From 7f67504993f96936145a48f5cee7dcc1e2645a47 Mon Sep 17 00:00:00 2001
From: wheredoesyourmindgo <moemanchu@icloud.com>
Date: Mon, 29 Nov 2021 00:17:07 -0800
Subject: [PATCH 001/867] Added cancel_key_lock function (#15321)

---
 docs/feature_key_lock.md                   | 3 ++-
 quantum/process_keycode/process_key_lock.c | 5 +++++
 quantum/process_keycode/process_key_lock.h | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/feature_key_lock.md b/docs/feature_key_lock.md
index 8e6e29f0e6..7681394229 100644
--- a/docs/feature_key_lock.md
+++ b/docs/feature_key_lock.md
@@ -19,4 +19,5 @@ First, enable Key Lock by setting `KEY_LOCK_ENABLE = yes` in your `rules.mk`. Th
 Key Lock is only able to hold standard action keys and [One Shot modifier](one_shot_keys.md) keys (for example, if you have your Shift defined as `OSM(KC_LSFT)`).
 This does not include any of the QMK special functions (except One Shot modifiers), or shifted versions of keys such as `KC_LPRN`. If it's in the [Basic Keycodes](keycodes_basic.md) list, it can be held.
 
-Switching layers will not cancel the Key Lock.
+Switching layers will not cancel the Key Lock. The Key Lock can be cancelled by calling the `cancel_key_lock()` function.
+
diff --git a/quantum/process_keycode/process_key_lock.c b/quantum/process_keycode/process_key_lock.c
index 4bd58f0c1e..941a2c5780 100644
--- a/quantum/process_keycode/process_key_lock.c
+++ b/quantum/process_keycode/process_key_lock.c
@@ -56,6 +56,11 @@ static inline uint16_t translate_keycode(uint16_t keycode) {
     }
 }
 
+void cancel_key_lock(void) {
+    watching = false;
+    UNSET_KEY_STATE(0x0);
+}
+
 bool process_key_lock(uint16_t *keycode, keyrecord_t *record) {
     // We start by categorizing the keypress event. In the event of a down
     // event, there are several possibilities:
diff --git a/quantum/process_keycode/process_key_lock.h b/quantum/process_keycode/process_key_lock.h
index baa0b39077..5159b0ba02 100644
--- a/quantum/process_keycode/process_key_lock.h
+++ b/quantum/process_keycode/process_key_lock.h
@@ -18,4 +18,5 @@
 
 #include "quantum.h"
 
+void cancel_key_lock(void);
 bool process_key_lock(uint16_t *keycode, keyrecord_t *record);

From c1297ceb972d45407cc1f518fd0527efda7ee796 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Mon, 29 Nov 2021 17:22:10 +0100
Subject: [PATCH 002/867] [Core] Remove matrix_is_modified() and
 debounce_is_active() (#15349)

---
 keyboards/40percentclub/ut47/matrix.c         | 6 ------
 keyboards/ai03/orbit/matrix.c                 | 5 -----
 keyboards/amj96/matrix.c                      | 6 ------
 keyboards/angel64/alpha/matrix.c              | 7 -------
 keyboards/angel64/rev1/matrix.c               | 7 -------
 keyboards/bpiphany/kitten_paw/matrix.c        | 7 -------
 keyboards/bpiphany/pegasushoof/2013/matrix.c  | 7 -------
 keyboards/converter/palm_usb/matrix.c         | 7 -------
 keyboards/converter/sun_usb/matrix.c          | 7 -------
 keyboards/converter/usb_usb/custom_matrix.cpp | 4 ----
 keyboards/dc01/arrow/matrix.c                 | 8 --------
 keyboards/dc01/left/matrix.c                  | 8 --------
 keyboards/dc01/numpad/matrix.c                | 8 --------
 keyboards/dc01/right/matrix.c                 | 8 --------
 keyboards/dm9records/ergoinu/matrix.c         | 6 ------
 keyboards/duck/jetfire/matrix.c               | 6 ------
 keyboards/ergodox_stm32/matrix.c              | 4 ----
 keyboards/ergotaco/matrix.c                   | 5 -----
 keyboards/gboards/gergoplex/matrix.c          | 5 -----
 keyboards/georgi/matrix.c                     | 5 -----
 keyboards/gergo/matrix.c                      | 5 -----
 keyboards/handwired/dactyl/matrix.c           | 8 --------
 keyboards/handwired/frenchdev/matrix.c        | 6 ------
 keyboards/handwired/not_so_minidox/matrix.c   | 6 ------
 keyboards/handwired/promethium/matrix.c       | 8 --------
 keyboards/handwired/pterodactyl/matrix.c      | 8 --------
 keyboards/helix/pico/matrix.c                 | 6 ------
 keyboards/helix/rev1/matrix.c                 | 6 ------
 keyboards/helix/rev2/matrix.c                 | 6 ------
 keyboards/hhkb/ansi/matrix.c                  | 9 ---------
 keyboards/hhkb/jp/matrix.c                    | 9 ---------
 keyboards/hid_liber/matrix.c                  | 6 ------
 keyboards/kinesis/alvicstep/matrix.c          | 6 ------
 keyboards/meira/matrix.c                      | 6 ------
 keyboards/nek_type_a/matrix.c                 | 8 --------
 keyboards/redscarf_iiplus/verb/matrix.c       | 7 -------
 keyboards/redscarf_iiplus/verc/matrix.c       | 7 -------
 keyboards/redscarf_iiplus/verd/matrix.c       | 7 -------
 keyboards/sirius/unigo66/custom_matrix.cpp    | 4 ----
 keyboards/sixkeyboard/matrix.c                | 5 -----
 keyboards/sx60/matrix.c                       | 8 --------
 keyboards/thedogkeyboard/matrix.c             | 7 -------
 keyboards/yosino58/rev1/matrix.c              | 6 ------
 quantum/debounce.h                            | 2 --
 quantum/debounce/asym_eager_defer_pk.c        | 1 -
 quantum/debounce/none.c                       | 2 --
 quantum/debounce/sym_defer_g.c                | 2 --
 quantum/debounce/sym_defer_pk.c               | 1 -
 quantum/debounce/sym_eager_pk.c               | 1 -
 quantum/debounce/sym_eager_pr.c               | 1 -
 quantum/matrix.h                              | 2 --
 quantum/matrix_common.c                       | 6 ------
 52 files changed, 298 deletions(-)

diff --git a/keyboards/40percentclub/ut47/matrix.c b/keyboards/40percentclub/ut47/matrix.c
index e47c7f8e13..c1284535bc 100644
--- a/keyboards/40percentclub/ut47/matrix.c
+++ b/keyboards/40percentclub/ut47/matrix.c
@@ -104,12 +104,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/ai03/orbit/matrix.c b/keyboards/ai03/orbit/matrix.c
index b8e3296686..024233524c 100644
--- a/keyboards/ai03/orbit/matrix.c
+++ b/keyboards/ai03/orbit/matrix.c
@@ -83,11 +83,6 @@ inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
 
 inline uint8_t matrix_cols(void) { return MATRIX_COLS; }
 
-bool matrix_is_modified(void) {
-  if (debounce_active()) return false;
-  return true;
-}
-
 inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
 
 inline matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
diff --git a/keyboards/amj96/matrix.c b/keyboards/amj96/matrix.c
index 8e7bbaa791..ffd66d120f 100644
--- a/keyboards/amj96/matrix.c
+++ b/keyboards/amj96/matrix.c
@@ -108,12 +108,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/angel64/alpha/matrix.c b/keyboards/angel64/alpha/matrix.c
index 474fbec030..2851859cf2 100644
--- a/keyboards/angel64/alpha/matrix.c
+++ b/keyboards/angel64/alpha/matrix.c
@@ -90,13 +90,6 @@ uint8_t matrix_cols(void) {
     return MATRIX_COLS;
 }
 
-//Deprecated.
-bool matrix_is_modified(void)
-{
-    if (debounce_active()) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/angel64/rev1/matrix.c b/keyboards/angel64/rev1/matrix.c
index 474fbec030..2851859cf2 100644
--- a/keyboards/angel64/rev1/matrix.c
+++ b/keyboards/angel64/rev1/matrix.c
@@ -90,13 +90,6 @@ uint8_t matrix_cols(void) {
     return MATRIX_COLS;
 }
 
-//Deprecated.
-bool matrix_is_modified(void)
-{
-    if (debounce_active()) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/bpiphany/kitten_paw/matrix.c b/keyboards/bpiphany/kitten_paw/matrix.c
index b59089cdf4..56114858f1 100644
--- a/keyboards/bpiphany/kitten_paw/matrix.c
+++ b/keyboards/bpiphany/kitten_paw/matrix.c
@@ -117,13 +117,6 @@ uint8_t matrix_scan(void) {
   return 1;
 }
 
-bool matrix_is_modified(void) {
-  if (debouncing)
-    return false;
-  else
-    return true;
-}
-
 inline bool matrix_is_on(uint8_t row, uint8_t col) {
   return (matrix[row] & ((matrix_row_t)1<<col));
 }
diff --git a/keyboards/bpiphany/pegasushoof/2013/matrix.c b/keyboards/bpiphany/pegasushoof/2013/matrix.c
index 037f323c00..09244982d9 100644
--- a/keyboards/bpiphany/pegasushoof/2013/matrix.c
+++ b/keyboards/bpiphany/pegasushoof/2013/matrix.c
@@ -110,13 +110,6 @@ uint8_t matrix_scan(void)
 	return 1;
 }
 
-bool matrix_is_modified(void)
-{
-	if (debouncing)
-		return false;
-	return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c
index 289284b616..5cb3c23572 100644
--- a/keyboards/converter/palm_usb/matrix.c
+++ b/keyboards/converter/palm_usb/matrix.c
@@ -58,8 +58,6 @@ static uint16_t disconnect_counter = 0;
 #define COL(code)    ((code & COL_MASK) )
 #define KEYUP(code) ((code & KEY_MASK) >>7 )
 
-static bool is_modified = false;
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -354,11 +352,6 @@ uint8_t matrix_scan(void)
     return code;
 }
 
-bool matrix_is_modified(void)
-{
-    return is_modified;
-}
-
 inline
 bool matrix_has_ghost(void)
 {
diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c
index 21f45111ec..9ab34bcef7 100644
--- a/keyboards/converter/sun_usb/matrix.c
+++ b/keyboards/converter/sun_usb/matrix.c
@@ -38,8 +38,6 @@ static uint8_t matrix[MATRIX_ROWS];
 #define ROW(code)      ((code>>3)&0xF)
 #define COL(code)      (code&0x07)
 
-static bool is_modified = false;
-
 __attribute__ ((weak))
 void matrix_init_kb(void) {
     matrix_init_user();
@@ -154,11 +152,6 @@ uint8_t matrix_scan(void)
     return code;
 }
 
-bool matrix_is_modified(void)
-{
-    return is_modified;
-}
-
 inline
 bool matrix_has_ghost(void)
 {
diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp
index 296f7fcd02..91986f6eb9 100644
--- a/keyboards/converter/usb_usb/custom_matrix.cpp
+++ b/keyboards/converter/usb_usb/custom_matrix.cpp
@@ -192,10 +192,6 @@ extern "C"
         return 1;
     }
 
-    bool matrix_is_modified(void) {
-        return matrix_is_mod;
-    }
-
     bool matrix_is_on(uint8_t row, uint8_t col) {
         uint8_t code = CODE(row, col);
 
diff --git a/keyboards/dc01/arrow/matrix.c b/keyboards/dc01/arrow/matrix.c
index 0102ad0fa4..b69e147914 100644
--- a/keyboards/dc01/arrow/matrix.c
+++ b/keyboards/dc01/arrow/matrix.c
@@ -205,14 +205,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-#if (DEBOUNCE > 0)
-    if (debouncing) return false;
-#endif
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c
index bf5aba8497..084978a1fd 100644
--- a/keyboards/dc01/left/matrix.c
+++ b/keyboards/dc01/left/matrix.c
@@ -230,14 +230,6 @@ if (i2c_transaction(SLAVE_I2C_ADDRESS_NUMPAD, 0x1FFFF, 11)) {
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-#if (DEBOUNCE > 0)
-    if (debouncing) return false;
-#endif
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/dc01/numpad/matrix.c b/keyboards/dc01/numpad/matrix.c
index 38130114eb..e8e2a1b14a 100644
--- a/keyboards/dc01/numpad/matrix.c
+++ b/keyboards/dc01/numpad/matrix.c
@@ -205,14 +205,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-#if (DEBOUNCE > 0)
-    if (debouncing) return false;
-#endif
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c
index 544c8dc538..2509bd7d4c 100644
--- a/keyboards/dc01/right/matrix.c
+++ b/keyboards/dc01/right/matrix.c
@@ -206,14 +206,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-#if (DEBOUNCE > 0)
-    if (debouncing) return false;
-#endif
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/dm9records/ergoinu/matrix.c b/keyboards/dm9records/ergoinu/matrix.c
index b1c58f88fe..87a5817313 100644
--- a/keyboards/dm9records/ergoinu/matrix.c
+++ b/keyboards/dm9records/ergoinu/matrix.c
@@ -223,12 +223,6 @@ void matrix_slave_scan(void) {
   }
 }
 
-bool matrix_is_modified(void)
-{
-  if (debouncing) return false;
-  return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/duck/jetfire/matrix.c b/keyboards/duck/jetfire/matrix.c
index 2dd94a72ac..729fa6dd14 100644
--- a/keyboards/duck/jetfire/matrix.c
+++ b/keyboards/duck/jetfire/matrix.c
@@ -116,12 +116,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/ergodox_stm32/matrix.c b/keyboards/ergodox_stm32/matrix.c
index 383bf9790a..094d4a9e0f 100644
--- a/keyboards/ergodox_stm32/matrix.c
+++ b/keyboards/ergodox_stm32/matrix.c
@@ -119,10 +119,6 @@ uint8_t matrix_scan(void) {
   return 0;
 }
 
-bool matrix_is_modified(void) {
-  return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col) {
   return (matrix[row] & (1 << col));
diff --git a/keyboards/ergotaco/matrix.c b/keyboards/ergotaco/matrix.c
index e5af1c27fd..16300a7e4f 100644
--- a/keyboards/ergotaco/matrix.c
+++ b/keyboards/ergotaco/matrix.c
@@ -199,11 +199,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void) // deprecated and evidently not called.
-{
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/gboards/gergoplex/matrix.c b/keyboards/gboards/gergoplex/matrix.c
index 716390241a..a075b85725 100644
--- a/keyboards/gboards/gergoplex/matrix.c
+++ b/keyboards/gboards/gergoplex/matrix.c
@@ -152,11 +152,6 @@ uint8_t matrix_scan(void) {
     return 1;
 }
 
-bool matrix_is_modified(void)  // deprecated and evidently not called.
-{
-    return true;
-}
-
 inline bool         matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
 inline matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
 
diff --git a/keyboards/georgi/matrix.c b/keyboards/georgi/matrix.c
index 438412102b..7d635ad8d7 100644
--- a/keyboards/georgi/matrix.c
+++ b/keyboards/georgi/matrix.c
@@ -220,11 +220,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void) // deprecated and evidently not called.
-{
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/gergo/matrix.c b/keyboards/gergo/matrix.c
index 655e729356..443e97132b 100644
--- a/keyboards/gergo/matrix.c
+++ b/keyboards/gergo/matrix.c
@@ -273,11 +273,6 @@ uint8_t matrix_scan(void) {
     return 1;
 }
 
-bool matrix_is_modified(void) // deprecated and evidently not called.
-{
-    return true;
-}
-
 inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
 
 inline matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
diff --git a/keyboards/handwired/dactyl/matrix.c b/keyboards/handwired/dactyl/matrix.c
index a21cd08e14..a70e8c5aca 100644
--- a/keyboards/handwired/dactyl/matrix.c
+++ b/keyboards/handwired/dactyl/matrix.c
@@ -281,14 +281,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void) // deprecated and evidently not called.
-{
-#if (DEBOUNCE > 0)
-    if (debouncing) return false;
-#endif
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c
index 5ab254a6f9..a043f78538 100644
--- a/keyboards/handwired/frenchdev/matrix.c
+++ b/keyboards/handwired/frenchdev/matrix.c
@@ -174,12 +174,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/handwired/not_so_minidox/matrix.c b/keyboards/handwired/not_so_minidox/matrix.c
index b7cec9370c..d2bbf7d303 100644
--- a/keyboards/handwired/not_so_minidox/matrix.c
+++ b/keyboards/handwired/not_so_minidox/matrix.c
@@ -239,12 +239,6 @@ void matrix_slave_scan(void) {
 #endif
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/handwired/promethium/matrix.c b/keyboards/handwired/promethium/matrix.c
index e3a41af288..90dbce14a9 100644
--- a/keyboards/handwired/promethium/matrix.c
+++ b/keyboards/handwired/promethium/matrix.c
@@ -148,14 +148,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-#if (DEBOUNCE > 0)
-    if (debouncing) return false;
-#endif
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 
diff --git a/keyboards/handwired/pterodactyl/matrix.c b/keyboards/handwired/pterodactyl/matrix.c
index 21e6a128df..d0f74802a0 100644
--- a/keyboards/handwired/pterodactyl/matrix.c
+++ b/keyboards/handwired/pterodactyl/matrix.c
@@ -282,14 +282,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void) // deprecated and evidently not called.
-{
-#if (DEBOUNCE > 0)
-    if (debouncing) return false;
-#endif
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/helix/pico/matrix.c b/keyboards/helix/pico/matrix.c
index b18213d846..039cca6dcf 100644
--- a/keyboards/helix/pico/matrix.c
+++ b/keyboards/helix/pico/matrix.c
@@ -273,12 +273,6 @@ void matrix_slave_scan(void) {
 #endif
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/helix/rev1/matrix.c b/keyboards/helix/rev1/matrix.c
index aa2cc76905..f59391b596 100644
--- a/keyboards/helix/rev1/matrix.c
+++ b/keyboards/helix/rev1/matrix.c
@@ -239,12 +239,6 @@ void matrix_slave_scan(void) {
 #endif
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/helix/rev2/matrix.c b/keyboards/helix/rev2/matrix.c
index 8eed7e58b7..699c15358b 100644
--- a/keyboards/helix/rev2/matrix.c
+++ b/keyboards/helix/rev2/matrix.c
@@ -287,12 +287,6 @@ void matrix_slave_scan(void) {
 #endif
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/hhkb/ansi/matrix.c b/keyboards/hhkb/ansi/matrix.c
index 529ba8b8fc..5dde74cce9 100644
--- a/keyboards/hhkb/ansi/matrix.c
+++ b/keyboards/hhkb/ansi/matrix.c
@@ -163,15 +163,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        if (matrix[i] != matrix_prev[i])
-            return true;
-    }
-    return false;
-}
-
 inline
 bool matrix_has_ghost(void)
 {
diff --git a/keyboards/hhkb/jp/matrix.c b/keyboards/hhkb/jp/matrix.c
index c0dca6a990..81db77fca7 100644
--- a/keyboards/hhkb/jp/matrix.c
+++ b/keyboards/hhkb/jp/matrix.c
@@ -164,15 +164,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        if (matrix[i] != matrix_prev[i])
-            return true;
-    }
-    return false;
-}
-
 inline
 bool matrix_has_ghost(void)
 {
diff --git a/keyboards/hid_liber/matrix.c b/keyboards/hid_liber/matrix.c
index ff59a17153..da73c616d7 100755
--- a/keyboards/hid_liber/matrix.c
+++ b/keyboards/hid_liber/matrix.c
@@ -218,12 +218,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    // NOTE: no longer used
-    return true;
-}
-
 inline
 bool matrix_has_ghost(void)
 {
diff --git a/keyboards/kinesis/alvicstep/matrix.c b/keyboards/kinesis/alvicstep/matrix.c
index 71619f8167..9c05374510 100644
--- a/keyboards/kinesis/alvicstep/matrix.c
+++ b/keyboards/kinesis/alvicstep/matrix.c
@@ -136,12 +136,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/meira/matrix.c b/keyboards/meira/matrix.c
index ae1ae5ce9d..8e8e9485b4 100644
--- a/keyboards/meira/matrix.c
+++ b/keyboards/meira/matrix.c
@@ -161,12 +161,6 @@ uint8_t matrix_scan(void)
 	return ret;
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/nek_type_a/matrix.c b/keyboards/nek_type_a/matrix.c
index a59598a503..b396be9911 100644
--- a/keyboards/nek_type_a/matrix.c
+++ b/keyboards/nek_type_a/matrix.c
@@ -205,14 +205,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-#if (DEBOUNCE > 0)
-    if (debouncing) return false;
-#endif
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/redscarf_iiplus/verb/matrix.c b/keyboards/redscarf_iiplus/verb/matrix.c
index 42cfb7c037..88ecb586b3 100755
--- a/keyboards/redscarf_iiplus/verb/matrix.c
+++ b/keyboards/redscarf_iiplus/verb/matrix.c
@@ -94,13 +94,6 @@ uint8_t matrix_cols(void) {
     return MATRIX_COLS;
 }
 
-//Deprecated.
-bool matrix_is_modified(void)
-{
-    if (debounce_active()) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/redscarf_iiplus/verc/matrix.c b/keyboards/redscarf_iiplus/verc/matrix.c
index 42cfb7c037..88ecb586b3 100755
--- a/keyboards/redscarf_iiplus/verc/matrix.c
+++ b/keyboards/redscarf_iiplus/verc/matrix.c
@@ -94,13 +94,6 @@ uint8_t matrix_cols(void) {
     return MATRIX_COLS;
 }
 
-//Deprecated.
-bool matrix_is_modified(void)
-{
-    if (debounce_active()) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/redscarf_iiplus/verd/matrix.c b/keyboards/redscarf_iiplus/verd/matrix.c
index 78d1191b68..d9dbb3c0a3 100644
--- a/keyboards/redscarf_iiplus/verd/matrix.c
+++ b/keyboards/redscarf_iiplus/verd/matrix.c
@@ -94,13 +94,6 @@ uint8_t matrix_cols(void) {
     return MATRIX_COLS;
 }
 
-//Deprecated.
-bool matrix_is_modified(void)
-{
-    if (debounce_active()) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/sirius/unigo66/custom_matrix.cpp b/keyboards/sirius/unigo66/custom_matrix.cpp
index fba107c7cb..dfcf82c779 100644
--- a/keyboards/sirius/unigo66/custom_matrix.cpp
+++ b/keyboards/sirius/unigo66/custom_matrix.cpp
@@ -172,10 +172,6 @@ extern "C"
         return 1;
     }
 
-    bool matrix_is_modified(void) {
-        return matrix_is_mod;
-    }
-
     bool matrix_is_on(uint8_t row, uint8_t col) {
         uint8_t code = CODE(row, col);
 
diff --git a/keyboards/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c
index 64b46e9b0c..a6b28f3a12 100644
--- a/keyboards/sixkeyboard/matrix.c
+++ b/keyboards/sixkeyboard/matrix.c
@@ -114,11 +114,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/sx60/matrix.c b/keyboards/sx60/matrix.c
index b7dc25425d..231e1c8836 100644
--- a/keyboards/sx60/matrix.c
+++ b/keyboards/sx60/matrix.c
@@ -172,14 +172,6 @@ uint8_t matrix_scan(void)
     return 1;
 }
 
-bool matrix_is_modified(void)
-{
-#if (DEBOUNCE > 0)
-    if (debouncing) return false;
-#endif
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/thedogkeyboard/matrix.c b/keyboards/thedogkeyboard/matrix.c
index 474fbec030..2851859cf2 100644
--- a/keyboards/thedogkeyboard/matrix.c
+++ b/keyboards/thedogkeyboard/matrix.c
@@ -90,13 +90,6 @@ uint8_t matrix_cols(void) {
     return MATRIX_COLS;
 }
 
-//Deprecated.
-bool matrix_is_modified(void)
-{
-    if (debounce_active()) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/keyboards/yosino58/rev1/matrix.c b/keyboards/yosino58/rev1/matrix.c
index 3db40b3829..e2be7113bf 100644
--- a/keyboards/yosino58/rev1/matrix.c
+++ b/keyboards/yosino58/rev1/matrix.c
@@ -289,12 +289,6 @@ void matrix_slave_scan(void) {
 #endif
 }
 
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
 inline
 bool matrix_is_on(uint8_t row, uint8_t col)
 {
diff --git a/quantum/debounce.h b/quantum/debounce.h
index 5043868289..3532d9cd7b 100644
--- a/quantum/debounce.h
+++ b/quantum/debounce.h
@@ -6,8 +6,6 @@
 // changed is true if raw has changed since the last call
 void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed);
 
-bool debounce_active(void);
-
 void debounce_init(uint8_t num_rows);
 
 void debounce_free(void);
diff --git a/quantum/debounce/asym_eager_defer_pk.c b/quantum/debounce/asym_eager_defer_pk.c
index 81f39383c4..b1eb4a2b7b 100644
--- a/quantum/debounce/asym_eager_defer_pk.c
+++ b/quantum/debounce/asym_eager_defer_pk.c
@@ -165,7 +165,6 @@ static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], ui
     }
 }
 
-bool debounce_active(void) { return true; }
 #else
 #    include "none.c"
 #endif
diff --git a/quantum/debounce/none.c b/quantum/debounce/none.c
index b03892bc5b..8a85cc04a8 100644
--- a/quantum/debounce/none.c
+++ b/quantum/debounce/none.c
@@ -26,6 +26,4 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
     }
 }
 
-bool debounce_active(void) { return false; }
-
 void debounce_free(void) {}
diff --git a/quantum/debounce/sym_defer_g.c b/quantum/debounce/sym_defer_g.c
index 9155eb914c..8cac1c37f9 100644
--- a/quantum/debounce/sym_defer_g.c
+++ b/quantum/debounce/sym_defer_g.c
@@ -44,8 +44,6 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
     }
 }
 
-bool debounce_active(void) { return debouncing; }
-
 void debounce_free(void) {}
 #else  // no debouncing.
 #    include "none.c"
diff --git a/quantum/debounce/sym_defer_pk.c b/quantum/debounce/sym_defer_pk.c
index 1b698ba347..9dee29e28e 100644
--- a/quantum/debounce/sym_defer_pk.c
+++ b/quantum/debounce/sym_defer_pk.c
@@ -134,7 +134,6 @@ static void start_debounce_counters(matrix_row_t raw[], matrix_row_t cooked[], u
     }
 }
 
-bool debounce_active(void) { return true; }
 #else
 #    include "none.c"
 #endif
diff --git a/quantum/debounce/sym_eager_pk.c b/quantum/debounce/sym_eager_pk.c
index 9da000ea9a..deec463649 100644
--- a/quantum/debounce/sym_eager_pk.c
+++ b/quantum/debounce/sym_eager_pk.c
@@ -140,7 +140,6 @@ static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], ui
     }
 }
 
-bool debounce_active(void) { return true; }
 #else
 #    include "none.c"
 #endif
diff --git a/quantum/debounce/sym_eager_pr.c b/quantum/debounce/sym_eager_pr.c
index eda92a263b..29b0cabefb 100644
--- a/quantum/debounce/sym_eager_pr.c
+++ b/quantum/debounce/sym_eager_pr.c
@@ -132,7 +132,6 @@ static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], ui
     }
 }
 
-bool debounce_active(void) { return true; }
 #else
 #    include "none.c"
 #endif
diff --git a/quantum/matrix.h b/quantum/matrix.h
index 5c696622fc..1a3f362fba 100644
--- a/quantum/matrix.h
+++ b/quantum/matrix.h
@@ -46,8 +46,6 @@ void matrix_setup(void);
 void matrix_init(void);
 /* scan all key states on matrix */
 uint8_t matrix_scan(void);
-/* whether modified from previous scan. used after matrix_scan. */
-bool matrix_is_modified(void) __attribute__((deprecated));
 /* whether a switch is on */
 bool matrix_is_on(uint8_t row, uint8_t col);
 /* matrix state on row */
diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c
index 66c89970b1..fe1d5b1edd 100644
--- a/quantum/matrix_common.c
+++ b/quantum/matrix_common.c
@@ -45,12 +45,6 @@ inline matrix_row_t matrix_get_row(uint8_t row) {
 #endif
 }
 
-// Deprecated.
-bool matrix_is_modified(void) {
-    if (debounce_active()) return false;
-    return true;
-}
-
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header() print("\nr/c 01234567\n")
 #    define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))

From b7cdda7dcd02719efd91817a36ab9268182f1224 Mon Sep 17 00:00:00 2001
From: xiao <307671+xia0@users.noreply.github.com>
Date: Tue, 30 Nov 2021 03:23:58 +1100
Subject: [PATCH 003/867] [Keyboard] Added Wakizashi 40 (#15336)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/wakizashi40/config.h      | 20 ++++
 keyboards/handwired/wakizashi40/info.json     | 88 ++++++++++++++++++
 .../wakizashi40/keymaps/default/keymap.c      | 44 +++++++++
 .../wakizashi40/keymaps/via/keymap.c          | 92 +++++++++++++++++++
 .../wakizashi40/keymaps/via/rules.mk          |  4 +
 keyboards/handwired/wakizashi40/readme.md     | 19 ++++
 keyboards/handwired/wakizashi40/rules.mk      |  1 +
 7 files changed, 268 insertions(+)
 create mode 100644 keyboards/handwired/wakizashi40/config.h
 create mode 100644 keyboards/handwired/wakizashi40/info.json
 create mode 100644 keyboards/handwired/wakizashi40/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/wakizashi40/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/wakizashi40/keymaps/via/rules.mk
 create mode 100644 keyboards/handwired/wakizashi40/readme.md
 create mode 100644 keyboards/handwired/wakizashi40/rules.mk

diff --git a/keyboards/handwired/wakizashi40/config.h b/keyboards/handwired/wakizashi40/config.h
new file mode 100644
index 0000000000..78f85f2197
--- /dev/null
+++ b/keyboards/handwired/wakizashi40/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 xiao (@xia0)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+#define DYNAMIC_KEYMAP_LAYER_COUNT 12
diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/info.json
new file mode 100644
index 0000000000..b64ab55116
--- /dev/null
+++ b/keyboards/handwired/wakizashi40/info.json
@@ -0,0 +1,88 @@
+{
+  "manufacturer": "fumbucker",
+  "keyboard_name": "Wakizashi 40",
+  "maintainer": "fumbucker",
+  "debounce": 5,
+  "processor": "at90usb1286",
+  "diode_direction": "COL2ROW",
+  "features": {
+    "audio": false,
+    "backlight": false,
+    "bluetooth": false,
+    "bootmagic": true,
+    "command": false,
+    "console": true,
+    "extrakey": true,
+    "midi": false,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": false,
+    "unicode": false
+  },
+  "matrix_pins": {
+    "cols": ["C5", "C4", "D2", "D3", "D4", "D5", "C6", "D7", "B0", "B1", "B2", "B3", "B4"],
+    "rows": ["C0", "C1", "C2", "C3"]
+  },
+  "usb": {
+    "device_ver": "0x0001",
+    "pid": "0x7740",
+    "vid": "0x6662"
+  },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_all"
+  },
+  "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        { "label": "TAB", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0 },
+        { "label": "Q", "matrix": [0, 2], "w": 1, "x": 1.5, "y": 0 },
+        { "label": "W", "matrix": [0, 3], "w": 1, "x": 2.5, "y": 0 },
+        { "label": "E", "matrix": [0, 4], "w": 1, "x": 3.5, "y": 0 },
+        { "label": "R", "matrix": [0, 5], "w": 1, "x": 4.5, "y": 0 },
+        { "label": "T", "matrix": [0, 6], "w": 1, "x": 5.5, "y": 0 },
+        { "label": "Y", "matrix": [0, 7], "w": 1, "x": 6.5, "y": 0 },
+        { "label": "U", "matrix": [0, 8], "w": 1, "x": 7.5, "y": 0 },
+        { "label": "I", "matrix": [0, 9], "w": 1, "x": 8.5, "y": 0 },
+        { "label": "O", "matrix": [0, 10], "w": 1, "x": 9.5, "y": 0 },
+        { "label": "P", "matrix": [0, 11], "w": 1, "x": 10.5, "y": 0 },
+        { "label": "BACKSPACE", "matrix": [0, 12], "w": 1.5, "x": 11.5, "y": 0 },
+
+        { "label": "CAPSLOCK", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 },
+        { "label": "A", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 },
+        { "label": "S", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 },
+        { "label": "D", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 },
+        { "label": "F", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 },
+        { "label": "G", "matrix": [1, 5], "w": 1, "x": 5.75, "y": 1 },
+        { "label": "H", "matrix": [1, 7], "w": 1, "x": 6.75, "y": 1 },
+        { "label": "J", "matrix": [1, 8], "w": 1, "x": 7.75, "y": 1 },
+        { "label": "K", "matrix": [1, 9], "w": 1, "x": 8.75, "y": 1 },
+        { "label": "L", "matrix": [1, 10], "w": 1, "x": 9.75, "y": 1 },
+        { "label": "SEMICOLON", "matrix": [1, 11], "w": 1, "x": 10.75, "y": 1 },
+        { "label": "ENTER", "matrix": [1, 12], "w": 1.25, "x": 11.75, "y": 1 },
+
+        { "label": "LSHIFT", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
+        { "label": "Z", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
+        { "label": "X", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
+        { "label": "C", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 },
+        { "label": "V", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 },
+        { "label": "B", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 },
+        { "label": "ESCAPE", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 },
+        { "label": "N", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 },
+        { "label": "M", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 },
+        { "label": "COMMA", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 },
+        { "label": "PERIOD", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 },
+        { "label": "SLASH", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 },
+        { "label": "RSHIFT", "matrix": [2, 12], "w": 1, "x": 12, "y": 2 },
+
+        { "label": "LCTRL", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+        { "label": "LWIN", "matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3 },
+        { "label": "LALT", "matrix": [3, 3], "w": 1.25, "x": 2.5, "y": 3 },
+        { "label": "SPACE1", "matrix": [3, 5], "w": 2.75, "x": 3.75, "y": 3 },
+        { "label": "SPACE2", "matrix": [3, 7], "w": 2.75, "x": 6.5, "y": 3 },
+        { "label": "RALT", "matrix": [3, 9], "w": 1.25, "x": 9.25, "y": 3 },
+        { "label": "MENU", "matrix": [3, 11], "w": 1.25, "x": 10.5, "y": 3 },
+        { "label": "RCTRL", "matrix": [3, 12], "w": 1.25, "x": 11.75, "y": 3 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/handwired/wakizashi40/keymaps/default/keymap.c b/keyboards/handwired/wakizashi40/keymaps/default/keymap.c
new file mode 100644
index 0000000000..910e5bde12
--- /dev/null
+++ b/keyboards/handwired/wakizashi40/keymaps/default/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2021 xiao (@xia0)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+		MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ESC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+		KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), LT(2, KC_SPC), KC_LALT, KC_MENU, KC_LCTL),
+
+	[1] = LAYOUT_all(
+		KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+		MO(3), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_TRNS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
+		MO(11), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_QUOT,
+		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_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_QUOT,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/handwired/wakizashi40/keymaps/via/keymap.c b/keyboards/handwired/wakizashi40/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d456b8b40a
--- /dev/null
+++ b/keyboards/handwired/wakizashi40/keymaps/via/keymap.c
@@ -0,0 +1,92 @@
+/* Copyright 2021 xiao (@xia0)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+		MO(3), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ESC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+		KC_LCTL, KC_LGUI, KC_LALT, LT(1, KC_SPC), LT(2, KC_SPC), KC_LALT, KC_MENU, KC_LCTL),
+
+	[1] = LAYOUT_all(
+		KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+		MO(11), KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_TRNS, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS,
+		MO(11), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_QUOT,
+		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_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_QUOT,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[4] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[5] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[6] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[7] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[8] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[9] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[10] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[11] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+
+};
diff --git a/keyboards/handwired/wakizashi40/keymaps/via/rules.mk b/keyboards/handwired/wakizashi40/keymaps/via/rules.mk
new file mode 100644
index 0000000000..7a49719505
--- /dev/null
+++ b/keyboards/handwired/wakizashi40/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+# rules.mk overrides to enable VIA
+
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/handwired/wakizashi40/readme.md b/keyboards/handwired/wakizashi40/readme.md
new file mode 100644
index 0000000000..d94a75651c
--- /dev/null
+++ b/keyboards/handwired/wakizashi40/readme.md
@@ -0,0 +1,19 @@
+# Wakizashi 40
+
+![Wakizashi40](https://cdn.thingiverse.com/renders/51/50/81/13/a9/7078248666f70b422127c6662cf79563_preview_featured.jpg)
+
+Reverse stagger 40% keyboard based on the Katana 60.
+
+* Keyboard Maintainer: [fumbucker](https://github.com/xia0)
+* Hardware Supported: Teensy2++
+* Hardware Availability: [thingiverse](https://www.thingiverse.com/thing:3467930)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/wakizashi40:default
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+## Bootloader
+
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available (Capslock + R).
diff --git a/keyboards/handwired/wakizashi40/rules.mk b/keyboards/handwired/wakizashi40/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/handwired/wakizashi40/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From b5a5bb6d743afc0be8d5b1d973158fa8fd2aec93 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 29 Nov 2021 17:18:54 -0800
Subject: [PATCH 004/867] Change default USB Polling rate to 1kHz (#15352)

---
 tmk_core/protocol/usb_descriptor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmk_core/protocol/usb_descriptor.c b/tmk_core/protocol/usb_descriptor.c
index a43755f899..0b992ba6c5 100644
--- a/tmk_core/protocol/usb_descriptor.c
+++ b/tmk_core/protocol/usb_descriptor.c
@@ -450,7 +450,7 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = {
 #endif
 
 #ifndef USB_POLLING_INTERVAL_MS
-#    define USB_POLLING_INTERVAL_MS 10
+#    define USB_POLLING_INTERVAL_MS 1
 #endif
 
 /*

From 9204f8535b36e4b9ea51c083bd04d6ea76ac97ee Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 30 Nov 2021 17:49:09 +0000
Subject: [PATCH 005/867] [Keyboard] Convert ergoinu to SPLIT_KEYBOARD (#15305)

---
 keyboards/dm9records/ergoinu/config.h         |  10 +-
 keyboards/dm9records/ergoinu/ergoinu.c        |  17 +
 keyboards/dm9records/ergoinu/ergoinu.h        |   5 -
 .../ergoinu/keymaps/default/config.h          |  24 --
 .../ergoinu/keymaps/default/keymap.c          |  49 ++-
 .../ergoinu/keymaps/default/rules.mk          |  26 --
 .../ergoinu/keymaps/default_jis/config.h      |  24 --
 .../ergoinu/keymaps/default_jis/keymap.c      |  42 ++-
 .../ergoinu/keymaps/default_jis/rules.mk      |  26 --
 keyboards/dm9records/ergoinu/matrix.c         | 286 -----------------
 keyboards/dm9records/ergoinu/post_rules.mk    |   9 -
 keyboards/dm9records/ergoinu/readme.md        |   9 +-
 keyboards/dm9records/ergoinu/rules.mk         |  30 +-
 keyboards/dm9records/ergoinu/serial.c         | 295 ------------------
 keyboards/dm9records/ergoinu/serial.h         |  24 --
 keyboards/dm9records/ergoinu/serial_config.h  |  11 -
 keyboards/dm9records/ergoinu/split_util.c     |  56 ----
 keyboards/dm9records/ergoinu/split_util.h     |  12 -
 18 files changed, 77 insertions(+), 878 deletions(-)
 delete mode 100644 keyboards/dm9records/ergoinu/keymaps/default/config.h
 delete mode 100644 keyboards/dm9records/ergoinu/keymaps/default/rules.mk
 delete mode 100644 keyboards/dm9records/ergoinu/keymaps/default_jis/config.h
 delete mode 100644 keyboards/dm9records/ergoinu/keymaps/default_jis/rules.mk
 delete mode 100644 keyboards/dm9records/ergoinu/matrix.c
 delete mode 100644 keyboards/dm9records/ergoinu/post_rules.mk
 delete mode 100644 keyboards/dm9records/ergoinu/serial.c
 delete mode 100644 keyboards/dm9records/ergoinu/serial.h
 delete mode 100644 keyboards/dm9records/ergoinu/serial_config.h
 delete mode 100644 keyboards/dm9records/ergoinu/split_util.c
 delete mode 100644 keyboards/dm9records/ergoinu/split_util.h

diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index 113eaf9f76..89ea9e7903 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-#include "serial_config.h"
 
 /* USB Device descriptor parameter
    VID & PID are lisenced from microchip sublisence program, Don't use other project! */
@@ -30,11 +29,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MANUFACTURER    Dm9Records
 #define PRODUCT         ergoinu
 
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 100
-
 #define USE_SERIAL
 
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D2
+
 /* Select hand configuration */
 #define MASTER_LEFT
 // #define MASTER_RIGHT
@@ -49,6 +48,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 7
 #define MATRIX_COL_PINS { B4, E6, D7, C6, D4, F5, F4 }
 
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
diff --git a/keyboards/dm9records/ergoinu/ergoinu.c b/keyboards/dm9records/ergoinu/ergoinu.c
index c6d099a148..a01ac0a25c 100644
--- a/keyboards/dm9records/ergoinu/ergoinu.c
+++ b/keyboards/dm9records/ergoinu/ergoinu.c
@@ -1 +1,18 @@
+/*
+Copyright 2018 Takuya Urakawa<twitter:@hsgw>
+
+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 "ergoinu.h"
diff --git a/keyboards/dm9records/ergoinu/ergoinu.h b/keyboards/dm9records/ergoinu/ergoinu.h
index 43249a8440..c275d3fa27 100644
--- a/keyboards/dm9records/ergoinu/ergoinu.h
+++ b/keyboards/dm9records/ergoinu/ergoinu.h
@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#ifdef RGBLIGHT_ENABLE
-#include "ws2812.h"
-#endif
-
 #define LAYOUT( \
   L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
   L07, L08, L09, L10, L11, L12, L13, R07, R08, R09, R10, R11, R12, R13, \
@@ -41,4 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { R27, R26, R25, R24, R23, R22, R21 }, \
     { KC_NO, KC_NO, R32, R31, R30, R29, R28 } \
   }
-
diff --git a/keyboards/dm9records/ergoinu/keymaps/default/config.h b/keyboards/dm9records/ergoinu/keymaps/default/config.h
deleted file mode 100644
index bb266f25e7..0000000000
--- a/keyboards/dm9records/ergoinu/keymaps/default/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Takuya Urakawa <Twitter:@hsgw>
-
-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 RGBLIGHT_ANIMATIONS
diff --git a/keyboards/dm9records/ergoinu/keymaps/default/keymap.c b/keyboards/dm9records/ergoinu/keymaps/default/keymap.c
index 3192b0f220..862b538829 100644
--- a/keyboards/dm9records/ergoinu/keymaps/default/keymap.c
+++ b/keyboards/dm9records/ergoinu/keymaps/default/keymap.c
@@ -5,14 +5,6 @@
 extern rgblight_config_t rgblight_config;
 #endif
 
-#define JA_CLON KC_QUOT  // : and +
-#define JA_AT   KC_LBRC  // @ and `
-#define JA_HAT  KC_EQL   // ^ and ~
-#define JA_ENUN KC_RO    // \ and _ (EN mark and UNder score)
-#define JA_ENVL KC_JYEN  // \ and | (EN mark and Vertical Line)
-#define JA_LBRC KC_RBRC  // [ and {
-#define JA_RBRC KC_BSLS  // ] and }
-
 enum LAYER_NO {
   BASE = 0,
   META,
@@ -24,33 +16,30 @@ enum CUSTOM_KEYCODES {
   RGB_TYPE,
 };
 
-// Fillers to make layering more clear
-#define ______ KC_TRNS
-#define XXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [BASE] = LAYOUT( \
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, \
-    KC_DEL,  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_LCTL,          KC_A,    KC_S,    KC_D,     KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_GRV, \
-    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_RSFT, \
-                      MO(META),KC_LALT, KC_LGUI,  KC_ENT,  KC_SPC,  KC_ENT, KC_BSPC, KC_RGUI, KC_RALT, MO(META) \
+  [BASE] = LAYOUT(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,     KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,
+    KC_DEL,  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_LCTL,          KC_A,    KC_S,    KC_D,     KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_GRV,
+    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_RSFT,
+                      MO(META),KC_LALT, KC_LGUI,  KC_ENT,  KC_SPC,  KC_ENT, KC_BSPC, KC_RGUI, KC_RALT, MO(META)
   ),
 
-  [META] = LAYOUT( \
-    MO(CONF),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_INS, \
-    ______,  KC_CAPS, ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_SLCK, KC_PSCR, KC_HOME, KC_END, \
-    ______,           ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_PAUS, KC_PGUP, KC_UP,   KC_PGDN, \
-    ______,           ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_LEFT, KC_DOWN, KC_RGHT, \
-                      ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______, ______ \
+  [META] = LAYOUT(
+    MO(CONF),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_INS,
+    _______, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_SLCK, KC_PSCR, KC_HOME, KC_END,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, KC_PGUP, KC_UP,   KC_PGDN,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT,
+                      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   ),
- [CONF] = LAYOUT( \
-    ______,  RGB_TYPE,RGB_MOD,  RGB_VAI, RGB_HUI, RGB_HUI,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX, \
-    RGB_RST, RGB_TOG, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_HUD,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX, \
-    XXXXXX,           XXXXXX,   XXXXXX,  XXXXXX,  XXXXXX,   XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX, \
-    XXXXXX,           XXXXXX,   XXXXXX,  XXXXXX,  XXXXXX,   XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX, \
-                      XXXXXX,   XXXXXX,  XXXXXX,  XXXXXX,   XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX \
+
+  [CONF] = LAYOUT(
+    _______, RGB_TYPE,RGB_MOD,  RGB_VAI, RGB_HUI, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    RGB_RST, RGB_TOG, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX,          XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX,          XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                      XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
   )
 };
 
diff --git a/keyboards/dm9records/ergoinu/keymaps/default/rules.mk b/keyboards/dm9records/ergoinu/keymaps/default/rules.mk
deleted file mode 100644
index 8741c24d87..0000000000
--- a/keyboards/dm9records/ergoinu/keymaps/default/rules.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-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
-NKRO_ENABLE = no            # 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           # Audio output
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SWAP_HANDS_ENABLE = no        # Enable one-hand typing
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-# ergoinu configs
-DISABLE_PROMICRO_LEDs = yes
-
-# Uncomment these for debugging
-# $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
-# $(info -- OPT_DEFS=$(OPT_DEFS))
-# $(info )
diff --git a/keyboards/dm9records/ergoinu/keymaps/default_jis/config.h b/keyboards/dm9records/ergoinu/keymaps/default_jis/config.h
deleted file mode 100644
index bb266f25e7..0000000000
--- a/keyboards/dm9records/ergoinu/keymaps/default_jis/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-Copyright 2018 Takuya Urakawa <Twitter:@hsgw>
-
-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 RGBLIGHT_ANIMATIONS
diff --git a/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c b/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
index e161145f4f..32289c44db 100644
--- a/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
+++ b/keyboards/dm9records/ergoinu/keymaps/default_jis/keymap.c
@@ -24,34 +24,30 @@ enum CUSTOM_KEYCODES {
   RGB_TYPE,
 };
 
-// Fillers to make layering more clear
-#define ______ KC_TRNS
-#define XXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [BASE] = LAYOUT( \
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, JA_HAT,   KC_JYEN, \
-    KC_DEL,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    JA_AT,    JA_LBRC, \
-    KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, JA_CLON,  JA_RBRC, \
-    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RO,    KC_RSFT, \
-                      MO(META),KC_LALT, KC_ZKHK, KC_BSPC, KC_SPC,  KC_ENT, KC_BSPC, KC_MHEN, KC_KANA, MO(META) \
+  [BASE] = LAYOUT(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, JA_HAT,   KC_JYEN,
+    KC_DEL,  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    JA_AT,    JA_LBRC,
+    KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, JA_CLON,  JA_RBRC,
+    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RO,    KC_RSFT,
+                      MO(META),KC_LALT, KC_ZKHK, KC_BSPC, KC_SPC,  KC_ENT, KC_BSPC, KC_MHEN, KC_KANA, MO(META)
   ),
 
-
-  [META] = LAYOUT( \
-    MO(CONF),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_INS, \
-    ______,  KC_CAPS, ______,  KC_UP,   ______,  ______,  ______,  ______,  ______,  ______,  KC_SLCK, KC_PSCR, KC_HOME, KC_END, \
-    ______,           KC_LEFT, KC_DOWN, KC_RGHT, ______,  ______,  ______,  ______,  ______,  KC_PAUS, KC_PGUP, KC_UP,   KC_PGDN, \
-    ______,           ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  ______,  KC_LEFT, KC_DOWN, KC_RGHT, \
-                      ______,  ______,  KC_RGUI, KC_DEL,  KC_ENT,  ______,  KC_DEL,  KC_HENK, KC_LGUI, ______ \
+  [META] = LAYOUT(
+    MO(CONF),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_INS,
+    _______, KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, _______, KC_SLCK, KC_PSCR, KC_HOME, KC_END,
+    _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_PAUS, KC_PGUP, KC_UP,   KC_PGDN,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT,
+                      _______, _______, KC_RGUI, KC_DEL,  KC_ENT,  _______, KC_DEL,  KC_HENK, KC_LGUI, _______
   ),
- [CONF] = LAYOUT( \
-    ______,  RGB_TYPE,RGB_MOD,  RGB_VAI, RGB_HUI, RGB_HUI,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX, \
-    RGB_RST, RGB_TOG, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_HUD,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX, \
-    XXXXXX,           XXXXXX,   XXXXXX,  XXXXXX,  XXXXXX,   XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX, \
-    XXXXXX,           XXXXXX,   XXXXXX,  XXXXXX,  XXXXXX,   XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX, \
-                      XXXXXX,   XXXXXX,  XXXXXX,  XXXXXX,   XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX,  XXXXXX \
+
+  [CONF] = LAYOUT(
+    _______, RGB_TYPE,RGB_MOD,  RGB_VAI, RGB_HUI, RGB_HUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    RGB_RST, RGB_TOG, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_HUD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX,          XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX,          XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                      XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
   )
 };
 
diff --git a/keyboards/dm9records/ergoinu/keymaps/default_jis/rules.mk b/keyboards/dm9records/ergoinu/keymaps/default_jis/rules.mk
deleted file mode 100644
index 48418de471..0000000000
--- a/keyboards/dm9records/ergoinu/keymaps/default_jis/rules.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no       # Audio control and System control(+450)
-CONSOLE_ENABLE = no         # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
-NKRO_ENABLE = no            # 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           # Audio output
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
-SWAP_HANDS_ENABLE = no        # Enable one-hand typing
-
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-# ergoinu configs
-DISABLE_PROMICRO_LEDs = yes
-
-# Uncomment these for debugging
-# $(info -- RGBLIGHT_ENABLE=$(RGBLIGHT_ENABLE))
-# $(info -- OPT_DEFS=$(OPT_DEFS))
-# $(info )
diff --git a/keyboards/dm9records/ergoinu/matrix.c b/keyboards/dm9records/ergoinu/matrix.c
deleted file mode 100644
index 87a5817313..0000000000
--- a/keyboards/dm9records/ergoinu/matrix.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- * scan matrix
- */
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include "print.h"
-#include "debug.h"
-#include "util.h"
-#include "matrix.h"
-#include "split_util.h"
-#include "quantum.h"
-
-#include "serial.h"
-
-#ifndef DEBOUNCE
-#  define DEBOUNCE	5
-#endif
-
-#define ERROR_DISCONNECT_COUNT 5
-
-static uint8_t debouncing = DEBOUNCE;
-static const int ROWS_PER_HAND = MATRIX_ROWS/2;
-static uint8_t error_count = 0;
-uint8_t is_master = 0 ;
-
-static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-
-static matrix_row_t read_cols(void);
-static void init_cols(void);
-static void unselect_rows(void);
-static void select_row(uint8_t row);
-static uint8_t matrix_master_scan(void);
-
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-  matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void) {
-  return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void) {
-  return MATRIX_COLS;
-}
-
-void matrix_init(void) {
-  debug_enable = true;
-  debug_matrix = true;
-  debug_mouse = true;
-  // initialize row and col
-  unselect_rows();
-  init_cols();
-
-  setPinOutput(B0);
-  setPinOutput(D5);
-
-  #ifdef DISABLE_PROMICRO_LEDs
-    writePinHigh(B0);
-    writePinHigh(D5);
-  #endif
-
-  // initialize matrix state: all keys off
-  for (uint8_t i=0; i < MATRIX_ROWS; i++) {
-      matrix[i] = 0;
-      matrix_debouncing[i] = 0;
-  }
-
-  is_master = has_usb();
-
-  matrix_init_quantum();
-}
-
-uint8_t _matrix_scan(void) {
-  // Right hand is stored after the left in the matirx so, we need to offset it
-  int offset = isLeftHand ? 0 : (ROWS_PER_HAND);
-
-  for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
-      select_row(i);
-      _delay_us(30);  // without this wait read unstable value.
-      matrix_row_t cols = read_cols();
-      if (matrix_debouncing[i+offset] != cols) {
-          matrix_debouncing[i+offset] = cols;
-          debouncing = DEBOUNCE;
-      }
-      unselect_rows();
-  }
-
-  if (debouncing) {
-      if (--debouncing) {
-          _delay_ms(1);
-      } else {
-          for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
-              matrix[i+offset] = matrix_debouncing[i+offset];
-          }
-      }
-  }
-
-  return 1;
-}
-
-int serial_transaction(void) {
-  int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-  int ret=serial_update_buffers();
-  if (ret ) {
-#ifndef DISABLE_PROMICRO_LEDs
-      if(ret==2) writePinLow(B0);
-#endif
-      return 1;
-  }
-#ifndef DISABLE_PROMICRO_LEDs
-  writePinHigh(B0);
-#endif
-  for (int i = 0; i < ROWS_PER_HAND; ++i) {
-      matrix[slaveOffset+i] = serial_slave_buffer[i];
-  }
-  return 0;
-}
-
-uint8_t matrix_scan(void) {
-  if (is_master) {
-    matrix_master_scan();
-  }else{
-    matrix_slave_scan();
-
-    int offset = (isLeftHand) ? ROWS_PER_HAND : 0;
-
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-      matrix[offset+i] = serial_master_buffer[i];
-    }
-
-    matrix_scan_quantum();
-  }
-  return 1;
-}
-
-
-uint8_t matrix_master_scan(void) {
-
-  int ret = _matrix_scan();
-
-  int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
-
-  for (int i = 0; i < ROWS_PER_HAND; ++i) {
-    serial_master_buffer[i] = matrix[offset+i];
-  }
-
-  if( serial_transaction() ) {
-#ifndef DISABLE_PROMICRO_LEDs
-    // turn on the indicator led when halves are disconnected
-    writePinLow(D5);
-#endif
-
-    error_count++;
-
-    if (error_count > ERROR_DISCONNECT_COUNT) {
-        // reset other half if disconnected
-      int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-      for (int i = 0; i < ROWS_PER_HAND; ++i) {
-          matrix[slaveOffset+i] = 0;
-      }
-    }
-  } else {
-#ifndef DISABLE_PROMICRO_LEDs
-    // turn off the indicator led on no error
-    writePinHigh(D5);
-#endif
-    error_count = 0;
-  }
-  matrix_scan_quantum();
-  return ret;
-}
-
-void matrix_slave_scan(void) {
-  _matrix_scan();
-
-  int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
-
-  for (int i = 0; i < ROWS_PER_HAND; ++i) {
-    serial_slave_buffer[i] = matrix[offset+i];
-  }
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-  return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-  return matrix[row];
-}
-
-void matrix_print(void)
-{
-  print("\nr/c 0123456789ABCDEF\n");
-  for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    print_hex8(row); print(": ");
-    print_bin_reverse16(matrix_get_row(row));
-    print("\n");
-  }
-}
-
-uint8_t matrix_key_count(void)
-{
-  uint8_t count = 0;
-  for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-    count += bitpop16(matrix[i]);
-  }
-  return count;
-}
-
-static void  init_cols(void)
-{
-  for(int x = 0; x < MATRIX_COLS; x++) {
-    _SFR_IO8((col_pins[x] >> 4) + 1) &=  ~_BV(col_pins[x] & 0xF);
-    _SFR_IO8((col_pins[x] >> 4) + 2) |= _BV(col_pins[x] & 0xF);
-  }
-}
-
-static matrix_row_t read_cols(void)
-{
-  matrix_row_t result = 0;
-  for(int x = 0; x < MATRIX_COLS; x++) {
-    result |= (_SFR_IO8(col_pins[x] >> 4) & _BV(col_pins[x] & 0xF)) ? 0 : (1 << x);
-  }
-  return result;
-}
-
-static void unselect_rows(void)
-{
-  for(int x = 0; x < ROWS_PER_HAND; x++) {
-    _SFR_IO8((row_pins[x] >> 4) + 1) &=  ~_BV(row_pins[x] & 0xF);
-    _SFR_IO8((row_pins[x] >> 4) + 2) |= _BV(row_pins[x] & 0xF);
-  }
-}
-
-static void select_row(uint8_t row)
-{
-  _SFR_IO8((row_pins[row] >> 4) + 1) |=  _BV(row_pins[row] & 0xF);
-  _SFR_IO8((row_pins[row] >> 4) + 2) &= ~_BV(row_pins[row] & 0xF);
-}
diff --git a/keyboards/dm9records/ergoinu/post_rules.mk b/keyboards/dm9records/ergoinu/post_rules.mk
deleted file mode 100644
index 02aa48104c..0000000000
--- a/keyboards/dm9records/ergoinu/post_rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-ifneq ($(strip $(ERGOINU)),)
-  ifeq ($(findstring promicroled, $(ERGOINU)), promicroled)
-    DISABLE_PROMICRO_LEDs = no
-  endif
-endif
-
-ifeq ($(strip $(DISABLE_PROMICRO_LEDs)), yes)
-  OPT_DEFS += -DDISABLE_PROMICRO_LEDs
-endif
diff --git a/keyboards/dm9records/ergoinu/readme.md b/keyboards/dm9records/ergoinu/readme.md
index de0a1c6c97..45f91dbac2 100644
--- a/keyboards/dm9records/ergoinu/readme.md
+++ b/keyboards/dm9records/ergoinu/readme.md
@@ -1,13 +1,12 @@
-ErgoInu
-===
+# ErgoInu
 
 ![ergoinu](https://i.imgur.com/4CCM8Vl.jpg)
 
 An (Not Portable But Small) Ergonomic Split Keyboard.
 
-Keyboard Maintainer: [hsgw](https://github.com/hsgw/)   [twitter](https://twitter.com/hsgw)  
-Hardware Supported: Pro Micro  
-Hardware Availability & Repository: [https://github.com/hsgw/ergoinu](https://github.com/hsgw/ergoinu)  
+* Keyboard Maintainer: [hsgw](https://github.com/hsgw/)   [twitter](https://twitter.com/hsgw)
+* Hardware Supported: Pro Micro
+* Hardware Availability & Repository: [https://github.com/hsgw/ergoinu](https://github.com/hsgw/ergoinu)
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/dm9records/ergoinu/rules.mk b/keyboards/dm9records/ergoinu/rules.mk
index 895ce253d7..9bdc73b761 100644
--- a/keyboards/dm9records/ergoinu/rules.mk
+++ b/keyboards/dm9records/ergoinu/rules.mk
@@ -5,25 +5,19 @@ MCU = atmega32u4
 BOOTLOADER = caterina
 
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
+#   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
-NKRO_ENABLE = no            # 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           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
-SUBPROJECT_rev1 = no
-USE_I2C = no               # i2c is not supported
+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
+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 = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
 
-CUSTOM_MATRIX = yes
-SRC += matrix.c serial.c split_util.c
-
-# ergoinu configs
-DISABLE_PROMICRO_LEDs = yes
+SPLIT_KEYBOARD = yes
diff --git a/keyboards/dm9records/ergoinu/serial.c b/keyboards/dm9records/ergoinu/serial.c
deleted file mode 100644
index 5919415877..0000000000
--- a/keyboards/dm9records/ergoinu/serial.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * WARNING: be careful changing this code, it is very timing dependent
- */
-
-#ifndef F_CPU
-#define F_CPU 16000000
-#endif
-
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <stdbool.h>
-#include "serial.h"
-
-#ifdef USE_SERIAL
-
-#define _delay_sub_us(x)    __builtin_avr_delay_cycles(x)
-
-// Serial pulse period in microseconds.
-#define SELECT_SERIAL_SPEED 1
-#if SELECT_SERIAL_SPEED == 0
-  // Very High speed
-  #define SERIAL_DELAY 4             // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #define READ_WRITE_WIDTH_ADJUST 10 // cycles
-#elif SELECT_SERIAL_SPEED == 1
-  // High speed
-  #define SERIAL_DELAY 6             // micro sec
-  #define READ_WRITE_START_ADJUST 23 // cycles
-  #define READ_WRITE_WIDTH_ADJUST 10 // cycles
-#elif SELECT_SERIAL_SPEED == 2
-  // Middle speed
-  #define SERIAL_DELAY 12            // micro sec
-  #define READ_WRITE_START_ADJUST 25 // cycles
-  #define READ_WRITE_WIDTH_ADJUST 10 // cycles
-#elif SELECT_SERIAL_SPEED == 3
-  // Low speed
-  #define SERIAL_DELAY 24            // micro sec
-  #define READ_WRITE_START_ADJUST 25 // cycles
-  #define READ_WRITE_WIDTH_ADJUST 10 // cycles
-#elif SELECT_SERIAL_SPEED == 4
-  // Very Low speed
-  #define SERIAL_DELAY 50            // micro sec
-  #define READ_WRITE_START_ADJUST 25 // cycles
-  #define READ_WRITE_WIDTH_ADJUST 10 // cycles
-#else
-#error Illegal Serial Speed
-#endif
-
-
-#define SERIAL_DELAY_HALF1 (SERIAL_DELAY/2)
-#define SERIAL_DELAY_HALF2 (SERIAL_DELAY - SERIAL_DELAY/2)
-
-#define SLAVE_INT_WIDTH 1
-#define SLAVE_INT_RESPONSE_TIME SERIAL_DELAY
-
-uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
-uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0};
-
-#define SLAVE_DATA_CORRUPT (1<<0)
-volatile uint8_t status = 0;
-
-inline static
-void serial_delay(void) {
-  _delay_us(SERIAL_DELAY);
-}
-
-inline static
-void serial_delay_half1(void) {
-  _delay_us(SERIAL_DELAY_HALF1);
-}
-
-inline static
-void serial_delay_half2(void) {
-  _delay_us(SERIAL_DELAY_HALF2);
-}
-
-inline static
-void serial_output(void) {
-  SERIAL_PIN_DDR |= SERIAL_PIN_MASK;
-}
-
-// make the serial pin an input with pull-up resistor
-inline static
-void serial_input_with_pullup(void) {
-  SERIAL_PIN_DDR  &= ~SERIAL_PIN_MASK;
-  SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
-}
-
-inline static
-uint8_t serial_read_pin(void) {
-  return !!(SERIAL_PIN_INPUT & SERIAL_PIN_MASK);
-}
-
-inline static
-void serial_low(void) {
-  SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK;
-}
-
-inline static
-void serial_high(void) {
-  SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
-}
-
-void serial_master_init(void) {
-  serial_output();
-  serial_high();
-}
-
-void serial_slave_init(void) {
-  serial_input_with_pullup();
-
-#if SERIAL_PIN_MASK == _BV(PD0)
-  // Enable INT0
-  EIMSK |= _BV(INT0);
-  // Trigger on falling edge of INT0
-  EICRA &= ~(_BV(ISC00) | _BV(ISC01));
-#elif SERIAL_PIN_MASK == _BV(PD2)
-  // Enable INT2
-  EIMSK |= _BV(INT2);
-  // Trigger on falling edge of INT2
-  EICRA &= ~(_BV(ISC20) | _BV(ISC21));
-#else
- #error unknown SERIAL_PIN_MASK value
-#endif
-}
-
-// Used by the sender to synchronize timing with the reciver.
-static
-void sync_recv(void) {
-  for (int i = 0; i < SERIAL_DELAY*5 && serial_read_pin(); i++ ) {
-  }
-  // This shouldn't hang if the slave disconnects because the
-  // serial line will float to high if the slave does disconnect.
-  while (!serial_read_pin());
-}
-
-// Used by the reciver to send a synchronization signal to the sender.
-static
-void sync_send(void) {
-  serial_low();
-  serial_delay();
-  serial_high();
-}
-
-// Reads a byte from the serial line
-static
-uint8_t serial_read_byte(void) {
-  uint8_t byte = 0;
-  _delay_sub_us(READ_WRITE_START_ADJUST);
-  for ( uint8_t i = 0; i < 8; ++i) {
-    serial_delay_half1();   // read the middle of pulses
-    byte = (byte << 1) | serial_read_pin();
-    _delay_sub_us(READ_WRITE_WIDTH_ADJUST);
-    serial_delay_half2();
-  }
-  return byte;
-}
-
-// Sends a byte with MSB ordering
-static
-void serial_write_byte(uint8_t data) {
-  uint8_t b = 1<<7;
-  while( b ) {
-    if(data & b) {
-      serial_high();
-    } else {
-      serial_low();
-    }
-    b >>= 1;
-    serial_delay();
-  }
-  serial_low(); // sync_send() / senc_recv() need raise edge
-}
-
-// interrupt handle to be used by the slave device
-ISR(SERIAL_PIN_INTERRUPT) {
-  serial_output();
-
-  // slave send phase
-  uint8_t checksum = 0;
-  for (int i = 0; i < SERIAL_SLAVE_BUFFER_LENGTH; ++i) {
-    sync_send();
-    serial_write_byte(serial_slave_buffer[i]);
-    checksum += serial_slave_buffer[i];
-  }
-  sync_send();
-  serial_write_byte(checksum);
-
-  // slave switch to input
-  sync_send(); //0
-  serial_delay_half1(); //1
-  serial_low();         //2
-  serial_input_with_pullup(); //2
-  serial_delay_half1(); //3
-
-  // slave recive phase
-  uint8_t checksum_computed = 0;
-  for (int i = 0; i < SERIAL_MASTER_BUFFER_LENGTH; ++i) {
-    sync_recv();
-    serial_master_buffer[i] = serial_read_byte();
-    checksum_computed += serial_master_buffer[i];
-  }
-  sync_recv();
-  uint8_t checksum_received = serial_read_byte();
-
-  if ( checksum_computed != checksum_received ) {
-    status |= SLAVE_DATA_CORRUPT;
-  } else {
-    status &= ~SLAVE_DATA_CORRUPT;
-  }
-
-  sync_recv(); //weit master output to high
-}
-
-inline
-bool serial_slave_DATA_CORRUPT(void) {
-  return status & SLAVE_DATA_CORRUPT;
-}
-
-// Copies the serial_slave_buffer to the master and sends the
-// serial_master_buffer to the slave.
-//
-// Returns:
-// 0 => no error
-// 1 => slave did not respond
-// 2 => checksum error
-int serial_update_buffers(void) {
-  // this code is very time dependent, so we need to disable interrupts
-  cli();
-
-  // signal to the slave that we want to start a transaction
-  serial_output();
-  serial_low();
-  _delay_us(SLAVE_INT_WIDTH);
-
-  // wait for the slaves response
-  serial_input_with_pullup();
-  _delay_us(SLAVE_INT_RESPONSE_TIME);
-
-  // check if the slave is present
-  if (serial_read_pin()) {
-    // slave failed to pull the line low, assume not present
-    serial_output();
-    serial_high();
-    sei();
-    return 1;
-  }
-
-  // master recive phase
-  // if the slave is present syncronize with it
-
-  uint8_t checksum_computed = 0;
-  // receive data from the slave
-  for (int i = 0; i < SERIAL_SLAVE_BUFFER_LENGTH; ++i) {
-    sync_recv();
-    serial_slave_buffer[i] = serial_read_byte();
-    checksum_computed += serial_slave_buffer[i];
-  }
-  sync_recv();
-  uint8_t checksum_received = serial_read_byte();
-
-  if (checksum_computed != checksum_received) {
-    serial_output();
-    serial_high();
-    sei();
-    return 2;
-  }
-
-  // master switch to output
-  sync_recv(); //0
-  serial_delay();  //1
-  serial_low();    //3
-  serial_output(); // 3
-  serial_delay_half1(); //4
-
-  // master send phase
-  uint8_t checksum = 0;
-
-  for (int i = 0; i < SERIAL_MASTER_BUFFER_LENGTH; ++i) {
-    sync_send();
-    serial_write_byte(serial_master_buffer[i]);
-    checksum += serial_master_buffer[i];
-  }
-  sync_send();
-  serial_write_byte(checksum);
-
-  // always, release the line when not in use
-  sync_send();
-
-  sei();
-  return 0;
-}
-
-#endif
diff --git a/keyboards/dm9records/ergoinu/serial.h b/keyboards/dm9records/ergoinu/serial.h
deleted file mode 100644
index 67cf06ac6b..0000000000
--- a/keyboards/dm9records/ergoinu/serial.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-
-// ////////////////////////////////////////////
-// Need Soft Serial defines in serial_config.h
-// ////////////////////////////////////////////
-// ex.
-//  #define SERIAL_PIN_DDR DDRD
-//  #define SERIAL_PIN_PORT PORTD
-//  #define SERIAL_PIN_INPUT PIND
-//  #define SERIAL_PIN_MASK _BV(PD?)   ?=0,2
-//  #define SERIAL_PIN_INTERRUPT INT?_vect  ?=0,2
-//  #define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-//  #define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2
-
-// Buffers for master - slave communication
-extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH];
-extern volatile uint8_t serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH];
-
-void serial_master_init(void);
-void serial_slave_init(void);
-int serial_update_buffers(void);
-bool serial_slave_data_corrupt(void);
diff --git a/keyboards/dm9records/ergoinu/serial_config.h b/keyboards/dm9records/ergoinu/serial_config.h
deleted file mode 100644
index a16db684ca..0000000000
--- a/keyboards/dm9records/ergoinu/serial_config.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-/* Soft Serial defines */
-#define SERIAL_PIN_DDR DDRD
-#define SERIAL_PIN_PORT PORTD
-#define SERIAL_PIN_INPUT PIND
-#define SERIAL_PIN_MASK _BV(PD2)
-#define SERIAL_PIN_INTERRUPT INT2_vect
-
-#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-#define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2
diff --git a/keyboards/dm9records/ergoinu/split_util.c b/keyboards/dm9records/ergoinu/split_util.c
deleted file mode 100644
index 0cbc2c69c4..0000000000
--- a/keyboards/dm9records/ergoinu/split_util.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/power.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <avr/eeprom.h>
-#include "split_util.h"
-#include "matrix.h"
-#include "keyboard.h"
-
-#include "serial.h"
-
-volatile bool isLeftHand = true;
-
-static void setup_handedness(void) {
-  #ifdef EE_HANDS
-    isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS);
-  #else
-    // I2C_MASTER_RIGHT is deprecated, use MASTER_RIGHT instead, since this works for both serial and i2c
-    #if defined(I2C_MASTER_RIGHT) || defined(MASTER_RIGHT)
-      isLeftHand = !has_usb();
-    #else
-      isLeftHand = has_usb();
-    #endif
-  #endif
-}
-
-static void keyboard_master_setup(void) {
-  serial_master_init();
-}
-
-static void keyboard_slave_setup(void) {
-  serial_slave_init();
-}
-
-bool has_usb(void) {
-   USBCON |= (1 << OTGPADE); //enables VBUS pad
-   _delay_us(5);
-   return (USBSTA & (1<<VBUS));  //checks state of VBUS
-}
-
-void split_keyboard_setup(void) {
-   setup_handedness();
-
-   if (has_usb()) {
-      keyboard_master_setup();
-   } else {
-      keyboard_slave_setup();
-   }
-   sei();
-}
-
-// this code runs before the usb and keyboard is initialized
-void matrix_setup(void) {
-    split_keyboard_setup();
-}
diff --git a/keyboards/dm9records/ergoinu/split_util.h b/keyboards/dm9records/ergoinu/split_util.h
deleted file mode 100644
index 11cfd5455a..0000000000
--- a/keyboards/dm9records/ergoinu/split_util.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include "eeconfig.h"
-
-extern volatile bool isLeftHand;
-
-// slave version of matix scan, defined in matrix.c
-void matrix_slave_scan(void);
-
-void split_keyboard_setup(void);
-bool has_usb(void);

From 2726856cde66856344de7790d750a332ace1070d Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 1 Dec 2021 01:34:08 +0000
Subject: [PATCH 006/867] Implement MAGIC_TOGGLE_CONTROL_CAPSLOCK (#15368)

---
 docs/keycodes.md                        | 1 +
 docs/keycodes_magic.md                  | 1 +
 quantum/process_keycode/process_magic.c | 4 ++++
 quantum/quantum_keycodes.h              | 3 +++
 4 files changed, 9 insertions(+)

diff --git a/docs/keycodes.md b/docs/keycodes.md
index ba06e1b8b6..2ea4fc74e2 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -326,6 +326,7 @@ See also: [Magic Keycodes](keycodes_magic.md)
 |----------------------------------|---------|--------------------------------------------------------------------------|
 |`MAGIC_SWAP_CONTROL_CAPSLOCK`     |`CL_SWAP`|Swap Caps Lock and Left Control                                           |
 |`MAGIC_UNSWAP_CONTROL_CAPSLOCK`   |`CL_NORM`|Unswap Caps Lock and Left Control                                         |
+|`MAGIC_TOGGLE_CONTROL_CAPSLOCK`   |`CL_TOGG`|Toggle Caps Lock and Left Control swap                                    |
 |`MAGIC_CAPSLOCK_TO_CONTROL`       |`CL_CTRL`|Treat Caps Lock as Control                                                |
 |`MAGIC_UNCAPSLOCK_TO_CONTROL`     |`CL_CAPS`|Stop treating Caps Lock as Control                                        |
 |`MAGIC_SWAP_LCTL_LGUI`            |`LCG_SWP`|Swap Left Control and GUI                                                 |
diff --git a/docs/keycodes_magic.md b/docs/keycodes_magic.md
index 7e1b1a4f62..01eb69168e 100644
--- a/docs/keycodes_magic.md
+++ b/docs/keycodes_magic.md
@@ -6,6 +6,7 @@
 |----------------------------------|---------|--------------------------------------------------------------------------|
 |`MAGIC_SWAP_CONTROL_CAPSLOCK`     |`CL_SWAP`|Swap Caps Lock and Left Control                                           |
 |`MAGIC_UNSWAP_CONTROL_CAPSLOCK`   |`CL_NORM`|Unswap Caps Lock and Left Control                                         |
+|`MAGIC_TOGGLE_CONTROL_CAPSLOCK`   |`CL_TOGG`|Toggle Caps Lock and Left Control swap                                    |
 |`MAGIC_CAPSLOCK_TO_CONTROL`       |`CL_CTRL`|Treat Caps Lock as Control                                                |
 |`MAGIC_UNCAPSLOCK_TO_CONTROL`     |`CL_CAPS`|Stop treating Caps Lock as Control                                        |
 |`MAGIC_SWAP_LCTL_LGUI`            |`LCG_SWP`|Swap Left Control and GUI                                                 |
diff --git a/quantum/process_keycode/process_magic.c b/quantum/process_keycode/process_magic.c
index d5cff4f12a..6332be647c 100644
--- a/quantum/process_keycode/process_magic.c
+++ b/quantum/process_keycode/process_magic.c
@@ -44,6 +44,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
             case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_TOGGLE_ALT_GUI:
             case MAGIC_SWAP_LCTL_LGUI ... MAGIC_EE_HANDS_RIGHT:
             case MAGIC_TOGGLE_GUI:
+            case MAGIC_TOGGLE_CONTROL_CAPSLOCK:
                 /* keymap config */
                 keymap_config.raw = eeconfig_read_keymap();
                 switch (keycode) {
@@ -168,6 +169,9 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
                     case MAGIC_TOGGLE_GUI:
                         keymap_config.no_gui = !keymap_config.no_gui;
                         break;
+                    case MAGIC_TOGGLE_CONTROL_CAPSLOCK:
+                        keymap_config.swap_control_capslock = !keymap_config.swap_control_capslock;
+                        break;
                 }
 
                 eeconfig_update_keymap(keymap_config.raw);
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index e4d0167aac..3950a3bcae 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -597,6 +597,8 @@ enum quantum_keycodes {
     MACRO_30,
     MACRO_31,
 
+    MAGIC_TOGGLE_CONTROL_CAPSLOCK,
+
     // Start of custom keycode range for keyboards and keymaps - always leave at the end
     SAFE_RANGE
 };
@@ -749,6 +751,7 @@ enum quantum_keycodes {
 #define CL_NORM MAGIC_UNSWAP_CONTROL_CAPSLOCK
 #define CL_CTRL MAGIC_CAPSLOCK_TO_CONTROL
 #define CL_CAPS MAGIC_UNCAPSLOCK_TO_CONTROL
+#define CL_TOGG MAGIC_TOGGLE_CONTROL_CAPSLOCK
 
 #define LCG_SWP MAGIC_SWAP_LCTL_LGUI
 #define LCG_NRM MAGIC_UNSWAP_LCTL_LGUI

From 3d06860f3cd8af5d9a2b4e9736b3024d0f37343f Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 1 Dec 2021 11:19:07 +0000
Subject: [PATCH 007/867] Convert not_so_minidox to SPLIT_KEYBOARD (#15306)

---
 keyboards/handwired/not_so_minidox/config.h   |   5 +
 keyboards/handwired/not_so_minidox/i2c.c      | 162 ----------
 keyboards/handwired/not_so_minidox/i2c.h      |  46 ---
 .../not_so_minidox/keymaps/default/keymap.c   |  56 +---
 keyboards/handwired/not_so_minidox/matrix.c   | 302 ------------------
 keyboards/handwired/not_so_minidox/rules.mk   |  27 +-
 keyboards/handwired/not_so_minidox/serial.c   | 228 -------------
 keyboards/handwired/not_so_minidox/serial.h   |  23 --
 .../handwired/not_so_minidox/split_util.c     |  84 -----
 .../handwired/not_so_minidox/split_util.h     |  17 -
 10 files changed, 21 insertions(+), 929 deletions(-)
 delete mode 100644 keyboards/handwired/not_so_minidox/i2c.c
 delete mode 100644 keyboards/handwired/not_so_minidox/i2c.h
 delete mode 100644 keyboards/handwired/not_so_minidox/matrix.c
 delete mode 100644 keyboards/handwired/not_so_minidox/serial.c
 delete mode 100644 keyboards/handwired/not_so_minidox/serial.h
 delete mode 100644 keyboards/handwired/not_so_minidox/split_util.c
 delete mode 100644 keyboards/handwired/not_so_minidox/split_util.h

diff --git a/keyboards/handwired/not_so_minidox/config.h b/keyboards/handwired/not_so_minidox/config.h
index de9286eda5..177552e2a6 100644
--- a/keyboards/handwired/not_so_minidox/config.h
+++ b/keyboards/handwired/not_so_minidox/config.h
@@ -40,6 +40,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define USE_SERIAL
 
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
 //#define EE_HANDS
 
 #define MASTER_LEFT
diff --git a/keyboards/handwired/not_so_minidox/i2c.c b/keyboards/handwired/not_so_minidox/i2c.c
deleted file mode 100644
index 084c890c40..0000000000
--- a/keyboards/handwired/not_so_minidox/i2c.c
+++ /dev/null
@@ -1,162 +0,0 @@
-#include <util/twi.h>
-#include <avr/io.h>
-#include <stdlib.h>
-#include <avr/interrupt.h>
-#include <util/twi.h>
-#include <stdbool.h>
-#include "i2c.h"
-
-#ifdef USE_I2C
-
-// Limits the amount of we wait for any one i2c transaction.
-// Since were running SCL line 100kHz (=> 10μs/bit), and each transactions is
-// 9 bits, a single transaction will take around 90μs to complete.
-//
-// (F_CPU/SCL_CLOCK)  =>  # of μC cycles to transfer a bit
-// poll loop takes at least 8 clock cycles to execute
-#define I2C_LOOP_TIMEOUT (9+1)*(F_CPU/SCL_CLOCK)/8
-
-#define BUFFER_POS_INC() (slave_buffer_pos = (slave_buffer_pos+1)%SLAVE_BUFFER_SIZE)
-
-volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
-
-static volatile uint8_t slave_buffer_pos;
-static volatile bool slave_has_register_set = false;
-
-// Wait for an i2c operation to finish
-inline static
-void i2c_delay(void) {
-  uint16_t lim = 0;
-  while(!(TWCR & (1<<TWINT)) && lim < I2C_LOOP_TIMEOUT)
-    lim++;
-
-  // easier way, but will wait slightly longer
-  // _delay_us(100);
-}
-
-// Setup twi to run at 100kHz
-void i2c_master_init(void) {
-  // no prescaler
-  TWSR = 0;
-  // Set TWI clock frequency to SCL_CLOCK. Need TWBR>10.
-  // Check datasheets for more info.
-  TWBR = ((F_CPU/SCL_CLOCK)-16)/2;
-}
-
-// Start a transaction with the given i2c slave address. The direction of the
-// transfer is set with I2C_READ and I2C_WRITE.
-// returns: 0 => success
-//          1 => error
-uint8_t i2c_master_start(uint8_t address) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTA);
-
-  i2c_delay();
-
-  // check that we started successfully
-  if ( (TW_STATUS != TW_START) && (TW_STATUS != TW_REP_START))
-    return 1;
-
-  TWDR = address;
-  TWCR = (1<<TWINT) | (1<<TWEN);
-
-  i2c_delay();
-
-  if ( (TW_STATUS != TW_MT_SLA_ACK) && (TW_STATUS != TW_MR_SLA_ACK) )
-    return 1; // slave did not acknowledge
-  else
-    return 0; // success
-}
-
-
-// Finish the i2c transaction.
-void i2c_master_stop(void) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (1<<TWSTO);
-
-  uint16_t lim = 0;
-  while(!(TWCR & (1<<TWSTO)) && lim < I2C_LOOP_TIMEOUT)
-    lim++;
-}
-
-// Write one byte to the i2c slave.
-// returns 0 => slave ACK
-//         1 => slave NACK
-uint8_t i2c_master_write(uint8_t data) {
-  TWDR = data;
-  TWCR = (1<<TWINT) | (1<<TWEN);
-
-  i2c_delay();
-
-  // check if the slave acknowledged us
-  return (TW_STATUS == TW_MT_DATA_ACK) ? 0 : 1;
-}
-
-// Read one byte from the i2c slave. If ack=1 the slave is acknowledged,
-// if ack=0 the acknowledge bit is not set.
-// returns: byte read from i2c device
-uint8_t i2c_master_read(int ack) {
-  TWCR = (1<<TWINT) | (1<<TWEN) | (ack<<TWEA);
-
-  i2c_delay();
-  return TWDR;
-}
-
-void i2c_reset_state(void) {
-  TWCR = 0;
-}
-
-void i2c_slave_init(uint8_t address) {
-  TWAR = address << 0; // slave i2c address
-  // TWEN  - twi enable
-  // TWEA  - enable address acknowledgement
-  // TWINT - twi interrupt flag
-  // TWIE  - enable the twi interrupt
-  TWCR = (1<<TWIE) | (1<<TWEA) | (1<<TWINT) | (1<<TWEN);
-}
-
-ISR(TWI_vect);
-
-ISR(TWI_vect) {
-  uint8_t ack = 1;
-  switch(TW_STATUS) {
-    case TW_SR_SLA_ACK:
-      // this device has been addressed as a slave receiver
-      slave_has_register_set = false;
-      break;
-
-    case TW_SR_DATA_ACK:
-      // this device has received data as a slave receiver
-      // The first byte that we receive in this transaction sets the location
-      // of the read/write location of the slaves memory that it exposes over
-      // i2c.  After that, bytes will be written at slave_buffer_pos, incrementing
-      // slave_buffer_pos after each write.
-      if(!slave_has_register_set) {
-        slave_buffer_pos = TWDR;
-        // don't acknowledge the master if this memory loctaion is out of bounds
-        if ( slave_buffer_pos >= SLAVE_BUFFER_SIZE ) {
-          ack = 0;
-          slave_buffer_pos = 0;
-        }
-        slave_has_register_set = true;
-      } else {
-        i2c_slave_buffer[slave_buffer_pos] = TWDR;
-        BUFFER_POS_INC();
-      }
-      break;
-
-    case TW_ST_SLA_ACK:
-    case TW_ST_DATA_ACK:
-      // master has addressed this device as a slave transmitter and is
-      // requesting data.
-      TWDR = i2c_slave_buffer[slave_buffer_pos];
-      BUFFER_POS_INC();
-      break;
-
-    case TW_BUS_ERROR: // something went wrong, reset twi state
-      TWCR = 0;
-    default:
-      break;
-  }
-  // Reset everything, so we are ready for the next TWI interrupt
-  TWCR |= (1<<TWIE) | (1<<TWINT) | (ack<<TWEA) | (1<<TWEN);
-}
-#endif
diff --git a/keyboards/handwired/not_so_minidox/i2c.h b/keyboards/handwired/not_so_minidox/i2c.h
deleted file mode 100644
index 8910e70f10..0000000000
--- a/keyboards/handwired/not_so_minidox/i2c.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-#ifndef F_CPU
-#define F_CPU 16000000UL
-#endif
-
-#define I2C_READ 1
-#define I2C_WRITE 0
-
-#define I2C_ACK 1
-#define I2C_NACK 0
-
-#define SLAVE_BUFFER_SIZE 0x10
-
-// i2c SCL clock frequency
-#define SCL_CLOCK  400000L
-
-extern volatile uint8_t i2c_slave_buffer[SLAVE_BUFFER_SIZE];
-
-void i2c_master_init(void);
-uint8_t i2c_master_start(uint8_t address);
-void i2c_master_stop(void);
-uint8_t i2c_master_write(uint8_t data);
-uint8_t i2c_master_read(int);
-void i2c_reset_state(void);
-void i2c_slave_init(uint8_t address);
-
-
-static inline unsigned char i2c_start_read(unsigned char addr) {
-  return i2c_master_start((addr << 1) | I2C_READ);
-}
-
-static inline unsigned char i2c_start_write(unsigned char addr) {
-  return i2c_master_start((addr << 1) | I2C_WRITE);
-}
-
-// from SSD1306 scrips
-extern unsigned char i2c_rep_start(unsigned char addr);
-extern void i2c_start_wait(unsigned char addr);
-extern unsigned char i2c_readAck(void);
-extern unsigned char i2c_readNak(void);
-extern unsigned char i2c_read(unsigned char ack);
-
-#define i2c_read(ack)  (ack) ? i2c_readAck() : i2c_readNak();
diff --git a/keyboards/handwired/not_so_minidox/keymaps/default/keymap.c b/keyboards/handwired/not_so_minidox/keymaps/default/keymap.c
index 296a7a281d..435eed2f1f 100644
--- a/keyboards/handwired/not_so_minidox/keymaps/default/keymap.c
+++ b/keyboards/handwired/not_so_minidox/keymaps/default/keymap.c
@@ -8,17 +8,10 @@
 #define _QWERTY 0
 #define _LOWER 1
 #define _RAISE 2
-#define _ADJUST 16
+#define _ADJUST 3
 
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-#define KC_LOWR LOWER
-#define KC_RASE RAISE
+#define KC_LOWR MO(_LOWER)
+#define KC_RASE MO(_RAISE)
 #define KC_RST  RESET
 #define KC_CAD  LCTL(LALT(KC_DEL))
 
@@ -72,45 +65,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   )
 };
 
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_ADJUST);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
 }
diff --git a/keyboards/handwired/not_so_minidox/matrix.c b/keyboards/handwired/not_so_minidox/matrix.c
deleted file mode 100644
index d2bbf7d303..0000000000
--- a/keyboards/handwired/not_so_minidox/matrix.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- * scan matrix
- */
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include "print.h"
-#include "debug.h"
-#include "util.h"
-#include "matrix.h"
-#include "split_util.h"
-#include "config.h"
-#include "quantum.h"
-
-#ifdef USE_I2C
-#  include "i2c.h"
-#else // USE_SERIAL
-#  include "serial.h"
-#endif
-
-#ifndef DEBOUNCE
-#  define DEBOUNCE	5
-#endif
-
-#define ERROR_DISCONNECT_COUNT 5
-
-static uint8_t debouncing = DEBOUNCE;
-static const int ROWS_PER_HAND = MATRIX_ROWS/2;
-static uint8_t error_count = 0;
-
-static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-
-static matrix_row_t read_cols(void);
-static void init_cols(void);
-static void unselect_rows(void);
-static void select_row(uint8_t row);
-
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void)
-{
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
-}
-
-void matrix_init(void)
-{
-    debug_enable = true;
-    debug_matrix = true;
-    debug_mouse = true;
-    // initialize row and col
-    unselect_rows();
-    init_cols();
-
-    setPinOutput(B0);
-    setPinOutput(D5);
-
-    // initialize matrix state: all keys off
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
-        matrix[i] = 0;
-        matrix_debouncing[i] = 0;
-    }
-
-    matrix_init_quantum();
-}
-
-uint8_t _matrix_scan(void)
-{
-    // Right hand is stored after the left in the matirx so, we need to offset it
-    int offset = isLeftHand ? 0 : (ROWS_PER_HAND);
-
-    for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
-        select_row(i);
-        _delay_us(30);  // without this wait read unstable value.
-        matrix_row_t cols = read_cols();
-        if (matrix_debouncing[i+offset] != cols) {
-            matrix_debouncing[i+offset] = cols;
-            debouncing = DEBOUNCE;
-        }
-        unselect_rows();
-    }
-
-    if (debouncing) {
-        if (--debouncing) {
-            _delay_ms(1);
-        } else {
-            for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
-                matrix[i+offset] = matrix_debouncing[i+offset];
-            }
-        }
-    }
-
-    return 1;
-}
-
-#ifdef USE_I2C
-
-// Get rows from other half over i2c
-int i2c_transaction(void) {
-    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-
-    int err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE);
-    if (err) goto i2c_error;
-
-    // start of matrix stored at 0x00
-    err = i2c_master_write(0x00);
-    if (err) goto i2c_error;
-
-    // Start read
-    err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
-    if (err) goto i2c_error;
-
-    if (!err) {
-        int i;
-        for (i = 0; i < ROWS_PER_HAND-1; ++i) {
-            matrix[slaveOffset+i] = i2c_master_read(I2C_ACK);
-        }
-        matrix[slaveOffset+i] = i2c_master_read(I2C_NACK);
-        i2c_master_stop();
-    } else {
-i2c_error: // the cable is disconnceted, or something else went wrong
-        i2c_reset_state();
-        return err;
-    }
-
-    return 0;
-}
-
-#else // USE_SERIAL
-
-int serial_transaction(void) {
-    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-
-    if (serial_update_buffers()) {
-        return 1;
-    }
-
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        matrix[slaveOffset+i] = serial_slave_buffer[i];
-    }
-    return 0;
-}
-#endif
-
-uint8_t matrix_scan(void)
-{
-    int ret = _matrix_scan();
-
-
-
-#ifdef USE_I2C
-    if( i2c_transaction() ) {
-#else // USE_SERIAL
-    if( serial_transaction() ) {
-#endif
-        // turn on the indicator led when halves are disconnected
-        writePinLow(D5);
-
-        error_count++;
-
-        if (error_count > ERROR_DISCONNECT_COUNT) {
-            // reset other half if disconnected
-            int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-            for (int i = 0; i < ROWS_PER_HAND; ++i) {
-                matrix[slaveOffset+i] = 0;
-            }
-        }
-    } else {
-        // turn off the indicator led on no error
-        writePinHigh(D5);
-        error_count = 0;
-    }
-    matrix_scan_quantum();
-    return ret;
-}
-
-void matrix_slave_scan(void) {
-    _matrix_scan();
-
-    int offset = (isLeftHand) ? 0 : (MATRIX_ROWS / 2);
-
-#ifdef USE_I2C
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        /* i2c_slave_buffer[i] = matrix[offset+i]; */
-        i2c_slave_buffer[i] = matrix[offset+i];
-    }
-#else // USE_SERIAL
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        serial_slave_buffer[i] = matrix[offset+i];
-    }
-#endif
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print("\nr/c 0123456789ABCDEF\n");
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_bin_reverse16(matrix_get_row(row));
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
-static void  init_cols(void)
-{
-    for(int x = 0; x < MATRIX_COLS; x++) {
-        _SFR_IO8((col_pins[x] >> 4) + 1) &=  ~_BV(col_pins[x] & 0xF);
-        _SFR_IO8((col_pins[x] >> 4) + 2) |= _BV(col_pins[x] & 0xF);
-    }
-}
-
-static matrix_row_t read_cols(void)
-{
-    matrix_row_t result = 0;
-    for(int x = 0; x < MATRIX_COLS; x++) {
-        result |= (_SFR_IO8(col_pins[x] >> 4) & _BV(col_pins[x] & 0xF)) ? 0 : (1 << x);
-    }
-    return result;
-}
-
-static void unselect_rows(void)
-{
-    for(int x = 0; x < ROWS_PER_HAND; x++) {
-        _SFR_IO8((row_pins[x] >> 4) + 1) &=  ~_BV(row_pins[x] & 0xF);
-        _SFR_IO8((row_pins[x] >> 4) + 2) |= _BV(row_pins[x] & 0xF);
-    }
-}
-
-static void select_row(uint8_t row)
-{
-    _SFR_IO8((row_pins[row] >> 4) + 1) |=  _BV(row_pins[row] & 0xF);
-    _SFR_IO8((row_pins[row] >> 4) + 2) &= ~_BV(row_pins[row] & 0xF);
-}
diff --git a/keyboards/handwired/not_so_minidox/rules.mk b/keyboards/handwired/not_so_minidox/rules.mk
index f322b2c914..0ce4c12edd 100644
--- a/keyboards/handwired/not_so_minidox/rules.mk
+++ b/keyboards/handwired/not_so_minidox/rules.mk
@@ -5,24 +5,19 @@ MCU = atmega32u4
 BOOTLOADER = caterina
 
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
+#   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = no       # Audio control and System control
+EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # 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           # Audio output
-RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight. 
-USE_I2C = no
+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
+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
+AUDIO_ENABLE = no           # Audio output
 
-CUSTOM_MATRIX = yes
-SRC += matrix.c \
-	   i2c.c \
-	   split_util.c \
-	   serial.c
+SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/not_so_minidox/serial.c b/keyboards/handwired/not_so_minidox/serial.c
deleted file mode 100644
index 74bcbb6bf6..0000000000
--- a/keyboards/handwired/not_so_minidox/serial.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * WARNING: be careful changing this code, it is very timing dependent
- */
-
-#ifndef F_CPU
-#define F_CPU 16000000
-#endif
-
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <stdbool.h>
-#include "serial.h"
-
-#ifndef USE_I2C
-
-// Serial pulse period in microseconds. Its probably a bad idea to lower this
-// value.
-#define SERIAL_DELAY 24
-
-uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
-uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0};
-
-#define SLAVE_DATA_CORRUPT (1<<0)
-volatile uint8_t status = 0;
-
-inline static
-void serial_delay(void) {
-  _delay_us(SERIAL_DELAY);
-}
-
-inline static
-void serial_output(void) {
-  SERIAL_PIN_DDR |= SERIAL_PIN_MASK;
-}
-
-// make the serial pin an input with pull-up resistor
-inline static
-void serial_input(void) {
-  SERIAL_PIN_DDR  &= ~SERIAL_PIN_MASK;
-  SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
-}
-
-inline static
-uint8_t serial_read_pin(void) {
-  return !!(SERIAL_PIN_INPUT & SERIAL_PIN_MASK);
-}
-
-inline static
-void serial_low(void) {
-  SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK;
-}
-
-inline static
-void serial_high(void) {
-  SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
-}
-
-void serial_master_init(void) {
-  serial_output();
-  serial_high();
-}
-
-void serial_slave_init(void) {
-  serial_input();
-
-  // Enable INT0
-  EIMSK |= _BV(INT0);
-  // Trigger on falling edge of INT0
-  EICRA &= ~(_BV(ISC00) | _BV(ISC01));
-}
-
-// Used by the master to synchronize timing with the slave.
-static
-void sync_recv(void) {
-  serial_input();
-  // This shouldn't hang if the slave disconnects because the
-  // serial line will float to high if the slave does disconnect.
-  while (!serial_read_pin());
-  serial_delay();
-}
-
-// Used by the slave to send a synchronization signal to the master.
-static
-void sync_send(void) {
-  serial_output();
-
-  serial_low();
-  serial_delay();
-
-  serial_high();
-}
-
-// Reads a byte from the serial line
-static
-uint8_t serial_read_byte(void) {
-  uint8_t byte = 0;
-  serial_input();
-  for ( uint8_t i = 0; i < 8; ++i) {
-    byte = (byte << 1) | serial_read_pin();
-    serial_delay();
-    _delay_us(1);
-  }
-
-  return byte;
-}
-
-// Sends a byte with MSB ordering
-static
-void serial_write_byte(uint8_t data) {
-  uint8_t b = 8;
-  serial_output();
-  while( b-- ) {
-    if(data & (1 << b)) {
-      serial_high();
-    } else {
-      serial_low();
-    }
-    serial_delay();
-  }
-}
-
-// interrupt handle to be used by the slave device
-ISR(SERIAL_PIN_INTERRUPT) {
-  sync_send();
-
-  uint8_t checksum = 0;
-  for (int i = 0; i < SERIAL_SLAVE_BUFFER_LENGTH; ++i) {
-    serial_write_byte(serial_slave_buffer[i]);
-    sync_send();
-    checksum += serial_slave_buffer[i];
-  }
-  serial_write_byte(checksum);
-  sync_send();
-
-  // wait for the sync to finish sending
-  serial_delay();
-
-  // read the middle of pulses
-  _delay_us(SERIAL_DELAY/2);
-
-  uint8_t checksum_computed = 0;
-  for (int i = 0; i < SERIAL_MASTER_BUFFER_LENGTH; ++i) {
-    serial_master_buffer[i] = serial_read_byte();
-    sync_send();
-    checksum_computed += serial_master_buffer[i];
-  }
-  uint8_t checksum_received = serial_read_byte();
-  sync_send();
-
-  serial_input(); // end transaction
-
-  if ( checksum_computed != checksum_received ) {
-    status |= SLAVE_DATA_CORRUPT;
-  } else {
-    status &= ~SLAVE_DATA_CORRUPT;
-  }
-}
-
-inline
-bool serial_slave_DATA_CORRUPT(void) {
-  return status & SLAVE_DATA_CORRUPT;
-}
-
-// Copies the serial_slave_buffer to the master and sends the
-// serial_master_buffer to the slave.
-//
-// Returns:
-// 0 => no error
-// 1 => slave did not respond
-int serial_update_buffers(void) {
-  // this code is very time dependent, so we need to disable interrupts
-  cli();
-
-  // signal to the slave that we want to start a transaction
-  serial_output();
-  serial_low();
-  _delay_us(1);
-
-  // wait for the slaves response
-  serial_input();
-  serial_high();
-  _delay_us(SERIAL_DELAY);
-
-  // check if the slave is present
-  if (serial_read_pin()) {
-    // slave failed to pull the line low, assume not present
-    sei();
-    return 1;
-  }
-
-  // if the slave is present syncronize with it
-  sync_recv();
-
-  uint8_t checksum_computed = 0;
-  // receive data from the slave
-  for (int i = 0; i < SERIAL_SLAVE_BUFFER_LENGTH; ++i) {
-    serial_slave_buffer[i] = serial_read_byte();
-    sync_recv();
-    checksum_computed += serial_slave_buffer[i];
-  }
-  uint8_t checksum_received = serial_read_byte();
-  sync_recv();
-
-  if (checksum_computed != checksum_received) {
-    sei();
-    return 1;
-  }
-
-  uint8_t checksum = 0;
-  // send data to the slave
-  for (int i = 0; i < SERIAL_MASTER_BUFFER_LENGTH; ++i) {
-    serial_write_byte(serial_master_buffer[i]);
-    sync_recv();
-    checksum += serial_master_buffer[i];
-  }
-  serial_write_byte(checksum);
-  sync_recv();
-
-  // always, release the line when not in use
-  serial_output();
-  serial_high();
-
-  sei();
-  return 0;
-}
-
-#endif
diff --git a/keyboards/handwired/not_so_minidox/serial.h b/keyboards/handwired/not_so_minidox/serial.h
deleted file mode 100644
index 28fcc56ce7..0000000000
--- a/keyboards/handwired/not_so_minidox/serial.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "config.h"
-#include <stdbool.h>
-
-/* TODO:  some defines for interrupt setup */
-#define SERIAL_PIN_DDR DDRD
-#define SERIAL_PIN_PORT PORTD
-#define SERIAL_PIN_INPUT PIND
-#define SERIAL_PIN_MASK _BV(PD0)
-#define SERIAL_PIN_INTERRUPT INT0_vect
-
-#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-#define SERIAL_MASTER_BUFFER_LENGTH 1
-
-// Buffers for master - slave communication
-extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH];
-extern volatile uint8_t serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH];
-
-void serial_master_init(void);
-void serial_slave_init(void);
-int serial_update_buffers(void);
-bool serial_slave_data_corrupt(void);
diff --git a/keyboards/handwired/not_so_minidox/split_util.c b/keyboards/handwired/not_so_minidox/split_util.c
deleted file mode 100644
index 39639c3b4b..0000000000
--- a/keyboards/handwired/not_so_minidox/split_util.c
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/power.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <avr/eeprom.h>
-#include "split_util.h"
-#include "matrix.h"
-#include "keyboard.h"
-#include "config.h"
-
-#ifdef USE_I2C
-#  include "i2c.h"
-#else
-#  include "serial.h"
-#endif
-
-volatile bool isLeftHand = true;
-
-static void setup_handedness(void) {
-  #ifdef EE_HANDS
-    isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS);
-  #else
-    // I2C_MASTER_RIGHT is deprecated, use MASTER_RIGHT instead, since this works for both serial and i2c
-    #if defined(I2C_MASTER_RIGHT) || defined(MASTER_RIGHT)
-      isLeftHand = !has_usb();
-    #else
-      isLeftHand = has_usb();
-    #endif
-  #endif
-}
-
-static void keyboard_master_setup(void) {
-#ifdef USE_I2C
-    i2c_master_init();
-#ifdef SSD1306OLED
-    matrix_master_OLED_init ();
-#endif
-#else
-    serial_master_init();
-#endif
-}
-
-static void keyboard_slave_setup(void) {
-#ifdef USE_I2C
-    i2c_slave_init(SLAVE_I2C_ADDRESS);
-#else
-    serial_slave_init();
-#endif
-}
-
-bool has_usb(void) {
-   USBCON |= (1 << OTGPADE); //enables VBUS pad
-   _delay_us(5);
-   return (USBSTA & (1<<VBUS));  //checks state of VBUS
-}
-
-void split_keyboard_setup(void) {
-   setup_handedness();
-
-   if (has_usb()) {
-      keyboard_master_setup();
-   } else {
-      keyboard_slave_setup();
-   }
-   sei();
-}
-
-void keyboard_slave_loop(void) {
-   matrix_init();
-
-   while (1) {
-      matrix_slave_scan();
-   }
-}
-
-// this code runs before the usb and keyboard is initialized
-void matrix_setup(void) {
-    split_keyboard_setup();
-
-    if (!has_usb()) {
-        keyboard_slave_loop();
-    }
-}
diff --git a/keyboards/handwired/not_so_minidox/split_util.h b/keyboards/handwired/not_so_minidox/split_util.h
deleted file mode 100644
index 807412cd38..0000000000
--- a/keyboards/handwired/not_so_minidox/split_util.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include "eeconfig.h"
-
-#define SLAVE_I2C_ADDRESS           0x32
-
-extern volatile bool isLeftHand;
-
-// slave version of matix scan, defined in matrix.c
-void matrix_slave_scan(void);
-
-void split_keyboard_setup(void);
-bool has_usb(void);
-void keyboard_slave_loop(void);
-
-void matrix_master_OLED_init (void);

From 1493e6d3f04387f7dc460836cac724703cb947e2 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 1 Dec 2021 11:19:14 +0000
Subject: [PATCH 008/867] Convert ai03/orbit to SPLIT_KEYBOARD (#15340)

---
 keyboards/ai03/orbit/config.h                 |  13 +-
 keyboards/ai03/orbit/keymaps/default/keymap.c |  16 +-
 keyboards/ai03/orbit/matrix.c                 | 323 -----------
 keyboards/ai03/orbit/orbit.c                  | 270 ++++-----
 keyboards/ai03/orbit/orbit.h                  |  17 +-
 keyboards/ai03/orbit/readme.md                |   6 +-
 keyboards/ai03/orbit/rules.mk                 |  10 +-
 keyboards/ai03/orbit/serial.c                 | 545 ------------------
 keyboards/ai03/orbit/serial.h                 |  62 --
 keyboards/ai03/orbit/split_flags.c            |   5 -
 keyboards/ai03/orbit/split_flags.h            |  15 -
 keyboards/ai03/orbit/split_util.c             |  87 ---
 keyboards/ai03/orbit/split_util.h             |  10 -
 keyboards/ai03/orbit/transport.c              | 238 --------
 keyboards/ai03/orbit/transport.h              |  42 --
 15 files changed, 115 insertions(+), 1544 deletions(-)
 delete mode 100644 keyboards/ai03/orbit/matrix.c
 delete mode 100644 keyboards/ai03/orbit/serial.c
 delete mode 100644 keyboards/ai03/orbit/serial.h
 delete mode 100644 keyboards/ai03/orbit/split_flags.c
 delete mode 100644 keyboards/ai03/orbit/split_flags.h
 delete mode 100644 keyboards/ai03/orbit/split_util.c
 delete mode 100644 keyboards/ai03/orbit/split_util.h
 delete mode 100644 keyboards/ai03/orbit/transport.c
 delete mode 100644 keyboards/ai03/orbit/transport.h

diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h
index 9ad384c8ff..0e4f4c3baf 100644
--- a/keyboards/ai03/orbit/config.h
+++ b/keyboards/ai03/orbit/config.h
@@ -44,13 +44,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { C7, B4, D7, D6, D4, F1, F0 }
 #define MATRIX_ROW_PINS_RIGHT { B6, B5, B4, D7, E6 }
 #define MATRIX_COL_PINS_RIGHT { D4, D6, F1, F0, F4, F5, C6 }
-
-#define SPLIT_HAND_PIN D5
-
-//#define USE_I2C
-
-#define SELECT_SOFT_SERIAL_SPEED 1
-
 #define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
@@ -60,6 +53,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
 #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define SELECT_SOFT_SERIAL_SPEED 1
+
+#define SPLIT_LED_STATE_ENABLE
+#define SPLIT_LAYER_STATE_ENABLE
+
+#define SPLIT_HAND_PIN D5
 
 #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
diff --git a/keyboards/ai03/orbit/keymaps/default/keymap.c b/keyboards/ai03/orbit/keymaps/default/keymap.c
index 6d4eef27c7..0c93f04897 100644
--- a/keyboards/ai03/orbit/keymaps/default/keymap.c
+++ b/keyboards/ai03/orbit/keymaps/default/keymap.c
@@ -48,25 +48,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 	switch (keycode) {
 		case MANUAL:
-			if (record->event.pressed) 
-			{
-				// Keypress
+			if (record->event.pressed) {
 				SEND_STRING("https://kb.ai03.me/redir/orbit");
-			} 
-			else 
-			{
-				// Key release
 			}
 			break;
 		case DBLZERO:
-			if (record->event.pressed) 
-			{
-				// Keypress
+			if (record->event.pressed) {
 				SEND_STRING("00");
-			} 
-			else 
-			{
-				// Key release
 			}
 			break;
   }
diff --git a/keyboards/ai03/orbit/matrix.c b/keyboards/ai03/orbit/matrix.c
deleted file mode 100644
index 024233524c..0000000000
--- a/keyboards/ai03/orbit/matrix.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- * scan matrix
- */
-#include <stdint.h>
-#include <stdbool.h>
-#include "wait.h"
-#include "util.h"
-#include "matrix.h"
-#include "split_util.h"
-#include "config.h"
-#include "split_flags.h"
-#include "quantum.h"
-#include "debounce.h"
-#include "transport.h"
-
-#if (MATRIX_COLS <= 8)
-#  define print_matrix_header() print("\nr/c 01234567\n")
-#  define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
-#  define matrix_bitpop(i) bitpop(matrix[i])
-#  define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-#  define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
-#  define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
-#  define matrix_bitpop(i) bitpop16(matrix[i])
-#  define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-#  define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-#  define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
-#  define matrix_bitpop(i) bitpop32(matrix[i])
-#  define ROW_SHIFTER ((uint32_t)1)
-#endif
-
-#define ERROR_DISCONNECT_COUNT 5
-
-//#define ROWS_PER_HAND (MATRIX_ROWS / 2)
-
-#ifdef DIRECT_PINS
-static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
-#else
-static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-#endif
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t raw_matrix[ROWS_PER_HAND];
-
-// row offsets for each hand
-uint8_t thisHand, thatHand;
-
-// user-defined overridable functions
-
-__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
-
-__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
-
-__attribute__((weak)) void matrix_init_user(void) {}
-
-__attribute__((weak)) void matrix_scan_user(void) {}
-
-__attribute__((weak)) void matrix_slave_scan_user(void) {}
-
-// helper functions
-
-inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
-
-inline uint8_t matrix_cols(void) { return MATRIX_COLS; }
-
-inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
-
-inline matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
-
-void matrix_print(void) {
-  print_matrix_header();
-
-  for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-    print_hex8(row);
-    print(": ");
-    print_matrix_row(row);
-    print("\n");
-  }
-}
-
-uint8_t matrix_key_count(void) {
-  uint8_t count = 0;
-  for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-    count += matrix_bitpop(i);
-  }
-  return count;
-}
-
-// matrix code
-
-#ifdef DIRECT_PINS
-
-static void init_pins(void) {
-  for (int row = 0; row < MATRIX_ROWS; row++) {
-    for (int col = 0; col < MATRIX_COLS; col++) {
-      pin_t pin = direct_pins[row][col];
-      if (pin != NO_PIN) {
-        setPinInputHigh(pin);
-      }
-    }
-  }
-}
-
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
-  matrix_row_t last_row_value = current_matrix[current_row];
-  current_matrix[current_row] = 0;
-
-  for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
-    pin_t pin = direct_pins[current_row][col_index];
-    if (pin != NO_PIN) {
-      current_matrix[current_row] |= readPin(pin) ? 0 : (ROW_SHIFTER << col_index);
-    }
-  }
-
-  return (last_row_value != current_matrix[current_row]);
-}
-
-#elif (DIODE_DIRECTION == COL2ROW)
-
-static void select_row(uint8_t row) {
-  setPinOutput(row_pins[row]);
-  writePinLow(row_pins[row]);
-}
-
-static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
-
-static void unselect_rows(void) {
-  for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
-    setPinInputHigh(row_pins[x]);
-  }
-}
-
-static void init_pins(void) {
-  unselect_rows();
-  for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-    setPinInputHigh(col_pins[x]);
-  }
-}
-
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
-  // Store last value of row prior to reading
-  matrix_row_t last_row_value = current_matrix[current_row];
-
-  // Clear data in matrix row
-  current_matrix[current_row] = 0;
-
-  // Select row and wait for row selecton to stabilize
-  select_row(current_row);
-  wait_us(30);
-
-  // For each col...
-  for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
-    // Populate the matrix row with the state of the col pin
-    current_matrix[current_row] |= readPin(col_pins[col_index]) ? 0 : (ROW_SHIFTER << col_index);
-  }
-
-  // Unselect row
-  unselect_row(current_row);
-
-  return (last_row_value != current_matrix[current_row]);
-}
-
-#elif (DIODE_DIRECTION == ROW2COL)
-
-static void select_col(uint8_t col) {
-  setPinOutput(col_pins[col]);
-  writePinLow(col_pins[col]);
-}
-
-static void unselect_col(uint8_t col) { setPinInputHigh(col_pins[col]); }
-
-static void unselect_cols(void) {
-  for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-    setPinInputHigh(col_pins[x]);
-  }
-}
-
-static void init_pins(void) {
-  unselect_cols();
-  for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
-    setPinInputHigh(row_pins[x]);
-  }
-}
-
-static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
-  bool matrix_changed = false;
-
-  // Select col and wait for col selecton to stabilize
-  select_col(current_col);
-  wait_us(30);
-
-  // For each row...
-  for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
-    // Store last value of row prior to reading
-    matrix_row_t last_row_value = current_matrix[row_index];
-
-    // Check row pin state
-    if (readPin(row_pins[row_index])) {
-      // Pin HI, clear col bit
-      current_matrix[row_index] &= ~(ROW_SHIFTER << current_col);
-    } else {
-      // Pin LO, set col bit
-      current_matrix[row_index] |= (ROW_SHIFTER << current_col);
-    }
-
-    // Determine if the matrix changed state
-    if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
-      matrix_changed = true;
-    }
-  }
-
-  // Unselect col
-  unselect_col(current_col);
-
-  return matrix_changed;
-}
-
-#endif
-
-void matrix_init(void) {
-  debug_enable = true;
-  debug_matrix = true;
-  debug_mouse  = true;
-
-  // Set pinout for right half if pinout for that half is defined
-  if (!isLeftHand) {
-#ifdef MATRIX_ROW_PINS_RIGHT
-    const uint8_t row_pins_right[MATRIX_ROWS] = MATRIX_ROW_PINS_RIGHT;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-      row_pins[i] = row_pins_right[i];
-    }
-#endif
-#ifdef MATRIX_COL_PINS_RIGHT
-    const uint8_t col_pins_right[MATRIX_COLS] = MATRIX_COL_PINS_RIGHT;
-    for (uint8_t i = 0; i < MATRIX_COLS; i++) {
-      col_pins[i] = col_pins_right[i];
-    }
-#endif
-  }
-
-  thisHand = isLeftHand ? 0 : (ROWS_PER_HAND);
-  thatHand = ROWS_PER_HAND - thisHand;
-
-  // initialize key pins
-  init_pins();
-
-  // initialize matrix state: all keys off
-  for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-    matrix[i] = 0;
-  }
-
-  debounce_init(ROWS_PER_HAND);
-
-  matrix_init_quantum();
-}
-
-uint8_t _matrix_scan(void) {
-  bool changed = false;
-
-#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
-  // Set row, read cols
-  for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) {
-    changed |= read_cols_on_row(raw_matrix, current_row);
-  }
-#elif (DIODE_DIRECTION == ROW2COL)
-  // Set col, read rows
-  for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
-    changed |= read_rows_on_col(raw_matrix, current_col);
-  }
-#endif
-
-  debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed);
-
-  return 1;
-}
-
-uint8_t matrix_scan(void) {
-  uint8_t ret = _matrix_scan();
-
-  if (is_keyboard_master()) {
-    static uint8_t error_count;
-
-    if (!transport_master(matrix + thatHand)) {
-      error_count++;
-
-      if (error_count > ERROR_DISCONNECT_COUNT) {
-        // reset other half if disconnected
-        for (int i = 0; i < ROWS_PER_HAND; ++i) {
-          matrix[thatHand + i] = 0;
-        }
-      }
-    } else {
-      error_count = 0;
-    }
-
-    matrix_scan_quantum();
-  } else {
-    transport_slave(matrix + thisHand);
-    matrix_slave_scan_user();
-  }
-
-  return ret;
-}
diff --git a/keyboards/ai03/orbit/orbit.c b/keyboards/ai03/orbit/orbit.c
index 97553e318a..5097f9cd90 100644
--- a/keyboards/ai03/orbit/orbit.c
+++ b/keyboards/ai03/orbit/orbit.c
@@ -15,196 +15,124 @@
  */
 #include "orbit.h"
 #include "split_util.h"
-#include "transport.h"
 
+void led_init_ports(void) {
+    // Initialize indicator LEDs to output
+    if (isLeftHand) {
+        setPinOutput(C6);
+        setPinOutput(B6);
+        setPinOutput(B5);
+    } else {
+        setPinOutput(F6);
+        setPinOutput(F7);
+        setPinOutput(C7);
+    }
+
+    set_layer_indicators(0);
+}
 
 // Call led_toggle to set LEDs easily
 // LED IDs:
-// 
+//
 // (LEFT) 0 1 2   |   3 4 5 (RIGHT)
-
-void led_toggle(int id, bool on) {
-	
-	if (isLeftHand) {
-		switch(id) {
-			case 0:
-				// Left hand C6
-				if (on)
-					//PORTC |= (1<<6);
-					writePinHigh(C6);
-				else
-					//PORTC &= ~(1<<6);
-					writePinLow(C6);
-				break;
-			case 1:
-				// Left hand B6
-				if (on)
-					//PORTB |= (1<<6);
-					writePinHigh(B6);
-				else
-					//PORTB &= ~(1<<6);
-					writePinLow(B6);
-				break;
-			case 2:
-				// Left hand B5
-				if (on)
-					//PORTB |= (1<<5);
-					writePinHigh(B5);
-				else
-					//PORTB &= ~(1<<5);
-					writePinLow(B5);
-				break;
-			default:
-				break;
-		}
-	} else {
-		switch(id) {
-			case 3:
-				// Right hand F6
-				if (on)
-					//PORTF |= (1<<6);
-					writePinHigh(F6);
-				else
-					//PORTF &= ~(1<<6);
-					writePinLow(F6);
-				break;
-			case 4:
-				// Right hand F7
-				if (on)
-					//PORTF |= (1<<7);
-					writePinHigh(F7);
-				else
-					//PORTF &= ~(1<<7);
-					writePinLow(F7);
-				break;
-			case 5:
-				// Right hand C7
-				if (on)
-					//PORTC |= (1<<7);
-					writePinHigh(C7);
-				else
-					//PORTC &= ~(1<<7);
-					writePinLow(C7);
-				break;
-			default:
-				break;
-		}
-	}
+void led_toggle(uint8_t id, bool on) {
+    if (isLeftHand) {
+        switch (id) {
+            case 0:
+                // Left hand C6
+                writePin(C6, on);
+                break;
+            case 1:
+                // Left hand B6
+                writePin(B6, on);
+                break;
+            case 2:
+                // Left hand B5
+                writePin(B5, on);
+                break;
+            default:
+                break;
+        }
+    } else {
+        switch (id) {
+            case 3:
+                // Right hand F6
+                writePin(F6, on);
+                break;
+            case 4:
+                // Right hand F7
+                writePin(F7, on);
+                break;
+            case 5:
+                // Right hand C7
+                writePin(C7, on);
+                break;
+            default:
+                break;
+        }
+    }
 }
 
 // Set all LEDs at once using an array of 6 booleans
 // LED IDs:
-// 
+//
 // (LEFT) 0 1 2   |   3 4 5 (RIGHT)
-// 
+//
 // Ex. set_all_leds({ false, false, false, true, true, true }) would turn off left hand, turn on right hand
 
 void set_all_leds(bool leds[6]) {
-	for (int i = 0; i < 6; i++) {
-		led_toggle(i, leds[i]);
-	}
+    for (int i = 0; i < 6; i++) {
+        led_toggle(i, leds[i]);
+    }
 }
 
 void set_layer_indicators(uint8_t layer) {
-	
-	switch (layer)
-	{
-		case 0:
-			led_toggle(0, true);
-			led_toggle(1, false);
-			led_toggle(2, false);
-			break;
-		case 1:
-			led_toggle(0, true);
-			led_toggle(1, true);
-			led_toggle(2, false);
-			break;
-		case 2:
-			led_toggle(0, true);
-			led_toggle(1, true);
-			led_toggle(2, true);
-			break;
-		case 3:
-			led_toggle(0, false);
-			led_toggle(1, true);
-			led_toggle(2, true);
-			break;
-		case 4:
-			led_toggle(0, false);
-			led_toggle(1, false);
-			led_toggle(2, true);
-			break;
-		default:
-			led_toggle(0, true);
-			led_toggle(1, false);
-			led_toggle(2, true);
-			break;
-	}
-	
+    switch (layer) {
+        case 0:
+            led_toggle(0, true);
+            led_toggle(1, false);
+            led_toggle(2, false);
+            break;
+        case 1:
+            led_toggle(0, true);
+            led_toggle(1, true);
+            led_toggle(2, false);
+            break;
+        case 2:
+            led_toggle(0, true);
+            led_toggle(1, true);
+            led_toggle(2, true);
+            break;
+        case 3:
+            led_toggle(0, false);
+            led_toggle(1, true);
+            led_toggle(2, true);
+            break;
+        case 4:
+            led_toggle(0, false);
+            led_toggle(1, false);
+            led_toggle(2, true);
+            break;
+        default:
+            led_toggle(0, true);
+            led_toggle(1, false);
+            led_toggle(2, true);
+            break;
+    }
 }
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	
-	// Initialize indicator LEDs to output
-	if (isLeftHand)
-	{
-		setPinOutput(C6);
-		setPinOutput(B6);
-		setPinOutput(B5);
-		//DDRC |= (1<<6);
-		//DDRB |= (1<<6);
-		//DDRB |= (1<<5);
-	}
-	else
-	{
-		setPinOutput(F6);
-		setPinOutput(F7);
-		setPinOutput(C7);
-		//DDRF |= (1<<6);
-		//DDRF |= (1<<7);
-		//DDRC |= (1<<7);
-	}
-
-	set_layer_indicators(0);
-	
-	matrix_init_user();
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        led_toggle(3, led_state.num_lock);
+        led_toggle(4, led_state.caps_lock);
+        led_toggle(5, led_state.scroll_lock);
+    }
+    return res;
 }
 
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-	
-	if (is_keyboard_master()) {
-	
-		serial_m2s_buffer.nlock_led = IS_LED_ON(usb_led, USB_LED_NUM_LOCK);
-		serial_m2s_buffer.clock_led = IS_LED_ON(usb_led, USB_LED_CAPS_LOCK);
-		serial_m2s_buffer.slock_led = IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK);
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    set_layer_indicators(get_highest_layer(state));
 
-		led_toggle(3, IS_LED_ON(usb_led, USB_LED_NUM_LOCK));
-		led_toggle(4, IS_LED_ON(usb_led, USB_LED_CAPS_LOCK));
-		led_toggle(5, IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK));
-		
-	}
-
-	led_set_user(usb_led);
-}
-
-uint32_t layer_state_set_kb(uint32_t state) {
-	
-	if (is_keyboard_master())
-	{
-		serial_m2s_buffer.current_layer = biton32(state);
-		
-		// If left half, do the LED toggle thing
-		if (isLeftHand)
-		{
-			set_layer_indicators(biton32(state));
-		}
-		
-	}
-	// NOTE: Do not set slave LEDs here.
-	// This is not called on slave
-	
-	return layer_state_set_user(state);
+    return layer_state_set_user(state);
 }
diff --git a/keyboards/ai03/orbit/orbit.h b/keyboards/ai03/orbit/orbit.h
index 39f1ebb0e3..7f3b1aca32 100644
--- a/keyboards/ai03/orbit/orbit.h
+++ b/keyboards/ai03/orbit/orbit.h
@@ -18,6 +18,8 @@
 
 #include "quantum.h"
 
+#define XXX KC_NO
+
 /* This a shortcut to help you visually see your layout.
  *
  * The first section contains all of the arguments representing the physical
@@ -26,17 +28,6 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
- 
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-  #include <avr/io.h>
-  #include <avr/interrupt.h>
-#endif
-#endif
-
-#define XXX KC_NO
-
 #define LAYOUT( \
     L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
     L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
@@ -56,6 +47,6 @@
     { R40, R41, R42, R43, R44, R45, XXX } \
 }
 
-extern void led_toggle(int id, bool on);
+void led_toggle(uint8_t id, bool on);
 void set_all_leds(bool leds[6]);
-extern void set_layer_indicators(uint8_t layer);
+void set_layer_indicators(uint8_t layer);
diff --git a/keyboards/ai03/orbit/readme.md b/keyboards/ai03/orbit/readme.md
index 58ba2079d5..0c320929b6 100644
--- a/keyboards/ai03/orbit/readme.md
+++ b/keyboards/ai03/orbit/readme.md
@@ -4,9 +4,9 @@
 
 A split ergonomic keyboard project.  
 
-Keyboard Maintainer: [ai03](https://github.com/ai03-2725)  
-Hardware Supported: The [Orbit PCB](https://github.com/ai03-2725/Orbit)  
-Hardware Availability: [This repository](https://github.com/ai03-2725/Orbit) has PCB files. Case group buy orders are currently closed.  
+* Keyboard Maintainer: [ai03](https://github.com/ai03-2725)
+* Hardware Supported: The [Orbit PCB](https://github.com/ai03-2725/Orbit)
+* Hardware Availability: [This repository](https://github.com/ai03-2725/Orbit) has PCB files. Case group buy orders are currently closed.
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/ai03/orbit/rules.mk b/keyboards/ai03/orbit/rules.mk
index fc66f9f6d0..5b082d9431 100644
--- a/keyboards/ai03/orbit/rules.mk
+++ b/keyboards/ai03/orbit/rules.mk
@@ -19,12 +19,4 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-USE_I2C = no                # I2C for split communication
-CUSTOM_MATRIX = yes			# For providing custom matrix.c (in this case, override regular matrix.c with split matrix.c)
-# SPLIT_KEYBOARD = yes		# Split keyboard flag disabled as manual edits had to be done to the split common files
-
-SRC += split_util.c \
-	   split_flags.c \
-	   serial.c \
-	   transport.c \
-	   matrix.c
+SPLIT_KEYBOARD = yes		# Split keyboard flag disabled as manual edits had to be done to the split common files
diff --git a/keyboards/ai03/orbit/serial.c b/keyboards/ai03/orbit/serial.c
deleted file mode 100644
index 636dfa0906..0000000000
--- a/keyboards/ai03/orbit/serial.c
+++ /dev/null
@@ -1,545 +0,0 @@
-/*
- * WARNING: be careful changing this code, it is very timing dependent
- *
- * 2018-10-28 checked
- *  avr-gcc 4.9.2
- *  avr-gcc 5.4.0
- *  avr-gcc 7.3.0
- */
-
-#ifndef F_CPU
-#define F_CPU 16000000
-#endif
-
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <stddef.h>
-#include <stdbool.h>
-#include "serial.h"
-
-#ifdef SOFT_SERIAL_PIN
-
-#ifdef __AVR_ATmega32U4__
-  // if using ATmega32U4 I2C, can not use PD0 and PD1 in soft serial.
-  #ifdef USE_AVR_I2C
-    #if SOFT_SERIAL_PIN == D0 || SOFT_SERIAL_PIN == D1
-      #error Using ATmega32U4 I2C, so can not use PD0, PD1
-    #endif
-  #endif
-
-  #if SOFT_SERIAL_PIN >= D0 && SOFT_SERIAL_PIN <= D3
-    #define SERIAL_PIN_DDR   DDRD
-    #define SERIAL_PIN_PORT  PORTD
-    #define SERIAL_PIN_INPUT PIND
-    #if SOFT_SERIAL_PIN == D0
-      #define SERIAL_PIN_MASK _BV(PD0)
-      #define EIMSK_BIT       _BV(INT0)
-      #define EICRx_BIT       (~(_BV(ISC00) | _BV(ISC01)))
-      #define SERIAL_PIN_INTERRUPT INT0_vect
-    #elif  SOFT_SERIAL_PIN == D1
-      #define SERIAL_PIN_MASK _BV(PD1)
-      #define EIMSK_BIT       _BV(INT1)
-      #define EICRx_BIT       (~(_BV(ISC10) | _BV(ISC11)))
-      #define SERIAL_PIN_INTERRUPT INT1_vect
-    #elif  SOFT_SERIAL_PIN == D2
-      #define SERIAL_PIN_MASK _BV(PD2)
-      #define EIMSK_BIT       _BV(INT2)
-      #define EICRx_BIT       (~(_BV(ISC20) | _BV(ISC21)))
-      #define SERIAL_PIN_INTERRUPT INT2_vect
-    #elif  SOFT_SERIAL_PIN == D3
-      #define SERIAL_PIN_MASK _BV(PD3)
-      #define EIMSK_BIT       _BV(INT3)
-      #define EICRx_BIT       (~(_BV(ISC30) | _BV(ISC31)))
-      #define SERIAL_PIN_INTERRUPT INT3_vect
-    #endif
-  #elif  SOFT_SERIAL_PIN == E6
-    #define SERIAL_PIN_DDR   DDRE
-    #define SERIAL_PIN_PORT  PORTE
-    #define SERIAL_PIN_INPUT PINE
-    #define SERIAL_PIN_MASK  _BV(PE6)
-    #define EIMSK_BIT        _BV(INT6)
-    #define EICRx_BIT        (~(_BV(ISC60) | _BV(ISC61)))
-    #define SERIAL_PIN_INTERRUPT INT6_vect
-  #else
-  #error invalid SOFT_SERIAL_PIN value
-  #endif
-
-#else
- #error serial.c now support ATmega32U4 only
-#endif
-
-#define ALWAYS_INLINE __attribute__((always_inline))
-#define NO_INLINE __attribute__((noinline))
-#define _delay_sub_us(x)    __builtin_avr_delay_cycles(x)
-
-// parity check
-#define ODD_PARITY 1
-#define EVEN_PARITY 0
-#define PARITY EVEN_PARITY
-
-#ifdef SERIAL_DELAY
-  // custom setup in config.h
-  // #define TID_SEND_ADJUST 2
-  // #define SERIAL_DELAY 6             // micro sec
-  // #define READ_WRITE_START_ADJUST 30 // cycles
-  // #define READ_WRITE_WIDTH_ADJUST 8 // cycles
-#else
-// ============ Standard setups ============
-
-#ifndef SELECT_SOFT_SERIAL_SPEED
-#define SELECT_SOFT_SERIAL_SPEED 1
-//  0: about 189kbps (Experimental only)
-//  1: about 137kbps (default)
-//  2: about 75kbps
-//  3: about 39kbps
-//  4: about 26kbps
-//  5: about 20kbps
-#endif
-
-#if __GNUC__ < 6
-  #define TID_SEND_ADJUST 14
-#else
-  #define TID_SEND_ADJUST 2
-#endif
-
-#if SELECT_SOFT_SERIAL_SPEED == 0
-  // Very High speed
-  #define SERIAL_DELAY 4             // micro sec
-  #if __GNUC__ < 6
-    #define READ_WRITE_START_ADJUST 33 // cycles
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_START_ADJUST 34 // cycles
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 1
-  // High speed
-  #define SERIAL_DELAY 6             // micro sec
-  #if __GNUC__ < 6
-    #define READ_WRITE_START_ADJUST 30 // cycles
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_START_ADJUST 33 // cycles
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 2
-  // Middle speed
-  #define SERIAL_DELAY 12            // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #if __GNUC__ < 6
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 3
-  // Low speed
-  #define SERIAL_DELAY 24            // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #if __GNUC__ < 6
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 4
-  // Very Low speed
-  #define SERIAL_DELAY 36            // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #if __GNUC__ < 6
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#elif SELECT_SOFT_SERIAL_SPEED == 5
-  // Ultra Low speed
-  #define SERIAL_DELAY 48            // micro sec
-  #define READ_WRITE_START_ADJUST 30 // cycles
-  #if __GNUC__ < 6
-    #define READ_WRITE_WIDTH_ADJUST 3 // cycles
-  #else
-    #define READ_WRITE_WIDTH_ADJUST 7 // cycles
-  #endif
-#else
-#error invalid SELECT_SOFT_SERIAL_SPEED value
-#endif /* SELECT_SOFT_SERIAL_SPEED */
-#endif /* SERIAL_DELAY */
-
-#define SERIAL_DELAY_HALF1 (SERIAL_DELAY/2)
-#define SERIAL_DELAY_HALF2 (SERIAL_DELAY - SERIAL_DELAY/2)
-
-#define SLAVE_INT_WIDTH_US 1
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-  #define SLAVE_INT_RESPONSE_TIME SERIAL_DELAY
-#else
-  #define SLAVE_INT_ACK_WIDTH_UNIT 2
-  #define SLAVE_INT_ACK_WIDTH 4
-#endif
-
-static SSTD_t *Transaction_table = NULL;
-static uint8_t Transaction_table_size = 0;
-
-inline static void serial_delay(void) ALWAYS_INLINE;
-inline static
-void serial_delay(void) {
-  _delay_us(SERIAL_DELAY);
-}
-
-inline static void serial_delay_half1(void) ALWAYS_INLINE;
-inline static
-void serial_delay_half1(void) {
-  _delay_us(SERIAL_DELAY_HALF1);
-}
-
-inline static void serial_delay_half2(void) ALWAYS_INLINE;
-inline static
-void serial_delay_half2(void) {
-  _delay_us(SERIAL_DELAY_HALF2);
-}
-
-inline static void serial_output(void) ALWAYS_INLINE;
-inline static
-void serial_output(void) {
-  SERIAL_PIN_DDR |= SERIAL_PIN_MASK;
-}
-
-// make the serial pin an input with pull-up resistor
-inline static void serial_input_with_pullup(void) ALWAYS_INLINE;
-inline static
-void serial_input_with_pullup(void) {
-  SERIAL_PIN_DDR  &= ~SERIAL_PIN_MASK;
-  SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
-}
-
-inline static uint8_t serial_read_pin(void) ALWAYS_INLINE;
-inline static
-uint8_t serial_read_pin(void) {
-  return !!(SERIAL_PIN_INPUT & SERIAL_PIN_MASK);
-}
-
-inline static void serial_low(void) ALWAYS_INLINE;
-inline static
-void serial_low(void) {
-  SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK;
-}
-
-inline static void serial_high(void) ALWAYS_INLINE;
-inline static
-void serial_high(void) {
-  SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
-}
-
-void soft_serial_initiator_init(SSTD_t *sstd_table, int sstd_table_size)
-{
-    Transaction_table = sstd_table;
-    Transaction_table_size = (uint8_t)sstd_table_size;
-    serial_output();
-    serial_high();
-}
-
-void soft_serial_target_init(SSTD_t *sstd_table, int sstd_table_size)
-{
-    Transaction_table = sstd_table;
-    Transaction_table_size = (uint8_t)sstd_table_size;
-    serial_input_with_pullup();
-
-    // Enable INT0-INT3,INT6
-    EIMSK |= EIMSK_BIT;
-#if SERIAL_PIN_MASK == _BV(PE6)
-    // Trigger on falling edge of INT6
-    EICRB &= EICRx_BIT;
-#else
-    // Trigger on falling edge of INT0-INT3
-    EICRA &= EICRx_BIT;
-#endif
-}
-
-// Used by the sender to synchronize timing with the reciver.
-static void sync_recv(void) NO_INLINE;
-static
-void sync_recv(void) {
-  for (uint8_t i = 0; i < SERIAL_DELAY*5 && serial_read_pin(); i++ ) {
-  }
-  // This shouldn't hang if the target disconnects because the
-  // serial line will float to high if the target does disconnect.
-  while (!serial_read_pin());
-}
-
-// Used by the reciver to send a synchronization signal to the sender.
-static void sync_send(void) NO_INLINE;
-static
-void sync_send(void) {
-  serial_low();
-  serial_delay();
-  serial_high();
-}
-
-// Reads a byte from the serial line
-static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) NO_INLINE;
-static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) {
-    uint8_t byte, i, p, pb;
-
-  _delay_sub_us(READ_WRITE_START_ADJUST);
-  for( i = 0, byte = 0, p = PARITY; i < bit; i++ ) {
-      serial_delay_half1();   // read the middle of pulses
-      if( serial_read_pin() ) {
-          byte = (byte << 1) | 1; p ^= 1;
-      } else {
-          byte = (byte << 1) | 0; p ^= 0;
-      }
-      _delay_sub_us(READ_WRITE_WIDTH_ADJUST);
-      serial_delay_half2();
-  }
-  /* recive parity bit */
-  serial_delay_half1();   // read the middle of pulses
-  pb = serial_read_pin();
-  _delay_sub_us(READ_WRITE_WIDTH_ADJUST);
-  serial_delay_half2();
-
-  *pterrcount += (p != pb)? 1 : 0;
-
-  return byte;
-}
-
-// Sends a byte with MSB ordering
-void serial_write_chunk(uint8_t data, uint8_t bit) NO_INLINE;
-void serial_write_chunk(uint8_t data, uint8_t bit) {
-    uint8_t b, p;
-    for( p = PARITY, b = 1<<(bit-1); b ; b >>= 1) {
-        if(data & b) {
-            serial_high(); p ^= 1;
-        } else {
-            serial_low();  p ^= 0;
-        }
-        serial_delay();
-    }
-    /* send parity bit */
-    if(p & 1) { serial_high(); }
-    else      { serial_low(); }
-    serial_delay();
-
-    serial_low(); // sync_send() / senc_recv() need raise edge
-}
-
-static void serial_send_packet(uint8_t *buffer, uint8_t size) NO_INLINE;
-static
-void serial_send_packet(uint8_t *buffer, uint8_t size) {
-  for (uint8_t i = 0; i < size; ++i) {
-    uint8_t data;
-    data = buffer[i];
-    sync_send();
-    serial_write_chunk(data,8);
-  }
-}
-
-static uint8_t serial_recive_packet(uint8_t *buffer, uint8_t size) NO_INLINE;
-static
-uint8_t serial_recive_packet(uint8_t *buffer, uint8_t size) {
-  uint8_t pecount = 0;
-  for (uint8_t i = 0; i < size; ++i) {
-    uint8_t data;
-    sync_recv();
-    data = serial_read_chunk(&pecount, 8);
-    buffer[i] = data;
-  }
-  return pecount == 0;
-}
-
-inline static
-void change_sender2reciver(void) {
-    sync_send();          //0
-    serial_delay_half1(); //1
-    serial_low();         //2
-    serial_input_with_pullup(); //2
-    serial_delay_half1(); //3
-}
-
-inline static
-void change_reciver2sender(void) {
-    sync_recv();     //0
-    serial_delay();  //1
-    serial_low();    //3
-    serial_output(); //3
-    serial_delay_half1(); //4
-}
-
-static inline uint8_t nibble_bits_count(uint8_t bits)
-{
-    bits = (bits & 0x5) + (bits >> 1 & 0x5);
-    bits = (bits & 0x3) + (bits >> 2 & 0x3);
-    return bits;
-}
-
-// interrupt handle to be used by the target device
-ISR(SERIAL_PIN_INTERRUPT) {
-
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-  serial_low();
-  serial_output();
-  SSTD_t *trans = Transaction_table;
-#else
-  // recive transaction table index
-  uint8_t tid, bits;
-  uint8_t pecount = 0;
-  sync_recv();
-  bits = serial_read_chunk(&pecount,7);
-  tid = bits>>3;
-  bits = (bits&7) != nibble_bits_count(tid);
-  if( bits || pecount> 0 || tid > Transaction_table_size ) {
-      return;
-  }
-  serial_delay_half1();
-
-  serial_high(); // response step1 low->high
-  serial_output();
-  _delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT*SLAVE_INT_ACK_WIDTH);
-  SSTD_t *trans = &Transaction_table[tid];
-  serial_low(); // response step2 ack high->low
-#endif
-
-  // target send phase
-  if( trans->target2initiator_buffer_size > 0 )
-      serial_send_packet((uint8_t *)trans->target2initiator_buffer,
-                         trans->target2initiator_buffer_size);
-  // target switch to input
-  change_sender2reciver();
-
-  // target recive phase
-  if( trans->initiator2target_buffer_size > 0 ) {
-      if (serial_recive_packet((uint8_t *)trans->initiator2target_buffer,
-                               trans->initiator2target_buffer_size) ) {
-          *trans->status = TRANSACTION_ACCEPTED;
-      } else {
-          *trans->status = TRANSACTION_DATA_ERROR;
-      }
-  } else {
-      *trans->status = TRANSACTION_ACCEPTED;
-  }
-
-  sync_recv(); //weit initiator output to high
-}
-
-/////////
-//  start transaction by initiator
-//
-// int  soft_serial_transaction(int sstd_index)
-//
-// Returns:
-//    TRANSACTION_END
-//    TRANSACTION_NO_RESPONSE
-//    TRANSACTION_DATA_ERROR
-// this code is very time dependent, so we need to disable interrupts
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-int  soft_serial_transaction(void) {
-  SSTD_t *trans = Transaction_table;
-#else
-int  soft_serial_transaction(int sstd_index) {
-  if( sstd_index > Transaction_table_size )
-      return TRANSACTION_TYPE_ERROR;
-  SSTD_t *trans = &Transaction_table[sstd_index];
-#endif
-  cli();
-
-  // signal to the target that we want to start a transaction
-  serial_output();
-  serial_low();
-  _delay_us(SLAVE_INT_WIDTH_US);
-
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-  // wait for the target response
-  serial_input_with_pullup();
-  _delay_us(SLAVE_INT_RESPONSE_TIME);
-
-  // check if the target is present
-  if (serial_read_pin()) {
-    // target failed to pull the line low, assume not present
-    serial_output();
-    serial_high();
-    *trans->status = TRANSACTION_NO_RESPONSE;
-    sei();
-    return TRANSACTION_NO_RESPONSE;
-  }
-
-#else
-  // send transaction table index
-  int tid = (sstd_index<<3) | (7 & nibble_bits_count(sstd_index));
-  sync_send();
-  _delay_sub_us(TID_SEND_ADJUST);
-  serial_write_chunk(tid, 7);
-  serial_delay_half1();
-
-  // wait for the target response (step1 low->high)
-  serial_input_with_pullup();
-  while( !serial_read_pin() ) {
-      _delay_sub_us(2);
-  }
-
-  // check if the target is present (step2 high->low)
-  for( int i = 0; serial_read_pin(); i++ ) {
-      if (i > SLAVE_INT_ACK_WIDTH + 1) {
-          // slave failed to pull the line low, assume not present
-          serial_output();
-          serial_high();
-          *trans->status = TRANSACTION_NO_RESPONSE;
-          sei();
-          return TRANSACTION_NO_RESPONSE;
-      }
-      _delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT);
-  }
-#endif
-
-  // initiator recive phase
-  // if the target is present syncronize with it
-  if( trans->target2initiator_buffer_size > 0 ) {
-      if (!serial_recive_packet((uint8_t *)trans->target2initiator_buffer,
-                                trans->target2initiator_buffer_size) ) {
-          serial_output();
-          serial_high();
-          *trans->status = TRANSACTION_DATA_ERROR;
-          sei();
-          return TRANSACTION_DATA_ERROR;
-      }
-   }
-
-  // initiator switch to output
-  change_reciver2sender();
-
-  // initiator send phase
-  if( trans->initiator2target_buffer_size > 0 ) {
-      serial_send_packet((uint8_t *)trans->initiator2target_buffer,
-                         trans->initiator2target_buffer_size);
-  }
-
-  // always, release the line when not in use
-  sync_send();
-
-  *trans->status = TRANSACTION_END;
-  sei();
-  return TRANSACTION_END;
-}
-
-#ifdef SERIAL_USE_MULTI_TRANSACTION
-int soft_serial_get_and_clean_status(int sstd_index) {
-    SSTD_t *trans = &Transaction_table[sstd_index];
-    cli();
-    int retval = *trans->status;
-    *trans->status = 0;;
-    sei();
-    return retval;
-}
-#endif
-
-#endif
-
-// Helix serial.c history
-//   2018-1-29 fork from let's split and add PD2, modify sync_recv() (#2308, bceffdefc)
-//   2018-6-28 bug fix master to slave comm and speed up (#3255, 1038bbef4)
-//             (adjusted with avr-gcc 4.9.2)
-//   2018-7-13 remove USE_SERIAL_PD2 macro (#3374, f30d6dd78)
-//             (adjusted with avr-gcc 4.9.2)
-//   2018-8-11 add support multi-type transaction (#3608, feb5e4aae)
-//             (adjusted with avr-gcc 4.9.2)
-//   2018-10-21 fix serial and RGB animation conflict (#4191, 4665e4fff)
-//             (adjusted with avr-gcc 7.3.0)
-//   2018-10-28 re-adjust compiler depend value of delay (#4269, 8517f8a66)
-//             (adjusted with avr-gcc 5.4.0, 7.3.0)
-//   2018-12-17 copy to TOP/quantum/split_common/ and remove backward compatibility code (#4669)
diff --git a/keyboards/ai03/orbit/serial.h b/keyboards/ai03/orbit/serial.h
deleted file mode 100644
index 1c1e640069..0000000000
--- a/keyboards/ai03/orbit/serial.h
+++ /dev/null
@@ -1,62 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-
-// /////////////////////////////////////////////////////////////////
-// Need Soft Serial defines in config.h
-// /////////////////////////////////////////////////////////////////
-// ex.
-//  #define SOFT_SERIAL_PIN ??   // ?? = D0,D1,D2,D3,E6
-//  OPTIONAL: #define SELECT_SOFT_SERIAL_SPEED ? // ? = 1,2,3,4,5
-//                                               //  1: about 137kbps (default)
-//                                               //  2: about 75kbps
-//                                               //  3: about 39kbps
-//                                               //  4: about 26kbps
-//                                               //  5: about 20kbps
-//
-// //// USE simple API (using signle-type transaction function)
-//   /* nothing */
-// //// USE flexible API (using multi-type transaction function)
-//   #define SERIAL_USE_MULTI_TRANSACTION
-//
-// /////////////////////////////////////////////////////////////////
-
-// Soft Serial Transaction Descriptor
-typedef struct _SSTD_t  {
-    uint8_t *status;
-    uint8_t initiator2target_buffer_size;
-    uint8_t *initiator2target_buffer;
-    uint8_t target2initiator_buffer_size;
-    uint8_t *target2initiator_buffer;
-} SSTD_t;
-#define TID_LIMIT( table ) (sizeof(table) / sizeof(SSTD_t))
-
-// initiator is transaction start side
-void soft_serial_initiator_init(SSTD_t *sstd_table, int sstd_table_size);
-// target is interrupt accept side
-void soft_serial_target_init(SSTD_t *sstd_table, int sstd_table_size);
-
-// initiator resullt
-#define TRANSACTION_END 0
-#define TRANSACTION_NO_RESPONSE 0x1
-#define TRANSACTION_DATA_ERROR  0x2
-#define TRANSACTION_TYPE_ERROR  0x4
-#ifndef SERIAL_USE_MULTI_TRANSACTION
-int  soft_serial_transaction(void);
-#else
-int  soft_serial_transaction(int sstd_index);
-#endif
-
-// target status
-// *SSTD_t.status has
-//   initiator:
-//       TRANSACTION_END
-//    or TRANSACTION_NO_RESPONSE
-//    or TRANSACTION_DATA_ERROR
-//   target:
-//       TRANSACTION_DATA_ERROR
-//    or TRANSACTION_ACCEPTED
-#define TRANSACTION_ACCEPTED 0x8
-#ifdef SERIAL_USE_MULTI_TRANSACTION
-int  soft_serial_get_and_clean_status(int sstd_index);
-#endif
diff --git a/keyboards/ai03/orbit/split_flags.c b/keyboards/ai03/orbit/split_flags.c
deleted file mode 100644
index 1f5825d650..0000000000
--- a/keyboards/ai03/orbit/split_flags.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "split_flags.h"
-
-volatile bool RGB_DIRTY = false;
-
-volatile bool BACKLIT_DIRTY = false;
\ No newline at end of file
diff --git a/keyboards/ai03/orbit/split_flags.h b/keyboards/ai03/orbit/split_flags.h
deleted file mode 100644
index aaac474a7d..0000000000
--- a/keyboards/ai03/orbit/split_flags.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include <stdint.h>
-
-/**
-* Global Flags
-**/
-
-//RGB Stuff
-extern volatile bool RGB_DIRTY;
-
-
-//Backlight Stuff
-extern volatile bool BACKLIT_DIRTY;
diff --git a/keyboards/ai03/orbit/split_util.c b/keyboards/ai03/orbit/split_util.c
deleted file mode 100644
index 2352e5a111..0000000000
--- a/keyboards/ai03/orbit/split_util.c
+++ /dev/null
@@ -1,87 +0,0 @@
-#include "split_util.h"
-#include "matrix.h"
-#include "keyboard.h"
-#include "config.h"
-#include "timer.h"
-#include "split_flags.h"
-#include "transport.h"
-#include "quantum.h"
-
-#ifdef EE_HANDS
-#   include "eeprom.h"
-#   include "eeconfig.h"
-#endif
-
-volatile bool isLeftHand = true;
-
-__attribute__((weak))
-bool is_keyboard_left(void) {
-  #ifdef SPLIT_HAND_PIN
-    // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand
-    setPinInput(SPLIT_HAND_PIN);
-    return readPin(SPLIT_HAND_PIN);
-  #else
-    #ifdef EE_HANDS
-      return eeprom_read_byte(EECONFIG_HANDEDNESS);
-    #else
-      #ifdef MASTER_RIGHT
-        return !is_keyboard_master();
-      #else
-        return is_keyboard_master();
-      #endif
-    #endif
-  #endif
-}
-
-bool is_keyboard_master(void)
-{
-#ifdef __AVR__
-  static enum { UNKNOWN, MASTER, SLAVE } usbstate = UNKNOWN;
-
-  // only check once, as this is called often
-  if (usbstate == UNKNOWN)
-  {
-    USBCON |= (1 << OTGPADE);  // enables VBUS pad
-    wait_us(5);
-
-    usbstate = (USBSTA & (1 << VBUS)) ? MASTER : SLAVE;  // checks state of VBUS
-  }
-
-  return (usbstate == MASTER);
-#else
-  return true;
-#endif
-}
-
-static void keyboard_master_setup(void) {
-#if defined(USE_I2C)
-  #ifdef SSD1306OLED
-    matrix_master_OLED_init ();
-  #endif
-#endif
-  transport_master_init();
-
-  // For master the Backlight info needs to be sent on startup
-  // Otherwise the salve won't start with the proper info until an update
-  BACKLIT_DIRTY = true;
-}
-
-static void keyboard_slave_setup(void)
-{
-  transport_slave_init();
-}
-
-// this code runs before the usb and keyboard is initialized
-void matrix_setup(void)
-{
-  isLeftHand = is_keyboard_left();
-
-  if (is_keyboard_master())
-  {
-    keyboard_master_setup();
-  }
-  else
-  {
-    keyboard_slave_setup();
-  }
-}
diff --git a/keyboards/ai03/orbit/split_util.h b/keyboards/ai03/orbit/split_util.h
deleted file mode 100644
index 20f7535bf4..0000000000
--- a/keyboards/ai03/orbit/split_util.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-extern volatile bool isLeftHand;
-
-void matrix_master_OLED_init (void);
diff --git a/keyboards/ai03/orbit/transport.c b/keyboards/ai03/orbit/transport.c
deleted file mode 100644
index 447fafed14..0000000000
--- a/keyboards/ai03/orbit/transport.c
+++ /dev/null
@@ -1,238 +0,0 @@
-
-#include "transport.h"
-
-#include "config.h"
-#include "matrix.h"
-#include "quantum.h"
-
-#include "orbit.h"
-
-#define ROWS_PER_HAND (MATRIX_ROWS/2)
-
-#ifdef RGBLIGHT_ENABLE
-#   include "rgblight.h"
-#endif
-
-#ifdef BACKLIGHT_ENABLE
-# include "backlight.h"
-  extern backlight_config_t backlight_config;
-#endif
-
-#if defined(USE_I2C)
-
-#include "i2c.h"
-
-#ifndef SLAVE_I2C_ADDRESS
-#  define SLAVE_I2C_ADDRESS           0x32
-#endif
-
-#if (MATRIX_COLS > 8)
-#  error "Currently only supports 8 COLS"
-#endif
-
-// Get rows from other half over i2c
-bool transport_master(matrix_row_t matrix[]) {
-  int err = 0;
-
-  // write backlight info
-#ifdef BACKLIGHT_ENABLE
-  if (BACKLIT_DIRTY) {
-    err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE);
-    if (err) { goto i2c_error; }
-
-    // Backlight location
-    err = i2c_master_write(I2C_BACKLIT_START);
-    if (err) { goto i2c_error; }
-
-    // Write backlight
-    i2c_master_write(get_backlight_level());
-
-    BACKLIT_DIRTY = false;
-  }
-#endif
-
-  err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE);
-  if (err) { goto i2c_error; }
-
-  // start of matrix stored at I2C_KEYMAP_START
-  err = i2c_master_write(I2C_KEYMAP_START);
-  if (err) { goto i2c_error; }
-
-  // Start read
-  err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
-  if (err) { goto i2c_error; }
-
-  if (!err) {
-    int i;
-    for (i = 0; i < ROWS_PER_HAND-1; ++i) {
-      matrix[i] = i2c_master_read(I2C_ACK);
-    }
-    matrix[i] = i2c_master_read(I2C_NACK);
-    i2c_master_stop();
-  } else {
-i2c_error: // the cable is disconnceted, or something else went wrong
-    i2c_reset_state();
-    return false;
-  }
-
-#ifdef RGBLIGHT_ENABLE
-  if (RGB_DIRTY) {
-    err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE);
-    if (err) { goto i2c_error; }
-
-    // RGB Location
-    err = i2c_master_write(I2C_RGB_START);
-    if (err) { goto i2c_error; }
-
-    uint32_t dword = eeconfig_read_rgblight();
-
-    // Write RGB
-    err = i2c_master_write_data(&dword, 4);
-    if (err) { goto i2c_error; }
-
-    RGB_DIRTY = false;
-    i2c_master_stop();
-  }
-#endif
-
-  return true;
-}
-
-void transport_slave(matrix_row_t matrix[]) {
-
-  for (int i = 0; i < ROWS_PER_HAND; ++i)
-  {
-    i2c_slave_buffer[I2C_KEYMAP_START + i] = matrix[i];
-  }
-  // Read Backlight Info
-  #ifdef BACKLIGHT_ENABLE
-  if (BACKLIT_DIRTY)
-  {
-    backlight_set(i2c_slave_buffer[I2C_BACKLIT_START]);
-    BACKLIT_DIRTY = false;
-  }
-  #endif
-  #ifdef RGBLIGHT_ENABLE
-  if (RGB_DIRTY)
-  {
-    // Disable interupts (RGB data is big)
-    cli();
-    // Create new DWORD for RGB data
-    uint32_t dword;
-
-    // Fill the new DWORD with the data that was sent over
-    uint8_t * dword_dat = (uint8_t *)(&dword);
-    for (int i = 0; i < 4; i++)
-    {
-      dword_dat[i] = i2c_slave_buffer[I2C_RGB_START + i];
-    }
-
-    // Update the RGB now with the new data and set RGB_DIRTY to false
-    rgblight_update_dword(dword);
-    RGB_DIRTY = false;
-    // Re-enable interupts now that RGB is set
-    sei();
-  }
-  #endif
-}
-
-void transport_master_init(void) {
-  i2c_master_init();
-}
-
-void transport_slave_init(void) {
-  i2c_slave_init(SLAVE_I2C_ADDRESS);
-}
-
-#else // USE_SERIAL
-
-#include "serial.h"
-
-
-
-volatile Serial_s2m_buffer_t serial_s2m_buffer = {};
-volatile Serial_m2s_buffer_t serial_m2s_buffer = {};
-uint8_t volatile status0 = 0;
-
-SSTD_t transactions[] = {
-  { (uint8_t *)&status0,
-    sizeof(serial_m2s_buffer), (uint8_t *)&serial_m2s_buffer,
-    sizeof(serial_s2m_buffer), (uint8_t *)&serial_s2m_buffer
-  }
-};
-
-uint8_t slave_layer_cache;
-uint8_t slave_nlock_cache;
-uint8_t slave_clock_cache;
-uint8_t slave_slock_cache;
-
-void transport_master_init(void)
-{ soft_serial_initiator_init(transactions, TID_LIMIT(transactions)); }
-
-void transport_slave_init(void)
-{ 
-	soft_serial_target_init(transactions, TID_LIMIT(transactions)); 
-	slave_layer_cache = 255;
-	slave_nlock_cache = 255;
-	slave_clock_cache = 255;
-	slave_slock_cache = 255;
-}
-
-bool transport_master(matrix_row_t matrix[]) {
-
-  if (soft_serial_transaction()) {
-    return false;
-  }
-
-  // TODO:  if MATRIX_COLS > 8 change to unpack()
-  for (int i = 0; i < ROWS_PER_HAND; ++i) {
-    matrix[i] = serial_s2m_buffer.smatrix[i];
-  }
-
-  #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
-    // Code to send RGB over serial goes here (not implemented yet)
-  #endif
-
-  #ifdef BACKLIGHT_ENABLE
-    // Write backlight level for slave to read
-    serial_m2s_buffer.backlight_level = backlight_config.enable ? backlight_config.level : 0;
-  #endif
-
-  return true;
-}
-
-void transport_slave(matrix_row_t matrix[]) {
-
-  // TODO: if MATRIX_COLS > 8 change to pack()
-  for (int i = 0; i < ROWS_PER_HAND; ++i)
-  {
-    serial_s2m_buffer.smatrix[i] = matrix[i];
-  }
-  #ifdef BACKLIGHT_ENABLE
-    backlight_set(serial_m2s_buffer.backlight_level);
-  #endif
-  #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
-  // Add serial implementation for RGB here
-  #endif
-  
-  if (slave_layer_cache != serial_m2s_buffer.current_layer) {  
-	slave_layer_cache = serial_m2s_buffer.current_layer;
-	set_layer_indicators(slave_layer_cache);
-  }
-  
-  if (slave_nlock_cache != serial_m2s_buffer.nlock_led) {
-	slave_nlock_cache = serial_m2s_buffer.nlock_led;
-	led_toggle(3, slave_nlock_cache);
-  }
-  if (slave_clock_cache != serial_m2s_buffer.clock_led) {
-	slave_clock_cache = serial_m2s_buffer.clock_led;
-	led_toggle(4, slave_clock_cache);
-  }
-  if (slave_slock_cache != serial_m2s_buffer.slock_led) {
-	slave_slock_cache = serial_m2s_buffer.slock_led;
-	led_toggle(5, slave_slock_cache);
-  }
-  
-}
-
-#endif
diff --git a/keyboards/ai03/orbit/transport.h b/keyboards/ai03/orbit/transport.h
deleted file mode 100644
index 757eae6f5c..0000000000
--- a/keyboards/ai03/orbit/transport.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include "matrix.h"
-
-#define ROWS_PER_HAND (MATRIX_ROWS/2)
-
-typedef struct _Serial_s2m_buffer_t {
-  // TODO: if MATRIX_COLS > 8 change to uint8_t packed_matrix[] for pack/unpack
-  matrix_row_t smatrix[ROWS_PER_HAND];
-} Serial_s2m_buffer_t;
-
-typedef struct _Serial_m2s_buffer_t {
-#ifdef BACKLIGHT_ENABLE
-    uint8_t backlight_level;
-#endif
-#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
-    rgblight_config_t rgblight_config; //not yet use
-    //
-    // When MCUs on both sides drive their respective RGB LED chains,
-    // it is necessary to synchronize, so it is necessary to communicate RGB information.
-    // In that case, define the RGBLIGHT_SPLIT macro.
-    //
-    // Otherwise, if the master side MCU drives both sides RGB LED chains,
-    // there is no need to communicate.
-#endif
-
-	uint8_t current_layer;
-	uint8_t nlock_led;
-	uint8_t clock_led;
-	uint8_t slock_led;
-
-} Serial_m2s_buffer_t;
-
-extern volatile Serial_s2m_buffer_t serial_s2m_buffer;
-extern volatile Serial_m2s_buffer_t serial_m2s_buffer;
-
-void transport_master_init(void);
-void transport_slave_init(void);
-
-// returns false if valid data not received from slave
-bool transport_master(matrix_row_t matrix[]);
-void transport_slave(matrix_row_t matrix[]);

From 3bf2403244b035e982dec17680b836afbe5df603 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 2 Dec 2021 14:32:31 +0000
Subject: [PATCH 009/867] Tidy up existing i2c_master implementations (#15376)

* Move chibios defines out of header

* Make some avr defines internal
---
 keyboards/matrix/m20add/m20add.c       | 19 --------
 keyboards/yanghu/unicorne/config.h     |  6 +++
 platforms/avr/drivers/i2c_master.c     |  7 ++-
 platforms/chibios/drivers/i2c_master.c | 59 +++++++++++++++++++++++++
 platforms/chibios/drivers/i2c_master.h | 61 +-------------------------
 5 files changed, 71 insertions(+), 81 deletions(-)

diff --git a/keyboards/matrix/m20add/m20add.c b/keyboards/matrix/m20add/m20add.c
index 21f4f9b1ba..4d328d6c54 100644
--- a/keyboards/matrix/m20add/m20add.c
+++ b/keyboards/matrix/m20add/m20add.c
@@ -53,25 +53,6 @@ bool led_update_kb(led_t led_state) {
     return res;
 }
 
-// override the default implementation to avoid re-initialization
-void i2c_init(void)
-{
-    static bool initialized = false;
-    if (initialized) {
-        return;
-    } else {
-        initialized = true;
-    }
-
-    // Try releasing special pins for a short time
-    palSetLineMode(I2C1_SCL_PIN, PAL_MODE_INPUT);
-    palSetLineMode(I2C1_SDA_PIN, PAL_MODE_INPUT);
-
-    chThdSleepMilliseconds(10);
-    palSetLineMode(I2C1_SCL_PIN, PAL_MODE_ALTERNATE(I2C1_SCL_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN);
-    palSetLineMode(I2C1_SDA_PIN, PAL_MODE_ALTERNATE(I2C1_SDA_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN);
-}
-
 #define REBOOT_MAGIC 0x41544B42
 void shutdown_user(void)
 {
diff --git a/keyboards/yanghu/unicorne/config.h b/keyboards/yanghu/unicorne/config.h
index 652afeb3b4..27d21c7906 100644
--- a/keyboards/yanghu/unicorne/config.h
+++ b/keyboards/yanghu/unicorne/config.h
@@ -42,6 +42,12 @@
 #define ENCODERS_PAD_B \
     { B12, B0 }
 
+/* I2C - required for custom i2c_init */
+#define I2C1_SCL_PIN B6
+#define I2C1_SDA_PIN B7
+#define I2C1_SCL_PAL_MODE 4
+#define I2C1_SDA_PAL_MODE 4
+
 /* Audio */
 #define AUDIO_PIN A8
 #define AUDIO_PWM_PAL_MODE 1
diff --git a/platforms/avr/drivers/i2c_master.c b/platforms/avr/drivers/i2c_master.c
index 111b55d6b0..d4024378ca 100644
--- a/platforms/avr/drivers/i2c_master.c
+++ b/platforms/avr/drivers/i2c_master.c
@@ -32,6 +32,9 @@
 #    define I2C_START_RETRY_COUNT 20
 #endif  // I2C_START_RETRY_COUNT
 
+#define I2C_ACTION_READ 0x01
+#define I2C_ACTION_WRITE 0x00
+
 #define TWBR_val (((F_CPU / F_SCL) - 16) / 2)
 
 #define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
@@ -154,7 +157,7 @@ int16_t i2c_read_nack(uint16_t timeout) {
 }
 
 i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length, uint16_t timeout) {
-    i2c_status_t status = i2c_start(address | I2C_WRITE, timeout);
+    i2c_status_t status = i2c_start(address | I2C_ACTION_WRITE, timeout);
 
     for (uint16_t i = 0; i < length && status >= 0; i++) {
         status = i2c_write(data[i], timeout);
@@ -166,7 +169,7 @@ i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length,
 }
 
 i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout) {
-    i2c_status_t status = i2c_start(address | I2C_READ, timeout);
+    i2c_status_t status = i2c_start(address | I2C_ACTION_READ, timeout);
 
     for (uint16_t i = 0; i < (length - 1) && status >= 0; i++) {
         status = i2c_read_ack(timeout);
diff --git a/platforms/chibios/drivers/i2c_master.c b/platforms/chibios/drivers/i2c_master.c
index 43591d56f8..4a5d4760d0 100644
--- a/platforms/chibios/drivers/i2c_master.c
+++ b/platforms/chibios/drivers/i2c_master.c
@@ -27,8 +27,67 @@
 #include "quantum.h"
 #include "i2c_master.h"
 #include <string.h>
+#include <ch.h>
 #include <hal.h>
 
+#ifndef I2C1_SCL_PIN
+#    define I2C1_SCL_PIN B6
+#endif
+#ifndef I2C1_SDA_PIN
+#    define I2C1_SDA_PIN B7
+#endif
+
+#ifdef USE_I2CV1
+#    ifndef I2C1_OPMODE
+#        define I2C1_OPMODE OPMODE_I2C
+#    endif
+#    ifndef I2C1_CLOCK_SPEED
+#        define I2C1_CLOCK_SPEED 100000 /* 400000 */
+#    endif
+#    ifndef I2C1_DUTY_CYCLE
+#        define I2C1_DUTY_CYCLE STD_DUTY_CYCLE /* FAST_DUTY_CYCLE_2 */
+#    endif
+#else
+// The default timing values below configures the I2C clock to 400khz assuming a 72Mhz clock
+// For more info : https://www.st.com/en/embedded-software/stsw-stm32126.html
+#    ifndef I2C1_TIMINGR_PRESC
+#        define I2C1_TIMINGR_PRESC 0U
+#    endif
+#    ifndef I2C1_TIMINGR_SCLDEL
+#        define I2C1_TIMINGR_SCLDEL 7U
+#    endif
+#    ifndef I2C1_TIMINGR_SDADEL
+#        define I2C1_TIMINGR_SDADEL 0U
+#    endif
+#    ifndef I2C1_TIMINGR_SCLH
+#        define I2C1_TIMINGR_SCLH 38U
+#    endif
+#    ifndef I2C1_TIMINGR_SCLL
+#        define I2C1_TIMINGR_SCLL 129U
+#    endif
+#endif
+
+#ifndef I2C_DRIVER
+#    define I2C_DRIVER I2CD1
+#endif
+
+#ifdef USE_GPIOV1
+#    ifndef I2C1_SCL_PAL_MODE
+#        define I2C1_SCL_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
+#    endif
+#    ifndef I2C1_SDA_PAL_MODE
+#        define I2C1_SDA_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
+#    endif
+#else
+// The default PAL alternate modes are used to signal that the pins are used for I2C
+#    ifndef I2C1_SCL_PAL_MODE
+#        define I2C1_SCL_PAL_MODE 4
+#    endif
+#    ifndef I2C1_SDA_PAL_MODE
+#        define I2C1_SDA_PAL_MODE 4
+#    endif
+#endif
+
 static uint8_t i2c_address;
 
 static const I2CConfig i2cconfig = {
diff --git a/platforms/chibios/drivers/i2c_master.h b/platforms/chibios/drivers/i2c_master.h
index 5f082e9d1e..deee7ecc08 100644
--- a/platforms/chibios/drivers/i2c_master.h
+++ b/platforms/chibios/drivers/i2c_master.h
@@ -24,66 +24,7 @@
  */
 #pragma once
 
-#include <ch.h>
-#include <hal.h>
-
-#ifndef I2C1_SCL_PIN
-#    define I2C1_SCL_PIN B6
-#endif
-#ifndef I2C1_SDA_PIN
-#    define I2C1_SDA_PIN B7
-#endif
-
-#ifdef USE_I2CV1
-#    ifndef I2C1_OPMODE
-#        define I2C1_OPMODE OPMODE_I2C
-#    endif
-#    ifndef I2C1_CLOCK_SPEED
-#        define I2C1_CLOCK_SPEED 100000 /* 400000 */
-#    endif
-#    ifndef I2C1_DUTY_CYCLE
-#        define I2C1_DUTY_CYCLE STD_DUTY_CYCLE /* FAST_DUTY_CYCLE_2 */
-#    endif
-#else
-// The default timing values below configures the I2C clock to 400khz assuming a 72Mhz clock
-// For more info : https://www.st.com/en/embedded-software/stsw-stm32126.html
-#    ifndef I2C1_TIMINGR_PRESC
-#        define I2C1_TIMINGR_PRESC 0U
-#    endif
-#    ifndef I2C1_TIMINGR_SCLDEL
-#        define I2C1_TIMINGR_SCLDEL 7U
-#    endif
-#    ifndef I2C1_TIMINGR_SDADEL
-#        define I2C1_TIMINGR_SDADEL 0U
-#    endif
-#    ifndef I2C1_TIMINGR_SCLH
-#        define I2C1_TIMINGR_SCLH 38U
-#    endif
-#    ifndef I2C1_TIMINGR_SCLL
-#        define I2C1_TIMINGR_SCLL 129U
-#    endif
-#endif
-
-#ifndef I2C_DRIVER
-#    define I2C_DRIVER I2CD1
-#endif
-
-#ifdef USE_GPIOV1
-#    ifndef I2C1_SCL_PAL_MODE
-#        define I2C1_SCL_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
-#    endif
-#    ifndef I2C1_SDA_PAL_MODE
-#        define I2C1_SDA_PAL_MODE PAL_MODE_ALTERNATE_OPENDRAIN
-#    endif
-#else
-// The default PAL alternate modes are used to signal that the pins are used for I2C
-#    ifndef I2C1_SCL_PAL_MODE
-#        define I2C1_SCL_PAL_MODE 4
-#    endif
-#    ifndef I2C1_SDA_PAL_MODE
-#        define I2C1_SDA_PAL_MODE 4
-#    endif
-#endif
+#include <stdint.h>
 
 typedef int16_t i2c_status_t;
 

From 942b3cf16cceec2afa72bea2f12ef543f395a5db Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 6 Dec 2021 09:38:36 -0800
Subject: [PATCH 010/867] Generalize Unicode defines (#15409)

---
 common_features.mk | 1 +
 quantum/quantum.c  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common_features.mk b/common_features.mk
index 8c593024f0..56a9a286ea 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -604,6 +604,7 @@ ifeq ($(strip $(UNICODE_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(UNICODE_COMMON)), yes)
+    OPT_DEFS += -DUNICODE_COMMON_ENABLE
     SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c
 endif
 
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 35b6351e9d..5ecc183327 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -263,7 +263,7 @@ bool process_record_quantum(keyrecord_t *record) {
 #ifdef TAP_DANCE_ENABLE
             process_tap_dance(keycode, record) &&
 #endif
-#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
+#if defined(UNICODE_COMMON_ENABLE)
             process_unicode_common(keycode, record) &&
 #endif
 #ifdef LEADER_ENABLE
@@ -387,7 +387,7 @@ void matrix_init_quantum() {
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_init();
 #endif
-#if defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)
+#if defined(UNICODE_COMMON_ENABLE)
     unicode_input_mode_init();
 #endif
 #ifdef HAPTIC_ENABLE

From 5f7c0e3097359bc867304640b6c7b7df3ad0ac7f Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 6 Dec 2021 11:36:30 -0800
Subject: [PATCH 011/867] Add missing define for unicode common (#15416)

---
 quantum/quantum.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/quantum/quantum.h b/quantum/quantum.h
index 6927884e2f..5d3a665887 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -109,6 +109,10 @@ extern layer_state_t layer_state;
 #    include "process_unicodemap.h"
 #endif
 
+#ifdef UNICODE_COMMON_ENABLE
+#    include "process_unicode_common.h"
+#endif
+
 #ifdef KEY_OVERRIDE_ENABLE
 #    include "process_key_override.h"
 #endif

From 9d7e64bcb3ee075dd7e253bce58a2015ac8b1353 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 7 Dec 2021 00:57:33 -0800
Subject: [PATCH 012/867] Remove Deprecated USB Polling comment from vusb.c
 (#15420)

---
 tmk_core/protocol/vusb/vusb.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index bd0f1c21aa..8bdcccc9c9 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -647,7 +647,6 @@ const PROGMEM uchar console_hid_report[] = {
 #    define USB_MAX_POWER_CONSUMPTION 500
 #endif
 
-// TODO: change this to 10ms to match LUFA
 #ifndef USB_POLLING_INTERVAL_MS
 #    define USB_POLLING_INTERVAL_MS 1
 #endif

From 26febb7c24581d5c91e188362684aee1f31edf1b Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 8 Dec 2021 07:38:09 -0800
Subject: [PATCH 013/867] Expand rotational range for PMW3360 Optical Sensor
 (#15431)

---
 docs/feature_pointing_device.md | 2 +-
 drivers/sensors/pmw3360.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 031ee52c1c..61d76cfc2a 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -150,7 +150,7 @@ The PMW 3360 is an SPI driven optical sensor, that uses a built in IR LED for su
 |`PMW3360_SPI_LSBFIRST`       | (Optional) Sets the Least/Most Significant Byte First setting for SPI.                     | `false`       |
 |`PMW3360_SPI_MODE`           | (Optional) Sets the SPI Mode for the sensor.                                               | `3`           |
 |`PMW3360_SPI_DIVISOR`        | (Optional) Sets the SPI Divisor used for SPI communication.                                | _varies_      |
-|`ROTATIONAL_TRANSFORM_ANGLE` | (Optional) Allows for the sensor data to be rotated +/- 30 degrees directly in the sensor. | `0`           |
+|`ROTATIONAL_TRANSFORM_ANGLE` | (Optional) Allows for the sensor data to be rotated +/- 127 degrees directly in the sensor. | `0`           |
 
 The CPI range is 100-12000, in increments of 100. Defaults to 1600 CPI.
 
diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index 2b27dccbb6..80852fd62c 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -184,7 +184,7 @@ bool pmw3360_init(void) {
 
     spi_write_adv(REG_Config2, 0x00);
 
-    spi_write_adv(REG_Angle_Tune, constrain(ROTATIONAL_TRANSFORM_ANGLE, -30, 30));
+    spi_write_adv(REG_Angle_Tune, constrain(ROTATIONAL_TRANSFORM_ANGLE, -127, 127));
 
     bool init_success = pmw3360_check_signature();
 

From 30f0bbe079003fb18764f9026a8eed7464efb216 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 9 Dec 2021 07:42:21 +1100
Subject: [PATCH 014/867] Add support for 21.11.x, remove 21.6.x as ChibiOS
 "canceled" it. (#15435)

---
 util/update_chibios_mirror.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/util/update_chibios_mirror.sh b/util/update_chibios_mirror.sh
index 0bf648ebfd..e6666c55c9 100755
--- a/util/update_chibios_mirror.sh
+++ b/util/update_chibios_mirror.sh
@@ -4,13 +4,13 @@
 # Configuration
 
 # The ChibiOS branches to mirror
-chibios_branches="trunk stable_20.3.x stable_21.6.x"
+chibios_branches="trunk stable_20.3.x stable_21.11.x"
 
 # The ChibiOS tags to mirror
-chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver20.3.4 ver21.6.0"
+chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver20.3.4 ver21.11.1"
 
 # The ChibiOS-Contrib branches to mirror
-contrib_branches="chibios-20.3.x chibios-21.6.x"
+contrib_branches="chibios-20.3.x chibios-21.11.x"
 
 ################################
 # Actions
@@ -88,5 +88,5 @@ echo "Updating ChibiOS-Contrib branches..."
 for branch in $contrib_branches ; do
     echo "Creating branch 'mirror/$branch' from 'upstream/$branch'..."
     git branch -f mirror/$branch upstream/$branch \
-        && git push qmk mirror/$branch
+        && git push qmk mirror/$branch || true # Allow for nonexistent ChibiOS-Contrib branches -- they'll turn up eventually.
 done

From 415faebd6563fa07e2f0c830546217bdb621128f Mon Sep 17 00:00:00 2001
From: "Dipl.-Ing. Raoul Rubien, BSc" <rubienr@sbox.tugraz.at>
Date: Sun, 12 Dec 2021 01:58:25 +0100
Subject: [PATCH 015/867] added missing audio_off_user() callback (#15457)

Co-authored-by: Raoul Rubien <raoul.rubienr@gmail.com>
---
 quantum/audio/audio.c                   | 3 +++
 quantum/process_keycode/process_audio.c | 1 +
 quantum/process_keycode/process_audio.h | 1 +
 3 files changed, 5 insertions(+)

diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index 49bb309e80..b3d6389dd5 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -160,6 +160,8 @@ void audio_toggle(void) {
     eeconfig_update_audio(audio_config.raw);
     if (audio_config.enable) {
         audio_on_user();
+    } else {
+        audio_off_user();
     }
 }
 
@@ -172,6 +174,7 @@ void audio_on(void) {
 
 void audio_off(void) {
     PLAY_SONG(audio_off_song);
+    audio_off_user();
     wait_ms(100);
     audio_stop_all();
     audio_config.enable = 0;
diff --git a/quantum/process_keycode/process_audio.c b/quantum/process_keycode/process_audio.c
index 3b5fa8490b..23664721e8 100644
--- a/quantum/process_keycode/process_audio.c
+++ b/quantum/process_keycode/process_audio.c
@@ -57,3 +57,4 @@ void process_audio_noteoff(uint8_t note) { stop_note(compute_freq_for_midi_note(
 void process_audio_all_notes_off(void) { stop_all_notes(); }
 
 __attribute__((weak)) void audio_on_user() {}
+__attribute__((weak)) void audio_off_user() {}
diff --git a/quantum/process_keycode/process_audio.h b/quantum/process_keycode/process_audio.h
index d89a834ea8..42cfab4af2 100644
--- a/quantum/process_keycode/process_audio.h
+++ b/quantum/process_keycode/process_audio.h
@@ -8,3 +8,4 @@ void process_audio_noteoff(uint8_t note);
 void process_audio_all_notes_off(void);
 
 void audio_on_user(void);
+void audio_off_user(void);

From 8b865a9d6445e3bce6c991224f373d71c67e87e5 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 14 Dec 2021 19:40:18 +0100
Subject: [PATCH 016/867] [Core] Don't send keyboard reports that propagate no
 changes to the host  (#14065)

---
 quantum/action_util.c                         |  9 ++-
 tests/auto_shift/test_auto_shift.cpp          |  3 -
 tests/basic/test_action_layer.cpp             | 33 ++++-------
 tests/basic/test_keypress.cpp                 | 55 +++++++++----------
 tests/basic/test_one_shot_keys.cpp            |  8 +--
 .../permissive_hold/test_tap_hold.cpp         |  3 +-
 .../test_tap_hold.cpp                         |  3 +-
 .../tapping_force_hold/test_action_layer.cpp  |  3 +-
 .../tapping_force_hold/test_tap_hold.cpp      |  2 -
 tests/test_common/test_fixture.cpp            |  3 -
 10 files changed, 51 insertions(+), 71 deletions(-)

diff --git a/quantum/action_util.c b/quantum/action_util.c
index 78e02aec18..7e30593fb1 100644
--- a/quantum/action_util.c
+++ b/quantum/action_util.c
@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action_layer.h"
 #include "timer.h"
 #include "keycode_config.h"
+#include <string.h>
 
 extern keymap_config_t keymap_config;
 
@@ -247,7 +248,13 @@ void send_keyboard_report(void) {
     keyboard_report->mods |= weak_override_mods;
 #endif
 
-    host_keyboard_send(keyboard_report);
+    static report_keyboard_t last_report;
+
+    /* Only send the report if there are changes to propagate to the host. */
+    if (memcmp(keyboard_report, &last_report, sizeof(report_keyboard_t)) != 0) {
+        memcpy(&last_report, keyboard_report, sizeof(report_keyboard_t));
+        host_keyboard_send(keyboard_report);
+    }
 }
 
 /** \brief Get mods
diff --git a/tests/auto_shift/test_auto_shift.cpp b/tests/auto_shift/test_auto_shift.cpp
index 9c5ed9a832..a19b5dfa82 100644
--- a/tests/auto_shift/test_auto_shift.cpp
+++ b/tests/auto_shift/test_auto_shift.cpp
@@ -42,7 +42,6 @@ TEST_F(AutoShift, key_release_before_timeout) {
     /* Release regular key */
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_A)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     regular_key.release();
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
@@ -65,8 +64,6 @@ TEST_F(AutoShift, key_release_after_timeout) {
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_A)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     regular_key.release();
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
diff --git a/tests/basic/test_action_layer.cpp b/tests/basic/test_action_layer.cpp
index 1b12d13642..fe5c729f7c 100644
--- a/tests/basic/test_action_layer.cpp
+++ b/tests/basic/test_action_layer.cpp
@@ -131,14 +131,12 @@ TEST_F(ActionLayer, MomentaryLayerDoesNothing) {
     set_keymap({layer_key});
 
     /* Press and release MO, nothing should happen. */
-    /* TODO: QMK currently sends an empty report even if nothing needs to be reported to the host! */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(1);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     layer_key.press();
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
 
-    /* TODO: QMK currently sends an empty report even if nothing needs to be reported to the host! */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(1);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     layer_key.release();
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
@@ -153,8 +151,7 @@ TEST_F(ActionLayer, MomentaryLayerWithKeypress) {
     set_keymap({layer_key, regular_key, KeymapKey{1, 1, 0, KC_B}});
 
     /* Press MO. */
-    /* TODO: QMK currently sends an empty report even if nothing needs to be reported to the host! */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(1);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     layer_key.press();
     run_one_scan_loop();
     EXPECT_TRUE(layer_state_is(1));
@@ -175,8 +172,7 @@ TEST_F(ActionLayer, MomentaryLayerWithKeypress) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Release MO */
-    /* TODO: QMK currently sends an empty report even if nothing needs to be reported to the host! */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(1);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     layer_key.release();
     run_one_scan_loop();
     EXPECT_TRUE(layer_state_is(0));
@@ -199,8 +195,7 @@ TEST_F(ActionLayer, ToggleLayerDoesNothing) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Release TG. */
-    /* TODO: QMK currently sends an empty report even if nothing needs to be reported to the host! */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(1);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     layer_key.release();
     run_one_scan_loop();
     EXPECT_TRUE(layer_state_is(1));
@@ -223,8 +218,7 @@ TEST_F(ActionLayer, ToggleLayerUpAndDown) {
     EXPECT_TRUE(layer_state_is(1));
     testing::Mock::VerifyAndClearExpectations(&driver);
 
-    /* TODO: QMK currently sends an empty report even if nothing needs to be reported to the host! */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(1);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     toggle_layer_1_on_layer_0.release();
     run_one_scan_loop();
     EXPECT_TRUE(layer_state_is(1));
@@ -237,8 +231,7 @@ TEST_F(ActionLayer, ToggleLayerUpAndDown) {
     EXPECT_TRUE(layer_state_is(0));
     testing::Mock::VerifyAndClearExpectations(&driver);
 
-    /* TODO: QMK currently sends an empty report even if nothing needs to be reported to the host! */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(1);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     toggle_layer_0_on_layer_1.release();
     run_one_scan_loop();
     EXPECT_TRUE(layer_state_is(0));
@@ -254,14 +247,13 @@ TEST_F(ActionLayer, LayerTapToggleDoesNothing) {
     set_keymap({layer_key});
 
     /* Press and release TT. */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(0);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     layer_key.press();
     run_one_scan_loop();
     EXPECT_TRUE(layer_state_is(1));
     testing::Mock::VerifyAndClearExpectations(&driver);
 
-    /* TODO: QMK currently sends an empty report even if nothing needs to be reported to the host! */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(2);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     layer_key.release();
     run_one_scan_loop();
     EXPECT_TRUE(layer_state_is(0));
@@ -279,7 +271,6 @@ TEST_F(ActionLayer, LayerTapToggleWithKeypress) {
     set_keymap({layer_key, regular_key, KeymapKey{1, 1, 0, KC_B}});
 
     /* Press TT. */
-    /* TODO: QMK currently sends an empty report even if nothing needs to be reported to the host! */
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(0);
     layer_key.press();
     run_one_scan_loop();
@@ -298,8 +289,7 @@ TEST_F(ActionLayer, LayerTapToggleWithKeypress) {
     EXPECT_TRUE(layer_state_is(1));
     testing::Mock::VerifyAndClearExpectations(&driver);
 
-    /* TODO: QMK currently sends an empty report even if nothing needs to be reported to the host! */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(1);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     layer_key.release();
     run_one_scan_loop();
     EXPECT_TRUE(layer_state_is(0));
@@ -317,8 +307,7 @@ TEST_F(ActionLayer, LayerTapToggleWithToggleWithKeypress) {
     set_keymap({layer_key, regular_key, KeymapKey{1, 1, 0, KC_B}});
 
     /* Tap TT five times . */
-    /* TODO: QMK currently sends an empty report even if nothing needs to be reported to the host! */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(9);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
 
     layer_key.press();
     run_one_scan_loop();
diff --git a/tests/basic/test_keypress.cpp b/tests/basic/test_keypress.cpp
index 1c175c9d56..044fc29378 100644
--- a/tests/basic/test_keypress.cpp
+++ b/tests/basic/test_keypress.cpp
@@ -85,7 +85,7 @@ TEST_F(KeyPress, CorrectKeysAreReportedWhenTwoKeysArePressed) {
 TEST_F(KeyPress, LeftShiftIsReportedCorrectly) {
     TestDriver driver;
     auto       key_a    = KeymapKey(0, 0, 0, KC_A);
-    auto       key_lsft = KeymapKey(0, 3, 0, KC_LSFT);
+    auto       key_lsft = KeymapKey(0, 3, 0, KC_LEFT_SHIFT);
 
     set_keymap({key_a, key_lsft});
 
@@ -110,8 +110,8 @@ TEST_F(KeyPress, LeftShiftIsReportedCorrectly) {
 
 TEST_F(KeyPress, PressLeftShiftAndControl) {
     TestDriver driver;
-    auto       key_lsft  = KeymapKey(0, 3, 0, KC_LSFT);
-    auto       key_lctrl = KeymapKey(0, 5, 0, KC_LCTRL);
+    auto       key_lsft  = KeymapKey(0, 3, 0, KC_LEFT_SHIFT);
+    auto       key_lctrl = KeymapKey(0, 5, 0, KC_LEFT_CTRL);
 
     set_keymap({key_lctrl, key_lsft});
 
@@ -138,8 +138,8 @@ TEST_F(KeyPress, PressLeftShiftAndControl) {
 
 TEST_F(KeyPress, LeftAndRightShiftCanBePressedAtTheSameTime) {
     TestDriver driver;
-    auto       key_lsft = KeymapKey(0, 3, 0, KC_LSFT);
-    auto       key_rsft = KeymapKey(0, 4, 0, KC_RSFT);
+    auto       key_lsft = KeymapKey(0, 3, 0, KC_LEFT_SHIFT);
+    auto       key_rsft = KeymapKey(0, 4, 0, KC_RIGHT_SHIFT);
 
     set_keymap({key_rsft, key_lsft});
 
@@ -175,12 +175,12 @@ TEST_F(KeyPress, RightShiftLeftControlAndCharWithTheSameKey) {
     // The underlying cause is that we use only one bit to represent the right hand
     // modifiers.
     combo_key.press();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL)));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL, KC_O)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RIGHT_SHIFT, KC_RIGHT_CTRL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RIGHT_SHIFT, KC_RIGHT_CTRL, KC_O)));
     keyboard_task();
 
     combo_key.release();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RSFT, KC_RCTRL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_RIGHT_SHIFT, KC_RIGHT_CTRL)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     keyboard_task();
 }
@@ -189,18 +189,18 @@ TEST_F(KeyPress, PressPlusEqualReleaseBeforePress) {
     TestDriver driver;
     InSequence s;
     auto       key_plus = KeymapKey(0, 1, 1, KC_PLUS);
-    auto       key_eql  = KeymapKey(0, 0, 1, KC_EQL);
+    auto       key_eql  = KeymapKey(0, 0, 1, KC_EQUAL);
 
     set_keymap({key_plus, key_eql});
 
     key_plus.press();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     key_plus.release();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
@@ -220,13 +220,13 @@ TEST_F(KeyPress, PressPlusEqualDontReleaseBeforePress) {
     TestDriver driver;
     InSequence s;
     auto       key_plus = KeymapKey(0, 1, 1, KC_PLUS);
-    auto       key_eql  = KeymapKey(0, 0, 1, KC_EQL);
+    auto       key_eql  = KeymapKey(0, 0, 1, KC_EQUAL);
 
     set_keymap({key_plus, key_eql});
 
     key_plus.press();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
 
@@ -237,14 +237,13 @@ TEST_F(KeyPress, PressPlusEqualDontReleaseBeforePress) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     key_plus.release();
-    // BUG: Should really still return KC_EQL, but this is fine too
-    // It's also called twice for some reason
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(2);
+    // BUG: Should really still return KC_EQUAL, but this is fine too
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(1);
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     key_eql.release();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
 }
@@ -253,12 +252,12 @@ TEST_F(KeyPress, PressEqualPlusReleaseBeforePress) {
     TestDriver driver;
     InSequence s;
     auto       key_plus = KeymapKey(0, 1, 1, KC_PLUS);
-    auto       key_eql  = KeymapKey(0, 0, 1, KC_EQL);
+    auto       key_eql  = KeymapKey(0, 0, 1, KC_EQUAL);
 
     set_keymap({key_plus, key_eql});
 
     key_eql.press();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQUAL)));
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
 
@@ -268,13 +267,13 @@ TEST_F(KeyPress, PressEqualPlusReleaseBeforePress) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     key_plus.press();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_EQUAL)));
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     key_plus.release();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
@@ -284,12 +283,12 @@ TEST_F(KeyPress, PressEqualPlusDontReleaseBeforePress) {
     TestDriver driver;
     InSequence s;
     auto       key_plus = KeymapKey(0, 1, 1, KC_PLUS);
-    auto       key_eql  = KeymapKey(0, 0, 1, KC_EQL);
+    auto       key_eql  = KeymapKey(0, 0, 1, KC_EQUAL);
 
     set_keymap({key_plus, key_eql});
 
     key_eql.press();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQL)));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_EQUAL)));
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
 
@@ -309,9 +308,7 @@ TEST_F(KeyPress, PressEqualPlusDontReleaseBeforePress) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     key_plus.release();
-    // This report is not needed
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
-}
\ No newline at end of file
+}
diff --git a/tests/basic/test_one_shot_keys.cpp b/tests/basic/test_one_shot_keys.cpp
index 98178912e4..43fc3e1ba3 100644
--- a/tests/basic/test_one_shot_keys.cpp
+++ b/tests/basic/test_one_shot_keys.cpp
@@ -175,22 +175,20 @@ TEST_F(OneShot, OSLWithAdditionalKeypress) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Release OSL key */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(2);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     osl_key.release();
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Press regular key */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(regular_key.report_code))).Times(2);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(regular_key.report_code))).Times(1);
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     regular_key.press();
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Release regular key */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     regular_key.release();
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
diff --git a/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp b/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp
index ab9dd1518b..00c2b33cb7 100644
--- a/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/permissive_hold/test_tap_hold.cpp
@@ -117,7 +117,6 @@ TEST_F(PermissiveHold, tap_regular_key_while_layer_tap_key_is_held) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Release regular key */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(layer_key.report_code)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     regular_key.release();
@@ -125,7 +124,7 @@ TEST_F(PermissiveHold, tap_regular_key_while_layer_tap_key_is_held) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Release layer-tap-hold key */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     layer_tap_hold_key.release();
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
diff --git a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test_tap_hold.cpp b/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test_tap_hold.cpp
index 67f394653f..67706f80dc 100644
--- a/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/permissive_hold_ignore_mod_tap_interrupt/test_tap_hold.cpp
@@ -119,7 +119,6 @@ TEST_F(PermissiveHold_IgnoreModTapInterrupt, tap_regular_key_while_layer_tap_key
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Release regular key */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_B)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
     regular_key.release();
@@ -127,7 +126,7 @@ TEST_F(PermissiveHold_IgnoreModTapInterrupt, tap_regular_key_while_layer_tap_key
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Release layer-tap-hold key */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
     layer_tap_hold_key.release();
     run_one_scan_loop();
     testing::Mock::VerifyAndClearExpectations(&driver);
diff --git a/tests/tap_hold_configurations/tapping_force_hold/test_action_layer.cpp b/tests/tap_hold_configurations/tapping_force_hold/test_action_layer.cpp
index 02416eed73..54e7daa22c 100644
--- a/tests/tap_hold_configurations/tapping_force_hold/test_action_layer.cpp
+++ b/tests/tap_hold_configurations/tapping_force_hold/test_action_layer.cpp
@@ -31,9 +31,8 @@ TEST_F(ActionLayer, LayerTapToggleWithToggleWithKeypress) {
     set_keymap({layer_key, regular_key, KeymapKey{1, 1, 0, KC_B}});
 
     /* Tap TT five times . */
-    /* TODO: QMK currently sends an empty report even if nothing needs to be reported to the host! */
     /* TODO: Tapping Force Hold breaks TT */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(10);
+    EXPECT_CALL(driver, send_keyboard_mock(_)).Times(0);
 
     layer_key.press();
     run_one_scan_loop();
diff --git a/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp b/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp
index cb68429617..3ae7c4ccfd 100644
--- a/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp
+++ b/tests/tap_hold_configurations/tapping_force_hold/test_tap_hold.cpp
@@ -60,7 +60,6 @@ TEST_F(TappingForceHold, tap_regular_key_while_mod_tap_key_is_held) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Idle for tapping term of mod tap hold key. */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_A)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
@@ -101,7 +100,6 @@ TEST_F(TappingForceHold, tap_mod_tap_key_while_mod_tap_key_is_held) {
     testing::Mock::VerifyAndClearExpectations(&driver);
 
     /* Idle for tapping term of first mod tap hold key. */
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT, KC_A)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT)));
     EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()));
diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp
index 0601b17191..91bf3e779e 100644
--- a/tests/test_common/test_fixture.cpp
+++ b/tests/test_common/test_fixture.cpp
@@ -48,7 +48,6 @@ void TestFixture::SetUpTestCase() {
     eeconfig_update_debug(debug_config.raw);
 
     TestDriver driver;
-    EXPECT_CALL(driver, send_keyboard_mock(_));
     keyboard_init();
 
     test_logger.info() << "TestFixture setup-up end." << std::endl;
@@ -62,8 +61,6 @@ TestFixture::~TestFixture() {
     test_logger.info() << "TestFixture clean-up start." << std::endl;
     TestDriver driver;
 
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(2);
-
     /* Reset keyboard state. */
     clear_all_keys();
 

From c12268807d8622a05dc445e6101a575eae16860d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 15 Dec 2021 22:00:39 +1100
Subject: [PATCH 017/867] Migrate serial_uart usages to UART driver (#15479)

* Migrate Thermal Printer feature to UART driver

* Migrate 40percentclub UT47 to UART driver

* Migrate Centromere to UART driver

* Migrate Chimera Ergo to UART driver

* Migrate Chimera Let's Split to UART driver

* Migrate Chimera Ortho to UART driver

* Migrate Chimera Ortho Plus to UART driver

* Migrate Comet46 to UART driver

* Migrate Palm USB converter to UART driver

* Migrate Sun USB converter to UART driver

* Migrate Dichotomy to UART driver

* Migrate Honeycomb to UART driver

* Migrate Mitosis to UART driver

* Migrate Redox W to UART driver

* Migrate Uni660 to UART driver

* Migrate Telophase to UART driver
---
 common_features.mk                            |  2 +-
 .../ut47/keymaps/default/keymap.c             |  6 +-
 .../ut47/keymaps/non-us/keymap.c              |  6 +-
 .../ut47/keymaps/nordic/keymap.c              |  6 +-
 .../40percentclub/ut47/keymaps/rgb/keymap.c   |  6 +-
 keyboards/40percentclub/ut47/matrix.c         |  8 ---
 keyboards/40percentclub/ut47/rules.mk         |  3 +-
 keyboards/40percentclub/ut47/ut47.c           |  8 ++-
 keyboards/centromere/config.h                 |  9 ---
 keyboards/centromere/matrix.c                 | 10 ++--
 keyboards/centromere/rules.mk                 |  3 +-
 keyboards/chimera_ergo/config.h               |  9 ---
 keyboards/chimera_ergo/matrix.c               | 10 ++--
 keyboards/chimera_ergo/rules.mk               |  3 +-
 keyboards/chimera_ls/config.h                 |  9 ---
 keyboards/chimera_ls/matrix.c                 | 10 ++--
 keyboards/chimera_ls/rules.mk                 |  3 +-
 keyboards/chimera_ortho/config.h              |  9 ---
 keyboards/chimera_ortho/matrix.c              | 10 ++--
 keyboards/chimera_ortho/rules.mk              |  3 +-
 keyboards/chimera_ortho_plus/config.h         |  9 ---
 keyboards/chimera_ortho_plus/matrix.c         | 10 ++--
 keyboards/chimera_ortho_plus/rules.mk         |  3 +-
 keyboards/comet46/config.h                    |  9 ---
 keyboards/comet46/matrix.c                    | 10 ++--
 keyboards/comet46/rules.mk                    |  4 +-
 keyboards/converter/palm_usb/config.h         | 55 -------------------
 keyboards/converter/palm_usb/matrix.c         |  8 +--
 keyboards/converter/palm_usb/post_rules.mk    |  7 ---
 keyboards/converter/palm_usb/rules.mk         |  1 +
 keyboards/converter/sun_usb/command_extra.c   | 22 ++++----
 keyboards/converter/sun_usb/config.h          | 47 ----------------
 keyboards/converter/sun_usb/led.c             |  6 +-
 keyboards/converter/sun_usb/matrix.c          | 20 +++----
 keyboards/converter/sun_usb/post_rules.mk     |  6 --
 keyboards/converter/sun_usb/rules.mk          |  1 +
 keyboards/dichotomy/config.h                  |  9 ---
 keyboards/dichotomy/dichotomy.c               |  8 ++-
 keyboards/dichotomy/matrix.c                  | 10 ++--
 keyboards/dichotomy/rules.mk                  |  3 +-
 keyboards/honeycomb/config.h                  |  9 ---
 keyboards/honeycomb/honeycomb.c               |  6 +-
 keyboards/honeycomb/matrix.c                  | 10 ++--
 keyboards/honeycomb/rules.mk                  |  3 +-
 keyboards/mitosis/config.h                    |  9 ---
 keyboards/mitosis/matrix.c                    | 10 ++--
 keyboards/mitosis/rules.mk                    |  3 +-
 .../planck/keymaps/thermal_printer/config.h   | 12 +---
 keyboards/redox_w/config.h                    |  9 ---
 keyboards/redox_w/matrix.c                    | 10 ++--
 keyboards/redox_w/rules.mk                    |  3 +-
 keyboards/sirius/uni660/rev1/config.h         |  9 ---
 keyboards/sirius/uni660/rev1/matrix.c         | 10 ++--
 keyboards/sirius/uni660/rev1/rules.mk         |  3 +-
 keyboards/sirius/uni660/rev2/ansi/config.h    |  9 ---
 keyboards/sirius/uni660/rev2/iso/config.h     |  9 ---
 keyboards/sirius/uni660/rev2/matrix.c         | 10 ++--
 keyboards/sirius/uni660/rev2/rules.mk         |  3 +-
 keyboards/telophase/config.h                  |  9 ---
 keyboards/telophase/matrix.c                  | 10 ++--
 keyboards/telophase/rules.mk                  |  3 +-
 quantum/process_keycode/process_printer.c     |  5 +-
 quantum/process_keycode/process_printer.h     |  2 -
 63 files changed, 154 insertions(+), 393 deletions(-)
 delete mode 100644 keyboards/converter/palm_usb/post_rules.mk
 delete mode 100644 keyboards/converter/sun_usb/post_rules.mk

diff --git a/common_features.mk b/common_features.mk
index 56a9a286ea..fed005ff5a 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -356,7 +356,7 @@ endif
 ifeq ($(strip $(PRINTING_ENABLE)), yes)
     OPT_DEFS += -DPRINTING_ENABLE
     SRC += $(QUANTUM_DIR)/process_keycode/process_printer.c
-    SRC += $(TMK_DIR)/protocol/serial_uart.c
+    QUANTUM_LIB_SRC += uart.c
 endif
 
 VARIABLE_TRACE ?= no
diff --git a/keyboards/40percentclub/ut47/keymaps/default/keymap.c b/keyboards/40percentclub/ut47/keymaps/default/keymap.c
index 0fa7838dfd..4eb2c190c1 100644
--- a/keyboards/40percentclub/ut47/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/ut47/keymaps/default/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 #ifdef LED_ENABLE
-  #include "protocol/serial.h"
+  #include "uart.h"
 #endif
 
 #define LT3_TAB LT(3, KC_TAB)
@@ -108,11 +108,11 @@ LAYOUT( /* Tab */
 //LED keymap functions
  #ifdef LED_ENABLE
 void led_chmode(void) {
-  serial_send(101);
+  uart_write(0x65);
 }
 
 void led_toggle(void) {
-  serial_send(100);
+  uart_write(0x64);
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/40percentclub/ut47/keymaps/non-us/keymap.c b/keyboards/40percentclub/ut47/keymaps/non-us/keymap.c
index 0c1c2e7599..8a0ba7b391 100644
--- a/keyboards/40percentclub/ut47/keymaps/non-us/keymap.c
+++ b/keyboards/40percentclub/ut47/keymaps/non-us/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 #ifdef LED_ENABLE
-  #include "protocol/serial.h"
+  #include "uart.h"
 #endif
 
 #define LT3_TAB LT(3, KC_TAB)
@@ -108,11 +108,11 @@ LAYOUT( /* Tab */
 //LED keymap functions
  #ifdef LED_ENABLE
 void led_chmode(void) {
-  serial_send(101);
+  uart_write(0x65);
 }
 
 void led_toggle(void) {
-  serial_send(100);
+  uart_write(0x64);
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c b/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
index 52372e2857..5e79cdb9a4 100644
--- a/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
+++ b/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 #ifdef LED_ENABLE
-  #include "protocol/serial.h"
+  #include "uart.h"
 
 #endif
 
@@ -151,11 +151,11 @@ LAYOUT( /* GAMING, toggled on and off - L5 */
 //LED keymap functions
  #ifdef LED_ENABLE
 void led_chmode(void) {
-  serial_send(101);
+  uart_write(0x65);
 }
 
 void led_toggle(void) {
-  serial_send(100);
+  uart_write(0x64);
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c b/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c
index ae8ad3e378..75dba3a2d4 100644
--- a/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c
+++ b/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c
@@ -15,7 +15,7 @@
  */
 #include QMK_KEYBOARD_H
 #ifdef LED_ENABLE
-  #include "protocol/serial.h"
+  #include "uart.h"
 #endif
 
 #define LT3_TAB LT(3, KC_TAB)
@@ -60,11 +60,11 @@ LAYOUT( /* Tab */
 //LED keymap functions
  #ifdef LED_ENABLE
 void led_chmode(void) {
-  serial_send(101);
+  uart_write(0x65);
 }
 
 void led_toggle(void) {
-  serial_send(100);
+  uart_write(0x64);
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/keyboards/40percentclub/ut47/matrix.c b/keyboards/40percentclub/ut47/matrix.c
index c1284535bc..89537592c5 100644
--- a/keyboards/40percentclub/ut47/matrix.c
+++ b/keyboards/40percentclub/ut47/matrix.c
@@ -26,10 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
-#ifdef LED_ENABLE
-    #include "protocol/serial.h"
-#endif
-
 
 #ifndef DEBOUNCE
 #   define DEBOUNCE	5
@@ -69,10 +65,6 @@ void matrix_init(void)
         matrix[i] = 0;
         matrix_debouncing[i] = 0;
     }
-  
-#ifdef LED_ENABLE
-    serial_init();
-#endif
 }
 
 uint8_t matrix_scan(void)
diff --git a/keyboards/40percentclub/ut47/rules.mk b/keyboards/40percentclub/ut47/rules.mk
index 29cee474ff..6c9805e0fc 100644
--- a/keyboards/40percentclub/ut47/rules.mk
+++ b/keyboards/40percentclub/ut47/rules.mk
@@ -18,4 +18,5 @@ AUDIO_ENABLE = no           # Audio output
 
 # custom matrix setup
 CUSTOM_MATRIX = yes
-SRC += matrix.c protocol/serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/40percentclub/ut47/ut47.c b/keyboards/40percentclub/ut47/ut47.c
index 9054335e5a..c01562cb68 100644
--- a/keyboards/40percentclub/ut47/ut47.c
+++ b/keyboards/40percentclub/ut47/ut47.c
@@ -15,15 +15,19 @@
  */
 #include "ut47.h"
 #ifdef LED_ENABLE
-  #include "protocol/serial.h"
+  #include "uart.h"
 #endif
 
+void matrix_init_kb() {
+  uart_init(9600);
+}
+
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 	// put your per-action keyboard code here
 	// runs for every action, just before processing by the firmware
   if (record->event.pressed) {
     #ifdef LED_ENABLE
-      serial_send((record->event.key.row*16)+record->event.key.col);
+      uart_write((record->event.key.row*16)+record->event.key.col);
     #endif
   }
 	return process_record_user(keycode, record);
diff --git a/keyboards/centromere/config.h b/keyboards/centromere/config.h
index e502e2534b..b4cae20332 100644
--- a/keyboards/centromere/config.h
+++ b/keyboards/centromere/config.h
@@ -56,12 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 500000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
diff --git a/keyboards/centromere/matrix.c b/keyboards/centromere/matrix.c
index 7256cd5cb5..a46701275a 100644
--- a/keyboards/centromere/matrix.c
+++ b/keyboards/centromere/matrix.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
 #include "timer.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -80,7 +80,7 @@ uint8_t matrix_cols(void) {
 void matrix_init(void) {
 
     matrix_init_quantum();
-    serial_init();
+    uart_init(500000);
 }
 
 uint8_t matrix_scan(void)
@@ -88,7 +88,7 @@ uint8_t matrix_scan(void)
     uint32_t timeout = 0;
 
     //the s character requests the RF remote slave to send the matrix information
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     //trust the external keystates, erase the last set of data
     uint8_t uart_data[11] = {0};
@@ -96,13 +96,13 @@ uint8_t matrix_scan(void)
     //there are 10 bytes corresponding to 1w columns, and an end byte
     for (uint8_t i = 0; i < 11; i++) {
         //wait for the serial data, timeout if it's been too long
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
diff --git a/keyboards/centromere/rules.mk b/keyboards/centromere/rules.mk
index ed777e1b9e..15c6a20746 100644
--- a/keyboards/centromere/rules.mk
+++ b/keyboards/centromere/rules.mk
@@ -21,6 +21,7 @@ BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
 UNICODE_ENABLE = yes 		# Unicode
 
 # # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
 
 LAYOUTS = split_3x5_3 split_3x6_3
diff --git a/keyboards/chimera_ergo/config.h b/keyboards/chimera_ergo/config.h
index 0767a218b5..3c0cc5c162 100644
--- a/keyboards/chimera_ergo/config.h
+++ b/keyboards/chimera_ergo/config.h
@@ -56,12 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
diff --git a/keyboards/chimera_ergo/matrix.c b/keyboards/chimera_ergo/matrix.c
index 577176c466..ec438beb56 100644
--- a/keyboards/chimera_ergo/matrix.c
+++ b/keyboards/chimera_ergo/matrix.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
 #include "timer.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -89,7 +89,7 @@ uint8_t matrix_cols(void) {
 void matrix_init(void) {
 
     matrix_init_quantum();
-    serial_init();
+    uart_init(1000000);
 }
 
 uint8_t matrix_scan(void)
@@ -97,7 +97,7 @@ uint8_t matrix_scan(void)
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     //trust the external keystates entirely, erase the last data
     uint8_t uart_data[14] = {0};
@@ -107,13 +107,13 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
diff --git a/keyboards/chimera_ergo/rules.mk b/keyboards/chimera_ergo/rules.mk
index a8bd3a027a..483485cb7d 100644
--- a/keyboards/chimera_ergo/rules.mk
+++ b/keyboards/chimera_ergo/rules.mk
@@ -17,4 +17,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 # BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/chimera_ls/config.h b/keyboards/chimera_ls/config.h
index 2eb028471d..ca92e1e2e4 100644
--- a/keyboards/chimera_ls/config.h
+++ b/keyboards/chimera_ls/config.h
@@ -56,12 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
diff --git a/keyboards/chimera_ls/matrix.c b/keyboards/chimera_ls/matrix.c
index 9edd91818f..354346ca09 100644
--- a/keyboards/chimera_ls/matrix.c
+++ b/keyboards/chimera_ls/matrix.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
 #include "timer.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -93,7 +93,7 @@ uint8_t matrix_cols(void) {
 
 void matrix_init(void) {
     matrix_init_quantum();
-    serial_init();
+    uart_init(1000000);
 }
 
 uint8_t matrix_scan(void)
@@ -101,7 +101,7 @@ uint8_t matrix_scan(void)
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     //trust the external keystates entirely, erase the last data
     uint8_t uart_data[11] = {0};
@@ -111,13 +111,13 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
diff --git a/keyboards/chimera_ls/rules.mk b/keyboards/chimera_ls/rules.mk
index 377c379911..ae0cc8b749 100644
--- a/keyboards/chimera_ls/rules.mk
+++ b/keyboards/chimera_ls/rules.mk
@@ -17,7 +17,8 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 # BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
 
 LAYOUTS = ortho_4x12
 
diff --git a/keyboards/chimera_ortho/config.h b/keyboards/chimera_ortho/config.h
index 974502525c..3d86343a67 100644
--- a/keyboards/chimera_ortho/config.h
+++ b/keyboards/chimera_ortho/config.h
@@ -56,12 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
diff --git a/keyboards/chimera_ortho/matrix.c b/keyboards/chimera_ortho/matrix.c
index 34930af7e2..1403f410c0 100644
--- a/keyboards/chimera_ortho/matrix.c
+++ b/keyboards/chimera_ortho/matrix.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
 #include "timer.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -79,7 +79,7 @@ uint8_t matrix_cols(void) {
 void matrix_init(void) {
 
     matrix_init_quantum();
-    serial_init();
+    uart_init(1000000);
 }
 
 uint8_t matrix_scan(void)
@@ -87,7 +87,7 @@ uint8_t matrix_scan(void)
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     //trust the external keystates entirely, erase the last data
     uint8_t uart_data[11] = {0};
@@ -97,13 +97,13 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
diff --git a/keyboards/chimera_ortho/rules.mk b/keyboards/chimera_ortho/rules.mk
index fbe6872001..c35dc9ba2e 100644
--- a/keyboards/chimera_ortho/rules.mk
+++ b/keyboards/chimera_ortho/rules.mk
@@ -17,4 +17,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 # BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/chimera_ortho_plus/config.h b/keyboards/chimera_ortho_plus/config.h
index 4b12796e95..ebffb85657 100644
--- a/keyboards/chimera_ortho_plus/config.h
+++ b/keyboards/chimera_ortho_plus/config.h
@@ -56,12 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
diff --git a/keyboards/chimera_ortho_plus/matrix.c b/keyboards/chimera_ortho_plus/matrix.c
index 818e05ac98..51898e35d1 100644
--- a/keyboards/chimera_ortho_plus/matrix.c
+++ b/keyboards/chimera_ortho_plus/matrix.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
 #include "timer.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -79,7 +79,7 @@ uint8_t matrix_cols(void) {
 void matrix_init(void) {
 
     matrix_init_quantum();
-    serial_init();
+    uart_init(1000000);
 }
 
 uint8_t matrix_scan(void)
@@ -87,7 +87,7 @@ uint8_t matrix_scan(void)
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     //trust the external keystates entirely, erase the last data
     uint8_t uart_data[14] = {0};
@@ -97,13 +97,13 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
diff --git a/keyboards/chimera_ortho_plus/rules.mk b/keyboards/chimera_ortho_plus/rules.mk
index e99e79c327..cd98979306 100644
--- a/keyboards/chimera_ortho_plus/rules.mk
+++ b/keyboards/chimera_ortho_plus/rules.mk
@@ -20,4 +20,5 @@ UNICODE_ENABLE = yes
 CUSTOM_MATRIX = yes
 
 # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/comet46/config.h b/keyboards/comet46/config.h
index 067dabb103..5ea40c14c5 100644
--- a/keyboards/comet46/config.h
+++ b/keyboards/comet46/config.h
@@ -62,12 +62,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MODS_CTRL_MASK  (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL))
 #define MODS_ALT_MASK  (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
 #define MODS_GUI_MASK  (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
-
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
diff --git a/keyboards/comet46/matrix.c b/keyboards/comet46/matrix.c
index 34930af7e2..1403f410c0 100644
--- a/keyboards/comet46/matrix.c
+++ b/keyboards/comet46/matrix.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
 #include "timer.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -79,7 +79,7 @@ uint8_t matrix_cols(void) {
 void matrix_init(void) {
 
     matrix_init_quantum();
-    serial_init();
+    uart_init(1000000);
 }
 
 uint8_t matrix_scan(void)
@@ -87,7 +87,7 @@ uint8_t matrix_scan(void)
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     //trust the external keystates entirely, erase the last data
     uint8_t uart_data[11] = {0};
@@ -97,13 +97,13 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
diff --git a/keyboards/comet46/rules.mk b/keyboards/comet46/rules.mk
index 814622226a..10d828cc7f 100644
--- a/keyboards/comet46/rules.mk
+++ b/keyboards/comet46/rules.mk
@@ -19,5 +19,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 # project specific files
 SRC += matrix.c \
        i2c.c \
-       ssd1306.c \
-       serial_uart.c
+       ssd1306.c
+QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/converter/palm_usb/config.h b/keyboards/converter/palm_usb/config.h
index 4afc654e85..35032835cd 100644
--- a/keyboards/converter/palm_usb/config.h
+++ b/keyboards/converter/palm_usb/config.h
@@ -60,58 +60,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     get_mods() == (MOD_BIT(KC_LGUI) | MOD_BIT(KC_RGUI)) || \
     get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 )
-
-
-/* Serial(USART) configuration
- *     asynchronous, negative logic, 9600baud, no flow control
- *     1-start bit, 8-data bit, non parity, 1-stop bit
- */
-#define SERIAL_SOFT_BAUD            9600
-#define SERIAL_SOFT_PARITY_NONE
-#define SERIAL_SOFT_BIT_ORDER_LSB
-#if (HANDSPRING == 0)
-    #define SERIAL_SOFT_LOGIC_NEGATIVE  //RS232 logic
-#endif
-/* RXD Port */
-#define SERIAL_SOFT_RXD_ENABLE
-
-// we are using Pro micro pin 3 / D0 as serial
-#define SERIAL_SOFT_RXD_DDR         DDRD
-#define SERIAL_SOFT_RXD_PORT        PORTD
-#define SERIAL_SOFT_RXD_PIN         PIND
-#define SERIAL_SOFT_RXD_BIT         0
-#define SERIAL_SOFT_RXD_VECT        INT0_vect
-
-/* RXD Interupt */
-#define SERIAL_SOFT_RXD_INIT()      do { \
-    /* pin configuration: input with pull-up */ \
-    SERIAL_SOFT_RXD_DDR &= ~(1<<SERIAL_SOFT_RXD_BIT); \
-    SERIAL_SOFT_RXD_PORT |= (1<<SERIAL_SOFT_RXD_BIT); \
-    /* enable interrupt: INT0(rising edge) */ \
-    EICRA |= ((1<<ISC01)|(1<<ISC00)); \
-    EIMSK |= (1<<INT0); \
-    sei(); \
-} while (0)
-#define SERIAL_SOFT_RXD_INT_ENTER()
-#define SERIAL_SOFT_RXD_INT_EXIT()  do { \
-    /* clear interrupt  flag */ \
-    EIFR = (1<<INTF0); \
-} while (0)
-#define SERIAL_SOFT_RXD_READ()      (SERIAL_SOFT_RXD_PIN&(1<<SERIAL_SOFT_RXD_BIT))
-
-/* TXD Port */
-#define SERIAL_SOFT_TXD_ENABLE
-#define SERIAL_SOFT_TXD_DDR         DDRD
-#define SERIAL_SOFT_TXD_PORT        PORTD
-#define SERIAL_SOFT_TXD_PIN         PIND
-#define SERIAL_SOFT_TXD_BIT         3
-#define SERIAL_SOFT_TXD_HI()        do { SERIAL_SOFT_TXD_PORT |=  (1<<SERIAL_SOFT_TXD_BIT); } while (0)
-#define SERIAL_SOFT_TXD_LO()        do { SERIAL_SOFT_TXD_PORT &= ~(1<<SERIAL_SOFT_TXD_BIT); } while (0)
-#define SERIAL_SOFT_TXD_INIT()      do { \
-    /* pin configuration: output */ \
-    SERIAL_SOFT_TXD_DDR |= (1<<SERIAL_SOFT_TXD_BIT); \
-    /* idle */ \
-    SERIAL_SOFT_TXD_ON(); \
-} while (0)
-
-
diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c
index 5cb3c23572..010fd56c79 100644
--- a/keyboards/converter/palm_usb/matrix.c
+++ b/keyboards/converter/palm_usb/matrix.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include QMK_KEYBOARD_H
-#include "protocol/serial.h"
+#include "uart.h"
 #include "timer.h"
 
 
@@ -164,7 +164,7 @@ uint8_t rts_reset(void) {
 uint8_t get_serial_byte(void) {
     static uint8_t code;
     while(1) {
-        code = serial_recv();
+        code = uart_read();
         if (code) { 
             debug_hex(code); debug(" ");
             return code;
@@ -240,7 +240,7 @@ void matrix_init(void)
     debug_enable = true;
     //debug_matrix =true;
     
-    serial_init(); // arguments all #defined 
+    uart_init(9600); // arguments all #defined 
  
 #if (HANDSPRING == 0)
     pins_init(); // set all inputs and outputs. 
@@ -290,7 +290,7 @@ void matrix_init(void)
 uint8_t matrix_scan(void)
 {
     uint8_t code;
-    code = serial_recv();
+    code = uart_read();
     if (!code) {
 /*         
         disconnect_counter ++;
diff --git a/keyboards/converter/palm_usb/post_rules.mk b/keyboards/converter/palm_usb/post_rules.mk
deleted file mode 100644
index 9c11076701..0000000000
--- a/keyboards/converter/palm_usb/post_rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-ifdef HARDWARE_SERIAL
-  # Untested with palm_usb
-  SRC += protocol/serial_uart.c
-  OPT_DEFS += -DHARDWARE_SERIAL
-else
-  SRC += protocol/serial_soft.c
-endif
diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/rules.mk
index c5e680b883..a1d2e39b23 100644
--- a/keyboards/converter/palm_usb/rules.mk
+++ b/keyboards/converter/palm_usb/rules.mk
@@ -20,5 +20,6 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
 
 DEFAULT_FOLDER = converter/palm_usb/stowaway
diff --git a/keyboards/converter/sun_usb/command_extra.c b/keyboards/converter/sun_usb/command_extra.c
index 756a9160bb..332776ab90 100644
--- a/keyboards/converter/sun_usb/command_extra.c
+++ b/keyboards/converter/sun_usb/command_extra.c
@@ -1,5 +1,5 @@
 #include QMK_KEYBOARD_H
-#include "protocol/serial.h"
+#include "uart.h"
 
 bool sun_bell = false;
 bool sun_click = false;
@@ -20,41 +20,41 @@ bool command_extra(uint8_t code)
             return false;
         case KC_DEL:
             print("Reset\n");
-            serial_send(0x01);
+            uart_write(0x01);
             break;
         case KC_HOME:
 	    sun_bell = !sun_bell;
 	    if (sun_bell) {
                 print("Bell On\n");
-	        serial_send(0x02);
+	        uart_write(0x02);
 	    } else {
 	        print("Bell Off\n");
-	        serial_send(0x03);
+	        uart_write(0x03);
 	    }
             break;
         case KC_END:
 	    sun_click = !sun_click;
 	    if (sun_click) {
 	        print("Click On\n");
-		serial_send(0x0A);
+		uart_write(0x0A);
 	    } else {
 	        print("Click Off\n");
-                serial_send(0x0B);
+                uart_write(0x0B);
 	    }
 	    break;
         case KC_PGUP:
             print("LED all on\n");
-            serial_send(0x0E);
-            serial_send(0xFF);
+            uart_write(0x0E);
+            uart_write(0xFF);
             break;
         case KC_PGDOWN:
             print("LED all off\n");
-            serial_send(0x0E);
-            serial_send(0x00);
+            uart_write(0x0E);
+            uart_write(0x00);
             break;
         case KC_INSERT:
             print("layout\n");
-            serial_send(0x0F);
+            uart_write(0x0F);
             break;
         default:
             xprintf("Unknown extra command: %02X\n", code);
diff --git a/keyboards/converter/sun_usb/config.h b/keyboards/converter/sun_usb/config.h
index c67ae5ebae..0a4aa019f7 100644
--- a/keyboards/converter/sun_usb/config.h
+++ b/keyboards/converter/sun_usb/config.h
@@ -33,50 +33,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     get_mods() == (MOD_BIT(KC_LGUI) | MOD_BIT(KC_RGUI)) || \
     get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 )
-
-
-/* Serial(USART) configuration
- *     asynchronous, negative logic, 1200baud, no flow control
- *     1-start bit, 8-data bit, non parity, 1-stop bit
- */
-#define SERIAL_SOFT_BAUD            1200
-#define SERIAL_SOFT_PARITY_NONE
-#define SERIAL_SOFT_BIT_ORDER_LSB
-#define SERIAL_SOFT_LOGIC_NEGATIVE
-/* RXD Port */
-#define SERIAL_SOFT_RXD_ENABLE
-#define SERIAL_SOFT_RXD_DDR         DDRD
-#define SERIAL_SOFT_RXD_PORT        PORTD
-#define SERIAL_SOFT_RXD_PIN         PIND
-#define SERIAL_SOFT_RXD_BIT         2
-#define SERIAL_SOFT_RXD_VECT        INT2_vect
-/* RXD Interupt */
-#define SERIAL_SOFT_RXD_INIT()      do { \
-    /* pin configuration: input with pull-up */ \
-    SERIAL_SOFT_RXD_DDR &= ~(1<<SERIAL_SOFT_RXD_BIT); \
-    SERIAL_SOFT_RXD_PORT |= (1<<SERIAL_SOFT_RXD_BIT); \
-    /* enable interrupt: INT2(rising edge) */ \
-    EICRA |= ((1<<ISC21)|(1<<ISC20)); \
-    EIMSK |= (1<<INT2); \
-    sei(); \
-} while (0)
-#define SERIAL_SOFT_RXD_INT_ENTER()
-#define SERIAL_SOFT_RXD_INT_EXIT()  do { \
-    /* clear interrupt  flag */ \
-    EIFR = (1<<INTF2); \
-} while (0)
-#define SERIAL_SOFT_RXD_READ()      (SERIAL_SOFT_RXD_PIN&(1<<SERIAL_SOFT_RXD_BIT))
-/* TXD Port */
-#define SERIAL_SOFT_TXD_ENABLE
-#define SERIAL_SOFT_TXD_DDR         DDRD
-#define SERIAL_SOFT_TXD_PORT        PORTD
-#define SERIAL_SOFT_TXD_PIN         PIND
-#define SERIAL_SOFT_TXD_BIT         3
-#define SERIAL_SOFT_TXD_HI()        do { SERIAL_SOFT_TXD_PORT |=  (1<<SERIAL_SOFT_TXD_BIT); } while (0)
-#define SERIAL_SOFT_TXD_LO()        do { SERIAL_SOFT_TXD_PORT &= ~(1<<SERIAL_SOFT_TXD_BIT); } while (0)
-#define SERIAL_SOFT_TXD_INIT()      do { \
-    /* pin configuration: output */ \
-    SERIAL_SOFT_TXD_DDR |= (1<<SERIAL_SOFT_TXD_BIT); \
-    /* idle */ \
-    SERIAL_SOFT_TXD_ON(); \
-} while (0)
diff --git a/keyboards/converter/sun_usb/led.c b/keyboards/converter/sun_usb/led.c
index a409699e92..f8d183fd48 100644
--- a/keyboards/converter/sun_usb/led.c
+++ b/keyboards/converter/sun_usb/led.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include QMK_KEYBOARD_H
-#include "protocol/serial.h"
+#include "uart.h"
 
 void led_set(uint8_t usb_led)
 {
@@ -27,6 +27,6 @@ void led_set(uint8_t usb_led)
     if (usb_led & (1<<USB_LED_CAPS_LOCK))   sun_led |= (1<<3);
     xprintf("LED: %02X\n", usb_led);
 
-    serial_send(0x0E);
-    serial_send(sun_led);
+    uart_write(0x0E);
+    uart_write(sun_led);
 }
diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c
index 9ab34bcef7..e28d165d52 100644
--- a/keyboards/converter/sun_usb/matrix.c
+++ b/keyboards/converter/sun_usb/matrix.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include QMK_KEYBOARD_H
-#include "protocol/serial.h"
+#include "uart.h"
 
 /*
  * Matrix Array usage:
@@ -74,7 +74,7 @@ void matrix_init(void)
     /* PORTD |= (1<<6); */
     debug_enable = true;
 
-    serial_init();
+    uart_init(1200);
 
     // initialize matrix state: all keys off
     for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
@@ -84,12 +84,12 @@ void matrix_init(void)
     /* print("Reseting "); */
     /* while (1) { */
     /*     print("."); */
-    /*     while (serial_recv()); */
-    /*     serial_send(0x01); */
+    /*     while (uart_read()); */
+    /*     uart_write(0x01); */
     /*     _delay_ms(500); */
-    /*     if (serial_recv() == 0xFF) { */
+    /*     if (uart_read() == 0xFF) { */
     /*         _delay_ms(500); */
-    /*         if (serial_recv() == 0x04) */
+    /*         if (uart_read() == 0x04) */
     /*             break; */
     /*     } */
     /* } */
@@ -104,7 +104,7 @@ void matrix_init(void)
 uint8_t matrix_scan(void)
 {
     uint8_t code;
-    code = serial_recv();
+    code = uart_read();
     if (!code) return 0;
 
     debug_hex(code); debug(" ");
@@ -113,7 +113,7 @@ uint8_t matrix_scan(void)
         case 0xFF:  // reset success: FF 04
             print("reset: ");
             _delay_ms(500);
-            code = serial_recv();
+            code = uart_read();
             xprintf("%02X\n", code);
             if (code == 0x04) {
                 // LED status
@@ -123,12 +123,12 @@ uint8_t matrix_scan(void)
         case 0xFE:  // layout: FE <layout>
             print("layout: ");
             _delay_ms(500);
-            xprintf("%02X\n", serial_recv());
+            xprintf("%02X\n", uart_read());
             return 0;
         case 0x7E:  // reset fail: 7E 01
             print("reset fail: ");
             _delay_ms(500);
-            xprintf("%02X\n", serial_recv());
+            xprintf("%02X\n", uart_read());
             return 0;
         case 0x7F:
             // all keys up
diff --git a/keyboards/converter/sun_usb/post_rules.mk b/keyboards/converter/sun_usb/post_rules.mk
deleted file mode 100644
index 2ea1f0a5bf..0000000000
--- a/keyboards/converter/sun_usb/post_rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-ifdef HARDWARE_SERIAL
-  SRC += protocol/serial_uart.c
-  OPT_DEFS += -DHARDWARE_SERIAL
-else
-  SRC += protocol/serial_soft.c
-endif
diff --git a/keyboards/converter/sun_usb/rules.mk b/keyboards/converter/sun_usb/rules.mk
index 2f2ddde1d0..d25bcc7ffa 100644
--- a/keyboards/converter/sun_usb/rules.mk
+++ b/keyboards/converter/sun_usb/rules.mk
@@ -20,5 +20,6 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c led.c
+QUANTUM_LIB_SRC += uart.c
 
 DEFAULT_FOLDER = converter/sun_usb/type5
diff --git a/keyboards/dichotomy/config.h b/keyboards/dichotomy/config.h
index 03e19b1388..40e7f18e6f 100644
--- a/keyboards/dichotomy/config.h
+++ b/keyboards/dichotomy/config.h
@@ -56,12 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
diff --git a/keyboards/dichotomy/dichotomy.c b/keyboards/dichotomy/dichotomy.c
index 967d7e603c..afd52cc8b3 100755
--- a/keyboards/dichotomy/dichotomy.c
+++ b/keyboards/dichotomy/dichotomy.c
@@ -1,11 +1,13 @@
 #include "dichotomy.h"
 
+//#include "uart.h"
+
 void pointing_device_task(void){
 	/*report_mouse_t currentReport = {};
     uint32_t timeout = 0;
 
     //the m character requests the RF slave to send the mouse report
-    SERIAL_UART_DATA = 'm';
+    uart_write('m');
 
     //trust the external inputs completely, erase old data
     uint8_t uart_data[5] = {0};
@@ -15,7 +17,7 @@ void pointing_device_task(void){
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
 		xprintf("\r\nTIMED OUT");
@@ -23,7 +25,7 @@ void pointing_device_task(void){
             }
         }
 	xprintf("\r\nGOT DATA for %d",i);
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, bytes 1-4 are movement and scroll
diff --git a/keyboards/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c
index ed83bd452c..806b66d498 100755
--- a/keyboards/dichotomy/matrix.c
+++ b/keyboards/dichotomy/matrix.c
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "dichotomy.h"
 #include "pointing_device.h"
 #include "report.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -94,7 +94,7 @@ uint8_t matrix_cols(void) {
 
 void matrix_init(void) {
     matrix_init_quantum();
-    serial_init();
+    uart_init(1000000);
 }
 
 uint8_t matrix_scan(void)
@@ -104,7 +104,7 @@ uint8_t matrix_scan(void)
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     //trust the external keystates entirely, erase the last data
     uint8_t uart_data[11] = {0};
@@ -114,14 +114,14 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
 		xprintf("\r\nTime out in keyboard.");
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk
index 2b5eb0360c..a6029e3dbf 100755
--- a/keyboards/dichotomy/rules.mk
+++ b/keyboards/dichotomy/rules.mk
@@ -18,4 +18,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 # BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/honeycomb/config.h b/keyboards/honeycomb/config.h
index 725f9490cb..c959543618 100755
--- a/keyboards/honeycomb/config.h
+++ b/keyboards/honeycomb/config.h
@@ -45,12 +45,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
diff --git a/keyboards/honeycomb/honeycomb.c b/keyboards/honeycomb/honeycomb.c
index 1254196d39..603400c7a3 100755
--- a/keyboards/honeycomb/honeycomb.c
+++ b/keyboards/honeycomb/honeycomb.c
@@ -7,7 +7,7 @@ void pointing_device_task(void){
     uint32_t timeout = 0;
 
     //the m character requests the RF slave to send the mouse report
-    SERIAL_UART_DATA = 'm';
+    uart_write('m');
 
     //trust the external inputs completely, erase old data
     uint8_t uart_data[5] = {0};
@@ -17,7 +17,7 @@ void pointing_device_task(void){
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
 		xprintf("\r\nTIMED OUT");
@@ -25,7 +25,7 @@ void pointing_device_task(void){
             }
         }
 	xprintf("\r\nGOT DATA for %d",i);
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, bytes 1-4 are movement and scroll
diff --git a/keyboards/honeycomb/matrix.c b/keyboards/honeycomb/matrix.c
index 7fef6f0fd8..fe1e4ce8ff 100755
--- a/keyboards/honeycomb/matrix.c
+++ b/keyboards/honeycomb/matrix.c
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "honeycomb.h"
 #include "pointing_device.h"
 #include "report.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 # define print_matrix_header()  print("\nr/c 01234567\n")
@@ -95,7 +95,7 @@ uint8_t matrix_cols(void) {
 void matrix_init(void) {
 
     matrix_init_quantum();
-    serial_init();
+    uart_init(1000000);
 }
 
 uint8_t matrix_scan(void)
@@ -103,7 +103,7 @@ uint8_t matrix_scan(void)
     uint32_t timeout = 0;
 
     // The 's' character requests the RF slave to send the matrix
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     // Trust the external keystates entirely, erase the last data
     uint8_t uart_data[4] = {0};
@@ -113,14 +113,14 @@ uint8_t matrix_scan(void)
         // Wait for the serial data, timeout if it's been too long
         // This only happened in testing with a loose wire, but does no
         // harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
                 xprintf("\r\nTime out in keyboard.");
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     // Check for the end packet, it's our checksum.
diff --git a/keyboards/honeycomb/rules.mk b/keyboards/honeycomb/rules.mk
index 2b5eb0360c..a6029e3dbf 100755
--- a/keyboards/honeycomb/rules.mk
+++ b/keyboards/honeycomb/rules.mk
@@ -18,4 +18,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 # BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/mitosis/config.h b/keyboards/mitosis/config.h
index 94e84e680e..2c72eed5f2 100644
--- a/keyboards/mitosis/config.h
+++ b/keyboards/mitosis/config.h
@@ -56,12 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
diff --git a/keyboards/mitosis/matrix.c b/keyboards/mitosis/matrix.c
index 71c372a3ce..102431eb67 100644
--- a/keyboards/mitosis/matrix.c
+++ b/keyboards/mitosis/matrix.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
 #include "timer.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -80,7 +80,7 @@ uint8_t matrix_cols(void) {
 void matrix_init(void) {
 
     matrix_init_quantum();
-    serial_init();
+    uart_init(1000000);
 }
 
 uint8_t matrix_scan(void)
@@ -88,7 +88,7 @@ uint8_t matrix_scan(void)
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     //trust the external keystates entirely, erase the last data
     uint8_t uart_data[11] = {0};
@@ -98,13 +98,13 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
diff --git a/keyboards/mitosis/rules.mk b/keyboards/mitosis/rules.mk
index 6c7aa30d88..04cafae718 100644
--- a/keyboards/mitosis/rules.mk
+++ b/keyboards/mitosis/rules.mk
@@ -18,4 +18,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 UNICODE_ENABLE = yes 		# Unicode
 
 # # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/planck/keymaps/thermal_printer/config.h b/keyboards/planck/keymaps/thermal_printer/config.h
index 4ae9ced258..dd9d6a9d25 100644
--- a/keyboards/planck/keymaps/thermal_printer/config.h
+++ b/keyboards/planck/keymaps/thermal_printer/config.h
@@ -1,9 +1,4 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include "../../config.h"
-
-#define SERIAL_UART_BAUD 19200
+#pragma once
 
 /*
  * MIDI options
@@ -21,8 +16,3 @@
    - etc.
 */
 //#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 2
-
- #endif
\ No newline at end of file
diff --git a/keyboards/redox_w/config.h b/keyboards/redox_w/config.h
index b480b072f9..c4aeb32d58 100644
--- a/keyboards/redox_w/config.h
+++ b/keyboards/redox_w/config.h
@@ -55,12 +55,3 @@
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
-
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
diff --git a/keyboards/redox_w/matrix.c b/keyboards/redox_w/matrix.c
index 703987a939..752324837c 100644
--- a/keyboards/redox_w/matrix.c
+++ b/keyboards/redox_w/matrix.c
@@ -24,7 +24,7 @@
 #include "util.h"
 #include "matrix.h"
 #include "timer.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -87,7 +87,7 @@ uint8_t matrix_cols(void) {
 void matrix_init(void) {
 
     matrix_init_quantum();
-    serial_init();
+    uart_init(1000000);
 }
 
 uint8_t matrix_scan(void)
@@ -95,7 +95,7 @@ uint8_t matrix_scan(void)
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     //trust the external keystates entirely, erase the last data
     uint8_t uart_data[11] = {0};
@@ -105,13 +105,13 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
diff --git a/keyboards/redox_w/rules.mk b/keyboards/redox_w/rules.mk
index a8bd3a027a..483485cb7d 100644
--- a/keyboards/redox_w/rules.mk
+++ b/keyboards/redox_w/rules.mk
@@ -17,4 +17,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 # BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
 
 # # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/sirius/uni660/rev1/config.h b/keyboards/sirius/uni660/rev1/config.h
index 91d7c5d7a3..f9815844cb 100644
--- a/keyboards/sirius/uni660/rev1/config.h
+++ b/keyboards/sirius/uni660/rev1/config.h
@@ -57,13 +57,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 4
diff --git a/keyboards/sirius/uni660/rev1/matrix.c b/keyboards/sirius/uni660/rev1/matrix.c
index 2db6767a46..65c35c968b 100644
--- a/keyboards/sirius/uni660/rev1/matrix.c
+++ b/keyboards/sirius/uni660/rev1/matrix.c
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "matrix.h"
 #include "timer.h"
 #include "debounce.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -81,7 +81,7 @@ uint8_t matrix_cols(void) {
 void matrix_init(void) {
     debounce_init(MATRIX_ROWS);
     matrix_init_quantum();
-    serial_init();
+    uart_init(1000000);
 }
 
 uint8_t matrix_scan(void)
@@ -91,7 +91,7 @@ uint8_t matrix_scan(void)
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     //trust the external keystates entirely, erase the last data
     uint8_t uart_data[17] = {0};
@@ -101,13 +101,13 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
diff --git a/keyboards/sirius/uni660/rev1/rules.mk b/keyboards/sirius/uni660/rev1/rules.mk
index 836bf6b442..77b9af362e 100644
--- a/keyboards/sirius/uni660/rev1/rules.mk
+++ b/keyboards/sirius/uni660/rev1/rules.mk
@@ -20,4 +20,5 @@ UNICODE_ENABLE = yes        # Unicode
 CUSTOM_MATRIX = yes
 
 # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/sirius/uni660/rev2/ansi/config.h b/keyboards/sirius/uni660/rev2/ansi/config.h
index 13e33ebf11..8777dc4011 100644
--- a/keyboards/sirius/uni660/rev2/ansi/config.h
+++ b/keyboards/sirius/uni660/rev2/ansi/config.h
@@ -57,13 +57,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 4
diff --git a/keyboards/sirius/uni660/rev2/iso/config.h b/keyboards/sirius/uni660/rev2/iso/config.h
index 3283f0cd67..763230dca8 100644
--- a/keyboards/sirius/uni660/rev2/iso/config.h
+++ b/keyboards/sirius/uni660/rev2/iso/config.h
@@ -57,13 +57,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-//UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 4
diff --git a/keyboards/sirius/uni660/rev2/matrix.c b/keyboards/sirius/uni660/rev2/matrix.c
index 2db6767a46..65c35c968b 100644
--- a/keyboards/sirius/uni660/rev2/matrix.c
+++ b/keyboards/sirius/uni660/rev2/matrix.c
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "matrix.h"
 #include "timer.h"
 #include "debounce.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
@@ -81,7 +81,7 @@ uint8_t matrix_cols(void) {
 void matrix_init(void) {
     debounce_init(MATRIX_ROWS);
     matrix_init_quantum();
-    serial_init();
+    uart_init(1000000);
 }
 
 uint8_t matrix_scan(void)
@@ -91,7 +91,7 @@ uint8_t matrix_scan(void)
     uint32_t timeout = 0;
 
     //the s character requests the RF slave to send the matrix
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     //trust the external keystates entirely, erase the last data
     uint8_t uart_data[17] = {0};
@@ -101,13 +101,13 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!SERIAL_UART_RXD_PRESENT){
+        while(!uart_available()){
             timeout++;
             if (timeout > 10000){
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
diff --git a/keyboards/sirius/uni660/rev2/rules.mk b/keyboards/sirius/uni660/rev2/rules.mk
index 0abebb07c6..f3ff80d92e 100644
--- a/keyboards/sirius/uni660/rev2/rules.mk
+++ b/keyboards/sirius/uni660/rev2/rules.mk
@@ -20,6 +20,7 @@ UNICODE_ENABLE = yes        # Unicode
 CUSTOM_MATRIX = yes
 
 # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
 
 DEFAULT_FOLDER = sirius/uni660/rev2/ansi
diff --git a/keyboards/telophase/config.h b/keyboards/telophase/config.h
index 51718da9d4..837bb8ab9b 100644
--- a/keyboards/telophase/config.h
+++ b/keyboards/telophase/config.h
@@ -72,12 +72,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* disable these deprecated features by default */
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
-
-// UART settings for communication with the RF microcontroller
-#define SERIAL_UART_BAUD 1000000
-#define SERIAL_UART_RXD_PRESENT (UCSR1A & _BV(RXC1))
-#define SERIAL_UART_INIT_CUSTOM       \
-    /* enable TX and RX */            \
-    UCSR1B = _BV(TXEN1) | _BV(RXEN1); \
-    /* 8-bit data */                  \
-    UCSR1C = _BV(UCSZ11) | _BV(UCSZ10);
diff --git a/keyboards/telophase/matrix.c b/keyboards/telophase/matrix.c
index a153dd4bf1..44b7e4c9e9 100644
--- a/keyboards/telophase/matrix.c
+++ b/keyboards/telophase/matrix.c
@@ -18,10 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 #include "matrix.h"
-#include "protocol/serial.h"
+#include "uart.h"
 
 void matrix_init_custom(void) {
-    serial_init();
+    uart_init(1000000);
 }
 
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
@@ -29,7 +29,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     bool changed = false;
 
     //the s character requests the RF slave to send the matrix
-    SERIAL_UART_DATA = 's';
+    uart_write('s');
 
     //trust the external keystates entirely, erase the last data
     uint8_t uart_data[13] = {0};
@@ -39,13 +39,13 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while (!SERIAL_UART_RXD_PRESENT) {
+        while (!uart_available()) {
             timeout++;
             if (timeout > 10000) {
                 break;
             }
         }
-        uart_data[i] = SERIAL_UART_DATA;
+        uart_data[i] = uart_read();
     }
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
diff --git a/keyboards/telophase/rules.mk b/keyboards/telophase/rules.mk
index c3a8aaf79f..41a6ee25f5 100644
--- a/keyboards/telophase/rules.mk
+++ b/keyboards/telophase/rules.mk
@@ -19,7 +19,8 @@ AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
 # project specific files
-SRC += matrix.c serial_uart.c
+SRC += matrix.c
+QUANTUM_LIB_SRC += uart.c
 
 # Disable unsupported hardware
 RGBLIGHT_SUPPORTED = no
diff --git a/quantum/process_keycode/process_printer.c b/quantum/process_keycode/process_printer.c
index 82528cc680..0801f078ef 100644
--- a/quantum/process_keycode/process_printer.c
+++ b/quantum/process_keycode/process_printer.c
@@ -16,13 +16,14 @@
 
 #include "process_printer.h"
 #include "action_util.h"
+#include "uart.h"
 
 bool    printing_enabled = false;
 uint8_t character_shift  = 0;
 
 void enable_printing(void) {
     printing_enabled = true;
-    serial_init();
+    uart_init(19200);
 }
 
 void disable_printing(void) { printing_enabled = false; }
@@ -35,7 +36,7 @@ uint8_t shifted_numbers[10] = {0x21, 0x40, 0x23, 0x24, 0x25, 0x5E, 0x26, 0x2A, 0
 
 void print_char(char c) {
     USB_Disable();
-    serial_send(c);
+    uart_write(c);
     USB_Init();
 }
 
diff --git a/quantum/process_keycode/process_printer.h b/quantum/process_keycode/process_printer.h
index 3c6d06ff94..6f4d09f333 100644
--- a/quantum/process_keycode/process_printer.h
+++ b/quantum/process_keycode/process_printer.h
@@ -18,6 +18,4 @@
 
 #include "quantum.h"
 
-#include "protocol/serial.h"
-
 bool process_printer(uint16_t keycode, keyrecord_t *record);

From 9d0b14500754eb8cb60a347f16f854f9d277604f Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 16 Dec 2021 01:25:32 +1100
Subject: [PATCH 018/867] Fix build failure for UT47 (#15483)

---
 keyboards/40percentclub/ut47/ut47.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/40percentclub/ut47/ut47.c b/keyboards/40percentclub/ut47/ut47.c
index c01562cb68..864edaeb57 100644
--- a/keyboards/40percentclub/ut47/ut47.c
+++ b/keyboards/40percentclub/ut47/ut47.c
@@ -16,11 +16,11 @@
 #include "ut47.h"
 #ifdef LED_ENABLE
   #include "uart.h"
-#endif
 
 void matrix_init_kb() {
   uart_init(9600);
 }
+#endif
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 	// put your per-action keyboard code here

From f79e1ab7481525cfa2b63e6bc062fb7d8250c8db Mon Sep 17 00:00:00 2001
From: JP <wongjingping@gmail.com>
Date: Sat, 18 Dec 2021 16:48:33 +0800
Subject: [PATCH 019/867] [Keyboard] Add k34 keyboard (#15250)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: jingpingw <jingpingw@twitter.com>
---
 keyboards/k34/config.h                  | 38 +++++++++++++++
 keyboards/k34/info.json                 | 52 +++++++++++++++++++++
 keyboards/k34/k34.c                     |  4 ++
 keyboards/k34/k34.h                     | 26 +++++++++++
 keyboards/k34/keymaps/default/config.h  | 24 ++++++++++
 keyboards/k34/keymaps/default/keymap.c  | 61 +++++++++++++++++++++++++
 keyboards/k34/keymaps/default/readme.md |  1 +
 keyboards/k34/keymaps/default/rules.mk  |  1 +
 keyboards/k34/readme.md                 | 25 ++++++++++
 keyboards/k34/rules.mk                  | 18 ++++++++
 10 files changed, 250 insertions(+)
 create mode 100644 keyboards/k34/config.h
 create mode 100644 keyboards/k34/info.json
 create mode 100644 keyboards/k34/k34.c
 create mode 100644 keyboards/k34/k34.h
 create mode 100644 keyboards/k34/keymaps/default/config.h
 create mode 100644 keyboards/k34/keymaps/default/keymap.c
 create mode 100644 keyboards/k34/keymaps/default/readme.md
 create mode 100644 keyboards/k34/keymaps/default/rules.mk
 create mode 100644 keyboards/k34/readme.md
 create mode 100644 keyboards/k34/rules.mk

diff --git a/keyboards/k34/config.h b/keyboards/k34/config.h
new file mode 100644
index 0000000000..4d9910d50d
--- /dev/null
+++ b/keyboards/k34/config.h
@@ -0,0 +1,38 @@
+// Copyright 2021 jp_smasher (@jp_smasher)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x0000
+#define DEVICE_VER   0x0001
+#define MANUFACTURER jp_smasher
+#define PRODUCT      k34
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 10
+
+/*
+ * 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 { F4, B2, E6, B4 }
+#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, F5, F6, F7, B1, B3 }
+#define UNUSED_PINS { B5, B6, D2, D3 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
diff --git a/keyboards/k34/info.json b/keyboards/k34/info.json
new file mode 100644
index 0000000000..0917e44961
--- /dev/null
+++ b/keyboards/k34/info.json
@@ -0,0 +1,52 @@
+{
+    "keyboard_name": "k34", 
+    "url": "https://github.com/wongjingping/k34", 
+    "maintainer": "qmk", 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "Q", "x": 0, "y": 0.3 },
+                { "label": "W", "x": 1, "y": 0.1 },
+                { "label": "E", "x": 2, "y": 0 },
+                { "label": "R", "x": 3, "y": 0.1 },
+                { "label": "T", "x": 4, "y": 0.2 },
+
+                { "label": "Y", "x": 8, "y": 0.2 },
+                { "label": "U", "x": 9, "y": 0.1 },
+                { "label": "I", "x": 10, "y": 0 },
+                { "label": "O", "x": 11, "y": 0.1 },
+                { "label": "P", "x": 12, "y": 0.3 },
+
+                { "label": "A", "x": 0, "y": 1.3 },
+                { "label": "S", "x": 1, "y": 1.1 },
+                { "label": "D", "x": 2, "y": 1 },
+                { "label": "F", "x": 3, "y": 1.1 },
+                { "label": "G", "x": 4, "y": 1.2 },
+
+                { "label": "H", "x": 8, "y": 1.2 },
+                { "label": "J", "x": 9, "y": 1.1 },
+                { "label": "K", "x": 10, "y": 1 },
+                { "label": "L", "x": 11, "y": 1.1 },
+                { "label": ";", "x": 12, "y": 1.3 },
+
+                { "label": "Z", "x": 0, "y": 2.3 },
+                { "label": "X", "x": 1, "y": 2.1 },
+                { "label": "C", "x": 2, "y": 2 },
+                { "label": "V", "x": 3, "y": 2.1 },
+                { "label": "B", "x": 4, "y": 2.2 },
+
+                { "label": "N", "x": 8, "y": 2.2 },
+                { "label": "M", "x": 9, "y": 2.1 },
+                { "label": ",", "x": 10, "y": 2 },
+                { "label": ".", "x": 11, "y": 2.1 },
+                { "label": "/", "x": 12, "y": 2.3 },
+
+                { "label": "GUI / KC_HANJ", "x": 3, "y": 3.7 },
+                { "label": "Lower", "x": 4, "y": 3.7 },
+
+                { "label": "Raise", "x": 8, "y": 3.7 },
+                { "label": "Alt / KC_HAEN", "x": 9, "y": 3.7 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/k34/k34.c b/keyboards/k34/k34.c
new file mode 100644
index 0000000000..0dffa61ffd
--- /dev/null
+++ b/keyboards/k34/k34.c
@@ -0,0 +1,4 @@
+// Copyright 2021 jp_smasher (@jp_smasher)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "k34.h"
diff --git a/keyboards/k34/k34.h b/keyboards/k34/k34.h
new file mode 100644
index 0000000000..e34f5408d4
--- /dev/null
+++ b/keyboards/k34/k34.h
@@ -0,0 +1,26 @@
+// Copyright 2021 jp_smasher (@jp_smasher)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    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, \
+                   k33, k34, k35, k36 \
+) { \
+    { 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   }, \
+    { KC_NO, KC_NO, KC_NO, k33,   k34,   k35,   k36,   KC_NO, KC_NO, KC_NO }, \
+}
diff --git a/keyboards/k34/keymaps/default/config.h b/keyboards/k34/keymaps/default/config.h
new file mode 100644
index 0000000000..803471e550
--- /dev/null
+++ b/keyboards/k34/keymaps/default/config.h
@@ -0,0 +1,24 @@
+ /* Copyright Wong Jing Ping <@wongjingping>
+  *  
+  * 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. 
+  * 
+  */
+
+#pragma once
+
+// use 1 combo
+#define COMBO_COUNT 1
+#define COMBO_TERM 300
+
+// mod taps for home row mods
+#define TAPPING_TERM_PER_KEY
+#define IGNORE_MOD_TAP_INTERRUPT
+
diff --git a/keyboards/k34/keymaps/default/keymap.c b/keyboards/k34/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6bd8e402da
--- /dev/null
+++ b/keyboards/k34/keymaps/default/keymap.c
@@ -0,0 +1,61 @@
+// Copyright 2021 jp_smasher (@jp_smasher)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _L1,
+    _L2
+};
+
+// define layers
+#define L1  MO(_L1)
+#define L2  LT(_L2, KC_ENT)
+
+// define home-row styled alpha-mods
+#define C_C     LCTL_T(KC_C)
+#define C_COMM  LCTL_T(KC_COMM)
+#define G_A     CMD_T(KC_A)
+#define G_SC    CMD_T(KC_SCLN)
+#define A_X     LOPT_T(KC_X)
+#define A_DOT   LOPT_T(KC_DOT)
+#define S_Z     SFT_T(KC_Z)
+#define S_SLSH  SFT_T(KC_SLSH)
+
+// combos for application shortcuts
+#define SG_LBRC SGUI(KC_LBRC)
+#define SG_RBRC SGUI(KC_RBRC)
+#define G_LBRC  G(KC_LBRC)
+#define G_RBRC  G(KC_RBRC)
+#define A_SLSH  A(KC_SLSH)
+
+/* combos */
+const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
+combo_t key_combos[COMBO_COUNT] = {COMBO(jk_combo, KC_ESC)};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+  [_BASE] = LAYOUT(
+    KC_Q,     KC_W,     KC_E,     KC_R,      KC_T,               KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,
+    G_A,      KC_S,     KC_D,     KC_F,      KC_G,               KC_H,     KC_J,     KC_K,     KC_L,     G_SC,
+    S_Z,      A_X,      C_C,      KC_V,      KC_B,               KC_N,     KC_M,     C_COMM,   A_DOT,    S_SLSH,
+				  L1,        KC_SPC,             KC_SPC,   L2
+  ),
+
+
+  [_L1] = LAYOUT(
+    KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,            KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_MINS,  KC_EQL,
+    KC_LPRN,  KC_RPRN,  KC_LCBR,  KC_RCBR,  KC_GRV,             KC_QUOT,  KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PIPE,
+    _______,  _______,  _______,  KC_TAB,   _______,            KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_MPLY,  KC_MNXT,
+				  _______,  _______,            _______,  _______
+  ),
+
+  [_L2] = LAYOUT(
+    KC_1,     KC_2,     KC_3,     KC_4,      KC_5,               KC_6,     KC_7,     KC_8,    KC_9,     KC_0,
+    _______,  _______,  _______,  _______,   KC_DOT,             KC_LEFT,  KC_DOWN,  KC_UP,   KC_RIGHT, KC_BSPC,
+    _______,  _______,  _______,  _______,   _______,            A_SLSH,   SG_LBRC,  SG_RBRC, G_LBRC,   G_RBRC,
+				  KC_LALT,  KC_LGUI,             _______,    _______
+  ),
+};
diff --git a/keyboards/k34/keymaps/default/readme.md b/keyboards/k34/keymaps/default/readme.md
new file mode 100644
index 0000000000..bad277222b
--- /dev/null
+++ b/keyboards/k34/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for k34
diff --git a/keyboards/k34/keymaps/default/rules.mk b/keyboards/k34/keymaps/default/rules.mk
new file mode 100644
index 0000000000..439d48d6e6
--- /dev/null
+++ b/keyboards/k34/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes          # enable combo
diff --git a/keyboards/k34/readme.md b/keyboards/k34/readme.md
new file mode 100644
index 0000000000..8f17c7e5de
--- /dev/null
+++ b/keyboards/k34/readme.md
@@ -0,0 +1,25 @@
+# k34
+
+![k34](https://i.imgur.com/tarkFIph.jpeg)
+
+## Keyboard Info
+
+The K34 is a custom 34-key unibody keyboard.
+
+* Keyboard Maintainer: [wongjingping](https://github.com/wongjingping)
+All hardware supported can be found in the [k34 repository](https://github.com/wongjingping/k34)
+
+## Flashing Instructions
+
+To enter the bootloader, short the RST and GND pins, or press the key mapped to `RESET`.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make k34:default
+
+Flashing example for this keyboard:
+
+    make k34:default:flash
+
+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).
+
diff --git a/keyboards/k34/rules.mk b/keyboards/k34/rules.mk
new file mode 100644
index 0000000000..a61e60c8a4
--- /dev/null
+++ b/keyboards/k34/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 98a82225aa82a5f9d4a2db80883661d3f34c9e7c Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 19 Dec 2021 12:07:10 -0800
Subject: [PATCH 020/867] MechBrewery MB65S Refactor (#15515)

---
 keyboards/mechbrewery/mb65s/info.json         | 86 ++-----------------
 .../mb65s/keymaps/default/keymap.c            | 79 +++++++++--------
 .../mb65s/keymaps/default/readme.md           |  2 +-
 .../mechbrewery/mb65s/keymaps/iso/keymap.c    | 46 +++++-----
 .../mechbrewery/mb65s/keymaps/iso/readme.md   | 40 ++++-----
 .../mb65s/keymaps/split_bs/keymap.c           | 80 ++++++++---------
 .../mb65s/keymaps/split_bs/readme.md          |  2 +-
 .../mb65s/keymaps/split_bs/rules.mk           |  1 -
 keyboards/mechbrewery/mb65s/mb65s.h           | 54 +++++++-----
 keyboards/mechbrewery/mb65s/rules.mk          |  8 +-
 10 files changed, 169 insertions(+), 229 deletions(-)
 delete mode 100644 keyboards/mechbrewery/mb65s/keymaps/split_bs/rules.mk

diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/info.json
index 51a1e2194f..45145001cf 100644
--- a/keyboards/mechbrewery/mb65s/info.json
+++ b/keyboards/mechbrewery/mb65s/info.json
@@ -1,85 +1,9 @@
 {
     "keyboard_name": "mb65s",
     "url": "",
-    "maintainer": "tuananhnguyen204",
+    "maintainer": "AnthonyNguyen168",
     "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-                {"x":15, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-                {"x":15, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-                {"x":15, "y":2},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3},
-                {"x":15, "y":3},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":13, "y":4},
-                {"x":14, "y":4},
-                {"x":15, "y":4}
-            ]
-        },
-        "LAYOUT_65_ansi": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -154,7 +78,7 @@
                 {"x":15, "y":4}
             ]
         },
-        "LAYOUT_65_ansi_split_bs": {
+        "LAYOUT_65_ansi_blocker_split_bs": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -230,7 +154,7 @@
                 {"x":15, "y":4}
             ]
         },
-        "LAYOUT_65_iso": {
+        "LAYOUT_65_ansi_blocker_isoenter": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -279,7 +203,7 @@
                 {"x":13.75, "y":1, "w":1.25, "h":2},
                 {"x":15, "y":2},
 
-                {"x":0, "y":3, "w":1.25},
+                {"x":0, "y":3, "w":2.25},
                 {"x":2.25, "y":3},
                 {"x":3.25, "y":3},
                 {"x":4.25, "y":3},
diff --git a/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
index 404c64df6d..f501190190 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
@@ -17,44 +17,47 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |Del |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |PgUp|
-   * |----------------------------------------------------------------|
-   * |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgDn|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|End |
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|    |Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[0] = LAYOUT_65_ansi(
-  KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
-  KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-  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_PGDN,
-  KC_LSFT,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
-  KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
 
-  /* Keymap Fn Layer
-   * ,----------------------------------------------------------------.
-   * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|        |    |
-   * |----------------------------------------------------------------|
-   * |        |BL+|BL-|BLT|BLS|BLM|   |   |End|PDn|Dow|      |PUp|    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |Hom|PDn|End |
-   * `----------------------------------------------------------------'
-   */
-[1] = LAYOUT_65_ansi(
-   KC_GRV, KC_F1,   KC_F2, KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
-   _______,_______, KC_UP, _______, _______,_______,_______,_______, KC_PSCR,KC_SLCK,KC_PAUS, KC_UP,   _______, _______, _______,
-   _______,KC_LEFT, KC_DOWN,KC_RGHT,_______,_______,_______,_______, KC_HOME,KC_PGUP,KC_LEFT, KC_RGHT,          _______, _______,
-   _______,         BL_DEC, BL_TOGG,BL_INC, BL_STEP,BL_BRTG,_______,_______, KC_END, KC_PGDN,KC_DOWN, _______, KC_PGUP, _______,
-   _______,_______, _______,                _______,                         _______,_______,          KC_HOME, KC_PGDN, KC_END),
+    /* Keymap (Base Layer) Default Layer
+     * ,---------------------------------------------------------------.
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |Del|
+     * |---------------------------------------------------------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |PUp|
+     * |---------------------------------------------------------------|
+     * |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PDn|
+     * |---------------------------------------------------------------|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|End|
+     * |---------------------------------------------------------------|
+     * |Ctrl|Win |Alt |        Space           |Alt | Fn | |Lef|Dow|Rig|
+     * `---------------------------------------------------------------'
+     */
+    [0] = LAYOUT_65_ansi_blocker(
+        KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /* Keymap Fn Layer
+     * ,---------------------------------------------------------------.
+     * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete |Ins|
+     * |---------------------------------------------------------------|
+     * |     |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |   |
+     * |---------------------------------------------------------------|
+     * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|        |   |
+     * |---------------------------------------------------------------|
+     * |        |BL-|BLT|BL+|BLS|BLM|   |   |End|PDn|Dow|      |PUp|   |
+     * |---------------------------------------------------------------|
+     * |    |    |    |                        |    |    | |Hom|PDn|End|
+     * `---------------------------------------------------------------'
+     */
+    [1] = LAYOUT_65_ansi_blocker(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______, _______,
+        _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, KC_PGUP, _______,
+        _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END
+    ),
 
 };
diff --git a/keyboards/mechbrewery/mb65s/keymaps/default/readme.md b/keyboards/mechbrewery/mb65s/keymaps/default/readme.md
index 2cb43c5e1a..50d242b75a 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/default/readme.md
+++ b/keyboards/mechbrewery/mb65s/keymaps/default/readme.md
@@ -1 +1 @@
-# The default keymap for kbd67
+# The default keymap for the MB65S
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c
index 605bbf666c..6ef0dfdb06 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c
@@ -18,21 +18,21 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        
+
     /* Base layer
      * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
      * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Del│
      * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
      * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │PUp│
      * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
-     * │ FN   │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PDn│
-     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
-     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
-     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴───┴──┬───┼───┼───┤
-     * │Ctrl│LGUI│LAlt│        Space        │RAlt│App      │ ← │ ↓ │ → │
-     * └────┴────┴────┴─────────────────────┴────┴─────────┴───┴───┴───┘
+     * │ Fn   │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PDn│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+     * │Shft    │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │Ctrl│LGUI│LAlt│          Space         │RAlt│App │ │ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-    [0] = LAYOUT_65_iso(
+    [0] = LAYOUT_65_ansi_blocker_isoenter(
         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_DEL,
         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_PGUP,
         MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGDN,
@@ -41,26 +41,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     /* Function layer
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬────┐
-     * │§  │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │PrtS│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼────┤
-     * │Caps │Prv│Pau│Nxt│   │   │   │   │   │   │BL+│BL-│BL │RESET│Ins │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├────┤
-     * │      │V- │V0 │V+ │   │   │   │   │   │   │   │   │   │    │Home│
-     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼────┤
-     * │    │BL+│BL-│BLT│BLS│BLM│   │   │   │   │   │   │LClick│MUp│End │
-     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴───┴──┬───┼───┼────┤
-     * │    │    │    │                     │    │         │MLt│MDw│MRgt│
-     * └────┴────┴────┴─────────────────────┴────┴─────────┴───┴───┴────┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │ § │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │Prt│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │Caps │Prv│Pau│Nxt│   │   │   │   │   │   │BL+│BL-│BLT│Reset│Ins│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
+     * │      │Vl-│V0 │Vl+│   │   │   │   │   │   │   │   │   │    │Hom│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+     * │        │BL-│BLT│BL+│BLS│BLM│   │   │   │   │   │LClick│MUp│End│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │    │    │    │                        │    │    │ │MLt│MDw│MRt│
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
-
-    [1] = LAYOUT_65_iso(
+    [1] = LAYOUT_65_ansi_blocker_isoenter(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
         KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, BL_INC,  BL_DEC,  BL_TOGG,          KC_INS,
-        _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, KC_HOME,
+        _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_HOME,
         _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_END,
         _______, _______, _______,                   _______,                            _______, _______,          KC_MS_L, KC_MS_D, KC_MS_R
     ),
+
 };
-
-
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso/readme.md b/keyboards/mechbrewery/mb65s/keymaps/iso/readme.md
index dfbd082c76..2397d2e858 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/iso/readme.md
+++ b/keyboards/mechbrewery/mb65s/keymaps/iso/readme.md
@@ -2,32 +2,32 @@
 
 Almost a default ISO layout, except Caps Lock swapped `MO(1)`.
 
-Made with `LAYOUT_65_iso`
+Made with `LAYOUT_65_ansi_blocker_isoenter`
 
 ```
 Base layer
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-│Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ ` │
+│Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Del│
 ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-│ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Å │ ^ │     │Del│
+│ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │PUp│
 ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
-│ FN   │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ö │ Ä │ ' │    │PUp│
-├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
-│Shft│ < │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │ Shift│ ↑ │PDn│
-├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼───┤
-│Ctrl│LAlt│LGUI│        Space        │RAlt│App │RCtl│ ← │ ↓ │ → │
-└────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘
+│ Fn   │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PDn│
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+│Shft    │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│Ctrl│LGUI│LAlt│          Space         │RAlt│App │ │ ← │ ↓ │ → │
+└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
 
 Function layer
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬────┐
-│§  │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │PrtS│
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼────┤
-│Caps │Prv│Pau│Nxt│   │   │   │   │   │   │BL+│BL-│BL │RESET│Ins │
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├────┤
-│      │V- │V0 │V+ │   │   │   │   │   │   │   │   │   │    │Home│
-├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼────┤
-│    │TOG│MOD│HU+│HU-│SA+│SA-│   │   │   │   │   │LClick│MUp│End │
-├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼────┤
-│    │    │    │                     │    │    │    │MLt│MDw│MRgt│
-└────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴────┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+│ § │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │Prt│
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+│Caps │Prv│Pau│Nxt│   │   │   │   │   │   │BL+│BL-│BLT│Reset│Ins│
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
+│      │Vl-│V0 │Vl+│   │   │   │   │   │   │   │   │   │    │Hom│
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+│        │BL-│BLT│BL+│BLS│BLM│   │   │   │   │   │LClick│MUp│End│
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│    │    │    │                        │    │    │ │MLt│MDw│MRt│
+└────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
 ```
diff --git a/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c
index 36a135e244..b8a915f2b7 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c
@@ -17,45 +17,47 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Keymap (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| - | = |Bsp|Del|Home|
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P| [ | ] |  \  |PgUp|
-   * |----------------------------------------------------------------|
-   * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L| ; | ' |Return |PgDn|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M| , | . | / |Shift | Up|Home|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |GUI |        Space          |GUI   |FN   |Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[0] = LAYOUT_65_ansi_split_bs(
-  KC_ESC,  KC_1,     KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,   KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
-  KC_TAB,            KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-  KC_LCTL,           KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
-  KC_LSFT,           KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-  KC_LCTL, KC_LALT,          KC_LGUI,                KC_SPC,                          KC_RGUI, MO(1),           KC_LEFT, KC_DOWN, KC_RGHT
-),
 
-  /* Keymap Fn Layer
-   * ,----------------------------------------------------------------.
-   * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|   |Del|Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|        |Vol+|
-   * |----------------------------------------------------------------|
-   * |        |BL+|BL-|BLT|BLS|BLM|   |   |End|PDn|Dow|      |   |Vol-|
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |      |     |Prv|Ply|Nxt |
-   * `----------------------------------------------------------------'
-   */
-[1] = LAYOUT_65_ansi_split_bs(
-  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL, KC_INS,
-  _______,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
-  _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______, KC_VOLU,
-  _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, KC_END,  KC_PGDN, KC_DOWN,          _______, _______, KC_VOLD,
-  _______, _______,          _______,                   _______,                            _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT),
+    /* Keymap (Base Layer) Default Layer
+     * ,---------------------------------------------------------------.
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| - | = |Bsp|Del|Hom|
+     * |---------------------------------------------------------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P| [ | ] |  \  |PUp|
+     * |---------------------------------------------------------------|
+     * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L| ; | ' |Return |PDn|
+     * |---------------------------------------------------------------|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M| , | . | / |Shift | Up|Hom|
+     * |---------------------------------------------------------------|
+     * |Ctrl|Alt |GUI |          Space         |GUI |Fn  | |Lef|Dow|Rig|
+     * `---------------------------------------------------------------'
+     */
+    [0] = LAYOUT_65_ansi_blocker_split_bs(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI  MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /* Keymap Fn Layer
+     * ,---------------------------------------------------------------.
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| - | = |   |Del|Ins|
+     * |---------------------------------------------------------------|
+     * |     |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |   |
+     * |---------------------------------------------------------------|
+     * |       |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|       |Vl+|
+     * |---------------------------------------------------------------|
+     * |        |BL-|BLT|BL+|BLS|BLM|   |   |End|PDn|Dow|      |   |Vl-|
+     * |---------------------------------------------------------------|
+     * |    |    |    |                        |    |    | |Prv|Ply|Nxt|
+     * `---------------------------------------------------------------'
+     */
+    [1] = LAYOUT_65_ansi_blocker_split_bs(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  KC_INS,
+        _______,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
+        _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______, KC_VOLU,
+        _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, KC_END,  KC_PGDN, KC_DOWN,          _______, _______, KC_VOLD,
+        _______, _______, _______,                            _______,                            _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
+    ),
 
 };
diff --git a/keyboards/mechbrewery/mb65s/keymaps/split_bs/readme.md b/keyboards/mechbrewery/mb65s/keymaps/split_bs/readme.md
index 2cb43c5e1a..50d242b75a 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/split_bs/readme.md
+++ b/keyboards/mechbrewery/mb65s/keymaps/split_bs/readme.md
@@ -1 +1 @@
-# The default keymap for kbd67
+# The default keymap for the MB65S
diff --git a/keyboards/mechbrewery/mb65s/keymaps/split_bs/rules.mk b/keyboards/mechbrewery/mb65s/keymaps/split_bs/rules.mk
deleted file mode 100644
index 4da205a168..0000000000
--- a/keyboards/mechbrewery/mb65s/keymaps/split_bs/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/mechbrewery/mb65s/mb65s.h b/keyboards/mechbrewery/mb65s/mb65s.h
index 9519208e3c..f1faf36984 100644
--- a/keyboards/mechbrewery/mb65s/mb65s.h
+++ b/keyboards/mechbrewery/mb65s/mb65s.h
@@ -18,6 +18,22 @@
 
 #include "quantum.h"
 
+#define XXX KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │    │0E     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │1F │      │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │2F │   │1E │    │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │3F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │40  │41  │43  │46                      │4A  │4B  │ │4D │4E │4F │
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ */
+
 /* This a shortcut to help you visually see your layout.
  *
  * The first section contains all of the arguments representing the physical
@@ -26,7 +42,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT_all( \
+#define LAYOUT_65_ansi_blocker_split_bs( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
@@ -34,14 +50,14 @@
     K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
 ) \
 { \
-    { K00, K01,   K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E,   K0F }, \
-    { K10, KC_NO, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E,   K1F }, \
-    { K20, KC_NO, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   K2D,   KC_NO, K2F }, \
-    { K30, KC_NO, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E,   K3F }, \
-    { K40, K41,   KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E,   K4F }, \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
 }
 
-#define LAYOUT_65_ansi( \
+#define LAYOUT_65_ansi_blocker( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
@@ -49,14 +65,14 @@
     K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
 ) \
 { \
-    { K00, K01,   K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E,   K0F }, \
-    { K10, KC_NO, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E,   K1F }, \
-    { K20, KC_NO, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   K2D,   KC_NO, K2F }, \
-    { K30, KC_NO, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E,   K3F }, \
-    { K40, K41,   KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E,   K4F }, \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
 }
 
-#define LAYOUT_65_iso( \
+#define LAYOUT_65_ansi_blocker_isoenter( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
@@ -64,11 +80,9 @@
     K40, K41,      K43,           K46,                K4A, K4B,      K4D, K4E, K4F  \
 ) \
 { \
-    { K00, K01,   K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   KC_NO, K0E,   K0F }, \
-    { K10, KC_NO, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E,   K1F }, \
-    { K20, KC_NO, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   K2D,   KC_NO, K2F }, \
-    { K30, KC_NO, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E,   K3F }, \
-    { K40, K41,   KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, KC_NO, K4D,   K4E,   K4F }, \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
 }
-
-#define LAYOUT_65_ansi_split_bs  LAYOUT_all
diff --git a/keyboards/mechbrewery/mb65s/rules.mk b/keyboards/mechbrewery/mb65s/rules.mk
index 09f27b3a50..d0cf09161a 100644
--- a/keyboards/mechbrewery/mb65s/rules.mk
+++ b/keyboards/mechbrewery/mb65s/rules.mk
@@ -10,12 +10,12 @@ BOOTLOADER = atmel-dfu
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 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
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
 
-LAYOUTS = 65_ansi 65_iso 65_ansi_split_bs
+LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs

From 0e18f03b79d9bf5274323d7049c25e16d9250a06 Mon Sep 17 00:00:00 2001
From: Domanic Calleja <82970232+Malevolti@users.noreply.github.com>
Date: Sun, 19 Dec 2021 20:58:40 +0000
Subject: [PATCH 021/867] Add Superlyra keyboard + group with Lyra under new
 directory (#14955)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/malevolti/lyra/config.h             |  19 +++
 .../malevolti/lyra/keymaps/default/config.h   |  30 +++++
 .../malevolti/lyra/keymaps/default/keymap.c   |  48 ++++++++
 keyboards/malevolti/lyra/keymaps/via/config.h |  30 +++++
 keyboards/malevolti/lyra/keymaps/via/keymap.c |  56 +++++++++
 keyboards/malevolti/lyra/keymaps/via/rules.mk |   1 +
 keyboards/malevolti/lyra/lyra.c               |  84 +++++++++++++
 keyboards/malevolti/lyra/lyra.h               |  23 ++++
 keyboards/malevolti/lyra/readme.md            |  20 +++
 keyboards/malevolti/lyra/rev1/config.h        |  49 ++++++++
 keyboards/malevolti/lyra/rev1/info.json       |  90 ++++++++++++++
 keyboards/malevolti/lyra/rev1/rev1.c          |  19 +++
 keyboards/malevolti/lyra/rev1/rev1.h          |  39 ++++++
 keyboards/malevolti/lyra/rev1/rules.mk        |  21 ++++
 keyboards/malevolti/superlyra/config.h        |  19 +++
 .../superlyra/keymaps/default/config.h        |  26 ++++
 .../superlyra/keymaps/default/keymap.c        |  43 +++++++
 .../malevolti/superlyra/keymaps/via/config.h  |  26 ++++
 .../malevolti/superlyra/keymaps/via/keymap.c  |  56 +++++++++
 .../malevolti/superlyra/keymaps/via/rules.mk  |   1 +
 keyboards/malevolti/superlyra/readme.md       |  20 +++
 keyboards/malevolti/superlyra/rev1/config.h   |  44 +++++++
 keyboards/malevolti/superlyra/rev1/info.json  | 116 ++++++++++++++++++
 keyboards/malevolti/superlyra/rev1/rev1.c     |  17 +++
 keyboards/malevolti/superlyra/rev1/rev1.h     |  34 +++++
 keyboards/malevolti/superlyra/rev1/rules.mk   |  20 +++
 keyboards/malevolti/superlyra/superlyra.c     |  17 +++
 keyboards/malevolti/superlyra/superlyra.h     |  23 ++++
 28 files changed, 991 insertions(+)
 create mode 100644 keyboards/malevolti/lyra/config.h
 create mode 100644 keyboards/malevolti/lyra/keymaps/default/config.h
 create mode 100644 keyboards/malevolti/lyra/keymaps/default/keymap.c
 create mode 100644 keyboards/malevolti/lyra/keymaps/via/config.h
 create mode 100644 keyboards/malevolti/lyra/keymaps/via/keymap.c
 create mode 100644 keyboards/malevolti/lyra/keymaps/via/rules.mk
 create mode 100644 keyboards/malevolti/lyra/lyra.c
 create mode 100644 keyboards/malevolti/lyra/lyra.h
 create mode 100644 keyboards/malevolti/lyra/readme.md
 create mode 100644 keyboards/malevolti/lyra/rev1/config.h
 create mode 100644 keyboards/malevolti/lyra/rev1/info.json
 create mode 100644 keyboards/malevolti/lyra/rev1/rev1.c
 create mode 100644 keyboards/malevolti/lyra/rev1/rev1.h
 create mode 100644 keyboards/malevolti/lyra/rev1/rules.mk
 create mode 100644 keyboards/malevolti/superlyra/config.h
 create mode 100644 keyboards/malevolti/superlyra/keymaps/default/config.h
 create mode 100644 keyboards/malevolti/superlyra/keymaps/default/keymap.c
 create mode 100644 keyboards/malevolti/superlyra/keymaps/via/config.h
 create mode 100644 keyboards/malevolti/superlyra/keymaps/via/keymap.c
 create mode 100644 keyboards/malevolti/superlyra/keymaps/via/rules.mk
 create mode 100644 keyboards/malevolti/superlyra/readme.md
 create mode 100644 keyboards/malevolti/superlyra/rev1/config.h
 create mode 100644 keyboards/malevolti/superlyra/rev1/info.json
 create mode 100644 keyboards/malevolti/superlyra/rev1/rev1.c
 create mode 100644 keyboards/malevolti/superlyra/rev1/rev1.h
 create mode 100644 keyboards/malevolti/superlyra/rev1/rules.mk
 create mode 100644 keyboards/malevolti/superlyra/superlyra.c
 create mode 100644 keyboards/malevolti/superlyra/superlyra.h

diff --git a/keyboards/malevolti/lyra/config.h b/keyboards/malevolti/lyra/config.h
new file mode 100644
index 0000000000..a4606507ce
--- /dev/null
+++ b/keyboards/malevolti/lyra/config.h
@@ -0,0 +1,19 @@
+ /* Copyright 2021 Domanic Calleja
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+#pragma once
+
+#include "config_common.h"
+
diff --git a/keyboards/malevolti/lyra/keymaps/default/config.h b/keyboards/malevolti/lyra/keymaps/default/config.h
new file mode 100644
index 0000000000..9c4bacd36d
--- /dev/null
+++ b/keyboards/malevolti/lyra/keymaps/default/config.h
@@ -0,0 +1,30 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/lyra/keymaps/default/keymap.c b/keyboards/malevolti/lyra/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1d4bef03f2
--- /dev/null
+++ b/keyboards/malevolti/lyra/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+ /* Copyright 2021 Domanic Calleja
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+//
+// Keymaps
+//
+enum lyra_layers {
+    /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */
+    _QWERTY,
+    _FUNCTION
+
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    // Layer 0
+    [_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_MINS,		KC_EQL,			KC_BSPC,
+    KC_TAB,		KC_LBRC,	KC_Q,		KC_W,				KC_E,		KC_R,		KC_T,				KC_Y,		KC_U,       KC_I,		KC_O,		KC_P,			KC_NUHS,		KC_DEL,			
+    KC_CLCK,	KC_RBRC,	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_NUBS,	KC_Z,		KC_X,       		KC_C,       KC_V,       KC_B,            	KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_SLSH,		KC_UP,			KC_RSFT,
+    KC_LCTL,	KC_LGUI,	KC_LALT,	TT(1),				KC_APP,		KC_PGDN,	KC_SPC,				KC_SPC,		KC_PGUP,	KC_RALT,	KC_RCTL,	KC_LEFT,		KC_DOWN,		KC_RGHT					
+    ),
+
+    // Layer 1
+    [_FUNCTION] = LAYOUT(
+    KC_TRNS,		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_TRNS,
+    KC_TRNS,		KC_TRNS,    KC_TRNS,	KC_TRNS,    KC_TRNS,    KC_TRNS,	KC_TRNS,			KC_TRNS,    KC_TRNS,    KC_TRNS,	KC_TRNS,    KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_VOLD,	KC_TRNS,			KC_TRNS,	KC_VOLU,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS	
+    )
+
+};
+
diff --git a/keyboards/malevolti/lyra/keymaps/via/config.h b/keyboards/malevolti/lyra/keymaps/via/config.h
new file mode 100644
index 0000000000..9c4bacd36d
--- /dev/null
+++ b/keyboards/malevolti/lyra/keymaps/via/config.h
@@ -0,0 +1,30 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/lyra/keymaps/via/keymap.c b/keyboards/malevolti/lyra/keymaps/via/keymap.c
new file mode 100644
index 0000000000..efc40d2267
--- /dev/null
+++ b/keyboards/malevolti/lyra/keymaps/via/keymap.c
@@ -0,0 +1,56 @@
+ /* Copyright 2021 Domanic Calleja
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+#include QMK_KEYBOARD_H
+//
+// Keymaps
+//
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    // Layer 0
+    [0] = LAYOUT(
+    KC_ESC,   KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,     KC_9,     KC_0,    KC_MINS,    KC_EQL,     KC_BSPC,
+    KC_TAB,   KC_LBRC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,     KC_I,     KC_O,    KC_P,       KC_NUHS,    KC_DEL,
+    KC_CLCK,  KC_RBRC,  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_NUBS,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,     KC_COMM,  KC_DOT,  KC_SLSH,    KC_UP,      KC_RSFT,
+    KC_LCTL,  KC_LGUI,  KC_LALT,  TT(1),  KC_APP,  KC_PGDN, KC_SPC,      KC_SPC,  KC_PGUP,  KC_RALT,  KC_RCTL, KC_LEFT,    KC_DOWN,    KC_RGHT
+    ),
+
+    // Layer 1
+    [1] = LAYOUT(
+    KC_TRNS,  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_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_TRNS,      KC_TRNS,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS
+    ),
+      // Layer 2
+    [2] = LAYOUT(
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_TRNS,      KC_TRNS,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_TRNS,      KC_TRNS,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS
+    ),
+      // Layer 3
+    [3] = LAYOUT(
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_TRNS,      KC_TRNS,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_TRNS,      KC_TRNS,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS
+    )
+};
diff --git a/keyboards/malevolti/lyra/keymaps/via/rules.mk b/keyboards/malevolti/lyra/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/malevolti/lyra/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/malevolti/lyra/lyra.c b/keyboards/malevolti/lyra/lyra.c
new file mode 100644
index 0000000000..cd8d7c2e8b
--- /dev/null
+++ b/keyboards/malevolti/lyra/lyra.c
@@ -0,0 +1,84 @@
+ /* Copyright 2021 Domanic Calleja
+  * 
+  * 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 "lyra.h"
+
+#ifdef OLED_ENABLE
+
+// 'lyralogooled', 32x128px
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    if (is_keyboard_master()) {
+        return OLED_ROTATION_270;
+    }
+    return rotation;
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+    if (is_keyboard_master()) {
+        oled_write_P(PSTR("      "), false);
+#    ifdef WPM_ENABLE
+        oled_write(get_u8_str(get_current_wpm(), ' '), false);
+        oled_write_ln_P(PSTR("   WPM"), false);
+#    else
+        oled_advance_page(true);
+#    endif
+        oled_advance_page(true);
+        led_t led_usb_state = host_keyboard_led_state();
+        oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock);
+        oled_advance_page(true);  oled_advance_page(true);
+        oled_write_ln_P(PSTR("Lyra"), false);
+        oled_write_ln_P(PSTR("v1.1"), false);
+        oled_write_ln_P(PSTR("by"), false);
+        oled_write_P(PSTR("Dom C"), false);
+    } else {
+        static const char PROGMEM QMK_logo[] = {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x78, 0x18, 0x0c, 0x04, 0x06, 0x02, 
+            0x02, 0x82, 0xc0, 0xf0, 0x38, 0x8c, 0xf2, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x80, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x80, 0x40, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0x18, 0x30, 0x20, 0xa0, 0xe0, 0xf8, 
+            0x3e, 0x1f, 0x13, 0x0c, 0x06, 0xc3, 0xf0, 0x60, 0x00, 0x80, 0xf0, 0xe0, 0x00, 0x38, 0xfe, 0x67, 
+            0x7b, 0xa5, 0xf3, 0xf0, 0x70, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0x70, 0x30, 0x20, 0x00, 0x00, 
+            0x00, 0x80, 0x00, 0x00, 0x00, 0x7f, 0xc0, 0xdd, 0xdd, 0xdd, 0xe3, 0x7e, 0x3c, 0x3e, 0x61, 0xdf, 
+            0xde, 0xde, 0x01, 0xff, 0xfe, 0x00, 0x80, 0x80, 0x80, 0xff, 0xc0, 0xdf, 0xdf, 0xdf, 0xe0, 0xff, 
+            0x7f, 0x3c, 0x62, 0xdd, 0xdd, 0xdd, 0xe3, 0x7e, 0x3c, 0xfe, 0xc1, 0xfd, 0x7d, 0xc3, 0xfd, 0x7d, 
+            0xc3, 0xfe, 0xfc, 0x30, 0xea, 0xd5, 0xd5, 0xd5, 0xc3, 0xff, 0xfe, 0x7e, 0xc1, 0xfd, 0x7d, 0x7d, 
+            0xc3, 0xfe, 0xfc, 0x3f, 0xe1, 0xff, 0xff, 0x3c, 0x62, 0xdd, 0xdd, 0xdd, 0xf7, 0xe6, 0x00, 0x00, 
+            0x00, 0x78, 0xc4, 0xc2, 0x82, 0x82, 0x82, 0x82, 0xc2, 0xe4, 0x74, 0x7c, 0x3f, 0x1f, 0x31, 0x60, 
+            0xe0, 0xc0, 0x80, 0x9c, 0xbf, 0xe7, 0xf1, 0x78, 0x3e, 0x1f, 0x0b, 0x04, 0x02, 0x01, 0x00, 0x1c, 
+            0x3e, 0x2f, 0x13, 0x10, 0x0c, 0x1e, 0x3f, 0x2f, 0x13, 0x09, 0x1c, 0x3e, 0x2f, 0x10, 0x08, 0x06, 
+            0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x06, 
+            0x06, 0x06, 0x07, 0x03, 0x7f, 0xc1, 0xbe, 0xbe, 0xbe, 0xa6, 0xe7, 0xc7, 0x60, 0xd4, 0xaa, 0xaa, 
+            0xaa, 0x86, 0xfe, 0xfc, 0x7f, 0xc0, 0xff, 0xff, 0x7f, 0xc0, 0xff, 0xff, 0xc4, 0xaa, 0xaa, 0xaa, 
+            0xa6, 0xfc, 0xf8, 0xff, 0x02, 0xff, 0xff, 0x60, 0xd4, 0xaa, 0xaa, 0xaa, 0x86, 0xfe, 0xfc, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x24, 
+            0x32, 0x1b, 0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3c, 0x38, 0x38, 0x78, 0x70, 0x70, 0x70, 0x30, 0x38, 
+            0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 
+            0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 
+            0x01, 0x01, 0x07, 0x0d, 0x0e, 0x07, 0x03, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 
+        };
+        oled_write_raw_P(QMK_logo, sizeof(QMK_logo));
+    }
+}
+#endif 
diff --git a/keyboards/malevolti/lyra/lyra.h b/keyboards/malevolti/lyra/lyra.h
new file mode 100644
index 0000000000..941f292c93
--- /dev/null
+++ b/keyboards/malevolti/lyra/lyra.h
@@ -0,0 +1,23 @@
+ /* Copyright 2021 Domanic Calleja
+  * 
+  * 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"
+
+
+#ifdef KEYBOARD_malevolti_lyra_rev1
+    #include "rev1.h"
+#endif
diff --git a/keyboards/malevolti/lyra/readme.md b/keyboards/malevolti/lyra/readme.md
new file mode 100644
index 0000000000..3939431fb6
--- /dev/null
+++ b/keyboards/malevolti/lyra/readme.md
@@ -0,0 +1,20 @@
+# Lyra Keyboard
+By Domanic Calleja - https://github.com/Malevolti
+
+Lyra is 7x5 keys column-staggered split keyboard. Based on  Sofle, Lily58, Corne and Helix keyboards.
+There is an open source PCB available via https://github.com/Malevolti/Lyra
+Instructions for handwiring and hand-wire specific case STLs are available for home 3d printing
+
+Make example for this keyboard (after setting up your build environment):
+
+    make malevolti/lyra:default
+
+Flashing example for this keyboard:
+
+    make malevolti/lyra:default:flash
+
+Press reset button on the keyboard when asked.
+
+Disconnect the first half, connect the second one and repeat the process.
+
+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).
diff --git a/keyboards/malevolti/lyra/rev1/config.h b/keyboards/malevolti/lyra/rev1/config.h
new file mode 100644
index 0000000000..4e006c2bdf
--- /dev/null
+++ b/keyboards/malevolti/lyra/rev1/config.h
@@ -0,0 +1,49 @@
+ /* Copyright 2021 Domanic Calleja
+  * 
+  * 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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4443  //DC
+#define PRODUCT_ID      0x4C43  //LC
+#define DEVICE_VER      0x3031  //01
+#define MANUFACTURER    Dom
+#define PRODUCT         Lyra
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
+#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define TAPPING_TERM 100
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* communication between sides */
+#define USE_SERIAL
+#define SOFT_SERIAL_PIN D2
+
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json
new file mode 100644
index 0000000000..82dd811fd5
--- /dev/null
+++ b/keyboards/malevolti/lyra/rev1/info.json
@@ -0,0 +1,90 @@
+{
+    "keyboard_name": "lyra",
+    "url": "",
+    "maintainer": "malevolti",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0.3},
+                {"x": 1, "y": 0.4},
+                {"x": 2, "y": 0.3},
+                {"x": 3, "y": 0.1},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0.1},
+                {"x": 6, "y": 0.25},
+
+                {"x": 8, "y": 0.25},
+                {"x": 9, "y": 0.1},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0.1},
+                {"x": 12, "y": 0.3},
+                {"x": 13, "y": 0.4},
+                {"x": 14, "y": 0.3},
+
+                {"x": 0, "y": 1.3},
+                {"x": 1, "y": 1.4},
+                {"x": 2, "y": 1.3},
+                {"x": 3, "y": 1.1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1.1},
+                {"x": 6, "y": 1.25},
+
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1.1},
+                {"x": 12, "y": 1.3},
+                {"x": 13, "y": 1.4},
+                {"x": 14, "y": 1.3},
+
+                {"x": 0, "y": 2.3},
+                {"x": 1, "y": 2.4},
+                {"x": 2, "y": 2.3},
+                {"x": 3, "y": 2.1},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2.1},
+                {"x": 6, "y": 2.25},
+
+                {"x": 8, "y": 2.25},
+                {"x": 9, "y": 2.1},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2.1},
+                {"x": 12, "y": 2.3},
+                {"x": 13, "y": 2.4},
+                {"x": 14, "y": 2.3},
+
+                {"x": 0, "y": 3.3},
+                {"x": 1, "y": 3.4},
+                {"x": 2, "y": 3.3},
+                {"x": 3, "y": 3.1},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3.1},
+                {"x": 6, "y": 3.25},
+
+                {"x": 8, "y": 3.25},
+                {"x": 9, "y": 3.1},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3.1},
+                {"x": 12, "y": 3.3},
+                {"x": 13, "y": 3.4},
+                {"x": 14, "y": 3.3},
+
+                {"x": 0, "y": 4.3},
+                {"x": 1, "y": 4.4},
+                {"x": 2, "y": 4.3},
+                {"x": 3, "y": 4.1},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4.1},
+                {"x": 6.25, "y": 4.5},
+
+                {"x": 7.75, "y": 4.5},
+                {"x": 9, "y": 4.1},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4.1},
+                {"x": 12, "y": 4.3},
+                {"x": 13, "y": 4.4},
+                {"x": 14, "y": 4.3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/malevolti/lyra/rev1/rev1.c b/keyboards/malevolti/lyra/rev1/rev1.c
new file mode 100644
index 0000000000..db31ea975c
--- /dev/null
+++ b/keyboards/malevolti/lyra/rev1/rev1.c
@@ -0,0 +1,19 @@
+ /* Copyright 2021 Domanic Calleja
+  * 
+  * 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 "rev1.h"
+
+
diff --git a/keyboards/malevolti/lyra/rev1/rev1.h b/keyboards/malevolti/lyra/rev1/rev1.h
new file mode 100644
index 0000000000..81b862c5c6
--- /dev/null
+++ b/keyboards/malevolti/lyra/rev1/rev1.h
@@ -0,0 +1,39 @@
+/* Copyright 2021 Domanic Calleja
+  * 
+  * 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 "lyra.h"
+
+
+#define LAYOUT( \
+	L00, L01, L02, L03, L04, L05, L06,          R00, R01, R02, R03, R04, R05, R06,	\
+	L10, L11, L12, L13, L14, L15, L16,          R10, R11, R12, R13, R14, R15, R16,  \
+	L20, L21, L22, L23, L24, L25, L26,          R20, R21, R22, R23, R24, R25, R26,	\
+	L30, L31, L32, L33, L34, L35, L36,			R30, R31, R32, R33, R34, R35, R36,	\
+	L40, L41, L42, L43, L44, L45, L46,			R40, R41, R42, R43, R44, R45, R46	\
+	) \
+	{ \
+		{ L00, L01, L02, L03, L04, L05, L06 }, \
+		{ L10, L11, L12, L13, L14, L15, L16 }, \
+		{ L20, L21, L22, L23, L24, L25, L26 }, \
+		{ L30, L31, L32, L33, L34, L35, L36 }, \
+		{ L40, L41, L42, L43, L44, L45, L46 }, \
+		{ R06, R05, R04, R03, R02, R01, R00 }, \
+		{ R16, R15, R14, R13, R12, R11, R10 }, \
+		{ R26, R25, R24, R23, R22, R21, R20 }, \
+		{ R36, R35, R34, R33, R32, R31, R30 }, \
+		{ R46, R45, R44, R43, R42, R41, R40 }	\
+	}
diff --git a/keyboards/malevolti/lyra/rev1/rules.mk b/keyboards/malevolti/lyra/rev1/rules.mk
new file mode 100644
index 0000000000..87f331ab6c
--- /dev/null
+++ b/keyboards/malevolti/lyra/rev1/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+SPLIT_KEYBOARD = yes
+LTO_ENABLE = yes 
\ No newline at end of file
diff --git a/keyboards/malevolti/superlyra/config.h b/keyboards/malevolti/superlyra/config.h
new file mode 100644
index 0000000000..a4606507ce
--- /dev/null
+++ b/keyboards/malevolti/superlyra/config.h
@@ -0,0 +1,19 @@
+ /* Copyright 2021 Domanic Calleja
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+#pragma once
+
+#include "config_common.h"
+
diff --git a/keyboards/malevolti/superlyra/keymaps/default/config.h b/keyboards/malevolti/superlyra/keymaps/default/config.h
new file mode 100644
index 0000000000..bbdf47463f
--- /dev/null
+++ b/keyboards/malevolti/superlyra/keymaps/default/config.h
@@ -0,0 +1,26 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/superlyra/keymaps/default/keymap.c b/keyboards/malevolti/superlyra/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c266867f6f
--- /dev/null
+++ b/keyboards/malevolti/superlyra/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+ /* Copyright 2021 Domanic Calleja
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+//
+// Keymaps
+//
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    // Layer 0
+    [0] = LAYOUT(
+    KC_ESC,		KC_1,		KC_2,		KC_3,	KC_4,		KC_5,		KC_6,			KC_NLCK,	KC_HOME,	KC_END,		KC_PSLS,			KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,		KC_EQL,			KC_BSPC,
+    KC_TAB,		KC_LBRC,	KC_Q,		KC_W,	KC_E,		KC_R,		KC_T,			KC_P7,		KC_P8,		KC_P9,		KC_PAST,			KC_Y,		KC_U,       KC_I,		KC_O,		KC_P,			KC_NUHS,		KC_DEL,			
+    KC_CLCK,	KC_RBRC,	KC_A,		KC_S,	KC_D,		KC_F,		KC_G,			KC_P4,		KC_P5,		KC_P6,		KC_PMNS,			KC_H,		KC_J,       KC_K,		KC_L,		KC_SCLN,		KC_QUOT,		KC_ENT,
+    KC_LSFT,	KC_NUBS,	KC_Z,		KC_X,	KC_C,       KC_V,       KC_B,			KC_P1,		KC_P2,		KC_P3,		KC_PPLS,			KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_SLSH,		KC_UP,			KC_RSFT,
+    KC_LCTL,	KC_LGUI,	KC_LALT,	TT(1),	KC_APP,		KC_PGDN,	KC_SPC,			KC_DEL,		KC_P0,		KC_PDOT,	KC_ENT,				KC_SPC,		KC_PGUP,	KC_RALT,	KC_RCTL,	KC_LEFT,		KC_DOWN,		KC_RGHT					
+    ),
+
+    // Layer 1
+    [1] = LAYOUT(
+    KC_TRNS,		KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,		KC_F6,				KC_TRNS,	KC_TRNS,	KC_TRNS,	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,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_VOLD,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_VOLU,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS	
+    )
+
+};
+
diff --git a/keyboards/malevolti/superlyra/keymaps/via/config.h b/keyboards/malevolti/superlyra/keymaps/via/config.h
new file mode 100644
index 0000000000..bbdf47463f
--- /dev/null
+++ b/keyboards/malevolti/superlyra/keymaps/via/config.h
@@ -0,0 +1,26 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 100
diff --git a/keyboards/malevolti/superlyra/keymaps/via/keymap.c b/keyboards/malevolti/superlyra/keymaps/via/keymap.c
new file mode 100644
index 0000000000..8c29bed56a
--- /dev/null
+++ b/keyboards/malevolti/superlyra/keymaps/via/keymap.c
@@ -0,0 +1,56 @@
+ /* Copyright 2021 Domanic Calleja
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+#include QMK_KEYBOARD_H
+//
+// Keymaps
+//
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    // Layer 0
+    [0] = LAYOUT(
+    KC_ESC,		KC_1,		KC_2,		KC_3,	KC_4,		KC_5,		KC_6,			KC_NLCK,	KC_HOME,	KC_END,		KC_PSLS,			KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,		KC_EQL,			KC_BSPC,
+    KC_TAB,		KC_LBRC,	KC_Q,		KC_W,	KC_E,		KC_R,		KC_T,			KC_P7,		KC_P8,		KC_P9,		KC_PAST,			KC_Y,		KC_U,       KC_I,		KC_O,		KC_P,			KC_NUHS,		KC_DEL,			
+    KC_CLCK,	KC_RBRC,	KC_A,		KC_S,	KC_D,		KC_F,		KC_G,			KC_P4,		KC_P5,		KC_P6,		KC_PMNS,			KC_H,		KC_J,       KC_K,		KC_L,		KC_SCLN,		KC_QUOT,		KC_ENT,
+    KC_LSFT,	KC_NUBS,	KC_Z,		KC_X,	KC_C,       KC_V,       KC_B,			KC_P1,		KC_P2,		KC_P3,		KC_PPLS,			KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_SLSH,		KC_UP,			KC_RSFT,
+    KC_LCTL,	KC_LGUI,	KC_LALT,	TT(1),	KC_APP,		KC_PGDN,	KC_SPC,			KC_DEL,		KC_P0,		KC_PDOT,	KC_ENT,				KC_SPC,		KC_PGUP,	KC_RALT,	KC_RCTL,	KC_LEFT,		KC_DOWN,		KC_RGHT		
+    ),
+
+    // Layer 1
+    [1] = LAYOUT(
+    KC_TRNS,		KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,		KC_F6,				KC_TRNS,	KC_TRNS,	KC_TRNS,	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,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_VOLD,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_VOLU,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS	
+    ),
+      // Layer 2
+    [2] = LAYOUT(
+    KC_TRNS,		KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,		KC_F6,				KC_TRNS,	KC_TRNS,	KC_TRNS,	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,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_VOLD,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_VOLU,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS	
+    ),
+      // Layer 3
+    [3] = LAYOUT(
+    KC_TRNS,		KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,		KC_F6,				KC_TRNS,	KC_TRNS,	KC_TRNS,	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,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
+    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_VOLD,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_VOLU,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS	
+    )
+};
diff --git a/keyboards/malevolti/superlyra/keymaps/via/rules.mk b/keyboards/malevolti/superlyra/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/malevolti/superlyra/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/malevolti/superlyra/readme.md b/keyboards/malevolti/superlyra/readme.md
new file mode 100644
index 0000000000..b222f0f34c
--- /dev/null
+++ b/keyboards/malevolti/superlyra/readme.md
@@ -0,0 +1,20 @@
+# SuperLyra Keyboard
+By Domanic Calleja - https://github.com/Malevolti
+
+SuperLyra is a 90 key column-staggered ergonomic keyboard. Based on the Lyra split with the addition of a centre numpad for ambidextorous use. 
+This version is a single pcb as opposed to a split, with the alphanumeric segments angled at 30 degrees to eachother.
+There is an open source PCB available via https://github.com/Malevolti/SuperLyra
+
+Make example for this keyboard (after setting up your build environment):
+
+    make malevolti/superlyra:default
+
+Flashing example for this keyboard:
+
+    make malevolti/superlyra:default:flash
+
+Press reset button on the keyboard when asked.
+
+Disconnect the first half, connect the second one and repeat the process.
+
+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).
diff --git a/keyboards/malevolti/superlyra/rev1/config.h b/keyboards/malevolti/superlyra/rev1/config.h
new file mode 100644
index 0000000000..65c41392fa
--- /dev/null
+++ b/keyboards/malevolti/superlyra/rev1/config.h
@@ -0,0 +1,44 @@
+ /* Copyright 2021 Domanic Calleja
+  * 
+  * 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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4443  //DC
+#define PRODUCT_ID      0x4C53  //LS
+#define DEVICE_VER      0x3031  //01
+#define MANUFACTURER    Dom
+#define PRODUCT         SuperLyra
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 18
+
+// wiring of each half
+#define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define TAPPING_TERM 100
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json
new file mode 100644
index 0000000000..c7dce70de5
--- /dev/null
+++ b/keyboards/malevolti/superlyra/rev1/info.json
@@ -0,0 +1,116 @@
+{
+    "keyboard_name": "superlyra",
+    "url": "",
+    "maintainer": "malevolti",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "x": 0, "y": 0.3 },
+                { "x": 1, "y": 0.4 },
+                { "x": 2, "y": 0.3 },
+                { "x": 3, "y": 0.1 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0.1 },
+                { "x": 6, "y": 0.25 },				
+
+                { "x": 8, "y": 0.25 },
+                { "x": 9, "y": 0.25 },
+                { "x": 10, "y": 0.25 },
+                { "x": 11, "y": 0.25 },
+
+                { "x": 13, "y": 0.25 },
+                { "x": 14, "y": 0.1 },
+                { "x": 15, "y": 0 },				
+                { "x": 16, "y": 0.1 },
+                { "x": 17, "y": 0.3 },                
+                { "x": 18, "y": 0.4 },
+                { "x": 19, "y": 0.3 },
+
+                { "x": 0, "y": 1.3 },                
+                { "x": 1, "y": 1.4 },
+                { "x": 2, "y": 1.3 },
+                { "x": 3, "y": 1.1 },                
+                { "x": 4, "y": 1 },
+                { "x": 5, "y": 1.1 },
+                { "x": 6, "y": 1.25 },
+
+                { "x": 8, "y": 1.25 },
+                { "x": 9, "y": 1.25 },
+                { "x": 10, "y": 1.25 },
+                { "x": 11, "y": 1.25 },
+
+                { "x": 13, "y": 1.25 },
+                { "x": 14, "y": 1.1 },
+                { "x": 15, "y": 1 },
+                { "x": 16, "y": 1.1 },
+                { "x": 17, "y": 1.3 },
+                { "x": 18, "y": 1.4 },
+                { "x": 19, "y": 1.3 },
+
+                { "x": 0, "y": 2.3 },
+                { "x": 1, "y": 2.4 },
+                { "x": 2, "y": 2.3 },
+                { "x": 3, "y": 2.1 },
+                { "x": 4, "y": 2 },
+                { "x": 5, "y": 2.1 },
+                { "x": 6, "y": 2.25 },
+
+                { "x": 8, "y": 2.25 },
+                { "x": 9, "y": 2.25 },
+                { "x": 10, "y": 2.25 },
+                { "x": 11, "y": 2.25 },
+
+                { "x": 13, "y": 2.25 },
+                { "x": 14, "y": 2.1 },
+                { "x": 15, "y": 2 },
+                { "x": 16, "y": 2.1 },
+                { "x": 17, "y": 2.3 },
+                { "x": 18, "y": 2.4 },
+                { "x": 19, "y": 2.3 },
+
+                { "x": 0, "y": 3.3 },
+                { "x": 1, "y": 3.4 },
+                { "x": 2, "y": 3.3 },
+                { "x": 3, "y": 3.1 },
+                { "x": 4, "y": 3 },
+                { "x": 5, "y": 3.1 },
+                { "x": 6, "y": 3.25 },
+
+                { "x": 8, "y": 3.25 },
+                { "x": 9, "y": 3.25 },
+                { "x": 10, "y": 3.25 },
+                { "x": 11, "y": 3.25 },	
+
+                { "x": 13, "y": 3.25 },
+                { "x": 14, "y": 3.1 },				
+                { "x": 15, "y": 3 },
+                { "x": 16, "y": 3.1 },
+                { "x": 17, "y": 3.3 },
+                { "x": 18, "y": 3.4 },
+                { "x": 19, "y": 3.3 },
+
+                { "x": 0, "y": 4.3 },
+                { "x": 1, "y": 4.4 },
+                { "x": 2, "y": 4.3 },
+                { "x": 3, "y": 4.1 },
+                { "x": 4, "y": 4 },
+                { "x": 5, "y": 4.1 },
+                { "x": 6.25, "y": 4.5, "w": 1.5 },
+
+                { "x": 8, "y": 4.25 },
+                { "x": 9, "y": 4.25 },
+                { "x": 10, "y": 4.25 },
+                { "x": 11, "y": 4.25 },
+				
+                { "x": 12.25, "y": 4.5, "w": 1.5 },
+                { "x": 14, "y": 4.1 },                
+                { "x": 15, "y": 4 },
+                { "x": 16, "y": 4.1 },
+                { "x": 17, "y": 4.3 },
+                { "x": 18, "y": 4.4 },
+                { "x": 19, "y": 4.3 }
+
+            ]
+        }
+    }
+}
diff --git a/keyboards/malevolti/superlyra/rev1/rev1.c b/keyboards/malevolti/superlyra/rev1/rev1.c
new file mode 100644
index 0000000000..35b44aed16
--- /dev/null
+++ b/keyboards/malevolti/superlyra/rev1/rev1.c
@@ -0,0 +1,17 @@
+ /* Copyright 2021 Domanic Calleja
+  * 
+  * 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 "rev1.h"
diff --git a/keyboards/malevolti/superlyra/rev1/rev1.h b/keyboards/malevolti/superlyra/rev1/rev1.h
new file mode 100644
index 0000000000..8bc17d1173
--- /dev/null
+++ b/keyboards/malevolti/superlyra/rev1/rev1.h
@@ -0,0 +1,34 @@
+/* Copyright 2021 Domanic Calleja
+  * 
+  * 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 "superlyra.h"
+
+
+#define LAYOUT( \
+    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,   \
+    K36, K37, K38, K39, K40, K41, K42,   K43, K44, K45, K46,   K47, K48, K49, K50, K51, K52, K53,   \
+    K54, K55, K56, K57, K58, K59, K60,   K61, K62, K63, K64,   K65, K66, K67, K68, K69, K70, K71,   \
+    K72, K73, K74, K75, K76, K77, K78,   K79, K80, K81, K82,   K83, K84, K85, K86, K87, K88, K89   \
+	) \
+	{ \
+        { 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 },   \
+        { K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53 },   \
+        { K54, K55, K56, K57, K58, K59, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K70, K71 },   \
+        { K72, K73, K74, K75, K76, K77, K78, K79, K80, K81, K82, K83, K84, K85, K86, K87, K88, K89 }   \
+	}
diff --git a/keyboards/malevolti/superlyra/rev1/rules.mk b/keyboards/malevolti/superlyra/rev1/rules.mk
new file mode 100644
index 0000000000..e3012714c8
--- /dev/null
+++ b/keyboards/malevolti/superlyra/rev1/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LTO_ENABLE = yes 
diff --git a/keyboards/malevolti/superlyra/superlyra.c b/keyboards/malevolti/superlyra/superlyra.c
new file mode 100644
index 0000000000..045ec9a097
--- /dev/null
+++ b/keyboards/malevolti/superlyra/superlyra.c
@@ -0,0 +1,17 @@
+ /* Copyright 2021 Domanic Calleja
+  * 
+  * 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 "superlyra.h"
+
diff --git a/keyboards/malevolti/superlyra/superlyra.h b/keyboards/malevolti/superlyra/superlyra.h
new file mode 100644
index 0000000000..b3c0f16daf
--- /dev/null
+++ b/keyboards/malevolti/superlyra/superlyra.h
@@ -0,0 +1,23 @@
+ /* Copyright 2021 Domanic Calleja
+  * 
+  * 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"
+
+
+#ifdef KEYBOARD_malevolti_superlyra_rev1
+    #include "rev1.h"
+#endif

From d4ae858e0aea3ee3e99badaaf489425b6b00d39e Mon Sep 17 00:00:00 2001
From: stanrc85 <47038504+stanrc85@users.noreply.github.com>
Date: Mon, 20 Dec 2021 14:31:46 -0500
Subject: [PATCH 022/867] [Keyboard] Add LAYOUT_alice support for Nasu (#15513)

---
 keyboards/nasu/nasu.h   | 14 ++++++++++++++
 keyboards/nasu/rules.mk |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/keyboards/nasu/nasu.h b/keyboards/nasu/nasu.h
index a2917fdb45..41bd1212f6 100644
--- a/keyboards/nasu/nasu.h
+++ b/keyboards/nasu/nasu.h
@@ -32,3 +32,17 @@
     { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
     { XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E }  \
 }
+
+#define LAYOUT_alice( \
+    K10, K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K20, K11, K12, K13, K14, K15, K16,      K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      \
+    K30, K21, K22, K23, K24, K25, K26,      K27, K28, K29, K2A, K2B, K2C,      K2E,      \
+         K31, K32, K33, K34, K35, K36,      K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      \
+         K41,      K43,      K45, K46,           K48,      K4A,                K4E       \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E }  \
+}
diff --git a/keyboards/nasu/rules.mk b/keyboards/nasu/rules.mk
index e8b7f22e0b..dac69f915b 100644
--- a/keyboards/nasu/rules.mk
+++ b/keyboards/nasu/rules.mk
@@ -25,4 +25,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-LAYOUTS = alice_split_bs
+LAYOUTS = alice alice_split_bs

From bcca5ec5fa13d42fe672da05af1bd0e2f209c319 Mon Sep 17 00:00:00 2001
From: Sergi Meseguer <zigotica@gmail.com>
Date: Tue, 21 Dec 2021 18:20:05 +0100
Subject: [PATCH 023/867] zigotica userspace rows tweak: TAB in default STENAI
 layer, ESC in sym/fn layers (#15525)

---
 users/zigotica/rows.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/users/zigotica/rows.h b/users/zigotica/rows.h
index e73d72bbe2..ef9487ace8 100644
--- a/users/zigotica/rows.h
+++ b/users/zigotica/rows.h
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *   |       |       |       |       | TD ]} |         |  TD ; |       |       |       |  TD : |
  *   `-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------.
  *                           |       |       |         |       |       |
- *                           |  ESC  |  SPC  |         |   E   | INTRO |
+ *                           |  TAB  |  SPC  |         |   E   | INTRO |
  *                           |  num  |  nav  |         |  sym  |   fn  |
  *                           `---------------'         `---------------'
  *
@@ -43,7 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define _STENAI_L1      KC_GRV,           KC_W,            KC_D,          KC_P,             KC_F
 #define _STENAI_L2      LALT_T(KC_H),     LCTL_T(KC_R),    LSFT_T(KC_S),  LGUI_T(KC_T),     KC_G
 #define _STENAI_L3      KC_B,             KC_X,            KC_C,          KC_V,             ZK_BRC
-#define _STENAI_LT      LT(_NUM, KC_ESC), LT(_NAV, KC_SPC)
+#define _STENAI_LT      LT(_NUM, KC_TAB), LT(_NAV, KC_SPC)
 
 #define _STENAI_R1      KC_K,             KC_Y,            KC_U,          KC_Q,             KC_QUOT
 #define _STENAI_R2      KC_M,             RGUI_T(KC_N),    RSFT_T(KC_A),  RCTL_T(KC_I),     RALT_T(KC_O)
@@ -147,14 +147,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *   |       |       |       |       |       |         |       |       |       |       |       |
 *   `-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------.
 *                           |       |       |         |:::::::|       |
-*                           |       |  TAB  |         |:::::::|       |
+*                           |       |  ESC  |         |:::::::|       |
 *                           |       |       |         |:::::::|       |
 *                           `---------------'         `---------------'
 */
 #define ____SYM_L1      KC_PERC, KC_AMPR, KC_QUES, KC_PIPE, KC_EXLM
 #define ____SYM_L2      KC_HASH, KC_AT,   KC_COLN, KC_SCLN, KC_DLR
 #define ____SYM_L3      ZK_PRN,  KC_TILD, KC_SLSH, KC_BSLS, KC_CIRC
-#define ____SYM_LT      _______, KC_TAB
+#define ____SYM_LT      _______, KC_ESC
 
 #define ____SYM_R1      _BLANK_ROW
 #define ____SYM_R2      _BLANK_ROW
@@ -178,14 +178,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *   |       |       |       |       |       |         |       |       |       |       |       |
 *   `-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------.
 *                           |       |       |         |       |:::::::|
-*                           |       |  TAB  |         |       |:::::::|
+*                           |       |  ESC  |         |       |:::::::|
 *                           |       |       |         |       |:::::::|
 *                           `---------------'         `---------------'
 */
 #define ____FN_L1       _BLANK_ROW
 #define ____FN_L2       _BLANK_ROW
 #define ____FN_L3       _BLANK_ROW
-#define ____FN_LT       _______, KC_TAB
+#define ____FN_LT       _______, KC_ESC
 
 #define ____FN_R1       _______,  KC_F7,  KC_F8,  KC_F9,  KC_F10
 #define ____FN_R2       _______,  KC_F1,  KC_F2,  KC_F3,  KC_F11

From 7b018f097db2d219908f74eb7a406ae5f7f93f46 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 22 Dec 2021 05:44:47 +1100
Subject: [PATCH 024/867] Use the PR title rather than parsing the commit
 message. (#15537)

---
 lib/python/qmk/cli/generate/develop_pr_list.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/python/qmk/cli/generate/develop_pr_list.py b/lib/python/qmk/cli/generate/develop_pr_list.py
index 07e46752a6..fab0262773 100755
--- a/lib/python/qmk/cli/generate/develop_pr_list.py
+++ b/lib/python/qmk/cli/generate/develop_pr_list.py
@@ -97,7 +97,7 @@ def generate_develop_pr_list(cli):
         match = git_expr.search(line)
         if match:
             pr_info = _get_pr_info(cache, gh, match.group("pr"))
-            commit_info = {'hash': match.group("hash"), 'title': match.group("title"), 'pr_num': int(match.group("pr")), 'pr_labels': [label.name for label in pr_info.labels.items]}
+            commit_info = {'hash': match.group("hash"), 'title': pr_info['title'], 'pr_num': int(match.group("pr")), 'pr_labels': [label.name for label in pr_info.labels.items]}
             _categorise_commit(commit_info)
 
     def _dump_commit_list(name, collection):

From 83b21deafc58acaa630606ec68698a25a2e6cf02 Mon Sep 17 00:00:00 2001
From: devilzmods <61511785+devilzmods@users.noreply.github.com>
Date: Tue, 21 Dec 2021 19:47:18 +0100
Subject: [PATCH 025/867] [Keyboard] Add 4x4 and 5x5 40percentclub boards +
 Unique VIDs (#15465)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/40percentclub/25/config.h           |   2 +-
 keyboards/40percentclub/4pack/config.h        |   2 +-
 keyboards/40percentclub/4x4/config.h          |   2 +-
 .../40percentclub/4x4/keymaps/via/keymap.c    | 105 ++++++++++++++++
 .../40percentclub/4x4/keymaps/via/rules.mk    |   1 +
 keyboards/40percentclub/5x5/config.h          |   2 +-
 .../40percentclub/5x5/keymaps/via/keymap.c    | 117 ++++++++++++++++++
 .../40percentclub/5x5/keymaps/via/rules.mk    |   1 +
 keyboards/40percentclub/6lit/config.h         |   2 +-
 keyboards/40percentclub/foobar/config.h       |   2 +-
 keyboards/40percentclub/gherkin/config.h      |   2 +-
 keyboards/40percentclub/half_n_half/config.h  |   2 +-
 keyboards/40percentclub/i75/config.h          |   2 +-
 keyboards/40percentclub/luddite/config.h      |   2 +-
 keyboards/40percentclub/mf68/config.h         |   2 +-
 keyboards/40percentclub/nano/config.h         |   2 +-
 keyboards/40percentclub/nein/config.h         |   2 +-
 keyboards/40percentclub/nori/config.h         |   2 +-
 keyboards/40percentclub/polyandry/config.h    |   4 +-
 keyboards/40percentclub/sixpack/config.h      |   2 +-
 keyboards/40percentclub/tomato/config.h       |   4 +-
 keyboards/40percentclub/ut47/config.h         |   4 +-
 22 files changed, 245 insertions(+), 21 deletions(-)
 create mode 100644 keyboards/40percentclub/4x4/keymaps/via/keymap.c
 create mode 100644 keyboards/40percentclub/4x4/keymaps/via/rules.mk
 create mode 100644 keyboards/40percentclub/5x5/keymaps/via/keymap.c
 create mode 100644 keyboards/40percentclub/5x5/keymaps/via/rules.mk

diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index af25449abc..8ff5264671 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -19,7 +19,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x4025
 #define PRODUCT_ID      0x0A0C
 #define DEVICE_VER      0x0F25
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/4pack/config.h b/keyboards/40percentclub/4pack/config.h
index db51715922..023df5fc4e 100644
--- a/keyboards/40percentclub/4pack/config.h
+++ b/keyboards/40percentclub/4pack/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
+#define VENDOR_ID 0x4025
 #define PRODUCT_ID 0x0000
 #define DEVICE_VER 0x0001
 #define MANUFACTURER 40percentclub
diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h
index 77b6e7c58b..439aa1b147 100644
--- a/keyboards/40percentclub/4x4/config.h
+++ b/keyboards/40percentclub/4x4/config.h
@@ -5,7 +5,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x4025 //"40 %", since 0x3430 is already registered.
 #define PRODUCT_ID      0x0A0C
 #define DEVICE_VER      0x4444
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/4x4/keymaps/via/keymap.c b/keyboards/40percentclub/4x4/keymaps/via/keymap.c
new file mode 100644
index 0000000000..3c39e98545
--- /dev/null
+++ b/keyboards/40percentclub/4x4/keymaps/via/keymap.c
@@ -0,0 +1,105 @@
+ /* Copyright 2021 Milan Düwel
+  *
+  * 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 custom_layers {
+    PAD,
+    _QW,
+    NUM,
+    DIR
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Single 4x4 board only
+ * .-----------------------------------.
+ * |   7    |   8    |   9    |   /    |
+ * |--------+--------+--------+--------|
+ * |   4    |   5    |   6    |   *    |
+ * |--------+--------+--------+--------|
+ * |   1    |   2    |   3    |   -    |
+ * |--------+--------+--------+--------|
+ * |   0    | QWERTY |   .    |   +    |
+ * '-----------------------------------'
+ */
+
+  [PAD] = LAYOUT_ortho_4x4(
+  KC_KP_7, KC_KP_8, KC_KP_9,   KC_PSLS,
+  KC_KP_4, KC_KP_5, KC_KP_6,   KC_PAST,
+  KC_KP_1, KC_KP_2, KC_KP_3,   KC_PMNS,
+  KC_KP_0, DF(_QW), KC_KP_DOT, KC_PPLS
+  ),
+
+/* QWERTY
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * | ESC    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | BACKSP |   7    |   8    |   9    |   /    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | TAB    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      |   4    |   5    |   6    |   *    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | SHIFT  | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | ENT/SFT|   1    |   2    |   3    |   -    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | LCTRL  | LGUI   | ALT    | ALT    | NUM    | SHIFT  | SPACE  | DIR    | RGUI   | RALT   | DEL    | CTRL   |   0    |   0    |   .    |   +    |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [_QW] = LAYOUT_ortho_4x16(
+  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_KP_7, KC_KP_8, KC_KP_9, KC_PSLS,
+  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_KP_4, KC_KP_5, KC_KP_6, KC_PAST,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_T(KC_ENT), KC_KP_1, KC_KP_2, KC_KP_3, KC_PMNS,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, MO(NUM), KC_LSFT, KC_SPC,  MO(DIR), KC_RGUI, KC_RALT, KC_DEL,  KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT, KC_PPLS
+  ),
+
+/* NUMBERS
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | NUMLOCK|   /    |   *    |   -    |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |    `   | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      |        |        |        |   +    |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        | F11    | F12    |        |        |        | ENTER  | SHIFT  | RGUI   | ./ALT  | BKSC   |        |        |        | ENTER  |        |
+ * |        |        |        |        |        |        |        |        |        |        |CTRLhold|		   |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        | ENTER  | SHIFT  |        |        |        |        |        |        |        |        |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [NUM] = LAYOUT_ortho_4x16(
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, _______,
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______, _______, _______, KC_PPLS, _______,
+  _______, KC_F11,  KC_F12,  _______, _______, _______, KC_ENT,  KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC), _______, _______, _______, KC_PENT, _______,
+  _______, _______, _______, _______, _______, _______, KC_ENT,  KC_RSFT, _______, _______, _______,  _______, _______, _______, _______, _______
+  ),
+
+/* DIRECTIONS
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * | RESET  | TAB    |   up   |        | INS    | CTRL   | SHIFT  | PgUp   | Home   |   -    |   =    |  DEL   |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | CAPSLK | left   |  down  | right  | PrScr  | SHIFT  | CTRL   | PgDn   | End    |   [    |   ]    |   \    |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        | P-Brk  |        |        |        |        |        |        | RGUI   | ALT    |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | KEYPAD |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [DIR] = LAYOUT_ortho_4x16(
+  RESET,   KC_TAB,  KC_UP,   _______, KC_INS,  KC_LCTL, KC_LSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL,  KC_DEL,  _______, _______, _______, _______,
+  KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_LCTL, KC_PGDN, KC_END,  KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______,
+  _______, KC_PAUS, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, _______, _______, _______, _______, _______, _______,
+  DF(PAD), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+};
diff --git a/keyboards/40percentclub/4x4/keymaps/via/rules.mk b/keyboards/40percentclub/4x4/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/40percentclub/4x4/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
index 694a589852..c9a83de737 100644
--- a/keyboards/40percentclub/5x5/config.h
+++ b/keyboards/40percentclub/5x5/config.h
@@ -5,7 +5,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x4025
 #define PRODUCT_ID      0x0A0C
 #define DEVICE_VER      0x05B5
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/5x5/keymaps/via/keymap.c b/keyboards/40percentclub/5x5/keymaps/via/keymap.c
new file mode 100644
index 0000000000..735fa6b145
--- /dev/null
+++ b/keyboards/40percentclub/5x5/keymaps/via/keymap.c
@@ -0,0 +1,117 @@
+ /* Copyright 2021 Milan Düwel
+  *
+  * 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 custom_layers {
+    PAD,
+    _QW,
+    NUM,
+    DIR
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Single 5x5 board only
+ * .--------------------------------------------.
+ * | QWERTY |   /    |   *    |   -    |        |
+ * |--------+--------+--------+--------+--------|
+ * |   7    |   8    |   9    |   +    |        |
+ * |--------+--------+--------+--------+--------|
+ * |   4    |   5    |   6    |   +    |        |
+ * |--------+--------+--------+--------+--------|
+ * |   1    |   2    |   3    | ENTER  |        |
+ * |--------+--------+--------+--------+--------|
+ * |   0    |   0    |   .    | ENTER  |        |
+ * '--------------------------------------------'
+ */
+
+  [PAD] = LAYOUT_ortho_5x5(
+  DF(_QW), KC_PSLS, KC_PAST,   KC_PMNS, _______,
+  KC_KP_7, KC_KP_8, KC_KP_9,   KC_PPLS, _______,
+  KC_KP_4, KC_KP_5, KC_KP_6,   KC_PPLS, _______,
+  KC_KP_1, KC_KP_2, KC_KP_3,   KC_PENT, _______,
+  KC_KP_0, KC_KP_0, KC_KP_DOT, KC_PENT, _______
+  ),
+
+/* QWERTY
+ * .--------------------------------------------------------------------------------------------------------------------------------------.
+ * |        | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | ESC    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | BACKSP |   7    |   8    |   9    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | TAB    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      |   4    |   5    |   6    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | SHIFT  | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | ENT/SFT|   1    |   2    |   3    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | LCTRL  | LGUI   | ALT    | ALT    | NUM    | SHIFT  | SPACE  | DIR    | RGUI   | RALT   | DEL    | CTRL   |   0    |   0    |   .    |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [_QW] = LAYOUT_ortho_5x15(
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______, _______, _______,
+  KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_KP_7, KC_KP_8, KC_KP_9,
+  KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_KP_4, KC_KP_5, KC_KP_6,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_T(KC_ENT), KC_KP_1, KC_KP_2, KC_KP_3,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_LALT, MO(NUM), KC_LSFT, KC_SPC,  MO(DIR), KC_RGUI, KC_RALT, KC_DEL,  KC_RCTL, KC_KP_0, KC_KP_0, KC_KP_DOT
+  ),
+
+/* NUMBERS
+ * .--------------------------------------------------------------------------------------------------------------------------------------.
+ * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | NUMLOCK|   /    |   *    |   -    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |    `   | 1      | 2      | 3      | 4      | 5      | 6      | 7      | 8      | 9      | 0      |        |        |        |   +    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        | F11    | F12    |        |        |        | ENTER  | SHIFT  | RGUI   | ./ALT  | BKSC   |        |        |        | ENTER  |
+ * |        |        |        |        |        |        |        |        |        |        |CTRLhold|		     |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        | ENTER  | SHIFT  |        |        |        |        |        |        |        |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [NUM] = LAYOUT_ortho_5x15(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     _______, _______, _______, KC_PPLS,
+  _______, KC_F11,  KC_F12,  _______, _______, _______, KC_ENT,  KC_RSFT, KC_RGUI, ALT_T(KC_DOT), CTL_T(KC_BSPC), _______, _______, _______, KC_PENT,
+  _______, _______, _______, _______, _______, _______, KC_ENT,  KC_RSFT, _______, _______, _______,  _______, _______, _______, _______
+  ),
+
+/* DIRECTIONS
+ * .--------------------------------------------------------------------------------------------------------------------------------------.
+ * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | RESET  | TAB    |   up   |        | INS    | CTRL   | SHIFT  | PgUp   | Home   |   -    |   =    |  DEL   |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | CAPSLK | left   |  down  | right  | PrScr  | SHIFT  | CTRL   | PgDn   | End    |   [    |   ]    |   \    |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        | P-Brk  |        |        |        |        |        |        | RGUI   | ALT    |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | KEYPAD |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [DIR] = LAYOUT_ortho_5x15(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  RESET,   KC_TAB,  KC_UP,   _______, KC_INS,  KC_LCTL, KC_LSFT, KC_PGUP, KC_HOME, KC_MINS, KC_EQL,  KC_DEL,  _______, _______, _______,
+  KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PSCR, KC_LSFT, KC_LCTL, KC_PGDN, KC_END,  KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______,
+  _______, KC_PAUS, _______, _______, _______, _______, _______, _______, KC_RGUI, KC_RALT, _______, _______, _______, _______, _______,
+  DF(PAD), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+};
diff --git a/keyboards/40percentclub/5x5/keymaps/via/rules.mk b/keyboards/40percentclub/5x5/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/40percentclub/5x5/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index ddf91a3ce5..f5c0ea3040 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -19,7 +19,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x4025
 #define PRODUCT_ID      0x0A0C
 #define DEVICE_VER      0x0F61
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index 999efef7f5..a65b6e51bf 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -19,7 +19,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x4025
 #define PRODUCT_ID      0x0A0C
 #define DEVICE_VER      0x0F00
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h
index 1307ca2e15..6373ea2e60 100644
--- a/keyboards/40percentclub/gherkin/config.h
+++ b/keyboards/40percentclub/gherkin/config.h
@@ -3,7 +3,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x4025 //"40 %", since 0x3430 is already registered.
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    40 Percent Club
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
index 3409af5f68..f79f83839c 100644
--- a/keyboards/40percentclub/half_n_half/config.h
+++ b/keyboards/40percentclub/half_n_half/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x4025
 #define PRODUCT_ID      0x0A0C
 #define DEVICE_VER      0x4A1F
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/i75/config.h b/keyboards/40percentclub/i75/config.h
index e89f4f5806..bacf9eb30f 100644
--- a/keyboards/40percentclub/i75/config.h
+++ b/keyboards/40percentclub/i75/config.h
@@ -19,7 +19,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x4025
 #define PRODUCT_ID      0x0A0C
 #define DEVICE_VER      0x0175
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
index 90d84c56e1..3f15523c89 100644
--- a/keyboards/40percentclub/luddite/config.h
+++ b/keyboards/40percentclub/luddite/config.h
@@ -3,7 +3,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x3430 // "40"
+#define VENDOR_ID       0x4025 // "40%", changed since 0x3430 is already officially registered
 #define PRODUCT_ID      0x4C55 // "LU"
 #define DEVICE_VER      0x1001
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
index 2307256154..7ebe5ae1b3 100644
--- a/keyboards/40percentclub/mf68/config.h
+++ b/keyboards/40percentclub/mf68/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x3430 // "40"
+#define VENDOR_ID       0x4025 // "40%", changed since 0x3430 is already officially registered
 #define PRODUCT_ID      0x4D68 // "M68"
 #define DEVICE_VER      0x0101
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/nano/config.h b/keyboards/40percentclub/nano/config.h
index aa4a64d07d..c6d66a1bb3 100644
--- a/keyboards/40percentclub/nano/config.h
+++ b/keyboards/40percentclub/nano/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xCEEB
+#define VENDOR_ID       0x4025 //"40 %", to make it consistent with other 40percent.club boards.
 #define PRODUCT_ID      0x0007
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/nein/config.h b/keyboards/40percentclub/nein/config.h
index 1dedb608f9..87c62673f9 100644
--- a/keyboards/40percentclub/nein/config.h
+++ b/keyboards/40percentclub/nein/config.h
@@ -19,7 +19,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x3430 // "40"
+#define VENDOR_ID       0x4025 // "40%", changed since 0x3430 is already officially registered
 #define PRODUCT_ID      0x9999
 #define DEVICE_VER      0x9999
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index 40225748ac..882da633e0 100644
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/config.h
@@ -19,7 +19,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x4025
 #define PRODUCT_ID      0x0A0C
 #define DEVICE_VER      0x0444
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/polyandry/config.h b/keyboards/40percentclub/polyandry/config.h
index 4d64e2d209..6f04d12297 100644
--- a/keyboards/40percentclub/polyandry/config.h
+++ b/keyboards/40percentclub/polyandry/config.h
@@ -19,7 +19,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x4025
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    di0ib
@@ -28,7 +28,7 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-//more detailed config options start below: 
+//more detailed config options start below:
 
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
diff --git a/keyboards/40percentclub/sixpack/config.h b/keyboards/40percentclub/sixpack/config.h
index 2ec676018c..edb123c4b9 100644
--- a/keyboards/40percentclub/sixpack/config.h
+++ b/keyboards/40percentclub/sixpack/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x3430 // "40"
+#define VENDOR_ID       0x4025 //"40 %", since 0x3430 is already registered.
 #define PRODUCT_ID      0x5350 // "SP"
 #define DEVICE_VER      0x1001
 #define MANUFACTURER    di0ib
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index a083223a1f..8f06341aad 100644
--- a/keyboards/40percentclub/tomato/config.h
+++ b/keyboards/40percentclub/tomato/config.h
@@ -3,8 +3,8 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
+#define VENDOR_ID       0x4025
+#define PRODUCT_ID      0x546F //"To", was duplicate with polyandry
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    40 Percent Club
 #define PRODUCT         Tomato
diff --git a/keyboards/40percentclub/ut47/config.h b/keyboards/40percentclub/ut47/config.h
index 9622f58bb3..7ead58e096 100644
--- a/keyboards/40percentclub/ut47/config.h
+++ b/keyboards/40percentclub/ut47/config.h
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
+#define VENDOR_ID       0x4025
+#define PRODUCT_ID      0x7574 //"ut"
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    40percent.club
 #define PRODUCT         ut47

From 77d3e564f723c12f2ffb501553b1e78bbe0ea84a Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 22 Dec 2021 16:51:39 +1100
Subject: [PATCH 026/867] Migrate RN42 to UART driver and refactor (#15492)

---
 common_features.mk            |   3 +-
 drivers/bluetooth/rn42.c      | 101 ++++++++++++++++++++++++++++++++++
 drivers/bluetooth/rn42.h      |  25 +++++++++
 tmk_core/protocol/lufa/lufa.c |  77 +++-----------------------
 4 files changed, 135 insertions(+), 71 deletions(-)
 create mode 100644 drivers/bluetooth/rn42.c
 create mode 100644 drivers/bluetooth/rn42.h

diff --git a/common_features.mk b/common_features.mk
index fed005ff5a..5cde023d10 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -720,6 +720,7 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), RN42)
         OPT_DEFS += -DMODULE_RN42
-        SRC += $(TMK_DIR)/protocol/serial_uart.c
+        SRC += $(DRIVER_PATH)/bluetooth/rn42.c
+        QUANTUM_LIB_SRC += uart.c
     endif
 endif
diff --git a/drivers/bluetooth/rn42.c b/drivers/bluetooth/rn42.c
new file mode 100644
index 0000000000..ee4c8c330e
--- /dev/null
+++ b/drivers/bluetooth/rn42.c
@@ -0,0 +1,101 @@
+/* Copyright 2021
+ *
+ * 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 "report.h"
+#include "uart.h"
+
+#ifndef RN42_BAUD_RATE
+#    define RN42_BAUD_RATE 115200
+#endif
+
+// https://cdn.sparkfun.com/datasheets/Wireless/Bluetooth/bluetooth_cr_UG-v1.0r.pdf#G7.663734
+static inline uint16_t rn42_consumer_usage_to_bitmap(uint16_t usage) {
+    switch (usage) {
+        case AC_HOME:
+            return 0x0001;
+        case AL_EMAIL:
+            return 0x0002;
+        case AC_SEARCH:
+            return 0x0004;
+        case AL_KEYBOARD_LAYOUT:
+            return 0x0008;
+        case AUDIO_VOL_UP:
+            return 0x0010;
+        case AUDIO_VOL_DOWN:
+            return 0x0020;
+        case AUDIO_MUTE:
+            return 0x0040;
+        case TRANSPORT_PLAY_PAUSE:
+            return 0x0080;
+        case TRANSPORT_NEXT_TRACK:
+            return 0x0100;
+        case TRANSPORT_PREV_TRACK:
+            return 0x0200;
+        case TRANSPORT_STOP:
+            return 0x0400;
+        case TRANSPORT_EJECT:
+            return 0x0800;
+        case TRANSPORT_FAST_FORWARD:
+            return 0x1000;
+        case TRANSPORT_REWIND:
+            return 0x2000;
+        case TRANSPORT_STOP_EJECT:
+            return 0x4000;
+        case AL_LOCAL_BROWSER:
+            return 0x8000;
+        default:
+            return 0;
+    }
+}
+
+void rn42_init(void) {
+    uart_init(RN42_BAUD_RATE);
+}
+
+void rn42_send_keyboard(report_keyboard_t *report) {
+    uart_write(0xFD);
+    uart_write(0x09);
+    uart_write(0x01);
+    uart_write(report->mods);
+    uart_write(0x00);
+    for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
+        uart_write(report->keys[i]);
+    }
+}
+
+void rn42_send_mouse(report_mouse_t *report) {
+    uart_write(0xFD);
+    uart_write(0x00);
+    uart_write(0x03);
+    uart_write(report->buttons);
+    uart_write(report->x);
+    uart_write(report->y);
+    uart_write(report->v);  // should try sending the wheel v here
+    uart_write(report->h);  // should try sending the wheel h here
+    uart_write(0x00);
+}
+
+void rn42_send_consumer(uint16_t data) {
+    static uint16_t last_data = 0;
+    if (data == last_data) return;
+    last_data       = data;
+    uint16_t bitmap = rn42_consumer_usage_to_bitmap(data);
+    uart_write(0xFD);
+    uart_write(0x03);
+    uart_write(0x03);
+    uart_write(bitmap & 0xFF);
+    uart_write((bitmap >> 8) & 0xFF);
+}
diff --git a/drivers/bluetooth/rn42.h b/drivers/bluetooth/rn42.h
new file mode 100644
index 0000000000..4747759111
--- /dev/null
+++ b/drivers/bluetooth/rn42.h
@@ -0,0 +1,25 @@
+/* Copyright 2021
+ *
+ * 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 "report.h"
+
+void rn42_init(void);
+
+void rn42_send_keyboard(report_keyboard_t *report);
+
+void rn42_send_mouse(report_mouse_t *report);
+
+void rn42_send_consumer(uint16_t data);
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index e3be96d93d..b9c2616058 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -69,8 +69,8 @@ extern keymap_config_t keymap_config;
 #    include "outputselect.h"
 #    ifdef MODULE_ADAFRUIT_BLE
 #        include "adafruit_ble.h"
-#    else
-#        include "../serial.h"
+#    elif MODULE_RN42
+#        include "rn42.h"
 #    endif
 #endif
 
@@ -90,46 +90,6 @@ extern keymap_config_t keymap_config;
 #    include "joystick.h"
 #endif
 
-// https://cdn.sparkfun.com/datasheets/Wireless/Bluetooth/bluetooth_cr_UG-v1.0r.pdf#G7.663734
-static inline uint16_t CONSUMER2RN42(uint16_t usage) {
-    switch (usage) {
-        case AC_HOME:
-            return 0x0001;
-        case AL_EMAIL:
-            return 0x0002;
-        case AC_SEARCH:
-            return 0x0004;
-        case AL_KEYBOARD_LAYOUT:
-            return 0x0008;
-        case AUDIO_VOL_UP:
-            return 0x0010;
-        case AUDIO_VOL_DOWN:
-            return 0x0020;
-        case AUDIO_MUTE:
-            return 0x0040;
-        case TRANSPORT_PLAY_PAUSE:
-            return 0x0080;
-        case TRANSPORT_NEXT_TRACK:
-            return 0x0100;
-        case TRANSPORT_PREV_TRACK:
-            return 0x0200;
-        case TRANSPORT_STOP:
-            return 0x0400;
-        case TRANSPORT_EJECT:
-            return 0x0800;
-        case TRANSPORT_FAST_FORWARD:
-            return 0x1000;
-        case TRANSPORT_REWIND:
-            return 0x2000;
-        case TRANSPORT_STOP_EJECT:
-            return 0x4000;
-        case AL_LOCAL_BROWSER:
-            return 0x8000;
-        default:
-            return 0;
-    }
-}
-
 uint8_t keyboard_idle = 0;
 /* 0: Boot Protocol, 1: Report Protocol(default) */
 uint8_t        keyboard_protocol  = 1;
@@ -688,14 +648,7 @@ static void send_keyboard(report_keyboard_t *report) {
 #    ifdef MODULE_ADAFRUIT_BLE
         adafruit_ble_send_keys(report->mods, report->keys, sizeof(report->keys));
 #    elif MODULE_RN42
-        serial_send(0xFD);
-        serial_send(0x09);
-        serial_send(0x01);
-        serial_send(report->mods);
-        serial_send(report->reserved);
-        for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
-            serial_send(report->keys[i]);
-        }
+        rn42_send_keyboard(report);
 #    endif
         return;
     }
@@ -741,16 +694,8 @@ static void send_mouse(report_mouse_t *report) {
 #        ifdef MODULE_ADAFRUIT_BLE
         // FIXME: mouse buttons
         adafruit_ble_send_mouse_move(report->x, report->y, report->v, report->h, report->buttons);
-#        else
-        serial_send(0xFD);
-        serial_send(0x00);
-        serial_send(0x03);
-        serial_send(report->buttons);
-        serial_send(report->x);
-        serial_send(report->y);
-        serial_send(report->v);  // should try sending the wheel v here
-        serial_send(report->h);  // should try sending the wheel h here
-        serial_send(0x00);
+#        elif MODULE_RN42
+        rn42_send_mouse(report);
 #        endif
         return;
     }
@@ -821,15 +766,7 @@ static void send_consumer(uint16_t data) {
 #        ifdef MODULE_ADAFRUIT_BLE
         adafruit_ble_send_consumer_key(data);
 #        elif MODULE_RN42
-        static uint16_t last_data = 0;
-        if (data == last_data) return;
-        last_data       = data;
-        uint16_t bitmap = CONSUMER2RN42(data);
-        serial_send(0xFD);
-        serial_send(0x03);
-        serial_send(0x03);
-        serial_send(bitmap & 0xFF);
-        serial_send((bitmap >> 8) & 0xFF);
+        rn42_send_consumer(data);
 #        endif
         return;
     }
@@ -1077,7 +1014,7 @@ void protocol_pre_init(void) {
     sei();
 
 #if defined(MODULE_RN42)
-    serial_init();
+    rn42_init();
 #endif
 
     /* wait for USB startup & debug output */

From f5995901b04d74ad1078dc1c3e6f54e5911a1c0a Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Tue, 21 Dec 2021 22:09:50 -0800
Subject: [PATCH 027/867] [CI] Format code according to conventions (#15541)

---
 drivers/bluetooth/rn42.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/bluetooth/rn42.c b/drivers/bluetooth/rn42.c
index ee4c8c330e..2ef40bb7e0 100644
--- a/drivers/bluetooth/rn42.c
+++ b/drivers/bluetooth/rn42.c
@@ -61,9 +61,7 @@ static inline uint16_t rn42_consumer_usage_to_bitmap(uint16_t usage) {
     }
 }
 
-void rn42_init(void) {
-    uart_init(RN42_BAUD_RATE);
-}
+void rn42_init(void) { uart_init(RN42_BAUD_RATE); }
 
 void rn42_send_keyboard(report_keyboard_t *report) {
     uart_write(0xFD);

From b8cd899dfb740083d712778221b9f28b38a3461e Mon Sep 17 00:00:00 2001
From: Wyatt Neal <wyattearp@users.noreply.github.com>
Date: Wed, 22 Dec 2021 02:36:48 -0500
Subject: [PATCH 028/867] [Keyboard] support for Stack Overflow The Key from
 Drop - adapted from @frap129 (#15520)

* support for Stack Overflow The Key from Drop - adapted from @frap129

* addressing code review comments

there's still some issues related to LEDs so i think for now the best
course of action is to remove those items until we can get better
details on the assembly of the board.

* removing this on the correct branch

* cleaning up more code review comments, moving to simpler/common formats for maps

* it is a C not a G fool

* well, looks like you can do it this way too for booting/dfu

* fixing missing newline for gcc to be quiet

* removing busted links

* formatting to match current template

* Update keyboards/massdrop/thekey/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Andy Piper <andypiper@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/massdrop/thekey/config.h            | 49 +++++++++++++++++++
 keyboards/massdrop/thekey/info.json           | 14 ++++++
 .../thekey/keymaps/default-macos/keymap.c     | 23 +++++++++
 .../massdrop/thekey/keymaps/default/keymap.c  | 23 +++++++++
 .../keymaps/url-copy-paste-macos/keymap.c     | 39 +++++++++++++++
 .../thekey/keymaps/url-copy-paste/keymap.c    | 40 +++++++++++++++
 keyboards/massdrop/thekey/readme.md           | 38 ++++++++++++++
 keyboards/massdrop/thekey/rules.mk            | 18 +++++++
 keyboards/massdrop/thekey/thekey.c            | 17 +++++++
 keyboards/massdrop/thekey/thekey.h            | 27 ++++++++++
 10 files changed, 288 insertions(+)
 create mode 100644 keyboards/massdrop/thekey/config.h
 create mode 100644 keyboards/massdrop/thekey/info.json
 create mode 100644 keyboards/massdrop/thekey/keymaps/default-macos/keymap.c
 create mode 100644 keyboards/massdrop/thekey/keymaps/default/keymap.c
 create mode 100644 keyboards/massdrop/thekey/keymaps/url-copy-paste-macos/keymap.c
 create mode 100644 keyboards/massdrop/thekey/keymaps/url-copy-paste/keymap.c
 create mode 100644 keyboards/massdrop/thekey/readme.md
 create mode 100644 keyboards/massdrop/thekey/rules.mk
 create mode 100644 keyboards/massdrop/thekey/thekey.c
 create mode 100644 keyboards/massdrop/thekey/thekey.h

diff --git a/keyboards/massdrop/thekey/config.h b/keyboards/massdrop/thekey/config.h
new file mode 100644
index 0000000000..a195628203
--- /dev/null
+++ b/keyboards/massdrop/thekey/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2021 Joe Maples <joe@maples.dev>
+ *
+ * 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    Drop
+#define PRODUCT         The Key
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 3
+
+/*
+ * Keyboard Matrix Assignments
+ */
+#define MATRIX_ROW_PINS { D4 }
+#define MATRIX_COL_PINS { D2, D1, D0 }
+
+#define DIODE_DIRECTION ROW2COL
+
+#define BACKLIGHT_PIN B6
+#define BACKLIGHT_LEVELS 3
+
+#define RGB_DI_PIN B1
+#define RGBLED_NUM 2
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
diff --git a/keyboards/massdrop/thekey/info.json b/keyboards/massdrop/thekey/info.json
new file mode 100644
index 0000000000..ac4c17e8c8
--- /dev/null
+++ b/keyboards/massdrop/thekey/info.json
@@ -0,0 +1,14 @@
+{
+    "keyboard_name": "The Key",
+    "url": "https://drop.com/buy/stack-overflow-the-key-macropad",
+    "maintainer": "massdrop",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "K00 (D4,D2)", "x": 0, "y": 0 },
+                { "label": "K01 (D4,D1)", "x": 1, "y": 0 },
+                { "label": "K02 (D4,D0)", "x": 2, "y": 0 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/massdrop/thekey/keymaps/default-macos/keymap.c b/keyboards/massdrop/thekey/keymaps/default-macos/keymap.c
new file mode 100644
index 0000000000..7e389e304e
--- /dev/null
+++ b/keyboards/massdrop/thekey/keymaps/default-macos/keymap.c
@@ -0,0 +1,23 @@
+/* Copyright 2021 Joe Maples <joe@maples.dev>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(KC_LGUI, KC_C, KC_V),
+
+};
diff --git a/keyboards/massdrop/thekey/keymaps/default/keymap.c b/keyboards/massdrop/thekey/keymaps/default/keymap.c
new file mode 100644
index 0000000000..047def84b6
--- /dev/null
+++ b/keyboards/massdrop/thekey/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+/* Copyright 2021 Joe Maples <joe@maples.dev>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(KC_LCTL, KC_C, KC_V),
+
+};
diff --git a/keyboards/massdrop/thekey/keymaps/url-copy-paste-macos/keymap.c b/keyboards/massdrop/thekey/keymaps/url-copy-paste-macos/keymap.c
new file mode 100644
index 0000000000..16c73ba6ae
--- /dev/null
+++ b/keyboards/massdrop/thekey/keymaps/url-copy-paste-macos/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2021 Joe Maples <joe@maples.dev>
+ *
+ * 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 custom_keycodes {
+    TK_URL = SAFE_RANGE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(TK_URL, C(KC_C), C(KC_V)),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TK_URL:
+            if (record->event.pressed) {
+                // when keycode TK_URL is pressed
+                SEND_STRING("https://stackoverflow.com/\n");
+            }
+            break;
+        default:
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/massdrop/thekey/keymaps/url-copy-paste/keymap.c b/keyboards/massdrop/thekey/keymaps/url-copy-paste/keymap.c
new file mode 100644
index 0000000000..18778d1946
--- /dev/null
+++ b/keyboards/massdrop/thekey/keymaps/url-copy-paste/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 Joe Maples <joe@maples.dev>
+ *
+ * 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 custom_keycodes {
+    TK_URL = SAFE_RANGE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(TK_URL, C(KC_C), C(KC_V)),
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TK_URL:
+            if (record->event.pressed) {
+                // when keycode TK_URL is pressed
+                SEND_STRING("https://stackoverflow.com/");
+            }
+            break;
+        default:
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/massdrop/thekey/readme.md b/keyboards/massdrop/thekey/readme.md
new file mode 100644
index 0000000000..74eab45f5e
--- /dev/null
+++ b/keyboards/massdrop/thekey/readme.md
@@ -0,0 +1,38 @@
+# The Key
+
+![The Key](https://i.imgur.com/hL5cRj9.jpg)
+
+
+The Stack Overflow "The Key" is a 3 button macropad based on atmega32u4 with Kailh Black Box switches.
+
+> Some say a programmer’s best solution is a simple two-step process: copy and paste. On April 1st, 2021, Stack Overflow proved it. On that fateful day, each time users went to copy a piece of code, they were met with a pop-up for a fake product. It was called The Key: an ultra-compact macropad advertised as the new (and only) way to copy and paste on the platform. As it turns out, roughly one fourth of Stack Overflow’s 15 million users tries to copy and paste within five minutes of visiting the site. An even greater number saw the joke and loved it, with many demanding that The Key be developed in earnest. So, naturally, we teamed up with Stack Overflow to make it happen. What started as an April Fool’s gag is now a full-fledged macropad—designed by our very own community member Cassidy, with a portion of proceeds benefiting digitalundivided.
+
+Keyboard Maintainer: [Drop / Massdrop](https://github.com/Massdrop/qmk_firmware) 
+
+Hardware Supported: Massdrop, Inc. **The Key**
+
+Hardware Availability: Limited Release - https://drop.com/buy/stack-overflow-the-key-macropad
+
+
+Make example for this keyboard (after setting up your build environment):
+```bash
+# default provided by Drop / Stack Overflow
+make massdrop/thekey:default
+# common modification where C = CTRL+C, V = CTRL+V
+make massdrop/thekey:url-copy-paste
+```
+
+Flashing example for this keyboard:
+```bash
+# install in dfu mode
+make massdrop/thekey:default:dfu
+```
+
+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).
+Make example for this keyboard (after setting up your build environment):
+
+## Bootloader
+
+Enter the bootloader as follows:
+* **Bootmagic reset**: Hold down the "Stack Overflow" key, the "left-most" or furthest from the USB plug while inserting the USB cable for a few seconds. The LEDs will **NOT** turn on.
+* **Physical reset button**: Briefly press and hold the reset button while pluggin in the USB port. The LEDs on the back will **NOT** turn on. Depending on your case revision, you may have to remove the 4 screws on the back plate to access the switch OR you can use the associated access hole on newer releases.
diff --git a/keyboards/massdrop/thekey/rules.mk b/keyboards/massdrop/thekey/rules.mk
new file mode 100644
index 0000000000..5b0dcd2db4
--- /dev/null
+++ b/keyboards/massdrop/thekey/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/massdrop/thekey/thekey.c b/keyboards/massdrop/thekey/thekey.c
new file mode 100644
index 0000000000..b32c302cd0
--- /dev/null
+++ b/keyboards/massdrop/thekey/thekey.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Joe Maples <joe@maples.dev>
+ *
+ * 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 "thekey.h"
diff --git a/keyboards/massdrop/thekey/thekey.h b/keyboards/massdrop/thekey/thekey.h
new file mode 100644
index 0000000000..f889c973c7
--- /dev/null
+++ b/keyboards/massdrop/thekey/thekey.h
@@ -0,0 +1,27 @@
+/* Copyright 2021 Joe Maples <joe@maples.dev>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    K00, K01, K02  \
+) { \
+    { K00, K01, K02 }, \
+}

From e95156d4d83ac849b1ee9b9220e9a27620bd88bc Mon Sep 17 00:00:00 2001
From: SmollChungus <38044391+SmollChungus@users.noreply.github.com>
Date: Wed, 22 Dec 2021 13:47:01 +0100
Subject: [PATCH 029/867] Documentation Typo fix (#15538)

---
 docs/feature_haptic_feedback.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/feature_haptic_feedback.md b/docs/feature_haptic_feedback.md
index c8c74cb8f0..bbdf7e122c 100644
--- a/docs/feature_haptic_feedback.md
+++ b/docs/feature_haptic_feedback.md
@@ -167,7 +167,7 @@ List of waveform sequences from the datasheet:
 ```
 #define DRV_GREETING *sequence name or number*
 ```
-If haptic feedback is enabled, the keyboard will vibrate to a specific sqeuence during startup. That can be selected using the following define:
+If haptic feedback is enabled, the keyboard will vibrate to a specific sequence during startup. That can be selected using the following define:
 
 ```
 #define DRV_MODE_DEFAULT *sequence name or number*
@@ -207,4 +207,4 @@ With the entry of `#define NO_HAPTIC_LOCKKEYS` in config.h, none of the followin
 With the entry of `#define NO_HAPTIC_NAV` in config.h, none of the following keys will trigger a feedback: Print Screen, Pause, Insert, Delete, Page Down, Page Up, Left Arrow, Up Arrow, Right Arrow, Down Arrow, End, Home.
 
 ### NO_HAPTIC_NUMERIC
-With the entry of `#define NO_HAPTIC_NUMERIC` in config.h, none of the following keys between 0 and 9 (KC_1 ... KC_0) will trigger a feedback.
\ No newline at end of file
+With the entry of `#define NO_HAPTIC_NUMERIC` in config.h, none of the following keys between 0 and 9 (KC_1 ... KC_0) will trigger a feedback.

From 3f1f60cbf9a980a8347e3899c04ac4b3e49b7285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Lorblanch=C3=A8s?= <Zlika@users.noreply.github.com>
Date: Wed, 22 Dec 2021 15:27:25 +0100
Subject: [PATCH 030/867] doc/faq_debug: qmk cli can also be used to print
 debug messages (#15528)

---
 docs/faq_debug.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/faq_debug.md b/docs/faq_debug.md
index 28b8c81759..fba27c5f68 100644
--- a/docs/faq_debug.md
+++ b/docs/faq_debug.md
@@ -18,15 +18,19 @@ void keyboard_post_init_user(void) {
 
 ## Debugging Tools
 
-There are two different tools you can use to debug your keyboard.
+Various tools are available to debug your keyboard.
 
 ### Debugging With QMK Toolbox
 
 For compatible platforms, [QMK Toolbox](https://github.com/qmk/qmk_toolbox) can be used to display debug messages from your keyboard.
 
+### Debugging with QMK CLI
+
+Prefer a terminal based solution? The [QMK CLI console command](cli_commands.md#qmk-console) can be used to display debug messages from your keyboard.
+
 ### Debugging With hid_listen
 
-Prefer a terminal based solution? [hid_listen](https://www.pjrc.com/teensy/hid_listen.html), provided by PJRC, can also be used to display debug messages. Prebuilt binaries for Windows,Linux,and MacOS are available.
+Something stand-alone? [hid_listen](https://www.pjrc.com/teensy/hid_listen.html), provided by PJRC, can also be used to display debug messages. Prebuilt binaries for Windows,Linux,and MacOS are available.
 
 ## Sending Your Own Debug Messages :id=debug-api
 

From 021eda3790832e928d9a6908cf6b4c8e678201b6 Mon Sep 17 00:00:00 2001
From: ExtReMLapin <3909752+ExtReMLapin@users.noreply.github.com>
Date: Wed, 22 Dec 2021 18:08:18 +0100
Subject: [PATCH 031/867] [Keymap][CRKBD/SOUNDMONSTER] Fixed compilation
 (forgot return) (#15554)

---
 keyboards/crkbd/keymaps/soundmonster/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/crkbd/keymaps/soundmonster/keymap.c b/keyboards/crkbd/keymaps/soundmonster/keymap.c
index 98afe3685f..c9e2c8bc44 100644
--- a/keyboards/crkbd/keymaps/soundmonster/keymap.c
+++ b/keyboards/crkbd/keymaps/soundmonster/keymap.c
@@ -303,7 +303,7 @@ void suspend_power_down_user() {
 bool oled_task_user(void) {
     if (timer_elapsed32(oled_timer) > 30000) {
         oled_off();
-        return;
+        return false;
     }
 #ifndef SPLIT_KEYBOARD
     else { oled_on(); }

From e9d1a711b457e5f7a9af6f2feb37e4be8e84e96d Mon Sep 17 00:00:00 2001
From: -pacer- <34766434+chent7@users.noreply.github.com>
Date: Thu, 23 Dec 2021 01:45:34 +0800
Subject: [PATCH 032/867] [Keyboard] Fixed caps lock led pin for
 crazy_keyboard_68 (#15539)

---
 keyboards/crazy_keyboard_68/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h
index e1304e18ed..53759a716a 100644
--- a/keyboards/crazy_keyboard_68/config.h
+++ b/keyboards/crazy_keyboard_68/config.h
@@ -52,7 +52,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 //#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
 
-#define LED_CAPS_LOCK_PIN B2
+#define LED_CAPS_LOCK_PIN B0
 #define LED_PIN_ON_STATE 0
 
 //#define BACKLIGHT_PIN B7

From e804e28e8e54d6821737fc32f31b7f2735a5994d Mon Sep 17 00:00:00 2001
From: Koobaczech <67293963+Koobaczech@users.noreply.github.com>
Date: Thu, 23 Dec 2021 16:43:10 -0500
Subject: [PATCH 033/867] [Keyboard] Add Pearlboards boards to directory
 (#15005)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/pearlboards/atlas/atlas.c           |  31 ++++++
 keyboards/pearlboards/atlas/atlas.h           |  38 +++++++
 keyboards/pearlboards/atlas/config.h          | 100 +++++++++++++++++
 .../atlas/keymaps/default/keymap.c            |  34 ++++++
 .../pearlboards/atlas/keymaps/via/keymap.c    |  48 ++++++++
 .../pearlboards/atlas/keymaps/via/rules.mk    |   1 +
 keyboards/pearlboards/atlas/readme.md         |  22 ++++
 keyboards/pearlboards/atlas/rules.mk          |  23 ++++
 keyboards/pearlboards/pandora/config.h        |  20 +++-
 .../pandora/keymaps/default/keymap.c          |  49 ++-------
 .../pearlboards/pandora/keymaps/via/keymap.c  |  73 ++++--------
 keyboards/pearlboards/pandora/pandora.c       |  25 +++++
 keyboards/pearlboards/pandora/rules.mk        |   2 +-
 keyboards/pearlboards/pearl/config.h          |  94 ++++++++++++++++
 .../pearl/keymaps/default/keymap.c            |  32 ++++++
 .../pearlboards/pearl/keymaps/via/keymap.c    |  45 ++++++++
 .../pearlboards/pearl/keymaps/via/rules.mk    |   1 +
 keyboards/pearlboards/pearl/pearl.c           |  17 +++
 keyboards/pearlboards/pearl/pearl.h           |  36 ++++++
 keyboards/pearlboards/pearl/readme.md         |  22 ++++
 keyboards/pearlboards/pearl/rules.mk          |  22 ++++
 keyboards/pearlboards/zeus/config.h           | 104 ++++++++++++++++++
 .../pearlboards/zeus/keymaps/default/keymap.c |  36 ++++++
 .../pearlboards/zeus/keymaps/via/keymap.c     |  52 +++++++++
 .../pearlboards/zeus/keymaps/via/rules.mk     |   1 +
 keyboards/pearlboards/zeus/readme.md          |  22 ++++
 keyboards/pearlboards/zeus/rules.mk           |  23 ++++
 keyboards/pearlboards/zeus/zeus.c             |  30 +++++
 keyboards/pearlboards/zeus/zeus.h             |  40 +++++++
 keyboards/pearlboards/zeuspad/config.h        |  90 +++++++++++++++
 .../zeuspad/keymaps/default/keymap.c          |  36 ++++++
 .../pearlboards/zeuspad/keymaps/via/keymap.c  |  52 +++++++++
 .../pearlboards/zeuspad/keymaps/via/rules.mk  |   1 +
 keyboards/pearlboards/zeuspad/readme.md       |  22 ++++
 keyboards/pearlboards/zeuspad/rules.mk        |  23 ++++
 keyboards/pearlboards/zeuspad/zeuspad.c       |  67 +++++++++++
 keyboards/pearlboards/zeuspad/zeuspad.h       |  40 +++++++
 37 files changed, 1281 insertions(+), 93 deletions(-)
 create mode 100644 keyboards/pearlboards/atlas/atlas.c
 create mode 100644 keyboards/pearlboards/atlas/atlas.h
 create mode 100644 keyboards/pearlboards/atlas/config.h
 create mode 100644 keyboards/pearlboards/atlas/keymaps/default/keymap.c
 create mode 100644 keyboards/pearlboards/atlas/keymaps/via/keymap.c
 create mode 100644 keyboards/pearlboards/atlas/keymaps/via/rules.mk
 create mode 100644 keyboards/pearlboards/atlas/readme.md
 create mode 100644 keyboards/pearlboards/atlas/rules.mk
 create mode 100644 keyboards/pearlboards/pearl/config.h
 create mode 100644 keyboards/pearlboards/pearl/keymaps/default/keymap.c
 create mode 100644 keyboards/pearlboards/pearl/keymaps/via/keymap.c
 create mode 100644 keyboards/pearlboards/pearl/keymaps/via/rules.mk
 create mode 100644 keyboards/pearlboards/pearl/pearl.c
 create mode 100644 keyboards/pearlboards/pearl/pearl.h
 create mode 100644 keyboards/pearlboards/pearl/readme.md
 create mode 100644 keyboards/pearlboards/pearl/rules.mk
 create mode 100644 keyboards/pearlboards/zeus/config.h
 create mode 100644 keyboards/pearlboards/zeus/keymaps/default/keymap.c
 create mode 100644 keyboards/pearlboards/zeus/keymaps/via/keymap.c
 create mode 100644 keyboards/pearlboards/zeus/keymaps/via/rules.mk
 create mode 100644 keyboards/pearlboards/zeus/readme.md
 create mode 100644 keyboards/pearlboards/zeus/rules.mk
 create mode 100644 keyboards/pearlboards/zeus/zeus.c
 create mode 100644 keyboards/pearlboards/zeus/zeus.h
 create mode 100644 keyboards/pearlboards/zeuspad/config.h
 create mode 100644 keyboards/pearlboards/zeuspad/keymaps/default/keymap.c
 create mode 100644 keyboards/pearlboards/zeuspad/keymaps/via/keymap.c
 create mode 100644 keyboards/pearlboards/zeuspad/keymaps/via/rules.mk
 create mode 100644 keyboards/pearlboards/zeuspad/readme.md
 create mode 100644 keyboards/pearlboards/zeuspad/rules.mk
 create mode 100644 keyboards/pearlboards/zeuspad/zeuspad.c
 create mode 100644 keyboards/pearlboards/zeuspad/zeuspad.h

diff --git a/keyboards/pearlboards/atlas/atlas.c b/keyboards/pearlboards/atlas/atlas.c
new file mode 100644
index 0000000000..ff8577bde1
--- /dev/null
+++ b/keyboards/pearlboards/atlas/atlas.c
@@ -0,0 +1,31 @@
+/* Copyright 2020 Koobaczech
+ *
+ * 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 "atlas.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/pearlboards/atlas/atlas.h b/keyboards/pearlboards/atlas/atlas.h
new file mode 100644
index 0000000000..93ecc82f7c
--- /dev/null
+++ b/keyboards/pearlboards/atlas/atlas.h
@@ -0,0 +1,38 @@
+/* Copyright 2021 Koobaczech
+ *
+ * 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/>.
+ */
+
+/*
+ * This layout covers all of the possible build layouts. Also, any
+ * built layouts will work without having to change anything.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1f, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2f, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3f, \
+    k40, k41, k42,                     k47,                k4b, k4c, k4d,      k4f  \
+) { \
+    { k00,  k01,  k02,  k03,    k04,    k05,    k06,    k07,  k08,    k09,    k0a,    k0b,  k0c,  k0d,  k0e,    k0f},  \
+    { k10,  k11,  k12,  k13,    k14,    k15,    k16,    k17,  k18,    k19,    k1a,    k1b,  k1c,  k1d,  KC_NO,  k1f},  \
+    { k20,  k21,  k22,  k23,    k24,    k25,    k26,    k27,  k28,    k29,    k2a,    k2b,  k2c,  k2d,  KC_NO,  k2f},  \
+    { k30,  k31,  k32,  k33,    k34,    k35,    k36,    k37,  k38,    k39,    k3a,    k3b,  k3c,  k3d,  KC_NO,  k3f},  \
+    { k40,  k41,  k42,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  k47,  KC_NO,  KC_NO,  KC_NO,  k4b,  k4c,  k4d,  KC_NO,  k4f }  \
+}
diff --git a/keyboards/pearlboards/atlas/config.h b/keyboards/pearlboards/atlas/config.h
new file mode 100644
index 0000000000..e35c7d0a90
--- /dev/null
+++ b/keyboards/pearlboards/atlas/config.h
@@ -0,0 +1,100 @@
+/*
+Copyright 2021 Koobaczech
+
+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 0x6963
+#define PRODUCT_ID 0x6964
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Koobaczech
+#define PRODUCT Atlas
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * 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 { D6, E1, C0, C4, E3 }
+#define MATRIX_COL_PINS { D5, D4, C1, C2, C3, C5, C7, A7, A6, A5, A4, A3, A2, A1, A0, F7 }
+#define UNUSED_PINS { E4, E5, E6, E7, F0, F1, F2, F3, B0, B4, B5, B7 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Encoder Function */
+#define ENCODERS_PAD_A { E0 }
+#define ENCODERS_PAD_B { D7 }
+//#define ENCODER_DIRECTION_FLIP
+#define ENCODER_RESOLUTION 1
+
+/* Audio Function */
+#define AUDIO_CLICKY
+#define AUDIO_PIN C6
+
+/* Haptic feedback */
+#define FB_ERM_LRA 0
+#define FB_BRAKEFACTOR 3 // For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7
+#define FB_LOOPGAIN 3 // For  Low:0, Medium:1, High:2, Very High:3
+/* Motor settings */
+#define RATED_VOLTAGE 3
+#define V_PEAK 5
+
+/*== all animations enabled ==*/
+/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
+#define RGB_DI_PIN B6
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 8
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_SLEEP
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Indicator Led's*/
+#define LED_CAPS_LOCK_PIN F4
+#define LED_NUM_LOCK_PIN F5
+#define LED_SCROLL_LOCK_PIN F6
+#define LED_PIN_ON_STATE 0
+/* 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
diff --git a/keyboards/pearlboards/atlas/keymaps/default/keymap.c b/keyboards/pearlboards/atlas/keymaps/default/keymap.c
new file mode 100644
index 0000000000..eac060cb7c
--- /dev/null
+++ b/keyboards/pearlboards/atlas/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2021 Koobaczech
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	LAYOUT_all(
+		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_DEL,   KC_BSPC,  KC_COPY,
+		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_PSTE,
+		KC_CAPS,  KC_A,     KC_S,      KC_D,  KC_F,  KC_G,  KC_H,  KC_J,    KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT ,            KC_FIND,
+		KC_LSFT,  KC_NUBS,  KC_Z,      KC_X,  KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP  ,            MO(1),
+		KC_LCTL,  KC_LALT,  KC_MEDIA_PLAY_PAUSE,                   KC_SPC,                             KC_RALT,  KC_LEFT,  KC_DOWN,            KC_RIGHT),
+
+	LAYOUT_all(
+		RESET,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
+		KC_TRNS,  HPT_FBK,  HPT_TOG,  HPT_ON,   CK_ON,    CK_TOGG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS)
+};
diff --git a/keyboards/pearlboards/atlas/keymaps/via/keymap.c b/keyboards/pearlboards/atlas/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1d1b5ccffc
--- /dev/null
+++ b/keyboards/pearlboards/atlas/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2021 Koobaczech
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_all(
+		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_DEL,   KC_BSPC,  KC_BSPC,
+		KC_TAB,   KC_Q,     KC_W,      KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,    KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_DEL,
+		KC_CAPS,  KC_A,     KC_S,      KC_D,  KC_F,  KC_G,  KC_H,  KC_J,    KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT ,            KC_MEDIA_PLAY_PAUSE,
+		KC_LSFT,  KC_NUBS,  KC_Z,      KC_X,  KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP  ,            MO(1),
+		KC_LCTL,  KC_LALT,  KC_MEDIA_PLAY_PAUSE,                   KC_SPC,                             KC_RALT,  KC_LEFT,  KC_DOWN,            KC_RIGHT),
+
+	[1] = LAYOUT_all(
+		RESET,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
+		KC_TRNS,  HPT_FBK,  HPT_TOG,  HPT_ON,   CK_ON,    CK_TOGG,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS),
+
+	[2] = LAYOUT_all(
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS),
+
+	[3] = LAYOUT_all(
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS)
+};
diff --git a/keyboards/pearlboards/atlas/keymaps/via/rules.mk b/keyboards/pearlboards/atlas/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/pearlboards/atlas/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/pearlboards/atlas/readme.md b/keyboards/pearlboards/atlas/readme.md
new file mode 100644
index 0000000000..ac02df971b
--- /dev/null
+++ b/keyboards/pearlboards/atlas/readme.md
@@ -0,0 +1,22 @@
+# Atlas
+
+![Atlas](https://i.imgur.com/jm6DyWAh.jpg)
+
+Atlas is a timeless Greek themed 65 percent keyboard. The construction uses 6061 alu, pvd coated brass/stainless steel and dyed polycarbonate. The finishes include e-coating, anodizing, micro arc anodization, metal polish and fine beadblasting. Layouts are limited to a few ANSI variations such as tsangan/wkl and ISO. The keyboard also has a usb-c daugtherboard, an integrated dual usb hub with an audio jack and dac, and a rotary encoder. The case has indicator lights and is gasket mounted. The pcb is designed by me in house and has some super cool tricks up its sleeve as well.
+
+* Keyboard Maintainer: Koobaczech
+* Hardware Supported: Koobaczech
+* Availability: https://pearlboards.net/products/atlas65
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pearlboards/atlas: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB labeled "RESET"
+* **Keycode in layout**: Press the key mapped to `RESET` in conjunction with the key mapped to `MO(1))` 
diff --git a/keyboards/pearlboards/atlas/rules.mk b/keyboards/pearlboards/atlas/rules.mk
new file mode 100644
index 0000000000..b75d687546
--- /dev/null
+++ b/keyboards/pearlboards/atlas/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = at90usb1286
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = yes          # Audio output
+ENCODER_ENABLE = yes
+HAPTIC_ENABLE = yes
+HAPTIC_DRIVER = DRV2605L
+
+LTO_ENABLE = yes
diff --git a/keyboards/pearlboards/pandora/config.h b/keyboards/pearlboards/pandora/config.h
index 2df4bcffc8..5a9a997be5 100644
--- a/keyboards/pearlboards/pandora/config.h
+++ b/keyboards/pearlboards/pandora/config.h
@@ -58,12 +58,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
 #define RGB_DI_PIN B1
 #ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
-#    define RGBLED_NUM 12
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 12
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_SLEEP
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/pearlboards/pandora/keymaps/default/keymap.c b/keyboards/pearlboards/pandora/keymaps/default/keymap.c
index 879ea04a1e..a0feb7ea32 100644
--- a/keyboards/pearlboards/pandora/keymaps/default/keymap.c
+++ b/keyboards/pearlboards/pandora/keymaps/default/keymap.c
@@ -43,42 +43,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
-        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_DEL,    KC_BSPC,
-        KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,   KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
-        KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,  KC_J,   KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,  KC_N,   KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
-        KC_LCTL,  KC_LGUI,  KC_LALT,                              KC_SPC,                  KC_RALT,  KC_RGUI,  KC_APP,   KC_RCTL),
+  [0] = LAYOUT_all(
+    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_DEL,    KC_BSPC,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,    KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,  KC_J,    KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
+    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
+    KC_LCTL,  KC_LGUI,  KC_LALT,                              KC_SPC,                   KC_RALT,  KC_RGUI,  KC_APP,   KC_RCTL),
 
-    [1] = LAYOUT_all(
-        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_TRNS,  KC_DEL,
-        KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  RESET,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_INS,   KC_HOME,  KC_PGUP,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  KC_TRNS,  KC_DEL,   KC_END,   KC_PGDN,  KC_UP,    KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                                          RGBWINGS,                     KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT)
+  [1] = LAYOUT_all(
+    RESET,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,     KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_DEL,
+    KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,   RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,                                          RGBWINGS,                      KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT)
 };
-
-// Encoder rotate function
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    /* First encoder */
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_AUDIO_VOL_UP);
-        } else {
-            tap_code(KC_AUDIO_VOL_DOWN);
-        }
-    }
-    return true;
-}
-// Encoder click function
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-    /* First encoder */
-    case 0:
-        if (active) {
-            tap_code(KC_MEDIA_PLAY_PAUSE);
-        }
-        break;
-    }
-    return true;
-}
diff --git a/keyboards/pearlboards/pandora/keymaps/via/keymap.c b/keyboards/pearlboards/pandora/keymaps/via/keymap.c
index 55bbff9676..aad4ddf290 100644
--- a/keyboards/pearlboards/pandora/keymaps/via/keymap.c
+++ b/keyboards/pearlboards/pandora/keymaps/via/keymap.c
@@ -43,56 +43,31 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
-        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_DEL,    KC_BSPC,
-        KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,   KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
-        KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,  KC_J,   KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,  KC_N,   KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
-        KC_LCTL,  KC_LGUI,  KC_LALT,                              KC_SPC,                  KC_RALT,  KC_RGUI,  KC_APP,   KC_RCTL),
+  [0] = LAYOUT_all(
+    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_DEL,    KC_BSPC,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,   KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,  KC_J,   KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
+    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,  KC_N,   KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
+    KC_LCTL,  KC_LGUI,  KC_LALT,                              KC_SPC,                  KC_RALT,  KC_RGUI,  KC_APP,   KC_RCTL),
 
-    [1] = LAYOUT_all(
-        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_TRNS,  KC_DEL,
-        KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  RESET,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_INS,   KC_HOME,  KC_PGUP,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  KC_TRNS,  KC_DEL,   KC_END,   KC_PGDN,  KC_UP,    KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                                          RGBWINGS,                     KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT),
+  [1] = LAYOUT_all(
+    RESET,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,     KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  KC_DEL,
+    KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,   RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,                                          RGBWINGS,                      KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT),
 
-    [2] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+  [2] = LAYOUT_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 
-    [3] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+  [3] = LAYOUT_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
 };
-
-// Encoder rotate function
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    /* First encoder */
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_AUDIO_VOL_UP);
-        } else {
-            tap_code(KC_AUDIO_VOL_DOWN);
-        }
-    }
-    return true;
-}
-// Encoder click function
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-    /* First encoder */
-    case 0:
-        if (active) {
-            tap_code(KC_MEDIA_PLAY_PAUSE);
-        }
-        break;
-    }
-    return true;
-}
diff --git a/keyboards/pearlboards/pandora/pandora.c b/keyboards/pearlboards/pandora/pandora.c
index 78368e9687..5ce5d22b06 100644
--- a/keyboards/pearlboards/pandora/pandora.c
+++ b/keyboards/pearlboards/pandora/pandora.c
@@ -15,3 +15,28 @@
  */
 
 #include "pandora.h"
+
+// Encoder rotate function
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    /* First encoder */
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_AUDIO_VOL_UP);
+        } else {
+            tap_code(KC_AUDIO_VOL_DOWN);
+        }
+    }
+    return true;
+}
+// Encoder click function
+bool dip_switch_update_user(uint8_t index, bool active) {
+    switch (index) {
+    /* First encoder */
+    case 0:
+        if (active) {
+            tap_code(KC_MEDIA_PLAY_PAUSE);
+        }
+        break;
+    }
+    return true;
+}
diff --git a/keyboards/pearlboards/pandora/rules.mk b/keyboards/pearlboards/pandora/rules.mk
index 1fc37ebbd8..04aacf572b 100644
--- a/keyboards/pearlboards/pandora/rules.mk
+++ b/keyboards/pearlboards/pandora/rules.mk
@@ -18,5 +18,5 @@ RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 ENCODER_ENABLE = yes
-OLED_ENABLE = no      # Future release
+
 LTO_ENABLE = yes
diff --git a/keyboards/pearlboards/pearl/config.h b/keyboards/pearlboards/pearl/config.h
new file mode 100644
index 0000000000..002c2a5f5f
--- /dev/null
+++ b/keyboards/pearlboards/pearl/config.h
@@ -0,0 +1,94 @@
+/*
+Copyright 2021 Koobaczech
+
+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 0x6963
+#define PRODUCT_ID 0x6965
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Koobaczech
+#define PRODUCT Pearl
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+/*
+ * 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 { D3, F7, F0, E6 }
+#define MATRIX_COL_PINS { D2, F1, F4, F5, F6, C7, B6, B5, B4, D7, D6, D4, D5 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Audio Function */
+#define AUDIO_CLICKY
+#define AUDIO_PIN C6
+
+/* Haptic feedback */
+#define FB_ERM_LRA 0
+#define FB_BRAKEFACTOR 3 // For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7
+#define FB_LOOPGAIN 1 // For  Low:0, Medium:1, High:2, Very High:3
+/* Motor settings */
+#define RATED_VOLTAGE 3
+#define V_PEAK 5
+
+/*== all animations enabled ==*/
+/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
+#define RGB_DI_PIN B3
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLED_NUM 10
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_SLEEP
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 4
+
+/* Indicator Led's*/
+#define LED_CAPS_LOCK_PIN B0
+#define LED_NUM_LOCK_PIN B1
+#define LED_SCROLL_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+/* 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
diff --git a/keyboards/pearlboards/pearl/keymaps/default/keymap.c b/keyboards/pearlboards/pearl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..05af40adae
--- /dev/null
+++ b/keyboards/pearlboards/pearl/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/*
+Copyright 2021 Koobaczech
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	LAYOUT_all(
+		KC_GESC,  KC_Q,     KC_W,     KC_E,    KC_R,     KC_T,    KC_Y,   KC_U,  KC_I,     KC_O,    KC_P,     KC_MINS,  KC_BSPC,
+		KC_TAB,   KC_A,     KC_S,     KC_D,    KC_F,     KC_G,    KC_H,   KC_J,  KC_K,     KC_L,    KC_SCLN,  KC_ENT,
+		KC_CAPS,  KC_Z,     KC_X,     KC_C,    KC_V,     KC_B,    KC_N,   KC_M,  KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,
+		KC_LCTL,  KC_LALT,  KC_LGUI,  KC_SPC,  KC_BSPC,  KC_APP,  MO(1)),
+
+	LAYOUT_all(
+		RESET,    KC_1,     KC_2,     KC_3,      KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_EQL,   KC_DEL,
+		KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_BSLS,
+		KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  HPT_FBK,  HPT_TOG,  HPT_ON,   CK_ON,    CK_TOGG,
+		RGB_MOD,  RGB_HUI,  KC_TRNS,  RGB_TOG,   KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
diff --git a/keyboards/pearlboards/pearl/keymaps/via/keymap.c b/keyboards/pearlboards/pearl/keymaps/via/keymap.c
new file mode 100644
index 0000000000..29e8fe1e89
--- /dev/null
+++ b/keyboards/pearlboards/pearl/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+/*
+Copyright 2021 Koobaczech
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_GESC,  KC_Q,     KC_W,     KC_E,    KC_R,     KC_T,    KC_Y,   KC_U,  KC_I,     KC_O,    KC_P,     KC_MINS,  KC_BSPC,
+		KC_TAB,   KC_A,     KC_S,     KC_D,    KC_F,     KC_G,    KC_H,   KC_J,  KC_K,     KC_L,    KC_SCLN,  KC_ENT,
+		KC_CAPS,  KC_Z,     KC_X,     KC_C,    KC_V,     KC_B,    KC_N,   KC_M,  KC_COMM,  KC_DOT,  KC_SLSH,  KC_RSFT,
+		KC_LCTL,  KC_LALT,  KC_LGUI,  KC_SPC,  KC_BSPC,  KC_APP,  MO(1)),
+
+	[1] = LAYOUT_all(
+		RESET,    KC_1,     KC_2,     KC_3,      KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_EQL,   KC_DEL,
+		KC_TRNS,  KC_TRNS,  KC_UP,    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_BSLS,
+		KC_TRNS,  KC_LEFT,  KC_DOWN,  KC_RIGHT,  KC_TRNS,  KC_TRNS,  KC_TRNS,  HPT_FBK,  HPT_TOG,  HPT_ON,   CK_ON,    CK_TOGG,
+		RGB_MOD,  RGB_HUI,  KC_TRNS,  RGB_TOG,   KC_TRNS,  KC_TRNS,  KC_TRNS),
+
+	[2] = LAYOUT_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+
+	[3] = LAYOUT_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
diff --git a/keyboards/pearlboards/pearl/keymaps/via/rules.mk b/keyboards/pearlboards/pearl/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/pearlboards/pearl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/pearlboards/pearl/pearl.c b/keyboards/pearlboards/pearl/pearl.c
new file mode 100644
index 0000000000..f1ccf3fd9a
--- /dev/null
+++ b/keyboards/pearlboards/pearl/pearl.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Koobaczech
+ *
+ * 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 "pearl.h"
diff --git a/keyboards/pearlboards/pearl/pearl.h b/keyboards/pearlboards/pearl/pearl.h
new file mode 100644
index 0000000000..d0a2fcb93f
--- /dev/null
+++ b/keyboards/pearlboards/pearl/pearl.h
@@ -0,0 +1,36 @@
+/* Copyright 2021 Koobaczech
+ *
+ * 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/>.
+ */
+
+/*
+ * This layout covers all of the possible build layouts. Also, any
+ * built layouts will work without having to change anything.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
+  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+  k30, k31, k32, k33, k34, k35, k36 \
+){ \
+  { k00,  k01,  k02,  k03,  k04,  k05,  k06,  k07,    k08,    k09,    k0a,    k0b,    k0c},    \
+  { k10,  k11,  k12,  k13,  k14,  k15,  k16,  k17,    k18,    k19,    k1a,    k1b,    KC_NO},  \
+  { k20,  k21,  k22,  k23,  k24,  k25,  k26,  k27,    k28,    k29,    k2a,    k2b,    KC_NO},  \
+  { k30,  k31,  k32,  k33,  k34,  k35,  k36,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO}   \
+}
diff --git a/keyboards/pearlboards/pearl/readme.md b/keyboards/pearlboards/pearl/readme.md
new file mode 100644
index 0000000000..7679b270b3
--- /dev/null
+++ b/keyboards/pearlboards/pearl/readme.md
@@ -0,0 +1,22 @@
+# Pearl
+
+![Pearl](https://i.imgur.com/xdEtT7uh.jpg)
+
+Pearl is a future-proof premium 40%. This is the second round of it, reworked for 2021. This firmware is for the latest QMK PCB's.
+
+* Keyboard Maintainer: Koobaczech
+* Hardware Supported: Pearl
+* Availability: https://pearlboards.net/products/pearl-40
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pearlboards/pearl: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the front left of the PCB labeled "RESET"
+* **Keycode in layout**: Press the key mapped to `RESET` in conjunction with the key mapped to `MO(1))` 
diff --git a/keyboards/pearlboards/pearl/rules.mk b/keyboards/pearlboards/pearl/rules.mk
new file mode 100644
index 0000000000..3d9fec280e
--- /dev/null
+++ b/keyboards/pearlboards/pearl/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = yes          # Audio output
+HAPTIC_ENABLE = yes
+HAPTIC_DRIVER = DRV2605L
+
+LTO_ENABLE = yes
diff --git a/keyboards/pearlboards/zeus/config.h b/keyboards/pearlboards/zeus/config.h
new file mode 100644
index 0000000000..7de94efcc2
--- /dev/null
+++ b/keyboards/pearlboards/zeus/config.h
@@ -0,0 +1,104 @@
+/*
+Copyright 2021 Koobaczech
+
+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 0x6963
+#define PRODUCT_ID 0x6966
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Koobaczech
+#define PRODUCT Zeus
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 18
+
+/*
+ * 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 { F0, C1, E1, E0, D7, D6 }
+#define MATRIX_COL_PINS { F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, A6, A7, C7, C2, C0 }
+#define UNUSED_PINS { E3, E4, E5, B0, B4, B5, B6, B7, D4 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Encoder Function */
+#define ENCODERS_PAD_A { E7 }
+#define ENCODERS_PAD_B { E6 }
+//#define ENCODER_DIRECTION_FLIP
+#define ENCODER_RESOLUTION 1
+
+/* Audio Function */
+#define AUDIO_CLICKY
+#define AUDIO_PIN C6
+#ifdef AUDIO_ENABLE
+#define AUDIO_ENABLE_TONE_MULTIPLEXING
+#define AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT 10
+#endif
+
+/* Haptic feedback */
+#define FB_ERM_LRA 0
+#define FB_BRAKEFACTOR 1 // For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7
+#define FB_LOOPGAIN 3 // For  Low:0, Medium:1, High:2, Very High:3
+/* Motor settings */
+#define RATED_VOLTAGE 2
+#define V_PEAK 5
+
+/*== all animations enabled ==*/
+/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
+#define RGB_DI_PIN D5
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 2
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_SLEEP
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Indicator Led's*/
+#define LED_CAPS_LOCK_PIN C5
+#define LED_NUM_LOCK_PIN C4
+#define LED_SCROLL_LOCK_PIN C3
+#define LED_PIN_ON_STATE 0
+/* 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
diff --git a/keyboards/pearlboards/zeus/keymaps/default/keymap.c b/keyboards/pearlboards/zeus/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2b9d56e9ca
--- /dev/null
+++ b/keyboards/pearlboards/zeus/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 Koobaczech
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	LAYOUT_all(
+		KC_GESC,  KC_F1,    KC_F2,    KC_F3,  KC_F4,  KC_F5,  KC_F6,   KC_F7,  KC_F8,  KC_F9,     KC_F10,   KC_F11,   KC_F12,
+    KC_GRV,   KC_1,     KC_2,     KC_3,   KC_4,   KC_5,   KC_6,    KC_7,   KC_8,   KC_9,      KC_0,     KC_MINS,  KC_EQL,   KC_DEL,   KC_BSPC,  KC_INS,               KC_HOME,  KC_PGUP,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,   KC_R,   KC_T,   KC_Y,    KC_U,   KC_I,   KC_O,      KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_DEL,               KC_END,   KC_PGDN,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,   KC_F,   KC_G,   KC_H,    KC_J,   KC_K,   KC_L,      KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
+    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,   KC_C,   KC_V,   KC_B,    KC_N,   KC_M,   KC_COMM,   KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),              KC_MEDIA_PLAY_PAUSE,  KC_UP,
+    KC_LCTL,  KC_LGUI,  KC_LALT,                          KC_SPC,                  KC_RALT,   KC_RGUI,  MO(1),    KC_RCTL,                      KC_LEFT,              KC_DOWN,  KC_RGHT),
+
+	LAYOUT_all(
+		RESET,    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,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  HPT_TOG,  HPT_FBK,  HPT_MODI, HPT_RST,  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,  CK_ON,    CK_TOGG,  MU_TOG,   MU_MOD,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
diff --git a/keyboards/pearlboards/zeus/keymaps/via/keymap.c b/keyboards/pearlboards/zeus/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6cb23a6fb3
--- /dev/null
+++ b/keyboards/pearlboards/zeus/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+/*
+Copyright 2021 Koobaczech
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_all(
+		KC_GESC,  KC_F1,    KC_F2,    KC_F3,  KC_F4,  KC_F5,  KC_F6,   KC_F7,  KC_F8,  KC_F9,     KC_F10,   KC_F11,   KC_F12,
+		KC_GRV,   KC_1,     KC_2,     KC_3,   KC_4,   KC_5,   KC_6,    KC_7,   KC_8,   KC_9,      KC_0,     KC_MINS,  KC_EQL,   KC_DEL,   KC_BSPC,  KC_INS,               KC_HOME,  KC_PGUP,
+		KC_TAB,   KC_Q,     KC_W,     KC_E,   KC_R,   KC_T,   KC_Y,    KC_U,   KC_I,   KC_O,      KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_DEL,               KC_END,   KC_PGDN,
+		KC_CAPS,  KC_A,     KC_S,     KC_D,   KC_F,   KC_G,   KC_H,    KC_J,   KC_K,   KC_L,      KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
+		KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,   KC_C,   KC_V,   KC_B,    KC_N,   KC_M,   KC_COMM,   KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),              KC_MEDIA_PLAY_PAUSE,  KC_UP,
+		KC_LCTL,  KC_LGUI,  KC_LALT,                          KC_SPC,                  KC_RALT,   KC_RGUI,  MO(1),    KC_RCTL,                      KC_LEFT,              KC_DOWN,  KC_RGHT),
+
+	[1] = LAYOUT_all(
+		RESET,    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,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  HPT_TOG,  HPT_FBK,  HPT_MODI, HPT_RST,  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,  CK_ON,    CK_TOGG,  MU_TOG,   MU_MOD,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS),
+
+	[2] = LAYOUT_all(
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS),
+
+	[3] = LAYOUT_all(
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+		KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
diff --git a/keyboards/pearlboards/zeus/keymaps/via/rules.mk b/keyboards/pearlboards/zeus/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/pearlboards/zeus/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/pearlboards/zeus/readme.md b/keyboards/pearlboards/zeus/readme.md
new file mode 100644
index 0000000000..9d85549d3b
--- /dev/null
+++ b/keyboards/pearlboards/zeus/readme.md
@@ -0,0 +1,22 @@
+# Zeus
+
+![Zeus](https://i.imgur.com/jdCaP1mh.jpg)
+
+Zeus is a modern Greek themed TKL keyboard. The construction uses 6061 alu, pvd coated brass/stainless steel and dyed polycarbonate. The finishes include e-coating, anodizing, micro arc anodization, metal polish and fine beadblasting. The keyboard has a usb-c daugtherboard, an integrated dual usb hub with an audio jack and dac, an internal speaker and a rotary encoder. The case has indicator lights and is top mounted. The pcb is designed by me in house and has some super cool tricks up its sleeve as well.
+
+* Keyboard Maintainer: Koobaczech
+* Hardware Supported: Koobaczech
+* Availability: https://pearlboards.net/products/zeus-tkl?variant=39646626250884
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pearlboards/zeus: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB labeled "RESET"
+* **Keycode in layout**: Press the key mapped to `RESET` in conjunction with the key mapped to `MO(1))` 
diff --git a/keyboards/pearlboards/zeus/rules.mk b/keyboards/pearlboards/zeus/rules.mk
new file mode 100644
index 0000000000..b75d687546
--- /dev/null
+++ b/keyboards/pearlboards/zeus/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = at90usb1286
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = yes          # Audio output
+ENCODER_ENABLE = yes
+HAPTIC_ENABLE = yes
+HAPTIC_DRIVER = DRV2605L
+
+LTO_ENABLE = yes
diff --git a/keyboards/pearlboards/zeus/zeus.c b/keyboards/pearlboards/zeus/zeus.c
new file mode 100644
index 0000000000..42b77b2831
--- /dev/null
+++ b/keyboards/pearlboards/zeus/zeus.c
@@ -0,0 +1,30 @@
+/* Copyright 2021 Koobaczech
+ *
+ * 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 "zeus.h"
+
+// Encoder rotate function
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    /* First encoder */
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_AUDIO_VOL_UP);
+        } else {
+            tap_code(KC_AUDIO_VOL_DOWN);
+        }
+    }
+    return true;
+}
diff --git a/keyboards/pearlboards/zeus/zeus.h b/keyboards/pearlboards/zeus/zeus.h
new file mode 100644
index 0000000000..f8b24e401c
--- /dev/null
+++ b/keyboards/pearlboards/zeus/zeus.h
@@ -0,0 +1,40 @@
+/* Copyright 2021 Koobaczech
+ *
+ * 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/>.
+ */
+
+/*
+ * This layout covers all of the possible build layouts. Also, any
+ * built layouts will work without having to change anything.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,                          \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2f, k2g, k2h, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,      k4f, k4g,      \
+    k50, k51, k52,                k56,           k59, k5a, k5b, k5c,           k5f, k5g, k5h  \
+) { \
+    { k00,  k01,  k02,  k03,    k04,    k05,    k06,  k07,    k08,    k09,  k0a,  k0b,  k0c,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO},  \
+    { k10,  k11,  k12,  k13,    k14,    k15,    k16,  k17,    k18,    k19,  k1a,  k1b,  k1c,  k1d,    k1e,    k1f,    k1g,    k1h  },  \
+    { k20,  k21,  k22,  k23,    k24,    k25,    k26,  k27,    k28,    k29,  k2a,  k2b,  k2c,  k2d,    KC_NO,  k2f,    k2g,    k2h  },  \
+    { k30,  k31,  k32,  k33,    k34,    k35,    k36,  k37,    k38,    k39,  k3a,  k3b,  k3c,  k3d,    KC_NO,  KC_NO,  KC_NO,  KC_NO},  \
+    { k40,  k41,  k42,  k43,    k44,    k45,    k46,  k47,    k48,    k49,  k4a,  k4b,  k4c,  k4d,    KC_NO,  k4f,    k4g,    KC_NO},  \
+    { k50,  k51,  k52,  KC_NO,  KC_NO,  KC_NO,  k56,  KC_NO,  KC_NO,  k59,  k5a,  k5b,  k5c,  KC_NO,  KC_NO,  k5f,    k5g,    k5h  }   \
+}
diff --git a/keyboards/pearlboards/zeuspad/config.h b/keyboards/pearlboards/zeuspad/config.h
new file mode 100644
index 0000000000..3c12bfae18
--- /dev/null
+++ b/keyboards/pearlboards/zeuspad/config.h
@@ -0,0 +1,90 @@
+/*
+Copyright 2021 Koobaczech
+
+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 0x6963
+#define PRODUCT_ID 0x6967
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Koobaczech
+#define PRODUCT Zeuspad
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 4
+
+/*
+ * 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 { D2, D3, D5, F7, F4, F1 }
+#define MATRIX_COL_PINS { B0, F0, F5, F6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* OLED Settings */
+#define OLED_TIMEOUT 120000
+#define OLED_FADE_OUT
+/* Audio Function */
+#define AUDIO_CLICKY
+#define AUDIO_PIN C6
+
+/* Encoder Function */
+#define ENCODERS_PAD_A { D6 }
+#define ENCODERS_PAD_B { D4 }
+//#define ENCODER_DIRECTION_FLIP
+#define ENCODER_RESOLUTION 1
+
+/*== all animations enabled ==*/
+/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
+#define RGB_DI_PIN B7
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 2
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_SLEEP
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 0
+
+/* 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
diff --git a/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c b/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3faa703484
--- /dev/null
+++ b/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 Koobaczech
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+		KC_ESC,   KC_LCTL,  KC_LALT,  KC_MEDIA_PLAY_PAUSE,
+		KC_NLCK,  KC_PSLS,  KC_PAST,  MO(1),
+		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
+		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+
+  [1] = LAYOUT_all(
+		RESET,    KC_LCTL,  KC_LALT,  KC_TRNS,
+		RGB_TOG,  RGB_MOD,  RGB_HUI,  KC_PMNS,
+		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
+		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT)
+};
diff --git a/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c b/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a0c6b0c69f
--- /dev/null
+++ b/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+/*
+Copyright 2021 Koobaczech
+
+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 <stdio.h>
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+		KC_ESC,   RGB_TOG,  RGB_MOD,  KC_MEDIA_PLAY_PAUSE,
+		KC_NLCK,  KC_PSLS,  KC_PAST,  MO(1),
+		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
+		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+
+  [1] = LAYOUT_all(
+		RESET,    KC_LCTL,  KC_LALT,  KC_TRNS,
+		RGB_TOG,  RGB_MOD,  RGB_HUI,  KC_PMNS,
+		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
+		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+
+  [2] = LAYOUT_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+
+  [3] = LAYOUT_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
diff --git a/keyboards/pearlboards/zeuspad/keymaps/via/rules.mk b/keyboards/pearlboards/zeuspad/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/pearlboards/zeuspad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/pearlboards/zeuspad/readme.md b/keyboards/pearlboards/zeuspad/readme.md
new file mode 100644
index 0000000000..e22f48e65a
--- /dev/null
+++ b/keyboards/pearlboards/zeuspad/readme.md
@@ -0,0 +1,22 @@
+# Zeuspad
+
+![Zeuspad](https://i.imgur.com/F657DWwh.png)
+
+Zeuspad is the perfect numpad complement to my TKL, Zeus. Standalone it is a glorious numpad with an encoder, oled and rgb.
+
+* Keyboard Maintainer: Koobaczech
+* Hardware Supported: Zeuspad
+* Availability: https://pearlboards.net/products/zeuspadl-coming-2022?variant=39642771718276
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pearlboards/zeuspad: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the front of the PCB labeled "RESET"
+* **Keycode in layout**: Press the key mapped to `RESET` in conjunction with the key mapped to `MO(1))` 
diff --git a/keyboards/pearlboards/zeuspad/rules.mk b/keyboards/pearlboards/zeuspad/rules.mk
new file mode 100644
index 0000000000..0299b99a2f
--- /dev/null
+++ b/keyboards/pearlboards/zeuspad/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+
+LTO_ENABLE = yes
diff --git a/keyboards/pearlboards/zeuspad/zeuspad.c b/keyboards/pearlboards/zeuspad/zeuspad.c
new file mode 100644
index 0000000000..fd79058e85
--- /dev/null
+++ b/keyboards/pearlboards/zeuspad/zeuspad.c
@@ -0,0 +1,67 @@
+/* Copyright 2021 Koobaczech
+ *
+ * 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 "zeuspad.h"
+
+// Encoder rotate function
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    /* First encoder */
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_AUDIO_VOL_UP);
+        } else {
+            tap_code(KC_AUDIO_VOL_DOWN);
+        }
+    }
+    return true;
+}
+
+//21 characters max
+#ifdef OLED_ENABLE
+void oled_task_user(void) {
+  oled_write_P(PSTR("ZEUSPAD BY KOOBACZECH"), false);
+  // Keyboard Layer Status
+  oled_write_P(PSTR("LAYER: "), false);
+
+  switch (get_highest_layer(layer_state)) {
+    case 1:
+        oled_write_ln_P(PSTR("FN"), false);
+        break;
+    default:
+        oled_write_ln_P(PSTR("Default"), false);
+    }
+    // Keyboard Locking Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.caps_lock ? PSTR("CAPS  ") : PSTR("      "), false);
+    oled_write_P(led_state.num_lock ? PSTR("NUM  ") : PSTR("     "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR  ") : PSTR("     "), false);
+
+    switch (rgblight_is_enabled() ? 1 : 2) {
+      case 1:
+          // Or use the write_ln shortcut over adding '\n' to the end of your string
+          oled_write_P(PSTR("RGB"), false);
+          static char led_buf[30];
+          snprintf(led_buf, sizeof(led_buf) - 1, "\nMODE:%2d BRIGHT:%2d/10",
+          (uint8_t)(rgblight_get_mode()),
+          (uint8_t)(rgblight_get_val()/25.5));
+          oled_write(led_buf, false);
+          break;
+      default:
+          oled_write_ln_P(PSTR(""), false);
+          oled_write_P(PSTR("\n"), false);
+    }
+}
+#endif
diff --git a/keyboards/pearlboards/zeuspad/zeuspad.h b/keyboards/pearlboards/zeuspad/zeuspad.h
new file mode 100644
index 0000000000..ea52fd81cd
--- /dev/null
+++ b/keyboards/pearlboards/zeuspad/zeuspad.h
@@ -0,0 +1,40 @@
+/* Copyright 2021 Koobaczech
+ *
+ * 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/>.
+ */
+
+/*
+ * This layout covers all of the possible build layouts. Also, any
+ * built layouts will work without having to change anything.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13, \
+    k20, k21, k22, k23, \
+    k30, k31, k32, k33, \
+    k40, k41, k42, k43, \
+    k50, k51, k52, k53  \
+) { \
+    { k00,  k01,  k02,  k03}, \
+    { k10,  k11,  k12,  k13}, \
+    { k20,  k21,  k22,  k23}, \
+    { k30,  k31,  k32,  k33}, \
+    { k40,  k41,  k42,  k43}, \
+    { k50,  k51,  k52,  k53}  \
+}

From d563ab052e694b5fd43de6c416589877df040576 Mon Sep 17 00:00:00 2001
From: Andrzej Kotulski <gh@akotulski.com>
Date: Fri, 24 Dec 2021 01:37:03 +0100
Subject: [PATCH 034/867] [Keyboard] Add dactyl manuform 4x6 with a 5 key thumb
 cluster (#15516)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../handwired/dactyl_manuform/4x6_5/4x6_5.c   |  1 +
 .../handwired/dactyl_manuform/4x6_5/4x6_5.h   | 26 +++++++
 .../handwired/dactyl_manuform/4x6_5/config.h  | 41 +++++++++++
 .../handwired/dactyl_manuform/4x6_5/info.json | 72 +++++++++++++++++++
 .../4x6_5/keymaps/default/config.h            | 24 +++++++
 .../4x6_5/keymaps/default/keymap.c            | 63 ++++++++++++++++
 .../keymaps/manna-harbour_miryoku/config.h    | 24 +++++++
 .../keymaps/manna-harbour_miryoku/keymap.c    |  5 ++
 .../handwired/dactyl_manuform/4x6_5/rules.mk  | 19 +++++
 .../dactyl_manuform/dactyl_manuform.h         |  2 +
 10 files changed, 277 insertions(+)
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/info.json
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/keymap.c
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/rules.mk

diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c
new file mode 100644
index 0000000000..a770f5ac40
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c
@@ -0,0 +1 @@
+#include "4x6_5.h"
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
new file mode 100644
index 0000000000..f34d8be4df
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "dactyl_manuform.h"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+              L32, L33,                                              R32, R33,    \
+                        L34, L45, L43,                R42, R40, R31, \
+                             L44, L42,                R43, R41 \
+) { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { XXX, XXX, L32, L33, L34, XXX }, \
+    { XXX, XXX, L42, L43, L44, L45 }, \
+\
+    { R00, R01, R02, R03, R04, R05 }, \
+    { R10, R11, R12, R13, R14, R15 }, \
+    { R20, R21, R22, R23, R24, R25 }, \
+    { XXX, R31, R32, R33, XXX, XXX }, \
+    { R40, R41, R42, R43, XXX, XXX } \
+}
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
new file mode 100644
index 0000000000..2e79517b25
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/config.h
@@ -0,0 +1,41 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID 0x3436
+#define DEVICE_VER 0x0001
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+
+// row-driven
+#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
+#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+// WS2812 RGB LED strip input and number of LEDs
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
new file mode 100644
index 0000000000..3534cc01a6
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "Dactyl Manuform 4x6 5 thumb keys",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+                {"x": 6, "y": 4},
+
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+
+                {"x": 5, "y": 5},
+                {"x": 6, "y": 5},
+
+                {"x": 10, "y": 5},
+                {"x": 11, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/config.h
new file mode 100644
index 0000000000..38dfa5cb39
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/config.h
@@ -0,0 +1,24 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+
+#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3036986f2a
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+// Copyright 2021 Andrzej Kotulski (@akotulski)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+enum layer_names {
+    _BASE,
+    _RAISE,
+    _LOWER
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base (qwerty)
+     * +-----------------------------------------+                             +-----------------------------------------+
+     * | ESC  |   q  |   w  |   e  |   r  |   t  |                             |   y  |   u  |   i  |   o  |   p  |      |
+     * |------+------+------+------+------+------|                             |------+------+------+------+------+------|
+     * | TAB  |   a  |   s  |   d  |   f  |   g  |                             |   h  |   j  |   k  |   l  |   ;  |      |
+     * |------+------+------+------+------+------|                             |------+------+------+------+------+------|
+     * | SHFT |   z  |   x  |   c  |   v  |   b  |                             |   n  |   m  |   ,  |   .  |   /  |      |
+     * +------+------+------+------+-------------+                             +-------------+------+------+------+------+
+     *               |  [   |   ]  |                                                         |      |      |
+     *               +-------------+-------------+                             +-------------+-------------+
+     *                             |      |      |                             |      |      |
+     *                             |------+------|                             |------+------|
+     *                             |      |      |                             |      |      |
+     *                             +-------------+                             +-------------+
+     *                                           +-------------+ +-------------+
+     *                                           |      |      | |      |      |
+     *                                           |------+------| |------+------|
+     *                                           |      |      | |      |      |
+     *                                           +-------------+ +-------------+
+     */
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_BSLS,
+                          KC_LBRC, KC_RBRC,                                                KC_PLUS, KC_EQL,
+                                       KC_SPC,  RAISE,   KC_HOME,   KC_END,    LOWER,  KC_ENT,
+                                            KC_BSPC, KC_LALT,            KC_LGUI,  KC_DEL
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______, _______, _______, _______, _______, KC_LBRC,             KC_RBRC, KC_P7,   KC_P8,   KC_P9,   RESET,   KC_PLUS,
+        _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END , KC_LPRN,             KC_RPRN, KC_P4,   KC_P5,   KC_P6,   KC_MINS, KC_PIPE,
+        _______, _______, _______, _______, _______, _______,             _______, KC_P1,   KC_P2,   KC_P3,   KC_EQL,  KC_UNDS,
+                          _______, KC_PSCR,                                                 _______, KC_P0,
+                                  _______, _______,  _______,             _______, _______, _______,
+                                            _______, _______,             _______, _______
+    ),
+
+    [_RAISE] = LAYOUT(
+        _______, RESET,   _______, _______, _______, KC_LBRC,             KC_RBRC, _______, KC_NLCK, KC_INS,  KC_SLCK, KC_MUTE,
+        _______, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, KC_LPRN,             KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
+        _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, KC_VOLD,
+                          _______, _______,                                                 KC_EQL,  _______,
+                                  _______, _______,  _______,             _______, _______, _______,
+                                            _______, _______,             _______, _______
+    )
+};
+
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/config.h
new file mode 100644
index 0000000000..9532d1f67c
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/config.h
@@ -0,0 +1,24 @@
+// Copyright 2019 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+// generated -*- buffer-read-only: t -*-
+
+// 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 XXX KC_NO
+
+#define LAYOUT_miryoku(\
+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,\
+N30, N31, K32, K33, K34,                         K35, K36, K37, N38, N39\
+)\
+LAYOUT( \
+XXX, K00, K01, K02, K03, K04,                         K05, K06, K07, K08, K09, XXX, \
+XXX, K10, K11, K12, K13, K14,                         K15, K16, K17, K18, K19, XXX, \
+XXX, K20, K21, K22, K23, K24,                         K25, K26, K27, K28, K29, XXX, \
+          XXX, XXX,                                             XXX, XXX, \
+                    K32, K33, K34,               K35, K36, K37, \
+                         XXX, XXX,               XXX, XXX \
+)
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/keymap.c
new file mode 100644
index 0000000000..7c5717a0fe
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/keymap.c
@@ -0,0 +1,5 @@
+// Copyright 2019 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+// generated -*- buffer-read-only: t -*-
+
+// 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/>.
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk
new file mode 100644
index 0000000000..0415379827
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
index 11c9997771..7a4ca6ea13 100644
--- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
+++ b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
@@ -4,6 +4,8 @@
 #    include "4x5.h"
 #elif defined(KEYBOARD_handwired_dactyl_manuform_4x6)
 #    include "4x6.h"
+#elif defined(KEYBOARD_handwired_dactyl_manuform_4x6_5)
+#    include "4x6_5.h"
 #elif defined(KEYBOARD_handwired_dactyl_manuform_5x6)
 #    include "5x6.h"
 #elif defined(KEYBOARD_handwired_dactyl_manuform_5x6_5)

From db149052c3067553fa357d0590ed0f9fc4460f40 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Thu, 23 Dec 2021 16:38:53 -0800
Subject: [PATCH 035/867] [Keyboard] Fix compilation issues for Pearlboards
 (#15562)

---
 keyboards/pearlboards/pandora/pandora.c | 14 +++++-
 keyboards/pearlboards/zeus/zeus.c       |  8 +++-
 keyboards/pearlboards/zeuspad/zeuspad.c | 60 ++++++++++++++-----------
 3 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/keyboards/pearlboards/pandora/pandora.c b/keyboards/pearlboards/pandora/pandora.c
index 5ce5d22b06..608ee00edf 100644
--- a/keyboards/pearlboards/pandora/pandora.c
+++ b/keyboards/pearlboards/pandora/pandora.c
@@ -17,7 +17,11 @@
 #include "pandora.h"
 
 // Encoder rotate function
-bool encoder_update_user(uint8_t index, bool clockwise) {
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
     /* First encoder */
     if (index == 0) {
         if (clockwise) {
@@ -28,8 +32,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     }
     return true;
 }
+#endif
+
 // Encoder click function
-bool dip_switch_update_user(uint8_t index, bool active) {
+#ifdef DIP_SWITCH_ENABLE
+bool dip_switch_update_kb(uint8_t index, bool active) {
+    if (!dip_switch_update_user(index, active)) { return false; }
+
     switch (index) {
     /* First encoder */
     case 0:
@@ -40,3 +49,4 @@ bool dip_switch_update_user(uint8_t index, bool active) {
     }
     return true;
 }
+#endif
diff --git a/keyboards/pearlboards/zeus/zeus.c b/keyboards/pearlboards/zeus/zeus.c
index 42b77b2831..cdb8d6125d 100644
--- a/keyboards/pearlboards/zeus/zeus.c
+++ b/keyboards/pearlboards/zeus/zeus.c
@@ -17,8 +17,11 @@
 #include "zeus.h"
 
 // Encoder rotate function
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    /* First encoder */
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }    /* First encoder */
     if (index == 0) {
         if (clockwise) {
             tap_code(KC_AUDIO_VOL_UP);
@@ -28,3 +31,4 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     }
     return true;
 }
+#endif
diff --git a/keyboards/pearlboards/zeuspad/zeuspad.c b/keyboards/pearlboards/zeuspad/zeuspad.c
index fd79058e85..3f7367fb49 100644
--- a/keyboards/pearlboards/zeuspad/zeuspad.c
+++ b/keyboards/pearlboards/zeuspad/zeuspad.c
@@ -17,31 +17,39 @@
 #include "zeuspad.h"
 
 // Encoder rotate function
-bool encoder_update_user(uint8_t index, bool clockwise) {
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
     /* First encoder */
     if (index == 0) {
         if (clockwise) {
-            tap_code(KC_AUDIO_VOL_UP);
+            tap_code_delay(KC_AUDIO_VOL_UP, 10);
         } else {
-            tap_code(KC_AUDIO_VOL_DOWN);
+            tap_code_delay(KC_AUDIO_VOL_DOWN, 10);
         }
     }
     return true;
 }
+#endif
 
-//21 characters max
+// 21 characters max
 #ifdef OLED_ENABLE
-void oled_task_user(void) {
-  oled_write_P(PSTR("ZEUSPAD BY KOOBACZECH"), false);
-  // Keyboard Layer Status
-  oled_write_P(PSTR("LAYER: "), false);
+bool oled_task_kb(void) {
+    if (oled_task_user()) {
+        return false;
+    }
+    oled_write_P(PSTR("ZEUSPAD BY KOOBACZECH"), false);
+    // Keyboard Layer Status
+    oled_write_P(PSTR("LAYER: "), false);
 
-  switch (get_highest_layer(layer_state)) {
-    case 1:
-        oled_write_ln_P(PSTR("FN"), false);
-        break;
-    default:
-        oled_write_ln_P(PSTR("Default"), false);
+    switch (get_highest_layer(layer_state)) {
+        case 1:
+            oled_write_ln_P(PSTR("FN"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Default"), false);
     }
     // Keyboard Locking Status
     led_t led_state = host_keyboard_led_state();
@@ -50,18 +58,18 @@ void oled_task_user(void) {
     oled_write_P(led_state.scroll_lock ? PSTR("SCR  ") : PSTR("     "), false);
 
     switch (rgblight_is_enabled() ? 1 : 2) {
-      case 1:
-          // Or use the write_ln shortcut over adding '\n' to the end of your string
-          oled_write_P(PSTR("RGB"), false);
-          static char led_buf[30];
-          snprintf(led_buf, sizeof(led_buf) - 1, "\nMODE:%2d BRIGHT:%2d/10",
-          (uint8_t)(rgblight_get_mode()),
-          (uint8_t)(rgblight_get_val()/25.5));
-          oled_write(led_buf, false);
-          break;
-      default:
-          oled_write_ln_P(PSTR(""), false);
-          oled_write_P(PSTR("\n"), false);
+        case 1:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_P(PSTR("RGB"), false);
+            static char led_buf[30];
+            snprintf(led_buf, sizeof(led_buf) - 1, "\nMODE:%2d BRIGHT:%2d/10", (uint8_t)(rgblight_get_mode()), (uint8_t)(rgblight_get_val() / 25.5));
+            oled_write(led_buf, false);
+            break;
+        default:
+            oled_write_ln_P(PSTR(""), false);
+            oled_write_P(PSTR("\n"), false);
     }
+
+    return true;
 }
 #endif

From 435fa2c391348f604f122dadba4f2af9306d085c Mon Sep 17 00:00:00 2001
From: Ian C <ian.canino@gmail.com>
Date: Fri, 24 Dec 2021 15:10:12 -0500
Subject: [PATCH 036/867] fix typo (#15569)

---
 docs/ref_functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ref_functions.md b/docs/ref_functions.md
index c6185c8703..209dcef722 100644
--- a/docs/ref_functions.md
+++ b/docs/ref_functions.md
@@ -85,7 +85,7 @@ To configure the default layer sounds, you would want to define this in your `co
 
 ?> There are a large number of predefined songs in [quantum/audio/song_list.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/audio/song_list.h) that you can use.
 
-## Reseting the keyboard
+## Resetting the keyboard
 
 There is the `RESET` quantum keycode that you can use. But if you want to reset the board as part of a macro, rather than hitting a key separately, you can do that.
 

From c4b03509da094c6dd72def69edff86d29326aeaa Mon Sep 17 00:00:00 2001
From: Chris Broekema <broekema-github@fuzzms.nl>
Date: Fri, 24 Dec 2021 23:31:15 +0100
Subject: [PATCH 037/867] Save a single byte of memory for joystick buttons
 (#15555)

Co-authored-by: Joel Challis <git@zvecr.com>
---
 quantum/joystick.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/joystick.h b/quantum/joystick.h
index 87dbc24aff..9156491aca 100644
--- a/quantum/joystick.h
+++ b/quantum/joystick.h
@@ -50,7 +50,7 @@ extern joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT];
 enum joystick_status { JS_INITIALIZED = 1, JS_UPDATED = 2 };
 
 typedef struct {
-    uint8_t buttons[JOYSTICK_BUTTON_COUNT / 8 + 1];
+    uint8_t buttons[(JOYSTICK_BUTTON_COUNT - 1) / 8 + 1];
 
     int16_t axes[JOYSTICK_AXES_COUNT];
     uint8_t status : 2;

From 1e28667ef8bf26a56faf26bf9af2542a18597721 Mon Sep 17 00:00:00 2001
From: Scott Chow <11098209+scchow@users.noreply.github.com>
Date: Fri, 24 Dec 2021 17:12:33 -0800
Subject: [PATCH 038/867] [Docs] Fixed keycode reference for swirl effect
 (#15564)

---
 docs/feature_rgb_matrix.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index d07c02e184..8ba39b476b 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -415,7 +415,7 @@ All RGB keycodes are currently shared with the RGBLIGHT system:
 
 * `RGB_MODE_*` keycodes will generally work, but not all of the modes are currently mapped to the correct effects for the RGB Matrix system.
 
-`RGB_MODE_PLAIN`, `RGB_MODE_BREATHE`, `RGB_MODE_RAINBOW`, and `RGB_MATRIX_SWIRL` are the only ones that are mapped properly. The rest don't have a direct equivalent, and are not mapped.
+`RGB_MODE_PLAIN`, `RGB_MODE_BREATHE`, `RGB_MODE_RAINBOW`, and `RGB_MODE_SWIRL` are the only ones that are mapped properly. The rest don't have a direct equivalent, and are not mapped.
 
 !> By default, if you have both the [RGB Light](feature_rgblight.md) and the RGB Matrix feature enabled, these keycodes will work for both features, at the same time. You can disable the keycode functionality by defining the `*_DISABLE_KEYCODES` option for the specific feature.
 

From 53996a78b59a9f1c53ad88e8dbc1ed252d3ed7d0 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Sat, 25 Dec 2021 09:17:48 +0800
Subject: [PATCH 039/867] [Keyboard] Add bm60hsrgb_poker/rev2, a continuation
 of #15001 (#15103)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../kprepublic/bm60hsrgb_poker/readme.md      |   9 +-
 .../{ => rev1}/keymaps/david/keymap.c         |   0
 .../{ => rev1}/keymaps/default/keymap.c       |   0
 .../{ => rev1}/keymaps/ipetepete/keymap.c     |   0
 .../{ => rev1}/keymaps/ipetepete/readme.md    |   0
 .../{ => rev1}/keymaps/ipetepete/rules.mk     |   0
 .../{ => rev1}/keymaps/via/keymap.c           |   0
 .../{ => rev1}/keymaps/via/rules.mk           |   0
 .../kprepublic/bm60hsrgb_poker/rev1/readme.md |  13 ++
 .../kprepublic/bm60hsrgb_poker/rev2/config.h  | 153 ++++++++++++++
 .../kprepublic/bm60hsrgb_poker/rev2/info.json |  76 +++++++
 .../rev2/keymaps/default/keymap.c             |  35 ++++
 .../bm60hsrgb_poker/rev2/keymaps/via/keymap.c |  49 +++++
 .../bm60hsrgb_poker/rev2/keymaps/via/rules.mk |   2 +
 .../kprepublic/bm60hsrgb_poker/rev2/readme.md |  13 ++
 .../kprepublic/bm60hsrgb_poker/rev2/rev2.c    | 196 ++++++++++++++++++
 .../kprepublic/bm60hsrgb_poker/rev2/rev2.h    |  32 +++
 .../kprepublic/bm60hsrgb_poker/rev2/rules.mk  |  31 +++
 18 files changed, 606 insertions(+), 3 deletions(-)
 rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/david/keymap.c (100%)
 rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/default/keymap.c (100%)
 rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/ipetepete/keymap.c (100%)
 rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/ipetepete/readme.md (100%)
 rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/ipetepete/rules.mk (100%)
 rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/via/keymap.c (100%)
 rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/via/rules.mk (100%)
 create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev1/readme.md
 create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
 create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
 create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c
 create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c
 create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/rules.mk
 create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/readme.md
 create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
 create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h
 create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk

diff --git a/keyboards/kprepublic/bm60hsrgb_poker/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/readme.md
index ef29166df8..5c9a843d1c 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb_poker/readme.md
@@ -2,12 +2,15 @@
 
 A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. 
 
-* Keyboard Maintainer: [ipetepete](https://github.com/ipetepete)
-* Hardware Supported: BM60HSRGB_Poker
+* Hardware Supported: BM60HSRGB_Poker/rev2
 * Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-poker-60-gh60-hot-swap-custom-mechanical-keyboard-pcb-program-qmk-underglow-type-c)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kprepublic/bm60hsrgb_poker/rev1:default
+    for rev1: make kprepublic/bm60hsrgb_poker/rev1:default
+    for rev2: make kprepublic/bm60hsrgb_poker/rev2:default
+
+To determine your board revision, check the PCB. For boards with bm60v2_poker printed on the PCB, use rev2. Otherwise, use rev1
 
 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).
+
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/david/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/david/keymap.c
rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/default/keymap.c
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/keymap.c
rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/readme.md
rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/readme.md
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/rules.mk
rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/rules.mk
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/via/keymap.c
rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/via/keymap.c
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/via/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/via/rules.mk
rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/via/rules.mk
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/rev1/readme.md
new file mode 100644
index 0000000000..f21ef45da7
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/readme.md
@@ -0,0 +1,13 @@
+# BM60HSRGB_Poker 60% Mechanical Keyboard RGB PCB
+
+A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. 
+
+* Keyboard Maintainer: [ipetepete](https://github.com/ipetepete)
+* Hardware Supported: BM60HSRGB_Poker/rev1
+* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-poker-60-gh60-hot-swap-custom-mechanical-keyboard-pcb-program-qmk-underglow-type-c)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kprepublic/bm60hsrgb_poker/rev1: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).
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
new file mode 100644
index 0000000000..b5efc1f596
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -0,0 +1,153 @@
+/* Copyright 2021 bdtc123
+ *
+ * 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       0x4B50
+#define PRODUCT_ID      0x1122
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    KP Republic
+#define PRODUCT         BM60V2_poker
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * 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 { E6, D2, D3, D5, F6 }
+#define MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+#define USB_POLLING_INTERVAL_MS 1
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+//rgb light setting
+#define RGBLIGHT_LIMIT_VAL 150
+#define RGBLED_NUM          6
+#define RGB_DI_PIN          F0
+#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
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+#define RGBLIGHT_HUE_STEP   8
+#define RGBLIGHT_SAT_STEP   8
+#define RGBLIGHT_VAL_STEP   8
+
+#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+#    define RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
+
+
+
+
+
+// Note: The RGB LED driver configuration is not inside #ifdef blocks, so that
+// the driver code would still compile even without RGBLIGHT_ENABLE and
+// RGB_MATRIX_ENABLE (usually this is not required, but with the custom
+// IS31FL3733+WS2812 driver setup used by this board the LED controller drivers
+// are compiled unconditionally).
+
+// Configure the IS31FL3733 driver for per-key RGB LEDs
+#define DRIVER_COUNT 1
+#define DRIVER_ADDR_1 0b1010000
+#define DRIVER_1_LED_TOTAL 61
+
+#define ISSI_LED_TOTAL DRIVER_1_LED_TOTAL
+
+// Underglow LEDs are WS2812, but someone might want to use RGBLIGHT for them;
+// don't use those LEDs in RGB Matrix in that case.
+#ifdef RGBLIGHT_ENABLE
+#    define WS2812_LED_TOTAL 0
+#else
+#    define WS2812_LED_TOTAL RGBLED_NUM
+#endif
+
+#define DRIVER_LED_TOTAL (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_KEYPRESSES
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#endif
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
new file mode 100644
index 0000000000..0ad2aa9d3c
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
@@ -0,0 +1,76 @@
+{
+    "keyboard_name": "bm60v2_poker",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":14, "y":3,"w":2.75},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4,"w":1.25},
+                {"x":11.25, "y":4,"w":1.25},
+                {"x":12.5, "y":4,"w":1.25},
+                {"x":13.75, "y":4,"w":1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b1c5c57ea4
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 bdtc123
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_60_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_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,  MO(1),  KC_RGUI,       KC_RCTL
+    ),
+    [1] = LAYOUT_60_ansi(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET,
+        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
+        _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______
+    ),
+
+};
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f74fa21de8
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 bdtc123
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_60_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_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,  MO(1),  KC_RGUI,       KC_RCTL
+    ),
+    [1] = LAYOUT_60_ansi(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET,
+        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
+        _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______
+    ),
+    [2] = LAYOUT_60_ansi(
+        _______, _______,   _______, _______,   _______, _______,   _______, _______,   _______, _______,   _______, _______,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_60_ansi(
+        _______, _______,   _______, _______,   _______, _______,   _______, _______,   _______, _______,   _______, _______,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/rev2/readme.md
new file mode 100644
index 0000000000..18a074cdb0
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/readme.md
@@ -0,0 +1,13 @@
+# BM60 Poker 60% Mechanical Keyboard RGB PCB
+
+A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. 
+
+* Keyboard Maintainer: [bdtc123](https://github.com/bdtc123)
+* Hardware Supported: BM60HSRGB_Poker/rev2
+* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-poker-60-gh60-hot-swap-custom-mechanical-keyboard-pcb-program-qmk-underglow-type-c)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kprepublic/bm60hsrgb_poker/rev2: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).
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
new file mode 100644
index 0000000000..32cfce362f
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
@@ -0,0 +1,196 @@
+/* Copyright 2021 bdtc123
+ *
+ * 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 "rev2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+#    include "i2c_master.h"
+#    include "is31fl3733.h"
+#    include "ws2812.h"
+
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+    { 0, B_1, A_1, C_1 },
+    { 0, B_2, A_2, C_2 },
+    { 0, B_3, A_3, C_3 },
+    { 0, B_4, A_4, C_4 },
+    { 0, B_5, A_5, C_5 },
+    { 0, B_6, A_6, C_6 },
+    { 0, B_7, A_7, C_7 },
+    { 0, B_8, A_8, C_8 },
+    { 0, B_9, A_9, C_9 },
+    { 0, B_10, A_10, C_10 },
+    { 0, B_11, A_11, C_11 },
+    { 0, B_12, A_12, C_12 },
+    { 0, B_13, A_13, C_13 },
+    { 0, B_14, A_14, C_14 },
+
+    { 0, E_1,  D_1,  F_1 },
+    { 0, E_2,  D_2,  F_2 },
+    { 0, E_3,  D_3,  F_3 },
+    { 0, E_4,  D_4,  F_4 },
+    { 0, E_5,  D_5,  F_5 },
+    { 0, E_6,  D_6,  F_6 },
+    { 0, E_7,  D_7,  F_7 },
+    { 0, E_8,  D_8,  F_8 },
+    { 0, E_9,  D_9,  F_9 },
+    { 0, E_10, D_10, F_10 },
+    { 0, E_11, D_11, F_11 },
+    { 0, E_12, D_12, F_12 },
+    { 0, E_13, D_13, F_13 },
+    { 0, E_14, D_14, F_14 },
+
+    { 0, H_1,  G_1,  I_1 },
+    { 0, H_2,  G_2,  I_2 },
+    { 0, H_3,  G_3,  I_3 },
+    { 0, H_4,  G_4,  I_4 },
+    { 0, H_5,  G_5,  I_5 },
+    { 0, H_6,  G_6,  I_6 },
+    { 0, H_7,  G_7,  I_7 },
+    { 0, H_8,  G_8,  I_8 },
+    { 0, H_9,  G_9,  I_9 },
+    { 0, H_10, G_10, I_10 },
+    { 0, H_11, G_11, I_11 },
+    { 0, H_12, G_12, I_12 },
+    { 0, H_14, G_14, I_14 },
+
+    { 0, K_1,  J_1,  L_1 },
+    { 0, K_2,  J_2,  L_2 },
+    { 0, K_3,  J_3,  L_3 },
+    { 0, K_4,  J_4,  L_4 },
+    { 0, K_5,  J_5,  L_5 },
+    { 0, K_6,  J_6,  L_6 },
+    { 0, K_7,  J_7,  L_7 },
+    { 0, K_8,  J_8,  L_8 },
+    { 0, K_9,  J_9,  L_9 },
+    { 0, K_10, J_10, L_10 },
+    { 0, K_11, J_11, L_11 },
+    { 0, K_13, J_13, L_13 },
+
+    { 0, H_16, G_16, I_16 },
+    { 0, H_15, G_15, I_15 },
+    { 0, H_13, G_13, I_13 },
+    { 0, E_15, D_15, F_15 },
+    { 0, K_15, J_15, L_15 },
+    { 0, K_16, J_16, L_16 },
+    { 0, K_12, J_12, L_12 },
+    { 0, E_16, D_16, F_16 }
+};
+
+led_config_t g_led_config = {
+    {
+        { 0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,     12,     13 },
+        { 14,     15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27 },
+        { 28,     29,     30,     31,     32,     33,     34,     35,     36,     37,     38,     39, NO_LED,     40 },
+        { 41,     42,     43,     44,     45,     46,     47,     48,     49,     50,     51, NO_LED, NO_LED,     52 },
+        { 53,     54,     55,   NO_LED,   NO_LED, 56, NO_LED,   NO_LED,   NO_LED, 57,     58,     59, NO_LED,     60 }
+    }, {
+    // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace
+    {   0,   0 }, {  15,   0 }, {  30,   0 }, {  45,   0 }, {  60,   0 }, {  75,   0 }, {  90,   0 }, { 105,   0 }, { 120,   0 }, { 135,   0 }, { 150,   0 }, { 165,   0 }, { 180,   0 }, { 202,   0 },
+    // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ],  ,
+    {   7,  16 }, {  22,  16 }, {  37,  16 }, {  52,  16 }, {  67,  16 }, {  82,  16 }, {  97,  16 }, { 112,  16 }, { 127,  16 }, { 142,  16 }, { 157,  16 }, { 172,  16 }, { 187,  16 }, { 206,  16 },
+    // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter
+    {  11,  32 }, {  26,  32 }, {  41,  32 }, {  56,  32 }, {  71,  32 }, {  86,  32 }, { 101,  32 }, { 116,  32 }, { 131,  32 }, { 146,  32 }, { 161,  32 }, { 176,  32 }, { 198,  32 },
+    // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up,
+    {  18,  48 }, {  30,  48 }, {  45,  48 }, {  60,  48 }, {  75,  48 }, {  90,  48 }, { 105,  48 }, { 120,  48 }, { 135,  48 }, { 150,  48 }, { 165,  48 }, { 191,  48 },
+    // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
+    {   3,  64 }, {  22,  64 }, {  33,  64 }, { 101,  64 }, { 135,  64 }, { 153,  64 }, { 210,  64 }, { 225,  64 }
+#    if WS2812_LED_TOTAL > 0
+        ,{ 28, 40}, { 62, 40}, { 96, 40}, {130, 40}, {164, 40}, {198, 40}
+#    endif
+}, {
+    // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ], backslash
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter
+    9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
+    1, 1, 1, 4, 1, 1, 1, 1
+#    if WS2812_LED_TOTAL > 0
+        ,2, 2, 2, 2, 2, 2
+#    endif
+    }
+};
+
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
+    }
+}
+
+// clang-format on
+
+// ==========================================================================
+// Custom RGB Matrix driver that combines IS31FL3733 and WS2812
+// ==========================================================================
+
+#    if WS2812_LED_TOTAL > 0
+LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
+#    endif
+
+static void rgb_matrix_driver_init(void) {
+    i2c_init();
+    IS31FL3733_init(DRIVER_ADDR_1, 0);
+    for (uint8_t index = 0; index < ISSI_LED_TOTAL; index++) {
+        bool enabled = true;
+        IS31FL3733_set_led_control_register(index, enabled, enabled, enabled);
+    }
+    IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0);
+}
+
+static void rgb_matrix_driver_flush(void) {
+    IS31FL3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
+#    if WS2812_LED_TOTAL > 0
+    ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
+#    endif
+}
+
+static void rgb_matrix_driver_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    if (index < ISSI_LED_TOTAL) {
+        IS31FL3733_set_color(index, red, green, blue);
+    } else {
+#    if WS2812_LED_TOTAL > 0
+        rgb_matrix_ws2812_array[index - ISSI_LED_TOTAL].r = red;
+        rgb_matrix_ws2812_array[index - ISSI_LED_TOTAL].g = green;
+        rgb_matrix_ws2812_array[index - ISSI_LED_TOTAL].b = blue;
+#    endif
+    }
+}
+
+static void rgb_matrix_driver_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    IS31FL3733_set_color_all(red, green, blue);
+#    if WS2812_LED_TOTAL > 0
+    for (uint8_t i = 0; i < WS2812_LED_TOTAL; i++) {
+        rgb_matrix_ws2812_array[i].r = red;
+        rgb_matrix_ws2812_array[i].g = green;
+        rgb_matrix_ws2812_array[i].b = blue;
+    }
+#    endif
+}
+
+// clang-format off
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init          = rgb_matrix_driver_init,
+    .flush         = rgb_matrix_driver_flush,
+    .set_color     = rgb_matrix_driver_set_color,
+    .set_color_all = rgb_matrix_driver_set_color_all,
+};
+// clang-format on
+
+#endif /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h
new file mode 100644
index 0000000000..6b4344586a
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h
@@ -0,0 +1,32 @@
+/* Copyright 2021 bdtc123
+ *
+ * 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_60_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        \
+    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
+    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,          \
+    K30,       K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,        K3D,     \
+    K40,  K41,  K42,              K45,                 K49,  K4A,   K4B,  K4D    \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   KC_NO, KC_NO, K3D   }, \
+    { K40,   K41,   K42,   KC_NO, KC_NO, K45,   KC_NO, KC_NO, KC_NO, K49,   K4A,   K4B,   KC_NO, K4D   }, \
+}
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
new file mode 100644
index 0000000000..cd9c25149a
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk
@@ -0,0 +1,31 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+LAYOUTS = 60_ansi
+LTO_ENABLE = yes
+
+# RGB Matrix is required to support per-key LEDs connected to IS31FL3733.
+RGB_MATRIX_ENABLE = yes
+
+# The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
+# normally done by common_features.mk for both of these drivers need to be done
+# here manually.
+RGB_MATRIX_DRIVER = custom
+COMMON_VPATH += $(DRIVER_PATH)/led/issi
+SRC += is31fl3733.c
+QUANTUM_LIB_SRC += i2c_master.c
+WS2812_DRIVER_REQUIRED = yes

From 34a7b435cd70f71b8fa1556f05f705a3497b2eb2 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Sat, 25 Dec 2021 09:18:27 +0800
Subject: [PATCH 040/867] [Keyboard] Add KPrepublic BM60hsrgb_iso/rev2, acting
 in lieu of @bdtc123 (#15095)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/kprepublic/bm60hsrgb_iso/readme.md  |  11 +-
 .../{ => rev1}/keymaps/default/keymap.c       |   0
 .../{ => rev1}/keymaps/default/readme.md      |   0
 .../keymaps/iso_nordic_sleepmode/config.h     |   0
 .../keymaps/iso_nordic_sleepmode/keymap.c     |   0
 .../keymaps/iso_nordic_sleepmode/readme.md    |   0
 .../kprepublic/bm60hsrgb_iso/rev1/readme.md   |  19 ++
 .../kprepublic/bm60hsrgb_iso/rev2/config.h    | 157 ++++++++++++++
 .../kprepublic/bm60hsrgb_iso/rev2/info.json   |  79 +++++++
 .../rev2/keymaps/default/keymap.c             |  34 +++
 .../bm60hsrgb_iso/rev2/keymaps/via/keymap.c   |  49 +++++
 .../bm60hsrgb_iso/rev2/keymaps/via/rules.mk   |   2 +
 .../kprepublic/bm60hsrgb_iso/rev2/readme.md   |  19 ++
 .../kprepublic/bm60hsrgb_iso/rev2/rev2.c      | 200 ++++++++++++++++++
 .../kprepublic/bm60hsrgb_iso/rev2/rev2.h      |  32 +++
 .../kprepublic/bm60hsrgb_iso/rev2/rules.mk    |  31 +++
 16 files changed, 629 insertions(+), 4 deletions(-)
 rename keyboards/kprepublic/bm60hsrgb_iso/{ => rev1}/keymaps/default/keymap.c (100%)
 rename keyboards/kprepublic/bm60hsrgb_iso/{ => rev1}/keymaps/default/readme.md (100%)
 rename keyboards/kprepublic/bm60hsrgb_iso/{ => rev1}/keymaps/iso_nordic_sleepmode/config.h (100%)
 rename keyboards/kprepublic/bm60hsrgb_iso/{ => rev1}/keymaps/iso_nordic_sleepmode/keymap.c (100%)
 rename keyboards/kprepublic/bm60hsrgb_iso/{ => rev1}/keymaps/iso_nordic_sleepmode/readme.md (100%)
 create mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev1/readme.md
 create mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
 create mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
 create mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/default/keymap.c
 create mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/via/keymap.c
 create mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/via/rules.mk
 create mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev2/readme.md
 create mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
 create mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.h
 create mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk

diff --git a/keyboards/kprepublic/bm60hsrgb_iso/readme.md b/keyboards/kprepublic/bm60hsrgb_iso/readme.md
index 5cef32cbeb..19db51eead 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/readme.md
+++ b/keyboards/kprepublic/bm60hsrgb_iso/readme.md
@@ -4,16 +4,19 @@
 
 A 60% ISO hotswap inswitch RGB keyboard.
 
-* Keyboard Maintainer: [markva](https://github.com/markva)
-* Hardware Supported: BM60 RGB ISO
+* Hardware Supported: BM60HSRGB_ISO
 * Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-iso-uk-eu-rgb-60-hot-swappable-pcb-qmk-firmware-rgb-underglow-type-c)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kprepublic/bm60hsrgb_iso/rev1:default
+    for rev1: make kprepublic/bm60hsrgb_iso/rev1:default
+    for rev2: make kprepublic/bm60hsrgb_iso/rev2:default
 
 Flashing example for this keyboard:
 
-    make kprepublic/bm60hsrgb_iso:default:flash
+    for rev1: make kprepublic/bm60hsrgb_iso/rev1:default:flash
+    for rev2: make kprepublic/bm60hsrgb_iso/rev2:default:flash
+
+To check which board revision you have, check the PCB. If it has BM60v2-ISO printed on it, it's rev2. Otherwise it's rev1.
 
 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).
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_iso/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/keymap.c
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/keymaps/default/readme.md b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_iso/keymaps/default/readme.md
rename to keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/default/readme.md
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/keymaps/iso_nordic_sleepmode/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/iso_nordic_sleepmode/config.h
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_iso/keymaps/iso_nordic_sleepmode/config.h
rename to keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/iso_nordic_sleepmode/config.h
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/keymaps/iso_nordic_sleepmode/keymap.c b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/iso_nordic_sleepmode/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_iso/keymaps/iso_nordic_sleepmode/keymap.c
rename to keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/iso_nordic_sleepmode/keymap.c
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/keymaps/iso_nordic_sleepmode/readme.md b/keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/iso_nordic_sleepmode/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_iso/keymaps/iso_nordic_sleepmode/readme.md
rename to keyboards/kprepublic/bm60hsrgb_iso/rev1/keymaps/iso_nordic_sleepmode/readme.md
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/readme.md b/keyboards/kprepublic/bm60hsrgb_iso/rev1/readme.md
new file mode 100644
index 0000000000..c18f2eb8cb
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/readme.md
@@ -0,0 +1,19 @@
+# BM60HSRGB_ISO/rev2
+
+![BM60HSRGB_ISO](https://i.imgur.com/i3gk2vql.jpg)
+
+A 60% ISO hotswap inswitch RGB keyboard.
+
+* Keyboard Maintainer: [markva](https://github.com/markva)
+* Hardware Supported: BM60HSRGB_ISO/rev1
+* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-iso-uk-eu-rgb-60-hot-swappable-pcb-qmk-firmware-rgb-underglow-type-c)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kprepublic/bm60hsrgb_iso/rev1:default
+
+Flashing example for this keyboard:
+
+    make kprepublic/bm60hsrgb_iso/rev1:default:flash
+
+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).
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
new file mode 100644
index 0000000000..b3bbed9110
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -0,0 +1,157 @@
+/* Copyright 2021 bdtc123
+ * Copyright 2021 sigprof
+ * Copyright 2021 peepeetee
+ *
+ * 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       0x4B50
+#define PRODUCT_ID      0x1123
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    KP REPUBLIC
+#define PRODUCT         BM60V2_ISO
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * 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 { E6, D2, D3, D5, F6 }
+#define MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+#define USB_POLLING_INTERVAL_MS 1
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 3
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+//rgb light setting
+#define RGBLIGHT_LIMIT_VAL 150
+#define RGBLED_NUM          6
+#define RGB_DI_PIN          F0
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+#define RGBLIGHT_HUE_STEP   8
+#define RGBLIGHT_SAT_STEP   8
+#define RGBLIGHT_VAL_STEP   8
+
+#    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+#    define RGB_MATRIX_KEYPRESSES
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define DISABLE_RGB_MATRIX_RAINDROPS
+#    define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define DRIVER_ADDR_1 0b1010000
+#    define DRIVER_COUNT 1
+#    define DRIVER_1_LED_TOTAL 64
+
+
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+// Note: The RGB LED driver configuration is not inside #ifdef blocks, so that
+// the driver code would still compile even without RGBLIGHT_ENABLE and
+// RGB_MATRIX_ENABLE (usually this is not required, but with the custom
+// IS31FL3733+WS2812 driver setup used by this board the LED controller drivers
+// are compiled unconditionally).
+
+#define ISSI_LED_TOTAL DRIVER_1_LED_TOTAL
+
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
+
+// Underglow LEDs are WS2812, but someone might want to use RGBLIGHT for them;
+// don't use those LEDs in RGB Matrix in that case.
+#ifdef RGBLIGHT_ENABLE
+#    define WS2812_LED_TOTAL 0
+#else
+#    define WS2812_LED_TOTAL RGBLED_NUM
+#endif
+
+#define DRIVER_LED_TOTAL (ISSI_LED_TOTAL + WS2812_LED_TOTAL)
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_KEYPRESSES
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#endif
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
new file mode 100644
index 0000000000..8fd3f1786f
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
@@ -0,0 +1,79 @@
+{
+    "keyboard_name": "bm60v2_ISO",
+    "url": "",
+    "maintainer": "kp republic",
+    "layouts": {
+        "LAYOUT_60_iso_arrow": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..93da46e31b
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 markva
+ * Copyright 2021 bdtc123
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_60_iso_arrow(
+        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_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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_60_iso_arrow(
+        _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
+        _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, KC_PGUP, _______,
+        _______, _______, _______,                            _______,                   _______, _______, KC_HOME, KC_PGDN, KC_END
+    )
+};
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..2bdfd2efe6
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2020 markva
+ * Copyright 2021 bdtc123
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_60_iso_arrow(
+        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_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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, KC_SPC,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_60_iso_arrow(
+        _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
+        _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, KC_PGUP, _______,
+        _______, _______, _______,                            _______,                   _______, _______, KC_HOME, KC_PGDN, KC_END
+    ),
+    [2] = LAYOUT_60_iso_arrow(
+        _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_60_iso_arrow(
+        _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/via/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/readme.md b/keyboards/kprepublic/bm60hsrgb_iso/rev2/readme.md
new file mode 100644
index 0000000000..d25f538e7e
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/readme.md
@@ -0,0 +1,19 @@
+# BM60HSRGB_ISO/rev2
+
+![BM60HSRGB_ISO](https://i.imgur.com/i3gk2vql.jpg)
+
+A 60% ISO hotswap inswitch RGB keyboard.
+
+* Keyboard Maintainer: [bdtc123](https://github.com/bdtc123)
+* Hardware Supported: BM60HSRGB_ISO/rev2
+* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-iso-uk-eu-rgb-60-hot-swappable-pcb-qmk-firmware-rgb-underglow-type-c)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kprepublic/bm60hsrgb_iso/rev2:default
+
+Flashing example for this keyboard:
+
+    make kprepublic/bm60hsrgb_iso/rev2:default:flash
+
+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).
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
new file mode 100644
index 0000000000..4500ff37b9
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
@@ -0,0 +1,200 @@
+/* Copyright 2021 bdtc123
+ * Copyright 2021 sigprof
+ * Copyright 2021 peepeetee
+ *
+ * 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 "rev2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+#    include "i2c_master.h"
+#    include "is31fl3733.h"
+#    include "ws2812.h"
+
+
+const PROGMEM is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+    { 0, B_1, A_1, C_1 },
+    { 0, B_2, A_2, C_2 },
+    { 0, B_3, A_3, C_3 },
+    { 0, B_4, A_4, C_4 },
+    { 0, B_5, A_5, C_5 },
+    { 0, B_6, A_6, C_6 },
+    { 0, B_7, A_7, C_7 },
+    { 0, B_8, A_8, C_8 },
+    { 0, B_9, A_9, C_9 },
+    { 0, B_10, A_10, C_10 },
+    { 0, B_11, A_11, C_11 },
+    { 0, B_12, A_12, C_12 },
+    { 0, B_13, A_13, C_13 },
+    { 0, B_14, A_14, C_14 },
+
+    { 0, E_1,  D_1,  F_1 },
+    { 0, E_2,  D_2,  F_2 },
+    { 0, E_3,  D_3,  F_3 },
+    { 0, E_4,  D_4,  F_4 },
+    { 0, E_5,  D_5,  F_5 },
+    { 0, E_6,  D_6,  F_6 },
+    { 0, E_7,  D_7,  F_7 },
+    { 0, E_8,  D_8,  F_8 },
+    { 0, E_9,  D_9,  F_9 },
+    { 0, E_10, D_10, F_10 },
+    { 0, E_11, D_11, F_11 },
+    { 0, E_12, D_12, F_12 },
+    { 0, E_13, D_13, F_13 },
+    { 0, E_14, D_14, F_14 },
+
+    { 0, H_1,  G_1,  I_1 },
+    { 0, H_2,  G_2,  I_2 },
+    { 0, H_3,  G_3,  I_3 },
+    { 0, H_4,  G_4,  I_4 },
+    { 0, H_5,  G_5,  I_5 },
+    { 0, H_6,  G_6,  I_6 },
+    { 0, H_7,  G_7,  I_7 },
+    { 0, H_8,  G_8,  I_8 },
+    { 0, H_9,  G_9,  I_9 },
+    { 0, H_10, G_10, I_10 },
+    { 0, H_11, G_11, I_11 },
+    { 0, H_12, G_12, I_12 },
+    { 0, H_13, G_13, I_13 },
+
+    { 0, K_1,  J_1,  L_1 },
+    { 0, K_11, J_11, L_11 },
+    { 0, K_2,  J_2,  L_2 },
+    { 0, K_3,  J_3,  L_3 },
+    { 0, K_4,  J_4,  L_4 },
+    { 0, K_5,  J_5,  L_5 },
+    { 0, K_6,  J_6,  L_6 },
+    { 0, K_7,  J_7,  L_7 },
+    { 0, K_8,  J_8,  L_8 },
+    { 0, K_9,  J_9,  L_9 },
+    { 0, K_10, J_10, L_10 },
+    { 0, K_12, J_12, L_12 },
+    { 0, K_13, J_13, L_13 },
+    { 0, K_14, J_14, L_14 },
+
+    { 0, H_16, G_16, I_16 },
+    { 0, H_14, G_14, I_14 },
+    { 0, H_15, G_15, I_15 },
+    { 0, E_15, D_15, F_15 },
+    { 0, K_15, J_15, L_15 },
+    { 0, K_16, J_16, L_16 },
+    { 0, B_16, A_16, C_16 },
+    { 0, B_15, A_15, C_15 },
+    { 0, E_16, D_16, F_16 }
+};
+
+led_config_t g_led_config = { {
+  {   0,   1,   2,     3,     4,     5,     6,     7,     8,   9,  10,  11,  12,  13 },
+  {  14,  15,  16,    17,    18,    19,    20,    21,    22,  23,  24,  25,  26,  27 },
+  {  28,  29,  30,    31,    32,    33,    34,    35,    36,  37,  38,  39,  40,NO_LED},
+  {  41,  58,  42,    43,    44,    45,    46,    47,    48,  49,  51,  52,  53,  54 },
+  {  55,  56,  57,NO_LED,NO_LED,    58,NO_LED,NO_LED,NO_LED,  59,  60,  61,  62,  63 }
+}, {
+    // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace
+    {   0,   0 }, {  15,   0 }, {  30,   0 }, {  45,   0 }, {  60,   0 }, {  75,   0 }, {  90,   0 }, { 105,   0 }, { 120,   0 }, { 135,   0 }, { 150,   0 }, { 165,   0 }, { 180,   0 }, { 202,   0 },
+    // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ],  ,
+    {   7,  16 }, {  22,  16 }, {  37,  16 }, {  52,  16 }, {  67,  16 }, {  82,  16 }, {  97,  16 }, { 112,  16 }, { 127,  16 }, { 142,  16 }, { 157,  16 }, { 172,  16 }, { 187,  16 }, { 206,  16 },
+    // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter
+    {  11,  32 }, {  26,  32 }, {  41,  32 }, {  56,  32 }, {  71,  32 }, {  86,  32 }, { 101,  32 }, { 116,  32 }, { 131,  32 }, { 146,  32 }, { 161,  32 }, { 176,  32 }, { 198,  32 },
+    // LShift, <, Z, X, C, V, B, N, M, ,, ., /, Shift, Up,
+    {   3,  48 }, {  22,  48 }, {  33,  48 }, {  48,  48 }, {  63,  48 }, {  78,  48 }, {  93,  48 }, { 108,  48 }, { 123,  48 }, { 138,  48 }, { 153,  48 }, { 168,  48 }, { 194,  48 }, { 213,  48 },
+    // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
+    {   3,  64 }, {  22,  64 }, {  33,  64 }, { 101,  64 }, { 135,  64 }, { 153,  64 }, { 195,  64 }, { 210,  64 }, { 225,  64 }
+#    if WS2812_LED_TOTAL > 0
+        ,{ 28, 40}, { 62, 40}, { 96, 40}, {130, 40}, {164, 40}, {198, 40}
+#    endif
+}, {
+    // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ], Enter
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    // Capslock, A, S, D, F, G, H, J, K, L, ;, ',#
+    9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    // LShift,backslash, Z, X, C, V, B, N, M, ,, ., Shift, Up, /
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4,
+    // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
+    1, 1, 1, 4, 1, 1, 1, 1, 1
+#    if WS2812_LED_TOTAL > 0
+        ,2, 2, 2, 2, 2, 2
+#    endif
+} };
+
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
+    }
+}
+
+// clang-format on
+
+// ==========================================================================
+// Custom RGB Matrix driver that combines IS31FL3733 and WS2812
+// ==========================================================================
+
+#    if WS2812_LED_TOTAL > 0
+LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL];
+#    endif
+
+static void rgb_matrix_driver_init(void) {
+    i2c_init();
+    IS31FL3733_init(DRIVER_ADDR_1, 0);
+    for (uint8_t index = 0; index < ISSI_LED_TOTAL; index++) {
+        bool enabled = true;
+        IS31FL3733_set_led_control_register(index, enabled, enabled, enabled);
+    }
+    IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0);
+}
+
+static void rgb_matrix_driver_flush(void) {
+    IS31FL3733_update_pwm_buffers(DRIVER_ADDR_1, 0);
+#    if WS2812_LED_TOTAL > 0
+    ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL);
+#    endif
+}
+
+static void rgb_matrix_driver_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    if (index < ISSI_LED_TOTAL) {
+        IS31FL3733_set_color(index, red, green, blue);
+    } else {
+#    if WS2812_LED_TOTAL > 0
+        rgb_matrix_ws2812_array[index - ISSI_LED_TOTAL].r = red;
+        rgb_matrix_ws2812_array[index - ISSI_LED_TOTAL].g = green;
+        rgb_matrix_ws2812_array[index - ISSI_LED_TOTAL].b = blue;
+#    endif
+    }
+}
+
+static void rgb_matrix_driver_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    IS31FL3733_set_color_all(red, green, blue);
+#    if WS2812_LED_TOTAL > 0
+    for (uint8_t i = 0; i < WS2812_LED_TOTAL; i++) {
+        rgb_matrix_ws2812_array[i].r = red;
+        rgb_matrix_ws2812_array[i].g = green;
+        rgb_matrix_ws2812_array[i].b = blue;
+    }
+#    endif
+}
+
+// clang-format off
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init          = rgb_matrix_driver_init,
+    .flush         = rgb_matrix_driver_flush,
+    .set_color     = rgb_matrix_driver_set_color,
+    .set_color_all = rgb_matrix_driver_set_color_all,
+};
+// clang-format on
+
+#endif /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.h
new file mode 100644
index 0000000000..75e30bab52
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.h
@@ -0,0 +1,32 @@
+/* Copyright 2021 bdtc123
+ *
+ * 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_60_iso_arrow( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        \
+    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           \
+    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K1D,   \
+    K30,  K43, K31, K32, K33, K34, K35, K36, K37, K38, K39,  K3B,    K3C, K3D,   \
+    K40,  K41,  K42,              K45,                K49, K4A, K4B, K4C, K4D    \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C, KC_NO   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39, KC_NO,   K3B,   K3C,   K3D   }, \
+    { K40,   K41,   K42,   K43,   KC_NO, K45, KC_NO,   KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   K4D   }, \
+}
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
new file mode 100644
index 0000000000..8ac7dd5a51
--- /dev/null
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk
@@ -0,0 +1,31 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes
+
+
+# RGB Matrix is required to support per-key LEDs connected to IS31FL3733.
+RGB_MATRIX_ENABLE = yes
+
+# The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are
+# normally done by common_features.mk for both of these drivers need to be done
+# here manually.
+RGB_MATRIX_DRIVER = custom
+COMMON_VPATH += $(DRIVER_PATH)/led/issi
+SRC += is31fl3733.c
+QUANTUM_LIB_SRC += i2c_master.c
+WS2812_DRIVER_REQUIRED = yes

From 95d08b463654c0e614abadb5a552dc49b4395d7e Mon Sep 17 00:00:00 2001
From: Ibnu Daru Aji <ibnuda@users.noreply.github.com>
Date: Sat, 25 Dec 2021 08:22:46 +0700
Subject: [PATCH 041/867] [Keyboard] Add Gurindam (#15540)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/gurindam/config.h                  | 117 +++++++++++++++++++
 keyboards/gurindam/gurindam.c                |  16 +++
 keyboards/gurindam/gurindam.h                |  46 ++++++++
 keyboards/gurindam/info.json                 |  82 +++++++++++++
 keyboards/gurindam/keymaps/default/keymap.c  |  34 ++++++
 keyboards/gurindam/keymaps/default/readme.md |   1 +
 keyboards/gurindam/keymaps/via/keymap.c      |  49 ++++++++
 keyboards/gurindam/keymaps/via/rules.mk      |   1 +
 keyboards/gurindam/readme.md                 |  23 ++++
 keyboards/gurindam/rules.mk                  |  18 +++
 10 files changed, 387 insertions(+)
 create mode 100644 keyboards/gurindam/config.h
 create mode 100644 keyboards/gurindam/gurindam.c
 create mode 100644 keyboards/gurindam/gurindam.h
 create mode 100644 keyboards/gurindam/info.json
 create mode 100644 keyboards/gurindam/keymaps/default/keymap.c
 create mode 100644 keyboards/gurindam/keymaps/default/readme.md
 create mode 100644 keyboards/gurindam/keymaps/via/keymap.c
 create mode 100644 keyboards/gurindam/keymaps/via/rules.mk
 create mode 100644 keyboards/gurindam/readme.md
 create mode 100644 keyboards/gurindam/rules.mk

diff --git a/keyboards/gurindam/config.h b/keyboards/gurindam/config.h
new file mode 100644
index 0000000000..9262bdbcda
--- /dev/null
+++ b/keyboards/gurindam/config.h
@@ -0,0 +1,117 @@
+/*
+Copyright 2021 Ibnu D. Aji
+
+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       0x1209
+#define PRODUCT_ID      0x6974
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Ibnu D. Aji
+#define PRODUCT         Gurindam
+
+/* key matrix size */
+#define MATRIX_ROWS 9
+#define MATRIX_COLS 8
+
+/*
+ * 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 { B5, B4, E6, D7, C6, D4, D0, D1, D2}
+#define MATRIX_COL_PINS { F6, F5, F4, F7, B1, B3, B2, B6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 10
+#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
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/keyboards/gurindam/gurindam.c b/keyboards/gurindam/gurindam.c
new file mode 100644
index 0000000000..bdca0269c2
--- /dev/null
+++ b/keyboards/gurindam/gurindam.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Ibnu D. Aji
+ *
+ * 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 "gurindam.h"
diff --git a/keyboards/gurindam/gurindam.h b/keyboards/gurindam/gurindam.h
new file mode 100644
index 0000000000..9967bcf528
--- /dev/null
+++ b/keyboards/gurindam/gurindam.h
@@ -0,0 +1,46 @@
+/* Copyright 2021 Ibnu D. Aji
+ *
+ * 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"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define XXX KC_NO
+#define LAYOUT( \
+	k1,  k6,  k10, k15, k19, k24, k28, k33, k37, k42, k46, k51, k55, k60, k64, k65, \
+	k2,  k7,  k11, k16, k20, k25, k29, k34, k38, k43, k47, k52, k56, k61,      k66, \
+	k3,  k8,  k12, k17, k21, k26, k30, k35, k39, k44, k48, k53, k57,           k62, \
+	k4,  k9,  k13, k18, k22, k27, k31, k36, k40, k45, k49, k54,      k58,           \
+	k5,       k14,      k23, k32,      k41,      k50,           k59, k63, k67       \
+) \
+{ \
+	{ k1, k10, k19, k28, k37, k46, k55, k64 }, \
+	{ k6, k15, k24, k33, k42, k51, k60, XXX }, \
+	{ k2, k11, k20, k29, k38, k47, k56, k65 }, \
+	{ k7, k16, k25, k34, k43, k52, k61, XXX }, \
+	{ k3, k12, k21, k30, k39, k48, k57, k66 }, \
+	{ k8, k17, k26, k35, k44, k53, k62, XXX }, \
+	{ k4, k13, k22, k31, k40, k49, k58, k67 }, \
+	{ k9, k18, k27, k36, k45, k54, k63, XXX }, \
+	{ k5, k14, k23, k32, k41, k50, k59, XXX }  \
+}
diff --git a/keyboards/gurindam/info.json b/keyboards/gurindam/info.json
new file mode 100644
index 0000000000..a196f066e0
--- /dev/null
+++ b/keyboards/gurindam/info.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "gurindam",
+    "url": "https://github.com/ibnuda/gurindam",
+    "maintainer": "Ibnu D. Aji",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+                {"x":16, "y":0},
+                {"x":17.3, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1},
+                {"x":14.5, "y":1},
+                {"x":15.5, "y":1, "w":1.5},
+                {"x":17.3, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":2},
+                {"x":14.75, "y":2, "w":2.25},
+                {"x":17.3, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3},
+                {"x":13.25, "y":3},
+                {"x":14.25, "y":3, "w":1.75},
+                {"x":16.3, "y":3.25},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":3.25, "y":4, "w":1.5},
+                {"x":4.75, "y":4, "w":2},
+                {"x":6.75, "y":4, "w":1.25},
+                {"x":8.75, "y":4, "w":2.75},
+                {"x":11.5, "y":4, "w":1.5},
+                {"x":15.3, "y":4.25},
+                {"x":16.3, "y":4.25},
+                {"x":17.3, "y":4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gurindam/keymaps/default/keymap.c b/keyboards/gurindam/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b451bbf050
--- /dev/null
+++ b/keyboards/gurindam/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2019 Fate
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    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_BSLS,  KC_GRV, 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_BSPC,          KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    MO(1),
+    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_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT(
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,   KC_F11,  KC_F12,  _______, _______, _______,
+    _______, _______, _______, _______, RESET,   RGB_TOG, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
+    _______, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, _______, _______, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,RGB_M_SN,_______,                   _______,
+    _______, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, _______
+  )
+};
diff --git a/keyboards/gurindam/keymaps/default/readme.md b/keyboards/gurindam/keymaps/default/readme.md
new file mode 100644
index 0000000000..52e0c72c53
--- /dev/null
+++ b/keyboards/gurindam/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for gurindam
\ No newline at end of file
diff --git a/keyboards/gurindam/keymaps/via/keymap.c b/keyboards/gurindam/keymaps/via/keymap.c
new file mode 100644
index 0000000000..3549a1bdea
--- /dev/null
+++ b/keyboards/gurindam/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2019 Fate
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    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_BSLS,  KC_GRV, 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_BSPC,          KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                    MO(1),
+    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_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT(
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,   KC_F11,  KC_F12,  _______, _______, _______,
+    _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, _______
+  ),
+
+  [2] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, _______
+  ),
+  [3] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, _______
+  )
+};
diff --git a/keyboards/gurindam/keymaps/via/rules.mk b/keyboards/gurindam/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/gurindam/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gurindam/readme.md b/keyboards/gurindam/readme.md
new file mode 100644
index 0000000000..0f6ae158b0
--- /dev/null
+++ b/keyboards/gurindam/readme.md
@@ -0,0 +1,23 @@
+# gurindam
+
+![Gurindam](https://raw.githubusercontent.com/ibnuda/Gurindam/master-of-puppets/imgs/gurindam-finished.jpg)
+
+A keyboard inspired by Arisu which in turn by Lyn's EM7 and TGR Alice.
+
+* Keyboard Maintainer: [Ibnu D. Aji](https://github.com/ibnuda)
+* Hardware Supported: Promicro
+* Hardware Availability: [PCB & Stacked Acrylic Case](https://github.com/ibnuda/gurindam) & private group-buy.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gurindam: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead.
+* **Keycode in layout**: Hold the mod key (lowest key on the right island) and then tap `R`.
+
diff --git a/keyboards/gurindam/rules.mk b/keyboards/gurindam/rules.mk
new file mode 100644
index 0000000000..afcb13df48
--- /dev/null
+++ b/keyboards/gurindam/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 57a1d04d381e9c71bbd19b21f408cee1a756c1ca Mon Sep 17 00:00:00 2001
From: jonavin <71780717+Jonavin@users.noreply.github.com>
Date: Fri, 24 Dec 2021 20:23:24 -0500
Subject: [PATCH 042/867] [Keymap] Jonavin kbd 67 keymap with advance RGB
 functions (#15527)

Co-authored-by: Jonavin <=>
---
 .../kbd67/mkiirgb/keymaps/jonavin/config.h    |  36 +++++
 .../kbd67/mkiirgb/keymaps/jonavin/keymap.c    | 137 ++++++++++++++++++
 .../kbd67/mkiirgb/keymaps/jonavin/readme.md   |  41 ++++++
 .../mkiirgb/keymaps/jonavin/rgb_matrix_map.h  | 109 ++++++++++++++
 .../kbd67/mkiirgb/keymaps/jonavin/rules.mk    |  10 ++
 users/jonavin/config.h                        |   5 +-
 users/jonavin/readme.md                       |   1 +
 7 files changed, 338 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/config.h
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/readme.md
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/rgb_matrix_map.h
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/rules.mk

diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/config.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/config.h
new file mode 100644
index 0000000000..9d842a7918
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/config.h
@@ -0,0 +1,36 @@
+/* Copyright 2021 Jonavin Eng
+ *
+ * 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 TAPPING_TOGGLE 2
+// TT set to two taps
+
+/*  Handle GRAVESC combo keys */
+#define GRAVE_ESC_ALT_OVERRIDE
+    //Always send Escape if Alt is pressed
+#define GRAVE_ESC_CTRL_OVERRIDE
+    //Always send Escape if Control is pressed
+
+#define TAPPING_TERM 180
+
+#ifdef RGB_MATRIX_ENABLE
+    #ifdef RGB_MATRIX_STARTUP_MODE
+        #undef RGB_MATRIX_STARTUP_MODE
+    #endif
+    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED
+#endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
new file mode 100644
index 0000000000..1b85354be5
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/keymap.c
@@ -0,0 +1,137 @@
+/*   Copyright 2021 Jonavin
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "rgb_matrix_map.h"
+#include "jonavin.h"
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_65_ansi_blocker(
+        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_DEL,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,  KC_RBRC, KC_BSLASH, KC_PGUP,
+      TT(_LOWER), KC_A,     KC_S,     KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,           KC_ENT,    KC_PGDN,
+  KC_LSFTCAPSWIN, KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                             KC_SPC,                    MO(1),   KC_RCTL,            KC_LEFT, KC_DOWN,   KC_RIGHT
+    ),
+    [_FN1] = LAYOUT_65_ansi_blocker(
+        KC_GESC,  KC_F1,    KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,  KC_DEL,    KC_CALC,
+        _______,  RGB_TOG,  RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, KC_PSCR, KC_SLCK, KC_PAUS, _______,  _______,  _______, RESET,     KC_HOME,
+        KC_CAPS,  RGB_SPI,  RGB_SPD, RGB_VAD,  RGB_VAI, _______, _______, _______, _______, _______, _______,  _______,           EEP_RST,   KC_END,
+        KC_LSFT,  RGB_NITE, _______, _______,  _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, KC_MPLY,  _______,           KC_VOLU,   KC_MUTE,
+        _______,  KC_WINLCK, _______,                   _______,                            _______, _______,            KC_MPRV, KC_VOLD,   KC_MNXT
+    ),
+    [_LOWER] = LAYOUT_65_ansi_blocker(
+        KC_TILD,  _______,  _______, _______,  _______,  _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_PMNS,  KC_PPLS, _______,   _______,
+        _______,  KC_HOME,  KC_UP,   KC_END,   KC_PGUP,  _______, KC_TAB,  KC_P4,   KC_P5,   KC_P6,   KC_PDOT, _______,  _______, _______,   KC_HOME,
+        _______,  KC_LEFT,  KC_DOWN, KC_RGHT,  KC_PGDN,  _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_NO,   KC_PAST,           KC_PENT,   KC_END,
+        _______,  KC_NO,    KC_DEL,  KC_INS,   KC_NO,    KC_NO,   KC_NO,   KC_P0,   KC_00,   KC_PDOT, KC_PSLS, _______,           _______,   _______,
+        _______,  _______,  _______,                              KC_BSPC,                   _______, _______,           _______, _______,   _______
+    ),
+    [_RAISE] = LAYOUT_65_ansi_blocker(
+        _______,  _______,  _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______,
+        _______,  _______,  _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______,
+        _______,  _______,  _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______,           _______,   _______,
+        _______,  _______,  _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______,           _______,   _______,
+        _______,  _______,  _______,                              KC_SPC,                    _______, _______,           _______, _______,   _______
+    ),
+};
+
+#ifdef RGB_MATRIX_ENABLE
+    // Capslock, Scroll lock and Numlock indicator
+    void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+        if (get_rgb_nightmode()) rgb_matrix_set_color_all(RGB_OFF);
+        if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) {
+            rgb_matrix_set_color(LED_I, RGB_GREEN);
+        }
+
+        #ifdef INVERT_NUMLOCK_INDICATOR
+            if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) {   // on if NUM lock is OFF
+                rgb_matrix_set_color(LED_B, RGB_GREEN);
+                rgb_matrix_set_color(LED_N, RGB_GREEN);
+                rgb_matrix_set_color(LED_M, RGB_GREEN);
+            }
+        #else
+            if (IS_HOST_LED_ON(USB_LED_NUM_LOCK)) {   // Normal, on if NUM lock is ON
+                rgb_matrix_set_color(LED_B, RGB_GREEN);
+                rgb_matrix_set_color(LED_N, RGB_GREEN);
+                rgb_matrix_set_color(LED_M, RGB_GREEN);
+            }
+        #endif // INVERT_NUMLOCK_INDICATOR
+
+        if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+            rgb_matrix_set_color(LED_CAPS, RGB_RED);
+            rgb_matrix_set_color(LED_Q, RGB_RED);
+            rgb_matrix_set_color(LED_A, RGB_RED);
+        }
+        if (keymap_config.no_gui) {
+            rgb_matrix_set_color(LED_LCTL, RGB_RED);  //light up Win key when disabled
+            rgb_matrix_set_color(LED_LWIN, RGB_RED);  //light up Win key when disabled
+            rgb_matrix_set_color(LED_LALT, RGB_RED);  //light up Win key when disabled
+        }
+        switch(get_highest_layer(layer_state)){  // special handling per layer
+        case _FN1:  // on Fn layer select what the encoder does when pressed
+            rgb_matrix_set_color(LED_FN, RGB_GOLD);
+            rgb_matrix_set_color(LED_RCTL, RGB_GOLD);
+
+            #ifdef IDLE_TIMEOUT_ENABLE
+                // Add RGB Timeout Indicator -- shows 0 to 139 using num row and qwerty row
+                uint16_t timeout_threshold = get_timeout_threshold();
+                if (timeout_threshold <= 10) rgb_matrix_set_color(LED_LIST_NUMROW[timeout_threshold], RGB_GOLD);
+                else if (timeout_threshold < 140) {
+                    rgb_matrix_set_color(LED_LIST_NUMROW[(timeout_threshold % 10)], RGB_GOLD);
+                    rgb_matrix_set_color(LED_LIST_QWERTYROW[(timeout_threshold / 10)], RGB_GOLD);
+                } else { // >= 140 minutes, just show these 3 lights
+                    rgb_matrix_set_color(LED_LIST_NUMROW[10], RGB_GOLD);
+                    rgb_matrix_set_color(LED_LIST_NUMROW[11], RGB_GOLD);
+                    rgb_matrix_set_color(LED_LIST_NUMROW[12], RGB_GOLD);
+                }
+            #endif // IDLE_TIMEOUT_ENABLE
+
+            break;
+        case _LOWER:
+            for (uint8_t i=0; i<ARRAYSIZE(LED_LIST_NUMPAD); i++) {
+                rgb_matrix_set_color(LED_LIST_NUMPAD[i], RGB_BLUE);
+            }
+            for (uint8_t i=0; i<ARRAYSIZE(LED_LIST_WASD); i++) {
+                rgb_matrix_set_color(LED_LIST_WASD[i], RGB_BLUE);
+            }
+            break;
+        case _RAISE:
+            rgb_matrix_set_color(LED_SPC, RGB_GREEN);
+            break;
+        default:
+            break;
+        }
+    }
+
+    void suspend_power_down_user(void) {
+        rgb_matrix_set_suspend_state(true);
+    }
+
+    void suspend_wakeup_init_user(void) {
+        rgb_matrix_set_suspend_state(false);
+    }
+#endif
+
+
+void keyboard_post_init_keymap(void) {
+    // keyboard_post_init_user() moved to userspace
+    #ifdef RGB_MATRIX_ENABLE
+        rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);
+        activate_rgb_nightmode(false);  // Set to true if you want to startup in nightmode, otherwise use Fn + Z to toggle
+    #endif
+}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/readme.md b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/readme.md
new file mode 100644
index 0000000000..a28e945cd1
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/readme.md
@@ -0,0 +1,41 @@
+# jonavin's KBD 67 Lite keymap
+
+NOTE: This keymap uses features from qmk userspace in user/jonavin.  I fyou copy this keymap you should also the user folder.
+
+- Add PrtScr, Scroll Lock, Break, NumLock to Fn layer
+- add double tap of Left Shift to toggle Caps Lock
+- Implement Win key lock using Fn+Win 
+- Layer 2 mod on Caps Lock with double-tap to switch to this layer, double tap to switch back
+- Layer 2 provides arrows on WASD and additional nav keys + right hand numpad with 00; an be used for Alt Code entry
+- Layer 2 spacebar Backspace
+    
+- LED/RGB Functionality
+    - RGB idle timeout (default 5 minutes)
+        - Can be changed in FN layer with < and >
+        - setting to zero disables timeout
+        - indicators in FN layer using RGB in number and qwerty rows to show the timeout in minutes
+    - LED address location map as enum definition in rgb_matrix_map.h
+    - LED group lists for arrows, numpad, qwerty row, num row LEDs
+    - default startup in single colour mode 
+    - Capslock, Scroll Lock, and Num Lock (not set) indicator
+    - Fn key light up GOLD when Fn layer activate
+    - Win Key light up red when Win Lock mode enabled
+    - Layer 2 activation lights up Numpad area
+    - Fn + Z to turn off all RGB lights except rgb indicators; press again to toggle
+
+rules.mk OPTIONS - Active features from userspace
+STARTUP_NUMLOCK_ON = yes
+    - turns on NUMLOCK by default
+
+TD_LSFT_CAPSLOCK_ENABLE = yes
+    - This will enable double tap on Left Shift to toggle CAPSLOCK when using KC_LSFTCAPS
+
+IDLE_TIMEOUT_ENABLE = yes
+    - Enables Timer functionality; for RGB idle timeouts that can be changed dynamically
+
+INVERT_NUMLOCK_INDICATOR = yes
+    - inverts the Num lock indicator, LED is on when num lock is off
+
+## All layers diagram
+![image](https://user-images.githubusercontent.com/71780717/146864247-4ec05ef7-7936-45db-9db9-02fb17d3f7ed.png)
+
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/rgb_matrix_map.h b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/rgb_matrix_map.h
new file mode 100644
index 0000000000..66608ba6e6
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/rgb_matrix_map.h
@@ -0,0 +1,109 @@
+/* Copyright 2021 Jonavin Eng
+ *
+ * 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/>.
+ */
+
+#ifdef RGB_MATRIX_ENABLE
+
+    // Custom RGB Colours
+    #define RGB_GODSPEED 0x00, 0xE4, 0xFF // colour for matching keycaps
+    #define RGB_NAUTILUS 0x00, 0xA4, 0xA9 // Naurilus Font colours
+    #define RGB_PURPLELITE 0x80, 0x00, 0x80 // Purple colours
+
+    // RGB LED locations
+    enum led_location_map {
+        LED_ESC, // 0
+        LED_1,  // 1
+        LED_2,  // 2
+        LED_3,  // 3
+        LED_4,  // 4
+        LED_5,  // 5
+        LED_6,  // 6
+        LED_7,  // 7
+        LED_8,  // 8
+        LED_9,  // 9
+        LED_0,  // 10
+        LED_MINS,   // 11
+        LED_EQL,    // 12
+        LED_BSPC,   // 13
+        LED_DEL,    // 14
+        LED_TAB,    // 15
+        LED_Q,  // 16
+        LED_W,  // 17
+        LED_E,  // 18
+        LED_R,  // 19
+        LED_T,  // 20
+        LED_Y,  // 21
+        LED_U,  // 22
+        LED_I,  // 23
+        LED_O,  // 24
+        LED_P,  // 25
+        LED_LBRC,   // 26  [
+        LED_RBRC,   // 27  ]
+        LED_BSLS,   // 28  |
+        LED_PGUP,   // 29
+        LED_CAPS,   // 30
+        LED_A,  // 31
+        LED_S,  // 32
+        LED_D,  // 33
+        LED_F,  // 34
+        LED_G,  // 35
+        LED_H,  // 36
+        LED_J,  // 37
+        LED_K,  // 38
+        LED_L,  // 39
+        LED_SCLN, // 40    ;
+        LED_QUOT, // 41    "
+        LED_ENT, // 42
+        LED_PGDN,   // 43
+        LED_LSFT,   // 44
+        LED_Z,  // 45
+        LED_X,  // 46
+        LED_C,  // 47
+        LED_V,  // 48
+        LED_B,  // 49
+        LED_N,  // 50
+        LED_M,  // 51
+        LED_COMM, // 52  ,
+        LED_DOT,    // 53  .
+        LED_SLSH,   // 54 /
+        LED_RSFT,   // 55
+        LED_UP, // 56
+        LED_END, // 57
+        LED_LCTL, // 58
+        LED_LWIN, // 59
+        LED_LALT, // 60
+        LED_SPC, // 61
+        LED_FN, // 62
+        LED_RCTL, // 63
+        LED_LEFT, // 64
+        LED_DOWN, // 65
+        LED_RIGHT // 66
+    };
+
+    const uint8_t LED_LIST_WASD[] = { LED_W, LED_A, LED_S, LED_D };
+
+    const uint8_t LED_LIST_ARROWS[] = { LED_LEFT, LED_RIGHT, LED_UP, LED_DOWN };
+
+    const uint8_t LED_LIST_NUMROW[] = { LED_ESC, LED_1, LED_2, LED_3, LED_4, LED_5, LED_6, LED_7, LED_8, LED_9, LED_0, LED_MINS, LED_EQL, LED_BSPC, LED_DEL};
+    const uint8_t LED_LIST_QWERTYROW[] = { LED_TAB, LED_Q, LED_W, LED_E, LED_R, LED_T, LED_Y, LED_U, LED_I, LED_O, LED_P, LED_LBRC, LED_RBRC, LED_BSLS, LED_PGUP};
+
+    const uint8_t LED_LIST_NUMPAD[] = {
+        LED_7, LED_8, LED_9,
+        LED_U, LED_I, LED_O,
+        LED_J, LED_K, LED_L,
+        LED_M, LED_COMM, LED_DOT
+        };
+
+#endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/rules.mk
new file mode 100644
index 0000000000..91153c75a3
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/keymaps/jonavin/rules.mk
@@ -0,0 +1,10 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+MOUSEKEY_ENABLE = no
+TAP_DANCE_ENABLE = yes
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+
+TD_LSFT_CAPSLOCK_ENABLE = yes
+IDLE_TIMEOUT_ENABLE = yes
+STARTUP_NUMLOCK_ON = yes
+INVERT_NUMLOCK_INDICATOR = yes
diff --git a/users/jonavin/config.h b/users/jonavin/config.h
index 7b6e335e3c..d694bc5371 100644
--- a/users/jonavin/config.h
+++ b/users/jonavin/config.h
@@ -26,6 +26,9 @@
 #define TAPPING_TERM_PER_KEY
 
 #ifdef RGB_MATRIX_ENABLE
+    #ifdef RGB_MATRIX_STARTUP_MODE
+        #undef RGB_MATRIX_STARTUP_MODE
+    #endif
     #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #endif
diff --git a/users/jonavin/readme.md b/users/jonavin/readme.md
index 8ec0e0ea16..7712eda1eb 100644
--- a/users/jonavin/readme.md
+++ b/users/jonavin/readme.md
@@ -119,6 +119,7 @@ LIST OF COMPATIBLE KEYMAPS
 - mechwild/mercutio
 - mechwild/murphpad
 - mechwild/OBE
+- kbdfans/kdb67
 - nopunin10did/kastenwagen (*)
 
     (*) coming soon

From 17c87710002c3993ce86f8dc6a96c940dedc1da8 Mon Sep 17 00:00:00 2001
From: minibois <themrminimario@gmail.com>
Date: Sat, 25 Dec 2021 02:27:16 +0100
Subject: [PATCH 043/867] [Keyboard] Add mini_ten_key_plus (#15568)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/mini_ten_key_plus/config.h          | 110 ++++++++++++++++++
 keyboards/mini_ten_key_plus/info.json         |  25 ++++
 .../keymaps/default/keymap.c                  |  32 +++++
 .../keymaps/default/readme.md                 |   2 +
 .../keymaps/standard_numpad/keymap.c          |  32 +++++
 .../keymaps/standard_numpad/readme.md         |   2 +
 .../mini_ten_key_plus/mini_ten_key_plus.c     |  15 +++
 .../mini_ten_key_plus/mini_ten_key_plus.h     |  78 +++++++++++++
 keyboards/mini_ten_key_plus/readme.md         |  24 ++++
 keyboards/mini_ten_key_plus/rules.mk          |  19 +++
 10 files changed, 339 insertions(+)
 create mode 100644 keyboards/mini_ten_key_plus/config.h
 create mode 100644 keyboards/mini_ten_key_plus/info.json
 create mode 100644 keyboards/mini_ten_key_plus/keymaps/default/keymap.c
 create mode 100644 keyboards/mini_ten_key_plus/keymaps/default/readme.md
 create mode 100644 keyboards/mini_ten_key_plus/keymaps/standard_numpad/keymap.c
 create mode 100644 keyboards/mini_ten_key_plus/keymaps/standard_numpad/readme.md
 create mode 100644 keyboards/mini_ten_key_plus/mini_ten_key_plus.c
 create mode 100644 keyboards/mini_ten_key_plus/mini_ten_key_plus.h
 create mode 100644 keyboards/mini_ten_key_plus/readme.md
 create mode 100644 keyboards/mini_ten_key_plus/rules.mk

diff --git a/keyboards/mini_ten_key_plus/config.h b/keyboards/mini_ten_key_plus/config.h
new file mode 100644
index 0000000000..92ac355fe8
--- /dev/null
+++ b/keyboards/mini_ten_key_plus/config.h
@@ -0,0 +1,110 @@
+/*
+Copyright 2021 minibois
+
+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 minibois
+#define PRODUCT      mini_ten_key_plus
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 5
+
+/*
+ * 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 { D4, B1, B5, B4, E6 }
+#define MATRIX_COL_PINS { F5, F4, B6, D7, C6 }
+#define ENCODERS_PAD_A { F7 }
+#define ENCODERS_PAD_B { F6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
+
+#define ENCODER_RESOLUTION 2
diff --git a/keyboards/mini_ten_key_plus/info.json b/keyboards/mini_ten_key_plus/info.json
new file mode 100644
index 0000000000..c300a0bcff
--- /dev/null
+++ b/keyboards/mini_ten_key_plus/info.json
@@ -0,0 +1,25 @@
+{
+    "keyboard_name": "mini_ten_key_plus",
+    "url": "https://github.com/minibois/ten-key-plus",
+    "maintainer": "minibois",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout":[
+                {"label":"Esc", "x":0, "y":0}      ,{"label":"Calculator", "x":1, "y":0},{"label":"/", "x":2, "y":0},{"label":"*", "x":3, "y":0},{"label":"-", "x":4, "y":0},
+                {"label":"Backspace", "x":0, "y":1},{"label":"7", "x":1, "y":1}         ,{"label":"8", "x":2, "y":1},{"label":"9", "x":3, "y":1},{"label":"+", "x":4, "y":1},
+                {"label":"(", "x":0, "y":2}        ,{"label":"4", "x":1, "y":2}         ,{"label":"5", "x":2, "y":2},{"label":"6", "x":3, "y":2},{"label":"+", "x":4, "y":2},
+                {"label":")", "x":0, "y":3}        ,{"label":"1", "x":1, "y":3}         ,{"label":"2", "x":2, "y":3},{"label":"3", "x":3, "y":3},{"label":"Enter", "x":4, "y":3},
+                {"label":"y", "x":0, "y":4}        ,{"label":"00", "x":1, "y":4}        ,{"label":"0", "x":2, "y":4},{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":4},
+            ]
+        },
+        "LAYOUT_standard_numpad": {
+            "layout":[
+                {"label":"Esc", "x":0, "y":0}      ,{"label":"Calculator", "x":1, "y":0},{"label":"/", "x":2, "y":0},{"label":"*", "x":3, "y":0},{"label":"-", "x":4, "y":0},
+                {"label":"Backspace", "x":0, "y":1},{"label":"7", "x":1, "y":1}         ,{"label":"8", "x":2, "y":1},{"label":"9", "x":3, "y":1},
+                {"label":"(", "x":0, "y":2}        ,{"label":"4", "x":1, "y":2}         ,{"label":"5", "x":2, "y":2},{"label":"6", "x":3, "y":2},{"label":"+", "x":4, "y":2, "h":2},
+                {"label":")", "x":0, "y":3}        ,{"label":"1", "x":1, "y":3}         ,{"label":"2", "x":2, "y":3},{"label":"3", "x":3, "y":3},
+                {"label":"y", "x":0, "y":4}        ,{"label":"0", "x":1, "y":4 ,"w":2}  ,{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":3, "h":2},
+            ]
+        }
+    }
+}
diff --git a/keyboards/mini_ten_key_plus/keymaps/default/keymap.c b/keyboards/mini_ten_key_plus/keymaps/default/keymap.c
new file mode 100644
index 0000000000..dee77629aa
--- /dev/null
+++ b/keyboards/mini_ten_key_plus/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2021 minibois (@minibois)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Keymap _BASE: (Base Layer) Default Layer
+     * ,-------------------.
+     * |Esc|Cal| / | * | - |
+     * |--------------------
+     * | BS| 7 | 8 | 9 | + |
+     * |--------------------
+     * | ( | 4 | 5 | 6 | + |
+     * |--------------------
+     * | ) | 1 | 2 | 3 |Ent|
+     * |--------------------
+     * | Y | 00| 0 | . |Ent|
+     * `-------------------'
+     */
+    [_BASE] = LAYOUT_all(
+        KC_ESC,  KC_CALC, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_BSPC,  KC_P7, KC_P8, KC_P9, KC_PPLS,
+        KC_LEFT_PAREN,  KC_P4, KC_P5, KC_P6, KC_PPLS,
+        KC_RIGHT_PAREN,  KC_P1, KC_P2, KC_P3, KC_PENT,
+        KC_Y,  KC_P0, KC_P0, KC_PDOT, KC_PENT
+    )
+};
diff --git a/keyboards/mini_ten_key_plus/keymaps/default/readme.md b/keyboards/mini_ten_key_plus/keymaps/default/readme.md
new file mode 100644
index 0000000000..a8f697f2cb
--- /dev/null
+++ b/keyboards/mini_ten_key_plus/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# The default 1u keymap for mini_ten_key_plus
+![mini_ten_key_plus](https://imgur.com/VuSTwfC.png)
\ No newline at end of file
diff --git a/keyboards/mini_ten_key_plus/keymaps/standard_numpad/keymap.c b/keyboards/mini_ten_key_plus/keymaps/standard_numpad/keymap.c
new file mode 100644
index 0000000000..cc3fa03da1
--- /dev/null
+++ b/keyboards/mini_ten_key_plus/keymaps/standard_numpad/keymap.c
@@ -0,0 +1,32 @@
+// Copyright 2021 minibois (@minibois)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Keymap _BASE: (Base Layer) Default Layer
+     * ,-------------------.
+     * |Esc|Cal| / | * | - |
+     * |--------------------
+     * | BS| 7 | 8 | 9 | + |
+     * |----------------   |
+     * | ( | 4 | 5 | 6 |   |
+     * |--------------------
+     * | ) | 1 | 2 | 3 |Ent|
+     * |----------------   |
+     * | Y | 0     | . |   |
+     * `-------------------'
+     */
+    [_BASE] = LAYOUT_standard_numpad(
+        KC_ESC,  KC_CALC, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_BSPC,  KC_P7, KC_P8, KC_P9,
+        KC_LEFT_PAREN,  KC_P4, KC_P5, KC_P6, KC_PPLS,
+        KC_RIGHT_PAREN,  KC_P1, KC_P2, KC_P3,
+        KC_Y,  KC_P0, KC_PDOT, KC_PENT
+    )
+};
diff --git a/keyboards/mini_ten_key_plus/keymaps/standard_numpad/readme.md b/keyboards/mini_ten_key_plus/keymaps/standard_numpad/readme.md
new file mode 100644
index 0000000000..2cb470bef8
--- /dev/null
+++ b/keyboards/mini_ten_key_plus/keymaps/standard_numpad/readme.md
@@ -0,0 +1,2 @@
+# The standard numpad keymap for mini_ten_key_plus
+![mini_ten_key_plus](https://imgur.com/x2BUc9J.png)
\ No newline at end of file
diff --git a/keyboards/mini_ten_key_plus/mini_ten_key_plus.c b/keyboards/mini_ten_key_plus/mini_ten_key_plus.c
new file mode 100644
index 0000000000..b2b7456b53
--- /dev/null
+++ b/keyboards/mini_ten_key_plus/mini_ten_key_plus.c
@@ -0,0 +1,15 @@
+// Copyright 2021 minibois (@minibois)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "mini_ten_key_plus.h"
+
+/* Rotary Encoder's function (currently volume up/down) */
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+        if (clockwise) {
+            tap_code16(KC_RIGHT_PAREN);
+        } else {
+            tap_code16(KC_LEFT_PAREN);
+        }
+    return true;
+}
\ No newline at end of file
diff --git a/keyboards/mini_ten_key_plus/mini_ten_key_plus.h b/keyboards/mini_ten_key_plus/mini_ten_key_plus.h
new file mode 100644
index 0000000000..fef3b6a8c3
--- /dev/null
+++ b/keyboards/mini_ten_key_plus/mini_ten_key_plus.h
@@ -0,0 +1,78 @@
+/* Copyright 2021 minibois
+ *
+ * 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"
+
+// readability
+#define ___ KC_NO
+
+/* Default
+ * ,-------------------.
+ * |00 |01 |02 |03 |04 |
+ * |-------------------|
+ * |10 |11 |12 |13 |14 |
+ * |-------------------|
+ * |20 |21 |22 |23 |24 |
+ * |-------------------|
+ * |30 |31 |32 |33 |34 |
+ * |-------------------|
+ * |40 |41 |42 |43 |44 |
+ * `-------------------'
+*/
+#define LAYOUT_all( \
+        k00, k01, k02, k03, k04 , \
+        k10, k11, k12, k13, k14 , \
+        k20, k21, k22, k23, k24 , \
+        k30, k31, k32, k33, k34 , \
+        k40, k41, k42, k43, k44   \
+) \
+{ \
+    {   k00, k01, k02, k03, k04,   },  \
+    {   k10, k11, k12, k13, k14,   },  \
+    {   k20, k21, k22, k23, k24,   },  \
+    {   k30, k31, k32, k33, k34,   },  \
+    {   k40, k41, k42, k43, k44,   }   \
+}
+
+/* Standard Numpad
+ * ,-------------------.
+ * |00 |01 |02 |03 |04 |
+ * |-------------------|
+ * |10 |11 |12 |13 |   |
+ * |---------------|14 |
+ * |20 |21 |22 |23 |   |
+ * |-------------------|
+ * |30 |31 |32 |33 |   |
+ * |---------------|34 |
+ * |40 |  41   |43 |   |
+ * `-------------------'
+*/
+#define LAYOUT_standard_numpad( \
+        k00, k01, k02, k03, k04 , \
+        k10, k11, k12, k13,       \
+        k20, k21, k22, k23, k24 , \
+        k30, k31, k32, k33,       \
+        k40,      k42, k43, k44   \
+) \
+{ \
+    {   k00, k01, k02, k03, k04,   },  \
+    {   k10, k11, k12, k13, ___,   },  \
+    {   k20, k21, k22, k23, k24,   },  \
+    {   k30, k31, k32, k33, ___,   },  \
+    {   k40, ___, k42, k43, k44,   }   \
+}
diff --git a/keyboards/mini_ten_key_plus/readme.md b/keyboards/mini_ten_key_plus/readme.md
new file mode 100644
index 0000000000..12afcc4f12
--- /dev/null
+++ b/keyboards/mini_ten_key_plus/readme.md
@@ -0,0 +1,24 @@
+# mini_ten_key_plus
+
+![mini_ten_key_plus](https://imgur.com/QtFFONgl.jpg)
+
+A 5x5 numpad/macropad, with support for a rotary encoder running on a Pro Micro.
+
+* Keyboard Maintainer: [minibois](https://github.com/minibois)
+* Hardware Supported: mini_ten_key_plus PCB, Pro Micro (or equivalent), 3D printed case, 22 - 25 MX (like) switches, PCB mount stabilizers
+* Hardware Availability: https://github.com/minibois/ten-key-plus
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mini_ten_key_plus:default
+
+Flashing example for this keyboard:
+
+    make mini_ten_key_plus:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader:
+* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/mini_ten_key_plus/rules.mk b/keyboards/mini_ten_key_plus/rules.mk
new file mode 100644
index 0000000000..77d9fdb410
--- /dev/null
+++ b/keyboards/mini_ten_key_plus/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes

From 36db7457b299d91f665f931a5f60bd059ada0210 Mon Sep 17 00:00:00 2001
From: Arturo Avila <69410272+ADPenrose@users.noreply.github.com>
Date: Fri, 24 Dec 2021 19:33:47 -0600
Subject: [PATCH 044/867] [Keyboard] Add Kintsugi keyboard (#15439)

---
 keyboards/adpenrose/kintsugi/config.h         | 146 +++++++++++
 keyboards/adpenrose/kintsugi/info.json        |  80 ++++++
 .../kintsugi/keymaps/default/keymap.c         |  48 ++++
 .../kintsugi/keymaps/default/readme.md        |   1 +
 .../kintsugi/keymaps/franky/keymap.c          | 164 ++++++++++++
 .../kintsugi/keymaps/franky/readme.md         |   1 +
 .../kintsugi/keymaps/franky/rules.mk          |   3 +
 .../adpenrose/kintsugi/keymaps/via/keymap.c   |  62 +++++
 .../adpenrose/kintsugi/keymaps/via/readme.md  |   1 +
 .../adpenrose/kintsugi/keymaps/via/rules.mk   |   2 +
 keyboards/adpenrose/kintsugi/kintsugi.c       |  74 ++++++
 keyboards/adpenrose/kintsugi/kintsugi.h       |  46 ++++
 .../adpenrose/kintsugi/lib/kintsugifont.c     | 244 ++++++++++++++++++
 keyboards/adpenrose/kintsugi/post_config.h    |  21 ++
 keyboards/adpenrose/kintsugi/readme.md        |  37 +++
 keyboards/adpenrose/kintsugi/rules.mk         |  21 ++
 16 files changed, 951 insertions(+)
 create mode 100644 keyboards/adpenrose/kintsugi/config.h
 create mode 100644 keyboards/adpenrose/kintsugi/info.json
 create mode 100644 keyboards/adpenrose/kintsugi/keymaps/default/keymap.c
 create mode 100644 keyboards/adpenrose/kintsugi/keymaps/default/readme.md
 create mode 100644 keyboards/adpenrose/kintsugi/keymaps/franky/keymap.c
 create mode 100644 keyboards/adpenrose/kintsugi/keymaps/franky/readme.md
 create mode 100644 keyboards/adpenrose/kintsugi/keymaps/franky/rules.mk
 create mode 100644 keyboards/adpenrose/kintsugi/keymaps/via/keymap.c
 create mode 100644 keyboards/adpenrose/kintsugi/keymaps/via/readme.md
 create mode 100644 keyboards/adpenrose/kintsugi/keymaps/via/rules.mk
 create mode 100644 keyboards/adpenrose/kintsugi/kintsugi.c
 create mode 100644 keyboards/adpenrose/kintsugi/kintsugi.h
 create mode 100644 keyboards/adpenrose/kintsugi/lib/kintsugifont.c
 create mode 100644 keyboards/adpenrose/kintsugi/post_config.h
 create mode 100644 keyboards/adpenrose/kintsugi/readme.md
 create mode 100644 keyboards/adpenrose/kintsugi/rules.mk

diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h
new file mode 100644
index 0000000000..cbd38b6664
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/config.h
@@ -0,0 +1,146 @@
+/*
+Copyright 2021 adpenrose
+
+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    0x4450 // "ADP"
+#define PRODUCT_ID   0x0001 // 'Cause it's my first keeb
+#define DEVICE_VER   0x0001
+#define MANUFACTURER adpenrose
+#define PRODUCT      Kintsugi
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+/*
+ * 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 { B0, E6, D7, C6, D4, D2, F4, F5, B5, B4 }
+#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6, F0 }
+#define UNUSED_PINS { D3, C7 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*Rotary encoder - set the resolution fitting your encoder.
+Most will need a value of 4. If 1 encoder click results in 2 keycodes sent
+increase the value. If you need 2 clicks for 1 keycode, decrease*/
+#define ENCODER_RESOLUTION 4
+#define ENCODERS_PAD_A { B7 }
+#define ENCODERS_PAD_B { D5 }
+#define TAP_CODE_DELAY 10
+
+/* Underglow options: */
+#define RGB_DI_PIN F1
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 16
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+// #    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json
new file mode 100644
index 0000000000..0e76187335
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/info.json
@@ -0,0 +1,80 @@
+{
+    "keyboard_name": "Kintsugi",
+    "url": "https://github.com/ADPenrose/kintsugi_keeb",
+    "maintainer": "adpenrose",
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+              {"label":"Esc", "x":0, "y":0},
+              {"label":"1", "x":1, "y":0},
+              {"label":"2", "x":2, "y":0},
+              {"label":"3", "x":3, "y":0},
+              {"label":"4", "x":4, "y":0},
+              {"label":"5", "x":5, "y":0},
+              {"label":"6", "x":6, "y":0},
+              {"label":"7", "x":7, "y":0},
+              {"label":"8", "x":8, "y":0},
+              {"label":"9", "x":9, "y":0},
+              {"label":"0", "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":"\\", "x":13.5, "y":1, "w":1.5},
+
+              {"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":"Enc", "x":15, "y":2},
+
+              {"label":"LShift", "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":"RShift", "x":12.25, "y":3, "w":1.75},
+              {"label":"Up", "x":14, "y":3},
+              {"label":"M1", "x":15, "y":3},
+
+              {"label":"LCtrl", "x":0, "y":4, "w":1.25},
+              {"label":"LSuper", "x":1.25, "y":4, "w":1.25},
+              {"label":"LAlt", "x":2.5, "y":4, "w":1.25},
+              {"label":"Space", "x":3.75, "y":4, "w":6.25},
+              {"label":"L1", "x":10, "y":4, "w":1.5},
+              {"label":"L2", "x":11.5, "y":4, "w":1.5},
+              {"label":"Left", "x":13, "y":4},
+              {"label":"Down", "x":14, "y":4},
+              {"label":"Right", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7e03701461
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 adpenrose
+ *
+ * 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
+
+/* Base layout:
+ * ,---------------------------------------------------------------------|
+ * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0   |-   |=  |Backspace| OLED|
+ * |---------------------------------------------------------------      |
+ * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  | ]  |   \      OLED|
+ * |---------------------------------------------------------------------|
+ * |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |  Enter     | ENC |
+ * |---------------------------------------------------------------------|
+ * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift       |Up| M1 |
+ * |---------------------------------------------------------------------|
+ * |Ctrl|GUI |Alt |     Space                 |Alt |MO(1)|   |Lt |Dn |Rt |
+ * `---------------------------------------------------------------------|'
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_65_ansi_blocker(
+          KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,
+          KC_TAB,  KC_A,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
+          KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,   KC_ENT,           KC_MUTE,
+          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_DEL,
+          KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                   KC_RALT, MO(1),           KC_LEFT, KC_DOWN,  KC_RIGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker(
+      _______,    KC_F1,      KC_F2,      KC_F3,      KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,     KC_F11,   KC_F12,  KC_DEL,
+      _______,  RGB_TOG,    RGB_VAI,    RGB_VAD,    RGB_MODE_FORWARD,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      RESET,    _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MPLY,
+      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
+      _______,  _______,    _______,                                        KC_SPC,                        _______,    _______,              _______,  _______,  _______
+    ),
+};
\ No newline at end of file
diff --git a/keyboards/adpenrose/kintsugi/keymaps/default/readme.md b/keyboards/adpenrose/kintsugi/keymaps/default/readme.md
new file mode 100644
index 0000000000..83bc48086d
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Kintsugi
diff --git a/keyboards/adpenrose/kintsugi/keymaps/franky/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/franky/keymap.c
new file mode 100644
index 0000000000..55098afbfd
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/keymaps/franky/keymap.c
@@ -0,0 +1,164 @@
+/* Copyright 2021 adpenrose
+ *
+ * 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
+
+/* Base layout:
+ * ,---------------------------------------------------------------------|
+ * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0   |-   |=  |Backspace| OLED|
+ * |---------------------------------------------------------------      |
+ * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  | ]  |   \      OLED|
+ * |---------------------------------------------------------------------|
+ * |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |  Enter     | ENC |
+ * |---------------------------------------------------------------------|
+ * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift       |Up| M1 |
+ * |---------------------------------------------------------------------|
+ * |Ctrl|GUI |Alt |     Space               |MO(2) |MO(3)|   |Lt |Dn |Rt |
+ * `---------------------------------------------------------------------|'
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_65_ansi_blocker(
+          KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,
+          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
+          KC_LGUI, 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_MUTE,
+          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_DEL,
+          KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                   MO(2), MO(3),           KC_LEFT, KC_DOWN,  KC_RIGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker(
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            _______,
+      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
+      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
+    ),
+    [2] = LAYOUT_65_ansi_blocker(
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            _______,
+      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
+      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
+    ),
+    [3] = LAYOUT_65_ansi_blocker(
+      _______,    KC_F1,      KC_F2,      KC_F3,      KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,     KC_F11,   KC_F12,  _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,   
+      RESET,    _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MPLY,
+      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
+      _______,  _______,    _______,                            KC_SPC,                                    _______,    _______,              _______,  _______,  _______
+    ),
+};
+
+/* Encoder */
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    static uint8_t selected_layer = 0; /* Used to change the layer using the encoder. */
+
+    if (clockwise){
+        /* Check if left shift is pressed: */
+        if (selected_layer < 3 && get_mods() & MOD_BIT(KC_LSFT)){
+            selected_layer ++;
+            layer_move(selected_layer); /* Jump up one layer. */
+        } else {
+            /* If shift isn't pressed, encoder will do this stuff: */
+            switch (get_highest_layer(layer_state)){
+                case 3:
+                    tap_code(KC_MNXT);
+                    break;
+                default:
+                    tap_code(KC_VOLU);
+                    break;
+            }
+        }
+    } else {
+        /* Check if left shift is pressed: */
+        if (selected_layer > 0 && get_mods() & MOD_BIT(KC_LSFT)){
+            selected_layer --;
+            layer_move(selected_layer); /* Go down one layer. */
+        } else {
+            /* If shift isn't pressed, encoder will do this stuff: */
+            switch (get_highest_layer(layer_state)){
+                case 3:
+                    tap_code(KC_MPRV);
+                    break;
+                default:
+                    tap_code(KC_VOLD);
+                    break;
+            }
+        }
+    }
+    return false;
+}
+#endif
+
+/* Rotation of the OLED: */
+#ifdef OLED_ENABLE
+/* Function that renders the kintsugi logo in the desired order. */
+static void render_logo(void) {
+    static const char PROGMEM logo_1[] = {
+        0x83, 0x84, 0x85, 0x86, 0x87, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0x00
+    };
+    static const char PROGMEM logo_2[] = {
+        0x88, 0x89, 0x8A, 0x8B, 0x8C, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0x00
+    };
+    static const char PROGMEM logo_3[] = {
+        0x8D, 0x8E, 0x8F, 0x90, 0x91, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0x00
+    };
+    oled_set_cursor(1,0);
+    oled_write_P(logo_1, false);
+    oled_set_cursor(1,4);
+    oled_write_P(logo_2, false);
+    oled_set_cursor(1,8);
+    oled_write_P(logo_3, false);
+}
+
+/* Function that renders the current layer to the user. */
+void render_layer(void) {
+    oled_set_cursor(0,12);
+    switch (get_highest_layer(layer_state)){
+        case 0:
+            oled_write_P(PSTR("_BASE"), false);
+            break;
+        case 1:
+            oled_write_P(PSTR("_KCAD"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("_NMPD"), false);
+            break;
+        case 3:
+            oled_write_P(PSTR("_FNCT"), false);
+            break;
+        default:
+            oled_write_P(PSTR("_OhNo"), false);
+            break;
+    }
+}
+
+/* The following function displays wpm to the user. */
+void render_wpm(void) {
+    oled_set_cursor(1,14);
+    oled_write(get_u8_str(get_current_wpm(), '0'), false);
+    oled_set_cursor(1,15);
+    oled_write_P(PSTR("WPM"), false);
+}
+
+/* Function that renders stuff on the oled: */
+bool oled_task_user(void) {
+    render_logo();
+    render_layer();
+    render_wpm();
+    return false;
+}
+#endif
diff --git a/keyboards/adpenrose/kintsugi/keymaps/franky/readme.md b/keyboards/adpenrose/kintsugi/keymaps/franky/readme.md
new file mode 100644
index 0000000000..9f44122306
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/keymaps/franky/readme.md
@@ -0,0 +1 @@
+# Franky keymap for Kintsugi. Here to serve as a way to test snippets of code.
diff --git a/keyboards/adpenrose/kintsugi/keymaps/franky/rules.mk b/keyboards/adpenrose/kintsugi/keymaps/franky/rules.mk
new file mode 100644
index 0000000000..7e72249a18
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/keymaps/franky/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+WPM_ENABLE = yes
diff --git a/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c b/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..80764047df
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/keymaps/via/keymap.c
@@ -0,0 +1,62 @@
+/* Copyright 2021 adpenrose
+ *
+ * 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
+
+/* Base layout:
+ * ,---------------------------------------------------------------------|
+ * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0   |-   |=  |Backspace| OLED|
+ * |---------------------------------------------------------------      |
+ * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  | ]  |   \      OLED|
+ * |---------------------------------------------------------------------|
+ * |Caps  |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |  Enter     | ENC |
+ * |---------------------------------------------------------------------|
+ * |Shft    |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |Shift       |Up| M1 |
+ * |---------------------------------------------------------------------|
+ * |Ctrl|GUI |Alt |     Space               |MO(2) |MO(3)|   |Lt |Dn |Rt |
+ * `---------------------------------------------------------------------|'
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_65_ansi_blocker(
+          KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC,
+          KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC, KC_BSLS,
+          KC_LGUI, 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_MUTE,
+          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_DEL,
+          KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                   MO(1),   MO(2),             KC_LEFT, KC_DOWN,  KC_RIGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker(
+      _______,    KC_F1,      KC_F2,      KC_F3,      KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,     KC_F11,   KC_F12,  _______,
+      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, 
+      RESET,    _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MPLY,
+      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
+      _______,  _______,    _______,                            KC_SPC,                                    _______,    _______,              _______,  _______,  _______
+    ),
+    [2] = LAYOUT_65_ansi_blocker(
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            KC_MNXT,
+      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
+      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
+    ),
+    [3] = LAYOUT_65_ansi_blocker(
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,
+      _______,  _______,    _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______,            _______,
+      _______,              _______,    _______,    _______,   _______,   _______,   _______,   _______,   _______,    _______,    _______,  _______, _______,   _______,
+      _______,  _______,    _______,                           _______,                                    _______,    _______,              _______,  _______,  _______
+    ),
+};
diff --git a/keyboards/adpenrose/kintsugi/keymaps/via/readme.md b/keyboards/adpenrose/kintsugi/keymaps/via/readme.md
new file mode 100644
index 0000000000..afdea1ca5b
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/keymaps/via/readme.md
@@ -0,0 +1 @@
+# VIA keymap for Kintsugi
diff --git a/keyboards/adpenrose/kintsugi/keymaps/via/rules.mk b/keyboards/adpenrose/kintsugi/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/adpenrose/kintsugi/kintsugi.c b/keyboards/adpenrose/kintsugi/kintsugi.c
new file mode 100644
index 0000000000..c697793172
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/kintsugi.c
@@ -0,0 +1,74 @@
+/* Copyright 2021 adpenrose
+ *
+ * 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 "kintsugi.h"
+
+/* Encoder */
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { 
+        return false; 
+    }
+/* The switch case allows for different encoder mappings on different layers, "default" map gets applied for all unspecified layers */
+    switch(get_highest_layer(layer_state)){
+        case 1:
+            if (clockwise) {
+                tap_code(KC_MNXT);
+            } else {
+                tap_code(KC_MPRV);
+            }
+            break;
+        default:
+            if (clockwise){
+                tap_code(KC_VOLU);
+            } else{
+                tap_code(KC_VOLD);
+            }
+            break;
+        }
+    return true;
+}
+#endif
+
+/* Rotation of the OLED: */
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_270;
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { 
+        return false; 
+    }
+    /* Kintsugi logo render: */
+    static const char PROGMEM logo_1[] = {
+        0x83, 0x84, 0x85, 0x86, 0x87, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0x00
+    };
+    static const char PROGMEM logo_2[] = {
+        0x88, 0x89, 0x8A, 0x8B, 0x8C, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0x00
+    };
+    static const char PROGMEM logo_3[] = {
+        0x8D, 0x8E, 0x8F, 0x90, 0x91, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0x00
+    };
+    oled_set_cursor(1,3);
+    oled_write_P(logo_1, false);
+    oled_set_cursor(1,7);
+    oled_write_P(logo_2, false);
+    oled_set_cursor(1,11);
+    oled_write_P(logo_3, false);
+    return true;
+}
+#endif
diff --git a/keyboards/adpenrose/kintsugi/kintsugi.h b/keyboards/adpenrose/kintsugi/kintsugi.h
new file mode 100644
index 0000000000..37ce6cc6e5
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/kintsugi.h
@@ -0,0 +1,46 @@
+/* Copyright 2021 adpenrose
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_65_ansi_blocker( \
+  K00, K01, K02, K03, K04, K05, K06, K50, K51, K52, K53, K54, K55, K56, \
+  K10, K11, K12, K13, K14, K15, K16, K60, K61, K62, K63, K64, K65, K66, \
+  K20, K21, K22, K23, K24, K25, K26, K70, K71, K72, K73, K74, K75, K76, \
+  K30, K31, K32, K33, K34, K35, K36, K80, K81, K82, K83, K84, K85, K86, \
+  K40, K41, K42,                K46,           K92, K93, K94, K95, K96  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06 }, \
+    { K10, K11, K12, K13, K14, K15, K16 }, \
+    { K20, K21, K22, K23, K24, K25, K26 }, \
+    { K30, K31, K32, K33, K34, K35, K36 }, \
+    { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46 }, \
+    { K50, K51, K52, K53, K54, K55, K56 }, \
+    { K60, K61, K62, K63, K64, K65, K66 }, \
+    { K70, K71, K72, K73, K74, K75, K76 }, \
+    { K80, K81, K82, K83, K84, K85, K86 }, \
+    { KC_NO, KC_NO, K92, K93, K94, K95, K96 } \
+}
diff --git a/keyboards/adpenrose/kintsugi/lib/kintsugifont.c b/keyboards/adpenrose/kintsugi/lib/kintsugifont.c
new file mode 100644
index 0000000000..bfa05d53a4
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/lib/kintsugifont.c
@@ -0,0 +1,244 @@
+/* Copyright 2021 adpenrose
+ *
+ * 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 "progmem.h"
+
+const unsigned char font[] PROGMEM = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
+  0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
+  0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
+  0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
+  0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
+  0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
+  0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
+  0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
+  0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
+  0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
+  0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
+  0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
+  0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
+  0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
+  0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
+  0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
+  0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
+  0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+  0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+  0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+  0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+  0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+  0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
+  0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
+  0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
+  0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
+  0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
+  0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
+  0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
+  0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
+  0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
+  0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+  0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
+  0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
+  0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
+  0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
+  0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
+  0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
+  0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
+  0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+  0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+  0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
+  0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+  0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
+  0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+  0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
+  0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
+  0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
+  0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
+  0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
+  0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
+  0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
+  0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
+  0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
+  0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
+  0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+  0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
+  0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
+  0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+  0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
+  0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
+  0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
+  0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
+  0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
+  0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
+  0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
+  0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
+  0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
+  0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
+  0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
+  0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
+  0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
+  0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
+  0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
+  0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
+  0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
+  0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
+  0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
+  0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
+  0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
+  0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
+  0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
+  0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
+  0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
+  0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
+  0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
+  0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
+  0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
+  0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
+  0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+  0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
+  0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
+  0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
+  0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
+  0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
+  0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
+  0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
+  0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
+  0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
+  0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
+  0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x00,
+  0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
+  0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
+  0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
+  0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
+  0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
+  0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
+  0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
+  0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+  0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
+  0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
+  0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
+  0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
+  0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
+  0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
+  0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
+  0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
+  0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+  0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
+  0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
+  0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
+  0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+  0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
+  0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
+  0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x80, 0xC0, 0xC0,
+  0xE0, 0xF0, 0xF0, 0xF8, 0xFC, 0xBC,
+  0x9E, 0x9E, 0xBC, 0xFC, 0xF8, 0xF0,
+  0xF0, 0xE0, 0xC0, 0xC0, 0x80, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0xC0, 0xF0, 0xFC, 0xFE, 0x8E,
+  0xE6, 0x70, 0x00, 0xFC, 0xFE, 0xFE,
+  0xFC, 0x00, 0x38, 0x78, 0xF0, 0xFE,
+  0xFE, 0xF0, 0x78, 0x38, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x78, 0x78, 0x78, 0x78, 0x78,
+  0x78, 0x78, 0x7E, 0x7E, 0xFE, 0xFC,
+  0xFC, 0x7C, 0x18, 0x00, 0x9E, 0xBC,
+  0x1C, 0x02, 0x0F, 0x1E, 0x0C, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
+  0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
+  0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
+  0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
+  0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
+  0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
+  0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
+  0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x01, 0xE1, 0xE1, 0xE1,
+  0xE1, 0xE3, 0xE7, 0xE7, 0xE3, 0xE3,
+  0xFF, 0xFF, 0xE3, 0xE3, 0xE7, 0xE7,
+  0xE3, 0xE1, 0xE1, 0xE1, 0xE1, 0x01,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x40, 0xF1, 0xFB, 0xFF, 0xFF, 0xE7,
+  0xF3, 0xF8, 0x00, 0xFF, 0xFF, 0xFF,
+  0xFF, 0x87, 0xC7, 0xE7, 0xFF, 0xFF,
+  0xFF, 0xFF, 0xE7, 0xC7, 0x87, 0x07,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x8E, 0x9E, 0x9E, 0x1E, 0x1E,
+  0x1E, 0x1E, 0x1E, 0x1E, 0x9F, 0xDF,
+  0xFF, 0xFF, 0xFE, 0xCF, 0x0F, 0x0F,
+  0x07, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
+  0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
+  0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
+  0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
+  0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
+  0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
+  0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
+  0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x70, 0x70, 0x71, 0x73,
+  0x73, 0x7F, 0x7E, 0x7C, 0x70, 0x70,
+  0x7F, 0x7F, 0x70, 0x70, 0x7C, 0x7E,
+  0x7F, 0x73, 0x73, 0x71, 0x70, 0x70,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x60, 0x7C, 0x3E, 0x01, 0x3E, 0x61,
+  0x0E, 0x1E, 0x00, 0x3F, 0x7F, 0x7F,
+  0x7F, 0x73, 0x73, 0x71, 0x70, 0x77,
+  0x77, 0x70, 0x71, 0x73, 0x73, 0x73,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x1F, 0x7F, 0x7F, 0x78, 0x78,
+  0x78, 0x78, 0x78, 0x78, 0x79, 0x7B,
+  0x7B, 0x7B, 0x03, 0x01, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
diff --git a/keyboards/adpenrose/kintsugi/post_config.h b/keyboards/adpenrose/kintsugi/post_config.h
new file mode 100644
index 0000000000..e1f92f9e60
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/post_config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2021 adpenrose
+
+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/>.
+*/
+
+#ifndef OLED_FONT_H
+#    define OLED_FONT_H "lib/kintsugifont.c"
+#	 define OLED_TIMEOUT 120000
+#endif
\ No newline at end of file
diff --git a/keyboards/adpenrose/kintsugi/readme.md b/keyboards/adpenrose/kintsugi/readme.md
new file mode 100644
index 0000000000..2aa402543e
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/readme.md
@@ -0,0 +1,37 @@
+# Kintsugi
+
+![kintsugi](https://i.imgur.com/HPdmzdCl.jpeg)
+
+A 65%-ish keyboard with some extra features.
+
+## Features
+
+* Powered by an ATmega32u4 microcontroller (current version needs an Elite-C to work).
+* Encoder.
+* OLED screen.
+* Underglow.
+* Hotswap sockets.
+
+## General info
+
+* Keyboard Maintainer: [Arturo Avila](https://github.com/ADPenrose)
+* Hardware Supported: Kintsugi V1 PCB
+* Hardware Availability: [Arturo Avila](https://github.com/ADPenrose)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kintsugi:default
+
+Flashing example for this keyboard:
+
+    make kintsugi:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the front of the Elite-C microcontroller _**before soldering**_ it to the PCB- some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/adpenrose/kintsugi/rules.mk b/keyboards/adpenrose/kintsugi/rules.mk
new file mode 100644
index 0000000000..fe95a9b72b
--- /dev/null
+++ b/keyboards/adpenrose/kintsugi/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no      	# Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes		# Encoder functionality
+OLED_ENABLE = yes           # OLED functionality
+OLED_DRIVER = SSD1306

From 859e2aa86b4ccb81f96a55d4fd9cd8d49a9704c2 Mon Sep 17 00:00:00 2001
From: uqs <uqs@FreeBSD.org>
Date: Sat, 25 Dec 2021 02:46:49 +0100
Subject: [PATCH 045/867] Fix some typos, especially the sensor name. (#15557)

---
 docs/feature_pointing_device.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index bd7fb36589..5aef9bea27 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -30,7 +30,7 @@ The ADNS 5050 sensor uses a serial type protocol for communication, and requires
 
 The CPI range is 125-1375, in increments of 125. Defaults to 500 CPI.
 
-### ADSN 9800 Sensor
+### ADNS 9800 Sensor
 
 To use the ADNS 9800 sensor, add this to your `rules.mk`
 
@@ -69,7 +69,7 @@ The Analog Joystick is an analog (ADC) driven sensor.  There are a variety of jo
 |`ANALOG_JOYSTICK_AXIS_MAX`        | (Optional) Sets the upper range to be considered movement.                 | `1023`        |
 |`ANALOG_JOYSTICK_SPEED_REGULATOR` | (Optional) The divisor used to slow down movement. (lower makes it faster) | `20`          |
 |`ANALOG_JOYSTICK_READ_INTERVAL`   | (Optional) The interval in milliseconds between reads.                     | `10`          |
-|`ANALOG_JOYSTICK_SPEED_MAX`       | (Optional) The maxiumum value used for motion.                             | `2`           |
+|`ANALOG_JOYSTICK_SPEED_MAX`       | (Optional) The maximum value used for motion.                              | `2`           |
 |`ANALOG_JOYSTICK_CLICK_PIN`       | (Optional) The pin wired up to the press switch of the analog stick.       | _not defined_ |
 
 
@@ -188,7 +188,7 @@ void           pointing_device_driver_set_cpi(uint16_t cpi) {}
 | `pointing_device_init_kb(void)`                            | Callback to allow for keyboard level initialization. Useful for additional hardware sensors.                  |
 | `pointing_device_init_user(void)`                          | Callback to allow for user level initialization. Useful for additional hardware sensors.                      |
 | `pointing_device_task_kb(mouse_report)`                    | Callback that sends sensor data, so keyboard code can intercept and modify the data.  Returns a mouse report. |
-| `pointing_device_task_user(mouse_report)`                  | Callback that sends sensor data, so user coe can intercept and modify the data.  Returns a mouse report.      |
+| `pointing_device_task_user(mouse_report)`                  | Callback that sends sensor data, so user code can intercept and modify the data.  Returns a mouse report.     |
 | `pointing_device_handle_buttons(buttons, pressed, button)` | Callback to handle hardware button presses. Returns a `uint8_t`.                                              |
 | `pointing_device_get_cpi(void)`                            | Gets the current CPI/DPI setting from the sensor, if supported.                                               |
 | `pointing_device_set_cpi(uint16_t)`                        | Sets the CPI/DPI, if supported.                                                                               |

From e1303a30d23e6ffb782d76cada2c144c2094f1f7 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Sat, 25 Dec 2021 09:47:21 +0800
Subject: [PATCH 046/867] [Keyboard] Add KPrepublic bm980hsrgb support (#14724)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c  |  51 +++++++
 keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h  |  35 +++++
 keyboards/kprepublic/bm980hsrgb/config.h      | 136 ++++++++++++++++++
 keyboards/kprepublic/bm980hsrgb/info.json     | 110 ++++++++++++++
 .../bm980hsrgb/keymaps/default/keymap.c       |  49 +++++++
 .../bm980hsrgb/keymaps/default/readme.md      |   1 +
 .../bm980hsrgb/keymaps/peepeetee/keymap.c     |  61 ++++++++
 .../bm980hsrgb/keymaps/via/keymap.c           |  64 +++++++++
 .../bm980hsrgb/keymaps/via/readme.md          |   1 +
 .../bm980hsrgb/keymaps/via/rules.mk           |   1 +
 keyboards/kprepublic/bm980hsrgb/readme.md     |  30 ++++
 keyboards/kprepublic/bm980hsrgb/rules.mk      |  22 +++
 12 files changed, 561 insertions(+)
 create mode 100644 keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c
 create mode 100644 keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h
 create mode 100644 keyboards/kprepublic/bm980hsrgb/config.h
 create mode 100644 keyboards/kprepublic/bm980hsrgb/info.json
 create mode 100644 keyboards/kprepublic/bm980hsrgb/keymaps/default/keymap.c
 create mode 100644 keyboards/kprepublic/bm980hsrgb/keymaps/default/readme.md
 create mode 100644 keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
 create mode 100644 keyboards/kprepublic/bm980hsrgb/keymaps/via/keymap.c
 create mode 100644 keyboards/kprepublic/bm980hsrgb/keymaps/via/readme.md
 create mode 100644 keyboards/kprepublic/bm980hsrgb/keymaps/via/rules.mk
 create mode 100644 keyboards/kprepublic/bm980hsrgb/readme.md
 create mode 100644 keyboards/kprepublic/bm980hsrgb/rules.mk

diff --git a/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c b/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c
new file mode 100644
index 0000000000..4aad7af0f1
--- /dev/null
+++ b/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 peepeetee
+ * Copyright 2021 bdtc123
+ *
+ * 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 "bm980hsrgb.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+  {  0,      1,      2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12,  NO_LED,    13 },
+  { 17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     28,     29,     30,     31 },
+  { 35,     36,     37,     38,     39,     40,     41,     42,     43,     44,     45,     46,     47,     48,     49 },
+  { 53,     54,     55,     56,     57,     58,     59,     60,     61,     62,     63,     64,  NO_LED,    65,     66 },
+  { 69, NO_LED,     70,     71,     72,     73,     74,     75,     76,     77,     78,     79,     80,     81,     82 },
+  { 86,     87,     88,     96,     97,     85,     89,     84,     83,     90,     91,     92,     93,     94,     95 },
+  { NO_LED, NO_LED, 34,     50,     51,     52,     16,     68,     67,     33,     15,     32,  NO_LED,    14, NO_LED }
+
+
+}, {
+    // LED Index to Physical Position
+    {   0,   0 },  {  15,   0 },  {  30,   0 },  {  45,   0 },  {  60,   0 },  {  75,   0 },  {  90,   0 },  { 105,   0 },  { 120,   0 },  { 135,   0 },  { 150,   0 },  { 165,   0 },  { 180,   0 }, { 195,   0 },  { 202,   0 },  { 212,   0 }, { 224,   0 },
+    {   0,   20 }, {  15,   20 }, {  30,   20 }, {  45,   20 }, {  60,   20 }, {  75,   20 }, {  90,   20 }, { 105,   20 }, { 120,   20 }, { 135,   20 }, { 150,   20 }, { 165,   20 }, { 180,   20 },{ 195,   20 }, { 202,   20 }, { 212,   20 },{ 220,   20 },{ 224,   20 },
+    {   8,   30 }, {  15,   30 }, {  30,   30 }, {  45,   30 }, {  60,   30 }, {  75,   30 }, {  90,   30 }, { 105,   30 }, { 120,   30 }, { 135,   30 }, { 150,   30 }, { 165,   30 }, { 180,   30 },{ 195,   30 }, { 202,   30 }, { 212,   30 },{ 220,   30 },{ 224,   30 },
+    {   9,   40 }, {  15,   40 }, {  30,   40 }, {  45,   40 }, {  60,   40 }, {  75,   40 }, {  90,   40 }, { 105,   40 }, { 120,   40 }, { 135,   40 }, { 150,   40 }, { 165,   40 }, { 180,   40 },{ 195,   40 }, { 202,   40 }, { 212,   40 },
+    {   12,  50 }, {  15,   50 }, {  30,   50 }, {  45,   50 }, {  60,   50 }, {  75,   50 }, {  90,   50 }, { 105,   50 }, { 120,   50 }, { 135,   50 }, { 150,   50 }, { 165,   50 }, { 180,   50 },{ 195,   50 }, { 202,   50 }, { 212,   50 },{ 224,   50 },
+    {   2,   60 }, {  17,   60 }, {  34,   60 },  { 77,   60 }, { 120,   60 }, { 135,   60 }, {  150,   60 }, { 165,  60 }, { 177,   60 }, { 182,   60 }, { 197,   60 }, { 212,   60 },
+
+}, {
+    // LED Index to Flag
+    1, 4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 1, 9/*scroll lock*/, 1,1,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,             1, 1, 1, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,             4, 4, 4, 1,
+    9/*caps lock*/, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,   4, 4, 4,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,            1,     4, 4, 4, 1,
+     1, 1, 1, 4, 1, 1, 1,                       1, 1, 1,     4, 4
+} };
+
+
+#endif
diff --git a/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h b/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h
new file mode 100644
index 0000000000..042f4ee4a5
--- /dev/null
+++ b/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h
@@ -0,0 +1,35 @@
+/* Copyright 2021 bdtc123
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,   K0E, K6D, K6A, K66, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K1E, K6B, K69, K62, \
+    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K63, K64, K65, \
+    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,          K3E, K68, K67,      \
+    K40,       K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4D,  K4E, K58, K57, K55, \
+    K50,  K51, K52,              K56,               K59, K5A, K5B,    K5C, K5D, K5E,  K53, K54       \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   K3E   }, \
+    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E   }, \
+    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E   }, \
+    { KC_NO, KC_NO, K62,   K63,   K64,   K65,   K66,   K67,   K68,   K69,   K6A,   K6B,   KC_NO, K6D,   KC_NO }, \
+}
diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
new file mode 100644
index 0000000000..e4499a0b05
--- /dev/null
+++ b/keyboards/kprepublic/bm980hsrgb/config.h
@@ -0,0 +1,136 @@
+/*
+Copyright 2021 peepeetee
+
+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    0x4B50 //KP
+#define PRODUCT_ID   0xEF61
+#define DEVICE_VER   0x0001
+#define MANUFACTURER KPrepublic
+#define PRODUCT      bm980rgb
+
+/* key matrix size */
+#define MATRIX_ROWS 7
+#define MATRIX_COLS 15
+
+/*
+ * 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 { D4, B6, B5, B4, F7, F6, D7 }
+#define MATRIX_COL_PINS { B1, B2, B3, B7, D0, D1, D2, D3, D5, E6, F0, F1, F4, F5, D6 }
+// #define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+
+
+#define LED_NUM_LOCK_PIN C6
+#define LED_CAPS_LOCK_PIN C7
+#define LED_SCROLL_LOCK_PIN E2
+
+#define LED_PIN_ON_STATE 0
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN B0
+
+// The number of LEDs connected
+#define DRIVER_LED_TOTAL  98
+//#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 98
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+//#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+
+
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+// #define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json
new file mode 100644
index 0000000000..459b98a089
--- /dev/null
+++ b/keyboards/kprepublic/bm980hsrgb/info.json
@@ -0,0 +1,110 @@
+{
+    "keyboard_name": "BM980",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (D4,B1)", "x":0, "y":0},
+                {"label":"K01 (D4,B2)", "x":2, "y":0},
+                {"label":"K02 (D4,B3)", "x":3, "y":0},
+                {"label":"K03 (D4,B7)", "x":4, "y":0},
+                {"label":"K04 (D4,D0)", "x":5, "y":0},
+                {"label":"K05 (D4,D1)", "x":6.5, "y":0},
+                {"label":"K06 (D4,D2)", "x":7.5, "y":0},
+                {"label":"K07 (D4,D3)", "x":8.5, "y":0},
+                {"label":"K08 (D4,D5)", "x":9.5, "y":0},
+                {"label":"K09 (D4,E6)", "x":11, "y":0},
+                {"label":"K0A (D4,F0)", "x":12, "y":0},
+                {"label":"K0B (D4,F1)", "x":13, "y":0},
+                {"label":"K0C (D4,F4)", "x":14, "y":0},
+                {"label":"K0E (D4,D6)", "x":15.5, "y":0},
+                {"label":"K6D (D7,F5)", "x":16.5, "y":0},
+                {"label":"K6A (D7,F0)", "x":17.5, "y":0},
+                {"label":"K66 (D7,D2)", "x":18.5, "y":0},
+                {"label":"K10 (B6,B1)", "x":0, "y":1.5},
+                {"label":"K11 (B6,B2)", "x":1, "y":1.5},
+                {"label":"K12 (B6,B3)", "x":2, "y":1.5},
+                {"label":"K13 (B6,B7)", "x":3, "y":1.5},
+                {"label":"K14 (B6,D0)", "x":4, "y":1.5},
+                {"label":"K15 (B6,D1)", "x":5, "y":1.5},
+                {"label":"K16 (B6,D2)", "x":6, "y":1.5},
+                {"label":"K17 (B6,D3)", "x":7, "y":1.5},
+                {"label":"K18 (B6,D5)", "x":8, "y":1.5},
+                {"label":"K19 (B6,E6)", "x":9, "y":1.5},
+                {"label":"K1A (B6,F0)", "x":10, "y":1.5},
+                {"label":"K1B (B6,F1)", "x":11, "y":1.5},
+                {"label":"K1C (B6,F4)", "x":12, "y":1.5},
+                {"label":"K1D (B6,F5)", "x":13, "y":1.5, "w":2},
+                {"label":"K1E (B6,D6)", "x":15.5, "y":1.5},
+                {"label":"K6B (D7,F1)", "x":16.5, "y":1.5},
+                {"label":"K69 (D7,E6)", "x":17.5, "y":1.5},
+                {"label":"K62 (D7,B3)", "x":18.5, "y":1.5},
+                {"label":"K20 (B5,B1)", "x":0, "y":2.5, "w":1.5},
+                {"label":"K21 (B5,B2)", "x":1.5, "y":2.5},
+                {"label":"K22 (B5,B3)", "x":2.5, "y":2.5},
+                {"label":"K23 (B5,B7)", "x":3.5, "y":2.5},
+                {"label":"K24 (B5,D0)", "x":4.5, "y":2.5},
+                {"label":"K25 (B5,D1)", "x":5.5, "y":2.5},
+                {"label":"K26 (B5,D2)", "x":6.5, "y":2.5},
+                {"label":"K27 (B5,D3)", "x":7.5, "y":2.5},
+                {"label":"K28 (B5,D5)", "x":8.5, "y":2.5},
+                {"label":"K29 (B5,E6)", "x":9.5, "y":2.5},
+                {"label":"K2A (B5,F0)", "x":10.5, "y":2.5},
+                {"label":"K2B (B5,F1)", "x":11.5, "y":2.5},
+                {"label":"K2C (B5,F4)", "x":12.5, "y":2.5},
+                {"label":"K2D (B5,F5)", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"K2E (B5,D6)", "x":15.5, "y":2.5},
+                {"label":"K63 (D7,B7)", "x":16.5, "y":2.5},
+                {"label":"K64 (D7,D0)", "x":17.5, "y":2.5},
+                {"label":"K65 (D7,D1)", "x":18.5, "y":2.5, "h":2},
+                {"label":"K30 (B4,B1)", "x":0, "y":3.5, "w":1.75},
+                {"label":"K31 (B4,B2)", "x":1.75, "y":3.5},
+                {"label":"K32 (B4,B3)", "x":2.75, "y":3.5},
+                {"label":"K33 (B4,B7)", "x":3.75, "y":3.5},
+                {"label":"K34 (B4,D0)", "x":4.75, "y":3.5},
+                {"label":"K35 (B4,D1)", "x":5.75, "y":3.5},
+                {"label":"K36 (B4,D2)", "x":6.75, "y":3.5},
+                {"label":"K37 (B4,D3)", "x":7.75, "y":3.5},
+                {"label":"K38 (B4,D5)", "x":8.75, "y":3.5},
+                {"label":"K39 (B4,E6)", "x":9.75, "y":3.5},
+                {"label":"K3A (B4,F0)", "x":10.75, "y":3.5},
+                {"label":"K3B (B4,F1)", "x":11.75, "y":3.5},
+                {"label":"K3D (B4,F5)", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"K3E (B4,D6)", "x":15.5, "y":3.5},
+                {"label":"K68 (D7,D5)", "x":16.5, "y":3.5},
+                {"label":"K67 (D7,D3)", "x":17.5, "y":3.5},
+                {"label":"K40 (F7,B1)", "x":0, "y":4.5, "w":2.25},
+                {"label":"K42 (F7,B3)", "x":2.25, "y":4.5},
+                {"label":"K43 (F7,B7)", "x":3.25, "y":4.5},
+                {"label":"K44 (F7,D0)", "x":4.25, "y":4.5},
+                {"label":"K45 (F7,D1)", "x":5.25, "y":4.5},
+                {"label":"K46 (F7,D2)", "x":6.25, "y":4.5},
+                {"label":"K47 (F7,D3)", "x":7.25, "y":4.5},
+                {"label":"K48 (F7,D5)", "x":8.25, "y":4.5},
+                {"label":"K49 (F7,E6)", "x":9.25, "y":4.5},
+                {"label":"K4A (F7,F0)", "x":10.25, "y":4.5},
+                {"label":"K4B (F7,F1)", "x":11.25, "y":4.5},
+                {"label":"K4C (F7,F4)", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"K4D (F7,F5)", "x":14.25, "y":4.75},
+                {"label":"K4E (F7,D6)", "x":15.5, "y":4.5},
+                {"label":"K58 (F6,D5)", "x":16.5, "y":4.5},
+                {"label":"K57 (F6,D3)", "x":17.5, "y":4.5},
+                {"label":"K55 (F6,D1)", "x":18.5, "y":4.5, "h":2},
+                {"label":"K50 (F6,B1)", "x":0, "y":5.5, "w":1.25},
+                {"label":"K51 (F6,B2)", "x":1.25, "y":5.5,"w":1.25},
+                {"label":"K52 (F6,B3)", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"K56 (F6,D2)", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"K59 (F6,E6)", "x":10, "y":5.5},
+                {"label":"K5A (F6,F0)", "x":11, "y":5.5},
+                {"label":"K5B (F6,F1)", "x":12, "y":5.5},
+                {"label":"K5C (F6,F4)", "x":13.25, "y":5.75},
+                {"label":"K5D (F6,F5)", "x":14.25, "y":5.75},
+                {"label":"K5E (F6,D6)", "x":15.25, "y":5.75},
+                {"label":"K53 (F6,B7)", "x":16.5, "y":5.5},
+                {"label":"K54 (F6,D0)", "x":17.5, "y":5.5}
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a9a2c818ee
--- /dev/null
+++ b/keyboards/kprepublic/bm980hsrgb/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 peepeetee
+ * Copyright 2021 bdtc123
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,              KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        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_P4,   KC_P5,   KC_P6,
+        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_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL,   KC_LGUI, KC_LALT,                       KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_PDOT
+    ),
+    [1] = LAYOUT(
+        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,     _______, _______, _______, RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,
+        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   _______, _______, _______, _______,
+        _______,   _______, _______,                      _______,                             _______, _______, _______,      _______, _______, _______,   _______, _______
+    ),
+
+};
+
+
+    // [X] = LAYOUT(
+    //     _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,     _______, _______, _______, _______,
+    //     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,
+    //     _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+    //     _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 _______, _______, _______,
+    //     _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   _______, _______, _______, _______,
+    //     _______,   _______, _______,                      _______,                             _______, _______, _______,      _______, _______, _______,   _______, _______
+    // ),
+
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/default/readme.md b/keyboards/kprepublic/bm980hsrgb/keymaps/default/readme.md
new file mode 100644
index 0000000000..4b17a02810
--- /dev/null
+++ b/keyboards/kprepublic/bm980hsrgb/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for bm980rgb
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
new file mode 100644
index 0000000000..9d6c64b33f
--- /dev/null
+++ b/keyboards/kprepublic/bm980hsrgb/keymaps/peepeetee/keymap.c
@@ -0,0 +1,61 @@
+/* Copyright 2021 peepeetee
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT(
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,                        KC_INS,  KC_DEL,   KC_AUDIO_VOL_DOWN,  KC_AUDIO_VOL_UP,
+	  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_NLCK,  KC_HOME,  KC_END,  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_P7,    KC_P8,    KC_P9,    KC_PGDN,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,                  KC_P4,   KC_P5,   KC_P6,
+        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_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL,   KC_LALT, KC_LGUI,                       KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_PDOT
+  ),
+
+  [1] = LAYOUT(
+       RESET,   _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,   _______,   _______,                                   _______,    _______,    _______,  _______,
+	  _______,   _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,  _______,   _______,            _______,    _______,    _______,  _______,
+	  RGB_MOD, 	     RGB_HUI,     RGB_VAI,     RGB_SAI,     RGB_SPI,     _______,     _______,     _______,     _______,     _______,     _______,     _______,  _______,  _______,         _______,    _______,    _______,  _______,
+	  RGB_TOG,          RGB_HUD,     RGB_VAD,     RGB_SAD,     RGB_SPD,     _______,     _______,     _______,     _______,     _______,     _______,  _______,  _______,                   _______,    _______,    _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   _______, _______, _______, _______,
+        _______,   _______, _______,                      _______,                             _______, _______, _______,      _______, _______, _______,   _______, _______
+  )
+
+    // [X] = LAYOUT(
+    //     _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,     _______, _______, _______, _______,
+    //     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,
+    //     _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+    //     _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 _______, _______, _______,
+    //     _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   _______, _______, _______, _______,
+    //     _______,   _______, _______,                      _______,                             _______, _______, _______,      _______, _______, _______,   _______, _______
+    // ),
+};
+
+
+void rgb_matrix_indicators_user(void) {
+
+    led_t host_leds = host_keyboard_led_state();
+    if (host_leds.num_lock) {
+        rgb_matrix_set_color(31, 0xFF, 0xFF, 0xFF);
+        //rgb_matrix_set_color(30, 0x0, 0x0, 0x0);
+
+    } else {
+        //rgb_matrix_set_color(30, 0x0, 0x0, 0x0);
+    }
+        //set_layer_color(get_highest_layer(layer_state));
+
+}
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm980hsrgb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..822ac29012
--- /dev/null
+++ b/keyboards/kprepublic/bm980hsrgb/keymaps/via/keymap.c
@@ -0,0 +1,64 @@
+/* Copyright 2021 peepeetee
+ * Copyright 2021 bdtc123
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,      KC_PSCR, KC_SLCK, KC_PAUS, KC_DEL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,              KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        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_P4,   KC_P5,   KC_P6,
+        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_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL,   KC_LGUI, KC_LALT,                       KC_SPC,                             KC_RALT, MO(1),   KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_PDOT
+    ),
+    [1] = LAYOUT(
+        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,     _______, _______, _______, RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,
+        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   _______, _______, _______, _______,
+        _______,   _______, _______,                      _______,                             _______, _______, _______,      _______, _______, _______,   _______, _______
+    ),
+    [2] = LAYOUT(
+        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   _______, _______, _______, _______,
+        _______,   _______, _______,                      _______,                             _______, _______, _______,      _______, _______, _______,   _______, _______
+    ),
+    [3] = LAYOUT(
+        _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   _______, _______, _______, _______,
+        _______,   _______, _______,                      _______,                             _______, _______, _______,      _______, _______, _______,   _______, _______
+    ),
+
+};
+
+    // [X] = LAYOUT(
+    //     _______,          _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,     _______, _______, _______, _______,
+    //     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______,
+    //     _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+    //     _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                 _______, _______, _______,
+    //     _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   _______, _______, _______, _______,
+    //     _______,   _______, _______,                      _______,                             _______, _______, _______,      _______, _______, _______,   _______, _______
+    // ),
+
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/via/readme.md b/keyboards/kprepublic/bm980hsrgb/keymaps/via/readme.md
new file mode 100644
index 0000000000..a94481a786
--- /dev/null
+++ b/keyboards/kprepublic/bm980hsrgb/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default via keymap for bm980rgb
diff --git a/keyboards/kprepublic/bm980hsrgb/keymaps/via/rules.mk b/keyboards/kprepublic/bm980hsrgb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/kprepublic/bm980hsrgb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kprepublic/bm980hsrgb/readme.md b/keyboards/kprepublic/bm980hsrgb/readme.md
new file mode 100644
index 0000000000..13e061e6d5
--- /dev/null
+++ b/keyboards/kprepublic/bm980hsrgb/readme.md
@@ -0,0 +1,30 @@
+# BM980HSRGB
+
+![BM980HSRGB](https://i.imgur.com/k4NQGLxh.jpeg)
+
+A 1800, hotswap, in switch RGB keyboard from KPRepublic.
+
+* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
+* Hardware Supported: BM980HSRGB
+* Hardware Availability:
+  * https://kprepublic.com/products/bm980rgb-bm980-rgb-hot-swappable-custom-mechanical-keyboard-pcb-programmed-qmk-via-firmware-full-rgb-switch-underglow-type-c
+  * https://www.aliexpress.com/item/1005002509519466.html
+  * https://item.taobao.com/item.htm?id=645862298692
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kprepublic/bm980hsrgb:default
+
+Flashing example for this keyboard:
+
+    make kprepublic/bm980hsrgb:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in one of 3 ways:
+
+* Short the two-pad footprint beneath the f12 key while the board is plugged in
+* Press the switch labled RST on the back of the PCB, near the MCU, while the board is plugged in
+* Hold the Esc key while connecting the USB cable (also erases persistent settings)
diff --git a/keyboards/kprepublic/bm980hsrgb/rules.mk b/keyboards/kprepublic/bm980hsrgb/rules.mk
new file mode 100644
index 0000000000..03f72adf54
--- /dev/null
+++ b/keyboards/kprepublic/bm980hsrgb/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+LTO_ENABLE = yes

From 94fe31609e41902c0cf579f2d2601ad8b54c5d3f Mon Sep 17 00:00:00 2001
From: mechlovin <57231893+mechlovin@users.noreply.github.com>
Date: Sat, 25 Dec 2021 08:47:35 +0700
Subject: [PATCH 047/867] [Keyboard] Add LZ erGhost (#15451)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/lz/erghost/config.h                 |  92 +++++
 keyboards/lz/erghost/erghost.c                |  17 +
 keyboards/lz/erghost/erghost.h                |  67 ++++
 keyboards/lz/erghost/info.json                |  16 +
 keyboards/lz/erghost/keymaps/default/keymap.c |  27 ++
 .../lz/erghost/keymaps/default/readme.md      |   1 +
 keyboards/lz/erghost/keymaps/via/keymap.c     |  51 +++
 keyboards/lz/erghost/keymaps/via/readme.md    |   1 +
 keyboards/lz/erghost/keymaps/via/rules.mk     |   2 +
 keyboards/lz/erghost/matrix.c                 | 344 ++++++++++++++++++
 keyboards/lz/erghost/readme.md                |  27 ++
 keyboards/lz/erghost/rules.mk                 |  21 ++
 12 files changed, 666 insertions(+)
 create mode 100644 keyboards/lz/erghost/config.h
 create mode 100644 keyboards/lz/erghost/erghost.c
 create mode 100644 keyboards/lz/erghost/erghost.h
 create mode 100644 keyboards/lz/erghost/info.json
 create mode 100644 keyboards/lz/erghost/keymaps/default/keymap.c
 create mode 100644 keyboards/lz/erghost/keymaps/default/readme.md
 create mode 100644 keyboards/lz/erghost/keymaps/via/keymap.c
 create mode 100644 keyboards/lz/erghost/keymaps/via/readme.md
 create mode 100644 keyboards/lz/erghost/keymaps/via/rules.mk
 create mode 100644 keyboards/lz/erghost/matrix.c
 create mode 100644 keyboards/lz/erghost/readme.md
 create mode 100644 keyboards/lz/erghost/rules.mk

diff --git a/keyboards/lz/erghost/config.h b/keyboards/lz/erghost/config.h
new file mode 100644
index 0000000000..74867baf7f
--- /dev/null
+++ b/keyboards/lz/erghost/config.h
@@ -0,0 +1,92 @@
+/*
+Copyright 2021 Mechlovin' Studio
+
+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    0x6C7A
+#define PRODUCT_ID   0x0002
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Mechlovin Studio
+#define PRODUCT      erGhost
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/*
+ * 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 { D5, D2, D4, D3, D0, D1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+#define USB_POLLING_INTERVAL_MS 1
+
+
+#define LED_NUM_LOCK_PIN D7
+#define LED_CAPS_LOCK_PIN D6
+#define LED_SCROLL_LOCK_PIN B4
+#define LED_PIN_ON_STATE 1
+
+#define BACKLIGHT_PIN B6
+#define BACKLIGHT_LEVELS 3
+#define BACKLIGHT_BREATHING
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN E2
+#define RGBLED_NUM 28
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+#    define RGBLIGHT_EFFECT_STATIC_LIGHT
+#    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
+#    define RGBLIGHT_EFFECT_TWINKLE
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/lz/erghost/erghost.c b/keyboards/lz/erghost/erghost.c
new file mode 100644
index 0000000000..7ea321e12e
--- /dev/null
+++ b/keyboards/lz/erghost/erghost.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Mechlovin
+ *
+ * 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 "erghost.h"
diff --git a/keyboards/lz/erghost/erghost.h b/keyboards/lz/erghost/erghost.h
new file mode 100644
index 0000000000..5f5244340c
--- /dev/null
+++ b/keyboards/lz/erghost/erghost.h
@@ -0,0 +1,67 @@
+/* Copyright 2021 Mechlovin
+ *
+ * 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, K0A, K0B, K0C,        K0E, K0F, K0G, \
+      K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D,   K1E, K1F, K1G, \
+      K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G, \
+      K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                       \
+      K40, K41, K42, K43, K44, K45, K46, K57, K47, K48, K49, K4A, K4B, K4C, K4D,        K4F,      \
+      K50, K51, K52,      K54, K55, K56,           K58, K59, K5A, K5B, K5C, K5D,   K5E, K5F, K5G  \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
+    { K50,   K51,   K52,   KC_NO, K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
+}
+
+#define LAYOUT_ansi( \
+      K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,        K0E, K0F, K0G, \
+      K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K1E, K1F, K1G, \
+      K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,        K2E, K2F, K2G, \
+      K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,       K3D,                       \
+      K40,      K42, K43, K44, K45, K46, K57, K47, K48, K49, K4A, K4B, K4C,             K4F,      \
+      K50, K51, K52,      K54, K55, K56, K58,           K59, K5A, K5B, K5C, K5D,   K5E, K5F, K5G  \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C, KC_NO,   K0E,   K0F,   K0G   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B, KC_NO,   K3D,   KC_NO, KC_NO, KC_NO }, \
+    { K40, KC_NO,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C, KC_NO,   KC_NO, K4F,   KC_NO }, \
+    { K50,   K51,   K52,   KC_NO, K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
+}
+
+#define LAYOUT_iso( \
+      K00,      K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,        K0E, K0F, K0G, \
+      K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,        K1E, K1F, K1G, \
+      K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K2E, K2F, K2G, \
+      K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                       \
+      K40, K41, K42, K43, K44, K45, K46, K57, K47, K48, K49, K4A, K4B, K4C, K4D,        K4F,      \
+      K50, K51, K52,      K54, K55, K56, K58,           K59, K5A, K5B, K5C, K5D,   K5E, K5F, K5G  \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C, KC_NO,   K0E,   K0F,   K0G   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C, KC_NO,   K2E,   K2F,   K2G   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
+    { K40, KC_NO,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
+    { K50,   K51,   K52,   KC_NO, K54,   K55,   K56,   K57,   K58,   K59,   K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
+}
diff --git a/keyboards/lz/erghost/info.json b/keyboards/lz/erghost/info.json
new file mode 100644
index 0000000000..1a5c9abf64
--- /dev/null
+++ b/keyboards/lz/erghost/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Erghost",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6, "y":0}, {"label":"0,6", "x":8.75, "y":0}, {"label":"0,7", "x":9.75, "y":0}, {"label":"0,8", "x":10.75, "y":0}, {"label":"0,9", "x":11.75, "y":0}, {"label":"0,10", "x":12.75, "y":0}, {"label":"0,11", "x":13.75, "y":0}, {"label":"0,12", "x":14.75, "y":0}, {"label":"0,14", "x":17, "y":0}, {"label":"0,15", "x":18, "y":0}, {"label":"0,16", "x":19, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":8.75, "y":1.25}, {"label":"1,8", "x":9.75, "y":1.25}, {"label":"1,9", "x":10.75, "y":1.25}, {"label":"1,10", "x":11.75, "y":1.25}, {"label":"1,11", "x":12.75, "y":1.25}, {"label":"1,12", "x":13.75, "y":1.25}, {"label":"1,13", "x":14.75, "y":1.25}, {"label":"0,13", "x":15.75, "y":1.25}, {"label":"1,14", "x":17, "y":1.25}, {"label":"1,15", "x":18, "y":1.25}, {"label":"1,16", "x":19, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":8.25, "y":2.25}, {"label":"2,7", "x":9.25, "y":2.25}, {"label":"2,8", "x":10.25, "y":2.25}, {"label":"2,9", "x":11.25, "y":2.25}, {"label":"2,10", "x":12.25, "y":2.25}, {"label":"2,11", "x":13.25, "y":2.25}, {"label":"2,12", "x":14.25, "y":2.25}, {"label":"2,13", "x":15.25, "y":2.25, "w":1.5}, {"label":"2,14", "x":17, "y":2.25}, {"label":"2,15", "x":18, "y":2.25}, {"label":"2,16", "x":19, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":8.5, "y":3.25}, {"label":"3,7", "x":9.5, "y":3.25}, {"label":"3,8", "x":10.5, "y":3.25}, {"label":"3,9", "x":11.5, "y":3.25}, {"label":"3,10", "x":12.5, "y":3.25}, {"label":"3,11", "x":13.5, "y":3.25}, {"label":"3,13", "x":14.5, "y":3.25, "w":1.25}, {"label":"3,12", "x":15.75, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"5,7", "x":8, "y":4.25}, {"label":"4,7", "x":9, "y":4.25}, {"label":"4,8", "x":10, "y":4.25}, {"label":"4,9", "x":11, "y":4.25}, {"label":"4,10", "x":12, "y":4.25}, {"label":"4,11", "x":13, "y":4.25}, {"label":"4,12", "x":14, "y":4.25, "w":1.75}, {"label":"4,13", "x":15.75, "y":4.25}, {"label":"4,15", "x":18, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,2", "x":3.75, "y":5.25, "w":1.25}, {"label":"5,6", "x":5, "y":5.25, "w":1.25}, {"x":6.25, "y":5.25}, {"label":"5,10", "x":8, "y":5.25, "w":1.75}, {"x":9.75, "y":5.25}, {"label":"5,11", "x":10.75, "y":5.25, "w":1.25}, {"label":"5,12", "x":12, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.25, "y":5.25, "w":1.25}, {"label":"5,13", "x":14.5, "y":5.25, "w":1.25}, {"label":"5,14", "x":17, "y":5.25}, {"label":"5,15", "x":18, "y":5.25}, {"label":"5,16", "x":19, "y":5.25}]        
+        },        
+        "LAYOUT_ansi": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6, "y":0}, {"label":"0,6", "x":8.75, "y":0}, {"label":"0,7", "x":9.75, "y":0}, {"label":"0,8", "x":10.75, "y":0}, {"label":"0,9", "x":11.75, "y":0}, {"label":"0,10", "x":12.75, "y":0}, {"label":"0,11", "x":13.75, "y":0}, {"label":"0,12", "x":14.75, "y":0}, {"label":"0,14", "x":17, "y":0}, {"label":"0,15", "x":18, "y":0}, {"label":"0,16", "x":19, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":8.75, "y":1.25}, {"label":"1,8", "x":9.75, "y":1.25}, {"label":"1,9", "x":10.75, "y":1.25}, {"label":"1,10", "x":11.75, "y":1.25}, {"label":"1,11", "x":12.75, "y":1.25}, {"label":"1,12", "x":13.75, "y":1.25}, {"label":"1,13", "x":14.75, "y":1.25, "w":2}, {"label":"1,14", "x":17, "y":1.25}, {"label":"1,15", "x":18, "y":1.25}, {"label":"1,16", "x":19, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":8.25, "y":2.25}, {"label":"2,7", "x":9.25, "y":2.25}, {"label":"2,8", "x":10.25, "y":2.25}, {"label":"2,9", "x":11.25, "y":2.25}, {"label":"2,10", "x":12.25, "y":2.25}, {"label":"2,11", "x":13.25, "y":2.25}, {"label":"2,12", "x":14.25, "y":2.25}, {"label":"2,13", "x":15.25, "y":2.25, "w":1.5}, {"label":"2,14", "x":17, "y":2.25}, {"label":"2,15", "x":18, "y":2.25}, {"label":"2,16", "x":19, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":8.5, "y":3.25}, {"label":"3,7", "x":9.5, "y":3.25}, {"label":"3,8", "x":10.5, "y":3.25}, {"label":"3,9", "x":11.5, "y":3.25}, {"label":"3,10", "x":12.5, "y":3.25}, {"label":"3,11", "x":13.5, "y":3.25}, {"label":"3,13", "x":14.5, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"5,7", "x":8, "y":4.25}, {"label":"4,7", "x":9, "y":4.25}, {"label":"4,8", "x":10, "y":4.25}, {"label":"4,9", "x":11, "y":4.25}, {"label":"4,10", "x":12, "y":4.25}, {"label":"4,11", "x":13, "y":4.25}, {"label":"4,13", "x":14, "y":4.25, "w":2.75}, {"label":"4,15", "x":18, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,2", "x":3.75, "y":5.25, "w":1.25}, {"label":"5,6", "x":5, "y":5.25, "w":1.25}, {"x":6.25, "y":5.25}, {"label":"5,10", "x":8, "y":5.25, "w":1.75}, {"x":9.75, "y":5.25}, {"label":"5,11", "x":10.75, "y":5.25, "w":1.25}, {"label":"5,12", "x":12, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.25, "y":5.25, "w":1.25}, {"label":"5,13", "x":14.5, "y":5.25, "w":1.25}, {"label":"5,14", "x":17, "y":5.25}, {"label":"5,15", "x":18, "y":5.25}, {"label":"5,16", "x":19, "y":5.25}]        
+        },
+        "LAYOUT_iso": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6, "y":0}, {"label":"0,6", "x":8.75, "y":0}, {"label":"0,7", "x":9.75, "y":0}, {"label":"0,8", "x":10.75, "y":0}, {"label":"0,9", "x":11.75, "y":0}, {"label":"0,10", "x":12.75, "y":0}, {"label":"0,11", "x":13.75, "y":0}, {"label":"0,12", "x":14.75, "y":0}, {"label":"0,14", "x":17, "y":0}, {"label":"0,15", "x":18, "y":0}, {"label":"0,16", "x":19, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":8.75, "y":1.25}, {"label":"1,8", "x":9.75, "y":1.25}, {"label":"1,9", "x":10.75, "y":1.25}, {"label":"1,10", "x":11.75, "y":1.25}, {"label":"1,11", "x":12.75, "y":1.25}, {"label":"1,12", "x":13.75, "y":1.25}, {"label":"1,13", "x":14.75, "y":1.25, "w":2}, {"label":"1,14", "x":17, "y":1.25}, {"label":"1,15", "x":18, "y":1.25}, {"label":"1,16", "x":19, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":8.25, "y":2.25}, {"label":"2,7", "x":9.25, "y":2.25}, {"label":"2,8", "x":10.25, "y":2.25}, {"label":"2,9", "x":11.25, "y":2.25}, {"label":"2,10", "x":12.25, "y":2.25}, {"label":"2,11", "x":13.25, "y":2.25}, {"label":"2,12", "x":14.25, "y":2.25}, {"label":"3,13", "x":15.5, "y":2.25, "w":1.25, "h":2}, {"label":"2,14", "x":17, "y":2.25}, {"label":"2,15", "x":18, "y":2.25}, {"label":"2,16", "x":19, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":8.5, "y":3.25}, {"label":"3,7", "x":9.5, "y":3.25}, {"label":"3,8", "x":10.5, "y":3.25}, {"label":"3,9", "x":11.5, "y":3.25}, {"label":"3,10", "x":12.5, "y":3.25}, {"label":"3,11", "x":13.5, "y":3.25}, {"label":"3,12", "x":14.5, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"5,7", "x":8, "y":4.25}, {"label":"4,7", "x":9, "y":4.25}, {"label":"4,8", "x":10, "y":4.25}, {"label":"4,9", "x":11, "y":4.25}, {"label":"4,10", "x":12, "y":4.25}, {"label":"4,11", "x":13, "y":4.25}, {"label":"4,12", "x":14, "y":4.25, "w":1.75}, {"label":"4,13", "x":15.75, "y":4.25}, {"label":"4,15", "x":18, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,2", "x":3.75, "y":5.25, "w":1.25}, {"label":"5,6", "x":5, "y":5.25, "w":1.25}, {"x":6.25, "y":5.25}, {"label":"5,10", "x":8, "y":5.25, "w":1.75}, {"x":9.75, "y":5.25}, {"label":"5,11", "x":10.75, "y":5.25, "w":1.25}, {"label":"5,12", "x":12, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.25, "y":5.25, "w":1.25}, {"label":"5,13", "x":14.5, "y":5.25, "w":1.25}, {"label":"5,14", "x":17, "y":5.25}, {"label":"5,15", "x":18, "y":5.25}, {"label":"5,16", "x":19, "y":5.25}]        }
+        }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/lz/erghost/keymaps/default/keymap.c b/keyboards/lz/erghost/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d19e909ce6
--- /dev/null
+++ b/keyboards/lz/erghost/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2021 Mechlovin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HASH, KC_ENT,
+        KC_LSFT,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    MO(1),   KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_LSFT,            KC_UP,
+        KC_LCTL,   KC_LGUI, KC_LALT, KC_APP,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_LALT, KC_LGUI, MO(1),   KC_LCTL,                              KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+};
diff --git a/keyboards/lz/erghost/keymaps/default/readme.md b/keyboards/lz/erghost/keymaps/default/readme.md
new file mode 100644
index 0000000000..be484dbb0e
--- /dev/null
+++ b/keyboards/lz/erghost/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for ERghost
diff --git a/keyboards/lz/erghost/keymaps/via/keymap.c b/keyboards/lz/erghost/keymaps/via/keymap.c
new file mode 100644
index 0000000000..eb8bac8eb5
--- /dev/null
+++ b/keyboards/lz/erghost/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 Mechlovin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_HASH, KC_ENT,
+        KC_LSFT,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    MO(2),   KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_LSFT,            KC_UP,
+        KC_LCTL,   KC_LGUI, KC_LALT, KC_APP,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC,  KC_LALT, KC_LGUI, MO(1),   KC_LCTL,                              KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                              KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                              KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                              KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
diff --git a/keyboards/lz/erghost/keymaps/via/readme.md b/keyboards/lz/erghost/keymaps/via/readme.md
new file mode 100644
index 0000000000..abafa4946f
--- /dev/null
+++ b/keyboards/lz/erghost/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The via keymap for erGhost
diff --git a/keyboards/lz/erghost/keymaps/via/rules.mk b/keyboards/lz/erghost/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/lz/erghost/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/lz/erghost/matrix.c b/keyboards/lz/erghost/matrix.c
new file mode 100644
index 0000000000..6b7d091cb7
--- /dev/null
+++ b/keyboards/lz/erghost/matrix.c
@@ -0,0 +1,344 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+Copyright 2019 Evy Dekkers
+
+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 "matrix.h"
+#include "gpio.h"
+
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+
+/* Cols 0 - 16
+ * These columns use two 74HC138 3 to 8 bit demultiplexer. B0, F1 is the enable pin, must be set high (1) to use it.
+ *
+ * col / pin:     PB5  PB7  PF0  PB0  PF1  PE6
+ * 0:              0 ── 0 ── 0    1 ── 0    0 
+ * ────────────────────────────────────────────
+ * 1:              0 ── 0 ── 1    1 ── 0    0
+ * ────────────────────────────────────────────    
+ * 2:              0 ── 1 ── 0    1 ── 0    0 
+ * ────────────────────────────────────────────    
+ * 3:              0 ── 1 ── 1    1 ── 0    0 
+ * ────────────────────────────────────────────    
+ * 4:              1 ── 0 ── 0    1 ── 0    0 
+ * ────────────────────────────────────────────    
+ * 5:              1 ── 0 ── 1    1 ── 0    0 
+ * ────────────────────────────────────────────    
+ * 6:              1 ── 1 ── 0    1 ── 0    0 
+ * ────────────────────────────────────────────    
+ * 7:              1 ── 1 ── 1    1 ── 0    0 
+ * ────────────────────────────────────────────    
+ * 8:              0 ── 0 ── 0    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ * 9:              0 ── 0 ── 1    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *10:              0 ── 1 ── 0    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *11:              0 ── 1 ── 1    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *12:              1 ── 0 ── 0    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *13:              1 ── 0 ── 1    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *14:              1 ── 1 ── 1    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *15:              1 ── 1 ── 0    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *16:              0 ── 0 ── 0    0 ── 0    1  
+ *
+ */
+static void select_col(uint8_t col) {
+    switch (col) {
+        case 0:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinHigh(B0);
+          break;
+        case 1:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinHigh(B0);
+          break;
+        case 2:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinHigh(B0);
+          break;
+        case 3:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinHigh(B0);
+          break;
+        case 4:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinHigh(B0);
+          break;
+        case 5:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinHigh(B0);
+          break;
+        case 6:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinHigh(B0);
+          break;
+        case 7:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinHigh(B0);
+          break;
+        case 8:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinHigh(F1);
+          break;
+        case 9:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinHigh(F1);
+          break;
+        case 10:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinHigh(F1);
+          break;
+        case 11:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinHigh(F1);
+          break;
+        case 12:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinHigh(F1);
+          break;
+        case 13:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinHigh(F1);
+          break;
+        case 14:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinHigh(F1);
+          break;
+        case 15:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinHigh(F1);
+          break;
+        case 16:
+          writePinLow(E6);
+          break;
+    }
+}
+
+static void unselect_col(uint8_t col) {
+    switch (col) {
+        case 0:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinLow(B0);
+          break;
+        case 1:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinLow(B0);
+          break;
+        case 2:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinLow(B0);
+          break;
+        case 3:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinLow(B0);
+          break;
+        case 4:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinLow(B0);
+          break;
+        case 5:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinLow(B0);
+          break;
+        case 6:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinLow(B0);
+          break;
+        case 7:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinLow(B0);
+          break;
+        case 8:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinLow(F1);
+          break;
+        case 9:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinLow(F1);
+          break;
+        case 10:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinLow(F1);
+          break;
+        case 11:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinLow(F1);
+          break;
+        case 12:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinLow(F1);
+          break;
+        case 13:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinLow(F1);
+          break;
+        case 14:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinLow(F1);
+          break;
+        case 15:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinLow(F1);
+          break;
+        case 16:
+          writePinHigh(E6);
+          break;
+    }
+}
+
+static void unselect_cols(void) {
+    //Native
+    writePinHigh(E6);
+
+    //Demultiplexer
+    writePinLow(B0);
+    writePinLow(F1);
+    writePinHigh(B5);
+    writePinHigh(B7);
+    writePinHigh(F0);
+}
+
+static void init_pins(void) {
+    unselect_cols();
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+    setPinOutput(B5);
+    setPinOutput(B7);
+    setPinOutput(F0);
+    setPinOutput(B0);
+    setPinOutput(F1);
+    setPinOutput(E6);
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
+    bool matrix_changed = false;
+
+    // Select col and wait for col selecton to stabilize
+    select_col(current_col);
+    matrix_io_delay();
+
+    // For each row...
+    for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[row_index];
+
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0) {
+            // Pin LO, set col bit
+            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
+        } else {
+            // Pin HI, clear col bit
+            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
+            matrix_changed = true;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+
+    return matrix_changed;
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool changed = false;
+
+    // Set col, read rows
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+        changed |= read_rows_on_col(current_matrix, current_col);
+    }
+
+    return changed;
+}
+
diff --git a/keyboards/lz/erghost/readme.md b/keyboards/lz/erghost/readme.md
new file mode 100644
index 0000000000..8a48d912d0
--- /dev/null
+++ b/keyboards/lz/erghost/readme.md
@@ -0,0 +1,27 @@
+# erGhost
+
+![erGhost](https://i.imgur.com/7cUHEXTl.jpeg)
+
+LZ erGhost PCB
+
+* Keyboard Maintainer: [Mechlovin](https://github.com/mechlovin)
+* Hardware Supported: erGhost PCB, Atmega32u4
+* Hardware Availability: [GB](https://geekhack.org/index.php?topic=115100.0)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make lz/erghost:default
+
+Flashing example for this keyboard:
+
+    make lz/erghost:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Physical reset button**: Press the button on the back of the PCB
\ No newline at end of file
diff --git a/keyboards/lz/erghost/rules.mk b/keyboards/lz/erghost/rules.mk
new file mode 100644
index 0000000000..a10d80e257
--- /dev/null
+++ b/keyboards/lz/erghost/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c

From 6e40dfa0220e68a6628d9e7d18788df6bcae5473 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 27 Dec 2021 11:52:10 +1100
Subject: [PATCH 048/867] Add open-drain GPIO support. (#15282)

* Add open-drain GPIO support.

* `qmk format-c`

* Wording.

* Remove port GPIO implementations as the only board that uses it has its own internal defs anyway. Will wait for first-class handling of ports in core before reimplementing.
---
 docs/internals_gpio_control.md | 24 +++++++++++++-----------
 platforms/arm_atsam/gpio.h     | 12 ++++++++----
 platforms/avr/gpio.h           | 17 +++--------------
 platforms/chibios/gpio.h       | 24 ++++++------------------
 4 files changed, 30 insertions(+), 47 deletions(-)

diff --git a/docs/internals_gpio_control.md b/docs/internals_gpio_control.md
index ccd3f8c74d..e1f1515b71 100644
--- a/docs/internals_gpio_control.md
+++ b/docs/internals_gpio_control.md
@@ -6,17 +6,19 @@ QMK has a GPIO control abstraction layer which is microcontroller agnostic. This
 
 The following functions provide basic control of GPIOs and are found in `platforms/<platform>/gpio.h`.
 
-|Function                |Description                                       | Old AVR Examples                                | Old ChibiOS/ARM Examples                        |
-|------------------------|--------------------------------------------------|-------------------------------------------------|-------------------------------------------------|
-| `setPinInput(pin)`     | Set pin as input with high impedance (High-Z)    | `DDRB &= ~(1<<2)`                               | `palSetLineMode(pin, PAL_MODE_INPUT)`           |
-| `setPinInputHigh(pin)` | Set pin as input with builtin pull-up resistor   | `DDRB &= ~(1<<2); PORTB \|= (1<<2)`             | `palSetLineMode(pin, PAL_MODE_INPUT_PULLUP)`    |
-| `setPinInputLow(pin)`  | Set pin as input with builtin pull-down resistor | N/A (Not supported on AVR)                      | `palSetLineMode(pin, PAL_MODE_INPUT_PULLDOWN)`  |
-| `setPinOutput(pin)`    | Set pin as output                                | `DDRB \|= (1<<2)`                               | `palSetLineMode(pin, PAL_MODE_OUTPUT_PUSHPULL)` |
-| `writePinHigh(pin)`    | Set pin level as high, assuming it is an output  | `PORTB \|= (1<<2)`                              | `palSetLine(pin)`                               |
-| `writePinLow(pin)`     | Set pin level as low, assuming it is an output   | `PORTB &= ~(1<<2)`                              | `palClearLine(pin)`                             |
-| `writePin(pin, level)` | Set pin level, assuming it is an output          | `(level) ? PORTB \|= (1<<2) : PORTB &= ~(1<<2)` | `(level) ? palSetLine(pin) : palClearLine(pin)` |
-| `readPin(pin)`         | Returns the level of the pin                     | `_SFR_IO8(pin >> 4) & _BV(pin & 0xF)`           | `palReadLine(pin)`                              |
-| `togglePin(pin)`       | Invert pin level, assuming it is an output       | `PORTB ^= (1<<2)`                               | `palToggleLine(pin)`                            |
+| Function                     | Description                                         | Old AVR Examples                                | Old ChibiOS/ARM Examples                         |
+|------------------------------|-----------------------------------------------------|-------------------------------------------------|--------------------------------------------------|
+| `setPinInput(pin)`           | Set pin as input with high impedance (High-Z)       | `DDRB &= ~(1<<2)`                               | `palSetLineMode(pin, PAL_MODE_INPUT)`            |
+| `setPinInputHigh(pin)`       | Set pin as input with builtin pull-up resistor      | `DDRB &= ~(1<<2); PORTB \|= (1<<2)`             | `palSetLineMode(pin, PAL_MODE_INPUT_PULLUP)`     |
+| `setPinInputLow(pin)`        | Set pin as input with builtin pull-down resistor    | N/A (Not supported on AVR)                      | `palSetLineMode(pin, PAL_MODE_INPUT_PULLDOWN)`   |
+| `setPinOutput(pin)`          | Set pin as output (alias of `setPinOutputPushPull`) | `DDRB \|= (1<<2)`                               | `palSetLineMode(pin, PAL_MODE_OUTPUT_PUSHPULL)`  |
+| `setPinOutputPushPull(pin)`  | Set pin as output, push/pull mode                   | `DDRB \|= (1<<2)`                               | `palSetLineMode(pin, PAL_MODE_OUTPUT_PUSHPULL)`  |
+| `setPinOutputOpenDrain(pin)` | Set pin as output, open-drain mode                  | N/A (Not implemented on AVR)                    | `palSetLineMode(pin, PAL_MODE_OUTPUT_OPENDRAIN)` |
+| `writePinHigh(pin)`          | Set pin level as high, assuming it is an output     | `PORTB \|= (1<<2)`                              | `palSetLine(pin)`                                |
+| `writePinLow(pin)`           | Set pin level as low, assuming it is an output      | `PORTB &= ~(1<<2)`                              | `palClearLine(pin)`                              |
+| `writePin(pin, level)`       | Set pin level, assuming it is an output             | `(level) ? PORTB \|= (1<<2) : PORTB &= ~(1<<2)` | `(level) ? palSetLine(pin) : palClearLine(pin)`  |
+| `readPin(pin)`               | Returns the level of the pin                        | `_SFR_IO8(pin >> 4) & _BV(pin & 0xF)`           | `palReadLine(pin)`                               |
+| `togglePin(pin)`             | Invert pin level, assuming it is an output          | `PORTB ^= (1<<2)`                               | `palToggleLine(pin)`                             |
 
 ## Advanced Settings :id=advanced-settings
 
diff --git a/platforms/arm_atsam/gpio.h b/platforms/arm_atsam/gpio.h
index 915ed0ef4f..a42aaff54d 100644
--- a/platforms/arm_atsam/gpio.h
+++ b/platforms/arm_atsam/gpio.h
@@ -22,9 +22,9 @@
 
 typedef uint8_t pin_t;
 
-#define SAMD_PORT(pin) ((pin & 0x20) >> 5)
-#define SAMD_PIN(pin) (pin & 0x1f)
-#define SAMD_PIN_MASK(pin) (1 << (pin & 0x1f))
+#define SAMD_PORT(pin) (((pin)&0x20) >> 5)
+#define SAMD_PIN(pin) ((pin)&0x1f)
+#define SAMD_PIN_MASK(pin) (1 << ((pin)&0x1f))
 
 #define setPinInput(pin)                                                                 \
     do {                                                                                 \
@@ -48,12 +48,16 @@ typedef uint8_t pin_t;
         PORT->Group[SAMD_PORT(pin)].PINCFG[SAMD_PIN(pin)].bit.PULLEN = 1;                  \
     } while (0)
 
-#define setPinOutput(pin)                                            \
+#define setPinOutputPushPull(pin)                                    \
     do {                                                             \
         PORT->Group[SAMD_PORT(pin)].DIRSET.reg = SAMD_PIN_MASK(pin); \
         PORT->Group[SAMD_PORT(pin)].OUTCLR.reg = SAMD_PIN_MASK(pin); \
     } while (0)
 
+#define setPinOutputOpenDrain(pin) _Static_assert(0, "arm_atsam platform does not implement an open-drain output")
+
+#define setPinOutput(pin) setPinOutputPushPull(pin)
+
 #define writePinHigh(pin)                                            \
     do {                                                             \
         PORT->Group[SAMD_PORT(pin)].OUTSET.reg = SAMD_PIN_MASK(pin); \
diff --git a/platforms/avr/gpio.h b/platforms/avr/gpio.h
index e9be68491d..95f15c28dc 100644
--- a/platforms/avr/gpio.h
+++ b/platforms/avr/gpio.h
@@ -25,7 +25,9 @@ typedef uint8_t pin_t;
 #define setPinInput(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin)&0xF), PORTx_ADDRESS(pin) &= ~_BV((pin)&0xF))
 #define setPinInputHigh(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin)&0xF), PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
 #define setPinInputLow(pin) _Static_assert(0, "AVR processors cannot implement an input as pull low")
-#define setPinOutput(pin) (DDRx_ADDRESS(pin) |= _BV((pin)&0xF))
+#define setPinOutputPushPull(pin) (DDRx_ADDRESS(pin) |= _BV((pin)&0xF))
+#define setPinOutputOpenDrain(pin) _Static_assert(0, "AVR platform does not implement an open-drain output")
+#define setPinOutput(pin) setPinOutputPushPull(pin)
 
 #define writePinHigh(pin) (PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
 #define writePinLow(pin) (PORTx_ADDRESS(pin) &= ~_BV((pin)&0xF))
@@ -34,16 +36,3 @@ typedef uint8_t pin_t;
 #define readPin(pin) ((bool)(PINx_ADDRESS(pin) & _BV((pin)&0xF)))
 
 #define togglePin(pin) (PORTx_ADDRESS(pin) ^= _BV((pin)&0xF))
-
-/* Operation of GPIO by port. */
-
-typedef uint8_t port_data_t;
-
-#define readPort(port) PINx_ADDRESS(port)
-
-#define setPortBitInput(port, bit) (DDRx_ADDRESS(port) &= ~_BV((bit)&0xF), PORTx_ADDRESS(port) &= ~_BV((bit)&0xF))
-#define setPortBitInputHigh(port, bit) (DDRx_ADDRESS(port) &= ~_BV((bit)&0xF), PORTx_ADDRESS(port) |= _BV((bit)&0xF))
-#define setPortBitOutput(port, bit) (DDRx_ADDRESS(port) |= _BV((bit)&0xF))
-
-#define writePortBitLow(port, bit) (PORTx_ADDRESS(port) &= ~_BV((bit)&0xF))
-#define writePortBitHigh(port, bit) (PORTx_ADDRESS(port) |= _BV((bit)&0xF))
diff --git a/platforms/chibios/gpio.h b/platforms/chibios/gpio.h
index 4d057f1cab..eb44a18f9c 100644
--- a/platforms/chibios/gpio.h
+++ b/platforms/chibios/gpio.h
@@ -22,10 +22,12 @@ typedef ioline_t pin_t;
 
 /* Operation of GPIO by pin. */
 
-#define setPinInput(pin) palSetLineMode(pin, PAL_MODE_INPUT)
-#define setPinInputHigh(pin) palSetLineMode(pin, PAL_MODE_INPUT_PULLUP)
-#define setPinInputLow(pin) palSetLineMode(pin, PAL_MODE_INPUT_PULLDOWN)
-#define setPinOutput(pin) palSetLineMode(pin, PAL_MODE_OUTPUT_PUSHPULL)
+#define setPinInput(pin) palSetLineMode((pin), PAL_MODE_INPUT)
+#define setPinInputHigh(pin) palSetLineMode((pin), PAL_MODE_INPUT_PULLUP)
+#define setPinInputLow(pin) palSetLineMode((pin), PAL_MODE_INPUT_PULLDOWN)
+#define setPinOutputPushPull(pin) palSetLineMode((pin), PAL_MODE_OUTPUT_PUSHPULL)
+#define setPinOutputOpenDrain(pin) palSetLineMode((pin), PAL_MODE_OUTPUT_OPENDRAIN)
+#define setPinOutput(pin) setPinOutputPushPull(pin)
 
 #define writePinHigh(pin) palSetLine(pin)
 #define writePinLow(pin) palClearLine(pin)
@@ -34,17 +36,3 @@ typedef ioline_t pin_t;
 #define readPin(pin) palReadLine(pin)
 
 #define togglePin(pin) palToggleLine(pin)
-
-/* Operation of GPIO by port. */
-
-typedef uint16_t port_data_t;
-
-#define readPort(pin) palReadPort(PAL_PORT(pin))
-
-#define setPortBitInput(pin, bit) palSetPadMode(PAL_PORT(pin), bit, PAL_MODE_INPUT)
-#define setPortBitInputHigh(pin, bit) palSetPadMode(PAL_PORT(pin), bit, PAL_MODE_INPUT_PULLUP)
-#define setPortBitInputLow(pin, bit) palSetPadMode(PAL_PORT(pin), bit, PAL_MODE_INPUT_PULLDOWN)
-#define setPortBitOutput(pin, bit) palSetPadMode(PAL_PORT(pin), bit, PAL_MODE_OUTPUT_PUSHPULL)
-
-#define writePortBitLow(pin, bit) palClearLine(PAL_LINE(PAL_PORT(pin), bit))
-#define writePortBitHigh(pin, bit) palSetLine(PAL_LINE(PAL_PORT(pin), bit))

From 0391801267799dfe233cd0962357a0bf332c3908 Mon Sep 17 00:00:00 2001
From: vectorstorm <github@gridbug.org>
Date: Mon, 27 Dec 2021 11:52:56 +1100
Subject: [PATCH 049/867] Fixes potential wpm sampling overflow, along with
 code comment fixes (#15277)

Co-authored-by: Trevor Powell <trevor@vectorstorm.com.au>
---
 docs/feature_wpm.md |  2 +-
 quantum/wpm.c       | 75 ++++++++++++++++++++++++++-------------------
 quantum/wpm.h       |  2 +-
 3 files changed, 45 insertions(+), 34 deletions(-)

diff --git a/docs/feature_wpm.md b/docs/feature_wpm.md
index 87145c97e3..9f98ef8336 100644
--- a/docs/feature_wpm.md
+++ b/docs/feature_wpm.md
@@ -16,7 +16,7 @@ For split keyboards using soft serial, the computed WPM score will be available
 | `WPM_ALLOW_COUNT_REGRESSION` | _Not defined_ | If defined allows the WPM to be decreased when hitting Delete or Backspace               |
 | `WPM_UNFILTERED`             | _Not defined_ | If undefined (the default), WPM values will be smoothed to avoid sudden changes in value |
 | `WPM_SAMPLE_SECONDS`         | `5`           | This defines how many seconds of typing to average, when calculating WPM                 |
-| `WPM_SAMPLE_PERIODS`         | `50`          | This defines how many sampling periods to use when calculating WPM                       |
+| `WPM_SAMPLE_PERIODS`         | `25`          | This defines how many sampling periods to use when calculating WPM                       |
 | `WPM_LAUNCH_CONTROL`         | _Not defined_ | If defined, WPM values will be calculated using partial buffers when typing begins       |
 
 'WPM_UNFILTERED' is potentially useful if you're filtering data in some other way (and also because it reduces the code required for the WPM feature), or if reducing measurement latency to a minimum is important for you.
diff --git a/quantum/wpm.c b/quantum/wpm.c
index 925e2c416e..62d4128b8e 100644
--- a/quantum/wpm.c
+++ b/quantum/wpm.c
@@ -22,33 +22,37 @@
 // WPM Stuff
 static uint8_t  current_wpm = 0;
 static uint32_t wpm_timer   = 0;
-#ifndef WPM_UNFILTERED
-static uint32_t smoothing_timer = 0;
-#endif
 
 /* The WPM calculation works by specifying a certain number of 'periods' inside
  * a ring buffer, and we count the number of keypresses which occur in each of
  * those periods.  Then to calculate WPM, we add up all of the keypresses in
  * the whole ring buffer, divide by the number of keypresses in a 'word', and
- * then adjust for how much time is captured by our ring buffer.  Right now
- * the ring buffer is hardcoded below to be six half-second periods, accounting
- * for a total WPM sampling period of up to three seconds of typing.
+ * then adjust for how much time is captured by our ring buffer.  The size
+ * of the ring buffer can be configured using the keymap configuration
+ * value `WPM_SAMPLE_PERIODS`.
  *
- * Whenever our WPM drops to absolute zero due to no typing occurring within
- * any contiguous three seconds, we reset and start measuring fresh,
- * which lets our WPM immediately reach the correct value even before a full
- * three second sampling buffer has been filled.
  */
 #define MAX_PERIODS (WPM_SAMPLE_PERIODS)
 #define PERIOD_DURATION (1000 * WPM_SAMPLE_SECONDS / MAX_PERIODS)
-#define LATENCY (100)
-static int8_t  period_presses[MAX_PERIODS] = {0};
+
+static int16_t period_presses[MAX_PERIODS] = {0};
 static uint8_t current_period              = 0;
 static uint8_t periods                     = 1;
 
 #if !defined(WPM_UNFILTERED)
-static uint8_t prev_wpm = 0;
-static uint8_t next_wpm = 0;
+/* LATENCY is used as part of filtering, and controls how quickly the reported
+ * WPM trails behind our actual instantaneous measured WPM value, and is
+ * defined in milliseconds.  So for LATENCY == 100, the displayed WPM is
+ * smoothed out over periods of 0.1 seconds.  This results in a nice,
+ * smoothly-moving reported WPM value which nevertheless is never more than
+ * 0.1 seconds behind the typist's actual current WPM.
+ *
+ * LATENCY is not used if WPM_UNFILTERED is defined.
+ */
+#    define LATENCY (100)
+static uint32_t smoothing_timer = 0;
+static uint8_t  prev_wpm        = 0;
+static uint8_t  next_wpm        = 0;
 #endif
 
 void    set_current_wpm(uint8_t new_wpm) { current_wpm = new_wpm; }
@@ -71,7 +75,7 @@ __attribute__((weak)) bool wpm_keycode_user(uint16_t keycode) {
     return false;
 }
 
-#ifdef WPM_ALLOW_COUNT_REGRESSION
+#if defined(WPM_ALLOW_COUNT_REGRESSION)
 __attribute__((weak)) uint8_t wpm_regress_count(uint16_t keycode) {
     bool weak_modded = (keycode >= QK_LCTL && keycode < QK_LSFT) || (keycode >= QK_RCTL && keycode < QK_RSFT);
 
@@ -95,12 +99,12 @@ __attribute__((weak)) uint8_t wpm_regress_count(uint16_t keycode) {
 // Outside 'raw' mode we smooth results over time.
 
 void update_wpm(uint16_t keycode) {
-    if (wpm_keycode(keycode)) {
+    if (wpm_keycode(keycode) && period_presses[current_period] < INT16_MAX) {
         period_presses[current_period]++;
     }
-#ifdef WPM_ALLOW_COUNT_REGRESSION
+#if defined(WPM_ALLOW_COUNT_REGRESSION)
     uint8_t regress = wpm_regress_count(keycode);
-    if (regress) {
+    if (regress && period_presses[current_period] > INT16_MIN) {
         period_presses[current_period]--;
     }
 #endif
@@ -116,32 +120,41 @@ void decay_wpm(void) {
     }
     int32_t  elapsed  = timer_elapsed32(wpm_timer);
     uint32_t duration = (((periods)*PERIOD_DURATION) + elapsed);
-    uint32_t wpm_now  = (60000 * presses) / (duration * WPM_ESTIMATED_WORD_SIZE);
-    wpm_now           = (wpm_now > 240) ? 240 : wpm_now;
+    int32_t  wpm_now  = (60000 * presses) / (duration * WPM_ESTIMATED_WORD_SIZE);
+
+    if (wpm_now < 0)  // set some reasonable WPM measurement limits
+        wpm_now = 0;
+    if (wpm_now > 240) wpm_now = 240;
 
     if (elapsed > PERIOD_DURATION) {
         current_period                 = (current_period + 1) % MAX_PERIODS;
         period_presses[current_period] = 0;
         periods                        = (periods < MAX_PERIODS - 1) ? periods + 1 : MAX_PERIODS - 1;
         elapsed                        = 0;
-        /* if (wpm_timer == 0) { */
-        wpm_timer = timer_read32();
-        /* } else { */
-        /*     wpm_timer += PERIOD_DURATION; */
-        /* } */
+        wpm_timer                      = timer_read32();
     }
     if (presses < 2)  // don't guess high WPM based on a single keypress.
         wpm_now = 0;
 
-#if defined WPM_LAUNCH_CONTROL
+#if defined(WPM_LAUNCH_CONTROL)
+    /*
+     * If the `WPM_LAUNCH_CONTROL` option is enabled, then whenever our WPM
+     * drops to absolute zero due to no typing occurring within our sample
+     * ring buffer, we reset and start measuring fresh, which lets our WPM
+     * immediately reach the correct value even before a full sampling buffer
+     * has been filled.
+     */
     if (presses == 0) {
-        current_period = 0;
-        periods        = 0;
-        wpm_now        = 0;
+        current_period    = 0;
+        periods           = 0;
+        wpm_now           = 0;
+        period_presses[0] = 0;
     }
 #endif  // WPM_LAUNCH_CONTROL
 
-#ifndef WPM_UNFILTERED
+#if defined(WPM_UNFILTERED)
+    current_wpm = wpm_now;
+#else
     int32_t latency = timer_elapsed32(smoothing_timer);
     if (latency > LATENCY) {
         smoothing_timer = timer_read32();
@@ -150,7 +163,5 @@ void decay_wpm(void) {
     }
 
     current_wpm = prev_wpm + (latency * ((int)next_wpm - (int)prev_wpm) / LATENCY);
-#else
-    current_wpm = wpm_now;
 #endif
 }
diff --git a/quantum/wpm.h b/quantum/wpm.h
index c8e7d26684..305d75b450 100644
--- a/quantum/wpm.h
+++ b/quantum/wpm.h
@@ -26,7 +26,7 @@
 #    define WPM_SAMPLE_SECONDS 5
 #endif
 #ifndef WPM_SAMPLE_PERIODS
-#    define WPM_SAMPLE_PERIODS 50
+#    define WPM_SAMPLE_PERIODS 25
 #endif
 
 bool wpm_keycode(uint16_t keycode);

From 76a673233c8cb3d97130a6dece364c24b29f5fd7 Mon Sep 17 00:00:00 2001
From: Hugo Osvaldo Barrera <hugo@barrera.io>
Date: Mon, 27 Dec 2021 01:53:46 +0100
Subject: [PATCH 050/867] Add a clarification to an error message (#15207)

Makes this a bit more foolproof.

See https://github.com/qmk/qmk_firmware/issues/15202
---
 builddefs/message.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/builddefs/message.mk b/builddefs/message.mk
index cb4ef43719..1187491452 100644
--- a/builddefs/message.mk
+++ b/builddefs/message.mk
@@ -87,6 +87,7 @@ define GENERATE_MSG_AVAILABLE_KEYMAPS
 endef
 MSG_AVAILABLE_KEYMAPS = $(eval $(call GENERATE_MSG_AVAILABLE_KEYMAPS))$(MSG_AVAILABLE_KEYMAPS_ACTUAL)
 
+MSG_BOOTLOADER_NOT_FOUND_BASE = Bootloader not found. Make sure the board is in bootloader mode. See https://docs.qmk.fm/\#/newbs_flashing\n
 MSG_CHECK_FILESIZE = Checking file size of $(TARGET).$(FIRMWARE_FORMAT)
 MSG_CHECK_FILESIZE_SKIPPED = (Firmware size check does not yet support $(MCU_ORIG); skipping)
 MSG_FILE_TOO_BIG = $(ERROR_COLOR)The firmware is too large!$(NO_COLOR) $(CURRENT_SIZE)/$(MAX_SIZE) ($(OVER_SIZE) bytes over)\n
@@ -97,6 +98,6 @@ MSG_PYTHON_MISSING = $(ERROR_COLOR)ERROR:$(NO_COLOR) Cannot run \"qmk hello\"!\n
 	Please run $(BOLD)qmk setup$(NO_COLOR) to install all the dependencies QMK requires.\n\n
 MSG_FLASH_BOOTLOADER = $(WARN_COLOR)WARNING:$(NO_COLOR) This board's bootloader is not specified or is not supported by the \":flash\" target at this time.\n\n
 MSG_FLASH_ARCH = $(WARN_COLOR)WARNING:$(NO_COLOR) This board's architecture is not supported by the \":flash\" target at this time.\n\n
-MSG_BOOTLOADER_NOT_FOUND = $(ERROR_COLOR)ERROR:$(NO_COLOR) Bootloader not found. Trying again in 5s (Ctrl+C to cancel)\n
+MSG_BOOTLOADER_NOT_FOUND = $(ERROR_COLOR)ERROR:$(NO_COLOR) $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying again in 5s (Ctrl+C to cancel)\n
 BOOTLOADER_RETRY_TIME ?= 0.5
-MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = Bootloader not found. Trying again every $(BOOTLOADER_RETRY_TIME)s (Ctrl+C to cancel)
+MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying again every $(BOOTLOADER_RETRY_TIME)s (Ctrl+C to cancel)

From 51be57c28709f60ce8c196de48d302d67abe6a4d Mon Sep 17 00:00:00 2001
From: cdc-mkb <90561417+cdc-mkb@users.noreply.github.com>
Date: Mon, 27 Dec 2021 02:00:06 +0100
Subject: [PATCH 051/867] [Keyboard] Add MNT Reform USB Keyboard (Standalone)
 (#15561)

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/mntre/config.h                  | 101 ++++++++++++++++++++++
 keyboards/mntre/info.json                 |  98 +++++++++++++++++++++
 keyboards/mntre/keymaps/default/keymap.c  |  31 +++++++
 keyboards/mntre/keymaps/default/readme.md |  19 ++++
 keyboards/mntre/mntre.c                   |  19 ++++
 keyboards/mntre/mntre.h                   |  30 +++++++
 keyboards/mntre/readme.md                 |  27 ++++++
 keyboards/mntre/rules.mk                  |  21 +++++
 8 files changed, 346 insertions(+)
 create mode 100644 keyboards/mntre/config.h
 create mode 100644 keyboards/mntre/info.json
 create mode 100644 keyboards/mntre/keymaps/default/keymap.c
 create mode 100644 keyboards/mntre/keymaps/default/readme.md
 create mode 100644 keyboards/mntre/mntre.c
 create mode 100644 keyboards/mntre/mntre.h
 create mode 100644 keyboards/mntre/readme.md
 create mode 100644 keyboards/mntre/rules.mk

diff --git a/keyboards/mntre/config.h b/keyboards/mntre/config.h
new file mode 100644
index 0000000000..9ee3d3f272
--- /dev/null
+++ b/keyboards/mntre/config.h
@@ -0,0 +1,101 @@
+// Copyright 2021 Cedric Vincent (@cdc-mkb)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x1302
+#define DEVICE_VER   0x0002
+#define MANUFACTURER MNT Research GmbH
+#define PRODUCT      MNT Reform USB Keyboard (Standalone)
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 14
+
+/*
+ * 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 { B6, B5, B4, D7, D6, D4 }
+#define MATRIX_COL_PINS { D5, F7, E6, C7, B3, B2, B1, B0, F0, F1, F4, F5, F6, C6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_PIN B7
+#define BACKLIGHT_CUSTOM_RESOLUTION 0x400
+#define BACKLIGHT_LIMIT_VAL 84
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mntre/info.json b/keyboards/mntre/info.json
new file mode 100644
index 0000000000..05e4bd4fd0
--- /dev/null
+++ b/keyboards/mntre/info.json
@@ -0,0 +1,98 @@
+{
+    "keyboard_name": "MNT Reform USB Keyboard (Standalone)",
+    "url": "https://shop.mntmn.com/products/mnt-reform-usb-keyboard-standalone",
+    "maintainer": "cdc-mkb",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "ESC", "x": 0,  "y": 0},
+                {"label": "F1",  "x": 1,  "y": 0},
+                {"label": "F2",  "x": 2,  "y": 0},
+                {"label": "F3",  "x": 3,  "y": 0},
+                {"label": "F4",  "x": 4,  "y": 0},
+                {"label": "F5",  "x": 5,  "y": 0},
+                {"label": "F6",  "x": 6,  "y": 0},
+                {"label": "F7",  "x": 7,  "y": 0},
+                {"label": "F8",  "x": 8,  "y": 0},
+                {"label": "F9",  "x": 9,  "y": 0},
+                {"label": "F10", "x": 10, "y": 0},
+                {"label": "F11", "x": 11, "y": 0},
+                {"label": "F12", "x": 12, "y": 0},
+                {"label": "NO",  "x": 13, "y": 0, "w": 1.5},
+
+                {"label": "GRAVE",  "x": 0,  "y": 1},
+                {"label": "1",      "x": 1,  "y": 1},
+                {"label": "2",      "x": 2,  "y": 1},
+                {"label": "3",      "x": 3,  "y": 1},
+                {"label": "4",      "x": 4,  "y": 1},
+                {"label": "5",      "x": 5,  "y": 1},
+                {"label": "6",      "x": 6,  "y": 1},
+                {"label": "7",      "x": 7,  "y": 1},
+                {"label": "8",      "x": 8,  "y": 1},
+                {"label": "9",      "x": 9,  "y": 1},
+                {"label": "0",      "x": 10, "y": 1},
+                {"label": "MINUS",  "x": 11, "y": 1},
+                {"label": "EQUAL",  "x": 12, "y": 1},
+                {"label": "BSPACE", "x": 13, "y": 1, "w": 1.5},
+
+                {"label": "TAB",      "x": 0,    "y": 2, "w": 1.5},
+                {"label": "Q",        "x": 1.5,  "y": 2},
+                {"label": "W",        "x": 2.5,  "y": 2},
+                {"label": "E",        "x": 3.5,  "y": 2},
+                {"label": "R",        "x": 4.5,  "y": 2},
+                {"label": "T",        "x": 5.5,  "y": 2},
+                {"label": "Y",        "x": 6.5,  "y": 2},
+                {"label": "U",        "x": 7.5,  "y": 2},
+                {"label": "I",        "x": 8.5,  "y": 2},
+                {"label": "O",        "x": 9.5,  "y": 2},
+                {"label": "P",        "x": 10.5, "y": 2},
+                {"label": "LBRACKET", "x": 11.5, "y": 2},
+                {"label": "RBRACKET", "x": 12.5, "y": 2},
+                {"label": "BSLASH",   "x": 13.5, "y": 2},
+
+                {"label": "LCTRL",  "x": 0,  "y": 3},
+                {"label": "APP",    "x": 1,  "y": 3},
+                {"label": "A",      "x": 2,  "y": 3},
+                {"label": "S",      "x": 3,  "y": 3},
+                {"label": "D",      "x": 4,  "y": 3},
+                {"label": "F",      "x": 5,  "y": 3},
+                {"label": "G",      "x": 6,  "y": 3},
+                {"label": "H",      "x": 7,  "y": 3},
+                {"label": "J",      "x": 8,  "y": 3},
+                {"label": "K",      "x": 9,  "y": 3},
+                {"label": "L",      "x": 10, "y": 3},
+                {"label": "SCOLON", "x": 11, "y": 3},
+                {"label": "QUOTE",  "x": 12, "y": 3},
+                {"label": "ENTER",  "x": 13, "y": 3, "w": 1.5},
+
+                {"label": "LSHIFT", "x": 0,    "y": 4, "w": 1.5},
+                {"label": "DEL",    "x": 1.5,  "y": 4},
+                {"label": "Z",      "x": 2.5,  "y": 4},
+                {"label": "X",      "x": 3.5,  "y": 4},
+                {"label": "C",      "x": 4.5,  "y": 4},
+                {"label": "V",      "x": 5.5,  "y": 4},
+                {"label": "B",      "x": 6.5,  "y": 4},
+                {"label": "N",      "x": 7.5,  "y": 4},
+                {"label": "M",      "x": 8.5,  "y": 4},
+                {"label": "COMMA",  "x": 9.5,  "y": 4},
+                {"label": "DOT",    "x": 10.5, "y": 4},
+                {"label": "SLASH",  "x": 11.5, "y": 4},
+                {"label": "UP",     "x": 12.5, "y": 4},
+                {"label": "RSHIFT", "x": 13.5, "y": 4},
+
+                {"label": "RGUI",    "x": 0,   "y": 5, "w": 1.5},
+                {"label": "LGUI",    "x": 1.5, "y": 5, "w": 1.5},
+                {"label": "RCTRL",   "x": 3,   "y": 5, "w": 1.5},
+                {"label": "SPACE",   "x": 4.5, "y": 5, "w": 1.5},
+                {"label": "LALT",    "x": 6,   "y": 5},
+                {"label": "RALT",    "x": 7,   "y": 5},
+                {"label": "SPACE",   "x": 8,   "y": 5, "w": 1.5},
+                {"label": "PGUP",    "x": 9.5,  "y": 5},
+                {"label": "PGDOWN",  "x": 10.5, "y": 5},
+                {"label": "LEFT",    "x": 11.5, "y": 5},
+                {"label": "DOWN",    "x": 12.5, "y": 5},
+                {"label": "RIGHT",   "x": 13.5, "y": 5},
+            ]
+        }
+    }
+}
diff --git a/keyboards/mntre/keymaps/default/keymap.c b/keyboards/mntre/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4dcdebe31b
--- /dev/null
+++ b/keyboards/mntre/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+// Copyright 2021 Cedric Vincent (@cdc-mkb)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_ESC,    KC_F1,   KC_F2,    KC_F3,    KC_F4,   KC_F5,   KC_F6,    KC_F7,   KC_F8,     KC_F9,    KC_F10,  KC_F11,      KC_F12,      MO(_FN),
+        KC_GRAVE,  KC_1,    KC_2,     KC_3,     KC_4,    KC_5,    KC_6,     KC_7,    KC_8,      KC_9,     KC_0,    KC_MINUS,    KC_EQUAL,    KC_BSPACE,
+        KC_TAB,    KC_Q,    KC_W,     KC_E,     KC_R,    KC_T,    KC_Y,     KC_U,    KC_I,      KC_O,     KC_P,    KC_LBRACKET, KC_RBRACKET, KC_BSLASH,
+        KC_LCTRL,  KC_APP,  KC_A,     KC_S,     KC_D,    KC_F,    KC_G,     KC_H,    KC_J,      KC_K,     KC_L,    KC_SCOLON,   KC_QUOTE,    KC_ENTER,
+        KC_LSHIFT, KC_DEL,  KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,     KC_N,    KC_M,      KC_COMMA, KC_DOT,  KC_SLASH,    KC_UP,       KC_RSHIFT,
+        KC_RGUI,   KC_LGUI, KC_RCTRL, KC_SPACE, KC_LALT, KC_RALT, KC_SPACE, KC_PGUP, KC_PGDOWN, KC_LEFT,  KC_DOWN, KC_RIGHT
+    ),
+
+    [_FN] = LAYOUT(
+        _______, BL_DEC,   BL_INC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/mntre/keymaps/default/readme.md b/keyboards/mntre/keymaps/default/readme.md
new file mode 100644
index 0000000000..fecdb68ea4
--- /dev/null
+++ b/keyboards/mntre/keymaps/default/readme.md
@@ -0,0 +1,19 @@
+# Default layout of MNT Reform USB Keyboard (Standalone)
+
+This is exactly the same layout as in the original firmware.
+Backlight level can be decreased and increased using Fn+F1 and Fn+F2
+respectively.
+
+  ┏━━━━━━┯━━━━━━┯━━━━━━┯━━━━━━┯━━━━━━┯━━━━━━┯━━━━━━┯━━━━━━┯━━━━━━┯━━━━━━┯━━━━━━┯━━━━━━┯━━━━━━┯━━━━━━━━━━┓
+  ┃  Esc │  F1  │  F2  │  F3  │  F4  │  F5  │  F6  │  F7  │  F8  │  F9  │  F10 │  F11 │  F12 │    Fn    ┃
+  ┠──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────┼──────────┨
+  ┃  `~  │  1!  │  2@  │  3#  │  4$  │  5%  │  6^  │  7&  │  8*  │  9(  │  0)  │  -_  │  =+  │ Backspace┃
+  ┠──────┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──────┨
+  ┃    Tab   │   Q  │   W  │   E  │   R  │   T  │   Y  │   U  │   I  │   O  │   P  │  [{  │  ]}  │  \|  ┃
+  ┠──────┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──┬───┴──────┨
+  ┃ LCtrl│  App │   A  │   S  │   D  │   F  │   G  │   H  │   J  │   K  │   L  │  ;:  │  '"  │   Enter  ┃
+  ┠──────┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──┴───┬──────┨
+  ┃  LShift  │  Del │   Z  │   X  │   C  │   V  │   B  │   N  │   M  │  ,<  │  .>  │  /?  │  Up  │RShift┃
+  ┠──────────┼──────┴──┬───┴──────┼──────┴──┬───┴──┬───┴──┬───┴──────┼──────┼──────┼──────┼──────┼──────┨
+  ┃   RGUI   │   LGUI  │   RCtrl  │  Space  │ LAlt │ RAlt │  Space   │ PgUp │ PgDn │ Left │ Down │ Right┃
+  ┗━━━━━━━━━━┷━━━━━━━━━┷━━━━━━━━━━┷━━━━━━━━━┷━━━━━━┷━━━━━━┷━━━━━━━━━━┷━━━━━━┷━━━━━━┷━━━━━━┷━━━━━━┷━━━━━━┛
diff --git a/keyboards/mntre/mntre.c b/keyboards/mntre/mntre.c
new file mode 100644
index 0000000000..c21070b23b
--- /dev/null
+++ b/keyboards/mntre/mntre.c
@@ -0,0 +1,19 @@
+// Copyright 2021 Cedric Vincent (@cdc-mkb)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "mntre.h"
+
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+
+    static const char PROGMEM qmk_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
+        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
+    };
+
+    oled_write_P(qmk_logo, false);
+    return true;
+}
+#endif
diff --git a/keyboards/mntre/mntre.h b/keyboards/mntre/mntre.h
new file mode 100644
index 0000000000..8a48114423
--- /dev/null
+++ b/keyboards/mntre/mntre.h
@@ -0,0 +1,30 @@
+// Copyright 2021 Cedric Vincent (@cdc-mkb)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, \
+  k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b \
+) { \
+  { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
+  { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
+  { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
+  { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
+  { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d }, \
+  { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, KC_NO, KC_NO } \
+}
diff --git a/keyboards/mntre/readme.md b/keyboards/mntre/readme.md
new file mode 100644
index 0000000000..4c827aeb25
--- /dev/null
+++ b/keyboards/mntre/readme.md
@@ -0,0 +1,27 @@
+# MNT Reform USB Keyboard (Standalone)
+
+![MNT Reform USB Keyboard (Standalone)](https://shop.mntmn.com/spree/products/117/large/reform-standalone-black-full.jpg)
+
+A compact and slim mechanical keyboard designed for comfort and portability.
+
+* Keyboard QMK port Maintainer: [cdc-mkb](https://github.com/cdc-mkb)
+* Hardware Supported: MNT Reform USB Keyboard (Standalone)
+* Hardware Availability: https://shop.mntmn.com/products/mnt-reform-usb-keyboard-standalone
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mntre:default
+
+Flashing example for this keyboard:
+
+    make mntre:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the "Esc" key and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available (default: "Circle" + "R")
+* **Physical reset button**: Remove the keyboard’s frame and toggle the programming DIP switch SW84 on the keyboard to “ON”.  Then press the reset button SW83.
diff --git a/keyboards/mntre/rules.mk b/keyboards/mntre/rules.mk
new file mode 100644
index 0000000000..0159e4da7e
--- /dev/null
+++ b/keyboards/mntre/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+OLED_ENABLE = yes
+BACKLIGHT_DRIVER = pwm
+

From 7f7364c55912879baaff8fafca550d02f17b4d44 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Mon, 27 Dec 2021 01:05:51 +0000
Subject: [PATCH 052/867] [Core] Split support for pointing devices. (#15304)

* Draft implementation

* formatting

* fix combined buttons

* remove pimoroni throttle

* sync pointing on a throttle loop with checksum

* no longer used

* doh

Co-authored-by: Drashna Jaelre <drashna@live.com>

* switch pimoroni to a cpi equivalent

* add cpi support

* allow user modification of seperate mouse reports

* a little tidy up

* add *_RIGHT defines.

* docs

* doxygen comments

* basic changelog

* clean up pimoroni

* small doc fixes

* Update docs/feature_pointing_device.md

Co-authored-by: Drashna Jaelre <drashna@live.com>

* performance tweak if side has usb

* Don't run init funtions on wrong side

* renamed some variables for consistency

* fix pimoroni typos

* Clamp instead of OR

* Promote combined values to uint16_t

* Update pointing_device.c

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 docs/ChangeLog/20220226/PR15304.md           |  13 +
 docs/feature_pointing_device.md              | 116 +++++-
 docs/feature_split_keyboard.md               |   8 +
 drivers/sensors/pimoroni_trackball.c         |  22 +-
 drivers/sensors/pimoroni_trackball.h         |   9 +-
 quantum/pointing_device.c                    | 389 +++++++++++++++++--
 quantum/pointing_device.h                    |  13 +
 quantum/pointing_device_drivers.c            |  22 +-
 quantum/split_common/transaction_id_define.h |   6 +
 quantum/split_common/transactions.c          |  79 ++++
 quantum/split_common/transport.h             |  13 +
 11 files changed, 625 insertions(+), 65 deletions(-)
 create mode 100644 docs/ChangeLog/20220226/PR15304.md

diff --git a/docs/ChangeLog/20220226/PR15304.md b/docs/ChangeLog/20220226/PR15304.md
new file mode 100644
index 0000000000..3cdb40db10
--- /dev/null
+++ b/docs/ChangeLog/20220226/PR15304.md
@@ -0,0 +1,13 @@
+### Split Common core now supports Pointing Devices ([#15304](https://github.com/qmk/qmk_firmware/pull/15304))
+
+Pointing devices can now be shared across a split keyboard with support for a single pointing device or a pointing device on each side.
+
+This feature can be enabled with `#define SPLIT_POINTING_ENABLE` and one of the following options:
+
+| Setting                   | Description                        |
+|---------------------------|------------------------------------|
+|`POINTING_DEVICE_LEFT`     | Pointing device on the left side   |
+|`POINTING_DEVICE_RIGHT`    | Pointing device on the right side  |
+|`POINTING_DEVICE_COMBINED` | Pointing device on both sides      |
+
+See the [Pointing Device](../feature_pointing_device.md) documentation for further configuration options.
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 5aef9bea27..f8de92f3b4 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -127,11 +127,10 @@ The Pimoroni Trackball module is a I2C based breakout board with an RGB enable t
 | Setting                             | Description                                                                        | Default |
 |-------------------------------------|------------------------------------------------------------------------------------|---------|
 |`PIMORONI_TRACKBALL_ADDRESS`         | (Required) Sets the I2C Address for the Pimoroni Trackball.                        | `0x0A`  |
-|`PIMORONI_TRACKBALL_TIMEOUT`         | (Optional) The timeout for i2c communication with the trackpad in milliseconds.    | `100`   |
-|`PIMORONI_TRACKBALL_INTERVAL_MS`     | (Optional) The update/read interval for the sensor in milliseconds.                | `8`     |
+|`PIMORONI_TRACKBALL_TIMEOUT`         | (Optional) The timeout for i2c communication with the trackball in milliseconds.   | `100`   |
 |`PIMORONI_TRACKBALL_SCALE`           | (Optional) The multiplier used to generate reports from the sensor.                | `5`     |
 |`PIMORONI_TRACKBALL_DEBOUNCE_CYCLES` | (Optional) The number of scan cycles used for debouncing on the ball press.        | `20`    |
-|`PIMORONI_TRACKBALL_ERROR_COUNT`     | (Optional) Specifies the number of read/write errors until the sensor is disabled. | `10`  |
+|`PIMORONI_TRACKBALL_ERROR_COUNT`     | (Optional) Specifies the number of read/write errors until the sensor is disabled. | `10`    |
 
 ### PMW 3360 Sensor
 
@@ -171,14 +170,35 @@ void           pointing_device_driver_set_cpi(uint16_t cpi) {}
 
 ## Common Configuration
 
-| Setting                       | Description                                                           | Default       |
-|-------------------------------|-----------------------------------------------------------------------|---------------|
-|`POINTING_DEVICE_ROTATION_90`  | (Optional) Rotates the X and Y data by  90 degrees.                   | _not defined_ |
-|`POINTING_DEVICE_ROTATION_180` | (Optional) Rotates the X and Y data by 180 degrees.                   | _not defined_ |
-|`POINTING_DEVICE_ROTATION_270` | (Optional) Rotates the X and Y data by 270 degrees.                   | _not defined_ |
-|`POINTING_DEVICE_INVERT_X`     | (Optional) Inverts the X axis report.                                 | _not defined_ |
-|`POINTING_DEVICE_INVERT_Y`     | (Optional) Inverts the Y axis report.                                 | _not defined_ |
-|`POINTING_DEVICE_MOTION_PIN`   | (Optional) If supported, will only read from sensor if pin is active. | _not defined_ |
+| Setting                          | Description                                                           | Default           |
+|----------------------------------|-----------------------------------------------------------------------|-------------------|
+|`POINTING_DEVICE_ROTATION_90`     | (Optional) Rotates the X and Y data by  90 degrees.                   | _not defined_     |
+|`POINTING_DEVICE_ROTATION_180`    | (Optional) Rotates the X and Y data by 180 degrees.                   | _not defined_     |
+|`POINTING_DEVICE_ROTATION_270`    | (Optional) Rotates the X and Y data by 270 degrees.                   | _not defined_     |
+|`POINTING_DEVICE_INVERT_X`        | (Optional) Inverts the X axis report.                                 | _not defined_     |
+|`POINTING_DEVICE_INVERT_Y`        | (Optional) Inverts the Y axis report.                                 | _not defined_     |
+|`POINTING_DEVICE_MOTION_PIN`      | (Optional) If supported, will only read from sensor if pin is active. | _not defined_     |
+|`POINTING_DEVICE_TASK_THROTTLE_MS`      | (Optional) Limits the frequency that the sensor is polled for motion. | _not defined_     |
+
+!> When using `SPLIT_POINTING_ENABLE` the `POINTING_DEVICE_MOTION_PIN` functionality is not supported and would recommend `POINTING_DEVICE_TASK_THROTTLE_MS` be set to `1`. Increasing this value will increase transport performance at the cost of possible mouse responsiveness.
+
+
+## Split Keyboard Configuration
+
+The following configuration options are only available when using `SPLIT_POINTING_ENABLE` see [data sync options](feature_split_keyboard.md?id=data-sync-options). The rotation and invert `*_RIGHT` options are only used with `POINTING_DEVICE_COMBINED`. If using `POINTING_DEVICE_LEFT` or `POINTING_DEVICE_RIGHT` use the common configuration above to configure your pointing device.
+
+| Setting                                | Description                                                           | Default       |
+|----------------------------------------|-----------------------------------------------------------------------|---------------|
+|`POINTING_DEVICE_LEFT`                  | Pointing device on the left side (Required - pick one only)           | _not defined_ |
+|`POINTING_DEVICE_RIGHT`                 | Pointing device on the right side (Required - pick one only)          | _not defined_ |
+|`POINTING_DEVICE_COMBINED`              | Pointing device on both sides (Required - pick one only)              | _not defined_ |
+|`POINTING_DEVICE_ROTATION_90_RIGHT`     | (Optional) Rotates the X and Y data by  90 degrees.                   | _not defined_ |
+|`POINTING_DEVICE_ROTATION_180_RIGHT`    | (Optional) Rotates the X and Y data by 180 degrees.                   | _not defined_ |
+|`POINTING_DEVICE_ROTATION_270_RIGHT`    | (Optional) Rotates the X and Y data by 270 degrees.                   | _not defined_ |
+|`POINTING_DEVICE_INVERT_X_RIGHT`        | (Optional) Inverts the X axis report.                                 | _not defined_ |
+|`POINTING_DEVICE_INVERT_Y_RIGHT`        | (Optional) Inverts the Y axis report.                                 | _not defined_ |
+
+!> If there is a `_RIGHT` configuration option or callback, the [common configuration](feature_pointing_device.md?id=common-configuration) option will work for the left. For correct left/right detection you should setup a [handedness option](feature_split_keyboard?id=setting-handedness), `EE_HANDS` is usually a good option for an existing board that doesn't do handedness by hardware.
 
 
 ## Callbacks and Functions 
@@ -196,6 +216,21 @@ void           pointing_device_driver_set_cpi(uint16_t cpi) {}
 | `pointing_device_set_report(mouse_report)`                 | Sets the mouse report to the assigned `mouse_report_t` data structured passed to the function.                | 
 | `pointing_device_send(void)`                               | Sends the current mouse report to the host system.  Function can be replaced.                                 | 
 | `has_mouse_report_changed(old, new)`                       | Compares the old and new `mouse_report_t` data and returns true only if it has changed.                       |
+| `pointing_device_adjust_by_defines(mouse_report)`          | Applies rotations and invert configurations to a raw mouse report.                                             |
+
+
+## Split Keyboard Callbacks and Functions
+
+The combined functions below are only available when using `SPLIT_POINTING_ENABLE` and `POINTING_DEVICE_COMBINED`. The 2 callbacks `pointing_device_task_combined_*` replace the single sided equivalents above. See the [combined pointing devices example](feature_pointing_device.md?id=combined-pointing-devices)
+
+| Function                                                        | Description                                                                                                              |
+|-----------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|
+| `pointing_device_set_shared_report(mouse_report)`               | Sets the shared mouse report to the assigned `mouse_report_t` data structured passed to the function.                    |
+| `pointing_device_set_cpi_on_side(bool, uint16_t)`               | Sets the CPI/DPI of one side, if supported. Passing `true` will set the left and `false` the right`                      |
+| `pointing_device_combine_reports(left_report, right_report)`    | Returns a combined mouse_report of left_report and right_report (as a `mouse_report_t` data structure)                   |
+| `pointing_device_task_combined_kb(left_report, right_report)`   | Callback, so keyboard code can intercept and modify the data. Returns a combined mouse report.                           |
+| `pointing_device_task_combined_user(left_report, right_report)` | Callback, so user code can intercept and modify. Returns a combined mouse report using `pointing_device_combine_reports` |
+| `pointing_device_adjust_by_defines_right(mouse_report)`         | Applies right side rotations and invert configurations to a raw mouse report.                                            |
 
 
 # Manipulating Mouse Reports
@@ -242,3 +277,62 @@ case MS_SPECIAL:
 ```
 
 Recall that the mouse report is set to zero (except the buttons) whenever it is sent, so the scrolling would only occur once in each case.
+
+## Split Examples
+
+The following examples make use the `SPLIT_POINTING_ENABLE` functionality and show how to manipulate the mouse report for a scrolling mode.
+
+### Single Pointing Device
+
+The following example will work with either `POINTING_DEVICE_LEFT` or `POINTING_DEVICE_RIGHT` and enables scrolling mode while on a particular layer.
+
+```c
+
+static bool scrolling_mode = false;
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+        case _RAISE:  // If we're on the _RAISE layer enable scrolling mode
+            scrolling_mode = true;
+            pointing_device_set_cpi(2000);
+            break;
+        default:
+            if (scrolling_mode) {  // check if we were scrolling before and set disable if so
+                scrolling_mode = false;
+                pointing_device_set_cpi(8000);
+            }
+            break;
+    }
+    return state;
+}
+
+report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
+    if (scrolling_mode) {
+        mouse_report.h = mouse_report.x;
+        mouse_report.v = mouse_report.y;
+        mouse_report.x = 0;
+        mouse_report.y = 0;
+    }
+    return mouse_report;
+}
+
+```
+
+### Combined Pointing Devices
+
+The following example requires `POINTING_DEVICE_COMBINED` and sets the left side pointing device to scroll only.
+
+```c
+void keyboard_post_init_user(void) {
+    pointing_device_set_cpi_on_side(true, 1000); //Set cpi on left side to a low value for slower scrolling.
+    pointing_device_set_cpi_on_side(false, 8000); //Set cpi on right side to a reasonable value for mousing.
+}
+
+report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, report_mouse_t right_report) {
+    left_report.h = left_report.x;
+    left_report.v = left_report.y;
+    left_report.x = 0;
+    left_report.y = 0;
+    return pointing_device_combine_reports(left_report, right_report);
+}
+```
diff --git a/docs/feature_split_keyboard.md b/docs/feature_split_keyboard.md
index c8ba18beeb..b51593308e 100644
--- a/docs/feature_split_keyboard.md
+++ b/docs/feature_split_keyboard.md
@@ -266,6 +266,14 @@ This enables transmitting the current OLED on/off status to the slave side of th
 
 This enables transmitting the current ST7565 on/off status to the slave side of the split keyboard. The purpose of this feature is to support state (on/off state only) syncing.
 
+```c
+#define SPLIT_POINTING_ENABLE
+```
+
+This enables transmitting the pointing device status to the master side of the split keyboard. The purpose of this feature is to enable use pointing devices on the slave side. 
+
+!> There is additional required configuration for `SPLIT_POINTING_ENABLE` outlined in the [pointing device documentation](feature_pointing_device.md?id=split-keyboard-configuration).
+
 ### Custom data sync between sides :id=custom-data-sync
 
 QMK's split transport allows for arbitrary data transactions at both the keyboard and user levels. This is modelled on a remote procedure call, with the master invoking a function on the slave side, with the ability to send data from master to slave, process it slave side, and send data back from slave to master.
diff --git a/drivers/sensors/pimoroni_trackball.c b/drivers/sensors/pimoroni_trackball.c
index 7d390056ea..2867e763bc 100644
--- a/drivers/sensors/pimoroni_trackball.c
+++ b/drivers/sensors/pimoroni_trackball.c
@@ -33,8 +33,24 @@
 
 static uint16_t precision = 128;
 
-float pimoroni_trackball_get_precision(void) { return ((float)precision / 128); }
-void  pimoroni_trackball_set_precision(float floatprecision) { precision = (floatprecision * 128); }
+uint16_t pimoroni_trackball_get_cpi(void) { return (precision * 125); }
+/**
+ * @brief Sets the scaling value for pimoroni trackball
+ *
+ * Sets a scaling value for pimoroni trackball to allow runtime adjustment. This isn't used by the sensor and is an
+ * approximation so the functions are consistent across drivers.
+ *
+ * NOTE: This rounds down to the nearest number divisable by 125 that's a positive integer, values below 125 are clamped to 125.
+ *
+ * @param cpi uint16_t
+ */
+void pimoroni_trackball_set_cpi(uint16_t cpi) {
+    if (cpi < 249) {
+        precision = 1;
+    } else {
+        precision = (cpi - (cpi % 125)) / 125;
+    }
+}
 
 void pimoroni_trackball_set_rgbw(uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
     uint8_t                              data[4] = {r, g, b, w};
@@ -60,7 +76,7 @@ i2c_status_t read_pimoroni_trackball(pimoroni_data_t* data) {
     return status;
 }
 
-__attribute__((weak)) void pimironi_trackball_device_init(void) {
+__attribute__((weak)) void pimoroni_trackball_device_init(void) {
     i2c_init();
     pimoroni_trackball_set_rgbw(0x00, 0x00, 0x00, 0x00);
 }
diff --git a/drivers/sensors/pimoroni_trackball.h b/drivers/sensors/pimoroni_trackball.h
index 59ee8724ba..e20ee748a7 100644
--- a/drivers/sensors/pimoroni_trackball.h
+++ b/drivers/sensors/pimoroni_trackball.h
@@ -23,9 +23,6 @@
 #ifndef PIMORONI_TRACKBALL_ADDRESS
 #    define PIMORONI_TRACKBALL_ADDRESS 0x0A
 #endif
-#ifndef PIMORONI_TRACKBALL_INTERVAL_MS
-#    define PIMORONI_TRACKBALL_INTERVAL_MS 8
-#endif
 #ifndef PIMORONI_TRACKBALL_SCALE
 #    define PIMORONI_TRACKBALL_SCALE 5
 #endif
@@ -52,10 +49,10 @@ typedef struct {
     uint8_t click;
 } pimoroni_data_t;
 
-void         pimironi_trackball_device_init(void);
+void         pimoroni_trackball_device_init(void);
 void         pimoroni_trackball_set_rgbw(uint8_t red, uint8_t green, uint8_t blue, uint8_t white);
 int16_t      pimoroni_trackball_get_offsets(uint8_t negative_dir, uint8_t positive_dir, uint8_t scale);
 void         pimoroni_trackball_adapt_values(int8_t* mouse, int16_t* offset);
-float        pimoroni_trackball_get_precision(void);
-void         pimoroni_trackball_set_precision(float precision);
+uint16_t     pimoroni_trackball_get_cpi(void);
+void         pimoroni_trackball_set_cpi(uint16_t cpi);
 i2c_status_t read_pimoroni_trackball(pimoroni_data_t* data);
diff --git a/quantum/pointing_device.c b/quantum/pointing_device.c
index 2fefdb67b6..23d93fa15f 100644
--- a/quantum/pointing_device.c
+++ b/quantum/pointing_device.c
@@ -18,24 +18,105 @@
 
 #include "pointing_device.h"
 #include <string.h>
+#include "timer.h"
 #ifdef MOUSEKEY_ENABLE
 #    include "mousekey.h"
 #endif
 #if (defined(POINTING_DEVICE_ROTATION_90) + defined(POINTING_DEVICE_ROTATION_180) + defined(POINTING_DEVICE_ROTATION_270)) > 1
 #    error More than one rotation selected.  This is not supported.
 #endif
+#if defined(SPLIT_POINTING_ENABLE)
+#    include "transactions.h"
+#    include "keyboard.h"
 
-static report_mouse_t mouseReport = {};
+report_mouse_t shared_mouse_report = {};
+uint16_t       shared_cpi          = 0;
+
+/**
+ * @brief Sets the shared mouse report used be pointing device task
+ *
+ * NOTE : Only available when using SPLIT_POINTING_ENABLE
+ *
+ * @param[in] new_mouse_report report_mouse_t
+ */
+void pointing_device_set_shared_report(report_mouse_t new_mouse_report) { shared_mouse_report = new_mouse_report; }
+
+/**
+ * @brief Gets current pointing device CPI if supported
+ *
+ * Gets current cpi of the shared report and returns it as uint16_t
+ *
+ * NOTE : Only available when using SPLIT_POINTING_ENABLE
+ *
+ * @return cpi value as uint16_t
+ */
+uint16_t pointing_device_get_shared_cpi(void) { return shared_cpi; }
+
+#    if defined(POINTING_DEVICE_LEFT)
+#        define POINTING_DEVICE_THIS_SIDE is_keyboard_left()
+#    elif defined(POINTING_DEVICE_RIGHT)
+#        define POINTING_DEVICE_THIS_SIDE !is_keyboard_left()
+#    elif defined(POINTING_DEVICE_COMBINED)
+#        define POINTING_DEVICE_THIS_SIDE true
+#    endif
+
+#endif  // defined(SPLIT_POINTING_ENABLE)
+
+static report_mouse_t local_mouse_report = {};
 
 extern const pointing_device_driver_t pointing_device_driver;
 
+/**
+ * @brief Compares 2 mouse reports for difference and returns result
+ *
+ * @param[in] new report_mouse_t
+ * @param[in] old report_mouse_t
+ * @return bool result
+ */
 __attribute__((weak)) bool has_mouse_report_changed(report_mouse_t new, report_mouse_t old) { return memcmp(&new, &old, sizeof(new)); }
 
-__attribute__((weak)) void           pointing_device_init_kb(void) {}
-__attribute__((weak)) void           pointing_device_init_user(void) {}
+/**
+ * @brief Keyboard level code pointing device initialisation
+ *
+ */
+__attribute__((weak)) void pointing_device_init_kb(void) {}
+
+/**
+ * @brief User level code pointing device initialisation
+ *
+ */
+__attribute__((weak)) void pointing_device_init_user(void) {}
+
+/**
+ * @brief Weak function allowing for keyboard level mouse report modification
+ *
+ * Takes report_mouse_t struct allowing modification at keyboard level then returns report_mouse_t.
+ *
+ * @param[in] mouse_report report_mouse_t
+ * @return report_mouse_t
+ */
 __attribute__((weak)) report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) { return pointing_device_task_user(mouse_report); }
+
+/**
+ * @brief Weak function allowing for user level mouse report modification
+ *
+ * Takes report_mouse_t struct allowing modification at user level then returns report_mouse_t.
+ *
+ * @param[in] mouse_report report_mouse_t
+ * @return report_mouse_t
+ */
 __attribute__((weak)) report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) { return mouse_report; }
 
+/**
+ * @brief Handles pointing device buttons
+ *
+ * Returns modified button bitmask using bool pressed and selected pointing_device_buttons_t button in uint8_t buttons bitmask.
+ *
+ * @param buttons[in] uint8_t bitmask
+ * @param pressed[in] bool
+ * @param button[in] pointing_device_buttons_t value
+ * @return Modified uint8_t bitmask buttons
+ */
 __attribute__((weak)) uint8_t pointing_device_handle_buttons(uint8_t buttons, bool pressed, pointing_device_buttons_t button) {
     if (pressed) {
         buttons |= 1 << (button);
@@ -45,7 +126,17 @@ __attribute__((weak)) uint8_t pointing_device_handle_buttons(uint8_t buttons, bo
     return buttons;
 }
 
+/**
+ * @brief Initialises pointing device
+ *
+ * Initialises pointing device, perform driver init and optional keyboard/user level code.
+ */
 __attribute__((weak)) void pointing_device_init(void) {
+#if defined(SPLIT_POINTING_ENABLE)
+    if (!(POINTING_DEVICE_THIS_SIDE)) {
+        return;
+    }
+#endif
     pointing_device_driver.init();
 #ifdef POINTING_DEVICE_MOTION_PIN
     setPinInputHigh(POINTING_DEVICE_MOTION_PIN);
@@ -54,67 +145,299 @@ __attribute__((weak)) void pointing_device_init(void) {
     pointing_device_init_user();
 }
 
+/**
+ * @brief Sends processed mouse report to host
+ *
+ * This sends the mouse report generated by pointing_device_task if changed since the last report. Once send zeros mouse report except buttons.
+ *
+ */
 __attribute__((weak)) void pointing_device_send(void) {
     static report_mouse_t old_report = {};
 
     // If you need to do other things, like debugging, this is the place to do it.
-    if (has_mouse_report_changed(mouseReport, old_report)) {
-        host_mouse_send(&mouseReport);
+    if (has_mouse_report_changed(local_mouse_report, old_report)) {
+        host_mouse_send(&local_mouse_report);
     }
     // send it and 0 it out except for buttons, so those stay until they are explicity over-ridden using update_pointing_device
-    mouseReport.x = 0;
-    mouseReport.y = 0;
-    mouseReport.v = 0;
-    mouseReport.h = 0;
+    local_mouse_report.x = 0;
+    local_mouse_report.y = 0;
+    local_mouse_report.v = 0;
+    local_mouse_report.h = 0;
 
-    memcpy(&old_report, &mouseReport, sizeof(mouseReport));
+    memcpy(&old_report, &local_mouse_report, sizeof(local_mouse_report));
 }
 
-__attribute__((weak)) void pointing_device_task(void) {
-    // Gather report info
-#ifdef POINTING_DEVICE_MOTION_PIN
-    if (!readPin(POINTING_DEVICE_MOTION_PIN))
-#endif
-        mouseReport = pointing_device_driver.get_report(mouseReport);
-
-        // Support rotation of the sensor data
+/**
+ * @brief Adjust mouse report by any optional common pointing configuration defines
+ *
+ * This applies rotation or inversion to the mouse report as selected by the pointing device common configuration defines.
+ *
+ * @param mouse_report[in] takes a report_mouse_t to be adjusted
+ * @return report_mouse_t with adjusted values
+ */
+report_mouse_t pointing_device_adjust_by_defines(report_mouse_t mouse_report) {
+    // Support rotation of the sensor data
 #if defined(POINTING_DEVICE_ROTATION_90) || defined(POINTING_DEVICE_ROTATION_180) || defined(POINTING_DEVICE_ROTATION_270)
-    int8_t x = mouseReport.x, y = mouseReport.y;
+    int8_t x = mouse_report.x, y = mouse_report.y;
 #    if defined(POINTING_DEVICE_ROTATION_90)
-    mouseReport.x = y;
-    mouseReport.y = -x;
+    mouse_report.x = y;
+    mouse_report.y = -x;
 #    elif defined(POINTING_DEVICE_ROTATION_180)
-    mouseReport.x = -x;
-    mouseReport.y = -y;
+    mouse_report.x = -x;
+    mouse_report.y = -y;
 #    elif defined(POINTING_DEVICE_ROTATION_270)
-    mouseReport.x = -y;
-    mouseReport.y = x;
+    mouse_report.x = -y;
+    mouse_report.y = x;
 #    else
 #        error "How the heck did you get here?!"
 #    endif
 #endif
     // Support Inverting the X and Y Axises
 #if defined(POINTING_DEVICE_INVERT_X)
-    mouseReport.x = -mouseReport.x;
+    mouse_report.x = -mouse_report.x;
 #endif
 #if defined(POINTING_DEVICE_INVERT_Y)
-    mouseReport.y = -mouseReport.y;
+    mouse_report.y = -mouse_report.y;
+#endif
+    return mouse_report;
+}
+
+/**
+ * @brief Retrieves and processes pointing device data.
+ *
+ * This function is part of the keyboard loop and retrieves the mouse report from the pointing device driver.
+ * It applies any optional configuration e.g. rotation or axis inversion and then initiates a send.
+ *
+ */
+__attribute__((weak)) void pointing_device_task(void) {
+#if defined(SPLIT_POINTING_ENABLE)
+    // Don't poll the target side pointing device.
+    if (!is_keyboard_master()) {
+        return;
+    };
 #endif
 
+#if defined(POINTING_DEVICE_TASK_THROTTLE_MS)
+    static uint32_t last_exec = 0;
+    if (timer_elapsed32(last_exec) < POINTING_DEVICE_TASK_THROTTLE_MS) {
+        return;
+    }
+    last_exec = timer_read32();
+#else
+#    if defined(SPLIT_POINTING_ENABLE)
+#        pragma message("It's recommended you enable a throttle when sharing pointing devices.")
+#    endif
+#endif
+
+    // Gather report info
+#ifdef POINTING_DEVICE_MOTION_PIN
+#    if defined(SPLIT_POINTING_ENABLE)
+#        error POINTING_DEVICE_MOTION_PIN not supported when sharing the pointing device report between sides.
+#    endif
+    if (!readPin(POINTING_DEVICE_MOTION_PIN))
+#endif
+
+#if defined(SPLIT_POINTING_ENABLE)
+#    if defined(POINTING_DEVICE_COMBINED)
+        static uint8_t old_buttons = 0;
+    local_mouse_report.buttons = old_buttons;
+    local_mouse_report         = pointing_device_driver.get_report(local_mouse_report);
+    old_buttons                = local_mouse_report.buttons;
+#    elif defined(POINTING_DEVICE_LEFT) || defined(POINTING_DEVICE_RIGHT)
+        local_mouse_report = POINTING_DEVICE_THIS_SIDE ? pointing_device_driver.get_report(local_mouse_report) : shared_mouse_report;
+#    else
+#        error "You need to define the side(s) the pointing device is on. POINTING_DEVICE_COMBINED / POINTING_DEVICE_LEFT / POINTING_DEVICE_RIGHT"
+#    endif
+#else
+    local_mouse_report = pointing_device_driver.get_report(local_mouse_report);
+#endif  // defined(SPLIT_POINTING_ENABLE)
+
     // allow kb to intercept and modify report
-    mouseReport = pointing_device_task_kb(mouseReport);
+#if defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)
+    if (is_keyboard_left()) {
+        local_mouse_report  = pointing_device_adjust_by_defines(local_mouse_report);
+        shared_mouse_report = pointing_device_adjust_by_defines_right(shared_mouse_report);
+    } else {
+        local_mouse_report  = pointing_device_adjust_by_defines_right(local_mouse_report);
+        shared_mouse_report = pointing_device_adjust_by_defines(shared_mouse_report);
+    }
+    local_mouse_report = is_keyboard_left() ? pointing_device_task_combined_kb(local_mouse_report, shared_mouse_report) : pointing_device_task_combined_kb(shared_mouse_report, local_mouse_report);
+#else
+    local_mouse_report = pointing_device_adjust_by_defines(local_mouse_report);
+    local_mouse_report = pointing_device_task_kb(local_mouse_report);
+#endif
     // combine with mouse report to ensure that the combined is sent correctly
 #ifdef MOUSEKEY_ENABLE
     report_mouse_t mousekey_report = mousekey_get_report();
-    mouseReport.buttons            = mouseReport.buttons | mousekey_report.buttons;
+    local_mouse_report.buttons     = local_mouse_report.buttons | mousekey_report.buttons;
 #endif
     pointing_device_send();
 }
 
-report_mouse_t pointing_device_get_report(void) { return mouseReport; }
+/**
+ * @brief Gets current mouse report used by pointing device task
+ *
+ * @return report_mouse_t
+ */
+report_mouse_t pointing_device_get_report(void) { return local_mouse_report; }
 
-void pointing_device_set_report(report_mouse_t newMouseReport) { mouseReport = newMouseReport; }
+/**
+ * @brief Sets mouse report used be pointing device task
+ *
+ * @param[in] new_mouse_report
+ */
+void pointing_device_set_report(report_mouse_t new_mouse_report) { local_mouse_report = new_mouse_report; }
 
-uint16_t pointing_device_get_cpi(void) { return pointing_device_driver.get_cpi(); }
+/**
+ * @brief Gets current pointing device CPI if supported
+ *
+ * Gets current cpi from pointing device driver if supported and returns it as uint16_t
+ *
+ * @return cpi value as uint16_t
+ */
+uint16_t pointing_device_get_cpi(void) {
+#if defined(SPLIT_POINTING_ENABLE)
+    return POINTING_DEVICE_THIS_SIDE ? pointing_device_driver.get_cpi() : shared_cpi;
+#else
+    return pointing_device_driver.get_cpi();
+#endif
+}
 
-void pointing_device_set_cpi(uint16_t cpi) { pointing_device_driver.set_cpi(cpi); }
+/**
+ * @brief Set pointing device CPI if supported
+ *
+ * Takes a uint16_t value to set pointing device cpi if supported by driver.
+ *
+ * @param[in] cpi uint16_t value.
+ */
+void pointing_device_set_cpi(uint16_t cpi) {
+#if defined(SPLIT_POINTING_ENABLE)
+    if (POINTING_DEVICE_THIS_SIDE) {
+        pointing_device_driver.set_cpi(cpi);
+    } else {
+        shared_cpi = cpi;
+    }
+#else
+    pointing_device_driver.set_cpi(cpi);
+#endif
+}
+
+#if defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)
+/**
+ * @brief Set pointing device CPI if supported
+ *
+ * Takes a bool and uint16_t and allows setting cpi for a single side when using 2 pointing devices with a split keyboard.
+ *
+ * NOTE: Only available when using SPLIT_POINTING_ENABLE and POINTING_DEVICE_COMBINED
+ *
+ * @param[in] left true = left, false = right.
+ * @param[in] cpi uint16_t value.
+ */
+void pointing_device_set_cpi_on_side(bool left, uint16_t cpi) {
+    bool local = (is_keyboard_left() & left) ? true : false;
+    if (local) {
+        pointing_device_driver.set_cpi(cpi);
+    } else {
+        shared_cpi = cpi;
+    }
+}
+
+/**
+ * @brief clamps int16_t to int8_t
+ *
+ * @param[in] int16_t value
+ * @return int8_t clamped value
+ */
+static inline int8_t pointing_device_movement_clamp(int16_t value) {
+    if (value < INT8_MIN) {
+        return INT8_MIN;
+    } else if (value > INT8_MAX) {
+        return INT8_MAX;
+    } else {
+        return value;
+    }
+}
+
+/**
+ * @brief combines 2 mouse reports and returns 2
+ *
+ * Combines 2 report_mouse_t structs, clamping movement values to int8_t and ignores report_id then returns the resulting report_mouse_t struct.
+ *
+ * NOTE: Only available when using SPLIT_POINTING_ENABLE and POINTING_DEVICE_COMBINED
+ *
+ * @param[in] left_report left report_mouse_t
+ * @param[in] right_report right report_mouse_t
+ * @return combined report_mouse_t of left_report and right_report
+ */
+report_mouse_t pointing_device_combine_reports(report_mouse_t left_report, report_mouse_t right_report) {
+    left_report.x = pointing_device_movement_clamp((int16_t)left_report.x + right_report.x);
+    left_report.y = pointing_device_movement_clamp((int16_t)left_report.y + right_report.y);
+    left_report.h = pointing_device_movement_clamp((int16_t)left_report.h + right_report.h);
+    left_report.v = pointing_device_movement_clamp((int16_t)left_report.v + right_report.v);
+    left_report.buttons |= right_report.buttons;
+    return left_report;
+}
+
+/**
+ * @brief Adjust mouse report by any optional right pointing configuration defines
+ *
+ * This applies rotation or inversion to the mouse report as selected by the pointing device common configuration defines.
+ *
+ * NOTE: Only available when using SPLIT_POINTING_ENABLE and POINTING_DEVICE_COMBINED
+ *
+ * @param[in] mouse_report report_mouse_t to be adjusted
+ * @return report_mouse_t with adjusted values
+ */
+report_mouse_t pointing_device_adjust_by_defines_right(report_mouse_t mouse_report) {
+    // Support rotation of the sensor data
+#    if defined(POINTING_DEVICE_ROTATION_90_RIGHT) || defined(POINTING_DEVICE_ROTATION_RIGHT) || defined(POINTING_DEVICE_ROTATION_RIGHT)
+    int8_t x = mouse_report.x, y = mouse_report.y;
+#        if defined(POINTING_DEVICE_ROTATION_90_RIGHT)
+    mouse_report.x = y;
+    mouse_report.y = -x;
+#        elif defined(POINTING_DEVICE_ROTATION_180_RIGHT)
+    mouse_report.x = -x;
+    mouse_report.y = -y;
+#        elif defined(POINTING_DEVICE_ROTATION_270_RIGHT)
+    mouse_report.x = -y;
+    mouse_report.y = x;
+#        else
+#            error "How the heck did you get here?!"
+#        endif
+#    endif
+    // Support Inverting the X and Y Axises
+#    if defined(POINTING_DEVICE_INVERT_X_RIGHT)
+    mouse_report.x = -mouse_report.x;
+#    endif
+#    if defined(POINTING_DEVICE_INVERT_Y_RIGHT)
+    mouse_report.y = -mouse_report.y;
+#    endif
+    return mouse_report;
+}
+
+/**
+ * @brief Weak function allowing for keyboard level mouse report modification
+ *
+ * Takes 2 report_mouse_t structs allowing individual modification of sides at keyboard level then returns pointing_device_task_combined_user.
+ *
+ * NOTE: Only available when using SPLIT_POINTING_ENABLE and POINTING_DEVICE_COMBINED
+ *
+ * @param[in] left_report report_mouse_t
+ * @param[in] right_report report_mouse_t
+ * @return pointing_device_task_combined_user(left_report, right_report) by default
+ */
+__attribute__((weak)) report_mouse_t pointing_device_task_combined_kb(report_mouse_t left_report, report_mouse_t right_report) { return pointing_device_task_combined_user(left_report, right_report); }
+
+/**
+ * @brief Weak function allowing for user level mouse report modification
+ *
+ * Takes 2 report_mouse_t structs allowing individual modification of sides at user level then returns pointing_device_combine_reports.
+ *
+ * NOTE: Only available when using SPLIT_POINTING_ENABLE and POINTING_DEVICE_COMBINED
+ *
+ * @param[in] left_report report_mouse_t
+ * @param[in] right_report report_mouse_t
+ * @return pointing_device_combine_reports(left_report, right_report) by default
+ */
+__attribute__((weak)) report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, report_mouse_t right_report) { return pointing_device_combine_reports(left_report, right_report); }
+#endif
diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h
index 5106c26660..78398d8999 100644
--- a/quantum/pointing_device.h
+++ b/quantum/pointing_device.h
@@ -86,3 +86,16 @@ void           pointing_device_init_user(void);
 report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report);
 report_mouse_t pointing_device_task_user(report_mouse_t mouse_report);
 uint8_t        pointing_device_handle_buttons(uint8_t buttons, bool pressed, pointing_device_buttons_t button);
+report_mouse_t pointing_device_adjust_by_defines(report_mouse_t mouse_report);
+
+#if defined(SPLIT_POINTING_ENABLE)
+void     pointing_device_set_shared_report(report_mouse_t report);
+uint16_t pointing_device_get_shared_cpi(void);
+#    if defined(POINTING_DEVICE_COMBINED)
+void           pointing_device_set_cpi_on_side(bool left, uint16_t cpi);
+report_mouse_t pointing_device_combine_reports(report_mouse_t left_report, report_mouse_t right_report);
+report_mouse_t pointing_device_task_combined_kb(report_mouse_t left_report, report_mouse_t right_report);
+report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, report_mouse_t right_report);
+report_mouse_t pointing_device_adjust_by_defines_right(report_mouse_t mouse_report);
+#    endif //defined(POINTING_DEVICE_COMBINED)
+#endif //defined(SPLIT_POINTING_ENABLE)
diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device_drivers.c
index 9ad5e76ba6..0852a0bea7 100644
--- a/quantum/pointing_device_drivers.c
+++ b/quantum/pointing_device_drivers.c
@@ -165,14 +165,13 @@ const pointing_device_driver_t pointing_device_driver = {
 // clang-format on
 
 #elif defined(POINTING_DEVICE_DRIVER_pimoroni_trackball)
-report_mouse_t pimorono_trackball_get_report(report_mouse_t mouse_report) {
-    static fast_timer_t throttle      = 0;
-    static uint16_t     debounce      = 0;
-    static uint8_t      error_count   = 0;
-    pimoroni_data_t     pimoroni_data = {0};
-    static int16_t      x_offset = 0, y_offset = 0;
+report_mouse_t pimoroni_trackball_get_report(report_mouse_t mouse_report) {
+    static uint16_t debounce      = 0;
+    static uint8_t  error_count   = 0;
+    pimoroni_data_t pimoroni_data = {0};
+    static int16_t  x_offset = 0, y_offset = 0;
 
-    if (error_count < PIMORONI_TRACKBALL_ERROR_COUNT && timer_elapsed_fast(throttle) >= PIMORONI_TRACKBALL_INTERVAL_MS) {
+    if (error_count < PIMORONI_TRACKBALL_ERROR_COUNT) {
         i2c_status_t status = read_pimoroni_trackball(&pimoroni_data);
 
         if (status == I2C_STATUS_SUCCESS) {
@@ -195,17 +194,16 @@ report_mouse_t pimorono_trackball_get_report(report_mouse_t mouse_report) {
         } else {
             error_count++;
         }
-        throttle = timer_read_fast();
     }
     return mouse_report;
 }
 
 // clang-format off
 const pointing_device_driver_t pointing_device_driver = {
-    .init       = pimironi_trackball_device_init,
-    .get_report = pimorono_trackball_get_report,
-    .set_cpi    = NULL,
-    .get_cpi    = NULL
+    .init       = pimoroni_trackball_device_init,
+    .get_report = pimoroni_trackball_get_report,
+    .set_cpi    = pimoroni_trackball_set_cpi,
+    .get_cpi    = pimoroni_trackball_get_cpi
 };
 // clang-format on
 #elif defined(POINTING_DEVICE_DRIVER_pmw3360)
diff --git a/quantum/split_common/transaction_id_define.h b/quantum/split_common/transaction_id_define.h
index 535bc21aea..aa71c3621e 100644
--- a/quantum/split_common/transaction_id_define.h
+++ b/quantum/split_common/transaction_id_define.h
@@ -78,6 +78,12 @@ enum serial_transaction_id {
     PUT_ST7565,
 #endif  // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
 
+#if defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+    GET_POINTING_CHECKSUM,
+    GET_POINTING_DATA,
+    PUT_POINTING_CPI,
+#endif  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
     PUT_RPC_INFO,
     PUT_RPC_REQ_DATA,
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 3ff87710e7..9622acb377 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -578,6 +578,82 @@ static void st7565_handlers_slave(matrix_row_t master_matrix[], matrix_row_t sla
 
 #endif  // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
 
+////////////////////////////////////////////////////
+// POINTING
+
+#if defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+
+static bool pointing_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+#    if defined(POINTING_DEVICE_LEFT)
+    if (is_keyboard_left()) {
+        return true;
+    }
+#    elif defined(POINTING_DEVICE_RIGHT)
+    if (!is_keyboard_left()) {
+        return true;
+    }
+#    endif
+    static uint32_t last_update = 0;
+    static uint16_t last_cpi    = 0;
+    report_mouse_t  temp_state;
+    uint16_t        temp_cpi;
+    bool            okay = read_if_checksum_mismatch(GET_POINTING_CHECKSUM, GET_POINTING_DATA, &last_update, &temp_state, &split_shmem->pointing.report, sizeof(temp_state));
+    if (okay) pointing_device_set_shared_report(temp_state);
+    temp_cpi = pointing_device_get_shared_cpi();
+    if (temp_cpi && memcmp(&last_cpi, &temp_cpi, sizeof(temp_cpi)) != 0) {
+        memcpy(&split_shmem->pointing.cpi, &temp_cpi, sizeof(temp_cpi));
+        okay = transport_write(PUT_POINTING_CPI, &split_shmem->pointing.cpi, sizeof(split_shmem->pointing.cpi));
+        if (okay) {
+            last_cpi = temp_cpi;
+        }
+    }
+    return okay;
+}
+
+extern const pointing_device_driver_t pointing_device_driver;
+
+static void pointing_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+#    if defined(POINTING_DEVICE_LEFT)
+    if (!is_keyboard_left()) {
+        return;
+    }
+#    elif defined(POINTING_DEVICE_RIGHT)
+    if (is_keyboard_left()) {
+        return;
+    }
+#    endif
+    report_mouse_t temp_report;
+    uint16_t       temp_cpi;
+#    ifdef POINTING_DEVICE_TASK_THROTTLE_MS
+    static uint32_t last_exec = 0;
+    if (timer_elapsed32(last_exec) < POINTING_DEVICE_TASK_THROTTLE_MS) {
+        return;
+    }
+    last_exec = timer_read32();
+#    endif
+    temp_cpi = pointing_device_driver.get_cpi();
+    if (split_shmem->pointing.cpi && memcmp(&split_shmem->pointing.cpi, &temp_cpi, sizeof(temp_cpi)) != 0) {
+        pointing_device_driver.set_cpi(split_shmem->pointing.cpi);
+    }
+    memset(&temp_report, 0, sizeof(temp_report));
+    temp_report = pointing_device_driver.get_report(temp_report);
+    memcpy(&split_shmem->pointing.report, &temp_report, sizeof(temp_report));
+    // Now update the checksum given that the pointing has been written to
+    split_shmem->pointing.checksum = crc8(&temp_report, sizeof(temp_report));
+}
+
+#    define TRANSACTIONS_POINTING_MASTER() TRANSACTION_HANDLER_MASTER(pointing)
+#    define TRANSACTIONS_POINTING_SLAVE() TRANSACTION_HANDLER_SLAVE(pointing)
+#    define TRANSACTIONS_POINTING_REGISTRATIONS [GET_POINTING_CHECKSUM] = trans_target2initiator_initializer(pointing.checksum), [GET_POINTING_DATA] = trans_target2initiator_initializer(pointing.report), [PUT_POINTING_CPI] = trans_initiator2target_initializer(pointing.cpi),
+
+#else  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+
+#    define TRANSACTIONS_POINTING_MASTER()
+#    define TRANSACTIONS_POINTING_SLAVE()
+#    define TRANSACTIONS_POINTING_REGISTRATIONS
+
+#endif  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+
 ////////////////////////////////////////////////////
 
 uint8_t                  dummy;
@@ -604,6 +680,7 @@ split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = {
     TRANSACTIONS_WPM_REGISTRATIONS
     TRANSACTIONS_OLED_REGISTRATIONS
     TRANSACTIONS_ST7565_REGISTRATIONS
+    TRANSACTIONS_POINTING_REGISTRATIONS
 // clang-format on
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
@@ -629,6 +706,7 @@ bool transactions_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix
     TRANSACTIONS_WPM_MASTER();
     TRANSACTIONS_OLED_MASTER();
     TRANSACTIONS_ST7565_MASTER();
+    TRANSACTIONS_POINTING_MASTER();
     return true;
 }
 
@@ -647,6 +725,7 @@ void transactions_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[
     TRANSACTIONS_WPM_SLAVE();
     TRANSACTIONS_OLED_SLAVE();
     TRANSACTIONS_ST7565_SLAVE();
+    TRANSACTIONS_POINTING_SLAVE();
 }
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index 1d4f6ed0cd..31b804908b 100644
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -106,6 +106,15 @@ typedef struct _split_mods_sync_t {
 } split_mods_sync_t;
 #endif  // SPLIT_MODS_ENABLE
 
+#if defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+#    include "pointing_device.h"
+typedef struct _split_slave_pointing_sync_t {
+    uint8_t        checksum;
+    report_mouse_t report;
+    uint16_t       cpi;
+} split_slave_pointing_sync_t;
+#endif  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 typedef struct _rpc_sync_info_t {
     int8_t  transaction_id;
@@ -173,6 +182,10 @@ typedef struct _split_shared_memory_t {
     uint8_t current_st7565_state;
 #endif  // ST7565_ENABLE(OLED_ENABLE) && defined(SPLIT_ST7565_ENABLE)
 
+#if defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+    split_slave_pointing_sync_t pointing;
+#endif  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
     rpc_sync_info_t rpc_info;
     uint8_t         rpc_m2s_buffer[RPC_M2S_BUFFER_SIZE];

From f9cf09ebd1ac7431dd4a708cd37a365efd623812 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Sun, 26 Dec 2021 17:10:04 -0800
Subject: [PATCH 053/867] Format code according to conventions (#15588)

---
 quantum/pointing_device.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h
index 78398d8999..00229e8a24 100644
--- a/quantum/pointing_device.h
+++ b/quantum/pointing_device.h
@@ -97,5 +97,5 @@ report_mouse_t pointing_device_combine_reports(report_mouse_t left_report, repor
 report_mouse_t pointing_device_task_combined_kb(report_mouse_t left_report, report_mouse_t right_report);
 report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, report_mouse_t right_report);
 report_mouse_t pointing_device_adjust_by_defines_right(report_mouse_t mouse_report);
-#    endif //defined(POINTING_DEVICE_COMBINED)
-#endif //defined(SPLIT_POINTING_ENABLE)
+#    endif  // defined(POINTING_DEVICE_COMBINED)
+#endif      // defined(SPLIT_POINTING_ENABLE)

From 672c6b47219067d1ec50057b17af4fcd98132ba4 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 26 Dec 2021 17:15:56 -0800
Subject: [PATCH 054/867] Make (un)register code functions weak (#15285)

---
 quantum/action.c  | 16 ++++++++--------
 quantum/quantum.c |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/quantum/action.c b/quantum/action.c
index 5e81efb671..ea2310a4d9 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -794,7 +794,7 @@ void process_action(keyrecord_t *record, action_t action) {
  *
  * FIXME: Needs documentation.
  */
-void register_code(uint8_t code) {
+__attribute__((weak)) void register_code(uint8_t code) {
     if (code == KC_NO) {
         return;
     }
@@ -890,7 +890,7 @@ void register_code(uint8_t code) {
  *
  * FIXME: Needs documentation.
  */
-void unregister_code(uint8_t code) {
+__attribute__((weak)) void unregister_code(uint8_t code) {
     if (code == KC_NO) {
         return;
     }
@@ -955,7 +955,7 @@ void unregister_code(uint8_t code) {
  * \param code The basic keycode to tap.
  * \param delay The amount of time in milliseconds to leave the keycode registered, before unregistering it.
  */
-void tap_code_delay(uint8_t code, uint16_t delay) {
+__attribute__((weak)) void tap_code_delay(uint8_t code, uint16_t delay) {
     register_code(code);
     for (uint16_t i = delay; i > 0; i--) {
         wait_ms(1);
@@ -967,13 +967,13 @@ void tap_code_delay(uint8_t code, uint16_t delay) {
  *
  * \param code The basic keycode to tap. If `code` is `KC_CAPS_LOCK`, the delay will be `TAP_HOLD_CAPS_DELAY`, otherwise `TAP_CODE_DELAY`, if defined.
  */
-void tap_code(uint8_t code) { tap_code_delay(code, code == KC_CAPS_LOCK ? TAP_HOLD_CAPS_DELAY : TAP_CODE_DELAY); }
+__attribute__((weak)) void tap_code(uint8_t code) { tap_code_delay(code, code == KC_CAPS_LOCK ? TAP_HOLD_CAPS_DELAY : TAP_CODE_DELAY); }
 
 /** \brief Adds the given physically pressed modifiers and sends a keyboard report immediately.
  *
  * \param mods A bitfield of modifiers to register.
  */
-void register_mods(uint8_t mods) {
+__attribute__((weak)) void register_mods(uint8_t mods) {
     if (mods) {
         add_mods(mods);
         send_keyboard_report();
@@ -984,7 +984,7 @@ void register_mods(uint8_t mods) {
  *
  * \param mods A bitfield of modifiers to unregister.
  */
-void unregister_mods(uint8_t mods) {
+__attribute__((weak)) void unregister_mods(uint8_t mods) {
     if (mods) {
         del_mods(mods);
         send_keyboard_report();
@@ -995,7 +995,7 @@ void unregister_mods(uint8_t mods) {
  *
  * \param mods A bitfield of modifiers to register.
  */
-void register_weak_mods(uint8_t mods) {
+__attribute__((weak)) void register_weak_mods(uint8_t mods) {
     if (mods) {
         add_weak_mods(mods);
         send_keyboard_report();
@@ -1006,7 +1006,7 @@ void register_weak_mods(uint8_t mods) {
  *
  * \param mods A bitfield of modifiers to unregister.
  */
-void unregister_weak_mods(uint8_t mods) {
+__attribute__((weak)) void unregister_weak_mods(uint8_t mods) {
     if (mods) {
         del_weak_mods(mods);
         send_keyboard_report();
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 5ecc183327..c106f795d0 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -76,9 +76,9 @@ uint8_t extract_mod_bits(uint16_t code) {
     return mods_to_send;
 }
 
-static void do_code16(uint16_t code, void (*f)(uint8_t)) { f(extract_mod_bits(code)); }
+void do_code16(uint16_t code, void (*f)(uint8_t)) { f(extract_mod_bits(code)); }
 
-void register_code16(uint16_t code) {
+__attribute__((weak)) void register_code16(uint16_t code) {
     if (IS_MOD(code) || code == KC_NO) {
         do_code16(code, register_mods);
     } else {
@@ -87,7 +87,7 @@ void register_code16(uint16_t code) {
     register_code(code);
 }
 
-void unregister_code16(uint16_t code) {
+__attribute__((weak)) void unregister_code16(uint16_t code) {
     unregister_code(code);
     if (IS_MOD(code) || code == KC_NO) {
         do_code16(code, unregister_mods);
@@ -96,7 +96,7 @@ void unregister_code16(uint16_t code) {
     }
 }
 
-void tap_code16(uint16_t code) {
+__attribute__((weak)) void tap_code16(uint16_t code) {
     register_code16(code);
 #if TAP_CODE_DELAY > 0
     wait_ms(TAP_CODE_DELAY);

From 3a3272a3d660efc666c6b0376d2bff69901aef9b Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 27 Dec 2021 13:27:38 +1100
Subject: [PATCH 055/867] Defer pin operations to gpio.h (#15589)

---
 platforms/avr/drivers/serial.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/platforms/avr/drivers/serial.c b/platforms/avr/drivers/serial.c
index 9a7345a53d..7a4e5e76e6 100644
--- a/platforms/avr/drivers/serial.c
+++ b/platforms/avr/drivers/serial.c
@@ -119,12 +119,6 @@
 #        error invalid SOFT_SERIAL_PIN value
 #    endif
 
-#    define setPinInputHigh(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin)&0xF), PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
-#    define setPinOutput(pin) (DDRx_ADDRESS(pin) |= _BV((pin)&0xF))
-#    define writePinHigh(pin) (PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
-#    define writePinLow(pin) (PORTx_ADDRESS(pin) &= ~_BV((pin)&0xF))
-#    define readPin(pin) ((bool)(PINx_ADDRESS(pin) & _BV((pin)&0xF)))
-
 #    define ALWAYS_INLINE __attribute__((always_inline))
 #    define NO_INLINE __attribute__((noinline))
 #    define _delay_sub_us(x) __builtin_avr_delay_cycles(x)

From 093d5c9991c42ec428d89aeec24c6df2200ff7b3 Mon Sep 17 00:00:00 2001
From: Derek Hsu <derekhybrid@gmail.com>
Date: Mon, 27 Dec 2021 10:39:57 +0800
Subject: [PATCH 056/867] [Keyboard] Add Runner3680 with 5x6+5x8 layout
 (#14617)

* [Keyboard] Add Runner3680 keyboard with 5x6 + 5x8 layout

* [Keymap] Use general audio key codes instead of MacOS specific ones

* [Keymap] Add via support

* [Keyboard] Add config for RGB Matrix feature for runner3680 5x6+5x8 layout

* Add license to .c and .h files

* Remove unused code

* [Keymap] Rename 'JIS' directory to be lower cased

* [Keyboard] Explicitly define enabled RGB lighting effects for Runner3680

* [Keyboard] Remove unused code of Runner3680

* [Keyboard] Move RGB Matrix related config to keyboard's rules.mk file

* [Keymap] Clean up default keymaps of Runner3680
---
 keyboards/runner3680/5x6_5x8/.noci            |  0
 keyboards/runner3680/5x6_5x8/5x6_5x8.c        | 52 ++++++++++++
 keyboards/runner3680/5x6_5x8/5x6_5x8.h        | 41 +++++++++
 keyboards/runner3680/5x6_5x8/config.h         | 84 ++++++++++++++++++
 keyboards/runner3680/5x6_5x8/info.json        | 85 +++++++++++++++++++
 .../5x6_5x8/keymaps/default/config.h          | 25 ++++++
 .../5x6_5x8/keymaps/default/keymap.c          | 71 ++++++++++++++++
 .../5x6_5x8/keymaps/derekhsu/config.h         | 26 ++++++
 .../5x6_5x8/keymaps/derekhsu/keymap.c         | 60 +++++++++++++
 .../5x6_5x8/keymaps/derekhsu/rules.mk         |  3 +
 .../runner3680/5x6_5x8/keymaps/jis/config.h   | 25 ++++++
 .../runner3680/5x6_5x8/keymaps/jis/keymap.c   | 72 ++++++++++++++++
 .../runner3680/5x6_5x8/keymaps/via/config.h   | 25 ++++++
 .../runner3680/5x6_5x8/keymaps/via/keymap.c   | 71 ++++++++++++++++
 .../runner3680/5x6_5x8/keymaps/via/rules.mk   |  1 +
 keyboards/runner3680/5x6_5x8/rules.mk         |  1 +
 keyboards/runner3680/runner3680.h             |  4 +
 17 files changed, 646 insertions(+)
 create mode 100644 keyboards/runner3680/5x6_5x8/.noci
 create mode 100644 keyboards/runner3680/5x6_5x8/5x6_5x8.c
 create mode 100644 keyboards/runner3680/5x6_5x8/5x6_5x8.h
 create mode 100644 keyboards/runner3680/5x6_5x8/config.h
 create mode 100644 keyboards/runner3680/5x6_5x8/info.json
 create mode 100644 keyboards/runner3680/5x6_5x8/keymaps/default/config.h
 create mode 100644 keyboards/runner3680/5x6_5x8/keymaps/default/keymap.c
 create mode 100644 keyboards/runner3680/5x6_5x8/keymaps/derekhsu/config.h
 create mode 100644 keyboards/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
 create mode 100644 keyboards/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk
 create mode 100644 keyboards/runner3680/5x6_5x8/keymaps/jis/config.h
 create mode 100644 keyboards/runner3680/5x6_5x8/keymaps/jis/keymap.c
 create mode 100644 keyboards/runner3680/5x6_5x8/keymaps/via/config.h
 create mode 100644 keyboards/runner3680/5x6_5x8/keymaps/via/keymap.c
 create mode 100644 keyboards/runner3680/5x6_5x8/keymaps/via/rules.mk
 create mode 100644 keyboards/runner3680/5x6_5x8/rules.mk

diff --git a/keyboards/runner3680/5x6_5x8/.noci b/keyboards/runner3680/5x6_5x8/.noci
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/runner3680/5x6_5x8/5x6_5x8.c b/keyboards/runner3680/5x6_5x8/5x6_5x8.c
new file mode 100644
index 0000000000..62597d0060
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/5x6_5x8.c
@@ -0,0 +1,52 @@
+/* Copyright 2021 omkbd
+ *
+ * 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 "5x6_5x8.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+  // Key Matrix to LED Index
+  { NO_LED, NO_LED, 5, 4, 3, 2, 1, 0 },
+  { NO_LED, NO_LED, 6, 7, 8, 9, 10, 11 },
+  { NO_LED, NO_LED, 17, 16, 15, 14, 13, 12 },
+  { NO_LED, NO_LED, 18, 19, 20, 21, 22, 23 },
+  { NO_LED, NO_LED, 29, 28, 27, 26, 25, 24 },
+  { 37, 36, 35, 34, 33, 32, 31, 30 },
+  { 38, 39, 40, 41, 42, 43, 44, 45 },
+  { 53, 52, 51, 50, 49, 48, 47, 46 },
+  { 54, 55, 56, 57, 58, 59, 60, 61 },
+  { 69, 68, 67, 66, 65, 64, 63, 62 }
+}, {
+  // LED Index to Physical Position
+  { 86, 0 }, { 69, 0 }, { 52, 0 }, { 34, 0 }, { 17, 0 }, { 0, 0 },
+  { 0, 16 }, { 17, 16 }, { 34, 16 }, { 52, 16 }, { 69, 16 }, { 86, 16 },
+  { 86, 32 }, { 69, 32 }, { 52, 32 }, { 34, 32 }, { 17, 32 }, { 0, 32 },
+  { 0, 48 }, { 17, 48 }, { 34, 48 }, { 52, 48 }, { 69, 48 }, { 86, 48 },
+  { 86, 64 }, { 69, 64 }, { 52, 64 }, { 34, 64 }, { 17, 64 }, { 0, 64 },
+  { 103, 0 }, { 121, 0 }, { 138, 0 }, { 155, 0 }, { 172, 0 }, { 190, 0 }, { 207, 0 }, { 224, 0 },
+  { 224, 16 }, { 207, 16 }, { 190, 16 }, { 172, 16 }, { 155, 16 }, { 138, 16 }, { 121, 16 }, { 103, 16 },
+  { 103, 32 }, { 121, 32 }, { 138, 32 }, { 155, 32 }, { 172, 32 }, { 190, 32 }, { 207, 32 }, { 224, 32 },
+  { 224, 48 }, { 207, 48 }, { 190, 48 }, { 172, 48 }, { 155, 48 }, { 138, 48 }, { 121, 48 }, { 103, 48 },
+  { 103, 64 }, { 121, 64 }, { 138, 64 }, { 155, 64 }, { 172, 64 }, { 190, 64 }, { 207, 64 }, { 224, 64 }
+}, {
+  // LED Index to Flag
+  LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+  LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+  LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+  LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+  LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL
+} };
+#endif
diff --git a/keyboards/runner3680/5x6_5x8/5x6_5x8.h b/keyboards/runner3680/5x6_5x8/5x6_5x8.h
new file mode 100644
index 0000000000..afceac0a89
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/5x6_5x8.h
@@ -0,0 +1,41 @@
+/* Copyright 2021 omkbd
+ *
+ * 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 "runner3680.h"
+
+#include "quantum.h"
+
+#define LAYOUT( \
+   L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \
+   L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \
+   L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \
+   L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \
+   L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47  \
+   ) \
+   { \
+     { KC_NO, KC_NO, L02, L03, L04, L05, L06, L07 }, \
+     { KC_NO, KC_NO, L12, L13, L14, L15, L16, L17 }, \
+     { KC_NO, KC_NO, L22, L23, L24, L25, L26, L27 }, \
+     { KC_NO, KC_NO, L32, L33, L34, L35, L36, L37 }, \
+     { KC_NO, KC_NO, L42, L43, L44, L45, L46, L47 }, \
+     { R07, R06, R05, R04, R03, R02, R01, R00 }, \
+     { R17, R16, R15, R14, R13, R12, R11, R10 }, \
+     { R27, R26, R25, R24, R23, R22, R21, R20 }, \
+     { R37, R36, R35, R34, R33, R32, R31, R30 }, \
+     { R47, R46, R45, R44, R43, R42, R41, R40 } \
+   }
diff --git a/keyboards/runner3680/5x6_5x8/config.h b/keyboards/runner3680/5x6_5x8/config.h
new file mode 100644
index 0000000000..815da24950
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/config.h
@@ -0,0 +1,84 @@
+/* Copyright 2021 omkbd
+ *
+ * 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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x3680
+#define PRODUCT_ID      0x5658
+#define DEVICE_VER      0x0005
+#define MANUFACTURER    Omkbd
+#define PRODUCT         runner3680
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 ,B6 }
+// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
+
+#define DIODE_DIRECTION COL2ROW
+
+/* define tapping term */
+#define TAPPING_TERM 120
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* 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 D3
+#ifdef RGBLIGHT_ENABLE
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 70
+#define RGBLIGHT_SPLIT
+#define RGBLED_SPLIT { 30, 40 }    // Number of LEDs
+#define RGBLIGHT_LIMIT_VAL 100
+#endif
+#ifdef RGB_MATRIX_ENABLE
+#define DRIVER_LED_TOTAL 70
+#define RGB_MATRIX_SPLIT { 30, 40 }    // Number of LEDs
+#endif
+
+#define SOFT_SERIAL_PIN D2
+#define SELECT_SOFT_SERIAL_SPEED 1
+/*Sets the protocol speed when using serial communication*/
+//Speeds:
+//0: about 189kbps (Experimental only)
+//1: about 137kbps (default)
+//2: about 75kbps
+//3: about 39kbps
+//4: about 26kbps
+//5: about 20kbps
diff --git a/keyboards/runner3680/5x6_5x8/info.json b/keyboards/runner3680/5x6_5x8/info.json
new file mode 100644
index 0000000000..e8fb4c0927
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "runner3680 5x6+5x8",
+    "url": "",
+    "maintainer": "omkbd",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":7, "y":1},
+                {"x":8, "y":1},
+                {"x":9, "y":1},
+                {"x":10, "y":1},
+                {"x":11, "y":1},
+                {"x":12, "y":1},
+                {"x":13, "y":1},
+                {"x":14, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+                {"x":4, "y":2},
+                {"x":5, "y":2},
+                {"x":7, "y":2},
+                {"x":8, "y":2},
+                {"x":9, "y":2},
+                {"x":10, "y":2},
+                {"x":11, "y":2},
+                {"x":12, "y":2},
+                {"x":13, "y":2},
+                {"x":14, "y":2},
+
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4},
+                {"x":1, "y":4},
+                {"x":2, "y":4},
+                {"x":3, "y":4},
+                {"x":4, "y":4},
+                {"x":5, "y":4},
+                {"x":7, "y":4},
+                {"x":8, "y":4},
+                {"x":9, "y":4},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/default/config.h b/keyboards/runner3680/5x6_5x8/keymaps/default/config.h
new file mode 100644
index 0000000000..a21551badf
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/keymaps/default/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2021 omkbd
+ *
+ * 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 USE_MATRIX_I2C
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/default/keymap.c b/keyboards/runner3680/5x6_5x8/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4dafb4b2a3
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/keymaps/default/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2021 omkbd
+ *
+ * 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 layer_number {
+    _QWERTY = 0,
+    _ADJUST
+};
+
+// Fillers to make layering more clear
+#define EISU LALT(KC_GRV)
+#define ADJUST MO(_ADJUST)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* QWERTY
+     * ,-----------------------------------------.      ,--------------------------------------------------------.
+     * |   `  |   1  |   2  |   3  |   4  |   5  |      |   6  |   7  |   8  |   9  |   0  |   -  |   =  | Del  |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * | Tab  |   Q  |   W  |   E  |   R  |   T  |      |   Y  |   U  |   I  |   O  |   P  |   [  |   ]  | Bksp |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * | Esc  |   A  |   S  |   D  |   F  |   G  |      |   H  |   J  |   K  |   L  |   ;  |   "  | Enter| Enter|
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * | Shift|   Z  |   X  |   C  |   V  |   B  |      |   N  |   M  |   ,  |   .  |   /  |   \  |  Up  | Shift|
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * | Ctrl | GUI  | Alt  | EISU |  Del | Space|      | Enter| Bksp | EISU |  ESC |Adjust| Left | Down | Right|
+     * `-----------------------------------------'      `-------------------------------------------------------'
+     */
+  [_QWERTY] = LAYOUT(
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,
+      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_BSPC,
+      KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  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_BSLS, KC_UP,   KC_RSFT,
+      KC_LCTL, KC_LGUI, KC_LALT, EISU,    KC_DEL,  KC_SPC,     KC_ENT,  KC_BSPC, EISU,    KC_ESC,  ADJUST,  KC_LEFT, KC_DOWN, KC_RGHT
+      ),
+
+    /* Adjust
+     * ,-----------------------------------------.      ,--------------------------------------------------------.
+     * |      |   F1 |   F2 |   F3 |   F4 |   F5 |      |   F6 |   F7 |   F8 |   F9 |  F10 |  F11 |  F12 |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * |      |  TOG |  HUI |  SAI |  VAI |      |      |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * |      |  MOD |  HUD |  SAD |  VAD |      |      |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+     * `-----------------------------------------'      `-------------------------------------------------------'
+     */
+  [_ADJUST] =  LAYOUT(
+      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+      _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______
+      )
+};
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/derekhsu/config.h b/keyboards/runner3680/5x6_5x8/keymaps/derekhsu/config.h
new file mode 100644
index 0000000000..818ea7d4af
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/keymaps/derekhsu/config.h
@@ -0,0 +1,26 @@
+/* Copyright 2021 omkbd
+ *
+ * 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 RGB_MATRIX_FRAMEBUFFER_EFFECTS
+//#define USE_MATRIX_I2C
+
+/* Select hand configuration */
+
+// #define MASTER_LEFT
+// #define MASTER_RIGHT
+#define EE_HANDS
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c b/keyboards/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
new file mode 100644
index 0000000000..2f8aed176c
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
@@ -0,0 +1,60 @@
+/* Copyright 2021 omkbd
+ *
+ * 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 layer_number {
+    _QWERTY = 0,
+    _NAV,
+    _SYMBOL,
+    _MEDIA
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_QWERTY] = LAYOUT(
+    KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,          KC_6,   KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+    KC_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_ESC,  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_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_DEL,
+    KC_LCTL, KC_LALT, KC_LGUI, MO(2), MO(1), KC_SPC,        KC_SPC, MO(1), MO(2),   KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+[_NAV] = LAYOUT(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+    KC_TRNS, KC_NO,   KC_UP,   KC_NO,   KC_NO,   KC_NO,         KC_NO,   KC_NO,   KC_UP,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,         KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_PGUP, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, MO(3),   KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS, MO(3),   KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
+),
+
+[_SYMBOL] = LAYOUT(
+    KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, KC_BSPC,
+    KC_TRNS, KC_NO,   KC_P7, KC_P8,   KC_P9,  KC_NO,            KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS, KC_NO,   KC_LCBR, KC_RCBR, KC_PIPE,
+    KC_ESC,  KC_NO,   KC_P4, KC_P5,   KC_P6,  KC_NO,            KC_LCBR, KC_RCBR, KC_MINS, KC_EQL,  KC_COLN, KC_DQUO, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_NO,   KC_P1, KC_P2,   KC_P3,  KC_NO,            KC_LBRC, KC_RBRC, KC_LT,   KC_GT,   KC_QUES, KC_TRNS, KC_UP,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_P0, KC_TRNS, MO(3),  KC_TRNS,          KC_TRNS, MO(3),   KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+[_MEDIA] = LAYOUT(
+    KC_NO,   KC_SLCK,  KC_PAUS, KC_NO,    KC_NO,   RGB_VAD,         RGB_VAI, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO,
+    RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI,  RGB_VAI, RGB_SPI,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_MPLY, KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   RGB_RMOD, RGB_HUD, RGB_SAD,  RGB_VAD, RGB_SPD,         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+    KC_NO,   RGB_M_P,  RGB_M_B, RGB_M_SW, RGB_M_G, KC_NO,           KC_NO,   KC_MUTE, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_VOLU, KC_NO,
+    KC_NO,   KC_NO,    KC_NO,   KC_TRNS,  KC_TRNS, KC_NO,           KC_NO,   KC_TRNS, KC_TRNS, KC_NO,   KC_NO,   KC_MRWD, KC_VOLD, KC_MFFD
+)
+
+};
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk b/keyboards/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk
new file mode 100644
index 0000000000..8110dbaa1f
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk
@@ -0,0 +1,3 @@
+RGB_MATRIX_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/jis/config.h b/keyboards/runner3680/5x6_5x8/keymaps/jis/config.h
new file mode 100644
index 0000000000..a21551badf
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/keymaps/jis/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2021 omkbd
+ *
+ * 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 USE_MATRIX_I2C
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/jis/keymap.c b/keyboards/runner3680/5x6_5x8/keymaps/jis/keymap.c
new file mode 100644
index 0000000000..463d847639
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/keymaps/jis/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2021 omkbd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keymap_jp.h"
+
+enum layer_number {
+    _QWERTY = 0,
+    _ADJUST
+};
+
+// Fillers to make layering more clear
+#define EISU LALT(KC_GRV)
+#define ADJUST MO(_ADJUST)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* QWERTY
+     * ,-----------------------------------------.      ,--------------------------------------------------------.
+     * | EISU |   1  |   2  |   3  |   4  |   5  |      |   6  |   7  |   8  |   9  |   0  |   -  |   ^  |   \  |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * | Tab  |   Q  |   W  |   E  |   R  |   T  |      |   Y  |   U  |   I  |   O  |   P  |   @  |   [  | Bksp |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * | Esc  |   A  |   S  |   D  |   F  |   G  |      |   H  |   J  |   K  |   L  |   :  |   ;  |   ]  | Enter|
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * | Shift|   Z  |   X  |   C  |   V  |   B  |      |   N  |   M  |   ,  |   .  |   /  |   \  |  Up  | Shift|
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * | Ctrl | GUI  | Alt  | MHEN |  Del | Space|      | Enter| Bksp | HENK |Adjust|  F10 | Left | Down | Right|
+     * `-----------------------------------------'      `-------------------------------------------------------'
+     */
+  [_QWERTY] = LAYOUT(
+      JP_ZKHK, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, JP_CIRC, JP_YEN,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    JP_AT,   JP_LBRC, KC_BSPC,
+      KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, JP_COLN, JP_RBRC, KC_ENT,
+      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, JP_BSLS, KC_UP,   KC_RSFT,
+      KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_DEL,  KC_SPC,     KC_ENT,  KC_BSPC, KC_HENK, ADJUST,  KC_F10,  KC_LEFT, KC_DOWN, KC_RGHT
+      ),
+
+    /* Adjust
+     * ,-----------------------------------------.      ,--------------------------------------------------------.
+     * |      |   F1 |   F2 |   F3 |   F4 |   F5 |      |   F6 |   F7 |   F8 |   F9 |  F10 |  F11 |  F12 |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * |      |  TOG |  HUI |  SAI |  VAI |      |      |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * |      |  MOD |  HUD |  SAD |  VAD |      |      |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+     * `-----------------------------------------'      `-------------------------------------------------------'
+     */
+  [_ADJUST] =  LAYOUT(
+      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+      _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______
+      )
+};
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/via/config.h b/keyboards/runner3680/5x6_5x8/keymaps/via/config.h
new file mode 100644
index 0000000000..a21551badf
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/keymaps/via/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2021 omkbd
+ *
+ * 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 USE_MATRIX_I2C
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/via/keymap.c b/keyboards/runner3680/5x6_5x8/keymaps/via/keymap.c
new file mode 100644
index 0000000000..4dafb4b2a3
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/keymaps/via/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2021 omkbd
+ *
+ * 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 layer_number {
+    _QWERTY = 0,
+    _ADJUST
+};
+
+// Fillers to make layering more clear
+#define EISU LALT(KC_GRV)
+#define ADJUST MO(_ADJUST)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* QWERTY
+     * ,-----------------------------------------.      ,--------------------------------------------------------.
+     * |   `  |   1  |   2  |   3  |   4  |   5  |      |   6  |   7  |   8  |   9  |   0  |   -  |   =  | Del  |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * | Tab  |   Q  |   W  |   E  |   R  |   T  |      |   Y  |   U  |   I  |   O  |   P  |   [  |   ]  | Bksp |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * | Esc  |   A  |   S  |   D  |   F  |   G  |      |   H  |   J  |   K  |   L  |   ;  |   "  | Enter| Enter|
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * | Shift|   Z  |   X  |   C  |   V  |   B  |      |   N  |   M  |   ,  |   .  |   /  |   \  |  Up  | Shift|
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * | Ctrl | GUI  | Alt  | EISU |  Del | Space|      | Enter| Bksp | EISU |  ESC |Adjust| Left | Down | Right|
+     * `-----------------------------------------'      `-------------------------------------------------------'
+     */
+  [_QWERTY] = LAYOUT(
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,
+      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_BSPC,
+      KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  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_BSLS, KC_UP,   KC_RSFT,
+      KC_LCTL, KC_LGUI, KC_LALT, EISU,    KC_DEL,  KC_SPC,     KC_ENT,  KC_BSPC, EISU,    KC_ESC,  ADJUST,  KC_LEFT, KC_DOWN, KC_RGHT
+      ),
+
+    /* Adjust
+     * ,-----------------------------------------.      ,--------------------------------------------------------.
+     * |      |   F1 |   F2 |   F3 |   F4 |   F5 |      |   F6 |   F7 |   F8 |   F9 |  F10 |  F11 |  F12 |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * |      |  TOG |  HUI |  SAI |  VAI |      |      |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * |      |  MOD |  HUD |  SAD |  VAD |      |      |      |      |      |      |      |      |      |      |
+     * |------+------+------+------+------+------|      |------+------+------+------+------+------+------+------|
+     * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+     * `-----------------------------------------'      `-------------------------------------------------------'
+     */
+  [_ADJUST] =  LAYOUT(
+      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+      _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______
+      )
+};
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/via/rules.mk b/keyboards/runner3680/5x6_5x8/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/runner3680/5x6_5x8/rules.mk b/keyboards/runner3680/5x6_5x8/rules.mk
new file mode 100644
index 0000000000..32afd21635
--- /dev/null
+++ b/keyboards/runner3680/5x6_5x8/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/runner3680/runner3680.h b/keyboards/runner3680/runner3680.h
index e7842b765a..39a498e90a 100644
--- a/keyboards/runner3680/runner3680.h
+++ b/keyboards/runner3680/runner3680.h
@@ -14,6 +14,10 @@
   #include "5x6.h"
 #endif
 
+#ifdef KEYBOARD_runner3680_5x6_5x8
+  #include "5x6_5x8.h"
+#endif
+
 #ifdef KEYBOARD_runner3680_4x8
   #include "4x8.h"
 #endif

From 743f78022127ad15e8ad4c736375516735469d63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Hor=C3=A1k?= <jakub@horak.io>
Date: Mon, 27 Dec 2021 02:42:01 +0000
Subject: [PATCH 057/867] [Keymap] Add keymap for the Keychron Q1 ISO layout
 (#14853)

* Add keymap for the Keychron Q1 ISO layout

- The rightest key column is: Ins, Home, PgUp, PgDn, which differs from the default.
- RGB lighting turns off when the computer sleeps
- Caps Lock and alpha keys turn red to indicate when Caps Lock is on
- When the Fn layer is active, RGB lighting turns off for keys that are not assigned

* Update keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c

Suggestion from review

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../q1/rev_0102/keymaps/kubahorak/README.md   | 16 ++++
 .../q1/rev_0102/keymaps/kubahorak/config.h    | 25 +++++++
 .../q1/rev_0102/keymaps/kubahorak/keymap.c    | 66 ++++++++++++++++
 .../rev_0102/keymaps/kubahorak/keymap_user.h  | 28 +++++++
 .../keymaps/kubahorak/rgb_matrix_user.c       | 75 +++++++++++++++++++
 .../keymaps/kubahorak/rgb_matrix_user.h       | 24 ++++++
 .../q1/rev_0102/keymaps/kubahorak/rules.mk    |  6 ++
 7 files changed, 240 insertions(+)
 create mode 100644 keyboards/keychron/q1/rev_0102/keymaps/kubahorak/README.md
 create mode 100644 keyboards/keychron/q1/rev_0102/keymaps/kubahorak/config.h
 create mode 100644 keyboards/keychron/q1/rev_0102/keymaps/kubahorak/keymap.c
 create mode 100644 keyboards/keychron/q1/rev_0102/keymaps/kubahorak/keymap_user.h
 create mode 100644 keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c
 create mode 100644 keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.h
 create mode 100644 keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rules.mk

diff --git a/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/README.md b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/README.md
new file mode 100644
index 0000000000..3cfae17543
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/README.md
@@ -0,0 +1,16 @@
+# kubahorak's Keychron Q1 keymap
+
+This ISO layout got heavily inspired by gtg465x's ANSI keymap (rev_0100).
+
+Features:
+- The rightest key column is: Ins, Home, PgUp, PgDn, which differs from the default.
+- RGB lighting turns off when the computer sleeps
+- Caps Lock and alpha keys turn red to indicate when Caps Lock is on
+- When the Fn layer is active, RGB lighting turns off for keys that are not assigned
+
+## Changelog
+
+### 2021-10-17 - 1.0.0
+
+- Initial release
+
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/config.h b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/config.h
new file mode 100644
index 0000000000..55dbb74d4a
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2021 Jakub Horak (@kubahorak)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef RGB_MATRIX_ENABLE
+/* from rev_0100/keymaps/gtg465x */
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define CAPS_LOCK_INDICATOR_COLOR RGB_RED
+#    define CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
+#    define FN_LAYER_TRANSPARENT_KEYS_OFF
+#endif
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/keymap.c b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/keymap.c
new file mode 100644
index 0000000000..479988dfa9
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2021 Jakub Horak (@kubahorak)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keymap_user.h"
+#ifdef RGB_MATRIX_ENABLE
+#    include "rgb_matrix_user.h"
+#endif
+
+// clang-format off
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_iso_83(
+            KC_ESC,    KC_BRID,   KC_BRIU,   KC_F3,    KC_F4,     RGB_VAD,   RGB_VAI,   KC_MPRV,   KC_MPLY,   KC_MNXT,   KC_MUTE,   KC_VOLD,   KC_VOLU,   KC_DEL,    KC_INS,
+            KC_GRV,    KC_1,      KC_2,      KC_3,     KC_4,      KC_5,      KC_6,      KC_7,      KC_8,      KC_9,      KC_0,      KC_MINS,   KC_EQL,    KC_BSPC,   KC_HOME,
+            KC_TAB,    KC_Q,      KC_W,      KC_E,     KC_R,      KC_T,      KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,      KC_LBRC,   KC_RBRC,   KC_PGUP,
+            KC_CAPS,   KC_A,      KC_S,      KC_D,     KC_F,      KC_G,      KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,   KC_QUOT,   KC_NUHS,   KC_ENT,    KC_PGDN,
+            KC_LSFT,   KC_NUBS,   KC_Z,      KC_X,     KC_C,      KC_V,      KC_B,      KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSFT,   KC_UP,
+            KC_LCTL,   KC_LALT,   KC_LGUI,   KC_SPC,   KC_RGUI,   MO(1),     KC_RCTL,   KC_LEFT,   KC_DOWN,   KC_RGHT
+            ),
+	[1] = LAYOUT_iso_83(
+            KC_TRNS,   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_TRNS,   KC_TRNS,
+            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_P7,     KC_P8,     KC_P9,     KC_PSLS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+            RGB_TOG,   RGB_MOD,    RGB_VAI,   RGB_HUI,   RGB_SAI,   RGB_SPI,   KC_TRNS,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+            KC_TRNS,   RGB_RMOD,   RGB_VAD,   RGB_HUD,   RGB_SAD,   RGB_SPD,   KC_TRNS,   KC_P1,     KC_P2,     KC_P3,     KC_PMNS,   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_P0,     KC_PDOT,   KC_PENT,   KC_PPLS,   KC_TRNS,   KC_TRNS,
+            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
+            ),
+    [2] = LAYOUT_iso_83(
+            KC_ESC,    KC_F1,     KC_F2,     KC_F3,    KC_F4,     KC_F5,   KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,    KC_F11,    KC_F12,    KC_DEL,    KC_INS,
+            KC_GRV,    KC_1,      KC_2,      KC_3,     KC_4,      KC_5,    KC_6,      KC_7,      KC_8,      KC_9,      KC_0,      KC_MINS,   KC_EQL,    KC_BSPC,   KC_HOME,
+            KC_TAB,    KC_Q,      KC_W,      KC_E,     KC_R,      KC_T,    KC_Y,      KC_U,      KC_I,      KC_O,      KC_P,      KC_LBRC,   KC_RBRC,   KC_PGUP,
+            KC_CAPS,   KC_A,      KC_S,      KC_D,     KC_F,      KC_G,    KC_H,      KC_J,      KC_K,      KC_L,      KC_SCLN,   KC_QUOT,   KC_NUHS,   KC_ENT,    KC_PGDN,
+            KC_LSFT,   KC_NUBS,   KC_Z,      KC_X,     KC_C,      KC_V,    KC_B,      KC_N,      KC_M,      KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSFT,   KC_UP,
+            KC_LCTL,   KC_LGUI,   KC_LALT,   KC_SPC,   KC_RALT,   MO(3),   KC_RCTL,   KC_LEFT,   KC_DOWN,   KC_RGHT
+            ),
+	[3] = LAYOUT_iso_83(
+            KC_TRNS,   KC_BRID,    KC_BRIU,   LGUI(KC_TAB),   LGUI(KC_E),   RGB_VAD,   RGB_VAI,   KC_MPRV,   KC_MPLY,   KC_MNXT,   KC_MUTE,   KC_VOLD,   KC_VOLU,   KC_TRNS,   KC_TRNS,
+            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,        KC_TRNS,      KC_TRNS,   KC_TRNS,   KC_P7,     KC_P8,     KC_P9,     KC_PSLS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+            RGB_TOG,   RGB_MOD,    RGB_VAI,   RGB_HUI,        RGB_SAI,      RGB_SPI,   KC_TRNS,   KC_P4,     KC_P5,     KC_P6,     KC_PAST,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+            KC_TRNS,   RGB_RMOD,   RGB_VAD,   RGB_HUD,        RGB_SAD,      RGB_SPD,   KC_TRNS,   KC_P1,     KC_P2,     KC_P3,     KC_PMNS,   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_P0,     KC_PDOT,   KC_PENT,   KC_PPLS,   KC_TRNS,   KC_TRNS,
+            KC_TRNS,   KC_TRNS,    KC_TRNS,   KC_TRNS,        KC_TRNS,      KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
+            )
+};
+
+// clang-format on
+
+void matrix_init_user(void) {
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_init_user();
+#endif
+}
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/keymap_user.h b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/keymap_user.h
new file mode 100644
index 0000000000..728114d556
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/keymap_user.h
@@ -0,0 +1,28 @@
+/* Copyright 2021 @ Grayson Carr
+ *
+ * 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
+
+// clang-format off
+
+enum layers {
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+// clang-format on
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c
new file mode 100644
index 0000000000..8650f30df1
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c
@@ -0,0 +1,75 @@
+/* Copyright 2021 @ Grayson Carr
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "rgb_matrix_user.h"
+#include "keymap_user.h"
+
+keypos_t led_index_key_position[DRIVER_LED_TOTAL];
+
+void rgb_matrix_init_user(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            uint8_t led_index = g_led_config.matrix_co[row][col];
+            if (led_index != NO_LED) {
+                led_index_key_position[led_index] = (keypos_t){.row = row, .col = col};
+            }
+        }
+    }
+}
+
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    uint8_t current_layer = get_highest_layer(layer_state);
+    switch (current_layer) {
+        case MAC_BASE:
+        case WIN_BASE:
+#ifdef CAPS_LOCK_INDICATOR_COLOR
+            if (host_keyboard_led_state().caps_lock) {
+                rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_caps_lock_indicator, CAPS_LOCK_INDICATOR_COLOR);
+            }
+#endif
+            break;
+        case MAC_FN:
+        case WIN_FN:
+#ifdef FN_LAYER_TRANSPARENT_KEYS_OFF
+            rgb_matrix_set_color_by_keycode(led_min, led_max, current_layer, is_transparent, RGB_OFF);
+#endif
+            break;
+    }
+}
+
+void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue) {
+    for (uint8_t i = led_min; i < led_max; i++) {
+        uint16_t keycode = keymap_key_to_keycode(layer, led_index_key_position[i]);
+        if ((*is_keycode)(keycode)) {
+            rgb_matrix_set_color(i, red, green, blue);
+        }
+    }
+}
+
+bool is_caps_lock_indicator(uint16_t keycode) {
+    switch (keycode) {
+#ifdef CAPS_LOCK_INDICATOR_LIGHT_ALPHAS
+    case KC_A ... KC_Z:
+#endif
+    case KC_CAPS:
+        return true;
+    default:
+        return false;
+    }
+}
+
+bool is_transparent(uint16_t keycode) { return keycode == KC_TRNS; }
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.h b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.h
new file mode 100644
index 0000000000..dead454167
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.h
@@ -0,0 +1,24 @@
+/* Copyright 2021 @ Grayson Carr
+ *
+ * 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
+
+void rgb_matrix_init_user(void);
+
+void rgb_matrix_set_color_by_keycode(uint8_t led_min, uint8_t led_max, uint8_t layer, bool (*is_keycode)(uint16_t), uint8_t red, uint8_t green, uint8_t blue);
+
+bool is_caps_lock_indicator(uint16_t keycode);
+bool is_transparent(uint16_t keycode);
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rules.mk b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rules.mk
new file mode 100644
index 0000000000..af720e37ee
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rules.mk
@@ -0,0 +1,6 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
+
+ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
+    SRC += rgb_matrix_user.c
+endif
\ No newline at end of file

From 25713dc2225556b20101347580146f9820d5e831 Mon Sep 17 00:00:00 2001
From: Chad Austin <chad@chadaustin.me>
Date: Sun, 26 Dec 2021 18:44:56 -0800
Subject: [PATCH 058/867] Add sym_defer_pr debouncer type (#14948)

---
 data/schemas/keyboard.jsonschema              |   2 +-
 docs/feature_debounce_type.md                 |   1 +
 quantum/debounce/sym_defer_pr.c               |  72 ++++++
 quantum/debounce/tests/rules.mk               |   5 +
 quantum/debounce/tests/sym_defer_pr_tests.cpp | 223 ++++++++++++++++++
 quantum/debounce/tests/testlist.mk            |   1 +
 6 files changed, 303 insertions(+), 1 deletion(-)
 create mode 100644 quantum/debounce/sym_defer_pr.c
 create mode 100644 quantum/debounce/tests/sym_defer_pr_tests.cpp

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 308f9b782b..2daeaf04b4 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -69,7 +69,7 @@
             "properties": {
                 "debounce_type": {
                     "type": "string",
-                    "enum": ["custom", "eager_pk", "eager_pr", "sym_defer_pk", "sym_eager_pk"]
+                    "enum": ["custom", "eager_pk", "eager_pr", "sym_defer_pk", "sym_defer_pr", "sym_eager_pk"]
                 },
                 "firmware_format": {
                     "type": "string",
diff --git a/docs/feature_debounce_type.md b/docs/feature_debounce_type.md
index f37a785b1e..9cd736a24a 100644
--- a/docs/feature_debounce_type.md
+++ b/docs/feature_debounce_type.md
@@ -116,6 +116,7 @@ Where name of algorithm is one of:
 For use in keyboards where refreshing ```NUM_KEYS``` 8-bit counters is computationally expensive / low scan rate, and fingers usually only hit one row at a time. This could be
 appropriate for the ErgoDox models; the matrix is rotated 90°, and hence its "rows" are really columns, and each finger only hits a single "row" at a time in normal use.
 * ```sym_eager_pk``` - debouncing per key. On any state change, response is immediate, followed by ```DEBOUNCE``` milliseconds of no further input for that key
+* ```sym_defer_pr``` - debouncing per row. On any state change, a per-row timer is set. When ```DEBOUNCE``` milliseconds of no changes have occurred on that row, the entire row is pushed. Can improve responsiveness over `sym_defer_g` while being less susceptible than per-key debouncers to noise.
 * ```sym_defer_pk``` - debouncing per key. On any state change, a per-key timer is set. When ```DEBOUNCE``` milliseconds of no changes have occurred on that key, the key status change is pushed.
 * ```asym_eager_defer_pk``` - debouncing per key. On a key-down state change, response is immediate, followed by ```DEBOUNCE``` milliseconds of no further input for that key. On a key-up state change, a per-key timer is set. When ```DEBOUNCE``` milliseconds of no changes have occurred on that key, the key-up status change is pushed.
 
diff --git a/quantum/debounce/sym_defer_pr.c b/quantum/debounce/sym_defer_pr.c
new file mode 100644
index 0000000000..8b33acc6a2
--- /dev/null
+++ b/quantum/debounce/sym_defer_pr.c
@@ -0,0 +1,72 @@
+/*
+Copyright 2021 Chad Austin <chad@chadaustin.me>
+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/>.
+*/
+
+/*
+Symmetric per-row debounce algorithm. Changes only apply when
+DEBOUNCE milliseconds have elapsed since the last change.
+*/
+
+#include "matrix.h"
+#include "timer.h"
+#include "quantum.h"
+#include <stdlib.h>
+
+#ifndef DEBOUNCE
+#    define DEBOUNCE 5
+#endif
+
+static uint16_t last_time;
+// [row] milliseconds until key's state is considered debounced.
+static uint8_t* countdowns;
+// [row]
+static matrix_row_t* last_raw;
+
+void debounce_init(uint8_t num_rows) {
+    countdowns = (uint8_t*)calloc(num_rows, sizeof(uint8_t));
+    last_raw   = (matrix_row_t*)calloc(num_rows, sizeof(matrix_row_t));
+
+    last_time = timer_read();
+}
+
+void debounce_free(void) {
+    free(countdowns);
+    countdowns = NULL;
+    free(last_raw);
+    last_raw = NULL;
+}
+
+void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool changed) {
+    uint16_t now       = timer_read();
+    uint16_t elapsed16 = TIMER_DIFF_16(now, last_time);
+    last_time          = now;
+    uint8_t elapsed    = (elapsed16 > 255) ? 255 : elapsed16;
+
+    uint8_t* countdown = countdowns;
+
+    for (uint8_t row = 0; row < num_rows; ++row, ++countdown) {
+        matrix_row_t raw_row = raw[row];
+
+        if (raw_row != last_raw[row]) {
+            *countdown    = DEBOUNCE;
+            last_raw[row] = raw_row;
+        } else if (*countdown > elapsed) {
+            *countdown -= elapsed;
+        } else if (*countdown) {
+            cooked[row] = raw_row;
+            *countdown  = 0;
+        }
+    }
+}
+
+bool debounce_active(void) { return true; }
diff --git a/quantum/debounce/tests/rules.mk b/quantum/debounce/tests/rules.mk
index e908dd6f67..8318b1c668 100644
--- a/quantum/debounce/tests/rules.mk
+++ b/quantum/debounce/tests/rules.mk
@@ -28,6 +28,11 @@ debounce_sym_defer_pk_SRC := $(DEBOUNCE_COMMON_SRC) \
 	$(QUANTUM_PATH)/debounce/sym_defer_pk.c \
 	$(QUANTUM_PATH)/debounce/tests/sym_defer_pk_tests.cpp
 
+debounce_sym_defer_pr_DEFS := $(DEBOUNCE_COMMON_DEFS)
+debounce_sym_defer_pr_SRC := $(DEBOUNCE_COMMON_SRC) \
+	$(QUANTUM_PATH)/debounce/sym_defer_pr.c \
+	$(QUANTUM_PATH)/debounce/tests/sym_defer_pr_tests.cpp
+
 debounce_sym_eager_pk_DEFS := $(DEBOUNCE_COMMON_DEFS)
 debounce_sym_eager_pk_SRC := $(DEBOUNCE_COMMON_SRC) \
 	$(QUANTUM_PATH)/debounce/sym_eager_pk.c \
diff --git a/quantum/debounce/tests/sym_defer_pr_tests.cpp b/quantum/debounce/tests/sym_defer_pr_tests.cpp
new file mode 100644
index 0000000000..bb3333cf7b
--- /dev/null
+++ b/quantum/debounce/tests/sym_defer_pr_tests.cpp
@@ -0,0 +1,223 @@
+/* Copyright 2021 Simon Arlott
+ *
+ * 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 "gtest/gtest.h"
+
+#include "debounce_test_common.h"
+
+TEST_F(DebounceTest, OneKeyShort1) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+
+        {5, {}, {{0, 1, DOWN}}},
+        /* 0ms delay (fast scan rate) */
+        {5, {{0, 1, UP}}, {}},
+
+        {10, {}, {{0, 1, UP}}},
+    });
+    runEvents();
+}
+
+TEST_F(DebounceTest, OneKeyShort2) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+
+        {5, {}, {{0, 1, DOWN}}},
+        /* 1ms delay */
+        {6, {{0, 1, UP}}, {}},
+
+        {11, {}, {{0, 1, UP}}},
+    });
+    runEvents();
+}
+
+TEST_F(DebounceTest, OneKeyShort3) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+
+        {5, {}, {{0, 1, DOWN}}},
+        /* 2ms delay */
+        {7, {{0, 1, UP}}, {}},
+
+        {12, {}, {{0, 1, UP}}},
+    });
+    runEvents();
+}
+
+TEST_F(DebounceTest, OneKeyTooQuick1) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+        /* Release key exactly on the debounce time */
+        {5, {{0, 1, UP}}, {}},
+    });
+    runEvents();
+}
+
+TEST_F(DebounceTest, OneKeyTooQuick2) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+
+        {5, {}, {{0, 1, DOWN}}},
+        {6, {{0, 1, UP}}, {}},
+
+        /* Press key exactly on the debounce time */
+        {11, {{0, 1, DOWN}}, {}},
+    });
+    runEvents();
+}
+
+TEST_F(DebounceTest, OneKeyBouncing1) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+        {1, {{0, 1, UP}}, {}},
+        {2, {{0, 1, DOWN}}, {}},
+        {3, {{0, 1, UP}}, {}},
+        {4, {{0, 1, DOWN}}, {}},
+        {5, {{0, 1, UP}}, {}},
+        {6, {{0, 1, DOWN}}, {}},
+        {11, {}, {{0, 1, DOWN}}}, /* 5ms after DOWN at time 7 */
+    });
+    runEvents();
+}
+
+TEST_F(DebounceTest, OneKeyBouncing2) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+        {5, {}, {{0, 1, DOWN}}},
+        {6, {{0, 1, UP}}, {}},
+        {7, {{0, 1, DOWN}}, {}},
+        {8, {{0, 1, UP}}, {}},
+        {9, {{0, 1, DOWN}}, {}},
+        {10, {{0, 1, UP}}, {}},
+        {15, {}, {{0, 1, UP}}}, /* 5ms after UP at time 10 */
+    });
+    runEvents();
+}
+
+TEST_F(DebounceTest, OneKeyLong) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+
+        {5, {}, {{0, 1, DOWN}}},
+
+        {25, {{0, 1, UP}}, {}},
+
+        {30, {}, {{0, 1, UP}}},
+
+        {50, {{0, 1, DOWN}}, {}},
+
+        {55, {}, {{0, 1, DOWN}}},
+    });
+    runEvents();
+}
+
+TEST_F(DebounceTest, TwoKeysShort) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+        {1, {{0, 2, DOWN}}, {}},
+
+        {6, {}, {{0, 1, DOWN}, {0, 2, DOWN}}},
+
+        {7, {{0, 1, UP}}, {}},
+        {8, {{0, 2, UP}}, {}},
+
+        {13, {}, {{0, 1, UP}, {0, 2, UP}}},
+    });
+    runEvents();
+}
+
+TEST_F(DebounceTest, TwoKeysSimultaneous1) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}, {0, 2, DOWN}}, {}},
+
+        {5, {}, {{0, 1, DOWN}, {0, 2, DOWN}}},
+        {6, {{0, 1, UP}, {0, 2, UP}}, {}},
+
+        {11, {}, {{0, 1, UP}, {0, 2, UP}}},
+    });
+    runEvents();
+}
+
+TEST_F(DebounceTest, TwoKeysSimultaneous2) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+        {1, {{0, 2, DOWN}}, {}},
+
+        {6, {}, {{0, 1, DOWN}, {0, 2, DOWN}}},
+        {7, {{0, 2, UP}}, {}},
+        {9, {{0, 1, UP}}, {}},
+
+        // Debouncing loses the specific ordering -- both events report simultaneously.
+        {14, {}, {{0, 1, UP}, {0, 2, UP}}},
+    });
+    runEvents();
+}
+
+TEST_F(DebounceTest, OneKeyDelayedScan1) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+
+        /* Processing is very late */
+        {300, {}, {{0, 1, DOWN}}},
+        /* Immediately release key */
+        {300, {{0, 1, UP}}, {}},
+
+        {305, {}, {{0, 1, UP}}},
+    });
+    time_jumps_ = true;
+    runEvents();
+}
+
+TEST_F(DebounceTest, OneKeyDelayedScan2) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+
+        /* Processing is very late */
+        {300, {}, {{0, 1, DOWN}}},
+        /* Release key after 1ms */
+        {301, {{0, 1, UP}}, {}},
+
+        {306, {}, {{0, 1, UP}}},
+    });
+    time_jumps_ = true;
+    runEvents();
+}
+
+TEST_F(DebounceTest, OneKeyDelayedScan3) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+
+        /* Release key before debounce expires */
+        {300, {{0, 1, UP}}, {}},
+    });
+    time_jumps_ = true;
+    runEvents();
+}
+
+TEST_F(DebounceTest, OneKeyDelayedScan4) {
+    addEvents({ /* Time, Inputs, Outputs */
+        {0, {{0, 1, DOWN}}, {}},
+
+        /* Processing is a bit late */
+        {50, {}, {{0, 1, DOWN}}},
+        /* Release key after 1ms */
+        {51, {{0, 1, UP}}, {}},
+
+        {56, {}, {{0, 1, UP}}},
+    });
+    time_jumps_ = true;
+    runEvents();
+}
diff --git a/quantum/debounce/tests/testlist.mk b/quantum/debounce/tests/testlist.mk
index c54c45aa63..f7bd520698 100644
--- a/quantum/debounce/tests/testlist.mk
+++ b/quantum/debounce/tests/testlist.mk
@@ -1,6 +1,7 @@
 TEST_LIST += \
 	debounce_sym_defer_g \
 	debounce_sym_defer_pk \
+	debounce_sym_defer_pr \
 	debounce_sym_eager_pk \
 	debounce_sym_eager_pr \
 	debounce_asym_eager_defer_pk

From 4eb6d1953063f5f73a917584a17bb1e7187de043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= <alvaro.volpato@usp.br>
Date: Sun, 26 Dec 2021 23:46:53 -0300
Subject: [PATCH 059/867] Add Gondolindrim's keymap for Evolv: addition of
 "encoder modes"  (#14943)

* Update encoder callback

* Move encoder callback

- Encoder callback function was moved from ``encoder_update_user`` in ``keymap.c`` to ``encoder_update_kb`` in ``keyboard.c``

* Update keyboards/evolv/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Use tap_code() on encoder callback

Co-authored-by: Ryan <fauxpark@gmail.com>

* Use tap_code_delay

* Minor readability changes

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 keyboards/evolv/keymaps/gondolindrim/keymap.c | 410 ++++++++++++++++++
 keyboards/evolv/rules.mk                      |   6 +-
 2 files changed, 413 insertions(+), 3 deletions(-)
 create mode 100755 keyboards/evolv/keymaps/gondolindrim/keymap.c

diff --git a/keyboards/evolv/keymaps/gondolindrim/keymap.c b/keyboards/evolv/keymaps/gondolindrim/keymap.c
new file mode 100755
index 0000000000..3ab66bd056
--- /dev/null
+++ b/keyboards/evolv/keymaps/gondolindrim/keymap.c
@@ -0,0 +1,410 @@
+/*
+Copyright 2021 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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/>.
+*/
+
+/* ---------------------------------------------- EVOLV75 GONDOLINDRIM LAYOUT
+This is the firmware for the Evolv75 CE (pre-Alpha) PCBs as designed by Gondolindrim.
+
+The final objective is to achieve a joystic encoder feature where the encoder can exhibit multiple behaviours, hereby called "encoder modes", which can be switched seamlessly by the user. In order to make the user know what encoder mode is active at a given instant, the keyboard has RGB underglow LEDs that shine a particular color; each mode has its own color.
+
+Modes, their behaviours and their colors are user-customizable.
+*/
+
+/* ---------------------------------------------- BASIC DEFINITIONS
+DON"T CHANGE ANY OF THESE.
+*/
+
+#include QMK_KEYBOARD_H
+typedef uint8_t color[3];
+#define COLOR(h,s,v) ((color){h,s,v})
+
+// Defining custom keycodes
+enum keyboard_keycodes {
+        ENCCLK = 0x5F80,	// For "encoder click"
+	ENCNTH,			// "Encoder north"
+	ENCSTH,			// "Encoder south"
+	ENCEST,			// "Encoder east"
+	ENCWST,			// "Encoder west"
+	ALTTABN,		// For alt-tab-switch, next
+	ALTTABP,		// For alt-tab-switch, previous
+	ALTTABC, 		// For alt-tab-click
+	ENCMUP,			// Encoder mode up
+	ENCMDN			// Encoder mode down
+};
+
+// Defining the encoder mode data structure
+typedef struct _encoder_mode_t {
+	color indicator_color;
+	uint16_t clockwise_key[4];
+	uint16_t counterclockwise_key[4];
+	uint16_t clicked_key[4];
+	uint16_t north_key[4];
+	uint16_t south_key[4];
+	uint16_t east_key[4];
+	uint16_t west_key[4];
+} encoder_mode_t;
+
+/* ---------------------------------------------- COLORS
+Colors are defined as HSV values where the values range from 0 to 255. Template:
+
+#define <COLOR NAME> COLOR( <HSV CODE> )
+
+Use these to define the colors for encoder modes.
+*/
+
+#define CYAN COLOR(128,255,255)
+#define PINK COLOR(191,255,255)
+#define YELLOW COLOR(36,255,255)
+#define WHITE COLOR(0,0,255)
+#define STARTUP_COLOR WHITE
+
+/* ---------------------------------------------- DELAYS
+These delays define some important behaviours on the firmware.
+
+MEDIA_KEY_DELAY is used throughout the code to hold certain keycodes for a time before holding them; this allows the use of media keys like volume up and down everywhere.
+
+ALT_TAB_DELAY is the time delay the firmware holds the LALT key before letting it go; in practical use this means once you rotate the encoder in alt-tabbing mode, it will keep the alt-tab window held for this amount of time.
+
+ENCODER_CLICK_DELAY defines a delayed behavior for the encoder click. Once you click it, a timer is triggered and monitored. If the click is held for more than this macro (defaults to 1000 or 1 second), encoder modes start cycling, each per second, and stops when you release. If you hold the click for shorter than the time defined in this macro, then the firmware registers the key contained in the .clicked_key list of that mode.
+*/
+
+#define MEDIA_KEY_DELAY 20
+#define ALT_TAB_DELAY 2000
+#define ENCODER_CLICK_DELAY 1000
+
+// -------------------------------------------- ENCODER MODES
+/* Encoder mode list
+WARNING: DO NOT, ABSOLUTELY DO NOT use ENCNTH, ENCSTH, ENCWST or ENCEST in any of the encoder mode keys. The reason is because these keycodes are used in process_record_user and they point to these very same encoder mode keys; this could generate a loop in process_record_user and freeze the keyboard.
+
+You can add and remove modes at will as long as you have at least one.
+*/
+const encoder_mode_t encoder_modes[] = {
+	// PINK MODE: "media mode". Encoder controls volume (and mode change on layer 1); click does media pause (mute on layer 1), directionals do arrows.
+	{ .indicator_color = PINK,
+	  .clockwise_key = {KC_VOLU, ENCMUP, KC_VOLU, KC_VOLU},
+	  .counterclockwise_key = {KC_VOLD, ENCMDN, KC_VOLD, KC_VOLD},
+	  .clicked_key = {KC_MUTE, KC_MUTE, KC_MPLY, KC_MUTE},
+	  .north_key = {KC_UP, KC_UP, KC_UP, KC_UP},
+	  .south_key = {KC_DOWN, KC_DOWN, KC_DOWN, KC_DOWN},
+	  .east_key = {KC_RGHT, KC_RGHT, KC_RGHT, KC_RGHT},
+	  .west_key = {KC_LEFT, KC_LEFT, KC_LEFT, KC_LEFT}
+	},
+	/* CYAN MODE: "application mode". Switches back and forth between applications ("alt-tabbing"); click stops the alt-tabbing at the selected application. When on layer 1, encoder changes modes. East-west switches tabs ("ctrl-tabbing") and north-sourh maximizes/minimizes windows (GUI plus up and down). Note: these are modifier keys defined natively in QMK
+	- C(kc) means hold left control and press kc
+	- MEH(kc) means hold left control, left shift and press kc
+	- G(kc) means hold LGUI and press kc
+*/
+	{ .indicator_color = CYAN,
+	  .clockwise_key = {ALTTABN, ENCMUP, ALTTABN, ALTTABN},
+	  .counterclockwise_key = {ALTTABP, ENCMDN, ALTTABP, ALTTABP},
+	  .clicked_key = {ALTTABC, ALTTABC, ALTTABC, ALTTABC},
+	  .north_key = {G(KC_UP),G(KC_UP), G(KC_UP), G(KC_UP)},
+	  .south_key = {G(KC_DOWN), G(KC_DOWN), G(KC_DOWN), G(KC_DOWN)},
+	  .east_key = {C(KC_TAB), C(KC_TAB), C(KC_TAB), C(KC_TAB)},
+	  .west_key = {S(C(KC_TAB)), S(C(KC_TAB)), S(C(KC_TAB)), S(C(KC_TAB))}
+	},
+	// YELLOW MODE: "navigation mode". Encoder mimicks mousehwheel, click does mouseclick. North-wouth does page up/down, east-west do home and end.
+	{ .indicator_color = YELLOW,
+	  .clockwise_key = {KC_WH_U, ENCMUP, KC_WH_U, KC_WH_U},
+	  .counterclockwise_key = {KC_WH_D, ENCMDN, KC_WH_D, KC_WH_D},
+	  .clicked_key = {KC_BTN1, KC_BTN2, KC_BTN1, KC_BTN1},
+	  .north_key = {KC_PGUP, KC_PGUP, KC_PGUP, KC_PGUP},
+	  .south_key = {KC_PGDN, KC_PGDN, KC_PGDN, KC_PGDN},
+	  .east_key = {KC_END, KC_END, KC_END, KC_END},
+	  .west_key = {KC_HOME, KC_HOME, KC_HOME, KC_HOME}
+	}
+	// Insert your custom encoder mode here
+};
+
+#define NUM_ENCODER_MODES (sizeof(encoder_modes)/sizeof(encoder_modes[0])) // DO NOT CHANGE THIS. NUM_ENCODER_MODES calculates how many modes there are.
+
+// This counter is used to track what encoder mode is being used at a certain time
+int encoder_mode_count = 0;
+
+/* ---------------------------------------------- RGB STARTING COLOR
+Due to the way rgblight.c stores to and re-stores RGB configurations from EEPROM, the first time the MCU boots up, the EEPROM will not have stored the default value for the RGB animation which in QMK is the static red light; however, during the first bootup, this EEPROM will be set so that, in all subsequent bootups, the RGBs will glow red instead of whatever color the first encoder mode is. What these lines do is re-define the default RGB color so that the default RGB color is defined the same as encoder mode [0] so that the RGB will glow this color once the keyboard boots. DONT CHANGE THIS.
+*/
+#define RGBLIGHT_DEFAULT_HUE encoder_modes[0].indicator_color[0]
+#define RGBLIGHT_DEFAULT_SAT encoder_modes[0].indicator_color[1]
+#define RGBLIGHT_DEFAULT_VAL encoder_modes[0].indicator_color[2]
+
+/* ---------------------------------------------- DEFINING DEFAULT KEYMAP
+Adapt this at will with the caveat that you should not have more nor less than four layers. And let's be honest, if you find yourself needing more than four layers on a 75% keyboard you are probably doing something wrong.
+*/
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_evolv_iso( 
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_INS ,           
+	KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_DEL ,          ENCNTH,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_ENT ,          KC_PGUP, ENCWST , ENCCLK, ENCEST,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS,                   KC_PGDN,          ENCSTH,
+        KC_LSFT, KC_BSLS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , MO(1)  ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
+   [1] = LAYOUT_evolv_iso(                                                                                                                                                  
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           ENCNTH,        
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,  ENCWST , ENCCLK, ENCEST,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,           ENCSTH,        
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_TRNS,  
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______),
+   [2] = LAYOUT_evolv_iso(                                                                                                                                                  
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           ENCNTH,        
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,  ENCWST , ENCCLK, ENCEST,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,           ENCSTH,        
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,  
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______),
+   [3] = LAYOUT_evolv_iso(                                                                                                                                                  
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            ENCNTH,        
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,   ENCWST , ENCCLK, ENCEST,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,            ENCSTH,        
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,  
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______)
+};
+
+/* ---------------------------------------------- END OF USER CUSTOMIZABLE CODE
+Everything past here are functions that operate the firmware. There is nothing to be customized by the user for encoder modes or keyboard keymap.
+*/
+
+/* ---------------------------------------------- SET INDICATOR COLOR FUNCTION
+This is the function used when the RGB colors need to change.
+*/
+void set_indicator_colors(const color target_color){
+	rgblight_sethsv(target_color[0],target_color[1],target_color[2]);
+};
+
+// Board init: RGB indicator is set to the first encoder mode color, also encoder mode is set to first mode.
+void keyboard_pre_init_user(void){
+        set_indicator_colors(STARTUP_COLOR);
+        encoder_mode_count = 0;
+};
+
+void keyboard_post_init_user(void){
+	set_indicator_colors(encoder_modes[0].indicator_color);
+};
+
+/* ---------------------------------------------- SPECIAL KEYCODE PROCESSING
+	The heart of this firmware is the process_custom_keycode function; this allows all the customized keycodes ENCMUP, ENCMDN, ALTTABN, ALLTABP and so on to be used in any place including the encoder callback. Its main mechanic is calling the process_record_user function, where there is a function for each one of the customized keycodes.
+	What process_custom_keycode does is, if a "normal" keycode is passed on, then it is registered and held for a small period of time (MEDIA_KEY_DELAY to be more specific). This "holding" allows it to correctly register media keys. However, if a custom keycode is used, then the function executes process_record_user again, but now with a new argument keycode that will be whatever is mapped inside the special key requested.
+	Admittedly, this implementation looks redundant: process_record_user calls process_custom_keycode which calls process_record_user again. However, the ingenuity of this recursion is this allows any of the custom keycodes to be mappable both to encoder action as well as keys by having their behavior mapped to a single function in a switch-case structure. For instance, by having the encoder update function encoder_update_user use process_custom_keycode, the code for each custom keycode can be present in a single place in the code, that is, in process_record_user. On another hand, if the user wants to map a certain special keycode to a particular key, they can do so; for instance, if the user wants to map the encoder mode switch keys ENCMUP/ENCMDN to, say, left and right keys of layer 1, they can also do so.
+	The glaring problem with this approach is the same as with all recursions: a recursion mapped to itself is a loop, meaning that it is very easy to put the program in a loop within process_record_user by nesting the custom keycodes, for instance, using the keycode ENCNTH in a north key in any of the modes. This then requires a certain care from whoever is adapting or customizing their encoder modes to not use ENCNTH, ENCSTH, ENCWST, ENCEST in the keymap or the encoder modes. The way the firmware deals with this is by only processing keycodes inside the 0x5F85 and 0x5F89 range which exclude these keys; if the given keycode is in the 0x5F80 to 0x5F84 range, which pertains to these forbidden keycodes, nothing is done; to the user it will seem like nothing happens.
+	In the case of the encoder rotating action, in order to call process_record_user a placeholder record is used, the idea being to use values not obtainable phisically on the keyboard like col 20, row 20, with a timer right at the begginig of the code initialization.
+keyrecord_t record {
+  keyevent_t event {
+    keypos_t key {
+      uint8_t col
+      uint8_t row
+    }
+    bool     pressed
+    uint16_t time
+  }
+}
+
+Despite this long description, process_custom_kc is fairly simple. It tests the passed keycode and, if it is one of the custom-defined keys in the forbidden range, nothing is done; if it's one of the good ones, process_record_user is called and the function for that particular keycode will be executed. In other cases, if the event was a press the keycode is registered and held for MEDIA_KEY_DELAY ms. In the case the event was a release, the keycode is unregistered.
+*/
+
+keyrecord_t placeholder_record ;
+//placeholder_record->event.key.col = 20;
+//placeholder_record.event.key.row = 20;
+//placeholder_record.event.time = timer_read32();
+
+uint16_t mapped_code = 0;
+uint32_t held_keycode_timer = 0;
+void process_custom_keycode(uint16_t keycode, keyrecord_t *record){
+	if (keycode >= 0x05F80 && keycode < 0x5F85) ;
+	else if (keycode >= 0x5F85 && keycode <= 0x5F89) process_record_user(keycode, record);
+	else {
+		// Note: (un)register_keycode16 need to be the 16 bit versions in case modifier keys like C(), G() and so on are used. This is specially true for the "application control" encoder mode.
+		if (record->event.pressed){
+			register_code16(keycode);
+			held_keycode_timer = timer_read32();
+			while (timer_elapsed32(held_keycode_timer) < MEDIA_KEY_DELAY);
+		} else unregister_code16(keycode);
+	}
+}
+
+// Basically calls process_custom_keycode in a press event and then in a release event. This is basically done to tap custom keycodes.
+void tap_custom_keycode(uint16_t keycode){
+	placeholder_record.event.pressed = true;
+	process_custom_keycode(keycode, &placeholder_record);
+	placeholder_record.event.pressed = false;
+	process_custom_keycode(keycode, &placeholder_record);
+}
+
+/* ---------------------------------------------- LAYER UPDATING
+Keeps track of the highest active layer.
+*/
+int current_layer = 0 ; // Updated in layer_state_set_user each time a layer change is made
+layer_state_t layer_state_set_user(layer_state_t state) {
+	current_layer = get_highest_layer(state);
+	return state;
+}
+
+/* ---------------------------------------------- ENCODER MDOE CYCLING
+Pretty straightforward: cycles encoder mode forwards if passed a true value and backwards otherwise.
+
+Some care is taken for two edge cases:
+	- The user is at mode 0 and the encoder mode is changed backwards
+	- The user is at the last mode and changes it forward.
+
+The program deals with this last case by taking the division remainder, which will take encoder_mode_count to 0. For the first case, encoder_mode_count is just made equal to the last (highest) mode.
+*/
+void cycle_encoder_mode(bool forward){
+	forward ? encoder_mode_count++ : encoder_mode_count-- ;
+	if (encoder_mode_count == -1) encoder_mode_count = NUM_ENCODER_MODES - 1;
+	encoder_mode_count = encoder_mode_count%NUM_ENCODER_MODES ; // This makes sure encoder_mode_count keeps cycling between 0,1,...,NUM_ENCODER_MODES and doesnt eventually overflow
+	set_indicator_colors( encoder_modes[ encoder_mode_count ].indicator_color ); // Set indicator color to the corresponding defined color
+}
+
+/* ---------------------------------------------- PROCESSING ALT-TABBING
+This function process the alt-tabbing keycode ALTTABS. The process works in a few steps:
+- At first, the flag is_alt_tab_active is false. When the user first uses this keycode (rotating the encoder, for instance) then the function turns the flag and "presses" left alt (KC_LALT), also triggering a timer alt_tab_timer.
+- The alt_tab_timer is supposed to keep track of how many miliseconds the alt-tab window should be kept, that is, how much time the LALT keycode should be held. The objective being, once the user cycles through the applications to the desired one, they select it either by not rotating the applications anymore or clicking the encoder.
+- Finally, the function shoots out the KC_TAB keycode if the encoder was rotated clockwise or the S(KC_TAB) (shift + tab) if the encoder was rotated counterclockwise.
+- If the user cycles the encoder still while alt-tab is active, then the function refreshes the timer and shoots out tab or shift+tab.
+- The function that keeps track of the timer expiration is housekeeping_task_user, where if the alt_tab_timer surpasses the defined ALT_TAB_DELAY macro (defaults to 2 seconds or 2000 ms) then the release_alt_tab function is called: the LALT keycode is released and the is_alt_tab_active flag is set to false again
+- The release_alt_tab function is also called when the ALTTABC keycode is hit, thus selecting the desired application.
+*/
+
+// This bool records if LALT is pressed or not. Due to the automatic disabling of the ALT-TAB of the ALTTABS custom keystroke, the automatic disabling can un-register KC_LALT even when the LALT key is phisically pressed. Hence there needs to be two bools: one that keebs track of the ALT-TAB activity and one that keeps track of LALT so that the automatic disabling will not disable LALT if it is phisically pressed.
+bool is_lalt_pressed = false;
+bool is_alt_tab_active = false; // Flag to check if alt tab is active
+uint32_t alt_tab_timer = 0;     // Time trigger for alt tab
+void process_alt_tabbing(bool next){
+	if(!is_alt_tab_active) {
+		is_alt_tab_active = true;
+		register_code(KC_LALT);
+		}
+	alt_tab_timer = timer_read32();
+	tap_code16(next ? KC_TAB : S(KC_TAB));
+}
+
+void release_alt_tab(void){
+	is_alt_tab_active = false;
+	unregister_code(KC_LALT);
+}
+
+/* ---------------------------------------------- ENCODER UPDATE CALLBACK
+This taps the keycode stored in the encoder mode struct, at the current encoder mode, at the current layer. Because the user can use non-QMK-native keycodes in the encoder, like the alt-tabbing keycodes like ALTTABP and ATLTTABN, the tap function is the custom tap one.
+*/
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+	mapped_code = clockwise ? encoder_modes[ encoder_mode_count ].clockwise_key[ current_layer ] : encoder_modes[ encoder_mode_count ].counterclockwise_key[ current_layer ] ; // mapped code is the clockwise key if a clockwise motion is sensed, otherwise it registers the counterclockwise key
+	tap_custom_keycode(mapped_code);
+	return false; 	// This function needs to return false in order to inhibit the action of encoder_update_user as defined in evolv.c
+}
+
+/* ---------------------------------------------- DEALING WITH THE ENCODER CLICK
+The encoder used in the Evolv has a construction particularity in that not only it has rotation and clicking but also directional joystic capabilities in the four cardinal directions, as in, it can also register four directions. The way that this works is, there are A,B and a common pin for the encoder rotation , with a PUSH and a COM pin. The encoder pins work pretty much like common encoders, as does the switch click: once you click it, PUSH and COM short-circuit, so the pushing mechanic can be easily integrated into a switch matrix and treated like a switch would.
+
+The problem, however, lies in the directionals. For each directional, say N,S,W,E, there is a corresponding pin on the encoder; once one directional is hit its pin is shorted with PUSH and COM. This means that the directionals can be treated as four short-circuit keys and integrated into the matrix, but with the added hassle that every time one of them is registered, the encoder push is also registered.
+
+The way this firmware deals with this problem is threefold.
+
+- First, there is a is_click_blocked flag that is set true whenever one of the directionals is sensed by the matrix; the name suggests that in this case the click keycode processing should be "blocked". This allows the firmware to differentiate between an event where a directional was hit (the encoder push is recognized but is_click_blocked is true) and an event where only the push was used (is_click_blocked is false albeit the push being sensed).
+- Second, in order to prevent the encoder push key from registering before the flag is set, a 20ms delay takes place when the encoder click was sensed; this means that when a directional is hit, the encoder action is guaranteed to be processed only after the is_click_blocked flag is true.
+- Finally, held_click_timer and is_click_held are used to differentiate between a click short push and a long push; when a directional key is hit, is_click_held is immediately reset, further preventing any action corresponding to the encoder push click being held down.
+
+automatic_encoder_mode_cycle is a flag used by the housekeeping function to communicate an encoder mode change was made during an encoder push, meaning that the user has held the encoder enough to trigger an encoder mode change. What the housekeeping function does is constantly monitor the timer so that, when it extrapolates the designated ENCODER_CLICK_DELAY, a mode change takes place; the held_click_timer timer is refreshed. The problem is that, once the user reaches their desired mode and releases the encoder, the timer had been refreshed and is lower than the designated delay, which would cause the "fast click" keycode to be triggered, which is of course unwanted. Hence the algorithm filters out these situations by knowing when the automatic mode change has taken place and not registering the click key, only resetting the automatic_encoder_mode_cycle flag.
+
+Finally, the process_encoder_click function has two parts. In a click press event, it sets the flag is_click_held and triggers a timer. When the encoder push is released, the timer is sampled and the pertinent action is taken depending on how much time the encoder was held for.
+*/
+
+uint32_t held_click_timer = 0;
+bool is_click_held = false;
+bool is_shift_held = false;
+bool automatic_encoder_mode_cycle = false; // This flag registers if the encoder mode was automatically cycled 
+bool is_click_blocked = false;
+void process_encoder_click(bool clickpress){
+	// What to do when the encoder is pressed: turn the flag to true, start (or refresh) timer
+	if (clickpress) { 
+		is_click_held = true;
+		held_click_timer = timer_read32();
+	} else { // What to do when encoder is released
+		is_click_held = false;
+		// Checking if the time the encoder click was held was smaller than the delay defined and if an automatic mode change was not already performed. If it was, just register whatever it is the click does.
+		if (timer_elapsed32(held_click_timer) < ENCODER_CLICK_DELAY && !automatic_encoder_mode_cycle ) tap_custom_keycode(encoder_modes[ encoder_mode_count ].clicked_key[ current_layer ]);
+		automatic_encoder_mode_cycle = false;
+	}
+}
+
+bool process_directional(uint16_t keycode, keyrecord_t *record){
+	is_click_held = false;
+	is_click_blocked = record->event.pressed ;
+	process_custom_keycode( keycode , record );
+	return false;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+	switch (keycode) {
+		case KC_LSFT:
+		case KC_RSFT:
+			is_shift_held = record->event.pressed;
+			break;
+		case KC_LALT: // If this is not defined, if the encoder is activated in the alt-tab mode while the LALT key is pressed, the menu goes away.
+			is_lalt_pressed = record->event.pressed;				
+			break;
+// ---------------------------------------------- CUSTOM KEYCODES: they do their thing and retun false right away to prevent any further action
+// --------------------- Encoder directionals (note: process_directional always returns false)
+		case ENCNTH: return process_directional( encoder_modes[ encoder_mode_count ].north_key[ current_layer ] , record);
+		case ENCSTH: return process_directional( encoder_modes[ encoder_mode_count ].south_key[ current_layer ] , record);
+		case ENCEST: return process_directional( encoder_modes[ encoder_mode_count ].east_key[ current_layer ] , record);
+		case ENCWST: return process_directional( encoder_modes[ encoder_mode_count ].west_key[ current_layer ] , record);
+// --------------------- Encoder click
+		case ENCCLK:
+			held_keycode_timer = timer_read32();
+			while (timer_elapsed32(held_keycode_timer) < 20);
+			if(!is_click_blocked) process_encoder_click(record->event.pressed);
+			return false; // Skip all further processing of this key
+// --------------------- Alt-tabbing
+		case ALTTABN:
+		case ALTTABP:
+			if(record->event.pressed) process_alt_tabbing(keycode == ALTTABN); // alt-tabs forward if the keycode is ALTTABN, else alt-tabs backwards if it's ALTTABP
+			return false;
+		case ALTTABC:
+			if(record->event.pressed) release_alt_tab();
+			return false;
+// --------------------- Encoder mode up/down
+		case ENCMUP:
+		case ENCMDN:
+			if(record->event.pressed) cycle_encoder_mode(keycode == ENCMUP); // Cycles encoder mode up if keycode is ENCMUP, else cycles backwards if the keycode is ENCMDN
+			return false;
+// ---------------------------------------------- DEFAULT
+		default:
+			return true;
+	}
+	return true;
+}
+
+/* ---------------------------------------------- HOUSEKEEPING
+Housekeeping keeps track of three events:
+- Keeps track of the alt-tabbing timer. If it surpasses ALT_TAB_DELAY the release_alt_tab function is called;
+- Keeps track of the encoder click hold timer; if the encoder click is held for more than a certain delay, cycles encoder mode and sets the automatic_mode_change flag.
+- The is_click_blocked flag marks if the encoder click has been registered with a directional key (recall that in this encoder, when a directional key is hit, both the directional key and the encoder push key are triggered in the keymap). In this case, only the directional should be registered. Hence, this housekeeping function resets the held_click_timer timer because, if this is not done, if the directional key is held for more than ENCODER_CLICK_DELAY then this will trigger an automatic mode change.
+*/
+void housekeeping_task_user(void) {
+	if (is_alt_tab_active){ 
+		if (is_lalt_pressed) alt_tab_timer = timer_read32(); // If the user is holding the LALT key, refresh the timer
+		else if (timer_elapsed32(alt_tab_timer) > ALT_TAB_DELAY) release_alt_tab(); // If the timer surpasses the delay, release alt tab
+	}
+	if (is_click_blocked) held_click_timer = timer_read32(); // To prevent mode changing when directionals are held
+	if (is_click_held && timer_elapsed32(held_click_timer) > ENCODER_CLICK_DELAY ){
+		automatic_encoder_mode_cycle = true;
+		held_click_timer = timer_read32();
+		if (is_shift_held) cycle_encoder_mode(false);
+		else cycle_encoder_mode(true);
+	}
+}
diff --git a/keyboards/evolv/rules.mk b/keyboards/evolv/rules.mk
index 5f5b97241b..5b705106b8 100644
--- a/keyboards/evolv/rules.mk
+++ b/keyboards/evolv/rules.mk
@@ -10,11 +10,11 @@ BOOTLOADER = stm32-dfu
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 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
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 

From 2c8d46f40843507a4aff66368194faf25745fed9 Mon Sep 17 00:00:00 2001
From: Erik Berthold <eberthold@users.noreply.github.com>
Date: Mon, 27 Dec 2021 03:50:44 +0100
Subject: [PATCH 060/867] fix RGB_DISABLE_TIMEOUT flicker on split keyboards
 (#14954)

---
 quantum/rgb_matrix/rgb_matrix.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index 558c7bd41a..51e9554e2d 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -275,12 +275,8 @@ static void rgb_task_timers(void) {
 
     // Update double buffer timers
 #if RGB_DISABLE_TIMEOUT > 0
-    if (rgb_anykey_timer < UINT32_MAX) {
-        if (UINT32_MAX - deltaTime < rgb_anykey_timer) {
-            rgb_anykey_timer = UINT32_MAX;
-        } else {
-            rgb_anykey_timer += deltaTime;
-        }
+    if (rgb_anykey_timer + deltaTime <= UINT32_MAX) {
+        rgb_anykey_timer += deltaTime;
     }
 #endif  // RGB_DISABLE_TIMEOUT > 0
 

From db358d171d24eaa10286cbb72916302dd8e22d00 Mon Sep 17 00:00:00 2001
From: Buttenup <50253991+Buttenup@users.noreply.github.com>
Date: Mon, 27 Dec 2021 13:57:09 +1100
Subject: [PATCH 061/867] Update feature_macros.md (#15026)

* Update feature_macros.md

Added a link to the usage of SAFE_RANGE as this wasn't clear to me when I visited this page in isolation.

* Fix typo

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 docs/feature_macros.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/feature_macros.md b/docs/feature_macros.md
index 81ade58592..4368853569 100644
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -144,6 +144,8 @@ If yes, we send the string `"QMK is the best thing ever!"` to the computer via t
 We return `true` to indicate to the caller that the key press we just processed should continue to be processed as normal (as we didn't replace or alter the functionality).
 Finally, we define the keymap so that the first button activates our macro and the second button is just an escape button.
 
+?>It is recommended to use the SAFE_RANGE macro as per [Customizing Functionality](custom_quantum_functions.md).
+
 You might want to add more than one macro.
 You can do that by adding another keycode and adding another case to the switch statement, like so:
 

From c93935f243dc7170dadfc2daf95e055fec56df6d Mon Sep 17 00:00:00 2001
From: Simon Arlott <70171+nomis@users.noreply.github.com>
Date: Mon, 27 Dec 2021 03:04:26 +0000
Subject: [PATCH 062/867] Durgod: Increase scan rate by using wait_us GPT timer
 (#14091)

Lower the tick rate from 10kHz to 1kHz (otherwise all the extra interrupts
reduce the achievable scan rate). Enable the WAIT_US_TIMER using GPT TIM3.

Observed scan rate on the K320 is increased from 625Hz to 2090-2120Hz.
---
 keyboards/durgod/boards/DURGOD_STM32_F070/chconf.h  | 2 +-
 keyboards/durgod/boards/DURGOD_STM32_F070/mcuconf.h | 2 +-
 keyboards/durgod/dgk6x/config.h                     | 3 +++
 keyboards/durgod/dgk6x/halconf.h                    | 3 +++
 keyboards/durgod/k3x0/config.h                      | 3 +++
 keyboards/durgod/k3x0/halconf.h                     | 2 ++
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/keyboards/durgod/boards/DURGOD_STM32_F070/chconf.h b/keyboards/durgod/boards/DURGOD_STM32_F070/chconf.h
index a7d95c51a9..d70f188178 100644
--- a/keyboards/durgod/boards/DURGOD_STM32_F070/chconf.h
+++ b/keyboards/durgod/boards/DURGOD_STM32_F070/chconf.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#define CH_CFG_ST_FREQUENCY 10000
+#define CH_CFG_ST_FREQUENCY 1000
 
 #define CH_CFG_ST_TIMEDELTA 0
 
diff --git a/keyboards/durgod/boards/DURGOD_STM32_F070/mcuconf.h b/keyboards/durgod/boards/DURGOD_STM32_F070/mcuconf.h
index 6d67aa96aa..a24c1cee12 100644
--- a/keyboards/durgod/boards/DURGOD_STM32_F070/mcuconf.h
+++ b/keyboards/durgod/boards/DURGOD_STM32_F070/mcuconf.h
@@ -85,7 +85,7 @@
  */
 #define STM32_GPT_USE_TIM1                  FALSE
 #define STM32_GPT_USE_TIM2                  FALSE
-#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM3                  TRUE
 #define STM32_GPT_USE_TIM14                 FALSE
 #define STM32_GPT_TIM1_IRQ_PRIORITY         2
 #define STM32_GPT_TIM2_IRQ_PRIORITY         2
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h
index 92673e5c24..a15ed86650 100644
--- a/keyboards/durgod/dgk6x/config.h
+++ b/keyboards/durgod/dgk6x/config.h
@@ -22,6 +22,9 @@
 #define VENDOR_ID       0xD60D
 #define MANUFACTURER    Hoksi Technology
 
+#define USB_POLLING_INTERVAL_MS 1
+#define WAIT_US_TIMER           GPTD3
+
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
diff --git a/keyboards/durgod/dgk6x/halconf.h b/keyboards/durgod/dgk6x/halconf.h
index 1772f8e410..9c1c6e5280 100644
--- a/keyboards/durgod/dgk6x/halconf.h
+++ b/keyboards/durgod/dgk6x/halconf.h
@@ -19,4 +19,7 @@
 #ifdef RGB_MATRIX_ENABLE
 #define HAL_USE_I2C TRUE
 #endif
+
+#define HAL_USE_GPT TRUE
+
 #include_next <halconf.h>
diff --git a/keyboards/durgod/k3x0/config.h b/keyboards/durgod/k3x0/config.h
index ef73a71016..af543bb970 100644
--- a/keyboards/durgod/k3x0/config.h
+++ b/keyboards/durgod/k3x0/config.h
@@ -23,6 +23,9 @@
 #define VENDOR_ID       0xD60D
 #define MANUFACTURER    Hoksi Technology
 
+#define USB_POLLING_INTERVAL_MS 1
+#define WAIT_US_TIMER           GPTD3
+
 /* key matrix size (rows in specific keyboard variant) */
 #define MATRIX_COLS 16
 
diff --git a/keyboards/durgod/k3x0/halconf.h b/keyboards/durgod/k3x0/halconf.h
index fa20fe30a9..d2a9d8c7c0 100644
--- a/keyboards/durgod/k3x0/halconf.h
+++ b/keyboards/durgod/k3x0/halconf.h
@@ -19,4 +19,6 @@
 #define HAL_USE_PAL                 TRUE
 #define PAL_USE_CALLBACKS           TRUE
 
+#define HAL_USE_GPT                 TRUE
+
 #include_next <halconf.h>

From 55c75da524df1ee00ccbd5b578fb61733906fedf Mon Sep 17 00:00:00 2001
From: yfuku <30647434+yfuku@users.noreply.github.com>
Date: Mon, 27 Dec 2021 12:05:31 +0900
Subject: [PATCH 063/867] Add wings42 rev2 (#13702)

* add rev2

* add encoder settings

* add license header
---
 keyboards/wings42/rev1/readme.md              |   4 +-
 keyboards/wings42/rev2/config.h               | 152 ++++++++++++
 .../wings42/rev2/keymaps/default/keymap.c     |  81 +++++++
 .../wings42/rev2/keymaps/default/readme.md    |   1 +
 keyboards/wings42/rev2/keymaps/via/config.h   |  20 ++
 keyboards/wings42/rev2/keymaps/via/keymap.c   | 218 ++++++++++++++++++
 keyboards/wings42/rev2/keymaps/via/rules.mk   |   2 +
 keyboards/wings42/rev2/readme.md              |  21 ++
 keyboards/wings42/rev2/rev2.c                 |  17 ++
 keyboards/wings42/rev2/rev2.h                 |  46 ++++
 keyboards/wings42/rev2/rules.mk               |   0
 keyboards/wings42/rules.mk                    |   2 +-
 keyboards/wings42/wings42.h                   |   4 +
 13 files changed, 565 insertions(+), 3 deletions(-)
 create mode 100644 keyboards/wings42/rev2/config.h
 create mode 100644 keyboards/wings42/rev2/keymaps/default/keymap.c
 create mode 100644 keyboards/wings42/rev2/keymaps/default/readme.md
 create mode 100644 keyboards/wings42/rev2/keymaps/via/config.h
 create mode 100644 keyboards/wings42/rev2/keymaps/via/keymap.c
 create mode 100644 keyboards/wings42/rev2/keymaps/via/rules.mk
 create mode 100644 keyboards/wings42/rev2/readme.md
 create mode 100644 keyboards/wings42/rev2/rev2.c
 create mode 100644 keyboards/wings42/rev2/rev2.h
 create mode 100644 keyboards/wings42/rev2/rules.mk

diff --git a/keyboards/wings42/rev1/readme.md b/keyboards/wings42/rev1/readme.md
index 158372feb4..4ddfe3e83c 100644
--- a/keyboards/wings42/rev1/readme.md
+++ b/keyboards/wings42/rev1/readme.md
@@ -10,11 +10,11 @@ A split keyboard with 3x6 vertically staggered keys and 3 thumb keys.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wings42:default
+    make wings42/rev1:default
 
 Flashing example for this keyboard:
 
-    make wings42:default:flash
+    make wings42/rev1:default:flash
 
 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).
 
diff --git a/keyboards/wings42/rev2/config.h b/keyboards/wings42/rev2/config.h
new file mode 100644
index 0000000000..836833718c
--- /dev/null
+++ b/keyboards/wings42/rev2/config.h
@@ -0,0 +1,152 @@
+/*
+Copyright 2021 yfuku
+
+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 0x5946 // YF
+#define PRODUCT_ID 0x0005
+#define DEVICE_VER 0x0001
+#define MANUFACTURER yfuku
+#define PRODUCT      wings42 rev2
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+
+/*
+ * 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 { D4, C6, D7, E6, NO_PIN }
+#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/wings42/rev2/keymaps/default/keymap.c b/keyboards/wings42/rev2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..df572a6f5a
--- /dev/null
+++ b/keyboards/wings42/rev2/keymaps/default/keymap.c
@@ -0,0 +1,81 @@
+/* Copyright 2021 yfuku
+ *
+ * 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 layer_number {
+    _QWERTY = 0,
+    _RAISE,
+    _LOWER,
+    _ADJUST,
+};
+
+#define KC_G_TAB LGUI_T(KC_TAB)
+#define KC_G_BS LGUI_T(KC_BSPC)
+#define KC_L_SPC LT(_LOWER, KC_SPC)
+#define KC_R_ENT LT(_RAISE, KC_ENT)
+#define KC_S_JA LSFT_T(KC_LANG1)
+#define KC_S_EN LSFT_T(KC_LANG2)
+#define KC_A_DEL ALT_T(KC_DEL)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_split_3x6_3_2(
+    //,--------+--------+--------+--------+--------+--------.                     ,--------+---------+--------+---------+--------+--------.
+        KC_ESC , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                       KC_Y   , KC_U    , KC_I   , KC_O    , KC_P   , KC_MINS,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+---------+--------+---------+--------+--------|
+       KC_G_TAB, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,  KC_BSPC, KC_BSPC,    KC_H   , KC_J    , KC_K   , KC_L    , KC_SCLN, KC_G_BS,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+---------+--------+---------+--------+--------|
+        KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,  KC_DEL , KC_DEL ,    KC_N   , KC_M    , KC_COMM, KC_DOT  , KC_SLSH, KC_RCTL,
+    //`--------+--------+--------+--------+--------+--------/                     \--------+---------+--------+---------+--------+--------'
+                                  KC_A_DEL,KC_S_EN ,KC_L_SPC,                      KC_R_ENT, KC_S_JA , KC_A_DEL
+    //                          `+--------+--------+--------'                     `--------+---------+--------+'
+    ),
+
+    [_RAISE] = LAYOUT_split_3x6_3_2(
+    //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
+        _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE,                       KC_AT  , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
+        KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD,  _______, _______,    KC_LEFT, KC_DOWN,  KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
+        _______, _______, _______, _______, KC_LCBR, KC_LBRC,  _______, _______,    KC_RBRC, KC_RCBR, _______, _______, _______, _______,
+    //`--------+--------+--------+--------+--------+--------/                     \--------+--------+--------+--------+--------+--------'
+                                  _______, _______, _______,                        _______, _______, RESET
+    //                          `+--------+--------+--------'                      `--------+-------+--------+'
+    ),
+
+    [_LOWER] = LAYOUT_split_3x6_3_2(
+    //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
+        KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,                       _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
+        _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,  _______, _______,    KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
+        KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,  _______, _______,    _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
+    //`--------+--------+--------+--------+--------+--------/                     \--------+--------+--------+--------+--------+--------'
+                                  RESET  , _______, _______,                        _______, _______, _______
+    //                          `+--------+--------+--------'                     `--------+--------+--------+'
+    ),
+
+    [_ADJUST] = LAYOUT_split_3x6_3_2(
+    //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
+        _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
+        _______, _______, _______, _______, _______, _______,  _______, _______,    _______, _______, _______, _______, _______, _______,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
+        _______, _______, _______, _______, _______, _______,  _______, _______,    _______, _______, _______, _______, _______, _______,
+    //`--------+--------+--------+--------+--------+--------/                     \--------+--------+--------+--------+--------+--------'
+                                  _______, _______, _______,                        _______, _______, _______
+    //                          `+--------+--------+--------'                     `--------+--------+--------+'
+    ),
+};
diff --git a/keyboards/wings42/rev2/keymaps/default/readme.md b/keyboards/wings42/rev2/keymaps/default/readme.md
new file mode 100644
index 0000000000..d99098ad0c
--- /dev/null
+++ b/keyboards/wings42/rev2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for wings42
diff --git a/keyboards/wings42/rev2/keymaps/via/config.h b/keyboards/wings42/rev2/keymaps/via/config.h
new file mode 100644
index 0000000000..3e0c8d146a
--- /dev/null
+++ b/keyboards/wings42/rev2/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 yfuku
+ *
+ * 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 ENCODERS_PAD_A { B5, B6 }
+#define ENCODERS_PAD_B { B4, B2 }
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/wings42/rev2/keymaps/via/keymap.c b/keyboards/wings42/rev2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e6b4ef840a
--- /dev/null
+++ b/keyboards/wings42/rev2/keymaps/via/keymap.c
@@ -0,0 +1,218 @@
+/* Copyright 2021 yfuku
+ *
+ * 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 layer_number {
+    _QWERTY = 0,
+    _RAISE,
+    _LOWER,
+    _ADJUST,
+};
+
+#define KC_G_TAB LGUI_T(KC_TAB)
+#define KC_G_BS LGUI_T(KC_BSPC)
+#define KC_L_SPC LT(_LOWER, KC_SPC)
+#define KC_R_ENT LT(_RAISE, KC_ENT)
+#define KC_S_JA LSFT_T(KC_LANG1)
+#define KC_S_EN LSFT_T(KC_LANG2)
+#define KC_A_DEL ALT_T(KC_DEL)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_split_3x6_3_2(
+    //,--------+--------+--------+--------+--------+--------.                     ,--------+---------+--------+---------+--------+--------.
+        KC_ESC , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                       KC_Y   , KC_U    , KC_I   , KC_O    , KC_P   , KC_MINS,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+---------+--------+---------+--------+--------|
+       KC_G_TAB, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,  KC_BSPC, KC_BSPC,    KC_H   , KC_J    , KC_K   , KC_L    , KC_SCLN, KC_G_BS,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+---------+--------+---------+--------+--------|
+        KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,  KC_DEL , KC_DEL ,    KC_N   , KC_M    , KC_COMM, KC_DOT  , KC_SLSH, KC_RCTL,
+    //`--------+--------+--------+--------+--------+--------/                     \--------+---------+--------+---------+--------+--------'
+                                  KC_A_DEL,KC_S_EN ,KC_L_SPC,                      KC_R_ENT, KC_S_JA , KC_A_DEL
+    //                          `+--------+--------+--------'                     `--------+---------+--------+'
+    ),
+
+    [_RAISE] = LAYOUT_split_3x6_3_2(
+    //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
+        _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE,                       KC_AT  , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
+        KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD,  _______, _______,    KC_LEFT, KC_DOWN,  KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
+        _______, _______, _______, _______, KC_LCBR, KC_LBRC,  _______, _______,    KC_RBRC, KC_RCBR, _______, _______, _______, _______,
+    //`--------+--------+--------+--------+--------+--------/                     \--------+--------+--------+--------+--------+--------'
+                                  _______, _______, _______,                        _______, _______, RESET
+    //                          `+--------+--------+--------'                      `--------+-------+--------+'
+    ),
+
+    [_LOWER] = LAYOUT_split_3x6_3_2(
+    //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
+        KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,                       _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
+        _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,  _______, _______,    KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
+        KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,  _______, _______,    _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
+    //`--------+--------+--------+--------+--------+--------/                     \--------+--------+--------+--------+--------+--------'
+                                  RESET  , _______, _______,                        _______, _______, _______
+    //                          `+--------+--------+--------'                     `--------+--------+--------+'
+    ),
+
+    [_ADJUST] = LAYOUT_split_3x6_3_2(
+    //,--------+--------+--------+--------+--------+--------.                     ,--------+--------+--------+--------+--------+--------.
+        _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
+        _______, _______, _______, _______, _______, _______,  _______, _______,    _______, _______, _______, _______, _______, _______,
+    //|--------+--------+--------+--------+--------+--------|                     |--------+--------+--------+--------+--------+--------|
+        _______, _______, _______, _______, _______, _______,  _______, _______,    _______, _______, _______, _______, _______, _______,
+    //`--------+--------+--------+--------+--------+--------/                     \--------+--------+--------+--------+--------+--------'
+                                  _______, _______, _______,                        _______, _______, _______
+    //                          `+--------+--------+--------'                     `--------+--------+--------+'
+    ),
+};
+
+keyevent_t encoder1_ccw = {
+    .key = (keypos_t){.row = 4, .col = 0},
+    .pressed = false
+};
+
+keyevent_t encoder1_cw = {
+    .key = (keypos_t){.row = 4, .col = 1},
+    .pressed = false
+};
+
+keyevent_t encoder2_ccw = {
+    .key = (keypos_t){.row = 4, .col = 2},
+    .pressed = false
+};
+
+keyevent_t encoder2_cw = {
+    .key = (keypos_t){.row = 4, .col = 3},
+    .pressed = false
+};
+
+keyevent_t encoder3_ccw = {
+    .key = (keypos_t){.row = 9, .col = 1},
+    .pressed = false
+};
+
+keyevent_t encoder3_cw = {
+    .key = (keypos_t){.row = 9, .col = 0},
+    .pressed = false
+};
+
+keyevent_t encoder4_ccw = {
+    .key = (keypos_t){.row = 9, .col = 3},
+    .pressed = false
+};
+
+keyevent_t encoder4_cw = {
+    .key = (keypos_t){.row = 9, .col = 2},
+    .pressed = false
+};
+
+
+void matrix_scan_user(void) {
+    if (IS_PRESSED(encoder1_ccw)) {
+        encoder1_ccw.pressed = false;
+        encoder1_ccw.time = (timer_read() | 1);
+        action_exec(encoder1_ccw);
+    }
+
+    if (IS_PRESSED(encoder1_cw)) {
+        encoder1_cw.pressed = false;
+        encoder1_cw.time = (timer_read() | 1);
+        action_exec(encoder1_cw);
+    }
+
+    if (IS_PRESSED(encoder2_ccw)) {
+        encoder2_ccw.pressed = false;
+        encoder2_ccw.time = (timer_read() | 1);
+        action_exec(encoder2_ccw);
+    }
+
+    if (IS_PRESSED(encoder2_cw)) {
+        encoder2_cw.pressed = false;
+        encoder2_cw.time = (timer_read() | 1);
+        action_exec(encoder2_cw);
+    }
+
+    if (IS_PRESSED(encoder3_ccw)) {
+        encoder3_ccw.pressed = false;
+        encoder3_ccw.time = (timer_read() | 1);
+        action_exec(encoder3_ccw);
+    }
+
+    if (IS_PRESSED(encoder3_cw)) {
+        encoder3_cw.pressed = false;
+        encoder3_cw.time = (timer_read() | 1);
+        action_exec(encoder3_cw);
+    }
+
+    if (IS_PRESSED(encoder4_ccw)) {
+        encoder4_ccw.pressed = false;
+        encoder4_ccw.time = (timer_read() | 1);
+        action_exec(encoder4_ccw);
+    }
+
+    if (IS_PRESSED(encoder4_cw)) {
+        encoder4_cw.pressed = false;
+        encoder4_cw.time = (timer_read() | 1);
+        action_exec(encoder4_cw);
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            encoder1_cw.pressed = true;
+            encoder1_cw.time = (timer_read() | 1);
+            action_exec(encoder1_cw);
+        } else {
+            encoder1_ccw.pressed = true;
+            encoder1_ccw.time = (timer_read() | 1);
+            action_exec(encoder1_ccw);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            encoder2_cw.pressed = true;
+            encoder2_cw.time = (timer_read() | 1);
+            action_exec(encoder2_cw);
+        } else {
+            encoder2_ccw.pressed = true;
+            encoder2_ccw.time = (timer_read() | 1);
+            action_exec(encoder2_ccw);
+        }
+    } else if (index == 2) {
+        if (clockwise) {
+            encoder3_cw.pressed = true;
+            encoder3_cw.time = (timer_read() | 1);
+            action_exec(encoder3_cw);
+        } else {
+            encoder3_ccw.pressed = true;
+            encoder3_ccw.time = (timer_read() | 1);
+            action_exec(encoder3_ccw);
+        }
+    } else if (index == 3) {
+        if (clockwise) {
+            encoder4_cw.pressed = true;
+            encoder4_cw.time = (timer_read() | 1);
+            action_exec(encoder4_cw);
+        } else {
+            encoder4_ccw.pressed = true;
+            encoder4_ccw.time = (timer_read() | 1);
+            action_exec(encoder4_ccw);
+        }
+    }
+
+    return true;
+}
diff --git a/keyboards/wings42/rev2/keymaps/via/rules.mk b/keyboards/wings42/rev2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..eea5e1e2a2
--- /dev/null
+++ b/keyboards/wings42/rev2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/wings42/rev2/readme.md b/keyboards/wings42/rev2/readme.md
new file mode 100644
index 0000000000..158372feb4
--- /dev/null
+++ b/keyboards/wings42/rev2/readme.md
@@ -0,0 +1,21 @@
+# wings42
+
+![wings42](https://raw.githubusercontent.com/yfuku/wings42/main/images/wings42.jpg)
+
+A split keyboard with 3x6 vertically staggered keys and 3 thumb keys.
+
+* Keyboard Maintainer: [yfuku](https://github.com/yfuku)
+* Hardware Supported: wings42 PCB, Pro Micro
+* Hardware Availability: https://yfuku.booth.pm/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wings42:default
+
+Flashing example for this keyboard:
+
+    make wings42:default:flash
+
+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 build guide for this keyboard can be found here: [wings42 build guide](https://yfuku.com/wings42/buildguide/)
diff --git a/keyboards/wings42/rev2/rev2.c b/keyboards/wings42/rev2/rev2.c
new file mode 100644
index 0000000000..96aa6cd314
--- /dev/null
+++ b/keyboards/wings42/rev2/rev2.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 yfuku
+ *
+ * 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 "rev2.h"
diff --git a/keyboards/wings42/rev2/rev2.h b/keyboards/wings42/rev2/rev2.h
new file mode 100644
index 0000000000..4720592264
--- /dev/null
+++ b/keyboards/wings42/rev2/rev2.h
@@ -0,0 +1,46 @@
+/* Copyright 2021 yfuku
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_split_3x6_3_2( \
+    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15, L31, R33, R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25, L32, R34, R20, R21, R22, R23, R24, R25, \
+                        L33, L34, L35, R30, R31, R32 \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05 }, \
+        { L10, L11, L12, L13, L14, L15 }, \
+        { L20, L21, L22, L23, L24, L25 }, \
+        { KC_NO, L31, L32, L33, L34, L35 }, \
+        { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+        { R05, R04, R03, R02, R01, R00 }, \
+        { R15, R14, R13, R12, R11, R10 }, \
+        { R25, R24, R23, R22, R21, R20 }, \
+        { KC_NO, R34, R33, R32, R31, R30 }, \
+        { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
+    }
diff --git a/keyboards/wings42/rev2/rules.mk b/keyboards/wings42/rev2/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/wings42/rules.mk b/keyboards/wings42/rules.mk
index 0904b3d766..74e894efec 100644
--- a/keyboards/wings42/rules.mk
+++ b/keyboards/wings42/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = wings42/rev1
+DEFAULT_FOLDER = wings42/rev2
diff --git a/keyboards/wings42/wings42.h b/keyboards/wings42/wings42.h
index 07c8823409..9412b7117a 100644
--- a/keyboards/wings42/wings42.h
+++ b/keyboards/wings42/wings42.h
@@ -24,3 +24,7 @@
 #ifdef KEYBOARD_wings42_rev1_extkeys
 #    include "rev1_extkeys.h"
 #endif
+#ifdef KEYBOARD_wings42_rev2
+#    include "rev2.h"
+#endif
+

From 76f94a4275ca1d6417c85c9ad173ae61247f0d19 Mon Sep 17 00:00:00 2001
From: Richard Snijder <37751775+rich239@users.noreply.github.com>
Date: Mon, 27 Dec 2021 04:06:27 +0100
Subject: [PATCH 064/867] Addition of a keypad (#14896)

* Add files via upload

* Update readme.md

* Update readme.md

* Add files via upload

* Add files via upload

* Update keymap.c

* Update config.h

* Delete config.h

* Update readme.md

* Update readme.md

* Delete readme.md

* Delete info.json.bak
---
 keyboards/deltapad/config.h                 | 152 ++++++++++++++++++++
 keyboards/deltapad/deltapad.c               |  17 +++
 keyboards/deltapad/deltapad.h               |  51 +++++++
 keyboards/deltapad/info.json                |  13 ++
 keyboards/deltapad/keymaps/default/keymap.c |  91 ++++++++++++
 keyboards/deltapad/readme.md                |  28 ++++
 keyboards/deltapad/rules.mk                 |  21 +++
 7 files changed, 373 insertions(+)
 create mode 100644 keyboards/deltapad/config.h
 create mode 100644 keyboards/deltapad/deltapad.c
 create mode 100644 keyboards/deltapad/deltapad.h
 create mode 100644 keyboards/deltapad/info.json
 create mode 100644 keyboards/deltapad/keymaps/default/keymap.c
 create mode 100644 keyboards/deltapad/readme.md
 create mode 100644 keyboards/deltapad/rules.mk

diff --git a/keyboards/deltapad/config.h b/keyboards/deltapad/config.h
new file mode 100644
index 0000000000..a4a78f244a
--- /dev/null
+++ b/keyboards/deltapad/config.h
@@ -0,0 +1,152 @@
+/*
+Copyright 2021 Richard Snijder
+
+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   0x0123
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Richard Snijder
+#define PRODUCT      deltapad
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 4
+
+/*
+ * 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 { D2, D3, D1, D0 }
+#define MATRIX_COL_PINS { D7, E6, B4, B5 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/deltapad/deltapad.c b/keyboards/deltapad/deltapad.c
new file mode 100644
index 0000000000..c5a6d866eb
--- /dev/null
+++ b/keyboards/deltapad/deltapad.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Richard Snijder
+ *
+ * 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 "deltapad.h"
diff --git a/keyboards/deltapad/deltapad.h b/keyboards/deltapad/deltapad.h
new file mode 100644
index 0000000000..8e09c1fc84
--- /dev/null
+++ b/keyboards/deltapad/deltapad.h
@@ -0,0 +1,51 @@
+/* Copyright 2021 Richard Snijder
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#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 }  \
+}
diff --git a/keyboards/deltapad/info.json b/keyboards/deltapad/info.json
new file mode 100644
index 0000000000..94fca5a9b4
--- /dev/null
+++ b/keyboards/deltapad/info.json
@@ -0,0 +1,13 @@
+{
+  "keyboard_name": "deltapad",
+  "url": "",
+  "maintainer": "Richard Snijder",
+  "layouts": {
+    "LAYOUT_ortho_4x4": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
+    },
+    "LAYOUT_numpad_4x4": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "y":3}]
+    }
+  }
+}
diff --git a/keyboards/deltapad/keymaps/default/keymap.c b/keyboards/deltapad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6baa033ed5
--- /dev/null
+++ b/keyboards/deltapad/keymaps/default/keymap.c
@@ -0,0 +1,91 @@
+/*
+Copyright 2021 Richard Snijder
+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
+
+uint16_t copy_paste_timer;
+uint16_t enter_timer;
+
+//extern rgblight_config_t rgblight_config;
+
+// Define custom keycodes
+enum my_keycodes {
+	KC_CCCV = SAFE_RANGE,
+	KC_2ENTER
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+        //Layer 0 - Base Layer (F13 to F24, and One Shot Layer 1,2,3,4)
+        [0] = LAYOUT_ortho_4x4(
+                KC_F13, KC_F14, KC_F15, KC_F16,
+                KC_F17, KC_F18, KC_F19, KC_F20,
+                KC_F21, KC_F22, KC_F23, KC_F24,
+                TO(1), OSL(2), OSL(3),  LCA(KC_J)    //Transparent to let you go between layers
+		),
+
+        [1] = LAYOUT_ortho_4x4(
+                LALT(KC_KP_1), LALT(KC_KP_2), LALT(KC_KP_3), LALT(KC_KP_4),
+                LALT(KC_KP_5), LALT(KC_KP_6), LALT(KC_KP_7), LALT(KC_KP_8),
+                LALT(KC_KP_9), LALT(KC_A), LALT(KC_B), LALT(KC_C),
+                TO(2),LALT(KC_D),LALT(KC_E),LALT(KC_F)         //Transparent to let you go between layers
+        ),
+
+        //Layer 2 - Shift + Function Key Layer
+        [2] = LAYOUT_ortho_4x4(
+                LCA(KC_F1), LCA(KC_F2), LCA(KC_F3), LCA(KC_F4),
+                LCA(KC_F5), LCA(KC_F6), LCA(KC_F7), LCA(KC_F8),
+                LCA(KC_F9), LCA(KC_F10),LCA(KC_F11),LCA(KC_F12),
+				TO(3),         LCA(KC_D), LCA(KC_E), LCA(KC_F)         //Transparent to let you go between layers
+        ),
+
+        //Layer 3 - Control + Function Key
+        [3] = LAYOUT_ortho_4x4(
+                LCA(KC_F13), LCA(KC_F14), LCA(KC_F15), LCA(KC_F16),
+                LCA(KC_F17), LCA(KC_F18), LCA(KC_F19), LCA(KC_F20),
+                LCA(KC_F21), LCA(KC_F22),LCA(KC_F23),LCA(KC_F24),
+				TO(0),         LCA(KC_G), LCA(KC_H), LCA(KC_I)          //Transparent to let you go between layers
+        ),
+
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_CCCV:  // One key copy/paste
+            if (record->event.pressed) {
+                copy_paste_timer = timer_read();
+            } else {
+                if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {  // Hold, copy
+                    tap_code16(LCTL(KC_C));
+                } else {  // Tap, paste
+                    tap_code16(LCTL(KC_V));
+                }
+            } return true;
+		case KC_2ENTER:
+		    if (record->event.pressed) {
+                enter_timer = timer_read();
+            } else {
+                if (timer_elapsed(enter_timer) > TAPPING_TERM) {  // Hold, shift+enter
+                    tap_code16(LSFT(KC_ENTER));
+                } else {  // Tap, enter
+                    tap_code16(KC_F24);
+                }
+            } 
+			return true;
+        default:
+            return true;
+    }
+}
+
+
diff --git a/keyboards/deltapad/readme.md b/keyboards/deltapad/readme.md
new file mode 100644
index 0000000000..ca44b2d7af
--- /dev/null
+++ b/keyboards/deltapad/readme.md
@@ -0,0 +1,28 @@
+# deltapad
+
+
+
+*A short description of the keyboard/project*
+
+A 4x4 keypad 
+
+* Keyboard Maintainer: [Richard Snijder](https://github.com/rich239)
+* Hardware Supported: Atmel 32u4 based keypads
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make deltapad:default
+
+Flashing example for this keyboard:
+
+    make deltapad:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in the following way:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+
diff --git a/keyboards/deltapad/rules.mk b/keyboards/deltapad/rules.mk
new file mode 100644
index 0000000000..9906266f48
--- /dev/null
+++ b/keyboards/deltapad/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From b384599663bc45b3aa27c5f83e70bbf6be42d9ea Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Mon, 27 Dec 2021 11:07:00 +0800
Subject: [PATCH 065/867] Link Macro example for COMBO_ACTION documentation
 (#15164)

* Link Macro example for COMBO_ACTION documentation

* Restructure

Co-authored-by: filterpaper <filterpaper@localhost>
---
 docs/feature_combo.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_combo.md b/docs/feature_combo.md
index 0e7ebd6c3b..47128c431b 100644
--- a/docs/feature_combo.md
+++ b/docs/feature_combo.md
@@ -100,7 +100,7 @@ void process_combo_event(uint16_t combo_index, bool pressed) {
 
 This will send "john.doe@example.com" if you chord E and M together, and clear the current line with Backspace and Left-Shift. You could change this to do stuff like play sounds or change settings.
 
-It is worth noting that `COMBO_ACTION`s are not needed anymore. As of [PR#8591](https://github.com/qmk/qmk_firmware/pull/8591/), it is possible to run your own custom keycodes from combos. Just define the custom keycode, program its functionality in `process_record_user`, and define a combo with `COMBO(<key_array>, <your_custom_keycode>)`.
+It is worth noting that `COMBO_ACTION`s are not needed anymore. As of [PR#8591](https://github.com/qmk/qmk_firmware/pull/8591/), it is possible to run your own custom keycodes from combos. Just define the custom keycode, program its functionality in `process_record_user`, and define a combo with `COMBO(<key_array>, <your_custom_keycode>)`. See the first example in [Macros](feature_macros.md).
 
 ## Keycodes
 You can enable, disable and toggle the Combo feature on the fly. This is useful if you need to disable them temporarily, such as for a game. The following keycodes are available for use in your `keymap.c`

From ec98bc343b4dae643ef4eac5fad2ca453af5ab65 Mon Sep 17 00:00:00 2001
From: nazerim <35893392+nazerim@users.noreply.github.com>
Date: Mon, 27 Dec 2021 11:08:06 +0800
Subject: [PATCH 066/867] Hex 4b LED Layer Indicater (#15160)

* Hex 4b VIA Keymap to use scroll lock and num lock LED's to indicate active layer (0,1,2,3)

* Added readme.md file
---
 .../mechlovin/hex4b/keymaps/nazzer/keymap.c   | 98 +++++++++++++++++++
 .../mechlovin/hex4b/keymaps/nazzer/reame.md   | 15 +++
 .../mechlovin/hex4b/keymaps/nazzer/rules.mk   |  1 +
 3 files changed, 114 insertions(+)
 create mode 100644 keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c
 create mode 100644 keyboards/mechlovin/hex4b/keymaps/nazzer/reame.md
 create mode 100644 keyboards/mechlovin/hex4b/keymaps/nazzer/rules.mk

diff --git a/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c b/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c
new file mode 100644
index 0000000000..437233be52
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/keymaps/nazzer/keymap.c
@@ -0,0 +1,98 @@
+/* Copyright 2020 Team Mechlovin
+ * Copyright 2021 Nazerim
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_split_bs(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_SPC,  KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_split_bs(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_split_bs(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_split_bs(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+};
+
+bool led_update_user(led_t led_state) {
+	
+	// Toggle CAPS_LOCK LED normally
+	
+#    if LED_PIN_ON_STATE == 0
+        // invert the whole thing to avoid having to conditionally !led_state.x later
+        led_state.raw = ~led_state.raw;
+#    endif
+#    ifdef LED_CAPS_LOCK_PIN
+        writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
+#    endif
+
+	// Don't call led_update_kb
+    return false;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+	
+	uint8_t layer = biton32(state);
+	
+#if defined(LED_NUM_LOCK_PIN) && defined(LED_SCROLL_LOCK_PIN)
+    switch (layer) {
+        case 0:
+			writePin(LED_SCROLL_LOCK_PIN, !LED_PIN_ON_STATE); 
+			writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE); 
+            break;
+        case 1:
+			writePin(LED_SCROLL_LOCK_PIN, LED_PIN_ON_STATE); 
+			writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE); 
+            break;
+        case 2:
+			writePin(LED_SCROLL_LOCK_PIN, !LED_PIN_ON_STATE); 
+			writePin(LED_NUM_LOCK_PIN, LED_PIN_ON_STATE); 
+            break;
+        case 3:
+			writePin(LED_SCROLL_LOCK_PIN, LED_PIN_ON_STATE); 
+			writePin(LED_NUM_LOCK_PIN, LED_PIN_ON_STATE); 
+            break;
+    }
+#endif
+
+	return state;												
+
+}
diff --git a/keyboards/mechlovin/hex4b/keymaps/nazzer/reame.md b/keyboards/mechlovin/hex4b/keymaps/nazzer/reame.md
new file mode 100644
index 0000000000..a8a686d8bc
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/keymaps/nazzer/reame.md
@@ -0,0 +1,15 @@
+# Nazzer's Hex 4b - Layers on Scroll Lock and Num Lock LED
+
+Repurposed the Scroll Lock and Num Lock LED's as Hex 4b does not have a NUM pad and default layout does not map Scroll Lock
+- Top LED shows CAPS lock status
+- Layer indicators:
+- Layer 0: bottom LED off, middle LED off
+- Layer 1: bottom LED on , middle LED off
+- Layer 2: bottom LED off, middle LED on
+- Layer 3: bottom LED on , middle LED on
+
+## Changelog
+
+### 15/11/2021 - 0.0.1
+
+- Initial release
diff --git a/keyboards/mechlovin/hex4b/keymaps/nazzer/rules.mk b/keyboards/mechlovin/hex4b/keymaps/nazzer/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/keymaps/nazzer/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file

From 8fd957b69b70136cf7b1ba7bed513e084fb3a340 Mon Sep 17 00:00:00 2001
From: BifbofII <christoph@jabs-family.de>
Date: Mon, 27 Dec 2021 05:09:56 +0200
Subject: [PATCH 067/867] Add personal handwired Planck clone (#13299)

* Add personal handwired Planck clone

* remove references to planck

* requested changes

- small changes to defines
- licence headers

* Clean up rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Change function return type to bool

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/handwired/ortho_brass/config.h      |  44 ++++
 .../ortho_brass/keymaps/default/keymap.c      | 240 ++++++++++++++++++
 .../ortho_brass/keymaps/default/readme.md     |   5 +
 keyboards/handwired/ortho_brass/ortho_brass.c |  26 ++
 keyboards/handwired/ortho_brass/ortho_brass.h |  47 ++++
 keyboards/handwired/ortho_brass/readme.md     |   6 +
 keyboards/handwired/ortho_brass/rules.mk      |  22 ++
 .../community/ortho_4x12/bifbofii/keymap.c    | 173 +++++++++++++
 .../community/ortho_4x12/bifbofii/readme.md   |  89 +++++++
 .../community/ortho_4x12/bifbofii/rules.mk    |   1 +
 10 files changed, 653 insertions(+)
 create mode 100644 keyboards/handwired/ortho_brass/config.h
 create mode 100644 keyboards/handwired/ortho_brass/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/ortho_brass/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/ortho_brass/ortho_brass.c
 create mode 100644 keyboards/handwired/ortho_brass/ortho_brass.h
 create mode 100644 keyboards/handwired/ortho_brass/readme.md
 create mode 100644 keyboards/handwired/ortho_brass/rules.mk
 create mode 100644 layouts/community/ortho_4x12/bifbofii/keymap.c
 create mode 100644 layouts/community/ortho_4x12/bifbofii/readme.md
 create mode 100644 layouts/community/ortho_4x12/bifbofii/rules.mk

diff --git a/keyboards/handwired/ortho_brass/config.h b/keyboards/handwired/ortho_brass/config.h
new file mode 100644
index 0000000000..816a8fe597
--- /dev/null
+++ b/keyboards/handwired/ortho_brass/config.h
@@ -0,0 +1,44 @@
+/* Copyright 2021 Christoph Jabs (BifbofII)
+ *
+ * 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 0x6060
+#define DEVICE_VER 0x0001
+#define MANUFACTURER BifbofII
+#define PRODUCT Ortho Brass
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+/* Handwired pin-out */
+#define MATRIX_ROW_PINS \
+    { D3, D2, D1, D0 }
+#define MATRIX_COL_PINS \
+    { F4, F7, F5, F1, C7, F0, B1, B0, F6, B6, B2, B3 }
+#define UNUSED_PINS \
+    { B0, B1, B2, F0, F1, F4, D4, D5, E6 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/handwired/ortho_brass/keymaps/default/keymap.c b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
new file mode 100644
index 0000000000..48af2a2d00
--- /dev/null
+++ b/keyboards/handwired/ortho_brass/keymaps/default/keymap.c
@@ -0,0 +1,240 @@
+/* Copyright 2021 Christoph Jabs (BifbofII)
+ *
+ * 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 ortho_brass_layers {
+    _QWERTY,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _PLOVER,
+    _ADJUST
+};
+
+enum ortho_brass_keycodes {
+    QWERTY = SAFE_RANGE,
+    COLEMAK,
+    DVORAK,
+    PLOVER,
+    EXT_PLV
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_ortho_4x12_1x2uC(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    XXXXXXX, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Colemak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT_ortho_4x12_1x2uC(
+    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+    KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    XXXXXXX, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Dvorak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_DVORAK] = LAYOUT_ortho_4x12_1x2uC(
+    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
+    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
+    XXXXXXX, KC_LCTL, KC_LALT, KC_LGUI, LOWER,       KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_ortho_4x12_1x2uC(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
+    _______, _______, _______, _______, _______,      _______,     _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_ortho_4x12_1x2uC(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Plover layer (http://opensteno.org)
+ * ,-----------------------------------------------------------------------------------.
+ * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_PLOVER] = LAYOUT_ortho_4x12_1x2uC(
+    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
+    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
+    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,        XXXXXXX,      KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
+),
+
+/* Adjust (Lower + Raise)
+ *                      v------------------------RGB CONTROL--------------------v
+ * ,-----------------------------------------------------------------------------------.
+ * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_ortho_4x12_1x2uC(
+    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, _______, _______, _______, _______,     _______,      _______, _______,  _______, _______, _______
+)
+
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); }
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case QWERTY:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_QWERTY);
+            }
+            return false;
+            break;
+        case COLEMAK:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_COLEMAK);
+            }
+            return false;
+            break;
+        case DVORAK:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_DVORAK);
+            }
+            return false;
+            break;
+        case PLOVER:
+            if (record->event.pressed) {
+                layer_off(_RAISE);
+                layer_off(_LOWER);
+                layer_off(_ADJUST);
+                layer_on(_PLOVER);
+                if (!eeconfig_is_enabled()) {
+                    eeconfig_init();
+                }
+                keymap_config.raw  = eeconfig_read_keymap();
+                keymap_config.nkro = 1;
+                eeconfig_update_keymap(keymap_config.raw);
+            }
+            return false;
+            break;
+        case EXT_PLV:
+            if (record->event.pressed) {
+                layer_off(_PLOVER);
+            }
+            return false;
+            break;
+    }
+    return true;
+}
+
+bool dip_switch_update_user(uint8_t index, bool active) {
+    switch (index) {
+        case 0: {
+            if (active) {
+                layer_on(_ADJUST);
+            } else {
+                layer_off(_ADJUST);
+            }
+            break;
+        }
+    }
+    return true;
+}
+
+bool music_mask_user(uint16_t keycode) {
+    switch (keycode) {
+        case RAISE:
+        case LOWER:
+            return false;
+        default:
+            return true;
+    }
+}
diff --git a/keyboards/handwired/ortho_brass/keymaps/default/readme.md b/keyboards/handwired/ortho_brass/keymaps/default/readme.md
new file mode 100644
index 0000000000..ca6c4a71d4
--- /dev/null
+++ b/keyboards/handwired/ortho_brass/keymaps/default/readme.md
@@ -0,0 +1,5 @@
+# The Default Ortho 4x12 Planck-like Layout
+
+![Planck Default Layout](https://i.imgur.com/axdWbdH.jpeg)
+
+Very slightly modified to remove features that the handwired version does not have.
diff --git a/keyboards/handwired/ortho_brass/ortho_brass.c b/keyboards/handwired/ortho_brass/ortho_brass.c
new file mode 100644
index 0000000000..d124bbfca2
--- /dev/null
+++ b/keyboards/handwired/ortho_brass/ortho_brass.c
@@ -0,0 +1,26 @@
+/* Copyright 2021 Christoph Jabs (BifbofII)
+ *
+ * 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 "ortho_brass.h"
+
+#ifdef SWAP_HANDS_ENABLE
+__attribute__((weak)) const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    {{11, 0}, {10, 0}, {9, 0}, {8, 0}, {7, 0}, {6, 0}, {5, 0}, {4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
+    {{11, 1}, {10, 1}, {9, 1}, {8, 1}, {7, 1}, {6, 1}, {5, 1}, {4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
+    {{11, 2}, {10, 2}, {9, 2}, {8, 2}, {7, 2}, {6, 2}, {5, 2}, {4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
+    {{11, 3}, {10, 3}, {9, 3}, {8, 3}, {7, 3}, {6, 3}, {5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}},
+};
+#endif
diff --git a/keyboards/handwired/ortho_brass/ortho_brass.h b/keyboards/handwired/ortho_brass/ortho_brass.h
new file mode 100644
index 0000000000..0bcff0db51
--- /dev/null
+++ b/keyboards/handwired/ortho_brass/ortho_brass.h
@@ -0,0 +1,47 @@
+/* Copyright 2021 Christoph Jabs (BifbofII)
+ *
+ * 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_ortho_4x12_1x2uC( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
+    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
+}
+
+#define LAYOUT_ortho_4x12( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
+}
+
+#define LAYOUT LAYOUT_ortho_4x12
diff --git a/keyboards/handwired/ortho_brass/readme.md b/keyboards/handwired/ortho_brass/readme.md
new file mode 100644
index 0000000000..0b531dac10
--- /dev/null
+++ b/keyboards/handwired/ortho_brass/readme.md
@@ -0,0 +1,6 @@
+# Ortho Brass Handwired Keyboard
+
+A handwired keyboard with brass backplate and planck-like ortho 4x12 layout.
+A compact 40% (12x4) ortholinear keyboard.
+
+![BifbofII Ortho 4x12 Layout](https://i.imgur.com/hHSexjE.jpeg)
diff --git a/keyboards/handwired/ortho_brass/rules.mk b/keyboards/handwired/ortho_brass/rules.mk
new file mode 100644
index 0000000000..19154c58f9
--- /dev/null
+++ b/keyboards/handwired/ortho_brass/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader
+BOOTLOADER = qmk-dfu
+
+# Build Options
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable RGB underlight.
+
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+
+LAYOUTS = ortho_4x12
+
+RGBLIGHT_SUPPORTED = no
diff --git a/layouts/community/ortho_4x12/bifbofii/keymap.c b/layouts/community/ortho_4x12/bifbofii/keymap.c
new file mode 100644
index 0000000000..6ce39a4a38
--- /dev/null
+++ b/layouts/community/ortho_4x12/bifbofii/keymap.c
@@ -0,0 +1,173 @@
+/* Copyright 2021 Christoph Jabs (BifbofII)
+ *
+ * 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
+
+/* ====== Unicode ====== */
+/* Character names */
+enum unicode_names {
+    SAE,
+    BAE,
+    SUE,
+    BUE,
+    SOE,
+    BOE,
+    SS,
+    EUR,
+    CPR
+};
+
+/* Unicode map */
+const uint32_t PROGMEM unicode_map[] = {
+    [SAE] = 0x00E4, // ä
+    [BAE] = 0x00C4, // Ä
+    [SUE] = 0x00FC, // ü
+    [BUE] = 0x00DC, // Ü
+    [SOE] = 0x00F6, // ü
+    [BOE] = 0x00D6, // Ü
+    [SS]  = 0x00DF, // ß
+    [EUR] = 0x20AC, // €
+    [CPR] = 0x00A9  // ©
+};
+
+// ====== Layers ======
+// Layer numbers
+enum layer_names {
+    QWERTY = 0,
+    RAISE,
+    LOWER,
+    FUNCTIONS,
+    UNICODE,
+    SPECIALS,
+};
+
+#define L_LOW  MO(LOWER)
+#define L_RAIS MO(RAISE)
+#define L_SPEC MO(SPECIALS)
+#define L_FNC  LT(FUNCTIONS, KC_SPC)
+#define L_UNI  LT(UNICODE, KC_ESC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * | Tab |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | Bsp |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * | Esc |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |Shift|  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | Ret |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |Ctrl |Super|     | Alt |Lower|    Spc    |Raise| Alt |Super|Ctrl |Spec |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+[QWERTY] = LAYOUT_ortho_4x12(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    L_UNI,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
+    KC_LCTL, KC_LGUI, XXXXXXX, KC_LALT, L_LOW,   L_FNC,   L_FNC,   L_RAIS,  KC_RALT, KC_RGUI, KC_RCTL, L_SPEC
+),
+
+/* Raise
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | Bsp |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     | F1  | F2  | F3  | F4  | F5  | F6  |  -  |  =  |  [  |  ]  |  \  |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     | F7  | F8  | F9  | F10 | F11 | F12 |     |     |     |     |     |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     |     |     |     |     |     |     |     |     |     |     |     |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+[RAISE] = LAYOUT_ortho_4x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+/* Lower
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |  ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  | Bsp |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     |     |     |     |     |     |     |  _  |  +  |  {  |  }  |  |  |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     |     |     |     |     |     |     |     |     |     |     |     |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     |     |     |     |     |           |     |     |     |     |     |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+[LOWER] = LAYOUT_ortho_4x12(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+    _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+/* Functions Layer 1
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     |     |     |     |     |Mute |Prev |Vol- |Vol+ |Next |Play | Del |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |Caps |     |  <  |     |     |  >  |Left |Down | Up  |Right|     |     |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     |     |     |     |     |     |Home |PgDn |PgUp | End |     |     |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     |     |     |     |     |           |     |     |     |     |     |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+[FUNCTIONS] = LAYOUT_ortho_4x12(
+    _______, _______, _______, _______, _______, KC__MUTE, KC_MPRV, KC__VOLDOWN, KC_VOLU, KC_MNXT, KC_MEDIA_PLAY_PAUSE, KC_DEL,
+    KC_CAPS, _______, KC_WBAK, _______, _______, KC_WFWD,  KC_LEFT, KC_DOWN,     KC_UP,   KC_RGHT, _______,             _______,
+    _______, _______, _______, _______, _______, _______,  KC_HOME, KC_PGDN,     KC_PGUP, KC_END,  _______,             _______,
+    _______, _______, _______, _______, _______, _______,  _______, _______,     _______, _______, _______,             _______
+),
+
+/* Unicode Layer
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     |     |     |  €  |     |     |     |  Ü  |     |  Ö  |     |     |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     |  Ä  |  ß  |     |     |     |     |     |     |     |     |     |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     |     |     |  ©  |     |     |     |     |     |     |     |     |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * |     |     |     |     |     |           |     |     |     |     |     |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+[UNICODE] = LAYOUT_ortho_4x12(
+    _______, _______,      _______, X(EUR),  _______, _______, _______, XP(SUE, BUE), _______, XP(SOE, BOE), _______, _______,
+    _______, XP(SAE, BAE), X(SS),   _______, _______, _______, _______, _______,      _______, _______,      _______, _______,
+    _______, _______,      _______, X(CPR),  _______, _______, _______, _______,      _______, _______,      _______, _______,
+    _______, _______,      _______, _______, _______, _______, _______, _______,      _______, _______,      _______, _______
+),
+
+/* Specials Layer
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * | XXX | XXX | Win | XXX | XXX | XXX | XXX | XXX | XXX | OSX | XXX | XXX |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | Lnx | XXX | XXX |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * | XXX | XXX | XXX | XXX | XXX |RESET| XXX | XXX | XXX | XXX | XXX | XXX |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ * | XXX | XXX | XXX | XXX | XXX |    XXX    | XXX | XXX | XXX | XXX | XXX |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+ */
+[SPECIALS] = LAYOUT_ortho_4x12(
+    XXXXXXX, XXXXXXX, UC_M_WC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_OS, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UC_M_LN, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+)
+
+};
diff --git a/layouts/community/ortho_4x12/bifbofii/readme.md b/layouts/community/ortho_4x12/bifbofii/readme.md
new file mode 100644
index 0000000000..e077ffba28
--- /dev/null
+++ b/layouts/community/ortho_4x12/bifbofii/readme.md
@@ -0,0 +1,89 @@
+# Personal Ortho 4x12 Layout of BifbofII
+
+![BifbofII Ortho 4x12 Layout](https://i.imgur.com/hHSexjE.jpeg)
+
+## QWERTY Layer
+
+```
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+| Tab |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | Bsp |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+| Esc |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|Shift|  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | Ret |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|Ctrl |Super|     | Alt |Lower| Spc | Spc |Raise| Alt |Super|Ctrl |Spec |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+```
+
+Holding the Space Bar switches to the Function layer.
+
+## Raise
+
+```
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  | Bsp |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     | F1  | F2  | F3  | F4  | F5  | F6  |  -  |  =  |  [  |  ]  |  \  |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     | F7  | F8  | F9  | F10 | F11 | F12 |     |     |     |     |     |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     |     |     |     |     |     |     |     |     |     |     |     |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+```
+
+## Lower
+
+```
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|  ~  |  !  |  @  |  #  |  $  |  %  |  ^  |  &  |  *  |  (  |  )  | Bsp |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     |     |     |     |     |     |     |  _  |  +  |  {  |  }  |  |  |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     |     |     |     |     |     |     |     |     |     |     |     |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     |     |     |     |     |     |     |     |     |     |     |     |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+```
+
+## Function Layer
+
+```
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     |     |     |     |     |Mute |Prev |Vol- |Vol+ |Next |Play | Del |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|Caps |     |  <  |     |     |  >  |Left |Down | Up  |Right|     |     |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     |     |     |     |     |     |Home |Page-|Page+| End |     |     |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     |     |     |     |     |     |     |     |     |     |     |     |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+```
+
+## Unicode Layer
+
+```
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     |     |     |  €  |     |     |     |  Ü  |     |  Ö  |     |     |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     |  Ä  |  ß  |     |     |     |     |     |     |     |     |     |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     |     |     |  ©  |     |     |     |     |     |     |     |     |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+|     |     |     |     |     |     |     |     |     |     |     |     |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+```
+
+## Specials Layer
+
+```
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+| XXX | XXX | Win | XXX | XXX | XXX | XXX | XXX | XXX | OSX | XXX | XXX |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+| XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | Lnx | XXX | XXX |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+| XXX | XXX | XXX | XXX | XXX |RESET| XXX | XXX | XXX | XXX | XXX | XXX |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+| XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX | XXX |
++-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
+```
diff --git a/layouts/community/ortho_4x12/bifbofii/rules.mk b/layouts/community/ortho_4x12/bifbofii/rules.mk
new file mode 100644
index 0000000000..502b2def76
--- /dev/null
+++ b/layouts/community/ortho_4x12/bifbofii/rules.mk
@@ -0,0 +1 @@
+UNICODEMAP_ENABLE = yes

From 58f7aefadd075d9cb335b99d24629744164013c7 Mon Sep 17 00:00:00 2001
From: rooski15 <34818505+rooski15@users.noreply.github.com>
Date: Sun, 26 Dec 2021 19:15:48 -0800
Subject: [PATCH 068/867] Added RGB compatible FC660C keymaps. Added VIA
 support and fixed indicators on Cajal keymaps (#15087)

* Added RGB compatible keymaps

Added two keymaps, both replacing insert LED with RGB control.
One keymap VIA enabled and updated VIA json included.

* Fixed Indicators

Added code to fix LED indicator brightness.

* Fixed Indicator LEDs

Added code to fix indicator LED brightness

* Update README.md

* Update README.md

* Delete fc660c_via_RGB.json

* Update rules.mk

Added VIA_ENABLE

* Update keyboards/walletburner/cajal/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Added VIA enabled Cajal stagger and ortho layouts

* Rename README.md to readme.md

* Removed Second via keymap.

* Rename README.md to readme.md

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/fc660c/keymaps/default_rgb/config.h | 51 ++++++++++
 keyboards/fc660c/keymaps/default_rgb/keymap.c | 46 +++++++++
 .../fc660c/keymaps/default_rgb/readme.md      |  6 ++
 keyboards/fc660c/keymaps/default_rgb/rules.mk |  1 +
 keyboards/fc660c/keymaps/via_rgb/config.h     | 51 ++++++++++
 keyboards/fc660c/keymaps/via_rgb/keymap.c     | 46 +++++++++
 keyboards/fc660c/keymaps/via_rgb/readme.md    |  6 ++
 keyboards/fc660c/keymaps/via_rgb/rules.mk     |  4 +
 .../cajal/keymaps/default/keymap.c            | 10 ++
 .../cajal/keymaps/default_ortho/keymap.c      |  9 ++
 .../walletburner/cajal/keymaps/via/keymap.c   | 96 +++++++++++++++++++
 .../walletburner/cajal/keymaps/via/rules.mk   |  2 +
 12 files changed, 328 insertions(+)
 create mode 100644 keyboards/fc660c/keymaps/default_rgb/config.h
 create mode 100644 keyboards/fc660c/keymaps/default_rgb/keymap.c
 create mode 100644 keyboards/fc660c/keymaps/default_rgb/readme.md
 create mode 100644 keyboards/fc660c/keymaps/default_rgb/rules.mk
 create mode 100644 keyboards/fc660c/keymaps/via_rgb/config.h
 create mode 100644 keyboards/fc660c/keymaps/via_rgb/keymap.c
 create mode 100644 keyboards/fc660c/keymaps/via_rgb/readme.md
 create mode 100644 keyboards/fc660c/keymaps/via_rgb/rules.mk
 create mode 100644 keyboards/walletburner/cajal/keymaps/via/keymap.c
 create mode 100644 keyboards/walletburner/cajal/keymaps/via/rules.mk

diff --git a/keyboards/fc660c/keymaps/default_rgb/config.h b/keyboards/fc660c/keymaps/default_rgb/config.h
new file mode 100644
index 0000000000..13153dd8fa
--- /dev/null
+++ b/keyboards/fc660c/keymaps/default_rgb/config.h
@@ -0,0 +1,51 @@
+/* Copyright 2017 Balz Guenat
+ *
+ * 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
+
+// place overrides here
+
+/*RGB*/
+/*Repurpose Insert LED */
+#define RGB_DI_PIN B5
+ #ifdef RGB_DI_PIN
+   #define RGBLED_NUM 16
+   #define RGBLIGHT_DEFAULT_HUE 127
+   #define RGBLIGHT_HUE_STEP 8
+   #define RGBLIGHT_SAT_STEP 8
+   #define RGBLIGHT_VAL_STEP 8
+   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+ /*== all animations enable ==*/
+   //#define RGBLIGHT_ANIMATIONS
+ /*== or choose animations ==*/
+   #define RGBLIGHT_EFFECT_PLAIN
+   #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
+ /*== customize breathing effect ==*/
+   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+   //#define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+   /*==== use exp() and sin() ====*/
+   //#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+   //#define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+ #endif
\ No newline at end of file
diff --git a/keyboards/fc660c/keymaps/default_rgb/keymap.c b/keyboards/fc660c/keymaps/default_rgb/keymap.c
new file mode 100644
index 0000000000..677797e39b
--- /dev/null
+++ b/keyboards/fc660c/keymaps/default_rgb/keymap.c
@@ -0,0 +1,46 @@
+/*
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+        KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,     KC_INS,
+        KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,     KC_DEL,
+        MO(1),   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,KC_RCTL,MO(1),       KC_LEFT,KC_DOWN,KC_RGHT
+    ),
+  [1] = LAYOUT(
+        KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_END, KC_PGDN,_______,_______,     KC_PGUP,
+        _______,_______,_______,                _______,                _______,MO(2),  _______,     KC_HOME,KC_PGDN,KC_END
+    ),
+  [2] = LAYOUT(
+        RESET,  EEPROM_RESET,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_TOG,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_MOD,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_VAI,
+        _______,_______,_______,                _______,                _______,_______,_______,     RGB_HUI,_______,RGB_SAI
+    ),
+  [3] = LAYOUT(
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
+        _______,_______,_______,                _______,                _______,_______,_______,     _______,_______,_______
+    )
+};
diff --git a/keyboards/fc660c/keymaps/default_rgb/readme.md b/keyboards/fc660c/keymaps/default_rgb/readme.md
new file mode 100644
index 0000000000..e52576231a
--- /dev/null
+++ b/keyboards/fc660c/keymaps/default_rgb/readme.md
@@ -0,0 +1,6 @@
+# Keymap with Insert LED remapped to RGB control
+
+Emulates original keymap, but replaces insert LED pin with RGB Underglow & respective configuration.
+Allows users to add underglow lighting. See [this keebtalk thread](https://www.keebtalk.com/t/adding-rgb-to-fc660c-with-hasu-controller/14484) for more information.
+
+![](https://i.imgur.com/fg89nez.jpg)
diff --git a/keyboards/fc660c/keymaps/default_rgb/rules.mk b/keyboards/fc660c/keymaps/default_rgb/rules.mk
new file mode 100644
index 0000000000..7ad666d1a3
--- /dev/null
+++ b/keyboards/fc660c/keymaps/default_rgb/rules.mk
@@ -0,0 +1 @@
+RGBLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/fc660c/keymaps/via_rgb/config.h b/keyboards/fc660c/keymaps/via_rgb/config.h
new file mode 100644
index 0000000000..13153dd8fa
--- /dev/null
+++ b/keyboards/fc660c/keymaps/via_rgb/config.h
@@ -0,0 +1,51 @@
+/* Copyright 2017 Balz Guenat
+ *
+ * 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
+
+// place overrides here
+
+/*RGB*/
+/*Repurpose Insert LED */
+#define RGB_DI_PIN B5
+ #ifdef RGB_DI_PIN
+   #define RGBLED_NUM 16
+   #define RGBLIGHT_DEFAULT_HUE 127
+   #define RGBLIGHT_HUE_STEP 8
+   #define RGBLIGHT_SAT_STEP 8
+   #define RGBLIGHT_VAL_STEP 8
+   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+ /*== all animations enable ==*/
+   //#define RGBLIGHT_ANIMATIONS
+ /*== or choose animations ==*/
+   #define RGBLIGHT_EFFECT_PLAIN
+   #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
+ /*== customize breathing effect ==*/
+   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+   //#define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+   /*==== use exp() and sin() ====*/
+   //#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+   //#define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+ #endif
\ No newline at end of file
diff --git a/keyboards/fc660c/keymaps/via_rgb/keymap.c b/keyboards/fc660c/keymaps/via_rgb/keymap.c
new file mode 100644
index 0000000000..f9d95b332d
--- /dev/null
+++ b/keyboards/fc660c/keymaps/via_rgb/keymap.c
@@ -0,0 +1,46 @@
+/*
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+        KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,     KC_INS,
+        KC_TAB,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,     KC_DEL,
+        MO(1),   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,KC_RCTL,MO(1),       KC_LEFT,KC_DOWN,KC_RGHT
+    ),
+  [1] = LAYOUT(
+        KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, _______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK,KC_PAUS,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_HOME,KC_PGUP,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,KC_END, KC_PGDN,_______,_______,     KC_PGUP,
+        _______,_______,_______,                _______,                _______,MO(2),  _______,     KC_HOME,KC_PGDN,KC_END
+    ),
+  [2] = LAYOUT(
+        RESET,  EEPROM_RESET,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,RGB_TOG,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_MOD,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     RGB_VAI,
+        _______,_______,_______,                _______,                _______,_______,_______,     RGB_HUI,_______,RGB_SAI
+    ),
+  [3] = LAYOUT(
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
+        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,
+        _______,_______,_______,                _______,                _______,_______,_______,     _______,_______,_______
+    )
+};
diff --git a/keyboards/fc660c/keymaps/via_rgb/readme.md b/keyboards/fc660c/keymaps/via_rgb/readme.md
new file mode 100644
index 0000000000..7e16e937d3
--- /dev/null
+++ b/keyboards/fc660c/keymaps/via_rgb/readme.md
@@ -0,0 +1,6 @@
+# Keymap with Insert LED remapped to RGB control
+
+Emulates original VIA keymap, but replaces insert LED pin with RGB Underglow & respective configuration.
+Allows users to add underglow lighting. See [this keebtalk thread](https://www.keebtalk.com/t/adding-rgb-to-fc660c-with-hasu-controller/14484) for more information.
+
+![](https://i.imgur.com/fg89nez.jpg)
diff --git a/keyboards/fc660c/keymaps/via_rgb/rules.mk b/keyboards/fc660c/keymaps/via_rgb/rules.mk
new file mode 100644
index 0000000000..0345a48f7d
--- /dev/null
+++ b/keyboards/fc660c/keymaps/via_rgb/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+COMMAND_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/walletburner/cajal/keymaps/default/keymap.c b/keyboards/walletburner/cajal/keymaps/default/keymap.c
index b985417537..4586e5695b 100644
--- a/keyboards/walletburner/cajal/keymaps/default/keymap.c
+++ b/keyboards/walletburner/cajal/keymaps/default/keymap.c
@@ -47,6 +47,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
+//Initialize indicator LEDs
+void matrix_init_user(void) {
+  setPinOutput(B5);
+  writePinLow(B5);
+  setPinOutput(B6);
+  writePinLow(B6);
+  setPinOutput(B7);
+  writePinLow(B7);
+}
+
 layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
     case 1:
diff --git a/keyboards/walletburner/cajal/keymaps/default_ortho/keymap.c b/keyboards/walletburner/cajal/keymaps/default_ortho/keymap.c
index 394a744e6d..87575e492f 100644
--- a/keyboards/walletburner/cajal/keymaps/default_ortho/keymap.c
+++ b/keyboards/walletburner/cajal/keymaps/default_ortho/keymap.c
@@ -47,6 +47,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
+//Initialize indicator LEDs
+void matrix_init_user(void) {
+  setPinOutput(B5);
+  writePinLow(B5);
+  setPinOutput(B6);
+  writePinLow(B6);
+  setPinOutput(B7);
+  writePinLow(B7);
+}
 
 layer_state_t layer_state_set_user(layer_state_t state) {
     writePinLow(B7);
diff --git a/keyboards/walletburner/cajal/keymaps/via/keymap.c b/keyboards/walletburner/cajal/keymaps/via/keymap.c
new file mode 100644
index 0000000000..86348ed456
--- /dev/null
+++ b/keyboards/walletburner/cajal/keymaps/via/keymap.c
@@ -0,0 +1,96 @@
+/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_stagger(
+        KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC, RGB_TOG,
+        CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, 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_LSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_SPC, MO(2), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_stagger(
+        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_RBRC, KC_BSLS, RGB_MOD,
+        KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR,  KC_TRNS, KC_PGUP,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, MO(3),  KC_HOME, KC_PGDN, KC_END
+    ),
+
+    [2] = LAYOUT_stagger(
+        KC_TILD, 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_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_SAI, KC_TRNS, RGB_VAI,
+        KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_TRNS, KC_TRNS, KC_TRNS, RGB_HUD, RGB_VAD, RGB_HUI
+    ),
+
+    [3] = LAYOUT_stagger(
+        RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+//Initialize indicator LEDs
+void matrix_init_user(void) {
+  setPinOutput(B5);
+  writePinLow(B5);
+  setPinOutput(B6);
+  writePinLow(B6);
+  setPinOutput(B7);
+  writePinLow(B7);
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+    case 1:
+        writePinHigh(B7);
+        writePinLow(B6);
+        break;
+    case 2:
+        writePinLow(B7);
+        writePinHigh(B6);
+        break;
+    case 3:
+        writePinHigh(B7);
+        writePinHigh(B6);
+        break;
+    default:
+        writePinLow(B7);
+        writePinLow(B6);
+        break;
+    }
+    return state;
+}
+
+bool led_update_user(led_t led_state) {
+    writePin(B5, led_state.caps_lock);
+    return false;
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLD);
+        } else {
+            tap_code(KC_VOLU);
+        }
+    }
+    return true;
+}
diff --git a/keyboards/walletburner/cajal/keymaps/via/rules.mk b/keyboards/walletburner/cajal/keymaps/via/rules.mk
new file mode 100644
index 0000000000..ca9fed0e6b
--- /dev/null
+++ b/keyboards/walletburner/cajal/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes

From e3073be4884c53bbd922477a83553d03f4eb7ebb Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Mon, 27 Dec 2021 11:16:18 +0800
Subject: [PATCH 069/867] RGB Matrix layer key indicator (#14626)

* Add layer key indicator example

* Update description

* Deobfuscate with index variable

* Add missing layer variable

* Correct color name and indicator function

* Function typo

* Place layer variable outside loops to save firmware space

Co-authored-by: filterpaper <filterpaper@localhost>
---
 docs/feature_rgb_matrix.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 8ba39b476b..3132360a38 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -790,6 +790,26 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 }
 ```
 
+Layer indicator with only configured keys:
+```c
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    if (get_highest_layer(layer_state) > 0) {
+        uint8_t layer = get_highest_layer(layer_state);
+
+        for (uint8_t row = 0; row < MATRIX_ROWS; ++row) {
+            for (uint8_t col = 0; col < MATRIX_COLS; ++col) {
+                uint8_t index = g_led_config.matrix_co[row][col];
+
+                if (index >= led_min && index <= led_max && index != NO_LED &&
+                keymap_key_to_keycode(layer, (keypos_t){col,row}) > KC_TRNS) {
+                    rgb_matrix_set_color(index, RGB_GREEN);
+                }
+            }
+        }
+    }
+}
+```
+
 #### Examples :id=indicator-examples
 
 This example sets the modifiers to be a specific color based on the layer state.  You can use a switch case here, instead, if you would like.  This uses HSV and then converts to RGB, because this allows the brightness to be limited (important when using the WS2812 driver).

From 14fb62529a4a38ab563a4bc47d0c6c172e47c1d5 Mon Sep 17 00:00:00 2001
From: rate <rate98326@gmail.com>
Date: Mon, 27 Dec 2021 12:17:29 +0900
Subject: [PATCH 070/867] Enable encoder settings VIA. (#15065)

* Enable encoder settings VIA.

* Fixed review points.
---
 keyboards/pistachio_pro/keymaps/via/keymap.c | 72 +++++++++++++++-----
 1 file changed, 55 insertions(+), 17 deletions(-)

diff --git a/keyboards/pistachio_pro/keymaps/via/keymap.c b/keyboards/pistachio_pro/keymaps/via/keymap.c
index 7517b4a6e4..f30254320b 100644
--- a/keyboards/pistachio_pro/keymaps/via/keymap.c
+++ b/keyboards/pistachio_pro/keymaps/via/keymap.c
@@ -26,34 +26,54 @@ enum layer_names {
     _RESERVE_1
 };
 
+static uint8_t encoder_state = 0;
+static const keypos_t ENC_CW = {.row = 0, .col = 14 };
+static const keypos_t ENC_CCW = {.row = 0, .col = 15 };
+
+#define LAYOUT_via( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, ENC_CW, ENC_CCW, k013, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \
+    k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, \
+    k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k510, k511, k512, k513 ) { \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, ENC_CW, ENC_CCW, KC_NO, KC_NO }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114,  k115,  k116,  k117  }, \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214,  k215,  KC_NO, KC_NO }, \
+    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k510, k511, k512, k513, KC_NO, KC_NO, KC_NO, KC_NO }  \
+}
+
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT(
-      KC_ESC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,    KC_F7,    KC_F8,     KC_F9,     KC_F10,     KC_F11,  KC_F12,                        KC_MPLY,
+    [_BASE] = LAYOUT_via(
+      KC_ESC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,     KC_F6,    KC_F7,    KC_F8,     KC_F9,     KC_F10,     KC_F11,  KC_F12,        KC_VOLU,KC_VOLD,KC_MPLY,
       KC_ZKHK,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    JP_MINS,  JP_CIRC,  JP_YEN,  KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
       KC_TAB,      KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,    KC_Y,    KC_U,   KC_I,    KC_O,    KC_P,    JP_AT,    JP_LBRC,                      KC_DEL,  KC_END,  KC_PGDN,
       JP_EISU,       KC_A,    KC_S,   KC_D,   KC_F,   KC_G,    KC_H,    KC_J,   KC_K,    KC_L,    JP_SCLN, JP_COLN,  JP_RBRC,       KC_ENT,
       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_RSFT,              KC_UP,
       KC_LCTRL,  KC_LGUI,  KC_LALT,   JP_MHEN,    KC_SPC,      KC_SPC,      LT(_FN, JP_HENK),    JP_KANA,   KC_RALT,     KC_APP,    KC_RCTRL,    KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [_FN] = LAYOUT(
-      KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                       KC_TRNS,
+    [_FN] = LAYOUT_via(
+      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_VOLU,KC_VOLD,KC_MPLY,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_7,    KC_8,    KC_9,                        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_4,    KC_5,    KC_6,         KC_TRNS,
       KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_1,    KC_2,    KC_3,                KC_TRNS,              KC_TRNS,
       KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,      KC_TRNS,          KC_TRNS,          KC_TRNS,    KC_0,    JP_DOT,    JP_DOT,      KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [_RESERVE_0] = LAYOUT(
-      KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                       KC_TRNS,
+    [_RESERVE_0] = LAYOUT_via(
+      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_VOLU,KC_VOLD,KC_MPLY,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,
       KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,           KC_TRNS,              KC_TRNS,
       KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,      KC_TRNS,          KC_TRNS,          KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [_RESERVE_1] = LAYOUT(
-      KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                       KC_TRNS,
+    [_RESERVE_1] = LAYOUT_via(
+      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_VOLU,KC_VOLD,KC_MPLY,
       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,
@@ -110,17 +130,35 @@ bool oled_task_user(void) {
 }
 
 /* Encoder */
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        // Volume control
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
+void encoder_action_unregister(void) {
+    if (encoder_state) {
+        keyevent_t encoder_event = (keyevent_t) {
+            .key = encoder_state >> 1 ? ENC_CW : ENC_CCW,
+            .pressed = false,
+            .time = (timer_read() | 1)
+        };
+        encoder_state = 0;
+        action_exec(encoder_event);
     }
+}
 
-    return true;
+void encoder_action_register(uint8_t index, bool clockwise) {
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? ENC_CW : ENC_CCW,
+        .pressed = true,
+        .time = (timer_read() | 1)
+    };
+    encoder_state = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+}
+
+void matrix_scan_user(void) {
+    encoder_action_unregister();
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    return false;
 }
 
 /* Keyboard */

From f7619600e3dca4270e86bd7e133ac9d63ee400f4 Mon Sep 17 00:00:00 2001
From: Evelien Dekkers <sixmoonskies@gmail.com>
Date: Mon, 27 Dec 2021 04:20:23 +0100
Subject: [PATCH 071/867] Atom47 led fix (#15272)

* Define pin states for leds

* Enable backlight in rules.mk
---
 keyboards/evyd13/atom47/rev2/config.h | 1 +
 keyboards/evyd13/atom47/rev2/rules.mk | 1 +
 keyboards/evyd13/atom47/rev3/config.h | 1 +
 keyboards/evyd13/atom47/rev3/rules.mk | 1 +
 keyboards/evyd13/atom47/rev4/config.h | 1 +
 5 files changed, 5 insertions(+)

diff --git a/keyboards/evyd13/atom47/rev2/config.h b/keyboards/evyd13/atom47/rev2/config.h
index 95fc7a4789..42661c3311 100644
--- a/keyboards/evyd13/atom47/rev2/config.h
+++ b/keyboards/evyd13/atom47/rev2/config.h
@@ -58,6 +58,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 4
 
 #define LED_CAPS_LOCK_PIN F5
+#define LED_PIN_ON_STATE 1
 
 #define RGB_DI_PIN D0    // The pin the LED strip is connected to
 #define RGBLED_NUM 1     // Number of LEDs in your strip
diff --git a/keyboards/evyd13/atom47/rev2/rules.mk b/keyboards/evyd13/atom47/rev2/rules.mk
index 632bdae8f3..104711e420 100644
--- a/keyboards/evyd13/atom47/rev2/rules.mk
+++ b/keyboards/evyd13/atom47/rev2/rules.mk
@@ -1,2 +1,3 @@
 # Build Options
 RGBLIGHT_ENABLE = no
+BACKLIGHT_ENABLE = yes
diff --git a/keyboards/evyd13/atom47/rev3/config.h b/keyboards/evyd13/atom47/rev3/config.h
index 4e53abd01e..90cb4a1952 100644
--- a/keyboards/evyd13/atom47/rev3/config.h
+++ b/keyboards/evyd13/atom47/rev3/config.h
@@ -53,6 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 5
 
 #define LED_CAPS_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
 
 #define RGB_DI_PIN F5    // The pin the LED strip is connected to
 #define RGBLED_NUM 6     // Number of LEDs in your strip
diff --git a/keyboards/evyd13/atom47/rev3/rules.mk b/keyboards/evyd13/atom47/rev3/rules.mk
index e69de29bb2..54a2685bf6 100644
--- a/keyboards/evyd13/atom47/rev3/rules.mk
+++ b/keyboards/evyd13/atom47/rev3/rules.mk
@@ -0,0 +1 @@
+BACKLIGHT_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/evyd13/atom47/rev4/config.h b/keyboards/evyd13/atom47/rev4/config.h
index 02a1b16755..a88c538716 100644
--- a/keyboards/evyd13/atom47/rev4/config.h
+++ b/keyboards/evyd13/atom47/rev4/config.h
@@ -56,3 +56,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define QMK_LED D1
 
 #define LED_CAPS_LOCK_PIN D1
+#define LED_PIN_ON_STATE 0

From e90974d810579c58969cc82abae34892aa312e20 Mon Sep 17 00:00:00 2001
From: npspears <40127181+npspears@users.noreply.github.com>
Date: Sun, 26 Dec 2021 21:32:06 -0600
Subject: [PATCH 072/867] add 5-row support for an existing board, Quark^2
 (#15188)

* add support for 5-row Quark^2

* add support for 5-row Quark^2

* add support for 5-row Quark^2

* add support for 5-row Quark^2

* Update keymap.c

* Update keymap.c

* Update keymap.c

* add 5-row Quark^2 keymaps

* add 5-row Quark^2 keymaps

* Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update info.json

* Fix typo

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 .../checkerboards/quark_squared/config.h      |  4 +-
 .../checkerboards/quark_squared/info.json     | 12 ++-
 .../quark_squared/keymaps/2u/keymap.c         |  6 +-
 .../quark_squared/keymaps/5_2u/config.h       | 19 ++++
 .../quark_squared/keymaps/5_2u/keymap.c       | 86 +++++++++++++++++++
 .../quark_squared/keymaps/5_2x225u/config.h   | 19 ++++
 .../quark_squared/keymaps/5_2x225u/keymap.c   | 86 +++++++++++++++++++
 .../quark_squared/keymaps/default/keymap.c    |  6 +-
 .../quark_squared/keymaps/via/keymap.c        |  8 +-
 .../quark_squared/quark_squared.h             | 42 +++++++--
 .../checkerboards/quark_squared/readme.md     |  4 +-
 11 files changed, 270 insertions(+), 22 deletions(-)
 create mode 100644 keyboards/checkerboards/quark_squared/keymaps/5_2u/config.h
 create mode 100644 keyboards/checkerboards/quark_squared/keymaps/5_2u/keymap.c
 create mode 100644 keyboards/checkerboards/quark_squared/keymaps/5_2x225u/config.h
 create mode 100644 keyboards/checkerboards/quark_squared/keymaps/5_2x225u/keymap.c

diff --git a/keyboards/checkerboards/quark_squared/config.h b/keyboards/checkerboards/quark_squared/config.h
index 89e7eb0725..32546097f1 100644
--- a/keyboards/checkerboards/quark_squared/config.h
+++ b/keyboards/checkerboards/quark_squared/config.h
@@ -26,11 +26,11 @@
 #define PRODUCT         QUARK²
 
 /* key matrix size */
-#define MATRIX_ROWS 4
+#define MATRIX_ROWS 5
 #define MATRIX_COLS 12
 
 /* key matrix pins */
-#define MATRIX_ROW_PINS { C5, C4, C6, C7 }
+#define MATRIX_ROW_PINS { C5, C4, C6, C7, B7 }
 #define MATRIX_COL_PINS { B4, B5, B6, B3, C2, B2, D6, D2, D3, D4, D5, B1 }
 #define UNUSED_PINS
 
diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json
index 76f68353b5..aec07bb7ad 100644
--- a/keyboards/checkerboards/quark_squared/info.json
+++ b/keyboards/checkerboards/quark_squared/info.json
@@ -1,13 +1,19 @@
 {
     "keyboard_name": "Quark_Squared",
-    "url": "",
+    "url": "https://www.checkerboards.xyz/Quark2_p_35.html",
     "maintainer": "nasp",
     "layouts": {
-        "LAYOUT_ortho_2x225u": {
+        "LAYOUT_ortho_4x12_2x225u": {
             "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":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":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Super", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.25}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"label":"Super", "x":9.5, "y":3, "w":1.25}, {"label":"Ctrl", "x":10.75, "y":3, "w":1.25}]
         },
-        "LAYOUT_ortho_2u": {
+        "LAYOUT_4_2u": {
             "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":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":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Alt", "x":1.25, "y":3, "w":1.25}, {"label":"Super", "x":2.5, "y":3, "w":1.25}, {"label":"&dArr;", "x":3.75, "y":3, "w":1.25}, {"x":5, "y":3, "w":2}, {"label":"&larr;", "x":7, "y":3, "w":1.25}, {"label":"&darr;", "x":8.25, "y":3, "w":1.25}, {"label":"&uarr;", "x":9.5, "y":3, "w":1.25}, {"label":"&rarr;", "x":10.75, "y":3, "w":1.25}]
+        },
+        "LAYOUT_5_2x225u": {
+            "layout": [{"label":"-", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":6, "y":0}, {"label":"7", "x":7, "y":0}, {"label":"8", "x":8, "y":0}, {"label":"9", "x":9, "y":0}, {"label":"0", "x":10, "y":0}, {"label":"+", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"Y", "x":6, "y":1}, {"label":"U", "x":7, "y":1}, {"label":"I", "x":8, "y":1}, {"label":"O", "x":9, "y":1}, {"label":"P", "x":10, "y":1}, {"label":"Back Space", "x":11, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":";", "x":10, "y":2}, {"label":"'", "x":11, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"N", "x":6, "y":3}, {"label":"M", "x":7, "y":3}, {"label":",", "x":8, "y":3}, {"label":".", "x":9, "y":3}, {"label":"/", "x":10, "y":3}, {"label":"Return", "x":11, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Super", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":2.25}, {"label":"Alt", "x":8.25, "y":4, "w":1.25}, {"label":"Super", "x":9.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":10.75, "y":4, "w":1.25}]
+        },
+        "LAYOUT_5_2u": {
+            "layout": [{"label":"-", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":6, "y":0}, {"label":"7", "x":7, "y":0}, {"label":"8", "x":8, "y":0}, {"label":"9", "x":9, "y":0}, {"label":"0", "x":10, "y":0}, {"label":"+", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"Y", "x":6, "y":1}, {"label":"U", "x":7, "y":1}, {"label":"I", "x":8, "y":1}, {"label":"O", "x":9, "y":1}, {"label":"P", "x":10, "y":1}, {"label":"Back Space", "x":11, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":";", "x":10, "y":2}, {"label":"'", "x":11, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"N", "x":6, "y":3}, {"label":"M", "x":7, "y":3}, {"label":",", "x":8, "y":3}, {"label":".", "x":9, "y":3}, {"label":"/", "x":10, "y":3}, {"label":"Return", "x":11, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Super", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"&dArr;", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2}, {"label":"&uArr;", "x":7, "y":4, "w":1.25}, {"label":"Alt", "x":8.25, "y":4, "w":1.25}, {"label":"Super", "x":9.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":10.75, "y":4, "w":1.25}]
         }
     }
 }
diff --git a/keyboards/checkerboards/quark_squared/keymaps/2u/keymap.c b/keyboards/checkerboards/quark_squared/keymaps/2u/keymap.c
index 0892729cf3..0f37a1d080 100644
--- a/keyboards/checkerboards/quark_squared/keymaps/2u/keymap.c
+++ b/keyboards/checkerboards/quark_squared/keymaps/2u/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * | PRINT   |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
      * `-----------------------------------------------------------------------------------------'
      */
-    [0] = LAYOUT_ortho_2u(
+    [0] = LAYOUT_4_2u(
       KC_TAB,        KC_Q,    KC_W,    KC_F,     KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
       CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,     KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
       KC_LSFT,       KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |   ESC  |  CTRL-ALT-DEL   |   TASK   |         |        |    '|'    |    `    |        |
      * `---------------------------------------------------------------------------------------'
      */
-    [1] = LAYOUT_ortho_2u(
+    [1] = LAYOUT_4_2u(
         KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
         KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
         _______, _______, _______, _______, _______, _______, _______, KC_PPLS, KC_EQL,  _______, _______, _______,
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |     RESET    |           |          |         |         |         |        |         |
     * `---------------------------------------------------------------------------------------'
        */
-    [2] = LAYOUT_ortho_2u(
+    [2] = LAYOUT_4_2u(
         _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
diff --git a/keyboards/checkerboards/quark_squared/keymaps/5_2u/config.h b/keyboards/checkerboards/quark_squared/keymaps/5_2u/config.h
new file mode 100644
index 0000000000..b1498826ee
--- /dev/null
+++ b/keyboards/checkerboards/quark_squared/keymaps/5_2u/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 Nathan Spears
+ *
+ * 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 TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark_squared/keymaps/5_2u/keymap.c b/keyboards/checkerboards/quark_squared/keymaps/5_2u/keymap.c
new file mode 100644
index 0000000000..d7f7ff378d
--- /dev/null
+++ b/keyboards/checkerboards/quark_squared/keymaps/5_2u/keymap.c
@@ -0,0 +1,86 @@
+/* Copyright 2021 Nathan Spears
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* [0]
+     * ,-----------------------------------------------------------------------------------------.
+     * |   =        |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
+     * |------------+------+------+------+------+------+------+------+------+------+------+------|
+     * | Tab        |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+     * |------------+------+------+------+------+-------------+------+------+------+------+------|
+     * | CTL & ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+     * |------------+------+------+------+------+------|------+------+------+------+------+------|
+     * | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+     * |   OS   |   Alt   |         Layer        |      Space & Layer     |     [    |    ]      |
+     * `-----------------------------------------------------------------------------------------'
+     */
+    [0] = LAYOUT_5_2u(
+        KC_EQL,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,          KC_8,    KC_9,    KC_0,    KC_MINS,
+        KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,          KC_I,    KC_O,    KC_P,     KC_DEL,
+        CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,          KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,          KC_COMM, KC_DOT,  KC_SLSH,  KC_ENT,
+        KC_GRV,           KC_LGUI,    KC_LALT,        TT(1),  KC_SPC,    TT(2),             KC_TILD,      KC_LBRC,     KC_RBRC
+    ),
+
+    /* [1]
+     * ,---------------------------------------------------------------------------------------.
+     * |   =    |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0   |   -   |
+     * |------------+------+------+------+------+------+------+------+------+------+------+----|
+     * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+     * |------------+------+------+------+------+-------------+------+------+------+------+----|
+     * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+     * |------------+------+------+------+------+------|------+------+------+------+------+----|
+     * |     |      |      |      |      |      |      |   +   |   =   |      |        |       |
+     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+     * |    ESC  |    CTRL-ALT-DEL        |             |           |      '|'     |    `      |
+     * `---------------------------------------------------------------------------------------'
+     */
+    [1] = LAYOUT_5_2u(
+        KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+        KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL,  _______, _______, _______,
+        KC_ESC,    CALTDEL,   _______,      _______,     _______,    _______,         _______,    KC_NUBS,  KC_GRV
+    ),
+
+    /* [2]
+     * ,---------------------------------------------------------------------------------------.
+     * |   =    |   1  |   2  |   3  |   4  |   5  |  6  |   7  |   8  |   9  |   0   |   -   |
+     * |------------+------+------+------+------+------+------+------+------+------+------+---|
+     * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+     * |------------+------+------+------+------+-------------+------+------+------+------+---|
+     * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+     * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+     * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+     * |     RESET    |              |             |            |                |            |
+     * `---------------------------------------------------------------------------------------'
+     */
+    [2] = LAYOUT_5_2u(
+        KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+        _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
+        _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        RESET,   _______,    _______,       _______,       _______,     _______,    _______,   _______,    _______
+    )
+};
diff --git a/keyboards/checkerboards/quark_squared/keymaps/5_2x225u/config.h b/keyboards/checkerboards/quark_squared/keymaps/5_2x225u/config.h
new file mode 100644
index 0000000000..b1498826ee
--- /dev/null
+++ b/keyboards/checkerboards/quark_squared/keymaps/5_2x225u/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 Nathan Spears
+ *
+ * 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 TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark_squared/keymaps/5_2x225u/keymap.c b/keyboards/checkerboards/quark_squared/keymaps/5_2x225u/keymap.c
new file mode 100644
index 0000000000..e116732b75
--- /dev/null
+++ b/keyboards/checkerboards/quark_squared/keymaps/5_2x225u/keymap.c
@@ -0,0 +1,86 @@
+/* Copyright 2021 Nathan Spears
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* [0]
+     * ,-----------------------------------------------------------------------------------------.
+     * |   =        |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   -  |
+     * |------------+------+------+------+------+------+------+------+------+------+------+------|
+     * | Tab        |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+     * |------------+------+------+------+------+-------------+------+------+------+------+------|
+     * | CTL & ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+     * |------------+------+------+------+------+------|------+------+------+------+------+------|
+     * | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+     * |   OS   |   Alt   |         Layer        |      Space & Layer     |     [    |    ]      |
+     * `-----------------------------------------------------------------------------------------'
+     */
+    [0] = LAYOUT_5_2x225u(
+        KC_EQL,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,          KC_8,    KC_9,    KC_0,    KC_MINS,
+        KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,          KC_I,    KC_O,    KC_P,    KC_DEL,
+        CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,          KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,          KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+        KC_GRV,        KC_LGUI,          KC_LALT,          TT(1),   LT(2, KC_SPC),          KC_TILD, KC_LBRC,          KC_RBRC
+    ),
+
+    /* [1]
+     * ,---------------------------------------------------------------------------------------.
+     * |   =    |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0   |   -   |
+     * |------------+------+------+------+------+------+------+------+------+------+------+----|
+     * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+     * |------------+------+------+------+------+-------------+------+------+------+------+----|
+     * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+     * |------------+------+------+------+------+------|------+------+------+------+------+----|
+     * |     |      |      |      |      |      |      |   +   |   =   |      |        |       |
+     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+     * |    ESC  |    CTRL-ALT-DEL        |             |           |      '|'     |    `      |
+     * `---------------------------------------------------------------------------------------'
+     */
+    [1] = LAYOUT_5_2x225u(
+        KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+        KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL,  _______, _______, _______,
+        KC_ESC,     CALTDEL,    _______,       _______,             _______,          _______,   KC_NUBS,   KC_GRV
+    ),
+
+    /* [2]
+     * ,---------------------------------------------------------------------------------------.
+     * |   =    |   1  |   2  |   3  |   4  |   5  |  6  |   7  |   8  |   9  |   0   |   -   |
+     * |------------+------+------+------+------+------+------+------+------+------+------+---|
+     * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+     * |------------+------+------+------+------+-------------+------+------+------+------+---|
+     * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+     * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+     * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+     * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+     * |     RESET    |              |             |            |                |            |
+     * `---------------------------------------------------------------------------------------'
+     */
+    [2] = LAYOUT_5_2x225u(
+        KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+        _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
+        _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        RESET,    _______,    _______,         _______,          _______,             _______,  _______,   _______
+    )
+};
diff --git a/keyboards/checkerboards/quark_squared/keymaps/default/keymap.c b/keyboards/checkerboards/quark_squared/keymaps/default/keymap.c
index 56aa2ea6b2..8601c76604 100644
--- a/keyboards/checkerboards/quark_squared/keymaps/default/keymap.c
+++ b/keyboards/checkerboards/quark_squared/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * | PRINT   |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
      * `-----------------------------------------------------------------------------------------'
      */
-    [0] = LAYOUT_ortho_2x225u(
+    [0] = LAYOUT_4_2x225u(
       KC_TAB,        KC_Q,    KC_W,    KC_F,     KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
       CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,     KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
       KC_LSFT,       KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |   ESC  |  CTRL-ALT-DEL   |   TASK   |         |        |    '|'    |    `    |        |
      * `---------------------------------------------------------------------------------------'
      */
-    [1] = LAYOUT_ortho_2x225u(
+    [1] = LAYOUT_4_2x225u(
         KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
         KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
         _______, _______, _______, _______, _______, _______, _______, KC_PPLS, KC_EQL,  _______, _______, _______,
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |     RESET    |           |          |         |         |         |        |         |
     * `---------------------------------------------------------------------------------------'
        */
-    [2] = LAYOUT_ortho_2x225u(
+    [2] = LAYOUT_4_2x225u(
         _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
diff --git a/keyboards/checkerboards/quark_squared/keymaps/via/keymap.c b/keyboards/checkerboards/quark_squared/keymaps/via/keymap.c
index 928965f973..37baf408d2 100644
--- a/keyboards/checkerboards/quark_squared/keymaps/via/keymap.c
+++ b/keyboards/checkerboards/quark_squared/keymaps/via/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * | PRINT   |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
      * `-----------------------------------------------------------------------------------------'
      */
-    [0] = LAYOUT_ortho_2x225u(
+    [0] = LAYOUT_4_2x225u(
       KC_TAB,        KC_Q,    KC_W,    KC_F,     KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
       CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,     KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
       KC_LSFT,       KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------------------------------------------------------------------------------------'
      */
 
-    [1] = LAYOUT_ortho_2x225u(
+    [1] = LAYOUT_4_2x225u(
         KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
         KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
         _______, _______, _______, _______, _______, _______, _______, KC_PPLS, KC_EQL,  _______, _______, _______,
@@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `---------------------------------------------------------------------------------------'
     */
 
-    [2] = LAYOUT_ortho_2x225u(
+    [2] = LAYOUT_4_2x225u(
         _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * `---------------------------------------------------------------------------------------'
     */
 
-    [3] = LAYOUT_ortho_2x225u(
+    [3] = LAYOUT_4_2x225u(
         _______, _______, _______, KC_UP,   _______, _______, _______, KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
         _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
diff --git a/keyboards/checkerboards/quark_squared/quark_squared.h b/keyboards/checkerboards/quark_squared/quark_squared.h
index d3d8842212..27f69d1db6 100644
--- a/keyboards/checkerboards/quark_squared/quark_squared.h
+++ b/keyboards/checkerboards/quark_squared/quark_squared.h
@@ -21,26 +21,56 @@
 #define XXX KC_NO
 
 
-#define LAYOUT_ortho_2x225u( \
+#define LAYOUT_4_2x225u( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31,      k33, k34,      k36,      k38, k39,      k3B \
+    k30, k31,      k33, k34,      k36,      k38, k39,      k3B  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, XXX, k33, k34, XXX, k36, XXX, k38, k39, XXX, k3B }  \
+    { k30, k31, XXX, k33, k34, XXX, k36, XXX, k38, k39, XXX, k3B }, \
+    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }  \
 }
 
-#define LAYOUT_ortho_2u( \
+#define LAYOUT_4_2u( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31,      k33, k34, k35,  k36,      k38, k39,      k3B \
+    k30, k31,      k33, k34, k35,  k36,     k38, k39,      k3B  \
 ) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, XXX, k33, k34, k35, k36, XXX, k38, k39, XXX, k3B }  \
+    { k30, k31, XXX, k33, k34, k35, k36, XXX, k38, k39, XXX, k3B }, \
+    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }  \
+}
+
+#define LAYOUT_5_2x225u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
+    k40, k41,      k43, k44,      k46,      k48, k49,      k4B  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
+    { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, k49, XXX, k4B }  \
+}
+
+#define LAYOUT_5_2u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
+    k40, k41,      k43, k44, k45, k46,      k48, k49,      k4B  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
+    { k40, k41, XXX, k43, k44, k45, k46, XXX, k48, k49, XXX, k4B }  \
 }
diff --git a/keyboards/checkerboards/quark_squared/readme.md b/keyboards/checkerboards/quark_squared/readme.md
index bbbe2bfb5b..8677710dd9 100644
--- a/keyboards/checkerboards/quark_squared/readme.md
+++ b/keyboards/checkerboards/quark_squared/readme.md
@@ -2,7 +2,7 @@
 
 ![Quark_Squared](https://i.imgur.com/zYH25zQ.png)
 
-The Quark² PCB is a hotswap version of the Quark PCB. Just like the OG, it has a modified layout than a traditonal 4x12 ortholinear keyboard. 
+The Quark² PCB is a hotswap version of the Quark PCB. Just like the OG, it has a modified layout than a traditonal 4x12 and 5x12 ortholinear keyboard. 
 
 * Keyboard Maintainer: [Nasp](https://github.com/npspears)
 * Hardware Supported: Planck
@@ -11,5 +11,7 @@ The Quark² PCB is a hotswap version of the Quark PCB. Just like the OG, it has
 Make example for this keyboard (after setting up your build environment):
 
     make checkerboards:quark_squared:default
+    
+These boards may be reset into bootloader either via the reset hardware button (on the back of the PCB near the USB connector) or through a configured RESET shortcut inserted into the keymap.     
 
 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).

From eadfcb9a40e3812ed66b484b9302ca5ff5e9b852 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Sun, 26 Dec 2021 19:34:15 -0800
Subject: [PATCH 073/867] Format code according to conventions (#15590)

---
 quantum/debounce/tests/sym_defer_pr_tests.cpp | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/quantum/debounce/tests/sym_defer_pr_tests.cpp b/quantum/debounce/tests/sym_defer_pr_tests.cpp
index bb3333cf7b..417e1f4ca2 100644
--- a/quantum/debounce/tests/sym_defer_pr_tests.cpp
+++ b/quantum/debounce/tests/sym_defer_pr_tests.cpp
@@ -19,7 +19,8 @@
 #include "debounce_test_common.h"
 
 TEST_F(DebounceTest, OneKeyShort1) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
 
         {5, {}, {{0, 1, DOWN}}},
@@ -32,7 +33,8 @@ TEST_F(DebounceTest, OneKeyShort1) {
 }
 
 TEST_F(DebounceTest, OneKeyShort2) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
 
         {5, {}, {{0, 1, DOWN}}},
@@ -45,7 +47,8 @@ TEST_F(DebounceTest, OneKeyShort2) {
 }
 
 TEST_F(DebounceTest, OneKeyShort3) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
 
         {5, {}, {{0, 1, DOWN}}},
@@ -58,7 +61,8 @@ TEST_F(DebounceTest, OneKeyShort3) {
 }
 
 TEST_F(DebounceTest, OneKeyTooQuick1) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
         /* Release key exactly on the debounce time */
         {5, {{0, 1, UP}}, {}},
@@ -67,7 +71,8 @@ TEST_F(DebounceTest, OneKeyTooQuick1) {
 }
 
 TEST_F(DebounceTest, OneKeyTooQuick2) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
 
         {5, {}, {{0, 1, DOWN}}},
@@ -80,7 +85,8 @@ TEST_F(DebounceTest, OneKeyTooQuick2) {
 }
 
 TEST_F(DebounceTest, OneKeyBouncing1) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
         {1, {{0, 1, UP}}, {}},
         {2, {{0, 1, DOWN}}, {}},
@@ -94,7 +100,8 @@ TEST_F(DebounceTest, OneKeyBouncing1) {
 }
 
 TEST_F(DebounceTest, OneKeyBouncing2) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
         {5, {}, {{0, 1, DOWN}}},
         {6, {{0, 1, UP}}, {}},
@@ -108,7 +115,8 @@ TEST_F(DebounceTest, OneKeyBouncing2) {
 }
 
 TEST_F(DebounceTest, OneKeyLong) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
 
         {5, {}, {{0, 1, DOWN}}},
@@ -125,7 +133,8 @@ TEST_F(DebounceTest, OneKeyLong) {
 }
 
 TEST_F(DebounceTest, TwoKeysShort) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
         {1, {{0, 2, DOWN}}, {}},
 
@@ -140,7 +149,8 @@ TEST_F(DebounceTest, TwoKeysShort) {
 }
 
 TEST_F(DebounceTest, TwoKeysSimultaneous1) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}, {0, 2, DOWN}}, {}},
 
         {5, {}, {{0, 1, DOWN}, {0, 2, DOWN}}},
@@ -152,7 +162,8 @@ TEST_F(DebounceTest, TwoKeysSimultaneous1) {
 }
 
 TEST_F(DebounceTest, TwoKeysSimultaneous2) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
         {1, {{0, 2, DOWN}}, {}},
 
@@ -167,7 +178,8 @@ TEST_F(DebounceTest, TwoKeysSimultaneous2) {
 }
 
 TEST_F(DebounceTest, OneKeyDelayedScan1) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
 
         /* Processing is very late */
@@ -182,7 +194,8 @@ TEST_F(DebounceTest, OneKeyDelayedScan1) {
 }
 
 TEST_F(DebounceTest, OneKeyDelayedScan2) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
 
         /* Processing is very late */
@@ -197,7 +210,8 @@ TEST_F(DebounceTest, OneKeyDelayedScan2) {
 }
 
 TEST_F(DebounceTest, OneKeyDelayedScan3) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
 
         /* Release key before debounce expires */
@@ -208,7 +222,8 @@ TEST_F(DebounceTest, OneKeyDelayedScan3) {
 }
 
 TEST_F(DebounceTest, OneKeyDelayedScan4) {
-    addEvents({ /* Time, Inputs, Outputs */
+    addEvents({
+        /* Time, Inputs, Outputs */
         {0, {{0, 1, DOWN}}, {}},
 
         /* Processing is a bit late */

From 698dd0485f9c87f8c249807aec9727fc059def62 Mon Sep 17 00:00:00 2001
From: rate <rate98326@gmail.com>
Date: Mon, 27 Dec 2021 12:36:33 +0900
Subject: [PATCH 074/867] Enable encoder settings VIA. (#14599)

* Enable encoder settings VIA.

* Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Modified to use action_exec.
Change keymap.

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/pistachio_mp/keymaps/via/keymap.c | 79 ++++++++++++++++-----
 1 file changed, 62 insertions(+), 17 deletions(-)

diff --git a/keyboards/pistachio_mp/keymaps/via/keymap.c b/keyboards/pistachio_mp/keymaps/via/keymap.c
index e3592ffa6d..241b501d1d 100644
--- a/keyboards/pistachio_mp/keymaps/via/keymap.c
+++ b/keyboards/pistachio_mp/keymaps/via/keymap.c
@@ -23,10 +23,29 @@ enum layer_names {
     _RESERVE_1
 };
 
+static uint8_t encoder_state = 0;
+static const keypos_t ENC_CW = {.row = 3, .col = 3};
+static const keypos_t ENC_CCW = {.row = 4, .col = 1};
+
+#define LAYOUT_via( \
+         ECW,ECCW, K07, \
+    K00, K01, K02, K03, \
+    K04, K05, K06,      \
+    K08, K09, K10, K11, \
+    K12, K13, K14,      \
+    K15,      K16, K17 ) { \
+    { K00,   K01,   K02,   K03 }, \
+    { K04,   K05,   K06,   K07 }, \
+    { K08,   K09,   K10,   K11 }, \
+    { K12,   K13,   K14,   ECCW }, \
+    { K15,   ECW,   K16,   K17 }, \
+}
+
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT(
-                                           KC_MPLY,
+    [_BASE] = LAYOUT_via(
+                           KC_VOLU,KC_VOLD,KC_MPLY,
     LT(_FN, KC_NLCK),  KC_PSLS,  KC_PAST,  KC_PMNS,
     KC_P7,             KC_P8,    KC_P9,
     KC_P4,             KC_P5,    KC_P6,    KC_PPLS,
@@ -34,8 +53,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_P0,                       KC_PDOT,  KC_PENT
     ),
     /* Fn */
-    [_FN] = LAYOUT(
-                                KC_NO,
+    [_FN] = LAYOUT_via(
+                KC_VOLU,KC_VOLD,KC_NO,
     KC_NO,   KC_NO,   KC_NO,    KC_NO,
     RGB_HUI, RGB_SAI, RGB_VAI,
     RGB_HUD, RGB_SAD, RGB_VAD,  RGB_TOG,
@@ -43,8 +62,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_NO,            KC_NO,    KC_NO
     ),
     /* Reserve */
-    [_RESERVE_0] = LAYOUT(
-                                KC_TRNS,
+    [_RESERVE_0] = LAYOUT_via(
+                KC_VOLU,KC_VOLD,KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
@@ -52,8 +71,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,          KC_TRNS,  KC_TRNS
     ),
     /* Reserve */
-    [_RESERVE_1] = LAYOUT(
-                                KC_TRNS,
+    [_RESERVE_1] = LAYOUT_via(
+                KC_VOLU,KC_VOLD,KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
@@ -61,16 +80,42 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS,          KC_TRNS,  KC_TRNS
     ),
 };
+
 #ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        // Volume control
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
+void encoder_action_unregister(void) {
+    if (encoder_state) {
+        keyevent_t encoder_event = (keyevent_t) {
+            .key = encoder_state >> 1 ? ENC_CW : ENC_CCW,
+            .pressed = false,
+            .time = (timer_read() | 1)
+        };
+        encoder_state = 0;
+        action_exec(encoder_event);
     }
-    return true;
+    return;
 }
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? ENC_CW : ENC_CCW,
+        .pressed = true,
+        .time = (timer_read() | 1)
+    };
+    encoder_state = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+    return;
+}
+
+void matrix_scan_kb(void) {
+    encoder_action_unregister();
+    matrix_scan_user();
+    return;
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    // don't return user actions, because they are in the keymap
+    // encoder_update_user(index, clockwise);
+    return true;
+};
 #endif

From e91070401d0eda5e25210e9f4155fa70d0d61912 Mon Sep 17 00:00:00 2001
From: Paul Scheikl <paul.scheikl@kit.edu>
Date: Mon, 27 Dec 2021 04:40:47 +0100
Subject: [PATCH 075/867] K.O.Y and German layout for several boards (#14991)

* Added accent.

* Added keymap for 5x6 dactyl manuform on KOY layout

* Added xd75 folder that is not in the main repo anymore?

* Added keymap for naked48 on KOY layout

* Added keymap for splitreus62 on KOY layout

* Added keymap for Dactyl Manuform 4x6 with RGB LEDs and K.O,Y layout

* Fixed error where handedness was not correctly determined because of combining vbus pins of both controllers.

* Replaced dynamic macros bith backspace and delete.

* Changed detecting handedness from detecting usb communication to checking a wired pin. This avoids problems when booting the PC, where VBUS is already high, but no communication is happening -> both halves think they are not master.

* Update keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/naked48/keymaps/scheiklp/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/naked48/keymaps/scheiklp/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/naked48/keymaps/scheiklp/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keymap.c

Added copyright

* Update config.h

* Update rules.mk

* Updated files according to PR requests.

* Update keyboards/xd75/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/xd75/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/xd75/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/xd75/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Removed duplicate code. Updated copyright info.

* Restored readme

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/atreus62/keymaps/scheiklp/config.h  |  6 +-
 keyboards/atreus62/keymaps/scheiklp/keymap.c  |  2 +-
 .../4x6/keymaps/scheikled/README.md           |  8 ++
 .../4x6/keymaps/scheikled/config.h            | 60 +++++++++++++
 .../4x6/keymaps/scheikled/keymap.c            | 64 ++++++++++++++
 .../4x6/keymaps/scheikled/rules.mk            | 10 +++
 .../4x6/keymaps/scheiklp/README.md            |  8 ++
 .../4x6/keymaps/scheiklp/config.h             | 47 +++++++++++
 .../4x6/keymaps/scheiklp/keymap.c             | 64 ++++++++++++++
 .../4x6/keymaps/scheiklp/rules.mk             |  9 ++
 .../5x6/keymaps/scheiklp/README.md            |  8 ++
 .../5x6/keymaps/scheiklp/config.h             | 47 +++++++++++
 .../5x6/keymaps/scheiklp/keymap.c             | 70 ++++++++++++++++
 .../5x6/keymaps/scheiklp/rules.mk             | 10 +++
 keyboards/naked48/keymaps/scheiklp/config.h   |  9 ++
 keyboards/naked48/keymaps/scheiklp/keymap.c   | 68 +++++++++++++++
 keyboards/naked48/keymaps/scheiklp/readme.md  | 37 ++++++++
 keyboards/naked48/keymaps/scheiklp/rules.mk   |  5 ++
 .../splitreus62/keymaps/scheiklp/config.h     | 84 +++++++++++++++++++
 .../splitreus62/keymaps/scheiklp/keymap.c     | 56 +++++++++++++
 .../splitreus62/keymaps/scheiklp/rules.mk     |  9 ++
 .../xiudi/xd75/keymaps/scheiklb/config.h      |  8 ++
 .../xiudi/xd75/keymaps/scheiklb/keymap.c      | 41 +++++++++
 .../xiudi/xd75/keymaps/scheiklb/rules.mk      | 17 ++++
 .../xiudi/xd75/keymaps/scheiklp/config.h      | 18 +---
 .../xiudi/xd75/keymaps/scheiklp/keymap.c      | 19 +----
 .../xiudi/xd75/keymaps/scheiklp/rules.mk      |  5 +-
 users/scheiklp/koy_keys_on_quertz_de_latin1.h |  1 +
 28 files changed, 755 insertions(+), 35 deletions(-)
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/README.md
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/README.md
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/keymap.c
 create mode 100644 keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/rules.mk
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/README.md
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/keymap.c
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/rules.mk
 create mode 100644 keyboards/naked48/keymaps/scheiklp/config.h
 create mode 100644 keyboards/naked48/keymaps/scheiklp/keymap.c
 create mode 100644 keyboards/naked48/keymaps/scheiklp/readme.md
 create mode 100644 keyboards/naked48/keymaps/scheiklp/rules.mk
 create mode 100644 keyboards/splitreus62/keymaps/scheiklp/config.h
 create mode 100644 keyboards/splitreus62/keymaps/scheiklp/keymap.c
 create mode 100644 keyboards/splitreus62/keymaps/scheiklp/rules.mk
 create mode 100644 keyboards/xiudi/xd75/keymaps/scheiklb/config.h
 create mode 100644 keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c
 create mode 100644 keyboards/xiudi/xd75/keymaps/scheiklb/rules.mk

diff --git a/keyboards/atreus62/keymaps/scheiklp/config.h b/keyboards/atreus62/keymaps/scheiklp/config.h
index dc7629b622..d8b7abe8d3 100644
--- a/keyboards/atreus62/keymaps/scheiklp/config.h
+++ b/keyboards/atreus62/keymaps/scheiklp/config.h
@@ -29,15 +29,15 @@
 // KC_ACL0 < KC_ACL1 < unmodified < KC_ACL2
 
 // Cursor offset per movement (unmodified)
-#define MK_C_OFFSET_UNMOD 16
+#define MK_C_OFFSET_UNMOD 20
 // Time between cursor movements (unmodified)
-#define MK_C_INTERVAL_UNMOD 10
+#define MK_C_INTERVAL_UNMOD 1
 /* #define MK_C_INTERVAL_UNMOD 16 */
 
 // Cursor offset per movement (KC_ACL0)
 #define MK_C_OFFSET_0 1
 // Time between cursor movements (KC_ACL0)
-#define MK_C_INTERVAL_0 32
+#define MK_C_INTERVAL_0 10
 
 // Cursor offset per movement (KC_ACL1)
 #define MK_C_OFFSET_1 4
diff --git a/keyboards/atreus62/keymaps/scheiklp/keymap.c b/keyboards/atreus62/keymaps/scheiklp/keymap.c
index 0c3208db86..58bacaab91 100644
--- a/keyboards/atreus62/keymaps/scheiklp/keymap.c
+++ b/keyboards/atreus62/keymaps/scheiklp/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_3] = LAYOUT(
     KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_BSPC,
-    KC_TAB,   N_DOTS,  N_USC,   N_LSQBR, N_RSQBR, N_CIRC,                     N_EXKL,  N_LT,    N_GT,    N_EQ,    N_AMP,   KC_TRNS,
+    KC_TAB,   N_DOTS,  N_USC,   N_LSQBR, N_RSQBR, N_CIRC,                     N_EXKL,  N_LT,    N_GT,    N_EQ,    N_AMP,   N_ACUT,
     KC_TRNS,  N_BSLS,  N_SLSH,  N_LCUBR, N_RCUBR, N_ASTR,                     N_QUES,  N_LPARN, N_RPARN, N_MINS,  N_COLN,  N_AT,
     KC_LSFT,  N_HASH,  N_DLR,   N_PIPE,  N_TILD,  N_GRAVE,                    N_PLUS,  N_PERC,  N_QUOT,  N_SING,  N_SEMI,  KC_RSFT,
     KC_LCTL,  N_COPY,  N_PASTE, KC_LGUI, KC_LALT, KC_SPC,  KC_ENTER, KC_TRNS, KC_TRNS, KC_RCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/README.md b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/README.md
new file mode 100644
index 0000000000..b7f7cbf938
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/README.md
@@ -0,0 +1,8 @@
+#### compile with
+
+`make handwired/dactyl_manuform/4x6:scheikled`
+
+
+#### flash with
+
+`qmk flash -kb handwired/dactyl_manuform/4x6 -km scheikled`
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h
new file mode 100644
index 0000000000..a73cac9ed6
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h
@@ -0,0 +1,60 @@
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+
+#pragma once
+
+#define USE_I2C
+
+#define SPLIT_HAND_PIN F6
+
+// WS2812 RGB LED strip input and number of LEDs
+#undef RGB_DI_PIN
+#undef RGBLED_NUM
+#define RGB_DI_PIN F4
+#define RGBLED_NUM 52
+#define RGBLED_SPLIT {26, 26}
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_SNAKE
+
+// Amoeba royale PCBs (https://github.com/mtl/keyboard-pcbs/tree/master/amoeba-royale) use row to column layout (current can flow from row pin to column pin).
+#undef DIODE_DIRECTION
+#define DIODE_DIRECTION ROW2COL
+
+#define DEBOUNCE 5
+
+#define AUTO_SHIFT_TIMEOUT 100
+#define NO_AUTO_SHIFT_SPECIAL
+#define NO_AUTO_SHIFT_NUMERIC
+
+// require two taps for a TT layer switch (default 5)
+#define TAPPING_TOGGLE 2
+
+// Mouse control
+// constant mode (velocity)
+#define MK_3_SPEED
+// KC_ACL0 < KC_ACL1 < unmodified < KC_ACL2
+
+// Cursor offset per movement (unmodified)
+#define MK_C_OFFSET_UNMOD 16
+// Time between cursor movements (unmodified)
+#define MK_C_INTERVAL_UNMOD 10
+/* #define MK_C_INTERVAL_UNMOD 16 */
+
+// Cursor offset per movement (KC_ACL0)
+#define MK_C_OFFSET_0 1
+// Time between cursor movements (KC_ACL0)
+#define MK_C_INTERVAL_0 32
+
+// Cursor offset per movement (KC_ACL1)
+#define MK_C_OFFSET_1 4
+// Time between cursor movements (KC_ACL1)
+#define MK_C_INTERVAL_1 16
+
+// Cursor offset per movement (KC_ACL2)
+#define MK_C_OFFSET_2 20
+/* #define MK_C_OFFSET_2 32 */
+// Time between cursor movements (KC_ACL2)
+#define MK_C_INTERVAL_2 16
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c
new file mode 100644
index 0000000000..7f3fc2585f
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/keymap.c
@@ -0,0 +1,64 @@
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/* A K.O,Y layout for the Dactyl Manuform 4x6 Keyboard */
+
+#include QMK_KEYBOARD_H
+#include "koy_keys_on_quertz_de_latin1.h"
+
+enum custom_layers {
+    _1,
+    _3,
+    _4,
+    _7,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_1] = LAYOUT(
+     KC_TAB  , KC_K , KC_DOT  , KC_O    , KC_COMM , N_Y    ,           KC_V    , KC_G     , KC_C    , KC_L   , N_SS , N_Z     ,
+     MO(_3)  , KC_H , KC_A    , KC_E    , KC_I    , KC_U   ,           KC_D    , KC_T     , KC_R    , KC_N   , KC_S , KC_F    ,
+     KC_LSFT , KC_X , KC_Q    , N_AE    , N_UE    , N_OE   ,           KC_B    , KC_P     , KC_W    , KC_M   , KC_J , KC_RSFT ,
+                      KC_LCTL , KC_LGUI ,                                                   KC_CAPS , TT(_7) ,
+                                          KC_LALT , KC_SPC ,           MO(_3)  , MO(_4)   ,
+                                          N_COPY  , N_CUT  ,           KC_ESC  , KC_ENTER ,
+                                          N_PASTE , N_UNDO ,           KC_BSPC , KC_DEL
+  ),
+
+  [_3] = LAYOUT(
+
+     KC_TAB  , N_DOTS ,  N_USC   , N_LSQBR , N_RSQBR , N_CIRC  ,       N_EXKL , N_LT      , N_GT    , N_EQ    , N_AMP  , N_ACUT  ,
+     KC_TRNS , N_BSLS ,  N_SLSH  , N_LCUBR , N_RCUBR , N_ASTR  ,       N_QUES , N_LPARN   , N_RPARN , N_MINS  , N_COLN , N_AT    ,
+     KC_LSFT , N_HASH ,  N_DLR   , N_PIPE  , N_TILD  , N_GRAVE ,       N_PLUS , N_PERC    , N_QUOT  , N_SING  , N_SEMI , KC_RSFT ,
+                         KC_TRNS , KC_TRNS ,                                                KC_TRNS , KC_TRNS ,
+                                             KC_LALT , KC_SPC  ,       KC_TRNS , KC_TRNS  ,
+                                             N_COPY  , N_CUT   ,       KC_ESC  , KC_ENTER ,
+                                             N_PASTE , N_UNDO  ,       KC_BSPC , KC_DEL
+
+  ),
+
+  [_4] = LAYOUT(
+
+     KC_TAB  , KC_PGUP , KC_BSPC , KC_UP   , KC_DEL   , KC_PGDN ,      KC_KP_SLASH    , KC_7     , KC_8 , KC_9    , KC_KP_MINUS , KC_TRNS ,
+     KC_TRNS , KC_HOME , KC_LEFT , KC_DOWN , KC_RIGHT , KC_END  ,      KC_KP_ASTERISK , KC_4     , KC_5 , KC_6    , KC_KP_PLUS  , KC_TRNS ,
+     KC_LSFT , KC_ESC  , KC_TAB  , KC_INS  , KC_ENTER , N_UNDO  ,      KC_KP_ENTER    , KC_1     , KC_2 , KC_3    , KC_KP_DOT   , KC_RSFT ,
+                         KC_TRNS , KC_TRNS ,                                                       KC_0 , KC_TRNS ,
+                                             KC_LALT  , KC_0    ,      KC_TRNS        , KC_TRNS  ,
+                                             N_COPY   , N_CUT   ,      KC_ESC         , KC_ENTER ,
+                                             N_PASTE  , N_UNDO  ,      KC_BSPC        , KC_DEL
+
+  ),
+
+  [_7] = LAYOUT(
+
+     KC_TAB  , KC_MS_WH_UP  , KC_MS_BTN2 , KC_MS_UP   , KC_MS_BTN1  , KC_MS_WH_DOWN ,      KC_TRNS , KC_F7    , KC_F8   , KC_F9   , RGB_HUI , RESET            ,
+     KC_TRNS , KC_MS_ACCEL0 , KC_MS_LEFT , KC_MS_DOWN , KC_MS_RIGHT , KC_TRNS       ,      KC_TRNS , KC_F4    , KC_F5   , KC_F6   , RGB_SAI , RGB_TOG          ,
+     KC_LSFT , KC_MS_ACCEL1 , KC_TRNS    , KC_TRNS    , KC_TRNS     , KC_TRNS       ,      KC_TRNS , KC_F1    , KC_F2   , KC_F3   , RGB_VAI , RGB_MODE_FORWARD ,
+                              KC_TRNS    , KC_PSCR    ,                                                         KC_F10  , KC_TRNS ,
+                                                        KC_LALT     , KC_F10        ,      KC_TRNS , KC_TRNS  ,
+                                                        N_COPY      , N_CUT         ,      KC_ESC  , KC_ENTER ,
+                                                        N_PASTE     , N_UNDO        ,      KC_BSPC , KC_DEL
+
+  ),
+
+};
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk
new file mode 100644
index 0000000000..9991dcad71
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/rules.mk
@@ -0,0 +1,10 @@
+# Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+BOOTLOADER = atmel-dfu
+AUTO_SHIFT_ENABLE = yes
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no
+NKRO_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/README.md b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/README.md
new file mode 100644
index 0000000000..18c4d8e78d
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/README.md
@@ -0,0 +1,8 @@
+#### compile with
+
+`make handwired/dactyl_manuform/4x6:scheiklp`
+
+
+#### flash with 
+
+`qmk flash -kb handwired/dactyl_manuform/4x6 -km scheiklp`
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h
new file mode 100644
index 0000000000..bfce275567
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h
@@ -0,0 +1,47 @@
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+
+#define USE_I2C
+#define SPLIT_HAND_PIN F6
+
+#undef RGB_DI_PIN
+#undef RGBLED_NUM
+
+#define DEBOUNCE 5
+
+#define AUTO_SHIFT_TIMEOUT 100
+#define NO_AUTO_SHIFT_SPECIAL
+#define NO_AUTO_SHIFT_NUMERIC
+
+// require two taps for a TT layer switch (default 5)
+#define TAPPING_TOGGLE 2
+
+// Mouse control
+// constant mode (velocity)
+#define MK_3_SPEED
+// KC_ACL0 < KC_ACL1 < unmodified < KC_ACL2
+
+// Cursor offset per movement (unmodified)
+#define MK_C_OFFSET_UNMOD 16
+// Time between cursor movements (unmodified)
+#define MK_C_INTERVAL_UNMOD 10
+/* #define MK_C_INTERVAL_UNMOD 16 */
+
+// Cursor offset per movement (KC_ACL0)
+#define MK_C_OFFSET_0 1
+// Time between cursor movements (KC_ACL0)
+#define MK_C_INTERVAL_0 32
+
+// Cursor offset per movement (KC_ACL1)
+#define MK_C_OFFSET_1 4
+// Time between cursor movements (KC_ACL1)
+#define MK_C_INTERVAL_1 16
+
+// Cursor offset per movement (KC_ACL2)
+#define MK_C_OFFSET_2 20
+/* #define MK_C_OFFSET_2 32 */
+// Time between cursor movements (KC_ACL2)
+#define MK_C_INTERVAL_2 16
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/keymap.c
new file mode 100644
index 0000000000..86a34c4f04
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/keymap.c
@@ -0,0 +1,64 @@
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/* A K.O,Y layout for the Dactyl Manuform 4x6 Keyboard */ 
+
+#include QMK_KEYBOARD_H
+#include "koy_keys_on_quertz_de_latin1.h"
+
+enum custom_layers {
+    _1,
+    _3,
+    _4,
+    _7,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_1] = LAYOUT(
+     KC_TAB  , KC_K , KC_DOT  , KC_O    , KC_COMM , N_Y    ,           KC_V    , KC_G     , KC_C    , KC_L   , N_SS , N_Z     ,
+     MO(_3)  , KC_H , KC_A    , KC_E    , KC_I    , KC_U   ,           KC_D    , KC_T     , KC_R    , KC_N   , KC_S , KC_F    ,
+     KC_LSFT , KC_X , KC_Q    , N_AE    , N_UE    , N_OE   ,           KC_B    , KC_P     , KC_W    , KC_M   , KC_J , KC_RSFT ,
+                      KC_LCTL , KC_LGUI ,                                                   KC_CAPS , TT(_7) ,
+                                          KC_LALT , KC_SPC ,           MO(_3)  , MO(_4)   ,
+                                          N_COPY  , N_CUT  ,           KC_ESC  , KC_ENTER ,
+                                          N_PASTE , N_UNDO ,           KC_BSPC , KC_DEL
+  ),
+
+  [_3] = LAYOUT(
+
+     KC_TAB  , N_DOTS ,  N_USC   , N_LSQBR , N_RSQBR , N_CIRC  ,       N_EXKL , N_LT      , N_GT    , N_EQ    , N_AMP  , N_ACUT  ,
+     KC_TRNS , N_BSLS ,  N_SLSH  , N_LCUBR , N_RCUBR , N_ASTR  ,       N_QUES , N_LPARN   , N_RPARN , N_MINS  , N_COLN , N_AT    ,
+     KC_LSFT , N_HASH ,  N_DLR   , N_PIPE  , N_TILD  , N_GRAVE ,       N_PLUS , N_PERC    , N_QUOT  , N_SING  , N_SEMI , KC_RSFT ,
+                         KC_TRNS , KC_TRNS ,                                                KC_TRNS , KC_TRNS ,
+                                             KC_LALT , KC_SPC  ,       KC_TRNS , KC_TRNS  ,
+                                             N_COPY  , N_CUT   ,       KC_ESC  , KC_ENTER ,
+                                             N_PASTE , N_UNDO  ,       KC_BSPC , KC_DEL
+
+  ),
+
+  [_4] = LAYOUT(
+
+     KC_TAB  , KC_PGUP , KC_BSPC , KC_UP   , KC_DEL   , KC_PGDN ,      KC_KP_SLASH    , KC_7     , KC_8 , KC_9    , KC_KP_MINUS , KC_TRNS ,
+     KC_TRNS , KC_HOME , KC_LEFT , KC_DOWN , KC_RIGHT , KC_END  ,      KC_KP_ASTERISK , KC_4     , KC_5 , KC_6    , KC_KP_PLUS  , KC_TRNS ,
+     KC_LSFT , KC_ESC  , KC_TAB  , KC_INS  , KC_ENTER , N_UNDO  ,      KC_KP_ENTER    , KC_1     , KC_2 , KC_3    , KC_KP_DOT   , KC_RSFT ,
+                         KC_TRNS , KC_TRNS ,                                                       KC_0 , KC_TRNS ,
+                                             KC_LALT  , KC_0    ,      KC_TRNS        , KC_TRNS  ,
+                                             N_COPY   , N_CUT   ,      KC_ESC         , KC_ENTER ,
+                                             N_PASTE  , N_UNDO  ,      KC_BSPC        , KC_DEL
+
+  ),
+
+  [_7] = LAYOUT(
+
+     KC_TAB  , KC_MS_WH_UP  , KC_MS_BTN2 , KC_MS_UP   , KC_MS_BTN1  , KC_MS_WH_DOWN ,      KC_TRNS , KC_F7    , KC_F8   , KC_F9   , KC_TRNS , KC_TRNS ,
+     KC_TRNS , KC_MS_ACCEL0 , KC_MS_LEFT , KC_MS_DOWN , KC_MS_RIGHT , KC_TRNS       ,      KC_TRNS , KC_F4    , KC_F5   , KC_F6   , KC_TRNS , KC_TRNS ,
+     KC_LSFT , KC_MS_ACCEL1 , KC_TRNS    , KC_TRNS    , KC_TRNS     , KC_TRNS       ,      KC_TRNS , KC_F1    , KC_F2   , KC_F3   , KC_TRNS , KC_TRNS ,
+                              KC_TRNS    , KC_PSCR    ,                                                         KC_F10  , KC_TRNS ,
+                                                        KC_LALT     , KC_F10        ,      KC_TRNS , KC_TRNS  ,
+                                                        N_COPY      , N_CUT         ,      KC_ESC  , KC_ENTER ,
+                                                        N_PASTE     , N_UNDO        ,      KC_BSPC , KC_DEL
+
+  ),
+
+};
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/rules.mk b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/rules.mk
new file mode 100644
index 0000000000..db873a7522
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/rules.mk
@@ -0,0 +1,9 @@
+# Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+BOOTLOADER = atmel-dfu
+AUTO_SHIFT_ENABLE = yes
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no
+NKRO_ENABLE = yes
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/README.md b/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/README.md
new file mode 100644
index 0000000000..81a8004f7b
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/README.md
@@ -0,0 +1,8 @@
+#### compile with
+
+`make handwired/dactyl_manuform/5x6:scheiklp`
+
+
+#### flash with 
+
+`qmk flash -kb handwired/dactyl_manuform/5x6 -km scheiklp`
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/config.h
new file mode 100644
index 0000000000..613d8ae47f
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/config.h
@@ -0,0 +1,47 @@
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+
+#pragma once
+
+
+#define USE_I2C
+
+/* #define MASTER_LEFT */
+ /* #define MASTER_RIGHT */
+#define EE_HANDS
+// Rows are doubled-up
+
+#define AUTO_SHIFT_TIMEOUT 125
+#define NO_AUTO_SHIFT_SPECIAL
+#define NO_AUTO_SHIFT_NUMERIC
+
+// require two taps for a TT layer switch (default 5)
+#define TAPPING_TOGGLE 2
+
+// Mouse control
+// constant mode (velocity)
+#define MK_3_SPEED
+// KC_ACL0 < KC_ACL1 < unmodified < KC_ACL2
+
+// Cursor offset per movement (unmodified)
+#define MK_C_OFFSET_UNMOD 16
+// Time between cursor movements (unmodified)
+#define MK_C_INTERVAL_UNMOD 10
+/* #define MK_C_INTERVAL_UNMOD 16 */
+
+// Cursor offset per movement (KC_ACL0)
+#define MK_C_OFFSET_0 1
+// Time between cursor movements (KC_ACL0)
+#define MK_C_INTERVAL_0 32
+
+// Cursor offset per movement (KC_ACL1)
+#define MK_C_OFFSET_1 4
+// Time between cursor movements (KC_ACL1)
+#define MK_C_INTERVAL_1 16
+
+// Cursor offset per movement (KC_ACL2)
+#define MK_C_OFFSET_2 20
+/* #define MK_C_OFFSET_2 32 */
+// Time between cursor movements (KC_ACL2)
+#define MK_C_INTERVAL_2 16
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/keymap.c
new file mode 100644
index 0000000000..001687b57d
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/keymap.c
@@ -0,0 +1,70 @@
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/* A K.O,Y layout for the Dactyl Manuform 5x6 Keyboard */ 
+
+#include QMK_KEYBOARD_H
+#include "koy_keys_on_quertz_de_latin1.h"
+
+
+enum custom_layers {
+    _1,
+    _3,
+    _4,
+    _7,
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_1] = LAYOUT_5x6(
+     KC_ESC  , 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_K , KC_DOT  , KC_O    , KC_COMM , N_Y  ,                     KC_V , KC_G , KC_C    , KC_L , N_SS , N_Z     ,
+     MO(_3)  , KC_H , KC_A    , KC_E    , KC_I    , KC_U ,                     KC_D , KC_T , KC_R    , KC_N , KC_S , KC_F    ,
+     KC_LSFT , KC_X , KC_Q    , N_AE    , N_UE    , N_OE ,                     KC_B , KC_P , KC_W    , KC_M , KC_J , KC_RSFT ,
+                      KC_LCTL , KC_LGUI ,                                                    KC_CAPS , TT(_7),
+                                          KC_LALT, KC_SPC,                     MO(_3),  MO(_4),
+                                          N_COPY,  N_CUT,                      DM_RSTP, KC_ENTER,
+                                          N_PASTE, N_UNDO,                     DM_REC1, DM_PLY1
+  ),
+
+  [_3] = LAYOUT_5x6(
+
+     KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_BSPC,
+     KC_TAB,   N_DOTS,  N_USC,   N_LSQBR, N_RSQBR, N_CIRC,                     N_EXKL,  N_LT,    N_GT,    N_EQ,    N_AMP,   N_ACUT,
+     KC_TRNS,  N_BSLS,  N_SLSH,  N_LCUBR, N_RCUBR, N_ASTR,                     N_QUES,  N_LPARN, N_RPARN, N_MINS,  N_COLN,  N_AT,
+     KC_LSFT,  N_HASH,  N_DLR,   N_PIPE,  N_TILD,  N_GRAVE,                    N_PLUS,  N_PERC,  N_QUOT,  N_SING,  N_SEMI,  KC_RSFT,
+                        KC_TRNS, KC_TRNS,                                                        KC_TRNS, KC_TRNS,
+                                           KC_LALT,KC_SPC,                     KC_TRNS,KC_TRNS,
+                                           N_COPY,  N_CUT,                     DM_RSTP, KC_ENTER,
+                                           N_PASTE, N_UNDO,                     DM_REC1, DM_PLY1
+
+  ),
+
+  [_4] = LAYOUT_5x6(
+
+     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,                      KC_F6,          KC_F7,   KC_F8,   KC_F9,   KC_F10,      KC_BSPC,
+     KC_TAB,  KC_PGUP, KC_BSPC, KC_UP,   KC_DEL,   KC_PGDN,                    KC_KP_SLASH,    KC_7,    KC_8,    KC_9,    KC_KP_MINUS, KC_TRNS,
+     KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END,                     KC_KP_ASTERISK, KC_4,    KC_5,    KC_6,    KC_KP_PLUS,  KC_TRNS,
+     KC_LSFT, KC_ESC,  KC_TAB,  KC_INS,  KC_ENTER, N_UNDO,                     KC_KP_ENTER,    KC_1,    KC_2,    KC_3,    KC_KP_DOT,   KC_RSFT,
+                        KC_TRNS,KC_TRNS,                                                         KC_TRNS, KC_TRNS,
+                                             KC_LALT,KC_0,               KC_TRNS,KC_TRNS,
+                                             N_COPY,  N_CUT,             DM_RSTP, KC_ENTER,
+                                             N_PASTE, N_UNDO,                     DM_REC1, DM_PLY1
+
+  ),
+
+  [_7] = LAYOUT_5x6(
+
+     KC_ESC,  KC_TRNS,      KC_TRNS,    KC_MS_BTN3, KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+     KC_TAB,  KC_MS_WH_UP,  KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_WH_DOWN,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_TRNS, KC_MS_ACCEL0, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     KC_LSFT, KC_MS_ACCEL1, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                        KC_TRNS,KC_PSCR,                                                         KC_TRNS, KC_TRNS,
+                                             KC_LALT,KC_0,               KC_TRNS,KC_TRNS,
+                                             N_COPY,  N_CUT,             DM_RSTP, KC_ENTER,
+                                             N_PASTE, N_UNDO,                     DM_REC1, DM_PLY1
+
+  ),
+
+};
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/rules.mk
new file mode 100644
index 0000000000..a0b983c7ab
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/scheiklp/rules.mk
@@ -0,0 +1,10 @@
+# Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+AUTO_SHIFT_ENABLE = yes
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no
+NKRO_ENABLE = yes
+BOOTLOADER = atmel-dfu
+DYNAMIC_MACRO_ENABLE = yes
+
diff --git a/keyboards/naked48/keymaps/scheiklp/config.h b/keyboards/naked48/keymaps/scheiklp/config.h
new file mode 100644
index 0000000000..8c11ad6078
--- /dev/null
+++ b/keyboards/naked48/keymaps/scheiklp/config.h
@@ -0,0 +1,9 @@
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* Select hand configuration */
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 180
diff --git a/keyboards/naked48/keymaps/scheiklp/keymap.c b/keyboards/naked48/keymaps/scheiklp/keymap.c
new file mode 100644
index 0000000000..d8549e0e8b
--- /dev/null
+++ b/keyboards/naked48/keymaps/scheiklp/keymap.c
@@ -0,0 +1,68 @@
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+
+#include QMK_KEYBOARD_H
+#include "koy_keys_on_quertz_de_latin1.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.
+enum layer_number {
+  _1 = 0,
+  _3,
+  _4,
+  _7,
+};
+
+enum custom_keycodes {
+  RGB_RST = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_1] = LAYOUT( /* KOY */
+    KC_ESC,  KC_K,     KC_DOT,  KC_O,    KC_COMM,  N_Y,                      KC_V,     KC_G,    KC_C,    KC_L,    N_SS,    N_Z,
+    MO(_3),  KC_H,     KC_A,    KC_E,    KC_I,     KC_U,                     KC_D,     KC_T,    KC_R,    KC_N,    KC_S,    KC_F,
+    KC_LSFT, KC_X,     KC_Q,    N_AE,    N_UE,     N_OE,                     KC_B,     KC_P,    KC_W,    KC_M,    KC_J,    KC_RSFT,
+             KC_LCTRL, MO(_4),  KC_HOME, KC_LALT,  KC_ENTER,  N_COPY, N_PASTE, KC_SPC, MO(_4),  KC_RCTL, KC_TRNS, MO(_7)
+  ),
+
+  [_3] = LAYOUT( /* Layer 3 */
+    KC_ESC,  N_DOTS,   N_USC,   N_LSQBR, N_RSQBR, N_CIRC,                   N_EXKL,   N_LT,    N_GT,    N_EQ,    N_AMP,   KC_TRNS,
+    KC_TRNS, N_BSLS,   N_SLSH,  N_LCUBR, N_RCUBR, N_ASTR,                   N_QUES,   N_LPARN, N_RPARN, N_MINS,  N_COLN,  N_AT,
+    KC_LSFT, N_HASH,   N_DLR,   N_PIPE,  N_TILD,  N_GRAVE,                  N_PLUS,   N_PERC,  N_QUOT,  N_SING,  N_SEMI,  KC_RSFT,
+             KC_LCTRL, KC_TRNS, KC_HOME, KC_LALT, KC_ENTER,  N_COPY, N_PASTE, KC_SPC, KC_TRNS, KC_RCTL, KC_TRNS, KC_TRNS
+  ),
+
+  [_4] = LAYOUT( /* Layer 4 */
+    KC_ESC,  KC_PGUP, KC_BSPC, KC_UP,   KC_DEL,   KC_PGDN,                    KC_KP_SLASH,    KC_7,    KC_8,    KC_9,    KC_KP_MINUS, KC_TRNS,
+    KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END,                     KC_KP_ASTERISK, KC_4,    KC_5,    KC_6,    KC_KP_PLUS,  KC_TRNS,
+    KC_LSFT, KC_ESC,  KC_TAB,  KC_INS,  KC_SPC,   N_UNDO,                     KC_KP_ENTER,    KC_1,    KC_2,    KC_3,    KC_KP_DOT,   KC_RSFT,
+             KC_LCTRL, KC_TRNS, KC_HOME, KC_LALT, KC_ENTER,  N_COPY, N_PASTE, KC_0,           KC_RCTL, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [_7] = LAYOUT( /* Layer 7 */
+    KC_ESC,  KC_MS_WH_UP,  KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_WH_DOWN,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+    KC_TRNS, KC_MS_ACCEL0, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_LSFT, KC_MS_ACCEL1, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,                           RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI,
+             KC_LCTRL,     KC_TRNS,    KC_HOME,    KC_LALT,     KC_ENTER,  N_COPY, N_PASTE, KC_SPC, KC_TRNS, KC_RCTL, KC_TRNS, KC_TRNS
+  )
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+#ifdef RGBLIGHT_ENABLE
+        case RGB_RST:
+            if (record->event.pressed) {
+                eeconfig_update_rgblight_default();
+                rgblight_enable();
+            }
+            break;
+#endif
+    }
+    return true;
+}
diff --git a/keyboards/naked48/keymaps/scheiklp/readme.md b/keyboards/naked48/keymaps/scheiklp/readme.md
new file mode 100644
index 0000000000..a28ad8c52c
--- /dev/null
+++ b/keyboards/naked48/keymaps/scheiklp/readme.md
@@ -0,0 +1,37 @@
+# The default keymap for naked48
+
+## Default
+|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
+|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
+|  TAB |     Q|     W|     E|     R|     T|      |      |     Y|     U|     I|     O|     P|  BSPC|
+|  ESC |     A|     S|     D|     F|     G|      |      |     H|     J|     K|     L|     ;|     '|
+| LSFT |     Z|     X|     C|     V|     B|      |      |     N|     M|     ,|     .|     /|   ENT|
+|      |ADJUST| LCTRL|  LALT|  LGUI| LOWER|   SPC|   SPC| RAISE|  LEFT|  DOWN|    UP| RIGHT|      |
+
+
+## Lower
+|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
+|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
+|     ~|     !|     @|     #|     $|     %|      |      |     ^|     &|     *|     (|     )|   DEL|
+|   ESC|    F1|    F2|    F3|    F4|    F5|      |      |    F6|     _|     +|     {|     }|  PIPE|
+|  LSFT|    F7|    F8|  F9|     F10|   F11|      |      |   F12| SNUHS| SNUBS|     ,|     .|   ENT|
+|      |ADJUST| LCTRL|  LALT|  LGUI| LOWER|   SPC|   SPC| RAISE|  MNXT|  VOLD|  VOLU|  MPLY|      |
+
+
+## Raise
+|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  10  |  11  |  12  |  13  |  14  |
+|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|
+|     ~|     1|     2|     3|     4|     5|      |      |     6|     7|     8|     9|     0|   DEL|
+|   DEL|    F1|    F2|    F3|    F4|    F5|      |      |    F6|     -|     =|     [|     ]|  BSLS|
+|  LSFT|    F7|    F8|    F9|   F10|   F11|      |      |   F12|  NUHS|  NUBS|     ,|     .|   ENT|
+|      |ADJUST| LCTRL|  LALT|  LGUI| LOWER|   SPC|   SPC| RAISE|  MNXT|  VOLD|  VOLU|  MPLY|      |
+
+
+## Adjust
+|  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |    9   |    10  |   11   |   12   |    13   |    14  |
+|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:----:|:------:|:------:|:------:|:------:|:-------:|:------:|
+|     ~| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_RST|   XXXXX|   XXXXX|   XXXXX|    XXXXX|     DEL|
+|   ESC| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_TOG| RGB_MOD|   XXXXX|   C+A+D| Alt+PSCR|    PSCR|
+|  LSFT| XXXXX| XXXXX| XXXXX| XXXXX| XXXXX|      |      | RGB_VAD| RGB_VAI| RGB_HUD| RGB_HUI|  RGB_SAD| RGB_SAI|
+|      |ADJUST| LCTRL|  LALT|  LGUI| LOWER| RESET| RESET|   RAISE|    MNXT|    VOLD|    VOLU|     MPLY|        |
+
diff --git a/keyboards/naked48/keymaps/scheiklp/rules.mk b/keyboards/naked48/keymaps/scheiklp/rules.mk
new file mode 100644
index 0000000000..0b64091e58
--- /dev/null
+++ b/keyboards/naked48/keymaps/scheiklp/rules.mk
@@ -0,0 +1,5 @@
+# Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+AUTO_SHIFT_ENABLE = yes
+
diff --git a/keyboards/splitreus62/keymaps/scheiklp/config.h b/keyboards/splitreus62/keymaps/scheiklp/config.h
new file mode 100644
index 0000000000..04af418d8f
--- /dev/null
+++ b/keyboards/splitreus62/keymaps/scheiklp/config.h
@@ -0,0 +1,84 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xBEEF
+#define PRODUCT_ID      0xFED0
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    NaCly
+#define PRODUCT         Splitreus62
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D3, D2, D1, D4, C6, D7 }
+#define MATRIX_COL_PINS { E6, B4, B5, B6, B2, B3 }
+
+#define DIODE_DIRECTION ROW2COL
+
+#define SPLIT_HAND_PIN F4
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D0
+
+/* 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 AUTO_SHIFT_TIMEOUT 100
+#define NO_AUTO_SHIFT_SPECIAL
+#define NO_AUTO_SHIFT_NUMERIC
+
+// require two taps for a TT layer switch (default 5)
+#define TAPPING_TOGGLE 2
+
+// Mouse control
+// constant mode (velocity)
+#define MK_3_SPEED
+// KC_ACL0 < KC_ACL1 < unmodified < KC_ACL2
+
+// Cursor offset per movement (unmodified)
+#define MK_C_OFFSET_UNMOD 16
+// Time between cursor movements (unmodified)
+#define MK_C_INTERVAL_UNMOD 10
+/* #define MK_C_INTERVAL_UNMOD 16 */
+
+// Cursor offset per movement (KC_ACL0)
+#define MK_C_OFFSET_0 1
+// Time between cursor movements (KC_ACL0)
+#define MK_C_INTERVAL_0 32
+
+// Cursor offset per movement (KC_ACL1)
+#define MK_C_OFFSET_1 4
+// Time between cursor movements (KC_ACL1)
+#define MK_C_INTERVAL_1 16
+
+// Cursor offset per movement (KC_ACL2)
+#define MK_C_OFFSET_2 20
+/* #define MK_C_OFFSET_2 32 */
+// Time between cursor movements (KC_ACL2)
+#define MK_C_INTERVAL_2 16
diff --git a/keyboards/splitreus62/keymaps/scheiklp/keymap.c b/keyboards/splitreus62/keymaps/scheiklp/keymap.c
new file mode 100644
index 0000000000..b192e357f0
--- /dev/null
+++ b/keyboards/splitreus62/keymaps/scheiklp/keymap.c
@@ -0,0 +1,56 @@
+/* Copyright 2019 NaCly
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "koy_keys_on_quertz_de_latin1.h"
+// Layer shorthand
+#define _1 0
+#define _3 1
+#define _4 2
+#define _7 3
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_1] = 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,
+    KC_TAB,  KC_K,   KC_DOT,  KC_O,    KC_COMM, N_Y,                         KC_V,    KC_G,    KC_C,    KC_L,    N_SS,    N_Z,
+    MO(_3),  KC_H,   KC_A,    KC_E,    KC_I,    KC_U,                        KC_D,    KC_T,    KC_R,    KC_N,    KC_S,    KC_F,
+    KC_LSFT, KC_X,   KC_Q,    N_AE,    N_UE,    N_OE,                        KC_B,    KC_P,    KC_W,    KC_M,    KC_J,    KC_RSFT,
+    KC_LCTL, N_COPY, N_PASTE, KC_LGUI, KC_LALT, KC_SPC, KC_ENTER,   KC_RCTL, MO(_3),  MO(_4),  KC_TRNS, KC_TRNS, KC_CAPS, TT(_7)
+  ),
+
+  [_3] = LAYOUT(
+    KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                      KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_BSPC,
+    KC_TAB,   N_DOTS,  N_USC,   N_LSQBR, N_RSQBR, N_CIRC,                     N_EXKL,  N_LT,    N_GT,    N_EQ,    N_AMP,   KC_TRNS,
+    KC_TRNS,  N_BSLS,  N_SLSH,  N_LCUBR, N_RCUBR, N_ASTR,                     N_QUES,  N_LPARN, N_RPARN, N_MINS,  N_COLN,  N_AT,
+    KC_LSFT,  N_HASH,  N_DLR,   N_PIPE,  N_TILD,  N_GRAVE,                    N_PLUS,  N_PERC,  N_QUOT,  N_SING,  N_SEMI,  KC_RSFT,
+    KC_LCTL,  N_COPY,  N_PASTE, KC_LGUI, KC_LALT, KC_SPC,  KC_ENTER, KC_TRNS, KC_TRNS, KC_RCTL, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [_4] = LAYOUT(
+    KC_ESC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_BSPC,
+    KC_TAB,  KC_PGUP, KC_BSPC, KC_UP,   KC_DEL,   KC_PGDN,                    KC_KP_SLASH,    KC_7,    KC_8,    KC_9,    KC_KP_MINUS, KC_TRNS,
+    KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT, KC_END,                     KC_KP_ASTERISK, KC_4,    KC_5,    KC_6,    KC_KP_PLUS,  KC_TRNS,
+    KC_LSFT, KC_ESC,  KC_TAB,  KC_INS,  KC_ENTER, N_UNDO,                     KC_KP_ENTER,    KC_1,    KC_2,    KC_3,    KC_KP_DOT,   KC_RSFT,
+    KC_LCTL, N_COPY,  N_PASTE, KC_LGUI, KC_LALT,  KC_0,    KC_ENTER, KC_0,    KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS
+  ),
+
+  [_7] = LAYOUT(
+    KC_ESC,  KC_TRNS,      KC_TRNS,    KC_MS_BTN3, KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+    KC_TAB,  KC_MS_WH_UP,  KC_MS_BTN2, KC_MS_UP,   KC_MS_BTN1,  KC_MS_WH_DOWN,                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_MS_ACCEL0, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_LSFT, KC_MS_ACCEL1, KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_LCTL, KC_MS_ACCEL2, KC_TRNS,    KC_LALT,    KC_TRNS,     KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  )
+};
diff --git a/keyboards/splitreus62/keymaps/scheiklp/rules.mk b/keyboards/splitreus62/keymaps/scheiklp/rules.mk
new file mode 100644
index 0000000000..cbfc44e1bd
--- /dev/null
+++ b/keyboards/splitreus62/keymaps/scheiklp/rules.mk
@@ -0,0 +1,9 @@
+BOOTLOADER = atmel-dfu
+
+# Build Options
+AUTO_SHIFT_ENABLE = yes
+BOOTMAGIC_ENABLE = no     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = no       # Audio control and System control
+NKRO_ENABLE = yes           # USB Nkey Rollover
+SPLIT_KEYBOARD = yes
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklb/config.h b/keyboards/xiudi/xd75/keymaps/scheiklb/config.h
new file mode 100644
index 0000000000..ea9ca7a950
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/scheiklb/config.h
@@ -0,0 +1,8 @@
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#define DE_PASTE LCTL(KC_V) // CTRL+V
+#define DE_COPY LCTL(KC_C) // CTRL+C
+#define DE_CUT LCTL(KC_X) // CTRL+X
+#define DE_UNDO LCTL(DE_Z) // CTRL+Z
+
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c b/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c
new file mode 100644
index 0000000000..3dc011a2cb
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c
@@ -0,0 +1,41 @@
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#include "keymap_german.h"
+
+// Layer shorthand
+#define _QWZ 0
+#define _FNC 1
+#define _AGR 2
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+
+	[_QWZ] = {
+	{ KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,     KC_5,     DE_CIRC, DE_UNDO,  KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    DE_SS,   DE_ACUT},
+	{ KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,     DE_COPY, DE_PASTE, DE_Z,   KC_U,   KC_I,    KC_O,    KC_P,    DE_UDIA, DE_PLUS},
+	{ KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,     KC_G,     KC_DEL,  KC_BSPC,  KC_H,   KC_J,   KC_K,    KC_L,    DE_ODIA, DE_ADIA, DE_HASH},
+    { KC_LSFT, DE_Y,    KC_X,    KC_C,    KC_V,     KC_B,     KC_DOWN, KC_UP,    KC_N,   KC_M,   KC_COMM, KC_DOT,  DE_MINS, KC_TRNS, KC_RSFT},
+    { KC_LCTL, DE_LABK, KC_HOME, KC_LALT, KC_ENTER, KC_ENTER, KC_LEFT, KC_RIGHT, KC_SPC, KC_SPC, MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, MO(1) },
+    },
+
+	[_FNC] = {
+	{ RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_TRNS, KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12},
+	{ KC_TAB,  DE_AT,   KC_TRNS, DE_EURO, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_TILD },
+	{ KC_CAPS, 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_LSFT, 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_RSFT },
+	{ KC_LCTL, DE_PIPE, KC_HOME, KC_LALT, KC_ENTER, KC_ENTER, KC_LEFT, KC_RIGHT, KC_SPC, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS },
+	},
+
+    [_AGR] = {
+
+    { KC_ESC,  KC_TRNS, DE_SUP2, DE_SUP3, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, DE_LCBR, DE_LBRC, DE_RBRC, DE_RCBR, DE_BSLS, KC_TRNS},
+	{ KC_TAB,  DE_AT,   KC_TRNS, DE_EURO, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_TILD },
+	{ KC_CAPS, 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_LSFT, 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_RSFT },
+	{ KC_LCTL, DE_PIPE, KC_HOME, KC_LALT, KC_ENTER, KC_ENTER, KC_LEFT, KC_RIGHT, KC_SPC, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS },
+	},
+
+};
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklb/rules.mk b/keyboards/xiudi/xd75/keymaps/scheiklb/rules.mk
new file mode 100644
index 0000000000..52ea43a828
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/scheiklb/rules.mk
@@ -0,0 +1,17 @@
+# Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = no         # Console for debug(+400)
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # 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
+MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
+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.
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+TAP_DANCE_ENABLE = no       # Enable Tap Dancing
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklp/config.h b/keyboards/xiudi/xd75/keymaps/scheiklp/config.h
index 68f5a3ee11..b20cb2f4f3 100644
--- a/keyboards/xiudi/xd75/keymaps/scheiklp/config.h
+++ b/keyboards/xiudi/xd75/keymaps/scheiklp/config.h
@@ -1,20 +1,8 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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/>.
- */
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
+
 // place overrides here
 #define AUTO_SHIFT_TIMEOUT 175
 #define NO_AUTO_SHIFT_SPECIAL
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c b/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
index a757c2e49c..594d34ce33 100644
--- a/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
@@ -1,20 +1,9 @@
-/* Copyright 2017 Wunder
- *
- * 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/>.
- */
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 #include "koy_keys_on_quertz_de_latin1.h"
+
 // Layer shorthand
 #define _1 0
 #define _3 1
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklp/rules.mk b/keyboards/xiudi/xd75/keymaps/scheiklp/rules.mk
index 2cbbe08d7a..0b00a6654d 100644
--- a/keyboards/xiudi/xd75/keymaps/scheiklp/rules.mk
+++ b/keyboards/xiudi/xd75/keymaps/scheiklp/rules.mk
@@ -1,4 +1,7 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+# Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+BOOTMAGIC_ENABLE = no
 COMMAND_ENABLE = no
 RGBLIGHT_ENABLE = no
 DYNAMIC_MACRO_ENABLE = yes
diff --git a/users/scheiklp/koy_keys_on_quertz_de_latin1.h b/users/scheiklp/koy_keys_on_quertz_de_latin1.h
index 4f39b7631c..e098e75dfc 100644
--- a/users/scheiklp/koy_keys_on_quertz_de_latin1.h
+++ b/users/scheiklp/koy_keys_on_quertz_de_latin1.h
@@ -61,3 +61,4 @@ Additionally, there are some common chars that we dit not yet define:
 #define N_COPY LCTL(KC_C) // CTRL+C
 #define N_CUT LCTL(KC_X) // CTRL+X
 #define N_UNDO LCTL(N_Z) // CTRL+Z
+#define N_ACUT KC_EQL  // ´

From 4d1ed37bdcb3641e35dc2324592a1f7fa0509bd2 Mon Sep 17 00:00:00 2001
From: Jordan Blackbourn <blackbournj@gmail.com>
Date: Mon, 27 Dec 2021 16:44:01 +1300
Subject: [PATCH 076/867] Orthocode update default keymap, and fix encoder
 function for keymaps built in configurator (#15161)

* Updated default keymap to match one shipping with the boards

* Fix encoder function so it works for users
of the online configurator

* Updated Info.json to match default keymap

* Changes as per review
---
 keyboards/orthocode/info.json                |  12 +-
 keyboards/orthocode/keymaps/default/keymap.c | 139 +++----------------
 keyboards/orthocode/orthocode.c              |  15 +-
 3 files changed, 36 insertions(+), 130 deletions(-)

diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json
index 058ec85579..c193ab44f9 100644
--- a/keyboards/orthocode/info.json
+++ b/keyboards/orthocode/info.json
@@ -5,9 +5,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Rotary", "x":0.5, "y":0},
+                {"label":"Mute", "x":0.5, "y":0},
 
-                {"label":"Game", "x":0.5, "y":1},
+                {"label":"RGB Tog", "x":0.5, "y":1},
                 {"label":"Esc", "x":1.75, "y":1},
                 {"label":"1", "x":3, "y":1},
                 {"label":"2", "x":4, "y":1},
@@ -23,7 +23,7 @@
                 {"label":"+", "x":16.5, "y":1},
                 {"label":"Home", "x":17.5, "y":1},
 
-                {"label":"M1", "x":0.25, "y":2},
+                {"label":"RGB Mode", "x":0.25, "y":2},
                 {"label":"Tab", "x":1.5, "y":2, "w":1.5},
                 {"label":"Q", "x":3, "y":2},
                 {"label":"W", "x":4, "y":2},
@@ -39,8 +39,8 @@
                 {"label":"Delete", "x":17, "y":2},
                 {"label":"End", "x":18, "y":2},
 
-                {"label":"M2", "x":0, "y":3},
-                {"label":"Ctrl", "x":1.25, "y":3, "w":1.75},
+                {"label":"RGB RMode", "x":0, "y":3},
+                {"label":"Caps", "x":1.25, "y":3, "w":1.75},
                 {"label":"A", "x":3, "y":3},
                 {"label":"S", "x":4, "y":3},
                 {"label":"D", "x":5, "y":3},
@@ -54,7 +54,7 @@
                 {"label":"\"", "x":15.5, "y":3},
                 {"label":"Enter", "x":16.5, "y":3, "w":2.25},
 
-                {"label":"Layer", "x":0.75, "y":4, "w":2.25},
+                {"label":"Shift", "x":0.75, "y":4, "w":2.25},
                 {"label":"Z", "x":3, "y":4},
                 {"label":"X", "x":4, "y":4},
                 {"label":"C", "x":5, "y":4},
diff --git a/keyboards/orthocode/keymaps/default/keymap.c b/keyboards/orthocode/keymaps/default/keymap.c
index ea69d01335..800886a63d 100644
--- a/keyboards/orthocode/keymaps/default/keymap.c
+++ b/keyboards/orthocode/keymaps/default/keymap.c
@@ -17,43 +17,36 @@
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
-  SHIFTSPACE,
-  ILIKEFROG
 };
 
-#define KC_SHSP SHIFTSPACE
-#define KC_FROG ILIKEFROG
-
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
      /* Rotary                                                                                                                                  */
         KC__MUTE,
      /*           esc      1        2        3        4        5        6        7        8        9        0        -        =        home     */
-        TG(2),    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_HOME,
+        RGB_TOG,    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_HOME,
      /*           tab      Q        W        E        R        T        Y        U        I        O        P        \        delete   end      */
-        RGB_TOG,  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_DEL,  KC_END,
+        RGB_MOD,    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_DEL,  KC_END,
      /*           caps     A        S        D        F        G        H        J        K        L        ;        '        enter             */
-        RGB_MOD,  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        RGB_RMOD,   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,
      /*           shift    Z        X        C        V        B        N        M        ,        .        /                 up                */
-                  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_UP,
+                  KC_LSFT,   KC_Z,    KC_X,    KC_C,  KC_V,    KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT,  KC_SLSH,          KC_UP,
      /*           ctrl     win      alt      fn       th1      th2      th3      th4      fn       alt      ctrl     left     down     right    */
-                  KC_LCTL, KC_LGUI, KC_LALT, MO(1),   KC_RSFT, KC_ENT,  KC_BSPC, KC_SHSP, MO(1),   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+                  KC_LCTL, KC_LGUI, KC_LALT, MO(1),  KC_RSFT, KC_ENT,  KC_BSPC, KC_SPC, MO(1),   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
     ),
     [1] = LAYOUT(
      /* Rotary                                                                                                                                                  */
-        KC_TRNS,
-     /*          esc      1        2        3        4        5        6        7             8              9              0        -        =        home     */
-        TG(3),   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_TRNS,
-     /*          tab      Q        W        E        R        T        Y        U             I              O              P        \        delete   end      */
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS,      LSFT(KC_LBRC), LSFT(KC_RBRC), KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS,
-     /*          caps     A        S        D        F        G        H        J             K              L              ;        '        enter             */
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_LBRC,       KC_RBRC,       KC_TRNS, KC_TRNS, KC_TRNS,
-     /*          shift    Z        X        C        V        B        N        M             ,              .              /                 up                */
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL,  LSFT(KC_EQL), LSFT(KC_9),    LSFT(KC_0),    KC_TRNS,          KC_VOLU,
-     /*          ctrl     win      alt      fn       th1      th2      th3      th4           fn             alt            ctrl     left     down     right    */
-                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS,      KC_TRNS,       KC_TRNS,       KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS
+        TG(2),
+     /*          esc      1        2        3        4       5       6        7            8          9           0        -         =     home  */
+      KC_TRNS, 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_TRNS,
+     /*          tab      Q       W        E        R        T       Y        U             I           O          P         \      delete     end */
+      RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,  KC_TRNS,KC_TRNS, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_TRNS, KC_TRNS,  KC_PAUS, KC_TRNS,
+     /*          caps      A       S        D        F        G      H         J            K          L         ;        '        enter    */
+      RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,     KC_LBRC,    KC_RBRC, KC_TRNS, KC_TRNS,  KC_TRNS,
+     /*         shift      Z         X        C       V       B       N       M             ,           .          /                       up      */
+              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, LSFT(KC_EQL), LSFT(KC_9), LSFT(KC_0), KC_TRNS,             KC_VOLU,
+     /*         ctrl     win      alt        fn     th1      th2     th3      th4          fn         alt       ctrl      left     down     right*/
+              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_VOLD,  KC_TRNS
     ),
     [2] = LAYOUT(
      /* Rotary                                                                                                                                 */
@@ -69,107 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      /*          ctrl     win      alt      fn       th1      th2      th3      th4      fn       alt      ctrl     left     down     right    */
                  KC_TRNS, KC_NO,   KC_TRNS, KC_TRNS, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
 
-    ),
-    [3] = LAYOUT(
-     /* Rotary                                                                                                                                 */
-        KC_FROG,
-     /*          esc      1        2        3        4        5        6        7        8        9        0        -        =        home     */
-        TG(3),   KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG,
-     /*          tab      Q        W        E        R        T        Y        U        I        O        P        \        delete   end      */
-        KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG,
-     /*          caps     A        S        D        F        G        H        J        K        L        ;        '        enter             */
-        KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG,
-     /*          shift    Z        X        C        V        B        N        M        ,        .        /                 up                */
-                 KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG,          KC_FROG,
-     /*          ctrl     win      alt      fn       th1      th2      th3      th4      fn       alt      ctrl     left     down     right    */
-                 KC_FROG, KC_FROG, KC_FROG, MO(1),   KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG, KC_FROG
     )
 };
 
 
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    static bool shiftspace_mods = false;
-    static int frogchar = 0;
-    switch (keycode) {
-    case SHIFTSPACE:
-        if (record->event.pressed) {
-            if(get_mods() & MOD_BIT(KC_RSFT)) {
-                register_code(KC_MINS);
-                shiftspace_mods = true;
-            }
-            else {
-                register_code(KC_SPC);
-            }
-        } else {
-            if (shiftspace_mods) {
-                unregister_code(KC_MINS);
-                shiftspace_mods = false;
-            } else {
-                unregister_code(KC_SPC);
-            }
-        }
-        return false;
-        break;
-    case ILIKEFROG:
-        if (record->event.pressed) {
-            switch (frogchar)
-            {
-            case 0:
-                SEND_STRING("I");
-                break;
-            case 1:
-                SEND_STRING(" ");
-                break;
-            case 2:
-                SEND_STRING("L");
-                break;
-            case 3:
-                SEND_STRING("i");
-                break;
-            case 4:
-                SEND_STRING("k");
-                break;
-            case 5:
-                SEND_STRING("e");
-                break;
-            case 6:
-                SEND_STRING(" ");
-                break;
-            case 7:
-                SEND_STRING("F");
-                break;
-            case 8:
-                SEND_STRING("r");
-                break;
-            case 9:
-                SEND_STRING("o");
-                break;
-            case 10:
-                SEND_STRING("g");
-                break;
-            case 11:
-                SEND_STRING(" ");
-                break;
-            }
-            frogchar = (frogchar + 1) % 12;
-        }
-        break;
-    }
-    return true;
-
-}
-
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    // Volume control
-    if (clockwise) {
-        tap_code(KC_VOLD);
-    } else {
-        tap_code(KC_VOLU);
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/orthocode/orthocode.c b/keyboards/orthocode/orthocode.c
index 8de13e2abe..23596d3e5b 100644
--- a/keyboards/orthocode/orthocode.c
+++ b/keyboards/orthocode/orthocode.c
@@ -13,4 +13,17 @@
  * 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 "orthocode.h"
\ No newline at end of file
+#include "orthocode.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    // Volume control
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+    return true;
+}
+#endif

From 93bc737a8fcb3ccac86772560a0e2b5bd91051c5 Mon Sep 17 00:00:00 2001
From: Jonathan Rascher <jon@bcat.name>
Date: Sun, 26 Dec 2021 21:46:00 -0600
Subject: [PATCH 077/867] [Keymap] Update bcat's keymaps/userspace to share
 logic, add OLED functionality, and set up one of my macropads for WFH
 (#14702)

* Add script to build all bcat keymaps at once

* Move userspace RGB to separate source file

* Move layer handling logic into userspace

* Move keycap aliases into userspace

* Add OLED userspace library and Lily58 OLED setup

* Add Luna keyboard pet, generic OLED pet framework

Luna artwork and original implementation by HellSingCoder, licensed
under GPL v2.0.

See also: https://github.com/qmk/qmk_firmware/blob/6dfe915e26d7147e6c2bed495d3b01cf5b21e6ec/keyboards/sofle/keymaps/helltm/keymap.c

* Use OLED on bcat's Crkbd

I had to turn off a few unused features to address firmware size limits.

* Remove vestigial NK_TOGG keybindings

* Add post-render hook to OLED pet API

This enables OLED pets to draw custom widgets (e.g., LED indicator
status) on top of their animation frames.

* Add Isda keyboard pet

For future use on my Unicorne keyboard. Unicorn artwork by sparrow666,
licensed under GPL v2.0.

See also: https://opengameart.org/content/unicorn-2

* Replace OLED timeout implementation with custom

The default implementation never lets the OLED turn off if a continuous
animation is in progress. The custom one does.

* Move keyboard state for OLED functions into struct

No change in firmware size, but makes keymaps read a little nicer and
enables more functionality in OLED pets.

* Enable continuously running OLED pet (for Luna)

* Sync OLED state; enable Bootmagic only when needed

The new extensible split transport for Split Common finally allows OLED
on/off status to be synced between halves of the keyboard. :)

Unfortunately, this required disabling Bootmagic Lite to keep my Crkbd
under the firmware size limit. (I now after 28 bytes free on avr-gcc
version 8.5.0.) So now I'll enable Bootmagic only on keyboards that
actually require it, i.e., ones lacking an accessible reset button.

* Update 9-Key macropad keymap for working from home

* Remove includes redundant with quantum.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Simplify BCAT_OLED_PET makefile logic

* Swap some keys on my 9-Key macropad around

* Inline spurious variable in OLED code

* Remove max brightness that's now set by default

The default max brightness is only 120 rather than 150, but that might
actually fix some weirdness I've seen with bright white LED settings.

* Enable specific RGBLIGHT modes instead of default

The general trend these days seems to be enabling only the modes you
want, so I'm manually expanding the ones currently enabled by
RGBLIGHT_ANIMATIONS.

I'd like to try out the TWINKLE mode too, but it seems not to work at
all on ARM right now, and all my usable RGBLIGHT keebs are ARM boards.

* Reenable RGB_MATRIX animations after #15018

My Crkbd still has a reasonable amount of free space with these:
27974/28672 (97%, 698 bytes free). The RGB_MATRIX_KEYPRESSES effects
would put it over the firmware size limit, but I really don't ever use
those anyway.

* Use new get_u8_str function for WPM display

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/9key/keymaps/bcat/keymap.c          |  19 +-
 keyboards/9key/keymaps/bcat/readme.md         |   6 +-
 keyboards/eco/keymaps/bcat/config.h           |   2 +
 keyboards/eco/keymaps/bcat/keymap.c           |  19 +-
 keyboards/eco/keymaps/bcat/readme.md          |   2 +-
 keyboards/keebio/bdn9/keymaps/bcat/keymap.c   |  13 +-
 .../keebio/quefrency/keymaps/bcat/keymap.c    |  13 +-
 .../keebio/quefrency/keymaps/bcat/readme.md   |   2 +-
 keyboards/lily58/keymaps/bcat/config.h        |   2 +
 keyboards/lily58/keymaps/bcat/keymap.c        |  33 +--
 keyboards/lily58/keymaps/bcat/readme.md       |   2 +-
 keyboards/lily58/keymaps/bcat/rules.mk        |   2 +
 .../60_ansi_split_bs_rshift/bcat/keymap.c     |  11 +-
 .../60_ansi_split_bs_rshift/bcat/readme.md    |   2 +-
 .../community/60_tsangan_hhkb/bcat/keymap.c   |  11 +-
 .../community/60_tsangan_hhkb/bcat/readme.md  |   2 +-
 .../65_ansi_blocker_split_bs/bcat/keymap.c    |  13 +-
 .../65_ansi_blocker_split_bs/bcat/readme.md   |   2 +-
 layouts/community/split_3x6_3/bcat/config.h   |   9 +-
 layouts/community/split_3x6_3/bcat/keymap.c   |  33 +--
 layouts/community/split_3x6_3/bcat/readme.md  |   2 +-
 layouts/community/split_3x6_3/bcat/rules.mk   |   4 +
 users/bcat/bcat.c                             |  10 +-
 users/bcat/bcat.h                             |  36 ++-
 users/bcat/bcat_oled.c                        | 216 ++++++++++++++++++
 users/bcat/bcat_oled.h                        |  55 +++++
 users/bcat/bcat_oled_pet.h                    |  73 ++++++
 users/bcat/bcat_oled_pet_isda.c               | 134 +++++++++++
 users/bcat/bcat_oled_pet_luna.c               | 168 ++++++++++++++
 users/bcat/bcat_rgblight.c                    |  22 ++
 users/bcat/compile.sh                         |  51 +++++
 users/bcat/config.h                           |  79 ++++++-
 users/bcat/readme.md                          |   2 +
 users/bcat/rules.mk                           |  43 +++-
 34 files changed, 959 insertions(+), 134 deletions(-)
 create mode 100644 users/bcat/bcat_oled.c
 create mode 100644 users/bcat/bcat_oled.h
 create mode 100644 users/bcat/bcat_oled_pet.h
 create mode 100644 users/bcat/bcat_oled_pet_isda.c
 create mode 100644 users/bcat/bcat_oled_pet_luna.c
 create mode 100644 users/bcat/bcat_rgblight.c
 create mode 100755 users/bcat/compile.sh

diff --git a/keyboards/9key/keymaps/bcat/keymap.c b/keyboards/9key/keymaps/bcat/keymap.c
index 5c08a42a56..944a48c0d3 100644
--- a/keyboards/9key/keymaps/bcat/keymap.c
+++ b/keyboards/9key/keymaps/bcat/keymap.c
@@ -16,22 +16,21 @@
 
 #include QMK_KEYBOARD_H
 
-enum layer {
-    LAYER_DEFAULT,
-    LAYER_FUNCTION,
-};
+#include "bcat.h"
 
-#define LY_FUNC MO(LAYER_FUNCTION)
-#define KY_LOCK LCA(KC_L) /* Cinnamon lock screen */
+#define KY_LOCK LGUI(KC_L) /* Chrome OS: Lock screen */
+#define KY_MICM LSG(KC_1)  /* Meet Shortcuts: Mute mic */
+#define KY_MICU LSG(KC_2)  /* Meet Shortcuts: Unmute mic */
+#define KY_RHAND LSG(KC_3) /* Meet Shortcuts: Raise/lower hand */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     [LAYER_DEFAULT] = LAYOUT(
-        KC_MPLY,  KC_VOLU,  KC_MSTP,
-        KC_MPRV,  KC_VOLD,  KC_MNXT,
-        KY_LOCK,  KC_MUTE,  LY_FUNC
+        KC_MPLY,  KC_VOLU,  KY_RHAND,
+        KY_LOCK,  KC_VOLD,  KY_MICU,
+        LY_FN1,   KC_MUTE,  KY_MICM
     ),
-    [LAYER_FUNCTION] = LAYOUT(
+    [LAYER_FUNCTION_1] = LAYOUT(
         EEP_RST,  _______,  RESET,
         _______,  _______,  _______,
         _______,  _______,  _______
diff --git a/keyboards/9key/keymaps/bcat/readme.md b/keyboards/9key/keymaps/bcat/readme.md
index 2dee51de8b..d38ae5463b 100644
--- a/keyboards/9key/keymaps/bcat/readme.md
+++ b/keyboards/9key/keymaps/bcat/readme.md
@@ -1,5 +1,5 @@
 # bcat's 9-Key layout
 
-This is a super simple PCB-mount macropad with nine keys, used at work for
-media keys and quick access to screen lock on Linux (Cinnamon desktop
-environment).
+This is a super simple PCB-mount macropad with nine keys, used on my
+work-from-home Chromebox for media/volume control and to activate some global
+shortcuts for Google Meet.
diff --git a/keyboards/eco/keymaps/bcat/config.h b/keyboards/eco/keymaps/bcat/config.h
index dffdc7b40a..f2d51c324a 100644
--- a/keyboards/eco/keymaps/bcat/config.h
+++ b/keyboards/eco/keymaps/bcat/config.h
@@ -16,6 +16,8 @@
 
 #pragma once
 
+#define BCAT_ORTHO_LAYERS
+
 /* WS2812B RGB LED strip hand wired to Elite-C. */
 #define RGB_DI_PIN B7
 #define RGBLED_NUM 15
diff --git a/keyboards/eco/keymaps/bcat/keymap.c b/keyboards/eco/keymaps/bcat/keymap.c
index d46a7d416b..8c50a9ed55 100644
--- a/keyboards/eco/keymaps/bcat/keymap.c
+++ b/keyboards/eco/keymaps/bcat/keymap.c
@@ -18,21 +18,6 @@
 
 #include "bcat.h"
 
-enum layer {
-    LAYER_DEFAULT,
-    LAYER_LOWER,
-    LAYER_RAISE,
-    LAYER_ADJUST,
-};
-
-#define LY_LWR MO(LAYER_LOWER)
-#define LY_RSE MO(LAYER_RAISE)
-
-#define KY_CSPC LCTL(KC_SPC)
-#define KY_ZMIN LCTL(KC_EQL)
-#define KY_ZMOUT LCTL(KC_MINS)
-#define KY_ZMRST LCTL(KC_0)
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
     /* Default layer: http://www.keyboard-layout-editor.com/#/gists/2c11371c7a5f7cd08a0132631d3d3281 */
@@ -58,12 +43,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/b18aafa0327d7e83eaf485546c067a21 */
     [LAYER_ADJUST] = LAYOUT(
-        _______,  NK_TOGG,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  _______,  _______,  EEP_RST,  RESET,    _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  _______,  _______,  EEP_RST,  RESET,    _______,  _______,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,  _______
     ),
     // clang-format on
 };
-
-layer_state_t layer_state_set_keymap(layer_state_t state) { return update_tri_layer_state(state, LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); }
diff --git a/keyboards/eco/keymaps/bcat/readme.md b/keyboards/eco/keymaps/bcat/readme.md
index 85e2615512..fd9e1bea73 100644
--- a/keyboards/eco/keymaps/bcat/readme.md
+++ b/keyboards/eco/keymaps/bcat/readme.md
@@ -39,6 +39,6 @@ nothing really useful to bind them to anyway.
 
 ## Adjust layer
 
-![Adjust layer layout](https://i.imgur.com/J2rOshm.png)
+![Adjust layer layout](https://i.imgur.com/63vm0ke.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/b18aafa0327d7e83eaf485546c067a21))
diff --git a/keyboards/keebio/bdn9/keymaps/bcat/keymap.c b/keyboards/keebio/bdn9/keymaps/bcat/keymap.c
index c64f702b20..2028deb4f1 100644
--- a/keyboards/keebio/bdn9/keymaps/bcat/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/bcat/keymap.c
@@ -16,21 +16,16 @@
 
 #include QMK_KEYBOARD_H
 
-enum layer {
-    LAYER_FIRST,
-    LAYER_SECOND,
-};
-
-#define LY_SECND MO(LAYER_SECOND)
+#include "bcat.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
-    [LAYER_FIRST] = LAYOUT(
-        KC_MUTE,  LY_SECND, BL_BRTG,
+    [LAYER_DEFAULT] = LAYOUT(
+        KC_MUTE,  LY_FN1,   BL_BRTG,
         KC_F4,    KC_F5,    KC_F6,
         KC_F1,    KC_F2,    KC_F3
     ),
-    [LAYER_SECOND] = LAYOUT(
+    [LAYER_FUNCTION_1] = LAYOUT(
         EEP_RST,  _______,  RESET,
         KC_F10,   KC_F11,   KC_F12,
         KC_F7,    KC_F8,    KC_F9
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
index d28a5083ac..3dd48623fa 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/bcat/keymap.c
@@ -16,12 +16,7 @@
 
 #include QMK_KEYBOARD_H
 
-enum layer {
-    LAYER_DEFAULT,
-    LAYER_FUNCTION,
-};
-
-#define LY_FN MO(LAYER_FUNCTION)
+#include "bcat.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
@@ -31,12 +26,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_BSPC,            KC_PGUP,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_PGDN,
         KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,    KC_END,
-        KC_LCTL,  KC_LGUI,  KC_LALT,  LY_FN,    KC_SPC,                       KC_SPC,   XXXXXXX,  KC_RALT,  LY_FN,    KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT
+        KC_LCTL,  KC_LGUI,  KC_LALT,  LY_FN1,   KC_SPC,                       KC_SPC,   XXXXXXX,  KC_RALT,  LY_FN1,   KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT
     ),
     /* Function layer: http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d */
-    [LAYER_FUNCTION] = LAYOUT_65(
+    [LAYER_FUNCTION_1] = LAYOUT_65(
         _______,  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_INS,   KC_DEL,   RGB_HUI,
-        KC_CAPS,  NK_TOGG,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  RESET,    KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,            RGB_SAI,
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  RESET,    KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,            RGB_SAI,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RGB_TOG,            RGB_SAD,
         _______,  KC_APP,   _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      RGB_VAI,  RGB_HUD,
         _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,            RGB_RMOD, RGB_VAD,  RGB_MOD
diff --git a/keyboards/keebio/quefrency/keymaps/bcat/readme.md b/keyboards/keebio/quefrency/keymaps/bcat/readme.md
index 914aa84b6b..59a691654d 100644
--- a/keyboards/keebio/quefrency/keymaps/bcat/readme.md
+++ b/keyboards/keebio/quefrency/keymaps/bcat/readme.md
@@ -12,6 +12,6 @@ ESDF cluster), and RGB controls in the function layer (on the arrow/nav keys).
 
 ## Function layer
 
-![Function layer layout](https://i.imgur.com/Fzshl0F.png)
+![Function layer layout](https://i.imgur.com/7oCdN86.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/59636898946da51f91fb290f8e078b4d))
diff --git a/keyboards/lily58/keymaps/bcat/config.h b/keyboards/lily58/keymaps/bcat/config.h
index dbe724d56b..2ee0071bda 100644
--- a/keyboards/lily58/keymaps/bcat/config.h
+++ b/keyboards/lily58/keymaps/bcat/config.h
@@ -16,4 +16,6 @@
 
 #pragma once
 
+#define BCAT_ORTHO_LAYERS
+
 #define EE_HANDS
diff --git a/keyboards/lily58/keymaps/bcat/keymap.c b/keyboards/lily58/keymaps/bcat/keymap.c
index 69af2ca003..a0856d0fdd 100644
--- a/keyboards/lily58/keymaps/bcat/keymap.c
+++ b/keyboards/lily58/keymaps/bcat/keymap.c
@@ -18,20 +18,9 @@
 
 #include "bcat.h"
 
-enum layer {
-    LAYER_DEFAULT,
-    LAYER_LOWER,
-    LAYER_RAISE,
-    LAYER_ADJUST,
-};
-
-#define LY_LWR MO(LAYER_LOWER)
-#define LY_RSE MO(LAYER_RAISE)
-
-#define KY_CSPC LCTL(KC_SPC)
-#define KY_ZMIN LCTL(KC_EQL)
-#define KY_ZMOUT LCTL(KC_MINS)
-#define KY_ZMRST LCTL(KC_0)
+#if defined(OLED_ENABLE)
+#    include "bcat_oled.h"
+#endif
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
@@ -62,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7 */
     [LAYER_ADJUST] = LAYOUT(
         _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  NK_TOGG,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    _______,  _______,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
                                       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
@@ -70,4 +59,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format on
 };
 
-layer_state_t layer_state_set_keymap(layer_state_t state) { return update_tri_layer_state(state, LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); }
+#if defined(OLED_ENABLE)
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return is_keyboard_master() ? OLED_ROTATION_270 : OLED_ROTATION_180; }
+
+void oled_task_keymap(const oled_keyboard_state_t *keyboard_state) {
+    render_oled_layers();
+    oled_advance_page(/*clearPageRemainder=*/false);
+    render_oled_indicators(keyboard_state->leds);
+    oled_advance_page(/*clearPageRemainder=*/false);
+    oled_advance_page(/*clearPageRemainder=*/false);
+    render_oled_wpm(keyboard_state->wpm);
+    render_oled_pet(/*col=*/0, /*line=*/12, keyboard_state);
+}
+#endif
diff --git a/keyboards/lily58/keymaps/bcat/readme.md b/keyboards/lily58/keymaps/bcat/readme.md
index de03526a8b..8b0e77e1b7 100644
--- a/keyboards/lily58/keymaps/bcat/readme.md
+++ b/keyboards/lily58/keymaps/bcat/readme.md
@@ -37,6 +37,6 @@ back/forward navigation keys.
 
 ## Adjust layer
 
-![Adjust layer layout](https://i.imgur.com/Q3PGsiK.png)
+![Adjust layer layout](https://i.imgur.com/XC2eR2M.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7))
diff --git a/keyboards/lily58/keymaps/bcat/rules.mk b/keyboards/lily58/keymaps/bcat/rules.mk
index c87b447c1e..62d1007a54 100644
--- a/keyboards/lily58/keymaps/bcat/rules.mk
+++ b/keyboards/lily58/keymaps/bcat/rules.mk
@@ -1 +1,3 @@
+BCAT_OLED_PET = luna
+
 BOOTLOADER = atmel-dfu  # Elite-C
diff --git a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
index 6bfafc3325..b40148e995 100644
--- a/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
+++ b/layouts/community/60_ansi_split_bs_rshift/bcat/keymap.c
@@ -16,14 +16,7 @@
 
 #include QMK_KEYBOARD_H
 
-enum layer {
-    LAYER_DEFAULT,
-    LAYER_FUNCTION_1,
-    LAYER_FUNCTION_2,
-};
-
-#define LY_FN1 MO(LAYER_FUNCTION_1)
-#define LY_FN2 MO(LAYER_FUNCTION_2)
+#include "bcat.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
@@ -48,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c */
     [LAYER_FUNCTION_2] = LAYOUT_60_ansi_split_bs_rshift(
         _______,  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_INS,   KC_DEL,
-        _______,  NK_TOGG,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EEP_RST,  RESET,    _______,  _______,  _______,  RGB_VAI,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EEP_RST,  RESET,    _______,  _______,  _______,  RGB_VAI,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_INC,   _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,
         _______,  _______,  _______,  KC_MUTE,  _______,  BL_DEC,   _______,  RGB_SPD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,  _______,  _______
diff --git a/layouts/community/60_ansi_split_bs_rshift/bcat/readme.md b/layouts/community/60_ansi_split_bs_rshift/bcat/readme.md
index 2d578aa3d3..f6bcda9197 100644
--- a/layouts/community/60_ansi_split_bs_rshift/bcat/readme.md
+++ b/layouts/community/60_ansi_split_bs_rshift/bcat/readme.md
@@ -19,6 +19,6 @@ layout](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/60_tsa
 
 ## Function 2 layer
 
-![Function 2 layer layout](https://i.imgur.com/vJaCzVo.png)
+![Function 2 layer layout](https://i.imgur.com/DW03vvJ.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/6e1068e4f91bbacccaf5ac0acbeec79c))
diff --git a/layouts/community/60_tsangan_hhkb/bcat/keymap.c b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
index 05e6462d90..9ec75f3c4d 100644
--- a/layouts/community/60_tsangan_hhkb/bcat/keymap.c
+++ b/layouts/community/60_tsangan_hhkb/bcat/keymap.c
@@ -16,14 +16,7 @@
 
 #include QMK_KEYBOARD_H
 
-enum layer {
-    LAYER_DEFAULT,
-    LAYER_FUNCTION_1,
-    LAYER_FUNCTION_2,
-};
-
-#define LY_FN1 MO(LAYER_FUNCTION_1)
-#define LY_FN2 MO(LAYER_FUNCTION_2)
+#include "bcat.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
@@ -46,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Function 2 layer: http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4 */
     [LAYER_FUNCTION_2] = LAYOUT_60_tsangan_hhkb(
         _______,  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_INS,   KC_DEL,
-        _______,  NK_TOGG,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EEP_RST,  RESET,    _______,  _______,  _______,  RGB_VAI,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  BL_BRTG,  EEP_RST,  RESET,    _______,  _______,  _______,  RGB_VAI,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  BL_INC,   _______,  RGB_SPI,  RGB_HUI,  RGB_SAI,  RGB_RMOD, RGB_MOD,            RGB_TOG,
         _______,  _______,  _______,  KC_MUTE,  _______,  BL_DEC,   _______,  RGB_SPD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  _______,                      _______,
         _______,  _______,  _______,                                _______,                                          _______,  _______,            _______
diff --git a/layouts/community/60_tsangan_hhkb/bcat/readme.md b/layouts/community/60_tsangan_hhkb/bcat/readme.md
index b7a3cde5d2..c8d0d72dd0 100644
--- a/layouts/community/60_tsangan_hhkb/bcat/readme.md
+++ b/layouts/community/60_tsangan_hhkb/bcat/readme.md
@@ -39,6 +39,6 @@ and/or blockers, so there aren't switches installed in those positions.
 
 ## Function 2 layer
 
-![Function 2 layer layout](https://i.imgur.com/vdNpFae.png)
+![Function 2 layer layout](https://i.imgur.com/4Jdw9eL.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/65ac939caec878401603bc36290852d4))
diff --git a/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
index c91a1b0ead..c099d36e25 100644
--- a/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
+++ b/layouts/community/65_ansi_blocker_split_bs/bcat/keymap.c
@@ -16,12 +16,7 @@
 
 #include QMK_KEYBOARD_H
 
-enum layer {
-    LAYER_DEFAULT,
-    LAYER_FUNCTION,
-};
-
-#define LY_FN MO(LAYER_FUNCTION)
+#include "bcat.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
@@ -31,13 +26,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_BSPC,            KC_PGUP,
         KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_PGDN,
         KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,    KC_END,
-        KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  LY_FN,                        KC_LEFT,  KC_DOWN,  KC_RGHT
+        KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  LY_FN1,                       KC_LEFT,  KC_DOWN,  KC_RGHT
     ),
 
     /* Function layer: http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44 */
-    [LAYER_FUNCTION] = LAYOUT_65_ansi_blocker_split_bs(
+    [LAYER_FUNCTION_1] = LAYOUT_65_ansi_blocker_split_bs(
         _______,  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_INS,   KC_DEL,   _______,
-        KC_CAPS,  NK_TOGG,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  RESET,    KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,            _______,
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  EEP_RST,  RESET,    KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,  _______,  _______,            _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            _______,
         _______,  KC_APP,   _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
         _______,  _______,  _______,                      _______,                                _______,  _______,                      _______,  _______,  _______
diff --git a/layouts/community/65_ansi_blocker_split_bs/bcat/readme.md b/layouts/community/65_ansi_blocker_split_bs/bcat/readme.md
index 0726cbecee..5777c7c38f 100644
--- a/layouts/community/65_ansi_blocker_split_bs/bcat/readme.md
+++ b/layouts/community/65_ansi_blocker_split_bs/bcat/readme.md
@@ -12,6 +12,6 @@ keys, an HHKB-style (split) backspace, and media controls in the function layer
 
 ## Function layer
 
-![Function layer layout](https://i.imgur.com/CsxfVfd.png)
+![Function layer layout](https://i.imgur.com/s4hS9ZK.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/f29128427f674c43777f045e363d1b44))
diff --git a/layouts/community/split_3x6_3/bcat/config.h b/layouts/community/split_3x6_3/bcat/config.h
index b8743429cf..556fb90d5f 100644
--- a/layouts/community/split_3x6_3/bcat/config.h
+++ b/layouts/community/split_3x6_3/bcat/config.h
@@ -16,12 +16,13 @@
 
 #pragma once
 
+#define BCAT_ORTHO_LAYERS
+
 #if defined(KEYBOARD_crkbd_rev1)
 #    define EE_HANDS
 
-#    if defined(RGB_MATRIX_ENABLE)
-/* Limit max RGB LED current to avoid tripping controller fuse. */
-#        undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
-#        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+#    if defined(OLED_ENABLE)
+#        undef OLED_FONT_H
+#        define OLED_FONT_H "lib/glcdfont.c"
 #    endif
 #endif
diff --git a/layouts/community/split_3x6_3/bcat/keymap.c b/layouts/community/split_3x6_3/bcat/keymap.c
index 4f68c8f843..cfac93d1e3 100644
--- a/layouts/community/split_3x6_3/bcat/keymap.c
+++ b/layouts/community/split_3x6_3/bcat/keymap.c
@@ -18,20 +18,9 @@
 
 #include "bcat.h"
 
-enum layer {
-    LAYER_DEFAULT,
-    LAYER_LOWER,
-    LAYER_RAISE,
-    LAYER_ADJUST,
-};
-
-#define LY_LWR MO(LAYER_LOWER)
-#define LY_RSE MO(LAYER_RAISE)
-
-#define KY_CSPC LCTL(KC_SPC)
-#define KY_ZMIN LCTL(KC_EQL)
-#define KY_ZMOUT LCTL(KC_MINS)
-#define KY_ZMRST LCTL(KC_0)
+#if defined(OLED_ENABLE)
+#    include "bcat_oled.h"
+#endif
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format off
@@ -58,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee */
     [LAYER_ADJUST] = LAYOUT_split_3x6_3(
-        _______,  NK_TOGG,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    _______,  _______,  _______,  _______,
         _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
         _______,  _______,  _______,  KC_MUTE,  _______,  _______,                      RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
                                                 _______,  _______,  _______,  RGB_TOG,  _______,  _______
@@ -66,4 +55,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // clang-format on
 };
 
-layer_state_t layer_state_set_keymap(layer_state_t state) { return update_tri_layer_state(state, LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST); }
+#if defined(OLED_ENABLE)
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return is_keyboard_master() ? OLED_ROTATION_270 : OLED_ROTATION_180; }
+
+void oled_task_keymap(const oled_keyboard_state_t *keyboard_state) {
+    render_oled_layers();
+    oled_advance_page(/*clearPageRemainder=*/false);
+    render_oled_indicators(keyboard_state->leds);
+    oled_advance_page(/*clearPageRemainder=*/false);
+    oled_advance_page(/*clearPageRemainder=*/false);
+    render_oled_wpm(keyboard_state->wpm);
+    render_oled_pet(/*col=*/0, /*line=*/12, keyboard_state);
+}
+#endif
diff --git a/layouts/community/split_3x6_3/bcat/readme.md b/layouts/community/split_3x6_3/bcat/readme.md
index c4bf891c40..b7b5d3de7d 100644
--- a/layouts/community/split_3x6_3/bcat/readme.md
+++ b/layouts/community/split_3x6_3/bcat/readme.md
@@ -117,7 +117,7 @@ better location.
 
 ## Adjust layer
 
-![Adjust layer layout](https://i.imgur.com/fZouko5.png)
+![Adjust layer layout](https://i.imgur.com/Q4rN6cQ.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee))
 
diff --git a/layouts/community/split_3x6_3/bcat/rules.mk b/layouts/community/split_3x6_3/bcat/rules.mk
index 5ee614b192..29e52b92db 100644
--- a/layouts/community/split_3x6_3/bcat/rules.mk
+++ b/layouts/community/split_3x6_3/bcat/rules.mk
@@ -1,5 +1,9 @@
+BCAT_OLED_PET = luna
+
 ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
 	BOOTLOADER = atmel-dfu  # Elite-C
 
+	OLED_ENABLE = yes  # dual 128x32 OLED screens
+	OLED_DRIVER = SSD1306
 	RGB_MATRIX_ENABLE = yes  # per-key RGB and underglow
 endif
diff --git a/users/bcat/bcat.c b/users/bcat/bcat.c
index f21d282e43..3a407cfac0 100644
--- a/users/bcat/bcat.c
+++ b/users/bcat/bcat.c
@@ -16,16 +16,15 @@
 
 #include "bcat.h"
 
-#if defined(RGBLIGHT_ENABLE)
-/* Adjust RGB static hue ranges for shorter gradients than default. */
-const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 127, 63, 31, 15};
-#endif
+#include "quantum.h"
 
 static int8_t alt_tab_layer = -1;
 
+__attribute__((weak)) void process_record_oled(uint16_t keycode, const keyrecord_t *record) {}
 __attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    process_record_oled(keycode, record);
     if (!process_record_keymap(keycode, record)) {
         return false;
     }
@@ -51,6 +50,9 @@ __attribute__((weak)) layer_state_t layer_state_set_keymap(layer_state_t state)
 
 layer_state_t layer_state_set_user(layer_state_t state) {
     state = layer_state_set_keymap(state);
+#if defined(BCAT_ORTHO_LAYERS)
+    state = update_tri_layer_state(state, LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+#endif
     if (alt_tab_layer >= 0 && !layer_state_cmp(state, alt_tab_layer)) {
         unregister_code(KC_LALT);
         alt_tab_layer = -1;
diff --git a/users/bcat/bcat.h b/users/bcat/bcat.h
index 0dae774ec5..4a88acba7d 100644
--- a/users/bcat/bcat.h
+++ b/users/bcat/bcat.h
@@ -16,9 +16,43 @@
 
 #pragma once
 
-#include "quantum.h"
+#include <stdbool.h>
 
+#include "keymap.h"
+
+/* Layer numbers shared across keymaps. */
+enum user_layer {
+    /* Base layers: */
+    LAYER_DEFAULT,
+
+#if defined(BCAT_ORTHO_LAYERS)
+    /* Function layers for ortho (and ergo) boards: */
+    LAYER_LOWER,
+    LAYER_RAISE,
+    LAYER_ADJUST,
+#else
+    /* Function layers for traditional boards: */
+    LAYER_FUNCTION_1,
+    LAYER_FUNCTION_2,
+#endif
+};
+
+/* Custom keycodes shared across keymaps. */
 enum user_keycode {
     MC_ALTT = SAFE_RANGE,
     KEYMAP_SAFE_RANGE,
 };
+
+/* Keycode aliases shared across keymaps. */
+#define KY_CSPC LCTL(KC_SPC)
+#define KY_ZMIN LCTL(KC_EQL)
+#define KY_ZMOUT LCTL(KC_MINS)
+#define KY_ZMRST LCTL(KC_0)
+
+#if defined(BCAT_ORTHO_LAYERS)
+#    define LY_LWR MO(LAYER_LOWER)
+#    define LY_RSE MO(LAYER_RAISE)
+#else
+#    define LY_FN1 MO(LAYER_FUNCTION_1)
+#    define LY_FN2 MO(LAYER_FUNCTION_2)
+#endif
diff --git a/users/bcat/bcat_oled.c b/users/bcat/bcat_oled.c
new file mode 100644
index 0000000000..390c9127b4
--- /dev/null
+++ b/users/bcat/bcat_oled.c
@@ -0,0 +1,216 @@
+/* Copyright 2021 Jonathan Rascher
+ *
+ * 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 "bcat_oled.h"
+
+#include "quantum.h"
+#include "bcat.h"
+
+#if defined(BCAT_OLED_PET)
+#    include "bcat_oled_pet.h"
+#endif
+
+#define TRIANGLE_UP 0x1e
+#define TRIANGLE_DOWN 0x1f
+
+#if defined(BCAT_OLED_PET)
+static bool oled_pet_should_jump = false;
+#endif
+
+/* Should be overridden by the keymap to render the OLED contents. For split
+ * keyboards, this function is only called on the master side.
+ */
+__attribute__((weak)) void oled_task_keymap(const oled_keyboard_state_t *keyboard_state) {}
+
+bool oled_task_user(void) {
+#if defined(SPLIT_KEYBOARD)
+    if (is_keyboard_master()) {
+#endif
+        /* Custom OLED timeout implementation that only considers user activity.
+         * Allows the OLED to turn off in the middle of a continuous animation.
+         */
+        static const uint16_t TIMEOUT_MILLIS = 60000 /* 1 min */;
+
+        if (last_input_activity_elapsed() < TIMEOUT_MILLIS) {
+            if (!is_oled_on()) {
+                oled_on();
+            }
+            oled_keyboard_state_t keyboard_state = {
+                .mods = get_mods(),
+                .leds = host_keyboard_led_state(),
+                .wpm  = get_current_wpm(),
+            };
+            oled_task_keymap(&keyboard_state);
+        } else if (is_oled_on()) {
+            oled_off();
+        }
+#if defined(SPLIT_KEYBOARD)
+    } else {
+        /* Display logo embedded at standard location in the OLED font on the
+         * slave side. By default, this is a "QMK firmware" logo, but many
+         * keyboards substitute their own logo. Occupies 21x3 character cells.
+         *
+         * Since the slave display buffer never changes, we don't need to worry
+         * about oled_render incorrectly turning the OLED on. Instead, we rely
+         * on SPLIT_OLED_ENABLE to propagate OLED on/off status from master.
+         */
+        static const char PROGMEM logo[] = {
+            // clang-format off
+            0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+            0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+            0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+            0x00,
+            // clang-format on
+        };
+
+        oled_write_P(logo, /*invert=*/false);
+    }
+#endif
+
+    return false;
+}
+
+void render_oled_layers(void) {
+    oled_advance_char();
+    oled_advance_char();
+#if defined(BCAT_ORTHO_LAYERS)
+    oled_write_char(IS_LAYER_ON(LAYER_LOWER) ? TRIANGLE_DOWN : ' ', /*invert=*/false);
+    oled_advance_char();
+    oled_write_char(IS_LAYER_ON(LAYER_RAISE) ? TRIANGLE_UP : ' ', /*invert=*/false);
+#else
+    switch (get_highest_layer(layer_state)) {
+        case LAYER_FUNCTION_1:
+            oled_write_P(PSTR("FN1"), /*invert=*/false);
+            break;
+        case LAYER_FUNCTION_2:
+            oled_write_P(PSTR("FN2"), /*invert=*/false);
+            break;
+        default:
+            oled_write_P(PSTR("   "), /*invert=*/false);
+            break;
+    }
+#endif
+}
+
+void render_oled_indicators(led_t leds) {
+    oled_advance_char();
+    oled_advance_char();
+    oled_write_P(leds.num_lock ? PSTR("NUM") : PSTR("   "), /*invert=*/false);
+    oled_advance_char();
+    oled_advance_char();
+    oled_write_P(leds.caps_lock ? PSTR("CAP") : PSTR("   "), /*invert=*/false);
+    oled_advance_char();
+    oled_advance_char();
+    oled_write_P(leds.scroll_lock ? PSTR("SCR") : PSTR("   "), /*invert=*/false);
+}
+
+void render_oled_wpm(uint8_t wpm) {
+    static const uint16_t UPDATE_MILLIS  = 100;
+    static uint32_t       update_timeout = 0;
+
+    if (timer_expired32(timer_read32(), update_timeout)) {
+        oled_advance_char();
+        oled_advance_char();
+        oled_write_P(wpm > 0 ? PSTR("WPM") : PSTR("   "), /*invert=*/false);
+        if (wpm > 0) {
+            oled_advance_char();
+            oled_advance_char();
+            oled_write(get_u8_str(wpm, ' '), /*invert=*/false);
+        } else {
+            oled_advance_page(/*clearPageRemainder=*/true);
+        }
+
+        update_timeout = timer_read32() + UPDATE_MILLIS;
+    }
+}
+
+#if defined(BCAT_OLED_PET)
+void process_record_oled(uint16_t keycode, const keyrecord_t *record) {
+    switch (keycode) {
+        case KC_SPACE:
+            if (oled_pet_can_jump()) {
+                oled_pet_should_jump = record->event.pressed;
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+static void redraw_oled_pet(uint8_t col, uint8_t line, bool jumping, oled_pet_state_t state) {
+    oled_set_cursor(col, line);
+    if (jumping) {
+        oled_write_raw_P(oled_pet_frame(state), oled_pet_frame_bytes());
+        oled_set_cursor(col, line + oled_pet_frame_lines());
+        oled_advance_page(/*clearPageRemainder=*/true);
+    } else {
+        oled_advance_page(/*clearPageRemainder=*/true);
+        oled_write_raw_P(oled_pet_frame(state), oled_pet_frame_bytes());
+    }
+}
+
+void render_oled_pet(uint8_t col, uint8_t line, const oled_keyboard_state_t *keyboard_state) {
+    /* Current animation to draw. We track changes to avoid redrawing the same
+     * frame repeatedly, allowing oled_pet_post_render to draw over the
+     * animation frame.
+     */
+    static oled_pet_state_t state         = 0;
+    static bool             state_changed = true;
+
+    /* Minimum time until the pet comes down after jumping. */
+    static const uint16_t JUMP_MILLIS = 200;
+    static bool           jumping     = false;
+
+    /* Time until the next animation or jump state change. */
+    static uint32_t update_timeout = 0;
+    static uint32_t jump_timeout   = 0;
+
+    /* If the user pressed the jump key, immediately redraw instead of waiting
+     * for the animation frame to update. That way, the pet appears to respond
+     * to jump commands quickly rather than lagging. If the user released the
+     * jump key, wait for the jump timeout to avoid overly brief jumps.
+     */
+    bool redraw = state_changed;
+    if (oled_pet_should_jump && !jumping) {
+        redraw       = true;
+        jumping      = true;
+        jump_timeout = timer_read32() + JUMP_MILLIS;
+    } else if (!oled_pet_should_jump && jumping && timer_expired32(timer_read32(), jump_timeout)) {
+        redraw  = true;
+        jumping = false;
+    }
+
+    /* Draw the actual animation, then move the cursor to the end of the
+     * rendered area. (Note that we take up an extra line to account for
+     * jumping, which shifts the animation up or down a line.)
+     */
+    if (redraw) {
+        redraw_oled_pet(col, line, jumping, state);
+    }
+    oled_pet_post_render(col, line + !jumping, keyboard_state, redraw);
+    oled_set_cursor(col, line + oled_pet_frame_lines() + 1);
+
+    /* If the update timer expired, recompute the pet's animation state. */
+    if (timer_expired32(timer_read32(), update_timeout)) {
+        oled_pet_state_t new_state = oled_pet_next_state(state, keyboard_state);
+        state_changed              = new_state != state;
+        state                      = new_state;
+        update_timeout             = timer_read32() + oled_pet_update_millis(keyboard_state);
+    } else {
+        state_changed = false;
+    }
+}
+#endif
diff --git a/users/bcat/bcat_oled.h b/users/bcat/bcat_oled.h
new file mode 100644
index 0000000000..f617e1f064
--- /dev/null
+++ b/users/bcat/bcat_oled.h
@@ -0,0 +1,55 @@
+/* Copyright 2021 Jonathan Rascher
+ *
+ * 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 <stdbool.h>
+#include <stdint.h>
+
+#include "led.h"
+
+/* Keyboard status passed to the oled_task_keymap function and used by the
+ * various keyboard pet implementations.
+ */
+typedef struct {
+    uint8_t mods;
+    led_t   leds;
+    uint8_t wpm;
+} oled_keyboard_state_t;
+
+/* Note: Functions below assume a vertical OLED that is 32px (5 chars) wide. */
+
+/* Renders layer status at the cursor. Occupies 5x1 character cells. */
+void render_oled_layers(void);
+
+/* Renders LED indicators (Num/Caps/Scroll Lock) at the cursor. Occupies 5x3
+ * character cells.
+ */
+void render_oled_indicators(led_t leds);
+
+/* Renders calculated WPM count at the cursor. Occupies 5x2 character cells. */
+void render_oled_wpm(uint8_t wpm);
+
+#if defined(BCAT_OLED_PET)
+/* Renders an animated critter at the cursor that can respond to keystrokes,
+ * typing speed, etc. Should be about 5 character cells wide, but exact height
+ * varies depending on the specific OLED pet implementation linked in.
+ *
+ * The rendered image will be one line taller than the OLED pet's animation
+ * frame height to accommodate pets that "jump" when the spacebar is pressed.
+ */
+void render_oled_pet(uint8_t col, uint8_t line, const oled_keyboard_state_t *keyboard_state);
+#endif
diff --git a/users/bcat/bcat_oled_pet.h b/users/bcat/bcat_oled_pet.h
new file mode 100644
index 0000000000..ba8227ab61
--- /dev/null
+++ b/users/bcat/bcat_oled_pet.h
@@ -0,0 +1,73 @@
+/* Copyright 2021 Jonathan Rascher
+ *
+ * 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/>.
+ */
+
+/* Common interface for an OLED pet (animated critter that reacts to typing).
+ * Please link exactly one accompanying .c file to implement these functions.
+ */
+
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "bcat_oled.h"
+
+/* Opaque token representing a single frame of the OLED pet animation.
+ * Different pet implementations have different valid state values, but the
+ * zero value must always represent the default state of the pet at startup.
+ */
+typedef uint16_t oled_pet_state_t;
+
+/* Returns the number of bytes used to represent the animation frame (in
+ * oled_write_raw_P format). Note that every state the pet supports is expected
+ * to have the same frame size.
+ */
+uint16_t oled_pet_frame_bytes(void);
+
+/* Returns the number of lines of the OLED occupied by the animation. Note that
+ * every state the pet supports is expected to have the same frame size. The
+ * returned value does not include the one line of padding that render_oled_pet
+ * uses to account for "jumping".
+ */
+uint8_t oled_pet_frame_lines(void);
+
+/* Returns whether or not the OLED pet should "jump" when the spacebar is
+ * pressed. (The render_oled_pet implementation shifts the animation frame up
+ * one line when this happens.)
+ */
+bool oled_pet_can_jump(void);
+
+/* Returns the delay before the next animation frame should be displayed. */
+uint16_t oled_pet_update_millis(const oled_keyboard_state_t *keyboard_state);
+
+/* Returns the state of the pet to be animated on the next animation tick. */
+oled_pet_state_t oled_pet_next_state(oled_pet_state_t state, const oled_keyboard_state_t *keyboard_state);
+
+/* Called after the OLED pet is rendered during each OLED task invocation.
+ * Receives the same keyboard state as render_oled_pet. The redraw param
+ * indicates whether or not an OLED frame was just redrawn, allowing a specific
+ * pet implementation to draw custom things atop its animation frames.
+ *
+ * When this function is called, the cursor will be in an unspecified location,
+ * not necessarily the top-left corner of the OLED pet.
+ */
+void oled_pet_post_render(uint8_t col, uint8_t line, const oled_keyboard_state_t *keyboard_state, bool redraw);
+
+/* Returns a PROGMEM pointer to the specified frame buffer for the specified
+ * state. The animation frame has length given by oled_pet_frame_bytes and is
+ * formatted as expected by oled_write_raw_P.
+ */
+const char *oled_pet_frame(oled_pet_state_t state);
diff --git a/users/bcat/bcat_oled_pet_isda.c b/users/bcat/bcat_oled_pet_isda.c
new file mode 100644
index 0000000000..98abddb13b
--- /dev/null
+++ b/users/bcat/bcat_oled_pet_isda.c
@@ -0,0 +1,134 @@
+/* Copyright 2018 sparrow666
+ * Copyright 2021 Jonathan Rascher
+ *
+ * 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/>.
+ */
+
+/* OLED pet "Isda" (animated unicorn) featuring artwork by OpenGameArt user
+ * sparrow666, licensed under GPL v2.0.
+ *
+ * The animation is 32x72 pixels (9 lines tall).
+ *
+ * Runs faster the quicker you type. Shows LED indicator (Num/Caps/Scroll Lock)
+ * status in the bottom-right corner.
+ *
+ * Named after the goddess Ehlonna's personal unicorn in the first D&D campaign
+ * I ever played. :)
+ *
+ * Artwork source: https://opengameart.org/content/unicorn-2
+ */
+
+#include "bcat_oled_pet.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "bcat_oled.h"
+#include "led.h"
+#include "oled_driver.h"
+#include "progmem.h"
+
+#define NUM_FRAMES 4
+#define FRAME_BYTES 288 /* (32 pixel) * (72 pixel) / (8 pixel/byte) */
+
+uint16_t oled_pet_frame_bytes(void) { return FRAME_BYTES; }
+uint8_t  oled_pet_frame_lines(void) { return 9 /* (72 pixel) / (8 pixel/line) */; }
+bool     oled_pet_can_jump(void) { return false; }
+
+uint16_t oled_pet_update_millis(const oled_keyboard_state_t *keyboard_state) {
+    static const uint16_t MIN_MILLIS = 75;
+    static const uint16_t MAX_MILLIS = 300;
+    static const uint8_t  MAX_WPM    = 150;
+    uint8_t               wpm        = keyboard_state->wpm;
+    if (wpm > MAX_WPM) {
+        wpm = MAX_WPM;
+    }
+    return MAX_MILLIS - (MAX_MILLIS - MIN_MILLIS) * wpm / MAX_WPM;
+}
+
+oled_pet_state_t oled_pet_next_state(oled_pet_state_t state, const oled_keyboard_state_t *keyboard_state) {
+    /* When the user stops typing, cycle the animation to frame 0 and stop. */
+    return state != 0 || keyboard_state->wpm > 0 ? (state + 1) % NUM_FRAMES : 0;
+}
+
+void oled_pet_post_render(uint8_t col, uint8_t line, const oled_keyboard_state_t *keyboard_state, bool redraw) {
+    /* Draws LED indicator status in the bottom-right corner of the OLED pet,
+     * atop the animation frame. Redrawn only when necessary, e.g., when LED
+     * status changes or the animation itself updated (which overwrites any
+     * previously drawn indicators).
+     */
+    static led_t prev_leds = {.raw = 0};
+    led_t        leds      = keyboard_state->leds;
+    if (redraw || leds.raw != prev_leds.raw) {
+        oled_set_cursor(col + 4, line + 4);
+        oled_write_char(leds.num_lock ? 'N' : ' ', /*invert=*/false);
+        oled_set_cursor(col + 4, line + 6);
+        oled_write_char(leds.caps_lock ? 'C' : ' ', /*invert=*/false);
+        oled_set_cursor(col + 4, line + 8);
+        oled_write_char(leds.scroll_lock ? 'S' : ' ', /*invert=*/false);
+        prev_leds = leds;
+    }
+}
+
+const char *oled_pet_frame(oled_pet_state_t state) {
+    static const char PROGMEM FRAMES[NUM_FRAMES][FRAME_BYTES] = {
+        // clang-format off
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xa0, 0x60, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x88, 0xd0, 0x78, 0x04, 0x28, 0x70, 0x60, 0x90, 0x88, 0xc4, 0x22, 0x19, 0x04, 0x03, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xfc, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x84, 0x8c, 0x08, 0x01, 0x01, 0x02, 0x02, 0x04, 0x88, 0xf0, 0x00,
+            0xc0, 0xe0, 0xe0, 0x10, 0x10, 0x08, 0x04, 0x02, 0x01, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x1f, 0x00, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
+            0x00, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0xfc, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0x3c, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x01, 0x03, 0xc6, 0x3c, 0x00, 0x80, 0x70, 0x1c, 0x0f, 0x03, 0x0f, 0x3f, 0xff, 0xff, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0x7f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x01, 0x0e, 0x30, 0x40, 0x47, 0x4f, 0x77, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xc0, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0xa0, 0xf0, 0x08, 0x50, 0xe0, 0xc0, 0x20, 0x10, 0x88, 0x44, 0x32, 0x09, 0x06, 0x01, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xfe, 0xff, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x19, 0x11, 0x03, 0x02, 0x04, 0x04, 0x08, 0x10, 0xe0, 0x00,
+            0xc0, 0xe0, 0xe0, 0x10, 0x10, 0x08, 0x04, 0x02, 0x01, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x3f, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x00,
+            0x00, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x01, 0x03, 0x00, 0x00, 0x80, 0xc0, 0x20, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0x3c, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x01, 0x03, 0xc6, 0x3c, 0x00, 0x80, 0x70, 0x18, 0x0f, 0x03, 0x0f, 0x3f, 0xff, 0xff, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0xc0, 0x38, 0x07, 0xc0, 0x38, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x7f, 0xff, 0xff, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x21, 0x20, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0f, 0x0f, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xc0, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0xa0, 0xf0, 0x08, 0x50, 0xe0, 0xc0, 0x20, 0x10, 0x88, 0x44, 0x32, 0x09, 0x06, 0x01, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xfe, 0xff, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x19, 0x11, 0x03, 0x02, 0x04, 0x04, 0x08, 0x10, 0xe0, 0x00,
+            0xc0, 0xc0, 0xc0, 0x20, 0x20, 0x10, 0x08, 0x04, 0x03, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x3f, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x00,
+            0x00, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x01, 0x03, 0x00, 0x00, 0x80, 0xc0, 0x20, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x01, 0x03, 0xc3, 0xfe, 0xfe, 0xfc, 0x7c, 0x1c, 0x0c, 0x0c, 0x08, 0x10, 0x60, 0x83, 0x07, 0x18, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x71, 0x0e, 0x80, 0x70, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x01, 0x0f, 0x3f, 0x7f, 0x7f, 0x78, 0xe0, 0x90, 0x88, 0x66, 0x11, 0x08, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xa0, 0x60, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x88, 0xd0, 0x78, 0x04, 0x28, 0x70, 0x60, 0x90, 0x88, 0xc4, 0x22, 0x19, 0x04, 0x03, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xfc, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x84, 0x8c, 0x08, 0x01, 0x01, 0x02, 0x02, 0x04, 0x88, 0xf0, 0x00,
+            0xc0, 0xe0, 0xe0, 0x10, 0x10, 0x08, 0x04, 0x02, 0x01, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x1f, 0x00, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
+            0x00, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x18, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0xe0, 0xfc, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x01, 0x03, 0xc6, 0xfc, 0xfc, 0xfc, 0x7c, 0x18, 0x08, 0x08, 0x08, 0x30, 0xc0, 0x03, 0x0c, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0xc0, 0xf8, 0xff, 0xff, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0e, 0x70, 0x80, 0x1f, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x18, 0x3e, 0x3f, 0x3f, 0x1f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x09, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        // clang-format on
+    };
+    return FRAMES[state];
+}
diff --git a/users/bcat/bcat_oled_pet_luna.c b/users/bcat/bcat_oled_pet_luna.c
new file mode 100644
index 0000000000..f0397c9c05
--- /dev/null
+++ b/users/bcat/bcat_oled_pet_luna.c
@@ -0,0 +1,168 @@
+/* Copyright 2021 HellSingCoder
+ * Copyright 2021 Jonathan Rascher
+ *
+ * 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/>.
+ */
+
+/* OLED pet "Luna" (animated doggo) originally by HellSingCoder
+ * (https://www.simonepellegrino.com/) and licensed under GPL v2.0, adapted to
+ * fit the OLED pet framework in bcat's userspace.
+ *
+ * The animation is 32x24 pixels (3 lines tall).
+ *
+ * Walks or runs in response to typing speed. Sneaks when Ctrl is pressed and
+ * barks when Caps Lock is on. Jumps when space is pressed.
+ *
+ * Original source:
+ * https://github.com/qmk/qmk_firmware/blob/6dfe915e26d7147e6c2bed495d3b01cf5b21e6ec/keyboards/sofle/keymaps/helltm/keymap.c
+ */
+
+#include "bcat_oled_pet.h"
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "bcat_oled.h"
+#include "keycode.h"
+#include "progmem.h"
+
+enum image {
+    IMAGE_IDLE,
+    IMAGE_WALK,
+    IMAGE_RUN,
+    IMAGE_SNEAK,
+    IMAGE_BARK,
+};
+
+typedef union {
+    oled_pet_state_t raw;
+    struct {
+        uint8_t image;
+        uint8_t frame;
+    };
+} luna_state_t;
+
+#define NUM_FRAMES 2
+#define FRAME_BYTES 96 /* (32 pixel) * (24 pixel) / (8 pixel/byte) */
+
+uint16_t oled_pet_frame_bytes(void) { return FRAME_BYTES; }
+uint8_t  oled_pet_frame_lines(void) { return 3 /* (24 pixel) / (8 pixel/line) */; }
+bool     oled_pet_can_jump(void) { return true; }
+
+uint16_t oled_pet_update_millis(const oled_keyboard_state_t *keyboard_state) { return 200; }
+
+oled_pet_state_t oled_pet_next_state(oled_pet_state_t state, const oled_keyboard_state_t *keyboard_state) {
+    luna_state_t luna_state = {.raw = state};
+    if (keyboard_state->leds.caps_lock) {
+        luna_state.image = IMAGE_BARK;
+    } else if (keyboard_state->mods & MOD_MASK_CTRL) {
+        luna_state.image = IMAGE_SNEAK;
+    } else if (keyboard_state->wpm >= 100) {
+        luna_state.image = IMAGE_RUN;
+    } else if (keyboard_state->wpm >= 25) {
+        luna_state.image = IMAGE_WALK;
+    } else {
+        luna_state.image = IMAGE_IDLE;
+    }
+    luna_state.frame = (luna_state.frame + 1) % NUM_FRAMES;
+    return luna_state.raw;
+}
+
+void oled_pet_post_render(uint8_t col, uint8_t line, const oled_keyboard_state_t *keyboard_state, bool redraw) {}
+
+const char *oled_pet_frame(oled_pet_state_t state) {
+    static const char PROGMEM IDLE_FRAMES[NUM_FRAMES][FRAME_BYTES] = {
+        // clang-format off
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x68, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28, 0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x90, 0x08, 0x18, 0x60, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28, 0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        // clang-format on
+    };
+    static const char PROGMEM WALK_FRAMES[NUM_FRAMES][FRAME_BYTES] = {
+        // clang-format off
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x90, 0x90, 0x90, 0xa0, 0xc0, 0x80, 0x80, 0x80, 0x70, 0x08, 0x14, 0x08, 0x90, 0x10, 0x10, 0x08, 0xa4, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, 0xea, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x03, 0x06, 0x18, 0x20, 0x20, 0x3c, 0x0c, 0x12, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x20, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x28, 0x10, 0x20, 0x20, 0x20, 0x10, 0x48, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x20, 0xf8, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x30, 0xd5, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x02, 0x1c, 0x14, 0x08, 0x10, 0x20, 0x2c, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        // clang-format on
+    };
+    static const char PROGMEM RUN_FRAMES[NUM_FRAMES][FRAME_BYTES] = {
+        // clang-format off
+        {
+            0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x08, 0xc8, 0xb0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0xc4, 0xa4, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x58, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x09, 0x04, 0x04, 0x04, 0x04, 0x02, 0x03, 0x02, 0x01, 0x01, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        {
+            0x00, 0x00, 0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x78, 0x28, 0x08, 0x10, 0x20, 0x30, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xb0, 0x50, 0x55, 0x20, 0x1f, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x1e, 0x20, 0x20, 0x18, 0x0c, 0x14, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        // clang-format on
+    };
+    static const char PROGMEM SNEAK_FRAMES[NUM_FRAMES][FRAME_BYTES] = {
+        // clang-format off
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x40, 0x80, 0x00, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x1e, 0x21, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x04, 0x04, 0x04, 0x03, 0x01, 0x00, 0x00, 0x09, 0x01, 0x80, 0x80, 0xab, 0x04, 0xf8, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x02, 0x06, 0x18, 0x20, 0x20, 0x38, 0x08, 0x10, 0x18, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
+        },
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xa0, 0x20, 0x40, 0x80, 0xc0, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x3e, 0x41, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x40, 0x40, 0x55, 0x82, 0x7c, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x04, 0x18, 0x10, 0x08, 0x10, 0x20, 0x28, 0x34, 0x06, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        // clang-format on
+    };
+    static const char PROGMEM BARK_FRAMES[NUM_FRAMES][FRAME_BYTES] = {
+        // clang-format off
+        {
+            0x00, 0xc0, 0x20, 0x10, 0xd0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x48, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        {
+            0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x2c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x48, 0x28, 0x2a, 0x10, 0x0f, 0x20, 0x4a, 0x09, 0x10,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+        // clang-format on
+    };
+    luna_state_t luna_state = {.raw = state};
+    switch (luna_state.image) {
+        case IMAGE_WALK:
+            return WALK_FRAMES[luna_state.frame];
+        case IMAGE_RUN:
+            return RUN_FRAMES[luna_state.frame];
+        case IMAGE_SNEAK:
+            return SNEAK_FRAMES[luna_state.frame];
+        case IMAGE_BARK:
+            return BARK_FRAMES[luna_state.frame];
+        default:
+            return IDLE_FRAMES[luna_state.frame];
+    }
+}
diff --git a/users/bcat/bcat_rgblight.c b/users/bcat/bcat_rgblight.c
new file mode 100644
index 0000000000..cd6222262b
--- /dev/null
+++ b/users/bcat/bcat_rgblight.c
@@ -0,0 +1,22 @@
+/* Copyright 2021 Jonathan Rascher
+ *
+ * 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 <stdint.h>
+
+#include "progmem.h"
+
+/* Adjust RGB static hue ranges for shorter gradients than default. */
+const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 127, 63, 31, 15};
diff --git a/users/bcat/compile.sh b/users/bcat/compile.sh
new file mode 100755
index 0000000000..81551f0ec0
--- /dev/null
+++ b/users/bcat/compile.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+set -o errexit -o nounset
+
+usage () {
+  printf "\
+usage: ./users/bcat/compile.sh [-c] [-j N]
+
+Compiles all keyboards for which bcat maintains keymaps.
+
+optional arguments:
+  -c                    performs a clean build
+  -j N                  runs N make tasks in parallel
+  -v                    shows verbose output
+"
+}
+
+compile () {
+    local keyboard=$1 layout=${2:-}
+    FORCE_LAYOUT="$layout" SILENT="$opt_silent" make -j "$opt_parallel" "$keyboard":bcat
+}
+
+opt_parallel=1
+opt_silent=true
+
+while getopts :chj:v opt; do
+  case $opt in
+    c) opt_clean=1 ;;
+    j) opt_parallel=$OPTARG ;;
+    v) opt_silent=false ;;
+    h) usage; exit 0 ;;
+    \?) usage >&2; exit 2 ;;
+  esac
+done
+
+if [[ -n ${opt_clean:-} ]]; then
+  SILENT="$opt_silent" make clean
+fi
+
+compile 9key
+compile ai03/polaris 60_tsangan_hhkb
+compile cannonkeys/an_c 60_tsangan_hhkb
+compile cannonkeys/instant60 60_tsangan_hhkb
+compile crkbd/rev1 split_3x6_3
+compile dz60 60_ansi_split_bs_rshift
+compile dz60 60_tsangan_hhkb
+compile eco/rev2
+compile kbdfans/kbd67/hotswap 65_ansi_blocker_split_bs
+compile keebio/bdn9/rev1
+compile keebio/quefrency/rev1
+compile lily58/rev1
diff --git a/users/bcat/config.h b/users/bcat/config.h
index 5bb93f3833..7bb5d71bae 100644
--- a/users/bcat/config.h
+++ b/users/bcat/config.h
@@ -14,6 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/* Enable NKRO by default. All my devices support this, and it enables me to
+ * dispense with the NK_TOGG key, thus saving firmware space by not compiling
+ * magic keycode support.
+ */
+#define FORCE_NKRO
+
 /* Wait between tap_code register and unregister to fix flaky media keys. */
 #undef TAP_CODE_DELAY
 
@@ -31,6 +37,22 @@
  */
 #define TAPPING_FORCE_HOLD
 
+#if defined(OLED_ENABLE)
+/* The built-in OLED timeout wakes the OLED screen every time the buffer is
+ * updated, even if no user activity has occurred recently. This prevents the
+ * OLED from ever turning off during a continuously running animation. To avoid
+ * this, we disable the default timeout and implement our own in
+ * oled_task_user.
+ */
+#    undef OLED_TIMEOUT
+#    define OLED_DISABLE_TIMEOUT
+
+#    if defined(SPLIT_KEYBOARD)
+/* Sync OLED on/off state between halves of split keyboards. */
+#        define SPLIT_OLED_ENABLE
+#    endif
+#endif
+
 #if defined(RGB_MATRIX_ENABLE)
 /* Turn off per-key RGB when the host goes to sleep. */
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
@@ -46,9 +68,42 @@
 #    define RGB_MATRIX_VAL_STEP 17
 #    define RGB_MATRIX_SPD_STEP 17
 
-/* Turn on additional RGB animations. */
+/* Enable specific per-key animation modes. */
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+
+/* Enable additional per-key animation modes that require a copy of the
+ * framebuffer (with accompanying storage cost).
+ */
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGB_MATRIX_KEYPRESSES
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #endif
 
 #if defined(RGBLIGHT_ENABLE)
@@ -64,8 +119,18 @@
 #    define RGBLIGHT_SAT_STEP 17
 #    define RGBLIGHT_VAL_STEP 17
 
-/* Turn on additional RGB animations. */
-#    define RGBLIGHT_ANIMATIONS
+/* Enable specific underglow animation modes. (Skip TWINKLE because it seems to
+ * be broken on ARM: https://github.com/qmk/qmk_firmware/issues/15345.)
+ */
+#    define RGBLIGHT_EFFECT_ALTERNATING
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_KNIGHT
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_SNAKE
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #endif
 
 #if defined(BACKLIGHT_ENABLE)
@@ -77,3 +142,9 @@
 
 #    define BACKLIGHT_LEVELS 7
 #endif
+
+/* Turn off unused config options to reduce firmware size. */
+#define LAYER_STATE_8BIT
+#define NO_ACTION_ONESHOT
+#undef LOCKING_RESYNC_ENABLE
+#undef LOCKING_SUPPORT_ENABLE
diff --git a/users/bcat/readme.md b/users/bcat/readme.md
index 1922f95f4a..bb73a53bf8 100644
--- a/users/bcat/readme.md
+++ b/users/bcat/readme.md
@@ -6,6 +6,8 @@ keyboard-specific keymaps for boards without standard layout support. I derive
 my keymaps from two canonical ones (preferred for typing and gaming,
 respectively).
 
+You can build all keymaps I maintain at once using `./users/bcat/compile.sh`.
+
 ## Canonical keymaps
 
 * [Split 3x6 + 3 thumb
diff --git a/users/bcat/rules.mk b/users/bcat/rules.mk
index 12c9a89bf4..bb4bb11d88 100644
--- a/users/bcat/rules.mk
+++ b/users/bcat/rules.mk
@@ -1,7 +1,10 @@
-SRC += bcat.c
-
-# Enable Bootmagic Lite to consistently reset to bootloader and clear EEPROM.
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+# Enable Bootmagic Lite for keyboards that don't have an easily accessible
+# reset button, but keep it disabled for all others to reduce firmware size.
+ifneq ($(filter $(strip $(KEYBOARD)),ai03/polaris dz60 kbdfans/kbd67/hotswap),)
+	BOOTMAGIC_ENABLE = yes
+else
+	BOOTMAGIC_ENABLE = no
+endif
 
 # Enable media keys on all keyboards.
 EXTRAKEY_ENABLE = yes
@@ -16,21 +19,49 @@ NKRO_ENABLE = yes
 # Enable link-time optimization to reduce binary size.
 LTO_ENABLE = yes
 
-# Disable unused build options on all keyboards.
+# Include common utilities shared across all our keymaps.
+SRC += bcat.c
+
+# Include additional utilities that extend optional QMK features only enabled
+# on some keyboards.
+ifeq ($(strip $(OLED_ENABLE)), yes)
+	SRC += bcat_oled.c
+	WPM_ENABLE = yes  # for WPM and animated "keyboard pet" widgets
+
+	# OLED pets (animated critters that react to typing) take up a lot of
+	# firmware space, so only compile one, and only if requested.
+	BCAT_OLED_PET ?= no
+	ifneq ($(strip $(BCAT_OLED_PET)), no)
+		SRC += bcat_oled_pet_$(strip $(BCAT_OLED_PET)).c
+		OPT_DEFS += -DBCAT_OLED_PET
+	endif
+endif
+
+ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
+	SRC += bcat_rgblight.c
+endif
+
+# Disable unwanted build options on all keyboards. (Mouse keys are turned off
+# due to https://github.com/qmk/qmk_firmware/issues/8323, and the rest are
+# turned off to reduce firmware size.)
 COMMAND_ENABLE = no
 CONSOLE_ENABLE = no
 MOUSEKEY_ENABLE = no
 TERMINAL_ENABLE = no
 
-# Disable unused hardware options on all keyboards.
+# Disable unwanted hardware options on all keyboards. (Some keyboards turn
+# these features on by default even though they aren't actually required.)
 MIDI_ENABLE = no
 SLEEP_LED_ENABLE = no
 
 # Disable other unused options on all keyboards.
 AUTO_SHIFT_ENABLE = no
 COMBO_ENABLE = no
+GRAVE_ESC_ENABLE = no
 KEY_LOCK_ENABLE = no
 LEADER_ENABLE = no
+MAGIC_ENABLE = no
+SPACE_CADET_ENABLE = no
 SWAP_HANDS_ENABLE = no
 TAP_DANCE_ENABLE = no
 UCIS_ENABLE = no

From 7d15bc7a92808e68b4f31b58d925469a3de84a82 Mon Sep 17 00:00:00 2001
From: gtips <51393966+gtips@users.noreply.github.com>
Date: Mon, 27 Dec 2021 12:47:50 +0900
Subject: [PATCH 078/867] [Keyboard] Add keyboard reviung53 (#15390)

* add keyboards/reviung53/

* modified:   keyboards/reviung53/rules.mk

* modified:   keyboards/reviung53/keymaps/default/keymap.c, keyboards/reviung53/keymaps/via/keymap.c

* modified:   keyboards/reviung53/readme.md

* modified:   keyboards/reviung53/config.h
---
 keyboards/reviung53/config.h                  | 138 ++++++++++++++++++
 keyboards/reviung53/info.json                 |  68 +++++++++
 keyboards/reviung53/keymaps/default/keymap.c  |  55 +++++++
 keyboards/reviung53/keymaps/default/readme.md |   1 +
 keyboards/reviung53/keymaps/via/keymap.c      |  55 +++++++
 keyboards/reviung53/keymaps/via/readme.md     |   3 +
 keyboards/reviung53/keymaps/via/rules.mk      |   1 +
 keyboards/reviung53/readme.md                 |  27 ++++
 keyboards/reviung53/reviung53.c               |   4 +
 keyboards/reviung53/reviung53.h               |  30 ++++
 keyboards/reviung53/rules.mk                  |  19 +++
 11 files changed, 401 insertions(+)
 create mode 100644 keyboards/reviung53/config.h
 create mode 100644 keyboards/reviung53/info.json
 create mode 100644 keyboards/reviung53/keymaps/default/keymap.c
 create mode 100644 keyboards/reviung53/keymaps/default/readme.md
 create mode 100644 keyboards/reviung53/keymaps/via/keymap.c
 create mode 100644 keyboards/reviung53/keymaps/via/readme.md
 create mode 100644 keyboards/reviung53/keymaps/via/rules.mk
 create mode 100644 keyboards/reviung53/readme.md
 create mode 100644 keyboards/reviung53/reviung53.c
 create mode 100644 keyboards/reviung53/reviung53.h
 create mode 100644 keyboards/reviung53/rules.mk

diff --git a/keyboards/reviung53/config.h b/keyboards/reviung53/config.h
new file mode 100644
index 0000000000..d73e6eab8a
--- /dev/null
+++ b/keyboards/reviung53/config.h
@@ -0,0 +1,138 @@
+// Copyright 2021 gtips (@gtips)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x4E94
+#define PRODUCT_ID   0x4E09
+#define DEVICE_VER   0x0001
+#define MANUFACTURER gtips
+#define PRODUCT      reviung53
+
+/* key matrix size */
+#define MATRIX_ROWS 7
+#define MATRIX_COLS 8
+
+/*
+ * 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 { D0, D4, C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+#define RGBLED_NUM 10
+#define RGBLIGHT_HUE_STEP 16
+#define RGBLIGHT_SAT_STEP 16
+#define RGBLIGHT_VAL_STEP 16
+#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+#define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/reviung53/info.json b/keyboards/reviung53/info.json
new file mode 100644
index 0000000000..ff63de5bc8
--- /dev/null
+++ b/keyboards/reviung53/info.json
@@ -0,0 +1,68 @@
+{
+    "keyboard_name": "reviung53",
+    "url": "",
+    "maintainer": "gtips",
+    "layouts": {
+        "LAYOUT_reviung53": {
+            "layout": [
+                {"label": "k02", "x":2.25,  "y":0},
+                {"label": "k03", "x":3.5,   "y":0},
+                {"label": "k04", "x":4.5,   "y":0},
+                {"label": "k05", "x":5.5,   "y":0},
+                {"label": "k06", "x":6.5,   "y":0},
+                {"label": "k07", "x":7.75,  "y":0},
+                {"label": "k40", "x":8.75,  "y":0},
+                {"label": "k41", "x":9.75,  "y":0},
+                {"label": "k42", "x":10.75, "y":0},
+                {"label": "k43", "x":12,    "y":0},
+
+                {"label": "k10", "x":0,     "y":1.25, "w":1.5},
+                {"label": "k11", "x":1.5,   "y":1.25},
+                {"label": "k12", "x":2.5,   "y":1.25},
+                {"label": "k13", "x":3.5,   "y":1.25},
+                {"label": "k14", "x":4.5,   "y":1.25},
+                {"label": "k15", "x":5.5,   "y":1.25},
+                {"label": "k16", "x":6.5,   "y":1.25},
+                {"label": "k17", "x":7.5,   "y":1.25},
+                {"label": "k44", "x":8.5,   "y":1.25},
+                {"label": "k45", "x":9.5,   "y":1.25},
+                {"label": "k46", "x":10.5,  "y":1.25},
+                {"label": "k47", "x":11.5,  "y":1.25, "w":1.5},
+
+                {"label": "k20", "x":0,     "y":2.25, "w":1.75},
+                {"label": "k21", "x":1.75,  "y":2.25},
+                {"label": "k22", "x":2.75,  "y":2.25},
+                {"label": "k23", "x":3.75,  "y":2.25},
+                {"label": "k24", "x":4.75,  "y":2.25},
+                {"label": "k25", "x":5.75,  "y":2.25},
+                {"label": "k26", "x":6.75,  "y":2.25},
+                {"label": "k27", "x":7.75,  "y":2.25},
+                {"label": "k50", "x":8.75,  "y":2.25},
+                {"label": "k51", "x":9.75,  "y":2.25},
+                {"label": "k52", "x":10.75, "y":2.25},
+                {"label": "k53", "x":11.75, "y":2.25, "w":1.25},
+
+                {"label": "k30", "x":0,     "y":3.25, "w":2.25},
+                {"label": "k31", "x":2.25,  "y":3.25},
+                {"label": "k32", "x":3.25,  "y":3.25},
+                {"label": "k33", "x":4.25,  "y":3.25},
+                {"label": "k34", "x":5.25,  "y":3.25},
+                {"label": "k35", "x":6.25,  "y":3.25},
+                {"label": "k36", "x":7.25,  "y":3.25},
+                {"label": "k37", "x":8.25,  "y":3.25},
+                {"label": "k54", "x":9.25,  "y":3.25},
+                {"label": "k55", "x":10.25, "y":3.25},
+                {"label": "k56", "x":11.25, "y":3.25, "w":1.75},
+
+                {"label": "k60", "x":0,     "y":4.25, "w":1.5},
+                {"label": "k61", "x":1.5,   "y":4.25, "w":1.25},
+                {"label": "k62", "x":2.75,  "y":4.25, "w":1.25},
+                {"label": "k63", "x":4,     "y":4.25, "w":2.75},
+                {"label": "k64", "x":6.75,  "y":4.25, "w":2.25},
+                {"label": "k65", "x":9,     "y":4.25, "w":1.25},
+                {"label": "k66", "x":10.25, "y":4.25, "w":1.25},
+                {"label": "k67", "x":11.5,  "y":4.25, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/reviung53/keymaps/default/keymap.c b/keyboards/reviung53/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a8d95d70d5
--- /dev/null
+++ b/keyboards/reviung53/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+// Copyright 2021 gtips (@gtips)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+	_BASE,
+	_LOWER,
+	_RAISE,
+	_ADJUST
+};
+
+#define LOWER  MO(_LOWER)
+#define RAISE  MO(_RAISE)
+#define ADJUST MO(_ADJUST)
+
+#define SF_SS RSFT_T(KC_SLSH)
+#define SP_LO LT(LOWER, KC_SPC)
+#define SP_RA LT(RAISE, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[_BASE] = LAYOUT_reviung53(
+                        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_DEL,
+    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_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_ENT,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,             SF_SS,
+    KC_LCTL,  KC_LGUI,  KC_LALT,               SP_LO,                   SP_RA,                KC_LALT,  KC_RGUI,  KC_RCTL
+	),
+	[_LOWER] = LAYOUT_reviung53(
+                        KC_GESC,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_PAUS,  KC_SLCK,  KC_PSCR,  _______,
+    _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
+    _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  XXXXXXX,  KC_QUOT,
+    _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,            KC_SLSH,
+    _______,  _______,  _______,               _______,                 _______,              _______,  _______,  _______
+	),
+	[_RAISE] = LAYOUT_reviung53(
+                        KC_TILD,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_MUTE,  KC_VOLU,  KC_VOLD,  KC_MPLY,  _______,
+    _______,  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_LBRC,  KC_RBRC,  KC_BSLS,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_DQUO,
+    _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            KC_QUES,
+    _______,  _______,  _______,               _______,                 _______,              _______,  _______,  _______
+	),
+	[_ADJUST] = LAYOUT_reviung53(
+                        XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  RESET,
+    RGB_VAI,   RGB_SAI, RGB_HUI,  RGB_MOD,  XXXXXXX,  RGB_TOG,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+    RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            XXXXXXX,
+    XXXXXXX,  XXXXXXX,  XXXXXXX,               _______,                 _______,              XXXXXXX,  XXXXXXX,  XXXXXXX
+	),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/keyboards/reviung53/keymaps/default/readme.md b/keyboards/reviung53/keymaps/default/readme.md
new file mode 100644
index 0000000000..1e473c9a74
--- /dev/null
+++ b/keyboards/reviung53/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for reviung53
diff --git a/keyboards/reviung53/keymaps/via/keymap.c b/keyboards/reviung53/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a8d95d70d5
--- /dev/null
+++ b/keyboards/reviung53/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+// Copyright 2021 gtips (@gtips)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+	_BASE,
+	_LOWER,
+	_RAISE,
+	_ADJUST
+};
+
+#define LOWER  MO(_LOWER)
+#define RAISE  MO(_RAISE)
+#define ADJUST MO(_ADJUST)
+
+#define SF_SS RSFT_T(KC_SLSH)
+#define SP_LO LT(LOWER, KC_SPC)
+#define SP_RA LT(RAISE, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[_BASE] = LAYOUT_reviung53(
+                        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_DEL,
+    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_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_ENT,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,             SF_SS,
+    KC_LCTL,  KC_LGUI,  KC_LALT,               SP_LO,                   SP_RA,                KC_LALT,  KC_RGUI,  KC_RCTL
+	),
+	[_LOWER] = LAYOUT_reviung53(
+                        KC_GESC,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_PAUS,  KC_SLCK,  KC_PSCR,  _______,
+    _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
+    _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  XXXXXXX,  KC_QUOT,
+    _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,            KC_SLSH,
+    _______,  _______,  _______,               _______,                 _______,              _______,  _______,  _______
+	),
+	[_RAISE] = LAYOUT_reviung53(
+                        KC_TILD,  KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_MUTE,  KC_VOLU,  KC_VOLD,  KC_MPLY,  _______,
+    _______,  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_LBRC,  KC_RBRC,  KC_BSLS,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  KC_DQUO,
+    _______,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            KC_QUES,
+    _______,  _______,  _______,               _______,                 _______,              _______,  _______,  _______
+	),
+	[_ADJUST] = LAYOUT_reviung53(
+                        XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  RESET,
+    RGB_VAI,   RGB_SAI, RGB_HUI,  RGB_MOD,  XXXXXXX,  RGB_TOG,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+    RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
+    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,            XXXXXXX,
+    XXXXXXX,  XXXXXXX,  XXXXXXX,               _______,                 _______,              XXXXXXX,  XXXXXXX,  XXXXXXX
+	),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/keyboards/reviung53/keymaps/via/readme.md b/keyboards/reviung53/keymaps/via/readme.md
new file mode 100644
index 0000000000..9b299ba286
--- /dev/null
+++ b/keyboards/reviung53/keymaps/via/readme.md
@@ -0,0 +1,3 @@
+# The default keymap for reviung53
+
+For use with VIA configurator and compatible keymap editors.  
\ No newline at end of file
diff --git a/keyboards/reviung53/keymaps/via/rules.mk b/keyboards/reviung53/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/reviung53/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/reviung53/readme.md b/keyboards/reviung53/readme.md
new file mode 100644
index 0000000000..a2bfbcdbc2
--- /dev/null
+++ b/keyboards/reviung53/readme.md
@@ -0,0 +1,27 @@
+# reviung53
+
+![reviung53](https://github.com/gtips/reviung/blob/master/reviung53/image/reviung53-04.jpg) 
+
+The REVIUNG53 is 53-key keyboard.
+
+* Keyboard Maintainer: [gtips](https://github.com/gtips)
+* Hardware Supported: REVIUNG53 PCB. 
+* Hardware Availability: [PCB & Case Data](https://github.com/gtips/reviung/tree/master/reviung53) 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make reviung53:default
+
+Flashing example for this keyboard:
+
+    make reviung53:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/reviung53/reviung53.c b/keyboards/reviung53/reviung53.c
new file mode 100644
index 0000000000..e2190aeccf
--- /dev/null
+++ b/keyboards/reviung53/reviung53.c
@@ -0,0 +1,4 @@
+// Copyright 2021 gtips (@gtips)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "reviung53.h"
diff --git a/keyboards/reviung53/reviung53.h b/keyboards/reviung53/reviung53.h
new file mode 100644
index 0000000000..89ebc45c18
--- /dev/null
+++ b/keyboards/reviung53/reviung53.h
@@ -0,0 +1,30 @@
+// Copyright 2021 gtips (@gtips)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_reviung53( \
+              K02, K03, K04, K05, K06, K07, K40, K41, K42, K43,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K44, K45, K46, K47, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K50, K51, K52, K53, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K54, K55, K56,\
+    K60, K61, K62, K63, K64, K65, K66, K67 \
+) { \
+    { KC_NO, KC_NO, 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,   K47 }, \
+    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   KC_NO }, \
+    { K60,   K61,   K62,   K63,   K64,   K65,   K66,   K67 } \
+}
diff --git a/keyboards/reviung53/rules.mk b/keyboards/reviung53/rules.mk
new file mode 100644
index 0000000000..90670e4b9e
--- /dev/null
+++ b/keyboards/reviung53/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# 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 = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From dfa39c0451c12b579624b3cd950922f20b07c05f Mon Sep 17 00:00:00 2001
From: br <brian@recchia.name>
Date: Sun, 26 Dec 2021 23:00:53 -0500
Subject: [PATCH 079/867] add my keymap (#15211)

* cleaned up for pr

* Update keyboards/massdrop/alt/keymaps/b/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/massdrop/alt/keymaps/b/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/massdrop/alt/keymaps/b/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* SPDX copyright header

* renamed keymap folder to b_

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/massdrop/alt/keymaps/b_/config.h | 121 +++++++++++++++++++++
 keyboards/massdrop/alt/keymaps/b_/keymap.c |  50 +++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 keyboards/massdrop/alt/keymaps/b_/config.h
 create mode 100644 keyboards/massdrop/alt/keymaps/b_/keymap.c

diff --git a/keyboards/massdrop/alt/keymaps/b_/config.h b/keyboards/massdrop/alt/keymaps/b_/config.h
new file mode 100644
index 0000000000..89d19f99a5
--- /dev/null
+++ b/keyboards/massdrop/alt/keymaps/b_/config.h
@@ -0,0 +1,121 @@
+// Copyright 2021 Your Name (@b-)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+
+#define MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
+#define MODS_CTRL   (get_mods() & MOD_MASK_CTRL)
+#define MODS_ALT    (get_mods() & MOD_MASK_ALT)
+
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)      // Key combination that allows the use of magic commands (useful for debugging)
+
+// #define NO_DEBUG                    			// Disable debugging
+// #define NO_PRINT                    			// Disable printing/debugging using hid_listen
+// #define NO_ACTION_LAYER             			// Disable layers
+// #define NO_ACTION_TAPPING           			// Disable tap dance and other tapping features
+// #define NO_ACTION_ONESHOT           			// Disable one-shot modifiers
+// #define NO_ACTION_MACRO             			// Disable old style macro handling: MACRO() & action_get_macro
+// #define TERMINAL_HELP
+// #define MOUSEKEY_INTERVAL 20
+// #define MOUSEKEY_DELAY 0
+// #define MOUSEKEY_TIME_TO_MAX 60
+// #define MOUSEKEY_MAX_SPEED 10
+// #define MOUSEKEY_WHEEL_DELAY 0
+//#define FORCE_NKRO                  			// NKRO by default requires to be turned on, this forces it on during keyboard startup regardless of EEPROM setting. NKRO can still be turned off but will be turned on again if the keyboard reboots.
+// #define QMK_KEYS_PER_SCAN 4         			// Allows sending more than one key per scan. By default, only one key event gets sent via process_record() per scan. This has little impact on most typing, but if you're doing a lot of chords, or your scan rate is slow to begin with, you can have some delay in processing key events. Each press and release is a separate event. For a keyboard with 1ms or so scan times, even a very fast typist isn't going to produce the 500 keystrokes a second needed to actually get more than a few ms of delay from this. But if you're doing chording on something with 3-4ms scan times? You probably want this.
+// #define STRICT_LAYER_RELEASE        			// Force a key release to be evaluated using the current layer stack instead of remembering which layer it came from (used for advanced cases)
+// #define LOCKING_SUPPORT_ENABLE      			// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
+// #define LOCKING_RESYNC_ENABLE       			// Tries to keep switch state consistent with keyboard LED state
+// #define TAPPING_TERM 200            			// How long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
+// #define TAPPING_TERM_PER_KEY        			// Enabling to allow to tweak individual keys
+// #define RETRO_TAPPING               			// Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
+// #define TAPPING_TOGGLE 2            			// How many taps before triggering the toggle
+// #define PERMISSIVE_HOLD             			// Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
+// #define IGNORE_MOD_TAP_INTERRUPT    			// Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
+// #define TAPPING_FORCE_HOLD          			// Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
+// #define LEADER_TIMEOUT 300          			// How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
+// #define LEADER_PER_KEY_TIMING       			// Sets the timer for leader key chords to run on each key press rather than overall
+// #define LEADER_KEY_STRICT_KEY_PROCESSING    	// Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
+// #define ONESHOT_TIMEOUT 3000         		// How long before oneshot times out
+// #define ONESHOT_TAP_TOGGLE 2        			// How many taps before oneshot toggle is triggered
+// #define COMBO_COUNT 2               			// Set this to the number of combos that you're using in the Combo feature.
+// #define COMBO_TERM 200              			// How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
+// #define TAP_CODE_DELAY 100          			// Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
+#define TAP_CODE_DELAY 25          			// Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
+// #define TAP_HOLD_CAPS_DELAY 80      			// Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPSLOCK keycode, as this has some special handling on MacOS.  The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES         			// reacts to keypresses
+// #define RGB_MATRIX_KEYRELEASES        		// reacts to keyreleases (instead of keypresses)
+
+
+
+//Teal and Blue
+//#define RGB_MATRIX_STARTUP_HUE 127 			// Default boot color
+//#define RGB_MATRIX_STARTUP_SPD 47 			// Used to determine the color for the modifiers
+
+//Teal and Blue
+//#define RGB_MATRIX_STARTUP_HUE 120 			// Default boot color
+//#define RGB_MATRIX_STARTUP_SPD 50 			//Used to determine the color for the modifiers
+
+
+//QMK HSV is based on 255 value wheel rather than 360
+
+//Cyan and Yellow
+//#define RGB_MATRIX_STARTUP_HUE 127 			// Default boot color
+//#define RGB_MATRIX_STARTUP_SPD 177
+
+//Cyan and Green
+//#define RGB_MATRIX_STARTUP_HUE 127 			// Default boot color
+//#define RGB_MATRIX_STARTUP_SPD 215
+
+// #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE  	// Sets the default mode, if none has been set
+#define RGB_MATRIX_STARTUP_HUE 180  //purple  alphas with green background when pressed.
+
+// This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/massdrop/alt/keymaps/b_/keymap.c b/keyboards/massdrop/alt/keymaps/b_/keymap.c
new file mode 100644
index 0000000000..8c10649a03
--- /dev/null
+++ b/keyboards/massdrop/alt/keymaps/b_/keymap.c
@@ -0,0 +1,50 @@
+// Copyright 2021 Your Name (@b-)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+/* physical layout
+ * [ ` ]  [ 1 ]  [ 2 ]  [ 3 ]  [ 4 ]  [ 5 ]  [ 6 ]  [ 7 ]  [ 8 ]  [ 9 ]  [ 0 ]  [ - ]  [ = ]  [ bksp ] [ del ]
+ * [ tab* ]  [ q ]  [ w ]  [ e ]  [ r ]  [ t ]  [ y ]  [ u ]  [ i ]  [ o ]  [ p ]  [ [ ]  [ ] ]  [ home ]
+ * [ ctrl* ]  [ a ]  [ s ]  [ d ]  [ f ]  [ g ]  [ h ]  [ j ]  [ k ]  [ l ]  [ ; ]  [ ' ]  [ enter ]  [ PgUp ]
+ * [ lshift* ]  [ z ]  [ x ]  [ c ]  [ v ]  [ b ]  [ n ]  [ m ]  [ , ]  [ . ]  [ / ]  [ rshift* ] ]  [ ↑ ]  [ PgDn ]
+ * [ ctrl ]  [ alt ]  [ meta ]  [              spaaaaaaaace             ]  [ meta ]  [ alt ]  [ ← ]  [ ↓ ]  [ → ]
+ */
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_65_ansi_blocker( /* normal */
+      KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,  /* 15 */
+      LT(1,KC_TAB), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_HOME, /* 15 */
+      LCTL_T(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_ENT, KC_PGUP, /* 14 */
+      LM(2, MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, LM(2, MOD_LSFT), KC_UP, KC_PGDN, /* 14 */
+      KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT /* 9 */
+      ),
+	[1] = LAYOUT_65_ansi_blocker( /* hold tab */
+      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_TRNS, KC_MUTE, 
+      KC_TRNS, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, BL_INC, BL_DEC, BL_BRTG, BL_STEP, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_END, 
+      MO(3), RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, 
+      KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, MO(4), NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_VOLD, 
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END // fn layer. f keys, media keys, backlight control, nkro-toggle, etc.
+      ),
+	[2] = LAYOUT_65_ansi_blocker( /* lshift + rshift = caps lock */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+      KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, 
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS // this feels like a kludge...but it works
+      ),
+	[3] = LAYOUT_65_ansi_blocker( /* tab+ctrl */
+      KC_EXEC, KC_HELP, KC_MENU, KC_SLCT, KC_STOP, KC_AGIN, KC_UNDO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_EJCT,
+      KC_NO, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+      KC_TRNS, BL_TOGG, BL_STEP, BL_BRTG, KC_FIND, BL_DEC, BL_INC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRIU,
+      KC_NO, KC_NO, KC_CUT, KC_COPY, KC_PSTE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MSTP, KC_BRID,
+      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MRWD, KC_MPLY, KC_MFFD // miscellaneous silly keys, subject to change
+      ),
+	[4] = LAYOUT_65_ansi_blocker( /* tab+b */
+      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, RESET, KC_TRNS, /* backspace */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS // tab + b + backspace goes to bootloader
+      )
+};
+

From bbd8f8e5847a54aa1604cd6b920115d2c5995951 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 27 Dec 2021 15:11:47 +1100
Subject: [PATCH 080/867] Fixup line endings

---
 keyboards/deltapad/deltapad.c | 34 ++++++++++-----------
 keyboards/deltapad/readme.md  | 56 +++++++++++++++++------------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/keyboards/deltapad/deltapad.c b/keyboards/deltapad/deltapad.c
index c5a6d866eb..ee9ac17c4a 100644
--- a/keyboards/deltapad/deltapad.c
+++ b/keyboards/deltapad/deltapad.c
@@ -1,17 +1,17 @@
-/* Copyright 2021 Richard Snijder
- *
- * 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 "deltapad.h"
+/* Copyright 2021 Richard Snijder
+ *
+ * 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 "deltapad.h"
diff --git a/keyboards/deltapad/readme.md b/keyboards/deltapad/readme.md
index ca44b2d7af..858f99b436 100644
--- a/keyboards/deltapad/readme.md
+++ b/keyboards/deltapad/readme.md
@@ -1,28 +1,28 @@
-# deltapad
-
-
-
-*A short description of the keyboard/project*
-
-A 4x4 keypad 
-
-* Keyboard Maintainer: [Richard Snijder](https://github.com/rich239)
-* Hardware Supported: Atmel 32u4 based keypads
-
-
-Make example for this keyboard (after setting up your build environment):
-
-    make deltapad:default
-
-Flashing example for this keyboard:
-
-    make deltapad:default:flash
-
-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).
-
-## Bootloader
-
-Enter the bootloader in the following way:
-
-* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-
+# deltapad
+
+
+
+*A short description of the keyboard/project*
+
+A 4x4 keypad 
+
+* Keyboard Maintainer: [Richard Snijder](https://github.com/rich239)
+* Hardware Supported: Atmel 32u4 based keypads
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make deltapad:default
+
+Flashing example for this keyboard:
+
+    make deltapad:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in the following way:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+

From 005290c6cf6ad2f960bff8cade10f1ba24596cbb Mon Sep 17 00:00:00 2001
From: br <brian@recchia.name>
Date: Sun, 26 Dec 2021 23:13:39 -0500
Subject: [PATCH 081/867] fixed "Your Name" in header (#15591)

* cleaned up for pr

* Update keyboards/massdrop/alt/keymaps/b/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/massdrop/alt/keymaps/b/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/massdrop/alt/keymaps/b/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* SPDX copyright header

* renamed keymap folder to b_

* Your Name

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/massdrop/alt/keymaps/b_/config.h | 2 +-
 keyboards/massdrop/alt/keymaps/b_/keymap.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/massdrop/alt/keymaps/b_/config.h b/keyboards/massdrop/alt/keymaps/b_/config.h
index 89d19f99a5..ca4424bd3f 100644
--- a/keyboards/massdrop/alt/keymaps/b_/config.h
+++ b/keyboards/massdrop/alt/keymaps/b_/config.h
@@ -1,4 +1,4 @@
-// Copyright 2021 Your Name (@b-)
+// Copyright 2021 br (@b-)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
diff --git a/keyboards/massdrop/alt/keymaps/b_/keymap.c b/keyboards/massdrop/alt/keymaps/b_/keymap.c
index 8c10649a03..8285d5108f 100644
--- a/keyboards/massdrop/alt/keymaps/b_/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/b_/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2021 Your Name (@b-)
+// Copyright 2021 br (@b-)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H

From c53ee0b3cef8d837304fc03bd57d579c01686fb8 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 27 Dec 2021 15:15:49 +1100
Subject: [PATCH 082/867] Fixup line endings

---
 keyboards/deltapad/deltapad.c | 34 ++++++++++-----------
 keyboards/deltapad/readme.md  | 56 +++++++++++++++++------------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/keyboards/deltapad/deltapad.c b/keyboards/deltapad/deltapad.c
index c5a6d866eb..ee9ac17c4a 100644
--- a/keyboards/deltapad/deltapad.c
+++ b/keyboards/deltapad/deltapad.c
@@ -1,17 +1,17 @@
-/* Copyright 2021 Richard Snijder
- *
- * 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 "deltapad.h"
+/* Copyright 2021 Richard Snijder
+ *
+ * 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 "deltapad.h"
diff --git a/keyboards/deltapad/readme.md b/keyboards/deltapad/readme.md
index ca44b2d7af..858f99b436 100644
--- a/keyboards/deltapad/readme.md
+++ b/keyboards/deltapad/readme.md
@@ -1,28 +1,28 @@
-# deltapad
-
-
-
-*A short description of the keyboard/project*
-
-A 4x4 keypad 
-
-* Keyboard Maintainer: [Richard Snijder](https://github.com/rich239)
-* Hardware Supported: Atmel 32u4 based keypads
-
-
-Make example for this keyboard (after setting up your build environment):
-
-    make deltapad:default
-
-Flashing example for this keyboard:
-
-    make deltapad:default:flash
-
-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).
-
-## Bootloader
-
-Enter the bootloader in the following way:
-
-* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-
+# deltapad
+
+
+
+*A short description of the keyboard/project*
+
+A 4x4 keypad 
+
+* Keyboard Maintainer: [Richard Snijder](https://github.com/rich239)
+* Hardware Supported: Atmel 32u4 based keypads
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make deltapad:default
+
+Flashing example for this keyboard:
+
+    make deltapad:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in the following way:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+

From 4d96e5322298c4e355b30723e4cf75bbf746addc Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 27 Dec 2021 16:36:52 +1100
Subject: [PATCH 083/867] More GPIO compilation fixes. (#15592)

---
 platforms/avr/drivers/serial.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platforms/avr/drivers/serial.c b/platforms/avr/drivers/serial.c
index 7a4e5e76e6..ab0b52afd1 100644
--- a/platforms/avr/drivers/serial.c
+++ b/platforms/avr/drivers/serial.c
@@ -16,6 +16,7 @@
 #include <util/delay.h>
 #include <stddef.h>
 #include <stdbool.h>
+#include "gpio.h"
 #include "serial.h"
 
 #ifdef SOFT_SERIAL_PIN

From 24f33460a22cd09a68e7e1120bb6c5a605bb34c8 Mon Sep 17 00:00:00 2001
From: Paul Ewers <ewersp@gmail.com>
Date: Mon, 27 Dec 2021 01:56:56 -0800
Subject: [PATCH 084/867] [Keymap] Adding 'super alt' keymap for Wuque ikki68
 Aurora (#14838)

* [Keymap] Adding personal keymap for ikki68 Aurora

* Add license headers

* Added support to toggle LED modes

* Added a toggleable layer for macOS (which swaps the GUI/ALT positions)
---
 .../ikki68_aurora/keymaps/ewersp/README.md    |  40 ++++
 .../ikki68_aurora/keymaps/ewersp/config.h     |  19 ++
 .../ikki68_aurora/keymaps/ewersp/keymap.c     | 215 ++++++++++++++++++
 .../ikki68_aurora/keymaps/ewersp/rules.mk     |   1 +
 4 files changed, 275 insertions(+)
 create mode 100644 keyboards/wuque/ikki68_aurora/keymaps/ewersp/README.md
 create mode 100644 keyboards/wuque/ikki68_aurora/keymaps/ewersp/config.h
 create mode 100644 keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
 create mode 100644 keyboards/wuque/ikki68_aurora/keymaps/ewersp/rules.mk

diff --git a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/README.md b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/README.md
new file mode 100644
index 0000000000..3e84b4ee60
--- /dev/null
+++ b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/README.md
@@ -0,0 +1,40 @@
+## Greetings, Traveler!
+
+This layout is for the [Wuque ikki68 Aurora](https://shop.wuquestudio.com/pages/ikki68-aurora) and is primarily meant for Windows.
+
+The keymap is similar to the default keymap for the Aurora, but it overloads the left alt key to behave like an additional 'Fn' key while keeping the standard functionality of the alt key intact.
+
+### For Example
+```
+LeftAlt + 1...N         -> F1...FN
+LeftAlt + L/R Arrows    -> Home/End
+LeftAlt + Home          -> End
+LeftAlt + Backspace     -> Delete
+LeftAlt + Esc           -> Backtick (`)
+LeftAlt + Shift + Esc   -> Tilde (~)
+LeftAlt + LeftShift + 4 -> Alt+F4
+```
+
+The novel part of this keymap is that it **preserves the default functionality** of the left alt key, so ```'alt + tab', 'ctrl + alt + del', 'alt + f4'```, etc. all work as expected without having to use timers.
+
+Everything also works with other modifier keys, so ```'alt + L/R' and 'alt + shift + L/R'``` work great for text manipulation to select lines.
+
+This **super alt** keymap will feel very familiar for anyone **coming from macOS** since the Windows alt key is in the same position as CMD on macOS keyboards.
+
+And finally, the original alt key functionality can be toggled at any time by pressing ```'Fn + period'``` so for example if a game requires use of the left alt, you can easily turn it off.
+
+### Toggle LED Modes
+You can also cycle though multiple LED modes (underglow, logo, all, none) by pressing ```'Fn + x'``` (the default ikki68 Aurora keymap only supports all or none). The last value set is persisted in EEPROM.
+
+### Compiling/Flashing
+1) After installing QMK MSYS, open the QMK MSYS terminal
+2) Type ```qmk compile -kb wuque/ikki68_aurora -km ewersp``` to test compilation
+3) Type ```qmk flash -kb wuque/ikki68_aurora -km ewersp``` to start flashing
+4) Press ```Fn+Page Up``` to put your keyboard into bootloader mode
+    - Note: After installing the keymap, to enter bootloader mode again press and hold ```Fn+B``` for half a second
+5) Wait for the ```Validating... Success``` message to appear and you're done!
+    - Note: If it gets stuck on ```Bootloader not found. Trying again every 0.5s...``` you may need to run QMK Toolbox to install/update drivers
+
+If you have any questions, feel free to reach out to me at: ewersp [at] gmail [dot] com.
+
+Enjoy! **<3**
diff --git a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/config.h b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/config.h
new file mode 100644
index 0000000000..1282334dce
--- /dev/null
+++ b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 Paul Ewers
+ * 
+ * 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 FORCE_NKRO
diff --git a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
new file mode 100644
index 0000000000..5983625adc
--- /dev/null
+++ b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/keymap.c
@@ -0,0 +1,215 @@
+/* Copyright 2021 Paul Ewers
+ * 
+ * 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 alt_keycodes {
+    ALT_DEL = SAFE_RANGE, // Map left alt + backspace to delete
+    LED_TOG               // Toggle LED modes
+};
+
+// Friendly layer names
+enum alt_layers {
+    DEF = 0,
+    ALT,
+    MAC,
+    FUNC,
+    SUPR
+};
+
+// EEPROM storage mode
+enum alt_led_mode {
+    LED_MODE_ALL = 0,
+    LED_MODE_LOGO,
+    LED_MODE_UNDERGLOW,
+    LED_MODE_OFF,
+    LED_MODE_TOTAL
+};
+
+// EEPROM storage type
+typedef union {
+    uint32_t raw;
+    struct {
+        uint8_t led_mode: 8;
+    };
+} user_config_t;
+
+user_config_t user_config;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [DEF] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, 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_RSFT,             KC_UP,
+        KC_LCTL, KC_LGUI, MO(SUPR),         KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(FUNC),KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [ALT] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
+        _______, _______, KC_LALT,          _______,          _______,          _______,          _______, _______, _______,             _______, _______, _______
+    ),
+    [MAC] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
+        _______, KC_LALT, KC_LGUI,          _______,          _______,          _______,          KC_RGUI, _______, KC_RALT,             _______, _______, _______
+    ),
+    [FUNC] = LAYOUT_all(
+        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_END,  KC_VOLU,
+        _______, RGB_HUD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_M_P, _______, _______, _______, KC_BRIU, KC_PAUS, KC_PSCR, _______, _______,             KC_MUTE, KC_VOLD,
+        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_SAD, RGB_M_B, _______, _______, _______, KC_BRID, _______, _______,          _______,
+        _______, _______, RGB_TOG, LED_TOG, _______, EEP_RST, RESET,   _______, _______, TG(MAC), TG(ALT), _______, _______, _______,             KC_PGUP,
+        _______, _______, KC_LALT,          _______,          _______,          _______,          _______, _______, _______,             KC_HOME, KC_PGDN, KC_END
+    ),
+    [SUPR] = LAYOUT_all(
+        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,  ALT_DEL, ALT_DEL,    KC_END,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,             KC_HOME, _______, KC_END
+    )
+};
+
+// If the super alt layer is the active layer
+bool super_alt_layer_active = false;
+
+// If we need to unregister alt when leaving the super alt layer
+bool need_to_unregister_alt = false;
+
+// This runs code every time that the layers get changed
+layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+        case DEF:
+            // When returning to the default layer, check if we need to unregister the left alt key
+            if (super_alt_layer_active && need_to_unregister_alt) {
+                unregister_code(KC_LALT);
+            }
+            super_alt_layer_active = false;
+            need_to_unregister_alt = false;
+            break;
+        case SUPR:
+            super_alt_layer_active = true;
+            break;
+    }
+    return state;
+}
+
+// There is a total of 20 LEDs on the board; the 4 logo LEDs have indices 16, 17, 18, 19
+void update_led_mode(void) {
+    rgblight_setrgb(0, 0, 0);
+    switch (user_config.led_mode) {
+        case LED_MODE_ALL:
+            rgblight_set_effect_range(0, RGBLED_NUM);
+            rgblight_enable_noeeprom();
+            break;
+        case LED_MODE_LOGO: 
+            rgblight_set_effect_range(16, 4);
+            rgblight_enable_noeeprom();
+            break;
+        case LED_MODE_UNDERGLOW:
+            rgblight_set_effect_range(0, 16);
+            rgblight_enable_noeeprom();
+            break;
+        case LED_MODE_OFF:
+            rgblight_disable_noeeprom();
+            break;
+    }
+}
+
+void keyboard_post_init_user(void) {
+    user_config.raw = eeconfig_read_user();
+    update_led_mode();
+}
+
+void eeconfig_init_user(void) {
+    user_config.raw      = 0;
+    user_config.led_mode = LED_MODE_ALL;
+    eeconfig_update_user(user_config.raw);
+    rgblight_enable();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static uint32_t key_timer;
+
+    switch (keycode) {
+        // These are the keys we want to 'fall though' and behave as usual when pressed with the alt modifier
+        case KC_A ... KC_Z:
+        case KC_TAB:
+        case KC_DEL:
+        case KC_UP:
+        case KC_DOWN:
+        case KC_ENT:
+        case KC_SPC:
+        case MO(FUNC):
+            if (super_alt_layer_active && record->event.pressed) {
+                // Only activate the alt modifier for the first key press
+                if ((get_mods() & MOD_BIT(KC_LALT)) == false) {
+                    register_code(KC_LALT);
+                    need_to_unregister_alt = true;
+                }
+            }
+            // We still want to process the keycode normally
+            return true;
+        case KC_F4:
+            // Map alt+shift+4 to alt+f4
+            if (super_alt_layer_active && (get_mods() & MOD_BIT(KC_LSHIFT))) {
+                if (record->event.pressed) {
+                    register_code(KC_LALT);
+                } else {
+                    unregister_code(KC_LALT);
+                }
+            }
+            return true;
+        case ALT_DEL:
+            if (record->event.pressed) {
+                register_code(KC_DEL);
+            } else {
+                unregister_code(KC_DEL);
+            }
+            return false;
+        case LED_TOG:
+            if (record->event.pressed) {
+                user_config.led_mode = (user_config.led_mode + 1) % LED_MODE_TOTAL;
+                update_led_mode();
+                eeconfig_update_user(user_config.raw);
+            }
+            return false;
+        case RESET:
+            if (record->event.pressed) {
+                key_timer = timer_read32();
+            } else {
+                if (timer_elapsed32(key_timer) >= 500) {
+                    reset_keyboard();
+                }
+            }
+            return false;
+        case EEP_RST:
+            if (record->event.pressed) {
+                key_timer = timer_read32();
+            } else {
+                if (timer_elapsed32(key_timer) >= 500) {
+                    eeconfig_init();
+                }
+            }
+            return false;
+        default:
+            return true; // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/wuque/ikki68_aurora/keymaps/ewersp/rules.mk b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/rules.mk
new file mode 100644
index 0000000000..4da205a168
--- /dev/null
+++ b/keyboards/wuque/ikki68_aurora/keymaps/ewersp/rules.mk
@@ -0,0 +1 @@
+LTO_ENABLE = yes

From ac31863021791c8bbaa98a83afe90ec6505f4897 Mon Sep 17 00:00:00 2001
From: Jay Greco <jayv.greco@gmail.com>
Date: Mon, 27 Dec 2021 02:03:40 -0800
Subject: [PATCH 085/867] Custom matrix lite support for split keyboards
 (#14674)

* Custom matrix lite support for split keyboards

* WIP: matrix -> matrix_common refactor

* Move matrix_post_scan() to matrix_common.c
---
 quantum/matrix.c        | 35 +------------------
 quantum/matrix.h        |  1 +
 quantum/matrix_common.c | 75 ++++++++++++++++++++++++++++++++++++++---
 3 files changed, 72 insertions(+), 39 deletions(-)

diff --git a/quantum/matrix.c b/quantum/matrix.c
index 483d518ecc..a58cc752fb 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -63,17 +63,13 @@ extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
 
 #ifdef SPLIT_KEYBOARD
 // row offsets for each hand
-uint8_t thisHand, thatHand;
+extern uint8_t thisHand, thatHand;
 #endif
 
 // user-defined overridable functions
 __attribute__((weak)) void matrix_init_pins(void);
 __attribute__((weak)) void matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row);
 __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter);
-#ifdef SPLIT_KEYBOARD
-__attribute__((weak)) void matrix_slave_scan_kb(void) { matrix_slave_scan_user(); }
-__attribute__((weak)) void matrix_slave_scan_user(void) {}
-#endif
 
 static inline void setPinOutput_writeLow(pin_t pin) {
     ATOMIC_BLOCK_FORCEON {
@@ -308,35 +304,6 @@ __attribute__((weak)) bool transport_master_if_connected(matrix_row_t master_mat
     transport_master(master_matrix, slave_matrix);
     return true;  // Treat the transport as always connected
 }
-
-bool matrix_post_scan(void) {
-    bool changed = false;
-    if (is_keyboard_master()) {
-        static bool  last_connected              = false;
-        matrix_row_t slave_matrix[ROWS_PER_HAND] = {0};
-        if (transport_master_if_connected(matrix + thisHand, slave_matrix)) {
-            changed = memcmp(matrix + thatHand, slave_matrix, sizeof(slave_matrix)) != 0;
-
-            last_connected = true;
-        } else if (last_connected) {
-            // reset other half when disconnected
-            memset(slave_matrix, 0, sizeof(slave_matrix));
-            changed = true;
-
-            last_connected = false;
-        }
-
-        if (changed) memcpy(matrix + thatHand, slave_matrix, sizeof(slave_matrix));
-
-        matrix_scan_quantum();
-    } else {
-        transport_slave(matrix + thatHand, matrix + thisHand);
-
-        matrix_slave_scan_kb();
-    }
-
-    return changed;
-}
 #endif
 
 uint8_t matrix_scan(void) {
diff --git a/quantum/matrix.h b/quantum/matrix.h
index 1a3f362fba..d968efeb0f 100644
--- a/quantum/matrix.h
+++ b/quantum/matrix.h
@@ -73,6 +73,7 @@ void matrix_init_user(void);
 void matrix_scan_user(void);
 
 #ifdef SPLIT_KEYBOARD
+bool matrix_post_scan(void);
 void matrix_slave_scan_kb(void);
 void matrix_slave_scan_user(void);
 #endif
diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c
index fe1d5b1edd..79f77421e1 100644
--- a/quantum/matrix_common.c
+++ b/quantum/matrix_common.c
@@ -4,6 +4,14 @@
 #include "wait.h"
 #include "print.h"
 #include "debug.h"
+#ifdef SPLIT_KEYBOARD
+#    include "split_common/split_util.h"
+#    include "split_common/transactions.h"
+
+#    define ROWS_PER_HAND (MATRIX_ROWS / 2)
+#else
+#    define ROWS_PER_HAND (MATRIX_ROWS)
+#endif
 
 #ifndef MATRIX_IO_DELAY
 #    define MATRIX_IO_DELAY 30
@@ -13,6 +21,11 @@
 matrix_row_t raw_matrix[MATRIX_ROWS];
 matrix_row_t matrix[MATRIX_ROWS];
 
+#ifdef SPLIT_KEYBOARD
+// row offsets for each hand
+uint8_t thisHand, thatHand;
+#endif
+
 #ifdef MATRIX_MASKED
 extern const matrix_row_t matrix_mask[];
 #endif
@@ -78,18 +91,61 @@ uint8_t matrix_key_count(void) {
     return count;
 }
 
+#ifdef SPLIT_KEYBOARD
+bool matrix_post_scan(void) {
+    bool changed = false;
+    if (is_keyboard_master()) {
+        matrix_row_t slave_matrix[ROWS_PER_HAND] = {0};
+        if (transport_master_if_connected(matrix + thisHand, slave_matrix)) {
+            for (int i = 0; i < ROWS_PER_HAND; ++i) {
+                if (matrix[thatHand + i] != slave_matrix[i]) {
+                    matrix[thatHand + i] = slave_matrix[i];
+                    changed              = true;
+                }
+            }
+        } else {
+            // reset other half if disconnected
+            for (int i = 0; i < ROWS_PER_HAND; ++i) {
+                matrix[thatHand + i] = 0;
+                slave_matrix[i]      = 0;
+            }
+
+            changed = true;
+        }
+
+        matrix_scan_quantum();
+    } else {
+        transport_slave(matrix + thatHand, matrix + thisHand);
+
+        matrix_slave_scan_kb();
+    }
+
+    return changed;
+}
+#endif
+
 /*　`matrix_io_delay ()` exists for backwards compatibility. From now on, use matrix_output_unselect_delay().　*/
 __attribute__((weak)) void matrix_io_delay(void) { wait_us(MATRIX_IO_DELAY); }
-
 __attribute__((weak)) void matrix_output_select_delay(void) { waitInputPinDelay(); }
 __attribute__((weak)) void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { matrix_io_delay(); }
 
 // CUSTOM MATRIX 'LITE'
 __attribute__((weak)) void matrix_init_custom(void) {}
-
 __attribute__((weak)) bool matrix_scan_custom(matrix_row_t current_matrix[]) { return true; }
 
+#ifdef SPLIT_KEYBOARD
+__attribute__((weak)) void matrix_slave_scan_kb(void) { matrix_slave_scan_user(); }
+__attribute__((weak)) void matrix_slave_scan_user(void) {}
+#endif
+
 __attribute__((weak)) void matrix_init(void) {
+#ifdef SPLIT_KEYBOARD
+    split_pre_init();
+
+    thisHand = isLeftHand ? 0 : (ROWS_PER_HAND);
+    thatHand = ROWS_PER_HAND - thisHand;
+#endif
+
     matrix_init_custom();
 
     // initialize matrix state: all keys off
@@ -98,17 +154,26 @@ __attribute__((weak)) void matrix_init(void) {
         matrix[i]     = 0;
     }
 
-    debounce_init(MATRIX_ROWS);
+    debounce_init(ROWS_PER_HAND);
 
     matrix_init_quantum();
+
+#ifdef SPLIT_KEYBOARD
+    split_post_init();
+#endif
 }
 
 __attribute__((weak)) uint8_t matrix_scan(void) {
     bool changed = matrix_scan_custom(raw_matrix);
 
-    debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
-
+#ifdef SPLIT_KEYBOARD
+    debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed);
+    changed = (changed || matrix_post_scan());
+#else
+    debounce(raw_matrix, matrix, ROWS_PER_HAND, changed);
     matrix_scan_quantum();
+#endif
+
     return changed;
 }
 

From ce0ca94600b94bafa132dacccc662615e8a9befe Mon Sep 17 00:00:00 2001
From: Jeremy Scherer <jeremy@unifyimpact.com>
Date: Mon, 27 Dec 2021 04:05:40 -0600
Subject: [PATCH 086/867] New keymap for Sofle rev1 for Flare576 (#13723)

* feat(sofle): add flare576 keymap to sofle

* feat(sofle): add flare576 keymap to sofle

* luna on main

* fix(flare576): Final layout for now

* WIP

* chore(graphics): file split

* fix(oled): display issues

Always show mode changes
Remove unused variable

* feat(marquee): Scrolling logo

* fix(TG TO): Better layer swapping

* feat(readme): Update for Flare576 keybinds

* chore(license): add license

* fix(logos): simplify loop/data

* fix(logos): simplify loop/data

* fix(logos): better quality

* feat(size): remove unused layers, split images

Remove Npad, media, add meta and FF14
Add flag (MAIN_BOARD) for main/secondary graphics
Add Chocobo image

* feat(size): remove unused layers, split images

Remove Npad, media, rename game to esdf, add FF14
Add flag (MAIN_BOARD) for main/secondary graphics
Add Chocobo image

* fix(headers): PR feedback

Rename to enums.h
Fix defines
Fix last commit (hanging refs)

* chore(graphics): manage large strings better

* fix(incremental): updating keymaps

* fix(syms): Bracket idea

* fix(esdf): Map (M) key to bottom right

* PR Feedback RE: headers

* docs(readme): old information updated

* fix(licenses): add license info to new files
---
 keyboards/sofle/keymaps/flare576/config.h   |  40 +++
 keyboards/sofle/keymaps/flare576/enums.h    |  34 +++
 keyboards/sofle/keymaps/flare576/graphics.c | 290 ++++++++++++++++++++
 keyboards/sofle/keymaps/flare576/graphics.h |  16 ++
 keyboards/sofle/keymaps/flare576/keymap.c   | 196 +++++++++++++
 keyboards/sofle/keymaps/flare576/logos.h    |  96 +++++++
 keyboards/sofle/keymaps/flare576/readme.md  |  22 ++
 keyboards/sofle/keymaps/flare576/rules.mk   |   7 +
 8 files changed, 701 insertions(+)
 create mode 100644 keyboards/sofle/keymaps/flare576/config.h
 create mode 100644 keyboards/sofle/keymaps/flare576/enums.h
 create mode 100644 keyboards/sofle/keymaps/flare576/graphics.c
 create mode 100644 keyboards/sofle/keymaps/flare576/graphics.h
 create mode 100644 keyboards/sofle/keymaps/flare576/keymap.c
 create mode 100644 keyboards/sofle/keymaps/flare576/logos.h
 create mode 100644 keyboards/sofle/keymaps/flare576/readme.md
 create mode 100644 keyboards/sofle/keymaps/flare576/rules.mk

diff --git a/keyboards/sofle/keymaps/flare576/config.h b/keyboards/sofle/keymaps/flare576/config.h
new file mode 100644
index 0000000000..c0f0a7d563
--- /dev/null
+++ b/keyboards/sofle/keymaps/flare576/config.h
@@ -0,0 +1,40 @@
+/* Copyright 2021 Flare576 <flare576@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#define MAIN_BOARD
+#define MASTER_RIGHT
+#define ENCODER_DIRECTION_FLIP
+#define OLED_TIMEOUT 10000
+
+#define MOUSEKEY_INTERVAL 16
+#define MOUSEKEY_DELAY 0
+#define MOUSEKEY_TIME_TO_MAX 60
+#define MOUSEKEY_MAX_SPEED 7
+#define MOUSEKEY_WHEEL_DELAY 0
+#define TAPPING_TERM_PER_KEY
+
+#ifdef ENCODER_RESOLUTION
+    #undef ENCODER_RESOLUTION
+#endif
+#define ENCODER_RESOLUTION 4
+
+#ifdef TAPPING_TERM
+    #undef TAPPING_TERM
+#endif
+#define TAPPING_TERM 200
+
+#undef MANUFACTURER
+#define MANUFACTURER Flare576
diff --git a/keyboards/sofle/keymaps/flare576/enums.h b/keyboards/sofle/keymaps/flare576/enums.h
new file mode 100644
index 0000000000..7edcc1110f
--- /dev/null
+++ b/keyboards/sofle/keymaps/flare576/enums.h
@@ -0,0 +1,34 @@
+/* Copyright 2021 Flare576 <flare576@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+enum _layers {
+    /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */
+    _BASE,
+    _MOUS,
+    _SYMS,
+    _FF14,
+    _ESDF,
+};
+
+enum custom_keycodes {
+    _COMP1  = SAFE_RANGE,
+    _COMP2,
+};
+
+enum custom_tapdance {
+    TD_PLAY,
+    TD_HOME,
+};
diff --git a/keyboards/sofle/keymaps/flare576/graphics.c b/keyboards/sofle/keymaps/flare576/graphics.c
new file mode 100644
index 0000000000..918334a508
--- /dev/null
+++ b/keyboards/sofle/keymaps/flare576/graphics.c
@@ -0,0 +1,290 @@
+/* Copyright 2021 Flare576 <flare576@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "enums.h"
+#include "logos.h"
+int current_wpm = -1; // Enable screen-on at startup
+bool isJumping = false;
+bool showedJump = true;
+
+#ifdef OLED_DRIVER_ENABLE
+
+#ifdef MAIN_BOARD
+static void render_logos(void){}
+void luna_jump(bool newJump){
+    isJumping = newJump;
+    if (newJump) {
+        showedJump = false;
+    }
+}
+
+// START Luna vars
+#define MIN_WALK_SPEED 10
+#define MIN_RUN_SPEED 40
+
+#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
+#define ANIM_SIZE 96 // number of bytes in array, minimize for adequate firmware size, max is 1024
+
+uint32_t anim_timer = 0;
+uint8_t current_frame = 0;
+
+bool isSneaking = false;
+static void render_luna(int LUNA_X, int LUNA_Y) {
+
+    static const char PROGMEM sit[2][ANIM_SIZE] = {
+        // 'sit1', 32x22px
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c,
+            0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x68, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28,
+            0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+
+        // 'sit2', 32x22px
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c,
+            0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x90, 0x08, 0x18, 0x60, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28,
+            0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        }
+    };
+
+    static const char PROGMEM walk[2][ANIM_SIZE] = {
+        // 'walk1', 32x22px
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x90, 0x90, 0x90, 0xa0, 0xc0, 0x80, 0x80,
+            0x80, 0x70, 0x08, 0x14, 0x08, 0x90, 0x10, 0x10, 0x08, 0xa4, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00,
+            0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, 0xea, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x03,
+            0x06, 0x18, 0x20, 0x20, 0x3c, 0x0c, 0x12, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+
+        // 'walk2', 32x22px
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x20, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00,
+            0x00, 0xe0, 0x10, 0x28, 0x10, 0x20, 0x20, 0x20, 0x10, 0x48, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x20, 0xf8, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x30, 0xd5, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e,
+            0x02, 0x1c, 0x14, 0x08, 0x10, 0x20, 0x2c, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        }
+    };
+
+    static const char PROGMEM run[2][ANIM_SIZE] = {
+        // 'run1', 32x22px
+        {
+            0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x08, 0xc8, 0xb0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+            0x80, 0x40, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0xc4, 0xa4, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x58, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x09, 0x04, 0x04, 0x04, 0x04, 0x02, 0x03, 0x02, 0x01, 0x01,
+            0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+        },
+
+        // 'run2', 32x22px
+        {
+            0x00, 0x00, 0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+            0x80, 0x80, 0x78, 0x28, 0x08, 0x10, 0x20, 0x30, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xb0, 0x50, 0x55, 0x20, 0x1f, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37,
+            0x02, 0x1e, 0x20, 0x20, 0x18, 0x0c, 0x14, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        }
+    };
+
+    static const char PROGMEM sneak[2][ANIM_SIZE] = {
+        // 'sneak1', 32x22px
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0xc0, 0x40, 0x40, 0x80, 0x00, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x1e, 0x21, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x04,
+            0x04, 0x04, 0x03, 0x01, 0x00, 0x00, 0x09, 0x01, 0x80, 0x80, 0xab, 0x04, 0xf8, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x02, 0x06,
+            0x18, 0x20, 0x20, 0x38, 0x08, 0x10, 0x18, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
+        },
+
+        // 'sneak2', 32x22px
+        {
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0xe0, 0xa0, 0x20, 0x40, 0x80, 0xc0, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x3e, 0x41, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x02, 0x04,
+            0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x40, 0x40, 0x55, 0x82, 0x7c, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x04,
+            0x18, 0x10, 0x08, 0x10, 0x20, 0x28, 0x34, 0x06, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+        }
+    };
+
+    // animation state
+    void animation_phase(void) {
+
+        if (isJumping || !showedJump) {
+
+            // clear
+            oled_set_cursor(LUNA_X,LUNA_Y +2);
+            oled_write("     ", false);
+
+            oled_set_cursor(LUNA_X,LUNA_Y -1);
+
+            showedJump = true;
+        } else {
+
+            // clear
+            oled_set_cursor(LUNA_X,LUNA_Y -1);
+            oled_write("     ", false);
+
+            oled_set_cursor(LUNA_X,LUNA_Y);
+        }
+
+        current_frame = (current_frame + 1) % 2;
+
+        if(isSneaking) {
+            oled_write_raw_P(sneak[abs(1 - current_frame)], ANIM_SIZE);
+
+        } else if(current_wpm <= MIN_WALK_SPEED) {
+            oled_write_raw_P(sit[abs(1 - current_frame)], ANIM_SIZE);
+
+        } else if(current_wpm <= MIN_RUN_SPEED) {
+            oled_write_raw_P(walk[abs(1 - current_frame)], ANIM_SIZE);
+
+        } else {
+            oled_write_raw_P(run[abs(1 - current_frame)], ANIM_SIZE);
+        }
+    }
+
+    // animation timer
+    if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+        anim_timer = timer_read32();
+        animation_phase();
+    }
+
+}
+// END Luna vars
+
+
+static void main_board(void) {
+    int layer = get_highest_layer(layer_state);
+    isSneaking = false;
+    // Print current mode
+    oled_write_ln_P(PSTR("Flare"), false);
+    oled_write_ln_P(PSTR("Sofle"), false);
+    if (layer == _FF14) {
+        oled_write_raw_P(ffxiv, 16*8);
+    } else if (keymap_config.swap_lalt_lgui) {
+        oled_write_raw_P(windows, 16*8);
+    } else {
+        oled_write_raw_P(apple, 16*8);
+    }
+    oled_set_cursor(0, 9);
+
+    switch (layer) {
+        case _BASE:
+            oled_write_ln_P(PSTR("ALL"), false);
+            oled_write_P(PSTR(" YOUR"), false);
+            oled_write_ln_P(PSTR("BASE"), false);
+            break;
+        case _MOUS:
+            isSneaking = true;
+            oled_write_ln_P(PSTR("Mouse"), false);
+            break;
+        case _SYMS:
+            oled_write_ln_P(PSTR("@$*&#"), false);
+            break;
+        case _FF14:
+            oled_write_ln_P(PSTR("FFXIV"), false);
+            break;
+        case _ESDF:
+            oled_write_ln_P(PSTR("ESDF "), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Undef"), false);
+    }
+    if (layer != _BASE) {
+        oled_write_P(PSTR("\n"), false);
+    }
+
+    // Don't re-write if not in use
+    if (current_wpm > 0) {
+        render_luna(0,13);
+    }
+}
+
+// End "MAIN_BOARD"
+#else
+static void main_board(void){}
+static void luna_jump(bool newJump){}
+
+#define MARQUEE_FRAME_DURATION 200 // how long each frame lasts in ms
+#define LOGO_BYTES 128
+#define LOGO_COUNT 7
+static const char *const secondary_logos[] = { js, apple, docker, python, qmk, brew, windows };
+#define MARQUEE_FRAMES (LOGO_COUNT * 4)
+#define MARQUEE_SIZE ( LOGO_COUNT * LOGO_BYTES)
+#define MARQUEE_SCROLL_UP true
+uint32_t marquee_timer = 0;
+uint32_t marquee_frame = 0;
+
+static void render_logos(void) {
+    void marquee_phase(void) {
+        marquee_frame = (marquee_frame + 1) % MARQUEE_FRAMES;
+        int marquee_start = MARQUEE_SIZE - (marquee_frame * 32);
+        static char output[MARQUEE_SIZE];
+        for (int i = 0; i < LOGO_COUNT; i++) {
+            for (int j = 0; j < LOGO_BYTES; j++) {
+                int pos = ( i * LOGO_BYTES + j + marquee_start ) % MARQUEE_SIZE;
+                output[pos] = pgm_read_byte_near(secondary_logos[i] + j);
+            }
+        }
+        oled_write_raw(output, MARQUEE_SIZE);
+    }
+
+    // animation timer
+    if(timer_elapsed32(marquee_timer) > MARQUEE_FRAME_DURATION) {
+        marquee_timer = timer_read32();
+        marquee_phase();
+    }
+}
+
+// End "MAIN_BOARD" false
+#endif
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_270;
+}
+
+void oled_task_user(void) {
+    // Prevent blank screen on startup
+    if (current_wpm == -1) {
+        set_current_wpm(10);
+    }
+    current_wpm = get_current_wpm();
+    if (is_keyboard_master()) {
+        // can't gate main_board on wpm; won't get mode changes that don't trigger wpm
+        main_board();
+    } else if (current_wpm > 0) {
+        render_logos();
+    }
+}
+
+// End "OLED_DRIVER_ENABLE"
+#else
+static void luna_jump(bool newJump){}
+// End "OLED_DRIVER_ENABLE" false
+#endif
diff --git a/keyboards/sofle/keymaps/flare576/graphics.h b/keyboards/sofle/keymaps/flare576/graphics.h
new file mode 100644
index 0000000000..3979ee43d9
--- /dev/null
+++ b/keyboards/sofle/keymaps/flare576/graphics.h
@@ -0,0 +1,16 @@
+/* Copyright 2021 Flare576 <flare576@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+void luna_jump(bool newJump);
diff --git a/keyboards/sofle/keymaps/flare576/keymap.c b/keyboards/sofle/keymaps/flare576/keymap.c
new file mode 100644
index 0000000000..68f611a1b5
--- /dev/null
+++ b/keyboards/sofle/keymaps/flare576/keymap.c
@@ -0,0 +1,196 @@
+/* Copyright 2021 Flare576 <flare576@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "print.h"
+#include "enums.h"
+#include "graphics.h"
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_PLAY] = ACTION_TAP_DANCE_DOUBLE(KC_MPLY, KC_MNXT),
+    [TD_HOME] = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END),
+};
+
+#define KC_TPLY TD(TD_PLAY)
+#define KC_THME TD(TD_HOME)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+ * BASE
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |Alt/Tb|   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  \   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |LShift|   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|  PLAY |    | PAGE  |------+------+------+------+------+------|
+ * |LCtrl |   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |+/SHFT|
+ * `-----------------------------------------/       /     \Enter \-----------------------------------------'
+ *            | ESDF | LAlt | ESC/ | LGUI | /Space  /       \ or   \  | Bspc | Alt+ |Delete|FFXIV |
+ *            |      |      |Symbol|      |/       /         \Mouse \ |      |Shift |      |      |
+ *            `----------------------------------'           '------''---------------------------'
+ *
+ * Note: Apple's keyboard settings don't seem to discern right- and left-ALT, so swapping keys there breaks TAB & META
+ */
+[_BASE] = LAYOUT(
+  KC_GRV,         KC_1, KC_2,      KC_3,    KC_4,             KC_5,                                KC_6,    KC_7,          KC_8,    KC_9,     KC_0,    KC_MINS,
+  RALT_T(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_LSFT,        KC_A, KC_S,      KC_D,    KC_F,             KC_G,                                KC_H,    KC_J,          KC_K,    KC_L,     KC_SCLN, KC_QUOT,
+  KC_LCTRL,       KC_Z, KC_X,      KC_C,    KC_V,             KC_B,    KC_TPLY, KC_THME,           KC_N,    KC_M,          KC_COMM, KC_DOT,   KC_SLSH, RSFT_T(KC_PLUS),
+                        TG(_ESDF), KC_LALT, LT(_SYMS,KC_ESC), KC_LGUI, KC_SPC,  LT(_MOUS, KC_ENT), KC_BSPC, RSFT(KC_RALT), KC_DEL,  TG(_FF14)
+),
+
+/*
+ * MOUS
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |CTRL+W|ALT+A |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | TRNS |PRNTSC|      | M UP | HOME | PGUP |                    |M Wl U|M Wl D|M Wl L|M Wl R|      |COMP1 |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | TRNS |SC LCK|M LFT |M DWN |M RGHT|      |-------.    ,-------|  UP  | DOWN | LEFT |RIGHT |      |COMP2 |
+ * |------+------+------+------+------+------| TRNS  |    | TRNS  |------+------+------+------+------+------|
+ * | TRNS |PAUSE |      |      | END  | PGDN |-------|    |-------|MOUS1 |MOUS2 |      |      |      |      |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *            |      | TRNS | TRNS |TRNS  | / TRNS  /       \ TRNS \  |MOUS3 |MOUS4 |MOUS5 |      |
+ *            |      |      |      |      |/       /         \      \ |      |      |      |      |
+ *            `----------------------------------'           '------''---------------------------'
+ */
+[_MOUS] = LAYOUT(
+  LCTL(KC_W), LALT(KC_A), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
+  _______,    KC_PSCR,    XXXXXXX, KC_MS_U, KC_HOME, KC_PGUP,                   KC_WH_U, KC_WH_D, KC_WH_L, KC_WH_R,  XXXXXXX, _COMP1,
+  _______,    KC_SLCK,    KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, XXXXXXX, _COMP2,
+  _______,    KC_PAUS,    XXXXXXX, XXXXXXX, KC_END,  KC_PGDN, _______, _______, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
+                          XXXXXXX, _______, _______, _______, _______, _______, KC_BTN3, KC_BTN4, KC_BTN5, XXXXXXX
+),
+
+/* SYMS
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |  F1  |  F2  |  F3  |  F4  | F5   |                    |      |      |   {  |   }  |      | RESET|
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | TRNS |  F6  |  F7  |  F8  |  F9  | F10  |                    |      |      |   (  |   )  |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | TRNS | F11  | F12  | F13  | F14  | F15  |-------.    ,-------|      |      |   [  |   ]  |      |      |
+ * |------+------+------+------+------+------| TRNS  |    | TRNS  |------+------+------+------+------+------|
+   | TRNS | UNDO | CUT  | COPY |PASTE | F20  |-------|    |-------|      |      |   <  |   >  |      |      |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *            | TRNS | TRNS | TRNS | TRNS | / TRNS  /       \ TRNS \  | TRNS | TRNS | TRNS | TRNS |
+ *            |      |      |      |      |/       /         \      \ |      |      |      |      |
+ *            `----------------------------------'           '------''---------------------------'
+ */
+[_SYMS] = LAYOUT(
+  XXXXXXX, KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,                      XXXXXXX, XXXXXXX, KC_LCBR, KC_RCBR, XXXXXXX, RESET,
+  _______, KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,                     XXXXXXX, XXXXXXX, KC_LPRN, KC_RPRN, XXXXXXX, XXXXXXX,
+  _______, KC_F11,     KC_F12,     KC_F13,     KC_F14,     KC_F15,                     XXXXXXX, XXXXXXX, KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX,
+  _______, LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), KC_F20,  _______,  _______, XXXXXXX, XXXXXXX, KC_LT,   KC_GT,   XXXXXXX, XXXXXXX,
+                       XXXXXXX,    _______,    _______,    _______, _______,  _______, _______, _______, _______, XXXXXXX
+),
+
+/* FF14
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * | TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |                    | TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | TAB  | TRNS | TRNS | TRNS | TRNS | TRNS |                    | TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |-------.    ,-------| TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |
+ * |------+------+------+------+------+------| TRNS  |    | TRNS  |------+------+------+------+------+------|
+ * | TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |-------|    |-------| TRNS | TRNS | TRNS | TRNS | TRNS | TRNS |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *            | ESDF |      | ESC  | TRNS | / TRNS  /       \ TRNS \  | TRNS |PrntSc| TRNS | TRNS |
+ *            |      |      |      |      |/       /         \      \ |      |      |      |      |
+ *            `----------------------------------'           '------''---------------------------'
+ */
+[_FF14] = LAYOUT(
+  _______, _______, _______,   _______, _______, _______,                   _______, _______, _______, _______, _______,  _______,
+  KC_TAB,  _______, _______,   _______, _______, _______,                   _______, _______, _______, _______, _______,  _______,
+  _______, _______, _______,   _______, _______, _______,                   _______, _______, _______, _______, _______,  _______,
+  _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
+                    TO(_ESDF), XXXXXXX, KC_ESC,  _______, _______, _______, _______, KC_PSCR, _______, _______
+),
+
+/* ESDF
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |   ~  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |   =  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   T  |  Tab |   Q  |   W  |   E  |   R  |                    | Ctl-Y| Ctl-U| Ctl-I| Ctl-O| Ctl-P| PGUP |
+ * |------|------+------+------+------+------+                    |------+------+------+------+------+------|
+ * |   G  |LShift|   A  |   S  |   D  |   F  |-------.    ,-------| Ctl-H| Ctl-J| Ctl-K| Ctl-L| Ctl-;| PGDN |
+ * |------|------+------+------+------+------+       |    |       |------+------+------+------+------+------|
+ * | LCtrl|  Z   |   X  |   C  |   V  |   B  |-------|    |-------| Ctl-N| Ctl-M| Ctl-,| Ctl-.| Ctl-/|   M  |
+ * `-----------------------------------------/       /     \Enter \-----------------------------------------'
+ *            | TRNS |      | ESC  | LAlt | /Space  /       \      \  |PrnScr|      |      | FF14 |
+ *            |      |      |      |      |/       /         \      \ |      |      |      |      |
+ *            `----------------------------------'           '------''---------------------------'
+ */
+[_ESDF] = LAYOUT(
+  KC_GRV, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,       KC_7,       KC_8,          KC_9,         KC_0,          KC_EQL,
+  KC_T,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,                      RCTL(KC_Y), RCTL(KC_U), RCTL(KC_I),    RCTL(KC_O),   RCTL(KC_P),    KC_PGUP,
+  KC_G,   KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,                      RCTL(KC_H), RCTL(KC_J), RCTL(KC_K),    RCTL(KC_L),   RCTL(KC_SCLN), KC_PGDN,
+  KC_LCTRL, KC_Z,  KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, RCTL(KC_N), RCTL(KC_M), RCTL(KC_COMM), RCTL(KC_DOT), RCTL(KC_SLSH), KC_M,
+                   _______, XXXXXXX, _______, _______, _______, _______, _______,    KC_PSCR,    _______,       TO(_FF14)
+)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case _COMP1:
+            if (record->event.pressed) {
+                // SEND_STRING(SS_TAP(X_RCTRL) SS_DELAY(100) SS_TAP(X_RCTRL) SS_DELAY(100) "1" SS_TAP(X_ENTER));
+                keymap_config.swap_lalt_lgui = false;
+            }
+            return false;
+        case _COMP2:
+            if (record->event.pressed) {
+                // SEND_STRING(SS_TAP(X_RCTRL) SS_DELAY(100) SS_TAP(X_RCTRL) SS_DELAY(100) "2" SS_TAP(X_ENTER));
+                keymap_config.swap_lalt_lgui = true;
+            }
+            return false;
+        case KC_SPC:
+            luna_jump(record->event.pressed);
+            break;
+    }
+    return true;
+}
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_THME:
+        case KC_TPLY:
+            return TAPPING_TERM + 250;
+        default:
+            return TAPPING_TERM;
+    }
+}
+
+#ifdef ENCODER_ENABLE
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLD);
+        } else {
+            tap_code(KC_VOLU);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_PGDOWN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return true;
+}
+
+#endif
diff --git a/keyboards/sofle/keymaps/flare576/logos.h b/keyboards/sofle/keymaps/flare576/logos.h
new file mode 100644
index 0000000000..18de1b3d52
--- /dev/null
+++ b/keyboards/sofle/keymaps/flare576/logos.h
@@ -0,0 +1,96 @@
+/* Copyright 2021 Flare576 <flare576@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+static const char PROGMEM ffxiv[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0x00, 0xf0, 0xc0, 0xe0, 0x80, 0x00, 0x02,
+    0x0c, 0x2e, 0xfc, 0xfc, 0xfc, 0xfc, 0x78, 0x78, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x3f, 0x37, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8,
+    0xf8, 0xf8, 0xf1, 0xff, 0xff, 0xff, 0xf8, 0xf0, 0xf0, 0xb0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31, 0x7b, 0xdf, 0x1f, 0x3f, 0x3f,
+    0x1f, 0x1f, 0x3f, 0x5f, 0x9f, 0x8f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x06, 0x07, 0x0f, 0x1c, 0x74,
+    0x0c, 0x0d, 0x09, 0x09, 0x11, 0x01, 0x03, 0x03, 0x07, 0x05, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+static const char PROGMEM windows[] = {
+    0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x00, 0xf8,
+    0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0x00,
+    0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+    0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0xfe,
+    0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00,
+    0x00, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x00, 0x1f,
+    0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00
+};
+static const char PROGMEM apple[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xe0, 0x78, 0x7c, 0x7e, 0x3e, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe,
+    0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3e, 0x0e, 0x0c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f,
+    0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00
+};
+const char PROGMEM docker[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70,
+    0x70, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x80, 0x80, 0xb0, 0xb0, 0xb0, 0x80, 0xb7, 0xb7, 0xb7, 0x80, 0xb7, 0xb7, 0xb7, 0x80, 0xb7,
+    0xb7, 0xb7, 0x80, 0xb0, 0xb0, 0xb0, 0x80, 0x80, 0xfe, 0xfe, 0xfc, 0xf0, 0xf0, 0xf0, 0x70, 0x00,
+    0x03, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03,
+    0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+static const char PROGMEM python[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x7e, 0x66, 0x66, 0x67, 0x7f, 0x7f, 0x7f,
+    0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xf0, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+    0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x9f, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0,
+    0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x03, 0xf9, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x0f,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff,
+    0xfe, 0xfe, 0xfe, 0xe6, 0x66, 0x66, 0x7e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+static const char PROGMEM js[] = {
+    0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0x78, 0x7c, 0x3c, 0x1e, 0x9f,
+    0x9e, 0x1e, 0x3c, 0x3c, 0x78, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x03, 0x01, 0xf1, 0xf8, 0xfc, 0xfc, 0x06, 0x06, 0xff, 0x0f,
+    0x0f, 0x67, 0x67, 0xe6, 0xcc, 0x8c, 0xf8, 0xf9, 0x01, 0x03, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+    0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x80, 0x1f, 0x3f, 0x3f, 0x3f, 0x00, 0x80, 0xff, 0xe3,
+    0xe2, 0xce, 0xce, 0x4c, 0x64, 0x20, 0x11, 0x9f, 0x80, 0xc0, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x1f, 0x3c, 0x3c, 0x78, 0x79,
+    0xf9, 0x78, 0x3c, 0x3c, 0x1e, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00,
+};
+static const char PROGMEM qmk[] = {
+    0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xf8,
+    0xf8, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x99, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00,
+    0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x99, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x99, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf1, 0xf3, 0xe3, 0xe7, 0x00,
+    0x00, 0xe7, 0xe3, 0xf3, 0xf1, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0x99, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x0f, 0x0f, 0x1f,
+    0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x0f, 0x0f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00,
+};
+static const char PROGMEM brew[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xe7, 0xff, 0xfe, 0xfc, 0xf8, 0xfe,
+    0xe4, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xe7, 0x43, 0x41, 0x41, 0x4b, 0xcf, 0x87, 0x87, 0x8f,
+    0x87, 0x03, 0x03, 0xc3, 0x47, 0xe7, 0xa4, 0xb8, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x01, 0x02, 0x02, 0x03, 0x00, 0xfe, 0x02, 0x02, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x40, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+    0x80, 0x80, 0x80, 0xc0, 0x40, 0x7b, 0x0a, 0x0a, 0x0b, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
diff --git a/keyboards/sofle/keymaps/flare576/readme.md b/keyboards/sofle/keymaps/flare576/readme.md
new file mode 100644
index 0000000000..9f8ad5f248
--- /dev/null
+++ b/keyboards/sofle/keymaps/flare576/readme.md
@@ -0,0 +1,22 @@
+![Flare576 Keycaps](https://raw.githubusercontent.com/Flare576/sofle/main/images/keycaps.png)
+![Flare576 Chord Guide](https://raw.githubusercontent.com/Flare576/sofle/main/images/chords.png)
+
+# Flare576's keymap for Sofle Keyboard
+
+[Layout](http://www.keyboard-layout-editor.com/#/gists/fb8b42a6156458e20ca421a6f80cec48) and [Chord Mapping](http://www.keyboard-layout-editor.com/#/gists/884e3bc833cdf80fed9337ffee93a500) in Keyboard Layout Manager
+
+
+Features:
+
+- WASD -> ESDF Gaming layer
+- Mouse/Arrow Keys Layer with **amazing** rates
+- Tap/Hold keys for `=/+`/`SHIFT`, `TAB`/`ALT`
+- Bracket layer with Fn Keys
+- Right-hand primary OLED
+  * Mode logo
+  * Mode title
+  * Luna WPM indicator
+- Left-hand secondary OLED scrolling logo marquee
+- Left encoder controls volume up/down/mute. Right encoder PGUP/PGDOWN/Home.
+
+See [My Sofle Project](https://github.com/flare576/sofle) for more details
diff --git a/keyboards/sofle/keymaps/flare576/rules.mk b/keyboards/sofle/keymaps/flare576/rules.mk
new file mode 100644
index 0000000000..a7505f5386
--- /dev/null
+++ b/keyboards/sofle/keymaps/flare576/rules.mk
@@ -0,0 +1,7 @@
+MOUSEKEY_ENABLE = yes
+ENCODER_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+WPM_ENABLE = yes
+OLED_DRIVER_ENABLE = yes
+SRC += graphics.c

From dad7424becdb10d1dc3ad70a456fc40513255e71 Mon Sep 17 00:00:00 2001
From: Sendy Aditya Suryana <sendzation@gmail.com>
Date: Mon, 27 Dec 2021 17:06:35 +0700
Subject: [PATCH 087/867] [Keyboard][Update] Add RGB Backlight feature to Pix
 (#14057)

* Initiate RGB Support

* Add RGB Support for PIX

* Revert Encoder pin assignment

* Lower default RGB LED to 15

* Use Left shift for far left key

* Replicate via keymap to default keymap
---
 keyboards/sendyyeah/pix/config.h              | 26 ++++----
 .../sendyyeah/pix/keymaps/default/glcdfont.c  | 24 +++----
 .../sendyyeah/pix/keymaps/default/keymap.c    | 65 +++++++++++++++++--
 keyboards/sendyyeah/pix/keymaps/via/keymap.c  | 65 +++++++++++++++++--
 keyboards/sendyyeah/pix/rules.mk              |  2 +-
 5 files changed, 147 insertions(+), 35 deletions(-)

diff --git a/keyboards/sendyyeah/pix/config.h b/keyboards/sendyyeah/pix/config.h
index a9c3080d8c..86c6d26e16 100644
--- a/keyboards/sendyyeah/pix/config.h
+++ b/keyboards/sendyyeah/pix/config.h
@@ -49,15 +49,17 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-// #define RGB_DI_PIN B5
-// #ifdef RGB_DI_PIN
-// #define RGBLED_NUM 5
-// #define RGBLIGHT_HUE_STEP 8
-// #define RGBLIGHT_SAT_STEP 8
-// #define RGBLIGHT_VAL_STEP 8
-// #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-// #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// #define RGBLIGHT_ANIMATIONS
-// #define RGBLIGHT_LAYERS
-// #define RGBLIGHT_LAYER_BLINK
-// #endif
+#define USB_MAX_POWER_CONSUMPTION 500
+
+#define RGB_DI_PIN B5
+#ifdef RGB_DI_PIN
+#define RGBLED_NUM 15
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYER_BLINK
+#endif
diff --git a/keyboards/sendyyeah/pix/keymaps/default/glcdfont.c b/keyboards/sendyyeah/pix/keymaps/default/glcdfont.c
index 7af69f796c..53f25b92ed 100644
--- a/keyboards/sendyyeah/pix/keymaps/default/glcdfont.c
+++ b/keyboards/sendyyeah/pix/keymaps/default/glcdfont.c
@@ -165,11 +165,11 @@ const unsigned char font[] PROGMEM = {
   0xF1, 0xF9, 0xFD, 0x01, 0x01, 0xFE,
   0xFE, 0x01, 0x01, 0xFD, 0xF9, 0xF1,
   0x61, 0x01, 0xFD, 0x01, 0x01, 0xFE,
+  0xFE, 0x01, 0xF9, 0xF9, 0x31, 0xE1,
+  0xE1, 0x31, 0xF9, 0xF9, 0x01, 0xFE,
+  0xFE, 0x01, 0xF9, 0xF9, 0x61, 0x61,
+  0x61, 0x61, 0xF9, 0xF9, 0x01, 0xFE,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xF0, 0x08, 0x04, 0xC4, 0x24, 0x24,
-  0x24, 0xC4, 0x04, 0x08, 0xF0, 0x00,
-  0xF0, 0xF8, 0xFC, 0x3C, 0xDC, 0xDC,
-  0xDC, 0x3C, 0xFC, 0xF8, 0xF0, 0x00,
   0xFE, 0xC1, 0xC1, 0xC9, 0xC5, 0xDD,
   0xC5, 0xC9, 0xC1, 0xC1, 0xFE, 0x00,
   0xFC, 0xFE, 0xFE, 0xEE, 0xF6, 0xC6,
@@ -197,15 +197,15 @@ const unsigned char font[] PROGMEM = {
   0x08, 0x09, 0x0B, 0x08, 0x08, 0x07,
   0x07, 0x08, 0x08, 0x0B, 0x09, 0x08,
   0x08, 0x08, 0x0B, 0x08, 0x08, 0x07,
+  0x07, 0x08, 0x09, 0x09, 0x08, 0x08,
+  0x08, 0x08, 0x09, 0x09, 0x08, 0x07,
+  0x07, 0x08, 0x09, 0x09, 0x08, 0x08,
+  0x08, 0x08, 0x09, 0x09, 0x08, 0x07,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x07, 0x08, 0x10, 0x13, 0x11, 0x11,
-  0x11, 0x13, 0x10, 0x08, 0x07, 0x00,
-  0x07, 0x0F, 0x1F, 0x1C, 0x1E, 0x1E,
-  0x1E, 0x1C, 0x1F, 0x0F, 0x07, 0x00,
   0xFE, 0x01, 0xF1, 0xF9, 0xFD, 0xFD,
   0x05, 0x05, 0x09, 0xF1, 0x01, 0xFE,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0xFE, 0x01, 0x39, 0x7D, 0x6D, 0x6D,
+  0x6D, 0x6D, 0xED, 0xC9, 0x01, 0xFE,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -236,8 +236,8 @@ const unsigned char font[] PROGMEM = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x07, 0x08, 0x08, 0x09, 0x0B, 0x0B,
   0x0A, 0x0A, 0x09, 0x08, 0x08, 0x07,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x07, 0x08, 0x09, 0x0B, 0x0B, 0x0B,
+  0x0B, 0x0B, 0x0B, 0x09, 0x08, 0x07,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/keyboards/sendyyeah/pix/keymaps/default/keymap.c b/keyboards/sendyyeah/pix/keymaps/default/keymap.c
index bcaf52d53b..951aadeae8 100644
--- a/keyboards/sendyyeah/pix/keymaps/default/keymap.c
+++ b/keyboards/sendyyeah/pix/keymaps/default/keymap.c
@@ -16,11 +16,12 @@
 
 #include QMK_KEYBOARD_H
 
-#define LAYERNUM 2
+#define LAYERNUM 3
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, TO(1)),
-    [1] = LAYOUT(KC_TRNS, KC_MSTP, KC_MRWD, KC_MFFD, TO(0))
+    [1] = LAYOUT(KC_TRNS, KC_MSTP, KC_MRWD, KC_MFFD, TO(2)),
+    [2] = LAYOUT(KC_LSFT, RGB_MOD, RGB_HUI, RGB_SAI, TO(0))
 };
 
 int get_icon_start_position(int key_position) {
@@ -44,13 +45,12 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
                 oled_write_P(UP_ICON, false);
             } else {
                 tap_code(KC_VOLD);
-
                 oled_set_cursor(get_icon_start_position(7), 2);
                 oled_write_P(PSTR(" "), false);
                 oled_set_cursor(get_icon_start_position(7), 3);
                 oled_write_P(DOWN_ICON, false);
             }
-        } else {
+        } else if (layer_state_is(1)) {
             if (clockwise) {
                 tap_code(KC_BRIU);
                 oled_set_cursor(get_icon_start_position(7), 3);
@@ -64,6 +64,20 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
                 oled_set_cursor(get_icon_start_position(7), 3);
                 oled_write_P(DOWN_ICON, false);
             }
+        } else if (layer_state_is(2)) {
+            if (clockwise) {
+                rgblight_increase_val();
+                oled_set_cursor(get_icon_start_position(7), 3);
+                oled_write_P(PSTR(" "), false);
+                oled_set_cursor(get_icon_start_position(7), 2);
+                oled_write_P(UP_ICON, false);
+            } else {
+                rgblight_decrease_val();
+                oled_set_cursor(get_icon_start_position(7), 2);
+                oled_write_P(PSTR(" "), false);
+                oled_set_cursor(get_icon_start_position(7), 3);
+                oled_write_P(DOWN_ICON, false);
+            }
         }
     }
     return true;
@@ -174,7 +188,34 @@ void draw_brightness_icon(int key_position, int row) {
     oled_write_P(ICON_BRIGHTNESS_1, false);
 }
 
-bool oled_task_user(void) {
+void draw_mode_icon(int key_position, int row) {
+    static const char PROGMEM ICON_MODE_0[] = {0x94, 0x95, 0};
+    static const char PROGMEM ICON_MODE_1[] = {0xB4, 0xB5, 0};
+    oled_set_cursor(get_icon_start_position(key_position), row);
+    oled_write_P(ICON_MODE_0, false);
+    oled_set_cursor(get_icon_start_position(key_position), row + 1);
+    oled_write_P(ICON_MODE_1, false);
+}
+
+void draw_hue_icon(int key_position, int row) {
+    static const char PROGMEM ICON_HUE_0[] = {0x96, 0x97, 0};
+    static const char PROGMEM ICON_HUE_1[] = {0xB6, 0xB7, 0};
+    oled_set_cursor(get_icon_start_position(key_position), row);
+    oled_write_P(ICON_HUE_0, false);
+    oled_set_cursor(get_icon_start_position(key_position), row + 1);
+    oled_write_P(ICON_HUE_1, false);
+}
+
+void draw_sat_icon(int key_position, int row) {
+    static const char PROGMEM ICON_SAT_0[] = {0xBB, 0xBC, 0};
+    static const char PROGMEM ICON_SAT_1[] = {0xDB, 0xDC, 0};
+    oled_set_cursor(get_icon_start_position(key_position), row);
+    oled_write_P(ICON_SAT_0, false);
+    oled_set_cursor(get_icon_start_position(key_position), row + 1);
+    oled_write_P(ICON_SAT_1, false);
+}
+
+void oled_task_user(void) {
     // Host Keyboard Layer Status
     static const char PROGMEM ICON_LAYER[] = {0x80, 0x81, 0x82, 0x83, 0};
     static const char PROGMEM ICON_ENCODER[] = {0x84, 0x85, 0x86, 0x87, 0};
@@ -189,6 +230,9 @@ bool oled_task_user(void) {
         case 1:
             oled_write_P(PSTR("2ND "), false);
             break;
+        case 2:
+            oled_write_P(PSTR("3RD "), false);
+            break;
         default:
             // Or use the write_ln shortcut over adding '\n' to the end of your string
             oled_write_P(PSTR("UNDF"), false);
@@ -204,6 +248,9 @@ bool oled_task_user(void) {
         case 1:
             oled_write_P(PSTR("BRGT"), false);
             break;
+        case 2:
+            oled_write_P(PSTR("RGB "), false);
+            break;
         default:
             // Or use the write_ln shortcut over adding '\n' to the end of your string
             oled_write_P(PSTR("UNDF"), false);
@@ -227,6 +274,14 @@ bool oled_task_user(void) {
             draw_lower_icon(5, 2);
             draw_brightness_icon(6, 2);
             break;
+        case 2:
+            draw_raise_icon(1, 2);
+            draw_mode_icon(2, 2);
+            draw_hue_icon(3, 2);
+            draw_sat_icon(4, 2);
+            draw_lower_icon(5, 2);
+            draw_brightness_icon(6, 2);
+            break;
     }
 
     return false;
diff --git a/keyboards/sendyyeah/pix/keymaps/via/keymap.c b/keyboards/sendyyeah/pix/keymaps/via/keymap.c
index bcaf52d53b..951aadeae8 100644
--- a/keyboards/sendyyeah/pix/keymaps/via/keymap.c
+++ b/keyboards/sendyyeah/pix/keymaps/via/keymap.c
@@ -16,11 +16,12 @@
 
 #include QMK_KEYBOARD_H
 
-#define LAYERNUM 2
+#define LAYERNUM 3
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(KC_MUTE, KC_MPLY, KC_MPRV, KC_MNXT, TO(1)),
-    [1] = LAYOUT(KC_TRNS, KC_MSTP, KC_MRWD, KC_MFFD, TO(0))
+    [1] = LAYOUT(KC_TRNS, KC_MSTP, KC_MRWD, KC_MFFD, TO(2)),
+    [2] = LAYOUT(KC_LSFT, RGB_MOD, RGB_HUI, RGB_SAI, TO(0))
 };
 
 int get_icon_start_position(int key_position) {
@@ -44,13 +45,12 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
                 oled_write_P(UP_ICON, false);
             } else {
                 tap_code(KC_VOLD);
-
                 oled_set_cursor(get_icon_start_position(7), 2);
                 oled_write_P(PSTR(" "), false);
                 oled_set_cursor(get_icon_start_position(7), 3);
                 oled_write_P(DOWN_ICON, false);
             }
-        } else {
+        } else if (layer_state_is(1)) {
             if (clockwise) {
                 tap_code(KC_BRIU);
                 oled_set_cursor(get_icon_start_position(7), 3);
@@ -64,6 +64,20 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
                 oled_set_cursor(get_icon_start_position(7), 3);
                 oled_write_P(DOWN_ICON, false);
             }
+        } else if (layer_state_is(2)) {
+            if (clockwise) {
+                rgblight_increase_val();
+                oled_set_cursor(get_icon_start_position(7), 3);
+                oled_write_P(PSTR(" "), false);
+                oled_set_cursor(get_icon_start_position(7), 2);
+                oled_write_P(UP_ICON, false);
+            } else {
+                rgblight_decrease_val();
+                oled_set_cursor(get_icon_start_position(7), 2);
+                oled_write_P(PSTR(" "), false);
+                oled_set_cursor(get_icon_start_position(7), 3);
+                oled_write_P(DOWN_ICON, false);
+            }
         }
     }
     return true;
@@ -174,7 +188,34 @@ void draw_brightness_icon(int key_position, int row) {
     oled_write_P(ICON_BRIGHTNESS_1, false);
 }
 
-bool oled_task_user(void) {
+void draw_mode_icon(int key_position, int row) {
+    static const char PROGMEM ICON_MODE_0[] = {0x94, 0x95, 0};
+    static const char PROGMEM ICON_MODE_1[] = {0xB4, 0xB5, 0};
+    oled_set_cursor(get_icon_start_position(key_position), row);
+    oled_write_P(ICON_MODE_0, false);
+    oled_set_cursor(get_icon_start_position(key_position), row + 1);
+    oled_write_P(ICON_MODE_1, false);
+}
+
+void draw_hue_icon(int key_position, int row) {
+    static const char PROGMEM ICON_HUE_0[] = {0x96, 0x97, 0};
+    static const char PROGMEM ICON_HUE_1[] = {0xB6, 0xB7, 0};
+    oled_set_cursor(get_icon_start_position(key_position), row);
+    oled_write_P(ICON_HUE_0, false);
+    oled_set_cursor(get_icon_start_position(key_position), row + 1);
+    oled_write_P(ICON_HUE_1, false);
+}
+
+void draw_sat_icon(int key_position, int row) {
+    static const char PROGMEM ICON_SAT_0[] = {0xBB, 0xBC, 0};
+    static const char PROGMEM ICON_SAT_1[] = {0xDB, 0xDC, 0};
+    oled_set_cursor(get_icon_start_position(key_position), row);
+    oled_write_P(ICON_SAT_0, false);
+    oled_set_cursor(get_icon_start_position(key_position), row + 1);
+    oled_write_P(ICON_SAT_1, false);
+}
+
+void oled_task_user(void) {
     // Host Keyboard Layer Status
     static const char PROGMEM ICON_LAYER[] = {0x80, 0x81, 0x82, 0x83, 0};
     static const char PROGMEM ICON_ENCODER[] = {0x84, 0x85, 0x86, 0x87, 0};
@@ -189,6 +230,9 @@ bool oled_task_user(void) {
         case 1:
             oled_write_P(PSTR("2ND "), false);
             break;
+        case 2:
+            oled_write_P(PSTR("3RD "), false);
+            break;
         default:
             // Or use the write_ln shortcut over adding '\n' to the end of your string
             oled_write_P(PSTR("UNDF"), false);
@@ -204,6 +248,9 @@ bool oled_task_user(void) {
         case 1:
             oled_write_P(PSTR("BRGT"), false);
             break;
+        case 2:
+            oled_write_P(PSTR("RGB "), false);
+            break;
         default:
             // Or use the write_ln shortcut over adding '\n' to the end of your string
             oled_write_P(PSTR("UNDF"), false);
@@ -227,6 +274,14 @@ bool oled_task_user(void) {
             draw_lower_icon(5, 2);
             draw_brightness_icon(6, 2);
             break;
+        case 2:
+            draw_raise_icon(1, 2);
+            draw_mode_icon(2, 2);
+            draw_hue_icon(3, 2);
+            draw_sat_icon(4, 2);
+            draw_lower_icon(5, 2);
+            draw_brightness_icon(6, 2);
+            break;
     }
 
     return false;
diff --git a/keyboards/sendyyeah/pix/rules.mk b/keyboards/sendyyeah/pix/rules.mk
index 7f4a71aab8..c5eb6c7bcc 100644
--- a/keyboards/sendyyeah/pix/rules.mk
+++ b/keyboards/sendyyeah/pix/rules.mk
@@ -14,7 +14,7 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 OLED_ENABLE = yes

From 6bc870d899c474bce82457699ec4b753d1538123 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 27 Dec 2021 21:10:07 +1100
Subject: [PATCH 088/867] Refactor `bootloader_jump()` implementations (#15450)

* Refactor `bootloader_jump()` implementations

* Fix tests?

* Rename `atmel-samba` to `md-boot`
---
 build_test.mk                                 |   1 +
 builddefs/bootloader.mk                       |  40 ++-
 data/schemas/keyboard.jsonschema              |   2 +-
 keyboards/handwired/onekey/teensy_32/rules.mk |   3 +
 keyboards/handwired/onekey/teensy_lc/rules.mk |   3 +
 keyboards/massdrop/alt/rules.mk               |   3 +
 keyboards/massdrop/ctrl/rules.mk              |   3 +
 keyboards/mechlovin/olly/jf/rules.mk          |   4 +-
 keyboards/rocketboard_16/rules.mk             |   2 +-
 keyboards/tgr/jane/v2ce/rules.mk              |   2 +-
 .../{bootloader.c => bootloaders/md_boot.c}   |  47 +--
 platforms/avr/bootloader.c                    | 293 ------------------
 platforms/avr/bootloaders/bootloadhid.c       |  34 ++
 platforms/avr/bootloaders/caterina.c          |  39 +++
 platforms/avr/bootloaders/dfu.c               |  53 ++++
 platforms/avr/bootloaders/halfkay.c           | 129 ++++++++
 platforms/avr/bootloaders/none.c              |  20 ++
 platforms/avr/bootloaders/usbasploader.c      |  57 ++++
 platforms/chibios/bootloader.c                | 145 ---------
 platforms/chibios/bootloaders/gd32v_dfu.c     |  40 +++
 platforms/chibios/bootloaders/halfkay.c       |  26 ++
 platforms/chibios/bootloaders/kiibohd.c       |  33 ++
 platforms/chibios/bootloaders/none.c          |  20 ++
 platforms/chibios/bootloaders/stm32_dfu.c     |  96 ++++++
 platforms/chibios/bootloaders/stm32duino.c    |  24 ++
 platforms/chibios/bootloaders/tinyuf2.c       |  35 +++
 platforms/common.mk                           |   2 +-
 .../test/{bootloader.c => bootloaders/none.c} |   2 +-
 .../protocol/arm_atsam/arm_atsam_protocol.h   |   1 -
 tmk_core/protocol/arm_atsam/md_bootloader.h   |  24 --
 tmk_core/protocol/arm_atsam/startup.c         |   6 +-
 tmk_core/protocol/arm_atsam/usb/udc.c         |   5 +-
 32 files changed, 701 insertions(+), 493 deletions(-)
 rename platforms/arm_atsam/{bootloader.c => bootloaders/md_boot.c} (77%)
 delete mode 100644 platforms/avr/bootloader.c
 create mode 100644 platforms/avr/bootloaders/bootloadhid.c
 create mode 100644 platforms/avr/bootloaders/caterina.c
 create mode 100644 platforms/avr/bootloaders/dfu.c
 create mode 100644 platforms/avr/bootloaders/halfkay.c
 create mode 100644 platforms/avr/bootloaders/none.c
 create mode 100644 platforms/avr/bootloaders/usbasploader.c
 delete mode 100644 platforms/chibios/bootloader.c
 create mode 100644 platforms/chibios/bootloaders/gd32v_dfu.c
 create mode 100644 platforms/chibios/bootloaders/halfkay.c
 create mode 100644 platforms/chibios/bootloaders/kiibohd.c
 create mode 100644 platforms/chibios/bootloaders/none.c
 create mode 100644 platforms/chibios/bootloaders/stm32_dfu.c
 create mode 100644 platforms/chibios/bootloaders/stm32duino.c
 create mode 100644 platforms/chibios/bootloaders/tinyuf2.c
 rename platforms/test/{bootloader.c => bootloaders/none.c} (95%)
 delete mode 100644 tmk_core/protocol/arm_atsam/md_bootloader.h

diff --git a/build_test.mk b/build_test.mk
index 136a0455f0..ec6699b4ea 100644
--- a/build_test.mk
+++ b/build_test.mk
@@ -43,6 +43,7 @@ all: elf
 VPATH += $(COMMON_VPATH)
 PLATFORM:=TEST
 PLATFORM_KEY:=test
+BOOTLOADER_TYPE:=none
 
 ifeq ($(strip $(DEBUG)), 1)
 CONSOLE_ENABLE = yes
diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk
index ccb92392d9..470febc346 100644
--- a/builddefs/bootloader.mk
+++ b/builddefs/bootloader.mk
@@ -30,6 +30,7 @@
 #     bootloadhid  HIDBootFlash compatible (ATmega32A)
 #     usbasploader USBaspLoader (ATmega328P)
 # ARM:
+#     halfkay      PJRC Teensy
 #     kiibohd      Input:Club Kiibohd bootloader (only used on their boards)
 #     stm32duino   STM32Duino (STM32F103x8)
 #     stm32-dfu    STM32 USB DFU in ROM
@@ -43,6 +44,8 @@
 ifeq ($(strip $(BOOTLOADER)), atmel-dfu)
     OPT_DEFS += -DBOOTLOADER_ATMEL_DFU
     OPT_DEFS += -DBOOTLOADER_DFU
+    BOOTLOADER_TYPE = dfu
+
     ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647))
         BOOTLOADER_SIZE = 4096
     endif
@@ -53,6 +56,8 @@ endif
 ifeq ($(strip $(BOOTLOADER)), lufa-dfu)
     OPT_DEFS += -DBOOTLOADER_LUFA_DFU
     OPT_DEFS += -DBOOTLOADER_DFU
+    BOOTLOADER_TYPE = dfu
+
     ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647))
         BOOTLOADER_SIZE ?= 4096
     endif
@@ -63,6 +68,8 @@ endif
 ifeq ($(strip $(BOOTLOADER)), qmk-dfu)
     OPT_DEFS += -DBOOTLOADER_QMK_DFU
     OPT_DEFS += -DBOOTLOADER_DFU
+    BOOTLOADER_TYPE = dfu
+
     ifneq (,$(filter $(MCU), at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647))
         BOOTLOADER_SIZE ?= 4096
     endif
@@ -73,10 +80,14 @@ endif
 ifeq ($(strip $(BOOTLOADER)), qmk-hid)
     OPT_DEFS += -DBOOTLOADER_QMK_HID
     OPT_DEFS += -DBOOTLOADER_HID
+    BOOTLOADER_TYPE = dfu
+
     BOOTLOADER_SIZE ?= 4096
 endif
 ifeq ($(strip $(BOOTLOADER)), halfkay)
     OPT_DEFS += -DBOOTLOADER_HALFKAY
+    BOOTLOADER_TYPE = halfkay
+
     ifeq ($(strip $(MCU)), atmega32u4)
         BOOTLOADER_SIZE = 512
     endif
@@ -86,18 +97,26 @@ ifeq ($(strip $(BOOTLOADER)), halfkay)
 endif
 ifeq ($(strip $(BOOTLOADER)), caterina)
     OPT_DEFS += -DBOOTLOADER_CATERINA
+    BOOTLOADER_TYPE = caterina
+
     BOOTLOADER_SIZE = 4096
 endif
 ifneq (,$(filter $(BOOTLOADER), bootloadhid bootloadHID))
     OPT_DEFS += -DBOOTLOADER_BOOTLOADHID
+    BOOTLOADER_TYPE = bootloadhid
+
     BOOTLOADER_SIZE = 4096
 endif
 ifneq (,$(filter $(BOOTLOADER), usbasploader USBasp))
     OPT_DEFS += -DBOOTLOADER_USBASP
+    BOOTLOADER_TYPE = usbasploader
+
     BOOTLOADER_SIZE = 4096
 endif
 ifeq ($(strip $(BOOTLOADER)), lufa-ms)
     OPT_DEFS += -DBOOTLOADER_MS
+    BOOTLOADER_TYPE = dfu
+
     BOOTLOADER_SIZE ?= 8192
     FIRMWARE_FORMAT = bin
 cpfirmware: lufa_warning
@@ -115,6 +134,7 @@ endif
 
 ifeq ($(strip $(BOOTLOADER)), stm32-dfu)
     OPT_DEFS += -DBOOTLOADER_STM32_DFU
+    BOOTLOADER_TYPE = stm32_dfu
 
     # Options to pass to dfu-util when flashing
     DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave
@@ -122,6 +142,7 @@ ifeq ($(strip $(BOOTLOADER)), stm32-dfu)
 endif
 ifeq ($(strip $(BOOTLOADER)), apm32-dfu)
     OPT_DEFS += -DBOOTLOADER_APM32_DFU
+    BOOTLOADER_TYPE = stm32_dfu
 
     # Options to pass to dfu-util when flashing
     DFU_ARGS ?= -d 314B:0106 -a 0 -s 0x08000000:leave
@@ -129,6 +150,7 @@ ifeq ($(strip $(BOOTLOADER)), apm32-dfu)
 endif
 ifeq ($(strip $(BOOTLOADER)), gd32v-dfu)
     OPT_DEFS += -DBOOTLOADER_GD32V_DFU
+    BOOTLOADER_TYPE = gd32v_dfu
 
     # Options to pass to dfu-util when flashing
     DFU_ARGS ?= -d 28E9:0189 -a 0 -s 0x08000000:leave
@@ -136,6 +158,8 @@ ifeq ($(strip $(BOOTLOADER)), gd32v-dfu)
 endif
 ifeq ($(strip $(BOOTLOADER)), kiibohd)
     OPT_DEFS += -DBOOTLOADER_KIIBOHD
+    BOOTLOADER_TYPE = kiibohd
+
     ifeq ($(strip $(MCU_ORIG)), MK20DX128)
         MCU_LDSCRIPT = MK20DX128BLDR4
     endif
@@ -151,8 +175,7 @@ ifeq ($(strip $(BOOTLOADER)), stm32duino)
     OPT_DEFS += -DBOOTLOADER_STM32DUINO
     MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
     BOARD = STM32_F103_STM32DUINO
-    # STM32F103 does NOT have an USB bootloader in ROM (only serial), so setting anything here does not make much sense
-    STM32_BOOTLOADER_ADDRESS = 0x80000000
+    BOOTLOADER_TYPE = stm32duino
 
     # Options to pass to dfu-util when flashing
     DFU_ARGS = -d 1EAF:0003 -a 2 -R
@@ -160,4 +183,17 @@ ifeq ($(strip $(BOOTLOADER)), stm32duino)
 endif
 ifeq ($(strip $(BOOTLOADER)), tinyuf2)
     OPT_DEFS += -DBOOTLOADER_TINYUF2
+    BOOTLOADER_TYPE = tinyuf2
+endif
+ifeq ($(strip $(BOOTLOADER)), halfkay)
+    OPT_DEFS += -DBOOTLOADER_HALFKAY
+    BOOTLOADER_TYPE = halfkay
+endif
+ifeq ($(strip $(BOOTLOADER)), md-boot)
+    OPT_DEFS += -DBOOTLOADER_MD_BOOT
+    BOOTLOADER_TYPE = md_boot
+endif
+
+ifeq ($(strip $(BOOTLOADER_TYPE)),)
+    BOOTLOADER_TYPE = none
 endif
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 2daeaf04b4..94bbbe7e85 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -57,7 +57,7 @@
         },
         "bootloader": {
             "type": "string",
-            "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "micronucleus", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2"],
+            "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "micronucleus", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2"],
         },
         "bootloader_instructions": {
             "type": "string",
diff --git a/keyboards/handwired/onekey/teensy_32/rules.mk b/keyboards/handwired/onekey/teensy_32/rules.mk
index c1b90d0d2b..937c9d5103 100644
--- a/keyboards/handwired/onekey/teensy_32/rules.mk
+++ b/keyboards/handwired/onekey/teensy_32/rules.mk
@@ -1,5 +1,8 @@
 # MCU name
 MCU = MK20DX256
 
+# Bootloader selection
+BOOTLOADER = halfkay
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/onekey/teensy_lc/rules.mk b/keyboards/handwired/onekey/teensy_lc/rules.mk
index b3daabe317..0e3c7edf7a 100644
--- a/keyboards/handwired/onekey/teensy_lc/rules.mk
+++ b/keyboards/handwired/onekey/teensy_lc/rules.mk
@@ -2,5 +2,8 @@
 MCU = MKL26Z64
 USE_CHIBIOS_CONTRIB = yes
 
+# Bootloader selection
+BOOTLOADER = halfkay
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/massdrop/alt/rules.mk b/keyboards/massdrop/alt/rules.mk
index 83d4fc590b..f0ff36fa35 100644
--- a/keyboards/massdrop/alt/rules.mk
+++ b/keyboards/massdrop/alt/rules.mk
@@ -5,6 +5,9 @@ SRC += config_led.c
 ARM_ATSAM = SAMD51J18A
 MCU = cortex-m4
 
+# Bootloader selection
+BOOTLOADER = md-boot
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/massdrop/ctrl/rules.mk b/keyboards/massdrop/ctrl/rules.mk
index 667642f83d..a302c82d86 100644
--- a/keyboards/massdrop/ctrl/rules.mk
+++ b/keyboards/massdrop/ctrl/rules.mk
@@ -5,6 +5,9 @@ SRC += config_led.c
 ARM_ATSAM = SAMD51J18A
 MCU = cortex-m4
 
+# Bootloader selection
+BOOTLOADER = md-boot
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/mechlovin/olly/jf/rules.mk b/keyboards/mechlovin/olly/jf/rules.mk
index c0c9b2d7ea..2fafe64f12 100644
--- a/keyboards/mechlovin/olly/jf/rules.mk
+++ b/keyboards/mechlovin/olly/jf/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32a
 F_CPU = 16000000
 
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 
 # Build Options
 #   change yes to no to disable
@@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = lite
 
-SRC += matrix.c
\ No newline at end of file
+SRC += matrix.c
diff --git a/keyboards/rocketboard_16/rules.mk b/keyboards/rocketboard_16/rules.mk
index d27da2c226..c07ebff427 100644
--- a/keyboards/rocketboard_16/rules.mk
+++ b/keyboards/rocketboard_16/rules.mk
@@ -8,7 +8,7 @@ MCU = STM32F103
 MCU_LDSCRIPT = STM32F103xB_stm32duino_bootloader
 OPT_DEFS += -DBOOTLOADER_STM32DUINO
 BOARD = STM32_F103_STM32DUINO
-STM32_BOOTLOADER_ADDRESS = 0x80000000
+BOOTLOADER_TYPE = stm32duino
 DFU_ARGS = -d 1EAF:0003 -a 2 -R
 DFU_SUFFIX_ARGS = -v 1EAF -p 0003
 
diff --git a/keyboards/tgr/jane/v2ce/rules.mk b/keyboards/tgr/jane/v2ce/rules.mk
index 0a865321a6..8fcc8d911f 100644
--- a/keyboards/tgr/jane/v2ce/rules.mk
+++ b/keyboards/tgr/jane/v2ce/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 
 # Bootloader selection
-BOOTLOADER = bootloadHID
+BOOTLOADER = bootloadhid
 
 # Build Options
 #   change yes to no to disable
diff --git a/platforms/arm_atsam/bootloader.c b/platforms/arm_atsam/bootloaders/md_boot.c
similarity index 77%
rename from platforms/arm_atsam/bootloader.c
rename to platforms/arm_atsam/bootloaders/md_boot.c
index 9015b00aab..fe07389487 100644
--- a/platforms/arm_atsam/bootloader.c
+++ b/platforms/arm_atsam/bootloaders/md_boot.c
@@ -15,13 +15,18 @@
  */
 
 #include "bootloader.h"
-#include "samd51j18a.h"
-#include "md_bootloader.h"
 
-// Set watchdog timer to reset. Directs the bootloader to stay in programming mode.
-void bootloader_jump(void) {
+#include "samd51j18a.h"
+
 #ifdef KEYBOARD_massdrop_ctrl
-    // CTRL keyboards released with bootloader version below must use RAM method. Otherwise use WDT method.
+// WARNING: These are only for CTRL bootloader release "v2.18Jun 22 2018 17:28:08" for bootloader_jump support
+extern uint32_t _eram;
+
+#define BOOTLOADER_MAGIC 0x3B9ACA00
+#define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4)
+
+// CTRL keyboards released with bootloader version below must use RAM method. Otherwise use WDT method.
+void bootloader_jump(void) {
     uint8_t  ver_ram_method[] = "v2.18Jun 22 2018 17:28:08";  // The version to match (NULL terminated by compiler)
     uint8_t *ver_check        = ver_ram_method;               // Pointer to version match string for traversal
     uint8_t *ver_rom          = (uint8_t *)0x21A0;            // Pointer to address in ROM where this specific bootloader version would exist
@@ -34,24 +39,28 @@ void bootloader_jump(void) {
     if (!*ver_check) {                   // If check version pointer is NULL, all characters have matched
         *MAGIC_ADDR = BOOTLOADER_MAGIC;  // Set magic number into RAM
         NVIC_SystemReset();              // Perform system reset
-        while (1) {
-        }  // Won't get here
-    }
-#endif
 
+        while (1);  // Won't get here
+    }
+}
+
+#else
+
+// Set watchdog timer to reset. Directs the bootloader to stay in programming mode.
+void bootloader_jump(void) {
     WDT->CTRLA.bit.ENABLE = 0;
-    while (WDT->SYNCBUSY.bit.ENABLE) {
-    }
-    while (WDT->CTRLA.bit.ENABLE) {
-    }
+
+    while (WDT->SYNCBUSY.bit.ENABLE);
+    while (WDT->CTRLA.bit.ENABLE);
+
     WDT->CONFIG.bit.WINDOW   = 0;
     WDT->CONFIG.bit.PER      = 0;
     WDT->EWCTRL.bit.EWOFFSET = 0;
     WDT->CTRLA.bit.ENABLE    = 1;
-    while (WDT->SYNCBUSY.bit.ENABLE) {
-    }
-    while (!WDT->CTRLA.bit.ENABLE) {
-    }
-    while (1) {
-    }  // Wait on timeout
+
+    while (WDT->SYNCBUSY.bit.ENABLE);
+    while (!WDT->CTRLA.bit.ENABLE);
+
+    while (1);  // Wait on timeout
 }
+#endif
diff --git a/platforms/avr/bootloader.c b/platforms/avr/bootloader.c
deleted file mode 100644
index c0272903b8..0000000000
--- a/platforms/avr/bootloader.c
+++ /dev/null
@@ -1,293 +0,0 @@
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include <avr/eeprom.h>
-#include <avr/interrupt.h>
-#include <avr/wdt.h>
-#include <util/delay.h>
-#include "bootloader.h"
-#include <avr/boot.h>
-
-#ifdef PROTOCOL_LUFA
-#    include <LUFA/Drivers/USB/USB.h>
-#endif
-
-/** \brief Bootloader Size in *bytes*
- *
- * AVR Boot section size are defined by setting BOOTSZ fuse in fact. Consult with your MCU datasheet.
- * Note that 'Word'(2 bytes) size and address are used in datasheet while TMK uses 'Byte'.
- *
- * Size of Bootloaders in bytes:
- *   Atmel DFU loader(ATmega32U4)   4096
- *   Atmel DFU loader(AT90USB128)   8192
- *   LUFA bootloader(ATmega32U4)    4096
- *   Arduino Caterina(ATmega32U4)   4096
- *   USBaspLoader(ATmega***)        2048
- *   Teensy   halfKay(ATmega32U4)   512
- *   Teensy++ halfKay(AT90USB128)   1024
- *
- * AVR Boot section is located at the end of Flash memory like the followings.
- *
- * byte     Atmel/LUFA(ATMega32u4)          byte     Atmel(AT90SUB128)
- * 0x0000   +---------------+               0x00000  +---------------+
- *          |               |                        |               |
- *          |               |                        |               |
- *          |  Application  |                        |  Application  |
- *          |               |                        |               |
- *          =               =                        =               =
- *          |               | 32KB-4KB               |               | 128KB-8KB
- * 0x7000   +---------------+               0x1E000  +---------------+
- *          |  Bootloader   | 4KB                    |  Bootloader   | 8KB
- * 0x7FFF   +---------------+               0x1FFFF  +---------------+
- *
- *
- * byte     Teensy(ATMega32u4)              byte     Teensy++(AT90SUB128)
- * 0x0000   +---------------+               0x00000  +---------------+
- *          |               |                        |               |
- *          |               |                        |               |
- *          |  Application  |                        |  Application  |
- *          |               |                        |               |
- *          =               =                        =               =
- *          |               | 32KB-512B              |               | 128KB-1KB
- * 0x7E00   +---------------+               0x1FC00  +---------------+
- *          |  Bootloader   | 512B                   |  Bootloader   | 1KB
- * 0x7FFF   +---------------+               0x1FFFF  +---------------+
- */
-#define FLASH_SIZE (FLASHEND + 1L)
-
-#if !defined(BOOTLOADER_SIZE)
-uint16_t bootloader_start;
-#endif
-
-// compatibility between ATMega8 and ATMega88
-#if !defined(MCUCSR)
-#    if defined(MCUSR)
-#        define MCUCSR MCUSR
-#    endif
-#endif
-
-/** \brief Entering the Bootloader via Software
- *
- * http://www.fourwalledcubicle.com/files/LUFA/Doc/120730/html/_page__software_bootloader_start.html
- */
-#define BOOTLOADER_RESET_KEY 0xB007B007
-uint32_t reset_key __attribute__((section(".noinit,\"aw\",@nobits;")));
-
-/** \brief initialize MCU status by watchdog reset
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void bootloader_jump(void) {
-#if !defined(BOOTLOADER_SIZE)
-    uint8_t high_fuse = boot_lock_fuse_bits_get(GET_HIGH_FUSE_BITS);
-
-    if (high_fuse & ~(FUSE_BOOTSZ0 & FUSE_BOOTSZ1)) {
-        bootloader_start = (FLASH_SIZE - 512) >> 1;
-    } else if (high_fuse & ~(FUSE_BOOTSZ1)) {
-        bootloader_start = (FLASH_SIZE - 1024) >> 1;
-    } else if (high_fuse & ~(FUSE_BOOTSZ0)) {
-        bootloader_start = (FLASH_SIZE - 2048) >> 1;
-    } else {
-        bootloader_start = (FLASH_SIZE - 4096) >> 1;
-    }
-#endif
-
-    // Something like this might work, but it compiled larger than the block above
-    // bootloader_start = FLASH_SIZE - (256 << (~high_fuse & 0b110 >> 1));
-
-#if defined(BOOTLOADER_HALFKAY)
-    //  http://www.pjrc.com/teensy/jump_to_bootloader.html
-    cli();
-    // disable watchdog, if enabled (it's not)
-    // disable all peripherals
-    // a shutdown call might make sense here
-    UDCON  = 1;
-    USBCON = (1 << FRZCLK);  // disable USB
-    UCSR1B = 0;
-    _delay_ms(5);
-#    if defined(__AVR_AT90USB162__)  // Teensy 1.0
-    EIMSK  = 0;
-    PCICR  = 0;
-    SPCR   = 0;
-    ACSR   = 0;
-    EECR   = 0;
-    TIMSK0 = 0;
-    TIMSK1 = 0;
-    UCSR1B = 0;
-    DDRB   = 0;
-    DDRC   = 0;
-    DDRD   = 0;
-    PORTB  = 0;
-    PORTC  = 0;
-    PORTD  = 0;
-    asm volatile("jmp 0x3E00");
-#    elif defined(__AVR_ATmega32U4__)   // Teensy 2.0
-    EIMSK  = 0;
-    PCICR  = 0;
-    SPCR   = 0;
-    ACSR   = 0;
-    EECR   = 0;
-    ADCSRA = 0;
-    TIMSK0 = 0;
-    TIMSK1 = 0;
-    TIMSK3 = 0;
-    TIMSK4 = 0;
-    UCSR1B = 0;
-    TWCR   = 0;
-    DDRB   = 0;
-    DDRC   = 0;
-    DDRD   = 0;
-    DDRE   = 0;
-    DDRF   = 0;
-    TWCR   = 0;
-    PORTB  = 0;
-    PORTC  = 0;
-    PORTD  = 0;
-    PORTE  = 0;
-    PORTF  = 0;
-    asm volatile("jmp 0x7E00");
-#    elif defined(__AVR_AT90USB646__)   // Teensy++ 1.0
-    EIMSK  = 0;
-    PCICR  = 0;
-    SPCR   = 0;
-    ACSR   = 0;
-    EECR   = 0;
-    ADCSRA = 0;
-    TIMSK0 = 0;
-    TIMSK1 = 0;
-    TIMSK2 = 0;
-    TIMSK3 = 0;
-    UCSR1B = 0;
-    TWCR   = 0;
-    DDRA   = 0;
-    DDRB   = 0;
-    DDRC   = 0;
-    DDRD   = 0;
-    DDRE   = 0;
-    DDRF   = 0;
-    PORTA  = 0;
-    PORTB  = 0;
-    PORTC  = 0;
-    PORTD  = 0;
-    PORTE  = 0;
-    PORTF  = 0;
-    asm volatile("jmp 0xFC00");
-#    elif defined(__AVR_AT90USB1286__)  // Teensy++ 2.0
-    EIMSK  = 0;
-    PCICR  = 0;
-    SPCR   = 0;
-    ACSR   = 0;
-    EECR   = 0;
-    ADCSRA = 0;
-    TIMSK0 = 0;
-    TIMSK1 = 0;
-    TIMSK2 = 0;
-    TIMSK3 = 0;
-    UCSR1B = 0;
-    TWCR   = 0;
-    DDRA   = 0;
-    DDRB   = 0;
-    DDRC   = 0;
-    DDRD   = 0;
-    DDRE   = 0;
-    DDRF   = 0;
-    PORTA  = 0;
-    PORTB  = 0;
-    PORTC  = 0;
-    PORTD  = 0;
-    PORTE  = 0;
-    PORTF  = 0;
-    asm volatile("jmp 0x1FC00");
-#    endif
-
-#elif defined(BOOTLOADER_CATERINA)
-    // this block may be optional
-    // TODO: figure it out
-
-    uint16_t *const bootKeyPtr = (uint16_t *)0x0800;
-
-    // Value used by Caterina bootloader use to determine whether to run the
-    // sketch or the bootloader programmer.
-    uint16_t bootKey = 0x7777;
-
-    *bootKeyPtr = bootKey;
-
-    // setup watchdog timeout
-    wdt_enable(WDTO_60MS);
-
-    while (1) {
-    }  // wait for watchdog timer to trigger
-
-#elif defined(BOOTLOADER_USBASP)
-    // Taken with permission of Stephan Baerwolf from https://github.com/tinyusbboard/API/blob/master/apipage.c
-    wdt_enable(WDTO_15MS);
-    wdt_reset();
-    asm volatile("cli                    \n\t"
-                 "ldi    r29 ,       %[ramendhi] \n\t"
-                 "ldi    r28 ,       %[ramendlo] \n\t"
-#    if (FLASHEND > 131071)
-                 "ldi    r18 ,       %[bootaddrhi]   \n\t"
-                 "st     Y+,         r18     \n\t"
-#    endif
-                 "ldi    r18 ,       %[bootaddrme]   \n\t"
-                 "st     Y+,     r18     \n\t"
-                 "ldi    r18 ,       %[bootaddrlo]   \n\t"
-                 "st     Y+,     r18     \n\t"
-                 "out    %[mcucsrio],    __zero_reg__    \n\t"
-                 "bootloader_startup_loop%=:         \n\t"
-                 "rjmp bootloader_startup_loop%=     \n\t"
-                 :
-                 : [mcucsrio] "I"(_SFR_IO_ADDR(MCUCSR)),
-#    if (FLASHEND > 131071)
-                   [ramendhi] "M"(((RAMEND - 2) >> 8) & 0xff), [ramendlo] "M"(((RAMEND - 2) >> 0) & 0xff), [bootaddrhi] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 16) & 0xff),
-#    else
-                   [ramendhi] "M"(((RAMEND - 1) >> 8) & 0xff), [ramendlo] "M"(((RAMEND - 1) >> 0) & 0xff),
-#    endif
-                   [bootaddrme] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 8) & 0xff), [bootaddrlo] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 0) & 0xff));
-
-#else  // Assume remaining boards are DFU, even if the flag isn't set
-
-#    if !(defined(__AVR_ATmega32A__) || defined(__AVR_ATmega328P__) || defined(__AVR_ATmega328__) || defined(__AVR_ATtiny85__))  // no USB - maybe BOOTLOADER_BOOTLOADHID instead though?
-    UDCON  = 1;
-    USBCON = (1 << FRZCLK);  // disable USB
-    UCSR1B = 0;
-    _delay_ms(5);  // 5 seems to work fine
-#    endif
-
-#    ifdef BOOTLOADER_BOOTLOADHID
-    // force bootloadHID to stay in bootloader mode, so that it waits
-    // for a new firmware to be flashed
-    eeprom_write_byte((uint8_t *)1, 0x00);
-#    endif
-
-    // watchdog reset
-    reset_key = BOOTLOADER_RESET_KEY;
-    wdt_enable(WDTO_250MS);
-    for (;;)
-        ;
-#endif
-}
-
-/* this runs before main() */
-void bootloader_jump_after_watchdog_reset(void) __attribute__((used, naked, section(".init3")));
-void bootloader_jump_after_watchdog_reset(void) {
-#ifndef BOOTLOADER_HALFKAY
-    if ((MCUCSR & (1 << WDRF)) && reset_key == BOOTLOADER_RESET_KEY) {
-        reset_key = 0;
-
-        // My custom USBasploader requires this to come up.
-        MCUCSR = 0;
-
-        // Seems like Teensy halfkay loader requires clearing WDRF and disabling watchdog.
-        MCUCSR &= ~(1 << WDRF);
-        wdt_disable();
-
-// This is compled into 'icall', address should be in word unit, not byte.
-#    ifdef BOOTLOADER_SIZE
-        ((void (*)(void))((FLASH_SIZE - BOOTLOADER_SIZE) >> 1))();
-#    else
-        asm("ijmp" ::"z"(bootloader_start));
-#    endif
-    }
-#endif
-}
diff --git a/platforms/avr/bootloaders/bootloadhid.c b/platforms/avr/bootloaders/bootloadhid.c
new file mode 100644
index 0000000000..8d18114613
--- /dev/null
+++ b/platforms/avr/bootloaders/bootloadhid.c
@@ -0,0 +1,34 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+#include <avr/eeprom.h>
+#include <avr/wdt.h>
+
+__attribute__((weak))
+void bootloader_jump(void) {
+    // force bootloadHID to stay in bootloader mode, so that it waits
+    // for a new firmware to be flashed
+    // NOTE: this byte is part of QMK's "magic number" - changing it causes the EEPROM to be re-initialized
+    // thus every time the device is flashed the EEPROM will be wiped
+    eeprom_write_byte((uint8_t *)1, 0x00);
+
+    // watchdog reset
+    wdt_enable(WDTO_250MS);
+    for (;;)
+        ;
+}
diff --git a/platforms/avr/bootloaders/caterina.c b/platforms/avr/bootloaders/caterina.c
new file mode 100644
index 0000000000..1b43ed4e44
--- /dev/null
+++ b/platforms/avr/bootloaders/caterina.c
@@ -0,0 +1,39 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+#include <avr/wdt.h>
+
+__attribute__((weak))
+void bootloader_jump(void) {
+    // this block may be optional
+    // TODO: figure it out
+
+    uint16_t *const bootKeyPtr = (uint16_t *)0x0800;
+
+    // Value used by Caterina bootloader use to determine whether to run the
+    // sketch or the bootloader programmer.
+    uint16_t bootKey = 0x7777;
+
+    *bootKeyPtr = bootKey;
+
+    // setup watchdog timeout
+    wdt_enable(WDTO_60MS);
+
+    // wait for watchdog timer to trigger
+    while (1) { }
+}
diff --git a/platforms/avr/bootloaders/dfu.c b/platforms/avr/bootloaders/dfu.c
new file mode 100644
index 0000000000..bdf5908934
--- /dev/null
+++ b/platforms/avr/bootloaders/dfu.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+#include <avr/wdt.h>
+#include <util/delay.h>
+
+#define FLASH_SIZE (FLASHEND + 1L)
+
+/** \brief Entering the Bootloader via Software
+ *
+ * http://www.fourwalledcubicle.com/files/LUFA/Doc/120730/html/_page__software_bootloader_start.html
+ */
+#define BOOTLOADER_RESET_KEY 0xB007B007
+uint32_t reset_key __attribute__((section(".noinit,\"aw\",@nobits;")));
+
+__attribute__((weak))
+void bootloader_jump(void) {
+    UDCON  = 1;
+    USBCON = (1 << FRZCLK);  // disable USB
+    UCSR1B = 0;
+    _delay_ms(5);  // 5 seems to work fine
+
+    // watchdog reset
+    reset_key = BOOTLOADER_RESET_KEY;
+    wdt_enable(WDTO_250MS);
+    for (;;)
+        ;
+}
+
+/* this runs before main() */
+void bootloader_jump_after_watchdog_reset(void) __attribute__((used, naked, section(".init3")));
+void bootloader_jump_after_watchdog_reset(void) {
+    if ((MCUSR & (1 << WDRF)) && reset_key == BOOTLOADER_RESET_KEY) {
+        reset_key = 0;
+
+        ((void (*)(void))((FLASH_SIZE - BOOTLOADER_SIZE) >> 1))();
+    }
+}
diff --git a/platforms/avr/bootloaders/halfkay.c b/platforms/avr/bootloaders/halfkay.c
new file mode 100644
index 0000000000..abef86980b
--- /dev/null
+++ b/platforms/avr/bootloaders/halfkay.c
@@ -0,0 +1,129 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+#include <avr/interrupt.h>
+#include <util/delay.h>
+
+__attribute__((weak))
+void bootloader_jump(void) {
+    // http://www.pjrc.com/teensy/jump_to_bootloader.html
+
+    cli();
+    // disable watchdog, if enabled (it's not)
+    // disable all peripherals
+    // a shutdown call might make sense here
+    UDCON  = 1;
+    USBCON = (1 << FRZCLK);  // disable USB
+    UCSR1B = 0;
+    _delay_ms(5);
+
+#if defined(__AVR_AT90USB162__)  // Teensy 1.0
+    EIMSK  = 0;
+    PCICR  = 0;
+    SPCR   = 0;
+    ACSR   = 0;
+    EECR   = 0;
+    TIMSK0 = 0;
+    TIMSK1 = 0;
+    UCSR1B = 0;
+    DDRB   = 0;
+    DDRC   = 0;
+    DDRD   = 0;
+    PORTB  = 0;
+    PORTC  = 0;
+    PORTD  = 0;
+    asm volatile("jmp 0x3E00");
+#elif defined(__AVR_ATmega32U4__)   // Teensy 2.0
+    EIMSK  = 0;
+    PCICR  = 0;
+    SPCR   = 0;
+    ACSR   = 0;
+    EECR   = 0;
+    ADCSRA = 0;
+    TIMSK0 = 0;
+    TIMSK1 = 0;
+    TIMSK3 = 0;
+    TIMSK4 = 0;
+    UCSR1B = 0;
+    TWCR   = 0;
+    DDRB   = 0;
+    DDRC   = 0;
+    DDRD   = 0;
+    DDRE   = 0;
+    DDRF   = 0;
+    TWCR   = 0;
+    PORTB  = 0;
+    PORTC  = 0;
+    PORTD  = 0;
+    PORTE  = 0;
+    PORTF  = 0;
+    asm volatile("jmp 0x7E00");
+#elif defined(__AVR_AT90USB646__)   // Teensy++ 1.0
+    EIMSK  = 0;
+    PCICR  = 0;
+    SPCR   = 0;
+    ACSR   = 0;
+    EECR   = 0;
+    ADCSRA = 0;
+    TIMSK0 = 0;
+    TIMSK1 = 0;
+    TIMSK2 = 0;
+    TIMSK3 = 0;
+    UCSR1B = 0;
+    TWCR   = 0;
+    DDRA   = 0;
+    DDRB   = 0;
+    DDRC   = 0;
+    DDRD   = 0;
+    DDRE   = 0;
+    DDRF   = 0;
+    PORTA  = 0;
+    PORTB  = 0;
+    PORTC  = 0;
+    PORTD  = 0;
+    PORTE  = 0;
+    PORTF  = 0;
+    asm volatile("jmp 0xFC00");
+#elif defined(__AVR_AT90USB1286__)  // Teensy++ 2.0
+    EIMSK  = 0;
+    PCICR  = 0;
+    SPCR   = 0;
+    ACSR   = 0;
+    EECR   = 0;
+    ADCSRA = 0;
+    TIMSK0 = 0;
+    TIMSK1 = 0;
+    TIMSK2 = 0;
+    TIMSK3 = 0;
+    UCSR1B = 0;
+    TWCR   = 0;
+    DDRA   = 0;
+    DDRB   = 0;
+    DDRC   = 0;
+    DDRD   = 0;
+    DDRE   = 0;
+    DDRF   = 0;
+    PORTA  = 0;
+    PORTB  = 0;
+    PORTC  = 0;
+    PORTD  = 0;
+    PORTE  = 0;
+    PORTF  = 0;
+    asm volatile("jmp 0x1FC00");
+#endif
+}
diff --git a/platforms/avr/bootloaders/none.c b/platforms/avr/bootloaders/none.c
new file mode 100644
index 0000000000..8af151c04d
--- /dev/null
+++ b/platforms/avr/bootloaders/none.c
@@ -0,0 +1,20 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+__attribute__((weak))
+void bootloader_jump(void) { }
diff --git a/platforms/avr/bootloaders/usbasploader.c b/platforms/avr/bootloaders/usbasploader.c
new file mode 100644
index 0000000000..b3e9b2d72d
--- /dev/null
+++ b/platforms/avr/bootloaders/usbasploader.c
@@ -0,0 +1,57 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+#include <avr/wdt.h>
+
+#define FLASH_SIZE (FLASHEND + 1L)
+
+#if !defined(MCUCSR)
+#    if defined(MCUSR)
+#        define MCUCSR MCUSR
+#    endif
+#endif
+
+__attribute__((weak))
+void bootloader_jump(void) {
+    // Taken with permission of Stephan Baerwolf from https://github.com/tinyusbboard/API/blob/master/apipage.c
+
+    wdt_enable(WDTO_15MS);
+    wdt_reset();
+    asm volatile("cli                    \n\t"
+                 "ldi    r29 ,       %[ramendhi] \n\t"
+                 "ldi    r28 ,       %[ramendlo] \n\t"
+#if (FLASHEND > 131071)
+                 "ldi    r18 ,       %[bootaddrhi]   \n\t"
+                 "st     Y+,         r18     \n\t"
+#endif
+                 "ldi    r18 ,       %[bootaddrme]   \n\t"
+                 "st     Y+,     r18     \n\t"
+                 "ldi    r18 ,       %[bootaddrlo]   \n\t"
+                 "st     Y+,     r18     \n\t"
+                 "out    %[mcucsrio],    __zero_reg__    \n\t"
+                 "bootloader_startup_loop%=:         \n\t"
+                 "rjmp bootloader_startup_loop%=     \n\t"
+                 :
+                 : [mcucsrio] "I"(_SFR_IO_ADDR(MCUCSR)),
+#if (FLASHEND > 131071)
+                   [ramendhi] "M"(((RAMEND - 2) >> 8) & 0xff), [ramendlo] "M"(((RAMEND - 2) >> 0) & 0xff), [bootaddrhi] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 16) & 0xff),
+#else
+                   [ramendhi] "M"(((RAMEND - 1) >> 8) & 0xff), [ramendlo] "M"(((RAMEND - 1) >> 0) & 0xff),
+#endif
+                   [bootaddrme] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 8) & 0xff), [bootaddrlo] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 0) & 0xff));
+}
diff --git a/platforms/chibios/bootloader.c b/platforms/chibios/bootloader.c
deleted file mode 100644
index 58212948b0..0000000000
--- a/platforms/chibios/bootloader.c
+++ /dev/null
@@ -1,145 +0,0 @@
-#include "bootloader.h"
-
-#include <ch.h>
-#include <hal.h>
-#include "wait.h"
-
-/* This code should be checked whether it runs correctly on platforms */
-#define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
-#define BOOTLOADER_MAGIC 0xDEADBEEF
-#define MAGIC_ADDR (unsigned long *)(SYMVAL(__ram0_end__) - 4)
-
-#ifndef STM32_BOOTLOADER_DUAL_BANK
-#    define STM32_BOOTLOADER_DUAL_BANK FALSE
-#endif
-
-#ifdef BOOTLOADER_TINYUF2
-
-#    define DBL_TAP_MAGIC 0xf01669ef  // From tinyuf2's board_api.h
-
-// defined by linker script
-extern uint32_t _board_dfu_dbl_tap[];
-#    define DBL_TAP_REG _board_dfu_dbl_tap[0]
-
-void bootloader_jump(void) {
-    DBL_TAP_REG = DBL_TAP_MAGIC;
-    NVIC_SystemReset();
-}
-
-void enter_bootloader_mode_if_requested(void) { /* not needed, no two-stage reset */
-}
-
-#elif STM32_BOOTLOADER_DUAL_BANK
-
-// Need pin definitions
-#    include "config_common.h"
-
-#    ifndef STM32_BOOTLOADER_DUAL_BANK_GPIO
-#        error "No STM32_BOOTLOADER_DUAL_BANK_GPIO defined, don't know which pin to toggle"
-#    endif
-
-#    ifndef STM32_BOOTLOADER_DUAL_BANK_POLARITY
-#        define STM32_BOOTLOADER_DUAL_BANK_POLARITY 0
-#    endif
-
-#    ifndef STM32_BOOTLOADER_DUAL_BANK_DELAY
-#        define STM32_BOOTLOADER_DUAL_BANK_DELAY 100000
-#    endif
-
-extern uint32_t __ram0_end__;
-
-__attribute__((weak)) void bootloader_jump(void) {
-    // For STM32 MCUs with dual-bank flash, and we're incapable of jumping to the bootloader. The first valid flash
-    // bank is executed unconditionally after a reset, so it doesn't enter DFU unless BOOT0 is high. Instead, we do
-    // it with hardware...in this case, we pull a GPIO high/low depending on the configuration, connects 3.3V to
-    // BOOT0's RC charging circuit, lets it charge the capacitor, and issue a system reset. See the QMK discord
-    // #hardware channel pins for an example circuit.
-    palSetPadMode(PAL_PORT(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_PAD(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_MODE_OUTPUT_PUSHPULL);
-#    if STM32_BOOTLOADER_DUAL_BANK_POLARITY
-    palSetPad(PAL_PORT(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_PAD(STM32_BOOTLOADER_DUAL_BANK_GPIO));
-#    else
-    palClearPad(PAL_PORT(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_PAD(STM32_BOOTLOADER_DUAL_BANK_GPIO));
-#    endif
-
-    // Wait for a while for the capacitor to charge
-    wait_ms(100);
-
-    // Issue a system reset to get the ROM bootloader to execute, with BOOT0 high
-    NVIC_SystemReset();
-}
-
-void enter_bootloader_mode_if_requested(void) {}  // not needed at all, but if anybody attempts to invoke it....
-
-#elif defined(STM32_BOOTLOADER_ADDRESS)  // STM32_BOOTLOADER_DUAL_BANK
-
-extern uint32_t __ram0_end__;
-
-__attribute__((weak)) void bootloader_jump(void) {
-    *MAGIC_ADDR = BOOTLOADER_MAGIC;  // set magic flag => reset handler will jump into boot loader
-    NVIC_SystemReset();
-}
-
-void enter_bootloader_mode_if_requested(void) {
-    unsigned long *check = MAGIC_ADDR;
-    if (*check == BOOTLOADER_MAGIC) {
-        *check = 0;
-        __set_CONTROL(0);
-        __set_MSP(*(__IO uint32_t *)STM32_BOOTLOADER_ADDRESS);
-        __enable_irq();
-
-        typedef void (*BootJump_t)(void);
-        BootJump_t boot_jump = *(BootJump_t *)(STM32_BOOTLOADER_ADDRESS + 4);
-        boot_jump();
-        while (1)
-            ;
-    }
-}
-
-#elif defined(GD32VF103)
-
-#    define DBGMCU_KEY_UNLOCK 0x4B5A6978
-#    define DBGMCU_CMD_RESET 0x1
-
-__IO uint32_t *DBGMCU_KEY = (uint32_t *)DBGMCU_BASE + 0x0CU;
-__IO uint32_t *DBGMCU_CMD = (uint32_t *)DBGMCU_BASE + 0x08U;
-
-__attribute__((weak)) void bootloader_jump(void) {
-    /* The MTIMER unit of the GD32VF103 doesn't have the MSFRST
-     * register to generate a software reset request.
-     * BUT instead two undocumented registers in the debug peripheral
-     * that allow issueing a software reset. WHO would need the MSFRST
-     * register anyway? Source:
-     * https://github.com/esmil/gd32vf103inator/blob/master/include/gd32vf103/dbg.h */
-    *DBGMCU_KEY = DBGMCU_KEY_UNLOCK;
-    *DBGMCU_CMD = DBGMCU_CMD_RESET;
-}
-
-void enter_bootloader_mode_if_requested(void) { /* Jumping to bootloader is not possible from user code. */
-}
-
-#elif defined(KL2x) || defined(K20x) || defined(MK66F18) || defined(MIMXRT1062)  // STM32_BOOTLOADER_DUAL_BANK // STM32_BOOTLOADER_ADDRESS
-/* Kinetis */
-
-#    if defined(BOOTLOADER_KIIBOHD)
-/* Kiibohd Bootloader (MCHCK and Infinity KB) */
-#        define SCB_AIRCR_VECTKEY_WRITEMAGIC 0x05FA0000
-const uint8_t              sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
-__attribute__((weak)) void bootloader_jump(void) {
-    void *volatile vbat = (void *)VBAT;
-    __builtin_memcpy(vbat, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic));
-    // request reset
-    SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk;
-}
-
-#    else /* defined(BOOTLOADER_KIIBOHD) */
-/* Default for Kinetis - expecting an ARM Teensy */
-#        include "wait.h"
-__attribute__((weak)) void bootloader_jump(void) {
-    wait_ms(100);
-    __BKPT(0);
-}
-#    endif /* defined(BOOTLOADER_KIIBOHD) */
-
-#else /* neither STM32 nor KINETIS */
-__attribute__((weak)) void bootloader_jump(void) {}
-#endif
diff --git a/platforms/chibios/bootloaders/gd32v_dfu.c b/platforms/chibios/bootloaders/gd32v_dfu.c
new file mode 100644
index 0000000000..1ab0882084
--- /dev/null
+++ b/platforms/chibios/bootloaders/gd32v_dfu.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+#include <ch.h>
+
+#define DBGMCU_KEY_UNLOCK 0x4B5A6978
+#define DBGMCU_CMD_RESET 0x1
+
+__IO uint32_t *DBGMCU_KEY = (uint32_t *)DBGMCU_BASE + 0x0CU;
+__IO uint32_t *DBGMCU_CMD = (uint32_t *)DBGMCU_BASE + 0x08U;
+
+__attribute__((weak))
+void bootloader_jump(void) {
+    /* The MTIMER unit of the GD32VF103 doesn't have the MSFRST
+     * register to generate a software reset request.
+     * BUT instead two undocumented registers in the debug peripheral
+     * that allow issueing a software reset. WHO would need the MSFRST
+     * register anyway? Source:
+     * https://github.com/esmil/gd32vf103inator/blob/master/include/gd32vf103/dbg.h */
+    *DBGMCU_KEY = DBGMCU_KEY_UNLOCK;
+    *DBGMCU_CMD = DBGMCU_CMD_RESET;
+}
+
+/* Jumping to bootloader is not possible from user code. */
+void enter_bootloader_mode_if_requested(void) { }
diff --git a/platforms/chibios/bootloaders/halfkay.c b/platforms/chibios/bootloaders/halfkay.c
new file mode 100644
index 0000000000..fb9b73dfb3
--- /dev/null
+++ b/platforms/chibios/bootloaders/halfkay.c
@@ -0,0 +1,26 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+#include <ch.h>
+#include "wait.h"
+
+__attribute__((weak))
+void bootloader_jump(void) {
+    wait_ms(100);
+    __BKPT(0);
+}
diff --git a/platforms/chibios/bootloaders/kiibohd.c b/platforms/chibios/bootloaders/kiibohd.c
new file mode 100644
index 0000000000..f4bb18f058
--- /dev/null
+++ b/platforms/chibios/bootloaders/kiibohd.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+#include <ch.h>
+
+/* Kiibohd Bootloader (MCHCK and Infinity KB) */
+#define SCB_AIRCR_VECTKEY_WRITEMAGIC 0x05FA0000
+
+const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+
+__attribute__((weak))
+void bootloader_jump(void) {
+    void *volatile vbat = (void *)VBAT;
+    __builtin_memcpy(vbat, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic));
+
+    // request reset
+    SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk;
+}
diff --git a/platforms/chibios/bootloaders/none.c b/platforms/chibios/bootloaders/none.c
new file mode 100644
index 0000000000..8af151c04d
--- /dev/null
+++ b/platforms/chibios/bootloaders/none.c
@@ -0,0 +1,20 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+__attribute__((weak))
+void bootloader_jump(void) { }
diff --git a/platforms/chibios/bootloaders/stm32_dfu.c b/platforms/chibios/bootloaders/stm32_dfu.c
new file mode 100644
index 0000000000..f4bd8554bf
--- /dev/null
+++ b/platforms/chibios/bootloaders/stm32_dfu.c
@@ -0,0 +1,96 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+#include <ch.h>
+#include <hal.h>
+#include "wait.h"
+
+extern uint32_t __ram0_end__;
+
+#ifndef STM32_BOOTLOADER_DUAL_BANK
+#    define STM32_BOOTLOADER_DUAL_BANK FALSE
+#endif
+
+#if STM32_BOOTLOADER_DUAL_BANK
+#    include "config_common.h"
+
+#    ifndef STM32_BOOTLOADER_DUAL_BANK_GPIO
+#        error "No STM32_BOOTLOADER_DUAL_BANK_GPIO defined, don't know which pin to toggle"
+#    endif
+
+#    ifndef STM32_BOOTLOADER_DUAL_BANK_POLARITY
+#        define STM32_BOOTLOADER_DUAL_BANK_POLARITY 0
+#    endif
+
+#    ifndef STM32_BOOTLOADER_DUAL_BANK_DELAY
+#        define STM32_BOOTLOADER_DUAL_BANK_DELAY 100000
+#    endif
+
+__attribute__((weak))
+void bootloader_jump(void) {
+    // For STM32 MCUs with dual-bank flash, and we're incapable of jumping to the bootloader. The first valid flash
+    // bank is executed unconditionally after a reset, so it doesn't enter DFU unless BOOT0 is high. Instead, we do
+    // it with hardware...in this case, we pull a GPIO high/low depending on the configuration, connects 3.3V to
+    // BOOT0's RC charging circuit, lets it charge the capacitor, and issue a system reset. See the QMK discord
+    // #hardware channel pins for an example circuit.
+    palSetPadMode(PAL_PORT(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_PAD(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_MODE_OUTPUT_PUSHPULL);
+#    if STM32_BOOTLOADER_DUAL_BANK_POLARITY
+    palSetPad(PAL_PORT(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_PAD(STM32_BOOTLOADER_DUAL_BANK_GPIO));
+#    else
+    palClearPad(PAL_PORT(STM32_BOOTLOADER_DUAL_BANK_GPIO), PAL_PAD(STM32_BOOTLOADER_DUAL_BANK_GPIO));
+#    endif
+
+    // Wait for a while for the capacitor to charge
+    wait_ms(100);
+
+    // Issue a system reset to get the ROM bootloader to execute, with BOOT0 high
+    NVIC_SystemReset();
+}
+
+// not needed at all, but if anybody attempts to invoke it....
+void enter_bootloader_mode_if_requested(void) { }
+
+#else
+
+/* This code should be checked whether it runs correctly on platforms */
+#define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
+#define BOOTLOADER_MAGIC 0xDEADBEEF
+#define MAGIC_ADDR (unsigned long *)(SYMVAL(__ram0_end__) - 4)
+
+__attribute__((weak))
+void bootloader_jump(void) {
+    *MAGIC_ADDR = BOOTLOADER_MAGIC;  // set magic flag => reset handler will jump into boot loader
+    NVIC_SystemReset();
+}
+
+void enter_bootloader_mode_if_requested(void) {
+    unsigned long *check = MAGIC_ADDR;
+    if (*check == BOOTLOADER_MAGIC) {
+        *check = 0;
+        __set_CONTROL(0);
+        __set_MSP(*(__IO uint32_t *)STM32_BOOTLOADER_ADDRESS);
+        __enable_irq();
+
+        typedef void (*BootJump_t)(void);
+        BootJump_t boot_jump = *(BootJump_t *)(STM32_BOOTLOADER_ADDRESS + 4);
+        boot_jump();
+        while (1)
+            ;
+    }
+}
+#endif
diff --git a/platforms/chibios/bootloaders/stm32duino.c b/platforms/chibios/bootloaders/stm32duino.c
new file mode 100644
index 0000000000..6ff9e28b4d
--- /dev/null
+++ b/platforms/chibios/bootloaders/stm32duino.c
@@ -0,0 +1,24 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+#include <ch.h>
+
+__attribute__((weak))
+void bootloader_jump(void) {
+    NVIC_SystemReset();
+}
diff --git a/platforms/chibios/bootloaders/tinyuf2.c b/platforms/chibios/bootloaders/tinyuf2.c
new file mode 100644
index 0000000000..ce82fa0c49
--- /dev/null
+++ b/platforms/chibios/bootloaders/tinyuf2.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "bootloader.h"
+
+#include <ch.h>
+
+// From tinyuf2's board_api.h
+#define DBL_TAP_MAGIC 0xF01669EF
+
+// defined by linker script
+extern uint32_t _board_dfu_dbl_tap[];
+#define DBL_TAP_REG _board_dfu_dbl_tap[0]
+
+__attribute__((weak))
+void bootloader_jump(void) {
+    DBL_TAP_REG = DBL_TAP_MAGIC;
+    NVIC_SystemReset();
+}
+
+/* not needed, no two-stage reset */
+void enter_bootloader_mode_if_requested(void) { }
diff --git a/platforms/common.mk b/platforms/common.mk
index f7a0fc7028..12ab45f823 100644
--- a/platforms/common.mk
+++ b/platforms/common.mk
@@ -4,7 +4,7 @@ TMK_COMMON_SRC +=	\
 	$(PLATFORM_COMMON_DIR)/platform.c \
 	$(PLATFORM_COMMON_DIR)/suspend.c \
 	$(PLATFORM_COMMON_DIR)/timer.c \
-	$(PLATFORM_COMMON_DIR)/bootloader.c \
+	$(PLATFORM_COMMON_DIR)/bootloaders/$(BOOTLOADER_TYPE).c
 
 # Search Path
 VPATH += $(PLATFORM_PATH)
diff --git a/platforms/test/bootloader.c b/platforms/test/bootloaders/none.c
similarity index 95%
rename from platforms/test/bootloader.c
rename to platforms/test/bootloaders/none.c
index 5155d9ff04..2920c68f18 100644
--- a/platforms/test/bootloader.c
+++ b/platforms/test/bootloaders/none.c
@@ -16,4 +16,4 @@
 
 #include "bootloader.h"
 
-void bootloader_jump(void) {}
+void bootloader_jump(void) { }
diff --git a/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h b/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
index e1749f872d..319ff8487d 100644
--- a/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
+++ b/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
@@ -19,7 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define _ARM_ATSAM_PROTOCOL_H_
 
 #include "samd51j18a.h"
-#include "md_bootloader.h"
 
 #include "timer.h"
 #include "d51_util.h"
diff --git a/tmk_core/protocol/arm_atsam/md_bootloader.h b/tmk_core/protocol/arm_atsam/md_bootloader.h
deleted file mode 100644
index 362b9bd52a..0000000000
--- a/tmk_core/protocol/arm_atsam/md_bootloader.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _MD_BOOTLOADER_H_
-#define _MD_BOOTLOADER_H_
-
-extern uint32_t _srom;
-extern uint32_t _lrom;
-extern uint32_t _erom;
-
-#define BOOTLOADER_SERIAL_MAX_SIZE 20  // DO NOT MODIFY!
-
-#ifdef KEYBOARD_massdrop_ctrl
-// WARNING: These are only for CTRL bootloader release "v2.18Jun 22 2018 17:28:08" for bootloader_jump support
-extern uint32_t _eram;
-#    define BOOTLOADER_MAGIC 0x3B9ACA00
-#    define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4)
-#endif
-
-#ifdef MD_BOOTLOADER
-
-#    define MCU_HZ 48000000
-#    define I2C_HZ 0  // Not used
-
-#endif  // MD_BOOTLOADER
-
-#endif  //_MD_BOOTLOADER_H_
diff --git a/tmk_core/protocol/arm_atsam/startup.c b/tmk_core/protocol/arm_atsam/startup.c
index 7a5791ab55..ce043bad51 100644
--- a/tmk_core/protocol/arm_atsam/startup.c
+++ b/tmk_core/protocol/arm_atsam/startup.c
@@ -28,7 +28,6 @@
  */
 
 #include "samd51.h"
-#include "md_bootloader.h"
 
 /* Initialize segments */
 extern uint32_t _sfixed;
@@ -496,6 +495,11 @@ __attribute__((section(".vectors"))) const DeviceVectors exception_table = {
 #endif
 };
 
+// WARNING: These are only for CTRL bootloader release "v2.18Jun 22 2018 17:28:08" for bootloader_jump support
+extern uint32_t _eram;
+#define BOOTLOADER_MAGIC 0x3B9ACA00
+#define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4)
+
 /**
  * \brief This is the code that gets called on processor reset.
  * To initialize the device, and call the main() routine.
diff --git a/tmk_core/protocol/arm_atsam/usb/udc.c b/tmk_core/protocol/arm_atsam/usb/udc.c
index d04e9b7b28..1f0c0d95d6 100644
--- a/tmk_core/protocol/arm_atsam/usb/udc.c
+++ b/tmk_core/protocol/arm_atsam/usb/udc.c
@@ -51,7 +51,8 @@
 #include "udi_device_conf.h"
 #include "udi.h"
 #include "udc.h"
-#include "md_bootloader.h"
+
+#define BOOTLOADER_SERIAL_MAX_SIZE 20  // DO NOT MODIFY!
 
 /**
  * \ingroup udc_group
@@ -122,6 +123,8 @@ static uint8_t udc_string_product_name[] = USB_DEVICE_PRODUCT_NAME;
 #    define USB_DEVICE_SERIAL_NAME_SIZE 0
 #endif
 
+extern uint32_t _srom;
+
 uint8_t     usb_device_serial_name_size = 0;
 #if defined USB_DEVICE_SERIAL_USE_BOOTLOADER_SERIAL
 uint8_t     bootloader_serial_number[BOOTLOADER_SERIAL_MAX_SIZE + 1] = "";

From 6209122213af6f675b50ad34dc2066dad42e7013 Mon Sep 17 00:00:00 2001
From: Victor Toni <ViToni@users.noreply.github.com>
Date: Mon, 27 Dec 2021 11:13:12 +0100
Subject: [PATCH 089/867] [Keymap] Add vitoni keymap for GMMK Pro (ISO)
 (#15006)

* [Keymap] Add vitoni layout for GMMK Pro (ISO)

Keymap has layered cursor keys similar to laptop keyboards.

* Configure RGB defaults for startup

* Configure encoder to change value/brightness on FN layer

* Remove FN layer and add dedicated RGB layer

* Make RGB layer sticky (using TG) to avoid holding FN while configuring RGB

* Add RGB indicators for active layers

* Add RGB indicator for active RESET mode

Signed-off-by: Victor Toni <victor.toni@gmail.com>

* Configure idle / USB suspend settings

* Add RGB fade in when resuming after suspend

* Add RGB fade out before suspend

* Add fade out before idle

* Add breathe effect when idle
---
 .../gmmk/pro/iso/keymaps/vitoni/config.h      |  20 ++
 .../gmmk/pro/iso/keymaps/vitoni/keymap.c      | 148 +++++++++++
 .../gmmk/pro/iso/keymaps/vitoni/readme.adoc   | 104 ++++++++
 users/vitoni/readme.adoc                      |  16 ++
 users/vitoni/rgb_matrix_effects.c             | 236 ++++++++++++++++++
 users/vitoni/rgb_matrix_effects.h             | 174 +++++++++++++
 users/vitoni/rules.mk                         |   4 +
 users/vitoni/utils.c                          | 129 ++++++++++
 users/vitoni/utils.h                          |  80 ++++++
 users/vitoni/vitoni.c                         | 131 ++++++++++
 users/vitoni/vitoni.h                         |  30 +++
 11 files changed, 1072 insertions(+)
 create mode 100644 keyboards/gmmk/pro/iso/keymaps/vitoni/config.h
 create mode 100644 keyboards/gmmk/pro/iso/keymaps/vitoni/keymap.c
 create mode 100644 keyboards/gmmk/pro/iso/keymaps/vitoni/readme.adoc
 create mode 100644 users/vitoni/readme.adoc
 create mode 100644 users/vitoni/rgb_matrix_effects.c
 create mode 100644 users/vitoni/rgb_matrix_effects.h
 create mode 100644 users/vitoni/rules.mk
 create mode 100644 users/vitoni/utils.c
 create mode 100644 users/vitoni/utils.h
 create mode 100644 users/vitoni/vitoni.c
 create mode 100644 users/vitoni/vitoni.h

diff --git a/keyboards/gmmk/pro/iso/keymaps/vitoni/config.h b/keyboards/gmmk/pro/iso/keymaps/vitoni/config.h
new file mode 100644
index 0000000000..fd8f1d6859
--- /dev/null
+++ b/keyboards/gmmk/pro/iso/keymaps/vitoni/config.h
@@ -0,0 +1,20 @@
+// Copyright 2021 Victor Toni (@vitoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#if defined(RGB_MATRIX_ENABLE)
+    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+     // number of milliseconds to wait until turning off RGB automatically
+    #define RGB_DISABLE_TIMEOUT 300000 // 300 seconds / 5 min
+    // start fading out before getting disabled
+    // fading out is timed (depending on the rgb_matrix_config.speed) to have finished before reaching RGB_DISABLE_TIMEOUT
+    #define RGB_DISABLE_WITH_FADE_OUT
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED
+    // number of milliseconds to wait until activating RGB idle effects
+    #define RGB_IDLE_TIMEOUT 4500 // 4.5 seconds
+    // activate breathe effect when idle
+    #define RGB_IDLE_BREATHE
+    // fade in when we have been suspended
+    #define RGB_FADE_IN
+#endif
diff --git a/keyboards/gmmk/pro/iso/keymaps/vitoni/keymap.c b/keyboards/gmmk/pro/iso/keymaps/vitoni/keymap.c
new file mode 100644
index 0000000000..d5b64c153a
--- /dev/null
+++ b/keyboards/gmmk/pro/iso/keymaps/vitoni/keymap.c
@@ -0,0 +1,148 @@
+// Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>,
+// Copyright 2021 Victor Toni (@vitoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#include "vitoni.h"
+
+enum layer_names {
+    _BASE,
+    _MOV,
+    _RGB
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)
+//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
+//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]                          PgUp
+//      Caps     A        S        D        F        G        H        J        K        L        ;        "        #        Enter             PgDn
+//      Sh_L     /        Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
+//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
+
+
+    //
+    // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
+    // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
+    // Press CAPS+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        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_PGUP,
+        MO(_MOV), KC_A,   KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TG(_RGB),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_MOV] = LAYOUT(
+        RESET,   KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_INS,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, KC_PGUP, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, KC_HOME, KC_PGDN, KC_END
+    ),
+
+    [_RGB] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            RGB_MOD,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   RGB_RMOD,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,          RGB_SPI,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI, RGB_SPD,
+        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_HUD, RGB_SAD, RGB_HUI
+    ),
+
+};
+// clang-format on
+
+#if defined(ENCODER_ENABLE)
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    switch (get_highest_layer(layer_state)) {
+        case _MOV:
+            if (clockwise) {
+                tap_code16(C(KC_TAB));
+            } else {
+                tap_code16(S(C(KC_TAB)));
+            }
+            break;
+#if defined(RGB_MATRIX_ENABLE)
+        case _RGB:
+            if (clockwise) {
+                rgb_matrix_increase_val_noeeprom();
+            } else {
+                rgb_matrix_decrease_val_noeeprom();
+            }
+            break;
+#endif // RGB_MATRIX_ENABLE
+        default:
+            if (clockwise) {
+                tap_code(KC_VOLU);
+            } else {
+                tap_code(KC_VOLD);
+            }
+            break;
+    }
+    return true;
+}
+#endif // ENCODER_ENABLE
+
+#if defined(RGB_MATRIX_ENABLE)
+/*
+* Set up default RGB color.
+*/
+void rgb_matrix_set_default_color(void) {
+    rgb_matrix_sethsv_noeeprom_user(HSV_CHARTREUSE);
+}
+
+/*
+* Set up RGB defaults.
+*/
+void rgb_matrix_configure_default_settings(void) {
+    rgb_matrix_set_default_color();
+}
+
+void keyboard_post_init_user(void) {
+    rgb_matrix_enable_noeeprom();
+    rgb_matrix_configure_default_settings();
+}
+
+/*
+* Use RGB underglow to indicate specific layers.
+*/
+layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+        case _MOV:
+            rgb_matrix_sethsv_noeeprom_user(HSV_SPRINGGREEN);
+            break;
+        case _RGB:
+            rgb_matrix_sethsv_noeeprom_user(HSV_GREEN);
+            break;
+        default: // for any other layer
+            rgb_matrix_set_default_color();
+            break;
+    }
+    return state;
+}
+
+void matrix_scan_user(void) {
+    matrix_scan_user_rgb();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user_rgb(keycode, record)) {
+        return false;
+    }
+
+    switch (keycode) {
+        case RESET:  // when activating RESET mode for flashing
+            if (record->event.pressed) {
+                rgb_matrix_set_color_all(63, 0, 0);
+                rgb_matrix_driver.flush();
+            }
+            return true;
+    }
+    return true; // Process all other keycodes normally
+}
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/gmmk/pro/iso/keymaps/vitoni/readme.adoc b/keyboards/gmmk/pro/iso/keymaps/vitoni/readme.adoc
new file mode 100644
index 0000000000..38a74a568b
--- /dev/null
+++ b/keyboards/gmmk/pro/iso/keymaps/vitoni/readme.adoc
@@ -0,0 +1,104 @@
+= ViToni's keymap for GMMK Pro ISO
+
+== Layout
+Based on the stock layout but making use of CAPS as FN similar to laptop keyboards.
+This frees up the left row for other uses (although not remapped yet).
+Since both Delete and Insert are used for coding they are part of the CAPS layer as well.
+
+The differences are as follows:
+
+=== Layer 0 (`_BASE`)
+Mostly stock + CAPS goes to layer `_MOV`.
+FN toggles the layer `_RGB`.
+
+=== Layer 1 (`_MOV`), accessed by pressing `CAPS` on layer `_BASE`
+[%header]
+|===
+| Key / Action          | Mapped to
+| ESC                   | _RESET_
+| F1                    | KC_MYCM
+| F2                    | KC_WHOM
+| F3                    | KC_CALC
+| F4                    | KC_MSEL
+| F5                    | KC_MPRV
+| F6                    | KC_MPLY
+| F7                    | KC_MSTP
+| F8                    | KC_MNXT
+| F9                    | KC_MUTE
+| F10                   | KC_VOLD
+| F11                   | KC_VOLU
+| N                     | NK_TOGG
+| Delete                | Insert
+| Left                  | Home
+| Right                 | End
+| Up                    | PgUp
+| Down                  | PgDn
+|===
+
+=== Layer 2 (`_RGB`), accessed by pressing `FN` on layer `_BASE`
+Revamped the stock FN layer to focus on RGB only.
+
+[%header]
+|===
+| Key / Action          | Mapped to
+| Knob clockwise        | Value/Brightness up
+| Knob anti-clockwise   | Value/Brightness down
+| Backspace             | _RESET_
+| Enter                 | RGB_TOG
+| Del                   | RGB_MOD
+| PgUp                  | RGB_RMOD
+| PgDn                  | RGB_SPI
+| End                   | RGB_SPD
+| Left                  | RGB_HUD
+| Right                 | RGB_HUI
+| Up                    | RGB_SAI
+| Down                  | RGB_SAD
+|===
+
+No other changes have been made.
+
+== RGB light
+
+The code customizing RGB light usage is decribed here:
+
+* link:../../../../../../users/vitoni/readme.adoc[/users/vitoni/readme.adoc]
+
+When using  `RGB_DISABLE_TIMEOUT` addtional options are available:
+
+* `RGB_FADE_IN` makes the RGB lights fade in instead of setting the value/brightness to 100% (implicitly due to HSV including the brightness) when resuming after RGB lights have been turned off.
+Fade in occurs when the keyboard is initialized and when the RGB brightness has been changed (e.g. suspending, fade out, etc.).
+* `RGB_DISABLE_WITH_FADE_OUT` activates fade out before the keyboard is disabled by `RGB_DISABLE_TIMEOUT`.
+
+Parameters used to define the behavior are:
+[%header]
+|===
+|Key | Default | Description
+
+| RGB_MATRIX_MAXIMUM_BRIGHTNESS
+| 200 (&lt;= UNIT8_MAX)
+| Maximum assumed value for brightness.
+Used to calculate lead time for fade out before suspend timeout.
+
+|===
+
+`RGB_IDLE_TIMEOUT` enables fading out after being idle for the defined time and allows
+* `RGB_IDLE_BREATHE` also activates a brethe effect while idling.
+
+[%header]
+|===
+|Key | Default | Description
+
+|RGB_IDLE_TIMEOUT
+|4500
+|Time in milliseconds without activity before considered to be idle.
+
+|RGB_IDLE_MINIMUM_BRIGHTNESS
+|`RGB_MATRIX_MAXIMUM_BRIGHTNESS` / 5
+|Brightness value RGB is dimmed to when starting to idle. +
+When breathing used as the lower bound of the brightness value.
+
+|RGB_IDLE_MAXIMUM_BRIGHTNESS
+|`RGB_MATRIX_MAXIMUM_BRIGHTNESS` * 2/5
+|Upper bound of brightness value of the RGB light while breathing.
+
+|===
diff --git a/users/vitoni/readme.adoc b/users/vitoni/readme.adoc
new file mode 100644
index 0000000000..acf65793d2
--- /dev/null
+++ b/users/vitoni/readme.adoc
@@ -0,0 +1,16 @@
+= User functions
+
+Functions are mostly related to changing the RGB lights depending on user interaction and when idling.
+
+== utils.h
+
+Common functions are declared in link:utils.h[]. These function are not directly RGB related but used to modify state and calculate values.
+
+== rgb_matrix_effects.h
+
+Functions in link:rgb_matrix_effects.h[] make use of common function in `utils.h` and are used to create to RGB matrix effects such as fading or breathing.
+
+== vitoni.h
+
+The functions declared in link:vitoni.h[] are used as entry points for usage of RGB effects.
+One entry point is `matrix_scan` based for regular task while the other is `process_record` based for user activity tasks.
diff --git a/users/vitoni/rgb_matrix_effects.c b/users/vitoni/rgb_matrix_effects.c
new file mode 100644
index 0000000000..3a13e99bc7
--- /dev/null
+++ b/users/vitoni/rgb_matrix_effects.c
@@ -0,0 +1,236 @@
+// Copyright 2021 Victor Toni (@vitoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "rgb_matrix_effects.h"
+
+#include <rgb_matrix.h>
+#include <lib/lib8tion/lib8tion.h>
+
+#include "utils.h"
+
+/*
+ Offset used to start at the right point in th curve to avoid big jumps in brightness
+  0 =>    0% (signed) =>  50% (unsigned)
+  64 =>  100% (signed) => 100% (unsigned)
+ 128 =>    0% (signed) =>  50% (unsigned)
+ 192 => -100% (signed) =>   0% (unsigned)
+*/
+enum PHASE {
+    PHASE_ZERO_RAISING
+    ,PHASE_HIGH
+    ,PHASE_ZERO_FALLING
+    ,PHASE_LOW
+};
+
+/**
+ * @brief Calculates the offset so that a specific time is aligned to a specific point in the sine curve.
+ * @param[in]   time    The time for which the offset shopuld be calculated.
+ * @param[in]   phase   Phase which should be reached with the offset
+ * @see PHASE
+ */
+uint8_t offset_for_time(const uint8_t time, const uint8_t phase) {
+    switch (phase) {
+        case PHASE_ZERO_RAISING:
+            return 0 - time;
+        case PHASE_HIGH:
+            return 64 - time;
+        case PHASE_ZERO_FALLING:
+            return 128 - time;
+        case PHASE_LOW:
+            return 192 - time;
+        default:
+            return 0;
+    }
+}
+
+/**
+ * @brief Scales down `g_rgb_timer` so that it can be used for RGB effects.
+ * @return scaled down timer
+ * @see rgb_time_2_scale_w_factor()
+ */
+uint8_t rgb_time_2_scale(void) {
+    static const uint8_t factor = 1;
+    return rgb_time_2_scale_w_factor(factor);
+}
+
+/*
+ * Used to slow down RGB speed.
+ */
+static const uint8_t rgb_speed_divisor = 8;
+
+/**
+ * @brief Scales down `g_rgb_timer` so that it can be used for RGB effects.
+ * @details Usually these calculations aredone internally by some RGB effects.
+ This method exposed to scaling so that all effects to have same timebase. If `rgb_matrix_config.speed` all effects are affected the same.
+ * @param[in]   factor The factor can be used to speed up some operations in relation to others.
+ * @return scaled down timer taking into account the given factor
+ * @see g_rgb_timer
+ * @see rgb_matrix_config.speed
+ */
+uint8_t rgb_time_2_scale_w_factor(const uint8_t rgb_speed_factor) {
+    const uint8_t scaled_time = scale16by8(g_rgb_timer, rgb_matrix_config.speed * rgb_speed_factor / rgb_speed_divisor);
+
+    return scaled_time;
+}
+
+/**
+ * @brief Inverse function to calculate time required to execute `timer` steps.
+ * @details This method allows calculation of the time needed to execute N `timer`steps.
+ Usefull when using a scaled down time but requiring the time needed to perform these steps.
+ * @param[in]   scaled_time scaled down timer to inverse to time
+ * @return time corresponding to scaled down time
+ * @see rgb_time_2_scale()
+ */
+uint16_t scale_2_rgb_time(const uint8_t scaled_time) {
+    const uint16_t time = scaled_time * rgb_speed_divisor * UINT8_MAX / rgb_matrix_config.speed;
+
+    return time;
+}
+
+bool fade_in_ranged(const uint8_t time, const uint8_t range_min, const uint8_t range_max) {
+    static const uint8_t max_delta = 1;
+    return scaled_sin_up(time, range_min, range_max, max_delta, &(rgb_matrix_config.hsv.v));
+}
+
+bool fade_out_ranged(const uint8_t time, const uint8_t range_min, const uint8_t range_max) {
+    static const uint8_t max_delta = 1;
+    return scaled_sin_down(time, range_min, range_max, max_delta, &(rgb_matrix_config.hsv.v));
+}
+
+/**
+ * @brief Convenience method to eventually skip the value part when setting HSV.
+ * @details When setting HSV this includes the value/brightness.
+ As changing brightness might interfer with fading or breathing effects,
+ this method can skip the value part of HSV (depending on the preprocessor flag: RGB_FADE_IN).
+ * @param[in]   hue Hue
+ * @param[in]   sat Saturation
+ * @param[in]   hue Value (brightness)
+ * @see rgb_matrix_sethsv_noeeprom()
+ */
+void rgb_matrix_sethsv_noeeprom_user(const uint16_t hue, const uint8_t sat, const uint8_t val) {
+#if defined(RGB_FADE_IN) || defined(RGB_IDLE_TIMEOUT)
+    rgb_matrix_config.hsv.h = hue;
+    rgb_matrix_config.hsv.s = sat;
+    // omitting setting the value to avoid interfering with effects
+//    rgb_matrix_config.hsv.v = val;
+#else
+    rgb_matrix_sethsv_noeeprom(hue, sat, val);
+#endif
+}
+
+#if defined(RGB_FADE_IN) || defined(RGB_IDLE_TIMEOUT)
+/**
+ * @brief Calculates the time offset required by fade in.
+ * @details Using an arbitrary timer any point on the sine curve might be pointed to.
+ * The offest is calculated so that
+ * a) the point is at the lowest point in the curve and the curve is raising
+ * b) the point is near the current brightness (eg. fade in might be called while fading out and the lowest value has not yet been reached).
+ * @param[in]   time Current time usually represented by (usually scaled) timer
+ * @return Offset required so that time matches the current brightness
+ */
+uint8_t calc_fade_in_offset(const uint8_t time) {
+    static const uint8_t max_steps = UINT8_MAX/2;
+    static const uint8_t range_min = 0;
+    static const uint8_t range_max = RGB_MATRIX_MAXIMUM_BRIGHTNESS;
+
+    // start at the right point in the sine curve
+    uint8_t time_offset = offset_for_time(time, PHASE_LOW);
+
+    // find the right offset to match the current brightness
+    for (int i = 1; i < max_steps; i++) {
+        const uint8_t value = scaled_sin(time + time_offset + 1, range_min, range_max);
+        if (in_range(value, range_min, range_max) && value < rgb_matrix_config.hsv.v) {
+            time_offset++;
+        } else {
+            break;
+        }
+    }
+
+    return time_offset;
+}
+
+/**
+ * @brief Increases value/brightness until reaching RGB_MATRIX_MAXIMUM_BRIGHTNESS based on given timer.
+ * @param[in]   time A (usually scaled) timer
+ * @return Returns `true` if RGB_MATRIX_MAXIMUM_BRIGHTNESS has been reached, `false` otherwise.
+ */
+bool fade_in(const uint8_t time) {
+    static const uint8_t range_min = 0;
+    static const uint8_t range_max = RGB_MATRIX_MAXIMUM_BRIGHTNESS;
+
+    return fade_in_ranged(time, range_min, range_max);
+}
+#endif
+
+#if defined(RGB_DISABLE_WITH_FADE_OUT) || defined(RGB_IDLE_TIMEOUT)
+/**
+ * @brief Calculates the time offset required by fade out.
+ * @details Using an arbitrary timer any point on the Sinus curve might be pointed to.
+ * The offest is calculated so that
+ * a) the point is at the highest point in the curve and the curve is failing
+ * b) the point is near the current brightness (eg. fade out might be called while on breath effect).
+ * @param[in]   time Current time usually represented by a(usually scaled) timer
+ * @return Offset required so that time matches the current brightness
+ */
+uint8_t calc_fade_out_offset(const uint8_t time) {
+    static const uint8_t range_min = 0;
+    static const uint8_t range_max = RGB_MATRIX_MAXIMUM_BRIGHTNESS;
+
+    // start at the right point in the sin() curve
+    uint8_t time_offset = offset_for_time(time, PHASE_HIGH);
+
+    // find the right offset to match the current brightness
+    for (int i = 1; i < 127; i++) {
+        const uint8_t value = scaled_sin(time + time_offset + 1, range_min, range_max);
+        if (in_range(value, range_min, range_max) && rgb_matrix_config.hsv.v < value) {
+            time_offset++;
+        } else {
+            break;
+        }
+    }
+
+    return time_offset;
+}
+#endif
+
+#if defined(RGB_DISABLE_WITH_FADE_OUT)
+/**
+ * @brief Decreases value/brightness until reaching 0 based on given timer.
+ * @param[in]   time A (usually scaled) timer
+ * @return Returns `true` if 0 has been reached, `false` otherwise.
+ */
+bool fade_out(const uint8_t time) {
+    static const uint8_t range_min = 0;
+    static const uint8_t range_max = RGB_MATRIX_MAXIMUM_BRIGHTNESS;
+
+    return fade_out_ranged(time, range_min, range_max);
+}
+#endif
+
+#if defined(RGB_IDLE_TIMEOUT)
+/**
+ * @brief Decreases value/brightness until reaching `RGB_IDLE_MINIMUM_BRIGHTNESS` based on given timer.
+ * @param[in]   time A (usually scaled) timer
+ * @return Returns `true` if `RGB_IDLE_MINIMUM_BRIGHTNESS` has been reached, `false` otherwise.
+ */
+bool idle_fade_out(const uint8_t time) {
+    static const uint8_t range_min = RGB_IDLE_MINIMUM_BRIGHTNESS;
+    static const uint8_t range_max = RGB_MATRIX_MAXIMUM_BRIGHTNESS;
+
+    return fade_out_ranged(time, range_min, range_max);
+}
+
+#if defined(RGB_IDLE_BREATHE)
+/**
+ * @brief Changes value/brightness to create a breathing effect based on given timer.
+ * @details Brightness will breathe in the range starting from `RGB_IDLE_MINIMUM_BRIGHTNESS` to `RGB_IDLE_MAXIMUM_BRIGHTNESS`.
+ * @param[in]   time A (usually scaled) timer
+ */
+void idle_breathe(const uint8_t time) {
+    static const uint8_t range_min = RGB_IDLE_MINIMUM_BRIGHTNESS;
+    static const uint8_t range_max = RGB_IDLE_MAXIMUM_BRIGHTNESS;
+
+    rgb_matrix_config.hsv.v = scaled_sin(time, range_min, range_max);
+}
+#endif // RGB_IDLE_BREATHE
+#endif // RGB_IDLE_TIMEOUT
diff --git a/users/vitoni/rgb_matrix_effects.h b/users/vitoni/rgb_matrix_effects.h
new file mode 100644
index 0000000000..ed74500b18
--- /dev/null
+++ b/users/vitoni/rgb_matrix_effects.h
@@ -0,0 +1,174 @@
+// Copyright 2021 Victor Toni (@vitoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+/**
+ * States reflecting the state of the keyboard.
+ * Dependeing on these states various effects can set for the RGB matrix.
+ */
+enum states {
+    REGULAR             //!< when in regular use
+#if defined(RGB_IDLE_TIMEOUT)
+    ,IDLE_FADE_OUT      //!< when started idling
+    ,IDLE               //!< when idling
+#endif
+#if defined(RGB_FADE_IN) || defined(RGB_IDLE_TIMEOUT)
+    ,FADE_IN            //!< when starting initially or before going back to REGULAR
+#endif
+#if defined(RGB_DISABLE_WITH_FADE_OUT)
+    ,FADE_OUT           //!< before supending
+#endif
+    ,SUSPENDED          //!< expecting to be suspended by RGB_DISABLE_TIMEOUT any time
+};
+
+/**
+ * @brief Scales down `g_rgb_timer` so that it can be used for RGB effects.
+ * @details Usually these calculations aredone internally by some RGB effects.
+ This method exposed to scaling so that all effects to have same timebase. If `rgb_matrix_config.speed` all effects are affected the same.
+ * @param[in]   factor The factor can be used to speed up some operations in relation to others.
+ * @return scaled down timer taking into account the given factor
+ * @see g_rgb_timer
+ * @see rgb_matrix_config.speed
+ */
+uint8_t rgb_time_2_scale_w_factor(const uint8_t factor);
+
+/**
+ * @brief Scales down `g_rgb_timer` so that it can be used for RGB effects.
+ * @return scaled down timer
+ * @see rgb_time_2_scale_w_factor()
+ */
+uint8_t rgb_time_2_scale(void);
+
+/**
+ * @brief Inverse function to calculate time required to execute `timer` steps.
+ * @details This method allows calculation of the time needed to execute N `timer`steps.
+ Usefull when using a scaled down time but requiring the time needed to perform these steps.
+ * @param[in]   scaled_time scaled down timer to inverse to time
+ * @return time corresponding to scaled down time
+ * @see rgb_time_2_scale()
+ */
+uint16_t scale_2_rgb_time(const uint8_t scaled_time);
+
+/**
+ * @brief Convenience method to eventually skip the value part when setting HSV.
+ * @details When setting HSV this includes the value/brightness.
+ As changing brightness might interfer with fading or breathing effects,
+ this method can skip the value part of HSV (depending on the preprocessor flag: RGB_FADE_IN).
+ * @param[in]   hue Hue
+ * @param[in]   sat Saturation
+ * @param[in]   hue Value (brightness)
+ * @see rgb_matrix_sethsv_noeeprom()
+ */
+void rgb_matrix_sethsv_noeeprom_user(const uint16_t hue, const uint8_t sat, const uint8_t val);
+
+#if defined(RGB_FADE_IN) || defined(RGB_DISABLE_WITH_FADE_OUT) || defined(RGB_IDLE_TIMEOUT)
+#   if defined(RGB_MATRIX_MAXIMUM_BRIGHTNESS)
+#       if (RGB_MATRIX_MAXIMUM_BRIGHTNESS) < 1
+#           error "RGB_MATRIX_MAXIMUM_BRIGHTNESS must not be less than ONE"
+#       endif
+#       if UINT8_MAX < (RGB_MATRIX_MAXIMUM_BRIGHTNESS)
+#           error "RGB_MATRIX_MAXIMUM_BRIGHTNESS must not be larger than UINT8_MAX"
+#       endif
+#   else
+#       define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+#   endif
+#endif
+
+#if defined(RGB_FADE_IN) || defined(RGB_IDLE_TIMEOUT)
+/**
+ * @brief Calculates the time offset required by fade in.
+ * @details Using an arbitrary timer any point on the sine curve might be pointed to.
+ * The offset is calculated so that
+ * a) the point is at the lowest point in the curve and the curve is raising
+ * b) the point is near the current brightness (eg. fade in might be called while fading out and the lowest value has not yet been reached).
+ * @param[in]   time Current time usually represented by a(usually scaled) timer
+ * @return Offset required so that time matches the current brightness
+ */
+uint8_t calc_fade_in_offset(const uint8_t time);
+
+/**
+ * @brief Increases value/brightness until reaching RGB_MATRIX_MAXIMUM_BRIGHTNESS based on given timer.
+ * @param[in]   time A (usually scaled) timer
+ * @return Returns `true` if RGB_MATRIX_MAXIMUM_BRIGHTNESS has been reached, `false` otherwise.
+ */
+bool fade_in(const uint8_t time);
+#endif
+
+#if defined(RGB_DISABLE_WITH_FADE_OUT)
+#   if !defined(RGB_DISABLE_TIMEOUT)
+#       warning "RGB_DISABLE_WITH_FADE_OUT expects RGB_DISABLE_TIMEOUT to be defined"
+#   endif
+#endif
+
+#if defined(RGB_DISABLE_WITH_FADE_OUT) || defined(RGB_IDLE_TIMEOUT)
+/**
+ * @brief Calculates the time offset required by fade out.
+ * @details Using an arbitrary timer any point on the Sinus curve might be pointed to.
+ * The offest is calculated so that
+ * a) the point is at the highest point in the curve and the curve is failing
+ * b) the point is near the current brightness (eg. fade out might be called while on breath effect).
+ * @param[in]   time Current time usually represented by a(usually scaled) timer
+ * @return Offset required so that time matches the current brightness
+ */
+uint8_t calc_fade_out_offset(const uint8_t time);
+#endif
+
+#if defined(RGB_DISABLE_WITH_FADE_OUT)
+/**
+ * @brief Decreases value/brightness until reaching 0 based on given timer.
+ * @param[in]   time A (usually scaled) timer
+ * @return Returns `true` if 0 has been reached, `false` otherwise.
+ */
+bool fade_out(const uint8_t time);
+#endif
+
+#if defined(RGB_IDLE_TIMEOUT)
+#   if RGB_IDLE_TIMEOUT < 0
+#       error "RGB_IDLE_TIMEOUT must not be less than ZERO"
+#   endif
+#   if !defined(RGB_IDLE_MINIMUM_BRIGHTNESS)
+        // minimum brightness when idling
+#       define RGB_IDLE_MINIMUM_BRIGHTNESS (RGB_MATRIX_MAXIMUM_BRIGHTNESS/5)
+#   endif
+#   if RGB_IDLE_MINIMUM_BRIGHTNESS < 0
+#       error "RGB_IDLE_MINIMUM_BRIGHTNESS must not be less than ZERO"
+#   endif // RGB_IDLE_MINIMUM_BRIGHTNESS < 0
+#   if RGB_MATRIX_MAXIMUM_BRIGHTNESS <= RGB_IDLE_MINIMUM_BRIGHTNESS
+#       error "RGB_IDLE_MINIMUM_BRIGHTNESS must be less than RGB_MATRIX_MAXIMUM_BRIGHTNESS"
+#   endif // RGB_MATRIX_MAXIMUM_BRIGHTNESS <= RGB_IDLE_MINIMUM_BRIGHTNESS
+
+/**
+ * @brief Decreases value/brightness until reaching `RGB_IDLE_MINIMUM_BRIGHTNESS` based on given timer.
+ * @param[in]   time A (usually scaled) timer
+ * @return Returns `true` if `RGB_IDLE_MINIMUM_BRIGHTNESS` has been reached, `false` otherwise.
+ */
+bool idle_fade_out(const uint8_t time);
+
+#if defined(RGB_IDLE_BREATHE)
+#   if !defined(RGB_IDLE_MAXIMUM_BRIGHTNESS)
+        // maximum brightness when idling
+#       define RGB_IDLE_MAXIMUM_BRIGHTNESS (RGB_MATRIX_MAXIMUM_BRIGHTNESS*3/5)
+#   endif
+#   if !(0 <= RGB_IDLE_MAXIMUM_BRIGHTNESS)
+#       error "RGB_IDLE_MINIMUM_BRIGHTNESS must not be less than ZERO, was: " RGB_IDLE_MAXIMUM_BRIGHTNESS
+#   endif // RGB_IDLE_MAXIMUM_BRIGHTNESS < 0
+#   if !(RGB_IDLE_MINIMUM_BRIGHTNESS < RGB_IDLE_MAXIMUM_BRIGHTNESS)
+#       error "RGB_IDLE_MINIMUM_BRIGHTNESS must be less than RGB_IDLE_MAXIMUM_BRIGHTNESS"
+#   endif // RGB_IDLE_MAXIMUM_BRIGHTNESS <= RGB_IDLE_MINIMUM_BRIGHTNESS
+#   if !(RGB_IDLE_MAXIMUM_BRIGHTNESS <= RGB_MATRIX_MAXIMUM_BRIGHTNESS)
+#       error "RGB_IDLE_MAXIMUM_BRIGHTNESS must be less than or equal to RGB_MATRIX_MAXIMUM_BRIGHTNESS"
+#   endif // RGB_MATRIX_MAXIMUM_BRIGHTNESS <= RGB_IDLE_MAXIMUM_BRIGHTNESS
+
+/**
+ * @brief Changes value/brightness to create a breathing effect based on given timer.
+ * @details Brightness will breathe in the range starting from `RGB_IDLE_MINIMUM_BRIGHTNESS` to `RGB_IDLE_MAXIMUM_BRIGHTNESS`.
+ * @param[in]   time A (usually scaled) timer
+ */
+void idle_breathe(const uint8_t time);
+#endif // RGB_IDLE_BREATHE
+
+#endif // RGB_IDLE_TIMEOUT
diff --git a/users/vitoni/rules.mk b/users/vitoni/rules.mk
new file mode 100644
index 0000000000..2f3b0d15e5
--- /dev/null
+++ b/users/vitoni/rules.mk
@@ -0,0 +1,4 @@
+SRC += \
+	vitoni.c \
+	utils.c \
+	rgb_matrix_effects.c
diff --git a/users/vitoni/utils.c b/users/vitoni/utils.c
new file mode 100644
index 0000000000..fb011570e4
--- /dev/null
+++ b/users/vitoni/utils.c
@@ -0,0 +1,129 @@
+// Copyright 2021 Victor Toni (@vitoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "utils.h"
+
+#include <lib/lib8tion/lib8tion.h>
+
+/**
+* @brief Changes `*value` to `new_value`.
+* @param[in,out] value      Pointer to variable to be changed.
+* @param[in]     new_value  Value to be changed.
+* @param[in,out] changed    Flag indicating `*value` and `new_value` were different.
+*/
+void update_value(uint8_t *value, const uint8_t new_value, bool *changed) {
+    if (new_value != (*value)) {
+        (*changed) = true;
+        (*value) = new_value;
+    }
+}
+
+/**
+* @brief Checks whether a value is in the given range.
+* @param[in] value      Value to be checked.
+* @param[in] range_min  Lower bound of range (inclusive).
+* @param[in] range_max  Upper bound of range (inclusive).
+* @return `true` if (range_min <= value <= range_max), `false` otherwise
+*/
+bool in_range(const uint8_t value, const uint8_t range_min, const uint8_t range_max) {
+    return range_min <= value && value <= range_max;
+}
+
+/**
+* @brief Calculates the sine value based on sin8() and scales it to the given range (unsigned).
+*
+* Table of values for unscaled sin8() eg. a theta of 0 results to 128 and a theta of 255 (240+15) results to 125.
+        0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    +----------------------------------------------------------------
+   0: 128 131 134 137 140 143 146 149 152 155 158 161 164 167 170 173
+  16: 177 179 182 184 187 189 192 194 197 200 202 205 207 210 212 215
+  32: 218 219 221 223 224 226 228 229 231 233 234 236 238 239 241 243
+  48: 245 245 246 246 247 248 248 249 250 250 251 251 252 253 253 254
+  64: 255 254 253 253 252 251 251 250 250 249 248 248 247 246 246 245
+  80: 245 243 241 239 238 236 234 233 231 229 228 226 224 223 221 219
+  96: 218 215 212 210 207 205 202 200 197 194 192 189 187 184 182 179
+ 112: 177 173 170 167 164 161 158 155 152 149 146 143 140 137 134 131
+ 128: 128 125 122 119 116 113 110 107 104 101  98  95  92  89  86  83
+ 144:  79  77  74  72  69  67  64  62  59  56  54  51  49  46  44  41
+ 160:  38  37  35  33  32  30  28  27  25  23  22  20  18  17  15  13
+ 176:  11  11  10  10   9   8   8   7   6   6   5   5   4   3   3   2
+ 192:   1   2   3   3   4   5   5   6   6   7   8   8   9  10  10  11
+ 208:  11  13  15  17  18  20  22  23  25  27  28  30  32  33  35  37
+ 224:  38  41  44  46  49  51  54  56  59  62  64  67  69  72  74  77
+ 240:  79  83  86  89  92  95  98 101 104 107 110 113 116 119 122 125
+*
+* @param[in] theta      Angle (a full circle mapped to 0-255) used as input for sine calculation.
+* @param[in] range_min  Lower bound of range (inclusive).
+* @param[in] range_max  Upper bound of range (inclusive).
+* @return Calculated sine value mapped to the given range.
+*/
+uint8_t scaled_sin(const uint8_t theta, const uint8_t range_min, const uint8_t range_max) {
+    const uint8_t range = range_max - range_min;
+    return scale8(sin8(theta), range) + range_min;
+}
+
+/**
+* @brief Increases the given value until reaching range_max.
+* The increments occur following an upwards sine wave (scaled from range_min to range_max).
+* @param[in]        theta       Angle (a full circle mapped to 0-255) used as input for sine calculation.
+* @param[in]        range_min   Lower bound of range (inclusive).
+* @param[in]        range_max   Upper bound of range (inclusive).
+* @param[in]        max_delta   Maximum delta between value and range_max (due to values being integers and eventually not fully matching).
+* @param[in,out]    value       Reference of variable to be increased
+* @return `true` if value and range_max are within a delta of 3 (chosen by fair dice rolling), `false` otherwise
+* @see scaled_sin()
+*/
+bool scaled_sin_up(const uint8_t theta, const uint8_t range_min, const uint8_t range_max, const uint8_t max_delta, uint8_t *value) {
+    // ensure upper range bound
+    if (range_max <= (*value)) {
+        (*value) = range_max;
+        return true;
+    }
+
+    const uint8_t new_value = scaled_sin(theta, range_min, range_max);
+    if (in_range(new_value, range_min, range_max) && (*value) < new_value) {
+        (*value) = new_value;
+
+        return range_max == (*value);
+    }
+
+    const uint8_t delta = range_max - (*value);
+    if (delta <= max_delta) {
+        (*value) = range_max;
+    }
+
+    return delta <= max_delta;
+}
+
+/**
+* @brief Decreases the given value until reaching range_min.
+* The decrements occur following an downwards sinus wave (scaled from range_min to range_max).
+* @param[in]        theta       Angle (a full circle mapped to 0-255) used as input for sinus calculation.
+* @param[in]        range_min   Lower bound of range (inclusive).
+* @param[in]        range_max   Upper bound of range (inclusive).
+* @param[in]        max_delta   Maximum delta between value and range_min (due to values being integers and eventually not fully matching).
+* @param[in,out]    value       Reference of variable to be decreased
+* @return `true` if value and range_max are within a delta of 3 (chosen by fair dice rolling), `false` otherwise
+* @see scaled_sin()
+*/
+bool scaled_sin_down(const uint8_t theta, const uint8_t range_min, const uint8_t range_max, const uint8_t max_delta, uint8_t *value) {
+    // ensure lower range bound
+    if ((*value) <= range_min) {
+        (*value) = range_min;
+        return true;
+    }
+
+    const uint8_t new_value = scaled_sin(theta, range_min, range_max);
+    if (in_range(new_value, range_min, range_max) && new_value < (*value)) {
+        (*value) = new_value;
+
+        return range_min == (*value);
+    }
+
+    const uint8_t delta = (*value) - range_min;
+    if (delta <= max_delta) {
+        (*value) = range_min;
+    }
+
+    return delta <= max_delta;
+}
diff --git a/users/vitoni/utils.h b/users/vitoni/utils.h
new file mode 100644
index 0000000000..987b612d58
--- /dev/null
+++ b/users/vitoni/utils.h
@@ -0,0 +1,80 @@
+// Copyright 2021 Victor Toni (@vitoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+/**
+* @brief Changes `*value` to `new_value`.
+* @param[in,out] value      Pointer to variable to be changed.
+* @param[in]     new_value  Value to be changed.
+* @param[in,out] changed    Flag indicating `*value` and `new_value` were different.
+*/
+void update_value(uint8_t *value, const uint8_t new_value, bool *changed);
+
+/**
+* @brief Checks whether a value is in the given range.
+* @param[in] value      Value to be checked.
+* @param[in] range_min  Lower bound of range (inclusive).
+* @param[in] range_max  Upper bound of range (inclusive).
+* @return `true` if (range_min <= value <= range_max), `false` otherwise
+*/
+bool in_range(const uint8_t value, const uint8_t range_min, const uint8_t range_max);
+
+/**
+* @brief Calculates the sine value based on sin8() and scales it to the given range (unsigned).
+*
+* Table of values for unscaled sin8() eg. a theta of 0 results to 128 and a theta of 255 (240+15) results to 125.
+        0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
+    +----------------------------------------------------------------
+   0: 128 131 134 137 140 143 146 149 152 155 158 161 164 167 170 173
+  16: 177 179 182 184 187 189 192 194 197 200 202 205 207 210 212 215
+  32: 218 219 221 223 224 226 228 229 231 233 234 236 238 239 241 243
+  48: 245 245 246 246 247 248 248 249 250 250 251 251 252 253 253 254
+  64: 255 254 253 253 252 251 251 250 250 249 248 248 247 246 246 245
+  80: 245 243 241 239 238 236 234 233 231 229 228 226 224 223 221 219
+  96: 218 215 212 210 207 205 202 200 197 194 192 189 187 184 182 179
+ 112: 177 173 170 167 164 161 158 155 152 149 146 143 140 137 134 131
+ 128: 128 125 122 119 116 113 110 107 104 101  98  95  92  89  86  83
+ 144:  79  77  74  72  69  67  64  62  59  56  54  51  49  46  44  41
+ 160:  38  37  35  33  32  30  28  27  25  23  22  20  18  17  15  13
+ 176:  11  11  10  10   9   8   8   7   6   6   5   5   4   3   3   2
+ 192:   1   2   3   3   4   5   5   6   6   7   8   8   9  10  10  11
+ 208:  11  13  15  17  18  20  22  23  25  27  28  30  32  33  35  37
+ 224:  38  41  44  46  49  51  54  56  59  62  64  67  69  72  74  77
+ 240:  79  83  86  89  92  95  98 101 104 107 110 113 116 119 122 125
+*
+* @param[in] theta      Angle (a full circle mapped to 0-255) used as input for sine calculation.
+* @param[in] range_min  Lower bound of range (inclusive).
+* @param[in] range_max  Upper bound of range (inclusive).
+* @return Calculated sine value mapped to the given range.
+*/
+uint8_t scaled_sin(const uint8_t theta, const uint8_t range_min, const uint8_t range_max);
+
+/**
+* @brief Increases the given value until reaching range_max.
+* The increments occur following an upwards sine wave (scaled from range_min to range_max).
+* @param[in]        theta       Angle (a full circle mapped to 0-255) used as input for sine calculation.
+* @param[in]        range_min   Lower bound of range (inclusive).
+* @param[in]        range_max   Upper bound of range (inclusive).
+* @param[in]        max_delta   Maximum delta between value and range_max (due to values being integers and eventually not fully matching).
+* @param[in,out]    value       Reference of variable to be increased
+* @return `true` if value and range_max are within a delta of 3 (chosen by fair dice rolling), `false` otherwise
+* @see scaled_sin()
+*/
+bool scaled_sin_up(const uint8_t thea, const uint8_t range_min, const uint8_t range_max, const uint8_t max_delta, uint8_t *value);
+
+/**
+* @brief Decreases the given value until reaching range_min.
+* The decrements occur following an downwards sinus wave (scaled from range_min to range_max).
+* @param[in]        theta       Angle (a full circle mapped to 0-255) used as input for sinus calculation.
+* @param[in]        range_min   Lower bound of range (inclusive).
+* @param[in]        range_max   Upper bound of range (inclusive).
+* @param[in]        max_delta   Maximum delta between value and range_min (due to values being integers and eventually not fully matching).
+* @param[in,out]    value       Reference of variable to be decreased
+* @return `true` if value and range_max are within a delta of 3 (chosen by fair dice rolling), `false` otherwise
+* @see scaled_sin()
+*/
+bool scaled_sin_down(const uint8_t theta, const uint8_t range_min, const uint8_t range_max, const uint8_t max_delta, uint8_t *value);
diff --git a/users/vitoni/vitoni.c b/users/vitoni/vitoni.c
new file mode 100644
index 0000000000..2a0ff5c46f
--- /dev/null
+++ b/users/vitoni/vitoni.c
@@ -0,0 +1,131 @@
+// Copyright 2021 Victor Toni (@vitoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "vitoni.h"
+
+#include <rgb_matrix.h>
+#include <lib/lib8tion/lib8tion.h>
+
+#include "rgb_matrix_effects.h"
+#include "utils.h"
+
+#if defined(RGB_FADE_IN) || defined(RGB_DISABLE_WITH_FADE_OUT) || defined(RGB_IDLE_TIMEOUT)
+static uint8_t state;
+
+// flag used to indicate that offset calculation is needed to adjust the timer,
+// so that it matches the index used for sine calculation
+static bool calc_offset;
+
+void matrix_scan_user_rgb(void) {
+#if defined(RGB_DISABLE_WITH_FADE_OUT) || defined(RGB_IDLE_TIMEOUT)
+    const uint8_t time = rgb_time_2_scale();
+#endif
+    static uint8_t time_offset;
+
+    const uint32_t inactivity_millis = last_input_activity_elapsed();
+
+#if defined(RGB_IDLE_TIMEOUT)
+    if (IDLE != state && RGB_IDLE_TIMEOUT <= inactivity_millis) {
+        update_value(&state, IDLE_FADE_OUT, &calc_offset);
+    }
+#endif
+#if defined(RGB_DISABLE_WITH_FADE_OUT)
+    const uint32_t fade_out_duration = scale_2_rgb_time(128);
+    const uint32_t start_fade_out_after_millis = (RGB_DISABLE_TIMEOUT) > fade_out_duration
+        ? (RGB_DISABLE_TIMEOUT) - fade_out_duration
+        : 0;
+
+    if (start_fade_out_after_millis <= inactivity_millis) {
+        update_value(&state, FADE_OUT, &calc_offset);
+    }
+#elif defined(RGB_DISABLE_TIMEOUT)
+    // having to set brightness "manually" to black as starting point for fade in
+    // for the time when returning from suspended state
+    if (RGB_DISABLE_TIMEOUT <= inactivity_millis + 15) {
+        rgb_matrix_config.hsv.v = 0;
+        state = SUSPENDED;
+    }
+#endif
+
+    switch(state) {
+#if defined(RGB_IDLE_TIMEOUT)
+        case IDLE_FADE_OUT:
+            if (calc_offset) {
+                time_offset = calc_fade_out_offset(time);
+
+                // resetting flag for subsequent calls
+                calc_offset = false;
+            }
+            if (idle_fade_out(time + time_offset)) {
+                update_value(&state, IDLE, &calc_offset);
+            }
+            break;
+        case IDLE:
+#if defined(RGB_IDLE_BREATHE)
+            if (calc_offset) {
+                // no need to calculate time_offset since we are aligned already due to IDLE_FADE_OUT
+                // resetting flag for subsequent calls
+                calc_offset = false;
+            }
+            idle_breathe(time + time_offset);
+#endif
+            break;
+#endif
+#if defined(RGB_DISABLE_WITH_FADE_OUT)
+        case FADE_OUT:
+            if (calc_offset) {
+                time_offset = calc_fade_out_offset(time);
+
+                // resetting flag for subsequent calls
+                calc_offset = false;
+            }
+            if (fade_out(time + time_offset)) {
+                update_value(&state, SUSPENDED, &calc_offset);
+            }
+            break;
+#endif
+#if defined(RGB_FADE_IN) || defined(RGB_IDLE_TIMEOUT)
+        case FADE_IN:
+            {
+                // since we want to be active, fade in should be faster than e.g. fading out
+                const uint8_t fade_in_time = rgb_time_2_scale_w_factor(4);
+                if (calc_offset) {
+                    time_offset = calc_fade_in_offset(fade_in_time);
+
+                    // resetting flag for subsequent calls
+                    calc_offset = false;
+                }
+                if (fade_in(fade_in_time + time_offset)) {
+                    update_value(&state, REGULAR, &calc_offset);
+                }
+            }
+            break;
+#endif
+        default:
+            break;
+    }
+}
+
+#if defined(RGB_FADE_IN) || defined(RGB_IDLE_TIMEOUT)
+bool process_record_user_rgb(const uint16_t keycode, const keyrecord_t *record) {
+    // if we are in a non regular state we might have faded out (eventually partially)
+    // so we restore brightness (to max as we don't keep track of manually changed brightness)
+    // if (REGULAR != state && FADE_IN != state) {
+    if (FADE_IN != state && REGULAR != state) {
+        update_value(&state, FADE_IN, &calc_offset);
+    }
+
+    return true; // Process all other keycodes normally
+}
+
+void suspend_wakeup_init_user(void) {
+    if (FADE_IN != state) {
+        // setting brightness to black as starting point for fade in
+        rgb_matrix_config.hsv.v = 0;
+
+        update_value(&state, FADE_IN, &calc_offset);
+    }
+}
+#endif // defined(RGB_FADE_IN)
+
+#endif // defined(RGB_FADE_IN) || defined(RGB_DISABLE_WITH_FADE_OUT)
diff --git a/users/vitoni/vitoni.h b/users/vitoni/vitoni.h
new file mode 100644
index 0000000000..1f26037135
--- /dev/null
+++ b/users/vitoni/vitoni.h
@@ -0,0 +1,30 @@
+// Copyright 2021 Victor Toni (@vitoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include <quantum/action.h>
+
+#include "rgb_matrix_effects.h"
+
+/**
+ * @brief Executes periodic tasks, eg. fading or checking for upcoming supend.
+ * @details Function declaration as weak as the implementation might "disappear" depending on the RGB settings used.
+ * The weak declaration avoids having to change `keymap.c`.
+ */
+__attribute__((weak))
+void matrix_scan_user_rgb(void);
+
+/**
+ * @brief Executes tasks based on user activity, eg. fading in.
+ * @details Function declaration as weak as the implementation might "disappear" depending on the RGB settings used.
+ * The weak declaration avoids having to change `keymap.c`.
+ * @param[in]   keycode
+ * @param[in]   record
+ * @return `false` if further processing should be stopped, `true` otherwise
+ */
+__attribute__((weak))
+bool process_record_user_rgb(const uint16_t keycode, const keyrecord_t *record);

From 6f81880f17f94cb9a2e7a09f2f028c83e5d8b1db Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 27 Dec 2021 21:15:56 +1100
Subject: [PATCH 090/867] Convert some more boards to Matrix Lite (#15489)

---
 keyboards/centromere/matrix.c         | 118 +++--------------------
 keyboards/centromere/rules.mk         |  20 ++--
 keyboards/chimera_ergo/matrix.c       | 127 +++----------------------
 keyboards/chimera_ergo/rules.mk       |  16 ++--
 keyboards/chimera_ls/matrix.c         | 131 +++-----------------------
 keyboards/chimera_ls/rules.mk         |  14 +--
 keyboards/chimera_ortho/matrix.c      | 117 +++--------------------
 keyboards/chimera_ortho/rules.mk      |  14 +--
 keyboards/chimera_ortho_plus/matrix.c | 117 +++--------------------
 keyboards/chimera_ortho_plus/rules.mk |   2 +-
 keyboards/comet46/matrix.c            | 117 +++--------------------
 keyboards/comet46/rules.mk            |  14 +--
 keyboards/mitosis/matrix.c            | 118 +++--------------------
 keyboards/mitosis/rules.mk            |  18 ++--
 keyboards/redox_w/matrix.c            | 127 +++----------------------
 keyboards/redox_w/rules.mk            |  16 ++--
 keyboards/sirius/uni660/rev1/matrix.c | 123 +++---------------------
 keyboards/sirius/uni660/rev1/rules.mk |   2 +-
 keyboards/sirius/uni660/rev2/matrix.c | 123 +++---------------------
 keyboards/sirius/uni660/rev2/rules.mk |   2 +-
 20 files changed, 206 insertions(+), 1130 deletions(-)

diff --git a/keyboards/centromere/matrix.c b/keyboards/centromere/matrix.c
index a46701275a..bbd771f41b 100644
--- a/keyboards/centromere/matrix.c
+++ b/keyboards/centromere/matrix.c
@@ -15,77 +15,18 @@ 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 <stdint.h>
-#include <stdbool.h>
-#if defined(__AVR__)
-#include <avr/io.h>
-#endif
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
+
+#include "quantum.h"
 #include "matrix.h"
-#include "timer.h"
 #include "uart.h"
 
-#if (MATRIX_COLS <= 8)
-#    define print_matrix_header()  print("\nr/c 01234567\n")
-#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
-#    define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
-#    define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
-#    define ROW_SHIFTER  ((uint32_t)1)
-#endif
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void) {
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void) {
-    return MATRIX_COLS;
-}
-
-void matrix_init(void) {
-
-    matrix_init_quantum();
+void matrix_init_custom(void) {
     uart_init(500000);
 }
 
-uint8_t matrix_scan(void)
-{
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     uint32_t timeout = 0;
+    bool changed = false;
 
     //the s character requests the RF remote slave to send the matrix information
     uart_write('s');
@@ -96,9 +37,9 @@ uint8_t matrix_scan(void)
     //there are 10 bytes corresponding to 1w columns, and an end byte
     for (uint8_t i = 0; i < 11; i++) {
         //wait for the serial data, timeout if it's been too long
-        while(!uart_available()){
+        while (!uart_available()) {
             timeout++;
-            if (timeout > 10000){
+            if (timeout > 10000) {
                 break;
             }
         }
@@ -107,47 +48,16 @@ uint8_t matrix_scan(void)
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
     //will only show up here if the correct bytes were recieved
-    if (uart_data[10] == 0xE0)
-    {
+    if (uart_data[10] == 0xE0) {
         //shifting and transferring the keystates to the QMK matrix variable
         for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-            matrix[i] = (uint16_t) uart_data[i*2] | (uint16_t) uart_data[i*2+1] << 5;
+            matrix_row_t current_row = (uint16_t) uart_data[i * 2] | (uint16_t) uart_data[i * 2 + 1] << 5;
+            if (current_matrix[i] != current_row) {
+                changed = true;
+            }
+            current_matrix[i] = current_row;
         }
     }
 
-
-    matrix_scan_quantum();
-    return 1;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print_matrix_header();
-
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_matrix_row(row);
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
+    return changed;
 }
diff --git a/keyboards/centromere/rules.mk b/keyboards/centromere/rules.mk
index 15c6a20746..113e1e6aff 100644
--- a/keyboards/centromere/rules.mk
+++ b/keyboards/centromere/rules.mk
@@ -11,16 +11,18 @@ BOOTLOADER = caterina
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes   # Commands for debug and configuration
-CUSTOM_MATRIX = yes    # Remote matrix from the wireless bridge
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
-UNICODE_ENABLE = yes 		# Unicode
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = yes
+CUSTOM_MATRIX = lite
 
-# # project specific files
+# project specific files
 SRC += matrix.c
 QUANTUM_LIB_SRC += uart.c
 
diff --git a/keyboards/chimera_ergo/matrix.c b/keyboards/chimera_ergo/matrix.c
index ec438beb56..603ad0f386 100644
--- a/keyboards/chimera_ergo/matrix.c
+++ b/keyboards/chimera_ergo/matrix.c
@@ -15,86 +15,18 @@ 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 <stdint.h>
-#include <stdbool.h>
-#if defined(__AVR__)
-#include <avr/io.h>
-#endif
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
+
+#include "quantum.h"
 #include "matrix.h"
-#include "timer.h"
 #include "uart.h"
 
-#if (MATRIX_COLS <= 8)
-#    define print_matrix_header()  print("\nr/c 01234567\n")
-#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
-#    define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
-#    define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
-#    define ROW_SHIFTER  ((uint32_t)1)
-#endif
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void) {
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void) {
-    return MATRIX_COLS;
-}
-
-void matrix_init(void) {
-
-    matrix_init_quantum();
+void matrix_init_custom(void) {
     uart_init(1000000);
 }
 
-uint8_t matrix_scan(void)
-{
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     uint32_t timeout = 0;
+    bool changed = false;
 
     //the s character requests the RF slave to send the matrix
     uart_write('s');
@@ -107,9 +39,9 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!uart_available()){
+        while (!uart_available()) {
             timeout++;
-            if (timeout > 10000){
+            if (timeout > 10000) {
                 break;
             }
         }
@@ -118,47 +50,16 @@ uint8_t matrix_scan(void)
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
     //will only show up here if the correct bytes were recieved
-    if (uart_data[10] == 0xE0)
-    {
+    if (uart_data[10] == 0xE0) {
         //shifting and transferring the keystates to the QMK matrix variable
         for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-            matrix[i] = (uint16_t) uart_data[i*2] | (uint16_t) uart_data[i*2+1] << 6;
+            matrix_row_t current_row = (uint16_t) uart_data[i * 2] | (uint16_t) uart_data[i * 2 + 1] << 6;
+            if (current_matrix[i] != current_row) {
+                changed = true;
+            }
+            current_matrix[i] = current_row;
         }
     }
 
-
-    matrix_scan_quantum();
-    return 1;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print_matrix_header();
-
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_matrix_row(row);
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
+    return changed;
 }
diff --git a/keyboards/chimera_ergo/rules.mk b/keyboards/chimera_ergo/rules.mk
index 483485cb7d..8cb1736147 100644
--- a/keyboards/chimera_ergo/rules.mk
+++ b/keyboards/chimera_ergo/rules.mk
@@ -8,14 +8,16 @@ BOOTLOADER = caterina
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes   # Commands for debug and configuration
-CUSTOM_MATRIX = yes    # Remote matrix from the wireless bridge
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+CUSTOM_MATRIX = lite
 
-# # project specific files
+# project specific files
 SRC += matrix.c
 QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/chimera_ls/matrix.c b/keyboards/chimera_ls/matrix.c
index 354346ca09..a92c3e8431 100644
--- a/keyboards/chimera_ls/matrix.c
+++ b/keyboards/chimera_ls/matrix.c
@@ -15,90 +15,18 @@ 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 <stdint.h>
-#include <stdbool.h>
-#if defined(__AVR__)
-#include <avr/io.h>
-#endif
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
+
+#include "quantum.h"
 #include "matrix.h"
-#include "timer.h"
 #include "uart.h"
 
-#if (MATRIX_COLS <= 8)
-#    define print_matrix_header()  print("\nr/c 01234567\n")
-#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
-#    define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
-#    define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
-#    define ROW_SHIFTER  ((uint32_t)1)
-#elif (MATRIX_COLS <= 64)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse64(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop64(matrix[i])
-#    define ROW_SHIFTER  ((uint64_t)1)
-#endif
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void) {
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void) {
-    return MATRIX_COLS;
-}
-
-void matrix_init(void) {
-    matrix_init_quantum();
+void matrix_init_custom(void) {
     uart_init(1000000);
 }
 
-uint8_t matrix_scan(void)
-{
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     uint32_t timeout = 0;
+    bool changed = false;
 
     //the s character requests the RF slave to send the matrix
     uart_write('s');
@@ -111,9 +39,9 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!uart_available()){
+        while (!uart_available()) {
             timeout++;
-            if (timeout > 10000){
+            if (timeout > 10000) {
                 break;
             }
         }
@@ -122,47 +50,16 @@ uint8_t matrix_scan(void)
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
     //will only show up here if the correct bytes were recieved
-    if (uart_data[10] == 0xE0)
-    {
+    if (uart_data[10] == 0xE0) {
         //shifting and transferring the keystates to the QMK matrix variable
         for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-            matrix[i] = (uint16_t) uart_data[i*2] | (uint16_t) uart_data[i*2+1] << 5;
+            matrix_row_t current_row = (uint16_t) uart_data[i * 2] | (uint16_t) uart_data[i * 2 + 1] << 5;
+            if (current_matrix[i] != current_row) {
+                changed = true;
+            }
+            current_matrix[i] = current_row;
         }
     }
 
-
-    matrix_scan_quantum();
-    return 1;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print_matrix_header();
-
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_matrix_row(row);
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
+    return changed;
 }
diff --git a/keyboards/chimera_ls/rules.mk b/keyboards/chimera_ls/rules.mk
index ae0cc8b749..b7f6db5aa5 100644
--- a/keyboards/chimera_ls/rules.mk
+++ b/keyboards/chimera_ls/rules.mk
@@ -8,13 +8,15 @@ BOOTLOADER = caterina
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes   # Commands for debug and configuration
-CUSTOM_MATRIX = yes    # Remote matrix from the wireless bridge
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+CUSTOM_MATRIX = lite
 
 # project specific files
 SRC += matrix.c
diff --git a/keyboards/chimera_ortho/matrix.c b/keyboards/chimera_ortho/matrix.c
index 1403f410c0..a92c3e8431 100644
--- a/keyboards/chimera_ortho/matrix.c
+++ b/keyboards/chimera_ortho/matrix.c
@@ -15,76 +15,18 @@ 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 <stdint.h>
-#include <stdbool.h>
-#if defined(__AVR__)
-#include <avr/io.h>
-#endif
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
+
+#include "quantum.h"
 #include "matrix.h"
-#include "timer.h"
 #include "uart.h"
 
-#if (MATRIX_COLS <= 8)
-#    define print_matrix_header()  print("\nr/c 01234567\n")
-#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
-#    define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
-#    define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
-#    define ROW_SHIFTER  ((uint32_t)1)
-#endif
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void) {
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void) {
-    return MATRIX_COLS;
-}
-
-void matrix_init(void) {
-
-    matrix_init_quantum();
+void matrix_init_custom(void) {
     uart_init(1000000);
 }
 
-uint8_t matrix_scan(void)
-{
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     uint32_t timeout = 0;
+    bool changed = false;
 
     //the s character requests the RF slave to send the matrix
     uart_write('s');
@@ -97,9 +39,9 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!uart_available()){
+        while (!uart_available()) {
             timeout++;
-            if (timeout > 10000){
+            if (timeout > 10000) {
                 break;
             }
         }
@@ -108,47 +50,16 @@ uint8_t matrix_scan(void)
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
     //will only show up here if the correct bytes were recieved
-    if (uart_data[10] == 0xE0)
-    {
+    if (uart_data[10] == 0xE0) {
         //shifting and transferring the keystates to the QMK matrix variable
         for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-            matrix[i] = (uint16_t) uart_data[i*2] | (uint16_t) uart_data[i*2+1] << 5;
+            matrix_row_t current_row = (uint16_t) uart_data[i * 2] | (uint16_t) uart_data[i * 2 + 1] << 5;
+            if (current_matrix[i] != current_row) {
+                changed = true;
+            }
+            current_matrix[i] = current_row;
         }
     }
 
-
-    matrix_scan_quantum();
-    return 1;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print_matrix_header();
-
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_matrix_row(row);
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
+    return changed;
 }
diff --git a/keyboards/chimera_ortho/rules.mk b/keyboards/chimera_ortho/rules.mk
index c35dc9ba2e..8cb1736147 100644
--- a/keyboards/chimera_ortho/rules.mk
+++ b/keyboards/chimera_ortho/rules.mk
@@ -8,13 +8,15 @@ BOOTLOADER = caterina
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes   # Commands for debug and configuration
-CUSTOM_MATRIX = yes    # Remote matrix from the wireless bridge
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+CUSTOM_MATRIX = lite
 
 # project specific files
 SRC += matrix.c
diff --git a/keyboards/chimera_ortho_plus/matrix.c b/keyboards/chimera_ortho_plus/matrix.c
index 51898e35d1..603ad0f386 100644
--- a/keyboards/chimera_ortho_plus/matrix.c
+++ b/keyboards/chimera_ortho_plus/matrix.c
@@ -15,76 +15,18 @@ 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 <stdint.h>
-#include <stdbool.h>
-#if defined(__AVR__)
-#include <avr/io.h>
-#endif
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
+
+#include "quantum.h"
 #include "matrix.h"
-#include "timer.h"
 #include "uart.h"
 
-#if (MATRIX_COLS <= 8)
-#    define print_matrix_header()  print("\nr/c 01234567\n")
-#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
-#    define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
-#    define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
-#    define ROW_SHIFTER  ((uint32_t)1)
-#endif
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void) {
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void) {
-    return MATRIX_COLS;
-}
-
-void matrix_init(void) {
-
-    matrix_init_quantum();
+void matrix_init_custom(void) {
     uart_init(1000000);
 }
 
-uint8_t matrix_scan(void)
-{
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     uint32_t timeout = 0;
+    bool changed = false;
 
     //the s character requests the RF slave to send the matrix
     uart_write('s');
@@ -97,9 +39,9 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!uart_available()){
+        while (!uart_available()) {
             timeout++;
-            if (timeout > 10000){
+            if (timeout > 10000) {
                 break;
             }
         }
@@ -108,47 +50,16 @@ uint8_t matrix_scan(void)
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
     //will only show up here if the correct bytes were recieved
-    if (uart_data[10] == 0xE0)
-    {
+    if (uart_data[10] == 0xE0) {
         //shifting and transferring the keystates to the QMK matrix variable
         for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-            matrix[i] = (uint16_t) uart_data[i*2] | (uint16_t) uart_data[i*2+1] << 6;
+            matrix_row_t current_row = (uint16_t) uart_data[i * 2] | (uint16_t) uart_data[i * 2 + 1] << 6;
+            if (current_matrix[i] != current_row) {
+                changed = true;
+            }
+            current_matrix[i] = current_row;
         }
     }
 
-
-    matrix_scan_quantum();
-    return 1;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print_matrix_header();
-
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_matrix_row(row);
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
+    return changed;
 }
diff --git a/keyboards/chimera_ortho_plus/rules.mk b/keyboards/chimera_ortho_plus/rules.mk
index cd98979306..0a8a31e7dd 100644
--- a/keyboards/chimera_ortho_plus/rules.mk
+++ b/keyboards/chimera_ortho_plus/rules.mk
@@ -17,7 +17,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
-CUSTOM_MATRIX = yes
+CUSTOM_MATRIX = lite
 
 # project specific files
 SRC += matrix.c
diff --git a/keyboards/comet46/matrix.c b/keyboards/comet46/matrix.c
index 1403f410c0..a92c3e8431 100644
--- a/keyboards/comet46/matrix.c
+++ b/keyboards/comet46/matrix.c
@@ -15,76 +15,18 @@ 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 <stdint.h>
-#include <stdbool.h>
-#if defined(__AVR__)
-#include <avr/io.h>
-#endif
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
+
+#include "quantum.h"
 #include "matrix.h"
-#include "timer.h"
 #include "uart.h"
 
-#if (MATRIX_COLS <= 8)
-#    define print_matrix_header()  print("\nr/c 01234567\n")
-#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
-#    define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
-#    define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
-#    define ROW_SHIFTER  ((uint32_t)1)
-#endif
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void) {
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void) {
-    return MATRIX_COLS;
-}
-
-void matrix_init(void) {
-
-    matrix_init_quantum();
+void matrix_init_custom(void) {
     uart_init(1000000);
 }
 
-uint8_t matrix_scan(void)
-{
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     uint32_t timeout = 0;
+    bool changed = false;
 
     //the s character requests the RF slave to send the matrix
     uart_write('s');
@@ -97,9 +39,9 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!uart_available()){
+        while (!uart_available()) {
             timeout++;
-            if (timeout > 10000){
+            if (timeout > 10000) {
                 break;
             }
         }
@@ -108,47 +50,16 @@ uint8_t matrix_scan(void)
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
     //will only show up here if the correct bytes were recieved
-    if (uart_data[10] == 0xE0)
-    {
+    if (uart_data[10] == 0xE0) {
         //shifting and transferring the keystates to the QMK matrix variable
         for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-            matrix[i] = (uint16_t) uart_data[i*2] | (uint16_t) uart_data[i*2+1] << 5;
+            matrix_row_t current_row = (uint16_t) uart_data[i * 2] | (uint16_t) uart_data[i * 2 + 1] << 5;
+            if (current_matrix[i] != current_row) {
+                changed = true;
+            }
+            current_matrix[i] = current_row;
         }
     }
 
-
-    matrix_scan_quantum();
-    return 1;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print_matrix_header();
-
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_matrix_row(row);
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
+    return changed;
 }
diff --git a/keyboards/comet46/rules.mk b/keyboards/comet46/rules.mk
index 10d828cc7f..e177fc6441 100644
--- a/keyboards/comet46/rules.mk
+++ b/keyboards/comet46/rules.mk
@@ -8,13 +8,15 @@ BOOTLOADER = caterina
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-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
-CUSTOM_MATRIX = yes     # Remote matrix from the wireless bridge
+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
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+CUSTOM_MATRIX = lite
 
 # project specific files
 SRC += matrix.c \
diff --git a/keyboards/mitosis/matrix.c b/keyboards/mitosis/matrix.c
index 102431eb67..a92c3e8431 100644
--- a/keyboards/mitosis/matrix.c
+++ b/keyboards/mitosis/matrix.c
@@ -15,77 +15,18 @@ 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 <stdint.h>
-#include <stdbool.h>
-#if defined(__AVR__)
-#include <avr/io.h>
-#endif
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
+
+#include "quantum.h"
 #include "matrix.h"
-#include "timer.h"
 #include "uart.h"
 
-#if (MATRIX_COLS <= 8)
-#    define print_matrix_header()  print("\nr/c 01234567\n")
-#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
-#    define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
-#    define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
-#    define ROW_SHIFTER  ((uint32_t)1)
-#endif
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void) {
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void) {
-    return MATRIX_COLS;
-}
-
-void matrix_init(void) {
-
-    matrix_init_quantum();
+void matrix_init_custom(void) {
     uart_init(1000000);
 }
 
-uint8_t matrix_scan(void)
-{
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     uint32_t timeout = 0;
+    bool changed = false;
 
     //the s character requests the RF slave to send the matrix
     uart_write('s');
@@ -98,9 +39,9 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!uart_available()){
+        while (!uart_available()) {
             timeout++;
-            if (timeout > 10000){
+            if (timeout > 10000) {
                 break;
             }
         }
@@ -109,47 +50,16 @@ uint8_t matrix_scan(void)
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
     //will only show up here if the correct bytes were recieved
-    if (uart_data[10] == 0xE0)
-    {
+    if (uart_data[10] == 0xE0) {
         //shifting and transferring the keystates to the QMK matrix variable
         for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-            matrix[i] = (uint16_t) uart_data[i*2] | (uint16_t) uart_data[i*2+1] << 5;
+            matrix_row_t current_row = (uint16_t) uart_data[i * 2] | (uint16_t) uart_data[i * 2 + 1] << 5;
+            if (current_matrix[i] != current_row) {
+                changed = true;
+            }
+            current_matrix[i] = current_row;
         }
     }
 
-
-    matrix_scan_quantum();
-    return 1;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print_matrix_header();
-
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_matrix_row(row);
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
+    return changed;
 }
diff --git a/keyboards/mitosis/rules.mk b/keyboards/mitosis/rules.mk
index 04cafae718..0a8a31e7dd 100644
--- a/keyboards/mitosis/rules.mk
+++ b/keyboards/mitosis/rules.mk
@@ -8,15 +8,17 @@ BOOTLOADER = caterina
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes   # Commands for debug and configuration
-CUSTOM_MATRIX = yes    # Remote matrix from the wireless bridge
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-UNICODE_ENABLE = yes 		# Unicode
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = yes
+CUSTOM_MATRIX = lite
 
-# # project specific files
+# project specific files
 SRC += matrix.c
 QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/redox_w/matrix.c b/keyboards/redox_w/matrix.c
index 752324837c..fd25231d9e 100644
--- a/keyboards/redox_w/matrix.c
+++ b/keyboards/redox_w/matrix.c
@@ -13,86 +13,18 @@
  * 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 <stdint.h>
-#include <stdbool.h>
-#if defined(__AVR__)
-#include <avr/io.h>
-#endif
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
+
+#include "quantum.h"
 #include "matrix.h"
-#include "timer.h"
 #include "uart.h"
 
-#if (MATRIX_COLS <= 8)
-#    define print_matrix_header()  print("\nr/c 01234567\n")
-#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
-#    define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
-#    define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
-#    define ROW_SHIFTER  ((uint32_t)1)
-#endif
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-
-__attribute__ ((weak))
-void matrix_init_quantum(void) {
-    matrix_init_kb();
-}
-
-__attribute__ ((weak))
-void matrix_scan_quantum(void) {
-    matrix_scan_kb();
-}
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void) {
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void) {
-    return MATRIX_COLS;
-}
-
-void matrix_init(void) {
-
-    matrix_init_quantum();
+void matrix_init_custom(void) {
     uart_init(1000000);
 }
 
-uint8_t matrix_scan(void)
-{
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     uint32_t timeout = 0;
+    bool changed = false;
 
     //the s character requests the RF slave to send the matrix
     uart_write('s');
@@ -105,9 +37,9 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!uart_available()){
+        while (!uart_available()) {
             timeout++;
-            if (timeout > 10000){
+            if (timeout > 10000) {
                 break;
             }
         }
@@ -116,47 +48,16 @@ uint8_t matrix_scan(void)
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
     //will only show up here if the correct bytes were recieved
-    if (uart_data[10] == 0xE0)
-    {
+    if (uart_data[10] == 0xE0) {
         //shifting and transferring the keystates to the QMK matrix variable
         for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-            matrix[i] = (uint16_t) uart_data[i*2] | (uint16_t) uart_data[i*2+1] << 7;
+            matrix_row_t current_row = (uint16_t) uart_data[i * 2] | (uint16_t) uart_data[i * 2 + 1] << 7;
+            if (current_matrix[i] != current_row) {
+                changed = true;
+            }
+            current_matrix[i] = current_row;
         }
     }
 
-
-    matrix_scan_quantum();
-    return 1;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print_matrix_header();
-
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_matrix_row(row);
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
+    return changed;
 }
diff --git a/keyboards/redox_w/rules.mk b/keyboards/redox_w/rules.mk
index 483485cb7d..8cb1736147 100644
--- a/keyboards/redox_w/rules.mk
+++ b/keyboards/redox_w/rules.mk
@@ -8,14 +8,16 @@ BOOTLOADER = caterina
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-CONSOLE_ENABLE = yes	# Console for debug
-COMMAND_ENABLE = yes   # Commands for debug and configuration
-CUSTOM_MATRIX = yes    # Remote matrix from the wireless bridge
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+CUSTOM_MATRIX = lite
 
-# # project specific files
+# project specific files
 SRC += matrix.c
 QUANTUM_LIB_SRC += uart.c
diff --git a/keyboards/sirius/uni660/rev1/matrix.c b/keyboards/sirius/uni660/rev1/matrix.c
index 65c35c968b..919db5c80d 100644
--- a/keyboards/sirius/uni660/rev1/matrix.c
+++ b/keyboards/sirius/uni660/rev1/matrix.c
@@ -15,80 +15,18 @@ 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 <stdint.h>
-#include <stdbool.h>
-#if defined(__AVR__)
-#include <avr/io.h>
-#endif
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
+
+#include "quantum.h"
 #include "matrix.h"
-#include "timer.h"
-#include "debounce.h"
 #include "uart.h"
 
-#if (MATRIX_COLS <= 8)
-#    define print_matrix_header()  print("\nr/c 01234567\n")
-#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
-#    define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
-#    define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
-#    define ROW_SHIFTER  ((uint32_t)1)
-#endif
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void) {
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void) {
-    return MATRIX_COLS;
-}
-
-void matrix_init(void) {
-    debounce_init(MATRIX_ROWS);
-    matrix_init_quantum();
+void matrix_init_custom(void) {
     uart_init(1000000);
 }
 
-uint8_t matrix_scan(void)
-{
-    bool matrix_has_changed = false;
-
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     uint32_t timeout = 0;
+    bool changed = false;
 
     //the s character requests the RF slave to send the matrix
     uart_write('s');
@@ -101,9 +39,9 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!uart_available()){
+        while (!uart_available()) {
             timeout++;
-            if (timeout > 10000){
+            if (timeout > 10000) {
                 break;
             }
         }
@@ -112,49 +50,16 @@ uint8_t matrix_scan(void)
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
     //will only show up here if the correct bytes were recieved
-    if (uart_data[10] == 0xE0)
-    {
+    if (uart_data[10] == 0xE0) {
         //shifting and transferring the keystates to the QMK matrix variable
         for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-            matrix[i] = (uint16_t) uart_data[i*2] | (uint16_t) uart_data[i*2+1] << 8;
+            matrix_row_t current_row = (uint16_t) uart_data[i * 2] | (uint16_t) uart_data[i * 2 + 1] << 8;
+            if (current_matrix[i] != current_row) {
+                changed = true;
+            }
+            current_matrix[i] = current_row;
         }
     }
 
-    debounce(matrix, matrix, MATRIX_ROWS, matrix_has_changed);
-
-    matrix_scan_quantum();
-
-    return matrix_has_changed;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print_matrix_header();
-
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_matrix_row(row);
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
+    return changed;
 }
diff --git a/keyboards/sirius/uni660/rev1/rules.mk b/keyboards/sirius/uni660/rev1/rules.mk
index 77b9af362e..71cc3efd92 100644
--- a/keyboards/sirius/uni660/rev1/rules.mk
+++ b/keyboards/sirius/uni660/rev1/rules.mk
@@ -17,7 +17,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes        # Unicode
-CUSTOM_MATRIX = yes
+CUSTOM_MATRIX = lite
 
 # project specific files
 SRC += matrix.c
diff --git a/keyboards/sirius/uni660/rev2/matrix.c b/keyboards/sirius/uni660/rev2/matrix.c
index 65c35c968b..919db5c80d 100644
--- a/keyboards/sirius/uni660/rev2/matrix.c
+++ b/keyboards/sirius/uni660/rev2/matrix.c
@@ -15,80 +15,18 @@ 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 <stdint.h>
-#include <stdbool.h>
-#if defined(__AVR__)
-#include <avr/io.h>
-#endif
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
+
+#include "quantum.h"
 #include "matrix.h"
-#include "timer.h"
-#include "debounce.h"
 #include "uart.h"
 
-#if (MATRIX_COLS <= 8)
-#    define print_matrix_header()  print("\nr/c 01234567\n")
-#    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
-#    define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
-#    define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-#    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-#    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
-#    define ROW_SHIFTER  ((uint32_t)1)
-#endif
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void) {
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void) {
-    return MATRIX_COLS;
-}
-
-void matrix_init(void) {
-    debounce_init(MATRIX_ROWS);
-    matrix_init_quantum();
+void matrix_init_custom(void) {
     uart_init(1000000);
 }
 
-uint8_t matrix_scan(void)
-{
-    bool matrix_has_changed = false;
-
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     uint32_t timeout = 0;
+    bool changed = false;
 
     //the s character requests the RF slave to send the matrix
     uart_write('s');
@@ -101,9 +39,9 @@ uint8_t matrix_scan(void)
         //wait for the serial data, timeout if it's been too long
         //this only happened in testing with a loose wire, but does no
         //harm to leave it in here
-        while(!uart_available()){
+        while (!uart_available()) {
             timeout++;
-            if (timeout > 10000){
+            if (timeout > 10000) {
                 break;
             }
         }
@@ -112,49 +50,16 @@ uint8_t matrix_scan(void)
 
     //check for the end packet, the key state bytes use the LSBs, so 0xE0
     //will only show up here if the correct bytes were recieved
-    if (uart_data[10] == 0xE0)
-    {
+    if (uart_data[10] == 0xE0) {
         //shifting and transferring the keystates to the QMK matrix variable
         for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-            matrix[i] = (uint16_t) uart_data[i*2] | (uint16_t) uart_data[i*2+1] << 8;
+            matrix_row_t current_row = (uint16_t) uart_data[i * 2] | (uint16_t) uart_data[i * 2 + 1] << 8;
+            if (current_matrix[i] != current_row) {
+                changed = true;
+            }
+            current_matrix[i] = current_row;
         }
     }
 
-    debounce(matrix, matrix, MATRIX_ROWS, matrix_has_changed);
-
-    matrix_scan_quantum();
-
-    return matrix_has_changed;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print_matrix_header();
-
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_matrix_row(row);
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
+    return changed;
 }
diff --git a/keyboards/sirius/uni660/rev2/rules.mk b/keyboards/sirius/uni660/rev2/rules.mk
index f3ff80d92e..850c2a2e35 100644
--- a/keyboards/sirius/uni660/rev2/rules.mk
+++ b/keyboards/sirius/uni660/rev2/rules.mk
@@ -17,7 +17,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes        # Unicode
-CUSTOM_MATRIX = yes
+CUSTOM_MATRIX = lite
 
 # project specific files
 SRC += matrix.c

From 067d94f0b6c957c4e1c0ae1d680b420651fb3766 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Mon, 27 Dec 2021 18:16:19 +0800
Subject: [PATCH 091/867] Add layer condition example to encoder callback
 function (#15490)

Co-authored-by: filterpaper <filterpaper@localhost>
---
 docs/feature_encoders.md | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md
index 8e854c1e58..8ab5ca9c46 100644
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -87,6 +87,43 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 
 !> If you return `true`, this will allow the keyboard level code to run, as well.  Returning `false` will override the keyboard level code.  Depending on how the keyboard level function is set up. 
 
+Layer conditions can also be used with the callback function like the following:
+
+```c
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (get_highest_layer(layer_state|default_layer_state) > 0) {
+        if (index == 0) {
+            if (clockwise) {
+                tap_code(KC_WH_D);
+            } else {
+                tap_code(KC_WH_U);
+            }
+        } else if (index == 1) {
+            if (clockwise) {
+                tap_code(KC_VOLU);
+            } else {
+                tap_code(KC_VOLD);
+            }
+        }
+    } else {  /* Layer 0 */
+        if (index == 0) {
+            if (clockwise) {
+                tap_code(KC_PGDN);
+            } else {
+                tap_code(KC_PGUP);
+            }
+        } else if (index == 1) {
+            if (clockwise) {
+                tap_code(KC_DOWN);
+            } else {
+                tap_code(KC_UP);
+            }
+        }
+    }
+    return false;
+}
+```
+
 ## Hardware
 
 The A an B lines of the encoders should be wired directly to the MCU, and the C/common lines should be wired to ground.

From 52b53ccf3821c0e2855acb424f78342a0c95a400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= <alvaro.volpato@usp.br>
Date: Mon, 27 Dec 2021 07:17:12 -0300
Subject: [PATCH 092/867] Add 'capslock backlight' feature to Iron180 (#15462)

* Add 'capslock backlight' capability to Iron180

* Update readme

* Revers CAPSLOCK_BACKLIGHT back to default
---
 keyboards/iron180/config.h  |  3 +++
 keyboards/iron180/iron180.c | 17 ++++++++++++++++-
 keyboards/iron180/readme.md | 13 +++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/keyboards/iron180/config.h b/keyboards/iron180/config.h
index bb71496b53..cc5c81a50c 100644
--- a/keyboards/iron180/config.h
+++ b/keyboards/iron180/config.h
@@ -47,3 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
+
+// Turn backlight on-off according to capslock (off by default)
+#define CAPSLOCK_BACKLIGHT
diff --git a/keyboards/iron180/iron180.c b/keyboards/iron180/iron180.c
index 236f8176f6..546ff7fc8f 100644
--- a/keyboards/iron180/iron180.c
+++ b/keyboards/iron180/iron180.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
+Copyright 2021 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,3 +16,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "iron180.h"
+
+#ifdef CAPSLOCK_BACKLIGHT
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (!led_state.caps_lock){
+        if (is_backlight_breathing()) breathing_disable();
+        backlight_disable();
+    }
+    else {
+	if (is_backlight_breathing()) breathing_enable();
+        backlight_enable();
+    }
+    return res;
+}
+#endif
diff --git a/keyboards/iron180/readme.md b/keyboards/iron180/readme.md
index 1dbffae1d4..d89ca912ef 100644
--- a/keyboards/iron180/readme.md
+++ b/keyboards/iron180/readme.md
@@ -31,3 +31,16 @@ Then, after accessing the DFU state, use a tool like `dfu-util` or the QMK Toolb
     make iron180:default:flash
 
 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).
+
+## The 'caps lock backlight' feature
+
+The Iron180 firmware allows the user to adjust the backlight according to the caps lock key. This will toggle *all backlight LEDs* according to caps lock, enabling backlight when caps is on and disabling when it is off.
+
+This option is specially useful if you are only interested in the caps lock LED and want it to work as an indicator; however, it must be noted that this works keyboard-wide, so if that is your case you should only solder the caps lock key LED and none else.
+
+This option is disabled by default; in order to enable it, you must un-comment the last line in `config.h`:
+
+    // Turn backlight on-off according to capslock
+    #define CAPSLOCK_BACKLIGHT
+
+Then compile and flash the firmware.

From 235c666f3d79ca42f8bc529bf006473396cb0bba Mon Sep 17 00:00:00 2001
From: Kyrylo Mikos <kiril.mik.os@gmail.com>
Date: Mon, 27 Dec 2021 12:18:04 +0200
Subject: [PATCH 093/867] mkiirgb/v3: Swap R and G lanes to achieve correct
 RGB. (#15511)

---
 keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c | 136 ++++++++++++------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index 85806aff51..6f325c4331 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -19,78 +19,78 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
-    {0, CS21_SW1, CS20_SW1, CS19_SW1},
-    {0, CS21_SW2, CS20_SW2, CS19_SW2},
-    {0, CS21_SW3, CS20_SW3, CS19_SW3},
-    {0, CS21_SW4, CS20_SW4, CS19_SW4},
-    {0, CS21_SW5, CS20_SW5, CS19_SW5},
-    {0, CS21_SW6, CS20_SW6, CS19_SW6},
-    {0, CS21_SW7, CS20_SW7, CS19_SW7},
-    {0, CS21_SW8, CS20_SW8, CS19_SW8},
-    {0, CS24_SW1, CS23_SW1, CS22_SW1},
-    {0, CS24_SW2, CS23_SW2, CS22_SW2},
-    {0, CS24_SW3, CS23_SW3, CS22_SW3},
-    {0, CS24_SW4, CS23_SW4, CS22_SW4},
-    {0, CS24_SW5, CS23_SW5, CS22_SW5},
-    {0, CS24_SW6, CS23_SW6, CS22_SW6},
-    {0, CS24_SW7, CS23_SW7, CS22_SW7},
+    {0, CS20_SW1, CS21_SW1, CS19_SW1},
+    {0, CS20_SW2, CS21_SW2, CS19_SW2},
+    {0, CS20_SW3, CS21_SW3, CS19_SW3},
+    {0, CS20_SW4, CS21_SW4, CS19_SW4},
+    {0, CS20_SW5, CS21_SW5, CS19_SW5},
+    {0, CS20_SW6, CS21_SW6, CS19_SW6},
+    {0, CS20_SW7, CS21_SW7, CS19_SW7},
+    {0, CS20_SW8, CS21_SW8, CS19_SW8},
+    {0, CS23_SW1, CS24_SW1, CS22_SW1},
+    {0, CS23_SW2, CS24_SW2, CS22_SW2},
+    {0, CS23_SW3, CS24_SW3, CS22_SW3},
+    {0, CS23_SW4, CS24_SW4, CS22_SW4},
+    {0, CS23_SW5, CS24_SW5, CS22_SW5},
+    {0, CS23_SW6, CS24_SW6, CS22_SW6},
+    {0, CS23_SW7, CS24_SW7, CS22_SW7},
 
-    {0, CS15_SW1, CS14_SW1, CS13_SW1},
-    {0, CS15_SW2, CS14_SW2, CS13_SW2},
-    {0, CS15_SW3, CS14_SW3, CS13_SW3},
-    {0, CS15_SW4, CS14_SW4, CS13_SW4},
-    {0, CS15_SW5, CS14_SW5, CS13_SW5},
-    {0, CS15_SW6, CS14_SW6, CS13_SW6},
-    {0, CS15_SW7, CS14_SW7, CS13_SW7},
-    {0, CS15_SW8, CS14_SW8, CS13_SW8},
-    {0, CS30_SW1, CS29_SW1, CS28_SW1},
-    {0, CS30_SW2, CS29_SW2, CS28_SW2},
-    {0, CS30_SW3, CS29_SW3, CS28_SW3},
-    {0, CS30_SW4, CS29_SW4, CS28_SW4},
-    {0, CS30_SW5, CS29_SW5, CS28_SW5},
-    {0, CS30_SW6, CS29_SW6, CS28_SW6},
-    {0, CS30_SW7, CS29_SW7, CS28_SW7},
+    {0, CS14_SW1, CS15_SW1, CS13_SW1},
+    {0, CS14_SW2, CS15_SW2, CS13_SW2},
+    {0, CS14_SW3, CS15_SW3, CS13_SW3},
+    {0, CS14_SW4, CS15_SW4, CS13_SW4},
+    {0, CS14_SW5, CS15_SW5, CS13_SW5},
+    {0, CS14_SW6, CS15_SW6, CS13_SW6},
+    {0, CS14_SW7, CS15_SW7, CS13_SW7},
+    {0, CS14_SW8, CS15_SW8, CS13_SW8},
+    {0, CS29_SW1, CS30_SW1, CS28_SW1},
+    {0, CS29_SW2, CS30_SW2, CS28_SW2},
+    {0, CS29_SW3, CS30_SW3, CS28_SW3},
+    {0, CS29_SW4, CS30_SW4, CS28_SW4},
+    {0, CS29_SW5, CS30_SW5, CS28_SW5},
+    {0, CS29_SW6, CS30_SW6, CS28_SW6},
+    {0, CS29_SW7, CS30_SW7, CS28_SW7},
 
-    {0, CS12_SW1, CS11_SW1, CS10_SW1},
-    {0, CS12_SW2, CS11_SW2, CS10_SW2},
-    {0, CS12_SW3, CS11_SW3, CS10_SW3},
-    {0, CS12_SW4, CS11_SW4, CS10_SW4},
-    {0, CS12_SW5, CS11_SW5, CS10_SW5},
-    {0, CS12_SW6, CS11_SW6, CS10_SW6},
-    {0, CS12_SW7, CS11_SW7, CS10_SW7},
-    {0, CS12_SW8, CS11_SW8, CS10_SW8},
-    {0, CS33_SW1, CS32_SW1, CS31_SW1},
-    {0, CS33_SW2, CS32_SW2, CS31_SW2},
-    {0, CS33_SW3, CS32_SW3, CS31_SW3},
-    {0, CS33_SW4, CS32_SW4, CS31_SW4},
-    {0, CS33_SW5, CS32_SW5, CS31_SW5},
-    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+    {0, CS11_SW1, CS12_SW1, CS10_SW1},
+    {0, CS11_SW2, CS12_SW2, CS10_SW2},
+    {0, CS11_SW3, CS12_SW3, CS10_SW3},
+    {0, CS11_SW4, CS12_SW4, CS10_SW4},
+    {0, CS11_SW5, CS12_SW5, CS10_SW5},
+    {0, CS11_SW6, CS12_SW6, CS10_SW6},
+    {0, CS11_SW7, CS12_SW7, CS10_SW7},
+    {0, CS11_SW8, CS12_SW8, CS10_SW8},
+    {0, CS32_SW1, CS33_SW1, CS31_SW1},
+    {0, CS32_SW2, CS33_SW2, CS31_SW2},
+    {0, CS32_SW3, CS33_SW3, CS31_SW3},
+    {0, CS32_SW4, CS33_SW4, CS31_SW4},
+    {0, CS32_SW5, CS33_SW5, CS31_SW5},
+    {0, CS32_SW7, CS33_SW7, CS31_SW7},
 
-    {0, CS9_SW1, CS8_SW1, CS7_SW1},
-    {0, CS9_SW2, CS8_SW2, CS7_SW2},
-    {0, CS9_SW3, CS8_SW3, CS7_SW3},
-    {0, CS9_SW4, CS8_SW4, CS7_SW4},
-    {0, CS9_SW5, CS8_SW5, CS7_SW5},
-    {0, CS9_SW6, CS8_SW6, CS7_SW6},
-    {0, CS9_SW7, CS8_SW7, CS7_SW7},
-    {0, CS9_SW8, CS8_SW8, CS7_SW8},
-    {0, CS36_SW1, CS35_SW1, CS34_SW1},
-    {0, CS36_SW2, CS35_SW2, CS34_SW2},
-    {0, CS36_SW3, CS35_SW3, CS34_SW3},
-    {0, CS36_SW4, CS35_SW4, CS34_SW4},
-    {0, CS36_SW5, CS35_SW5, CS34_SW5},
-    {0, CS36_SW7, CS35_SW7, CS34_SW7},
+    {0, CS8_SW1, CS9_SW1, CS7_SW1},
+    {0, CS8_SW2, CS9_SW2, CS7_SW2},
+    {0, CS8_SW3, CS9_SW3, CS7_SW3},
+    {0, CS8_SW4, CS9_SW4, CS7_SW4},
+    {0, CS8_SW5, CS9_SW5, CS7_SW5},
+    {0, CS8_SW6, CS9_SW6, CS7_SW6},
+    {0, CS8_SW7, CS9_SW7, CS7_SW7},
+    {0, CS8_SW8, CS9_SW8, CS7_SW8},
+    {0, CS35_SW1, CS36_SW1, CS34_SW1},
+    {0, CS35_SW2, CS36_SW2, CS34_SW2},
+    {0, CS35_SW3, CS36_SW3, CS34_SW3},
+    {0, CS35_SW4, CS36_SW4, CS34_SW4},
+    {0, CS35_SW5, CS36_SW5, CS34_SW5},
+    {0, CS35_SW7, CS36_SW7, CS34_SW7},
 
-    {0, CS3_SW1, CS2_SW1, CS1_SW1},
-    {0, CS3_SW2, CS2_SW2, CS1_SW2},
-    {0, CS3_SW3, CS2_SW3, CS1_SW3},
-    {0, CS3_SW6, CS2_SW6, CS1_SW6},
-//    {0, CS39_SW1, CS38_SW1, CS37_SW1},
-    {0, CS39_SW2, CS38_SW2, CS37_SW2},
-    {0, CS39_SW3, CS38_SW3, CS37_SW3},
-    {0, CS39_SW4, CS38_SW4, CS37_SW4},
-    {0, CS39_SW5, CS38_SW5, CS37_SW5},
-    {0, CS39_SW7, CS38_SW7, CS37_SW7}
+    {0, CS2_SW1, CS3_SW1, CS1_SW1},
+    {0, CS2_SW2, CS3_SW2, CS1_SW2},
+    {0, CS2_SW3, CS3_SW3, CS1_SW3},
+    {0, CS2_SW6, CS3_SW6, CS1_SW6},
+//    {0, CS38_SW1, CS39_SW1, CS37_SW1},
+    {0, CS38_SW2, CS39_SW2, CS37_SW2},
+    {0, CS38_SW3, CS39_SW3, CS37_SW3},
+    {0, CS38_SW4, CS39_SW4, CS37_SW4},
+    {0, CS38_SW5, CS39_SW5, CS37_SW5},
+    {0, CS38_SW7, CS39_SW7, CS37_SW7}
 
 };
 led_config_t g_led_config = { {

From f08824f6eb169cb47599a56eb1162e168aac49c4 Mon Sep 17 00:00:00 2001
From: Alabastard-64 <96358682+Alabastard-64@users.noreply.github.com>
Date: Mon, 27 Dec 2021 03:18:35 -0700
Subject: [PATCH 094/867] Fix for SPI write timing in PMW3360 driver (#15519)

Timing does not match Pixart documentation for this sensor (may have been carried forward from adns9800).
Not aware of any issues coming from this currently.
It should only cause issues when writing to multiple registers in succession which currently only happens during initialization for the PMW3360.
This should prevent future issues with write operations if other features of the sensor are added.
---
 drivers/sensors/pmw3360.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index 78d9c3bc8b..cebf4f25d8 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -108,10 +108,10 @@ spi_status_t spi_write_adv(uint8_t reg_addr, uint8_t data) {
     status              = spi_write(data);
 
     // tSCLK-NCS for write operation
-    wait_us(20);
+    wait_us(35);
 
-    // tSWW/tSWR (=120us) minus tSCLK-NCS. Could be shortened, but is looks like a safe lower bound
-    wait_us(100);
+    // tSWW/tSWR (=180us) minus tSCLK-NCS. Could be shortened, but is looks like a safe lower bound
+    wait_us(145);
     spi_stop();
     return status;
 }

From 58600146a9d7290c6cc36e026d0d535826c495a6 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <fernando.delphi@gmail.com>
Date: Mon, 27 Dec 2021 07:19:34 -0300
Subject: [PATCH 095/867] Added BareDev keyboard (#15518)

* Added BareDev keyboard

* Updated readme.md to reflect handwired directory

* Simplified keycodes for basic GUI + [KEY]
---
 keyboards/handwired/baredev/rev1/config.h     |  25 +
 keyboards/handwired/baredev/rev1/info.json    | 706 ++++++++++++++++++
 .../baredev/rev1/keymaps/default/keymap.c     |  56 ++
 .../baredev/rev1/keymaps/default/readme.md    |   7 +
 .../baredev/rev1/keymaps/manoshu/keymap.c     |  99 +++
 .../baredev/rev1/keymaps/manoshu/readme.md    |  16 +
 keyboards/handwired/baredev/rev1/readme.md    |  29 +
 keyboards/handwired/baredev/rev1/rev1.c       |  17 +
 keyboards/handwired/baredev/rev1/rev1.h       |  19 +
 keyboards/handwired/baredev/rev1/rules.mk     |   0
 10 files changed, 974 insertions(+)
 create mode 100644 keyboards/handwired/baredev/rev1/config.h
 create mode 100644 keyboards/handwired/baredev/rev1/info.json
 create mode 100644 keyboards/handwired/baredev/rev1/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/baredev/rev1/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c
 create mode 100644 keyboards/handwired/baredev/rev1/keymaps/manoshu/readme.md
 create mode 100644 keyboards/handwired/baredev/rev1/readme.md
 create mode 100644 keyboards/handwired/baredev/rev1/rev1.c
 create mode 100644 keyboards/handwired/baredev/rev1/rev1.h
 create mode 100644 keyboards/handwired/baredev/rev1/rules.mk

diff --git a/keyboards/handwired/baredev/rev1/config.h b/keyboards/handwired/baredev/rev1/config.h
new file mode 100644
index 0000000000..f3d36fd08b
--- /dev/null
+++ b/keyboards/handwired/baredev/rev1/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2021 Fernando "ManoShu" Rodrigues
+
+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"
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
diff --git a/keyboards/handwired/baredev/rev1/info.json b/keyboards/handwired/baredev/rev1/info.json
new file mode 100644
index 0000000000..83b1c7cdd0
--- /dev/null
+++ b/keyboards/handwired/baredev/rev1/info.json
@@ -0,0 +1,706 @@
+{
+    "manufacturer": "Fernando \"ManoShu\" Rodrigues",
+    "keyboard_name": "BareDev (rev1)",
+    "url": "https://github.com/ManoShu/BareDev",
+    "maintainer": "ManoShu",
+    "debounce": 5,
+    "diode_direction": "COL2ROW",
+    "tapping": {
+        "term": 175
+    },
+    "matrix_pins": {
+        "unused": [
+            "F1",
+            "F4",
+            "F5",
+            "F6",
+            "F7"
+        ],
+        "cols": [
+            "B6",
+            "B7",
+            "C6",
+            "C7",
+            "D0",
+            "D1",
+            "D2",
+            "D3",
+            "D4",
+            "D5",
+            "D6",
+            "D7",
+            "E6",
+            "F0"
+        ],
+        "rows": [
+            "B0",
+            "B1",
+            "B2",
+            "B3",
+            "B4",
+            "B5"
+        ]
+    },
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x4126",
+        "device_ver": "0x0001",
+        "polling_interval": 1,
+        "shared_endpoint": {
+            "keyboard": true
+        }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "features": {
+        "audio": false,
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "midi": false,
+        "mousekey": true,
+        "nkro": true,
+        "rgblight": false,
+        "unicode": false,
+        "bluetooth": false,
+        "backlight": false,
+        "sleep_led": false
+    },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_abnt2"
+    },
+    "layouts": {
+        "LAYOUT_abnt2": {
+            "layout": [
+                {
+                    "matrix": [
+                        0,
+                        0
+                    ],
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        2
+                    ],
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        3
+                    ],
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        4
+                    ],
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        5
+                    ],
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        6
+                    ],
+                    "x": 6.5,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        7
+                    ],
+                    "x": 7.5,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        8
+                    ],
+                    "x": 8.5,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        9
+                    ],
+                    "x": 9.5,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        10
+                    ],
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        11
+                    ],
+                    "x": 12,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        12
+                    ],
+                    "x": 13,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        0,
+                        13
+                    ],
+                    "x": 14,
+                    "y": 0
+                },
+                {
+                    "matrix": [
+                        1,
+                        0
+                    ],
+                    "x": 0,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        1
+                    ],
+                    "x": 1,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        2
+                    ],
+                    "x": 2,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        3
+                    ],
+                    "x": 3,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        4
+                    ],
+                    "x": 4,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        5
+                    ],
+                    "x": 5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        6
+                    ],
+                    "x": 6,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        7
+                    ],
+                    "x": 7,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        8
+                    ],
+                    "x": 8,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        9
+                    ],
+                    "x": 9,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        10
+                    ],
+                    "x": 10,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        11
+                    ],
+                    "x": 11,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        12
+                    ],
+                    "x": 12,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        13
+                    ],
+                    "x": 13,
+                    "y": 1.25,
+                    "w": 2
+                },
+                {
+                    "matrix": [
+                        2,
+                        0
+                    ],
+                    "x": 0,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "matrix": [
+                        2,
+                        1
+                    ],
+                    "x": 1.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        2
+                    ],
+                    "x": 2.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        3
+                    ],
+                    "x": 3.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        4
+                    ],
+                    "x": 4.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        5
+                    ],
+                    "x": 5.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        6
+                    ],
+                    "x": 6.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        7
+                    ],
+                    "x": 7.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        8
+                    ],
+                    "x": 8.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        9
+                    ],
+                    "x": 9.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        10
+                    ],
+                    "x": 10.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        11
+                    ],
+                    "x": 11.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        12
+                    ],
+                    "x": 12.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        13
+                    ],
+                    "x": 13.75,
+                    "y": 2.25,
+                    "w": 1.25,
+                    "h": 2
+                },
+                {
+                    "matrix": [
+                        3,
+                        0
+                    ],
+                    "x": 0,
+                    "y": 3.25,
+                    "w": 1.75
+                },
+                {
+                    "matrix": [
+                        3,
+                        1
+                    ],
+                    "x": 1.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        2
+                    ],
+                    "x": 2.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        3
+                    ],
+                    "x": 3.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        4
+                    ],
+                    "x": 4.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        5
+                    ],
+                    "x": 5.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        6
+                    ],
+                    "x": 6.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        7
+                    ],
+                    "x": 7.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        8
+                    ],
+                    "x": 8.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        9
+                    ],
+                    "x": 9.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        10
+                    ],
+                    "x": 10.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        11
+                    ],
+                    "x": 11.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        12
+                    ],
+                    "x": 12.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        0
+                    ],
+                    "x": 0,
+                    "y": 4.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        1
+                    ],
+                    "x": 1.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        2
+                    ],
+                    "x": 2.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        3
+                    ],
+                    "x": 3.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        4
+                    ],
+                    "x": 4.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        5
+                    ],
+                    "x": 5.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        6
+                    ],
+                    "x": 6.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        7
+                    ],
+                    "x": 7.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        8
+                    ],
+                    "x": 8.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        9
+                    ],
+                    "x": 9.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        10
+                    ],
+                    "x": 10.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        11
+                    ],
+                    "x": 11.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        12
+                    ],
+                    "x": 12.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        13
+                    ],
+                    "x": 13.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        0
+                    ],
+                    "x": 0,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        1
+                    ],
+                    "x": 1.25,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        2
+                    ],
+                    "x": 2.5,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        6
+                    ],
+                    "x": 3.75,
+                    "y": 5.25,
+                    "w": 6.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        9
+                    ],
+                    "x": 10,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        10
+                    ],
+                    "x": 11.25,
+                    "y": 5.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        11
+                    ],
+                    "x": 12.25,
+                    "y": 5.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        12
+                    ],
+                    "x": 13.25,
+                    "y": 5.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        13
+                    ],
+                    "x": 14.25,
+                    "y": 5.25
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e679667ba0
--- /dev/null
+++ b/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c
@@ -0,0 +1,56 @@
+/* Copyright 2021 Fernando "ManoShu" Rodrigues
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+#include "keymap_br_abnt2.h"
+
+enum { 
+    LAYER_BASE, 
+    LAYER_FUNCTIONS 
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [LAYER_BASE] = LAYOUT(
+        /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+              KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,              KC_F9,    KC_F10,  KC_F11,   KC_F12,
+        /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
+             BR_QUOT,   BR_1,     BR_2,     BR_3,      BR_4,    BR_5,     BR_6,      BR_7,    BR_8,     BR_9,     BR_0,    BR_MINS,  BR_EQL,        KC_BSPC,
+        /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
+                KC_TAB,      BR_Q,     BR_W,     BR_E,     BR_R,     BR_T,     BR_Y,     BR_U,     BR_I,     BR_O,     BR_P,    BR_ACUT,  BR_LBRC,      KC_ENT,
+        /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ┤ */
+                  KC_CAPS,      BR_A,     BR_S,      BR_D,    BR_F,     BR_G,     BR_H,     BR_J,     BR_K,     BR_L,    BR_CCED,  BR_TILD,  BR_RBRC,
+        /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
+              KC_LSFT,   BR_BSLS,   BR_Z,     BR_X,     BR_C,     BR_V,     BR_B,     BR_N,     BR_M,    BR_COMM,  BR_DOT,   BR_SCLN,      BR_SLSH,       KC_UP,
+        /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
+              KC_LCTL,   KC_LGUI,     KC_LALT,                                KC_SPC,                            KC_APP,    KC_DEL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+        /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+    ),
+    [LAYER_FUNCTIONS] = LAYOUT(
+        /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+              RESET,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  KC_PSCR,  KC_SLCK,  KC_PAUS, 
+        /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
+             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
+        /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
+               _______,     KC_MPLY,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,
+        /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ┤ */
+                 _______,      KC_MPRV,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    
+        /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
+              _______,   _______,  KC_VOLU,  KC_VOLD,  KC_CALC,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,      KC_PGUP, 
+        /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
+              _______,    _______,    _______,                                _______,                           _______,   KC_INS,  KC_HOME,  KC_PGDN,  KC_END
+        /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+    )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/baredev/rev1/keymaps/default/readme.md b/keyboards/handwired/baredev/rev1/keymaps/default/readme.md
new file mode 100644
index 0000000000..6e8c07ad83
--- /dev/null
+++ b/keyboards/handwired/baredev/rev1/keymaps/default/readme.md
@@ -0,0 +1,7 @@
+![BareDev Layout Image](https://i.imgur.com/uP8Jzvi.png)
+
+# Default BareDev layout
+
+Has all the functions of a ABNT TKL keyboard, sans right shift.
+
+Basic media functions also included.
\ No newline at end of file
diff --git a/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c
new file mode 100644
index 0000000000..4bbf4c2cbc
--- /dev/null
+++ b/keyboards/handwired/baredev/rev1/keymaps/manoshu/keymap.c
@@ -0,0 +1,99 @@
+/* Copyright 2021 Fernando "ManoShu" Rodrigues
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+#include "keymap_br_abnt2.h"
+#include "sendstring_br_abnt2.h"
+
+enum { 
+    LAYER_BASE, 
+    LAYER_FUNCTIONS 
+};
+
+#define L_FUNCT MO(LAYER_FUNCTIONS)
+#define W_CHOLD LGUI_T(KC_CAPS)
+
+//Combination keycodes
+#define KC_PSBR C(KC_PAUSE)    // Ctrl+Pause/Break
+#define KC_SNIP SGUI(BR_S)     // Screen Snip (GUI + Shift + S)
+#define KC_WRUN G(BR_R)        // Run (GUI + R)
+#define KC_WLCK G(BR_L)        // Lock (GUI + L)
+#define KC_WDSK G(BR_D)        // Desktop (GUI + D)
+#define KC_WEXP G(BR_E)        // Explorer (GUI + E)
+#define KC_WPSE G(KC_PAUSE)    // System Properties (GUI + Pause)
+#define KC_WMGP G(BR_EQL)      // Magnify (+)
+#define KC_WMGM G(BR_MINS)     // Magnify (-)
+
+enum custom_keycodes {
+    KC_WPRN = SAFE_RANGE,  // Project (P)
+    KC_WSPC                // Input Select (Space)
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    if (get_highest_layer(state) == LAYER_BASE) {
+        unregister_mods(MOD_MASK_GUI);
+    }
+    return state;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if(keycode == KC_WPRN || keycode == KC_WSPC) {
+        if (record->event.pressed) {
+
+            register_code(KC_LGUI);
+
+            if(keycode == KC_WPRN) {
+                tap_code(KC_P);
+            } else if (keycode == KC_WSPC) {
+                tap_code(KC_SPACE);
+            }
+        }
+    }
+    return true;
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [LAYER_BASE] = LAYOUT(
+        /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+              KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,              KC_F9,    KC_F10,  KC_F11,   KC_F12,
+        /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
+             BR_QUOT,   BR_1,     BR_2,     BR_3,      BR_4,    BR_5,     BR_6,      BR_7,    BR_8,     BR_9,     BR_0,    BR_MINS,  BR_EQL,        KC_BSPC,
+        /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
+                KC_TAB,      BR_Q,     BR_W,     BR_E,     BR_R,     BR_T,     BR_Y,     BR_U,     BR_I,     BR_O,     BR_P,    BR_ACUT,  BR_LBRC,      KC_ENT,
+        /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ┤ */
+                  W_CHOLD,      BR_A,     BR_S,      BR_D,    BR_F,     BR_G,     BR_H,     BR_J,     BR_K,     BR_L,    BR_CCED,  BR_TILD,  BR_RBRC,
+        /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
+              KC_LSFT,   BR_BSLS,   BR_Z,     BR_X,     BR_C,     BR_V,     BR_B,     BR_N,     BR_M,    BR_COMM,  BR_DOT,   BR_SCLN,      BR_SLSH,       KC_UP,
+        /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
+              KC_LCTL,   L_FUNCT,    KC_LALT,                                 KC_SPC,                            KC_APP,    KC_DEL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+        /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+    ),
+    [LAYER_FUNCTIONS] = LAYOUT(
+        /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+              RESET,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  KC_PSBR,  KC_SNIP, 
+        /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
+             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_WMGM,  KC_WMGP,       _______,
+        /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
+               _______,     KC_MPLY,  KC_MUTE,  KC_WEXP,  KC_WRUN,  _______,  _______,  _______,  _______,  _______,  KC_WPRN,  _______,  _______,      _______,
+        /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ┤ */
+                 _______,      KC_MPRV,  KC_MNXT,  KC_WDSK,  _______,  _______,  _______,  _______,  _______,  KC_WLCK,  _______,  _______,  _______,    
+        /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
+              _______,   _______,  KC_VOLU,  KC_VOLD,  KC_CALC,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,      KC_PGUP, 
+        /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
+              _______,    _______,    _______,                                KC_WSPC,                           _______,   KC_INS,  KC_HOME,  KC_PGDN,  KC_END
+        /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+    )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/baredev/rev1/keymaps/manoshu/readme.md b/keyboards/handwired/baredev/rev1/keymaps/manoshu/readme.md
new file mode 100644
index 0000000000..1852a0fbc2
--- /dev/null
+++ b/keyboards/handwired/baredev/rev1/keymaps/manoshu/readme.md
@@ -0,0 +1,16 @@
+![BareDev Layout Image](https://i.imgur.com/FXye4Hn.png)
+
+# ManoShu's custom layout
+
+Has all the functions of a ABNT TKL keyboard, sans right shift.
+
+Basic media functions also included.
+
+Trying to emulate where notebooks/smaller OEM keyboard put the function key, for this reason the GUI key was moved and it can be used by holding the Caps Lock key.
+
+To not use the new GUI position very often, commonly used GUI + [X] commands are sent using `SEND_STRING()`, `(un)register_code()` and `tap_code()`.
+
+## Why you didn't used `LT(FUNCTIONS, KC_LGUI)` on the GUI/FN key?
+Because I don't want rely on the tapping term to determine I will send either KC_HOME or snap the active window to the left.
+
+If there is a better way to solve this, please let me know.
\ No newline at end of file
diff --git a/keyboards/handwired/baredev/rev1/readme.md b/keyboards/handwired/baredev/rev1/readme.md
new file mode 100644
index 0000000000..3f852f2bc6
--- /dev/null
+++ b/keyboards/handwired/baredev/rev1/readme.md
@@ -0,0 +1,29 @@
+# BareDev (rev1)
+
+![PCB](https://i.imgur.com/byquO5u.png)
+![Prototype Build](https://i.imgur.com/fkizunN.png)
+
+An open-source, ABNT2-based 70% keyboard, focusing in a smaller footprint while retaining all the functions found on a TKL (Del and arrow keys doubling as the navigational cluster)
+
+* Keyboard Maintainer: [Fernando "ManoShu" Rodrigues](https://github.com/ManoShu)
+* Hardware Supported: BareDev rev1 PCB
+* Hardware Availability: Files available on [GitHub](https://github.com/ManoShu/BareDev)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/baredev/rev1:default
+
+Flashing example for this keyboard:
+
+    make handwired/baredev/rev1:default:flash
+
+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).
+
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
\ No newline at end of file
diff --git a/keyboards/handwired/baredev/rev1/rev1.c b/keyboards/handwired/baredev/rev1/rev1.c
new file mode 100644
index 0000000000..809138c9b2
--- /dev/null
+++ b/keyboards/handwired/baredev/rev1/rev1.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Fernando "ManoShu" Rodrigues
+ *
+ * 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 "rev1.h"
diff --git a/keyboards/handwired/baredev/rev1/rev1.h b/keyboards/handwired/baredev/rev1/rev1.h
new file mode 100644
index 0000000000..62a4829060
--- /dev/null
+++ b/keyboards/handwired/baredev/rev1/rev1.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 Fernando "ManoShu" Rodrigues
+ *
+ * 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"
\ No newline at end of file
diff --git a/keyboards/handwired/baredev/rev1/rules.mk b/keyboards/handwired/baredev/rev1/rules.mk
new file mode 100644
index 0000000000..e69de29bb2

From 27fd6b7462998dd00c7ab1bf8a4ff4440cb12ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Vallejo?= <jesus.vallejo.collados@gmail.com>
Date: Mon, 27 Dec 2021 11:20:23 +0100
Subject: [PATCH 096/867] Keebwerk devices keymaps (#15504)

* Keymap with status leds animations

* Midi2Vol keymap

* Coding conventions

* Coding Conventions

* rename directory

* Midi2Vol keymap

* Update to follow coding conventions

* Rename keyboards/keebwerk/nano_slider/keymaps/Midi2Vol/keymap.c to keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c

* Rename keyboards/keebwerk/nano_slider/keymaps/Midi2Vol/readme.md to keyboards/keebwerk/nano_slider/keymaps/midi2vol/readme.md

* Update keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c

Wild slash typo.

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c

Changed define for an enum.

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../mega/ansi/keymaps/jesusvallejo/keymap.c   | 176 ++++++++++++++++++
 .../mega/ansi/keymaps/jesusvallejo/readme.md  |   9 +
 .../mega/ansi/keymaps/jesusvallejo/rules.mk   |   1 +
 .../nano_slider/keymaps/midi2vol/keymap.c     | 154 +++++++++++++++
 .../nano_slider/keymaps/midi2vol/readme.md    |   2 +
 5 files changed, 342 insertions(+)
 create mode 100644 keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
 create mode 100644 keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/readme.md
 create mode 100644 keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/rules.mk
 create mode 100644 keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
 create mode 100644 keyboards/keebwerk/nano_slider/keymaps/midi2vol/readme.md

diff --git a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
new file mode 100644
index 0000000000..54e6ee4ac2
--- /dev/null
+++ b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/keymap.c
@@ -0,0 +1,176 @@
+/* Copyright 2020 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "drivers/issi/is31fl3733.h"
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_65_ansi( /* Base */
+    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+    KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+    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_PGDN,
+    KC_LSFT, KC_Z,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+    KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_65_ansi( /* FN */
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_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, RESET,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  BR_DEC,  BR_INC,  ES_DEC,  ES_INC,  KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_65_ansi( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_65_ansi( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
+
+
+static uint16_t ledTimer;
+
+uint8_t R = 0;  /* First led*/
+uint8_t G = 0;  /* Second led*/
+uint8_t B = 0;  /* Third led*/
+
+/* Boot animation parameters */
+
+uint8_t bootFirst=3;    /* Number of increment slides. */
+uint8_t bootSec=3;      /* Number of full blink. */
+
+/* Breathing animation parameters */
+
+const uint16_t travelTime = 1000;   /* Time the leds take to go from off to on or on to off. */
+const uint16_t fadeStep = 5;        /* Steps for the fade in and out, 0-255 by steps of 10. */
+const uint16_t fadeTime = 20;       /* Time between each fade step. */
+const uint8_t maxBrightness=255;    /* keep them multipliers of fade Step between 0 and 255. */
+const uint8_t minBrightness=0;
+
+uint16_t previousTime = 0;
+uint16_t time = 0;
+
+bool bootAnimation(void){
+    if (bootFirst>0 || bootSec>0){    
+        if(bootFirst!=0){
+            if (timer_elapsed(ledTimer) > 150){
+                G = 255;
+                R = 0;
+                B = 0;
+                IS31FL3733_set_color( 6+64-1, R, G, B );
+            }
+            if (timer_elapsed(ledTimer) > 300){
+                G = 255;
+                R = 255;
+                B = 0;
+                IS31FL3733_set_color( 6+64-1, R, G, B );
+            }
+            if (timer_elapsed(ledTimer) > 400){
+                G = 255;
+                R = 255;
+                B = 255;
+                IS31FL3733_set_color( 6+64-1, R, G, B );
+            }
+            if (timer_elapsed(ledTimer) > 500){
+                G = 0;
+                R = 0;
+                B = 0;
+                IS31FL3733_set_color( 6+64-1, R, G, B );
+                ledTimer = timer_read();
+                bootFirst--;
+            }
+        }
+        if (bootFirst==0 && bootSec!=0){
+            if (timer_elapsed(ledTimer) > 200) {
+                G = 255;
+                R = 255;
+                B = 255;
+                IS31FL3733_set_color( 6+64-1, R, G, B );
+            }
+            if (timer_elapsed(ledTimer) > 400){
+                G = 0;
+                R = 0;
+                B = 0;
+                IS31FL3733_set_color( 6+64-1, R, G, B );
+                ledTimer = timer_read();
+                bootSec--;
+            }
+        }
+        return false;
+    }
+    return true;
+}
+
+
+void breathing(void) {
+    if(timer_elapsed(ledTimer)<travelTime){
+        time = timer_elapsed(ledTimer);
+        if((time - previousTime) > fadeTime && R<maxBrightness){
+            G+=fadeStep;
+            R+=fadeStep;
+            B+=fadeStep;
+            IS31FL3733_set_color( 6+64-1, R, G, B );
+            previousTime = time;
+        }
+    }
+    else if(timer_elapsed(ledTimer)<(travelTime *  2)){
+        time = timer_elapsed(ledTimer);
+        if((time - previousTime) > fadeTime && R>minBrightness){
+            G-=fadeStep;
+            R-=fadeStep;
+            B-=fadeStep;
+            IS31FL3733_set_color( 6+64-1, R, G, B );
+            previousTime = time;
+        } 
+    }
+    else {
+        R=0;
+        G=0;
+        B=0;
+        IS31FL3733_set_color( 6+64-1, R, G, B );
+        previousTime = 0;
+        time = 0;
+        ledTimer=timer_read();
+    }
+}
+
+/* this avoids turning off the led each matrix_scan_user() call */
+bool capsState; 
+bool prevCapsState;
+
+void matrix_scan_user(void){
+    if(bootAnimation()){
+        capsState = host_keyboard_led_state().caps_lock; 
+        if (capsState) {
+            breathing();
+            prevCapsState = capsState; 
+        } 
+        else if(!capsState && capsState != prevCapsState){ 
+            G = 0;
+            R = 0;
+            B = 0;
+            IS31FL3733_set_color( 6+64-1, R, G, B );
+            prevCapsState = capsState; 
+        }
+    }
+}
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/readme.md b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/readme.md
new file mode 100644
index 0000000000..5910222a46
--- /dev/null
+++ b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/readme.md
@@ -0,0 +1,9 @@
+# The jesusvallejo keymap for ANSI Keebwerk Mega. VIA support enabled.
+
+![Layer 0](https://i.imgur.com/RcuLofrl.png)
+
+![Layer 1](https://i.imgur.com/NJOORcdl.png)
+
+- Default layer is normal ANSI 65%.
+- Leds slide and blink bootup animation.
+- Leds fade Caps Lock animation.
diff --git a/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/rules.mk b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keebwerk/mega/ansi/keymaps/jesusvallejo/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
new file mode 100644
index 0000000000..0623f7556c
--- /dev/null
+++ b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/keymap.c
@@ -0,0 +1,154 @@
+/* Copyright 2020 Duckle, 2021 Jesús Vallejo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include QMK_KEYBOARD_H
+#include "analog.h"
+#include "qmk_midi.h"
+
+/*
+This keymap works with midi2vol: linux version  https://github.com/jesusvallejo/Midi2Vol-Linux  
+and windows version https://github.com/jesusvallejo/Midi2Vol
+
+Enables the user to change the volume on the host computer if running midi2vol software.
+
+Example to extend usability is provided check VLC in: enum custom_keycodes {} and bool process_record_user(uint16_t keycode, keyrecord_t *record) {}
+Remember to give allways the new volume control a hex value not used by other volume control, 
+and add it to the midi2vol software.
+Check respective midi2vol readme on how to do so.In linux change config.json,in windows you can use configuration option.
+
+A compiled version of this keymap is provided in here: https://github.com/jesusvallejo/nanokeymaps/
+
+*/
+
+uint8_t midi2vol = 0x3E;
+
+/* Defines names for use in layer keycodes and the keymap */
+
+enum custom_layers {
+    _MEDIA,    /* Controls Pause, Mute , Forward ... */
+    _NAV,      /* Nav arrows, Enter, Space*/
+    _VOLUME    /* Changes midi2vol int to interface with midi2vol program: Chrome Volume, General Volume */
+    _DISCORD,  /* FXX unsused keys to interface with Discord: Mute , Silence */
+    _LIGHTS,   /* Edits underglow and retroilumination */
+    _EDIT,     /* Cut, Copy ,Paste */
+    _RESET,    /* Layer to set nano in bootloader mode */
+    _TOOGLE,   /* Momentary layer to switch between layers */
+};
+
+
+
+/* Defines the keycodes used by our macros in process_record_user */
+enum custom_keycodes { /* In order to add more volume controls, add here a custom keycode, ex: VLC */
+    DEFAULT= SAFE_RANGE,SPOTIFY,DISCORD,CHROME/*,VLC*/
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_MEDIA] = LAYOUT(
+        MO(_TOOGLE),
+        KC_MPLY, KC_MNXT,  KC_COPY,
+        KC_MUTE,  KC_MPRV, KC_PASTE, KC_ENTER
+    ),
+    [_NAV] = LAYOUT(
+        MO(_TOOGLE),
+        KC_SPC, KC_UP, KC_BSPACE,
+        KC_LEFT, KC_DOWN, KC_RIGHT, KC_ENTER      
+    ),
+    [_VOLUME] = LAYOUT(
+        MO(_TOOGLE),
+        SPOTIFY, DISCORD, CHROME,
+        KC_NO, KC_NO, KC_NO, DEFAULT
+    ),
+    [_DISCORD] = LAYOUT(
+        MO(_TOOGLE),
+        KC_F18, KC_F19, KC_F20,
+        KC_F21, KC_F22, KC_F23, KC_F24
+    ),
+    [_LIGHTS] = LAYOUT(
+        MO(_TOOGLE),
+        RGB_TOG, RGB_MOD, RGB_VAI,
+        RGB_SAI, BL_BRTG, BL_STEP, KC_LSFT
+    ),
+    [_EDIT] = LAYOUT(
+        MO(_TOOGLE),
+        KC_MENU, KC_CUT, KC_COPY,
+        KC_FIND, KC_UNDO, KC_PASTE, KC_MPLY
+    ),
+    [_RESET] = LAYOUT(
+        MO(_TOOGLE),
+        KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, RESET 
+    ),
+    [_TOOGLE] = LAYOUT(
+        MO(_TOOGLE),
+        TO(_MEDIA),    TO(_NAV),    TO(_VOLUME),
+        TO(_DISCORD),    TO(_LIGHTS),    TO(_EDIT),    TO(_RESET)
+    )
+};
+/* In order to add more volume controls, add here code to detect custom keycode, ex: VLC */
+bool process_record_user(uint16_t keycode, keyrecord_t *record) { 
+    switch (keycode) {
+        case DEFAULT:
+            if (record->event.pressed) {
+                /* when keycode DEFAULT is pressed */
+                midi2vol= 0x3E;
+            } else {
+                /* when keycode DEFAULT is released */
+            }
+            break;
+        case SPOTIFY:
+            if (record->event.pressed) {                
+                midi2vol= 0x3F;
+            }
+            break;
+        case DISCORD:
+            if (record->event.pressed) {
+                
+                midi2vol= 0x40;
+            } 
+            break;
+        case CHROME:
+            if (record->event.pressed) {
+                
+                midi2vol= 0x41;
+            }
+            break;
+        /*
+        case VLC:
+            if (record->event.pressed) {
+                midi2vol= 0x42;
+            }
+            break;
+        */
+    }
+    return true;
+}
+
+uint8_t divisor = 0;
+
+
+void slider(void) {
+    if (divisor++) { /* only run the slider function 1/256 times it's called */
+        return;
+    }
+    midi_send_cc(&midi_device, 2, midi2vol, 0x7F - (analogReadPin(SLIDER_PIN) >> 3));
+}
+
+void matrix_scan_user(void) {
+    slider();
+}
diff --git a/keyboards/keebwerk/nano_slider/keymaps/midi2vol/readme.md b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/readme.md
new file mode 100644
index 0000000000..869baef07f
--- /dev/null
+++ b/keyboards/keebwerk/nano_slider/keymaps/midi2vol/readme.md
@@ -0,0 +1,2 @@
+# The Midi2Vol keymap for nano_slider
+This keymap has the code for the nano_slider to work with [Midi2Vol](https://github.com/jesusvallejo/Midi2Vol).

From be2265d0d173ac347f0ee9ed809c2a689bf835a2 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Mon, 27 Dec 2021 02:20:52 -0800
Subject: [PATCH 097/867] Format code according to conventions (#15593)

---
 platforms/arm_atsam/bootloaders/md_boot.c  | 22 ++++++++++++++--------
 platforms/avr/bootloaders/bootloadhid.c    |  3 +--
 platforms/avr/bootloaders/caterina.c       |  6 +++---
 platforms/avr/bootloaders/dfu.c            |  3 +--
 platforms/avr/bootloaders/halfkay.c        |  3 +--
 platforms/avr/bootloaders/none.c           |  3 +--
 platforms/avr/bootloaders/usbasploader.c   |  3 +--
 platforms/chibios/bootloaders/gd32v_dfu.c  |  5 ++---
 platforms/chibios/bootloaders/halfkay.c    |  3 +--
 platforms/chibios/bootloaders/kiibohd.c    |  3 +--
 platforms/chibios/bootloaders/none.c       |  3 +--
 platforms/chibios/bootloaders/stm32_dfu.c  | 14 ++++++--------
 platforms/chibios/bootloaders/stm32duino.c |  5 +----
 platforms/chibios/bootloaders/tinyuf2.c    |  5 ++---
 platforms/test/bootloaders/none.c          |  2 +-
 15 files changed, 37 insertions(+), 46 deletions(-)

diff --git a/platforms/arm_atsam/bootloaders/md_boot.c b/platforms/arm_atsam/bootloaders/md_boot.c
index fe07389487..e7508ffe51 100644
--- a/platforms/arm_atsam/bootloaders/md_boot.c
+++ b/platforms/arm_atsam/bootloaders/md_boot.c
@@ -22,8 +22,8 @@
 // WARNING: These are only for CTRL bootloader release "v2.18Jun 22 2018 17:28:08" for bootloader_jump support
 extern uint32_t _eram;
 
-#define BOOTLOADER_MAGIC 0x3B9ACA00
-#define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4)
+#    define BOOTLOADER_MAGIC 0x3B9ACA00
+#    define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4)
 
 // CTRL keyboards released with bootloader version below must use RAM method. Otherwise use WDT method.
 void bootloader_jump(void) {
@@ -40,7 +40,8 @@ void bootloader_jump(void) {
         *MAGIC_ADDR = BOOTLOADER_MAGIC;  // Set magic number into RAM
         NVIC_SystemReset();              // Perform system reset
 
-        while (1);  // Won't get here
+        while (1)
+            ;  // Won't get here
     }
 }
 
@@ -50,17 +51,22 @@ void bootloader_jump(void) {
 void bootloader_jump(void) {
     WDT->CTRLA.bit.ENABLE = 0;
 
-    while (WDT->SYNCBUSY.bit.ENABLE);
-    while (WDT->CTRLA.bit.ENABLE);
+    while (WDT->SYNCBUSY.bit.ENABLE)
+        ;
+    while (WDT->CTRLA.bit.ENABLE)
+        ;
 
     WDT->CONFIG.bit.WINDOW   = 0;
     WDT->CONFIG.bit.PER      = 0;
     WDT->EWCTRL.bit.EWOFFSET = 0;
     WDT->CTRLA.bit.ENABLE    = 1;
 
-    while (WDT->SYNCBUSY.bit.ENABLE);
-    while (!WDT->CTRLA.bit.ENABLE);
+    while (WDT->SYNCBUSY.bit.ENABLE)
+        ;
+    while (!WDT->CTRLA.bit.ENABLE)
+        ;
 
-    while (1);  // Wait on timeout
+    while (1)
+        ;  // Wait on timeout
 }
 #endif
diff --git a/platforms/avr/bootloaders/bootloadhid.c b/platforms/avr/bootloaders/bootloadhid.c
index 8d18114613..ae58760d7d 100644
--- a/platforms/avr/bootloaders/bootloadhid.c
+++ b/platforms/avr/bootloaders/bootloadhid.c
@@ -19,8 +19,7 @@
 #include <avr/eeprom.h>
 #include <avr/wdt.h>
 
-__attribute__((weak))
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     // force bootloadHID to stay in bootloader mode, so that it waits
     // for a new firmware to be flashed
     // NOTE: this byte is part of QMK's "magic number" - changing it causes the EEPROM to be re-initialized
diff --git a/platforms/avr/bootloaders/caterina.c b/platforms/avr/bootloaders/caterina.c
index 1b43ed4e44..82a16a3765 100644
--- a/platforms/avr/bootloaders/caterina.c
+++ b/platforms/avr/bootloaders/caterina.c
@@ -18,8 +18,7 @@
 
 #include <avr/wdt.h>
 
-__attribute__((weak))
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     // this block may be optional
     // TODO: figure it out
 
@@ -35,5 +34,6 @@ void bootloader_jump(void) {
     wdt_enable(WDTO_60MS);
 
     // wait for watchdog timer to trigger
-    while (1) { }
+    while (1) {
+    }
 }
diff --git a/platforms/avr/bootloaders/dfu.c b/platforms/avr/bootloaders/dfu.c
index bdf5908934..cb42821a93 100644
--- a/platforms/avr/bootloaders/dfu.c
+++ b/platforms/avr/bootloaders/dfu.c
@@ -28,8 +28,7 @@
 #define BOOTLOADER_RESET_KEY 0xB007B007
 uint32_t reset_key __attribute__((section(".noinit,\"aw\",@nobits;")));
 
-__attribute__((weak))
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     UDCON  = 1;
     USBCON = (1 << FRZCLK);  // disable USB
     UCSR1B = 0;
diff --git a/platforms/avr/bootloaders/halfkay.c b/platforms/avr/bootloaders/halfkay.c
index abef86980b..6ce2e19114 100644
--- a/platforms/avr/bootloaders/halfkay.c
+++ b/platforms/avr/bootloaders/halfkay.c
@@ -19,8 +19,7 @@
 #include <avr/interrupt.h>
 #include <util/delay.h>
 
-__attribute__((weak))
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     // http://www.pjrc.com/teensy/jump_to_bootloader.html
 
     cli();
diff --git a/platforms/avr/bootloaders/none.c b/platforms/avr/bootloaders/none.c
index 8af151c04d..624fbe242a 100644
--- a/platforms/avr/bootloaders/none.c
+++ b/platforms/avr/bootloaders/none.c
@@ -16,5 +16,4 @@
 
 #include "bootloader.h"
 
-__attribute__((weak))
-void bootloader_jump(void) { }
+__attribute__((weak)) void bootloader_jump(void) {}
diff --git a/platforms/avr/bootloaders/usbasploader.c b/platforms/avr/bootloaders/usbasploader.c
index b3e9b2d72d..008bd16069 100644
--- a/platforms/avr/bootloaders/usbasploader.c
+++ b/platforms/avr/bootloaders/usbasploader.c
@@ -26,8 +26,7 @@
 #    endif
 #endif
 
-__attribute__((weak))
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     // Taken with permission of Stephan Baerwolf from https://github.com/tinyusbboard/API/blob/master/apipage.c
 
     wdt_enable(WDTO_15MS);
diff --git a/platforms/chibios/bootloaders/gd32v_dfu.c b/platforms/chibios/bootloaders/gd32v_dfu.c
index 1ab0882084..7a979638e3 100644
--- a/platforms/chibios/bootloaders/gd32v_dfu.c
+++ b/platforms/chibios/bootloaders/gd32v_dfu.c
@@ -24,8 +24,7 @@
 __IO uint32_t *DBGMCU_KEY = (uint32_t *)DBGMCU_BASE + 0x0CU;
 __IO uint32_t *DBGMCU_CMD = (uint32_t *)DBGMCU_BASE + 0x08U;
 
-__attribute__((weak))
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     /* The MTIMER unit of the GD32VF103 doesn't have the MSFRST
      * register to generate a software reset request.
      * BUT instead two undocumented registers in the debug peripheral
@@ -37,4 +36,4 @@ void bootloader_jump(void) {
 }
 
 /* Jumping to bootloader is not possible from user code. */
-void enter_bootloader_mode_if_requested(void) { }
+void enter_bootloader_mode_if_requested(void) {}
diff --git a/platforms/chibios/bootloaders/halfkay.c b/platforms/chibios/bootloaders/halfkay.c
index fb9b73dfb3..168c2abc23 100644
--- a/platforms/chibios/bootloaders/halfkay.c
+++ b/platforms/chibios/bootloaders/halfkay.c
@@ -19,8 +19,7 @@
 #include <ch.h>
 #include "wait.h"
 
-__attribute__((weak))
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     wait_ms(100);
     __BKPT(0);
 }
diff --git a/platforms/chibios/bootloaders/kiibohd.c b/platforms/chibios/bootloaders/kiibohd.c
index f4bb18f058..911e807092 100644
--- a/platforms/chibios/bootloaders/kiibohd.c
+++ b/platforms/chibios/bootloaders/kiibohd.c
@@ -23,8 +23,7 @@
 
 const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
 
-__attribute__((weak))
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     void *volatile vbat = (void *)VBAT;
     __builtin_memcpy(vbat, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic));
 
diff --git a/platforms/chibios/bootloaders/none.c b/platforms/chibios/bootloaders/none.c
index 8af151c04d..624fbe242a 100644
--- a/platforms/chibios/bootloaders/none.c
+++ b/platforms/chibios/bootloaders/none.c
@@ -16,5 +16,4 @@
 
 #include "bootloader.h"
 
-__attribute__((weak))
-void bootloader_jump(void) { }
+__attribute__((weak)) void bootloader_jump(void) {}
diff --git a/platforms/chibios/bootloaders/stm32_dfu.c b/platforms/chibios/bootloaders/stm32_dfu.c
index f4bd8554bf..0a113570f7 100644
--- a/platforms/chibios/bootloaders/stm32_dfu.c
+++ b/platforms/chibios/bootloaders/stm32_dfu.c
@@ -41,8 +41,7 @@ extern uint32_t __ram0_end__;
 #        define STM32_BOOTLOADER_DUAL_BANK_DELAY 100000
 #    endif
 
-__attribute__((weak))
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     // For STM32 MCUs with dual-bank flash, and we're incapable of jumping to the bootloader. The first valid flash
     // bank is executed unconditionally after a reset, so it doesn't enter DFU unless BOOT0 is high. Instead, we do
     // it with hardware...in this case, we pull a GPIO high/low depending on the configuration, connects 3.3V to
@@ -63,17 +62,16 @@ void bootloader_jump(void) {
 }
 
 // not needed at all, but if anybody attempts to invoke it....
-void enter_bootloader_mode_if_requested(void) { }
+void enter_bootloader_mode_if_requested(void) {}
 
 #else
 
 /* This code should be checked whether it runs correctly on platforms */
-#define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
-#define BOOTLOADER_MAGIC 0xDEADBEEF
-#define MAGIC_ADDR (unsigned long *)(SYMVAL(__ram0_end__) - 4)
+#    define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
+#    define BOOTLOADER_MAGIC 0xDEADBEEF
+#    define MAGIC_ADDR (unsigned long *)(SYMVAL(__ram0_end__) - 4)
 
-__attribute__((weak))
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     *MAGIC_ADDR = BOOTLOADER_MAGIC;  // set magic flag => reset handler will jump into boot loader
     NVIC_SystemReset();
 }
diff --git a/platforms/chibios/bootloaders/stm32duino.c b/platforms/chibios/bootloaders/stm32duino.c
index 6ff9e28b4d..dd1d551fa9 100644
--- a/platforms/chibios/bootloaders/stm32duino.c
+++ b/platforms/chibios/bootloaders/stm32duino.c
@@ -18,7 +18,4 @@
 
 #include <ch.h>
 
-__attribute__((weak))
-void bootloader_jump(void) {
-    NVIC_SystemReset();
-}
+__attribute__((weak)) void bootloader_jump(void) { NVIC_SystemReset(); }
diff --git a/platforms/chibios/bootloaders/tinyuf2.c b/platforms/chibios/bootloaders/tinyuf2.c
index ce82fa0c49..9ffca5dec8 100644
--- a/platforms/chibios/bootloaders/tinyuf2.c
+++ b/platforms/chibios/bootloaders/tinyuf2.c
@@ -25,11 +25,10 @@
 extern uint32_t _board_dfu_dbl_tap[];
 #define DBL_TAP_REG _board_dfu_dbl_tap[0]
 
-__attribute__((weak))
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     DBL_TAP_REG = DBL_TAP_MAGIC;
     NVIC_SystemReset();
 }
 
 /* not needed, no two-stage reset */
-void enter_bootloader_mode_if_requested(void) { }
+void enter_bootloader_mode_if_requested(void) {}
diff --git a/platforms/test/bootloaders/none.c b/platforms/test/bootloaders/none.c
index 2920c68f18..5155d9ff04 100644
--- a/platforms/test/bootloaders/none.c
+++ b/platforms/test/bootloaders/none.c
@@ -16,4 +16,4 @@
 
 #include "bootloader.h"
 
-void bootloader_jump(void) { }
+void bootloader_jump(void) {}

From 6ec9cd511df29a0bf788818e3cecf636d836af3c Mon Sep 17 00:00:00 2001
From: Victor Savu Gabriel <victorsavu3@gmail.com>
Date: Mon, 27 Dec 2021 11:22:27 +0100
Subject: [PATCH 098/867] Addd victorsavu3's Keychron Q1 keymap (ISO) (#15517)

Co-authored-by: Savu Victor-Gabriel <dev@victorsavu.com>
---
 .../q1/rev_0102/keymaps/victorsavu3/config.h  |  69 ++++++++
 .../q1/rev_0102/keymaps/victorsavu3/keymap.c  | 152 ++++++++++++++++++
 .../q1/rev_0102/keymaps/victorsavu3/readme.md |   4 +
 .../q1/rev_0102/keymaps/victorsavu3/rules.mk  |   3 +
 4 files changed, 228 insertions(+)
 create mode 100644 keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/config.h
 create mode 100644 keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/keymap.c
 create mode 100644 keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/readme.md
 create mode 100644 keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/rules.mk

diff --git a/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/config.h b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/config.h
new file mode 100644
index 0000000000..8120a9352a
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/config.h
@@ -0,0 +1,69 @@
+/* Copyright 2021 @ Victor-Gabriel Savu
+ *
+ * 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
+
+// disable all default effects
+#undef ENABLE_RGB_MATRIX_BREATHING
+#undef ENABLE_RGB_MATRIX_CYCLE_ALL
+#undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#undef ENABLE_RGB_MATRIX_DUAL_BEACON
+#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#undef ENABLE_RGB_MATRIX_RAINDROPS
+#undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#undef ENABLE_RGB_MATRIX_SPLASH
+#undef ENABLE_RGB_MATRIX_MULTISPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+// Allow fancy RGB
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+// Simple RGB
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+
+// Reactive RGB
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_TYPING_HEATMAP
+
+#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 50
+
+// Unicode for Linux
+#define UNICODE_SELECTED_MODES UC_LNX
+#define UNICODE_KEY_LNX  LCTL(LSFT(KC_U))
+
+// Leader config
+#define LEADER_PER_KEY_TIMING
+#define LEADER_TIMEOUT 500
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/keymap.c b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/keymap.c
new file mode 100644
index 0000000000..1f56295fa9
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/keymap.c
@@ -0,0 +1,152 @@
+/* Copyright 2021 @ Victor-Gabriel Savu
+ *
+ * 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 layers{
+  MAC_BASE,
+  MAC_FN,
+  WIN_BASE,
+  WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+enum unicode_names {
+    GRIN,
+    SAD,
+};
+
+const uint32_t PROGMEM unicode_map[] = {
+    [GRIN]  = 0x1F600,  // 😀
+    [SAD]   = 0x1F61E,  // 😞
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[MAC_BASE] = LAYOUT_iso_83(
+     KC_ESC,             KC_BRID,  KC_BRIU,  KC_F3,    KC_F4,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
+     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
+     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
+     KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[MAC_FN] = LAYOUT_iso_83(
+     KC_TRNS,            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_TRNS,  KC_TRNS,
+     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
+     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+
+[WIN_BASE] = LAYOUT_iso_83(
+     KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   X(SAD),
+     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            X(GRIN),
+     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_PGUP,
+     KC_LEAD,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_PGDN,
+     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
+     KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[WIN_FN] = LAYOUT_iso_83(
+     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_CALC,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_TRNS,  KC_PSCR,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_MPLY,  KC_TRNS,  KC_TRNS,
+     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
+     KC_CAPS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_PGUP,
+     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_HOME,  KC_PGDN,  KC_END)
+
+};
+
+static bool wiggle_mouse;
+static uint16_t wiggle_timer;
+static uint16_t next_wiggle;
+
+
+LEADER_EXTERNS();
+
+void matrix_scan_user(void) {
+    LEADER_DICTIONARY() {
+        leading = false;
+        leader_end();
+
+        SEQ_ONE_KEY(KC_LEAD) {
+            tap_code(KC_CAPS);
+        }
+
+        SEQ_FOUR_KEYS(KC_I, KC_D, KC_L, KC_E) {
+            wiggle_mouse = !wiggle_mouse;
+            wiggle_timer = timer_read();
+        }
+
+        SEQ_TWO_KEYS(KC_O, KC_K) {
+            send_unicode_string("👍");
+        }
+
+        SEQ_THREE_KEYS(KC_S, KC_A, KC_D) {
+            send_unicode_string("😞");
+        }
+
+        SEQ_FIVE_KEYS(KC_C, KC_H, KC_E, KC_C, KC_K) {
+            send_unicode_string("✅");
+        }
+
+        SEQ_FIVE_KEYS(KC_C, KC_R, KC_O, KC_S, KC_S) {
+            send_unicode_string("❎");
+        }
+
+        SEQ_FIVE_KEYS(KC_T, KC_H, KC_A, KC_N, KC_K) {
+            send_unicode_string("🙏");
+        }
+
+        SEQ_FIVE_KEYS(KC_S, KC_M, KC_I, KC_L, KC_E) {
+            send_unicode_string("😊");
+        }
+
+        SEQ_FIVE_KEYS(KC_P, KC_A, KC_R, KC_T, KC_Y) {
+            send_unicode_string("🎉");
+        }
+
+        SEQ_FOUR_KEYS(KC_E, KC_Y, KC_E, KC_S) {
+            send_unicode_string("(ಠ_ಠ)");
+        }
+
+        SEQ_FIVE_KEYS(KC_M, KC_A, KC_G, KC_I, KC_C) {
+            send_unicode_string("(ಠ_ಠ) 🪄 ⠁⭒*.✫.*⭒⠁");
+        }
+
+        SEQ_FIVE_KEYS(KC_T, KC_A, KC_B, KC_L, KC_E) {
+            send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
+        }
+
+        SEQ_FIVE_KEYS(KC_S, KC_H, KC_R, KC_U, KC_G) {
+            send_unicode_string("¯\\_(ツ)_/¯");
+        }
+    }
+
+    if (wiggle_mouse && timer_elapsed(wiggle_timer) > next_wiggle) {
+        wiggle_timer = timer_read();
+
+        uint8_t rval = TCNT0 + TCNT1 + TCNT3 + TCNT4;
+        next_wiggle = rval % 1000;
+
+        if (rval & 1) tap_code(KC_MS_UP);
+        if (rval & 2) tap_code(KC_MS_DOWN);
+        if (rval & 4) tap_code(KC_MS_LEFT);
+        if (rval & 8) tap_code(KC_MS_RIGHT);
+    }
+}
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/readme.md b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/readme.md
new file mode 100644
index 0000000000..c96130816e
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/readme.md
@@ -0,0 +1,4 @@
+# victorsavu3's Keychron Q1 keymap (ISO)
+
+Very similar to the default layout. Enables reactive and framebuffer RGB, but disables most effects enabled by keychron.
+Uses Caps Lock as a leader key for emojis and to enable a random mouse wiggler to prevent the system from going to sleep.
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/rules.mk b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/rules.mk
new file mode 100644
index 0000000000..853c414ec7
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/rules.mk
@@ -0,0 +1,3 @@
+MOUSEKEY_ENABLE = yes
+UNICODEMAP_ENABLE = yes
+LEADER_ENABLE = yes

From 07465c0ebbabf35079fed70a58e73da1e9419444 Mon Sep 17 00:00:00 2001
From: Sergi Meseguer <zigotica@gmail.com>
Date: Mon, 27 Dec 2021 11:24:14 +0100
Subject: [PATCH 099/867] zigotica userspace add raw_hid_receive (#14869)

* zigotica userspace add raw_hid_receive

* add 3 keys to figma keymap

* add 2 keys to vim keymap

* improve vim keys

* add 3 keys to browser keymap

* comment typo

* shorten SEND_STRING

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/z12/keymaps/zigotica/encoder.c |  12 +--
 keyboards/z12/keymaps/zigotica/keymap.c  | 126 ++++++++++++++++-------
 keyboards/z12/keymaps/zigotica/oled.c    |  10 +-
 keyboards/z12/keymaps/zigotica/readme.md |   3 +
 users/zigotica/zigotica.h                |   2 +-
 5 files changed, 100 insertions(+), 53 deletions(-)
 create mode 100644 keyboards/z12/keymaps/zigotica/readme.md

diff --git a/keyboards/z12/keymaps/zigotica/encoder.c b/keyboards/z12/keymaps/zigotica/encoder.c
index 49a3d859b6..f55b9b5ae9 100644
--- a/keyboards/z12/keymaps/zigotica/encoder.c
+++ b/keyboards/z12/keymaps/zigotica/encoder.c
@@ -48,12 +48,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
                 // Cycle through Tabs
                 if (clockwise) {
                     tap_code16(C(KC_TAB));
-                    /* register_code16(G(KC_RCBR)); */
-                    /* unregister_code16(G(KC_RCBR)); */
                 } else {
                     tap_code16(S(C(KC_TAB)));
-                    /* register_code16(G(KC_LCBR)); */
-                    /* unregister_code16(G(KC_LCBR)); */
                 }
             } else { // RIGHT
                 // Scroll up/down
@@ -68,11 +64,11 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
         break;
         case _FIGMA:
             if (index == 0) { // LEFT
-                // Volume control.
+                // Cycle through Tabs
                 if (clockwise) {
-                    tap_code(KC_VOLU);
+                    tap_code16(C(KC_TAB));
                 } else {
-                    tap_code(KC_VOLD);
+                    tap_code16(S(C(KC_TAB)));
                 }
             } else { // RIGHT
                 // Zoom in/out
@@ -89,7 +85,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
                 }
             }
         break;
-        case _TERMINAL:
+        case _BASE:
         default:
             if (index == 0) { // LEFT
                 // Volume control.
diff --git a/keyboards/z12/keymaps/zigotica/keymap.c b/keyboards/z12/keymaps/zigotica/keymap.c
index 7e969de96e..ef01561f1a 100644
--- a/keyboards/z12/keymaps/zigotica/keymap.c
+++ b/keyboards/z12/keymaps/zigotica/keymap.c
@@ -16,25 +16,73 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "zigotica.h"
+#include "raw_hid.h"
+
+#ifdef RAW_ENABLE
+void raw_hid_receive(uint8_t* data, uint8_t length) {
+    layer_clear();
+    if (data[0] == 99) {
+        layer_on(_BASE);
+    }
+    else {
+        layer_on(data[0]);
+    }
+}
+#endif
 
 // Custom Keycodes
-#define MODE_1 TO(_TERMINAL)
+#define MODE_1 TO(_BASE)
 #define MODE_2 TO(_FIGMA)
 #define MODE_3 TO(_BROWSER)
 #define MODE_4 TO(_VIM)
 
 enum custom_keycodes {
-    VIM_SIP = SAFE_RANGE
+    VIM_SIF = SAFE_RANGE,
+    VIM_SIP,
+    VIM_RIF,
+    VIM_RIP,
+    VIM_NEW
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
-        case VIM_SIP:
+        case VIM_SIF:// Search in File
+            if (record->event.pressed) {
+                register_code(KC_ESC);
+                tap_code(KC_SLASH);
+            } else { // released
+                unregister_code(KC_ESC);
+            }
+        break;
+        case VIM_SIP:// Search in Project
             if (record->event.pressed) {
                 register_code(KC_ESC);
                 SEND_STRING(":Ag ");
-            } else {
-                // released
+            } else { // released
+                unregister_code(KC_ESC);
+            }
+        break;
+        case VIM_RIF:// Replace in File
+            if (record->event.pressed) {
+                register_code(KC_ESC);
+                SEND_STRING(":%s/a/b/g");
+            } else { // released
+                unregister_code(KC_ESC);
+            }
+        break;
+        case VIM_RIP:// Replace in Project
+            if (record->event.pressed) {
+                register_code(KC_ESC);
+                SEND_STRING(":cdo %s/a/b/g");
+            } else { // released
+                unregister_code(KC_ESC);
+            }
+        break;
+        case VIM_NEW:// New buffer
+            if (record->event.pressed) {
+                SEND_STRING("\e:vnew\n");
+            } else { // released
+                unregister_code(KC_ENT);
                 unregister_code(KC_ESC);
             }
         break;
@@ -44,83 +92,83 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /*
- * TERMINAL Layer
+ * BASE Layer
  *
  * ,-----------------------------.
- * |       | TERM | FIGM |       |
+ * |       | BASE | FIGM |       |
  * |-------+------+------+-------|
- * |  VOL  | BROW |  VIM | SCROLL|
+ * |VOL/PLY| BROW |  VIM | SCROLL|
  * |-------+------+------+-------|
  *    |-------+-------+-------|
- *    | MEDIA |   o   |   o   |
+ *    |   o   |   o   |   o   |
  *    |-------+-------+-------|
  *    |   o   |   o   |   o   |
  *    |-------+-------+-------|
  */
-    [_TERMINAL] = LAYOUT(
+    [_BASE] = LAYOUT(
                MODE_1, MODE_2,
     ZK_MEDIA,  MODE_3, MODE_4,  _______,
     _______,      _______,      _______,
     _______,      _______,      _______
     ),
-/*
- * VIM Layer
- *
- * ,-----------------------------.
- * |       | TERM | FIGM |       |
- * |-------+------+------+-------|
- * |BUFFER | BROW |  VIM | SCROLL|
- * |-------+------+------+-------|
- *    |-------+-------+-------|
- *    |SEARCH |   o   |   o   |
- *    |-------+-------+-------|
- *    |   o   |   o   |   o   |
- *    |-------+-------+-------|
- */
-    [_VIM] = LAYOUT(
-             _______, _______,
-    _______, _______, _______,  _______,
-    VIM_SIP,      _______,      _______,
-    _______,      _______,      _______
-    ),
 /*
  * FIGMA Layer
  *
  * ,-----------------------------.
- * |       | TERM | FIGM |       |
+ * |       | BASE | FIGM |       |
  * |-------+------+------+-------|
- * |  VOL  | BROW |  VIM | ZOOM  |
+ * |  TABS | BROW |  VIM | ZOOM  |
  * |-------+------+------+-------|
  *    |-------+-------+-------|
- *    | ZOOM  | GRIDS |  FULL |
+ *    |ZOOMFIT| GRIDS |  FULL |
  *    |-------+-------+-------|
- *    |   o   |   o   |   o   |
+ *    |ZOOM100|  NEXT | COLOR |
  *    |-------+-------+-------|
  */
     [_FIGMA] = LAYOUT(
              _______, _______,
     _______, _______, _______,  _______,
     LSFT(KC_1), LCTL(KC_G), LGUI(KC_BSLS),
-    _______,      _______,      _______
+    LSFT(KC_0), KC_N,       LCTL(KC_C)
     ),
 /*
  * BROWSER Layer
  *
  * ,-----------------------------.
- * |       | TERM | FIGM |       |
+ * |       | BASE | FIGM |       |
  * |-------+------+------+-------|
  * |  TABS | BROW |  VIM | SCROLL|
  * |-------+------+------+-------|
  *    |-------+-------+-------|
  *    |SEARCH | BOOKM | DEVTL |
  *    |-------+-------+-------|
- *    |   o   |   o   |   o   |
+ *    |ZOOM100| MUTE  | READ  |
  *    |-------+-------+-------|
  */
     [_BROWSER] = LAYOUT(
              _______, _______,
     _______, _______, _______,  _______,
-    G(KC_F),      G(KC_D),   G(A(KC_I)),
-    _______,      _______,      _______
+    G(KC_F),   G(KC_D),   G(A(KC_I)),
+    G(KC_0),   C(KC_M),   G(A(KC_R))
+    ),
+/*
+ * VIM Layer
+ *
+ * ,-----------------------------.
+ * |       | BASE | FIGM |       |
+ * |-------+------+------+-------|
+ * |BUFFER | BROW |  VIM | SCROLL|
+ * |-------+------+------+-------|
+ *    |-------+-------+-------|
+ *    |SRCH FL|REPL FL|NEW BUF|
+ *    |-------+-------+-------|
+ *    |SRCH PR|REPL PR|   o   |
+ *    |-------+-------+-------|
+ */
+    [_VIM] = LAYOUT(
+             _______, _______,
+    _______, _______, _______,  _______,
+    VIM_SIF,      VIM_RIF,      VIM_NEW,
+    VIM_SIP,      VIM_RIP,      _______
     ),
 };
diff --git a/keyboards/z12/keymaps/zigotica/oled.c b/keyboards/z12/keymaps/zigotica/oled.c
index fa11a3d6c6..c96fc0f708 100644
--- a/keyboards/z12/keymaps/zigotica/oled.c
+++ b/keyboards/z12/keymaps/zigotica/oled.c
@@ -21,16 +21,16 @@ static void render_status(void) {
     oled_write_P(PSTR("Layer: "), false);
     switch (get_highest_layer(layer_state)) {
         case _VIM:
-            oled_write_P(PSTR("VIM\n\nBUFFER       SCROLL"), false);
+            oled_write_P(PSTR("VIM      \n\nBUFFER         SCROLL"), false);
             break;
         case _FIGMA:
-            oled_write_P(PSTR("FIGMA\n\nVOLUME         ZOOM"), false);
+            oled_write_P(PSTR("FIGMA    \n\nTABS             ZOOM"), false);
             break;
         case _BROWSER:
-            oled_write_P(PSTR("BROWSER\n\nTABS         SCROLL"), false);
+            oled_write_P(PSTR("BROWSER  \n\nTABS           SCROLL"), false);
             break;
-        case _TERMINAL:
-            oled_write_P(PSTR("TERMINAL\n\nVOLUME       SCROLL"), false);
+        case _BASE:
+            oled_write_P(PSTR("BASE     \n\nVOLUME         SCROLL"), false);
             break;
         default:
             oled_write_P(PSTR("Undef\n"), false);
diff --git a/keyboards/z12/keymaps/zigotica/readme.md b/keyboards/z12/keymaps/zigotica/readme.md
new file mode 100644
index 0000000000..a3746a88d2
--- /dev/null
+++ b/keyboards/z12/keymaps/zigotica/readme.md
@@ -0,0 +1,3 @@
+# zigotica's z12 Layout
+
+This layout uses `RAW_ENABLE = yes`, and benefits from [active-app-qmk-layer-updater](https://github.com/zigotica/active-app-qmk-layer-updater) node script (run by the host system) to change layers programmatically depending on the current active app.
diff --git a/users/zigotica/zigotica.h b/users/zigotica/zigotica.h
index e9ff5ff16c..e85a04edbe 100644
--- a/users/zigotica/zigotica.h
+++ b/users/zigotica/zigotica.h
@@ -26,7 +26,7 @@ enum userspace_layers {
 };
 #else
 enum userspace_layers {
-    _TERMINAL = 0,
+    _BASE = 0,
     _FIGMA,
     _BROWSER,
     _VIM,

From d3952523fe67ca22defe0d889e6fc77f76c3afd9 Mon Sep 17 00:00:00 2001
From: uqs <uqs@FreeBSD.org>
Date: Mon, 27 Dec 2021 11:26:09 +0100
Subject: [PATCH 100/867] pwm3360 driver cleanup and diff reduction to adns9800
 (#15559)

* Diff reduction between ADNS9800 and PMW3360 drivers.

They are very similar devices. This (somewhat) unreadable diff is
essentially a no-op, but it makes a `vimdiff` between the 2 drivers much
more readable.

* Cleanup pwm3360 driver some more.

Remove redundant calls to spi_start() and spi_stop(), as pmw3360_write()
will already call these.
---
 drivers/sensors/adns9800.c        |  14 +-
 drivers/sensors/pmw3360.c         | 242 +++++++++++++++---------------
 drivers/sensors/pmw3360.h         |  18 +--
 quantum/pointing_device_drivers.c |   5 +-
 4 files changed, 133 insertions(+), 146 deletions(-)

diff --git a/drivers/sensors/adns9800.c b/drivers/sensors/adns9800.c
index c52f991804..995c9e8614 100644
--- a/drivers/sensors/adns9800.c
+++ b/drivers/sensors/adns9800.c
@@ -77,7 +77,9 @@
 #define MSB1              0x80
 // clang-format on
 
-void adns9800_spi_start(void) { spi_start(ADNS9800_CS_PIN, false, ADNS9800_SPI_MODE, ADNS9800_SPI_DIVISOR); }
+void adns9800_spi_start(void) {
+    spi_start(ADNS9800_CS_PIN, false, ADNS9800_SPI_MODE, ADNS9800_SPI_DIVISOR);
+}
 
 void adns9800_write(uint8_t reg_addr, uint8_t data) {
     adns9800_spi_start();
@@ -154,8 +156,8 @@ void adns9800_init() {
 }
 
 config_adns9800_t adns9800_get_config(void) {
-    uint8_t config_1 = adns9800_read(REG_Configuration_I);
-    return (config_adns9800_t){(config_1 & 0xFF) * CPI_STEP};
+    uint8_t cpival = adns9800_read(REG_Configuration_I);
+    return (config_adns9800_t){(cpival & 0xFF) * CPI_STEP};
 }
 
 void adns9800_set_config(config_adns9800_t config) {
@@ -164,8 +166,8 @@ void adns9800_set_config(config_adns9800_t config) {
 }
 
 uint16_t adns9800_get_cpi(void) {
-    uint8_t config_1 = adns9800_read(REG_Configuration_I);
-    return (uint16_t){(config_1 & 0xFF) * CPI_STEP};
+    uint8_t cpival = adns9800_read(REG_Configuration_I);
+    return (uint16_t)(cpival & 0xFF) * CPI_STEP;
 }
 
 void adns9800_set_cpi(uint16_t cpi) {
@@ -184,7 +186,7 @@ static int16_t convertDeltaToInt(uint8_t high, uint8_t low) {
 }
 
 report_adns9800_t adns9800_get_report(void) {
-    report_adns9800_t report = {0, 0};
+    report_adns9800_t report = {0};
 
     adns9800_spi_start();
 
diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index cebf4f25d8..4854ba5f47 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "spi_master.h"
 #include "pmw3360.h"
 #include "wait.h"
 #include "debug.h"
@@ -24,55 +25,57 @@
 
 // Registers
 // clang-format off
-#define REG_Product_ID                 0x00
-#define REG_Revision_ID                0x01
-#define REG_Motion                     0x02
-#define REG_Delta_X_L                  0x03
-#define REG_Delta_X_H                  0x04
-#define REG_Delta_Y_L                  0x05
-#define REG_Delta_Y_H                  0x06
-#define REG_SQUAL                      0x07
-#define REG_Raw_Data_Sum               0x08
-#define REG_Maximum_Raw_data           0x09
-#define REG_Minimum_Raw_data           0x0A
-#define REG_Shutter_Lower              0x0B
-#define REG_Shutter_Upper              0x0C
-#define REG_Control                    0x0D
-#define REG_Config1                    0x0F
-#define REG_Config2                    0x10
-#define REG_Angle_Tune                 0x11
-#define REG_Frame_Capture              0x12
-#define REG_SROM_Enable                0x13
-#define REG_Run_Downshift              0x14
-#define REG_Rest1_Rate_Lower           0x15
-#define REG_Rest1_Rate_Upper           0x16
-#define REG_Rest1_Downshift            0x17
-#define REG_Rest2_Rate_Lower           0x18
-#define REG_Rest2_Rate_Upper           0x19
-#define REG_Rest2_Downshift            0x1A
-#define REG_Rest3_Rate_Lower           0x1B
-#define REG_Rest3_Rate_Upper           0x1C
-#define REG_Observation                0x24
-#define REG_Data_Out_Lower             0x25
-#define REG_Data_Out_Upper             0x26
-#define REG_Raw_Data_Dump              0x29
-#define REG_SROM_ID                    0x2A
-#define REG_Min_SQ_Run                 0x2B
-#define REG_Raw_Data_Threshold         0x2C
-#define REG_Config5                    0x2F
-#define REG_Power_Up_Reset             0x3A
-#define REG_Shutdown                   0x3B
-#define REG_Inverse_Product_ID         0x3F
-#define REG_LiftCutoff_Tune3           0x41
-#define REG_Angle_Snap                 0x42
-#define REG_LiftCutoff_Tune1           0x4A
-#define REG_Motion_Burst               0x50
-#define REG_LiftCutoff_Tune_Timeout    0x58
-#define REG_LiftCutoff_Tune_Min_Length 0x5A
-#define REG_SROM_Load_Burst            0x62
-#define REG_Lift_Config                0x63
-#define REG_Raw_Data_Burst             0x64
-#define REG_LiftCutoff_Tune2           0x65
+#define REG_Product_ID                   0x00
+#define REG_Revision_ID                  0x01
+#define REG_Motion                       0x02
+#define REG_Delta_X_L                    0x03
+#define REG_Delta_X_H                    0x04
+#define REG_Delta_Y_L                    0x05
+#define REG_Delta_Y_H                    0x06
+#define REG_SQUAL                        0x07
+#define REG_Raw_Data_Sum                 0x08
+#define REG_Maximum_Raw_data             0x09
+#define REG_Minimum_Raw_data             0x0a
+#define REG_Shutter_Lower                0x0b
+#define REG_Shutter_Upper                0x0c
+#define REG_Control                      0x0d
+#define REG_Config1                      0x0f
+#define REG_Config2                      0x10
+#define REG_Angle_Tune                   0x11
+#define REG_Frame_Capture                0x12
+#define REG_SROM_Enable                  0x13
+#define REG_Run_Downshift                0x14
+#define REG_Rest1_Rate_Lower             0x15
+#define REG_Rest1_Rate_Upper             0x16
+#define REG_Rest1_Downshift              0x17
+#define REG_Rest2_Rate_Lower             0x18
+#define REG_Rest2_Rate_Upper             0x19
+#define REG_Rest2_Downshift              0x1a
+#define REG_Rest3_Rate_Lower             0x1b
+#define REG_Rest3_Rate_Upper             0x1c
+#define REG_Observation                  0x24
+#define REG_Data_Out_Lower               0x25
+#define REG_Data_Out_Upper               0x26
+#define REG_Raw_Data_Dump                0x29
+#define REG_SROM_ID                      0x2a
+#define REG_Min_SQ_Run                   0x2b
+#define REG_Raw_Data_Threshold           0x2c
+#define REG_Config5                      0x2f
+#define REG_Power_Up_Reset               0x3a
+#define REG_Shutdown                     0x3b
+#define REG_Inverse_Product_ID           0x3f
+#define REG_LiftCutoff_Tune3             0x41
+#define REG_Angle_Snap                   0x42
+#define REG_LiftCutoff_Tune1             0x4a
+#define REG_Motion_Burst                 0x50
+#define REG_LiftCutoff_Tune_Timeout      0x58
+#define REG_LiftCutoff_Tune_Min_Length   0x5a
+#define REG_SROM_Load_Burst              0x62
+#define REG_Lift_Config                  0x63
+#define REG_Raw_Data_Burst               0x64
+#define REG_LiftCutoff_Tune2             0x65
+
+#define CPI_STEP          100
 // clang-format on
 
 #ifndef MAX_CPI
@@ -86,23 +89,19 @@ void print_byte(uint8_t byte) { dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1'
 #endif
 #define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
 
-bool spi_start_adv(void) {
+bool pmw3360_spi_start(void) {
     bool status = spi_start(PMW3360_CS_PIN, PMW3360_SPI_LSBFIRST, PMW3360_SPI_MODE, PMW3360_SPI_DIVISOR);
     wait_us(1);
     return status;
 }
 
-void spi_stop_adv(void) {
-    wait_us(1);
-    spi_stop();
-}
+spi_status_t pmw3360_write(uint8_t reg_addr, uint8_t data) {
+    pmw3360_spi_start();
 
-spi_status_t spi_write_adv(uint8_t reg_addr, uint8_t data) {
     if (reg_addr != REG_Motion_Burst) {
         _inBurst = false;
     }
 
-    spi_start_adv();
     // send address of the register, with MSBit = 1 to indicate it's a write
     spi_status_t status = spi_write(reg_addr | 0x80);
     status              = spi_write(data);
@@ -116,11 +115,10 @@ spi_status_t spi_write_adv(uint8_t reg_addr, uint8_t data) {
     return status;
 }
 
-uint8_t spi_read_adv(uint8_t reg_addr) {
-    spi_start_adv();
+uint8_t pmw3360_read(uint8_t reg_addr) {
+    pmw3360_spi_start();
     // send adress of the register, with MSBit = 0 to indicate it's a read
     spi_write(reg_addr & 0x7f);
-
     uint8_t data = spi_read();
 
     // tSCLK-NCS for read operation is 120ns
@@ -133,19 +131,6 @@ uint8_t spi_read_adv(uint8_t reg_addr) {
     return data;
 }
 
-void pmw3360_set_cpi(uint16_t cpi) {
-    uint8_t cpival = constrain((cpi / 100) - 1, 0, MAX_CPI);
-
-    spi_start_adv();
-    spi_write_adv(REG_Config1, cpival);
-    spi_stop();
-}
-
-uint16_t pmw3360_get_cpi(void) {
-    uint8_t cpival = spi_read_adv(REG_Config1);
-    return (uint16_t)((cpival + 1) & 0xFF) * 100;
-}
-
 bool pmw3360_init(void) {
     setPinOutput(PMW3360_CS_PIN);
 
@@ -153,42 +138,51 @@ bool pmw3360_init(void) {
     _inBurst = false;
 
     spi_stop();
-    spi_start_adv();
+    pmw3360_spi_start();
     spi_stop();
 
-    spi_write_adv(REG_Shutdown, 0xb6);  // Shutdown first
+    pmw3360_write(REG_Shutdown, 0xb6);  // Shutdown first
     wait_ms(300);
 
-    spi_start_adv();
+    pmw3360_spi_start();
     wait_us(40);
-    spi_stop_adv();
+    spi_stop();
     wait_us(40);
 
-    spi_write_adv(REG_Power_Up_Reset, 0x5a);
+    // reboot
+    pmw3360_write(REG_Power_Up_Reset, 0x5a);
     wait_ms(50);
 
-    spi_read_adv(REG_Motion);
-    spi_read_adv(REG_Delta_X_L);
-    spi_read_adv(REG_Delta_X_H);
-    spi_read_adv(REG_Delta_Y_L);
-    spi_read_adv(REG_Delta_Y_H);
+    // read registers and discard
+    pmw3360_read(REG_Motion);
+    pmw3360_read(REG_Delta_X_L);
+    pmw3360_read(REG_Delta_X_H);
+    pmw3360_read(REG_Delta_Y_L);
+    pmw3360_read(REG_Delta_Y_H);
 
     pmw3360_upload_firmware();
 
-    spi_stop_adv();
+    spi_stop();
 
     wait_ms(10);
     pmw3360_set_cpi(PMW3360_CPI);
 
     wait_ms(1);
 
-    spi_write_adv(REG_Config2, 0x00);
+    pmw3360_write(REG_Config2, 0x00);
 
-    spi_write_adv(REG_Angle_Tune, constrain(ROTATIONAL_TRANSFORM_ANGLE, -127, 127));
+    pmw3360_write(REG_Angle_Tune, constrain(ROTATIONAL_TRANSFORM_ANGLE, -127, 127));
 
-    spi_write_adv(REG_Lift_Config, PMW3360_LIFTOFF_DISTANCE);
+    pmw3360_write(REG_Lift_Config, PMW3360_LIFTOFF_DISTANCE);
 
     bool init_success = pmw3360_check_signature();
+#ifdef CONSOLE_ENABLE
+    if (init_success) {
+        dprintf("pmw3360 signature verified");
+    } else {
+        dprintf("pmw3360 signature verification failed!");
+    }
+#endif
 
     writePinLow(PMW3360_CS_PIN);
 
@@ -196,13 +190,13 @@ bool pmw3360_init(void) {
 }
 
 void pmw3360_upload_firmware(void) {
-    spi_write_adv(REG_SROM_Enable, 0x1d);
+    pmw3360_write(REG_SROM_Enable, 0x1d);
 
     wait_ms(10);
 
-    spi_write_adv(REG_SROM_Enable, 0x18);
+    pmw3360_write(REG_SROM_Enable, 0x18);
 
-    spi_start_adv();
+    pmw3360_spi_start();
     spi_write(REG_SROM_Load_Burst | 0x80);
     wait_us(15);
 
@@ -214,68 +208,72 @@ void pmw3360_upload_firmware(void) {
     }
     wait_us(200);
 
-    spi_read_adv(REG_SROM_ID);
-
-    spi_write_adv(REG_Config2, 0x00);
-
-    spi_stop();
-    wait_ms(10);
+    pmw3360_read(REG_SROM_ID);
+    pmw3360_write(REG_Config2, 0x00);
 }
 
 bool pmw3360_check_signature(void) {
-    uint8_t pid      = spi_read_adv(REG_Product_ID);
-    uint8_t iv_pid   = spi_read_adv(REG_Inverse_Product_ID);
-    uint8_t SROM_ver = spi_read_adv(REG_SROM_ID);
+    uint8_t pid      = pmw3360_read(REG_Product_ID);
+    uint8_t iv_pid   = pmw3360_read(REG_Inverse_Product_ID);
+    uint8_t SROM_ver = pmw3360_read(REG_SROM_ID);
     return (pid == firmware_signature[0] && iv_pid == firmware_signature[1] && SROM_ver == firmware_signature[2]);  // signature for SROM 0x04
 }
 
+uint16_t pmw3360_get_cpi(void) {
+    uint8_t cpival = pmw3360_read(REG_Config1);
+    return (uint16_t)((cpival + 1) & 0xFF) * CPI_STEP;
+}
+
+void pmw3360_set_cpi(uint16_t cpi) {
+    uint8_t cpival = constrain((cpi / CPI_STEP) - 1, 0, MAX_CPI);
+    pmw3360_write(REG_Config1, cpival);
+}
+
 report_pmw3360_t pmw3360_read_burst(void) {
+    report_pmw3360_t report = {0};
+
     if (!_inBurst) {
 #ifdef CONSOLE_ENABLE
         dprintf("burst on");
 #endif
-        spi_write_adv(REG_Motion_Burst, 0x00);
+        pmw3360_write(REG_Motion_Burst, 0x00);
         _inBurst = true;
     }
 
-    spi_start_adv();
+    pmw3360_spi_start();
     spi_write(REG_Motion_Burst);
     wait_us(35);  // waits for tSRAD
 
-    report_pmw3360_t data = {0};
-
-    data.motion = spi_read();
+    report.motion = spi_read();
     spi_write(0x00);  // skip Observation
-    data.dx  = spi_read();
-    data.mdx = spi_read();
-    data.dy  = spi_read();
-    data.mdy = spi_read();
+    report.dx  = spi_read();
+    report.mdx = spi_read();
+    report.dy  = spi_read();
+    report.mdy = spi_read();
 
     spi_stop();
 
 #ifdef CONSOLE_ENABLE
     if (debug_mouse) {
-        print_byte(data.motion);
-        print_byte(data.dx);
-        print_byte(data.mdx);
-        print_byte(data.dy);
-        print_byte(data.mdy);
+        print_byte(report.motion);
+        print_byte(report.dx);
+        print_byte(report.mdx);
+        print_byte(report.dy);
+        print_byte(report.mdy);
         dprintf("\n");
     }
 #endif
 
-    data.isMotion    = (data.motion & 0x80) != 0;
-    data.isOnSurface = (data.motion & 0x08) == 0;
-    data.dx |= (data.mdx << 8);
-    data.dx = data.dx * -1;
-    data.dy |= (data.mdy << 8);
-    data.dy = data.dy * -1;
+    report.isMotion    = (report.motion & 0x80) != 0;
+    report.isOnSurface = (report.motion & 0x08) == 0;
+    report.dx |= (report.mdx << 8);
+    report.dx = report.dx * -1;
+    report.dy |= (report.mdy << 8);
+    report.dy = report.dy * -1;
 
-    spi_stop();
-
-    if (data.motion & 0b111) {  // panic recovery, sometimes burst mode works weird.
+    if (report.motion & 0b111) {  // panic recovery, sometimes burst mode works weird.
         _inBurst = false;
     }
 
-    return data;
+    return report;
 }
diff --git a/drivers/sensors/pmw3360.h b/drivers/sensors/pmw3360.h
index 9aa8e13f8e..df0c10d643 100644
--- a/drivers/sensors/pmw3360.h
+++ b/drivers/sensors/pmw3360.h
@@ -19,8 +19,6 @@
 #pragma once
 
 #include <stdint.h>
-#include "report.h"
-#include "spi_master.h"
 
 #ifndef PMW3360_CPI
 #    define PMW3360_CPI 1600
@@ -69,10 +67,6 @@ This should work for the 3390 and 3391 too, in theory.
 #    define PMW3360_FIRMWARE_H "pmw3360_firmware.h"
 #endif
 
-#ifdef CONSOLE_ENABLE
-void print_byte(uint8_t byte);
-#endif
-
 typedef struct {
     int8_t  motion;
     bool    isMotion;     // True if a motion is detected.
@@ -83,16 +77,10 @@ typedef struct {
     int8_t  mdy;
 } report_pmw3360_t;
 
-bool             spi_start_adv(void);
-void             spi_stop_adv(void);
-spi_status_t     spi_write_adv(uint8_t reg_addr, uint8_t data);
-uint8_t          spi_read_adv(uint8_t reg_addr);
 bool             pmw3360_init(void);
-void             pmw3360_set_cpi(uint16_t cpi);
-uint16_t         pmw3360_get_cpi(void);
 void             pmw3360_upload_firmware(void);
 bool             pmw3360_check_signature(void);
+uint16_t         pmw3360_get_cpi(void);
+void             pmw3360_set_cpi(uint16_t cpi);
+/* Reads and clears the current delta values on the sensor */
 report_pmw3360_t pmw3360_read_burst(void);
-
-#define degToRad(angleInDegrees) ((angleInDegrees)*M_PI / 180.0)
-#define radToDeg(angleInRadians) ((angleInRadians)*180.0 / M_PI)
diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device_drivers.c
index 0852a0bea7..260a6d2eb4 100644
--- a/quantum/pointing_device_drivers.c
+++ b/quantum/pointing_device_drivers.c
@@ -207,8 +207,7 @@ const pointing_device_driver_t pointing_device_driver = {
 };
 // clang-format on
 #elif defined(POINTING_DEVICE_DRIVER_pmw3360)
-
-static void init(void) { pmw3360_init(); }
+static void pmw3360_device_init(void) { pmw3360_init(); }
 
 report_mouse_t pmw3360_get_report(report_mouse_t mouse_report) {
     report_pmw3360_t data        = pmw3360_read_burst();
@@ -237,7 +236,7 @@ report_mouse_t pmw3360_get_report(report_mouse_t mouse_report) {
 
 // clang-format off
 const pointing_device_driver_t pointing_device_driver = {
-    .init       = init,
+    .init       = pmw3360_device_init,
     .get_report = pmw3360_get_report,
     .set_cpi    = pmw3360_set_cpi,
     .get_cpi    = pmw3360_get_cpi

From 4e077250d56f7e786af0cdef00f4b41d77e2b85c Mon Sep 17 00:00:00 2001
From: 3araht <69518343+3araht@users.noreply.github.com>
Date: Mon, 27 Dec 2021 19:27:15 +0900
Subject: [PATCH 101/867] bandominedoni, Drashna's method is applied to
 encoder_update_kb. (#15287)

* Drashna's method is applied to rotary encoder rotation detection. rgb_matrix_user.inc -> rgb_matrix_kb.inc.

* Disabled some RGB MATRIX effects to shrink the firmware size.

* via # of layers changed from 5 to 4.
---
 keyboards/bandominedoni/bandominedoni.c       |  74 +++++---
 keyboards/bandominedoni/bandominedoni.h       |   4 +
 keyboards/bandominedoni/config.h              | 161 ++++++------------
 keyboards/bandominedoni/keymaps/led/keymap.c  |  32 ++--
 keyboards/bandominedoni/keymaps/led/rules.mk  |   4 +-
 keyboards/bandominedoni/keymaps/via/config.h  |   2 +-
 keyboards/bandominedoni/keymaps/via/keymap.c  |  32 ++--
 keyboards/bandominedoni/keymaps/via/rules.mk  |   3 +-
 ...{rgb_matrix_user.inc => rgb_matrix_kb.inc} |   0
 9 files changed, 143 insertions(+), 169 deletions(-)
 rename keyboards/bandominedoni/{rgb_matrix_user.inc => rgb_matrix_kb.inc} (100%)

diff --git a/keyboards/bandominedoni/bandominedoni.c b/keyboards/bandominedoni/bandominedoni.c
index 1b0365ac6a..eacbb40fa0 100644
--- a/keyboards/bandominedoni/bandominedoni.c
+++ b/keyboards/bandominedoni/bandominedoni.c
@@ -119,33 +119,53 @@ static enum { UNKNOWN, LEFT, RIGHT } hand_side = UNKNOWN;
 }
 
 #ifdef ENCODER_ENABLE
-const uint16_t rt_matrix[2][2] = {
-    {5, 5}, {5, 6}
-};
+#   ifdef ENCODERS
+static uint8_t  encoder_state[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[ENCODERS]   = ENCODERS_CCW_KEY;
+#   endif
+
+void encoder_action_unregister(void) {
+#   ifdef ENCODERS
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index]) {
+            keyevent_t encoder_event = (keyevent_t) {
+                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
+                .pressed = false,
+                .time = (timer_read() | 1)
+            };
+            encoder_state[index] = 0;
+            action_exec(encoder_event);
+        }
+    }
+#   endif
+}
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+#   ifdef ENCODERS
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = true,
+        .time = (timer_read() | 1)
+    };
+    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
+#       ifdef CONSOLE_ENABLE
+    uprintf("encoder_action_register index = %u, clockwise = %u, row = %u, col = %u\n", index, clockwise, encoder_event.key.row, encoder_event.key.col);
+#       endif
+    action_exec(encoder_event);
+#   endif
+}
+
+void matrix_scan_kb(void) {
+    encoder_action_unregister();
+    matrix_scan_user();
+}
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (index == 1) { /* An encoder on the right side */
-        keypos_t key;
-        int cw = 0;
-        cw = clockwise ? 1 : 0;
-        key.row = rt_matrix[cw][0];
-        key.col = rt_matrix[cw][1];
-        uint8_t layer = layer_switch_get_layer(key);
-        uint16_t keycode = keymap_key_to_keycode(layer, key);
-        keyrecord_t record;
-        record.event.key = key;
-
-        if (keycode < MI_ON){
-            tap_code16(keycode);
-        } else {
-            record.event.pressed = true;
-            process_midi(keycode, &record);
-            wait_ms(TAP_CODE_DELAY);
-            record.event.pressed = false;
-            process_midi(keycode, &record);
-        }
-
-    }
+    encoder_action_register(index, clockwise);
+    // don't return user actions, because they are in the keymap
+    // encoder_update_user(index, clockwise);
     return true;
-}
-#endif  // ENCODER_ENABLE
+};
+
+#endif
diff --git a/keyboards/bandominedoni/bandominedoni.h b/keyboards/bandominedoni/bandominedoni.h
index 8e2470826c..1eca4f8d98 100644
--- a/keyboards/bandominedoni/bandominedoni.h
+++ b/keyboards/bandominedoni/bandominedoni.h
@@ -82,3 +82,7 @@
 //  reason: bandoMIneDonI has no space on right hand side to use "SPLIT_HAND_MATRIX_GRID".
 //          However, It enables to decide the handedness by the HW by adding one condition: "not to press any keys (especially r30) dusing startup."
 bool is_keyboard_left(void);
+
+void encoder_action_unregister(void);
+
+void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index 629c6af884..e1e4d87405 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -133,120 +133,54 @@
 //  Enable suspend mode.
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED true
 
-// //  enable below to shrink the firmware size ( -1974 bytes )
-// #    define REDUCE_RGB_MATRIX_EFFECTS
-
-//  enable below to shrink the firmware size ( -1574 bytes )
-// #    define REDUCE_RGB_MATRIX_EFFECTS_2
-
-// #    ifdef AUDIO_ENABLE
-#    ifdef CONSOLE_ENABLE
-#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#    else
+#   ifdef CONSOLE_ENABLE
+#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#   else
 // #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-// #define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-// #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define ENABLE_RGB_MATRIX_RAINDROPS
-// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#        define ENABLE_RGB_MATRIX_HUE_BREATHING
-#        define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#        define ENABLE_RGB_MATRIX_HUE_WAVE
-#        define ENABLE_RGB_MATRIX_FRACTAL
-#        define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#        if !defined(REDUCE_RGB_MATRIX_EFFECTS) && !defined(VIA_ENABLE)
-// #       ifdef REDUCE_RGB_MATRIX_EFFECTS
-#            define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#            define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#            define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#            define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#            define ENABLE_RGB_MATRIX_DUAL_BEACON
-#            define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#            define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#        endif
-
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-// #define ENABLE_RGB_MATRIX_FRACTAL
-// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-
-#        if !defined(REDUCE_RGB_MATRIX_EFFECTS_2) && !defined(VIA_ENABLE)
-// #       ifdef REDUCE_RGB_MATRIX_EFFECTS_2
-#            define ENABLE_RGB_MATRIX_BAND_VAL
-#            define ENABLE_RGB_MATRIX_CYCLE_ALL
-#            define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#            define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#            define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#            define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#            define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#            define ENABLE_RGB_MATRIX_MULTISPLASH
-#            define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-#        endif
-#            define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#    endif  // AUDIO_ENABLE
-
-// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
-// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-// #define ENABLE_RGB_MATRIX_BREATHING
-// #define ENABLE_RGB_MATRIX_BAND_SAT
-// #define ENABLE_RGB_MATRIX_BAND_VAL
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-// #define ENABLE_RGB_MATRIX_CYCLE_ALL
-// #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-// #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-// #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-// #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-// #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-// #define ENABLE_RGB_MATRIX_DUAL_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #define ENABLE_RGB_MATRIX_RAINDROPS
-// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #define ENABLE_RGB_MATRIX_HUE_BREATHING
-// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
-// #define ENABLE_RGB_MATRIX_HUE_WAVE
-// #define ENABLE_RGB_MATRIX_FRACTAL
-// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
+#       define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#       define ENABLE_RGB_MATRIX_BREATHING
+#       define ENABLE_RGB_MATRIX_BAND_SAT
+#       define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#       define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#       define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#       define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
 // #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// #define ENABLE_RGB_MATRIX_SPLASH
-// #define ENABLE_RGB_MATRIX_MULTISPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_SPLASH
-// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
+#       define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#       define ENABLE_RGB_MATRIX_SPLASH
+#       define ENABLE_RGB_MATRIX_SOLID_SPLASH
+//  RAINDROPS don't match well with layer LED indicator (oc) using rgb_matrix_set_color().
+// #define ENABLE_RGB_MATRIX_RAINDROPS
+// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+//  Recommendend not to use these.
+#       ifndef VIA_ENABLE
+#           define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#           define ENABLE_RGB_MATRIX_BAND_VAL
+#           define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#           define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#           define ENABLE_RGB_MATRIX_CYCLE_ALL
+#           define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#           define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#           define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#           define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#           define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#           define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#           define ENABLE_RGB_MATRIX_DUAL_BEACON
+#           define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#           define ENABLE_RGB_MATRIX_HUE_BREATHING
+#           define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#           define ENABLE_RGB_MATRIX_HUE_WAVE
+#           define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#           define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#           define ENABLE_RGB_MATRIX_MULTISPLASH
+#           define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#           define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#       endif
+#   endif  // CONSOLE_ENABLE
 #endif  // RGB_MATRIX_ENABLE
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
@@ -330,4 +264,7 @@
 #   define ENCODERS_PAD_B_RIGHT { F4 }
 #   define ENCODER_RESOLUTION 4
 #   define TAP_CODE_DELAY 10
+#   define ENCODERS 2
+#   define ENCODERS_CW_KEY  { {4, 5}, {6, 5} }
+#   define ENCODERS_CCW_KEY { {3, 5}, {5, 5} }
 #endif  // ENCODER_ENABLE
diff --git a/keyboards/bandominedoni/keymaps/led/keymap.c b/keyboards/bandominedoni/keymaps/led/keymap.c
index 7693557df3..305756b5b1 100644
--- a/keyboards/bandominedoni/keymaps/led/keymap.c
+++ b/keyboards/bandominedoni/keymaps/led/keymap.c
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      XXXXXXX, XXXXXXX, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
      _______,        MI_OCTD, MI_OCTU, MI_VELD, MI_VELU,         _______,
-                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
+                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  RGB_RMOD, RGB_MOD,
                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
             RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI,
@@ -149,23 +149,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
-void eeconfig_init_user(void) {  // EEPROM is getting reset!
-  #ifdef RGB_MATRIX_ENABLE
-  rgb_matrix_enable();
-  rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
-  rgb_matrix_sethsv(HSV_BLUE);
-
-  rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE);
-  // rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
-  #endif
-}
-
-void keyboard_post_init_user(void) {
+void my_init(void){
     //  Set octave to MI_OCT_0
     midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
 
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
+}
+
+void eeconfig_init_user(void) {  // EEPROM is getting reset!
+    midi_init();
+    my_init();
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_enable();
+    rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
+    rgb_matrix_sethsv(HSV_BLUE);
+
+    rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE);
+    // rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
+#endif
+}
+
+void keyboard_post_init_user(void) {
+    my_init();
 
     //  party mode (for LED soldering test. Enable rainbow color effect, and disable led_indicator to check all LEDs)
     rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
diff --git a/keyboards/bandominedoni/keymaps/led/rules.mk b/keyboards/bandominedoni/keymaps/led/rules.mk
index a7583d38c8..08ed472ad6 100644
--- a/keyboards/bandominedoni/keymaps/led/rules.mk
+++ b/keyboards/bandominedoni/keymaps/led/rules.mk
@@ -1,2 +1,2 @@
-RGB_MATRIX_ENABLE = yes       # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
-RGB_MATRIX_CUSTOM_USER = yes  # 
+RGB_MATRIX_ENABLE = yes      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
+RGB_MATRIX_CUSTOM_KB = yes   #
diff --git a/keyboards/bandominedoni/keymaps/via/config.h b/keyboards/bandominedoni/keymaps/via/config.h
index 99e39626ce..4dcac5104f 100644
--- a/keyboards/bandominedoni/keymaps/via/config.h
+++ b/keyboards/bandominedoni/keymaps/via/config.h
@@ -15,4 +15,4 @@
  */
  #pragma once
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 5
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
diff --git a/keyboards/bandominedoni/keymaps/via/keymap.c b/keyboards/bandominedoni/keymaps/via/keymap.c
index 59e074228b..ad6833d692 100644
--- a/keyboards/bandominedoni/keymaps/via/keymap.c
+++ b/keyboards/bandominedoni/keymaps/via/keymap.c
@@ -82,7 +82,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
 
      _______,        MI_OCTD, MI_OCTU, MI_VELD, MI_VELU,         _______,
-                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_RMOD, RGB_MOD,
                 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
             RGB_SAD, RGB_SAI, RGB_HUD, RGB_HUI, RGB_SPD, RGB_SPI, RGB_VAD, RGB_VAI,
@@ -90,23 +90,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
-void eeconfig_init_user(void) {  // EEPROM is getting reset!
-  #ifdef RGB_MATRIX_ENABLE
-  rgb_matrix_enable();
-  rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
-  rgb_matrix_sethsv(HSV_BLUE);
-
-  rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE);
-  // rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
-  #endif
-}
-
-void keyboard_post_init_user(void) {
+void my_init(void){
     //  Set octave to MI_OCT_0
     midi_config.octave = MI_OCT_0 - MIDI_OCTAVE_MIN;
 
     // avoid using 127 since it is used as a special number in some sound sources.
     midi_config.velocity = MIDI_INITIAL_VELOCITY;
+}
+
+void eeconfig_init_user(void) {  // EEPROM is getting reset!
+    midi_init();
+    my_init();
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_enable();
+    rgb_matrix_set_speed(RGB_MATRIX_STARTUP_SPD);
+    rgb_matrix_sethsv(HSV_BLUE);
+
+    rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE);
+    // rgb_matrix_mode(RGB_MATRIX_RAINBOW_MOVING_CHEVRON);
+#endif
+}
+
+void keyboard_post_init_user(void) {
+    my_init();
 };
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/bandominedoni/keymaps/via/rules.mk b/keyboards/bandominedoni/keymaps/via/rules.mk
index 925056c3dc..95d7690567 100644
--- a/keyboards/bandominedoni/keymaps/via/rules.mk
+++ b/keyboards/bandominedoni/keymaps/via/rules.mk
@@ -1,3 +1,4 @@
-RGB_MATRIX_ENABLE = yes       # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
+RGB_MATRIX_ENABLE = yes      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
+RGB_MATRIX_CUSTOM_KB = yes   #
 VIA_ENABLE = yes
 MOUSEKEY_ENABLE = yes        # Mouse keys
diff --git a/keyboards/bandominedoni/rgb_matrix_user.inc b/keyboards/bandominedoni/rgb_matrix_kb.inc
similarity index 100%
rename from keyboards/bandominedoni/rgb_matrix_user.inc
rename to keyboards/bandominedoni/rgb_matrix_kb.inc

From c86baf3ecea618ce42263c06ac5d0922ea8817fa Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 27 Dec 2021 15:01:51 -0800
Subject: [PATCH 102/867] [Core] Fix bug and code regression for Split Common
 (#15603)

---
 quantum/matrix_common.c           | 22 ++++++++++------------
 quantum/split_common/split_util.h |  1 -
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c
index 79f77421e1..5fdc9186fa 100644
--- a/quantum/matrix_common.c
+++ b/quantum/matrix_common.c
@@ -95,24 +95,22 @@ uint8_t matrix_key_count(void) {
 bool matrix_post_scan(void) {
     bool changed = false;
     if (is_keyboard_master()) {
+        static bool  last_connected              = false;
         matrix_row_t slave_matrix[ROWS_PER_HAND] = {0};
         if (transport_master_if_connected(matrix + thisHand, slave_matrix)) {
-            for (int i = 0; i < ROWS_PER_HAND; ++i) {
-                if (matrix[thatHand + i] != slave_matrix[i]) {
-                    matrix[thatHand + i] = slave_matrix[i];
-                    changed              = true;
-                }
-            }
-        } else {
-            // reset other half if disconnected
-            for (int i = 0; i < ROWS_PER_HAND; ++i) {
-                matrix[thatHand + i] = 0;
-                slave_matrix[i]      = 0;
-            }
+            changed = memcmp(matrix + thatHand, slave_matrix, sizeof(slave_matrix)) != 0;
 
+            last_connected = true;
+        } else if (last_connected) {
+            // reset other half when disconnected
+            memset(slave_matrix, 0, sizeof(slave_matrix));
             changed = true;
+
+            last_connected = false;
         }
 
+        if (changed) memcpy(matrix + thatHand, slave_matrix, sizeof(slave_matrix));
+
         matrix_scan_quantum();
     } else {
         transport_slave(matrix + thatHand, matrix + thisHand);
diff --git a/quantum/split_common/split_util.h b/quantum/split_common/split_util.h
index ef72043bb7..c7eabea233 100644
--- a/quantum/split_common/split_util.h
+++ b/quantum/split_common/split_util.h
@@ -2,7 +2,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "matrix.h"

From 25707cad5cbe3a6955d0fd597f7449818dea4849 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Mon, 27 Dec 2021 15:08:44 -0800
Subject: [PATCH 103/867] Format code according to conventions (#15604)

---
 drivers/sensors/adns9800.c |  4 +---
 drivers/sensors/pmw3360.h  | 10 +++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/sensors/adns9800.c b/drivers/sensors/adns9800.c
index 995c9e8614..425cf9912f 100644
--- a/drivers/sensors/adns9800.c
+++ b/drivers/sensors/adns9800.c
@@ -77,9 +77,7 @@
 #define MSB1              0x80
 // clang-format on
 
-void adns9800_spi_start(void) {
-    spi_start(ADNS9800_CS_PIN, false, ADNS9800_SPI_MODE, ADNS9800_SPI_DIVISOR);
-}
+void adns9800_spi_start(void) { spi_start(ADNS9800_CS_PIN, false, ADNS9800_SPI_MODE, ADNS9800_SPI_DIVISOR); }
 
 void adns9800_write(uint8_t reg_addr, uint8_t data) {
     adns9800_spi_start();
diff --git a/drivers/sensors/pmw3360.h b/drivers/sensors/pmw3360.h
index df0c10d643..b46fc9056e 100644
--- a/drivers/sensors/pmw3360.h
+++ b/drivers/sensors/pmw3360.h
@@ -77,10 +77,10 @@ typedef struct {
     int8_t  mdy;
 } report_pmw3360_t;
 
-bool             pmw3360_init(void);
-void             pmw3360_upload_firmware(void);
-bool             pmw3360_check_signature(void);
-uint16_t         pmw3360_get_cpi(void);
-void             pmw3360_set_cpi(uint16_t cpi);
+bool     pmw3360_init(void);
+void     pmw3360_upload_firmware(void);
+bool     pmw3360_check_signature(void);
+uint16_t pmw3360_get_cpi(void);
+void     pmw3360_set_cpi(uint16_t cpi);
 /* Reads and clears the current delta values on the sensor */
 report_pmw3360_t pmw3360_read_burst(void);

From 8b9657471ed727ff1bec527be9b4c873a6e3354b Mon Sep 17 00:00:00 2001
From: me-dea <45652183+me-dea@users.noreply.github.com>
Date: Mon, 27 Dec 2021 15:33:53 -0800
Subject: [PATCH 104/867] massdrop/thekey: macos requires LGUI modifier instead
 of LCTL (#15605)

---
 keyboards/massdrop/thekey/keymaps/url-copy-paste-macos/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/massdrop/thekey/keymaps/url-copy-paste-macos/keymap.c b/keyboards/massdrop/thekey/keymaps/url-copy-paste-macos/keymap.c
index 16c73ba6ae..57382dfc5f 100644
--- a/keyboards/massdrop/thekey/keymaps/url-copy-paste-macos/keymap.c
+++ b/keyboards/massdrop/thekey/keymaps/url-copy-paste-macos/keymap.c
@@ -21,7 +21,7 @@ enum custom_keycodes {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(TK_URL, C(KC_C), C(KC_V)),
+    [0] = LAYOUT(TK_URL, G(KC_C), G(KC_V)),
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {

From 14d5c3f2f14d20c8d3559068b00dead66273765c Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 27 Dec 2021 15:57:41 -0800
Subject: [PATCH 105/867] [Bug] Include missing string.h include (#15606)

---
 quantum/matrix_common.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c
index 5fdc9186fa..98b83ddcf6 100644
--- a/quantum/matrix_common.c
+++ b/quantum/matrix_common.c
@@ -7,6 +7,7 @@
 #ifdef SPLIT_KEYBOARD
 #    include "split_common/split_util.h"
 #    include "split_common/transactions.h"
+#    include <string.h>
 
 #    define ROWS_PER_HAND (MATRIX_ROWS / 2)
 #else

From 6151b365f9ee2bae609c8bbac99ba7a6b631c86a Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 28 Dec 2021 11:32:34 +0800
Subject: [PATCH 106/867] move bm65hsrgb_iso and bm68hsrgb to rev1/ (#15132)

---
 keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/config.h          | 0
 keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/info.json         | 0
 .../bm65hsrgb_iso/{ => rev1}/keymaps/deadolus/config.h          | 0
 .../bm65hsrgb_iso/{ => rev1}/keymaps/deadolus/keymap.c          | 0
 .../bm65hsrgb_iso/{ => rev1}/keymaps/deadolus/keymap.h          | 0
 .../bm65hsrgb_iso/{ => rev1}/keymaps/deadolus/readme.md         | 0
 .../bm65hsrgb_iso/{ => rev1}/keymaps/deadolus/rules.mk          | 0
 .../bm65hsrgb_iso/{ => rev1}/keymaps/default/keymap.c           | 0
 .../kprepublic/bm65hsrgb_iso/{ => rev1}/keymaps/via/keymap.c    | 0
 .../kprepublic/bm65hsrgb_iso/{ => rev1}/keymaps/via/readme.md   | 0
 .../kprepublic/bm65hsrgb_iso/{ => rev1}/keymaps/via/rules.mk    | 0
 keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/readme.md         | 0
 .../kprepublic/bm65hsrgb_iso/{bm65hsrgb_iso.c => rev1/rev1.c}   | 2 +-
 .../kprepublic/bm65hsrgb_iso/{bm65hsrgb_iso.h => rev1/rev1.h}   | 0
 keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/rules.mk          | 0
 keyboards/kprepublic/bm68hsrgb/{ => rev1}/config.h              | 0
 keyboards/kprepublic/bm68hsrgb/{ => rev1}/info.json             | 0
 .../kprepublic/bm68hsrgb/{ => rev1}/keymaps/default/keymap.c    | 0
 .../kprepublic/bm68hsrgb/{ => rev1}/keymaps/default/readme.md   | 0
 .../kprepublic/bm68hsrgb/{ => rev1}/keymaps/peepeetee/config.h  | 0
 .../kprepublic/bm68hsrgb/{ => rev1}/keymaps/peepeetee/keymap.c  | 0
 .../kprepublic/bm68hsrgb/{ => rev1}/keymaps/peepeetee/keymap.h  | 0
 .../kprepublic/bm68hsrgb/{ => rev1}/keymaps/peepeetee/readme.md | 0
 keyboards/kprepublic/bm68hsrgb/{ => rev1}/keymaps/via/keymap.c  | 0
 keyboards/kprepublic/bm68hsrgb/{ => rev1}/keymaps/via/readme.md | 0
 keyboards/kprepublic/bm68hsrgb/{ => rev1}/keymaps/via/rules.mk  | 0
 keyboards/kprepublic/bm68hsrgb/{ => rev1}/readme.md             | 0
 keyboards/kprepublic/bm68hsrgb/{bm68hsrgb.c => rev1/rev1.c}     | 2 +-
 keyboards/kprepublic/bm68hsrgb/{bm68hsrgb.h => rev1/rev1.h}     | 0
 keyboards/kprepublic/bm68hsrgb/{ => rev1}/rules.mk              | 0
 30 files changed, 2 insertions(+), 2 deletions(-)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/config.h (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/info.json (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/keymaps/deadolus/config.h (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/keymaps/deadolus/keymap.c (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/keymaps/deadolus/keymap.h (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/keymaps/deadolus/readme.md (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/keymaps/deadolus/rules.mk (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/keymaps/default/keymap.c (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/keymaps/via/keymap.c (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/keymaps/via/readme.md (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/keymaps/via/rules.mk (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/readme.md (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{bm65hsrgb_iso.c => rev1/rev1.c} (99%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{bm65hsrgb_iso.h => rev1/rev1.h} (100%)
 rename keyboards/kprepublic/bm65hsrgb_iso/{ => rev1}/rules.mk (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/config.h (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/info.json (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/keymaps/default/keymap.c (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/keymaps/default/readme.md (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/keymaps/peepeetee/config.h (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/keymaps/peepeetee/keymap.c (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/keymaps/peepeetee/keymap.h (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/keymaps/peepeetee/readme.md (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/keymaps/via/keymap.c (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/keymaps/via/readme.md (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/keymaps/via/rules.mk (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/readme.md (100%)
 rename keyboards/kprepublic/bm68hsrgb/{bm68hsrgb.c => rev1/rev1.c} (99%)
 rename keyboards/kprepublic/bm68hsrgb/{bm68hsrgb.h => rev1/rev1.h} (100%)
 rename keyboards/kprepublic/bm68hsrgb/{ => rev1}/rules.mk (100%)

diff --git a/keyboards/kprepublic/bm65hsrgb_iso/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/config.h
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/config.h
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/info.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/info.json
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/info.json
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/config.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/config.h
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/config.h
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/config.h
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/keymap.c
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.c
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/keymap.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.h
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/keymap.h
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/keymap.h
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/readme.md b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/readme.md
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/readme.md
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/keymaps/deadolus/rules.mk
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/deadolus/rules.mk
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/default/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/default/keymap.c
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/via/keymap.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/keymaps/via/keymap.c
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/keymap.c
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/via/readme.md b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/keymaps/via/readme.md
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/readme.md
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/keymaps/via/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/keymaps/via/rules.mk
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/keymaps/via/rules.mk
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/readme.md b/keyboards/kprepublic/bm65hsrgb_iso/rev1/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/readme.md
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/readme.md
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.c
similarity index 99%
rename from keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.c
index 134c271824..f351fa68a8 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.c
@@ -13,7 +13,7 @@
  * 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 "bm65hsrgb_iso.h"
+#include "rev1.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.h b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.h
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.h
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/rev1.h
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rules.mk b/keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm65hsrgb_iso/rules.mk
rename to keyboards/kprepublic/bm65hsrgb_iso/rev1/rules.mk
diff --git a/keyboards/kprepublic/bm68hsrgb/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/config.h
rename to keyboards/kprepublic/bm68hsrgb/rev1/config.h
diff --git a/keyboards/kprepublic/bm68hsrgb/info.json b/keyboards/kprepublic/bm68hsrgb/rev1/info.json
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/info.json
rename to keyboards/kprepublic/bm68hsrgb/rev1/info.json
diff --git a/keyboards/kprepublic/bm68hsrgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/keymaps/default/keymap.c
rename to keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/keymap.c
diff --git a/keyboards/kprepublic/bm68hsrgb/keymaps/default/readme.md b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/keymaps/default/readme.md
rename to keyboards/kprepublic/bm68hsrgb/rev1/keymaps/default/readme.md
diff --git a/keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/config.h
rename to keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
diff --git a/keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/keymap.c
rename to keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.c
diff --git a/keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/keymap.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.h
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/keymap.h
rename to keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/keymap.h
diff --git a/keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/readme.md b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/keymaps/peepeetee/readme.md
rename to keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/readme.md
diff --git a/keyboards/kprepublic/bm68hsrgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/keymaps/via/keymap.c
rename to keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/keymap.c
diff --git a/keyboards/kprepublic/bm68hsrgb/keymaps/via/readme.md b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/keymaps/via/readme.md
rename to keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/readme.md
diff --git a/keyboards/kprepublic/bm68hsrgb/keymaps/via/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/keymaps/via/rules.mk
rename to keyboards/kprepublic/bm68hsrgb/rev1/keymaps/via/rules.mk
diff --git a/keyboards/kprepublic/bm68hsrgb/readme.md b/keyboards/kprepublic/bm68hsrgb/rev1/readme.md
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/readme.md
rename to keyboards/kprepublic/bm68hsrgb/rev1/readme.md
diff --git a/keyboards/kprepublic/bm68hsrgb/bm68hsrgb.c b/keyboards/kprepublic/bm68hsrgb/rev1/rev1.c
similarity index 99%
rename from keyboards/kprepublic/bm68hsrgb/bm68hsrgb.c
rename to keyboards/kprepublic/bm68hsrgb/rev1/rev1.c
index 734d2ee677..4634a662b6 100644
--- a/keyboards/kprepublic/bm68hsrgb/bm68hsrgb.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "bm68hsrgb.h"
+#include "rev1.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm68hsrgb/bm68hsrgb.h b/keyboards/kprepublic/bm68hsrgb/rev1/rev1.h
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/bm68hsrgb.h
rename to keyboards/kprepublic/bm68hsrgb/rev1/rev1.h
diff --git a/keyboards/kprepublic/bm68hsrgb/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev1/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm68hsrgb/rules.mk
rename to keyboards/kprepublic/bm68hsrgb/rev1/rules.mk

From 60b4ee1df37d2436e3fa9479c9bcaea72abcdcc0 Mon Sep 17 00:00:00 2001
From: yfuku <30647434+yfuku@users.noreply.github.com>
Date: Tue, 28 Dec 2021 12:34:24 +0900
Subject: [PATCH 107/867] Move to organization folder (#15481)

* move directory

* fix

* move wings42 to dailycraft

* Adjust wings42 to work with organization folder.
---
 keyboards/{ => dailycraft}/bat43/.noci        |  0
 keyboards/{ => dailycraft}/bat43/bat43.c      |  0
 keyboards/{ => dailycraft}/bat43/bat43.h      |  4 ++--
 keyboards/{ => dailycraft}/bat43/config.h     |  0
 .../bat43/keymaps/default/keymap.c            |  0
 .../bat43/keymaps/default/readme.md           |  0
 .../bat43/keymaps/via/keymap.c                |  0
 .../bat43/keymaps/via/readme.md               |  0
 .../bat43/keymaps/via/rules.mk                |  0
 keyboards/{ => dailycraft}/bat43/readme.md    | 15 +++++++++++++--
 keyboards/{ => dailycraft}/bat43/rev1/.noci   |  0
 .../{ => dailycraft}/bat43/rev1/info.json     |  0
 keyboards/{ => dailycraft}/bat43/rev1/rev1.c  |  0
 keyboards/{ => dailycraft}/bat43/rev1/rev1.h  |  0
 .../{ => dailycraft}/bat43/rev1/rules.mk      |  0
 keyboards/{ => dailycraft}/bat43/rev2/.noci   |  0
 .../{ => dailycraft}/bat43/rev2/info.json     |  0
 keyboards/{ => dailycraft}/bat43/rev2/rev2.c  |  0
 keyboards/{ => dailycraft}/bat43/rev2/rev2.h  |  0
 .../{ => dailycraft}/bat43/rev2/rules.mk      |  0
 keyboards/{ => dailycraft}/bat43/rules.mk     |  2 +-
 keyboards/{ => dailycraft}/claw44/.noci       |  0
 keyboards/{ => dailycraft}/claw44/claw44.c    |  0
 keyboards/{ => dailycraft}/claw44/claw44.h    |  2 +-
 keyboards/{ => dailycraft}/claw44/config.h    |  0
 .../claw44/keymaps/default/config.h           |  0
 .../claw44/keymaps/default/keymap.c           |  0
 .../claw44/keymaps/oled/config.h              |  0
 .../claw44/keymaps/oled/keymap.c              |  0
 .../claw44/keymaps/oled/rules.mk              |  0
 .../claw44/keymaps/via/config.h               |  0
 .../claw44/keymaps/via/keymap.c               |  0
 .../claw44/keymaps/via/rules.mk               |  0
 .../{ => dailycraft}/claw44/lib/glcdfont.c    |  0
 keyboards/{ => dailycraft}/claw44/readme.md   | 19 +++++++++++++++----
 keyboards/{ => dailycraft}/claw44/rev1/.noci  |  0
 .../{ => dailycraft}/claw44/rev1/config.h     |  0
 .../{ => dailycraft}/claw44/rev1/info.json    |  0
 .../{ => dailycraft}/claw44/rev1/readme.md    |  0
 keyboards/{ => dailycraft}/claw44/rev1/rev1.c |  0
 keyboards/{ => dailycraft}/claw44/rev1/rev1.h |  0
 .../{ => dailycraft}/claw44/rev1/rules.mk     |  0
 keyboards/{ => dailycraft}/claw44/rules.mk    |  2 +-
 keyboards/{ => dailycraft}/owl8/config.h      |  0
 keyboards/{ => dailycraft}/owl8/info.json     |  0
 .../owl8/keymaps/default/keymap.c             |  0
 .../owl8/keymaps/default/readme.md            |  0
 .../owl8/keymaps/via/keymap.c                 |  0
 .../owl8/keymaps/via/readme.md                |  0
 .../owl8/keymaps/via/rules.mk                 |  0
 keyboards/{ => dailycraft}/owl8/owl8.c        |  0
 keyboards/{ => dailycraft}/owl8/owl8.h        |  0
 keyboards/{ => dailycraft}/owl8/readme.md     | 13 ++++++++++---
 keyboards/{ => dailycraft}/owl8/rules.mk      |  0
 keyboards/{ => dailycraft}/wings42/config.h   |  0
 .../rev1 => dailycraft/wings42}/readme.md     | 13 +++++++++----
 .../{ => dailycraft}/wings42/rev1/config.h    |  0
 .../wings42/rev1/keymaps/default/keymap.c     |  0
 .../wings42/rev1/keymaps/default/readme.md    |  0
 .../wings42/rev1/keymaps/via/keymap.c         |  0
 .../wings42/rev1/keymaps/via/rules.mk         |  0
 .../wings42/rev1}/readme.md                   | 13 +++++++++----
 .../{ => dailycraft}/wings42/rev1/rev1.c      |  0
 .../{ => dailycraft}/wings42/rev1/rev1.h      |  0
 .../{ => dailycraft}/wings42/rev1/rules.mk    |  0
 .../wings42/rev1_extkeys/config.h             |  0
 .../rev1_extkeys/keymaps/default/keymap.c     |  0
 .../rev1_extkeys/keymaps/default/readme.md    |  0
 .../wings42/rev1_extkeys/keymaps/via/keymap.c |  0
 .../wings42/rev1_extkeys/keymaps/via/rules.mk |  0
 .../wings42/rev1_extkeys}/readme.md           | 13 ++++++++++---
 .../wings42/rev1_extkeys/rev1_extkeys.c       |  0
 .../wings42/rev1_extkeys/rev1_extkeys.h       |  0
 .../wings42/rev1_extkeys/rules.mk             |  0
 .../{ => dailycraft}/wings42/rev2/config.h    |  0
 .../wings42/rev2/keymaps/default/keymap.c     |  0
 .../wings42/rev2/keymaps/default/readme.md    |  0
 .../wings42/rev2/keymaps/via/config.h         |  0
 .../wings42/rev2/keymaps/via/keymap.c         |  0
 .../wings42/rev2/keymaps/via/rules.mk         |  0
 .../wings42/rev2}/readme.md                   | 13 +++++++++----
 .../{ => dailycraft}/wings42/rev2/rev2.c      |  0
 .../{ => dailycraft}/wings42/rev2/rev2.h      |  0
 .../{ => dailycraft}/wings42/rev2/rules.mk    |  0
 keyboards/{ => dailycraft}/wings42/rules.mk   |  2 +-
 keyboards/{ => dailycraft}/wings42/wings42.c  |  0
 keyboards/{ => dailycraft}/wings42/wings42.h  |  6 +++---
 87 files changed, 84 insertions(+), 33 deletions(-)
 rename keyboards/{ => dailycraft}/bat43/.noci (100%)
 rename keyboards/{ => dailycraft}/bat43/bat43.c (100%)
 rename keyboards/{ => dailycraft}/bat43/bat43.h (55%)
 rename keyboards/{ => dailycraft}/bat43/config.h (100%)
 rename keyboards/{ => dailycraft}/bat43/keymaps/default/keymap.c (100%)
 rename keyboards/{ => dailycraft}/bat43/keymaps/default/readme.md (100%)
 rename keyboards/{ => dailycraft}/bat43/keymaps/via/keymap.c (100%)
 rename keyboards/{ => dailycraft}/bat43/keymaps/via/readme.md (100%)
 rename keyboards/{ => dailycraft}/bat43/keymaps/via/rules.mk (100%)
 rename keyboards/{ => dailycraft}/bat43/readme.md (62%)
 rename keyboards/{ => dailycraft}/bat43/rev1/.noci (100%)
 rename keyboards/{ => dailycraft}/bat43/rev1/info.json (100%)
 rename keyboards/{ => dailycraft}/bat43/rev1/rev1.c (100%)
 rename keyboards/{ => dailycraft}/bat43/rev1/rev1.h (100%)
 rename keyboards/{ => dailycraft}/bat43/rev1/rules.mk (100%)
 rename keyboards/{ => dailycraft}/bat43/rev2/.noci (100%)
 rename keyboards/{ => dailycraft}/bat43/rev2/info.json (100%)
 rename keyboards/{ => dailycraft}/bat43/rev2/rev2.c (100%)
 rename keyboards/{ => dailycraft}/bat43/rev2/rev2.h (100%)
 rename keyboards/{ => dailycraft}/bat43/rev2/rules.mk (100%)
 rename keyboards/{ => dailycraft}/bat43/rules.mk (94%)
 rename keyboards/{ => dailycraft}/claw44/.noci (100%)
 rename keyboards/{ => dailycraft}/claw44/claw44.c (100%)
 rename keyboards/{ => dailycraft}/claw44/claw44.h (51%)
 rename keyboards/{ => dailycraft}/claw44/config.h (100%)
 rename keyboards/{ => dailycraft}/claw44/keymaps/default/config.h (100%)
 rename keyboards/{ => dailycraft}/claw44/keymaps/default/keymap.c (100%)
 rename keyboards/{ => dailycraft}/claw44/keymaps/oled/config.h (100%)
 rename keyboards/{ => dailycraft}/claw44/keymaps/oled/keymap.c (100%)
 rename keyboards/{ => dailycraft}/claw44/keymaps/oled/rules.mk (100%)
 rename keyboards/{ => dailycraft}/claw44/keymaps/via/config.h (100%)
 rename keyboards/{ => dailycraft}/claw44/keymaps/via/keymap.c (100%)
 rename keyboards/{ => dailycraft}/claw44/keymaps/via/rules.mk (100%)
 rename keyboards/{ => dailycraft}/claw44/lib/glcdfont.c (100%)
 rename keyboards/{ => dailycraft}/claw44/readme.md (50%)
 rename keyboards/{ => dailycraft}/claw44/rev1/.noci (100%)
 rename keyboards/{ => dailycraft}/claw44/rev1/config.h (100%)
 rename keyboards/{ => dailycraft}/claw44/rev1/info.json (100%)
 rename keyboards/{ => dailycraft}/claw44/rev1/readme.md (100%)
 rename keyboards/{ => dailycraft}/claw44/rev1/rev1.c (100%)
 rename keyboards/{ => dailycraft}/claw44/rev1/rev1.h (100%)
 rename keyboards/{ => dailycraft}/claw44/rev1/rules.mk (100%)
 rename keyboards/{ => dailycraft}/claw44/rules.mk (93%)
 rename keyboards/{ => dailycraft}/owl8/config.h (100%)
 rename keyboards/{ => dailycraft}/owl8/info.json (100%)
 rename keyboards/{ => dailycraft}/owl8/keymaps/default/keymap.c (100%)
 rename keyboards/{ => dailycraft}/owl8/keymaps/default/readme.md (100%)
 rename keyboards/{ => dailycraft}/owl8/keymaps/via/keymap.c (100%)
 rename keyboards/{ => dailycraft}/owl8/keymaps/via/readme.md (100%)
 rename keyboards/{ => dailycraft}/owl8/keymaps/via/rules.mk (100%)
 rename keyboards/{ => dailycraft}/owl8/owl8.c (100%)
 rename keyboards/{ => dailycraft}/owl8/owl8.h (100%)
 rename keyboards/{ => dailycraft}/owl8/readme.md (64%)
 rename keyboards/{ => dailycraft}/owl8/rules.mk (100%)
 rename keyboards/{ => dailycraft}/wings42/config.h (100%)
 rename keyboards/{wings42/rev1 => dailycraft/wings42}/readme.md (67%)
 rename keyboards/{ => dailycraft}/wings42/rev1/config.h (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1/keymaps/default/keymap.c (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1/keymaps/default/readme.md (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1/keymaps/via/keymap.c (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1/keymaps/via/rules.mk (100%)
 rename keyboards/{wings42/rev2 => dailycraft/wings42/rev1}/readme.md (66%)
 rename keyboards/{ => dailycraft}/wings42/rev1/rev1.c (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1/rev1.h (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1/rules.mk (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1_extkeys/config.h (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1_extkeys/keymaps/default/keymap.c (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1_extkeys/keymaps/default/readme.md (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1_extkeys/keymaps/via/keymap.c (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1_extkeys/keymaps/via/rules.mk (100%)
 rename keyboards/{wings42 => dailycraft/wings42/rev1_extkeys}/readme.md (65%)
 rename keyboards/{ => dailycraft}/wings42/rev1_extkeys/rev1_extkeys.c (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1_extkeys/rev1_extkeys.h (100%)
 rename keyboards/{ => dailycraft}/wings42/rev1_extkeys/rules.mk (100%)
 rename keyboards/{ => dailycraft}/wings42/rev2/config.h (100%)
 rename keyboards/{ => dailycraft}/wings42/rev2/keymaps/default/keymap.c (100%)
 rename keyboards/{ => dailycraft}/wings42/rev2/keymaps/default/readme.md (100%)
 rename keyboards/{ => dailycraft}/wings42/rev2/keymaps/via/config.h (100%)
 rename keyboards/{ => dailycraft}/wings42/rev2/keymaps/via/keymap.c (100%)
 rename keyboards/{ => dailycraft}/wings42/rev2/keymaps/via/rules.mk (100%)
 rename keyboards/{wings42/rev1_extkeys => dailycraft/wings42/rev2}/readme.md (67%)
 rename keyboards/{ => dailycraft}/wings42/rev2/rev2.c (100%)
 rename keyboards/{ => dailycraft}/wings42/rev2/rev2.h (100%)
 rename keyboards/{ => dailycraft}/wings42/rev2/rules.mk (100%)
 rename keyboards/{ => dailycraft}/wings42/rules.mk (94%)
 rename keyboards/{ => dailycraft}/wings42/wings42.c (100%)
 rename keyboards/{ => dailycraft}/wings42/wings42.h (86%)

diff --git a/keyboards/bat43/.noci b/keyboards/dailycraft/bat43/.noci
similarity index 100%
rename from keyboards/bat43/.noci
rename to keyboards/dailycraft/bat43/.noci
diff --git a/keyboards/bat43/bat43.c b/keyboards/dailycraft/bat43/bat43.c
similarity index 100%
rename from keyboards/bat43/bat43.c
rename to keyboards/dailycraft/bat43/bat43.c
diff --git a/keyboards/bat43/bat43.h b/keyboards/dailycraft/bat43/bat43.h
similarity index 55%
rename from keyboards/bat43/bat43.h
rename to keyboards/dailycraft/bat43/bat43.h
index 42d44107b4..046788a0a1 100644
--- a/keyboards/bat43/bat43.h
+++ b/keyboards/dailycraft/bat43/bat43.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#ifdef KEYBOARD_bat43_rev1
+#ifdef KEYBOARD_dailycraft_bat43_rev1
     #include "rev1.h"
 #endif
-#ifdef KEYBOARD_bat43_rev2
+#ifdef KEYBOARD_dailycraft_bat43_rev2
     #include "rev2.h"
 #endif
 
diff --git a/keyboards/bat43/config.h b/keyboards/dailycraft/bat43/config.h
similarity index 100%
rename from keyboards/bat43/config.h
rename to keyboards/dailycraft/bat43/config.h
diff --git a/keyboards/bat43/keymaps/default/keymap.c b/keyboards/dailycraft/bat43/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bat43/keymaps/default/keymap.c
rename to keyboards/dailycraft/bat43/keymaps/default/keymap.c
diff --git a/keyboards/bat43/keymaps/default/readme.md b/keyboards/dailycraft/bat43/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bat43/keymaps/default/readme.md
rename to keyboards/dailycraft/bat43/keymaps/default/readme.md
diff --git a/keyboards/bat43/keymaps/via/keymap.c b/keyboards/dailycraft/bat43/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bat43/keymaps/via/keymap.c
rename to keyboards/dailycraft/bat43/keymaps/via/keymap.c
diff --git a/keyboards/bat43/keymaps/via/readme.md b/keyboards/dailycraft/bat43/keymaps/via/readme.md
similarity index 100%
rename from keyboards/bat43/keymaps/via/readme.md
rename to keyboards/dailycraft/bat43/keymaps/via/readme.md
diff --git a/keyboards/bat43/keymaps/via/rules.mk b/keyboards/dailycraft/bat43/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bat43/keymaps/via/rules.mk
rename to keyboards/dailycraft/bat43/keymaps/via/rules.mk
diff --git a/keyboards/bat43/readme.md b/keyboards/dailycraft/bat43/readme.md
similarity index 62%
rename from keyboards/bat43/readme.md
rename to keyboards/dailycraft/bat43/readme.md
index 7097aa7af5..6b58aa5ca3 100644
--- a/keyboards/bat43/readme.md
+++ b/keyboards/dailycraft/bat43/readme.md
@@ -6,10 +6,21 @@ A 43-key keyboard.
 
 * Keyboard Maintainer: [yfuku](https://github.com/yfuku)
 * Hardware Supported: bat43 PCB, Pro Micro
-* Hardware Availability: https://yfuku.booth.pm/
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bat43:default
+    make dailycraft/bat43:default
+
+Flashing example for this keyboard:
+
+    make dailycraft/bat43:default:flash
 
 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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/bat43/rev1/.noci b/keyboards/dailycraft/bat43/rev1/.noci
similarity index 100%
rename from keyboards/bat43/rev1/.noci
rename to keyboards/dailycraft/bat43/rev1/.noci
diff --git a/keyboards/bat43/rev1/info.json b/keyboards/dailycraft/bat43/rev1/info.json
similarity index 100%
rename from keyboards/bat43/rev1/info.json
rename to keyboards/dailycraft/bat43/rev1/info.json
diff --git a/keyboards/bat43/rev1/rev1.c b/keyboards/dailycraft/bat43/rev1/rev1.c
similarity index 100%
rename from keyboards/bat43/rev1/rev1.c
rename to keyboards/dailycraft/bat43/rev1/rev1.c
diff --git a/keyboards/bat43/rev1/rev1.h b/keyboards/dailycraft/bat43/rev1/rev1.h
similarity index 100%
rename from keyboards/bat43/rev1/rev1.h
rename to keyboards/dailycraft/bat43/rev1/rev1.h
diff --git a/keyboards/bat43/rev1/rules.mk b/keyboards/dailycraft/bat43/rev1/rules.mk
similarity index 100%
rename from keyboards/bat43/rev1/rules.mk
rename to keyboards/dailycraft/bat43/rev1/rules.mk
diff --git a/keyboards/bat43/rev2/.noci b/keyboards/dailycraft/bat43/rev2/.noci
similarity index 100%
rename from keyboards/bat43/rev2/.noci
rename to keyboards/dailycraft/bat43/rev2/.noci
diff --git a/keyboards/bat43/rev2/info.json b/keyboards/dailycraft/bat43/rev2/info.json
similarity index 100%
rename from keyboards/bat43/rev2/info.json
rename to keyboards/dailycraft/bat43/rev2/info.json
diff --git a/keyboards/bat43/rev2/rev2.c b/keyboards/dailycraft/bat43/rev2/rev2.c
similarity index 100%
rename from keyboards/bat43/rev2/rev2.c
rename to keyboards/dailycraft/bat43/rev2/rev2.c
diff --git a/keyboards/bat43/rev2/rev2.h b/keyboards/dailycraft/bat43/rev2/rev2.h
similarity index 100%
rename from keyboards/bat43/rev2/rev2.h
rename to keyboards/dailycraft/bat43/rev2/rev2.h
diff --git a/keyboards/bat43/rev2/rules.mk b/keyboards/dailycraft/bat43/rev2/rules.mk
similarity index 100%
rename from keyboards/bat43/rev2/rules.mk
rename to keyboards/dailycraft/bat43/rev2/rules.mk
diff --git a/keyboards/bat43/rules.mk b/keyboards/dailycraft/bat43/rules.mk
similarity index 94%
rename from keyboards/bat43/rules.mk
rename to keyboards/dailycraft/bat43/rules.mk
index 7bd7394e4f..c2e1c5755f 100644
--- a/keyboards/bat43/rules.mk
+++ b/keyboards/dailycraft/bat43/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-DEFAULT_FOLDER = bat43/rev2
+DEFAULT_FOLDER = dailycraft/bat43/rev2
diff --git a/keyboards/claw44/.noci b/keyboards/dailycraft/claw44/.noci
similarity index 100%
rename from keyboards/claw44/.noci
rename to keyboards/dailycraft/claw44/.noci
diff --git a/keyboards/claw44/claw44.c b/keyboards/dailycraft/claw44/claw44.c
similarity index 100%
rename from keyboards/claw44/claw44.c
rename to keyboards/dailycraft/claw44/claw44.c
diff --git a/keyboards/claw44/claw44.h b/keyboards/dailycraft/claw44/claw44.h
similarity index 51%
rename from keyboards/claw44/claw44.h
rename to keyboards/dailycraft/claw44/claw44.h
index 4ca25fcb2b..76ecda6e90 100644
--- a/keyboards/claw44/claw44.h
+++ b/keyboards/dailycraft/claw44/claw44.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#ifdef KEYBOARD_claw44_rev1
+#ifdef KEYBOARD_dailycraft_claw44_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/claw44/config.h b/keyboards/dailycraft/claw44/config.h
similarity index 100%
rename from keyboards/claw44/config.h
rename to keyboards/dailycraft/claw44/config.h
diff --git a/keyboards/claw44/keymaps/default/config.h b/keyboards/dailycraft/claw44/keymaps/default/config.h
similarity index 100%
rename from keyboards/claw44/keymaps/default/config.h
rename to keyboards/dailycraft/claw44/keymaps/default/config.h
diff --git a/keyboards/claw44/keymaps/default/keymap.c b/keyboards/dailycraft/claw44/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/claw44/keymaps/default/keymap.c
rename to keyboards/dailycraft/claw44/keymaps/default/keymap.c
diff --git a/keyboards/claw44/keymaps/oled/config.h b/keyboards/dailycraft/claw44/keymaps/oled/config.h
similarity index 100%
rename from keyboards/claw44/keymaps/oled/config.h
rename to keyboards/dailycraft/claw44/keymaps/oled/config.h
diff --git a/keyboards/claw44/keymaps/oled/keymap.c b/keyboards/dailycraft/claw44/keymaps/oled/keymap.c
similarity index 100%
rename from keyboards/claw44/keymaps/oled/keymap.c
rename to keyboards/dailycraft/claw44/keymaps/oled/keymap.c
diff --git a/keyboards/claw44/keymaps/oled/rules.mk b/keyboards/dailycraft/claw44/keymaps/oled/rules.mk
similarity index 100%
rename from keyboards/claw44/keymaps/oled/rules.mk
rename to keyboards/dailycraft/claw44/keymaps/oled/rules.mk
diff --git a/keyboards/claw44/keymaps/via/config.h b/keyboards/dailycraft/claw44/keymaps/via/config.h
similarity index 100%
rename from keyboards/claw44/keymaps/via/config.h
rename to keyboards/dailycraft/claw44/keymaps/via/config.h
diff --git a/keyboards/claw44/keymaps/via/keymap.c b/keyboards/dailycraft/claw44/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/claw44/keymaps/via/keymap.c
rename to keyboards/dailycraft/claw44/keymaps/via/keymap.c
diff --git a/keyboards/claw44/keymaps/via/rules.mk b/keyboards/dailycraft/claw44/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/claw44/keymaps/via/rules.mk
rename to keyboards/dailycraft/claw44/keymaps/via/rules.mk
diff --git a/keyboards/claw44/lib/glcdfont.c b/keyboards/dailycraft/claw44/lib/glcdfont.c
similarity index 100%
rename from keyboards/claw44/lib/glcdfont.c
rename to keyboards/dailycraft/claw44/lib/glcdfont.c
diff --git a/keyboards/claw44/readme.md b/keyboards/dailycraft/claw44/readme.md
similarity index 50%
rename from keyboards/claw44/readme.md
rename to keyboards/dailycraft/claw44/readme.md
index 7e72e08971..e533bd7c82 100644
--- a/keyboards/claw44/readme.md
+++ b/keyboards/dailycraft/claw44/readme.md
@@ -4,12 +4,23 @@
 
 A split keyboard with 3x6 vertically staggered keys and 4 thumb keys.
 
-Keyboard Maintainer: [@yfuku_](https://twitter.com/yfuku_)  
-Hardware Supported: Claw44 PCB, ProMicro  
-Hardware Availability: https://yfuku.booth.pm/  
+* Keyboard Maintainer: [yfuku](https://github.com/yfuku)
+* Hardware Supported: Claw44 PCB, ProMicro
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make claw44:default
+    make dailycraft/claw44:default
+
+Flashing example for this keyboard:
+
+    make dailycraft/claw44:default:flash
 
 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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/claw44/rev1/.noci b/keyboards/dailycraft/claw44/rev1/.noci
similarity index 100%
rename from keyboards/claw44/rev1/.noci
rename to keyboards/dailycraft/claw44/rev1/.noci
diff --git a/keyboards/claw44/rev1/config.h b/keyboards/dailycraft/claw44/rev1/config.h
similarity index 100%
rename from keyboards/claw44/rev1/config.h
rename to keyboards/dailycraft/claw44/rev1/config.h
diff --git a/keyboards/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json
similarity index 100%
rename from keyboards/claw44/rev1/info.json
rename to keyboards/dailycraft/claw44/rev1/info.json
diff --git a/keyboards/claw44/rev1/readme.md b/keyboards/dailycraft/claw44/rev1/readme.md
similarity index 100%
rename from keyboards/claw44/rev1/readme.md
rename to keyboards/dailycraft/claw44/rev1/readme.md
diff --git a/keyboards/claw44/rev1/rev1.c b/keyboards/dailycraft/claw44/rev1/rev1.c
similarity index 100%
rename from keyboards/claw44/rev1/rev1.c
rename to keyboards/dailycraft/claw44/rev1/rev1.c
diff --git a/keyboards/claw44/rev1/rev1.h b/keyboards/dailycraft/claw44/rev1/rev1.h
similarity index 100%
rename from keyboards/claw44/rev1/rev1.h
rename to keyboards/dailycraft/claw44/rev1/rev1.h
diff --git a/keyboards/claw44/rev1/rules.mk b/keyboards/dailycraft/claw44/rev1/rules.mk
similarity index 100%
rename from keyboards/claw44/rev1/rules.mk
rename to keyboards/dailycraft/claw44/rev1/rules.mk
diff --git a/keyboards/claw44/rules.mk b/keyboards/dailycraft/claw44/rules.mk
similarity index 93%
rename from keyboards/claw44/rules.mk
rename to keyboards/dailycraft/claw44/rules.mk
index 6ba5e853fb..69c59f28e6 100644
--- a/keyboards/claw44/rules.mk
+++ b/keyboards/dailycraft/claw44/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight. 
 
-DEFAULT_FOLDER = claw44/rev1
+DEFAULT_FOLDER = dailycraft/claw44/rev1
diff --git a/keyboards/owl8/config.h b/keyboards/dailycraft/owl8/config.h
similarity index 100%
rename from keyboards/owl8/config.h
rename to keyboards/dailycraft/owl8/config.h
diff --git a/keyboards/owl8/info.json b/keyboards/dailycraft/owl8/info.json
similarity index 100%
rename from keyboards/owl8/info.json
rename to keyboards/dailycraft/owl8/info.json
diff --git a/keyboards/owl8/keymaps/default/keymap.c b/keyboards/dailycraft/owl8/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/owl8/keymaps/default/keymap.c
rename to keyboards/dailycraft/owl8/keymaps/default/keymap.c
diff --git a/keyboards/owl8/keymaps/default/readme.md b/keyboards/dailycraft/owl8/keymaps/default/readme.md
similarity index 100%
rename from keyboards/owl8/keymaps/default/readme.md
rename to keyboards/dailycraft/owl8/keymaps/default/readme.md
diff --git a/keyboards/owl8/keymaps/via/keymap.c b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/owl8/keymaps/via/keymap.c
rename to keyboards/dailycraft/owl8/keymaps/via/keymap.c
diff --git a/keyboards/owl8/keymaps/via/readme.md b/keyboards/dailycraft/owl8/keymaps/via/readme.md
similarity index 100%
rename from keyboards/owl8/keymaps/via/readme.md
rename to keyboards/dailycraft/owl8/keymaps/via/readme.md
diff --git a/keyboards/owl8/keymaps/via/rules.mk b/keyboards/dailycraft/owl8/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/owl8/keymaps/via/rules.mk
rename to keyboards/dailycraft/owl8/keymaps/via/rules.mk
diff --git a/keyboards/owl8/owl8.c b/keyboards/dailycraft/owl8/owl8.c
similarity index 100%
rename from keyboards/owl8/owl8.c
rename to keyboards/dailycraft/owl8/owl8.c
diff --git a/keyboards/owl8/owl8.h b/keyboards/dailycraft/owl8/owl8.h
similarity index 100%
rename from keyboards/owl8/owl8.h
rename to keyboards/dailycraft/owl8/owl8.h
diff --git a/keyboards/owl8/readme.md b/keyboards/dailycraft/owl8/readme.md
similarity index 64%
rename from keyboards/owl8/readme.md
rename to keyboards/dailycraft/owl8/readme.md
index b40a5f35cb..c7fab17476 100644
--- a/keyboards/owl8/readme.md
+++ b/keyboards/dailycraft/owl8/readme.md
@@ -6,14 +6,21 @@ macropad
 
 * Keyboard Maintainer: [yfuku](https://github.com/yfuku)
 * Hardware Supported: owl8 PCB, Pro Micro
-* Hardware Availability: https://yfuku.booth.pm/
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make owl8:default
+    make dailycraft/owl8:default
 
 Flashing example for this keyboard:
 
-    make owl8:default:flash
+    make dailycraft/owl8:default:flash
 
 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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/owl8/rules.mk b/keyboards/dailycraft/owl8/rules.mk
similarity index 100%
rename from keyboards/owl8/rules.mk
rename to keyboards/dailycraft/owl8/rules.mk
diff --git a/keyboards/wings42/config.h b/keyboards/dailycraft/wings42/config.h
similarity index 100%
rename from keyboards/wings42/config.h
rename to keyboards/dailycraft/wings42/config.h
diff --git a/keyboards/wings42/rev1/readme.md b/keyboards/dailycraft/wings42/readme.md
similarity index 67%
rename from keyboards/wings42/rev1/readme.md
rename to keyboards/dailycraft/wings42/readme.md
index 4ddfe3e83c..c919653397 100644
--- a/keyboards/wings42/rev1/readme.md
+++ b/keyboards/dailycraft/wings42/readme.md
@@ -6,16 +6,21 @@ A split keyboard with 3x6 vertically staggered keys and 3 thumb keys.
 
 * Keyboard Maintainer: [yfuku](https://github.com/yfuku)
 * Hardware Supported: wings42 PCB, Pro Micro
-* Hardware Availability: https://yfuku.booth.pm/
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wings42/rev1:default
+    make dailycraft/wings42:default
 
 Flashing example for this keyboard:
 
-    make wings42/rev1:default:flash
+    make dailycraft/wings42:default:flash
 
 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 build guide for this keyboard can be found here: [wings42 build guide](https://yfuku.com/wings42/buildguide/)
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h
similarity index 100%
rename from keyboards/wings42/rev1/config.h
rename to keyboards/dailycraft/wings42/rev1/config.h
diff --git a/keyboards/wings42/rev1/keymaps/default/keymap.c b/keyboards/dailycraft/wings42/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/wings42/rev1/keymaps/default/keymap.c
rename to keyboards/dailycraft/wings42/rev1/keymaps/default/keymap.c
diff --git a/keyboards/wings42/rev1/keymaps/default/readme.md b/keyboards/dailycraft/wings42/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/wings42/rev1/keymaps/default/readme.md
rename to keyboards/dailycraft/wings42/rev1/keymaps/default/readme.md
diff --git a/keyboards/wings42/rev1/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/wings42/rev1/keymaps/via/keymap.c
rename to keyboards/dailycraft/wings42/rev1/keymaps/via/keymap.c
diff --git a/keyboards/wings42/rev1/keymaps/via/rules.mk b/keyboards/dailycraft/wings42/rev1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/wings42/rev1/keymaps/via/rules.mk
rename to keyboards/dailycraft/wings42/rev1/keymaps/via/rules.mk
diff --git a/keyboards/wings42/rev2/readme.md b/keyboards/dailycraft/wings42/rev1/readme.md
similarity index 66%
rename from keyboards/wings42/rev2/readme.md
rename to keyboards/dailycraft/wings42/rev1/readme.md
index 158372feb4..959052c41d 100644
--- a/keyboards/wings42/rev2/readme.md
+++ b/keyboards/dailycraft/wings42/rev1/readme.md
@@ -6,16 +6,21 @@ A split keyboard with 3x6 vertically staggered keys and 3 thumb keys.
 
 * Keyboard Maintainer: [yfuku](https://github.com/yfuku)
 * Hardware Supported: wings42 PCB, Pro Micro
-* Hardware Availability: https://yfuku.booth.pm/
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wings42:default
+    make dailycraft/wings42/rev1:default
 
 Flashing example for this keyboard:
 
-    make wings42:default:flash
+    make dailycraft/wings42/rev1:default:flash
 
 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 build guide for this keyboard can be found here: [wings42 build guide](https://yfuku.com/wings42/buildguide/)
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/wings42/rev1/rev1.c b/keyboards/dailycraft/wings42/rev1/rev1.c
similarity index 100%
rename from keyboards/wings42/rev1/rev1.c
rename to keyboards/dailycraft/wings42/rev1/rev1.c
diff --git a/keyboards/wings42/rev1/rev1.h b/keyboards/dailycraft/wings42/rev1/rev1.h
similarity index 100%
rename from keyboards/wings42/rev1/rev1.h
rename to keyboards/dailycraft/wings42/rev1/rev1.h
diff --git a/keyboards/wings42/rev1/rules.mk b/keyboards/dailycraft/wings42/rev1/rules.mk
similarity index 100%
rename from keyboards/wings42/rev1/rules.mk
rename to keyboards/dailycraft/wings42/rev1/rules.mk
diff --git a/keyboards/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
similarity index 100%
rename from keyboards/wings42/rev1_extkeys/config.h
rename to keyboards/dailycraft/wings42/rev1_extkeys/config.h
diff --git a/keyboards/wings42/rev1_extkeys/keymaps/default/keymap.c b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/wings42/rev1_extkeys/keymaps/default/keymap.c
rename to keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/keymap.c
diff --git a/keyboards/wings42/rev1_extkeys/keymaps/default/readme.md b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/readme.md
similarity index 100%
rename from keyboards/wings42/rev1_extkeys/keymaps/default/readme.md
rename to keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/readme.md
diff --git a/keyboards/wings42/rev1_extkeys/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/wings42/rev1_extkeys/keymaps/via/keymap.c
rename to keyboards/dailycraft/wings42/rev1_extkeys/keymaps/via/keymap.c
diff --git a/keyboards/wings42/rev1_extkeys/keymaps/via/rules.mk b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/wings42/rev1_extkeys/keymaps/via/rules.mk
rename to keyboards/dailycraft/wings42/rev1_extkeys/keymaps/via/rules.mk
diff --git a/keyboards/wings42/readme.md b/keyboards/dailycraft/wings42/rev1_extkeys/readme.md
similarity index 65%
rename from keyboards/wings42/readme.md
rename to keyboards/dailycraft/wings42/rev1_extkeys/readme.md
index fc71d58ab6..4a34063ad4 100644
--- a/keyboards/wings42/readme.md
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/readme.md
@@ -6,14 +6,21 @@ A split keyboard with 3x6 vertically staggered keys and 3 thumb keys.
 
 * Keyboard Maintainer: [yfuku](https://github.com/yfuku)
 * Hardware Supported: wings42 PCB, Pro Micro
-* Hardware Availability: https://yfuku.booth.pm/
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wings42:default
+    make dailycraft/wings42/rev1_extkeys:default
 
 Flashing example for this keyboard:
 
-    make wings42:default:flash
+    make dailycraft/wings42/rev1_extkeys:default:flash
 
 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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/wings42/rev1_extkeys/rev1_extkeys.c b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c
similarity index 100%
rename from keyboards/wings42/rev1_extkeys/rev1_extkeys.c
rename to keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c
diff --git a/keyboards/wings42/rev1_extkeys/rev1_extkeys.h b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h
similarity index 100%
rename from keyboards/wings42/rev1_extkeys/rev1_extkeys.h
rename to keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h
diff --git a/keyboards/wings42/rev1_extkeys/rules.mk b/keyboards/dailycraft/wings42/rev1_extkeys/rules.mk
similarity index 100%
rename from keyboards/wings42/rev1_extkeys/rules.mk
rename to keyboards/dailycraft/wings42/rev1_extkeys/rules.mk
diff --git a/keyboards/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h
similarity index 100%
rename from keyboards/wings42/rev2/config.h
rename to keyboards/dailycraft/wings42/rev2/config.h
diff --git a/keyboards/wings42/rev2/keymaps/default/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/wings42/rev2/keymaps/default/keymap.c
rename to keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
diff --git a/keyboards/wings42/rev2/keymaps/default/readme.md b/keyboards/dailycraft/wings42/rev2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/wings42/rev2/keymaps/default/readme.md
rename to keyboards/dailycraft/wings42/rev2/keymaps/default/readme.md
diff --git a/keyboards/wings42/rev2/keymaps/via/config.h b/keyboards/dailycraft/wings42/rev2/keymaps/via/config.h
similarity index 100%
rename from keyboards/wings42/rev2/keymaps/via/config.h
rename to keyboards/dailycraft/wings42/rev2/keymaps/via/config.h
diff --git a/keyboards/wings42/rev2/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/wings42/rev2/keymaps/via/keymap.c
rename to keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
diff --git a/keyboards/wings42/rev2/keymaps/via/rules.mk b/keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/wings42/rev2/keymaps/via/rules.mk
rename to keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk
diff --git a/keyboards/wings42/rev1_extkeys/readme.md b/keyboards/dailycraft/wings42/rev2/readme.md
similarity index 67%
rename from keyboards/wings42/rev1_extkeys/readme.md
rename to keyboards/dailycraft/wings42/rev2/readme.md
index 7be464a141..c919653397 100644
--- a/keyboards/wings42/rev1_extkeys/readme.md
+++ b/keyboards/dailycraft/wings42/rev2/readme.md
@@ -6,16 +6,21 @@ A split keyboard with 3x6 vertically staggered keys and 3 thumb keys.
 
 * Keyboard Maintainer: [yfuku](https://github.com/yfuku)
 * Hardware Supported: wings42 PCB, Pro Micro
-* Hardware Availability: https://yfuku.booth.pm/
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make make wings42/rev1_extkeys:default
+    make dailycraft/wings42:default
 
 Flashing example for this keyboard:
 
-    make make wings42/rev1_extkeys:default:flash
+    make dailycraft/wings42:default:flash
 
 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 build guide for this keyboard can be found here: [wings42 build guide](https://yfuku.com/wings42/buildguide/)
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/wings42/rev2/rev2.c b/keyboards/dailycraft/wings42/rev2/rev2.c
similarity index 100%
rename from keyboards/wings42/rev2/rev2.c
rename to keyboards/dailycraft/wings42/rev2/rev2.c
diff --git a/keyboards/wings42/rev2/rev2.h b/keyboards/dailycraft/wings42/rev2/rev2.h
similarity index 100%
rename from keyboards/wings42/rev2/rev2.h
rename to keyboards/dailycraft/wings42/rev2/rev2.h
diff --git a/keyboards/wings42/rev2/rules.mk b/keyboards/dailycraft/wings42/rev2/rules.mk
similarity index 100%
rename from keyboards/wings42/rev2/rules.mk
rename to keyboards/dailycraft/wings42/rev2/rules.mk
diff --git a/keyboards/wings42/rules.mk b/keyboards/dailycraft/wings42/rules.mk
similarity index 94%
rename from keyboards/wings42/rules.mk
rename to keyboards/dailycraft/wings42/rules.mk
index 74e894efec..94459dbcc5 100644
--- a/keyboards/wings42/rules.mk
+++ b/keyboards/dailycraft/wings42/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = wings42/rev2
+DEFAULT_FOLDER = dailycraft/wings42/rev2
diff --git a/keyboards/wings42/wings42.c b/keyboards/dailycraft/wings42/wings42.c
similarity index 100%
rename from keyboards/wings42/wings42.c
rename to keyboards/dailycraft/wings42/wings42.c
diff --git a/keyboards/wings42/wings42.h b/keyboards/dailycraft/wings42/wings42.h
similarity index 86%
rename from keyboards/wings42/wings42.h
rename to keyboards/dailycraft/wings42/wings42.h
index 9412b7117a..d839f04884 100644
--- a/keyboards/wings42/wings42.h
+++ b/keyboards/dailycraft/wings42/wings42.h
@@ -18,13 +18,13 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_wings42_rev1
+#ifdef KEYBOARD_dailycraft_wings42_rev1
 #    include "rev1.h"
 #endif
-#ifdef KEYBOARD_wings42_rev1_extkeys
+#ifdef KEYBOARD_dailycraft_wings42_rev1_extkeys
 #    include "rev1_extkeys.h"
 #endif
-#ifdef KEYBOARD_wings42_rev2
+#ifdef KEYBOARD_dailycraft_wings42_rev2
 #    include "rev2.h"
 #endif
 

From 6aa0c15fcad93c6b74d48165a8e3901ac8a91544 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 27 Dec 2021 19:35:07 -0800
Subject: [PATCH 108/867] [Keyboard] Fix over sized compiliation for
 Bandiominedoni via keymap (#15607)

---
 keyboards/bandominedoni/keymaps/via/rules.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/bandominedoni/keymaps/via/rules.mk b/keyboards/bandominedoni/keymaps/via/rules.mk
index 95d7690567..71eb1ebf8e 100644
--- a/keyboards/bandominedoni/keymaps/via/rules.mk
+++ b/keyboards/bandominedoni/keymaps/via/rules.mk
@@ -1,4 +1,3 @@
 RGB_MATRIX_ENABLE = yes      # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.)
 RGB_MATRIX_CUSTOM_KB = yes   #
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = yes        # Mouse keys

From 787f15b58f099949cbcc3ef4bfea255c6185d708 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 27 Dec 2021 21:13:11 -0800
Subject: [PATCH 109/867] [Keyboard] Fix sendyyeah/pix oled task function type
 (#15608)

---
 keyboards/sendyyeah/pix/keymaps/default/keymap.c | 2 +-
 keyboards/sendyyeah/pix/keymaps/via/keymap.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/sendyyeah/pix/keymaps/default/keymap.c b/keyboards/sendyyeah/pix/keymaps/default/keymap.c
index 951aadeae8..75914a0b0f 100644
--- a/keyboards/sendyyeah/pix/keymaps/default/keymap.c
+++ b/keyboards/sendyyeah/pix/keymaps/default/keymap.c
@@ -215,7 +215,7 @@ void draw_sat_icon(int key_position, int row) {
     oled_write_P(ICON_SAT_1, false);
 }
 
-void oled_task_user(void) {
+bool oled_task_user(void) {
     // Host Keyboard Layer Status
     static const char PROGMEM ICON_LAYER[] = {0x80, 0x81, 0x82, 0x83, 0};
     static const char PROGMEM ICON_ENCODER[] = {0x84, 0x85, 0x86, 0x87, 0};
diff --git a/keyboards/sendyyeah/pix/keymaps/via/keymap.c b/keyboards/sendyyeah/pix/keymaps/via/keymap.c
index 951aadeae8..75914a0b0f 100644
--- a/keyboards/sendyyeah/pix/keymaps/via/keymap.c
+++ b/keyboards/sendyyeah/pix/keymaps/via/keymap.c
@@ -215,7 +215,7 @@ void draw_sat_icon(int key_position, int row) {
     oled_write_P(ICON_SAT_1, false);
 }
 
-void oled_task_user(void) {
+bool oled_task_user(void) {
     // Host Keyboard Layer Status
     static const char PROGMEM ICON_LAYER[] = {0x80, 0x81, 0x82, 0x83, 0};
     static const char PROGMEM ICON_ENCODER[] = {0x84, 0x85, 0x86, 0x87, 0};

From 3dee6e28dd2fce27945bd464f5a80d3508e7c1d4 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Wed, 29 Dec 2021 05:00:49 +0800
Subject: [PATCH 110/867] [Docs] Clarify placement and usage of RGB matrix
 effect inc files (#15572)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: filterpaper <filterpaper@localhost>
---
 docs/feature_rgb_matrix.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 3132360a38..3a40be5f5e 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -554,12 +554,11 @@ In order to change the delay of temperature decrease define
 
 ## Custom RGB Matrix Effects :id=custom-rgb-matrix-effects
 
-By setting `RGB_MATRIX_CUSTOM_USER` (and/or `RGB_MATRIX_CUSTOM_KB`) in `rules.mk`, new effects can be defined directly from userspace, without having to edit any QMK core files.
+By setting `RGB_MATRIX_CUSTOM_USER = yes` in `rules.mk`, new effects can be defined directly from your keymap or userspace, without having to edit any QMK core files.
 
-To declare new effects, create a new `rgb_matrix_user/kb.inc` that looks something like this:
+To declare new effects, create a `rgb_matrix_user.inc` file in the user keymap directory or userspace folder.
 
-`rgb_matrix_user.inc` should go in the root of the keymap directory.
-`rgb_matrix_kb.inc` should go in the root of the keyboard directory.
+?> Hardware maintainers who want to limit custom effects to a specific keyboard can create a `rgb_matrix_kb.inc` file in the root of the keyboard directory, and add `RGB_MATRIX_CUSTOM_KB = yes` to the keyboard level `rules.mk`.
 
 To use custom effects in your code, simply prepend `RGB_MATRIX_CUSTOM_` to the effect name specified in `RGB_MATRIX_EFFECT()`. For example, an effect declared as `RGB_MATRIX_EFFECT(my_cool_effect)` would be referenced with:
 

From 9d801cb03db7d5f11d1b82a22f401e30c343d0ee Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 28 Dec 2021 20:25:06 -0800
Subject: [PATCH 111/867] [Keyboard] Update Tractyl Manuform to use Split
 Pointing Device Sync

---
 .../tractyl_manuform/5x6_right/config.h       |   1 -
 .../5x6_right/keymaps/drashna/keymap.c        |   2 +-
 .../tractyl_manuform/5x6_right/rules.mk       |   2 -
 keyboards/handwired/tractyl_manuform/config.h |   5 +-
 .../handwired/tractyl_manuform/tm_sync.c      | 180 ------------------
 .../tractyl_manuform/tractyl_manuform.c       |  56 ++++--
 .../tractyl_manuform/tractyl_manuform.h       |  15 +-
 users/drashna/oled/oled_stuff.c               |  13 +-
 users/drashna/oled/oled_stuff.h               |   2 +-
 9 files changed, 65 insertions(+), 211 deletions(-)
 delete mode 100644 keyboards/handwired/tractyl_manuform/tm_sync.c

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
index d7618912f7..b9d8e86c09 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
@@ -52,5 +52,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define OLED_DISPLAY_128X64
 
-#define POINTING_DEVICE_TASK_THROTTLE
 #define POINTING_DEVICE_RIGHT
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
index 958f694172..65f8a5260d 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -301,7 +301,7 @@ void oled_driver_render_logo_left(void) {
 #    endif
     oled_set_cursor(6, 3);
 #    if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right)
-    render_pointing_dpi_status(0);
+    render_pointing_dpi_status(kb_config_data.device_cpi, 0);
 #    endif
     oled_set_cursor(0, 4);
 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
index 37bbbb4dae..a689be3dd5 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
@@ -18,6 +18,4 @@ MOUSE_SHARED_EP = yes
 
 SPLIT_KEYBOARD = yes
 
-QUANTUM_LIB_SRC += tm_sync.c
-
 DEFAULT_FOLDER = handwired/tractyl_manuform/5x6_right/teensy2pp
diff --git a/keyboards/handwired/tractyl_manuform/config.h b/keyboards/handwired/tractyl_manuform/config.h
index cc8a7546f4..15c8102b8f 100644
--- a/keyboards/handwired/tractyl_manuform/config.h
+++ b/keyboards/handwired/tractyl_manuform/config.h
@@ -39,4 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-#define SPLIT_TRANSACTION_IDS_KB RPC_ID_KB_CONFIG_SYNC, RPC_ID_POINTER_STATE_SYNC
+#define SPLIT_POINTING_ENABLE
+#define POINTING_DEVICE_TASK_THROTTLE_MS 1
+
+#define SPLIT_TRANSACTION_IDS_KB RPC_ID_KB_CONFIG_SYNC
diff --git a/keyboards/handwired/tractyl_manuform/tm_sync.c b/keyboards/handwired/tractyl_manuform/tm_sync.c
deleted file mode 100644
index 549a17a22f..0000000000
--- a/keyboards/handwired/tractyl_manuform/tm_sync.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- * Copyright 2021 Dasky (@daskygit)
-
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-#include "pointing_device.h"
-#include "transactions.h"
-#include <string.h>
-#ifdef MOUSEKEY_ENABLE
-#    include "mousekey.h"
-#endif
-
-// typedef struct {
-//     uint16_t device_cpi;
-// } kb_config_data_t;
-
-kb_config_data_t                      kb_config;
-static report_mouse_t                 shared_mouse_report;
-extern const pointing_device_driver_t pointing_device_driver;
-
-void kb_pointer_sync_handler(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
-    shared_mouse_report = pointing_device_driver.get_report(shared_mouse_report);
-    memcpy(target2initiator_buffer, &shared_mouse_report, sizeof(report_mouse_t));
-    shared_mouse_report.x = 0;
-    shared_mouse_report.y = 0;
-    shared_mouse_report.h = 0;
-    shared_mouse_report.v = 0;
-}
-
-void kb_config_sync_handler(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
-    if (initiator2target_buffer_size == sizeof(kb_config)) {
-        memcpy(&kb_config, initiator2target_buffer, sizeof(kb_config));
-    }
-
-    static uint16_t cpi = 0;
-    // Check if the state values are different
-    if (cpi != kb_config.device_cpi) {
-        cpi = kb_config.device_cpi;
-        if (!is_keyboard_left()) {
-            pointing_device_set_cpi(cpi);
-        }
-    }
-}
-
-void keyboard_pre_init_sync(void) {
-    memset(&kb_config, 0, sizeof(kb_config));
-    memset(&shared_mouse_report, 0, sizeof(shared_mouse_report));
-}
-
-void keyboard_post_init_sync(void) {
-    // Register keyboard state sync split transaction
-    transaction_register_rpc(RPC_ID_KB_CONFIG_SYNC, kb_config_sync_handler);
-    transaction_register_rpc(RPC_ID_POINTER_STATE_SYNC, kb_pointer_sync_handler);
-}
-
-void housekeeping_task_sync(void) {
-    if (is_keyboard_master()) {
-        // Keep track of the last state, so that we can tell if we need to propagate to slave
-        static kb_config_data_t last_kb_config;
-        static uint32_t         last_sync  = 0;
-        bool                    needs_sync = false;
-
-        // Check if the state values are different
-        if (memcmp(&kb_config, &last_kb_config, sizeof(kb_config))) {
-            needs_sync = true;
-            memcpy(&last_kb_config, &kb_config, sizeof(kb_config));
-        }
-        // Send to slave every 500ms regardless of state change
-        if (timer_elapsed32(last_sync) > 500) {
-            needs_sync = true;
-        }
-
-        // Perform the sync if requested
-        if (needs_sync) {
-            if (transaction_rpc_send(RPC_ID_KB_CONFIG_SYNC, sizeof(kb_config), &kb_config)) {
-                last_sync = timer_read32();
-            }
-        }
-    }
-}
-
-void trackball_set_cpi(uint16_t cpi) {
-    kb_config.device_cpi = cpi;
-    if (!is_keyboard_left()) {
-        pointing_device_set_cpi(cpi);
-    }
-}
-
-void pointing_device_task(void) {
-    if (!is_keyboard_master()) {
-        return;
-    }
-
-#if defined(POINTING_DEVICE_TASK_THROTTLE)
-    static uint32_t last_exec = 0;
-    if (timer_elapsed32(last_exec) < 1) {
-        return;
-    }
-    last_exec = timer_read32();
-#endif
-
-    report_mouse_t local_report = pointing_device_get_report();
-
-    // Gather report info
-#ifdef POINTING_DEVICE_MOTION_PIN
-    if (!readPin(POINTING_DEVICE_MOTION_PIN))
-#endif
-#if defined(POINTING_DEVICE_COMBINED)
-        local_report = pointing_device_driver.get_report(local_report);
-    transaction_rpc_recv(RPC_ID_POINTER_STATE_SYNC, sizeof(report_mouse_t), &shared_mouse_report);
-    local_report.x = local_report.x | shared_mouse_report.x;
-    local_report.y = local_report.y | shared_mouse_report.y;
-    local_report.h = local_report.h | shared_mouse_report.h;
-    local_report.v = local_report.v | shared_mouse_report.v;
-#elif defined(POINTING_DEVICE_LEFT)
-    if (is_keyboard_left()) {
-        local_report = pointing_device_driver.get_report(local_report);
-    } else {
-        transaction_rpc_recv(RPC_ID_POINTER_STATE_SYNC, sizeof(report_mouse_t), &local_report);
-    }
-#elif defined(POINTING_DEVICE_RIGHT)
-    if (!is_keyboard_left()) {
-        local_report = pointing_device_driver.get_report(local_report);
-    } else {
-        transaction_rpc_recv(RPC_ID_POINTER_STATE_SYNC, sizeof(report_mouse_t), &local_report);
-    }
-#else
-#    error "You need to define the side(s) the pointing device is on. POINTING_DEVICE_COMBINED / POINTING_DEVICE_LEFT / POINTING_DEVICE_RIGHT"
-#endif
-
-    // Support rotation of the sensor data
-#if defined(POINTING_DEVICE_ROTATION_90) || defined(POINTING_DEVICE_ROTATION_180) || defined(POINTING_DEVICE_ROTATION_270)
-    int8_t x = local_report.x, y = local_report.y;
-#    if defined(POINTING_DEVICE_ROTATION_90)
-    local_report.x = y;
-    local_report.y = -x;
-#    elif defined(POINTING_DEVICE_ROTATION_180)
-    local_report.x = -x;
-    local_report.y = -y;
-#    elif defined(POINTING_DEVICE_ROTATION_270)
-    local_report.x = -y;
-    local_report.y = x;
-#    else
-#        error "How the heck did you get here?!"
-#    endif
-#endif
-    // Support Inverting the X and Y Axises
-#if defined(POINTING_DEVICE_INVERT_X)
-    local_report.x = -local_report.x;
-#endif
-#if defined(POINTING_DEVICE_INVERT_Y)
-    local_report.y = -local_report.y;
-#endif
-
-    // allow kb to intercept and modify report
-    local_report = pointing_device_task_kb(local_report);
-    // combine with mouse report to ensure that the combined is sent correctly
-#ifdef MOUSEKEY_ENABLE
-    report_mouse_t mousekey_report = mousekey_get_report();
-    local_report.buttons           = local_report.buttons | mousekey_report.buttons;
-#endif
-#if defined(POINTING_DEVICE_COMBINED)
-    local_report.buttons = local_report.buttons | shared_mouse_report.buttons;
-#endif
-    pointing_device_set_report(local_report);
-    pointing_device_send();
-}
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
index 6095bfb7e2..5bdc57ca09 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
@@ -17,7 +17,6 @@
 #include "tractyl_manuform.h"
 #include "transactions.h"
 #include <string.h>
-#include "drivers/sensors/pmw3360.h"
 
 #ifndef TRACKBALL_DPI_OPTIONS
 #    define TRACKBALL_DPI_OPTIONS \
@@ -31,11 +30,10 @@
 #endif
 
 keyboard_config_t keyboard_config;
+kb_config_data_t  kb_config_data;
 uint16_t          dpi_array[] = TRACKBALL_DPI_OPTIONS;
 #define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
 
-
-
 bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
     if (!process_record_user(keycode, record)) {
         return false;
@@ -49,7 +47,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
             keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE;
         }
         eeconfig_update_kb(keyboard_config.raw);
-        trackball_set_cpi(dpi_array[keyboard_config.dpi_config]);
+        kb_config_data.device_cpi = dpi_array[keyboard_config.dpi_config];
+        pointing_device_set_cpi(kb_config_data.device_cpi);
     }
 #endif
 
@@ -69,7 +68,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
 
     return true;
 }
-__attribute__((weak)) void keyboard_pre_init_sync(void) {}
 __attribute__((weak)) void keyboard_pre_init_sub(void) {}
 void                       keyboard_pre_init_kb(void) {
     // debug_enable  = true;
@@ -83,20 +81,22 @@ void                       keyboard_pre_init_kb(void) {
     writePin(DEBUG_LED_PIN, !debug_enable);
 #endif
 
+    memset(&kb_config_data, 0, sizeof(kb_config_data));
+
     keyboard_pre_init_sub();
-    keyboard_pre_init_sync();
     keyboard_pre_init_user();
 }
 
-__attribute__((weak)) void keyboard_post_init_sync(void) {}
-void                       keyboard_post_init_kb(void) {
-    keyboard_post_init_sync();
+void keyboard_post_init_kb(void) {
+    transaction_register_rpc(RPC_ID_KB_CONFIG_SYNC, kb_config_sync_handler);
+
     keyboard_post_init_user();
 }
 
 #ifdef POINTING_DEVICE_ENABLE
 void pointing_device_init_kb(void) {
-    trackball_set_cpi(dpi_array[keyboard_config.dpi_config]);
+    kb_config_data.device_cpi = dpi_array[keyboard_config.dpi_config];
+    pointing_device_set_cpi(kb_config_data.device_cpi);
     pointing_device_init_user();
 }
 
@@ -111,7 +111,8 @@ report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
 void eeconfig_init_kb(void) {
     keyboard_config.dpi_config = TRACKBALL_DPI_DEFAULT;
 #ifdef POINTING_DEVICE_ENABLE
-    trackball_set_cpi(dpi_array[keyboard_config.dpi_config]);
+    kb_config_data.device_cpi = dpi_array[keyboard_config.dpi_config];
+    pointing_device_set_cpi(kb_config_data.device_cpi);
 #endif
     eeconfig_update_kb(keyboard_config.raw);
     eeconfig_init_user();
@@ -135,12 +136,39 @@ void                       matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-__attribute__((weak)) void housekeeping_task_sync(void) {}
-void                       housekeeping_task_kb(void) {
-    housekeeping_task_sync();
+void housekeeping_task_kb(void) {
+    if (is_keyboard_master()) {
+        // Keep track of the last state, so that we can tell if we need to propagate to slave
+        static kb_config_data_t last_kb_config;
+        static uint32_t         last_sync  = 0;
+        bool                    needs_sync = false;
+
+        // Check if the state values are different
+        if (memcmp(&kb_config_data, &last_kb_config, sizeof(kb_config_data))) {
+            needs_sync = true;
+            memcpy(&last_kb_config, &kb_config_data, sizeof(kb_config_data));
+        }
+        // Send to slave every 500ms regardless of state change
+        if (timer_elapsed32(last_sync) > 500) {
+            needs_sync = true;
+        }
+
+        // Perform the sync if requested
+        if (needs_sync) {
+            if (transaction_rpc_send(RPC_ID_KB_CONFIG_SYNC, sizeof(kb_config_data), &kb_config_data)) {
+                last_sync = timer_read32();
+            }
+        }
+    }
     // no need for user function, is called already
 }
 
+void kb_config_sync_handler(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
+    if (initiator2target_buffer_size == sizeof(kb_config_data)) {
+        memcpy(&kb_config_data, initiator2target_buffer, sizeof(kb_config_data));
+    }
+}
+
 #ifdef POINTING_DEVICE_ENABLE
 void matrix_power_up(void) { pointing_device_task(); }
 #endif
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
index 6aa40fc18b..3f8aca4551 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
@@ -32,21 +32,26 @@ typedef union {
     };
 } keyboard_config_t;
 
+typedef union {
+    uint32_t raw;
+    struct {
+        uint16_t device_cpi;
+    };
+} kb_config_data_t;
+
 extern keyboard_config_t keyboard_config;
+extern kb_config_data_t kb_config_data;
 
 enum ploopy_keycodes {
     DPI_CONFIG = SAFE_RANGE,
     KEYMAP_SAFE_RANGE,
 };
 
-typedef struct {
-    uint16_t device_cpi;
-} kb_config_data_t;
-
-void trackball_set_cpi(uint16_t cpi);
 void matrix_init_sub_kb(void);
 void matrix_scan_sub_kb(void);
 
 void keyboard_pre_init_sync(void);
 void keyboard_post_init_sync(void);
 void housekeeping_task_sync(void);
+
+void kb_config_sync_handler(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer);
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index 9ee2cbfed8..8894814985 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -348,9 +348,8 @@ void render_wpm(uint8_t padding) {
 #endif
 }
 
-#if defined(KEYBOARD_handwired_tractyl_manuform) || defined(KEYBOARD_bastardkb_charybdis)
-extern kb_config_data_t kb_config;
-void                    render_pointing_dpi_status(uint8_t padding) {
+#if defined(POINTING_DEVICE_ENABLE)
+void render_pointing_dpi_status(uint16_t cpi, uint8_t padding) {
     oled_write_P(PSTR("CPI:"), false);
     if (padding) {
         for (uint8_t n = padding - 1; n > 0; n--) {
@@ -358,7 +357,7 @@ void                    render_pointing_dpi_status(uint8_t padding) {
         }
     }
 
-    oled_write(get_u16_str(kb_config.device_cpi, ' '), false);
+    oled_write(get_u16_str(cpi, ' '), false);
 }
 #endif
 
@@ -381,8 +380,10 @@ __attribute__((weak)) void oled_driver_render_logo_left(void) {
     render_wpm(0);
 #    endif
     oled_write_P(PSTR("  "), false);
-#    if defined(KEYBOARD_handwired_tractyl_manuform) || defined(KEYBOARD_bastardkb_charybdis)
-    render_pointing_dpi_status(1);
+#    if defined(KEYBOARD_handwired_tractyl_manuform)
+    render_pointing_dpi_status(kb_config_data.device_cpi, 1);
+#    elif defined(KEYBOARD_bastardkb_charybdis)
+    render_pointing_dpi_status(, 1);
 #    endif
     oled_set_cursor(0, 4);
 #else
diff --git a/users/drashna/oled/oled_stuff.h b/users/drashna/oled/oled_stuff.h
index 8795684d6a..fd64b50874 100644
--- a/users/drashna/oled/oled_stuff.h
+++ b/users/drashna/oled/oled_stuff.h
@@ -33,7 +33,7 @@ void            render_bootmagic_status(void);
 void            render_user_status(void);
 void            oled_driver_render_logo(void);
 void            render_wpm(uint8_t padding);
-void            render_pointing_dpi_status(uint8_t padding);
+void            render_pointing_dpi_status(uint16_t cpi, uint8_t padding);
 void            oled_driver_render_logo_left(void);
 void            oled_driver_render_logo_right(void);
 

From c6ad3bf23d10d806c784c4cc3ceb7491a874de69 Mon Sep 17 00:00:00 2001
From: 4pplet <mail@4pplet.com>
Date: Wed, 29 Dec 2021 05:25:41 +0100
Subject: [PATCH 112/867] [Keymap] Bug fix nordic60, enable underglow for VIA
 firmware (#15616)

Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
---
 keyboards/kbnordic/nordic60/keymaps/via/rules.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/kbnordic/nordic60/keymaps/via/rules.mk b/keyboards/kbnordic/nordic60/keymaps/via/rules.mk
index 1e5b99807c..c4b503281b 100644
--- a/keyboards/kbnordic/nordic60/keymaps/via/rules.mk
+++ b/keyboards/kbnordic/nordic60/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+RGBLIGHT_ENABLE = yes
\ No newline at end of file

From 9475767e7a0e0c6e0ceccc446bec848002d6fc77 Mon Sep 17 00:00:00 2001
From: Jonathan Rascher <jon@bcat.name>
Date: Wed, 29 Dec 2021 04:56:16 -0600
Subject: [PATCH 113/867] [Keymap] Add initial Unicorne keyboard layout for
 bcat (#15613)

---
 .../yanghu/unicorne/keymaps/bcat/config.h     | 19 +++++
 .../yanghu/unicorne/keymaps/bcat/keymap.c     | 83 +++++++++++++++++++
 .../yanghu/unicorne/keymaps/bcat/readme.md    | 33 ++++++++
 .../yanghu/unicorne/keymaps/bcat/rules.mk     |  1 +
 users/bcat/compile.sh                         |  1 +
 users/bcat/readme.md                          |  1 +
 users/bcat/rules.mk                           |  2 +-
 7 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/yanghu/unicorne/keymaps/bcat/config.h
 create mode 100644 keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
 create mode 100644 keyboards/yanghu/unicorne/keymaps/bcat/readme.md
 create mode 100644 keyboards/yanghu/unicorne/keymaps/bcat/rules.mk

diff --git a/keyboards/yanghu/unicorne/keymaps/bcat/config.h b/keyboards/yanghu/unicorne/keymaps/bcat/config.h
new file mode 100644
index 0000000000..6a27f2aa96
--- /dev/null
+++ b/keyboards/yanghu/unicorne/keymaps/bcat/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 Jonathan Rascher
+ *
+ * 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 BCAT_ORTHO_LAYERS
diff --git a/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c b/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
new file mode 100644
index 0000000000..3da9f880ae
--- /dev/null
+++ b/keyboards/yanghu/unicorne/keymaps/bcat/keymap.c
@@ -0,0 +1,83 @@
+/* Copyright 2021 Jonathan Rascher
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "bcat.h"
+
+#if defined(OLED_ENABLE)
+#    include "bcat_oled.h"
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // clang-format off
+    /* Default layer: http://www.keyboard-layout-editor.com/#/gists/b6d0b16a913e7d1faeafc9fc751c413f */
+    [LAYER_DEFAULT] = LAYOUT(
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                         KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
+        KC_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,                         KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,                         KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
+                                      KC_MPLY,  KC_LCTL,  LY_LWR,   KC_SPC,   KC_ENT,   LY_RSE,   KC_RALT,  KC_MUTE
+    ),
+    /* Lower layer: http://www.keyboard-layout-editor.com/#/gists/99dd65d3b857a272be7a1804b20bc266 */
+    [LAYER_LOWER] = LAYOUT(
+        MC_ALTT,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                      KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
+        KY_CSPC,  KY_ZMRST, KY_ZMOUT, KY_ZMIN,  KC_WBAK,  KC_WFWD,                      KC_PIPE,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_TILD,
+        _______,  KC_APP,   KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_LGUI,                      KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_GRV,
+                                      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
+    ),
+    /* Raise layer: http://www.keyboard-layout-editor.com/#/gists/cf9e899867763dc45b65917ce4cf93ff */
+    [LAYER_RAISE] = LAYOUT(
+        KC_CAPS,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                         KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                        KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_F11,   KC_DEL,
+        _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,                       KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_F12,   KC_INS,
+                                      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
+    ),
+    /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/7eb0f1c437169f30cc18eac271ad2302 */
+    [LAYER_ADJUST] = LAYOUT(
+        _______,  MU_TOG,   KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    _______,  _______,  _______,  _______,
+        _______,  MU_MOD,   KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
+        _______,  _______,  _______,  KC_MUTE,  _______,  _______,                      RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
+                                      _______,  _______,  _______,  _______,  RGB_TOG,  _______,  _______,  _______
+    ),
+    // clang-format on
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    switch (index) {
+        case 0:
+            /* Left encoder (scrolling) */
+            tap_code(clockwise ? KC_PGDN : KC_PGUP);
+            return false;
+        case 1:
+            /* Right encoder (volume) */
+            tap_code(clockwise ? KC_VOLU : KC_VOLD);
+            return false;
+        default:
+            return true;
+    }
+}
+
+#if defined(OLED_ENABLE)
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_270; }
+
+void oled_task_keymap(const oled_keyboard_state_t *keyboard_state) {
+    render_oled_layers();
+    oled_advance_page(/*clearPageRemainder=*/false);
+    oled_advance_page(/*clearPageRemainder=*/false);
+    render_oled_wpm(keyboard_state->wpm);
+    render_oled_pet(/*col=*/0, /*line=*/6, keyboard_state);
+}
+#endif
diff --git a/keyboards/yanghu/unicorne/keymaps/bcat/readme.md b/keyboards/yanghu/unicorne/keymaps/bcat/readme.md
new file mode 100644
index 0000000000..5c30911d5e
--- /dev/null
+++ b/keyboards/yanghu/unicorne/keymaps/bcat/readme.md
@@ -0,0 +1,33 @@
+# bcat's Unicorne layout
+
+This ergo layout follows my preferred [split 3x6 + 3 thumb
+keys](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/split_3x6_3/bcat)
+layout, adding bindings for the two rotary encoders on the bottom row. (The
+left encoder scrolls vertically and the right encoder adjusts volume.) Also,
+since the Unicorne keyboard has a speaker, I added bindings on the adjust layer
+to activate and configure music mode. Finally, an adorable unicorn prances on
+the OLED, running faster the quicker you type.
+
+## Default layer
+
+![Default layer layout](https://i.imgur.com/Max5R0T.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/b6d0b16a913e7d1faeafc9fc751c413f))
+
+## Lower layer
+
+![Lower layer layout](https://i.imgur.com/E8Cfowc.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/99dd65d3b857a272be7a1804b20bc266))
+
+## Raise layer
+
+![Raise layer layout](https://i.imgur.com/KomdMyB.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/cf9e899867763dc45b65917ce4cf93ff))
+
+## Adjust layer
+
+![Adjust layer layout](https://i.imgur.com/EtshZbn.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/7eb0f1c437169f30cc18eac271ad2302))
diff --git a/keyboards/yanghu/unicorne/keymaps/bcat/rules.mk b/keyboards/yanghu/unicorne/keymaps/bcat/rules.mk
new file mode 100644
index 0000000000..e9a4fda1f7
--- /dev/null
+++ b/keyboards/yanghu/unicorne/keymaps/bcat/rules.mk
@@ -0,0 +1 @@
+BCAT_OLED_PET = isda
diff --git a/users/bcat/compile.sh b/users/bcat/compile.sh
index 81551f0ec0..9d5e58b1a1 100755
--- a/users/bcat/compile.sh
+++ b/users/bcat/compile.sh
@@ -49,3 +49,4 @@ compile kbdfans/kbd67/hotswap 65_ansi_blocker_split_bs
 compile keebio/bdn9/rev1
 compile keebio/quefrency/rev1
 compile lily58/rev1
+compile yanghu/unicorne/f411
diff --git a/users/bcat/readme.md b/users/bcat/readme.md
index bb73a53bf8..3650e8ee42 100644
--- a/users/bcat/readme.md
+++ b/users/bcat/readme.md
@@ -24,6 +24,7 @@ AN-C, CannonKeys Instant60, DZ60.
 ### Ergo
 
 * [Lily58](https://github.com/qmk/qmk_firmware/tree/master/keyboards/lily58/keymaps/bcat)
+* [Unicorne](https://github.com/qmk/qmk_firmware/tree/master/keyboards/yanghu/unicorne/keymaps/bcat)
 
 ### Ortho
 
diff --git a/users/bcat/rules.mk b/users/bcat/rules.mk
index bb4bb11d88..1ad2ee0aa8 100644
--- a/users/bcat/rules.mk
+++ b/users/bcat/rules.mk
@@ -1,6 +1,6 @@
 # Enable Bootmagic Lite for keyboards that don't have an easily accessible
 # reset button, but keep it disabled for all others to reduce firmware size.
-ifneq ($(filter $(strip $(KEYBOARD)),ai03/polaris dz60 kbdfans/kbd67/hotswap),)
+ifneq ($(filter $(strip $(KEYBOARD)),ai03/polaris dz60 kbdfans/kbd67/hotswap yanghu/unicorne/f411),)
 	BOOTMAGIC_ENABLE = yes
 else
 	BOOTMAGIC_ENABLE = no

From dea23720e67d95278830a1172dac57a4e502a050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= <alvaro.volpato@usp.br>
Date: Wed, 29 Dec 2021 07:57:22 -0300
Subject: [PATCH 114/867] [Keyboard] Add Mode Eighty M80v2 PCB support (#15486)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/mode/eighty/readme.md               |  22 ----
 keyboards/mode/{eighty => m80v1}/chconf.h     |   0
 keyboards/mode/{eighty => m80v1}/config.h     |   0
 keyboards/mode/{eighty => m80v1}/halconf.h    |   8 --
 .../mode/{eighty => m80v1}/m80h/config.h      |   0
 .../mode/{eighty => m80v1}/m80h/info.json     |   0
 .../m80h/keymaps/default/keymap.c             |   0
 .../m80h/keymaps/via/keymap.c                 |   0
 .../m80h/keymaps/via/rules.mk                 |   0
 keyboards/mode/{eighty => m80v1}/m80h/m80h.c  |   0
 keyboards/mode/{eighty => m80v1}/m80h/m80h.h  |   2 +-
 .../mode/{eighty => m80v1}/m80h/readme.md     |   0
 .../mode/{eighty => m80v1}/m80h/rules.mk      |   0
 .../mode/{eighty => m80v1}/m80s/config.h      |   0
 .../mode/{eighty => m80v1}/m80s/info.json     |   0
 .../m80s/keymaps/default/keymap.c             |   0
 .../m80s/keymaps/via/keymap.c                 |   0
 .../m80s/keymaps/via/rules.mk                 |   0
 keyboards/mode/{eighty => m80v1}/m80s/m80s.c  |   0
 keyboards/mode/{eighty => m80v1}/m80s/m80s.h  |   2 +-
 .../mode/{eighty => m80v1}/m80s/readme.md     |   0
 .../mode/{eighty => m80v1}/m80s/rules.mk      |   0
 .../mode/{eighty/eighty.c => m80v1/m80v1.c}   |   2 +-
 .../mode/{eighty/eighty.h => m80v1/m80v1.h}   |   4 +-
 keyboards/mode/{eighty => m80v1}/mcuconf.h    |   0
 keyboards/mode/m80v1/readme.md                |  38 +++++++
 keyboards/mode/m80v2/chconf.h                 |  25 +++++
 keyboards/mode/m80v2/config.h                 |  45 ++++++++
 keyboards/mode/m80v2/halconf.h                |  18 ++++
 keyboards/mode/m80v2/m80v2.c                  |  18 ++++
 keyboards/mode/m80v2/m80v2.h                  |  26 +++++
 keyboards/mode/m80v2/m80v2h/config.h          |   2 +
 keyboards/mode/m80v2/m80v2h/info.json         |  97 +++++++++++++++++
 .../m80v2/m80v2h/keymaps/default/keymap.c     |  53 +++++++++
 .../mode/m80v2/m80v2h/keymaps/via/keymap.c    |  53 +++++++++
 .../mode/m80v2/m80v2h/keymaps/via/rules.mk    |   1 +
 keyboards/mode/m80v2/m80v2h/m80v2h.c          |  18 ++++
 keyboards/mode/m80v2/m80v2h/m80v2h.h          |  39 +++++++
 keyboards/mode/m80v2/m80v2h/rules.mk          |  21 ++++
 keyboards/mode/m80v2/m80v2s/config.h          |   2 +
 keyboards/mode/m80v2/m80v2s/info.json         | 101 ++++++++++++++++++
 .../m80v2/m80v2s/keymaps/default/keymap.c     |  53 +++++++++
 .../mode/m80v2/m80v2s/keymaps/via/keymap.c    |  53 +++++++++
 .../mode/m80v2/m80v2s/keymaps/via/rules.mk    |   1 +
 keyboards/mode/m80v2/m80v2s/m80v2s.c          |  18 ++++
 keyboards/mode/m80v2/m80v2s/m80v2s.h          |  39 +++++++
 keyboards/mode/m80v2/m80v2s/rules.mk          |  21 ++++
 keyboards/mode/m80v2/mcuconf.h                |  19 ++++
 keyboards/mode/m80v2/readme.md                |  38 +++++++
 49 files changed, 804 insertions(+), 35 deletions(-)
 delete mode 100644 keyboards/mode/eighty/readme.md
 rename keyboards/mode/{eighty => m80v1}/chconf.h (100%)
 rename keyboards/mode/{eighty => m80v1}/config.h (100%)
 rename keyboards/mode/{eighty => m80v1}/halconf.h (79%)
 rename keyboards/mode/{eighty => m80v1}/m80h/config.h (100%)
 rename keyboards/mode/{eighty => m80v1}/m80h/info.json (100%)
 rename keyboards/mode/{eighty => m80v1}/m80h/keymaps/default/keymap.c (100%)
 rename keyboards/mode/{eighty => m80v1}/m80h/keymaps/via/keymap.c (100%)
 rename keyboards/mode/{eighty => m80v1}/m80h/keymaps/via/rules.mk (100%)
 rename keyboards/mode/{eighty => m80v1}/m80h/m80h.c (100%)
 rename keyboards/mode/{eighty => m80v1}/m80h/m80h.h (99%)
 rename keyboards/mode/{eighty => m80v1}/m80h/readme.md (100%)
 rename keyboards/mode/{eighty => m80v1}/m80h/rules.mk (100%)
 rename keyboards/mode/{eighty => m80v1}/m80s/config.h (100%)
 rename keyboards/mode/{eighty => m80v1}/m80s/info.json (100%)
 rename keyboards/mode/{eighty => m80v1}/m80s/keymaps/default/keymap.c (100%)
 rename keyboards/mode/{eighty => m80v1}/m80s/keymaps/via/keymap.c (100%)
 rename keyboards/mode/{eighty => m80v1}/m80s/keymaps/via/rules.mk (100%)
 rename keyboards/mode/{eighty => m80v1}/m80s/m80s.c (100%)
 rename keyboards/mode/{eighty => m80v1}/m80s/m80s.h (99%)
 rename keyboards/mode/{eighty => m80v1}/m80s/readme.md (100%)
 rename keyboards/mode/{eighty => m80v1}/m80s/rules.mk (100%)
 rename keyboards/mode/{eighty/eighty.c => m80v1/m80v1.c} (96%)
 rename keyboards/mode/{eighty/eighty.h => m80v1/m80v1.h} (62%)
 rename keyboards/mode/{eighty => m80v1}/mcuconf.h (100%)
 create mode 100644 keyboards/mode/m80v1/readme.md
 create mode 100644 keyboards/mode/m80v2/chconf.h
 create mode 100644 keyboards/mode/m80v2/config.h
 create mode 100644 keyboards/mode/m80v2/halconf.h
 create mode 100644 keyboards/mode/m80v2/m80v2.c
 create mode 100644 keyboards/mode/m80v2/m80v2.h
 create mode 100644 keyboards/mode/m80v2/m80v2h/config.h
 create mode 100644 keyboards/mode/m80v2/m80v2h/info.json
 create mode 100755 keyboards/mode/m80v2/m80v2h/keymaps/default/keymap.c
 create mode 100755 keyboards/mode/m80v2/m80v2h/keymaps/via/keymap.c
 create mode 100644 keyboards/mode/m80v2/m80v2h/keymaps/via/rules.mk
 create mode 100644 keyboards/mode/m80v2/m80v2h/m80v2h.c
 create mode 100644 keyboards/mode/m80v2/m80v2h/m80v2h.h
 create mode 100644 keyboards/mode/m80v2/m80v2h/rules.mk
 create mode 100644 keyboards/mode/m80v2/m80v2s/config.h
 create mode 100644 keyboards/mode/m80v2/m80v2s/info.json
 create mode 100755 keyboards/mode/m80v2/m80v2s/keymaps/default/keymap.c
 create mode 100755 keyboards/mode/m80v2/m80v2s/keymaps/via/keymap.c
 create mode 100644 keyboards/mode/m80v2/m80v2s/keymaps/via/rules.mk
 create mode 100644 keyboards/mode/m80v2/m80v2s/m80v2s.c
 create mode 100644 keyboards/mode/m80v2/m80v2s/m80v2s.h
 create mode 100644 keyboards/mode/m80v2/m80v2s/rules.mk
 create mode 100644 keyboards/mode/m80v2/mcuconf.h
 create mode 100644 keyboards/mode/m80v2/readme.md

diff --git a/keyboards/mode/eighty/readme.md b/keyboards/mode/eighty/readme.md
deleted file mode 100644
index 40df5adb51..0000000000
--- a/keyboards/mode/eighty/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Mode Eighty
-
-![MODE80](https://i.imgur.com/26uzM3yl.jpg)\
-[Image Gallery](https://imgur.com/t/mechanicalkeyboards/8Uf6c2m?nc=1)
-
-The Mode80 is a tenkeyless high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/).
-
-* Keyboard Maintainer: [Gondolindrim](https://github.com/gondolindrim)
-* Hardware Supported: proprietary PCB using STM32F072 controller
-* Hardware Availability: you can get a Mode Eighty as of today (dec. 2020) through the in stock sales or special groupbuy editions at https://shop.modedesigns.com/
-
-Make example for this keyboard (after setting up your build environment):
-
-    make mode/eighty/m80h:default # Hotswap
-    make mode/eighty/m80s:default # Soldered
-
-Flashing example for this keyboard:
-
-    make mode/eighty/m80h:default:flash # Hotswap
-    make mode/eighty/m80s:default:flash # Soldered
-
-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).
diff --git a/keyboards/mode/eighty/chconf.h b/keyboards/mode/m80v1/chconf.h
similarity index 100%
rename from keyboards/mode/eighty/chconf.h
rename to keyboards/mode/m80v1/chconf.h
diff --git a/keyboards/mode/eighty/config.h b/keyboards/mode/m80v1/config.h
similarity index 100%
rename from keyboards/mode/eighty/config.h
rename to keyboards/mode/m80v1/config.h
diff --git a/keyboards/mode/eighty/halconf.h b/keyboards/mode/m80v1/halconf.h
similarity index 79%
rename from keyboards/mode/eighty/halconf.h
rename to keyboards/mode/m80v1/halconf.h
index eab8a300a1..bd55942f8c 100644
--- a/keyboards/mode/eighty/halconf.h
+++ b/keyboards/mode/m80v1/halconf.h
@@ -14,14 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/mode/eighty/halconf.h -r platforms/chibios/common/configs/halconf.h`
- */
-
 #pragma once
 
-#define HAL_USE_I2C TRUE
-
 #include_next <halconf.h>
-
diff --git a/keyboards/mode/eighty/m80h/config.h b/keyboards/mode/m80v1/m80h/config.h
similarity index 100%
rename from keyboards/mode/eighty/m80h/config.h
rename to keyboards/mode/m80v1/m80h/config.h
diff --git a/keyboards/mode/eighty/m80h/info.json b/keyboards/mode/m80v1/m80h/info.json
similarity index 100%
rename from keyboards/mode/eighty/m80h/info.json
rename to keyboards/mode/m80v1/m80h/info.json
diff --git a/keyboards/mode/eighty/m80h/keymaps/default/keymap.c b/keyboards/mode/m80v1/m80h/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mode/eighty/m80h/keymaps/default/keymap.c
rename to keyboards/mode/m80v1/m80h/keymaps/default/keymap.c
diff --git a/keyboards/mode/eighty/m80h/keymaps/via/keymap.c b/keyboards/mode/m80v1/m80h/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mode/eighty/m80h/keymaps/via/keymap.c
rename to keyboards/mode/m80v1/m80h/keymaps/via/keymap.c
diff --git a/keyboards/mode/eighty/m80h/keymaps/via/rules.mk b/keyboards/mode/m80v1/m80h/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mode/eighty/m80h/keymaps/via/rules.mk
rename to keyboards/mode/m80v1/m80h/keymaps/via/rules.mk
diff --git a/keyboards/mode/eighty/m80h/m80h.c b/keyboards/mode/m80v1/m80h/m80h.c
similarity index 100%
rename from keyboards/mode/eighty/m80h/m80h.c
rename to keyboards/mode/m80v1/m80h/m80h.c
diff --git a/keyboards/mode/eighty/m80h/m80h.h b/keyboards/mode/m80v1/m80h/m80h.h
similarity index 99%
rename from keyboards/mode/eighty/m80h/m80h.h
rename to keyboards/mode/m80v1/m80h/m80h.h
index 882099b1a3..f3f4c53889 100644
--- a/keyboards/mode/eighty/m80h/m80h.h
+++ b/keyboards/mode/m80v1/m80h/m80h.h
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "eighty.h"
+#include "m80v1.h"
 
 #define LAYOUT_eighty_m80h( \
     K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K415,  K114, K115,  K116, \
diff --git a/keyboards/mode/eighty/m80h/readme.md b/keyboards/mode/m80v1/m80h/readme.md
similarity index 100%
rename from keyboards/mode/eighty/m80h/readme.md
rename to keyboards/mode/m80v1/m80h/readme.md
diff --git a/keyboards/mode/eighty/m80h/rules.mk b/keyboards/mode/m80v1/m80h/rules.mk
similarity index 100%
rename from keyboards/mode/eighty/m80h/rules.mk
rename to keyboards/mode/m80v1/m80h/rules.mk
diff --git a/keyboards/mode/eighty/m80s/config.h b/keyboards/mode/m80v1/m80s/config.h
similarity index 100%
rename from keyboards/mode/eighty/m80s/config.h
rename to keyboards/mode/m80v1/m80s/config.h
diff --git a/keyboards/mode/eighty/m80s/info.json b/keyboards/mode/m80v1/m80s/info.json
similarity index 100%
rename from keyboards/mode/eighty/m80s/info.json
rename to keyboards/mode/m80v1/m80s/info.json
diff --git a/keyboards/mode/eighty/m80s/keymaps/default/keymap.c b/keyboards/mode/m80v1/m80s/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mode/eighty/m80s/keymaps/default/keymap.c
rename to keyboards/mode/m80v1/m80s/keymaps/default/keymap.c
diff --git a/keyboards/mode/eighty/m80s/keymaps/via/keymap.c b/keyboards/mode/m80v1/m80s/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mode/eighty/m80s/keymaps/via/keymap.c
rename to keyboards/mode/m80v1/m80s/keymaps/via/keymap.c
diff --git a/keyboards/mode/eighty/m80s/keymaps/via/rules.mk b/keyboards/mode/m80v1/m80s/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mode/eighty/m80s/keymaps/via/rules.mk
rename to keyboards/mode/m80v1/m80s/keymaps/via/rules.mk
diff --git a/keyboards/mode/eighty/m80s/m80s.c b/keyboards/mode/m80v1/m80s/m80s.c
similarity index 100%
rename from keyboards/mode/eighty/m80s/m80s.c
rename to keyboards/mode/m80v1/m80s/m80s.c
diff --git a/keyboards/mode/eighty/m80s/m80s.h b/keyboards/mode/m80v1/m80s/m80s.h
similarity index 99%
rename from keyboards/mode/eighty/m80s/m80s.h
rename to keyboards/mode/m80v1/m80s/m80s.h
index 3799b5f617..b5d1e4dd06 100644
--- a/keyboards/mode/eighty/m80s/m80s.h
+++ b/keyboards/mode/m80v1/m80s/m80s.h
@@ -13,7 +13,7 @@
 
 #pragma once
 
-#include "eighty.h"
+#include "m80v1.h"
 
 #define LAYOUT_eighty_m80s( \
     K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K415,  K114, K115,  K116, \
diff --git a/keyboards/mode/eighty/m80s/readme.md b/keyboards/mode/m80v1/m80s/readme.md
similarity index 100%
rename from keyboards/mode/eighty/m80s/readme.md
rename to keyboards/mode/m80v1/m80s/readme.md
diff --git a/keyboards/mode/eighty/m80s/rules.mk b/keyboards/mode/m80v1/m80s/rules.mk
similarity index 100%
rename from keyboards/mode/eighty/m80s/rules.mk
rename to keyboards/mode/m80v1/m80s/rules.mk
diff --git a/keyboards/mode/eighty/eighty.c b/keyboards/mode/m80v1/m80v1.c
similarity index 96%
rename from keyboards/mode/eighty/eighty.c
rename to keyboards/mode/m80v1/m80v1.c
index bde91d35a5..225ed9cc8d 100644
--- a/keyboards/mode/eighty/eighty.c
+++ b/keyboards/mode/m80v1/m80v1.c
@@ -11,4 +11,4 @@
   * GNU General Public License for more details. 
   */
 
-#include "eighty.h"
+#include "m80v1.h"
diff --git a/keyboards/mode/eighty/eighty.h b/keyboards/mode/m80v1/m80v1.h
similarity index 62%
rename from keyboards/mode/eighty/eighty.h
rename to keyboards/mode/m80v1/m80v1.h
index b5f6328854..704ea28439 100644
--- a/keyboards/mode/eighty/eighty.h
+++ b/keyboards/mode/m80v1/m80v1.h
@@ -2,8 +2,8 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_mode_eighty_m80h)
+#if defined(KEYBOARD_mode_m80v1_m80h)
   #include "m80h.h"
-#elif defined(KEYBOARD_mode_eighty_m80s)
+#elif defined(KEYBOARD_mode_m80v1_m80s)
   #include "m80s.h"
 #endif // Mode80 solderable "S" and hotswap "H" revisions
diff --git a/keyboards/mode/eighty/mcuconf.h b/keyboards/mode/m80v1/mcuconf.h
similarity index 100%
rename from keyboards/mode/eighty/mcuconf.h
rename to keyboards/mode/m80v1/mcuconf.h
diff --git a/keyboards/mode/m80v1/readme.md b/keyboards/mode/m80v1/readme.md
new file mode 100644
index 0000000000..5435a02e61
--- /dev/null
+++ b/keyboards/mode/m80v1/readme.md
@@ -0,0 +1,38 @@
+# Mode Eighty V1 PCB QMK firmware
+
+![MODE80](https://i.imgur.com/26uzM3yl.jpg)\
+[Image Gallery](https://imgur.com/t/mechanicalkeyboards/8Uf6c2m?nc=1)
+
+The Mode80 is a tenkeyless high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/).
+
+* Keyboard Maintainer: [Gondolindrim](https://github.com/gondolindrim)
+* Hardware Supported: proprietary PCB using STM32F072 controller
+* Hardware Availability: the Mode Eighty V1 was discontinued in 2021 in favour of its second revisions. You can still buy hardware (PCBs and plates) at the Mode Designs website.
+
+## How to flash
+
+### Enter bootloader
+
+The DFU state in the bootloader can be accessed in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: press the button on the front of the PCB, next to caps lock, for at least five seconds
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available (ESC key at layer 1 in the default layout)
+
+## Compile firmware
+
+After accessing the DFU state in your PCB, build the default layout using:
+
+    make mode/m80v1/m80h:default # Hotswap
+    make mode/m80v1/m80s:default # Soldered
+
+Then download the resulting binary `*bin` file using `dfu-util` or QMK Toolbox.
+
+## Compile and flash
+
+After accessing the DFU state in your PCB, you can compile-and-flash automatically usind `dfu-util` through
+
+    make mode/m80v1/m80h:default:flash # Hotswap
+    make mode/m80v1/m80s:default:flash # Soldered
+
+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).
diff --git a/keyboards/mode/m80v2/chconf.h b/keyboards/mode/m80v2/chconf.h
new file mode 100644
index 0000000000..cbbae31079
--- /dev/null
+++ b/keyboards/mode/m80v2/chconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * 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 CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_OPTIMIZE_SPEED FALSE
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h
new file mode 100644
index 0000000000..fbe5fb86df
--- /dev/null
+++ b/keyboards/mode/m80v2/config.h
@@ -0,0 +1,45 @@
+/*
+ Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x00DE
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    Mode
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+#define MATRIX_ROW_PINS { B12, B13, B14, B3, B4, B9 }
+#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, B0, B1, B10, A8, A10, B15, A15, B5, B8, C13 }
+
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* 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 LED_CAPS_LOCK_PIN A0
diff --git a/keyboards/mode/m80v2/halconf.h b/keyboards/mode/m80v2/halconf.h
new file mode 100644
index 0000000000..3aeb26b0e7
--- /dev/null
+++ b/keyboards/mode/m80v2/halconf.h
@@ -0,0 +1,18 @@
+/* Copyright 2020 QMK
+ *
+ * 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_next <halconf.h>
diff --git a/keyboards/mode/m80v2/m80v2.c b/keyboards/mode/m80v2/m80v2.c
new file mode 100644
index 0000000000..faad98b7a7
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2.c
@@ -0,0 +1,18 @@
+/*
+ Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 "m80v2.h"
diff --git a/keyboards/mode/m80v2/m80v2.h b/keyboards/mode/m80v2/m80v2.h
new file mode 100644
index 0000000000..c00f148e62
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2.h
@@ -0,0 +1,26 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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"
+
+#if defined(KEYBOARD_mode_m80v2_m80v2h)
+  #include "m80v2h.h"
+#elif defined(KEYBOARD_mode_m80v2_m80v2s)
+  #include "m80v2s.h"
+#endif
diff --git a/keyboards/mode/m80v2/m80v2h/config.h b/keyboards/mode/m80v2/m80v2h/config.h
new file mode 100644
index 0000000000..f474e28453
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/config.h
@@ -0,0 +1,2 @@
+#define PRODUCT_ID      0x0083 // 81 was used for M80H V1
+#define PRODUCT         M80H V2
diff --git a/keyboards/mode/m80v2/m80v2h/info.json b/keyboards/mode/m80v2/m80v2h/info.json
new file mode 100644
index 0000000000..251937c562
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/info.json
@@ -0,0 +1,97 @@
+{
+    "keyboard_name": "MODE80V2H", 
+    "url": "https://shop.modedesigns.com/collections/eighty", 
+    "maintainer": "Gondolindrim", 
+    "layouts": {
+        "LAYOUT_m80v2h": {
+            "layout": [
+			{"label":"Esc", "x":0, "y":0},
+			{"label":"F1", "x":2, "y":0},
+			{"label":"F2", "x":3, "y":0},
+			{"label":"F3", "x":4, "y":0},
+			{"label":"F4", "x":5, "y":0},
+			{"label":"F5", "x":6.5, "y":0},
+			{"label":"F6", "x":7.5, "y":0},
+			{"label":"F7", "x":8.5, "y":0},
+			{"label":"F8", "x":9.5, "y":0},
+			{"label":"F9", "x":11, "y":0},
+			{"label":"F10", "x":12, "y":0},
+			{"label":"F11", "x":13, "y":0},
+			{"label":"F12", "x":14, "y":0},
+			{"label":"Bkspc", "x":13, "y":1.5, "w": 2},
+			{"label":"Mute", "x":15.25, "y":0},
+			{"label":"VolDn", "x":16.25, "y":0},
+			{"label":"VolUp", "x":17.25, "y":0},
+			{"label":"~", "x":0, "y":1.5},
+			{"label":"1", "x":1, "y":1.5},
+			{"label":"2", "x":2, "y":1.5},
+			{"label":"3", "x":3, "y":1.5},
+			{"label":"4", "x":4, "y":1.5},
+			{"label":"5", "x":5, "y":1.5}, 
+			{"label":"6", "x":6, "y":1.5},
+			{"label":"7", "x":7, "y":1.5},
+			{"label":"8", "x":8, "y":1.5},
+			{"label":"9", "x":9, "y":1.5},
+			{"label":"0", "x":10, "y":1.5},
+			{"label":"_", "x":11, "y":1.5},
+			{"label":"+", "x":12, "y":1.5},
+			{"label":"Insert", "x":15.25, "y":1.5},
+			{"label":"Home", "x":16.25, "y":1.5},
+			{"label":"PgUp", "x":17.25, "y":1.5},
+			{"label":"Tab", "x":0, "y":2.5, "w":1.5},
+			{"label":"Q", "x":1.5, "y":2.5},
+			{"label":"W", "x":2.5, "y":2.5},
+			{"label":"E", "x":3.5, "y":2.5},
+			{"label":"R", "x":4.5, "y":2.5},
+			{"label":"T", "x":5.5, "y":2.5},
+			{"label":"Y", "x":6.5, "y":2.5},
+			{"label":"U", "x":7.5, "y":2.5},
+			{"label":"I", "x":8.5, "y":2.5},
+			{"label":"O", "x":9.5, "y":2.5},
+			{"label":"P", "x":10.5, "y":2.5},
+			{"label":"{", "x":11.5, "y":2.5},
+			{"label":"}", "x":12.5, "y":2.5},
+			{"label":"|", "x":13.5, "y":2.5, "w":1.5},
+			{"label":"Delete", "x":15.25, "y":2.5},
+			{"label":"End", "x":16.25, "y":2.5},
+			{"label":"PgDn", "x":17.25, "y":2.5},
+			{"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+			{"label":"A", "x":1.75, "y":3.5},
+			{"label":"S", "x":2.75, "y":3.5},
+			{"label":"D", "x":3.75, "y":3.5},
+			{"label":"F", "x":4.75, "y":3.5},
+			{"label":"G", "x":5.75, "y":3.5},
+			{"label":"H", "x":6.75, "y":3.5},
+			{"label":"J", "x":7.75, "y":3.5},
+			{"label":"K", "x":8.75, "y":3.5},
+			{"label":"L", "x":9.75, "y":3.5},
+			{"label":":", "x":10.75, "y":3.5},
+			{"label":"\"", "x":11.75, "y":3.5},
+			{"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+			{"label":"Shift", "x":0, "y":4.5, "w":2.25},
+			{"label":"Z", "x":2.25, "y":4.5},
+			{"label":"X", "x":3.25, "y":4.5},
+			{"label":"C", "x":4.25, "y":4.5},
+			{"label":"V", "x":5.25, "y":4.5},
+			{"label":"B", "x":6.25, "y":4.5},
+			{"label":"N", "x":7.25, "y":4.5},
+			{"label":"M", "x":8.25, "y":4.5},
+			{"label":",", "x":9.25, "y":4.5},
+			{"label":".", "x":10.25, "y":4.5},
+			{"label":"/", "x":11.25, "y":4.5},
+			{"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+			{"label":"\u2191", "x":16.25, "y":4.5},
+			{"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+			{"label":"Win", "x":1.25, "y":5.5, "w":1.25},
+			{"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+			{"x":3.75, "y":5.5, "w":6.25},
+			{"label":"Alt", "x":10, "y":5.5, "w":1.25},
+			{"label":"Win", "x":11.25, "y":5.5, "w":1.25},
+			{"label":"FN1", "x":12.5, "y":5.5, "w":1.25},
+			{"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+			{"label":"\u2190", "x":15.25, "y":5.5},
+			{"label":"\u2193", "x":16.25, "y":5.5},
+			{"label":"\u2192", "x":17.25, "y":5.5}]
+        }
+    }
+}
diff --git a/keyboards/mode/m80v2/m80v2h/keymaps/default/keymap.c b/keyboards/mode/m80v2/m80v2h/keymaps/default/keymap.c
new file mode 100755
index 0000000000..f65309dfc7
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_m80v2h(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_BSPC, KC_MUTE, KC_VOLD , KC_VOLU ,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL ,          KC_INS , KC_HOME , KC_PGUP ,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END  , KC_PGDN ,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_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, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 
+	),
+   [1] = LAYOUT_m80v2h(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+	),
+   [2] = LAYOUT_m80v2h(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+	),
+   [3] = LAYOUT_m80v2h(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+	),
+};
diff --git a/keyboards/mode/m80v2/m80v2h/keymaps/via/keymap.c b/keyboards/mode/m80v2/m80v2h/keymaps/via/keymap.c
new file mode 100755
index 0000000000..f65309dfc7
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_m80v2h(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_BSPC, KC_MUTE, KC_VOLD , KC_VOLU ,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL ,          KC_INS , KC_HOME , KC_PGUP ,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END  , KC_PGDN ,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_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, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 
+	),
+   [1] = LAYOUT_m80v2h(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+	),
+   [2] = LAYOUT_m80v2h(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+	),
+   [3] = LAYOUT_m80v2h(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+	),
+};
diff --git a/keyboards/mode/m80v2/m80v2h/keymaps/via/rules.mk b/keyboards/mode/m80v2/m80v2h/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mode/m80v2/m80v2h/m80v2h.c b/keyboards/mode/m80v2/m80v2h/m80v2h.c
new file mode 100644
index 0000000000..0d4e533c30
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/m80v2h.c
@@ -0,0 +1,18 @@
+/*
+ Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 "m80v2h.h"
diff --git a/keyboards/mode/m80v2/m80v2h/m80v2h.h b/keyboards/mode/m80v2/m80v2h/m80v2h.h
new file mode 100644
index 0000000000..6a21b8cecc
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/m80v2h.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 "m80v2.h"
+
+#define ___ KC_NO
+
+#define LAYOUT_m80v2h( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, K1G, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                \
+	K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           K4F,      \
+        K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F, K5G  \
+)\
+{\
+	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, ___, K1E, K1F, K1G }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, ___, ___, ___ }, \
+	{ K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, ___, K4F, ___ }, \
+	{ K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F, K5G } \
+}
diff --git a/keyboards/mode/m80v2/m80v2h/rules.mk b/keyboards/mode/m80v2/m80v2h/rules.mk
new file mode 100644
index 0000000000..5422160c87
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2h/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes      # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = yes          # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/mode/m80v2/m80v2s/config.h b/keyboards/mode/m80v2/m80v2s/config.h
new file mode 100644
index 0000000000..ad1871f8ab
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/config.h
@@ -0,0 +1,2 @@
+#define PRODUCT_ID      0x0082 // 81 was used for M80H V1
+#define PRODUCT         M80S V2
diff --git a/keyboards/mode/m80v2/m80v2s/info.json b/keyboards/mode/m80v2/m80v2s/info.json
new file mode 100644
index 0000000000..6e0bd62d51
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/info.json
@@ -0,0 +1,101 @@
+{
+    "keyboard_name": "MODE80V2S", 
+    "url": "https://shop.modedesigns.com/collections/eighty", 
+    "maintainer": "Gondolindrim", 
+    "layouts": {
+        "LAYOUT_m80v2s": {
+            "layout": [
+			{"label":"Esc", "x":0, "y":0},
+			{"label":"F1", "x":2, "y":0},
+			{"label":"F2", "x":3, "y":0},
+			{"label":"F3", "x":4, "y":0},
+			{"label":"F4", "x":5, "y":0},
+			{"label":"F5", "x":6.5, "y":0},
+			{"label":"F6", "x":7.5, "y":0},
+			{"label":"F7", "x":8.5, "y":0},
+			{"label":"F8", "x":9.5, "y":0},
+			{"label":"F9", "x":11, "y":0},
+			{"label":"F10", "x":12, "y":0},
+			{"label":"F11", "x":13, "y":0},
+			{"label":"F12", "x":14, "y":0},
+			{"label": "LBkspc", "x":13, "y":1.5},
+			{"label":"Mute", "x":15.25, "y":0},
+			{"label":"VolDn", "x":16.25, "y":0},
+			{"label":"VolUp", "x":17.25, "y":0},
+			{"label":"~", "x":0, "y":1.5},
+			{"label":"1", "x":1, "y":1.5},
+			{"label":"2", "x":2, "y":1.5},
+			{"label":"3", "x":3, "y":1.5},
+			{"label":"4", "x":4, "y":1.5},
+			{"label":"5", "x":5, "y":1.5}, 
+			{"label":"6", "x":6, "y":1.5},
+			{"label":"7", "x":7, "y":1.5},
+			{"label":"8", "x":8, "y":1.5},
+			{"label":"9", "x":9, "y":1.5},
+			{"label":"0", "x":10, "y":1.5},
+			{"label":"_", "x":11, "y":1.5},
+			{"label":"+", "x":12, "y":1.5},
+			{"label": "RBkspc", "x":14, "y":1.5},
+			{"label":"Insert", "x":15.25, "y":1.5},
+			{"label":"Home", "x":16.25, "y":1.5},
+			{"label":"PgUp", "x":17.25, "y":1.5},
+			{"label":"Tab", "x":0, "y":2.5, "w":1.5},
+			{"label":"Q", "x":1.5, "y":2.5},
+			{"label":"W", "x":2.5, "y":2.5},
+			{"label":"E", "x":3.5, "y":2.5},
+			{"label":"R", "x":4.5, "y":2.5},
+			{"label":"T", "x":5.5, "y":2.5},
+			{"label":"Y", "x":6.5, "y":2.5},
+			{"label":"U", "x":7.5, "y":2.5},
+			{"label":"I", "x":8.5, "y":2.5},
+			{"label":"O", "x":9.5, "y":2.5},
+			{"label":"P", "x":10.5, "y":2.5},
+			{"label":"{", "x":11.5, "y":2.5},
+			{"label":"}", "x":12.5, "y":2.5},
+			{"label":"|", "x":13.5, "y":2.5, "w":1.5},
+			{"label":"Delete", "x":15.25, "y":2.5},
+			{"label":"End", "x":16.25, "y":2.5},
+			{"label":"PgDn", "x":17.25, "y":2.5},
+			{"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+			{"label":"A", "x":1.75, "y":3.5},
+			{"label":"S", "x":2.75, "y":3.5},
+			{"label":"D", "x":3.75, "y":3.5},
+			{"label":"F", "x":4.75, "y":3.5},
+			{"label":"G", "x":5.75, "y":3.5},
+			{"label":"H", "x":6.75, "y":3.5},
+			{"label":"J", "x":7.75, "y":3.5},
+			{"label":"K", "x":8.75, "y":3.5},
+			{"label":"L", "x":9.75, "y":3.5},
+			{"label":":", "x":10.75, "y":3.5},
+			{"label":"\"", "x":11.75, "y":3.5},
+			{"label":"NUBS", "x":12.75, "y":3.5},
+			{"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+			{"label":"Shift", "x":0, "y":4.5, "w":1.25},
+			{"label":"NUHS", "x":1.25, "y":4.5},
+			{"label":"Z", "x":2.25, "y":4.5},
+			{"label":"X", "x":3.25, "y":4.5},
+			{"label":"C", "x":4.25, "y":4.5},
+			{"label":"V", "x":5.25, "y":4.5},
+			{"label":"B", "x":6.25, "y":4.5},
+			{"label":"N", "x":7.25, "y":4.5},
+			{"label":"M", "x":8.25, "y":4.5},
+			{"label":",", "x":9.25, "y":4.5},
+			{"label":".", "x":10.25, "y":4.5},
+			{"label":"/", "x":11.25, "y":4.5},
+			{"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+			{"label":"FN1", "x":14, "y":4.5},
+			{"label":"\u2191", "x":16.25, "y":4.5},
+			{"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+			{"label":"Win", "x":1.25, "y":5.5, "w":1.25},
+			{"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+			{"x":3.75, "y":5.5, "w":6.25},
+			{"label":"Alt", "x":10, "y":5.5, "w":1.25},
+			{"label":"Win", "x":11.25, "y":5.5, "w":1.25},
+			{"label":"FN1", "x":12.5, "y":5.5, "w":1.25},
+			{"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+			{"label":"\u2190", "x":15.25, "y":5.5},
+			{"label":"\u2193", "x":16.25, "y":5.5},
+			{"label":"\u2192", "x":17.25, "y":5.5}]
+        }
+    }
+}
diff --git a/keyboards/mode/m80v2/m80v2s/keymaps/default/keymap.c b/keyboards/mode/m80v2/m80v2s/keymaps/default/keymap.c
new file mode 100755
index 0000000000..fcb05df0cf
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_m80v2s(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_BSPC, KC_MUTE, KC_VOLD , KC_VOLU ,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_INS , KC_HOME , KC_PGUP ,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END  , KC_PGDN ,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,          
+	KC_LSFT, KC_BSLS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP   , 
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 
+	),
+   [1] = LAYOUT_m80v2s(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+	),
+   [2] = LAYOUT_m80v2s(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+	),
+   [3] = LAYOUT_m80v2s(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+	)
+};
diff --git a/keyboards/mode/m80v2/m80v2s/keymaps/via/keymap.c b/keyboards/mode/m80v2/m80v2s/keymaps/via/keymap.c
new file mode 100755
index 0000000000..fcb05df0cf
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_m80v2s(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_BSPC, KC_MUTE, KC_VOLD , KC_VOLU ,
+        KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_INS , KC_HOME , KC_PGUP ,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , KC_END  , KC_PGDN ,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT ,          
+	KC_LSFT, KC_BSLS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP   , 
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RGUI, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT 
+	),
+   [1] = LAYOUT_m80v2s(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+	),
+   [2] = LAYOUT_m80v2s(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+	),
+   [3] = LAYOUT_m80v2s(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 
+	)
+};
diff --git a/keyboards/mode/m80v2/m80v2s/keymaps/via/rules.mk b/keyboards/mode/m80v2/m80v2s/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.c b/keyboards/mode/m80v2/m80v2s/m80v2s.c
new file mode 100644
index 0000000000..7be89b1288
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/m80v2s.c
@@ -0,0 +1,18 @@
+/*
+ Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 "m80v2s.h"
diff --git a/keyboards/mode/m80v2/m80v2s/m80v2s.h b/keyboards/mode/m80v2/m80v2s/m80v2s.h
new file mode 100644
index 0000000000..440b54583a
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/m80v2s.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 "m80v2.h"
+
+#define ___ KC_NO
+
+#define LAYOUT_m80v2s( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                \
+	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4F,      \
+        K50, K51, K52,                K56,                K5A, K5B, K5C, K5D, K5E, K5F, K5G  \
+)\
+{\
+	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, ___ }, \
+	{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
+	{ K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E, K5F, K5G } \
+}
diff --git a/keyboards/mode/m80v2/m80v2s/rules.mk b/keyboards/mode/m80v2/m80v2s/rules.mk
new file mode 100644
index 0000000000..5422160c87
--- /dev/null
+++ b/keyboards/mode/m80v2/m80v2s/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes      # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = yes          # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/mode/m80v2/mcuconf.h b/keyboards/mode/m80v2/mcuconf.h
new file mode 100644
index 0000000000..6d5ee13d30
--- /dev/null
+++ b/keyboards/mode/m80v2/mcuconf.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 QMK
+ *
+ * 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_next <mcuconf.h>
diff --git a/keyboards/mode/m80v2/readme.md b/keyboards/mode/m80v2/readme.md
new file mode 100644
index 0000000000..e94984f06b
--- /dev/null
+++ b/keyboards/mode/m80v2/readme.md
@@ -0,0 +1,38 @@
+# Mode Eighty V2 PCB QMK firmware
+
+![MODE80](https://i.imgur.com/26uzM3yl.jpg)\
+[Image Gallery](https://imgur.com/t/mechanicalkeyboards/8Uf6c2m?nc=1)
+
+The Mode80 is a tenkeyless high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/).
+
+* Keyboard Maintainer: [Gondolindrim](https://github.com/gondolindrim)
+* Hardware Supported: proprietary PCB using STM32F072 controller
+* Hardware Availability: you can get a Mode Eighty as of today (dec. 2021) through the in stock sales or special groupbuy editions at https://shop.modedesigns.com/
+
+## How to flash
+
+### Enter bootloader
+
+The DFU state in the bootloader can be accessed in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: press the button on the front of the PCB, next to caps lock, for at least five seconds
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available (ESC key at layer 1 in the default layout)
+
+## Compile firmware
+
+After accessing the DFU state in your PCB, build the default layout using:
+
+    make mode/m80v2/m80v2h:default # Hotswap
+    make mode/m80v2/m80v2s:default # Soldered
+
+Then download the resulting binary `*bin` file using `dfu-util` or QMK Toolbox.
+
+## Compile and flash
+
+After accessing the DFU state in your PCB, you can compile-and-flash automatically usind `dfu-util` through
+
+    make mode/m80v2/m80v2h:default:flash # Hotswap
+    make mode/m80v2/m80v2s:default:flash # Soldered
+
+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).

From 88a8bdbb3aa3ee6c4eb443557bca0849f455fc03 Mon Sep 17 00:00:00 2001
From: ILWrites <pikeeb@gmail.com>
Date: Wed, 29 Dec 2021 13:57:40 +0300
Subject: [PATCH 115/867] [Keyboard] Adding Charon keyboard to Charue family
 (#15190)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/charue/charon/charon.c              | 17 ++++
 keyboards/charue/charon/charon.h              | 41 +++++++++
 keyboards/charue/charon/config.h              | 43 ++++++++++
 keyboards/charue/charon/info.json             | 85 +++++++++++++++++++
 .../charue/charon/keymaps/debug/keymap.c      | 76 +++++++++++++++++
 .../charue/charon/keymaps/debug/readme.md     |  1 +
 .../charue/charon/keymaps/default/keymap.c    | 40 +++++++++
 .../charue/charon/keymaps/default/readme.md   |  1 +
 keyboards/charue/charon/keymaps/via/keymap.c  | 48 +++++++++++
 keyboards/charue/charon/keymaps/via/readme.md |  1 +
 keyboards/charue/charon/keymaps/via/rules.mk  |  1 +
 keyboards/charue/charon/readme.md             | 27 ++++++
 keyboards/charue/charon/rules.mk              | 18 ++++
 13 files changed, 399 insertions(+)
 create mode 100644 keyboards/charue/charon/charon.c
 create mode 100644 keyboards/charue/charon/charon.h
 create mode 100644 keyboards/charue/charon/config.h
 create mode 100644 keyboards/charue/charon/info.json
 create mode 100644 keyboards/charue/charon/keymaps/debug/keymap.c
 create mode 100644 keyboards/charue/charon/keymaps/debug/readme.md
 create mode 100644 keyboards/charue/charon/keymaps/default/keymap.c
 create mode 100644 keyboards/charue/charon/keymaps/default/readme.md
 create mode 100644 keyboards/charue/charon/keymaps/via/keymap.c
 create mode 100644 keyboards/charue/charon/keymaps/via/readme.md
 create mode 100644 keyboards/charue/charon/keymaps/via/rules.mk
 create mode 100644 keyboards/charue/charon/readme.md
 create mode 100644 keyboards/charue/charon/rules.mk

diff --git a/keyboards/charue/charon/charon.c b/keyboards/charue/charon/charon.c
new file mode 100644
index 0000000000..2c4a518a31
--- /dev/null
+++ b/keyboards/charue/charon/charon.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Charue Design
+ *
+ * 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 "charon.h"
diff --git a/keyboards/charue/charon/charon.h b/keyboards/charue/charon/charon.h
new file mode 100644
index 0000000000..e8738dda73
--- /dev/null
+++ b/keyboards/charue/charon/charon.h
@@ -0,0 +1,41 @@
+/* Copyright 2021 Charue Design
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f,      \
+     k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,   k1e,  k1f, \
+      k20,  k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,     k2c,    k2e, \
+     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,   k3c,   k3e, k3f, \
+      k40,   k41,  k42,   k43,     k45,      k48,     k4a,  k4b,     k4c, k4e, k4f  \
+) { \
+    { k00, k01, k02, k03, k04,   k05, k06,   k07,   k08, k09,   k0a, k0b, k0c, k0e, k0f   }, \
+    { k10, k11, k12, k13, k14,   k15, k16,   k17,   k18, k19,   k1a, k1b, k1c, k1e, k1f   }, \
+    { k20, k21, k22, k23, k24,   k25, k26,   k27,   k28, k29,   k2a, k2b, k2c, k2e, KC_NO }, \
+    { k30, k31, k32, k33, k34,   k35, k36,   k37,   k38, k39,   k3a, k3b, k3c, k3e, k3f   }, \
+    { k40, k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4e, k4f   }  \
+}
diff --git a/keyboards/charue/charon/config.h b/keyboards/charue/charon/config.h
new file mode 100644
index 0000000000..4ee679f707
--- /dev/null
+++ b/keyboards/charue/charon/config.h
@@ -0,0 +1,43 @@
+/*
+Copyright 2021 Charue Design
+
+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    0x4344 // CD for CharueDesign
+#define PRODUCT_ID   0x4348 // CH for Charon
+#define DEVICE_VER   0x0001 // Revision prototype
+#define MANUFACTURER Charue Design
+#define PRODUCT      Charon
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* Keyboard Matrix Assignments */
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, C7 }
+#define MATRIX_COL_PINS { D3, D5, B4, D7, D6, D4, F7, F6, F5, F4, F1, F0, B5, B6, C6 }
+#define UNUSED_PINS { B7, D0, D1, D2 }
+#define DIODE_DIRECTION COL2ROW
+
+/* LED config */
+#define LED_CAPS_LOCK_PIN E6
+
+/* Set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/charue/charon/info.json b/keyboards/charue/charon/info.json
new file mode 100644
index 0000000000..9702af08cf
--- /dev/null
+++ b/keyboards/charue/charon/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "Charon",
+    "url": "https://charue-design.com/products/charon",
+    "maintainer": "ILWrites",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4},
+                {"x":5, "y":4, "w":2.25},
+                {"x":7.25, "y":4, "w":2.75},
+                {"x":10, "y":4},
+                {"x":11, "y":4, "w":1.5},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/charue/charon/keymaps/debug/keymap.c b/keyboards/charue/charon/keymaps/debug/keymap.c
new file mode 100644
index 0000000000..8e8c045b8b
--- /dev/null
+++ b/keyboards/charue/charon/keymaps/debug/keymap.c
@@ -0,0 +1,76 @@
+/* Copyright 2021 Charue Design
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    QMKBEST = SAFE_RANGE,
+    QMKURL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_all(
+      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_GRV, KC_BSPC,
+        KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
+         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_VOLD,
+  KC_LSFT, KC_BSLS, 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_MUTE,
+      KC_LCTRL, KC_LGUI, KC_LALT, KC_LGUI,     KC_SPC,        KC_SPC,     KC_RGUI,     MO(_FN),              KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [_FN] = LAYOUT_all(
+      RESET,  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_GRV, KC_BSPC,
+        KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
+         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_VOLD,
+  KC_LSFT, KC_BSLS, 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_MUTE,
+      KC_LCTRL, KC_LGUI, KC_LALT, QMKURL,      KC_SPC,        KC_SPC,     QMKBEST,     KC_TRNS,              KC_LEFT, KC_DOWN, KC_RIGHT
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case QMKBEST:
+            if (record->event.pressed) {
+                // when keycode QMKBEST is pressed
+                SEND_STRING("QMK is the best thing ever!");
+            } else {
+                // when keycode QMKBEST is released
+            }
+            break;
+        case QMKURL:
+            if (record->event.pressed) {
+                // when keycode QMKURL is pressed
+                SEND_STRING("https://qmk.fm/\n");
+            } else {
+                // when keycode QMKURL is released
+            }
+            break;
+    };
+    #ifdef CONSOLE_ENABLE
+        uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
+    #endif
+    return true;
+}
+
+void keyboard_post_init_user(void) {
+  debug_enable=true;
+  debug_matrix=true;
+}
diff --git a/keyboards/charue/charon/keymaps/debug/readme.md b/keyboards/charue/charon/keymaps/debug/readme.md
new file mode 100644
index 0000000000..b1b61bf15f
--- /dev/null
+++ b/keyboards/charue/charon/keymaps/debug/readme.md
@@ -0,0 +1 @@
+# The default keymap for charon
diff --git a/keyboards/charue/charon/keymaps/default/keymap.c b/keyboards/charue/charon/keymaps/default/keymap.c
new file mode 100644
index 0000000000..cb16f8eee3
--- /dev/null
+++ b/keyboards/charue/charon/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 Charue Design
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_all(
+      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_GRV, KC_BSPC,
+        KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
+         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_VOLD,
+  KC_LSFT, KC_BSLS, 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_MUTE,
+      KC_LCTRL, KC_LGUI, KC_LALT, KC_LGUI,     KC_SPC,        KC_SPC,     KC_RGUI,     MO(_FN),              KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [_FN] = LAYOUT_all(
+      RESET,  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_GRV, KC_BSPC,
+        KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
+         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_VOLD,
+  KC_LSFT, KC_BSLS, 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_MUTE,
+      KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC,      KC_SPC,        KC_SPC,     KC_SPC,     KC_TRNS,              KC_LEFT, KC_DOWN, KC_RIGHT
+    )
+};
diff --git a/keyboards/charue/charon/keymaps/default/readme.md b/keyboards/charue/charon/keymaps/default/readme.md
new file mode 100644
index 0000000000..b1b61bf15f
--- /dev/null
+++ b/keyboards/charue/charon/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for charon
diff --git a/keyboards/charue/charon/keymaps/via/keymap.c b/keyboards/charue/charon/keymaps/via/keymap.c
new file mode 100644
index 0000000000..3eeb2af267
--- /dev/null
+++ b/keyboards/charue/charon/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 Charue Design
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_all(
+      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_BSPC,
+        KC_TAB,   KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,    KC_BSLS,       KC_VOLU,
+         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_VOLD,
+  KC_LSFT, KC_BSLS, 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_MUTE,
+      KC_LCTRL, KC_LGUI, KC_LALT, KC_LGUI,     KC_SPC,        KC_SPC,     KC_RGUI,     MO(1),                KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT_all(
+    KC_TRNS,  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_TRNS, KC_TRNS,
+      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,    KC_TRNS,     KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,       KC_TRNS,           KC_TRNS,
+  KC_TRNS, KC_TRNS, RESET,    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,                 KC_TRNS, KC_TRNS,
+      KC_TRNS,      KC_TRNS,     KC_TRNS,     KC_TRNS,      KC_TRNS,        KC_TRNS,     KC_TRNS,               KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,    KC_TRNS,     KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,       KC_TRNS,           KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,                 KC_TRNS, KC_TRNS,
+      KC_TRNS,      KC_TRNS,     KC_TRNS,     KC_TRNS,      KC_TRNS,        KC_TRNS,     KC_TRNS,               KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,    KC_TRNS,     KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,       KC_TRNS,           KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,                 KC_TRNS, KC_TRNS,
+      KC_TRNS,      KC_TRNS,     KC_TRNS,     KC_TRNS,      KC_TRNS,        KC_TRNS,     KC_TRNS,               KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/charue/charon/keymaps/via/readme.md b/keyboards/charue/charon/keymaps/via/readme.md
new file mode 100644
index 0000000000..f45f3c54b9
--- /dev/null
+++ b/keyboards/charue/charon/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for charon
diff --git a/keyboards/charue/charon/keymaps/via/rules.mk b/keyboards/charue/charon/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/charue/charon/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/charue/charon/readme.md b/keyboards/charue/charon/readme.md
new file mode 100644
index 0000000000..1732d8a018
--- /dev/null
+++ b/keyboards/charue/charon/readme.md
@@ -0,0 +1,27 @@
+# Charon
+
+![Charon](https://i.imgur.com/fnQLZ2Th.jpg)
+
+A 65% with blocker Keyboard kit made and sold by Charue Design. [More info on charue-design.com](https://charue-design.com/)
+
+* Keyboard Maintainer: [ILWrites](https://github.com/PiKeeb)
+* Hardware Supported: [Charon PCB](https://charue-design.com/collections/charon/)
+* Hardware Availability: [Charue Design](https://charue-design.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make charue/charon:default
+
+Flashing example for this keyboard:
+
+    make charue/charon:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/charue/charon/rules.mk b/keyboards/charue/charon/rules.mk
new file mode 100644
index 0000000000..d6d12ae0db
--- /dev/null
+++ b/keyboards/charue/charon/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # 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 = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From bdce7c8d4a7dc067c31e7115efc1c8caa1bc74bf Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 29 Dec 2021 05:05:37 -0800
Subject: [PATCH 116/867] [Keyboard] Fix via keymap in charue/charon keyboard
 (#15642)

---
 keyboards/charue/charon/keymaps/via/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/charue/charon/keymaps/via/keymap.c b/keyboards/charue/charon/keymaps/via/keymap.c
index 3eeb2af267..680333c6d7 100644
--- a/keyboards/charue/charon/keymaps/via/keymap.c
+++ b/keyboards/charue/charon/keymaps/via/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,                 KC_TRNS, KC_TRNS,
       KC_TRNS,      KC_TRNS,     KC_TRNS,     KC_TRNS,      KC_TRNS,        KC_TRNS,     KC_TRNS,               KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [3] = LAYOUT(
+    [3] = LAYOUT_all(
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
       KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,    KC_TRNS,     KC_TRNS,
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS,       KC_TRNS,           KC_TRNS,

From 0d02af816b6600a7399dacbc703827895b5baa1f Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 29 Dec 2021 05:26:28 -0800
Subject: [PATCH 117/867] [Keyboard] Update grs_70ec to use newer custom matrix
 (#15609)

---
 keyboards/sekigon/grs_70ec/matrix.c | 47 -----------------------------
 1 file changed, 47 deletions(-)

diff --git a/keyboards/sekigon/grs_70ec/matrix.c b/keyboards/sekigon/grs_70ec/matrix.c
index 98b2347937..926ed6f813 100644
--- a/keyboards/sekigon/grs_70ec/matrix.c
+++ b/keyboards/sekigon/grs_70ec/matrix.c
@@ -70,50 +70,3 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
 
     return updated;
 }
-
-bool matrix_post_scan(void) {
-    bool changed = false;
-    if (is_keyboard_master()) {
-        static uint8_t error_count;
-
-        matrix_row_t slave_matrix[ROWS_PER_HAND] = {0};
-        if (!transport_master(matrix + thatHand, slave_matrix)) {
-            error_count++;
-
-            if (error_count > ERROR_DISCONNECT_COUNT) {
-                // reset other half if disconnected
-                dprintf("Error: disconnect split half\n");
-                for (int i = 0; i < ROWS_PER_HAND; ++i) {
-                    matrix[thatHand + i] = 0;
-                    slave_matrix[i]      = 0;
-                }
-
-                changed = true;
-            }
-        } else {
-            error_count = 0;
-
-            for (int i = 0; i < ROWS_PER_HAND; ++i) {
-                if (matrix[thatHand + i] != slave_matrix[i]) {
-                    matrix[thatHand + i] = slave_matrix[i];
-                    changed              = true;
-                }
-            }
-        }
-
-        matrix_scan_quantum();
-    } else {
-        transport_slave(matrix + thatHand, matrix + thisHand);
-
-        matrix_slave_scan_user();
-    }
-    return changed;
-}
-
-uint8_t matrix_scan(void) {
-    bool changed = matrix_scan_custom(raw_matrix) || matrix_post_scan();
-
-    debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed);
-
-    return changed;
-}

From f85b945c328ee5a26a8f6ae7a34930237cf69184 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 29 Dec 2021 05:54:57 -0800
Subject: [PATCH 118/867] [Keyboard] Fix compiler issue with tractyl manuform
 4x6 (#15646)

---
 keyboards/handwired/tractyl_manuform/4x6_right/rules.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
index e83e9a7bba..c497bb2ee8 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
@@ -21,9 +21,7 @@ RGB_MATRIX_DRIVER = WS2812
 
 
 POINTING_DEVICE_ENABLE = yes
-MOUSE_SHARED_EP = no
+POINTING_DEVICE_DRIVER = pmw3360
+MOUSE_SHARED_EP = yes
 
 SPLIT_KEYBOARD = yes
-
-SRC += drivers/sensors/pmw3360.c
-QUANTUM_LIB_SRC += spi_master.c tm_sync.c

From 906108fb486797ab2f3eb7c3a6f70e099c1199e6 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 29 Dec 2021 06:14:48 -0800
Subject: [PATCH 119/867] [Keyboard] Update to ZSA Keyboards (#15644)

---
 keyboards/ergodox_ez/config.h     |  14 ++--
 keyboards/ergodox_ez/ergodox_ez.c |  51 ++++++++++++++
 keyboards/ergodox_ez/ergodox_ez.h |  22 ++++++
 keyboards/ergodox_ez/rules.mk     |  12 ++--
 keyboards/moonlander/config.h     |  12 ++++
 keyboards/moonlander/moonlander.c | 111 +++++++++++-------------------
 keyboards/moonlander/rules.mk     |   3 +
 keyboards/planck/ez/config.h      |  13 ++--
 keyboards/planck/ez/ez.c          |  12 +---
 keyboards/planck/ez/rules.mk      |   7 +-
 10 files changed, 158 insertions(+), 99 deletions(-)

diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index c3b794f108..109a80d2c5 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -43,12 +43,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_EXPANDER_COL_PINS { 5, 4, 3, 2, 1, 0 }
 #define MATRIX_EXPANDER_ROW_PINS { 0, 1, 2, 3, 4, 5, 6 }
 
-
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-#define MOUSEKEY_WHEEL_DELAY 0
+#define MOUSEKEY_INTERVAL           20
+#define MOUSEKEY_DELAY              0
+#define MOUSEKEY_TIME_TO_MAX        60
+#define MOUSEKEY_MAX_SPEED          7
+#define MOUSEKEY_WHEEL_DELAY        400
+#define MOUSEKEY_WHEEL_INTERVAL     MOUSEKEY_INTERVAL
+#define MOUSEKEY_WHEEL_MAX_SPEED    MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_WHEEL_TIME_TO_MAX  MOUSEKEY_TIME_TO_MAX
 
 #define DEBOUNCE 30
 
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c
index 49f690fa70..8d3790088d 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox_ez/ergodox_ez.c
@@ -398,3 +398,54 @@ void eeconfig_init_kb(void) {  // EEPROM is getting reset!
     eeconfig_update_kb(keyboard_config.raw);
     eeconfig_init_user();
 }
+
+#ifdef ORYX_ENABLE
+static uint16_t loops = 0;
+static bool is_on = false;
+#endif
+
+#ifdef DYNAMIC_MACRO_ENABLE
+static bool is_dynamic_recording = false;
+static uint16_t dynamic_loop_timer;
+
+void dynamic_macro_record_start_user(void) {
+    is_dynamic_recording = true;
+    dynamic_loop_timer = timer_read();
+    ergodox_right_led_1_on();
+}
+
+void dynamic_macro_record_end_user(int8_t direction) {
+    is_dynamic_recording = false;
+    layer_state_set_user(layer_state);
+}
+#endif
+
+void matrix_scan_kb(void) {
+#ifdef DYNAMIC_MACRO_ENABLE
+    if (is_dynamic_recording) {
+        ergodox_right_led_1_off();
+        // if (timer_elapsed(dynamic_loop_timer) > 5)
+        {
+            static uint8_t counter;
+            counter++;
+            if (counter > 100) ergodox_right_led_1_on();
+            dynamic_loop_timer = timer_read();
+        }
+    }
+#endif
+
+#ifdef CAPS_LOCK_STATUS
+    led_t led_state = host_keyboard_led_state();
+    if(led_state.caps_lock) {
+        ergodox_right_led_3_on();
+    }
+    else {
+        uint8_t layer = get_highest_layer(layer_state);
+        if(layer != 1) {
+        ergodox_right_led_3_off();
+        }
+    }
+#endif
+
+    matrix_scan_user();
+}
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h
index 7bb2717147..7243a6a18d 100644
--- a/keyboards/ergodox_ez/ergodox_ez.h
+++ b/keyboards/ergodox_ez/ergodox_ez.h
@@ -292,3 +292,25 @@ extern keyboard_config_t keyboard_config;
     { R05, R15, R25, R35, R45, R55 },     \
     { R06, R16, R26, R36, R46, KC_NO }    \
     }
+
+/*  ---- LEFT HAND ----     ---- RIGHT HAND ---- */
+#define LED_LAYOUT_ergodox_pretty(                \
+    L01,L02,L03,L04,L05,    R01,R02,R03,R04,R05,  \
+    L11,L12,L13,L14,L15,    R11,R12,R13,R14,R15,  \
+    L21,L22,L23,L24,L25,    R21,R22,R23,R24,R25,  \
+    L31,L32,L33,L34,L35,    R31,R32,R33,R34,R35,  \
+    L41,L42,L43,L44,            R42,R43,R44,R45 ) \
+                                                  \
+   /* matrix positions */                         \
+    { R01, R02, R03, R04, R05,                    \
+      R11, R12, R13, R14, R15,                    \
+      R21, R22, R23, R24, R25,                    \
+      R31, R32, R33, R34, R35,                    \
+           R42, R43, R44, R45,                    \
+                                                  \
+      L05, L04, L03, L02, L01,                    \
+      L15, L14, L13, L12, L11,                    \
+      L25, L24, L23, L22, L21,                    \
+      L35, L34, L33, L32, L31,                    \
+           L44, L43, L42, L41                     \
+    }
diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk
index e648053922..1b4ace5ee5 100644
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -12,15 +12,15 @@ BOOTLOADER = halfkay
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = no   # Enable Bootmagic Lite
 MOUSEKEY_ENABLE  = yes  # Mouse keys
 EXTRAKEY_ENABLE  = yes  # Audio control and System control
 CONSOLE_ENABLE   = no   # Console for debug
-COMMAND_ENABLE   = yes  # Commands for debug and configuration
+COMMAND_ENABLE   = no   # Commands for debug and configuration
 CUSTOM_MATRIX    = lite # Custom matrix file for the ErgoDox EZ
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-UNICODE_ENABLE   = yes  # Unicode
-SWAP_HANDS_ENABLE= yes  # Allow swapping hands of keyboard
+NKRO_ENABLE      = yes           # Enable N-Key Rollover
+UNICODE_ENABLE   = no  # Unicode
+SWAP_HANDS_ENABLE= no   # Allow swapping hands of keyboard
 
 RGB_MATRIX_ENABLE = no # enable later
 RGB_MATRIX_DRIVER = IS31FL3731
@@ -36,3 +36,5 @@ LAYOUTS = ergodox
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
 BACKLIGHT_SUPPORTED = no
+
+MOUSE_SHARED_EP = no
diff --git a/keyboards/moonlander/config.h b/keyboards/moonlander/config.h
index 1c6cbb5c63..d6686425c4 100644
--- a/keyboards/moonlander/config.h
+++ b/keyboards/moonlander/config.h
@@ -141,6 +141,18 @@
 #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
+// #define RGB_MATRIX_LED_PROCESS_LIMIT 5
+// #define RGB_MATRIX_LED_FLUSH_LIMIT 26
+
+#define MOUSEKEY_INTERVAL           20
+#define MOUSEKEY_DELAY              0
+#define MOUSEKEY_TIME_TO_MAX        60
+#define MOUSEKEY_MAX_SPEED          7
+#define MOUSEKEY_WHEEL_DELAY        400
+#define MOUSEKEY_WHEEL_INTERVAL     MOUSEKEY_INTERVAL
+#define MOUSEKEY_WHEEL_MAX_SPEED    MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_WHEEL_TIME_TO_MAX  MOUSEKEY_TIME_TO_MAX
+
 #define MUSIC_MAP
 
 #define FIRMWARE_VERSION_SIZE 17
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index d5105c26cd..ea50226f0c 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -19,9 +19,6 @@
 
 
 #include "moonlander.h"
-#ifdef WEBUSB_ENABLE
-#    include "webusb.h"
-#endif
 
 keyboard_config_t keyboard_config;
 
@@ -83,50 +80,9 @@ void moonlander_led_task(void) {
         wait_ms(155);
     }
 #endif
-#ifdef WEBUSB_ENABLE
-    else if (webusb_state.pairing == true) {
-        static uint8_t led_mask;
-
-        ML_LED_1(false);
-        ML_LED_2(false);
-        ML_LED_3(false);
-        ML_LED_4(false);
-        ML_LED_5(false);
-        ML_LED_6(false);
-
-        if (!led_mask) {
-            led_mask = 1;
-        } else {
-            led_mask++;
-            if (led_mask > 12) led_mask = 1;
-        }
-        switch (led_mask) {
-            case 1:
-            case 12:
-                ML_LED_1(true);
-                break;
-            case 2:
-            case 11:
-                ML_LED_2(true);
-                break;
-            case 3:
-            case 10:
-                ML_LED_3(true);
-                break;
-            case 4:
-            case 9:
-                ML_LED_4(true);
-                break;
-            case 5:
-            case 8:
-                ML_LED_5(true);
-                break;
-            case 6:
-            case 7:
-                ML_LED_6(true);
-                break;
-        }
-        wait_ms(150);
+#if !defined(MOONLANDER_USER_LEDS)
+    else {
+        layer_state_set_kb(layer_state);
     }
 #endif
 }
@@ -163,40 +119,53 @@ void keyboard_pre_init_kb(void) {
 layer_state_t layer_state_set_kb(layer_state_t state) {
     state = layer_state_set_user(state);
     if (is_launching || !keyboard_config.led_level) return state;
-
-    ML_LED_1(false);
-    ML_LED_2(false);
-    ML_LED_3(false);
-    ML_LED_4(false);
-    ML_LED_5(false);
-    ML_LED_6(false);
+    bool LED_1 = false;
+    bool LED_2 = false;
+    bool LED_3 = false;
+    bool LED_4 = false;
+    bool LED_5 = false;
+    bool LED_6 = false;
 
     uint8_t layer = get_highest_layer(state);
     switch (layer) {
         case 1:
-            ML_LED_1(1);
-            ML_LED_4(1);
+            LED_1 = true;
+            LED_4 = true;
             break;
         case 2:
-            ML_LED_2(1);
-            ML_LED_5(1);
+            LED_2 = true;
+            LED_5 = true;
             break;
         case 3:
-            ML_LED_3(1);
+            LED_3 = true;
+#if !defined(CAPS_LOCK_STATUS)
+            LED_6 = true;
+#endif
             break;
         case 4:
-            ML_LED_4(1);
+            LED_4 = true;
             break;
         case 5:
-            ML_LED_5(1);
+            LED_5 = true;
             break;
         case 6:
-            ML_LED_6(1);
+#if !defined(CAPS_LOCK_STATUS)
+            LED_6 = true;
+#endif
             break;
         default:
             break;
     }
 
+    ML_LED_1(LED_1);
+    ML_LED_2(LED_2);
+    ML_LED_3(LED_3);
+    ML_LED_4(LED_4);
+    ML_LED_5(LED_5);
+#if !defined(CAPS_LOCK_STATUS)
+    ML_LED_6(LED_6);
+#endif
+
     return state;
 }
 #endif
@@ -398,15 +367,19 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_moonlander(
 // clang-format on
 #endif
 
-#ifdef ORYX_CONFIGURATOR
+#ifdef CAPS_LOCK_STATUS
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(res) {
+        ML_LED_6(led_state.caps_lock);
+    }
+    return res;
+}
+#endif
+
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     if (!process_record_user(keycode, record)) { return false; }
     switch (keycode) {
-#ifdef WEBUSB_ENABLE
-        case WEBUSB_PAIR:
-            if (!record->event.pressed && !webusb_state.pairing) layer_state_set_kb(layer_state);
-            break;
-#endif
 #if !defined(MOONLANDER_USER_LEDS)
         case LED_LEVEL:
             if (record->event.pressed) {
@@ -454,8 +427,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-#endif
-
 void matrix_init_kb(void) {
     keyboard_config.raw = eeconfig_read_kb();
 
diff --git a/keyboards/moonlander/rules.mk b/keyboards/moonlander/rules.mk
index 01994ba93a..72682d29b1 100644
--- a/keyboards/moonlander/rules.mk
+++ b/keyboards/moonlander/rules.mk
@@ -16,6 +16,7 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
+AUDIO_DRIVER = dac_additive
 CUSTOM_MATRIX = lite
 SWAP_HANDS_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
@@ -25,3 +26,5 @@ EEPROM_DRIVER = i2c
 #project specific files
 SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
+
+MOUSE_SHARED_EP = no
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h
index 5085514729..537c215096 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -183,8 +183,11 @@
 
 #define TAPPING_TOGGLE  1
 
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_DELAY          0
-#define MOUSEKEY_TIME_TO_MAX    60
-#define MOUSEKEY_MAX_SPEED      7
-#define MOUSEKEY_WHEEL_DELAY 0
+#define MOUSEKEY_INTERVAL           20
+#define MOUSEKEY_DELAY              0
+#define MOUSEKEY_TIME_TO_MAX        60
+#define MOUSEKEY_MAX_SPEED          7
+#define MOUSEKEY_WHEEL_DELAY        400
+#define MOUSEKEY_WHEEL_INTERVAL     MOUSEKEY_INTERVAL
+#define MOUSEKEY_WHEEL_MAX_SPEED    MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_WHEEL_TIME_TO_MAX  MOUSEKEY_TIME_TO_MAX
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 5c68726a01..98ec13085f 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -106,16 +106,6 @@ led_config_t g_led_config = { {
     1, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1
 } };
 
-void suspend_power_down_kb(void) {
-    rgb_matrix_set_color_all(0, 0, 0);
-    rgb_matrix_set_suspend_state(true);
-    suspend_power_down_user();
-}
-
- void suspend_wakeup_init_kb(void) {
-    rgb_matrix_set_suspend_state(false);
-    suspend_wakeup_init_user();
-}
 #endif
 
 /* Left B9   Right B8 */
@@ -259,7 +249,7 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
     planck_ez_left_led_off();
     planck_ez_right_led_off();
     state = layer_state_set_user(state);
-    uint8_t layer = biton32(state);
+    uint8_t layer = get_highest_layer(state);
     switch (layer) {
         case PLANCK_EZ_LED_LOWER:
             planck_ez_left_led_on();
diff --git a/keyboards/planck/ez/rules.mk b/keyboards/planck/ez/rules.mk
index 9da538da61..61d3eb4d4f 100644
--- a/keyboards/planck/ez/rules.mk
+++ b/keyboards/planck/ez/rules.mk
@@ -11,10 +11,11 @@ BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes       # Commands for debug and configuration
+COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = yes          # Audio output
+AUDIO_DRIVER = dac_additive
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
 ENCODER_ENABLE = yes
@@ -26,3 +27,5 @@ LAYOUTS_HAS_RGB = no
 RGB_MATRIX_SUPPORTED = yes
 RGBLIGHT_SUPPORTED = no
 BAKCLIGHT_SUPPORTED = no
+
+MOUSE_SHARED_EP = no

From 1a8a842cfb3e87a82afb57ba29ca59c5fa6fe97b Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 29 Dec 2021 21:35:35 +0000
Subject: [PATCH 120/867] Fix compilation-database command under MSYS (#15652)

* Fix compilation-database command under MSYS

* Add comment
---
 lib/python/qmk/cli/generate/compilation_database.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/python/qmk/cli/generate/compilation_database.py b/lib/python/qmk/cli/generate/compilation_database.py
index 602635270c..7ac0f740fe 100755
--- a/lib/python/qmk/cli/generate/compilation_database.py
+++ b/lib/python/qmk/cli/generate/compilation_database.py
@@ -26,7 +26,8 @@ def system_libs(binary: str) -> List[Path]:
 
     # Actually query xxxxxx-gcc to find its include paths.
     if binary.endswith("gcc") or binary.endswith("g++"):
-        result = cli.run([binary, '-E', '-Wp,-v', '-'], capture_output=True, check=True, input='\n')
+        # (TODO): Remove 'stdin' once 'input' no longer causes issues under MSYS
+        result = cli.run([binary, '-E', '-Wp,-v', '-'], capture_output=True, check=True, stdin=None, input='\n')
         paths = []
         for line in result.stderr.splitlines():
             if line.startswith(" "):

From c4551d7ef1ed2c1069f23cc8499b7c7fc30f3ecf Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 29 Dec 2021 20:17:34 -0800
Subject: [PATCH 121/867] [Keymap] Reorganization, cleanup and readmes for
 drashna code (#15617)

---
 .../4x6_right/keymaps/drashna/keymap.c        | 100 ------
 .../5x6_right/keymaps/drashna/rules.mk        |  46 ++-
 .../keebio/iris/keymaps/drashna/config.h      |   9 -
 .../keebio/iris/keymaps/drashna/rules.mk      |   5 +-
 keyboards/moonlander/keymaps/drashna/keymap.c |  64 +---
 keyboards/moonlander/keymaps/drashna/rules.mk |  10 +-
 .../splitkb/kyria/keymaps/drashna/rules.mk    |  29 +-
 .../work_board/keymaps/drashna/config.h       |   5 +
 .../work_board/keymaps/drashna/keymap.c       |  37 +--
 .../work_board/keymaps/drashna/rules.mk       |   4 +
 layouts/community/ergodox/drashna/config.h    |   7 +-
 layouts/community/ergodox/drashna/keymap.c    |  40 +--
 layouts/community/ortho_4x12/drashna/keymap.c |  55 +---
 layouts/community/ortho_4x12/drashna/rules.mk |  24 +-
 .../community/split_3x6_3/drashna/config.h    |   4 +
 .../community/split_3x6_3/drashna/keymap.c    |   5 +-
 .../community/split_3x6_3/drashna/rules.mk    |  35 +-
 users/drashna/callbacks.c                     | 215 +++++++++++++
 users/drashna/callbacks.h                     |  25 ++
 users/drashna/callbacks.md                    |  71 +++++
 users/drashna/config.h                        |  35 +-
 users/drashna/drashna.c                       | 291 +----------------
 users/drashna/drashna.h                       |  59 +---
 .../autocorrection/autocorrection.c           |  14 +-
 .../autocorrection/autocorrection.h           |   2 +-
 .../make_autocorrection_data.py               |   5 +-
 .../keyrecords/autocorrection/readme.md       | 301 ++++++++++++++++++
 users/drashna/keyrecords/caps_word.c          |   6 +-
 users/drashna/keyrecords/capwords.md          |  36 +++
 users/drashna/keyrecords/keycodes.md          |  18 ++
 users/drashna/keyrecords/process_records.c    |  42 ++-
 users/drashna/keyrecords/process_records.h    |  37 ++-
 users/drashna/keyrecords/readme.md            |   9 +
 .../drashna/{readme => keyrecords}/secrets.md |   0
 .../{readme => keyrecords}/tap_dance.md       |   4 +-
 users/drashna/keyrecords/tap_dances.c         |  17 +-
 users/drashna/keyrecords/tap_dances.h         |  17 +-
 users/drashna/keyrecords/tapping.c            |  64 ++++
 users/drashna/keyrecords/unicode.c            |  37 +--
 users/drashna/keyrecords/unicode.md           |  27 ++
 users/drashna/keyrecords/wrappers.h           |  18 +-
 .../{readme => keyrecords}/wrappers.md        |   0
 users/drashna/oled/drashna_font.h             |   4 +-
 users/drashna/oled/oled_stuff.c               |   9 +-
 users/drashna/oled/readme.md                  |  42 +++
 users/drashna/pointing/pointing.c             |  17 +-
 users/drashna/pointing/pointing.h             |  17 +-
 users/drashna/pointing/readme.md              |  19 ++
 users/drashna/post_config.h                   |  21 +-
 users/drashna/readme.md                       |  24 +-
 users/drashna/readme/handlers.md              |  97 ------
 users/drashna/readme/keycodes.md              |  10 -
 .../drashna/{readme/rgb.md => rgb/readme.md}  |  21 +-
 users/drashna/rgb/rgb_matrix_stuff.c          |  94 ++++--
 users/drashna/rgb/rgb_matrix_stuff.h          |  20 +-
 users/drashna/rgb/rgb_stuff.c                 |  17 +-
 users/drashna/rgb/rgb_stuff.h                 |  17 +-
 users/drashna/rgblight_breathe_table.h        |  17 +-
 users/drashna/rules.mk                        |  41 +--
 users/drashna/split/readme.md                 |  29 ++
 users/drashna/split/transport_sync.c          |  57 +++-
 users/drashna/split/transport_sync.h          |  18 +-
 users/drashna/template.c                      |  17 +-
 users/drashna/template.h                      |  17 +-
 64 files changed, 1291 insertions(+), 1163 deletions(-)
 create mode 100644 users/drashna/callbacks.c
 create mode 100644 users/drashna/callbacks.h
 create mode 100644 users/drashna/callbacks.md
 create mode 100644 users/drashna/keyrecords/autocorrection/readme.md
 create mode 100644 users/drashna/keyrecords/capwords.md
 create mode 100644 users/drashna/keyrecords/keycodes.md
 create mode 100644 users/drashna/keyrecords/readme.md
 rename users/drashna/{readme => keyrecords}/secrets.md (100%)
 rename users/drashna/{readme => keyrecords}/tap_dance.md (96%)
 create mode 100644 users/drashna/keyrecords/tapping.c
 create mode 100644 users/drashna/keyrecords/unicode.md
 rename users/drashna/{readme => keyrecords}/wrappers.md (100%)
 create mode 100644 users/drashna/oled/readme.md
 create mode 100644 users/drashna/pointing/readme.md
 delete mode 100644 users/drashna/readme/handlers.md
 delete mode 100644 users/drashna/readme/keycodes.md
 rename users/drashna/{readme/rgb.md => rgb/readme.md} (69%)
 create mode 100644 users/drashna/split/readme.md

diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
index 78a7db67a9..290ea22c5f 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keymaps/drashna/keymap.c
@@ -115,103 +115,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 };
 // clang-format on
-
-#ifdef POINTING_DEVICE_ENABLE
-static uint16_t mouse_timer           = 0;
-static uint16_t mouse_debounce_timer  = 0;
-static uint8_t  mouse_keycode_tracker = 0;
-bool            tap_toggling          = false;
-
-void process_mouse_user(report_mouse_t* mouse_report, int8_t x, int8_t y) {
-    if ((x || y) && timer_elapsed(mouse_timer) > 125) {
-        mouse_timer = timer_read();
-        if (!layer_state_is(_MOUSE) && !(layer_state_is(_GAMEPAD) || layer_state_is(_DIABLO)) && timer_elapsed(mouse_debounce_timer) > 125) {
-            layer_on(_MOUSE);
-        }
-    }
-
-#    ifdef TAPPING_TERM_PER_KEY
-    if (timer_elapsed(mouse_debounce_timer) > get_tapping_term(KC_BTN1, NULL)
-#    else
-    if (timer_elapsed(mouse_debounce_timer) > TAPPING_TERM
-#    endif
-        || (layer_state_is(_GAMEPAD) || layer_state_is(_DIABLO))) {
-        mouse_report->x = x;
-        mouse_report->y = y;
-    }
-#    ifdef OLED_ENABLE
-    if (x || y) oled_timer = timer_read32();
-#    endif
-}
-
-void matrix_scan_keymap(void) {
-    if (timer_elapsed(mouse_timer) > 650 && layer_state_is(_MOUSE) && !mouse_keycode_tracker && !tap_toggling) {
-        layer_off(_MOUSE);
-    }
-    if (tap_toggling) {
-        if (!layer_state_is(_MOUSE)) {
-            layer_on(_MOUSE);
-        }
-    }
-}
-
-bool process_record_keymap(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-        case TT(_MOUSE):
-            {
-                if (record->event.pressed) {
-                    mouse_keycode_tracker++;
-                } else {
-#    if TAPPING_TOGGLE != 0
-                    if (record->tap.count == TAPPING_TOGGLE) {
-                        tap_toggling ^= 1;
-#        if TAPPING_TOGGLE == 1
-                        if (!tap_toggling) mouse_keycode_tracker -= record->tap.count + 1;
-#        else
-                        if (!tap_toggling) mouse_keycode_tracker -= record->tap.count;
-#        endif
-                    } else {
-                        mouse_keycode_tracker--;
-                    }
-#    endif
-                }
-                mouse_timer = timer_read();
-                break;
-            }
-        case MO(_MOUSE):
-        case DPI_CONFIG:
-        case KC_MS_UP ... KC_MS_WH_RIGHT:
-            record->event.pressed ? mouse_keycode_tracker++ : mouse_keycode_tracker--;
-            mouse_timer = timer_read();
-            break;
-        default:
-            if (layer_state_is(_MOUSE) && !mouse_keycode_tracker) {
-                layer_off(_MOUSE);
-            }
-            mouse_keycode_tracker = 0;
-            mouse_debounce_timer  = timer_read();
-            break;
-    }
-    return true;
-}
-
-layer_state_t layer_state_set_keymap(layer_state_t state) {
-    if (layer_state_cmp(state, _GAMEPAD) || layer_state_cmp(state, _DIABLO)) {
-        state |= (1UL << _MOUSE);
-    }
-    return state;
-}
-#endif
-
-void matrix_init_keymap(void) {
-#ifdef AUDIO_ENABLE
-    extern audio_config_t audio_config;
-
-    if (!is_keyboard_master()) {
-        audio_stop_all();
-        audio_config.enable = false;
-    }
-#endif
-}
-
-void keyboard_post_init_keymap(void) { matrix_init_keymap(); }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
index 9b9032837e..0765bb2c6e 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
@@ -1,14 +1,34 @@
-RGBLIGHT_ENABLE              = yes
-RGBLIGHT_STARTUP_ANIMATION   = yes
-AUDIO_ENABLE                 = yes
-HAPTIC_ENABLE                = no
-COMMAND_ENABLE               = no
-TAP_DANCE_ENABLE             = yes
-UNICODE_ENABLE               = yes
-OLED_ENABLE                  = yes
-WPM_ENABLE                   = yes
-ENCODER_ENABLE               = yes
-ENCODER_MAP_ENABLE           = yes
-# DEBOUNCE_TYPE = sym_eager_pk
+COMMAND_ENABLE                   = no
+RGBLIGHT_ENABLE                  = yes
+RGBLIGHT_STARTUP_ANIMATION       = yes
+AUDIO_ENABLE                     = yes
+HAPTIC_ENABLE                    = no
+TAP_DANCE_ENABLE                 = yes
+OLED_ENABLE                      = yes
+WPM_ENABLE                       = yes
+ENCODER_ENABLE                   = yes
+ENCODER_MAP_ENABLE               = yes
+AUTOCORRECTION_ENABLE            = yes
+CAPS_WORD_ENABLE                 = yes
 
-LTO_SUPPORTED = no
+ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c)
+    RGBLIGHT_ENABLE              = no
+    AUDIO_ENABLE                 = no
+    HAPTIC_ENABLE                = no
+    TAP_DANCE_ENABLE             = no
+    OLED_ENABLE                  = no
+    WPM_ENABLE                   = no
+    ENCODER_ENABLE               = no
+    AUTOCORRECTION_ENABLE        = no
+    LTO_SUPPORTED                = yes
+    SWAP_HANDS_ENABLE            = no
+    CUSTOM_UNICODE_ENABLE        = no
+    CAPS_WORD_ENABLE             = no
+    BOOTLOADER                   = qmk-hid
+    BOOTLOADER_SIZE              = 512
+endif
+ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/teensy2pp)
+    AUTOCORRECTION_ENABLE        = no
+    CAPS_WORD_ENABLE             = yes
+endif
+# DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/keebio/iris/keymaps/drashna/config.h b/keyboards/keebio/iris/keymaps/drashna/config.h
index f68166c98f..cf67aa6984 100644
--- a/keyboards/keebio/iris/keymaps/drashna/config.h
+++ b/keyboards/keebio/iris/keymaps/drashna/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-// #define USE_SERIAL
-#define USE_I2C
-
-/* Select hand configuration */
-
-// #define MASTER_LEFT
-// #define MASTER_RIGHT
 #define EE_HANDS
 
 #ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/keebio/iris/keymaps/drashna/rules.mk b/keyboards/keebio/iris/keymaps/drashna/rules.mk
index ca140d76ce..51b9a105d2 100644
--- a/keyboards/keebio/iris/keymaps/drashna/rules.mk
+++ b/keyboards/keebio/iris/keymaps/drashna/rules.mk
@@ -4,7 +4,6 @@ EXTRAKEY_ENABLE    = yes      # Audio control and System control
 CONSOLE_ENABLE     = no       # Console for debug
 COMMAND_ENABLE     = no       # Commands for debug and configuration
 TAP_DANCE_ENABLE   = no
-RGBLIGHT_ENABLE    = yes
 AUDIO_ENABLE       = no
 NKRO_ENABLE        = yes
 BACKLIGHT_ENABLE   = no
@@ -15,3 +14,7 @@ INDICATOR_LIGHTS            = no
 RGBLIGHT_STARTUP_ANIMATION  = no
 CUSTOM_UNICODE_ENABLE       = no
 CUSTOM_SPLIT_TRANSPORT_SYNC = no
+
+ifneq ($(strip $(KEYBOARD)), keebio/iris/rev6)
+   RGBLIGHT_ENABLE    = yes
+endif
diff --git a/keyboards/moonlander/keymaps/drashna/keymap.c b/keyboards/moonlander/keymaps/drashna/keymap.c
index 1b5280e742..82abdb0055 100644
--- a/keyboards/moonlander/keymaps/drashna/keymap.c
+++ b/keyboards/moonlander/keymaps/drashna/keymap.c
@@ -63,27 +63,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
     [_GAMEPAD] = LAYOUT_moonlander_wrapper(
-        KC_ESC,  KC_NO,   KC_1,    KC_2,    KC_3,    KC_4, HYPR(KC_Q),                 KC_TRNS, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,
-        KC_F1,   KC_K,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                    UC_SHRG, UC_DISA, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_TAB,  KC_G,    KC_A,    KC_S,    KC_D,    KC_F,    KC_TRNS,            TG_GAME, KC_I,    KC_O,    KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_LCTL, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,                                      KC_N,    KC_M,    KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_ESC,  XXXXXXX, KC_1,    KC_2,    KC_3,    KC_4, HYPR(KC_Q),                 _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, KC_NO,
+        KC_F1,   KC_K,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                    UC_SHRG, UC_DISA, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_NO,
+        KC_TAB,  KC_G,    KC_A,    KC_S,    KC_D,    KC_F,    _______,            TG_GAME, KC_I,    KC_O,    XXXXXXX, XXXXXXX, XXXXXXX, KC_NO,
+        KC_LCTL, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,                                      KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX, KC_NO,
         KC_GRV,  KC_U,    KC_I,    KC_Y,    KC_T,             KC_PSCR,                 _______,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_NO,
-                                            KC_V,    KC_SPC,  KC_H,                    KC_NO, KC_NO,  KC_SWAP_NUM
+                                            KC_V,    KC_SPC,  KC_H,                    KC_NO, XXXXXXX,KC_SWAP_NUM
     ),
     [_DIABLO] = LAYOUT_moonlander_wrapper(
-        KC_ESC,  KC_V,    KC_D,    KC_LALT, KC_NO,   KC_NO,   KC_NO,                   KC_TRNS, KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_NO,   KC_NO,
-        KC_TAB,  KC_S,    KC_I,    KC_F,    KC_M,    KC_T,    KC_TRNS,                 KC_TRNS, KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,    KC_G,    KC_TRNS,                 KC_TRNS, KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z,                                      KC_N,    KC_M,     KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_NO,   KC_NO,   KC_L,    KC_J,    KC_F,             KC_PSCR,                 KC_NO,            KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_ESC,  KC_V,    KC_D,    KC_LALT, XXXXXXX, XXXXXXX, XXXXXXX,                 _______, KC_F9,   KC_F10,   KC_F11,  KC_F12,  XXXXXXX, KC_NO,
+        KC_TAB,  KC_S,    KC_I,    KC_F,    KC_M,    KC_T,    _______,                 _______, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, KC_NO,
+        XXXXXXX, KC_1,    KC_2,    KC_3,    KC_4,    KC_G,    XXXXXXX,                 _______, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, KC_NO,
+        KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z,                                      KC_N,    KC_M,     XXXXXXX, XXXXXXX, XXXXXXX, KC_NO,
+        XXXXXXX, XXXXXXX, KC_L,    KC_J,    KC_F,             KC_PSCR,                 XXXXXXX,          XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, KC_NO,
                           KC_DIABLO_CLEAR,  SFT_T(KC_SPACE),  ALT_T(KC_Q),             KC_PGDN, KC_DEL,  KC_ENT
     ),
     [_DIABLOII] = LAYOUT_moonlander_wrapper(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_GRV,  KC_NO,                   KC_TRNS, KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_NO,   KC_NO,
-        KC_TAB,  KC_A,    KC_T,    KC_Q,    KC_I,    KC_M,    TG(_DIABLOII),           KC_TRNS, KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_S,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_NO,                   KC_TRNS, KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_LCTL, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,                                    KC_N,    KC_M,     KC_NO,   KC_NO,   KC_NO,   KC_NO,
-        KC_NO,   KC_NO,   KC_G,    KC_F,    KC_L,             KC_V,                    KC_NO,            KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_GRV,  XXXXXXX,                 _______, KC_F9,   KC_F10,   KC_F11,  KC_F12,  XXXXXXX, KC_NO,
+        KC_TAB,  KC_A,    KC_T,    KC_Q,    KC_I,    KC_M,    TG(_DIABLOII),           _______, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, KC_NO,
+        KC_S,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   XXXXXXX,                 _______, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, KC_NO,
+        KC_LCTL, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,                                    KC_N,    KC_M,     XXXXXXX, XXXXXXX, XXXXXXX, KC_NO,
+        XXXXXXX, XXXXXXX, KC_G,    KC_F,    KC_L,             KC_V,                    XXXXXXX,          XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, KC_NO,
                                             KC_G,    KC_LSFT, KC_LCTL,                 KC_PGDN, KC_DEL,  KC_ENT
     ),
 
@@ -164,7 +164,7 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
 }
 
 #ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     if (layer_state_is(_GAMEPAD)) {
         RGB_MATRIX_INDICATOR_SET_COLOR(11, 0x00, 0xFF, 0x00);  // Q
         RGB_MATRIX_INDICATOR_SET_COLOR(16, 0x00, 0xFF, 0xFF);  // W
@@ -180,37 +180,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         RGB_MATRIX_INDICATOR_SET_COLOR(20, 0x7A, 0x00, 0xFF);                                          // 3
     }
 
-    if (userspace_config.rgb_layer_change) {
-        switch (get_highest_layer(layer_state|default_layer_state)) {
-            case _DEFAULT_LAYER_1:
-                rgb_matrix_layer_helper(DEFAULT_LAYER_1_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DEFAULT_LAYER_2:
-                rgb_matrix_layer_helper(DEFAULT_LAYER_2_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DEFAULT_LAYER_3:
-                rgb_matrix_layer_helper(DEFAULT_LAYER_3_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DEFAULT_LAYER_4:
-                rgb_matrix_layer_helper(DEFAULT_LAYER_4_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _GAMEPAD:
-                rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DIABLO:
-                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed * 8, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _RAISE:
-                rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _LOWER:
-                rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _ADJUST:
-                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-        }
-    }
+    return true;
 }
 #endif
 
diff --git a/keyboards/moonlander/keymaps/drashna/rules.mk b/keyboards/moonlander/keymaps/drashna/rules.mk
index 2a6d20bed5..feb91c774b 100644
--- a/keyboards/moonlander/keymaps/drashna/rules.mk
+++ b/keyboards/moonlander/keymaps/drashna/rules.mk
@@ -1,4 +1,6 @@
-TAP_DANCE_ENABLE   = yes
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-UNICODE_ENABLE     = yes
-UNICODEMAP_ENABLE  = no
+TAP_DANCE_ENABLE      = yes
+BOOTMAGIC_ENABLE      = yes      # Enable Bootmagic Lite
+UNICODE_ENABLE        = yes
+UNICODEMAP_ENABLE     = no
+AUTOCORRECTION_ENABLE = yes
+CAPS_WORD_ENABLE      = yes
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
index 2f4f4d091f..3cdfe1becd 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
@@ -1,20 +1,27 @@
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE            = yes      # Mouse keys
+MOUSEKEY_ENABLE            = no       # Mouse keys
 EXTRAKEY_ENABLE            = yes      # Audio control and System control
-CONSOLE_ENABLE             = yes      # Console for debug
+CONSOLE_ENABLE             = no       # Console for debug
 COMMAND_ENABLE             = no       # Commands for debug and configuration
 NKRO_ENABLE                = yes      # USB Nkey Rollover
-UNICODE_ENABLE             = yes      # Unicode
 OLED_ENABLE                = yes
-OLED_DRIVER                = SSD1306  # Enables the use of OLED displays
 ENCODER_ENABLE             = yes      # Enables the use of one or more encoders
-
 RGBLIGHT_ENABLE            = no       # Enable keyboard RGB underglow
-RGBLIGHT_STARTUP_ANIMATION = yes
-RGB_MATRIX_ENABLE          = yes
-TAP_DANCE_ENABLE           = yes
 KEY_LOCK_ENABLE            = no
 WPM_ENABLE                 = yes
-SWAP_HANDS_ENABLE          = yes
-LTO_ENABLE                 = no
-CTPC                       = yes
+
+ifeq ($(strip $(KEYBOARD)), splitkb/kyria/rev1/proton_c)
+    RGB_MATRIX_ENABLE      = yes
+    CONSOLE_ENABLE         = yes      # Console for debug
+    MOUSEKEY_ENABLE        = yes      # Mouse keys
+    TAP_DANCE_ENABLE       = yes
+    SWAP_HANDS_ENABLE      = yes
+    LTO_ENABLE             = no
+    CTPC                   = yes
+    AUTOCORRECTION_ENABLE  = yes
+    CAPS_WORD_ENABLE       = yes
+else
+    LTO_ENABLE             = yes
+    BOOTLOADER             = qmk-hid
+    BOOTLOADER_SIZE        = 512
+endif
diff --git a/keyboards/work_louder/work_board/keymaps/drashna/config.h b/keyboards/work_louder/work_board/keymaps/drashna/config.h
index 5ea4dc7e48..b3bcaca25d 100644
--- a/keyboards/work_louder/work_board/keymaps/drashna/config.h
+++ b/keyboards/work_louder/work_board/keymaps/drashna/config.h
@@ -15,3 +15,8 @@
  */
 
 #pragma once
+
+#define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 12
+
+#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
diff --git a/keyboards/work_louder/work_board/keymaps/drashna/keymap.c b/keyboards/work_louder/work_board/keymaps/drashna/keymap.c
index 3bbb81bf04..3b0f4921ac 100644
--- a/keyboards/work_louder/work_board/keymaps/drashna/keymap.c
+++ b/keyboards/work_louder/work_board/keymaps/drashna/keymap.c
@@ -126,45 +126,12 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 
 #endif
 
-void rgb_matrix_indicators_user(void) {}
-
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     uint8_t this_mod = get_mods();
     uint8_t this_led = host_keyboard_leds();
     uint8_t this_osm = get_oneshot_mods();
 #define THUMB_LED                                   6
 #define RGB_MATRIX_INDICATOR_SET_COLOR_wrapper(...) RGB_MATRIX_INDICATOR_SET_COLOR(__VA_ARGS__)
-    if (!userspace_config.rgb_layer_change) {
-        switch (get_highest_layer(layer_state | default_layer_state)) {
-            case _GAMEPAD:
-                rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DIABLO:
-                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed * 8, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _RAISE:
-                rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _LOWER:
-                rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _ADJUST:
-                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DEFAULT_LAYER_1:
-                rgb_matrix_layer_helper(DEFAULT_LAYER_1_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DEFAULT_LAYER_2:
-                rgb_matrix_layer_helper(DEFAULT_LAYER_2_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DEFAULT_LAYER_3:
-                rgb_matrix_layer_helper(DEFAULT_LAYER_3_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DEFAULT_LAYER_4:
-                rgb_matrix_layer_helper(DEFAULT_LAYER_4_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-        }
-    }
 
     extern bool host_driver_disabled;
     if (host_driver_disabled) {
@@ -214,4 +181,6 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         RGB_MATRIX_INDICATOR_SET_COLOR(4, 0xFF, 0xFF, 0x00);
         RGB_MATRIX_INDICATOR_SET_COLOR(5, 0xFF, 0xFF, 0x00);
     }
+
+    return true;
 }
diff --git a/keyboards/work_louder/work_board/keymaps/drashna/rules.mk b/keyboards/work_louder/work_board/keymaps/drashna/rules.mk
index 363f2d0edb..6cccd5f8d2 100644
--- a/keyboards/work_louder/work_board/keymaps/drashna/rules.mk
+++ b/keyboards/work_louder/work_board/keymaps/drashna/rules.mk
@@ -1,6 +1,10 @@
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 EXTRAKEY_ENABLE             = yes
+MOUSEKEY_ENABLE             = yes
 TAP_DANCE_ENABLE            = no
 NKRO_ENABLE                 = yes
 RGBLIGHT_STARTUP_ANIMATION  = yes
 ENCODER_MAP_ENABLE          = yes
+
+AUTOCORRECTION_ENABLE = no
+CUSTOM_UNICODE_ENABLE = no
diff --git a/layouts/community/ergodox/drashna/config.h b/layouts/community/ergodox/drashna/config.h
index f9daf277fb..d669f27298 100644
--- a/layouts/community/ergodox/drashna/config.h
+++ b/layouts/community/ergodox/drashna/config.h
@@ -45,6 +45,7 @@
 #    endif
 #endif
 
-#define PIMORONI_TRACKBALL_INVERT_X
-#define PIMORONI_TRACKBALL_INVERT_Y
-#define PIMORONI_TRACKBALL_CLICK
+#ifdef TAPPING_TERM
+#    undef TAPPING_TERM
+#endif
+#define TAPPING_TERM 185
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 3c9bcfeaa2..798680628f 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -317,7 +317,7 @@ void suspend_power_down_keymap(void) { rgb_matrix_set_suspend_state(true); }
 
 void suspend_wakeup_init_keymap(void) { rgb_matrix_set_suspend_state(false); }
 
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     if (layer_state_is(_GAMEPAD)) {
         RGB_MATRIX_INDICATOR_SET_COLOR(32, 0x00, 0xFF, 0x00);  // Q
         RGB_MATRIX_INDICATOR_SET_COLOR(31, 0x00, 0xFF, 0xFF);  // W
@@ -332,43 +332,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         RGB_MATRIX_INDICATOR_SET_COLOR((userspace_config.swapped_numbers ? 27 : 26), 0x00, 0xFF, 0x00);  // 2
         RGB_MATRIX_INDICATOR_SET_COLOR(25, 0x7A, 0x00, 0xFF);                                            // 3
     }
-
-#    if defined(RGBLIGHT_ENABLE)
-    if (!userspace_config.rgb_layer_change)
-#    else
-    if (userspace_config.rgb_layer_change)
-#    endif
-    {
-        switch (get_highest_layer(layer_state | default_layer_state)) {
-            case _GAMEPAD:
-                rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DIABLO:
-                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed * 8, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _RAISE:
-                rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _LOWER:
-                rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _ADJUST:
-                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DEFAULT_LAYER_1:
-                rgb_matrix_layer_helper(DEFAULT_LAYER_1_HSV, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DEFAULT_LAYER_2:
-                rgb_matrix_layer_helper(DEFAULT_LAYER_2_HSV, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DEFAULT_LAYER_3:
-                rgb_matrix_layer_helper(DEFAULT_LAYER_3_HSV, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DEFAULT_LAYER_4:
-                rgb_matrix_layer_helper(DEFAULT_LAYER_4_HSV, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-        }
-    }
+    return true;
 }
 
 #endif  // RGB_MATRIX_INIT
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c
index 3ba9cf64f9..ce241fd76d 100644
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -201,17 +201,8 @@ led_config_t g_led_config = {
 // clange-format on
 #    endif
 
-// clang-format off
-void suspend_power_down_keymap(void) {
-    rgb_matrix_set_suspend_state(true);
-}
 
-void suspend_wakeup_init_keymap(void) {
-    rgb_matrix_set_suspend_state(false);
-}
-// clang-format on
-
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     uint8_t this_mod = get_mods();
     uint8_t this_led = host_keyboard_leds();
     uint8_t this_osm = get_oneshot_mods();
@@ -221,48 +212,6 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 #        define THUMB_LED 42
 #    endif
 #    define RGB_MATRIX_INDICATOR_SET_COLOR_wrapper(...) RGB_MATRIX_INDICATOR_SET_COLOR(__VA_ARGS__)
-#    if defined(RGBLIGHT_ENABLE)
-    if (!userspace_config.rgb_layer_change)
-#    else
-    if (userspace_config.rgb_layer_change)
-#    endif
-    {
-        switch (get_highest_layer(layer_state)) {
-            case _GAMEPAD:
-                rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _DIABLO:
-                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed * 8, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _RAISE:
-                rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _LOWER:
-                rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            case _ADJUST:
-                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                break;
-            default:
-                {
-                    switch (get_highest_layer(default_layer_state)) {
-                        case _DEFAULT_LAYER_1:
-                            rgb_matrix_layer_helper(DEFAULT_LAYER_1_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                            break;
-                        case _DEFAULT_LAYER_2:
-                            rgb_matrix_layer_helper(DEFAULT_LAYER_2_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                            break;
-                        case _DEFAULT_LAYER_3:
-                            rgb_matrix_layer_helper(DEFAULT_LAYER_3_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                            break;
-                        case _DEFAULT_LAYER_4:
-                            rgb_matrix_layer_helper(DEFAULT_LAYER_4_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
-                            break;
-                    }
-                    break;
-                }
-        }
-    }
 
     switch (get_highest_layer(default_layer_state)) {
         case _DEFAULT_LAYER_1:
@@ -296,6 +245,8 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     if ((this_mod | this_osm) & MOD_MASK_ALT) {
         RGB_MATRIX_INDICATOR_SET_COLOR(38, 0x00, 0x00, 0xFF);
     }
+
+    return true;
 }
 
 void matrix_init_keymap(void) {
diff --git a/layouts/community/ortho_4x12/drashna/rules.mk b/layouts/community/ortho_4x12/drashna/rules.mk
index d766245260..2905fb0fd4 100644
--- a/layouts/community/ortho_4x12/drashna/rules.mk
+++ b/layouts/community/ortho_4x12/drashna/rules.mk
@@ -1,33 +1,35 @@
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE    = no       # Mouse keys(+4700)
-EXTRAKEY_ENABLE    = yes       # Audio control and System control(+450)
+MOUSEKEY_ENABLE    = no       # Mouse keys
+EXTRAKEY_ENABLE    = yes       # Audio control and System control
 TAP_DANCE_ENABLE   = no
 SPACE_CADET_ENABLE = no
 NKRO_ENABLE        = yes
+CAPS_WORD_ENABLE   = no
 
 ifneq ($(strip $(KEYBOARD)), planck/rev6)
-    CONSOLE_ENABLE    			= no
-    COMMAND_ENABLE    			= no
+    CONSOLE_ENABLE              = no
+    COMMAND_ENABLE              = no
     ifeq ($(strip $(LAYOUT_HAS_RGB)), yes)
         RGBLIGHT_ENABLE         = yes
-        INDICATOR_LIGHTS            = yes
+        INDICATOR_LIGHTS        = yes
         RGBLIGHT_STARTUP_ANIMATION  = yes
     endif
 else
-    CONSOLE_ENABLE    			= yes
-    COMMAND_ENABLE    			= yes
+    CONSOLE_ENABLE              = yes
     RGBLIGHT_ENABLE             = yes
     RGBLIGHT_STARTUP_ANIMATION  = yes
     RGB_MATRIX_ENABLE           = no
-    AUDIO_ENABLE       			= yes
-    EEPROM_DRIVER 				= i2c
+    AUDIO_ENABLE                = yes
+    EEPROM_DRIVER               = i2c
     ENCODER_MAP_ENABLE          = yes
+    AUTOCORRECTION_ENABLE       = yes
+    CAPS_WORD_ENABLE            = yes
 endif
 ifeq ($(strip $(KEYBOARD)), planck/light)
     RGB_MATRIX_ENABLE           = yes
     RGBLIGHT_ENABLE             = yes
     RGBLIGHT_STARTUP_ANIMATION  = yes
-    AUDIO_ENABLE       			= yes
+    AUDIO_ENABLE                = yes
 endif
 ifeq ($(strip $(KEYBOARD)), planck/ez)
     RGBLIGHT_ENABLE             = no
@@ -39,4 +41,6 @@ ifeq ($(strip $(KEYBOARD)), planck/ez)
     CONSOLE_ENABLE              = yes
     COMMAND_ENABLE              = yes
     AUDIO_ENABLE                = yes
+    AUTOCORRECTION_ENABLE       = yes
+    CAPS_WORD_ENABLE            = yes
 endif
diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h
index b86448c671..cfcb873a80 100644
--- a/layouts/community/split_3x6_3/drashna/config.h
+++ b/layouts/community/split_3x6_3/drashna/config.h
@@ -93,3 +93,7 @@
 #endif
 
 #define TAPPING_TERM_PER_KEY
+#ifdef TAPPING_TERM
+#    undef TAPPING_TERM
+#endif
+#define TAPPING_TERM 200
diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c
index 7c31972e3f..476ca5fcef 100644
--- a/layouts/community/split_3x6_3/drashna/keymap.c
+++ b/layouts/community/split_3x6_3/drashna/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_MAKE, _________________ADJUST_L1_________________,                    _________________ADJUST_R1_________________, KC_RESET,
     VRSN,    _________________ADJUST_L2_________________,                    _________________ADJUST_R2_________________, EEP_RST,
     KEYLOCK, _________________ADJUST_L3_________________,                    _________________ADJUST_R3_________________, RGB_IDL,
-                                     HPT_TOG, KC_NUKE, _______,        _______, TG_MODS, HPT_FBK
+                                     AUTO_CTN,KC_NUKE, _______,        _______, TG_MODS, HPT_FBK
   )
 };
 // clang-format on
@@ -265,7 +265,7 @@ void check_default_layer(uint8_t mode, uint8_t type, uint8_t led_min, uint8_t le
     }
 }
 
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) {
     if (userspace_config.rgb_layer_change) {
         switch (get_highest_layer(layer_state)) {
             case _GAMEPAD:
@@ -291,5 +291,6 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
         }
         check_default_layer(0, LED_FLAG_MODIFIER, led_min, led_max);
     }
+    return false;
 }
 #endif
diff --git a/layouts/community/split_3x6_3/drashna/rules.mk b/layouts/community/split_3x6_3/drashna/rules.mk
index cf2dfbdc88..9164dcdeba 100644
--- a/layouts/community/split_3x6_3/drashna/rules.mk
+++ b/layouts/community/split_3x6_3/drashna/rules.mk
@@ -1,9 +1,8 @@
-
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
+#   change to "no" to disable the options
 #
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+
+BOOTMAGIC_ENABLE           = yes # Enable Bootmagic Lite
 MOUSEKEY_ENABLE            = no  # Mouse keys
 EXTRAKEY_ENABLE            = yes # Audio control and System control
 CONSOLE_ENABLE             = no  # Console for debug
@@ -12,27 +11,25 @@ NKRO_ENABLE                = yes # Nkey Rollover - if this doesn't work, see her
 BACKLIGHT_ENABLE           = no  # Enable keyboard backlight functionality
 AUDIO_ENABLE               = no  # Audio output
 UNICODE_ENABLE             = no  # Unicode
-BLUETOOTH_ENABLE           = no  # Enable Bluetooth
 RGBLIGHT_ENABLE            = no  # Enable WS2812 RGB underlight.
 SWAP_HANDS_ENABLE          = no  # Enable one-hand typing
 
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
 ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
-    OLED_ENABLE = yes
-    RGB_MATRIX_ENABLE = yes
-    HAPTIC_ENABLE = no
+    OLED_ENABLE            = yes
+    RGB_MATRIX_ENABLE      = yes
+    HAPTIC_ENABLE          = no
 endif
 
 ifeq ($(strip $(CTPC)), yes)
-    HAPTIC_ENABLE = no
-    WS2812_DRIVER = pwm # won't work without a patch to the ctpc mk file
-    SERIAL_DRIVER = usart
-    SWAP_HANDS_ENABLE = yes
-    WPM_ENABLE = yes
+    HAPTIC_ENABLE          = no
+    WS2812_DRIVER          = pwm # won't work without a patch to the ctpc mk file
+    SERIAL_DRIVER          = usart
+    SWAP_HANDS_ENABLE      = yes
+    WPM_ENABLE             = yes
+    AUTOCORRECTION_ENABLE  = yes
+    CAPS_WORD_ENABLE       = yes
 else
-    CUSTOM_UNICODE_ENABLE = no
-    BOOTLOADER = qmk-hid
-    BOOTLOADER_SIZE = 512
+    CUSTOM_UNICODE_ENABLE  = no
+    BOOTLOADER             = qmk-hid
+    BOOTLOADER_SIZE        = 512
 endif
diff --git a/users/drashna/callbacks.c b/users/drashna/callbacks.c
new file mode 100644
index 0000000000..48b076b6ba
--- /dev/null
+++ b/users/drashna/callbacks.c
@@ -0,0 +1,215 @@
+// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "drashna.h"
+
+__attribute__((weak)) void keyboard_pre_init_keymap(void) {}
+void                       keyboard_pre_init_user(void) {
+    userspace_config.raw = eeconfig_read_user();
+    keyboard_pre_init_keymap();
+}
+// Add reconfigurable functions here, for keymap customization
+// This allows for a global, userspace functions, and continued
+// customization of the keymap.  Use _keymap instead of _user
+// functions in the keymaps
+// Call user matrix init, set default RGB colors and then
+// call the keymap's init function
+__attribute__((weak)) void matrix_init_keymap(void) {}
+__attribute__((weak)) void matrix_init_secret(void) {}
+void                       matrix_init_user(void) {
+#if defined(BOOTLOADER_CATERINA) && defined(__AVR__) && defined(__AVR_ATmega32U4__)
+    DDRD &= ~(1 << 5);
+    PORTD &= ~(1 << 5);
+
+    DDRB &= ~(1 << 0);
+    PORTB &= ~(1 << 0);
+#endif
+#ifdef CUSTOM_UNICODE_ENABLE
+    matrix_init_unicode();
+#endif
+    matrix_init_secret();
+    matrix_init_keymap();
+}
+
+__attribute__((weak)) void keyboard_post_init_keymap(void) {}
+void                       keyboard_post_init_user(void) {
+#if defined(RGBLIGHT_ENABLE)
+    keyboard_post_init_rgb_light();
+#endif
+#if defined(RGB_MATRIX_ENABLE)
+    keyboard_post_init_rgb_matrix();
+#endif
+#if defined(SPLIT_KEYBOARD) && defined(SPLIT_TRANSACTION_IDS_USER)
+    keyboard_post_init_transport_sync();
+#endif
+    keyboard_post_init_keymap();
+}
+
+#ifdef RGB_MATRIX_ENABLE
+void rgb_matrix_update_pwm_buffers(void);
+#endif
+
+__attribute__((weak)) void shutdown_keymap(void) {}
+void                       shutdown_user(void) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_enable_noeeprom();
+    rgblight_mode_noeeprom(1);
+    rgblight_setrgb_red();
+#endif  // RGBLIGHT_ENABLE
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_set_color_all(0xFF, 0x00, 0x00);
+    rgb_matrix_update_pwm_buffers();
+#endif  // RGB_MATRIX_ENABLE
+#ifdef OLED_ENABLE
+    oled_off();
+#endif
+
+    shutdown_keymap();
+}
+
+__attribute__((weak)) void suspend_power_down_keymap(void) {}
+
+void suspend_power_down_user(void) {
+#ifdef OLED_ENABLE
+    oled_off();
+#endif
+    suspend_power_down_keymap();
+}
+
+__attribute__((weak)) void suspend_wakeup_init_keymap(void) {}
+void                       suspend_wakeup_init_user(void) {
+    if (layer_state_is(_GAMEPAD)) {
+        layer_off(_GAMEPAD);
+    }
+    if (layer_state_is(_DIABLO)) {
+        layer_off(_DIABLO);
+    }
+    suspend_wakeup_init_keymap();
+}
+
+// No global matrix scan code, so just run keymap's matrix
+// scan function
+__attribute__((weak)) void matrix_scan_keymap(void) {}
+__attribute__((weak)) void matrix_scan_secret(void) {}
+void                       matrix_scan_user(void) {
+    static bool has_ran_yet;
+    if (!has_ran_yet) {
+        has_ran_yet = true;
+        startup_user();
+    }
+
+#ifdef TAP_DANCE_ENABLE  // Run Diablo 3 macro checking code.
+    run_diablo_macro_check();
+#endif  // TAP_DANCE_ENABLE
+
+#if defined(RGBLIGHT_ENABLE)
+    matrix_scan_rgb_light();
+#endif  // RGBLIGHT_ENABLE
+#if defined(RGB_MATRIX_ENABLE)
+    matrix_scan_rgb_matrix();
+#endif
+#if defined(POINTING_DEVICE_ENABLE)
+    matrix_scan_pointing();
+#endif
+
+    matrix_scan_secret();
+
+    matrix_scan_keymap();
+}
+
+#ifdef AUDIO_ENABLE
+float doom_song[][2] = SONG(E1M1_DOOM);
+#endif
+
+// on layer change, no matter where the change was initiated
+// Then runs keymap's layer change check
+__attribute__((weak)) layer_state_t layer_state_set_keymap(layer_state_t state) { return state; }
+layer_state_t                       layer_state_set_user(layer_state_t state) {
+    if (!is_keyboard_master()) {
+        return state;
+    }
+
+    state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
+#if defined(POINTING_DEVICE_ENABLE)
+    state = layer_state_set_pointing(state);
+#endif
+#if defined(RGBLIGHT_ENABLE)
+    state = layer_state_set_rgb_light(state);
+#endif  // RGBLIGHT_ENABLE
+#if defined(AUDIO_ENABLE) && !defined(__arm__)
+    static bool is_gamepad_on = false;
+    if (layer_state_cmp(state, _GAMEPAD) != is_gamepad_on) {
+        is_gamepad_on = layer_state_cmp(state, _GAMEPAD);
+        if (is_gamepad_on) {
+            PLAY_LOOP(doom_song);
+        } else {
+            stop_all_notes();
+        }
+    }
+#endif
+    state = layer_state_set_keymap(state);
+    return state;
+}
+
+// Runs state check and changes underglow color and animation
+__attribute__((weak)) layer_state_t default_layer_state_set_keymap(layer_state_t state) { return state; }
+layer_state_t                       default_layer_state_set_user(layer_state_t state) {
+    if (!is_keyboard_master()) {
+        return state;
+    }
+
+    state = default_layer_state_set_keymap(state);
+#if 0
+#    if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+  state = default_layer_state_set_rgb(state);
+#    endif  // RGBLIGHT_ENABLE
+#endif
+    return state;
+}
+
+__attribute__((weak)) void led_set_keymap(uint8_t usb_led) {}
+void                       led_set_user(uint8_t usb_led) { led_set_keymap(usb_led); }
+
+__attribute__((weak)) void eeconfig_init_keymap(void) {}
+void                       eeconfig_init_user(void) {
+    userspace_config.raw              = 0;
+    userspace_config.rgb_layer_change = true;
+    eeconfig_update_user(userspace_config.raw);
+    eeconfig_init_keymap();
+}
+
+#ifdef SPLIT_KEYBOARD
+__attribute__((weak)) void matrix_slave_scan_keymap(void) {}
+void                       matrix_slave_scan_user(void) {
+#    if defined(AUDIO_ENABLE)
+#        if !defined(NO_MUSIC_MODE)
+    music_task();
+#        endif
+#        ifdef AUDIO_INIT_DELAY
+    if (!is_keyboard_master()) {
+        static bool delayed_tasks_run = false;
+        static uint16_t delayed_task_timer = 0;
+        if (!delayed_tasks_run) {
+            if (!delayed_task_timer) {
+                delayed_task_timer = timer_read();
+            } else if (timer_elapsed(delayed_task_timer) > 300) {
+                audio_startup();
+                delayed_tasks_run = true;
+            }
+        }
+    }
+#        endif
+#    endif
+#    ifdef SEQUENCER_ENABLE
+    sequencer_task();
+#    endif
+#    ifdef LED_MATRIX_ENABLE
+    led_matrix_task();
+#    endif
+#    ifdef HAPTIC_ENABLE
+    haptic_task();
+#    endif
+
+    matrix_slave_scan_keymap();
+}
+#endif
diff --git a/users/drashna/callbacks.h b/users/drashna/callbacks.h
new file mode 100644
index 0000000000..f6ac6b88de
--- /dev/null
+++ b/users/drashna/callbacks.h
@@ -0,0 +1,25 @@
+// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+void          matrix_init_keymap(void);
+void          matrix_init_secret(void);
+void          shutdown_keymap(void);
+void          suspend_power_down_keymap(void);
+void          suspend_wakeup_init_keymap(void);
+void          matrix_scan_keymap(void);
+void          matrix_scan_secret(void);
+layer_state_t layer_state_set_keymap(layer_state_t state);
+layer_state_t default_layer_state_set_keymap(layer_state_t state);
+void          led_set_keymap(uint8_t usb_led);
+void          eeconfig_init_keymap(void);
+
+#ifdef CUSTOM_UNICODE_ENABLE
+void matrix_init_unicode(void);
+#endif
+#ifdef SPLIT_KEYBOARD
+void matrix_slave_scan_keymap(void);
+#endif
diff --git a/users/drashna/callbacks.md b/users/drashna/callbacks.md
new file mode 100644
index 0000000000..a0f0d9fdae
--- /dev/null
+++ b/users/drashna/callbacks.md
@@ -0,0 +1,71 @@
+# Custom Userspace Callback Functions
+
+Specifically QMK works by using customized callback functions for everything. This allows for multiple levels of customization. 
+
+`matrix_scan` calls `matrix_scan_quantum`, which calls `matrix_scan_kb`, which calls `matrix_scan_user`. 
+`process_record` calls a bunch of stuff, but eventually calls `process_record_kb` which calls `process_record_user`
+The same goes for `matrix_init`, `layer_state_set`, `led_set`, and a few other functions.  
+
+All (most) `_user` functions are handled here, in the userspace instead.  To allow keyboard specific configuration, I've created `_keymap` functions that can be called by the keymap.c files instead.
+
+This allows for keyboard specific configuration while maintaining the ability to customize the board.
+
+My [Ergodox EZ Keymap](https://github.com/qmk/qmk_firmware/blob/master/layouts/community/ergodox/drashna/keymap.c) is a good example of this, as it uses the LEDs as modifier indicators.
+
+You can see a list of these files in [callbacks.c](callbacks.c), or a shortend list here 
+
+```c
+__attribute__((weak)) void matrix_init_keymap(void) {}
+void                       matrix_init_user(void) {
+    matrix_init_keymap();
+}
+
+__attribute__((weak)) void keyboard_post_init_keymap(void) {}
+void                       keyboard_post_init_user(void) {
+    keyboard_post_init_keymap();
+}
+
+__attribute__((weak)) void matrix_scan_keymap(void) {}
+void                       matrix_scan_user(void) {
+    matrix_scan_keymap();
+}
+
+__attribute__ ((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; }
+bool                        process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_keymap(keycode, record)) { return false; }
+    return true;
+}
+
+__attribute__((weak)) layer_state_t layer_state_set_keymap(layer_state_t state) { return state; }
+layer_state_t                       layer_state_set_user(layer_state_t state) {
+    state = layer_state_set_keymap(state);
+    return state;
+}
+
+__attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) {}
+void                        led_set_user(uint8_t usb_led) {
+    led_set_keymap(usb_led);
+}
+
+__attribute__ ((weak)) void suspend_power_down_keymap(void) {}
+void                        suspend_power_down_user(void) {
+    suspend_power_down_keymap();
+}
+
+__attribute__ ((weak)) void suspend_wakeup_init_keymap(void) {}
+void                        suspend_wakeup_init_user(void) {
+    suspend_wakeup_init_keymap();
+}
+
+
+__attribute__ ((weak)) void shutdown_keymap(void) {}
+void                        shutdown_user (void) {
+    shutdown_keymap();
+}
+
+__attribute__ ((weak)) void eeconfig_init_keymap(void) {}
+void                   eeconfig_init_user(void) {
+    eeconfig_update_user(0);
+    eeconfig_init_keymap();
+}
+```
diff --git a/users/drashna/config.h b/users/drashna/config.h
index cc8f9ac83c..46cd276dd4 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -1,24 +1,16 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
 // Use custom magic number so that when switching branches, EEPROM always gets reset
 #define EECONFIG_MAGIC_NUMBER   (uint16_t)0x1339
 
+#ifdef IS_COMMAND
+#undef IS_COMMAND
+#endif
+#define IS_COMMAND() (((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) == MOD_MASK_SHIFT)
+
 /* Set Polling rate to 1000Hz */
 #define USB_POLLING_INTERVAL_MS 1
 
@@ -37,7 +29,7 @@
 #        define SELECT_SOFT_SERIAL_SPEED 1
 #    endif
 #    ifdef CUSTOM_SPLIT_TRANSPORT_SYNC
-#        define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_STATE_SYNC, RPC_ID_USER_KEYMAP_SYNC, RPC_ID_USER_CONFIG_SYNC
+#        define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_STATE_SYNC, RPC_ID_USER_KEYMAP_SYNC, RPC_ID_USER_CONFIG_SYNC, RPC_ID_USER_WATCHDOG_SYNC
 #    endif
 #endif
 
@@ -251,17 +243,6 @@
 #    define TAPPING_TOGGLE 1
 #endif
 
-#ifdef TAPPING_TERM
-#    undef TAPPING_TERM
-#endif  // TAPPING_TERM
-#if defined(KEYBOARD_ergodox_ez)
-#    define TAPPING_TERM 185
-#elif defined(KEYBOARD_crkbd)
-#    define TAPPING_TERM 200
-#else
-#    define TAPPING_TERM 175
-#endif
-
 #define TAP_CODE_DELAY 5
 
 /* Disable unused and unneeded features to reduce on firmware size */
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index 9c1233ed90..9128a89bc6 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "drashna.h"
 
@@ -49,182 +36,6 @@ bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this
     return false;
 }
 
-__attribute__((weak)) void keyboard_pre_init_keymap(void) {}
-void                       keyboard_pre_init_user(void) {
-    userspace_config.raw = eeconfig_read_user();
-    keyboard_pre_init_keymap();
-}
-// Add reconfigurable functions here, for keymap customization
-// This allows for a global, userspace functions, and continued
-// customization of the keymap.  Use _keymap instead of _user
-// functions in the keymaps
-// Call user matrix init, set default RGB colors and then
-// call the keymap's init function
-__attribute__((weak)) void matrix_init_keymap(void) {}
-__attribute__((weak)) void matrix_init_secret(void) {}
-void                       matrix_init_user(void) {
-#if defined(BOOTLOADER_CATERINA) && defined(__AVR__)
-    DDRD &= ~(1 << 5);
-    PORTD &= ~(1 << 5);
-
-    DDRB &= ~(1 << 0);
-    PORTB &= ~(1 << 0);
-#endif
-#ifdef CUSTOM_UNICODE_ENABLE
-    matrix_init_unicode();
-#endif
-    matrix_init_secret();
-    matrix_init_keymap();
-}
-
-__attribute__((weak)) void keyboard_post_init_keymap(void) {}
-void                       keyboard_post_init_user(void) {
-#if defined(RGBLIGHT_ENABLE)
-    keyboard_post_init_rgb_light();
-#endif
-#if defined(RGB_MATRIX_ENABLE)
-    keyboard_post_init_rgb_matrix();
-#endif
-#if defined(SPLIT_KEYBOARD) && defined(SPLIT_TRANSACTION_IDS_USER)
-    keyboard_post_init_transport_sync();
-#endif
-    keyboard_post_init_keymap();
-}
-
-#ifdef RGB_MATRIX_ENABLE
-void rgb_matrix_update_pwm_buffers(void);
-#endif
-
-__attribute__((weak)) void shutdown_keymap(void) {}
-void                       shutdown_user(void) {
-#ifdef RGBLIGHT_ENABLE
-    rgblight_enable_noeeprom();
-    rgblight_mode_noeeprom(1);
-    rgblight_setrgb_red();
-#endif  // RGBLIGHT_ENABLE
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_set_color_all(0xFF, 0x00, 0x00);
-    rgb_matrix_update_pwm_buffers();
-#endif  // RGB_MATRIX_ENABLE
-#ifdef OLED_ENABLE
-    oled_off();
-#endif
-
-    shutdown_keymap();
-}
-
-__attribute__((weak)) void suspend_power_down_keymap(void) {}
-
-void suspend_power_down_user(void) {
-#ifdef OLED_ENABLE
-    oled_off();
-#endif
-    suspend_power_down_keymap();
-}
-
-__attribute__((weak)) void suspend_wakeup_init_keymap(void) {}
-void                       suspend_wakeup_init_user(void) {
-    if (layer_state_is(_GAMEPAD)) {
-        layer_off(_GAMEPAD);
-    }
-    if (layer_state_is(_DIABLO)) {
-        layer_off(_DIABLO);
-    }
-    suspend_wakeup_init_keymap();
-}
-
-// No global matrix scan code, so just run keymap's matrix
-// scan function
-__attribute__((weak)) void matrix_scan_keymap(void) {}
-__attribute__((weak)) void matrix_scan_secret(void) {}
-void                       matrix_scan_user(void) {
-    static bool has_ran_yet;
-    if (!has_ran_yet) {
-        has_ran_yet = true;
-        startup_user();
-    }
-
-#ifdef TAP_DANCE_ENABLE  // Run Diablo 3 macro checking code.
-    run_diablo_macro_check();
-#endif  // TAP_DANCE_ENABLE
-
-#if defined(RGBLIGHT_ENABLE)
-    matrix_scan_rgb_light();
-#endif  // RGBLIGHT_ENABLE
-#if defined(RGB_MATRIX_ENABLE)
-    matrix_scan_rgb_matrix();
-#endif
-#if defined(POINTING_DEVICE_ENABLE)
-    matrix_scan_pointing();
-#endif
-
-    matrix_scan_secret();
-
-    matrix_scan_keymap();
-}
-
-#ifdef AUDIO_ENABLE
-float doom_song[][2] = SONG(E1M1_DOOM);
-#endif
-
-// on layer change, no matter where the change was initiated
-// Then runs keymap's layer change check
-__attribute__((weak)) layer_state_t layer_state_set_keymap(layer_state_t state) { return state; }
-layer_state_t                       layer_state_set_user(layer_state_t state) {
-    if (!is_keyboard_master()) {
-        return state;
-    }
-
-    state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-#if defined(POINTING_DEVICE_ENABLE)
-    state = layer_state_set_pointing(state);
-#endif
-#if defined(RGBLIGHT_ENABLE)
-    state = layer_state_set_rgb_light(state);
-#endif  // RGBLIGHT_ENABLE
-#if defined(AUDIO_ENABLE) && !defined(__arm__)
-    static bool is_gamepad_on = false;
-    if (layer_state_cmp(state, _GAMEPAD) != is_gamepad_on) {
-        is_gamepad_on = layer_state_cmp(state, _GAMEPAD);
-        if (is_gamepad_on) {
-            PLAY_LOOP(doom_song);
-        } else {
-            stop_all_notes();
-        }
-    }
-#endif
-    state = layer_state_set_keymap(state);
-    return state;
-}
-
-// Runs state check and changes underglow color and animation
-__attribute__((weak)) layer_state_t default_layer_state_set_keymap(layer_state_t state) { return state; }
-layer_state_t                       default_layer_state_set_user(layer_state_t state) {
-    if (!is_keyboard_master()) {
-        return state;
-    }
-
-    state = default_layer_state_set_keymap(state);
-#if 0
-#    if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-  state = default_layer_state_set_rgb(state);
-#    endif  // RGBLIGHT_ENABLE
-#endif
-    return state;
-}
-
-__attribute__((weak)) void led_set_keymap(uint8_t usb_led) {}
-void                       led_set_user(uint8_t usb_led) { led_set_keymap(usb_led); }
-
-__attribute__((weak)) void eeconfig_init_keymap(void) {}
-void                       eeconfig_init_user(void) {
-    userspace_config.raw              = 0;
-    userspace_config.rgb_layer_change = true;
-    eeconfig_update_user(userspace_config.raw);
-    eeconfig_init_keymap();
-    keyboard_init();
-}
-
 bool hasAllBitsInMask(uint8_t value, uint8_t mask) {
     value &= 0xF;
     mask &= 0xF;
@@ -232,96 +43,10 @@ bool hasAllBitsInMask(uint8_t value, uint8_t mask) {
     return (value & mask) == mask;
 }
 
-#ifdef SPLIT_KEYBOARD
-__attribute__((weak)) void matrix_slave_scan_keymap(void) {}
-void                       matrix_slave_scan_user(void) {
-#    if defined(AUDIO_ENABLE)
-#        if !defined(NO_MUSIC_MODE)
-    music_task();
-#        endif
-#        ifdef AUDIO_INIT_DELAY
-    if (!is_keyboard_master()) {
-        static bool delayed_tasks_run = false;
-        static uint16_t delayed_task_timer = 0;
-        if (!delayed_tasks_run) {
-            if (!delayed_task_timer) {
-                delayed_task_timer = timer_read();
-            } else if (timer_elapsed(delayed_task_timer) > 300) {
-                audio_startup();
-                delayed_tasks_run = true;
-            }
-        }
-    }
-#        endif
-#    endif
-#    ifdef SEQUENCER_ENABLE
-    sequencer_task();
-#    endif
-#    ifdef LED_MATRIX_ENABLE
-    led_matrix_task();
-#    endif
-#    ifdef HAPTIC_ENABLE
-    haptic_task();
-#    endif
-
-    matrix_slave_scan_keymap();
-}
-#endif
-
-__attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        default:
-            return TAPPING_TERM;
-    }
-}
-
-__attribute__((weak)) bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
-    // Immediately select the hold action when another key is tapped:
-    // return true;
-    // Do not select the hold action when another key is tapped.
-    // return false;
-    switch (keycode) {
-        default:
-            return false;
-    }
-}
-
-__attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
-    // Immediately select the hold action when another key is pressed.
-    // return true;
-    // Do not select the hold action when another key is pressed.
-    // return false;
-    switch (keycode) {
-        case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
-            return true;
-        default:
-            return false;
-    }
-}
-
-__attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
-    // Do not force the mod-tap key press to be handled as a modifier
-    // if any other key was pressed while the mod-tap key is held down.
-    // return true;
-    // Force the mod-tap key press to be handled as a modifier if any
-    // other key was pressed while the mod-tap key is held down.
-    // return false;
-    switch (keycode) {
-        default:
-            return true;
-    }
-}
-
-__attribute__((weak)) bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        default:
-            return false;
-    }
-}
-
-__attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        default:
-            return false;
-    }
+void tap_code16_nomods(uint8_t kc) {
+    uint8_t temp_mod = get_mods();
+    clear_mods();
+    clear_oneshot_mods();
+    tap_code16(kc);
+    set_mods(temp_mod);
 }
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index 7bcae881e4..5a9da16273 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 #include QMK_KEYBOARD_H
@@ -20,6 +7,8 @@
 #include "eeprom.h"
 #include "keyrecords/wrappers.h"
 #include "keyrecords/process_records.h"
+#include "callbacks.h"
+
 #ifdef TAP_DANCE_ENABLE
 #    include "keyrecords/tap_dances.h"
 #endif  // TAP_DANCE_ENABLE
@@ -58,7 +47,7 @@ enum userspace_layers {
     _ADJUST,
 };
 
-#define _MACROS          _MOUSE
+#define _MACROS _MOUSE
 #define _DEFAULT_LAYER_1 FIRST_DEFAULT_LAYER
 #define _DEFAULT_LAYER_2 (FIRST_DEFAULT_LAYER + 1)
 #define _DEFAULT_LAYER_3 (FIRST_DEFAULT_LAYER + 2)
@@ -86,23 +75,10 @@ enum userspace_layers {
 #define DEFAULT_LAYER_3_RGB RGB_MAGENTA
 #define DEFAULT_LAYER_4_RGB RGB_GOLDENROD
 
-bool          mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed);
-bool          mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer);
-void          matrix_init_keymap(void);
-void          matrix_init_secret(void);
-void          shutdown_keymap(void);
-void          suspend_power_down_keymap(void);
-void          suspend_wakeup_init_keymap(void);
-void          matrix_scan_keymap(void);
-void          matrix_scan_secret(void);
-layer_state_t layer_state_set_keymap(layer_state_t state);
-layer_state_t default_layer_state_set_keymap(layer_state_t state);
-void          led_set_keymap(uint8_t usb_led);
-void          eeconfig_init_keymap(void);
-bool          hasAllBitsInMask(uint8_t value, uint8_t mask);
-#ifdef SPLIT_KEYBOARD
-void matrix_slave_scan_keymap(void);
-#endif
+bool mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed);
+bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer);
+bool hasAllBitsInMask(uint8_t value, uint8_t mask);
+void tap_code16_nomods(uint8_t kc);
 
 // clang-format off
 typedef union {
@@ -119,20 +95,3 @@ typedef union {
 // clang-format on
 
 extern userspace_config_t userspace_config;
-
-/*
-Custom Keycodes for Diablo 3 layer
-But since TD() doesn't work when tap dance is disabled
-We use custom codes here, so we can substitute the right stuff
-*/
-#ifdef TAP_DANCE_ENABLE
-#    define KC_D3_1 TD(TD_D3_1)
-#    define KC_D3_2 TD(TD_D3_2)
-#    define KC_D3_3 TD(TD_D3_3)
-#    define KC_D3_4 TD(TD_D3_4)
-#else  // TAP_DANCE_ENABLE
-#    define KC_D3_1 KC_1
-#    define KC_D3_2 KC_2
-#    define KC_D3_3 KC_3
-#    define KC_D3_4 KC_4
-#endif  // TAP_DANCE_ENABLE
diff --git a/users/drashna/keyrecords/autocorrection/autocorrection.c b/users/drashna/keyrecords/autocorrection/autocorrection.c
index 7c8c28c674..e561224374 100644
--- a/users/drashna/keyrecords/autocorrection/autocorrection.c
+++ b/users/drashna/keyrecords/autocorrection/autocorrection.c
@@ -1,5 +1,5 @@
 // Copyright 2021 Google LLC
-// Copyright 2022 @filterpaper
+// Copyright 2021 @filterpaper
 // SPDX-License-Identifier: Apache-2.0
 // Original source: https://getreuer.info/posts/keyboards/autocorrection
 
@@ -7,10 +7,15 @@
 #include <string.h>
 
 #if __has_include("autocorrection_data.h")
+#    pragma GCC push_options
+#    pragma GCC optimize("O0")
 #    include "autocorrection_data.h"
 #    if AUTOCORRECTION_MIN_LENGTH < 4
 #        error Minimum Length is too short and may cause overflows
 #    endif
+#    if DICTIONARY_SIZE > SIZE_MAX
+#        error Dictionary size excees maximum size permitted
+#    endif
 
 bool process_autocorrection(uint16_t keycode, keyrecord_t* record) {
     static uint8_t typo_buffer[AUTOCORRECTION_MAX_LENGTH] = {KC_SPC};
@@ -55,11 +60,17 @@ bool process_autocorrection(uint16_t keycode, keyrecord_t* record) {
             }
 #    endif
         default:
+            // Disable autocorrection while a mod other than shift is active.
+            if (((get_mods() | get_oneshot_mods()) & ~MOD_MASK_SHIFT) != 0) {
+                typo_buffer_size = 0;
+                return true;
+            }
             if (!record->event.pressed) {
                 return true;
             }
     }
 
+
     // Subtract buffer for Backspace key, reset for other non-alpha.
     if (!(KC_A <= keycode && keycode <= KC_Z)) {
         if (keycode == KC_BSPC) {
@@ -137,6 +148,7 @@ bool process_autocorrection(uint16_t keycode, keyrecord_t* record) {
     }
     return true;
 }
+#    pragma GCC pop_options
 #else
 #    pragma message "Warning!!! Autocorrect is not corretly setup!"
 bool process_autocorrection(uint16_t keycode, keyrecord_t* record) { return true; }
diff --git a/users/drashna/keyrecords/autocorrection/autocorrection.h b/users/drashna/keyrecords/autocorrection/autocorrection.h
index 57685eb4b5..cea93159ae 100644
--- a/users/drashna/keyrecords/autocorrection/autocorrection.h
+++ b/users/drashna/keyrecords/autocorrection/autocorrection.h
@@ -1,5 +1,5 @@
 // Copyright 2021 Google LLC
-// Copyright 2022 @filterpaper
+// Copyright 2021 @filterpaper
 // SPDX-License-Identifier: Apache-2.0
 // Original source: https://getreuer.info/posts/keyboards/autocorrection
 
diff --git a/users/drashna/keyrecords/autocorrection/make_autocorrection_data.py b/users/drashna/keyrecords/autocorrection/make_autocorrection_data.py
index 27383b8955..54fd9ba594 100755
--- a/users/drashna/keyrecords/autocorrection/make_autocorrection_data.py
+++ b/users/drashna/keyrecords/autocorrection/make_autocorrection_data.py
@@ -252,8 +252,9 @@ def write_generated_code(autocorrections: List[Tuple[str, str]],
                    for typo, correction in autocorrections)),
     f'\n#define AUTOCORRECTION_MIN_LENGTH {len(min_typo)}  // "{min_typo}"\n',
     f'#define AUTOCORRECTION_MAX_LENGTH {len(max_typo)}  // "{max_typo}"\n\n',
-    textwrap.fill('static const uint8_t autocorrection_data[%d] PROGMEM = {%s};' % (
-      len(data), ', '.join(map(str, data))), width=80, subsequent_indent='  '),
+    f'#define DICTIONARY_SIZE {len(data)}\n\n',
+    textwrap.fill('static const uint8_t autocorrection_data[DICTIONARY_SIZE] PROGMEM = {%s};' % (
+      ', '.join(map(str, data))), width=120, subsequent_indent='    '),
     '\n\n'])
 
   with open(file_name, 'wt') as f:
diff --git a/users/drashna/keyrecords/autocorrection/readme.md b/users/drashna/keyrecords/autocorrection/readme.md
new file mode 100644
index 0000000000..d920508793
--- /dev/null
+++ b/users/drashna/keyrecords/autocorrection/readme.md
@@ -0,0 +1,301 @@
+# Autocorrection
+
+This is taken from [Pascal Getreuer's implemenation](https://getreuer.info/posts/keyboards/autocorrection/index.html), with a number of modifications. 
+
+To enabled Autocorrection, add `AUTOCORRECTION_ENABLE = yes` to your `rules.mk` file. 
+
+This is mostly a reproduction of Pascal's docs:
+
+## Overview
+Some words are more prone to typos than others. I have a habit of typo-ing *ouput* and *fitler*. This post describes a rudimentary autocorrection implementation that runs on your keyboard with QMK.
+
+The animation below shows the effect as I type *aparent*. As I press the final t, the autocorrection feature detects the typo and automatically sends keys to correct it:
+
+Example: Autocorrecting *aparent* → apparent.
+
+**Features**:
+* It runs on your keyboard, so it is always active no matter what software.
+* Low resource cost: for an autocorrection dictionary of 70 entries, firmware size cost is 1620 bytes and average CPU cost per key press is about 20 µs.
+* It is case insensitive. It corrects Fitler to Filter and FITLER to FILTER.
+* It works within words. It corrects fitlered, fitlering, and useful for programming, within longer identifiers like DesignButterworthFitle*r.
+
+**Limitations**: Running autocorrection on the keyboard comes with some constraints. It is rudimentary like I said:
+* It is limited to alphabet characters a–z. No accented or Unicode letters; I’m sorry this probably isn’t useful for languages besides English.
+* It does not follow mouse or hotkey driven cursor movement.
+
+## Taking autocorrection for a test drive
+With the above flashed to your keyboard, try for instance typing the misspelled word ouput. The instant you type the final t, the word should be speedily autocorrected to output. As further tests, try becuase and invliad.
+
+Here is the full list of typos corrected using the provided autocorrection_data.h file. : is a special character denoting a word break. See below for how to change the autocorrection dictionary.
+
+```
+:guage        -> gauge
+:the:the:     -> the
+:thier        -> their
+:ture         -> true
+accomodate    -> accommodate
+acommodate    -> accommodate
+aparent       -> apparent
+aparrent      -> apparent
+apparant      -> apparent
+apparrent     -> apparent
+aquire        -> acquire
+becuase       -> because
+cauhgt        -> caught
+cheif         -> chief
+choosen       -> chosen
+cieling       -> ceiling
+collegue      -> colleague
+concensus     -> consensus
+contians      -> contains
+cosnt         -> const
+dervied       -> derived
+fales         -> false
+fasle         -> false
+fitler        -> filter
+flase         -> false
+foward        -> forward
+frequecy      -> frequency
+gaurantee     -> guarantee
+guaratee      -> guarantee
+heigth        -> height
+heirarchy     -> hierarchy
+inclued       -> include
+interator     -> iterator
+intput        -> input
+invliad       -> invalid
+lenght        -> length
+liasion       -> liaison
+libary        -> library
+listner       -> listener
+looses:       -> loses
+looup         -> lookup
+manefist      -> manifest
+namesapce     -> namespace
+namespcae     -> namespace
+occassion     -> occasion
+occured       -> occurred
+ouptut        -> output
+ouput         -> output
+overide       -> override
+postion       -> position
+priviledge    -> privilege
+psuedo        -> pseudo
+recieve       -> receive
+refered       -> referred
+relevent      -> relevant
+repitition    -> repetition
+reuslt        -> result
+retrun        -> return
+retun         -> return
+reutrn        -> return
+saftey        -> safety
+seperate      -> separate
+singed        -> signed
+stirng        -> string
+strign        -> string
+swithc        -> switch
+swtich        -> switch
+thresold      -> threshold
+udpate        -> update
+widht         -> width
+```
+
+## Firmware size and CPU costs
+I am anxiously aware that a keyboard microcontroller has limited resources. So I was sure to measure how much memory and CPU time autocorrection consumes during development. These measurements are for the example autocorrection dictionary as used above, which has 70 entries:
+* **Firmware size**: Autocorrection increases my firmware size by a total of 1620 bytes. Breaking that down, 1104 bytes are for the autocorrection_data array and 516 bytes for the autocorrection code.
+* **CPU time**: On my Elite-C microcontrollers, the average CPU time for process_autocorrection to process an alpha key press is around 20 µs. Consider this a rough order-of-magnitude cost. Processing cost increases (more trie nodes are visited) when recent input is close to a known typo, with the max being when a long typo is matched.
+
+The costs are not free but reasonable. For reference, the firmware size cost for mouse keys is 2124 bytes and the CPU time to process a layer switch is about 70 µs, so autocorrection is cheaper than those things. Of course, the cost scales with the size of the autocorrection dictionary, so keep that in mind if you add a lot more entries.
+
+## How does it work?
+The function process_autocorrection maintains a small buffer of recent key presses. On each key press, it checks whether the buffer ends in a recognized typo, and if so, automatically sends keystrokes to correct it.
+
+The tricky part is how to efficiently check the buffer for typos. We don’t want to spend too much memory or time on storing or searching the typos. A good solution is to represent the typos with a trie data structure. A trie is a tree data structure where each node is a letter, and words are formed by following a path to one of the leaves.
+
+
+An example trie.
+Since we search whether the buffer ends in a typo, we store the trie writing in reverse. The trie is queried starting from the last letter, then second to last letter, and so on, until either a letter doesn’t match or we reach a leaf, meaning a typo was found.
+
+## Changing the autocorrection dictionary
+The file autocorrection_data.h encodes the typos to correct. While you could simply use the version of this file provided above for a practical configuration, you can make your own to personalize the autocorrection to your most troublesome typos:
+
+1. First, create an autocorrection dictionary autocorrection_dict.txt, like
+
+  ```
+:thier        -> their
+fitler        -> filter
+lenght        -> length
+ouput         -> output
+widht         -> width
+```
+  For a practical 70-entry example, see autocorrection_dict.txt. And for a yet larger 400-entry example, see autocorrection_dict_extra.txt.
+
+  The syntax is `typo -> correction`. Typos and corrections are case insensitive, and any whitespace before or after the typo and correction is ignored. The typo must be only the letters a–z, or the special character : representing a word break. The correction may have any characters.
+
+2. Use the make_autocorrection_data.py Python script to process the dictionary
+
+```
+$ python3 make_autocorrection_data.py
+Processed 70 autocorrection entries to table with 1104 bytes.
+```
+The script arranges the entries in autocorrection_dict.txt into a trie and generates autocorrection_data.h with the serialized trie embedded as an array.
+
+3. Finally, recompile and flash your keymap.
+
+The generated C header looks like this:
+
+autocorrection_data.h
+```c
+// Generated code.
+
+#define AUTOCORRECTION_MIN_LENGTH 5  // "cheif"
+#define AUTOCORRECTION_MAX_LENGTH 10  // "accomodate"
+
+static const uint8_t autocorrection_data[1104] PROGMEM = {108, 43, 0, 6,
+  71, 0, 7, 81, 0, 8, 199, 0, 9, 240, 1, 10, 250, 1, 11, 26, 2, 17, 53, 2,
+  18, 190, 2, 19, 202, 2, 21, 212, 2, 22, 20, 3, 23, 67, 3, 28, 16, 4, 0,
+  72, 50, 0, 22, 60, 0, 0, 11, 23, 44, 8, 11, 23, 44, 0, 132, 0, 8, 22, 18,
+  18, 15, 0, 132, 115, 101, 115, 0, 11, 23, 12, 26, 22, 0, 129, 99, 104, 0,
+  68, 94, 0, 8, 106, 0, 15, 174, 0, 21, 187, 0, 0, 12, 15, 25, 17, 12, 0,
+  131, 97, 108, 105, 100, 0, 74, 119, 0, 12, 129, 0, 21, 140, 0, 24, 165,
+  0, 0, 17, 12, 22, 0, 131, 103, 110, 101, 100, 0, 25, 21, 8, 7, 0, 131,
+  105, 118, 101, 100, 0, 72, 147, 0, 24, 156, 0, 0, 9, 8, 21, 0, 129, 114,
+  101, 100, 0, 6, 6, 18, 0, 129, 114, 101, 100, 0, 15, 6, 17, 12, 0, 129,
+  100, 101, 0, 18, 22, 8, 21, 11, 23, 0, 130, 104, 111, 108, 100, 0, 4, 26,
+  18, 9, 0, 131, 114, 119, 97, 114, 100, 0, 68, 233, 0, 6, 246, 0, 7, 4, 1,
+  8, 16, 1, 10, 52, 1, 15, 81, 1, 21, 90, 1, 22, 117, 1, 23, 144, 1, 24,
+  215, 1, 25, 228, 1, 0, 6, 19, 22, 8, 16, 4, 17, 0, 130, 97, 99, 101, 0,
+  19, 4, 22, 8, 16, 4, 17, 0, 131, 112, 97, 99, 101, 0, 12, 21, 8, 25, 18,
+  0, 130, 114, 105, 100, 101, 0, 23, 0, 68, 25, 1, 17, 36, 1, 0, 21, 4, 24,
+  10, 0, 130, 110, 116, 101, 101, 0, 4, 21, 24, 4, 10, 0, 135, 117, 97,
+  114, 97, 110, 116, 101, 101, 0, 68, 59, 1, 7, 69, 1, 0, 24, 10, 44, 0,
+  131, 97, 117, 103, 101, 0, 8, 15, 12, 25, 12, 21, 19, 0, 130, 103, 101,
+  0, 22, 4, 9, 0, 130, 108, 115, 101, 0, 76, 97, 1, 24, 109, 1, 0, 24, 20,
+  4, 0, 132, 99, 113, 117, 105, 114, 101, 0, 23, 44, 0, 130, 114, 117, 101,
+  0, 4, 0, 79, 126, 1, 24, 134, 1, 0, 9, 0, 131, 97, 108, 115, 101, 0, 6,
+  8, 5, 0, 131, 97, 117, 115, 101, 0, 4, 0, 71, 156, 1, 19, 193, 1, 21,
+  203, 1, 0, 18, 16, 0, 80, 166, 1, 18, 181, 1, 0, 18, 6, 4, 0, 135, 99,
+  111, 109, 109, 111, 100, 97, 116, 101, 0, 6, 6, 4, 0, 132, 109, 111, 100,
+  97, 116, 101, 0, 7, 24, 0, 132, 112, 100, 97, 116, 101, 0, 8, 19, 8, 22,
+  0, 132, 97, 114, 97, 116, 101, 0, 10, 8, 15, 15, 18, 6, 0, 130, 97, 103,
+  117, 101, 0, 8, 12, 6, 8, 21, 0, 131, 101, 105, 118, 101, 0, 12, 8, 11,
+  6, 0, 130, 105, 101, 102, 0, 17, 0, 76, 3, 2, 21, 16, 2, 0, 15, 8, 12, 6,
+  0, 133, 101, 105, 108, 105, 110, 103, 0, 12, 23, 22, 0, 131, 114, 105,
+  110, 103, 0, 70, 33, 2, 23, 44, 2, 0, 12, 23, 26, 22, 0, 131, 105, 116,
+  99, 104, 0, 10, 12, 8, 11, 0, 129, 104, 116, 0, 72, 69, 2, 10, 80, 2, 18,
+  89, 2, 21, 156, 2, 24, 167, 2, 0, 22, 18, 18, 11, 6, 0, 131, 115, 101,
+  110, 0, 12, 21, 23, 22, 0, 129, 110, 103, 0, 12, 0, 86, 98, 2, 23, 124,
+  2, 0, 68, 105, 2, 22, 114, 2, 0, 12, 15, 0, 131, 105, 115, 111, 110, 0,
+  4, 6, 6, 18, 0, 131, 105, 111, 110, 0, 76, 131, 2, 22, 146, 2, 0, 23, 12,
+  19, 8, 21, 0, 134, 101, 116, 105, 116, 105, 111, 110, 0, 18, 19, 0, 131,
+  105, 116, 105, 111, 110, 0, 23, 24, 8, 21, 0, 131, 116, 117, 114, 110, 0,
+  85, 174, 2, 23, 183, 2, 0, 23, 8, 21, 0, 130, 117, 114, 110, 0, 8, 21, 0,
+  128, 114, 110, 0, 7, 8, 24, 22, 19, 0, 131, 101, 117, 100, 111, 0, 24,
+  18, 18, 15, 0, 129, 107, 117, 112, 0, 72, 219, 2, 18, 3, 3, 0, 76, 229,
+  2, 15, 238, 2, 17, 248, 2, 0, 11, 23, 44, 0, 130, 101, 105, 114, 0, 23,
+  12, 9, 0, 131, 108, 116, 101, 114, 0, 23, 22, 12, 15, 0, 130, 101, 110,
+  101, 114, 0, 23, 4, 21, 8, 23, 17, 12, 0, 135, 116, 101, 114, 97, 116,
+  111, 114, 0, 72, 30, 3, 17, 38, 3, 24, 51, 3, 0, 15, 4, 9, 0, 129, 115,
+  101, 0, 4, 12, 23, 17, 18, 6, 0, 131, 97, 105, 110, 115, 0, 22, 17, 8, 6,
+  17, 18, 6, 0, 133, 115, 101, 110, 115, 117, 115, 0, 74, 86, 3, 11, 96, 3,
+  15, 118, 3, 17, 129, 3, 22, 218, 3, 24, 232, 3, 0, 11, 24, 4, 6, 0, 130,
+  103, 104, 116, 0, 71, 103, 3, 10, 110, 3, 0, 12, 26, 0, 129, 116, 104, 0,
+  17, 8, 15, 0, 129, 116, 104, 0, 22, 24, 8, 21, 0, 131, 115, 117, 108,
+  116, 0, 68, 139, 3, 8, 150, 3, 22, 210, 3, 0, 21, 4, 19, 19, 4, 0, 130,
+  101, 110, 116, 0, 85, 157, 3, 25, 200, 3, 0, 68, 164, 3, 21, 175, 3, 0,
+  19, 4, 0, 132, 112, 97, 114, 101, 110, 116, 0, 4, 19, 0, 68, 185, 3, 19,
+  193, 3, 0, 133, 112, 97, 114, 101, 110, 116, 0, 4, 0, 131, 101, 110, 116,
+  0, 8, 15, 8, 21, 0, 130, 97, 110, 116, 0, 18, 6, 0, 130, 110, 115, 116,
+  0, 12, 9, 8, 17, 4, 16, 0, 132, 105, 102, 101, 115, 116, 0, 83, 239, 3,
+  23, 6, 4, 0, 87, 246, 3, 24, 254, 3, 0, 17, 12, 0, 131, 112, 117, 116, 0,
+  18, 0, 130, 116, 112, 117, 116, 0, 19, 24, 18, 0, 131, 116, 112, 117,
+  116, 0, 70, 29, 4, 8, 41, 4, 11, 51, 4, 21, 69, 4, 0, 8, 24, 20, 8, 21,
+  9, 0, 129, 110, 99, 121, 0, 23, 9, 4, 22, 0, 130, 101, 116, 121, 0, 6,
+  21, 4, 21, 12, 8, 11, 0, 135, 105, 101, 114, 97, 114, 99, 104, 121, 0, 4,
+  5, 12, 15, 0, 130, 114, 97, 114, 121, 0};
+```
+
+## Troubleshooting
+### Avoiding false triggers
+By default, typos are searched within words, to find typos within longer identifiers like maxFitlerOuput. While this is useful, a consequence is that autocorrection will falsely trigger when a typo happens to be a substring of a correctly-spelled word. For instance, if we had thier -> their as an entry, it would falsely trigger on (correct, though relatively uncommon) words like “wealthier” and “filthier.”
+
+The solution is to set a word break : before and/or after the typo to constrain matching. : matches space, period, comma, underscore, digits, and most other non-alpha characters.
+
+| Text | thier | :thier | thier: | :thier: |
+|------|-------|--------|--------|---------|
+|see thier typo|matches|matches|matches|matches|
+it’s thiers    |matches|matches|no|no|
+wealthier words|matches|no|matches|no|
+
+:thier: is most restrictive, matching only when thier is a whole word.
+
+The make_autocorrection_data.py script makes an effort to check for entries that would false trigger as substrings of correct words. It searches each typo against a dictionary of 25K English words from the english_words Python package, provided it’s installed.
+
+### Overriding autocorrection
+Occasionally you might actually want to type a typo (for instance, while editing autocorrection_dict.txt) without being autocorrected. Here is a way to do that:
+
+1. Begin typing the typo.
+2. Before typing the last letter, press and release the Ctrl or Alt key.
+3. Type the remaining letters.
+
+This works because the autocorrection implementation doesn’t understand hotkeys, so it resets itself whenever a modifier other than shift is held.
+
+Alternatively, the `AUTO_CTN` keycode will toggle autocorrection on and off.
+
+## Closing thoughts
+Based on my own use, an autocorrection dictionary of a few dozen entries is enough to help in day-to-day writing. On the other hand, it is of course far from comprehensively checking that every word is spelled correctly. Keyboard microcontrollers might not have the resources check against a full English dictionary any time soon, but a lot of editors and other software have good integrated spell check features.
+
+I suggest to enable and use spell check in combination with autocorrection:
+* Sublime: Open the View menu and enable “Spell Check.”
+* Eclipse: Open the Window menu, click Preferences, and search for “Spelling.”
+* Vim: Type :set spell, and misspellings will be highlighted. Use ]s to jump to the next misspelled word and z= to get suggested corrections for the word under the cursor. See the :help spell documentation. Vim also has an abbreviations feature that can autocorrect misspellings (see :help abbreviations).
+* Emacs: Use M-x flyspell-mode to enable Flyspell mode in the current buffer. Or for programming, use M-x flyspell-prog-mode to check comments and strings only. See the spelling documentation. There is also an abbreviations feature that can do autocorrection.
+
+Some useful resources:
+
+* Wikipedia has a [large list of common typos](https://en.wikipedia.org/wiki/Wikipedia:Lists_of_common_misspellings/For_machines).
+* EmacsWiki has another [list of typos](https://www.emacswiki.org/emacs/autocorrection_abbrev_defs).
+* You can find data on English word frequencies at https://www.wordfrequency.info/samples.asp.
+
+# Appendix: Trie binary data format
+This section details how the trie is serialized to byte data in autocorrection_data. You don’t need to care about this to use this autocorrection implementation. But I document it for the record in case anyone is interested in modifying the implementation, or just curious how it works.
+
+What I did here is fairly arbitrary, but it is simple to decode and gets the job done.
+
+## Encoding
+All autocorrection data is stored in a single flat array autocorrection_data. Each trie node is associated with a byte offset into this array, where data for that node is encoded, beginning with root at offset 0. There are three kinds of nodes. The highest two bits of the first byte of the node indicate what kind:
+
+* 00 ⇒ chain node: a trie node with a single child.
+* 01 ⇒ branching node: a trie node with multiple children.
+* 10 ⇒ leaf node: a leaf, corresponding to a typo and storing its correction.
+
+An example trie.
+Branching node. Each branch is encoded with one byte for the keycode (KC_A–KC_Z) followed by a link to the child node. Links between nodes are 16-bit byte offsets relative to the beginning of the array, serialized in little endian order.
+
+All branches are serialized this way, one after another, and terminated with a zero byte. As described above, the node is identified as a branch by setting the two high bits of the first byte to 01, done by bitwise ORing the first keycode with 64. keycode. The root node for the above figure would be serialized like:
+
+    +-------+-------+-------+-------+-------+-------+-------+
+    | R|64  |    node 2     |   T   |    node 3     |   0   |
+    +-------+-------+-------+-------+-------+-------+-------+
+
+Chain node. Tries tend to have long chains of single-child nodes, as seen in the example above with f-i-t-l in fitler. So to save space, we use a different format to encode chains than branching nodes. A chain is encoded as a string of keycodes, beginning with the node closest to the root, and terminated with a zero byte. The child of the last node in the chain is encoded immediately after. That child could be either a branching node or a leaf.
+
+In the figure above, the f-i-t-l chain is encoded as
+
+    +-------+-------+-------+-------+-------+
+    |   L   |   T   |   I   |   F   |   0   |
+    +-------+-------+-------+-------+-------+
+If we were to encode this chain using the same format used for branching nodes, we would encode a 16-bit node link with every node, costing 8 more bytes in this example. Across the whole trie, this adds up. Conveniently, we can point to intermediate points in the chain and interpret the bytes in the same way as before. E.g. starting at the i instead of the l, and the subchain has the same format.
+
+Leaf node. A leaf node corresponds to a particular typo and stores data to correct the typo. The leaf begins with a byte for the number of backspaces to type, and is followed by a null-terminated ASCII string of the replacement text. The idea is, after tapping backspace the indicated number of times, we can simply pass this string to QMK’s send_string_P function. For fitler, we need to tap backspace 3 times (not 4, because we catch the typo as the final ‘r’ is pressed) and replace it with lter. To identify the node as a leaf, the two high bits are set to 10 by ORing the backspace count with 128:
+
+    +-------+-------+-------+-------+-------+-------+
+    | 3|128 |  'l'  |  't'  |  'e'  |  'r'  |   0   |
+    +-------+-------+-------+-------+-------+-------+
+## Decoding
+This format is by design decodable with fairly simple logic. A 16-bit variable state represents our current position in the trie, initialized with 0 to start at the root node. Then, for each keycode, test the highest two bits in the byte at state to identify the kind of node.
+
+* 00 ⇒ chain node: If the node’s byte matches the keycode, increment state by one to go to the next byte. If the next byte is zero, increment again to go to the following node.
+* 01 ⇒ branching node: Search the branches for one that matches the keycode, and follow its node link.
+* 10 ⇒ leaf node: a typo has been found! We read its first byte for the number of backspaces to type, then pass its following bytes to send_string_P to type the correction.
diff --git a/users/drashna/keyrecords/caps_word.c b/users/drashna/keyrecords/caps_word.c
index 731568328a..cc9ca93b72 100644
--- a/users/drashna/keyrecords/caps_word.c
+++ b/users/drashna/keyrecords/caps_word.c
@@ -3,13 +3,17 @@
 
 #include "caps_word.h"
 
+#ifndef IS_COMMAND
+#    define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+#endif
+
 bool caps_word_enabled = false;
 bool caps_word_shifted = false;
 
 bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
     if (!caps_word_enabled) {
         // Pressing both shift keys at the same time enables caps word.
-        if (((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
+        if (IS_COMMAND()) {
             clear_mods();
             clear_oneshot_mods();
             caps_word_shifted = false;
diff --git a/users/drashna/keyrecords/capwords.md b/users/drashna/keyrecords/capwords.md
new file mode 100644
index 0000000000..1ca01ed853
--- /dev/null
+++ b/users/drashna/keyrecords/capwords.md
@@ -0,0 +1,36 @@
+# Cap Words
+
+This is taken from [Pascal Getreuer's implemenation](https://getreuer.info/posts/keyboards/caps-word/index.html), with a number of modifications. 
+
+To enable Caps Word, add `CAPS_WORD_ENABLE = yes` to your `rules.mk`.
+
+This is mostly a reproduction of Pascal's docs:
+
+## Overview
+
+All-caps identifiers like “MOD_MASK_ALT” are awkward to type.
+
+Caps Lock would be the standard solution to this problem, but it is awkward: it needs a dedicated key to toggle it (an imposition on smaller keyboards), and we need to remember to toggle it off after typing the word. Or with normal shifting, we either perform finger gymnastics or need to stop typing in the middle of the word to release shift with one hand to switch to holding shift with the other hand. In my experience, this is a nuisance especially if your shift keys are mod-taps, as in home row mods.
+
+Caps Word, implemented here, is a modern alternative to Caps Lock:
+
+* Caps Word is activated by pressing the left and right shift keys at the same time. This way you don’t need a dedicated key for using Caps Word.
+* Caps Word automatically disables itself at the end of the word.
+
+**Compatibility**: I’ve tested that this implementation works with one-shot mods and Space Cadet Shift, and it predictably handles key repeating.
+
+Unlike some other QMK Caps Word implementations, this library does not use the Caps Lock (KC_CAPS) keycode. It works even if the OS remaps Caps Lock to Ctrl or something else, as Emacs and Vim users often do.
+
+## Using Caps Word
+With the above flashed to your keyboard:
+
+1. **Activating**: Press and release both left and right shift keys at the same time. If your shift keys are mod-taps, activate Caps Word by holding both shift mod-tap keys until the tapping term, then release them.
+2. Then begin typing to get capitalized letters.
+3. **Disabling**: Caps Word disables itself when the next word breaking key is typed.
+
+If you want to explicitly stop Caps Word, press and release Ctrl or another non-shift modifier or layer key. This also disables Caps Word.
+
+## Explanation
+The code checks the mod bits on each key event, enabling Caps Word when both left and right shifts are active.
+
+While enabled, Caps Word automatically presses and releases left shift (KC_LSFT) as needed so that letters are shifted and other keys are not. The word continues while typing a–z, 0–9, -, _, and backspace. Any other key is considered “word breaking” and disables Caps Word. You can edit the switch statement at the end of the process_caps_word() function to adjust which keys count as word breaking.
diff --git a/users/drashna/keyrecords/keycodes.md b/users/drashna/keyrecords/keycodes.md
new file mode 100644
index 0000000000..348c68e46c
--- /dev/null
+++ b/users/drashna/keyrecords/keycodes.md
@@ -0,0 +1,18 @@
+
+# Custom Keycodes
+
+Keycodes are defined in the `process_record.h` file and need to be included in the keymap.c files, so that they can be used there. 
+
+A bunch of macros are present and are only included on boards that are not the Ergodox EZ or Orthodox, as they are not needed for those boards. 
+
+* `KC_MAKE` - outputs `qmk compile -kb (keyboard) -km (keymap)` and enter, to start compiling the currenct keyboard.  This uses generated variables to always use the current keyboard and keymap.  Will work with any keyboard and any keymap.
+  * If you are holding shift, it will use `qmk flash` instead of `qmk compile`.
+  * If `MAKE_BOOTLOADER` is defined, it will always use `qmk flash` instead of `qmk compile`.
+* `DEFAULT_LAYER_1` ... `DEFAULT_LAYER_4` - This sets layer 0-3 as the default layer, and writes that to eeprom, and plays a chime. 
+* `VRSN`, outputs the keyboard, keymap, commit and date info.  Eg:
+  * `handwired/tractyl_manuform/5x6_right/f411/drashna @ 0.15.9-162-g087d08, Built on: 2021-12-19-21:10:26`
+*  `KC_DIABLO_CLEAR` - clears the diablo tapdance status.
+* `KC_CCCV` - Copy on hold, paste on tap.
+* `KEYLOCK` - This unloads the host driver, and prevents any data from being sent to the host. Hitting it again loads the driver, back. 
+* `REBOOT` - Uses watchdog timer on AVR, and `NVIC_SystemReset()` on ChibiOS to reset the board, without jumping to the bootloader.
+* `EEP_RST` - Overrides the default behavior, disables EEPROM (which will trigger a reset on init), and reboots the keyboard as per `REBOOT` keycode. 
diff --git a/users/drashna/keyrecords/process_records.c b/users/drashna/keyrecords/process_records.c
index c7d4a925b0..f49ac6ef64 100644
--- a/users/drashna/keyrecords/process_records.c
+++ b/users/drashna/keyrecords/process_records.c
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "drashna.h"
 #include "version.h"
@@ -22,6 +9,9 @@
 #ifdef AUTOCORRECTION_ENABLE
 #    include "autocorrection/autocorrection.h"
 #endif
+#ifdef __AVR__
+#include <avr/wdt.h>
+#endif
 
 uint16_t copy_paste_timer;
 bool     host_driver_disabled = false;
@@ -212,6 +202,28 @@ bool                       process_record_user(uint16_t keycode, keyrecord_t *re
             }
             break;
         }
+        case EEP_RST:
+            if (record->event.pressed) {
+                eeconfig_disable();
+                shutdown_user();
+#ifdef __AVR__
+                wdt_enable(WDTO_250MS);
+#else
+                NVIC_SystemReset();
+#endif
+            }
+            return false;
+        case REBOOT:
+            if (record->event.pressed) {
+                shutdown_user();
+#ifdef __AVR__
+                wdt_enable(WDTO_250MS);
+#else
+                NVIC_SystemReset();
+#endif
+            }
+            return false;
+
     }
     return true;
 }
diff --git a/users/drashna/keyrecords/process_records.h b/users/drashna/keyrecords/process_records.h
index df506b3647..d7a81d4607 100644
--- a/users/drashna/keyrecords/process_records.h
+++ b/users/drashna/keyrecords/process_records.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 #include "drashna.h"
@@ -58,6 +45,7 @@ enum userspace_custom_keycodes {
     KC_ZALGO,
     KC_ACCEL,
     AUTO_CTN,                                 // Toggle Autocorrect status
+    REBOOT,
     NEW_SAFE_RANGE                            // use "NEWPLACEHOLDER for keymap specific codes
 };
 
@@ -66,7 +54,6 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
 void post_process_record_keymap(uint16_t keycode, keyrecord_t *record);
 #ifdef CUSTOM_UNICODE_ENABLE
 bool process_record_unicode(uint16_t keycode, keyrecord_t *record);
-void matrix_init_unicode(void);
 #endif
 
 #define LOWER     MO(_LOWER)
@@ -140,3 +127,21 @@ void matrix_init_unicode(void);
 #define ALT_APP ALT_T(KC_APP)
 
 #define MG_NKRO MAGIC_TOGGLE_NKRO
+
+
+/*
+Custom Keycodes for Diablo 3 layer
+But since TD() doesn't work when tap dance is disabled
+We use custom codes here, so we can substitute the right stuff
+*/
+#ifdef TAP_DANCE_ENABLE
+#    define KC_D3_1 TD(TD_D3_1)
+#    define KC_D3_2 TD(TD_D3_2)
+#    define KC_D3_3 TD(TD_D3_3)
+#    define KC_D3_4 TD(TD_D3_4)
+#else  // TAP_DANCE_ENABLE
+#    define KC_D3_1 KC_1
+#    define KC_D3_2 KC_2
+#    define KC_D3_3 KC_3
+#    define KC_D3_4 KC_4
+#endif  // TAP_DANCE_ENABLE
diff --git a/users/drashna/keyrecords/readme.md b/users/drashna/keyrecords/readme.md
new file mode 100644
index 0000000000..5f708f9edf
--- /dev/null
+++ b/users/drashna/keyrecords/readme.md
@@ -0,0 +1,9 @@
+# Keycode handling and interception
+
+  * [Autocorrection](autocorrection/readme.md)
+  * [Cap Words](capwords.md)
+  * [Diablo Tap Dancing](tap_dance.md)
+  * [Keymap Wrappers](wrappers.md)
+  * [Secret Macros](secrets.md)
+  * [Custom Keycodes](keycodes.md)
+  * [Unicode Input](unicode.md)
diff --git a/users/drashna/readme/secrets.md b/users/drashna/keyrecords/secrets.md
similarity index 100%
rename from users/drashna/readme/secrets.md
rename to users/drashna/keyrecords/secrets.md
diff --git a/users/drashna/readme/tap_dance.md b/users/drashna/keyrecords/tap_dance.md
similarity index 96%
rename from users/drashna/readme/tap_dance.md
rename to users/drashna/keyrecords/tap_dance.md
index a61dd1f2b0..0bf67cbd5a 100644
--- a/users/drashna/readme/tap_dance.md
+++ b/users/drashna/keyrecords/tap_dance.md
@@ -1,6 +1,8 @@
 # Diablo Tap Dances 
 
-My [Tap Dance](https://github.com/qmk/qmk_firmware/blob/master/users/drashna/tap_dances.c) file includes the tap dance declarations, and everything needed for them. 
+My [Tap Dance](tap_dances.c) file includes the tap dance declarations, and everything needed for them. 
+
+To disable, add `CUSTOM_TAP_DANCE = no` to your `rules.mk`.
 
 This is used for making Diablo 3 much easier to plan, especially at high rift levels. 
 
diff --git a/users/drashna/keyrecords/tap_dances.c b/users/drashna/keyrecords/tap_dances.c
index 01873489d8..63eb0c3348 100644
--- a/users/drashna/keyrecords/tap_dances.c
+++ b/users/drashna/keyrecords/tap_dances.c
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "tap_dances.h"
 
diff --git a/users/drashna/keyrecords/tap_dances.h b/users/drashna/keyrecords/tap_dances.h
index 81e462ce29..d9baedc867 100644
--- a/users/drashna/keyrecords/tap_dances.h
+++ b/users/drashna/keyrecords/tap_dances.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 #include "drashna.h"
diff --git a/users/drashna/keyrecords/tapping.c b/users/drashna/keyrecords/tapping.c
new file mode 100644
index 0000000000..9c4892b33d
--- /dev/null
+++ b/users/drashna/keyrecords/tapping.c
@@ -0,0 +1,64 @@
+// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "drashna.h"
+
+__attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case BK_LWER:
+            return TAPPING_TERM + 25;
+        default:
+            return TAPPING_TERM;
+    }
+}
+
+__attribute__((weak)) bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
+    // Immediately select the hold action when another key is tapped:
+    // return true;
+    // Do not select the hold action when another key is tapped.
+    // return false;
+    switch (keycode) {
+        default:
+            return false;
+    }
+}
+
+__attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
+    // Immediately select the hold action when another key is pressed.
+    // return true;
+    // Do not select the hold action when another key is pressed.
+    // return false;
+    switch (keycode) {
+        case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
+            return true;
+        default:
+            return false;
+    }
+}
+
+__attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
+    // Do not force the mod-tap key press to be handled as a modifier
+    // if any other key was pressed while the mod-tap key is held down.
+    // return true;
+    // Force the mod-tap key press to be handled as a modifier if any
+    // other key was pressed while the mod-tap key is held down.
+    // return false;
+    switch (keycode) {
+        default:
+            return true;
+    }
+}
+
+__attribute__((weak)) bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        default:
+            return false;
+    }
+}
+
+__attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        default:
+            return false;
+    }
+}
diff --git a/users/drashna/keyrecords/unicode.c b/users/drashna/keyrecords/unicode.c
index 88df2c9df9..4010b9c1c6 100644
--- a/users/drashna/keyrecords/unicode.c
+++ b/users/drashna/keyrecords/unicode.c
@@ -1,34 +1,13 @@
-/* Copyright 2020 @ridingqwerty
- * Copyright 2020 @tzarc
- * Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 @ridingqwerty
+// Copyright 2020 @tzarc
+// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "drashna.h"
 #include "process_unicode_common.h"
 
 uint16_t typing_mode;
 
-void tap_code16_nomods(uint8_t kc) {
-    uint8_t temp_mod = get_mods();
-    clear_mods();
-    clear_oneshot_mods();
-    tap_code16(kc);
-    set_mods(temp_mod);
-}
-
 void tap_unicode_glyph_nomods(uint32_t glyph) {
     uint8_t temp_mod = get_mods();
     clear_mods();
@@ -188,6 +167,7 @@ bool process_record_aussie(uint16_t keycode, keyrecord_t *record) {
 bool process_record_zalgo(uint16_t keycode, keyrecord_t *record) {
     if ((KC_A <= keycode) && (keycode <= KC_0)) {
         if (record->event.pressed) {
+
             tap_code16_nomods(keycode);
 
             int number = (rand() % (8 + 1 - 2)) + 2;
@@ -247,9 +227,12 @@ bool process_record_unicode(uint16_t keycode, keyrecord_t *record) {
                 }
             }
             break;
-
-            break;
     }
+
+    if (((get_mods() | get_oneshot_mods()) & ~MOD_MASK_SHIFT) != 0) {
+        return true;
+    }
+
     if (((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) && record->tap.count) {
         keycode &= 0xFF;
     }
diff --git a/users/drashna/keyrecords/unicode.md b/users/drashna/keyrecords/unicode.md
new file mode 100644
index 0000000000..1b3f696a82
--- /dev/null
+++ b/users/drashna/keyrecords/unicode.md
@@ -0,0 +1,27 @@
+# Custom Unicode
+
+To disable, add `CUSTOM_UNICODE_ENABLE = no` to the keymap's `rules.mk`.  
+
+This disables all of the various implementations of unicode, enables the common unicode core, and allows usage. 
+
+In addition to a number of unicode keycodes: 
+
+* `UC_FLIP` - `(ノಠ痊ಠ)ノ彡┻━┻`
+* `UC_TABL` - `┬─┬ノ( º _ ºノ)`
+* `UC_SHRG` - `¯\_(ツ)_/¯`
+* `UC_DISA` -  `ಠ_ಠ`
+* `UC_IRNY` - `⸮`
+* `UC_CLUE` - `‽`
+
+There are a number of unicode typing modes. This replaces the normal alpha keys with special unicodes. 
+
+* `KC_WIDE` - ｔｈｉｓ ｉｓ ｗｉｄｅ ｍｏｄｅ
+* `KC_SCRIPT` - 𝓽𝓱𝓲𝓼 𝓲𝓼 𝓼𝓬𝓻𝓲𝓹𝓽 𝓶𝓸𝓭𝓮
+* `KC_BLOCKS` - 🆃🅷🅸🆂 🅸🆂 🅱🅻🅾🅲🅺 🅼🅾🅳🅴
+* `KC_REGIONAL` - 🇹‌‌🇭‌‌🇮‌‌🇸‌‌ ‌‌🇮‌‌🇸‌‌ ‌‌🇷‌‌🇪‌‌🇬‌‌🇮‌‌🇴‌‌🇳‌‌🇦‌‌🇱‌‌ ‌‌🇲‌‌🇴‌‌🇩‌‌🇪‌‌
+* `KC_AUSSIE` - ǝpoɯ ǝᴉssnɐ sᴉ sᴉɥʇ
+* `KC_ZALGO` - t̨͕͙̺͍͐̾ĥ̻ï̳̻̗̜͔ͦs͎̠͈͓͗̀ i̶̫ͭ̆s̛̫̻̜̝͑͡ z̩͈̠͗a͚̜̓͜l͈̟g͋͢͝ò͚ͥ͘͡͞ ḿ̴̡̻̼̔ͪò͔̭̿ͪ̍ḏ̻̊̄̈e̳͕̤ͣͯ
+* `KC_NOMODE` - this is the normal typing mode with no unicode glyphs
+
+
+Credit goes to ridingqwerty and tzarc for the unicode typing modes. 
diff --git a/users/drashna/keyrecords/wrappers.h b/users/drashna/keyrecords/wrappers.h
index c1ae815579..cb8dc6189a 100644
--- a/users/drashna/keyrecords/wrappers.h
+++ b/users/drashna/keyrecords/wrappers.h
@@ -1,18 +1,6 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// Copyright 2020 @jola5
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 #include "drashna.h"
diff --git a/users/drashna/readme/wrappers.md b/users/drashna/keyrecords/wrappers.md
similarity index 100%
rename from users/drashna/readme/wrappers.md
rename to users/drashna/keyrecords/wrappers.md
diff --git a/users/drashna/oled/drashna_font.h b/users/drashna/oled/drashna_font.h
index 844292a53a..7ba03c4c13 100644
--- a/users/drashna/oled/drashna_font.h
+++ b/users/drashna/oled/drashna_font.h
@@ -3,8 +3,8 @@
 // additional fonts from
 // https://github.com/datacute/TinyOLED-Fonts
 
-#if __has_include("../../../../Documents/qmk/oled_font.h")
-#    include "../../../../Documents/qmk/oled_font.h"
+#if __has_include("oled_font.h")
+#    include "oled_font.h"
 #else
 
 // additional fonts from
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index 9ee2cbfed8..de84766725 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -162,15 +162,8 @@ void render_keylock_status(uint8_t led_usb_state) {
 
 void render_matrix_scan_rate(void) {
 #ifdef DEBUG_MATRIX_SCAN_RATE
-    char     matrix_rate[5];
-    uint16_t n     = get_matrix_scan_rate();
-    matrix_rate[4] = '\0';
-    matrix_rate[3] = '0' + n % 10;
-    matrix_rate[2] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' ';
-    matrix_rate[1] = n / 10 ? '0' + n / 10 : ' ';
-    matrix_rate[0] = ' ';
     oled_write_P(PSTR("MS:"), false);
-    oled_write(matrix_rate, false);
+    oled_write(get_u16_str(get_matrix_scan_rate(), ' '), false);
 #endif
 }
 
diff --git a/users/drashna/oled/readme.md b/users/drashna/oled/readme.md
new file mode 100644
index 0000000000..dbb8187d49
--- /dev/null
+++ b/users/drashna/oled/readme.md
@@ -0,0 +1,42 @@
+# OLED Display
+
+To disable the pre genrated oled display, add `CUSTOM_OLED_DRIVER = no` to your `rules.mk`.
+
+<!-- to do: add all the stuff -->
+## OLED Font
+
+My font file has multiple fonts and multiple logs integrated into the one file.  And it uses the full 255 possible characters. 
+
+In addition to the default font and logos: 
+
+```c
+#    define OLED_FONT_5X5
+#    define OLED_FONT_AZTECH
+#    define OLED_FONT_BMPLAIN
+#    define OLED_FONT_CRACKERS
+#    define OLED_FONT_EIN
+#    define OLED_FONT_HISKYF21
+#    define OLED_FONT_SQUASH
+#    define OLED_FONT_SUPER_DIGG
+#    define OLED_FONT_ZXPIX
+```
+
+```c
+#    define OLED_LOGO_CORNE
+#    define OLED_LOGO_GMK_BAD
+#    define OLED_LOGO_GOTHAM
+#    define OLED_LOGO_HUE_MANITEE
+#    define OLED_LOGO_LOOSE
+#    define OLED_LOGO_SETS3N
+#    define OLED_LOGO_SKEEB
+```
+
+Additionally, the font file allows for external oled font files, instead.  This allows for additional files that cannot be hosted in the QMK Repo. 
+
+## Display
+
+A picture is worth a thousand words.  So here are two: 
+
+![Right](https://i.imgur.com/4XFOVKBl.jpg)
+
+![Left](https://i.imgur.com/W5RX4pAl.jpg)
diff --git a/users/drashna/pointing/pointing.c b/users/drashna/pointing/pointing.c
index 0198a8ae23..0bd14e4775 100644
--- a/users/drashna/pointing/pointing.c
+++ b/users/drashna/pointing/pointing.c
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "pointing.h"
 
diff --git a/users/drashna/pointing/pointing.h b/users/drashna/pointing/pointing.h
index 4ad16eeff3..8b00ffc0ec 100644
--- a/users/drashna/pointing/pointing.h
+++ b/users/drashna/pointing/pointing.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2021 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "drashna.h"
 
diff --git a/users/drashna/pointing/readme.md b/users/drashna/pointing/readme.md
new file mode 100644
index 0000000000..7770755050
--- /dev/null
+++ b/users/drashna/pointing/readme.md
@@ -0,0 +1,19 @@
+# User Pointing Device customization
+
+To disable the customized pointing device code and implement it at the keymap, add `CUSTOM_POINTING_DEVICE = no` to your `rules.mk`.
+
+## Automatic Mouse Layer
+
+Movement on the optical sensor triggers a layer that has all of the mouse keys on that layer.  After a set time, the layer will automatically turn itself off after 650ms.
+
+Also, using mousekeys will extend the amount of time that the layer will stay active. 
+
+Additionally, layer keys for the mouse layer will lock the layer on.
+
+## Gaming
+
+When the gamepad or diablo layers are enabled, the mouse layer is locked on, as well. 
+
+## Keycodes
+
+The only custom keycode for Pointing devices here is `KC_ACCEL`.  This allow the mouse report to have an acceleration curve (exponential).
diff --git a/users/drashna/post_config.h b/users/drashna/post_config.h
index b9d934c42b..0c9bda2eeb 100644
--- a/users/drashna/post_config.h
+++ b/users/drashna/post_config.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
@@ -137,3 +124,7 @@
 #ifndef DYNAMIC_KEYMAP_LAYER_COUNT
 #    define DYNAMIC_KEYMAP_LAYER_COUNT 11
 #endif
+
+#ifndef TAPPING_TERM
+#    define TAPPING_TERM 175
+#endif
diff --git a/users/drashna/readme.md b/users/drashna/readme.md
index b8d10aada2..e52b67e835 100644
--- a/users/drashna/readme.md
+++ b/users/drashna/readme.md
@@ -2,14 +2,16 @@
 
 This is my personal userspace file.  Most of my code exists here, as it's heavily shared.
 
-* [RGB Customization](readme/rgb.md)
-* [Diablo Tap Dancing](readme/tap_dance.md)
-* [Keymap Wrappers](readme/wrappers.md)
-* [Custom Function Handlers](readme/handlers.md)
-* [Secret Macros](readme/secrets.md)
-* [Custom Keycodes](readme/keycodes.md)
-
-
-## Pro Micro Hacking
-
-See [this thread](https://www.reddit.com/r/olkb/comments/8sxgzb/replace_pro_micro_bootloader_with_qmk_dfu/) for details on how to flash QMK DFU to Pro Micros. 
+* [Callback (keymap+misc)](callbacks.md)
+* [Keycode Handling](keyrecords/readme.md)
+  * [Autocorrection](keyrecords/autocorrection/readme.md)
+  * [Cap Words](keyrecords/capwords.md)
+  * [Diablo Tap Dancing](keyrecords/tap_dance.md)
+  * [Keymap Wrappers](keyrecords/wrappers.md)
+  * [Secret Macros](keyrecords/secrets.md)
+  * [Custom Keycodes](keyrecords/keycodes.md)
+  * [Unicode Input](keyrecords/unicode.md)
+* [OLED Display](oled/readme.md)
+* [Pointing Devices](pointing/readme.md)
+* [RGB Customization](rgb/readme.md)
+* [Split Transport](split/readme.md)
diff --git a/users/drashna/readme/handlers.md b/users/drashna/readme/handlers.md
deleted file mode 100644
index 4abaf51473..0000000000
--- a/users/drashna/readme/handlers.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# Custom Userspace Function handlers
-
-Specifically QMK works by using customized handlers for everything. This allows for multiple levels of customization. 
-
-`matrix_scan` calls `matrix_scan_quantum`, which calls `matrix_scan_kb`, which calls `matrix_scan_user`. 
-`process_record` calls a bunch of stuff, but eventually calls `process_record_kb` which calls `process_record_user`
-The same goes for `matrix_init`, `layer_state_set`, `led_set`, and a few other functions.  
-
-All (most) `_user` functions are handled here, in the userspace instead.  To allow keyboard specific configuration, I've created `_keymap` functions that can be called by the keymap.c files instead.
-
-This allows for keyboard specific configuration while maintaining the ability to customize the board.
-
-My [Ergodox EZ Keymap](https://github.com/qmk/qmk_firmware/blob/master/layouts/community/ergodox/drashna/keymap.c) is a good example of this, as it uses the LEDs as modifier indicators.
-
-But for a list: 
-
-```c
-__attribute__ ((weak))
-void matrix_init_keymap(void) {}
-
-void matrix_init_user(void) {
-  matrix_init_keymap();
-}
-
-__attribute__((weak))
-void keyboard_post_init_keymap(void){ }
-
-void keyboard_post_init_user(void){
-    keyboard_post_init_keymap();
-}
-
-__attribute__ ((weak))
-void matrix_scan_keymap(void) {}
-
-void matrix_scan_user(void) {
-  matrix_scan_keymap();
-}
-
-
-__attribute__ ((weak))
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return process_record_keymap(keycode, record);
-}
-
-
-__attribute__ ((weak))
-layer_state_t layer_state_set_keymap (layer_state_t state) {
-  return state;
-}
-
-layer_state_t layer_state_set_user (layer_state_t state) {
-  return layer_state_set_keymap (state);
-}
-
-
-__attribute__ ((weak))
-void led_set_keymap(uint8_t usb_led) {}
-
-void led_set_user(uint8_t usb_led) {
-   led_set_keymap(usb_led);
-}
-
-
-__attribute__ ((weak))
-void suspend_power_down_keymap(void) {}
-
-void suspend_power_down_user(void) {
-    suspend_power_down_keymap();
-}
-
-
-__attribute__ ((weak))
-void suspend_wakeup_init_keymap(void) {}
-
-void suspend_wakeup_init_user(void) {
-  suspend_wakeup_init_keymap();
-}
-
-
-__attribute__ ((weak))
-void shutdown_keymap(void) {}
-
-void shutdown_user (void) {
-  shutdown_keymap();
-}
-
-__attribute__ ((weak))
-void eeconfig_init_keymap(void) {}
-
-void eeconfig_init_user(void) {
-  eeconfig_init_keymap();
-}
-```
diff --git a/users/drashna/readme/keycodes.md b/users/drashna/readme/keycodes.md
deleted file mode 100644
index af4dd54bc0..0000000000
--- a/users/drashna/readme/keycodes.md
+++ /dev/null
@@ -1,10 +0,0 @@
-
-# Custom Keycodes
-
-Keycodes are defined in the drashna.h file and need to be included in the keymap.c files, so that they can be used there. 
-
-A bunch of macros are present and are only included on boards that are not the Ergodox EZ or Orthodox, as they are not needed for those boards. 
-
-Included is a custom macro for compiling my keyboards.  This includes the bootloader target (`:teensy`, `:avrdude`, or `:dfu`), and keeps RGBLIGHT, AUDIO enabled, if it previously was (regardless of the rules file).
-
-This also includes a modified RESET keycode as well, that sets the underglow to red.
diff --git a/users/drashna/readme/rgb.md b/users/drashna/rgb/readme.md
similarity index 69%
rename from users/drashna/readme/rgb.md
rename to users/drashna/rgb/readme.md
index acf01b051e..4deaa0a463 100644
--- a/users/drashna/readme/rgb.md
+++ b/users/drashna/rgb/readme.md
@@ -1,4 +1,10 @@
-# Layer Indication Code 
+# RGB 
+
+Custom RGB code can be disabled by setting `CUSTOM_RGBLIGHT = no` or `CUSTOM_RGB_MATRIX = no` in your `rules.mk`
+
+## RGB Light
+
+### Layer Indication Code 
 
 At least for RGB Light, the `layer_state_set` function is used to detect the current highest layer, and change the underglow based on that layer.  
 
@@ -8,7 +14,7 @@ I use the sethsv variants of the commands, so that different modes can be used,
 
 RGB Matrix uses a custom, per board implementation, at the moment. 
 
-# RGB Light Startup Animation
+### RGB Light Startup Animation
 
 On startup, if enabled, the board will cycle through the entire hue wheel, starting and ending on the default layer color. 
 
@@ -33,11 +39,14 @@ void keyboard_post_init_rgb(void) {
 
 This could probably benefit from some cleanup and better handling. 
 
+## RGB Matrix
 
-# RGB Light Twinkling 
+### Idle Animation
 
-This enables random twinkling of the LEDs when typing. 
+This feature can be toggled with the `RGB_IDL` keycode. 
 
-# RGB Light Mod Indicators
+This sets the mode to the Heatmap Animation when typing, but will switch to the cycle in animations when idle. 
 
-Allows feedback of which mods (oneshot or otherwise) are enabled. 
+### Layer Indication
+
+This sets the modifier keys to indicate the current layer state, with the option to override the behavior. 
diff --git a/users/drashna/rgb/rgb_matrix_stuff.c b/users/drashna/rgb/rgb_matrix_stuff.c
index 97811092c1..e6d631466d 100644
--- a/users/drashna/rgb/rgb_matrix_stuff.c
+++ b/users/drashna/rgb/rgb_matrix_stuff.c
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "drashna.h"
 #include "rgb_matrix.h"
@@ -29,27 +16,27 @@ void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode
 
     switch (mode) {
         case 1:  // breathing
-            {
-                uint16_t time = scale16by8(g_rgb_timer, speed / 8);
-                hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
-                RGB rgb       = hsv_to_rgb(hsv);
-                for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
-                    if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
-                        RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b);
-                    }
+        {
+            uint16_t time = scale16by8(g_rgb_timer, speed / 8);
+            hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+            RGB rgb       = hsv_to_rgb(hsv);
+            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+                if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
+                    RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b);
                 }
-                break;
             }
+            break;
+        }
         default:  // Solid Color
-            {
-                RGB rgb = hsv_to_rgb(hsv);
-                for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
-                    if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
-                        RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b);
-                    }
+        {
+            RGB rgb = hsv_to_rgb(hsv);
+            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+                if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
+                    RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b);
                 }
-                break;
             }
+            break;
+        }
     }
 }
 
@@ -95,3 +82,48 @@ bool process_record_user_rgb_matrix(uint16_t keycode, keyrecord_t *record) {
     }
     return true;
 }
+
+__attribute__((weak)) bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max) { return true; }
+void                       rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    if (!rgb_matrix_indicators_advanced_keymap(led_min, led_max)) { return; }
+
+#if defined(RGBLIGHT_ENABLE)
+    if (!userspace_config.rgb_layer_change)
+#else
+    if (userspace_config.rgb_layer_change)
+#endif
+    {
+        switch (get_highest_layer(layer_state | default_layer_state)) {
+            case _DEFAULT_LAYER_1:
+                rgb_matrix_layer_helper(DEFAULT_LAYER_1_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
+                break;
+            case _DEFAULT_LAYER_2:
+                rgb_matrix_layer_helper(DEFAULT_LAYER_2_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
+                break;
+            case _DEFAULT_LAYER_3:
+                rgb_matrix_layer_helper(DEFAULT_LAYER_3_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
+                break;
+            case _DEFAULT_LAYER_4:
+                rgb_matrix_layer_helper(DEFAULT_LAYER_4_HSV, 0, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
+                break;
+            case _GAMEPAD:
+                rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
+                break;
+            case _DIABLO:
+                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed * 8, LED_FLAG_MODIFIER, led_min, led_max);
+                break;
+            case _RAISE:
+                rgb_matrix_layer_helper(HSV_YELLOW, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
+                break;
+            case _LOWER:
+                rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
+                break;
+            case _ADJUST:
+                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER, led_min, led_max);
+                break;
+        }
+    }
+}
+
+__attribute__((weak)) bool rgb_matrix_indicators_keymap(void) { return true; }
+void                       rgb_matrix_indicators_user(void) { rgb_matrix_indicators_keymap(); }
diff --git a/users/drashna/rgb/rgb_matrix_stuff.h b/users/drashna/rgb/rgb_matrix_stuff.h
index b86f2f6514..7c6f6c271e 100644
--- a/users/drashna/rgb/rgb_matrix_stuff.h
+++ b/users/drashna/rgb/rgb_matrix_stuff.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 #include "quantum.h"
@@ -23,3 +10,6 @@ void matrix_scan_rgb_matrix(void);
 
 void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
 void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode, uint8_t speed, uint8_t led_type, uint8_t led_min, uint8_t led_max);
+
+bool rgb_matrix_indicators_advanced_keymap(uint8_t led_min, uint8_t led_max);
+bool rgb_matrix_indicators_keymap(void);
diff --git a/users/drashna/rgb/rgb_stuff.c b/users/drashna/rgb/rgb_stuff.c
index 15108bde04..e0422334aa 100644
--- a/users/drashna/rgb/rgb_stuff.c
+++ b/users/drashna/rgb/rgb_stuff.c
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifdef RGBLIGHT_ENABLE
 
diff --git a/users/drashna/rgb/rgb_stuff.h b/users/drashna/rgb/rgb_stuff.h
index af1acdde71..d720275b60 100644
--- a/users/drashna/rgb/rgb_stuff.h
+++ b/users/drashna/rgb/rgb_stuff.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 #include "quantum.h"
diff --git a/users/drashna/rgblight_breathe_table.h b/users/drashna/rgblight_breathe_table.h
index b6f7a13ac1..d406395978 100644
--- a/users/drashna/rgblight_breathe_table.h
+++ b/users/drashna/rgblight_breathe_table.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #ifndef RGBLIGHT_EFFECT_BREATHE_TABLE
 #define RGBLIGHT_EFFECT_BREATHE_TABLE
diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk
index 32afae22c9..445d1cf5ac 100644
--- a/users/drashna/rules.mk
+++ b/users/drashna/rules.mk
@@ -1,5 +1,7 @@
 SRC += $(USER_PATH)/drashna.c \
-       $(USER_PATH)/keyrecords/process_records.c
+        $(USER_PATH)/callbacks.c \
+        $(USER_PATH)/keyrecords/process_records.c \
+        $(USER_PATH)/keyrecords/tapping.c
 
 ifneq ($(PLATFORM),CHIBIOS)
     ifneq ($(strip $(LTO_SUPPORTED)), no)
@@ -8,6 +10,7 @@ ifneq ($(PLATFORM),CHIBIOS)
 endif
 SPACE_CADET_ENABLE    = no
 GRAVE_ESC_ENABLE      = no
+# DEBUG_MATRIX_SCAN_RATE_ENABLE = api
 
 ifneq ($(strip $(NO_SECRETS)), yes)
     ifneq ("$(wildcard $(USER_PATH)/keyrecords/secrets.c)","")
@@ -18,12 +21,23 @@ ifneq ($(strip $(NO_SECRETS)), yes)
     endif
 endif
 
+ifeq ($(strip $(MAKE_BOOTLOADER)), yes)
+    OPT_DEFS += -DMAKE_BOOTLOADER
+endif
+
+# At least until build.mk or the like drops, this is here to prevent
+# VUSB boards from enabling NKRO, as they do not support it. Ideally
+# this should be handled per keyboard, but until that happens ...
+ifeq ($(strip $(PROTOCOL)), VUSB)
+    NKRO_ENABLE       := no
+endif
+
 CUSTOM_UNICODE_ENABLE ?= yes
 ifeq ($(strip $(CUSTOM_UNICODE_ENABLE)), yes)
-    UNICODE_ENABLE        = no
-    UNICODEMAP_ENABLE     = no
-    UCIS_ENABLE           = no
-    UNICODE_COMMON        = yes
+    UNICODE_ENABLE        := no
+    UNICODEMAP_ENABLE     := no
+    UCIS_ENABLE           := no
+    UNICODE_COMMON        := yes
     OPT_DEFS += -DCUSTOM_UNICODE_ENABLE
     SRC += $(USER_PATH)/keyrecords/unicode.c
 endif
@@ -62,17 +76,6 @@ ifdef CONSOLE_ENABLE
     endif
 endif
 
-ifeq ($(strip $(MAKE_BOOTLOADER)), yes)
-    OPT_DEFS += -DMAKE_BOOTLOADER
-endif
-
-# At least until build.mk or the like drops, this is here to prevent
-# VUSB boards from enabling NKRO, as they do not support it. Ideally
-# this should be handled per keyboard, but until that happens ...
-ifeq ($(strip $(PROTOCOL)), VUSB)
-    NKRO_ENABLE       = no
-endif
-
 CUSTOM_OLED_DRIVER ?= yes
 ifeq ($(strip $(OLED_ENABLE)), yes)
     ifeq ($(strip $(CUSTOM_OLED_DRIVER)), yes)
@@ -96,15 +99,13 @@ ifeq ($(strip $(CUSTOM_SPLIT_TRANSPORT_SYNC)), yes)
     endif
 endif
 
-# DEBUG_MATRIX_SCAN_RATE_ENABLE = api
-
-AUTOCORRECTION_ENABLE ?= yes
+AUTOCORRECTION_ENABLE ?= no
 ifeq ($(strip $(AUTOCORRECTION_ENABLE)), yes)
     SRC += $(USER_PATH)/keyrecords/autocorrection/autocorrection.c
     OPT_DEFS += -DAUTOCORRECTION_ENABLE
 endif
 
-CAPS_WORD_ENABLE ?= yes
+CAPS_WORD_ENABLE ?= no
 ifeq ($(strip $(CAPS_WORD_ENABLE)), yes)
     SRC += $(USER_PATH)/keyrecords/caps_word.c
     OPT_DEFS += -DCAPS_WORD_ENABLE
diff --git a/users/drashna/split/readme.md b/users/drashna/split/readme.md
new file mode 100644
index 0000000000..5dad340122
--- /dev/null
+++ b/users/drashna/split/readme.md
@@ -0,0 +1,29 @@
+# Custom Split Transport
+
+To disable the customized split transport, add `CUSTOM_SPLIT_TRANSPORT_SYNC = no` to your `rules.mk`.
+
+This syncs a number of additional settings, such as the keymap_config (magic settings), user eeprom configs, and misc firmware settings. 
+
+Additionally, this supports a watchdog timer reset for the secondary split side. 
+
+## User State Config 
+
+The User states that it sync are: 
+
+* Audio Enable status
+* Audio Clicky states
+* Unicode mode
+* Pointing Device tap toggle status
+* Swap Hands status
+* Host Driver status
+
+## Userspace Config
+
+The userspace config states that are synced are: 
+
+* RGB layer indication
+* "is overwatch" status
+* nuke switch
+* Swapped numbers
+* RGB Matrix idle animation
+* Autocorrect enable status
diff --git a/users/drashna/split/transport_sync.c b/users/drashna/split/transport_sync.c
index cee3f04c8f..794664293c 100644
--- a/users/drashna/split/transport_sync.c
+++ b/users/drashna/split/transport_sync.c
@@ -1,22 +1,12 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "transport_sync.h"
 #include "transactions.h"
 #include <string.h>
+#ifdef __AVR__
+#    include <avr/wdt.h>
+#endif
 
 #ifdef CUSTOM_UNICODE_ENABLE
 #include "process_unicode_common.h"
@@ -33,6 +23,10 @@ extern bool tap_toggling;
 #ifdef SWAP_HANDS_ENABLE
 extern bool swap_hands;
 #endif
+
+static bool watchdog_ping_done = false;
+static uint32_t watchdog_timer = 0;
+
 extern userspace_config_t userspace_config;
 extern bool               host_driver_disabled;
 
@@ -57,11 +51,20 @@ void user_config_sync(uint8_t initiator2target_buffer_size, const void* initiato
     }
 }
 
+void watchdog_handler(uint8_t in_buflen, const void* in_data, uint8_t out_buflen, void* out_data) { watchdog_ping_done = true; }
+
+
 void keyboard_post_init_transport_sync(void) {
     // Register keyboard state sync split transaction
     transaction_register_rpc(RPC_ID_USER_STATE_SYNC, user_state_sync);
     transaction_register_rpc(RPC_ID_USER_KEYMAP_SYNC, user_keymap_sync);
     transaction_register_rpc(RPC_ID_USER_CONFIG_SYNC, user_config_sync);
+
+#ifdef __AVR__
+    wdt_disable();
+#endif
+    transaction_register_rpc(RPC_ID_USER_WATCHDOG_SYNC, watchdog_handler);
+    watchdog_timer = timer_read32();
 }
 
 void user_transport_update(void) {
@@ -163,6 +166,30 @@ void user_transport_sync(void) {
             }
         }
     }
+
+    if (!watchdog_ping_done) {
+        if (is_keyboard_master()) {
+            if (timer_elapsed32(watchdog_timer) > 100) {
+                uint8_t any_data = 1;
+                if (transaction_rpc_send(RPC_ID_USER_WATCHDOG_SYNC, sizeof(any_data), &any_data)) {
+                    watchdog_ping_done = true;  // successful ping
+                } else {
+                    dprint("Watchdog ping failed!\n");
+                }
+                watchdog_timer = timer_read32();
+            }
+        } else {
+            if (timer_elapsed32(watchdog_timer) > 3500) {
+#ifdef __AVR__
+                wdt_enable(WDTO_250MS);
+#else
+                NVIC_SystemReset();
+#endif
+                while (1) {
+                }
+            }
+        }
+    }
 }
 
 void housekeeping_task_user(void) {
diff --git a/users/drashna/split/transport_sync.h b/users/drashna/split/transport_sync.h
index 70b6ea522b..6b6f0c388b 100644
--- a/users/drashna/split/transport_sync.h
+++ b/users/drashna/split/transport_sync.h
@@ -1,19 +1,5 @@
-
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 
diff --git a/users/drashna/template.c b/users/drashna/template.c
index f98964ae4f..c4a62c6448 100644
--- a/users/drashna/template.c
+++ b/users/drashna/template.c
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "template.h"
 
diff --git a/users/drashna/template.h b/users/drashna/template.h
index cb1ad75d8a..26ac98edb9 100644
--- a/users/drashna/template.h
+++ b/users/drashna/template.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
 

From 3b4d5390f2c203b97d1f1c0b542d0f5cd0cfd5c7 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Fri, 31 Dec 2021 03:27:51 +0000
Subject: [PATCH 122/867] [Bug] Fix analog joystick to mouse compilation
 (#15677)

---
 drivers/sensors/analog_joystick.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/sensors/analog_joystick.c b/drivers/sensors/analog_joystick.c
index 0f4d1d7a4c..1666bed047 100644
--- a/drivers/sensors/analog_joystick.c
+++ b/drivers/sensors/analog_joystick.c
@@ -30,7 +30,7 @@ int16_t xOrigin, yOrigin;
 
 uint16_t lastCursor = 0;
 
-int16_t axisCoordinate(uint8_t pin, uint16_t origin) {
+int16_t axisCoordinate(pin_t pin, uint16_t origin) {
     int8_t  direction;
     int16_t distanceFromOrigin;
     int16_t range;
@@ -60,7 +60,7 @@ int16_t axisCoordinate(uint8_t pin, uint16_t origin) {
     }
 }
 
-int8_t axisToMouseComponent(uint8_t pin, int16_t origin, uint8_t maxSpeed) {
+int8_t axisToMouseComponent(pin_t pin, int16_t origin, uint8_t maxSpeed) {
     int16_t coordinate = axisCoordinate(pin, origin);
     if (coordinate != 0) {
         float percent = (float)coordinate / 100;

From 4fe6f3cd7a974e28796b1c1549cca22e7002e3eb Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Fri, 31 Dec 2021 23:38:23 +0000
Subject: [PATCH 123/867] Fix split pointing for analog joystick (#15691)

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 quantum/split_common/transactions.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 9622acb377..edaf0df628 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -631,9 +631,11 @@ static void pointing_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
     }
     last_exec = timer_read32();
 #    endif
-    temp_cpi = pointing_device_driver.get_cpi();
+    temp_cpi = !pointing_device_driver.get_cpi ? 0 : pointing_device_driver.get_cpi(); // check for NULL
     if (split_shmem->pointing.cpi && memcmp(&split_shmem->pointing.cpi, &temp_cpi, sizeof(temp_cpi)) != 0) {
-        pointing_device_driver.set_cpi(split_shmem->pointing.cpi);
+        if (pointing_device_driver.set_cpi) {
+            pointing_device_driver.set_cpi(split_shmem->pointing.cpi);
+        }
     }
     memset(&temp_report, 0, sizeof(temp_report));
     temp_report = pointing_device_driver.get_report(temp_report);

From 5fcdff99357e9a91d0f3b3b1d9505f43ac7a9634 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Fri, 31 Dec 2021 15:46:23 -0800
Subject: [PATCH 124/867] Format code according to conventions (#15693)

---
 quantum/split_common/transactions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index edaf0df628..81f9836382 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -631,7 +631,7 @@ static void pointing_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
     }
     last_exec = timer_read32();
 #    endif
-    temp_cpi = !pointing_device_driver.get_cpi ? 0 : pointing_device_driver.get_cpi(); // check for NULL
+    temp_cpi = !pointing_device_driver.get_cpi ? 0 : pointing_device_driver.get_cpi();  // check for NULL
     if (split_shmem->pointing.cpi && memcmp(&split_shmem->pointing.cpi, &temp_cpi, sizeof(temp_cpi)) != 0) {
         if (pointing_device_driver.set_cpi) {
             pointing_device_driver.set_cpi(split_shmem->pointing.cpi);

From a7735b614f683fda94754975409c302aaec5bcf5 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 1 Jan 2022 11:10:47 -0700
Subject: [PATCH 125/867] BM60HSRGB Poker rev2: Fix QMK Configurator
 Implementation (#15697)

* fix layout macro reference

* correct layout data

* correct maintainer field
---
 keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
index 0ad2aa9d3c..914334e113 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
@@ -1,9 +1,9 @@
 {
     "keyboard_name": "bm60v2_poker",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "bdtc123",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_60_ansi": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -60,7 +60,7 @@
                 {"x":9.25, "y":3},
                 {"x":10.25, "y":3},
                 {"x":11.25, "y":3},
-                {"x":14, "y":3,"w":2.75},
+                {"x":12.25, "y":3,"w":2.75},
 
                 {"x":0, "y":4, "w":1.25},
                 {"x":1.25, "y":4, "w":1.25},

From f3c080b4b47ba1150f4c44766b6fa8a685970b31 Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Sun, 2 Jan 2022 12:38:31 +1100
Subject: [PATCH 126/867] Revert "mkiirgb/v3: Swap R and G lanes to achieve
 correct RGB. (#15511)" (#15660)

This reverts commit 235c666f3d79ca42f8bc529bf006473396cb0bba.
---
 keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c | 136 ++++++++++++------------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index 6f325c4331..85806aff51 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -19,78 +19,78 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
-    {0, CS20_SW1, CS21_SW1, CS19_SW1},
-    {0, CS20_SW2, CS21_SW2, CS19_SW2},
-    {0, CS20_SW3, CS21_SW3, CS19_SW3},
-    {0, CS20_SW4, CS21_SW4, CS19_SW4},
-    {0, CS20_SW5, CS21_SW5, CS19_SW5},
-    {0, CS20_SW6, CS21_SW6, CS19_SW6},
-    {0, CS20_SW7, CS21_SW7, CS19_SW7},
-    {0, CS20_SW8, CS21_SW8, CS19_SW8},
-    {0, CS23_SW1, CS24_SW1, CS22_SW1},
-    {0, CS23_SW2, CS24_SW2, CS22_SW2},
-    {0, CS23_SW3, CS24_SW3, CS22_SW3},
-    {0, CS23_SW4, CS24_SW4, CS22_SW4},
-    {0, CS23_SW5, CS24_SW5, CS22_SW5},
-    {0, CS23_SW6, CS24_SW6, CS22_SW6},
-    {0, CS23_SW7, CS24_SW7, CS22_SW7},
+    {0, CS21_SW1, CS20_SW1, CS19_SW1},
+    {0, CS21_SW2, CS20_SW2, CS19_SW2},
+    {0, CS21_SW3, CS20_SW3, CS19_SW3},
+    {0, CS21_SW4, CS20_SW4, CS19_SW4},
+    {0, CS21_SW5, CS20_SW5, CS19_SW5},
+    {0, CS21_SW6, CS20_SW6, CS19_SW6},
+    {0, CS21_SW7, CS20_SW7, CS19_SW7},
+    {0, CS21_SW8, CS20_SW8, CS19_SW8},
+    {0, CS24_SW1, CS23_SW1, CS22_SW1},
+    {0, CS24_SW2, CS23_SW2, CS22_SW2},
+    {0, CS24_SW3, CS23_SW3, CS22_SW3},
+    {0, CS24_SW4, CS23_SW4, CS22_SW4},
+    {0, CS24_SW5, CS23_SW5, CS22_SW5},
+    {0, CS24_SW6, CS23_SW6, CS22_SW6},
+    {0, CS24_SW7, CS23_SW7, CS22_SW7},
 
-    {0, CS14_SW1, CS15_SW1, CS13_SW1},
-    {0, CS14_SW2, CS15_SW2, CS13_SW2},
-    {0, CS14_SW3, CS15_SW3, CS13_SW3},
-    {0, CS14_SW4, CS15_SW4, CS13_SW4},
-    {0, CS14_SW5, CS15_SW5, CS13_SW5},
-    {0, CS14_SW6, CS15_SW6, CS13_SW6},
-    {0, CS14_SW7, CS15_SW7, CS13_SW7},
-    {0, CS14_SW8, CS15_SW8, CS13_SW8},
-    {0, CS29_SW1, CS30_SW1, CS28_SW1},
-    {0, CS29_SW2, CS30_SW2, CS28_SW2},
-    {0, CS29_SW3, CS30_SW3, CS28_SW3},
-    {0, CS29_SW4, CS30_SW4, CS28_SW4},
-    {0, CS29_SW5, CS30_SW5, CS28_SW5},
-    {0, CS29_SW6, CS30_SW6, CS28_SW6},
-    {0, CS29_SW7, CS30_SW7, CS28_SW7},
+    {0, CS15_SW1, CS14_SW1, CS13_SW1},
+    {0, CS15_SW2, CS14_SW2, CS13_SW2},
+    {0, CS15_SW3, CS14_SW3, CS13_SW3},
+    {0, CS15_SW4, CS14_SW4, CS13_SW4},
+    {0, CS15_SW5, CS14_SW5, CS13_SW5},
+    {0, CS15_SW6, CS14_SW6, CS13_SW6},
+    {0, CS15_SW7, CS14_SW7, CS13_SW7},
+    {0, CS15_SW8, CS14_SW8, CS13_SW8},
+    {0, CS30_SW1, CS29_SW1, CS28_SW1},
+    {0, CS30_SW2, CS29_SW2, CS28_SW2},
+    {0, CS30_SW3, CS29_SW3, CS28_SW3},
+    {0, CS30_SW4, CS29_SW4, CS28_SW4},
+    {0, CS30_SW5, CS29_SW5, CS28_SW5},
+    {0, CS30_SW6, CS29_SW6, CS28_SW6},
+    {0, CS30_SW7, CS29_SW7, CS28_SW7},
 
-    {0, CS11_SW1, CS12_SW1, CS10_SW1},
-    {0, CS11_SW2, CS12_SW2, CS10_SW2},
-    {0, CS11_SW3, CS12_SW3, CS10_SW3},
-    {0, CS11_SW4, CS12_SW4, CS10_SW4},
-    {0, CS11_SW5, CS12_SW5, CS10_SW5},
-    {0, CS11_SW6, CS12_SW6, CS10_SW6},
-    {0, CS11_SW7, CS12_SW7, CS10_SW7},
-    {0, CS11_SW8, CS12_SW8, CS10_SW8},
-    {0, CS32_SW1, CS33_SW1, CS31_SW1},
-    {0, CS32_SW2, CS33_SW2, CS31_SW2},
-    {0, CS32_SW3, CS33_SW3, CS31_SW3},
-    {0, CS32_SW4, CS33_SW4, CS31_SW4},
-    {0, CS32_SW5, CS33_SW5, CS31_SW5},
-    {0, CS32_SW7, CS33_SW7, CS31_SW7},
+    {0, CS12_SW1, CS11_SW1, CS10_SW1},
+    {0, CS12_SW2, CS11_SW2, CS10_SW2},
+    {0, CS12_SW3, CS11_SW3, CS10_SW3},
+    {0, CS12_SW4, CS11_SW4, CS10_SW4},
+    {0, CS12_SW5, CS11_SW5, CS10_SW5},
+    {0, CS12_SW6, CS11_SW6, CS10_SW6},
+    {0, CS12_SW7, CS11_SW7, CS10_SW7},
+    {0, CS12_SW8, CS11_SW8, CS10_SW8},
+    {0, CS33_SW1, CS32_SW1, CS31_SW1},
+    {0, CS33_SW2, CS32_SW2, CS31_SW2},
+    {0, CS33_SW3, CS32_SW3, CS31_SW3},
+    {0, CS33_SW4, CS32_SW4, CS31_SW4},
+    {0, CS33_SW5, CS32_SW5, CS31_SW5},
+    {0, CS33_SW7, CS32_SW7, CS31_SW7},
 
-    {0, CS8_SW1, CS9_SW1, CS7_SW1},
-    {0, CS8_SW2, CS9_SW2, CS7_SW2},
-    {0, CS8_SW3, CS9_SW3, CS7_SW3},
-    {0, CS8_SW4, CS9_SW4, CS7_SW4},
-    {0, CS8_SW5, CS9_SW5, CS7_SW5},
-    {0, CS8_SW6, CS9_SW6, CS7_SW6},
-    {0, CS8_SW7, CS9_SW7, CS7_SW7},
-    {0, CS8_SW8, CS9_SW8, CS7_SW8},
-    {0, CS35_SW1, CS36_SW1, CS34_SW1},
-    {0, CS35_SW2, CS36_SW2, CS34_SW2},
-    {0, CS35_SW3, CS36_SW3, CS34_SW3},
-    {0, CS35_SW4, CS36_SW4, CS34_SW4},
-    {0, CS35_SW5, CS36_SW5, CS34_SW5},
-    {0, CS35_SW7, CS36_SW7, CS34_SW7},
+    {0, CS9_SW1, CS8_SW1, CS7_SW1},
+    {0, CS9_SW2, CS8_SW2, CS7_SW2},
+    {0, CS9_SW3, CS8_SW3, CS7_SW3},
+    {0, CS9_SW4, CS8_SW4, CS7_SW4},
+    {0, CS9_SW5, CS8_SW5, CS7_SW5},
+    {0, CS9_SW6, CS8_SW6, CS7_SW6},
+    {0, CS9_SW7, CS8_SW7, CS7_SW7},
+    {0, CS9_SW8, CS8_SW8, CS7_SW8},
+    {0, CS36_SW1, CS35_SW1, CS34_SW1},
+    {0, CS36_SW2, CS35_SW2, CS34_SW2},
+    {0, CS36_SW3, CS35_SW3, CS34_SW3},
+    {0, CS36_SW4, CS35_SW4, CS34_SW4},
+    {0, CS36_SW5, CS35_SW5, CS34_SW5},
+    {0, CS36_SW7, CS35_SW7, CS34_SW7},
 
-    {0, CS2_SW1, CS3_SW1, CS1_SW1},
-    {0, CS2_SW2, CS3_SW2, CS1_SW2},
-    {0, CS2_SW3, CS3_SW3, CS1_SW3},
-    {0, CS2_SW6, CS3_SW6, CS1_SW6},
-//    {0, CS38_SW1, CS39_SW1, CS37_SW1},
-    {0, CS38_SW2, CS39_SW2, CS37_SW2},
-    {0, CS38_SW3, CS39_SW3, CS37_SW3},
-    {0, CS38_SW4, CS39_SW4, CS37_SW4},
-    {0, CS38_SW5, CS39_SW5, CS37_SW5},
-    {0, CS38_SW7, CS39_SW7, CS37_SW7}
+    {0, CS3_SW1, CS2_SW1, CS1_SW1},
+    {0, CS3_SW2, CS2_SW2, CS1_SW2},
+    {0, CS3_SW3, CS2_SW3, CS1_SW3},
+    {0, CS3_SW6, CS2_SW6, CS1_SW6},
+//    {0, CS39_SW1, CS38_SW1, CS37_SW1},
+    {0, CS39_SW2, CS38_SW2, CS37_SW2},
+    {0, CS39_SW3, CS38_SW3, CS37_SW3},
+    {0, CS39_SW4, CS38_SW4, CS37_SW4},
+    {0, CS39_SW5, CS38_SW5, CS37_SW5},
+    {0, CS39_SW7, CS38_SW7, CS37_SW7}
 
 };
 led_config_t g_led_config = { {

From 8b44eaa63eef60fa52c85838605a870d6f9d3e46 Mon Sep 17 00:00:00 2001
From: uqs <uqs@FreeBSD.org>
Date: Sun, 2 Jan 2022 09:06:17 +0100
Subject: [PATCH 127/867] Update pmw3360 comments to match the datasheet
 better, fix delays. (#15682)

---
 drivers/sensors/pmw3360.c                | 34 +++++++++++++++---------
 keyboards/ploopyco/mouse/readme.md       |  2 +-
 keyboards/ploopyco/trackball/readme.md   |  4 +--
 keyboards/ploopyco/trackball/trackball.c |  2 +-
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index 4854ba5f47..9e3aeaa468 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -78,8 +78,12 @@
 #define CPI_STEP          100
 // clang-format on
 
+// limits to 0--119, resulting in a CPI range of 100 -- 12000 (as only steps of 100 are possible).
+// Note that for the PMW3389DM chip, the step size is 50 and supported range is
+// up to 16000. The datasheet does not indicate the minimum CPI though, neither
+// whether this uses 2 bytes (as 16000/50 == 320)
 #ifndef MAX_CPI
-#    define MAX_CPI 0x77  // limits to 0--119, should be max cpi/100
+#    define MAX_CPI 0x77
 #endif
 
 bool _inBurst = false;
@@ -91,6 +95,7 @@ void print_byte(uint8_t byte) { dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1'
 
 bool pmw3360_spi_start(void) {
     bool status = spi_start(PMW3360_CS_PIN, PMW3360_SPI_LSBFIRST, PMW3360_SPI_MODE, PMW3360_SPI_DIVISOR);
+    // tNCS-SCLK, 120ns
     wait_us(1);
     return status;
 }
@@ -106,12 +111,12 @@ spi_status_t pmw3360_write(uint8_t reg_addr, uint8_t data) {
     spi_status_t status = spi_write(reg_addr | 0x80);
     status              = spi_write(data);
 
-    // tSCLK-NCS for write operation
+    // tSCLK-NCS for write operation is 35us
     wait_us(35);
+    spi_stop();
 
     // tSWW/tSWR (=180us) minus tSCLK-NCS. Could be shortened, but is looks like a safe lower bound
     wait_us(145);
-    spi_stop();
     return status;
 }
 
@@ -119,15 +124,16 @@ uint8_t pmw3360_read(uint8_t reg_addr) {
     pmw3360_spi_start();
     // send adress of the register, with MSBit = 0 to indicate it's a read
     spi_write(reg_addr & 0x7f);
+    // tSRAD (=160us)
+    wait_us(160);
     uint8_t data = spi_read();
 
     // tSCLK-NCS for read operation is 120ns
     wait_us(1);
+    spi_stop();
 
     //  tSRW/tSRR (=20us) minus tSCLK-NCS
     wait_us(19);
-
-    spi_stop();
     return data;
 }
 
@@ -149,7 +155,7 @@ bool pmw3360_init(void) {
     spi_stop();
     wait_us(40);
 
-    // reboot
+    // power up, need to first drive NCS high then low, see above.
     pmw3360_write(REG_Power_Up_Reset, 0x5a);
     wait_ms(50);
 
@@ -190,6 +196,9 @@ bool pmw3360_init(void) {
 }
 
 void pmw3360_upload_firmware(void) {
+    // Datasheet claims we need to disable REST mode first, but during startup
+    // it's already disabled and we're not turning it on ...
+    //pmw3360_write(REG_Config2, 0x00);  // disable REST mode
     pmw3360_write(REG_SROM_Enable, 0x1d);
 
     wait_ms(10);
@@ -242,15 +251,20 @@ report_pmw3360_t pmw3360_read_burst(void) {
 
     pmw3360_spi_start();
     spi_write(REG_Motion_Burst);
-    wait_us(35);  // waits for tSRAD
+    wait_us(35);  // waits for tSRAD_MOTBR
 
     report.motion = spi_read();
-    spi_write(0x00);  // skip Observation
+    spi_read();  // skip Observation
+    // delta registers
     report.dx  = spi_read();
     report.mdx = spi_read();
     report.dy  = spi_read();
     report.mdy = spi_read();
 
+    if (report.motion & 0b111) {  // panic recovery, sometimes burst mode works weird.
+        _inBurst = false;
+    }
+
     spi_stop();
 
 #ifdef CONSOLE_ENABLE
@@ -271,9 +285,5 @@ report_pmw3360_t pmw3360_read_burst(void) {
     report.dy |= (report.mdy << 8);
     report.dy = report.dy * -1;
 
-    if (report.motion & 0b111) {  // panic recovery, sometimes burst mode works weird.
-        _inBurst = false;
-    }
-
     return report;
 }
diff --git a/keyboards/ploopyco/mouse/readme.md b/keyboards/ploopyco/mouse/readme.md
index f7f072928b..af3cb3520f 100644
--- a/keyboards/ploopyco/mouse/readme.md
+++ b/keyboards/ploopyco/mouse/readme.md
@@ -39,7 +39,7 @@ This should allow you to more heavily customize the behavior.
 
 Alternatively, the `process_wheel` and `process_mouse` functions can both be replaced too, to allow for even more functionality.
 
-Additionally, you can change the DPI/CPI or speed of the krackball by calling `pmw_set_cpi` at any time. Additionally, there is a `DPI_CONFIG` macro that will cycle through an array of options for the DPI.  This is set to 1200, 1600, and 2400, but can be changed.  1600 is also set to the default. 
+Additionally, you can change the DPI/CPI or speed of the trackball by calling `pointing_device_set_cpi` at any time. Additionally, there is a `DPI_CONFIG` macro that will cycle through an array of options for the DPI.  This is set to 1200, 1600, and 2400, but can be changed.  1600 is also set to the default.
 
 To configure/set your own array, there are two defines to use, `PLOOPY_DPI_OPTIONS` to set the array, and `PLOOPY_DPI_DEFAULT`. 
 
diff --git a/keyboards/ploopyco/trackball/readme.md b/keyboards/ploopyco/trackball/readme.md
index e1885d149a..1648bd20f9 100644
--- a/keyboards/ploopyco/trackball/readme.md
+++ b/keyboards/ploopyco/trackball/readme.md
@@ -19,7 +19,7 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 
 ## Revisions
 
-There are two main revisions for the PloopyCo Tracball, everything up to 1.004, and 1.005-1.006.
+There are two main revisions for the PloopyCo Trackball, everything up to 1.004, and 1.005-1.006.
 
 In the 1.005 revision, button for was changed from pin B5 to B6, and the debug LED pin was changed from F7 to B5. 
 
@@ -47,7 +47,7 @@ This should allow you to more heavily customize the behavior.
 
 Alternatively, the `process_wheel` and `process_mouse` functions can both be replaced too, to allow for even more functionality.
 
-Additionally, you can change the DPI/CPI or speed of the trackball by calling `pmw_set_cpi` at any time. Additionally, there is a `DPI_CONFIG` macro that will cycle through an array of options for the DPI.  This is set to 1200, 1600, and 2400, but can be changed.  1600 is also set to the default. 
+Additionally, you can change the DPI/CPI or speed of the trackball by calling `pointing_device_set_cpi` at any time. Additionally, there is a `DPI_CONFIG` macro that will cycle through an array of options for the DPI.  This is set to 1200, 1600, and 2400, but can be changed.  1600 is also set to the default.
 
 To configure/set your own array, there are two defines to use, `PLOOPY_DPI_OPTIONS` to set the array, and `PLOOPY_DPI_DEFAULT`. 
 
diff --git a/keyboards/ploopyco/trackball/trackball.c b/keyboards/ploopyco/trackball/trackball.c
index 25b36574a5..f819958734 100644
--- a/keyboards/ploopyco/trackball/trackball.c
+++ b/keyboards/ploopyco/trackball/trackball.c
@@ -218,7 +218,7 @@ void keyboard_pre_init_kb(void) {
 }
 
 void pointing_device_init_kb(void) {
-    pmw3360_set_cpi(dpi_array[keyboard_config.dpi_config]);
+    pointing_device_set_cpi(dpi_array[keyboard_config.dpi_config]);
     // initialize the scroll wheel's optical encoder
     opt_encoder_init();
 }

From 89f7378569e603149eae0e9918babd94c85b7796 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Sun, 2 Jan 2022 16:07:01 +0800
Subject: [PATCH 128/867] move @yangdigi 's keyboards to a YDKB folder (#15681)

---
 keyboards/{ => ydkb}/chili/chili.c                    | 0
 keyboards/{ => ydkb}/chili/chili.h                    | 0
 keyboards/{ => ydkb}/chili/config.h                   | 0
 keyboards/{ => ydkb}/chili/info.json                  | 0
 keyboards/{ => ydkb}/chili/keymaps/default/keymap.c   | 0
 keyboards/{ => ydkb}/chili/keymaps/via/keymap.c       | 0
 keyboards/{ => ydkb}/chili/keymaps/via/rules.mk       | 0
 keyboards/{ => ydkb}/chili/readme.md                  | 2 +-
 keyboards/{ => ydkb}/chili/rules.mk                   | 0
 keyboards/{ => ydkb}/just60/config.h                  | 0
 keyboards/{ => ydkb}/just60/info.json                 | 0
 keyboards/{ => ydkb}/just60/just60.h                  | 0
 keyboards/{ => ydkb}/just60/keymaps/default/keymap.c  | 0
 keyboards/{ => ydkb}/just60/keymaps/default/readme.md | 0
 keyboards/{ => ydkb}/just60/keymaps/thinxer/keymap.c  | 0
 keyboards/{ => ydkb}/just60/keymaps/thinxer/readme.md | 0
 keyboards/{ => ydkb}/just60/keymaps/thinxer/rules.mk  | 0
 keyboards/{ => ydkb}/just60/readme.md                 | 2 +-
 keyboards/{ => ydkb}/just60/rules.mk                  | 0
 keyboards/{ => ydkb}/yd68/config.h                    | 0
 keyboards/{ => ydkb}/yd68/info.json                   | 0
 keyboards/{ => ydkb}/yd68/keymaps/default/keymap.c    | 0
 keyboards/{ => ydkb}/yd68/keymaps/default/readme.md   | 0
 keyboards/{ => ydkb}/yd68/readme.md                   | 2 +-
 keyboards/{ => ydkb}/yd68/rules.mk                    | 0
 keyboards/{ => ydkb}/yd68/yd68.c                      | 0
 keyboards/{ => ydkb}/yd68/yd68.h                      | 0
 27 files changed, 3 insertions(+), 3 deletions(-)
 rename keyboards/{ => ydkb}/chili/chili.c (100%)
 rename keyboards/{ => ydkb}/chili/chili.h (100%)
 rename keyboards/{ => ydkb}/chili/config.h (100%)
 rename keyboards/{ => ydkb}/chili/info.json (100%)
 rename keyboards/{ => ydkb}/chili/keymaps/default/keymap.c (100%)
 rename keyboards/{ => ydkb}/chili/keymaps/via/keymap.c (100%)
 rename keyboards/{ => ydkb}/chili/keymaps/via/rules.mk (100%)
 rename keyboards/{ => ydkb}/chili/readme.md (95%)
 rename keyboards/{ => ydkb}/chili/rules.mk (100%)
 rename keyboards/{ => ydkb}/just60/config.h (100%)
 rename keyboards/{ => ydkb}/just60/info.json (100%)
 rename keyboards/{ => ydkb}/just60/just60.h (100%)
 rename keyboards/{ => ydkb}/just60/keymaps/default/keymap.c (100%)
 rename keyboards/{ => ydkb}/just60/keymaps/default/readme.md (100%)
 rename keyboards/{ => ydkb}/just60/keymaps/thinxer/keymap.c (100%)
 rename keyboards/{ => ydkb}/just60/keymaps/thinxer/readme.md (100%)
 rename keyboards/{ => ydkb}/just60/keymaps/thinxer/rules.mk (100%)
 rename keyboards/{ => ydkb}/just60/readme.md (97%)
 rename keyboards/{ => ydkb}/just60/rules.mk (100%)
 rename keyboards/{ => ydkb}/yd68/config.h (100%)
 rename keyboards/{ => ydkb}/yd68/info.json (100%)
 rename keyboards/{ => ydkb}/yd68/keymaps/default/keymap.c (100%)
 rename keyboards/{ => ydkb}/yd68/keymaps/default/readme.md (100%)
 rename keyboards/{ => ydkb}/yd68/readme.md (96%)
 rename keyboards/{ => ydkb}/yd68/rules.mk (100%)
 rename keyboards/{ => ydkb}/yd68/yd68.c (100%)
 rename keyboards/{ => ydkb}/yd68/yd68.h (100%)

diff --git a/keyboards/chili/chili.c b/keyboards/ydkb/chili/chili.c
similarity index 100%
rename from keyboards/chili/chili.c
rename to keyboards/ydkb/chili/chili.c
diff --git a/keyboards/chili/chili.h b/keyboards/ydkb/chili/chili.h
similarity index 100%
rename from keyboards/chili/chili.h
rename to keyboards/ydkb/chili/chili.h
diff --git a/keyboards/chili/config.h b/keyboards/ydkb/chili/config.h
similarity index 100%
rename from keyboards/chili/config.h
rename to keyboards/ydkb/chili/config.h
diff --git a/keyboards/chili/info.json b/keyboards/ydkb/chili/info.json
similarity index 100%
rename from keyboards/chili/info.json
rename to keyboards/ydkb/chili/info.json
diff --git a/keyboards/chili/keymaps/default/keymap.c b/keyboards/ydkb/chili/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/chili/keymaps/default/keymap.c
rename to keyboards/ydkb/chili/keymaps/default/keymap.c
diff --git a/keyboards/chili/keymaps/via/keymap.c b/keyboards/ydkb/chili/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/chili/keymaps/via/keymap.c
rename to keyboards/ydkb/chili/keymaps/via/keymap.c
diff --git a/keyboards/chili/keymaps/via/rules.mk b/keyboards/ydkb/chili/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/chili/keymaps/via/rules.mk
rename to keyboards/ydkb/chili/keymaps/via/rules.mk
diff --git a/keyboards/chili/readme.md b/keyboards/ydkb/chili/readme.md
similarity index 95%
rename from keyboards/chili/readme.md
rename to keyboards/ydkb/chili/readme.md
index a383f98fb0..c7be92b9e5 100644
--- a/keyboards/chili/readme.md
+++ b/keyboards/ydkb/chili/readme.md
@@ -10,6 +10,6 @@ The YDKB Chili is a Cherry G80-3000 replacement PCB utilizing the ATmega32U4 mic
 
 Make example for this keyboard (after setting up your build environment):
 
-    make chili:default
+    make ydkb/chili: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).
diff --git a/keyboards/chili/rules.mk b/keyboards/ydkb/chili/rules.mk
similarity index 100%
rename from keyboards/chili/rules.mk
rename to keyboards/ydkb/chili/rules.mk
diff --git a/keyboards/just60/config.h b/keyboards/ydkb/just60/config.h
similarity index 100%
rename from keyboards/just60/config.h
rename to keyboards/ydkb/just60/config.h
diff --git a/keyboards/just60/info.json b/keyboards/ydkb/just60/info.json
similarity index 100%
rename from keyboards/just60/info.json
rename to keyboards/ydkb/just60/info.json
diff --git a/keyboards/just60/just60.h b/keyboards/ydkb/just60/just60.h
similarity index 100%
rename from keyboards/just60/just60.h
rename to keyboards/ydkb/just60/just60.h
diff --git a/keyboards/just60/keymaps/default/keymap.c b/keyboards/ydkb/just60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/just60/keymaps/default/keymap.c
rename to keyboards/ydkb/just60/keymaps/default/keymap.c
diff --git a/keyboards/just60/keymaps/default/readme.md b/keyboards/ydkb/just60/keymaps/default/readme.md
similarity index 100%
rename from keyboards/just60/keymaps/default/readme.md
rename to keyboards/ydkb/just60/keymaps/default/readme.md
diff --git a/keyboards/just60/keymaps/thinxer/keymap.c b/keyboards/ydkb/just60/keymaps/thinxer/keymap.c
similarity index 100%
rename from keyboards/just60/keymaps/thinxer/keymap.c
rename to keyboards/ydkb/just60/keymaps/thinxer/keymap.c
diff --git a/keyboards/just60/keymaps/thinxer/readme.md b/keyboards/ydkb/just60/keymaps/thinxer/readme.md
similarity index 100%
rename from keyboards/just60/keymaps/thinxer/readme.md
rename to keyboards/ydkb/just60/keymaps/thinxer/readme.md
diff --git a/keyboards/just60/keymaps/thinxer/rules.mk b/keyboards/ydkb/just60/keymaps/thinxer/rules.mk
similarity index 100%
rename from keyboards/just60/keymaps/thinxer/rules.mk
rename to keyboards/ydkb/just60/keymaps/thinxer/rules.mk
diff --git a/keyboards/just60/readme.md b/keyboards/ydkb/just60/readme.md
similarity index 97%
rename from keyboards/just60/readme.md
rename to keyboards/ydkb/just60/readme.md
index f78adcd529..1fe05bd3ea 100644
--- a/keyboards/just60/readme.md
+++ b/keyboards/ydkb/just60/readme.md
@@ -12,6 +12,6 @@ Backlight LEDs and Bluetooth are not working yet.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make just60:default
+    make ydkb/just60: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).
diff --git a/keyboards/just60/rules.mk b/keyboards/ydkb/just60/rules.mk
similarity index 100%
rename from keyboards/just60/rules.mk
rename to keyboards/ydkb/just60/rules.mk
diff --git a/keyboards/yd68/config.h b/keyboards/ydkb/yd68/config.h
similarity index 100%
rename from keyboards/yd68/config.h
rename to keyboards/ydkb/yd68/config.h
diff --git a/keyboards/yd68/info.json b/keyboards/ydkb/yd68/info.json
similarity index 100%
rename from keyboards/yd68/info.json
rename to keyboards/ydkb/yd68/info.json
diff --git a/keyboards/yd68/keymaps/default/keymap.c b/keyboards/ydkb/yd68/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/yd68/keymaps/default/keymap.c
rename to keyboards/ydkb/yd68/keymaps/default/keymap.c
diff --git a/keyboards/yd68/keymaps/default/readme.md b/keyboards/ydkb/yd68/keymaps/default/readme.md
similarity index 100%
rename from keyboards/yd68/keymaps/default/readme.md
rename to keyboards/ydkb/yd68/keymaps/default/readme.md
diff --git a/keyboards/yd68/readme.md b/keyboards/ydkb/yd68/readme.md
similarity index 96%
rename from keyboards/yd68/readme.md
rename to keyboards/ydkb/yd68/readme.md
index 7e5e83bcc9..2632e8e9f8 100644
--- a/keyboards/yd68/readme.md
+++ b/keyboards/ydkb/yd68/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [KBDFans](https://kbdfans.cn/collections/diy-kit/products
 
 Make example for this keyboard (after setting up your build environment):
 
-    make yd68:default
+    make ydkb/yd68: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).
diff --git a/keyboards/yd68/rules.mk b/keyboards/ydkb/yd68/rules.mk
similarity index 100%
rename from keyboards/yd68/rules.mk
rename to keyboards/ydkb/yd68/rules.mk
diff --git a/keyboards/yd68/yd68.c b/keyboards/ydkb/yd68/yd68.c
similarity index 100%
rename from keyboards/yd68/yd68.c
rename to keyboards/ydkb/yd68/yd68.c
diff --git a/keyboards/yd68/yd68.h b/keyboards/ydkb/yd68/yd68.h
similarity index 100%
rename from keyboards/yd68/yd68.h
rename to keyboards/ydkb/yd68/yd68.h

From 6f043c549715b572cb77015369d07b382887daba Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Sun, 2 Jan 2022 16:07:22 +0800
Subject: [PATCH 129/867] Volume as default encoder documentation example
 (#15678)

Co-authored-by: filterpaper <filterpaper@localhost>
---
 docs/feature_encoders.md | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md
index 8ab5ca9c46..f301f7068d 100644
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -70,15 +70,15 @@ or `keymap.c`:
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* First encoder */
         if (clockwise) {
-            tap_code(KC_PGDN);
+            tap_code_delay(KC_VOLU, 10);
         } else {
-            tap_code(KC_PGUP);
+            tap_code_delay(KC_VOLD, 10);
         }
     } else if (index == 1) { /* Second encoder */
         if (clockwise) {
-            tap_code(KC_DOWN);
+            rgb_matrix_increase_hue();
         } else {
-            tap_code(KC_UP);
+            rgb_matrix_decrease_hue();
         }
     }
     return false;
@@ -100,9 +100,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             }
         } else if (index == 1) {
             if (clockwise) {
-                tap_code(KC_VOLU);
+                tap_code_delay(KC_VOLU, 10);
             } else {
-                tap_code(KC_VOLD);
+                tap_code_delay(KC_VOLD, 10);
             }
         }
     } else {  /* Layer 0 */
@@ -114,9 +114,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             }
         } else if (index == 1) {
             if (clockwise) {
-                tap_code(KC_DOWN);
+                rgb_matrix_increase_speed();
             } else {
-                tap_code(KC_UP);
+                rgb_matrix_decrease_speed();
             }
         }
     }
@@ -124,6 +124,8 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 ```
 
+?> Media and mouse countrol keycodes such as `KC_VOLU` and `KC_WH_D` requires `EXTRAKEY_ENABLE = yes` and `MOUSEKEY_ENABLE = yes` respectively in user's `rules.mk` if they are not enabled as default on keyboard level configuration.
+
 ## Hardware
 
 The A an B lines of the encoders should be wired directly to the MCU, and the C/common lines should be wired to ground.

From c32a329583c9ed0a14cff1e6ae9ac7cdc1e9d202 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Sun, 2 Jan 2022 00:11:49 -0800
Subject: [PATCH 130/867] Format code according to conventions (#15705)

---
 drivers/sensors/pmw3360.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index 9e3aeaa468..ad0a724ee4 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -198,7 +198,7 @@ bool pmw3360_init(void) {
 void pmw3360_upload_firmware(void) {
     // Datasheet claims we need to disable REST mode first, but during startup
     // it's already disabled and we're not turning it on ...
-    //pmw3360_write(REG_Config2, 0x00);  // disable REST mode
+    // pmw3360_write(REG_Config2, 0x00);  // disable REST mode
     pmw3360_write(REG_SROM_Enable, 0x1d);
 
     wait_ms(10);

From 838b214a2e4d791479a4ce67e508576293202516 Mon Sep 17 00:00:00 2001
From: Mango The Fourth <40720523+MangoIV@users.noreply.github.com>
Date: Mon, 3 Jan 2022 01:20:24 +0100
Subject: [PATCH 131/867] Fix DracuLad keymap to accomodate for breaking
 changes. (#15713)

Co-authored-by: MangoIV <mangoiv@outlook.com>
---
 keyboards/draculad/keymaps/pimoroni/config.h |  8 ++--
 keyboards/draculad/keymaps/pimoroni/keymap.c | 43 ++++++++++++--------
 keyboards/draculad/keymaps/pimoroni/rules.mk |  5 +--
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/keyboards/draculad/keymaps/pimoroni/config.h b/keyboards/draculad/keymaps/pimoroni/config.h
index c5f9df6f99..378b9b8923 100644
--- a/keyboards/draculad/keymaps/pimoroni/config.h
+++ b/keyboards/draculad/keymaps/pimoroni/config.h
@@ -15,11 +15,13 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#define POINTING_DEVICE_ROTATION_90
+
 //comment that out if your trackball is on the left side
 #define TRACKBALL_RIGHT
 
-#ifdef TRACKBALL_RIGHT
-    #define PIMORONI_TRACKBALL_INVERT_X
-    #define PIMORONI_TRACKBALL_INVERT_Y
+#ifdef TRACKBALL_RIGHT 
+    #define POINTING_DEVICE_INVERT_X
+    #define POINTING_DEVICE_INVERT_Y
 #endif
 
diff --git a/keyboards/draculad/keymaps/pimoroni/keymap.c b/keyboards/draculad/keymaps/pimoroni/keymap.c
index b70184dbc8..5c20c69af9 100644
--- a/keyboards/draculad/keymaps/pimoroni/keymap.c
+++ b/keyboards/draculad/keymaps/pimoroni/keymap.c
@@ -16,8 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include QMK_KEYBOARD_H
-#include "drivers/sensors/pimoroni_trackball.h"
-#include "pointing_device.h"
 
 
 enum layer_number {
@@ -29,13 +27,13 @@ enum layer_number {
 };
 
 enum custom_keycodes {
-  BALL_HUI,//cycles hue
-  BALL_WHT,//cycles white
-  BALL_DEC,//decreased color
-  BALL_SCR,//scrolls
-  BALL_NCL,//left click
-  BALL_RCL,//right click
-  BALL_MCL,//middle click
+  BALL_HUI = SAFE_RANGE, //cycles hue
+  BALL_WHT,              //cycles white
+  BALL_DEC,              //decreased color
+  BALL_SCR,              //scrolls
+  BALL_NCL,              //left click
+  BALL_RCL,              //right click
+  BALL_MCL,              //middle click
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -78,8 +76,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 #ifdef OLED_ENABLE
-
-
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 
  if (is_keyboard_master()) {
@@ -209,13 +205,23 @@ bool oled_task_user(void) {
     return false;
 }
 
-#endif
+#endif //OLED_ENABLE
 
 uint8_t white = 0;
 uint8_t red = 255;
 uint8_t green = 0;
 uint8_t blue = 0;
 
+bool set_scrolling = false;
+report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
+    if (set_scrolling) {
+        mouse_report.h = mouse_report.x;
+        mouse_report.v = mouse_report.y;
+        mouse_report.x = mouse_report.y = 0; 
+    }
+    return mouse_report;
+}
+
 void ball_increase_hue(void){
       if(red!=255&&green!=255&&blue!=255){
         red =255;
@@ -233,7 +239,7 @@ void ball_increase_hue(void){
       } else if(green ==0&&blue>0&&red==255){
         blue -=15;
       }
-      trackball_set_rgbw(red,green,blue,white);
+      pimoroni_trackball_set_rgbw(red,green,blue,white);
 }
 
 void decrease_color(void){
@@ -246,7 +252,7 @@ void decrease_color(void){
   if (blue>0){
     blue-=15;
   }
-  trackball_set_rgbw(red,green,blue,white);
+  pimoroni_trackball_set_rgbw(red,green,blue,white);
 }
 
 void cycle_white(void){
@@ -255,7 +261,7 @@ void cycle_white(void){
   } else{
     white=0;
   }
-  trackball_set_rgbw(red,green,blue,white);
+  pimoroni_trackball_set_rgbw(red,green,blue,white);
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record){
@@ -280,9 +286,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record){
 
   case BALL_SCR:
    if(record->event.pressed){
-     trackball_set_scrolling(true);
+     set_scrolling = true;
    } else{
-     trackball_set_scrolling(false);
+     set_scrolling = false;
    }
    break;
 
@@ -298,6 +304,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record){
   }
   return true;
 }
+
 #ifdef ENCODER_ENABLE
 bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) {
@@ -325,4 +332,4 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     // the missing ones are encoder 1 on the right side and encoder 3 on the left side
     return true;
 }
-#endif
+#endif // ENCODER_ENABLE
diff --git a/keyboards/draculad/keymaps/pimoroni/rules.mk b/keyboards/draculad/keymaps/pimoroni/rules.mk
index 704aad070a..66d3bf0e46 100644
--- a/keyboards/draculad/keymaps/pimoroni/rules.mk
+++ b/keyboards/draculad/keymaps/pimoroni/rules.mk
@@ -1,7 +1,6 @@
 # only uncomment on the side you have your trackball on
 POINTING_DEVICE_ENABLE = yes
-SRC += drivers/sensors/pimoroni_trackball.c
-QUANTUM_LIB_SRC += i2c_master.c
+POINTING_DEVICE_DRIVER = pimoroni_trackball
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
-MOUSEKEY_ENABLE = no
+MOUSEKEY_ENABLE = yes

From 1b953ac1e2a0b6f4bb91dea71339d1ccfc25f523 Mon Sep 17 00:00:00 2001
From: ripdog <ripdog@users.noreply.github.com>
Date: Mon, 3 Jan 2022 16:26:16 +1300
Subject: [PATCH 132/867] [Keyboard] Keychron Q1: Turn off RGB during PC
 suspend (#15685)

---
 keyboards/keychron/q1/config.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h
index 149280161f..8107dd6251 100644
--- a/keyboards/keychron/q1/config.h
+++ b/keyboards/keychron/q1/config.h
@@ -46,6 +46,9 @@
 /* NKRO */
 #define FORCE_NKRO
 
+/* Disable RGB lighting when PC is in suspend */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects

From d49b46a30d4fbd2b663b623b3cc6a4a67d631646 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 4 Jan 2022 01:07:35 +0800
Subject: [PATCH 133/867] [Keyboard] change bm60hsrgb/rev2 layout to
 LAYOUT_60_ansi_arrow (#15701)

---
 keyboards/kprepublic/bm60hsrgb/rev2/info.json            | 4 ++--
 .../kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c   | 5 +++--
 keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c | 9 +++++----
 keyboards/kprepublic/bm60hsrgb/rev2/rev2.h               | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
index 51a6fbc880..7cbd7fb4f7 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/info.json
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json
@@ -1,9 +1,9 @@
 {
     "keyboard_name": "bm60v2",
     "url": "",
-    "maintainer": "kp republic",
+    "maintainer": "bdtc123",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_60_ansi_arrow": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c
index 58828d5181..a46be1786e 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c
@@ -1,4 +1,5 @@
 /* Copyright 2021 bdtc123
+ * Copyright 2022 peepeetee
  *
  * 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
@@ -16,14 +17,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_60_ansi_arrow(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         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_RSFT,        KC_UP,   KC_SLSH,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_60_ansi_arrow(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET,
         _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
         _______,            _______, _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______,
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c
index cca11326d0..55db68139e 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c
@@ -1,4 +1,5 @@
 /* Copyright 2021 bdtc123
+ * Copyright 2022 peepeetee
  *
  * 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
@@ -16,28 +17,28 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_60_ansi_arrow(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         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_RSFT,        KC_UP,   KC_SLSH,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_60_ansi_arrow(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET,
         _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
         _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______,
         _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,        _______, _______,
         _______,   _______,   _______,                      _______,                              _______, _______, _______, _______, _______
     ),
-    [2] = LAYOUT(
+    [2] = LAYOUT_60_ansi_arrow(
         _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______,
         _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
         _______,   _______,   _______,                      _______,                              _______, _______, _______, _______, _______
     ),
-    [3] = LAYOUT(
+    [3] = LAYOUT_60_ansi_arrow(
         _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
         _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______,
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h
index de1df85666..f8aeaca39e 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h
@@ -17,7 +17,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
+#define LAYOUT_60_ansi_arrow( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        \
     K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
     K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,          \

From a88dc08643af76e19eff72dbd9b2a0cefea3f23f Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 4 Jan 2022 01:07:58 +0800
Subject: [PATCH 134/867] [Docs] Note the order of enumerated custom keycodes
 (#15706)

Co-authored-by: filterpaper <filterpaper@localhost>
---
 docs/feature_macros.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/feature_macros.md b/docs/feature_macros.md
index 4368853569..f39c1a40e8 100644
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -193,6 +193,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 ```
 
+?> An enumerated list of custom keycodes (`enum custom_keycodes`) must be declared before `keymaps[]` array, `process_record_user()` and any other function that use the list for the compiler to recognise it.
+
 #### Advanced Macros
 
 In addition to the `process_record_user()` function, is the `post_process_record_user()` function. This runs after `process_record` and can be used to do things after a keystroke has been sent.  This is useful if you want to have a key pressed before and released after a normal key, for instance. 

From aea71554234cce71f9f9d4087253e53d2729f9a7 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 3 Jan 2022 21:54:46 +0000
Subject: [PATCH 135/867] Fix "No C files in filelist: None" (#15560)

* Fix "No C files in filelist: None"

* Align other commands

* force absolute paths
---
 lib/python/qmk/cli/format/c.py      | 22 ++++++++++++----------
 lib/python/qmk/cli/format/python.py |  3 ++-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/python/qmk/cli/format/c.py b/lib/python/qmk/cli/format/c.py
index 568684ed56..fe2f97da94 100644
--- a/lib/python/qmk/cli/format/c.py
+++ b/lib/python/qmk/cli/format/c.py
@@ -1,6 +1,5 @@
 """Format C code according to QMK's style.
 """
-from os import path
 from shutil import which
 from subprocess import CalledProcessError, DEVNULL, Popen, PIPE
 
@@ -15,6 +14,12 @@ core_dirs = ('drivers', 'quantum', 'tests', 'tmk_core', 'platforms')
 ignored = ('tmk_core/protocol/usb_hid', 'platforms/chibios/boards')
 
 
+def is_relative_to(file, other):
+    """Provide similar behavior to PurePath.is_relative_to in Python > 3.9
+    """
+    return str(normpath(file).resolve()).startswith(str(normpath(other).resolve()))
+
+
 def find_clang_format():
     """Returns the path to clang-format.
     """
@@ -68,18 +73,19 @@ def cformat_run(files):
 def filter_files(files, core_only=False):
     """Yield only files to be formatted and skip the rest
     """
+    files = list(map(normpath, filter(None, files)))
     if core_only:
         # Filter non-core files
         for index, file in enumerate(files):
             # The following statement checks each file to see if the file path is
             # - in the core directories
             # - not in the ignored directories
-            if not any(str(file).startswith(i) for i in core_dirs) or any(str(file).startswith(i) for i in ignored):
-                files[index] = None
+            if not any(is_relative_to(file, i) for i in core_dirs) or any(is_relative_to(file, i) for i in ignored):
+                del files[index]
                 cli.log.debug("Skipping non-core file %s, as '--core-only' is used.", file)
 
     for file in files:
-        if file and file.name.split('.')[-1] in c_file_suffixes:
+        if file.suffix[1:] in c_file_suffixes:
             yield file
         else:
             cli.log.debug('Skipping file %s', file)
@@ -118,12 +124,8 @@ def format_c(cli):
             print(git_diff.stderr)
             return git_diff.returncode
 
-        files = []
-
-        for file in git_diff.stdout.strip().split('\n'):
-            if not any([file.startswith(ignore) for ignore in ignored]):
-                if path.exists(file) and file.split('.')[-1] in c_file_suffixes:
-                    files.append(file)
+        changed_files = git_diff.stdout.strip().split('\n')
+        files = list(filter_files(changed_files, True))
 
     # Sanity check
     if not files:
diff --git a/lib/python/qmk/cli/format/python.py b/lib/python/qmk/cli/format/python.py
index 47b5c45fd5..008622cac1 100755
--- a/lib/python/qmk/cli/format/python.py
+++ b/lib/python/qmk/cli/format/python.py
@@ -25,8 +25,9 @@ def yapf_run(files):
 def filter_files(files):
     """Yield only files to be formatted and skip the rest
     """
+    files = list(map(normpath, filter(None, files)))
     for file in files:
-        if file and normpath(file).name.split('.')[-1] in py_file_suffixes:
+        if file.suffix[1:] in py_file_suffixes:
             yield file
         else:
             cli.log.debug('Skipping file %s', file)

From 550c9a315f146bc30fc828726d977f3f41477d52 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 3 Jan 2022 22:42:15 +0000
Subject: [PATCH 136/867] Refix "No C files in filelist: None" (#15728)

---
 lib/python/qmk/cli/format/c.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/python/qmk/cli/format/c.py b/lib/python/qmk/cli/format/c.py
index fe2f97da94..8eb7fa1ed0 100644
--- a/lib/python/qmk/cli/format/c.py
+++ b/lib/python/qmk/cli/format/c.py
@@ -74,17 +74,16 @@ def filter_files(files, core_only=False):
     """Yield only files to be formatted and skip the rest
     """
     files = list(map(normpath, filter(None, files)))
-    if core_only:
-        # Filter non-core files
-        for index, file in enumerate(files):
+
+    for file in files:
+        if core_only:
             # The following statement checks each file to see if the file path is
             # - in the core directories
             # - not in the ignored directories
             if not any(is_relative_to(file, i) for i in core_dirs) or any(is_relative_to(file, i) for i in ignored):
-                del files[index]
                 cli.log.debug("Skipping non-core file %s, as '--core-only' is used.", file)
+                continue
 
-    for file in files:
         if file.suffix[1:] in c_file_suffixes:
             yield file
         else:

From 1c1e6fa47df8d1dc094973929afdfd1ca9333150 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 5 Jan 2022 02:11:24 +0000
Subject: [PATCH 137/867] Remove stale docs translations (#15737)

---
 book.json                                     |  46 ---
 docs/_langs.md                                |   5 -
 docs/de/README.md                             |  32 --
 docs/de/_summary.md                           | 122 ------
 docs/de/cli.md                                | 150 -------
 docs/de/driver_installation_zadig.md          |  47 ---
 docs/de/newbs.md                              |  22 --
 docs/de/newbs_building_firmware.md            |  78 ----
 docs/de/newbs_flashing.md                     | 369 ------------------
 docs/de/newbs_getting_started.md              | 101 -----
 docs/de/newbs_learn_more_resources.md         |  14 -
 docs/de/newbs_testing_debugging.md            | 102 -----
 docs/es/README.md                             |  31 --
 docs/es/_summary.md                           | 122 ------
 docs/es/hardware.md                           |   8 -
 docs/es/hardware_avr.md                       | 182 ---------
 docs/es/hardware_drivers.md                   |  31 --
 docs/es/hardware_keyboard_guidelines.md       | 147 -------
 docs/es/newbs.md                              |  23 --
 docs/es/newbs_best_practices.md               | 159 --------
 docs/es/newbs_building_firmware.md            |  81 ----
 .../newbs_building_firmware_configurator.md   | 105 -----
 docs/es/newbs_flashing.md                     | 351 -----------------
 docs/es/newbs_getting_started.md              | 103 -----
 docs/es/newbs_learn_more_resources.md         |  15 -
 docs/es/newbs_testing_debugging.md            | 101 -----
 docs/fr-fr/ChangeLog/20190830.md              |  52 ---
 docs/fr-fr/README.md                          |  31 --
 docs/fr-fr/_summary.md                        | 126 ------
 docs/fr-fr/breaking_changes.md                | 106 -----
 docs/fr-fr/cli.md                             | 127 ------
 docs/fr-fr/cli_configuration.md               | 121 ------
 docs/fr-fr/contributing.md                    | 154 --------
 docs/fr-fr/driver_installation_zadig.md       |  46 ---
 docs/fr-fr/faq.md                             |   6 -
 docs/fr-fr/faq_build.md                       | 154 --------
 docs/fr-fr/faq_debug.md                       | 153 --------
 docs/fr-fr/faq_general.md                     |  16 -
 docs/fr-fr/faq_keymap.md                      | 161 --------
 docs/fr-fr/flashing.md                        | 238 -----------
 docs/fr-fr/getting_started_getting_help.md    |  15 -
 docs/fr-fr/getting_started_github.md          |  66 ----
 docs/fr-fr/getting_started_introduction.md    |  62 ---
 docs/fr-fr/newbs.md                           |  23 --
 docs/fr-fr/newbs_best_practices.md            | 161 --------
 docs/fr-fr/newbs_building_firmware.md         |  81 ----
 .../newbs_building_firmware_configurator.md   | 105 -----
 docs/fr-fr/newbs_flashing.md                  | 367 -----------------
 docs/fr-fr/newbs_getting_started.md           | 101 -----
 docs/fr-fr/newbs_learn_more_resources.md      |  14 -
 docs/fr-fr/newbs_testing_debugging.md         | 104 -----
 docs/he-il/README.md                          |  33 --
 docs/he-il/_summary.md                        | 140 -------
 docs/he-il/documentation_best_practices.md    |  67 ----
 docs/he-il/faq.md                             |   8 -
 docs/he-il/faq_general.md                     |  17 -
 docs/he-il/getting_started_getting_help.md    |  17 -
 docs/he-il/getting_started_github.md          |  74 ----
 docs/he-il/getting_started_introduction.md    |  72 ----
 docs/he-il/hardware.md                        |  10 -
 docs/he-il/newbs_learn_more_resources.md      |  16 -
 docs/he-il/proton_c_conversion.md             |  36 --
 docs/he-il/quantum_keycodes.md                |  25 --
 docs/index.html                               |  23 --
 docs/ko-kr/README.md                          |  32 --
 docs/ko-kr/getting_started_build_tools.md     | 156 --------
 docs/ko-kr/getting_started_getting_help.md    |  17 -
 docs/ko-kr/getting_started_github.md          |  67 ----
 docs/pt-br/README.md                          |  30 --
 docs/pt-br/_summary.md                        | 122 ------
 docs/ru-ru/README.md                          |  31 --
 docs/ru-ru/_summary.md                        | 124 ------
 docs/ru-ru/getting_started_build_tools.md     | 153 --------
 docs/ru-ru/getting_started_getting_help.md    |  15 -
 docs/ru-ru/getting_started_github.md          |  63 ---
 docs/ru-ru/getting_started_introduction.md    |  58 ---
 docs/ru-ru/newbs.md                           |  23 --
 docs/ru-ru/newbs_getting_started.md           | 102 -----
 78 files changed, 6668 deletions(-)
 delete mode 100644 book.json
 delete mode 100644 docs/de/README.md
 delete mode 100644 docs/de/_summary.md
 delete mode 100644 docs/de/cli.md
 delete mode 100644 docs/de/driver_installation_zadig.md
 delete mode 100644 docs/de/newbs.md
 delete mode 100644 docs/de/newbs_building_firmware.md
 delete mode 100644 docs/de/newbs_flashing.md
 delete mode 100644 docs/de/newbs_getting_started.md
 delete mode 100644 docs/de/newbs_learn_more_resources.md
 delete mode 100644 docs/de/newbs_testing_debugging.md
 delete mode 100644 docs/es/README.md
 delete mode 100644 docs/es/_summary.md
 delete mode 100644 docs/es/hardware.md
 delete mode 100644 docs/es/hardware_avr.md
 delete mode 100644 docs/es/hardware_drivers.md
 delete mode 100644 docs/es/hardware_keyboard_guidelines.md
 delete mode 100644 docs/es/newbs.md
 delete mode 100644 docs/es/newbs_best_practices.md
 delete mode 100644 docs/es/newbs_building_firmware.md
 delete mode 100644 docs/es/newbs_building_firmware_configurator.md
 delete mode 100644 docs/es/newbs_flashing.md
 delete mode 100644 docs/es/newbs_getting_started.md
 delete mode 100644 docs/es/newbs_learn_more_resources.md
 delete mode 100644 docs/es/newbs_testing_debugging.md
 delete mode 100644 docs/fr-fr/ChangeLog/20190830.md
 delete mode 100644 docs/fr-fr/README.md
 delete mode 100644 docs/fr-fr/_summary.md
 delete mode 100644 docs/fr-fr/breaking_changes.md
 delete mode 100644 docs/fr-fr/cli.md
 delete mode 100644 docs/fr-fr/cli_configuration.md
 delete mode 100644 docs/fr-fr/contributing.md
 delete mode 100644 docs/fr-fr/driver_installation_zadig.md
 delete mode 100644 docs/fr-fr/faq.md
 delete mode 100644 docs/fr-fr/faq_build.md
 delete mode 100644 docs/fr-fr/faq_debug.md
 delete mode 100644 docs/fr-fr/faq_general.md
 delete mode 100644 docs/fr-fr/faq_keymap.md
 delete mode 100644 docs/fr-fr/flashing.md
 delete mode 100644 docs/fr-fr/getting_started_getting_help.md
 delete mode 100644 docs/fr-fr/getting_started_github.md
 delete mode 100644 docs/fr-fr/getting_started_introduction.md
 delete mode 100644 docs/fr-fr/newbs.md
 delete mode 100644 docs/fr-fr/newbs_best_practices.md
 delete mode 100644 docs/fr-fr/newbs_building_firmware.md
 delete mode 100644 docs/fr-fr/newbs_building_firmware_configurator.md
 delete mode 100644 docs/fr-fr/newbs_flashing.md
 delete mode 100644 docs/fr-fr/newbs_getting_started.md
 delete mode 100644 docs/fr-fr/newbs_learn_more_resources.md
 delete mode 100644 docs/fr-fr/newbs_testing_debugging.md
 delete mode 100644 docs/he-il/README.md
 delete mode 100644 docs/he-il/_summary.md
 delete mode 100644 docs/he-il/documentation_best_practices.md
 delete mode 100644 docs/he-il/faq.md
 delete mode 100644 docs/he-il/faq_general.md
 delete mode 100644 docs/he-il/getting_started_getting_help.md
 delete mode 100644 docs/he-il/getting_started_github.md
 delete mode 100644 docs/he-il/getting_started_introduction.md
 delete mode 100644 docs/he-il/hardware.md
 delete mode 100644 docs/he-il/newbs_learn_more_resources.md
 delete mode 100644 docs/he-il/proton_c_conversion.md
 delete mode 100644 docs/he-il/quantum_keycodes.md
 delete mode 100644 docs/ko-kr/README.md
 delete mode 100644 docs/ko-kr/getting_started_build_tools.md
 delete mode 100644 docs/ko-kr/getting_started_getting_help.md
 delete mode 100644 docs/ko-kr/getting_started_github.md
 delete mode 100644 docs/pt-br/README.md
 delete mode 100644 docs/pt-br/_summary.md
 delete mode 100644 docs/ru-ru/README.md
 delete mode 100644 docs/ru-ru/_summary.md
 delete mode 100644 docs/ru-ru/getting_started_build_tools.md
 delete mode 100644 docs/ru-ru/getting_started_getting_help.md
 delete mode 100644 docs/ru-ru/getting_started_github.md
 delete mode 100644 docs/ru-ru/getting_started_introduction.md
 delete mode 100644 docs/ru-ru/newbs.md
 delete mode 100644 docs/ru-ru/newbs_getting_started.md

diff --git a/book.json b/book.json
deleted file mode 100644
index 79206bf35a..0000000000
--- a/book.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "structure": {
-        "summary": "_summary.md"
-    },
-    "plugins" : [
-      "edit-link",
-      "forkmegithub",
-      "hints",
-      "page-toc",
-      "terminal",
-      "toolbar",
-      "bulk-redirect"
-    ],
-    "pluginsConfig": {
-      "edit-link": {
-        "base": "https://github.com/qmk/qmk_firmware/edit/master/docs",
-        "label": "Suggest an edit"
-      },
-      "forkmegithub": {
-        "color": "red",
-        "url": "https://github.com/qmk/qmk_firmware"
-      },
-      "page-toc": {
-        "selector": ".markdown-section h1, .markdown-section h2"
-      },
-      "terminal": {
-        "copyButtons": true,
-        "fade": false,
-        "style": "flat"
-      },
-      "toolbar": {
-        "buttons": [
-          {
-            "label": "QMK Firmware",
-            "icon": "fa fa-github",
-            "url": "https://github.com/qmk/qmk_firmware"
-          }
-        ]
-      }, 
-      "bulk-redirect": {
-          "basepath": "/",
-          "redirectsFile": "docs/redirects.json"
-      }
-    },
-    "root": "./docs/"
-}
diff --git a/docs/_langs.md b/docs/_langs.md
index e25458bbfd..8b08c34513 100644
--- a/docs/_langs.md
+++ b/docs/_langs.md
@@ -1,9 +1,4 @@
 - Translations
   - [:uk: English](/)
   - [:cn: 简体中文](/zh-cn/)
-  - [:es: Español](/es/)
-  - [:fr: Français](/fr-fr/)
-  - [:israel: עברית](/he-il/)
-  - [:brazil: Português](/pt-br/)
-  - [:ru: Русский](/ru-ru/)
   - [:jp: 日本語](/ja/)
diff --git a/docs/de/README.md b/docs/de/README.md
deleted file mode 100644
index f5f35d9d1c..0000000000
--- a/docs/de/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Quantum Mechanical Keyboard Firmware
-
-[![Aktuelle Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)
-[![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh)
-[![Docs Status](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm)
-[![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
-[![GitHub forks](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
-
-## Was ist QMK Firmware?
-
-QMK (*Quantum Mechanical Keyboard*) ist eine Open-Source-Community, welche die QMK-Firmware, die QMK-Toolbox, [qmk.fm](https://qmk.fm) und diese Dokumententation betreut. QMK-Firmware ist eine Weiterentwicklung der [tmk\_keyboard](https://github.com/tmk/tmk_keyboard)-Tastatur-Firmware mit vielen nützlichen Zusatzfunktionen für Atmel AVR-Prozessoren. Ursprünglich wurde sie für Produkte von [OLKB](https://olkb.com), das [ErgoDox EZ](https://www.ergodox-ez.com) und das [Clueboard](https://clueboard.co/) entwickelt. Im Laufe der Zeit wurde sie mit Hilfe von [ChibiOS](https://chibios.org) auch für die ARM-Architektur angepasst. Außerdem ist es inzwischen möglich, auch handverdrahtete Tastaturen und selbst geätzte PCBs mit QMK zu verwenden.
-
-## Bezugsquelle für QMK
-
-Wenn Du vorhast, deine Tastatur, Tastaturbelegung oder Features zu QMK beizusteuern, geht das am einfachsten, indem Du das [Repository auf GitHub](https://github.com/qmk/qmk_firmware#fork-destination-box) forkst, die Änderungen in deinem lokalen Repo vornimmst und anschließend einen [Pull Request](https://github.com/qmk/qmk_firmware/pulls) einreichst.
-
-Ansonsten kannst Du es als [zip](https://github.com/qmk/qmk_firmware/zipball/master) oder [tar](https://github.com/qmk/qmk_firmware/tarball/master) herunterladen, oder es direkt via git klonen (`git clone git@github.com:qmk/qmk_firmware.git` bzw. `git clone https://github.com/qmk/qmk_firmware.git`).
-
-
-## Anleitung fürs Kompilieren
-
-Bevor Du in der Lage bist, die Firmware zu kompilieren, musst Du eine [Entwicklungsumgebung](de/getting_started_build_tools.md) für AVR und/oder ARM aufsetzen. Danach kannst Du mit dem `make` Befehl eine Keymap für deine Tastatur erzeugen. Die Notation dafür ist:
-
-    make planck/rev4:default
-
-Dies generiert die Revision `rev4` für eine Tastatur vom Type `planck` mit der `default` Tastaturbelegung. Nicht alle Tastaturen haben Revisionen (auch bekannt als Subprojekt oder Unterordner) weswegen dies auch ausgelassen werden kann:
-
-    make preonic:default
-
-## Möglichkeiten der Anpassung
-
-QMK hat viele [Features](de/features.md), die es zu entdecken gibt. In der [Dokumentation](https://docs.qmk.fmk) kannst Du Dir einen Überblick verschaffen. Die meisten Features basieren darauf, die [Tastaturbelegung](de/keymap.md) anzupassen und das Verhalten der [Keycodes](de/keycodes.md) zu verändern.
diff --git a/docs/de/_summary.md b/docs/de/_summary.md
deleted file mode 100644
index ffbd292bd4..0000000000
--- a/docs/de/_summary.md
+++ /dev/null
@@ -1,122 +0,0 @@
-* [Anleitung für Anfänger](de/newbs.md)
-  * [Erste Schritte](de/newbs_getting_started.md)
-  * [Die erste Firmware](de/newbs_building_firmware.md)
-  * [Firmware flashen](de/newbs_flashing.md)
-  * [Testen und Debuggen](de/newbs_testing_debugging.md)
-  * [Git Tips und Tricks](de/newbs_best_practices.md)
-  * [Hilfreiche Ressourcen](de/newbs_learn_more_resources.md)
-
-* [QMK Basics](de/README.md)
-  * [QMK Einführung](de/getting_started_introduction.md)
-  * [QMK CLI](de/cli.md)
-  * [QMK CLI Konfiguration](de/cli_configuration.md)
-  * [Zu QMK beitragen](de/contributing.md)
-  * [Anleitung für GitHub](de/getting_started_github.md)
-  * [Nach Hilfe fragen](de/getting_started_getting_help.md)
-
-* [Breaking Changes](de/breaking_changes.md)
-  * [2019 Aug 30](de/ChangeLog/20190830.md)
-
-* [FAQ](de/faq.md)
-  * [Häufige Fragen](de/faq_general.md)
-  * [Build/Kompilieren](de/faq_build.md)
-  * [Debugging/Troubleshooting](de/faq_debug.md)
-  * [Keymap](de/faq_keymap.md)
-  * [Treiber Installation mit Zadig](de/driver_installation_zadig.md)
-
-* Detailierte Guides
-  * [Build Tools installieren](de/getting_started_build_tools.md)
-  * [Vagrant Guide](de/getting_started_vagrant.md)
-  * [Build/Compile Anleitung](de/getting_started_make_guide.md)
-  * [Firmware flashen](de/flashing.md)
-  * [Funktionalität anpassen](de/custom_quantum_functions.md)
-  * [Keymap Überblick](de/keymap.md)
-
-* [Hardware](de/hardware.md)
-  * [AVR Prozessoren](de/hardware_avr.md)
-  * [Treiber](de/hardware_drivers.md)
-
-* Referenz
-  * [Tastatur Richtlinien](de/hardware_keyboard_guidelines.md)
-  * [Konfigurations Optionen](de/config_options.md)
-  * [Keycodes](de/keycodes.md)
-  * [Coding Konventionen - C](de/coding_conventions_c.md)
-  * [Coding Konventionen - Python](de/coding_conventions_python.md)
-  * [Dokumentations Best Practices](de/documentation_best_practices.md)
-  * [Dokumentations Templates](de/documentation_templates.md)
-  * [Glossar](de/reference_glossary.md)
-  * [Unit Testing](de/unit_testing.md)
-  * [Nützliche Funktionen](de/ref_functions.md)
-  * [Configurator Support](de/reference_configurator_support.md)
-  * [info.json Format](de/reference_info_json.md)
-  * [Python CLI Development](de/cli_development.md)
-
-* [Features](de/features.md)
-  * [Basic Keycodes](de/keycodes_basic.md)
-  * [US ANSI Shifted Keys](de/keycodes_us_ansi_shifted.md)
-  * [Quantum Keycodes](de/quantum_keycodes.md)
-  * [Advanced Keycodes](de/feature_advanced_keycodes.md)
-  * [Audio](de/feature_audio.md)
-  * [Auto Shift](de/feature_auto_shift.md)
-  * [Backlight](de/feature_backlight.md)
-  * [Bluetooth](de/feature_bluetooth.md)
-  * [Bootmagic](de/feature_bootmagic.md)
-  * [Combos](de/feature_combo.md)
-  * [Command](de/feature_command.md)
-  * [Debounce API](de/feature_debounce_type.md)
-  * [DIP Switch](de/feature_dip_switch.md)
-  * [Dynamic Macros](de/feature_dynamic_macros.md)
-  * [Encoders](de/feature_encoders.md)
-  * [Grave Escape](de/feature_grave_esc.md)
-  * [Haptic Feedback](de/feature_haptic_feedback.md)
-  * [HD44780 LCD Controller](de/feature_hd44780.md)
-  * [Key Lock](de/feature_key_lock.md)
-  * [Layouts](de/feature_layouts.md)
-  * [Leader Key](de/feature_leader_key.md)
-  * [LED Matrix](de/feature_led_matrix.md)
-  * [Macros](de/feature_macros.md)
-  * [Mouse Keys](de/feature_mouse_keys.md)
-  * [OLED Driver](de/feature_oled_driver.md)
-  * [One Shot Keys](de/one_shot_keys.md)
-  * [Pointing Device](de/feature_pointing_device.md)
-  * [PS/2 Mouse](de/feature_ps2_mouse.md)
-  * [RGB Lighting](de/feature_rgblight.md)
-  * [RGB Matrix](de/feature_rgb_matrix.md)
-  * [Space Cadet](de/feature_space_cadet.md)
-  * [Split Keyboard](de/feature_split_keyboard.md)
-  * [Stenography](de/feature_stenography.md)
-  * [Swap Hands](de/feature_swap_hands.md)
-  * [Tap Dance](de/feature_tap_dance.md)
-  * [Terminal](de/feature_terminal.md)
-  * [Thermal Printer](de/feature_thermal_printer.md)
-  * [Unicode](de/feature_unicode.md)
-  * [Userspace](de/feature_userspace.md)
-  * [Velocikey](de/feature_velocikey.md)
-
-* Für Maker und Modder
-  * [Hand Wiring Guide](de/hand_wire.md)
-  * [ISP Flashing Guide](de/isp_flashing_guide.md)
-  * [ARM Debugging Guide](de/arm_debugging.md)
-  * [I2C Driver](de/i2c_driver.md)
-  * [SPI Driver](de/spi_driver.md)
-  * [GPIO Controls](de/internals_gpio_control.md)
-  * [Proton C Conversion](de/proton_c_conversion.md)
-
-* Für ein tieferes Verständnis
-  * [Wie Tastaturen funktionieren](de/how_keyboards_work.md)
-  * [QMK verstehen](de/understanding_qmk.md)
-
-* Andere Themen
-  * [Eclipse mit QMK](de/other_eclipse.md)
-  * [VSCode mit QMK](de/other_vscode.md)
-  * [Support](de/getting_started_getting_help.md)
-  * [Übersetzungen](de/translating.md)
-
-* QMK Internals (In Progress)
-  * [Defines](de/internals_defines.md)
-  * [Input Callback Reg](de/internals_input_callback_reg.md)
-  * [Midi Device](de/internals_midi_device.md)
-  * [Midi Device Setup Process](de/internals_midi_device_setup_process.md)
-  * [Midi Util](de/internals_midi_util.md)
-  * [Send Functions](de/internals_send_functions.md)
-  * [Sysex Tools](de/internals_sysex_tools.md)
diff --git a/docs/de/cli.md b/docs/de/cli.md
deleted file mode 100644
index 259aeecf75..0000000000
--- a/docs/de/cli.md
+++ /dev/null
@@ -1,150 +0,0 @@
-# QMK CLI (Kommandozeile)
-
-Diese Seite beschreibt die Einrichtung und den Umgang mit dem QMK CLI (Kommandozeile).
-
-# Übersicht
-
-Die QMK CLI vereinfacht das Zusammenbauen und Arbeiten mit QMK Tastaturen. Hier findest Du wichtige Befehle, um beispielsweise das Herunterladen und Kompilieren der QMK Firmware oder das Erstellen von Tastaturbelegungen (und vieles mehr) zu erleichtern.
-
-* [Globale CLI](#globale-cli)
-* [Lokale CLI](#lokale-cli)
-* [CLI-Befehle](#cli-befehle)
-
-# System-Anforderungen
-
-Die CLI benötigt Python 3.5 oder höher. Außerdem ist es nötig, die Packages laut [`requirements.txt`](https://github.com/qmk/qmk_firmware/blob/master/requirements.txt) zu installieren.
-
-# Globale CLI
-
-QMK bietet ein installierbares CLI, das Du zum Einrichten Deiner QMK Build-Umgebung verwenden kannst. Dieses ermöglicht Dir das Arbeiten mit QMK, und erleichtert das Arbeiten mit mehreren Kopien der `qmk_firmware`. Wir empfehlen, dieses CLI zu installieren und regelmäßig upzudaten.
-
-## Installation mit Homebrew (macOS, manche Linux)
-
-Solltest Du [Homebrew](https://brew.sh) installiert haben, kannst Du QMK per tap installieren:
-
-```
-brew tap qmk/qmk
-brew install qmk
-export QMK_HOME='~/qmk_firmware' # Optional: setzt den Installationsort für `qmk_firmware`
-qmk setup  # Dies klont `qmk/qmk_firmware` und richtet optional auch Deine Build-Umgebung ein
-```
-
-## Installation mit easy_install oder pip
-
-Falls Du kein Homebrew hast, kannst Du QMK auch manuell installieren. Zuerst musst Du sicherstellen, dass Python 3.5 (oder höher) und pip installiert ist. Dann installiere QMK mit diesem Befehl:
-
-```
-pip3 install qmk
-export QMK_HOME='~/qmk_firmware' # Optional: setzt den Installationsort für `qmk_firmware`
-qmk setup  # Dies klont `qmk/qmk_firmware` und richtet optional auch Deine Build-Umgebung ein
-```
-## Installation mit git Repo
-
-`git clone https://github.com/qmk/qmk_cli.git && cd qmk_cli && python3 setup.py install`
-
-## Packaging für andere Betriebssysteme
-
-Wir suchen nach Freiwilligen, die ein `qmk`-Package für weitere Betriebssysteme erstellen und pflegen. Falls Du ein Package für Dein OS erstellen möchtest, bitte befolge diese Richtlinien:
-
-* Verwende "Best Practices" für Dein OS, sollten sie mit diesen Richtlinien in Konflikt stehen.
-    * Dokumentiere den Grund in einem Kommentar, wenn Du abweichen musstest.
-* Installiere mit einem [virtualenv](https://virtualenv.pypa.io/en/latest/).
-* Weise den User an, die Umgebungs-Variable `QMK_HOME` zu setzen, um die Firmware-Quelle anders einzustellen als `~/qmk_firmware`.
-
-# CLI-Befehle
-
-## `qmk compile`
-
-Dieser Befehl erlaubt es dir, die Firmware - aus egal welchem Datei-Verzeichnis - zu compilen. Du kannst JSON-Exporte von <https://config.qmk.fm> oder Keymaps in der Repo kompilen.
-
-**Anwendung für Konfigurations-Exports**:
-
-```
-qmk compile <configuratorExport.json>
-```
-
-**Anwendung für Keymaps**:
-
-```
-qmk compile -kb <keyboard_name> -km <keymap_name>
-```
-
-## `qmk format-c`
-
-Dieser Befehl formatiert C-Code im clang-Format. Benutze ihn ohne Argumente, um den core-Code zu formatieren, oder benutze Namen von Dateien in der CLI, um den Befehl auf bestimmte Dateien anzuwenden.
-
-**Anwendung**:
-
-```
-qmk format-c [file1] [file2] [...] [fileN]
-```
-
-## `qmk config`
-
-Dieser Befehl konfiguriert das Verhalten von QMK. Für die volle `qmk config`-Dokumentation gehe zu [CLI-Konfiguration](cli_configuration.md).
-
-**Anwendung**:
-
-```
-qmk config [-ro] [config_token1] [config_token2] [...] [config_tokenN]
-```
-
-## `qmk docs`
-
-Dieser Befehl startet einen lokalen HTTP-Server, den Du zum Browsen oder Verbessern der Dokumentation verwenden kannst. Der Default-Port ist 8936.
-
-**Anwendung**:
-
-```
-qmk docs [-p PORT]
-```
-
-## `qmk doctor`
-
-Dieser Befehl untersucht Deine Umgebung und warnt Dich vor potentiellen Build- oder Flash-Problemen.
-
-**Anwendung**:
-
-```
-qmk doctor
-```
-
-## `qmk list-keyboards`
-
-Dieser Befehl listet alle zurzeit in `qmk_firmware` definierten Tastaturen/Keyboards auf.
-
-**Anwendung**:
-
-```
-qmk list-keyboards
-```
-
-## `qmk new-keymap`
-
-Dieser Befehl erstellt eine neue Keymap basierend auf einer existierenden Standard-Keymap eines bestimmten Keyboards.
-
-**Anwendung**:
-
-```
-qmk new-keymap [-kb KEYBOARD] [-km KEYMAP]
-```
-
-## `qmk format-py`
-
-Dieser Befehl formatiert Python-Code in `qmk_firmware`.
-
-**Anwendung**:
-
-```
-qmk format-py
-```
-
-## `qmk pytest`
-
-Dieser Befehl führt die Python Test Suite aus. Wenn Du Python-Code veränderst, solltest Du sicherstellen, dass der Test erfolgreich ausgeführt wurde.
-
-**Anwendung**:
-
-```
-qmk pytest
-```
diff --git a/docs/de/driver_installation_zadig.md b/docs/de/driver_installation_zadig.md
deleted file mode 100644
index bd04e05430..0000000000
--- a/docs/de/driver_installation_zadig.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# Bootloader Treiber Installation mit Zadig
-
-QMK erscheint für den Host als normales HID Eingabegerät und benötigt deshalb keine zusätzlichen Treiber. Der Bootloader, den Du für das Flashen der Firmware benötigst, jedoch meistens schon.
-
-Hierzu gibt es zwei Ausnahmen: den Caterina Bootloader, meistens auf Pro Micros, sowie den HalfKay Bootloader auf PJRC Teensys. Diese erscheinen als serieller Port und als generisches HID Gerät und benötigen keine Treiber.
-
-Wir empfehlen deshalb [Zadig](https://zadig.akeo.ie/). Wenn Du die Entwicklungsumgebung mit MSYS2 oder WSL installiert hast, wird dich dass `qmk_install.sh` Skript gefragt haben, ob es die Treiber für dich installieren sollte.
-
-## Installation
-
-Versetze deine Tastatur in den Bootloader-Modus, entweder durch Betätigung des physischen `RESET` Schalters - meist auf der Unterseite der Platine - oder durch das Auslösen des Key-Codes `RESET` bzw. `KC_RESET` (sollte in der zur Tastatur gehörigen `keycode.c` zu entnehmen sein). Sollte deine Tastatur weder noch besitzen, versuche es damit die `Escape`-Taste oder `Leertaste + B` zu halten während Du die Tastatur mit dem PC verbindest (Siehe auch [Bootmagic](de/feature_bootmagic.md) für weitere Details). Ein paar Tastaturen benutzen das [Command](de/feature_command.md)-Feature an Stelle von Bootmagic; in diesem Fall kannst du mit den Tastenkombinationen `linkes Shift + rechtes Shift + B` oder `linkes Shift + rechtes Shift + Escape` zu jeder Zeit in den Bootloader wechseln solange die Tastatur verbunden ist.
-
-Eingie Tastaturen haben u.U. spezielle Anweisungen um in den Bootloader-Modus zu gelangen. Zum Beispiel kann die [Bootmagic-Lite](de/feature_bootmagic.md#bootmagic-lite)-Taste (default: Escape) auf eine andere Taste gemappt sein; oder die magische Kombination (default: linkes Shift+rechtes Shift) verwendet anstatt Shift die STRG-Tasten. Die zur Tastatur gehörige README sollte dir Aufschluss darüber geben wie der Bootloader-Modus ausgelöst werden kann wenn Du unsicher bist.
-
-Um ein Gerät mit USBaspLoader in den Bootloader-Modus zu versetzen, halte `BOOT` gedrückt während Du den `RESET`-Knopf drückst.
-Alternativ, halte `BOOT` gedrückt während Du das USB-Kabel einsteckst.
-
-Zadig sollte das Bootloader-Gerät automatisch erkennen. Manchmal musst Du zusätzlich noch **Options → List All Devices** auswählen.
-
- - Tastaturen mit Atmel AVR MCUs sollten als `ATm32U4DFU` (oder ähnlich) angezeigt werden, mit der Vendor ID `03EB`.
- - USBasp werden als `USBasp` angezeigt, mit VID/PID `16C0:05DC`.
- - Tastaturen AVR controller und dem QMK-DFU Bootloader haben den namen `<Tastatur Name> Bootloader` und die VID `03EB`.
- - Die meisten ARM Tastaturen werden als `STM32 BOOTLOADER` angezeigt, mit VID/PID `0483:DF11`.
-
-!> Sollte Zadig ein oder mehrere Geräte mit `HidUsb`-Treiber anzeigen, dann ist deine Tastatur wahrscheinlich nicht im Bootloader-Modus. Der Pfeil wird orange eingefärbt sein und Du wirst nach einer Bestätigung gefragt um Veränderungen am System vorzunehmen. In diesem Fall **fahre nicht fort**!
-
-Wenn der Pfeil grün angezeigt wird, wähle den Treiber aus und klicke auf **Treiber installieren**. Der  `libusb-win32`-Treiber sollte gewöhnlich für AVR verwendet werden und `WinUSB` für ARM. Sollte es danach noch nicht möglich sein die Tastatur zu flashen, versuche es mit einem anderen Treiber. Für USBaspLoader Geräte, die über die Befehlszeile mit MSYS2 geflasht werden, wird der `libusbk`-Treiber empfohlen. Ansonsten sollte `libusb-win32` funktionieren wenn die QMK Toolbox verwendet wird.
-
-![Zadig mit Bootloader-Treiber korrekt installiert](https://i.imgur.com/b8VgXzx.png)
-
-Entferne nun deine Tastatur und verbinde sie erneut um sicherzugehen dass der neue Treiber erfolgreich installiert wurde. Wenn Du QMK Toolbox benutzt, starte die Anwendung zur Sicherheit einmal neu, da Veränderungen am Treiber manchmal nicht richtig erkannt werden. Wenn dies immer noch nicht erfolgreich war hilft es an dieser Stelle manchmal ein Neustart des Computers.
-
-## Wiederherstellung einer Installation für ein falsches Gerät
-
-Wenn Du feststellst dass Du anschließend auf deiner Tastatur nicht mehr tippen kannst, ist etwas bei der Installation schief gelaufen. Ein häufiger Fehler ist es dass die Tastatur nicht im Bootloader-Modus war und stattdessen der Treiber für das HID-Gerät ersetzt wurde. Dies kannst Du einfach mit Zadig überprüfen, eine funktionierende Tastatur verwendet als Treiber `HidUsb` auf allen Interfaces .
-
-![Eine funktionierende Tastatur aus Zadigs Sicht](https://i.imgur.com/Hx0E5kC.png)
-
-Öffne den Geräte-Manager und suche nach einem Gerät das wie deine Tastatur aussieht.
-
-![Die Tastatur mit dem falschen Treiber installiert, im Geräte-Manager](https://i.imgur.com/L3wvX8f.png)
-
-Rechtsklick und **Gerät deinstallieren** anklicken. Bitte gehe sicher dass in diesem Schritt auch **Treibersoftware für dieses Gerät löschen** markiert ist.
-
-![Der "Gerät deinstallieren"-Dialog, mit "Treibersoftware für dieses Gerät entfernen" markiert](https://i.imgur.com/aEs2RuA.png)
-
-Klick **Aktion → Suche nach veränderter Hardware**. Nun solltest Du wieder in der Lage sein normal zu tippen. Vergewissere dich mit Hilfe von Zadig dass die Tastatur nun `HidUsb` als Treiber verwendet. Wenn dies der Fall ist sollte wieder alles funktionieren.
diff --git a/docs/de/newbs.md b/docs/de/newbs.md
deleted file mode 100644
index 61139a99e1..0000000000
--- a/docs/de/newbs.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Anleitung für absolute Beginner
-QMK ist eine mächtige Open Source Firmware für mechanische Tastaturen. Mit QMK kannst Du deine Tastatur sowohl sehr einfach als auch sehr umfangreich anpassen. Menschen unterschiedlichen Wissensstandes - vom kompletten Anfänger bis zum erfahrenen Programmierer - haben ihre Tastaturen mit QMK erfolgreich auf ihre persönlichen Bedürfnisse angepasst. Diese Anleitung soll Dir unabhängig von deinen Vorkenntnissen dabei helfen dies ebenfalls zu bewältigen.
-
-Bist Du unsicher ob deine Tastatur QMK unterstützt? Wenn es eine mechanische Tastatur ist, die Du selbst gebaut hast, stehen deine Chancen gut. Wir unterstützen eine [Vielzahl](https://qmk.fm/keyboards/) selbst gebauter Tastaturen, sodass selbst wenn deine jetzige Tastatur nicht unterstützt wird Du keine Probleme haben solltest eine für deine Anforderungen zu finden.
-
-## Übersicht
-
-Diese Anleitung ist in 7 Abschnitte unterteilt:
-
-* [Die ersten Schritte](newbs_getting_started.md)
-* [Die erste Firmware auf der Kommandozeile erzeugen](newbs_building_firmware.md)
-* [Die erste Firmware mit der Online GUI erzeugen](newbs_building_firmware_configurator.md)
-* [Firmware flashen](newbs_flashing.md)
-* [Testen und Debuggen](newbs_testing_debugging.md)
-* [Git Leitfaden](newbs_best_practices.md)
-* [Weitere hilfreiche Ressourcen für Anfänger](newbs_learn_more_resources.md)
-
-Diese Anleitung richtet sich an Personen, die vorher noch nie Software kompiliert haben. Die Entscheidungen und Empfehlungen basieren auf dieser Grundannahme. Es gibt unterschiedliche Herangehensweisen für viele der Prozeduren und wir unterstützen die meisten Alternativen. Wenn Du mal nicht weiter weißt oder Dir nicht sicher bist, wie Du an ein Problem herangehen sollst, kannst Du uns gerne [um Hilfe bitten](getting_started_getting_help.md).
-
-## Weitere Ressourcen
-
-* [Thomas Baart's QMK Basics Blog](https://thomasbaart.nl/category/mechanical-keyboards/firmware/qmk/qmk-basics/) – Ein äußerst hilfreicher Blog eines Community-Mitglieds, der einige Grundlagen der QMK-Firmware aus der Sicht des Benutzers erklärt (auf Englisch).
diff --git a/docs/de/newbs_building_firmware.md b/docs/de/newbs_building_firmware.md
deleted file mode 100644
index b6d4840249..0000000000
--- a/docs/de/newbs_building_firmware.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# Eine eigene Firmware erstellen 
-
-Nachdem Du nun eine funktionierende Entwicklungsumgebung aufgesetzt hast, bist Du nun bereit, deine eigene Firmware zu erstellen. Dieses Sektion des Guides wird zwischen drei Programmen hin- und herwechseln: deinem Dateimanager, deinem Texteditor und der Befehlszeile. Lasse diese drei Fenster geöffnet, bis Du fertig und zufrieden mit deiner Tastatur-Firmware bist.
-
-Solltest Du die Befehlszeile zwischenzeitlich geschlossen haben, vergiss nicht wieder in das richtige Verzeichnis zu navigieren, benutze dazu den Befehl `cd qmk_firmware`.
-
-## Navigiere in deinen Keymap Ordner
-
-Beginne damit, in das `keymaps` Verzeichnis für deine Tastatur zu navigieren.
-
-Wenn Du macOS oder Windows benutzt, kannst Du einfach in das keymaps Verzeichnis wechseln.
-
-?> macOS:<br>
-    open keyboards/<keyboard_folder>/keymaps
-
-?> Windows:<br>
-    start .\\keyboards\\<keyboard_folder>\\keymaps
-
-## Eine Kopie der `default`  Tastaturbelegung erstellen
-
-Wenn Du den `keymaps` Ordner geöffnet hast, solltest Du zuerst eine Kopie des `default` Verzeichnisses erstellen. Wir empfehlen dafür deinen GitHub Benutzernamen zu verweden, aber Du kannst auch jeden anderen Namen verwenden solange er nur aus Kleinbuchstaben, Zahlen und Unterstrichen besteht.
-
-Um den Prozess zu automatisieren kannst Du dazu auch das Skript `new_keymap.sh` verwenden.
-
-Navigiere dazu in das `qmk_firmware/util` Verzeichnis und gib folgenden Befehl ein:
-
-```
-./new_keymap.sh <keyboard path> <username>
-```
-
-Um zum Beispiel den Benutzernamen John für die Tastaturbelegung eines 1up60hse zu verwenden, würdest Du Folgendes eingeben:
-
-```
-./new_keymap.sh 1upkeyboards/1up60hse john
-```
-
-## Öffne `keymap.c` in deinem bevorzugtem Text Editor
-
-Öffne deine `keymap.c`. In dieser Datei findest Du die Strukturen, die das Verhalten deiner Tastatur bestimmen. Oben in der `keymap.c` befinden sich Definitionen (defines) und Aufzählungen (enums), die die Tastaturbelegung leserlicher machen sollen. Weiter unten wirst Du eine Zeile finden, die wie folgt aussieht:
-
-    const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-Diese Zeile markiert den Anfang der Liste der Ebenen (Layers). Darunter befinden sich Zeilen die entweder `LAYOUT` oder `KEYMAP` enthalten, das deutet auf den Start einer Ebene hin. Danach folgt eine Liste von Tasten, die dieser Ebene zugewiesen sind.
-
-!> Beim Bearbeiten einer Tastaturbelegung solltest Du darauf achten, keine Kommata hinzuzufügen oder zu entfernen. Ansonsten kann dies dazu führen, dass deine Firmware nicht mehr kompiliert und es ist nicht immer einfach festzustellen, wo genau ein Komma zuviel oder zu wenig ist. Die letzte Zeile hat am Ende kein Komma, die Zeilen davor jedoch schon.
-
-## Personalisiere die Tastaturbelegung nach deinen Wünschen
-
-Wie Du diesen Schritt abschließt ist vollkommen Dir überlassen. Ändere die eine Sache die Dich stört oder verändere alles von Grund auf. Du kannst Ebenen entfernen die Du nicht brauchst oder Neue hinzufügen, bis zu 32 Stück. Die folgende Dokumentation verrät Dir was Du hier alles definieren kannst: 
-
-* [Keycodes](de/keycodes.md)
-* [Features](de/features.md)
-* [FAQ](de/faq.md)
-
-?> Während Du langsam ein Gefühl dafür kriegst wie Keymaps funktionieren, solltest Du darauf achten nicht zuviel auf einmal zu verändern. Größere Änderungen machen es schwieriger, Probleme zu debuggen.
-
-## Deine Firmware erzeugen
-
-Wenn Du damit fertig bist, deine Tastaturbelegung anzupassen, musst Du noch die Firmware erzeugen. Öffne dazu wieder die Befehlszeile und führe folgenden Befehl aus:
-
-    make <my_keyboard>:<my_keymap>
-
-Wenn deine Tastaturbelegung z.B. "xyverz" heißt und Du die Belegung für ein rev5 planck erzeugen möchtest, lautet der Befehl:
-
-    make planck/rev5:xyverz
-
-Während des Kompiliervorgangs wird viel Text auf dem Bildschirm ausgegeben. Es sollte am Ende mit etwas enden das ungefähr so aussieht:
-
-```
-Linking: .build/planck_rev5_xyverz.elf                                                              [OK]
-Creating load file for flashing: .build/planck_rev5_xyverz.hex                                      [OK]
-Copying planck_rev5_xyverz.hex to qmk_firmware folder                                               [OK]
-Checking file size of planck_rev5_xyverz.hex                                                        [OK]
- * File size is fine - 18392/28672
-```
-
-## Deine Firmware flashen
-Bitte fahre mit [Firmware flashen](de/newbs_flashing.md) fort, um zu erfahren, wie Du deine neue Firmware auf deine Tastatur flashen kannst.
diff --git a/docs/de/newbs_flashing.md b/docs/de/newbs_flashing.md
deleted file mode 100644
index 940438669e..0000000000
--- a/docs/de/newbs_flashing.md
+++ /dev/null
@@ -1,369 +0,0 @@
-# Deine Tastatur flashen
-
-Nachdem deine Firmware nun fertig ist musst Du Sie noch auf deine Tastatur flashen.
-
-## Flash-Vorgang mit QMK Toolbox
-
-Der einfachste Weg deine Tastatur zu flashen ist mit Hilfe der [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases)
-
-Leider ist die QMK Toolbox derzeit nur für Windows und macOS verfügbar. Wenn Du Linux benutzt (oder es vorziehst die Firmware mit der Kommandozeile zu flashen) solltest Du die Methode benutzen die [hier](de/newbs_flashing.md#tastatur-mit-der-befehlszeile-flashen) beschrieben wird.
-
-### Lade die Datei in QMK Toolbox
-
-Beginne damit die Datei in der QMK Toolbox Anwendung zu laden. Versichere dich dass Du die Firmware-Datei im Finder oder Explorer findest. Deine Tastatur-Firmware sollte entweder vom Typ `.hex` oder `.bin` sein sein. QMK sollte die für deine Tastatur entsprechende Datei automatisch in das Root-Verzeichnis (normalerweise `qmk_firmware`) kopieren.
-
-?> Wenn Du Windows oder macOS benutzt kannst Du mit folgenden Befehlen ganz einfach das aktuelle Firmware-Verzeichnis im Explorer oder Finder öffnen.
-
-#### Windows:
-
-``` start . ```
-
-#### macOS:
-
-``` open . ```
-
-Die Firmware-Dateien folgen dabei immer folgendem Schema:
-
-    <meine_Tastatur>_<meine_Tastaturbelegung>.{bin,hex}
-
-Zum Beispiel würde ein `planck/rev5` mit der `default` Tastaturbelegung folgenden Dateinamen haben:
-
-    planck_rev5_default.hex
-
-Wenn Du die Firmware-Datei gefunden hast kannst Du sie in das "Local file" ("Lokale Datei") Feld in der QMK Toolbox ziehen, alternativ kannst Du auf "Öffnen" klicken und in das Verzeichnis navigieren indem sich die Firmware-Datei befindet.
-
-### Die Tastatur in den DFU (Bootloader) Modus versetzen
-
-Um deine angepasste Firmware auf deine Tastatur zu flashen musst Du diese erst in einen speziellen "flashing"-Modus versetzen. Während die Tastatur in diesem Modus ist kannst Du nicht auf ihr tippen oder sie wie gewohnt als Tastatur benutzen. Es ist wichtig dass der flashing-Prozesses nicht unterbrochen oder die Tastatur ausstöpselst wird, da der Vorgang ansonst wiederholt werden muss.
-
-Verschiedene Tastaturen verwenden unterschiedliche Methoden um in den Bootloader-Modus zu gelangen. Wenn dein PCB im Moment QMK oder TMK verwendet und Du keine spezifischen Anweisungen erhalten hast probiere die folgenden Methoden in dieser Reihenfolge:
-
-* Halte beide Shift-Tasten und drücke `Pause`
-* Halte beide Shift-Tasten und drücke `B`
-* Entferne deine Tastatur vom Computer, drücke gleichzeitig `Leertaste` und `B`, verbinde die Tastatur wieder mit dem Computer und warte eine Sekunde bevor Du die Tasten wieder loslässt.
-* Drücke den physischen `RESET`-Knopf auf der Unterseite des PCBs
-* Suche auf dem PCB den Pin mit dem Label `RESET`, verbinde diesen mit deinem GND-Pin
-* Suche auf dem PCB den Pin mit dem Label `BOOT0`, verbinde diesen mit GND und schließe die Tastatur wieder an den PC an TODO: DIS IS DANGEROUS!!
-
-Wenn Du damit erfolgreich warst solltest Du in der QMK Toolbox eine Nachricht sehen die ungefähr so aussieht:
-
-```
-*** Clueboard - Clueboard 66% HotSwap disconnected -- 0xC1ED:0x2390
-*** DFU device connected
-```
-
-### Tastatur flashen
-
-Klicke auf den `Flash`-Knopf in der QMK Toolbox. Die Ausgabe wird ungefähr so aussehen:
-
-```
-*** Clueboard - Clueboard 66% HotSwap disconnected -- 0xC1ED:0x2390
-*** DFU device connected
-*** Attempting to flash, please don't remove device
->>> dfu-programmer atmega32u4 erase --force
-    Erasing flash...  Success
-    Checking memory from 0x0 to 0x6FFF...  Empty.
->>> dfu-programmer atmega32u4 flash qmk_firmware/clueboard_66_hotswap_skully.hex
-    Checking memory from 0x0 to 0x55FF...  Empty.
-    0%                            100%  Programming 0x5600 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    0%                            100%  Reading 0x7000 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    Validating...  Success
-    0x5600 bytes written into 0x7000 bytes memory (76.79%).
->>> dfu-programmer atmega32u4 reset
-   
-*** DFU device disconnected
-*** Clueboard - Clueboard 66% HotSwap connected -- 0xC1ED:0x2390
-```
-
-## Tastatur mit der Befehlszeile flashen
-
-Zunächst solltest Du versuchen herauszufinden welchen Bootlader deine Tastatur benutzt. Diese vier Bootloader sind am Weitesten verbreitet:
-
-| MCU | Bootloader |
-| --- | --- |
-| Pro-Micro und Klone | CATERINA |
-| Teensy | Halfkay |
-| OLKB Boards | QMK-DFU |
-| sonstige atmega32u4 | DFU |
-
-Auf der Seite [Flash Anleitung und Bootloader Informationen](de/flashing.md) kannst Du mehr über das Thema erfahren.
-
-Wenn Du weißt welchen Bootloader deine Tastaur verwendet, kannst Du diese Information bei der Kompilation hinzufügen um den Flash-Vorgang mit dem `make`-Befehl zu automatisieren.
-```rules.mk
-...
-BOOTLOADER = caterina
-...
-```
-
-### DFU
-
-Wenn Du den DFU-Bootloader verwendest und Du bereit bist deine Firmware zu kompilieren und zu flashen, öffne ein Befehlszeile und führe folgenden Befehl aus:
-
-    make <meine_Tastatur>:<meine_Tastaturbelegung>:dfu
-
-Wenn deine Tastaturbelegung z.B den Namen "xzverz" trägt und Du ein rev5 planck flashen möchtest sähe der Befehl wie folgt aus:
-
-    make planck/rev5:xyverz:dfu
-
-
-Nachdem der Vorgang abgeschlossen ist sollte die Ausgabe ungefähr so aussehen:
-
-```
-Linking: .build/planck_rev5_xyverz.elf                                [OK]
-Creating load file for flashing: .build/planck_rev5_xyverz.hex        [OK]
-Copying planck_rev5_xyverz.hex to qmk_firmware folder                 [OK]
-Checking file size of planck_rev5_xyverz.hex
- * File size is fine - 18574/28672
- ```
-
-Wenn dieser Punkt erreicht ist wird das Build-Skript alle 5 Sekunden nach einem DFU Bootloader suchen. Dieser Vorgang wird wiederholt bis er erfolgreich ist oder abgebrochen wird.
-
-    dfu-programmer: no device present.
-    Error: Bootloader not found. Trying again in 5s.
-
-Wenn diese Nachricht erscheint konnte das Build-Skript den Controller nicht eigenständig in den DFU Modus versetzen (z.B. weil der Modus in rules.mk falsch gesetzt wurde oder ein Problem mit der Hardware besteht), wenn dies eintritt musst Du die oben beschrieben Schritte benutzen um den Controller in den DFU Modus zu versetzen. Danach sollte die Ausgabe ungefähr so aussehen:
-
-```
-*** Attempting to flash, please don't remove device
->>> dfu-programmer atmega32u4 erase --force
-    Erasing flash...  Success
-    Checking memory from 0x0 to 0x6FFF...  Empty.
->>> dfu-programmer atmega32u4 flash qmk_firmware/clueboard_66_hotswap_skully.hex
-    Checking memory from 0x0 to 0x55FF...  Empty.
-    0%                            100%  Programming 0x5600 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    0%                            100%  Reading 0x7000 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    Validating...  Success
-    0x5600 bytes written into 0x7000 bytes memory (76.79%).
->>> dfu-programmer atmega32u4 reset
-```
-
-?> Wenn Du mit diesem Schritt Probleme hast (z.B. `dfu-programmer: no device present`) hilft dir hoffentlich der Abschnitt [Häufig gestellte Fragen (Build/Kompilieren)](de/faq_build.md).
-
-#### DFU Befehle
-
-Es gibt verschiedene DFU Befehle um die Firmware auf ein DFU Gerät zu flashen:
-
-* `:dfu` - Dies ist die default Option. Es wird gecheckt ob ein DFU Gerät verfügbar ist, ist dies der Fall wird die Firmware geflasht. Dieser Check wird alle 5 Sekunden ausgeführt bis ein DFU Gerät erkannt wird.
-* `:dfu-ee` - Der Flash-Vorgang benutzt eine `.eep` Datei anstatt einer `.hex` Datei. Dies ist eher unüblich.
-* `:dfu-split-left` - Dies flasht die Firmware wie gewohnt (`:dfu`). Allerdings nur die "linke Seite" der EEPROM für geteilte Tastaturen. _Dies ist ideal für auf Elite C basierenden geteilten Tastaturen._
-* `:dfu-split-right` - Dies flasht die Firmware wie gewohnt (`:dfu`). Allerdings nur die "rechte Seite" der EEPROM für geteilte Tastaturen. _Dies ist ideal für auf Elite C basierenden geteilten Tastaturen._
-
-
-### Caterina
-Für Arduinos und andere ProMicro Klone (z.B. SparkFun ProMicro), wenn Du bereit bist zu kompilieren und die Tastatur zu flashen, öffne ein Befehlszeilen-Fenster und führe den Build-Befehl aus:
-
-    make <meine_Tastatur>:<meine_Tastaturbelegung>:avrdude
-
-Wenn deine Tastaturbelegung zum Beispiel den Namen "xyverz" hat und Du eine Tastaturbelegung für ein "rev2 Lets Split" erzeugen möchtest, lautet der Befehl dafür:
-
-    make lets_split/rev2:xyverz:avrdude
-
-Nachdem die Kompilation abgeschlossen ist sollte die Ausgabe ungefähr so aussehen:
-
-```
-Linking: .build/lets_split_rev2_xyverz.elf                                [OK]
-Creating load file for flashing: .build/lets_split_rev2_xyverz.hex        [OK]
-Checking file size of lets_split_rev2_xyverz.hex                          [OK]
- * File size is fine - 27938/28672
-Detecting USB port, reset your controller now..............
-```
-
-Nun wird die Tastatur automatisch zurückgesetzt und das Skript wird die Firmware flashen sobald es den Bootloader erkennt. Die Ausgabe sollte ungefähr so aussehen:
-
-```
-Detected controller on USB port at /dev/ttyS15
-
-Connecting to programmer: .
-Found programmer: Id = "CATERIN"; type = S
-    Software Version = 1.0; No Hardware Version given.
-Programmer supports auto addr increment.
-Programmer supports buffered memory access with buffersize=128 bytes.
-
-Programmer supports the following devices:
-    Device code: 0x44
-
-avrdude.exe: AVR device initialized and ready to accept instructions
-
-Reading | ################################################## | 100% 0.00s
-
-avrdude.exe: Device signature = 0x1e9587 (probably m32u4)
-avrdude.exe: NOTE: "flash" memory has been specified, an erase cycle will be performed
-             To disable this feature, specify the -D option.
-avrdude.exe: erasing chip
-avrdude.exe: reading input file "./.build/lets_split_rev2_xyverz.hex"
-avrdude.exe: input file ./.build/lets_split_rev2_xyverz.hex auto detected as Intel Hex
-avrdude.exe: writing flash (27938 bytes):
-
-Writing | ################################################## | 100% 2.40s
-
-avrdude.exe: 27938 bytes of flash written
-avrdude.exe: verifying flash memory against ./.build/lets_split_rev2_xyverz.hex:
-avrdude.exe: load data flash data from input file ./.build/lets_split_rev2_xyverz.hex:
-avrdude.exe: input file ./.build/lets_split_rev2_xyverz.hex auto detected as Intel Hex
-avrdude.exe: input file ./.build/lets_split_rev2_xyverz.hex contains 27938 bytes
-avrdude.exe: reading on-chip flash data:
-
-Reading | ################################################## | 100% 0.43s
-
-avrdude.exe: verifying ...
-avrdude.exe: 27938 bytes of flash verified
-
-avrdude.exe: safemode: Fuses OK (E:CB, H:D8, L:FF)
-
-avrdude.exe done.  Thank you.
-```
-Sollten dabei Probleme auftreten (z.B. "Zugriff verweigert" / "Permission denied") muss der Make-Befehl mit privilegierten Berechtigungen ausgeführt werden:
-
-    sudo make <meine_Tastatur>:<meine_Tastaturbelegung>:avrdude
-
-Zusätzlich ist es möglich mehrere Tastaturen in einem Vorgang zu flashen:
-
-    make <keyboard>:<keymap>:avrdude-loop
-
-Du kannst den Loop mit STRG + C unterbrechen sobald der Vorgang abgeschlossen ist. Die korrekte Tastenkombination kann abweichen und hängt vom Betriebssystem ab.
-
-
-### HalfKay
-
-Für Tastaturen mit PJRC Controllern (Teensy's), wenn Du bereit bist zu kompilieren und die Tastatur zu flashen, öffne ein Befehlszeilen-Fenster und führe den Build-Befehl aus:
-
-    make <meine_Tastatur>:<meine_Tastaturbelegung>:teensy
-
-Wenn deine Tastaturbelegung zum Beispiel den Namen "xyverz" hat und Du eine Tastaturbelegung für ein Ergodox oder Ergodox EZ erzeugen möchtest, lautet der Befehl dafür:
-
-    make ergodox_ez:xyverz:teensy
-
-Nachdem die Kompilation abgeschlossen ist sollte die Ausgabe ungefähr so aussehen:
-
-```
-Linking: .build/ergodox_ez_xyverz.elf                                [OK]
-Creating load file for flashing: .build/ergodox_ez_xyverz.hex        [OK]
-Checking file size of ergodox_ez_xyverz.hex                          [OK]
- * File size is fine - 25584/32256
- Teensy Loader, Command Line, Version 2.1
-Read "./.build/ergodox_ez_xyverz.hex": 25584 bytes, 79.3% usage
-Waiting for Teensy device...
- (hint: press the reset button)
- ```
-
-An diesem Punkt solltest Du die Tastatur zurücksetzen um den Flash-Vorgang auszulösen. Wenn dies abgeschlossen ist sollte die Ausgabe ungefähr so aussehen:
-
- ```
-Found HalfKay Bootloader
-Read "./.build/ergodox_ez_xyverz.hex": 28532 bytes, 88.5% usage
-Programming.............................................................
-...................................................
-Booting
-```
-
-### BootloadHID
-
-Für auf Bootmapper Client(BMC)/bootloaderHID/ATmega32A basierende Tastaturen, wenn Du bereit bist zu kompilieren und die Tastatur zu flashen, öffne ein Befehlszeilen-Fenster und führe den Build-Befehl aus:
-
-    make <meine_Tastatur>:<meine_Tastaturbelegung>:bootloaderHID
-
-Wenn deine Tastaturbelegung zum Beispiel den Namen "xyverz" hat und Du eine Tastaturbelegung für ein jj40 erzeugen möchtest, lautet der Befehl dafür:
-
-    make jj40:xyverz:bootloaderHID
-
-Nachdem die Kompilation abgeschlossen ist sollte die Ausgabe ungefähr so aussehen:
-
-```
-Linking: .build/jj40_default.elf                                 [OK]
-Creating load file for flashing: .build/jj40_default.hex         [OK]
-Copying jj40_default.hex to qmk_firmware folder                  [OK]
-Checking file size of jj40_default.hex                           [OK]
- * The firmware size is fine - 21920/28672 (6752 bytes free)
-```
-
-Wenn dieser Punkt erreicht ist wird das Build-Skript alle 5 Sekunden nach einem DFU Bootloader suchen. Dieser Vorgang wird wiederholt bis er erfolgreich ist oder abgebrochen wird.
-
-```
-Error opening HIDBoot device: The specified device was not found
-Trying again in 5s.
-```
-
-An diesem Punkt solltest Du die Tastatur zurücksetzen um den Flash-Vorgang auszulösen. Wenn dies abgeschlossen ist sollte die Ausgabe ungefähr so aussehen:
-
-```
-Page size   = 128 (0x80)
-Device size = 32768 (0x8000); 30720 bytes remaining
-Uploading 22016 (0x5600) bytes starting at 0 (0x0)
-0x05580 ... 0x05600
-```
-
-### STM32 (ARM)
-
-Für die meisten ARM Tastaturen (inkl. Proton C, Planck Rev 6 und Preonic Rev 3), wenn Du bereit bist zu kompilieren und die Tastatur zu flashen, öffne ein Befehlszeilen-Fenster und führe den Build-Befehl aus:
-
-    make <meine_Tastatur>:<meine_Tastaturbelegung>:dfu-util
-
-Wenn deine Tastaturbelegung zum Beispiel den Namen "xyverz" hat und Du eine Tastaturbelegung für ein Planck Revision 6 erzeugen möchtest, benutze dafür den folgenden Befehl und reboote die Tastatur in den Bootloader (kurz bevor der Kompiliervorgang abgeschlossen ist):
-
-    make planck/rev6:xyverz:dfu-util
-
-Nachdem der Kompiliervorgang abgeschlossen ist sollte die Ausgabe ungefähr so aussehen:
-
-Für auf Bootmapper Client(BMC)/bootloaderHID/ATmega32A basierende Tastaturen, wenn Du bereit bist zu kompilieren und die Tastatur zu flashen, öffne ein Befehlszeilen-Fenster und führe den Build-Befehl aus:
-
-    make <meine_Tastatur>:<meine_Tastaturbelegung>:bootloaderHID
-
-Wenn deine Tastaturbelegung zum Beispiel den Namen "xyverz" hat und Du eine Tastaturbelegung für ein jj40 erzeugen möchtest, lautet der Befehl dafür:
-```
-Linking: .build/planck_rev6_xyverz.elf                                       [OK]
-Creating binary load file for flashing: .build/planck_rev6_xyverz.bin        [OK]
-Creating load file for flashing: .build/planck_rev6_xyverz.hex               [OK]
-
-Size after:
-   text    data     bss     dec     hex filename
-      0   41820       0   41820    a35c .build/planck_rev6_xyverz.hex
-
-Copying planck_rev6_xyverz.bin to qmk_firmware folder                        [OK]
-dfu-util 0.9
-
-Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc.
-Copyright 2010-2016 Tormod Volden and Stefan Schmidt
-This program is Free Software and has ABSOLUTELY NO WARRANTY
-Please report bugs to http://sourceforge.net/p/dfu-util/tickets/
-
-Invalid DFU suffix signature
-A valid DFU suffix will be required in a future dfu-util release!!!
-Opening DFU capable USB device...
-ID 0483:df11
-Run-time device DFU version 011a
-Claiming USB DFU Interface...
-Setting Alternate Setting #0 ...
-Determining device status: state = dfuERROR, status = 10
-dfuERROR, clearing status
-Determining device status: state = dfuIDLE, status = 0
-dfuIDLE, continuing
-DFU mode device DFU version 011a
-Device returned transfer size 2048
-DfuSe interface name: "Internal Flash  "
-Downloading to address = 0x08000000, size = 41824
-Download        [=========================] 100%        41824 bytes
-Download done.
-File downloaded successfully
-Transitioning to dfuMANIFEST state
-```
-
-#### STM32 Befehle
-
-Für Tastaturen mit STM32 Controller sind die DFU Befehle wie folgt:
-
-* `:dfu-util` - The default command for flashing to STM32 devices.
-* `:dfu-util` - Der Standard-Befehl für STM32 Geräte.
-* `:dfu-util-wait` - Funktioniert wie der Standard-Befehl, aber mit einem 10 Sekunden Timeout bevor erneut versucht wird die Firmware zu flashen. Mit dem Parameter `TIME_DELAY=20` auf der Befehlszeile kann der Timeout beeinflusst werden.
-   * z.B.: `make <meine_Tastatur>:<meine_Tastaturbelegung>:dfu-util TIME_DELAY=5`
-* `:dfu-util-split-left` - Gleiche Funktionsweise wie `dfu-util`, jedoch wird zusätzlich das EEPROM Setting "linke Seite" für geteilte Tastaturen gesetzt.
-* `:dfu-util-split-right` - Gleiche Funktionsweise wie `dfu-util`, jedoch wird zusätzlich das EEPROM Setting "rechte Seite" für geteilte Tastaturen gesetzt.
-
-## Probier's aus!
-
-Herzlichen Glückwunsch! Deine individuell angepasst Firmware wurde auf deine Tastatur übertragen!
-
- Probiere deine neue Tastatur aus und gehe sicher dass alles wie gewünscht funktioniert. Wir haben einen weiteren Artikel zum Thema [Testen und Debuggen](de/newbs_testing_debugging.md) verfasst der sich mit Problembeseitigung beschäftigt um den Beginnger-Guide abzuschließen.
diff --git a/docs/de/newbs_getting_started.md b/docs/de/newbs_getting_started.md
deleted file mode 100644
index 188cf97e0a..0000000000
--- a/docs/de/newbs_getting_started.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Einleitung
-Genau wie in einem Computer befindet sich auch in einer Tastatur ein Prozessor.
-
-Dieser Prozessor führt Software aus, die registriert wenn Tasten gedrückt bzw. wieder losgelassen werden und leitet die entsprechenden Signale an den Computer weiter.
-
-QMK übernimmt die Rolle dieser Software und teilt dem Host-Computer den aktuellen Zustand der Tastatur mit. Wenn Du eine Tastaturbelegung definierst, ist dies äquivalent zu einem ausführbarem Programm, das auf deiner Tastatur läuft.
-
-QMK möchte seine BenutzerInnen in die Lage versetzen, simple Aufgaben möglichst einfach zu gestalten und gleichzeitig komplexe Dinge zu ermöglichen, die mit normalen Tastaturen ohne zusätzliche Software undenkbar wären. Du musst nicht programmieren können, um abgefahrene Tastaturbelegungen zu gestalten - es reicht wenn Du eine Idee hast und ein paar einfache syntaktische Regeln verstehen kannst.
-
-# Los geht's!
-Bevor Du damit loslegen kannst, deine Tastaturbelegung zu erstellen, musst Du ein wenig Software installieren und Dir eine Entwicklungsumgebung aufsetzen. Die gute Nachricht ist, dass das nur einmal erledigt werden muss, egal für wie viele verschiedene Tastaturen Du hinterher Firmware entwickeln willst.
-
-Wenn Du es vorziehst mit einer grafischen Oberfläche zu entwickeln kannst Du auch dazu gerne direkt mit dem online [QMK Konfigurator](https://config.qmk.fm) loslegen. Siehe auch: [Firmware mit der Online GUI erzeugen](de/newbs_building_firmware_configurator.md)
-
-## Software herunterladen
-
-### Text Editor
-
-Du wirst ein Programm benötigen, mit dem Du **plain text** (= reiner Text) Dateien bearbeiten und speichern kannst. Wenn Du Windows benutzt, reicht dafür schon das normale `Notepad` und für Linux z.B. `gedit` oder `leafpad`. Beide sind sehr rudimentäre Editoren deren Funktionsumfang aber vollkommen ausreicht. Für macOS' standard `TextEdit` muss man ein bisschen vorsichtig sein und darauf achten, beim Speichern explizit unter _Format_ die Option _Reiner Text_ auszuwählen.
-
-Ansonsten ist es empfehlenswert, einen Editor herunterzuladen der für die Programmierung und das Bearbeiten von Code ausgelegt ist wie z.b [Notepad++](https://notepad-plus-plus.org/), [Sublime Text](https://www.sublimetext.com/) oder [VS Code](https://code.visualstudio.com/).
-
-?> Immer noch unsicher, welcher Text Editor der Richtige für Dich ist? Laurence Bradford hat eine hervorragende [Einleitung](https://learntocodewith.me/programming/basics/text-editors/) zu dem Thema geschrieben (auf Englisch).
-
-### QMK Toolbox
-
-QMK Toolbox ist ein optionales grafisches Programm für Windows und macOS, das es erleichtern soll, deine Tastatur zu programmieren und zu debuggen. Du wirst es höchstwahrscheinlich früher oder später als unverzichtbar ansehen, wenn es darum geht eine Tastatur einfach zu flashen oder zu debuggen, da es ermöglicht, sich debug-Nachrichten direkt anzeigen zu lassen.
-
-[Hier kannst Du die aktuelle Version herunterladen.](https://github.com/qmk/qmk_toolbox/releases/latest)
-
-* Für Windows: `qmk_toolbox.exe` (portable) oder `qmk_toolbox_install.exe` (installer)
-* Für macOS: `QMK.Toolbox.app.zip` (portable) oder `QMK.Toolbox.pkg` (installer)
-
-## Die Entwicklungsumgebung aufsetzen
-
-
-Wir haben versucht, die Installation der Entwicklungsumgebung für QMK so einfach wie möglich zu gestalten. Alles, was Du tun musst, ist eine Linux oder Unix Umgebung aufzusetzen, danach macht QMK den Rest.
-
-?> Wenn Du das erste Mal mit der Linux/Unix Befehlszeile arbeitest, schadet es nicht, sich mit ein paar Grundlagen und Befehlen vertraut zu machen. Diese Ressourcen sollten ausreichen, um sich das Nötigste anzueignen um mit QMK arbeiten zu können:<br>
-[Erforderliche Linux Grundlagen](https://www.guru99.com/must-know-linux-commands.html)<br>
-[Noch ein paar Linux Befehle](https://www.tjhsst.edu/~dhyatt/superap/unixcmd.html)
-
-### Windows
-
-Du wirst MSYS2 (o.Ä.) und Git benötigen.
-
-* Befolge die Installationsanleitung auf der [MSYS2 Homepage](https://www.msys2.org)
-* Schließe alle offenen MSYS2 Fenster und öffne ein neues MSYS2 MinGW 64-bit Terminal
-* Installiere Git mit dem Kommando: `pacman -S git`
-
-### macOS
-
-Du wirst Homebrew benötigen. Folge dafür den Anweisungen auf der [Homebrew homepage](https://brew.sh).
-
-Nachdem Homebrew erfolgreich installiert ist, kannst Du mit _QMK aufsetzen_ fortfahren. 
-
-### Linux
-
-Du benötigst Git, aber es ist ziemlich wahrscheinlich, dass es bereits installiert ist. Sollte dies nicht der Fall sein, kannst Du es mit dem folgenden Aufruf installieren:
-
-* Debian / Ubuntu / Devuan: `apt-get install git`
-* Fedora / Red Hat / CentOS: `yum install git`
-* Arch Linux: `pacman -S git`
-
-?> Docker ist ebenfalls eine Option für alle Plattformen. [Hier](de/getting_started_build_tools.md#docker) kannst Du dazu weitere Informationen finden.
-
-## QMK aufsetzen
-Wenn Du damit fertig bist, deine Linux/Unix Umgebung zu installieren, kannst Du damit fortfahren QMK herunterzuladen. Dafür werden wir mit Git das QMK Repository "klonen". Öffne ein Terminal oder ein MSYS2 MinGW Fenster, dies wirst Du für den Rest der Anleitung benötigen. In diesem Fenster rufst Du nun die beiden folgenden Kommandos auf:
-
-```shell
-git clone --recurse-submodules https://github.com/qmk/qmk_firmware.git
-cd qmk_firmware
-```
-?> Wenn Du bereits weißt, [wie man GitHub benutzt](de/getting_started_github.md), empfehlen wir, dass Du Dir ein eigenen Fork erstellst. Wenn Du nicht weißt, was das bedeuten soll, kannst Du diesen Ratschlag getrost ignorieren.
-
-QMK liefert ein Script mit, das helfen soll, Dir alles Weitere abzunehmen. Du kannst es mit dem folgenden Befehl aufrufen:
-
-    util/qmk_install.sh
-
-## Die Build-Umgebung testen
-
-Nun sollte hoffentlich alles Nötige für eine funktionierende QMK Build-Umgebung installiert sein und Du solltest in der Lage sein, die QMK-Firmware zu kompilieren. Um dies mit einer `default` Tastaturbelegung zu testen, kannst Du den folgenden Befehl ausprobieren:
-
-    make <keyboard>:default
-
-Der Befehl um z.B. die Firmware für ein _Clueboard 66%_ zu erzeugen lautet:
-
-    make clueboard/66/rev3:default
-
-Wenn es fertig ist, sollte der Output ungefähr so ähnlich wie das Folgende aussehen:
-
-```
-Linking: .build/clueboard_66_rev3_default.elf                                                       [OK]
-Creating load file for flashing: .build/clueboard_66_rev3_default.hex                               [OK]
-Copying clueboard_66_rev3_default.hex to qmk_firmware folder                                        [OK]
-Checking file size of clueboard_66_rev3_default.hex                                                 [OK]
- * The firmware size is fine - 26356/28672 (2316 bytes free)
-```
-
-# Eine eigene Tastaturbelegung erstellen
-Du bist nun fertig mit dem Setup der Entwicklungsumgebung und solltest somit in der Lage sein, deine eigenen Tastaturbelegungen zu erstellen. Um fortzufahren, folge bitte der nächsten Anleitung unter [Die erste Firmware](de/newbs_building_firmware.md).
diff --git a/docs/de/newbs_learn_more_resources.md b/docs/de/newbs_learn_more_resources.md
deleted file mode 100644
index ac5adb0c12..0000000000
--- a/docs/de/newbs_learn_more_resources.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Lernmaterial
-
-Diese weiterführenden Ressourcen sind darauf ausgerichtet, Neulingen der QMK Commmunity mehr Informationen und ein besseres Verständnis zu einzelnen Themen zu bieten.
-
-Git Ressourcen:
-
-* [Gutes allgemeines Tutorial](https://www.codecademy.com/learn/learn-git) (auf Englisch)
-* [Git spielerisch anhand von Beispielen lernen](https://learngitbranching.js.org/) (auf Englisch)
-* [Mehr über den allgemeinen Umgang mit GitHub](getting_started_github.md)
-* [Mehr über Git im Bezug zu QMK](contributing.md)
-
-Mehr über die Arbeit mit der Befehlszeile:
-
-* [Gutes allgemeines Tutorial über die Arbeit mit der Befehlszeile](https://www.codecademy.com/learn/learn-the-command-line) (auf Englisch)
diff --git a/docs/de/newbs_testing_debugging.md b/docs/de/newbs_testing_debugging.md
deleted file mode 100644
index 4d4e7cfee6..0000000000
--- a/docs/de/newbs_testing_debugging.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Testen und Debuggen
-
-Nachdem Du deine Tastatur mit deiner angepassten Firmware geflasht hast, ist es nun an der Zeit sie auszuprobieren. Mit ein bisschen Glück sollte alles ohne Probleme funktionieren, wenn dies nicht der Fall ist, soll dieses Dokument dir dabei helfen, herauszufinden wo das Problem liegt.
-
-## Testen
-
-Die Tastatur zu testen ist relativ selbsterklärend. Drücke jede der Tasten um dich zu versichern, dass der gesendete Keyode der ist, den du erwarten würdest. Dafür gibt es sogar ein paar Programme die helfen sollen, dass keine Taste ausgelassen wurde.
-
-Anmerkung: Diese Programme werden weder von QMK bereitgestellt oder gutgeheißen.
-
-* [Switch Hitter](https://elitekeyboards.com/switchhitter.php) (Nur für Windows)
-* [Keyboard Viewer](https://www.imore.com/how-use-keyboard-viewer-your-mac) (Nur für Mac)
-* [Keyboard Tester](https://www.keyboardtester.com) (Web basiert)
-* [Keyboard Checker](https://keyboardchecker.com) (Web basiert)
-
-## Debuggen
-
-Deine Tastatur wird Debug Informationen liefern wenn Du `CONSOLE_ENABLE = yes` in deiner `rules.mk` gesetzt hast. Die default-Ausgabe ist sehr beschränkt und kann wenn nötig durch die Aktivierung des Debug-Modes erhöht werden. Benutze dafür entweder den `DEBUG` Keycode in deiner Tastaturbelegung, das [Command](de/feature_command.md)-Feature oder füge den folgenden Code zu deiner Tastaturbelegung hinzu.
-
-```c
-void keyboard_post_init_user(void) {
-  // Customise these values to desired behaviour
-  debug_enable=true;
-  debug_matrix=true;
-  //debug_keyboard=true;
-  //debug_mouse=true;
-}
-```
-
-### Debuggen mit der QMK Toolbox
-
-Für kompatible Plattformen kann die [QMK Toolbox](https://github.com/qmk/qmk_toolbox) benutzt werden um Debug-Nachrichten deiner Tastatur anzuzeigen.
-
-### Debuggen mit hid_listen
-
-Bevorzugst Du es lieber auf der Befehlszeile zu debuggen? Dafür eignet sich das Programm [hid_listen](https://www.pjrc.com/teensy/hid_listen.html) von PJRC. Binaries sind für Windows, Linux und MacOS verfügbar.
-
-<!-- FIXME: Describe the debugging messages here. -->
-
-## Eigene Debug-Nachrichten senden
-
-Manchmal ist es hilfreich Debug-Nachrichten innerhalb deines eigenen [Custom Codes](de/custom_quantum_functions.md) zu drucken. Das ist ziemlich einfach. Beginne damit `print.h` am Anfang deiner Datei zu inkludieren:
-
-```c
-#include "print.h"
-```
-
-Danach stehen dir verschiedene Druck-Funktionen zur Verfügung:
-
-* `print("string")`: Druckt einen simplen String
-* `uprintf("%s string", var)`: Druckt einen formatierten String
-* `dprint("string")` Druckt einen simplen String, aber nur wenn der Debug-Mode aktiviert ist
-* `dprintf("%s string", var)`: Druckt einen formatierten String, aber nur wenn der Debug-Mode aktiviert ist
-
-## Debug Beispiele
-
-Anbei findest Du eine Sammlung von hilfreichen Beispielen. Für weitere Informationen Informationen sei an dieser Stelle auf [Debugging/Troubleshooting QMK](de/faq_debug.md) verwiesen.
-
-### Which matrix position is this keypress?
-### Welche Matrix Position hat dieser Tastenanschlag
-
-Beim Portieren, oder bei der Fehlerdiagnose von PCB Problemen, ist es nützlich sich anzeigen zu lassen ob ein Tastenanschlag richtig erkannt wurde. Um die Protokollierung für diesen Fall zu aktivieren, füge bitte folgenden Code zu deiner Tastaturbelegung `keymap.c` hinzu.
-
-```c
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  // Wenn 'console' aktiviert ist wird die Matrix-Position und der Status jedes Tastenanschlags ausgegeben 
-#ifdef CONSOLE_ENABLE
-    uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
-#endif 
-  return true;
-}
-```
-
-Beispiel Ausgabe:
-```text
-Waiting for device:.......
-Listening:
-KL: kc: 169, col: 0, row: 0, pressed: 1
-KL: kc: 169, col: 0, row: 0, pressed: 0
-KL: kc: 174, col: 1, row: 0, pressed: 1
-KL: kc: 174, col: 1, row: 0, pressed: 0
-KL: kc: 172, col: 2, row: 0, pressed: 1
-KL: kc: 172, col: 2, row: 0, pressed: 0
-```
-
-### Wieviel Zeit wurde benötigt um einen Tastenanschlag zu detektieren?
-
-Wenn Performance-Probleme auftreten ist es hilfreich die Frequenz, mit der die Matrix gescannt wird, zu wissen. Um dies in diesem Fall zu aktiveren füge, den folgenden Code zu deiner Tastaturbelegung in `config.h` hinzu.
-
-```c
-#define DEBUG_MATRIX_SCAN_RATE
-```
-
-Beispiel Ausgabe
-```text
-  > matrix scan frequency: 315
-  > matrix scan frequency: 313
-  > matrix scan frequency: 316
-  > matrix scan frequency: 316
-  > matrix scan frequency: 316
-  > matrix scan frequency: 316
-```
diff --git a/docs/es/README.md b/docs/es/README.md
deleted file mode 100644
index 0d504fad05..0000000000
--- a/docs/es/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Firmware Quantum Mechanical Keyboard
-
-[![Versión actual](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)
-[![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh)
-[![Estado de la documentación](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm)
-[![Contribuyentes en GitHub](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
-[![Forks en GitHub](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
-
-## ¿Qué es el firmware QMK?
-
-QMK (*Quantum Mechanical Keyboard*) es una comunidad open source que mantiene el firmware QMK, QMK Toolbox, qmk.fm, y estos documentos. El firmware QMK es un firmware para teclados basado en [tmk\_keyboard](https://github.com/tmk/tmk_keyboard) con algunas características útiles para controladores Atmel AVR, y más específicamente, la [línea de productos OLKB](https://olkb.com), el teclado [ErgoDox EZ](https://www.ergodox-ez.com), y la [línea de productos Clueboard](https://clueboard.co/). También ha sido portado a chips ARM chips usando ChibiOS. Lo puedes utilizar para manejar tu propio teclado ya sea cableado a mano o basado en una PCB personalizada.
-
-## Cómo conseguirlo
-
-Si estás pensando en contribuir con un keymap, teclado, or característica a QMK, la manera más sencilla es hacer un [fork del repositorio en GitHub](https://github.com/qmk/qmk_firmware#fork-destination-box), y clonar tu repositorio localmente para hacer los cambios, subirlos, y abir un [Pull Request](https://github.com/qmk/qmk_firmware/pulls) desde tu fork.
-
-De cualquier manera, también puedes descargarlo directamente en formatos ([zip](https://github.com/qmk/qmk_firmware/zipball/master), [tar](https://github.com/qmk/qmk_firmware/tarball/master)), o clonarlo via git (`git@github.com:qmk/qmk_firmware.git`), o https (`https://github.com/qmk/qmk_firmware.git`).
-
-## Cómo compilar
-
-Antes de poder compilar, necesitarás [instalar un entorno](es/getting_started_build_tools.md) para el desarrollo de AVR y/o ARM. Una vez hayas completado este paso, usarás el comando `make` para compilar un teclado y keymap con la siguiente notación:
-
-    make planck/rev4:default
-
-Este ejemplo compilaría la revisión `rev4` del teclado `planck` con el keymap `default`. No todos los teclados tienen revisiones (también llamados subproyectos o carpetas), en ese caso, se puede omitir:
-
-    make preonic:default
-
-## Cómo personalizar
-
-QMK tiene montones de [características](es/features.md) para explorar, y una buena cantidad de [documentación de referencia](https://docs.qmk.fm) en la que sumergirse. Se pueden sacar provecho de la mayoría de las características modificando tu [keymap](es/keymap.md), y cambiando los [keycodes](es/keycodes.md).
diff --git a/docs/es/_summary.md b/docs/es/_summary.md
deleted file mode 100644
index aa2a0ca5d9..0000000000
--- a/docs/es/_summary.md
+++ /dev/null
@@ -1,122 +0,0 @@
-* [Guía completa para novatos](es/newbs.md)
-  * [Empezando](es/newbs_getting_started.md)
-  * [Construyendo tu primer firmare](es/newbs_building_firmware.md)
-  * [Flasheando el firmware](es/newbs_flashing.md)
-  * [Testeando y depurando ](es/newbs_testing_debugging.md)
-  * [Mejores práticas](es/newbs_best_practices.md)
-  * [Recursos de aprendizaje](es/newbs_learn_more_resources.md)
-
-* [QMK Basics](es/README.md)
-  * [Introducción a QMK](es/getting_started_introduction.md)
-  * [QMK CLI](es/cli.md)
-  * [Configuración de QMK CLI](es/cli_configuration.md)
-  * [Contribuyendo a QMK](es/contributing.md)
-  * [Cómo usar GitHub](es/getting_started_github.md)
-  * [Obtener ayuda](es/getting_started_getting_help.md)
-
-* [Cambios incompatibles](es/breaking_changes.md)
-  * [30 Ago 2019](es/ChangeLog/20190830.md)
-
-* [Preguntas frecuentes](es/faq.md)
-  * [General](es/faq_general.md)
-  * [Construir/Compilar QMK](es/faq_build.md)
-  * [Depurando/Encontrando problemas en QMK](es/faq_debug.md)
-  * [Keymap](es/faq_keymap.md)
-  * [Instalación de drivers con Zadig](es/driver_installation_zadig.md)
-
-* Guías detalladas
-  * [Instalar herramientas construcción](es/getting_started_build_tools.md)
-  * [Guía Vagrant](es/getting_started_vagrant.md)
-  * [Instrucciones de Construcción/Compilado](es/getting_started_make_guide.md)
-  * [Flasheando Firmware](es/flashing.md)
-  * [Personalizando funcionalidad](es/custom_quantum_functions.md)
-  * [Visión general del Keymap](es/keymap.md)
-
-* [Hardware](es/hardware.md)
-  * [Procesadores AVR](es/hardware_avr.md)
-  * [Drivers](es/hardware_drivers.md)
-
-* Referencia
-  * [Pautas de teclados](es/hardware_keyboard_guidelines.md)
-  * [Opciones de configuración](es/config_options.md)
-  * [Keycodes](es/keycodes.md)
-  * [Convenciones de código - C](es/coding_conventions_c.md)
-  * [Convenciones de código - Python](es/coding_conventions_python.md)
-  * [Mejores prácticas de documentación](es/documentation_best_practices.md)
-  * [Plantillas de documentación](es/documentation_templates.md)
-  * [Glosario](es/reference_glossary.md)
-  * [Tests unitarios](es/unit_testing.md)
-  * [Funciones útiles](es/ref_functions.md)
-  * [Sporte configurador](es/reference_configurator_support.md)
-  * [Formato info.json](es/reference_info_json.md)
-  * [Desarrollo Python CLI](es/cli_development.md)
-
-* [Características](es/features.md)
-  * [Keycodes Básicos](es/keycodes_basic.md)
-  * [Teclas US ANSI Shifted](es/keycodes_us_ansi_shifted.md)
-  * [Keycodes Quantum](es/quantum_keycodes.md)
-  * [Keycodes Avanzados](es/feature_advanced_keycodes.md)
-  * [Audio](es/feature_audio.md)
-  * [Auto Shift](es/feature_auto_shift.md)
-  * [Retroiluminación](es/feature_backlight.md)
-  * [Bluetooth](es/feature_bluetooth.md)
-  * [Bootmagic](es/feature_bootmagic.md)
-  * [Combos](es/feature_combo.md)
-  * [Comando](es/feature_command.md)
-  * [API Debounce](es/feature_debounce_type.md)
-  * [Switch DIP](es/feature_dip_switch.md)
-  * [Macros Dinámicas](es/feature_dynamic_macros.md)
-  * [Encoders](es/feature_encoders.md)
-  * [Grave Escape](es/feature_grave_esc.md)
-  * [Feedback Háptico](es/feature_haptic_feedback.md)
-  * [Controlador LCD HD44780](es/feature_hd44780.md)
-  * [Key Lock](es/feature_key_lock.md)
-  * [Layouts](es/feature_layouts.md)
-  * [Tecla Leader](es/feature_leader_key.md)
-  * [Matriz LED](es/feature_led_matrix.md)
-  * [Macros](es/feature_macros.md)
-  * [Teclas del ratón](es/feature_mouse_keys.md)
-  * [Driver OLED](es/feature_oled_driver.md)
-  * [Teclas One Shot](es/one_shot_keys.md)
-  * [Dispositivo de apuntado](es/feature_pointing_device.md)
-  * [Ratón PS/2](es/feature_ps2_mouse.md)
-  * [Iluminación RGB](es/feature_rgblight.md)
-  * [Matriz RGB](es/feature_rgb_matrix.md)
-  * [Cadete espacial](es/feature_space_cadet.md)
-  * [Teclado dividido](es/feature_split_keyboard.md)
-  * [Stenografía](es/feature_stenography.md)
-  * [Swap Hands](es/feature_swap_hands.md)
-  * [Tap Dance](es/feature_tap_dance.md)
-  * [Terminal](es/feature_terminal.md)
-  * [Impresora Térmica](es/feature_thermal_printer.md)
-  * [Unicode](es/feature_unicode.md)
-  * [Userspace](es/feature_userspace.md)
-  * [Velocikey](es/feature_velocikey.md)
-
-* Para Makers y Modders
-  * [Guía de cableado a mano](es/hand_wire.md)
-  * [Guía de flasheado de ISP](es/isp_flashing_guide.md)
-  * [Guía de depuración de ARM](es/arm_debugging.md)
-  * [Driver I2C](es/i2c_driver.md)
-  * [Driver SPI](es/spi_driver.md)
-  * [Controles GPIO](es/internals_gpio_control.md)
-  * [Conversión Proton C](es/proton_c_conversion.md)
-
-* Para entender en profundidad
-  * [Cómo funcionan los teclados](es/how_keyboards_work.md)
-  * [Entendiendo QMK](es/understanding_qmk.md)
-
-* Otros temas
-  * [Usando Eclipse con QMK](es/other_eclipse.md)
-  * [Usando VSCode con QMK](es/other_vscode.md)
-  * [Soporte](es/getting_started_getting_help.md)
-  * [Cómo añadir traducciones](es/translating.md)
-
-* QMK Internals (En progreso)
-  * [Defines](es/internals_defines.md)
-  * [Input Callback Reg](es/internals_input_callback_reg.md)
-  * [Dispositivo Midi](es/internals_midi_device.md)
-  * [Proceso de configuración de un dispositivo Midi](es/internals_midi_device_setup_process.md)
-  * [Utilidad Midi](es/internals_midi_util.md)
-  * [Funciones Send](es/internals_send_functions.md)
-  * [Herramientas Sysex](es/internals_sysex_tools.md)
diff --git a/docs/es/hardware.md b/docs/es/hardware.md
deleted file mode 100644
index 085c7e6745..0000000000
--- a/docs/es/hardware.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Hardware
-
-QMK es compatible con una variedad de hardware. Si tu procesador puede ser dirigido por [LUFA](https://www.fourwalledcubicle.com/LUFA.php) o [ChibiOS](https://www.chibios.org), probablemente puedes hacer que QMK se ejecute en él. Esta sección explora cómo hacer que QMK se ejecute y se comunique con hardware de todo tipo.
-
-* [Pautas de teclados](hardware_keyboard_guidelines.md)
-* [Procesadores AVR](hardware_avr.md)
-* Procesadores ARM (TBD)
-* [Drivers](hardware_drivers.md)
diff --git a/docs/es/hardware_avr.md b/docs/es/hardware_avr.md
deleted file mode 100644
index ac6a715658..0000000000
--- a/docs/es/hardware_avr.md
+++ /dev/null
@@ -1,182 +0,0 @@
-# Teclados con Procesadores AVR
-
-Esta página describe el soporte para procesadores AVR en QMK. Los procesadores AVR incluyen el atmega32u4, atmega32u2, at90usb1286, y otros procesadores de la Corporación Atmel. Los procesadores AVR son MCUs de 8-bit que son diseñados para ser fáciles de trabajar. Los procesadores AVR más comunes en los teclados tienen USB y un montón de GPIO para permitir grandes matrices de teclado. Son los MCUs más populares para el uso en los teclados hoy en día.
-
-Si aún no lo has hecho, debes leer las [Pautas de teclados](hardware_keyboard_guidelines.md) para tener una idea de cómo los teclados encajan en QMK.
-
-## Añadir tu Teclado AVR a QMK
-
-QMK tiene varias características para simplificar el trabajo con teclados AVR. Para la mayoría de los teclados no tienes que escribir ni una sola línea de código. Para empezar, ejecuta `qmk new-keyboard`:
-
-```
-$ qmk new-keyboard
-Ψ Generating a new QMK keyboard directory
-
-Keyboard Name: mycoolkeeb
-Keyboard Type:
-        1. avr
-        2. ps2avrgb
-Please enter your choice:  [1]
-Your Name: [John Smith]
-Ψ Copying base template files...
-Ψ Copying avr template files...
-Ψ Renaming keyboard.[ch] to mycoolkeeb.[ch]...
-Ψ Replacing %YEAR% with 2021...
-Ψ Replacing %KEYBOARD% with mycoolkeeb...
-Ψ Replacing %YOUR_NAME% with John Smith...
-
-Ψ Created a new keyboard called mycoolkeeb.
-Ψ To start working on things, `cd` into keyboards/mycoolkeeb,
-Ψ or open the directory in your preferred text editor.
-```
-
-Esto creará todos los archivos necesarios para tu nuevo teclado, y rellenará la configuración con valores predeterminados. Ahora sólo tienes que personalizarlo para tu teclado. 
-
-## `readme.md`
-
-Aquí es donde describirás tu teclado. Por favor sigue la [Plantilla del readme de teclados](documentation_templates.md#keyboard-readmemd-template) al escribir tu `readme.md`. Te animamos a colocar una imagen en la parte superior de tu `readme.md`. Por favor, utiliza un servicio externo como [Imgur](https://imgur.com) para alojar las imágenes.
-
-## `<keyboard>.c`
-
-Aquí es donde pondrás toda la lógica personalizada para tu teclado. Muchos teclados no necesitan nada aquí. Puedes aprender más sobre cómo escribir lógica personalizada en [Funciones Quantum Personalizadas](custom_quantum_functions.md).
-
-## `<keyboard>.h`
-
-Este es el archivo en el que defines tu(s) [Macro(s) de Layout](feature_layouts.md). Por lo menos deberías tener un `#define LAYOUT` para tu teclado que se ve algo así:
-
-```c
-#define LAYOUT(          \
-      k00, k01, k02,     \
-      k10,   k11         \
-) {                      \
-    { k00, k01,   k02 }, \
-    { k10, KC_NO, k11 }, \
-}
-```
-
-La primera mitad de la macro pre-procesador `LAYOUT` define la disposición física de las llaves. La segunda mitad de la macro define la matriz a la que están conectados los interruptores. Esto te permite tener una disposición física de las llaves que difiere de la matriz de cableado.
-
-Cada una de las variables `k__` tiene que ser única, y normalmente sigue el formato `k<row><col>`.
-
-La matriz física (la segunda mitad) debe tener un número de filas igualando `MATRIX_ROWS`, y cada fila debe tener exactamente `MATRIX_COLS` elementos. Si no tienes tantas teclas físicas puedes usar `KC_NO` para rellenar los espacios en blanco.
-
-## `config.h`
-
-El archivo `config.h` es donde configuras el hardware y el conjunto de características para tu teclado. Hay un montón de opciones que se pueden colocar en ese archivo, demasiadas para listar allí. Para obtener una visión de conjunto completa de las opciones disponibles consulta la página de [Opciones de Configuración](config_options.md).
-
-### Configuración de hardware
-
-
-En la parte superior de `config.h` encontrarás ajustes relacionados con USB. Estos controlan la apariencia de tu teclado en el Sistema Operativo. Si no tienes una buena razón para cambiar debes dejar el `VENDOR_ID` como `0xFEED`. Para el `PRODUCT_ID` debes seleccionar un número que todavía no esté en uso.
-
-Cambia las líneas de `MANUFACTURER` y `PRODUCT` para reflejar con precisión tu teclado.
-
-```c
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Tú
-#define PRODUCT         mi_teclado_fantastico
-```
-
-?> Windows y macOS mostrarán el `MANUFACTURER` y `PRODUCT` en la lista de dispositivos USB. `lsusb` en Linux toma estos de la lista mantenida por el [Repositorio de ID USB](http://www.linux-usb.org/usb-ids.html) por defecto. `lsusb -v` mostrará los valores reportados por el dispositivo, y también están presentes en los registros del núcleo después de conectarlo.
-
-### Configuración de la matriz del teclado
-
-La siguiente sección del archivo `config.h` trata de la matriz de tu teclado. Lo primero que debes establecer es el tamaño de la matriz. Esto es generalmente, pero no siempre, el mismo número de filas y columnas como la disposición física de las teclas.
-
-```c
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-```
-
-Una vez que hayas definido el tamaño de tu matriz, necesitas definir qué pines en tu MCU están conectados a filas y columnas. Para hacerlo simplemente especifica los nombres de esos pines:
-
-```c
-#define MATRIX_ROW_PINS { D0, D5 }
-#define MATRIX_COL_PINS { F1, F0, B0 }
-#define UNUSED_PINS
-```
-
-El número de entradas debe ser el mismo que el número que asignaste a `MATRIX_ROWS`, y del mismo modo para `MATRIX_COL_PINS` y `MATRIX_COLS`. No tienes que especificar `UNUSED_PINS`, pero puedes si deseas documentar qué pines están abiertos.
-
-Finalmente, puedes especificar la dirección en la que apuntan tus diodos. Esto puede ser `COL2ROW` o `ROW2COL`.
-
-```c
-#define DIODE_DIRECTION COL2ROW
-```
-
-#### Matriz de patas directas
-Para configurar un teclado en el que cada interruptor está conectado a un pin y tierra separados en lugar de compartir los pines de fila y columna, usa `DIRECT_PINS`. La asignación define los pines de cada interruptor en filas y columnas, de izquierda a derecha. Debe ajustarse a los tamaños dentro de `MATRIX_ROWS` y `MATRIX_COLS`. Usa `NO_PIN` para rellenar espacios en blanco. Sobreescribe el comportamiento de `DIODE_DIRECTION`, `MATRIX_ROW_PINS` y `MATRIX_COL_PINS`.
-
-```c
-// #define MATRIX_ROW_PINS { D0, D5 }
-// #define MATRIX_COL_PINS { F1, F0, B0 }
-#define DIRECT_PINS { \
-    { F1, E6, B0, B2, B3 }, \
-    { F5, F0, B1, B7, D2 }, \
-    { F6, F7, C7, D5, D3 }, \
-    { B5, C6, B6, NO_PIN, NO_PIN } \
-}
-#define UNUSED_PINS
-
-/* COL2ROW, ROW2COL */
-//#define DIODE_DIRECTION
-```
-
-### Configuración de retroiluminación
-
-QMK soporta retroiluminación en la mayoría de los pines GPIO. Algunos de ellos pueden ser manejados por el MCU en hardware. Para más detalles, consulta la [Documentación de Retroiluminación](feature_backlight.md).
-
-```c
-#define BACKLIGHT_PIN B7
-#define BACKLIGHT_LEVELS 3
-#define BACKLIGHT_BREATHING
-#define BREATHING_PERIOD 6
-```
-
-### Otras opciones de configuración
-
-Hay un montón de características que se pueden configurar o ajustar en `config.h`. Debes consultar la página de [Opciones de Configuración](config_options.md) para más detalles.
-
-## `rules.mk`
-
-Usa el archivo `rules.mk` para decirle a QMK qué archivos construir y qué características habilitar. Si estás construyendo sobre un atmega32u4 deberías poder dejar mayormente los valores predeterminados. Si estás usando otro MCU es posible que tengas que ajustar algunos parámetros.
-
-### Opciones MCU
-
-Estas opciones le indican al sistema de compilación para qué CPU construir. Ten mucho cuidado si cambias cualquiera de estos ajustes. Puedes inutilizar tu teclado.
-
-```make
-MCU = atmega32u4
-F_CPU = 16000000
-ARCH = AVR8
-F_USB = $(F_CPU)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-```
-
-### Gestores de arranque
-
-El gestor de arranque es una sección especial de tu MCU que te permite actualizar el código almacenado en el MCU. Piensa en ello como una partición de rescate para tu teclado.
-
-#### Ejemplo de gestor de arranque
-
-```make
-BOOTLOADER = halfkay
-```
-
-#### Ejemplo de cargador DFU Atmel
-
-```make
-BOOTLOADER = atmel-dfu
-```
-
-#### Ejemplo de gestor de arranque Pro Micro
-
-```make
-BOOTLOADER = caterina
-```
-
-### Opciones de construcción
-
-Hay un serie de características que se pueden activar o desactivar en `rules.mk`. Consulta la página de [Opciones de Configuración](config_options.md#feature-options) para obtener una lista detallada y una descripción.
diff --git a/docs/es/hardware_drivers.md b/docs/es/hardware_drivers.md
deleted file mode 100644
index 788de2c5ef..0000000000
--- a/docs/es/hardware_drivers.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Controladores de hardware QMK
-
-QMK se utiliza en un montón de hardware diferente. Mientras que el soporte para los MCUs y las configuraciones de matriz más comunes está integrado, hay una serie de controladores que se pueden añadir para soportar hardware adicional al teclado. Los ejemplos incluyen ratones y otros dispositivos de apuntamiento, extensores de i/o para teclados divididos, modúlos Bluetooth, y pantallas LCD, OLED y TFT.
-
-<!-- FIXME: Esto debe hablar de cómo se integran los controladores en QMK y cómo puedes añadir su propio controlador.
-
-# Descripción del sistema de controladores
-
--->
-
-# Controladores disponibles
-
-## ProMicro (Solo AVR)
-
-Soporte para direccionar pines en el ProMicro por su nombre Arduino en lugar de su nombre AVR. Esto necesita ser mejor documentado. Si estás tratando de hacer esto y leer el código no ayuda por favor [abre una issue](https://github.com/qmk/qmk_firmware/issues/new) y podemos ayudarte por el proceso.
-
-## Controlador OLED SSD1306
-
-Soporte para pantallas OLED basadas en SSD1306. Para obtener más información consulta la página de [Característica de Controlador OLED](feature_oled_driver.md).
-
-## WS2812 (Solo AVR)
-
-Soporte para LEDs WS2811/WS2812{a,b,c}. Para obtener más información consulta la página de [Luz RGB](feature_rgblight.md).
-
-## IS31FL3731
-
-Soporte para hasta 2 controladores. Cada controlador implementa 2 matrices charlieplex para direccionar LEDs individualmente usando I2C. Esto permite hasta 144 LEDs del mismo color o 32 LEDs RGB. Para obtener más información sobre cómo configurar el controlador, consulta la página de [Matriz RGB](feature_rgb_matrix.md).
-
-## IS31FL3733
-
-Soporte para hasta un solo controlador con espacio para expansión. Cada controlador puede controlar 192 LEDs individuales o 64 LEDs RGB. Para obtener más información sobre cómo configurar el controlador, consulta la página de [Matriz RGB](feature_rgb_matrix.md).
diff --git a/docs/es/hardware_keyboard_guidelines.md b/docs/es/hardware_keyboard_guidelines.md
deleted file mode 100644
index 298a3b7ce7..0000000000
--- a/docs/es/hardware_keyboard_guidelines.md
+++ /dev/null
@@ -1,147 +0,0 @@
-# Pautas del teclado QMK
-
-Desde sus inicios, QMK ha crecido a pasos agigantados gracias a personas como tú que contribuyes a la creación y mantenimiento de nuestros teclados comunitarios. A medida que hemos crecido hemos descubierto algunos patrones que funcionan bien, y pedimos que te ajustes a ellos para que sea más fácil para que otras personas se beneficien de tu duro trabajo.
-
-
-## Nombrar tu Teclado/Proyecto
-
-Todos los nombres de teclado están en minúsculas, consistiendo sólo de letras, números y guiones bajos (`_`). Los nombres no pueden comenzar con un guión bajo. La barra de desplazamiento (`/`) se utiliza como un carácter de separación de subcarpetas.
-
-Los nombres `test`, `keyboard`, y `all` están reservados para las órdenes de make y no pueden ser usados como un nombre de teclado o subcarpeta.
-
-Ejemplos Válidos:
-
-* `412_64`
-* `chimera_ortho`
-* `clueboard/66/rev3`
-* `planck`
-* `v60_type_r`
-
-## Subcarpetas
-
-QMK utiliza subcarpetas tanto para organización como para compartir código entre las revisiones del mismo teclado. Puedes anidar carpetas hasta 4 niveles de profundidad:
-
-    qmk_firmware/keyboards/top_folder/sub_1/sub_2/sub_3/sub_4
-
-Si una subcarpeta tiene un archivo `rules.mk` será considerado un teclado compilable. Estará disponible en el configurador de QMK y se probará con `make all`. Si estás utilizando una carpeta para organizar varios teclados del mismo fabricante no debes tener un archivo `rules.mk`.
-
-Ejemplo:
-
-Clueboard utiliza subcarpetas para ambos propósitos: organización y revisiones de teclado.
-
-* [`qmk_firmware`](https://github.com/qmk/qmk_firmware/tree/master)
-  * [`keyboards`](https://github.com/qmk/qmk_firmware/tree/master/keyboards)
-    * [`clueboard`](https://github.com/qmk/qmk_firmware/tree/master/keyboards/clueboard)  &larr; This is the organization folder, there's no `rules.mk` file
-      * [`60`](https://github.com/qmk/qmk_firmware/tree/master/keyboards/clueboard/60)  &larr; This is a compilable keyboard, it has a `rules.mk` file
-      * [`66`](https://github.com/qmk/qmk_firmware/tree/master/keyboards/clueboard/66) &larr; This is also compilable- it uses `DEFAULT_FOLDER` to specify `rev3` as the default revision
-        * [`rev1`](https://github.com/qmk/qmk_firmware/tree/master/keyboards/clueboard/66/rev1) &larr; compilable: `make clueboard/66/rev1`
-        * [`rev2`](https://github.com/qmk/qmk_firmware/tree/master/keyboards/clueboard/66/rev2) &larr; compilable: `make clueboard/66/rev2`
-        * [`rev3`](https://github.com/qmk/qmk_firmware/tree/master/keyboards/clueboard/66/rev3) &larr; compilable: `make clueboard/66/rev3` or `make clueboard/66`
-
-## Estructura de carpetas de teclado
-
-Su teclado debe estar ubicado en `qmk_firm cuidada/keyboards/` y el nombre de la carpeta debe ser el nombre de su teclado como se describe en la sección anterior. Dentro de esta carpeta debe haber varios archivos:
-
-* `readme.md`
-* `info.json`
-* `config.h`
-* `rules.mk`
-* `<keyboard_name>.c`
-* `<keyboard_name>.h`
-
-### `readme.md`
-
-Todos los proyectos necesitan tener un archivo `readme.md` que explica lo que es el teclado, quién lo hizo y dónde está disponible. Si es aplicable, también debe contener enlaces a más información, como el sitio web del fabricante. Por favor, sigue la [plantilla publicada](documentation_templates.md#keyboard-readmemd-template).
-
-### `info.json`
-
-Este archivo es utilizado por la [API de QMK](https://github.com/qmk/qmk_api). Contiene la información que [configurador de QMK](https://config.qmk.fm/) necesita mostrar en una representación de su teclado. También puede establecer metadatos aquí. Para más información, consulta la [página de referencia](reference_info_json.md).
-
-### `config.h`
-
-Todos los proyectos necesitan tener un archivo `config.h` que establece cosas como el tamaño de la matriz, nombre del producto, USB VID/PID, descripción y otros ajustes. En general, usa este archivo para establecer la información esencial y los valores predeterminados para tu teclado que siempre funcionarán.
-
-### `rules.mk`
-
-La presencia de este archivo indica que la carpeta es un destino de teclado y se puede utilizar en las órdenes `make`. Aquí es donde estableces el entorno de compilación para tu teclado y configuras el conjunto predeterminado de características.
-
-### `<keyboard_name.c>`
-
-Aquí es donde escribirás código personalizado para tu teclado. Típicamente escribirás código para inicializar e interactuar con el hardware de tu teclado. Si tu teclado se compone de sólo una matriz de teclas sin LEDs, altavoces u otro hardware auxiliar este archivo puede estar en blanco.
-
-Las funciones siguientes se definen típicamente en este archivo:
-
-* `void matrix_init_kb(void)`
-* `void matrix_scan_kb(void)`
-* `bool process_record_kb(uint16_t keycode, keyrecord_t *record)`
-* `void led_set_kb(uint8_t usb_led)`
-
-### `<keyboard_name.h>`
-
-Este archivo se utiliza para definir la matriz para tu teclado. Debes definir al menos un macro de C que traduce una serie en una matriz que representa la matriz de interruptor físico para tu teclado. Si es posible construir tu teclado con múltiples diseños debes definir macros adicionales.
-
-Si solo tienes un diseño debes llamar a esta macro `LAYOUT`.
-
-Al definir diseños múltiples debes tener un diseño base, llamado `LAYOUT_all`, que soporte todas las posibles posiciones de switch en tu matriz, incluso si ese diseño es imposible de construir físicamente. Esta es la macro que deberías usar en tu keymap `predeterminado`. Debes tener keymaps adicionales llamados `default_ término layout>` que usen tus otras macros de diseño. Esto hará que sea más fácil para las personas utilizar los diseños que defines.
-
-Los nombres de las macros de diseño son completamente minúsculas, excepto por la palabra `LAYOUT` en el frente.
-
-Por ejemplo, si tienes un PCB de 60% que soporta ANSI e ISO podría definir los siguientes diseños y keymaps:
-
-| Nombre de diseño | Nombre de keymap | Descripción |
-|-------------|-------------|-------------|
-| LAYOUT_all | default | Un diseño que soporta tanto ISO como ANSI |
-| LAYOUT_ansi | default_ansi | Un diseño ANSI |
-| LAYOUT_iso | default_iso | Un diseño ISO |
-
-## Archivos de Imagen/Hardware
-
-En un esfuerzo por mantener el tamaño de repo abajo ya no estamos aceptando archivos binarios de cualquier formato, con pocas excepciones. Alojarlos en otro lugar (por ejemplo <https://imgur.com>) y enlazarlos en el `readme.md` es preferible.
-
-Para archivos de hardware (tales como placas, casos, pcb) puedes contribuir a [qmk.fm repo](https://github.com/qmk/qmk.fm) y estarán disponibles en [qmk.fm](https://qmk.fm). Archivos descargables se almacenan en `/<teclado>/` (nombre sigue el mismo formato que el anterior), se sirven en `https://qmk.fm/<teclado>/`, y se generan páginas de `/_pages/<teclado>/` que se sirven en la misma ubicación (Los archivos .md se generan en archivos .html mediante Jekyll). Echa un vistazo a la carpeta `lets_split` para ver un ejemplo.
-
-## Predeterminados de teclado
-
-Dada la cantidad de funcionalidad que expone QMK, es muy fácil confundir a los nuevos usuarios. Al armar el firmware predeterminado para tu teclado, te recomendamos limitar tus funciones y opciones habilitadas al conjunto mínimo necesario para soportar tu hardware. A continuación se formulan recomendaciones sobre características específicas.
-
-### Bootmagic y Command
-
-[Bootmagic](feature_bootmagic.md) and [Command](feature_command.md) son dos características relacionadas que permiten a un usuario controlar su teclado de manera no obvia. Te recomendamos que piense largo y tendido acerca de si vas a habilitar cualquiera de las características, y cómo vas a exponer esta funcionalidad. Tengas en cuenta que los usuarios que quieren esta funcionalidad puede habilitarla en sus keymaps personales sin afectar a todos los usuarios novatos que pueden estar usando tu teclado como su primera tarjeta programable.
-
-De lejos el problema más común con el que se encuentran los nuevos usuarios es la activación accidental de Bootmagic mientras están conectando su teclado. Están sosteniendo el teclado por la parte inferior, presionando sin saberlo en alt y barra espaciadora, y luego se dan cuenta de que estas teclas han sido intercambiadas en ellos. Recomendamos dejar esta característica deshabilitada de forma predeterminada, pero si la activas consideres establecer la opción `BOOTMAGIC_KEY_SALT` a una tecla que es difícil de presionar al conectar el teclado.
-
-Si tu teclado no tiene 2 teclas de cambio debes proporcionar un predeterminado de trabajo para `IS_COMMAND`, incluso cuando haya definido `COMMAND_ENABLE = no`. Esto dará a sus usuarios un valor predeterminado para ajustarse a si lo hacen enable Command.
-
-## Programación de teclado personalizado
-
-Como se documenta en [Funcionalidad de Adaptación](custom_quantum_functions.md) puedes definir funciones personalizadas para tu teclado. Por favor, tengas en cuenta que sus usuarios pueden querer personalizar ese comportamiento así, y hacer que sea posible para que puedan hacer eso. Si está proporcionando una función personalizada, por ejemplo `process_record_kb()`, asegúrese de que su función también llame a la versión` `_user()` de la llamada. También debes tener en cuenta el valor de retorno de la versión `_user()`, y ejecutar sólo tu código personalizado si el usuario devuelve `true`.
-
-## Proyectos Sin Producción/Conectados A Mano
-
-Estamos encantados de aceptar cualquier proyecto que utilice QMK, incluidos los prototipos y los cableados de mano, pero tenemos una carpeta `/keyboards/handwired/` separada para ellos, por lo que la carpeta `/keyboards/` principal no se llena. Si un proyecto prototipo se convierte en un proyecto de producción en algún momento en el futuro, ¡estaremos encantados de moverlo a la carpeta `/keyboards/` principal!
-
-## Advertencias como errores
-
-Al desarrollar su teclado, tengas en cuenta que todas las advertencias serán tratadas como errores - estas pequeñas advertencias pueden acumularse y causar errores más grandes en el camino (y pierdan es generalmente una mala práctica).
-
-## Derechos de autor
-
-Si estás adaptando la configuración de tu teclado de otro proyecto, pero no utilizando el mismo código, asegúrese de actualizar la cabecera de derechos de autor en la parte superior de los archivos para mostrar tu nombre, en este formato:
-
-    Copyright 2017 Tu nombre <tu@email.com>
-
-Si estás modificando el código de otra persona y sólo ha hecho cambios triviales debes dejar su nombre en la declaración de derechos de autor. Si has hecho un trabajo significativo en el archivo debe agregar tu nombre a la de ellos, así:
-
-    Copyright 2017 Su nombre <original_author@ejemplo.com> Tu nombre <tu@ejemplo.com>
-
-El año debe ser el primer año en que se crea el archivo. Si el trabajo se hizo a ese archivo en años posteriores puedes reflejar que mediante la adición del segundo año a la primera, como así:
-
-    Copyright 2015-2017 Tu nombre <tu@ejemplo.com>
-
-## Licencia
-
-El núcleo de QMC está licenciado bajo la [GNU General Public License](https://www.gnu.org/licenses/licenses.en.html). Si estás enviando binarios para los procesadores AVR puedes elegir cualquiera [GPLv2](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html) o [GPLv3](https://www.gnu.org/licenses/gpl.html). Si estás enviando binarios para ARM procesadores debes elegir [GPL Versión 3](https://www.gnu.org/licenses/gpl.html) para cumplir con los [ChibiOS](https://www.chibios.org) licencia GPLv3.
-
-## Detalles técnicos
-
-Si estás buscando más información sobre cómo hacer que su teclado funcione con QMK, [echa un vistazo a la sección hardware](hardware.md)!
diff --git a/docs/es/newbs.md b/docs/es/newbs.md
deleted file mode 100644
index 7e08b679c3..0000000000
--- a/docs/es/newbs.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# La guía completa de QMK para novatos
-
-QMK es un poderoso firmware Open Source para tu teclado mecánico. Puedes utilizar QMK para personalizar tu teclado en maneras a la vez simples y potentes. Gente de todos los niveles de habilidad, desde completos novatos hasta expertos programadores, han utilizado con éxito QMK para personalizar sus teclados. Esta guía te ayudará a hacer lo mismo, sin importar tu nivel de habilidad.
-
-¿No estás seguro de si tu teclado puede ejecutar QMK? Si es un teclado mecánico construido por ti mismo probablemente puedas. Damos soporte a [gran número de placas de hobbistas](https://qmk.fm/keyboards/), e incluso si tu teclado actual no pudiera ejecutar QMK no deberías tener problemas encontrando uno que cumpliera tus necesidades.
-
-## Visión general
-
-Hay 7 secciones principales en esta guía:
-
-* [Empezando](newbs_getting_started.md)
-* [Construyendo tu primer firmware](newbs_building_firmware.md)
-* [Construyendo tu primer firmware usando la GUI](newbs_building_firmware_configurator.md)
-* [Flasheando el firmware](newbs_flashing.md)
-* [Testeando y depurando](newbs_testing_debugging.md)
-* [Mejores práticas](newbs_best_practices.md)
-* [Recursos de aprendizaje](newbs_learn_more_resources.md)
-
-Esta guía está enfocada en ayudar a alguien que nunca ha compilado software con anterioridad. Toma decisiones y hace recomendaciones teniendo en cuenta este punto de vista. Hay métodos alternativos para muchos de estos procedimientos, y soportamos la mayoría de esas alternativas. Si tienes alguna duda sobre cómo llevar a cabo una tarea nos puedes [preguntar para que te guiemos](getting_started_getting_help.md).
-
-## Recursos adicionales
-
-* [Blog de Básicos de Thomas Baart's QMK](https://thomasbaart.nl/category/mechanical-keyboards/firmware/qmk/qmk-basics/) – Un blog creado por un usuario que cubre lo básico sobre cómo usar el firmware QMK Firmware, visto desde la perspectiva de un usuario nuevo.
diff --git a/docs/es/newbs_best_practices.md b/docs/es/newbs_best_practices.md
deleted file mode 100644
index 2f72eff788..0000000000
--- a/docs/es/newbs_best_practices.md
+++ /dev/null
@@ -1,159 +0,0 @@
-# Mejores prácticas
-
-## O, "Cómo aprendí a dejar de preocuparme y amarle a Git."
-
-Este documento procura instruir a los novatos en las mejores prácticas para tener una experiencia más fácil en contribuir a QMK. Te guiaremos por el proceso de contribuir a QMK, explicando algunas maneras de hacerlo más fácilmente, y luego romperemos algunas cosas para enseñarte cómo arreglarlas.
-
-En este documento suponemos un par de cosas:
-
-1. Tienes una cuenta de GitHub, y has hecho un [fork del repo qmk_firmware](getting_started_github.md) en tu cuenta.
-2. Has [configurado tu entorno de desarrollo](newbs_getting_started.md?id=environment-setup).
-
-
-## La rama master de tu fork: Actualizar a menudo, nunca commit
-
-Se recomienda que para desarrollo con QMK, lo que sea que estés haciendo, mantener tu rama `master` actualizada, pero **nunca** commit en ella. Mejor, haz todos tus cambios en una rama de desarrollo y manda pull requests de tus ramas mientras programas.
-
-Para evitar los conflictos de merge &mdash; cuando dos o más usuarios han editado la misma parte de un archivo al mismo tiempo &mdash; mantén tu rama `master` actualizada, y empieza desarrollo nuevo creando una nueva rama.
-
-### Actualizando tu rama master
-
-Para mantener tu rama `master` actualizada, se recomienda agregar el repository ("repo") de Firmware QMK como un repo remoto en git. Para hacer esto, abre tu interfaz de línea de mandatos y ingresa:
-```
-git remote add upstream https://github.com/qmk/qmk_firmware.git
-```
-
-Para verificar que el repo ha sido agregado, ejecuta `git remote -v`, y lo siguiente debe aparecer:
-
-```
-$ git remote -v
-origin  https://github.com/<your_username>/qmk_firmware.git (fetch)
-origin  https://github.com/<your_username>/qmk_firmware.git (push)
-upstream        https://github.com/qmk/qmk_firmware.git (fetch)
-upstream        https://github.com/qmk/qmk_firmware.git (push)
-```
-
-Ya que has hecho esto, puedes buscar actualizaciones del repo ejecutando `git fetch upstream`. Esto busca las ramas y etiquetas &mdash; juntos conocidos como "refs" &mdash; del repo QMK, que ahora tiene el apodo `upstream`. Ahora podemos comparar los archivos en nuestro fork `origin` con los de QMK.
-
-Para actualizar la rama master de tu fork, ejecuta lo siguiente, pulsando Intro después de cada línea:
-
-```
-git checkout master
-git fetch upstream
-git pull upstream master
-git push origin master
-```
-
-Esto te coloca en tu rama master, busca los refs del repo de QMK, descarga la rama `master` actual a tu computadora, y después lo sube a tu fork.
-
-### Hacer cambios
-
-Para hacer cambios, crea una nueva rama ejecutando:
-
-```
-git checkout -b dev_branch
-git push --set-upstream origin dev_branch
-```
-
-Esto crea una nueva rama llamada `dev_branch`, te coloca en ella, y después guarda la nueva rama a tu fork. El parámetro `--set-upstream` le dice a git que use tu fork y la rama `dev_branch` cada vez que uses `git push` o `git pull` en esta rama. Solo necesitas usarlo la primera que que subes cambios; ya después, puedes usar `git push` o `git pull`, sin usar los demás parámetros.
-
-!> Con `git push`, puedes usar `-u` en vez de `--set-upstream` &mdash; `-u` es un alias de `--set-upstream`.
-
-Puedes nombrar tu rama casi cualquier cosa, pero se recomienda ponerle algo con relación a los cambios que vas a hacer.
-
-Por defecto `git checkout -b` se basará tu nueva rama en la rama en la cual estás actualmente. Puedes basar tu rama en otra rama existente agregando el nombre de la rama al comando:
-
-```
-git checkout -b dev_branch master
-```
-
-Ahora que tienes una rama development, abre tu editor de texto y haz los cambios que quieres. Se recomienda hacer varios commits pequeños a tu rama; de este modo cualquier cambio que causa problemas puede ser rastreado y deshecho si fuera necesario. Para hacer tus cambios, edita y guarda los archivos que necesitas actualizar, agrégalos al *staging area* de Git, y luego haz un commit a tu rama:
-
-```
-git add path/to/updated_file
-git commit -m "My commit message."
-```
-`git add` agrega los archivos que han sido cambiados al *staging area* de Git, lo cual es la "zona de preparación"de Git. Este contiene los cambios que vas a *commit* usando `git commit`, que guarda los cambios en el repo. Usa un mensaje de commit descriptivo para que puedas saber que ha cambiado fácilmente.
-
-!> Si has cambiado muchos archivos, pero todos los archivos son parte del mismo cambio, puedes usar `git add .` para agregar todos los archivos cambiados que están en tu directiro actual, en vez de agregar cada archivo manualmente.
-
-### Publicar tus cambios
-
-El útimo paso es subir tus cambios a tu fork. Para hacerlo, ejecuta `git push`. Ahora Git publicará el estado actual de `dev_branch` a tu fork.
-
-
-## Resolver los conflictos del merge
-
-A veces cuando el trabajo en una rama tarda mucho tiempo en completarse,  los cambios que han sido hechos por otros chocan con los cambios que has hecho en tu rama cuando abres un pull request. Esto se llama un *merge conflict*, y es algo que ocurre cuando varias personas editan las mismas partes de los mismos archivos.
-
-### Rebase tus cambios
-
-Un *rebase* es la manera de Git de tomar los cambios que se aplicaron en un punto, deshacerlos, y aplicar estos mismos cambios en otro punto. En el caso de un conflicto de merge, puedes hacer un rebase de tu rama para recoger los cambios que has hecho.
-
-Para empezar, ejecuta lo siguiente:
-
-```
-git fetch upstream
-git rev-list --left-right --count HEAD...upstream/master
-```
-
-El comando `git rev-list` ejecutado aquí muestra el número de commits que difieren entre la rama actual y la rama master de QMK. Ejecutamos `git fetch` primero para asegurarnos de que tenemos los refs que representan es estado actual del repo upstream. El output del comando `git rev-list` muestra dos números:
-
-```
-$ git rev-list --left-right --count HEAD...upstream/master
-7       35
-```
-
-El primer número representa el número de commits en la rama actual desde que fue creada, y el segundo número es el número de commits hecho a `upstream/master` desde que la rama actual fue creada, o sea los cambios que no están registrados en la rama actual.
-
-Ahora que sabemos el estado actual de la rama actual y el del repo upstream, podemos empezar una operación rebase:
-
-```
-git rebase upstream/master
-```
-Esto le dice a Git que deshaga los commits en la rama actual, y después los re-aplica en la rama master de QMK.
-
-```
-$ git rebase upstream/master
-First, rewinding head to replay your work on top of it...
-Applying: Commit #1
-Using index info to reconstruct a base tree...
-M       conflicting_file_1.txt
-Falling back to patching base and 3-way merge...
-Auto-merging conflicting_file_1.txt
-CONFLICT (content): Merge conflict in conflicting_file_1.txt
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 Commit #1
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-```
-
-Esto nos dice que tenemos un conflicto de merge, y nos dice el nombre del archivo con el conflict. Abre el archivo en tu editor de texto, y en alguna parte del archivo verás algo así:
-
-```
-<<<<<<< HEAD
-<p>For help with any issues, email us at support@webhost.us.</p>
-=======
-<p>Need help? Email support@webhost.us.</p>
->>>>>>> Commit #1
-```
-La línea `<<<<<<< HEAD` marca el principio de un conflicto de merge, y la línea `>>>>>>> Commit #1` marca el final, con las secciones de conflicto separadas por `=======`. La parte del lado `HEAD` is de la versión de QMK master del archivo, y la parte marcada con el mensaje de commit es de la rama actual.
-
-Ya que Git rastrea *cambios de archivos* en vez del contenido de los archivos directamente, si Git no puede encontrar el texto que estaba en el archivo antes del último commit, no sabrá cómo editar el archivo. El editar el archivo de nuevo resolverá este conflicto. Haz tus cambios, y guarda el archivo.
-
-```
-<p>Need help? Email support@webhost.us.</p>
-```
-
-Ahora ejecuta:
-
-```
-git add conflicting_file_1.txt
-git rebase --continue
-```
-
-Git registra los cambios al archivo con conflictos, y sigue aplicando los commits de nuestra rama hasta llegar al final.
diff --git a/docs/es/newbs_building_firmware.md b/docs/es/newbs_building_firmware.md
deleted file mode 100644
index ff9873c785..0000000000
--- a/docs/es/newbs_building_firmware.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# Construyendo tu primer firmware
-
-Ahora que has configurado tu entorno de construcción estas listo para empezar a construir firmwares personalizados. Para esta sección de la guía alternaremos entre 3 programas - tu gestor de ficheros, tu editor de texto , y tu ventana de terminal. Manten los 3 abiertos hasta que hayas acabado y estés contento con el firmware de tu teclado.
-
-Si has cerrado y reabierto la ventana de tu terminal después de seguir el primero paso de esta guía, no olvides hacer `cd qmk_firmware` para que tu terminal esté en el directorio correcto.
-
-## Navega a tu carpeta de keymaps 
-
-Comienza navegando a la carpeta `keymaps` correspondiente a tu teclado.
-
-?> Si estás en macOS o Windows hay comandos que puedes utilizar fácilmente para abrir la carpeta keymaps.
-
-?> macOS:
-
-    abre keyboards/<keyboard_folder>/keymaps
-
-?> Windows:
-
-    inicia .\\keyboards\\<keyboard_folder>\\keymaps
-
-## Crea una copia del keymap `default`
-
-Una vez que tengas la carpeta `keymaps` abierta querrás crear una copia de la carpeta `default`. Recomendamos encarecidamente que nombres la carpeta igual que tu nombre de usuario de GitHub, pero puedes utilizar el nombre que quieras siempre que contenga sólo letras en minúscula, números y el caracter de guión bajo.
-
-Para automatizar el proceso, también tienes la opción de ejecutar el script `new_keymap.sh`. 
-
-Navega a la carpeta `qmk_firmware/util` e introduce lo siguiente:
-
-```
-./new_keymap.sh <keyboard path> <username>
-```
-
-Por ejemplo, para un usuario llamado John, intentando hacer un keymap nuevo para el 1up60hse, tendría que teclear
-
-```
-./new_keymap.sh 1upkeyboards/1up60hse john
-```
-
-## Abre `keymap.c` con tu editor de texto favorito
-
-Abre tu `keymap.c`. Dentro de este fichero encontrarás la estructura que controla cómo se comporta tu teclado. En lo alto de `keymap.c` puede haber distintos defines y enums que hacen el keymap más fácil de leer. Continuando por abajo encontrarás una línea con este aspecto:
-
-    const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-Esta línea indica el comienzo del listado de Capas. Debajo encontrarás líneas que contienen o bien `LAYOUT` o `KEYMAP`, y estas líneas indican el comienzo de una capa. Debajo de esa línea está la lista de teclas que pertenecen a esa capa concreta.
-
-!> Cuando estés editando tu fichero de keymap ten cuidado con no añadir ni eliminar ninguna coma. Si lo haces el firmware dejará de compilar y puede no ser fácil averiguar dónde está la coma faltante o sobrante.
-
-## Personaliza el Layout a tu gusto
-
-Cómo completar esta paso depende enteramente de ti. Haz ese pequeño cambio que querías o rehaz completamente todo. Puedes eliminar capas si no las necesitas todas, o añadir nuevas hasta un total de 32. Comprueba la siguiente documentación para descubrir qué es lo que puedes definir aquí:
-
-* [Keycodes](keycodes.md)
-* [Características](features.md)
-* [Preguntas frecuentes](faq.md)
-
-?> Mientras estás descubriendo cómo funcionan los keymaps, haz pequeños cambios. Cambios mayores pueden hacer difícil la depuración de problemas que puedan aparecer.
-
-## Construye tu firmware
-
-Cuando los cambios a tu keymap están completos necesitarás construir el firmware. Para hacerlo vuelve a la ventana de tu terminal y ejecuta el siguiente comando:
-
-    make <my_keyboard>:<my_keymap>
-
-Por ejemplo, si tu keymap se llama "xyverz" y estás construyendo un keymap para un planck rev5, utilizarás el siguiente comando:
-
-    make planck/rev5:xyverz
-
-Mientras compila, recibirás un montón de información de salida en la pantalla informándote de qué ficheros están siendo compilados. Debería acabar con una información similar a esta:
-
-```
-Linking: .build/planck_rev5_xyverz.elf                                                              [OK]
-Creating load file for flashing: .build/planck_rev5_xyverz.hex                                      [OK]
-Copying planck_rev5_xyverz.hex to qmk_firmware folder                                               [OK]
-Checking file size of planck_rev5_xyverz.hex                                                        [OK]
- * File size is fine - 18392/28672
-```
-
-## Flashea tu firmware
-
-Continua con [Flasheando el firmware](newbs_flashing.md) para aprender cómo escribir tu firmware nuevo en tu teclado.
diff --git a/docs/es/newbs_building_firmware_configurator.md b/docs/es/newbs_building_firmware_configurator.md
deleted file mode 100644
index 60d67f5fa4..0000000000
--- a/docs/es/newbs_building_firmware_configurator.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Configurador QMK
-
-El [Configurador QMK](https://config.qmk.fm) es un entorno gráfico online que genera ficheros hexadecimales de Firmware QMK.  
-
-?> **Por favor sigue estos pasos en orden.**
-
-Ve el [Video tutorial](https://www.youtube.com/watch?v=-imgglzDMdY)
-
-El Configurador QMK functiona mejor con Chrome/Firefox. 
-
-
-!> **Ficheros de otras herramientas como KLE, o kbfirmware no serán compatibles con el Configurador QMK. No las cargues, no las importes. El configurador Configurador QMK es una herramienta DIFERENTE. **
-
-## Seleccionando tu teclado
-
-Haz click en el desplegable y selecciona el teclado para el que quieres crear el keymap. 
-
-?> Si tu teclado tiene varias versiones, asegúrate de que seleccionas la correcta.** 
-
-Lo diré otra vez porque es importante
-
-!> **ASEGÚRATE DE QUE SELECCIONAS LA VERSIÓN CORRECTA!**
-
-Si se ha anunciado que tu teclado funciona con QMK pero no está en la lista, es probable que un desarrollador no se haya encargado de él aún o que todavía no hemos tenido la oportunidad de incluirlo. Abre un issue en [qmk_firmware](https://github.com/qmk/qmk_firmware/issues) solicitando soportar ese teclado un particular, si no hay un [Pull Request](https://github.com/qmk/qmk_firmware/pulls?q=is%3Aopen+is%3Apr+label%3Akeyboard) activo para ello. Hay también teclados que funcionan con QMK que están en las cuentas de GitHub de sus manufacturantes. Acuérdate de comprobar esto también.
-
-## Eligiendo el layout de tu teclado
-
-Elige el layout que mejor represente el keymap que quieres crear. Algunos teclados no tienen suficientes layouts o layouts correctos definidos aún. Serán soportados en el futuro. 
-
-## Nombre del keymap
-
-Llama a este keymap como quieras. 
-
-?> Si estás teniendo problemas para compilar, puede merecer la pena probar un cambio de nombre, ya que puede que ya exista en el repositorio de QMK Firmware.
-
-## Creando Tu keymap
-
-La adición de keycodes se puede hacer de 3 maneras.  
-1. Arrastrando y soltando
-2. Clickando en un hueco vacío en el layout y haciendo click en el keycode que deseas
-3. Clickando en un hueco vacío en el layout, presionando la tecla física en tu teclado. 
-
-Mueve el puntero de tu ratón sobre una tecla y un pequeño extracto te dirá que es lo que hace la tecla. Para una descripción más detallada por favor, mira
-
-[Referencia básica de keycodes](https://docs.qmk.fm/#/keycodes_basic)    
-[Referencia avanzada de keycodes](https://docs.qmk.fm/#/feature_advanced_keycodes)    
-
-En el caso de que no puedas encontrar un layout que suporte tu keymap, por ejemplo, tres huecos para la barra espaciadora, dos huecos para el retroceso o dos huecos para shift etc etc, rellènalos TODOS. 
-
-### Ejemplo:
-
-3 huecos para barra espaciadora: Rellena TODOS con barra espaciadora
-
-2 huecos para retroceso: Rellena AMBOS con retroceso
-
-2 huecos para el shift derecho: Rellena AMBOS con shift derecho
-
-1 hueco para el shift izquierdo y 1 hueco para soporte iso: Rellena ambos con el shift izquierdo
-
-5 huecos , pero sólo 4 teclas: Intuye y comprueba o pregunta a alguien que lo haya hecho anteriormente. 
-
-## Guardando tu keymap para ediciones futuras
-
-Cuando estés satisfecho con un teclado o quieres trabajar en el después, pulsa el botón `Exportar Keymap`. Guardára tu keymap con el nombre que elijas seguido de .json. 
-
-Entonces podrás cargar este fichero .json en el futuro pulsando el botón `Importar Keymap`. 
-
-!> **PRECAUCIÓN:** No es el mismo tipo de fichero .json usado en kbfirmware.com ni ninguna otra herramienta. Si intentas utilizar un fichero .json de alguna de estas herramientas con el Configurador QMK, existe la posibilidad de que tu teclado **explote**. 
-
-## Generando tu fichero de firmware
-
-Pulsa el botón verde `Compilar`.
-
-Cuando la compilación haya acabado, podrás presionar el botón verde `Descargar Firmware`. 
-
-## Flasheando tu teclado
-
-Por favor, dirígete a la sección de [Flashear firmware](newbs_flashing.md)
-
-## Problemas comunes
-
-#### Mi fichero .json no funciona
-
-Si el fichero .json fue generado con el Configurador QMK, enhorabuena, has dado con un bug. Abre una issue en [qmk_configurator](https://github.com/qmk/qmk_configurator/issues)
-
-Si no....cómo no viste el mensaje en negrita que puse arriba diciendo que no hay que utilizar otros ficheros .json? 
-
-#### Hay espacios extra en mi layout ¿Qué hago?
-
-Si te refieres a tener tres espacios para la barra espaciadora, la mejor decisión es rellenar los tres con la barra espaciadora. También se puede hacer lo mismo con las teclas retroceso y las de shift
-
-#### Para qué sirve el keycode.......
-
-Por favor, mira
-
-[Referencia básica de keycodes](https://docs.qmk.fm/#/keycodes_basic)    
-[Referencia avanzada de keycodes](https://docs.qmk.fm/#/feature_advanced_keycodes)    
-
-#### No compila
-
-Por favor, revisa las otras capas de tu keymap para asegurarte de que no hay teclas aleatorias presentes. 
-
-## Problemas y bugs
-
-Siempre aceptamos peticiones de clientes y reportes de bug. Por favor, indícalos en [qmk_configurator](https://github.com/qmk/qmk_configurator/issues)
diff --git a/docs/es/newbs_flashing.md b/docs/es/newbs_flashing.md
deleted file mode 100644
index 066715c483..0000000000
--- a/docs/es/newbs_flashing.md
+++ /dev/null
@@ -1,351 +0,0 @@
-# Flasheando tu teclado
-
-Ahora que has construido tu fichero de firmware personalizado querrás flashear tu teclado. 
-
-## Flasheando tu teclado con QMK Toolbox
-
-La manera más simple de flashear tu teclado sería con [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases). 
-
-De todos modos, QMK Toolbox actualmente sólo está disponible para Windows y macOS.  Si estás usando Linux (o sólo quisieras flashear el firmware desde la línea de comandos), tendrás que utilizar el [método indicado abajo](newbs_flashing.md#flash-your-keyboard-from-the-command-line).
-
-### Cargar el fichero en QMK Toolbox
-
-Empieza abriendo la aplicación QMK Toolbox. Tendrás que buscar el fichero de firmware usando Finder o Explorer. El firmware de teclado puede estar en uno de estos dos formatos- `.hex` o `.bin`. QMK intenta copiar el apropiado para tu teclado en el fichero raíz `qmk_firmware`.
-
-?> Si tu estás on Windows o macOS hay comandos que puedes usar para abrir fácilmente la carpeta del firmware actual en Explorer o Finder.
-
-?> Windows:
-
-    start .
-
-?> macOS:
-
-    open .
-
-El fichero de firmware sempre sigue el siguiente formato de nombre:
-
-    <nombre_teclado>_<nombre_keymap>.{bin,hex}
-
-Por ejemplo, un `plank/rev5` con un keymap `default` tendrá este nombre de fichero:
-
-    planck_rev5_default.hex
-
-Una vez que hayas localizado el fichero de tu firmware arrástralo a la caja "Fichero local" en QMK Toolbox, o haz click en "Abrir" y navega allí donde tengas almacenado tu fichero de firmware. 
-
-### Pon tu teclado en modo DFU (Bootloader)
-
-Para poder flashear tu firmware personalizado tienes que poner tu teclado en un modo especial que permite flasheado. Cuando está en este modo no podrás teclear o utilizarlo para ninguna otra cosa. Es muy importante que no desconectes tu teclado, de lo contrario interrumpirás el proceso de flasheo mientras el firmware se está escribiendo.
-
-Diferentes teclados tienen diferentes maneras de entrar en este modo especial. Si tu PCB actualmente ejecuta QMK o TMK y no has recibido instrucciones específicas, intenta los siguientes pasos en orden:
-
-* Manten pulsadas ambas teclas shift y pulsa `Pause`
-* Manten pulsadas ambas teclas shift y pulsa `B`
-* Desconecta tu teclado, mantén pulsada la barra espaciadora y `B` al mismo tiempo, conecta tu teclado y espera un segundo antes de dejar de pulsar las teclas
-* Pulsa el botón físico `RESET` situado en el fondo de la PCB
-* Localiza los pines en la PCB etiquetados on `BOOT0` o `RESET`, puentea estos dos juntos cuando enchufes la PCB
-
-Si has tenido éxito verás un mensaje similar a este en QMK Toolbox:
-
-```
-*** Clueboard - Clueboard 66% HotSwap disconnected -- 0xC1ED:0x2390
-*** DFU device connected
-```
-
-### Flashea tu teclado
-
-Haz click en el botón `Flash` de QMK Toolbox. Verás una información de salida similar a esta:
-
-```
-*** Clueboard - Clueboard 66% HotSwap disconnected -- 0xC1ED:0x2390
-*** DFU device connected
-*** Attempting to flash, please don't remove device
->>> dfu-programmer atmega32u4 erase --force
-    Erasing flash...  Success
-    Checking memory from 0x0 to 0x6FFF...  Empty.
->>> dfu-programmer atmega32u4 flash /Users/skully/qmk_firmware/clueboard_66_hotswap_gen1_skully.hex
-    Checking memory from 0x0 to 0x55FF...  Empty.
-    0%                            100%  Programming 0x5600 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    0%                            100%  Reading 0x7000 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    Validating...  Success
-    0x5600 bytes written into 0x7000 bytes memory (76.79%).
->>> dfu-programmer atmega32u4 reset
-    
-*** DFU device disconnected
-*** Clueboard - Clueboard 66% HotSwap connected -- 0xC1ED:0x2390
-```
-
-## Flashea tu teclado desde la línea de comandos
-
-Lo primero que tienes que saber es qué bootloader utiliza tu teclado.  Hay cuatro bootloaders pincipales que se usan habitualmente . Pro-Micro y sus clones usan CATERINA, Teensy's usa Halfkay, las placas OLKB usan QMK-DFU, y otros chips atmega32u4 usan DFU. 
-
-Puedes encontrar más información sobre bootloaders en la página [Instrucciones de flasheado e información de Bootloader](flashing.md). 
-
-Si sabes qué bootloader estás usando, en el momento de compilar el firmware, podrás añadir algún texto extra al comando `make` para automatizar el proceso de flasheado. 
-
-### DFU
-
-Para eo bootloader DFU, cuando estés listo para compilar y flashear tu firmware, abre tu ventana de terminal y ejecuta el siguiente comando de construcción: 
-
-    make <my_keyboard>:<my_keymap>:dfu
-
-Por ejemplo, si tu keymap se llama "xyverz" y estás construyendo un keymap para un planck rev5, utilizarás este comando:
-
-    make planck/rev5:xyverz:dfu
-
-Una vez que finalice de compilar, deberá aparecer lo siguiente:
-
-```
-Linking: .build/planck_rev5_xyverz.elf                                                              [OK]
-Creating load file for flashing: .build/planck_rev5_xyverz.hex                                      [OK]
-Copying planck_rev5_xyverz.hex to qmk_firmware folder                                               [OK]
-Checking file size of planck_rev5_xyverz.hex                                                        
- * File size is fine - 18574/28672
- ```
-
-Después de llegar a este punto, el script de construcción buscará el bootloader DFU cada 5 segundos.  Repetirá lo siguiente hasta que se encuentre el dispositivo o lo canceles:
-
-    dfu-programmer: no device present.
-    Error: Bootloader not found. Trying again in 5s.
-
-Una vez haya hecho esto, tendrás que reiniciar el controlador.  Debería mostrar una información de salida similar a esta: 
-
-```
-*** Attempting to flash, please don't remove device
->>> dfu-programmer atmega32u4 erase --force
-    Erasing flash...  Success
-    Checking memory from 0x0 to 0x6FFF...  Empty.
->>> dfu-programmer atmega32u4 flash /Users/skully/qmk_firmware/clueboard_66_hotswap_gen1_skully.hex
-    Checking memory from 0x0 to 0x55FF...  Empty.
-    0%                            100%  Programming 0x5600 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    0%                            100%  Reading 0x7000 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    Validating...  Success
-    0x5600 bytes written into 0x7000 bytes memory (76.79%).
->>> dfu-programmer atmega32u4 reset
-```
-
-?> Si tienes problemas con esto- del estilo de `dfu-programmer: no device present` - por favor consulta las [Preguntas frecuentes de construcción](faq_build.md).
-
-#### Comandos DFU
-
-Hay un número de comandos DFU que puedes usar para flashear firmware a un dispositivo DFU:
-
-* `:dfu` - Esta es la opción normal y espera hasta que un dispositivo DFU esté disponible, entonces flashea el firmware. Esperará reintentando cada 5 segundos, para ver si un dispositivo DFU ha aparecido.
-* `:dfu-ee` - Esta flashea un fichero `eep` en vez del hex normal.  Esto no es lo común. 
-* `:dfu-split-left` - Esta flashea el firmware normal, igual que la opción por defecto (`:dfu`). Sin embargo, también flashea el fichero EEPROM "Lado Izquierdo" para teclados divididos. _Esto es ideal para los ficheros divididos basados en Elite C._
-* `:dfu-split-right` - Esto flashea el firmware normal, igual que la opción por defecto (`:dfu`). Sin embargo, también flashea el fichero EEPROM "Lado Derecho" para teclados divididos. _Esto es ideal para los ficheros divididos basados en Elite C._
-
-
-### Caterina 
-
-Para placas Arduino y sus clones (como la SparkFun ProMicro), cuando estés listo para compilar y flashear tu firmware, abre tu ventana de terminal y ejecuta el siguiente comando de construcción: 
-
-    make <my_keyboard>:<my_keymap>:avrdude
-
-Por ejemplo, si tu keymap se llama "xyverz" y estás construyendo un keymap para un Lets Split rev2, usarás este comando:
-
-    make lets_split/rev2:xyverz:avrdude
-
-Una vez que finalice de compilar, deberá aparecer lo siguiente:
-
-```
-Linking: .build/lets_split_rev2_xyverz.elf                                                            [OK]
-Creating load file for flashing: .build/lets_split_rev2_xyverz.hex                                    [OK]
-Checking file size of lets_split_rev2_xyverz.hex                                                      [OK]
- * File size is fine - 27938/28672
-Detecting USB port, reset your controller now..............
-```
-
-En este punto, reinicia la placa y entonces el script detectará el bootloader y procederá a flashear la placa.  La información de salida deber ser algo similar a esto: 
-
-```
-Detected controller on USB port at /dev/ttyS15
-
-Connecting to programmer: .
-Found programmer: Id = "CATERIN"; type = S
-    Software Version = 1.0; No Hardware Version given.
-Programmer supports auto addr increment.
-Programmer supports buffered memory access with buffersize=128 bytes.
-
-Programmer supports the following devices:
-    Device code: 0x44
-
-avrdude.exe: AVR device initialized and ready to accept instructions
-
-Reading | ################################################## | 100% 0.00s
-
-avrdude.exe: Device signature = 0x1e9587 (probably m32u4)
-avrdude.exe: NOTE: "flash" memory has been specified, an erase cycle will be performed
-             To disable this feature, specify the -D option.
-avrdude.exe: erasing chip
-avrdude.exe: reading input file "./.build/lets_split_rev2_xyverz.hex"
-avrdude.exe: input file ./.build/lets_split_rev2_xyverz.hex auto detected as Intel Hex
-avrdude.exe: writing flash (27938 bytes):
-
-Writing | ################################################## | 100% 2.40s
-
-avrdude.exe: 27938 bytes of flash written
-avrdude.exe: verifying flash memory against ./.build/lets_split_rev2_xyverz.hex:
-avrdude.exe: load data flash data from input file ./.build/lets_split_rev2_xyverz.hex:
-avrdude.exe: input file ./.build/lets_split_rev2_xyverz.hex auto detected as Intel Hex
-avrdude.exe: input file ./.build/lets_split_rev2_xyverz.hex contains 27938 bytes
-avrdude.exe: reading on-chip flash data:
-
-Reading | ################################################## | 100% 0.43s
-
-avrdude.exe: verifying ...
-avrdude.exe: 27938 bytes of flash verified
-
-avrdude.exe: safemode: Fuses OK (E:CB, H:D8, L:FF)
-
-avrdude.exe done.  Thank you.
-```
-Si tienes problemas con esto, puede ser necesario que hagas esto: 
-
-    sudo make <my_keyboard>:<my_keymap>:avrdude
-
-
-Adicionalmente, si quisieras flashear múltiples placas, usa el siguiente comando:
-
-    make <keyboard>:<keymap>:avrdude-loop
-
-Cuando hayas acabado de flashear placas, necesitarás pulsar Ctrl + C o cualquier combinación que esté definida en tu sistema operativo para finalizar el bucle.
-
-
-### HalfKay
-
-Para dispositivos PJRC (Teensy's), cuando estés listo para compilar y flashear tu firmware, abre tu ventana de terminal y ejecuta el siguiente comando de construcción: 
-
-    make <my_keyboard>:<my_keymap>:teensy
-
-Por ejemplo, si tu keymap se llama "xyverz" y estás construyendo un keymap para un Ergodox o un Ergodox EZ, usarás este comando:
-
-    make ergodox_ez:xyverz:teensy
-
-Una vez que el firmware acabe de compilar, deberá mostrar una información de salida como esta: 
-
-```
-Linking: .build/ergodox_ez_xyverz.elf                                                               [OK]
-Creating load file for flashing: .build/ergodox_ez_xyverz.hex                                       [OK]
-Checking file size of ergodox_ez_xyverz.hex                                                         [OK]
- * File size is fine - 25584/32256
- Teensy Loader, Command Line, Version 2.1
-Read "./.build/ergodox_ez_xyverz.hex": 25584 bytes, 79.3% usage
-Waiting for Teensy device...
- (hint: press the reset button)
- ```
-
-En este punto, reinicia tu placa.  Una vez que lo hayas hecho, deberás ver una información de salida como esta: 
-
- ```
- Found HalfKay Bootloader
-Read "./.build/ergodox_ez_xyverz.hex": 28532 bytes, 88.5% usage
-Programming............................................................................................................................................................................
-...................................................
-Booting
-```
-
-### BootloadHID
-
-Para placas basadas en Bootmapper Client(BMC)/bootloadHID/ATmega32A, cuando estés listo para compilar y flashear tu firmware, abre tu ventana de terminal y ejecuta el comando de construcción: 
-
-    make <my_keyboard>:<my_keymap>:bootloaderHID
-
-Por ejemplo, si tu keymap se llama "xyverz" y estás construyendo un keymap para un jj40, usarás esté comando:
-
-    make jj40:xyverz:bootloaderHID
-
-Una vez que el firmware acaba de compilar, mostrará una información de salida como esta: 
-
-```
-Linking: .build/jj40_default.elf                                                                   [OK]
-Creating load file for flashing: .build/jj40_default.hex                                           [OK]
-Copying jj40_default.hex to qmk_firmware folder                                                    [OK]
-Checking file size of jj40_default.hex                                                             [OK]
- * The firmware size is fine - 21920/28672 (6752 bytes free)
-```
-
-Después de llegar a este punto, el script de construcción buscará el bootloader DFU cada 5 segundos.  Repetirá lo siguiente hasta que se encuentre el dispositivo o hasta que lo canceles. 
-
-```
-Error opening HIDBoot device: The specified device was not found
-Trying again in 5s.
-```
-
-Una vez que lo haga, querrás reinicar el controlador.  Debería entonces mostrar una información de salida similar a esta: 
-
-```
-Page size   = 128 (0x80)
-Device size = 32768 (0x8000); 30720 bytes remaining
-Uploading 22016 (0x5600) bytes starting at 0 (0x0)
-0x05580 ... 0x05600
-```
-
-### STM32 (ARM)
-
-Para la mayoría de placas ARM (incluyendo la Proton C, Planck Rev 6, y Preonic Rev 3), cuando estés listo para compilar y flashear tu firmware, abre tu ventana de terminal y ejecuta el siguiente comando de construcción:
-
-    make <my_keyboard>:<my_keymap>:dfu-util
-
-Por ejemplo, si tu keymap se llama "xyverz" y estás construyendo un keymap para un teclado Planck Revision 6, utilizarás este comando y a continuación reiniciarás el teclado con el bootloader (antes de que acabe de compilar):
-
-    make planck/rev6:xyverz:dfu-util
-
-Una vez que el firmware acaba de compilar, mostrará una información de salida similar a esta: 
-
-```
-Linking: .build/planck_rev6_xyverz.elf                                                             [OK]
-Creating binary load file for flashing: .build/planck_rev6_xyverz.bin                               [OK]
-Creating load file for flashing: .build/planck_rev6_xyverz.hex                                     [OK]
-
-Size after:
-   text    data     bss     dec     hex filename
-      0   41820       0   41820    a35c .build/planck_rev6_xyverz.hex
-
-Copying planck_rev6_xyverz.bin to qmk_firmware folder                                              [OK]
-dfu-util 0.9
-
-Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc.
-Copyright 2010-2016 Tormod Volden and Stefan Schmidt
-This program is Free Software and has ABSOLUTELY NO WARRANTY
-Please report bugs to http://sourceforge.net/p/dfu-util/tickets/
-
-Invalid DFU suffix signature
-A valid DFU suffix will be required in a future dfu-util release!!!
-Opening DFU capable USB device...
-ID 0483:df11
-Run-time device DFU version 011a
-Claiming USB DFU Interface...
-Setting Alternate Setting #0 ...
-Determining device status: state = dfuERROR, status = 10
-dfuERROR, clearing status
-Determining device status: state = dfuIDLE, status = 0
-dfuIDLE, continuing
-DFU mode device DFU version 011a
-Device returned transfer size 2048
-DfuSe interface name: "Internal Flash  "
-Downloading to address = 0x08000000, size = 41824
-Download        [=========================] 100%        41824 bytes
-Download done.
-File downloaded successfully
-Transitioning to dfuMANIFEST state
-```
-
-#### STM32 Commands
-
-Hay un número de comandos DFU que puedes usar para flashear firmware a un dispositivo DFU:
-
-* `:dfu-util` - El comando por defecto para flashing en dispositivos STM32. 
-* `:dfu-util-wait` - Esto funciona como el comando por defecto, pero te da (configurable) 10 segundos de tiempo antes de que intente flashear el firmware.  Puedes usar `TIME_DELAY=20` desde la líena de comandos para cambiar este tiempo de retardo.
-   * Eg: `make <keyboard>:<keymap>:dfu-util TIME_DELAY=5`
-* `:dfu-util-split-left` - Flashea el firmware normal, igual que la opción por defecto (`:dfu-util`). Sin embargo, también flashea el fichero EEPROM "Lado Izquierdo" para teclados divididos.
-* `:dfu-util-split-right` - Flashea el firmware normal, igual que la opción por defecto (`:dfu-util`). Sin embargo, también flashea el fichero EEPROM "Lado Derecho" para teclados divididos.
-
-## ¡Pruébalo!
-
-¡Felicidades! ¡Tu firmware personalizado ha sido programado en tu teclado!
-
-Pruébalo y asegúrate de que todo funciona de la manera que tu quieres. Hemos escrito [Testeando y depurando](newbs_testing_debugging.md) para redondear esta guía de novatos, así que pásate por allí para aprender cómo resolver problemas con tu funcionalidad personalizada.
diff --git a/docs/es/newbs_getting_started.md b/docs/es/newbs_getting_started.md
deleted file mode 100644
index 046fdee27e..0000000000
--- a/docs/es/newbs_getting_started.md
+++ /dev/null
@@ -1,103 +0,0 @@
-# Introducción
-
-El teclado de tu computador tiene un procesador dentro de él, no muy distinto del que está dentro de tu ordenador. Este procesador ejecuta software que es responsable de detectar la pulsación de las teclas y enviar informes sobre el estado del teclado cuando las teclas son pulsadas y liberadas. QMK ocupa el rol de ese software. Cuando construyes un keymap personalizado , estas creando el equivalente de un programa ejecutable en tu teclado.
-
-QMK intenta poner un montón de poder en tus manos haciendo que las cosas fáciles sean fáciles, y las cosas difíciles posibles. No tienes que saber cómo programar para crear keymaps potentes — sólo tienes que seguir un conjunto simple de reglas sintácticas.
-
-# Comenzando
-
-Antes de que puedas construir keymaps, necesitarás instalar algun software y configurar tu entorno de construcción. Esto sólo hay que hacerlo una vez sin importar en cuántos teclados planeas configurar el software. 
-
-Si prefieres hacerlo mediante un interfaz gráfico , por favor, considera utilizar el [Configurador QMK](https://config.qmk.fm). En ese caso dirígete a [Construyendo tu primer firmware usando la GUI](newbs_building_firmware_configurator.md). 
-
-
-## Descarga el software
-
-### Editor de texto
-
-Necesitarás un programa con el que puedas editar y guardar archivos de **texto plano**, en windows puedes utilizar Notepad y en tu Linux puedes utilizar gedit. Estos dos programas son editores simples y funcionales. En macOS ten cuidado con la aplicación de edición de texto por defecto TextEdit: no guardará texto plano a menos de que se le seleccione explícitamente _Make Plain Text_ desde el menú _Format_.
-
-También puedes descargar e instalar un editor de texto dedicado como [Sublime Text](https://www.sublimetext.com/) o [VS Code](https://code.visualstudio.com/). Esta es probablemente la mejor manera independientemente de la plataforma, ya que estos programas fueron creados específicamente para editar código.
-
-?> ¿No estás seguro de qué editor de texto utilizar? Laurence Bradford escribió una [estupenda introducción](https://learntocodewith.me/programming/basics/text-editors/) al tema.
-
-### QMK Toolbox
-
-QMK Toolbox is an optional graphical program for Windows and macOS that allows you to both program and debug your custom keyboard. You will likely find it invaluable for easily flashing your keyboard and viewing debug messages that it prints.
-
-[Download the latest release here.](https://github.com/qmk/qmk_toolbox/releases/latest)
-
-* For Windows: `qmk_toolbox.exe` (portable) or `qmk_toolbox_install.exe` (installer)
-* For macOS: `QMK.Toolbox.app.zip` (portable) or `QMK.Toolbox.pkg` (installer)
-
-## Configura tu entorno
-
-Hemos intentado hacer QMK lo más fácil de configurar posible. Sólo tienes que preparar tu entorno Linux o Unix, y luego dejar que QMK
-instale el resto.
-
-?> Si no has trabajado con la línea de comandos de Linux/Unix con anterioridad, hay algunos conceptos y comandos básicos que deberías aprender. Estos recursos te enseñarán lo suficiente para poder trabajar con QMK:<br>
-[Comandos de Linux que debería saber](https://www.guru99.com/must-know-linux-commands.html)<br>
-[Algunos comandos básicos de Unix](https://www.tjhsst.edu/~dhyatt/superap/unixcmd.html)
-
-### Windows
-
-Necesitarás instalar MSYS2 y Git.
-
-* Sigue las instrucciones de instalación en la [página de MSYS2](https://www.msys2.org).
-* Cierra las terminales abiertas de MSYS2 y abre una nueva termial de MSYS2 MinGW 64-bit.
-* Instala Git ejecutando este comando: `pacman -S git`.
-
-### macOS
-
-Necesitarás instalar Homebrew. Sigue las instrucciones que encontrarás en la [página de Homebrew](https://brew.sh).
-
-Despueś de que se haya inastalado Homebrew, continúa con _Set Up QMK_. En ese paso ejecutará un script que instalará el resto de paquetes.
-
-### Linux
-
-Necesitarás instalar Git. Es bastante probable que ya lo tengas, pero si no, uno de los siguientes comandos debería instalarlo:
-
-* Debian / Ubuntu / Devuan: `apt-get install git`
-* Fedora / Red Hat / CentOS: `yum install git`
-* Arch: `pacman -S git`
-
-?> Docker es también una opción en todas las plataformas. [Haz click aquí si quieres detalles.](getting_started_build_tools.md#docker)
-
-## Configura QMK
-
-Una vez que hayas configurado tu entorno Linux/Unix, estarás listo para descargar QMK. Haremos esto utilizando Git para "clonar" el respositorio de QMK. Abre una ventana de Terminal o MSYS2 MinGW y mantenla abierta mientras sigues esta guía. Dentro de esa ventana ejecuta estos dos comandos:
-
-```shell
-git clone --recurse-submodules https://github.com/qmk/qmk_firmware.git
-cd qmk_firmware
-```
-
-?> Si ya sabes [cómo usar GitHub](getting_started_github.md), te recomendamos en vez de eso, crees y clones tu propio fork. Si no sabes lo que significa, puedes ignorar este mensaje sin problemas.
-
-QMK viene con un script para ayudarte a configurar el resto de cosas que necesitarás. Deberías ejecutarlo introduciendo este comando:
-
-    util/qmk_install.sh
-
-## Prueba tu entorno de construcción
-
-Ahora que tu entorno de construcción de QMK está configurado, puedes construcir un firmware para tu teclado. Comienza intentado construir el keymap por defecto del teclado. Deberías ser capaz de hacerlo con un comando con este formato:
-
-    make <keyboard>:default
-
-Por ejemplo, para construir el firmware para un Clueboard 66% deberías usar:
-
-    make clueboard/66/rev3:default
-
-Cuando esté hecho, deberías tener un montón de información de salida similar a esta:
-
-```
-Linking: .build/clueboard_66_rev3_default.elf                                                       [OK]
-Creating load file for flashing: .build/clueboard_66_rev3_default.hex                               [OK]
-Copying clueboard_66_rev3_default.hex to qmk_firmware folder                                        [OK]
-Checking file size of clueboard_66_rev3_default.hex                                                 [OK]
- * The firmware size is fine - 26356/28672 (2316 bytes free)
-```
-
-# Creando tu keymap
-
-Ya estás listo para crear tu propio keymap personal! Para hacerlo continua con [Construyendo tu primer firmware](newbs_building_firmware.md).
diff --git a/docs/es/newbs_learn_more_resources.md b/docs/es/newbs_learn_more_resources.md
deleted file mode 100644
index 34fd7556bf..0000000000
--- a/docs/es/newbs_learn_more_resources.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Recursos de aprendizaje
-
-Estos recursos procuran dar miembros nuevos en la communidad QMK un mayor entendimiento de la información proporcionada en la documentación para novatos.
-
-Recursos de Git:
-
-* [Excelente tutorial general](https://www.codecademy.com/learn/learn-git)
-* [Juego de Git para aprender usando ejemplos](https://learngitbranching.js.org/)
-* [Recursos de Git para aprender más sobre GitHub](getting_started_github.md)
-* [Recursos de Git dirigidos específicamente a QMK](contributing.md)
-
-
-Recursos para línea de mandatos:
-
-* [Excelente tutorial general sobre la línea de mandatos](https://www.codecademy.com/learn/learn-the-command-line)
diff --git a/docs/es/newbs_testing_debugging.md b/docs/es/newbs_testing_debugging.md
deleted file mode 100644
index 69f6984658..0000000000
--- a/docs/es/newbs_testing_debugging.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Testeando y depurando
-
-Una vez que hayas flasheado tu teclado con un firmware personalizado estarás listo para probarlo. Con un poco de suerte todo funcionará a la primera, pero si no es así, este documento te ayudará a averiguar qué está mal.
-
-## Probando
-
-Probar tu teclado es generalmente bastante sencillo. Persiona cada una de las teclas y asegúrate de que envía la tecla correcta. Existen incluso programas que te ayudarán a asegurarte de que no te dejas ninguna tecla sin comprobar.
-
-Nota: Estos programas no los provée ni están relacionados con QMK.
-
-* [Switch Hitter](https://elitekeyboards.com/switchhitter.php) (Sólo Windows)
-* [Keyboard Viewer](https://www.imore.com/how-use-keyboard-viewer-your-mac) (Sólo Mac)
-* [Keyboard Tester](https://www.keyboardtester.com) (Aplicación web)
-* [Keyboard Checker](https://keyboardchecker.com) (Aplicación web)
-
-## Depurando
-
-Tu teclado mostrará información de depuración si tienes `CONSOLE_ENABLE = yes` en tu `rules.mk`. Por defecto la información de salida es muy limitada, pero puedes encender el modo de depuración para incrementar la información de salida. Utiliza el keycode `DEBUG` de tu keymap, usa la característica [Comando](feature_command.md) para activar el modo depuración, o añade el siguiente código a tu keymap.
-
-```c
-void keyboard_post_init_user(void) {
-  // Customise these values to desired behaviour
-  debug_enable=true;
-  debug_matrix=true;
-  //debug_keyboard=true;
-  //debug_mouse=true;
-}
-```
-
-### Depurando con QMK Toolbox
-
-Para plataformas compatibles, [QMK Toolbox](https://github.com/qmk/qmk_toolbox) se puede usar para mostrar mensajes de depuración de tu teclado.
-
-### Depurando con hid_listen
-
-¿Prefieres una solución basada en una terminal? [hid_listen](https://www.pjrc.com/teensy/hid_listen.html), provista por PJRC, se puede usar también para mostrar mensajes de depuración. Hay binarios preconstruídos para Windows,Linux,y MacOS.
-
-<!-- FIXME: Describe the debugging messages here. -->
-
-## Enviando tus propios mensajes de depuración
-
-A veces, es útil imprimir mensajes de depuración desde tu [código personalizado](custom_quantum_functions.md). Hacerlo es bastante simple. Comienza incluyendo `print.h` al principio de tu fichero:
-
-```c
-#include "print.h"
-```
-
-Después de eso puedes utilzar algunas funciones print diferentes:
-
-* `print("string")`: Imprime un string simple
-* `uprintf("%s string", var)`: Imprime un string formateado
-* `dprint("string")` Imprime un string simple, pero sólo cuando el modo de depuración está activo
-* `dprintf("%s string", var)`: Imprime un string formateado, pero sólo cuando el modo de depuración está activo
-
-## Ejemplos de depuración
-
-Debajo hay una colección de ejemplos de depuración del mundo real. Para información adicional, Dirígete a [Depurando/Encontrando problemas en QMK](faq_debug.md).
-
-### ¿Que posición en la matriz tiene esta pulsación de tecla?
-
-Cuando estés portando, o intentando diagnosticar problemas en la pcb, puede ser útil saber si la pulsación de una tecla es escaneada correctamente. Para hablitar la información de registro en este escenario, añade el siguiente código al `keymap.c` de tus keymaps
-
-```c
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  // If console is enabled, it will print the matrix position and status of each key pressed
-#ifdef CONSOLE_ENABLE
-    uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
-#endif 
-  return true;
-}
-```
-
-Ejemplo de salida
-```text
-Waiting for device:.......
-Listening:
-KL: kc: 169, col: 0, row: 0, pressed: 1
-KL: kc: 169, col: 0, row: 0, pressed: 0
-KL: kc: 174, col: 1, row: 0, pressed: 1
-KL: kc: 174, col: 1, row: 0, pressed: 0
-KL: kc: 172, col: 2, row: 0, pressed: 1
-KL: kc: 172, col: 2, row: 0, pressed: 0
-```
-
-### ¿Cuanto tiempo tardó en escanear la pulsación de una tecla?
-
-Cuando estés probando problemas en el rendimiento, puede ser útil saber la frecuenta a la cual la matríz de pulsadores se está escaneando. Para hablitar la información de registro en este escenario, añade el siguiente código al `config.h` de tus keymaps
-
-```c
-#define DEBUG_MATRIX_SCAN_RATE
-```
-
-Ejemplo de salida
-```text
-  > matrix scan frequency: 315
-  > matrix scan frequency: 313
-  > matrix scan frequency: 316
-  > matrix scan frequency: 316
-  > matrix scan frequency: 316
-  > matrix scan frequency: 316
-```
diff --git a/docs/fr-fr/ChangeLog/20190830.md b/docs/fr-fr/ChangeLog/20190830.md
deleted file mode 100644
index cb223be31a..0000000000
--- a/docs/fr-fr/ChangeLog/20190830.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# QMK Breaking Change - 30 août 2019
-
-Quatre fois par an, QMK lance un processus pour fusionner les Breaking Changes. Un Breaking Change est un changement qui modifie la manière dont QMK fonctionne introduisant des incompatibilités ou des comportements dangereux. Nous n'effectuons ces changements que 4 fois par an afin que les utilisateurs n'aient pas peur de casser leurs keymaps en mettant à jour leur version de QMK.
-
-Ce document présente les fusions de Breaking Change. Voici la liste des changements.
-
-## Formattage de code Core avec clang-format
-
-* Tous les fichiers core (`drivers/`, `quantum/`, `tests/`, et `tmk_core/`) seront formatés avec clang-format
-* Un processus travis pour reformatter les PRs lors de la fusion a été mis en place
-* Vous pouvez utiliser la nouvelle commande CLI `qmk cformat` afin de formater avant de soumettre votre PR si vous le souhaitez.
-
-## Nettoyage des descripteurs LUFA USB
-
-* Nettoyage du code lié aux descripteurs USB HID sur les claviers AVR, afin de les rendre plus simple à lire et compréhensibles
-* Plus d'information:  https://github.com/qmk/qmk_firmware/pull/4871
-* Normalement pas de changement de fonctionnement et aucune keymap modifiée.
-
-## Migration des entrées de `ACTION_LAYER_MOMENTARY()` dans `fn_actions` vers des keycodes `MO()`
-
-* `fn_actions` est déprécié, et ses fonctionnalités ont été remplacées par des keycodes directs et `process_record_user()`
-* Supprimer cette fonctionnalité obsolète devrait aboutir à une réduction importante de la taille du firmware et de la complexité du code
-* Il est recommandé que toutes les keymaps affectées remplacent `fn_actions` vers les fonctionnalités de [keycode custom](https://docs.qmk.fm/#/custom_quantum_functions) et [macro](https://docs.qmk.fm/#/feature_macros)
-
-## Mise à jour Atreus vers les conventions de codage courantes
-
-* Les doublons include guards ont contourné le comportement de traitement des headers attendu
-* Il est recommandé pour toutes les keymaps affectées de supprimer le doublon de `<keyboard>/config.h` et `<keyboard>/keymaps/<user>/config.h` et de ne garder que des surcharges au niveau keymap
-
-## Récupération des changements de fichier keymap langage de la fork ZSA
-
-* Corrige une issue dans le fichier `keymap_br_abnt2.h` qui inclut la mauvaise souce (`keymap_common.h` au lieu de `keymap.h`)
-* Met à jour le fichier `keymap_swedish.h` afin d'être spécifique au suédois et plus "nordique" en général.
-* Toutes les keymaps qui utilisent ceci devront supprimer `NO_*` et le remplacer par `SE_*`.
-
-## Mise à jour du repo afin d'utiliser LUFA comme un sous-module git
-
-* `/lib/LUFA` supprimé du dépôt
-* LUFA, définis comme un sous-module, pointe vers qmk/lufa
-* Ceci devrait ajouter plus de flexibilité vers LUFA, et nous permet de garder le sous-module à jour bien plus facilement. Il avait environ 2 ans de retard, sans manière simple de corriger. Ce changement devrait simplifier la mise à jour dans le futur.
-
-## Migration des entrées `ACTION_BACKLIGHT_*()` dans `fn_actions` vers des keycodes `BL_`
-
-* `fn_actions` est déprécié, et ses fonctionnalités ont été remplacées par des keycodes directs et `process_record_user()`
-* Toutes les keymaps utilisant ces actions doivent avoir les clés `KC_FN*` remplacées par les clés `BL_*` équivalentes
-* Si vous utilisez actuellement `KC_FN*` vous devrez remplacer `fn_actions` avec les fonctionnalités de [keycode custom](https://docs.qmk.fm/#/custom_quantum_functions) et [macro](https://docs.qmk.fm/#/feature_macros)
-
-## Remplacer l'alias `KC_DELT` par `KC_DEL`
-
-* `KC_DELT` était un alias redondant et non documenté pour `KC_DELETE`
-* Il a été supprimé et toutes ses utilisations ont été remplacées par l'alias plus courant `KC_DEL`
-* Environ 90 keymaps (surtout des boards ErgoDox) ont été modifiées à cette fin
diff --git a/docs/fr-fr/README.md b/docs/fr-fr/README.md
deleted file mode 100644
index 3d1f740abb..0000000000
--- a/docs/fr-fr/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Quantum Mechanical Keyboard Firmware
-
-[![Version courante](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)
-[![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh)
-[![Statut de la doc](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm)
-[![Contributeurs GitHub](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
-[![Forks GitHub](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
-
-## Qu'est-ce que QMK Firmware?
-
-QMK (*Quantum Mechanical Keyboard*) est une communauté open source qui maintient le firmware QMK, la QMK Toolbox (*Boite à outil*), qmk.fm et leurs documentations. QMK Firmware est un firmware dédié aux claviers qui est basé sur [tmk\_keyboard](https://github.com/tmk/tmk_keyboard). Il offre des fonctionnalités très utiles pour les contrôleurs Atmel AVR, et, plus spécifiquement pour [les produits d'OLKB](https://olkb.com), le clavier [ErgoDox EZ](https://www.ergodox-ez.com), et pour les [produits Clueboard](https://clueboard.co/). Il prend désormais aussi en charge les processeurs ARM qui utilisent ChibiOS. Vous pouvez l'utiliser pour contrôler un clavier personnalisé soudé à la main ou alors sur un clavier avec un PCB personnalisé.
-
-## Comment l'obtenir
-
-Si vous souhaitez contribuer à une disposition de clavier (keymap), ou à des fonctionnalités de QMK alors le plus simple est de [forker le dépôt avec GitHub](https://github.com/qmk/qmk_firmware#fork-destination-box) puis cloner le dépôt localement pour y faire des changements. Vous pourrez pousser vos changements sur GitHub puis ouvrir un [Pull Request](https://github.com/qmk/qmk_firmware/pulls) depuis votre fork GitHub.
-
-Sinon, vous pouvez aussi le télécharger directement en ([zip](https://github.com/qmk/qmk_firmware/zipball/master), [tar](https://github.com/qmk/qmk_firmware/tarball/master)), ou le cloner avec git en ssh (`git@github.com:qmk/qmk_firmware.git`), ou https (`https://github.com/qmk/qmk_firmware.git`).
-
-## Comment le compiler
-
-Avant d'être prêt à compiler vous allez devoir [installer un environnement](fr-fr/getting_started_build_tools.md) pour les développements AVR et/ou ARM. Une fois ceci fait, vous pourrez utiliser la commande `make` pour compiler le clavier et la disposition avec une commande de ce type :
-
-    make planck/rev4:default
-
-Cette commande compilera la révision `rev4` du clavier `planck` avec la disposition `default`. Notez que tous les claviers n'ont pas forcément de révisions (aussi appelées sous-projects ou dossiers, ou en anglais «subprojects» ou «folder»). Cette option peut donc être omise:
-
-    make preonic:default
-
-## Comment le personnaliser
-
-QMK a beaucoup de [fonctionnalités](fr-fr/features.md) à explorer, et [une documentation](https://docs.qmk.fm) très abondante que vous pourrez parcourir. La plupart des fonctionnalités vous permettrons de modifier vos [dispositions](fr-fr/keymap.md) (keymaps) et de changer [les codes de caractères](fr-fr/keycodes.md) (keycodes).
diff --git a/docs/fr-fr/_summary.md b/docs/fr-fr/_summary.md
deleted file mode 100644
index 25a593b2ec..0000000000
--- a/docs/fr-fr/_summary.md
+++ /dev/null
@@ -1,126 +0,0 @@
-**En Français**
-
-* [Guide pour débutant complet](fr-fr/newbs.md)
-  * [Pour débuter](fr-fr/newbs_getting_started.md)
-  * [Compiler son premier firmware](fr-fr/newbs_building_firmware.md)
-  * [Flasher le Firmware](fr-fr/newbs_flashing.md)
-  * [Test et Débuggage](fr-fr/newbs_testing_debugging.md)
-  * [Bonnes pratiques Git](fr-fr/newbs_best_practices.md)
-  * [Ressources d'apprentissage](fr-fr/newbs_learn_more_resources.md)
-
-* [Les bases de QMK](fr-fr/README.md)
-  * [Indroduction à QMK](fr-fr/getting_started_introduction.md)
-  * [QMK CLI](fr-fr/cli.md)
-  * [Configuration de la CLI QMK](fr-fr/cli_configuration.md)
-  * [Contribuer à QMK](fr-fr/contributing.md)
-  * [Comment utiliser GitHub](fr-fr/getting_started_github.md)
-  * [Trouver de l'aide](fr-fr/getting_started_getting_help.md)
-
-* [Breaking changes](fr-fr/breaking_changes.md)
-  * [30 août 2019](fr-fr/ChangeLog/20190830.md)
-
-* [FAQ](fr-fr/faq.md)
-  * [FAQ Générale](fr-fr/faq_general.md)
-  * [Compiler QMK](fr-fr/faq_build.md)
-  * [Débugguer / Dépanner QMK](fr-fr/faq_debug.md)
-  * [Keymap / Disposition](fr-fr/faq_keymap.md)
-  * [Installer les drivers avec Zadig](fr-fr/driver_installation_zadig.md)
-
-**En Anglais**
-
-* Guides détaillés
-  * [Installation des outils de compilation](fr-fr/getting_started_build_tools.md)
-  * [Guide Vagrant](fr-fr/getting_started_vagrant.md)
-  * [Commandes de compilations](fr-fr/getting_started_make_guide.md)
-  * [Flasher les firmwares](fr-fr/flashing.md)
-  * [Personnaliser les fonctionnalités](fr-fr/custom_quantum_functions.md)
-  * [Aperçu des fonctionnalités des dispositions](fr-fr/keymap.md)
-
-* [Hardware](fr-fr/hardware.md)
-  * [Processeurs AVR](fr-fr/hardware_avr.md)
-  * [Pilotes / Drivers](fr-fr/hardware_drivers.md)
-
-* Réferences
-  * [Lignes de conduite des claviers](fr-fr/hardware_keyboard_guidelines.md)
-  * [Options de configurations](fr-fr/config_options.md)
-  * [Keycodes / Codes des caractères](fr-fr/keycodes.md)
-  * [Conventions de codage - C](fr-fr/coding_conventions_c.md)
-  * [Conventions de codage - Python](fr-fr/coding_conventions_python.md)
-  * [Meilleurs pratiques sur la documentation](fr-fr/documentation_best_practices.md)
-  * [Modèles de documentation](fr-fr/documentation_templates.md)
-  * [Glossaire](fr-fr/reference_glossary.md)
-  * [Tests unitaires](fr-fr/unit_testing.md)
-  * [Fonctions utiles](fr-fr/ref_functions.md)
-  * [Support de configuration](fr-fr/reference_configurator_support.md)
-  * [Format du fichier info.json](fr-fr/reference_info_json.md)
-  * [Développer la CLI en Python](fr-fr/cli_development.md)
-
-* [Fonctionnalités](fr-fr/features.md)
-  * [Keycodes basiques](fr-fr/keycodes_basic.md)
-  * [Touches utilisées avec Shift (US ANSI)](fr-fr/keycodes_us_ansi_shifted.md)
-  * [Keycodes quantiques](fr-fr/quantum_keycodes.md)
-  * [Keycodes avancés](fr-fr/feature_advanced_keycodes.md)
-  * [Fonctionnalités audio](fr-fr/feature_audio.md)
-  * [Majuscule automatique](fr-fr/feature_auto_shift.md)
-  * [Rétroéclairage](fr-fr/feature_backlight.md)
-  * [Bluetooth](fr-fr/feature_bluetooth.md)
-  * [Bootmagic](fr-fr/feature_bootmagic.md)
-  * [Combos](fr-fr/feature_combo.md)
-  * [Commande](fr-fr/feature_command.md)
-  * [API anti-rebond](fr-fr/feature_debounce_type.md)
-  * [DIP Switch](fr-fr/feature_dip_switch.md)
-  * [Macros dynamiques](fr-fr/feature_dynamic_macros.md)
-  * [Interrupteurs rotatifs](fr-fr/feature_encoders.md)
-  * [Grave Escape](fr-fr/feature_grave_esc.md)
-  * [Retour haptique](fr-fr/feature_haptic_feedback.md)
-  * [Contrôleur LCD HD44780](fr-fr/feature_hd44780.md)
-  * [Touche à verrou / Lock-key](fr-fr/feature_key_lock.md)
-  * [Dispositions / layouts](fr-fr/feature_layouts.md)
-  * [Touche leader](fr-fr/feature_leader_key.md)
-  * [Matrice LED](fr-fr/feature_led_matrix.md)
-  * [Macros](fr-fr/feature_macros.md)
-  * [Boutons de souris](fr-fr/feature_mouse_keys.md)
-  * [Pilotes / Drivers OLED](fr-fr/feature_oled_driver.md)
-  * [Touche one-shot](fr-fr/one_shot_keys.md)
-  * [Périphériques de pointage](fr-fr/feature_pointing_device.md)
-  * [Souris PS/2](fr-fr/feature_ps2_mouse.md)
-  * [Éclairage RGB](fr-fr/feature_rgblight.md)
-  * [Matrice RGB](fr-fr/feature_rgb_matrix.md)
-  * [Space Cadet](fr-fr/feature_space_cadet.md)
-  * [Claviers scindés / splittés](fr-fr/feature_split_keyboard.md)
-  * [Stenographie](fr-fr/feature_stenography.md)
-  * [Inversion des mains](fr-fr/feature_swap_hands.md)
-  * [Tap Dance](fr-fr/feature_tap_dance.md)
-  * [Terminale](fr-fr/feature_terminal.md)
-  * [Imprimante thermique](fr-fr/feature_thermal_printer.md)
-  * [Caractères unicodes](fr-fr/feature_unicode.md)
-  * [Dossier utilisateur](fr-fr/feature_userspace.md)
-  * [Velocikey](fr-fr/feature_velocikey.md)
-
-* Pour les makers et les bricoleurs
-  * [Guide des claviers soudés à la main](fr-fr/hand_wire.md)
-  * [Guide de flash de l’ISP](fr-fr/isp_flashing_guide.md)
-  * [Guide du débogage ARM](fr-fr/arm_debugging.md)
-  * [Drivers I2C](fr-fr/i2c_driver.md)
-  * [Drivers SPI](fr-fr/spi_driver.md)
-  * [Contrôles des GPIO](fr-fr/internals_gpio_control.md)
-  * [Conversion en Proton C](fr-fr/proton_c_conversion.md)
-
-* Pour aller plus loin
-  * [Comment fonctionnent les claviers](fr-fr/how_keyboards_work.md)
-  * [Comprendre QMK](fr-fr/understanding_qmk.md)
-
-* Autres sujets
-  * [Utiliser Eclipse avec QMK](fr-fr/other_eclipse.md)
-  * [Utiliser VSCode avec QMK](fr-fr/other_vscode.md)
-  * [Support](fr-fr/getting_started_getting_help.md)
-  * [Comment ajouter des traductions](fr-fr/translating.md)
-
-* À l’intérieur de QMK (En cours de documentation)
-  * [Définitions](fr-fr/internals_defines.md)
-  * [Input Callback Reg](fr-fr/internals_input_callback_reg.md)
-  * [Appareils Midi](fr-fr/internals_midi_device.md)
-  * [Installation d’un appareil Midi](fr-fr/internals_midi_device_setup_process.md)
-  * [Utilitaires Midi](fr-fr/internals_midi_util.md)
-  * [Fonctions Midi](fr-fr/internals_send_functions.md)
-  * [Outils Sysex](fr-fr/internals_sysex_tools.md)
diff --git a/docs/fr-fr/breaking_changes.md b/docs/fr-fr/breaking_changes.md
deleted file mode 100644
index 4c3817d2ef..0000000000
--- a/docs/fr-fr/breaking_changes.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# Breaking changes
-
-Ce document décrit le processus de QMK pour la gestion des breaking changes. Un breaking change est un changement qui modifie la manière dont QMK fonctionne introduisant des incompatibilités ou des comportements dangereux. Nous limitons ces changements afin que les utilisateurs n'aient pas peur de casser leurs keymaps en mettant à jour leur version de QMK.
-
-La période de breaking change est quand nous allons fusionner un PR qui change QMK d'une manière dangereuse ou inattendue. Il y a une période interne de test afin de nous assurer que les problèmes résiduels sont rares ou impossible à prévoir.
-
-## Qu'est-ce qui a été inclus dans des Breaking Changes précédents?
-
-* [30 août 2019](ChangeLog/20190830.md)
-
-## Quand va être le prochain Breaking Change?
-
-Le prochain Breaking Change est planifié pour le 29 novembre.
-
-### Dates importantes
-
-* [x] 21 septembre 2019 - `future` est créé. Il va être rebasé de manière hebdomadaire.
-* [ ] 01 novembre 2019 - `future` fermé aux nouveaux PRs.
-* [ ] 01 novembre 2019 - Appel aux testeurs.
-* [ ] 27 novembre 2019 - `master` est bloqué, pas de PRs fusionnés.
-* [ ] 29 novembre 2019 - `future` est fusionné dans `master`.
-* [ ] 30 novembre 2019 - `master` est débloqué. Les PRs peuvent à nouveau être fusionnés.
-
-## Quels changements seront inclus?
-
-Pour voir une liste de candidats de breaking changes, vous pouvez regarder la liste des [labels `breaking_change`](https://github.com/qmk/qmk_firmware/pulls?q=is%3Aopen+label%3Abreaking_change+is%3Apr). De nouveaux changements peuvent être ajoutés entre maintenant et lorsque `future` est fermée, et un PR avec ce label n'est pas garanti d'être fusionné.
-
-Si vous souhaitez que votre breaking change soit inclus dans ce tour, vous devez créer un PR avec le label `breaking_change` et faire en sorte qu'il soit accepté avant que `future` ne soit fermé. Une fois `future` fermé, aucun nouveau breaking change sera accepté.
-
-Critère d'acceptation:
-
-* Le PR est complété et prêt à fusionner
-* Le PR a un ChangeLog
-
-# Checklists
-
-Cette section documente plusieurs processus que nous utilisons en lançant le processus de Breaking Change.
-
-## Rebase `future` de `master`
-
-Ceci est lancé chaque vendredi tant que `future` est ouvert.
-
-Processus:
-
-```
-cd qmk_firmware
-git checkout master
-git pull --ff-only
-git checkout future
-git rebase master
-git push --force
-```
-
-## Créer la branche `future`
-
-Ceci est fait immédiatement après la fusion de la branche `future` précédente.
-
-* `qmk_firmware` git commands
-    * [ ] `git checkout master`
-    * [ ] `git pull --ff-only`
-    * [ ] `git checkout -b future`
-    * [ ] Modifie `readme.md`
-        * [ ] Ajoute un message en haut qui indique que c'est une branche de test.
-        * [ ] Ajoute un lien vers ce document
-    * [ ] `git commit -m 'Branch point for <DATE> Breaking Change'`
-    * [ ] `git tag breakpoint_<YYYY>_<MM>_<DD>`
-    * [ ] `git tag <next_version>` # Evite que le label point d'arrêt soit confondu par un incrément de version
-    * [ ] `git push origin future`
-    * [ ] `git push --tags`
-
-## 4 Semaines Avant la Fusion
-
-* `future` est maintenant fermé aux nouveaux PRs, seul des correctifs pour les PRs courants peuvent être mergés
-* Envoi de l'appel aux testeurs
-    * [ ] Discord
-    * [ ] GitHub PR
-    * [ ] https://reddit.com/r/olkb
-
-## 1 Semaine Avant la Fusion
-
-* Annonce que master sera fermée entre <2 jours avant> à <Jour de la fusion>
-    * [ ] Discord
-    * [ ] GitHub PR
-    * [ ] https://reddit.com/r/olkb
-
-## 2 Jours Avant la Fusion
-
-* Annonce que master est fermé pour 2 jours
-    * [ ] Discord
-    * [ ] GitHub PR
-    * [ ] https://reddit.com/r/olkb
-
-## Jour de la fusion
-
-* `qmk_firmware` git commands
-    * [ ] `git checkout future`
-    * [ ] `git pull --ff-only`
-    * [ ] `git rebase origin/master`
-    * [ ] Modifie `readme.md`
-        * [ ] Supprimer les notes à propos de `future`
-    * [ ] Regroupe ChangeLog dans un fichier.
-    * [ ] `git commit -m 'Merge point for <DATE> Breaking Change'`
-    * [ ] `git push origin future`
-* Actions sur GitHub
-    * [ ] Crée un PR pour `future`
-    * [ ] Fusion le PR `future`
diff --git a/docs/fr-fr/cli.md b/docs/fr-fr/cli.md
deleted file mode 100644
index 917a9315bc..0000000000
--- a/docs/fr-fr/cli.md
+++ /dev/null
@@ -1,127 +0,0 @@
-# La CLI de QMK
-
-Cette page décrit comment configurer et utiliser la CLI QMK.
-
-# Vue d'ensemble
-
-La CLI de QMK permet de simplifier la compilation et l'interaction avec les claviers QMK. Nous avons défini plusieurs commandes pour simplifier et rationaliser les tâches telles qu'obtenir et compiler le firmware QMK, créer de nouvelles keymaps, et plus.
-
-* [CLI globale](#global-cli)
-* [CLI locale](#local-cli)
-* [Les commandes CLI](#cli-commands)
-
-# Pré-requis
-
-La CLI nécessite Python 3.5 ou plus récent. Nous essayons de limiter le nombre de pré-requis, mais vous allez aussi devoir installer les paquets listés dans le fichier [`requirements.txt`](https://github.com/qmk/qmk_firmware/blob/master/requirements.txt).
-
-# CLI globale
-
-QMK met à disposition une CLI installable qui peut être utilisée pour configurer votre environnement de compilation QMK, fonctionne avec QMK, et qui rend l'utilisation de plusieurs copies de `qmk_firmware` plus simple. Nous recommandons d'installer et de mettre à jour ceci régulièrement.
-
-## Installer en utilisant Homebrew (macOS, quelques Linux)
-
-Si vous avez installé [Homebrew](https://brew.sh) vous pouvez entrer ce qui suit et installer QMK:
-
-```
-brew tap qmk/qmk
-brew install qmk
-export QMK_HOME='~/qmk_firmware' # Optional, set the location for `qmk_firmware`
-qmk setup  # This will clone `qmk/qmk_firmware` and optionally set up your build environment
-```
-
-## Installer en utilisant easy_install ou pip
-
-Si votre système n'est pas listé ci-dessus, vous pouvez installer QMK manuellement. Premièrement, vérifiez que vous avez bien installé Python 3.5 (ou plus récent) et pip. Ensuite, installez QMK avec cette commande:
-
-```
-pip3 install qmk
-export QMK_HOME='~/qmk_firmware' # Optional, set the location for `qmk_firmware`
-qmk setup  # This will clone `qmk/qmk_firmware` and optionally set up your build environment
-```
-
-## Paquets pour d'autres systèmes d'exploitation
-
-Nous recherchons des gens pour créer et maintenir un paquet `qmk` pour plus de systèmes d'exploitation. Si vous voulez créer un paquet pour votre système d'exploitation, suivez ces directives:
-
-* Suivez les bonnes pratiques pour votre système d'exploitation lorsqu'elles entrent en conflit avec ces directives
-    * Documentez pourquoi dans un commentaire lorsque vous ne les suivez pas
-* Installez en utilisant un virtualenv
-* Expliquez à l'utilisateur de définir la variable d'environnement `QMK_Home` pour "check out" les sources du firmware à un autre endroit que `~/qmk_firmware`.
-
-# Les commandes CLI
-
-## `qmk compile`
-
-Cette commande permet de compiler le firmware de n'importe quel répertoire. Vous pouvez compiler des exports JSON de <https://config.qmk.fm> ou compiler des keymaps du dépôt.
-
-**Utilisation pour les exports de configuration**:
-
-```
-qmk compile <configuratorExport.json>
-```
-
-**Utilisation pour les Keymaps**:
-
-```
-qmk compile -kb <keyboard_name> -km <keymap_name>
-```
-
-## `qmk format-c`
-
-Cette commande formatte le code C en utilisant clang-format. Lancez-la sans arguments pour formatter tout le code core, ou passez les noms de fichiers à la ligne de commande pour la lancer sur des fichiers spécifiques.
-
-**Utilisation**:
-
-```
-qmk format-c [file1] [file2] [...] [fileN]
-```
-
-## `qmk config`
-
-Cette commande vous permet de configurer le comportement de QMK. Pour la documentation complète de `qmk config`, regardez [Configuration de CLI](cli_configuration.md).
-
-**Utilisation**:
-
-```
-qmk config [-ro] [config_token1] [config_token2] [...] [config_tokenN]
-```
-
-## `qmk doctor`
-
-Cette commande examine votre environnement et vous alertes des potentiels problèmes de compilation ou de flash.
-
-**Utilisation**:
-
-```
-qmk doctor
-```
-
-## `qmk new-keymap`
-
-Cette commande crée une nouvelle keymap basée sur une keymap par défaut d'un clavier existant.
-
-**Utilisation**:
-
-```
-qmk new-keymap [-kb KEYBOARD] [-km KEYMAP]
-```
-
-## `qmk format-py`
-
-Cette commande formate le code python dans `qmk_firmware`.
-
-**Utilisation**:
-
-```
-qmk format-py
-```
-
-## `qmk pytest`
-
-Cette commande démarre la suite de test python. Si vous faites des changements dans le code Python, assurez-vous que les tests se lancent avec succès.
-
-**Utilisation**:
-
-```
-qmk pytest
-```
diff --git a/docs/fr-fr/cli_configuration.md b/docs/fr-fr/cli_configuration.md
deleted file mode 100644
index 3eed1e0e95..0000000000
--- a/docs/fr-fr/cli_configuration.md
+++ /dev/null
@@ -1,121 +0,0 @@
-# Configuration de QMK CLI
-
-Ce document explique comment fonctionne la commande `qmk config`.
-
-# Introduction
-
-La configuration pour QMK CLI est un système clé/valeur. Chaque clé est composée d'une sous-commande et d'un argument séparé par une virgule. Cela permet une traduction simple et directe entre les clés de configuration et l'argument qu'elle définit.
-
-## Exemple simple
-
-Comme exemple, regardons la commande `qmk compile --keyboard clueboard/66/rev4 --keymap default`.
-
-Il y a deux arguments de ligne de commande qui peuvent être lu de la configuration:
-
-* `compile.keyboard`
-* `compile.keymap`
-
-Essayons de les définir:
-
-```shell
-$ qmk config compile.keyboard=clueboard/66/rev4 compile.keymap=default
-compile.keyboard: None -> clueboard/66/rev4
-compile.keymap: None -> default
-Ψ Wrote configuration to '/Users/example/Library/Application Support/qmk/qmk.ini'
-```
-
-Maintenant, je peux lancer la commande `qmk compile` sans avoir à spécifier mon clavier et keymap à chaque fois.
-
-## Définir les options par défaut
-
-Parfois, il est utile de partager une configuration entre plusieurs commandes. Par exemple, plusieurs commandes prennent un argument `--keyboard`. Plutôt que de devoir définir cette valeur pour chaque commande, vous pouvez définir une valeur d'utilisateur qui sera utilisée par toutes les commandes qui prennent cet argument.
-
-Exemple:
-
-```
-$ qmk config user.keyboard=clueboard/66/rev4 user.keymap=default
-user.keyboard: None -> clueboard/66/rev4
-user.keymap: None -> default
-Ψ Wrote configuration to '/Users/example/Library/Application Support/qmk/qmk.ini'
-```
-
-# CLI Documentation (`qmk config`)
-
-La commande `qmk config` est utilisée pour interagir avec la configuration sous-jacente. Lancée sans argument, elle affiche la configuration courante. Lorsque des arguments sont définis, ils sont considérés comme étant des jetons de configuration, qui sont des chaînes de caractère ne contenant aucun espace avec le format suivant:
-
-    <subcommand|general|default>[.<key>][=<value>]
-
-## Définir des valeurs de configuration
-
-Vous pouvez définir des valeurs de configuration en mettant le caractère égal (=) dans votre clé de configuration. La clé doit toujours être dans le format complet `<section>.<key>`.
-
-Exemple:
-
-```
-$ qmk config default.keymap=default
-default.keymap: None -> default
-Ψ Wrote configuration to '/Users/example/Library/Application Support/qmk/qmk.ini'
-```
-
-## Lire des valeurs de configuration
-
-Vous pouvez lire les valeurs de configuration pour la totalité de la configuration, une seule clé, ou une section entière. Vous pouvez aussi spécifier plusieurs clés pour afficher plus d'une valeur.
-
-### Exemple avec la totalité de la configuration
-
-    qmk config
-
-### Exemple avec une section entière
-
-    qmk config compile
-
-### Exemple avec une clé unique
-
-    qmk config compile.keyboard
-
-### Exemple avec plusieurs clés
-
-    qmk config user compile.keyboard compile.keymap
-
-## Supprimer des valeurs de configuration
-
-Vous pouvez supprimer une valeur de configuration en la définissant avec la chaîne spéciale `None`.
-
-Exemple:
-
-```
-$ qmk config default.keymap=None
-default.keymap: default -> None
-Ψ Wrote configuration to '/Users/example/Library/Application Support/qmk/qmk.ini'
-```
-
-## Plusieurs opérations
-
-Vous pouvez combiner plusieurs opérations d'écriture et de lecture en une seule commande. Elles seront exécutées et affichées dans l'ordre:
-
-```
-$ qmk config compile default.keymap=default compile.keymap=None
-compile.keymap=skully
-compile.keyboard=clueboard/66_hotswap/gen1
-default.keymap: None -> default
-compile.keymap: skully -> None
-Ψ Wrote configuration to '/Users/example/Library/Application Support/qmk/qmk.ini'
-```
-
-# Options de configuration utilisateur
-
-| Clé | Valeur par défaut | Description |
-|-----|---------------|-------------|
-| user.keyboard | None | Le chemin d'accès vers le clavier (Exemple: `clueboard/66/rev4`) |
-| user.keymap | None | Le nom de la keymap (Exemple: `default`) |
-| user.name | None | Le nom d'utilisateur GitHub de l'utilisateur. |
-
-# Toutes les options de configuration
-
-| Clé | Valeur par défaut | Description |
-|-----|---------------|-------------|
-| compile.keyboard | None | Le chemin d'accès vers le clavier (Exemple: `clueboard/66/rev4`) |
-| compile.keymap | None | Le nom de la keymap (Exemple: `default`) |
-| hello.name | None | Le nom à saluer lorsque démarré. |
-| new_keyboard.keyboard | None | Le chemin d'accès vers le clavier (Exemple: `clueboard/66/rev4`) |
-| new_keyboard.keymap | None | Le nom de la keymap (Example: `default`) |
diff --git a/docs/fr-fr/contributing.md b/docs/fr-fr/contributing.md
deleted file mode 100644
index d135871055..0000000000
--- a/docs/fr-fr/contributing.md
+++ /dev/null
@@ -1,154 +0,0 @@
-# Comment contribuer
-
-👍🎉 Premièrement, merci de prendre le temps de lire ceci et de contribuer! 🎉👍
-
-Les contributions de tiers nous aide à améliorer et faire grandir QMK. Nous voulons rendre les pull requests et le processus de contribution utile et simple à la fois pour les contributeurs et les mainteneurs. C'est pourquoi nous avons mis en places des directives pour les contributeurs afin que votre pull request puisse être accepté sans changement majeur.
-
-* [Aperçu du projet](#project-overview)
-* [Conventions de codage](#coding-conventions)
-* [Directives générales](#general-guidelines)
-* [Que veut dire le code de conduite pour moi?](#what-does-the-code-of-conduct-mean-for-me)
-
-## Je ne veux pas lire tout ce pavé! J'ai juste une question!
-
-Si vous voulez poser une question sur QMK, vous pouvez le faire sur le [sous-reddit OLKB](https://reddit.com/r/olkb) ou sur [Discord](https://discord.gg/Uq7gcHh).
-
-Merci de garder ceci en tête:
-
-* Cela peut prendre plusieurs heures pour que quelqu'un réponde à votre question. Merci d'être patient!
-* Tous ceux impliqués avec QMK fait don de son temps et de son énergie. Nous ne sommes pas payés pour travailler sur ou répondre aux questions concernant QMK.
-* Essayez de poser vos questions de manière à ce qu'elles soient le plus simple à répondre possible. Si vous n'êtes pas sûrs de savoir comment faire, voici quelques bon guides (en anglais):
-  * https://opensource.com/life/16/10/how-ask-technical-questions
-  * http://www.catb.org/esr/faqs/smart-questions.html
-
-# Aperçu du projet
-
-QMK est majoritairement écrit en C, avec quelques fonctions et parties spécifiques écrites en C++. Il est destiné aux processeurs intégrés que l'on trouve dans des clavier, particulièrement AVR ([LUFA](https://www.fourwalledcubicle.com/LUFA.php)) et ARM ([ChibiOS](https://www.chibios.org)). Si vous maîtrisez déjà la programmation sur Arduino, vous trouverez beaucoup de concepts et de limitations familiers. Une expérience préalable avec les Arduino n'est pas nécessaire à contribuer avec succès à QMK.
-
-<!-- FIXME: We should include a list of resources for learning C here. -->
-
-# Où trouver de l'aide?
-
-Si vous avez besoin d'aide, vous pouvez [ouvrir une issue](https://github.com/qmk/qmk_firmware/issues) ou [un chat sur Discord](https://discord.gg/Uq7gcHh).
-
-# Comment contribuer?
-
-Vous n'avez encore jamais contribué à un projet open source? Vous vous demandez comment les contributions dans QMK fonctionnent? Voici un aperçu rapide!
-
-0. Enregistrez-vous sur [GitHub](https://github.com).
-1. Définissez une keymap à contribuer, [trouvez une issue](https://github.com/qmk/qmk_firmware/issues) que vous souhaitez corriger, ou [une fonction](https://github.com/qmk/qmk_firmware/issues?q=is%3Aopen+is%3Aissue+label%3Afeature) que vous voulez ajouter.
-2. Créez un fork sur le dépôt associé avec une issue sur votre compte GitHub. Cela veut dire que vous allez avoir une copie du dépôt sous `votre-login-GitHub/qmk_firmware`.
-3. Clonez le dépôt sur votre machine locale en utilisant `git clone https://github.com/login-github/repository-name.git`.
-4. Si vous travaillez sur une nouvelle fonctionnalité, pensez à ouvrir une issue pour parler avec nous du travail que vous souhaitez démarrer.
-5. Créez une nouvelle branche pour votre correctif en utilisant `git checkout -b nom-de-branche`.
-6. Faites les changements nécessaires pour corriger le problème ou ajouter la fonctionnalité.
-7. Utilisez `git add chemin-de-fichier` pour ajouter les contenus des fichiers modifiés au "snapshot" que git utilise pour gérer l'état du projet, appelé aussi l'index.
-8. Utilisez `git commit -m "Insérez une description courte des changements (en anglais)"` pour enregistrer le contenu de l'index avec un message descriptif.
-9. Poussez les changements vers votre dépôt sur GitHub en utilisant `git push origin nom-de-branche`.
-10. Créez un pull request sur [QMK Firmware](https://github.com/qmk/qmk_firmware/pull/new/master).
-11. Donnez un titre à votre pull request en utilisant une description courte des changements que vous avez fait et ajoutez le numéro de l'issue ou du bug associé avec votre changement. Les commentaires de PR devraient se faire en anglais de préférence. Par exemple, vous pouvez utiliser un titre tel que celui-là: "Added more log outputting to resolve #4352".
-12. Dans la description du pull request, expliquez les changements que vous avez fait et tous les problèmes qui existent, selon vous, sur le pull request que vous avez fait. Vous pouvez aussi utiliser la description pour poser des questions au mainteneur. Il n'est pas nécessaire que votre pull request soit parfait (aucun pull request ne l'est), le reviewer sera là pour vous aider à résoudre les problèmes et l'améliorer!
-13. Attendez que le pull request soit revu par un mainteneur.
-14. Faites des changements au pull request si le mainteneur le recommande.
-15. Célébrez votre succès une fois votre pull request fusionné!
-
-# Conventions de codage
-
-La grande majorité de notre style est plutôt simple à comprendre. Si vous connaissez C ou Python, vous ne devriez pas avoir trop de difficulté avec notre style.
-
-* [Conventions de codage - C](coding_conventions_c.md)
-* [Conventions de codage - Python](coding_conventions_python.md)
-
-# Directives générales
-
-Nous avons un certain nombre de type de changements dans QMK, chacun nécessitant un niveau de rigueur différent. Nous voulons que vous gardiez les directives suivantes en tête quel que soit le changement que vous êtes en train de faire.
-
-* Séparez les PR dans des unités logiques. Par exemple, ne soumettez pas un PR qui couvre deux fonctionnalités séparées, soumettez plutôt un PR pour chaque fonctionnalité.
-* Vérifiez les espaces blancs non nécessaires avec `git diff --check` avant de commit.
-* Assurez-vous que votre code compile.
-  * Keymaps: Assurez-vous que `make keyboard:your_new_keymap` ne renvoie pas d'erreur.
-  * Claviers: Assurez-vous que `make keyboard:all` ne renvoie pas d'erreur.
-  * Core: Assurez-vous que `make all` ne renvoie pas d'erreur.
-* Assurez-vous que les messages de commit soient compréhensibles d'eux-mêmes. Vous devriez écrire une description simple (pas plus de 70 caractères) sur la première ligne, suivi d'une ligne vide, suivi d'un détail de votre commit, si nécessaire. Exemple:
-
-```
-Adjust the fronzlebop for the kerpleplork
-
-The kerpleplork was intermittently failing with error code 23. The root cause was the fronzlebop setting, which causes the kerpleplork to activate every N iterations.
-
-Limited experimentation on the devices I have available shows that 7 is high enough to avoid confusing the kerpleplork, but I'd like to get some feedback from people with ARM devices to be sure.
-```
-
-## Documentation
-
-La documentation est l'une des manières les plus simples de démarrer la contribution sur QMK. Il est simple de trouver des endroits où la documentation est fausse ou incomplète, et il est tout aussi simple de la corriger! Nous avons aussi grandement besoin de quelqu'un pour éditer notre documentation, donc si vous avez des compétences en édition mais que vous n'êtes pas sûr de savoir où aller, n'hésitez pas [demandez de l'aide](#where-can-i-go-for-help)!
-
-Vous trouverez toute notre documentation dans le répertoire `qmk_firmware/docs`, ou si vous préférez utiliser des outils web, vous pouvez cliquer sur le bouton "Suggest An Edit" en haut de chaque page sur https://docs.qmk.fm/.
-
-Lorsque vous donnez des exemples de code dans la documentation, essayez de suivre les conventions de nommage utilisées ailleurs dans la documentation. Par exemple, standardisez les enums en utilisant `my_layers` ou `my_keycodes` afin de garder une consistance:
-
-```c
-enum my_layers {
-  _FIRST_LAYER,
-  _SECOND_LAYER
-};
-
-enum my_keycodes {
-  FIRST_LAYER = SAFE_RANGE,
-  SECOND_LAYER
-};
-```
-
-## Keymaps
-
-La plupart des contributeurs débutants démarrent avec leurs keymaps personnelles. Nous essayons de garder les standards pour les keymaps pluôt simple (les keymaps reflètent, après tout, la personnalité de leurs créateurs) mais nous demandons que vous suiviez les directives suivantes afin que d'autres puissent découvrir et apprendre de votre keymap.
-
-* Ecrivez un fichier `readme.md` en utilisant [la template](documentation_templates.md).
-* Tous les PR de keymaps doivent être "squashés", donc si la manière dont vos commits sont squashés vous est important, vous devez le faire vous-même.
-* Ne regroupez pas des fonctionnalités avec votre PR de keymap. Envoyez d'abord votre fonctionnalité, puis créez un second PR pour la keymap.
-* N'incluez pas de fichier `Makefile` dans votre dossier de keymap (ils ne sont plus utilisés)
-* Mettez à jour les copyrights dans les en-têtes de fichiers (cherchez `%YOUR_NAME%`)
-
-## Claviers
-
-Les claviers sont la raison d'être de QMK. Certains claviers sont maintenus par la communauté, alors que d'autre sont maintenus par les gens responsables de la création du clavier. Le fichier `readme.md` devrait vous informer de qui maintient le clavier. Si vous avez des questions concernant un clavier en particulier, vous pouvez [Ouvrir une issue](https://github.com/qmk/qmk_firmware/issues) et tagger le mainteneur dans votre question.
-
-Nous vous demandons aussi que vous suiviez ces directives:
-
-* Ecrivez un fichier `readme.md` en utilisant [le template](documentation_templates.md).
-* Gardez un nombre de commits raisonnable, ou nous squasherons votre PR.
-* Ne regroupez pas des fonctionnalités avec le PR pour votre clavier. Envoyez d'abord votre fonctionnalité, puis créez un second PR pour le clavier.
-* Appelez les fichiers `.c`/`.h` du nom du dossier parent, par exemple `/keyboards/<kb1>/<kb2>/<kb2>.[ch]`
-* N'incluez pas de fichier `Makefile` dans votre dossier de keymap (ils ne sont plus utilisés)
-* Mettez à jour les copyrights dans les en-têtes de fichiers (cherchez `%YOUR_NAME%`)
-
-## Quantum/TMK Core
-
-Faites attention d'être sûr d'implémenter votre nouvelle fonctionnalité de la meilleure manière qu'il soit avant d'investir beaucoup de travail à son développement. Vous pouvez apprendre les bases de QMK en lisant [Comprendre QMK](understanding_qmk.md), qui vous donnera une idée du flux du programme QMK. A partir de là, parlez nous afin de définir la meilleure façon d'implémenter votre idée. Il y a deux façons principale de le faire:
-
-* [Chat sur Discord](https://discord.gg/Uq7gcHh)
-* [Ouvrir une Issue](https://github.com/qmk/qmk_firmware/issues/new)
-
-Les PR de nouvelles fonctionnalités de de correction de bug affectent tous les claviers. Nous sommes aussi dans un processus de restructuration de QMK. Pour cette raison, il est absolument nécessaire que tout changement important ou significatif soit discuté avant que l'implémentation soit faite. Si vous ouvrez un PR sans nous avoir parlé, préparez-vous à faire des refontes significatives si vos changements ne sont pas compatibles avec ce que nous avons planifié.
-
-Voici quelques choses à garder en tête lorsque vous travaillez sur une fonctionnalité ou un bug fix.
-
-* **Désactivé par défaut** - la mémoire est plutôt limitée sur la plupart des puces que QMK supporte, et il est important que les keymaps courantes ne soient pas cassées. S'il vous plaît faites que vos features doivent être **activées** plutôt que désactivées. Si vous pensez qu'elle devrait être activée par défaut, ou que cela réduit la taille du code, parlez-nous-en.
-* **Compilez localement avant de soumettre** - Cela devrait aller sans dire, mais votre code doit compiler! Vous devriez toujours faire gaffe à ce que vos changements compilent avant d'ouvrir une pull request.
-* **Faites attention aux révisions et différentes bases de puces** - beaucoup de claviers ont des révisions qui permettent des changements de configuration mineurs, voir des bases de chip différentes. Essayez de faire que votre fonctionnalité soit supportée à la fois sur ARM et AVR, ou désactivez-là automatiquement sur les plateformes non supportées.
-* **Expliquez votre fonctionnalité** - Documentez-là dans `docs/`, soit dans un nouveau fichier, ou dans une partie d'un fichier existant. Si vous ne la documentez pas, personne ne pourra bénéficier de votre dur labeur.
-
-Nous vous demandons aussi de suivre ces directives:
-
-* Gardez un nombre de commits raisonnable, ou nous squasherons votre PR.
-* Ne regroupez pas des claviers ou des keymaps avec des changements core. Soumettez vos changements core en premier.
-* Ecrivez des [Tests Unitaires](unit_testing.md) pour votre fonctionnalité.
-* Suivez le style du fichier que vous modifiez. Si le style n'est pas clair ou qu'il y a un mélange de fichiers, vous devriez vous conformer aux [conventions de codage](#coding-conventions) au dessus.
-
-## Refactoriser
-
-Afin de maintenir une vision claire sur comment les choses sont architectuées dans QMK, nous essayons de planifier des refactorisations en profondeur et qu'un collaborateur fasse le changement. Si vous avez une idée de refactorisation, ou une suggestion, [ouvrez une issue] [open an issue](https://github.com/qmk/qmk_firmware/issues), nous adorons discuter de comment améliorer QMK.
-
-# Que veut dire le code de conduite pour moi?
-
-Note [Code De Conduite](https://github.com/qmk/qmk_firmware/blob/master/CODE_OF_CONDUCT.md) veut dire que vous avez la responsabilité de traiter tout le monde dans le projet avec respect et courtoisie, peu importe leur identité. Si vous êtes victime d'une attitude ou de commentaires inappropriés, tels que décrit dans notre Code de Conduite, nous sommes là pour vous et nous ferons de notre mieux pour nous assurer que le fautif soit réprimandé, tel que décrit dans notre code.
diff --git a/docs/fr-fr/driver_installation_zadig.md b/docs/fr-fr/driver_installation_zadig.md
deleted file mode 100644
index 35beefa3c9..0000000000
--- a/docs/fr-fr/driver_installation_zadig.md
+++ /dev/null
@@ -1,46 +0,0 @@
-# Installation du driver du bootloader avec Zadig
-
-Vous n’aurez pas besoin de pilote particulier pour utiliser un clavier QMK. En effet, QMK  se présente à l'ordinateur hôte comme un clavier HID standard et sera reconnu sans problème. Cependant vous aurez peut-être besoin d'un pilote pour flasher votre clavier avec Windows. En effet, quand vous redémarrerez votre clavier en mode bootloader, le périphérique que détectera Windows ne sera pas un clavier mais un périphérique bootloader.
-
-Il existe deux exceptions : le bootloader Caterina, qui se trouve en général sur les Pro Micros, et le bootloader Halfkay, livré avec les Teensy de PJRC. Ils apparaissent respectivement sous la forme d'un port série et d'un périphérique HID générique, ne nécessitant pas de pilote particulier.
-
-Nous vous recommandons d'utiliser l'utilitaire [Zadig](https://zadig.akeo.ie/). Si vous avez configuré votre environnement de développement avec Msys2 ou WSL, le script `qmk_install.sh` vous aura proposé l'installation des pilotes durant le processus.
-
-## Installation
-
-Passez votre clavier en mode bootloader, soit en appuyant sur le keycode `RESET` (qui peut se trouver dans un calque différent) ou en appuyant sur le bouton reset qui se trouve en général sous la board. Si votre clavier n'a aucune de ces options, essayez de le brancher en maintenant Escape ou Espace+`B` appuyés (voir la documentation de [Bootmagic](feature_bootmagic.md) pour plus de détails). Certaines boards utilisent [Command](feature_command.md) à la place de Bootmagic. Dans ce cas, vous pouvez entrer en mode bootloader en appuyant, à n'importe quel moment lorsque le clavier est branché, sur les combinaisons de touches Shift Gauche+Shift Droit+`B` ou Shift Gauche+Shift Droit+Escape.
-Certains claviers ont des instructions spécifiques pour passer en mode bootloader. Par exemple, la touche [Bootmagic Lite]](feature_bootmagic.md#bootmagic-lite) (défaut: Échap) peut être sur une touche différente telle que Contrôle Gauche. La combinaison pour la Command (défaut: Shift Gauche+Shift Droit) peut être différente, par exemple Contrôle Gauche+Contrôle Droit. Référez-vous au fichier README de votre clavier.
-
-Pour mettre un clavier en mode bootloader avec USBaspLoader, appuyez sur le bouton `RESET` tout en maintenant le bouton `BOOT`. Vous pouvez aussi maintenir le bouton `BOOT` en branchant le câble USB.
-
-Zadig détectera automatiquement les périphériques en mode bootloader. Il se peut toutefois que vous deviez vérifier en passant par  **Options → List All Devices**.
-
-
- - Pour les claviers avec des MCUs Atmel AVR, le bootloader aura un nom similaire à `ATm32U4DFU`, et un Vendor ID `03EB`.
- - Les bootloaders USBasp s'appelleront `USBasp`, avec un VID/PID `16C0:05DC`.
- - Les claviers AVR flashé avec le bootloader QMK-DFU s'appelleront `<nom du clavier> Bootloader` et auront aussi le VID `03EB`.
- - Pour la plupart des claviers ARM, ils s'appelleront `STM32 BOOTLOADER`, et auront un VID/PID `0483:DF11`.
-
-!> Si Zadig affiche certains de vos périphériques avec le driver `HidUsb`, votre clavier n'est probablement pas en mode bootloader. La flèche aura une couleur orange et vous aurez un message de confirmation vous demandant de modifier un pilote système. **Ne continuez pas!**
-
-Si la flèche apparaît en vert, sélectionnez le driver et appuyez sur le bouton **Install Driver**. Le driver `libusb-win32` devrait normalement fonctionner pour AVR, et `WinUSB` pour ARM. Si vous avez des problèmes pour flasher la board, essayez d'installer un pilote différent de la liste. Pour flasher un périphérique USBaspLoader en ligne de commande avec msys2, le driver `libusbk` est recommandé, sinon `libusb-win32` devrait fonctionner correctement si vous utilisez QMK Toolbox pour flasher.
-
-![Zadig montrant un driver de bootloader installé correctement](https://i.imgur.com/b8VgXzx.png)
-
-Finalement, débranchez et rebranchez le clavier afin de vous assurer que le nouveau pilote a bien été chargé. Si vous utilisez QMK Toolbox pour flasher, redémarrez-le aussi, il arrive qu'il n'arrive pas à détecter le changement de driver.
-
-## Récupérer l'installation du mauvais périphérique
-
-Si vous n'arrivez plus à saisir de texte avec le clavier, il est possible que vous ayez installé le driver sur le clavier au lieu du bootloader. Vous pouvez facilement vérifier ceci dans Zadig. Un clavier fonctionnel a le pilote `HidUsb` installé sur toutes ses interfaces :
-
-![Un clavier fonctionnel vu par Zadig](https://i.imgur.com/Hx0E5kC.png)
-
-Ouvrez le Gestionnaire de périphériques et cherchez un périphérique qui ressemble à votre clavier.
-
-![La board avec le mauvais driver installé, dans le Gestionnaire de périphériques](https://i.imgur.com/L3wvX8f.png)
-
-Cliquez dessus avec le bouton droit et sélectionner **Désinstaller le périphérique**. Faites bien attention à sélectionner **Supprimer le pilote pour ce périphérique** avant de valider.
-
-![Le dialogue Suppression de périphérique, avec la boîte "suppression de pilote" cochée](https://i.imgur.com/aEs2RuA.png)
-
-Appuyez sur **Action → Analyser les changements de hardware**. A ce stade, vous devriez pouvoir saisir à nouveau. Vérifiez dans Zadig que les périphériques utilisent bien le pilote `HidUsb`. Si c'est le cas, vous avez corrigé le problème, votre clavier devrait fonctionner à nouveau!
diff --git a/docs/fr-fr/faq.md b/docs/fr-fr/faq.md
deleted file mode 100644
index 89576b3cc2..0000000000
--- a/docs/fr-fr/faq.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Foire Aux Questions
-
-* [FAQ Générale](faq_general.md)
-* [Construire ou Compiler QMK](faq_build.md)
-* [Débuguer et Dépanner QMK](faq_debug.md)
-* [Keymap (disposition)](faq_keymap.md)
diff --git a/docs/fr-fr/faq_build.md b/docs/fr-fr/faq_build.md
deleted file mode 100644
index c6a3253530..0000000000
--- a/docs/fr-fr/faq_build.md
+++ /dev/null
@@ -1,154 +0,0 @@
-# Foire aux questions sur la compilation
-
-Cette page couvre les questions concernant la compilation de QMK. Si vous ne l'avez pas encore fait, vous devriez lire les guides [Configuration de l'environnement de build](getting_started_build_tools.md) et [Instructions pour Make](getting_started_make_guide.md).
-
-## Je ne peux pas programmer sous Linux
-
-Vous aurez besoin des permissions appropriées pour utiliser un périphérique. Pour les utilisateurs de Linux, référez-vous aux instructions concernant les règles `udev` ci-dessous. Si `udev` vous pose des problèmes, une alternative est d'utiliser la commande `sudo`. Si vous ne connaissez pas cette commande, référez-vous à son manuel d'utilisation en utilisant `man sudo` ou [regardez cette page](https://linux.die.net/man/8/sudo).
-
-Un exemple utilisant `sudo`, lorsque votre contrôleur est un ATMega32u4 :
-
-    $ sudo dfu-programmer atmega32u4 erase --force
-    $ sudo dfu-programmer atmega32u4 flash your.hex
-    $ sudo dfu-programmer atmega32u4 reset
-
-ou simplement :
-
-    $ sudo make <keyboard>:<keymap>:dfu
-
-Veuillez noter que lancer `make` avec `sudo` est généralement une **mauvaise** idée, et vous devriez préférer une des méthodes précédente, si possible.
-
-### Règles `udev` pour Linux
-
-Sous Linux, vous aurez besoin des permissions appropriées pour accéder au MCU (le micro-contrôleur). Vous avez le choix d'utiliser `sudo` en flashant le firmware, ou placer ces fichiers dans `/etc/udev/rules.d`. Une fois ajouté, lancez les commandes suivantes:
-
-```console
-sudo udevadm control --reload-rules
-sudo udevadm trigger
-```
-
-**/etc/udev/rules.d/50-atmel-dfu.rules:**
-```
-# Atmel ATMega32U4
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff4", MODE:="0666"
-# Atmel USBKEY AT90USB1287
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffb", MODE:="0666"
-# Atmel ATMega32U2
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff0", MODE:="0666"
-```
-
-**/etc/udev/rules.d/52-tmk-keyboard.rules:**
-```
-# tmk keyboard products     https://github.com/tmk/tmk_keyboard
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="feed", MODE:="0666"
-```
-
-**/etc/udev/rules.d/54-input-club-keyboard.rules:**
-
-```
-# Input Club keyboard bootloader
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1c11", MODE:="0666"
-```
-
-**/etc/udev/rules.d/55-catalina.rules:**
-```
-# ModemManager should ignore the following devices
-ATTRS{idVendor}=="2a03", ENV{ID_MM_DEVICE_IGNORE}="1"
-ATTRS{idVendor}=="2341", ENV{ID_MM_DEVICE_IGNORE}="1"
-```
-
-**Note:** Le filtrage utilisant ModemManager fonctionnera uniquement si vous n'êtes pas en mode strict. Les commandes suivantes peuvent changer cette option :
-
-```console
-sudo sed -i 's/--filter-policy=strict/--filter-policy=default/' /lib/systemd/system/ModemManager.service
-sudo systemctl daemon-reload
-sudo systemctl restart ModemManager
-```
-
-**/etc/udev/rules.d/56-dfu-util.rules:**
-
-```
-# stm32duino
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1eaf", ATTRS{idProduct}=="0003", MODE:="0666"
-# Generic stm32
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", MODE:="0666"
-```
-
-### Le périphérique sériel n'est pas détecté en mode bootloader sous Linux
-
-Assurez-vous que votre kernel ait un support approprié pour votre périphérique. Si votre périphérique utilise USB ACM, par exemple pour les Pro Micro (AtMega32u4), assurez-vous d'inclure `CONFIG_USB_ACM=y`. D'autres périphériques peuvent avoir besoin de `USB_SERIAL` et de ses sous-options.
-
-## Périphérique inconnu pour le bootloader DFU
-
-Les problèmes rencontrés lorsque l'on flash des claviers sous Windows sont, la plupart du temps, dus à une installation du mauvais pilote, ou un pilote manquant.
-
-Relancer le script d'installation de QMK (`./util/qmk_install.sh` situé dans répertoire `qmk_firmware`sous MSYS2 ou WSL) ou réinstaller la QMK Toolbox peut résoudre le problème. Une alternative est de télécharger et lancer manuellement le package [`qmk_driver_installer`](https://github.com/qmk/qmk_driver_installer).
-
-Si vous rencontrez toujours des problèmes, essayez de télécharger et lancer Zadig. Voir [Installation du driver du bootloader avec Zadig](driver_installation_zadig.md) pour plus d'informations.
-
-## USB VID et PID
-
-Vous pouvez utiliser l'ID de votre choix en modifier `config.h`. Il y a peu de chance de conflit avec d'autres produits.
-
-La plupart des boards QMK utilisent `0xFEED` comme vendor ID. Vérifiez les autres claviers pour être sûr de choisir un Product ID unique.
-
-Étudiez aussi ce ticket
-https://github.com/tmk/tmk_keyboard/issues/150
-
-Vous pouvez acheter un VID:PID unique ici. Je ne pense pas que ce soit nécessaire pour un usage personnel.
-- https://www.obdev.at/products/vusb/license.html
-- https://www.mcselec.com/index.php?page=shop.product_details&flypage=shop.flypage&product_id=92&option=com_phpshop&Itemid=1
-
-## BOOTLOADER_SIZE pour AVR
-
-Notez que la taille du bootloader pour les Teensy2.0++ est de 2048bytes. Quelques Makefiles peuvent contenir une erreur et avoir le mauvais commentaire.
-
-```
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 2048
-#   Atmel DFU loader 4096       (TMK Alt Controller)
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=2048
-```
-
-## `avr-gcc: internal compiler error: Abort trap: 6 (program cc1)` sous MacOS
-
-C'est un problème de mise à jour avec brew, causée par des liens symboliques (symlinks) dont dépend avr-gcc qui sont détruits.
-
-La solution est de supprimer et réinstaller tous les modules affectés.
-
-```
-brew rm avr-gcc
-brew rm dfu-programmer
-brew rm dfu-util
-brew rm gcc-arm-none-eabi
-brew rm avrdude
-brew install avr-gcc
-brew install dfu-programmer
-brew install dfu-util
-brew install gcc-arm-none-eabi
-brew install avrdude
-```
-
-### avr-gcc 8.1 et LUFA
-
-Si vous avez mis à jour votre avr-gcc au-dessus de la version 7, vous risquez de voir des erreurs impliquant LUA. Par exemple :
-
-`lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h:380:5: error: 'const' attribute on function returning 'void'`
-
-Pour le moment, vous devrez revenir à la version 7 de avr-gcc dans brew.
-
-```
-brew uninstall --force avr-gcc
-brew install avr-gcc@8
-brew link --force avr-gcc@8
-```
-
-### Je viens de flasher mon clavier et il ne fait rien/l'appui des touches n'est pas enregistré - c'est aussi un ARM(rev6 plank, clueboard 60, hs60v2, etc.) (Février 2019)
-
-A cause de la manière dont les EEPROM fonctionnent sur les puces ARM, les options sauvegardées peuvent ne plus être valides. Ceci affecte les calques par défaut et *peut*, sous certaines conditions que nous essayons encore de déterminer, rendre le clavier inutilisable. Réinitialiser l'EEPROM corrigera le problème.
-
-[Réinitialiser EEPROM sur Planck rev6](https://cdn.discordapp.com/attachments/473506116718952450/539284620861243409/planck_rev6_default.bin) peut être utilisé pour forcer une réinitialisation d'EEPROM. Une fois cette image flashée, flashez à nouveau votre firmware standard. Cela devrait rétablir le fonctionnement de votre clavier.
-Si bootmagic est activé dans n'importe quel forme, vous devriez être capable de faire aussi ceci (regardez  [Documentation Bootmagic](feature_bootmagic.md) et les informations spécifiques à votre clavier).
diff --git a/docs/fr-fr/faq_debug.md b/docs/fr-fr/faq_debug.md
deleted file mode 100644
index 8868744f73..0000000000
--- a/docs/fr-fr/faq_debug.md
+++ /dev/null
@@ -1,153 +0,0 @@
-# FAQ Débugage
-
-Cette page détaille diverses questions fréquemment posées par les utilisateurs sur le dépannage de leurs claviers.
-
-# Console de débugage
-
-## `hid_listen` ne reconnaît pas de périphérique
-
-Lorsque la console de débugage sur votre périphérique n'est pas prêt, vous obtiendrez un message similaire:
-
-```
-Waiting for device:.........
-```
-
-Une fois le périphérique connecté, *hid_listen* le trouve et vous obtiendrez ce message:
-
-```
-Waiting for new device:.........................
-Listening:
-```
-
-Si vous ne recevez pas ce message `Listening:`, essayez de compiler avec `CONSOLE_ENABLE=yes` dans le [Makefile]
-
-Il se peut que vous ayez besoin de certains privilèges avancés pour accéder à des périphériques sur des OS comme Linux.
-
-- Essayez `sudo hid_listen`
-
-## Ne reçoit pas de messages sur la console
-
-Vérifiez :
-
-- *hid_listen* trouve votre périphérique. Voir ci-dessus.
-- Activez le débugage en appuyant sur **Magic**+d. Voir [Commandes Magic](https://github.com/tmk/tmk_keyboard#magic-commands).
-- Définissez `debug_enable=true` en général dans `matrix_init()` du fichier **matrix.c**.
-- Essayez d'utiliser la fonction `print` à la place du debug print. Voir **common/print.h**.
-- Déconnectez tous les autres périphériques qui utilisent la fonction console. Voir [Issue #97](https://github.com/tmk/tmk_keyboard/issues/97).
-
-## Linux ou les systèmes UNIX nécessitent des privilèges super utilisateur
-
-Utilisez `sudo` pour exécuter *hid_listen* avec des privilèges étendus.
-
-```
-$ sudo hid_listen
-```
-
-Ou ajoutez une *udev rule* pour les périphériques TMK en plaçant un fichier dans le répertoire rules. Le chemin vers ce répertoire peut varier en fonction du système.
-
-Fichier: /etc/udev/rules.d/52-tmk-keyboard.rules(sous Ubuntu)
-```
-# tmk keyboard products     https://github.com/tmk/tmk_keyboard
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="feed", MODE:="0666"
-```
-
-***
-
-# Divers
-
-## Considérations de sécurité
-
-Vous ne voulez probablement pas "briquer" votre clavier, rendre impossible d'écrire un firmware dessus. Il y a quelques paramètres qui montrent ce qui est (et n'est probablement pas) trop risqué.
-
-- Si votre map de clavier n'inclut pas de RESET, pour entrer en mode DFU, vous devrez appuyer sur le bouton reset du PCB. Cela implique que vous devrez certainement dévisser certaines pièces de votre clavier pour y accéder.
-- Modifier les fichiers tmk_core / common peut rendre le clavier inutilisable
-- Si un fichier .hex trop large est la cause du problème: `make dfu` supprime le bloc puis teste la taille (il ne fait pas les choses dans le bon ordre), ce qui provoque une erreur. En résultat, le flash n’aura pas été fait et le clavier restera en mode DFU.
-- Pour finir, notez que la taille maximale d'un fichier .hex sur un Plank est de 7000h (28672 decimal)
-
-```
-Linking: .build/planck_rev4_cbbrowne.elf                                                            [OK]
-Creating load file for Flash: .build/planck_rev4_cbbrowne.hex                                       [OK]
-
-Size after:
-   text    data     bss     dec     hex filename
-      0   22396       0   22396    577c planck_rev4_cbbrowne.hex
-```
-
-- La taille du fichier ci-dessus est de 22396/577ch, ce qui est en dessous de 28672/7000h
-- Tant que vous avez un fichier .hex alternatif correct, vous pouvez réessayer en le chargeant
-- Certaines options que vous pouvez spécifier dans votre Makefile consomme de la mémoire supplémentaire. Faites attention aux options BOOTMAGIC_ENABLE, MOUSEKEY_ENABLE, EXTRAKEY_ENABLE, CONSOLE_ENABLE, API_SYSEX_ENABLE.
-- Les outils DFU **ne** vous permettent **pas** d'écrire dans le bootloader (à moins que vous n'ajoutiez des options spéciales), il n'y a donc peu de risque.
-- Les EEPROM ont environ 100000 cycles d'écriture. Ne réécrivez pas le firmware de manière continue et répétée. Vous allez détruire définitivement l'EEPROM.
-
-## NKRO ne fonctionne pas
-
-Premièrement, vous devez compiler le firmware avec l'option de compilation `NKRO_ENABLE` dans le **Makefile**.
-
-Essayez la commande `Magic` **N** (`LShift+RShift+N` par défaut) si **NKRO** ne fonctionne toujours pas. Vous pouvez utiliser cette commande pour basculer temporairement entre le mode **NKRO** et **6KRO**. Sous certaines conditions, **NKRO** ne fonctionnera pas et vous devrez basculer en **6KRO**, en particulier lorsque vous êtes dans le BIOS.
-
-## Le TrackPoint a besoin Circuit de réinitialisation (Support de souris PS/2)
-
-Sans circuit de réinitialisation vous allez avoir des résultats inconsistants à cause de la mauvaise initialisation du matériel. Regardez le schéma du circuit du TPM754.
-
-- https://geekhack.org/index.php?topic=50176.msg1127447#msg1127447
-- https://www.mikrocontroller.net/attachment/52583/tpm754.pdf
-
-## Impossible de lire la colonne de la matrice après 16
-
-Utilisez `1UL<<16` à la place de `1<<16` dans `read_cols()` du fichier [matrix.h] lorsque le nombre de vos colonnes dépassent 16.
-
-En C, `1` implique un type [int] qui est [16 bits] pour les AVR, ce qui implique que vous ne pouvez pas décaler à gauche de plus de 15. Si vous utilisez `1<<16`, vous aurez un résultat non attendu de zéro. Vous devez donc utiliser un type [unsigned long] en utilisant `1UL`.
-
-https://deskthority.net/workshop-f7/rebuilding-and-redesigning-a-classic-thinkpad-keyboard-t6181-60.html#p146279
-
-## Les touches spéciales ne fonctionnent pas (Touche Système, Touches de contrôle du son)
-
-Vous devez définir `EXTRAKEY_ENABLE` dans le fichier `rules.mk` pour les utiliser dans QMK.
-
-```
-EXTRAKEY_ENABLE = yes          # Audio control and System control
-```
-
-## Réveiller du mode veille ne fonctionne pas
-
-Sous Windows, activez l'option `Permettre au périphérique de sortir l'ordinateur de veille` dans les paramètres des **Options d'alimentations** du **Gestionnaire de périphériques**. Vérifiez aussi les paramètres du BIOS.
-
-Appuyer sur n'importe quelle touche en mode veille devrait sortir l'ordinateur de veille.
-
-## Vous utilisez un Arduino?
-
-**Faites attention au fait que le nommage des pin d'un Arduino diffère de la puce**. Par exemple, la pin `D0` n'est pas `PD0`. Vérifiez le circuit avec la fiche technique.
-
-- https://arduino.cc/en/uploads/Main/arduino-leonardo-schematic_3b.pdf
-- https://arduino.cc/en/uploads/Main/arduino-micro-schematic.pdf
-
-Les Arduino Leonardo et micro ont des **ATMega32U4** et peuvent être utilisés avec TMK, mais le bootloader Arduino peut causer des problèmes.
-
-## Activer JTAG
-
-Par défaut, le débugage des interfaces JTAG est désactivé dès que le clavier démarre. Les MCUs compatible JTAG viennent d'usine avec le fusible `JTAGEN` activé, et il prend certaines pins du MCU que la board pourrait utiliser pour la matrice, les LEDs, etc.
-
-Si vous voulez garder JTAG activé, ajoutez la ligne suivante à votre fichier `config.h` :
-
-```c
-#define NO_JTAG_DISABLE
-```
-
-## Compatibilité USB 3
-
-Il semble que certaines personnes ont eu des problèmes avec les ports USB 3, essayez un port USB 2.
-
-## Compatibilité Mac
-
-### OS X 10.11 et Hub
-
-https://geekhack.org/index.php?topic=14290.msg1884034#msg1884034
-
-## Problème sur BIOS (UEFI) / Resume (Mise en veille et réveil) / Redémarrage
-
-Certaines personnes ont eu des problèmes de fonctionnement de leur clavier dans le BIOS et/ou après des redémarrages.
-
-Pour le moment, l'origine du problème n'est pas comprise, mais certaines options de compilation semble liées. Dans le Makefile, essayez de désactiver les options comme  `CONSOLE_ENABLE`, `NKRO_ENABLE`, `SLEEP_LED_ENABLE` et/ou d'autres.
-
-https://github.com/tmk/tmk_keyboard/issues/266
-https://geekhack.org/index.php?topic=41989.msg1967778#msg1967778
diff --git a/docs/fr-fr/faq_general.md b/docs/fr-fr/faq_general.md
deleted file mode 100644
index b1eae6df16..0000000000
--- a/docs/fr-fr/faq_general.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Questions fréquemment posées
-
-## Qu'est-ce que QMK ?
-
-[QMK](https://github.com/qmk), acronyme pour Quantum Mechanical Keyboard, est un groupe de personnes qui construisent des outils pour des claviers personnalisés. Nous avons commencé par le [firmware QMK](https://github.com/qmk/qmk_firmware), un fork très modifié du firmware [TMK](https://github.com/tmk/tmk_keyboard).
-
-## Quelles sont les différences entre QMK et TMK ?
-
-TMK a été conçu et développé à l'origine par [Jun Wako](https://github.com/tmk). QMK a démarré comme étant le fork de [Jack Humbert](https://github.com/jackhumbert) pour le Planck. Au bout d'un moment, le fork de Jack a divergé de manière significative de TMK et, en 2015, Jack a décidé de le renommer QMK.
-
-D'un point de vue technique, QMK se base sur TMK en lui ajoutant plusieurs nouvelles fonctionnalités.
-QMK a notamment augmenté le nombre de keycodes disponibles et les a utilisé pour implémenter des fonctionnalités avancées telles que `S()`, `LCTL()` et `MO()`. Vous pouvez voir une liste complète de ces keycodes dans [Keycodes] (keycodes.md).
-
-D'un point de vue management de projet et communauté, Hasu, sur TMK maintient tous les claviers supportés officiellement par lui-même, avec un peu de support de la communauté. Il existe ou peuvent être créées d'autres communautés maintenant des fork pour d'autres claviers. Peu de keymaps sont définies par défaut, les utilisateurs ne se partagent donc pas leurs keymaps en général. QMK encourage le partage des claviers et des keymaps à l'aide d'un dépôt géré de manière centrale, acceptant les pull requests qui suivent les standards de qualité. Ceux-ci sont surtout maitenus par la communauté, mais l'équipe de QMK aide aussi lorsque c'est nécessaire.
-
-Les deux approches ont leurs avantages et leurs inconvénients, et le développements de fonctionnalités intéressantes sont partagées entre TMK et QMK lorsque fait sens.
diff --git a/docs/fr-fr/faq_keymap.md b/docs/fr-fr/faq_keymap.md
deleted file mode 100644
index cc0700ab8e..0000000000
--- a/docs/fr-fr/faq_keymap.md
+++ /dev/null
@@ -1,161 +0,0 @@
-# FAQ Keymap
-
-Cette page couvre les questions souvent posées à propos des keymaps. Si vous ne l'avez pas encore fait, vous devriez commencer par là [Aperçu des Keymap](keymap.md).
-
-## Quels Keycodes puis-je utiliser ?
-
-Regardez [Keycodes](keycodes.md) pour une liste des keycodes disponibles. Certains keycodes spécifiques ont des documentations plus complètes de disponible.
-
-Les keycodes sont définies dans [common/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/keycode.h).
-
-## Quels sont les keycodes par défaut ?
-
-Il existe 3 configurations de clavier standard utilisées dans le monde: ANSI, ISO et JIS. L'Amérique du Nord utilise principalement l'ANSI, l'Europe et l'Afrique l'ISO et le Japon utilise JIS. Les autres régions utilisent généralement ANSI ou ISO. Les keycodes correspondant à ces dispositions spécifiques sont affichés ici :
-
-<!-- Source for this image: https://www.keyboard-layout-editor.com/#/gists/bf431647d1001cff5eff20ae55621e9a -->
-![Keyboard Layout Image](https://i.imgur.com/5wsh5wM.png)
-
-## Certaines de mes touches sont permutées ou ne fonctionnent pas
-
-QMK possède deux fonctionnalités, Bootmagic et Command, qui vous permettent de modifier le comportement de votre clavier à la volée. Cela inclut, sans toutefois s'y limiter, l'échange de Ctrl / Majuscules, la désactivation de l'interface graphique, le basculement de Alt/Gui, le basculement de barre d'espacement arrière/barre oblique inversée, la désactivation de toutes les touches et d'autres modifications comportementales.
-
-Pour résoudre rapidement le problème, essayez de maintenir les touches Espace + Retour arrière enfoncées pendant que vous branchez votre clavier. Cela réinitialisera les paramètres stockés sur votre clavier, ramenant ces touches à un fonctionnement normal. Si cela ne fonctionne pas, regardez ici:
-
-* [Bootmagic](feature_bootmagic.md)
-* [Command](feature_command.md)
-
-## La touche de menu ne fonctionne pas
-
-La touche trouvée sur la plupart des claviers modernes située entre `KC_RGUI` et` KC_RCTL` est en réalité appelée `KC_APP`. En effet, lorsque cette touche a été inventée, il existait déjà une clé nommée `MENU` dans les normes correspondantes. MS a donc choisi de l'appeler la touche` APP`.
-
-## `KC_SYSREQ` ne fonctionne pas
-
-Utilisez le keycode pour Print Screen (`KC_PSCREEN` or `KC_PSCR`) à la place de `KC_SYSREQ`. La combinaison de touche 'Alt + Print Screen' est reconnue comme 'System request'.
-
-Voir [issue #168](https://github.com/tmk/tmk_keyboard/issues/168) et
-* https://en.wikipedia.org/wiki/Magic_SysRq_key
-* https://en.wikipedia.org/wiki/System_request
-
-## Les touches alimentation ne fonctionnent pas
-
-Un peu déroutant, il y a deux codes de touche "Alimentation" dans QMK: `KC_POWER` dans la page d'utilisation du clavier / keypad, et `KC_SYSTEM_POWER` (ou `KC_PWR`) dans la page Consumer.
-
-Le premier n'est reconnu que sur macOS, alors que le dernier, `KC_SLEP` et `KC_WAKE` sont supportés par les trois principaux systèmes d'exploitation. Il est donc recommandé de les utiliser à la place. Sous Windows, ces touches prennent effet immédiatement, mais sur macOS, elles doivent être maintenues enfoncées jusqu'à ce qu'une boîte de dialogue apparaisse.
-
-## Modificateur "One Shot"
-
-Cette fonctionnalité permet de corriger un problème avec la touche Shift. En effet, il arrive de saisir plusieurs majuscules en ne voulant en saisir qu'une sur un mot. Ex: `CEtte` à la place de `Cette`. La fonctionnalité «One shot» shift permet de corriger ça.
-
-https://github.com/tmk/tmk_keyboard/issues/67
-
-## Le modificateur d'un calque reste bloqué
-
-Les touches de modification ou les calques peuvent être bloquées si la commutation de calque n'est pas configurée correctement.
-Pour les touches de modification et les actions de calque, vous devez placer `KC_TRANS` sur la même position du calque de destination afin de désenregistrer la clé de modificateur ou de revenir au calque précédent lors de la libération.
-
-* https://github.com/tmk/tmk_core/blob/master/doc/keymap.md#31-momentary-switching
-* https://geekhack.org/index.php?topic=57008.msg1492604#msg1492604
-* https://github.com/tmk/tmk_keyboard/issues/248
-
-## Support de touche à verrouillage mécanique
-
-Cette fonctionnalité permet l'usage de *touches à verrouillage mécanique* comme [ces interrupteurs Alps](https://deskthority.net/wiki/Alps_SKCL_Lock). Vous pouvez l'activer en ajoutant ceci à votre `config.h`:
-
-```
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-```
-
-Une fois la fonction activée, utilisez les keycodes `KC_LCAP`, `KC_LNUM` et `KC_LSCR` dans votre keymap.
-
-Des vieux claviers mécaniques ont parfois des touches à verrouillage, mais les claviers modernes n'en sont pas équipés. ***Vous n'avez pas besoin de cette fonction dans la majorité des cas et devez utiliser les keycodes `KC_CAPS`, `KC_NLCK` et `KC_SLCK`.***
-
-## Ajouter des caractères spéciaux autres que ASCII comme la cédille 'Ç'
-
-Voir la fonctionnalité [Unicode](feature_unicode.md).
-
-## Touche `Fn` sur macOS
-
-Contrairement à la plupart des touches Fn, celle des claviers Apple a son propre code d'activation... en quelque sorte. Il remplace le sixième code d'activation dans un rapport de base 6KRO HID - de sorte qu'un clavier Apple ne contient en réalité que 5KRO.
-
-Il est techniquement possible de demander à QMK d’envoyer ce keycode. Cependant, cela nécessite une modification du format du rapport pour ajouter l'état de la touche Fn.
-Pire encore, ce keycode n'est reconnu que si les identifiants du clavier VID et PID correspondent à ceux d'un vrai clavier Apple. Malheureusement QMK ne peut juridiquement prendre en charge cette fonctionnalité et il y a peu de chance que la situation s'améliore.
-
-Voir [cette issue](https://github.com/qmk/qmk_firmware/issues/2179) pour des informations détaillées.
-
-## Touches Media sous Mac OSX
-
-#### KC_MNXT et KC_MPRV ne fonctionnent pas sous Mac
-
-Utilisez `KC_MFFD`(`KC_MEDIA_FAST_FORWARD`) et `KC_MRWD`(`KC_MEDIA_REWIND`) à la place de `KC_MNXT` et `KC_MPRV`.
-Voir https://github.com/tmk/tmk_keyboard/issues/195
-
-## Touches supportées sous Mac OSX?
-
-Vous pouvez connaître les keycodes supportés par OSX en lisant ce code source.
-
-`usb_2_adb_keymap` contient les tableaux des pages Keyboard/Keypad vers les scancodes ADB (keycodes interne à OSX).
-
-https://opensource.apple.com/source/IOHIDFamily/IOHIDFamily-606.1.7/IOHIDFamily/Cosmo_USB2ADB.c
-
-Et `IOHIDConsumer::dispatchConsumerEvent` s'occupe des utilisations Consumer page.
-
-https://opensource.apple.com/source/IOHIDFamily/IOHIDFamily-606.1.7/IOHIDFamily/IOHIDConsumer.cpp
-
-## Touches JIS dans Mac OSX
-
-Les touches de clavier spécifiques JIS comme `無変換(Muhenkan)`, `変換(Henkan)`, `ひらがな(hiragana)` ne sont pas reconnues par OSX. Vous pouvez utiliser **Seil** pour les activer, esssayez les options suivantes.
-
-* Activer la touche NFER sur clavier PC
-* Activer la touche XFER sur clavier PC
-* Activer la touche KATAKANA sur clavier PC
-
-https://pqrs.org/osx/karabiner/seil.html
-
-## RN-42 Bluetooth ne fonctionne pas avec Karabiner
-
-Karabiner - Outil de Keymapping sous Mac OSX - Ignore les entrées du module RN-42. Vous devez activer cette option pour rendre Karabiner compatible avec votre clavier.
-https://github.com/tekezo/Karabiner/issues/403#issuecomment-102559237
-
-Plus de détails sur ce problème sur les liens suivants.
-https://github.com/tmk/tmk_keyboard/issues/213
-https://github.com/tekezo/Karabiner/issues/403
-
-## Esc et <code>&#96;</code> sur une touche simple.
-
-Cette fonctionnalité permet d'utiliser une touche à la fois comme touche Échap ou une touche  `§` (En Azerty) selon le cas d’utilisation. Cela est très utile sur un clavier de petite taille.
-
-Voir la fonctionnalité [Grave Escape](feature_grave_esc.md).
-
-## Eject sur Mac OSX
-
-Le keycode`KC_EJCT` fonctionne sous OSX. https://github.com/tmk/tmk_keyboard/issues/250
-
-Il semble que Windows 10 ignore le code et Linux/Xorg le reconnaît mais n'a pas de mapping par défaut.
-
-Nous ne sommes pas sûr quel keycode est utilisé pour la touche Eject sur les claviers Apple officiels. HHKB utilise `F20` pour la touche Eject (`Fn+f`) lorsqu'il est en mode Mac, mais ce n'est probablement pas la même chose que le keycode Eject d'Apple.
-
-## Qu'est-ce que `weak_mods` et `real_mods` dans `action_util.c`
-
-___TO BE IMPROVED___
-
-real_mods est prévu pour retenir l'état des touches modificateur réelles/physiques, alors que weak_mods ne retient l'état que des modificateurs temporaires ou virtuels qui ne devraient pas affecter l'état des touches modificaterus réelles.
-
-Par exemple, disons que vous maintenez la touche physique "shift gauche" et tapez ACTION_MODS_KEY(LSHIFT, KC_A),
-
-en weak_mods,
-
-* (1) maintenir shift gauche : real_mods |= MOD_BIT(LSHIFT)
-* (2) appuyer ACTION_MODS_KEY(LSHIFT, KC_A): weak_mods |= MOD_BIT(LSHIFT)
-* (3) lâcher ACTION_MODS_KEY(LSHIFT, KC_A): weak_mods &= ~MOD_BIT(LSHIFT)
-real_mods garde sur état modificateur.
-
-sans weak_mods,
-
-* (1) maintenir shift gauche : real_mods |= MOD_BIT(LSHIFT)
-* (2) appuyer ACTION_MODS_KEY(LSHIFT, KC_A): real_mods |= MOD_BIT(LSHIFT)
-* (3) lâcher ACTION_MODS_KEY(LSHIFT, KC_A): real_mods &= ~MOD_BIT(LSHIFT)
-ici real_mods a perdu son état pour 'shift gauche physique'.
-
-weak_mods est ORed avec real_mods lorsque le rapport du clavier est envoyé.
-https://github.com/tmk/tmk_core/blob/master/common/action_util.c#L57
diff --git a/docs/fr-fr/flashing.md b/docs/fr-fr/flashing.md
deleted file mode 100644
index 9f5493194a..0000000000
--- a/docs/fr-fr/flashing.md
+++ /dev/null
@@ -1,238 +0,0 @@
-# Instructions pour flasher et informations sur les bootloader
-
-Les claviers utilisent différents types de bootloaders et certains doivent être flashés différement. Heureusement, certains projets comme la [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) ont pour objectifs de permettre de flasher les différents bootloader sans trop se faire de soucis et ça peu importe les manières de les flasher.
-
-Si vous avez un bootloader sélectionné avec la variable `BOOTLOADER` dans votre fichier `rules.mk` alors QMK vas automatiquement calculer si votre fichier .hex n'est pas trop grand pour être flashé sur votre appareil, et il affichera la taille finale du firmware. Pour vérifier la taille manuellement, vous pouvez aussi compiler le firmware avec l'option `check-size`. Exemple : `make planck/rev4:default:check-size`.
-
-## DFU
-
-Le bootloader pour les processeurs Atmel DFU est fourni par défaut sur tous les processeurs atmega32u4. Celui-ci est utilisé par beaucoup de claviers plus vieux que les OLKB et Clueboard qui ont leur propre ICs sur leurs PCBs. D'autres claviers utilisent le bootloader DFU de LUFA (ou son fork QMK), notamment les nouveaux claviers OLKB. Ce dernier ajoute des fonctionnalités spécifiques sur le matériel.
-
-Pour vérifier la compatibilité avec le bootloader DFU, vérifiez que ce bloc de code est présent dans votre fichier `rules.mk`. Parfois il peut être inscrit `lufa-dfu` ou `qmk-dfu` à la place.
-
-```make
-# 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
-```
-
-Méthodes de flash compatibles :
-
-* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (interface graphique recommandé)
-* [dfu-programmer](https://github.com/dfu-programmer/dfu-programmer) / `:dfu` avec QMK (outil en ligne de commande recommandé)
-
-Ordre des actions:
-
-1. Pressez le keycode `RESET`, ou appuyez sur le bouton physique RESET ou alors créez un contact entre RST et GND.
-2. Attendez que l'OS detecte l'appareil.
-3. Éffacez la mémoire, cela peut être fait automatiquement.
-4. Flasher le fichier .hex.
-5. Redémarrez l'appareil en mode «application», cela peut être fait automatiquement.
-
-Alternativement:
-
-    make <keyboard>:<keymap>:dfu
-
-### DFU QMK
-
-QMK a un fork du bootloader LUFA DFU qui vous permet de faire un simple scan de la matrice pour quitter le bootloader et retourner à l'application. En même temps que le flash se produira, il est possible de faire flasher un led ou de produire un son via un haut parleur. Pour activer ces fonctionnalités, vous pouvez utiliser ce bloc dans votre fichier `config.h` (La touche permettant de quitter le bootloader a besoin d'être reliée entre les ports définis en INPUT et OUTPUT ici):
-
-    #define QMK_ESC_OUTPUT F1 // usually COL
-    #define QMK_ESC_INPUT D5 // usually ROW
-    #define QMK_LED E6
-    #define QMK_SPEAKER C6
-
-Le fabricant et le nom du produit proviennent de vos définitions dans fichier  `config.h`, et la chaîne de caractère «bootloader» est ajoutée au nom du produit.
-
-Pour génerer le bootloader, utilisez la cible `bootloader`. Exemple: `make planck/rev4:default:bootloader`.
-
-Pour génerer un fichier .hex prêt pour la production qui contiendra tant l'application que le bootloader, utilisez la cible `production`. Exemple: `make planck/rev4:default:production`.
-
-### Commandes DFU
-
-Il y a plusieurs commandes DFU que vous pouvez utiliser pour flasher le firmware sur un appareil DFU.
-
-* `:dfu` - C'est l'option normale qui attend qu'un appareil DFU soit disponible et qui flashe le firmware dès que c'est le cas. La vérification sera faite toutes les 5 secondes.
-* `:dfu-ee` - Cette option flash un fichier `.eep` à la place d'un fichier `.hex`. Ce cas est plutôt rare.
-* `:dfu-split-left` - Cette option flashe le firmware normal comme avec l'option (`:dfu`). Mais cela aussi flash le coté gauche du fichier EEPROM pour les claviers scindés. _C'est l'option idéale pour un clavier scindé basé sur le Elite C_
-* `:dfu-split-right` - Cette option flashe le firmware normal comme avec l'option (`:dfu`).  Mais cela aussi flash le coté droite du fichier EEPROM pour les claviers scindés. _C'est l'option idéale pour un clavier scindé basé sur le Elite C_
-
-## Caterina
-
-Les cartes arduinos et leurs clones utilisent le [bootloader Caterina](https://github.com/arduino/ArduinoCore-avr/tree/master/bootloaders/caterina) (tous les claviers utilisant un Pro Micro, ou un clone). Ils utilisent aussi le protocole avr109 pour communiquer en virtuellement en série (serial en anglais). Les bootloaders comme le [A-Star](https://www.pololu.com/docs/0J61/9) sont basés sur Caterina.
-
-Pour vérifier la compatibilité avec un bootloader Caterina, vérifiez que ce bloc est présent dans votre fichier `rules.mk`:
-
-```make
-# 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
-```
-
-Flashers compatibles:
-
-* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (Interface graphique recommandée)
-* [avrdude](https://www.nongnu.org/avrdude/) avec avr109 / `:avrdude` (Outil en ligne de commande recommandé)
-* [AVRDUDESS](https://github.com/zkemble/AVRDUDESS)
-
-Séquence de flash :
-
-1. Pressez la touche avec le keycode `RESET`, ou reliez les ports GND et RST. Vous n'avez que 7 secondes pour flasher une fois que l'opération a été faite.
-2. Attendez que l'OS détecte l'appareil.
-3. Flasher le fichier .hex.
-4. Attendez que l'appareil redémarre automatiquement.
-
-ou, utilisez:
-
-    make <keyboard>:<keymap>:avrdude
-
-#### Commandes Caterina 
-
-Il existe un certain nombre de commandes DFU que vous pouvez utiliser pour mettre à jour le firmware sur un périphérique DFU:
-
-* `: avrdude` - Il s’agit de l’option normale. Le script va attendre qu’un appareil Caterina soit disponible. Dès que c’est le cas, il flash le firmware. Il attendra de détecter un nouveau port COM pour le flasher.
-* `: avrdude-loop` - Cela fonctionne de la même manière que`: avrdude`, mais une fois que chaque périphérique est flashé, il tentera de flasher à nouveau. Cela peut être utile pour flasher plusieurs claviers à la suite. _Cela implique de sortir manuellement de la boucle en appuyant sur Ctrl + C, Cmd + C ou un raccourci équivalent selon votre OS_
-* `: avrdude-split-left` - Cela fonctionne de la même manière que la fonction (`: avrdude`). Toutefois, cela permet aussi de flasher le coté gauche de l'EEPROM des claviers splittés / divisés. C'est donc la méthode recommandée pour les claviers splittés avec Pro Micro.
-* `: avrdude-split-right` - Cela fonctionne de la même manière que la fonction (`: avrdude`). Toutefois, cela permet aussi de flasher le coté droite de l'EEPROM des claviers splittés / divisés. C'est donc la méthode recommandée pour les claviers splittés avec Pro Micro.
-
-## Halfkay
-
-Halfkay est un protocole ultra-simple développé par PJRC qui utilise HID et qui est fourni avec tous les Teensys après le modèle 2.0.
-
-Pour vérifier la compatibilité avec le booloader Halfkay, vérifiez que ce bloc est présent dans votre fichier `rules.mk`:
-
-```make
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
-BOOTLOADER = halfkay
-```
-
-Flasher compatibles:
-
-* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (Interface graphique recomandée)
-* [Teensy Loader](https://www.pjrc.com/teensy/loader.html) (petit utilitaire ultra simple)
- [Teensy Loader en ligne de commande](https://www.pjrc.com/teensy/loader_cli.html) (Outil en ligne de commande recommandé)
-
-Séquence de flash:
-
-1. Pressez la touche du keycode `RESET`, ou reliez les ports RST et GND rapidement. Vous avez ensuite 7 secondes pour réaliser le flash.
-2. Attendez que l'OS détecte l'appareil.
-3. Flasher le fichier .hex.
-4. Redémarrez l'appareil en mode «application». Cela peut être fait automatiquement.
-
-## USBasploader
-
-USBasploader est un bootloader développé par matrixstorm. Il est utilisé sur des processeurs AVR non-USB comme le ATmega328P, qui fonctionne grâce à V-USB.
-
-Pour vérifier la compatibilité avec le booloader USBasploader, vérifiez que ce bloc est présent dans votre fichier `rules.mk`:
-
-```make
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
-BOOTLOADER = USBasp
-```
-
-Flashers compatibles:
-
-* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (Interface graphique recommandé)
-* [avrdude](https://www.nongnu.org/avrdude/) avec le programmeur `usbasp`.
-* [AVRDUDESS](https://github.com/zkemble/AVRDUDESS)
-
-Séquence de flash:
-
-1. Pressez la touche du keycode `RESET`, ou reliez le port de boot pendant que RST et GND snt reliés. Cela doit être fait très rapidement.
-2. Attendez que l'OS détecte l'appareil.
-3. Flasher le fichier .hex.
-4. Redémarrez l'appareil en mode «application». Cela peut être fait automatiquement.
-
-## BootloadHID
-
-BootloadHID est un bootloader pour les microcontrôleurs AVR. L'utilitaire de téleversement ne demande pas de drivers au niveau du kernel et peut être lancé sans installer aucune DLLs.
-
-Pour vérifier la compatibilité avec le bootloader bootloadHID, vérifiez que ce bloc existe dans votre fichier `rules.mk` :
-
-```make
-# Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
-BOOTLOADER = bootloadHID
-```
-
-Utilitaires de flash compatibles:
-
-* [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash) (Utilitaire avec interface graphique recommandé)
-* [bootloadhid Command Line](https://www.obdev.at/products/vusb/bootloadhid.html) / `:BootloadHID` avec QMK (utilitaire en ligne de commande recommandé)
-
-Séquence de flash
-
-1. Entrez dans le bootloader en utilisant l'une de ces méthodes:
-    * Pressez la touche du keycode `RESET` (Cela ne fonctionnera pas sur certains appareils).
-    * Verrouillez la touche «Salt» tout en branchant le clavier (Généralement ce principe est documenté dans le fichier readme du clavier)
-2. Attendez que l'OS détecte l'appareil.
-3. Flasher le fichier .hex.
-4. Redémarrez l'appareil en mode «application». Cela peut être fait automatiquement.
-
-Ou alors:
-
-    make <keyboard>:<keymap>:bootloadHID
-
-## STM32
-
-Tous les processeurs STM32 contiennent un bootloader installé en usine qui ne peut pas être modifié ou supprimé. Certains processeurs STM32 ont des bootloaders qui ne peuvent pas être programmés par USB (ex: STM32F103) mais le processus reste le même.
-
-Pour le moment, aucune variable `BOOTLOADER` n'est nécessaire dans le fichier `rules.mk`.
-
-Flashers compatibles:
-
-* [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (interface graphique recommandé)
-* [dfu-util](https://github.com/Stefan-Schmidt/dfu-util) / `:dfu-util` (utilitaire en ligne de commande recommandé)
-
-Séquence pour flasher:
-
-1. Entrez dans le bootloader en utilisant l'une de ces méthodes:
-    * Utilisez une touche sur laquelle le keycode `RESET` (Cela peut ne pas fonctionner sur les appareils STM32F042)
-    * Si un circuit de réinitialisation (Reset) est présent alors utilisé le bouton qui lui est dédié.
-    * Autrement, vous devez réaliser une liaison entre BOOT0 et VCC (en appuyant sur le bouton ou à l'aide d'un pont) puis faire un pont entre RESET et GND et enfin relacher le pont BOOT0.
-2. Attendre que l'os détecte l'appareil.
-3. Flasher un fichier `.bin`.h
-    * Vous allez recevoir un avertissement à propos de la signature DFU. Ignorez-la.
-4. Réinitialisez l'appareil en mode «application». Cela peut être fait automatiquement.
-    * Si vous êtes en train de travailler en ligne de commande, par exemple avec un `make planck/rev6:default:dfu-util` alors soyez bien sur que l'argument `:leave` est passé aux arguments DFU grâce à la variable `DFU_ARGS` à l'intérieur de votre fichier `rules.mk` (Ex: `DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave`) afin que votre appareil redémarre après avoir été flashé.
-
-### Commandes STM32
-
-Il y a différentes commandes que vous pouvez utiliser pour flasher un firmware dans un appareil STM32:
-
-* `:dfu-util` - C'est l'option standard pour flasher un appareil STM32. Le script attendra qu'un bootloader STM32 soit présent.
-* `:dfu-util-split-left` - Permet de flasher un firmware normalement, tout comme l'option précédente mais permet de configurer le côté gauche des paramètres EEPROM sur un clavier scindé.
-* `:dfu-util-split-right` - Permet de flasher un firmware normalement, tout comme l'option précédente mais permet de configurer le côté droit des paramètres EEPROM sur un clavier scindé.
-* `:st-link-cli` - Cela permet de flasher le firmware avec l'utilitaire en ligne de commande ST-LINK's plutôt que d'utiliser dfu-util.
diff --git a/docs/fr-fr/getting_started_getting_help.md b/docs/fr-fr/getting_started_getting_help.md
deleted file mode 100644
index fedb18c76c..0000000000
--- a/docs/fr-fr/getting_started_getting_help.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Trouver de l'aide
-
-Il y a beaucoup de ressources pour trouver de l'aide avec QMK.
-
-## Chat temps-réel
-
-Vous trouverez des développeurs QMK et des utilisateurs sur notre [Serveur Discord](https://discord.gg/Uq7gcHh) principal. Il y a des canaux spécifiques dans le serveur pour discuter des firmwares, toolbox, hardware et configurateurs.
-
-## Sous-Reddit OLKB
-
-Le forum officiel de QMK est [/r/olkb](https://reddit.com/r/olkb) sur [reddit.com](https://reddit.com).
-
-## Tickets GitHub
-
-Vous pouvez ouvrir un [ticket sur GitHub](https://github.com/qmk/qmk_firmware/issues). Ceci est spécialement pratique lorsque votre problème demande une discussion sur le long terme ou un débugage.
diff --git a/docs/fr-fr/getting_started_github.md b/docs/fr-fr/getting_started_github.md
deleted file mode 100644
index 522b09a03e..0000000000
--- a/docs/fr-fr/getting_started_github.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# Comment utiliser GitHub avec QMK
-
-GitHub peut être un peu compliqué pour ceux qui n'y sont pas familier. Ce guide va vous expliquer chaque étape de "fork", clone et envoi d'un pull request avec QMK.
-
-?> Ce guide part du principe que vous êtes suffisamment à l'aise pour envoyer commandes sur la ligne de commande et que vous avez Git installé sur votre système.
-
-Commencez par la [page GitHub de QMK](https://github.com/qmk/qmk_firmware), et vous verrez un bouton dans le coin en haut à droite qui indique "Fork":
-
-![Fork on GitHub](https://i.imgur.com/8Toomz4.jpg)
-
-Si vous faites partie d'une organisation, vous aurez besoin de savoir quel compte utiliser pour le fork. Dans la plupart des cas, vous voudrez créer le fork dans votre compte personnel. Une fois le fork complet (cela peut quelques fois prendre un peu de temps), appuyez sur le bouton "Clone or download":
-
-![Download from GitHub](https://i.imgur.com/N1NYcSz.jpg)
-
-Faites attention à sélectionner "HTTPS", et sélectionnez le lien et copiez-le:
-
-![HTTPS link](https://i.imgur.com/eGO0ohO.jpg)
-
-Ensuite, entrez `git clone --recurse-submodules ` dans la ligne de commande, et collez votre lien:
-
-```
-user@computer:~$ git clone --recurse-submodules https://github.com/whoeveryouare/qmk_firmware.git
-Cloning into 'qmk_firmware'...
-remote: Enumerating objects: 9, done.
-remote: Counting objects: 100% (9/9), done.
-remote: Compressing objects: 100% (5/5), done.
-remote: Total 183883 (delta 5), reused 4 (delta 4), pack-reused 183874
-Receiving objects: 100% (183883/183883), 132.90 MiB | 9.57 MiB/s, done.
-Resolving deltas: 100% (119972/119972), done.
-...
-Submodule path 'lib/chibios': checked out '587968d6cbc2b0e1c7147540872f2a67e59ca18b'
-Submodule path 'lib/chibios-contrib': checked out 'ede48346eee4b8d6847c19bc01420bee76a5e486'
-Submodule path 'lib/googletest': checked out 'ec44c6c1675c25b9827aacd08c02433cccde7780'
-Submodule path 'lib/lufa': checked out 'ce10f7642b0459e409839b23cc91498945119b4d'
-```
-
-Vous avez maintenant votre fork QMK sur votre machine locale, vous pouvez ajouter votre keymap, la compiler et la flasher sur votre board. Une fois heureux avec vos changements, vous pouvez les ajouter, commit, et pousser vers votre fork comme suit:
-
-```
-user@computer:~$ git add .
-user@computer:~$ git commit -m "adding my keymap"
-[master cccb1608] adding my keymap
- 1 file changed, 1 insertion(+)
- create mode 100644 keyboards/planck/keymaps/mine/keymap.c
-user@computer:~$ git push
-Counting objects: 1, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (1/1), done.
-Writing objects: 100% (1/1), 1.64 KiB | 0 bytes/s, done.
-Total 1 (delta 1), reused 0 (delta 0)
-remote: Resolving deltas: 100% (1/1), completed with 1 local objects.
-To https://github.com/whoeveryouare/qmk_firmware.git
- + 20043e64...7da94ac5 master -> master
-```
-
-Vos changements existent maintenant dans votre fork sur GitHub. Si vous allez à cette adresse (`https://github.com/<whoeveryouare>/qmk_firmware`), vous pouvez créer un nouveau "Pull Request" en cliquant sur ce bouton:
-
-![New Pull Request](https://i.imgur.com/DxMHpJ8.jpg)
-
-Maintenant, vous pourrez voir exactement ce que vous avez commité. Si ça vous semble bien, vous pouvez le finaliser en cliquant sur "Create Pull Request":
-
-![Create Pull Request](https://i.imgur.com/Ojydlaj.jpg)
-
-Une fois transmis, nous pourrons vous parler de vos changements, vous demander de faire des changements, et éventuellement de les accepter!
-
-Merci de contribuer à QMK :)
diff --git a/docs/fr-fr/getting_started_introduction.md b/docs/fr-fr/getting_started_introduction.md
deleted file mode 100644
index b2711a1671..0000000000
--- a/docs/fr-fr/getting_started_introduction.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Introduction
-
-Le but de cette page est d'expliquer les informations de base qui vous serons nécessaire pour travailler sur le projet QMK. Il a pour pré-requis que vous soyez familier à la navigation à l'aide d'un shell Unix, mais ne s'attend pas à ce que vous soyez familier avec C ou la compilation en utilisant make.
-
-## Structure de base de QMK
-
-QMK est un fork du projet [tmk_keyboard](https://github.com/tmk/tmk_keyboard) créé par [Jun Wako](https://github.com/tmk). Le code originel de TMK, avec quelques modifications, se trouve dans le dossier `tmk_core`. Les additions que QMK amène au projet se trouvent dans le dossier `quantum`. Les projets de clavier se trouvent dans les dossiers `handwired` et `keyboard`.
-
-### Structure du Userspace
-
-Dans le dossier `users` se trouve un répertoire pour chaque utilisateur. C'est un endroit où les utilisateurs peuvent mettre du code qui serait partagé entre plusieurs claviers. Merci de lire la documentation  [Fonctionnalité Userspace](feature_userspace.md) pour plus d'information.
-
-### Structure du projet clavier
-
-Dans le dossier `keyboards`, son sous-dossier `handwired` et ses sous-dossiers pour les revendeurs et fabriquants (par exemple `clueboard`) se trouve un répertoire pour chaque projet clavier. Par exemple `qmk_firmware/keyboards/clueboard/2x1800`.
-
-A l'intérieur, vous trouverez la structure suivante:
-
-* `keymaps/`: différentes keymaps qui peuvent être compilées
-* `rules.mk`: Ce fichier définit les options "make" par défaut. Ne modifiez pas ce fichier directement, utilisez à la place un `rules.mk` spécifique à la keymap.
-* `config.h`: Ce fichier définit les options de compilation par défaut. Ne modifiez pas ce fichier directement, utilisez à la place un `config.h` spécifique à la keymap.
-* `info.json`: Le fichier utilisé pour définir les options de layout de QMK Configurator. Voyez [Support Configurator](reference_configurator_support.md) pour plus d'information.
-* `readme.md`: une brève description du clavier.
-* `<keyboardName>.h`: Ce fichier définit le layout du fichier par rapport à la matrice de commutation.
-* `<keyboardName>.c`: Ce fichier définit du code custom pour le clavier.
-
-Pour plus d'information sur la structure du projet, voyez [Directives clavier QMK](hardware_keyboard_guidelines.md).
-
-### Structure d'une Keymap
-
-Dans chaque dossier keymap, vous allez trouver les fichiers suivants. Seul le fichier `keymap.c` est nécessaire, et si le reste des fichiers n'existent pas, les options par défaut seront choisies.
-
-* `config.h`: les options de configuration de votre keymap
-* `keymap.c`: tout le code de votre keymap, requis
-* `rules.mk`: les features de QMK qui sont activées
-* `readme.md`: une description de votre keymap, comment d'autres l'utiliseront, et des explications des fonctionnalités. Uploadez les images vers un service comme imgur.
-
-# Le fichier `config.h`
-
-Le fichier `config.h` peut être mis à 3 endroits:
-
-* keyboard (`/keyboards/<keyboard>/config.h`)
-* userspace (`/users/<user>/config.h`)
-* keymap (`/keyboards/<keyboard>/keymaps/<keymap>/config.h`)
-
-Le système de compilation cherche automatiquement les fichiers de configuration dans l'ordre au-dessus. Si vous souhaitez surcharger une configuration définie par un `config.h` précédent, vous devrez d'abord ajouter le code suivant.
-
-```
-#pragma once
-```
-
-Ensuite, pour surcharger l'option du fichier `config.h` précédent, vous devez `#undef` puis `#define` l'option à nouveau.
-
-Voici à quoi l'ensemble du code ressemble une fois regroupé:
-
-```
-#pragma once
-
-// overrides go here!
-#undef MY_SETTING
-#define MY_SETTING 4
-```
diff --git a/docs/fr-fr/newbs.md b/docs/fr-fr/newbs.md
deleted file mode 100644
index 6d848b11f8..0000000000
--- a/docs/fr-fr/newbs.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Le Guide pour débutant complet à QMK
-
-QMK est un firmware Open Source pour votre clavier mécanique. Vous pouvez utiliser QMK pour customiser votre clavier de manière simple et puissante. Tout le monde, du débutant complet au développeur avancé, ont utilisé avec succès QMK pour customiser leur clavier. Ce guide vous aidera à faire de même, quelles que soient vos compétences.
-
-Vous voulez savoir si votre clavier peut utiliser QMK? Si c'est un clavier mécanique que vous avez vous-même construit, il y a de bonnes chances que vous pouvez. Nous supportons un [grand nombre de "hobbyist boards"](https://qmk.fm/keyboards), donc même si votre clavier ne peut pas utiliser QMK, vous ne devriez pas avoir trop de problème pour en trouver un qui vous convienne.
-
-## Vue d'ensemble
-
-Il y a 7 sections principales dans ce guide:
-
-* [Pour débuter](fr-FR/newbs_getting_started.md)
-* [Compiler votre premier firmware en utilisant la ligne de commande](fr-FR/newbs_building_firmware.md)
-* [Compiler votre premier firmware en utilisant l'interface graphique en ligne](fr-FR/newbs_building_firmware_configurator.md)
-* [Flasher le Firmware](fr-FR/newbs_flashing.md)
-* [Test et Débuggage](fr-FR/newbs_testing_debugging.md)
-* [Bonnes pratiques Git](fr-FR/newbs_best_practices.md)
-* [Ressources d'apprentissage](fr-FR/newbs_learn_more_resources.md)
-
-Ce guide a pour but principal d'aider quelqu'un qui n'a jamais compilé de logiciel avant. Les recommandations et les choix qu'il contient vont donc dans ce sens. Il y a des méthodes alternatives pour beaucoup de ces procédures, et nous supportons la plupart de ces alternatives. Si vous avez un doute sur comment accomplir une tâche, vous pouvez [nous demander de l'aide](fr-FR/getting_started_getting_help.md).
-
-## Ressources additionnelles
-
-* [Thomas Baart's QMK Basics Blog](https://thomasbaart.nl/category/mechanical-keyboards/firmware/qmk/qmk-basics/) – Un blog créé par un utilisateur qui couvre les bases de l'utilisation du Firmware QMK, vue d'un point de vue d'un nouvel utilisateur (anglais).
diff --git a/docs/fr-fr/newbs_best_practices.md b/docs/fr-fr/newbs_best_practices.md
deleted file mode 100644
index ec68a5e3e5..0000000000
--- a/docs/fr-fr/newbs_best_practices.md
+++ /dev/null
@@ -1,161 +0,0 @@
-# Bonnes Pratiques
-
-## Ou, "Comment j'ai appris à ne plus m'en faire et aimer Git."
-
-Ce document a pour but d'apprendre aux novices les meilleures solutions pour faciliter la contribution à QMK. Nous allons étudier le processus de contribution à QMK, détaillant quelques moyens de rendre cette tâche plus simple. Nous allons faire quelques erreurs afin de vous apprendre à les résoudre.
-
-Ce document suppose les choses suivantes:
-
-1. Vous avez un compte GitHub, et avez [créé un "fork" pour le dépôt qmk_firmware](fr-FR/getting_started_github.md) avec votre compte.
-2. Vous avez [configuré votre environnement de compilation](fr-FR/newbs_getting_started.md?id=environment-setup).
-
-## La branche master de votre fork: Mettre à jour souvent, ne jamais commit
-
-Il est hautement recommandé pour le développement de QMK, peu importe ce qui est fait ou où, de garder votre branche `master` à jour, mais de ne ***jamais*** commit dessus. A la place, faites tous vos changements dans une branche de développement et crééz des "pull requests" de votre branche lorsque vous développez.
-
-Pour réduire les chances de conflits de fusion (merge) &mdash; des cas où deux ou plus d'utilisateurs ont édité la même section d'un fichier en parallèle &mdash; gardez votre branche `master` relativement à jour et démarrez chaque nouveau développement en créant une nouvelle branche.
-
-### Mettre à jour votre branche master
-
-Pour garder votre branche `master` à jour, il est recommandé d'ajouter le dépôt du firmware QMK comme un dépôt distant (remote) dans git. pour se faire, ouvrez votre interface de ligne de commande Git et entrez:
-
-```bash
-git remote add upstream https://github.com/qmk/qmk_firmware.git
-```
-
-Pour vérifier que le dépôt a bien été ajouté, lancez la commande `git remote -v`, qui devrait retourner le résultat suivant:
-
-```bash
-$ git remote -v
-origin  https://github.com/<your_username>/qmk_firmware.git (fetch)
-origin  https://github.com/<your_username>/qmk_firmware.git (push)
-upstream        https://github.com/qmk/qmk_firmware.git (fetch)
-upstream        https://github.com/qmk/qmk_firmware.git (push)
-```
-
-Maintenant que c'est fait, vous pouvez vérifier les mises à jour au dépôt en lançant `git fetch upstream`. Cela récupère les branches et les tags &mdash; appelé de manière générale "refs" &mdash; du dépôt QMK, qui a maintenant le surnom `upstream`. Nous pouvons maintenant comparer les données sur notre "fork" `origin` à celles contenues par QMK.
-
-Pour mettre à jour la branche master de votre "fork", lancez les commandes suivantes (en appuyant sur Enter après chaque ligne):
-
-```bash
-git checkout master
-git fetch upstream
-git pull upstream master
-git push origin master
-```
-
-Cela vous change la branche courante en master, synchronise les données de références du dépôt QMK vers votre ordinateur. La commande pull tire les données de références vers votre branche courante puis les y téleverse. La commande push permet de pousser la branche courante (master) vers votre fork GitHub.
-
-### Faire des changements
-
-Pour faire des changements, créez une nouvelle branche en entrant:
-
-```bash
-git checkout -b dev_branch
-git push --set-upstream origin dev_branch
-```
-
-Ceci crée une branche nommée `dev_branch`, bascule vers cette branche, et ensuite sauvegarde cette nouvelle branche vers votre fork. L'argument `--set-upstream` demande à git d'utiliser votre fork et la branche `dev_branch` à chaque fois que vous utilisez `git push` ou `git pull` depuis cette branche. Vous ne devez l'utiliser que pour le premier "push", après cela, vous pouvez utiliser simplement `git push` ou `git pull`, sans le reste des arguments.
-
-!> Avec `git push`, vous pouvez utiliser `-u` à la place de `--set-upstream` &mdash; `-u` est un alias pour `--set-upstream`.
-
-Vous pouvez appeler votre branche à peu près comme vous voulez, toutefois il est recommandé d'utiliser un nom qui est lié aux changements que vous allez faire.
-
-Par défaut, `git checkout -b` va faire de la branche actuelle la branche de base de votre nouvelle branche. Vous pouvez définir la base de votre nouvelle branche comme étant n'importe quelle branche existante qui n'est pas la courante en utilisant la commande:
-
-```bash
-git checkout -b dev_branch master
-```
-
-Maintenant que vous avez une branche de développement, ouvrez votre éditeur de texte et faites vos changements. Il est recommandé de faire beaucoup de petits commits dans votre branche. Ainsi, un changement qui crée un problème peut être plus facilement retracé et annulé si nécessaire. Pour faire un changement, éditez et sauvez n'importe quel fichier qui doit être mis à jour, ajoutez les à la *zone de staging* de Git, et commitez les vers votre branche:
-
-```bash
-git add path/to/updated_file
-git commit -m "My commit message."
-```
-
-`git add` ajoute les fichiers qui ont été changés dans la *zone de staging* de Git, qui est sa "zone de chargement". Elle contient tous les changements qui vont être *validés* (committed) par `git commit`, qui sauvegarde les changements vers le dépôt. Utilisez des messages de validation descriptifs afin que vous puissiez savoir ce qui a changé d'un coup d'oeil.
-
-!> Si vous changez beaucoup de fichiers, mais tous les fichiers font partie du même changement, vous pouvez utiliser `git add .` pour ajouter tous les fichiers changés dans le répertoire courant, plutôt que d'avoir à ajouter chaque fichier individuellement.
-
-### Publier Vos Changements
-
-La dernière étape est de pousser vos changements vers votre fork. Pour ce faire, entrez `git push`. Git publie maintenant l'état courant de `dev_branch` vers votre fork.
-
-## Résoudre Les Conflits De Merge
-
-Parfois, lorsque votre travail sur une branche met beaucoup de temps à se compléter, des changements réalisés par d'autres peuvent entrer en conflit avec les changements que vous avez fait sur votre branche au moment où vous avez ouvert un pull request. Ceci est appelé un *conflit de merge*, et c'est ce qui arrive lorsque plusieurs personnes modifient les mêmes parties de mêmes fichiers.
-
-### Rebaser Vos Changements
-
-Un *rebase* est la manière pour Git de prendre les changements qui ont été faits à un point, les annuler, et les réappliquer sur un autre point. Dans le cas d'un conflit de merge, vous pouvez rebaser votre branche pour récupérer les changements qui ont été faits entre le moment où vous avez créé votre branche et le présent.
-
-Pour démarrer, lancez les commandes suivantes:
-
-```bash
-git fetch upstream
-git rev-list --left-right --count HEAD...upstream/master
-```
-
-La commande `git rev-list` retourne le nombre de commits qui diffère entre la branche courante et la branche master de QMK. Nous lançons `git fetch` en premier afin d'être sûr que les refs qui représentent l'état courant du dépôt upstream soient à jour. Le résultat de la commande `git rev-list` retourne deux nombres:
-
-```bash
-$ git rev-list --left-right --count HEAD...upstream/master
-7       35
-```
-
-Le premier nombre représente combien il y a eu de commits sur la branche courante depuis qu'elle a été créée, et le second nombre est combien de commits ont été faits sur la branche `upstream/master` depuis que la branche a été créée et, ainsi, les changements qui ne sont pas enregistrés sur la branche courante.
-
-Maintenant que l'état actuel de la branche courante et la branche upstream sont connus, nous pouvons maintenant démarrer une opération de rebase:
-
-```bash
-git rebase upstream/master
-```
-
-Ceci dit à Git d'annuler les commits de la branche courante puis de les réappliquer sur la branche master de QMK.
-
-```bash
-$ git rebase upstream/master
-First, rewinding head to replay your work on top of it...
-Applying: Commit #1
-Using index info to reconstruct a base tree...
-M       conflicting_file_1.txt
-Falling back to patching base and 3-way merge...
-Auto-merging conflicting_file_1.txt
-CONFLICT (content): Merge conflict in conflicting_file_1.txt
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 Commit #1
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-```
-
-Ceci nous dit que nous avons un conflit de merge, et nous donne le nom du fichier en conflit. Ouvrez le fichier conflictuel dans votre éditeur de texte et, quelque part dans le fichier, vous trouverez quelque chose comme ça:
-
-```bash
-<<<<<<< HEAD
-<p>For help with any issues, email us at support@webhost.us.</p>
-=======
-<p>Need help? Email support@webhost.us.</p>
->>>>>>> Commit #1
-```
-
-La ligne `<<<<<<< HEAD` montre le début d'un conflit de merge et la ligne `>>>>>>> Commit #1` indique la fin, avec les sections conflictuelles séparées par `=======`. La partie du côté `HEAD` vient de la version du fichier provenant de la branche master de QMK, et la partie marquée avec le numéro du commit provient de la branche courrante.
-
-Parce que Git suis *les changements des fichiers*, plutôt que les contenus des fichiers directement, si Git ne peut pas trouver le texte qu'il y avait dans le fichier avant que le commit soit fait, il ne saura pas comment modifier le fichier. Modifier le fichier à nouveau va résoudre le conflit. Faites votre changement, et sauvez le fichier.
-
-```bash
-<p>Need help? Email support@webhost.us.</p>
-```
-
-Maintenant, lancez:
-
-```bash
-git add conflicting_file_1.txt
-git rebase --continue
-```
-
-Git enregistre le changement dans le fichier conflictuel, et continue à appliquer les commits depuis votre branche jusqu'à ce qu'il arrive à la fin.
diff --git a/docs/fr-fr/newbs_building_firmware.md b/docs/fr-fr/newbs_building_firmware.md
deleted file mode 100644
index 81870d31e4..0000000000
--- a/docs/fr-fr/newbs_building_firmware.md
+++ /dev/null
@@ -1,81 +0,0 @@
-# Compiler Votre Premier Firmware
-
-Maintenant que vous avez configuré votre environnement de build, vous être prêts à compiler un firmware customisé. Pour cette section, nous allons utiliser trois programmes différents: votre explorateur de fichier, votre éditeur de texte et votre fenêtre de terminal. Gardez les 3 ouverts jusqu'à ce que vous ayez terminé et soyez content de votre firmware de clavier.
-
-Si vous avez fermé et rouvert votre fenêtre de terminal depuis le démarrage de ce guide, n'oubliez pas de `cd qmk_firmware` afin que votre terminal soit dans le bon répertoire.
-
-## Naviguez vers votre répertoire keymaps
-
-Démarrez par naviguer dans le répertoire `keymaps` de votre clavier.
-
-?> Si vous êtes sous macOS ou Windows, il y a des commandes que vous pouvez utiliser pour facilement ouvrir le dossier keymaps.
-
-?> macOS:
-
-    open keyboards/<keyboard_folder>/keymaps
-
-?> Windows:
-
-    start .\\keyboards\\<keyboard_folder>\\keymaps
-
-## Créez une copie de la keymap `default`
-
-Une fois le dossier `keymaps` ouvert, créez une copie du répertoire `default`. Nous vous recommandons de nommer ce répertoire de la même manière que votre nom d'utilisateur GitHub. Vous pouvez aussi utiliser le nom que vous voulez, tant qu'il contient uniquement des lettres minuscules, des nombres et le caractère souligné (_).
-
-Afin d'automatiser ce processus, vous avez aussi l'option de lancer le script `new_keymap.sh`.
-
-Naviguez vers le répertoire `qmk_firmware/util` et tapez ce qui suit:
-
-```
-./new_keymap.sh <keyboard path> <username>
-```
-
-Par exemple, pour un utilisateur s'appeleant John, essayant de créer une nouvelle keymap pour le 1up60hse, il taperait:
-
-```
-./new_keymap.sh 1upkeyboards/1up60hse john
-```
-
-## Ouvrez `keymap.c` dans votre éditeur de texte préféré
-
-Ouvrez votre fichier `keymap.c`. Dans ce fichier, vous trouverez la structure qui contrôle comment votre clavier se comporte. En haut du fichier `keymap.c` il peut y avoir quelques `defines` et `enums` qui rendent la keymap plus simple à lire. Plus bas, vous trouverez une ligne telle que celle-ci:
-
-    const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-Cette ligne indique le début d'une liste de calques (layers). En dessous, vous trouverez des lignes contenant soit `LAYOUT`, soit `KEYMAP` et ces lignes indiquent le début d'un calque. En dessous de cette ligne se trouve la liste des touches qui comprennent ce calque particulier.
-
-!> Lorsque vous éditez votre fichier keymap, faites attention à ne pas ajouter ou enlever une virgule. Si vous le faites, vous aller empêcher votre firmware de compiler et il ne sera pas facile de trouver où la virgule est manquante ou en trop.
-
-## Customisez le layout à votre goût
-
-Libre à vous de choisir comment compléter cette étape. Faites le petit changement qui vous dérange ou retravaillez tout de zéro. Vous pouvez supprimer des calques si vous ne les utilisez pas tous, ou ajouter des calques jusqu'à un maximum de 32. Vérifiez la documentation suivante pour trouver ce que vous pouvez définir ici:
-
-* [Keycodes](keycodes.md)
-* [Fonctionnalités](features.md)
-* [FAQ](faq.md)
-
-?> Lorsque vous découvrez comment des keymaps fonctionnent, faites de petits changements. De gros changements rendent le débuggage des problèmes éventuels plus difficile.
-
-## Compilez votre firmware
-
-Lorsque les changements de votre keymap sont complets, vous allez devoir compiler le firmware. Pour ce faire, retournez à votre terminal et lancez la commande de compilation:
-
-    make <my_keyboard>:<my_keymap>
-
-Par exemple, si votre keymap s'appelle "xyverz" et vous compilez une keymap pour une plank rev5, vous allez utiliser cette commande:
-
-    make planck/rev5:xyverz
-
-Durant la compilation, vous allez avoir beaucoup de messages sur l'écran vous informant de quels fichiers sont en train d'être compilés. Il devrait se terminer avec des messages qui ressemblent comme suit:
-
-```
-Linking: .build/planck_rev5_xyverz.elf                                                              [OK]
-Creating load file for flashing: .build/planck_rev5_xyverz.hex                                      [OK]
-Copying planck_rev5_xyverz.hex to qmk_firmware folder                                               [OK]
-Checking file size of planck_rev5_xyverz.hex                                                        [OK]
- * File size is fine - 18392/28672
-```
-
-## Flasher votre firmware
-
-Allez sur la page [Flasher le firmware](fr-FR/newbs_flashing.md) pour apprendre comment écrire votre nouveau firmware sur votre clavier.
diff --git a/docs/fr-fr/newbs_building_firmware_configurator.md b/docs/fr-fr/newbs_building_firmware_configurator.md
deleted file mode 100644
index d06242f392..0000000000
--- a/docs/fr-fr/newbs_building_firmware_configurator.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Configurateur de QMK
-
-Le [Configurateur de QMK](https://config.qmk.fm) est une interface graphique en ligne permettant de générer des fichiers "hex" du firmware de QMK.
-
-?> **S'il vous plaît, suivez les étapes suivantes dans l'ordre.**
-
-Regardez le [Tutoriel vidéo](https://youtu.be/tx54jkRC9ZY)https://www.youtube.com/watch?v=-imgglzDMdY)
-
-Le configurateur de QMK fonctionne mieux avec Chrome et Firefox.
-
-!> **Les fichiers d'autres outils, tels que KLE ou kbfirmware ne seront pas compatibles avec le configurateur QMK. Ne les chargez pas, ne les importez pas. Le configurateur QMK est un outil DIFFERENT.**
-
-## Sélectionner votre clavier
-
-Cliquez la boîte déroulante et sélectionnez le clavier pour lequel vous voulez créer une keymap.
-
-?> Si votre clavier a plusieurs versions, faites attention à utiliser la bonne.
-
-Je vais le répéter, parce que c'est important
-
-!> **FAITES ATTENTION A UTILISER LA BONNE VERSION !**
-
-Si votre clavier est annoncé comme fonctionnant grâce à QMK mais n'est pas dans la liste, il y a des chances que le développeur ne l'ait pas encore fait, ou que nous n'avons pas encore eu le temps de le merger. Ajoutez un problème (issue) sur [qmk_firmware](https://github.com/qmk/qmk_firmware/issues) demandant le support de votre clavier, s'il n'y a pas de [Pull Request](https://github.com/qmk/qmk_firmware/pulls?q=is%3Aopen+is%3Apr+label%3Akeyboard) ouvert pour lui. Il y a aussi des claviers alimentés par QMK qui sont sur le compte GitHub du fabricant, il est bon de le vérifier aussi.
-
-## Sélectionner la disposition de votre clavier
-
-Choisissez la disposition (layout) qui représente le mieux la keymap que vous voulez créer. Certains claviers n'ont pas encore assez de dispositions ou des dispositions incorrectes. Ils seront supportés dans le future.
-
-## Nom de la Keymap
-
-Appelez cette keymap comme vous voulez.
-
-?> Si vous rencontrez des problèmes lors de la compilation, il peut être utile de changer ce nom, il peut déjà exister dans le dépôt du firmware QMK.
-
-## Créer votre keymap
-
-Entrer un keycode peut s'accomplir de 3 façons différentes.
-
-1. Glisser déposer
-2. Cliquer sur un endroit vide sur le layout et cliquer sur le keycode souhaité
-3. Cliquer sur un endroit vide sur le layout et appuyer sur une touche physique de votre clavier.
-
-Passez votre souris au dessus d'une touche et un affichage vous dira quel est le rôle du keycode. Pour une version plus verbeuse suivre:
-
-[Référence Keycode basique](https://docs.qmk.fm/#/keycodes_basic)
-[Référence Keycode avancé](https://docs.qmk.fm/#/feature_advanced_keycodes)
-
-Dans le cas où vous ne trouvez pas une disposition qui supporte votre keymap, par exemple trois places pour une barre d'espace, ou deux places pour retour clavier, ou deux places pour shift, etc. etc. remplissez les TOUTES.
-
-### Exemples
-
-3 places pour la barre d'espace: Remplissez les TOUTES avec la barre d'espace
-
-2 places pour un retour clavier: Remplissez les DEUX avec un retour clavier
-
-2 places pour un shift droit: Remplissez les DEUX avec un shift droit
-
-1 place pour un shift gauche et 1 place pour le support ISO: Remplissez les deux avec un shift gauche
-
-5 places, mais seulement 4 touches: Deviner et vérifier, ou demander à quelqu'un qui l'a déjà fait.
-
-## Sauvez votre keymap pour des éditions futures
-
-Une fois satisfait de votre keymap, ou si vous souhaitez revenir travailler dessus plus tard, appuyez sur le bouton `Export Keymap`. Il vous permettra de sauvegarder votre keymap avec le nom choisi au dessus suivi de .json.
-
-Vous pouvez ensuite charger ce fichier .json à nouveau en appuxant sur le bouton `Import Keymap`.
-
-!> **ATTENTION** Ce n'est pas le même type de fichier .json utilisé pour kbfirmware.com ou n'importe quel autre outil. Si vous essayez d'utiliser ce fichier pour d'autres outil, ou le fichier .json d'autres outils avec le configurateur QMK, il y a des chances que votre clavier **explose**.
-
-## Générer votre fichier firmware
-
-Appuyez sur le bouton `Compile`.
-
-Une fois la compilation terminée, vous pourrez appuyer sur le bouton vert `Download Firmware`.
-
-## Ecrire votre firmware sur votre clavier
-
-Merci de vous référer à [Flasher le Firmware](fr-FR/newbs_flashing.md)
-
-## Dépannage
-
-#### Mon fichier json ne fonctionne pas
-
-Si le fichier .json a été généré par le configurateur QMK, bravo vous avez trouvé un bug. Merci d'ouvrir une issue sur [qmk_configurator](https://github.com/qmk/qmk_configurator/issues)
-
-Sinon... vous avez raté mon message écris en gras qui dit de ne pas utiliser d'autres fichiers .json?
-
-#### Il y a des espaces en trop dans mon alyout? Qu'est-ce que je fais?
-
-Si vous voulez dire que vous avez trois places pour une barre d'espace, le mieux est de les remplir tous avec une barre d'espace. Vous pouvez faire de même avec les retour clavier et les shift.
-
-#### C'est quoi le keycode pour .......
-
-Merci de regarder
-
-[Référence keycode basique](https://docs.qmk.fm/#/keycodes_basic)
-[Référence keycode avancé](https://docs.qmk.fm/#/feature_advanced_keycodes)
-
-#### Ca ne compile pas?
-
-Merci de vérifier les autres dispositions de votre keymap afin d'être sûr qu'il n'y a pas de touches aléatoires.
-
-## Problèmes et Bugs
-
-Nous acceptons toujours les demandes des clients et les rapports de bugs. Merci de les remplirs sur [qmk_configurator](https://github.com/qmk/qmk_configurator/issues)
diff --git a/docs/fr-fr/newbs_flashing.md b/docs/fr-fr/newbs_flashing.md
deleted file mode 100644
index f1f6b1131f..0000000000
--- a/docs/fr-fr/newbs_flashing.md
+++ /dev/null
@@ -1,367 +0,0 @@
-# Flasher votre clavier
-
-Maintenant que vous avez compilé un firmware custom, vous allez vouloir le flasher dans votre clavier.
-
-## Flasher votre clavier avec QMK Toolbox
-
-La manière la plus simple de flasher votre clavier est avec [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases).
-
-Toutefois, la QMK Toolbox n'est actuellement disponible que pour Windows et macOS. Si vous utilisez Linux (ou préférez flasher le firmware depuis la ligne de commande), vous devrez utiliser [la métode décrite ci-dessous](newbs_flashing.md#flash-your-keyboard-from-the-command-line).
-
-### Charger le fichier dans QMK Toolbox
-
-Démarrez en ouvrant l'application QMK Toolbox. Cherchez le fichier de firmware dans Finder ou Explorer. Vore firmware de clavier peut être dans un de deux formats `.hex` ou `.bin`. QMK essaye de copier le bon format pour votre clavier du répertoire racine `qmk_firmware`.
-
-?> Si vous êtes sous Windows ou macOS il y a des commandes que vous pouvez utiliser pour facilement ouvrir le répertoire firmware dans Explorer ou Finder.
-
-?> Windows:
-
-    start .
-
-?> macOS:
-
-    open .
-
-Le fichier firmware suit toujours ce format de nommage:
-
-    <keyboard_name>_<keymap_name>.{bin,hex}
-
-Par exemple, le `plank/rev5` avec une keymap `default` aura ce nom de fichier:
-
-    planck_rev5_default.hex
-
-Une fois que vous aurez trouvé votre fichier de firmware, glissez le dans la boîte "Local file" sur QMK Toolbox, ou cliquez sur "Open" et naviguez où votre firmware est enregistré.
-
-### Mettez votre clavier en mode DFU (Bootloader)
-
-Afin de flasher votre firmware custom, vous devez mettre votre clavier dans un mode spécial. Lorsqu'il sera dans ce mode, vous ne pourrez pas taper ou utiliser votre clavier. Il est très important que vous ne débranchiez pas votre clavier ou n'arrêtiez pas le processus d'écriture du firmware.
-
-Chaque clavier a une manière différente d'entrer dans ce mode spécial. Si votre clavier tourne actuellement QMK ou TMK et vous n'avez pas reçu d'instruction spécifiques, essayez, dans cet ordre:
-
-* Enfoncez les deux touches shift et appuyez sur `Pause`
-* Enfoncez les deux touches shift et appuyez sur `B`
-* Débranchez votre clavier, gardez shift la barre d'espace et `B` en même temps, branchez votre clavier et attendez une seconde avant de relâcher les touches.
-* Appuyez la touche physique `RESET` en bas du PCB
-* Trouvez les pins sur le PCB marquées `BOOT0` ou `RESET`, court circuitez ces pins en branchant votre PCB
-
-Lorsque vous aurez réussi, vous verrez le message suivant dans QMK Toolbox:
-
-```
-*** Clueboard - Clueboard 66% HotSwap disconnected -- 0xC1ED:0x2390
-*** DFU device connected
-```
-
-### Flasher votre clavier
-
-Appuyez sur le boutton `Flash` dans QMK Toolbox. Vous verrez un résultat similaire à ce qui suit:
-
-```
-*** Clueboard - Clueboard 66% HotSwap disconnected -- 0xC1ED:0x2390
-*** DFU device connected
-*** Attempting to flash, please don't remove device
->>> dfu-programmer atmega32u4 erase --force
-    Erasing flash...  Success
-    Checking memory from 0x0 to 0x6FFF...  Empty.
->>> dfu-programmer atmega32u4 flash /Users/skully/qmk_firmware/clueboard_66_hotswap_gen1_skully.hex
-    Checking memory from 0x0 to 0x55FF...  Empty.
-    0%                            100%  Programming 0x5600 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    0%                            100%  Reading 0x7000 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    Validating...  Success
-    0x5600 bytes written into 0x7000 bytes memory (76.79%).
->>> dfu-programmer atmega32u4 reset
-
-*** DFU device disconnected
-*** Clueboard - Clueboard 66% HotSwap connected -- 0xC1ED:0x2390
-```
-
-## Flashez votre clavier à l'aide de la ligne de commande
-
-C'est désormais relativement simple. Lorsque vous êtes prêt à compiler et à flasher votre firmware, ouvrez la fenêtre de votre terminal et exécutez la commande de build :
-
-    make <my_keyboard>:<my_keymap>:flash
-
-Par exemple, si votre keymap s'appelle "xyverz" et que vous fabriquez une keymap pour un clavier `planck` de version `rev5` vous devrez utiliser cette commande:
-
-    make planck/rev5:xyverz:flash
-
-La commande va vérifier la configuration du clavier, puis tentera de le flasher en fonction du bootloader (chargeur d’amorçage) spécifié. Cela signifie que vous n'avez pas besoin de savoir quel bootloader votre clavier utilise. Exécutez simplement la commande et laissez-le faire le gros du travail.
-
-Cependant, tout dépend du bootloader qui est installé sur le clavier. Si cette information n’est pas configurée ou si vous tentez de flasher un clavier qui ne permet pas d’être flashé alors vous obtiendrez cette erreur:
-
-    WARNING: This board's bootloader is not specified or is not supported by the ":flash" target at this time.
-
-Dans ce cas, vous devrez choisir le bootloader.
-
-Il y a cinq bootloaders principaux. Les Pro-Micro et les clones utilisent Caterina, les Teensy utilisent Halfkay, les claviers AVR d’OLKB utilisent QMK-DFU, certains controleurs atmega32u4 utilisent DFU et la plupart des controlleurs ARM utilisent ARM DFU.
-
-Vous pouvez trouver plus d'information à propos des bootloaders sur la page [Instructions de flash et information sur le Bootloader](flashing.md).
-
-Si vous savez quel bootloader vous utilisez, lorsque vous compilez le firmware, vous pouvez ajouter quelques options à la commande `make` pour automatiser le processus de flash.
-
-### DFU
-
-Pour le bootloader DFU, lorsque vous êtes prêts à compiler et flasher votre firmware, ouvrez votre fenêtre de terminal et lancez la commande de compilation:
-
-    make <my_keyboard>:<my_keymap>:dfu
-
-Par exemple, si vous keymap s'appelle "xyverz" et vous compilez une keymap pour une plank rev5, vous utiliserez cette commande:
-
-    make planck/rev5:xyverz:dfu
-
-Une fois la compilation terminée, le résultat devrait être le suivant:
-
-```
-Linking: .build/planck_rev5_xyverz.elf                                                              [OK]
-Creating load file for flashing: .build/planck_rev5_xyverz.hex                                      [OK]
-Copying planck_rev5_xyverz.hex to qmk_firmware folder                                               [OK]
-Checking file size of planck_rev5_xyverz.hex
- * File size is fine - 18574/28672
- ```
-
-Une fois arrivé à ce stade, le script de compilation va chercher le bootloader DFU toutes les 5 secondes. Il va répéter les messages suivants jusqu'à ce que l'appareil soit trouvé ou que vous l'annuliez.
-
-    dfu-programmer: no device present.
-    Error: Bootloader not found. Trying again in 5s.
-
-Une fois terminé, vous devrez mettre à zéro le contrôleur. Vous allez voir un résultat similaire à ceci:
-
-```
-*** Attempting to flash, please don't remove device
->>> dfu-programmer atmega32u4 erase --force
-    Erasing flash...  Success
-    Checking memory from 0x0 to 0x6FFF...  Empty.
->>> dfu-programmer atmega32u4 flash /Users/skully/qmk_firmware/clueboard_66_hotswap_gen1_skully.hex
-    Checking memory from 0x0 to 0x55FF...  Empty.
-    0%                            100%  Programming 0x5600 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    0%                            100%  Reading 0x7000 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    Validating...  Success
-    0x5600 bytes written into 0x7000 bytes memory (76.79%).
->>> dfu-programmer atmega32u4 reset
-```
-
-?> Si vous avez des soucis concernant ceci - par exemple `dfu-programmer: no device present` - merci de regarder [Foires Aux Questions de Compilation](faq_build.md).
-
-#### Commandes DFU
-
-Il y  aun certain nombre de commandes du DFU que vous pouvez utiliser pour flasher un firmware sur un device DFU:
-
-* `:dfu` - C'est l'option standard qui attends jusqu'à e qu'un appareil DFU soit disponible, puis flash le firmware. Il va vérifier toutes les 5 secondes, afin de voir si un appareil DFU est apparu.
-* `:dfu-ee` - Ceci flash un fichier `eep` à la place du standard hex, peu commun.
-* `:dfu-split-left` - Ceci flash le firmware standard, comme la commande standard (`:dfu`). Toutefois, elle flash aussi les fichiers EEPROM du "côté gauche" pour les claviers scindés. _C'est l'option idéale pour les claviers scindés basés sur Elite C._
-* `:dfu-split-right` - Ceci flash le firmware standard, comme la commande standard (`:dfu`). Toutefois, elle flash aussi les fichiers EEPROM du "côté droit" pour les claviers scindés. _C'est l'option idéale pour les claviers scindés basés sur Elite C._
-
-### Caterina
-
-Pour les boards Arduino et leurs clones (tel que le SparkFun ProMicro), lorsque vous êtes prêt à compiler et flasher votre firmware, ouvrez votre terminal et lancer la commande de compilation:
-
-    make <my_keyboard>:<my_keymap>:avrdude
-
-Par exemple, si votre keymap se nomme "xyverz" et que vous compilez une keymap pour un Lets Split rev2, vous utiliserez la commande suivante:
-
-    make lets_split/rev2:xyverz:avrdude
-
-Une fois le firmware compilé, vous aurez le résultat suivant:
-
-```
-Linking: .build/lets_split_rev2_xyverz.elf                                                            [OK]
-Creating load file for flashing: .build/lets_split_rev2_xyverz.hex                                    [OK]
-Checking file size of lets_split_rev2_xyverz.hex                                                      [OK]
- * File size is fine - 27938/28672
-Detecting USB port, reset your controller now..............
-```
-
-Une fois ceci fait, réinitialisez votre board et le script va détecter et flasher le firmware. La sortie devrait ressembler à quelque chose comme ça:
-
-```
-Detected controller on USB port at /dev/ttyS15
-
-Connecting to programmer: .
-Found programmer: Id = "CATERIN"; type = S
-    Software Version = 1.0; No Hardware Version given.
-Programmer supports auto addr increment.
-Programmer supports buffered memory access with buffersize=128 bytes.
-
-Programmer supports the following devices:
-    Device code: 0x44
-
-avrdude.exe: AVR device initialized and ready to accept instructions
-
-Reading | ################################################## | 100% 0.00s
-
-avrdude.exe: Device signature = 0x1e9587 (probably m32u4)
-avrdude.exe: NOTE: "flash" memory has been specified, an erase cycle will be performed
-             To disable this feature, specify the -D option.
-avrdude.exe: erasing chip
-avrdude.exe: reading input file "./.build/lets_split_rev2_xyverz.hex"
-avrdude.exe: input file ./.build/lets_split_rev2_xyverz.hex auto detected as Intel Hex
-avrdude.exe: writing flash (27938 bytes):
-
-Writing | ################################################## | 100% 2.40s
-
-avrdude.exe: 27938 bytes of flash written
-avrdude.exe: verifying flash memory against ./.build/lets_split_rev2_xyverz.hex:
-avrdude.exe: load data flash data from input file ./.build/lets_split_rev2_xyverz.hex:
-avrdude.exe: input file ./.build/lets_split_rev2_xyverz.hex auto detected as Intel Hex
-avrdude.exe: input file ./.build/lets_split_rev2_xyverz.hex contains 27938 bytes
-avrdude.exe: reading on-chip flash data:
-
-Reading | ################################################## | 100% 0.43s
-
-avrdude.exe: verifying ...
-avrdude.exe: 27938 bytes of flash verified
-
-avrdude.exe: safemode: Fuses OK (E:CB, H:D8, L:FF)
-
-avrdude.exe done.  Thank you.
-```
-
-Si vous avez un souci, essayez de faire ceci:
-
-    sudo make <my_keyboard>:<my_keymap>:avrdude
-
-#### Commandes Caterina 
-
-Il existe un certain nombre de commandes DFU que vous pouvez utiliser pour mettre à jour le firmware sur un périphérique DFU:
-
-* `: avrdude` - Il s’agit de l’option normale. Elle attend qu’un appareil Caterina soit disponible, puis tente de flasher le firmware. Il attendra de détecter un autre port COM, puis il flashera à nouveau.
-* `: avrdude-loop` - Cela fonctionne de la même manière que `: avrdude`, mais une fois que chaque périphérique est flashé, il tentera de flasher à nouveau. Cela peut être utile pour flasher plusieurs claviers à la suite. _Cela implique de sortir manuellement de la boucle en appuyant sur Ctrl + C, Cmd + C ou un raccourci équivalent selon votre OS_
-* `: avrdude-split-left` - Cela fonctionne de la même manière que la fonction (`: avrdude`). Toutefois, cela permet aussi de flasher le coté gauche de l'EEPROM des claviers splittés / divisés. C'est donc la méthode recommandée pour les claviers splittés avec Pro Micro.
-* `: avrdude-split-right` - Cela fonctionne de la même manière que la fonction (`: avrdude`). Toutefois, cela permet aussi de flasher le coté droite de l'EEPROM des claviers splittés / divisés. C'est donc la méthode recommandée pour les claviers splittés avec Pro Micro.
-
-### HalfKay
-
-Pour les composants PJRC (les Teensy), lorsque vous êtes prêts à compiler et flasher votre firmware, ouvrez votre fenêtre de terminal et lancez la commande de compilation suivante:
-
-    make <my_keyboard>:<my_keymap>:teensy
-
-Par exemple, si vous keymap s'appelle "xyverz" et vous compilez une keymap pour un Ergodox ou un Ergodox EZ, vous utiliserez cette commande:
-
-    make ergodox_ez:xyverz:teensy
-
-Une fois la compilation du firmware terminée, votre sortie devrait ressembler à ça:
-
-```
-Linking: .build/ergodox_ez_xyverz.elf                                                               [OK]
-Creating load file for flashing: .build/ergodox_ez_xyverz.hex                                       [OK]
-Checking file size of ergodox_ez_xyverz.hex                                                         [OK]
- * File size is fine - 25584/32256
- Teensy Loader, Command Line, Version 2.1
-Read "./.build/ergodox_ez_xyverz.hex": 25584 bytes, 79.3% usage
-Waiting for Teensy device...
- (hint: press the reset button)
- ```
-
-Une fois terminé, réinitialisez votre board. Une fois fait, vous verrez une sortie comme ça:
-
- ```
- Found HalfKay Bootloader
-Read "./.build/ergodox_ez_xyverz.hex": 28532 bytes, 88.5% usage
-Programming............................................................................................................................................................................
-...................................................
-Booting
-```
-
-### STM32 (ARM)
-
-Pour la majorité des boards ARM (incluant les Proton C, Planck Rev 6, et Preonic Rev 3), lorsque vous êtes prêt à compiler et flasher votre firmware, ouvrez la fenêtre de terminal et lancez la commande de compilation:
-
-    make <my_keyboard>:<my_keymap>:dfu-util
-
-Par exemple, si votre keymap s'appelle "xyverz" et vous compilez une keymap pour le clavier Plank Revision 6, vous utiliserez cette commande et redémarrerez le clavier vers le bootloader (avant que la compilation soit terminée):
-
-    make planck/rev6:xyverz:dfu-util
-
-Une fois le firmware compilé, il va afficher quelque chose comme ça:
-
-```
-Linking: .build/planck_rev6_xyverz.elf                                                             [OK]
-Creating binary load file for flashing: .build/planck_rev6_xyverz.bin                               [OK]
-Creating load file for flashing: .build/planck_rev6_xyverz.hex                                     [OK]
-
-Size after:
-   text    data     bss     dec     hex filename
-      0   41820       0   41820    a35c .build/planck_rev6_xyverz.hex
-
-Copying planck_rev6_xyverz.bin to qmk_firmware folder                                              [OK]
-dfu-util 0.9
-
-Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc.
-Copyright 2010-2016 Tormod Volden and Stefan Schmidt
-This program is Free Software and has ABSOLUTELY NO WARRANTY
-Please report bugs to http://sourceforge.net/p/dfu-util/tickets/
-
-Invalid DFU suffix signature
-A valid DFU suffix will be required in a future dfu-util release!!!
-Opening DFU capable USB device...
-ID 0483:df11
-Run-time device DFU version 011a
-Claiming USB DFU Interface...
-Setting Alternate Setting #0 ...
-Determining device status: state = dfuERROR, status = 10
-dfuERROR, clearing status
-Determining device status: state = dfuIDLE, status = 0
-dfuIDLE, continuing
-DFU mode device DFU version 011a
-Device returned transfer size 2048
-DfuSe interface name: "Internal Flash  "
-Downloading to address = 0x08000000, size = 41824
-Download        [=========================] 100%        41824 bytes
-Download done.
-File downloaded successfully
-Transitioning to dfuMANIFEST state
-```
-
-#### Commandes STM32
-
-Il y  aun certain nombre de commandes du DFU que vous pouvez utiliser pour flasher un firmware sur un device STM32:
-
-* `:dfu-util` - C'est l'option standard pour flasher un appareil STM32. Elle attendra qu'un bootloader STM32 soit présent et tentera de l’utiliser.
-* `:dfu-util-left` - Ceci flasher le firmware standard, comme la commande standard (`:dfu-util`). Toutefois, elle flasher aussi les fichiers EEPROM du "côté gauche" pour les claviers scindés.
-* `:dfu-util-right` - Ceci flash le firmware standard, comme la commande standard (`:dfu-util`). Toutefois, elle flash aussi les fichiers EEPROM du "côté droit" pour les claviers scindés.
-* `:st-link-cli` - Cela permet de flasher le firmware avec l'utilitaire en ligne de commande ST-LINK's plutôt que d'utiliser dfu-util.
-
-### BootloadHID
-
-Pour les claviers basés sur Bootmapper Client(BMC)/bootloadHID/ATmega32A, si vous êtes prêts à compiler et flasher le firmware, ouvrez votre fenêtre de terminal et lancez la commande suivante:
-
-    make <my_keyboard>:<my_keymap>:bootloaderHID
-
-Par exemple, si votre keymap s'appelle "xyverz" et que vous compilez une keymap pour un jj40, utilisez cette commande:
-
-    make jj40:xyverz:bootloaderHID
-
-Une fois le firmware compilé, vous aurez cette sortie:
-
-```
-Linking: .build/jj40_default.elf                                                                   [OK]
-Creating load file for flashing: .build/jj40_default.hex                                           [OK]
-Copying jj40_default.hex to qmk_firmware folder                                                    [OK]
-Checking file size of jj40_default.hex                                                             [OK]
- * The firmware size is fine - 21920/28672 (6752 bytes free)
-```
-
-A ce stade, le script de build va chercher le bootloader DFU toutes les 5 secondes. Il répétera l ’affichage de ce message jusqu'à ce que l’appareil soit trouvé ou que vous annuliez l'opération```
-
-```
-Error opening HIDBoot device: The specified device was not found
-Trying again in 5s.
-```
-
-Une fois ce résultat obtenu, réinitialisez le contrôleur. Le résultat suivant devrait s’afficher:
-
-```
-Page size   = 128 (0x80)
-Device size = 32768 (0x8000); 30720 bytes remaining
-Uploading 22016 (0x5600) bytes starting at 0 (0x0)
-0x05580 ... 0x05600
-```
-
-## Faites l'essai!
-
-Bravo! Votre firmware customisé a été programmé sur votre clavier!
-
-Essayez-le et vérifiez qu'il fonctionne comme vous le souhaitez. Nous avons écrit [Tester et débugger](newbs_testing_debugging.md) pour compléter le guide du débutant, alors allez voir là-bas pour apprendre comment dépanner vos fonctionnalités custom.
diff --git a/docs/fr-fr/newbs_getting_started.md b/docs/fr-fr/newbs_getting_started.md
deleted file mode 100644
index 1a5740185c..0000000000
--- a/docs/fr-fr/newbs_getting_started.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Introduction
-
-Votre clavier d'ordinateur contient un processeur, proche de celui dans votre ordinateur. Ce processeur exécute un logiciel responsable de détecter les touches appuyées et envoie des rapports à propos de l'état du clavier lorsque les touches sont appuyées et relâchées. QMK prend le rôle de ce logiciel, détectant les appuis des boutons et passant cette information à l'ordinateur hôte. Lorsque vous construisez votre keymap customisée, vous créez l'équivalent d'un programme exécutable pour votre clavier.
-
-QMK essaie de rendre les choses simples faciles, et les choses difficiles possibles. Vous n'avez pas à savoir programmer pour créer des keymaps puissantes - vous devez seulement suivre quelques règles de syntaxe simples.
-
-# Guide de démarrage
-
-Avant de pouvoir construire des keymaps, vous devez installer quelques logiciels et configurer votre environnement de compilation. Ceci n'a besoin d'être fait seulement une fois, peu importe le nombre de clavier pour lesquels vous compter compiler un firmware.
-
-Si vous préférez une approche plus proche d'une interface graphique, considérez utiliser l'outil en ligne [QMK Configurator](https://config.qmk.fm). Référez-vous à [Construire votre premier firmware en utilisant l'interface graphique en ligne](newbs_building_firmware_configurator.md).
-
-## Logiciels à télécharger
-
-### Editeur de texte
-
-Vous allez avoir besoin d'un programme qui peut éditer et sauvegarder des fichiers **plain text**. Si vous êtes sur Windows, vous pouvez utiliser notepad et sur Linux vous pouvez utiliser gedit. Ces deux options sont des éditeurs de texte simples mais fonctionnels. Sur macOS, faites attention avec l'application par défaut TextEdit: elle ne sauvegardera pas les fichiers en mode "plain text" sauf si vous sélectionnez explicitement _Make Plain Text_ à partir du menu _Format_.
-
-Vous pouvez aussi télécharger et installer un éditeur de texte dédié comme [Sublime Text](https://www.sublimetext.com/) ou [VS Code](https://code.visualstudio.com/). C'est probablement la meilleure solution peu importe la plateforme car ce sont des programmes conçus spécifiquement pour éditer du code.
-
-?> Pas sûr de quel éditeur de texte utiliser? Laurence Bradford a écrit une [excellente introduction](https://learntocodewith.me/programming/basics/text-editors/) au sujet.
-
-### QMK Toolbox
-
-QMK Toolbox est un programme graphique optionnel pour Windows et macOS qui permet à la fois de programmer et débugger votre clavier customisé. Il vous sera probablement très utile pour facilement flasher votre clavier et analyser ses messages de débugage.
-
-[Télécharger la dernière version ici.](https://github.com/qmk/qmk_toolbox/releases/latest)
-
-* Pour Windows: `qmk_toolbox.exe` (portable) or `qmk_toolbox_install.exe` (installeur)
-* Pour macOS: `QMK.Toolbox.app.zip` (portable) or `QMK.Toolbox.pkg` (installeur)
-
-## Configurez votre environnement
-
-Nous avons essayé de rendre QMK aussi simple que possible à configurer. Vous avez uniquement à préparer votre environnment Linux ou Unix et laisser QMK installer le reste.
-
-?> Si vous n'avez jamais travaillé avec la ligne de commande Linux/Unix, il y a un certain nombre de concepts basiques et de commandes que vous devriez apprendre. Ces ressources vous apprendrons suffisemment pour travailler avec QMK:<br>
-[Commandes Linux à savoir](https://www.guru99.com/must-know-linux-commands.html)<br>
-[Commandes Unix de base](https://www.tjhsst.edu/~dhyatt/superap/unixcmd.html)
-
-### Windows
-
-Vous devez installer MSYS2 et Git.
-
-* Suivez les instructions d'installation sur la [page de MSYS2](https://www.msys2.org).
-* Fermez tous les terminaux MSYS2 éventuellement ouverts et ouvrez un nouveau terminal MSYS2 MinGW 64-bit.
-* Installez Git en lançant la commande: `pacman -S git`.
-
-### macOS
-
-Vous devez installer Homebew. Suivez les instructions sur la [page de Homebrew](https://brew.sh).
-
-Une fois Homebrew installé, continuez avec _Configurer QMK_. Dans cette étape, nous lancerons un script qui va installer d'autres paquets.
-
-### Linux
-
-Vous devez installer Git. Il est très probable que vous l'ayez déjà installé, mais sinon, une des commandes suivantes devrait l'installer:
-
-* Debian / Ubuntu / Devuan: `apt-get install git`
-* Fedora / Red Hat / CentOS: `yum install git`
-* Arch: `pacman -S git`
-
-?> Docker est aussi une option sur toutes les plateformes. [Appuyez ici pour plus de détail.](getting_started_build_tools.md#docker)
-
-## Configurer QMK
-
-Une fois votre environnement Linux/Unix configuré, vous êtes prêt à télécharger QMK. Nous allons le faire en utilisant Git pour "cloner" le dépôt de QMK. Ouvrez un terminal ou une fenêtre MSYS2 MinGW et gardez le ouvert pour le reste de ce guide. Dans ce terminal, lancez ces deux commandes:
-
-```shell
-git clone --recurse-submodules https://github.com/qmk/qmk_firmware.git
-cd qmk_firmware
-```
-
-?> Si vous savez déjà [comment utiliser GitHub](getting_started_github.md), nous recommandons que vous créez et clonez votre propre fork. Si vous ne savez pas ce que cela veut dire, vous pouvez sans problème ignorer ce message.
-
-QMK vient avec un script pour vous aider à configurer le reste de ce que vous aurez besoin. Vous devez le lancer en tapant la ligne de commande suivante:
-
-    util/qmk_install.sh
-
-## Testez votre environnement de compilation
-
-Maintenant que votre environnement de compilation de QMK est configuré, vous pouvez compiler un firmware pour votre clavier. Démarrez en compilant la keymap par défaut du clavier. Vous devriez pouvoir le faire avec une commande de ce format:
-
-    make <keyboard>:default
-
-Par exemple, pour compiler un firmware pour une Clueboard 66%, vous utiliserez:
-
-    make clueboard/66/rev3:default
-
-Une fois ceci fait, vous devriez avoir beaucoup d'information dans votre sortie qui devrait se terminer par quelque chose de similaire à ça:
-
-```
-Linking: .build/clueboard_66_rev3_default.elf                                                       [OK]
-Creating load file for flashing: .build/clueboard_66_rev3_default.hex                               [OK]
-Copying clueboard_66_rev3_default.hex to qmk_firmware folder                                        [OK]
-Checking file size of clueboard_66_rev3_default.hex                                                 [OK]
- * The firmware size is fine - 26356/28672 (2316 bytes free)
-```
-
-# Créer votre Keymap
-
-Vous êtes maintenant prêt à créer votre propre keymap! Passez à l'étape [Compiler votre premier firmware](newbs_building_firmware.md) pour ce faire.
diff --git a/docs/fr-fr/newbs_learn_more_resources.md b/docs/fr-fr/newbs_learn_more_resources.md
deleted file mode 100644
index 01b1c9e8eb..0000000000
--- a/docs/fr-fr/newbs_learn_more_resources.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Ressources d'apprentissage
-
-Ces ressources permettent de donner aux nouveaux membres de la communauté QMK plus de compréhension aux informations données dans la documentation Newbs.
-
-Ressources Git:
-
-* [Tutoriel général](https://www.codecademy.com/learn/learn-git)
-* [Jeu Git pour apprendre avec des exemples](https://learngitbranching.js.org/)
-* [Des ressources Git pour en savoir plus à propos de GitHub](getting_started_github.md)
-* [Des ressources Git spécifiques à QMK](contributing.md)
-
-Ressources sur les lignes de commande:
-
-* [Bon tutoriel général sur la ligne de commande](https://www.codecademy.com/learn/learn-the-command-line)
diff --git a/docs/fr-fr/newbs_testing_debugging.md b/docs/fr-fr/newbs_testing_debugging.md
deleted file mode 100644
index 85a7fb9f13..0000000000
--- a/docs/fr-fr/newbs_testing_debugging.md
+++ /dev/null
@@ -1,104 +0,0 @@
-# Test et débugage
-
-Une fois votre clavier configuré avec un firmware custom, vous êtes prêt à le tester. Avec un peu de chance, tout fonctionne parfaitement bien, dans le cas contraire, ce document vous aidera à trouver où se trouve le problème.
-
-## Tester
-
-Tester votre clavier est normalement assez simple. Appuyez chaque touche de votre clavier et assurez-vous qu'il envoie les touches auquel vous vous attendiez. Il existe même des programmes qui vous aideront à vérifier qu'aucune touche ne soit oubliée.
-
-Note: ces programmes ne sont ni fournis ni approuvés par QMK.
-
-* [QMK Configurator](https://config.qmk.fm/#/test/) (Web)
-* [Switch Hitter](https://web.archive.org/web/20190413233743/https://elitekeyboards.com/switchhitter.php) (Windows seulement)
-* [Keyboard Viewer](https://www.imore.com/how-use-keyboard-viewer-your-mac) (Mac seulement)
-* [Keyboard Tester](https://www.keyboardtester.com) (Web)
-* [Keyboard Checker](https://keyboardchecker.com) (Web)
-
-## Débuguer
-
-Votre clavier va envoyer des informations de débugage si vous avez `CONSOLE_ENABLE = yes` dans votre fichier `rules.mk`. Par défaut, la sortie est très limitée, mais vous pouvez activer le mode debug pour augmenter la quantité de sortie de débugage. Utilisez le keycode `DEBUG` dans votre keymap, utilisez la fonction [Commande](feature_command.md) pour activer le mode debug ou ajoutez le code suivant à votre keymap.
-
-```c
-void keyboard_post_init_user(void) {
-  // Customise these values to desired behaviour
-  debug_enable=true;
-  debug_matrix=true;
-  //debug_keyboard=true;
-  //debug_mouse=true;
-}
-```
-
-### Débuguer avec QMK Toolbox
-
-Pour les plateformes compatibles, [QMK Toolbox](https://github.com/qmk/qmk_toolbox) peut être utilisé pour afficher les messages de débugage pour votre clavier.
-
-### Débuguer avec hid_listen
-
-Vous préférez une solution basée sur le terminal? [hid_listen](https://www.pjrc.com/teensy/hid_listen.html), fourni par PJRC, peut aussi être utilisé pour afficher des messages de débugage. Des versions compilées pour Windows, Linux et MacOS sont disponibles.
-
-<!-- FIXME: Describe the debugging messages here. -->
-
-## Envoyer vos propres messages de débugage
-
-Parfois, il est utile d'afficher des messages de débugage depuis votre [code custom](custom_quantum_functions.md). Le faire est assez simple. Commencez par ajouter `print.h` au début de votre fichier:
-
-```c
-#include "print.h"
-```
-
-Une fois fait, vous pouvez utiliser les fonctions print suivantes:
-
-* `print("string")`: Affiche une simple chaîne de caractères.
-* `uprintf("%s string", var)`: Affiche une chaîne de caractères formatée.
-* `dprint("string")` Affiche une chaîne de caractère simple, mais uniquement lorsque le mode debug est activé.
-* `dprintf("%s string", var)`: Affiche une chaîne de caractère formatée, mais uniquement lorsque le mode debug est activé.
-
-## Exemples de debugage
-
-Si dessous se trouve une liste d'exemples réels de débugage. Pour plus d'information, référez-vous à [Débuguer/Dépanner QMK](faq_debug.md).
-
-### A quelle position de la matrice se trouve cette activation de touche?
-
-Lors du portage ou lorsque vous essayez de diagnostiquer un problème de PCB, il est utile de savoir si une activation de touche est enregistrée correctement. Pour activer le log de ce scénario, ajoutez le code suivant à votre fichier keymaps `keymap.c`.
-
-```c
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  // If console is enabled, it will print the matrix position and status of each key pressed
-#ifdef CONSOLE_ENABLE
-    uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
-#endif
-  return true;
-}
-```
-
-Exemple de sortie
-
-```text
-Waiting for device:.......
-Listening:
-KL: kc: 169, col: 0, row: 0, pressed: 1
-KL: kc: 169, col: 0, row: 0, pressed: 0
-KL: kc: 174, col: 1, row: 0, pressed: 1
-KL: kc: 174, col: 1, row: 0, pressed: 0
-KL: kc: 172, col: 2, row: 0, pressed: 1
-KL: kc: 172, col: 2, row: 0, pressed: 0
-```
-
-### Combien de temps cela a pris pour une activation de touche?
-
-Lorsque vous testez des problèmes de performance, il peut être utile de savoir à quelle fréquence la matrice est scannée. Pour activer le log dans ce scénario, ajoutez la ligne suivante à votre fichier `config.h` de votre keymaps.
-
-```c
-#define DEBUG_MATRIX_SCAN_RATE
-```
-
-Exemple de sortie
-
-```text
-  > matrix scan frequency: 315
-  > matrix scan frequency: 313
-  > matrix scan frequency: 316
-  > matrix scan frequency: 316
-  > matrix scan frequency: 316
-  > matrix scan frequency: 316
-```
diff --git a/docs/he-il/README.md b/docs/he-il/README.md
deleted file mode 100644
index 5c113eb498..0000000000
--- a/docs/he-il/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-<div dir="rtl" markdown="1">
-# קושחה עבור Quantum Mechanical Keyboard
-
-[![גירסה נוכחית](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)
-[![ערוץ דיסקורד](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh)
-[![מצב מסמכים](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm)
-[![תומכי GitHub](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
-[![מזלגות GitHub](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
-
-## מה היא קושחת QMK?
-
-QMK (*Quantum Mechanical Keyboard*) היא קהילת קוד פתוח (open source) שמתחזקת את קושחת QMK, QMK Toolbox, qmk.fm, והמסמכים המתאימים. קושחת QMK היא קושחה עבור מקלדות המבוססת על [tmk\_keyboard](https://github.com/tmk/tmk_keyboard) עם כמה תוספות עבור בקרי Atmel AVR ובאופן ספציפי יותר - [מוצרי OLKB](https://olkb.com), מקלדת [ErgoDox EZ](https://www.ergodox-ez.com), וגם [מוצרי Clueboard](https://clueboard.co/). בנוסף, הקושחה עברה פורט עבור שבבי ARM באמצעות ChibiOS. ניתן להשתמש בה על מנת להפעיל את מקלדות ה PCB המקוסטמות שלך.
-
-## איך להשיג אותה
-
-אם אתם מתכננים לתרום מיפוי מקשים, מקלדת או יכולת ל QMK, הדבר הקל ביותר הוא  [לעשות פורק לריפו בGitHub](https://github.com/qmk/qmk_firmware#fork-destination-box), ולעשות קלון לריפו בסביבה המקומית ושם לבצע את השינויים שלכם, לדחוף אותם ולפתוח  [Pull Request](https://github.com/qmk/qmk_firmware/pulls) מהפורק שלך.
-
-אחרת, אפשר להוריד את הקושחה באופן ישיר ([zip](https://github.com/qmk/qmk_firmware/zipball/master), [tar](https://github.com/qmk/qmk_firmware/tarball/master)), או לשכפל אותה באמצעות git (`git@github.com:qmk/qmk_firmware.git`), או https (`https://github.com/qmk/qmk_firmware.git`).
-
-## איך לקמפל
-
-לפני שתצליחו לקמפל, תדרשו [להתקין סביבה](he-il/getting_started_build_tools.md) עבור פיתוח AVR ו/או ARM. ברגע שהדבר בוצע, תוכלו להריץ פקודת `make` כדי לבנות מקלדת ומיפוי עם התחביר הבא: 
-
-    make planck/rev4:default
-
-כך תוכלו לבנות את גרסא `rev4` של ה `planck` עם מיפוי ברירת המחדל (`default`). לא כל המקלדות בעלות גרסאות (נקרא גם תת-פרוייקט או תיקייה), במקרה כזה, אפשר להריץ את הפקודה הבאה: 
-
-    make preonic:default
-
-## איך להתאים
-
-לQMK יש המון [יכולות](he-il/features.md) שאפשר לנווט בהן, וכמות נכבדת של [תיעוד ודוקומנטציה](https://docs.qmk.fm) בה אפשר לנבור. רוב הפיצ׳רים באים לידי ביטוי על ידי שינוי  [מיפוי המקלדת](he-il/keymap.md) ושינוי  [קודי המקשים](he-il/keycodes.md).
-</div>
diff --git a/docs/he-il/_summary.md b/docs/he-il/_summary.md
deleted file mode 100644
index 148eb6400d..0000000000
--- a/docs/he-il/_summary.md
+++ /dev/null
@@ -1,140 +0,0 @@
-<div dir="rtl" markdown="1">
-
-**בשפה העברית**
-* [המדריך המלא למתחילים](he-il/newbs.md)
-  * [מקורות ללמידה](he-il/newbs_learn_more_resources.md)
-* [בסיס QMK](he-il/README.md)
-    * [מבוא לQMK](he-il/getting_started_introduction.md)
-    * [איך להשתמש בGitHub](he-il/getting_started_github.md)
-    * [קבלת עזרה](he-il/getting_started_getting_help.md)
-* [שאלות נפוצות](he-il/faq.md)
-    * [שאלות נפוצות כלליות](he-il/faq_general.md)
-* [חומרה](he-il/hardware.md)
-* התייחסויות
-  * [איך לתעד נכון](he-il/documentation_best_practices.md)
-
-**בשפה האנגלית**
-* [המדריך המלא למתחילים](he-il/newbs.md)
-  * [התחלה](he-il/newbs_getting_started.md)
-  * [בנייה של הקושחה הראשונה שלך](he-il/newbs_building_firmware.md)
-  * [צריבה של הקושחה](he-il/newbs_flashing.md)
-  * [בדיקות ודיבאגינג](he-il/newbs_testing_debugging.md)
-  * [עבודה נכונה ב GIT](he-il/newbs_best_practices.md)
-  * [מקורות ללמידה](he-il/newbs_learn_more_resources.md)
-
-* [בסיס QMK](he-il/README.md)
-  * [מבוא לQMK](he-il/getting_started_introduction.md)
-  * [QMK CLI](he-il/cli.md)
-  * [QMK CLI Config](he-il/cli_configuration.md)
-  * [תרומה ל QMK](he-il/contributing.md)
-  * [איך להשתמש בGitHub](he-il/getting_started_github.md)
-  * [קבלת עזרה](he-il/getting_started_getting_help.md)
-
-* [שינויים משמעותיים](he-il/breaking_changes.md)
-  * [2019 Aug 30](he-il/ChangeLog/20190830.md)
-
-* [שאלות נפוצות](he-il/faq.md)
-  * [שאלות נפוצות כלליות](he-il/faq_general.md)
-  * [בנייה/קומפילציה של QMK](he-il/faq_build.md)
-  * [דיבאגינג ופתרון תקלות של QMK](he-il/faq_debug.md)
-  * [מיפוי מקשים](he-il/faq_keymap.md)
-  * [התקנת דרייברים עם Zadig](he-il/driver_installation_zadig.md)
-
-* מדריכים מפורטים
-  * [התקנת כלי Build](he-il/getting_started_build_tools.md)
-  * [מדריך Vagrant](he-il/getting_started_vagrant.md)
-  * [הוראות בנייה/קומפילציה](he-il/getting_started_make_guide.md)
-  * [צריבת קושחה](he-il/flashing.md)
-  * [התאמה אישית של הפונקציונאליות](he-il/custom_quantum_functions.md)
-  * [מיפוי מקשים](he-il/keymap.md)
-
-* [חומרה](he-il/hardware.md)
-  * [מעבדי AVR](he-il/hardware_avr.md)
-  * [דרייברים](he-il/hardware_drivers.md)
-
-* התייחסויות
-  * [מדריך למקלדות](he-il/hardware_keyboard_guidelines.md)
-  * [אפשרויות הגדרות](he-il/config_options.md)
-  * [קודי מקשים](he-il/keycodes.md)
-  * [קונבנציות קוד - C](he-il/coding_conventions_c.md)
-  * [קונבנציות קוד - Python](he-il/coding_conventions_python.md)
-  * [איך לתעד נכון](he-il/documentation_best_practices.md)
-  * [טמפלטים לדוקומנטציה](he-il/documentation_templates.md)
-  * [מילון](he-il/reference_glossary.md)
-  * [בדיקות יחידה](he-il/unit_testing.md)
-  * [פונקציות שימושיות](he-il/ref_functions.md)
-  * [תמיכה בConfigurator](he-il/reference_configurator_support.md)
-  * [פורמט info.json](he-il/reference_info_json.md)
-  * [פיתוח בPython CLI](he-il/cli_development.md)
-
-* [תכונות](he-il/features.md)
-  * [Basic Keycodes](he-il/keycodes_basic.md)
-  * [US ANSI Shifted Keys](he-il/keycodes_us_ansi_shifted.md)
-  * [Quantum Keycodes](he-il/quantum_keycodes.md)
-  * [Advanced Keycodes](he-il/feature_advanced_keycodes.md)
-  * [Audio](he-il/feature_audio.md)
-  * [Auto Shift](he-il/feature_auto_shift.md)
-  * [Backlight](he-il/feature_backlight.md)
-  * [Bluetooth](he-il/feature_bluetooth.md)
-  * [Bootmagic](he-il/feature_bootmagic.md)
-  * [Combos](he-il/feature_combo.md)
-  * [Command](he-il/feature_command.md)
-  * [Debounce API](he-il/feature_debounce_type.md)
-  * [DIP Switch](he-il/feature_dip_switch.md)
-  * [Dynamic Macros](he-il/feature_dynamic_macros.md)
-  * [Encoders](he-il/feature_encoders.md)
-  * [Grave Escape](he-il/feature_grave_esc.md)
-  * [Haptic Feedback](he-il/feature_haptic_feedback.md)
-  * [HD44780 LCD Controller](he-il/feature_hd44780.md)
-  * [Key Lock](he-il/feature_key_lock.md)
-  * [Layouts](he-il/feature_layouts.md)
-  * [Leader Key](he-il/feature_leader_key.md)
-  * [LED Matrix](he-il/feature_led_matrix.md)
-  * [Macros](he-il/feature_macros.md)
-  * [Mouse Keys](he-il/feature_mouse_keys.md)
-  * [OLED Driver](he-il/feature_oled_driver.md)
-  * [One Shot Keys](he-il/one_shot_keys.md)
-  * [Pointing Device](he-il/feature_pointing_device.md)
-  * [PS/2 Mouse](he-il/feature_ps2_mouse.md)
-  * [RGB Lighting](he-il/feature_rgblight.md)
-  * [RGB Matrix](he-il/feature_rgb_matrix.md)
-  * [Space Cadet](he-il/feature_space_cadet.md)
-  * [Split Keyboard](he-il/feature_split_keyboard.md)
-  * [Stenography](he-il/feature_stenography.md)
-  * [Swap Hands](he-il/feature_swap_hands.md)
-  * [Tap Dance](he-il/feature_tap_dance.md)
-  * [Terminal](he-il/feature_terminal.md)
-  * [Thermal Printer](he-il/feature_thermal_printer.md)
-  * [Unicode](he-il/feature_unicode.md)
-  * [Userspace](he-il/feature_userspace.md)
-  * [Velocikey](he-il/feature_velocikey.md)
-
-* למייקרים ומודרים
-  * [מדריך לכתיבה ידנית](he-il/hand_wire.md)
-  * [מדריך לצריבת ISP](he-il/isp_flashing_guide.md)
-  * [מדריך לדיבאגינג ARM](he-il/arm_debugging.md)
-  * [מנהל התקן I2C](he-il/i2c_driver.md)
-  * [מנהל התקן SPI](he-il/spi_driver.md)
-  * [בקרת GPIO](he-il/internals_gpio_control.md)
-  * [המרת Proton C](he-il/proton_c_conversion.md)
-
-* להבנה עמוקה יותר
-  * [איך עובדות מקלדות](he-il/how_keyboards_work.md)
-  * [להבין את QMK](he-il/understanding_qmk.md)
-
-* נושאים נוספים
-  * [שימוש ב - Eclipse עם QMK](he-il/other_eclipse.md)
-  * [שימוש ב - VSCode עם QMK](he-il/other_vscode.md)
-  * [תמיכה](he-il/getting_started_getting_help.md)
-  * [כיצד להוסיף תרגום](he-il/translating.md)
-
-* QMK מבפנים (בתהליך)
-  * [Defines](he-il/internals_defines.md)
-  * [Input Callback Reg](he-il/internals_input_callback_reg.md)
-  * [Midi Device](he-il/internals_midi_device.md)
-  * [Midi Device Setup Process](he-il/internals_midi_device_setup_process.md)
-  * [Midi Util](he-il/internals_midi_util.md)
-  * [Send Functions](he-il/internals_send_functions.md)
-  * [Sysex Tools](he-il/internals_sysex_tools.md)
-
-</div>
diff --git a/docs/he-il/documentation_best_practices.md b/docs/he-il/documentation_best_practices.md
deleted file mode 100644
index bba9d886ab..0000000000
--- a/docs/he-il/documentation_best_practices.md
+++ /dev/null
@@ -1,67 +0,0 @@
-<div dir="rtl" markdown="1">
-# איך לתעד נכון
-
-עמוד זה קיים כדי לתעד את השיטות הטובות ביותר כאשר כותבים תיעוד עבור QMK. מעקב אחר הוראות אלה יעזור לשמור על סגנון וטון עקביים, אשר בתורם יעזרו לאנשים אחרים להבין טוב יותר את QMK.
-
-# פתיחת עמוד
-
-התיעוד שלך צריך בד״כ להפתח עם כותרת בגודל H1, אחריה פסקה אחת של תיאור של מה המשתמש ימצא בעמוד זה.
-זכור כי כותרת זו והפסקה ימוקמו ליד תוכן העניינים, אז חשוב לשמור על כותרת קצרה ולהמנע ממשפטים ארוכים ללא פיסוק.
-
-לדוגמה:
-
-```
-# הכותרת שלי
-
-עמוד זה מדבר על היכולת הסופר-מגניבה שלי. אתה יכול להשתמש ביכולת זו כדי להכין קפה, לסחוט תפוזים ולקבל משלוח של ביצים ועוגות מהסופר הקרוב באמצעות רחפן.
-```
-
-# כותרות
-
-עמוד התיעוד צריך לאופן כללי לכלול מס׳ כותרות בגודל "H1". רק כותרות מגודל H1 ו- H2 יכללו בתוכן העניינים, אז חשוב לתכנן אותם בהתאם. הכותרות לא להיות רחבות מידי כדי למנוע מתוכן העניינים להפוך להיות רחב מידי
-
-# בלוקי רמיזה מעוצבים
-
-ניתן להוסיף בלוקי רמיזה מעוצבים שמצויירים מסביב לטקסט כדי למשוך תשומת לב אליו.
-
-### חשוב
-
-```
-!> זה חשוב
-```
-
-יתרנדר כ:
-
-!> זה חשוב
-
-### טיפים כלליים
-
-```
-?> זהו טיפ שימושי.
-```
-
-יתרנדר כ:
-
-?> זהו טיפ שימושי.
-
-
-# תיעוד יכולות ופיצ׳ריםDocumenting Features
-
-אם יוצרים יכולת חדשה ב QMK, צרו עמוד תיעוד עבורה. העמוד לא צריך להיות ארוך במיוחד, מספר משפטים המתארים את היכולת (פיצ׳ר) וטבלה המתארת קודי מקשים רלוונטיים זה מספיק. הנה דוגמה בסיסית:
-
-```markdown
-# הפיצ׳ר המגניב שלי
-
-עמוד זה מדבר על היכולת הסופר-מגניבה שלי. אתה יכול להשתמש ביכולת זו כדי להכין קפה, לסחוט תפוזים ולקבל משלוח של ביצים ועוגות מהסופר הקרוב באמצעות רחפן.
-
-## קודי המקשים המגניבים של היכולת שלי
-
-|Long Name|Short Name|Description|
-|---------|----------|-----------|
-|KC_COFFEE||Make Coffee|
-|KC_CREAM||Order Cream|
-|KC_SUGAR||Order Sugar|
-```
-
-מקמו את התיעוד שלכם בתוך  `docs/feature_<my_cool_feature>.md`, והוסיפו קישור לקובץ זה במקום המתאים ב `docs/_sidebar.md`. אם הוספתם קודי מקשים נוספים, תקפידו להוסיף אותם ל-  `docs/keycodes.md` עם לינק לעמוד היכולת שלכם.
-</div>
diff --git a/docs/he-il/faq.md b/docs/he-il/faq.md
deleted file mode 100644
index 0a783eb8ca..0000000000
--- a/docs/he-il/faq.md
+++ /dev/null
@@ -1,8 +0,0 @@
-<div dir="rtl" markdown="1">
-# שאלות נפוצות
-
-* [כללי](faq_general.md)
-* [בנייה או קומפילציה של QMK](faq_build.md)
-* [דיבאגינג ופתרון בעיות של QMK](faq_debug.md)
-* [מיפוי מקשים](faq_keymap.md)
-</div>
diff --git a/docs/he-il/faq_general.md b/docs/he-il/faq_general.md
deleted file mode 100644
index fc102d6c6a..0000000000
--- a/docs/he-il/faq_general.md
+++ /dev/null
@@ -1,17 +0,0 @@
-<div dir="rtl" markdown="1">
-# שאלות נפוצות
-
-## מה זה QMK?
-
-[QMK](https://github.com/qmk), קיצור עבור Quantum Mechanical Keyboard, הוא קבוצה של אנשים הבונים כלים עבור מקלדות מותאמות אישית. התחלנו עם  [קושחת QMK](https://github.com/qmk/qmk_firmware), פורק של [TMK](https://github.com/tmk/tmk_keyboard) אשר שונה באופן ניכר.
-
-## מה ההבדלים העיקריים בין QMK ו-Keymap TMK?
-
-TMK עוצב ומומש במקור ע״י [Jun Wako](https://github.com/tmk). QMK התחיל כפורק של [Jack Humbert](https://github.com/jackhumbert) של הפרוייקט של TMK עבור Planck. אחרי כמה זמן הפורק של ג׳ק השתנה מזה של TMK וב- 2015 ג׳ק החליט לשנות את שמו  של הפורק ל- QMK.
-
-מנק׳ מבט טכנית, QMK נבנה על גבי TMK ע״י הוספת יכולות ופיצ׳רים חדשים. ראוי לציון ש- QMK הרחיב את מס׳ קודי המקלדת האפשריים ומשתמש בהם למימוש יכולות מתקדמות כמו `S()`, `LCTL()`, ו- `MO()`. ניתן לראות רשימה מלאה של קודי המקלדת האלה ב - [קודי מקלדת](keycodes.md).
-
-מנק׳ מבט של הפרוייקט וניהול הקהילה, TMK מנהל את כל המקלדות הנתמכות בעצמו, עם מעט תמיכה מהקהילה. כל אחד יכול לעשות פורק מהפרוייקט עבור מקלדות אחרות. רק מס׳ מיפויי מקשים נמצאים בברירת המחדל כך שאנשים בד״כ לא משתפים מיפויי מקשים זה עם זה. QMK מעודד את השיתוף של המקלדות וקודי המקשים דרך רפוזיטורי בניהול מרכזי, אשר מקבל את כל בקשות ה- Pull Requests שעומדות בסטנדרט האיכות. רובם מנוהלות ע״י הקהילה, אבל הצוות של QMK עוזר כשנדרש.
-
-לשתי הגישות יש יתרונות וחסרונות וקוד עובר בחופשיות בין TMK ל- QMK כשצריך.
-</div>
diff --git a/docs/he-il/getting_started_getting_help.md b/docs/he-il/getting_started_getting_help.md
deleted file mode 100644
index 7dec3e87d6..0000000000
--- a/docs/he-il/getting_started_getting_help.md
+++ /dev/null
@@ -1,17 +0,0 @@
-<div dir="rtl" markdown="1">
-# קבלת עזרה
-
-ישנם משאבים רבים לצורך קבלת עזרה עם QMK.
-
-## צ׳אט בזמן אמת
-
-אפשר למצוא מפתחי QMK ומשתמשים [בשרת ה-Discord הראשי שלנו](https://discord.gg/Uq7gcHh). ישנם ערוצים ספציפיים בשרת לצורך שיחות על הקושחה, ארגז הכלים, חומרה והמגדיר.
-
-## סאב-רדיט OLKB
-
-הפורום הרשמי של QMK נמצא ב - [/r/olkb](https://reddit.com/r/olkb) באתר [reddit.com](https://reddit.com).
-
-## סוגיות GitHub
-
-ניתן לפתוח [סוגייה ב-GitHub](https://github.com/qmk/qmk_firmware/issues). הדבר שימושי במיוחד כאשר הסוגיה דורשת דיון עמוק וארוך או דיבאגינג.
-</div>
diff --git a/docs/he-il/getting_started_github.md b/docs/he-il/getting_started_github.md
deleted file mode 100644
index ca79e40f9a..0000000000
--- a/docs/he-il/getting_started_github.md
+++ /dev/null
@@ -1,74 +0,0 @@
-<div dir="rtl" markdown="1">
-# איך להשתמש ב-GitHub עם QMK
-
-GitHub עלול להיות קצת טריקי למי שלא מכיר את העבודה איתו - מדריך זה ילווה אתכם שלב אחר שלב דרך ביצוע פעולות fork, clone ו-pull request עם QMK.
-
-?> מדריך זה מניח שאתם מרגישים בנוח עם הרצה של פקודות בסביבת command line (שורת הפקודה) ו-git מותקן במערכת שלכם.
-
-התחילו ב- [עמוד של QMK ב-GitHub](https://github.com/qmk/qmk_firmware), ותצמאו כפתור בחלק העליון מימין עם התיכוב "Fork":
-
-![Fork ב-GitHub](https://i.imgur.com/8Toomz4.jpg)
-
-אם אתם חלק מארגון, תצטרכו לבחור לאיזה חשבון לבצע פעולת fork. ברוב המבקרים, תרצו לבצע fork לתוך החשבון הפרטי שלכם. ברגע שה-fork הסתיים (לפעמים זה יכול לקחת קצת זמן) הקליקו על כפתור ה-"Clone or Download":
-
-![הורדה מ-GitHub](https://i.imgur.com/N1NYcSz.jpg)
-
-תוודאו שאתם בוחרים באופצייה של  "HTTPS", בחרו את הקישור והעתיקו אותו:
-
-![קישור HTTPS](https://i.imgur.com/eGO0ohO.jpg)
-
-מכאן והלאה, הקיש `git clone --recurse-submodules ` בשורת הפקודה והדביקו את הלינק שלכם:
-
-<div dir="ltr" markdown="1">
-
-```
-user@computer:~$ git clone --recurse-submodules https://github.com/whoeveryouare/qmk_firmware.git
-Cloning into 'qmk_firmware'...
-remote: Enumerating objects: 9, done.
-remote: Counting objects: 100% (9/9), done.
-remote: Compressing objects: 100% (5/5), done.
-remote: Total 183883 (delta 5), reused 4 (delta 4), pack-reused 183874
-Receiving objects: 100% (183883/183883), 132.90 MiB | 9.57 MiB/s, done.
-Resolving deltas: 100% (119972/119972), done.
-...
-Submodule path 'lib/chibios': checked out '587968d6cbc2b0e1c7147540872f2a67e59ca18b'
-Submodule path 'lib/chibios-contrib': checked out 'ede48346eee4b8d6847c19bc01420bee76a5e486'
-Submodule path 'lib/googletest': checked out 'ec44c6c1675c25b9827aacd08c02433cccde7780'
-Submodule path 'lib/lufa': checked out 'ce10f7642b0459e409839b23cc91498945119b4d'
-```
-
-</div>
-
-כעת, יש לכם את ה-fork של QMK על המכונה המקומית שלכם ואתם יכולים להוסיף את מיפויי המקשים שלכם, לקמפל את הפרוייקט ולצרוב אותו על הלוח שלכם. כשאתם שלמים עם השינוי שעשיתם, תוכלו להוסיף, לבצע פעולת commit ולדחוף את השינויים ל-fork שלכם באופן הבא:
-
-<div dir="ltr" markdown="1">
-
-```
-user@computer:~$ git add .
-user@computer:~$ git commit -m "adding my keymap"
-[master cccb1608] adding my keymap
- 1 file changed, 1 insertion(+)
- create mode 100644 keyboards/planck/keymaps/mine/keymap.c
-user@computer:~$ git push
-Counting objects: 1, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (1/1), done.
-Writing objects: 100% (1/1), 1.64 KiB | 0 bytes/s, done.
-Total 1 (delta 1), reused 0 (delta 0)
-remote: Resolving deltas: 100% (1/1), completed with 1 local objects.
-To https://github.com/whoeveryouare/qmk_firmware.git
- + 20043e64...7da94ac5 master -> master
-```
-
-</div>
-
-השינויים שלכם יופיעו ב-fork שלכם ב-GitHub - אם תחזרו לשם  (`https://github.com/<whoeveryouare>/qmk_firmware`), תוכלו ליצור "Pull Request חדש" ע״י הקשה על הכפתור הבא:
-
-![Pull Request חדש](https://i.imgur.com/DxMHpJ8.jpg)
-
-כאן תוכלו לראות בדיוק למה עשיתם commit - אם הכל נראה תקין, תוכלו להשלים את הפעולה ע״י הקשה על  "Create Pull Request":
-
-![צרו Pull Request](https://i.imgur.com/Ojydlaj.jpg)
-
-אחרי שהגשתם, אנו עלולים לפנות אליכם לגבי השינויים שהצעתם, נבקש שתבצעו שינויים ובסופו של דבר נקבל את השינויים! תודה שתרמתם לפרוייקט QMK :)
-</div>
diff --git a/docs/he-il/getting_started_introduction.md b/docs/he-il/getting_started_introduction.md
deleted file mode 100644
index fca86bdaaf..0000000000
--- a/docs/he-il/getting_started_introduction.md
+++ /dev/null
@@ -1,72 +0,0 @@
-<div dir="rtl" markdown="1">
-# מבוא
-
-עמוד זה מנסה להסביר את המידע הבסיסי אותו תדרשו לדעת כדי לעבוד עם פרוייקט QMK. הוא מניח שאתם יודעים איך לנווט בסביבת Unix Shell, אבל לא מניח שאתם מכירים את שפת C או קומפילציה באמצעות make.
-
-## מבנה QMK בסיסי
-
-QMK הוא פורק של הפרוייקט [tmk_keyboard](https://github.com/tmk/tmk_keyboard) של [Jun Wako](https://github.com/tmk). קוד הTMK המקורי, עם התאמות, יכול להמצא בתיקיית `tmk_core`. התוספות של QMK לפרוייקט יכולות להמצא בתיקיית `quantum`. פרוייקטי מקלדות יכולות להמצא בתיקיות `handwired` ו- `keyboard`.
-
-### מבנה אחסון המשתמש
-
-בתוך תיקיית `users` יש תיקייה לכל משתמש. זה המקום למשתמשים להוסיף קוד שהם רוצים להשתמש בו במקלדות שונות. מומלץ לעיין במסמך [תכונות אחסון המשתמש](feature_userspace.md) לקבלת מידע נוסף.
-
-### מבנה פרוייקט המקלדת
-
-בתוך תיקיית `keyboards`, תת התיקייה `handwired` ותת התיקיות של היצרן והמוכר, לדוגמה `clueboard` היא תיקייה לכל פרוייקט מקלדת - `qmk_firmware/keyboards/clueboard/2x1800` בתוך התיקייה הזאת תמצאו את המבנה הבא:
-
-
-* `keymaps/`: מיפויי מקשים שונים היכולים להבנות
-* `rules.mk`: קובץ המגדיר את הגדרות ברירת המחדל של `make`. נא לא לערוך את הקובץ ישירות, במקום זאת, השתמשו בקובץ מיפוי המקשים ספציפי `rules.mk`.
-* `config.h`: הקובץ מכיל הגדרות לזמן הקומפילציה. נא לא לערוך את הקובץ ישירות אלא להשתמש בקובץ `config.h` לכל מיפויי מקשים.
-* `info.json`: הקובץ מכיל הגדרות פריסה עבור QMK Configurator. צפו ב [תמיכת Configurator](reference_configurator_support.md) למידע נוסף.
-* `readme.md`: סקירה כללית של המקלדת.
-* `<keyboardName>.h`: הקובץ בו פריסת המקלדת מוגדרת אל מול מטריצת המתגים של המקלדת.
-* `<keyboardName>.c`: הקובץ בו ניתן למצוא קוד מותאם למקלדת.
-
-למידע נוסף - אנא הכנסו ל [QMK](hardware_keyboard_guidelines.md).
-For more information on project structure, see [QMK מדריך למקלדת](hardware_keyboard_guidelines.md).
-
-### מבנה מפיוי המקשים
-
-בכל ספריית מיפוי מקשים, הקבצים הבאים עלולים להמצא. רק הקובץ `keymap.c` הוא חובה, אם השאר לא נמצאים, אפשרויות ברירת המחדל יבחרו.
-In every keymap folder, the following files may be found. Only `keymap.c` is required, and if the rest of the files are not found the default options will be chosen.
-
-* `config.h`: ההגדרות השונות עבור מיפוי המקשים.
-* `keymap.c`: כל הקודים של מיפוי המקשים, קובץ חובה
-* `rules.mk`: אילו יכולות של QMK מאופשרות.
-* `readme.md`: הסבר על מיפוי המקשים, איך אחרים ישתמשו בו והסבר על היכולות. נא להעלות תמונות לשירותים כמו imgur.
-
-# קובץ `config.h` 
-
-לקובץ `config.h` יש 3 מיקומים אפשריים:
-
-* keyboard (`/keyboards/<keyboard>/config.h`)
-* userspace (`/users/<user>/config.h`)
-* keymap (`/keyboards/<keyboard>/keymaps/<keymap>/config.h`)
-
-מערכת הבילד אוטומטית בוחרת את קובץ ההגדרות לפי הסדר הנ״ל. אם רוצים לדרוס הגדרה מסויימת שהוגדרה בקובץ `config.h` קודם, ראשית תצטרכו להשתמש בקוד מוכן עבור ההגדרות שאתם רוצים לשנות.
-
-<div dir="ltr"  markdown="1">
-
-```
-#pragma once
-```
-
-</div>
-
-כדי לדרוס הגדרות מקובץ `config.h` קודם, אתם מוכרחים להשתמש בפקודת `#undef` ואז שוב `#define`.
-
-דוגמה לקוד כזה נראית כך:
-<div dir="ltr"  markdown="1">
-
-```
-#pragma once
-
-// overrides go here!
-#undef MY_SETTING
-#define MY_SETTING 4
-```
-
-</div>
-</div>
diff --git a/docs/he-il/hardware.md b/docs/he-il/hardware.md
deleted file mode 100644
index fca03bd64b..0000000000
--- a/docs/he-il/hardware.md
+++ /dev/null
@@ -1,10 +0,0 @@
-<div dir="rtl" markdown="1">
-# חומרה
-
-QMK רצה על מגוון של חומרות. אם המעבד שלך יכול להיות ממוקד (מטורגט) ע״י [LUFA](https://www.fourwalledcubicle.com/LUFA.php) או [ChibiOS](https://www.chibios.org) כנראה שתוכל לגרום ל QMK לרוץ על המעבד. קטע זה מדבר על הרצת QMK, ותקשורת עם, סוגים שונים של חומרות.
-
-* [מדריך למקלדת](hardware_keyboard_guidelines.md)
-* [מעבדי AVR](hardware_avr.md)
-* מעבדי ARM (TBD)
-* [מנהלי התקנים](hardware_drivers.md)
-</div>
diff --git a/docs/he-il/newbs_learn_more_resources.md b/docs/he-il/newbs_learn_more_resources.md
deleted file mode 100644
index 4127c387ff..0000000000
--- a/docs/he-il/newbs_learn_more_resources.md
+++ /dev/null
@@ -1,16 +0,0 @@
-<div dir="rtl" markdown="1">
-# מקורות ללמידה
-
-המקורות הבאים מטרתם היא לתת למשתמשים חדשים בקהילת QMK כדי להבין לעומק את המידע שמגיע במסמכי המתחילים.
-
-מקורות גיט:
-
-* [מדריך כללי מעולה](https://www.codecademy.com/learn/learn-git)
-* [משחק גיט כדי ללמוד מדוגמאות](https://learngitbranching.js.org/)
-* [מקורות גיט כדי ללמוד עוד על GitHub](getting_started_github.md)
-* [מקור גיט כדי ללמוד במפורש על QMK](contributing.md)
-
-מקורות לפקודות שורה (Command Line):
-
-* [מדריך טוב על Command Line](https://www.codecademy.com/learn/learn-the-command-line)
-</div>
diff --git a/docs/he-il/proton_c_conversion.md b/docs/he-il/proton_c_conversion.md
deleted file mode 100644
index 9642ca3090..0000000000
--- a/docs/he-il/proton_c_conversion.md
+++ /dev/null
@@ -1,36 +0,0 @@
-<div dir="rtl" markdown="1">
-# המרה של לוח להשתמש ב-Proton C
-
-אם לוח נתמך ב-QMK משתמש בלוח Pro Micro (או כל לוח נתמך) ואתם רוצים להשתמש ב-Proton C, ניתן לייצר את החומרה ע"י הוספה של הפקודה `CONVERT_TO_PROTON_C=yes` (או `CTPC=yes`) לפקודת make, כמו כאן:
-<div dir="ltr" markdown="1">
-
-```
-    make 40percentclub/mf68:default CTPC=yes
-```
-
-</div>
-ניתן להוסיף את אותו ארגומנט לקובץ `rules.mk` במיפוי המקשים שלכם, שתיצור את אותה התוצאה.
-
-הדבר חושף את דגל `CONVERT_TO_PROTON_C` שניתן להשתמש בו בקוד שלכם באמצעות פקודת `#ifdef`, כמו כאן:
-<div dir="ltr" markdown="1">
-
-```
-    #ifdef CONVERT_TO_PROTON_C
-        // Proton C code
-    #else
-        // Pro Micro code
-    #endif
-```
-
-</div>
-לפני שתצליחו לקמפל, יכול להיות שתקבלו שגיאות שונות לגבי `PORTB/DDRB`, וכו' שלא הוגדרו, אם כך, תצטרכו להמיר את קודי המקלדת להשתמש ב - [בקרי GPIO](internals_gpio_control.md) שיעבדו עבור ARM וגם AVR. הדבר לא אמור להשפיע על הבילדים של AVR בכלל.
-
-ל-Proton C יש רק מנורת LED אחת על הלוח (C13), וכברירת מחדל, TXLED (D5) ממופה אליו. אם תרצו במקום, למפות אליו את  RXLED (B0), הוסיפו את השורה הבא לקובץ `config.h`:
-<div dir="ltr"  markdown="1">
-
-```
-    #define CONVERT_TO_PROTON_C_RXLED
-```
-
-</div>
-</div>
diff --git a/docs/he-il/quantum_keycodes.md b/docs/he-il/quantum_keycodes.md
deleted file mode 100644
index 5374fd47ad..0000000000
--- a/docs/he-il/quantum_keycodes.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<div dir="rtl" markdown="1">
-# קודי מקלדת Quantum
-
-קודי מקלדת Quantum מאפשרים התאמה נוחה יותר של מיפוי המקשים שלך מעבר למה שהבסיסי מאפשר, ללא צורך בהגדרת של פעולות מותאמות אישית.
-
-כל קודי המקלדת בתוך quantum הם מספרים בין `0x0000` ֿֿֿ ל-`0xFFFF`. בתוך הקובץ `keymap.c` זה עלול להראות כאילו יש לך פונקציות ומקרים יחודיים נוספים, אבל בסופו של דבר הקדם-מעבד של שפת C יתרגם אלה לתוך מספר יחיד בין 4 בתים. QMK שמרה את מרחב הכתובות בין `0x0000` עד ל- `0x00FF` עבור קודי מקשים סטנדרטיים. קודי מקשים אלה, כגון `KC_A`, `KC_1`, ו- `KC_LCTL`, אשר מתארים מקשים בסיסיים מוגדרים בתוך USB HID specification.
-
-בעמודו זה יש לנו את קודי המקשים מתועדים בין `0x00FF` ֿֿ ל- `0xFFFF` אשר משומשים בשביל לממש יכולות מתקדמות של quantum. אם תגדירו קודי מקשים משלכם, הם יתווספו לתוך המרחב הזה גם כן.
-
-## קודי מקשים של QMK
-<div dir="ltr"  markdown="1">
-
-```
-|Key            |Aliases    |Description                                                          |
-|---------------|-----------|---------------------------------------------------------------------|
-|`RESET`        |           |Put the keyboard into DFU mode for flashing                          |
-|`DEBUG`        |           |Toggle debug mode                                                    |
-|`EEPROM_RESET` |`EEP_RST`  |Resets EEPROM state by reinitializing it                             |
-|`KC_GESC`      |`GRAVE_ESC`|Escape when tapped, <code>&#96;</code> when pressed with Shift or GUI|
-|`KC_LEAD`      |           |The [Leader key](feature_leader_key.md)                              |
-|`KC_LOCK`      |           |The [Lock key](feature_key_lock.md)                                  |
-```
-
-</div>
-</div>
diff --git a/docs/index.html b/docs/index.html
index 5312b9105d..f5a8dbbf12 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -51,13 +51,7 @@
       basePath: '/',
       name: 'QMK Firmware',
       nameLink: {
-        '/de/': '/#/de/',
-        '/es/': '/#/es/',
-        '/fr-fr/': '/#/fr-fr/',
-        '/he-il/': '/#/he-il/',
         '/ja/': '/#/ja/',
-        '/pt-br/': '/#/pt-br/',
-        '/ru-ru/': '/#/ru-ru/',
         '/zh-cn/': '/#/zh-cn/',
         '/': '/#/'
       },
@@ -68,30 +62,20 @@
       auto2top: true,
       autoHeader: true,
       fallbackLanguages: [
-        'de',
-        'es',
-        'fr-fr',
-        'he-il',
         'ja',
-        'pt-br',
-        'ru-ru',
         'zh-cn'
       ],
       formatUpdated: '{YYYY}/{MM}/{DD} {HH}:{mm}',
       search: {
         paths: 'auto',
         placeholder: {
-          '/es/': 'Buscar',
           '/zh-cn/': '搜索',
           '/ja/': '検索',
-          '/pt-br/': 'Busca',
           '/': 'Search'
         },
         noData: {
-          '/es/': '¡Ningún resultado!',
           '/zh-cn/': '没有结果!',
           '/ja/': '見つかりません!',
-          '/pt-br/': 'Nenhum resultado!',
           '/': 'No results!'
         },
         depth: 6
@@ -103,21 +87,14 @@
       copyCode: {
         buttonText: {
           '/zh-cn/': '点击复制',
-          '/ru/'   : 'Скопировать в буфер обмена',
-          '/de-de/': 'Klicken Sie zum Kopieren',
-          '/es/'   : 'Haga clic para copiar',
           '/'      : 'Copy to clipboard'
         },
         errorText: {
           '/zh-cn/': '错误',
-          '/ru/'   : 'ошибка',
           '/'      : 'Error'
         },
         successText: {
           '/zh-cn/': '复制',
-          '/ru/'   : 'Скопировано',
-          '/de-de/': 'Kopiert',
-          '/es/'   : 'Copiado',
           '/'      : 'Copied'
         }
       },
diff --git a/docs/ko-kr/README.md b/docs/ko-kr/README.md
deleted file mode 100644
index a3b5b91011..0000000000
--- a/docs/ko-kr/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-# Quantum Mechanical Keyboard Firmware
-
-[![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)
-[![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh)
-[![Docs Status](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm)
-[![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
-[![GitHub forks](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
-
-## QMK Firmware 란?
-
-QMK(*Quantum Mechanical Keyboard 양자 기계식 키보드*)란 QMK 컴워어, QMK 툴박스, qmk.fm 를 관리하고 있는 오픈소스 커뮤니티 입니다. QMK펌웨어는 [tmk\_keyboard](https://github.com/tmk/tmk_keyboard)를 바탕으로 만들어진 키보드펌웨어이며, Atmel AVR컨트롤러와 [OLKB 제품군](https://olkb.com) [ErgoDox EZ](https://www.ergodox-ez.com), 그리고 [Clueboard 제품군](https://clueboard.co/) 이용할때 매우 편리합니다. 또한 QMK는 ChibiOS를 사용하여 ARM기반의 컨트롤러로도 사용할수 있습니다. 마지막으로 QMK는 커스텀회로와 핸드와이어드 키보드을 작동시키는데에도 사용가능합니다.
-
-
-## 설치하기
-
-만약 당신이 QMK에 키보드, 키맵, 또는 새로운 기능을 추가하고싶다면, 가장쉬운 방법은 Github를 통해 [저장소(REPO)를 추가하고]((https://github.com/qmk/qmk_firmware#fork-destination-box)) 로컬에서 변화 또는 수정하고, [PULL REQUEST](https://github.com/qmk/qmk_firmware/pulls)을 통해 업로드 할수 있습니다.
-
-또다른 방법으로는, 직접 파일들 로컬로 다운로드 하거나([zip](https://github.com/qmk/qmk_firmware/zipball/master), [tar](https://github.com/qmk/qmk_firmware/tarball/master)), git (`git@github.com:qmk/qmk_firmware.git`), https (`https://github.com/qmk/qmk_firmware.git`)을 통해 클론을 만들수 있습니다.
-
-## 컴파일
-
-먼저 컴파일을 하기전 AVR 이나 ARM [개발환경](getting_started_build_tools.md)을 구축해야 합니다. 모든준비가 끝났다면 `make`를 다음과 같이 키보드와 키맵을 선택하여 컴파일 할 수 있습니다.
-
-    make planck/rev4:default
-
-이 커맨드는 `rev4`버전의 `planck`를 `default`키맵으로 컴파일 할것입니다. 다만 모든 키보드는 파일, 수정본 또는 세부프로젝트를 가지고있지 않음으로 수정본 부분을 생략될수 있습니다.
-
-    make preonic:default
-
-## 커스터마이징
-
-QMK는 사용할 수 있는 매우 다양한 [기능](features.md)과 체계화된 [참고자료](https://docs.qmk.fm)들이 있습니다. 그중 대부분은 [키맵](keymap.md)을 수정하거나 [키코드](keycodes.md)를 변경하는데에 특화되어 있습니다.
diff --git a/docs/ko-kr/getting_started_build_tools.md b/docs/ko-kr/getting_started_build_tools.md
deleted file mode 100644
index c5aa8d0c03..0000000000
--- a/docs/ko-kr/getting_started_build_tools.md
+++ /dev/null
@@ -1,156 +0,0 @@
-# 컴파일 도구 설치
-
-이 페이지는 QMK 컴파일 환경을 설치하는 방법을 설명합니다. 이 페이지는 AVR 프로세서들(예를 들면 atmega32u4와 비슷한)을 위한 가이드를 제공합니다
-
-<!-- FIXME: We should have ARM instructions somewhere. -->
-
-
-**노트:** 만약 당신이 처음 시작한다면 [입문자를 위한 가이드](newbs.md)페이지를 확인하세요.
-
-계속하기전에 당신의 서브모듈(외부라이브러리)이 최신인지 `make git-submodule`을 사용하여 확인하세요.
-
-## 리눅스
-
-당신이 항상 최신 파일을 가지고 있는지는 `sudo util/qmk_install.sh`을 이용하여 간단히 확인할 수 있습니다. 이 명령어는 당신이 필요한 모든 속성물(dependencies)를 설치할 것입니다. **이 명령어는 `apt-get upgrade`를 사용합니다**
-
-또한 당신의 직접 필요한 것들을 설치할 수도 있습니다. 하지만 이 자료는 항상 최신의 자료을 가지고 있지 않습니다.
-
-현재로써 필요한 것은 다음과 같습니다. 하지만 당신이 하는 작업에 따라 당신은 다음 패키지를 다 쓰지 않을 수도 있습니다. 또한 환경에 따라 모든 다음 패키지는 다른이름으로 존재하거나, 없을 수도 있습니다.
-
-```
-build-essential
-gcc
-unzip
-wget
-zip
-gcc-avr
-binutils-avr
-avr-libc
-dfu-programmer
-dfu-util
-gcc-arm-none-eabi
-binutils-arm-none-eabi
-libnewlib-arm-none-eabi
-git
-```
-
-당신이 사용하는 패키지 매니져에서 이러한 방법으로 설치하십시요.
-
-데비안 / 우분투 예시:
-
-    sudo apt-get update
-    sudo apt-get install gcc unzip wget zip gcc-avr binutils-avr avr-libc dfu-programmer dfu-util gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi
-
-페도라 / 레드햇 예시:
-
-    sudo dnf install gcc unzip wget zip dfu-util dfu-programmer avr-gcc avr-libc binutils-avr32-linux-gnu arm-none-eabi-gcc-cs arm-none-eabi-binutils-cs arm-none-eabi-newlib
-    
-아치 / 맨자로(Manjaro) 예시:
-
-    pacman -S base-devel gcc unzip wget zip avr-gcc avr-binutils avr-libc dfu-util arm-none-eabi-gcc arm-none-eabi-binutils arm-none-eabi-newlib git dfu-programmer dfu-util
-
-## 닉스 (NIX)
-
-만약 당신이 [NixOS](https://nixos.org/)를 사용중이거나 NIX를 리눅스 또는 맥에서 사용중이라면 `nix-shell`를 root 디렉토리에서 사용하여 컴파일 환경의 구축할 수 있습니다.
-
-기본적으로 다음 커맨드는 AVR과 ARM 컴파일러를 설치할것입니다. 만약 필요 없다면 `avr` 또는 `arm`을 인수에서 해제할 수 있습니다.
-
-    nix-shell --arg arm false
-
-## 맥
-당신이 홈브루([homebrew](https://brew.sh/))를 사용한다면, 다음을 입력하세요.
-
-    brew tap osx-cross/avr
-    brew tap PX4/homebrew-px4
-    brew update
-    brew install avr-gcc@7
-    brew link --force avr-gcc@7
-    brew install dfu-programmer
-    brew install dfu-util
-    brew install gcc-arm-none-eabi
-    brew install avrdude
-
-이 방법을 가장 추천합니다. 만약 홈브루가 없다면 커맨드라인 환경에서 매우 편한 [Homebrew](https://brew.sh/)를 다운받는 것을 추천합니다. 참고로 `avr-gcc@7`를 설치하는 중 `make`과 `make install`는 대개 20분 넘게 걸리고 CPU 사용량이 높아집니다.
-
-## msys2를 사용하는 윈도우 (추천)
-윈도우 비스타 부터 최신버젼까지 가장추천되는 환경은 [msys2](https://www.msys2.org)를 이용하는 것입니다. (윈도우 7과 윈도우 10에서 모두 테스트되었음)
-
-* 이 사이트에 있는 설명을 이용해 msys2를 설치하세요: https://www.msys2.org
-* ``MSYS2 MingGW 64-bit`` 를 여세요
-* QMK폴더로 이동하세요. c드라이브 루트에 있는경우:
- * `$ cd /c/qmk_firmware`
-* `util/qmk_install.sh`을 실행시키고 나오는데요 따라하세요
-
-### 크리에이터 업데이트
-만약 당신의 윈도우 10이 크리에이터 업데이트 버전 또는 더 높은 버전이라면 바로 컴파일과 프로그램 업로드(flashing)를 할 수 있습니다. 크리에이터 업데이트 전 버전이라면 컴파일만 가능합니다. 만약 당신이 잘 모르겠거나 업데이트된 버전이 아니라면 [이 링크](https://support.microsoft.com/en-us/instantanswers/d4efb316-79f0-1aa1-9ef3-dcada78f3fa0/get-the-windows-10-creators-update)를 확인해 보십시오.
-
-### 리눅스용 윈도우 하위 시스템 사용 (Windows10 Subsystem for Linux)
-크리에이터 업데이트에 추가로 만약 당신이 리눅스용 윈도우 하위 시스템이 필요하다면 이 링크에서 다운받으십시오: [설명](https://www.howtogeek.com/249966/how-to-install-and-use-the-linux-bash-shell-on-windows-10/)
-
-만약 당신이 이미 리눅스용 윈도우 하위 시스템을 Anniversary업데이트를 통해 받았다면 이 링크에서 16.04LTS로 업데이트 하는것을 추천합니다. 왜냐하면 업데이트 없이는 일부키보드가 14.04LTS에 포함되있는 도구들로 컴파일되지 않을수 있기때문입니다 : [WSL 업데이트](https://betanews.com/2017/04/14/upgrade-windows-subsystem-for-linux/)
-
-
-### Git
-만약 당신이 이미 파일을 로컬로 복제하였다면 이 섹션을 무시하십시요.
-
-당신은 파일을 기본적인 git을 사용하여 로컬로 복제해야 합니다. **주의, WSL Git을 사용하면 안됩니다** [Git](https://git-scm.com/download/win) 이 링크에서 git을 다운받고 설치하십시오.
-그리고 [기본설정](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup), 유저네임과 이메일을 설정하는 것은 만약 당신이 온라인에 기여할 계획이라면 매우 중요합니다.
-
-Git의 설치가 완료되었다면 Git Bash커맨드을 열고 당신의 복제 QMK파일이 있는 위치로 이동하고 `git clone --recurse-submodules https://github.com/qmk/qmk_firmware`를 실행 시키십니오. 이 커맨드는 새로운 `qmk_firmware`폴더를 이미 존재하는 것의 하위 폴더설정으로 생성할 것입니다.
-
-### 도구(Toolchain) 설정
-기본적으로 도구설정은 리눅스용 윈도우 하위 시스템이 설치될때 자동으로 설정됩니다. 하지만 수동적으로 하고 싶다면 여기 설명이 있습니다. (If you want to do everything manually, there are no other instructions than the scripts themselves, but you can always open issues and ask for more information. )
-
-1. "Bash On Ubuntu On Windows" 을 실행시키십시오.
-2. 당신이 `qmk_firmware`를 복제한 위치로 가십시오. WSL(리눅스용 윈도우 하위 시스템 사용)에서 `/mnt/`로 시작되는 패스를 찾으십시오. 즉 당신은 다음과 같은 형식으로 입력해야 합니다. `cd /mnt/c/path/to/qmk_firmware`  (Note that the paths start with `/mnt/`in the WSL, so you have to write for example `cd /mnt/c/path/to/qmk_firmware`.)
-3. `util/wsl_install.sh`를 실행시키고 화면에 나오는 지시를 따르십니오.
-4. Bash command window를 재실행 시키십시오.
-5. 이로써 당신은 컴파일과 프로그램 업로드(flashing)을 위한 준비가 모두 끝났습니다.
-
-### 중요한 참고사항
-*`util/wsl_install.sh` 명령어를 다시 실행시켜 최신 업데이트를 다운받을 수 있습니다.
-* QMK 폴더의 위치는 윈도우 파일시스템을 기반으로 해야 됩니다. WSL는 외부실행파일를 작동 시킬수 없기 때문이죠.
-* WSL의 Git은 윈도우용 Git과 **호환되지 않습니다**
-* 파일을 수정하는 것은 WSL안과 밖에서 모두 가능합니다 하지만 만약 .makefile 혹은 .sh를 수정한다면 유닉스 라인엔딩(Unix line endings)을 지원하는 에디터를 사용하는지 확인하십이오. 그렇지 않다면 컴파일이 되지않을 수도 있습니다.
-
-## 윈두우 (비스타 혹은 더 최신) (비추천)
-
-이 섹션은 윈도우 비스타 혹은 더 최신버젼을 위한 오래된 설명입니다. [MSYS2](#windows-with-msys2-recommended)를 사용하는 것을 더 추천합니다.
-
-1. WinAVR을 설치하였다면 먼저 삭제하십시오.
-2. [MHV AVR Tools](https://infernoembedded.com/sites/default/files/project/MHV_AVR_Tools_20131101.exe)을 설치하십시오. (Disable smatch, but **be sure to leave the option to add the tools to the PATH checked**)
-3. 만약 당신이 Infinity을 기반으로 하는 키보드에 프로그램 업로드를(flashing) 할거라면 dfu-util을 설치해야 합니다, [Input Club](https://github.com/kiibohd/controller/wiki/Loading-DFU-Firmware) 를 참고 하십시오.
-4. [MinGW](https://sourceforge.net/projects/mingw/files/Installer/mingw-get-setup.exe/download)를 설치하십시오. 설치중 윈도우화면에서 GUI 추가 설치 옵션을 해재하십니오. **기본 설치 위치를 바꾸지 마십시오.** 이 명령어는 기본위치를 기반으로 하고 있습니다.
-5. 레파지토리를 복제하십시오. [이 링크로 압축파일을 받고 앞축해제 하십시오.](https://github.com/qmk/qmk_firmware/archive/master.zip) 윈도우 탐색기에서 다운받은 파일을 여십시오.
-6. `\util` 폴더를 여십시오.
-7. `1-setup-path-win` .bat파일을 더블클릭해서 실행시키시오. 유저 계정 설정 변경을 허용해야될 수도 있습니다. 스페이스바를 눌러 설치가 성공적으로 완료되었다는 메세지를 닫을 수 있습니다.
-8. `2-setup-environment-win` .bat파일에 우클릭해서 '관리자 권한으로 실행'으로 실행시키십시오. 이 작업을 꽤 오래 걸릴 수도 있습니다. 또한 드라이버 설정을 승인해야 될 수도 있습니다. 하지만 이 모든것이 끝나면 당신의 시스템의 설정이 모두 끝났습니다.
-
-만약 이 작업을 하는데에 문제가 있어 도움받고 싶다면 *Win_Check_Output.txt*을 생성하는 것이 도움이 될것입니다. 이 파일은 `Win_Check.bat`을 `\util`폴더에서 실행시켜 생성할 수 있습니다.
-
-## 도커(Docker)
-만약 위작업들이 당신에게 좀 어렵게 느껴졌다면 도커(Docker)가 당신을 위한 최선일 수도 있습니다(의역). [Docker CE](https://docs.docker.com/install/#supported-platforms)를 설치한뒤 아래 커맨드를 `qmk_firmware` 디랙토리에서 실행시켜 키보드 또는 키맵을 생성시킵니다.
-```bash
-util/docker_build.sh keyboard:keymap
-# 예: util/docker_build.sh ergodox_ez:steno
-```
-이 커맨드는 원하는 키보드 또는 키맵을 컴파일하고 `.hex`또는 `.bin`파일을 프로그램 업로드를(flashing) 위해 QMK디랙토리에 생성할것입니다. 만약 `:keymap`이 생략된다면 `default`이 기본을로 사용됩니다. 참고로 여기서 사용되는 인수는 `make` 커맨드를 사용하여 컴파일할때와 동일합니다.
-
-
-또한 스크립트를 그냥 아무 인수 없이도 사용가능합니다. 그렇게 된다면 프로그램은 하나씩 자동으로 인수입력을 요구 할것입니다. 어쩌면 이방법이 더 쉬울 수도 있습니다.
-```bash
-util/docker_build.sh
-# 인수을 입력받습니다.(아무것도 쓰지 않고 놔두는면 기본값으로 설정됩니다)
-```
-
-다음과 같이 `target`를 사용하여 컴파일과 프로그램 업로드(flashing)을 동시에 할수도 있습니다.
-```bash
-util/docker_build.sh keyboard:keymap:target
-# 예: util/docker_build.sh planck/rev6:default:dfu-util
-```
-만약 당시이 리눅스를 사용한다면 이 커맨드들은 추가 설정 없이 바로 작동할 것입니다. 하지만 위도우 또는 맥 환경에서는 [Docker Machine](http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos/)를 사용하여야 이 커맨드들을 사용가능합니다. Docker Machine설정은 꽤 지루하고 짜증남으로 추천하지 않고 [QMK Toolbox](https://github.com/qmk/qmk_toolbox)를 사용하는 것을 추천합니다.
-
-!> 윈도우에서 독커는 [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v)을 활성화 설정하여야 사용가능합니다. 즉, 도커는 Hyper-V를 지원하지 않는 윈도우 7, 윈도우 8, 그리고 **윈도우 10 홈**과 같은 윈도우 버전에서 사용할수 없다는 것을 의미합니다.
-
-## Vagrant
-만약 컴웨어를 사용하는데 문제가 있다면 Vagrant라는 이름의 툴을 사용해 볼 수 있습니다. 이 툴은 가상환경을 세팅해줌과 동시에 컴웨어를 사용하는데에 필요한 모든 설정을 해줄 것입니다. OLKB는 가상환경에 파일을 호스팅하지 않습니다. [Vagrant 가이드](getting_started_vagrant.md)에서 더 많은 정보를 확인할 수 있습니다.
diff --git a/docs/ko-kr/getting_started_getting_help.md b/docs/ko-kr/getting_started_getting_help.md
deleted file mode 100644
index 2ae7917a01..0000000000
--- a/docs/ko-kr/getting_started_getting_help.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# 도움 받기
-
-QMK에서 도움을 받는 방법은 다양합니다.
-
-**주의, 아래 링크들은 영어로 이루어져 있으며 영어 사용이 가능해야 편리하게 이용할 수 있습니다.**
-
-## 디스코드 실시간 채팅
-
-[QMK 디스코드 서버](https://discord.gg/Uq7gcHh)에서 QMK 개발자들과 실시간으로 대화를 나눌수있습니다. 이 디스코드에는 펌웨어, 툴박스, 하드웨어, 그리고 컨피겨레이터(configurator)에 관한 특별화된 채널이 운영되고 있습니다.
-
-## OLKB 서브레딧
-
-공식 QMK 포럼은 [reddit.com](https://reddit.com) 에 [/r/olkb](https://reddit.com/r/olkb)입니다.
-
-## Github 이슈
-
-[issue on GitHub](https://github.com/qmk/qmk_firmware/issues)에서 문제를 보고 할 수 있습니다. 이 링크는 문제가 오랜 시간을 필요로하거나 디버깅를 요구 할때 매우 유용합니다.
diff --git a/docs/ko-kr/getting_started_github.md b/docs/ko-kr/getting_started_github.md
deleted file mode 100644
index 4fd8fda6b8..0000000000
--- a/docs/ko-kr/getting_started_github.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# QMK와 함께 Github를 사용하는 방법
-
-Github can be a little tricky to those that aren't familiar with it - this guide will walk through each step of forking, cloning, and submitting a pull request with QMK.
-
-Github는 자주 사용하는 사람이 아니면 좀 여려울수도 있습니다. 이 문서는 Github를 사용하는데 필요한 forking, cloning 그리고 submitting a pull request with QMK를 설명할 것입니다. 
-
-?> 이 가이드는 당신이 git커맨드를 사용하는데 익숙하고 git환경을 당신의 시스템이 설치하였다는 전제하에 작성되었습니다.
-
-아래와 같이 [QMK Github 페이지](https://github.com/qmk/qmk_firmware)에서 당신은 "Fork"라고 쓰여있는 버튼을 볼 수 있습니다
-
-![Fork on Github](https://i.imgur.com/8Toomz4.jpg)
-
-만약 당신이 어느기관 소속이고, 무슨 계정을 사용할것인지 골라야 한다면 개인 계정을 사용하는 것을 추천합니다.
-"Fork"가 성공적으로 끝났다면 아래 보이는 "Clone or Download"를 눌러야 합니다.
-
-![Download from Github](https://i.imgur.com/N1NYcSz.jpg)
-
-"HTTPS"채크 했는지 확인하고 나와 있는 링크를 복사하세요.
-
-![HTTPS link](https://i.imgur.com/eGO0ohO.jpg)
-
-여기거 부터 커맨드라인을 사용합니다. 커맨드 라인에서 `git clone `을 치고 복사한 링크를 붙여넣은후 실행시키세요.
-
-```
-user@computer:~$ git clone https://github.com/whoeveryouare/qmk_firmware.git
-Cloning into 'qmk_firmware'...
-remote: Counting objects: 46625, done.
-remote: Compressing objects: 100% (2/2), done.
-remote: Total 46625 (delta 0), reused 0 (delta 0), pack-reused 46623
-Receiving objects: 100% (46625/46625), 84.47 MiB | 3.14 MiB/s, done.
-Resolving deltas: 100% (29362/29362), done.
-Checking out files: 100% (2799/2799), done.
-```
-
-당신은 이제 모든파일이 로컬시스템이 추가 되었습니다 그리고 이제 키맵을 추가하거나 컴파일, 프로그램 업로드(flashing)를 할 수 있습니다. 
-모든 추가 변경을 만든 뒤에는 add, commit, and push를 사용하여 당신의 Folk에 추가 할 수 있습니다.
-
-```
-user@computer:~$ git add .
-user@computer:~$ git commit -m "adding my keymap"
-[master cccb1608] adding my keymap
- 1 file changed, 1 insertion(+)
- create mode 100644 keyboards/planck/keymaps/mine/keymap.c
-user@computer:~$ git push
-Counting objects: 1, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (1/1), done.
-Writing objects: 100% (1/1), 1.64 KiB | 0 bytes/s, done.
-Total 1 (delta 1), reused 0 (delta 0)
-remote: Resolving deltas: 100% (1/1), completed with 1 local objects.
-To https://github.com/whoeveryouare/qmk_firmware.git
- + 20043e64...7da94ac5 master -> master
-```
-
-이로써 당신이 만든 모든 변경들이 당신의 Github의 Folk에 추가 되었습니다. (`https://github.com/<whoeveryouare>/qmk_firmware`)에서 확인하고 "New Pull Request"를 눌러 변경사항을 QMK에 업로드할수 있습니다.
-
-![New Pull Request](https://i.imgur.com/DxMHpJ8.jpg)
-
-이 버튼을 누르면 당신이 만든 모든 변경사항들이 보여질 것입니다. 만약 모든 변경사항이 맘에 든다면 "Create Pull Request"를 눌러 요청을 확정할수 있습니다.
-
-**요청사항이 확정된다고 변경사항이 바로 적용되는 것은 아닙니다.**
-
-![Create Pull Request](https://i.imgur.com/Ojydlaj.jpg)
-
-요청을 한뒤 QMK개발자들은 댓글로 무엇이 변경되었는지 등을 물어 볼수있지만 끝에는 매인 디랙토리로 업로드 될것입니다.
-
-**"Thanks for contributing to QMK :)"**
diff --git a/docs/pt-br/README.md b/docs/pt-br/README.md
deleted file mode 100644
index bf8ec974eb..0000000000
--- a/docs/pt-br/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# Quantum Mechanical Keyboard Firmware
-
-[![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)
-[![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh)
-[![Docs Status](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm)
-[![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
-[![GitHub forks](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
-
-## O que é o firmware QMK?
-QMK (*Quantum Mechanical Keyboard*) é uma comunidade de código aberto que mantém o QMK Firmware, o QMK Toolbox, qmk.fm e suas documentações. O QMK Firmware é um software embarcado ("firmware") de teclado baseado no [tmk\_keyboard](https://github.com/tmk/tmk_keyboard) com alguns recursos úteis para os controladores Atmel AVR e, mais especificamente, na [linha de produtos OLKB](https://olkb.com), o teclado [ErgoDox EZ](https://www.ergodox-ez.com) e a [linha de produtos Clueboard](https://clueboard.co/). Também foi portado para chips ARM usando o ChibiOS. Você pode usá-lo no seu próprio teclado com fio ou personalizado.
-
-## Como obter e usar o QMK
-
-Se você planeja contribuir com um _keymap_ ("mapa de teclas"), teclado ou recursos para o QMK, o jeito mais fácil é [percorrer o repositório através do GitHub](https://github.com/qmk/qmk_firmware#fork-destination-box) e clonar seu repositório localmente para fazer suas alterações, dê um _push_ nelas e abra uma [_Pull request_](https://github.com/qmk/qmk_firmware/pulls) no seu fork.
-
-Caso contrário, você pode cloná-lo diretamente com `git clone https://github.com/qmk/qmk_firmware`. Não faça o download dos arquivos zip ou tar; é necessário um repositório git para baixar os submódulos para compilar.
-
-## Como compilar
-
-Antes de compilar, você precisará [instalar um ambiente específico](getting_started_build_tools.md) para o desenvolvimento em plataforma AVR e/ou ARM; vez que isto for feito, você usará o comando `make` para criar um teclado e um mapa de teclas com a seguinte notação:
-
-    make planck/rev4:default
-
-Isso compilaria a revisão `rev4` do teclado ` planck` com o mapa de teclas `default`. Nem todos os teclados têm revisões (também chamadas de _subprojects_ ou _folders_); nesse caso, a revisão pode ser omitida:
-
-    make preonic:default
-
-## Como personalizar
-
-O QMK tem muitos [recursos](features.md) para explorar e uma boa quantidade de [documentação de referência](https://docs.qmk.fm) para explorar. A maioria dos recursos é aproveitada modificando seu [keymap](keymap.md) e alterando os [keycodes](keycodes.md).
diff --git a/docs/pt-br/_summary.md b/docs/pt-br/_summary.md
deleted file mode 100644
index e0a1b45b33..0000000000
--- a/docs/pt-br/_summary.md
+++ /dev/null
@@ -1,122 +0,0 @@
-* [Complete Newbs Guide](pt-br/newbs.md)
-  * [Getting Started](pt-br/newbs_getting_started.md)
-  * [Building Your First Firmware](pt-br/newbs_building_firmware.md)
-  * [Flashing Firmware](pt-br/newbs_flashing.md)
-  * [Testing and Debugging](pt-br/newbs_testing_debugging.md)
-  * [Git Best Practices](pt-br/newbs_best_practices.md)
-  * [Learning Resources](pt-br/newbs_learn_more_resources.md)
-
-* [QMK Basics](pt-br/README.md)
-  * [QMK Introduction](pt-br/getting_started_introduction.md)
-  * [QMK CLI](pt-br/cli.md)
-  * [QMK CLI Config](pt-br/cli_configuration.md)
-  * [Contributing to QMK](pt-br/contributing.md)
-  * [How to Use GitHub](pt-br/getting_started_github.md)
-  * [Getting Help](pt-br/getting_started_getting_help.md)
-
-* [Breaking Changes](pt-br/breaking_changes.md)
-  * [2019 Aug 30](pt-br/ChangeLog/20190830.md)
-
-* [FAQ](faq.md)
-  * [General FAQ](pt-br/faq_general.md)
-  * [Build/Compile QMK](pt-br/faq_build.md)
-  * [Debugging/Troubleshooting QMK](pt-br/faq_debug.md)
-  * [Keymap](pt-br/faq_keymap.md)
-  * [Driver Installation with Zadig](pt-br/driver_installation_zadig.md)
-
-* Detailed Guides
-  * [Install Build Tools](pt-br/getting_started_build_tools.md)
-  * [Vagrant Guide](pt-br/getting_started_vagrant.md)
-  * [Build/Compile Instructions](pt-br/getting_started_make_guide.md)
-  * [Flashing Firmware](pt-br/flashing.md)
-  * [Customizing Functionality](pt-br/custom_quantum_functions.md)
-  * [Keymap Overview](pt-br/keymap.md)
-
-* [Hardware](hardware.md)
-  * [AVR Processors](pt-br/hardware_avr.md)
-  * [Drivers](pt-br/hardware_drivers.md)
-
-* Reference
-  * [Keyboard Guidelines](pt-br/hardware_keyboard_guidelines.md)
-  * [Config Options](pt-br/config_options.md)
-  * [Keycodes](pt-br/keycodes.md)
-  * [Coding Conventions - C](pt-br/coding_conventions_c.md)
-  * [Coding Conventions - Python](pt-br/coding_conventions_python.md)
-  * [Documentation Best Practices](pt-br/documentation_best_practices.md)
-  * [Documentation Templates](pt-br/documentation_templates.md)
-  * [Glossary](pt-br/reference_glossary.md)
-  * [Unit Testing](pt-br/unit_testing.md)
-  * [Useful Functions](pt-br/ref_functions.md)
-  * [Configurator Support](pt-br/reference_configurator_support.md)
-  * [info.json Format](pt-br/reference_info_json.md)
-  * [Python CLI Development](pt-br/cli_development.md)
-
-* [Features](pt-br/features.md)
-  * [Basic Keycodes](pt-br/keycodes_basic.md)
-  * [US ANSI Shifted Keys](pt-br/keycodes_us_ansi_shifted.md)
-  * [Quantum Keycodes](pt-br/quantum_keycodes.md)
-  * [Advanced Keycodes](pt-br/feature_advanced_keycodes.md)
-  * [Audio](pt-br/feature_audio.md)
-  * [Auto Shift](pt-br/feature_auto_shift.md)
-  * [Backlight](pt-br/feature_backlight.md)
-  * [Bluetooth](pt-br/feature_bluetooth.md)
-  * [Bootmagic](pt-br/feature_bootmagic.md)
-  * [Combos](pt-br/feature_combo.md)
-  * [Command](pt-br/feature_command.md)
-  * [Debounce API](pt-br/feature_debounce_type.md)
-  * [DIP Switch](pt-br/feature_dip_switch.md)
-  * [Dynamic Macros](pt-br/feature_dynamic_macros.md)
-  * [Encoders](pt-br/feature_encoders.md)
-  * [Grave Escape](pt-br/feature_grave_esc.md)
-  * [Haptic Feedback](pt-br/feature_haptic_feedback.md)
-  * [HD44780 LCD Controller](pt-br/feature_hd44780.md)
-  * [Key Lock](pt-br/feature_key_lock.md)
-  * [Layouts](pt-br/feature_layouts.md)
-  * [Leader Key](pt-br/feature_leader_key.md)
-  * [LED Matrix](pt-br/feature_led_matrix.md)
-  * [Macros](pt-br/feature_macros.md)
-  * [Mouse Keys](pt-br/feature_mouse_keys.md)
-  * [OLED Driver](pt-br/feature_oled_driver.md)
-  * [One Shot Keys](pt-br/one_shot_keys.md)
-  * [Pointing Device](pt-br/feature_pointing_device.md)
-  * [PS/2 Mouse](pt-br/feature_ps2_mouse.md)
-  * [RGB Lighting](pt-br/feature_rgblight.md)
-  * [RGB Matrix](pt-br/feature_rgb_matrix.md)
-  * [Space Cadet](pt-br/feature_space_cadet.md)
-  * [Split Keyboard](pt-br/feature_split_keyboard.md)
-  * [Stenography](pt-br/feature_stenography.md)
-  * [Swap Hands](pt-br/feature_swap_hands.md)
-  * [Tap Dance](pt-br/feature_tap_dance.md)
-  * [Terminal](pt-br/feature_terminal.md)
-  * [Thermal Printer](pt-br/feature_thermal_printer.md)
-  * [Unicode](pt-br/feature_unicode.md)
-  * [Userspace](pt-br/feature_userspace.md)
-  * [Velocikey](pt-br/feature_velocikey.md)
-
-* For Makers and Modders
-  * [Hand Wiring Guide](pt-br/hand_wire.md)
-  * [ISP Flashing Guide](pt-br/isp_flashing_guide.md)
-  * [ARM Debugging Guide](pt-br/arm_debugging.md)
-  * [I2C Driver](pt-br/i2c_driver.md)
-  * [SPI Driver](pt-br/spi_driver.md)
-  * [GPIO Controls](pt-br/internals_gpio_control.md)
-  * [Proton C Conversion](pt-br/proton_c_conversion.md)
-
-* For a Deeper Understanding
-  * [How Keyboards Work](pt-br/how_keyboards_work.md)
-  * [Understanding QMK](pt-br/understanding_qmk.md)
-
-* Other Topics
-  * [Using Eclipse with QMK](pt-br/other_eclipse.md)
-  * [Using VSCode with QMK](pt-br/other_vscode.md)
-  * [Support](pt-br/getting_started_getting_help.md)
-  * [How to add translations](pt-br/translating.md)
-
-* QMK Internals (In Progress)
-  * [Defines](pt-br/internals_defines.md)
-  * [Input Callback Reg](pt-br/internals_input_callback_reg.md)
-  * [Midi Device](pt-br/internals_midi_device.md)
-  * [Midi Device Setup Process](pt-br/internals_midi_device_setup_process.md)
-  * [Midi Util](pt-br/internals_midi_util.md)
-  * [Send Functions](pt-br/internals_send_functions.md)
-  * [Sysex Tools](pt-br/internals_sysex_tools.md)
diff --git a/docs/ru-ru/README.md b/docs/ru-ru/README.md
deleted file mode 100644
index 7218781540..0000000000
--- a/docs/ru-ru/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Quantum Mechanical Keyboard Firmware
-
-[![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)
-[![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh)
-[![Docs Status](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm)
-[![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
-[![GitHub forks](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
-
-## Что такое QMK Firmware?
-
-QMK (*Quantum Mechanical Keyboard*) — это сообщество, работающее над ПО с открытым исходным кодом, которое разрабатывает QMK Firmware, QMK Toolbox, qmk.fm и эту документацию. QMK Firmware — это прошивка для клавиатур, основанная на [tmk\_keyboard](https://github.com/tmk/tmk_keyboard) с множеством полезных функций для микроконтроллеров Atmel AVR, а именно, для продуктов компаний [OLKB](https://olkb.com), [ErgoDox EZ](https://www.ergodox-ez.com) и [Clueboard](https://clueboard.co/). Она также была портирована на чипы ARM при помощи ChibiOS. Вы можете использовать ее для клавиатуры, собранной вручную или имеющей нестандартную печатную плату.
-
-## Как скачать
-
-Если вы собираетесь добавить раскладку, клавиатуру или новые функции в QMK, то самый простой путь реализации — это [сделать форк репозитория на GitHub](https://github.com/qmk/qmk_firmware#fork-destination-box), клонировать ваш репозиторий локально для дальнейшего внесения изменений, сделать пуш изменений, а затем открыть [пулреквест](https://github.com/qmk/qmk_firmware/pulls) из вашего форка.
-
-Также вы можете либо скачать репозиторий ([zip](https://github.com/qmk/qmk_firmware/zipball/master), [tar](https://github.com/qmk/qmk_firmware/tarball/master)), либо клонировать его через git (`git@github.com:qmk/qmk_firmware.git`) или https (`https://github.com/qmk/qmk_firmware.git`).
-
-## Как скомпилировать
-
-Перед компиляцией вам необходимо [настроить окружение](ru-ru/getting_started_build_tools.md) разработчика для AVR или/и ARM. После этого используйте команду `make` со следующим синтаксисом, чтобы собрать клавиатуру и раскладку:
-
-    make planck/rev4:default
-
-Данная команда соберет ревизию `rev4` клавиатуры `planck` с раскладкой `default`. Не все клавиатуры имеют ревизии (они также называются subprojects или folders), в этом случае она может быть опущена:
-
-    make preonic:default
-
-## Как настроить
-
-QMK обладает множеством [функций](ru-ru/features.md) для исследования, и [справочная документация](https://docs.qmk.fm) может стать хорошей отправной точкой для знакомства с ними. Большинством функций можно воспользоваться модифицируя [раскладку](ru-ru/keymap.md) и изменяя [коды клавиш](ru-ru/keycodes.md).
diff --git a/docs/ru-ru/_summary.md b/docs/ru-ru/_summary.md
deleted file mode 100644
index 09273172b6..0000000000
--- a/docs/ru-ru/_summary.md
+++ /dev/null
@@ -1,124 +0,0 @@
-* [Complete Newbs Guide](ru-ru/newbs.md)
-  * [Getting Started](ru-ru/newbs_getting_started.md)
-  * [Building Your First Firmware](ru-ru/newbs_building_firmware.md)
-  * [Flashing Firmware](ru-ru/newbs_flashing.md)
-  * [Testing and Debugging](ru-ru/newbs_testing_debugging.md)
-  * [Git Best Practices](ru-ru/newbs_best_practices.md)
-  * [Learning Resources](ru-ru/newbs_learn_more_resources.md)
-
-* [QMK Basics](ru-ru/README.md)
-  * [QMK Introduction](ru-ru/getting_started_introduction.md)
-  * [QMK CLI](ru-ru/cli.md)
-  * [QMK CLI Config](ru-ru/cli_configuration.md)
-  * [Contributing to QMK](ru-ru/contributing.md)
-  * [How to Use GitHub](ru-ru/getting_started_github.md)
-  * [Getting Help](ru-ru/getting_started_getting_help.md)
-
-* [Breaking Changes](ru-ru/breaking_changes.md)
-  * [2019 Aug 30](ru-ru/ChangeLog/20190830.md)
-
-* [FAQ](ru-ru/faq.md)
-  * [General FAQ](ru-ru/faq_general.md)
-  * [Build/Compile QMK](ru-ru/faq_build.md)
-  * [Debugging/Troubleshooting QMK](ru-ru/faq_debug.md)
-  * [Keymap](ru-ru/faq_keymap.md)
-  * [Driver Installation with Zadig](ru-ru/driver_installation_zadig.md)
-
-* Detailed Guides
-  * [Install Build Tools](ru-ru/getting_started_build_tools.md)
-  * [Vagrant Guide](ru-ru/getting_started_vagrant.md)
-  * [Build/Compile Instructions](ru-ru/getting_started_make_guide.md)
-  * [Flashing Firmware](ru-ru/flashing.md)
-  * [Customizing Functionality](ru-ru/custom_quantum_functions.md)
-  * [Keymap Overview](ru-ru/keymap.md)
-
-* [Hardware](ru-ru/hardware.md)
-  * [Compatible Microcontrollers](ru-ru/compatible_microcontrollers.md)
-  * [AVR Processors](ru-ru/hardware_avr.md)
-  * [Drivers](ru-ru/hardware_drivers.md)
-
-* Reference
-  * [Keyboard Guidelines](ru-ru/hardware_keyboard_guidelines.md)
-  * [Config Options](ru-ru/config_options.md)
-  * [Keycodes](ru-ru/keycodes.md)
-  * [Coding Conventions - C](ru-ru/coding_conventions_c.md)
-  * [Coding Conventions - Python](ru-ru/coding_conventions_python.md)
-  * [Documentation Best Practices](ru-ru/documentation_best_practices.md)
-  * [Documentation Templates](ru-ru/documentation_templates.md)
-  * [Glossary](ru-ru/reference_glossary.md)
-  * [Unit Testing](ru-ru/unit_testing.md)
-  * [Useful Functions](ru-ru/ref_functions.md)
-  * [Configurator Support](ru-ru/reference_configurator_support.md)
-  * [info.json Format](ru-ru/reference_info_json.md)
-  * [Python CLI Development](ru-ru/cli_development.md)
-
-* [Features](ru-ru/features.md)
-  * [Basic Keycodes](ru-ru/keycodes_basic.md)
-  * [US ANSI Shifted Keys](ru-ru/keycodes_us_ansi_shifted.md)
-  * [Quantum Keycodes](ru-ru/quantum_keycodes.md)
-  * [Advanced Keycodes](ru-ru/feature_advanced_keycodes.md)
-  * [Audio](ru-ru/feature_audio.md)
-  * [Auto Shift](ru-ru/feature_auto_shift.md)
-  * [Backlight](ru-ru/feature_backlight.md)
-  * [Bluetooth](ru-ru/feature_bluetooth.md)
-  * [Bootmagic](ru-ru/feature_bootmagic.md)
-  * [Combos](ru-ru/feature_combo.md)
-  * [Command](ru-ru/feature_command.md)
-  * [Debounce API](ru-ru/feature_debounce_type.md)
-  * [DIP Switch](ru-ru/feature_dip_switch.md)
-  * [Dynamic Macros](ru-ru/feature_dynamic_macros.md)
-  * [Encoders](ru-ru/feature_encoders.md)
-  * [Grave Escape](ru-ru/feature_grave_esc.md)
-  * [Haptic Feedback](ru-ru/feature_haptic_feedback.md)
-  * [HD44780 LCD Controller](ru-ru/feature_hd44780.md)
-  * [Key Lock](ru-ru/feature_key_lock.md)
-  * [Layouts](ru-ru/feature_layouts.md)
-  * [Leader Key](ru-ru/feature_leader_key.md)
-  * [LED Matrix](ru-ru/feature_led_matrix.md)
-  * [Macros](ru-ru/feature_macros.md)
-  * [Mouse Keys](ru-ru/feature_mouse_keys.md)
-  * [OLED Driver](ru-ru/feature_oled_driver.md)
-  * [One Shot Keys](ru-ru/one_shot_keys.md)
-  * [Pointing Device](ru-ru/feature_pointing_device.md)
-  * [PS/2 Mouse](ru-ru/feature_ps2_mouse.md)
-  * [RGB Lighting](ru-ru/feature_rgblight.md)
-  * [RGB Matrix](ru-ru/feature_rgb_matrix.md)
-  * [Space Cadet](ru-ru/feature_space_cadet.md)
-  * [Split Keyboard](ru-ru/feature_split_keyboard.md)
-  * [Stenography](ru-ru/feature_stenography.md)
-  * [Swap Hands](ru-ru/feature_swap_hands.md)
-  * [Tap Dance](ru-ru/feature_tap_dance.md)
-  * [Terminal](ru-ru/feature_terminal.md)
-  * [Thermal Printer](ru-ru/feature_thermal_printer.md)
-  * [Unicode](ru-ru/feature_unicode.md)
-  * [Userspace](ru-ru/feature_userspace.md)
-  * [Velocikey](ru-ru/feature_velocikey.md)
-
-* For Makers and Modders
-  * [Hand Wiring Guide](ru-ru/hand_wire.md)
-  * [ISP Flashing Guide](ru-ru/isp_flashing_guide.md)
-  * [ARM Debugging Guide](ru-ru/arm_debugging.md)
-  * [I2C Driver](ru-ru/i2c_driver.md)
-  * [SPI Driver](ru-ru/spi_driver.md)
-  * [WS2812 Driver](ru-ru/ws2812_driver.md)
-  * [GPIO Controls](ru-ru/internals_gpio_control.md)
-  * [Proton C Conversion](ru-ru/proton_c_conversion.md)
-
-* For a Deeper Understanding
-  * [How Keyboards Work](ru-ru/how_keyboards_work.md)
-  * [Understanding QMK](ru-ru/understanding_qmk.md)
-
-* Other Topics
-  * [Using Eclipse with QMK](ru-ru/other_eclipse.md)
-  * [Using VSCode with QMK](ru-ru/other_vscode.md)
-  * [Support](ru-ru/getting_started_getting_help.md)
-  * [Translating the QMK Docs](ru-ru/translating.md)
-
-* QMK Internals (In Progress)
-  * [Defines](ru-ru/internals_defines.md)
-  * [Input Callback Reg](ru-ru/internals_input_callback_reg.md)
-  * [Midi Device](ru-ru/internals_midi_device.md)
-  * [Midi Device Setup Process](ru-ru/internals_midi_device_setup_process.md)
-  * [Midi Util](ru-ru/internals_midi_util.md)
-  * [Send Functions](ru-ru/internals_send_functions.md)
-  * [Sysex Tools](ru-ru/internals_sysex_tools.md)
diff --git a/docs/ru-ru/getting_started_build_tools.md b/docs/ru-ru/getting_started_build_tools.md
deleted file mode 100644
index 322f9a9e59..0000000000
--- a/docs/ru-ru/getting_started_build_tools.md
+++ /dev/null
@@ -1,153 +0,0 @@
-# Установка инструментов для сборки
-
-Данная страница описывает процесс установки окружения для сборки QMK. Эти инструкции относятся к процессорам AVR (таким как atmega32u4).
-
-<!-- FIXME: Нужно написать и добавить куда-нибудь инструкции для ARM. -->
-
-**Примечание:** Если вы здесь впервые, ознакомьтесь с [Руководством для полных новичков](ru-ru/newbs.md).
-
-Прежде, чем продолжить, убедитесь, что у вас обновлены подмодули (сторонние библиотеки), выполнив `make git-submodule`.
-
-## Linux
-
-Чтобы всегда быть уверенными, что у вас установлены последние версии ПО, можно просто выполнить команду `sudo util/qmk_install.sh`. Она должна установить все необходимые зависимости. **Это выполнит `apt-get upgrade`.**
-
-Вы также можете устанавливать все вручную, но в данной документации список требований может не всегда быть актуальным.
-
-Текущие требования представлены ниже, но не все они могут быть необходимы, так как зависят от того, что вы делаете. Также стоит отметить, что в некоторых системах не все зависимости доступны в виде пакетов, или они могут называться по-другому.
-
-```
-build-essential
-gcc
-unzip
-wget
-zip
-gcc-avr
-binutils-avr
-avr-libc
-dfu-programmer
-dfu-util
-gcc-arm-none-eabi
-binutils-arm-none-eabi
-libnewlib-arm-none-eabi
-git
-```
-
-Установите все зависимости при помощи вашего любимого менеджера пакетов.
-
-Пример для Debian / Ubuntu:
-
-    sudo apt-get update
-    sudo apt-get install gcc unzip wget zip gcc-avr binutils-avr avr-libc dfu-programmer dfu-util gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi
-
-Пример для Fedora / Red Hat:
-
-    sudo dnf install gcc unzip wget zip dfu-util dfu-programmer avr-gcc avr-libc binutils-avr32-linux-gnu arm-none-eabi-gcc-cs arm-none-eabi-binutils-cs arm-none-eabi-newlib
-    
-Пример для Arch / Manjaro:
-
-    pacman -S base-devel gcc unzip wget zip avr-gcc avr-binutils avr-libc dfu-util arm-none-eabi-gcc arm-none-eabi-binutils arm-none-eabi-newlib git dfu-programmer dfu-util
-
-## Nix
-
-Если вы используете [NixOS](https://nixos.org/), или у вас установлена Nix в Linux или macOS, выполните `nix-shell` из корня репозитория, чтобы настроить окружение для сборки.
-
-По умолчанию, это скачает компиляторы для AVR и ARM. Если вам не нужны они оба, отключите `avr` или `arm` с помощью аргумента, например:
-
-    nix-shell --arg arm false
-
-## macOS
-
-Если вы пользуетесь [Homebrew](https://brew.sh/), вы можете использовать следующие команды:
-
-    brew tap osx-cross/avr
-    brew tap PX4/homebrew-px4
-    brew update
-    brew install avr-gcc@8
-    brew link --force avr-gcc@8
-    brew install dfu-programmer
-    brew install dfu-util
-    brew install gcc-arm-none-eabi
-    brew install avrdude
-
-Данный метод является рекомендуемым. Если у вас нет Homebrew, [установите его!](https://brew.sh/) Он очень сильно пригодится тем, кто работает с командной строкой. Стоит отметить, что часть с `make` и `make install` во время установки `avr-gcc@8` из Homebrew может занимать более 20 минут и сильно нагружать CPU.
-
-## Windows с MSYS2 (рекомендуется)
-
-Наилучшим окружение для Windows Vista и всех последующих версий (тестировалось с 7 и 10) является [MSYS2](https://www.msys2.org).
-
-* Для установки MSYS2, скачайте его и следуйте дальнейшим указаниям отсюда: https://www.msys2.org
-* Откройте ``MSYS2 MingGW 64-bit`` ярлык
-* Перейдите в свой репозиторий QMK. Например, если он находится в корне вашего диска C:
-  * `$ cd /c/qmk_firmware`
-* Запустите `util/qmk_install.sh` и следуйте подсказкам
-
-## Windows 10 (устарело)
-
-Это устаревшие инструкции для Windows 10. Мы рекомендуем использовать [MSYS2, как сказано выше](#windows-с-msys2-рекомендуется).
-
-### Обновление для дизайнеров (Creators Update)
-
-Если у вас Windows 10 с Обновлением для дизайнеров или новее, вы можете собрать прошивку и прошить ей напрямую. До Обновления для дизайнеров было возможно только собрать прошивку. Если у вас его еще нет, или вы не уверены, следуйте [этим инструкциям](https://support.microsoft.com/en-us/instantanswers/d4efb316-79f0-1aa1-9ef3-dcada78f3fa0/get-the-windows-10-creators-update).
-
-### Подсистема Windows для Linux (Windows Subsystem for Linux, WSL)
-
-В дополнение к Обновлению для дизайнеров вам необходима подсистема Windows для Linux, поэтому установите ее, следуя [иснтрукциям здесь](https://www.howtogeek.com/249966/how-to-install-and-use-the-linux-bash-shell-on-windows-10/). Если у вас уже есть подсистема Windows для Linux из Юбилейного обновления (Anniversary update), рекомендуется ее [обновить](https://betanews.com/2017/04/14/upgrade-windows-subsystem-for-linux/) до 16.04LTS, потому что некоторые клавиатуры не компилируются с набором инструментов из 14.04LTS. Стоит отметить, что вы четко должны понимать, что вы делаете, если выбрали метод `sudo do-release-upgrade`.
-
-### Git
-
-Если вы уже клонировали репозиторий в файловую систему Windows, вы можете пропустить данную секцию.
-
-Вам нужно клонировать репозиторий в файловую систему Windows при помощи обычного Git для Windows, а **не** WSL Git. Так что, если вы ещё не установили Git, [скачайте](https://git-scm.com/download/win) и установите его. Затем [настройте его](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup). Важно указать свой адрес электронной почты и имя пользователя, особенно если вы планируете вносить свой вклад в проект.
-
-Как только Git будет установлен, откройте командную строку Git Bash и поменяйте директорию на ту, в которую хотите клонировать QMK; обратите внимание, что вы должны использовать косую черту, и что доступ к вашему диску C осуществляется примерно так: `/c/path/to/where/you/want/to/go`. Затем выполните `git clone --recurse-submodules https://github.com/qmk/qmk_firmware`, это создаст новую папку `qmk_firmware` в текущей директории.
-
-### Установка инструментов (Toolchain)
-
-Установка инструментов (Toolchain) осуществляется через подсистему Windows для Linux, и процесс полностью автоматизирован. Если вы хотите выполнить установку вручную, то не существует никакой другой инструкции помимо самого скрипта. Однако, вы всегда можете открыть ишью и запросить дополнительную информацию.
-
-1. Откройте "Bash On Ubuntu On Windows" в меню Пуск.
-2. Перейдите в папку, в которую клонирована `qmk_firmware`. Обратите внимание, что пути начинаются с `/mnt/` в WSL, так что вы должны написать, например, `cd /mnt/c/path/to/qmk_firmware`.
-3. Запустите `util/wsl_install.sh` и следуйте инструкциям на экране.
-4. Закройте окно командной строки Bash, и откройте его снова.
-5. Все готово, чтобы скомпилировать прошивку и прошить ей!
-
-### Несколько важных вещей, которые надо запомнить
-
-* Вы можете запустить `util/wsl_install.sh` еще раз, чтобы установить все последние обновления.
-* Ваш репозиторий QMK должен находиться в файловой системе Windows, поскольку WSL не может запускать выполняемые файлы извне.
-* WSL Git **не** совместим с Windows Git, поэтому используйте Windows Git Bash или Windows Git GUI для всех операций с Git.
-* Вы можете изменять файлы как внутри WSL, так и просто через Windows. Но обратите внимание, что если вы изменяете makefiles или сценарии командной строки, вы должны убедиться, что используете текстовый редактор, который сохраняет файлы с переводом строки в стиле Unix (Unix line endings). В противном случае компиляция может не работать.
-
-## Docker
-
-Если это немного сложновато для вас, Docker может стать готовым решением, которое вы ищите. После установки [Docker CE](https://docs.docker.com/install/#supported-platforms) выполните следующую команду из директории `qmk_firmware`, чтобы собрать клавиатуру/раскладку:
-
-```bash
-util/docker_build.sh keyboard:keymap
-# Например: util/docker_build.sh ergodox_ez:steno
-```
-
-Это скомпилирует указанную клавиатуру/раскладку и создаст для вас `.hex` или `.bin` файл с результатом, готовым к процессу прошивки, в директории QMK. Если опустить `:keymap`, будет использована раскладка `default`. Заметьте, что формат параметров такой же, как и в случае сборки командой `make`.
-
-Вы также можете запустить скрипт без параметров. Тогда он попросит вас ввести поочередно параметры сборки. Возможно, вам это покажется более удобным:
-
-```bash
-util/docker_build.sh
-# Читает параметры из пользовательского ввода (оставьте пустым для значений по умолчанию)
-```
-
-Также имеется поддержка сборки _и_ прошивки клавиатуры прямо из Docker. Для этого укажите еще один параметр `target`:
-
-```bash
-util/docker_build.sh keyboard:keymap:target
-# Например: util/docker_build.sh planck/rev6:default:dfu-util
-```
-
-Если вы используете Linux, это должно работать прямо из коробки. На Windows и macOS это требует запуска [Docker Machine](http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos/). Ее довольно утомительно настраивать, поэтому мы не рекомендуем это; используйте вместо этого [QMK Toolbox](https://github.com/qmk/qmk_toolbox).
-
-!> Docker для Windows требует включения [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v). Это означает, что он не работает на версиях Windows без Hyper-V, например, на Windows 7, Windows 8 и **Windows 10 Home**.
-
-## Vagrant
-
-Если у вас возникли проблемы при сборке прошивки, вы можете попробовать установить инструмент под названием Vagrant. Он сконфигурирует виртуальный компьютер с такими параметрами, которые подходят для сборки прошивки. У OLKB НЕТ файлов такого виртуально компьютера. Подробности о том, как настроить Vagrant, можно найти в [Руководстве по Vagrant](ru-ru/getting_started_vagrant.md).
diff --git a/docs/ru-ru/getting_started_getting_help.md b/docs/ru-ru/getting_started_getting_help.md
deleted file mode 100644
index 75be44310e..0000000000
--- a/docs/ru-ru/getting_started_getting_help.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Получение помощи
-
-Существует много ресурсов для получения помощи по работе с QMK.
-
-## Чат в реальном времени
-
-Вы можете найти разработчиков и пользователей QMK на нашем главном [сервере Discord](https://discord.gg/Uq7gcHh). На сервере есть специальные каналы для разговоров о прошивке, Toolbox, оборудовании и конфигураторе.
-
-## OLKB Сабреддит
-
-Официальный форум QMK [/r/olkb](https://reddit.com/r/olkb) на [reddit.com](https://reddit.com).
-
-## GitHub ишью
-
-Вы можете открыть [ишью на GitHub](https://github.com/qmk/qmk_firmware/issues). Это особенно удобно, когда ваша проблема потребует длительного обсуждения или отладки.
diff --git a/docs/ru-ru/getting_started_github.md b/docs/ru-ru/getting_started_github.md
deleted file mode 100644
index 7a70926f50..0000000000
--- a/docs/ru-ru/getting_started_github.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# Как использовать GitHub с QMK
-
-GitHub может показаться несколько сложным для тех, кто никогда с ним не работал. В данном руководстве будет разобран каждый шаг создания форка, клонирования и отправки пулреквеста в QMK.
-
-?> В этом руководстве предполагается, что вы в какой-то степени знакомы с работой в командной строке, и в вашей системе установлен git.
-
-Откройте [страницу QMK на GitHub] (https://github.com/qmk/qmk_firmware), и в правом верхнем углу вы увидите кнопку с надписью "Fork":
-
-![Fork on GitHub](https://i.imgur.com/8Toomz4.jpg)
-
-Если вы состоите в какой-либо организации, вам нужно выбрать учетную запись, к которой будет привязан форк. В большинстве случаев это будет личной аккаунт. Как только ваш форк будет завершен (иногда это занимает немного времени), нажмите кнопку "Clone or Download":
-![Download from GitHub](https://i.imgur.com/N1NYcSz.jpg)
-
-И обязательно выберите "HTTPS", затем выделите ссылку и скопируйте ее:
-
-![HTTPS link](https://i.imgur.com/eGO0ohO.jpg)
-
-Теперь введите `git clone --recurse-submodules ` в командную строку, а затем вставьте ссылку:
-
-```
-user@computer:~$ git clone --recurse-submodules https://github.com/whoeveryouare/qmk_firmware.git
-Cloning into 'qmk_firmware'...
-remote: Enumerating objects: 9, done.
-remote: Counting objects: 100% (9/9), done.
-remote: Compressing objects: 100% (5/5), done.
-remote: Total 183883 (delta 5), reused 4 (delta 4), pack-reused 183874
-Receiving objects: 100% (183883/183883), 132.90 MiB | 9.57 MiB/s, done.
-Resolving deltas: 100% (119972/119972), done.
-...
-Submodule path 'lib/chibios': checked out '587968d6cbc2b0e1c7147540872f2a67e59ca18b'
-Submodule path 'lib/chibios-contrib': checked out 'ede48346eee4b8d6847c19bc01420bee76a5e486'
-Submodule path 'lib/googletest': checked out 'ec44c6c1675c25b9827aacd08c02433cccde7780'
-Submodule path 'lib/lufa': checked out 'ce10f7642b0459e409839b23cc91498945119b4d'
-```
-
-Теперь у вас есть форк QMK на вашем локальном компьютере, и вы можете добавить свою раскладку, скомпилировать ее и прошить ей свою клавиатуру. Как только вы будете довольны своими изменениями, есть возможность добавить, зафиксировать их и сделать коммит в свой форк следующим образом:
-
-```
-user@computer:~$ git add .
-user@computer:~$ git commit -m "adding my keymap"
-[master cccb1608] adding my keymap
- 1 file changed, 1 insertion(+)
- create mode 100644 keyboards/planck/keymaps/mine/keymap.c
-user@computer:~$ git push
-Counting objects: 1, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (1/1), done.
-Writing objects: 100% (1/1), 1.64 KiB | 0 bytes/s, done.
-Total 1 (delta 1), reused 0 (delta 0)
-remote: Resolving deltas: 100% (1/1), completed with 1 local objects.
-To https://github.com/whoeveryouare/qmk_firmware.git
- + 20043e64...7da94ac5 master -> master
-```
-
-Ваши изменения теперь существуют в вашем форке на GitHub - если вернуться туда (`https://github.com/<whoeveryouare>/qmk_firmware`), вы сможете создать "New Pull Request" нажатием на кнопку:
-
-![New Pull Request](https://i.imgur.com/DxMHpJ8.jpg)
-
-Здесь вы сможете увидеть, какие именно изменения были внесены, - если все выглядит хорошо, вы можете завершить его, нажав "Create Pull Request":
-
-![Create Pull Request](https://i.imgur.com/Ojydlaj.jpg)
-
-После отправки мы можем расспросить вас о ваших изменениях, попросить внести корректировки и в конечном итоге принять их! Спасибо за ваш вклад в QMK :)
diff --git a/docs/ru-ru/getting_started_introduction.md b/docs/ru-ru/getting_started_introduction.md
deleted file mode 100644
index ccc4418068..0000000000
--- a/docs/ru-ru/getting_started_introduction.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# Введение
-
-Эта страница пытается объяснить основную информацию, которую вы должны знать, чтобы работать с проектом QMK. Предполагается, что вы знакомы с навигацией в оболочке Unix, но не предполагается, что вы знакомы с C или с компиляцией с использованием make.
-
-## Базовая структура QMK
-
-QMK - это форк [Джуна Вако (Jun Wako)](https://github.com/tmk) проекта [tmk_keyboard](https://github.com/tmk/tmk_keyboard). Оригинальный код TMK с изменениями можно найти в папке `tmk_core`. Дополнения QMK к проекту можно найти в папке `quantum`. Проекты клавиатур можно найти в папках `handwired` и `keyboard`.
-
-### Структура пространства пользователя
-
-Внутри папки `users` находится каталог для каждого пользователя. Это место для пользователей, куда они могут поместить код, чтобы использовать его с разными клавиатурами. Для получения дополнительной информации обратитесь к документации по [функциям пользовательского пространства](ru-ru/feature_userspace.md).
-
-### Структура проекта клавиатуры
-
-Внутри папки `keyboards` есть подпапки `handwired` и есть подкаталоги поставщиков и производителей, для примера, `clueboard` - это каталог для каждого проекта клавиатуры, например, `qmk_firmware/keyboards/clueboard/2x1800`. В нем вы найдете следующую структуру:
-* `keymaps/`: Различные раскладки клавиш, которые можно собрать.
-* `rules.mk`: Файл, который устанавливает параметры по умолчанию для команды "make". Не редактируйте этот файл напрямую, вместо этого используйте `rules.mk`, относящийся к конкретной раскладке.
-* `config.h`: Файл, который устанавливает параметры времени компиляции по умолчанию. Не редактируйте этот файл напрямую, вместо этого используйте `config.h`, относящийся к конкретной раскладке.
-* `info.json`: Файл настройки раскладки для QMK Configurator. Посмотрите [Поддержку конфигуратора](ru-ru/reference_configurator_support.md) для дополнительной информации.
-* `readme.md`: Краткий обзор клавиатуры.
-* `<keyboardName>.h`: В этом файле определяется раскладка клавиатуры по матрице переключателей клавиатуры.
-* `<keyboardName>.c`: В этом файле вы можете найти пользовательский код для клавиатуры.
-
-Для получения дополнительной информации о структуре проекта обратитесь к [Руководству QMK по клавиатуре](ru-ru/hardware_keyboard_guidelines.md).
-
-### Структура раскладки клавиатуры
-
-В каждой папке раскладки клавиатуры могут быть найдены следующие файлы. Обязательным является только файл `keymap.c`, и если остальные файлы не найдены, то будут выбраны параметры по умолчанию.
-
-* `config.h`: настройки вашей раскладки клавиатуры.
-* `keymap.c`: весь код вашей раскладки клавиатуры (обязателен).
-* `rules.mk`: активированные функции QMK.
-* `readme.md`: описание вашей раскладки клавиш, как ее могут использовать другие, и объяснения функций. Пожалуйста, загрузите изображения на сервис, такой как imgur.
-
-# Файл `config.h`
-
-Существует 3 возможных местоположения `config.h`:
-
-* клавиатура (`/keyboards/<keyboard>/config.h`)
-* пространство пользователя (`/users/<user>/config.h`)
-* раскладка клавиш (`/keyboards/<keyboard>/keymaps/<keymap>/config.h`)
-
-Система сборки автоматически загружает файлы конфигурации в указанном выше порядке. Если вы хотите переопределить любую настройку, заданную предыдущим `config.h`, вам сначала нужно будет включить некоторый шаблонный код для настроек, которые вы хотите изменить.
-
-```
-#pragma once
-```
-
-Затем, чтобы переопределить настройку из предыдущего файла `config.h`, вы должны сделать `#undef` и `#define` для неё снова.
-
-Код и настройка шаблона вместе выглядят так:
-```
-#pragma once
-
-// Переопределения производятся здесь!
-#undef MY_SETTING
-#define MY_SETTING 4
-```
diff --git a/docs/ru-ru/newbs.md b/docs/ru-ru/newbs.md
deleted file mode 100644
index 0e7bd6499c..0000000000
--- a/docs/ru-ru/newbs.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Руководство по QMK для полных новичков
-
-QMK ― это мощная прошивка с открытым исходным кодом для вашей механической клавиатуры. Вы можете использовать QMK для легкой и мощной персонализации своей клавиатуры. Люди с разным уровнем умений, от совсем новичков до крутых программистов, успешно применяли QMK, чтобы персонализировать свои клавиатуры. Данное руководство поможет вам сделать то же самое, независимо от уровня вашего мастерства.
-
-Не уверены, поддерживает ли ваша клавиатура QMK? Если это механическая клавиатура, которую вы собрали сами, шансы достаточно велики. Мы поддерживаем [большое число любительских клавиатур](https://qmk.fm/keyboards/), поэтому, даже если ваша текущая клавиатура не совместима с QMK, у вас не должно возникнуть проблем с нахождением подходящей для ваших нужд.
-
-## Обзор
-
-В данном руководстве 7 основных секций:
-
-* [Первое знакомство](ru-ru/newbs_getting_started.md)
-* [Собираем вашу первую прошивку с помощью командной строки](ru-ru/newbs_building_firmware.md)
-* [Собираем вашу первую прошивку с помощью онлайн GUI](ru-ru/newbs_building_firmware_configurator.md)
-* [Прошиваем файл прошивки](ru-ru/newbs_flashing.md)
-* [Тестируем и отлаживаем](ru-ru/newbs_testing_debugging.md)
-* [Лучшие практики по Git](ru-ru/newbs_best_practices.md)
-* [Узнайте больше на этих ресурсах](ru-ru/newbs_learn_more_resources.md)
-
-Данное руководство сосредоточено на помощи тем, кто никогда раньше не компилировал ПО. Приятие решений и рекомендации делаются с учетом именно этого. Существует много альтернативных методов для описанных процедур, и мы поддерживаем большинство из них. Если у вас есть сомнения о том, как выполнить задачу, вы можете [попросить у нас совета](ru-ru/getting_started_getting_help.md).
-
-## Дополнительные ресурсы
-
-* [Блог Томаса Баарта (Thomas Baart) об основах QMK](https://thomasbaart.nl/category/mechanical-keyboards/firmware/qmk/qmk-basics/) – Созданный пользователем блог, охватывающий основы использования QMK Firmware с точки зрения нового пользователя.
diff --git a/docs/ru-ru/newbs_getting_started.md b/docs/ru-ru/newbs_getting_started.md
deleted file mode 100644
index a301e9adba..0000000000
--- a/docs/ru-ru/newbs_getting_started.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Введение
-
-У вашей компьютерной клавиатуры внутри есть процессор, похожий на тот, что внутри вашего компьютера. Этот процессор выполняет программное обеспечение, которое отвечает за обнаружение нажатий клавиш и отсылку сигналов состояния клавиатуры, когда клавиши нажимаются и отпускаются. Роль такого ПО выполняет QMK, детектируя нажатия клавиш и отсылая эту информацию главному компьютеру. Сбор собственной раскладки эквивалентен сборке выполняемой программы для вашей клавиатуры.
-
-QMK старается дать вам большую силу, оставляя простые вещи легкими и делай сложные — возможными. Вам не надо уметь программировать, чтобы создавать мощные прошивки — вам только надо следовать нескольким простым синтаксическим правилам.
-
-# Первое знакомство
-
-Перед тем, как вы сможете собирать раскладки, вам необходимо установить некоторое программное обеспечение и настроить ваше окружение для сборки. Это нужно сделать только один раз, вне зависимости от того, для скольких клавиатур вы планируете компилировать прошивки.
-
-Если вы предпочитаете графический пользовательский интерфейс, пожалуйста, рассмотрите возможность использования онлайн [QMK Конфигуратора](https://config.qmk.fm). Пожалуйста, обратитесь к [Собираем вашу первую прошивку с помощью онлайн GUI](ru-ru/newbs_building_firmware_configurator.md). 
-
-
-## Загрузка ПО
-
-### Текстовый редактор
-
-Вам понадобится программа, умеющая редактировать и сохранять **обычные текстовые** файлы. Если вы используете Windows, вы можете делать это Блокнотом, а в Linux вы можете использовать gedit. Обе программы являются простыми, но функциональными редакторами. В macOS остерегайтесь стандартного приложения TextEdit: он не будет сохранять обычные текстовые файлы, пока вы явно не выберите _Make Plain Text_ из меню _Format_.
-
-Вы также можете скачать и установить отдельный текстовый редактор наподобие [Sublime Text](https://www.sublimetext.com/) или [VS Code](https://code.visualstudio.com/). Возможно, это наилучший вариант независимо от платформы, поскольку эти программы сделаны специально для редактирования кода.
-
-?> Не уверены, какой выбрать текстовый редактор? Лоуренс Брэдфорд (Laurence Bradford) написал [отличное введение](https://learntocodewith.me/programming/basics/text-editors/) в тему.
-
-### QMK Toolbox
-
-QMK Toolbox является дополнительной графической программой для Windows и macOS, которая позволяет вам разрабатывать и отлаживать вашу клавиатуру. Вы, вероятно, посчитаете ее бесценной для легкого процесса прошивки вашей клавиатуры и просмотра отладочных сообщений, которые она отображает.
-
-[Скачайте последний выпуск здесь.](https://github.com/qmk/qmk_toolbox/releases/latest)
-
-* Для Windows: `qmk_toolbox.exe` (переносимое приложение) или `qmk_toolbox_install.exe` (установщик)
-* Для macOS: `QMK.Toolbox.app.zip` (переносимое приложение) или `QMK.Toolbox.pkg` (установщик)
-
-## Настройте ваше окружение
-
-Мы постарались сделать установку QMK максимально легкой. Вам нужно только подготовить ваше Linux или Unix окружение, после этого позвольте QMK установить все остальное.
-
-?> Если вы никогда раньше не работали с командной строкой Linux/Unix, существует несколько базовых концептов и команд, которые необходимо выучить. Эти ресурсы дадут вам достаточно знаний, чтобы работать с QMK:<br>
-[Обязательные к изучению команды Linux](https://www.guru99.com/must-know-linux-commands.html)<br>
-[Несколько базовых команд Unix](https://www.tjhsst.edu/~dhyatt/superap/unixcmd.html)
-
-### Windows
-
-Вам нужно будет установить MSYS2 и Git.
-
-* Следуйте инструкциям по установки на [домашней странице MSYS2](https://www.msys2.org).
-* Закройте все открытые терминалы MSYS2 и откройте новый терминал MSYS2 MinGW 64-bit.
-* Установите Git, выполнив эту команду: `pacman -S git`.
-
-### macOS
-
-Вам нужно будет установить Homebrew. Следуйте инструкциям на [домашней странице Homebrew](https://brew.sh).
-
-После установки Homebrew продолжите чтение с _Установите QMK_. На этом шаге вам надо будет запустить скрипт, который установит остальные пакеты.
-
-### Linux
-
-Вам нужно будет установить Git. Скорее всего, он у вас уже есть, но если нет, одна из следующих команд должна установить его:
-
-* Debian / Ubuntu / Devuan: `apt-get install git`
-* Fedora / Red Hat / CentOS: `yum install git`
-* Arch: `pacman -S git`
-
-?> Docker также является вариантом для всех платформ. [Нажмите сюда для получения подробностей.](ru-ru/getting_started_build_tools.md#docker)
-
-## Установите QMK
-
-Как только вы настроили ваше Linux/Unix окружение, вы готовы к загрузке QMK. Мы сделаем это при помощи Git, "клонировав" репозиторий QMK. Откройте Терминал или окно MSYS2 MinGW и оставьте его открытым до конца данного руководства. Выполните эти команды внутри него:
-
-```shell
-git clone --recurse-submodules https://github.com/qmk/qmk_firmware.git
-cd qmk_firmware
-```
-
-?> Если вы уже знаете, [как пользоваться GitHub](ru-ru/getting_started_github.md), мы рекомендуем вам вместо этого создать и клонировать свой собственный форк. Если вы не понимаете, что это значит, просто проигнорируйте это сообщение.
-
-QMK включает в себя скрипт, который поможет вам установить все оставшееся, что вам понадобится. Вы должны запустить его, набрав эту команду:
-
-    util/qmk_install.sh
-
-## Протестируйте ваше окружение для сборки
-
-Теперь, когда ваше окружение QMK для сборки настроено, вы можете собрать прошивку для вашей клавиатуры. Начните с попытки собрать раскладку для клавиатуры по умолчанию. У вас должно это получиться с помощью команды в этом формате:
-
-    make <keyboard>:default
-
-Например, чтобы собрать прошивку для Clueboard 66%, вы введете:
-
-    make clueboard/66/rev3:default
-
-Когда все закончится, вы должны увидеть большой лог, который заканчивается примерно так:
-
-```
-Linking: .build/clueboard_66_rev3_default.elf                                                       [OK]
-Creating load file for flashing: .build/clueboard_66_rev3_default.hex                               [OK]
-Copying clueboard_66_rev3_default.hex to qmk_firmware folder                                        [OK]
-Checking file size of clueboard_66_rev3_default.hex                                                 [OK]
- * The firmware size is fine - 26356/28672 (2316 bytes free)
-```
-
-# Создаем вашу раскладку
-
-Теперь вы готовы создать свою персональную раскладку! Для этого перейдите к [Собираем вашу первую прошивку](ru-ru/newbs_building_firmware.md).

From 5fb93934d0f3319547cc6313845fe5a96f8b7798 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 6 Jan 2022 06:55:46 +1100
Subject: [PATCH 138/867] Fixes for bootloader refactor build failures (#15638)

---
 builddefs/mcu_selection.mk                    | 40 +++++++++++++++++++
 docs/platformdev_chibios_earlyinit.md         |  1 -
 .../DURGOD_STM32_F070/bootloader_defs.h       |  7 ----
 keyboards/durgod/dgk6x/rules.mk               |  4 +-
 keyboards/ergodox_stm32/rules.mk              |  4 --
 .../matrix/abelx/boards/abelx_bd/board.c      |  3 --
 keyboards/matrix/abelx/bootloader_defs.h      |  7 ----
 keyboards/matrix/abelx/rules.mk               |  8 ----
 keyboards/matrix/m20add/bootloader_defs.h     |  5 ---
 keyboards/matrix/noah/bootloader_defs.h       |  5 ---
 keyboards/mechmini/v1/rules.mk                |  2 +-
 keyboards/mode/m65s/rules.mk                  |  5 ++-
 lib/python/qmk/info.py                        |  7 +---
 .../configs/bootloader_defs.h                 |  5 ---
 .../configs/bootloader_defs.h                 |  5 ---
 .../configs/bootloader_defs.h                 |  5 ---
 .../configs/bootloader_defs.h                 |  5 ---
 .../configs/bootloader_defs.h                 |  5 ---
 .../GENERIC_STM32_F405XG/configs/config.h     |  2 +-
 .../GENERIC_STM32_F407XE/configs/config.h     |  2 +-
 .../GENERIC_STM32_F446XE/configs/config.h     |  2 +-
 .../GENERIC_STM32_G431XB/configs/config.h     | 23 -----------
 .../GENERIC_STM32_L412XB/configs/config.h     |  1 -
 .../GENERIC_STM32_L433XC/configs/config.h     |  1 -
 .../configs/bootloader_defs.h                 | 12 ------
 .../QMK_PROTON_C/configs/bootloader_defs.h    |  7 ----
 platforms/chibios/bootloaders/gd32v_dfu.c     |  1 +
 27 files changed, 53 insertions(+), 121 deletions(-)
 delete mode 100644 keyboards/durgod/boards/DURGOD_STM32_F070/bootloader_defs.h
 delete mode 100644 keyboards/matrix/abelx/bootloader_defs.h
 delete mode 100644 keyboards/matrix/m20add/bootloader_defs.h
 delete mode 100644 keyboards/matrix/noah/bootloader_defs.h
 delete mode 100644 platforms/chibios/boards/BLACKPILL_STM32_F401/configs/bootloader_defs.h
 delete mode 100644 platforms/chibios/boards/BLACKPILL_STM32_F411/configs/bootloader_defs.h
 delete mode 100644 platforms/chibios/boards/GENERIC_STM32_F042X6/configs/bootloader_defs.h
 delete mode 100644 platforms/chibios/boards/GENERIC_STM32_F072XB/configs/bootloader_defs.h
 delete mode 100644 platforms/chibios/boards/GENERIC_STM32_F303XC/configs/bootloader_defs.h
 delete mode 100644 platforms/chibios/boards/GENERIC_STM32_G431XB/configs/config.h
 delete mode 100644 platforms/chibios/boards/GENERIC_WB32_F3G71XX/configs/bootloader_defs.h
 delete mode 100644 platforms/chibios/boards/QMK_PROTON_C/configs/bootloader_defs.h

diff --git a/builddefs/mcu_selection.mk b/builddefs/mcu_selection.mk
index 46d34aabe4..3a5768de73 100644
--- a/builddefs/mcu_selection.mk
+++ b/builddefs/mcu_selection.mk
@@ -143,6 +143,9 @@ ifneq ($(findstring STM32F042, $(MCU)),)
   # This ensures that the EEPROM page buffer fits into RAM
   USE_PROCESS_STACKSIZE = 0x600
   USE_EXCEPTIONS_STACKSIZE = 0x300
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFFC400
 endif
 
 ifneq ($(findstring STM32F072, $(MCU)),)
@@ -175,6 +178,9 @@ ifneq ($(findstring STM32F072, $(MCU)),)
 
   # UF2 settings
   UF2_FAMILY ?= STM32F0
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFFC800
 endif
 
 ifneq ($(findstring STM32F103, $(MCU)),)
@@ -239,6 +245,9 @@ ifneq ($(findstring STM32F303, $(MCU)),)
 
   # UF2 settings
   UF2_FAMILY ?= STM32F3
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFFD800
 endif
 
 ifneq ($(findstring STM32F401, $(MCU)),)
@@ -276,6 +285,9 @@ ifneq ($(findstring STM32F401, $(MCU)),)
 
   # UF2 settings
   UF2_FAMILY ?= STM32F4
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
 endif
 
 ifneq ($(findstring STM32F405, $(MCU)),)
@@ -308,6 +320,9 @@ ifneq ($(findstring STM32F405, $(MCU)),)
 
   # UF2 settings
   UF2_FAMILY ?= STM32F4
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
 endif
 
 ifneq ($(findstring STM32F407, $(MCU)),)
@@ -340,6 +355,9 @@ ifneq ($(findstring STM32F407, $(MCU)),)
 
   # UF2 settings
   UF2_FAMILY ?= STM32F4
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
 endif
 
 ifneq ($(findstring STM32F411, $(MCU)),)
@@ -377,6 +395,9 @@ ifneq ($(findstring STM32F411, $(MCU)),)
 
   # UF2 settings
   UF2_FAMILY ?= STM32F4
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
 endif
 
 ifneq ($(findstring STM32F446, $(MCU)),)
@@ -406,6 +427,9 @@ ifneq ($(findstring STM32F446, $(MCU)),)
   BOARD ?= GENERIC_STM32_F446XE
 
   USE_FPU ?= yes
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
 endif
 
 ifneq ($(findstring STM32G431, $(MCU)),)
@@ -438,6 +462,9 @@ ifneq ($(findstring STM32G431, $(MCU)),)
 
   # UF2 settings
   UF2_FAMILY ?= STM32G4
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
 endif
 
 ifneq ($(findstring STM32G474, $(MCU)),)
@@ -470,6 +497,9 @@ ifneq ($(findstring STM32G474, $(MCU)),)
 
   # UF2 settings
   UF2_FAMILY ?= STM32G4
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
 endif
 
 ifneq (,$(filter $(MCU),STM32L433 STM32L443))
@@ -504,6 +534,9 @@ ifneq (,$(filter $(MCU),STM32L433 STM32L443))
 
   # UF2 settings
   UF2_FAMILY ?= STM32L4
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
 endif
 
 ifneq (,$(filter $(MCU),STM32L412 STM32L422))
@@ -538,6 +571,9 @@ ifneq (,$(filter $(MCU),STM32L412 STM32L422))
 
   # UF2 settings
   UF2_FAMILY ?= STM32L4
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
 endif
 
 ifneq ($(findstring WB32F3G71, $(MCU)),)
@@ -567,6 +603,10 @@ ifneq ($(findstring WB32F3G71, $(MCU)),)
   BOARD ?= GENERIC_WB32_F3G71XX
 
   USE_FPU ?= no
+
+  # Bootloader address for WB32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFFE000
+  WB32_BOOTLOADER_ADDRESS ?= 0x1FFFE000
 endif
 
 ifneq ($(findstring GD32VF103, $(MCU)),)
diff --git a/docs/platformdev_chibios_earlyinit.md b/docs/platformdev_chibios_earlyinit.md
index eb932bc774..aaa91ba438 100644
--- a/docs/platformdev_chibios_earlyinit.md
+++ b/docs/platformdev_chibios_earlyinit.md
@@ -17,7 +17,6 @@ As such, if you wish to override this API consider limiting use to writing to lo
 | `config.h` override                           | Description                                                                                                                                                                                                                                                                            | Default  |
 |-----------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
 | `#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP`  | Whether or not bootloader is to be executed during the early initialisation code of QMK.                                                                                                                                                                                               | `FALSE`  |
-| `#define STM32_BOOTLOADER_ADDRESS`            | Relevant for single-bank STM32 MCUs, signifies the memory address to jump to bootloader. Consult [AN2606](https://www.st.com/content/st_com/en/search.html#q=an2606-t=resources-page=1) for the _System Memory_ address for your MCU. This value should be of the format `0x11111111`. | `<none>` |
 | `#define STM32_BOOTLOADER_DUAL_BANK`          | Relevant for dual-bank STM32 MCUs, signifies that a GPIO is to be toggled in order to enter bootloader mode.                                                                                                                                                                           | `FALSE`  |
 | `#define STM32_BOOTLOADER_DUAL_BANK_GPIO`     | Relevant for dual-bank STM32 MCUs, the pin to toggle when attempting to enter bootloader mode, e.g. `B8`                                                                                                                                                                               | `<none>` |
 | `#define STM32_BOOTLOADER_DUAL_BANK_POLARITY` | Relevant for dual-bank STM32 MCUs, the value to set the pin to in order to trigger charging of the RC circuit. e.g. `0` or `1`.                                                                                                                                                        | `0`      |
diff --git a/keyboards/durgod/boards/DURGOD_STM32_F070/bootloader_defs.h b/keyboards/durgod/boards/DURGOD_STM32_F070/bootloader_defs.h
deleted file mode 100644
index 02c48c4e6d..0000000000
--- a/keyboards/durgod/boards/DURGOD_STM32_F070/bootloader_defs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up here (page 175):
- * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
- */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFFC800
diff --git a/keyboards/durgod/dgk6x/rules.mk b/keyboards/durgod/dgk6x/rules.mk
index 56c5b1ac24..660719104d 100644
--- a/keyboards/durgod/dgk6x/rules.mk
+++ b/keyboards/durgod/dgk6x/rules.mk
@@ -1,9 +1,11 @@
 # MCU name
 # Actually F070, but close enough
 MCU = STM32F072
-
 BOARD = DURGOD_STM32_F070
 
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Do not put the microcontroller into power saving mode
 NO_SUSPEND_POWER_DOWN = yes
 
diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk
index 3a035cee01..3f7197cbf6 100644
--- a/keyboards/ergodox_stm32/rules.mk
+++ b/keyboards/ergodox_stm32/rules.mk
@@ -1,12 +1,8 @@
 # MCU name
 MCU = STM32F103
-
 MCU_LDSCRIPT = stm32f103_bootloader
 BOARD = ST_NUCLEO64_F103RB
 
-CFLAGS += "-Wno-error=deprecated"
-EXTRAFLAGS = -O0 -g
-
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = no	# Mouse keys
 EXTRAKEY_ENABLE = yes	# Audio control and System control
diff --git a/keyboards/matrix/abelx/boards/abelx_bd/board.c b/keyboards/matrix/abelx/boards/abelx_bd/board.c
index 68cf23cddc..db40a8e37b 100644
--- a/keyboards/matrix/abelx/boards/abelx_bd/board.c
+++ b/keyboards/matrix/abelx/boards/abelx_bd/board.c
@@ -208,9 +208,6 @@ static void stm32_gpio_init(void) {
  *          else.
  */
 void __early_init(void) {
-  extern void enter_bootloader_mode_if_requested(void);
-  enter_bootloader_mode_if_requested();
-
   stm32_gpio_init();
   stm32_clock_init();
 }
diff --git a/keyboards/matrix/abelx/bootloader_defs.h b/keyboards/matrix/abelx/bootloader_defs.h
deleted file mode 100644
index 20b8f73e6f..0000000000
--- a/keyboards/matrix/abelx/bootloader_defs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up here:
- * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
- */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
diff --git a/keyboards/matrix/abelx/rules.mk b/keyboards/matrix/abelx/rules.mk
index 98b6cfa65e..ac00984eae 100644
--- a/keyboards/matrix/abelx/rules.mk
+++ b/keyboards/matrix/abelx/rules.mk
@@ -25,14 +25,6 @@ ARMV = 7
 
 USE_FPU = yes
 
-# Vector table for application
-# 0x00000000-0x00001000 area is occupied by bootlaoder.*/
-OPT_DEFS =
-
-# Options to pass to dfu-util when flashing
-#DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
-#DFU_SUFFIX_ARGS = -p DF11 -v 0483
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/matrix/m20add/bootloader_defs.h b/keyboards/matrix/m20add/bootloader_defs.h
deleted file mode 100644
index 4da3d39a32..0000000000
--- a/keyboards/matrix/m20add/bootloader_defs.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up here:
- * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
diff --git a/keyboards/matrix/noah/bootloader_defs.h b/keyboards/matrix/noah/bootloader_defs.h
deleted file mode 100644
index 4da3d39a32..0000000000
--- a/keyboards/matrix/noah/bootloader_defs.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up here:
- * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
diff --git a/keyboards/mechmini/v1/rules.mk b/keyboards/mechmini/v1/rules.mk
index 6905e73c27..a7d4a67a16 100644
--- a/keyboards/mechmini/v1/rules.mk
+++ b/keyboards/mechmini/v1/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32a
 
 # Bootloader selection
-BOOTLOADER = atmel-dfu
+BOOTLOADER = bootloadhid
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/mode/m65s/rules.mk b/keyboards/mode/m65s/rules.mk
index ed43a7bc77..bb3ebaee28 100644
--- a/keyboards/mode/m65s/rules.mk
+++ b/keyboards/mode/m65s/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = STM32F401
 
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Build Options
 #   change yes to no to disable
 #
@@ -14,6 +17,6 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 EEPROM_DRIVER = i2c
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
-STM32_BOOTLOADER_ADDRESS = 0x1FFF0000
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 9a07fc842f..6bdf2cb166 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -622,12 +622,7 @@ def arm_processor_rules(info_data, rules):
     info_data['protocol'] = 'ChibiOS'
 
     if 'bootloader' not in info_data:
-        if 'STM32' in info_data['processor']:
-            info_data['bootloader'] = 'stm32-dfu'
-        elif 'WB32' in info_data['processor']:
-            info_data['bootloader'] = 'wb32-dfu'
-        else:
-            info_data['bootloader'] = 'unknown'
+        info_data['bootloader'] = 'unknown'
 
     if 'STM32' in info_data['processor']:
         info_data['platform'] = 'STM32'
diff --git a/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/bootloader_defs.h b/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/bootloader_defs.h
deleted file mode 100644
index 4da3d39a32..0000000000
--- a/platforms/chibios/boards/BLACKPILL_STM32_F401/configs/bootloader_defs.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up here:
- * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
diff --git a/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/bootloader_defs.h b/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/bootloader_defs.h
deleted file mode 100644
index 4da3d39a32..0000000000
--- a/platforms/chibios/boards/BLACKPILL_STM32_F411/configs/bootloader_defs.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up here:
- * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
diff --git a/platforms/chibios/boards/GENERIC_STM32_F042X6/configs/bootloader_defs.h b/platforms/chibios/boards/GENERIC_STM32_F042X6/configs/bootloader_defs.h
deleted file mode 100644
index 25113425a6..0000000000
--- a/platforms/chibios/boards/GENERIC_STM32_F042X6/configs/bootloader_defs.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up here:
- * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFFC400
diff --git a/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/bootloader_defs.h b/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/bootloader_defs.h
deleted file mode 100644
index dccd0fa5d1..0000000000
--- a/platforms/chibios/boards/GENERIC_STM32_F072XB/configs/bootloader_defs.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up here (page 175):
- * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFFC800
diff --git a/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/bootloader_defs.h b/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/bootloader_defs.h
deleted file mode 100644
index 87ac7b10dc..0000000000
--- a/platforms/chibios/boards/GENERIC_STM32_F303XC/configs/bootloader_defs.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up here:
- * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800
diff --git a/platforms/chibios/boards/GENERIC_STM32_F405XG/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_F405XG/configs/config.h
index cc52a953ed..90a41326a1 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F405XG/configs/config.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F405XG/configs/config.h
@@ -17,7 +17,7 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up by checking against ST's application note AN2606.
  */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
+
 #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
 #    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 #endif
diff --git a/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/config.h
index cc52a953ed..90a41326a1 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/config.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F407XE/configs/config.h
@@ -17,7 +17,7 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up by checking against ST's application note AN2606.
  */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
+
 #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
 #    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 #endif
diff --git a/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/config.h
index cc52a953ed..90a41326a1 100644
--- a/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/config.h
+++ b/platforms/chibios/boards/GENERIC_STM32_F446XE/configs/config.h
@@ -17,7 +17,7 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up by checking against ST's application note AN2606.
  */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
+
 #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
 #    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
 #endif
diff --git a/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/config.h
deleted file mode 100644
index 39ce627e77..0000000000
--- a/platforms/chibios/boards/GENERIC_STM32_G431XB/configs/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2018-2020 Nick Brassel (@tzarc)
- *
- * 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/>.
- */
-
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up here (page 175):
- * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
- */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
diff --git a/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/config.h
index c27c61b19a..fc9055ccfb 100644
--- a/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/config.h
+++ b/platforms/chibios/boards/GENERIC_STM32_L412XB/configs/config.h
@@ -17,7 +17,6 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up by checking against ST's application note AN2606.
  */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
 
 #define PAL_STM32_OSPEED_HIGHEST PAL_STM32_OSPEED_HIGH
 
diff --git a/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/config.h
index c27c61b19a..fc9055ccfb 100644
--- a/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/config.h
+++ b/platforms/chibios/boards/GENERIC_STM32_L433XC/configs/config.h
@@ -17,7 +17,6 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up by checking against ST's application note AN2606.
  */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
 
 #define PAL_STM32_OSPEED_HIGHEST PAL_STM32_OSPEED_HIGH
 
diff --git a/platforms/chibios/boards/GENERIC_WB32_F3G71XX/configs/bootloader_defs.h b/platforms/chibios/boards/GENERIC_WB32_F3G71XX/configs/bootloader_defs.h
deleted file mode 100644
index c929d2ad03..0000000000
--- a/platforms/chibios/boards/GENERIC_WB32_F3G71XX/configs/bootloader_defs.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Address for jumping to bootloader on WB32 chips. */
-/* It is chip dependent, the correct number can be looked up here:
- * http://www.westberrytech.com/down/mcu/data/WB32F3G71xx_rm.pdf
- */
-#ifndef WB32_BOOTLOADER_ADDRESS
-#    undef STM32_BOOTLOADER_ADDRESS
-#    define WB32_BOOTLOADER_ADDRESS 0x1FFFE000
-#    define STM32_BOOTLOADER_ADDRESS WB32_BOOTLOADER_ADDRESS
-#else
-#    undef STM32_BOOTLOADER_ADDRESS
-#    define STM32_BOOTLOADER_ADDRESS WB32_BOOTLOADER_ADDRESS
-#endif
diff --git a/platforms/chibios/boards/QMK_PROTON_C/configs/bootloader_defs.h b/platforms/chibios/boards/QMK_PROTON_C/configs/bootloader_defs.h
deleted file mode 100644
index 3b0e9d20a6..0000000000
--- a/platforms/chibios/boards/QMK_PROTON_C/configs/bootloader_defs.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Address for jumping to bootloader on STM32 chips. */
-/* It is chip dependent, the correct number can be looked up here:
- * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
- */
-#define STM32_BOOTLOADER_ADDRESS 0x1FFFD800
diff --git a/platforms/chibios/bootloaders/gd32v_dfu.c b/platforms/chibios/bootloaders/gd32v_dfu.c
index 7a979638e3..baa7d1f882 100644
--- a/platforms/chibios/bootloaders/gd32v_dfu.c
+++ b/platforms/chibios/bootloaders/gd32v_dfu.c
@@ -17,6 +17,7 @@
 #include "bootloader.h"
 
 #include <ch.h>
+#include <hal.h>
 
 #define DBGMCU_KEY_UNLOCK 0x4B5A6978
 #define DBGMCU_CMD_RESET 0x1

From fda5d982427502e8497866b814adb11ea386e294 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 5 Jan 2022 12:03:21 -0800
Subject: [PATCH 139/867] [Keymap] Fix onekey oled keymap (#15751)

---
 keyboards/handwired/onekey/keymaps/oled/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/handwired/onekey/keymaps/oled/keymap.c b/keyboards/handwired/onekey/keymaps/oled/keymap.c
index e020d5e4b6..244dc4facb 100644
--- a/keyboards/handwired/onekey/keymaps/oled/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/oled/keymap.c
@@ -390,7 +390,7 @@ bool oled_task_user(void) {
         // This mode is also forced when the screen update speed test is performed.
         if (!need_update) {
             if (test_mode != TEST_SLOW_UPDATE) {
-                return;
+                return false;
             }
         }
         need_update = false;

From efa2b5b683fd28eef1f36080f6a1d95a1cb5fbef Mon Sep 17 00:00:00 2001
From: Sergey Vlasov <sigprof@gmail.com>
Date: Wed, 5 Jan 2022 23:06:34 +0300
Subject: [PATCH 140/867] Fix info.json for kbdfans/odin/{rgb,soldered}
 (#15750)

* kbdfans/odin/*: Reformat info.json to be human-readable

Apply `qmk format-json` to the `info.json` files for `kbdfans/odin/rgb`
and `kbdfans/odin/soldered; no actual content changes.

* kbdfans/odin/*: Fix key ordering in info.json

The order of key entries in `info.json` did not match the order of
layout macro arguments (apparently the keys in the cursor block, which
are shifted down by 0.25u with respect to the rest of keys, were treated
as separate rows).  Fix the order to make the configurator
produce proper keymaps.
---
 keyboards/kbdfans/odin/rgb/info.json      | 111 +++++++++++++++++++-
 keyboards/kbdfans/odin/soldered/info.json | 118 +++++++++++++++++++++-
 2 files changed, 219 insertions(+), 10 deletions(-)

diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/info.json
index efec5ce07e..d5c63b5700 100644
--- a/keyboards/kbdfans/odin/rgb/info.json
+++ b/keyboards/kbdfans/odin/rgb/info.json
@@ -1,10 +1,111 @@
 {
-    "keyboard_name": "ODIN_RGB", 
-    "url": "", 
-    "maintainer": "moyi4681", 
+    "keyboard_name": "ODIN_RGB",
+    "maintainer": "moyi4681",
+    "url": "",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"x":18.5, "y":0}, {"x":19.5, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Num Lock", "x":16.5, "y":1.5}, {"label":"/", "x":17.5, "y":1.5}, {"label":"*", "x":18.5, "y":1.5}, {"label":"-", "x":19.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"7", "x":16.5, "y":2.5}, {"label":"8", "x":17.5, "y":2.5}, {"label":"9", "x":18.5, "y":2.5}, {"label":"+", "x":19.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":16.5, "y":3.5}, {"label":"5", "x":17.5, "y":3.5}, {"label":"6", "x":18.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"1", "x":16.5, "y":4.5}, {"label":"2", "x":17.5, "y":4.5}, {"label":"3", "x":18.5, "y":4.5}, {"label":"Enter", "x":19.5, "y":4.5, "h":2}, {"label":"\u2191", "x":15.25, "y":4.75}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":7}, {"label":"Alt", "x":10.75, "y":5.5, "w":1.5}, {"label":"Win", "x":12.25, "y":5.5, "w":1.5}, {"label":"0", "x":17.5, "y":5.5}, {"label":".", "x":18.5, "y":5.5}, {"label":"\u2190", "x":14.25, "y":5.75}, {"label":"\u2193", "x":15.25, "y":5.75}, {"label":"\u2192", "x":16.25, "y":5.75}]
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 2, "y": 0 },
+                { "label": "F2", "x": 3, "y": 0 },
+                { "label": "F3", "x": 4, "y": 0 },
+                { "label": "F4", "x": 5, "y": 0 },
+                { "label": "F5", "x": 6.5, "y": 0 },
+                { "label": "F6", "x": 7.5, "y": 0 },
+                { "label": "F7", "x": 8.5, "y": 0 },
+                { "label": "F8", "x": 9.5, "y": 0 },
+                { "label": "F9", "x": 11, "y": 0 },
+                { "label": "F10", "x": 12, "y": 0 },
+                { "label": "F11", "x": 13, "y": 0 },
+                { "label": "F12", "x": 14, "y": 0 },
+                { "label": "PrtSc", "x": 15.25, "y": 0 },
+                { "x": 16.5, "y": 0 },
+                { "x": 17.5, "y": 0 },
+                { "x": 18.5, "y": 0 },
+                { "x": 19.5, "y": 0 },
+                { "label": "~", "x": 0, "y": 1.5 },
+                { "label": "!", "x": 1, "y": 1.5 },
+                { "label": "@", "x": 2, "y": 1.5 },
+                { "label": "#", "x": 3, "y": 1.5 },
+                { "label": "$", "x": 4, "y": 1.5 },
+                { "label": "%", "x": 5, "y": 1.5 },
+                { "label": "^", "x": 6, "y": 1.5 },
+                { "label": "&", "x": 7, "y": 1.5 },
+                { "label": "*", "x": 8, "y": 1.5 },
+                { "label": "(", "x": 9, "y": 1.5 },
+                { "label": ")", "x": 10, "y": 1.5 },
+                { "label": "_", "x": 11, "y": 1.5 },
+                { "label": "+", "x": 12, "y": 1.5 },
+                { "label": "Backspace", "w": 2, "x": 13, "y": 1.5 },
+                { "label": "Insert", "x": 15.25, "y": 1.5 },
+                { "label": "Num Lock", "x": 16.5, "y": 1.5 },
+                { "label": "/", "x": 17.5, "y": 1.5 },
+                { "label": "*", "x": 18.5, "y": 1.5 },
+                { "label": "-", "x": 19.5, "y": 1.5 },
+                { "label": "Tab", "w": 1.5, "x": 0, "y": 2.5 },
+                { "label": "Q", "x": 1.5, "y": 2.5 },
+                { "label": "W", "x": 2.5, "y": 2.5 },
+                { "label": "E", "x": 3.5, "y": 2.5 },
+                { "label": "R", "x": 4.5, "y": 2.5 },
+                { "label": "T", "x": 5.5, "y": 2.5 },
+                { "label": "Y", "x": 6.5, "y": 2.5 },
+                { "label": "U", "x": 7.5, "y": 2.5 },
+                { "label": "I", "x": 8.5, "y": 2.5 },
+                { "label": "O", "x": 9.5, "y": 2.5 },
+                { "label": "P", "x": 10.5, "y": 2.5 },
+                { "label": "{", "x": 11.5, "y": 2.5 },
+                { "label": "}", "x": 12.5, "y": 2.5 },
+                { "label": "|", "w": 1.5, "x": 13.5, "y": 2.5 },
+                { "label": "Delete", "x": 15.25, "y": 2.5 },
+                { "label": "7", "x": 16.5, "y": 2.5 },
+                { "label": "8", "x": 17.5, "y": 2.5 },
+                { "label": "9", "x": 18.5, "y": 2.5 },
+                { "h": 2, "label": "+", "x": 19.5, "y": 2.5 },
+                { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.5 },
+                { "label": "A", "x": 1.75, "y": 3.5 },
+                { "label": "S", "x": 2.75, "y": 3.5 },
+                { "label": "D", "x": 3.75, "y": 3.5 },
+                { "label": "F", "x": 4.75, "y": 3.5 },
+                { "label": "G", "x": 5.75, "y": 3.5 },
+                { "label": "H", "x": 6.75, "y": 3.5 },
+                { "label": "J", "x": 7.75, "y": 3.5 },
+                { "label": "K", "x": 8.75, "y": 3.5 },
+                { "label": "L", "x": 9.75, "y": 3.5 },
+                { "label": ":", "x": 10.75, "y": 3.5 },
+                { "label": "\"", "x": 11.75, "y": 3.5 },
+                { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.5 },
+                { "label": "4", "x": 16.5, "y": 3.5 },
+                { "label": "5", "x": 17.5, "y": 3.5 },
+                { "label": "6", "x": 18.5, "y": 3.5 },
+                { "label": "Shift", "w": 2.25, "x": 0, "y": 4.5 },
+                { "label": "Z", "x": 2.25, "y": 4.5 },
+                { "label": "X", "x": 3.25, "y": 4.5 },
+                { "label": "C", "x": 4.25, "y": 4.5 },
+                { "label": "V", "x": 5.25, "y": 4.5 },
+                { "label": "B", "x": 6.25, "y": 4.5 },
+                { "label": "N", "x": 7.25, "y": 4.5 },
+                { "label": "M", "x": 8.25, "y": 4.5 },
+                { "label": "<", "x": 9.25, "y": 4.5 },
+                { "label": ">", "x": 10.25, "y": 4.5 },
+                { "label": "?", "x": 11.25, "y": 4.5 },
+                { "label": "Shift", "w": 2.75, "x": 12.25, "y": 4.5 },
+                { "label": "\u2191", "x": 15.25, "y": 4.75 },
+                { "label": "1", "x": 16.5, "y": 4.5 },
+                { "label": "2", "x": 17.5, "y": 4.5 },
+                { "label": "3", "x": 18.5, "y": 4.5 },
+                { "h": 2, "label": "Enter", "x": 19.5, "y": 4.5 },
+                { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.5 },
+                { "label": "Win", "w": 1.25, "x": 1.25, "y": 5.5 },
+                { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.5 },
+                { "w": 7, "x": 3.75, "y": 5.5 },
+                { "label": "Alt", "w": 1.5, "x": 10.75, "y": 5.5 },
+                { "label": "Win", "w": 1.5, "x": 12.25, "y": 5.5 },
+                { "label": "\u2190", "x": 14.25, "y": 5.75 },
+                { "label": "\u2193", "x": 15.25, "y": 5.75 },
+                { "label": "\u2192", "x": 16.25, "y": 5.75 },
+                { "label": "0", "x": 17.5, "y": 5.5 },
+                { "label": ".", "x": 18.5, "y": 5.5 }
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/kbdfans/odin/soldered/info.json b/keyboards/kbdfans/odin/soldered/info.json
index 1d33f9f710..1e4da0d275 100644
--- a/keyboards/kbdfans/odin/soldered/info.json
+++ b/keyboards/kbdfans/odin/soldered/info.json
@@ -1,10 +1,118 @@
 {
-    "keyboard_name": "ODIN_SOLDERED", 
-    "url": "", 
-    "maintainer": "moyi4681", 
+    "keyboard_name": "ODIN_SOLDERED",
+    "maintainer": "moyi4681",
+    "url": "",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"x":18.5, "y":0}, {"x":19.5, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"x":13, "y":1.5}, {"label":"Backspace", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Num Lock", "x":16.5, "y":1.5}, {"label":"/", "x":17.5, "y":1.5}, {"label":"*", "x":18.5, "y":1.5}, {"label":"-", "x":19.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"7", "x":16.5, "y":2.5}, {"label":"8", "x":17.5, "y":2.5}, {"label":"9", "x":18.5, "y":2.5}, {"label":"+", "x":19.5, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":16.5, "y":3.5}, {"label":"5", "x":17.5, "y":3.5}, {"label":"6", "x":18.5, "y":3.5}, {"x":19.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"1", "x":16.5, "y":4.5}, {"label":"2", "x":17.5, "y":4.5}, {"label":"3", "x":18.5, "y":4.5}, {"label":"Enter", "x":19.5, "y":4.5}, {"label":"\u2191", "x":15.25, "y":4.75}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5}, {"x":11, "y":5.5}, {"x":12, "y":5.5}, {"x":13, "y":5.5}, {"label":"0", "x":17.5, "y":5.5}, {"label":".", "x":18.5, "y":5.5}, {"x":19.5, "y":5.5}, {"label":"\u2190", "x":14.25, "y":5.75}, {"label":"\u2193", "x":15.25, "y":5.75}, {"label":"\u2192", "x":16.25, "y":5.75}]
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 2, "y": 0 },
+                { "label": "F2", "x": 3, "y": 0 },
+                { "label": "F3", "x": 4, "y": 0 },
+                { "label": "F4", "x": 5, "y": 0 },
+                { "label": "F5", "x": 6.5, "y": 0 },
+                { "label": "F6", "x": 7.5, "y": 0 },
+                { "label": "F7", "x": 8.5, "y": 0 },
+                { "label": "F8", "x": 9.5, "y": 0 },
+                { "label": "F9", "x": 11, "y": 0 },
+                { "label": "F10", "x": 12, "y": 0 },
+                { "label": "F11", "x": 13, "y": 0 },
+                { "label": "F12", "x": 14, "y": 0 },
+                { "label": "PrtSc", "x": 15.25, "y": 0 },
+                { "x": 16.5, "y": 0 },
+                { "x": 17.5, "y": 0 },
+                { "x": 18.5, "y": 0 },
+                { "x": 19.5, "y": 0 },
+                { "label": "~", "x": 0, "y": 1.5 },
+                { "label": "!", "x": 1, "y": 1.5 },
+                { "label": "@", "x": 2, "y": 1.5 },
+                { "label": "#", "x": 3, "y": 1.5 },
+                { "label": "$", "x": 4, "y": 1.5 },
+                { "label": "%", "x": 5, "y": 1.5 },
+                { "label": "^", "x": 6, "y": 1.5 },
+                { "label": "&", "x": 7, "y": 1.5 },
+                { "label": "*", "x": 8, "y": 1.5 },
+                { "label": "(", "x": 9, "y": 1.5 },
+                { "label": ")", "x": 10, "y": 1.5 },
+                { "label": "_", "x": 11, "y": 1.5 },
+                { "label": "+", "x": 12, "y": 1.5 },
+                { "x": 13, "y": 1.5 },
+                { "label": "Backspace", "x": 14, "y": 1.5 },
+                { "label": "Insert", "x": 15.25, "y": 1.5 },
+                { "label": "Num Lock", "x": 16.5, "y": 1.5 },
+                { "label": "/", "x": 17.5, "y": 1.5 },
+                { "label": "*", "x": 18.5, "y": 1.5 },
+                { "label": "-", "x": 19.5, "y": 1.5 },
+                { "label": "Tab", "w": 1.5, "x": 0, "y": 2.5 },
+                { "label": "Q", "x": 1.5, "y": 2.5 },
+                { "label": "W", "x": 2.5, "y": 2.5 },
+                { "label": "E", "x": 3.5, "y": 2.5 },
+                { "label": "R", "x": 4.5, "y": 2.5 },
+                { "label": "T", "x": 5.5, "y": 2.5 },
+                { "label": "Y", "x": 6.5, "y": 2.5 },
+                { "label": "U", "x": 7.5, "y": 2.5 },
+                { "label": "I", "x": 8.5, "y": 2.5 },
+                { "label": "O", "x": 9.5, "y": 2.5 },
+                { "label": "P", "x": 10.5, "y": 2.5 },
+                { "label": "{", "x": 11.5, "y": 2.5 },
+                { "label": "}", "x": 12.5, "y": 2.5 },
+                { "label": "|", "w": 1.5, "x": 13.5, "y": 2.5 },
+                { "label": "Delete", "x": 15.25, "y": 2.5 },
+                { "label": "7", "x": 16.5, "y": 2.5 },
+                { "label": "8", "x": 17.5, "y": 2.5 },
+                { "label": "9", "x": 18.5, "y": 2.5 },
+                { "label": "+", "x": 19.5, "y": 2.5 },
+                { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.5 },
+                { "label": "A", "x": 1.75, "y": 3.5 },
+                { "label": "S", "x": 2.75, "y": 3.5 },
+                { "label": "D", "x": 3.75, "y": 3.5 },
+                { "label": "F", "x": 4.75, "y": 3.5 },
+                { "label": "G", "x": 5.75, "y": 3.5 },
+                { "label": "H", "x": 6.75, "y": 3.5 },
+                { "label": "J", "x": 7.75, "y": 3.5 },
+                { "label": "K", "x": 8.75, "y": 3.5 },
+                { "label": "L", "x": 9.75, "y": 3.5 },
+                { "label": ":", "x": 10.75, "y": 3.5 },
+                { "label": "\"", "x": 11.75, "y": 3.5 },
+                { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.5 },
+                { "label": "4", "x": 16.5, "y": 3.5 },
+                { "label": "5", "x": 17.5, "y": 3.5 },
+                { "label": "6", "x": 18.5, "y": 3.5 },
+                { "x": 19.5, "y": 3.5 },
+                { "label": "Shift", "w": 1.25, "x": 0, "y": 4.5 },
+                { "x": 1.25, "y": 4.5 },
+                { "label": "Z", "x": 2.25, "y": 4.5 },
+                { "label": "X", "x": 3.25, "y": 4.5 },
+                { "label": "C", "x": 4.25, "y": 4.5 },
+                { "label": "V", "x": 5.25, "y": 4.5 },
+                { "label": "B", "x": 6.25, "y": 4.5 },
+                { "label": "N", "x": 7.25, "y": 4.5 },
+                { "label": "M", "x": 8.25, "y": 4.5 },
+                { "label": "<", "x": 9.25, "y": 4.5 },
+                { "label": ">", "x": 10.25, "y": 4.5 },
+                { "label": "?", "x": 11.25, "y": 4.5 },
+                { "label": "Shift", "w": 1.75, "x": 12.25, "y": 4.5 },
+                { "x": 14, "y": 4.5 },
+                { "label": "\u2191", "x": 15.25, "y": 4.75 },
+                { "label": "1", "x": 16.5, "y": 4.5 },
+                { "label": "2", "x": 17.5, "y": 4.5 },
+                { "label": "3", "x": 18.5, "y": 4.5 },
+                { "label": "Enter", "x": 19.5, "y": 4.5 },
+                { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.5 },
+                { "label": "Win", "w": 1.25, "x": 1.25, "y": 5.5 },
+                { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.5 },
+                { "w": 6.25, "x": 3.75, "y": 5.5 },
+                { "x": 10, "y": 5.5 },
+                { "x": 11, "y": 5.5 },
+                { "x": 12, "y": 5.5 },
+                { "x": 13, "y": 5.5 },
+                { "label": "\u2190", "x": 14.25, "y": 5.75 },
+                { "label": "\u2193", "x": 15.25, "y": 5.75 },
+                { "label": "\u2192", "x": 16.25, "y": 5.75 },
+                { "label": "0", "x": 17.5, "y": 5.5 },
+                { "label": ".", "x": 18.5, "y": 5.5 },
+                { "x": 19.5, "y": 5.5 }
+            ]
         }
     }
-}
\ No newline at end of file
+}

From 7b151143f77f102c6b48f3b9249e3298150dcabe Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 6 Jan 2022 08:56:31 +1100
Subject: [PATCH 141/867] eol=lf, where appropriate (#15752)

---
 .gitattributes | 113 +++++++++++++++++++++++++------------------------
 1 file changed, 57 insertions(+), 56 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index a0fd4fed62..30a783f26c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,69 +2,70 @@
 * text=auto
 
 # sources
-*.c text
-*.cc text
-*.cxx text
-*.cpp text
-*.c++ text
-*.hpp text
-*.h text
-*.h++ text
-*.hh text
-*.bat    text
-*.coffee text
-*.css    text
-*.htm    text
-*.html   text
-*.inc    text
-*.ini    text
-*.js     text
-*.jsx    text
-*.json   text
-*.less   text
-*.php    text
-*.pl     text
-*.py     text
-*.rb     text
-*.sass   text
-*.scm    text
-*.scss   text
-*.sh     text
-*.sql    text
-*.styl   text
-*.ts     text
-*.xml    text
-*.xhtml  text
+*.c      text eol=lf
+*.cc     text eol=lf
+*.cxx    text eol=lf
+*.cpp    text eol=lf
+*.c++    text eol=lf
+*.hpp    text eol=lf
+*.h      text eol=lf
+*.h++    text eol=lf
+*.hh     text eol=lf
+*.bat    text eol=crlf
+*.cmd    text eol=crlf
+*.coffee text eol=lf
+*.css    text eol=lf
+*.htm    text eol=lf
+*.html   text eol=lf
+*.inc    text eol=lf
+*.ini    text eol=crlf
+*.js     text eol=lf
+*.jsx    text eol=lf
+*.json   text eol=lf
+*.less   text eol=lf
+*.php    text eol=lf
+*.pl     text eol=lf
+*.py     text eol=lf
+*.rb     text eol=lf
+*.sass   text eol=lf
+*.scm    text eol=lf
+*.scss   text eol=lf
+*.sh     text eol=lf
+*.sql    text eol=lf
+*.styl   text eol=lf
+*.ts     text eol=lf
+*.xml    text eol=lf
+*.xhtml  text eol=lf
 
 # make files (need to always use lf for compatibility with Windows 10 bash)
 Makefile eol=lf
-*.mk eol=lf
+*.mk     eol=lf
 
 # make files (need to always use lf for compatibility with Windows 10 bash)
 *.sh eol=lf
 
 # documentation
-*.markdown   text
-*.md         text
-*.mdwn       text
-*.mdown      text
-*.mkd        text
-*.mkdn       text
-*.mdtxt      text
-*.mdtext     text
-*.txt        text
-AUTHORS      text
-CHANGELOG    text
-CHANGES      text
-CONTRIBUTING text
-COPYING      text
-INSTALL      text
-license      text
-LICENSE      text
-NEWS         text
-readme       text
-*README*     text
-TODO         text
+*.markdown   text eol=lf
+*.md         text eol=lf
+*.mdwn       text eol=lf
+*.mdown      text eol=lf
+*.mkd        text eol=lf
+*.mkdn       text eol=lf
+*.mdtxt      text eol=lf
+*.mdtext     text eol=lf
+*.txt        text eol=lf
+AUTHORS      text eol=lf
+CHANGELOG    text eol=lf
+CHANGES      text eol=lf
+CONTRIBUTING text eol=lf
+COPYING      text eol=lf
+INSTALL      text eol=lf
+license      text eol=lf
+LICENSE      text eol=lf
+NEWS         text eol=lf
+readme       text eol=lf
+*README*     text eol=lf
+TODO         text eol=lf
 
 GRAPHICS
 *.ai   binary
@@ -82,7 +83,7 @@ GRAPHICS
 *.png  binary
 *.psb  binary
 *.psd  binary
-*.svg  text
+*.svg  text eol=lf
 *.svgz binary
 *.tif  binary
 *.tiff binary

From 896ab38fd2ac1e1f755c854432a56b2ce8613a5c Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 6 Jan 2022 07:39:18 +0800
Subject: [PATCH 142/867] [Keyboard] Remove locking support for Boardsource LP
 boards (#15747)

---
 keyboards/boardsource/beiwagon/config.h  | 4 ++--
 keyboards/boardsource/technik_o/config.h | 4 ++--
 keyboards/boardsource/technik_s/config.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/keyboards/boardsource/beiwagon/config.h b/keyboards/boardsource/beiwagon/config.h
index eb30e5535c..797da34613 100644
--- a/keyboards/boardsource/beiwagon/config.h
+++ b/keyboards/boardsource/beiwagon/config.h
@@ -114,9 +114,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MATRIX_HAS_GHOST
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
+//#define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
+//#define LOCKING_RESYNC_ENABLE
 
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
diff --git a/keyboards/boardsource/technik_o/config.h b/keyboards/boardsource/technik_o/config.h
index 3b9bf20217..51c9529da4 100644
--- a/keyboards/boardsource/technik_o/config.h
+++ b/keyboards/boardsource/technik_o/config.h
@@ -114,9 +114,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MATRIX_HAS_GHOST
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
+//#define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
+//#define LOCKING_RESYNC_ENABLE
 
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
diff --git a/keyboards/boardsource/technik_s/config.h b/keyboards/boardsource/technik_s/config.h
index 4f665330a3..7b5f297c9e 100644
--- a/keyboards/boardsource/technik_s/config.h
+++ b/keyboards/boardsource/technik_s/config.h
@@ -114,9 +114,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MATRIX_HAS_GHOST
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
+//#define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
+//#define LOCKING_RESYNC_ENABLE
 
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).

From 1fd448f7fcdfbcf026ca0c666e020c8df1af38fa Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 5 Jan 2022 23:44:21 -0800
Subject: [PATCH 143/867] cannonkeys/adelie: Fix QMK Configurator
 Implementation (#15754)

* info.json: apply friendly formatting

* info.json: correct key sequence
---
 keyboards/cannonkeys/adelie/info.json | 60 ++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/keyboards/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/info.json
index a32bb419d3..5367fdbff4 100644
--- a/keyboards/cannonkeys/adelie/info.json
+++ b/keyboards/cannonkeys/adelie/info.json
@@ -4,7 +4,65 @@
     "maintainer": "Abec13",
     "layouts": {
         "LAYOUT_all": {
-            "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":"{", "x":11, "y":0}, {"label":"}", "x":12, "y":0}, {"label":"Back<br>Space", "x":13, "y":0}, {"label":"Page up", "x":14.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1}, {"label":"Enter", "x":12.25, "y":1, "w":1.75}, {"label":"Page Dn", "x":14.5, "y":1}, {"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":"?", "x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2, "w":1.25}, {"label":"TG(3)", "x":14.5, "y":2}, {"label":"Up", "x":13.25, "y":2.25}, {"label":"Control", "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":"MO(1)", "x":3.5, "y":3, "w":2.75}, {"label":"Space", "x":6.25, "y":3, "w":2.25}, {"label":"Alt", "x":8.5, "y":3, "w":1.25}, {"label":"Win", "x":9.75, "y":3}, {"label":"MO(2)", "x":10.75, "y":3, "w":1.25}, {"label":"Left", "x":12.25, "y":3.25}, {"label":"Down", "x":13.25, "y":3.25}, {"label":"Right", "x":14.25, "y":3.25}]
+            "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":"[{", "x":11, "y":0},
+                {"label":"]}", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0},
+                {"label":"Page Up", "x":14.5, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25},
+                {"label":"A", "x":1.25, "y":1},
+                {"label":"S", "x":2.25, "y":1},
+                {"label":"D", "x":3.25, "y":1},
+                {"label":"F", "x":4.25, "y":1},
+                {"label":"G", "x":5.25, "y":1},
+                {"label":"H", "x":6.25, "y":1},
+                {"label":"J", "x":7.25, "y":1},
+                {"label":"K", "x":8.25, "y":1},
+                {"label":"L", "x":9.25, "y":1},
+                {"label":";:", "x":10.25, "y":1},
+                {"label":"'\"", "x":11.25, "y":1},
+                {"label":"Enter", "x":12.25, "y":1, "w":1.75},
+                {"label":"Page Down", "x":14.5, "y":1},
+
+                {"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":"/?", "x":10.75, "y":2},
+                {"label":"Shift", "x":11.75, "y":2, "w":1.25},
+                {"label":"Up", "x":13.25, "y":2.25},
+                {"label":"TG(3)", "x":14.5, "y":2},
+
+                {"label":"Control", "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":"MO(1)", "x":3.5, "y":3, "w":2.75},
+                {"label":"Space", "x":6.25, "y":3, "w":2.25},
+                {"label":"Alt", "x":8.5, "y":3, "w":1.25},
+                {"label":"Win", "x":9.75, "y":3},
+                {"label":"MO(2)", "x":10.75, "y":3, "w":1.25},
+                {"label":"Left", "x":12.25, "y":3.25},
+                {"label":"Down", "x":13.25, "y":3.25},
+                {"label":"Right", "x":14.25, "y":3.25}
+            ]
         }
     }
 }

From f5d11e758630968fa7e7c876d5aaeb0835844ca3 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 5 Jan 2022 23:51:21 -0800
Subject: [PATCH 144/867] handwired/ortho_brass: add QMK Configurator data
 (#15755)

---
 keyboards/handwired/ortho_brass/info.json | 116 ++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 keyboards/handwired/ortho_brass/info.json

diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/info.json
new file mode 100644
index 0000000000..9178f8d89b
--- /dev/null
+++ b/keyboards/handwired/ortho_brass/info.json
@@ -0,0 +1,116 @@
+{
+    "keyboard_name": "Ortho Brass",
+    "url": "",
+    "maintainer": "BifbofII",
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k01", "x":1, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k06", "x":6, "y":0},
+                {"label":"k07", "x":7, "y":0},
+                {"label":"k08", "x":8, "y":0},
+                {"label":"k09", "x":9, "y":0},
+                {"label":"k0a", "x":10, "y":0},
+                {"label":"k0b", "x":11, "y":0},
+
+                {"label":"k10", "x":0, "y":1},
+                {"label":"k11", "x":1, "y":1},
+                {"label":"k12", "x":2, "y":1},
+                {"label":"k13", "x":3, "y":1},
+                {"label":"k14", "x":4, "y":1},
+                {"label":"k15", "x":5, "y":1},
+                {"label":"k16", "x":6, "y":1},
+                {"label":"k17", "x":7, "y":1},
+                {"label":"k18", "x":8, "y":1},
+                {"label":"k19", "x":9, "y":1},
+                {"label":"k1a", "x":10, "y":1},
+                {"label":"k1b", "x":11, "y":1},
+
+                {"label":"k20", "x":0, "y":2},
+                {"label":"k21", "x":1, "y":2},
+                {"label":"k22", "x":2, "y":2},
+                {"label":"k23", "x":3, "y":2},
+                {"label":"k24", "x":4, "y":2},
+                {"label":"k25", "x":5, "y":2},
+                {"label":"k26", "x":6, "y":2},
+                {"label":"k27", "x":7, "y":2},
+                {"label":"k28", "x":8, "y":2},
+                {"label":"k29", "x":9, "y":2},
+                {"label":"k2a", "x":10, "y":2},
+                {"label":"k2b", "x":11, "y":2},
+
+                {"label":"k30", "x":0, "y":3},
+                {"label":"k31", "x":1, "y":3},
+                {"label":"k32", "x":2, "y":3},
+                {"label":"k33", "x":3, "y":3},
+                {"label":"k34", "x":4, "y":3},
+                {"label":"k35", "x":5, "y":3},
+                {"label":"k36", "x":6, "y":3},
+                {"label":"k37", "x":7, "y":3},
+                {"label":"k38", "x":8, "y":3},
+                {"label":"k39", "x":9, "y":3},
+                {"label":"k3a", "x":10, "y":3},
+                {"label":"k3b", "x":11, "y":3}
+            ]
+        },
+        "LAYOUT_ortho_4x12_1x2uC": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k01", "x":1, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k06", "x":6, "y":0},
+                {"label":"k07", "x":7, "y":0},
+                {"label":"k08", "x":8, "y":0},
+                {"label":"k09", "x":9, "y":0},
+                {"label":"k0a", "x":10, "y":0},
+                {"label":"k0b", "x":11, "y":0},
+
+                {"label":"k10", "x":0, "y":1},
+                {"label":"k11", "x":1, "y":1},
+                {"label":"k12", "x":2, "y":1},
+                {"label":"k13", "x":3, "y":1},
+                {"label":"k14", "x":4, "y":1},
+                {"label":"k15", "x":5, "y":1},
+                {"label":"k16", "x":6, "y":1},
+                {"label":"k17", "x":7, "y":1},
+                {"label":"k18", "x":8, "y":1},
+                {"label":"k19", "x":9, "y":1},
+                {"label":"k1a", "x":10, "y":1},
+                {"label":"k1b", "x":11, "y":1},
+
+                {"label":"k20", "x":0, "y":2},
+                {"label":"k21", "x":1, "y":2},
+                {"label":"k22", "x":2, "y":2},
+                {"label":"k23", "x":3, "y":2},
+                {"label":"k24", "x":4, "y":2},
+                {"label":"k25", "x":5, "y":2},
+                {"label":"k26", "x":6, "y":2},
+                {"label":"k27", "x":7, "y":2},
+                {"label":"k28", "x":8, "y":2},
+                {"label":"k29", "x":9, "y":2},
+                {"label":"k2a", "x":10, "y":2},
+                {"label":"k2b", "x":11, "y":2},
+
+                {"label":"k30", "x":0, "y":3},
+                {"label":"k31", "x":1, "y":3},
+                {"label":"k32", "x":2, "y":3},
+                {"label":"k33", "x":3, "y":3},
+                {"label":"k34", "x":4, "y":3},
+                {"label":"k35", "x":5, "y":3, "w":2},
+                {"label":"k37", "x":7, "y":3},
+                {"label":"k38", "x":8, "y":3},
+                {"label":"k39", "x":9, "y":3},
+                {"label":"k3a", "x":10, "y":3},
+                {"label":"k3b", "x":11, "y":3}
+            ]
+        }
+    }
+}

From 8dbc8a802cc07271ba90af05bf57daefe5729b5b Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 6 Jan 2022 07:52:32 +0000
Subject: [PATCH 145/867] Unify the key up/down behaviour of RGB keycodes
 (#15730)

---
 quantum/process_keycode/process_rgb.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/quantum/process_keycode/process_rgb.c b/quantum/process_keycode/process_rgb.c
index 69853cd5c4..c805bd615d 100644
--- a/quantum/process_keycode/process_rgb.c
+++ b/quantum/process_keycode/process_rgb.c
@@ -51,12 +51,8 @@ static void __attribute__((noinline, unused)) handleKeycodeRGBMode(const uint8_t
  * Handle keycodes for both rgblight and rgbmatrix
  */
 bool process_rgb(const uint16_t keycode, const keyrecord_t *record) {
-#ifndef SPLIT_KEYBOARD
-    if (record->event.pressed) {
-#else
-    // Split keyboards need to trigger on key-up for edge-case issue
+    // need to trigger on key-up for edge-case issue
     if (!record->event.pressed) {
-#endif
 #if (defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)) || (defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES))
         uint8_t shifted = get_mods() & MOD_MASK_SHIFT;
 #endif

From 2669b0bee89a212a7e3aadf83f484bfb285a9897 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Thu, 6 Jan 2022 00:30:22 -0800
Subject: [PATCH 146/867] [Docs] Add drag scrolling example to Pointing device
 docs page (#15715)

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
---
 docs/feature_pointing_device.md | 36 +++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index bd7fb36589..098a787ed8 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -220,9 +220,11 @@ Additionally, by default, `pointing_device_send()` will only send a report when
 
 Also, you use the `has_mouse_report_changed(new, old)` function to check to see if the report has changed.
 
-## Example
+## Examples
 
-In the following example, a custom key is used to click the mouse and scroll 127 units vertically and horizontally, then undo all of that when released - because that's a totally useful function.  Listen, this is an example:
+### Custom Mouse Keycode
+
+In this example, a custom key is used to click the mouse and scroll 127 units vertically and horizontally, then undo all of that when released - because that's a totally useful function.
 
 ```c
 case MS_SPECIAL:
@@ -242,3 +244,33 @@ case MS_SPECIAL:
 ```
 
 Recall that the mouse report is set to zero (except the buttons) whenever it is sent, so the scrolling would only occur once in each case.
+
+### Drag Scroll or Mouse Scroll
+
+A very common implementation is to use the mouse movement to scroll instead of moving the cursor on the system.  This uses the `pointing_device_task_user` callback to intercept and modify the mouse report before it's sent to the host system. 
+
+```c
+enum custom_keycodes {
+    DRAG_SCROLL = SAFE_RANGE,
+};
+
+bool set_scrolling = false;
+
+report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
+    if (set_scrolling) {
+        mouse_report.h = mouse_report.x;
+        mouse_report.v = mouse_report.y;
+        mouse_report.x = mouse_report.y = 0
+    }
+    return mouse_report;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (keycode == DRAG_SCROLL && record->event.pressed) {
+        set_scrolling = !set_scrolling;
+    }
+    return true;
+}
+```
+
+This allows you to toggle between scrolling and cursor movement by pressing the DRAG_SCROLL key.  

From 910a7b92d0c10010153d4e853b634ff49ebcc146 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 6 Jan 2022 01:39:10 -0800
Subject: [PATCH 147/867] Pearlboards Touch-Up (#15756)

* add QMK Configurator data for Atlas

* add QMK Configurator data for Pearl

* add QMK Configurator data for Zeus

* add QMK Configurator data for Zeuspad

* physically arrange Zeus layout macro

Moves the keycode for the rotary encoder to the top row.
---
 keyboards/pearlboards/atlas/info.json         |  84 ++++++++++++++
 keyboards/pearlboards/pearl/info.json         |  58 ++++++++++
 keyboards/pearlboards/zeus/info.json          | 106 ++++++++++++++++++
 .../pearlboards/zeus/keymaps/default/keymap.c |  32 +++---
 .../pearlboards/zeus/keymaps/via/keymap.c     |  64 ++++++-----
 keyboards/pearlboards/zeus/zeus.h             |   3 +-
 keyboards/pearlboards/zeuspad/info.json       |  40 +++++++
 7 files changed, 344 insertions(+), 43 deletions(-)
 create mode 100644 keyboards/pearlboards/atlas/info.json
 create mode 100644 keyboards/pearlboards/pearl/info.json
 create mode 100644 keyboards/pearlboards/zeus/info.json
 create mode 100644 keyboards/pearlboards/zeuspad/info.json

diff --git a/keyboards/pearlboards/atlas/info.json b/keyboards/pearlboards/atlas/info.json
new file mode 100644
index 0000000000..c3a924d0e4
--- /dev/null
+++ b/keyboards/pearlboards/atlas/info.json
@@ -0,0 +1,84 @@
+{
+    "keyboard_name": "Atlas",
+    "maintainer": "Koobaczech",
+    "url": "",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k01", "x":1, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k06", "x":6, "y":0},
+                {"label":"k07", "x":7, "y":0},
+                {"label":"k08", "x":8, "y":0},
+                {"label":"k09", "x":9, "y":0},
+                {"label":"k0a", "x":10, "y":0},
+                {"label":"k0b", "x":11, "y":0},
+                {"label":"k0c", "x":12, "y":0},
+                {"label":"k0d", "x":13, "y":0},
+                {"label":"k0e", "x":14, "y":0},
+                {"label":"k0f", "x":15, "y":0},
+
+                {"label":"k10", "x":0, "y":1, "w":1.5},
+                {"label":"k11", "x":1.5, "y":1},
+                {"label":"k12", "x":2.5, "y":1},
+                {"label":"k13", "x":3.5, "y":1},
+                {"label":"k14", "x":4.5, "y":1},
+                {"label":"k15", "x":5.5, "y":1},
+                {"label":"k16", "x":6.5, "y":1},
+                {"label":"k17", "x":7.5, "y":1},
+                {"label":"k18", "x":8.5, "y":1},
+                {"label":"k19", "x":9.5, "y":1},
+                {"label":"k1a", "x":10.5, "y":1},
+                {"label":"k1b", "x":11.5, "y":1},
+                {"label":"k1c", "x":12.5, "y":1},
+                {"label":"k1d", "x":13.5, "y":1, "w":1.5},
+                {"label":"k1f", "x":15, "y":1},
+
+                {"label":"k20", "x":0, "y":2, "w":1.75},
+                {"label":"k21", "x":1.75, "y":2},
+                {"label":"k22", "x":2.75, "y":2},
+                {"label":"k23", "x":3.75, "y":2},
+                {"label":"k24", "x":4.75, "y":2},
+                {"label":"k25", "x":5.75, "y":2},
+                {"label":"k26", "x":6.75, "y":2},
+                {"label":"k27", "x":7.75, "y":2},
+                {"label":"k28", "x":8.75, "y":2},
+                {"label":"k29", "x":9.75, "y":2},
+                {"label":"k2a", "x":10.75, "y":2},
+                {"label":"k2b", "x":11.75, "y":2},
+                {"label":"k2c", "x":12.75, "y":2},
+                {"label":"k2d", "x":13.75, "y":2, "w":1.25},
+                {"label":"k2f", "x":15, "y":2},
+
+                {"label":"k30", "x":0, "y":3, "w":1.25},
+                {"label":"k31", "x":1.25, "y":3},
+                {"label":"k32", "x":2.25, "y":3},
+                {"label":"k33", "x":3.25, "y":3},
+                {"label":"k34", "x":4.25, "y":3},
+                {"label":"k35", "x":5.25, "y":3},
+                {"label":"k36", "x":6.25, "y":3},
+                {"label":"k37", "x":7.25, "y":3},
+                {"label":"k38", "x":8.25, "y":3},
+                {"label":"k39", "x":9.25, "y":3},
+                {"label":"k3a", "x":10.25, "y":3},
+                {"label":"k3b", "x":11.25, "y":3},
+                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
+                {"label":"k3d", "x":14, "y":3},
+                {"label":"k3f", "x":15, "y":3},
+
+                {"label":"k40", "x":0, "y":4, "w":1.5},
+                {"label":"k41", "x":1.5, "y":4},
+                {"label":"k42", "x":2.5, "y":4, "w":1.5},
+                {"label":"k47", "x":4, "y":4, "w":7},
+                {"label":"k4b", "x":11, "y":4, "w":1.5},
+                {"label":"k4c", "x":13, "y":4},
+                {"label":"k4d", "x":14, "y":4},
+                {"label":"k4f", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pearlboards/pearl/info.json b/keyboards/pearlboards/pearl/info.json
new file mode 100644
index 0000000000..4a6619f394
--- /dev/null
+++ b/keyboards/pearlboards/pearl/info.json
@@ -0,0 +1,58 @@
+{
+    "keyboard_name": "Pearl",
+    "maintainer": "Koobaczech",
+    "url": "",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k01", "x":1, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k06", "x":6, "y":0},
+                {"label":"k07", "x":7, "y":0},
+                {"label":"k08", "x":8, "y":0},
+                {"label":"k09", "x":9, "y":0},
+                {"label":"k0A", "x":10, "y":0},
+                {"label":"k0B", "x":11, "y":0},
+                {"label":"k0C", "x":12, "y":0},
+
+                {"label":"k10", "x":0, "y":1, "w":1.5},
+                {"label":"k11", "x":1.5, "y":1},
+                {"label":"k12", "x":2.5, "y":1},
+                {"label":"k13", "x":3.5, "y":1},
+                {"label":"k14", "x":4.5, "y":1},
+                {"label":"k15", "x":5.5, "y":1},
+                {"label":"k16", "x":6.5, "y":1},
+                {"label":"k17", "x":7.5, "y":1},
+                {"label":"k18", "x":8.5, "y":1},
+                {"label":"k19", "x":9.5, "y":1},
+                {"label":"k1A", "x":10.5, "y":1},
+                {"label":"k1B", "x":11.5, "y":1, "w":1.5},
+
+                {"label":"k20", "x":0, "y":2, "w":1.75},
+                {"label":"k21", "x":1.75, "y":2},
+                {"label":"k22", "x":2.75, "y":2},
+                {"label":"k23", "x":3.75, "y":2},
+                {"label":"k24", "x":4.75, "y":2},
+                {"label":"k25", "x":5.75, "y":2},
+                {"label":"k26", "x":6.75, "y":2},
+                {"label":"k27", "x":7.75, "y":2},
+                {"label":"k28", "x":8.75, "y":2},
+                {"label":"k29", "x":9.75, "y":2},
+                {"label":"k2A", "x":10.75, "y":2},
+                {"label":"k2B", "x":11.75, "y":2, "w":1.25},
+
+                {"label":"k30", "x":1.125, "y":3},
+                {"label":"k31", "x":2.125, "y":3, "w":1.25},
+                {"label":"k32", "x":3.38, "y":3, "w":1.25},
+                {"label":"k33", "x":4.625, "y":3, "w":2.25},
+                {"label":"k34", "x":6.875, "y":3, "w":2.75},
+                {"label":"k35", "x":9.625, "y":3, "w":1.25},
+                {"label":"k36", "x":10.875, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pearlboards/zeus/info.json b/keyboards/pearlboards/zeus/info.json
new file mode 100644
index 0000000000..1938a7ef6d
--- /dev/null
+++ b/keyboards/pearlboards/zeus/info.json
@@ -0,0 +1,106 @@
+{
+    "keyboard_name": "Zeus",
+    "maintainer": "Koobaczech",
+    "url": "",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"k4F", "x":3, "y":0},
+
+                {"label":"k00", "x":0, "y":1.5},
+                {"label":"k01", "x":2, "y":1.5},
+                {"label":"k02", "x":3, "y":1.5},
+                {"label":"k03", "x":4, "y":1.5},
+                {"label":"k04", "x":5, "y":1.5},
+                {"label":"k05", "x":6.5, "y":1.5},
+                {"label":"k06", "x":7.5, "y":1.5},
+                {"label":"k07", "x":8.5, "y":1.5},
+                {"label":"k08", "x":9.5, "y":1.5},
+                {"label":"k09", "x":11, "y":1.5},
+                {"label":"k0B", "x":12, "y":1.5},
+                {"label":"k0B", "x":13, "y":1.5},
+                {"label":"k0C", "x":14, "y":1.5},
+
+                {"label":"k10", "x":0, "y":2.75},
+                {"label":"k11", "x":1, "y":2.75},
+                {"label":"k12", "x":2, "y":2.75},
+                {"label":"k13", "x":3, "y":2.75},
+                {"label":"k14", "x":4, "y":2.75},
+                {"label":"k15", "x":5, "y":2.75},
+                {"label":"k16", "x":6, "y":2.75},
+                {"label":"k17", "x":7, "y":2.75},
+                {"label":"k18", "x":8, "y":2.75},
+                {"label":"k19", "x":9, "y":2.75},
+                {"label":"k1B", "x":10, "y":2.75},
+                {"label":"k1B", "x":11, "y":2.75},
+                {"label":"k1C", "x":12, "y":2.75},
+                {"label":"k1D", "x":13, "y":2.75},
+                {"label":"k1E", "x":14, "y":2.75},
+                {"label":"k1F", "x":15.25, "y":2.75},
+                {"label":"k1G", "x":16.25, "y":2.75},
+                {"label":"k1H", "x":17.25, "y":2.75},
+
+                {"label":"k20", "x":0, "y":3.75, "w":1.5},
+                {"label":"k21", "x":1.5, "y":3.75},
+                {"label":"k22", "x":2.5, "y":3.75},
+                {"label":"k23", "x":3.5, "y":3.75},
+                {"label":"k24", "x":4.5, "y":3.75},
+                {"label":"k25", "x":5.5, "y":3.75},
+                {"label":"k26", "x":6.5, "y":3.75},
+                {"label":"k27", "x":7.5, "y":3.75},
+                {"label":"k28", "x":8.5, "y":3.75},
+                {"label":"k29", "x":9.5, "y":3.75},
+                {"label":"k2A", "x":10.5, "y":3.75},
+                {"label":"k2B", "x":11.5, "y":3.75},
+                {"label":"k2C", "x":12.5, "y":3.75},
+                {"label":"k2D", "x":13.5, "y":3.75, "w":1.5},
+                {"label":"k2F", "x":15.25, "y":3.75},
+                {"label":"k2G", "x":16.25, "y":3.75},
+                {"label":"k2H", "x":17.25, "y":3.75},
+
+                {"label":"k30", "x":0, "y":4.75, "w":1.75},
+                {"label":"k31", "x":1.75, "y":4.75},
+                {"label":"k32", "x":2.75, "y":4.75},
+                {"label":"k33", "x":3.75, "y":4.75},
+                {"label":"k34", "x":4.75, "y":4.75},
+                {"label":"k35", "x":5.75, "y":4.75},
+                {"label":"k36", "x":6.75, "y":4.75},
+                {"label":"k37", "x":7.75, "y":4.75},
+                {"label":"k38", "x":8.75, "y":4.75},
+                {"label":"k39", "x":9.75, "y":4.75},
+                {"label":"k3A", "x":10.75, "y":4.75},
+                {"label":"k3B", "x":11.75, "y":4.75},
+                {"label":"k3C", "x":12.75, "y":4.75},
+                {"label":"k3D", "x":13.75, "y":4.75, "w":1.25},
+
+                {"label":"k40", "x":0, "y":5.75, "w":1.25},
+                {"label":"k41", "x":1.25, "y":5.75},
+                {"label":"k42", "x":2.25, "y":5.75},
+                {"label":"k43", "x":3.25, "y":5.75},
+                {"label":"k44", "x":4.25, "y":5.75},
+                {"label":"k45", "x":5.25, "y":5.75},
+                {"label":"k46", "x":6.25, "y":5.75},
+                {"label":"k47", "x":7.25, "y":5.75},
+                {"label":"k48", "x":8.25, "y":5.75},
+                {"label":"k49", "x":9.25, "y":5.75},
+                {"label":"k4A", "x":10.25, "y":5.75},
+                {"label":"k4B", "x":11.25, "y":5.75},
+                {"label":"k4C", "x":12.25, "y":5.75, "w":1.75},
+                {"label":"k4D", "x":14, "y":5.75},
+                {"label":"k4G", "x":16.25, "y":5.75},
+
+                {"label":"k50", "x":0, "y":6.75, "w":1.25},
+                {"label":"k51", "x":1.25, "y":6.75, "w":1.25},
+                {"label":"k52", "x":2.5, "y":6.75, "w":1.25},
+                {"label":"k56", "x":3.75, "y":6.75, "w":6.25},
+                {"label":"k59", "x":10, "y":6.75, "w":1.25},
+                {"label":"k5A", "x":11.25, "y":6.75, "w":1.25},
+                {"label":"k5B", "x":12.5, "y":6.75, "w":1.25},
+                {"label":"k5C", "x":13.75, "y":6.75, "w":1.25},
+                {"label":"k5F", "x":15.25, "y":6.75},
+                {"label":"k5G", "x":16.25, "y":6.75},
+                {"label":"k5H", "x":17.25, "y":6.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/pearlboards/zeus/keymaps/default/keymap.c b/keyboards/pearlboards/zeus/keymaps/default/keymap.c
index 2b9d56e9ca..7c79a64395 100644
--- a/keyboards/pearlboards/zeus/keymaps/default/keymap.c
+++ b/keyboards/pearlboards/zeus/keymaps/default/keymap.c
@@ -18,19 +18,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	LAYOUT_all(
-		KC_GESC,  KC_F1,    KC_F2,    KC_F3,  KC_F4,  KC_F5,  KC_F6,   KC_F7,  KC_F8,  KC_F9,     KC_F10,   KC_F11,   KC_F12,
-    KC_GRV,   KC_1,     KC_2,     KC_3,   KC_4,   KC_5,   KC_6,    KC_7,   KC_8,   KC_9,      KC_0,     KC_MINS,  KC_EQL,   KC_DEL,   KC_BSPC,  KC_INS,               KC_HOME,  KC_PGUP,
-    KC_TAB,   KC_Q,     KC_W,     KC_E,   KC_R,   KC_T,   KC_Y,    KC_U,   KC_I,   KC_O,      KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_DEL,               KC_END,   KC_PGDN,
-    KC_CAPS,  KC_A,     KC_S,     KC_D,   KC_F,   KC_G,   KC_H,    KC_J,   KC_K,   KC_L,      KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-    KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,   KC_C,   KC_V,   KC_B,    KC_N,   KC_M,   KC_COMM,   KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),              KC_MEDIA_PLAY_PAUSE,  KC_UP,
-    KC_LCTL,  KC_LGUI,  KC_LALT,                          KC_SPC,                  KC_RALT,   KC_RGUI,  MO(1),    KC_RCTL,                      KC_LEFT,              KC_DOWN,  KC_RGHT),
+    [0] = LAYOUT_all(
+                                   KC_MEDIA_PLAY_PAUSE,
+        KC_GESC,          KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                        KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-	LAYOUT_all(
-		RESET,    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,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS,  HPT_TOG,  HPT_FBK,  HPT_MODI, HPT_RST,  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,  CK_ON,    CK_TOGG,  MU_TOG,   MU_MOD,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS)
+    [1] = LAYOUT_all(
+                                   KC_TRNS,
+        RESET,            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, RGB_TOG, RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, HPT_TOG, HPT_FBK, HPT_MODI, HPT_RST, 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, CK_ON,   CK_TOGG, MU_TOG,   MU_MOD,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    )
 };
diff --git a/keyboards/pearlboards/zeus/keymaps/via/keymap.c b/keyboards/pearlboards/zeus/keymaps/via/keymap.c
index 6cb23a6fb3..70a83ab6c5 100644
--- a/keyboards/pearlboards/zeus/keymaps/via/keymap.c
+++ b/keyboards/pearlboards/zeus/keymaps/via/keymap.c
@@ -18,35 +18,43 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT_all(
-		KC_GESC,  KC_F1,    KC_F2,    KC_F3,  KC_F4,  KC_F5,  KC_F6,   KC_F7,  KC_F8,  KC_F9,     KC_F10,   KC_F11,   KC_F12,
-		KC_GRV,   KC_1,     KC_2,     KC_3,   KC_4,   KC_5,   KC_6,    KC_7,   KC_8,   KC_9,      KC_0,     KC_MINS,  KC_EQL,   KC_DEL,   KC_BSPC,  KC_INS,               KC_HOME,  KC_PGUP,
-		KC_TAB,   KC_Q,     KC_W,     KC_E,   KC_R,   KC_T,   KC_Y,    KC_U,   KC_I,   KC_O,      KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_DEL,               KC_END,   KC_PGDN,
-		KC_CAPS,  KC_A,     KC_S,     KC_D,   KC_F,   KC_G,   KC_H,    KC_J,   KC_K,   KC_L,      KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-		KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,   KC_C,   KC_V,   KC_B,    KC_N,   KC_M,   KC_COMM,   KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),              KC_MEDIA_PLAY_PAUSE,  KC_UP,
-		KC_LCTL,  KC_LGUI,  KC_LALT,                          KC_SPC,                  KC_RALT,   KC_RGUI,  MO(1),    KC_RCTL,                      KC_LEFT,              KC_DOWN,  KC_RGHT),
+    [0] = LAYOUT_all(
+                                   KC_MEDIA_PLAY_PAUSE,
+        KC_GESC,          KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                        KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-	[1] = LAYOUT_all(
-		RESET,    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,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS,  HPT_TOG,  HPT_FBK,  HPT_MODI, HPT_RST,  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,  CK_ON,    CK_TOGG,  MU_TOG,   MU_MOD,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-    KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS),
+    [1] = LAYOUT_all(
+                                   KC_TRNS,
+        RESET,            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, RGB_TOG, RGB_MOD, RGB_HUI,  RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, HPT_TOG, HPT_FBK, HPT_MODI, HPT_RST, 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, CK_ON,   CK_TOGG, MU_TOG,   MU_MOD,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                             KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
 
-	[2] = LAYOUT_all(
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS),
+    [2] = LAYOUT_all(
+                                   KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
 
-	[3] = LAYOUT_all(
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-		KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS)
+    [3] = LAYOUT_all(
+                                   KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    )
 };
diff --git a/keyboards/pearlboards/zeus/zeus.h b/keyboards/pearlboards/zeus/zeus.h
index f8b24e401c..7bffbf2a90 100644
--- a/keyboards/pearlboards/zeus/zeus.h
+++ b/keyboards/pearlboards/zeus/zeus.h
@@ -24,11 +24,12 @@
 #include "quantum.h"
 
 #define LAYOUT_all( \
+                   k4f,                                                                       \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,                          \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2f, k2g, k2h, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,      k4f, k4g,      \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4g,      \
     k50, k51, k52,                k56,           k59, k5a, k5b, k5c,           k5f, k5g, k5h  \
 ) { \
     { k00,  k01,  k02,  k03,    k04,    k05,    k06,  k07,    k08,    k09,  k0a,  k0b,  k0c,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO},  \
diff --git a/keyboards/pearlboards/zeuspad/info.json b/keyboards/pearlboards/zeuspad/info.json
new file mode 100644
index 0000000000..840d1a5b24
--- /dev/null
+++ b/keyboards/pearlboards/zeuspad/info.json
@@ -0,0 +1,40 @@
+{
+    "keyboard_name": "Zeuspad",
+    "maintainer": "Koobaczech",
+    "url": "",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k01", "x":1, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+
+                {"label":"k10", "x":0, "y":1.25},
+                {"label":"k11", "x":1, "y":1.25},
+                {"label":"k12", "x":2, "y":1.25},
+                {"label":"k13", "x":3, "y":1.25},
+
+                {"label":"k20", "x":0, "y":2.25},
+                {"label":"k21", "x":1, "y":2.25},
+                {"label":"k22", "x":2, "y":2.25},
+                {"label":"k23", "x":3, "y":2.25},
+
+                {"label":"k30", "x":0, "y":3.25},
+                {"label":"k31", "x":1, "y":3.25},
+                {"label":"k32", "x":2, "y":3.25},
+                {"label":"k33", "x":3, "y":3.25},
+
+                {"label":"k40", "x":0, "y":4.25},
+                {"label":"k41", "x":1, "y":4.25},
+                {"label":"k42", "x":2, "y":4.25},
+                {"label":"k43", "x":3, "y":4.25},
+
+                {"label":"k50", "x":0, "y":5.25},
+                {"label":"k51", "x":1, "y":5.25},
+                {"label":"k52", "x":2, "y":5.25},
+                {"label":"k53", "x":3, "y":5.25}
+            ]
+        }
+    }
+}

From cf8c9befff20cbe245a3a77f45a9fd9fc3480fd4 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 6 Jan 2022 04:00:03 -0800
Subject: [PATCH 148/867] checkerboards/quark_squared: fix broken layout macro
 reference in info.json (#15757)

---
 keyboards/checkerboards/quark_squared/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/checkerboards/quark_squared/info.json b/keyboards/checkerboards/quark_squared/info.json
index aec07bb7ad..4d2ce21298 100644
--- a/keyboards/checkerboards/quark_squared/info.json
+++ b/keyboards/checkerboards/quark_squared/info.json
@@ -3,7 +3,7 @@
     "url": "https://www.checkerboards.xyz/Quark2_p_35.html",
     "maintainer": "nasp",
     "layouts": {
-        "LAYOUT_ortho_4x12_2x225u": {
+        "LAYOUT_4_2x225u": {
             "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":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":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Super", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.25}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"label":"Super", "x":9.5, "y":3, "w":1.25}, {"label":"Ctrl", "x":10.75, "y":3, "w":1.25}]
         },
         "LAYOUT_4_2u": {

From 58d27129369151cddbebad05da1652c6adb1ed97 Mon Sep 17 00:00:00 2001
From: AnthonyNguyen168 <89651736+AnthonyNguyen168@users.noreply.github.com>
Date: Fri, 7 Jan 2022 06:45:12 +0700
Subject: [PATCH 149/867] Update keymap for MechBrewery MB65S (#15673)

---
 keyboards/mechbrewery/mb65s/info.json            |  2 +-
 .../mechbrewery/mb65s/keymaps/default/keymap.c   |  4 ++--
 keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c | 12 ++++++------
 .../mechbrewery/mb65s/keymaps/split_bs/keymap.c  | 16 ++++++++--------
 keyboards/mechbrewery/mb65s/mb65s.h              |  4 +++-
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/keyboards/mechbrewery/mb65s/info.json b/keyboards/mechbrewery/mb65s/info.json
index 45145001cf..b11e07fa26 100644
--- a/keyboards/mechbrewery/mb65s/info.json
+++ b/keyboards/mechbrewery/mb65s/info.json
@@ -78,7 +78,7 @@
                 {"x":15, "y":4}
             ]
         },
-        "LAYOUT_65_ansi_blocker_split_bs": {
+        "LAYOUT_all": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
diff --git a/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
index f501190190..512c04a296 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |---------------------------------------------------------------|
      * |     |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |   |
      * |---------------------------------------------------------------|
-     * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|        |   |
+     * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|  Reset |   |
      * |---------------------------------------------------------------|
      * |        |BL-|BLT|BL+|BLS|BLM|   |   |End|PDn|Dow|      |PUp|   |
      * |---------------------------------------------------------------|
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT_65_ansi_blocker(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
         _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          RESET,   _______,
         _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, KC_PGUP, _______,
         _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END
     ),
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c
index 6ef0dfdb06..f6101815ac 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c
@@ -25,26 +25,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
      * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │PUp│
      * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
-     * │ Fn   │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PDn│
+     * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PDn│
      * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
      * │Shft    │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
      * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │Ctrl│LGUI│LAlt│          Space         │RAlt│App │ │ ← │ ↓ │ → │
+     * │Ctrl│LGUI│LAlt│          Space         │RAlt│Fn  │ │ ← │ ↓ │ → │
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
     [0] = LAYOUT_65_ansi_blocker_isoenter(
         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_DEL,
         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_PGUP,
-        MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGDN,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_APP,           KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     /* Function layer
      * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
      * │ § │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │Prt│
      * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │Caps │Prv│Pau│Nxt│   │   │   │   │   │   │BL+│BL-│BLT│Reset│Ins│
+     * │     │Prv│Pau│Nxt│   │   │   │   │   │   │   │   │   │Reset│Ins│
      * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
      * │      │Vl-│V0 │Vl+│   │   │   │   │   │   │   │   │   │    │Hom│
      * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
@@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      */
     [1] = LAYOUT_65_ansi_blocker_isoenter(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
-        KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, BL_INC,  BL_DEC,  BL_TOGG,          KC_INS,
+        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_INS,
         _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_HOME,
         _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_END,
         _______, _______, _______,                   _______,                            _______, _______,          KC_MS_L, KC_MS_D, KC_MS_R
diff --git a/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c
index b8a915f2b7..0cbb5040ea 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c
@@ -24,19 +24,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |---------------------------------------------------------------|
      * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P| [ | ] |  \  |PUp|
      * |---------------------------------------------------------------|
-     * |Ctrl   |  A|  S|  D|  F|  G|  H|  J|  K|  L| ; | ' |Return |PDn|
+     * |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L| ; | ' |Return |PDn|
      * |---------------------------------------------------------------|
      * |Shift   |  Z|  X|  C|  V|  B|  N|  M| , | . | / |Shift | Up|Hom|
      * |---------------------------------------------------------------|
-     * |Ctrl|Alt |GUI |          Space         |GUI |Fn  | |Lef|Dow|Rig|
+     * |Ctrl|LGUI|Alt |          Space         |GUI |Fn  | |Lef|Dow|Rig|
      * `---------------------------------------------------------------'
      */
-    [0] = LAYOUT_65_ansi_blocker_split_bs(
+    [0] = LAYOUT_all(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
         KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-        KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
+        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGDN,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI  MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RGUI  MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     /* Keymap Fn Layer
@@ -45,17 +45,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |---------------------------------------------------------------|
      * |     |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |   |
      * |---------------------------------------------------------------|
-     * |       |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|       |Vl+|
+     * |       |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig| Reset |Vl+|
      * |---------------------------------------------------------------|
      * |        |BL-|BLT|BL+|BLS|BLM|   |   |End|PDn|Dow|      |   |Vl-|
      * |---------------------------------------------------------------|
      * |    |    |    |                        |    |    | |Prv|Ply|Nxt|
      * `---------------------------------------------------------------'
      */
-    [1] = LAYOUT_65_ansi_blocker_split_bs(
+    [1] = LAYOUT_all(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  KC_INS,
         _______,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
-        _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______, KC_VOLU,
+        _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          RESET,   KC_VOLU,
         _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, KC_END,  KC_PGDN, KC_DOWN,          _______, _______, KC_VOLD,
         _______, _______, _______,                            _______,                            _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
     ),
diff --git a/keyboards/mechbrewery/mb65s/mb65s.h b/keyboards/mechbrewery/mb65s/mb65s.h
index f1faf36984..ff03e7a0e6 100644
--- a/keyboards/mechbrewery/mb65s/mb65s.h
+++ b/keyboards/mechbrewery/mb65s/mb65s.h
@@ -42,7 +42,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT_65_ansi_blocker_split_bs( \
+#define LAYOUT_all( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
@@ -86,3 +86,5 @@
     { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
     { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
 }
+
+#define LAYOUT_65_ansi_blocker_split_bs LAYOUT_all

From a6ed0e10f3b3b8625c54c0b5061b7d3fe4a7dbd2 Mon Sep 17 00:00:00 2001
From: hadi <h.m.iskandarani@gmail.com>
Date: Thu, 6 Jan 2022 15:45:48 -0800
Subject: [PATCH 150/867] [Keyboard] Adding GOS65 files (#14734)

* Adding gos65 files

* Updating info and config to align with other review

* Changing LAYOUT_all to LAYOUT

* Updating LAYOUT to have 69 elements
---
 keyboards/senselessclay/gos65/config.h        | 123 ++++++++++++++++++
 keyboards/senselessclay/gos65/gos65.c         |  26 ++++
 keyboards/senselessclay/gos65/gos65.h         |  35 +++++
 keyboards/senselessclay/gos65/info.json       |  10 ++
 .../gos65/keymaps/default/keymap.c            |  45 +++++++
 .../senselessclay/gos65/keymaps/via/keymap.c  |  51 ++++++++
 .../senselessclay/gos65/keymaps/via/rules.mk  |   1 +
 keyboards/senselessclay/gos65/readme.md       |  18 +++
 keyboards/senselessclay/gos65/rules.mk        |  21 +++
 9 files changed, 330 insertions(+)
 create mode 100644 keyboards/senselessclay/gos65/config.h
 create mode 100644 keyboards/senselessclay/gos65/gos65.c
 create mode 100644 keyboards/senselessclay/gos65/gos65.h
 create mode 100644 keyboards/senselessclay/gos65/info.json
 create mode 100644 keyboards/senselessclay/gos65/keymaps/default/keymap.c
 create mode 100644 keyboards/senselessclay/gos65/keymaps/via/keymap.c
 create mode 100644 keyboards/senselessclay/gos65/keymaps/via/rules.mk
 create mode 100644 keyboards/senselessclay/gos65/readme.md
 create mode 100644 keyboards/senselessclay/gos65/rules.mk

diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h
new file mode 100644
index 0000000000..e910f5a15d
--- /dev/null
+++ b/keyboards/senselessclay/gos65/config.h
@@ -0,0 +1,123 @@
+/*
+Copyright 2020 Hadi Iskandarani
+
+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    0x4849 // HI
+#define PRODUCT_ID   0x0650 // 65rgb (0)
+#define DEVICE_VER   0x0001 // rev1
+#define MANUFACTURER senselessclay
+#define PRODUCT      gos65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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)
+ *
+ */
+/* rev0 */ 
+/*
+#define MATRIX_ROW_PINS { B1, B2, F6, F5, F4 }
+#define MATRIX_COL_PINS { F1, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
+*/
+/* rev1 */ 
+#define MATRIX_ROW_PINS { B1, B2, F1, F6, F5 }
+#define MATRIX_COL_PINS { F4, D5, D3, D2, D1, D0, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
+
+//#define UNUSED_PINS { B0, B7, E6 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
+
+/* RGB Backlighting */ 
+#define RGB_DI_PIN B0
+#define RGBLED_NUM 68
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_LIMIT_VAL 125
+#define RGBLIGHT_SLEEP
\ No newline at end of file
diff --git a/keyboards/senselessclay/gos65/gos65.c b/keyboards/senselessclay/gos65/gos65.c
new file mode 100644
index 0000000000..fd77aa79ab
--- /dev/null
+++ b/keyboards/senselessclay/gos65/gos65.c
@@ -0,0 +1,26 @@
+/* Copyright 2020 Hadi Iskandarani
+ *
+ * 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 "gos65.h"
+
+void eeconfig_init_kb(void) {  // EEPROM is getting reset!
+  rgblight_enable(); // Enable RGB by default
+  rgblight_sethsv(0, 255, 125);  // Set default HSV - red hue, full saturation, medium brightness
+  rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 5); // set to RGB_RAINBOW_SWIRL by default
+  
+  eeconfig_update_kb(0);
+  eeconfig_init_user();
+}
\ No newline at end of file
diff --git a/keyboards/senselessclay/gos65/gos65.h b/keyboards/senselessclay/gos65/gos65.h
new file mode 100644
index 0000000000..b8222688d2
--- /dev/null
+++ b/keyboards/senselessclay/gos65/gos65.h
@@ -0,0 +1,35 @@
+/* Copyright 2020 Hadi Iskandarani
+ *
+ * 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 ____ KC_NO
+
+#define LAYOUT( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       K314, \
+    K400, K401, K402,                   K406,                   K410, K411, K412, K413,       K414 \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+    { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, K410, K411, K412, K413, K414 }  \
+}
diff --git a/keyboards/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json
new file mode 100644
index 0000000000..95f0960a47
--- /dev/null
+++ b/keyboards/senselessclay/gos65/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "gos65",
+    "url": "https://senselessclay.com/",
+    "maintainer": "hadi",
+    "layouts": {
+      "LAYOUT": {
+          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+      }
+  }
+}
\ No newline at end of file
diff --git a/keyboards/senselessclay/gos65/keymaps/default/keymap.c b/keyboards/senselessclay/gos65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c35af25888
--- /dev/null
+++ b/keyboards/senselessclay/gos65/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2020 Hadi Iskandarani
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+     [0] = LAYOUT(
+        /*Base*/
+		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME, 
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+		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_PGDN,
+		KC_LSFT, KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
+    [1] = LAYOUT(
+		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, RGB_VAI,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, RGB_VAD,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_HOME, KC_PGUP, KC_TRNS, RGB_MODE_FORWARD,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_MUTE, KC_VOLU, KC_MPLY, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
+    [2] = LAYOUT(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
\ No newline at end of file
diff --git a/keyboards/senselessclay/gos65/keymaps/via/keymap.c b/keyboards/senselessclay/gos65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..74ebce7df5
--- /dev/null
+++ b/keyboards/senselessclay/gos65/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2020 Hadi Iskandarani
+ *
+ * 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 layers {
+    _0,
+    _1,
+    _2,
+    _3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_0] = LAYOUT(
+        /*Base*/
+		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME, 
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+		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_PGDN,
+		KC_LSFT, KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
+    [_1] = LAYOUT(
+		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, RGB_VAI,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, RGB_VAD,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_HOME, KC_PGUP, KC_TRNS, RGB_MODE_FORWARD,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_MUTE, KC_VOLU, KC_MPLY, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
+    [_2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 
+    [_3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
\ No newline at end of file
diff --git a/keyboards/senselessclay/gos65/keymaps/via/rules.mk b/keyboards/senselessclay/gos65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/senselessclay/gos65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/senselessclay/gos65/readme.md b/keyboards/senselessclay/gos65/readme.md
new file mode 100644
index 0000000000..bae450ee79
--- /dev/null
+++ b/keyboards/senselessclay/gos65/readme.md
@@ -0,0 +1,18 @@
+# gos65
+
+A 65% keyboard implementation based around the ATMEGA32u4 with per-key RGB. Designed for the GOS65 from OPS Keyboard. 
+
+* Keyboard Maintainer: [hadi](https://github.com/senselessclay)
+* Hardware Supported: gos65 PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make senselessclay/gos65:default
+
+Flashing example for this keyboard:
+
+    make senselessclay/gos65:default:flash
+
+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).
+
+If you'd like to reset the board into bootloader mode for flashing using [QMK Toolbox](https://github.com/qmk/qmk_toolbox), simply press the reset button directly above the controller assembly on the bottom side of the PCB.
\ No newline at end of file
diff --git a/keyboards/senselessclay/gos65/rules.mk b/keyboards/senselessclay/gos65/rules.mk
new file mode 100644
index 0000000000..08b268c041
--- /dev/null
+++ b/keyboards/senselessclay/gos65/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file

From 845529782ef13a3d3f86443cf74082832eb71d9d Mon Sep 17 00:00:00 2001
From: Leo Batyuk <leonid.batyuk@wooga.net>
Date: Fri, 7 Jan 2022 00:49:55 +0100
Subject: [PATCH 151/867] Migrate crkbd/soundmonster to split common, fix OLED
 and RGB matrix (#15717)

Co-authored-by: Leo B <leo.the.soundmonster@gmail.com>
---
 keyboards/crkbd/keymaps/soundmonster/config.h | 30 ++++++----
 keyboards/crkbd/keymaps/soundmonster/keymap.c | 55 ++++---------------
 keyboards/crkbd/keymaps/soundmonster/rules.mk |  5 +-
 3 files changed, 31 insertions(+), 59 deletions(-)

diff --git a/keyboards/crkbd/keymaps/soundmonster/config.h b/keyboards/crkbd/keymaps/soundmonster/config.h
index 0687f9c5c8..3a31f8613f 100644
--- a/keyboards/crkbd/keymaps/soundmonster/config.h
+++ b/keyboards/crkbd/keymaps/soundmonster/config.h
@@ -51,9 +51,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_VAL_STEP 17
 #endif
 
-#define OLED_FONT_H "keyboards/crkbd/keymaps/soundmonster/glcdfont.c"
-// #define OLED_FONT_WIDTH 5
-// #define OLED_FONT_HEIGHT 7
+
+#ifdef OLED_ENABLE
+#   define SPLIT_LAYER_STATE_ENABLE
+#   define SPLIT_LED_STATE_ENABLE
+#   define SPLIT_MODS_ENABLE
+#   define SPLIT_OLED_ENABLE
+#   define OLED_FONT_H "keyboards/crkbd/keymaps/soundmonster/glcdfont.c"
+#   define OLED_TIMEOUT 30000
+#endif
 
 #ifdef RGB_MATRIX_ENABLE
 #   define RGB_MATRIX_KEYPRESSES // reacts to keypresses
@@ -71,12 +77,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Disable the animations you don't want/need.  You will need to disable a good number of these    *
  * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
-// #   undef ENABLE_RGB_MATRIX_ALPHAS_MODS
+#   define ENABLE_RGB_MATRIX_ALPHAS_MODS
 #    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 #    undef ENABLE_RGB_MATRIX_BREATHING
-// #   undef ENABLE_RGB_MATRIX_BAND_SAT
+#    undef ENABLE_RGB_MATRIX_BAND_SAT
 #    undef ENABLE_RGB_MATRIX_BAND_VAL
-#    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#   define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
 #    undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
 #    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
 #    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
@@ -85,26 +91,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
 #    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
 #    undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-// #   undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#   define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
 #    undef ENABLE_RGB_MATRIX_DUAL_BEACON
 #    undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
 #    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
 #    undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
 #    undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-// #   undef ENABLE_RGB_MATRIX_RAINDROPS
+#    undef ENABLE_RGB_MATRIX_RAINDROPS
 #    undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-// #   undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// #   undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#   define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#   define ENABLE_RGB_MATRIX_DIGITAL_RAIN
 #    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
 #    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-// #   undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
 #    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
 #    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
 #    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
 #    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
 #    undef ENABLE_RGB_MATRIX_SPLASH
-// #   undef ENABLE_RGB_MATRIX_MULTISPLASH
+#   define ENABLE_RGB_MATRIX_MULTISPLASH
 #    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
 #    undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #endif
diff --git a/keyboards/crkbd/keymaps/soundmonster/keymap.c b/keyboards/crkbd/keymaps/soundmonster/keymap.c
index c9e2c8bc44..70fe50e967 100644
--- a/keyboards/crkbd/keymaps/soundmonster/keymap.c
+++ b/keyboards/crkbd/keymaps/soundmonster/keymap.c
@@ -1,3 +1,6 @@
+// Copyright 2022 Soundmonster (@soundmonster)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
 extern keymap_config_t keymap_config;
@@ -7,10 +10,6 @@ extern keymap_config_t keymap_config;
 extern rgblight_config_t rgblight_config;
 #endif
 
-#ifdef OLED_ENABLE
-static uint32_t oled_timer = 0;
-#endif
-
 // 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
@@ -278,53 +277,19 @@ void render_layer_state(void) {
     }
 }
 
-void render_status_main(void) {
-    render_logo();
-    render_space();
-    render_layer_state();
-    render_space();
-    render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
-    render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
-}
-
-void render_status_secondary(void) {
-    render_logo();
-    render_space();
-    render_layer_state();
-    render_space();
-    render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
-    render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
-}
-
-void suspend_power_down_user() {
-    oled_off();
-}
-
 bool oled_task_user(void) {
-    if (timer_elapsed32(oled_timer) > 30000) {
-        oled_off();
-        return false;
-    }
-#ifndef SPLIT_KEYBOARD
-    else { oled_on(); }
-#endif
-
-    if (is_keyboard_master()) {
-        render_status_main();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-    } else {
-        render_status_secondary();
-    }
+    // Renders the current keyboard state (layers and mods)
+    render_logo();
+    render_space();
+    render_layer_state();
+    render_space();
+    render_mod_status_gui_alt(get_mods()|get_oneshot_mods());
+    render_mod_status_ctrl_shift(get_mods()|get_oneshot_mods());
     return false;
 }
 
 #endif
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef OLED_ENABLE
-        oled_timer = timer_read32();
-#endif
-    // set_timelog();
-  }
   static uint16_t my_colon_timer;
 
   switch (keycode) {
diff --git a/keyboards/crkbd/keymaps/soundmonster/rules.mk b/keyboards/crkbd/keymaps/soundmonster/rules.mk
index 62971258e9..d3a964424f 100644
--- a/keyboards/crkbd/keymaps/soundmonster/rules.mk
+++ b/keyboards/crkbd/keymaps/soundmonster/rules.mk
@@ -2,6 +2,7 @@ RGBLIGHT_ENABLE    = no
 RGB_MATRIX_ENABLE  = yes
 MOUSEKEY_ENABLE    = no
 NKRO_ENABLE        = yes
-OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
+OLED_ENABLE        = yes
+OLED_DRIVER        = SSD1306
+LTO_ENABLE         = yes
 

From db8cf0b872a1350f11d2de931f7b375feaec69c2 Mon Sep 17 00:00:00 2001
From: Walter Hanley <walterphanley@gmail.com>
Date: Thu, 6 Jan 2022 19:38:42 -0600
Subject: [PATCH 152/867] [Keyboard] Add Support for Wren Keyboard (#14570)

* initial prime_o commit

* Cleaned up comments, other things.

* Updated keymap to use standard seven-underscore KC_TRNS notation

* initial prime_o commit

* Cleaned up comments, other things.

* Updated keymap to use standard seven-underscore KC_TRNS notation

* Initial Code for Wren Keyboard

This is the initial hardware test commit for the wren. More detailed keymaps will be added soon.

* Update layout and add author

* Add PCB Image and Clarify Bootloader Instructions

* Update config.h

Updating config.h to remove mentions to LED backlighting (not supported on this PCB)

* Update wren.h to match PR checklist

* Roll back addition of code that should have been in wren.h

* Update /default/keymap.c

Make keyboard.c "pristine" to the best of my ability and add information about configuring a "non-standard" layout.

* Update readme.md

* Update keymap readmes to match PR checklist

* Update readme.md

* Final touches before PR

* Un-delete non-wren files

* Create rules.mk

* Create config.h

* Update keyboards/wren/keymaps/walterhanley/keymap.c

* Update keyboards/wren/keymaps/walterhanley/keymap.c

* Update keyboards/wren/wren.c

As per feedback, move encoder definition to wren.c from keymap.c.

* Update keyboards/wren/keymaps/walterhanley/keymap.c

As per feedback, move encoder definition to wren.c from keymap.c

* Update keyboards/wren/keymaps/default/keymap.c

As per feedback, move encoder definition to wren.c from keymap.c

* Create Keymap-Level config.h

I've been dealing with some issues with this board over-drawing power on certain devices; this should fix that issue on my build without affecting other users.

* Add bells and whistles to personal keymap

This update adds bells and whistles to my personal keymap. I couldn't figure out how to modify rotary encoder functionality for just my personal layout with the definition in wren.c, so I moved it back into the individual keymaps. Please let me know if this is an issue and I can look into possible alternative implementations.

* Update to match drashna's requested changes

* Update keymap.c

This update refines drashna's requested changes.

* Update keymap.c

Fix typo
---
 keyboards/wren/config.h                       | 125 +++++++++++++
 keyboards/wren/keymaps/default/keymap.c       |  36 ++++
 keyboards/wren/keymaps/default/readme.md      |  11 ++
 keyboards/wren/keymaps/walterhanley/config.h  |  20 +++
 keyboards/wren/keymaps/walterhanley/keymap.c  | 170 ++++++++++++++++++
 keyboards/wren/keymaps/walterhanley/readme.md |  12 ++
 keyboards/wren/readme.md                      |  27 +++
 keyboards/wren/rules.mk                       |  21 +++
 keyboards/wren/wren.c                         |  35 ++++
 keyboards/wren/wren.h                         |  46 +++++
 10 files changed, 503 insertions(+)
 create mode 100644 keyboards/wren/config.h
 create mode 100644 keyboards/wren/keymaps/default/keymap.c
 create mode 100644 keyboards/wren/keymaps/default/readme.md
 create mode 100644 keyboards/wren/keymaps/walterhanley/config.h
 create mode 100644 keyboards/wren/keymaps/walterhanley/keymap.c
 create mode 100644 keyboards/wren/keymaps/walterhanley/readme.md
 create mode 100644 keyboards/wren/readme.md
 create mode 100644 keyboards/wren/rules.mk
 create mode 100644 keyboards/wren/wren.c
 create mode 100644 keyboards/wren/wren.h

diff --git a/keyboards/wren/config.h b/keyboards/wren/config.h
new file mode 100644
index 0000000000..93b8468c17
--- /dev/null
+++ b/keyboards/wren/config.h
@@ -0,0 +1,125 @@
+/*
+Copyright 2021 Walter Hanley
+
+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 Walter Hanley
+#define PRODUCT      wren
+
+/* key matrix size */
+// Rows are doubled-up (Bottom set of rows are used for the right half)
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 10
+
+/*
+ * 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 { D3, D2, C6, D4, B5 }
+#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D7, F0 }
+#define UNUSED_PINS
+
+// define encoders
+#define ENCODERS_PAD_A \
+    { E6 }
+#define ENCODERS_PAD_B \
+    { B4 }
+#define ENCODERS_PAD_A_RIGHT \
+    { B4 }
+#define ENCODERS_PAD_B_RIGHT \
+    { E6 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define USE_I2C
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/wren/keymaps/default/keymap.c b/keyboards/wren/keymaps/default/keymap.c
new file mode 100644
index 0000000000..637e0e08b8
--- /dev/null
+++ b/keyboards/wren/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 Walter Hanley
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE
+};
+
+/* This layout preserves the entire keyboard matrix, but only includes keycodes
+ * for a numpad/nav cluster configuration. Depending on your configuration, you
+ * may need to replace some of the existing KC_NO values with actual keycodes.
+ */
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+     KC_PSLS, KC_7,    KC_8,    KC_9,    KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  KC_INS,  KC_HOME, KC_PGUP, KC_NO,
+     KC_PAST, KC_4,    KC_5,    KC_6,    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_DEL,  KC_END,  KC_PGDN, KC_NO,
+     KC_PMNS, KC_1,    KC_2,    KC_3,    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_NO,   KC_UP,   KC_NO,   KC_NO,
+     KC_PPLS, KC_0,    KC_DOT,  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_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+                                                           KC_NLCK, KC_LALT, KC_LGUI, KC_BSPC, KC_ENT,  KC_SPC,  KC_DEL,  KC_RGUI, KC_RALT, KC_MUTE
+    )
+};
diff --git a/keyboards/wren/keymaps/default/readme.md b/keyboards/wren/keymaps/default/readme.md
new file mode 100644
index 0000000000..7227050dd4
--- /dev/null
+++ b/keyboards/wren/keymaps/default/readme.md
@@ -0,0 +1,11 @@
+![Default Layout](https://github.com/walterhanley/wren-keyboard/blob/main/images/author-layout.png?raw=true)
+
+# Default Wren Layout
+
+This is the default Wren layout, which lacks any layers. It should be fairly 
+straightforward, with the sole exception of the equals key in the place of the 
+grave key and the grave key in the place of the delete key. 
+
+This layout preserves the entire keyboard matrix, but only includes keycodes 
+for a numpad/nav cluster configuration. Depending on your configuration, you 
+may need to replace some of the existing KC_NO values with actual keycodes.
diff --git a/keyboards/wren/keymaps/walterhanley/config.h b/keyboards/wren/keymaps/walterhanley/config.h
new file mode 100644
index 0000000000..3dd5b47c16
--- /dev/null
+++ b/keyboards/wren/keymaps/walterhanley/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 Walter Hanley
+ *
+ * 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
+
+// Lower board power consumption to boost compatibility
+#define USB_MAX_POWER_CONSUMPTION 250
diff --git a/keyboards/wren/keymaps/walterhanley/keymap.c b/keyboards/wren/keymaps/walterhanley/keymap.c
new file mode 100644
index 0000000000..ee4b6f3734
--- /dev/null
+++ b/keyboards/wren/keymaps/walterhanley/keymap.c
@@ -0,0 +1,170 @@
+/* Copyright 2021 Walter Hanley
+ *
+ * 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
+
+// Cmd-tab tablesetting
+bool is_cmd_tab_active = false;
+uint16_t cmd_tab_timer = 0;
+
+// Alt-tab tablesetting
+bool is_alt_tab_active = false;
+uint16_t alt_tab_timer = 0;
+
+// Defines keycode alias
+#define ECTL LCTL_T(KC_ESC)
+#define EGUI LGUI_T(KC_ESC)
+#define DELSYM LT(_SYMBOL, KC_DEL)
+#define SCLNAV LT(_NAV, KC_SCLN)
+#define TGNLCK TG(_NLCK)
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _MAC,
+    _WIN,
+    _NLCK,
+    _SYMBOL,
+    _NAV
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    NSEAL = SAFE_RANGE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Mac */
+    [_MAC] = LAYOUT(
+     KC_PSLS, KC_7,    KC_8,    KC_9,    KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  KC_INS,  KC_HOME, KC_PGUP, KC_NO,
+     KC_PAST, KC_4,    KC_5,    KC_6,    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_DEL,  KC_END,  KC_PGDN, KC_NO,
+     KC_PMNS, KC_1,    KC_2,    KC_3,    ECTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    SCLNAV,  KC_QUOT, KC_NO,   KC_UP,   KC_NO,   KC_NO,
+     KC_PPLS, KC_0,    KC_DOT,  KC_ENT,  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+                                                           TGNLCK,  KC_LALT, KC_LGUI, KC_BSPC, KC_ENT,  KC_SPC,  DELSYM,  KC_RGUI, KC_RALT, KC_MUTE
+    ),
+
+    /* Windows */
+    [_WIN] = LAYOUT(
+     KC_PSLS, KC_7,    KC_8,    KC_9,    KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,  KC_INS,  KC_HOME, KC_PGUP, KC_NO,
+     KC_PAST, KC_4,    KC_5,    KC_6,    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_DEL,  KC_END,  KC_PGDN, KC_NO,
+     KC_PMNS, KC_1,    KC_2,    KC_3,    EGUI,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    SCLNAV,  KC_QUOT, KC_NO,   KC_UP,   KC_NO,   KC_NO,
+     KC_PPLS, KC_0,    KC_DOT,  KC_ENT,  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+                                                           TGNLCK,  KC_LALT, KC_LCTL, KC_BSPC, KC_ENT,  KC_SPC,  DELSYM,  KC_RCTL, KC_RALT, KC_MUTE
+    ),
+
+    /* In-Keyboard Numlock */
+    [_NLCK] = LAYOUT(
+     KC_PSLS, KC_HOME, KC_UP,   KC_PGUP, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+     KC_PAST, KC_LEFT, KC_5,    KC_RGHT, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+     KC_PMNS, KC_END,  KC_DOWN, KC_PGDN, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+     KC_PPLS, KC_INS,  KC_DOT,  KC_ENT,  _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                                                           TGNLCK,  _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    /* Symbols, F-Keys, and Text Macros */
+    [_SYMBOL] = LAYOUT(
+     NSEAL,   _______, _______, _______, 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_UNDS, KC_LCBR, KC_LBRC, _______,                   _______, KC_RBRC, KC_RCBR, KC_MINS, _______, _______, _______, _______, _______, _______,
+     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                                                           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    /* Nav Cluster and Settings*/
+    [_NAV] = LAYOUT(
+     DF(_MAC), _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+     DF(_WIN), _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_UP,   KC_END,  _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+     _______,  _______, _______, _______, _______, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                                                            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder */
+        // Encoder functionality for _MAC layer
+        if (IS_LAYER_ON(_MAC))
+        {
+            if (clockwise) {
+                if (!is_cmd_tab_active) {
+                    is_cmd_tab_active = true;
+                    register_code(KC_LGUI);
+                }
+                cmd_tab_timer = timer_read();
+                tap_code16(KC_TAB);
+            } else {
+                if (!is_cmd_tab_active) {
+                    is_cmd_tab_active = true;
+                    register_code(KC_LGUI);
+                }
+                cmd_tab_timer = timer_read();
+                tap_code16(S(KC_TAB));
+            }
+        }
+        // Encoder functionality for _WIN layer
+        else if (IS_LAYER_ON(_WIN)) {
+            if (clockwise) {
+                if (!is_alt_tab_active) {
+                    is_alt_tab_active = true;
+                    register_code(KC_LALT);
+                }
+                alt_tab_timer = timer_read();
+                tap_code16(KC_TAB);
+            } else {
+                if (!is_alt_tab_active) {
+                    is_alt_tab_active = true;
+                    register_code(KC_LALT);
+                }
+                alt_tab_timer = timer_read();
+                tap_code16(S(KC_TAB));
+            }
+        }
+    } else if (index == 1) { /* Second encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return true;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case NSEAL:
+            if (record->event.pressed) {
+                // when keycode NSEAL is pressed
+                SEND_STRING("What the fuck did you just fucking say about me, you little bitch? I'll have you know I graduated top of my class in the Navy Seals, and I've been involved in numerous secret raids on Al-Quaeda, and I have over 300 confirmed kills. I am trained in gorilla warfare and I'm the top sniper in the entire US armed forces. You are nothing to me but just another target. I will wipe you the fuck out with precision the likes of which has never been seen before on this Earth, mark my fucking words. You think you can get away with saying that shit to me over the Internet? Think again, fucker. As we speak I am contacting my secret network of spies across the USA and your IP is being traced right now so you better prepare for the storm, maggot. The storm that wipes out the pathetic little thing you call your life. You're fucking dead, kid. I can be anywhere, anytime, and I can kill you in over seven hundred ways, and that's just with my bare hands. Not only am I extensively trained in unarmed combat, but I have access to the entire arsenal of the United States Marine Corps and I will use it to its full extent to wipe your miserable ass off the face of the continent, you little shit. If only you could have known what unholy retribution your little 'clever' comment was about to bring down upon you, maybe you would have held your fucking tongue. But you couldn't, you didn't, and now you're paying the price, you goddamn idiot. I will shit fury all over you and you will drown in it. You're fucking dead, kiddo.");
+            } else {
+                // when keycode NSEAL is released
+            }
+            break;
+    }
+    return true;
+}
+
+void matrix_scan_user(void) {
+    if (is_cmd_tab_active) {
+        if (timer_elapsed(cmd_tab_timer) > 1000) {
+            unregister_code(KC_LGUI);
+            is_cmd_tab_active = false;
+        }
+    }
+    if (is_alt_tab_active) {
+        if (timer_elapsed(alt_tab_timer) > 1000) {
+            unregister_code(KC_LALT);
+            is_alt_tab_active = false;
+        }
+    }
+}
diff --git a/keyboards/wren/keymaps/walterhanley/readme.md b/keyboards/wren/keymaps/walterhanley/readme.md
new file mode 100644
index 0000000000..27e32360dc
--- /dev/null
+++ b/keyboards/wren/keymaps/walterhanley/readme.md
@@ -0,0 +1,12 @@
+![Author's Layout](https://github.com/walterhanley/wren-keyboard/blob/main/images/author-layout.png?raw=true)
+
+# Author's Wren Layout
+
+This is my personal Wren layout, which includes a few layers and macros that 
+I find useful. It started as a clone of the default keymap, but will likely
+diverge more as time goes on.
+
+Please note that this layout preserves the entire keyboard matrix, but only 
+includes keycodes for a numpad/nav cluster configuration. Depending on your 
+configuration, you may need to replace some of the existing KC_NO values 
+with actual keycodes.
diff --git a/keyboards/wren/readme.md b/keyboards/wren/readme.md
new file mode 100644
index 0000000000..8de95734d6
--- /dev/null
+++ b/keyboards/wren/readme.md
@@ -0,0 +1,27 @@
+# Wren
+
+![Wren PCB](https://raw.githubusercontent.com/walterhanley/wren-keyboard/main/images/wren-universal.png)
+![Wren Layout](https://raw.githubusercontent.com/walterhanley/wren-keyboard/main/images/author-layout.png)
+
+A split ergonomic "system keyboard" aimed at providing numpad and nav cluster functionality. For more information, please see the [project repo](https://github.com/walterhanley/wren-keyboard).
+
+* Keyboard Maintainer: [Walter Hanley](https://github.com/walterhanley)
+* Hardware Supported: Wren Universal PCB and Elite C (Pro Micro configurations likely supported but not tested)
+* Hardware Availability: Source files available at [project repository](https://github.com/walterhanley/wren-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wren:default
+
+Flashing example for this keyboard:
+
+    make wren:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the front of the PCB below the microcontroler
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/wren/rules.mk b/keyboards/wren/rules.mk
new file mode 100644
index 0000000000..76e0fdf55d
--- /dev/null
+++ b/keyboards/wren/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+# 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
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes       # Enables the use of one or more encoders
+SPLIT_KEYBOARD = yes       # Enables split keyboard
diff --git a/keyboards/wren/wren.c b/keyboards/wren/wren.c
new file mode 100644
index 0000000000..487c9d3070
--- /dev/null
+++ b/keyboards/wren/wren.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 Walter Hanley
+ *
+ * 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 "wren.h"
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    } else if (index == 1) { /* Second encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return true;
+}
diff --git a/keyboards/wren/wren.h b/keyboards/wren/wren.h
new file mode 100644
index 0000000000..ee589fe23c
--- /dev/null
+++ b/keyboards/wren/wren.h
@@ -0,0 +1,46 @@
+/* Copyright 2021 Walter Hanley
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05, L06, L07, L08, L09,           R00, R01, R02, R03, R04, R05, R06, R07, R08, R09, \
+    L10, L11, L12, L13, L14, L15, L16, L17, L18, L19,           R10, R11, R12, R13, R14, R15, R16, R17, R18, R19, \
+    L20, L21, L22, L23, L24, L25, L26, L27, L28, L29,           R20, R21, R22, R23, R24, R25, R26, R27, R28, R29, \
+    L30, L31, L32, L33, L34, L35, L36, L37, L38, L39,           R30, R31, R32, R33, R34, R35, R36, R37, R38, R39, \
+                                  LT0, LT1, LT2, LT3, LT4, RT0, RT1, RT2, RT3, RT4 \
+) { \
+    { L09,   L08,   L07,   L06,   L05,   L04,   L03,   L02,   L01,   L00   }, \
+    { L19,   L18,   L17,   L16,   L15,   L14,   L13,   L12,   L11,   L10   }, \
+    { L29,   L28,   L27,   L26,   L25,   L24,   L23,   L22,   L21,   L20   }, \
+    { L39,   L38,   L37,   L36,   L35,   L34,   L33,   L32,   L31,   L30   }, \
+    { LT4,   LT3,   LT2,   LT1,   LT0,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { R00,   R01,   R02,   R03,   R04,   R05,   R06,   R07,   R08,   R09   }, \
+    { R10,   R11,   R12,   R13,   R14,   R15,   R16,   R17,   R18,   R19   }, \
+    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   R27,   R28,   R29   }, \
+    { R30,   R31,   R32,   R33,   R34,   R35,   R36,   R37,   R38,   R39   }, \
+    { RT0,   RT1,   RT2,   RT3,   RT4,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+}

From 7ed34bb59fc61114cd2c1e329f40a8a2598d9357 Mon Sep 17 00:00:00 2001
From: TJ <tom.campie@gmail.com>
Date: Thu, 6 Jan 2022 21:07:06 -0600
Subject: [PATCH 153/867] [Keyboard] Adalyn keyboard (#14184)

* first Adalyn commit

* fixed json and removed via

* fixed GPL headers and rules.mk

* fix extra space after gpl
add vial keymap

* Removed VIAL and revised rules.mk

* updating per request and completing readme
---
 keyboards/adalyn/adalyn.c                  | 16 +++++
 keyboards/adalyn/adalyn.h                  | 33 ++++++++++
 keyboards/adalyn/config.h                  | 54 ++++++++++++++++
 keyboards/adalyn/info.json                 | 10 +++
 keyboards/adalyn/keymaps/default/config.h  | 21 +++++++
 keyboards/adalyn/keymaps/default/keymap.c  | 72 ++++++++++++++++++++++
 keyboards/adalyn/keymaps/default/readme.md |  1 +
 keyboards/adalyn/keymaps/default/rules.mk  |  1 +
 keyboards/adalyn/readme.md                 | 19 ++++++
 keyboards/adalyn/rules.mk                  | 22 +++++++
 10 files changed, 249 insertions(+)
 create mode 100644 keyboards/adalyn/adalyn.c
 create mode 100644 keyboards/adalyn/adalyn.h
 create mode 100644 keyboards/adalyn/config.h
 create mode 100644 keyboards/adalyn/info.json
 create mode 100644 keyboards/adalyn/keymaps/default/config.h
 create mode 100644 keyboards/adalyn/keymaps/default/keymap.c
 create mode 100644 keyboards/adalyn/keymaps/default/readme.md
 create mode 100644 keyboards/adalyn/keymaps/default/rules.mk
 create mode 100644 keyboards/adalyn/readme.md
 create mode 100644 keyboards/adalyn/rules.mk

diff --git a/keyboards/adalyn/adalyn.c b/keyboards/adalyn/adalyn.c
new file mode 100644
index 0000000000..837cb9c98a
--- /dev/null
+++ b/keyboards/adalyn/adalyn.c
@@ -0,0 +1,16 @@
+ /* Copyright TJ Campie
+  *
+  * 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 "adalyn.h"
diff --git a/keyboards/adalyn/adalyn.h b/keyboards/adalyn/adalyn.h
new file mode 100644
index 0000000000..d9c1c68504
--- /dev/null
+++ b/keyboards/adalyn/adalyn.h
@@ -0,0 +1,33 @@
+ /* Copyright TJ Campie
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+  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,      K33,           K36, K37,      K39  \
+) \
+{ \
+  { 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, XXX, K33, XXX, XXX, K36, K37, XXX, K39  }  \
+}
diff --git a/keyboards/adalyn/config.h b/keyboards/adalyn/config.h
new file mode 100644
index 0000000000..c34337f245
--- /dev/null
+++ b/keyboards/adalyn/config.h
@@ -0,0 +1,54 @@
+ /* Copyright TJ Campie
+  *
+  * 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 0x7431
+#define PRODUCT_ID 0x6164
+#define DEVICE_VER 0x0001
+#define MANUFACTURER tominabox1
+#define PRODUCT Adalyn
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 10
+
+/*
+ * 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 { C7, D6, B7, B3 }
+#define MATRIX_COL_PINS { D7, B4, B5, B6, C6, F7, F6, F5, F4, F1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
diff --git a/keyboards/adalyn/info.json b/keyboards/adalyn/info.json
new file mode 100644
index 0000000000..b8cc6640af
--- /dev/null
+++ b/keyboards/adalyn/info.json
@@ -0,0 +1,10 @@
+{
+  "keyboard_name": "adalyn",
+  "url": "https://github.com/MarvFPV/Adalyn",
+  "maintainer": "tominabox1",
+  "layouts": {
+    "LAYOUT": {
+        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0, "w":1.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2, "w":1.5}, {"x":0, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":10.75, "y":3}]
+    }
+}
+}
diff --git a/keyboards/adalyn/keymaps/default/config.h b/keyboards/adalyn/keymaps/default/config.h
new file mode 100644
index 0000000000..d8b87f9478
--- /dev/null
+++ b/keyboards/adalyn/keymaps/default/config.h
@@ -0,0 +1,21 @@
+ /* Copyright TJ Campie
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+#pragma once
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 5
+#    define COMBO_TERM 200
+#endif
diff --git a/keyboards/adalyn/keymaps/default/keymap.c b/keyboards/adalyn/keymaps/default/keymap.c
new file mode 100644
index 0000000000..21cc74fa9f
--- /dev/null
+++ b/keyboards/adalyn/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+ /* Copyright TJ Campie
+  *
+  * 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 layers{
+  _BASE,
+  _NUM_SYM,
+  _NAV
+};
+enum combo_events {
+  COMBO_BSPC,
+  COMBO_NUMBAK,
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+};
+
+#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
+#define KC_GA LGUI_T(KC_A)
+#define KC_AS LALT_T(KC_S)
+#define KC_CD LCTL_T(KC_D)
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+#define KC_CK RCTL_T(KC_K)
+#define KC_AL RALT_T(KC_L)
+#define KC_GSCLN RGUI_T(KC_SCLN)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,    KC_I,   KC_O,     KC_P,
+    KC_GA,  KC_AS,  KC_CD,  KC_SF,   KC_G,   KC_H,  KC_SJ,   KC_CK,  KC_AL, KC_ENT,
+    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_B, KC_N,   KC_M, KC_COMM, KC_DOT,
+    KC_LCTL, KC_LALT, KC_BSPC, LT(_NUM_SYM,KC_SPACE), KC_RGUI, KC_RCTL
+  ),
+
+  [_NUM_SYM] = LAYOUT(
+    KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
+    KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
+    KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_NO, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  )
+};
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
+const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
+const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
+  [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+
+};
+#endif
diff --git a/keyboards/adalyn/keymaps/default/readme.md b/keyboards/adalyn/keymaps/default/readme.md
new file mode 100644
index 0000000000..fb85d36e28
--- /dev/null
+++ b/keyboards/adalyn/keymaps/default/readme.md
@@ -0,0 +1 @@
+# Default QAZ Layout
diff --git a/keyboards/adalyn/keymaps/default/rules.mk b/keyboards/adalyn/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/adalyn/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/adalyn/readme.md b/keyboards/adalyn/readme.md
new file mode 100644
index 0000000000..ee24bead61
--- /dev/null
+++ b/keyboards/adalyn/readme.md
@@ -0,0 +1,19 @@
+# Adalyn
+
+![Adalyn](https://i.imgur.com/3mGQlh2.jpg)
+
+*A cool QAZ-Alice hybrid designed by [Marv](https://github.com/MarvFPV/Adalyn) with a PCB by [tominabox1](https://github.com/tominabox1)*
+* Keyboard Maintainer: [tominabox1](https://github.com/tominabox1)
+* Hardware Supported: Adalyn PCB, atmega32u4
+* Hardware Availability: Open source on @tominabox1 GitHub
+
+Make example for this keyboard (after setting up your build environment):
+    make adalyn:default
+Flashing example for this keyboard:
+    make adalyn:default:flash
+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).
+## Bootloader
+Enter the bootloader in 3 ways:
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/adalyn/rules.mk b/keyboards/adalyn/rules.mk
new file mode 100644
index 0000000000..078a9bca06
--- /dev/null
+++ b/keyboards/adalyn/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+COMBO_ENABLE = no

From 3076d3c4f4caa3a4e98ac85cf6911af4eebf9329 Mon Sep 17 00:00:00 2001
From: Mason <68556199+masoncowen@users.noreply.github.com>
Date: Fri, 7 Jan 2022 05:25:20 +0000
Subject: [PATCH 154/867] [Keymap] Add masoncowen planck keymap (#14353)

Co-authored-by: Drashna Jael're <drashna@live.com>
---
 keyboards/planck/keymaps/masoncowen/keymap.c  | 59 +++++++++++++++++++
 keyboards/planck/keymaps/masoncowen/readme.md | 46 +++++++++++++++
 keyboards/planck/keymaps/masoncowen/rules.mk  |  1 +
 3 files changed, 106 insertions(+)
 create mode 100644 keyboards/planck/keymaps/masoncowen/keymap.c
 create mode 100644 keyboards/planck/keymaps/masoncowen/readme.md
 create mode 100644 keyboards/planck/keymaps/masoncowen/rules.mk

diff --git a/keyboards/planck/keymaps/masoncowen/keymap.c b/keyboards/planck/keymaps/masoncowen/keymap.c
new file mode 100644
index 0000000000..9a0377a4ca
--- /dev/null
+++ b/keyboards/planck/keymaps/masoncowen/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2021 masoncowen
+ *
+ * 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 planck_layers {
+  _ZWFP,
+  _NUMNAV
+};
+
+enum planck_keycodes {
+  ZWFP = SAFE_RANGE,
+  NUMNAV
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_ZWFP] = LAYOUT_planck_grid(
+  KC_Z , KC_W , KC_F , KC_P , KC_Q , KC_NO , KC_NO , KC_J , KC_L , KC_U , KC_Y , OSL(_NUMNAV) ,
+  KC_A , KC_R , KC_S , KC_T , KC_G , KC_NO , KC_NO , KC_M , KC_N , KC_E , KC_I , KC_O ,
+  KC_X , KC_V , KC_C , KC_D , KC_B , KC_NO , KC_NO , KC_K , KC_H , KC_DOT , KC_COMM , KC_SCLN ,
+  KC_NO , KC_NO , KC_ESC , KC_SPC , OSM(MOD_LCTL) , KC_NO , KC_NO , KC_BSPC , OSM(MOD_LSFT) , OSM(MOD_LALT) , KC_NO , KC_NO
+),
+
+//TRANSPARENT keys are to be decided on
+[_NUMNAV] = LAYOUT_planck_grid(
+  KC_PPLS , KC_4 , KC_5 , KC_6 , KC_PAST , KC_NO , KC_NO , KC_BSLS , KC_HOME , KC_PGDN , KC_PGUP , KC_END ,
+  KC_0 , KC_1 , KC_2 , KC_3 , KC_PENT , KC_NO , KC_NO , KC_NUHS , KC_LEFT , KC_DOWN , KC_UP , KC_RIGHT ,
+  KC_PMNS , KC_7 , KC_8 , KC_9 , KC_PSLS , KC_NO , KC_NO , KC_QUOT , , _______ , _______ , _______ ,
+  KC_NO , KC_NO , _______ , _______ , _______ , KC_NO , KC_NO , _______ , _______ , _______ , KC_NO , KC_NO
+)
+
+};
+
+const key_override_t delete_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_BSPC, KC_DEL);
+const key_override_t enter_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_ESC, KC_ENTER);
+const key_override_t tab_key_override = ko_make_basic(MOD_MASK_SHIFT, KC_SPC, KC_TAB);
+
+const key_override_t **key_overrides = (const key_override_t *[]){
+  &delete_key_override,
+  &enter_key_override,
+  &tab_key_override,
+  NULL
+};
diff --git a/keyboards/planck/keymaps/masoncowen/readme.md b/keyboards/planck/keymaps/masoncowen/readme.md
new file mode 100644
index 0000000000..073cbe73b3
--- /dev/null
+++ b/keyboards/planck/keymaps/masoncowen/readme.md
@@ -0,0 +1,46 @@
+# ZWFP Layout Notes
+## About
+
+ZWFP is a layout largely based on Colemak Mod-DH.
+The layout rotates the QZXVB keys for the following reasons:
+* XCV are brought together.
+  * One design goal of colemak was to keep ZXCV close together as they are commonly uses control shortcuts.
+  * Mod-dh moved D to where the V key was as that position was too ergonomic for an infrequent letter like V.
+  * XCV benefit more from being together are Cut-Copy-Paste are more related than Undo (which Z commonly represents).
+* B is returned to its QWERTY position.
+  * This was an unintentional benefit.
+  * The original rotation of QZXV moved Q to a better position than B despite being was less frequent.
+    * This is based off the grid on [the colemak mod-dh page](https://colemakmods.github.io/mod-dh/model.html).
+    * This needs more testing, and may be reverted as despite the above mentioned grid, the current Q position feels easier than the current B position.
+* Based off [the layout analyser](https://colemakmods.github.io/mod-dh/analyze.html) its slightly better.
+* I like being different.
+
+## Todo
+* Work out punctuation locations.
+* Figure out what the thumb cluster is doing.
+  * I've somewhat settled on left home-row (centre) thumb key is space and right is shift OSL.
+* Maybe a deadkey instead of using shift-/alt- key overrides?
+* [Repeat key](https://www.jonashietala.se/blog/2021/09/05/t-34-0/)
+* Move Home, End, PgDn and PgUp to a kc/ko/dk with the arrow keys.
+
+### Keys still to add
+* A reset key, cba with finding small pokey things to use at the back.
+* Shifted numbers \(not including $^\*\)
+* Dedicated Pipe |
+* Dedicated Underscore \(\_\)
+* Backslash \(\\\) and shifted \(Don't forget to use NOUS\)
+* Square brackets \(\[ \]\) and shifted
+* Dedicated question mark
+* Backtick (`) and shifted
+* Function keys 1-12
+
+#### Obscure keys to add just for completeness
+* Normal Minus and Equals \(Don't know if they are needed or not \)
+* Function keys 13-24
+* Capslock \(Not sure if multi-tapping OSL actually counts as a caps lock for shift\)
+* Numlock, Scrolllock and the Locking lock keys
+* Keypad characters
+* Command Keys in general
+* International Keys
+* Right Modifiers
+* Windows keys for either side
diff --git a/keyboards/planck/keymaps/masoncowen/rules.mk b/keyboards/planck/keymaps/masoncowen/rules.mk
new file mode 100644
index 0000000000..90c9b36df0
--- /dev/null
+++ b/keyboards/planck/keymaps/masoncowen/rules.mk
@@ -0,0 +1 @@
+KEY_OVERRIDE_ENABLE = yes

From febbf66be148c154d9f54027a274ae8a1542712f Mon Sep 17 00:00:00 2001
From: Samuel Fischer <it.fischer.samuel@gmail.com>
Date: Fri, 7 Jan 2022 09:24:54 +0100
Subject: [PATCH 155/867] [Keyboard] Add croxsplit44 handwired keyboard
 (#14227)

* Add files via upload

* Delete keyboards/croxsplit44 directory

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Apply suggestions from code review

* Apply suggestions from code review
---
 keyboards/handwired/croxsplit44/config.h      | 53 ++++++++++++++++++
 keyboards/handwired/croxsplit44/croxsplit44.c | 17 ++++++
 keyboards/handwired/croxsplit44/croxsplit44.h | 32 +++++++++++
 keyboards/handwired/croxsplit44/info.json     | 55 +++++++++++++++++++
 .../croxsplit44/keymaps/default/keymap.c      | 31 +++++++++++
 .../croxsplit44/keymaps/via/keymap.c          | 43 +++++++++++++++
 .../croxsplit44/keymaps/via/rules.mk          |  2 +
 keyboards/handwired/croxsplit44/readme.md     | 23 ++++++++
 keyboards/handwired/croxsplit44/rules.mk      | 21 +++++++
 9 files changed, 277 insertions(+)
 create mode 100644 keyboards/handwired/croxsplit44/config.h
 create mode 100644 keyboards/handwired/croxsplit44/croxsplit44.c
 create mode 100644 keyboards/handwired/croxsplit44/croxsplit44.h
 create mode 100644 keyboards/handwired/croxsplit44/info.json
 create mode 100644 keyboards/handwired/croxsplit44/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/croxsplit44/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/croxsplit44/keymaps/via/rules.mk
 create mode 100644 keyboards/handwired/croxsplit44/readme.md
 create mode 100644 keyboards/handwired/croxsplit44/rules.mk

diff --git a/keyboards/handwired/croxsplit44/config.h b/keyboards/handwired/croxsplit44/config.h
new file mode 100644
index 0000000000..009da2785e
--- /dev/null
+++ b/keyboards/handwired/croxsplit44/config.h
@@ -0,0 +1,53 @@
+/*
+Copyright 2021 Samux6146
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+#define VENDOR_ID       0xB62C
+#define PRODUCT_ID      0x6146
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Samux6146
+#define PRODUCT         splitcustom44
+
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+#define MATRIX_ROW_PINS { D4, D5, D6, D7 }
+#define MATRIX_COL_PINS { B6, B5, B4, D2, C0, C1, F5, F4, F3, F2, F1, F0 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN C4
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 42
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_SLEEP 
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
+#endif
\ No newline at end of file
diff --git a/keyboards/handwired/croxsplit44/croxsplit44.c b/keyboards/handwired/croxsplit44/croxsplit44.c
new file mode 100644
index 0000000000..4dbc7d4cb5
--- /dev/null
+++ b/keyboards/handwired/croxsplit44/croxsplit44.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Samux6146
+ *
+ * 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 "croxsplit44.h"
diff --git a/keyboards/handwired/croxsplit44/croxsplit44.h b/keyboards/handwired/croxsplit44/croxsplit44.h
new file mode 100644
index 0000000000..c94124f9ee
--- /dev/null
+++ b/keyboards/handwired/croxsplit44/croxsplit44.h
@@ -0,0 +1,32 @@
+/* Copyright 2021 Samux6146
+ *
+ * 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( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+	            K302, K303, K304, K305, K306, K307, K308, K309  \
+) \
+{ \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
+	{ KC_NO, KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
+}
diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json
new file mode 100644
index 0000000000..e10a390bbd
--- /dev/null
+++ b/keyboards/handwired/croxsplit44/info.json
@@ -0,0 +1,55 @@
+{
+    "keyboard_name": "croxsplit44",
+    "url": "",
+    "maintainer": "Samux6146",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (D4,B6)", "x":0.5, "y":1.375},
+                {"label":"K01 (D4,B5)", "x":1.5, "y":1.375},
+                {"label":"K02 (D4,B4)", "x":2.5, "y":1.125},
+                {"label":"K03 (D4,D2)", "x":3.5, "y":1},
+                {"label":"K04 (D4,C0)", "x":4.5, "y":1.125},
+                {"label":"K05 (D4,C1)", "x":5.5, "y":1.25},
+                {"label":"K06 (D4,F5)", "x":13, "y":1.25},
+                {"label":"K07 (D4,F4)", "x":14, "y":1.125},
+                {"label":"K08 (D4,F3)", "x":15, "y":1},
+                {"label":"K09 (D4,F2)", "x":16, "y":1.125},
+                {"label":"K0A (D4,F1)", "x":17, "y":1.375},
+                {"label":"K0B (D4,F0)", "x":18, "y":1.375},
+                {"label":"K10 (D5,B6)", "x":0.5, "y":2.375},
+                {"label":"K11 (D5,B5)", "x":1.5, "y":2.375},
+                {"label":"K12 (D5,B4)", "x":2.5, "y":2.125},
+                {"label":"K13 (D5,D2)", "x":3.5, "y":2},
+                {"label":"K14 (D5,C0)", "x":4.5, "y":2.125},
+                {"label":"K15 (D5,C1)", "x":5.5, "y":2.25},
+                {"label":"K16 (D5,F5)", "x":13, "y":2.25},
+                {"label":"K17 (D5,F4)", "x":14, "y":2.125},
+                {"label":"K18 (D5,F3)", "x":15, "y":2},
+                {"label":"K19 (D5,F2)", "x":16, "y":2.125},
+                {"label":"K1A (D5,F1)", "x":17, "y":2.375},
+                {"label":"K1B (D5,F0)", "x":18, "y":2.375},
+                {"label":"K20 (D6,B6)", "x":0.5, "y":3.375},
+                {"label":"K21 (D6,B5)", "x":1.5, "y":3.375},
+                {"label":"K22 (D6,B4)", "x":2.5, "y":3.125},
+                {"label":"K23 (D6,D2)", "x":3.5, "y":3},
+                {"label":"K24 (D6,C0)", "x":4.5, "y":3.125},
+                {"label":"K25 (D6,C1)", "x":5.5, "y":3.25},
+                {"label":"K26 (D6,F5)", "x":13, "y":3.25},
+                {"label":"K27 (D6,F4)", "x":14, "y":3.125},
+                {"label":"K28 (D6,F3)", "x":15, "y":3},
+                {"label":"K29 (D6,F2)", "x":16, "y":3.125},
+                {"label":"K2A (D6,F1)", "x":17, "y":3.375},
+                {"label":"K2B (D6,F0)", "x":18, "y":3.375},
+                {"label":"K32 (D7,B4)", "x":2.5, "y":4.125},
+                {"label":"K33 (D7,D2)", "x":3.5, "y":4},
+                {"label":"K34 (D7,C0)", "x":4.5, "y":4.5},
+                {"label":"K35 (D7,C1)", "x":5.5, "y":4.75},
+                {"label":"K36 (D7,F5)", "x":12.75, "y":4.75},
+                {"label":"K37 (D7,F4)", "x":13.8, "y":4.375},
+                {"label":"K38 (D7,F3)", "x":15, "y":4},
+                {"label":"K39 (D7,F2)", "x":16, "y":4.125}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/croxsplit44/keymaps/default/keymap.c b/keyboards/handwired/croxsplit44/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7b3805ad63
--- /dev/null
+++ b/keyboards/handwired/croxsplit44/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2021 Samux6146
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT(
+		KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 
+		KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, 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_LGUI, 
+		KC_LCTL, KC_LALT, LT(1, KC_NO), KC_SPC, KC_SPC, LT(1, KC_NO), KC_TRNS, KC_TRNS),
+
+[1] = 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, 
+		KC_TAB, RGB_MOD, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_UP, KC_RGHT, KC_ENT, 
+		KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),
+};
\ No newline at end of file
diff --git a/keyboards/handwired/croxsplit44/keymaps/via/keymap.c b/keyboards/handwired/croxsplit44/keymaps/via/keymap.c
new file mode 100644
index 0000000000..63cd585ab3
--- /dev/null
+++ b/keyboards/handwired/croxsplit44/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2021 Samux6146
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT(
+		KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, 
+		KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, 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_LGUI, 
+		KC_LCTL, KC_LALT, LT(1, KC_NO), KC_SPC, KC_SPC, LT(1, KC_NO), KC_TRNS, KC_TRNS),
+
+[1] = 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, 
+		KC_TAB, RGB_MOD, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_UP, KC_RGHT, KC_ENT, 
+		KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_SPC, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) 
+};
diff --git a/keyboards/handwired/croxsplit44/keymaps/via/rules.mk b/keyboards/handwired/croxsplit44/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/handwired/croxsplit44/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/croxsplit44/readme.md b/keyboards/handwired/croxsplit44/readme.md
new file mode 100644
index 0000000000..b9eeb305b2
--- /dev/null
+++ b/keyboards/handwired/croxsplit44/readme.md
@@ -0,0 +1,23 @@
+# croxsplit44
+
+![davanti](https://user-images.githubusercontent.com/41386727/131268038-801cb316-7bb1-486d-8432-be5412ddc31b.jpg)
+
+# A 3d printed 44 key handwired split keyboard
+Thanks to ak666666 for the base case layout : https://www.thingiverse.com/thing:4146704
+*
+* Keyboard Maintainer: https://github.com/Samux6146
+* Hardware Supported: handwired, teensy ++ 2.0
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/croxsplit44: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/croxsplit44/rules.mk b/keyboards/handwired/croxsplit44/rules.mk
new file mode 100644
index 0000000000..0b2170c456
--- /dev/null
+++ b/keyboards/handwired/croxsplit44/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = at90usb1286
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file

From a8927ac60140a2b12bb47661e22c9218f16897f5 Mon Sep 17 00:00:00 2001
From: chance <chance@trashcat.xyz>
Date: Fri, 7 Jan 2022 08:27:42 -0500
Subject: [PATCH 156/867] [Keymap] Adding Frosty Flake VIA keymap (#13211)

* updated my personal layouts

* added Artix to install script

* setting up for PR

* added Artix to install script

* Created frosty flake via keymap.c

Created the default VIA keymap.c file for the Frosty Flake controller

* Create rules.mk

* add #define DYNAMIC_KEYMAP_LAYER_COUNT 3

* Update keymap.c

* Delete keyboards/tada68/keymaps/trashcat directory

* Create keymap.c

* Create README.md

* Create rules.mk

* Delete keyboards/whitefox/keymaps/trashcat directory

* Update qmk_install.sh

* Rename README.md to readme.md

* Update keymap.c

* Update keymap.c

* Apply suggestions from code review
---
 keyboards/bpiphany/frosty_flake/config.h      |  1 +
 .../frosty_flake/keymaps/via/keymap.c         | 44 +++++++++++++++++++
 .../frosty_flake/keymaps/via/rules.mk         |  2 +
 3 files changed, 47 insertions(+)
 create mode 100644 keyboards/bpiphany/frosty_flake/keymaps/via/keymap.c
 create mode 100644 keyboards/bpiphany/frosty_flake/keymaps/via/rules.mk

diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h
index 1a337b111f..a60d728ac6 100644
--- a/keyboards/bpiphany/frosty_flake/config.h
+++ b/keyboards/bpiphany/frosty_flake/config.h
@@ -93,3 +93,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/via/keymap.c b/keyboards/bpiphany/frosty_flake/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b3ef6ecadb
--- /dev/null
+++ b/keyboards/bpiphany/frosty_flake/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+ /* Copyright 2021 Chance Monnette <chance@trashcat.xyz> 
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */  
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_tkl(
+                 KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+                 KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
+                 KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
+                 KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,          KC_ENT,
+                 KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,          KC_RSFT,            KC_UP,
+                 KC_LCTL,KC_LGUI,KC_LALT,                KC_SPC,                                 KC_RALT,KC_RGUI, KC_APP,  KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT  ),
+
+[1] = LAYOUT_tkl(
+       _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,             _______, _______, _______,
+       _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______, _______,  _______,   _______,  _______, _______,
+       _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______, _______, _______,   _______,  _______,  _______,
+       _______,_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,_______,          _______,
+       _______,_______,_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,_______, _______,          _______,            _______,
+       _______,_______,_______,                _______,                                 _______,    _______ , _______,  _______,   _______, _______, _______
+       ),
+
+[2] = LAYOUT_tkl(
+       _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,             _______, _______, _______,
+       _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______, _______,  _______,   _______,  _______, _______,
+       _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______, _______, _______,   _______,  _______,  _______,
+       _______,_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,_______,          _______,
+       _______,_______,_______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,_______, _______,          _______,            _______,
+       _______,_______,_______,                _______,                                 _______,    _______ , _______,  _______,   _______, _______, _______
+       ),
+};
diff --git a/keyboards/bpiphany/frosty_flake/keymaps/via/rules.mk b/keyboards/bpiphany/frosty_flake/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/bpiphany/frosty_flake/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

From 145e91d41f97f210783f053c6caf8eeb37be4fc2 Mon Sep 17 00:00:00 2001
From: FateEverywhere <41215461+FateEverywhere@users.noreply.github.com>
Date: Fri, 7 Jan 2022 15:21:04 -0500
Subject: [PATCH 157/867] [Keyboard] Hard Light Mark 2 and keymaps (#13719)

* Hard Light Mark 2 and keymaps

This time with minor competence!

* Update keyboards/edi/hardlight/mk2/rules.mk

* Delete config.h

* Apply suggestions from code review
---
 keyboards/edi/hardlight/mk2/config.h          |  81 ++++++++++++
 keyboards/edi/hardlight/mk2/halconf.h         |  32 +++++
 .../edi/hardlight/mk2/keymaps/.gitignore      |   1 +
 .../hardlight/mk2/keymaps/default/config.h    |  24 ++++
 .../hardlight/mk2/keymaps/default/keymap.c    | 115 ++++++++++++++++++
 .../edi/hardlight/mk2/keymaps/kate/keymap.c   | 115 ++++++++++++++++++
 keyboards/edi/hardlight/mk2/mcuconf.h         |  32 +++++
 keyboards/edi/hardlight/mk2/mk2.c             |  18 +++
 keyboards/edi/hardlight/mk2/mk2.h             |  37 ++++++
 keyboards/edi/hardlight/mk2/readme.md         |  22 ++++
 keyboards/edi/hardlight/mk2/rules.mk          |  33 +++++
 11 files changed, 510 insertions(+)
 create mode 100644 keyboards/edi/hardlight/mk2/config.h
 create mode 100644 keyboards/edi/hardlight/mk2/halconf.h
 create mode 100644 keyboards/edi/hardlight/mk2/keymaps/.gitignore
 create mode 100644 keyboards/edi/hardlight/mk2/keymaps/default/config.h
 create mode 100644 keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
 create mode 100644 keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
 create mode 100644 keyboards/edi/hardlight/mk2/mcuconf.h
 create mode 100644 keyboards/edi/hardlight/mk2/mk2.c
 create mode 100644 keyboards/edi/hardlight/mk2/mk2.h
 create mode 100644 keyboards/edi/hardlight/mk2/readme.md
 create mode 100644 keyboards/edi/hardlight/mk2/rules.mk

diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
new file mode 100644
index 0000000000..ab4b006827
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -0,0 +1,81 @@
+/*
+©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xF7E0
+#define PRODUCT_ID      0x2408
+#define DEVICE_VER      0x0007
+#define MANUFACTURER    Everywhere Defense Industries
+#define PRODUCT         Hard Light Mk 2
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 8
+
+#define MATRIX_COL_PINS { B2, B6, B5, F1, F0, C15, C14, C13 }
+#define MATRIX_ROW_PINS { B10, B11, A14, A15, A3, A0, A2, A1 }
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* RGB Underglow */
+#define RGB_DI_PIN A10
+#define RGBLED_NUM 32
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5
+//#define RGBLIGHT_LIMIT_VAL 200
+
+/* PWM RGB Underglow Defines */
+#define WS2812_PWM_DRIVER PWMD1
+#define WS2812_PWM_CHANNEL 3
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM5
+#define WS2812_DMA_CHANNEL 3
+#define WS2812_EXTERNAL_PULLUP
+
+/* I2C driver overrides */
+#define I2C1_SCL 7
+#define I2C1_SDA 8
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/keyboards/edi/hardlight/mk2/halconf.h b/keyboards/edi/hardlight/mk2/halconf.h
new file mode 100644
index 0000000000..498f31a919
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/halconf.h
@@ -0,0 +1,32 @@
+/*
+©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// Activate PWM mode
+#define HAL_USE_PWM TRUE
+
+// Activate Inter-Integrated-Circuit Networking (I2C/2Wire)
+#define HAL_USE_I2C TRUE
+
+// Activate Serial Peripheral Interface
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/edi/hardlight/mk2/keymaps/.gitignore b/keyboards/edi/hardlight/mk2/keymaps/.gitignore
new file mode 100644
index 0000000000..08a0f321a2
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/keymaps/.gitignore
@@ -0,0 +1 @@
+fate
\ No newline at end of file
diff --git a/keyboards/edi/hardlight/mk2/keymaps/default/config.h b/keyboards/edi/hardlight/mk2/keymaps/default/config.h
new file mode 100644
index 0000000000..6887510933
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/keymaps/default/config.h
@@ -0,0 +1,24 @@
+/*
+©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#undef  LEADER_TIMEOUT
+#define LEADER_TIMEOUT 250
+#define LEADER_PER_KEY_TIMING
+
+// place overrides here
diff --git a/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6683e647d3
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/keymaps/default/keymap.c
@@ -0,0 +1,115 @@
+/*
+©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _MAIN,
+    _RAISE,
+    _LOWER,
+    _SET,
+};
+
+// Readability keycodes
+#define LOWER   MO(_LOWER)
+#define RAISE   MO(_RAISE)
+#define SET     MO(_SET)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+
+/* MAIN
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * | Tab    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | Backsp | Delete |   7    |   8    |   9    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | Esc    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | Pause  |   4    |   5    |   6    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | LShift | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | Up     | Enter  |   1    |   2    |   3    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | LCtrl  |  Lock  |   GUI  |   Alt  | Lower  | Space  |  Space | Raise  | PrtScr | RShift | Left   | Down   | Right  |   0    |   .    |  Enter |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [_MAIN] = LAYOUT_ortho_4x16(
+  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_DEL,  KC_KP_7, KC_KP_8,   KC_KP_9,
+  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_PAUS, KC_KP_4, KC_KP_5,   KC_KP_6,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_ENT,  KC_KP_1, KC_KP_2,   KC_KP_3,
+  KC_LCTL, KC_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
+  ),
+
+/* RAISE
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * |    `   |  1     |  2     |  3     |  4     |  5     |  6     |  7     |  8     |  9     |  0     |        | Insert |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        | -      | =      | [      | ]      |   \    |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |        |        |        |        |  PgUp  |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |        |        |        |  Vol-  |  PgDn  |  Vol+  |        |        |        |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [_RAISE] = LAYOUT_ortho_4x16(
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, KC_INS,  _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_PGDN, KC_VOLU, _______, _______, _______
+  ),
+
+/* LOWER
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * |    ~   |    !   |    @   |    #   |    $   |    %   |    ^   |    &   |    *   |    (   |    )   |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |    _   |    +   |    {   |    }   |   |    |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |   F7   |   F8   |   F9   |  F10   |  F11   |  F12   |        |        |        |        |  Home  |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |        |        |        |  Mute  |  End   |  Play  |        |        |        |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [_LOWER] = LAYOUT_ortho_4x16(
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, _______, _______, 
+  _______, 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,  _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, 
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_END,  KC_MPLY, _______, _______, _______
+  ),
+
+ /* SETTINGS
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * |        | CapLok | ScrLok | NumLok | VK I/O |        |        | RGB IO | Mode+  | Mode-  | Plain  |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |  Hue+  |  Sat+  |  Val+  | Larsen |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |  Hue-  |  Sat-  |  Val-  | Rswirl |        | Reset  |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [_SET] = LAYOUT_ortho_4x16(
+  _______, KC_CAPS, KC_SLCK, KC_NLCK, VLK_TOG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_M_SW,_______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_K, _______, RESET,   _______, _______, _______, 
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _SET);
+}
\ No newline at end of file
diff --git a/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
new file mode 100644
index 0000000000..a493c2288a
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/keymaps/kate/keymap.c
@@ -0,0 +1,115 @@
+/*
+©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _MAIN,
+    _RAISE,
+    _LOWER,
+    _SET,
+};
+
+// Readability keycodes
+#define LOWER   MO(_LOWER)
+#define RAISE   MO(_RAISE)
+#define SET     MO(_SET)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+
+/* MAIN
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * | Tab    | Q      | W      | E      | R      | T      | Y      | U      | I      | O      | P      | Backsp | Delete |   7    |   8    |   9    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | Esc    | A      | S      | D      | F      | G      | H      | J      | K      | L      | ;      | '      | Enter  |   4    |   5    |   6    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | LShift | Z      | X      | C      | V      | B      | N      | M      | ,      | .      | /      | Up     | Pause  |   1    |   2    |   3    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | LCtrl  |  Lock  |   GUI  |   Alt  | Lower  | Space  |  Space | Raise  | PrtScr | RShift | Left   | Down   | Right  |   0    |   .    |  Enter |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [_MAIN] = LAYOUT_ortho_4x16(
+  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_DEL,  KC_KP_7, KC_KP_8,   KC_KP_9,
+  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_ENT,  KC_KP_4, KC_KP_5,   KC_KP_6,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_PAUS, KC_KP_1, KC_KP_2,   KC_KP_3,
+  KC_LCTL, KC_LOCK, KC_LGUI, KC_LALT, LOWER,   KC_SPC, KC_SPC, RAISE, KC_PSCR, KC_RSFT, KC_LEFT, KC_DOWN, KC_RGHT, KC_KP_0, KC_KP_DOT, KC_PENT
+  ),
+
+/* RAISE
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * |    `   |  1     |  2     |  3     |  4     |  5     |  6     |  7     |  8     |  9     |  0     |        | Insert |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        | -      | =      | [      | ]      |   \    |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |        |        |        |        |  PgUp  |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |        |        |        |  Vol-  |  PgDn  |  Vol+  |        |        |        |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [_RAISE] = LAYOUT_ortho_4x16(
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, KC_INS,  _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_PGDN, KC_VOLU, _______, _______, _______
+  ),
+
+/* LOWER
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * |    ~   |    !   |    @   |    #   |    $   |    %   |    ^   |    &   |    *   |    (   |    )   |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |    _   |    +   |    {   |    }   |   |    |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |   F7   |   F8   |   F9   |  F10   |  F11   |  F12   |        |        |        |        |  Home  |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |        |        |        |  Mute  |  End   |  Play  |        |        |        |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [_LOWER] = LAYOUT_ortho_4x16(
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, _______, _______, 
+  _______, 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,  _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, 
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_END,  KC_MPLY, _______, _______, _______
+  ),
+
+ /* SETTINGS
+ * .-----------------------------------------------------------------------------------------------------------------------------------------------.
+ * |        | CapLok | ScrLok | NumLok | VK I/O |        |        | RGB IO | Mode+  | Mode-  | Plain  |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |  Hue+  |  Sat+  |  Val+  | Larsen |        | Reset  |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |  Hue-  |  Sat-  |  Val-  | Rswirl |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
+ * '-----------------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+  [_SET] = LAYOUT_ortho_4x16(
+  _______, KC_CAPS, KC_SLCK, KC_NLCK, VLK_TOG, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_P, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_M_SW,_______, RESET,   _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_M_K, _______, _______, _______, _______, _______, 
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _SET);
+}
\ No newline at end of file
diff --git a/keyboards/edi/hardlight/mk2/mcuconf.h b/keyboards/edi/hardlight/mk2/mcuconf.h
new file mode 100644
index 0000000000..95e698d9ec
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/mcuconf.h
@@ -0,0 +1,32 @@
+/*
+©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+// Enable PWM
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
+
+// Enable I2C
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+//Enable SPI
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 TRUE
\ No newline at end of file
diff --git a/keyboards/edi/hardlight/mk2/mk2.c b/keyboards/edi/hardlight/mk2/mk2.c
new file mode 100644
index 0000000000..ab4414e4d2
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/mk2.c
@@ -0,0 +1,18 @@
+/*
+©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "mk2.h"
diff --git a/keyboards/edi/hardlight/mk2/mk2.h b/keyboards/edi/hardlight/mk2/mk2.h
new file mode 100644
index 0000000000..5065582d65
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/mk2.h
@@ -0,0 +1,37 @@
+/*
+©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
+ 
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_ortho_4x16( \
+    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, K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, \
+    K48, K49, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, K61, K62, K63 \
+) \
+{ \
+    { K00, K02, K04, K06, K08, K10, K12, K14 }, \
+    { K01, K03, K05, K07, K09, K11, K13, K15 }, \
+    { K16, K18, K20, K22, K24, K26, K28, K30 }, \
+    { K17, K19, K21, K23, K25, K27, K29, K31 }, \
+    { K32, K34, K36, K38, K40, K42, K44, K46 }, \
+    { K33, K35, K37, K39, K41, K43, K45, K47 }, \
+    { K48, K50, K52, K54, K56, K58, K60, K62 }, \
+    { K49, K51, K53, K55, K57, K59, K61, K63 } \
+}
diff --git a/keyboards/edi/hardlight/mk2/readme.md b/keyboards/edi/hardlight/mk2/readme.md
new file mode 100644
index 0000000000..54b14a220e
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/readme.md
@@ -0,0 +1,22 @@
+# Hard Light Mark 2
+
+![Hard Light Mark 2](https://i.imgur.com/X6Katarh.png)
+
+A compact 60% keyboard designed by Fate Everywhere. Born out of the desire for a Planck with a numpad for technical work and a lack of reliance on the Elite-C.
+
+* Keyboard Maintainer: [Fate Everywhere](https://github.com/fateeverywhere)
+* Hardware Supported: Mark 2 Hard Light.
+* Hardware Availability: [Seven Store](https://store.7storm.org).
+* To Enter Bootloader: 
+    If keyboard is operational, hold RAISE and LOWER then press ENTER.
+    If keyboard is unresponsive, unplug board then hold the BTLDR button on the bottom of the PCB and plug in the keyboard.
+
+Build example for this keyboard (after setting up your build environment):
+
+    make edi/hardlight/mk2:default
+
+Flash example for this keyboard (after setting up your build environment):
+ 
+    make edi/hardlight/mk2:default:flash
+
+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).
diff --git a/keyboards/edi/hardlight/mk2/rules.mk b/keyboards/edi/hardlight/mk2/rules.mk
new file mode 100644
index 0000000000..5ffab4a55e
--- /dev/null
+++ b/keyboards/edi/hardlight/mk2/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+Bootloader = stm32-dfu
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+VELOCIKEY_ENABLE = yes
+KEY_LOCK_ENABLE = yes
+WS2812_DRIVER = pwm
+
+# Layout definitions
+LAYOUTS = ortho_4x16
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

From a5afe84a121026d6b0489ee66939d954d19c9ddb Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 7 Jan 2022 13:30:22 -0800
Subject: [PATCH 158/867] Dango40: Fix QMK Configurator Implementation (#15761)

* friendly-format info.json

* correct info.json structure

* info.json: update key labels
---
 keyboards/onekeyco/dango40/info.json | 323 +++++----------------------
 1 file changed, 61 insertions(+), 262 deletions(-)

diff --git a/keyboards/onekeyco/dango40/info.json b/keyboards/onekeyco/dango40/info.json
index 188cc7473d..e26e92697b 100644
--- a/keyboards/onekeyco/dango40/info.json
+++ b/keyboards/onekeyco/dango40/info.json
@@ -1,263 +1,62 @@
 {
-   "keyboard_name":"Dango40",
-   "url":"https://github.com/swiftrax",
-   "maintainer":"Swiftrax",
-   "layouts":{
-      "LAYOUT":{
-         "layout_all":[
-            {
-               "label":"0,0",
-               "x":0,
-               "y":0
-            },
-            {
-               "label":"0,1",
-               "x":1,
-               "y":0
-            },
-            {
-               "label":"0,2",
-               "x":2,
-               "y":0
-            },
-            {
-               "label":"0,3",
-               "x":3,
-               "y":0
-            },
-            {
-               "label":"0,4",
-               "x":4,
-               "y":0
-            },
-            {
-               "label":"0,5",
-               "x":5,
-               "y":0
-            },
-            {
-               "label":"0,6",
-               "x":6,
-               "y":0
-            },
-            {
-               "label":"0,7",
-               "x":7,
-               "y":0
-            },
-            {
-               "label":"0,8",
-               "x":8,
-               "y":0
-            },
-            {
-               "label":"0,9",
-               "x":9,
-               "y":0
-            },
-            {
-               "label":"0,10",
-               "x":10,
-               "y":0
-            },
-            {
-               "label":"0,11",
-               "x":11,
-               "y":0,
-               "w":1.75
-            },
-            {
-               "label":"0,12",
-               "x":12.75,
-               "y":0
-            },
-            {
-               "label":"1,0",
-               "x":0,
-               "y":1,
-               "w":1.25
-            },
-            {
-               "label":"1,1",
-               "x":1.25,
-               "y":1
-            },
-            {
-               "label":"1,2",
-               "x":2.25,
-               "y":1
-            },
-            {
-               "label":"1,3",
-               "x":3.25,
-               "y":1
-            },
-            {
-               "label":"1,4",
-               "x":4.25,
-               "y":1
-            },
-            {
-               "label":"1,5",
-               "x":5.25,
-               "y":1
-            },
-            {
-               "label":"1,6",
-               "x":6.25,
-               "y":1
-            },
-            {
-               "label":"1,7",
-               "x":7.25,
-               "y":1
-            },
-            {
-               "label":"1,8",
-               "x":8.25,
-               "y":1
-            },
-            {
-               "label":"1,9",
-               "x":9.25,
-               "y":1
-            },
-            {
-               "label":"1,10",
-               "x":10.25,
-               "y":1
-            },
-            {
-               "label":"1,11",
-               "x":11.25,
-               "y":1,
-               "w":1.5
-            },
-            {
-               "label":"1,12",
-               "x":12.75,
-               "y":1
-            },
-            {
-               "label":"2,0",
-               "x":0,
-               "y":2,
-               "w":1.75
-            },
-            {
-               "label":"2,1",
-               "x":1.75,
-               "y":2
-            },
-            {
-               "label":"2,2",
-               "x":2.75,
-               "y":2
-            },
-            {
-               "label":"2,3",
-               "x":3.75,
-               "y":2
-            },
-            {
-               "label":"2,4",
-               "x":4.75,
-               "y":2
-            },
-            {
-               "label":"2,5",
-               "x":5.75,
-               "y":2
-            },
-            {
-               "label":"2,6",
-               "x":6.75,
-               "y":2
-            },
-            {
-               "label":"2,7",
-               "x":7.75,
-               "y":2
-            },
-            {
-               "label":"2,8",
-               "x":8.75,
-               "y":2
-            },
-            {
-               "label":"2,9",
-               "x":9.75,
-               "y":2
-            },
-            {
-               "label":"2,10",
-               "x":10.75,
-               "y":2
-            },
-            {
-               "label":"2,11",
-               "x":11.75,
-               "y":2
-            },
-            {
-               "label":"2,12",
-               "x":12.75,
-               "y":2
-            },
-            {
-               "label":"3,0",
-               "x":0,
-               "y":3,
-               "w":1.25
-            },
-            {
-               "label":"3,1",
-               "x":1.25,
-               "y":3,
-               "w":1.5
-            },
-            {
-               "label":"3,2",
-               "x":2.75,
-               "y":3,
-               "w":1.25
-            },
-            {
-               "label":"3,4",
-               "x":4,
-               "y":3,
-               "w":2.25
-            },
-            {
-               "label":"3,6",
-               "x":6.25,
-               "y":3,
-               "w":2.75
-            },
-            {
-               "label":"3,7",
-               "x":9,
-               "y":3,
-               "w":1.25
-            },
-            {
-               "label":"3,9",
-               "x":10.25,
-               "y":3,
-               "w":1.25
-            },
-            {
-               "label":"3,10",
-               "x":11.5,
-               "y":3,
-               "w":1.25
-            },
-            {
-               "label":"3,11",
-               "x":12.75,
-               "y":3
-            }
-         ]
-      }
-   }
-}
\ No newline at end of file
+    "keyboard_name": "Dango40",
+    "url": "https://github.com/swiftrax",
+    "maintainer": "Swiftrax",
+    "layouts": {
+        "LAYOUT_all": {
+            "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":"Backspace", "x":11, "y":0, "w":1.75},
+                {"label":"Mute", "x":12.75, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25},
+                {"label":"A", "x":1.25, "y":1},
+                {"label":"S", "x":2.25, "y":1},
+                {"label":"D", "x":3.25, "y":1},
+                {"label":"F", "x":4.25, "y":1},
+                {"label":"G", "x":5.25, "y":1},
+                {"label":"H", "x":6.25, "y":1},
+                {"label":"J", "x":7.25, "y":1},
+                {"label":"K", "x":8.25, "y":1},
+                {"label":"L", "x":9.25, "y":1},
+                {"label":";:", "x":10.25, "y":1},
+                {"label":"Enter", "x":11.25, "y":1, "w":1.5},
+                {"label":"Page Up", "x":12.75, "y":1},
+
+                {"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":"/?", "x":10.75, "y":2},
+                {"label":"Shift", "x":11.75, "y":2},
+                {"label":"Page Down", "x":12.75, "y":2},
+
+                {"label":"Ctrl", "x":0, "y":3, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":3, "w":1.5},
+                {"label":"Alt", "x":2.75, "y":3, "w":1.25},
+                {"label":"Space", "x":4, "y":3, "w":2.25},
+                {"label":"Space", "x":6.25, "y":3, "w":2.75},
+                {"label":"Alt", "x":9, "y":3, "w":1.25},
+                {"label":"Ctrl", "x":10.25, "y":3, "w":1.25},
+                {"label":"Fn", "x":11.5, "y":3, "w":1.25},
+                {"label":"Right", "x":12.75, "y":3}
+            ]
+        }
+    }
+}

From 4ace960b98bf50468cf560a50ce591d6de00639d Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 7 Jan 2022 13:47:49 -0800
Subject: [PATCH 159/867] JJ50 Touch-Up (#15762)

* rules.mk: Build Options sorting and white space

* use QMK 3-character notation

* info.json: apply friendly formatting

* info.json: use 3-character notation

* move layout macro alias to info.json

* number matrix identifiers by electrical position
---
 keyboards/kprepublic/jj50/info.json | 82 ++++++++++++++++++++++++++---
 keyboards/kprepublic/jj50/jj50.h    | 22 ++++----
 keyboards/kprepublic/jj50/rules.mk  | 16 +++---
 3 files changed, 93 insertions(+), 27 deletions(-)

diff --git a/keyboards/kprepublic/jj50/info.json b/keyboards/kprepublic/jj50/info.json
index e492059e11..5d84efe246 100644
--- a/keyboards/kprepublic/jj50/info.json
+++ b/keyboards/kprepublic/jj50/info.json
@@ -1,10 +1,78 @@
 {
-  "keyboard_name": "JJ50",
-  "url": "",
-  "maintainer": "qmk",
-  "layouts": {
-    "LAYOUT_ortho_5x12": {
-      "layout": [{"label":"K011", "x":0, "y":0}, {"label":"K010", "x":1, "y":0}, {"label":"K009", "x":2, "y":0}, {"label":"K008", "x":3, "y":0}, {"label":"K004", "x":4, "y":0}, {"label":"K005", "x":5, "y":0}, {"label":"K006", "x":6, "y":0}, {"label":"K007", "x":7, "y":0}, {"label":"K003", "x":8, "y":0}, {"label":"K002", "x":9, "y":0}, {"label":"K201", "x":10, "y":0}, {"label":"K000", "x":11, "y":0}, {"label":"K111", "x":0, "y":1}, {"label":"K110", "x":1, "y":1}, {"label":"K109", "x":2, "y":1}, {"label":"K108", "x":3, "y":1}, {"label":"K104", "x":4, "y":1}, {"label":"K105", "x":5, "y":1}, {"label":"K106", "x":6, "y":1}, {"label":"K107", "x":7, "y":1}, {"label":"K103", "x":8, "y":1}, {"label":"K102", "x":9, "y":1}, {"label":"K001", "x":10, "y":1}, {"label":"K100", "x":11, "y":1}, {"label":"K211", "x":0, "y":2}, {"label":"K210", "x":1, "y":2}, {"label":"K209", "x":2, "y":2}, {"label":"K208", "x":3, "y":2}, {"label":"K204", "x":4, "y":2}, {"label":"K205", "x":5, "y":2}, {"label":"K206", "x":6, "y":2}, {"label":"K207", "x":7, "y":2}, {"label":"K203", "x":8, "y":2}, {"label":"K202", "x":9, "y":2}, {"label":"K101", "x":10, "y":2}, {"label":"K200", "x":11, "y":2}, {"label":"K311", "x":0, "y":3}, {"label":"K310", "x":1, "y":3}, {"label":"K309", "x":2, "y":3}, {"label":"K308", "x":3, "y":3}, {"label":"K304", "x":4, "y":3}, {"label":"K305", "x":5, "y":3}, {"label":"K306", "x":6, "y":3}, {"label":"K307", "x":7, "y":3}, {"label":"K303", "x":8, "y":3}, {"label":"K302", "x":9, "y":3}, {"label":"K301", "x":10, "y":3}, {"label":"K300", "x":11, "y":3}, {"label":"K411", "x":0, "y":4}, {"label":"K410", "x":1, "y":4}, {"label":"K409", "x":2, "y":4}, {"label":"K408", "x":3, "y":4}, {"label":"K404", "x":4, "y":4}, {"label":"K405", "x":5, "y":4}, {"label":"K406", "x":6, "y":4}, {"label":"K407", "x":7, "y":4}, {"label":"K403", "x":8, "y":4}, {"label":"K402", "x":9, "y":4}, {"label":"K401", "x":10, "y":4}, {"label":"K400", "x":11, "y":4}]
+    "keyboard_name": "JJ50",
+    "url": "",
+    "maintainer": "qmk",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_ortho_5x12"
+    },
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "layout": [
+                {"label":"K2B", "x":0, "y":0},
+                {"label":"K2A", "x":1, "y":0},
+                {"label":"K29", "x":2, "y":0},
+                {"label":"K28", "x":3, "y":0},
+                {"label":"K24", "x":4, "y":0},
+                {"label":"K25", "x":5, "y":0},
+                {"label":"K26", "x":6, "y":0},
+                {"label":"K27", "x":7, "y":0},
+                {"label":"K23", "x":8, "y":0},
+                {"label":"K22", "x":9, "y":0},
+                {"label":"K21", "x":10, "y":0},
+                {"label":"K20", "x":11, "y":0},
+
+                {"label":"K0B", "x":0, "y":1},
+                {"label":"K0A", "x":1, "y":1},
+                {"label":"K09", "x":2, "y":1},
+                {"label":"K08", "x":3, "y":1},
+                {"label":"K04", "x":4, "y":1},
+                {"label":"K05", "x":5, "y":1},
+                {"label":"K06", "x":6, "y":1},
+                {"label":"K07", "x":7, "y":1},
+                {"label":"K03", "x":8, "y":1},
+                {"label":"K02", "x":9, "y":1},
+                {"label":"K01", "x":10, "y":1},
+                {"label":"K00", "x":11, "y":1},
+
+                {"label":"K1B", "x":0, "y":2},
+                {"label":"K1A", "x":1, "y":2},
+                {"label":"K19", "x":2, "y":2},
+                {"label":"K18", "x":3, "y":2},
+                {"label":"K14", "x":4, "y":2},
+                {"label":"K15", "x":5, "y":2},
+                {"label":"K16", "x":6, "y":2},
+                {"label":"K17", "x":7, "y":2},
+                {"label":"K13", "x":8, "y":2},
+                {"label":"K12", "x":9, "y":2},
+                {"label":"K11", "x":10, "y":2},
+                {"label":"K10", "x":11, "y":2},
+
+                {"label":"K3B", "x":0, "y":3},
+                {"label":"K3A", "x":1, "y":3},
+                {"label":"K39", "x":2, "y":3},
+                {"label":"K38", "x":3, "y":3},
+                {"label":"K34", "x":4, "y":3},
+                {"label":"K35", "x":5, "y":3},
+                {"label":"K36", "x":6, "y":3},
+                {"label":"K37", "x":7, "y":3},
+                {"label":"K33", "x":8, "y":3},
+                {"label":"K32", "x":9, "y":3},
+                {"label":"K31", "x":10, "y":3},
+                {"label":"K30", "x":11, "y":3},
+
+                {"label":"K4B", "x":0, "y":4},
+                {"label":"K4A", "x":1, "y":4},
+                {"label":"K49", "x":2, "y":4},
+                {"label":"K48", "x":3, "y":4},
+                {"label":"K44", "x":4, "y":4},
+                {"label":"K45", "x":5, "y":4},
+                {"label":"K46", "x":6, "y":4},
+                {"label":"K47", "x":7, "y":4},
+                {"label":"K43", "x":8, "y":4},
+                {"label":"K42", "x":9, "y":4},
+                {"label":"K41", "x":10, "y":4},
+                {"label":"K40", "x":11, "y":4}
+            ]
+        }
     }
-  }
 }
diff --git a/keyboards/kprepublic/jj50/jj50.h b/keyboards/kprepublic/jj50/jj50.h
index 59d5c64097..a3d42856c8 100644
--- a/keyboards/kprepublic/jj50/jj50.h
+++ b/keyboards/kprepublic/jj50/jj50.h
@@ -22,17 +22,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 
 #define LAYOUT_ortho_5x12( \
-    K011, K010, K009, K008, K004, K005, K006, K007, K003, K002, K201, K000, \
-    K111, K110, K109, K108, K104, K105, K106, K107, K103, K102, K001, K100, \
-    K211, K210, K209, K208, K204, K205, K206, K207, K203, K202, K101, K200, \
-    K311, K310, K309, K308, K304, K305, K306, K307, K303, K302, K301, K300, \
-    K411, K410, K409, K408, K404, K405, K406, K407, K403, K402, K401, K400  \
+    K2B, K2A, K29, K28, K24, K25, K26, K27, K23, K22, K21, K20, \
+    K0B, K0A, K09, K08, K04, K05, K06, K07, K03, K02, K01, K00, \
+    K1B, K1A, K19, K18, K14, K15, K16, K17, K13, K12, K11, K10, \
+    K3B, K3A, K39, K38, K34, K35, K36, K37, K33, K32, K31, K30, \
+    K4B, K4A, K49, K48, K44, K45, K46, K47, K43, K42, K41, K40  \
 ) { \
-  { K100, K001, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, }, \
-  { K200, K101, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, }, \
-  { K000, K201, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, }, \
-  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, }, \
-  { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411  }  \
+  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, }, \
+  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, }, \
+  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, }, \
+  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, }, \
+  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B  }  \
 }
-
-#define LAYOUT LAYOUT_ortho_5x12
diff --git a/keyboards/kprepublic/jj50/rules.mk b/keyboards/kprepublic/jj50/rules.mk
index 2e510c8bba..faa1a619b9 100644
--- a/keyboards/kprepublic/jj50/rules.mk
+++ b/keyboards/kprepublic/jj50/rules.mk
@@ -8,14 +8,14 @@ BOOTLOADER = bootloadhid
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no    # Mouse keys
-EXTRAKEY_ENABLE = yes   # Audio control and System control
-CONSOLE_ENABLE = no     # Console for debug
-COMMAND_ENABLE = no     # Commands for debug and configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes   # Enable keyboard underlight functionality
-WS2812_DRIVER = i2c     # This driver powers the RGB Lighting and RGB Matrix features
-LTO_ENABLE = yes        # Enable link time optimization
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+WS2812_DRIVER = i2c         # This driver powers the RGB Lighting and RGB Matrix features
+LTO_ENABLE = yes            # Enable link time optimization
 
 LAYOUTS = ortho_5x12

From a2ed670eee98cab826e0b959576716cd7e13a946 Mon Sep 17 00:00:00 2001
From: Richard <rich@brickbots.com>
Date: Fri, 7 Jan 2022 19:22:35 -0800
Subject: [PATCH 160/867] Add a-ball handwired trackball based on ADSN9800
 (#9015)

* Initial commit of kball

* Pretty much working

* Rename to aball

* Cleanup

* Fix typo and make instructions

* Refactor to use qmk spi

* Suggestions from ZVECR

* Update keyboards/handwired/aball/adns9800_srom_A6.h

* Update keyboards/handwired/aball/adns.c

* Update keyboards/handwired/aball/adns.c

* Update keyboards/handwired/aball/adns.c

* Added copyright and source attribution

* Update keyboards/handwired/aball/rules.mk

Include as quantum lib to help avoid timing issues with LTO

* Only send report on change, adj sensitivity, fix src include

* Fix issue causing constant reports and bad clamping

* Streamline conversion to int, add required wait before burst read

* Changes to track develop

* Update rules with new feature descriptors, add info.json

* Add stub layout

* Rework / cleanup key matrix.  Add missing CS pin define for new ADNS driver

* Add stub keymap to enable compile
---
 keyboards/handwired/aball/aball.c             | 18 ++++++++++
 keyboards/handwired/aball/aball.h             | 29 +++++++++++++++
 keyboards/handwired/aball/config.h            | 35 +++++++++++++++++++
 keyboards/handwired/aball/info.json           | 12 +++++++
 .../handwired/aball/keymaps/default/keymap.c  | 18 ++++++++++
 keyboards/handwired/aball/readme.md           | 14 ++++++++
 keyboards/handwired/aball/rules.mk            | 22 ++++++++++++
 7 files changed, 148 insertions(+)
 create mode 100644 keyboards/handwired/aball/aball.c
 create mode 100644 keyboards/handwired/aball/aball.h
 create mode 100644 keyboards/handwired/aball/config.h
 create mode 100644 keyboards/handwired/aball/info.json
 create mode 100644 keyboards/handwired/aball/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/aball/readme.md
 create mode 100644 keyboards/handwired/aball/rules.mk

diff --git a/keyboards/handwired/aball/aball.c b/keyboards/handwired/aball/aball.c
new file mode 100644
index 0000000000..0b3d2f165c
--- /dev/null
+++ b/keyboards/handwired/aball/aball.c
@@ -0,0 +1,18 @@
+/* Copyright 2020 Richard Sutherland
+ *
+ * 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 "aball.h"
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { };
diff --git a/keyboards/handwired/aball/aball.h b/keyboards/handwired/aball/aball.h
new file mode 100644
index 0000000000..8daf6bf680
--- /dev/null
+++ b/keyboards/handwired/aball/aball.h
@@ -0,0 +1,29 @@
+/* Copyright 2020 Richard Sutherland
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT(k00) {{ KC_NO }}
diff --git a/keyboards/handwired/aball/config.h b/keyboards/handwired/aball/config.h
new file mode 100644
index 0000000000..12f13fb4a8
--- /dev/null
+++ b/keyboards/handwired/aball/config.h
@@ -0,0 +1,35 @@
+/*
+Copyright 2020 Richard Sutherland
+
+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 0xC2F0
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Richard Sutherland
+#define PRODUCT ABall
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 1
+
+#define DIRECT_PINS {{NO_PIN}}
+
+#define ADNS9800_CS_PIN F7
diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/info.json
new file mode 100644
index 0000000000..c8afff6a2b
--- /dev/null
+++ b/keyboards/handwired/aball/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "aball",
+    "url": "https://github.com/brickbots/aball/",
+    "maintainer": "@brickbots",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/aball/keymaps/default/keymap.c b/keyboards/handwired/aball/keymaps/default/keymap.c
new file mode 100644
index 0000000000..00826a0262
--- /dev/null
+++ b/keyboards/handwired/aball/keymaps/default/keymap.c
@@ -0,0 +1,18 @@
+/* Copyright 2020 Richard Sutherland
+ *
+ * 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
+
+
diff --git a/keyboards/handwired/aball/readme.md b/keyboards/handwired/aball/readme.md
new file mode 100644
index 0000000000..96a62d8386
--- /dev/null
+++ b/keyboards/handwired/aball/readme.md
@@ -0,0 +1,14 @@
+# ABall
+
+Your keyboard has plenty of buttons, why do you need more on your pointing device? ABall is a buttonless trackball designed to
+fit nicely next to a kyria, or other keyboard which serves as the mouse buttons. For my use I have left, middle and right mouse
+buttons on a layer along with keys for scroll up and down which I operate with my left hand while my right hand uses the ball for pointing.
+
+* Keyboard Maintainer: [Richard Sutherland](https://github.com/brickbots)
+* Special thanks to the Oddball for doing the heavy lifing with ADNS suport: [atulloh.github.io/oddball](https://atulloh.github.io/oddball)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/aball: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).
diff --git a/keyboards/handwired/aball/rules.mk b/keyboards/handwired/aball/rules.mk
new file mode 100644
index 0000000000..9063957737
--- /dev/null
+++ b/keyboards/handwired/aball/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# Add trackball support
+POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = adns9800

From 6fe3a1af01c937a64c6412bf77672b0608910ea5 Mon Sep 17 00:00:00 2001
From: dnaq <dnaq@users.noreply.github.com>
Date: Sat, 8 Jan 2022 19:44:37 +0100
Subject: [PATCH 161/867] [Keyboard] Fix inverted ploopy trackball (#15790)

---
 keyboards/ploopyco/trackball/config.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h
index ccbb89d5f9..7b0f3faa04 100644
--- a/keyboards/ploopyco/trackball/config.h
+++ b/keyboards/ploopyco/trackball/config.h
@@ -60,3 +60,4 @@
 
 /* PMW3360 Settings */
 #define PMW3360_CS_PIN             B0
+#define POINTING_DEVICE_INVERT_Y

From 1709f3b4300efb9989339c32d295681a8d2d9b4d Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@gmail.com>
Date: Sat, 8 Jan 2022 15:32:27 -0500
Subject: [PATCH 162/867] [Keyboard] Add caps and scroll indicator LEDs to
 andromeda PCB (#15793)

---
 keyboards/ai03/andromeda/config.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/keyboards/ai03/andromeda/config.h b/keyboards/ai03/andromeda/config.h
index e04fb8a56f..f88eb02123 100644
--- a/keyboards/ai03/andromeda/config.h
+++ b/keyboards/ai03/andromeda/config.h
@@ -41,3 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
+
+#define LED_CAPS_LOCK_PIN A2
+#define LED_SCROLL_LOCK_PIN A1
+#define LED_PIN_ON_STATE 0

From 2ad8826b75b70a4cd772874fffab1970103617f9 Mon Sep 17 00:00:00 2001
From: moyi4681 <moyi4681@users.noreply.github.com>
Date: Sun, 9 Jan 2022 04:49:52 +0800
Subject: [PATCH 163/867] [Keyboard] KBDfans KBD67 Mk.II RGB ISO (#14830)

* add kbd67mkiirgb iso keyboard

add kbd67mkiirgb iso keyboard

* Update rules.mk

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/config.h

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk

* Update readme.md

* Update readme.md

* Create info.json

* Update info.json

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c

* Update keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
---
 keyboards/kbdfans/kbd67/mkiirgb_iso/config.h  | 62 +++++++++++++++++++
 keyboards/kbdfans/kbd67/mkiirgb_iso/info.json | 10 +++
 .../mkiirgb_iso/keymaps/default/keymap.c      | 33 ++++++++++
 .../kbd67/mkiirgb_iso/keymaps/via/keymap.c    | 45 ++++++++++++++
 .../kbd67/mkiirgb_iso/keymaps/via/rules.mk    |  2 +
 .../kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c   | 49 +++++++++++++++
 .../kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h   | 33 ++++++++++
 keyboards/kbdfans/kbd67/mkiirgb_iso/readme.md | 18 ++++++
 keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk  | 20 ++++++
 9 files changed, 272 insertions(+)
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/rules.mk
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb_iso/readme.md
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk

diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
new file mode 100644
index 0000000000..04eb32f6f1
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
@@ -0,0 +1,62 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * 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       0x4B42
+#define PRODUCT_ID      0x0105
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    KBDFANS
+#define PRODUCT         KBD67MKIIRGB_ISO
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+#define MATRIX_ROW_PINS { B1, F1, B2, B3, C6 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, B0, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4}
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+#define USB_SUSPEND_WAKEUP_DELAY 5000
+
+
+#define RGB_DI_PIN C7
+#define RGBLED_NUM 68
+#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGBLIGHT_ANIMATIONS
+
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_HUE_STEP 8
+#define RGB_MATRIX_SAT_STEP 8
+#define RGB_MATRIX_VAL_STEP 8
+#define RGB_MATRIX_SPD_STEP 10
+#endif
+
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
new file mode 100644
index 0000000000..b7e40053df
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
@@ -0,0 +1,10 @@
+{
+  "keyboard_name": "kbd67mkiirgb_iso", 
+  "url": "", 
+  "maintainer": "moyi4681", 
+  "layouts": {
+      "LAYOUT_65_iso_blocker": {
+            "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}, {"x":15, "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":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "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}, {"x":15, "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":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"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":13, "y":4}, {"label":"Ctrl", "x":14, "y":4}, {"x":15, "y":4}]
+        }
+  }
+}
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1d13f68f86
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+		[0] = LAYOUT_65_iso_blocker( 
+			KC_ESC, KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
+		    KC_TAB,  KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_ENT, KC_PGUP,
+			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_BSLASH,    KC_PGDN,
+		    KC_LSFT, KC_NUBS, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
+		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,    KC_LEFT,           KC_DOWN,   KC_RIGHT),
+		[1] = LAYOUT_65_iso_blocker( 
+			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, RESET,    KC_PGUP,
+			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
+		    KC_LSFT,    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_VOLU,  KC_MUTE,
+		    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
+};
+
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
new file mode 100644
index 0000000000..390725dd2d
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+		[0] = LAYOUT_65_iso_blocker( 
+			KC_ESC, KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
+		    KC_TAB,  KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_ENT, KC_PGUP,
+			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_BSLASH,    KC_PGDN,
+		    KC_LSFT, KC_NUBS, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
+		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,    KC_LEFT,           KC_DOWN,   KC_RIGHT),
+		[1] = LAYOUT_65_iso_blocker( 
+			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
+		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, RESET,    KC_PGUP,
+			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
+		    KC_LSFT,    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_VOLU,  KC_MUTE,
+		    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
+		[2] = LAYOUT_65_iso_blocker( 
+			KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+		    KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+			KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
+		    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
+		    KC_TRNS,  KC_TRNS,  KC_TRNS,                     KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS),
+		[3] = LAYOUT_65_iso_blocker( 
+			KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+		    KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+			KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
+		    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
+		    KC_TRNS,  KC_TRNS,  KC_TRNS,                     KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS),
+};
+
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
new file mode 100644
index 0000000000..267fa57598
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * 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 "mkiirgb_iso.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = {
+{
+    {  0,  1,  2,  3,  4,      5,  6,      7,       8,      9,  10,  11, 12,    13,  14 },
+    {  28, 27, 26, 25, 24,     23, 22,     21,      20,     19, 18,  17, 16,    42,  15 },
+    {  29, 30, 31, 32, 33,     34, 35,     36,      37,     38, 39,  40, 41,NO_LED,  43 },
+    {  58, 56, 55, 54, 53,     52, 51,     50,      49,     48, 47,  46, NO_LED,45,  44 },
+    {  59, 60, 61, 57, NO_LED, 62, NO_LED, NO_LED,  NO_LED, 63, 64,  65, NO_LED,66,  67 }
+}, {
+    {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0},
+    {224,16},{188,16},{173,16},{158,16},{143,16},{128,16},{113,16},{98,16},{83,16}, {68,16},{53,16},{38,16},{23,16},{4,16},
+    {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{191,32},{206,24},{224,32},
+    {224,48},{210,48},{189,48},{169,48},{154,48},{139,48},{124,48},{109,48},{94,48},{79,48},{64,48},{49,48},{34,48},{21,48},{2,48},
+    {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
+}, {
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 4, 1, 1, 1, 1, 1	
+} };
+
+
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(29, 0xFF, 0xFF, 0xFF);
+    }
+}
+#endif
+
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h
new file mode 100644
index 0000000000..1b84dde21b
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * 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 XXX KC_NO
+#include "quantum.h"
+
+#define LAYOUT_65_iso_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
+    K30, K43, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
+    K40, K41, K42,           K45,                K49, K4A, K4B,      K4D, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
+    { K40, K41, K42, K43, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, XXX, K4D, K4E }  \
+}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/readme.md b/keyboards/kbdfans/kbd67/mkiirgb_iso/readme.md
new file mode 100644
index 0000000000..7673acc580
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/readme.md
@@ -0,0 +1,18 @@
+# KBD67 Mk.II RGB ISO (Hotswap)
+
+A customizable 65% RGB ISO keyboard.
+
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: KBD67 Mk.II RGB ISO
+* Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbdfans/kbd67/mkiirgb_iso: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).
+
+## Bootloader Enter the bootloader in 3 ways:
+* **Bootmagic reset**: Hold down esc in the keyboard then replug
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET`
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
new file mode 100644
index 0000000000..1ca0f90a5f
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = lufa-ms
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
\ No newline at end of file

From 604fca4aa9eff07254a91b21625bfe736f323002 Mon Sep 17 00:00:00 2001
From: "FREEWING.JP" <freewing.jp@gmail.com>
Date: Sun, 9 Jan 2022 06:13:29 +0900
Subject: [PATCH 164/867] [Keyboard] bstk100 handwired (#14158)

* General: Initial commit for bstk100

* bstk100 custom keyboard firmware

* fix Bootloader section

* fix  "Pad 0" key twice

* delete via config

* fix readme.md key layout

* add via keymap

* fix readme.md info

* remove keymap.json

* Suggested change readme.md

* moved to handwired folder

* fix readme.md for handwired

* fix info.json

* Suggested change readme.md

* Update keyboards/handwired/bstk100/rules.mk

fix requested changes

* Update keyboards/handwired/bstk100/rules.mk

fix requested changes

* Update keyboards/handwired/bstk100/info.json

* Update keyboards/handwired/bstk100/rules.mk
---
 keyboards/handwired/bstk100/bstk100.c         |  18 ++
 keyboards/handwired/bstk100/bstk100.h         |  43 +++++
 keyboards/handwired/bstk100/config.h          | 156 ++++++++++++++++++
 keyboards/handwired/bstk100/info.json         |  36 ++++
 .../bstk100/keymaps/default/keymap.c          |  53 ++++++
 .../bstk100/keymaps/default/readme.md         |  26 +++
 .../handwired/bstk100/keymaps/via/keymap.c    |  53 ++++++
 .../handwired/bstk100/keymaps/via/readme.md   |  26 +++
 .../handwired/bstk100/keymaps/via/rules.mk    |   1 +
 keyboards/handwired/bstk100/readme.md         |  35 ++++
 keyboards/handwired/bstk100/rules.mk          |  18 ++
 11 files changed, 465 insertions(+)
 create mode 100644 keyboards/handwired/bstk100/bstk100.c
 create mode 100644 keyboards/handwired/bstk100/bstk100.h
 create mode 100644 keyboards/handwired/bstk100/config.h
 create mode 100644 keyboards/handwired/bstk100/info.json
 create mode 100644 keyboards/handwired/bstk100/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/bstk100/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/bstk100/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/bstk100/keymaps/via/readme.md
 create mode 100644 keyboards/handwired/bstk100/keymaps/via/rules.mk
 create mode 100644 keyboards/handwired/bstk100/readme.md
 create mode 100644 keyboards/handwired/bstk100/rules.mk

diff --git a/keyboards/handwired/bstk100/bstk100.c b/keyboards/handwired/bstk100/bstk100.c
new file mode 100644
index 0000000000..004b97004b
--- /dev/null
+++ b/keyboards/handwired/bstk100/bstk100.c
@@ -0,0 +1,18 @@
+/* Copyright 2021 FREE WING,Y.Sakamoto
+ * http://www.neko.ne.jp/~freewing/
+ *
+ * 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 "bstk100.h"
diff --git a/keyboards/handwired/bstk100/bstk100.h b/keyboards/handwired/bstk100/bstk100.h
new file mode 100644
index 0000000000..42a6da437f
--- /dev/null
+++ b/keyboards/handwired/bstk100/bstk100.h
@@ -0,0 +1,43 @@
+/* Copyright 2021 FREE WING,Y.Sakamoto
+ * http://www.neko.ne.jp/~freewing/
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    k00, \
+    k34, k03, k02, k13, \
+    k10, k11, k12, k01, \
+    k20, k21, k22, k23, \
+    k30, k31, k32, k33, \
+    k40, k41, k43 \
+) { \
+    { k00, k01, k02,   k03, KC_NO }, \
+    { k10, k11, k12,   k13, KC_NO }, \
+    { k20, k21, k22,   k23, KC_NO }, \
+    { k30, k31, k32,   k33, k34   }, \
+    { k40, k41, KC_NO, k43, KC_NO }  \
+}
diff --git a/keyboards/handwired/bstk100/config.h b/keyboards/handwired/bstk100/config.h
new file mode 100644
index 0000000000..6769f9b5c0
--- /dev/null
+++ b/keyboards/handwired/bstk100/config.h
@@ -0,0 +1,156 @@
+/*
+Copyright 2021 FREE WING,Y.Sakamoto
+http://www.neko.ne.jp/~freewing/
+
+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   0xB100
+#define DEVICE_VER   0x0001
+#define MANUFACTURER FREE WING
+#define PRODUCT      bstk100
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 5
+
+/*
+ * 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 { B6, B2, B3, B1, F7 }
+#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+// The state of the indicator pins when the LED is "on" - 1 for high
+#define LED_PIN_ON_STATE 0
+
+#define LED_NUM_LOCK_PIN D4
+#define LED_CAPS_LOCK_PIN D5
+#define LED_SCROLL_LOCK_PIN B0
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/bstk100/info.json b/keyboards/handwired/bstk100/info.json
new file mode 100644
index 0000000000..aec01fccc9
--- /dev/null
+++ b/keyboards/handwired/bstk100/info.json
@@ -0,0 +1,36 @@
+{
+    "keyboard_name": "bstk100",
+    "url": "http://www.neko.ne.jp/~freewing/",
+    "maintainer": "FREE WING",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "k00", "x": 0, "y": 0},
+
+                {"label": "k34", "x": 0, "y": 1},
+                {"label": "k03", "x": 1, "y": 1},
+                {"label": "k02", "x": 2, "y": 1},
+                {"label": "k13", "x": 3, "y": 1},
+
+                {"label": "k10", "x": 0, "y": 2},
+                {"label": "k11", "x": 1, "y": 2},
+                {"label": "k12", "x": 2, "y": 2},
+                {"label": "k01", "x": 3, "y": 2},
+
+                {"label": "k20", "x": 0, "y": 3},
+                {"label": "k21", "x": 1, "y": 3},
+                {"label": "k22", "x": 2, "y": 3},
+                {"label": "k23", "x": 3, "y": 3},
+
+                {"label": "k30", "x": 0, "y": 4},
+                {"label": "k31", "x": 1, "y": 4},
+                {"label": "k32", "x": 2, "y": 4},
+                {"label": "k33", "x": 3, "y": 4, "h": 2},
+
+                {"label": "k40", "x": 0, "y": 5},
+                {"label": "k41", "x": 1, "y": 5},
+                {"label": "k43", "x": 2, "y": 5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/bstk100/keymaps/default/keymap.c b/keyboards/handwired/bstk100/keymaps/default/keymap.c
new file mode 100644
index 0000000000..474921eeab
--- /dev/null
+++ b/keyboards/handwired/bstk100/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 FREE WING,Y.Sakamoto
+ * http://www.neko.ne.jp/~freewing/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    QMK00 = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_NLCK,
+        KC_TAB, KC_PSLS, KC_PAST, KC_BSPC,
+        KC_P7,  KC_P8,   KC_P9,   KC_PMNS,
+        KC_P4,  KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,  KC_P2,   KC_P3,   KC_PENT,
+        KC_P0,  QMK00,   KC_PDOT
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case QMK00:
+            if (record->event.pressed) {
+                // when keycode QMK00 is pressed
+                SEND_STRING(SS_TAP(X_KP_0) SS_TAP(X_KP_0));
+            } else {
+                // when keycode QMK00 is released
+            }
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/handwired/bstk100/keymaps/default/readme.md b/keyboards/handwired/bstk100/keymaps/default/readme.md
new file mode 100644
index 0000000000..15f86c185e
--- /dev/null
+++ b/keyboards/handwired/bstk100/keymaps/default/readme.md
@@ -0,0 +1,26 @@
+# The default keymap for bstk100
+
+```
+                (LED)
+               +----+
+               +NumL+
+               +----+
+
++----+----+----+----+
+|Tab | /  | *  |Back|
+|    |    |    | Spc|
++----+----+----+----+
+|7   |8   |9   |-   |
+|Home|Up  |PgUp|    |
++----+----+----+----+
+|4   |5   |6   |+   |
+|Left|    |Righ|    |
++----+----+----+----+
+|1   |2   |3   |    |
+| End|Down|PgDn|Ent |
++----+----+----|    |
+|0   |00  |.   |    |
+| Ins|    | Del|    |
++----+----+----+----+
+```
+
diff --git a/keyboards/handwired/bstk100/keymaps/via/keymap.c b/keyboards/handwired/bstk100/keymaps/via/keymap.c
new file mode 100644
index 0000000000..474921eeab
--- /dev/null
+++ b/keyboards/handwired/bstk100/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 FREE WING,Y.Sakamoto
+ * http://www.neko.ne.jp/~freewing/
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    QMK00 = SAFE_RANGE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_NLCK,
+        KC_TAB, KC_PSLS, KC_PAST, KC_BSPC,
+        KC_P7,  KC_P8,   KC_P9,   KC_PMNS,
+        KC_P4,  KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,  KC_P2,   KC_P3,   KC_PENT,
+        KC_P0,  QMK00,   KC_PDOT
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case QMK00:
+            if (record->event.pressed) {
+                // when keycode QMK00 is pressed
+                SEND_STRING(SS_TAP(X_KP_0) SS_TAP(X_KP_0));
+            } else {
+                // when keycode QMK00 is released
+            }
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/handwired/bstk100/keymaps/via/readme.md b/keyboards/handwired/bstk100/keymaps/via/readme.md
new file mode 100644
index 0000000000..15f86c185e
--- /dev/null
+++ b/keyboards/handwired/bstk100/keymaps/via/readme.md
@@ -0,0 +1,26 @@
+# The default keymap for bstk100
+
+```
+                (LED)
+               +----+
+               +NumL+
+               +----+
+
++----+----+----+----+
+|Tab | /  | *  |Back|
+|    |    |    | Spc|
++----+----+----+----+
+|7   |8   |9   |-   |
+|Home|Up  |PgUp|    |
++----+----+----+----+
+|4   |5   |6   |+   |
+|Left|    |Righ|    |
++----+----+----+----+
+|1   |2   |3   |    |
+| End|Down|PgDn|Ent |
++----+----+----|    |
+|0   |00  |.   |    |
+| Ins|    | Del|    |
++----+----+----+----+
+```
+
diff --git a/keyboards/handwired/bstk100/keymaps/via/rules.mk b/keyboards/handwired/bstk100/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/handwired/bstk100/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/bstk100/readme.md b/keyboards/handwired/bstk100/readme.md
new file mode 100644
index 0000000000..7247150c48
--- /dev/null
+++ b/keyboards/handwired/bstk100/readme.md
@@ -0,0 +1,35 @@
+# bstk100
+
+BUFFALO USB 10-Key keyboard BSTK100 modification by Pro Micro and QMK firmware .  
+see [[FREE WING HOME PAGE]](http://www.neko.ne.jp/~freewing/) for more detail .  
+
+![bstk100](https://i.imgur.com/9s5kxSB.jpeg)
+![bstk100](https://i.imgur.com/rsilkiy.jpeg)
+![bstk100](https://i.imgur.com/TuQlxat.jpeg)
+![bstk100](https://i.imgur.com/w0g6Qlz.jpeg)
+![bstk100](https://i.imgur.com/ORgbBQh.jpeg)
+![bstk100](https://i.imgur.com/1MDm3zt.png)
+
+* Keyboard Maintainer: [FREE WING GitHub](https://github.com/FREEWING-JP/qmk_firmware)
+* Hardware Supported: Pro Micro ATmega32U4 5V/16MHz
+* Hardware Availability: [BUFFALO USB 10-Key keyboard BSTK100BK](https://amzn.to/389GGtP), [Pro Micro ATmega32U4 5V/16MHz](https://amzn.to/3jePZPi)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/bstk100:default
+
+Enable VIA feature in QMK
+
+    make handwired/bstk100:via
+
+Flashing example for this keyboard:
+
+    make handwired/bstk100:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in one way:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
diff --git a/keyboards/handwired/bstk100/rules.mk b/keyboards/handwired/bstk100/rules.mk
new file mode 100644
index 0000000000..1275531ef6
--- /dev/null
+++ b/keyboards/handwired/bstk100/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 31331e6d33a46d98a3a853bd7fef39f898977386 Mon Sep 17 00:00:00 2001
From: Brandon Claveria <48102030+swiftrax@users.noreply.github.com>
Date: Sat, 8 Jan 2022 13:19:13 -0800
Subject: [PATCH 165/867] [Keyboard] Glacier handwired (#14758)

* finish adding glacier

* change PID

* Update keyboards/handwired/swiftrax/glacier/info.json

* edit info.json

* Update keyboards/handwired/swiftrax/glacier/info.json

* Apply suggestions from code review

* Update keyboards/handwired/swiftrax/glacier/rules.mk
---
 keyboards/handwired/swiftrax/glacier/config.h | 51 +++++++++++++++++++
 .../handwired/swiftrax/glacier/glacier.c      | 18 +++++++
 .../handwired/swiftrax/glacier/glacier.h      | 43 ++++++++++++++++
 .../handwired/swiftrax/glacier/info.json      | 10 ++++
 .../swiftrax/glacier/keymaps/default/keymap.c | 28 ++++++++++
 .../swiftrax/glacier/keymaps/via/keymap.c     | 44 ++++++++++++++++
 .../swiftrax/glacier/keymaps/via/rules.mk     |  1 +
 .../handwired/swiftrax/glacier/readme.md      | 18 +++++++
 keyboards/handwired/swiftrax/glacier/rules.mk | 18 +++++++
 9 files changed, 231 insertions(+)
 create mode 100644 keyboards/handwired/swiftrax/glacier/config.h
 create mode 100644 keyboards/handwired/swiftrax/glacier/glacier.c
 create mode 100644 keyboards/handwired/swiftrax/glacier/glacier.h
 create mode 100644 keyboards/handwired/swiftrax/glacier/info.json
 create mode 100644 keyboards/handwired/swiftrax/glacier/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/swiftrax/glacier/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/swiftrax/glacier/keymaps/via/rules.mk
 create mode 100644 keyboards/handwired/swiftrax/glacier/readme.md
 create mode 100644 keyboards/handwired/swiftrax/glacier/rules.mk

diff --git a/keyboards/handwired/swiftrax/glacier/config.h b/keyboards/handwired/swiftrax/glacier/config.h
new file mode 100644
index 0000000000..b8496d76a1
--- /dev/null
+++ b/keyboards/handwired/swiftrax/glacier/config.h
@@ -0,0 +1,51 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xE890
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Digital Carpentry
+#define PRODUCT         Glacier
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 10
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5, B6, E5, E4, D4, D5, D7, D6 }
+#define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, D0, D1, D2 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/*EEPROM for via*/
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+
+/* RGB */
+#define RGB_DI_PIN B0
+#define RGBLED_NUM 12
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/glacier/glacier.c b/keyboards/handwired/swiftrax/glacier/glacier.c
new file mode 100644
index 0000000000..a30c69ba87
--- /dev/null
+++ b/keyboards/handwired/swiftrax/glacier/glacier.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "glacier.h"
+
diff --git a/keyboards/handwired/swiftrax/glacier/glacier.h b/keyboards/handwired/swiftrax/glacier/glacier.h
new file mode 100644
index 0000000000..1a731ea072
--- /dev/null
+++ b/keyboards/handwired/swiftrax/glacier/glacier.h
@@ -0,0 +1,43 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#define ___ KC_NO
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,      K07,       K17, K08, K18, K09,  \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K78, K27,       K37, K28, K38, K29,  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,      K47,       K57, K48, K58, K49,  \
+    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66,                      K67, K77, K68,       \
+    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95,                K86,       K96, K87, K97, K88,  \
+    KA0, KB0, KA1,                KB3,                     KA4, KB4,      KA5, KB5, KA6,       KB6, KA7        \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, ___ }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, ___ }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49 }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57, K58, ___ }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67, K68, ___ }, \
+    { K70, K71, K72, K73, K74, K75, ___, K77, K78, ___ }, \
+    { K80, K81, K82, K83, K84, K85, K86, K87, K88, ___ }, \
+    { K90, K91, K92, K93, K94, K95, K96, K97, ___, ___ }, \
+    { KA0, KA1, ___, ___, KA4, KA5, KA6, KA7, ___, ___ }, \
+    { KB0, ___, ___, KB3, KB4, KB5, KB6, ___, ___, ___ }  \
+}
diff --git a/keyboards/handwired/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/info.json
new file mode 100644
index 0000000000..f185e9f898
--- /dev/null
+++ b/keyboards/handwired/swiftrax/glacier/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Glacier", 
+    "url": "https://www.github.com/swiftrax", 
+    "maintainer": "swiftrax", 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1.25, "y":0}, {"label":"0,1", "x":2.25, "y":0}, {"label":"1,1", "x":3.25, "y":0}, {"label":"0,2", "x":4.25, "y":0}, {"label":"1,2", "x":5.5, "y":0}, {"label":"0,3", "x":6.5, "y":0}, {"label":"1,3", "x":7.5, "y":0}, {"label":"0,4", "x":8.5, "y":0}, {"label":"1,4", "x":9.75, "y":0}, {"label":"0,5", "x":10.75, "y":0}, {"label":"1,5", "x":11.75, "y":0}, {"label":"0,6", "x":12.75, "y":0}, {"label":"1,6", "x":14, "y":0}, {"label":"0,7", "x":15.25, "y":0}, {"label":"1,7", "x":16.5, "y":0}, {"label":"0,8", "x":17.5, "y":0}, {"label":"1,8", "x":18.5, "y":0}, {"label":"0,9", "x":19.5, "y":0}, {"label":"2,0", "x":0, "y":1.25}, {"label":"3,0", "x":1, "y":1.25}, {"label":"2,1", "x":2, "y":1.25}, {"label":"3,1", "x":3, "y":1.25}, {"label":"2,2", "x":4, "y":1.25}, {"label":"3,2", "x":5, "y":1.25}, {"label":"2,3", "x":6, "y":1.25}, {"label":"3,3", "x":7, "y":1.25}, {"label":"2,4", "x":8, "y":1.25}, {"label":"3,4", "x":9, "y":1.25}, {"label":"2,5", "x":10, "y":1.25}, {"label":"3,5", "x":11, "y":1.25}, {"label":"2,6", "x":12, "y":1.25}, {"label":"3,6", "x":13, "y":1.25}, {"label":"7,8", "x":14, "y":1.25}, {"label":"2,7", "x":15.25, "y":1.25}, {"label":"3,7", "x":16.5, "y":1.25}, {"label":"2,8", "x":17.5, "y":1.25}, {"label":"3,8", "x":18.5, "y":1.25}, {"label":"2,9", "x":19.5, "y":1.25}, {"label":"4,0", "x":0, "y":2.25, "w":1.5}, {"label":"5,0", "x":1.5, "y":2.25}, {"label":"4,1", "x":2.5, "y":2.25}, {"label":"5,1", "x":3.5, "y":2.25}, {"label":"4,2", "x":4.5, "y":2.25}, {"label":"5,2", "x":5.5, "y":2.25}, {"label":"4,3", "x":6.5, "y":2.25}, {"label":"5,3", "x":7.5, "y":2.25}, {"label":"4,4", "x":8.5, "y":2.25}, {"label":"5,4", "x":9.5, "y":2.25}, {"label":"4,5", "x":10.5, "y":2.25}, {"label":"5,5", "x":11.5, "y":2.25}, {"label":"4,6", "x":12.5, "y":2.25}, {"label":"5,6", "x":13.5, "y":2.25, "w":1.5}, {"label":"4,7", "x":15.25, "y":2.25}, {"label":"5,7", "x":16.5, "y":2.25}, {"label":"4,8", "x":17.5, "y":2.25}, {"label":"5,8", "x":18.5, "y":2.25}, {"label":"4,9", "x":19.5, "y":2.25, "h":2}, {"label":"6,0", "x":0, "y":3.25, "w":1.75}, {"label":"7,0", "x":1.75, "y":3.25}, {"label":"6,1", "x":2.75, "y":3.25}, {"label":"7,1", "x":3.75, "y":3.25}, {"label":"6,2", "x":4.75, "y":3.25}, {"label":"7,2", "x":5.75, "y":3.25}, {"label":"6,3", "x":6.75, "y":3.25}, {"label":"7,3", "x":7.75, "y":3.25}, {"label":"6,4", "x":8.75, "y":3.25}, {"label":"7,4", "x":9.75, "y":3.25}, {"label":"6,5", "x":10.75, "y":3.25}, {"label":"7,5", "x":11.75, "y":3.25}, {"label":"6,6", "x":12.75, "y":3.25, "w":2.25}, {"label":"6,7", "x":16.5, "y":3.25}, {"label":"7,7", "x":17.5, "y":3.25}, {"label":"6,8", "x":18.5, "y":3.25}, {"label":"8,0", "x":0, "y":4.25, "w":2.25}, {"label":"9,0", "x":2.25, "y":4.25}, {"label":"8,1", "x":3.25, "y":4.25}, {"label":"9,1", "x":4.25, "y":4.25}, {"label":"8,2", "x":5.25, "y":4.25}, {"label":"9,2", "x":6.25, "y":4.25}, {"label":"8,3", "x":7.25, "y":4.25}, {"label":"9,3", "x":8.25, "y":4.25}, {"label":"8,4", "x":9.25, "y":4.25}, {"label":"9,4", "x":10.25, "y":4.25}, {"label":"8,5", "x":11.25, "y":4.25}, {"label":"9,5", "x":12.25, "y":4.25, "w":1.75}, {"label":"9,6", "x":16.5, "y":4.25}, {"label":"8,7", "x":17.5, "y":4.25}, {"label":"9,7", "x":18.5, "y":4.25}, {"label":"8,8", "x":19.5, "y":4.25, "h":2}, {"label":"8,6", "x":14.25, "y":4.5}, {"label":"10,0", "x":0, "y":5.25, "w":1.25}, {"label":"11,0", "x":1.25, "y":5.25, "w":1.25}, {"label":"10,1", "x":2.5, "y":5.25, "w":1.25}, {"label":"11,3", "x":3.75, "y":5.25, "w":6.25}, {"label":"10,4", "x":10, "y":5.25, "w":1.5}, {"label":"11,4", "x":11.5, "y":5.25, "w":1.5}, {"label":"11,6", "x":16.5, "y":5.25, "w":2}, {"label":"10,7", "x":18.5, "y":5.25}, {"label":"10,5", "x":13.25, "y":5.5}, {"label":"11,5", "x":14.25, "y":5.5}, {"label":"10,6", "x":15.25, "y":5.5}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/glacier/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/glacier/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2c4c5b3ddf
--- /dev/null
+++ b/keyboards/handwired/swiftrax/glacier/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_all(
+      KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_PSCR,            KC_SLCK,   KC_PAUS, KC_HOME, KC_END , KC_DEL ,
+      KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,   KC_INS ,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,            KC_PGUP,   KC_P7  , KC_P8  , KC_P9  , KC_PPLS,
+      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_P4  , KC_P5  , KC_P6  , 
+      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_P1  , KC_P2  , KC_P3  , KC_PENT,
+      KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,                     KC_P0  , KC_PDOT                
+ )
+};
diff --git a/keyboards/handwired/swiftrax/glacier/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/glacier/keymaps/via/keymap.c
new file mode 100644
index 0000000000..50ea5443d0
--- /dev/null
+++ b/keyboards/handwired/swiftrax/glacier/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_all(
+      KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_PSCR,            KC_SLCK,   KC_PAUS, KC_HOME, KC_END , KC_DEL ,
+      KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,   KC_INS ,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,            KC_PGUP,   KC_P7  , KC_P8  , KC_P9  , KC_PPLS,
+      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_P4  , KC_P5  , KC_P6  , 
+      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_P1  , KC_P2  , KC_P3  , KC_PENT,
+      KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,                     KC_P0  , KC_PDOT         
+ ),
+   [1] = LAYOUT_all(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,   _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,   _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,   _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                _______, _______, _______, 
+      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,                     _______, _______, _______, _______,
+      _______, _______, _______,                            _______,                            _______, _______,   _______, _______, _______,                     _______, _______ 
+ ),
+    [2] = LAYOUT_all(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,   _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,   _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,   _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                _______, _______, _______, 
+      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,                     _______, _______, _______, _______,
+      _______, _______, _______,                            _______,                            _______, _______,   _______, _______, _______,                     _______, _______ 
+ )
+};
diff --git a/keyboards/handwired/swiftrax/glacier/keymaps/via/rules.mk b/keyboards/handwired/swiftrax/glacier/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/handwired/swiftrax/glacier/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/glacier/readme.md b/keyboards/handwired/swiftrax/glacier/readme.md
new file mode 100644
index 0000000000..36588e000e
--- /dev/null
+++ b/keyboards/handwired/swiftrax/glacier/readme.md
@@ -0,0 +1,18 @@
+# Glacier
+
+1800 Style Keyboard based on the Austin
+
+* Keyboard Maintainer: Swiftrax
+* Hardware Supported: Glacier
+* Hardware Availability: Glacier PCB
+
+## Bootloader Enter the bootloader in 3 ways:
+ * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+ * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+ * **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+Make example for flashing this keyboard (after setting up your build environment):
+
+    make handwired/swiftrax/glacier:default:flash
+
+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).
diff --git a/keyboards/handwired/swiftrax/glacier/rules.mk b/keyboards/handwired/swiftrax/glacier/rules.mk
new file mode 100644
index 0000000000..b2d6d9e43c
--- /dev/null
+++ b/keyboards/handwired/swiftrax/glacier/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = at90usb1286
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file

From 4c080be8e8fd2d1a7a818022634b08c76ee92e40 Mon Sep 17 00:00:00 2001
From: Andrew Missel <dyindude@users.noreply.github.com>
Date: Sat, 8 Jan 2022 15:22:14 -0600
Subject: [PATCH 166/867] [Keyboard] Bathroom Epiphanies Frosty Flake rev
 20130602 (#15365)

* add optional support for Frosty Flake rev 20130602

* update documentation with instructions on building for rev 20130602

* support revisions using subfolders instead of preprocessor directives

* rules.mk cleanup
---
 .../{frosty_flake.c => 20130602/20130602.c}   |  0
 .../bpiphany/frosty_flake/20130602/matrix.c   | 86 +++++++++++++++++++
 .../bpiphany/frosty_flake/20130602/rules.mk   | 22 +++++
 .../bpiphany/frosty_flake/20140521/20140521.c | 24 ++++++
 .../frosty_flake/{ => 20140521}/matrix.c      |  1 +
 .../bpiphany/frosty_flake/20140521/rules.mk   | 22 +++++
 keyboards/bpiphany/frosty_flake/readme.md     |  8 +-
 keyboards/bpiphany/frosty_flake/rules.mk      | 23 +----
 8 files changed, 162 insertions(+), 24 deletions(-)
 rename keyboards/bpiphany/frosty_flake/{frosty_flake.c => 20130602/20130602.c} (100%)
 create mode 100644 keyboards/bpiphany/frosty_flake/20130602/matrix.c
 create mode 100644 keyboards/bpiphany/frosty_flake/20130602/rules.mk
 create mode 100644 keyboards/bpiphany/frosty_flake/20140521/20140521.c
 rename keyboards/bpiphany/frosty_flake/{ => 20140521}/matrix.c (99%)
 create mode 100644 keyboards/bpiphany/frosty_flake/20140521/rules.mk

diff --git a/keyboards/bpiphany/frosty_flake/frosty_flake.c b/keyboards/bpiphany/frosty_flake/20130602/20130602.c
similarity index 100%
rename from keyboards/bpiphany/frosty_flake/frosty_flake.c
rename to keyboards/bpiphany/frosty_flake/20130602/20130602.c
diff --git a/keyboards/bpiphany/frosty_flake/20130602/matrix.c b/keyboards/bpiphany/frosty_flake/20130602/matrix.c
new file mode 100644
index 0000000000..e0337f9ec2
--- /dev/null
+++ b/keyboards/bpiphany/frosty_flake/20130602/matrix.c
@@ -0,0 +1,86 @@
+/*
+  Copyright 2017 Gabriel Young <gabeplaysdrums@live.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <util/delay.h>
+#include "matrix.h"
+
+
+static matrix_row_t scan_col(void) {
+    // Each of the 8 columns is read off pins as below
+    //   7  6  5  4  3  2  1  0
+    // ,--,--,--,--,--,--,--,--,
+    // |B0|B3|B2|B1|B6|B4|B5|C7|
+    // `--`--`--`--`--`--`--`--`
+    return (
+        (PINC&(1<<2) ? 0 : ((matrix_row_t)1<<0)) |
+        (PIND&(1<<0) ? 0 : ((matrix_row_t)1<<1)) |
+        (PIND&(1<<1) ? 0 : ((matrix_row_t)1<<2)) |
+        (PINC&(1<<7) ? 0 : ((matrix_row_t)1<<3)) |
+        (PIND&(1<<5) ? 0 : ((matrix_row_t)1<<4)) |
+        (PIND&(1<<4) ? 0 : ((matrix_row_t)1<<5)) |
+        (PIND&(1<<2) ? 0 : ((matrix_row_t)1<<6)) |
+        (PIND&(1<<6) ? 0 : ((matrix_row_t)1<<7))
+    );
+}
+
+static void select_row(uint8_t row) {
+    switch (row) {
+        case  0: PORTB = (PORTB & ~0b01111110) | 0b00111010; break;
+        case  1: PORTB = (PORTB & ~0b01111110) | 0b01011000; break;
+        case  2: PORTB = (PORTB & ~0b01111110) | 0b01110000; break;
+        case  3: PORTB = (PORTB & ~0b01111110) | 0b01101110; break;
+        case  4: PORTB = (PORTB & ~0b01111110) | 0b01101100; break;
+        case  5: PORTB = (PORTB & ~0b01111110) | 0b01101010; break;
+        case  6: PORTB = (PORTB & ~0b01111110) | 0b01101000; break;
+        case  7: PORTB = (PORTB & ~0b01111110) | 0b01100100; break;
+        case  8: PORTB = (PORTB & ~0b01111110) | 0b01100000; break;
+        case  9: PORTB = (PORTB & ~0b01111110) | 0b01100010; break;
+        case 10: PORTB = (PORTB & ~0b01111110) | 0b00011010; break;
+        case 11: PORTB = (PORTB & ~0b01111110) | 0b00011000; break;
+        case 12: PORTB = (PORTB & ~0b01111110) | 0b00111100; break;
+        case 13: PORTB = (PORTB & ~0b01111110) | 0b01100110; break;
+        case 14: PORTB = (PORTB & ~0b01111110) | 0b00111000; break;
+        case 15: PORTB = (PORTB & ~0b01111110) | 0b01110010; break;
+        case 16: PORTB = (PORTB & ~0b01111110) | 0b00011110; break;
+        case 17: PORTB = (PORTB & ~0b01111110) | 0b00111110; break;
+    }
+}
+
+void matrix_init_custom(void) {
+    /* Column output pins */
+    DDRB  |=  0b01111110;
+    /* Row input pins */
+    DDRC  &= ~0b10000100;
+    DDRD  &= ~0b01110111;
+    PORTC |=  0b10000100;
+    PORTD |=  0b01110111;
+}
+
+// matrix is 18 uint8_t.
+// we select the row (one of 18), then read the column
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+	bool has_changed = false;
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        matrix_row_t orig = current_matrix[row];
+        select_row(row);
+        _delay_us(3);
+        current_matrix[row] = scan_col();
+        has_changed |= (orig != current_matrix[row]);
+    }
+
+    return has_changed;
+}
diff --git a/keyboards/bpiphany/frosty_flake/20130602/rules.mk b/keyboards/bpiphany/frosty_flake/20130602/rules.mk
new file mode 100644
index 0000000000..dc435a332f
--- /dev/null
+++ b/keyboards/bpiphany/frosty_flake/20130602/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+
+CUSTOM_MATRIX = lite
+SRC += 20130602/matrix.c
+
+LAYOUTS = tkl_ansi
diff --git a/keyboards/bpiphany/frosty_flake/20140521/20140521.c b/keyboards/bpiphany/frosty_flake/20140521/20140521.c
new file mode 100644
index 0000000000..cd425cffa1
--- /dev/null
+++ b/keyboards/bpiphany/frosty_flake/20140521/20140521.c
@@ -0,0 +1,24 @@
+#include "frosty_flake.h"
+
+void keyboard_pre_init_kb() {
+    setPinOutput(B7); // num lock
+    writePinHigh(B7);
+    setPinOutput(C5); // caps lock
+    writePinHigh(C7);
+    setPinOutput(C6); // scroll lock
+    writePinHigh(C6);
+
+    keyboard_pre_init_user();
+}
+
+bool led_update_kb(led_t usb_led) {
+    // user requests no further processing
+    if (!led_update_user(usb_led))
+        return true;
+
+    writePin(B7, !usb_led.caps_lock);
+    writePin(C5, !usb_led.num_lock);
+    writePin(C6, !usb_led.scroll_lock);
+
+    return true;
+}
diff --git a/keyboards/bpiphany/frosty_flake/matrix.c b/keyboards/bpiphany/frosty_flake/20140521/matrix.c
similarity index 99%
rename from keyboards/bpiphany/frosty_flake/matrix.c
rename to keyboards/bpiphany/frosty_flake/20140521/matrix.c
index 4517c7af5b..24c7617b19 100644
--- a/keyboards/bpiphany/frosty_flake/matrix.c
+++ b/keyboards/bpiphany/frosty_flake/20140521/matrix.c
@@ -18,6 +18,7 @@
 #include <util/delay.h>
 #include "matrix.h"
 
+
 static matrix_row_t scan_col(void) {
     // Each of the 8 columns is read off pins as below
     //   7  6  5  4  3  2  1  0
diff --git a/keyboards/bpiphany/frosty_flake/20140521/rules.mk b/keyboards/bpiphany/frosty_flake/20140521/rules.mk
new file mode 100644
index 0000000000..035e59f911
--- /dev/null
+++ b/keyboards/bpiphany/frosty_flake/20140521/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+
+CUSTOM_MATRIX = lite
+SRC += 20140521/matrix.c
+
+LAYOUTS = tkl_ansi
diff --git a/keyboards/bpiphany/frosty_flake/readme.md b/keyboards/bpiphany/frosty_flake/readme.md
index 5917022a88..7c64085182 100644
--- a/keyboards/bpiphany/frosty_flake/readme.md
+++ b/keyboards/bpiphany/frosty_flake/readme.md
@@ -1,7 +1,7 @@
 # Frosty Flake Controller
 
-This is the firmware for Rev. 20140521 of the Frosty Flake controller
-by [Bathroom Epiphanies](http://bathroomepiphanies.com/controllers/),
+This is the firmware for the Frosty Flake controller by
+[Bathroom Epiphanies](http://bathroomepiphanies.com/controllers/),
 a replacement controller for the [Cooler Master Quick Fire
 Rapid](http://www.coolermaster.com/peripheral/keyboards/quickfirerapid/).
 
@@ -11,6 +11,10 @@ but has been cleaned up to match the
 [schematic](https://deskthority.net/wiki/File:Frosty_Flake_Schematics.pdf)
 and gone through some minor refactoring for QMK.
 
+## Revision support
+There are two revisions of this controller. 20140521 is built by default.
+If you need to build for 20130602, it can be built with `make bpiphany/frosty_flake/20130602`
+
 ## 104 and 87 layout support
 
 Support for both 104 key and 87 key layouts is provided. See the
diff --git a/keyboards/bpiphany/frosty_flake/rules.mk b/keyboards/bpiphany/frosty_flake/rules.mk
index 38e02ec185..e5402b32f7 100644
--- a/keyboards/bpiphany/frosty_flake/rules.mk
+++ b/keyboards/bpiphany/frosty_flake/rules.mk
@@ -1,22 +1 @@
-# MCU name
-MCU = atmega32u2
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-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
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
-CUSTOM_MATRIX = lite
-SRC += matrix.c
-
-LAYOUTS = tkl_ansi
+DEFAULT_FOLDER=bpiphany/frosty_flake/20140521

From a461f607e781a4698d41dddddb467be90835b36a Mon Sep 17 00:00:00 2001
From: x1 <viva008@gmail.com>
Date: Sun, 9 Jan 2022 06:23:34 +0900
Subject: [PATCH 167/867] [Keyboard] Add Kudox Full (#15256)

* Add Kudox Full keyboard

* Add keyboards/kudox_full SPDX identifier

* Modify rule.mk of keyboards/kudox_full

* Remove html code from README of keyboards/kudox_full

* Modify readme of keyboards/kudox_full

* rev1.c includes rev1.h - kudox-full/rev1

* Move to <keyboard>.c oled_task_user and eeconfig_init_user

* Move post_config.h MOUSEKEY_*

* Change BOOTMAGIC_ENABLE no kudox_full

* Modify the obsoleted codes

* Modify eeconfig_init_kb from eeconfig_init_user

* Set none as default, but values

* Add about the bootloader on kudox_full/readme

* Modify the comments in keyboards/kudox_full/rules.mk
---
 keyboards/kudox_full/config.h                 | 13 +++
 keyboards/kudox_full/keymaps/default/keymap.c | 86 +++++++++++++++++++
 keyboards/kudox_full/keymaps/jis/keymap.c     | 84 ++++++++++++++++++
 keyboards/kudox_full/keymaps/via/keymap.c     | 76 ++++++++++++++++
 keyboards/kudox_full/keymaps/via/rules.mk     |  3 +
 keyboards/kudox_full/kudox_full.c             | 41 +++++++++
 keyboards/kudox_full/kudox_full.h             | 10 +++
 keyboards/kudox_full/post_config.h            | 20 +++++
 keyboards/kudox_full/readme.md                | 32 +++++++
 keyboards/kudox_full/rev1/config.h            | 77 +++++++++++++++++
 keyboards/kudox_full/rev1/info.json           | 83 ++++++++++++++++++
 keyboards/kudox_full/rev1/rev1.c              |  4 +
 keyboards/kudox_full/rev1/rev1.h              | 26 ++++++
 keyboards/kudox_full/rev1/rules.mk            |  1 +
 keyboards/kudox_full/rules.mk                 | 24 ++++++
 15 files changed, 580 insertions(+)
 create mode 100644 keyboards/kudox_full/config.h
 create mode 100644 keyboards/kudox_full/keymaps/default/keymap.c
 create mode 100644 keyboards/kudox_full/keymaps/jis/keymap.c
 create mode 100644 keyboards/kudox_full/keymaps/via/keymap.c
 create mode 100644 keyboards/kudox_full/keymaps/via/rules.mk
 create mode 100644 keyboards/kudox_full/kudox_full.c
 create mode 100644 keyboards/kudox_full/kudox_full.h
 create mode 100644 keyboards/kudox_full/post_config.h
 create mode 100644 keyboards/kudox_full/readme.md
 create mode 100644 keyboards/kudox_full/rev1/config.h
 create mode 100644 keyboards/kudox_full/rev1/info.json
 create mode 100644 keyboards/kudox_full/rev1/rev1.c
 create mode 100644 keyboards/kudox_full/rev1/rev1.h
 create mode 100644 keyboards/kudox_full/rev1/rules.mk
 create mode 100644 keyboards/kudox_full/rules.mk

diff --git a/keyboards/kudox_full/config.h b/keyboards/kudox_full/config.h
new file mode 100644
index 0000000000..82b8da8a41
--- /dev/null
+++ b/keyboards/kudox_full/config.h
@@ -0,0 +1,13 @@
+// Copyright 2021 Kumao Kobo (@kumaokobo)
+// SPDX-License-Identifier: GPL-2.0+
+
+#pragma once
+
+#include "config_common.h"
+
+#define USE_SERIAL
+
+/* Select hand configuration */
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+
diff --git a/keyboards/kudox_full/keymaps/default/keymap.c b/keyboards/kudox_full/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8d16262b59
--- /dev/null
+++ b/keyboards/kudox_full/keymaps/default/keymap.c
@@ -0,0 +1,86 @@
+// Copyright 2021 Kumao Kobo (@kumaokobo)
+// SPDX-License-Identifier: GPL-2.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.
+enum layer_number {
+  _BASE,
+  _FN1,
+  _FN2,
+  _FN3,
+};
+
+// Shortcut to make keymap more readable
+#define LT_AESC LALT_T(KC_ESC)
+#define LT_ALN1 LALT_T(KC_LANG1)
+#define LT_ALN2 LALT_T(KC_LANG2)
+#define LT_GENT LGUI_T(KC_ENT)
+#define LT_GSPC LGUI_T(KC_SPC)
+#define LT_F1F  LT(_FN1, KC_F)
+#define LT_F2J  LT(_FN1, KC_J)
+#define LT_F2DL LT(_FN2, KC_DEL)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_ESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_6    ,                 KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_MINS ,KC_EQL  ,KC_BSPC ,KC_DEL  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_GRV  ,                          KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_LBRC ,KC_RBRC ,KC_BSLS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,LT_F1F  ,KC_G,                                       KC_H    ,LT_F2J  ,KC_K    ,KC_L    ,KC_SCLN ,KC_QUOT ,KC_ENT  ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                          KC_UP   ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,KC_RSFT ,KC_UP   ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+     LT_AESC ,MO(_FN3),LT_F2DL ,LT_ALN2 ,LT_GENT ,KC_SPC  ,                          KC_DOWN ,LT_GSPC ,LT_ALN1 ,                           KC_LEFT ,KC_DOWN ,KC_RIGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
+  ),
+
+  [_FN1] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_GRV  ,KC_EXLM ,KC_AT   ,KC_HASH ,KC_DLR  ,KC_PERC ,KC_CIRC ,                 KC_CIRC ,KC_AMPR ,KC_ASTR ,KC_LPRN ,KC_RPRN ,KC_UNDS ,KC_PLUS ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_DQUO ,KC_QUOT ,KC_HASH ,KC_ASTR ,KC_PLUS ,KC_TILD ,                          KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_LCBR ,KC_RCBR ,KC_PIPE ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_COLN ,KC_DQT  ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
+     _______ ,_______ ,_______ ,KC_COMM ,KC_DOT  ,KC_SLSH ,                          KC_UNDS ,KC_LCBR ,KC_RCBR ,KC_LT   ,KC_GT   ,KC_QUES ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,                           _______ ,_______ ,_______
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
+  ),
+
+  [_FN2] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_GRV  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F6   ,                 KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,KC_F12  ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_DQUO ,KC_QUOT ,KC_HASH ,KC_ASTR ,KC_PLUS ,KC_TILD ,                          KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_SLSH ,KC_JYEN ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   KC_LBRC ,_______ ,KC_DOT  ,KC_SLSH ,KC_MINS ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
+     _______ ,_______ ,_______ ,KC_COMM ,KC_DOT  ,KC_SLSH ,                          _______ ,KC_LCBR ,KC_RCBR ,KC_SLSH ,KC_MINS ,KC_UNDS ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,                           _______ ,_______ ,_______
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
+  ),
+
+  [_FN3] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     _______ ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,                 RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                   _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
+     RGB_M_X ,RGB_M_K ,RGB_M_SN,RGB_M_B ,RGB_M_R ,RGB_M_SW,                          RGB_M_SW,RGB_M_R ,RGB_M_B ,RGB_M_SN,RGB_M_K ,RGB_M_X ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,MO(_BASE),RGB_MOD ,RGB_TOG ,                         RGB_TOG ,RGB_MOD ,MO(_BASE),                          _______ ,_______ ,_______
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
+  )
+
+};
diff --git a/keyboards/kudox_full/keymaps/jis/keymap.c b/keyboards/kudox_full/keymaps/jis/keymap.c
new file mode 100644
index 0000000000..5baa7d14d4
--- /dev/null
+++ b/keyboards/kudox_full/keymaps/jis/keymap.c
@@ -0,0 +1,84 @@
+// Copyright 2021 Kumao Kobo (@kumaokobo)
+// SPDX-License-Identifier: GPL-2.0+
+
+#include QMK_KEYBOARD_H
+#include"keymap_jp.h"
+
+
+enum layer_number {
+  _BASE,
+  _FN1,
+  _FN2,
+  _FN3,
+};
+
+// Shortcut to make keymap more readable
+#define LT_AESC LALT_T(KC_ESC)
+#define LT_ALN1 LALT_T(JP_HENK)
+#define LT_ALN2 LALT_T(JP_MHEN)
+#define LT_GENT LGUI_T(KC_ENT)
+#define LT_GSPC LGUI_T(KC_SPC)
+#define LT_F1F  LT(_FN1, KC_F)
+#define LT_F2J  LT(_FN1, KC_J)
+#define LT_F2DL LT(_FN2, KC_DEL)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     JP_ZKHK ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_6    ,                 KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,JP_MINS ,JP_CIRC ,JP_YEN  ,KC_BSPC ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_ESC  ,                          KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,JP_AT   ,JP_LBRC ,KC_DEL  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,LT_F1F  ,KC_G,                                       KC_H    ,LT_F2J  ,KC_K    ,KC_L    ,JP_SCLN ,JP_COLN ,JP_RBRC ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                          KC_UP   ,KC_N    ,KC_M    ,JP_COMM ,JP_DOT  ,JP_SLSH ,JP_BSLS ,KC_RSFT ,KC_UP   ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+     LT_AESC ,MO(_FN3),LT_F2DL ,LT_ALN2 ,LT_GENT ,KC_SPC  ,                          KC_DOWN ,LT_GSPC ,LT_ALN1 ,                           KC_LEFT ,KC_DOWN ,KC_RIGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
+  ),
+
+  [_FN1] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     _______ ,JP_EXLM ,JP_DQUO ,JP_HASH ,JP_DLR  ,JP_PERC ,JP_AMPR ,                 JP_AMPR ,JP_QUOT ,JP_LPRN ,JP_RPRN ,_______ ,JP_EQL  ,JP_TILD ,JP_PIPE ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,JP_DQUO ,JP_QUOT ,JP_HASH ,JP_ASTR ,JP_PLUS ,JP_CIRC ,                          JP_LPRN ,JP_RPRN ,JP_PIPE ,JP_ASTR ,JP_TILD ,JP_GRV  ,JP_LCBR ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,JP_AT   ,JP_COLN ,JP_GRV  ,_______ ,JP_MINS ,                                   JP_LBRC ,JP_RBRC ,JP_DOT  ,JP_SLSH ,JP_PLUS ,JP_ASTR ,JP_RCBR ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
+     _______ ,_______ ,_______ ,JP_COMM ,JP_DOT  ,JP_SLSH ,                          JP_UNDS ,JP_LCBR ,JP_RCBR ,JP_LABK ,JP_RABK ,JP_QUES ,JP_UNDS ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,                           _______ ,_______ ,_______
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
+  ),
+
+  [_FN2] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     _______ ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F6   ,                 KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,KC_F12  ,KC_DEL  ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,JP_DQUO ,JP_QUOT ,JP_HASH ,JP_ASTR ,JP_PLUS ,JP_CIRC ,                          JP_LPRN ,JP_RPRN ,JP_PIPE ,JP_ASTR ,JP_TILD ,JP_GRV  ,JP_LCBR ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,JP_AT   ,JP_COLN ,JP_GRV  ,_______ ,JP_MINS ,                                   JP_LBRC ,_______ ,JP_DOT  ,JP_SLSH ,JP_PLUS ,JP_ASTR ,JP_RCBR ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
+     _______ ,_______ ,_______ ,JP_COMM ,JP_DOT  ,JP_SLSH ,                          _______ ,JP_LCBR ,JP_RCBR ,JP_SLSH ,JP_MINS ,JP_UNDS ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,                           _______ ,_______ ,_______
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
+  ),
+
+  [_FN3] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     _______ ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,                 RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                   _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,MO(_BASE),RGB_MOD ,RGB_TOG ,                         RGB_TOG ,RGB_MOD ,MO(_BASE),                          _______ ,_______ ,_______
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
+  )
+
+};
diff --git a/keyboards/kudox_full/keymaps/via/keymap.c b/keyboards/kudox_full/keymaps/via/keymap.c
new file mode 100644
index 0000000000..707152affa
--- /dev/null
+++ b/keyboards/kudox_full/keymaps/via/keymap.c
@@ -0,0 +1,76 @@
+// Copyright 2021 Kumao Kobo (@kumaokobo)
+// SPDX-License-Identifier: GPL-2.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.
+enum layer_number {
+  _BASE,
+  _FN1,
+  _FN2,
+  _FN3,
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_ESC  ,KC_1    ,KC_2    ,KC_3    ,KC_4    ,KC_5    ,KC_6    ,                 KC_6    ,KC_7    ,KC_8    ,KC_9    ,KC_0    ,KC_MINS ,KC_EQL  ,KC_BSPC ,KC_DEL  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB  ,KC_Q    ,KC_W    ,KC_E    ,KC_R    ,KC_T    ,KC_GRV  ,                          KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_LBRC ,KC_RBRC ,KC_BSLS ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,LT(_FN1,KC_F),KC_G,                                  KC_H    ,LT(_FN1,KC_J),KC_K,KC_L   ,KC_SCLN ,KC_QUOT ,KC_ENT  ,KC_ENT  ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
+     KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,                          KC_UP   ,KC_N    ,KC_M    ,KC_COMM ,KC_DOT  ,KC_SLSH ,KC_RSFT ,KC_RSFT ,KC_UP   ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+     LALT_T(KC_ESC),MO(_FN3),LT(_FN2,KC_DEL),LALT_T(KC_LANG2),LGUI_T(KC_ENT),KC_SPC, KC_DOWN,LGUI_T(KC_SPC),LALT_T(KC_LANG1),              KC_LEFT ,KC_DOWN ,KC_RIGHT
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
+  ),
+
+  [_FN1] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_GRV  ,KC_EXLM ,KC_AT   ,KC_HASH ,KC_DLR  ,KC_PERC ,KC_CIRC ,                 KC_CIRC ,KC_AMPR ,KC_ASTR ,KC_LPRN ,KC_RPRN ,KC_UNDS ,KC_PLUS ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_DQUO ,KC_QUOT ,KC_HASH ,KC_ASTR ,KC_PLUS ,KC_TILD ,                          KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_LCBR ,KC_RCBR ,KC_PIPE ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   KC_LBRC ,KC_RBRC ,KC_DOT  ,KC_SLSH ,KC_COLN ,KC_DQT  ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
+     _______ ,_______ ,_______ ,KC_COMM ,KC_DOT  ,KC_SLSH ,                          KC_UNDS ,KC_LCBR ,KC_RCBR ,KC_LT   ,KC_GT   ,KC_QUES ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,                           _______ ,_______ ,_______
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
+  ),
+
+  [_FN2] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_GRV  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_F6   ,                 KC_F6   ,KC_F7   ,KC_F8   ,KC_F9   ,KC_F10  ,KC_F11  ,KC_F12  ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_DQUO ,KC_QUOT ,KC_HASH ,KC_ASTR ,KC_PLUS ,KC_TILD ,                          KC_LPRN ,KC_RPRN ,KC_PIPE ,KC_ASTR ,KC_TILD ,KC_CIRC ,KC_SLSH ,KC_JYEN ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,KC_AT   ,KC_COLN ,KC_GRV  ,_______ ,KC_MINS ,                                   KC_LBRC ,_______ ,KC_DOT  ,KC_SLSH ,KC_MINS ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
+     _______ ,_______ ,_______ ,KC_COMM ,KC_DOT  ,KC_SLSH ,                          _______ ,KC_LCBR ,KC_RCBR ,KC_SLSH ,KC_MINS ,KC_UNDS ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,                           _______ ,_______ ,_______
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
+  ),
+
+  [_FN3] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐                ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     _______ ,RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,                 RGB_HUI ,RGB_HUD ,RGB_SAI ,RGB_SAD ,RGB_VAI ,RGB_VAD ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                └────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                          _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┘                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,                                   _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┤                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┘
+     RGB_M_X ,RGB_M_K ,RGB_M_SN,RGB_M_B ,RGB_M_R ,RGB_M_SW,                          RGB_M_SW,RGB_M_R ,RGB_M_B ,RGB_M_SN,RGB_M_K ,RGB_M_X ,_______ ,_______ ,_______ ,
+  //├────────┼────────┼────────┼────────┼────────┼────────┐                         ├────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+     _______ ,_______ ,_______ ,MO(_BASE),RGB_MOD ,RGB_TOG ,                         RGB_TOG ,RGB_MOD ,MO(_BASE),                          _______ ,_______ ,_______
+  //└────────┴────────┴────────┴────────┴────────┴────────┘                         └────────┴────────┴────────┘                          └────────┴────────┴────────┘
+  )
+
+};
diff --git a/keyboards/kudox_full/keymaps/via/rules.mk b/keyboards/kudox_full/keymaps/via/rules.mk
new file mode 100644
index 0000000000..21b1b8d0ce
--- /dev/null
+++ b/keyboards/kudox_full/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
+UNICODE_ENABLE = no
diff --git a/keyboards/kudox_full/kudox_full.c b/keyboards/kudox_full/kudox_full.c
new file mode 100644
index 0000000000..d5ab31fc15
--- /dev/null
+++ b/keyboards/kudox_full/kudox_full.c
@@ -0,0 +1,41 @@
+// Copyright 2021 Kumao Kobo (@kumaokobo)
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "kudox_full.h"
+
+#ifdef RGBLIGHT_ENABLE
+void eeconfig_init_kb(void) {
+    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL);
+};
+#endif
+
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+    // Host Keyboard Layer Status
+    oled_write_ln_P(PSTR("Kudox Keyboard"), false);
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_ln_P(PSTR("\n"), false);
+            break;
+        case 1:
+            oled_write_ln_P(PSTR("\nLayer: Symbol"), false);
+            break;
+        case 2:
+            oled_write_ln_P(PSTR("\nLayer: Function"), false);
+            break;
+        case 3:
+            oled_write_ln_P(PSTR("\nLayer: Light"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("\nLayer: Undefined"), false);
+    }
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+    return true;
+}
+#endif
diff --git a/keyboards/kudox_full/kudox_full.h b/keyboards/kudox_full/kudox_full.h
new file mode 100644
index 0000000000..78a4dcb474
--- /dev/null
+++ b/keyboards/kudox_full/kudox_full.h
@@ -0,0 +1,10 @@
+// Copyright 2021 Kumao Kobo (@kumaokobo)
+// SPDX-License-Identifier: GPL-2.0+
+
+#pragma once
+
+#ifdef KEYBOARD_kudox_full_rev1
+    #include "rev1.h"
+#endif
+
+#include "quantum.h"
diff --git a/keyboards/kudox_full/post_config.h b/keyboards/kudox_full/post_config.h
new file mode 100644
index 0000000000..eb26f369c3
--- /dev/null
+++ b/keyboards/kudox_full/post_config.h
@@ -0,0 +1,20 @@
+// Copyright 2021 Kumao Kobo (@kumaokobo)
+// SPDX-License-Identifier: GPL-2.0+
+
+#pragma once
+
+#ifndef MOUSEKEY_INTERVAL
+#    define MOUSEKEY_INTERVAL       20
+#endif
+#ifndef MOUSEKEY_DELAY
+#    define MOUSEKEY_DELAY          0
+#endif
+#ifndef MOUSEKEY_TIME_TO_MAX
+#    define MOUSEKEY_TIME_TO_MAX    60
+#endif
+#ifndef MOUSEKEY_MAX_SPEED
+#    define MOUSEKEY_MAX_SPEED      7
+#endif
+#ifndef MOUSEKEY_WHEEL_DELAY
+#    define MOUSEKEY_WHEEL_DELAY    0
+#endif
diff --git a/keyboards/kudox_full/readme.md b/keyboards/kudox_full/readme.md
new file mode 100644
index 0000000000..185a1394d4
--- /dev/null
+++ b/keyboards/kudox_full/readme.md
@@ -0,0 +1,32 @@
+# The Kudox Full keyboard
+
+![Kudox logo](https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox.png)
+
+![Kudox Full image2](https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-full-image2.jpg) | ![Kudox Full image1](https://raw.githubusercontent.com/kumaokobo/kudox-keyboard/master/img/kudox-full-image1.jpg)
+:----:|:-----:
+ front | angle
+
+- Keyboard Maintainer: [Kumao Kobo](https://github.com/kumaokobo)
+- Hardware Supported: Kudox Full PCB rev1.0 w/ Pro Micro
+- Assembly guide: [Kudox Full/README](https://github.com/kumaokobo/kudox-keyboard/blob/master/kudox-full/README.md)
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+## Building Firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kudox_full/rev1:default
+
+
+Flashing example for this keyboard:
+
+    make kudox_full/rev1:default:flash
+
+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).
diff --git a/keyboards/kudox_full/rev1/config.h b/keyboards/kudox_full/rev1/config.h
new file mode 100644
index 0000000000..46d680e442
--- /dev/null
+++ b/keyboards/kudox_full/rev1/config.h
@@ -0,0 +1,77 @@
+// Copyright 2021 Kumao Kobo (@kumaokobo)
+// SPDX-License-Identifier: GPL-2.0+
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xABBA
+#define PRODUCT_ID      0x9693
+#define DEVICE_VER      0x0100
+#define MANUFACTURER    Kumao Kobo
+#define PRODUCT         The Kudox Full Keyboard
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 9
+
+// wiring of each half
+#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D4 }
+// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+// #define BACKLIGHT_LEVELS 3
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D2
+
+/* 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 D3
+
+#undef RGBLED_NUM
+#define RGBLED_NUM 14    // Number of LEDs
+#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_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+// #define NO_DEBUG
+
+/* disable print */
+// #define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/kudox_full/rev1/info.json b/keyboards/kudox_full/rev1/info.json
new file mode 100644
index 0000000000..7dfbf7c4e9
--- /dev/null
+++ b/keyboards/kudox_full/rev1/info.json
@@ -0,0 +1,83 @@
+{
+    "url": "http://kumaokobo.com/",
+    "maintainer": "Kumao Kobo",
+    "keyboard_name": "Kudox Full Keyboard Rev1",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1", "x":1, "y":0},
+                {"label":"2", "x":2, "y":0},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0},
+                {"label":"5", "x":5, "y":0},
+                {"label":"6", "x":6, "y":0},
+                {"label":"6", "x":9, "y":0},
+                {"label":"7", "x":10, "y":0},
+                {"label":"8", "x":11, "y":0},
+                {"label":"9", "x":12, "y":0},
+                {"label":"0", "x":13, "y":0},
+                {"label":"-", "x":14, "y":0},
+                {"label":"=", "x":15, "y":0},
+                {"label":"\u2190", "x":16, "y":0},
+                {"label":"Del", "x":17, "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":"`", "x":6.5, "y":1},
+                {"label":"Y", "x":9.5, "y":1},
+                {"label":"U", "x":10.5, "y":1},
+                {"label":"I", "x":11.5, "y":1},
+                {"label":"O", "x":12.5, "y":1},
+                {"label":"P", "x":13.5, "y":1},
+                {"label":"[", "x":14.5, "y":1},
+                {"label":"]", "x":15.5, "y":1},
+                {"label":"\\", "x":16.5, "y":1, "w":1.5},
+                {"label":"Ctrl", "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":9.75, "y":2},
+                {"label":"J", "x":10.75, "y":2},
+                {"label":"K", "x":11.75, "y":2},
+                {"label":"L", "x":12.75, "y":2},
+                {"label":";", "x":13.75, "y":2},
+                {"label":"'", "x":14.75, "y":2},
+                {"label":"Enter", "x":15.75, "y":2},
+                {"label":"Enter", "x":17, "y":2},
+                {"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":"\u2191", "x":9.25, "y":3},
+                {"label":"N", "x":10.25, "y":3},
+                {"label":"M", "x":11.25, "y":3},
+                {"label":",", "x":12.25, "y":3},
+                {"label":".", "x":13.25, "y":3},
+                {"label":"/", "x":14.25, "y":3},
+                {"label":"Shift", "x":15.25, "y":3},
+                {"label":"Shift", "x":16.25, "y":3},
+                {"label":"\u2191", "x":17.5, "y":3},
+                {"label":"Alt", "x":0, "y":4, "w":1.25},
+                {"label":"Layer3", "x":1.5, "y":4},
+                {"label":"Layer2", "x":2.5, "y":4},
+                {"label":"Alt", "x":3.5, "y":4, "w":1.25},
+                {"label":"GUI", "x":5, "y":4, "w":1.25},
+                {"label":" ", "x":6.25, "y":4},
+                {"label":"\u2193", "x":9, "y":4},
+                {"label":"GUI", "x":10, "y":4},
+                {"label":"Alt", "x":11, "y":4, "w":1.25},
+                {"label":"\u2190", "x":16, "y":4},
+                {"label":"\u2193", "x":17, "y":4},
+                {"label":"\u2192", "x":18, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kudox_full/rev1/rev1.c b/keyboards/kudox_full/rev1/rev1.c
new file mode 100644
index 0000000000..8dfb941ba2
--- /dev/null
+++ b/keyboards/kudox_full/rev1/rev1.c
@@ -0,0 +1,4 @@
+// Copyright 2021 Kumao Kobo (@kumaokobo)
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "rev1.h"
diff --git a/keyboards/kudox_full/rev1/rev1.h b/keyboards/kudox_full/rev1/rev1.h
new file mode 100644
index 0000000000..686941117e
--- /dev/null
+++ b/keyboards/kudox_full/rev1/rev1.h
@@ -0,0 +1,26 @@
+// Copyright 2021 Kumao Kobo (@kumaokobo)
+// SPDX-License-Identifier: GPL-2.0+
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+  L00, L01, L02, L03, L04, L05, L06,            R00, R01, R02, R03, R04, R05, R06, R07, R08, \
+  L10, L11, L12, L13, L14, L15, L16,            R10, R11, R12, R13, R14, R15, R16, R17,      \
+  L20, L21, L22, L23, L24, L25,                 R20, R21, R22, R23, R24, R25, R26, R27,      \
+  L30, L31, L32, L33, L34, L35,                 R30, R31, R32, R33, R34, R35, R36, R37, R38, \
+  L40, L41, L42, L43, L44, L45,                 R40, R41, R42,                R46, R47, R48  \
+) \
+{ \
+    { L00,   L01,   L02,   L03,   L04,   L05,   L06 }, \
+    { L10,   L11,   L12,   L13,   L14,   L15,   L16 }, \
+    { L20,   L21,   L22,   L23,   L24,   L25    }, \
+    { L30,   L31,   L32,   L33,   L34,   L35    }, \
+    { L40,   L41,   L42,   L43,   L44,   L45    }, \
+    { R00,   R01,   R02,   R03,   R04,   R05,   R06,   R07,   R08 }, \
+    { R10,   R11,   R12,   R13,   R14,   R15,   R16,   R17    }, \
+    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   R27    }, \
+    { R30,   R31,   R32,   R33,   R34,   R35,   R36,   R37,   R38 }, \
+    { R40,   R41,   R42,   KC_NO, KC_NO, KC_NO, R46,   R47,   R48 } \
+}
diff --git a/keyboards/kudox_full/rev1/rules.mk b/keyboards/kudox_full/rev1/rules.mk
new file mode 100644
index 0000000000..dd68e9d3b0
--- /dev/null
+++ b/keyboards/kudox_full/rev1/rules.mk
@@ -0,0 +1 @@
+OLED_ENABLE = yes
diff --git a/keyboards/kudox_full/rules.mk b/keyboards/kudox_full/rules.mk
new file mode 100644
index 0000000000..57aa49a6d8
--- /dev/null
+++ b/keyboards/kudox_full/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = yes        # Unicode
+
+SPLIT_KEYBOARD = yes
+
+DEFAULT_FOLDER = kudox_full/rev1

From 4b0aa1a2af5934aad40c21ceb9f83cf6b5034d5b Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 8 Jan 2022 16:12:37 -0800
Subject: [PATCH 168/867] kbdfans/kbd67/mkiirgb_iso: LAYOUT_65_iso_blocker
 conformance (#15794)

---
 keyboards/kbdfans/kbd67/mkiirgb_iso/info.json | 89 +++++++++++++++++--
 .../mkiirgb_iso/keymaps/default/keymap.c      | 29 +++---
 .../kbd67/mkiirgb_iso/keymaps/via/keymap.c    | 55 ++++++------
 .../kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h   |  8 +-
 keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk  |  6 +-
 5 files changed, 133 insertions(+), 54 deletions(-)

diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
index b7e40053df..36ff2f1fe5 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
@@ -1,10 +1,83 @@
 {
-  "keyboard_name": "kbd67mkiirgb_iso", 
-  "url": "", 
-  "maintainer": "moyi4681", 
-  "layouts": {
-      "LAYOUT_65_iso_blocker": {
-            "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}, {"x":15, "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":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "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}, {"x":15, "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":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"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":13, "y":4}, {"label":"Ctrl", "x":14, "y":4}, {"x":15, "y":4}]
+    "keyboard_name": "kbd67mkiirgb_iso",
+    "url": "",
+    "maintainer": "moyi4681",
+    "layouts": {
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"label":"`\u00ac", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Home", "x":15, "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":"Page Up", "x":15, "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":"Page Down", "x":15, "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":1.75},
+                {"label":"Up", "x":14, "y":3},
+                {"label":"End", "x":15, "y":3},
+
+                {"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},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"AltGr", "x":10, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
+                {"label":"Left", "x":13, "y":4},
+                {"label":"Down", "x":14, "y":4},
+                {"label":"Right", "x":15, "y":4}
+            ]
         }
-  }
-}
\ No newline at end of file
+    }
+}
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
index 1d13f68f86..db85ab3df9 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/default/keymap.c
@@ -13,21 +13,22 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-		[0] = LAYOUT_65_iso_blocker( 
-			KC_ESC, KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
-		    KC_TAB,  KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_ENT, KC_PGUP,
-			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_BSLASH,    KC_PGDN,
-		    KC_LSFT, KC_NUBS, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
-		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,    KC_LEFT,           KC_DOWN,   KC_RIGHT),
-		[1] = LAYOUT_65_iso_blocker( 
-			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, RESET,    KC_PGUP,
-			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
-		    KC_LSFT,    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_VOLU,  KC_MUTE,
-		    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
+    [0] = LAYOUT_65_iso_blocker(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_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_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_iso_blocker(
+        KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,          KC_PGUP,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, RESET,   KC_PGDN,
+        KC_LSFT, 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_VOLU, KC_MUTE,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_MPRV, KC_VOLD, KC_MNXT
+    ),
 };
-
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
index 390725dd2d..df2bd587e6 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/keymaps/via/keymap.c
@@ -13,33 +13,36 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-		[0] = LAYOUT_65_iso_blocker( 
-			KC_ESC, KC_1,     KC_2,     KC_3,  KC_4,  KC_5,  KC_6,    KC_7,  KC_8,    KC_9,     KC_0,     KC_MINS,  KC_EQL,  KC_BSPC,   KC_HOME,
-		    KC_TAB,  KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,    KC_O,     KC_P,     KC_LBRC,  KC_RBRC, KC_ENT, KC_PGUP,
-			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_BSLASH,    KC_PGDN,
-		    KC_LSFT, KC_NUBS, KC_Z,     KC_X,     KC_C,  KC_V,  KC_B,  KC_N,    KC_M,  KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,           KC_UP,     KC_END,
-		    KC_LCTL, KC_LGUI,  KC_LALT,                KC_SPC,                KC_RALT,           KC_RCTL,    KC_LEFT,           KC_DOWN,   KC_RIGHT),
-		[1] = LAYOUT_65_iso_blocker( 
-			KC_GESC,       KC_F1,    KC_F2,   KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_DEL,   KC_HOME,
-		    KC_TRNS,       RGB_TOG,  RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK,  KC_PAUS, RESET,    KC_PGUP,
-			KC_TRNS,       RGB_SPI,  RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          EEP_RST,  KC_PGDN,
-		    KC_LSFT,    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_VOLU,  KC_MUTE,
-		    KC_TRNS,       KC_TRNS,  KC_TRNS,                  KC_TRNS,                   KC_TRNS,          KC_TRNS,  KC_MPRV,          KC_VOLD,  KC_MNXT),
-		[2] = LAYOUT_65_iso_blocker( 
-			KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-		    KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-			KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-		    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-		    KC_TRNS,  KC_TRNS,  KC_TRNS,                     KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS),
-		[3] = LAYOUT_65_iso_blocker( 
-			KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-		    KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-			KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-		    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS,
-		    KC_TRNS,  KC_TRNS,  KC_TRNS,                     KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS),
+    [0] = LAYOUT_65_iso_blocker(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_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_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_iso_blocker(
+        KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,          KC_PGUP,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, RESET,   KC_PGDN,
+        KC_LSFT, 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_VOLU, KC_MUTE,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+    [2] = LAYOUT_65_iso_blocker(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_65_iso_blocker(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
 };
-
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h
index 1b84dde21b..3c0e90abc8 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/mkiirgb_iso.h
@@ -13,17 +13,17 @@
  * 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 XXX KC_NO
 #include "quantum.h"
 
 #define LAYOUT_65_iso_blocker( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2E, \
     K30, K43, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
-    K40, K41, K42,           K45,                K49, K4A, K4B,      K4D, K4E  \
+    K40, K41, K42,                K45,           K49, K4A,      K4B, K4D, K4E  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
index 1ca0f90a5f..7e5b22ef73 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
@@ -8,7 +8,7 @@ BOOTLOADER = lufa-ms
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
+MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
@@ -17,4 +17,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
\ No newline at end of file
+RGB_MATRIX_DRIVER = WS2812
+
+LAYOUTS = 65_iso_blocker

From fc8346e0b3d601aadf37fd7a1e708910cee22f75 Mon Sep 17 00:00:00 2001
From: Brandon Claveria <48102030+swiftrax@users.noreply.github.com>
Date: Sat, 8 Jan 2022 16:13:37 -0800
Subject: [PATCH 169/867] [keyboard] BumbleBee handwired (#14908)

* add bumblebee

* change keymaps

* change PID

* update info.json

* Apply suggestions from code review

* Update keyboards/handwired/swiftrax/bumblebee/rules.mk

* update readme.md

* Update keyboards/handwired/swiftrax/bumblebee/info.json

* edit keymaps

* Update keyboards/handwired/swiftrax/bumblebee/rules.mk

* Update keyboards/handwired/swiftrax/bumblebee/bumblebee.h

* Update keyboards/handwired/swiftrax/bumblebee/info.json

* Update keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c

* Update keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c

* Update keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c

* Update keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c

* Update keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c

* Update keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c

* Update keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
---
 .../handwired/swiftrax/bumblebee/bumblebee.c  | 56 ++++++++++++++++++
 .../handwired/swiftrax/bumblebee/bumblebee.h  | 39 +++++++++++++
 .../handwired/swiftrax/bumblebee/config.h     | 58 +++++++++++++++++++
 .../handwired/swiftrax/bumblebee/info.json    | 10 ++++
 .../bumblebee/keymaps/default/keymap.c        | 47 +++++++++++++++
 .../bumblebee/keymaps/default/rules.mk        |  2 +
 .../swiftrax/bumblebee/keymaps/via/keymap.c   | 53 +++++++++++++++++
 .../swiftrax/bumblebee/keymaps/via/rules.mk   |  4 ++
 .../handwired/swiftrax/bumblebee/readme.md    | 21 +++++++
 .../handwired/swiftrax/bumblebee/rules.mk     | 19 ++++++
 10 files changed, 309 insertions(+)
 create mode 100644 keyboards/handwired/swiftrax/bumblebee/bumblebee.c
 create mode 100644 keyboards/handwired/swiftrax/bumblebee/bumblebee.h
 create mode 100644 keyboards/handwired/swiftrax/bumblebee/config.h
 create mode 100644 keyboards/handwired/swiftrax/bumblebee/info.json
 create mode 100644 keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/swiftrax/bumblebee/keymaps/default/rules.mk
 create mode 100644 keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk
 create mode 100644 keyboards/handwired/swiftrax/bumblebee/readme.md
 create mode 100644 keyboards/handwired/swiftrax/bumblebee/rules.mk

diff --git a/keyboards/handwired/swiftrax/bumblebee/bumblebee.c b/keyboards/handwired/swiftrax/bumblebee/bumblebee.c
new file mode 100644
index 0000000000..613a1fa1b3
--- /dev/null
+++ b/keyboards/handwired/swiftrax/bumblebee/bumblebee.c
@@ -0,0 +1,56 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "bumblebee.h"
+
+// Encoder
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise))
+        return false;
+    if (clockwise)
+        tap_code16(KC_VOLU);
+    else
+        tap_code16(KC_VOLD);
+    return true;
+}
+
+// Initialize all RGB indicators to 'off'
+__attribute__((weak))
+void keyboard_post_init_user(void) {
+    rgblight_setrgb_at(0, 0, 0, 0); // [..., 0] = top LED
+    rgblight_setrgb_at(0, 0, 0, 1); // [..., 1] = middle LED
+    rgblight_setrgb_at(0, 0, 0, 2); // [..., 2] = bottom LED
+}
+
+// RGB Layer Indicators
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    if (get_highest_layer(state) == 0) {
+        rgblight_setrgb_at(255, 0, 0, 0); //red
+    } else {
+        rgblight_setrgb_at(0, 0, 0, 0);
+    }
+    if (get_highest_layer(state) == 1){
+        rgblight_setrgb_at(0, 0, 255, 1); //green
+    } else{
+        rgblight_setrgb_at(0, 0, 0, 1);
+    }
+    if (get_highest_layer(state) == 2){
+        rgblight_setrgb_at(0, 255, 0, 2); //blue
+    } else{
+        rgblight_setrgb_at(0, 0, 0, 2);
+    }
+    return layer_state_set_user(state);
+}
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/bumblebee/bumblebee.h b/keyboards/handwired/swiftrax/bumblebee/bumblebee.h
new file mode 100644
index 0000000000..2d1fdf7a46
--- /dev/null
+++ b/keyboards/handwired/swiftrax/bumblebee/bumblebee.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#define KC_NO XXX
+
+#include "quantum.h"
+
+ #define LAYOUT_all( \
+    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,      \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47,      \
+    K60, K70,           K62, K72, K63,           K74, K65,      K66, K76, K67       \
+ ) \
+ { \
+    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
+    { K10, K11, K12, K13, K14, K15, K16, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27 }, \
+    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, K56, XXX }, \
+    { K60, XXX, K62, K63, XXX, K65, K66, K67 }, \
+    { K70, XXX, K72, XXX, K74, XXX, K76, XXX }  \
+ } 
+
diff --git a/keyboards/handwired/swiftrax/bumblebee/config.h b/keyboards/handwired/swiftrax/bumblebee/config.h
new file mode 100644
index 0000000000..89b51a762f
--- /dev/null
+++ b/keyboards/handwired/swiftrax/bumblebee/config.h
@@ -0,0 +1,58 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xE881
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Swiftrax
+#define PRODUCT         BumbleBee
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 8
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, F4, F5, F6, F7 }
+#define MATRIX_COL_PINS { C7, D3, D5, D4, D6, D7, B4, B5 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Encoder */
+#define ENCODERS_PAD_A { C6 }
+#define ENCODERS_PAD_B { B6 }
+
+/* RGB Indicators */
+#define RGB_DI_PIN E6
+#define RGBLED_NUM 3
+
+/* Solenid Pin */
+#define SOLENOID_PIN D2
+
+/* Piezo Buzzer */
+#define AUDIO_PIN B7
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/info.json
new file mode 100644
index 0000000000..3d9a8730a6
--- /dev/null
+++ b/keyboards/handwired/swiftrax/bumblebee/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "BumbleBee", 
+    "url": "https://www.github.com/swiftrax", 
+    "maintainer": "swiftrax", 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0, "w":1.5}, {"label":"0,1", "x":2.5, "y":0}, {"label":"1,1", "x":3.5, "y":0}, {"label":"0,2", "x":4.5, "y":0}, {"label":"1,2", "x":5.5, "y":0}, {"label":"0,3", "x":6.5, "y":0}, {"label":"1,3", "x":7.5, "y":0}, {"label":"0,4", "x":8.5, "y":0}, {"label":"1,4", "x":9.5, "y":0}, {"label":"0,5", "x":10.5, "y":0}, {"label":"1,5", "x":11.5, "y":0}, {"label":"0,6", "x":12.5, "y":0}, {"label":"1,6", "x":13.5, "y":0}, {"label":"0,7", "x":14.5, "y":0, "w":1.5}, {"label":"1,7", "x":16, "y":0}, {"label":"2,0", "x":0, "y":1}, {"label":"3,0", "x":1, "y":1, "w":1.75}, {"label":"2,1", "x":2.75, "y":1}, {"label":"3,1", "x":3.75, "y":1}, {"label":"2,2", "x":4.75, "y":1}, {"label":"3,2", "x":5.75, "y":1}, {"label":"2,3", "x":6.75, "y":1}, {"label":"3,3", "x":7.75, "y":1}, {"label":"2,4", "x":8.75, "y":1}, {"label":"3,4", "x":9.75, "y":1}, {"label":"2,5", "x":10.75, "y":1}, {"label":"3,5", "x":11.75, "y":1}, {"label":"2,6", "x":12.75, "y":1}, {"label":"3,6", "x":13.75, "y":1, "w":2.25}, {"label":"2,7", "x":16, "y":1}, {"label":"4,0", "x":0, "y":2}, {"label":"5,0", "x":1, "y":2, "w":2.25}, {"label":"4,1", "x":3.25, "y":2}, {"label":"5,1", "x":4.25, "y":2}, {"label":"4,2", "x":5.25, "y":2}, {"label":"5,2", "x":6.25, "y":2}, {"label":"4,3", "x":7.25, "y":2}, {"label":"5,3", "x":8.25, "y":2}, {"label":"4,4", "x":9.25, "y":2}, {"label":"5,4", "x":10.25, "y":2}, {"label":"4,5", "x":11.25, "y":2}, {"label":"5,5", "x":12.25, "y":2}, {"label":"4,6", "x":13.25, "y":2, "w":1.75}, {"label":"5,6", "x":15, "y":2}, {"label":"4,7", "x":16, "y":2}, {"label":"6,0", "x":0, "y":3}, {"label":"7,0", "x":1, "y":3, "w":1.5}, {"label":"6,2", "x":3.88, "y":3, "w":1.5}, {"label":"7,2", "x":5.38, "y":3, "w":2.75}, {"label":"6,3", "x":8.13, "y":3}, {"label":"7,4", "x":9.13, "y":3, "w":2}, {"label":"6,5", "x":11.13, "y":3, "w":1.5}, {"label":"6,6", "x":14, "y":3}, {"label":"7,6", "x":15, "y":3}, {"label":"6,7", "x":16, "y":3}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7e7247c80f
--- /dev/null
+++ b/keyboards/handwired/swiftrax/bumblebee/keymaps/default/keymap.c
@@ -0,0 +1,47 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+#define SOLENOID_DEFAULT_BUZZ 1
+#define FB_ERM_LRA 0
+#define FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+
+/* Please refer to your datasheet for the optimal setting for your specific motor. */
+#define RATED_VOLTAGE 3
+#define V_PEAK 5
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        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_LBRC, KC_RBRC, KC_BSPC, KC_DEL , 
+        KC_F13 , 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_HOME,      
+        KC_F14 , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_END ,      
+        KC_F15 , KC_LCTL,                   KC_LALT, KC_SPC , KC_MUTE,                   MO(1)  , MO(2)  ,          KC_LEFT, KC_DOWN, KC_RGHT       
+    ),
+    [1] = LAYOUT_all(
+        _______, _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
+        _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______, _______        
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
+        _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______, _______     
+    ),
+};
diff --git a/keyboards/handwired/swiftrax/bumblebee/keymaps/default/rules.mk b/keyboards/handwired/swiftrax/bumblebee/keymaps/default/rules.mk
new file mode 100644
index 0000000000..9c6098640a
--- /dev/null
+++ b/keyboards/handwired/swiftrax/bumblebee/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+AUDIO_ENABLE = yes
+HAPTIC_ENABLE += SOLENOID
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a48f998100
--- /dev/null
+++ b/keyboards/handwired/swiftrax/bumblebee/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+#define SOLENOID_DEFAULT_BUZZ 1
+#define FB_ERM_LRA 0
+#define FB_BRAKEFACTOR 3 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+
+/* Please refer to your datasheet for the optimal setting for your specific motor. */
+#define RATED_VOLTAGE 3
+#define V_PEAK 5
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        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_LBRC, KC_RBRC, KC_BSPC, KC_DEL , 
+        KC_F13 , 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_HOME,      
+        KC_F14 , KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP  , KC_END ,      
+        KC_F15 , KC_LCTL,                   KC_LALT, KC_SPC , KC_MUTE,                   MO(1)  , MO(2)  ,          KC_LEFT, KC_DOWN, KC_RGHT       
+    ),
+    [1] = LAYOUT_all(
+        _______, _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
+        _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______, _______       
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
+        _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______, _______     
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      
+        _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______, _______     
+    ),
+};
diff --git a/keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk b/keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk
new file mode 100644
index 0000000000..e0ef178896
--- /dev/null
+++ b/keyboards/handwired/swiftrax/bumblebee/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+#HAPTIC_ENABLE += SOLENOID
+AUDIO_ENABLE = yes
+#either solenoid or audio not both can be enabled
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/bumblebee/readme.md b/keyboards/handwired/swiftrax/bumblebee/readme.md
new file mode 100644
index 0000000000..32091cb83b
--- /dev/null
+++ b/keyboards/handwired/swiftrax/bumblebee/readme.md
@@ -0,0 +1,21 @@
+# BumbleBee
+
+A 50% keyboard with a bunch of fun features
+
+* Keyboard Maintainer: Swiftrax
+* Hardware Supported: BumbleBee
+* Hardware Availability: https://github.com/swiftrax
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/swiftrax/bumblebee: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).
diff --git a/keyboards/handwired/swiftrax/bumblebee/rules.mk b/keyboards/handwired/swiftrax/bumblebee/rules.mk
new file mode 100644
index 0000000000..e0590e039a
--- /dev/null
+++ b/keyboards/handwired/swiftrax/bumblebee/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Rotary Encoder

From 4c1fd0897cfec6d1b09b651b372b2d5bbc03de25 Mon Sep 17 00:00:00 2001
From: mmccoyd <mmccoyd@users.noreply.github.com>
Date: Sat, 8 Jan 2022 17:29:51 -0800
Subject: [PATCH 170/867] [Keyboard] Add Hillside support (#15399)

* [Keyboard] Add Hillside

* Remove no longer used define, rename README

* Rename to readme.md

* Readme: Improve clarity, fix grammar and typos

* Readme: Remove extra line pointing to QMK docs

* Readme: Join consecutive source lines in .md

* Readme: split lines, post spelling fix

* Keymap: fix key label in readme
---
 keyboards/handwired/hillside/0_1/0_1.c        |   4 +
 keyboards/handwired/hillside/0_1/0_1.h        |  34 +++
 keyboards/handwired/hillside/0_1/config.h     |  35 +++
 keyboards/handwired/hillside/0_1/info.json    |  13 ++
 keyboards/handwired/hillside/0_1/rules.mk     |   8 +
 keyboards/handwired/hillside/info.json        |  97 ++++++++
 .../hillside/keymaps/default/keymap.json      | 102 +++++++++
 .../hillside/keymaps/default/readme.md        | 216 ++++++++++++++++++
 .../handwired/hillside/keymaps/json2hill.py   | 136 +++++++++++
 .../hillside/keymaps/via/keymap.json          | 101 ++++++++
 keyboards/handwired/hillside/readme.md        |  29 +++
 11 files changed, 775 insertions(+)
 create mode 100644 keyboards/handwired/hillside/0_1/0_1.c
 create mode 100644 keyboards/handwired/hillside/0_1/0_1.h
 create mode 100644 keyboards/handwired/hillside/0_1/config.h
 create mode 100644 keyboards/handwired/hillside/0_1/info.json
 create mode 100644 keyboards/handwired/hillside/0_1/rules.mk
 create mode 100644 keyboards/handwired/hillside/info.json
 create mode 100644 keyboards/handwired/hillside/keymaps/default/keymap.json
 create mode 100644 keyboards/handwired/hillside/keymaps/default/readme.md
 create mode 100755 keyboards/handwired/hillside/keymaps/json2hill.py
 create mode 100644 keyboards/handwired/hillside/keymaps/via/keymap.json
 create mode 100644 keyboards/handwired/hillside/readme.md

diff --git a/keyboards/handwired/hillside/0_1/0_1.c b/keyboards/handwired/hillside/0_1/0_1.c
new file mode 100644
index 0000000000..ee096f18a7
--- /dev/null
+++ b/keyboards/handwired/hillside/0_1/0_1.c
@@ -0,0 +1,4 @@
+// Copyright 2021 Michael McCoyd (@mmccoyd)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "0_1.h"
diff --git a/keyboards/handwired/hillside/0_1/0_1.h b/keyboards/handwired/hillside/0_1/0_1.h
new file mode 100644
index 0000000000..0aeefdf630
--- /dev/null
+++ b/keyboards/handwired/hillside/0_1/0_1.h
@@ -0,0 +1,34 @@
+// Copyright 2021 Michael McCoyd (@mmccoyd)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts those identifiers into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+// clang-format off
+#define LAYOUT( \
+  L00, L01, L02, L03, L04, L05,                     R00, R01, R02, R03, R04, R05, \
+  L10, L11, L12, L13, L14, L15,                     R10, R11, R12, R13, R14, R15, \
+  L20, L21, L22, L23, L24, L25, LT4,           RT4, R20, R21, R22, R23, R24, R25, \
+            L30,      LT0, LT1, LT2, LT3, RT3, RT2, RT1, RT0,      R30       	  \
+  ) \
+  { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, LT0, LT1, LT2, LT3, LT4 }, \
+    { R05, R04, R03, R02, R01, R00 }, \
+    { R15, R14, R13, R12, R11, R10 }, \
+    { R25, R24, R23, R22, R21, R20 }, \
+    { R30, RT0, RT1, RT2, RT3, RT4 }  \
+  }
+// clang-format on
diff --git a/keyboards/handwired/hillside/0_1/config.h b/keyboards/handwired/hillside/0_1/config.h
new file mode 100644
index 0000000000..c83b23d0e8
--- /dev/null
+++ b/keyboards/handwired/hillside/0_1/config.h
@@ -0,0 +1,35 @@
+// Copyright 2021 Michael McCoyd (@mmccoyd)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 6
+
+/* Encoder */
+#define ENCODERS_PAD_A { F5 }
+#define ENCODERS_PAD_B { F4 }
+#define ENCODERS_PAD_A_RIGHT { F4 }
+#define ENCODERS_PAD_B_RIGHT { F5 }
+
+#define RGBLIGHT_SLEEP
+
+/* Haptic hardware */
+// The Pimoroni is the likely hardware, for which these settings work
+#define FB_ERM_LRA 1
+#define FB_BRAKEFACTOR 3 /* 1x:0, 2x:1, 3x:2, 4x:3, 6:4, 8:5, 16:6, Disable:7 */
+#define FB_LOOPGAIN 1 /* For  Low:0, Medium:1, High:2, Very High:3 */
+/* Please refer to your datasheet for optimal setting for your specific motor.*/
+#define RATED_VOLTAGE 2
+#define V_PEAK 2.8
+#define V_RMS 2.0
+#define F_LRA 205 /* resonance freq */
+
+/* Haptic waveforms */
+// Two mild waveforms
+#define DRV_GREETING alert_750ms
+#define DRV_MODE_DEFAULT sharp_tick3_60
diff --git a/keyboards/handwired/hillside/0_1/info.json b/keyboards/handwired/hillside/0_1/info.json
new file mode 100644
index 0000000000..e45e4571f5
--- /dev/null
+++ b/keyboards/handwired/hillside/0_1/info.json
@@ -0,0 +1,13 @@
+{
+    "matrix_pins": {
+        "rows": ["D7", "E6", "B4", "B5"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+     },    
+    "diode_direction": "COL2ROW",
+
+    "usb": {
+      "vid": "0xFEED",
+      "pid": "0x67C0",
+      "device_ver": "0x0001"
+    },
+}
diff --git a/keyboards/handwired/hillside/0_1/rules.mk b/keyboards/handwired/hillside/0_1/rules.mk
new file mode 100644
index 0000000000..2501147ea8
--- /dev/null
+++ b/keyboards/handwired/hillside/0_1/rules.mk
@@ -0,0 +1,8 @@
+SPLIT_KEYBOARD = yes        # Use shared split_common code
+LTO_ENABLE = yes            # Use link time optimization for smaller firmware
+
+# If you add a haptic board,
+# enable it and set its driver here or in your keymap folder
+# The Pimoroni board's driver is DRV2605L 
+# HAPTIC_ENABLE = yes        # Enable haptic driver
+# HAPTIC_DRIVER = DRV2605L
diff --git a/keyboards/handwired/hillside/info.json b/keyboards/handwired/hillside/info.json
new file mode 100644
index 0000000000..7a29df1c64
--- /dev/null
+++ b/keyboards/handwired/hillside/info.json
@@ -0,0 +1,97 @@
+{
+    "manufacturer": "mmccoyd",
+    "maintainer": "mmccoyd",
+
+    "keyboard_name": "Hillside",
+    "url": "http://github.com/mmccoyd/hillside/",
+
+    "tags": ["split", "column stagger", "choc v1", "choc spaced" ],
+
+    "processor": "atmega32u4",
+
+    "features": {
+        "encoder": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "split": {
+        "soft_serial_pin": "D2",
+        "main": "left"
+    },
+
+    "rgblight": {
+        "led_count": 5,
+        "pin": "D3",
+        "split": true,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8
+    },
+
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+		
+                {"label": "Tab", "x": 0, "y": 0.93},
+                {"label": "Q", "x": 1, "y": 0.93},
+                {"label": "W", "x": 2, "y": 0.31},
+                {"label": "E", "x": 3, "y": 0},
+                {"label": "R", "x": 4, "y": 0.28},
+                {"label": "T", "x": 5, "y": 0.42},
+
+                {"label": "Y", "x": 9.5, "y": 0.42},
+                {"label": "U", "x": 10.5, "y": 0.28},
+                {"label": "I", "x": 11.5, "y": 0},
+                {"label": "O", "x": 12.5, "y": 0.31},
+                {"label": "P", "x": 13.5, "y": 0.93},
+                {"label": "Backspace", "x": 14.5, "y": 0.93},
+
+
+                {"label": "Ctrl", "x": 0, "y": 1.93},
+                {"label": "A", "x": 1, "y": 1.93},
+                {"label": "S", "x": 2, "y": 1.31},
+                {"label": "D", "x": 3, "y": 1},
+                {"label": "F", "x": 4, "y": 1.28},
+                {"label": "G", "x": 5, "y": 1.42},
+
+                {"label": "H", "x": 9.5, "y": 1.42},
+                {"label": "J", "x": 10.5, "y": 1.28},
+                {"label": "K", "x": 11.5, "y": 1},
+                {"label": "L", "x": 12.5, "y": 1.31},
+                {"label": ";", "x": 13.5, "y": 1.93},
+                {"label": "'", "x": 14.5, "y": 1.93},
+
+
+                {"label": "Shift", "x": 0, "y": 2.93},
+                {"label": "Z", "x": 1, "y": 2.93},
+                {"label": "X", "x": 2, "y": 2.31},
+                {"label": "C", "x": 3, "y": 2},
+                {"label": "V", "x": 4, "y": 2.28},
+                {"label": "B", "x": 5, "y": 2.42},
+                {"label": "`", "x": 6, "y": 2.78},
+
+                {"label": "Esc", "x": 8.5, "y": 2.78},
+                {"label": "N", "x": 9.5, "y": 2.42},
+                {"label": "M", "x": 10.5, "y": 2.28},
+                {"label": ",", "x": 11.5, "y": 2},
+                {"label": ".", "x": 12.5, "y": 2.31},
+                {"label": "/", "x": 13.5, "y": 2.93},
+                {"label": "Shift", "x": 14.5, "y": 2.93},
+
+
+                {"label": "Enter", "x": 2, "y": 3.31},
+                {"label": "Gui", "x": 3.5, "y": 3.28},
+                {"label": "Alt", "x": 4.5, "y": 3.42},
+                {"label": "Num", "x": 5.5, "y": 3.78},
+                {"label": "Nav", "x": 6.5, "y": 4.14},
+
+
+                {"label": "Sym", "x": 8, "y": 4.14},
+                {"label": "Space", "x": 9, "y": 3.78},
+                {"label": "Alt", "x": 10, "y": 3.42},
+                {"label": "Gui", "x": 11, "y": 3.28},
+                {"label": "App", "x": 12.5, "y": 3.31}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/hillside/keymaps/default/keymap.json b/keyboards/handwired/hillside/keymaps/default/keymap.json
new file mode 100644
index 0000000000..f5871b073f
--- /dev/null
+++ b/keyboards/handwired/hillside/keymaps/default/keymap.json
@@ -0,0 +1,102 @@
+{
+  "version": 1,
+  "notes": "",
+  "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
+  "keyboard": "handwired/hillside/0_1",
+  "author": "@mmccoyd",
+  "keymap": "default",
+  "layout": "LAYOUT",
+  "layers": [
+        ["KC_TAB" , "KC_Q"      , "KC_W"         , "KC_E"      , "KC_R"         , "KC_T",
+         "KC_Y"   , "KC_U"      , "KC_I"         , "KC_O"      , "KC_P"         , "KC_BSPC",
+
+         "KC_LCTL", "KC_A"      , "KC_S"         , "KC_D"      , "KC_F"         , "KC_G",
+         "KC_H"   , "KC_J"      , "KC_K"         , "KC_L"      , "KC_SCLN"      , "KC_QUOT",
+
+         "KC_LSFT", "KC_Z"      , "KC_X"         , "KC_C"      , "KC_V"         , "KC_B"      , "KC_GRV",
+         "KC_ESC" , "KC_N"      , "KC_M"         , "KC_COMM"   , "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
+
+         "KC_ENT" , "KC_LGUI"   , "KC_LALT"      , "MO(5)"     , "MO(3)",
+         "MO(4)"  , "KC_SPC"    , "KC_LALT"      , "KC_RGUI"   , "KC_APP"
+
+        ],
+        ["KC_TAB" , "KC_QUOT"   , "KC_COMM"      , "KC_DOT"    , "KC_P"         , "KC_Y",
+         "KC_F"   , "KC_G"      , "KC_C"         , "KC_R"      , "KC_L"         , "KC_BSPC",
+
+         "KC_LCTL", "KC_A"      , "KC_O"         , "KC_E"      , "KC_U"         , "KC_I",
+         "KC_D"   , "KC_H"      , "KC_T"         , "KC_N"      , "KC_S"         , "KC_SLSH",
+
+         "KC_LSFT", "KC_SCLN"   , "KC_Q"         , "KC_J"      , "KC_K"         , "KC_X"      , "KC_GRV",
+         "KC_ESC" , "KC_B"      , "KC_M"         , "KC_W"      , "KC_V"         , "KC_Z"      , "KC_RSFT",
+
+         "KC_ENT" , "KC_LGUI"   , "KC_LALT"      , "MO(5)"     , "MO(3)",
+         "MO(4)"  , "KC_SPC"    , "KC_LALT"      , "KC_RGUI"   , "KC_APP"
+
+        ],
+        ["KC_TAB" , "KC_Q"      , "KC_W"         , "KC_F"      , "KC_P"         , "KC_B",
+         "KC_J"   , "KC_L"      , "KC_U"         , "KC_Y"      , "KC_SCLN"      , "KC_BSPC",
+
+         "KC_LCTL", "KC_A"      , "KC_R"         , "KC_S"      , "KC_T"         , "KC_G",
+         "KC_M"   , "KC_N"      , "KC_E"         , "KC_I"      , "KC_O"         , "KC_QUOT",
+
+         "KC_LSFT", "KC_Z"      , "KC_X"         , "KC_C"      , "KC_D"         , "KC_V"      , "KC_GRV",
+         "KC_ESC" , "KC_K"      , "KC_H"         , "KC_COMM"   , "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
+
+         "KC_ENT" , "KC_LGUI"   , "KC_LALT"      , "MO(5)"     , "MO(3)",
+         "MO(4)"  , "KC_SPC"    , "KC_LALT"      , "KC_RGUI"   , "KC_APP"
+
+        ],
+        ["KC_CAPS", "KC_INS"    , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_VOLU",
+         "KC_PGUP", "KC_HOME"   , "KC_NO"        , "KC_END"    , "KC_NO"        , "KC_DEL",
+
+         "KC_LCTL", "KC_LGUI"   , "KC_LALT"      , "KC_LCTL"   , "KC_LSFT"      , "KC_VOLD",
+         "KC_PGDN", "KC_LEFT"   , "KC_UP"        , "KC_RGHT"   , "KC_NO"        , "KC_RCTL",
+
+         "KC_LSFT", "LCTL(KC_Z)", "LCTL(KC_X)"   , "LCTL(KC_C)", "LCTL(KC_V)"   , "LCTL(KC_Y)", "KC_MUTE",
+         "KC_ESC" , "KC_NO"     , "LCTL(KC_LEFT)", "KC_DOWN"   , "LCTL(KC_RGHT)", "KC_RALT"   , "KC_RSFT",
+
+         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS",
+         "MO(6)"  , "KC_BSPC"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS"
+
+        ],
+        ["KC_F12" , "KC_EXLM"   , "KC_AT"        , "KC_HASH"   , "KC_DLR"       , "KC_PERC",
+         "KC_CIRC", "KC_AMPR"   , "KC_ASTR"      , "KC_LPRN"   , "KC_RPRN"      , "KC_BSPC",
+
+         "KC_LCTL", "KC_F1"     , "KC_F2"        , "KC_F3"     , "KC_F4"        , "KC_F5",
+         "KC_PIPE", "KC_LSFT"   , "KC_LCTL"      , "KC_LALT"   , "KC_LGUI"      , "KC_RCTL",
+
+         "KC_LSFT", "KC_F6"     , "KC_F7"        , "KC_F8"     , "KC_F9"        , "KC_F10"    , "KC_F11",
+         "KC_ESC" , "KC_BSLS"   , "KC_LBRC"      , "KC_RBRC"   , "KC_LCBR"      , "KC_RCBR"   , "KC_RSFT",
+
+         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "MO(6)",
+         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS"
+
+        ],
+        ["KC_NO"  , "KC_MINS"   , "KC_PLUS"      , "KC_EQL"    , "KC_SLSH"      , "KC_ASTR",
+         "KC_COMM", "KC_7"      , "KC_8"         , "KC_9"      , "KC_NO"        , "KC_TRNS",
+
+         "KC_TRNS", "KC_LGUI"   , "KC_LALT"      , "KC_LCTL"   , "KC_LSFT"      , "KC_NO",
+         "KC_0"   , "KC_1"      , "KC_2"         , "KC_3"      , "KC_UNDS"      , "KC_RCTL",
+
+         "KC_TRNS", "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO",
+         "KC_NO"  , "KC_DOT"    , "KC_4"         , "KC_5"      , "KC_6"         , "KC_NO"     , "KC_TRNS",
+
+         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "KC_NO",
+         "KC_NO"  , "KC_BSPC"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS"
+
+        ],
+        ["KC_NO"  , "DF(0)"     , "DF(1)"        , "DF(2)"     , "AG_SWAP"      , "AG_NORM",
+         "KC_NO"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO",
+
+         "KC_NO"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO",
+         "RGB_MOD", "RGB_VAI"   , "RGB_HUI"      , "RGB_SAI"   , "KC_NO"        , "KC_NO",
+
+         "RESET"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO",
+         "RGB_TOG", "RGB_RMOD"  , "RGB_VAD"      , "RGB_HUD"   , "RGB_SAD"      , "KC_NO"     , "KC_NO",
+
+         "KC_NO"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_TRNS",
+         "KC_TRNS", "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"
+
+        ]
+  ]
+}
diff --git a/keyboards/handwired/hillside/keymaps/default/readme.md b/keyboards/handwired/hillside/keymaps/default/readme.md
new file mode 100644
index 0000000000..a982c0c380
--- /dev/null
+++ b/keyboards/handwired/hillside/keymaps/default/readme.md
@@ -0,0 +1,216 @@
+# Default Keymap
+
+This default keymap follows many of the norms seen in non-programmable keyboards
+  to ease initial use of the Hillside keyboard.
+It is a starting point for you to tweak over time to better suit _your_ preferences.
+You can easily customize it with the
+  [QMK configurator](https://config.qmk.fm/#/hillside/0_1/LAYOUT)
+  or with the [via firmware](https://caniusevia.com).
+
+Some of its key features are:
+- A mostly standard base layer with letters, some symbols, shift, modifier and delete keys
+  in the expected places for non-programmable keyboards.
+- QWERTY, Colemak-DH and Dvorak options for the letter and symbol layout.
+- Comfortable modifier and function or symbol combinations on the non-base layers
+  using modifiers on the home row of the navigation/edit, symbol/function and number-pad layers.
+- Word navigation and cut/copy/paste keys on the navigation layer.
+- A slightly optimized number pad with the more frequently used numbers on the home row.
+
+We've deliberately omitted some features:
+- Combos: because the online configuration tools do not handle them
+  and because they would add to the initial learning curve,
+  as helpful to a keymap as a light sprinkling of combos can be.
+- Multi-function mod-tap keys, auto shift capitalization and auto-exit modes such as CAPWORD or NUMWORD:
+  as they may be too large a step for someone new to programmable keyboards.
+
+## Base Layer
+
+```
+| TAB   |  Q  |  W  |  E  |  R  |  T  |---------------------------|  Y  |  U  |  I  |  O  |  P  | BKSPC |
+| CTRL  |  A  |  S  |  D  |  F  |  G  |---------------------------|  H  |  J  |  K  |  L  |  ;  |   '   |
+| SHIFT |  Z  |  X  |  C  |  V  |  B  |  ~  |---------------| ESC |  N  |  M  |  ,  |  .  |  /  | SHIFT |
+--------------|ENTER|-----| GUI | ALT | Num | Nav |---| Sym |SPACE| ALT | GUI |-----| APP |--------------
+```
+
+The base layer can be either of QWERTY, Colemak-DH or Dvorak,
+  with identical non-alpha and non-symbol keys.
+QWERTY is the default.
+
+A standard keyboard layout is used for:
+
+- Tab, backspace and shift keys in the outer columns.
+- Alt/option and GUI/command keys on both thumbs, with the location swappable for windows or mac.
+- A space key on the right thumb.
+
+The differences from a standard layout are:
+
+- There are three additional "shift" keys
+  to access the navigation/editing, symbol/function, and number layers.
+- Enter is on the left thumb or ring finger.
+  This location allowed preserving the more common right-hand keys.
+  Feel free to swap it with the quote key or have it share the right shift key
+    as a mod-tap key.
+- Control is in the caps lock spot.
+- Esc and `~ are above the thumbs.
+- The rarer AltGr key is in a layer.
+
+<details>
+<summary>Details of Dvorak and Colemak-DH</summary>
+In the Dvorak layout, the outer home row key is the "/?" symbols
+  so that the same 12 symbols are taken care of on the base layer.
+
+```
+Dvorak
+| TAB   |  '  |  ,  |  .  |  P  |  Y  |---------------------------|  F  |  G  |  C  |  R  |  L  | BKSPC |
+| CTRL  |  A  |  O  |  E  |  U  |  I  |---------------------------|  D  |  H  |  T  |  N  |  S  |  /    |
+| SHIFT |  ;  |  Q  |  J  |  K  |  X  |  ~  |---------------| ESC |  B  |  M  |  W  |  V  |  Z  | SHIFT |
+--------------|ENTER|-----| GUI | ALT | Num | Nav |---| Sym |SPACE| ALT | GUI |-----| APP |--------------
+
+Colemak-DH
+| TAB   |  Q  |  W  |  F  |  P  |  B  |---------------------------|  J  |  L  |  U  |  Y  |  ;  | BKSPC |
+| CTRL  |  A  |  R  |  S  |  T  |  G  |---------------------------|  M  |  N  |  E  |  I  |  O  |   '   |
+| SHIFT |  Z  |  X  |  C  |  D  |  V  |  ~  |---------------| ESC |  K  |  H  |  ,  |  .  |  /  | SHIFT |
+--------------|ENTER|-----| GUI | ALT | Num | Nav |---| Sym |SPACE| ALT | GUI |-----| APP |--------------
+```
+</details>
+
+## Navigation, Editing and Media Layer
+
+```
+| CAPS  | INS |     |     |     |VOL+ |---------------------------|PG_UP|HOME |     |  END|     | DEL   |
+| CTRL  | GUI | ALT |CTRL |SHIFT|VOL- |---------------------------|PG_DN|LEFT | UP  |RIGHT|     | CTRL  |
+| SHIFT |UNDO | CUT |COPY |PASTE|REDO |MUTE |---------------| ESC |     |WORDL|DOWN |WORDR|RALT | SHIFT |
+--------------|ENTER|-----| GUI | ALT | Num | *** |---| Adj |BSPC | ALT | GUI |-----| APP |--------------
+```
+Holding down the Nav key accesses a navigation and editing layer:
+
+- Navigation arrows are on and below the right home row in a cross pattern.
+  This feels more natural for a column stagger keyboard than an inverted T.
+  The keys below that move left or right by a word.
+  Home, end, and page up/down are beside them.
+- Modifiers in the left home row make it easier to use the arrows
+  to select text with the shift key or move between desktops or tabs.
+- Editing keys appear on the lower left.
+  The edit keys, modifiers and arrows make it easy to move text around without leaving the layer.
+- Delete is in the upper right, and a backspace key is on the thumb.
+- The base layer modifiers and escape are in the same spots as on the base layer,
+  and a right-hand control key is added.
+- Media volume and play keys are on the left, accessible with one hand.
+- AltGr and caps lock fill out the layer.
+- A few keys do nothing and are available for more user-specific needs.
+
+## Symbol and Function Layer
+
+```
+| F12   |  !  |  @  |  #  |  $  |  %  |---------------------------|  ^  |  &  |  *  |  (  |  )  | BSPC  |
+| CTRL  | F1  | F2  | F3  | F4  | F5  |---------------------------|  |  |SHIFT|CTRL | ALT | GUI | CTRL  |
+| SHIFT | F6  | F7  | F8  | F9  | F10 | F11 |---------------| ESC |  \  |  [  |  ]  |  {  |  }  | SHIFT |
+--------------|ENTER|-----| GUI | ALT | Num | Adj |---| *** |SPACE| ALT | GUI |-----| APP |--------------
+```
+Holding down the Sym key accesses a layer of symbol and function keys:
+
+- The symbols usually found on the number keys are in the top row.
+  If desired, you can use these positions for other things,
+  as the symbols are also accessible from the number pad layer with the shift key.
+- The remaining symbols appear on the right.
+- The function keys are on the left, beginning with two rows of five.
+- A row of modifiers in the home row allows the comfortable creation of any modifier and function key combination.  
+- The base layer modifier and escape keys are still available, as is a right-hand control key.
+
+##  Number Pad and Algebraic Layer
+```
+|       |  -  |  +  |  =  |  /  |  *  |---------------------------|  .  |  7  |  8  |  9  |     | BSPC  |
+| CTRL  | GUI | ALT |CTRL |SHIFT|     |---------------------------|  0  |  1  |  2  |  3  |  _  | CTRL  |
+| SHIFT |     |     |     |     |     |     |---------------| ESC |  ,  |  4  |  5  |  6  |     | SHIFT |
+--------------|ENTER|-----| GUI | ALT | *** |     |---|     |BSPC | ALT | GUI |-----| APP |--------------
+```
+Holding down the Num key accesses a number pad and arithmetic symbols:
+
+- The number pad has the lowest numbers swapped into the home row as these are the most commonly used.
+- A row of modifiers in the home row allows the comfortable creation of any modifier and number combination.
+- Symbols commonly used with numbers fill out the layer
+   and can be combined with the home row mods or the existing base layer modifiers on the right hand.
+- Several keys remain unused and await more user-specific needs.
+
+
+## Adjust Layer
+```
+|       |QWERT|DVORK|COLMK|AG_SWAP|AG_NORM|-----------------------|     |     |     |     |     |       |
+|       |     |     |     |     |     |---------------------------|MOD+ |BRI+ |HUE+ |SAT+ |     |       |
+| RESET |     |     |     |     |     |     |--------------|RGBTOG|MOD- |BRI- |HUE- |SAT- |     |       |
+--------------|     |-----|     |     |     | *** |---| *** |     |     |     |-----|     |--------------
+```
+Simultaneously holding down the Nav and Sym keys enables keys to adjust various keyboard settings:
+
+- The base layer can be set to QWERTY, Colemak-DH or Dvorak,
+  but the keyboard reverts to QWERTY each time it is plugged in.
+- Alt/option and GUI/command can be swapped for mac users or restored to the windows norm.
+  This setting persists over power loss.
+- The backlight LEDs can be enabled, disabled, and controlled.
+  These settings also persist over power loss.
+
+
+## Make it Yours
+
+If you are coming from a traditional keyboard,
+  with a row-staggered layout and a large set of physical keys,
+  learning to use a column staggered (ergo) and layer-based keyboard,
+  which uses layers instead of finger reaches to access numbers, symbols and functions,
+  will be an adjustment for your muscle memory and your mental keyboard map.
+This default layout tries to simplify that adjustment by keeping things    in the expected spots when possible.
+
+Yet this layout is only a decent compromise and is not optimal for each user.
+
+The online configurator makes it easy to tweak this layout to your needs.
+You can add additional layers or completely switch around what these do.
+
+Some changes you might consider making:
+- Put some of your most-used key combinations on the unused keys on the navigation layer.
+- If you are on a mac, switch the editing and word navigation keys from ctrl-x to cmd-x.
+- Change the shift keys to one-shot shift keys,
+  where pressing and releasing them shifts the next key pressed.
+  That is much easier on your hands than holding them down.
+  Yet, they can still be held as usual if desired.
+- Instead of holding down the thumb key to keep the symbol layer active,
+  you could use a one-shot layer key.
+  One-shot modifiers are likely less stress on your hands and may even be faster.
+  You would still be able to hold it down instead.
+- Instead of holding down the key for the number pad layer,
+  you could make it a layer toggle, like caps lock is a capitalization toggle key.
+
+Here are some other keymaps for inspiration and ideas:
+- The [Ferris default](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ferris/keymaps/default) uses more advanced features as it has far fewer keys to work with.
+- The [Miryoku](https://github.com/manna-harbour/miryoku/tree/master/docs/reference) keymap ensures that all modifiers are comfortably available with each character key.
+- The [Kyria default](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/default) has different keymap choices and a couple more keys.
+
+A good metaphor is to think of your keymap as a bonsai tree that you tweak slightly over time
+  in response to ideas of how it might serve you better.
+
+
+## Why no keymap.c
+
+Via and the online configurator provide straightforward visual ways to work with a simple layout,
+  and both use a .json keymap format.
+So this default ```keymap.json``` was created with the online configurator
+  and formatted for easier reading and editing.
+
+If you wish, you can edit the ```keymap.json``` directly in a text editor, optionally use the below ```json2hill.py``` to restore the spacing, and then compile and flash it.
+
+Or, you can use the graphical configurator to edit the keymap. To do that:
+
+- Open the [QMK configurator](https://config.qmk.fm/#/handwired/hillside/LAYOUT)
+- Using the green up arrow button, load the keymap from ```qmk_firmware/keyboards/handwired/hillside/keymaps/default/keymap.json```
+- Make the changes you wish to the layout
+- Save the keymap using the green down arrow button.
+- Copy those changes back into your QMK repository and reformat for easy reading using the format script:
+```
+./keyboards/handwired/hillside/keymaps/json2hill.py --input <Your download directory>/default.json > ./keyboards/handwired/hillside/keymaps/default/keymap.json
+```
+   You may need to make that script executable with ```chmod +x```. After your keymap is safely copied and formated, you may want to remove the keymap from your download directory so later downloads will automatically receive the same file name.
+
+After either method of editing, compile and flash the keymap as usual.
+
+You can combine a .json based keymap with more advanced features specified in .c files
+  with a bit more complexity.
+For example, see
+[pierrec83's Kyria map](https://github.com/qmk/qmk_firmware/tree/master/keyboards/splitkb/kyria/keymaps/pierrec83).
diff --git a/keyboards/handwired/hillside/keymaps/json2hill.py b/keyboards/handwired/hillside/keymaps/json2hill.py
new file mode 100755
index 0000000000..a9971c0d78
--- /dev/null
+++ b/keyboards/handwired/hillside/keymaps/json2hill.py
@@ -0,0 +1,136 @@
+#!/usr/bin/env python3
+
+# Copyright 2020-2021 Pierre Viseu Chevalier, Michael McCoyd (@pierrechevalier83, @mmccoyd)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+"""Pretty print keymap json in more readable row/side organized format."""
+
+import argparse
+import json
+import sys
+from typing import NamedTuple
+
+"""Print keymap json in row and side format, though as still re-readable json.
+
+For example, for one layer:
+
+ ["KC_TAB" , "KC_Q"   , "KC_W"   , "KC_E"   , "KC_R"   , "KC_T",
+  "KC_Y"   , "KC_U"   , "KC_I"   , "KC_O"   , "KC_P"   , "KC_BSPC",
+
+  "KC_LCTL", "KC_A"   , "KC_S"   , "KC_D"   , "KC_F"   , "KC_G",
+  "KC_H"   , "KC_J"   , "KC_K"   , "KC_L"   , "KC_SCLN", "KC_QUOT",
+
+  "KC_LSFT", "KC_Z"   , "KC_X"   , "KC_C"   , "KC_V"   , "KC_B"   , "KC_GRV",
+  "KC_ESC" , "KC_N"   , "KC_M"   , "KC_COMM", "KC_DOT" , "KC_SLSH", "KC_RSFT",
+
+  "KC_ENT" , "KC_LGUI", "KC_LALT", "MO(5)"  , "MO(3)",
+  "MO(4)"  , "KC_SPC" , "KC_LALT", "KC_RGUI", "KC_APP"
+ ],
+"""
+
+indent_level=4 # number of spaces of initial indent per output line
+
+# The structure of the keymap
+# [[Endpoint of sides with identical widths, side width, mapping to column],...]
+KEYS_TO_COL = [[24, 6, lambda n: n % 6],
+               [38, 7, lambda n: (n - 24) % 7],
+               [48, 5, lambda n: (n - 38) % 5]]
+LAST_KEY = KEYS_TO_COL[-1][0] - 1
+
+def parse_cli():
+    parser = argparse.ArgumentParser(description='Hillside keymap formatter')
+    parser.add_argument("--input", type=argparse.FileType('r'),
+        default=sys.stdin, help="Input keymap "
+                        "(json file produced by qmk configurator)")
+    return parser.parse_args()
+
+class Column(NamedTuple):
+    """Column number within keymap side, if it ends side, and ends row.
+
+    Position within a keyboard row runs from 0 to n and again 0 to n"""
+    num: int
+    ends_side: bool
+    ends_row: bool
+
+def get_col(key_index):
+    """Return Column for key_index."""
+    for keys, num_cols, col_fn in KEYS_TO_COL:
+        if key_index < keys:
+            col_num = col_fn(key_index)
+            return Column(col_num,
+                          ends_side=col_num == num_cols - 1,
+                          ends_row=(keys - 1 - key_index) % (2 * num_cols) == 0)
+
+def format_layers(layers):
+    formatted = indent_level * " " + "\"layers\": [\n"
+
+    # Find max key length per column
+    max_key_length = {}
+    for layer in layers:
+        for (index, keycode) in enumerate(layer):
+            col = get_col(index)
+            max_length = max_key_length.get(col.num)
+            if (not max_length) or len(keycode) > max_length:
+                max_key_length.update({col.num: len(keycode)})
+    # Format each layer
+    for (layer_index, layer) in enumerate(layers):
+        # Opening [
+        formatted += 2 * indent_level * " "
+        formatted += "["
+
+        # Split keys into pairs of left and right rows by key row length
+        for (index, keycode) in enumerate(layer):
+            col = get_col(index)
+
+            # Indent for rows past first
+            if col.num == 0 and index != 0:
+                formatted += (1 + 2 * indent_level) * " "
+
+            # Print key
+            formatted += json.dumps(keycode)
+
+            # End layer, or end side, or space to next key
+            if index == LAST_KEY:
+                formatted += "\n"
+            elif col.ends_side:
+                formatted += ",\n"
+            else:
+                n_spaces = max_key_length[get_col(index).num] - len(keycode)
+                formatted += n_spaces * " "
+                formatted += ", "
+
+            # Split groups of row sides
+            if col.ends_row:
+                formatted += "\n"
+
+        # Closing ] with , or without
+        formatted += 2 * indent_level * " "
+        if layer_index < len(layers) - 1:
+            formatted += "],\n"
+        else:
+            formatted += "]\n"
+
+    formatted += indent_level * " "
+    formatted += "]"
+
+    return formatted
+
+def format_keymap(keymap_json):
+    formatted = "{"
+    for (index, k) in enumerate(keymap_json):
+        if k == "layers":
+            formatted += format_layers(keymap_json[k])
+        else:
+            formatted += f"{indent_level * ' '}{json.dumps(k)}: {json.dumps(keymap_json[k])}"
+        if index < len(keymap_json) - 1:
+            formatted += ","
+        formatted += "\n"
+    formatted += "}"
+    return formatted
+
+def main():
+    args=parse_cli()
+    keymap_json = json.loads(args.input.read())
+    print(format_keymap(keymap_json))
+
+main()
diff --git a/keyboards/handwired/hillside/keymaps/via/keymap.json b/keyboards/handwired/hillside/keymaps/via/keymap.json
new file mode 100644
index 0000000000..8b4810c309
--- /dev/null
+++ b/keyboards/handwired/hillside/keymaps/via/keymap.json
@@ -0,0 +1,101 @@
+{
+  "version": 1,
+  "notes": "",
+  "keyboard": "handwired/hillside/0_1",
+  "author": "@mmccoyd",
+  "keymap": "via",
+  "layout": "LAYOUT",
+  "layers": [
+        ["KC_TAB" , "KC_Q"      , "KC_W"         , "KC_E"      , "KC_R"         , "KC_T",
+         "KC_Y"   , "KC_U"      , "KC_I"         , "KC_O"      , "KC_P"         , "KC_BSPC",
+
+         "KC_LCTL", "KC_A"      , "KC_S"         , "KC_D"      , "KC_F"         , "KC_G",
+         "KC_H"   , "KC_J"      , "KC_K"         , "KC_L"      , "KC_SCLN"      , "KC_QUOT",
+
+         "KC_LSFT", "KC_Z"      , "KC_X"         , "KC_C"      , "KC_V"         , "KC_B"      , "KC_GRV",
+         "KC_ESC" , "KC_N"      , "KC_M"         , "KC_COMM"   , "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
+
+         "KC_ENT" , "KC_LGUI"   , "KC_LALT"      , "MO(5)"     , "MO(3)",
+         "MO(4)"  , "KC_SPC"    , "KC_LALT"      , "KC_RGUI"   , "KC_APP"
+
+        ],
+        ["KC_TAB" , "KC_QUOT"   , "KC_COMM"      , "KC_DOT"    , "KC_P"         , "KC_Y",
+         "KC_F"   , "KC_G"      , "KC_C"         , "KC_R"      , "KC_L"         , "KC_BSPC",
+
+         "KC_LCTL", "KC_A"      , "KC_O"         , "KC_E"      , "KC_U"         , "KC_I",
+         "KC_D"   , "KC_H"      , "KC_T"         , "KC_N"      , "KC_S"         , "KC_SLSH",
+
+         "KC_LSFT", "KC_SCLN"   , "KC_Q"         , "KC_J"      , "KC_K"         , "KC_X"      , "KC_GRV",
+         "KC_ESC" , "KC_B"      , "KC_M"         , "KC_W"      , "KC_V"         , "KC_Z"      , "KC_RSFT",
+
+         "KC_ENT" , "KC_LGUI"   , "KC_LALT"      , "MO(5)"     , "MO(3)",
+         "MO(4)"  , "KC_SPC"    , "KC_LALT"      , "KC_RGUI"   , "KC_APP"
+
+        ],
+        ["KC_TAB" , "KC_Q"      , "KC_W"         , "KC_F"      , "KC_P"         , "KC_B",
+         "KC_J"   , "KC_L"      , "KC_U"         , "KC_Y"      , "KC_SCLN"      , "KC_BSPC",
+
+         "KC_LCTL", "KC_A"      , "KC_R"         , "KC_S"      , "KC_T"         , "KC_G",
+         "KC_M"   , "KC_N"      , "KC_E"         , "KC_I"      , "KC_O"         , "KC_QUOT",
+
+         "KC_LSFT", "KC_Z"      , "KC_X"         , "KC_C"      , "KC_D"         , "KC_V"      , "KC_GRV",
+         "KC_ESC" , "KC_K"      , "KC_H"         , "KC_COMM"   , "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
+
+         "KC_ENT" , "KC_LGUI"   , "KC_LALT"      , "MO(5)"     , "MO(3)",
+         "MO(4)"  , "KC_SPC"    , "KC_LALT"      , "KC_RGUI"   , "KC_APP"
+
+        ],
+        ["KC_CAPS", "KC_INS"    , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_VOLU",
+         "KC_PGUP", "KC_HOME"   , "KC_NO"        , "KC_END"    , "KC_NO"        , "KC_DEL",
+
+         "KC_LCTL", "KC_LGUI"   , "KC_LALT"      , "KC_LCTL"   , "KC_LSFT"      , "KC_VOLD",
+         "KC_PGDN", "KC_LEFT"   , "KC_UP"        , "KC_RGHT"   , "KC_NO"        , "KC_RCTL",
+
+         "KC_LSFT", "LCTL(KC_Z)", "LCTL(KC_X)"   , "LCTL(KC_C)", "LCTL(KC_V)"   , "LCTL(KC_Y)", "KC_MUTE",
+         "KC_ESC" , "KC_NO"     , "LCTL(KC_LEFT)", "KC_DOWN"   , "LCTL(KC_RGHT)", "KC_RALT"   , "KC_RSFT",
+
+         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS",
+         "MO(6)"  , "KC_BSPC"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS"
+
+        ],
+        ["KC_F12" , "KC_EXLM"   , "KC_AT"        , "KC_HASH"   , "KC_DLR"       , "KC_PERC",
+         "KC_CIRC", "KC_AMPR"   , "KC_ASTR"      , "KC_LPRN"   , "KC_RPRN"      , "KC_BSPC",
+
+         "KC_LCTL", "KC_F1"     , "KC_F2"        , "KC_F3"     , "KC_F4"        , "KC_F5",
+         "KC_PIPE", "KC_LSFT"   , "KC_LCTL"      , "KC_LALT"   , "KC_LGUI"      , "KC_RCTL",
+
+         "KC_LSFT", "KC_F6"     , "KC_F7"        , "KC_F8"     , "KC_F9"        , "KC_F10"    , "KC_F11",
+         "KC_ESC" , "KC_BSLS"   , "KC_LBRC"      , "KC_RBRC"   , "KC_LCBR"      , "KC_RCBR"   , "KC_RSFT",
+
+         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "MO(6)",
+         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS"
+
+        ],
+        ["KC_NO"  , "KC_MINS"   , "KC_PLUS"      , "KC_EQL"    , "KC_SLSH"      , "KC_ASTR",
+         "KC_COMM", "KC_7"      , "KC_8"         , "KC_9"      , "KC_NO"        , "KC_TRNS",
+
+         "KC_TRNS", "KC_LGUI"   , "KC_LALT"      , "KC_LCTL"   , "KC_LSFT"      , "KC_NO",
+         "KC_0"   , "KC_1"      , "KC_2"         , "KC_3"      , "KC_UNDS"      , "KC_RCTL",
+
+         "KC_TRNS", "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO",
+         "KC_NO"  , "KC_DOT"    , "KC_4"         , "KC_5"      , "KC_6"         , "KC_NO"     , "KC_TRNS",
+
+         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "KC_NO",
+         "KC_NO"  , "KC_BSPC"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS"
+
+        ],
+        ["KC_NO"  , "DF(0)"     , "DF(1)"        , "DF(2)"     , "AG_SWAP"      , "AG_NORM",
+         "KC_NO"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO",
+
+         "KC_NO"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO",
+         "RGB_MOD", "RGB_VAI"   , "RGB_HUI"      , "RGB_SAI"   , "KC_NO"        , "KC_NO",
+
+         "RESET"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO",
+         "RGB_TOG", "RGB_RMOD"  , "RGB_VAD"      , "RGB_HUD"   , "RGB_SAD"      , "KC_NO"     , "KC_NO",
+
+         "KC_NO"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_TRNS",
+         "KC_TRNS", "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"
+
+        ]
+  ]
+}
diff --git a/keyboards/handwired/hillside/readme.md b/keyboards/handwired/hillside/readme.md
new file mode 100644
index 0000000000..f1ff0f8506
--- /dev/null
+++ b/keyboards/handwired/hillside/readme.md
@@ -0,0 +1,29 @@
+# Hillside
+
+![hillside](https://imgur.com/XW0rX13.png)
+
+[Hillside](https://github.com/mmccoyd/hillside)
+ is a split ergonomic keyboard
+ with 3x6+4+2 choc-spaced keys with aggressive column stagger,
+ a longer thumb arc and a breakoff outer-pinky column.
+
+* Keyboard Maintainer: [Michael McCoyd](https://github.com/mmccoyd)
+* Hardware Supported: ProMicro/Elite-C and compatible
+* Hardware Availability: https://github.com/mmccoyd/hillside
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/hillside/0_1:default
+
+Flashing example for this keyboard:
+
+    make handwired/hillside/0_1:default:flash
+
+## Bootloader
+
+Enter the bootloader by either:
+
+* **Physical reset button**: Briefly press the button on the front of the PCB.
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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).

From ac02260bcb8c71dbafc606ed5311033ec28cc397 Mon Sep 17 00:00:00 2001
From: WestM <93159069+WestMProducts@users.noreply.github.com>
Date: Sat, 8 Jan 2022 18:30:14 -0800
Subject: [PATCH 171/867] Updated Info.json for westm/westmergo (#15530)

* Added WestM keyboard

* Update keyboards/westm/westm68/config.h

* Update keyboards/westm/westm68/config.h

* Update keyboards/westm/westm68/rules.mk

* Update keyboards/westm/westm68/rules.mk

* Update keyboards/westm/westm68/rules.mk

* Updated Ergo as well to match Drashna's recommended changes

* Added layers for VIA and updated keymaps

* Applied missing changes that were done on 68 but not Ergo

* Update keyboards/westm/westmergo/readme.md

* Update keyboards/westm/westmergo/readme.md

* Update keyboards/westm/westm68/readme.md

* Update keyboards/westm/westm68/rules.mk

* Update keyboards/westm/westmergo/rules.mk

* Update keyboards/westm/westm68/rules.mk

* Update keyboards/westm/westmergo/rules.mk

* Update keyboards/westm/westm68/readme.md

* Updated README bootloader  and keymaps

* Updated info.json

* Changed to proper layout (for real this time)

* Updated info.json

* Fixed Alice layout in info.json
---
 keyboards/westm/westmergo/info.json | 138 ++++++++++++++--------------
 1 file changed, 69 insertions(+), 69 deletions(-)

diff --git a/keyboards/westm/westmergo/info.json b/keyboards/westm/westmergo/info.json
index 7b28d17104..c31a65a2ec 100644
--- a/keyboards/westm/westmergo/info.json
+++ b/keyboards/westm/westmergo/info.json
@@ -1,80 +1,80 @@
 {
-    "keyboard_name": "WestMErgo",
-    "url": "https://github.com/WestMProducts",
-    "maintainer": "WestM",
+    "keyboard_name": "WestMErgo", 
+    "url": "https://github.com/WestMProducts", 
+    "maintainer": "WestM", 
     "layouts": {
         "LAYOUT_alice": {
             "layout": [
-                {"label":"Esc", "x":0.5, "y":0},
-                {"label":"`", "x":1.75, "y":0.25},
-                {"label":"1", "x":2.75, "y":0.25},
-                {"label":"2", "x":3.75, "y":0},
-                {"label":"3", "x":4.75, "y":0.25},
-                {"label":"4", "x":5.75, "y":0.25},
-                {"label":"5", "x":6.75, "y":0.25},
-                {"label":"6", "x":7.75, "y":0.25},
-                {"label":"7", "x":11, "y":0.25},
-                {"label":"8", "x":12, "y":0.25},
-                {"label":"9", "x":13, "y":0.25},
-                {"label":"0", "x":14, "y":0.25},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0.25},
-                {"label":"Backspace", "x":17, "y":0.25, "w":2},
+                {"label":"K1E", "x":0, "y":0},
+                {"label":"K00", "x":1.5, "y":0},
+                {"label":"K01", "x":2.5, "y":0},
+                {"label":"K02", "x":3.5, "y":0},
+                {"label":"K03", "x":4.5, "y":0},
+                {"label":"K04", "x":5.5, "y":0},
+                {"label":"K05", "x":6.5, "y":0},
+                {"label":"K06", "x":7.5, "y":0},
+                {"label":"K07", "x":10.5, "y":0},
+                {"label":"K08", "x":11.5, "y":0},
+                {"label":"K09", "x":12.5, "y":0},
+                {"label":"K0A", "x":13.5, "y":0},
+                {"label":"K0B", "x":14.5, "y":0},
+                {"label":"K0C", "x":15.5, "y":0},
+                {"label":"K0D", "x":16.5, "y":0, "w":2},
 
-                {"label":"PgUp", "x":0.25, "y":1},
-                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
-                {"label":"Q", "x":3, "y":1.25},
-                {"label":"W", "x":4.25, "y":1.25},
-                {"label":"E", "x":5.25, "y":1.25},
-                {"label":"R", "x":6.25, "y":1.25},
-                {"label":"T", "x":7.25, "y":1.25},
-                {"label":"Y", "x":10.5, "y":1.25},
-                {"label":"U", "x":11.5, "y":1.25},
-                {"label":"I", "x":12.5, "y":1.25},
-                {"label":"O", "x":13.5, "y":1.25},
-                {"label":"P", "x":14.75, "y":1.25},
-                {"label":"{", "x":15.75, "y":1.25},
-                {"label":"}", "x":16.75, "y":1.25},
-                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
+                {"label":"K2E", "x":0, "y":1},
+                {"label":"K10", "x":1.5, "y":1, "w":1.5},
+                {"label":"K11", "x":3, "y":1},
+                {"label":"K12", "x":4, "y":1},
+                {"label":"K13", "x":5, "y":1},
+                {"label":"K14", "x":6, "y":1},
+                {"label":"K15", "x":7, "y":1},
+                {"label":"K16", "x":10, "y":1},
+                {"label":"K17", "x":11, "y":1},
+                {"label":"K18", "x":12, "y":1},
+                {"label":"K19", "x":13, "y":1},
+                {"label":"K1A", "x":14, "y":1},
+                {"label":"K1B", "x":15, "y":1},
+                {"label":"K1C", "x":16, "y":1},
+                {"label":"K1D", "x":17, "y":1, "w":1.5},
 
-                {"label":"PgDn", "x":0, "y":2},
-                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
-                {"label":"A", "x":3.25, "y":2.25},
-                {"label":"S", "x":4.5, "y":2.25},
-                {"label":"D", "x":5.5, "y":2.25},
-                {"label":"F", "x":6.5, "y":2.25},
-                {"label":"G", "x":7.5, "y":2.25},
-                {"label":"H", "x":10.75, "y":2.25},
-                {"label":"J", "x":11.75, "y":2.25},
-                {"label":"K", "x":12.75, "y":2.25},
-                {"label":"L", "x":13.75, "y":2.25},
-                {"label":":", "x":15.25, "y":2.25},
-                {"label":"\"", "x":16.25, "y":2.25},
-                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
+                {"label":"K3E", "x":0, "y":2},
+                {"label":"K20", "x":1.5, "y":2, "w":1.75},
+                {"label":"K21", "x":3.25, "y":2},
+                {"label":"K22", "x":4.25, "y":2},
+                {"label":"K23", "x":5.25, "y":2},
+                {"label":"K24", "x":6.25, "y":2},
+                {"label":"K25", "x":7.25, "y":2},
+                {"label":"K26", "x":10.25, "y":2},
+                {"label":"K27", "x":11.25, "y":2},
+                {"label":"K28", "x":12.25, "y":2},
+                {"label":"K29", "x":13.25, "y":2},
+                {"label":"K2A", "x":14.25, "y":2},
+                {"label":"K2B", "x":15.25, "y":2},
+                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
 
-                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
-                {"label":"Z", "x":3.75, "y":3.25},
-                {"label":"X", "x":5, "y":3.25},
-                {"label":"C", "x":6, "y":3.25},
-                {"label":"V", "x":7, "y":3.25},
-                {"label":"B", "x":8, "y":3.25},
-                {"label":"Fn", "x":10.25, "y":3.25},
-                {"label":"N", "x":11.25, "y":3.25},
-                {"label":"M", "x":12.25, "y":3.25},
-                {"label":"<", "x":13.25, "y":3.25},
-                {"label":">", "x":15, "y":3.25},
-                {"label":"?", "x":16, "y":3.25},
-                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
-                {"label":"Fn", "x":18.75, "y":3.25},
+                {"label":"K30", "x":1.5, "y":3, "w":2.25},
+                {"label":"K32", "x":3.75, "y":3},
+                {"label":"K33", "x":4.75, "y":3},
+                {"label":"K34", "x":5.75, "y":3},
+                {"label":"K35", "x":6.75, "y":3},
+                {"label":"K36", "x":7.75, "y":3},
+                {"label":"K37", "x":9.75, "y":3},
+                {"label":"K38", "x":10.75, "y":3},
+                {"label":"K39", "x":11.75, "y":3},
+                {"label":"K3A", "x":12.75, "y":3},
+                {"label":"K3B", "x":13.75, "y":3},
+                {"label":"K3D", "x":14.75, "y":3},
+                {"label":"K3C", "x":15.75, "y":3, "w":1.75},
+                {"label":"K4D", "x":17.5, "y":3},
 
-                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
-                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
-                {"label":"Space", "x":6.5, "y":4.25, "w":2},
-                {"label":"Menu", "x":8.5, "y":4.25},
-                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
-                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
-                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+                {"label":"K40", "x":1.5, "y":4, "w":1.5},
+                {"label":"K42", "x":4.5, "y":4, "w":1.25},
+                {"label":"K44", "x":5.75, "y":4, "w":2.25},
+                {"label":"K46", "x":8, "y":4, "w":1.25},
+                {"label":"K48", "x":9.75, "y":4, "w":2.75},
+                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
+                {"label":"K4E", "x":17, "y":4, "w":1.5}
             ]
         }
     }
-}
+}
\ No newline at end of file

From 69510bab8ee882ac80bb85f340b9ac56639bfa77 Mon Sep 17 00:00:00 2001
From: mechlovin <57231893+mechlovin@users.noreply.github.com>
Date: Sun, 9 Jan 2022 09:33:46 +0700
Subject: [PATCH 172/867] [Keyboard] add Haus PCB (#12434)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/mechlovin/hannah65/config.h           | 3 ++-
 keyboards/mechlovin/hannah65/rev1/haus/config.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h
index 8c94fe4b35..f0aa801396 100644
--- a/keyboards/mechlovin/hannah65/config.h
+++ b/keyboards/mechlovin/hannah65/config.h
@@ -42,10 +42,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define LED_CAPS_LOCK_PIN B9
+#define LED_PIN_ON_STATE  0
 
 #define BACKLIGHT_PIN B8
 #define BACKLIGHT_BREATHING
-#define BACKLIGHT_PWM_DRIVER PWMD3
+#define BACKLIGHT_PWM_DRIVER PWMD4
 #define BACKLIGHT_PWM_CHANNEL 3
 
 #define BACKLIGHT_LEVELS 3
diff --git a/keyboards/mechlovin/hannah65/rev1/haus/config.h b/keyboards/mechlovin/hannah65/rev1/haus/config.h
index 4d517ef475..204bf356e7 100644
--- a/keyboards/mechlovin/hannah65/rev1/haus/config.h
+++ b/keyboards/mechlovin/hannah65/rev1/haus/config.h
@@ -19,4 +19,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define PRODUCT_ID   0x6500
 #define DEVICE_VER   0x0001
-#define PRODUCTION   Haus Rev. 1
\ No newline at end of file
+#define PRODUCT      Haus Rev. 1
\ No newline at end of file

From 0acc0924db3be0647aaeb61fc002641f84d18d59 Mon Sep 17 00:00:00 2001
From: Tate <wintermydog@gmail.com>
Date: Sat, 8 Jan 2022 21:26:44 -0600
Subject: [PATCH 173/867] [Docs] Update feature_tap_dance.md (#14931)

---
 docs/feature_tap_dance.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_tap_dance.md b/docs/feature_tap_dance.md
index 40f9802db3..6edce651cd 100644
--- a/docs/feature_tap_dance.md
+++ b/docs/feature_tap_dance.md
@@ -10,7 +10,7 @@ With this feature one can specify keys that behave differently, based on the amo
 
 First, you will need `TAP_DANCE_ENABLE = yes` in your `rules.mk`, because the feature is disabled by default. This adds a little less than 1k to the firmware size. 
 
-Optionally, you might want to set a custom `TAPPING_TERM` time by adding something like this in you `config.h`:
+Optionally, you might want to set a custom `TAPPING_TERM` time by adding something like this in your `config.h` file:
 
 ```c
 #define TAPPING_TERM 175

From 82d3bdb733194a21fddd5cfa2ebc8234a05bfc6f Mon Sep 17 00:00:00 2001
From: Leo Deng <myst.dg@gmail.com>
Date: Sun, 9 Jan 2022 11:37:03 +0800
Subject: [PATCH 174/867] IS31FL3733 driver for LED Matrix (#15088)

---
 drivers/led/issi/is31fl3733-simple.c | 248 +++++++++++++++++++++++++
 drivers/led/issi/is31fl3733-simple.h | 260 +++++++++++++++++++++++++++
 quantum/led_matrix/led_matrix.h      |   4 +
 3 files changed, 512 insertions(+)
 create mode 100644 drivers/led/issi/is31fl3733-simple.c
 create mode 100644 drivers/led/issi/is31fl3733-simple.h

diff --git a/drivers/led/issi/is31fl3733-simple.c b/drivers/led/issi/is31fl3733-simple.c
new file mode 100644
index 0000000000..777895bf89
--- /dev/null
+++ b/drivers/led/issi/is31fl3733-simple.c
@@ -0,0 +1,248 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2021 Doni Crosby
+ * Copyright 2021 Leo Deng
+ *
+ * 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 "is31fl3733-simple.h"
+#include "i2c_master.h"
+#include "wait.h"
+
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 00 <-> GND
+// 01 <-> SCL
+// 10 <-> SDA
+// 11 <-> VCC
+// ADDR1 represents A1:A0 of the 7-bit address.
+// ADDR2 represents A3:A2 of the 7-bit address.
+// The result is: 0b101(ADDR2)(ADDR1)
+#define ISSI_ADDR_DEFAULT 0x50
+
+#define ISSI_COMMANDREGISTER 0xFD
+#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
+#define ISSI_INTERRUPTMASKREGISTER 0xF0
+#define ISSI_INTERRUPTSTATUSREGISTER 0xF1
+
+#define ISSI_PAGE_LEDCONTROL 0x00  // PG0
+#define ISSI_PAGE_PWM 0x01         // PG1
+#define ISSI_PAGE_AUTOBREATH 0x02  // PG2
+#define ISSI_PAGE_FUNCTION 0x03    // PG3
+
+#define ISSI_REG_CONFIGURATION 0x00  // PG3
+#define ISSI_REG_GLOBALCURRENT 0x01  // PG3
+#define ISSI_REG_RESET 0x11          // PG3
+#define ISSI_REG_SWPULLUP 0x0F       // PG3
+#define ISSI_REG_CSPULLUP 0x10       // PG3
+
+#ifndef ISSI_TIMEOUT
+#    define ISSI_TIMEOUT 100
+#endif
+
+#ifndef ISSI_PERSISTENCE
+#    define ISSI_PERSISTENCE 0
+#endif
+
+#ifndef ISSI_PWM_FREQUENCY
+#    define ISSI_PWM_FREQUENCY 0b000  // PFS - IS31FL3733B only
+#endif
+
+#ifndef ISSI_SWPULLUP
+#    define ISSI_SWPULLUP PUR_0R
+#endif
+
+#ifndef ISSI_CSPULLUP
+#    define ISSI_CSPULLUP PUR_0R
+#endif
+
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];
+
+// These buffers match the IS31FL3733 PWM registers.
+// The control buffers match the PG0 LED On/Off registers.
+// Storing them like this is optimal for I2C transfers to the registers.
+// We could optimize this and take out the unused registers from these
+// buffers and the transfers in IS31FL3733_write_pwm_buffer() but it's
+// probably not worth the extra complexity.
+uint8_t g_pwm_buffer[LED_DRIVER_COUNT][192];
+bool    g_pwm_buffer_update_required[LED_DRIVER_COUNT] = {false};
+
+/* There's probably a better way to init this... */
+#if LED_DRIVER_COUNT == 1
+uint8_t g_led_control_registers[LED_DRIVER_COUNT][24] = {{0}};
+#elif LED_DRIVER_COUNT == 2
+uint8_t g_led_control_registers[LED_DRIVER_COUNT][24] = {{0}, {0}};
+#elif LED_DRIVER_COUNT == 3
+uint8_t g_led_control_registers[LED_DRIVER_COUNT][24] = {{0}, {0}, {0}};
+#elif LED_DRIVER_COUNT == 4
+uint8_t g_led_control_registers[LED_DRIVER_COUNT][24] = {{0}, {0}, {0}, {0}};
+#endif
+bool g_led_control_registers_update_required[LED_DRIVER_COUNT] = {false};
+
+bool IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data) {
+    // If the transaction fails function returns false.
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;
+
+#if ISSI_PERSISTENCE > 0
+    for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) != 0) {
+            return false;
+        }
+    }
+#else
+    if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) != 0) {
+        return false;
+    }
+#endif
+    return true;
+}
+
+bool IS31FL3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer) {
+    // Assumes PG1 is already selected.
+    // If any of the transactions fails function returns false.
+    // Transmit PWM registers in 12 transfers of 16 bytes.
+    // g_twi_transfer_buffer[] is 20 bytes
+
+    // Iterate over the pwm_buffer contents at 16 byte intervals.
+    for (int i = 0; i < 192; i += 16) {
+        g_twi_transfer_buffer[0] = i;
+        // Copy the data from i to i+15.
+        // Device will auto-increment register for data after the first byte
+        // Thus this sets registers 0x00-0x0F, 0x10-0x1F, etc. in one transfer.
+        for (int j = 0; j < 16; j++) {
+            g_twi_transfer_buffer[1 + j] = pwm_buffer[i + j];
+        }
+
+#if ISSI_PERSISTENCE > 0
+        for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) != 0) {
+                return false;
+            }
+        }
+#else
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 17, ISSI_TIMEOUT) != 0) {
+            return false;
+        }
+#endif
+    }
+    return true;
+}
+
+void IS31FL3733_init(uint8_t addr, uint8_t sync) {
+    // In order to avoid the LEDs being driven with garbage data
+    // in the LED driver's PWM registers, shutdown is enabled last.
+    // Set up the mode and other settings, clear the PWM registers,
+    // then disable software shutdown.
+    // Sync is passed so set it according to the datasheet.
+
+    // Unlock the command register.
+    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+
+    // Select PG0
+    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+    // Turn off all LEDs.
+    for (int i = 0x00; i <= 0x17; i++) {
+        IS31FL3733_write_register(addr, i, 0x00);
+    }
+
+    // Unlock the command register.
+    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+
+    // Select PG1
+    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+    // Set PWM on all LEDs to 0
+    // No need to setup Breath registers to PWM as that is the default.
+    for (int i = 0x00; i <= 0xBF; i++) {
+        IS31FL3733_write_register(addr, i, 0x00);
+    }
+
+    // Unlock the command register.
+    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+
+    // Select PG3
+    IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_FUNCTION);
+    // Set de-ghost pull-up resistors (SWx)
+    IS31FL3733_write_register(addr, ISSI_REG_SWPULLUP, ISSI_SWPULLUP);
+    // Set de-ghost pull-down resistors (CSx)
+    IS31FL3733_write_register(addr, ISSI_REG_CSPULLUP, ISSI_CSPULLUP);
+    // Set global current to maximum.
+    IS31FL3733_write_register(addr, ISSI_REG_GLOBALCURRENT, 0xFF);
+    // Disable software shutdown.
+    IS31FL3733_write_register(addr, ISSI_REG_CONFIGURATION, ((sync & 0b11) << 6) | ((ISSI_PWM_FREQUENCY & 0b111) << 3) | 0x01);
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void IS31FL3733_set_value(int index, uint8_t value) {
+    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+        is31_led led = g_is31_leds[index];
+
+        g_pwm_buffer[led.driver][led.v]          = value;
+        g_pwm_buffer_update_required[led.driver] = true;
+    }
+}
+
+void IS31FL3733_set_value_all(uint8_t value) {
+    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+        IS31FL3733_set_value(i, value);
+    }
+}
+
+void IS31FL3733_set_led_control_register(uint8_t index, bool value) {
+    is31_led led = g_is31_leds[index];
+
+    uint8_t control_register = led.v / 8;
+    uint8_t bit_value        = led.v % 8;
+
+    if (value) {
+        g_led_control_registers[led.driver][control_register] |= (1 << bit_value);
+    } else {
+        g_led_control_registers[led.driver][control_register] &= ~(1 << bit_value);
+    }
+
+    g_led_control_registers_update_required[led.driver] = true;
+}
+
+void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index) {
+    if (g_pwm_buffer_update_required[index]) {
+        // Firstly we need to unlock the command register and select PG1.
+        IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_PWM);
+
+        // If any of the transactions fail we risk writing dirty PG0,
+        // refresh page 0 just in case.
+        if (!IS31FL3733_write_pwm_buffer(addr, g_pwm_buffer[index])) {
+            g_led_control_registers_update_required[index] = true;
+        }
+        g_pwm_buffer_update_required[index] = false;
+    }
+}
+
+void IS31FL3733_update_led_control_registers(uint8_t addr, uint8_t index) {
+    if (g_led_control_registers_update_required[index]) {
+        // Firstly we need to unlock the command register and select PG0
+        IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, 0xC5);
+        IS31FL3733_write_register(addr, ISSI_COMMANDREGISTER, ISSI_PAGE_LEDCONTROL);
+        for (int i = 0; i < 24; i++) {
+            IS31FL3733_write_register(addr, i, g_led_control_registers[index][i]);
+        }
+        g_led_control_registers_update_required[index] = false;
+    }
+}
diff --git a/drivers/led/issi/is31fl3733-simple.h b/drivers/led/issi/is31fl3733-simple.h
new file mode 100644
index 0000000000..f071db5e40
--- /dev/null
+++ b/drivers/led/issi/is31fl3733-simple.h
@@ -0,0 +1,260 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2021 Doni Crosby
+ * Copyright 2021 Leo Deng
+ *
+ * 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 <stdint.h>
+#include <stdbool.h>
+#include "progmem.h"
+
+typedef struct is31_led {
+    uint8_t driver : 2;
+    uint8_t v;
+} __attribute__((packed)) is31_led;
+
+extern const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL];
+
+void IS31FL3733_init(uint8_t addr, uint8_t sync);
+bool IS31FL3733_write_register(uint8_t addr, uint8_t reg, uint8_t data);
+bool IS31FL3733_write_pwm_buffer(uint8_t addr, uint8_t *pwm_buffer);
+
+void IS31FL3733_set_value(int index, uint8_t value);
+void IS31FL3733_set_value_all(uint8_t value);
+
+void IS31FL3733_set_led_control_register(uint8_t index, bool value);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index);
+void IS31FL3733_update_led_control_registers(uint8_t addr, uint8_t index);
+
+#define PUR_0R 0x00    // No PUR resistor
+#define PUR_05KR 0x02  // 0.5k Ohm resistor in t_NOL
+#define PUR_3KR 0x03   // 3.0k Ohm resistor on all the time
+#define PUR_4KR 0x04   // 4.0k Ohm resistor on all the time
+#define PUR_8KR 0x05   // 8.0k Ohm resistor on all the time
+#define PUR_16KR 0x06  // 16k Ohm resistor on all the time
+#define PUR_32KR 0x07  // 32k Ohm resistor in t_NOL
+
+#define A_1 0x00
+#define A_2 0x01
+#define A_3 0x02
+#define A_4 0x03
+#define A_5 0x04
+#define A_6 0x05
+#define A_7 0x06
+#define A_8 0x07
+#define A_9 0x08
+#define A_10 0x09
+#define A_11 0x0A
+#define A_12 0x0B
+#define A_13 0x0C
+#define A_14 0x0D
+#define A_15 0x0E
+#define A_16 0x0F
+
+#define B_1 0x10
+#define B_2 0x11
+#define B_3 0x12
+#define B_4 0x13
+#define B_5 0x14
+#define B_6 0x15
+#define B_7 0x16
+#define B_8 0x17
+#define B_9 0x18
+#define B_10 0x19
+#define B_11 0x1A
+#define B_12 0x1B
+#define B_13 0x1C
+#define B_14 0x1D
+#define B_15 0x1E
+#define B_16 0x1F
+
+#define C_1 0x20
+#define C_2 0x21
+#define C_3 0x22
+#define C_4 0x23
+#define C_5 0x24
+#define C_6 0x25
+#define C_7 0x26
+#define C_8 0x27
+#define C_9 0x28
+#define C_10 0x29
+#define C_11 0x2A
+#define C_12 0x2B
+#define C_13 0x2C
+#define C_14 0x2D
+#define C_15 0x2E
+#define C_16 0x2F
+
+#define D_1 0x30
+#define D_2 0x31
+#define D_3 0x32
+#define D_4 0x33
+#define D_5 0x34
+#define D_6 0x35
+#define D_7 0x36
+#define D_8 0x37
+#define D_9 0x38
+#define D_10 0x39
+#define D_11 0x3A
+#define D_12 0x3B
+#define D_13 0x3C
+#define D_14 0x3D
+#define D_15 0x3E
+#define D_16 0x3F
+
+#define E_1 0x40
+#define E_2 0x41
+#define E_3 0x42
+#define E_4 0x43
+#define E_5 0x44
+#define E_6 0x45
+#define E_7 0x46
+#define E_8 0x47
+#define E_9 0x48
+#define E_10 0x49
+#define E_11 0x4A
+#define E_12 0x4B
+#define E_13 0x4C
+#define E_14 0x4D
+#define E_15 0x4E
+#define E_16 0x4F
+
+#define F_1 0x50
+#define F_2 0x51
+#define F_3 0x52
+#define F_4 0x53
+#define F_5 0x54
+#define F_6 0x55
+#define F_7 0x56
+#define F_8 0x57
+#define F_9 0x58
+#define F_10 0x59
+#define F_11 0x5A
+#define F_12 0x5B
+#define F_13 0x5C
+#define F_14 0x5D
+#define F_15 0x5E
+#define F_16 0x5F
+
+#define G_1 0x60
+#define G_2 0x61
+#define G_3 0x62
+#define G_4 0x63
+#define G_5 0x64
+#define G_6 0x65
+#define G_7 0x66
+#define G_8 0x67
+#define G_9 0x68
+#define G_10 0x69
+#define G_11 0x6A
+#define G_12 0x6B
+#define G_13 0x6C
+#define G_14 0x6D
+#define G_15 0x6E
+#define G_16 0x6F
+
+#define H_1 0x70
+#define H_2 0x71
+#define H_3 0x72
+#define H_4 0x73
+#define H_5 0x74
+#define H_6 0x75
+#define H_7 0x76
+#define H_8 0x77
+#define H_9 0x78
+#define H_10 0x79
+#define H_11 0x7A
+#define H_12 0x7B
+#define H_13 0x7C
+#define H_14 0x7D
+#define H_15 0x7E
+#define H_16 0x7F
+
+#define I_1 0x80
+#define I_2 0x81
+#define I_3 0x82
+#define I_4 0x83
+#define I_5 0x84
+#define I_6 0x85
+#define I_7 0x86
+#define I_8 0x87
+#define I_9 0x88
+#define I_10 0x89
+#define I_11 0x8A
+#define I_12 0x8B
+#define I_13 0x8C
+#define I_14 0x8D
+#define I_15 0x8E
+#define I_16 0x8F
+
+#define J_1 0x90
+#define J_2 0x91
+#define J_3 0x92
+#define J_4 0x93
+#define J_5 0x94
+#define J_6 0x95
+#define J_7 0x96
+#define J_8 0x97
+#define J_9 0x98
+#define J_10 0x99
+#define J_11 0x9A
+#define J_12 0x9B
+#define J_13 0x9C
+#define J_14 0x9D
+#define J_15 0x9E
+#define J_16 0x9F
+
+#define K_1 0xA0
+#define K_2 0xA1
+#define K_3 0xA2
+#define K_4 0xA3
+#define K_5 0xA4
+#define K_6 0xA5
+#define K_7 0xA6
+#define K_8 0xA7
+#define K_9 0xA8
+#define K_10 0xA9
+#define K_11 0xAA
+#define K_12 0xAB
+#define K_13 0xAC
+#define K_14 0xAD
+#define K_15 0xAE
+#define K_16 0xAF
+
+#define L_1 0xB0
+#define L_2 0xB1
+#define L_3 0xB2
+#define L_4 0xB3
+#define L_5 0xB4
+#define L_6 0xB5
+#define L_7 0xB6
+#define L_8 0xB7
+#define L_9 0xB8
+#define L_10 0xB9
+#define L_11 0xBA
+#define L_12 0xBB
+#define L_13 0xBC
+#define L_14 0xBD
+#define L_15 0xBE
+#define L_16 0xBF
diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h
index e42be64661..cb7526d6e0 100644
--- a/quantum/led_matrix/led_matrix.h
+++ b/quantum/led_matrix/led_matrix.h
@@ -2,6 +2,7 @@
  * Copyright 2017 Jack Humbert
  * Copyright 2018 Yiancar
  * Copyright 2019 Clueboard
+ * Copyright 2021 Leo Deng
  *
  * 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
@@ -27,6 +28,9 @@
 #ifdef IS31FL3731
 #    include "is31fl3731-simple.h"
 #endif
+#ifdef IS31FL3733
+#    include "is31fl3733-simple.h"
+#endif
 
 #ifndef LED_MATRIX_LED_FLUSH_LIMIT
 #    define LED_MATRIX_LED_FLUSH_LIMIT 16

From 7562f6644f654d0d870d19b5c51d3dd51f9ffb09 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 9 Jan 2022 03:50:44 +0000
Subject: [PATCH 175/867] Slight tidy up of keyboard task loop (#15725)

---
 quantum/keyboard.c | 83 +++++++++++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 35 deletions(-)

diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 3bca05aab7..67f7381f74 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -349,6 +349,32 @@ void keyboard_init(void) {
     keyboard_post_init_kb(); /* Always keep this last */
 }
 
+/** \brief keyboard set leds
+ *
+ * FIXME: needs doc
+ */
+void keyboard_set_leds(uint8_t leds) {
+    if (debug_keyboard) {
+        debug("keyboard_set_led: ");
+        debug_hex8(leds);
+        debug("\n");
+    }
+    led_set(leds);
+}
+
+/** \brief set host led state
+ *
+ * Only sets state if change detected
+ */
+void led_task(void) {
+    static uint8_t led_status = 0;
+    // update LED
+    if (led_status != host_keyboard_leds()) {
+        led_status = host_keyboard_leds();
+        keyboard_set_leds(led_status);
+    }
+}
+
 /** \brief key_event_task
  *
  * This function is responsible for calling into other systems when they need to respond to electrical switch press events.
@@ -363,28 +389,17 @@ void switch_events(uint8_t row, uint8_t col, bool pressed) {
 #endif
 }
 
-/** \brief Keyboard task: Do keyboard routine jobs
+/** \brief Perform scan of keyboard matrix
  *
- * Do routine keyboard jobs:
- *
- * * scan matrix
- * * handle mouse movements
- * * handle midi commands
- * * light LEDs
- *
- * This is repeatedly called as fast as possible.
+ * Any detected changes in state are sent out as part of the processing
  */
-void keyboard_task(void) {
+bool matrix_scan_task(void) {
     static matrix_row_t matrix_prev[MATRIX_ROWS];
-    static uint8_t      led_status    = 0;
     matrix_row_t        matrix_row    = 0;
     matrix_row_t        matrix_change = 0;
 #ifdef QMK_KEYS_PER_SCAN
     uint8_t keys_processed = 0;
 #endif
-#ifdef ENCODER_ENABLE
-    bool encoders_changed = false;
-#endif
 
     uint8_t matrix_changed = matrix_scan();
     if (matrix_changed) last_matrix_activity_trigger();
@@ -431,9 +446,24 @@ void keyboard_task(void) {
 
 MATRIX_LOOP_END:
 
-#ifdef DEBUG_MATRIX_SCAN_RATE
     matrix_scan_perf_task();
-#endif
+    return matrix_changed;
+}
+
+/** \brief Keyboard task: Do keyboard routine jobs
+ *
+ * Do routine keyboard jobs:
+ *
+ * * scan matrix
+ * * handle mouse movements
+ * * handle midi commands
+ * * light LEDs
+ *
+ * This is repeatedly called as fast as possible.
+ */
+void keyboard_task(void) {
+    bool matrix_changed = matrix_scan_task();
+    (void)matrix_changed;
 
 #if defined(RGBLIGHT_ENABLE)
     rgblight_task();
@@ -453,7 +483,7 @@ MATRIX_LOOP_END:
 #endif
 
 #ifdef ENCODER_ENABLE
-    encoders_changed = encoder_read();
+    bool encoders_changed = encoder_read();
     if (encoders_changed) last_encoder_activity_trigger();
 #endif
 
@@ -516,22 +546,5 @@ MATRIX_LOOP_END:
     programmable_button_send();
 #endif
 
-    // update LED
-    if (led_status != host_keyboard_leds()) {
-        led_status = host_keyboard_leds();
-        keyboard_set_leds(led_status);
-    }
-}
-
-/** \brief keyboard set leds
- *
- * FIXME: needs doc
- */
-void keyboard_set_leds(uint8_t leds) {
-    if (debug_keyboard) {
-        debug("keyboard_set_led: ");
-        debug_hex8(leds);
-        debug("\n");
-    }
-    led_set(leds);
+    led_task();
 }

From 50d81b63e91c6d16d8f20f52ebd8f216797cab1f Mon Sep 17 00:00:00 2001
From: Uy Bui <uybv.cntt@gmail.com>
Date: Sun, 9 Jan 2022 12:53:45 +0900
Subject: [PATCH 176/867] [Keyboard] Stelo65 (#15102)

* [Keyboard] add new keyboard Stelo

* [Keyboard] Stelo encoder action

* Update keyboards/wekey/stelo/readme.md

* Update keyboards/wekey/stelo/rules.mk

* [Keyboard] change name Stelo to Stelo65
---
 keyboards/wekey/stelo65/config.h              | 150 ++++++++++++++++++
 keyboards/wekey/stelo65/encoder_actions.c     |  57 +++++++
 keyboards/wekey/stelo65/encoder_actions.h     |  21 +++
 keyboards/wekey/stelo65/info.json             |  10 ++
 .../wekey/stelo65/keymaps/default/keymap.c    |  29 ++++
 .../wekey/stelo65/keymaps/default/readme.md   |   1 +
 keyboards/wekey/stelo65/keymaps/via/keymap.c  |  47 ++++++
 keyboards/wekey/stelo65/keymaps/via/rules.mk  |   2 +
 keyboards/wekey/stelo65/readme.md             |  27 ++++
 keyboards/wekey/stelo65/rules.mk              |  22 +++
 keyboards/wekey/stelo65/stelo65.c             |  16 ++
 keyboards/wekey/stelo65/stelo65.h             |  35 ++++
 12 files changed, 417 insertions(+)
 create mode 100644 keyboards/wekey/stelo65/config.h
 create mode 100644 keyboards/wekey/stelo65/encoder_actions.c
 create mode 100644 keyboards/wekey/stelo65/encoder_actions.h
 create mode 100644 keyboards/wekey/stelo65/info.json
 create mode 100644 keyboards/wekey/stelo65/keymaps/default/keymap.c
 create mode 100644 keyboards/wekey/stelo65/keymaps/default/readme.md
 create mode 100644 keyboards/wekey/stelo65/keymaps/via/keymap.c
 create mode 100644 keyboards/wekey/stelo65/keymaps/via/rules.mk
 create mode 100644 keyboards/wekey/stelo65/readme.md
 create mode 100644 keyboards/wekey/stelo65/rules.mk
 create mode 100644 keyboards/wekey/stelo65/stelo65.c
 create mode 100644 keyboards/wekey/stelo65/stelo65.h

diff --git a/keyboards/wekey/stelo65/config.h b/keyboards/wekey/stelo65/config.h
new file mode 100644
index 0000000000..6a5ab4bb98
--- /dev/null
+++ b/keyboards/wekey/stelo65/config.h
@@ -0,0 +1,150 @@
+// Copyright 2021 @wekey (@@wekey)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x5559
+#define PRODUCT_ID   0x0003
+#define DEVICE_VER   0x0001
+#define MANUFACTURER @wekey
+#define PRODUCT      Stelo65
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+
+/*
+ * 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 { F0, E6, D0, D1, C6, F7, F6, F5, F4, F1 }
+#define MATRIX_COL_PINS { C7, B6, B5, B4, D7, D6, D4, D5 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#ifdef ENCODER_ENABLE
+#define ENCODERS_PAD_A { D3 }
+#define ENCODERS_PAD_B { D2 } 
+#define ENCODER_RESOLUTION 2
+
+#define ENCODERS 1
+#define ENCODERS_CW_KEY  { { 4, 7 } }
+#define ENCODERS_CCW_KEY { { 4, 6 } }
+#endif
+
+#define LED_CAPS_LOCK_PIN B3
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/wekey/stelo65/encoder_actions.c b/keyboards/wekey/stelo65/encoder_actions.c
new file mode 100644
index 0000000000..0f32ac2723
--- /dev/null
+++ b/keyboards/wekey/stelo65/encoder_actions.c
@@ -0,0 +1,57 @@
+/* Copyright 2020 Neil Brian Ramirez
+ * Copyright 2021 drashna jael're (@drashna)
+ * Copyright 2021 uybv
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "encoder_actions.h"
+
+#ifdef ENCODER_ENABLE
+
+#    ifdef ENCODERS
+static uint8_t  encoder_state[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[ENCODERS]   = ENCODERS_CCW_KEY;
+#    endif
+
+void encoder_action_unregister(void) {
+#    ifdef ENCODERS
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index]) {
+            keyevent_t encoder_event = (keyevent_t) {
+                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
+                .pressed = false,
+                .time = (timer_read() | 1)
+            };
+            encoder_state[index] = 0;
+            action_exec(encoder_event);
+        }
+    }
+#    endif
+}
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+#    ifdef ENCODERS
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = true,
+        .time = (timer_read() | 1)
+    };
+    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+#    endif
+}
+
+#endif
diff --git a/keyboards/wekey/stelo65/encoder_actions.h b/keyboards/wekey/stelo65/encoder_actions.h
new file mode 100644
index 0000000000..2484af52ae
--- /dev/null
+++ b/keyboards/wekey/stelo65/encoder_actions.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Neil Brian Ramirez
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+void encoder_action_unregister(void);
+
+void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/wekey/stelo65/info.json b/keyboards/wekey/stelo65/info.json
new file mode 100644
index 0000000000..dbaa157b5b
--- /dev/null
+++ b/keyboards/wekey/stelo65/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Stelo65",
+    "url": "",
+    "maintainer": "@wekey",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"esc", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":6, "y":0}, {"label":"7", "x":7, "y":0}, {"label":"8", "x":8, "y":0}, {"label":"9", "x":9, "y":0}, {"label":"0", "x":10, "y":0}, {"label":"-", "x":11, "y":0}, {"label":"=", "x":12, "y":0}, {"label":"bs", "x":13, "y":0}, {"label":"del", "x":14, "y":0}, {"label":"home", "x":15, "y":0}, {"label":"vold", "x":16.25, "y":0}, {"label":"volu", "x":17.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":"end", "x":15, "y":1}, {"label":"caps", "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":"pgup", "x":15, "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":1.75}, {"label":"up", "x":14, "y":3}, {"label":"pgdn", "x":15, "y":3}, {"label":"ctrl", "x":0, "y":4, "w":1.25}, {"label":"gui", "x":1.25, "y":4, "w":1.25}, {"label":"alt", "x":2.5, "y":4, "w":1.25}, {"label":"spacce", "x":3.75, "y":4, "w":6.25}, {"label":"alt", "x":10, "y":4, "w":1.25}, {"label":"ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"left", "x":13, "y":4}, {"label":"down", "x":14, "y":4}, {"label":"right", "x":15, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/wekey/stelo65/keymaps/default/keymap.c b/keyboards/wekey/stelo65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3e55cfdd22
--- /dev/null
+++ b/keyboards/wekey/stelo65/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+// Copyright 2021 @wekey (@@wekey)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[_BASE] = LAYOUT_all(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME, KC_VOLD, KC_VOLU,
+		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_END,  
+		MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP, 
+		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN, 
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT 
+    ),
+
+    [_FN] = LAYOUT_all(
+		RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______, 
+		_______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,          _______, _______, 
+		_______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,          _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP, _______, 
+		_______, _______, _______,                            _______,                            _______, _______,          KC_HOME, KC_PGDN, KC_END 
+    )
+
+};
diff --git a/keyboards/wekey/stelo65/keymaps/default/readme.md b/keyboards/wekey/stelo65/keymaps/default/readme.md
new file mode 100644
index 0000000000..566d02c976
--- /dev/null
+++ b/keyboards/wekey/stelo65/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for stelo65
diff --git a/keyboards/wekey/stelo65/keymaps/via/keymap.c b/keyboards/wekey/stelo65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..3c3b9076c1
--- /dev/null
+++ b/keyboards/wekey/stelo65/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+// Copyright 2021 @wekey (@@wekey)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[_BASE] = LAYOUT_all(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME, KC_VOLD, KC_VOLU,
+		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_END,  
+		MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP, 
+		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN, 
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT 
+	),
+
+	[_FN1] = LAYOUT_all(
+		RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, _______, 
+		_______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP,   _______, _______, _______, _______,          _______, _______, 
+		_______, _______, KC_HOME, KC_PGDN, KC_END,  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,          _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGUP, _______, 
+		_______, _______, _______,                            _______,                            _______, _______,          KC_HOME, KC_PGDN, KC_END 
+	),
+
+	[_FN2] = LAYOUT_all(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, 
+		_______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______  
+	),
+
+	[_FN3] = LAYOUT_all(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, 
+		_______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______  
+	),
+
+};
diff --git a/keyboards/wekey/stelo65/keymaps/via/rules.mk b/keyboards/wekey/stelo65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..16d33cd89f
--- /dev/null
+++ b/keyboards/wekey/stelo65/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+
diff --git a/keyboards/wekey/stelo65/readme.md b/keyboards/wekey/stelo65/readme.md
new file mode 100644
index 0000000000..0a9d106664
--- /dev/null
+++ b/keyboards/wekey/stelo65/readme.md
@@ -0,0 +1,27 @@
+# stelo65
+
+![stelo65](https://i.imgur.com/dvzVYH1h.png)
+
+65% keyboard with encoder.
+
+* Keyboard Maintainer: [@wekey](https://github.com/wekey-dev)
+* Hardware Supported: Stelo65 case, ATMEGA32U4
+* Hardware Availability: Group buy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make stelo65:default
+
+Flashing example for this keyboard:
+
+    make stelo65:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/wekey/stelo65/rules.mk b/keyboards/wekey/stelo65/rules.mk
new file mode 100644
index 0000000000..9754b6df42
--- /dev/null
+++ b/keyboards/wekey/stelo65/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+DEBOUNCE_TYPE	  = sym_defer_pk
+
+SRC += encoder_actions.c
diff --git a/keyboards/wekey/stelo65/stelo65.c b/keyboards/wekey/stelo65/stelo65.c
new file mode 100644
index 0000000000..922f399a6d
--- /dev/null
+++ b/keyboards/wekey/stelo65/stelo65.c
@@ -0,0 +1,16 @@
+// Copyright 2021 @wekey (@@wekey)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "stelo65.h"
+#include "encoder_actions.h"
+
+void matrix_scan_kb(void) {
+    encoder_action_unregister();
+    matrix_scan_user();
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    encoder_action_register(index, clockwise);
+    return true;
+};
diff --git a/keyboards/wekey/stelo65/stelo65.h b/keyboards/wekey/stelo65/stelo65.h
new file mode 100644
index 0000000000..1a26c934a2
--- /dev/null
+++ b/keyboards/wekey/stelo65/stelo65.h
@@ -0,0 +1,35 @@
+// Copyright 2021 @wekey (@@wekey)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+#define ___ KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+	K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K46, K47, \
+	K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      K37, \
+	K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,      K57, \
+	K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76,      K77, \
+	K80, K90, K81,                K83,           K94,      K95, K86, K96,      K97  \
+) { \
+	{ K00, K01, K02, K03, K04, K05, K06, K07 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, ___ }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57 }, \
+    { K60, K61, K62, K63, K64, K65, K66, ___ }, \
+    { K70, K71, K72, K73, K74, K75, K76, K77 }, \
+    { K80, K81, ___, K83, ___, ___, K86, ___ }, \
+    { K90, ___, ___, ___, K94, K95, K96, K97 } \
+}

From 70469d373dfe52c9778289ac2c96ae9c5bf3b2fb Mon Sep 17 00:00:00 2001
From: TW59420 <40019210+TW59420@users.noreply.github.com>
Date: Sun, 9 Jan 2022 11:57:31 +0800
Subject: [PATCH 177/867] [Keyboard] Add MMKZOO65 PCB (#15546)

* Add MMKZOO65 PCB

* Update keyboards/mmkzoo65/rules.mk

* Update keyboards/mmkzoo65/rules.mk
---
 keyboards/mmkzoo65/config.h                 | 48 ++++++++++++
 keyboards/mmkzoo65/info.json                | 81 +++++++++++++++++++++
 keyboards/mmkzoo65/keymaps/default/keymap.c | 53 ++++++++++++++
 keyboards/mmkzoo65/keymaps/via/keymap.c     | 52 +++++++++++++
 keyboards/mmkzoo65/keymaps/via/rules.mk     |  2 +
 keyboards/mmkzoo65/mmkzoo65.c               | 18 +++++
 keyboards/mmkzoo65/mmkzoo65.h               | 32 ++++++++
 keyboards/mmkzoo65/readme.md                | 22 ++++++
 keyboards/mmkzoo65/rules.mk                 | 19 +++++
 9 files changed, 327 insertions(+)
 create mode 100644 keyboards/mmkzoo65/config.h
 create mode 100644 keyboards/mmkzoo65/info.json
 create mode 100644 keyboards/mmkzoo65/keymaps/default/keymap.c
 create mode 100644 keyboards/mmkzoo65/keymaps/via/keymap.c
 create mode 100644 keyboards/mmkzoo65/keymaps/via/rules.mk
 create mode 100644 keyboards/mmkzoo65/mmkzoo65.c
 create mode 100644 keyboards/mmkzoo65/mmkzoo65.h
 create mode 100644 keyboards/mmkzoo65/readme.md
 create mode 100644 keyboards/mmkzoo65/rules.mk

diff --git a/keyboards/mmkzoo65/config.h b/keyboards/mmkzoo65/config.h
new file mode 100644
index 0000000000..18d7c40ca6
--- /dev/null
+++ b/keyboards/mmkzoo65/config.h
@@ -0,0 +1,48 @@
+/* Copyright 2021 TW59420 <https://github.com/TW59420>
+ *
+ * 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       0x7BA1
+#define PRODUCT_ID      0x6505
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    MWStudio
+#define PRODUCT         MMKZOO65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B2, B3, B7, E6, B0 }
+#define MATRIX_COL_PINS { B1, F0, F1, F4, F5, F6, F7, D4, D6, D7, B4, B5, B6, C6, C7 }
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+#define FORCE_NKRO
+
+/* 将USB 轮询速率更改为 1000hz 并为精英游戏每次扫描使用更大的密钥*/
+#define USB_POLLING_INTERVAL_MS  2
+#define QMK_KEYS_PER_SCAN  12
diff --git a/keyboards/mmkzoo65/info.json b/keyboards/mmkzoo65/info.json
new file mode 100644
index 0000000000..682c2238fc
--- /dev/null
+++ b/keyboards/mmkzoo65/info.json
@@ -0,0 +1,81 @@
+{
+    "keyboard_name": "MMKZOO65",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"ESC", "x":0, "y":0},
+                {"label":"1", "x":1, "y":0},
+                {"label":"2", "x":2, "y":0},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0},
+                {"label":"5", "x":5, "y":0},
+                {"label":"6", "x":6, "y":0},
+                {"label":"7", "x":7, "y":0},
+                {"label":"8", "x":8, "y":0},
+                {"label":"9", "x":9, "y":0},
+                {"label":"0", "x":10, "y":0},
+                {"label":"-", "x":11, "y":0},
+                {"label":"=", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Delete", "x":15, "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":"PgUp", "x":15, "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":"PgDn", "x":15, "y":2},
+
+                {"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":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+
+                {"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":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":4, "w":1.25},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
+                {"label":"\u2192", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mmkzoo65/keymaps/default/keymap.c b/keyboards/mmkzoo65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1d5d53f255
--- /dev/null
+++ b/keyboards/mmkzoo65/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 TW59420 <https://github.com/TW59420>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPACE,                            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+	[1] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    ),
+
+	[2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+	[3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+};
+
diff --git a/keyboards/mmkzoo65/keymaps/via/keymap.c b/keyboards/mmkzoo65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..78ca824d29
--- /dev/null
+++ b/keyboards/mmkzoo65/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2021 TW59420 <https://github.com/TW59420>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,     KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPACE,                            KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+	[1] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    ),
+
+	[2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+	[3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/mmkzoo65/keymaps/via/rules.mk b/keyboards/mmkzoo65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mmkzoo65/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mmkzoo65/mmkzoo65.c b/keyboards/mmkzoo65/mmkzoo65.c
new file mode 100644
index 0000000000..09da82dd89
--- /dev/null
+++ b/keyboards/mmkzoo65/mmkzoo65.c
@@ -0,0 +1,18 @@
+/* Copyright 2021 TW59420 <https://github.com/TW59420>
+ *
+ * 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 "mmkzoo65.h"
+
diff --git a/keyboards/mmkzoo65/mmkzoo65.h b/keyboards/mmkzoo65/mmkzoo65.h
new file mode 100644
index 0000000000..59b2b7f56c
--- /dev/null
+++ b/keyboards/mmkzoo65/mmkzoo65.h
@@ -0,0 +1,32 @@
+/* Copyright 2021 TW59420 <https://github.com/TW59420>
+ *
+ * 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( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
+	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
+	K400, K401, K402,                   K406,                   K410, K411, K412, K413, K414 \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO,  K213,  K214 }, \
+	{ K300,  KC_NO,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO }, \
+	{ K400,  K401,  K402,  KC_NO,  KC_NO,  KC_NO,  K406,  KC_NO,  KC_NO,  KC_NO,  K410,  K411,  K412,  K413,  K414 } \
+}
diff --git a/keyboards/mmkzoo65/readme.md b/keyboards/mmkzoo65/readme.md
new file mode 100644
index 0000000000..96a699769a
--- /dev/null
+++ b/keyboards/mmkzoo65/readme.md
@@ -0,0 +1,22 @@
+# MMKZOO65
+
+![MMKZOO65](https://i.imgur.com/f84vVr4.jpg?1)
+
+Support Atmega32u4 keyboard.
+
+* Keyboard Maintainer: [TW59420](https://github.com/TW59420)
+* Hardware Supported: Atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mmkzoo65:default 
+
+Flashing example for this keyboard:
+
+    make mmkzoo65:default:flash
+
+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).
+
+## Bootloader
+* **Physical reset button**: Short press the button on the back of the PCB to enter the Bootloader and flash the firmware
+* **Keycode in layout**: Press the key mapped to RESET if it is available
diff --git a/keyboards/mmkzoo65/rules.mk b/keyboards/mmkzoo65/rules.mk
new file mode 100644
index 0000000000..b018a630b5
--- /dev/null
+++ b/keyboards/mmkzoo65/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no

From 7b27957adf3b960958e2592ce10e29fe866ee2fc Mon Sep 17 00:00:00 2001
From: Domanic Calleja <82970232+Malevolti@users.noreply.github.com>
Date: Sun, 9 Jan 2022 04:02:45 +0000
Subject: [PATCH 178/867] [Keyboard] Delete lyra (located in malevolti/lyra) 
 (#15524)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/lyra/config.h                 | 19 -----
 keyboards/lyra/keymaps/default/config.h | 30 --------
 keyboards/lyra/keymaps/default/keymap.c | 48 -------------
 keyboards/lyra/keymaps/default/rules.mk |  1 -
 keyboards/lyra/keymaps/via/config.h     | 30 --------
 keyboards/lyra/keymaps/via/keymap.c     | 56 ---------------
 keyboards/lyra/keymaps/via/rules.mk     |  2 -
 keyboards/lyra/lyra.c                   | 93 -------------------------
 keyboards/lyra/lyra.h                   | 23 ------
 keyboards/lyra/readme.md                | 20 ------
 keyboards/lyra/rev1/config.h            | 50 -------------
 keyboards/lyra/rev1/info.json           | 90 ------------------------
 keyboards/lyra/rev1/rev1.c              | 17 -----
 keyboards/lyra/rev1/rev1.h              | 39 -----------
 keyboards/lyra/rev1/rules.mk            | 23 ------
 15 files changed, 541 deletions(-)
 delete mode 100644 keyboards/lyra/config.h
 delete mode 100644 keyboards/lyra/keymaps/default/config.h
 delete mode 100644 keyboards/lyra/keymaps/default/keymap.c
 delete mode 100644 keyboards/lyra/keymaps/default/rules.mk
 delete mode 100644 keyboards/lyra/keymaps/via/config.h
 delete mode 100644 keyboards/lyra/keymaps/via/keymap.c
 delete mode 100644 keyboards/lyra/keymaps/via/rules.mk
 delete mode 100644 keyboards/lyra/lyra.c
 delete mode 100644 keyboards/lyra/lyra.h
 delete mode 100644 keyboards/lyra/readme.md
 delete mode 100644 keyboards/lyra/rev1/config.h
 delete mode 100644 keyboards/lyra/rev1/info.json
 delete mode 100644 keyboards/lyra/rev1/rev1.c
 delete mode 100644 keyboards/lyra/rev1/rev1.h
 delete mode 100644 keyboards/lyra/rev1/rules.mk

diff --git a/keyboards/lyra/config.h b/keyboards/lyra/config.h
deleted file mode 100644
index a4606507ce..0000000000
--- a/keyboards/lyra/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-#include "config_common.h"
-
diff --git a/keyboards/lyra/keymaps/default/config.h b/keyboards/lyra/keymaps/default/config.h
deleted file mode 100644
index 9c4bacd36d..0000000000
--- a/keyboards/lyra/keymaps/default/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 100
diff --git a/keyboards/lyra/keymaps/default/keymap.c b/keyboards/lyra/keymaps/default/keymap.c
deleted file mode 100644
index 1d4bef03f2..0000000000
--- a/keyboards/lyra/keymaps/default/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-
-#include QMK_KEYBOARD_H
-//
-// Keymaps
-//
-enum lyra_layers {
-    /* _M_XYZ = Mac Os, _W_XYZ = Win/Linux */
-    _QWERTY,
-    _FUNCTION
-
-};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    // Layer 0
-    [_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_MINS,		KC_EQL,			KC_BSPC,
-    KC_TAB,		KC_LBRC,	KC_Q,		KC_W,				KC_E,		KC_R,		KC_T,				KC_Y,		KC_U,       KC_I,		KC_O,		KC_P,			KC_NUHS,		KC_DEL,			
-    KC_CLCK,	KC_RBRC,	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_NUBS,	KC_Z,		KC_X,       		KC_C,       KC_V,       KC_B,            	KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_SLSH,		KC_UP,			KC_RSFT,
-    KC_LCTL,	KC_LGUI,	KC_LALT,	TT(1),				KC_APP,		KC_PGDN,	KC_SPC,				KC_SPC,		KC_PGUP,	KC_RALT,	KC_RCTL,	KC_LEFT,		KC_DOWN,		KC_RGHT					
-    ),
-
-    // Layer 1
-    [_FUNCTION] = LAYOUT(
-    KC_TRNS,		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_TRNS,
-    KC_TRNS,		KC_TRNS,    KC_TRNS,	KC_TRNS,    KC_TRNS,    KC_TRNS,	KC_TRNS,			KC_TRNS,    KC_TRNS,    KC_TRNS,	KC_TRNS,    KC_TRNS,		KC_TRNS,		KC_TRNS,
-    KC_TRNS,		KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
-    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,			KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS,
-    KC_TRNS,		KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_TRNS,	KC_VOLD,	KC_TRNS,			KC_TRNS,	KC_VOLU,	KC_TRNS,	KC_TRNS,	KC_TRNS,		KC_TRNS,		KC_TRNS	
-    )
-
-};
-
diff --git a/keyboards/lyra/keymaps/default/rules.mk b/keyboards/lyra/keymaps/default/rules.mk
deleted file mode 100644
index c02c449839..0000000000
--- a/keyboards/lyra/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-CONSOLE_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/lyra/keymaps/via/config.h b/keyboards/lyra/keymaps/via/config.h
deleted file mode 100644
index 9c4bacd36d..0000000000
--- a/keyboards/lyra/keymaps/via/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 100
diff --git a/keyboards/lyra/keymaps/via/keymap.c b/keyboards/lyra/keymaps/via/keymap.c
deleted file mode 100644
index efc40d2267..0000000000
--- a/keyboards/lyra/keymaps/via/keymap.c
+++ /dev/null
@@ -1,56 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#include QMK_KEYBOARD_H
-//
-// Keymaps
-//
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    // Layer 0
-    [0] = LAYOUT(
-    KC_ESC,   KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,        KC_7,    KC_8,     KC_9,     KC_0,    KC_MINS,    KC_EQL,     KC_BSPC,
-    KC_TAB,   KC_LBRC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,     KC_I,     KC_O,    KC_P,       KC_NUHS,    KC_DEL,
-    KC_CLCK,  KC_RBRC,  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_NUBS,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,     KC_COMM,  KC_DOT,  KC_SLSH,    KC_UP,      KC_RSFT,
-    KC_LCTL,  KC_LGUI,  KC_LALT,  TT(1),  KC_APP,  KC_PGDN, KC_SPC,      KC_SPC,  KC_PGUP,  KC_RALT,  KC_RCTL, KC_LEFT,    KC_DOWN,    KC_RGHT
-    ),
-
-    // Layer 1
-    [1] = LAYOUT(
-    KC_TRNS,  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_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_TRNS,      KC_TRNS,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS
-    ),
-      // Layer 2
-    [2] = LAYOUT(
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_TRNS,      KC_TRNS,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_TRNS,      KC_TRNS,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS
-    ),
-      // Layer 3
-    [3] = LAYOUT(
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_TRNS,      KC_TRNS,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_VOLD,  KC_TRNS,      KC_TRNS,  KC_VOLU,  KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS
-    )
-};
diff --git a/keyboards/lyra/keymaps/via/rules.mk b/keyboards/lyra/keymaps/via/rules.mk
deleted file mode 100644
index 5e92d952f1..0000000000
--- a/keyboards/lyra/keymaps/via/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-CONSOLE_ENABLE = yes
-VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/lyra/lyra.c b/keyboards/lyra/lyra.c
deleted file mode 100644
index 6b9c47c4a0..0000000000
--- a/keyboards/lyra/lyra.c
+++ /dev/null
@@ -1,93 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  *
-  * 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 "lyra.h"
-
-#ifdef OLED_ENABLE
-
-// 'lyralogooled', 32x128px
-oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
-    if (is_keyboard_master()) {
-        return OLED_ROTATION_270;
-    }
-    return rotation;
-}
-
-bool oled_task_kb(void) {
-    if (!oled_task_user()) {
-        return false;
-    }
-    if (is_keyboard_master()) {
-        oled_write_P(PSTR("      "), false);
-#    ifdef WPM_ENABLE
-      uint8_t n = get_current_wpm();
-        char wpm_counter[4];
-        wpm_counter[3] = '\0';
-        wpm_counter[2] = '0' + n % 10;
-        wpm_counter[1] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' ';
-        wpm_counter[0] = n / 10 ? '0' + n / 10 : ' ';
-        oled_write(wpm_counter, false);
-        oled_write_ln_P(PSTR("   WPM"), false);
-#    else
-        oled_advance_page(true);
-#    endif
-        oled_advance_page(true);
-        led_t led_usb_state = host_keyboard_led_state();
-        oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock);
-        oled_advance_page(true);  oled_advance_page(true);
-        oled_write_ln_P(PSTR("Lyra"), false);
-        oled_write_ln_P(PSTR("v1.1"), false);
-        oled_write_ln_P(PSTR("by"), false);
-        oled_write_P(PSTR("Dom C"), false);
-    } else {
-        static const char PROGMEM QMK_logo[] = {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x78, 0x18, 0x0c, 0x04, 0x06, 0x02,
-            0x02, 0x82, 0xc0, 0xf0, 0x38, 0x8c, 0xf2, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0xc0, 0x80,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x80, 0x40, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0x18, 0x30, 0x20, 0xa0, 0xe0, 0xf8,
-            0x3e, 0x1f, 0x13, 0x0c, 0x06, 0xc3, 0xf0, 0x60, 0x00, 0x80, 0xf0, 0xe0, 0x00, 0x38, 0xfe, 0x67,
-            0x7b, 0xa5, 0xf3, 0xf0, 0x70, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0x70, 0x30, 0x20, 0x00, 0x00,
-            0x00, 0x80, 0x00, 0x00, 0x00, 0x7f, 0xc0, 0xdd, 0xdd, 0xdd, 0xe3, 0x7e, 0x3c, 0x3e, 0x61, 0xdf,
-            0xde, 0xde, 0x01, 0xff, 0xfe, 0x00, 0x80, 0x80, 0x80, 0xff, 0xc0, 0xdf, 0xdf, 0xdf, 0xe0, 0xff,
-            0x7f, 0x3c, 0x62, 0xdd, 0xdd, 0xdd, 0xe3, 0x7e, 0x3c, 0xfe, 0xc1, 0xfd, 0x7d, 0xc3, 0xfd, 0x7d,
-            0xc3, 0xfe, 0xfc, 0x30, 0xea, 0xd5, 0xd5, 0xd5, 0xc3, 0xff, 0xfe, 0x7e, 0xc1, 0xfd, 0x7d, 0x7d,
-            0xc3, 0xfe, 0xfc, 0x3f, 0xe1, 0xff, 0xff, 0x3c, 0x62, 0xdd, 0xdd, 0xdd, 0xf7, 0xe6, 0x00, 0x00,
-            0x00, 0x78, 0xc4, 0xc2, 0x82, 0x82, 0x82, 0x82, 0xc2, 0xe4, 0x74, 0x7c, 0x3f, 0x1f, 0x31, 0x60,
-            0xe0, 0xc0, 0x80, 0x9c, 0xbf, 0xe7, 0xf1, 0x78, 0x3e, 0x1f, 0x0b, 0x04, 0x02, 0x01, 0x00, 0x1c,
-            0x3e, 0x2f, 0x13, 0x10, 0x0c, 0x1e, 0x3f, 0x2f, 0x13, 0x09, 0x1c, 0x3e, 0x2f, 0x10, 0x08, 0x06,
-            0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x06,
-            0x06, 0x06, 0x07, 0x03, 0x7f, 0xc1, 0xbe, 0xbe, 0xbe, 0xa6, 0xe7, 0xc7, 0x60, 0xd4, 0xaa, 0xaa,
-            0xaa, 0x86, 0xfe, 0xfc, 0x7f, 0xc0, 0xff, 0xff, 0x7f, 0xc0, 0xff, 0xff, 0xc4, 0xaa, 0xaa, 0xaa,
-            0xa6, 0xfc, 0xf8, 0xff, 0x02, 0xff, 0xff, 0x60, 0xd4, 0xaa, 0xaa, 0xaa, 0x86, 0xfe, 0xfc, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0x24,
-            0x32, 0x1b, 0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3c, 0x38, 0x38, 0x78, 0x70, 0x70, 0x70, 0x30, 0x38,
-            0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01,
-            0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01,
-            0x01, 0x01, 0x07, 0x0d, 0x0e, 0x07, 0x03, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        };
-        oled_write_raw_P(QMK_logo, sizeof(QMK_logo));
-    }
-    return false;
-}
-#endif
diff --git a/keyboards/lyra/lyra.h b/keyboards/lyra/lyra.h
deleted file mode 100644
index ba0c8344fe..0000000000
--- a/keyboards/lyra/lyra.h
+++ /dev/null
@@ -1,23 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  * 
-  * 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"
-
-
-#ifdef KEYBOARD_lyra_rev1
-    #include "rev1.h"
-#endif
diff --git a/keyboards/lyra/readme.md b/keyboards/lyra/readme.md
deleted file mode 100644
index 575afa3f03..0000000000
--- a/keyboards/lyra/readme.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Lyra Keyboard
-By Domanic Calleja - https://github.com/Malevolti
-
-Lyra is 7x5 keys column-staggered split keyboard. Based on  Sofle, Lily58, Corne and Helix keyboards.
-There is an open source PCB available via https://github.com/Malevolti/Lyra
-Instructions for handwiring and hand-wire specific case STLs are available for home 3d printing
-
-Make example for this keyboard (after setting up your build environment):
-
-    make lyra:default
-
-Flashing example for this keyboard:
-
-    make lyra:default:flash
-
-Press reset button on the keyboard when asked.
-
-Disconnect the first half, connect the second one and repeat the process.
-
-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).
diff --git a/keyboards/lyra/rev1/config.h b/keyboards/lyra/rev1/config.h
deleted file mode 100644
index 3dc9af28aa..0000000000
--- a/keyboards/lyra/rev1/config.h
+++ /dev/null
@@ -1,50 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  * 
-  * 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
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4443  //DC
-#define PRODUCT_ID      0x4C43  //LC
-#define DEVICE_VER      0x3031  //01
-#define MANUFACTURER    Dom
-#define PRODUCT         Lyra
-
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 7
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define TAPPING_TERM 100
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* communication between sides */
-#define USE_SERIAL
-#define SERIAL_USE_MULTI_TRANSACTION
-#define SOFT_SERIAL_PIN D2
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/lyra/rev1/info.json b/keyboards/lyra/rev1/info.json
deleted file mode 100644
index 82dd811fd5..0000000000
--- a/keyboards/lyra/rev1/info.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-    "keyboard_name": "lyra",
-    "url": "",
-    "maintainer": "malevolti",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 0.3},
-                {"x": 1, "y": 0.4},
-                {"x": 2, "y": 0.3},
-                {"x": 3, "y": 0.1},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0.1},
-                {"x": 6, "y": 0.25},
-
-                {"x": 8, "y": 0.25},
-                {"x": 9, "y": 0.1},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0.1},
-                {"x": 12, "y": 0.3},
-                {"x": 13, "y": 0.4},
-                {"x": 14, "y": 0.3},
-
-                {"x": 0, "y": 1.3},
-                {"x": 1, "y": 1.4},
-                {"x": 2, "y": 1.3},
-                {"x": 3, "y": 1.1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1.1},
-                {"x": 6, "y": 1.25},
-
-                {"x": 8, "y": 1.25},
-                {"x": 9, "y": 1.1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1.1},
-                {"x": 12, "y": 1.3},
-                {"x": 13, "y": 1.4},
-                {"x": 14, "y": 1.3},
-
-                {"x": 0, "y": 2.3},
-                {"x": 1, "y": 2.4},
-                {"x": 2, "y": 2.3},
-                {"x": 3, "y": 2.1},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2.1},
-                {"x": 6, "y": 2.25},
-
-                {"x": 8, "y": 2.25},
-                {"x": 9, "y": 2.1},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2.1},
-                {"x": 12, "y": 2.3},
-                {"x": 13, "y": 2.4},
-                {"x": 14, "y": 2.3},
-
-                {"x": 0, "y": 3.3},
-                {"x": 1, "y": 3.4},
-                {"x": 2, "y": 3.3},
-                {"x": 3, "y": 3.1},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3.1},
-                {"x": 6, "y": 3.25},
-
-                {"x": 8, "y": 3.25},
-                {"x": 9, "y": 3.1},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3.1},
-                {"x": 12, "y": 3.3},
-                {"x": 13, "y": 3.4},
-                {"x": 14, "y": 3.3},
-
-                {"x": 0, "y": 4.3},
-                {"x": 1, "y": 4.4},
-                {"x": 2, "y": 4.3},
-                {"x": 3, "y": 4.1},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4.1},
-                {"x": 6.25, "y": 4.5},
-
-                {"x": 7.75, "y": 4.5},
-                {"x": 9, "y": 4.1},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4.1},
-                {"x": 12, "y": 4.3},
-                {"x": 13, "y": 4.4},
-                {"x": 14, "y": 4.3}
-            ]
-        }
-    }
-}
diff --git a/keyboards/lyra/rev1/rev1.c b/keyboards/lyra/rev1/rev1.c
deleted file mode 100644
index 35b44aed16..0000000000
--- a/keyboards/lyra/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 Domanic Calleja
-  * 
-  * 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 "rev1.h"
diff --git a/keyboards/lyra/rev1/rev1.h b/keyboards/lyra/rev1/rev1.h
deleted file mode 100644
index 81b862c5c6..0000000000
--- a/keyboards/lyra/rev1/rev1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Domanic Calleja
-  * 
-  * 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 "lyra.h"
-
-
-#define LAYOUT( \
-	L00, L01, L02, L03, L04, L05, L06,          R00, R01, R02, R03, R04, R05, R06,	\
-	L10, L11, L12, L13, L14, L15, L16,          R10, R11, R12, R13, R14, R15, R16,  \
-	L20, L21, L22, L23, L24, L25, L26,          R20, R21, R22, R23, R24, R25, R26,	\
-	L30, L31, L32, L33, L34, L35, L36,			R30, R31, R32, R33, R34, R35, R36,	\
-	L40, L41, L42, L43, L44, L45, L46,			R40, R41, R42, R43, R44, R45, R46	\
-	) \
-	{ \
-		{ L00, L01, L02, L03, L04, L05, L06 }, \
-		{ L10, L11, L12, L13, L14, L15, L16 }, \
-		{ L20, L21, L22, L23, L24, L25, L26 }, \
-		{ L30, L31, L32, L33, L34, L35, L36 }, \
-		{ L40, L41, L42, L43, L44, L45, L46 }, \
-		{ R06, R05, R04, R03, R02, R01, R00 }, \
-		{ R16, R15, R14, R13, R12, R11, R10 }, \
-		{ R26, R25, R24, R23, R22, R21, R20 }, \
-		{ R36, R35, R34, R33, R32, R31, R30 }, \
-		{ R46, R45, R44, R43, R42, R41, R40 }	\
-	}
diff --git a/keyboards/lyra/rev1/rules.mk b/keyboards/lyra/rev1/rules.mk
deleted file mode 100644
index 003ade7ce7..0000000000
--- a/keyboards/lyra/rev1/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-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
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-SPLIT_KEYBOARD = yes
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-LTO_ENABLE = yes 
\ No newline at end of file

From 1df390c34f95fb3c4e07518cf51438986ec7c621 Mon Sep 17 00:00:00 2001
From: Gabriel Kim <68445851+gabrielkim13@users.noreply.github.com>
Date: Sun, 9 Jan 2022 14:44:33 -0300
Subject: [PATCH 179/867] [Keyboard] Add Meck TKL handwired (#15533)

* Add meck_tkl

* Fix configuration and pin assignment

* Rellocate A10 pin, as it is used by the USB DFU bootloader

* Add volume and media keys to the function keys layer

* Rellocate source files to the handwired keyboards folder and add documentation

* Review changes for PR
- Improve LAYOUT macro to match the keyboard layout.
- Use "kxy" as pin names on the LAYOUT macro.
- Remove unused mcuconf.h and halconf.h.
- Fix README.

* Improve layout macro naming
---
 .../meck_tkl/blackpill_f401/chconf.h          |  39 +++++++
 .../meck_tkl/blackpill_f401/config.h          |  14 +++
 .../meck_tkl/blackpill_f401/rules.mk          |  10 ++
 keyboards/handwired/meck_tkl/config.h         |  47 ++++++++
 keyboards/handwired/meck_tkl/info.json        | 103 ++++++++++++++++++
 .../meck_tkl/keymaps/default/keymap.c         |  29 +++++
 .../meck_tkl/keymaps/default/readme.md        |   1 +
 keyboards/handwired/meck_tkl/meck_tkl.c       |   4 +
 keyboards/handwired/meck_tkl/meck_tkl.h       |  38 +++++++
 keyboards/handwired/meck_tkl/readme.md        |  37 +++++++
 keyboards/handwired/meck_tkl/rules.mk         |  16 +++
 11 files changed, 338 insertions(+)
 create mode 100644 keyboards/handwired/meck_tkl/blackpill_f401/chconf.h
 create mode 100644 keyboards/handwired/meck_tkl/blackpill_f401/config.h
 create mode 100644 keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
 create mode 100644 keyboards/handwired/meck_tkl/config.h
 create mode 100644 keyboards/handwired/meck_tkl/info.json
 create mode 100644 keyboards/handwired/meck_tkl/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/meck_tkl/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/meck_tkl/meck_tkl.c
 create mode 100644 keyboards/handwired/meck_tkl/meck_tkl.h
 create mode 100644 keyboards/handwired/meck_tkl/readme.md
 create mode 100644 keyboards/handwired/meck_tkl/rules.mk

diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/chconf.h b/keyboards/handwired/meck_tkl/blackpill_f401/chconf.h
new file mode 100644
index 0000000000..ad51f8cbe6
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/chconf.h
@@ -0,0 +1,39 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/meck_tkl/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
+
+#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
+
+#define CH_CFG_FACTORY_SEMAPHORES TRUE
+
+#define CH_CFG_FACTORY_MAILBOXES TRUE
+
+#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
+
+#define CH_CFG_FACTORY_PIPES TRUE
+
+#include_next <chconf.h>
+
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/config.h b/keyboards/handwired/meck_tkl/blackpill_f401/config.h
new file mode 100644
index 0000000000..cca2eac3a9
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/config.h
@@ -0,0 +1,14 @@
+// Copyright 2021 Gabriel Kim (@gabrielkim13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define MATRIX_ROW_PINS \
+    { B15, A8, A9, B14, A15, B3 }
+#define MATRIX_COL_PINS \
+    { B4, B5, B6, B7, B8, B9, A1, A2, A3, A4, A5, A6, A7, B0, B1, A0, B10 }
+#define UNUSED_PINS \
+    { A10, A11, A12, B2, B12, C14, C15 }
+
+#define LED_CAPS_LOCK_PIN C13
+#define LED_PIN_ON_STATE 0
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
new file mode 100644
index 0000000000..e01b22e8fd
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
@@ -0,0 +1,10 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h
new file mode 100644
index 0000000000..5c22e781e4
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/config.h
@@ -0,0 +1,47 @@
+// Copyright 2021 Gabriel Kim (@gabrielkim13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x474B
+#define PRODUCT_ID   0x0001
+#define DEVICE_VER   0x0001
+#define MANUFACTURER gabrielkim13
+#define PRODUCT      Meck TKL
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/*
+ * 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)
+ *
+ */
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/info.json
new file mode 100644
index 0000000000..5976b67584
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/info.json
@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "meck_tkl",
+    "url": "github.com/gabrielkim13",
+    "maintainer": "gabrielkim13",
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 2, "y": 0 },
+                { "label": "F2", "x": 3, "y": 0 },
+                { "label": "F3", "x": 4, "y": 0 },
+                { "label": "F4", "x": 5, "y": 0 },
+                { "label": "F5", "x": 6.5, "y": 0 },
+                { "label": "F6", "x": 7.5, "y": 0 },
+                { "label": "F7", "x": 8.5, "y": 0 },
+                { "label": "F8", "x": 9.5, "y": 0 },
+                { "label": "F9", "x": 11, "y": 0 },
+                { "label": "F10", "x": 12, "y": 0 },
+                { "label": "F11", "x": 13, "y": 0 },
+                { "label": "F12", "x": 14, "y": 0 },
+                { "label": "Print Screen", "x": 15.25, "y": 0 },
+                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
+                { "label": "Pause", "x": 17.25, "y": 0 },
+
+                { "label": "`", "x": 0, "y": 1.5 },
+                { "label": "1", "x": 1, "y": 1.5 },
+                { "label": "2", "x": 2, "y": 1.5 },
+                { "label": "3", "x": 3, "y": 1.5 },
+                { "label": "4", "x": 4, "y": 1.5 },
+                { "label": "5", "x": 5, "y": 1.5 },
+                { "label": "6", "x": 6, "y": 1.5 },
+                { "label": "7", "x": 7, "y": 1.5 },
+                { "label": "8", "x": 8, "y": 1.5 },
+                { "label": "9", "x": 9, "y": 1.5 },
+                { "label": "0", "x": 10, "y": 1.5 },
+                { "label": "-", "x": 11, "y": 1.5 },
+                { "label": "=", "x": 12, "y": 1.5 },
+                { "label": "Back Space", "x": 13, "y": 1.5, "w": 2 },
+                { "label": "Insert", "x": 15.25, "y": 1.5 },
+                { "label": "Home", "x": 16.25, "y": 1.5 },
+                { "label": "Page Up", "x": 17.25, "y": 1.5 },
+
+                { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 2.5 },
+                { "label": "W", "x": 2.5, "y": 2.5 },
+                { "label": "E", "x": 3.5, "y": 2.5 },
+                { "label": "R", "x": 4.5, "y": 2.5 },
+                { "label": "T", "x": 5.5, "y": 2.5 },
+                { "label": "Y", "x": 6.5, "y": 2.5 },
+                { "label": "U", "x": 7.5, "y": 2.5 },
+                { "label": "I", "x": 8.5, "y": 2.5 },
+                { "label": "O", "x": 9.5, "y": 2.5 },
+                { "label": "P", "x": 10.5, "y": 2.5 },
+                { "label": "[", "x": 11.5, "y": 2.5 },
+                { "label": "]", "x": 12.5, "y": 2.5 },
+                { "label": "\\", "x": 13.5, "y": 2.5, "w": 1.5 },
+                { "label": "Delete", "x": 15.25, "y": 2.5 },
+                { "label": "End", "x": 16.25, "y": 2.5 },
+                { "label": "Page Down", "x": 17.25, "y": 2.5 },
+
+                { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 3.5 },
+                { "label": "S", "x": 2.75, "y": 3.5 },
+                { "label": "D", "x": 3.75, "y": 3.5 },
+                { "label": "F", "x": 4.75, "y": 3.5 },
+                { "label": "G", "x": 5.75, "y": 3.5 },
+                { "label": "H", "x": 6.75, "y": 3.5 },
+                { "label": "J", "x": 7.75, "y": 3.5 },
+                { "label": "K", "x": 8.75, "y": 3.5 },
+                { "label": "L", "x": 9.75, "y": 3.5 },
+                { "label": ";", "x": 10.75, "y": 3.5 },
+                { "label": "'", "x": 11.75, "y": 3.5 },
+                { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 },
+
+                { "label": "Left Shift", "x": 0, "y": 4.5, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 4.5 },
+                { "label": "X", "x": 3.25, "y": 4.5 },
+                { "label": "C", "x": 4.25, "y": 4.5 },
+                { "label": "V", "x": 5.25, "y": 4.5 },
+                { "label": "B", "x": 6.25, "y": 4.5 },
+                { "label": "N", "x": 7.25, "y": 4.5 },
+                { "label": "M", "x": 8.25, "y": 4.5 },
+                { "label": ",", "x": 9.25, "y": 4.5 },
+                { "label": ".", "x": 10.25, "y": 4.5 },
+                { "label": "/", "x": 11.25, "y": 4.5 },
+                { "label": "Right Shift", "x": 12.25, "y": 4.5, "w": 2.75 },
+                { "label": "Up", "x": 16.25, "y": 4.5 },
+
+                { "label": "Left Ctrl", "x": 0, "y": 5.5, "w": 1.25 },
+                { "label": "Left OS", "x": 1.25, "y": 5.5, "w": 1.25 },
+                { "label": "Left Alt", "x": 2.5, "y": 5.5, "w": 1.25 },
+                { "label": "Space", "x": 3.75, "y": 5.5, "w": 6.25 },
+                { "label": "Right Alt", "x": 10, "y": 5.5, "w": 1.25 },
+                { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 },
+                { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 },
+                { "label": "Right Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 },
+                { "label": "Left", "x": 15.25, "y": 5.5 },
+                { "label": "Down", "x": 16.25, "y": 5.5 },
+                { "label": "Right", "x": 17.25, "y": 5.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/meck_tkl/keymaps/default/keymap.c b/keyboards/handwired/meck_tkl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1df1318db5
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+// Copyright 2021 Gabriel Kim (@gabrielkim13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_tkl_ansi(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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(1), KC_MENU, KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_tkl_ansi(
+        _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______,            _______, _______, KC_SLEP,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
+    )
+};
diff --git a/keyboards/handwired/meck_tkl/keymaps/default/readme.md b/keyboards/handwired/meck_tkl/keymaps/default/readme.md
new file mode 100644
index 0000000000..9e2994008a
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for meck_tkl
diff --git a/keyboards/handwired/meck_tkl/meck_tkl.c b/keyboards/handwired/meck_tkl/meck_tkl.c
new file mode 100644
index 0000000000..2668b440ec
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/meck_tkl.c
@@ -0,0 +1,4 @@
+// Copyright 2021 Gabriel Kim (@gabrielkim13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "meck_tkl.h"
diff --git a/keyboards/handwired/meck_tkl/meck_tkl.h b/keyboards/handwired/meck_tkl/meck_tkl.h
new file mode 100644
index 0000000000..a7417dbafe
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/meck_tkl.h
@@ -0,0 +1,38 @@
+// Copyright 2021 Gabriel Kim (@gabrielkim13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ *
+ *
+ * | Esc |   |  F1 |  F2 |  F3 |  F4 |  |  F5 |  F6 |  F7 |  F8 |  | F9 | F10 | F11 | F12 |  | SLk | Pau | NLk |
+ * |  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  Back  |  | Ins | Hom | PUp |
+ * |  Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \  |  | Del | End | PDn |
+ * |   Caps  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |   Enter  |
+ * |   Shift   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |    Shift     |        |  ^  |
+ * | Ctrl | Win  | alt  |               Space                 | alt  |  fn  | Menu | Ctrl |  |  <  |  v  |  >  |
+ */
+#define LAYOUT_tkl_ansi( \
+     k00 ,      k01 , k02 , k03 , k04 ,   k05 , k06 , k07 , k08 ,   k09 , k0A , k0B , k0C ,    k0D , k0E , k0F , \
+     k10 , k11 , k12 , k13 , k14 , k15 , k16 , k17 , k18 , k19 , k1A , k1B , k1C ,  k1D   ,    k1E , k1F , k1G , \
+      k20  , k21 , k22 , k23 , k24 , k25 , k26 , k27 , k28 , k29 , k2A , k2B , k2C , k2D  ,    k2E , k2F , k2G , \
+       k30   , k31 , k32 , k33 , k34 , k35 , k36 , k37 , k38 , k39 , k3A , k3B ,    k3C   ,                      \
+         k40    , k41 , k42 , k43 , k44 , k45 , k46 , k47 , k48 , k49 , k4A ,     k4B     ,          k4C ,       \
+      k50 ,  k51 ,  k52 ,                k53                  ,  k54 ,  k55 ,  k56 ,  k57 ,    k58 , k59 , k5A   \
+) { \
+    { k00, KC_NO, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3C, KC_NO, KC_NO, KC_NO }, \
+    { k40, KC_NO, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, KC_NO, k4B, KC_NO, k4C, KC_NO }, \
+    { k50, k51, k52, KC_NO, KC_NO, KC_NO, k53, KC_NO, KC_NO, KC_NO, k54, k55, k56, k57, k58, k59, k5A } \
+}
diff --git a/keyboards/handwired/meck_tkl/readme.md b/keyboards/handwired/meck_tkl/readme.md
new file mode 100644
index 0000000000..ec09047dde
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/readme.md
@@ -0,0 +1,37 @@
+# meck_tkl
+
+![meck_tkl](https://i.imgur.com/eIpQTjQ.jpeg)
+
+A standard tenkeyless keyboard, using STM32 Blackpill.
+
+* Keyboard Maintainer: [Gabriel Kim](https://github.com/gabrielkim13)
+* Hardware Supported: Blackpill F401
+* Hardware Availability: [Thingiverse: Mechanical Keyboard - MECH - TKL](https://www.thingiverse.com/thing:4225961)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/meck_tkl:default
+
+Flashing example for this keyboard:
+
+    make handwired/meck_tkl:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+## Wiring instructions
+
+- On Blackpill boards, **avoid** using the following pins, since they will cause either USB enumeration or the DFU bootloader to not work correctly:
+  - **USB-related pins:** `PA10`, `PA11`, `PA12`
+  - **BOOT1 pin:** `PB2`
+
+Sample wiring:
+
+![wiring](https://i.imgur.com/jIDmsNy.jpg)
diff --git a/keyboards/handwired/meck_tkl/rules.mk b/keyboards/handwired/meck_tkl/rules.mk
new file mode 100644
index 0000000000..6213285117
--- /dev/null
+++ b/keyboards/handwired/meck_tkl/rules.mk
@@ -0,0 +1,16 @@
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+AUDIO_SUPPORTED = no
+BACKLIGHT_SUPPORTED = no
+
+DEFAULT_FOLDER = handwired/meck_tkl/blackpill_f401

From 8e17f9911d267a86777cf3e814710ac35e673c62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arda=20K=C4=B1l=C4=B1=C3=A7da=C4=9F=C4=B1?=
 <ardakilicdagi@gmail.com>
Date: Sun, 9 Jan 2022 21:21:54 +0300
Subject: [PATCH 180/867] [Keymap] Ardakilic keymap for crkbd added (#13745)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/crkbd/keymaps/ardakilic/README.md |   7 +
 keyboards/crkbd/keymaps/ardakilic/config.h  |  57 +++
 keyboards/crkbd/keymaps/ardakilic/keymap.c  | 489 ++++++++++++++++++++
 keyboards/crkbd/keymaps/ardakilic/rules.mk  |  15 +
 4 files changed, 568 insertions(+)
 create mode 100644 keyboards/crkbd/keymaps/ardakilic/README.md
 create mode 100644 keyboards/crkbd/keymaps/ardakilic/config.h
 create mode 100644 keyboards/crkbd/keymaps/ardakilic/keymap.c
 create mode 100644 keyboards/crkbd/keymaps/ardakilic/rules.mk

diff --git a/keyboards/crkbd/keymaps/ardakilic/README.md b/keyboards/crkbd/keymaps/ardakilic/README.md
new file mode 100644
index 0000000000..5e620f03f0
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ardakilic/README.md
@@ -0,0 +1,7 @@
+# Ardakilic's Corne Layout
+
+This layout is optimised to use Turkish characters on Corne on macOS.
+
+Also, some size optimisations enabled in `rules.mk` and `config.h`.
+
+Bongo cat animation implemented from: https://github.com/nwii/oledbongocat
diff --git a/keyboards/crkbd/keymaps/ardakilic/config.h b/keyboards/crkbd/keymaps/ardakilic/config.h
new file mode 100644
index 0000000000..78602b22ab
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ardakilic/config.h
@@ -0,0 +1,57 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
+
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 200
+#define PERMISSIVE_HOLD
+#define IGNORE_MOD_TAP_INTERRUPT
+#define RETRO_TAPPING
+
+
+
+#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
+
+// size optimisations
+// #define NO_DEBUG
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* CONSOLE_ENABLE = no achieves this
+// Size optimisations
+#ifndef NO_DEBUG
+#define NO_DEBUG
+#endif // !NO_DEBUG
+#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
+#define NO_PRINT
+#endif // !NO_PRINT
+
+#define NO_ACTION_ONESHOT
+// Size optimisations END
+*/
\ No newline at end of file
diff --git a/keyboards/crkbd/keymaps/ardakilic/keymap.c b/keyboards/crkbd/keymaps/ardakilic/keymap.c
new file mode 100644
index 0000000000..758cdbab60
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ardakilic/keymap.c
@@ -0,0 +1,489 @@
+/*
+Copyright 2019 @foostan
+Copyright 2020 Drashna Jaelre <@drashna>
+Copyright 2021 Arda Kilicdagi <GH: @ardakilic, TW: @ardadev>
+
+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
+
+// Layers
+enum {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+  _SPACE,
+  _NUMPAD,
+  _SODA,
+  _ADJUST
+};
+
+//KC_NONUS_BSLASH (\|) is equivalent to ["é] key in Turkish keyboards.
+//KC_GRV (~ `) is equivalent to [<>|] key in Turkish keyboards.
+// KC_SCLN is Turkish s [şŞ] key
+// KC_QUOT is Turkish i [iİ] key
+// KC_COMM is Turkish o [öÖ] key
+// KC_DOT is Turkish c [çÇ] key
+
+// Custom shortcuts specific to Turkish layout
+#define CURLY_OPEN RALT(KC_7)
+#define CURLY_CLOSE RALT(KC_0)
+#define SQUARE_OPEN RALT(KC_8)
+#define SQUARE_CLOSE RALT(KC_9)
+#define DOLLAR_SIGN RALT(KC_4)
+#define BACKSLASH RALT(KC_MINS)
+#define VERTICAL_PIPE RALT(KC_EQL)
+#define BACKTICK RALT(KC_BSLS)
+#define TILDE RALT(KC_RBRC)
+#define NUMBER_SIGN RALT(KC_3) //hashtag sign
+#define LOCKSCREEN LCTL(LSFT(KC_POWER)) // Screen Lock shortcut for OSX
+
+/* 
+// Unicode Turkish characters, in case it's needed
+enum {
+    TR_C, // ç
+    TR_C_L, // Ç
+    TR_I, // ı
+    TR_I_L, // İ
+    TR_G, // ğ
+    TR_G_L, // Ğ
+    TR_S, // ş
+    TR_S_L, // Ş
+    TR_U, // ü
+    TR_U_L, // Ü
+    TR_O, // ö
+    TR_O_L, // Ö
+};
+
+// clang-format off
+const uint32_t PROGMEM unicode_map[] = {
+    [TR_C] = 0x00c7,
+    [TR_C_L] = 0x00e7,
+    [TR_I] = 0x0130,
+    [TR_I_L] = 0x0131,
+    [TR_G] = 0x011e,
+    [TR_G_L] = 0x011f,
+    [TR_S] = 0x015e,
+    [TR_S_L] = 0x015f,
+    [TR_U] = 0x00dc,
+    [TR_U_L] = 0x00fc,
+    [TR_O] = 0x00d6,
+    [TR_O_L] = 0x00f6,
+};
+// clang-format on
+*/
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+ * BASE LAYER
+  [_TPL] = LAYOUT_wrapper( \
+  //,-----------------------------------------------------.      ,----------------------------------------------------.
+    |  Tab   |   Q    |   W    |   E    |   R    |   T    |      |    Y   |   U    |   I    |   O    |   P    |  Bksp |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    | NpdESC |   A    |   S    |   D    |   F    |   G    |      |    H   |   J    |   K    |   L    |   Ş    |  İ    |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    | SftCaps|   Z    |   X    |   C    |   V    |   B    |      |    N   |   M    |   Ö    |   Ç    |   .    | CtlEnt|
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+                                    ,-----------------------,  ,-----------------------.
+                                    |  OS|. | Lwr|, | Space*|  |Sda|Ent|Raise|"| LAlt|.|
+                                   /|-------+-------+-------'  +-------+-------+-------|\
+  ),
+*/
+  [_QWERTY] = LAYOUT_split_3x6_3(
+    KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+    LT(_NUMPAD, KC_ESC), KC_A,  KC_S, KC_D,  KC_F,  KC_G,           KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+    LSFT_T(KC_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B,                  KC_N,   KC_M,  KC_COMM, KC_DOT, KC_SLSH, LCTL_T(KC_ENT), /*KC_ENT*/
+      LGUI_T(KC_SLSH), LT(_LOWER, KC_BSLS),LT(_SPACE, KC_SPC),   LT(_SODA, KC_ENT), LT(_RAISE, KC_NONUS_BSLASH), LALT_T(KC_SLSH)
+
+  ),
+
+/*
+ * LOWER LAYER
+  [_TPL] = LAYOUT_wrapper( \
+  //,-----------------------------------------------------.      ,----------------------------------------------------.
+    |   >    |   !    |   '    |   ^    |   +    |   %    |      |    &   |   /    |   (    |   )    |   =    |  Bksp |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |      |   "$"  |   ?    |   _    |   Ğ    |   Ü    |  -    |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |      |   "["  |   "]"  |   "{"  |   "}"  |   <    |  ">"  |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+                                    ,-----------------------,  ,-----------------------.
+                                    |       |       |       |  |       | ADJUST|       |
+                                   /|-------+-------+-------'  +-------+-------+-------|\
+  ),
+*/
+  [_LOWER] = LAYOUT_split_3x6_3(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,            KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,                   DOLLAR_SIGN,    KC_UNDS,  KC_PLUS,  KC_LBRC,  KC_RBRC,  KC_EQL,
+    KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,                SQUARE_OPEN, SQUARE_CLOSE, CURLY_OPEN, CURLY_CLOSE, KC_GRV, LSFT(KC_GRV),
+                                _______, _______, _______,        _______, MO(_ADJUST), _______
+  ),
+
+/*
+ * RAISE LAYER
+  [_TPL] = LAYOUT_wrapper( \
+  //,-----------------------------------------------------.      ,----------------------------------------------------.
+    |   Tab  |   1    |   2    |   3    |   4    |   5    |      |    6   |   7    |   8    |   9    |   0    |  Bksp |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |      |        |   *    |   -    |   "\"  |   "|"  |  ,    |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    |   F7   |   F8   |   F9   |   F10  |   F11  |   F12  |      |    '   |   #    |   "    |   "~"  |   "`"  |  <>|  |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+                                    ,-----------------------,  ,-----------------------.
+                                    |       |       |       |  |       |       |       |
+                                   /|-------+-------+-------'  +-------+-------+-------|\
+  ),
+*/
+  [_RAISE] = LAYOUT_split_3x6_3(
+    KC_TAB,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,                       KC_6,  KC_7,  KC_8,  KC_9,  KC_0,  KC_BSPC,
+    KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,                   _______, KC_MINS, KC_EQL,  BACKSLASH, VERTICAL_PIPE, KC_BSLS,
+    KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,                KC_AT, NUMBER_SIGN, KC_NUBS, TILDE, BACKTICK, KC_GRV,
+                                _______, _______, _______,        _______, _______, _______
+  ),
+
+/*
+ * SPACE LAYER
+  [_TPL] = LAYOUT_wrapper( \
+  //,-----------------------------------------------------.      ,----------------------------------------------------.
+    |        |  CMD+1 |  CMD+2 |  CMD+3 |  CMD+4 | CMD+5  |      |  CMD+6 |  CMD+7 |  CMD+8 |  CMD+9 |  CMD+0 | LCKOSX|
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    |        | Brght▼ | Brght▲ |        |        |        |      |  Left  |  Down  |   Up   |  Right |        |       |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    |        |        |        |        |        |        |      |        |  Prev  |   Next |  Vol-  |  Vol+  |  Play |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+                                    ,-----------------------,  ,-----------------------.
+                                    |       |       |       |  |       |       |       |
+                                   /|-------+-------+-------'  +-------+-------+-------|\
+  ),
+*/
+  [_SPACE] = LAYOUT_split_3x6_3(
+    _______, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5),    LGUI(KC_6), LGUI(KC_7), LGUI(KC_8),  LGUI(KC_9), LGUI(KC_0), LOCKSCREEN,
+    _______, KC_BRMD,  KC_BRMU, _______, _______,  _______,      KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______,
+    _______, _______, _______, _______,  _______,  _______,      _______, KC_MPRV, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+                                  _______, _______, _______,    _______, _______, _______
+  ),
+
+/*
+ * NUMPAD LAYER
+ * KC_PDOT is comma on the Turkish layout ¯\_(ツ)_/¯
+  [_TPL] = LAYOUT_wrapper( \
+  //,-----------------------------------------------------.      ,----------------------------------------------------.
+    |        |        |        |        |        |        |      |   =    |  Num7  |  Num8  |  Num9  |   -    |  Bksp |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    |        |        |        |        |        |        |      |   .    |  Num4  |  Num5  |  Num6  |   +    |   *   |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    |        |        |        |        |        |        |      |   ,    |  Num1  |  Num2  |  Num3  |   .    |   /   |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+                                    ,-----------------------,  ,-----------------------.
+                                    |       |       |       |  |  Ent  |  Num0 |  Num0 |
+                                   /|-------+-------+-------'  +-------+-------+-------|\
+  ),
+*/
+  [_NUMPAD] = LAYOUT_split_3x6_3(
+    _______,  _______,  _______,  _______,  _______,  _______,        KC_PEQL, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_BSPC,
+    _______,  _______,  _______,  _______,  _______,  _______,        KC_SLSH, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PAST,
+    _______,  _______,  _______,  _______,  _______,  _______,        KC_PDOT, KC_P1, KC_P2, KC_P3, KC_SLSH, KC_PSLS,
+                                      _______, _______, _______,    KC_PENT, KC_P0, KC_P0
+  ),
+
+
+  /*
+ * SODA LAYER
+ * KC_PDOT is comma on the Turkish layout ¯\_(ツ)_/¯
+  [_TPL] = LAYOUT_wrapper( \
+  //,-----------------------------------------------------.      ,----------------------------------------------------.
+    |        |        |   Up   |        |        |        |      |        |        |        |        |        |       |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    |        |  Left  |  Down  | Right  |        |        |      |        |        |        |        |        |       |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    |        |        |        |        |        |        |      |        |        |        |        |        |       |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+                                    ,-----------------------,  ,-----------------------.
+                                    |       |       |       |  |       |       |       |
+                                   /|-------+-------+-------'  +-------+-------+-------|\
+  ),
+*/
+  [_SODA] = LAYOUT_split_3x6_3(
+    _______,  _______,  KC_UP,  _______,  _______,  _______,        _______, _______, _______, _______, _______, _______,
+    _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,      _______, _______, _______, _______, _______, _______,
+    _______,  _______,  _______,  _______,  _______,  _______,      _______, _______, _______, _______, _______, _______,
+                                      _______, _______, _______,    _______, _______, _______
+  ),
+
+
+
+/*
+ * ADJUST LAYER
+  [_TPL] = LAYOUT_wrapper( \
+  //,-----------------------------------------------------.      ,----------------------------------------------------.
+    |  RESET | EEPRST |        |        |        |        |      |        |        |        |        |        |       |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    | RGBTog |  HUE▲  |  SAT▲  | BRGHT▲ |        |        |      |        |        |        |        |        |       |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+    | RGBMOD |  HUE▼  |  SAt▼  | BRGHT▼ |        |        |      |        |        |        |        |        |       |
+  //|--------+--------+--------+--------+--------+--------|      |--------+--------+--------+--------+--------+-------|
+                                    ,-----------------------,  ,-----------------------.
+                                    |   OS  |       | Space |  |  Ent  |       |  ALT  |
+                                   /|-------+-------+-------'  +-------+-------+-------|\
+  ),
+*/
+  [_ADJUST] = LAYOUT_split_3x6_3(
+    RESET, EEP_RST, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
+    RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,                    _______, _______, _______, _______, _______, _______,
+    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,                    _______, _______, _______, _______, _______, _______,
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
+  )
+};
+
+
+#ifdef OLED_DRIVER_ENABLE
+// #include <stdio.h>
+
+// bongo cat
+// Taken from
+// https://github.com/nwii/oledbongocat
+// char wpm_str[10]; // sprintf changed with more optimized code
+
+
+// WPM-responsive animation stuff here
+#    define IDLE_FRAMES 5
+#    define IDLE_SPEED 20  // below this wpm value your animation will idle
+
+// #define PREP_FRAMES 1 // uncomment if >1
+
+#    define TAP_FRAMES 2
+#    define TAP_SPEED 40  // above this wpm value typing animation to trigger
+
+#    define ANIM_FRAME_DURATION 200  // how long each frame lasts in ms
+// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
+#    define ANIM_SIZE 636  // number of bytes in array, minimize for adequate firmware size, max is 1024
+
+uint32_t anim_timer         = 0;
+uint32_t anim_sleep         = 0;
+uint8_t  current_idle_frame = 0;
+// uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1
+uint8_t current_tap_frame = 0;
+
+// Code containing pixel art, contains:
+// 5 idle frames, 1 prep frame, and 2 tap frames
+
+// To make your own pixel art:
+// save a png/jpeg of an 128x32 image (resource: https://www.pixilart.com/draw )
+// follow this guide up to and including "CONVERT YOUR IMAGE" https://docs.splitkb.com/hc/en-us/articles/360013811280-How-do-I-convert-an-image-for-use-on-an-OLED-display-
+// replace numbers in brackets with your own
+// if you start getting errors when compiling make sure you didn't accedentally delete a bracket
+static void render_anim(void) {
+    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x82, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x60, 0x60, 0x00, 0x01, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x0c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x86, 0x86, 0x40, 0x40, 0x40, 0x40, 0x21, 0x22, 0x22, 0x20, 0x11, 0x11, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x34, 0xc4, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                                              {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x20, 0x18, 0x04, 0x02, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0d, 0x31, 0xc1, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
+    static const char PROGMEM prep[][ANIM_SIZE]            = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
+    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE]   = {
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x64, 0x18, 0x04, 0x12, 0xc2, 0xca, 0x24, 0x88, 0xf0, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x41, 0x42, 0x24, 0x98, 0xc0, 0x88, 0x88, 0x8c, 0x9c, 0x1c, 0x1e, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x08, 0x04, 0x02, 0x04, 0x08, 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1, 0x01, 0x01, 0x02, 0x02, 0x04, 0x84, 0x44, 0x44, 0x42, 0x82, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x80, 0x80, 0x40, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x20, 0x40, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x18, 0x06, 0x01, 0x00, 0x00, 0x0c, 0x03, 0x00, 0x02, 0x18, 0x19, 0x00, 0x05, 0xfe, 0x80, 0x83, 0x83, 0x40, 0x40, 0x40, 0x40, 0x20, 0x21, 0x21, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x04, 0x08, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x01, 0x86, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x20, 0x20, 0x20, 0x10, 0x10, 0x10, 0x10, 0x08, 0x0f, 0x08, 0x08, 0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x61, 0xf0, 0xf8, 0xfc, 0x60, 0x01, 0x01, 0x01, 0x3c, 0x78, 0xf8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+    };
+
+    // assumes 1 frame prep stage
+    void animation_phase(void) {
+        if (get_current_wpm() <= IDLE_SPEED) {
+            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
+        }
+        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
+            // oled_write_raw_P(prep[abs((PREP_FRAMES-1)-current_prep_frame)], ANIM_SIZE); // uncomment if IDLE_FRAMES >1
+            oled_write_raw_P(prep[0], ANIM_SIZE);  // remove if IDLE_FRAMES >1
+        }
+        if (get_current_wpm() >= TAP_SPEED) {
+            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+            oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
+        }
+    }
+    if (get_current_wpm() != 000) {
+        oled_on();  // not essential but turns on animation OLED with any alpha keypress
+        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+            anim_timer = timer_read32();
+            animation_phase();
+        }
+        anim_sleep = timer_read32();
+    } else {
+        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
+            oled_off();
+        } else {
+            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+                anim_timer = timer_read32();
+                animation_phase();
+            }
+        }
+    }
+}
+
+// bongop cat
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (!is_keyboard_master()) {
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  }
+  return rotation;
+}
+
+
+void oled_render_layer_state(void) {
+    oled_write_P(PSTR("Layer: "), false);
+    switch (get_highest_layer(layer_state)) {
+        case _QWERTY:
+            oled_write_ln_P(PSTR("Default"), false);
+            break;
+        case _LOWER:
+            oled_write_ln_P(PSTR("Lower"), false);
+            break;
+        case _RAISE:
+            oled_write_ln_P(PSTR("Raise"), false);
+            break;
+        case _SPACE:
+            oled_write_ln_P(PSTR("Space"), false);
+            break;
+        case _NUMPAD:
+            oled_write_ln_P(PSTR("Numpad"), false);
+            break;
+        case _SODA:
+            oled_write_ln_P(PSTR("Soda"), false);
+            break;
+        case _ADJUST:
+        // case _ADJUST|_LOWER:
+        // case _ADJUST|_RAISE:
+        // case _ADJUST|_LOWER|_RAISE:
+        // case _ADJUST|_LOWER|_RAISE|_SPACE:
+        // case _ADJUST|_LOWER|_RAISE|_SPACE|_NUMPAD|_SODA:
+            oled_write_ln_P(PSTR("Adjust"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("?????"), false);
+    }
+}
+
+
+char keylog_str[24] = {};
+
+const char code_to_name[60] = {
+    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
+    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
+    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
+    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+
+void set_keylog(uint16_t keycode, keyrecord_t *record) {
+  char name = ' ';
+    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
+        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
+  if (keycode < 60) {
+    name = code_to_name[keycode];
+  }
+
+  // update keylog
+  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
+           record->event.key.row, record->event.key.col,
+           keycode, name);
+}
+
+void oled_render_keylog(void) {
+    oled_write(keylog_str, false);
+}
+
+void render_bootmagic_status(bool status) {
+    /* Show Ctrl-Gui Swap options */
+    static const char PROGMEM logo[][2][3] = {
+        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
+        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
+    };
+    if (status) {
+        oled_write_ln_P(logo[0][0], false);
+        oled_write_ln_P(logo[0][1], false);
+    } else {
+        oled_write_ln_P(logo[1][0], false);
+        oled_write_ln_P(logo[1][1], false);
+    }
+}
+
+// void oled_render_logo(void) {
+//    static const char PROGMEM crkbd_logo[] = {
+//        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+//        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+//        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+//        0};
+//    oled_write_P(crkbd_logo, false);
+// }
+
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        oled_render_layer_state();
+        oled_render_keylog();
+    } else {
+        // bongo cat
+        render_anim();  // renders pixelart
+
+        oled_set_cursor(0, 0);                            // sets cursor to (row, column) using charactar spacing (5 rows on 128x32 screen, anything more will overflow back to the top)
+        // sprintf(wpm_str, "WPM:%03d", get_current_wpm());  // edit the string to change wwhat shows up, edit %03d to change how many digits show up
+        // oled_write(wpm_str, false);                       // writes wpm on top left corner of string
+
+        // This way it's more size efficient than calling sprintf
+        oled_write_P(PSTR("WPM: "), false);
+        oled_write(get_u8_str(get_current_wpm(), ' '), false);
+        // This way it's more size efficient than calling sprintf
+
+        led_t led_state = host_keyboard_led_state();  // caps lock stuff, prints CAPS on new line if caps led is on
+
+        oled_set_cursor(0, 1);
+        oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("       "), false);
+        // bongo cat
+
+        //oled_render_logo();
+    }
+    return false;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+    set_keylog(keycode, record);
+  }
+  return true;
+}
+#endif // OLED_DRIVER_ENABLE
diff --git a/keyboards/crkbd/keymaps/ardakilic/rules.mk b/keyboards/crkbd/keymaps/ardakilic/rules.mk
new file mode 100644
index 0000000000..0453ca573a
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ardakilic/rules.mk
@@ -0,0 +1,15 @@
+OLED_ENABLE  = yes
+EXTRAKEY_ENABLE = yes # for media keys
+
+# bongo cat
+WPM_ENABLE = yes
+# bongo cat
+
+# Size optimisations
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no
+LTO_ENABLE = yes
+SPACE_CADET_ENABLE = no
+GRAVE_ESCAPE_ENABLE = no
+MOUSEKEY_ENABLE = no
+# Size optimisations END

From ec78acae690ae8b6122132b810ce663604cd8b9b Mon Sep 17 00:00:00 2001
From: Islam Sharabash <islam.sharabash@gmail.com>
Date: Sun, 9 Jan 2022 11:57:08 -0800
Subject: [PATCH 181/867] [Keyboard] Adding Dygma Raise (#13543)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/handwired/dygma/raise/ansi/ansi.c   |   81 ++
 .../handwired/dygma/raise/ansi/info.json      | 1115 +++++++++++++++++
 keyboards/handwired/dygma/raise/ansi/rules.mk |    0
 keyboards/handwired/dygma/raise/config.h      |   34 +
 keyboards/handwired/dygma/raise/halconf.h     |   21 +
 keyboards/handwired/dygma/raise/iso/info.json | 1115 +++++++++++++++++
 keyboards/handwired/dygma/raise/iso/iso.c     |   79 ++
 keyboards/handwired/dygma/raise/iso/rules.mk  |    0
 .../dygma/raise/keymaps/ansi/keymap.c         |   43 +
 .../dygma/raise/keymaps/ansi/readme.md        |    1 +
 .../dygma/raise/keymaps/default/keymap.c      |   43 +
 .../dygma/raise/keymaps/default/readme.md     |    1 +
 .../dygma/raise/keymaps/iso/keymap.c          |   43 +
 .../dygma/raise/keymaps/iso/readme.md         |    1 +
 keyboards/handwired/dygma/raise/leds.c        |  101 ++
 keyboards/handwired/dygma/raise/leds.h        |   25 +
 keyboards/handwired/dygma/raise/matrix.c      |  104 ++
 keyboards/handwired/dygma/raise/mcuconf.h     |   25 +
 keyboards/handwired/dygma/raise/raise.c       |   22 +
 keyboards/handwired/dygma/raise/raise.h       |   83 ++
 keyboards/handwired/dygma/raise/readme.md     |   55 +
 keyboards/handwired/dygma/raise/rules.mk      |   30 +
 .../dygma/raise/wire-protocol-constants.h     |   51 +
 23 files changed, 3073 insertions(+)
 create mode 100644 keyboards/handwired/dygma/raise/ansi/ansi.c
 create mode 100644 keyboards/handwired/dygma/raise/ansi/info.json
 create mode 100644 keyboards/handwired/dygma/raise/ansi/rules.mk
 create mode 100644 keyboards/handwired/dygma/raise/config.h
 create mode 100644 keyboards/handwired/dygma/raise/halconf.h
 create mode 100644 keyboards/handwired/dygma/raise/iso/info.json
 create mode 100644 keyboards/handwired/dygma/raise/iso/iso.c
 create mode 100644 keyboards/handwired/dygma/raise/iso/rules.mk
 create mode 100644 keyboards/handwired/dygma/raise/keymaps/ansi/keymap.c
 create mode 100644 keyboards/handwired/dygma/raise/keymaps/ansi/readme.md
 create mode 100644 keyboards/handwired/dygma/raise/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/dygma/raise/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/dygma/raise/keymaps/iso/keymap.c
 create mode 100644 keyboards/handwired/dygma/raise/keymaps/iso/readme.md
 create mode 100644 keyboards/handwired/dygma/raise/leds.c
 create mode 100644 keyboards/handwired/dygma/raise/leds.h
 create mode 100644 keyboards/handwired/dygma/raise/matrix.c
 create mode 100644 keyboards/handwired/dygma/raise/mcuconf.h
 create mode 100644 keyboards/handwired/dygma/raise/raise.c
 create mode 100644 keyboards/handwired/dygma/raise/raise.h
 create mode 100644 keyboards/handwired/dygma/raise/readme.md
 create mode 100644 keyboards/handwired/dygma/raise/rules.mk
 create mode 100644 keyboards/handwired/dygma/raise/wire-protocol-constants.h

diff --git a/keyboards/handwired/dygma/raise/ansi/ansi.c b/keyboards/handwired/dygma/raise/ansi/ansi.c
new file mode 100644
index 0000000000..652b6551d2
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/ansi/ansi.c
@@ -0,0 +1,81 @@
+/* Copyright 2018-2021 James Laird-Wah, Islam Sharabash
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+// "led_map" is taken from kaleidoscope
+// LHK = Left Hand Keys
+// LPH = "Leds per hand", which isn't _actually_ the number of leds, but instead
+// is just used for indexing
+#define LHK 33
+#define LPH 72
+
+const uint8_t led_map[DRIVER_LED_TOTAL] = {
+  // left side - 32 keys includes LP: key 19 is missing for ANSI layout
+  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 20, 0xff, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 68, 69,
+
+  // right side - 36 keys includes LP
+  0 + LPH, 1 + LPH, 2 + LPH, 3 + LPH, 4 + LPH, 5 + LPH, 6 + LPH, 15 + LPH, 8 + LPH, 9 + LPH, 10 + LPH, 11 + LPH, 12 + LPH, 13 + LPH, 14 + LPH, 7 + LPH, 16 + LPH, 17 + LPH, 18 + LPH, 19 + LPH,
+  20 + LPH, 21 + LPH, 22 + LPH, 23 + LPH, 24 + LPH, 25 + LPH, 26 + LPH, 27 + LPH, 28 + LPH, 29 + LPH, 30 + LPH, 31 + LPH, 32 + LPH, 33 + LPH, 68 + LPH, 69 + LPH,
+
+  // left under glow - 30
+  34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+
+  // right underglow - 32
+  34 + LPH, 35 + LPH, 36 + LPH, 37 + LPH, 38 + LPH, 39 + LPH, 40 + LPH, 41 + LPH, 42 + LPH, 43 + LPH, 44 + LPH, 45 + LPH, 46 + LPH, 47 + LPH, 48 + LPH, 49 + LPH, 50 + LPH, 51 + LPH,
+  52 + LPH, 53 + LPH, 54 + LPH, 55 + LPH, 56 + LPH, 57 + LPH, 58 + LPH, 59 + LPH, 60 + LPH, 61 + LPH, 62 + LPH, 63 + LPH, 64 + LPH, 65 + LPH, 0xff
+};
+
+// taken from "key_led_map" and reformatted
+// ISO & ANSI (ANSI has no LED at 20, but this key can never be pressed so we can have just one map).
+led_config_t g_led_config = { {
+    // left hand
+    { 0  , 1  , 2  , 3  , 4  , 5      , 6      , NO_LED } ,
+    { 7  , 8  , 9  , 10 , 11 , 12     , NO_LED , NO_LED } ,
+    { 13 , 14 , 15 , 16 , 17 , 18     , NO_LED , NO_LED } ,
+    { 19 , 20 , 21 , 22 , 23 , 24     , 25     , NO_LED } ,
+    { 26 , 27 , 28 , 29 , 30 , NO_LED , 31     , 32     } ,
+
+    // right hand
+    { NO_LED   , 6 + LHK  , 5 + LHK  , 4 + LHK  , 3 + LHK  , 2 + LHK  , 1 + LHK  , 0 + LHK  } ,
+    { 14 + LHK , 13 + LHK , 12 + LHK , 11 + LHK , 10 + LHK , 9 + LHK  , 8 + LHK  , 7 + LHK  } ,
+    { NO_LED   , 21 + LHK , 20 + LHK , 19 + LHK , 18 + LHK , 17 + LHK , 16 + LHK , 15 + LHK } ,
+    { NO_LED   , NO_LED   , 27 + LHK , 26 + LHK , 25 + LHK , 24 + LHK , 23 + LHK , 22 + LHK } ,
+    { 35 + LHK , 34 + LHK , 33 + LHK , 32 + LHK , 31 + LHK , 30 + LHK , 29 + LHK , 28 + LHK }
+  }, {
+    // generated from the svg image of the keyboard, see create-led-config.js
+    {82, 3}, {88, 3}, {94, 3}, {100, 3}, {106, 3}, {112, 3}, {118, 3}, {84, 10}, {91, 10}, {97, 10}, {103, 10}, {109, 10},
+    {115, 10}, {84, 16}, {92, 16}, {98, 16}, {104, 16}, {110, 16}, {116, 16}, {85, 22},
+    {0, 0},
+    {94, 22}, {100, 22}, {106, 22}, {112, 22}, {118, 22}, {83, 28}, {90, 28}, {98, 28}, {106, 28}, {116, 28}, {111, 34},
+    {118, 34}, {168, 3}, {159, 3}, {153, 3}, {147, 3}, {141, 3}, {135, 3}, {129, 3}, {168, 16}, {162, 10}, {156, 10},
+    {150, 10}, {144, 10}, {139, 10}, {133, 10}, {127, 10}, {170, 10}, {159, 16}, {153, 16}, {147, 16}, {141, 16}, {135, 16},
+    {129, 16}, {166, 22}, {154, 22}, {148, 22}, {142, 22}, {136, 22}, {130, 22}, {170, 28}, {163, 28}, {156, 28}, {149, 28},
+    {140, 28}, {131, 28}, {136, 34}, {128, 34}, {78, 13}, {78, 6}, {80, 0}, {87, 0}, {95, 0}, {103, 0}, {111, 0}, {119, 0},
+    {122, 3}, {121, 9}, {120, 15}, {122, 21}, {123, 27}, {123, 33}, {120, 38}, {116, 42}, {114, 48}, {112, 55}, {109, 61},
+    {103, 64}, {96, 64}, {88, 64}, {81, 63}, {76, 60}, {75, 52}, {75, 46}, {74, 38}, {74, 32}, {75, 27}, {77, 21}, {175, 10},
+    {175, 4}, {172, 0}, {164, 0}, {157, 0}, {149, 0}, {142, 0}, {134, 0}, {127, 0}, {123, 3}, {122, 8}, {122, 15}, {124, 21},
+    {124, 27}, {124, 33}, {126, 38}, {131, 42}, {134, 48}, {135, 55}, {137, 61}, {143, 63}, {150, 63}, {158, 63}, {166, 63},
+    {173, 63}, {177, 59}, {178, 49}, {179, 40}, {179, 31}, {177, 25}, {175, 20}, {175, 15}, {123, 54}
+  }, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    0, 
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4
+  }
+};
diff --git a/keyboards/handwired/dygma/raise/ansi/info.json b/keyboards/handwired/dygma/raise/ansi/info.json
new file mode 100644
index 0000000000..f7f9a07c1c
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/ansi/info.json
@@ -0,0 +1,1115 @@
+{
+    "keyboard_name": "Dygma Raise",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/dygma/raise",
+    "maintainer": "ibash",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {
+                    "label": "esc",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "1",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "2",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "3",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "4",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "5",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "6",
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "label": "7",
+                    "x": 8.75,
+                    "y": 0
+                },
+                {
+                    "label": "8",
+                    "x": 9.75,
+                    "y": 0
+                },
+                {
+                    "label": "9",
+                    "x": 10.75,
+                    "y": 0
+                },
+                {
+                    "label": "0",
+                    "x": 11.75,
+                    "y": 0
+                },
+                {
+                    "label": "-",
+                    "x": 12.75,
+                    "y": 0
+                },
+                {
+                    "label": "+",
+                    "x": 13.75,
+                    "y": 0
+                },
+                {
+                    "label": "backspace",
+                    "w": 2,
+                    "x": 14.75,
+                    "y": 0
+                },
+                {
+                    "label": "tab",
+                    "w": 1.5,
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "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": 8.25,
+                    "y": 1
+                },
+                {
+                    "label": "U",
+                    "x": 9.25,
+                    "y": 1
+                },
+                {
+                    "label": "I",
+                    "x": 10.25,
+                    "y": 1
+                },
+                {
+                    "label": "O",
+                    "x": 11.25,
+                    "y": 1
+                },
+                {
+                    "label": "P",
+                    "x": 12.25,
+                    "y": 1
+                },
+                {
+                    "label": "[",
+                    "x": 13.25,
+                    "y": 1
+                },
+                {
+                    "label": "]",
+                    "x": 14.25,
+                    "y": 1
+                },
+                {
+                    "label": "enter",
+                    "h": 2,
+                    "w": 1.25,
+                    "x": 15.5,
+                    "y": 1
+                },
+                {
+                    "label": "caps",
+                    "w": 1.75,
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "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": 8.5,
+                    "y": 2
+                },
+                {
+                    "label": "J",
+                    "x": 9.5,
+                    "y": 2
+                },
+                {
+                    "label": "K",
+                    "x": 10.5,
+                    "y": 2
+                },
+                {
+                    "label": "L",
+                    "x": 11.5,
+                    "y": 2
+                },
+                {
+                    "label": ";",
+                    "x": 12.5,
+                    "y": 2
+                },
+                {
+                    "label": "'",
+                    "x": 13.5,
+                    "y": 2
+                },
+                {
+                    "label": "#",
+                    "x": 14.5,
+                    "y": 2
+                },
+                {
+                    "label": "shift",
+                    "w": 1.25,
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "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": 9,
+                    "y": 3
+                },
+                {
+                    "label": "M",
+                    "x": 10,
+                    "y": 3
+                },
+                {
+                    "label": ",",
+                    "x": 11,
+                    "y": 3
+                },
+                {
+                    "label": ".",
+                    "x": 12,
+                    "y": 3
+                },
+                {
+                    "label": "/",
+                    "x": 13,
+                    "y": 3
+                },
+                {
+                    "label": "shift",
+                    "w": 2.75,
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "label": "ctrl",
+                    "w": 1.25,
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "label": "os",
+                    "w": 1.25,
+                    "x": 1.25,
+                    "y": 4
+                },
+                {
+                    "label": "alt",
+                    "w": 1.25,
+                    "x": 2.5,
+                    "y": 4
+                },
+                {
+                    "label": "...",
+                    "w": 1.5,
+                    "x": 3.75,
+                    "y": 4
+                },
+                {
+                    "label": "\u2014",
+                    "w": 1.5,
+                    "x": 5.25,
+                    "y": 4
+                },
+                {
+                    "label": "\u2014",
+                    "w": 1.5,
+                    "x": 8.75,
+                    "y": 4
+                },
+                {
+                    "label": "...",
+                    "w": 1.5,
+                    "x": 10.25,
+                    "y": 4
+                },
+                {
+                    "label": "alt",
+                    "w": 1.25,
+                    "x": 11.75,
+                    "y": 4
+                },
+                {
+                    "label": "fn",
+                    "w": 1.25,
+                    "x": 13,
+                    "y": 4
+                },
+                {
+                    "label": "os",
+                    "w": 1.25,
+                    "x": 14.25,
+                    "y": 4
+                },
+                {
+                    "label": "ctrl",
+                    "w": 1.25,
+                    "x": 15.5,
+                    "y": 4
+                },
+                {
+                    "label": "..",
+                    "w": 1.5,
+                    "x": 3.75,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "w": 1.5,
+                    "x": 5.25,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "w": 1.5,
+                    "x": 8.75,
+                    "y": 5
+                },
+                {
+                    "label": "..",
+                    "w": 1.5,
+                    "x": 10.25,
+                    "y": 5
+                }
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {
+                    "label": "esc",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "1",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "2",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "3",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "4",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "5",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "6",
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "label": "7",
+                    "x": 8.75,
+                    "y": 0
+                },
+                {
+                    "label": "8",
+                    "x": 9.75,
+                    "y": 0
+                },
+                {
+                    "label": "9",
+                    "x": 10.75,
+                    "y": 0
+                },
+                {
+                    "label": "0",
+                    "x": 11.75,
+                    "y": 0
+                },
+                {
+                    "label": "-",
+                    "x": 12.75,
+                    "y": 0
+                },
+                {
+                    "label": "+",
+                    "x": 13.75,
+                    "y": 0
+                },
+                {
+                    "label": "backspace",
+                    "w": 2,
+                    "x": 14.75,
+                    "y": 0
+                },
+                {
+                    "label": "tab",
+                    "w": 1.5,
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "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": 8.25,
+                    "y": 1
+                },
+                {
+                    "label": "U",
+                    "x": 9.25,
+                    "y": 1
+                },
+                {
+                    "label": "I",
+                    "x": 10.25,
+                    "y": 1
+                },
+                {
+                    "label": "O",
+                    "x": 11.25,
+                    "y": 1
+                },
+                {
+                    "label": "P",
+                    "x": 12.25,
+                    "y": 1
+                },
+                {
+                    "label": "{",
+                    "x": 13.25,
+                    "y": 1
+                },
+                {
+                    "label": "}",
+                    "x": 14.25,
+                    "y": 1
+                },
+                {
+                    "label": "\\",
+                    "w": 1.5,
+                    "x": 15.25,
+                    "y": 1
+                },
+                {
+                    "label": "caps",
+                    "w": 1.75,
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "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": 8.5,
+                    "y": 2
+                },
+                {
+                    "label": "J",
+                    "x": 9.5,
+                    "y": 2
+                },
+                {
+                    "label": "K",
+                    "x": 10.5,
+                    "y": 2
+                },
+                {
+                    "label": "L",
+                    "x": 11.5,
+                    "y": 2
+                },
+                {
+                    "label": ";",
+                    "x": 12.5,
+                    "y": 2
+                },
+                {
+                    "label": "'",
+                    "x": 13.5,
+                    "y": 2
+                },
+                {
+                    "label": "enter",
+                    "w": 2.25,
+                    "x": 14.5,
+                    "y": 2
+                },
+                {
+                    "label": "shift",
+                    "w": 2.25,
+                    "x": 0,
+                    "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": 9,
+                    "y": 3
+                },
+                {
+                    "label": "M",
+                    "x": 10,
+                    "y": 3
+                },
+                {
+                    "label": ",",
+                    "x": 11,
+                    "y": 3
+                },
+                {
+                    "label": ".",
+                    "x": 12,
+                    "y": 3
+                },
+                {
+                    "label": "/",
+                    "x": 13,
+                    "y": 3
+                },
+                {
+                    "label": "shift",
+                    "w": 2.75,
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "label": "ctrl",
+                    "w": 1.25,
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "label": "os",
+                    "w": 1.25,
+                    "x": 1.25,
+                    "y": 4
+                },
+                {
+                    "label": "alt",
+                    "w": 1.25,
+                    "x": 2.5,
+                    "y": 4
+                },
+                {
+                    "label": "...",
+                    "w": 1.5,
+                    "x": 3.75,
+                    "y": 4
+                },
+                {
+                    "label": "\u2014",
+                    "w": 1.5,
+                    "x": 5.25,
+                    "y": 4
+                },
+                {
+                    "label": "\u2014",
+                    "w": 1.5,
+                    "x": 8.75,
+                    "y": 4
+                },
+                {
+                    "label": "...",
+                    "w": 1.5,
+                    "x": 10.25,
+                    "y": 4
+                },
+                {
+                    "label": "alt",
+                    "w": 1.25,
+                    "x": 11.75,
+                    "y": 4
+                },
+                {
+                    "label": "fn",
+                    "w": 1.25,
+                    "x": 13,
+                    "y": 4
+                },
+                {
+                    "label": "os",
+                    "w": 1.25,
+                    "x": 14.25,
+                    "y": 4
+                },
+                {
+                    "label": "ctrl",
+                    "w": 1.25,
+                    "x": 15.5,
+                    "y": 4
+                },
+                {
+                    "label": "..",
+                    "w": 1.5,
+                    "x": 3.75,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "w": 1.5,
+                    "x": 5.25,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "w": 1.5,
+                    "x": 8.75,
+                    "y": 5
+                },
+                {
+                    "label": "..",
+                    "w": 1.5,
+                    "x": 10.25,
+                    "y": 5
+                }
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {
+                    "label": "esc",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "1",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "2",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "3",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "4",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "5",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "6",
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "label": "7",
+                    "x": 8.75,
+                    "y": 0
+                },
+                {
+                    "label": "8",
+                    "x": 9.75,
+                    "y": 0
+                },
+                {
+                    "label": "9",
+                    "x": 10.75,
+                    "y": 0
+                },
+                {
+                    "label": "0",
+                    "x": 11.75,
+                    "y": 0
+                },
+                {
+                    "label": "-",
+                    "x": 12.75,
+                    "y": 0
+                },
+                {
+                    "label": "+",
+                    "x": 13.75,
+                    "y": 0
+                },
+                {
+                    "label": "backspace",
+                    "w": 2,
+                    "x": 14.75,
+                    "y": 0
+                },
+                {
+                    "label": "tab",
+                    "w": 1.5,
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "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": 8.25,
+                    "y": 1
+                },
+                {
+                    "label": "U",
+                    "x": 9.25,
+                    "y": 1
+                },
+                {
+                    "label": "I",
+                    "x": 10.25,
+                    "y": 1
+                },
+                {
+                    "label": "O",
+                    "x": 11.25,
+                    "y": 1
+                },
+                {
+                    "label": "P",
+                    "x": 12.25,
+                    "y": 1
+                },
+                {
+                    "label": "[",
+                    "x": 13.25,
+                    "y": 1
+                },
+                {
+                    "label": "]",
+                    "x": 14.25,
+                    "y": 1
+                },
+                {
+                    "label": "enter",
+                    "h": 2,
+                    "w": 1.25,
+                    "x": 15.5,
+                    "y": 1
+                },
+                {
+                    "label": "caps",
+                    "w": 1.75,
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "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": 8.5,
+                    "y": 2
+                },
+                {
+                    "label": "J",
+                    "x": 9.5,
+                    "y": 2
+                },
+                {
+                    "label": "K",
+                    "x": 10.5,
+                    "y": 2
+                },
+                {
+                    "label": "L",
+                    "x": 11.5,
+                    "y": 2
+                },
+                {
+                    "label": ";",
+                    "x": 12.5,
+                    "y": 2
+                },
+                {
+                    "label": "'",
+                    "x": 13.5,
+                    "y": 2
+                },
+                {
+                    "label": "#",
+                    "x": 14.5,
+                    "y": 2
+                },
+                {
+                    "label": "shift",
+                    "w": 1.25,
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "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": 9,
+                    "y": 3
+                },
+                {
+                    "label": "M",
+                    "x": 10,
+                    "y": 3
+                },
+                {
+                    "label": ",",
+                    "x": 11,
+                    "y": 3
+                },
+                {
+                    "label": ".",
+                    "x": 12,
+                    "y": 3
+                },
+                {
+                    "label": "/",
+                    "x": 13,
+                    "y": 3
+                },
+                {
+                    "label": "shift",
+                    "w": 2.75,
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "label": "ctrl",
+                    "w": 1.25,
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "label": "os",
+                    "w": 1.25,
+                    "x": 1.25,
+                    "y": 4
+                },
+                {
+                    "label": "alt",
+                    "w": 1.25,
+                    "x": 2.5,
+                    "y": 4
+                },
+                {
+                    "label": "...",
+                    "w": 1.5,
+                    "x": 3.75,
+                    "y": 4
+                },
+                {
+                    "label": "\u2014",
+                    "w": 1.5,
+                    "x": 5.25,
+                    "y": 4
+                },
+                {
+                    "label": "\u2014",
+                    "w": 1.5,
+                    "x": 8.75,
+                    "y": 4
+                },
+                {
+                    "label": "...",
+                    "w": 1.5,
+                    "x": 10.25,
+                    "y": 4
+                },
+                {
+                    "label": "alt",
+                    "w": 1.25,
+                    "x": 11.75,
+                    "y": 4
+                },
+                {
+                    "label": "fn",
+                    "w": 1.25,
+                    "x": 13,
+                    "y": 4
+                },
+                {
+                    "label": "os",
+                    "w": 1.25,
+                    "x": 14.25,
+                    "y": 4
+                },
+                {
+                    "label": "ctrl",
+                    "w": 1.25,
+                    "x": 15.5,
+                    "y": 4
+                },
+                {
+                    "label": "..",
+                    "w": 1.5,
+                    "x": 3.75,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "w": 1.5,
+                    "x": 5.25,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "w": 1.5,
+                    "x": 8.75,
+                    "y": 5
+                },
+                {
+                    "label": "..",
+                    "w": 1.5,
+                    "x": 10.25,
+                    "y": 5
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dygma/raise/ansi/rules.mk b/keyboards/handwired/dygma/raise/ansi/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/handwired/dygma/raise/config.h b/keyboards/handwired/dygma/raise/config.h
new file mode 100644
index 0000000000..674fd592cf
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/config.h
@@ -0,0 +1,34 @@
+/* Copyright 2021 Islam Sharabash
+ *
+ * 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 0x1209
+#define PRODUCT_ID 0x2201
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Dygma
+#define PRODUCT Raise
+
+/* key matrix size */
+// rows are doubled for split
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+/* The scanners already debounce for us */
+#define DEBOUNCE 0
+
+#define DRIVER_LED_TOTAL 132
diff --git a/keyboards/handwired/dygma/raise/halconf.h b/keyboards/handwired/dygma/raise/halconf.h
new file mode 100644
index 0000000000..ebe78c3bec
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright (C) 2021 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/dygma/raise/iso/info.json b/keyboards/handwired/dygma/raise/iso/info.json
new file mode 100644
index 0000000000..f7f9a07c1c
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/iso/info.json
@@ -0,0 +1,1115 @@
+{
+    "keyboard_name": "Dygma Raise",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/dygma/raise",
+    "maintainer": "ibash",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {
+                    "label": "esc",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "1",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "2",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "3",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "4",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "5",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "6",
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "label": "7",
+                    "x": 8.75,
+                    "y": 0
+                },
+                {
+                    "label": "8",
+                    "x": 9.75,
+                    "y": 0
+                },
+                {
+                    "label": "9",
+                    "x": 10.75,
+                    "y": 0
+                },
+                {
+                    "label": "0",
+                    "x": 11.75,
+                    "y": 0
+                },
+                {
+                    "label": "-",
+                    "x": 12.75,
+                    "y": 0
+                },
+                {
+                    "label": "+",
+                    "x": 13.75,
+                    "y": 0
+                },
+                {
+                    "label": "backspace",
+                    "w": 2,
+                    "x": 14.75,
+                    "y": 0
+                },
+                {
+                    "label": "tab",
+                    "w": 1.5,
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "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": 8.25,
+                    "y": 1
+                },
+                {
+                    "label": "U",
+                    "x": 9.25,
+                    "y": 1
+                },
+                {
+                    "label": "I",
+                    "x": 10.25,
+                    "y": 1
+                },
+                {
+                    "label": "O",
+                    "x": 11.25,
+                    "y": 1
+                },
+                {
+                    "label": "P",
+                    "x": 12.25,
+                    "y": 1
+                },
+                {
+                    "label": "[",
+                    "x": 13.25,
+                    "y": 1
+                },
+                {
+                    "label": "]",
+                    "x": 14.25,
+                    "y": 1
+                },
+                {
+                    "label": "enter",
+                    "h": 2,
+                    "w": 1.25,
+                    "x": 15.5,
+                    "y": 1
+                },
+                {
+                    "label": "caps",
+                    "w": 1.75,
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "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": 8.5,
+                    "y": 2
+                },
+                {
+                    "label": "J",
+                    "x": 9.5,
+                    "y": 2
+                },
+                {
+                    "label": "K",
+                    "x": 10.5,
+                    "y": 2
+                },
+                {
+                    "label": "L",
+                    "x": 11.5,
+                    "y": 2
+                },
+                {
+                    "label": ";",
+                    "x": 12.5,
+                    "y": 2
+                },
+                {
+                    "label": "'",
+                    "x": 13.5,
+                    "y": 2
+                },
+                {
+                    "label": "#",
+                    "x": 14.5,
+                    "y": 2
+                },
+                {
+                    "label": "shift",
+                    "w": 1.25,
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "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": 9,
+                    "y": 3
+                },
+                {
+                    "label": "M",
+                    "x": 10,
+                    "y": 3
+                },
+                {
+                    "label": ",",
+                    "x": 11,
+                    "y": 3
+                },
+                {
+                    "label": ".",
+                    "x": 12,
+                    "y": 3
+                },
+                {
+                    "label": "/",
+                    "x": 13,
+                    "y": 3
+                },
+                {
+                    "label": "shift",
+                    "w": 2.75,
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "label": "ctrl",
+                    "w": 1.25,
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "label": "os",
+                    "w": 1.25,
+                    "x": 1.25,
+                    "y": 4
+                },
+                {
+                    "label": "alt",
+                    "w": 1.25,
+                    "x": 2.5,
+                    "y": 4
+                },
+                {
+                    "label": "...",
+                    "w": 1.5,
+                    "x": 3.75,
+                    "y": 4
+                },
+                {
+                    "label": "\u2014",
+                    "w": 1.5,
+                    "x": 5.25,
+                    "y": 4
+                },
+                {
+                    "label": "\u2014",
+                    "w": 1.5,
+                    "x": 8.75,
+                    "y": 4
+                },
+                {
+                    "label": "...",
+                    "w": 1.5,
+                    "x": 10.25,
+                    "y": 4
+                },
+                {
+                    "label": "alt",
+                    "w": 1.25,
+                    "x": 11.75,
+                    "y": 4
+                },
+                {
+                    "label": "fn",
+                    "w": 1.25,
+                    "x": 13,
+                    "y": 4
+                },
+                {
+                    "label": "os",
+                    "w": 1.25,
+                    "x": 14.25,
+                    "y": 4
+                },
+                {
+                    "label": "ctrl",
+                    "w": 1.25,
+                    "x": 15.5,
+                    "y": 4
+                },
+                {
+                    "label": "..",
+                    "w": 1.5,
+                    "x": 3.75,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "w": 1.5,
+                    "x": 5.25,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "w": 1.5,
+                    "x": 8.75,
+                    "y": 5
+                },
+                {
+                    "label": "..",
+                    "w": 1.5,
+                    "x": 10.25,
+                    "y": 5
+                }
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {
+                    "label": "esc",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "1",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "2",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "3",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "4",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "5",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "6",
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "label": "7",
+                    "x": 8.75,
+                    "y": 0
+                },
+                {
+                    "label": "8",
+                    "x": 9.75,
+                    "y": 0
+                },
+                {
+                    "label": "9",
+                    "x": 10.75,
+                    "y": 0
+                },
+                {
+                    "label": "0",
+                    "x": 11.75,
+                    "y": 0
+                },
+                {
+                    "label": "-",
+                    "x": 12.75,
+                    "y": 0
+                },
+                {
+                    "label": "+",
+                    "x": 13.75,
+                    "y": 0
+                },
+                {
+                    "label": "backspace",
+                    "w": 2,
+                    "x": 14.75,
+                    "y": 0
+                },
+                {
+                    "label": "tab",
+                    "w": 1.5,
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "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": 8.25,
+                    "y": 1
+                },
+                {
+                    "label": "U",
+                    "x": 9.25,
+                    "y": 1
+                },
+                {
+                    "label": "I",
+                    "x": 10.25,
+                    "y": 1
+                },
+                {
+                    "label": "O",
+                    "x": 11.25,
+                    "y": 1
+                },
+                {
+                    "label": "P",
+                    "x": 12.25,
+                    "y": 1
+                },
+                {
+                    "label": "{",
+                    "x": 13.25,
+                    "y": 1
+                },
+                {
+                    "label": "}",
+                    "x": 14.25,
+                    "y": 1
+                },
+                {
+                    "label": "\\",
+                    "w": 1.5,
+                    "x": 15.25,
+                    "y": 1
+                },
+                {
+                    "label": "caps",
+                    "w": 1.75,
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "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": 8.5,
+                    "y": 2
+                },
+                {
+                    "label": "J",
+                    "x": 9.5,
+                    "y": 2
+                },
+                {
+                    "label": "K",
+                    "x": 10.5,
+                    "y": 2
+                },
+                {
+                    "label": "L",
+                    "x": 11.5,
+                    "y": 2
+                },
+                {
+                    "label": ";",
+                    "x": 12.5,
+                    "y": 2
+                },
+                {
+                    "label": "'",
+                    "x": 13.5,
+                    "y": 2
+                },
+                {
+                    "label": "enter",
+                    "w": 2.25,
+                    "x": 14.5,
+                    "y": 2
+                },
+                {
+                    "label": "shift",
+                    "w": 2.25,
+                    "x": 0,
+                    "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": 9,
+                    "y": 3
+                },
+                {
+                    "label": "M",
+                    "x": 10,
+                    "y": 3
+                },
+                {
+                    "label": ",",
+                    "x": 11,
+                    "y": 3
+                },
+                {
+                    "label": ".",
+                    "x": 12,
+                    "y": 3
+                },
+                {
+                    "label": "/",
+                    "x": 13,
+                    "y": 3
+                },
+                {
+                    "label": "shift",
+                    "w": 2.75,
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "label": "ctrl",
+                    "w": 1.25,
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "label": "os",
+                    "w": 1.25,
+                    "x": 1.25,
+                    "y": 4
+                },
+                {
+                    "label": "alt",
+                    "w": 1.25,
+                    "x": 2.5,
+                    "y": 4
+                },
+                {
+                    "label": "...",
+                    "w": 1.5,
+                    "x": 3.75,
+                    "y": 4
+                },
+                {
+                    "label": "\u2014",
+                    "w": 1.5,
+                    "x": 5.25,
+                    "y": 4
+                },
+                {
+                    "label": "\u2014",
+                    "w": 1.5,
+                    "x": 8.75,
+                    "y": 4
+                },
+                {
+                    "label": "...",
+                    "w": 1.5,
+                    "x": 10.25,
+                    "y": 4
+                },
+                {
+                    "label": "alt",
+                    "w": 1.25,
+                    "x": 11.75,
+                    "y": 4
+                },
+                {
+                    "label": "fn",
+                    "w": 1.25,
+                    "x": 13,
+                    "y": 4
+                },
+                {
+                    "label": "os",
+                    "w": 1.25,
+                    "x": 14.25,
+                    "y": 4
+                },
+                {
+                    "label": "ctrl",
+                    "w": 1.25,
+                    "x": 15.5,
+                    "y": 4
+                },
+                {
+                    "label": "..",
+                    "w": 1.5,
+                    "x": 3.75,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "w": 1.5,
+                    "x": 5.25,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "w": 1.5,
+                    "x": 8.75,
+                    "y": 5
+                },
+                {
+                    "label": "..",
+                    "w": 1.5,
+                    "x": 10.25,
+                    "y": 5
+                }
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {
+                    "label": "esc",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "1",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "2",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "3",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "4",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "5",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "6",
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "label": "7",
+                    "x": 8.75,
+                    "y": 0
+                },
+                {
+                    "label": "8",
+                    "x": 9.75,
+                    "y": 0
+                },
+                {
+                    "label": "9",
+                    "x": 10.75,
+                    "y": 0
+                },
+                {
+                    "label": "0",
+                    "x": 11.75,
+                    "y": 0
+                },
+                {
+                    "label": "-",
+                    "x": 12.75,
+                    "y": 0
+                },
+                {
+                    "label": "+",
+                    "x": 13.75,
+                    "y": 0
+                },
+                {
+                    "label": "backspace",
+                    "w": 2,
+                    "x": 14.75,
+                    "y": 0
+                },
+                {
+                    "label": "tab",
+                    "w": 1.5,
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "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": 8.25,
+                    "y": 1
+                },
+                {
+                    "label": "U",
+                    "x": 9.25,
+                    "y": 1
+                },
+                {
+                    "label": "I",
+                    "x": 10.25,
+                    "y": 1
+                },
+                {
+                    "label": "O",
+                    "x": 11.25,
+                    "y": 1
+                },
+                {
+                    "label": "P",
+                    "x": 12.25,
+                    "y": 1
+                },
+                {
+                    "label": "[",
+                    "x": 13.25,
+                    "y": 1
+                },
+                {
+                    "label": "]",
+                    "x": 14.25,
+                    "y": 1
+                },
+                {
+                    "label": "enter",
+                    "h": 2,
+                    "w": 1.25,
+                    "x": 15.5,
+                    "y": 1
+                },
+                {
+                    "label": "caps",
+                    "w": 1.75,
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "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": 8.5,
+                    "y": 2
+                },
+                {
+                    "label": "J",
+                    "x": 9.5,
+                    "y": 2
+                },
+                {
+                    "label": "K",
+                    "x": 10.5,
+                    "y": 2
+                },
+                {
+                    "label": "L",
+                    "x": 11.5,
+                    "y": 2
+                },
+                {
+                    "label": ";",
+                    "x": 12.5,
+                    "y": 2
+                },
+                {
+                    "label": "'",
+                    "x": 13.5,
+                    "y": 2
+                },
+                {
+                    "label": "#",
+                    "x": 14.5,
+                    "y": 2
+                },
+                {
+                    "label": "shift",
+                    "w": 1.25,
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "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": 9,
+                    "y": 3
+                },
+                {
+                    "label": "M",
+                    "x": 10,
+                    "y": 3
+                },
+                {
+                    "label": ",",
+                    "x": 11,
+                    "y": 3
+                },
+                {
+                    "label": ".",
+                    "x": 12,
+                    "y": 3
+                },
+                {
+                    "label": "/",
+                    "x": 13,
+                    "y": 3
+                },
+                {
+                    "label": "shift",
+                    "w": 2.75,
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "label": "ctrl",
+                    "w": 1.25,
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "label": "os",
+                    "w": 1.25,
+                    "x": 1.25,
+                    "y": 4
+                },
+                {
+                    "label": "alt",
+                    "w": 1.25,
+                    "x": 2.5,
+                    "y": 4
+                },
+                {
+                    "label": "...",
+                    "w": 1.5,
+                    "x": 3.75,
+                    "y": 4
+                },
+                {
+                    "label": "\u2014",
+                    "w": 1.5,
+                    "x": 5.25,
+                    "y": 4
+                },
+                {
+                    "label": "\u2014",
+                    "w": 1.5,
+                    "x": 8.75,
+                    "y": 4
+                },
+                {
+                    "label": "...",
+                    "w": 1.5,
+                    "x": 10.25,
+                    "y": 4
+                },
+                {
+                    "label": "alt",
+                    "w": 1.25,
+                    "x": 11.75,
+                    "y": 4
+                },
+                {
+                    "label": "fn",
+                    "w": 1.25,
+                    "x": 13,
+                    "y": 4
+                },
+                {
+                    "label": "os",
+                    "w": 1.25,
+                    "x": 14.25,
+                    "y": 4
+                },
+                {
+                    "label": "ctrl",
+                    "w": 1.25,
+                    "x": 15.5,
+                    "y": 4
+                },
+                {
+                    "label": "..",
+                    "w": 1.5,
+                    "x": 3.75,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "w": 1.5,
+                    "x": 5.25,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "w": 1.5,
+                    "x": 8.75,
+                    "y": 5
+                },
+                {
+                    "label": "..",
+                    "w": 1.5,
+                    "x": 10.25,
+                    "y": 5
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dygma/raise/iso/iso.c b/keyboards/handwired/dygma/raise/iso/iso.c
new file mode 100644
index 0000000000..ec2607d06c
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/iso/iso.c
@@ -0,0 +1,79 @@
+/* Copyright 2018-2021 James Laird-Wah, Islam Sharabash
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+// "led_map" is taken from kaleidoscope
+// LHK = Left Hand Keys
+// LPH = "Leds per hand", which isn't _actually_ the number of leds, but instead
+// is just used for indexing
+#define LHK 33
+#define LPH 72
+
+const uint8_t led_map[DRIVER_LED_TOTAL] = {
+  // left side - 33 keys
+  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 68, 69,
+
+  // right side - 36 keys
+  0 + LPH, 1 + LPH, 2 + LPH, 3 + LPH, 4 + LPH, 5 + LPH, 6 + LPH, 15 + LPH, 8 + LPH, 9 + LPH, 10 + LPH, 11 + LPH, 12 + LPH, 13 + LPH, 14 + LPH, 7 + LPH, 16 + LPH, 17 + LPH, 18 + LPH, 19 + LPH,
+  20 + LPH, 21 + LPH, 22 + LPH, 23 + LPH, 24 + LPH, 25 + LPH, 26 + LPH, 27 + LPH, 28 + LPH, 29 + LPH, 30 + LPH, 31 + LPH, 32 + LPH, 33 + LPH, 68 + LPH, 69 + LPH,
+
+  // left under glow - 30 keys
+  34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+
+  // right underglow - 32 keys
+  34 + LPH, 35 + LPH, 36 + LPH, 37 + LPH, 38 + LPH, 39 + LPH, 40 + LPH, 41 + LPH, 42 + LPH, 43 + LPH, 44 + LPH, 45 + LPH, 46 + LPH, 47 + LPH, 48 + LPH, 49 + LPH, 50 + LPH, 51 + LPH,
+  52 + LPH, 53 + LPH, 54 + LPH, 55 + LPH, 56 + LPH, 57 + LPH, 58 + LPH, 59 + LPH, 60 + LPH, 61 + LPH, 62 + LPH, 63 + LPH, 64 + LPH, 65 + LPH, 0xff
+};
+
+// taken from "key_led_map" and reformatted
+// ISO & ANSI (ANSI has no LED at 20, but this key can never be pressed so we can have just one map).
+led_config_t g_led_config = { {
+    // left hand
+    { 0  , 1  , 2  , 3  , 4  , 5      , 6      , NO_LED } ,
+    { 7  , 8  , 9  , 10 , 11 , 12     , NO_LED , NO_LED } ,
+    { 13 , 14 , 15 , 16 , 17 , 18     , NO_LED , NO_LED } ,
+    { 19 , 20 , 21 , 22 , 23 , 24     , 25     , NO_LED } ,
+    { 26 , 27 , 28 , 29 , 30 , NO_LED , 31     , 32     } ,
+
+    // right hand
+    { NO_LED   , 6 + LHK  , 5 + LHK  , 4 + LHK  , 3 + LHK  , 2 + LHK  , 1 + LHK  , 0 + LHK  } ,
+    { 14 + LHK , 13 + LHK , 12 + LHK , 11 + LHK , 10 + LHK , 9 + LHK  , 8 + LHK  , 7 + LHK  } ,
+    { NO_LED   , 21 + LHK , 20 + LHK , 19 + LHK , 18 + LHK , 17 + LHK , 16 + LHK , 15 + LHK } ,
+    { NO_LED   , NO_LED   , 27 + LHK , 26 + LHK , 25 + LHK , 24 + LHK , 23 + LHK , 22 + LHK } ,
+    { 35 + LHK , 34 + LHK , 33 + LHK , 32 + LHK , 31 + LHK , 30 + LHK , 29 + LHK , 28 + LHK }
+  }, {
+    // generated from the svg image of the keyboard, see create-led-config.js
+    {82, 3}, {88, 3}, {94, 3}, {100, 3}, {106, 3}, {112, 3}, {118, 3}, {84, 10}, {91, 10}, {97, 10}, {103, 10}, {109, 10}, 
+    {115, 10}, {84, 16}, {92, 16}, {98, 16}, {104, 16}, {110, 16}, {116, 16}, {82, 22}, {88, 22}, {94, 22}, {100, 22},
+    {106, 22}, {112, 22}, {118, 22}, {83, 28}, {90, 28}, {98, 28}, {106, 28}, {116, 28}, {111, 34}, {118, 34}, {168, 3},
+    {159, 3}, {153, 3}, {147, 3}, {141, 3}, {135, 3}, {129, 3}, {170, 13}, {162, 10}, {156, 10}, {150, 10}, {144, 10},
+    {139, 10}, {133, 10}, {127, 10}, {164, 16}, {158, 16}, {152, 16}, {146, 16}, {140, 16}, {134, 16}, {128, 16}, {166, 22}, 
+    {154, 22}, {148, 22}, {142, 22}, {136, 22}, {130, 22}, {170, 28}, {163, 28}, {156, 28}, {149, 28}, {140, 28}, {131, 28},
+    {136, 34}, {128, 34}, {78, 13}, {78, 6}, {80, 0}, {87, 0}, {95, 0}, {103, 0}, {111, 0}, {119, 0}, {122, 3}, {121, 9},
+    {120, 15}, {122, 21}, {123, 27}, {123, 33}, {120, 38}, {116, 42}, {114, 48}, {112, 55}, {109, 61}, {103, 64}, {96, 64}, 
+    {88, 64}, {81, 63}, {76, 60}, {75, 52}, {75, 46}, {74, 38}, {74, 32}, {75, 27}, {77, 21}, {175, 10}, {175, 4}, {172, 0},
+    {164, 0}, {157, 0}, {149, 0}, {142, 0}, {134, 0}, {127, 0}, {123, 3}, {122, 8}, {122, 15}, {124, 21}, {124, 27}, {124, 33},
+    {126, 38}, {131, 42}, {134, 48}, {135, 55}, {137, 61}, {143, 63}, {150, 63}, {158, 63}, {166, 63}, {173, 63}, {177, 59},
+    {178, 49}, {179, 40}, {179, 31}, {177, 25}, {175, 20}, {175, 15}, {123, 54}
+
+  }, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4
+  }
+};
diff --git a/keyboards/handwired/dygma/raise/iso/rules.mk b/keyboards/handwired/dygma/raise/iso/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/handwired/dygma/raise/keymaps/ansi/keymap.c b/keyboards/handwired/dygma/raise/keymaps/ansi/keymap.c
new file mode 100644
index 0000000000..427b9ddb14
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/keymaps/ansi/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright (C) 2021 Islam Sharabash
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum {
+  QWERTY,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[QWERTY] = LAYOUT_ansi(
+  KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,     KC_5,    KC_6,                KC_7,     KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 
+  KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,     KC_T,                KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
+  KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,     KC_G,                         KC_H,     KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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_LCTL, RGB_MOD, KC_LALT, KC_SPC, KC_SPC,                                           KC_SPC,  KC_SPC,  KC_RALT, KC_RGUI, KC_APP,  KC_RCTL, 
+                                     KC_BSPC,  KC_ENT,                                 KC_NO,   KC_DEL
+)
+};
+
+/* template for new layouts:
+LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______,             _______,  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,             _______, _______,  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,                      _______,  _______, _______, _______, _______, _______, _______,
+  _______,          _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______,                                         _______, _______, _______, _______, _______, _______,
+                                      _______, _______,                                _______, _______
+)
+*/
diff --git a/keyboards/handwired/dygma/raise/keymaps/ansi/readme.md b/keyboards/handwired/dygma/raise/keymaps/ansi/readme.md
new file mode 100644
index 0000000000..ceafd78f41
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/keymaps/ansi/readme.md
@@ -0,0 +1 @@
+# The ansi keymap for Dygma's Raise
diff --git a/keyboards/handwired/dygma/raise/keymaps/default/keymap.c b/keyboards/handwired/dygma/raise/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c766fb7203
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright (C) 2021 Islam Sharabash
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum {
+  QWERTY,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[QWERTY] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,     KC_5,    KC_6,                KC_7,     KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 
+  KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,     KC_T,                KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT, 
+  KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,     KC_G,                         KC_H,     KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, 
+  KC_LSFT, KC_NUBS, KC_Z,    KC_X,   KC_C,     KC_V,    KC_B,                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, 
+  KC_LCTL, RGB_MOD, KC_LALT, KC_SPC, KC_SPC,                                           KC_SPC,  KC_SPC,  KC_RALT, KC_RGUI, KC_APP,  KC_RCTL, 
+                                     KC_BSPC,  KC_ENT,                                 KC_NO,   KC_DEL
+)
+};
+
+/* template for new layouts:
+LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______,             _______,  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,             _______, _______,  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,                      _______,  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______,                                         _______, _______, _______, _______, _______, _______,
+                                      _______, _______,                                _______, _______
+)
+*/
diff --git a/keyboards/handwired/dygma/raise/keymaps/default/readme.md b/keyboards/handwired/dygma/raise/keymaps/default/readme.md
new file mode 100644
index 0000000000..1103cb349b
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Dygma's Raise
diff --git a/keyboards/handwired/dygma/raise/keymaps/iso/keymap.c b/keyboards/handwired/dygma/raise/keymaps/iso/keymap.c
new file mode 100644
index 0000000000..2fd0b49b0b
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/keymaps/iso/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright (C) 2021 Islam Sharabash
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum {
+  QWERTY,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[QWERTY] = LAYOUT_iso(
+  KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,     KC_5,    KC_6,                KC_7,     KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 
+  KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,     KC_T,                KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT, 
+  KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,     KC_G,                         KC_H,     KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, 
+  KC_LSFT, KC_NUBS, KC_Z,    KC_X,   KC_C,     KC_V,    KC_B,                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, 
+  KC_LCTL, RGB_MOD, KC_LALT, KC_SPC, KC_SPC,                                           KC_SPC,  KC_SPC,  KC_RALT, KC_RGUI, KC_APP,  KC_RCTL, 
+                                     KC_BSPC,  KC_ENT,                                 KC_NO,   KC_DEL
+)
+};
+
+/* template for new layouts:
+LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______,             _______,  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,             _______, _______,  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,                      _______,  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______,                       _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______,                                         _______, _______, _______, _______, _______, _______,
+                                      _______, _______,                                _______, _______
+)
+*/
diff --git a/keyboards/handwired/dygma/raise/keymaps/iso/readme.md b/keyboards/handwired/dygma/raise/keymaps/iso/readme.md
new file mode 100644
index 0000000000..5f8924ae2c
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/keymaps/iso/readme.md
@@ -0,0 +1 @@
+# The iso keymap for Dygma's Raise
diff --git a/keyboards/handwired/dygma/raise/leds.c b/keyboards/handwired/dygma/raise/leds.c
new file mode 100644
index 0000000000..3f6037cbfa
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/leds.c
@@ -0,0 +1,101 @@
+/* Copyright 2018-2021 James Laird-Wah, Islam Sharabash
+ *
+ * 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 "quantum.h"
+#include "i2c_master.h"
+#include "led_tables.h"
+#include "rgb_matrix.h"
+#include <string.h>
+#include "raise.h"
+#include "wire-protocol-constants.h"
+#include "print.h"
+#include "leds.h"
+
+struct __attribute__((packed)) cRGB {
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+};
+
+#define LEDS_PER_HAND 72
+#define LED_BANKS 9
+#define LEDS_PER_BANK 8
+#define LED_BYTES_PER_BANK (sizeof(cRGB) * LEDS_PER_BANK)
+
+// shifting << 1 is because drivers/chibios/i2c_master.h expects the address
+// shifted.
+// 0x58 and 0x59 are the addresses defined in dygma/raise/Hand.h
+#define I2C_ADDR_LEFT (0x58 << 1)
+#define I2C_ADDR_RIGHT (0x59 << 1)
+#define I2C_ADDR(hand) ((hand) ? I2C_ADDR_RIGHT : I2C_ADDR_LEFT)
+#define LEFT 0
+#define RIGHT 1
+
+static cRGB led_state[2 * LEDS_PER_HAND];
+
+void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b) {
+    uint8_t buf[] = {TWI_CMD_LED_SET_ALL_TO, b, g, r};
+    i2c_transmit(I2C_ADDR(LEFT), buf, sizeof(buf), I2C_TIMEOUT);
+    wait_us(10);
+    i2c_transmit(I2C_ADDR(RIGHT), buf, sizeof(buf), I2C_TIMEOUT);
+    wait_us(10);
+}
+
+void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b) {
+    int     sled  = led_map[led];
+    uint8_t buf[] = {TWI_CMD_LED_SET_ONE_TO, sled & 0x1f, b, g, r};
+    int     hand  = (sled >= LEDS_PER_HAND) ? RIGHT : LEFT;
+    i2c_transmit(I2C_ADDR(hand), buf, sizeof(buf), I2C_TIMEOUT);
+    wait_us(10);
+}
+
+static void set_color(int index, uint8_t r, uint8_t g, uint8_t b) {
+    int sled = led_map[index];
+
+    led_state[sled].r = r;
+    led_state[sled].g = g;
+    led_state[sled].b = b;
+}
+
+static void set_color_all(uint8_t r, uint8_t g, uint8_t b) {
+    for (int i = 0; i < DRIVER_LED_TOTAL; i++) set_color(i, r, g, b);
+}
+
+static void init(void) {}
+
+static void flush(void) {
+    uint8_t  command[1 + LED_BYTES_PER_BANK];
+
+    // SUBTLE(ibash) alternate hands when transmitting led data, otherwise the
+    // mcu in the hand seems to have trouble keeping up with the i2c
+    // transmission
+    for (int bank = 0; bank < LED_BANKS; bank++) {
+        for (int hand = 0; hand < 2; hand++) {
+            int addr = I2C_ADDR(hand);
+            int i = (hand * LEDS_PER_HAND) + (bank * LEDS_PER_BANK);
+            uint8_t *bank_data = (uint8_t *)&led_state[i];
+
+            command[0] = TWI_CMD_LED_BASE + bank;
+            memcpy(&command[1], bank_data, LED_BYTES_PER_BANK);
+            i2c_transmit(addr, command, sizeof(command), I2C_TIMEOUT);
+
+            // delay to prevent issues with the i2c bus
+            wait_us(10);
+        }
+    }
+}
+
+const rgb_matrix_driver_t rgb_matrix_driver = {.init = init, .flush = flush, .set_color = set_color, .set_color_all = set_color_all};
diff --git a/keyboards/handwired/dygma/raise/leds.h b/keyboards/handwired/dygma/raise/leds.h
new file mode 100644
index 0000000000..8d70ed70b2
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/leds.h
@@ -0,0 +1,25 @@
+/* Copyright 2018-2021 James Laird-Wah, Islam Sharabash
+ *
+ * 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"
+#include "rgb_matrix.h"
+
+extern const uint8_t led_map[DRIVER_LED_TOTAL];
+
+void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b);
+void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b);
diff --git a/keyboards/handwired/dygma/raise/matrix.c b/keyboards/handwired/dygma/raise/matrix.c
new file mode 100644
index 0000000000..bbcf697a59
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/matrix.c
@@ -0,0 +1,104 @@
+/* Copyright 2018-2021 James Laird-Wah, Islam Sharabash
+ *
+ * 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 "quantum.h"
+#include "i2c_master.h"
+#include <string.h>
+#include "wire-protocol-constants.h"
+
+// shifting << 1 is because drivers/chibios/i2c_master.h expects the address
+// shifted.
+// 0x58 and 0x59 are the addresses defined in dygma/raise/Hand.h
+#define I2C_ADDR_LEFT (0x58 << 1)
+#define I2C_ADDR_RIGHT (0x59 << 1)
+#define I2C_ADDR(hand) ((hand) ? I2C_ADDR_RIGHT : I2C_ADDR_LEFT)
+#define LEFT 0
+#define RIGHT 1
+
+/* If no key events have occurred, the scanners will time out on reads.
+ * So we don't want to be too permissive here. */
+// TODO(ibash) not convinced this is needed...
+#define MY_I2C_TIMEOUT 10
+#define ROWS_PER_HAND (MATRIX_ROWS / 2)
+
+typedef enum { CHANGED, OFFLINE, UNCHANGED } read_hand_t;
+
+static read_hand_t last_state[2] = {OFFLINE, OFFLINE};
+
+static read_hand_t i2c_read_hand(int hand, matrix_row_t current_matrix[]) {
+    // dygma raise firmware says online is true iff we get the number of
+    // expected bytes (e.g. 6 bytes or ROWS_PER_HAND + 1).
+    // In the case where no keys are pressed the keyscanner will send the same 0
+    // byte over and over. -- so this case is set.
+    //
+    // On the stm32 side if we don't get as many bytes as expecetd the
+    // i2c_receive times out -- so online can be defined as getting
+    // "I2C_STATUS_SUCCESS".
+
+    uint8_t      buf[ROWS_PER_HAND + 1];
+    i2c_status_t ret = i2c_receive(I2C_ADDR(hand), buf, sizeof(buf), MY_I2C_TIMEOUT);
+    if (ret != I2C_STATUS_SUCCESS) {
+        return OFFLINE;
+    }
+
+    if (buf[0] != TWI_REPLY_KEYDATA) {
+        return UNCHANGED;
+    }
+
+    int           start_row = hand ? ROWS_PER_HAND : 0;
+    matrix_row_t *out       = &current_matrix[start_row];
+    memcpy(out, &buf[1], ROWS_PER_HAND);
+
+    return CHANGED;
+}
+
+static int i2c_set_keyscan_interval(int hand, int delay) {
+    uint8_t      buf[] = {TWI_CMD_KEYSCAN_INTERVAL, delay};
+    i2c_status_t ret   = i2c_transmit(I2C_ADDR(hand), buf, sizeof(buf), MY_I2C_TIMEOUT);
+    return ret;
+}
+
+void matrix_init_custom(void) {
+    i2c_init();
+
+    // ref: https://github.com/Dygmalab/Kaleidoscope/blob/7bac53de106c42ffda889e6854abc06cf43a3c6f/src/kaleidoscope/device/dygma/Raise.cpp#L83
+    // ref: https://github.com/Dygmalab/Kaleidoscope/blob/7bac53de106c42ffda889e6854abc06cf43a3c6f/src/kaleidoscope/device/dygma/raise/Hand.cpp#L73
+    i2c_set_keyscan_interval(LEFT, 50);
+    i2c_set_keyscan_interval(RIGHT, 50);
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    // HACK(ibash) without the delay between the two calls to i2c_read_hand, the
+    // second call to i2c_read_hand breaks. I observed that the i2s start isn't
+    // sent, or maybe it is, but the address matcher in the attiny can't recognize
+    // it. In any case, a short delay fixes it.
+    read_hand_t left_state = i2c_read_hand(LEFT, current_matrix);
+    wait_us(10);
+    read_hand_t right_state = i2c_read_hand(RIGHT, current_matrix);
+
+
+    if ((last_state[LEFT] == OFFLINE && left_state != OFFLINE) || (last_state[RIGHT] == OFFLINE && right_state != OFFLINE)) {
+        // reinitialize both sides
+        i2c_set_keyscan_interval(LEFT, 50);
+        i2c_set_keyscan_interval(RIGHT, 50);
+    }
+
+    last_state[LEFT]  = left_state;
+    last_state[RIGHT] = right_state;
+
+    bool matrix_has_changed = left_state == CHANGED || right_state == CHANGED;
+
+    return matrix_has_changed;
+}
diff --git a/keyboards/handwired/dygma/raise/mcuconf.h b/keyboards/handwired/dygma/raise/mcuconf.h
new file mode 100644
index 0000000000..fba1cace28
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2021 Islam Sharabash
+ *
+ * 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_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_I2C_BUSY_TIMEOUT
+#define STM32_I2C_BUSY_TIMEOUT 5
diff --git a/keyboards/handwired/dygma/raise/raise.c b/keyboards/handwired/dygma/raise/raise.c
new file mode 100644
index 0000000000..d9023093b5
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/raise.c
@@ -0,0 +1,22 @@
+/* Copyright 2018-2021 James Laird-Wah, Islam Sharabash
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "raise.h"
+
+void keyboard_post_init_kb(void) {
+    set_all_leds_to(0, 0, 0);
+    keyboard_post_init_user();
+}
diff --git a/keyboards/handwired/dygma/raise/raise.h b/keyboards/handwired/dygma/raise/raise.h
new file mode 100644
index 0000000000..6310fc3d08
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/raise.h
@@ -0,0 +1,83 @@
+/* Copyright 2018-2021 James Laird-Wah, Islam Sharabash
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#include "leds.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+  L00, L01, L02, L03, L04, L05, L06,           R06,  R05, R04, R03, R02, R01, R00, \
+  L10, L11, L12, L13, L14, L15,          R17,  R16,  R15, R14, R13, R12, R11, R10, \
+  L20, L21, L22, L23, L24, L25,                R26,  R25, R24, R23, R22, R21, R20, \
+  L30, L31, L32, L33, L34, L35, L36,                 R35, R34, R33, R32, R31, R30, \
+  L40, L41, L42, L43, L44,                           R45, R44, R43, R42, R41, R40, \
+                      L46, L47,                      R47, R46                      \
+) { \
+		{ L00, L01, L02, L03, L04, L05, L06, XXX }, \
+		{ L10, L11, L12, L13, L14, L15, XXX, XXX }, \
+		{ L20, L21, L22, L23, L24, L25, XXX, XXX }, \
+		{ L30, L31, L32, L33, L34, L35, L36, XXX }, \
+		{ L40, L41, L42, L43, L44, XXX, L46, L47 }, \
+		{ R00, R01, R02, R03, R04, R05, R06, XXX }, \
+		{ R10, R11, R12, R13, R14, R15, R16, R17 }, \
+		{ R20, R21, R22, R23, R24, R25, R26, XXX }, \
+		{ R30, R31, R32, R33, R34, R35, XXX, XXX }, \
+		{ R40, R41, R42, R43, R44, R45, R46, R47 } \
+}
+
+#define LAYOUT_ansi( \
+  L00, L01, L02, L03, L04, L05, L06,           R06,  R05, R04, R03, R02, R01, R00, \
+  L10, L11, L12, L13, L14, L15,          R17,  R16,  R15, R14, R13, R12, R11, R10, \
+  L20, L21, L22, L23, L24, L25,                R26,  R25, R24, R23, R22, R21, R20, \
+  L31     , L32, L33, L34, L35, L36,                 R35, R34, R33, R32, R31, R30, \
+  L40, L41, L42, L43, L44,                           R45, R44, R43, R42, R41, R40, \
+                      L46, L47,                      R47, R46                      \
+) { \
+		{ L00, L01, L02, L03, L04, L05, L06, XXX }, \
+		{ L10, L11, L12, L13, L14, L15, XXX, XXX }, \
+		{ L20, L21, L22, L23, L24, L25, XXX, XXX }, \
+		{ XXX, L31, L32, L33, L34, L35, L36, XXX }, \
+		{ L40, L41, L42, L43, L44, XXX, L46, L47 }, \
+		{ R00, R01, R02, R03, R04, R05, R06, XXX }, \
+		{ R10, R11, R12, R13, R14, R15, R16, R17 }, \
+		{ R20, R21, R22, R23, R24, R25, R26, XXX }, \
+		{ R30, R31, R32, R33, R34, R35, XXX, XXX }, \
+		{ R40, R41, R42, R43, R44, R45, R46, R47 } \
+}
+
+#define LAYOUT_iso( \
+  L00, L01, L02, L03, L04, L05, L06,           R06,  R05, R04, R03, R02, R01, R00, \
+  L10, L11, L12, L13, L14, L15,          R17,  R16,  R15, R14, R13, R12, R11, R10, \
+  L20, L21, L22, L23, L24, L25,                R26,  R25, R24, R23, R22, R21, R20, \
+  L30, L31, L32, L33, L34, L35, L36,                 R35, R34, R33, R32, R31, R30, \
+  L40, L41, L42, L43, L44,                           R45, R44, R43, R42, R41, R40, \
+                      L46, L47,                      R47, R46                      \
+) { \
+		{ L00, L01, L02, L03, L04, L05, L06, XXX }, \
+		{ L10, L11, L12, L13, L14, L15, XXX, XXX }, \
+		{ L20, L21, L22, L23, L24, L25, XXX, XXX }, \
+		{ L30, L31, L32, L33, L34, L35, L36, XXX }, \
+		{ L40, L41, L42, L43, L44, XXX, L46, L47 }, \
+		{ R00, R01, R02, R03, R04, R05, R06, XXX }, \
+		{ R10, R11, R12, R13, R14, R15, R16, R17 }, \
+		{ R20, R21, R22, R23, R24, R25, R26, XXX }, \
+		{ R30, R31, R32, R33, R34, R35, XXX, XXX }, \
+		{ R40, R41, R42, R43, R44, R45, R46, R47 } \
+}
diff --git a/keyboards/handwired/dygma/raise/readme.md b/keyboards/handwired/dygma/raise/readme.md
new file mode 100644
index 0000000000..219ea5f3c9
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/readme.md
@@ -0,0 +1,55 @@
+# Raise
+
+![](https://cdn.shopify.com/s/files/1/0374/9448/9228/files/Dygma-Raise-Hero2.png)
+
+* Keyboard Maintainer: [ibash](https://github.com/ibash)
+* Hardware Supported: [F411 Blackpill](https://github.com/WeActTC/MiniSTM32F4x1) with the [Dygma Raise](http://www.dygma.com)
+* Hardware Availability: See below
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/dygma/raise/ansi:default
+
+Flashing example for this keyboard:
+
+    make handwired/dygma/raise/ansi:default:flash
+
+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).
+
+## Hardware
+
+QMK does not currently support the [Dygma Neuron](https://dygma.com/products/neuron-black) because QMK does not support SAMD21 which the Neuron has.
+Instead this code uses a [STM32 Blackpill](https://github.com/WeActTC/MiniSTM32F4x1) to create a Neuron replacement.
+
+## Required Hardware
+
+1. [STM32 Blackpill from WeAct Studio](https://github.com/WeActTC/MiniSTM32F4x1) (via [aliexpress](https://www.aliexpress.com/item/1005001456186625.html) or [adafruit](https://www.adafruit.com/product/4877)).
+
+2. 2x USB-C breakouts (via [keeb](https://keeb.io/collections/diy-parts/products/usb-c-breakout-board) or [adafruit](https://www.adafruit.com/product/4090)).
+
+3. 2x 2.7KΩ resistors (via [digikey](https://www.digikey.com/en/products/detail/yageo/CFR-25JB-52-2K7/684)).
+
+4. Breadboard or PCB proto board, wires, solder, etc.
+
+## Wiring
+
+Briefly each raise hand uses I2C to communicate with the Neuron:
+
+1. USB D+ is the I2C clock line.
+2. USB D- is the I2C data line.
+3. The resistors are pullup resistors for the I2C lines.
+4. Each hand draws power from the USB port.
+
+![](https://i.imgur.com/ai9rcHal.png)
+
+<p float="left">
+  <img src="https://i.imgur.com/GvXfnpf.jpg" width="200">
+  <img src="https://i.imgur.com/kFKFjrU.jpg" width="200">
+</p>
+
+We are also prototyping a [custom pcb](https://www.reddit.com/r/DygmaLab/comments/ojgm95/pcb_for_running_qmk_on_the_raise/?utm_source=share&utm_medium=web2x&context=3).
+
+<p>
+  <img src="https://i.imgur.com/xfzIxkW.png" width="200">
+</p>
diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk
new file mode 100644
index 0000000000..a316e1af17
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/rules.mk
@@ -0,0 +1,30 @@
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = custom
+CUSTOM_MATRIX = lite
+
+# TODO(ibash) we don't actually need to enable raw, but there's some side effect
+# in the usb driver this triggers that allows mousekeys to work. The same side
+# effect happens if console or midi is enabled -- so something to do with
+# alternate usb endpoints.
+RAW_ENABLE = yes
+
+QUANTUM_LIB_SRC += i2c_master.c
+SRC += leds.c matrix.c
diff --git a/keyboards/handwired/dygma/raise/wire-protocol-constants.h b/keyboards/handwired/dygma/raise/wire-protocol-constants.h
new file mode 100644
index 0000000000..67c4ca0b23
--- /dev/null
+++ b/keyboards/handwired/dygma/raise/wire-protocol-constants.h
@@ -0,0 +1,51 @@
+/* KeyboardioScanner
+ * Copyright (C) 2015-2018  Keyboard.io, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#pragma once
+
+#define TWI_CMD_NONE 0x00
+#define TWI_CMD_VERSION 0x01
+#define TWI_CMD_KEYSCAN_INTERVAL 0x02
+#define TWI_CMD_LED_SET_ALL_TO 0x03
+#define TWI_CMD_LED_SET_ONE_TO 0x04
+#define TWI_CMD_COLS_USE_PULLUPS 0x05
+#define TWI_CMD_LED_SPI_FREQUENCY 0x06
+
+#define LED_SPI_FREQUENCY_4MHZ      0x07
+#define LED_SPI_FREQUENCY_2MHZ      0x06
+#define LED_SPI_FREQUENCY_1MHZ      0x05
+#define LED_SPI_FREQUENCY_512KHZ    0x04
+#define LED_SPI_FREQUENCY_256KHZ    0x03
+#define LED_SPI_FREQUENCY_128KHZ    0x02
+#define LED_SPI_FREQUENCY_64KHZ     0x01
+#define LED_SPI_OFF                 0x00
+
+
+// 512KHZ seems to be the sweet spot in early testing
+// so make it the default
+#define LED_SPI_FREQUENCY_DEFAULT LED_SPI_FREQUENCY_512KHZ
+
+
+#define TWI_CMD_LED_BASE 0x80
+
+#define TWI_REPLY_NONE 0x00
+#define TWI_REPLY_KEYDATA 0x01

From 21958a93434e40db904eb731bc75b65661bcb9ae Mon Sep 17 00:00:00 2001
From: Pete Sevander <pete.sevander@gmail.com>
Date: Sun, 9 Jan 2022 22:02:25 +0200
Subject: [PATCH 182/867] New combo configuration options (#15083)

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
---
 docs/feature_combo.md                   | 42 +++++++++++++++++++++++--
 quantum/process_keycode/process_combo.c | 39 ++++++++++++++++++++++-
 2 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/docs/feature_combo.md b/docs/feature_combo.md
index 47128c431b..c0e10f09d5 100644
--- a/docs/feature_combo.md
+++ b/docs/feature_combo.md
@@ -141,10 +141,13 @@ Processing combos has two buffers, one for the key presses, another for the comb
 ## Modifier Combos
 If a combo resolves to a Modifier, the window for processing the combo can be extended independently from normal combos. By default, this is disabled but can be enabled with `#define COMBO_MUST_HOLD_MODS`, and the time window can be configured with `#define COMBO_HOLD_TERM 150` (default: `TAPPING_TERM`). With `COMBO_MUST_HOLD_MODS`, you cannot tap the combo any more which makes the combo less prone to misfires.
 
-## Per Combo Timing, Holding and Tapping
-For each combo, it is possible to configure the time window it has to pressed in, if it needs to be held down, or if it needs to be tapped.
+## Strict key press order
+By defining `COMBO_MUST_PRESS_IN_ORDER` combos only activate when the keys are pressed in the same order as they are defined in the key array.
 
-For example, tap-only combos are useful if any (or all) of the underlying keys is a Mod-Tap or a Layer-Tap key. When you tap the combo, you get the combo result. When you press the combo and hold it down, the combo doesn't actually activate. Instead the keys are processed separately as if the combo wasn't even there.
+## Per Combo Timing, Holding, Tapping and Key Press Order
+For each combo, it is possible to configure the time window it has to pressed in, if it needs to be held down, if it needs to be tapped, or if its keys need to be pressed in order.
+
+For example, tap-only combos are useful if any (or all) of the underlying keys are mod-tap or layer-tap keys. When you tap the combo, you get the combo result. When you press the combo and hold it down, the combo doesn't activate. Instead the keys are processed separately as if the combo wasn't even there.
 
 In order to use these features, the following configuration options and functions need to be defined. Coming up with useful timings and configuration is left as an exercise for the reader.
 
@@ -153,6 +156,7 @@ In order to use these features, the following configuration options and function
 | `COMBO_TERM_PER_COMBO`      | uint16_t get_combo_term(uint16_t index, combo_t \*combo)  | Optional per-combo timeout window. (default: `COMBO_TERM`)                                             |
 | `COMBO_MUST_HOLD_PER_COMBO` | bool get_combo_must_hold(uint16_t index, combo_t \*combo) | Controls if a given combo should fire immediately on tap or if it needs to be held. (default: `false`) |
 | `COMBO_MUST_TAP_PER_COMBO`  | bool get_combo_must_tap(uint16_t index, combo_t \*combo)  | Controls if a given combo should fire only if tapped within `COMBO_HOLD_TERM`. (default: `false`)      |
+| `COMBO_MUST_PRESS_IN_ORDER_PER_COMBO` | bool get_combo_must_press_in_order(uint16_t index, combo_t \*combo) | Controls if a given combo should fire only if its keys are pressed in order. (default: `true`) |
 
 Examples:
 ```c
@@ -216,6 +220,38 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
     return false;
 
 }
+
+bool get_combo_must_press_in_order(uint16_t combo_index, combo_t *combo) {
+    switch (combo_index) {
+        /* List combos here that you want to only activate if their keys
+         * are pressed in the same order as they are defined in the combo's key
+         * array. */
+        case COMBO_NAME_HERE:
+            return true;
+        default:
+            return false;
+    }
+}
+```
+
+## Generic hook to (dis)allow a combo activation
+
+By defining `COMBO_SHOULD_TRIGGER` and its companying function `bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record)` you can block or allow combos to activate on the conditions of your choice.
+For example, you could disallow some combos on the base layer and allow them on another. Or disable combos on the home row when a timer is running.
+
+Examples:
+```c
+bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
+    /* Disable combo `SOME_COMBO` on layer `_LAYER_A` */
+    switch (combo_index) {
+        case SOME_COMBO:
+            if (layer_state_is(_LAYER_A)) {
+                return false;
+            }
+    }
+
+    return true;
+}
 ```
 
 ## Variable Length Combos
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index a050161edf..8040ede528 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -40,10 +40,18 @@ __attribute__((weak)) bool get_combo_must_tap(uint16_t index, combo_t *combo) {
 __attribute__((weak)) uint16_t get_combo_term(uint16_t index, combo_t *combo) { return COMBO_TERM; }
 #endif
 
+#ifdef COMBO_MUST_PRESS_IN_ORDER_PER_COMBO
+__attribute__((weak)) bool get_combo_must_press_in_order(uint16_t combo_index, combo_t *combo) { return true; }
+#endif
+
 #ifdef COMBO_PROCESS_KEY_RELEASE
 __attribute__((weak)) bool process_combo_key_release(uint16_t combo_index, combo_t *combo, uint8_t key_index, uint16_t keycode) { return false; }
 #endif
 
+#ifdef COMBO_SHOULD_TRIGGER
+__attribute__((weak)) bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) { return true; }
+#endif
+
 #ifndef COMBO_NO_TIMER
 static uint16_t timer = 0;
 #endif
@@ -350,6 +358,28 @@ combo_t *overlaps(combo_t *combo1, combo_t *combo2) {
     return combo1;
 }
 
+#if defined(COMBO_MUST_PRESS_IN_ORDER) || defined(COMBO_MUST_PRESS_IN_ORDER_PER_COMBO)
+static bool keys_pressed_in_order(uint16_t combo_index, combo_t *combo, uint16_t key_index, uint16_t keycode, keyrecord_t *record) {
+#    ifdef COMBO_MUST_PRESS_IN_ORDER_PER_COMBO
+    if (!get_combo_must_press_in_order(combo_index, combo)) {
+        return true;
+    }
+#    endif
+    if (
+        // The `state` bit for the key being pressed.
+        (1 << key_index) ==
+        // The *next* combo key's bit.
+        (COMBO_STATE(combo) + 1)
+        // E.g. two keys already pressed: `state == 11`.
+        // Next possible `state` is `111`.
+        // So the needed bit is `100` which we get with `11 + 1`.
+    ) {
+        return true;
+    }
+    return false;
+}
+#endif
+
 static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *record, uint16_t combo_index) {
     uint8_t  key_count = 0;
     uint16_t key_index = -1;
@@ -360,7 +390,14 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *
         return false;
     }
 
-    bool key_is_part_of_combo = !COMBO_DISABLED(combo) && is_combo_enabled();
+    bool key_is_part_of_combo = (!COMBO_DISABLED(combo) && is_combo_enabled()
+#if defined(COMBO_MUST_PRESS_IN_ORDER) || defined(COMBO_MUST_PRESS_IN_ORDER_PER_COMBO)
+                                 && keys_pressed_in_order(combo_index, combo, key_index, keycode, record)
+#endif
+#ifdef COMBO_SHOULD_TRIGGER
+                                 && combo_should_trigger(combo_index, combo, keycode, record)
+#endif
+    );
 
     if (record->event.pressed && key_is_part_of_combo) {
         uint16_t time = _get_combo_term(combo_index, combo);

From 1ed5c48d939ce711977e345bd127ec10415ae6af Mon Sep 17 00:00:00 2001
From: werther <werther@mailbox.org>
Date: Sun, 9 Jan 2022 21:08:18 +0100
Subject: [PATCH 183/867] [Keyboard] Add RGB Matrix support to id67 and add
 thewerther keymap (#15558)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: sigprof and fauxpark
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/id67/{ => default_rgb}/config.h     |   0
 .../{id67.c => default_rgb/default_rgb.c}     |   2 +-
 .../{id67.h => default_rgb/default_rgb.h}     |   0
 keyboards/id67/{ => default_rgb}/info.json    |   0
 keyboards/id67/default_rgb/readme.md          |  19 +++
 keyboards/id67/{ => default_rgb}/rules.mk     |   0
 keyboards/id67/readme.md                      |  20 ++-
 keyboards/id67/rgb/config.h                   | 120 ++++++++++++++++++
 keyboards/id67/rgb/info.json                  |  85 +++++++++++++
 keyboards/id67/rgb/keymaps/default/keymap.c   |  36 ++++++
 .../id67/rgb/keymaps/thewerther/config.h      |  95 ++++++++++++++
 .../id67/rgb/keymaps/thewerther/keymap.c      |  57 +++++++++
 .../id67/rgb/keymaps/thewerther/rules.mk      |   2 +
 keyboards/id67/rgb/readme.md                  |  36 ++++++
 keyboards/id67/rgb/rgb.c                      |  49 +++++++
 keyboards/id67/rgb/rgb.h                      |  34 +++++
 keyboards/id67/rgb/rules.mk                   |  25 ++++
 17 files changed, 574 insertions(+), 6 deletions(-)
 rename keyboards/id67/{ => default_rgb}/config.h (100%)
 rename keyboards/id67/{id67.c => default_rgb/default_rgb.c} (96%)
 rename keyboards/id67/{id67.h => default_rgb/default_rgb.h} (100%)
 rename keyboards/id67/{ => default_rgb}/info.json (100%)
 create mode 100644 keyboards/id67/default_rgb/readme.md
 rename keyboards/id67/{ => default_rgb}/rules.mk (100%)
 create mode 100644 keyboards/id67/rgb/config.h
 create mode 100644 keyboards/id67/rgb/info.json
 create mode 100644 keyboards/id67/rgb/keymaps/default/keymap.c
 create mode 100644 keyboards/id67/rgb/keymaps/thewerther/config.h
 create mode 100644 keyboards/id67/rgb/keymaps/thewerther/keymap.c
 create mode 100644 keyboards/id67/rgb/keymaps/thewerther/rules.mk
 create mode 100644 keyboards/id67/rgb/readme.md
 create mode 100644 keyboards/id67/rgb/rgb.c
 create mode 100644 keyboards/id67/rgb/rgb.h
 create mode 100644 keyboards/id67/rgb/rules.mk

diff --git a/keyboards/id67/config.h b/keyboards/id67/default_rgb/config.h
similarity index 100%
rename from keyboards/id67/config.h
rename to keyboards/id67/default_rgb/config.h
diff --git a/keyboards/id67/id67.c b/keyboards/id67/default_rgb/default_rgb.c
similarity index 96%
rename from keyboards/id67/id67.c
rename to keyboards/id67/default_rgb/default_rgb.c
index d0377a4345..972b0b8b06 100644
--- a/keyboards/id67/id67.c
+++ b/keyboards/id67/default_rgb/default_rgb.c
@@ -14,4 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "id67.h"
\ No newline at end of file
+#include "default_rgb.h"
diff --git a/keyboards/id67/id67.h b/keyboards/id67/default_rgb/default_rgb.h
similarity index 100%
rename from keyboards/id67/id67.h
rename to keyboards/id67/default_rgb/default_rgb.h
diff --git a/keyboards/id67/info.json b/keyboards/id67/default_rgb/info.json
similarity index 100%
rename from keyboards/id67/info.json
rename to keyboards/id67/default_rgb/info.json
diff --git a/keyboards/id67/default_rgb/readme.md b/keyboards/id67/default_rgb/readme.md
new file mode 100644
index 0000000000..9559384f1e
--- /dev/null
+++ b/keyboards/id67/default_rgb/readme.md
@@ -0,0 +1,19 @@
+# IDOBAO ID67
+
+A 65% hotswap keyboard from IDOBAO.
+
+## ANSI support:
+
+* Keyboard Maintainer: Tybera
+* Hardware Supported: IDOBAO ID67
+* Hardware Availability: [IDOBAO](https://www.idobao.net/products/idobao-id67-65-hot-swappable-mechanical-keyboard-kit-1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make id67/default_rgb:default
+
+Flashing example for this keyboard:
+
+    make id67/default_rgb:default:flash
+
+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).
diff --git a/keyboards/id67/rules.mk b/keyboards/id67/default_rgb/rules.mk
similarity index 100%
rename from keyboards/id67/rules.mk
rename to keyboards/id67/default_rgb/rules.mk
diff --git a/keyboards/id67/readme.md b/keyboards/id67/readme.md
index eca398184a..7949ee1af2 100644
--- a/keyboards/id67/readme.md
+++ b/keyboards/id67/readme.md
@@ -6,14 +6,24 @@ A 65% hotswap keyboard from IDOBAO.
 
 * Keyboard Maintainer: Tybera
 * Hardware Supported: IDOBAO ID67
-* Hardware Availability: [IDOBAO]https://www.idobao.net/products/idobao-id67-65-hot-swappable-mechanical-keyboard-kit-1
+* Hardware Availability: [IDOBAO](https://www.idobao.net/products/idobao-id67-65-hot-swappable-mechanical-keyboard-kit-1)
 
-Make example for this keyboard (after setting up your build environment):
+## Variants
 
-    make id67:default
+Currently there are two variants for the id67:
+1. `rgb_default` which uses the `RGB Lightning` feature for the on-board LEDs.
+2. `rgb` which uses the more advanced `RGB Matrix` feature for the per-key and underglow (bottom of PCB) LEDs.
 
-Flashing example for this keyboard:
+Make examples for this keyboard (after setting up your build environment):
 
-    make id67:default:flash
+    make id67/default_rgb:default
+
+    make id67/rgb:default
+
+Flashing examples for this keyboard:
+
+    make id67/default_rgb:default:flash
+
+    make id67/rgb:default:flash
 
 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).
diff --git a/keyboards/id67/rgb/config.h b/keyboards/id67/rgb/config.h
new file mode 100644
index 0000000000..be6594b0c1
--- /dev/null
+++ b/keyboards/id67/rgb/config.h
@@ -0,0 +1,120 @@
+/* Copyright 2021 Tybera
+ * Copyright 2021 thewerther
+ *
+ * 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       0x6964 /* "id" */
+#define PRODUCT_ID      0x0067
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    IDOBAO
+#define PRODUCT         ID67
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 { B0, B1, B2, B3, F7 }
+#define MATRIX_COL_PINS { C7, F6, F5, F4, F1, B7, D5, D1, D2, D3, D4, D0, D6, D7, B4 }
+
+#define DIODE_DIRECTION COL2ROW
+#define RGB_DI_PIN F0
+
+// RGB Light config
+#if defined(RGBLIGHT_ENABLE)
+    #define RGBLED_NUM 77
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+    #define RGBLIGHT_ANIMATIONS
+// /*== or choose 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
+
+// RGB Matrix config
+#if defined(RGB_MATRIX_ENABLE)
+    #define DRIVER_LED_TOTAL 77
+    #define DRIVER_LED_UNDERGLOW 10
+
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+
+    #define RGB_MATRIX_KEYPRESSES
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS          // Static dual hue, speed is hue for secondary hue
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN     // Static gradient top to bottom, speed controls how much gradient changes
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT  // Static gradient left to right, speed controls how much gradient changes
+    #define ENABLE_RGB_MATRIX_BREATHING            // Single hue brightness cycling animation
+    #define ENABLE_RGB_MATRIX_BAND_SAT             // Single hue band fading saturation scrolling left to right
+    #define ENABLE_RGB_MATRIX_BAND_VAL             // Single hue band fading brightness scrolling left to right
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT    // Single hue 3 blade spinning pinwheel fades saturation
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL    // Single hue 3 blade spinning pinwheel fades brightness
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT      // Single hue spinning spiral fades saturation
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL      // Single hue spinning spiral fades brightness
+    #define ENABLE_RGB_MATRIX_CYCLE_ALL            // Full keyboard solid hue cycling through full gradient
+    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT     // Full gradient scrolling left to right
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN        // Full gradient scrolling top to bottom
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN         // Full gradient scrolling out to in
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL    // Full dual gradients scrolling out to in
+    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Full gradent Chevron shapped scrolling left to right
+    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL       // Full gradient spinning pinwheel around center of keyboard
+    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL         // Full gradient spinning spiral around center of keyboard
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON          // Full gradient spinning around center of keyboard
+    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON       // Full tighter gradient spinning around center of keyboard
+    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS    // Full dual gradients spinning two halfs of keyboard
+    #define ENABLE_RGB_MATRIX_RAINDROPS            // Randomly changes a single key's hue
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS  // Randomly changes a single key's hue and saturation
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING        // Hue shifts up a slight ammount at the same time, then shifts back
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM         // Hue shifts up a slight ammount in a wave to the right, then back to the left
+    #define ENABLE_RGB_MATRIX_HUE_WAVE             // Hue shifts up a slight ammount and then back down in a wave to the right
+#if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE// Pulses keys hit to hue & value then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE       // Static single hue, pulses keys hit to shifted hue then fades to current hue
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SPLASH               // Full gradient & value pulse away from a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_MULTISPLASH          // Full gradient & value pulse away from multiple key hits then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH         // Hue & value pulse away from a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH    // Hue & value pulse away from multiple key hits then fades value out
+#endif // #if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
+#endif // #if defined(RGB_MATRIX_ENABLE)
diff --git a/keyboards/id67/rgb/info.json b/keyboards/id67/rgb/info.json
new file mode 100644
index 0000000000..774d913413
--- /dev/null
+++ b/keyboards/id67/rgb/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "ID67 RGB Matrix variant",
+    "url": "",
+    "maintainer": "qmk",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label":"K00 (B0,C7)", "x":0, "y":0},
+                {"label":"K01 (B0,F6)", "x":1, "y":0},
+                {"label":"K02 (B0,F5)", "x":2, "y":0},
+                {"label":"K03 (B0,F4)", "x":3, "y":0},
+                {"label":"K04 (B0,F1)", "x":4, "y":0},
+                {"label":"K05 (B0,B7)", "x":5, "y":0},
+                {"label":"K06 (B0,D5)", "x":6, "y":0},
+                {"label":"K07 (B0,D1)", "x":7, "y":0},
+                {"label":"K08 (B0,D2)", "x":8, "y":0},
+                {"label":"K09 (B0,D3)", "x":9, "y":0},
+                {"label":"K0A (B0,D4)", "x":10, "y":0},
+                {"label":"K0B (B0,D0)", "x":11, "y":0},
+                {"label":"K0C (B0,D6)", "x":12, "y":0},
+                {"label":"K0D (B0,D7)", "x":13, "y":0, "w":2},
+                {"label":"K0E (B0,B4)", "x":15, "y":0},
+
+                {"label":"K10 (B1,C7)", "x":0, "y":1, "w":1.5},
+                {"label":"K11 (B1,F6)", "x":1.5, "y":1},
+                {"label":"K12 (B1,F5)", "x":2.5, "y":1},
+                {"label":"K13 (B1,F4)", "x":3.5, "y":1},
+                {"label":"K14 (B1,F1)", "x":4.5, "y":1},
+                {"label":"K15 (B1,B7)", "x":5.5, "y":1},
+                {"label":"K16 (B1,D5)", "x":6.5, "y":1},
+                {"label":"K17 (B1,D1)", "x":7.5, "y":1},
+                {"label":"K18 (B1,D2)", "x":8.5, "y":1},
+                {"label":"K19 (B1,D3)", "x":9.5, "y":1},
+                {"label":"K1A (B1,D4)", "x":10.5, "y":1},
+                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
+                {"label":"K1C (B1,D6)", "x":12.5, "y":1},
+                {"label":"K1D (B1,D7)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K1E (B1,B4)", "x":15, "y":1},
+
+                {"label":"K20 (B2,C7)", "x":0, "y":2, "w":1.75},
+                {"label":"K21 (B2,F6)", "x":1.75, "y":2},
+                {"label":"K22 (B2,F5)", "x":2.75, "y":2},
+                {"label":"K23 (B2,F4)", "x":3.75, "y":2},
+                {"label":"K24 (B2,F1)", "x":4.75, "y":2},
+                {"label":"K25 (B2,B7)", "x":5.75, "y":2},
+                {"label":"K26 (B2,D5)", "x":6.75, "y":2},
+                {"label":"K27 (B2,D1)", "x":7.75, "y":2},
+                {"label":"K28 (B2,D2)", "x":8.75, "y":2},
+                {"label":"K29 (B2,D3)", "x":9.75, "y":2},
+                {"label":"K2A (B2,D4)", "x":10.75, "y":2},
+                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
+                {"label":"K2D (B2,D7)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K2E (B2,B4)", "x":15, "y":2},
+
+                {"label":"K30 (B3,C7)", "x":0, "y":3, "w":2.25},
+                {"label":"K32 (B3,F5)", "x":2.25, "y":3},
+                {"label":"K33 (B3,F4)", "x":3.25, "y":3},
+                {"label":"K34 (B3,F1)", "x":4.25, "y":3},
+                {"label":"K35 (B3,B7)", "x":5.25, "y":3},
+                {"label":"K36 (B3,D5)", "x":6.25, "y":3},
+                {"label":"K37 (B3,D1)", "x":7.25, "y":3},
+                {"label":"K38 (B3,D2)", "x":8.25, "y":3},
+                {"label":"K39 (B3,D3)", "x":9.25, "y":3},
+                {"label":"K3A (B3,D4)", "x":10.25, "y":3},
+                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
+                {"label":"K3C (B3,D6)", "x":12.25, "y":3, "w":1.75},
+                {"label":"K3D (B3,D7)", "x":14, "y":3},
+                {"label":"K3E (B3,B4)", "x":15, "y":3},
+
+                {"label":"K40 (F7,C7)", "x":0, "y":4, "w":1.25},
+                {"label":"K41 (F7,F6)", "x":1.25, "y":4, "w":1.25},
+                {"label":"K43 (F7,F4)", "x":2.5, "y":4, "w":1.25},
+                {"label":"K46 (F7,D5)", "x":3.75, "y":4, "w":6.25},
+                {"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25},
+                {"label":"K4B (F7,D0)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K4C (F7,D6)", "x":13, "y":4},
+                {"label":"K4D (F7,D7)", "x":14, "y":4},
+                {"label":"K4E (F7,B4)", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/id67/rgb/keymaps/default/keymap.c b/keyboards/id67/rgb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..450550e12a
--- /dev/null
+++ b/keyboards/id67/rgb/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 Tybera
+ * Copyright 2022 thewerther
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi_blocker(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_TILD,
+        KC_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_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,              KC_PGUP,
+        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,          KC_PGDN,
+        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              MO(1),     KC_RCTL,   KC_LEFT,   KC_DOWN,    KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,          _______,
+        _______,     RGB_TOG, KC_UP,   RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,      _______,
+        _______,       KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,             _______,
+        _______,           RESET,  RGB_SPI,  RGB_SPD, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, KC_DEL,  KC_END,  KC_PGDN, _______,         _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
+    ),
+
+};
diff --git a/keyboards/id67/rgb/keymaps/thewerther/config.h b/keyboards/id67/rgb/keymaps/thewerther/config.h
new file mode 100644
index 0000000000..539e3bbb41
--- /dev/null
+++ b/keyboards/id67/rgb/keymaps/thewerther/config.h
@@ -0,0 +1,95 @@
+/* Copyright 2021 thewerther
+ *
+ * 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 DRIVER_LED_UNDERGLOW 10
+#define TAPPING_TERM 500
+
+#if defined(RGB_MATRIX_ENABLE)
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+    #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+
+    // change saturation and hue step size
+    #undef RGBLIGHT_HUE_STEP
+    #undef RGBLIGHT_SAT_STEP
+    #define RGBLIGHT_SAT_STEP 5
+    #define RGBLIGHT_HUE_STEP 5
+
+    #define RGB_MATRIX_KEYPRESSES
+
+    // disable effects from keyboard level config.h
+    #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
+    #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+    #undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+    #undef ENABLE_RGB_MATRIX_BREATHING
+    #undef ENABLE_RGB_MATRIX_BAND_SAT
+    #undef ENABLE_RGB_MATRIX_BAND_VAL
+    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+    #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+    #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+    #undef ENABLE_RGB_MATRIX_CYCLE_ALL
+    #undef ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+    #undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+    #undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+    #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+    #undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+    #undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+    #undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+    #undef ENABLE_RGB_MATRIX_DUAL_BEACON
+    #undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
+    #undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+    #undef ENABLE_RGB_MATRIX_RAINDROPS
+    #undef ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+    #undef ENABLE_RGB_MATRIX_HUE_BREATHING
+    #undef ENABLE_RGB_MATRIX_HUE_PENDULUM
+    #undef ENABLE_RGB_MATRIX_HUE_WAVE
+    #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+    #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
+    #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    #undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
+    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
+    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+    #undef ENABLE_RGB_MATRIX_SPLASH
+    #undef ENABLE_RGB_MATRIX_MULTISPLASH
+    #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+    #undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+    // only enable a few
+    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON
+    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+
+#if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE// Pulses keys hit to hue & value then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE       // Static single hue, pulses keys hit to shifted hue then fades to current hue
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH    // Hue & value pulse away from multiple key hits then fades value out
+#endif // # if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES)
+#endif // # if defined(RGB_MATRIX_ENABLE)
+
diff --git a/keyboards/id67/rgb/keymaps/thewerther/keymap.c b/keyboards/id67/rgb/keymaps/thewerther/keymap.c
new file mode 100644
index 0000000000..8af720755f
--- /dev/null
+++ b/keyboards/id67/rgb/keymaps/thewerther/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2021 Tybera
+ * Copyright 2021 thewerther
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi_blocker(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_GRV,
+        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_RALT,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,              KC_PGUP,
+        KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,          KC_PGDN,
+        KC_LCTL,   KC_LGUI,   KC_LALT,                       LT(1, KC_SPC),                       MO(2),     KC_RCTL,   KC_LEFT,   KC_DOWN,    KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker(
+        _______, 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_PGUP, _______, _______, _______, _______, _______, _______,     _______,
+        _______,        _______, _______, KC_PGDN, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT,  _______, _______, _______,            _______,
+        _______,           _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______,    _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
+    ),
+    [2] = LAYOUT_65_ansi_blocker(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,     _______,
+        _______,     RGB_TOG, _______,  RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_MPLY, KC_MPRV, KC_MNXT, _______,     _______,
+        _______,        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            KC_HOME,
+        _______,           RESET,  RGB_SPI,  RGB_SPD, _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______,  _______,  _______,  _______,      KC_END,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
+    )
+
+};
+
+void matrix_scan_user(void) {
+#   if defined(RGB_MATRIX_ENABLE)
+    int current_effect = rgb_matrix_get_mode();
+    if (current_effect >= RGB_MATRIX_SOLID_REACTIVE_SIMPLE && current_effect <= RGB_MATRIX_SOLID_MULTISPLASH) {
+        // set all underglow leds to current color
+        RGB current_color = hsv_to_rgb(rgb_matrix_get_hsv());
+        for (int i = DRIVER_LED_TOTAL - DRIVER_LED_UNDERGLOW; i < DRIVER_LED_TOTAL; i++) {
+            rgb_matrix_set_color(i, current_color.r, current_color.g, current_color.b);
+        }
+    }
+#   endif
+}
+
diff --git a/keyboards/id67/rgb/keymaps/thewerther/rules.mk b/keyboards/id67/rgb/keymaps/thewerther/rules.mk
new file mode 100644
index 0000000000..acd3adaa9a
--- /dev/null
+++ b/keyboards/id67/rgb/keymaps/thewerther/rules.mk
@@ -0,0 +1,2 @@
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
diff --git a/keyboards/id67/rgb/readme.md b/keyboards/id67/rgb/readme.md
new file mode 100644
index 0000000000..8376af1468
--- /dev/null
+++ b/keyboards/id67/rgb/readme.md
@@ -0,0 +1,36 @@
+# IDOBAO ID67
+
+![id67](https://i.imgur.com/9roQ4Mih.jpeg)
+
+A 65% hotswap keyboard from IDOBAO.
+
+## ANSI support:
+
+* Keyboard Maintainer: Tybera
+* Hardware Supported: IDOBAO ID67
+* Hardware Availability: [IDOBAO-website](https://www.idobao.net/products/idobao-id67-65-hot-swappable-mechanical-keyboard-kit-1)
+
+## Layout
+
+![ID67 layout](https://i.imgur.com/Ge6Uxao.png)
+
+
+## Compiling and flashing
+
+Make example for this keyboard (after setting up your build environment):
+
+    make id67/rgb:default
+
+Flashing example for this keyboard:
+
+    make id67/rgb:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the `Escape` key and plug in the keyboard.
+* **Physical reset button**: Briefly press the button on the back of the PCB.
+* **Keycode in layout**: Press the key mapped to `RESET` (FN+Z).
diff --git a/keyboards/id67/rgb/rgb.c b/keyboards/id67/rgb/rgb.c
new file mode 100644
index 0000000000..5fc007d19a
--- /dev/null
+++ b/keyboards/id67/rgb/rgb.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 Tybera
+ * Copyright 2021 thewerther
+ *
+ * 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 "rgb.h"
+
+#define __ NO_LED
+
+// Indices are reveresed on the physical board, top left is bottom right.
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    {66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52},
+    {51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37},
+    {36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, __, 24, 23},
+    {22, __, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10,  9},
+    { 8,  7, __,  6, __, __,  5, __, __, __,  4,  3,  2,  1,  0},
+}, {
+    // LED Index to Physical Position
+    {224, 64}, {196, 64}, {168, 64}, {140, 64}, {112, 64},                                  {84, 64},                      {56, 64},           {28, 64}, {0, 64},
+    {224, 48}, {206, 48}, {189, 48}, {172, 48}, {155, 48}, {137, 48}, {120, 48}, {103, 48}, {86, 48},  {68, 48}, {51, 48}, {34, 48}, {17, 48},           {0, 48},
+    {224, 32}, {206, 32},            {189, 32}, {172, 32}, {155, 32}, {137, 32}, {120, 32}, {103, 32}, {86, 32}, {68, 32}, {51, 32}, {34, 32}, {17, 32}, {0, 32},
+    {224, 16}, {208, 16}, {192, 16}, {176, 16}, {160, 16}, {144, 16}, {128, 16}, {112, 16}, {96, 16},  {80, 16}, {64, 16}, {48, 16}, {32, 16}, {16, 16}, {0, 16},
+    {224,  0}, {208,  0}, {192,  0}, {176,  0}, {160,  0}, {144,  0}, {128,  0}, {112,  0}, {96,  0},  {80,  0}, {64,  0}, {48,  0}, {32,  0}, {16,  0}, {0,  0},
+    // underglow LEDs
+    {0, 0}, {56, 0}, {112, 0}, {168, 0}, {224, 0},
+    {224, 64}, {168, 64}, {112, 64}, {56, 64}, {0, 64}
+},  {
+    // LED Index to Flag
+    4, 4, 4, 1, 1, 4, 1, 1, 1,                   // first row
+    1, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    // second row
+    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    // third row
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, // fourth row
+    4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, // fifth row
+    // underglow leds
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+} };
diff --git a/keyboards/id67/rgb/rgb.h b/keyboards/id67/rgb/rgb.h
new file mode 100644
index 0000000000..cca757bfc7
--- /dev/null
+++ b/keyboards/id67/rgb/rgb.h
@@ -0,0 +1,34 @@
+/* Copyright 2021 Tybera
+ * Copyright 2021 thewerther
+ *
+ * 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_65_ansi_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,   \
+    K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,    K1E,   \
+    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,        K2E,   \
+    K30,       K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,     K3E,   \
+    K40,  K41,  K43,              K46,                K4A,  K4B,  K4C,  K4D,   K4E    \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
+    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
+    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
+}
diff --git a/keyboards/id67/rgb/rules.mk b/keyboards/id67/rgb/rules.mk
new file mode 100644
index 0000000000..5ebc2b824a
--- /dev/null
+++ b/keyboards/id67/rgb/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+RGB_MATRIX_ENABLE = yes     # Enable RGB Matrix feature
+RGB_MATRIX_DRIVER = WS2812 	# ID67 uses WS2812 driver
+
+KEY_LOCK_ENABLE = yes       # Enable KC_LOCK support
+
+LAYOUTS = 65_ansi_blocker

From 7c186ebb974b4bbadbb74a7610bab5d2f66d030e Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@users.noreply.github.com>
Date: Sun, 9 Jan 2022 22:17:15 +0100
Subject: [PATCH 184/867] Revert "core: make the full 4096 bytes of EEPROM work
 on Teensy 3.6 (#12947)" (#15695)

This reverts commit 7f8faa429e0c0662cec34a7d60e33ca58333d6d7.

related to https://github.com/qmk/qmk_firmware/issues/15521
---
 platforms/chibios/eeprom_teensy.c | 213 ++----------------------------
 1 file changed, 14 insertions(+), 199 deletions(-)

diff --git a/platforms/chibios/eeprom_teensy.c b/platforms/chibios/eeprom_teensy.c
index 97da6f9e14..4aaf665269 100644
--- a/platforms/chibios/eeprom_teensy.c
+++ b/platforms/chibios/eeprom_teensy.c
@@ -39,126 +39,7 @@
  * SOFTWARE.
  */
 
-#define SMC_PMSTAT_RUN ((uint8_t)0x01)
-#define SMC_PMSTAT_HSRUN ((uint8_t)0x80)
-
-#define F_CPU KINETIS_SYSCLK_FREQUENCY
-
-static inline int kinetis_hsrun_disable(void) {
-#if defined(MK66F18)
-    if (SMC->PMSTAT == SMC_PMSTAT_HSRUN) {
-// First, reduce the CPU clock speed, but do not change
-// the peripheral speed (F_BUS).  Serial1 & Serial2 baud
-// rates will be impacted, but most other peripherals
-// will continue functioning at the same speed.
-#    if F_CPU == 256000000 && F_BUS == 64000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(1, 3, 1, 7);  // TODO: TEST
-#    elif F_CPU == 256000000 && F_BUS == 128000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(1, 1, 1, 7);  // TODO: TEST
-#    elif F_CPU == 240000000 && F_BUS == 60000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(1, 3, 1, 7);  // ok
-#    elif F_CPU == 240000000 && F_BUS == 80000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(2, 2, 2, 8);  // ok
-#    elif F_CPU == 240000000 && F_BUS == 120000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(1, 1, 1, 7);  // ok
-#    elif F_CPU == 216000000 && F_BUS == 54000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(1, 3, 1, 7);  // ok
-#    elif F_CPU == 216000000 && F_BUS == 72000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(2, 2, 2, 8);  // ok
-#    elif F_CPU == 216000000 && F_BUS == 108000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(1, 1, 1, 7);  // ok
-#    elif F_CPU == 192000000 && F_BUS == 48000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(1, 3, 1, 7);  // ok
-#    elif F_CPU == 192000000 && F_BUS == 64000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(2, 2, 2, 8);  // ok
-#    elif F_CPU == 192000000 && F_BUS == 96000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(1, 1, 1, 7);  // ok
-#    elif F_CPU == 180000000 && F_BUS == 60000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(2, 2, 2, 8);  // ok
-#    elif F_CPU == 180000000 && F_BUS == 90000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(1, 1, 1, 7);  // ok
-#    elif F_CPU == 168000000 && F_BUS == 56000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(2, 2, 2, 5);  // ok
-#    elif F_CPU == 144000000 && F_BUS == 48000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(2, 2, 2, 5);  // ok
-#    elif F_CPU == 144000000 && F_BUS == 72000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(1, 1, 1, 5);  // ok
-#    elif F_CPU == 120000000 && F_BUS == 60000000
-        SIM->CLKDIV1 = SIM_CLKDIV1_OUTDIV1(KINETIS_CLKDIV1_OUTDIV1 - 1) | SIM_CLKDIV1_OUTDIV2(KINETIS_CLKDIV1_OUTDIV2 - 1) |
-#        if defined(MK66F18)
-                       SIM_CLKDIV1_OUTDIV3(KINETIS_CLKDIV1_OUTDIV3 - 1) |
-#        endif
-                       SIM_CLKDIV1_OUTDIV4(KINETIS_CLKDIV1_OUTDIV4 - 1);
-#    else
-        return 0;
-#    endif
-        // Then turn off HSRUN mode
-        SMC->PMCTRL = SMC_PMCTRL_RUNM_SET(0);
-        while (SMC->PMSTAT == SMC_PMSTAT_HSRUN)
-            ;  // wait
-        return 1;
-    }
-#endif
-    return 0;
-}
-
-static inline int kinetis_hsrun_enable(void) {
-#if defined(MK66F18)
-    if (SMC->PMSTAT == SMC_PMSTAT_RUN) {
-        // Turn HSRUN mode on
-        SMC->PMCTRL = SMC_PMCTRL_RUNM_SET(3);
-        while (SMC->PMSTAT != SMC_PMSTAT_HSRUN) {
-            ;
-        }  // wait
-// Then configure clock for full speed
-#    if F_CPU == 256000000 && F_BUS == 64000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 3, 0, 7);
-#    elif F_CPU == 256000000 && F_BUS == 128000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 1, 0, 7);
-#    elif F_CPU == 240000000 && F_BUS == 60000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 3, 0, 7);
-#    elif F_CPU == 240000000 && F_BUS == 80000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 2, 0, 7);
-#    elif F_CPU == 240000000 && F_BUS == 120000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 1, 0, 7);
-#    elif F_CPU == 216000000 && F_BUS == 54000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 3, 0, 7);
-#    elif F_CPU == 216000000 && F_BUS == 72000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 2, 0, 7);
-#    elif F_CPU == 216000000 && F_BUS == 108000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 1, 0, 7);
-#    elif F_CPU == 192000000 && F_BUS == 48000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 3, 0, 6);
-#    elif F_CPU == 192000000 && F_BUS == 64000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 2, 0, 6);
-#    elif F_CPU == 192000000 && F_BUS == 96000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 1, 0, 6);
-#    elif F_CPU == 180000000 && F_BUS == 60000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 2, 0, 6);
-#    elif F_CPU == 180000000 && F_BUS == 90000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 1, 0, 6);
-#    elif F_CPU == 168000000 && F_BUS == 56000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 2, 0, 5);
-#    elif F_CPU == 144000000 && F_BUS == 48000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 2, 0, 4);
-#    elif F_CPU == 144000000 && F_BUS == 72000000
-        SIM_CLKDIV1 = SIM_CLKDIV1_OUTDIVS(0, 1, 0, 4);
-#    elif F_CPU == 120000000 && F_BUS == 60000000
-        SIM->CLKDIV1 = SIM_CLKDIV1_OUTDIV1(KINETIS_CLKDIV1_OUTDIV1 - 1) | SIM_CLKDIV1_OUTDIV2(KINETIS_CLKDIV1_OUTDIV2 - 1) |
-#        if defined(MK66F18)
-                       SIM_CLKDIV1_OUTDIV3(KINETIS_CLKDIV1_OUTDIV3 - 1) |
-#        endif
-                       SIM_CLKDIV1_OUTDIV4(KINETIS_CLKDIV1_OUTDIV4 - 1);
-#    else
-        return 0;
-#    endif
-        return 1;
-    }
-#endif
-    return 0;
-}
-
-#if defined(K20x) || defined(MK66F18) /* chip selection */
+#if defined(K20x) /* chip selection */
 /* Teensy 3.0, 3.1, 3.2; mchck; infinity keyboard */
 
 // The EEPROM is really RAM with a hardware-based backup system to
@@ -188,34 +69,22 @@ static inline int kinetis_hsrun_enable(void) {
 //
 #    define HANDLE_UNALIGNED_WRITES
 
-#    if defined(K20x)
-#        define EEPROM_MAX 2048
-#        define EEPARTITION 0x03  // all 32K dataflash for EEPROM, none for Data
-#        define EEESPLIT 0x30     // must be 0x30 on these chips
-#    elif defined(MK66F18)
-#        define EEPROM_MAX 4096
-#        define EEPARTITION 0x05  // 128K dataflash for EEPROM, 128K for Data
-#        define EEESPLIT 0x10     // best endurance: 0x00 = first 12%, 0x10 = first 25%, 0x30 = all equal
-#    endif
-
 // Minimum EEPROM Endurance
 // ------------------------
-#    if (EEPROM_SIZE == 4096)
-#        define EEESIZE 0x02
-#    elif (EEPROM_SIZE == 2048)  // 35000 writes/byte or 70000 writes/word
-#        define EEESIZE 0x03
+#    if (EEPROM_SIZE == 2048)  // 35000 writes/byte or 70000 writes/word
+#        define EEESIZE 0x33
 #    elif (EEPROM_SIZE == 1024)  // 75000 writes/byte or 150000 writes/word
-#        define EEESIZE 0x04
+#        define EEESIZE 0x34
 #    elif (EEPROM_SIZE == 512)  // 155000 writes/byte or 310000 writes/word
-#        define EEESIZE 0x05
+#        define EEESIZE 0x35
 #    elif (EEPROM_SIZE == 256)  // 315000 writes/byte or 630000 writes/word
-#        define EEESIZE 0x06
+#        define EEESIZE 0x36
 #    elif (EEPROM_SIZE == 128)  // 635000 writes/byte or 1270000 writes/word
-#        define EEESIZE 0x07
+#        define EEESIZE 0x37
 #    elif (EEPROM_SIZE == 64)  // 1275000 writes/byte or 2550000 writes/word
-#        define EEESIZE 0x08
+#        define EEESIZE 0x38
 #    elif (EEPROM_SIZE == 32)  // 2555000 writes/byte or 5110000 writes/word
-#        define EEESIZE 0x09
+#        define EEESIZE 0x39
 #    endif
 
 /** \brief eeprom initialization
@@ -228,21 +97,15 @@ void eeprom_initialize(void) {
     uint8_t  status;
 
     if (FTFL->FCNFG & FTFL_FCNFG_RAMRDY) {
-        uint8_t stat = FTFL->FSTAT & 0x70;
-        if (stat) FTFL->FSTAT = stat;
-
         // FlexRAM is configured as traditional RAM
         // We need to reconfigure for EEPROM usage
-        kinetis_hsrun_disable();
-        FTFL->FCCOB0 = 0x80;  // PGMPART = Program Partition Command
-        FTFL->FCCOB3 = 0;
-        FTFL->FCCOB4 = EEESPLIT | EEESIZE;
-        FTFL->FCCOB5 = EEPARTITION;
+        FTFL->FCCOB0 = 0x80;     // PGMPART = Program Partition Command
+        FTFL->FCCOB4 = EEESIZE;  // EEPROM Size
+        FTFL->FCCOB5 = 0x03;     // 0K for Dataflash, 32K for EEPROM backup
         __disable_irq();
         // do_flash_cmd() must execute from RAM.  Luckily the C syntax is simple...
         (*((void (*)(volatile uint8_t *))((uint32_t)do_flash_cmd | 1)))(&(FTFL->FSTAT));
         __enable_irq();
-        kinetis_hsrun_enable();
         status = FTFL->FSTAT;
         if (status & (FTFL_FSTAT_RDCOLERR | FTFL_FSTAT_ACCERR | FTFL_FSTAT_FPVIOL)) {
             FTFL->FSTAT = (status & (FTFL_FSTAT_RDCOLERR | FTFL_FSTAT_ACCERR | FTFL_FSTAT_FPVIOL));
@@ -251,11 +114,11 @@ void eeprom_initialize(void) {
     }
     // wait for eeprom to become ready (is this really necessary?)
     while (!(FTFL->FCNFG & FTFL_FCNFG_EEERDY)) {
-        if (++count > 200000) break;
+        if (++count > 20000) break;
     }
 }
 
-#    define FlexRAM ((volatile uint8_t *)0x14000000)
+#    define FlexRAM ((uint8_t *)0x14000000)
 
 /** \brief eeprom read byte
  *
@@ -332,12 +195,8 @@ void eeprom_write_byte(uint8_t *addr, uint8_t value) {
     if (offset >= EEPROM_SIZE) return;
     if (!(FTFL->FCNFG & FTFL_FCNFG_EEERDY)) eeprom_initialize();
     if (FlexRAM[offset] != value) {
-        kinetis_hsrun_disable();
-        uint8_t stat = FTFL->FSTAT & 0x70;
-        if (stat) FTFL->FSTAT = stat;
         FlexRAM[offset] = value;
         flexram_wait();
-        kinetis_hsrun_enable();
     }
 }
 
@@ -354,30 +213,18 @@ void eeprom_write_word(uint16_t *addr, uint16_t value) {
     if ((offset & 1) == 0) {
 #    endif
         if (*(uint16_t *)(&FlexRAM[offset]) != value) {
-            kinetis_hsrun_disable();
-            uint8_t stat = FTFL->FSTAT & 0x70;
-            if (stat) FTFL->FSTAT = stat;
             *(uint16_t *)(&FlexRAM[offset]) = value;
             flexram_wait();
-            kinetis_hsrun_enable();
         }
 #    ifdef HANDLE_UNALIGNED_WRITES
     } else {
         if (FlexRAM[offset] != value) {
-            kinetis_hsrun_disable();
-            uint8_t stat = FTFL->FSTAT & 0x70;
-            if (stat) FTFL->FSTAT = stat;
             FlexRAM[offset] = value;
             flexram_wait();
-            kinetis_hsrun_enable();
         }
         if (FlexRAM[offset + 1] != (value >> 8)) {
-            kinetis_hsrun_disable();
-            uint8_t stat = FTFL->FSTAT & 0x70;
-            if (stat) FTFL->FSTAT = stat;
             FlexRAM[offset + 1] = value >> 8;
             flexram_wait();
-            kinetis_hsrun_enable();
         }
     }
 #    endif
@@ -397,57 +244,33 @@ void eeprom_write_dword(uint32_t *addr, uint32_t value) {
         case 0:
 #    endif
             if (*(uint32_t *)(&FlexRAM[offset]) != value) {
-                kinetis_hsrun_disable();
-                uint8_t stat = FTFL->FSTAT & 0x70;
-                if (stat) FTFL->FSTAT = stat;
                 *(uint32_t *)(&FlexRAM[offset]) = value;
                 flexram_wait();
-                kinetis_hsrun_enable();
             }
             return;
 #    ifdef HANDLE_UNALIGNED_WRITES
         case 2:
             if (*(uint16_t *)(&FlexRAM[offset]) != value) {
-                kinetis_hsrun_disable();
-                uint8_t stat = FTFL->FSTAT & 0x70;
-                if (stat) FTFL->FSTAT = stat;
                 *(uint16_t *)(&FlexRAM[offset]) = value;
                 flexram_wait();
-                kinetis_hsrun_enable();
             }
             if (*(uint16_t *)(&FlexRAM[offset + 2]) != (value >> 16)) {
-                kinetis_hsrun_disable();
-                uint8_t stat = FTFL->FSTAT & 0x70;
-                if (stat) FTFL->FSTAT = stat;
                 *(uint16_t *)(&FlexRAM[offset + 2]) = value >> 16;
                 flexram_wait();
-                kinetis_hsrun_enable();
             }
             return;
         default:
             if (FlexRAM[offset] != value) {
-                kinetis_hsrun_disable();
-                uint8_t stat = FTFL->FSTAT & 0x70;
-                if (stat) FTFL->FSTAT = stat;
                 FlexRAM[offset] = value;
                 flexram_wait();
-                kinetis_hsrun_enable();
             }
             if (*(uint16_t *)(&FlexRAM[offset + 1]) != (value >> 8)) {
-                kinetis_hsrun_disable();
-                uint8_t stat = FTFL->FSTAT & 0x70;
-                if (stat) FTFL->FSTAT = stat;
                 *(uint16_t *)(&FlexRAM[offset + 1]) = value >> 8;
                 flexram_wait();
-                kinetis_hsrun_enable();
             }
             if (FlexRAM[offset + 3] != (value >> 24)) {
-                kinetis_hsrun_disable();
-                uint8_t stat = FTFL->FSTAT & 0x70;
-                if (stat) FTFL->FSTAT = stat;
                 FlexRAM[offset + 3] = value >> 24;
                 flexram_wait();
-                kinetis_hsrun_enable();
             }
     }
 #    endif
@@ -465,7 +288,6 @@ void eeprom_write_block(const void *buf, void *addr, uint32_t len) {
     if (!(FTFL->FCNFG & FTFL_FCNFG_EEERDY)) eeprom_initialize();
     if (len >= EEPROM_SIZE) len = EEPROM_SIZE;
     if (offset + len >= EEPROM_SIZE) len = EEPROM_SIZE - offset;
-    kinetis_hsrun_disable();
     while (len > 0) {
         uint32_t lsb = offset & 3;
         if (lsb == 0 && len >= 4) {
@@ -476,8 +298,6 @@ void eeprom_write_block(const void *buf, void *addr, uint32_t len) {
             val32 |= (*src++ << 16);
             val32 |= (*src++ << 24);
             if (*(uint32_t *)(&FlexRAM[offset]) != val32) {
-                uint8_t stat = FTFL->FSTAT & 0x70;
-                if (stat) FTFL->FSTAT = stat;
                 *(uint32_t *)(&FlexRAM[offset]) = val32;
                 flexram_wait();
             }
@@ -489,8 +309,6 @@ void eeprom_write_block(const void *buf, void *addr, uint32_t len) {
             val16 = *src++;
             val16 |= (*src++ << 8);
             if (*(uint16_t *)(&FlexRAM[offset]) != val16) {
-                uint8_t stat = FTFL->FSTAT & 0x70;
-                if (stat) FTFL->FSTAT = stat;
                 *(uint16_t *)(&FlexRAM[offset]) = val16;
                 flexram_wait();
             }
@@ -500,8 +318,6 @@ void eeprom_write_block(const void *buf, void *addr, uint32_t len) {
             // write 8 bits
             uint8_t val8 = *src++;
             if (FlexRAM[offset] != val8) {
-                uint8_t stat = FTFL->FSTAT & 0x70;
-                if (stat) FTFL->FSTAT = stat;
                 FlexRAM[offset] = val8;
                 flexram_wait();
             }
@@ -509,7 +325,6 @@ void eeprom_write_block(const void *buf, void *addr, uint32_t len) {
             len--;
         }
     }
-    kinetis_hsrun_enable();
 }
 
 /*

From d9e5a5f2dbbc99516e5b81776c2130cceab6691b Mon Sep 17 00:00:00 2001
From: Gianluca D'Abrosca <63099818+dbrglc@users.noreply.github.com>
Date: Mon, 10 Jan 2022 10:13:35 +0100
Subject: [PATCH 185/867] [Keymap] bongocat_wpm_responsive for lily58 (#14922)

* Adding the keymap of the wpm responsive bongocat

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/rules.mk

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c

* Adding the License

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/rules.mk

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c

* Update keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
---
 .../keymaps/bongocat_wpm_responsive/config.h  |  49 +++
 .../keymaps/bongocat_wpm_responsive/keymap.c  | 334 ++++++++++++++++++
 .../keymaps/bongocat_wpm_responsive/readme.md |  23 ++
 .../keymaps/bongocat_wpm_responsive/rules.mk  |  11 +
 4 files changed, 417 insertions(+)
 create mode 100644 keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h
 create mode 100644 keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
 create mode 100644 keyboards/lily58/keymaps/bongocat_wpm_responsive/readme.md
 create mode 100644 keyboards/lily58/keymaps/bongocat_wpm_responsive/rules.mk

diff --git a/keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h b/keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h
new file mode 100644
index 0000000000..09248850f2
--- /dev/null
+++ b/keyboards/lily58/keymaps/bongocat_wpm_responsive/config.h
@@ -0,0 +1,49 @@
+/*
+ This is the c configuration file for the keymap
+
+ Copyright 2012 Jun Wako <wakojun@gmail.com>
+ Copyright 2015 Jack Humbert
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ #pragma once
+
+ //#define USE_MATRIX_I2C
+
+ /* Select hand configuration */
+
+ // #define MASTER_LEFT
+ #define MASTER_LEFT
+ // #define EE_HANDS
+
+ #define TAPPING_FORCE_HOLD
+ #define TAPPING_TERM 200
+
+ #undef RGBLED_NUM
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+ #define RGBLED_NUM 27
+ #define RGBLIGHT_LIMIT_VAL 120
+ #define RGBLIGHT_HUE_STEP 10
+ #define RGBLIGHT_SAT_STEP 17
+ #define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c b/keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
new file mode 100644
index 0000000000..f93e9050c4
--- /dev/null
+++ b/keyboards/lily58/keymaps/bongocat_wpm_responsive/keymap.c
@@ -0,0 +1,334 @@
+/* Copyright 2021 (@dbrglc) 
+*
+* 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 custom_layers {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+  _ADJUST,
+};
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  LOWER,
+  RAISE,
+  ADJUST,
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* QWERTY
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  =   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |CANC  |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LCTRL| LAlt | LGUI | /Space  /       \Enter \  |BackSP| RAISE |LOWER |
+ *                   |      |      |      |/       /         \      \ |      |       |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+ [_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_EQL,
+  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
+  KC_DEL,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
+                             KC_LCTRL, KC_LALT, KC_LGUI, KC_SPC,   KC_ENT,  KC_BSPC, RAISE, LOWER
+),
+/* LOWER
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   `  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   -  |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |   _  |   +  |   {  |   }  |   |  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LCTRL| LAlt | LGUI | /Space  /       \Enter \  |BackSP| RAISE |LOWER |
+ *                   |      |      |      |/       /         \      \ |      |       |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+[_LOWER] = LAYOUT(
+  _______, _______, _______, _______, _______, _______,                   _______, _______, _______,_______, _______, _______,
+  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_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
+  _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+                             _______, _______, _______, _______, _______,  _______, _______, _______
+),
+/* RAISE
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |-------.    ,-------|      | Left | Down |  Up  |Right |      |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |   \  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LCTRL| LAlt | LGUI | /Space  /       \Enter \  |BackSP| RAISE |LOWER |
+ *                   |      |      |      |/       /         \      \ |      |       |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+[_RAISE] = LAYOUT(
+  _______, _______, _______, _______, _______, _______,                     _______, _______, _______, _______, _______, _______,
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                       XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
+  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   _______, _______,  KC_PLUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+                             _______, _______, _______,  _______, _______,  _______, _______, _______
+),
+/* ADJUST
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------.    ,-------|      |      |RGB ON| HUE+ | SAT+ | VAL+ |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |      | MODE | HUE- | SAT- | VAL- |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LCTRL| LAlt | LGUI | /Space  /       \Enter \  |BackSP| RAISE |LOWER |
+ *                   |      |      |      |/       /         \      \ |      |       |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+  [_ADJUST] = LAYOUT(
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD,
+                             _______, _______, _______, _______, _______,  _______, _______, _______
+  )
+};
+
+//SSD1306 OLED update loop, make sure to enable OLED_ENABLE=yes in rules.mk
+#ifdef OLED_ENABLE
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (!is_keyboard_master())
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  return rotation;
+}
+
+// When you add source files to SRC in rules.mk, you can use functions.
+const char *read_layer_state(void);
+const char *read_logo(void);
+void set_keylog(uint16_t keycode, keyrecord_t *record);
+const char *read_keylog(void);
+const char *read_keylogs(void);
+
+// const char *read_mode_icon(bool swap);
+// const char *read_host_led_state(void);
+// void set_timelog(void);
+// const char *read_timelog(void);
+
+char wpm_str[16];
+
+// WPM-responsive animation stuff here
+#define IDLE_FRAMES 5
+#define IDLE_SPEED 40 // below this wpm value your animation will idle
+
+// #define PREP_FRAMES 1 // uncomment if >1
+
+#define TAP_FRAMES 2
+#define TAP_SPEED 60 // above this wpm value typing animation to triggere
+
+#define ANIM_FRAME_DURATION 200 // how long each frame lasts in ms
+#define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, may need fixing
+#define ANIM_SIZE 640 // number of bytes in array, minimize for adequate firmware size, max is 1024
+
+uint16_t anim_timer = 0;
+uint16_t anim_sleep = 0;
+uint8_t current_idle_frame = 0;
+uint8_t current_tap_frame = 0;
+
+//
+// Render right OLED display animation
+//
+static void render_anim(void) {
+
+  // Idle animation
+  static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
+    {
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
+      64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    },
+
+    {
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
+      64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
+      7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    },
+
+    {
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
+      32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    },
+
+    {
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
+      64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
+      7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    },
+
+    {
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
+      32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    }
+  };
+
+  // Prep animation
+  static const char PROGMEM prep[][ANIM_SIZE] = {
+
+    {
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
+      64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    }
+
+  };
+
+  // Typing animation
+  static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
+
+    {
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
+      95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
+      1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    },
+
+    {
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
+      32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
+      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    }
+
+  };
+
+  //assumes 1 frame prep stage
+    void animation_phase(void) {
+        if(get_current_wpm() <=IDLE_SPEED){
+            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+            oled_clear();
+            oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
+        }
+        if(get_current_wpm() >IDLE_SPEED && get_current_wpm() <TAP_SPEED){
+            oled_clear();
+            // oled_write_raw_P(prep[abs((PREP_FRAMES-1)-current_prep_frame)], ANIM_SIZE); // uncomment if IDLE_FRAMES >1
+            oled_write_raw_P(prep[0], ANIM_SIZE); // remove if IDLE_FRAMES >1
+        }
+        if(get_current_wpm() >=TAP_SPEED){
+            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+            oled_clear();
+            oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
+        }
+    }
+    if(get_current_wpm() != 0) {
+        if(timer_elapsed(anim_timer) > ANIM_FRAME_DURATION) {
+            anim_timer = timer_read();
+            animation_phase();
+        }
+        anim_sleep = timer_read();
+    } else {
+        if(timer_elapsed(anim_timer) > ANIM_FRAME_DURATION) {
+            anim_timer = timer_read();
+            animation_phase();
+        }
+        if(timer_elapsed(anim_sleep) > SLEEP_TIMER) {
+//            oled_off();
+        }
+    }
+}
+
+void oled_task_user(void) {
+    if (is_keyboard_master()) {
+        oled_set_cursor(0,1);
+        uint8_t n = get_current_wpm();
+        char    wpm_counter[4];
+        wpm_counter[3] = '\0';
+        wpm_counter[2] = '0' + n % 10;
+        wpm_counter[1] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' ';
+        wpm_counter[0] = n / 10 ? '0' + n / 10 : ' ';
+        oled_write_P(PSTR("WPM: "), false);
+        oled_write(wpm_counter, false);
+        oled_set_cursor(0,3); {
+            oled_write_ln(read_layer_state(), false);
+        }
+    } else {
+        render_anim();
+    }
+}
+#endif // OLED_DRIVER_ENABLE
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+#ifdef OLED_ENABLE
+    set_keylog(keycode, record);
+#endif
+    // set_timelog();
+  }
+
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+      break;
+    case LOWER:
+      if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case RAISE:
+      if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case ADJUST:
+        if (record->event.pressed) {
+          layer_on(_ADJUST);
+        } else {
+          layer_off(_ADJUST);
+        }
+        return false;
+        break;
+  }
+  return true;
+}
diff --git a/keyboards/lily58/keymaps/bongocat_wpm_responsive/readme.md b/keyboards/lily58/keymaps/bongocat_wpm_responsive/readme.md
new file mode 100644
index 0000000000..2bcd7e87f8
--- /dev/null
+++ b/keyboards/lily58/keymaps/bongocat_wpm_responsive/readme.md
@@ -0,0 +1,23 @@
+# Responsive Bongo Cat layout for Lily58 :drum: :smile_cat:
+
+This split ergo layout follows the layout of another ergo split keyboard with the following changes:
+
+* I put the space on the Left thumb and the Enter on the right thumb :thumbsup:
+
+* Near the thumbs there are all my most used keys as a Mac User :computer:
+
+* I edit the Bongo Cat to be responsive to the Word Per Minutes that you are writing :scream_cat:
+
+## Layers
+
+### Default layer
+
+![Default layer layout](https://i.imgur.com/padJXr2.png)
+
+### Raise layer
+
+![Raise layer layout](https://i.imgur.com/iqQDUXD.png)
+
+### Lower layer
+
+![Lower layer layout](https://i.imgur.com/EzNU2hq.png)
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/bongocat_wpm_responsive/rules.mk b/keyboards/lily58/keymaps/bongocat_wpm_responsive/rules.mk
new file mode 100644
index 0000000000..787d72e3f1
--- /dev/null
+++ b/keyboards/lily58/keymaps/bongocat_wpm_responsive/rules.mk
@@ -0,0 +1,11 @@
+WPM_ENABLE = yes
+LTO_ENABLE = yes
+
+ # If you want to change the display of OLED, you need to change here
+ SRC +=  ./lib/rgb_state_reader.c \
+         ./lib/layer_state_reader.c \
+         ./lib/logo_reader.c \
+         ./lib/keylogger.c \
+         # ./lib/mode_icon_reader.c \
+         # ./lib/host_led_state_reader.c \
+         # ./lib/timelogger.c \
\ No newline at end of file

From c5728aebeeb75e0069642f984d579e4691ec9677 Mon Sep 17 00:00:00 2001
From: Dmitry Nosachev <quartz64@gmail.com>
Date: Mon, 10 Jan 2022 12:26:06 +0300
Subject: [PATCH 186/867] Add Teensy2.0++ revision and VIA keymap to
 handwired/sono1 (#15296)

* teensy2.0pp revision, via support

* updated documentation

* Update keyboards/handwired/sono1/t2pp/rules.mk
---
 keyboards/handwired/sono1/config.h            | 74 ++----------------
 .../handwired/sono1/keymaps/via/keymap.c      | 75 +++++++++++++++++++
 .../handwired/sono1/keymaps/via/rules.mk      |  1 +
 keyboards/handwired/sono1/readme.md           | 32 +++++++-
 keyboards/handwired/sono1/rules.mk            |  9 +--
 .../handwired/sono1/{ => stm32f103}/chconf.h  |  3 +-
 keyboards/handwired/sono1/stm32f103/config.h  | 36 +++++++++
 .../handwired/sono1/{ => stm32f103}/halconf.h |  3 +-
 .../handwired/sono1/{ => stm32f103}/mcuconf.h |  3 +-
 keyboards/handwired/sono1/stm32f103/rules.mk  |  8 ++
 keyboards/handwired/sono1/t2pp/config.h       | 36 +++++++++
 keyboards/handwired/sono1/t2pp/rules.mk       |  5 ++
 12 files changed, 198 insertions(+), 87 deletions(-)
 create mode 100644 keyboards/handwired/sono1/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/sono1/keymaps/via/rules.mk
 rename keyboards/handwired/sono1/{ => stm32f103}/chconf.h (86%)
 create mode 100644 keyboards/handwired/sono1/stm32f103/config.h
 rename keyboards/handwired/sono1/{ => stm32f103}/halconf.h (86%)
 rename keyboards/handwired/sono1/{ => stm32f103}/mcuconf.h (86%)
 create mode 100644 keyboards/handwired/sono1/stm32f103/rules.mk
 create mode 100644 keyboards/handwired/sono1/t2pp/config.h
 create mode 100644 keyboards/handwired/sono1/t2pp/rules.mk

diff --git a/keyboards/handwired/sono1/config.h b/keyboards/handwired/sono1/config.h
index 9ccc496e17..3b06342a1a 100644
--- a/keyboards/handwired/sono1/config.h
+++ b/keyboards/handwired/sono1/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 DmNosachev
+Copyright 2021 DmNosachev
 
 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
@@ -30,80 +30,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 15
 #define MATRIX_COLS 8
 
-/*
- * 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 { A5, B3, A9, A10, B13, B14, B15, A8, B7, B8, B9, C13, A15, A0, A1 }
-#define MATRIX_COL_PINS { A4, A3, B11, B10, B1, B0, A7, A6 }
-#define UNUSED_PINS { A5 }
-
-#define LED_KANA_PIN A2
-#define LED_CAPS_LOCK_PIN B5
-#define LED_CTRL_XFER_PIN B6
-#define LED_NUM_LOCK_PIN B4
-#define LED_KB_LOCK_PIN B12
-#define LED_PIN_ON_STATE 0
-
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
 /* disable these deprecated features by default */
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
@@ -111,3 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
+
+/* mechanical locking support. NumLock key on the numpad uses Alps SKCL Lock switch */
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
\ No newline at end of file
diff --git a/keyboards/handwired/sono1/keymaps/via/keymap.c b/keyboards/handwired/sono1/keymaps/via/keymap.c
new file mode 100644
index 0000000000..8c1dc160dd
--- /dev/null
+++ b/keyboards/handwired/sono1/keymaps/via/keymap.c
@@ -0,0 +1,75 @@
+/* Copyright 2021 DmNosachev
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+,---------------------------------------------------------------------------------------------------------,  ,-----,
+| F11 |  | F12 |  |  F1  |  F2  |  F3  |  F4  |  F5  |   |  F6  |  F7  |  F8  |  F9  | F10  | |PgUp |PgDn |  | NO  |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----|-----------------,
+| Esc  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  —- | +=  |  ~` |BkSpc | |Home | End |  |  *  |  /  |  -  |  +  |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----------------------|
+|  Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  | {[  | }]  |   Enter   | | Ins | Del |  |  7  |  8  |  9  | +=  |
+|--------------------------------------------------------------------------------|          | `-----------'  |-----------------------|
+|  Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  | :;  | "'  | |\  |          | |    Up     |  |  4  |  5  |  6  |  .  |
+|--------------------------------------------------------------------------------`----------' |-----------|  |-----------------------|
+|   Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  <, |  >. | ?/  |  NO |    Shift     | |Left |Right|  |  1  |  2  |  3  | <,  |
+|-------------------------------------------------------------------------------------------| |-----------|  |-----------------------|
+|Caps | Alt | App | GUI |   Space     |   Space     |    Enter        | Ctrl  |       | Alt | |   Down    |  |  0  |  0  |   Enter   |
+`-------------------------------------------------------------------------------------------' `-----------'  '-----------------------'
+                               |  Del | BackSp|
+                               `--------------'
+*/
+    [0] = LAYOUT(
+    KC_F11,   KC_F12,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,     KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,   KC_PGUP, KC_PGDN,   _______,
+    KC_ESC,  KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_BSPC,   KC_HOME, KC_END,    KC_PAST, KC_PSLS, KC_PMNS, KC_PPLS,
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,     KC_ENT,        KC_INS,  KC_DEL,    KC_P7,   KC_P8,   KC_P9,   KC_EQL,
+    KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS,                     KC_UP,         KC_P4,   KC_P5,   KC_P6,   KC_PDOT,
+    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_LEFT, KC_RIGHT,  KC_P1,   KC_P2,   KC_P3,   KC_COMM,
+    KC_CAPS, KC_LALT, KC_APP,  KC_LGUI,     KC_SPACE,    KC_SPACE,      KC_ENT,     KC_RCTL,   KC_RALT,           KC_DOWN,       KC_P0,   KC_P0,   KC_PENT,
+                                              KC_DEL, KC_BSPC
+    ),
+
+    [1] = LAYOUT(
+    _______,  _______,   _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,               _______, _______,   _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,         _______, _______,   _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                           _______,      _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______,  _______, _______, _______, _______,
+    _______, _______, _______,          _______,       _______,         _______,     _______,     _______,   _______,                              _______,      _______, _______,    _______,
+                                          _______, _______
+    ),
+
+    [2] = LAYOUT(
+    _______,  _______,   _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,               _______, _______,   _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,         _______, _______,   _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                           _______,      _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______,  _______, _______, _______, _______,
+    _______, _______, _______,          _______,       _______,         _______,     _______,     _______,   _______,                              _______,      _______, _______,    _______,
+                                          _______, _______
+    ),
+    [3] = LAYOUT(
+    _______,  _______,   _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,               _______, _______,   _______,
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,         _______, _______,   _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                           _______,      _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______,  _______, _______, _______, _______,
+    _______, _______, _______,          _______,       _______,         _______,     _______,     _______,   _______,                              _______,      _______, _______,    _______,
+                                          _______, _______
+    )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/sono1/keymaps/via/rules.mk b/keyboards/handwired/sono1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/handwired/sono1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/sono1/readme.md b/keyboards/handwired/sono1/readme.md
index e21d06e2d9..76541e118b 100644
--- a/keyboards/handwired/sono1/readme.md
+++ b/keyboards/handwired/sono1/readme.md
@@ -5,11 +5,11 @@
 ASkeyboard Sono1 keyboard conversion project: direct connection of Black Pill to the matrix.
 
 * Keyboard Maintainer: [DmNosachev](https://github.com/DmNosachev)
-* Hardware Supported: [ASkeyboard Sono1](http://www5f.biglobe.ne.jp/~silencium/keyboard/html/alps.html), Black Pill STM32F103C8T6 MCU board. Alternatively you can use any MCU which is supported by QMK and has 28 IO pins or more (15x8 matrix and 5 LEDs): Teensy 2.0++, Blue Pill, etc.
+* Hardware Supported: [ASkeyboard Sono1](http://www5f.biglobe.ne.jp/~silencium/keyboard/html/alps.html), Teensy 2.0++ or Black Pill STM32F103C8T6 MCU board. Alternatively you can use any MCU which is supported by QMK and has 28 IO pins or more (15x8 matrix and 5 LEDs): Blue Pill, Black Pill STM32F4xx, etc.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make handwired/sono1:default
+    qmk compile -kb handwired/sono1: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).
 
@@ -22,11 +22,34 @@ ASkeyboard Sono1 has 15x8 matrix. Sono2 numpad connects directly to the main mat
 Rows (R0-RE) and columns (R0-C7):
 ![Sono1 rows and columns](https://i.imgur.com/5Owazg6h.jpeg)
 
+Desolder all ICs, capacitors and resistors except R10–R14.
+
 ## LEDs
 Keyboard has 5 LEDs with common anode. Their cathodes are connected to R10–R14 resistors (you may want to replace them to adjust LED brightness for 3.3V voltage). Add 5 wire jumpers to connect them to the corresponding traces.
 
 ![Sono1 LEDs](https://i.imgur.com/opxc2A3h.jpeg)
 
+## Teensy 2.0++
+Suggested mount position for the Teensy 2.0++ (view from the bottom side of the PCB):
+```
+     R8 R9 RA RB RC RD RE L0    R8    C7 C6 C5 C4 C3 C2 C1 C0
+      *  |  |  |  |  |  |  |     *     |  |  |  |  |  |  |  |
+    ,------------------------------------------------------------,
+,---|GN B7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 C0 C1 C2 C3 C4 C5 C6 C7 |
+|   |D7                                                          |
+|USB|                                                            |
+|   |GN                                                          |
+'---|V  B6 B5 B4 B3 B2 B1 B0 E7 E6 G  A  F0 F1 F2 F3 F4 F5 F6 F7 |
+    `------------------------------------------------------------'
+     *         |  |  |  |                 |  |  |  |  |  |  |  |
+     GN       L2 L1 L3 L4                R7 R6 R5 R4 R3 R2 R1 R0
+```
+Asterisk sign designates pins of the Teensy that don't align properly with PCB and need to be rewired.
+
+1. Compile and flash the firmware: `qmk compile -kb handwired/sono1/t2pp:default:flash`. Press the reset button on Teensy to launch the bootloader.
+2. You will need to solder several pin headers to Teensy: two 7 pin headers (C0–C7, D5–B7), 8 pin (F0–F7) and 4 pin (B1—B4). 
+3. Solder the Teensy to keyboard's PCB. You will need to manually reroute only 3 pins.
+
 ## Black Pill
 Suggested mount position for the Black Pill (view from the bottom side of the PCB):
 
@@ -47,11 +70,12 @@ Asterisk sign designates pins of the Black Pill that don't align properly with P
 
 ![Black Pill](https://i.imgur.com/KQjTWVbh.jpeg)
 
-1. Desolder all ICs, capacitors and resistors except R10–R14.
 1. Solder 4-pin SWD header to Black Pill.
 2. Burn [STM32duino bootloader](https://github.com/rogerclarkmelbourne/STM32duino-bootloader/blob/master/bootloader_only_binaries/generic_boot20_pb12.bin) to Black Pill.
-3. Compile and flash the firmware: `make handwired/sono1:default:flash`
+3. Compile and flash the firmware: `qmk compile -kb handwired/sono1/stm32f103:default:flash`
 4. Connect rows, columns and LED pads to the corresponding pins of the Black Pill.
 
 ## Keymap
 'CUR LOCK' key on Sono2 numpad has locking switch by default (Alps SKCL lock). QMK [supports mechanical locking switches](https://docs.qmk.fm/#/faq_keymap?id=mechanical-lock-switch-support) for CapsLock, NumLock and ScrollLock keycodes.
+
+There is 'debug' keymap which doesn't output any scancodes, but displays row and column numbers of pressed buttons to console (hid_listen or QMK Toolbox).
diff --git a/keyboards/handwired/sono1/rules.mk b/keyboards/handwired/sono1/rules.mk
index 3e70fa7f95..e2e79966be 100644
--- a/keyboards/handwired/sono1/rules.mk
+++ b/keyboards/handwired/sono1/rules.mk
@@ -1,11 +1,4 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+DEFAULT_FOLDER = handwired/sono1/t2pp
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/handwired/sono1/chconf.h b/keyboards/handwired/sono1/stm32f103/chconf.h
similarity index 86%
rename from keyboards/handwired/sono1/chconf.h
rename to keyboards/handwired/sono1/stm32f103/chconf.h
index f2330f083c..63236f2c2c 100644
--- a/keyboards/handwired/sono1/chconf.h
+++ b/keyboards/handwired/sono1/stm32f103/chconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/handwired/sono1/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
@@ -26,4 +26,3 @@
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
 #include_next <chconf.h>
-
diff --git a/keyboards/handwired/sono1/stm32f103/config.h b/keyboards/handwired/sono1/stm32f103/config.h
new file mode 100644
index 0000000000..8da1256900
--- /dev/null
+++ b/keyboards/handwired/sono1/stm32f103/config.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 DmNosachev
+
+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"
+
+#undef DEVICE_VER
+
+#define DEVICE_VER 0x0001
+
+#define MATRIX_ROW_PINS { A5, B3, A9, A10, B13, B14, B15, A8, B7, B8, B9, C13, A15, A0, A1 }
+#define MATRIX_COL_PINS { A4, A3, B11, B10, B1, B0, A7, A6 }
+
+
+#define LED_KANA_PIN A2
+#define LED_CAPS_LOCK_PIN B5
+#define LED_CTRL_XFER_PIN B6
+#define LED_NUM_LOCK_PIN B4
+#define LED_KB_LOCK_PIN B12
+#define LED_PIN_ON_STATE 0
+
diff --git a/keyboards/handwired/sono1/halconf.h b/keyboards/handwired/sono1/stm32f103/halconf.h
similarity index 86%
rename from keyboards/handwired/sono1/halconf.h
rename to keyboards/handwired/sono1/stm32f103/halconf.h
index 71ad504111..923b4e52d2 100644
--- a/keyboards/handwired/sono1/halconf.h
+++ b/keyboards/handwired/sono1/stm32f103/halconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/handwired/sono1/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
@@ -24,4 +24,3 @@
 #define HAL_USE_PWM TRUE
 
 #include_next <halconf.h>
-
diff --git a/keyboards/handwired/sono1/mcuconf.h b/keyboards/handwired/sono1/stm32f103/mcuconf.h
similarity index 86%
rename from keyboards/handwired/sono1/mcuconf.h
rename to keyboards/handwired/sono1/stm32f103/mcuconf.h
index cf252da153..5e94a97e21 100644
--- a/keyboards/handwired/sono1/mcuconf.h
+++ b/keyboards/handwired/sono1/stm32f103/mcuconf.h
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/handwired/sono1/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/bluepill/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
@@ -28,4 +28,3 @@
 
 #undef STM32_SPI_USE_SPI2
 #define STM32_SPI_USE_SPI2 FALSE
-
diff --git a/keyboards/handwired/sono1/stm32f103/rules.mk b/keyboards/handwired/sono1/stm32f103/rules.mk
new file mode 100644
index 0000000000..019b1130d9
--- /dev/null
+++ b/keyboards/handwired/sono1/stm32f103/rules.mk
@@ -0,0 +1,8 @@
+# MCU name
+MCU = STM32F103
+
+# Bootloader selection
+BOOTLOADER = stm32duino
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/handwired/sono1/t2pp/config.h b/keyboards/handwired/sono1/t2pp/config.h
new file mode 100644
index 0000000000..8a20aeeb1d
--- /dev/null
+++ b/keyboards/handwired/sono1/t2pp/config.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 DmNosachev
+
+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"
+
+#undef DEVICE_VER
+
+#define DEVICE_VER 0x0002
+
+#define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, D7, B7, D0, D1, D2, D3, D4 }
+#define MATRIX_COL_PINS { C6, C5, C4, C3, C2, C1, C0, E1 }
+
+
+#define LED_KANA_PIN D5
+#define LED_CAPS_LOCK_PIN B3
+#define LED_CTRL_XFER_PIN B4
+#define LED_NUM_LOCK_PIN B2
+#define LED_KB_LOCK_PIN B1
+#define LED_PIN_ON_STATE 0
+
diff --git a/keyboards/handwired/sono1/t2pp/rules.mk b/keyboards/handwired/sono1/t2pp/rules.mk
new file mode 100644
index 0000000000..149471682d
--- /dev/null
+++ b/keyboards/handwired/sono1/t2pp/rules.mk
@@ -0,0 +1,5 @@
+# MCU name
+MCU = at90usb1286
+
+# Bootloader selection
+BOOTLOADER = halfkay

From f59cbfb75c0b161187d22d07b58e242ef225611a Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Mon, 10 Jan 2022 17:21:53 +0700
Subject: [PATCH 187/867] [Keyboard] Added Handwired Redragon K552 Kumara (RGB)
 (#14004)

* Added Handwired Redragon K552 with default and via keymaps

* Resolve some request changes, and change the cols pin to a better one.

* Resolved request changes

* Added OLED support and resolve request change

* Increase polling rate to 1000hz

* Update font for OLED, and change logo

* Added LED Underglow support

* Add personal custom keymap

* Nit some line, to get better way to look on code

* Refactor everything and solved some issue.

* Resolved issue
---
 .../horrortroll/k552/boards/k552/board.c      |  49 +++
 .../horrortroll/k552/boards/k552/board.h      | 145 +++++++
 .../horrortroll/k552/boards/k552/board.mk     |   5 +
 keyboards/handwired/horrortroll/k552/chconf.h |  29 ++
 keyboards/handwired/horrortroll/k552/config.h | 102 +++++
 .../handwired/horrortroll/k552/halconf.h      |  26 ++
 .../handwired/horrortroll/k552/info.json      | 103 +++++
 keyboards/handwired/horrortroll/k552/k552.c   |  64 +++
 keyboards/handwired/horrortroll/k552/k552.h   |  54 +++
 .../horrortroll/k552/keymaps/default/keymap.c |  98 +++++
 .../k552/keymaps/default/keymap_stuff.h       | 304 ++++++++++++++
 .../k552/keymaps/default/led/cool_diagonal.c  |  22 +
 .../keymaps/default/led/custom_gradient.c     |  74 ++++
 .../k552/keymaps/default/led/diagonal.c       |  22 +
 .../k552/keymaps/default/led/kitt.c           |  68 ++++
 .../default/led/random_breath_rainbow.c       |  55 +++
 .../k552/keymaps/default/oled/oled_stuff.h    |  69 ++++
 .../k552/keymaps/default/readme.md            |  16 +
 .../k552/keymaps/default/rgb_matrix_user.inc  |  15 +
 .../horrortroll/k552/keymaps/default/rules.mk |   1 +
 .../horrortroll/k552/keymaps/via/config.h     |  19 +
 .../horrortroll/k552/keymaps/via/keymap.c     |  98 +++++
 .../k552/keymaps/via/keymap_stuff.h           | 304 ++++++++++++++
 .../k552/keymaps/via/led/cool_diagonal.c      |  22 +
 .../k552/keymaps/via/led/custom_gradient.c    |  74 ++++
 .../k552/keymaps/via/led/diagonal.c           |  22 +
 .../horrortroll/k552/keymaps/via/led/kitt.c   |  68 ++++
 .../keymaps/via/led/random_breath_rainbow.c   |  55 +++
 .../k552/keymaps/via/oled/oled_stuff.h        |  69 ++++
 .../horrortroll/k552/keymaps/via/readme.md    |  16 +
 .../k552/keymaps/via/rgb_matrix_user.inc      |  15 +
 .../horrortroll/k552/keymaps/via/rules.mk     |   3 +
 .../horrortroll/k552/ld/k552_f103.ld          |  85 ++++
 .../handwired/horrortroll/k552/lib/bongocat.c | 376 ++++++++++++++++++
 .../handwired/horrortroll/k552/lib/galaxy.c   |  58 +++
 .../handwired/horrortroll/k552/lib/glcdfont.c | 248 ++++++++++++
 .../handwired/horrortroll/k552/lib/logo.c     |  58 +++
 .../handwired/horrortroll/k552/lib/wave.c     | 133 +++++++
 .../handwired/horrortroll/k552/mcuconf.h      |  27 ++
 .../handwired/horrortroll/k552/readme.md      |  22 +
 keyboards/handwired/horrortroll/k552/rules.mk |  33 ++
 41 files changed, 3126 insertions(+)
 create mode 100644 keyboards/handwired/horrortroll/k552/boards/k552/board.c
 create mode 100644 keyboards/handwired/horrortroll/k552/boards/k552/board.h
 create mode 100644 keyboards/handwired/horrortroll/k552/boards/k552/board.mk
 create mode 100644 keyboards/handwired/horrortroll/k552/chconf.h
 create mode 100644 keyboards/handwired/horrortroll/k552/config.h
 create mode 100644 keyboards/handwired/horrortroll/k552/halconf.h
 create mode 100644 keyboards/handwired/horrortroll/k552/info.json
 create mode 100644 keyboards/handwired/horrortroll/k552/k552.c
 create mode 100644 keyboards/handwired/horrortroll/k552/k552.h
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/default/keymap_stuff.h
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/default/led/cool_diagonal.c
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/default/led/custom_gradient.c
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/default/led/diagonal.c
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/default/led/kitt.c
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/default/led/random_breath_rainbow.c
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/default/oled/oled_stuff.h
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/default/rgb_matrix_user.inc
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/default/rules.mk
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/via/config.h
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/via/keymap_stuff.h
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/via/led/cool_diagonal.c
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/via/led/custom_gradient.c
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/via/led/diagonal.c
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/via/led/kitt.c
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/via/led/random_breath_rainbow.c
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/via/oled/oled_stuff.h
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/via/readme.md
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/via/rgb_matrix_user.inc
 create mode 100644 keyboards/handwired/horrortroll/k552/keymaps/via/rules.mk
 create mode 100644 keyboards/handwired/horrortroll/k552/ld/k552_f103.ld
 create mode 100644 keyboards/handwired/horrortroll/k552/lib/bongocat.c
 create mode 100644 keyboards/handwired/horrortroll/k552/lib/galaxy.c
 create mode 100644 keyboards/handwired/horrortroll/k552/lib/glcdfont.c
 create mode 100644 keyboards/handwired/horrortroll/k552/lib/logo.c
 create mode 100644 keyboards/handwired/horrortroll/k552/lib/wave.c
 create mode 100644 keyboards/handwired/horrortroll/k552/mcuconf.h
 create mode 100644 keyboards/handwired/horrortroll/k552/readme.md
 create mode 100644 keyboards/handwired/horrortroll/k552/rules.mk

diff --git a/keyboards/handwired/horrortroll/k552/boards/k552/board.c b/keyboards/handwired/horrortroll/k552/boards/k552/board.c
new file mode 100644
index 0000000000..65269520ea
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/boards/k552/board.c
@@ -0,0 +1,49 @@
+/*
+    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include <hal.h>
+
+/**
+ * @brief   PAL setup.
+ * @details Digital I/O ports static configuration as defined in @p board.h.
+ *          This variable is used by the HAL when initializing the PAL driver.
+ */
+#if HAL_USE_PAL || defined(__DOXYGEN__)
+const PALConfig pal_default_config =
+{
+  {VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH},
+  {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH},
+  {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH},
+  {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH},
+};
+#endif
+
+/*
+ * Early initialization code.
+ * This initialization must be performed just after stack setup and before
+ * any other initialization.
+ */
+void __early_init(void) {
+  stm32_clock_init();
+  
+}
+
+/*
+ * Board-specific initialization code.
+ */
+void boardInit(void) {
+
+}
diff --git a/keyboards/handwired/horrortroll/k552/boards/k552/board.h b/keyboards/handwired/horrortroll/k552/boards/k552/board.h
new file mode 100644
index 0000000000..f9b38b0caf
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/boards/k552/board.h
@@ -0,0 +1,145 @@
+/*
+    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _BOARD_H_
+#define _BOARD_H_
+
+/*
+ * Board identifier.
+ */
+#define BOARD_K552
+#define BOARD_NAME              "K552 keyboard"
+
+/*
+ * Board frequencies.
+ */
+#define STM32_LSECLK            32768
+#define STM32_HSECLK            8000000
+
+/*
+ * MCU type, supported types are defined in ./os/hal/platforms/hal_lld.h.
+ *
+ * Only xC (256KB Flash) is defined, but it's identical to the
+ * x8 version (64KB Flash) except for the Flash region size in the
+ * linker script. For x8 parts use xC here and change to the x8 linker
+ * script in the project Makefile.
+ */
+#pragma once
+#include_next <board.h>
+#undef STM32F103xB
+#define STM32F103xE
+
+/*
+ * IO pins assignments
+ *
+ * numbering is sorted by onboard/connectors, as from the schematics in
+ * http://www.vcc-gnd.com/read.php?tid=369
+ */
+
+/* on-board */
+#define GPIOA_USBDM             11      // pin 8
+#define GPIOA_USBDP             12      // pin 9
+
+#define GPIOC_OSC32_IN          14
+#define GPIOC_OSC32_OUT         15
+
+/*
+ * I/O ports initial setup, this configuration is established soon after reset
+ * in the initialization code.
+ *
+ * The digits have the following meaning:
+ *   0 - Analog input.
+ *   1 - Push Pull output 10MHz.
+ *   2 - Push Pull output 2MHz.
+ *   3 - Push Pull output 50MHz.
+ *   4 - Digital input.
+ *   5 - Open Drain output 10MHz.
+ *   6 - Open Drain output 2MHz.
+ *   7 - Open Drain output 50MHz.
+ *   8 - Digital input with PullUp or PullDown resistor depending on ODR.
+ *   9 - Alternate Push Pull output 10MHz.
+ *   A - Alternate Push Pull output 2MHz.
+ *   B - Alternate Push Pull output 50MHz.
+ *   C - Reserved.
+ *   D - Alternate Open Drain output 10MHz.
+ *   E - Alternate Open Drain output 2MHz.
+ *   F - Alternate Open Drain output 50MHz.
+ * Please refer to the STM32 Reference Manual for details.
+ */
+
+/*
+ * Port A setup.
+ * Everything input with pull-up except:
+ */
+#define VAL_GPIOACRL            0x88888888      /*  PA7...PA0 */
+#define VAL_GPIOACRH            0x88888888      /* PA15...PA8 */
+#define VAL_GPIOAODR            0xFFFFFFFF
+
+/*
+ * Port B setup.
+ * Everything input with pull-up except:
+ */
+#define VAL_GPIOBCRL            0x88888888      /*  PB7...PB0 */
+#define VAL_GPIOBCRH            0x88888888      /* PB15...PB8 */
+#define VAL_GPIOBODR            0xFFFFFFFF
+
+/*
+ * Port C setup.
+ * Everything input with pull-up except:
+ */
+#define VAL_GPIOCCRL            0x88888888      /*  PC7...PC0 */
+#define VAL_GPIOCCRH            0x88888888      /* PC15...PC8 */
+#define VAL_GPIOCODR            0xFFFFFFFF
+
+/*
+ * Port D setup.
+ * Everything input with pull-up except:
+ * PD0  - Normal input (XTAL).
+ * PD1  - Normal input (XTAL).
+ */
+#define VAL_GPIODCRL            0x88888844      /*  PD7...PD0 */
+#define VAL_GPIODCRH            0x88888888      /* PD15...PD8 */
+#define VAL_GPIODODR            0xFFFFFFFF
+
+/*
+ * Port E setup.
+ * Everything input with pull-up except:
+ */
+#define VAL_GPIOECRL            0x88888888      /*  PE7...PE0 */
+#define VAL_GPIOECRH            0x88888888      /* PE15...PE8 */
+#define VAL_GPIOEODR            0xFFFFFFFF
+
+/*
+ * USB bus activation macro, required by the USB driver.
+ */
+#define usb_lld_connect_bus(usbp)	/* always connected */
+
+/*
+ * USB bus de-activation macro, required by the USB driver.
+ */
+#define usb_lld_disconnect_bus(usbp)	/* always connected */
+
+#if !defined(_FROM_ASM_)
+#ifdef __cplusplus
+extern "C" {
+#endif
+  void boardInit(void);
+#ifdef __cplusplus
+}
+#endif
+#endif /* _FROM_ASM_ */
+
+#endif /* _BOARD_H_ */
diff --git a/keyboards/handwired/horrortroll/k552/boards/k552/board.mk b/keyboards/handwired/horrortroll/k552/boards/k552/board.mk
new file mode 100644
index 0000000000..15831c4f15
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/boards/k552/board.mk
@@ -0,0 +1,5 @@
+# List of all the board related files.
+BOARDSRC = $(BOARD_PATH)/boards/k552/board.c
+
+# Required include directories
+BOARDINC = $(BOARD_PATH)/boards/k552
diff --git a/keyboards/handwired/horrortroll/k552/chconf.h b/keyboards/handwired/horrortroll/k552/chconf.h
new file mode 100644
index 0000000000..41c38c33e4
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/chconf.h
@@ -0,0 +1,29 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/wolfmarkclub/wm1/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_TIMEDELTA 0
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
+
diff --git a/keyboards/handwired/horrortroll/k552/config.h b/keyboards/handwired/horrortroll/k552/config.h
new file mode 100644
index 0000000000..1071b7ff31
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/config.h
@@ -0,0 +1,102 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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       0x7516 //Redragon
+#define PRODUCT_ID      0x5104
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Redragon
+#define PRODUCT         K552 Kumara
+
+/* Key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/* Key matrix pin           0    1,   2,  3,  4,  5,  6,   7,   8,  9, 10, 11, 12,  13, 14, 15, 16 */
+#define MATRIX_ROW_PINS { C12, C10, A10, A8, C8, C9 }
+#define MATRIX_COL_PINS { B15,  C6,  C7, A3, A1, C3, C1, B14, B13, A9, B3, B4, A0, C11, A2, C0, C2 }
+
+/* Direction of diode (COL2ROW or ROW2COL) */
+#define DIODE_DIRECTION ROW2COL
+
+/* Bootmagic reset */
+#define BOOTMAGIC_LITE_ROW 4
+#define BOOTMAGIC_LITE_COLUMN 6
+
+/* Forcing to use NKRO instead 6KRO */
+#define FORCE_NKRO
+
+/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
+#define USB_POLLING_INTERVAL_MS 1
+#define QMK_KEYS_PER_SCAN 12
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* EEPROM size */
+#define EEPROM_PAGE_SIZE
+#define FEE_PAGE_SIZE 0x800
+#define FEE_PAGE_COUNT 4
+
+#define FEE_MCU_FLASH_SIZE_IGNORE_CHECK
+#define FEE_MCU_FLASH_SIZE                              \
+({                                                      \
+    uint16_t flash_size = *(uint16_t*)FLASHSIZE_BASE;   \
+    (flash_size <= 512) ? flash_size : 512;             \
+})
+
+#ifdef OLED_ENABLE
+    /* Mapping I2C2 for OLED */
+    #define I2C1_SCL_PIN B10
+    #define I2C1_SDA_PIN B11
+    #define I2C_DRIVER I2CD2
+
+    /* Use the custom font */
+    #define OLED_FONT_H "lib/glcdfont.c"
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+    #define DRIVER_LED_TOTAL 24
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+
+    /* RGB Matrix config */
+    #define RGB_DI_PIN C14
+
+    /* RGB Matrix effect */
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_BREATHING
+    #define ENABLE_RGB_MATRIX_BAND_VAL
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+    #define ENABLE_RGB_MATRIX_CYCLE_ALL
+    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON
+    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+    #define ENABLE_RGB_MATRIX_RAINDROPS
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+    #define ENABLE_RGB_MATRIX_HUE_WAVE
+    #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#endif
diff --git a/keyboards/handwired/horrortroll/k552/halconf.h b/keyboards/handwired/horrortroll/k552/halconf.h
new file mode 100644
index 0000000000..e872252b6e
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/halconf.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/wolfmarkclub/wm1/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/horrortroll/k552/info.json b/keyboards/handwired/horrortroll/k552/info.json
new file mode 100644
index 0000000000..d7cbb2b448
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/info.json
@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "Redragon K552 Kumara",
+    "url": "",
+    "maintainer": "HorrorTroll",
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"App", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/horrortroll/k552/k552.c b/keyboards/handwired/horrortroll/k552/k552.c
new file mode 100644
index 0000000000..31ce5d1bbf
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/k552.c
@@ -0,0 +1,64 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 "k552.h"
+
+// OLED animation
+#include "lib/logo.c"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    { }
+}, {
+    {152,  0}, {165,  0}, {190,  0}, {205,  0},
+    {224, 21}, {224, 43}, {224, 54},
+    {188, 64}, {172, 64}, {156, 64}, {140, 64}, {115, 64}, {99 , 64}, {75 , 64}, {59 , 64}, {43 , 64}, {26 , 64},
+    {0  , 15}, {0  , 50}, {0  , 39},
+    {18 ,  0}, {36 ,  0}, {57 ,  0}, {67 ,  0}
+}, {
+    2, 2, 2, 2,       2, 2, 2, 2,
+    2,                         2,
+    2,                         2,
+    2,                         2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+} };
+#endif
+
+#ifdef OLED_ENABLE
+    uint16_t startup_timer; 
+
+    oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+        startup_timer = timer_read();
+
+        return rotation;
+    }
+
+    bool oled_task_kb(void) {
+        static bool finished_logo = false;
+
+        if ((timer_elapsed(startup_timer) < 5000) && !finished_logo) {
+            render_logo();
+        } else {
+            finished_logo = true;
+			
+            if (!oled_task_user()) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+#endif
diff --git a/keyboards/handwired/horrortroll/k552/k552.h b/keyboards/handwired/horrortroll/k552/k552.h
new file mode 100644
index 0000000000..2a537714e3
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/k552.h
@@ -0,0 +1,54 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/* ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ * │00 │   │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C │ │0E │0F │0G │
+ * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │ │1E │1F │1G │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D   │ │2E │2F │2G │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D        │     │4F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+ * │50  │51  │52  │53                      │54  │55  │56  │58  │ │5E │5F │5G │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ */
+
+#define LAYOUT_tkl_ansi( \
+    K00,      K01, K02, K03, K04,   K05, K06, K07, K08,    K09, K0A, K0B, K0C,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,    K1D,    K1E, K1F, K1G, \
+     K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,   K2D,   K2E, K2F, K2G, \
+      K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,                    \
+       K40,    K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,           K4F,      \
+    K50,  K51,  K52,                K53,                K54,  K55,  K56,  K58,  K5E, K5F, K5G  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F, K0G }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX }, \
+    { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, K4F, XXX }, \
+    { K50, K51, K52, K53, K54, K55, K56, XXX, K58, XXX, XXX, XXX, XXX, XXX, K5E, K5F, K5G }, \
+}
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/keymap.c b/keyboards/handwired/horrortroll/k552/keymaps/default/keymap.c
new file mode 100644
index 0000000000..641e0e5381
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/default/keymap.c
@@ -0,0 +1,98 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "keymap_stuff.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+       │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │ │Del│End│PgD│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │   RShift │     │ ↑ │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ App│RCrl│ │ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+       │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │ │   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │ │   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │   RShift │     │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+       │    │    │    │                        │    │    │    │    │ │   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15        16      */
+    [_BASE] = LAYOUT_tkl_ansi(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK,  KC_PAUSE,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME,  KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,   KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_APP,           KC_RCTL,                                              KC_LEFT, KC_DOWN,  KC_RIGHT
+            ),
+
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15        16     */
+    [_WAVE] = LAYOUT_tkl_ansi(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK,  KC_PAUSE,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME,  KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,   KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_APP,           KC_RCTL,                                              KC_LEFT, KC_DOWN,  KC_RIGHT
+            ),
+
+/*
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+       │Rst│   │MeP│VoD│VoU│Mut│ │Stp│Prv│Ply│Nxt│ │Mai│Hom│Cal│Sch│ │Rod│Mod│Tog│
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+       │   │   │   │   │   │   │   │   │   │   │   │Spd│Spi│       │ │C_E│   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+       │     │1Hd│1Hi│1Sd│1Si│1Vd│1Vi│   │   │   │   │   │   │     │ │   │   │Wve│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+       │      │2Hd│2Hi│2Sd│2Si│2Vd│2Vi│   │   │   │   │   │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+       │        │   │Pre│Ref│Flp│   │   │   │   │   │   │          │     │Vai│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+       │    │    │    │                        │    │ Fn │    │    │ │Hud│Vad│Hui│
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15        16     */
+    [_FN]   = LAYOUT_tkl_ansi(
+                RESET,   KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH,          RGB_RMOD, RGB_MOD, RGB_TOG,
+                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, RGB_C_E,  _______, _______,
+                _______, G1_HUD,  G1_HUI,  G1_SAD,  G1_SAI,  G1_VAD,  G1_VAI,  _______, _______, _______, _______, _______, _______, _______, _______,  _______, TG(_WAVE),
+                _______, G2_HUD,  G2_HUI,  G2_SAD,  G2_SAI,  G2_VAD,  G2_VAI,  _______, _______, _______, _______, _______,          _______,
+                _______,          G_PRE,   REF_G,   G_FLIP,  _______, _______, _______, _______, _______, _______, _______,          _______,           RGB_VAI,
+                _______, _______, _______, _______, _______, _______, _______,          _______,                                              RGB_HUD,  RGB_VAD, RGB_HUI
+            ),
+};
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/keymap_stuff.h b/keyboards/handwired/horrortroll/k552/keymaps/default/keymap_stuff.h
new file mode 100644
index 0000000000..c328e03e00
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/default/keymap_stuff.h
@@ -0,0 +1,304 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 "rgb_matrix.h"
+#include "progmem.h"
+#include "config.h"
+#include "eeprom.h"
+#include <string.h>
+#include <math.h>
+
+#include <lib/lib8tion/lib8tion.h>
+
+#include "oled/oled_stuff.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.
+
+enum layer_names {
+    _BASE = 0,
+    _WAVE = 1,
+    _FN = 2
+};
+
+// For CUSTOM_GRADIENT
+HSV gradient_0          = {205, 250, 255};
+HSV gradient_100        = {140, 215, 125};
+bool reflected_gradient = false;
+uint8_t gp_i            = 0;
+
+typedef struct {
+    HSV gradient_0;
+    HSV gradient_1;
+    bool reflected;
+} CUSTOM_PRESETS;
+
+enum user_rgb_mode {
+    RGB_MODE_ALL,
+    RGB_MODE_NONE,
+};
+
+typedef union {
+    uint32_t raw;
+    struct {
+        uint8_t rgb_mode :8;
+    };
+} user_config_t;
+
+user_config_t user_config;
+
+enum layer_keycodes {
+    //Custom Gradient control keycode
+    G1_HUI = SAFE_RANGE, //Custom gradient color 1 hue increase
+    G1_HUD,              //Custom gradient color 1 hue decrease
+    G1_SAI,              //Custom gradient color 1 saturation increase
+    G1_SAD,              //Custom gradient color 1 saturation decrease
+    G1_VAI,              //Custom gradient color 1 value increase
+    G1_VAD,              //Custom gradient color 1 value decrease
+    G2_HUI,              //Custom gradient color 2 hue increase
+    G2_HUD,              //Custom gradient color 2 hue decrease
+    G2_SAI,              //Custom gradient color 2 saturation increase
+    G2_SAD,              //Custom gradient color 2 saturation decrease
+    G2_VAI,              //Custom gradient color 2 value increase
+    G2_VAD,              //Custom gradient color 2 value decrease
+    G_PRE,               //Gradient presets
+    REF_G,               //Toggle between linear and reflected gradient
+    G_FLIP,              //Flip the gradient colors
+  
+    //Custom led effect keycode
+    RGB_C_E,             //Cycle user effect
+};
+
+void keyboard_post_init_kb(void) {
+    user_config.raw = eeconfig_read_user();
+    switch (user_config.rgb_mode) {
+        case RGB_MODE_ALL:
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_enable_noeeprom();
+            break;
+        case RGB_MODE_NONE:
+            rgb_matrix_set_flags(LED_FLAG_NONE);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    process_record_user_oled(keycode, record);
+
+    uint8_t color_adj_step = 5;
+
+    CUSTOM_PRESETS gradient_presets[] = {
+    {{41 , 255, 255}, {233, 245, 255}, false },
+    {{45 , 245, 155}, {160, 255,  80}, false },
+    {{173, 245,  40}, {41 , 255, 205}, true  },
+    {{32 , 255, 165}, {217, 185,  70}, false },
+    {{240, 255, 145}, {115, 255, 245}, true  },
+    {{118, 255, 255}, {242, 255, 255}, false },
+    {{212,  0 ,   0}, {223, 235, 165}, true  },
+    {{205, 250, 255}, {140, 215, 125}, false },
+    };
+
+    uint8_t gp_length = sizeof(gradient_presets)/sizeof(gradient_presets[0]);
+
+    switch (keycode) {
+        case G1_HUI:
+            if (record->event.pressed) {
+                gradient_0.h += color_adj_step;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_HUD:
+            if (record->event.pressed) {
+                gradient_0.h -= color_adj_step;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_SAI:
+            if (record->event.pressed) {
+                gradient_0.s = (gradient_0.s + color_adj_step * 2 <= 255) ? gradient_0.s + color_adj_step * 2 : 255;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_SAD:
+            if (record->event.pressed) {
+                gradient_0.s = (gradient_0.s - color_adj_step * 2 >= 0) ? gradient_0.s - color_adj_step * 2 : 0;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_VAI:
+            if (record->event.pressed) {
+                gradient_0.v = (gradient_0.v + color_adj_step * 2 <= 255) ? gradient_0.v + color_adj_step * 2 : 255;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_VAD:
+            if (record->event.pressed) {
+                gradient_0.v = (gradient_0.v - color_adj_step * 2 >= 0) ? gradient_0.v - color_adj_step * 2 : 0;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G2_HUI:
+            if (record->event.pressed) {
+                gradient_100.h += color_adj_step;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_HUD:
+            if (record->event.pressed) {
+                gradient_100.h -= color_adj_step;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_SAI:
+            if (record->event.pressed) {
+                gradient_100.s = (gradient_100.s + color_adj_step * 2 <= 255) ? gradient_100.s + color_adj_step * 2 : 255;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_SAD:
+            if (record->event.pressed) {
+                gradient_100.s = (gradient_100.s - color_adj_step * 2 >= 0) ? gradient_100.s - color_adj_step * 2 : 0;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_VAI:
+            if (record->event.pressed) {
+                gradient_100.v = (gradient_100.v + color_adj_step * 2 <= 255) ? gradient_100.v + color_adj_step * 2 : 255;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_VAD:
+            if (record->event.pressed) {
+                gradient_100.v = (gradient_100.v - color_adj_step * 2 >= 0) ? gradient_100.v - color_adj_step * 2 : 0;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G_PRE:
+            if (record->event.pressed) {
+                gp_i = (gp_i + gp_length ) % gp_length;
+
+                gradient_0 = gradient_presets[gp_i].gradient_0;
+                gradient_100 = gradient_presets[gp_i].gradient_1;
+                reflected_gradient = gradient_presets[gp_i].reflected;
+
+                gp_i += 1;
+            }
+            return false;
+        case REF_G:
+            if (record->event.pressed) {
+                reflected_gradient = !reflected_gradient;
+            }
+            return false;
+        case G_FLIP:
+            if (record->event.pressed) {
+                HSV temp_color = gradient_0;
+                gradient_0 = gradient_100;
+                gradient_100 = temp_color;
+            }
+            return false;
+        case RGB_C_E:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_mode()) {
+                    case RGB_MATRIX_CUSTOM_CUSTOM_GRADIENT:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_DIAGONAL);
+                        return false;
+                    case RGB_MATRIX_CUSTOM_DIAGONAL:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_COOL_DIAGONAL);
+                        return false;
+                    case RGB_MATRIX_CUSTOM_COOL_DIAGONAL:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_KITT);
+                        return false;
+                    case RGB_MATRIX_CUSTOM_KITT:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_RANDOM_BREATH_RAINBOW);
+                        return false;
+                    default:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_CUSTOM_GRADIENT);
+                        return false;
+                }
+            }
+            return false;
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_NONE;
+                    }
+                    break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                        user_config.rgb_mode = RGB_MODE_ALL;
+                    }
+                    break;
+                }
+                eeconfig_update_user(user_config.raw);
+            }
+            return false;
+	}
+    return true;
+}
+
+void rgb_matrix_indicators_user(void) {
+    uint8_t  side_leds_left[3]  = {17, 18, 19};
+    uint8_t  side_leds_right[3] = { 4,  5,  6};
+    HSV      hsv = rgb_matrix_config.hsv;
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
+    hsv.h        = time;
+    RGB      rgb = hsv_to_rgb(hsv);
+
+    if ((rgb_matrix_get_flags() & LED_FLAG_ALL)) {
+        if (host_keyboard_led_state().caps_lock) {
+            for (uint8_t i = 0; i < 3; i++)
+            {
+                rgb_matrix_set_color(side_leds_left[i], rgb.r, rgb.g, rgb.b);
+            }
+        }
+        if (host_keyboard_led_state().scroll_lock) {
+            for (uint8_t i = 0; i < 3; i++)
+            {
+                rgb_matrix_set_color(side_leds_right[i], rgb.r, rgb.g, rgb.b);
+            }
+        }
+    } else {
+        if (host_keyboard_led_state().caps_lock) {
+            for (uint8_t i = 0; i < 3; i++)
+            {
+                rgb_matrix_set_color(side_leds_left[i], rgb.r, rgb.g, rgb.b);
+            }
+        } else {
+            for (uint8_t i = 0; i < 3; i++)
+            {
+                rgb_matrix_set_color(side_leds_left[i], 0, 0, 0);
+            }
+        }
+        if (host_keyboard_led_state().scroll_lock) {
+            for (uint8_t i = 0; i < 3; i++)
+            {
+                rgb_matrix_set_color(side_leds_right[i], rgb.r, rgb.g, rgb.b);
+            }
+        } else {
+            for (uint8_t i = 0; i < 3; i++)
+            {
+                rgb_matrix_set_color(side_leds_right[i], 0, 0, 0);
+            }
+        }
+    }
+}
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/cool_diagonal.c b/keyboards/handwired/horrortroll/k552/keymaps/default/led/cool_diagonal.c
new file mode 100644
index 0000000000..2c518a5431
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/default/led/cool_diagonal.c
@@ -0,0 +1,22 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+static HSV COOL_DIAGONAL_math(HSV hsv, uint8_t i, uint8_t time) {
+    hsv.h = (g_led_config.point[i].x / 4) - g_led_config.point[i].y - time;
+    return hsv;
+}
+
+bool COOL_DIAGONAL(effect_params_t* params) { return effect_runner_i(params, &COOL_DIAGONAL_math); }
\ No newline at end of file
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/custom_gradient.c b/keyboards/handwired/horrortroll/k552/keymaps/default/led/custom_gradient.c
new file mode 100644
index 0000000000..49e4a242fb
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/default/led/custom_gradient.c
@@ -0,0 +1,74 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+extern HSV gradient_0;
+extern HSV gradient_100;
+extern bool reflected_gradient;
+
+static HSV INTERPOLATE_HSV(float step, HSV gradient_0, HSV gradient_100) {
+    uint8_t cw, ccw;
+    HSV color;
+
+    cw = (gradient_0.h >= gradient_100.h) ? 255 + gradient_100.h - gradient_0.h : gradient_100.h - gradient_0.h;  // Hue range is 0 to 255.
+    ccw = (gradient_0.h >= gradient_100.h) ? gradient_0.h - gradient_100.h : 255 + gradient_0.h - gradient_100.h;
+
+    if( cw < ccw ) { // going clockwise
+        color.h = gradient_0.h + (uint8_t)(step * cw);
+    } else { // Going counter clockwise
+        color.h = gradient_0.h - (uint8_t)(step * ccw);
+    }
+
+    color.s = gradient_0.s + step * (gradient_100.s - gradient_0.s);
+
+    // Scale V with global RGB Matrix's V, so users can still control overall brightness with RGB_VAI & RGB_VAD0
+    color.v = round((gradient_0.v + step * (gradient_100.v - gradient_0.v)) * ((float)rgb_matrix_config.hsv.v / 255));
+
+    return color;
+}
+
+static HSV CUSTOM_GRADIENT_math(uint8_t led_x, uint8_t min_x, uint8_t max_x) {
+    float step = (float)led_x / (max_x - min_x);
+    float mid_gradient_pos = 0.5;
+
+    if( reflected_gradient ) {
+        if( step <= mid_gradient_pos ) {
+            return INTERPOLATE_HSV(step * (1/mid_gradient_pos), gradient_0, gradient_100);
+        } else {
+            return INTERPOLATE_HSV((step - mid_gradient_pos) * (1/(1-mid_gradient_pos)), gradient_100, gradient_0);
+        }
+
+    } else {
+        return INTERPOLATE_HSV(step, gradient_0, gradient_100);
+    }
+}
+
+static bool CUSTOM_GRADIENT(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t min_x = 0;  // X coordinate of the left-most LED
+    uint8_t max_x = 224; // X coordinate of the right-most LED
+
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+
+        HSV hsv_orig = CUSTOM_GRADIENT_math(g_led_config.point[i].x, min_x, max_x);
+        RGB rgb = hsv_to_rgb(hsv_orig);
+
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+
+    return led_max < DRIVER_LED_TOTAL;
+}
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/diagonal.c b/keyboards/handwired/horrortroll/k552/keymaps/default/led/diagonal.c
new file mode 100644
index 0000000000..19e3791bd6
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/default/led/diagonal.c
@@ -0,0 +1,22 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+static HSV DIAGONAL_math(HSV hsv, uint8_t i, uint8_t time) {
+    hsv.h = g_led_config.point[i].x - g_led_config.point[i].y - time;
+    return hsv;
+}
+
+bool DIAGONAL(effect_params_t* params) { return effect_runner_i(params, &DIAGONAL_math); }
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/kitt.c b/keyboards/handwired/horrortroll/k552/keymaps/default/led/kitt.c
new file mode 100644
index 0000000000..823eb5839b
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/default/led/kitt.c
@@ -0,0 +1,68 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+// variable for startup animation
+bool BASE_EFFECT_NOT_STARTED_YET = true;
+uint8_t base_effect_startup_counter = 255;
+
+uint8_t led_count = 10;
+uint8_t led_first = 7;
+
+static uint8_t time_to_led(uint8_t time, uint8_t led_behind) {
+    uint16_t led_time = led_count * time;
+    uint16_t step = ((2 * led_count + (led_time / 128)) - led_behind) % (2 * led_count);
+    uint8_t led;
+
+    if (step < led_count) {
+        led = step;
+    } else {
+        led = led_count - 1 - (step - led_count);
+    }
+
+    return led;
+}
+
+static HSV KITT_math(HSV hsv, uint8_t i, uint8_t time) {
+
+    // reset base effect startup
+    if (i == 0) {
+        BASE_EFFECT_NOT_STARTED_YET = true;
+    }
+
+    hsv.h = 0;
+    hsv.s = 255;
+
+    if (i >= led_first && i < led_first + led_count) {
+        uint8_t j = i - led_first;
+        if (j == time_to_led(time, 0)) {
+            hsv.v = hsv.v;
+        } else if (j == time_to_led(time, 1)) {
+            hsv.v = hsv.v/2;
+        } else if (j == time_to_led(time, 2)) {
+            hsv.v = hsv.v/4;
+        } else if (j == time_to_led(time, 3)) {
+            hsv.v = hsv.v/8;
+        } else {
+            hsv.v = 0;
+        }
+    } else {
+        hsv.v = 0;
+    }
+
+    return hsv;
+}
+
+bool KITT(effect_params_t* params) { return effect_runner_i(params, &KITT_math); }
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/random_breath_rainbow.c b/keyboards/handwired/horrortroll/k552/keymaps/default/led/random_breath_rainbow.c
new file mode 100644
index 0000000000..041417477b
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/default/led/random_breath_rainbow.c
@@ -0,0 +1,55 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+static uint8_t offset[DRIVER_LED_TOTAL];
+
+static void doRandom_breath_rainbow(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
+    uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 6);
+
+    if (rand() * 50 == 1) {
+        if (rand() * 2 == 1) {
+            offset[i]++;
+        }
+        else {
+            offset[i]--;
+        }
+    }
+
+    //float val = (((float)sin8(time + offset[i]) / 256)/2.1) + .05;
+    HSV hsv = {0, 255, 255};
+    hsv.h = scale16by8(g_rgb_timer + offset[i], rgb_matrix_config.speed / 4) + (offset[i]*2);
+    hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+}
+
+bool RANDOM_BREATH_RAINBOW(effect_params_t* params) {
+    
+    if (!params->init) {
+        // Change one LED every tick, make sure speed is not 0
+        doRandom_breath_rainbow(rand() % DRIVER_LED_TOTAL, params);
+        return false;
+    }
+	
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    for (uint8_t i = led_min; i < led_max; i++) {
+        doRandom_breath_rainbow(i, params);
+    }
+
+    return led_max < DRIVER_LED_TOTAL;
+}
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/oled/oled_stuff.h b/keyboards/handwired/horrortroll/k552/keymaps/default/oled/oled_stuff.h
new file mode 100644
index 0000000000..9d8d629179
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/default/oled/oled_stuff.h
@@ -0,0 +1,69 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+// OLED animation
+#include "lib/bongocat.c"
+#include "lib/galaxy.c"
+#include "lib/wave.c"
+
+#ifdef OLED_ENABLE
+    bool oled_task_user(void) {
+        led_t led_usb_state = host_keyboard_led_state();
+        static uint8_t old_layer;
+        uint8_t layer = get_highest_layer(layer_state | default_layer_state);
+
+        if (layer != old_layer) {
+            oled_clear();
+        }
+
+        old_layer = layer;
+
+        switch (layer) {
+            case 0:
+                render_bongocat();
+                oled_set_cursor(14, 0);                                // sets cursor to (column, row) using charactar spacing (4 rows on 128x32 screen, anything more will overflow back to the top)
+                oled_write_P(PSTR("WPM:"), false);
+                oled_write(get_u8_str(get_current_wpm(), '0'), false); // writes wpm on top right corner of string
+                oled_set_cursor(17, 2);
+                oled_write_P(led_usb_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
+                oled_set_cursor(17, 3);
+                oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRL") : PSTR("    "), false);
+                break;
+            case 1:
+                // sleep if it has been long enough since we last got a char
+                if (timer_elapsed32(wave_sleep) > OLED_TIMEOUT) {
+                    oled_off();
+                } else {
+                    oled_on();
+                }
+                // time for the next frame?
+                if (timer_elapsed(wave_timer) > FRAME_TIMEOUT) {
+                    wave_timer = timer_read();
+                    render_frame();
+                }
+
+                oled_set_cursor(0, 3);
+                oled_write_P(led_usb_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
+                oled_set_cursor(17, 3);
+                oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRL") : PSTR("    "), false);
+                break;
+            case 2:
+                render_galaxy();
+                break;
+		}
+        return false;
+    }
+#endif
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/readme.md b/keyboards/handwired/horrortroll/k552/keymaps/default/readme.md
new file mode 100644
index 0000000000..c8f9c1f8ec
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/default/readme.md
@@ -0,0 +1,16 @@
+# Default layout and custom LED / OLED
+
+Keymap is default 87 qwerty, TKL layout
+
+It have new LED effect:
+- Custom gradient (ported from SirTimmyTimbit code [https://github.com/SirTimmyTimbit/customizable-gradient-effect-for-drop-alt])
+- Diagonal (ported from pleasuretek code [https://github.com/pleasuretek/qmk_firmware])
+- Cool diagonal (ported from pleasuretek code [https://github.com/pleasuretek/qmk_firmware])
+- Knight Rider (ported from jumper149 code [https://github.com/jumper149/qmk_firmware/blob/jumper149/keyboards/dztech/dz65rgb/keymaps/jumper149/])
+- Random breath rainbow (based from daed code [https://github.com/daed/qmk_firmware/blob/master/keyboards/massdrop/alt/keymaps/daed] and modify by me)
+
+And OLED Animation:
+- Bongo Cat (ported from nwii code [https://github.com/nwii/oledbongocat] and modify image animation by me)
+- Waveform Typing (ported from drcforbin code [https://github.com/drcforbin/keyboards] and modify to correct my TKL layout)
+- Galaxy image when pressing FN key (original image [https://www.deviantart.com/rock-bomber/art/Gateway-668850827] and redraw then cut for 128x32 size by me)
+- Redragon Logo when booting up
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/rgb_matrix_user.inc b/keyboards/handwired/horrortroll/k552/keymaps/default/rgb_matrix_user.inc
new file mode 100644
index 0000000000..38edbae993
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/default/rgb_matrix_user.inc
@@ -0,0 +1,15 @@
+RGB_MATRIX_EFFECT(CUSTOM_GRADIENT)
+RGB_MATRIX_EFFECT(DIAGONAL)
+RGB_MATRIX_EFFECT(COOL_DIAGONAL)
+RGB_MATRIX_EFFECT(KITT)
+RGB_MATRIX_EFFECT(RANDOM_BREATH_RAINBOW)
+
+#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+#include "led/custom_gradient.c"
+#include "led/diagonal.c"
+#include "led/cool_diagonal.c"
+#include "led/kitt.c"
+#include "led/random_breath_rainbow.c"
+
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
\ No newline at end of file
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/rules.mk b/keyboards/handwired/horrortroll/k552/keymaps/default/rules.mk
new file mode 100644
index 0000000000..6245023e80
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/default/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/config.h b/keyboards/handwired/horrortroll/k552/keymaps/via/config.h
new file mode 100644
index 0000000000..a36ce468bc
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/via/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/keymap.c b/keyboards/handwired/horrortroll/k552/keymaps/via/keymap.c
new file mode 100644
index 0000000000..641e0e5381
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/via/keymap.c
@@ -0,0 +1,98 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "keymap_stuff.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+       │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Scr│Pse│
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+       │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │ │Del│End│PgD│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │   RShift │     │ ↑ │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ App│RCrl│ │ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+       │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │ │   │   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │ │   │   │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │   RShift │     │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+       │    │    │    │                        │    │    │    │    │ │   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15        16      */
+    [_BASE] = LAYOUT_tkl_ansi(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK,  KC_PAUSE,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME,  KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,   KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_APP,           KC_RCTL,                                              KC_LEFT, KC_DOWN,  KC_RIGHT
+            ),
+
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15        16     */
+    [_WAVE] = LAYOUT_tkl_ansi(
+                KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK,  KC_PAUSE,
+                KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME,  KC_PGUP,
+                KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,   KC_PGDN,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_APP,           KC_RCTL,                                              KC_LEFT, KC_DOWN,  KC_RIGHT
+            ),
+
+/*
+       ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+       │Rst│   │MeP│VoD│VoU│Mut│ │Stp│Prv│Ply│Nxt│ │Mai│Hom│Cal│Sch│ │Rod│Mod│Tog│
+       └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+       │   │   │   │   │   │   │   │   │   │   │   │Spd│Spi│       │ │C_E│   │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+       │     │1Hd│1Hi│1Sd│1Si│1Vd│1Vi│   │   │   │   │   │   │     │ │   │   │Wve│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+       │      │2Hd│2Hi│2Sd│2Si│2Vd│2Vi│   │   │   │   │   │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+       │        │   │Pre│Ref│Flp│   │   │   │   │   │   │          │     │Vai│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+       │    │    │    │                        │    │ Fn │    │    │ │Hud│Vad│Hui│
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13       14       15        16     */
+    [_FN]   = LAYOUT_tkl_ansi(
+                RESET,   KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH,          RGB_RMOD, RGB_MOD, RGB_TOG,
+                NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, RGB_C_E,  _______, _______,
+                _______, G1_HUD,  G1_HUI,  G1_SAD,  G1_SAI,  G1_VAD,  G1_VAI,  _______, _______, _______, _______, _______, _______, _______, _______,  _______, TG(_WAVE),
+                _______, G2_HUD,  G2_HUI,  G2_SAD,  G2_SAI,  G2_VAD,  G2_VAI,  _______, _______, _______, _______, _______,          _______,
+                _______,          G_PRE,   REF_G,   G_FLIP,  _______, _______, _______, _______, _______, _______, _______,          _______,           RGB_VAI,
+                _______, _______, _______, _______, _______, _______, _______,          _______,                                              RGB_HUD,  RGB_VAD, RGB_HUI
+            ),
+};
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/keymap_stuff.h b/keyboards/handwired/horrortroll/k552/keymaps/via/keymap_stuff.h
new file mode 100644
index 0000000000..c328e03e00
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/via/keymap_stuff.h
@@ -0,0 +1,304 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 "rgb_matrix.h"
+#include "progmem.h"
+#include "config.h"
+#include "eeprom.h"
+#include <string.h>
+#include <math.h>
+
+#include <lib/lib8tion/lib8tion.h>
+
+#include "oled/oled_stuff.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.
+
+enum layer_names {
+    _BASE = 0,
+    _WAVE = 1,
+    _FN = 2
+};
+
+// For CUSTOM_GRADIENT
+HSV gradient_0          = {205, 250, 255};
+HSV gradient_100        = {140, 215, 125};
+bool reflected_gradient = false;
+uint8_t gp_i            = 0;
+
+typedef struct {
+    HSV gradient_0;
+    HSV gradient_1;
+    bool reflected;
+} CUSTOM_PRESETS;
+
+enum user_rgb_mode {
+    RGB_MODE_ALL,
+    RGB_MODE_NONE,
+};
+
+typedef union {
+    uint32_t raw;
+    struct {
+        uint8_t rgb_mode :8;
+    };
+} user_config_t;
+
+user_config_t user_config;
+
+enum layer_keycodes {
+    //Custom Gradient control keycode
+    G1_HUI = SAFE_RANGE, //Custom gradient color 1 hue increase
+    G1_HUD,              //Custom gradient color 1 hue decrease
+    G1_SAI,              //Custom gradient color 1 saturation increase
+    G1_SAD,              //Custom gradient color 1 saturation decrease
+    G1_VAI,              //Custom gradient color 1 value increase
+    G1_VAD,              //Custom gradient color 1 value decrease
+    G2_HUI,              //Custom gradient color 2 hue increase
+    G2_HUD,              //Custom gradient color 2 hue decrease
+    G2_SAI,              //Custom gradient color 2 saturation increase
+    G2_SAD,              //Custom gradient color 2 saturation decrease
+    G2_VAI,              //Custom gradient color 2 value increase
+    G2_VAD,              //Custom gradient color 2 value decrease
+    G_PRE,               //Gradient presets
+    REF_G,               //Toggle between linear and reflected gradient
+    G_FLIP,              //Flip the gradient colors
+  
+    //Custom led effect keycode
+    RGB_C_E,             //Cycle user effect
+};
+
+void keyboard_post_init_kb(void) {
+    user_config.raw = eeconfig_read_user();
+    switch (user_config.rgb_mode) {
+        case RGB_MODE_ALL:
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_enable_noeeprom();
+            break;
+        case RGB_MODE_NONE:
+            rgb_matrix_set_flags(LED_FLAG_NONE);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    process_record_user_oled(keycode, record);
+
+    uint8_t color_adj_step = 5;
+
+    CUSTOM_PRESETS gradient_presets[] = {
+    {{41 , 255, 255}, {233, 245, 255}, false },
+    {{45 , 245, 155}, {160, 255,  80}, false },
+    {{173, 245,  40}, {41 , 255, 205}, true  },
+    {{32 , 255, 165}, {217, 185,  70}, false },
+    {{240, 255, 145}, {115, 255, 245}, true  },
+    {{118, 255, 255}, {242, 255, 255}, false },
+    {{212,  0 ,   0}, {223, 235, 165}, true  },
+    {{205, 250, 255}, {140, 215, 125}, false },
+    };
+
+    uint8_t gp_length = sizeof(gradient_presets)/sizeof(gradient_presets[0]);
+
+    switch (keycode) {
+        case G1_HUI:
+            if (record->event.pressed) {
+                gradient_0.h += color_adj_step;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_HUD:
+            if (record->event.pressed) {
+                gradient_0.h -= color_adj_step;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_SAI:
+            if (record->event.pressed) {
+                gradient_0.s = (gradient_0.s + color_adj_step * 2 <= 255) ? gradient_0.s + color_adj_step * 2 : 255;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_SAD:
+            if (record->event.pressed) {
+                gradient_0.s = (gradient_0.s - color_adj_step * 2 >= 0) ? gradient_0.s - color_adj_step * 2 : 0;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_VAI:
+            if (record->event.pressed) {
+                gradient_0.v = (gradient_0.v + color_adj_step * 2 <= 255) ? gradient_0.v + color_adj_step * 2 : 255;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_VAD:
+            if (record->event.pressed) {
+                gradient_0.v = (gradient_0.v - color_adj_step * 2 >= 0) ? gradient_0.v - color_adj_step * 2 : 0;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G2_HUI:
+            if (record->event.pressed) {
+                gradient_100.h += color_adj_step;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_HUD:
+            if (record->event.pressed) {
+                gradient_100.h -= color_adj_step;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_SAI:
+            if (record->event.pressed) {
+                gradient_100.s = (gradient_100.s + color_adj_step * 2 <= 255) ? gradient_100.s + color_adj_step * 2 : 255;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_SAD:
+            if (record->event.pressed) {
+                gradient_100.s = (gradient_100.s - color_adj_step * 2 >= 0) ? gradient_100.s - color_adj_step * 2 : 0;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_VAI:
+            if (record->event.pressed) {
+                gradient_100.v = (gradient_100.v + color_adj_step * 2 <= 255) ? gradient_100.v + color_adj_step * 2 : 255;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_VAD:
+            if (record->event.pressed) {
+                gradient_100.v = (gradient_100.v - color_adj_step * 2 >= 0) ? gradient_100.v - color_adj_step * 2 : 0;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G_PRE:
+            if (record->event.pressed) {
+                gp_i = (gp_i + gp_length ) % gp_length;
+
+                gradient_0 = gradient_presets[gp_i].gradient_0;
+                gradient_100 = gradient_presets[gp_i].gradient_1;
+                reflected_gradient = gradient_presets[gp_i].reflected;
+
+                gp_i += 1;
+            }
+            return false;
+        case REF_G:
+            if (record->event.pressed) {
+                reflected_gradient = !reflected_gradient;
+            }
+            return false;
+        case G_FLIP:
+            if (record->event.pressed) {
+                HSV temp_color = gradient_0;
+                gradient_0 = gradient_100;
+                gradient_100 = temp_color;
+            }
+            return false;
+        case RGB_C_E:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_mode()) {
+                    case RGB_MATRIX_CUSTOM_CUSTOM_GRADIENT:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_DIAGONAL);
+                        return false;
+                    case RGB_MATRIX_CUSTOM_DIAGONAL:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_COOL_DIAGONAL);
+                        return false;
+                    case RGB_MATRIX_CUSTOM_COOL_DIAGONAL:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_KITT);
+                        return false;
+                    case RGB_MATRIX_CUSTOM_KITT:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_RANDOM_BREATH_RAINBOW);
+                        return false;
+                    default:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_CUSTOM_GRADIENT);
+                        return false;
+                }
+            }
+            return false;
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_NONE;
+                    }
+                    break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                        user_config.rgb_mode = RGB_MODE_ALL;
+                    }
+                    break;
+                }
+                eeconfig_update_user(user_config.raw);
+            }
+            return false;
+	}
+    return true;
+}
+
+void rgb_matrix_indicators_user(void) {
+    uint8_t  side_leds_left[3]  = {17, 18, 19};
+    uint8_t  side_leds_right[3] = { 4,  5,  6};
+    HSV      hsv = rgb_matrix_config.hsv;
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
+    hsv.h        = time;
+    RGB      rgb = hsv_to_rgb(hsv);
+
+    if ((rgb_matrix_get_flags() & LED_FLAG_ALL)) {
+        if (host_keyboard_led_state().caps_lock) {
+            for (uint8_t i = 0; i < 3; i++)
+            {
+                rgb_matrix_set_color(side_leds_left[i], rgb.r, rgb.g, rgb.b);
+            }
+        }
+        if (host_keyboard_led_state().scroll_lock) {
+            for (uint8_t i = 0; i < 3; i++)
+            {
+                rgb_matrix_set_color(side_leds_right[i], rgb.r, rgb.g, rgb.b);
+            }
+        }
+    } else {
+        if (host_keyboard_led_state().caps_lock) {
+            for (uint8_t i = 0; i < 3; i++)
+            {
+                rgb_matrix_set_color(side_leds_left[i], rgb.r, rgb.g, rgb.b);
+            }
+        } else {
+            for (uint8_t i = 0; i < 3; i++)
+            {
+                rgb_matrix_set_color(side_leds_left[i], 0, 0, 0);
+            }
+        }
+        if (host_keyboard_led_state().scroll_lock) {
+            for (uint8_t i = 0; i < 3; i++)
+            {
+                rgb_matrix_set_color(side_leds_right[i], rgb.r, rgb.g, rgb.b);
+            }
+        } else {
+            for (uint8_t i = 0; i < 3; i++)
+            {
+                rgb_matrix_set_color(side_leds_right[i], 0, 0, 0);
+            }
+        }
+    }
+}
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/cool_diagonal.c b/keyboards/handwired/horrortroll/k552/keymaps/via/led/cool_diagonal.c
new file mode 100644
index 0000000000..2c518a5431
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/via/led/cool_diagonal.c
@@ -0,0 +1,22 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+static HSV COOL_DIAGONAL_math(HSV hsv, uint8_t i, uint8_t time) {
+    hsv.h = (g_led_config.point[i].x / 4) - g_led_config.point[i].y - time;
+    return hsv;
+}
+
+bool COOL_DIAGONAL(effect_params_t* params) { return effect_runner_i(params, &COOL_DIAGONAL_math); }
\ No newline at end of file
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/custom_gradient.c b/keyboards/handwired/horrortroll/k552/keymaps/via/led/custom_gradient.c
new file mode 100644
index 0000000000..49e4a242fb
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/via/led/custom_gradient.c
@@ -0,0 +1,74 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+extern HSV gradient_0;
+extern HSV gradient_100;
+extern bool reflected_gradient;
+
+static HSV INTERPOLATE_HSV(float step, HSV gradient_0, HSV gradient_100) {
+    uint8_t cw, ccw;
+    HSV color;
+
+    cw = (gradient_0.h >= gradient_100.h) ? 255 + gradient_100.h - gradient_0.h : gradient_100.h - gradient_0.h;  // Hue range is 0 to 255.
+    ccw = (gradient_0.h >= gradient_100.h) ? gradient_0.h - gradient_100.h : 255 + gradient_0.h - gradient_100.h;
+
+    if( cw < ccw ) { // going clockwise
+        color.h = gradient_0.h + (uint8_t)(step * cw);
+    } else { // Going counter clockwise
+        color.h = gradient_0.h - (uint8_t)(step * ccw);
+    }
+
+    color.s = gradient_0.s + step * (gradient_100.s - gradient_0.s);
+
+    // Scale V with global RGB Matrix's V, so users can still control overall brightness with RGB_VAI & RGB_VAD0
+    color.v = round((gradient_0.v + step * (gradient_100.v - gradient_0.v)) * ((float)rgb_matrix_config.hsv.v / 255));
+
+    return color;
+}
+
+static HSV CUSTOM_GRADIENT_math(uint8_t led_x, uint8_t min_x, uint8_t max_x) {
+    float step = (float)led_x / (max_x - min_x);
+    float mid_gradient_pos = 0.5;
+
+    if( reflected_gradient ) {
+        if( step <= mid_gradient_pos ) {
+            return INTERPOLATE_HSV(step * (1/mid_gradient_pos), gradient_0, gradient_100);
+        } else {
+            return INTERPOLATE_HSV((step - mid_gradient_pos) * (1/(1-mid_gradient_pos)), gradient_100, gradient_0);
+        }
+
+    } else {
+        return INTERPOLATE_HSV(step, gradient_0, gradient_100);
+    }
+}
+
+static bool CUSTOM_GRADIENT(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t min_x = 0;  // X coordinate of the left-most LED
+    uint8_t max_x = 224; // X coordinate of the right-most LED
+
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+
+        HSV hsv_orig = CUSTOM_GRADIENT_math(g_led_config.point[i].x, min_x, max_x);
+        RGB rgb = hsv_to_rgb(hsv_orig);
+
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+
+    return led_max < DRIVER_LED_TOTAL;
+}
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/diagonal.c b/keyboards/handwired/horrortroll/k552/keymaps/via/led/diagonal.c
new file mode 100644
index 0000000000..19e3791bd6
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/via/led/diagonal.c
@@ -0,0 +1,22 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+static HSV DIAGONAL_math(HSV hsv, uint8_t i, uint8_t time) {
+    hsv.h = g_led_config.point[i].x - g_led_config.point[i].y - time;
+    return hsv;
+}
+
+bool DIAGONAL(effect_params_t* params) { return effect_runner_i(params, &DIAGONAL_math); }
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/kitt.c b/keyboards/handwired/horrortroll/k552/keymaps/via/led/kitt.c
new file mode 100644
index 0000000000..823eb5839b
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/via/led/kitt.c
@@ -0,0 +1,68 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+// variable for startup animation
+bool BASE_EFFECT_NOT_STARTED_YET = true;
+uint8_t base_effect_startup_counter = 255;
+
+uint8_t led_count = 10;
+uint8_t led_first = 7;
+
+static uint8_t time_to_led(uint8_t time, uint8_t led_behind) {
+    uint16_t led_time = led_count * time;
+    uint16_t step = ((2 * led_count + (led_time / 128)) - led_behind) % (2 * led_count);
+    uint8_t led;
+
+    if (step < led_count) {
+        led = step;
+    } else {
+        led = led_count - 1 - (step - led_count);
+    }
+
+    return led;
+}
+
+static HSV KITT_math(HSV hsv, uint8_t i, uint8_t time) {
+
+    // reset base effect startup
+    if (i == 0) {
+        BASE_EFFECT_NOT_STARTED_YET = true;
+    }
+
+    hsv.h = 0;
+    hsv.s = 255;
+
+    if (i >= led_first && i < led_first + led_count) {
+        uint8_t j = i - led_first;
+        if (j == time_to_led(time, 0)) {
+            hsv.v = hsv.v;
+        } else if (j == time_to_led(time, 1)) {
+            hsv.v = hsv.v/2;
+        } else if (j == time_to_led(time, 2)) {
+            hsv.v = hsv.v/4;
+        } else if (j == time_to_led(time, 3)) {
+            hsv.v = hsv.v/8;
+        } else {
+            hsv.v = 0;
+        }
+    } else {
+        hsv.v = 0;
+    }
+
+    return hsv;
+}
+
+bool KITT(effect_params_t* params) { return effect_runner_i(params, &KITT_math); }
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/random_breath_rainbow.c b/keyboards/handwired/horrortroll/k552/keymaps/via/led/random_breath_rainbow.c
new file mode 100644
index 0000000000..041417477b
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/via/led/random_breath_rainbow.c
@@ -0,0 +1,55 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+static uint8_t offset[DRIVER_LED_TOTAL];
+
+static void doRandom_breath_rainbow(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
+    uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 6);
+
+    if (rand() * 50 == 1) {
+        if (rand() * 2 == 1) {
+            offset[i]++;
+        }
+        else {
+            offset[i]--;
+        }
+    }
+
+    //float val = (((float)sin8(time + offset[i]) / 256)/2.1) + .05;
+    HSV hsv = {0, 255, 255};
+    hsv.h = scale16by8(g_rgb_timer + offset[i], rgb_matrix_config.speed / 4) + (offset[i]*2);
+    hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+}
+
+bool RANDOM_BREATH_RAINBOW(effect_params_t* params) {
+    
+    if (!params->init) {
+        // Change one LED every tick, make sure speed is not 0
+        doRandom_breath_rainbow(rand() % DRIVER_LED_TOTAL, params);
+        return false;
+    }
+	
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    for (uint8_t i = led_min; i < led_max; i++) {
+        doRandom_breath_rainbow(i, params);
+    }
+
+    return led_max < DRIVER_LED_TOTAL;
+}
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/oled/oled_stuff.h b/keyboards/handwired/horrortroll/k552/keymaps/via/oled/oled_stuff.h
new file mode 100644
index 0000000000..9d8d629179
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/via/oled/oled_stuff.h
@@ -0,0 +1,69 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+// OLED animation
+#include "lib/bongocat.c"
+#include "lib/galaxy.c"
+#include "lib/wave.c"
+
+#ifdef OLED_ENABLE
+    bool oled_task_user(void) {
+        led_t led_usb_state = host_keyboard_led_state();
+        static uint8_t old_layer;
+        uint8_t layer = get_highest_layer(layer_state | default_layer_state);
+
+        if (layer != old_layer) {
+            oled_clear();
+        }
+
+        old_layer = layer;
+
+        switch (layer) {
+            case 0:
+                render_bongocat();
+                oled_set_cursor(14, 0);                                // sets cursor to (column, row) using charactar spacing (4 rows on 128x32 screen, anything more will overflow back to the top)
+                oled_write_P(PSTR("WPM:"), false);
+                oled_write(get_u8_str(get_current_wpm(), '0'), false); // writes wpm on top right corner of string
+                oled_set_cursor(17, 2);
+                oled_write_P(led_usb_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
+                oled_set_cursor(17, 3);
+                oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRL") : PSTR("    "), false);
+                break;
+            case 1:
+                // sleep if it has been long enough since we last got a char
+                if (timer_elapsed32(wave_sleep) > OLED_TIMEOUT) {
+                    oled_off();
+                } else {
+                    oled_on();
+                }
+                // time for the next frame?
+                if (timer_elapsed(wave_timer) > FRAME_TIMEOUT) {
+                    wave_timer = timer_read();
+                    render_frame();
+                }
+
+                oled_set_cursor(0, 3);
+                oled_write_P(led_usb_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
+                oled_set_cursor(17, 3);
+                oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRL") : PSTR("    "), false);
+                break;
+            case 2:
+                render_galaxy();
+                break;
+		}
+        return false;
+    }
+#endif
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/readme.md b/keyboards/handwired/horrortroll/k552/keymaps/via/readme.md
new file mode 100644
index 0000000000..c8f9c1f8ec
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/via/readme.md
@@ -0,0 +1,16 @@
+# Default layout and custom LED / OLED
+
+Keymap is default 87 qwerty, TKL layout
+
+It have new LED effect:
+- Custom gradient (ported from SirTimmyTimbit code [https://github.com/SirTimmyTimbit/customizable-gradient-effect-for-drop-alt])
+- Diagonal (ported from pleasuretek code [https://github.com/pleasuretek/qmk_firmware])
+- Cool diagonal (ported from pleasuretek code [https://github.com/pleasuretek/qmk_firmware])
+- Knight Rider (ported from jumper149 code [https://github.com/jumper149/qmk_firmware/blob/jumper149/keyboards/dztech/dz65rgb/keymaps/jumper149/])
+- Random breath rainbow (based from daed code [https://github.com/daed/qmk_firmware/blob/master/keyboards/massdrop/alt/keymaps/daed] and modify by me)
+
+And OLED Animation:
+- Bongo Cat (ported from nwii code [https://github.com/nwii/oledbongocat] and modify image animation by me)
+- Waveform Typing (ported from drcforbin code [https://github.com/drcforbin/keyboards] and modify to correct my TKL layout)
+- Galaxy image when pressing FN key (original image [https://www.deviantart.com/rock-bomber/art/Gateway-668850827] and redraw then cut for 128x32 size by me)
+- Redragon Logo when booting up
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/rgb_matrix_user.inc b/keyboards/handwired/horrortroll/k552/keymaps/via/rgb_matrix_user.inc
new file mode 100644
index 0000000000..38edbae993
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/via/rgb_matrix_user.inc
@@ -0,0 +1,15 @@
+RGB_MATRIX_EFFECT(CUSTOM_GRADIENT)
+RGB_MATRIX_EFFECT(DIAGONAL)
+RGB_MATRIX_EFFECT(COOL_DIAGONAL)
+RGB_MATRIX_EFFECT(KITT)
+RGB_MATRIX_EFFECT(RANDOM_BREATH_RAINBOW)
+
+#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+#include "led/custom_gradient.c"
+#include "led/diagonal.c"
+#include "led/cool_diagonal.c"
+#include "led/kitt.c"
+#include "led/random_breath_rainbow.c"
+
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
\ No newline at end of file
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/rules.mk b/keyboards/handwired/horrortroll/k552/keymaps/via/rules.mk
new file mode 100644
index 0000000000..d475530c87
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+
+RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/handwired/horrortroll/k552/ld/k552_f103.ld b/keyboards/handwired/horrortroll/k552/ld/k552_f103.ld
new file mode 100644
index 0000000000..7b9e75b3c7
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/ld/k552_f103.ld
@@ -0,0 +1,85 @@
+/*
+    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * STM32F103xC memory setup for use with the K552 mass-storage device bootloader.
+ */
+MEMORY
+{
+    flash0  : org = 0x08002000, len = 256k - 0x2000
+    flash1  : org = 0x00000000, len = 0
+    flash2  : org = 0x00000000, len = 0
+    flash3  : org = 0x00000000, len = 0
+    flash4  : org = 0x00000000, len = 0
+    flash5  : org = 0x00000000, len = 0
+    flash6  : org = 0x00000000, len = 0
+    flash7  : org = 0x00000000, len = 0
+    ram0    : org = 0x20000000, len = 48k
+    ram1    : org = 0x00000000, len = 0
+    ram2    : org = 0x00000000, len = 0
+    ram3    : org = 0x00000000, len = 0
+    ram4    : org = 0x00000000, len = 0
+    ram5    : org = 0x00000000, len = 0
+    ram6    : org = 0x00000000, len = 0
+    ram7    : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
diff --git a/keyboards/handwired/horrortroll/k552/lib/bongocat.c b/keyboards/handwired/horrortroll/k552/lib/bongocat.c
new file mode 100644
index 0000000000..fbde9c911a
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/lib/bongocat.c
@@ -0,0 +1,376 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+// WPM-responsive animation stuff here
+# define IDLE_FRAMES 5
+# define IDLE_SPEED 10  // below this wpm value your animation will idle
+// #define PREP_FRAMES 1 // uncomment if >1
+# define TAP_FRAMES 2
+# define ANIM_WPM_LOWER 20  // above this wpm value typing animation to trigger
+# define ANIM_FRAME_DURATION_MAX 450 // longest animation duration in ms
+# define ANIM_FRAME_DURATION_MIN 100 // shortest animation duration in ms
+# define IDLE_FRAME_DURATION 300  // how long each frame lasts in ms
+# define ANIM_FRAME_RATIO 2.5 // how aggressively animation speeds up with wpm
+// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
+# define ANIM_SIZE 636  // number of bytes in array, minimize for adequate firmware size, max is 1024
+# define MAX(x, y) (((x) > (y)) ? (x) : (y)) // Math.max macro
+
+uint32_t curr_anim_duration = 0; // variable animation duration
+uint32_t bongo_timer = 0;
+uint32_t bongo_sleep = 0;
+uint8_t  current_idle_frame = 0;
+// uint8_t current_prep_frame = 0; // uncomment if PREP_FRAMES >1
+uint8_t current_tap_frame = 0;
+
+// Code containing pixel art, contains:
+// 5 idle frames, 1 prep frame, and 2 tap frames
+
+// To make your own pixel art:
+// save a png/jpeg of an 128x32 image (resource: https://www.pixilart.com/draw )
+// follow this guide up to and including "CONVERT YOUR IMAGE" https://docs.splitkb.com/hc/en-us/articles/360013811280-How-do-I-convert-an-image-for-use-on-an-OLED-display-
+// replace numbers in brackets with your own
+// if you start getting errors when compiling make sure you didn't accedentally delete a bracket
+static void render_bongocat(void) {
+    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
+        {
+        //Idle 1 - 128x32
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xce, 0x9c, 0xf8, 0xfc, 0xfe, 0x80, 0xe0, 0x20, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0,
+        0xf8, 0xfc, 0xfe, 0xff, 0xfe, 0xfc, 0xf8, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80,
+        0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x38, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0x31, 0x00, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xcf, 0xff,
+        0xff, 0xbf, 0x7f, 0x7f, 0xbf, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x30, 0x38, 0x2c, 0x04, 0x64, 0xf8, 0xfe, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x8f, 0x27, 0x27, 0x27, 0xc7, 0xc7, 0x4f, 0x4f, 0x8f, 0x8f,
+        0x9f, 0x9f, 0x1f, 0x1f, 0x3f, 0x3e, 0x3e, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0xfc, 0xfc, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xe0, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x10, 0x18, 0x08, 0x08, 0x08, 0x18, 0x10, 0x30,
+        0x60, 0x40, 0xc0, 0x86, 0x87, 0x85, 0xc4, 0x49, 0x69, 0x3e, 0x0e, 0x13, 0x11, 0x12, 0x12, 0x3d,
+        0x2d, 0x25, 0x26, 0x44, 0x68, 0x78, 0x58, 0x9d, 0x97, 0x93, 0xe3, 0x62, 0x34, 0x3c, 0x2c, 0x26,
+        0xc7, 0xc5, 0x69, 0x39, 0x19, 0x1d, 0x36, 0xa2, 0xe2, 0x62, 0x24, 0x18, 0x3c, 0x7e, 0x7f, 0x7f,
+        0x7f, 0xbf, 0x3f, 0x1f, 0x1f, 0x8f, 0xe7, 0x63, 0x27, 0x27, 0x47, 0x47, 0xcf, 0xcf, 0x0f, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        {
+        //Idle 2 - 128x32
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xce, 0x9c, 0xf8, 0xfc, 0xfe, 0x80, 0xe0, 0x20, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xf0,
+        0xf8, 0xfc, 0xfe, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x38, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0x31, 0x00, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0x9f, 0x9f, 0xff,
+        0xff, 0x7f, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x30, 0x38, 0x2c, 0x04, 0x64, 0xf8, 0xfe, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x8f, 0x27, 0x27, 0x27, 0xc7, 0xc7, 0x4f, 0x4f, 0x8f, 0x8f,
+        0x9f, 0x9f, 0x1e, 0x1e, 0x3f, 0x3d, 0x3d, 0x3e, 0x7f, 0x7f, 0x7f, 0x7f, 0xf9, 0xf9, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xc0, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x10, 0x18, 0x08, 0x08, 0x08, 0x18, 0x10, 0x30,
+        0x60, 0x40, 0xc0, 0x86, 0x87, 0x85, 0xc4, 0x49, 0x69, 0x3e, 0x0e, 0x13, 0x11, 0x12, 0x12, 0x3d,
+        0x2d, 0x25, 0x26, 0x44, 0x68, 0x78, 0x58, 0x9d, 0x97, 0x93, 0xe3, 0x62, 0x34, 0x3c, 0x2c, 0x26,
+        0xc7, 0xc5, 0x69, 0x39, 0x19, 0x1d, 0x36, 0xa2, 0xe2, 0x62, 0x24, 0x18, 0x3c, 0x7e, 0x7f, 0x7f,
+        0x7f, 0xbf, 0x3f, 0x1f, 0x1f, 0x8f, 0xe7, 0x63, 0x27, 0x27, 0x47, 0x47, 0xcf, 0xcf, 0x0f, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        {
+        //Idle 3 - 128x32
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xce, 0x9c, 0xf8, 0xfc, 0xfe, 0x80, 0xe0, 0x20, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0,
+        0xf0, 0xf8, 0xfc, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x38, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0x31, 0x00, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0x9f, 0x9f, 0xff,
+        0xff, 0x7f, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0x7e, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x30, 0x38, 0x2c, 0x04, 0x64, 0xf8, 0xfe, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x8f, 0x27, 0x27, 0x27, 0xc7, 0xc7, 0x4f, 0x4f, 0x8f, 0x8f,
+        0x9f, 0x9f, 0x1e, 0x1e, 0x3f, 0x3d, 0x3d, 0x3e, 0x7f, 0x7f, 0x7f, 0x7f, 0xf9, 0xf9, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xc0, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x10, 0x18, 0x08, 0x08, 0x08, 0x18, 0x10, 0x30,
+        0x60, 0x40, 0xc0, 0x86, 0x87, 0x85, 0xc4, 0x49, 0x69, 0x3e, 0x0e, 0x13, 0x11, 0x12, 0x12, 0x3d,
+        0x2d, 0x25, 0x26, 0x44, 0x68, 0x78, 0x58, 0x9d, 0x97, 0x93, 0xe3, 0x62, 0x34, 0x3c, 0x2c, 0x26,
+        0xc7, 0xc5, 0x69, 0x39, 0x19, 0x1d, 0x36, 0xa2, 0xe2, 0x62, 0x24, 0x18, 0x3c, 0x7e, 0x7f, 0x7f,
+        0x7f, 0xbf, 0x3f, 0x1f, 0x1f, 0x8f, 0xe7, 0x63, 0x27, 0x27, 0x47, 0x47, 0xcf, 0xcf, 0x0f, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        {
+        //Idle 4 - 128x32
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xce, 0x9c, 0xf8, 0xfc, 0xfe, 0x80, 0xe0, 0x20, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0,
+        0xf0, 0xf8, 0xfc, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x38, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0x31, 0x00, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xcf, 0xcf, 0xff,
+        0xff, 0xbf, 0x7f, 0x7f, 0xbf, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0x3c, 0x1c, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x30, 0x38, 0x2c, 0x04, 0x64, 0xf8, 0xfe, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x8f, 0x27, 0x27, 0x27, 0xc7, 0xc7, 0x4f, 0x4f, 0x8f, 0x8f,
+        0x9f, 0x9f, 0x1f, 0x1f, 0x3f, 0x3e, 0x3e, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0xfc, 0xfc, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xe0, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x10, 0x18, 0x08, 0x08, 0x08, 0x18, 0x10, 0x30,
+        0x60, 0x40, 0xc0, 0x86, 0x87, 0x85, 0xc4, 0x49, 0x69, 0x3e, 0x0e, 0x13, 0x11, 0x12, 0x12, 0x3d,
+        0x2d, 0x25, 0x26, 0x44, 0x68, 0x78, 0x58, 0x9d, 0x97, 0x93, 0xe3, 0x62, 0x34, 0x3c, 0x2c, 0x26,
+        0xc7, 0xc5, 0x69, 0x39, 0x19, 0x1d, 0x36, 0xa2, 0xe2, 0x62, 0x24, 0x18, 0x3c, 0x7e, 0x7f, 0x7f,
+        0x7f, 0xbf, 0x3f, 0x1f, 0x1f, 0x8f, 0xe7, 0x63, 0x27, 0x27, 0x47, 0x47, 0xcf, 0xcf, 0x0f, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        {
+        //Idle 5 - 128x32
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xce, 0x9c, 0xf8, 0xfc, 0xfe, 0x80, 0xe0, 0x20, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0,
+        0xf8, 0xfc, 0xfe, 0xff, 0xfe, 0xfc, 0xf8, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80,
+        0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x38, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0x31, 0x00, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xcf, 0xff,
+        0xff, 0xbf, 0x7f, 0x7f, 0xbf, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x06, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x30, 0x38, 0x2c, 0x04, 0x64, 0xf8, 0xfe, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x8f, 0x27, 0x27, 0x27, 0xc7, 0xc7, 0x4f, 0x4f, 0x8f, 0x8f,
+        0x9f, 0x9f, 0x1f, 0x1f, 0x3f, 0x3e, 0x3e, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0xfc, 0xfc, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xe0, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x10, 0x18, 0x08, 0x08, 0x08, 0x18, 0x10, 0x30,
+        0x60, 0x40, 0xc0, 0x86, 0x87, 0x85, 0xc4, 0x49, 0x69, 0x3e, 0x0e, 0x13, 0x11, 0x12, 0x12, 0x3d,
+        0x2d, 0x25, 0x26, 0x44, 0x68, 0x78, 0x58, 0x9d, 0x97, 0x93, 0xe3, 0x62, 0x34, 0x3c, 0x2c, 0x26,
+        0xc7, 0xc5, 0x69, 0x39, 0x19, 0x1d, 0x36, 0xa2, 0xe2, 0x62, 0x24, 0x18, 0x3c, 0x7e, 0x7f, 0x7f,
+        0x7f, 0xbf, 0x3f, 0x1f, 0x1f, 0x8f, 0xe7, 0x63, 0x27, 0x27, 0x47, 0x47, 0xcf, 0xcf, 0x0f, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        }
+    };
+
+    static const char PROGMEM prep[][ANIM_SIZE] = {
+        {
+        //Prepare - 128x32
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xce, 0x9c, 0xf8, 0xfc, 0xfe, 0x80, 0xe0, 0x20, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0,
+        0xf0, 0xf8, 0xfc, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x38, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0x31, 0x00, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0xf0, 0xf8,
+        0xdc, 0x36, 0x3e, 0xee, 0xfc, 0xe0, 0x9c, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xcf, 0xff,
+        0xff, 0xbf, 0x7f, 0x7f, 0xbf, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0x7e, 0xbe, 0xbc, 0xbc, 0x7c, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x30, 0x38, 0x2c, 0x44, 0xc4, 0xc4, 0x68, 0x78,
+        0x59, 0x89, 0x91, 0x91, 0xd3, 0xf3, 0xa3, 0x23, 0x27, 0x27, 0xc7, 0xc7, 0x4f, 0x4f, 0x8f, 0x8f,
+        0x9f, 0x9f, 0x1f, 0x1f, 0x3f, 0x3e, 0x3e, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0xfc, 0xfc, 0xff, 0x81,
+        0xfa, 0xff, 0xe6, 0xe7, 0xfd, 0xff, 0xfc, 0xf3, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xe0, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x10, 0x18, 0x08, 0x08, 0x08, 0x18, 0x10, 0x30,
+        0x60, 0x40, 0xc0, 0x86, 0x87, 0x85, 0xc4, 0x49, 0x69, 0x3e, 0x0e, 0x13, 0x11, 0x13, 0x12, 0x3c,
+        0x2c, 0x26, 0x27, 0x45, 0x68, 0x78, 0x58, 0x9d, 0x97, 0x93, 0xe3, 0x62, 0x34, 0x3c, 0x2c, 0x26,
+        0xc7, 0xc5, 0x69, 0x39, 0x19, 0x1d, 0x36, 0xa2, 0xe2, 0x62, 0x34, 0x3c, 0x2c, 0x44, 0xc8, 0xc8,
+        0xe9, 0xb9, 0x11, 0x11, 0x13, 0x93, 0xe3, 0x63, 0x27, 0x27, 0x47, 0x47, 0xcf, 0xcf, 0x0f, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        }
+    };
+
+    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
+        {
+        //Tap left - 128x32
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xce, 0x9c, 0xf8, 0xfc, 0xfe, 0x80, 0xe0, 0x20, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0,
+        0xf0, 0xf8, 0xfc, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x38, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0x31, 0x00, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0xf0, 0xf8,
+        0xdc, 0x36, 0x3e, 0xee, 0xfc, 0xe0, 0x9c, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xcf, 0xff,
+        0xff, 0xbf, 0x7f, 0x7f, 0xbf, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00,
+        0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x30, 0x38, 0x2c, 0x44, 0xc4, 0xc4, 0x68, 0x78,
+        0x59, 0x89, 0x91, 0x91, 0xd3, 0xf3, 0xa3, 0x23, 0x27, 0x27, 0xc7, 0xc7, 0x4f, 0x4f, 0x8f, 0x8f,
+        0x9f, 0x9f, 0x1f, 0x1f, 0x3f, 0x3e, 0x3e, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0xfc, 0xfc, 0xff, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xe0, 0x00, 0x00,
+        0x3f, 0x1f, 0x07, 0x83, 0xc0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x10, 0x18, 0x08, 0x08, 0x08, 0x18, 0x10, 0x30,
+        0x60, 0x40, 0xc0, 0x86, 0x87, 0x85, 0xc4, 0x49, 0x69, 0x3e, 0x0e, 0x13, 0x11, 0x13, 0x12, 0x3c,
+        0x2c, 0x26, 0x27, 0x45, 0x68, 0x78, 0x58, 0x9d, 0x97, 0x93, 0xe3, 0x62, 0x34, 0x3c, 0x2c, 0x26,
+        0xc7, 0xc5, 0x69, 0x39, 0x19, 0x1d, 0x36, 0xa2, 0xe2, 0x62, 0x24, 0x18, 0x3c, 0x7e, 0x7f, 0x7f,
+        0x7f, 0xbf, 0x3f, 0x1f, 0x1f, 0x8f, 0xe7, 0x63, 0x27, 0x27, 0x47, 0x47, 0xcf, 0xcf, 0x0f, 0x08,
+        0x10, 0x10, 0x11, 0x11, 0x21, 0x23, 0x23, 0x21, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+        {
+        //Tap right - 128x32
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xce, 0x9c, 0xf8, 0xfc, 0xfe, 0x80, 0xe0, 0x20, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0,
+        0xf0, 0xf8, 0xfc, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x38, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0xf7, 0x31, 0x00, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0xa0, 0xa0, 0x20, 0x20, 0x40, 0x46, 0x4f, 0x5f, 0x9f, 0x9c, 0x90, 0x80,
+        0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xcf, 0xff,
+        0xff, 0xbf, 0x7f, 0x7f, 0xbf, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+        0xff, 0x7e, 0xbe, 0xbc, 0xbc, 0x7c, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x07, 0x0f, 0x8f, 0xc7, 0xe3, 0x31, 0x38, 0x2c, 0x04, 0x64, 0xf8, 0xfe, 0xff,
+        0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x8f, 0x27, 0x27, 0x27, 0xc7, 0xc7, 0x4f, 0x4f, 0x8f, 0x8f,
+        0x9f, 0x9f, 0x1f, 0x1f, 0x3f, 0x3e, 0x3e, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0xfc, 0xfc, 0xff, 0x81,
+        0xfa, 0xff, 0xe6, 0xe7, 0xfd, 0xff, 0xfc, 0xf3, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xe0, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x30, 0x10, 0x18, 0x08, 0x08, 0x08, 0x18, 0x10, 0x30,
+        0x60, 0x40, 0xc0, 0x86, 0x87, 0x85, 0xc4, 0x49, 0x69, 0x3e, 0x0e, 0x13, 0x11, 0x12, 0x12, 0x3d,
+        0x2d, 0x25, 0x26, 0x44, 0x68, 0x78, 0x58, 0x9d, 0x97, 0x93, 0xe3, 0x62, 0x34, 0x3c, 0x2c, 0x26,
+        0xc7, 0xc5, 0x69, 0x39, 0x19, 0x1d, 0x36, 0xa2, 0xe2, 0x62, 0x34, 0x3c, 0x2c, 0x44, 0xc8, 0xc8,
+        0xe9, 0xb9, 0x11, 0x11, 0x13, 0x93, 0xe3, 0x63, 0x27, 0x27, 0x47, 0x47, 0xcf, 0xcf, 0x0f, 0x08,
+        0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        },
+    };
+
+    // assumes 1 frame prep stage
+    void animation_phase(void) {
+        if (get_current_wpm() <= IDLE_SPEED) {
+            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+            oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
+        }
+
+        if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < ANIM_WPM_LOWER) {
+            // oled_write_raw_P(prep[abs((PREP_FRAMES-1)-current_prep_frame)], ANIM_SIZE); // uncomment if IDLE_FRAMES >1
+            oled_write_raw_P(prep[0], ANIM_SIZE);  // remove if IDLE_FRAMES >1
+        }
+
+        if (get_current_wpm() >= ANIM_WPM_LOWER) {
+            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+            oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
+        }
+    }
+
+    // variable animation duration. Don't want this value to get near zero as it'll bug out.
+    curr_anim_duration = MAX(ANIM_FRAME_DURATION_MIN, ANIM_FRAME_DURATION_MAX - ANIM_FRAME_RATIO * get_current_wpm());
+
+    if (get_current_wpm() > ANIM_WPM_LOWER) {
+        oled_on();  // not essential but turns on animation OLED with any alpha keypress
+
+        if (timer_elapsed32(bongo_timer) > curr_anim_duration) {
+            bongo_timer = timer_read32();
+            animation_phase();
+        }
+
+        bongo_sleep = timer_read32();
+    } else {
+        if (timer_elapsed32(bongo_sleep) > OLED_TIMEOUT) {
+            oled_off();
+        } else {
+            if (timer_elapsed32(bongo_timer) > IDLE_FRAME_DURATION) {
+                bongo_timer = timer_read32();
+                animation_phase();
+            }
+        }
+    }
+}
diff --git a/keyboards/handwired/horrortroll/k552/lib/galaxy.c b/keyboards/handwired/horrortroll/k552/lib/galaxy.c
new file mode 100644
index 0000000000..5cc340dded
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/lib/galaxy.c
@@ -0,0 +1,58 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+# define ANIM_SIZE 636  // number of bytes in array, minimize for adequate firmware size, max is 1024
+
+static void render_galaxy(void) {
+    static const char PROGMEM galaxy[][ANIM_SIZE] = {
+        {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x80, 0xc8, 0xe8, 0x49, 0x72,
+        0x7e, 0x4b, 0x82, 0x05, 0xa2, 0x55, 0x0a, 0x11, 0x2a, 0x44, 0xaa, 0x11, 0xaa, 0x44, 0x2a, 0x10,
+        0x20, 0x42, 0x02, 0x80, 0xc4, 0x92, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x02, 0x05, 0x02, 0x05, 0x03, 0x06, 0x81, 0xfe, 0x81, 0x1c, 0x1e, 0x08, 0x00, 0x00, 0x00, 0x80,
+        0x00, 0x10, 0x65, 0xcd, 0x63, 0xce, 0x2b, 0x2b, 0x8e, 0x9c, 0x2c, 0x78, 0xf3, 0x58, 0xc0, 0xe8,
+        0xe0, 0xf9, 0x88, 0x68, 0xa1, 0x00, 0x01, 0x03, 0x8f, 0x0f, 0x1f, 0x2f, 0xdf, 0x7f, 0x7e, 0xff,
+        0x79, 0x2f, 0xff, 0xdf, 0x5f, 0xbf, 0xff, 0x7f, 0xff, 0x9e, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xf7,
+        0xde, 0xfd, 0xfe, 0x50, 0xa8, 0x50, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x42, 0xe4, 0xf0, 0xfe, 0xf0, 0xe1, 0x41, 0x47, 0x49, 0xab,
+        0x14, 0x48, 0x22, 0x55, 0x0a, 0x05, 0x20, 0x55, 0x88, 0x54, 0xa2, 0x14, 0x08, 0x00, 0x48, 0x22,
+        0x90, 0x20, 0x00, 0x40, 0xa8, 0x70, 0x86, 0x5d, 0x60, 0x04, 0x08, 0x00, 0x04, 0x00, 0x04, 0x04,
+        0x04, 0x04, 0x84, 0x84, 0x0e, 0x1f, 0x3f, 0xff, 0x3f, 0x1f, 0x6e, 0xe4, 0xe4, 0xd4, 0xa4, 0xd4,
+        0xa5, 0xd9, 0xad, 0xde, 0xfd, 0xf9, 0xfd, 0xf4, 0x08, 0xf0, 0x40, 0x40, 0x00, 0xc1, 0x01, 0x0b,
+        0x9f, 0x4f, 0xbf, 0x7f, 0xff, 0xff, 0xfa, 0xc0, 0xea, 0x84, 0xaa, 0x84, 0x00, 0x05, 0x00, 0x01,
+        0xc5, 0x7c, 0x2d, 0x57, 0x28, 0x53, 0x20, 0x11, 0x2b, 0x9d, 0x1e, 0x2f, 0x57, 0x2f, 0xdf, 0x3f,
+        0xff, 0x7f, 0xff, 0x7f, 0xbf, 0x3f, 0x52, 0x04, 0x0a, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x31, 0x60, 0x00, 0x00, 0x00, 0x00,
+        0x01, 0x0a, 0x11, 0x2a, 0x44, 0xa8, 0x00, 0x80, 0x00, 0x01, 0x00, 0x04, 0x19, 0x58, 0xf6, 0xf5,
+        0xf8, 0xd5, 0x58, 0xe1, 0x6e, 0xb4, 0x02, 0x80, 0x04, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x03, 0x07, 0xa7, 0xa3, 0x00, 0x00, 0xaf, 0x80, 0x00, 0x04, 0x01, 0x03, 0x83, 0x73, 0x05,
+        0xd3, 0xff, 0x7f, 0xbf, 0x7f, 0xbf, 0xdf, 0xff, 0xfb, 0xf5, 0xe9, 0xac, 0x97, 0x1e, 0xae, 0xf0,
+        0x82, 0xc1, 0x42, 0xc5, 0x50, 0xef, 0x9b, 0x1f, 0x9f, 0x6f, 0x59, 0x80, 0x18, 0xe0, 0x60, 0xf1,
+        0x56, 0x23, 0x61, 0x22, 0x11, 0x02, 0x01, 0x00, 0x00, 0x80, 0x80, 0x10, 0x08, 0x1a, 0xfd, 0x02,
+        0xa9, 0x71, 0x3f, 0x16, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x05, 0x0a, 0x11, 0x0a, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff,
+        0xff, 0xff, 0xbf, 0xea, 0xed, 0x7a, 0x05, 0x02, 0x06, 0x00, 0x0c, 0x00, 0x09, 0x2e, 0x80, 0x30,
+        0x02, 0x04, 0x82, 0x8a, 0x0d, 0xb8, 0x10, 0xf1, 0xe0, 0xe0, 0x80, 0xe0, 0x40, 0x00, 0x54, 0xa8,
+        0x41, 0x82, 0x01, 0x00, 0x01, 0x00, 0x41, 0x88, 0x55, 0x23, 0x55, 0x8b, 0x57, 0xaf, 0xdf, 0xff,
+        0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xfc, 0xbf, 0x4b, 0x8c, 0x07, 0x0f, 0x1f, 0x0c, 0xaa, 0x10, 0x00,
+        0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x04, 0x04, 0x01, 0x80,
+        0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x04, 0x0e, 0x04, 0x00
+        }
+    };
+
+    oled_write_raw_P(galaxy[0], ANIM_SIZE);
+}
\ No newline at end of file
diff --git a/keyboards/handwired/horrortroll/k552/lib/glcdfont.c b/keyboards/handwired/horrortroll/k552/lib/glcdfont.c
new file mode 100644
index 0000000000..23bfd92d72
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/lib/glcdfont.c
@@ -0,0 +1,248 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
+// See gfxfont.h for newer custom bitmap font info.
+
+#include "progmem.h"
+
+// Standard ASCII 5x7 font
+const unsigned char font[] PROGMEM = {
+    0x07, 0x08, 0x7F, 0x08, 0x07, 0x00,
+    0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
+    0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
+    0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
+    0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
+    0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
+    0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
+    0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
+    0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
+    0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
+    0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
+    0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
+    0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
+    0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
+    0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
+    0x2A, 0x1C, 0x77, 0x1C, 0x2A, 0x00,
+    0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
+    0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
+    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+    0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
+    0x08, 0x04, 0x3E, 0x04, 0x08, 0x00,
+    0x08, 0x10, 0x3E, 0x10, 0x08, 0x00,
+    0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
+    0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
+    0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
+    0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
+    0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
+    0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
+    0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
+    0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
+    0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
+    0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
+    0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
+    0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
+    0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
+    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+    0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+    0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
+    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+    0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
+    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+    0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
+    0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
+    0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
+    0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
+    0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
+    0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
+    0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
+    0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
+    0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
+    0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
+    0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+    0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
+    0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
+    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+    0x41, 0x22, 0x14, 0x08, 0x00, 0x00,
+    0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
+    0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
+    0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
+    0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
+    0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
+    0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
+    0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
+    0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
+    0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
+    0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
+    0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
+    0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
+    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
+    0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
+    0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
+    0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
+    0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
+    0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
+    0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
+    0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
+    0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
+    0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
+    0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
+    0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
+    0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
+    0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
+    0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
+    0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
+    0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
+    0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+    0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
+    0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
+    0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
+    0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
+    0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
+    0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
+    0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
+    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
+    0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
+    0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
+    0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x00,
+    0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
+    0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
+    0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
+    0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
+    0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
+    0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
+    0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
+    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+    0xFC, 0x18, 0x24, 0x24, 0x18, 0x00,
+    0x18, 0x24, 0x24, 0x18, 0xFC, 0x00,
+    0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
+    0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
+    0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
+    0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
+    0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
+    0x3C, 0x40, 0x38, 0x40, 0x3C, 0x00,
+    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+    0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
+    0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
+    0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
+    0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+    0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
+    0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
+    0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
+    0x10, 0x38, 0x10, 0x10, 0x1C, 0x00,
+    0x0C, 0x7A, 0x41, 0x7A, 0x0C, 0x00,
+    0x18, 0x2F, 0x41, 0x2F, 0x18, 0x00,
+    0x22, 0x72, 0x22, 0x27, 0x22, 0x00,
+    0x08, 0x1C, 0x08, 0x08, 0x08, 0x00,
+    0x08, 0x08, 0x38, 0x20, 0x28, 0x28,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x2A, 0x2A, 0x2A, 0x00, 0x00,
+    0x4E, 0x46, 0x4A, 0x50, 0x2F, 0x00,
+    0x3E, 0x45, 0x55, 0x51, 0x3E, 0x00,
+    0x48, 0x50, 0x7E, 0x50, 0x48, 0x00,
+    0x3E, 0x49, 0x71, 0x49, 0x3E, 0x00,
+    0x10, 0x22, 0x4F, 0x20, 0x10, 0x00,
+    0x0E, 0x06, 0x0A, 0x10, 0x20, 0x00,
+    0x20, 0x10, 0x0A, 0x06, 0x0E, 0x00,
+    0x08, 0x08, 0x08, 0x1C, 0x08, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xE0, 0xF0, 0xF0, 0xF0, 0xE0, 0xEC,
+    0xEE, 0xF7, 0xF3, 0x70, 0x20, 0x00,
+    0x7C, 0x7C, 0x7C, 0x7E, 0x00, 0x7E,
+    0x7E, 0x7E, 0x7F, 0x7F, 0x7F, 0x00,
+    0x00, 0x80, 0xC0, 0xE0, 0x7E, 0x5B,
+    0x4F, 0x5B, 0xFE, 0xC0, 0x00, 0x00,
+    0xC0, 0x00, 0xDC, 0xD7, 0xDE, 0xDE,
+    0xDE, 0xD7, 0xDC, 0x00, 0xC0, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x0F, 0x1F, 0x3F, 0x7F, 0x7F, 0x7F,
+    0x7F, 0x7F, 0x3F, 0x1E, 0x0C, 0x00,
+    0x1F, 0x1F, 0x1F, 0x3F, 0x00, 0x3F,
+    0x3F, 0x3F, 0x7F, 0x7F, 0x7F, 0x00,
+    0x30, 0x7B, 0x7F, 0x78, 0x30, 0x20,
+    0x20, 0x30, 0x78, 0x7F, 0x3B, 0x00,
+    0x03, 0x00, 0x0F, 0x7F, 0x0F, 0x0F,
+    0x0F, 0x7F, 0x0F, 0x00, 0x03, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
diff --git a/keyboards/handwired/horrortroll/k552/lib/logo.c b/keyboards/handwired/horrortroll/k552/lib/logo.c
new file mode 100644
index 0000000000..2e05555af2
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/lib/logo.c
@@ -0,0 +1,58 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+# define ANIM_SIZE 636  // number of bytes in array, minimize for adequate firmware size, max is 1024
+
+static void render_logo(void) {
+    static const char PROGMEM redragon[][ANIM_SIZE] = {
+        {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0x80,
+        0x80, 0xc0, 0xe0, 0x80, 0xc0, 0xe0, 0x30, 0x8c, 0x83, 0xc0, 0x60, 0x18, 0x04, 0x00, 0x01, 0x03,
+        0x0e, 0x3e, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x10, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xf6, 0xf3, 0x31, 0xfc, 0xff, 0xff, 0x3f,
+        0x9f, 0x5f, 0x5f, 0x5f, 0xcf, 0xcf, 0xcf, 0xcb, 0xc9, 0x8c, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x01, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xe0, 0x80,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0xf0, 0xe0, 0x60, 0x60, 0xc0, 0x80, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x40, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x10, 0xf0, 0xf0, 0xf0, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x00, 0x01, 0x00, 0x00, 0x80, 0x00, 0x03, 0xcf, 0xff, 0x0c,
+        0x02, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xf9, 0xff, 0xff, 0xff, 0xff, 0x1c, 0x00, 0x00, 0x00, 0x00,
+        0x03, 0xfe, 0xf8, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x3f, 0x7f, 0xff, 0xff,
+        0xfc, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0xff, 0xff, 0x20, 0x60, 0xd9, 0x9f, 0x0f, 0x00,
+        0x01, 0xff, 0xff, 0x23, 0x21, 0x21, 0x73, 0x00, 0xff, 0xff, 0x03, 0x22, 0x1e, 0xfc, 0xf8, 0x41,
+        0xff, 0xff, 0xe3, 0xb2, 0x3e, 0x1c, 0x00, 0xe0, 0xfe, 0x7f, 0x43, 0x4f, 0x7d, 0xf0, 0x80, 0x70,
+        0xfc, 0x9e, 0x22, 0x03, 0x43, 0x43, 0xc6, 0xcc, 0x80, 0x78, 0xfc, 0x06, 0x23, 0x22, 0x06, 0x9c,
+        0xf8, 0x40, 0x20, 0xff, 0xff, 0xff, 0x07, 0x1f, 0x7c, 0xf8, 0xe0, 0xff, 0xff, 0xff, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf1, 0xf9, 0xfd, 0xff, 0xfe,
+        0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x97, 0x87, 0xc1, 0xe3, 0xf0, 0x78, 0x7e, 0x7f, 0x38,
+        0x3e, 0x3f, 0x9f, 0x6f, 0x3f, 0x1f, 0x07, 0x00, 0x03, 0x7f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x03,
+        0x0f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0e, 0x0f, 0x0f, 0x08, 0x00, 0x01, 0x03, 0x0f, 0x1e,
+        0x3c, 0x77, 0x67, 0x44, 0x04, 0x04, 0x04, 0x02, 0x07, 0x07, 0x06, 0x06, 0x03, 0x03, 0x01, 0x04,
+        0x07, 0x07, 0x00, 0x03, 0x07, 0x04, 0x06, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x06,
+        0x05, 0x03, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x00, 0x00, 0x03, 0x07, 0x06, 0x06, 0x06, 0x07,
+        0x01, 0x00, 0x04, 0x07, 0x07, 0x07, 0x04, 0x00, 0x00, 0x01, 0x03, 0x0f, 0x3f, 0xff, 0x00, 0x00
+        }
+    };
+
+    oled_write_raw_P(redragon[0], ANIM_SIZE);
+}
diff --git a/keyboards/handwired/horrortroll/k552/lib/wave.c b/keyboards/handwired/horrortroll/k552/lib/wave.c
new file mode 100644
index 0000000000..79b4e0ced7
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/lib/wave.c
@@ -0,0 +1,133 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+extern const unsigned char font[] PROGMEM;
+
+#define ROW_1 OLED_DISPLAY_WIDTH
+#define ROW_2 (OLED_DISPLAY_WIDTH * 2)
+
+static uint32_t wave_sleep = 0;
+
+#define FRAME_TIMEOUT (1000/24)
+
+static uint16_t wave_timer = 0;
+
+static uint8_t next_bar_val = 0;
+static uint8_t next_log_byte[OLED_FONT_WIDTH] = {0};
+static uint8_t line1[OLED_DISPLAY_WIDTH] = {0};
+static uint8_t line2[OLED_DISPLAY_WIDTH] = {0};
+
+static const uint8_t PROGMEM bar_lut[8] = {0, 16, 24, 56, 60, 124, 126, 255};
+
+#define BAR_KEY_WEIGHT 128
+#define BAR_KEY_DECAY_MAX 18
+
+static uint8_t bar_key_decay = BAR_KEY_DECAY_MAX;
+
+// clang-format off
+static const char PROGMEM code_to_name[0xFF] = {
+//   0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+    ' ', ' ', ' ', ' ', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',  // 0x
+    'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '1', '2',  // 1x
+    '3', '4', '5', '6', '7', '8', '9', '0', 128, 136, 132, 131,  22, '-', '=', '[',  // 2x
+    ']','\\', '#', ';','\'', '`', ',', '.', '/', 130,   7,   7,   7,   7,   7,   7,  // 3x
+      7,   7,   7,   7,   7,   7, 137, 138, 139, 140, 141,  30, 143, 142,  31,  26,  // 4x
+     27,  25,  24, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 5x
+    ' ', ' ', ' ', ' ', ' ', 135, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 6x
+    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 7x
+    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 8x
+    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 9x
+    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Ax
+    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Bx
+    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Cx
+    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Dx
+     15, 129, 133,   4,  15, 129, 133, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Ex
+    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '        // Fx
+};
+// clang-format on
+
+void add_keylog(uint16_t keycode) {
+    if ((keycode >= QK_MOD_TAP   && keycode <= QK_MOD_TAP_MAX)   ||
+        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) ||
+        (keycode >= QK_MODS      && keycode <= QK_MODS_MAX)) {
+        keycode = keycode & 0xFF;
+    } else if (keycode > 0xFF) {
+        keycode = 0;
+    }
+
+    if (keycode < (sizeof(code_to_name) / sizeof(char))) {
+        char log_char = pgm_read_byte(&code_to_name[keycode]);
+
+        for (uint8_t j = 0; j < OLED_FONT_WIDTH; j++) {
+            const uint8_t glyph_line = pgm_read_byte(&font[log_char * OLED_FONT_WIDTH + j]);
+            next_log_byte[j] = glyph_line;
+        }
+    }
+}
+
+bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        wave_sleep = timer_read32();
+        add_keylog(keycode);
+
+        uint8_t t = next_bar_val + BAR_KEY_WEIGHT;
+
+        if (t < next_bar_val) {
+            next_bar_val = 255;
+        } else {
+            next_bar_val = t;
+        }
+
+        bar_key_decay = BAR_KEY_DECAY_MAX;
+    }
+
+    return true;
+}
+
+void render_layer_name(void) {
+    oled_write_P(PSTR("LAYER: WAVE"), false);
+}
+
+void render_frame(void) {
+    // rotate line 1, and stick in the next byte of the next char,
+    // then rotate the next char buffer
+    memmove(line1+1, line1, OLED_DISPLAY_WIDTH - 1);
+    line1[0] = next_log_byte[OLED_FONT_WIDTH - 1];
+    memmove(next_log_byte+1, next_log_byte, OLED_FONT_WIDTH - 1);
+    next_log_byte[0] = 0;
+
+    // rotate line 2, sticking in the next display value
+    uint8_t disp_val = pgm_read_byte(&bar_lut[next_bar_val / 32]);
+    memmove(line2+1, line2, OLED_DISPLAY_WIDTH - 1);
+    line2[0] = disp_val;
+
+    // draw both bars
+    for (uint8_t i = 0; i < OLED_DISPLAY_WIDTH; i++) {
+        oled_write_raw_byte(line1[i], ROW_1 + i);
+        oled_write_raw_byte(line2[i], ROW_2 + i);
+    }
+
+    // decay the next bar value
+    if (next_bar_val > bar_key_decay) {
+        next_bar_val -= bar_key_decay;
+    } else {
+        next_bar_val = 0;
+    }
+
+    if (bar_key_decay > 1) {
+        bar_key_decay -= 1;
+    }
+}
diff --git a/keyboards/handwired/horrortroll/k552/mcuconf.h b/keyboards/handwired/horrortroll/k552/mcuconf.h
new file mode 100644
index 0000000000..c2c0e9a2f6
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/wolfmarkclub/wm1/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C2
+#define STM32_I2C_USE_I2C2 TRUE
diff --git a/keyboards/handwired/horrortroll/k552/readme.md b/keyboards/handwired/horrortroll/k552/readme.md
new file mode 100644
index 0000000000..f1b30afae5
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/readme.md
@@ -0,0 +1,22 @@
+# Redragon K552 Kumara
+
+![K552](https://i.imgur.com/XpNmJpBh.png)
+
+A handwired K552 Kumara. Built using STM32F103RCT6 Mini
+
+* Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
+* Hardware Supported: Redragon K552 Kumara and STM32F103RCT6 Mini
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/horrortroll/k552: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (4,6) in the matrix (B key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/horrortroll/k552/rules.mk b/keyboards/handwired/horrortroll/k552/rules.mk
new file mode 100644
index 0000000000..5df510cd44
--- /dev/null
+++ b/keyboards/handwired/horrortroll/k552/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = STM32F103
+
+MCU_LDSCRIPT = k552_f103
+BOARD = k552
+
+# Bootloader selection
+BOOTLOADER = stm32duino
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+NO_USB_STARTUP_CHECK = yes
+
+# RGB Matrix enabled
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+# OLED enabled
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+WPM_ENABLE = yes
+
+LAYOUTS = tkl_ansi

From d7eb09949d426af891dd9cf85ad789285422490e Mon Sep 17 00:00:00 2001
From: Bartosz Nowak <bartosz.nowak@vimn.com>
Date: Mon, 10 Jan 2022 11:31:51 +0100
Subject: [PATCH 188/867] [Keyboard] Add keymap and settings for
 dactyl_manuform 6x6_5 thumb (#15526)

* Add dactyl manu 6x6 with stm32 support and 5thumb cluster

* Add review changes

* Add license to new files

* Fix enums for custom keymap

* Readme update

* Fix readme to follow one from template

* Add missing licence to files

* Update keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk

* Update keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk

* Remove readme from onekey keyboard

* Make separate macro for 5thumb
---
 keyboards/handwired/dactyl_manuform/6x6/6x6.h | 23 +++++++
 .../6x6/blackpill_f411/chconf.h               | 22 +++++++
 .../6x6/blackpill_f411/config.h               | 54 ++++++++++++++++
 .../6x6/blackpill_f411/halconf.h              | 24 +++++++
 .../6x6/blackpill_f411/mcuconf.h              | 22 +++++++
 .../6x6/blackpill_f411/rules.mk               | 30 +++++++++
 .../handwired/dactyl_manuform/6x6/config.h    | 18 ++----
 .../6x6/keymaps/default/keymap.c              | 13 ++--
 .../6x6/keymaps/default_5_thumb/keymap.c      | 51 +++++++++++++++
 .../6x6/keymaps/dumam/keymap.c                | 59 +++++++++++++++++
 .../dactyl_manuform/6x6/promicro/config.h     | 29 +++++++++
 .../dactyl_manuform/6x6/promicro/rules.mk     |  8 +++
 .../handwired/dactyl_manuform/6x6/readme.md   | 63 +++++++++++++++++++
 .../handwired/dactyl_manuform/6x6/rules.mk    |  8 +--
 14 files changed, 401 insertions(+), 23 deletions(-)
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/chconf.h
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/halconf.h
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6/keymaps/default_5_thumb/keymap.c
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6/readme.md

diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.h b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
index 821abe0308..097d1095e8 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/6x6.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
@@ -31,3 +31,26 @@
     { R50, R51, R52, R53, XXX, XXX }, \
     { R60, R61, R62, R63, XXX, XXX } \
 }
+
+
+#define LAYOUT_6x6_5_thumb( \
+    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+    L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+    L40, L41, L42, L43, L44, L45,                          R40, R41, R42, R43, R44, R45, \
+              L52, L53,                                              R52, R53, \
+                        L54,                                    R51, \
+                                  L64, L65,      R60, R61, \
+                                  L62, L63,      R62, R63 \
+) LAYOUT_6x6( \
+    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+    L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+    L40, L41, L42, L43, L44, L45,                          R40, R41, R42, R43, R44, R45, \
+              L52, L53,                                              R52, R53, \
+                        L54, XXX,                          XXX, R51, \
+                                  L64, L65,      R60, R61, \
+                                  L62, L63,      R62, R63 \
+)
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/chconf.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/chconf.h
new file mode 100644
index 0000000000..f0c98d3b97
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/chconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 QMK
+ *
+ * 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 CH_CFG_ST_FREQUENCY 10000
+
+#include_next <chconf.h>
+
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
new file mode 100644
index 0000000000..93e1ed8449
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h
@@ -0,0 +1,54 @@
+/* Copyright 2021 QMK
+ *
+ * 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"
+
+#undef SOFT_SERIAL_PIN
+
+#define MATRIX_ROW_PINS          { B12, B13, B14, B15, A8 , A9, A10}
+#define MATRIX_COL_PINS          { B1, B0, A7, A6, A5, A4}
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define BOOTMAGIC_LITE_ROW          0
+#define BOOTMAGIC_LITE_COLUMN       0
+#define BOOTMAGIC_LITE_ROW_RIGHT    7
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
+
+// in col2row col is input, and row is output
+// #define SPLIT_HAND_MATRIX_GRID A10, A4
+// 68kohm
+#define SPLIT_HAND_PIN              B10
+
+/* connection */
+#define SERIAL_USART_FULL_DUPLEX   // Enable full duplex operation mode.
+#define SOFT_SERIAL_PIN B6     // USART TX pin
+#define SERIAL_USART_RX_PIN B7     // USART RX pin
+#define SERIAL_USART_TX_PIN SOFT_SERIAL_PIN     // USART TX pin
+
+#define SELECT_SOFT_SERIAL_SPEED 1 // or 0, 2, 3, 4, 5
+                                   //  0: 460800 baud
+                                   //  1: 230400 baud (default)
+                                   //  2: 115200 baud
+                                   //  3: 57600 baud
+                                   //  4: 38400 baud
+                                   //  5: 19200 baud
+#define SERIAL_USART_DRIVER SD1    // USART driver of TX and RX pin. default: SD1
+#define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+#define SERIAL_USART_RX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+#define SERIAL_USART_TIMEOUT 20    // USART driver timeout. default 20
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/halconf.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/halconf.h
new file mode 100644
index 0000000000..9068139df8
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/halconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2021 QMK
+ *
+ * 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 HAL_USE_SERIAL TRUE
+
+#define PAL_USE_CALLBACKS TRUE
+#define PAL_USE_WAIT TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h
new file mode 100644
index 0000000000..b8bb363d91
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 QMK
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
new file mode 100644
index 0000000000..af3cc49296
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
@@ -0,0 +1,30 @@
+# Copyright 2021 Bartosz Nowak (@dumam)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = tinyuf2
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+
+# Build Options
+#   change yes to no to disable
+#
+SPLIT_KEYBOARD = yes
+# split settings
+# https://beta.docs.qmk.fm/developing-qmk/c-development/hardware_drivers/serial_driver
+SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/dactyl_manuform/6x6/config.h b/keyboards/handwired/dactyl_manuform/6x6/config.h
index 9323e33029..15682fcadf 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/config.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/config.h
@@ -20,21 +20,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define PRODUCT_ID 0x3636
-#define DEVICE_VER 0x0001
-#define PRODUCT    Dactyl-Manuform (6x6)
+#define PRODUCT_ID  0x3636
+#define DEVICE_VER  0x0001
+#define PRODUCT     "Dactyl-Manuform (6x6)"
+
+/* USB Device descriptor parameter */
 
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 14
 #define MATRIX_COLS 6
-
-// wiring of each half
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
-// WS2812 RGB LED strip input and number of LEDs
-#define RGB_DI_PIN D3
-#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c
index 41e96b53d7..8c85746986 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c
@@ -1,8 +1,13 @@
+// Copyright 2021 david@impstyle.com (@zwnk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
+enum custom_layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+};
 
 #define RAISE MO(_RAISE)
 #define LOWER MO(_LOWER)
@@ -15,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
         KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
                          KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,
-                                         RAISE,KC_SPC,                        KC_ENT, LOWER,
+                                         RAISE ,KC_SPC,                        KC_ENT, LOWER,
                                          KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
                                          KC_BSPC, KC_GRV,                        KC_LGUI, KC_LALT
     ),
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default_5_thumb/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default_5_thumb/keymap.c
new file mode 100644
index 0000000000..b68ec078e0
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default_5_thumb/keymap.c
@@ -0,0 +1,51 @@
+// Copyright 2021 Bartosz Nowak (@dumam)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+};
+
+#define RAISE LT(_RAISE, KC_SPC)
+#define LOWER LT(_LOWER, KC_ENT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_6x6_5_thumb(
+        KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,                        KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,
+        KC_ESC ,KC_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_MINS,
+        KC_LSFT,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                        KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,
+        KC_LCTL,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,                        KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
+                        KC_LBRC,KC_RBRC,                                                        KC_PLUS,KC_EQL ,
+                                        RAISE  ,                                        LOWER  ,
+                                                KC_TAB ,KC_HOME,       KC_END  ,KC_DEL,
+                                                KC_BSPC,KC_GRV ,       KC_LGUI ,KC_LALT
+    ),
+
+    [_LOWER] = LAYOUT_6x6_5_thumb(
+        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_TILD,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,                        KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
+        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,KC_P7  ,KC_P8  ,KC_P9  ,_______,KC_PLUS,
+        _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN,                        KC_RPRN,KC_P4  ,KC_P5  ,KC_P6  ,KC_MINS,KC_PIPE,
+        _______,_______,_______,_______,_______,_______,                        _______,KC_P1  ,KC_P2  ,KC_P3  ,KC_EQL ,KC_UNDS,
+                        _______,KC_PSCR,                                                        _______,KC_P0  ,
+                                        _______,                                        _______,
+                                                _______,_______,        _______,_______,
+                                                _______,_______,        _______,_______
+    ),
+
+    [_RAISE] = LAYOUT_6x6_5_thumb(
+        KC_F12 ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,                        KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_F11 ,
+        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+        _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
+        _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD,
+        _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,_______,
+                        _______,_______,                                                        KC_EQL ,_______,
+                                        _______,                                        _______,
+                                                _______,_______,        _______,_______,
+                                                _______,_______,        _______,_______
+    )
+};
diff --git a/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c b/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
new file mode 100644
index 0000000000..2fb783e0b8
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/dumam/keymap.c
@@ -0,0 +1,59 @@
+// Copyright 2021 Bartosz Nowak (@dumam)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _QWERTY,   // daily use and coding
+    _MOVE,     // mouse, arrows, browsing useful keys
+    _CONF,     // machine settings, keyboard settings, backlight
+};
+#define _KC_SPC LT(_CONF, KC_SPC)
+#define _KC_ENT LT(_MOVE, KC_ENT)
+
+#define KC_SPEC KC_SFTENT //KC_SFTENT - Right Shift when held, Enter when tapped
+#define KC_INS_ KC_INS
+#define KC_TAB_ KC_TAB
+#define RESET__ RESET
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT_6x6_5_thumb(
+
+    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_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,                          KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,
+    KC_BSLS,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,                          KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_EQL ,
+    KC_SLSH,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,                          KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_LBRC,KC_RBRC,
+    KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,                          KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SCLN,KC_QUOT,
+                    KC_LGUI,KC_ESC ,                                                          KC_HOME,KC_END ,
+                                    _KC_SPC,                                          _KC_ENT,
+                                            KC_TAB_,KC_BSPC,          KC_DEL ,KC_RSFT,
+                                            KC_LCTL,KC_LALT,          KC_RALT,KC_RCTL
+  ),
+
+  [_CONF] = LAYOUT_6x6_5_thumb(
+
+    RESET__,XXXXXXX,XXXXXXX,XXXXXXX,KC_SLEP,KC_WAKE,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,RESET__,
+    XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+    XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+    XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_PGUP,XXXXXXX,                          XXXXXXX,KC_PGUP,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+    XXXXXXX,KC_CAPS,KC_MENU,XXXXXXX,KC_PGDN,KC_LGUI,                          KC_LGUI,KC_PGDN,XXXXXXX,KC_INS_,KC_PSCR,XXXXXXX,
+                    _______,_______,                                                          _______,_______,
+                                    _______,                                          _______,
+                                            _______,_______,          _______,_______,
+                                            _______,_______,          _______,_______
+  ),
+
+  [_MOVE] = LAYOUT_6x6_5_thumb(
+
+    RESET__,XXXXXXX,XXXXXXX,KC_MPRV,KC_MPLY,KC_MPLY,                          KC_MUTE,KC_VOLD,KC_VOLU,XXXXXXX,XXXXXXX,RESET__,
+    XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+    XXXXXXX,XXXXXXX,XXXXXXX,KC_MS_U,XXXXXXX,XXXXXXX,                          XXXXXXX,XXXXXXX,KC_UP  ,XXXXXXX,XXXXXXX,XXXXXXX,
+    XXXXXXX,XXXXXXX,KC_MS_L,KC_MS_D,KC_MS_R,XXXXXXX,                          XXXXXXX,KC_LEFT,KC_DOWN,KC_RGHT,XXXXXXX,XXXXXXX,
+    XXXXXXX,XXXXXXX,KC_BTN1,KC_BTN3,KC_BTN2,XXXXXXX,                          XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+                    _______,_______,                                                          _______,_______,
+                                    _______,                                          _______,
+                                            _______,_______,          _______,_______,
+                                            _______,_______,          _______,_______
+  ),
+};
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
new file mode 100644
index 0000000000..953d94a1a3
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h
@@ -0,0 +1,29 @@
+/* Copyright 2019
+ *
+ * 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"
+
+// wiring of each half
+#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
+#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
+
+#define DIODE_DIRECTION COL2ROW
+
+// WS2812 RGB LED strip input and number of LEDs
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk
new file mode 100644
index 0000000000..d47d8e75f4
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk
@@ -0,0 +1,8 @@
+# Copyright 2021 Bartosz Nowak (@dumam)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
diff --git a/keyboards/handwired/dactyl_manuform/6x6/readme.md b/keyboards/handwired/dactyl_manuform/6x6/readme.md
new file mode 100644
index 0000000000..9b079be466
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6/readme.md
@@ -0,0 +1,63 @@
+# Dactyl Manuform (6x6) optional 5thumb cluster
+
+## Dactyl Manufrom 6x6
+
+![Dactyl Manufrom 6x6](https://i.imgur.com/j8dsBgs.jpeg)
+
+## Dactyl Manufrom 6x6 with 5 key thumb cluster
+
+![Dactyl Manufrom 6x6 with thumb](https://i.imgur.com/C7FRiwd.jpeg)
+
+## Description
+
+* Keyboard Maintainer: [dumam for 5thumb](https://github.com/DuMaM) and others
+* Hardware Supported: STM32F4BlackPill, Promicro and clones
+
+Basic guide how to build 6x6 board is in root keyboard dir. This will help you to to create your own board with 6key based cluster with promicro. [For more click here](../readme.md).
+
+If you want to use 5thumb cluster or stm32, you also should read base guide, but please came back here after you finish 😉.
+
+For my build I used stm32f411 black pill. It's pretty cheap board and I highly recommend you to buy one from official distributors, to support board creators. [To buy it, please go into designer site](https://github.com/WeActTC/MiniSTM32F4x1).
+
+I recommend using stm32 boards for this project, because QMK recently added support for [tinyuf2 bootloader](https://github.com/adafruit/tinyuf2). This bootloader is great for cases where you are going to use QMK Configurator and don't want to use any command line interface. This way when you need change keyboard layout, you only need an UF2 file. Setting up board in boot mode will allow you to drag and drop it on to created STM32F flash drive.
+![BlackPill Schematic](blackpill_f411/STM32F4x1_PinoutDiagram_RichardBalint.png "Schematic of stm32f4 blackpill")
+
+For case I used 3D models form here. Big thanks to creators.
+
+- [dactyl-manuform-mini-keyboard](https://github.com/l4u/dactyl-manuform-mini-keyboard)
+- [dactyl-manuform](https://github.com/carbonfet/dactyl-manuform)
+- [Good build guide](https://medium.com/swlh/complete-idiot-guide-for-building-a-dactyl-manuform-keyboard-53454845b065)
+
+## STM32 Usage
+
+![BlackPill](https://raw.githubusercontent.com/WeActTC/MiniSTM32F4x1/master/images/STM32F4x1_PinoutDiagram_RichardBalint.png)
+
+My fixes allows for using STM32 with all keymaps located in this dir. Please note that you need to pull down and up B10 pin. I used here 68kohm resistor. Don't use bigger one then 100kohm and lower then 10kohm. Pin you should use for this it B10. [More can be found here](https://beta.docs.qmk.fm/using-qmk/hardware-features/feature_split_keyboard#setting-handedness).
+
+### Features
+
+- any board could be master one, and they can be used separately from each other
+- it's using full usart (4 cables), mostly due to some stability and half detection problems
+- easy keymaps update -> drag and drop file
+- pin used for rows (B12, B13, B14, B15, A8 , A9, A10) and for cols (B1, B0, A7, A6, A5, A4)
+
+## Build
+
+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).
+After setting up your build environment you can try to build it with those commands.
+
+Make Promicro based img:
+
+    qmk compile -kb keyboards/handwired/dactyl_manuform/6x6 -km default
+
+Make BlackPill one:
+
+    qmk compile -kb keyboards/handwired/dactyl_manuform/6x6/blackpill_f411 -km default
+
+## Bootloader for BlackPill
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at F1 for left side, and F7 for right side.
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET`, in dumam keymap it's assigned to F1 and F12 keys on mod layers.
diff --git a/keyboards/handwired/dactyl_manuform/6x6/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
index 0415379827..84645084d3 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
@@ -17,3 +11,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
+
+DEFAULT_FOLDER = handwired/dactyl_manuform/6x6/promicro

From 2e19d0d7d14fef69d583886c244d3c67b3c0cc3d Mon Sep 17 00:00:00 2001
From: Christoph Rehmann <1273098+crehmann@users.noreply.github.com>
Date: Mon, 10 Jan 2022 11:33:48 +0100
Subject: [PATCH 189/867] [Keyboard] Add Buzzard support (#15493)

* add buzzerd

(untested, WIP)

* configured linear actuator and fixed keymap

* configuration tweaks and added custom keymap

* add custom tapping term for home row mod

* added readme

* remove ionide folder

* added scroll function to trackpoint

* keymap reworked

* using one shot shift and removed dynamic macros

* reworked default keymap

* adapted to latest qmk changes

* remove caps word from default keymap

* use provided coding guidelines

* use get_highest_layer in favour  of biton32

* fixed formatting

* remove unnecessary define statement
---
 keyboards/buzzard/buzzard.c                   |   3 +
 keyboards/buzzard/buzzard.h                   |   9 +
 keyboards/buzzard/config.h                    |   6 +
 keyboards/buzzard/info.json                   |  10 +
 keyboards/buzzard/keymaps/crehmann/config.h   |  38 +++
 .../keymaps/crehmann/features/haptic_utils.c  |  42 +++
 .../keymaps/crehmann/features/haptic_utils.h  |  10 +
 keyboards/buzzard/keymaps/crehmann/keymap.c   | 256 ++++++++++++++++
 keyboards/buzzard/keymaps/crehmann/rules.mk   |   9 +
 keyboards/buzzard/keymaps/default/config.h    |  39 +++
 keyboards/buzzard/keymaps/default/keymap.c    | 274 ++++++++++++++++++
 keyboards/buzzard/keymaps/default/rules.mk    |   7 +
 keyboards/buzzard/readme.md                   |  29 ++
 keyboards/buzzard/rev1/config.h               |  62 ++++
 keyboards/buzzard/rev1/rev1.c                 | 128 ++++++++
 keyboards/buzzard/rev1/rev1.h                 |  52 ++++
 keyboards/buzzard/rev1/rules.mk               |   3 +
 keyboards/buzzard/rules.mk                    |  22 ++
 18 files changed, 999 insertions(+)
 create mode 100644 keyboards/buzzard/buzzard.c
 create mode 100644 keyboards/buzzard/buzzard.h
 create mode 100644 keyboards/buzzard/config.h
 create mode 100644 keyboards/buzzard/info.json
 create mode 100644 keyboards/buzzard/keymaps/crehmann/config.h
 create mode 100644 keyboards/buzzard/keymaps/crehmann/features/haptic_utils.c
 create mode 100644 keyboards/buzzard/keymaps/crehmann/features/haptic_utils.h
 create mode 100644 keyboards/buzzard/keymaps/crehmann/keymap.c
 create mode 100644 keyboards/buzzard/keymaps/crehmann/rules.mk
 create mode 100644 keyboards/buzzard/keymaps/default/config.h
 create mode 100644 keyboards/buzzard/keymaps/default/keymap.c
 create mode 100644 keyboards/buzzard/keymaps/default/rules.mk
 create mode 100644 keyboards/buzzard/readme.md
 create mode 100644 keyboards/buzzard/rev1/config.h
 create mode 100644 keyboards/buzzard/rev1/rev1.c
 create mode 100644 keyboards/buzzard/rev1/rev1.h
 create mode 100644 keyboards/buzzard/rev1/rules.mk
 create mode 100644 keyboards/buzzard/rules.mk

diff --git a/keyboards/buzzard/buzzard.c b/keyboards/buzzard/buzzard.c
new file mode 100644
index 0000000000..00ad12a23e
--- /dev/null
+++ b/keyboards/buzzard/buzzard.c
@@ -0,0 +1,3 @@
+// Copyright 2021 Christoph Rehmann (crehmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "buzzard.h"
diff --git a/keyboards/buzzard/buzzard.h b/keyboards/buzzard/buzzard.h
new file mode 100644
index 0000000000..f094e4af39
--- /dev/null
+++ b/keyboards/buzzard/buzzard.h
@@ -0,0 +1,9 @@
+// Copyright 2021 Christoph Rehmann (crehmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "quantum.h"
+
+#if defined(KEYBOARD_buzzard_rev1)
+#   include "rev1.h"
+#endif
\ No newline at end of file
diff --git a/keyboards/buzzard/config.h b/keyboards/buzzard/config.h
new file mode 100644
index 0000000000..7dbbedfaf0
--- /dev/null
+++ b/keyboards/buzzard/config.h
@@ -0,0 +1,6 @@
+// Copyright 2021 Christoph Rehmann (crehmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
\ No newline at end of file
diff --git a/keyboards/buzzard/info.json b/keyboards/buzzard/info.json
new file mode 100644
index 0000000000..a958ffdc94
--- /dev/null
+++ b/keyboards/buzzard/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Buzzard",
+    "url": "https://github.com/crehmann/buzzard",
+    "maintainer": "crehmann",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/buzzard/keymaps/crehmann/config.h b/keyboards/buzzard/keymaps/crehmann/config.h
new file mode 100644
index 0000000000..d5d9a9bb83
--- /dev/null
+++ b/keyboards/buzzard/keymaps/crehmann/config.h
@@ -0,0 +1,38 @@
+// Copyright 2021 Christoph Rehmann (crehmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Configure the global tapping term (default: 200ms)
+#define TAPPING_TERM 200
+
+// Prevent normal rollover on alphas from accidentally triggering mods.
+#define IGNORE_MOD_TAP_INTERRUPT
+
+// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
+#define TAPPING_FORCE_HOLD
+
+// Apply the modifier on keys that are tapped during a short hold of a modtap
+#define PERMISSIVE_HOLD
+
+// Using the right side as master
+#define MASTER_RIGHT
+
+#ifdef HAPTIC_ENABLE
+// this configuration has no effect because the haptic exclusion is implemented with
+// __attribute__((weak)) bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record)
+// in the default keymap and reacts only to mouse clicks. 
+//#define NO_HAPTIC_MOD
+#define NO_HAPTIC_FN
+#define NO_HAPTIC_ALPHA
+#define NO_HAPTIC_PUNCTUATION
+#define NO_HAPTIC_NAV 
+#define NO_HAPTIC_NUMERIC
+#define DRV_GREETING       alert_750ms
+#define DRV_MODE_DEFAULT   sharp_tick1
+#endif
+
+#ifdef PS2_MOUSE_ENABLE
+#define PS2_MOUSE_SCROLL_BTN_MASK (1<<PS2_MOUSE_BTN_RIGHT)
+#define PS2_MOUSE_SCROLL_BTN_SEND 500
+#endif
\ No newline at end of file
diff --git a/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.c b/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.c
new file mode 100644
index 0000000000..37fa2902c5
--- /dev/null
+++ b/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.c
@@ -0,0 +1,42 @@
+// Copyright 2021 Christoph Rehmann (crehmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "haptic_utils.h"
+
+#ifdef HAPTIC_ENABLE
+#include "drivers/haptic/DRV2605L.h"
+#endif
+
+#ifdef HAPTIC_ENABLE
+bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_BTN1 ... KC_BTN5:
+            return true;
+            break;
+    }
+
+    return false;
+}
+#endif
+
+void process_layer_pulse(layer_state_t state) {
+#ifdef HAPTIC_ENABLE
+    switch (get_highest_layer(state)) {
+        case 1:
+            DRV_pulse(soft_bump);
+            break;
+        case 2:
+            DRV_pulse(sh_dblsharp_tick);
+            break;
+        case 3:
+            DRV_pulse(lg_dblclick_str);
+            break;
+        case 4:
+            DRV_pulse(soft_bump);
+            break;
+        case 5:
+            DRV_pulse(pulsing_sharp);
+            break;
+    }
+#endif
+}
diff --git a/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.h b/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.h
new file mode 100644
index 0000000000..ccfbb7e14b
--- /dev/null
+++ b/keyboards/buzzard/keymaps/crehmann/features/haptic_utils.h
@@ -0,0 +1,10 @@
+// Copyright 2021 Christoph Rehmann (crehmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include QMK_KEYBOARD_H
+
+bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record);
+
+void process_layer_pulse(layer_state_t state);
\ No newline at end of file
diff --git a/keyboards/buzzard/keymaps/crehmann/keymap.c b/keyboards/buzzard/keymaps/crehmann/keymap.c
new file mode 100644
index 0000000000..842494c60a
--- /dev/null
+++ b/keyboards/buzzard/keymaps/crehmann/keymap.c
@@ -0,0 +1,256 @@
+// Copyright 2021 Christoph Rehmann (crehmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "keymap_german_ch.h"
+#include "features/haptic_utils.h"
+
+#ifdef PS2_MOUSE_ENABLE
+    #include "ps2_mouse.h"
+#endif
+
+enum layers {
+    _BASE = 0,
+    _NAVR,
+    _SYMB,
+    _NUMR,
+    _FUNL,
+    _MOAJ
+};
+
+
+// Aliases for readability
+#define BASE     DF(_BASE)
+#define NAVR     MO(_NAVR)
+#define SYMB     MO(_SYMB)
+#define NUMR     MO(_NUMR)
+#define FUNL     MO(_FUNL)
+#define MOAD     MO(_MOAJ)
+
+// Left-hand home row mods
+#define RALT_X  RALT_T(KC_X)
+#define GUI_A   LGUI_T(KC_A)
+#define ALT_S   LALT_T(KC_S)
+#define CTL_D   LCTL_T(KC_D)
+#define SFT_F   LSFT_T(KC_F)
+
+// Right-hand home row mods
+#define SFT_J   RSFT_T(KC_J)
+#define CTL_K   RCTL_T(KC_K)
+#define ALT_L   LALT_T(KC_L)
+#define GUI_SCL RGUI_T(KC_SCLN)
+#define RALT_DT RALT_T(KC_DOT)
+
+// Left-hand outer column
+#define CTL_ESC  MT(MOD_LCTL, KC_ESC)
+
+// Thumbcluster
+#define UC_TL1 CTL_ESC
+#define UC_TL2 LT(NAVR, KC_SPC)
+#define UC_TL3 LT(NUMR, KC_TAB)
+
+#define UC_TR3 LT(FUNL, KC_BSPC)
+#define UC_TR2 LT(SYMB, KC_ENT)
+#define UC_TR1 KC_DEL
+
+// Shortcuts
+#define UC_COPY LCTL(KC_C)
+#define UC_PSTE LCTL(KC_V)
+#define UC_CUT  LCTL(KC_X)
+#define UC_MUTE SGUI(KC_M)
+#define UC_OSFT OSM(MOD_LSFT)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+// /*
+//  * Base Layer
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |   Q  |   W  |   E  |   R  |   T  |                                               |   Z  |   U  |   I  |   O  |   P  |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          | OSM  |   A  |   S  |   D  |   F  |   G  |                                               |   H  |   J  |   K  |   L  |  ; : | Bksp |
+//  *          | Shift|  GUI | LALT | LCTL | LSFT |      |                                               |      | LSFT | LCTL | LALT |  GUI |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |  ESC |   Y  |   X  |   C  |   F  |   B  |                                               |   N  |   M  |  , < |  . > |  / ? | Mute |
+//  *          |  CTL |      | RALT |      |      |      |                                               |      |      |      | RALT |      |  Mic |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |  ESC | Space| TAB  |                   |  Bksp| Enter|  Del |
+//  *                                             |  CTL | NAVR | NUMR |                   |  FUNL| SYML |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+    [_BASE] = LAYOUT(
+               KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                                        CH_Z   , KC_U   , KC_I   , KC_O   , KC_P   ,
+      UC_OSFT, GUI_A  , ALT_S  , CTL_D  , SFT_F  , KC_G   ,                                        KC_H   , SFT_J  , CTL_K  , ALT_L  , GUI_SCL, KC_BSPC,
+      CTL_ESC, CH_Y   , RALT_X , KC_C   , KC_V   , KC_B   ,                                        KC_N   , KC_M   , KC_COMM, RALT_DT, KC_SLSH, UC_MUTE,
+                                                   UC_TL1 , UC_TL2 , UC_TL3 ,    UC_TR3 , UC_TR2 , UC_TR1
+    ),
+
+// /*
+//  * Symbol Layer
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |   `  |   @  |   {  |   }  |   $  |                                               |   ¨  |   ü  |   /  |   \  |   ^  |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |      |   ä  |   &  |   (  |   )  |   |  |                                               |   '  |   "  |   ?  |   !  |   +  |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |      |   %  |   #  |   [  |   ]  |   ~  |                                               |   €  |   =  |   *  |   <  |   >  |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |      |      | TAB  |                   |      |      |      |
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+    [_SYMB] = LAYOUT(
+               CH_GRV , CH_AT  , CH_LCBR, CH_RCBR, CH_DLR ,                                       CH_DIAE, CH_UDIA, CH_SLSH, CH_BSLS, KC_CIRC,
+      _______, CH_ADIA, CH_AMPR, CH_LPRN, CH_RPRN, CH_PIPE,                                       CH_QUOT, CH_DQUO, CH_QUES, CH_EXLM, CH_PLUS, _______,
+      _______, CH_PERC, CH_HASH, CH_LBRC, CH_RBRC, CH_TILD,                                       CH_EURO, CH_EQL , CH_ASTR, CH_LABK, CH_RABK, _______,
+                                                   _______, _______, KC_TAB,    _______, _______ , _______ 
+    ),
+
+// /*
+//  * Navigation Layer (Right)
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |      |      |      |      |      |                                               |Insert| Cut  | PgUp | PgDn |      |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |      |      |      |      |      |      |                                               | Copy |   ←  |   ↑  |   ↓  |   →  |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |      |      |      |      |      |      |                                               | Paste| Home | WH_U | WH_D | End  |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |      |      |      |                   | Bksp |      |  Del |
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+    [_NAVR] = LAYOUT(
+               _______, _______, _______, _______, _______,                                        KC_INS , UC_CUT , KC_PGUP, KC_PGDN, _______,
+      _______, _______, _______, _______, _______, _______,                                        UC_COPY, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, _______,
+      _______, _______, _______, _______, _______, _______,                                        UC_PSTE, KC_HOME, KC_WH_U, KC_WH_D, KC_END , _______,
+                                                   _______, _______, _______,    KC_BSPC, _______, _______
+    ),
+// --------------------------------------------------------------------------------------------------------------------------------------------------------
+
+// /*
+//  * Number Layer (Right)
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |      |      |      |      |      |                                               |   /  |   7  |   8  |   9  |  -   |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |      |      |      |      |      |      |                                               |   *  |   4  |   5  |  6   |  +   |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |      |      |      |      |      |      |                                               |   0  |   1  |   2  |  3   |  .   |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |      |      |      |                   | Bksp | Enter|      |
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+    [_NUMR] = LAYOUT(
+               _______, _______, _______, _______, _______,                                        KC_SLSH, KC_7   , KC_8   , KC_9   , KC_MINS,
+      _______, _______, _______, _______, _______, _______,                                        KC_ASTR, KC_4   , KC_5   , KC_6   , KC_PLUS, _______,
+      _______, _______, _______, _______, _______, _______,                                        KC_0   , KC_1   , KC_2   , KC_3   , KC_DOT , _______,
+                                                   _______, _______, _______,    KC_BSPC, KC_ENT , _______ 
+    ),
+
+// /*
+//  * Function Layer (Left)
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |  F12 |  F7  |  F8  |  F9  | Pause|                                               |      |      |      |      |      |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |      |  F11 |  F4  |  F5  |  F6  | PrScr|                                               |      |      |      |      |      |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |      |  F10 |  F1  |  F2  |  F3  | CapsL|                                               |      |      |      |      |      |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |      | Space|  TAB |                   |      |      |      |
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+    [_FUNL] = LAYOUT(
+               KC_F12 , KC_F7  , KC_F8  , KC_F9  , KC_PAUS,                                        _______, _______, _______, _______, _______,
+      _______, KC_F11 , KC_F4  , KC_F5  , KC_F6  , KC_PSCR,                                        _______, _______, _______, _______, _______, _______,
+      _______, KC_F10 , KC_F1  , KC_F2  , KC_F3  , KC_CAPS,                                        _______, _______, _______, _______, _______, _______,
+                                                   _______, KC_SPC , KC_TAB  ,    _______, _______, _______
+    ),
+  
+// /*
+//  * Mouse & Adjustment Layer
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |      |      | BTN3 | BTN2 | BTN1 |      |                                               |      |      |      |      |      |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |      |      |  Cut | Copy | Paste|      |                                               | Play |M Prev| VolDn| VolUp|M Next|      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+    [_MOAJ] = LAYOUT(
+               _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______,
+      _______, _______, KC_BTN3, KC_BTN2, KC_BTN1, _______,                                        _______, _______, _______, _______, _______, _______,
+      _______, _______, UC_CUT , UC_COPY, UC_PSTE, _______,                                        KC_MPLY, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______,
+                                                   _______, _______, _______,    _______, _______, _______
+    ),
+
+// -------------------------------------------------------- TEMPLATE -------------------------------------------------------------------------------------
+// /*
+//  * Layer
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+//     [_LAYERINDEX] = LAYOUT(
+//                _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______, _______,
+//                                                    _______, _______, _______,    _______, _______, _______
+//     ),
+// --------------------------------------------------------------------------------------------------------------------------------------------------------
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    process_layer_pulse(state);
+    return update_tri_layer_state(state, _NAVR, _SYMB, _MOAJ);
+}
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case GUI_A:
+            return TAPPING_TERM + 150;
+        case ALT_S:
+            return TAPPING_TERM + 50;
+        case ALT_L:
+            return TAPPING_TERM + 50;
+        case GUI_SCL:
+            return TAPPING_TERM + 150;
+        default:
+            return TAPPING_TERM;
+    }
+}
diff --git a/keyboards/buzzard/keymaps/crehmann/rules.mk b/keyboards/buzzard/keymaps/crehmann/rules.mk
new file mode 100644
index 0000000000..484e7d84a6
--- /dev/null
+++ b/keyboards/buzzard/keymaps/crehmann/rules.mk
@@ -0,0 +1,9 @@
+SRC += features/haptic_utils.c
+
+OLED_ENABLE = yes		
+
+HAPTIC_ENABLE = yes
+HAPTIC_DRIVER = DRV2605L
+
+PS2_MOUSE_ENABLE = yes	
+MOUSEKEY_ENABLE = yes
diff --git a/keyboards/buzzard/keymaps/default/config.h b/keyboards/buzzard/keymaps/default/config.h
new file mode 100644
index 0000000000..76294cf78a
--- /dev/null
+++ b/keyboards/buzzard/keymaps/default/config.h
@@ -0,0 +1,39 @@
+// Copyright 2021 Christoph Rehmann (crehmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// Configure the global tapping term (default: 200ms)
+#define TAPPING_TERM 200
+
+// Prevent normal rollover on alphas from accidentally triggering mods.
+#define IGNORE_MOD_TAP_INTERRUPT
+
+// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
+#define TAPPING_FORCE_HOLD
+
+// Apply the modifier on keys that are tapped during a short hold of a modtap
+#define PERMISSIVE_HOLD
+
+// Using the right side as master
+#define MASTER_RIGHT
+
+#ifdef HAPTIC_ENABLE
+// this configuration has no effect because the haptic exclusion is implemented with
+// __attribute__((weak)) bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record)
+// in the default keymap and reacts only to mouse clicks. 
+//#define NO_HAPTIC_MOD
+#define NO_HAPTIC_FN
+#define NO_HAPTIC_ALPHA
+#define NO_HAPTIC_PUNCTUATION
+#define NO_HAPTIC_NAV 
+#define NO_HAPTIC_NUMERIC
+#define DRV_GREETING       alert_750ms
+#define DRV_MODE_DEFAULT   sharp_tick1
+#endif
+
+
+#ifdef PS2_MOUSE_ENABLE
+#define PS2_MOUSE_SCROLL_BTN_MASK (1<<PS2_MOUSE_BTN_RIGHT)   // using the right mouse button for scrolling (other buttons can be configured)
+#define PS2_MOUSE_SCROLL_BTN_SEND 500
+#endif
\ No newline at end of file
diff --git a/keyboards/buzzard/keymaps/default/keymap.c b/keyboards/buzzard/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7ca3ddc7de
--- /dev/null
+++ b/keyboards/buzzard/keymaps/default/keymap.c
@@ -0,0 +1,274 @@
+/* Copyright 2021 Christoph Rehmann (crehmann)
+ *
+ * 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 layers {
+    _BASE = 0,
+    _NAVR,
+    _SYMB,
+    _NUMR,
+    _FUNL,
+    _ADJL
+};
+
+
+// Aliases for readability
+#define BASE     DF(_BASE)
+#define NAVR     MO(_NAVR)
+#define SYMB     MO(_SYMB)
+#define NUMR     MO(_NUMR)
+#define FUNL     MO(_FUNL)
+#define ADJL     MO(_ADJL)
+
+// Left-hand home row mods
+#define RALT_X  RALT_T(KC_X)
+#define GUI_A   LGUI_T(KC_A)
+#define ALT_S   LALT_T(KC_S)
+#define CTL_D   LCTL_T(KC_D)
+#define SFT_F   LSFT_T(KC_F)
+
+// Right-hand home row mods
+#define SFT_J   RSFT_T(KC_J)
+#define CTL_K   RCTL_T(KC_K)
+#define ALT_L   LALT_T(KC_L)
+#define GUI_SCL RGUI_T(KC_SCLN)
+#define RALT_DT RALT_T(KC_DOT)
+
+// Left-hand outer column
+#define CTL_ESC  MT(MOD_LCTL, KC_ESC)
+#define SFT_TAB  MT(MOD_LSFT, KC_TAB)
+
+// Thumbcluster
+#define UC_TL1 KC_BTN1
+#define UC_TL2 LT(NAVR, KC_SPC)
+#define UC_TL3 LT(NUMR, KC_TAB)
+
+#define UC_TR3 LT(FUNL, KC_BSPC)
+#define UC_TR2 LT(SYMB, KC_ENT)
+#define UC_TR1 KC_BTN2
+
+// Shortcuts
+#define UC_COPY LCTL(KC_C)
+#define UC_PSTE LCTL(KC_V)
+#define UC_CUT  LCTL(KC_X)
+#define UC_OSFT OSM(MOD_LSFT)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+// /*
+//  * Base Layer
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |   Q  |   W  |   E  |   R  |   T  |                                               |   Y  |   U  |   I  |   O  |   P  |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |  OSM |   A  |   S  |   D  |   F  |   G  |                                               |   H  |   J  |   K  |   L  |  ; : | Bksp |
+//  *          | Shift|  GUI | LALT | LCTL | LSFT |      |                                               |      | LSFT | LCTL |  ALT |  GUI |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |  ESC |   Z  |   X  |   C  |   F  |   B  |                                               |   N  |   M  |  , < |  . > |  / ? | ADJL |
+//  *          |  CTL |      | RALT |      |      |      |                                               |      |      |      | RALT |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             | BTN1 | Space| TAB  |                   |  Bksp| Enter| BTN2 |
+//  *                                             |      | NAVR | NUMR |                   |  FUNL| SYML |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+    [_BASE] = LAYOUT(
+               KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                                        KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   ,
+      UC_OSFT, GUI_A  , ALT_S  , CTL_D  , SFT_F  , KC_G   ,                                        KC_H   , SFT_J  , CTL_K  , ALT_L  , GUI_SCL, KC_DEL,
+      CTL_ESC, KC_Z   , RALT_X , KC_C   , KC_V   , KC_B   ,                                        KC_N   , KC_M   , KC_COMM, RALT_DT, KC_SLSH, ADJL  ,
+                                                   KC_BTN1, UC_TL2 , UC_TL3 ,    UC_TR3 , UC_TR2 , UC_TR1
+    ),
+
+// /*
+//  * Navigation Layer (Right)
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |      |      |      |      |      |                                               |Insert| Cut  | PgUp | PgDn |      |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |      |      |      |      |      |      |                                               | Copy |   ←  |   ↑  |   ↓  |   →  |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |      |      |      |      |      |      |                                               | Paste| Home | WH_U | WH_D | End  |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |      |      |      |                   | Bksp | Enter|      |
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+    [_NAVR] = LAYOUT(
+               _______, _______, _______, _______, _______,                                        KC_INS , UC_CUT , KC_PGUP, KC_PGDN, _______,
+      _______, _______, _______, _______, _______, _______,                                        UC_COPY, KC_LEFT, KC_UP  , KC_DOWN, KC_RGHT, _______,
+      _______, _______, _______, _______, _______, _______,                                        UC_PSTE, KC_HOME, KC_WH_U, KC_WH_D, KC_END , _______,
+                                                   _______, _______, _______,    KC_BSPC, KC_ENT , _______
+    ),
+// --------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+// /*
+//  * Symbol Layer (Right)
+//  
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |   `  |   ~  |   |  |   \  |      |                                               |      |   /  |   +  |   =  |   ?  |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |      |   !  |   @  |   #  |   $  |   %  |                                               |   ^  |   &  |   *  |   (  |   )  |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |      |   :  |   ;  |   -  |   [  |   {  |                                               |   }  |   ]  |   _  |   ,  |   .  |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |      | Space| TAB  |                   | Bksp | Enter|      |
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             `--------------------'                   `--------------------'
+//  *
+    [_SYMB] = LAYOUT(
+               KC_GRV , KC_TILD, KC_PIPE, KC_BSLS, _______,                                        _______, KC_SLSH, KC_PLUS, KC_EQL , KC_QUES,
+      _______, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC,                                        KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+      _______, KC_COLN, KC_SCLN, KC_MINS, KC_LBRC, KC_LCBR,                                        KC_RCBR, KC_RBRC, KC_UNDS, KC_COMM, KC_DOT , _______,
+                                                   _______, KC_SPC , KC_TAB  ,   KC_BSPC, KC_ENT , _______ 
+    ),
+
+// /*
+//  * Number Layer (Right)
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |      |      |      |      |      |                                               |   /  |   7  |   8  |   9  |  -   |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |      |      |      |      |      |      |                                               |   *  |   4  |   5  |  6   |  +   |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |      |      |      |      |      |      |                                               |   0  |   1  |   2  |  3   |  .   |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |      |      |      |                   | Bksp | Enter|      |
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+    [_NUMR] = LAYOUT(
+               _______, _______, _______, _______, _______,                                        KC_SLSH, KC_7   , KC_8   , KC_9   , KC_MINS,
+      _______, _______, _______, _______, _______, _______,                                        KC_ASTR, KC_4   , KC_5   , KC_6   , KC_PLUS, _______,
+      _______, _______, _______, _______, _______, _______,                                        KC_0   , KC_1   , KC_2   , KC_3   , KC_DOT , _______,
+                                                   _______, _______, _______,    KC_BSPC, KC_ENT , _______ 
+    ),
+
+// /*
+//  * Function Layer (Left)
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |  F12 |  F7  |  F8  |  F9  | Pause|                                               |      |      |      |      |      |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |      |  F11 |  F4  |  F5  |  F6  | PrScr|                                               |      |      |      |      |      |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |      |  F10 |  F1  |  F2  |  F3  | CapsL|                                               |      |      |      |      |      |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |      | Space|  TAB |                   |      |      |      |
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+    [_FUNL] = LAYOUT(
+               KC_F12 , KC_F7  , KC_F8  , KC_F9  , KC_PAUS,                                        _______, _______, _______, _______, _______,
+      _______, KC_F11 , KC_F4  , KC_F5  , KC_F6  , KC_PSCR,                                        _______, _______, _______, _______, _______, _______,
+      _______, KC_F10 , KC_F1  , KC_F2  , KC_F3  , KC_CAPS,                                        _______, _______, _______, _______, _______, _______,
+                                                   _______, KC_SPC , KC_TAB  ,    _______, _______, _______
+    ),
+
+// /*
+//  * Adjustment Layer (Left)
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |      |M Prev| VolDn| VolDn|M Next|      |                                               |      |      |      |      |      |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |      |      |      | Mute | Play |      |                                               |      |      |      |      |      |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |      | Space| TAB  |                   |      |      |      |
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+    [_ADJL] = LAYOUT(
+               _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______,
+      _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT, _______,                                        _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, KC_MUTE, KC_MPLY, _______,                                        _______, _______, _______, _______, _______, _______,
+                                                   _______, KC_SPC , KC_TAB  ,    _______, _______, _______
+    ),
+
+// -------------------------------------------------------- TEMPLATE -------------------------------------------------------------------------------------
+// /*
+//  * Layer
+//  *
+//  *                 ,----------------------------------.                                               ,----------------------------------.
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *                 |      |      |      |      |      |                                               |      |      |      |      |      |      
+//  *          ,------+------+------+------+------+------|                                               |------+------+------+------+------+------.
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |------+------+------+------+------+------|                                               |------+------+------+------+------+------|
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          |      |      |      |      |      |      |                                               |      |      |      |      |      |      |
+//  *          `----------------------------------+------+-------------.                   ,-------------+------+----------------------------------'
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             |      |      |      |                   |      |      |      |
+//  *                                             `--------------------'                   `--------------------'
+//  */
+//     [_LAYERINDEX] = LAYOUT(
+//                _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______,                                        _______, _______, _______, _______, _______, _______,
+//                                                    _______, _______, _______,    _______, _______, _______
+//     ),
+// --------------------------------------------------------------------------------------------------------------------------------------------------------
+};
+
+// uncommint this and modify the timings if the home row mods are not working for you
+/*
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case GUI_A:
+            return TAPPING_TERM + 150;
+        case ALT_S:
+            return TAPPING_TERM + 50;
+        case ALT_L:
+            return TAPPING_TERM + 50;
+        case GUI_SCL:
+            return TAPPING_TERM + 150;
+        default:
+            return TAPPING_TERM;
+    }
+}
+*/
+
+#ifdef HAPTIC_ENABLE
+
+bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_BTN1 ... KC_BTN5:
+            return true;
+            break;
+    }
+
+    return false;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/buzzard/keymaps/default/rules.mk b/keyboards/buzzard/keymaps/default/rules.mk
new file mode 100644
index 0000000000..e8124aebb9
--- /dev/null
+++ b/keyboards/buzzard/keymaps/default/rules.mk
@@ -0,0 +1,7 @@
+OLED_ENABLE = yes				# uncomment if you are using an OLED display
+
+#HAPTIC_ENABLE = yes			# uncomment only on the master side if you are using a Pimoroni haptic buzz
+#HAPTIC_DRIVER = DRV2605L		# uncomment only on the master side if you are using a Pimoroni haptic buzz
+
+#PS2_MOUSE_ENABLE = yes			# uncomment only on the master side if you are usin a TrackPoint
+MOUSEKEY_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/buzzard/readme.md b/keyboards/buzzard/readme.md
new file mode 100644
index 0000000000..d86c2feb31
--- /dev/null
+++ b/keyboards/buzzard/readme.md
@@ -0,0 +1,29 @@
+# Buzzard
+
+![Buzzard Keyboard](https://raw.githubusercontent.com/crehmann/Buzzard/main/Pictures/build_guide_final.jpg)
+
+Buzzard is a 40 keys ergonomic split keyboard. The layout is inspired by the [Architeuthis dux](https://github.com/tapioki/cephalopoda/tree/main/Architeuthis%20dux) with pinky, ring, index, and inner columns splayed at 15, 5, 0, -5, -5 degrees. However, it as two additional pinky keys and a modified thumb cluster.
+
+* Keyboard Maintainer: [crehmann](https://github.com/crehmann)  
+* Hardware Supported: Pro Micro 5V/16MHz and compatible.
+* Hardware Availability: https://github.com/crehmann/Buzzard
+
+## Some Features:
+
+- Integrated TrackPoint reset circuit and two possible positions to mount a TrackPoint to the bottom of the PCB. Either between the two inner columns or between the index and middle finger columns
+- Mounting option for a linear actuator ([HapticBuzz from pimoroni](https://shop.pimoroni.com/products/drv2605l-linear-actuator-haptic-breakout))
+- I2C interface for an OLED display
+- Wireless Ready (however, without TrackPoint / linear actuator support):
+  - Battery switch / connector
+  - Option to use a battery friendly Sharp memory display instead of an OLED display
+- Choc-spaced
+
+## Building the Firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb buzzard -km  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 build guide for the Buzzard keyboard can be found at [https://github.com/crehmann/Buzzard](https://github.com/crehmann/Buzzard)
\ No newline at end of file
diff --git a/keyboards/buzzard/rev1/config.h b/keyboards/buzzard/rev1/config.h
new file mode 100644
index 0000000000..2a7ea22ec1
--- /dev/null
+++ b/keyboards/buzzard/rev1/config.h
@@ -0,0 +1,62 @@
+// Copyright 2021 Christoph Rehmann (crehmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED 
+#define PRODUCT_ID   0xB077
+#define DEVICE_VER   0x0001
+#define MANUFACTURER crehmann
+#define PRODUCT      Buzzard
+
+/* key matrix size */
+/* Rows are doubled up */
+#define MATRIX_ROWS  8
+#define MATRIX_COLS  6
+
+// wiring
+#define MATRIX_ROW_PINS \
+    { F4, F5, F6, F7 }
+#define MATRIX_COL_PINS \
+    { B1, B3, B2, B6, B5, B4}
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE        5
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D2
+
+/* 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 OLED_ENABLE
+#define OLED_DISPLAY_128X32
+#define SPLIT_OLED_ENABLE
+#endif
+
+#ifdef PS2_USE_INT
+#define PS2_CLOCK_PIN   E6
+#define PS2_DATA_PIN    D7
+
+#define PS2_INT_INIT()  do {    \
+    EICRB |= ((1<<ISC61) |      \
+              (0<<ISC60));      \
+    } while (0)
+#define PS2_INT_ON()  do {      \
+     EIMSK |= (1<<INT6);        \
+} while (0)
+#define PS2_INT_OFF() do {      \
+    EIMSK &= ~(1<<INT6);        \
+} while (0)
+#define PS2_INT_VECT   INT6_vect
+#define PS2_MOUSE_ROTATE 270 /* Compensate for East-facing device orientation. */
+#endif
diff --git a/keyboards/buzzard/rev1/rev1.c b/keyboards/buzzard/rev1/rev1.c
new file mode 100644
index 0000000000..0124a92c32
--- /dev/null
+++ b/keyboards/buzzard/rev1/rev1.c
@@ -0,0 +1,128 @@
+// Copyright 2021 Christoph Rehmann (crehmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "rev1.h"
+
+#ifdef HAPTIC_ENABLE
+#include "drivers/haptic/DRV2605L.h"
+#endif
+
+#ifdef SWAP_HANDS_ENABLE
+// clang-format off
+__attribute__ ((weak)) const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4},
+    {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5},
+    {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6},
+    {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7},
+    {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0},
+    {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1},
+    {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2},
+    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}
+};
+// clang-format on
+#endif
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_270; }
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+
+    if (is_keyboard_master()) {
+        static const char PROGMEM base_logo[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xfe, 0xc6, 0xc6, 0xee, 0xfe, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x30, 0x30, 0x39, 0x3f, 0x1f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf8, 0xff, 0x9f, 0x8f, 0xff, 0xfc, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0f, 0x0f, 0x03, 0x01, 0x01, 0x01, 0x0f, 0x0f, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x60, 0x60, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc7, 0xcf, 0x8f, 0x1c, 0x1c, 0x98, 0xf9, 0xf1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xc3, 0xc3, 0xc3, 0xc3, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        static const char PROGMEM nav_logo[]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x3e, 0xf8, 0xc0, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x00, 0x01, 0x0f, 0x3e, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf8, 0xff, 0x9f, 0x8f, 0xff, 0xfc, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0f, 0x0f, 0x03, 0x01, 0x01, 0x01, 0x0f, 0x0f, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3f, 0xff, 0xf0, 0xe0, 0xff, 0x7f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        static const char PROGMEM sym_logo[]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xfc, 0xfe, 0xc6, 0xc6, 0x8e, 0x9c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1c, 0x38, 0x31, 0x31, 0x39, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x7f, 0xf8, 0xf0, 0x7e, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0xe0, 0x60, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x0f, 0x0e, 0x07, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        static const char PROGMEM num_logo[]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x3e, 0xf8, 0xc0, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x00, 0x01, 0x0f, 0x3e, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0c, 0x0c, 0x0e, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0xe0, 0x60, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x0f, 0x0e, 0x07, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        static const char PROGMEM fun_logo[]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xfe, 0x86, 0x86, 0x86, 0x86, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0c, 0x0c, 0x0e, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x1f, 0xfc, 0xe0, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        static const char PROGMEM adj_logo[]  = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfe, 0x7e, 0x3e, 0xfe, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x3e, 0x3f, 0x0f, 0x06, 0x06, 0x07, 0x3f, 0x3e, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x01, 0x01, 0x03, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0c, 0x0c, 0x0e, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+        // Host Keyboard LED Status
+        led_t led_usb_state = host_keyboard_led_state();
+        oled_write_P(led_usb_state.num_lock ? PSTR(" NUM ") : PSTR("     "), false);
+        oled_write_P(led_usb_state.caps_lock ? PSTR(" CAP ") : PSTR("     "), false);
+        oled_write_P(led_usb_state.scroll_lock ? PSTR(" SCR \n\n") : PSTR("     \n\n"), false);
+
+        // Host Keyboard Layer Status
+        switch (get_highest_layer(layer_state | default_layer_state)) {
+            case 0:
+                oled_write_raw_P(base_logo, sizeof(base_logo));
+                break;
+            case 1:
+                oled_write_raw_P(nav_logo, sizeof(nav_logo));
+                break;
+            case 2:
+                oled_write_raw_P(sym_logo, sizeof(sym_logo));
+                break;
+            case 3:
+                oled_write_raw_P(num_logo, sizeof(num_logo));
+                break;
+            case 4:
+                oled_write_raw_P(fun_logo, sizeof(fun_logo));
+                break;
+            case 5:
+                oled_write_raw_P(adj_logo, sizeof(adj_logo));
+                break;
+            default:
+                oled_write_P(PSTR("---\n"), false);
+        }
+
+    } else {
+        static const char PROGMEM buzzard_log[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x38, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x30, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                   0x00, 0x00, 0x00, 0x03, 0x0f, 0x7f, 0xff, 0xff, 0xfc, 0xe3, 0x1f, 0xff, 0xff, 0xfe, 0xfc, 0x80, 0x3f, 0xfe, 0xfc, 0xf0, 0x00, 0x00, 0x80, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0x7f, 0xfe, 0xf8, 0xc7, 0x3f, 0x7f, 0x7f, 0x00, 0x7f, 0x7f, 0x0f, 0xd8, 0xdd, 0xed, 0xee, 0xe6, 0x66, 0x63, 0x30, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x30, 0x18, 0x88, 0x84, 0x04, 0x62, 0x02, 0x12, 0x11, 0xc1, 0x01, 0x21, 0x81, 0x81, 0x1a, 0x62, 0x02, 0x04, 0x04, 0xc8, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0x00, 0x10, 0x50, 0x40, 0x0c, 0x30, 0x82, 0x98, 0x41, 0x41, 0x04, 0x10, 0x83, 0xc8, 0x08, 0x20, 0x86, 0x18, 0x41, 0x45, 0x04, 0x30, 0x82, 0x88, 0x08, 0x01, 0x0e, 0xf0,
+                                                   0x00, 0x00, 0x0f, 0x30, 0xc0, 0x84, 0x14, 0x10, 0x43, 0x0c, 0x20, 0x22, 0x82, 0x18, 0x61, 0x04, 0x30, 0x30, 0xc3, 0x08, 0x20, 0x24, 0x84, 0x11, 0x41, 0x0c, 0x00, 0x02, 0x82, 0x60, 0x18, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x88, 0xd0, 0xd0, 0xd0, 0x26, 0xa0, 0xa1, 0x21, 0xa0, 0xa0, 0x22, 0xe0, 0xd0, 0xd1, 0xc8, 0xc8, 0x84, 0x86, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xff, 0x3f, 0xc7, 0xf8, 0xff, 0xff, 0x7f, 0x00, 0xff, 0xff, 0xfc, 0x06, 0x2f, 0x6d, 0xdd, 0x99, 0x19, 0x21, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xff, 0xff, 0x7f, 0x0f, 0xf1, 0xfe, 0x7f, 0x3f, 0x1f, 0x0f, 0x00, 0x3f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                   0x08, 0x07, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+        oled_write_raw_P(buzzard_log, sizeof(buzzard_log));
+    }
+    return false;
+}
+#endif
+
+__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+        case 1:
+#ifdef HAPTIC_ENABLE
+            DRV_pulse(soft_bump);
+#endif
+            break;
+        case 2:
+#ifdef HAPTIC_ENABLE
+            DRV_pulse(sh_dblsharp_tick);
+#endif
+            break;
+        case 3:
+#ifdef HAPTIC_ENABLE
+            DRV_pulse(lg_dblclick_str);
+#endif
+            break;
+        case 4:
+#ifdef HAPTIC_ENABLE
+            DRV_pulse(soft_bump);
+#endif
+            break;
+        case 5:
+#ifdef HAPTIC_ENABLE
+            DRV_pulse(pulsing_sharp);
+#endif
+            break;
+    }
+    return state;
+}
\ No newline at end of file
diff --git a/keyboards/buzzard/rev1/rev1.h b/keyboards/buzzard/rev1/rev1.h
new file mode 100644
index 0000000000..c73e9164f0
--- /dev/null
+++ b/keyboards/buzzard/rev1/rev1.h
@@ -0,0 +1,52 @@
+// Copyright 2021 Christoph Rehmann (crehmann)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "buzzard.h"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+         L00, L01, L02, L03, L04,                          R05, R06, R07, R08, R09,      \
+    L10, L11, L12, L13, L14, L15,                          R16, R17, R18, R19, R20, R21, \
+    L22, L23, L24, L25, L26, L27,                          R28, R29, R30, R31, R32, R33, \
+                             L34, L35, L36,      R37, R38, R39 \
+) \
+{ \
+    { L04,   L03,   L02,   L01,   L00,   KC_NO }, \
+    { L15,   L14,   L13,   L12,   L11,   L10   }, \
+    { L27,   L26,   L25,   L24,   L23,   L22   }, \
+    { L36,   L35,   L34,   KC_NO, KC_NO, KC_NO }, \
+    { R05,   R06,   R07,   R08,   R09,   KC_NO }, \
+    { R16,   R17,   R18,   R19,   R20,   R21   }, \
+    { R28,   R29,   R30,   R31,   R32,   R33   }, \
+    { R37,   R38,   R39,   KC_NO, KC_NO, KC_NO }, \
+}
+
+#define LAYOUT_stack(                               \
+         L00, L01, L02, L03, L04,                   \
+    L10, L11, L12, L13, L14, L15,                   \
+    L22, L23, L24, L25, L26, L27,                   \
+                   L34, L35, L36,                   \
+                                                    \
+                  R05, R06, R07, R08, R09,          \
+                  R16, R17, R18, R19, R20, R21,     \
+                  R28, R29, R30, R31, R32, R33,     \
+                  R37, R38, R39                     \
+)                                                   \
+{                                                   \
+    { L04,   L03,   L02,   L01,   L00,   KC_NO }, \
+    { L15,   L14,   L13,   L12,   L11,   L10   }, \
+    { L27,   L26,   L25,   L24,   L23,   L22   }, \
+    { L36,   L35,   L34,   KC_NO, KC_NO, KC_NO }, \
+    { R05,   R06,   R07,   R08,   R09,   KC_NO }, \
+    { R16,   R17,   R18,   R19,   R20,   R21   }, \
+    { R28,   R29,   R30,   R31,   R32,   R33   }, \
+    { R37,   R38,   R39,   KC_NO, KC_NO, KC_NO }, \
+}
diff --git a/keyboards/buzzard/rev1/rules.mk b/keyboards/buzzard/rev1/rules.mk
new file mode 100644
index 0000000000..9a479c64e6
--- /dev/null
+++ b/keyboards/buzzard/rev1/rules.mk
@@ -0,0 +1,3 @@
+OLED_DRIVER = SSD1306
+
+PS2_USE_INT = yes
diff --git a/keyboards/buzzard/rules.mk b/keyboards/buzzard/rules.mk
new file mode 100644
index 0000000000..6450813074
--- /dev/null
+++ b/keyboards/buzzard/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
+LTO_ENABLE = yes
+
+DEFAULT_FOLDER = buzzard/rev1

From 63d3ad155af88b2dc8d70e2acde1c056e30e9f96 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 11 Jan 2022 00:23:07 +0800
Subject: [PATCH 190/867] [Docs] Recommend the use of RGB light functions for
 code (#15745)

* Recommend the use of functions instead of keycodes

* Commit suggested revision

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 docs/feature_rgblight.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index 8484586c05..e707502613 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -78,6 +78,7 @@ Changing the **Value** sets the overall brightness.<br>
 
 !> By default, if you have both the RGB Light and the [RGB Matrix](feature_rgb_matrix.md) feature enabled, these keycodes will work for both features, at the same time. You can disable the keycode functionality by defining the `*_DISABLE_KEYCODES` option for the specific feature.
 
+?> `RGB_*` keycodes cannot be used with functions like `tap_code16(RGB_HUI)` as they're not USB HID keycodes. If you wish to replicate similar behaviour in custom code within your firmware (e.g. inside `encoder_update_user()` or `process_record_user()`), the equivalent [RGB functions](#functions-idfunctions) should be used instead.
 
 ## Configuration
 

From 8a4fae3b32c40f73ba75582da1ec13b59856bf3f Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 11 Jan 2022 00:23:28 +0800
Subject: [PATCH 191/867] [Docs] Recommend the use of RGB matrix functions for
 code (#15744)

* Recommend the use of functions instead of keycodes

* Commit suggested review

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 docs/feature_rgb_matrix.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 3a40be5f5e..676588b750 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -417,6 +417,7 @@ All RGB keycodes are currently shared with the RGBLIGHT system:
 
 `RGB_MODE_PLAIN`, `RGB_MODE_BREATHE`, `RGB_MODE_RAINBOW`, and `RGB_MODE_SWIRL` are the only ones that are mapped properly. The rest don't have a direct equivalent, and are not mapped.
 
+?> `RGB_*` keycodes cannot be used with functions like `tap_code16(RGB_HUD)` as they're not USB HID keycodes. If you wish to replicate similar behaviour in custom code within your firmware (e.g. inside `encoder_update_user()` or `process_record_user()`), the equivalent [RGB functions](#functions-idfunctions) should be used instead.
 !> By default, if you have both the [RGB Light](feature_rgblight.md) and the RGB Matrix feature enabled, these keycodes will work for both features, at the same time. You can disable the keycode functionality by defining the `*_DISABLE_KEYCODES` option for the specific feature.
 
 ## RGB Matrix Effects :id=rgb-matrix-effects

From 0c402157fc8f586e443468e61ca94ce01a9a0ea4 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 11 Jan 2022 05:26:46 +1100
Subject: [PATCH 192/867] Advanced deferred_exec for core-side code. (#15579)

---
 quantum/deferred_exec.c |  81 +++++++++++++++------------
 quantum/deferred_exec.h | 119 ++++++++++++++++++++++++++++++++++------
 2 files changed, 147 insertions(+), 53 deletions(-)

diff --git a/quantum/deferred_exec.c b/quantum/deferred_exec.c
index 5b0a5b1425..a64b451df2 100644
--- a/quantum/deferred_exec.c
+++ b/quantum/deferred_exec.c
@@ -9,32 +9,27 @@
 #    define MAX_DEFERRED_EXECUTORS 8
 #endif
 
-typedef struct deferred_executor_t {
-    deferred_token         token;
-    uint32_t               trigger_time;
-    deferred_exec_callback callback;
-    void *                 cb_arg;
-} deferred_executor_t;
+//------------------------------------
+// Helpers
+//
 
-static deferred_token      current_token                     = 0;
-static uint32_t            last_deferred_exec_check          = 0;
-static deferred_executor_t executors[MAX_DEFERRED_EXECUTORS] = {0};
+static deferred_token current_token = 0;
 
-static inline bool token_can_be_used(deferred_token token) {
+static inline bool token_can_be_used(deferred_executor_t *table, size_t table_count, deferred_token token) {
     if (token == INVALID_DEFERRED_TOKEN) {
         return false;
     }
-    for (int i = 0; i < MAX_DEFERRED_EXECUTORS; ++i) {
-        if (executors[i].token == token) {
+    for (int i = 0; i < table_count; ++i) {
+        if (table[i].token == token) {
             return false;
         }
     }
     return true;
 }
 
-static inline deferred_token allocate_token(void) {
+static inline deferred_token allocate_token(deferred_executor_t *table, size_t table_count) {
     deferred_token first = ++current_token;
-    while (!token_can_be_used(current_token)) {
+    while (!token_can_be_used(table, table_count, current_token)) {
         ++current_token;
         if (current_token == first) {
             // If we've looped back around to the first, everything is already allocated (yikes!). Need to exit with a failure.
@@ -44,18 +39,22 @@ static inline deferred_token allocate_token(void) {
     return current_token;
 }
 
-deferred_token defer_exec(uint32_t delay_ms, deferred_exec_callback callback, void *cb_arg) {
-    // Ignore queueing if it's a zero-time delay, or invalid callback
-    if (delay_ms == 0 || !callback) {
+//------------------------------------
+// Advanced API: used when a custom-allocated table is used, primarily for core code.
+//
+
+deferred_token defer_exec_advanced(deferred_executor_t *table, size_t table_count, uint32_t delay_ms, deferred_exec_callback callback, void *cb_arg) {
+    // Ignore queueing if the table isn't valid, it's a zero-time delay, or the token is not valid
+    if (!table || table_count == 0 || delay_ms == 0 || !callback) {
         return INVALID_DEFERRED_TOKEN;
     }
 
     // Find an unused slot and claim it
-    for (int i = 0; i < MAX_DEFERRED_EXECUTORS; ++i) {
-        deferred_executor_t *entry = &executors[i];
+    for (int i = 0; i < table_count; ++i) {
+        deferred_executor_t *entry = &table[i];
         if (entry->token == INVALID_DEFERRED_TOKEN) {
             // Work out the new token value, dropping out if none were available
-            deferred_token token = allocate_token();
+            deferred_token token = allocate_token(table, table_count);
             if (token == INVALID_DEFERRED_TOKEN) {
                 return false;
             }
@@ -73,15 +72,15 @@ deferred_token defer_exec(uint32_t delay_ms, deferred_exec_callback callback, vo
     return INVALID_DEFERRED_TOKEN;
 }
 
-bool extend_deferred_exec(deferred_token token, uint32_t delay_ms) {
-    // Ignore queueing if it's a zero-time delay, or the token is not valid
-    if (delay_ms == 0 || token == INVALID_DEFERRED_TOKEN) {
+bool extend_deferred_exec_advanced(deferred_executor_t *table, size_t table_count, deferred_token token, uint32_t delay_ms) {
+    // Ignore queueing if the table isn't valid, it's a zero-time delay, or the token is not valid
+    if (!table || table_count == 0 || delay_ms == 0 || token == INVALID_DEFERRED_TOKEN) {
         return false;
     }
 
     // Find the entry corresponding to the token
-    for (int i = 0; i < MAX_DEFERRED_EXECUTORS; ++i) {
-        deferred_executor_t *entry = &executors[i];
+    for (int i = 0; i < table_count; ++i) {
+        deferred_executor_t *entry = &table[i];
         if (entry->token == token) {
             // Found it, extend the delay
             entry->trigger_time = timer_read32() + delay_ms;
@@ -93,15 +92,15 @@ bool extend_deferred_exec(deferred_token token, uint32_t delay_ms) {
     return false;
 }
 
-bool cancel_deferred_exec(deferred_token token) {
-    // Ignore request if the token is not valid
-    if (token == INVALID_DEFERRED_TOKEN) {
+bool cancel_deferred_exec_advanced(deferred_executor_t *table, size_t table_count, deferred_token token) {
+    // Ignore request if the table/token are not valid
+    if (!table || table_count == 0 || token == INVALID_DEFERRED_TOKEN) {
         return false;
     }
 
     // Find the entry corresponding to the token
-    for (int i = 0; i < MAX_DEFERRED_EXECUTORS; ++i) {
-        deferred_executor_t *entry = &executors[i];
+    for (int i = 0; i < table_count; ++i) {
+        deferred_executor_t *entry = &table[i];
         if (entry->token == token) {
             // Found it, cancel and clear the table entry
             entry->token        = INVALID_DEFERRED_TOKEN;
@@ -116,16 +115,16 @@ bool cancel_deferred_exec(deferred_token token) {
     return false;
 }
 
-void deferred_exec_task(void) {
+void deferred_exec_advanced_task(deferred_executor_t *table, size_t table_count, uint32_t *last_execution_time) {
     uint32_t now = timer_read32();
 
     // Throttle only once per millisecond
-    if (((int32_t)TIMER_DIFF_32(now, last_deferred_exec_check)) > 0) {
-        last_deferred_exec_check = now;
+    if (((int32_t)TIMER_DIFF_32(now, (*last_execution_time))) > 0) {
+        *last_execution_time = now;
 
         // Run through each of the executors
-        for (int i = 0; i < MAX_DEFERRED_EXECUTORS; ++i) {
-            deferred_executor_t *entry = &executors[i];
+        for (int i = 0; i < table_count; ++i) {
+            deferred_executor_t *entry = &table[i];
 
             // Check if we're supposed to execute this entry
             if (entry->token != INVALID_DEFERRED_TOKEN && ((int32_t)TIMER_DIFF_32(entry->trigger_time, now)) <= 0) {
@@ -150,3 +149,15 @@ void deferred_exec_task(void) {
         }
     }
 }
+
+//------------------------------------
+// Basic API: used by user-mode code, guaranteed to not collide with core deferred execution
+//
+
+static uint32_t            last_deferred_exec_check                = 0;
+static deferred_executor_t basic_executors[MAX_DEFERRED_EXECUTORS] = {0};
+
+deferred_token defer_exec(uint32_t delay_ms, deferred_exec_callback callback, void *cb_arg) { return defer_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, delay_ms, callback, cb_arg); }
+bool           extend_deferred_exec(deferred_token token, uint32_t delay_ms) { return extend_deferred_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, token, delay_ms); }
+bool           cancel_deferred_exec(deferred_token token) { return cancel_deferred_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, token); }
+void           deferred_exec_task(void) { deferred_exec_advanced_task(basic_executors, MAX_DEFERRED_EXECUTORS, &last_deferred_exec_check); }
diff --git a/quantum/deferred_exec.h b/quantum/deferred_exec.h
index f80d353169..97ef0f6c0e 100644
--- a/quantum/deferred_exec.h
+++ b/quantum/deferred_exec.h
@@ -5,34 +5,117 @@
 
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdlib.h>
 
-// A token that can be used to cancel an existing deferred execution.
+//------------------------------------
+// Common
+//------------------------------------
+
+/**
+ * @typedef A token that can be used to cancel or extend an existing deferred execution.
+ */
 typedef uint8_t deferred_token;
+
+/**
+ * @def The constant used to denote an invalid deferred execution token.
+ */
 #define INVALID_DEFERRED_TOKEN 0
 
-// Callback to execute.
-//  -- Parameter trigger_time: the intended trigger time to execute the callback -- equivalent time-space as timer_read32()
-//               cb_arg: the callback argument specified when enqueueing the deferred executor
-//  -- Return value: Non-zero re-queues the callback to execute after the returned number of milliseconds. Zero cancels repeated execution.
+/**
+ * @typedef Callback to execute.
+ * @param trigger_time[in] the intended trigger time to execute the callback -- equivalent time-space as timer_read32()
+ * @param cb_arg[in] the callback argument specified when enqueueing the deferred executor
+ * @return non-zero re-queues the callback to execute after the returned number of milliseconds. Zero cancels repeated execution.
+ */
 typedef uint32_t (*deferred_exec_callback)(uint32_t trigger_time, void *cb_arg);
 
-// Configures the supplied deferred executor to be executed after the required number of milliseconds.
-//  -- Parameter delay_ms: the number of milliseconds before executing the callback
-//  --           callback: the executor to invoke
-//  --           cb_arg: the argument to pass to the executor, may be NULL if unused by the executor
-//  -- Return value: a token usable for cancellation, or INVALID_DEFERRED_TOKEN if an error occurred
+//------------------------------------
+// Basic API: used by user-mode code, guaranteed to not collide with core deferred execution
+//------------------------------------
+
+/**
+ * Configures the supplied deferred executor to be executed after the required number of milliseconds.
+ *
+ * @param delay_ms[in] the number of milliseconds before executing the callback
+ * @param callback[in] the executor to invoke
+ * @param cb_arg[in] the argument to pass to the executor, may be NULL if unused by the executor
+ * @return a token usable for extension/cancellation, or INVALID_DEFERRED_TOKEN if an error occurred
+ */
 deferred_token defer_exec(uint32_t delay_ms, deferred_exec_callback callback, void *cb_arg);
 
-// Allows for extending the timeframe before an existing deferred execution is invoked.
-//  -- Parameter token: the returned value from defer_exec for the deferred execution you wish to extend.
-//  --           delay_ms: the new delay (with respect to the current time)
-//  -- Return value: if the token was found, and the delay was extended
+/**
+ * Allows for extending the timeframe before an existing deferred execution is invoked.
+ *
+ * @param token[in] the returned value from defer_exec for the deferred execution you wish to extend
+ * @param delay_ms[in] the number of milliseconds before executing the callback
+ * @return true if the token was extended successfully, otherwise false
+ */
 bool extend_deferred_exec(deferred_token token, uint32_t delay_ms);
 
-// Allows for cancellation of an existing deferred execution.
-//  -- Parameter token: the returned value from defer_exec for the deferred execution you wish to cancel.
-//  -- Return value: if the token was found, and the executor was cancelled
+/**
+ * Allows for cancellation of an existing deferred execution.
+ *
+ * @param token[in] the returned value from defer_exec for the deferred execution you wish to cancel
+ * @return true if the token was cancelled successfully, otherwise false
+ */
 bool cancel_deferred_exec(deferred_token token);
 
-// Forward declaration for the main loop in order to execute any deferred executors. Should not be invoked by keyboard/user code.
+/**
+ * Forward declaration for the main loop in order to execute any deferred executors. Should not be invoked by keyboard/user code.
+ */
 void deferred_exec_task(void);
+
+//------------------------------------
+// Advanced API: used when a custom-allocated table is used, primarily for core code.
+//------------------------------------
+
+/**
+ * @struct Structure for containing self-hosted deferred executor tables.
+ * @brief Core-side code can use this to create their own tables without impacting on the use of users' ability to add deferred execution.
+ *        Code outside deferred_exec.c should not worry about internals of this struct, and should just allocate the required number in an array.
+ */
+typedef struct deferred_executor_t {
+    deferred_token         token;
+    uint32_t               trigger_time;
+    deferred_exec_callback callback;
+    void *                 cb_arg;
+} deferred_executor_t;
+
+/**
+ * Configures the supplied deferred executor to be executed after the required number of milliseconds.
+ *
+ * @param table[in] the custom table used for storage
+ * @param table_count[in] the number of available items in the table
+ * @param delay_ms[in] the number of milliseconds before executing the callback
+ * @param callback[in] the executor to invoke
+ * @param cb_arg[in] the argument to pass to the executor, may be NULL if unused by the executor
+ * @return a token usable for extension/cancellation, or INVALID_DEFERRED_TOKEN if an error occurred
+ */
+deferred_token defer_exec_advanced(deferred_executor_t *table, size_t table_count, uint32_t delay_ms, deferred_exec_callback callback, void *cb_arg);
+
+/**
+ * Allows for extending the timeframe before an existing deferred execution is invoked.
+ *
+ * @param token[in] the returned value from defer_exec for the deferred execution you wish to extend
+ * @param delay_ms[in] the number of milliseconds before executing the callback
+ * @return true if the token was extended successfully, otherwise false
+ */
+bool extend_deferred_exec_advanced(deferred_executor_t *table, size_t table_count, deferred_token token, uint32_t delay_ms);
+
+/**
+ * Allows for cancellation of an existing deferred execution.
+ *
+ * @param token[in] the returned value from defer_exec for the deferred execution you wish to cancel
+ * @return true if the token was cancelled successfully, otherwise false
+ */
+bool cancel_deferred_exec_advanced(deferred_executor_t *table, size_t table_count, deferred_token token);
+
+/**
+ * Forward declaration for the main loop in order to execute any custom table deferred executors. Should not be invoked by keyboard/user code.
+ * Needed for any custom-allocated deferred execution tables. Any core tasks should add appropriate invocation to quantum/main.c.
+ *
+ * @param table[in] the custom table used for storage
+ * @param table_count[in] the number of available items in the table
+ * @param last_execution_time[in,out] the last execution time -- this will be checked first to determine if execution is needed, and updated if execution occurred
+ */
+void deferred_exec_advanced_task(deferred_executor_t *table, size_t table_count, uint32_t *last_execution_time);

From 50d46b5003a4469689337f218b415b2c61ffd185 Mon Sep 17 00:00:00 2001
From: moyi4681 <moyi4681@users.noreply.github.com>
Date: Tue, 11 Jan 2022 02:59:42 +0800
Subject: [PATCH 193/867] [Keyboard] add kbd75rgb support (#15552)

* add kbd75rgb support

* Update keyboards/kbdfans/kbd75rgb/config.h

* Update keyboards/kbdfans/kbd75rgb/rules.mk

* Update keyboards/kbdfans/kbd75rgb/rules.mk

* Update keymap.c

* Update keymap.c

* Update readme.md

* Update keyboards/kbdfans/kbd75rgb/config.h

* Update keyboards/kbdfans/kbd75rgb/config.h

* Update keyboards/kbdfans/kbd75rgb/config.h

* Update keyboards/kbdfans/kbd75rgb/rules.mk

* Update keyboards/kbdfans/kbd75rgb/rules.mk

* Update keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c

* Update keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c

* Update keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c

* Update keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c

* Update keyboards/kbdfans/kbd75rgb/rules.mk
---
 keyboards/kbdfans/kbd75rgb/config.h           | 92 +++++++++++++++++++
 keyboards/kbdfans/kbd75rgb/kbd75rgb.c         | 51 ++++++++++
 keyboards/kbdfans/kbd75rgb/kbd75rgb.h         | 34 +++++++
 .../kbdfans/kbd75rgb/keymaps/default/keymap.c | 55 +++++++++++
 .../kbdfans/kbd75rgb/keymaps/via/keymap.c     | 55 +++++++++++
 .../kbdfans/kbd75rgb/keymaps/via/rules.mk     |  1 +
 keyboards/kbdfans/kbd75rgb/readme.md          | 23 +++++
 keyboards/kbdfans/kbd75rgb/rules.mk           | 22 +++++
 8 files changed, 333 insertions(+)
 create mode 100644 keyboards/kbdfans/kbd75rgb/config.h
 create mode 100644 keyboards/kbdfans/kbd75rgb/kbd75rgb.c
 create mode 100644 keyboards/kbdfans/kbd75rgb/kbd75rgb.h
 create mode 100644 keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c
 create mode 100644 keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c
 create mode 100644 keyboards/kbdfans/kbd75rgb/keymaps/via/rules.mk
 create mode 100644 keyboards/kbdfans/kbd75rgb/readme.md
 create mode 100644 keyboards/kbdfans/kbd75rgb/rules.mk

diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h
new file mode 100644
index 0000000000..e49cf68b98
--- /dev/null
+++ b/keyboards/kbdfans/kbd75rgb/config.h
@@ -0,0 +1,92 @@
+/* Copyright 2021 DZTECH <moyi4681@Live.cn>
+ *
+ * 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       0x4B42
+#define PRODUCT_ID      0x6063
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    KBDFANS
+#define PRODUCT         KBD75RGB
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+#define MATRIX_ROW_PINS { F0, F1, B0, B1, B2, C6 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, E6, B3, B7, D0, D1, D2, D3, D5, D4, D6, D7}
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+#define USB_SUSPEND_WAKEUP_DELAY 5000
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
+
+#define RGB_DI_PIN C7
+#define RGBLED_NUM 84
+#define DRIVER_LED_TOTAL RGBLED_NUM
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspendedz
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_HUE_STEP 8
+#define RGB_MATRIX_SAT_STEP 8
+#define RGB_MATRIX_VAL_STEP 8
+#define RGB_MATRIX_SPD_STEP 10
diff --git a/keyboards/kbdfans/kbd75rgb/kbd75rgb.c b/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
new file mode 100644
index 0000000000..93bbbfc02c
--- /dev/null
+++ b/keyboards/kbdfans/kbd75rgb/kbd75rgb.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 DZTECH <moyi4681@Live.cn>
+ *
+ * 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 "kbd75rgb.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    {  0,  1,  2,  3,      4,      5,  6,      7,       8, 9,  10, 11, 12, 13,    15},
+    {  30, 29, 28, 27,     26,     25, 24,     23,     22, 21, 20, 19, 18, 17,    16},
+    {  31, 32, 33, 34,     35,     36, 37,     38,     39, 40, 41, 42, 43, 44,    45},
+    {  59, 58, 57, 56,     55,     54, 53,     52,     51, 50, 49, 48, 14, 47,    46},
+    {  60, 61, 62, 63,     64,     65, 66,     67,     68, 69, 70, 71, NO_LED,72, 73},
+    {  83, 82, 81, NO_LED, NO_LED, 80, NO_LED, NO_LED, 79, 78, 77, 76, NO_LED,75 ,74}
+}, {
+    {0, 0},   {14.9, 0},  {14.9*2, 0},{14.9*3, 0}, {14.9*4, 0}, {14.9*5, 0}, {14.9*6, 0}, {14.9*7, 0}, {14.9*8, 0}, {14.9*9, 0}, {14.9*10, 0}, {14.9*11, 0}, {14.9*12, 0},  {14.9*13, 0}, {14.9*14, 0}, {224, 0},
+    {224, 12.8}, {218, 12.8},{192, 12.8},{176, 12.8},{160, 12.8},{144, 12.8},{128, 12.8},{112, 12.8},{96, 12.8},{80, 12.8},{64, 12.8},{48, 12.8},{32, 12.8},{16, 12.8},{0, 12.8},         
+    {0, 25.6},{16, 25.6}, {32, 25.6}, {48, 25.6},  {64, 25.6},  {80, 25.6},  {96, 25.6},  {112, 25.6}, {128, 25.6}, {144, 25.6}, {160, 25.6},{176, 25.6}, {192, 25.6},   {218, 25.6}, {224, 25.6},
+{224, 38.4},{200, 38.4},{176, 38.4},{160, 38.4},{144, 38.4},{128, 38.4},{112, 38.4},{96, 38.4},{80, 38.4},{64, 38.4},{48, 38.4},{32, 38.4},{16, 38.4},{0, 38.4},                       
+    {0, 51.2},{16, 51.2}, {32, 51.2}, {48, 51.2},  {64, 51.2},  {80, 51.2},  {96, 51.2},  {112, 51.2}, {128, 51.2}, {144, 51.2}, {160, 51.2},   {189, 51.2}, {218, 51.2},   {224, 51.2}, 
+{224, 64},{218, 64},{192, 64},{176, 64},{160, 64},{144, 64}, {80, 64}, {32, 64},{16, 64},{0, 64}                                                                              
+}, {
+4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+4,4,4,4,4,4,4,4,4,4,4,4,1,4,1,1,1,4,4,4,
+4,4,4,4
+} };
+
+
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void)
+{
+    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
+    {
+        rgb_matrix_set_color(59, 0xFF, 0xFF, 0xFF);
+    }
+}
+#endif
diff --git a/keyboards/kbdfans/kbd75rgb/kbd75rgb.h b/keyboards/kbdfans/kbd75rgb/kbd75rgb.h
new file mode 100644
index 0000000000..88ff6ef9f6
--- /dev/null
+++ b/keyboards/kbdfans/kbd75rgb/kbd75rgb.h
@@ -0,0 +1,34 @@
+/* Copyright 2021 DZTECH <moyi4681@Live.cn>
+ *
+ * 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 XXX KC_NO
+#include "quantum.h"
+#define LAYOUT_75_ansi( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K312, K014, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414, \
+	K500, K501, K502,             K505,             K508, K509, K510, K511,       K513, K514  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414 }, \
+	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, K508,  K509,  K510,  K511,  KC_NO, K513,  K514 }  \
+}
diff --git a/keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c b/keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ce40dd3a21
--- /dev/null
+++ b/keyboards/kbdfans/kbd75rgb/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2021 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_75_ansi(
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_INS, KC_HOME,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_END,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PGUP,
+    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_PGDN,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,    KC_DEL,
+    KC_LCTL,  KC_LGUI,  KC_LALT,                               KC_SPC,              KC_RALT,            KC_RGUI,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_75_ansi(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,    _______,   
+    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
+  ),
+  
+   [2] = LAYOUT_75_ansi(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,    _______,   
+    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
+  ),
+   [3] = LAYOUT_75_ansi(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,    _______,   
+    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
+  )
+};
diff --git a/keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c b/keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b7f0e4f36e
--- /dev/null
+++ b/keyboards/kbdfans/kbd75rgb/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2021 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_75_ansi (
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_PSCR,  KC_INS, KC_HOME,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_END,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PGUP,
+    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_PGDN,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,    KC_DEL,
+    KC_LCTL,  KC_LGUI,  KC_LALT,                               KC_SPC,              KC_RALT,            KC_RGUI,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_75_ansi (
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,    _______,   
+    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
+  ),
+  
+   [2] = LAYOUT_75_ansi (
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,    _______,   
+    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
+  ),
+   [3] = LAYOUT_75_ansi (
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,    _______,   
+    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,  _______,          
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,                                _______,            _______,            _______,  _______,  _______,  _______,  _______
+  )
+};
diff --git a/keyboards/kbdfans/kbd75rgb/keymaps/via/rules.mk b/keyboards/kbdfans/kbd75rgb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/kbdfans/kbd75rgb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd75rgb/readme.md b/keyboards/kbdfans/kbd75rgb/readme.md
new file mode 100644
index 0000000000..2dc002022f
--- /dev/null
+++ b/keyboards/kbdfans/kbd75rgb/readme.md
@@ -0,0 +1,23 @@
+# KBD75RGB
+
+A customizable 75% RGB keyboard.
+
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: KBDFANS
+* Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
+
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbdfans/kbd75rgb: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).
diff --git a/keyboards/kbdfans/kbd75rgb/rules.mk b/keyboards/kbdfans/kbd75rgb/rules.mk
new file mode 100644
index 0000000000..477bc16bdc
--- /dev/null
+++ b/keyboards/kbdfans/kbd75rgb/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = lufa-ms
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_DRIVER = WS2812
+LTO_ENABLE = yes
+
+LAYOUTS = 75_ansi

From 23ba884fa08e0a7cb16486ba1d31ea2c74cf33c9 Mon Sep 17 00:00:00 2001
From: moyi4681 <moyi4681@users.noreply.github.com>
Date: Tue, 11 Jan 2022 03:05:53 +0800
Subject: [PATCH 194/867] [Keyboard] add dz64rgb support (#15553)

* add dz64rgb support

* Update keyboards/dztech/dz64rgb/dz64rgb.c

* Update keyboards/dztech/dz64rgb/rules.mk

* Update keyboards/dztech/dz64rgb/dz64rgb.c

* Update keyboards/dztech/dz64rgb/rules.mk

* Update keyboards/dztech/dz64rgb/rules.mk

* Update keyboards/dztech/dz64rgb/rules.mk
---
 keyboards/dztech/dz64rgb/config.h             |  72 +++++++++++
 keyboards/dztech/dz64rgb/dz64rgb.c            | 121 ++++++++++++++++++
 keyboards/dztech/dz64rgb/dz64rgb.h            |  35 +++++
 .../dztech/dz64rgb/keymaps/default/keymap.c   |  48 +++++++
 keyboards/dztech/dz64rgb/keymaps/via/keymap.c |  48 +++++++
 keyboards/dztech/dz64rgb/keymaps/via/rules.mk |   1 +
 keyboards/dztech/dz64rgb/readme.md            |  21 +++
 keyboards/dztech/dz64rgb/rules.mk             |  22 ++++
 8 files changed, 368 insertions(+)
 create mode 100644 keyboards/dztech/dz64rgb/config.h
 create mode 100644 keyboards/dztech/dz64rgb/dz64rgb.c
 create mode 100644 keyboards/dztech/dz64rgb/dz64rgb.h
 create mode 100644 keyboards/dztech/dz64rgb/keymaps/default/keymap.c
 create mode 100644 keyboards/dztech/dz64rgb/keymaps/via/keymap.c
 create mode 100644 keyboards/dztech/dz64rgb/keymaps/via/rules.mk
 create mode 100644 keyboards/dztech/dz64rgb/readme.md
 create mode 100644 keyboards/dztech/dz64rgb/rules.mk

diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h
new file mode 100644
index 0000000000..224c2672cc
--- /dev/null
+++ b/keyboards/dztech/dz64rgb/config.h
@@ -0,0 +1,72 @@
+/* Copyright 2021 DZTECH <moyi4681@Live.cn>
+ *
+ * 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 VENDOR_ID       0x445A
+#define PRODUCT_ID      0x1013
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    DZTECH
+#define PRODUCT         DZ64RGB
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+#define MATRIX_ROW_PINS { F5, F4, F1, B3, B2 }
+#define MATRIX_COL_PINS { C7, F7, F6, F0, B0, B1, B4, D7, D6, D4, D5, D3, D2, B7 }
+#define UNUSED_PINS
+
+#define DIODE_DIRECTION COL2ROW
+#define DEBOUNCE 5
+
+#define USB_SUSPEND_WAKEUP_DELAY 5000
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define DRIVER_ADDR_1 0b1010000
+#define DRIVER_COUNT 1
+#define DRIVER_LED_TOTAL 64
+#endif
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
\ No newline at end of file
diff --git a/keyboards/dztech/dz64rgb/dz64rgb.c b/keyboards/dztech/dz64rgb/dz64rgb.c
new file mode 100644
index 0000000000..3850dbe276
--- /dev/null
+++ b/keyboards/dztech/dz64rgb/dz64rgb.c
@@ -0,0 +1,121 @@
+/* Copyright 2021 DZTECH <moyi4681@Live.cn>
+ *
+ * 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 "dz64rgb.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+    { 0, K_14, J_14, L_14 },
+    { 0, K_13, J_13, L_13 },
+    { 0, K_12, J_12, L_12 },
+    { 0, K_11, J_11, L_11 },
+    { 0, K_10, J_10, L_10 },
+    { 0, K_9,  J_9,  L_9 },
+    { 0, K_8,  J_8,  L_8 },
+    { 0, K_7,  J_7,  L_7 },
+    { 0, K_6,  J_6,  L_6 },
+    { 0, K_5,  J_5,  L_5 },
+    { 0, K_4,  J_4,  L_4 },
+    { 0, K_3,  J_3,  L_3 },
+    { 0, K_2,  J_2,  L_2 },
+    { 0, K_1,  J_1,  L_1 },
+
+    { 0, H_14, G_14, I_14 },
+    { 0, H_13, G_13, I_13 },
+    { 0, H_12, G_12, I_12 },
+    { 0, H_11, G_11, I_11 },
+    { 0, H_10, G_10, I_10 },
+    { 0, H_9,  G_9,  I_9 },
+    { 0, H_8,  G_8,  I_8 },
+    { 0, H_7,  G_7,  I_7 },
+    { 0, H_6,  G_6,  I_6 },
+    { 0, H_5,  G_5,  I_5 },
+    { 0, H_4,  G_4,  I_4 },
+    { 0, H_3,  G_3,  I_3 },
+    { 0, H_2,  G_2,  I_2 },
+    { 0, H_1,  G_1,  I_1 },
+
+    { 0, E_14, D_14, F_14 },
+    { 0, E_12, D_12, F_12 },
+    { 0, E_11, D_11, F_11 },
+    { 0, E_10, D_10, F_10 },
+    { 0, E_9,  D_9,  F_9 },
+    { 0, E_8,  D_8,  F_8 },
+    { 0, E_7,  D_7,  F_7 },
+    { 0, E_6,  D_6,  F_6 },
+    { 0, E_5,  D_5,  F_5 },
+    { 0, E_4,  D_4,  F_4 },
+    { 0, E_3,  D_3,  F_3 },
+    { 0, E_2,  D_2,  F_2 },
+    { 0, E_1,  D_1,  F_1 },
+
+    { 0, B_14, A_14, C_14 },
+    { 0, B_13, A_13, C_13 },
+    { 0, B_12, A_12, C_12 },    
+    { 0, B_11, A_11, C_11 },
+    { 0, B_10, A_10, C_10 },
+    { 0, B_9,  A_9,  C_9 },
+    { 0, B_8,  A_8,  C_8 },
+    { 0, B_7,  A_7,  C_7 },
+    { 0, B_6,  A_6,  C_6 },
+    { 0, B_5,  A_5,  C_5 },
+    { 0, B_4,  A_4,  C_4 },
+    { 0, B_3,  A_3,  C_3 },
+    { 0, B_2,  A_2,  C_2 },
+    { 0, B_1,  A_1,  C_1 },
+
+    { 0, B_15, A_15, C_15 },
+    { 0, E_13, D_13, F_13 },
+    { 0, K_15, J_15, L_15 },
+    { 0, E_15, D_15, F_15 },
+    { 0, H_15, G_15, I_15 },
+    { 0, B_16, A_16, C_16 },
+    { 0, E_16, D_16, F_16 },
+    { 0, H_16, G_16, I_16 },
+    { 0, K_16, J_16, L_16 }
+};
+
+led_config_t g_led_config = {
+    {
+        { 13, 12, 11,     10,      9,  8,      7,      6,  5,  4,  3,  2,      1,  0 },
+        { 27, 26, 25,     24,     23, 22,     21,     20, 19, 18, 17, 16,     15, 14 },
+        { 40, 39, 38,     37,     36, 35,     34,     33, 32, 31, 30, 29, NO_LED, 28 },
+        { 54, 53, 52,     51,     50, 49,     48,     47, 46, 45, 44, 43, 42,     41 },
+        { 63, 62, 61, NO_LED, NO_LED, 60, NO_LED, NO_LED, 59, 58, 57, 56, NO_LED, 55 }
+    }, {
+        { 216,   0 }, { 192,   0 }, { 176,   0 }, { 160,   0 }, { 144,   0 }, { 128,   0 }, { 112,   0 }, {  96,   0 }, {  80,   0 }, {  64,   0 }, {  48,   0 }, {  32,   0 }, {  16,   0 }, {   0,   0 },
+        { 220,  16 }, { 200,  16 }, { 184,  16 }, { 168,  16 }, { 152,  16 }, { 136,  16 }, { 120,  16 }, { 104,  16 }, {  88,  16 }, {  72,  16 }, {  56,  16 }, {  40,  16 }, {  24,  16 }, {   4,  16 },
+        { 214,  32 }, { 188,  32 }, { 172,  32 }, { 156,  32 }, { 140,  32 }, { 124,  32 }, { 108,  32 }, {  92,  32 }, {  76,  32 }, {  60,  32 }, {  44,  32 }, {  28,  32 },               {   6,  32 },
+        { 224,  48 }, { 218,  48 }, { 192,  48 }, { 176,  48 }, { 160,  48 }, { 144,  48 }, { 128,  48 }, { 112,  48 }, {  96,  48 },{80, 48},  {  64,  48 }, {  48,  48 }, {  32,  48 }, {   8,  48 },
+        { 224,  64 }, { 208,  64 }, { 192,  64 },                                           { 176,  64 },                             { 160,  64 }, { 102,  64 }, {  42,  64 }, {  22,  64 }, {   2,  64 }
+    }, {
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 1, 1,          1,       1, 1, 1, 1, 1
+    }
+};
+
+
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
+    }
+}
+#endif
+
diff --git a/keyboards/dztech/dz64rgb/dz64rgb.h b/keyboards/dztech/dz64rgb/dz64rgb.h
new file mode 100644
index 0000000000..3d27e2620d
--- /dev/null
+++ b/keyboards/dztech/dz64rgb/dz64rgb.h
@@ -0,0 +1,35 @@
+/* Copyright 2021 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_64_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41, K42,                K45,      K48, K49, K4A, K4B,      K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, XXX, K4D }  \
+}
diff --git a/keyboards/dztech/dz64rgb/keymaps/default/keymap.c b/keyboards/dztech/dz64rgb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..877793b892
--- /dev/null
+++ b/keyboards/dztech/dz64rgb/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_64_ansi(
+        KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,  KC_BSPC,
+        KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,   KC_RBRC, KC_BSLS,
+        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_DEL,
+        KC_LCTL,  KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL, KC_LEFT,   KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_64_ansi(
+        TO(3),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
+        _______, _______, _______,                            TO(4),                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+    [2] = LAYOUT_64_ansi(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EEP_RST,
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_64_ansi(
+        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
+        _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, TO(0),
+        _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______,          KC_PENT,
+        _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
+        _______, KC_P0,   KC_PDOT,                            KC_PENT,                   KC_P0,   KC_PDOT, _______, _______, _______
+    )
+};
diff --git a/keyboards/dztech/dz64rgb/keymaps/via/keymap.c b/keyboards/dztech/dz64rgb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..877793b892
--- /dev/null
+++ b/keyboards/dztech/dz64rgb/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 DZTECH <moyi4681@Live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_64_ansi(
+        KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,  KC_BSPC,
+        KC_TAB,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,   KC_RBRC, KC_BSLS,
+        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_DEL,
+        KC_LCTL,  KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL, KC_LEFT,   KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_64_ansi(
+        TO(3),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, KC_VOLU, KC_MUTE,
+        _______, _______, _______,                            TO(4),                     _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+    [2] = LAYOUT_64_ansi(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          EEP_RST,
+        _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_64_ansi(
+        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS, _______,
+        _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, TO(0),
+        _______, KC_P4,   KC_P5,   KC_P6,   _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______,          KC_PENT,
+        _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______,
+        _______, KC_P0,   KC_PDOT,                            KC_PENT,                   KC_P0,   KC_PDOT, _______, _______, _______
+    )
+};
diff --git a/keyboards/dztech/dz64rgb/keymaps/via/rules.mk b/keyboards/dztech/dz64rgb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/dztech/dz64rgb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/dztech/dz64rgb/readme.md b/keyboards/dztech/dz64rgb/readme.md
new file mode 100644
index 0000000000..132a1710d7
--- /dev/null
+++ b/keyboards/dztech/dz64rgb/readme.md
@@ -0,0 +1,21 @@
+# DZ64RGB
+
+A hotswap 60% RGB keyboard.
+
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: DZtech DZ64RGB
+* Hardware Availability: [KBDfans](https://kbdfans.com/)
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dztech/dz64rgb: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).
diff --git a/keyboards/dztech/dz64rgb/rules.mk b/keyboards/dztech/dz64rgb/rules.mk
new file mode 100644
index 0000000000..f4982e7fd2
--- /dev/null
+++ b/keyboards/dztech/dz64rgb/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = lufa-ms
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3733
+LTO_ENABLE = yes
+LAYOUT= 64_ansi
\ No newline at end of file

From f423837ed25b7a2c48d59aefaf95a0cf6f2c90b9 Mon Sep 17 00:00:00 2001
From: Alin Marin Elena <alin@elena.space>
Date: Mon, 10 Jan 2022 20:15:28 +0000
Subject: [PATCH 195/867] [Keyboard] M48 12x4 lego ortholinear keyboard
 (#15536)

---
 keyboards/mlego/m48/config.h                 |  37 ++++
 keyboards/mlego/m48/info.json                |  11 ++
 keyboards/mlego/m48/keymaps/default/config.h |  21 +++
 keyboards/mlego/m48/keymaps/default/keymap.c | 182 +++++++++++++++++++
 keyboards/mlego/m48/keymaps/via/config.h     |  20 ++
 keyboards/mlego/m48/keymaps/via/keymap.c     | 137 ++++++++++++++
 keyboards/mlego/m48/keymaps/via/rules.mk     |   1 +
 keyboards/mlego/m48/m48.c                    |  30 +++
 keyboards/mlego/m48/m48.h                    |  80 ++++++++
 keyboards/mlego/m48/readme.md                |  50 +++++
 keyboards/mlego/m48/rev1/config.h            |  58 ++++++
 keyboards/mlego/m48/rev1/halconf.h           |  30 +++
 keyboards/mlego/m48/rev1/mcuconf.h           |  30 +++
 keyboards/mlego/m48/rev1/rules.mk            |  21 +++
 14 files changed, 708 insertions(+)
 create mode 100644 keyboards/mlego/m48/config.h
 create mode 100644 keyboards/mlego/m48/info.json
 create mode 100644 keyboards/mlego/m48/keymaps/default/config.h
 create mode 100644 keyboards/mlego/m48/keymaps/default/keymap.c
 create mode 100644 keyboards/mlego/m48/keymaps/via/config.h
 create mode 100644 keyboards/mlego/m48/keymaps/via/keymap.c
 create mode 100644 keyboards/mlego/m48/keymaps/via/rules.mk
 create mode 100644 keyboards/mlego/m48/m48.c
 create mode 100644 keyboards/mlego/m48/m48.h
 create mode 100644 keyboards/mlego/m48/readme.md
 create mode 100644 keyboards/mlego/m48/rev1/config.h
 create mode 100644 keyboards/mlego/m48/rev1/halconf.h
 create mode 100644 keyboards/mlego/m48/rev1/mcuconf.h
 create mode 100644 keyboards/mlego/m48/rev1/rules.mk

diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h
new file mode 100644
index 0000000000..6be2373d8f
--- /dev/null
+++ b/keyboards/mlego/m48/config.h
@@ -0,0 +1,37 @@
+/* Copyright 2021-2022 alin m elena <alinm.elena@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xBABA
+#define MANUFACTURER alin elena
+#define PRODUCT m48
+
+#define MATRIX_ROWS 4  // Rows are doubled-up
+#define MATRIX_COLS 12
+
+#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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/mlego/m48/info.json b/keyboards/mlego/m48/info.json
new file mode 100644
index 0000000000..cc6b273f0d
--- /dev/null
+++ b/keyboards/mlego/m48/info.json
@@ -0,0 +1,11 @@
+{
+    "keyboard_name": "mlego/m48",
+    "keyboard_folder": "mlego/m48",
+    "url": "https://gitlab.com/m-lego/m48",
+    "maintainer": "alin elena",
+    "layouts": {
+        "LAYOUT_ortho_4x12": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
+        }
+    }
+}
diff --git a/keyboards/mlego/m48/keymaps/default/config.h b/keyboards/mlego/m48/keymaps/default/config.h
new file mode 100644
index 0000000000..b1aed18a18
--- /dev/null
+++ b/keyboards/mlego/m48/keymaps/default/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
+#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WINC
diff --git a/keyboards/mlego/m48/keymaps/default/keymap.c b/keyboards/mlego/m48/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8a76993c07
--- /dev/null
+++ b/keyboards/mlego/m48/keymaps/default/keymap.c
@@ -0,0 +1,182 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+#endif
+
+#define LOWER TT(_LWR)
+#define RAISE TT(_RSE)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QW] = LAYOUT_ortho_4x12(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    KC_TRNS,KC_LCTL,  KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LWR] = LAYOUT_ortho_4x12(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RSE] = LAYOUT_ortho_4x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Adjust (Lower + Raise)
+ *                      v------------------------RGB CONTROL--------------------v
+ * ,-----------------------------------------------------------------------------------.
+ * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJ] =  LAYOUT_ortho_4x12(
+    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______,  _______, _______, _______,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+)
+
+};
+// clang-format on
+
+// let us assume we start with both layers off
+bool toggle_lwr = false;
+bool toggle_rse = false;
+
+bool led_update_user(led_t led_state) {
+    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
+    return false;
+}
+
+void matrix_scan_user(void) {
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        case (TT(_LWR)):
+            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
+                toggle_lwr = !layer_state_is(_LWR);
+            }
+            return true;
+            break;
+        case (TT(_RSE)):
+            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                toggle_rse = !layer_state_is(_RSE);
+            }
+            return true;
+            break;
+        default:
+            return true;
+    }
+}
+
+#ifdef ENCODER_ENABLE
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+#endif
+    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+#endif
diff --git a/keyboards/mlego/m48/keymaps/via/config.h b/keyboards/mlego/m48/keymaps/via/config.h
new file mode 100644
index 0000000000..637c0a8faf
--- /dev/null
+++ b/keyboards/mlego/m48/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/mlego/m48/keymaps/via/keymap.c b/keyboards/mlego/m48/keymaps/via/keymap.c
new file mode 100644
index 0000000000..54ef03cd5a
--- /dev/null
+++ b/keyboards/mlego/m48/keymaps/via/keymap.c
@@ -0,0 +1,137 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+#endif
+
+#define LOWER TT(_LWR)
+#define RAISE TT(_RSE)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_QW] = LAYOUT_ortho_4x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT
+),
+
+[_LWR] = LAYOUT_ortho_4x12(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+[_RSE] = LAYOUT_ortho_4x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+[_ADJ] =  LAYOUT_ortho_4x12(
+    _______, RESET,   _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, RESET,   _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+)
+
+};
+// clang-format on
+
+// let us assume we start with both layers off
+bool toggle_lwr = false;
+bool toggle_rse = false;
+
+bool led_update_user(led_t led_state) {
+    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
+    return false;
+}
+
+void matrix_scan_user(void) {
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        case (TT(_LWR)):
+            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
+                toggle_lwr = !layer_state_is(_LWR);
+            }
+            return true;
+            break;
+        case (TT(_RSE)):
+            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                toggle_rse = !layer_state_is(_RSE);
+            }
+            return true;
+            break;
+        default:
+            return true;
+    }
+}
+
+#ifdef ENCODER_ENABLE
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+#endif
+    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+#endif
diff --git a/keyboards/mlego/m48/keymaps/via/rules.mk b/keyboards/mlego/m48/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mlego/m48/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mlego/m48/m48.c b/keyboards/mlego/m48/m48.c
new file mode 100644
index 0000000000..79ba408cd9
--- /dev/null
+++ b/keyboards/mlego/m48/m48.c
@@ -0,0 +1,30 @@
+/* Copyright 2021-2022 alin elena <alin@elena.space>
+ *
+ * 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 "m48.h"
+
+/*
+void keyboard_pre_init_kb(void){
+
+  // Workaround for reversible pcb/mcu
+    palSetLineMode(C13, PAL_MODE_INPUT_PULLUP);
+    palSetLineMode(C15, PAL_MODE_INPUT_PULLUP);
+    palSetLineMode(B7, PAL_MODE_OUTPUT_OPENDRAIN);
+    palSetLineMode(A0, PAL_MODE_OUTPUT_OPENDRAIN);
+    palSetLineMode(A1, PAL_MODE_OUTPUT_OPENDRAIN);
+
+    keyboard_pre_init_user();
+    }
+*/
diff --git a/keyboards/mlego/m48/m48.h b/keyboards/mlego/m48/m48.h
new file mode 100644
index 0000000000..766f38124c
--- /dev/null
+++ b/keyboards/mlego/m48/m48.h
@@ -0,0 +1,80 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_ortho_4x12( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }  \
+}
+
+enum layer_names { _QW = 0, _LWR, _RSE, _ADJ };
+static inline void led_lwr(const bool on) {
+#ifdef LED_NUM_LOCK_PIN
+    writePin(LED_NUM_LOCK_PIN, on);
+#endif
+}
+
+static inline void led_rse(const bool on) {
+#ifdef LED_SCROLL_LOCK_PIN
+    writePin(LED_SCROLL_LOCK_PIN, on);
+#endif
+}
+static inline void led_caps(const bool on) {
+#ifdef LED_CAPS_LOCK_PIN
+    writePin(LED_CAPS_LOCK_PIN, !on);
+#endif
+}
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+#endif
diff --git a/keyboards/mlego/m48/readme.md b/keyboards/mlego/m48/readme.md
new file mode 100644
index 0000000000..c48cec9c8a
--- /dev/null
+++ b/keyboards/mlego/m48/readme.md
@@ -0,0 +1,50 @@
+# M48
+
+![M48](https://i.imgur.com/QLuCAlWh.jpg)
+
+A  (12x4) ortholinear keyboard that can be hand wired or using a pcb.
+
+* Keyboard Maintainer: [Alin Elena](https://github.com/alinelena) ([@drFaustroll on GitLab](https://gitlab.com/drFaustroll))
+* Hardware Supported: custom pcb [see](https://gitlab.com/m-lego/m48) STM32F401 from we act (rev1)
+* Hardware Availability: [custom how to](https://gitlab.com/m-lego/m65)
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mlego/m48/rev1:default
+
+Flashing example for this keyboard:
+
+    make mlego/m48/rev1:default
+
+To enter flashing mode, press Lower+Raise+1 or Lower+Raise+0 also on microcontroller keep pressed BOOT0 and then NRST, release NRST and then after 0.5s or so  release BOOT0.
+
+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).
+
+
+## Pins for rev1 stm32f401
+
+the same for stm32f411
+
+| Rows  | C0    | C1    | C2    | C3    | C4    | C5    | C6    | C7    | C8    | C9    | C10   | C11   | Pins  |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| R0    | Tab   | q     | w     | e     | r     | t     | y     | u     | i     | o     | p     | BSpace|   A6  |
+| R1    | Esc   | a     | s     | d     | f     | g     | h     | j     | k     | l     | ;     | '     |   A7  |
+| R2    | Shift | z     | x     | c     | v     | b     | n     | m     | ,     | .     | /     | Enter |   B0  |
+| R3    | Ctrl  | Menu  | Alt   | Fn    | Lower | Space | Space | Raise | Left  | Down  | Up    | Right |  B10  |
+| Pins  | A10   | A15   | B3    | B4    | B5    | B7    | B6    | A1    | A2    | A3    | A4    |  A5   |       |
+
+### Encoders:
+
+  - Pad_A: A0
+  - Pad_B: B8
+
+### Leds
+
+| Leds        | Pin |
+| ----------- | --- |
+| NUM_LOCK    | B12 |
+| CAPS_LOCK   | C13 |
+| SCROLL_LOCK | B13 |
+| RBG_DI      | B15 |
+
diff --git a/keyboards/mlego/m48/rev1/config.h b/keyboards/mlego/m48/rev1/config.h
new file mode 100644
index 0000000000..85da34f17a
--- /dev/null
+++ b/keyboards/mlego/m48/rev1/config.h
@@ -0,0 +1,58 @@
+/* Copyright 2021-2022 alin m elena <alinm.elena@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID 0x0001
+#define DEVICE_VER 0x0001
+
+#define MATRIX_ROW_PINS \
+    { A6, A7, B0, B10 }
+#define MATRIX_COL_PINS \
+    { A10, A15, B3, B4, B5, B7, B6, A1, A2, A3, A4, A5 }
+
+#define ENCODERS_PAD_A \
+    { A0 }
+#define ENCODERS_PAD_B \
+    { B8 }
+
+#define LED_NUM_LOCK_PIN B12
+#define LED_SCROLL_LOCK_PIN B13
+#define LED_CAPS_LOCK_PIN C13
+
+#define RGB_DI_PIN B15
+
+#define UNUSED_PINS
+#define RGBLIGHT_LAYERS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define MATRIX_IO_DELAY 5
+
+#define RGBLED_NUM 20
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/mlego/m48/rev1/halconf.h b/keyboards/mlego/m48/rev1/halconf.h
new file mode 100644
index 0000000000..89815e23b7
--- /dev/null
+++ b/keyboards/mlego/m48/rev1/halconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SERIAL TRUE
+
+#define SERIAL_USB_BUFFERS_SIZE 256
+
+#include_next <halconf.h>
diff --git a/keyboards/mlego/m48/rev1/mcuconf.h b/keyboards/mlego/m48/rev1/mcuconf.h
new file mode 100644
index 0000000000..4d90ec07ea
--- /dev/null
+++ b/keyboards/mlego/m48/rev1/mcuconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/mlego/m48/rev1/rules.mk b/keyboards/mlego/m48/rev1/rules.mk
new file mode 100644
index 0000000000..066cfd4f8e
--- /dev/null
+++ b/keyboards/mlego/m48/rev1/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes      # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes  # Enable keyboard RGB underglow
+AUDIO_ENABLE = no      # Audio output
+ENCODER_ENABLE = yes   # Enable encoder
+
+LAYOUTS = ortho_4x12

From 0e11f8ec202fb5c91b6054705a40070a1c1cec42 Mon Sep 17 00:00:00 2001
From: TerryMathews <terry@terrymathews.net>
Date: Mon, 10 Jan 2022 15:32:46 -0500
Subject: [PATCH 196/867] [Keyboard] TKC California (#15124)

* CALIFORNIA: Initial support for TKC California

* update readme.md, info.json

* Update keyboards/tkc/california/rules.mk

* Update keyboards/tkc/california/rules.mk

* Update keyboards/tkc/california/readme.md

* Update keyboards/tkc/california/rules.mk

* Update keyboards/tkc/california/info.json
---
 keyboards/tkc/california/california.c         |  18 +++
 keyboards/tkc/california/california.h         |  50 +++++++
 keyboards/tkc/california/config.h             | 123 ++++++++++++++++++
 keyboards/tkc/california/info.json            |  10 ++
 .../tkc/california/keymaps/default/keymap.c   |  29 +++++
 keyboards/tkc/california/keymaps/via/keymap.c |  38 ++++++
 keyboards/tkc/california/keymaps/via/rules.mk |   2 +
 keyboards/tkc/california/readme.md            |  21 +++
 keyboards/tkc/california/rules.mk             |  18 +++
 9 files changed, 309 insertions(+)
 create mode 100644 keyboards/tkc/california/california.c
 create mode 100644 keyboards/tkc/california/california.h
 create mode 100644 keyboards/tkc/california/config.h
 create mode 100644 keyboards/tkc/california/info.json
 create mode 100644 keyboards/tkc/california/keymaps/default/keymap.c
 create mode 100644 keyboards/tkc/california/keymaps/via/keymap.c
 create mode 100644 keyboards/tkc/california/keymaps/via/rules.mk
 create mode 100644 keyboards/tkc/california/readme.md
 create mode 100644 keyboards/tkc/california/rules.mk

diff --git a/keyboards/tkc/california/california.c b/keyboards/tkc/california/california.c
new file mode 100644
index 0000000000..002732208f
--- /dev/null
+++ b/keyboards/tkc/california/california.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Terry Mathews
+
+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 "california.h"
diff --git a/keyboards/tkc/california/california.h b/keyboards/tkc/california/california.h
new file mode 100644
index 0000000000..a438e6a024
--- /dev/null
+++ b/keyboards/tkc/california/california.h
@@ -0,0 +1,50 @@
+/*
+Copyright 2021 Terry Mathews
+
+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"  
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09,      K61, K62, K63, K64, K65, K66, K67, K68, K69, \
+    K10, k11, K12, K13, K14, K15, K16, K17, K18, K19, K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K80, K81, K82, K83, K84, K85, K86, K87, K88, K89, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K90, K91, K92, K93,           K96, K97, K98, K99, \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, KA0, KA1, KA2,      KA4, KA5, KA6, KA7, KA8, KA9, \
+    K50, K51, K52,           K55,           K58,      KB0,      KB2,      KB4, KB5, KB6, KB7, KB8, KB9  \
+) { \
+    { K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09   }, \
+    { K10,   k11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19   }, \
+    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29   }, \
+    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39   }, \
+    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49   }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, K55,   KC_NO, KC_NO, K58,   KC_NO }, \
+    { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68,   K69   }, \
+    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   K77,   K78,   K79   }, \
+    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88,   K89   }, \
+    { K90,   K91,   K92,   K93,   KC_NO, KC_NO, K96,   K97,   K98,   K99   }, \
+    { KA0,   KA1,   KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8,   KA9   }, \
+    { KB0,   KC_NO, KB2,   KC_NO, KB4,   KB5,   KB6,   KB7,   KB8,   KB9   }  \
+}
diff --git a/keyboards/tkc/california/config.h b/keyboards/tkc/california/config.h
new file mode 100644
index 0000000000..7820869142
--- /dev/null
+++ b/keyboards/tkc/california/config.h
@@ -0,0 +1,123 @@
+/*
+Copyright 2021 Terry Mathews
+
+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       0x544B //TK
+#define PRODUCT_ID      0x0009
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    TKC
+#define PRODUCT         California
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 10
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
+
+/*
+ * 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 { C7, C6, B6, D4, D3, D0, E6, B0, B1, B2, D2, B3 }
+#define MATRIX_COL_PINS { B5, B4, D7, D6, F7, F6, F5, D5, D1, F4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define BACKLIGHT_PIN B7
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
+#endif
+#define LED_NUM_LOCK_PIN F1
+#define LED_CAPS_LOCK_PIN F0
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/tkc/california/info.json b/keyboards/tkc/california/info.json
new file mode 100644
index 0000000000..ef55e0e2e0
--- /dev/null
+++ b/keyboards/tkc/california/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "TKC California", 
+    "url": "", 
+    "maintainer": "TerryMathews", 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.5, "y":0}, {"label":"Home", "x":17, "y":0}, {"label":"End", "x":18, "y":0}, {"label":"Scroll Lock", "x":19, "y":0}, {"label":"Pause", "x":20, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Bksp", "x":13, "y":1.5}, {"x":14, "y":1.5}, {"label":"PgUp", "x":15.5, "y":1.5}, {"label":"Num Lock", "x":17, "y":1.5}, {"label":"/", "x":18, "y":1.5}, {"label":"*", "x":19, "y":1.5}, {"label":"-", "x":20, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"PgDn", "x":15.5, "y":2.5}, {"label":"7", "x":17, "y":2.5}, {"label":"8", "x":18, "y":2.5}, {"label":"9", "x":19, "y":2.5}, {"label":"+", "x":20, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"4", "x":17, "y":3.5}, {"label":"5", "x":18, "y":3.5}, {"label":"6", "x":19, "y":3.5}, {"x":20, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":15.5, "y":4.75}, {"label":"1", "x":17, "y":4.5}, {"label":"2", "x":18, "y":4.5}, {"label":"3", "x":19, "y":4.5}, {"label":"Enter", "x":20, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Menu", "x":11.25, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":12.5, "y":5.5, "w":1.25}, {"label":"\u2190", "x":14.5, "y":5.75}, {"label":"\u2193", "x":15.5, "y":5.75}, {"label":"\u2192", "x":16.5, "y":5.75}, {"label":"0", "x":18, "y":5.5}, {"label":".", "x":19, "y":5.5}, {"x":20, "y":5.5}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/tkc/california/keymaps/default/keymap.c b/keyboards/tkc/california/keymaps/default/keymap.c
new file mode 100644
index 0000000000..747ed11e00
--- /dev/null
+++ b/keyboards/tkc/california/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/*
+Copyright 2021 Terry Mathews
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all( /* Base */
+    
+	KC_ESC,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_PSCR,KC_HOME,KC_END,KC_SLCK,KC_PAUS,
+    KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_DEL,KC_BSPC,KC_PGUP,KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
+    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_PGDN,KC_P7,KC_P8,KC_P9,KC_PMNS,
+    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_P4,   KC_P5,   KC_P6,KC_PPLS,
+    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_NO,KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT,KC_MENU, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
+};
diff --git a/keyboards/tkc/california/keymaps/via/keymap.c b/keyboards/tkc/california/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b84fdd4a2e
--- /dev/null
+++ b/keyboards/tkc/california/keymaps/via/keymap.c
@@ -0,0 +1,38 @@
+/*
+Copyright 2021 Terry Mathews
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all( /* Base */
+    
+	KC_ESC,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_F12,KC_PSCR,KC_HOME,KC_END,KC_SLCK,KC_PAUS,
+    KC_GRV,KC_1,KC_2,KC_3,KC_4,KC_5,KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINS,KC_EQL,KC_DEL,KC_BSPC,KC_PGUP,KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS,
+    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_PGDN,KC_P7,KC_P8,KC_P9,KC_PMNS,
+    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_P4,   KC_P5,   KC_P6,KC_PPLS,
+    KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_RSFT,MO(1),KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT,KC_MENU, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
+	
+	[1] = LAYOUT_all( /* Function */
+    
+	_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,MO(1),_______,_______,_______,_______,_______,
+    _______,_______,_______,                   _______,                    _______,_______, _______,_______,_______,_______,_______,_______,_______),
+};
diff --git a/keyboards/tkc/california/keymaps/via/rules.mk b/keyboards/tkc/california/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/tkc/california/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/tkc/california/readme.md b/keyboards/tkc/california/readme.md
new file mode 100644
index 0000000000..d8717ee6ea
--- /dev/null
+++ b/keyboards/tkc/california/readme.md
@@ -0,0 +1,21 @@
+# TKC California
+
+![TKC California](https://i.imgur.com/IaG5Gvph.jpg)
+
+A compact 1800 keyboard.
+
+* Keyboard Maintainer: [TerryMathews](https://github.com/TerryMathews)
+* Hardware Supported: TKC California (ATmega32U4)
+* Hardware Availability: TBA
+
+Reset board into bootloader by holding down Esc key while plugging in USB-C cable.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make tkc/california:default
+
+Flashing example for this keyboard:
+
+    make tkc/california:default:flash
+
+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).
diff --git a/keyboards/tkc/california/rules.mk b/keyboards/tkc/california/rules.mk
new file mode 100644
index 0000000000..1c4073c9ce
--- /dev/null
+++ b/keyboards/tkc/california/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 2dd7242e999c10341f42bb75bcad7ec12b8ed9ce Mon Sep 17 00:00:00 2001
From: nopunin10did <w.alex.ronke@gmail.com>
Date: Mon, 10 Jan 2022 15:36:02 -0500
Subject: [PATCH 197/867] [Keyboard] Kastenwagen 1840 and Kastenwagen 48
 (#13565)

* cleaning up

* deleting to undelete

* Stub out defaults

* Jabberwocky firmware WIP

* Stubbing out keymap spacing

* Default keymap and layout updates

* start stubbing out JSON for configurator

* more WIP

* Update jabberwocky.h

* Add Readme

* Apply suggestions from code review

* Fix layout capitalization

* Updates to personal and default keymaps

* Add instructions for jumping the bootloader

* Update keyboards/nopunin10did/jabberwocky/rules.mk

* Add easier ctrl-alt-del to my keymap

* Start stubbing out KW firmware

* More firmware and keymap stuff

* Fix compile error

* Filling out other layers in default keymap

* Update layout JSON and finish default layouts

* Add rotary and LED code

* Add VIA support (first draft)

* Move VIA compatibility to VIA-specific branch

* Fix readme formatting

* Fix state count issue in LED code

* Fix an erroneous change to a Jabberwocky file

* Default LEDs to on.

* Apply suggestions from code review

* Delete kastenwagen.json

* Update keyboards/nopunin10did/kastenwagen/config.h

* Apply suggestions from code review

* Apply suggestions from noroadsleft code review

* Update image in the readme

* Split 1840 & 48 into two boards (part 1)

* Splitting into two keyboards (part 2)
---
 .../nopunin10did/kastenwagen1840/config.h     | 51 ++++++++++
 .../nopunin10did/kastenwagen1840/info.json    | 77 +++++++++++++++
 .../kastenwagen1840/kastenwagen1840.c         | 60 ++++++++++++
 .../kastenwagen1840/kastenwagen1840.h         | 54 +++++++++++
 .../kastenwagen1840/keymaps/default/keymap.c  | 94 +++++++++++++++++++
 .../keymaps/default48/keymap.c                | 93 ++++++++++++++++++
 .../kastenwagen1840/keymaps/via/keymap.c      | 94 +++++++++++++++++++
 .../kastenwagen1840/keymaps/via/rules.mk      |  2 +
 .../nopunin10did/kastenwagen1840/readme.md    | 32 +++++++
 .../nopunin10did/kastenwagen1840/rules.mk     | 20 ++++
 keyboards/nopunin10did/kastenwagen48/config.h | 51 ++++++++++
 .../nopunin10did/kastenwagen48/info.json      | 65 +++++++++++++
 .../kastenwagen48/kastenwagen48.c             | 60 ++++++++++++
 .../kastenwagen48/kastenwagen48.h             | 36 +++++++
 .../kastenwagen48/keymaps/default/keymap.c    | 93 ++++++++++++++++++
 .../nopunin10did/kastenwagen48/readme.md      | 28 ++++++
 keyboards/nopunin10did/kastenwagen48/rules.mk | 20 ++++
 17 files changed, 930 insertions(+)
 create mode 100644 keyboards/nopunin10did/kastenwagen1840/config.h
 create mode 100644 keyboards/nopunin10did/kastenwagen1840/info.json
 create mode 100644 keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.c
 create mode 100644 keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.h
 create mode 100644 keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c
 create mode 100644 keyboards/nopunin10did/kastenwagen1840/keymaps/default48/keymap.c
 create mode 100644 keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c
 create mode 100644 keyboards/nopunin10did/kastenwagen1840/keymaps/via/rules.mk
 create mode 100644 keyboards/nopunin10did/kastenwagen1840/readme.md
 create mode 100644 keyboards/nopunin10did/kastenwagen1840/rules.mk
 create mode 100644 keyboards/nopunin10did/kastenwagen48/config.h
 create mode 100644 keyboards/nopunin10did/kastenwagen48/info.json
 create mode 100644 keyboards/nopunin10did/kastenwagen48/kastenwagen48.c
 create mode 100644 keyboards/nopunin10did/kastenwagen48/kastenwagen48.h
 create mode 100644 keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c
 create mode 100644 keyboards/nopunin10did/kastenwagen48/readme.md
 create mode 100644 keyboards/nopunin10did/kastenwagen48/rules.mk

diff --git a/keyboards/nopunin10did/kastenwagen1840/config.h b/keyboards/nopunin10did/kastenwagen1840/config.h
new file mode 100644
index 0000000000..a9926aded4
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen1840/config.h
@@ -0,0 +1,51 @@
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID           0x4E50  // "NP"
+#define PRODUCT_ID          0x4B57  // "KW"
+#define DEVICE_VER          0x0001
+#define MANUFACTURER        NoPunIn10Did
+#define PRODUCT             Kastenwagen 1840
+
+/* key matrix size */
+#define MATRIX_ROWS         8
+#define MATRIX_COLS         9
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS     { B4, B5, B7, D5, C7, F1, F0, B6 }
+#define MATRIX_COL_PINS     { F4, F5, F6, F7, B1, B3, B2, E6, D7 }
+#define UNUSED_PINS
+
+/* Indicator LEDs */
+#define LED_INDICATOR_TOP   B0
+#define LED_INDICATOR_MID   D4
+#define LED_INDICATOR_BOT   C6
+
+/* Rotary encoder rotation pins */
+#define ENCODERS_PAD_A      { D0, D3 }
+#define ENCODERS_PAD_B      { D1, D2 }
+
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION     COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE            5
diff --git a/keyboards/nopunin10did/kastenwagen1840/info.json b/keyboards/nopunin10did/kastenwagen1840/info.json
new file mode 100644
index 0000000000..63b401f8e3
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen1840/info.json
@@ -0,0 +1,77 @@
+{
+    "keyboard_name": "Kastenwagen 1840",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/kastenwagen1840",
+    "maintainer": "NoPunIn10Did",
+    "manufacturer": "NoPunIn10Did",
+    "layouts": {
+        "LAYOUT_1840": {
+            "layout": [
+                {"x":0   ,  "y":0,    "label":"Esc"},
+                {"x":1   ,  "y":0,    "label":"Q"},
+                {"x":2   ,  "y":0,    "label":"W"},
+                {"x":3   ,  "y":0,    "label":"E"},
+                {"x":4   ,  "y":0,    "label":"R"},
+                {"x":5   ,  "y":0,    "label":"T"},
+                {"x":6   ,  "y":0,    "label":"Y"},
+                {"x":7   ,  "y":0,    "label":"U"},
+                {"x":8   ,  "y":0,    "label":"I"},
+                {"x":9   ,  "y":0,    "label":"O"},
+                {"x":10  ,  "y":0,    "label":"P"},
+                {"x":11  ,  "y":0,    "label":"L Bracket"},
+                {"x":12  ,  "y":0,    "label":"Backspace", "w":1.75},
+                {"x":14.25, "y":0,    "label":"P-7"},
+                {"x":15.25, "y":0,    "label":"P-8"},
+                {"x":16.25, "y":0,    "label":"P-9"},
+                {"x":17.25, "y":0,    "label":"P-Minus"},
+                {"x":0   ,  "y":1,    "label":"Tab", "w":1.25},
+                {"x":1.25,  "y":1,    "label":"A"},
+                {"x":2.25,  "y":1,    "label":"S"},
+                {"x":3.25,  "y":1,    "label":"D"},
+                {"x":4.25,  "y":1,    "label":"F"},
+                {"x":5.25,  "y":1,    "label":"G"},
+                {"x":6.25,  "y":1,    "label":"H"},
+                {"x":7.25,  "y":1,    "label":"J"},
+                {"x":8.25,  "y":1,    "label":"K"},
+                {"x":9.25,  "y":1,    "label":"L"},
+                {"x":10.25, "y":1,    "label":"Semicolon"},
+                {"x":11.25, "y":1,    "label":"Quote"},
+                {"x":12.25, "y":1,    "label":"Enter", "w":1.5},
+                {"x":14.25, "y":1,    "label":"P-4"},
+                {"x":15.25, "y":1,    "label":"P-5"},
+                {"x":16.25, "y":1,    "label":"P-6"},
+                {"x":17.25, "y":1,    "label":"P-Plus"},
+                {"x":0   ,  "y":2,    "label":"Left Shift", "w":1.75},
+                {"x":1.75,  "y":2,    "label":"Z"},
+                {"x":2.75,  "y":2,    "label":"X"},
+                {"x":3.75,  "y":2,    "label":"C"},
+                {"x":4.75,  "y":2,    "label":"V"},
+                {"x":5.75,  "y":2,    "label":"B"},
+                {"x":6.75,  "y":2,    "label":"N"},
+                {"x":7.75,  "y":2,    "label":"M"},
+                {"x":8.75,  "y":2,    "label":"Comma"},
+                {"x":9.75,  "y":2,    "label":"Period"},
+                {"x":10.75, "y":2,    "label":"Slash"},
+                {"x":11.75, "y":2,    "label":"Right Shift", "w":1.25},
+                {"x":13.125,"y":2.125,"label":"Up"},
+                {"x":14.25, "y":2,    "label":"P-1"},
+                {"x":15.25, "y":2,    "label":"P-2"},
+                {"x":16.25, "y":2,    "label":"P-3"},
+                {"x":17.25, "y":2,    "label":"P-Mult"},
+                {"x":0    , "y":3,    "label":"Left Ctrl", "w":1.25},
+                {"x":1.25 , "y":3,    "label":"Left Alt", "w":1.25},
+                {"x":2.5  , "y":3,    "label":"MO(2)"},
+                {"x":3.5  , "y":3,    "label":"Space", "w":2.75},
+                {"x":6.25 , "y":3,    "label":"Space", "w":2.25},
+                {"x":8.5  , "y":3,    "label":"MO(3)"},
+                {"x":9.5  , "y":3,    "label":"R Win / Alt Gr", "w":1.25},
+                {"x":10.75, "y":3,    "label":"MO(1)", "w":1.25},
+                {"x":12.125,"y":3.125,"label":"Left"},
+                {"x":13.125,"y":3.125,"label":"Down"},
+                {"x":14.125,"y":3.125,"label":"Right"},
+                {"x":15.25 ,"y":3,    "label":"P-0"},
+                {"x":16.25 ,"y":3,    "label":"P-Dot"},
+                {"x":17.25 ,"y":3,    "label":"P-Enter"}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.c b/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.c
new file mode 100644
index 0000000000..a54b557406
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.c
@@ -0,0 +1,60 @@
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "kastenwagen1840.h"
+
+#ifndef LAYER_LED_DISABLE
+
+void keyboard_pre_init_kb(void) {
+    setPinOutput(LED_INDICATOR_TOP);
+    setPinOutput(LED_INDICATOR_MID);
+    setPinOutput(LED_INDICATOR_BOT);
+    keyboard_pre_init_user();
+}
+
+__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
+    writePinHigh(LED_INDICATOR_TOP);
+    writePinHigh(LED_INDICATOR_MID);
+    writePinHigh(LED_INDICATOR_BOT);
+
+    switch(get_highest_layer(state) % 4) {
+    case 1:
+        writePinLow(LED_INDICATOR_TOP);
+        writePinLow(LED_INDICATOR_MID);
+        break;
+    case 2:
+        writePinLow(LED_INDICATOR_TOP);
+        writePinLow(LED_INDICATOR_BOT);
+        break;
+    case 3:
+        writePinLow(LED_INDICATOR_MID);
+        writePinLow(LED_INDICATOR_BOT);
+        break;
+    }
+    return state;
+}
+
+#endif
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+   if (!encoder_update_user(index, clockwise)) { return false; }
+   if (clockwise) {
+       tap_code(KC_PGUP);
+   } else {
+       tap_code(KC_PGUP);
+   }
+   return true;
+};
diff --git a/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.h b/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.h
new file mode 100644
index 0000000000..b06cd3596c
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.h
@@ -0,0 +1,54 @@
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+
+#define LAYOUT_1840( \
+K100  , K101  , K110  , K111  , K120  , K121  , K130  , K131  , K140  , K141  , K150  , K151  , K160        ,   K170  , K171  , K180  , K181  , \
+K202    , K203  , K212  , K213  , K222  , K223  , K232  , K233  , K242  , K243  , K252  , K253  , K262      ,   K272  , K273  , K282  , K283  , \
+K304        , K305  , K314  , K315  , K324  , K325  , K334  , K335  , K344  , K345  , K354  , K355    , K364  , K374  , K375  , K384  , K385  , \
+K406    , K407    , K416  , K417                , K437            , K446  , K447    , K456    ,  K457 , K467 , K476  ,  K477  , K486  , K487    \
+) \
+{ \
+	{ K100 , K110 , K120 , K130 , K140 , K150 , K160 , K170 , K180 }, \
+	{ K101 , K111 , K121 , K131 , K141 , K151 , KC_NO, K171 , K181 }, \
+	{ K202 , K212 , K222 , K232 , K242 , K252 , K262 , K272 , K282 }, \
+	{ K203 , K213 , K223 , K233 , K243 , K253 , KC_NO, K273 , K283 }, \
+	{ K304 , K314 , K324 , K334 , K344 , K354 , K364 , K374 , K384 }, \
+	{ K305 , K315 , K325 , K335 , K345 , K355 , KC_NO, K375 , K385 }, \
+	{ K406 , K416 , KC_NO, KC_NO, K446 , K456 , KC_NO, K476 , K486 }, \
+	{ K407 , K417 , KC_NO, K437 , K447 , K457 , K467 , K477 , K487 } \
+}
+
+#define LAYOUT_48( \
+K100  , K101  , K110  , K111  , K120  , K121  , K130  , K131  , K140  , K141  , K150  , K151  , K160        ,   K170  , \
+K202    , K203  , K212  , K213  , K222  , K223  , K232  , K233  , K242  , K243  , K252  , K253  , K262      ,   K272  , \
+K304        , K305  , K314  , K315  , K324  , K325  , K334  , K335  , K344  , K345  , K354  , K355    , K364  , K374  , \
+K406    , K407    , K416  , K417                , K437            , K446  , K447    , K456    ,  K457 , K467 , K476     \
+) \
+{ \
+	{ K100 , K110 , K120 , K130 , K140 , K150 , K160 , K170  }, \
+	{ K101 , K111 , K121 , K131 , K141 , K151 , KC_NO, KC_NO }, \
+	{ K202 , K212 , K222 , K232 , K242 , K252 , K262 , K272  }, \
+	{ K203 , K213 , K223 , K233 , K243 , K253 , KC_NO, KC_NO }, \
+	{ K304 , K314 , K324 , K334 , K344 , K354 , K364 , K374  }, \
+	{ K305 , K315 , K325 , K335 , K345 , K355 , KC_NO, KC_NO }, \
+	{ K406 , K416 , KC_NO, KC_NO, K446 , K456 , KC_NO, K476  }, \
+	{ K407 , K417 , KC_NO, K437 , K447 , K457 , K467 , KC_NO } \
+}
\ No newline at end of file
diff --git a/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c b/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b9e9ad1511
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define L2_SPC      LT(2,KC_SPC)
+#define L3_SPC      LT(3,KC_SPC)
+#define L3_PENT     LT(3,KC_PENT)
+#define RWINALT     RALT_T(KC_RGUI)
+#define ISO_LT      KC_NUBS
+#define ISO_GT      LSFT(KC_NUBS)
+
+bool is_alt_tab_active = false;
+uint16_t alt_tab_timer = 0;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_1840(
+
+    KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_BSPC      , KC_P7  ,KC_P8  ,KC_P9  ,KC_PMNS,
+    KC_TAB   ,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_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,
+    KC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC ,KC_UP , KC_P1  ,KC_P2  ,KC_P3  ,KC_PAST,
+    KC_LCTL  ,KC_LALT  ,MO(2)  ,L2_SPC               ,L3_SPC           ,MO(3)  ,RWINALT  ,MO(1)   ,KC_LEFT,KC_DOWN,KC_RGHT,KC_P0  ,KC_PDOT,L3_PENT  
+    ),
+[1] = LAYOUT_1840(
+    RESET  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_HOME,XXXXXXX,KC_PGUP,XXXXXXX,
+    KC_CAPS  ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX    , XXXXXXX,XXXXXXX,XXXXXXX,KC_PAST,
+    _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,XXXXXXX,KC_PGDN,KC_PSLS,
+    KC_RCTL  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END ,KC_INS ,KC_DEL ,KC_EQL   
+    ),
+[2] = LAYOUT_1840(
+    KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL       , XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+    KC_TILD  ,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_UNDS,KC_LBRC,KC_RBRC,KC_BSLS    , XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+    _______      ,ISO_LT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+    _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX  
+    ),
+[3] = LAYOUT_1840(
+    KC_TILD,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,KC_PLUS      , KC_NLCK,KC_PSLS,KC_PAST,XXXXXXX,
+    _______  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_LCBR,KC_RCBR,KC_PIPE    , KC_PSCR,KC_SLCK,KC_PAUS,XXXXXXX,
+    _______      ,ISO_GT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+    _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______  
+    )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        }
+        else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            if (!is_alt_tab_active) {
+                is_alt_tab_active = true;
+                register_code(KC_LALT);
+            }
+            alt_tab_timer = timer_read();
+            tap_code16(KC_TAB);
+        }
+        else {
+            alt_tab_timer = timer_read();
+            tap_code16(S(KC_TAB));
+        }
+    }
+    
+    return false;
+}
+
+void matrix_scan_user(void) {
+    
+    if (is_alt_tab_active) {
+        if (timer_elapsed(alt_tab_timer) > 1250) {
+            unregister_code(KC_LALT);
+            is_alt_tab_active = false;
+        }
+    }
+}
diff --git a/keyboards/nopunin10did/kastenwagen1840/keymaps/default48/keymap.c b/keyboards/nopunin10did/kastenwagen1840/keymaps/default48/keymap.c
new file mode 100644
index 0000000000..ca6b66d59c
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen1840/keymaps/default48/keymap.c
@@ -0,0 +1,93 @@
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define L2_SPC      LT(2,KC_SPC)
+#define L3_SPC      LT(3,KC_SPC)
+#define RWINALT     RALT_T(KC_RGUI)
+#define ISO_LT      KC_NUBS
+#define ISO_GT      LSFT(KC_NUBS)
+
+bool is_alt_tab_active = false;
+uint16_t alt_tab_timer = 0;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_48(
+
+    KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_BSPC      , KC_DEL ,
+    KC_TAB   ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_ENT     , KC_PGUP,
+    KC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC ,KC_UP , KC_PGDN,
+    KC_LCTL  ,KC_LALT  ,MO(2)  ,L2_SPC               ,L3_SPC           ,MO(3)  ,RWINALT  ,MO(1)   ,KC_LEFT,KC_DOWN,KC_RGHT 
+    ),
+[1] = LAYOUT_48(
+    RESET  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_INS ,
+    KC_CAPS  ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX    , KC_HOME,
+    _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,
+    KC_RCTL  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END  
+    ),
+[2] = LAYOUT_48(
+    KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL       , XXXXXXX,
+    KC_TILD  ,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_UNDS,KC_LBRC,KC_RBRC,KC_BSLS    , XXXXXXX,
+    _______      ,ISO_LT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,
+    _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX 
+    ),
+[3] = LAYOUT_48(
+    KC_TILD,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,KC_PLUS      , XXXXXXX,
+    _______  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_LCBR,KC_RCBR,KC_PIPE    , XXXXXXX,
+    _______      ,ISO_GT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,
+    _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX 
+    )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        }
+        else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            if (!is_alt_tab_active) {
+                is_alt_tab_active = true;
+                register_code(KC_LALT);
+            }
+            alt_tab_timer = timer_read();
+            tap_code16(KC_TAB);
+        }
+        else {
+            alt_tab_timer = timer_read();
+            tap_code16(S(KC_TAB));
+        }
+    }
+    
+    return false;
+}
+
+void matrix_scan_user(void) {
+    
+    if (is_alt_tab_active) {
+        if (timer_elapsed(alt_tab_timer) > 1250) {
+            unregister_code(KC_LALT);
+            is_alt_tab_active = false;
+        }
+    }
+}
diff --git a/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c b/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b9e9ad1511
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define L2_SPC      LT(2,KC_SPC)
+#define L3_SPC      LT(3,KC_SPC)
+#define L3_PENT     LT(3,KC_PENT)
+#define RWINALT     RALT_T(KC_RGUI)
+#define ISO_LT      KC_NUBS
+#define ISO_GT      LSFT(KC_NUBS)
+
+bool is_alt_tab_active = false;
+uint16_t alt_tab_timer = 0;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_1840(
+
+    KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_BSPC      , KC_P7  ,KC_P8  ,KC_P9  ,KC_PMNS,
+    KC_TAB   ,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_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,
+    KC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC ,KC_UP , KC_P1  ,KC_P2  ,KC_P3  ,KC_PAST,
+    KC_LCTL  ,KC_LALT  ,MO(2)  ,L2_SPC               ,L3_SPC           ,MO(3)  ,RWINALT  ,MO(1)   ,KC_LEFT,KC_DOWN,KC_RGHT,KC_P0  ,KC_PDOT,L3_PENT  
+    ),
+[1] = LAYOUT_1840(
+    RESET  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_HOME,XXXXXXX,KC_PGUP,XXXXXXX,
+    KC_CAPS  ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX    , XXXXXXX,XXXXXXX,XXXXXXX,KC_PAST,
+    _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,XXXXXXX,KC_PGDN,KC_PSLS,
+    KC_RCTL  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END ,KC_INS ,KC_DEL ,KC_EQL   
+    ),
+[2] = LAYOUT_1840(
+    KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL       , XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+    KC_TILD  ,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_UNDS,KC_LBRC,KC_RBRC,KC_BSLS    , XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+    _______      ,ISO_LT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+    _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX  
+    ),
+[3] = LAYOUT_1840(
+    KC_TILD,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,KC_PLUS      , KC_NLCK,KC_PSLS,KC_PAST,XXXXXXX,
+    _______  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_LCBR,KC_RCBR,KC_PIPE    , KC_PSCR,KC_SLCK,KC_PAUS,XXXXXXX,
+    _______      ,ISO_GT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
+    _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______  
+    )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        }
+        else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            if (!is_alt_tab_active) {
+                is_alt_tab_active = true;
+                register_code(KC_LALT);
+            }
+            alt_tab_timer = timer_read();
+            tap_code16(KC_TAB);
+        }
+        else {
+            alt_tab_timer = timer_read();
+            tap_code16(S(KC_TAB));
+        }
+    }
+    
+    return false;
+}
+
+void matrix_scan_user(void) {
+    
+    if (is_alt_tab_active) {
+        if (timer_elapsed(alt_tab_timer) > 1250) {
+            unregister_code(KC_LALT);
+            is_alt_tab_active = false;
+        }
+    }
+}
diff --git a/keyboards/nopunin10did/kastenwagen1840/keymaps/via/rules.mk b/keyboards/nopunin10did/kastenwagen1840/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen1840/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/nopunin10did/kastenwagen1840/readme.md b/keyboards/nopunin10did/kastenwagen1840/readme.md
new file mode 100644
index 0000000000..e70890b48d
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen1840/readme.md
@@ -0,0 +1,32 @@
+# Kastenwagen 1840
+
+![Kastenwagen 1840](https://diplomacyvariants.files.wordpress.com/2022/01/late-harvest-on-kastenwagen.png)
+
+Kastenwagen 1840 is a 40% keyboard with a mini-numpad and dedicated arrows.  The main alpha block is 13.75u long, allowing for more dedicated punctuation keys to be paired with common Minivan-like mod keys.
+
+A second model of Kastenwagen, the [Kastenwagen 48](https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/kastenwagen48), is similar but replaces the numpad with a three-key macro column.
+
+Please note that the Kastenwagen 1840 via-compatible keymap firmware is also compatible with the Kastenwagen 48.  The Kastenwagen 48 does not have a dedicated via-compatible firmware.
+
+For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w).
+
+* Keyboard Maintainer: [Alex Ronke](diplomacyvariants.wordpress.com), also known as NoPunIn10Did. 
+* Hardware Supported: Kastenwagen 1840 & 48 (2021 June)
+* Hardware Availability: Currently by request only
+
+To jump the bootloader, either:
+* If loaded with the default layout, use Function-Escape *(the function button is the farthest righthand 1.25u on the bottom row)* **OR**
+* Use the physical reset switch on the Elite C **OR**
+* Briefly jump the Reset and Ground pins of the Elite C
+
+Make example for the 1840 model (after setting up your build environment):
+
+    make nopunin10did/kastenwagen1840:default
+    
+Make example for the 48 model:
+
+    make nopunin10did/kastenwagen48: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).
+
+![Kastenwagen Default Layouts](https://diplomacyvariants.files.wordpress.com/2022/01/kastenwagen-default-layouts.png)
\ No newline at end of file
diff --git a/keyboards/nopunin10did/kastenwagen1840/rules.mk b/keyboards/nopunin10did/kastenwagen1840/rules.mk
new file mode 100644
index 0000000000..61eb7eafb0
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen1840/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+ENCODER_ENABLE = yes        # Enable rotary encoder input
diff --git a/keyboards/nopunin10did/kastenwagen48/config.h b/keyboards/nopunin10did/kastenwagen48/config.h
new file mode 100644
index 0000000000..f88a630cfd
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen48/config.h
@@ -0,0 +1,51 @@
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID           0x4E50  // "NP"
+#define PRODUCT_ID          0x4B30  // Hex for "K" and 48
+#define DEVICE_VER          0x0001
+#define MANUFACTURER        NoPunIn10Did
+#define PRODUCT             Kastenwagen 48
+
+/* key matrix size */
+#define MATRIX_ROWS         8
+#define MATRIX_COLS         8
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS     { B4, B5, B7, D5, C7, F1, F0, B6 }
+#define MATRIX_COL_PINS     { F4, F5, F6, F7, B1, B3, B2, E6 }
+#define UNUSED_PINS
+
+/* Indicator LEDs */
+#define LED_INDICATOR_TOP   B0
+#define LED_INDICATOR_MID   D4
+#define LED_INDICATOR_BOT   C6
+
+/* Rotary encoder rotation pins */
+#define ENCODERS_PAD_A      { D0, D3 }
+#define ENCODERS_PAD_B      { D1, D2 }
+
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION     COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE            5
diff --git a/keyboards/nopunin10did/kastenwagen48/info.json b/keyboards/nopunin10did/kastenwagen48/info.json
new file mode 100644
index 0000000000..bccfbeb36d
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen48/info.json
@@ -0,0 +1,65 @@
+{
+    "keyboard_name": "Kastenwagen 48",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/kastenwagen48",
+    "maintainer": "NoPunIn10Did",
+    "manufacturer": "NoPunIn10Did",
+    "layouts": {
+        "LAYOUT_48": {
+            "layout": [
+                {"x":0   ,  "y":0,    "label":"Esc"},
+                {"x":1   ,  "y":0,    "label":"Q"},
+                {"x":2   ,  "y":0,    "label":"W"},
+                {"x":3   ,  "y":0,    "label":"E"},
+                {"x":4   ,  "y":0,    "label":"R"},
+                {"x":5   ,  "y":0,    "label":"T"},
+                {"x":6   ,  "y":0,    "label":"Y"},
+                {"x":7   ,  "y":0,    "label":"U"},
+                {"x":8   ,  "y":0,    "label":"I"},
+                {"x":9   ,  "y":0,    "label":"O"},
+                {"x":10  ,  "y":0,    "label":"P"},
+                {"x":11  ,  "y":0,    "label":"L Bracket"},
+                {"x":12  ,  "y":0,    "label":"Backspace", "w":1.75},
+                {"x":14.25, "y":0,    "label":"Delete"},
+                {"x":0   ,  "y":1,    "label":"Tab", "w":1.25},
+                {"x":1.25,  "y":1,    "label":"A"},
+                {"x":2.25,  "y":1,    "label":"S"},
+                {"x":3.25,  "y":1,    "label":"D"},
+                {"x":4.25,  "y":1,    "label":"F"},
+                {"x":5.25,  "y":1,    "label":"G"},
+                {"x":6.25,  "y":1,    "label":"H"},
+                {"x":7.25,  "y":1,    "label":"J"},
+                {"x":8.25,  "y":1,    "label":"K"},
+                {"x":9.25,  "y":1,    "label":"L"},
+                {"x":10.25, "y":1,    "label":"Semicolon"},
+                {"x":11.25, "y":1,    "label":"Quote"},
+                {"x":12.25, "y":1,    "label":"Enter", "w":1.5},
+                {"x":14.25, "y":1,    "label":"Pg Up"},
+                {"x":0   ,  "y":2,    "label":"Left Shift", "w":1.75},
+                {"x":1.75,  "y":2,    "label":"Z"},
+                {"x":2.75,  "y":2,    "label":"X"},
+                {"x":3.75,  "y":2,    "label":"C"},
+                {"x":4.75,  "y":2,    "label":"V"},
+                {"x":5.75,  "y":2,    "label":"B"},
+                {"x":6.75,  "y":2,    "label":"N"},
+                {"x":7.75,  "y":2,    "label":"M"},
+                {"x":8.75,  "y":2,    "label":"Comma"},
+                {"x":9.75,  "y":2,    "label":"Period"},
+                {"x":10.75, "y":2,    "label":"Slash"},
+                {"x":11.75, "y":2,    "label":"Right Shift", "w":1.25},
+                {"x":13.125,"y":2.125,"label":"Up"},
+                {"x":14.25, "y":2,    "label":"Pg Dn"},
+                {"x":0    , "y":3,    "label":"Left Ctrl", "w":1.25},
+                {"x":1.25 , "y":3,    "label":"Left Alt", "w":1.25},
+                {"x":2.5  , "y":3,    "label":"MO(2)"},
+                {"x":3.5  , "y":3,    "label":"Space", "w":2.75},
+                {"x":6.25 , "y":3,    "label":"Space", "w":2.25},
+                {"x":8.5  , "y":3,    "label":"MO(3)"},
+                {"x":9.5  , "y":3,    "label":"R Win / Alt Gr", "w":1.25},
+                {"x":10.75, "y":3,    "label":"MO(1)", "w":1.25},
+                {"x":12.125,"y":3.125,"label":"Left"},
+                {"x":13.125,"y":3.125,"label":"Down"},
+                {"x":14.125,"y":3.125,"label":"Right"}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nopunin10did/kastenwagen48/kastenwagen48.c b/keyboards/nopunin10did/kastenwagen48/kastenwagen48.c
new file mode 100644
index 0000000000..9cce6ac2e3
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen48/kastenwagen48.c
@@ -0,0 +1,60 @@
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "kastenwagen48.h"
+
+#ifndef LAYER_LED_DISABLE
+
+void keyboard_pre_init_kb(void) {
+    setPinOutput(LED_INDICATOR_TOP);
+    setPinOutput(LED_INDICATOR_MID);
+    setPinOutput(LED_INDICATOR_BOT);
+    keyboard_pre_init_user();
+}
+
+__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
+    writePinHigh(LED_INDICATOR_TOP);
+    writePinHigh(LED_INDICATOR_MID);
+    writePinHigh(LED_INDICATOR_BOT);
+
+    switch(get_highest_layer(state) % 4) {
+    case 1:
+        writePinLow(LED_INDICATOR_TOP);
+        writePinLow(LED_INDICATOR_MID);
+        break;
+    case 2:
+        writePinLow(LED_INDICATOR_TOP);
+        writePinLow(LED_INDICATOR_BOT);
+        break;
+    case 3:
+        writePinLow(LED_INDICATOR_MID);
+        writePinLow(LED_INDICATOR_BOT);
+        break;
+    }
+    return state;
+}
+
+#endif
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+   if (!encoder_update_user(index, clockwise)) { return false; }
+   if (clockwise) {
+       tap_code(KC_PGUP);
+   } else {
+       tap_code(KC_PGUP);
+   }
+   return true;
+};
diff --git a/keyboards/nopunin10did/kastenwagen48/kastenwagen48.h b/keyboards/nopunin10did/kastenwagen48/kastenwagen48.h
new file mode 100644
index 0000000000..8f948fca6a
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen48/kastenwagen48.h
@@ -0,0 +1,36 @@
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_48( \
+K100  , K101  , K110  , K111  , K120  , K121  , K130  , K131  , K140  , K141  , K150  , K151  , K160        ,   K170  , \
+K202    , K203  , K212  , K213  , K222  , K223  , K232  , K233  , K242  , K243  , K252  , K253  , K262      ,   K272  , \
+K304        , K305  , K314  , K315  , K324  , K325  , K334  , K335  , K344  , K345  , K354  , K355    , K364  , K374  , \
+K406    , K407    , K416  , K417                , K437            , K446  , K447    , K456    ,  K457 , K467 , K476     \
+) \
+{ \
+	{ K100 , K110 , K120 , K130 , K140 , K150 , K160 , K170  }, \
+	{ K101 , K111 , K121 , K131 , K141 , K151 , KC_NO, KC_NO }, \
+	{ K202 , K212 , K222 , K232 , K242 , K252 , K262 , K272  }, \
+	{ K203 , K213 , K223 , K233 , K243 , K253 , KC_NO, KC_NO }, \
+	{ K304 , K314 , K324 , K334 , K344 , K354 , K364 , K374  }, \
+	{ K305 , K315 , K325 , K335 , K345 , K355 , KC_NO, KC_NO }, \
+	{ K406 , K416 , KC_NO, KC_NO, K446 , K456 , KC_NO, K476  }, \
+	{ K407 , K417 , KC_NO, K437 , K447 , K457 , K467 , KC_NO } \
+}
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c b/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ca6b66d59c
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c
@@ -0,0 +1,93 @@
+/* Copyright 2022 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define L2_SPC      LT(2,KC_SPC)
+#define L3_SPC      LT(3,KC_SPC)
+#define RWINALT     RALT_T(KC_RGUI)
+#define ISO_LT      KC_NUBS
+#define ISO_GT      LSFT(KC_NUBS)
+
+bool is_alt_tab_active = false;
+uint16_t alt_tab_timer = 0;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_48(
+
+    KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_BSPC      , KC_DEL ,
+    KC_TAB   ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_ENT     , KC_PGUP,
+    KC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC ,KC_UP , KC_PGDN,
+    KC_LCTL  ,KC_LALT  ,MO(2)  ,L2_SPC               ,L3_SPC           ,MO(3)  ,RWINALT  ,MO(1)   ,KC_LEFT,KC_DOWN,KC_RGHT 
+    ),
+[1] = LAYOUT_48(
+    RESET  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_INS ,
+    KC_CAPS  ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX    , KC_HOME,
+    _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,
+    KC_RCTL  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END  
+    ),
+[2] = LAYOUT_48(
+    KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL       , XXXXXXX,
+    KC_TILD  ,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_UNDS,KC_LBRC,KC_RBRC,KC_BSLS    , XXXXXXX,
+    _______      ,ISO_LT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,
+    _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX 
+    ),
+[3] = LAYOUT_48(
+    KC_TILD,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,KC_PLUS      , XXXXXXX,
+    _______  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_LCBR,KC_RCBR,KC_PIPE    , XXXXXXX,
+    _______      ,ISO_GT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,
+    _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX 
+    )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        }
+        else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            if (!is_alt_tab_active) {
+                is_alt_tab_active = true;
+                register_code(KC_LALT);
+            }
+            alt_tab_timer = timer_read();
+            tap_code16(KC_TAB);
+        }
+        else {
+            alt_tab_timer = timer_read();
+            tap_code16(S(KC_TAB));
+        }
+    }
+    
+    return false;
+}
+
+void matrix_scan_user(void) {
+    
+    if (is_alt_tab_active) {
+        if (timer_elapsed(alt_tab_timer) > 1250) {
+            unregister_code(KC_LALT);
+            is_alt_tab_active = false;
+        }
+    }
+}
diff --git a/keyboards/nopunin10did/kastenwagen48/readme.md b/keyboards/nopunin10did/kastenwagen48/readme.md
new file mode 100644
index 0000000000..f6db1aa410
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen48/readme.md
@@ -0,0 +1,28 @@
+# Kastenwagen 48
+
+![Kastenwagen 48](https://diplomacyvariants.files.wordpress.com/2022/01/kastenwagen-48-concept-art.png)
+
+Kastenwagen 48 is a 40% keyboard with a macro column and dedicated arrows.  The main alpha block is 13.75u long, allowing for more dedicated punctuation keys to be paired with common Minivan-like mod keys.
+
+A second model of Kastenwagen, the [Kastenwagen 1840](https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/kastenwagen1840), is similar but replaces the macro column with a mini-numpad.
+
+Please note that the Kastenwagen 1840 via-compatible keymap firmware is also compatible with the Kastenwagen 48.  The Kastenwagen 48 does not have a dedicated via-compatible firmware.
+
+For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w).
+
+* Keyboard Maintainer: [Alex Ronke](diplomacyvariants.wordpress.com), also known as NoPunIn10Did. 
+* Hardware Supported: Kastenwagen 48 (2021 June)
+* Hardware Availability: Currently by request only
+
+To jump the bootloader, either:
+* If loaded with the default layout, use Function-Escape *(the function button is the farthest righthand 1.25u on the bottom row)* **OR**
+* Use the physical reset switch on the Elite C **OR**
+* Briefly jump the Reset and Ground pins of the Elite C
+    
+Make example for the 48 model:
+
+    make nopunin10did/kastenwagen48:default48
+
+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).
+
+![Kastenwagen Default Layouts](https://diplomacyvariants.files.wordpress.com/2022/01/kastenwagen-default-layouts.png)
\ No newline at end of file
diff --git a/keyboards/nopunin10did/kastenwagen48/rules.mk b/keyboards/nopunin10did/kastenwagen48/rules.mk
new file mode 100644
index 0000000000..61eb7eafb0
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen48/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+ENCODER_ENABLE = yes        # Enable rotary encoder input

From ec7c3ac12dbc355218bae9c392e96b8d513fb95d Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 10 Jan 2022 14:57:36 -0800
Subject: [PATCH 198/867] Optimize initialization of PMW3360 Sensor (#15821)

---
 docs/feature_pointing_device.md | 15 ++++++++-------
 drivers/sensors/pmw3360.c       |  4 ++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index b1015f3cd3..ecf6d5c6d4 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -144,13 +144,14 @@ The PMW 3360 is an SPI driven optical sensor, that uses a built in IR LED for su
 
 | Setting                     | Description                                                                                | Default       |
 |-----------------------------|--------------------------------------------------------------------------------------------|---------------|
-|`PMW3360_CS_PIN`             | (Required) Sets the Cable Select pin connected to the sensor.                              | _not defined_ |
-|`PMW3360_CLOCK_SPEED`        | (Optional) Sets the clock speed that the sensor runs at.                                   | `2000000`     |
-|`PMW3360_SPI_LSBFIRST`       | (Optional) Sets the Least/Most Significant Byte First setting for SPI.                     | `false`       |
-|`PMW3360_SPI_MODE`           | (Optional) Sets the SPI Mode for the sensor.                                               | `3`           |
-|`PMW3360_SPI_DIVISOR`        | (Optional) Sets the SPI Divisor used for SPI communication.                                | _varies_      |
-|`PMW3360_LIFTOFF_DISTANCE`   | (Optional) Sets the lift off distance at run time                                          | `0x02`        |
-|`ROTATIONAL_TRANSFORM_ANGLE` | (Optional) Allows for the sensor data to be rotated +/- 30 degrees directly in the sensor. | `0`           |
+|`PMW3360_CS_PIN`                 | (Required) Sets the Cable Select pin connected to the sensor.                              | _not defined_ |
+|`PMW3360_CLOCK_SPEED`            | (Optional) Sets the clock speed that the sensor runs at.                                   | `2000000`     |
+|`PMW3360_SPI_LSBFIRST`           | (Optional) Sets the Least/Most Significant Byte First setting for SPI.                     | `false`       |
+|`PMW3360_SPI_MODE`               | (Optional) Sets the SPI Mode for the sensor.                                               | `3`           |
+|`PMW3360_SPI_DIVISOR`            | (Optional) Sets the SPI Divisor used for SPI communication.                                | _varies_      |
+|`PMW3360_LIFTOFF_DISTANCE`       | (Optional) Sets the lift off distance at run time                                          | `0x02`        |
+|`ROTATIONAL_TRANSFORM_ANGLE`     | (Optional) Allows for the sensor data to be rotated +/- 127 degrees directly in the sensor. | `0`           |
+|`PMW3360_LEGACY_FIRMWARE_UPLOAD` | (Optional) Switches to older, manual upload of firmware, for compatibility.                | _not defined_     |
 
 The CPI range is 100-12000, in increments of 100. Defaults to 1600 CPI.
 
diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index ad0a724ee4..4712f6015c 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -209,12 +209,16 @@ void pmw3360_upload_firmware(void) {
     spi_write(REG_SROM_Load_Burst | 0x80);
     wait_us(15);
 
+#ifdef PMW3360_LEGACY_FIRMWARE_UPLOAD
     unsigned char c;
     for (int i = 0; i < FIRMWARE_LENGTH; i++) {
         c = (unsigned char)pgm_read_byte(firmware_data + i);
         spi_write(c);
         wait_us(15);
     }
+#else
+    spi_transmit(firmware_data, sizeof(firmware_data));
+#endif
     wait_us(200);
 
     pmw3360_read(REG_SROM_ID);

From e4f0c7941308281c59140bbc56ef27902a20a49c Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 10 Jan 2022 14:59:33 -0800
Subject: [PATCH 199/867] [Keyboard] Enable RGB Matrix Animations on KBD67
 mkIII ISO (#15808)

---
 keyboards/kbdfans/kbd67/mkiirgb_iso/config.h | 67 +++++++++++++++++---
 1 file changed, 57 insertions(+), 10 deletions(-)

diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
index 04eb32f6f1..8806624e24 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
@@ -41,22 +41,69 @@
 #define NO_ACTION_FUNCTION
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
-
 #define RGB_DI_PIN C7
 #define RGBLED_NUM 68
 #define DRIVER_LED_TOTAL RGBLED_NUM
 #define RGBLIGHT_ANIMATIONS
 
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
-#define RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 8
-#define RGB_MATRIX_VAL_STEP 8
-#define RGB_MATRIX_SPD_STEP 10
+#    define RGB_MATRIX_KEYPRESSES           // reacts to keypresses
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_HUE_STEP 8
+#    define RGB_MATRIX_SAT_STEP 8
+#    define RGB_MATRIX_VAL_STEP 8
+#    define RGB_MATRIX_SPD_STEP 10
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+// #define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+// #define ENABLE_RGB_MATRIX_SPLASH
+// #define ENABLE_RGB_MATRIX_MULTISPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #endif
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

From 028463991332348fa355e399721a9215588e496c Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 10 Jan 2022 14:59:51 -0800
Subject: [PATCH 200/867] [Keyboard] Fix compiled size for Kudox Full keyboard
 (#15809)

---
 keyboards/kudox_full/rules.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/kudox_full/rules.mk b/keyboards/kudox_full/rules.mk
index 57aa49a6d8..5250547b66 100644
--- a/keyboards/kudox_full/rules.mk
+++ b/keyboards/kudox_full/rules.mk
@@ -7,17 +7,17 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 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
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes        # Unicode
+LTO_ENABLE = yes
 
 SPLIT_KEYBOARD = yes
 

From 9bcb33f0daec233d02dddaea566442a825e5e307 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 10 Jan 2022 15:00:08 -0800
Subject: [PATCH 201/867] [Keyboard] Fix compilation issues for Dygma Raise
 (#15810)

---
 keyboards/handwired/dygma/raise/rules.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk
index a316e1af17..0fd9955715 100644
--- a/keyboards/handwired/dygma/raise/rules.mk
+++ b/keyboards/handwired/dygma/raise/rules.mk
@@ -28,3 +28,5 @@ RAW_ENABLE = yes
 
 QUANTUM_LIB_SRC += i2c_master.c
 SRC += leds.c matrix.c
+
+DEFAULT_FOLDER = handwired/dygma/raise/ansi

From 5470e4a8add89a2e413a3c3994e856fff1c99ab9 Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Tue, 11 Jan 2022 00:01:20 +0100
Subject: [PATCH 202/867] [Core] ChibiOS: shorten USB disconnect state on boot
 to 50ms (#15805)

---
 tmk_core/protocol/chibios/usb_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index ac46a9312b..541c44b574 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -734,7 +734,7 @@ void init_usb_driver(USBDriver *usbp) {
      * after a reset.
      */
     usbDisconnectBus(usbp);
-    wait_ms(1500);
+    wait_ms(50);
     usbStart(usbp, &usbcfg);
     usbConnectBus(usbp);
 

From 8f630c17b9a6bc6286cbe4435c66033720182803 Mon Sep 17 00:00:00 2001
From: FearlessSpiff <fearless.spiff@me.com>
Date: Tue, 11 Jan 2022 00:01:32 +0100
Subject: [PATCH 203/867] [Keymap] Add Fearless Spiff keymap for Mechwild
 Mercutio based on Bongocat and Jonavin (#15802)

---
 .../mercutio/keymaps/fearless_spiff/config.h  |  19 ++
 .../mercutio/keymaps/fearless_spiff/keymap.c  | 293 ++++++++++++++++++
 .../mercutio/keymaps/fearless_spiff/readme.md |  24 ++
 .../mercutio/keymaps/fearless_spiff/rules.mk  |   7 +
 4 files changed, 343 insertions(+)
 create mode 100644 keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h
 create mode 100644 keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
 create mode 100644 keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md
 create mode 100644 keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk

diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h
new file mode 100644
index 0000000000..9d588ed8c0
--- /dev/null
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 Fearless Spiff
+ *
+ * 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 TAPPING_TERM 180
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
new file mode 100644
index 0000000000..ada92103c3
--- /dev/null
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
@@ -0,0 +1,293 @@
+/* Copyright 2021 Kyle McCreery
+ * Copyright 2021 Jonavin Eng
+ * Copyright 2022 Fearless Spiff
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keymap_german.h"
+
+// OLED setup for bongocat
+#define IDLE_FRAMES 5
+#define IDLE_SPEED 30
+#define TAP_FRAMES 2
+#define TAP_SPEED 40
+#define ANIM_FRAME_DURATION 200
+#define ANIM_SIZE 512
+
+#define LABEL_LENGTH 8
+
+#define KC_CAD	        LALT(LCTL(KC_DEL))
+#define KC_TEAMS_CAM	C(S(KC_O))
+#define KC_TEAMS_MUTE	C(S(KC_M))
+
+enum layers {
+  QWERT,
+  FN_1,
+  FN_2
+};
+
+enum custom_user_keycodes {
+  KC_ENC = SAFE_RANGE
+};
+
+static long int oled_timeout = 1800000; //  30 minutes
+bool gui_on = true;
+char wpm_str[10];
+uint32_t anim_timer = 0;
+uint32_t anim_sleep = 0;
+uint8_t current_idle_frame = 0;
+uint8_t current_tap_frame = 0;
+
+// Tap Dance declarations
+enum {
+    TD_TAB_ESC,
+};
+
+// Tap Dance definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    // Tap once for Tab, twice for Esc
+    [TD_TAB_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, KC_ESC),
+};
+
+typedef struct {
+    char label_top[LABEL_LENGTH];
+    char label_mid[LABEL_LENGTH];
+    char label_bottom[LABEL_LENGTH];
+    uint16_t keycode;
+} encoder_key;
+
+static const encoder_key PROGMEM encoder_keys[] = {
+    // list of key codes that will be scrolled through by encoder and description
+    // Be aware that it only works when using one char less than defined. In this case 7 max. No idea why?
+    {"Teams", "Toggle", "Mic", KC_TEAMS_MUTE},
+    {"Teams", "Toggle", "Cam", KC_TEAMS_CAM},
+    {"Ctrl", "Alt", "Del", KC_CAD},
+    {"Caps", "Lock", "", KC_CAPSLOCK},
+    {"Pause", "", "", KC_PAUSE},
+    {"PrtScr", "", "", KC_PSCR},
+    {"Insert", "", "", KC_INS},
+    {"Play", "", "", KC_MEDIA_PLAY_PAUSE}
+};
+
+#define NUMBER_OF_ENCODER_KEYS sizeof(encoder_keys)/sizeof(encoder_keys[0])
+
+static uint8_t selected_encoder_key_id = 0;
+static encoder_key selected_encoder_key;
+
+static void set_selected_encoder_key(uint8_t idx) {
+    // make a copy from PROGMEM
+    memcpy_P (&selected_encoder_key, &encoder_keys[idx], sizeof selected_encoder_key);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_ENC:
+            if (record->event.pressed) {
+                tap_code16(selected_encoder_key.keycode);
+            }
+        break;
+    }
+    return true;
+}
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [QWERT] = LAYOUT_all(
+                                                                                                                      KC_ENC,
+          TD(TD_TAB_ESC),   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    DE_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+          MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    DE_PLUS,          KC_ENT,
+          KC_LSFT, DE_LABK, DE_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,           KC_RSFT,
+          KC_LCTL, KC_LGUI, KC_LALT,   LT(2,KC_SPC),  LT(2,KC_SPC),   LT(2,KC_SPC),        KC_RALT, DE_MINS,          KC_RCTL ),
+
+    [FN_1] = LAYOUT_all(
+                                                                                                                       KC_MUTE,
+    	  KC_GESC,          _______, _______, _______, DE_LCBR, DE_RCBR, _______, DE_UDIA, KC_UP,    DE_ODIA, DE_QUES, KC_DEL,
+    	  _______,          DE_ADIA, DE_SS,   _______, DE_LPRN, DE_RPRN, _______, KC_LEFT, KC_DOWN, KC_RIGHT, DE_HASH, _______,
+    	  _______, DE_CIRC, DE_ACUT, _______, _______, DE_LBRC, DE_RBRC, KC_HOME, KC_END,  DE_QUOT,  DE_DQUO,          DE_EQL,
+    	  _______,   _______, _______,          _______, _______,          _______,          DE_BSLS, DE_SLSH,         DE_TILD ),
+
+    [FN_2] = LAYOUT_all(
+                                                                                                                      _______,
+    	  KC_F1,            KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_BSPC,
+    	  KC_1,             KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______,
+    	  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT,           _______,
+    	  _______, _______, _______,          _______, _______,          _______,          _______, _______,          _______ )
+};
+
+#ifdef ENCODER_ENABLE
+    bool encoder_update_user(uint8_t index, bool clockwise) {
+        if (clockwise) {
+            if (IS_LAYER_ON(QWERT) && selected_encoder_key_id  < NUMBER_OF_ENCODER_KEYS-1) {
+               selected_encoder_key_id ++;
+               set_selected_encoder_key(selected_encoder_key_id);
+            }
+            if (IS_LAYER_ON(FN_1)) {
+                tap_code16(KC_PGDOWN);
+            }
+            if (IS_LAYER_ON(FN_2)) {
+                tap_code(KC_VOLU);
+            }
+        } else {
+            if (IS_LAYER_ON(QWERT) && selected_encoder_key_id  > 0) {
+                selected_encoder_key_id --;
+                set_selected_encoder_key(selected_encoder_key_id);
+            }
+            if (IS_LAYER_ON(FN_1)) {
+                tap_code16(KC_PGUP);
+            }
+            if (IS_LAYER_ON(FN_2)) {
+                tap_code(KC_VOLD);
+            }
+        }
+        return true;
+    }
+#endif
+
+#ifdef OLED_ENABLE
+    oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+        set_selected_encoder_key(selected_encoder_key_id);
+
+        return OLED_ROTATION_180;  // flips the display 180 degrees
+    }
+
+    static void render_anim(void) {
+
+        // Idle animation
+        static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
+
+            {
+                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
+                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
+                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+            },
+
+            {
+                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
+                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
+                7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+            },
+
+            {
+                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
+                32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
+                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+            },
+
+            {
+                0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
+                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
+                7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+            },
+
+            {
+                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
+                32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
+                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+            }
+
+        };
+
+        // Prep animation
+        static const char PROGMEM prep[][ANIM_SIZE] = {
+
+            {
+                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
+                64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
+                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+            }
+
+        };
+
+        // Typing animation
+        static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
+
+            {
+                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
+                95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
+                1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+            },
+
+            {
+                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
+                32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
+                0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+            }
+
+        };
+
+        void animation_phase(void) {
+            if (get_current_wpm() <= IDLE_SPEED) {
+                current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+                oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
+            }
+
+            if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
+                oled_write_raw_P(prep[0], ANIM_SIZE);
+            }
+
+            if (get_current_wpm() >= TAP_SPEED) {
+                current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+                oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
+            }
+        }
+
+        if (get_current_wpm() != 000) {
+            oled_on();
+
+            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+                anim_timer = timer_read32();
+                animation_phase();
+            }
+
+            anim_sleep = timer_read32();
+        } else {
+            if (timer_elapsed32(anim_sleep) > oled_timeout) {
+                oled_off();
+            } else {
+                if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+                    anim_timer = timer_read32();
+                    animation_phase();
+                }
+            }
+        }
+    }
+
+    bool oled_task_user(void) {
+
+            render_anim();
+
+            oled_set_cursor(0,0);
+            oled_write(selected_encoder_key.label_top, false);
+
+            oled_set_cursor(0,1);
+            oled_write(selected_encoder_key.label_mid, false);
+
+            oled_set_cursor(0,2);
+            oled_write(selected_encoder_key.label_bottom, false);
+
+    /* hide wpm display for now
+            oled_set_cursor(13,3);
+            oled_write_P(PSTR("WPM: "), false);
+            oled_write(get_u8_str(get_current_wpm(), ' '), false);
+    */
+
+      return true;
+    }
+
+    void suspend_power_down_user(void) {
+          oled_off();
+    }
+#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md
new file mode 100644
index 0000000000..33240ffbcd
--- /dev/null
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md
@@ -0,0 +1,24 @@
+Fearless Spiff's Custom Mercutio Keymap
+  - "Programmer"-centric and German layout based keymap
+  - Based on Bongocat and Jonavin keymap
+
+Features
+  - Fancy Bongocat! Yay! (borrowed from bongocat obviously)
+  - Encoder selectable key codes and displayed on OLED (borrowed and multi-line-enhanced from Jonavin)
+    - Change encoder_keys in keymap.c to assign your desired key selection
+  - Additional encoder functionality 
+    - While holding FN_1, page up and down
+    - While holding FN_2, volume up and down
+  - Use my templates for your own layout overview at [Keyboard Layout Editor](http://www.keyboard-layout-editor.com) using my gist [here](https://gist.github.com/FearlessSpiff)
+
+QWERT Layer
+![image](https://user-images.githubusercontent.com/1927259/148683284-04932e15-a34d-451e-b657-335780033f36.png)
+
+FN_1 Layer
+![image](https://user-images.githubusercontent.com/1927259/148683299-f2c80403-3f29-4ba8-9fc4-957729f30b05.png)
+
+FN_2 layer
+![image](https://user-images.githubusercontent.com/1927259/148683306-364bc59c-b41b-4092-b93b-d7b4fc58567b.png)
+
+
+
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk
new file mode 100644
index 0000000000..16f26944e8
--- /dev/null
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk
@@ -0,0 +1,7 @@
+WPM_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+VIA_ENABLE = no
+MOUSEKEY_ENABLE = no
+EXTRAKEY_ENABLE = yes # Audio control and System control
+KEY_LOCK_ENABLE = no
+CONSOLE_ENABLE = no

From cfabc3b028f5c4dcb03cadfd99d98beca0f59b14 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 11 Jan 2022 07:01:44 +0800
Subject: [PATCH 204/867] Add layout for split 3x5_2 (#15800)

---
 .../split_3x5_2/default_split_3x5_2/keymap.c  | 23 ++++++++
 layouts/default/split_3x5_2/info.json         | 52 +++++++++++++++++++
 layouts/default/split_3x5_2/layout.json       | 11 ++++
 layouts/default/split_3x5_2/readme.md         |  5 ++
 4 files changed, 91 insertions(+)
 create mode 100644 layouts/default/split_3x5_2/default_split_3x5_2/keymap.c
 create mode 100644 layouts/default/split_3x5_2/info.json
 create mode 100644 layouts/default/split_3x5_2/layout.json
 create mode 100644 layouts/default/split_3x5_2/readme.md

diff --git a/layouts/default/split_3x5_2/default_split_3x5_2/keymap.c b/layouts/default/split_3x5_2/default_split_3x5_2/keymap.c
new file mode 100644
index 0000000000..68ffd797a7
--- /dev/null
+++ b/layouts/default/split_3x5_2/default_split_3x5_2/keymap.c
@@ -0,0 +1,23 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+      * ┌───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┐
+      * │ Q │ W │ E │ R │ T │       │ Y │ U │ I │ O │ P │
+      * ├───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┤
+      * │ A │ S │ D │ F │ G │       │ H │ J │ K │ L │ ; │
+      * ├───┼───┼───┼───┼───┤       ├───┼───┼───┼───┼───┤
+      * │ Z │ X │ C │ V │ B │       │ N │ M │ , │ . │ / │
+      * └───┴───┴───┴───┴───┘       └───┴───┴───┴───┴───┘
+      *               ┌───┐           ┌───┐
+      *               │Bsp├───┐   ┌───┤Ent│
+      *               └───┤Tab│   │Spc├───┘
+      *                   └───┘   └───┘
+      */
+    [0] = LAYOUT_split_3x5_2(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
+        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                               KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+                                            KC_BSPC, KC_TAB,           KC_SPC,  KC_ENT
+    )
+};
diff --git a/layouts/default/split_3x5_2/info.json b/layouts/default/split_3x5_2/info.json
new file mode 100644
index 0000000000..e253093544
--- /dev/null
+++ b/layouts/default/split_3x5_2/info.json
@@ -0,0 +1,52 @@
+{
+    "keyboard_name": "3x5+2 split layout",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_split_3x5_2": {
+            "layout": [
+                {"x":0, "y":0.25},
+                {"x":1, "y":0.125},
+                {"x":2, "y":0},
+                {"x":3, "y":0.125},
+                {"x":4, "y":0.25},
+
+                {"x":7, "y":0.25},
+                {"x":8, "y":0.125},
+                {"x":9, "y":0},
+                {"x":10, "y":0.125},
+                {"x":11, "y":0.25},
+
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.125},
+                {"x":2, "y":1},
+                {"x":3, "y":1.125},
+                {"x":4, "y":1.25},
+
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.125},
+                {"x":9, "y":1},
+                {"x":10, "y":1.125},
+                {"x":11, "y":1.25},
+
+                {"x":0, "y":2.25},
+                {"x":1, "y":2.125},
+                {"x":2, "y":2},
+                {"x":3, "y":2.125},
+                {"x":4, "y":2.25},
+
+                {"x":7, "y":2.25},
+                {"x":8, "y":2.125},
+                {"x":9, "y":2},
+                {"x":10, "y":2.125},
+                {"x":11, "y":2.25},
+
+                {"x":3.5, "y":3.25},
+                {"x":4.5, "y":3.5},
+
+                {"x":6.5, "y":3.5},
+                {"x":7.5, "y":3.25}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/split_3x5_2/layout.json b/layouts/default/split_3x5_2/layout.json
new file mode 100644
index 0000000000..1b1c3d0001
--- /dev/null
+++ b/layouts/default/split_3x5_2/layout.json
@@ -0,0 +1,11 @@
+[{x:2,a:7},"",{x:6},""],
+[{y:-0.875,x:1},"",{x:1},"",{x:4},"",{x:1},""],
+[{y:-0.875},"",{x:3},"",{x:2},"",{x:3},""],
+[{y:-0.25,x:2},"",{x:6},""],
+[{y:-0.875,x:1},"",{x:1},"",{x:4},"",{x:1},""],
+[{y:-0.875},"",{x:3},"",{x:2},"",{x:3},""],
+[{y:-0.25,x:2},"",{x:6},""],
+[{y:-0.875,x:1},"",{x:1},"",{x:4},"",{x:1},""],
+[{y:-0.875},"",{x:3},"",{x:2},"",{x:3},""],
+[{y:-0.75,x:3.5},"",{x:3},""],
+[{y:-0.75,x:4.5},"",{x:1},""]
diff --git a/layouts/default/split_3x5_2/readme.md b/layouts/default/split_3x5_2/readme.md
new file mode 100644
index 0000000000..5ec829e478
--- /dev/null
+++ b/layouts/default/split_3x5_2/readme.md
@@ -0,0 +1,5 @@
+# split_3x5_2
+
+    LAYOUT_split_3x5_2
+
+Layout for split keyboards with 3x5 keys and two thumb keys per hand. Examples include the Architeuthis Dux, Ferris, and Cradio.

From 0b32bddd65e85fdc32ae03b18696d5432c045076 Mon Sep 17 00:00:00 2001
From: takishim <96878459+takishim@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:02:12 +0900
Subject: [PATCH 205/867] [Keyboard] Add mikeneko65 keyboard (#15792)

Co-authored-by: takishim <tadashi@kishimo.to>
---
 keyboards/mikeneko65/rev3/config.h            | 108 ++++++++++++++++++
 keyboards/mikeneko65/rev3/info.json           |  10 ++
 .../mikeneko65/rev3/keymaps/default/keymap.c  |  38 ++++++
 .../mikeneko65/rev3/keymaps/default/readme.md |   1 +
 .../mikeneko65/rev3/keymaps/via/keymap.c      |  54 +++++++++
 .../mikeneko65/rev3/keymaps/via/rules.mk      |   1 +
 keyboards/mikeneko65/rev3/readme.md           |  23 ++++
 keyboards/mikeneko65/rev3/rev3.c              |  17 +++
 keyboards/mikeneko65/rev3/rev3.h              |  33 ++++++
 keyboards/mikeneko65/rev3/rules.mk            |  18 +++
 keyboards/mikeneko65/rev4/config.h            | 108 ++++++++++++++++++
 keyboards/mikeneko65/rev4/info.json           |  10 ++
 .../mikeneko65/rev4/keymaps/default/keymap.c  |  38 ++++++
 .../mikeneko65/rev4/keymaps/default/readme.md |   1 +
 .../mikeneko65/rev4/keymaps/via/keymap.c      |  54 +++++++++
 .../mikeneko65/rev4/keymaps/via/rules.mk      |   1 +
 keyboards/mikeneko65/rev4/readme.md           |  23 ++++
 keyboards/mikeneko65/rev4/rev4.c              |  17 +++
 keyboards/mikeneko65/rev4/rev4.h              |  33 ++++++
 keyboards/mikeneko65/rev4/rules.mk            |  18 +++
 20 files changed, 606 insertions(+)
 create mode 100644 keyboards/mikeneko65/rev3/config.h
 create mode 100644 keyboards/mikeneko65/rev3/info.json
 create mode 100644 keyboards/mikeneko65/rev3/keymaps/default/keymap.c
 create mode 100644 keyboards/mikeneko65/rev3/keymaps/default/readme.md
 create mode 100644 keyboards/mikeneko65/rev3/keymaps/via/keymap.c
 create mode 100644 keyboards/mikeneko65/rev3/keymaps/via/rules.mk
 create mode 100644 keyboards/mikeneko65/rev3/readme.md
 create mode 100644 keyboards/mikeneko65/rev3/rev3.c
 create mode 100644 keyboards/mikeneko65/rev3/rev3.h
 create mode 100644 keyboards/mikeneko65/rev3/rules.mk
 create mode 100644 keyboards/mikeneko65/rev4/config.h
 create mode 100644 keyboards/mikeneko65/rev4/info.json
 create mode 100644 keyboards/mikeneko65/rev4/keymaps/default/keymap.c
 create mode 100644 keyboards/mikeneko65/rev4/keymaps/default/readme.md
 create mode 100644 keyboards/mikeneko65/rev4/keymaps/via/keymap.c
 create mode 100644 keyboards/mikeneko65/rev4/keymaps/via/rules.mk
 create mode 100644 keyboards/mikeneko65/rev4/readme.md
 create mode 100644 keyboards/mikeneko65/rev4/rev4.c
 create mode 100644 keyboards/mikeneko65/rev4/rev4.h
 create mode 100644 keyboards/mikeneko65/rev4/rules.mk

diff --git a/keyboards/mikeneko65/rev3/config.h b/keyboards/mikeneko65/rev3/config.h
new file mode 100644
index 0000000000..9fffb77c63
--- /dev/null
+++ b/keyboards/mikeneko65/rev3/config.h
@@ -0,0 +1,108 @@
+/* Copyright 2022 takishim
+
+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    0x7934
+#define PRODUCT_ID   0x6D53
+#define DEVICE_VER   0x0001
+#define MANUFACTURER takishim
+#define PRODUCT      Mikeneko 65 V3
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * 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 { E6, B7, F7, F4, F5 }
+#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mikeneko65/rev3/info.json b/keyboards/mikeneko65/rev3/info.json
new file mode 100644
index 0000000000..5eba021804
--- /dev/null
+++ b/keyboards/mikeneko65/rev3/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Mikeneko 65 V3",
+    "url": "https://github.com/takishim/mikeneko65",
+    "maintainer": "takishim",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":0, "y":0.25}, {"x":1, "y":0.25}, {"x":2, "y":0.25}, {"x":3, "y":0.25}, {"x":4, "y":0.25}, {"x":5, "y":0.25}, {"x":6, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.25}, {"x":9, "y":0.25}, {"x":10, "y":0.25}, {"x":11, "y":0.25}, {"x":12, "y":0.25}, {"x":13, "y":0.25}, {"x":14, "y":0.25}, {"x":15, "y":0.25}, {"x":0, "y":1.25, "w":1.5}, {"x":1.5, "y":1.25}, {"x":2.5, "y":1.25}, {"x":3.5, "y":1.25}, {"x":4.5, "y":1.25}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25}, {"x":7.5, "y":1.25}, {"x":8.5, "y":1.25}, {"x":9.5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.25}, {"x":12.5, "y":1.25}, {"x":13.5, "y":1.25, "w":1.5}, {"x":15, "y":1.25}, {"x":0, "y":2.25, "w":1.75}, {"x":1.75, "y":2.25}, {"x":2.75, "y":2.25}, {"x":3.75, "y":2.25}, {"x":4.75, "y":2.25}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25, "w":2.25}, {"x":15, "y":2.25}, {"x":0, "y":3.25, "w":2.25}, {"x":2.25, "y":3.25}, {"x":3.25, "y":3.25}, {"x":4.25, "y":3.25}, {"x":5.25, "y":3.25}, {"x":6.25, "y":3.25}, {"x":7.25, "y":3.25}, {"x":8.25, "y":3.25}, {"x":9.25, "y":3.25}, {"x":10.25, "y":3.25}, {"x":11.25, "y":3.25}, {"x":12.25, "y":3.25, "w":1.75}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25, "w":1.25}, {"x":2.5, "y":4.25, "w":1.25}, {"x":3.75, "y":4.25, "w":6.25}, {"x":10, "y":4.25, "w":1.25}, {"x":11.25, "y":4.25, "w":1.25}, {"x":13, "y":4.25}, {"x":14, "y":4.25}, {"x":15, "y":4.25}]
+        }
+    }
+}
diff --git a/keyboards/mikeneko65/rev3/keymaps/default/keymap.c b/keyboards/mikeneko65/rev3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c40d48f2fe
--- /dev/null
+++ b/keyboards/mikeneko65/rev3/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2022 takishim
+ *
+ * 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 layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_HOME, 
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSPC, KC_END,  
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  KC_PGUP, 
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN, 
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_all(
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_INS,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,          KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/mikeneko65/rev3/keymaps/default/readme.md b/keyboards/mikeneko65/rev3/keymaps/default/readme.md
new file mode 100644
index 0000000000..0771ea1f21
--- /dev/null
+++ b/keyboards/mikeneko65/rev3/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Mikeneko 65 V3
diff --git a/keyboards/mikeneko65/rev3/keymaps/via/keymap.c b/keyboards/mikeneko65/rev3/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6c909b0c97
--- /dev/null
+++ b/keyboards/mikeneko65/rev3/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2022 takishim
+ *
+ * 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 layer_names {
+    _L0,
+    _L1,
+    _L2,
+    _L3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_L0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_HOME, 
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSPC, KC_END,  
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  KC_PGUP, 
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN, 
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_L1] = LAYOUT_all(
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_INS,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,          KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______
+    ),
+    [_L2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______
+    ),
+    [_L3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/mikeneko65/rev3/keymaps/via/rules.mk b/keyboards/mikeneko65/rev3/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mikeneko65/rev3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mikeneko65/rev3/readme.md b/keyboards/mikeneko65/rev3/readme.md
new file mode 100644
index 0000000000..3722c91f25
--- /dev/null
+++ b/keyboards/mikeneko65/rev3/readme.md
@@ -0,0 +1,23 @@
+# Mikeneko 65 V3
+
+A simple 65% keyboard
+
+* Keyboard Maintainer: [takishim](https://github.com/takishim)
+* Hardware Supported: Mikeneko 65 V4
+* Hardware Availability: [Open source on GitHub](https://github.com/takishim/mikeneko65/tree/v3)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mikeneko65/rev3:default
+
+Flashing example for this keyboard:
+
+    make mikeneko65/rev3:default:flash
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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).
diff --git a/keyboards/mikeneko65/rev3/rev3.c b/keyboards/mikeneko65/rev3/rev3.c
new file mode 100644
index 0000000000..8186588033
--- /dev/null
+++ b/keyboards/mikeneko65/rev3/rev3.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 takishim
+ *
+ * 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 "rev3.h"
diff --git a/keyboards/mikeneko65/rev3/rev3.h b/keyboards/mikeneko65/rev3/rev3.h
new file mode 100644
index 0000000000..f6c3792bd3
--- /dev/null
+++ b/keyboards/mikeneko65/rev3/rev3.h
@@ -0,0 +1,33 @@
+/* Copyright 2022 takishim
+ *
+ * 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( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,       k113, k115, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,             k213, k215, \
+    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,       k312, k313, k315, \
+    k400, k401, k402,                   k406,                         k409, k411, k412, k413, k415  \
+) { \
+    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014,  k015 }, \
+    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  KC_NO, k115 }, \
+    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  KC_NO, k215 }, \
+    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  KC_NO, k315 }, \
+    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  KC_NO, k411,  k412,  k413,  KC_NO, k415 }  \
+}
diff --git a/keyboards/mikeneko65/rev3/rules.mk b/keyboards/mikeneko65/rev3/rules.mk
new file mode 100644
index 0000000000..1275531ef6
--- /dev/null
+++ b/keyboards/mikeneko65/rev3/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mikeneko65/rev4/config.h b/keyboards/mikeneko65/rev4/config.h
new file mode 100644
index 0000000000..30ad8e9fa8
--- /dev/null
+++ b/keyboards/mikeneko65/rev4/config.h
@@ -0,0 +1,108 @@
+/* Copyright 2022 takishim
+
+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    0x7934
+#define PRODUCT_ID   0x6D54
+#define DEVICE_VER   0x0001
+#define MANUFACTURER takishim
+#define PRODUCT      Mikeneko 65 V4
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 { D0, D2, D5, C6, C7 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, E6, B0, B7, D4, D6, D7, B4, B5, B6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mikeneko65/rev4/info.json b/keyboards/mikeneko65/rev4/info.json
new file mode 100644
index 0000000000..a0a16b8987
--- /dev/null
+++ b/keyboards/mikeneko65/rev4/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Mikeneko 65 V4",
+    "url": "https://github.com/takishim/mikeneko65",
+    "maintainer": "takishim",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":0, "y":0.25}, {"x":1, "y":0.25}, {"x":2, "y":0.25}, {"x":3, "y":0.25}, {"x":4, "y":0.25}, {"x":5, "y":0.25}, {"x":6, "y":0.25}, {"x":7, "y":0.25}, {"x":8, "y":0.25}, {"x":9, "y":0.25}, {"x":10, "y":0.25}, {"x":11, "y":0.25}, {"x":12, "y":0.25}, {"x":13, "y":0.25, "w":2}, {"x":15, "y":0.25}, {"x":0, "y":1.25, "w":1.5}, {"x":1.5, "y":1.25}, {"x":2.5, "y":1.25}, {"x":3.5, "y":1.25}, {"x":4.5, "y":1.25}, {"x":5.5, "y":1.25}, {"x":6.5, "y":1.25}, {"x":7.5, "y":1.25}, {"x":8.5, "y":1.25}, {"x":9.5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.25}, {"x":12.5, "y":1.25}, {"x":13.5, "y":1.25, "w":1.5}, {"x":15, "y":1.25}, {"x":0, "y":2.25, "w":1.75}, {"x":1.75, "y":2.25}, {"x":2.75, "y":2.25}, {"x":3.75, "y":2.25}, {"x":4.75, "y":2.25}, {"x":5.75, "y":2.25}, {"x":6.75, "y":2.25}, {"x":7.75, "y":2.25}, {"x":8.75, "y":2.25}, {"x":9.75, "y":2.25}, {"x":10.75, "y":2.25}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2.25, "w":2.25}, {"x":15, "y":2.25}, {"x":0, "y":3.25, "w":2.25}, {"x":2.25, "y":3.25}, {"x":3.25, "y":3.25}, {"x":4.25, "y":3.25}, {"x":5.25, "y":3.25}, {"x":6.25, "y":3.25}, {"x":7.25, "y":3.25}, {"x":8.25, "y":3.25}, {"x":9.25, "y":3.25}, {"x":10.25, "y":3.25}, {"x":11.25, "y":3.25}, {"x":12.25, "y":3.25, "w":1.75}, {"x":14, "y":3.25}, {"x":15, "y":3.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25, "w":1.25}, {"x":2.5, "y":4.25, "w":1.25}, {"x":3.75, "y":4.25, "w":6.25}, {"x":10, "y":4.25, "w":1.25}, {"x":11.25, "y":4.25, "w":1.25}, {"x":13, "y":4.25}, {"x":14, "y":4.25}, {"x":15, "y":4.25}]
+        }
+    }
+}
diff --git a/keyboards/mikeneko65/rev4/keymaps/default/keymap.c b/keyboards/mikeneko65/rev4/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4cbdd7a773
--- /dev/null
+++ b/keyboards/mikeneko65/rev4/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2022 takishim
+ *
+ * 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 layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_all(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/mikeneko65/rev4/keymaps/default/readme.md b/keyboards/mikeneko65/rev4/keymaps/default/readme.md
new file mode 100644
index 0000000000..13754c577f
--- /dev/null
+++ b/keyboards/mikeneko65/rev4/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Mikeneko 65 V4
diff --git a/keyboards/mikeneko65/rev4/keymaps/via/keymap.c b/keyboards/mikeneko65/rev4/keymaps/via/keymap.c
new file mode 100644
index 0000000000..518cc8d5cf
--- /dev/null
+++ b/keyboards/mikeneko65/rev4/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2022 takishim
+ *
+ * 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 layer_names {
+    _L0,
+    _L1,
+    _L2,
+    _L3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_L0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_L1] = LAYOUT_all(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    ),
+    [_L2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    ),
+    [_L3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/mikeneko65/rev4/keymaps/via/rules.mk b/keyboards/mikeneko65/rev4/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mikeneko65/rev4/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mikeneko65/rev4/readme.md b/keyboards/mikeneko65/rev4/readme.md
new file mode 100644
index 0000000000..5af268757e
--- /dev/null
+++ b/keyboards/mikeneko65/rev4/readme.md
@@ -0,0 +1,23 @@
+# Mikeneko 65 V4
+
+A simple 65% keyboard
+
+* Keyboard Maintainer: [takishim](https://github.com/takishim)
+* Hardware Supported: Mikeneko 65 V4
+* Hardware Availability: [Open source on GitHub](https://github.com/takishim/mikeneko65/tree/v4)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mikeneko65/rev4:default
+
+Flashing example for this keyboard:
+
+    make mikeneko65/rev4:default:flash
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+ぶ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).
diff --git a/keyboards/mikeneko65/rev4/rev4.c b/keyboards/mikeneko65/rev4/rev4.c
new file mode 100644
index 0000000000..bf16b41c8e
--- /dev/null
+++ b/keyboards/mikeneko65/rev4/rev4.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 takishim
+ *
+ * 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 "rev4.h"
diff --git a/keyboards/mikeneko65/rev4/rev4.h b/keyboards/mikeneko65/rev4/rev4.h
new file mode 100644
index 0000000000..5a3e124c54
--- /dev/null
+++ b/keyboards/mikeneko65/rev4/rev4.h
@@ -0,0 +1,33 @@
+/* Copyright 2022 takishim
+ *
+ * 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( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k213, k214, \
+    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314, \
+    k400, k401, k402,                   k406,             k409,       k411, k412, k413, k414  \
+) { \
+    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014 }, \
+    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  k114 }, \
+    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  k214 }, \
+    { k300,  KC_NO, k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  k311,  k312,  k313,  k314 }, \
+    { k400,  k401,  k402,  KC_NO, KC_NO, KC_NO, k406,  KC_NO, KC_NO, k409,  KC_NO, k411,  k412,  k413,  k414 }  \
+}
diff --git a/keyboards/mikeneko65/rev4/rules.mk b/keyboards/mikeneko65/rev4/rules.mk
new file mode 100644
index 0000000000..1275531ef6
--- /dev/null
+++ b/keyboards/mikeneko65/rev4/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From e6e6529b4a85e9bdcb2708216b5434c52d5be15e Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 07:03:15 +0800
Subject: [PATCH 206/867] [Keyboard] move Salicylic-acid3's keyboards to
 salicylic-acid3/ (#15791)

---
 keyboards/{ => salicylic_acid3}/7skb/.noci                      | 0
 keyboards/{ => salicylic_acid3}/7skb/7skb.c                     | 0
 keyboards/{ => salicylic_acid3}/7skb/7skb.h                     | 2 +-
 keyboards/{ => salicylic_acid3}/7skb/config.h                   | 0
 keyboards/{ => salicylic_acid3}/7skb/info.json                  | 0
 keyboards/{ => salicylic_acid3}/7skb/keymaps/default/config.h   | 0
 keyboards/{ => salicylic_acid3}/7skb/keymaps/default/keymap.c   | 0
 keyboards/{ => salicylic_acid3}/7skb/keymaps/salicylic/config.h | 0
 keyboards/{ => salicylic_acid3}/7skb/keymaps/salicylic/keymap.c | 0
 keyboards/{ => salicylic_acid3}/7skb/keymaps/salicylic/rules.mk | 0
 keyboards/{ => salicylic_acid3}/7skb/keymaps/via/keymap.c       | 0
 keyboards/{ => salicylic_acid3}/7skb/keymaps/via/readme.md      | 0
 keyboards/{ => salicylic_acid3}/7skb/keymaps/via/rules.mk       | 0
 keyboards/{ => salicylic_acid3}/7skb/readme.md                  | 2 +-
 keyboards/{ => salicylic_acid3}/7skb/rev1/config.h              | 0
 keyboards/{ => salicylic_acid3}/7skb/rev1/rev1.c                | 0
 keyboards/{ => salicylic_acid3}/7skb/rev1/rev1.h                | 0
 keyboards/{ => salicylic_acid3}/7skb/rev1/rules.mk              | 0
 keyboards/{ => salicylic_acid3}/7skb/rules.mk                   | 0
 keyboards/{ => salicylic_acid3}/7splus/7splus.c                 | 0
 keyboards/{ => salicylic_acid3}/7splus/7splus.h                 | 0
 keyboards/{ => salicylic_acid3}/7splus/config.h                 | 0
 keyboards/{ => salicylic_acid3}/7splus/info.json                | 0
 keyboards/{ => salicylic_acid3}/7splus/keymaps/default/keymap.c | 0
 .../{ => salicylic_acid3}/7splus/keymaps/salicylic/config.h     | 0
 .../{ => salicylic_acid3}/7splus/keymaps/salicylic/keymap.c     | 0
 .../{ => salicylic_acid3}/7splus/keymaps/salicylic/rules.mk     | 0
 keyboards/{ => salicylic_acid3}/7splus/keymaps/via/config.h     | 0
 keyboards/{ => salicylic_acid3}/7splus/keymaps/via/keymap.c     | 0
 keyboards/{ => salicylic_acid3}/7splus/keymaps/via/rules.mk     | 0
 keyboards/{ => salicylic_acid3}/7splus/readme.md                | 2 +-
 keyboards/{ => salicylic_acid3}/7splus/rules.mk                 | 0
 keyboards/{ => salicylic_acid3}/ajisai74/ajisai74.c             | 0
 keyboards/{ => salicylic_acid3}/ajisai74/ajisai74.h             | 0
 keyboards/{ => salicylic_acid3}/ajisai74/config.h               | 0
 keyboards/{ => salicylic_acid3}/ajisai74/info.json              | 0
 .../{ => salicylic_acid3}/ajisai74/keymaps/default/config.h     | 0
 .../{ => salicylic_acid3}/ajisai74/keymaps/default/keymap.c     | 0
 keyboards/{ => salicylic_acid3}/ajisai74/keymaps/jis/config.h   | 0
 keyboards/{ => salicylic_acid3}/ajisai74/keymaps/jis/keymap.c   | 0
 keyboards/{ => salicylic_acid3}/ajisai74/keymaps/jis/rules.mk   | 0
 .../{ => salicylic_acid3}/ajisai74/keymaps/salicylic/config.h   | 0
 .../{ => salicylic_acid3}/ajisai74/keymaps/salicylic/keymap.c   | 0
 .../{ => salicylic_acid3}/ajisai74/keymaps/salicylic/rules.mk   | 0
 keyboards/{ => salicylic_acid3}/ajisai74/keymaps/via/config.h   | 0
 keyboards/{ => salicylic_acid3}/ajisai74/keymaps/via/keymap.c   | 0
 keyboards/{ => salicylic_acid3}/ajisai74/keymaps/via/rules.mk   | 0
 keyboards/{ => salicylic_acid3}/ajisai74/readme.md              | 2 +-
 keyboards/{ => salicylic_acid3}/ajisai74/rules.mk               | 0
 keyboards/{ => salicylic_acid3}/ergoarrows/config.h             | 0
 keyboards/{ => salicylic_acid3}/ergoarrows/ergoarrows.c         | 0
 keyboards/{ => salicylic_acid3}/ergoarrows/ergoarrows.h         | 0
 keyboards/{ => salicylic_acid3}/ergoarrows/info.json            | 0
 .../{ => salicylic_acid3}/ergoarrows/keymaps/default/config.h   | 0
 .../{ => salicylic_acid3}/ergoarrows/keymaps/default/keymap.c   | 0
 .../{ => salicylic_acid3}/ergoarrows/keymaps/salicylic/config.h | 0
 .../{ => salicylic_acid3}/ergoarrows/keymaps/salicylic/keymap.c | 0
 keyboards/{ => salicylic_acid3}/ergoarrows/keymaps/via/config.h | 0
 keyboards/{ => salicylic_acid3}/ergoarrows/keymaps/via/keymap.c | 0
 keyboards/{ => salicylic_acid3}/ergoarrows/keymaps/via/rules.mk | 0
 keyboards/{ => salicylic_acid3}/ergoarrows/readme.md            | 2 +-
 keyboards/{ => salicylic_acid3}/ergoarrows/rules.mk             | 0
 keyboards/{ => salicylic_acid3}/getta25/.noci                   | 0
 keyboards/{ => salicylic_acid3}/getta25/config.h                | 0
 keyboards/{ => salicylic_acid3}/getta25/getta25.c               | 0
 keyboards/{ => salicylic_acid3}/getta25/getta25.h               | 2 +-
 keyboards/{ => salicylic_acid3}/getta25/info.json               | 0
 .../{ => salicylic_acid3}/getta25/keymaps/default/config.h      | 0
 .../{ => salicylic_acid3}/getta25/keymaps/default/keymap.c      | 0
 keyboards/{ => salicylic_acid3}/getta25/keymaps/oled/config.h   | 0
 keyboards/{ => salicylic_acid3}/getta25/keymaps/oled/glcdfont.c | 0
 keyboards/{ => salicylic_acid3}/getta25/keymaps/oled/keymap.c   | 0
 keyboards/{ => salicylic_acid3}/getta25/keymaps/oled/rules.mk   | 0
 keyboards/{ => salicylic_acid3}/getta25/readme.md               | 2 +-
 keyboards/{ => salicylic_acid3}/getta25/rev1/config.h           | 0
 keyboards/{ => salicylic_acid3}/getta25/rev1/rev1.c             | 0
 keyboards/{ => salicylic_acid3}/getta25/rev1/rev1.h             | 0
 keyboards/{ => salicylic_acid3}/getta25/rev1/rules.mk           | 0
 keyboards/{ => salicylic_acid3}/getta25/rules.mk                | 0
 keyboards/{ => salicylic_acid3}/jisplit89/.noci                 | 0
 keyboards/{ => salicylic_acid3}/jisplit89/config.h              | 0
 keyboards/{ => salicylic_acid3}/jisplit89/info.json             | 0
 keyboards/{ => salicylic_acid3}/jisplit89/jisplit89.c           | 0
 keyboards/{ => salicylic_acid3}/jisplit89/jisplit89.h           | 2 +-
 .../{ => salicylic_acid3}/jisplit89/keymaps/default/keymap.c    | 0
 .../{ => salicylic_acid3}/jisplit89/keymaps/salicylic/config.h  | 0
 .../{ => salicylic_acid3}/jisplit89/keymaps/salicylic/keymap.c  | 0
 .../{ => salicylic_acid3}/jisplit89/keymaps/salicylic/rules.mk  | 0
 keyboards/{ => salicylic_acid3}/jisplit89/keymaps/via/config.h  | 0
 keyboards/{ => salicylic_acid3}/jisplit89/keymaps/via/keymap.c  | 0
 keyboards/{ => salicylic_acid3}/jisplit89/keymaps/via/rules.mk  | 0
 keyboards/{ => salicylic_acid3}/jisplit89/readme.md             | 2 +-
 keyboards/{ => salicylic_acid3}/jisplit89/rev1/config.h         | 0
 keyboards/{ => salicylic_acid3}/jisplit89/rev1/rev1.c           | 0
 keyboards/{ => salicylic_acid3}/jisplit89/rev1/rev1.h           | 0
 keyboards/{ => salicylic_acid3}/jisplit89/rev1/rules.mk         | 0
 keyboards/{ => salicylic_acid3}/jisplit89/rules.mk              | 0
 keyboards/{ => salicylic_acid3}/nafuda/config.h                 | 0
 keyboards/{ => salicylic_acid3}/nafuda/info.json                | 0
 keyboards/{ => salicylic_acid3}/nafuda/keymaps/default/config.h | 0
 keyboards/{ => salicylic_acid3}/nafuda/keymaps/default/keymap.c | 0
 .../{ => salicylic_acid3}/nafuda/keymaps/default/readme.md      | 0
 keyboards/{ => salicylic_acid3}/nafuda/nafuda.c                 | 0
 keyboards/{ => salicylic_acid3}/nafuda/nafuda.h                 | 0
 keyboards/{ => salicylic_acid3}/nafuda/readme.md                | 2 +-
 keyboards/{ => salicylic_acid3}/nafuda/rules.mk                 | 0
 keyboards/{ => salicylic_acid3}/naked48/.noci                   | 0
 keyboards/{ => salicylic_acid3}/naked48/config.h                | 0
 keyboards/{ => salicylic_acid3}/naked48/info.json               | 0
 .../{ => salicylic_acid3}/naked48/keymaps/default/config.h      | 0
 .../{ => salicylic_acid3}/naked48/keymaps/default/keymap.c      | 0
 .../{ => salicylic_acid3}/naked48/keymaps/default/readme.md     | 0
 .../{ => salicylic_acid3}/naked48/keymaps/default/rules.mk      | 0
 .../naked48/keymaps/default_with_nafuda/config.h                | 0
 .../naked48/keymaps/default_with_nafuda/keymap.c                | 0
 .../naked48/keymaps/default_with_nafuda/readme.md               | 0
 .../naked48/keymaps/default_with_nafuda/rules.mk                | 0
 .../naked48/keymaps/default_with_setta21/config.h               | 0
 .../naked48/keymaps/default_with_setta21/keymap.c               | 0
 .../naked48/keymaps/default_with_setta21/readme.md              | 0
 .../{ => salicylic_acid3}/naked48/keymaps/salicylic/config.h    | 0
 .../{ => salicylic_acid3}/naked48/keymaps/salicylic/keymap.c    | 0
 .../{ => salicylic_acid3}/naked48/keymaps/salicylic/readme.md   | 0
 .../{ => salicylic_acid3}/naked48/keymaps/salicylic/rules.mk    | 0
 .../naked48/keymaps/salicylic_with_nafuda/config.h              | 0
 .../naked48/keymaps/salicylic_with_nafuda/keymap.c              | 0
 .../naked48/keymaps/salicylic_with_nafuda/readme.md             | 0
 .../naked48/keymaps/salicylic_with_nafuda/rules.mk              | 0
 .../naked48/keymaps/salicylic_with_setta21/config.h             | 0
 .../naked48/keymaps/salicylic_with_setta21/keymap.c             | 0
 .../naked48/keymaps/salicylic_with_setta21/readme.md            | 0
 .../naked48/keymaps/salicylic_with_setta21/rules.mk             | 0
 .../{ => salicylic_acid3}/naked48/keymaps/scheiklp/config.h     | 0
 .../{ => salicylic_acid3}/naked48/keymaps/scheiklp/keymap.c     | 0
 .../{ => salicylic_acid3}/naked48/keymaps/scheiklp/readme.md    | 0
 .../{ => salicylic_acid3}/naked48/keymaps/scheiklp/rules.mk     | 0
 keyboards/{ => salicylic_acid3}/naked48/keymaps/via/config.h    | 0
 keyboards/{ => salicylic_acid3}/naked48/keymaps/via/keymap.c    | 0
 keyboards/{ => salicylic_acid3}/naked48/keymaps/via/rules.mk    | 0
 .../naked48/keymaps/via_rgb_matrix/config.h                     | 0
 .../naked48/keymaps/via_rgb_matrix/keymap.c                     | 0
 .../naked48/keymaps/via_rgb_matrix/rules.mk                     | 0
 keyboards/{ => salicylic_acid3}/naked48/naked48.c               | 0
 keyboards/{ => salicylic_acid3}/naked48/naked48.h               | 2 +-
 keyboards/{ => salicylic_acid3}/naked48/readme.md               | 2 +-
 keyboards/{ => salicylic_acid3}/naked48/rev1/config.h           | 0
 keyboards/{ => salicylic_acid3}/naked48/rev1/rev1.c             | 0
 keyboards/{ => salicylic_acid3}/naked48/rev1/rev1.h             | 0
 keyboards/{ => salicylic_acid3}/naked48/rev1/rules.mk           | 0
 keyboards/{ => salicylic_acid3}/naked48/rules.mk                | 0
 keyboards/{ => salicylic_acid3}/naked60/config.h                | 0
 keyboards/{ => salicylic_acid3}/naked60/info.json               | 0
 .../{ => salicylic_acid3}/naked60/keymaps/333fred/config.h      | 0
 .../{ => salicylic_acid3}/naked60/keymaps/333fred/keymap.c      | 0
 .../{ => salicylic_acid3}/naked60/keymaps/default/config.h      | 0
 .../{ => salicylic_acid3}/naked60/keymaps/default/keymap.c      | 0
 .../{ => salicylic_acid3}/naked60/keymaps/default/readme.md     | 0
 .../naked60/keymaps/default_with_nafuda/config.h                | 0
 .../naked60/keymaps/default_with_nafuda/keymap.c                | 0
 .../naked60/keymaps/default_with_nafuda/readme.md               | 0
 .../naked60/keymaps/default_with_setta21/config.h               | 0
 .../naked60/keymaps/default_with_setta21/keymap.c               | 0
 .../naked60/keymaps/default_with_setta21/readme.md              | 0
 .../{ => salicylic_acid3}/naked60/keymaps/salicylic/config.h    | 0
 .../{ => salicylic_acid3}/naked60/keymaps/salicylic/keymap.c    | 0
 .../{ => salicylic_acid3}/naked60/keymaps/salicylic/readme.md   | 0
 .../{ => salicylic_acid3}/naked60/keymaps/salicylic/rules.mk    | 0
 .../naked60/keymaps/salicylic_with_nafuda/config.h              | 0
 .../naked60/keymaps/salicylic_with_nafuda/keymap.c              | 0
 .../naked60/keymaps/salicylic_with_nafuda/readme.md             | 0
 .../naked60/keymaps/salicylic_with_nafuda/rules.mk              | 0
 .../naked60/keymaps/salicylic_with_setta21/config.h             | 0
 .../naked60/keymaps/salicylic_with_setta21/keymap.c             | 0
 .../naked60/keymaps/salicylic_with_setta21/readme.md            | 0
 .../naked60/keymaps/salicylic_with_setta21/rules.mk             | 0
 keyboards/{ => salicylic_acid3}/naked60/keymaps/via/config.h    | 0
 keyboards/{ => salicylic_acid3}/naked60/keymaps/via/keymap.c    | 0
 keyboards/{ => salicylic_acid3}/naked60/keymaps/via/rules.mk    | 0
 keyboards/{ => salicylic_acid3}/naked60/naked60.c               | 0
 keyboards/{ => salicylic_acid3}/naked60/naked60.h               | 2 +-
 keyboards/{ => salicylic_acid3}/naked60/readme.md               | 2 +-
 keyboards/{ => salicylic_acid3}/naked60/rev1/config.h           | 0
 keyboards/{ => salicylic_acid3}/naked60/rev1/rev1.c             | 0
 keyboards/{ => salicylic_acid3}/naked60/rev1/rev1.h             | 0
 keyboards/{ => salicylic_acid3}/naked60/rev1/rules.mk           | 0
 keyboards/{ => salicylic_acid3}/naked60/rules.mk                | 0
 keyboards/{ => salicylic_acid3}/naked64/.noci                   | 0
 keyboards/{ => salicylic_acid3}/naked64/config.h                | 0
 keyboards/{ => salicylic_acid3}/naked64/info.json               | 0
 .../{ => salicylic_acid3}/naked64/keymaps/default/config.h      | 0
 .../{ => salicylic_acid3}/naked64/keymaps/default/keymap.c      | 0
 .../{ => salicylic_acid3}/naked64/keymaps/default/readme.md     | 0
 .../{ => salicylic_acid3}/naked64/keymaps/default/rules.mk      | 0
 .../naked64/keymaps/default_with_setta21/config.h               | 0
 .../naked64/keymaps/default_with_setta21/keymap.c               | 0
 .../naked64/keymaps/default_with_setta21/readme.md              | 0
 .../naked64/keymaps/default_with_setta21/rules.mk               | 0
 .../{ => salicylic_acid3}/naked64/keymaps/salicylic/config.h    | 0
 .../{ => salicylic_acid3}/naked64/keymaps/salicylic/keymap.c    | 0
 .../{ => salicylic_acid3}/naked64/keymaps/salicylic/readme.md   | 0
 .../{ => salicylic_acid3}/naked64/keymaps/salicylic/rules.mk    | 0
 .../naked64/keymaps/salicylic_with_setta21/config.h             | 0
 .../naked64/keymaps/salicylic_with_setta21/keymap.c             | 0
 .../naked64/keymaps/salicylic_with_setta21/readme.md            | 0
 .../naked64/keymaps/salicylic_with_setta21/rules.mk             | 0
 keyboards/{ => salicylic_acid3}/naked64/naked64.c               | 0
 keyboards/{ => salicylic_acid3}/naked64/naked64.h               | 2 +-
 keyboards/{ => salicylic_acid3}/naked64/readme.md               | 2 +-
 keyboards/{ => salicylic_acid3}/naked64/rev1/config.h           | 0
 keyboards/{ => salicylic_acid3}/naked64/rev1/rev1.c             | 0
 keyboards/{ => salicylic_acid3}/naked64/rev1/rev1.h             | 0
 keyboards/{ => salicylic_acid3}/naked64/rev1/rules.mk           | 0
 keyboards/{ => salicylic_acid3}/naked64/rules.mk                | 0
 keyboards/{ => salicylic_acid3}/nknl7en/config.h                | 0
 keyboards/{ => salicylic_acid3}/nknl7en/info.json               | 0
 .../{ => salicylic_acid3}/nknl7en/keymaps/default/config.h      | 0
 .../{ => salicylic_acid3}/nknl7en/keymaps/default/keymap.c      | 0
 .../{ => salicylic_acid3}/nknl7en/keymaps/salicylic/config.h    | 0
 .../{ => salicylic_acid3}/nknl7en/keymaps/salicylic/keymap.c    | 0
 keyboards/{ => salicylic_acid3}/nknl7en/keymaps/via/config.h    | 0
 keyboards/{ => salicylic_acid3}/nknl7en/keymaps/via/keymap.c    | 0
 keyboards/{ => salicylic_acid3}/nknl7en/keymaps/via/rules.mk    | 0
 keyboards/{ => salicylic_acid3}/nknl7en/nknl7en.c               | 0
 keyboards/{ => salicylic_acid3}/nknl7en/nknl7en.h               | 0
 keyboards/{ => salicylic_acid3}/nknl7en/readme.md               | 2 +-
 keyboards/{ => salicylic_acid3}/nknl7en/rules.mk                | 0
 keyboards/{ => salicylic_acid3}/nknl7jp/config.h                | 0
 keyboards/{ => salicylic_acid3}/nknl7jp/info.json               | 0
 .../{ => salicylic_acid3}/nknl7jp/keymaps/default/config.h      | 0
 .../{ => salicylic_acid3}/nknl7jp/keymaps/default/keymap.c      | 0
 .../{ => salicylic_acid3}/nknl7jp/keymaps/salicylic/config.h    | 0
 .../{ => salicylic_acid3}/nknl7jp/keymaps/salicylic/keymap.c    | 0
 keyboards/{ => salicylic_acid3}/nknl7jp/keymaps/via/config.h    | 0
 keyboards/{ => salicylic_acid3}/nknl7jp/keymaps/via/keymap.c    | 0
 keyboards/{ => salicylic_acid3}/nknl7jp/keymaps/via/rules.mk    | 0
 keyboards/{ => salicylic_acid3}/nknl7jp/nknl7jp.c               | 0
 keyboards/{ => salicylic_acid3}/nknl7jp/nknl7jp.h               | 0
 keyboards/{ => salicylic_acid3}/nknl7jp/readme.md               | 2 +-
 keyboards/{ => salicylic_acid3}/nknl7jp/rules.mk                | 0
 keyboards/{ => salicylic_acid3}/setta21/config.h                | 0
 keyboards/{ => salicylic_acid3}/setta21/info.json               | 0
 .../{ => salicylic_acid3}/setta21/keymaps/default/config.h      | 0
 .../{ => salicylic_acid3}/setta21/keymaps/default/keymap.c      | 0
 .../{ => salicylic_acid3}/setta21/keymaps/default/readme.md     | 0
 .../{ => salicylic_acid3}/setta21/keymaps/salicylic/config.h    | 0
 .../{ => salicylic_acid3}/setta21/keymaps/salicylic/keymap.c    | 0
 .../{ => salicylic_acid3}/setta21/keymaps/salicylic/readme.md   | 0
 .../{ => salicylic_acid3}/setta21/keymaps/salicylic/rules.mk    | 0
 keyboards/{ => salicylic_acid3}/setta21/readme.md               | 2 +-
 keyboards/{ => salicylic_acid3}/setta21/rev1/.noci              | 0
 keyboards/{ => salicylic_acid3}/setta21/rev1/config.h           | 0
 keyboards/{ => salicylic_acid3}/setta21/rev1/rev1.c             | 0
 keyboards/{ => salicylic_acid3}/setta21/rev1/rev1.h             | 0
 keyboards/{ => salicylic_acid3}/setta21/rev1/rules.mk           | 0
 keyboards/{ => salicylic_acid3}/setta21/rules.mk                | 0
 keyboards/{ => salicylic_acid3}/setta21/setta21.c               | 0
 keyboards/{ => salicylic_acid3}/setta21/setta21.h               | 2 +-
 257 files changed, 20 insertions(+), 20 deletions(-)
 rename keyboards/{ => salicylic_acid3}/7skb/.noci (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/7skb.c (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/7skb.h (60%)
 rename keyboards/{ => salicylic_acid3}/7skb/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/keymaps/default/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/keymaps/salicylic/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/keymaps/salicylic/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/keymaps/salicylic/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/keymaps/via/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/keymaps/via/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/keymaps/via/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/readme.md (95%)
 rename keyboards/{ => salicylic_acid3}/7skb/rev1/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/rev1/rev1.c (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/rev1/rev1.h (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/rev1/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/7skb/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/7splus/7splus.c (100%)
 rename keyboards/{ => salicylic_acid3}/7splus/7splus.h (100%)
 rename keyboards/{ => salicylic_acid3}/7splus/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/7splus/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/7splus/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/7splus/keymaps/salicylic/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/7splus/keymaps/salicylic/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/7splus/keymaps/salicylic/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/7splus/keymaps/via/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/7splus/keymaps/via/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/7splus/keymaps/via/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/7splus/readme.md (95%)
 rename keyboards/{ => salicylic_acid3}/7splus/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/ajisai74.c (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/ajisai74.h (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/keymaps/default/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/keymaps/jis/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/keymaps/jis/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/keymaps/jis/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/keymaps/salicylic/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/keymaps/salicylic/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/keymaps/salicylic/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/keymaps/via/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/keymaps/via/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/keymaps/via/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/readme.md (95%)
 rename keyboards/{ => salicylic_acid3}/ajisai74/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/ergoarrows.c (100%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/ergoarrows.h (100%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/keymaps/default/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/keymaps/salicylic/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/keymaps/salicylic/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/keymaps/via/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/keymaps/via/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/keymaps/via/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/readme.md (95%)
 rename keyboards/{ => salicylic_acid3}/ergoarrows/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/.noci (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/getta25.c (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/getta25.h (58%)
 rename keyboards/{ => salicylic_acid3}/getta25/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/keymaps/default/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/keymaps/oled/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/keymaps/oled/glcdfont.c (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/keymaps/oled/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/keymaps/oled/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/readme.md (94%)
 rename keyboards/{ => salicylic_acid3}/getta25/rev1/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/rev1/rev1.c (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/rev1/rev1.h (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/rev1/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/getta25/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/.noci (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/jisplit89.c (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/jisplit89.h (93%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/keymaps/salicylic/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/keymaps/salicylic/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/keymaps/salicylic/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/keymaps/via/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/keymaps/via/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/keymaps/via/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/readme.md (94%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/rev1/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/rev1/rev1.c (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/rev1/rev1.h (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/rev1/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/jisplit89/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/nafuda/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/nafuda/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/nafuda/keymaps/default/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/nafuda/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/nafuda/keymaps/default/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/nafuda/nafuda.c (100%)
 rename keyboards/{ => salicylic_acid3}/nafuda/nafuda.h (100%)
 rename keyboards/{ => salicylic_acid3}/nafuda/readme.md (95%)
 rename keyboards/{ => salicylic_acid3}/nafuda/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/.noci (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/default/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/default/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/default/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/default_with_nafuda/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/default_with_nafuda/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/default_with_nafuda/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/default_with_nafuda/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/default_with_setta21/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/default_with_setta21/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/default_with_setta21/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/salicylic/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/salicylic/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/salicylic/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/salicylic/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/salicylic_with_nafuda/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/salicylic_with_nafuda/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/salicylic_with_nafuda/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/salicylic_with_nafuda/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/salicylic_with_setta21/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/salicylic_with_setta21/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/salicylic_with_setta21/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/salicylic_with_setta21/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/scheiklp/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/scheiklp/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/scheiklp/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/scheiklp/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/via/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/via/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/via/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/via_rgb_matrix/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/via_rgb_matrix/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/keymaps/via_rgb_matrix/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/naked48.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/naked48.h (94%)
 rename keyboards/{ => salicylic_acid3}/naked48/readme.md (94%)
 rename keyboards/{ => salicylic_acid3}/naked48/rev1/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/rev1/rev1.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/rev1/rev1.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/rev1/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked48/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/333fred/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/333fred/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/default/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/default/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/default_with_nafuda/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/default_with_nafuda/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/default_with_nafuda/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/default_with_setta21/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/default_with_setta21/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/default_with_setta21/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/salicylic/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/salicylic/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/salicylic/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/salicylic/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/salicylic_with_nafuda/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/salicylic_with_nafuda/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/salicylic_with_nafuda/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/salicylic_with_nafuda/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/salicylic_with_setta21/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/salicylic_with_setta21/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/salicylic_with_setta21/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/salicylic_with_setta21/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/via/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/via/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/keymaps/via/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/naked60.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/naked60.h (94%)
 rename keyboards/{ => salicylic_acid3}/naked60/readme.md (94%)
 rename keyboards/{ => salicylic_acid3}/naked60/rev1/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/rev1/rev1.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/rev1/rev1.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/rev1/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked60/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/.noci (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/default/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/default/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/default/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/default_with_setta21/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/default_with_setta21/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/default_with_setta21/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/default_with_setta21/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/salicylic/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/salicylic/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/salicylic/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/salicylic/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/salicylic_with_setta21/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/salicylic_with_setta21/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/salicylic_with_setta21/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/keymaps/salicylic_with_setta21/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/naked64.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/naked64.h (58%)
 rename keyboards/{ => salicylic_acid3}/naked64/readme.md (95%)
 rename keyboards/{ => salicylic_acid3}/naked64/rev1/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/rev1/rev1.c (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/rev1/rev1.h (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/rev1/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/naked64/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/keymaps/default/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/keymaps/salicylic/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/keymaps/salicylic/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/keymaps/via/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/keymaps/via/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/keymaps/via/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/nknl7en.c (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/nknl7en.h (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/readme.md (95%)
 rename keyboards/{ => salicylic_acid3}/nknl7en/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/keymaps/default/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/keymaps/salicylic/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/keymaps/salicylic/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/keymaps/via/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/keymaps/via/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/keymaps/via/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/nknl7jp.c (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/nknl7jp.h (100%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/readme.md (95%)
 rename keyboards/{ => salicylic_acid3}/nknl7jp/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/info.json (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/keymaps/default/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/keymaps/default/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/keymaps/default/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/keymaps/salicylic/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/keymaps/salicylic/keymap.c (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/keymaps/salicylic/readme.md (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/keymaps/salicylic/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/readme.md (94%)
 rename keyboards/{ => salicylic_acid3}/setta21/rev1/.noci (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/rev1/config.h (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/rev1/rev1.c (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/rev1/rev1.h (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/rev1/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/rules.mk (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/setta21.c (100%)
 rename keyboards/{ => salicylic_acid3}/setta21/setta21.h (58%)

diff --git a/keyboards/7skb/.noci b/keyboards/salicylic_acid3/7skb/.noci
similarity index 100%
rename from keyboards/7skb/.noci
rename to keyboards/salicylic_acid3/7skb/.noci
diff --git a/keyboards/7skb/7skb.c b/keyboards/salicylic_acid3/7skb/7skb.c
similarity index 100%
rename from keyboards/7skb/7skb.c
rename to keyboards/salicylic_acid3/7skb/7skb.c
diff --git a/keyboards/7skb/7skb.h b/keyboards/salicylic_acid3/7skb/7skb.h
similarity index 60%
rename from keyboards/7skb/7skb.h
rename to keyboards/salicylic_acid3/7skb/7skb.h
index 9e23d0ad3c..5043a46747 100644
--- a/keyboards/7skb/7skb.h
+++ b/keyboards/salicylic_acid3/7skb/7skb.h
@@ -2,6 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_7skb_rev1
+#ifdef KEYBOARD_salicylic_acid3_7skb_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/7skb/config.h b/keyboards/salicylic_acid3/7skb/config.h
similarity index 100%
rename from keyboards/7skb/config.h
rename to keyboards/salicylic_acid3/7skb/config.h
diff --git a/keyboards/7skb/info.json b/keyboards/salicylic_acid3/7skb/info.json
similarity index 100%
rename from keyboards/7skb/info.json
rename to keyboards/salicylic_acid3/7skb/info.json
diff --git a/keyboards/7skb/keymaps/default/config.h b/keyboards/salicylic_acid3/7skb/keymaps/default/config.h
similarity index 100%
rename from keyboards/7skb/keymaps/default/config.h
rename to keyboards/salicylic_acid3/7skb/keymaps/default/config.h
diff --git a/keyboards/7skb/keymaps/default/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/7skb/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/7skb/keymaps/default/keymap.c
diff --git a/keyboards/7skb/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/7skb/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h
diff --git a/keyboards/7skb/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/7skb/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
diff --git a/keyboards/7skb/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/7skb/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/7skb/keymaps/salicylic/rules.mk
diff --git a/keyboards/7skb/keymaps/via/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/7skb/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/7skb/keymaps/via/keymap.c
diff --git a/keyboards/7skb/keymaps/via/readme.md b/keyboards/salicylic_acid3/7skb/keymaps/via/readme.md
similarity index 100%
rename from keyboards/7skb/keymaps/via/readme.md
rename to keyboards/salicylic_acid3/7skb/keymaps/via/readme.md
diff --git a/keyboards/7skb/keymaps/via/rules.mk b/keyboards/salicylic_acid3/7skb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/7skb/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/7skb/keymaps/via/rules.mk
diff --git a/keyboards/7skb/readme.md b/keyboards/salicylic_acid3/7skb/readme.md
similarity index 95%
rename from keyboards/7skb/readme.md
rename to keyboards/salicylic_acid3/7skb/readme.md
index 18e4eef3ea..a3077f068a 100644
--- a/keyboards/7skb/readme.md
+++ b/keyboards/salicylic_acid3/7skb/readme.md
@@ -10,7 +10,7 @@ This is 63 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make 7skb:default
+    make salicylic_acid3/7skb/rev1: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).
 
diff --git a/keyboards/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h
similarity index 100%
rename from keyboards/7skb/rev1/config.h
rename to keyboards/salicylic_acid3/7skb/rev1/config.h
diff --git a/keyboards/7skb/rev1/rev1.c b/keyboards/salicylic_acid3/7skb/rev1/rev1.c
similarity index 100%
rename from keyboards/7skb/rev1/rev1.c
rename to keyboards/salicylic_acid3/7skb/rev1/rev1.c
diff --git a/keyboards/7skb/rev1/rev1.h b/keyboards/salicylic_acid3/7skb/rev1/rev1.h
similarity index 100%
rename from keyboards/7skb/rev1/rev1.h
rename to keyboards/salicylic_acid3/7skb/rev1/rev1.h
diff --git a/keyboards/7skb/rev1/rules.mk b/keyboards/salicylic_acid3/7skb/rev1/rules.mk
similarity index 100%
rename from keyboards/7skb/rev1/rules.mk
rename to keyboards/salicylic_acid3/7skb/rev1/rules.mk
diff --git a/keyboards/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk
similarity index 100%
rename from keyboards/7skb/rules.mk
rename to keyboards/salicylic_acid3/7skb/rules.mk
diff --git a/keyboards/7splus/7splus.c b/keyboards/salicylic_acid3/7splus/7splus.c
similarity index 100%
rename from keyboards/7splus/7splus.c
rename to keyboards/salicylic_acid3/7splus/7splus.c
diff --git a/keyboards/7splus/7splus.h b/keyboards/salicylic_acid3/7splus/7splus.h
similarity index 100%
rename from keyboards/7splus/7splus.h
rename to keyboards/salicylic_acid3/7splus/7splus.h
diff --git a/keyboards/7splus/config.h b/keyboards/salicylic_acid3/7splus/config.h
similarity index 100%
rename from keyboards/7splus/config.h
rename to keyboards/salicylic_acid3/7splus/config.h
diff --git a/keyboards/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json
similarity index 100%
rename from keyboards/7splus/info.json
rename to keyboards/salicylic_acid3/7splus/info.json
diff --git a/keyboards/7splus/keymaps/default/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/7splus/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/7splus/keymaps/default/keymap.c
diff --git a/keyboards/7splus/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/7splus/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/7splus/keymaps/salicylic/config.h
diff --git a/keyboards/7splus/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/7splus/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
diff --git a/keyboards/7splus/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/7splus/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/7splus/keymaps/salicylic/rules.mk
diff --git a/keyboards/7splus/keymaps/via/config.h b/keyboards/salicylic_acid3/7splus/keymaps/via/config.h
similarity index 100%
rename from keyboards/7splus/keymaps/via/config.h
rename to keyboards/salicylic_acid3/7splus/keymaps/via/config.h
diff --git a/keyboards/7splus/keymaps/via/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/7splus/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/7splus/keymaps/via/keymap.c
diff --git a/keyboards/7splus/keymaps/via/rules.mk b/keyboards/salicylic_acid3/7splus/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/7splus/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/7splus/keymaps/via/rules.mk
diff --git a/keyboards/7splus/readme.md b/keyboards/salicylic_acid3/7splus/readme.md
similarity index 95%
rename from keyboards/7splus/readme.md
rename to keyboards/salicylic_acid3/7splus/readme.md
index a733595249..ef6820a188 100644
--- a/keyboards/7splus/readme.md
+++ b/keyboards/salicylic_acid3/7splus/readme.md
@@ -10,7 +10,7 @@ This is 85 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make 7splus:default
+    make salicylic_acid3/7splus: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).
 
diff --git a/keyboards/7splus/rules.mk b/keyboards/salicylic_acid3/7splus/rules.mk
similarity index 100%
rename from keyboards/7splus/rules.mk
rename to keyboards/salicylic_acid3/7splus/rules.mk
diff --git a/keyboards/ajisai74/ajisai74.c b/keyboards/salicylic_acid3/ajisai74/ajisai74.c
similarity index 100%
rename from keyboards/ajisai74/ajisai74.c
rename to keyboards/salicylic_acid3/ajisai74/ajisai74.c
diff --git a/keyboards/ajisai74/ajisai74.h b/keyboards/salicylic_acid3/ajisai74/ajisai74.h
similarity index 100%
rename from keyboards/ajisai74/ajisai74.h
rename to keyboards/salicylic_acid3/ajisai74/ajisai74.h
diff --git a/keyboards/ajisai74/config.h b/keyboards/salicylic_acid3/ajisai74/config.h
similarity index 100%
rename from keyboards/ajisai74/config.h
rename to keyboards/salicylic_acid3/ajisai74/config.h
diff --git a/keyboards/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json
similarity index 100%
rename from keyboards/ajisai74/info.json
rename to keyboards/salicylic_acid3/ajisai74/info.json
diff --git a/keyboards/ajisai74/keymaps/default/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/default/config.h
similarity index 100%
rename from keyboards/ajisai74/keymaps/default/config.h
rename to keyboards/salicylic_acid3/ajisai74/keymaps/default/config.h
diff --git a/keyboards/ajisai74/keymaps/default/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ajisai74/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/ajisai74/keymaps/default/keymap.c
diff --git a/keyboards/ajisai74/keymaps/jis/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/config.h
similarity index 100%
rename from keyboards/ajisai74/keymaps/jis/config.h
rename to keyboards/salicylic_acid3/ajisai74/keymaps/jis/config.h
diff --git a/keyboards/ajisai74/keymaps/jis/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
similarity index 100%
rename from keyboards/ajisai74/keymaps/jis/keymap.c
rename to keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
diff --git a/keyboards/ajisai74/keymaps/jis/rules.mk b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/rules.mk
similarity index 100%
rename from keyboards/ajisai74/keymaps/jis/rules.mk
rename to keyboards/salicylic_acid3/ajisai74/keymaps/jis/rules.mk
diff --git a/keyboards/ajisai74/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/ajisai74/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/config.h
diff --git a/keyboards/ajisai74/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/ajisai74/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c
diff --git a/keyboards/ajisai74/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/ajisai74/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/rules.mk
diff --git a/keyboards/ajisai74/keymaps/via/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/via/config.h
similarity index 100%
rename from keyboards/ajisai74/keymaps/via/config.h
rename to keyboards/salicylic_acid3/ajisai74/keymaps/via/config.h
diff --git a/keyboards/ajisai74/keymaps/via/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ajisai74/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/ajisai74/keymaps/via/keymap.c
diff --git a/keyboards/ajisai74/keymaps/via/rules.mk b/keyboards/salicylic_acid3/ajisai74/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ajisai74/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/ajisai74/keymaps/via/rules.mk
diff --git a/keyboards/ajisai74/readme.md b/keyboards/salicylic_acid3/ajisai74/readme.md
similarity index 95%
rename from keyboards/ajisai74/readme.md
rename to keyboards/salicylic_acid3/ajisai74/readme.md
index af66ce0fc5..e274eb0ac4 100644
--- a/keyboards/ajisai74/readme.md
+++ b/keyboards/salicylic_acid3/ajisai74/readme.md
@@ -10,7 +10,7 @@ This is 74 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ajisai74:default
+    make salicylic_acid3/ajisai74: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).
 
diff --git a/keyboards/ajisai74/rules.mk b/keyboards/salicylic_acid3/ajisai74/rules.mk
similarity index 100%
rename from keyboards/ajisai74/rules.mk
rename to keyboards/salicylic_acid3/ajisai74/rules.mk
diff --git a/keyboards/ergoarrows/config.h b/keyboards/salicylic_acid3/ergoarrows/config.h
similarity index 100%
rename from keyboards/ergoarrows/config.h
rename to keyboards/salicylic_acid3/ergoarrows/config.h
diff --git a/keyboards/ergoarrows/ergoarrows.c b/keyboards/salicylic_acid3/ergoarrows/ergoarrows.c
similarity index 100%
rename from keyboards/ergoarrows/ergoarrows.c
rename to keyboards/salicylic_acid3/ergoarrows/ergoarrows.c
diff --git a/keyboards/ergoarrows/ergoarrows.h b/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h
similarity index 100%
rename from keyboards/ergoarrows/ergoarrows.h
rename to keyboards/salicylic_acid3/ergoarrows/ergoarrows.h
diff --git a/keyboards/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
similarity index 100%
rename from keyboards/ergoarrows/info.json
rename to keyboards/salicylic_acid3/ergoarrows/info.json
diff --git a/keyboards/ergoarrows/keymaps/default/config.h b/keyboards/salicylic_acid3/ergoarrows/keymaps/default/config.h
similarity index 100%
rename from keyboards/ergoarrows/keymaps/default/config.h
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/default/config.h
diff --git a/keyboards/ergoarrows/keymaps/default/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergoarrows/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/default/keymap.c
diff --git a/keyboards/ergoarrows/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/ergoarrows/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/config.h
diff --git a/keyboards/ergoarrows/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/ergoarrows/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
diff --git a/keyboards/ergoarrows/keymaps/via/config.h b/keyboards/salicylic_acid3/ergoarrows/keymaps/via/config.h
similarity index 100%
rename from keyboards/ergoarrows/keymaps/via/config.h
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/via/config.h
diff --git a/keyboards/ergoarrows/keymaps/via/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ergoarrows/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/via/keymap.c
diff --git a/keyboards/ergoarrows/keymaps/via/rules.mk b/keyboards/salicylic_acid3/ergoarrows/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ergoarrows/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/via/rules.mk
diff --git a/keyboards/ergoarrows/readme.md b/keyboards/salicylic_acid3/ergoarrows/readme.md
similarity index 95%
rename from keyboards/ergoarrows/readme.md
rename to keyboards/salicylic_acid3/ergoarrows/readme.md
index 00932548d1..93ad989415 100644
--- a/keyboards/ergoarrows/readme.md
+++ b/keyboards/salicylic_acid3/ergoarrows/readme.md
@@ -10,7 +10,7 @@ This is 76 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ergoarrows:default
+    make salicylic_acid3/ergoarrows: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).
 
diff --git a/keyboards/ergoarrows/rules.mk b/keyboards/salicylic_acid3/ergoarrows/rules.mk
similarity index 100%
rename from keyboards/ergoarrows/rules.mk
rename to keyboards/salicylic_acid3/ergoarrows/rules.mk
diff --git a/keyboards/getta25/.noci b/keyboards/salicylic_acid3/getta25/.noci
similarity index 100%
rename from keyboards/getta25/.noci
rename to keyboards/salicylic_acid3/getta25/.noci
diff --git a/keyboards/getta25/config.h b/keyboards/salicylic_acid3/getta25/config.h
similarity index 100%
rename from keyboards/getta25/config.h
rename to keyboards/salicylic_acid3/getta25/config.h
diff --git a/keyboards/getta25/getta25.c b/keyboards/salicylic_acid3/getta25/getta25.c
similarity index 100%
rename from keyboards/getta25/getta25.c
rename to keyboards/salicylic_acid3/getta25/getta25.c
diff --git a/keyboards/getta25/getta25.h b/keyboards/salicylic_acid3/getta25/getta25.h
similarity index 58%
rename from keyboards/getta25/getta25.h
rename to keyboards/salicylic_acid3/getta25/getta25.h
index ff44820173..67632bba4d 100644
--- a/keyboards/getta25/getta25.h
+++ b/keyboards/salicylic_acid3/getta25/getta25.h
@@ -2,6 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_getta25_rev1
+#ifdef KEYBOARD_salicylic_acid3_getta25_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/getta25/info.json b/keyboards/salicylic_acid3/getta25/info.json
similarity index 100%
rename from keyboards/getta25/info.json
rename to keyboards/salicylic_acid3/getta25/info.json
diff --git a/keyboards/getta25/keymaps/default/config.h b/keyboards/salicylic_acid3/getta25/keymaps/default/config.h
similarity index 100%
rename from keyboards/getta25/keymaps/default/config.h
rename to keyboards/salicylic_acid3/getta25/keymaps/default/config.h
diff --git a/keyboards/getta25/keymaps/default/keymap.c b/keyboards/salicylic_acid3/getta25/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/getta25/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/getta25/keymaps/default/keymap.c
diff --git a/keyboards/getta25/keymaps/oled/config.h b/keyboards/salicylic_acid3/getta25/keymaps/oled/config.h
similarity index 100%
rename from keyboards/getta25/keymaps/oled/config.h
rename to keyboards/salicylic_acid3/getta25/keymaps/oled/config.h
diff --git a/keyboards/getta25/keymaps/oled/glcdfont.c b/keyboards/salicylic_acid3/getta25/keymaps/oled/glcdfont.c
similarity index 100%
rename from keyboards/getta25/keymaps/oled/glcdfont.c
rename to keyboards/salicylic_acid3/getta25/keymaps/oled/glcdfont.c
diff --git a/keyboards/getta25/keymaps/oled/keymap.c b/keyboards/salicylic_acid3/getta25/keymaps/oled/keymap.c
similarity index 100%
rename from keyboards/getta25/keymaps/oled/keymap.c
rename to keyboards/salicylic_acid3/getta25/keymaps/oled/keymap.c
diff --git a/keyboards/getta25/keymaps/oled/rules.mk b/keyboards/salicylic_acid3/getta25/keymaps/oled/rules.mk
similarity index 100%
rename from keyboards/getta25/keymaps/oled/rules.mk
rename to keyboards/salicylic_acid3/getta25/keymaps/oled/rules.mk
diff --git a/keyboards/getta25/readme.md b/keyboards/salicylic_acid3/getta25/readme.md
similarity index 94%
rename from keyboards/getta25/readme.md
rename to keyboards/salicylic_acid3/getta25/readme.md
index 886e52a2ea..2f3e9d1f1b 100644
--- a/keyboards/getta25/readme.md
+++ b/keyboards/salicylic_acid3/getta25/readme.md
@@ -10,7 +10,7 @@ This is 25 keys tenkeypad.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make getta25:default
+    make salicylic_acid3/getta25/rev1: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).
 
diff --git a/keyboards/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h
similarity index 100%
rename from keyboards/getta25/rev1/config.h
rename to keyboards/salicylic_acid3/getta25/rev1/config.h
diff --git a/keyboards/getta25/rev1/rev1.c b/keyboards/salicylic_acid3/getta25/rev1/rev1.c
similarity index 100%
rename from keyboards/getta25/rev1/rev1.c
rename to keyboards/salicylic_acid3/getta25/rev1/rev1.c
diff --git a/keyboards/getta25/rev1/rev1.h b/keyboards/salicylic_acid3/getta25/rev1/rev1.h
similarity index 100%
rename from keyboards/getta25/rev1/rev1.h
rename to keyboards/salicylic_acid3/getta25/rev1/rev1.h
diff --git a/keyboards/getta25/rev1/rules.mk b/keyboards/salicylic_acid3/getta25/rev1/rules.mk
similarity index 100%
rename from keyboards/getta25/rev1/rules.mk
rename to keyboards/salicylic_acid3/getta25/rev1/rules.mk
diff --git a/keyboards/getta25/rules.mk b/keyboards/salicylic_acid3/getta25/rules.mk
similarity index 100%
rename from keyboards/getta25/rules.mk
rename to keyboards/salicylic_acid3/getta25/rules.mk
diff --git a/keyboards/jisplit89/.noci b/keyboards/salicylic_acid3/jisplit89/.noci
similarity index 100%
rename from keyboards/jisplit89/.noci
rename to keyboards/salicylic_acid3/jisplit89/.noci
diff --git a/keyboards/jisplit89/config.h b/keyboards/salicylic_acid3/jisplit89/config.h
similarity index 100%
rename from keyboards/jisplit89/config.h
rename to keyboards/salicylic_acid3/jisplit89/config.h
diff --git a/keyboards/jisplit89/info.json b/keyboards/salicylic_acid3/jisplit89/info.json
similarity index 100%
rename from keyboards/jisplit89/info.json
rename to keyboards/salicylic_acid3/jisplit89/info.json
diff --git a/keyboards/jisplit89/jisplit89.c b/keyboards/salicylic_acid3/jisplit89/jisplit89.c
similarity index 100%
rename from keyboards/jisplit89/jisplit89.c
rename to keyboards/salicylic_acid3/jisplit89/jisplit89.c
diff --git a/keyboards/jisplit89/jisplit89.h b/keyboards/salicylic_acid3/jisplit89/jisplit89.h
similarity index 93%
rename from keyboards/jisplit89/jisplit89.h
rename to keyboards/salicylic_acid3/jisplit89/jisplit89.h
index b59b5a66a2..8de2326de6 100644
--- a/keyboards/jisplit89/jisplit89.h
+++ b/keyboards/salicylic_acid3/jisplit89/jisplit89.h
@@ -17,6 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef KEYBOARD_jisplit89_rev1
+#ifdef KEYBOARD_salicylic_acid3_jisplit89_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/jisplit89/keymaps/default/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/jisplit89/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c
diff --git a/keyboards/jisplit89/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/jisplit89/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/config.h
diff --git a/keyboards/jisplit89/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/jisplit89/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
diff --git a/keyboards/jisplit89/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/jisplit89/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/rules.mk
diff --git a/keyboards/jisplit89/keymaps/via/config.h b/keyboards/salicylic_acid3/jisplit89/keymaps/via/config.h
similarity index 100%
rename from keyboards/jisplit89/keymaps/via/config.h
rename to keyboards/salicylic_acid3/jisplit89/keymaps/via/config.h
diff --git a/keyboards/jisplit89/keymaps/via/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/jisplit89/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
diff --git a/keyboards/jisplit89/keymaps/via/rules.mk b/keyboards/salicylic_acid3/jisplit89/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/jisplit89/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/jisplit89/keymaps/via/rules.mk
diff --git a/keyboards/jisplit89/readme.md b/keyboards/salicylic_acid3/jisplit89/readme.md
similarity index 94%
rename from keyboards/jisplit89/readme.md
rename to keyboards/salicylic_acid3/jisplit89/readme.md
index d222874577..df0994e109 100644
--- a/keyboards/jisplit89/readme.md
+++ b/keyboards/salicylic_acid3/jisplit89/readme.md
@@ -10,7 +10,7 @@ This is 89 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make jisplit89:default
+    make salicylic_acid3/jisplit89/rev1: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).
 
diff --git a/keyboards/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
similarity index 100%
rename from keyboards/jisplit89/rev1/config.h
rename to keyboards/salicylic_acid3/jisplit89/rev1/config.h
diff --git a/keyboards/jisplit89/rev1/rev1.c b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c
similarity index 100%
rename from keyboards/jisplit89/rev1/rev1.c
rename to keyboards/salicylic_acid3/jisplit89/rev1/rev1.c
diff --git a/keyboards/jisplit89/rev1/rev1.h b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h
similarity index 100%
rename from keyboards/jisplit89/rev1/rev1.h
rename to keyboards/salicylic_acid3/jisplit89/rev1/rev1.h
diff --git a/keyboards/jisplit89/rev1/rules.mk b/keyboards/salicylic_acid3/jisplit89/rev1/rules.mk
similarity index 100%
rename from keyboards/jisplit89/rev1/rules.mk
rename to keyboards/salicylic_acid3/jisplit89/rev1/rules.mk
diff --git a/keyboards/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk
similarity index 100%
rename from keyboards/jisplit89/rules.mk
rename to keyboards/salicylic_acid3/jisplit89/rules.mk
diff --git a/keyboards/nafuda/config.h b/keyboards/salicylic_acid3/nafuda/config.h
similarity index 100%
rename from keyboards/nafuda/config.h
rename to keyboards/salicylic_acid3/nafuda/config.h
diff --git a/keyboards/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json
similarity index 100%
rename from keyboards/nafuda/info.json
rename to keyboards/salicylic_acid3/nafuda/info.json
diff --git a/keyboards/nafuda/keymaps/default/config.h b/keyboards/salicylic_acid3/nafuda/keymaps/default/config.h
similarity index 100%
rename from keyboards/nafuda/keymaps/default/config.h
rename to keyboards/salicylic_acid3/nafuda/keymaps/default/config.h
diff --git a/keyboards/nafuda/keymaps/default/keymap.c b/keyboards/salicylic_acid3/nafuda/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nafuda/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/nafuda/keymaps/default/keymap.c
diff --git a/keyboards/nafuda/keymaps/default/readme.md b/keyboards/salicylic_acid3/nafuda/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nafuda/keymaps/default/readme.md
rename to keyboards/salicylic_acid3/nafuda/keymaps/default/readme.md
diff --git a/keyboards/nafuda/nafuda.c b/keyboards/salicylic_acid3/nafuda/nafuda.c
similarity index 100%
rename from keyboards/nafuda/nafuda.c
rename to keyboards/salicylic_acid3/nafuda/nafuda.c
diff --git a/keyboards/nafuda/nafuda.h b/keyboards/salicylic_acid3/nafuda/nafuda.h
similarity index 100%
rename from keyboards/nafuda/nafuda.h
rename to keyboards/salicylic_acid3/nafuda/nafuda.h
diff --git a/keyboards/nafuda/readme.md b/keyboards/salicylic_acid3/nafuda/readme.md
similarity index 95%
rename from keyboards/nafuda/readme.md
rename to keyboards/salicylic_acid3/nafuda/readme.md
index 73007ed01e..5df9b5df0f 100644
--- a/keyboards/nafuda/readme.md
+++ b/keyboards/salicylic_acid3/nafuda/readme.md
@@ -10,7 +10,7 @@ This is 7 keys cursor macropad.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nafuda:default
+    make salicylic_acid3/nafuda: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).
 
diff --git a/keyboards/nafuda/rules.mk b/keyboards/salicylic_acid3/nafuda/rules.mk
similarity index 100%
rename from keyboards/nafuda/rules.mk
rename to keyboards/salicylic_acid3/nafuda/rules.mk
diff --git a/keyboards/naked48/.noci b/keyboards/salicylic_acid3/naked48/.noci
similarity index 100%
rename from keyboards/naked48/.noci
rename to keyboards/salicylic_acid3/naked48/.noci
diff --git a/keyboards/naked48/config.h b/keyboards/salicylic_acid3/naked48/config.h
similarity index 100%
rename from keyboards/naked48/config.h
rename to keyboards/salicylic_acid3/naked48/config.h
diff --git a/keyboards/naked48/info.json b/keyboards/salicylic_acid3/naked48/info.json
similarity index 100%
rename from keyboards/naked48/info.json
rename to keyboards/salicylic_acid3/naked48/info.json
diff --git a/keyboards/naked48/keymaps/default/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/default/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/default/config.h
diff --git a/keyboards/naked48/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c
diff --git a/keyboards/naked48/keymaps/default/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/default/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/default/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/default/readme.md
diff --git a/keyboards/naked48/keymaps/default/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/default/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/default/rules.mk
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_nafuda/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_nafuda/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_nafuda/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/readme.md
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_nafuda/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/rules.mk
diff --git a/keyboards/naked48/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_setta21/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
diff --git a/keyboards/naked48/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_setta21/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c
diff --git a/keyboards/naked48/keymaps/default_with_setta21/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_setta21/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/readme.md
diff --git a/keyboards/naked48/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h
diff --git a/keyboards/naked48/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
diff --git a/keyboards/naked48/keymaps/salicylic/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic/readme.md
diff --git a/keyboards/naked48/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic/rules.mk
diff --git a/keyboards/naked48/keymaps/salicylic_with_nafuda/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_nafuda/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h
diff --git a/keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
diff --git a/keyboards/naked48/keymaps/salicylic_with_nafuda/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_nafuda/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/readme.md
diff --git a/keyboards/naked48/keymaps/salicylic_with_nafuda/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_nafuda/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/rules.mk
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_setta21/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_setta21/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/readme.md
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_setta21/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk
diff --git a/keyboards/naked48/keymaps/scheiklp/config.h b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/scheiklp/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/scheiklp/config.h
diff --git a/keyboards/naked48/keymaps/scheiklp/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/scheiklp/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/scheiklp/keymap.c
diff --git a/keyboards/naked48/keymaps/scheiklp/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/scheiklp/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/scheiklp/readme.md
diff --git a/keyboards/naked48/keymaps/scheiklp/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/scheiklp/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/scheiklp/rules.mk
diff --git a/keyboards/naked48/keymaps/via/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/via/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/via/config.h
diff --git a/keyboards/naked48/keymaps/via/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c
diff --git a/keyboards/naked48/keymaps/via/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk
diff --git a/keyboards/naked48/keymaps/via_rgb_matrix/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/via_rgb_matrix/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
diff --git a/keyboards/naked48/keymaps/via_rgb_matrix/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/via_rgb_matrix/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/keymap.c
diff --git a/keyboards/naked48/keymaps/via_rgb_matrix/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/via_rgb_matrix/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk
diff --git a/keyboards/naked48/naked48.c b/keyboards/salicylic_acid3/naked48/naked48.c
similarity index 100%
rename from keyboards/naked48/naked48.c
rename to keyboards/salicylic_acid3/naked48/naked48.c
diff --git a/keyboards/naked48/naked48.h b/keyboards/salicylic_acid3/naked48/naked48.h
similarity index 94%
rename from keyboards/naked48/naked48.h
rename to keyboards/salicylic_acid3/naked48/naked48.h
index e210cf0f57..bbfa6d2e84 100644
--- a/keyboards/naked48/naked48.h
+++ b/keyboards/salicylic_acid3/naked48/naked48.h
@@ -19,6 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_naked48_rev1
+#ifdef KEYBOARD_salicylic_acid3_naked48_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/naked48/readme.md b/keyboards/salicylic_acid3/naked48/readme.md
similarity index 94%
rename from keyboards/naked48/readme.md
rename to keyboards/salicylic_acid3/naked48/readme.md
index bb16571efd..c3a826f13e 100644
--- a/keyboards/naked48/readme.md
+++ b/keyboards/salicylic_acid3/naked48/readme.md
@@ -10,7 +10,7 @@ Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/PCB_
 
 Make example for this keyboard (after setting up your build environment):
 
-    make naked48:default:avrdude
+    make salicylic_acid3/naked48/rev1:default:avrdude
 
 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).
 
diff --git a/keyboards/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h
similarity index 100%
rename from keyboards/naked48/rev1/config.h
rename to keyboards/salicylic_acid3/naked48/rev1/config.h
diff --git a/keyboards/naked48/rev1/rev1.c b/keyboards/salicylic_acid3/naked48/rev1/rev1.c
similarity index 100%
rename from keyboards/naked48/rev1/rev1.c
rename to keyboards/salicylic_acid3/naked48/rev1/rev1.c
diff --git a/keyboards/naked48/rev1/rev1.h b/keyboards/salicylic_acid3/naked48/rev1/rev1.h
similarity index 100%
rename from keyboards/naked48/rev1/rev1.h
rename to keyboards/salicylic_acid3/naked48/rev1/rev1.h
diff --git a/keyboards/naked48/rev1/rules.mk b/keyboards/salicylic_acid3/naked48/rev1/rules.mk
similarity index 100%
rename from keyboards/naked48/rev1/rules.mk
rename to keyboards/salicylic_acid3/naked48/rev1/rules.mk
diff --git a/keyboards/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk
similarity index 100%
rename from keyboards/naked48/rules.mk
rename to keyboards/salicylic_acid3/naked48/rules.mk
diff --git a/keyboards/naked60/config.h b/keyboards/salicylic_acid3/naked60/config.h
similarity index 100%
rename from keyboards/naked60/config.h
rename to keyboards/salicylic_acid3/naked60/config.h
diff --git a/keyboards/naked60/info.json b/keyboards/salicylic_acid3/naked60/info.json
similarity index 100%
rename from keyboards/naked60/info.json
rename to keyboards/salicylic_acid3/naked60/info.json
diff --git a/keyboards/naked60/keymaps/333fred/config.h b/keyboards/salicylic_acid3/naked60/keymaps/333fred/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/333fred/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/333fred/config.h
diff --git a/keyboards/naked60/keymaps/333fred/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/333fred/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/333fred/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/333fred/keymap.c
diff --git a/keyboards/naked60/keymaps/default/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/default/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/default/config.h
diff --git a/keyboards/naked60/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c
diff --git a/keyboards/naked60/keymaps/default/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/default/readme.md
similarity index 100%
rename from keyboards/naked60/keymaps/default/readme.md
rename to keyboards/salicylic_acid3/naked60/keymaps/default/readme.md
diff --git a/keyboards/naked60/keymaps/default_with_nafuda/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/default_with_nafuda/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h
diff --git a/keyboards/naked60/keymaps/default_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/default_with_nafuda/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c
diff --git a/keyboards/naked60/keymaps/default_with_nafuda/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/readme.md
similarity index 100%
rename from keyboards/naked60/keymaps/default_with_nafuda/readme.md
rename to keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/readme.md
diff --git a/keyboards/naked60/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/default_with_setta21/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h
diff --git a/keyboards/naked60/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/default_with_setta21/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
diff --git a/keyboards/naked60/keymaps/default_with_setta21/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/readme.md
similarity index 100%
rename from keyboards/naked60/keymaps/default_with_setta21/readme.md
rename to keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/readme.md
diff --git a/keyboards/naked60/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic/config.h
diff --git a/keyboards/naked60/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
diff --git a/keyboards/naked60/keymaps/salicylic/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/readme.md
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic/readme.md
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic/readme.md
diff --git a/keyboards/naked60/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic/rules.mk
diff --git a/keyboards/naked60/keymaps/salicylic_with_nafuda/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_nafuda/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h
diff --git a/keyboards/naked60/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_nafuda/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
diff --git a/keyboards/naked60/keymaps/salicylic_with_nafuda/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/readme.md
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_nafuda/readme.md
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/readme.md
diff --git a/keyboards/naked60/keymaps/salicylic_with_nafuda/rules.mk b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/rules.mk
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_nafuda/rules.mk
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/rules.mk
diff --git a/keyboards/naked60/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_setta21/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h
diff --git a/keyboards/naked60/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_setta21/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
diff --git a/keyboards/naked60/keymaps/salicylic_with_setta21/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/readme.md
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_setta21/readme.md
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/readme.md
diff --git a/keyboards/naked60/keymaps/salicylic_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/rules.mk
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_setta21/rules.mk
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/rules.mk
diff --git a/keyboards/naked60/keymaps/via/config.h b/keyboards/salicylic_acid3/naked60/keymaps/via/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/via/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/via/config.h
diff --git a/keyboards/naked60/keymaps/via/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/via/keymap.c
diff --git a/keyboards/naked60/keymaps/via/rules.mk b/keyboards/salicylic_acid3/naked60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/naked60/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/naked60/keymaps/via/rules.mk
diff --git a/keyboards/naked60/naked60.c b/keyboards/salicylic_acid3/naked60/naked60.c
similarity index 100%
rename from keyboards/naked60/naked60.c
rename to keyboards/salicylic_acid3/naked60/naked60.c
diff --git a/keyboards/naked60/naked60.h b/keyboards/salicylic_acid3/naked60/naked60.h
similarity index 94%
rename from keyboards/naked60/naked60.h
rename to keyboards/salicylic_acid3/naked60/naked60.h
index 4952b6b076..9ad73df67f 100644
--- a/keyboards/naked60/naked60.h
+++ b/keyboards/salicylic_acid3/naked60/naked60.h
@@ -19,6 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_naked60_rev1
+#ifdef KEYBOARD_salicylic_acid3_naked60_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/naked60/readme.md b/keyboards/salicylic_acid3/naked60/readme.md
similarity index 94%
rename from keyboards/naked60/readme.md
rename to keyboards/salicylic_acid3/naked60/readme.md
index 60bb164377..e44aa64a44 100644
--- a/keyboards/naked60/readme.md
+++ b/keyboards/salicylic_acid3/naked60/readme.md
@@ -10,7 +10,7 @@ Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/PCB_
 
 Make example for this keyboard (after setting up your build environment):
 
-    make naked60:default:avrdude
+    make salicylic_acid3/naked60/rev1:default:avrdude
 
 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).
 
diff --git a/keyboards/naked60/rev1/config.h b/keyboards/salicylic_acid3/naked60/rev1/config.h
similarity index 100%
rename from keyboards/naked60/rev1/config.h
rename to keyboards/salicylic_acid3/naked60/rev1/config.h
diff --git a/keyboards/naked60/rev1/rev1.c b/keyboards/salicylic_acid3/naked60/rev1/rev1.c
similarity index 100%
rename from keyboards/naked60/rev1/rev1.c
rename to keyboards/salicylic_acid3/naked60/rev1/rev1.c
diff --git a/keyboards/naked60/rev1/rev1.h b/keyboards/salicylic_acid3/naked60/rev1/rev1.h
similarity index 100%
rename from keyboards/naked60/rev1/rev1.h
rename to keyboards/salicylic_acid3/naked60/rev1/rev1.h
diff --git a/keyboards/naked60/rev1/rules.mk b/keyboards/salicylic_acid3/naked60/rev1/rules.mk
similarity index 100%
rename from keyboards/naked60/rev1/rules.mk
rename to keyboards/salicylic_acid3/naked60/rev1/rules.mk
diff --git a/keyboards/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk
similarity index 100%
rename from keyboards/naked60/rules.mk
rename to keyboards/salicylic_acid3/naked60/rules.mk
diff --git a/keyboards/naked64/.noci b/keyboards/salicylic_acid3/naked64/.noci
similarity index 100%
rename from keyboards/naked64/.noci
rename to keyboards/salicylic_acid3/naked64/.noci
diff --git a/keyboards/naked64/config.h b/keyboards/salicylic_acid3/naked64/config.h
similarity index 100%
rename from keyboards/naked64/config.h
rename to keyboards/salicylic_acid3/naked64/config.h
diff --git a/keyboards/naked64/info.json b/keyboards/salicylic_acid3/naked64/info.json
similarity index 100%
rename from keyboards/naked64/info.json
rename to keyboards/salicylic_acid3/naked64/info.json
diff --git a/keyboards/naked64/keymaps/default/config.h b/keyboards/salicylic_acid3/naked64/keymaps/default/config.h
similarity index 100%
rename from keyboards/naked64/keymaps/default/config.h
rename to keyboards/salicylic_acid3/naked64/keymaps/default/config.h
diff --git a/keyboards/naked64/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/naked64/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c
diff --git a/keyboards/naked64/keymaps/default/readme.md b/keyboards/salicylic_acid3/naked64/keymaps/default/readme.md
similarity index 100%
rename from keyboards/naked64/keymaps/default/readme.md
rename to keyboards/salicylic_acid3/naked64/keymaps/default/readme.md
diff --git a/keyboards/naked64/keymaps/default/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/naked64/keymaps/default/rules.mk
rename to keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk
diff --git a/keyboards/naked64/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
similarity index 100%
rename from keyboards/naked64/keymaps/default_with_setta21/config.h
rename to keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
diff --git a/keyboards/naked64/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c
similarity index 100%
rename from keyboards/naked64/keymaps/default_with_setta21/keymap.c
rename to keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c
diff --git a/keyboards/naked64/keymaps/default_with_setta21/readme.md b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/readme.md
similarity index 100%
rename from keyboards/naked64/keymaps/default_with_setta21/readme.md
rename to keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/readme.md
diff --git a/keyboards/naked64/keymaps/default_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk
similarity index 100%
rename from keyboards/naked64/keymaps/default_with_setta21/rules.mk
rename to keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk
diff --git a/keyboards/naked64/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic/config.h
diff --git a/keyboards/naked64/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
diff --git a/keyboards/naked64/keymaps/salicylic/readme.md b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/readme.md
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic/readme.md
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic/readme.md
diff --git a/keyboards/naked64/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic/rules.mk
diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic_with_setta21/config.h
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h
diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/readme.md b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/readme.md
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic_with_setta21/readme.md
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/readme.md
diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/rules.mk
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic_with_setta21/rules.mk
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/rules.mk
diff --git a/keyboards/naked64/naked64.c b/keyboards/salicylic_acid3/naked64/naked64.c
similarity index 100%
rename from keyboards/naked64/naked64.c
rename to keyboards/salicylic_acid3/naked64/naked64.c
diff --git a/keyboards/naked64/naked64.h b/keyboards/salicylic_acid3/naked64/naked64.h
similarity index 58%
rename from keyboards/naked64/naked64.h
rename to keyboards/salicylic_acid3/naked64/naked64.h
index a131440118..cb73e2142d 100644
--- a/keyboards/naked64/naked64.h
+++ b/keyboards/salicylic_acid3/naked64/naked64.h
@@ -2,6 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_naked64_rev1
+#ifdef KEYBOARD_salicylic_acid3_naked64_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/naked64/readme.md b/keyboards/salicylic_acid3/naked64/readme.md
similarity index 95%
rename from keyboards/naked64/readme.md
rename to keyboards/salicylic_acid3/naked64/readme.md
index 403e5cf4ae..ab02be74f5 100644
--- a/keyboards/naked64/readme.md
+++ b/keyboards/salicylic_acid3/naked64/readme.md
@@ -10,7 +10,7 @@ Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/PCB_
 
 Make example for this keyboard (after setting up your build environment):
 
-    make naked64:default:flash
+    make salicylic_acid3/naked64/rev1: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).
 
diff --git a/keyboards/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h
similarity index 100%
rename from keyboards/naked64/rev1/config.h
rename to keyboards/salicylic_acid3/naked64/rev1/config.h
diff --git a/keyboards/naked64/rev1/rev1.c b/keyboards/salicylic_acid3/naked64/rev1/rev1.c
similarity index 100%
rename from keyboards/naked64/rev1/rev1.c
rename to keyboards/salicylic_acid3/naked64/rev1/rev1.c
diff --git a/keyboards/naked64/rev1/rev1.h b/keyboards/salicylic_acid3/naked64/rev1/rev1.h
similarity index 100%
rename from keyboards/naked64/rev1/rev1.h
rename to keyboards/salicylic_acid3/naked64/rev1/rev1.h
diff --git a/keyboards/naked64/rev1/rules.mk b/keyboards/salicylic_acid3/naked64/rev1/rules.mk
similarity index 100%
rename from keyboards/naked64/rev1/rules.mk
rename to keyboards/salicylic_acid3/naked64/rev1/rules.mk
diff --git a/keyboards/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk
similarity index 100%
rename from keyboards/naked64/rules.mk
rename to keyboards/salicylic_acid3/naked64/rules.mk
diff --git a/keyboards/nknl7en/config.h b/keyboards/salicylic_acid3/nknl7en/config.h
similarity index 100%
rename from keyboards/nknl7en/config.h
rename to keyboards/salicylic_acid3/nknl7en/config.h
diff --git a/keyboards/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json
similarity index 100%
rename from keyboards/nknl7en/info.json
rename to keyboards/salicylic_acid3/nknl7en/info.json
diff --git a/keyboards/nknl7en/keymaps/default/config.h b/keyboards/salicylic_acid3/nknl7en/keymaps/default/config.h
similarity index 100%
rename from keyboards/nknl7en/keymaps/default/config.h
rename to keyboards/salicylic_acid3/nknl7en/keymaps/default/config.h
diff --git a/keyboards/nknl7en/keymaps/default/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nknl7en/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c
diff --git a/keyboards/nknl7en/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/nknl7en/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/config.h
diff --git a/keyboards/nknl7en/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/nknl7en/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
diff --git a/keyboards/nknl7en/keymaps/via/config.h b/keyboards/salicylic_acid3/nknl7en/keymaps/via/config.h
similarity index 100%
rename from keyboards/nknl7en/keymaps/via/config.h
rename to keyboards/salicylic_acid3/nknl7en/keymaps/via/config.h
diff --git a/keyboards/nknl7en/keymaps/via/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nknl7en/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c
diff --git a/keyboards/nknl7en/keymaps/via/rules.mk b/keyboards/salicylic_acid3/nknl7en/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nknl7en/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/nknl7en/keymaps/via/rules.mk
diff --git a/keyboards/nknl7en/nknl7en.c b/keyboards/salicylic_acid3/nknl7en/nknl7en.c
similarity index 100%
rename from keyboards/nknl7en/nknl7en.c
rename to keyboards/salicylic_acid3/nknl7en/nknl7en.c
diff --git a/keyboards/nknl7en/nknl7en.h b/keyboards/salicylic_acid3/nknl7en/nknl7en.h
similarity index 100%
rename from keyboards/nknl7en/nknl7en.h
rename to keyboards/salicylic_acid3/nknl7en/nknl7en.h
diff --git a/keyboards/nknl7en/readme.md b/keyboards/salicylic_acid3/nknl7en/readme.md
similarity index 95%
rename from keyboards/nknl7en/readme.md
rename to keyboards/salicylic_acid3/nknl7en/readme.md
index 5cbffae30c..07f87e3e5e 100644
--- a/keyboards/nknl7en/readme.md
+++ b/keyboards/salicylic_acid3/nknl7en/readme.md
@@ -10,7 +10,7 @@ This is 70 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nknl7en:default
+    make salicylic_acid3/nknl7en: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).
 
diff --git a/keyboards/nknl7en/rules.mk b/keyboards/salicylic_acid3/nknl7en/rules.mk
similarity index 100%
rename from keyboards/nknl7en/rules.mk
rename to keyboards/salicylic_acid3/nknl7en/rules.mk
diff --git a/keyboards/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h
similarity index 100%
rename from keyboards/nknl7jp/config.h
rename to keyboards/salicylic_acid3/nknl7jp/config.h
diff --git a/keyboards/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json
similarity index 100%
rename from keyboards/nknl7jp/info.json
rename to keyboards/salicylic_acid3/nknl7jp/info.json
diff --git a/keyboards/nknl7jp/keymaps/default/config.h b/keyboards/salicylic_acid3/nknl7jp/keymaps/default/config.h
similarity index 100%
rename from keyboards/nknl7jp/keymaps/default/config.h
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/default/config.h
diff --git a/keyboards/nknl7jp/keymaps/default/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nknl7jp/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c
diff --git a/keyboards/nknl7jp/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/nknl7jp/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h
diff --git a/keyboards/nknl7jp/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/nknl7jp/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
diff --git a/keyboards/nknl7jp/keymaps/via/config.h b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/config.h
similarity index 100%
rename from keyboards/nknl7jp/keymaps/via/config.h
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/via/config.h
diff --git a/keyboards/nknl7jp/keymaps/via/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nknl7jp/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
diff --git a/keyboards/nknl7jp/keymaps/via/rules.mk b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nknl7jp/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/via/rules.mk
diff --git a/keyboards/nknl7jp/nknl7jp.c b/keyboards/salicylic_acid3/nknl7jp/nknl7jp.c
similarity index 100%
rename from keyboards/nknl7jp/nknl7jp.c
rename to keyboards/salicylic_acid3/nknl7jp/nknl7jp.c
diff --git a/keyboards/nknl7jp/nknl7jp.h b/keyboards/salicylic_acid3/nknl7jp/nknl7jp.h
similarity index 100%
rename from keyboards/nknl7jp/nknl7jp.h
rename to keyboards/salicylic_acid3/nknl7jp/nknl7jp.h
diff --git a/keyboards/nknl7jp/readme.md b/keyboards/salicylic_acid3/nknl7jp/readme.md
similarity index 95%
rename from keyboards/nknl7jp/readme.md
rename to keyboards/salicylic_acid3/nknl7jp/readme.md
index 9d0ccba4e8..b2f375aef8 100644
--- a/keyboards/nknl7jp/readme.md
+++ b/keyboards/salicylic_acid3/nknl7jp/readme.md
@@ -10,7 +10,7 @@ This is 73 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nknl7jp:default
+    make salicylic_acid3/nknl7jp: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).
 
diff --git a/keyboards/nknl7jp/rules.mk b/keyboards/salicylic_acid3/nknl7jp/rules.mk
similarity index 100%
rename from keyboards/nknl7jp/rules.mk
rename to keyboards/salicylic_acid3/nknl7jp/rules.mk
diff --git a/keyboards/setta21/config.h b/keyboards/salicylic_acid3/setta21/config.h
similarity index 100%
rename from keyboards/setta21/config.h
rename to keyboards/salicylic_acid3/setta21/config.h
diff --git a/keyboards/setta21/info.json b/keyboards/salicylic_acid3/setta21/info.json
similarity index 100%
rename from keyboards/setta21/info.json
rename to keyboards/salicylic_acid3/setta21/info.json
diff --git a/keyboards/setta21/keymaps/default/config.h b/keyboards/salicylic_acid3/setta21/keymaps/default/config.h
similarity index 100%
rename from keyboards/setta21/keymaps/default/config.h
rename to keyboards/salicylic_acid3/setta21/keymaps/default/config.h
diff --git a/keyboards/setta21/keymaps/default/keymap.c b/keyboards/salicylic_acid3/setta21/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/setta21/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/setta21/keymaps/default/keymap.c
diff --git a/keyboards/setta21/keymaps/default/readme.md b/keyboards/salicylic_acid3/setta21/keymaps/default/readme.md
similarity index 100%
rename from keyboards/setta21/keymaps/default/readme.md
rename to keyboards/salicylic_acid3/setta21/keymaps/default/readme.md
diff --git a/keyboards/setta21/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/setta21/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h
diff --git a/keyboards/setta21/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/setta21/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c
diff --git a/keyboards/setta21/keymaps/salicylic/readme.md b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/readme.md
similarity index 100%
rename from keyboards/setta21/keymaps/salicylic/readme.md
rename to keyboards/salicylic_acid3/setta21/keymaps/salicylic/readme.md
diff --git a/keyboards/setta21/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/setta21/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk
diff --git a/keyboards/setta21/readme.md b/keyboards/salicylic_acid3/setta21/readme.md
similarity index 94%
rename from keyboards/setta21/readme.md
rename to keyboards/salicylic_acid3/setta21/readme.md
index c940079997..25027b7281 100644
--- a/keyboards/setta21/readme.md
+++ b/keyboards/salicylic_acid3/setta21/readme.md
@@ -10,7 +10,7 @@ This is 21 keys tenkeypad.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make setta21:default
+    make salicylic_acid3/setta21/rev1: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).
 
diff --git a/keyboards/setta21/rev1/.noci b/keyboards/salicylic_acid3/setta21/rev1/.noci
similarity index 100%
rename from keyboards/setta21/rev1/.noci
rename to keyboards/salicylic_acid3/setta21/rev1/.noci
diff --git a/keyboards/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h
similarity index 100%
rename from keyboards/setta21/rev1/config.h
rename to keyboards/salicylic_acid3/setta21/rev1/config.h
diff --git a/keyboards/setta21/rev1/rev1.c b/keyboards/salicylic_acid3/setta21/rev1/rev1.c
similarity index 100%
rename from keyboards/setta21/rev1/rev1.c
rename to keyboards/salicylic_acid3/setta21/rev1/rev1.c
diff --git a/keyboards/setta21/rev1/rev1.h b/keyboards/salicylic_acid3/setta21/rev1/rev1.h
similarity index 100%
rename from keyboards/setta21/rev1/rev1.h
rename to keyboards/salicylic_acid3/setta21/rev1/rev1.h
diff --git a/keyboards/setta21/rev1/rules.mk b/keyboards/salicylic_acid3/setta21/rev1/rules.mk
similarity index 100%
rename from keyboards/setta21/rev1/rules.mk
rename to keyboards/salicylic_acid3/setta21/rev1/rules.mk
diff --git a/keyboards/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk
similarity index 100%
rename from keyboards/setta21/rules.mk
rename to keyboards/salicylic_acid3/setta21/rules.mk
diff --git a/keyboards/setta21/setta21.c b/keyboards/salicylic_acid3/setta21/setta21.c
similarity index 100%
rename from keyboards/setta21/setta21.c
rename to keyboards/salicylic_acid3/setta21/setta21.c
diff --git a/keyboards/setta21/setta21.h b/keyboards/salicylic_acid3/setta21/setta21.h
similarity index 58%
rename from keyboards/setta21/setta21.h
rename to keyboards/salicylic_acid3/setta21/setta21.h
index 0409f6cbc2..9e5b17e2c3 100644
--- a/keyboards/setta21/setta21.h
+++ b/keyboards/salicylic_acid3/setta21/setta21.h
@@ -2,6 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_setta21_rev1
+#ifdef KEYBOARD_salicylic_acid3_setta21_rev1
   #include "rev1.h"
 #endif

From d9d8526ca2a7d95cd78d005c11cb86779428e61c Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 11 Jan 2022 07:04:54 +0800
Subject: [PATCH 207/867] [Keyboard] Update Cradio readme (#15784)

---
 keyboards/cradio/readme.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/keyboards/cradio/readme.md b/keyboards/cradio/readme.md
index e538a417dc..c6013006d4 100644
--- a/keyboards/cradio/readme.md
+++ b/keyboards/cradio/readme.md
@@ -1,19 +1,18 @@
 # Cradio keyboards
 
-![Cradio](https://github.com/davidphilipbarr/hypergolic/raw/main/hypergarlic/ht.png)
+![Cradio](https://raw.githubusercontent.com/filterpaper/filterpaper.github.io/main/images/cradio.png)
 
-Cradio are low-profile 34-key split-keyboards designed by [@davidphilipbarr](https://github.com/davidphilipbarr), with no diodes and direct micro-controller pin wiring.
+Cradio are minimalist 34-key split-keyboards designed with no diodes, using direct micro-controller pin wiring.
 
 ## Keyboard Info
 
-* Keyboard Maintainer: [davidphilipbarr](https://github.com/davidphilipbarr)
+* Keyboard Maintainer: [David Barr](https://github.com/davidphilipbarr)
 * Hardware Supported:
     * [Cradio](https://github.com/davidphilipbarr/36keys/tree/master/34Keys)
     * [Sweep](https://github.com/davidphilipbarr/Sweep)
-    * [Hypergarlic](https://github.com/davidphilipbarr/hypergolic/tree/main/hypergarlic)
-    * [Paroxysm](https://github.com/davidphilipbarr/hypergolic/tree/main/paroxysm)
+    * [Hypergolic](https://github.com/davidphilipbarr/hypergolic)
     * Variants of the same 34-key direct pin PCB
-* Hardware Availability: order PCBs with gerber files from the repository
+* Hardware Availability: order PCBs using gerber files from the repository
 
 Make example for this keyboard (after setting up your build environment):
 

From 590ec4ae047146a0e04be9b11ef6e2c062e4dfb0 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 10 Jan 2022 15:05:29 -0800
Subject: [PATCH 208/867] add ortho_4x16 Community Layout (#15776)

---
 .../ortho_4x16/default_ortho_4x16/keymap.c    | 61 +++++++++++++++
 layouts/default/ortho_4x16/info.json          | 78 +++++++++++++++++++
 layouts/default/ortho_4x16/layout.json        |  4 +
 layouts/default/ortho_4x16/readme.md          |  3 +
 layouts/default/readme.md                     | 13 ++++
 5 files changed, 159 insertions(+)
 create mode 100644 layouts/default/ortho_4x16/default_ortho_4x16/keymap.c
 create mode 100644 layouts/default/ortho_4x16/info.json
 create mode 100644 layouts/default/ortho_4x16/layout.json
 create mode 100644 layouts/default/ortho_4x16/readme.md

diff --git a/layouts/default/ortho_4x16/default_ortho_4x16/keymap.c b/layouts/default/ortho_4x16/default_ortho_4x16/keymap.c
new file mode 100644
index 0000000000..0703038bdf
--- /dev/null
+++ b/layouts/default/ortho_4x16/default_ortho_4x16/keymap.c
@@ -0,0 +1,61 @@
+// Copyright 2022 QMK (James Young @noroadsleft)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Tab│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │BS │ 7 │ 8 │ 9 │ / │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┬───┬───┬───┬───┼───┼───┼───┼───┤
+     * │Esc│ A │ S │ D │ F │ G │ H │ J │ K │ L │;: │'" │ 4 │ 5 │ 6 │ * │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Sft│ Z │ X │ C │ V │ B │ N │ M │,< │.> │/? │Ent│ 1 │ 2 │ 3 │ - │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │ ` │Ctl│GUI│Alt│Fn │   │   │Fn2│Lft│Dwn│Up │Rgt│ 0 │ . │Ent│ + │
+     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_ortho_4x16(
+        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_P7,   KC_P8,   KC_P9,   KC_PSLS,
+        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_P4,   KC_P5,   KC_P6,   KC_PAST,
+        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_P1,   KC_P2,   KC_P3,   KC_PMNS,
+        KC_GRV,  KC_LCTL, KC_LGUI, KC_LALT, MO(1),   KC_SPC,  KC_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_P0,   KC_PDOT, KC_PENT, KC_PPLS
+    ),
+
+    /* Lower
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │BS │   │   │   │   │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Del│F1 │F2 │F3 │F4 │F5 │F6 │ _ │ + │ { │ } │ │ │   │   │   │   │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │   │F7 │F8 │F9 │F10│F11│F12│#~ │\| │Hom│End│   │   │   │   │   │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │   │   │   │   │   │   │   │Nxt│Vl─│Vl+│Ply│   │   │   │   │   │
+     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+     */
+    [1] = LAYOUT_ortho_4x16(
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC, _______, _______, _______, _______,
+        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______,
+        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______
+    ),
+
+    /* Raise
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │BS │   │   │   │   │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │Del│F1 │F2 │F3 │F4 │F5 │F6 │ - │ = │ [ │ ] │ \ │   │   │   │   │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │   │F7 │F8 │F9 │F10│F11│F12│ # │ \ │PUp│PDn│   │   │   │   │   │
+     * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+     * │   │   │   │   │   │   │   │   │Nxt│Vl-│Vl+│Ply│   │   │   │   │
+     * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+     */
+    [2] = LAYOUT_ortho_4x16(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, _______, _______, _______, _______,
+        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, _______, _______, _______, _______,
+        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______, _______, _______
+    ),
+
+};
diff --git a/layouts/default/ortho_4x16/info.json b/layouts/default/ortho_4x16/info.json
new file mode 100644
index 0000000000..94ad23c78d
--- /dev/null
+++ b/layouts/default/ortho_4x16/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "4x16 ortholinear layout",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_ortho_4x16": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1, "y":1},
+                {"x":2, "y":1},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":6, "y":1},
+                {"x":7, "y":1},
+                {"x":8, "y":1},
+                {"x":9, "y":1},
+                {"x":10, "y":1},
+                {"x":11, "y":1},
+                {"x":12, "y":1},
+                {"x":13, "y":1},
+                {"x":14, "y":1},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+                {"x":4, "y":2},
+                {"x":5, "y":2},
+                {"x":6, "y":2},
+                {"x":7, "y":2},
+                {"x":8, "y":2},
+                {"x":9, "y":2},
+                {"x":10, "y":2},
+                {"x":11, "y":2},
+                {"x":12, "y":2},
+                {"x":13, "y":2},
+                {"x":14, "y":2},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3},
+                {"x":1, "y":3},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
+                {"x":15, "y":3}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/ortho_4x16/layout.json b/layouts/default/ortho_4x16/layout.json
new file mode 100644
index 0000000000..6f5785f39a
--- /dev/null
+++ b/layouts/default/ortho_4x16/layout.json
@@ -0,0 +1,4 @@
+["","","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","","",""],
+["","","","","","","","","","","","","","","",""]
diff --git a/layouts/default/ortho_4x16/readme.md b/layouts/default/ortho_4x16/readme.md
new file mode 100644
index 0000000000..6dce03f51a
--- /dev/null
+++ b/layouts/default/ortho_4x16/readme.md
@@ -0,0 +1,3 @@
+# ortho_4x16
+
+    LAYOUT_ortho_4x16
diff --git a/layouts/default/readme.md b/layouts/default/readme.md
index 25d56cb558..1601b95c0f 100644
--- a/layouts/default/readme.md
+++ b/layouts/default/readme.md
@@ -856,6 +856,19 @@ LAYOUT_ortho_4x12
 └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
 ```
 
+```
+LAYOUT_ortho_4x16
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+```
+
 ```
 LAYOUT_ortho_4x4
 ┌───┬───┬───┬───┐

From 53359ab2eecbf14ccd0c8dc3ccf156086b3e5432 Mon Sep 17 00:00:00 2001
From: Evelien Dekkers <sixmoonskies@gmail.com>
Date: Tue, 11 Jan 2022 00:06:19 +0100
Subject: [PATCH 209/867] [Keyboard] Add Aves60 (#15770)

---
 keyboards/aves60/aves60.c                  |   4 +
 keyboards/aves60/aves60.h                  | 122 +++++
 keyboards/aves60/config.h                  | 139 ++++++
 keyboards/aves60/info.json                 | 512 +++++++++++++++++++++
 keyboards/aves60/keymaps/default/keymap.c  |  27 ++
 keyboards/aves60/keymaps/default/readme.md |   1 +
 keyboards/aves60/keymaps/via/keymap.c      |  43 ++
 keyboards/aves60/keymaps/via/rules.mk      |   2 +
 keyboards/aves60/readme.md                 |  27 ++
 keyboards/aves60/rules.mk                  |  18 +
 10 files changed, 895 insertions(+)
 create mode 100644 keyboards/aves60/aves60.c
 create mode 100644 keyboards/aves60/aves60.h
 create mode 100644 keyboards/aves60/config.h
 create mode 100644 keyboards/aves60/info.json
 create mode 100644 keyboards/aves60/keymaps/default/keymap.c
 create mode 100644 keyboards/aves60/keymaps/default/readme.md
 create mode 100644 keyboards/aves60/keymaps/via/keymap.c
 create mode 100644 keyboards/aves60/keymaps/via/rules.mk
 create mode 100644 keyboards/aves60/readme.md
 create mode 100644 keyboards/aves60/rules.mk

diff --git a/keyboards/aves60/aves60.c b/keyboards/aves60/aves60.c
new file mode 100644
index 0000000000..4931deb7c9
--- /dev/null
+++ b/keyboards/aves60/aves60.c
@@ -0,0 +1,4 @@
+// Copyright 2021 Evelien Dekkers (@evyd13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "aves60.h"
diff --git a/keyboards/aves60/aves60.h b/keyboards/aves60/aves60.h
new file mode 100644
index 0000000000..7340114306
--- /dev/null
+++ b/keyboards/aves60/aves60.h
@@ -0,0 +1,122 @@
+// Copyright 2021 Evelien Dekkers (@evyd13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42,      k44,      k46, k47,           k4a, k4b, k4c, k4d  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
+    { k40, k41, k42, XXX, k44, XXX, k46, k47, XXX, XXX, k4a, k4b, k4c, k4d }  \
+}
+
+#define LAYOUT_60_ansi_split_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d }  \
+}
+
+#define LAYOUT_60_ansi_split_bs_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d }  \
+}
+
+#define LAYOUT_60_ansi_split_bs_rshift_space( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42,      k44,      k46,      k47,      k4a, k4b, k4c, k4d  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
+    { k40, k41, k42, XXX, k44, XXX, k46, k47, XXX, XXX, k4a, k4b, k4c, k4d }  \
+}
+
+#define LAYOUT_60_iso_split_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d }  \
+}
+
+#define LAYOUT_60_iso_split_bs_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d }  \
+}
+
+#define LAYOUT_60_iso_split_bs_rshift_space( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42,      k44,      k46,      k47,      k4a, k4b, k4c, k4d  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
+    { k40, k41, k42, XXX, k44, XXX, k46, k47, XXX, XXX, k4a, k4b, k4c, k4d }  \
+}
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
new file mode 100644
index 0000000000..9f90b2109e
--- /dev/null
+++ b/keyboards/aves60/config.h
@@ -0,0 +1,139 @@
+// Copyright 2021 Evelien Dekkers (@evyd13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x9991
+#define PRODUCT_ID      0xD408
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    I/O Keyboards
+#define PRODUCT         Aves 60
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * 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 { F6, F7, F5, F1, F4 }
+#define MATRIX_COL_PINS { B2, B3, D0, D1, D2, D3, C7, C6, B6, B5, B4, D7, D6, D4 }
+#define UNUSED_PINS { B0, B7, E6, F0 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN D5
+#ifdef RGB_DI_PIN
+#define RGBLED_NUM 9
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+#define RGBLIGHT_EFFECT_TWINKLE
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 4
+#define BOOTMAGIC_LITE_COLUMN 6
diff --git a/keyboards/aves60/info.json b/keyboards/aves60/info.json
new file mode 100644
index 0000000000..f921de058a
--- /dev/null
+++ b/keyboards/aves60/info.json
@@ -0,0 +1,512 @@
+{
+    "keyboard_name": "Aves60",
+    "url": "https://iokeyboards.eu/",
+    "maintainer": "evyd13",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":2.75},
+                {"x":6.5, "y":4, "w":1.25},
+                {"x":7.75, "y":4, "w":2.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift_space": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":2.75},
+                {"x":6.5, "y":4, "w":1.25},
+                {"x":7.75, "y":4, "w":2.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift_space": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":2.75},
+                {"x":6.5, "y":4, "w":1.25},
+                {"x":7.75, "y":4, "w":2.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/aves60/keymaps/default/keymap.c b/keyboards/aves60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ae27fadb71
--- /dev/null
+++ b/keyboards/aves60/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2021 Evelien Dekkers (@evyd13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_BASE] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN1),
+  KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
+
+[_FN1] = LAYOUT_all(
+  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,  _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______)
+};
diff --git a/keyboards/aves60/keymaps/default/readme.md b/keyboards/aves60/keymaps/default/readme.md
new file mode 100644
index 0000000000..ad8b72772a
--- /dev/null
+++ b/keyboards/aves60/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Aves60
diff --git a/keyboards/aves60/keymaps/via/keymap.c b/keyboards/aves60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..35fd15723e
--- /dev/null
+++ b/keyboards/aves60/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+// Copyright 2021 Evelien Dekkers (@evyd13)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_BASE] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+  KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN1),
+  KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_RGUI, KC_APP,  KC_RCTL),
+
+[_FN1] = LAYOUT_all(
+  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,  _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______),
+  
+[_FN2] = LAYOUT_all(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______),
+  
+[_FN3] = LAYOUT_all(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______)
+};
diff --git a/keyboards/aves60/keymaps/via/rules.mk b/keyboards/aves60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/aves60/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/aves60/readme.md b/keyboards/aves60/readme.md
new file mode 100644
index 0000000000..5a96d2b2eb
--- /dev/null
+++ b/keyboards/aves60/readme.md
@@ -0,0 +1,27 @@
+# aves60
+
+![Aves60](https://i.imgur.com/U5UpFAVl.jpg)
+
+A universally compatible 60% PCB.
+
+* Keyboard Maintainer: [Evelien Dekkers](https://github.com/evyd13)
+* Hardware Supported: Aves60 PCB
+* Hardware Availability: [I/O Keyboards](https://iokeyboards.eu/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aves60:default
+
+Flashing example for this keyboard:
+
+    make aves60:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the space bar and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/aves60/rules.mk b/keyboards/aves60/rules.mk
new file mode 100644
index 0000000000..1275531ef6
--- /dev/null
+++ b/keyboards/aves60/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From aafbe043f91a9d33afb516fda0afba069f88113c Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 07:06:37 +0800
Subject: [PATCH 210/867] [Keyboard] move lyso1 's boards into lyso1/ (#15767)

---
 keyboards/{ => lyso1}/lck75/config.h                   | 0
 keyboards/{ => lyso1}/lck75/info.json                  | 0
 keyboards/{ => lyso1}/lck75/keymaps/7u/keymap.c        | 0
 keyboards/{ => lyso1}/lck75/keymaps/7u_iso/keymap.c    | 0
 keyboards/{ => lyso1}/lck75/keymaps/7u_sbs/keymap.c    | 0
 keyboards/{ => lyso1}/lck75/keymaps/default/keymap.c   | 0
 keyboards/{ => lyso1}/lck75/keymaps/iso/keymap.c       | 0
 keyboards/{ => lyso1}/lck75/keymaps/iso_sbs/keymap.c   | 0
 keyboards/{ => lyso1}/lck75/keymaps/sbs/keymap.c       | 0
 keyboards/{ => lyso1}/lck75/keymaps/via/keymap.c       | 0
 keyboards/{ => lyso1}/lck75/keymaps/via/rules.mk       | 0
 keyboards/{ => lyso1}/lck75/lck75.c                    | 0
 keyboards/{ => lyso1}/lck75/lck75.h                    | 0
 keyboards/{ => lyso1}/lck75/readme.md                  | 4 ++--
 keyboards/{ => lyso1}/lck75/rules.mk                   | 0
 keyboards/{ => lyso1}/lefishe/config.h                 | 0
 keyboards/{ => lyso1}/lefishe/info.json                | 0
 keyboards/{ => lyso1}/lefishe/keymaps/default/keymap.c | 0
 keyboards/{ => lyso1}/lefishe/keymaps/wk_sbs/keymap.c  | 0
 keyboards/{ => lyso1}/lefishe/keymaps/wkl/keymap.c     | 0
 keyboards/{ => lyso1}/lefishe/keymaps/wkl_sbs/keymap.c | 0
 keyboards/{ => lyso1}/lefishe/lefishe.c                | 0
 keyboards/{ => lyso1}/lefishe/lefishe.h                | 0
 keyboards/{ => lyso1}/lefishe/readme.md                | 4 ++--
 keyboards/{ => lyso1}/lefishe/rules.mk                 | 0
 25 files changed, 4 insertions(+), 4 deletions(-)
 rename keyboards/{ => lyso1}/lck75/config.h (100%)
 rename keyboards/{ => lyso1}/lck75/info.json (100%)
 rename keyboards/{ => lyso1}/lck75/keymaps/7u/keymap.c (100%)
 rename keyboards/{ => lyso1}/lck75/keymaps/7u_iso/keymap.c (100%)
 rename keyboards/{ => lyso1}/lck75/keymaps/7u_sbs/keymap.c (100%)
 rename keyboards/{ => lyso1}/lck75/keymaps/default/keymap.c (100%)
 rename keyboards/{ => lyso1}/lck75/keymaps/iso/keymap.c (100%)
 rename keyboards/{ => lyso1}/lck75/keymaps/iso_sbs/keymap.c (100%)
 rename keyboards/{ => lyso1}/lck75/keymaps/sbs/keymap.c (100%)
 rename keyboards/{ => lyso1}/lck75/keymaps/via/keymap.c (100%)
 rename keyboards/{ => lyso1}/lck75/keymaps/via/rules.mk (100%)
 rename keyboards/{ => lyso1}/lck75/lck75.c (100%)
 rename keyboards/{ => lyso1}/lck75/lck75.h (100%)
 rename keyboards/{ => lyso1}/lck75/readme.md (90%)
 rename keyboards/{ => lyso1}/lck75/rules.mk (100%)
 rename keyboards/{ => lyso1}/lefishe/config.h (100%)
 rename keyboards/{ => lyso1}/lefishe/info.json (100%)
 rename keyboards/{ => lyso1}/lefishe/keymaps/default/keymap.c (100%)
 rename keyboards/{ => lyso1}/lefishe/keymaps/wk_sbs/keymap.c (100%)
 rename keyboards/{ => lyso1}/lefishe/keymaps/wkl/keymap.c (100%)
 rename keyboards/{ => lyso1}/lefishe/keymaps/wkl_sbs/keymap.c (100%)
 rename keyboards/{ => lyso1}/lefishe/lefishe.c (100%)
 rename keyboards/{ => lyso1}/lefishe/lefishe.h (100%)
 rename keyboards/{ => lyso1}/lefishe/readme.md (94%)
 rename keyboards/{ => lyso1}/lefishe/rules.mk (100%)

diff --git a/keyboards/lck75/config.h b/keyboards/lyso1/lck75/config.h
similarity index 100%
rename from keyboards/lck75/config.h
rename to keyboards/lyso1/lck75/config.h
diff --git a/keyboards/lck75/info.json b/keyboards/lyso1/lck75/info.json
similarity index 100%
rename from keyboards/lck75/info.json
rename to keyboards/lyso1/lck75/info.json
diff --git a/keyboards/lck75/keymaps/7u/keymap.c b/keyboards/lyso1/lck75/keymaps/7u/keymap.c
similarity index 100%
rename from keyboards/lck75/keymaps/7u/keymap.c
rename to keyboards/lyso1/lck75/keymaps/7u/keymap.c
diff --git a/keyboards/lck75/keymaps/7u_iso/keymap.c b/keyboards/lyso1/lck75/keymaps/7u_iso/keymap.c
similarity index 100%
rename from keyboards/lck75/keymaps/7u_iso/keymap.c
rename to keyboards/lyso1/lck75/keymaps/7u_iso/keymap.c
diff --git a/keyboards/lck75/keymaps/7u_sbs/keymap.c b/keyboards/lyso1/lck75/keymaps/7u_sbs/keymap.c
similarity index 100%
rename from keyboards/lck75/keymaps/7u_sbs/keymap.c
rename to keyboards/lyso1/lck75/keymaps/7u_sbs/keymap.c
diff --git a/keyboards/lck75/keymaps/default/keymap.c b/keyboards/lyso1/lck75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/lck75/keymaps/default/keymap.c
rename to keyboards/lyso1/lck75/keymaps/default/keymap.c
diff --git a/keyboards/lck75/keymaps/iso/keymap.c b/keyboards/lyso1/lck75/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/lck75/keymaps/iso/keymap.c
rename to keyboards/lyso1/lck75/keymaps/iso/keymap.c
diff --git a/keyboards/lck75/keymaps/iso_sbs/keymap.c b/keyboards/lyso1/lck75/keymaps/iso_sbs/keymap.c
similarity index 100%
rename from keyboards/lck75/keymaps/iso_sbs/keymap.c
rename to keyboards/lyso1/lck75/keymaps/iso_sbs/keymap.c
diff --git a/keyboards/lck75/keymaps/sbs/keymap.c b/keyboards/lyso1/lck75/keymaps/sbs/keymap.c
similarity index 100%
rename from keyboards/lck75/keymaps/sbs/keymap.c
rename to keyboards/lyso1/lck75/keymaps/sbs/keymap.c
diff --git a/keyboards/lck75/keymaps/via/keymap.c b/keyboards/lyso1/lck75/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/lck75/keymaps/via/keymap.c
rename to keyboards/lyso1/lck75/keymaps/via/keymap.c
diff --git a/keyboards/lck75/keymaps/via/rules.mk b/keyboards/lyso1/lck75/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/lck75/keymaps/via/rules.mk
rename to keyboards/lyso1/lck75/keymaps/via/rules.mk
diff --git a/keyboards/lck75/lck75.c b/keyboards/lyso1/lck75/lck75.c
similarity index 100%
rename from keyboards/lck75/lck75.c
rename to keyboards/lyso1/lck75/lck75.c
diff --git a/keyboards/lck75/lck75.h b/keyboards/lyso1/lck75/lck75.h
similarity index 100%
rename from keyboards/lck75/lck75.h
rename to keyboards/lyso1/lck75/lck75.h
diff --git a/keyboards/lck75/readme.md b/keyboards/lyso1/lck75/readme.md
similarity index 90%
rename from keyboards/lck75/readme.md
rename to keyboards/lyso1/lck75/readme.md
index 2ded56ebd2..bb3dd2626a 100644
--- a/keyboards/lck75/readme.md
+++ b/keyboards/lyso1/lck75/readme.md
@@ -8,10 +8,10 @@ A 75% keyboard that can be assembled with only through hole components, includin
 
 Make example for this keyboard (after setting up your build environment):
 
-    make lck75:default
+    make lyso1/lck75:default
 
 Flashing example for this keyboard:
 
-    make lck75:default:flash
+    make lyso1/lck75:default:flash
 
 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).
diff --git a/keyboards/lck75/rules.mk b/keyboards/lyso1/lck75/rules.mk
similarity index 100%
rename from keyboards/lck75/rules.mk
rename to keyboards/lyso1/lck75/rules.mk
diff --git a/keyboards/lefishe/config.h b/keyboards/lyso1/lefishe/config.h
similarity index 100%
rename from keyboards/lefishe/config.h
rename to keyboards/lyso1/lefishe/config.h
diff --git a/keyboards/lefishe/info.json b/keyboards/lyso1/lefishe/info.json
similarity index 100%
rename from keyboards/lefishe/info.json
rename to keyboards/lyso1/lefishe/info.json
diff --git a/keyboards/lefishe/keymaps/default/keymap.c b/keyboards/lyso1/lefishe/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/lefishe/keymaps/default/keymap.c
rename to keyboards/lyso1/lefishe/keymaps/default/keymap.c
diff --git a/keyboards/lefishe/keymaps/wk_sbs/keymap.c b/keyboards/lyso1/lefishe/keymaps/wk_sbs/keymap.c
similarity index 100%
rename from keyboards/lefishe/keymaps/wk_sbs/keymap.c
rename to keyboards/lyso1/lefishe/keymaps/wk_sbs/keymap.c
diff --git a/keyboards/lefishe/keymaps/wkl/keymap.c b/keyboards/lyso1/lefishe/keymaps/wkl/keymap.c
similarity index 100%
rename from keyboards/lefishe/keymaps/wkl/keymap.c
rename to keyboards/lyso1/lefishe/keymaps/wkl/keymap.c
diff --git a/keyboards/lefishe/keymaps/wkl_sbs/keymap.c b/keyboards/lyso1/lefishe/keymaps/wkl_sbs/keymap.c
similarity index 100%
rename from keyboards/lefishe/keymaps/wkl_sbs/keymap.c
rename to keyboards/lyso1/lefishe/keymaps/wkl_sbs/keymap.c
diff --git a/keyboards/lefishe/lefishe.c b/keyboards/lyso1/lefishe/lefishe.c
similarity index 100%
rename from keyboards/lefishe/lefishe.c
rename to keyboards/lyso1/lefishe/lefishe.c
diff --git a/keyboards/lefishe/lefishe.h b/keyboards/lyso1/lefishe/lefishe.h
similarity index 100%
rename from keyboards/lefishe/lefishe.h
rename to keyboards/lyso1/lefishe/lefishe.h
diff --git a/keyboards/lefishe/readme.md b/keyboards/lyso1/lefishe/readme.md
similarity index 94%
rename from keyboards/lefishe/readme.md
rename to keyboards/lyso1/lefishe/readme.md
index ae6ab1322e..eb8322b2df 100644
--- a/keyboards/lefishe/readme.md
+++ b/keyboards/lyso1/lefishe/readme.md
@@ -9,7 +9,7 @@ This pcb cab also be used as a replacement pcb for the revoKmini/kmacmini with s
 
 Make example for this keyboard (after setting up your build environment):
 
-    make lefishe:default
+    make lyso1/lefishe:default
 
 Enter into the bootloader to flash new firmware in 3 ways:
 
@@ -19,6 +19,6 @@ Enter into the bootloader to flash new firmware in 3 ways:
 
 Flashing example for this keyboard:
 
-    make lefishe:default:flash
+    make lyso1/lefishe:default:flash
 
 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).
diff --git a/keyboards/lefishe/rules.mk b/keyboards/lyso1/lefishe/rules.mk
similarity index 100%
rename from keyboards/lefishe/rules.mk
rename to keyboards/lyso1/lefishe/rules.mk

From ceea8ab5fe47f520a59d5ae7649c5e997bc813b2 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:35:23 +0800
Subject: [PATCH 211/867] [Keyboard] move standaside into edi/ (#15798)

---
 keyboards/{ => edi}/standaside/config.h                 | 0
 keyboards/{ => edi}/standaside/info.json                | 0
 keyboards/{ => edi}/standaside/keymaps/default/keymap.c | 0
 keyboards/{ => edi}/standaside/readme.md                | 4 ++--
 keyboards/{ => edi}/standaside/rules.mk                 | 0
 keyboards/{ => edi}/standaside/standaside.c             | 0
 keyboards/{ => edi}/standaside/standaside.h             | 0
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename keyboards/{ => edi}/standaside/config.h (100%)
 rename keyboards/{ => edi}/standaside/info.json (100%)
 rename keyboards/{ => edi}/standaside/keymaps/default/keymap.c (100%)
 rename keyboards/{ => edi}/standaside/readme.md (94%)
 rename keyboards/{ => edi}/standaside/rules.mk (100%)
 rename keyboards/{ => edi}/standaside/standaside.c (100%)
 rename keyboards/{ => edi}/standaside/standaside.h (100%)

diff --git a/keyboards/standaside/config.h b/keyboards/edi/standaside/config.h
similarity index 100%
rename from keyboards/standaside/config.h
rename to keyboards/edi/standaside/config.h
diff --git a/keyboards/standaside/info.json b/keyboards/edi/standaside/info.json
similarity index 100%
rename from keyboards/standaside/info.json
rename to keyboards/edi/standaside/info.json
diff --git a/keyboards/standaside/keymaps/default/keymap.c b/keyboards/edi/standaside/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/standaside/keymaps/default/keymap.c
rename to keyboards/edi/standaside/keymaps/default/keymap.c
diff --git a/keyboards/standaside/readme.md b/keyboards/edi/standaside/readme.md
similarity index 94%
rename from keyboards/standaside/readme.md
rename to keyboards/edi/standaside/readme.md
index ca1cfb2763..51911c877d 100644
--- a/keyboards/standaside/readme.md
+++ b/keyboards/edi/standaside/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: Seven Store (https://store.7storm.org).
 
 Make example for this keyboard (after setting up your build environment):
 
-    make standaside:default
+    make edi/standaside: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).
\ No newline at end of file
+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).
diff --git a/keyboards/standaside/rules.mk b/keyboards/edi/standaside/rules.mk
similarity index 100%
rename from keyboards/standaside/rules.mk
rename to keyboards/edi/standaside/rules.mk
diff --git a/keyboards/standaside/standaside.c b/keyboards/edi/standaside/standaside.c
similarity index 100%
rename from keyboards/standaside/standaside.c
rename to keyboards/edi/standaside/standaside.c
diff --git a/keyboards/standaside/standaside.h b/keyboards/edi/standaside/standaside.h
similarity index 100%
rename from keyboards/standaside/standaside.h
rename to keyboards/edi/standaside/standaside.h

From 31a6401193f66d5c6d244c3db6e6292b57e274d7 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:35:54 +0800
Subject: [PATCH 212/867] [Keyboard] move rainkeebs's keyboards to rainkeebs/
 (#15797)

---
 keyboards/{ => rainkeebs}/delilah/config.h                  | 0
 keyboards/{ => rainkeebs}/delilah/delilah.c                 | 0
 keyboards/{ => rainkeebs}/delilah/delilah.h                 | 0
 keyboards/{ => rainkeebs}/delilah/info.json                 | 0
 keyboards/{ => rainkeebs}/delilah/keymaps/default/keymap.c  | 0
 keyboards/{ => rainkeebs}/delilah/keymaps/via/keymap.c      | 0
 keyboards/{ => rainkeebs}/delilah/keymaps/via/rules.mk      | 0
 keyboards/{ => rainkeebs}/delilah/readme.md                 | 4 ++--
 keyboards/{ => rainkeebs}/delilah/rules.mk                  | 0
 keyboards/{ => rainkeebs}/rainkeeb/config.h                 | 0
 keyboards/{ => rainkeebs}/rainkeeb/info.json                | 0
 keyboards/{ => rainkeebs}/rainkeeb/keymaps/default/keymap.c | 0
 keyboards/{ => rainkeebs}/rainkeeb/keymaps/via/keymap.c     | 0
 keyboards/{ => rainkeebs}/rainkeeb/keymaps/via/rules.mk     | 0
 keyboards/{ => rainkeebs}/rainkeeb/rainkeeb.c               | 0
 keyboards/{ => rainkeebs}/rainkeeb/rainkeeb.h               | 0
 keyboards/{ => rainkeebs}/rainkeeb/readme.md                | 4 ++--
 keyboards/{ => rainkeebs}/rainkeeb/rules.mk                 | 0
 keyboards/{ => rainkeebs}/yasui/config.h                    | 0
 keyboards/{ => rainkeebs}/yasui/info.json                   | 0
 keyboards/{ => rainkeebs}/yasui/keymaps/default/keymap.c    | 0
 keyboards/{ => rainkeebs}/yasui/keymaps/via/keymap.c        | 0
 keyboards/{ => rainkeebs}/yasui/keymaps/via/rules.mk        | 0
 keyboards/{ => rainkeebs}/yasui/readme.md                   | 4 ++--
 keyboards/{ => rainkeebs}/yasui/rules.mk                    | 0
 keyboards/{ => rainkeebs}/yasui/yasui.c                     | 0
 keyboards/{ => rainkeebs}/yasui/yasui.h                     | 0
 27 files changed, 6 insertions(+), 6 deletions(-)
 rename keyboards/{ => rainkeebs}/delilah/config.h (100%)
 rename keyboards/{ => rainkeebs}/delilah/delilah.c (100%)
 rename keyboards/{ => rainkeebs}/delilah/delilah.h (100%)
 rename keyboards/{ => rainkeebs}/delilah/info.json (100%)
 rename keyboards/{ => rainkeebs}/delilah/keymaps/default/keymap.c (100%)
 rename keyboards/{ => rainkeebs}/delilah/keymaps/via/keymap.c (100%)
 rename keyboards/{ => rainkeebs}/delilah/keymaps/via/rules.mk (100%)
 rename keyboards/{ => rainkeebs}/delilah/readme.md (89%)
 rename keyboards/{ => rainkeebs}/delilah/rules.mk (100%)
 rename keyboards/{ => rainkeebs}/rainkeeb/config.h (100%)
 rename keyboards/{ => rainkeebs}/rainkeeb/info.json (100%)
 rename keyboards/{ => rainkeebs}/rainkeeb/keymaps/default/keymap.c (100%)
 rename keyboards/{ => rainkeebs}/rainkeeb/keymaps/via/keymap.c (100%)
 rename keyboards/{ => rainkeebs}/rainkeeb/keymaps/via/rules.mk (100%)
 rename keyboards/{ => rainkeebs}/rainkeeb/rainkeeb.c (100%)
 rename keyboards/{ => rainkeebs}/rainkeeb/rainkeeb.h (100%)
 rename keyboards/{ => rainkeebs}/rainkeeb/readme.md (95%)
 rename keyboards/{ => rainkeebs}/rainkeeb/rules.mk (100%)
 rename keyboards/{ => rainkeebs}/yasui/config.h (100%)
 rename keyboards/{ => rainkeebs}/yasui/info.json (100%)
 rename keyboards/{ => rainkeebs}/yasui/keymaps/default/keymap.c (100%)
 rename keyboards/{ => rainkeebs}/yasui/keymaps/via/keymap.c (100%)
 rename keyboards/{ => rainkeebs}/yasui/keymaps/via/rules.mk (100%)
 rename keyboards/{ => rainkeebs}/yasui/readme.md (88%)
 rename keyboards/{ => rainkeebs}/yasui/rules.mk (100%)
 rename keyboards/{ => rainkeebs}/yasui/yasui.c (100%)
 rename keyboards/{ => rainkeebs}/yasui/yasui.h (100%)

diff --git a/keyboards/delilah/config.h b/keyboards/rainkeebs/delilah/config.h
similarity index 100%
rename from keyboards/delilah/config.h
rename to keyboards/rainkeebs/delilah/config.h
diff --git a/keyboards/delilah/delilah.c b/keyboards/rainkeebs/delilah/delilah.c
similarity index 100%
rename from keyboards/delilah/delilah.c
rename to keyboards/rainkeebs/delilah/delilah.c
diff --git a/keyboards/delilah/delilah.h b/keyboards/rainkeebs/delilah/delilah.h
similarity index 100%
rename from keyboards/delilah/delilah.h
rename to keyboards/rainkeebs/delilah/delilah.h
diff --git a/keyboards/delilah/info.json b/keyboards/rainkeebs/delilah/info.json
similarity index 100%
rename from keyboards/delilah/info.json
rename to keyboards/rainkeebs/delilah/info.json
diff --git a/keyboards/delilah/keymaps/default/keymap.c b/keyboards/rainkeebs/delilah/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/delilah/keymaps/default/keymap.c
rename to keyboards/rainkeebs/delilah/keymaps/default/keymap.c
diff --git a/keyboards/delilah/keymaps/via/keymap.c b/keyboards/rainkeebs/delilah/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/delilah/keymaps/via/keymap.c
rename to keyboards/rainkeebs/delilah/keymaps/via/keymap.c
diff --git a/keyboards/delilah/keymaps/via/rules.mk b/keyboards/rainkeebs/delilah/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/delilah/keymaps/via/rules.mk
rename to keyboards/rainkeebs/delilah/keymaps/via/rules.mk
diff --git a/keyboards/delilah/readme.md b/keyboards/rainkeebs/delilah/readme.md
similarity index 89%
rename from keyboards/delilah/readme.md
rename to keyboards/rainkeebs/delilah/readme.md
index 8ba9d83188..cc8ad40d62 100644
--- a/keyboards/delilah/readme.md
+++ b/keyboards/rainkeebs/delilah/readme.md
@@ -11,12 +11,12 @@ A 12.25u, traditional stagger, 40% keyboard. Designed to keep another punctuatio
 
 Make example for this keyboard (after setting up your build environment):
 
-    qmk compile -kb delilah -kb default
+    qmk compile -kb rainkeebs/delilah -km default
     
 To reset the keyboard, hold the top left key while plugging in, or hit the reset button near the USB port
 
 Install example for this keyboard:
 
-    qmk flash -kb delilah -km default
+    qmk flash -kb rainkeebs/delilah -km 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).
diff --git a/keyboards/delilah/rules.mk b/keyboards/rainkeebs/delilah/rules.mk
similarity index 100%
rename from keyboards/delilah/rules.mk
rename to keyboards/rainkeebs/delilah/rules.mk
diff --git a/keyboards/rainkeeb/config.h b/keyboards/rainkeebs/rainkeeb/config.h
similarity index 100%
rename from keyboards/rainkeeb/config.h
rename to keyboards/rainkeebs/rainkeeb/config.h
diff --git a/keyboards/rainkeeb/info.json b/keyboards/rainkeebs/rainkeeb/info.json
similarity index 100%
rename from keyboards/rainkeeb/info.json
rename to keyboards/rainkeebs/rainkeeb/info.json
diff --git a/keyboards/rainkeeb/keymaps/default/keymap.c b/keyboards/rainkeebs/rainkeeb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/rainkeeb/keymaps/default/keymap.c
rename to keyboards/rainkeebs/rainkeeb/keymaps/default/keymap.c
diff --git a/keyboards/rainkeeb/keymaps/via/keymap.c b/keyboards/rainkeebs/rainkeeb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/rainkeeb/keymaps/via/keymap.c
rename to keyboards/rainkeebs/rainkeeb/keymaps/via/keymap.c
diff --git a/keyboards/rainkeeb/keymaps/via/rules.mk b/keyboards/rainkeebs/rainkeeb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/rainkeeb/keymaps/via/rules.mk
rename to keyboards/rainkeebs/rainkeeb/keymaps/via/rules.mk
diff --git a/keyboards/rainkeeb/rainkeeb.c b/keyboards/rainkeebs/rainkeeb/rainkeeb.c
similarity index 100%
rename from keyboards/rainkeeb/rainkeeb.c
rename to keyboards/rainkeebs/rainkeeb/rainkeeb.c
diff --git a/keyboards/rainkeeb/rainkeeb.h b/keyboards/rainkeebs/rainkeeb/rainkeeb.h
similarity index 100%
rename from keyboards/rainkeeb/rainkeeb.h
rename to keyboards/rainkeebs/rainkeeb/rainkeeb.h
diff --git a/keyboards/rainkeeb/readme.md b/keyboards/rainkeebs/rainkeeb/readme.md
similarity index 95%
rename from keyboards/rainkeeb/readme.md
rename to keyboards/rainkeebs/rainkeeb/readme.md
index f2c759ebeb..6d82df0283 100644
--- a/keyboards/rainkeeb/readme.md
+++ b/keyboards/rainkeebs/rainkeeb/readme.md
@@ -13,12 +13,12 @@ This is the default layout, at least the base layer. By default the OLED display
 
 Make example for this keyboard (after setting up your build environment):
 
-    make rainkeeb:default
+    make rainkeebs/rainkeeb:default
 
 To put reset into bootloader mode just push the reset button from the left side of the board using a pair of tweezers or similar object.
 
 Install example for this keyboard:
 
-    make rainkeeb:default:flash
+    make rainkeebs/rainkeeb:default:flash
 
 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).
diff --git a/keyboards/rainkeeb/rules.mk b/keyboards/rainkeebs/rainkeeb/rules.mk
similarity index 100%
rename from keyboards/rainkeeb/rules.mk
rename to keyboards/rainkeebs/rainkeeb/rules.mk
diff --git a/keyboards/yasui/config.h b/keyboards/rainkeebs/yasui/config.h
similarity index 100%
rename from keyboards/yasui/config.h
rename to keyboards/rainkeebs/yasui/config.h
diff --git a/keyboards/yasui/info.json b/keyboards/rainkeebs/yasui/info.json
similarity index 100%
rename from keyboards/yasui/info.json
rename to keyboards/rainkeebs/yasui/info.json
diff --git a/keyboards/yasui/keymaps/default/keymap.c b/keyboards/rainkeebs/yasui/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/yasui/keymaps/default/keymap.c
rename to keyboards/rainkeebs/yasui/keymaps/default/keymap.c
diff --git a/keyboards/yasui/keymaps/via/keymap.c b/keyboards/rainkeebs/yasui/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/yasui/keymaps/via/keymap.c
rename to keyboards/rainkeebs/yasui/keymaps/via/keymap.c
diff --git a/keyboards/yasui/keymaps/via/rules.mk b/keyboards/rainkeebs/yasui/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/yasui/keymaps/via/rules.mk
rename to keyboards/rainkeebs/yasui/keymaps/via/rules.mk
diff --git a/keyboards/yasui/readme.md b/keyboards/rainkeebs/yasui/readme.md
similarity index 88%
rename from keyboards/yasui/readme.md
rename to keyboards/rainkeebs/yasui/readme.md
index dfc20bbe6b..c167abf4a0 100644
--- a/keyboards/yasui/readme.md
+++ b/keyboards/rainkeebs/yasui/readme.md
@@ -11,12 +11,12 @@ A 10u ortho kit.
 
 Make example for this keyboard (after setting up your build environment):
 
-    qmk compile -kb yasui -kb default
+    qmk compile -kb rainkeebs/yasui -km default
     
 To reset the keyboard, hold the top left key while plugging in, or hit the reset button near the USB port
 
 Install example for this keyboard:
 
-    qmk flash -kb yasui -km default
+    qmk flash -kb rainkeebs/yasui -km 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).
diff --git a/keyboards/yasui/rules.mk b/keyboards/rainkeebs/yasui/rules.mk
similarity index 100%
rename from keyboards/yasui/rules.mk
rename to keyboards/rainkeebs/yasui/rules.mk
diff --git a/keyboards/yasui/yasui.c b/keyboards/rainkeebs/yasui/yasui.c
similarity index 100%
rename from keyboards/yasui/yasui.c
rename to keyboards/rainkeebs/yasui/yasui.c
diff --git a/keyboards/yasui/yasui.h b/keyboards/rainkeebs/yasui/yasui.h
similarity index 100%
rename from keyboards/yasui/yasui.h
rename to keyboards/rainkeebs/yasui/yasui.h

From a2ddb44957ce134b08081daf769ec25cd1463918 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:38:31 +0800
Subject: [PATCH 213/867] [Keyboard] move marksard's boards to marksard/
 (#15786)

---
 keyboards/{ => marksard}/treadstone32/info.json               | 0
 .../{ => marksard}/treadstone32/keymaps/default/config.h      | 0
 .../{ => marksard}/treadstone32/keymaps/default/keymap.c      | 0
 .../{ => marksard}/treadstone32/keymaps/default/readme.md     | 0
 .../{ => marksard}/treadstone32/keymaps/default/readme_jp.md  | 0
 .../{ => marksard}/treadstone32/keymaps/default/rules.mk      | 0
 .../{ => marksard}/treadstone32/keymaps/like_jis/config.h     | 0
 .../{ => marksard}/treadstone32/keymaps/like_jis/keymap.c     | 0
 .../{ => marksard}/treadstone32/keymaps/like_jis/readme.md    | 0
 .../{ => marksard}/treadstone32/keymaps/like_jis/readme_jp.md | 0
 .../{ => marksard}/treadstone32/keymaps/like_jis/rules.mk     | 0
 keyboards/{ => marksard}/treadstone32/lite/.noci              | 0
 keyboards/{ => marksard}/treadstone32/lite/config.h           | 0
 keyboards/{ => marksard}/treadstone32/lite/lite.c             | 0
 keyboards/{ => marksard}/treadstone32/lite/lite.h             | 0
 keyboards/{ => marksard}/treadstone32/lite/rules.mk           | 0
 keyboards/{ => marksard}/treadstone32/readme.md               | 4 ++--
 keyboards/{ => marksard}/treadstone32/rev1/.noci              | 0
 keyboards/{ => marksard}/treadstone32/rev1/config.h           | 0
 keyboards/{ => marksard}/treadstone32/rev1/rev1.c             | 0
 keyboards/{ => marksard}/treadstone32/rev1/rev1.h             | 0
 keyboards/{ => marksard}/treadstone32/rev1/rules.mk           | 0
 keyboards/{ => marksard}/treadstone32/rules.mk                | 0
 keyboards/{ => marksard/treadstone48}/treadstone48/.noci      | 0
 .../treadstone48}/treadstone48/common/glcdfont.c              | 0
 .../treadstone48}/treadstone48/common/oled_helper.c           | 0
 .../treadstone48}/treadstone48/common/oled_helper.h           | 0
 .../treadstone48}/treadstone48/keymaps/default/config.h       | 0
 .../treadstone48}/treadstone48/keymaps/default/keymap.c       | 0
 .../treadstone48}/treadstone48/keymaps/default/readme.md      | 0
 .../treadstone48}/treadstone48/keymaps/default/readme_jp.md   | 0
 .../treadstone48}/treadstone48/keymaps/default/rules.mk       | 0
 .../treadstone48}/treadstone48/keymaps/like_jis/config.h      | 0
 .../treadstone48}/treadstone48/keymaps/like_jis/keymap.c      | 0
 .../treadstone48}/treadstone48/keymaps/like_jis/readme.md     | 0
 .../treadstone48}/treadstone48/keymaps/like_jis/readme_jp.md  | 0
 .../treadstone48}/treadstone48/keymaps/like_jis/rules.mk      | 0
 keyboards/{ => marksard/treadstone48}/treadstone48/readme.md  | 4 ++--
 keyboards/{ => marksard/treadstone48}/treadstone48/rev1/.noci | 0
 .../{ => marksard/treadstone48}/treadstone48/rev1/config.h    | 0
 .../{ => marksard/treadstone48}/treadstone48/rev1/info.json   | 0
 .../treadstone48/rev1/keymaps/like_jis_rs/config.h            | 0
 .../treadstone48/rev1/keymaps/like_jis_rs/keymap.c            | 0
 .../treadstone48/rev1/keymaps/like_jis_rs/readme.md           | 0
 .../treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md        | 0
 .../treadstone48/rev1/keymaps/like_jis_rs/rules.mk            | 0
 .../{ => marksard/treadstone48}/treadstone48/rev1/rev1.c      | 0
 .../{ => marksard/treadstone48}/treadstone48/rev1/rev1.h      | 0
 .../{ => marksard/treadstone48}/treadstone48/rev1/rules.mk    | 0
 .../{ => marksard/treadstone48}/treadstone48/rev2/config.h    | 0
 .../{ => marksard/treadstone48}/treadstone48/rev2/info.json   | 0
 .../{ => marksard/treadstone48}/treadstone48/rev2/rev2.c      | 0
 .../{ => marksard/treadstone48}/treadstone48/rev2/rev2.h      | 0
 .../{ => marksard/treadstone48}/treadstone48/rev2/rules.mk    | 0
 keyboards/{ => marksard/treadstone48}/treadstone48/rules.mk   | 0
 55 files changed, 4 insertions(+), 4 deletions(-)
 rename keyboards/{ => marksard}/treadstone32/info.json (100%)
 rename keyboards/{ => marksard}/treadstone32/keymaps/default/config.h (100%)
 rename keyboards/{ => marksard}/treadstone32/keymaps/default/keymap.c (100%)
 rename keyboards/{ => marksard}/treadstone32/keymaps/default/readme.md (100%)
 rename keyboards/{ => marksard}/treadstone32/keymaps/default/readme_jp.md (100%)
 rename keyboards/{ => marksard}/treadstone32/keymaps/default/rules.mk (100%)
 rename keyboards/{ => marksard}/treadstone32/keymaps/like_jis/config.h (100%)
 rename keyboards/{ => marksard}/treadstone32/keymaps/like_jis/keymap.c (100%)
 rename keyboards/{ => marksard}/treadstone32/keymaps/like_jis/readme.md (100%)
 rename keyboards/{ => marksard}/treadstone32/keymaps/like_jis/readme_jp.md (100%)
 rename keyboards/{ => marksard}/treadstone32/keymaps/like_jis/rules.mk (100%)
 rename keyboards/{ => marksard}/treadstone32/lite/.noci (100%)
 rename keyboards/{ => marksard}/treadstone32/lite/config.h (100%)
 rename keyboards/{ => marksard}/treadstone32/lite/lite.c (100%)
 rename keyboards/{ => marksard}/treadstone32/lite/lite.h (100%)
 rename keyboards/{ => marksard}/treadstone32/lite/rules.mk (100%)
 rename keyboards/{ => marksard}/treadstone32/readme.md (92%)
 rename keyboards/{ => marksard}/treadstone32/rev1/.noci (100%)
 rename keyboards/{ => marksard}/treadstone32/rev1/config.h (100%)
 rename keyboards/{ => marksard}/treadstone32/rev1/rev1.c (100%)
 rename keyboards/{ => marksard}/treadstone32/rev1/rev1.h (100%)
 rename keyboards/{ => marksard}/treadstone32/rev1/rules.mk (100%)
 rename keyboards/{ => marksard}/treadstone32/rules.mk (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/.noci (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/common/glcdfont.c (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/common/oled_helper.c (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/common/oled_helper.h (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/keymaps/default/config.h (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/keymaps/default/keymap.c (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/keymaps/default/readme.md (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/keymaps/default/readme_jp.md (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/keymaps/default/rules.mk (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/keymaps/like_jis/config.h (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/keymaps/like_jis/keymap.c (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/keymaps/like_jis/readme.md (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/keymaps/like_jis/readme_jp.md (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/keymaps/like_jis/rules.mk (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/readme.md (92%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev1/.noci (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev1/config.h (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev1/info.json (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev1/keymaps/like_jis_rs/config.h (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev1/keymaps/like_jis_rs/keymap.c (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev1/keymaps/like_jis_rs/readme.md (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev1/keymaps/like_jis_rs/rules.mk (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev1/rev1.c (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev1/rev1.h (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev1/rules.mk (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev2/config.h (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev2/info.json (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev2/rev2.c (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev2/rev2.h (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rev2/rules.mk (100%)
 rename keyboards/{ => marksard/treadstone48}/treadstone48/rules.mk (100%)

diff --git a/keyboards/treadstone32/info.json b/keyboards/marksard/treadstone32/info.json
similarity index 100%
rename from keyboards/treadstone32/info.json
rename to keyboards/marksard/treadstone32/info.json
diff --git a/keyboards/treadstone32/keymaps/default/config.h b/keyboards/marksard/treadstone32/keymaps/default/config.h
similarity index 100%
rename from keyboards/treadstone32/keymaps/default/config.h
rename to keyboards/marksard/treadstone32/keymaps/default/config.h
diff --git a/keyboards/treadstone32/keymaps/default/keymap.c b/keyboards/marksard/treadstone32/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/treadstone32/keymaps/default/keymap.c
rename to keyboards/marksard/treadstone32/keymaps/default/keymap.c
diff --git a/keyboards/treadstone32/keymaps/default/readme.md b/keyboards/marksard/treadstone32/keymaps/default/readme.md
similarity index 100%
rename from keyboards/treadstone32/keymaps/default/readme.md
rename to keyboards/marksard/treadstone32/keymaps/default/readme.md
diff --git a/keyboards/treadstone32/keymaps/default/readme_jp.md b/keyboards/marksard/treadstone32/keymaps/default/readme_jp.md
similarity index 100%
rename from keyboards/treadstone32/keymaps/default/readme_jp.md
rename to keyboards/marksard/treadstone32/keymaps/default/readme_jp.md
diff --git a/keyboards/treadstone32/keymaps/default/rules.mk b/keyboards/marksard/treadstone32/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/treadstone32/keymaps/default/rules.mk
rename to keyboards/marksard/treadstone32/keymaps/default/rules.mk
diff --git a/keyboards/treadstone32/keymaps/like_jis/config.h b/keyboards/marksard/treadstone32/keymaps/like_jis/config.h
similarity index 100%
rename from keyboards/treadstone32/keymaps/like_jis/config.h
rename to keyboards/marksard/treadstone32/keymaps/like_jis/config.h
diff --git a/keyboards/treadstone32/keymaps/like_jis/keymap.c b/keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c
similarity index 100%
rename from keyboards/treadstone32/keymaps/like_jis/keymap.c
rename to keyboards/marksard/treadstone32/keymaps/like_jis/keymap.c
diff --git a/keyboards/treadstone32/keymaps/like_jis/readme.md b/keyboards/marksard/treadstone32/keymaps/like_jis/readme.md
similarity index 100%
rename from keyboards/treadstone32/keymaps/like_jis/readme.md
rename to keyboards/marksard/treadstone32/keymaps/like_jis/readme.md
diff --git a/keyboards/treadstone32/keymaps/like_jis/readme_jp.md b/keyboards/marksard/treadstone32/keymaps/like_jis/readme_jp.md
similarity index 100%
rename from keyboards/treadstone32/keymaps/like_jis/readme_jp.md
rename to keyboards/marksard/treadstone32/keymaps/like_jis/readme_jp.md
diff --git a/keyboards/treadstone32/keymaps/like_jis/rules.mk b/keyboards/marksard/treadstone32/keymaps/like_jis/rules.mk
similarity index 100%
rename from keyboards/treadstone32/keymaps/like_jis/rules.mk
rename to keyboards/marksard/treadstone32/keymaps/like_jis/rules.mk
diff --git a/keyboards/treadstone32/lite/.noci b/keyboards/marksard/treadstone32/lite/.noci
similarity index 100%
rename from keyboards/treadstone32/lite/.noci
rename to keyboards/marksard/treadstone32/lite/.noci
diff --git a/keyboards/treadstone32/lite/config.h b/keyboards/marksard/treadstone32/lite/config.h
similarity index 100%
rename from keyboards/treadstone32/lite/config.h
rename to keyboards/marksard/treadstone32/lite/config.h
diff --git a/keyboards/treadstone32/lite/lite.c b/keyboards/marksard/treadstone32/lite/lite.c
similarity index 100%
rename from keyboards/treadstone32/lite/lite.c
rename to keyboards/marksard/treadstone32/lite/lite.c
diff --git a/keyboards/treadstone32/lite/lite.h b/keyboards/marksard/treadstone32/lite/lite.h
similarity index 100%
rename from keyboards/treadstone32/lite/lite.h
rename to keyboards/marksard/treadstone32/lite/lite.h
diff --git a/keyboards/treadstone32/lite/rules.mk b/keyboards/marksard/treadstone32/lite/rules.mk
similarity index 100%
rename from keyboards/treadstone32/lite/rules.mk
rename to keyboards/marksard/treadstone32/lite/rules.mk
diff --git a/keyboards/treadstone32/readme.md b/keyboards/marksard/treadstone32/readme.md
similarity index 92%
rename from keyboards/treadstone32/readme.md
rename to keyboards/marksard/treadstone32/readme.md
index 99cbe4e014..170c6bc761 100644
--- a/keyboards/treadstone32/readme.md
+++ b/keyboards/marksard/treadstone32/readme.md
@@ -10,9 +10,9 @@ Hardware Availability: links to where you can find this hardware
 
 Make example for this keyboard (after setting up your build environment):
 
-    make treadstone32:default
+    make marksard/treadstone32:default
     or
-    make treadstone32/lite:default
+    make marksard/treadstone32/lite: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).
 
diff --git a/keyboards/treadstone32/rev1/.noci b/keyboards/marksard/treadstone32/rev1/.noci
similarity index 100%
rename from keyboards/treadstone32/rev1/.noci
rename to keyboards/marksard/treadstone32/rev1/.noci
diff --git a/keyboards/treadstone32/rev1/config.h b/keyboards/marksard/treadstone32/rev1/config.h
similarity index 100%
rename from keyboards/treadstone32/rev1/config.h
rename to keyboards/marksard/treadstone32/rev1/config.h
diff --git a/keyboards/treadstone32/rev1/rev1.c b/keyboards/marksard/treadstone32/rev1/rev1.c
similarity index 100%
rename from keyboards/treadstone32/rev1/rev1.c
rename to keyboards/marksard/treadstone32/rev1/rev1.c
diff --git a/keyboards/treadstone32/rev1/rev1.h b/keyboards/marksard/treadstone32/rev1/rev1.h
similarity index 100%
rename from keyboards/treadstone32/rev1/rev1.h
rename to keyboards/marksard/treadstone32/rev1/rev1.h
diff --git a/keyboards/treadstone32/rev1/rules.mk b/keyboards/marksard/treadstone32/rev1/rules.mk
similarity index 100%
rename from keyboards/treadstone32/rev1/rules.mk
rename to keyboards/marksard/treadstone32/rev1/rules.mk
diff --git a/keyboards/treadstone32/rules.mk b/keyboards/marksard/treadstone32/rules.mk
similarity index 100%
rename from keyboards/treadstone32/rules.mk
rename to keyboards/marksard/treadstone32/rules.mk
diff --git a/keyboards/treadstone48/.noci b/keyboards/marksard/treadstone48/treadstone48/.noci
similarity index 100%
rename from keyboards/treadstone48/.noci
rename to keyboards/marksard/treadstone48/treadstone48/.noci
diff --git a/keyboards/treadstone48/common/glcdfont.c b/keyboards/marksard/treadstone48/treadstone48/common/glcdfont.c
similarity index 100%
rename from keyboards/treadstone48/common/glcdfont.c
rename to keyboards/marksard/treadstone48/treadstone48/common/glcdfont.c
diff --git a/keyboards/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/treadstone48/common/oled_helper.c
similarity index 100%
rename from keyboards/treadstone48/common/oled_helper.c
rename to keyboards/marksard/treadstone48/treadstone48/common/oled_helper.c
diff --git a/keyboards/treadstone48/common/oled_helper.h b/keyboards/marksard/treadstone48/treadstone48/common/oled_helper.h
similarity index 100%
rename from keyboards/treadstone48/common/oled_helper.h
rename to keyboards/marksard/treadstone48/treadstone48/common/oled_helper.h
diff --git a/keyboards/treadstone48/keymaps/default/config.h b/keyboards/marksard/treadstone48/treadstone48/keymaps/default/config.h
similarity index 100%
rename from keyboards/treadstone48/keymaps/default/config.h
rename to keyboards/marksard/treadstone48/treadstone48/keymaps/default/config.h
diff --git a/keyboards/treadstone48/keymaps/default/keymap.c b/keyboards/marksard/treadstone48/treadstone48/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/treadstone48/keymaps/default/keymap.c
rename to keyboards/marksard/treadstone48/treadstone48/keymaps/default/keymap.c
diff --git a/keyboards/treadstone48/keymaps/default/readme.md b/keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme.md
similarity index 100%
rename from keyboards/treadstone48/keymaps/default/readme.md
rename to keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme.md
diff --git a/keyboards/treadstone48/keymaps/default/readme_jp.md b/keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme_jp.md
similarity index 100%
rename from keyboards/treadstone48/keymaps/default/readme_jp.md
rename to keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme_jp.md
diff --git a/keyboards/treadstone48/keymaps/default/rules.mk b/keyboards/marksard/treadstone48/treadstone48/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/treadstone48/keymaps/default/rules.mk
rename to keyboards/marksard/treadstone48/treadstone48/keymaps/default/rules.mk
diff --git a/keyboards/treadstone48/keymaps/like_jis/config.h b/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/config.h
similarity index 100%
rename from keyboards/treadstone48/keymaps/like_jis/config.h
rename to keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/config.h
diff --git a/keyboards/treadstone48/keymaps/like_jis/keymap.c b/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/keymap.c
similarity index 100%
rename from keyboards/treadstone48/keymaps/like_jis/keymap.c
rename to keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/keymap.c
diff --git a/keyboards/treadstone48/keymaps/like_jis/readme.md b/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme.md
similarity index 100%
rename from keyboards/treadstone48/keymaps/like_jis/readme.md
rename to keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme.md
diff --git a/keyboards/treadstone48/keymaps/like_jis/readme_jp.md b/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme_jp.md
similarity index 100%
rename from keyboards/treadstone48/keymaps/like_jis/readme_jp.md
rename to keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme_jp.md
diff --git a/keyboards/treadstone48/keymaps/like_jis/rules.mk b/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/rules.mk
similarity index 100%
rename from keyboards/treadstone48/keymaps/like_jis/rules.mk
rename to keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/rules.mk
diff --git a/keyboards/treadstone48/readme.md b/keyboards/marksard/treadstone48/treadstone48/readme.md
similarity index 92%
rename from keyboards/treadstone48/readme.md
rename to keyboards/marksard/treadstone48/treadstone48/readme.md
index 432ef33fe9..c5f6f8f73f 100644
--- a/keyboards/treadstone48/readme.md
+++ b/keyboards/marksard/treadstone48/treadstone48/readme.md
@@ -10,9 +10,9 @@ Hardware Availability: links to where you can find this hardware
 
 Make example for this keyboard (after setting up your build environment):
 
-    make treadstone48:default
+    make marksard/treadstone48:default
     or
-    make treadstone48/rev2:default
+    make marksard/treadstone48/rev2: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).
 
diff --git a/keyboards/treadstone48/rev1/.noci b/keyboards/marksard/treadstone48/treadstone48/rev1/.noci
similarity index 100%
rename from keyboards/treadstone48/rev1/.noci
rename to keyboards/marksard/treadstone48/treadstone48/rev1/.noci
diff --git a/keyboards/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/treadstone48/rev1/config.h
similarity index 100%
rename from keyboards/treadstone48/rev1/config.h
rename to keyboards/marksard/treadstone48/treadstone48/rev1/config.h
diff --git a/keyboards/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/treadstone48/rev1/info.json
similarity index 100%
rename from keyboards/treadstone48/rev1/info.json
rename to keyboards/marksard/treadstone48/treadstone48/rev1/info.json
diff --git a/keyboards/treadstone48/rev1/keymaps/like_jis_rs/config.h b/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/config.h
similarity index 100%
rename from keyboards/treadstone48/rev1/keymaps/like_jis_rs/config.h
rename to keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/config.h
diff --git a/keyboards/treadstone48/rev1/keymaps/like_jis_rs/keymap.c b/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
similarity index 100%
rename from keyboards/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
rename to keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
diff --git a/keyboards/treadstone48/rev1/keymaps/like_jis_rs/readme.md b/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme.md
similarity index 100%
rename from keyboards/treadstone48/rev1/keymaps/like_jis_rs/readme.md
rename to keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme.md
diff --git a/keyboards/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md b/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md
similarity index 100%
rename from keyboards/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md
rename to keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md
diff --git a/keyboards/treadstone48/rev1/keymaps/like_jis_rs/rules.mk b/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
similarity index 100%
rename from keyboards/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
rename to keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
diff --git a/keyboards/treadstone48/rev1/rev1.c b/keyboards/marksard/treadstone48/treadstone48/rev1/rev1.c
similarity index 100%
rename from keyboards/treadstone48/rev1/rev1.c
rename to keyboards/marksard/treadstone48/treadstone48/rev1/rev1.c
diff --git a/keyboards/treadstone48/rev1/rev1.h b/keyboards/marksard/treadstone48/treadstone48/rev1/rev1.h
similarity index 100%
rename from keyboards/treadstone48/rev1/rev1.h
rename to keyboards/marksard/treadstone48/treadstone48/rev1/rev1.h
diff --git a/keyboards/treadstone48/rev1/rules.mk b/keyboards/marksard/treadstone48/treadstone48/rev1/rules.mk
similarity index 100%
rename from keyboards/treadstone48/rev1/rules.mk
rename to keyboards/marksard/treadstone48/treadstone48/rev1/rules.mk
diff --git a/keyboards/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/treadstone48/rev2/config.h
similarity index 100%
rename from keyboards/treadstone48/rev2/config.h
rename to keyboards/marksard/treadstone48/treadstone48/rev2/config.h
diff --git a/keyboards/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/treadstone48/rev2/info.json
similarity index 100%
rename from keyboards/treadstone48/rev2/info.json
rename to keyboards/marksard/treadstone48/treadstone48/rev2/info.json
diff --git a/keyboards/treadstone48/rev2/rev2.c b/keyboards/marksard/treadstone48/treadstone48/rev2/rev2.c
similarity index 100%
rename from keyboards/treadstone48/rev2/rev2.c
rename to keyboards/marksard/treadstone48/treadstone48/rev2/rev2.c
diff --git a/keyboards/treadstone48/rev2/rev2.h b/keyboards/marksard/treadstone48/treadstone48/rev2/rev2.h
similarity index 100%
rename from keyboards/treadstone48/rev2/rev2.h
rename to keyboards/marksard/treadstone48/treadstone48/rev2/rev2.h
diff --git a/keyboards/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/treadstone48/rev2/rules.mk
similarity index 100%
rename from keyboards/treadstone48/rev2/rules.mk
rename to keyboards/marksard/treadstone48/treadstone48/rev2/rules.mk
diff --git a/keyboards/treadstone48/rules.mk b/keyboards/marksard/treadstone48/treadstone48/rules.mk
similarity index 100%
rename from keyboards/treadstone48/rules.mk
rename to keyboards/marksard/treadstone48/treadstone48/rules.mk

From ced6d835e850715bb689e26b8578d5fa14bafa93 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:38:55 +0800
Subject: [PATCH 214/867] [Keyboard] move weirdo-f's keyboards into weirdo/
 (#15785)

---
 keyboards/{ => weirdo}/geminate60/chconf.h                      | 0
 keyboards/{ => weirdo}/geminate60/config.h                      | 0
 keyboards/{ => weirdo}/geminate60/geminate60.c                  | 0
 keyboards/{ => weirdo}/geminate60/geminate60.h                  | 0
 keyboards/{ => weirdo}/geminate60/info.json                     | 0
 keyboards/{ => weirdo}/geminate60/keymaps/default/keymap.c      | 0
 keyboards/{ => weirdo}/geminate60/keymaps/via/keymap.c          | 0
 keyboards/{ => weirdo}/geminate60/keymaps/via/rules.mk          | 0
 keyboards/{ => weirdo}/geminate60/readme.md                     | 2 +-
 keyboards/{ => weirdo}/geminate60/rules.mk                      | 0
 keyboards/{ => weirdo}/kelowna/rgb64/config.h                   | 0
 keyboards/{ => weirdo}/kelowna/rgb64/info.json                  | 0
 keyboards/{ => weirdo}/kelowna/rgb64/keymaps/default/keymap.c   | 0
 keyboards/{ => weirdo}/kelowna/rgb64/keymaps/via/keymap.c       | 0
 keyboards/{ => weirdo}/kelowna/rgb64/keymaps/via/rules.mk       | 0
 keyboards/{ => weirdo}/kelowna/rgb64/readme.md                  | 2 +-
 keyboards/{ => weirdo}/kelowna/rgb64/rgb64.c                    | 0
 keyboards/{ => weirdo}/kelowna/rgb64/rgb64.h                    | 0
 keyboards/{ => weirdo}/kelowna/rgb64/rules.mk                   | 0
 keyboards/{ => weirdo}/ls_60/chconf.h                           | 0
 keyboards/{ => weirdo}/ls_60/config.h                           | 0
 keyboards/{ => weirdo}/ls_60/info.json                          | 0
 keyboards/{ => weirdo}/ls_60/keymaps/default/keymap.c           | 0
 keyboards/{ => weirdo}/ls_60/keymaps/via/keymap.c               | 0
 keyboards/{ => weirdo}/ls_60/keymaps/via/rules.mk               | 0
 keyboards/{ => weirdo}/ls_60/ls_60.c                            | 0
 keyboards/{ => weirdo}/ls_60/ls_60.h                            | 0
 keyboards/{ => weirdo}/ls_60/readme.md                          | 2 +-
 keyboards/{ => weirdo}/ls_60/rules.mk                           | 0
 keyboards/{ => weirdo}/naiping/np64/chconf.h                    | 0
 keyboards/{ => weirdo}/naiping/np64/config.h                    | 0
 keyboards/{ => weirdo}/naiping/np64/info.json                   | 0
 keyboards/{ => weirdo}/naiping/np64/keymaps/default/keymap.c    | 0
 keyboards/{ => weirdo}/naiping/np64/keymaps/via/keymap.c        | 0
 keyboards/{ => weirdo}/naiping/np64/keymaps/via/rules.mk        | 0
 keyboards/{ => weirdo}/naiping/np64/np64.c                      | 0
 keyboards/{ => weirdo}/naiping/np64/np64.h                      | 0
 keyboards/{ => weirdo}/naiping/np64/readme.md                   | 2 +-
 keyboards/{ => weirdo}/naiping/np64/rules.mk                    | 0
 keyboards/{ => weirdo}/naiping/nphhkb/chconf.h                  | 0
 keyboards/{ => weirdo}/naiping/nphhkb/config.h                  | 0
 keyboards/{ => weirdo}/naiping/nphhkb/info.json                 | 0
 keyboards/{ => weirdo}/naiping/nphhkb/keymaps/default/keymap.c  | 0
 keyboards/{ => weirdo}/naiping/nphhkb/keymaps/via/keymap.c      | 0
 keyboards/{ => weirdo}/naiping/nphhkb/keymaps/via/rules.mk      | 0
 keyboards/{ => weirdo}/naiping/nphhkb/nphhkb.c                  | 0
 keyboards/{ => weirdo}/naiping/nphhkb/nphhkb.h                  | 0
 keyboards/{ => weirdo}/naiping/nphhkb/readme.md                 | 2 +-
 keyboards/{ => weirdo}/naiping/nphhkb/rules.mk                  | 0
 keyboards/{ => weirdo}/naiping/npminila/chconf.h                | 0
 keyboards/{ => weirdo}/naiping/npminila/config.h                | 0
 keyboards/{ => weirdo}/naiping/npminila/info.json               | 0
 .../{ => weirdo}/naiping/npminila/keymaps/default/keymap.c      | 0
 keyboards/{ => weirdo}/naiping/npminila/keymaps/via/keymap.c    | 0
 keyboards/{ => weirdo}/naiping/npminila/keymaps/via/rules.mk    | 0
 keyboards/{ => weirdo}/naiping/npminila/npminila.c              | 0
 keyboards/{ => weirdo}/naiping/npminila/npminila.h              | 0
 keyboards/{ => weirdo}/naiping/npminila/readme.md               | 2 +-
 keyboards/{ => weirdo}/naiping/npminila/rules.mk                | 0
 keyboards/{ => weirdo}/tiger910/config.h                        | 0
 keyboards/{ => weirdo}/tiger910/info.json                       | 0
 keyboards/{ => weirdo}/tiger910/keymaps/default/keymap.c        | 0
 keyboards/{ => weirdo}/tiger910/keymaps/via/keymap.c            | 0
 keyboards/{ => weirdo}/tiger910/keymaps/via/rules.mk            | 0
 keyboards/{ => weirdo}/tiger910/readme.md                       | 2 +-
 keyboards/{ => weirdo}/tiger910/rules.mk                        | 0
 keyboards/{ => weirdo}/tiger910/tiger910.c                      | 0
 keyboards/{ => weirdo}/tiger910/tiger910.h                      | 0
 68 files changed, 7 insertions(+), 7 deletions(-)
 rename keyboards/{ => weirdo}/geminate60/chconf.h (100%)
 rename keyboards/{ => weirdo}/geminate60/config.h (100%)
 rename keyboards/{ => weirdo}/geminate60/geminate60.c (100%)
 rename keyboards/{ => weirdo}/geminate60/geminate60.h (100%)
 rename keyboards/{ => weirdo}/geminate60/info.json (100%)
 rename keyboards/{ => weirdo}/geminate60/keymaps/default/keymap.c (100%)
 rename keyboards/{ => weirdo}/geminate60/keymaps/via/keymap.c (100%)
 rename keyboards/{ => weirdo}/geminate60/keymaps/via/rules.mk (100%)
 rename keyboards/{ => weirdo}/geminate60/readme.md (95%)
 rename keyboards/{ => weirdo}/geminate60/rules.mk (100%)
 rename keyboards/{ => weirdo}/kelowna/rgb64/config.h (100%)
 rename keyboards/{ => weirdo}/kelowna/rgb64/info.json (100%)
 rename keyboards/{ => weirdo}/kelowna/rgb64/keymaps/default/keymap.c (100%)
 rename keyboards/{ => weirdo}/kelowna/rgb64/keymaps/via/keymap.c (100%)
 rename keyboards/{ => weirdo}/kelowna/rgb64/keymaps/via/rules.mk (100%)
 rename keyboards/{ => weirdo}/kelowna/rgb64/readme.md (95%)
 rename keyboards/{ => weirdo}/kelowna/rgb64/rgb64.c (100%)
 rename keyboards/{ => weirdo}/kelowna/rgb64/rgb64.h (100%)
 rename keyboards/{ => weirdo}/kelowna/rgb64/rules.mk (100%)
 rename keyboards/{ => weirdo}/ls_60/chconf.h (100%)
 rename keyboards/{ => weirdo}/ls_60/config.h (100%)
 rename keyboards/{ => weirdo}/ls_60/info.json (100%)
 rename keyboards/{ => weirdo}/ls_60/keymaps/default/keymap.c (100%)
 rename keyboards/{ => weirdo}/ls_60/keymaps/via/keymap.c (100%)
 rename keyboards/{ => weirdo}/ls_60/keymaps/via/rules.mk (100%)
 rename keyboards/{ => weirdo}/ls_60/ls_60.c (100%)
 rename keyboards/{ => weirdo}/ls_60/ls_60.h (100%)
 rename keyboards/{ => weirdo}/ls_60/readme.md (95%)
 rename keyboards/{ => weirdo}/ls_60/rules.mk (100%)
 rename keyboards/{ => weirdo}/naiping/np64/chconf.h (100%)
 rename keyboards/{ => weirdo}/naiping/np64/config.h (100%)
 rename keyboards/{ => weirdo}/naiping/np64/info.json (100%)
 rename keyboards/{ => weirdo}/naiping/np64/keymaps/default/keymap.c (100%)
 rename keyboards/{ => weirdo}/naiping/np64/keymaps/via/keymap.c (100%)
 rename keyboards/{ => weirdo}/naiping/np64/keymaps/via/rules.mk (100%)
 rename keyboards/{ => weirdo}/naiping/np64/np64.c (100%)
 rename keyboards/{ => weirdo}/naiping/np64/np64.h (100%)
 rename keyboards/{ => weirdo}/naiping/np64/readme.md (95%)
 rename keyboards/{ => weirdo}/naiping/np64/rules.mk (100%)
 rename keyboards/{ => weirdo}/naiping/nphhkb/chconf.h (100%)
 rename keyboards/{ => weirdo}/naiping/nphhkb/config.h (100%)
 rename keyboards/{ => weirdo}/naiping/nphhkb/info.json (100%)
 rename keyboards/{ => weirdo}/naiping/nphhkb/keymaps/default/keymap.c (100%)
 rename keyboards/{ => weirdo}/naiping/nphhkb/keymaps/via/keymap.c (100%)
 rename keyboards/{ => weirdo}/naiping/nphhkb/keymaps/via/rules.mk (100%)
 rename keyboards/{ => weirdo}/naiping/nphhkb/nphhkb.c (100%)
 rename keyboards/{ => weirdo}/naiping/nphhkb/nphhkb.h (100%)
 rename keyboards/{ => weirdo}/naiping/nphhkb/readme.md (94%)
 rename keyboards/{ => weirdo}/naiping/nphhkb/rules.mk (100%)
 rename keyboards/{ => weirdo}/naiping/npminila/chconf.h (100%)
 rename keyboards/{ => weirdo}/naiping/npminila/config.h (100%)
 rename keyboards/{ => weirdo}/naiping/npminila/info.json (100%)
 rename keyboards/{ => weirdo}/naiping/npminila/keymaps/default/keymap.c (100%)
 rename keyboards/{ => weirdo}/naiping/npminila/keymaps/via/keymap.c (100%)
 rename keyboards/{ => weirdo}/naiping/npminila/keymaps/via/rules.mk (100%)
 rename keyboards/{ => weirdo}/naiping/npminila/npminila.c (100%)
 rename keyboards/{ => weirdo}/naiping/npminila/npminila.h (100%)
 rename keyboards/{ => weirdo}/naiping/npminila/readme.md (94%)
 rename keyboards/{ => weirdo}/naiping/npminila/rules.mk (100%)
 rename keyboards/{ => weirdo}/tiger910/config.h (100%)
 rename keyboards/{ => weirdo}/tiger910/info.json (100%)
 rename keyboards/{ => weirdo}/tiger910/keymaps/default/keymap.c (100%)
 rename keyboards/{ => weirdo}/tiger910/keymaps/via/keymap.c (100%)
 rename keyboards/{ => weirdo}/tiger910/keymaps/via/rules.mk (100%)
 rename keyboards/{ => weirdo}/tiger910/readme.md (94%)
 rename keyboards/{ => weirdo}/tiger910/rules.mk (100%)
 rename keyboards/{ => weirdo}/tiger910/tiger910.c (100%)
 rename keyboards/{ => weirdo}/tiger910/tiger910.h (100%)

diff --git a/keyboards/geminate60/chconf.h b/keyboards/weirdo/geminate60/chconf.h
similarity index 100%
rename from keyboards/geminate60/chconf.h
rename to keyboards/weirdo/geminate60/chconf.h
diff --git a/keyboards/geminate60/config.h b/keyboards/weirdo/geminate60/config.h
similarity index 100%
rename from keyboards/geminate60/config.h
rename to keyboards/weirdo/geminate60/config.h
diff --git a/keyboards/geminate60/geminate60.c b/keyboards/weirdo/geminate60/geminate60.c
similarity index 100%
rename from keyboards/geminate60/geminate60.c
rename to keyboards/weirdo/geminate60/geminate60.c
diff --git a/keyboards/geminate60/geminate60.h b/keyboards/weirdo/geminate60/geminate60.h
similarity index 100%
rename from keyboards/geminate60/geminate60.h
rename to keyboards/weirdo/geminate60/geminate60.h
diff --git a/keyboards/geminate60/info.json b/keyboards/weirdo/geminate60/info.json
similarity index 100%
rename from keyboards/geminate60/info.json
rename to keyboards/weirdo/geminate60/info.json
diff --git a/keyboards/geminate60/keymaps/default/keymap.c b/keyboards/weirdo/geminate60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/geminate60/keymaps/default/keymap.c
rename to keyboards/weirdo/geminate60/keymaps/default/keymap.c
diff --git a/keyboards/geminate60/keymaps/via/keymap.c b/keyboards/weirdo/geminate60/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/geminate60/keymaps/via/keymap.c
rename to keyboards/weirdo/geminate60/keymaps/via/keymap.c
diff --git a/keyboards/geminate60/keymaps/via/rules.mk b/keyboards/weirdo/geminate60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/geminate60/keymaps/via/rules.mk
rename to keyboards/weirdo/geminate60/keymaps/via/rules.mk
diff --git a/keyboards/geminate60/readme.md b/keyboards/weirdo/geminate60/readme.md
similarity index 95%
rename from keyboards/geminate60/readme.md
rename to keyboards/weirdo/geminate60/readme.md
index 7fab7d7df6..ca865c8cff 100644
--- a/keyboards/geminate60/readme.md
+++ b/keyboards/weirdo/geminate60/readme.md
@@ -10,7 +10,7 @@ A 60% keyboard based on STM32F303.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make geminate60:default
+    make weirdo/geminate60:default
 
 The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written.
 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).
diff --git a/keyboards/geminate60/rules.mk b/keyboards/weirdo/geminate60/rules.mk
similarity index 100%
rename from keyboards/geminate60/rules.mk
rename to keyboards/weirdo/geminate60/rules.mk
diff --git a/keyboards/kelowna/rgb64/config.h b/keyboards/weirdo/kelowna/rgb64/config.h
similarity index 100%
rename from keyboards/kelowna/rgb64/config.h
rename to keyboards/weirdo/kelowna/rgb64/config.h
diff --git a/keyboards/kelowna/rgb64/info.json b/keyboards/weirdo/kelowna/rgb64/info.json
similarity index 100%
rename from keyboards/kelowna/rgb64/info.json
rename to keyboards/weirdo/kelowna/rgb64/info.json
diff --git a/keyboards/kelowna/rgb64/keymaps/default/keymap.c b/keyboards/weirdo/kelowna/rgb64/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kelowna/rgb64/keymaps/default/keymap.c
rename to keyboards/weirdo/kelowna/rgb64/keymaps/default/keymap.c
diff --git a/keyboards/kelowna/rgb64/keymaps/via/keymap.c b/keyboards/weirdo/kelowna/rgb64/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/kelowna/rgb64/keymaps/via/keymap.c
rename to keyboards/weirdo/kelowna/rgb64/keymaps/via/keymap.c
diff --git a/keyboards/kelowna/rgb64/keymaps/via/rules.mk b/keyboards/weirdo/kelowna/rgb64/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kelowna/rgb64/keymaps/via/rules.mk
rename to keyboards/weirdo/kelowna/rgb64/keymaps/via/rules.mk
diff --git a/keyboards/kelowna/rgb64/readme.md b/keyboards/weirdo/kelowna/rgb64/readme.md
similarity index 95%
rename from keyboards/kelowna/rgb64/readme.md
rename to keyboards/weirdo/kelowna/rgb64/readme.md
index 9300b82819..f12e155c8a 100644
--- a/keyboards/kelowna/rgb64/readme.md
+++ b/keyboards/weirdo/kelowna/rgb64/readme.md
@@ -10,7 +10,7 @@ A 60% keyboard based on STM32f303
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kelowna/rgb64:default
+    make weirdo/kelowna/rgb64:default
 
 Use the SWD interface on the board to connect to the STlink (JLink) to directly burn firmware without entering the bootloader.
 
diff --git a/keyboards/kelowna/rgb64/rgb64.c b/keyboards/weirdo/kelowna/rgb64/rgb64.c
similarity index 100%
rename from keyboards/kelowna/rgb64/rgb64.c
rename to keyboards/weirdo/kelowna/rgb64/rgb64.c
diff --git a/keyboards/kelowna/rgb64/rgb64.h b/keyboards/weirdo/kelowna/rgb64/rgb64.h
similarity index 100%
rename from keyboards/kelowna/rgb64/rgb64.h
rename to keyboards/weirdo/kelowna/rgb64/rgb64.h
diff --git a/keyboards/kelowna/rgb64/rules.mk b/keyboards/weirdo/kelowna/rgb64/rules.mk
similarity index 100%
rename from keyboards/kelowna/rgb64/rules.mk
rename to keyboards/weirdo/kelowna/rgb64/rules.mk
diff --git a/keyboards/ls_60/chconf.h b/keyboards/weirdo/ls_60/chconf.h
similarity index 100%
rename from keyboards/ls_60/chconf.h
rename to keyboards/weirdo/ls_60/chconf.h
diff --git a/keyboards/ls_60/config.h b/keyboards/weirdo/ls_60/config.h
similarity index 100%
rename from keyboards/ls_60/config.h
rename to keyboards/weirdo/ls_60/config.h
diff --git a/keyboards/ls_60/info.json b/keyboards/weirdo/ls_60/info.json
similarity index 100%
rename from keyboards/ls_60/info.json
rename to keyboards/weirdo/ls_60/info.json
diff --git a/keyboards/ls_60/keymaps/default/keymap.c b/keyboards/weirdo/ls_60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ls_60/keymaps/default/keymap.c
rename to keyboards/weirdo/ls_60/keymaps/default/keymap.c
diff --git a/keyboards/ls_60/keymaps/via/keymap.c b/keyboards/weirdo/ls_60/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ls_60/keymaps/via/keymap.c
rename to keyboards/weirdo/ls_60/keymaps/via/keymap.c
diff --git a/keyboards/ls_60/keymaps/via/rules.mk b/keyboards/weirdo/ls_60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ls_60/keymaps/via/rules.mk
rename to keyboards/weirdo/ls_60/keymaps/via/rules.mk
diff --git a/keyboards/ls_60/ls_60.c b/keyboards/weirdo/ls_60/ls_60.c
similarity index 100%
rename from keyboards/ls_60/ls_60.c
rename to keyboards/weirdo/ls_60/ls_60.c
diff --git a/keyboards/ls_60/ls_60.h b/keyboards/weirdo/ls_60/ls_60.h
similarity index 100%
rename from keyboards/ls_60/ls_60.h
rename to keyboards/weirdo/ls_60/ls_60.h
diff --git a/keyboards/ls_60/readme.md b/keyboards/weirdo/ls_60/readme.md
similarity index 95%
rename from keyboards/ls_60/readme.md
rename to keyboards/weirdo/ls_60/readme.md
index e0efdfd9b5..cb289b8ad6 100644
--- a/keyboards/ls_60/readme.md
+++ b/keyboards/weirdo/ls_60/readme.md
@@ -10,7 +10,7 @@ A 60% keyboard based on STM32f303
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ls_60:default
+    make weirdo/ls_60:default
 
 The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written.
 
diff --git a/keyboards/ls_60/rules.mk b/keyboards/weirdo/ls_60/rules.mk
similarity index 100%
rename from keyboards/ls_60/rules.mk
rename to keyboards/weirdo/ls_60/rules.mk
diff --git a/keyboards/naiping/np64/chconf.h b/keyboards/weirdo/naiping/np64/chconf.h
similarity index 100%
rename from keyboards/naiping/np64/chconf.h
rename to keyboards/weirdo/naiping/np64/chconf.h
diff --git a/keyboards/naiping/np64/config.h b/keyboards/weirdo/naiping/np64/config.h
similarity index 100%
rename from keyboards/naiping/np64/config.h
rename to keyboards/weirdo/naiping/np64/config.h
diff --git a/keyboards/naiping/np64/info.json b/keyboards/weirdo/naiping/np64/info.json
similarity index 100%
rename from keyboards/naiping/np64/info.json
rename to keyboards/weirdo/naiping/np64/info.json
diff --git a/keyboards/naiping/np64/keymaps/default/keymap.c b/keyboards/weirdo/naiping/np64/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/naiping/np64/keymaps/default/keymap.c
rename to keyboards/weirdo/naiping/np64/keymaps/default/keymap.c
diff --git a/keyboards/naiping/np64/keymaps/via/keymap.c b/keyboards/weirdo/naiping/np64/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/naiping/np64/keymaps/via/keymap.c
rename to keyboards/weirdo/naiping/np64/keymaps/via/keymap.c
diff --git a/keyboards/naiping/np64/keymaps/via/rules.mk b/keyboards/weirdo/naiping/np64/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/naiping/np64/keymaps/via/rules.mk
rename to keyboards/weirdo/naiping/np64/keymaps/via/rules.mk
diff --git a/keyboards/naiping/np64/np64.c b/keyboards/weirdo/naiping/np64/np64.c
similarity index 100%
rename from keyboards/naiping/np64/np64.c
rename to keyboards/weirdo/naiping/np64/np64.c
diff --git a/keyboards/naiping/np64/np64.h b/keyboards/weirdo/naiping/np64/np64.h
similarity index 100%
rename from keyboards/naiping/np64/np64.h
rename to keyboards/weirdo/naiping/np64/np64.h
diff --git a/keyboards/naiping/np64/readme.md b/keyboards/weirdo/naiping/np64/readme.md
similarity index 95%
rename from keyboards/naiping/np64/readme.md
rename to keyboards/weirdo/naiping/np64/readme.md
index 8e85d79de3..a5b4c89f01 100644
--- a/keyboards/naiping/np64/readme.md
+++ b/keyboards/weirdo/naiping/np64/readme.md
@@ -10,7 +10,7 @@ A 60% keyboard based on STM32f303
 
 Make example for this keyboard (after setting up your build environment):
 
-    make naiping/np64:default
+    make weirdo/naiping/np64:default
 
 The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written.
 
diff --git a/keyboards/naiping/np64/rules.mk b/keyboards/weirdo/naiping/np64/rules.mk
similarity index 100%
rename from keyboards/naiping/np64/rules.mk
rename to keyboards/weirdo/naiping/np64/rules.mk
diff --git a/keyboards/naiping/nphhkb/chconf.h b/keyboards/weirdo/naiping/nphhkb/chconf.h
similarity index 100%
rename from keyboards/naiping/nphhkb/chconf.h
rename to keyboards/weirdo/naiping/nphhkb/chconf.h
diff --git a/keyboards/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h
similarity index 100%
rename from keyboards/naiping/nphhkb/config.h
rename to keyboards/weirdo/naiping/nphhkb/config.h
diff --git a/keyboards/naiping/nphhkb/info.json b/keyboards/weirdo/naiping/nphhkb/info.json
similarity index 100%
rename from keyboards/naiping/nphhkb/info.json
rename to keyboards/weirdo/naiping/nphhkb/info.json
diff --git a/keyboards/naiping/nphhkb/keymaps/default/keymap.c b/keyboards/weirdo/naiping/nphhkb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/naiping/nphhkb/keymaps/default/keymap.c
rename to keyboards/weirdo/naiping/nphhkb/keymaps/default/keymap.c
diff --git a/keyboards/naiping/nphhkb/keymaps/via/keymap.c b/keyboards/weirdo/naiping/nphhkb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/naiping/nphhkb/keymaps/via/keymap.c
rename to keyboards/weirdo/naiping/nphhkb/keymaps/via/keymap.c
diff --git a/keyboards/naiping/nphhkb/keymaps/via/rules.mk b/keyboards/weirdo/naiping/nphhkb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/naiping/nphhkb/keymaps/via/rules.mk
rename to keyboards/weirdo/naiping/nphhkb/keymaps/via/rules.mk
diff --git a/keyboards/naiping/nphhkb/nphhkb.c b/keyboards/weirdo/naiping/nphhkb/nphhkb.c
similarity index 100%
rename from keyboards/naiping/nphhkb/nphhkb.c
rename to keyboards/weirdo/naiping/nphhkb/nphhkb.c
diff --git a/keyboards/naiping/nphhkb/nphhkb.h b/keyboards/weirdo/naiping/nphhkb/nphhkb.h
similarity index 100%
rename from keyboards/naiping/nphhkb/nphhkb.h
rename to keyboards/weirdo/naiping/nphhkb/nphhkb.h
diff --git a/keyboards/naiping/nphhkb/readme.md b/keyboards/weirdo/naiping/nphhkb/readme.md
similarity index 94%
rename from keyboards/naiping/nphhkb/readme.md
rename to keyboards/weirdo/naiping/nphhkb/readme.md
index 47ad9dafc3..1ed6d46eff 100644
--- a/keyboards/naiping/nphhkb/readme.md
+++ b/keyboards/weirdo/naiping/nphhkb/readme.md
@@ -10,7 +10,7 @@ A 60% keyboard based on STM32f303
 
 Make example for this keyboard (after setting up your build environment):
 
-    make naiping/nphhkb:default
+    make weirdo/naiping/nphhkb:default
 
 The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written.
 
diff --git a/keyboards/naiping/nphhkb/rules.mk b/keyboards/weirdo/naiping/nphhkb/rules.mk
similarity index 100%
rename from keyboards/naiping/nphhkb/rules.mk
rename to keyboards/weirdo/naiping/nphhkb/rules.mk
diff --git a/keyboards/naiping/npminila/chconf.h b/keyboards/weirdo/naiping/npminila/chconf.h
similarity index 100%
rename from keyboards/naiping/npminila/chconf.h
rename to keyboards/weirdo/naiping/npminila/chconf.h
diff --git a/keyboards/naiping/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h
similarity index 100%
rename from keyboards/naiping/npminila/config.h
rename to keyboards/weirdo/naiping/npminila/config.h
diff --git a/keyboards/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json
similarity index 100%
rename from keyboards/naiping/npminila/info.json
rename to keyboards/weirdo/naiping/npminila/info.json
diff --git a/keyboards/naiping/npminila/keymaps/default/keymap.c b/keyboards/weirdo/naiping/npminila/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/naiping/npminila/keymaps/default/keymap.c
rename to keyboards/weirdo/naiping/npminila/keymaps/default/keymap.c
diff --git a/keyboards/naiping/npminila/keymaps/via/keymap.c b/keyboards/weirdo/naiping/npminila/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/naiping/npminila/keymaps/via/keymap.c
rename to keyboards/weirdo/naiping/npminila/keymaps/via/keymap.c
diff --git a/keyboards/naiping/npminila/keymaps/via/rules.mk b/keyboards/weirdo/naiping/npminila/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/naiping/npminila/keymaps/via/rules.mk
rename to keyboards/weirdo/naiping/npminila/keymaps/via/rules.mk
diff --git a/keyboards/naiping/npminila/npminila.c b/keyboards/weirdo/naiping/npminila/npminila.c
similarity index 100%
rename from keyboards/naiping/npminila/npminila.c
rename to keyboards/weirdo/naiping/npminila/npminila.c
diff --git a/keyboards/naiping/npminila/npminila.h b/keyboards/weirdo/naiping/npminila/npminila.h
similarity index 100%
rename from keyboards/naiping/npminila/npminila.h
rename to keyboards/weirdo/naiping/npminila/npminila.h
diff --git a/keyboards/naiping/npminila/readme.md b/keyboards/weirdo/naiping/npminila/readme.md
similarity index 94%
rename from keyboards/naiping/npminila/readme.md
rename to keyboards/weirdo/naiping/npminila/readme.md
index 335e12508d..35d5a2e5ec 100644
--- a/keyboards/naiping/npminila/readme.md
+++ b/keyboards/weirdo/naiping/npminila/readme.md
@@ -10,7 +10,7 @@ A 60% keyboard based on STM32f303
 
 Make example for this keyboard (after setting up your build environment):
 
-    make naiping/npminila:default
+    make weirdo/naiping/npminila:default
 
 The RST pin and GND pin on the board can be quickly shortened twice to enter DFU mode, and then the program can be written.
 
diff --git a/keyboards/naiping/npminila/rules.mk b/keyboards/weirdo/naiping/npminila/rules.mk
similarity index 100%
rename from keyboards/naiping/npminila/rules.mk
rename to keyboards/weirdo/naiping/npminila/rules.mk
diff --git a/keyboards/tiger910/config.h b/keyboards/weirdo/tiger910/config.h
similarity index 100%
rename from keyboards/tiger910/config.h
rename to keyboards/weirdo/tiger910/config.h
diff --git a/keyboards/tiger910/info.json b/keyboards/weirdo/tiger910/info.json
similarity index 100%
rename from keyboards/tiger910/info.json
rename to keyboards/weirdo/tiger910/info.json
diff --git a/keyboards/tiger910/keymaps/default/keymap.c b/keyboards/weirdo/tiger910/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/tiger910/keymaps/default/keymap.c
rename to keyboards/weirdo/tiger910/keymaps/default/keymap.c
diff --git a/keyboards/tiger910/keymaps/via/keymap.c b/keyboards/weirdo/tiger910/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/tiger910/keymaps/via/keymap.c
rename to keyboards/weirdo/tiger910/keymaps/via/keymap.c
diff --git a/keyboards/tiger910/keymaps/via/rules.mk b/keyboards/weirdo/tiger910/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/tiger910/keymaps/via/rules.mk
rename to keyboards/weirdo/tiger910/keymaps/via/rules.mk
diff --git a/keyboards/tiger910/readme.md b/keyboards/weirdo/tiger910/readme.md
similarity index 94%
rename from keyboards/tiger910/readme.md
rename to keyboards/weirdo/tiger910/readme.md
index ed14a307d3..a47b84db87 100644
--- a/keyboards/tiger910/readme.md
+++ b/keyboards/weirdo/tiger910/readme.md
@@ -10,6 +10,6 @@ A 65% keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make tiger910:default
+    make weirdo/tiger910: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).
diff --git a/keyboards/tiger910/rules.mk b/keyboards/weirdo/tiger910/rules.mk
similarity index 100%
rename from keyboards/tiger910/rules.mk
rename to keyboards/weirdo/tiger910/rules.mk
diff --git a/keyboards/tiger910/tiger910.c b/keyboards/weirdo/tiger910/tiger910.c
similarity index 100%
rename from keyboards/tiger910/tiger910.c
rename to keyboards/weirdo/tiger910/tiger910.c
diff --git a/keyboards/tiger910/tiger910.h b/keyboards/weirdo/tiger910/tiger910.h
similarity index 100%
rename from keyboards/tiger910/tiger910.h
rename to keyboards/weirdo/tiger910/tiger910.h

From a483ab321313471bfa54e71f14bb68056130b7c3 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:39:17 +0800
Subject: [PATCH 215/867] [Keyboard] move novelkeys keyboards to vendor folder
 (#15783)

---
 keyboards/{ => novelkeys}/nk1/config.h                      | 0
 keyboards/{ => novelkeys}/nk1/info.json                     | 0
 keyboards/{ => novelkeys}/nk1/keymaps/default/keymap.c      | 0
 keyboards/{ => novelkeys}/nk1/keymaps/default/readme.md     | 0
 keyboards/{ => novelkeys}/nk1/keymaps/via/keymap.c          | 0
 keyboards/{ => novelkeys}/nk1/keymaps/via/readme.md         | 0
 keyboards/{ => novelkeys}/nk1/keymaps/via/rules.mk          | 0
 keyboards/{ => novelkeys}/nk1/nk1.c                         | 0
 keyboards/{ => novelkeys}/nk1/nk1.h                         | 0
 keyboards/{ => novelkeys}/nk1/readme.md                     | 2 +-
 keyboards/{ => novelkeys}/nk1/rules.mk                      | 0
 keyboards/{ => novelkeys}/nk65/config.h                     | 0
 keyboards/{ => novelkeys}/nk65/halconf.h                    | 0
 keyboards/{ => novelkeys}/nk65/info.json                    | 0
 keyboards/{ => novelkeys}/nk65/keymaps/default/keymap.c     | 0
 keyboards/{ => novelkeys}/nk65/keymaps/default/readme.md    | 0
 keyboards/{ => novelkeys}/nk65/keymaps/madhatter/keymap.c   | 0
 keyboards/{ => novelkeys}/nk65/keymaps/via/keymap.c         | 0
 keyboards/{ => novelkeys}/nk65/keymaps/via/readme.md        | 0
 keyboards/{ => novelkeys}/nk65/keymaps/via/rules.mk         | 0
 keyboards/{ => novelkeys}/nk65/mcuconf.h                    | 0
 keyboards/{ => novelkeys}/nk65/nk65.c                       | 0
 keyboards/{ => novelkeys}/nk65/nk65.h                       | 0
 keyboards/{ => novelkeys}/nk65/readme.md                    | 2 +-
 keyboards/{ => novelkeys}/nk65/rules.mk                     | 0
 keyboards/{ => novelkeys}/nk65/v1_4/config.h                | 0
 keyboards/{ => novelkeys}/nk65/v1_4/readme.md               | 0
 keyboards/{ => novelkeys}/nk65/v1_4/rules.mk                | 0
 keyboards/{ => novelkeys}/nk87/config.h                     | 0
 keyboards/{ => novelkeys}/nk87/halconf.h                    | 0
 keyboards/{ => novelkeys}/nk87/info.json                    | 0
 keyboards/{ => novelkeys}/nk87/keymaps/default/keymap.c     | 0
 keyboards/{ => novelkeys}/nk87/keymaps/default/readme.md    | 0
 keyboards/{ => novelkeys}/nk87/keymaps/via/keymap.c         | 0
 keyboards/{ => novelkeys}/nk87/keymaps/via/readme.md        | 0
 keyboards/{ => novelkeys}/nk87/keymaps/via/rules.mk         | 0
 keyboards/{ => novelkeys}/nk87/mcuconf.h                    | 0
 keyboards/{ => novelkeys}/nk87/nk87.c                       | 0
 keyboards/{ => novelkeys}/nk87/nk87.h                       | 0
 keyboards/{ => novelkeys}/nk87/readme.md                    | 2 +-
 keyboards/{ => novelkeys}/nk87/rules.mk                     | 0
 keyboards/{ => novelkeys}/novelpad/config.h                 | 0
 keyboards/{ => novelkeys}/novelpad/info.json                | 0
 keyboards/{ => novelkeys}/novelpad/keymaps/0xdec/keymap.c   | 0
 keyboards/{ => novelkeys}/novelpad/keymaps/default/keymap.c | 0
 keyboards/{ => novelkeys}/novelpad/novelpad.c               | 0
 keyboards/{ => novelkeys}/novelpad/novelpad.h               | 0
 keyboards/{ => novelkeys}/novelpad/readme.md                | 2 +-
 keyboards/{ => novelkeys}/novelpad/rules.mk                 | 0
 49 files changed, 4 insertions(+), 4 deletions(-)
 rename keyboards/{ => novelkeys}/nk1/config.h (100%)
 rename keyboards/{ => novelkeys}/nk1/info.json (100%)
 rename keyboards/{ => novelkeys}/nk1/keymaps/default/keymap.c (100%)
 rename keyboards/{ => novelkeys}/nk1/keymaps/default/readme.md (100%)
 rename keyboards/{ => novelkeys}/nk1/keymaps/via/keymap.c (100%)
 rename keyboards/{ => novelkeys}/nk1/keymaps/via/readme.md (100%)
 rename keyboards/{ => novelkeys}/nk1/keymaps/via/rules.mk (100%)
 rename keyboards/{ => novelkeys}/nk1/nk1.c (100%)
 rename keyboards/{ => novelkeys}/nk1/nk1.h (100%)
 rename keyboards/{ => novelkeys}/nk1/readme.md (96%)
 rename keyboards/{ => novelkeys}/nk1/rules.mk (100%)
 rename keyboards/{ => novelkeys}/nk65/config.h (100%)
 rename keyboards/{ => novelkeys}/nk65/halconf.h (100%)
 rename keyboards/{ => novelkeys}/nk65/info.json (100%)
 rename keyboards/{ => novelkeys}/nk65/keymaps/default/keymap.c (100%)
 rename keyboards/{ => novelkeys}/nk65/keymaps/default/readme.md (100%)
 rename keyboards/{ => novelkeys}/nk65/keymaps/madhatter/keymap.c (100%)
 rename keyboards/{ => novelkeys}/nk65/keymaps/via/keymap.c (100%)
 rename keyboards/{ => novelkeys}/nk65/keymaps/via/readme.md (100%)
 rename keyboards/{ => novelkeys}/nk65/keymaps/via/rules.mk (100%)
 rename keyboards/{ => novelkeys}/nk65/mcuconf.h (100%)
 rename keyboards/{ => novelkeys}/nk65/nk65.c (100%)
 rename keyboards/{ => novelkeys}/nk65/nk65.h (100%)
 rename keyboards/{ => novelkeys}/nk65/readme.md (97%)
 rename keyboards/{ => novelkeys}/nk65/rules.mk (100%)
 rename keyboards/{ => novelkeys}/nk65/v1_4/config.h (100%)
 rename keyboards/{ => novelkeys}/nk65/v1_4/readme.md (100%)
 rename keyboards/{ => novelkeys}/nk65/v1_4/rules.mk (100%)
 rename keyboards/{ => novelkeys}/nk87/config.h (100%)
 rename keyboards/{ => novelkeys}/nk87/halconf.h (100%)
 rename keyboards/{ => novelkeys}/nk87/info.json (100%)
 rename keyboards/{ => novelkeys}/nk87/keymaps/default/keymap.c (100%)
 rename keyboards/{ => novelkeys}/nk87/keymaps/default/readme.md (100%)
 rename keyboards/{ => novelkeys}/nk87/keymaps/via/keymap.c (100%)
 rename keyboards/{ => novelkeys}/nk87/keymaps/via/readme.md (100%)
 rename keyboards/{ => novelkeys}/nk87/keymaps/via/rules.mk (100%)
 rename keyboards/{ => novelkeys}/nk87/mcuconf.h (100%)
 rename keyboards/{ => novelkeys}/nk87/nk87.c (100%)
 rename keyboards/{ => novelkeys}/nk87/nk87.h (100%)
 rename keyboards/{ => novelkeys}/nk87/readme.md (96%)
 rename keyboards/{ => novelkeys}/nk87/rules.mk (100%)
 rename keyboards/{ => novelkeys}/novelpad/config.h (100%)
 rename keyboards/{ => novelkeys}/novelpad/info.json (100%)
 rename keyboards/{ => novelkeys}/novelpad/keymaps/0xdec/keymap.c (100%)
 rename keyboards/{ => novelkeys}/novelpad/keymaps/default/keymap.c (100%)
 rename keyboards/{ => novelkeys}/novelpad/novelpad.c (100%)
 rename keyboards/{ => novelkeys}/novelpad/novelpad.h (100%)
 rename keyboards/{ => novelkeys}/novelpad/readme.md (95%)
 rename keyboards/{ => novelkeys}/novelpad/rules.mk (100%)

diff --git a/keyboards/nk1/config.h b/keyboards/novelkeys/nk1/config.h
similarity index 100%
rename from keyboards/nk1/config.h
rename to keyboards/novelkeys/nk1/config.h
diff --git a/keyboards/nk1/info.json b/keyboards/novelkeys/nk1/info.json
similarity index 100%
rename from keyboards/nk1/info.json
rename to keyboards/novelkeys/nk1/info.json
diff --git a/keyboards/nk1/keymaps/default/keymap.c b/keyboards/novelkeys/nk1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nk1/keymaps/default/keymap.c
rename to keyboards/novelkeys/nk1/keymaps/default/keymap.c
diff --git a/keyboards/nk1/keymaps/default/readme.md b/keyboards/novelkeys/nk1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nk1/keymaps/default/readme.md
rename to keyboards/novelkeys/nk1/keymaps/default/readme.md
diff --git a/keyboards/nk1/keymaps/via/keymap.c b/keyboards/novelkeys/nk1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nk1/keymaps/via/keymap.c
rename to keyboards/novelkeys/nk1/keymaps/via/keymap.c
diff --git a/keyboards/nk1/keymaps/via/readme.md b/keyboards/novelkeys/nk1/keymaps/via/readme.md
similarity index 100%
rename from keyboards/nk1/keymaps/via/readme.md
rename to keyboards/novelkeys/nk1/keymaps/via/readme.md
diff --git a/keyboards/nk1/keymaps/via/rules.mk b/keyboards/novelkeys/nk1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nk1/keymaps/via/rules.mk
rename to keyboards/novelkeys/nk1/keymaps/via/rules.mk
diff --git a/keyboards/nk1/nk1.c b/keyboards/novelkeys/nk1/nk1.c
similarity index 100%
rename from keyboards/nk1/nk1.c
rename to keyboards/novelkeys/nk1/nk1.c
diff --git a/keyboards/nk1/nk1.h b/keyboards/novelkeys/nk1/nk1.h
similarity index 100%
rename from keyboards/nk1/nk1.h
rename to keyboards/novelkeys/nk1/nk1.h
diff --git a/keyboards/nk1/readme.md b/keyboards/novelkeys/nk1/readme.md
similarity index 96%
rename from keyboards/nk1/readme.md
rename to keyboards/novelkeys/nk1/readme.md
index bc668481b5..720d03adbc 100644
--- a/keyboards/nk1/readme.md
+++ b/keyboards/novelkeys/nk1/readme.md
@@ -12,7 +12,7 @@ A big switch keypad!
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nk1:default
+    make novelkeys/nk1: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).
 
diff --git a/keyboards/nk1/rules.mk b/keyboards/novelkeys/nk1/rules.mk
similarity index 100%
rename from keyboards/nk1/rules.mk
rename to keyboards/novelkeys/nk1/rules.mk
diff --git a/keyboards/nk65/config.h b/keyboards/novelkeys/nk65/config.h
similarity index 100%
rename from keyboards/nk65/config.h
rename to keyboards/novelkeys/nk65/config.h
diff --git a/keyboards/nk65/halconf.h b/keyboards/novelkeys/nk65/halconf.h
similarity index 100%
rename from keyboards/nk65/halconf.h
rename to keyboards/novelkeys/nk65/halconf.h
diff --git a/keyboards/nk65/info.json b/keyboards/novelkeys/nk65/info.json
similarity index 100%
rename from keyboards/nk65/info.json
rename to keyboards/novelkeys/nk65/info.json
diff --git a/keyboards/nk65/keymaps/default/keymap.c b/keyboards/novelkeys/nk65/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nk65/keymaps/default/keymap.c
rename to keyboards/novelkeys/nk65/keymaps/default/keymap.c
diff --git a/keyboards/nk65/keymaps/default/readme.md b/keyboards/novelkeys/nk65/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nk65/keymaps/default/readme.md
rename to keyboards/novelkeys/nk65/keymaps/default/readme.md
diff --git a/keyboards/nk65/keymaps/madhatter/keymap.c b/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c
similarity index 100%
rename from keyboards/nk65/keymaps/madhatter/keymap.c
rename to keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c
diff --git a/keyboards/nk65/keymaps/via/keymap.c b/keyboards/novelkeys/nk65/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nk65/keymaps/via/keymap.c
rename to keyboards/novelkeys/nk65/keymaps/via/keymap.c
diff --git a/keyboards/nk65/keymaps/via/readme.md b/keyboards/novelkeys/nk65/keymaps/via/readme.md
similarity index 100%
rename from keyboards/nk65/keymaps/via/readme.md
rename to keyboards/novelkeys/nk65/keymaps/via/readme.md
diff --git a/keyboards/nk65/keymaps/via/rules.mk b/keyboards/novelkeys/nk65/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nk65/keymaps/via/rules.mk
rename to keyboards/novelkeys/nk65/keymaps/via/rules.mk
diff --git a/keyboards/nk65/mcuconf.h b/keyboards/novelkeys/nk65/mcuconf.h
similarity index 100%
rename from keyboards/nk65/mcuconf.h
rename to keyboards/novelkeys/nk65/mcuconf.h
diff --git a/keyboards/nk65/nk65.c b/keyboards/novelkeys/nk65/nk65.c
similarity index 100%
rename from keyboards/nk65/nk65.c
rename to keyboards/novelkeys/nk65/nk65.c
diff --git a/keyboards/nk65/nk65.h b/keyboards/novelkeys/nk65/nk65.h
similarity index 100%
rename from keyboards/nk65/nk65.h
rename to keyboards/novelkeys/nk65/nk65.h
diff --git a/keyboards/nk65/readme.md b/keyboards/novelkeys/nk65/readme.md
similarity index 97%
rename from keyboards/nk65/readme.md
rename to keyboards/novelkeys/nk65/readme.md
index 3bd04210d1..38f66500b9 100755
--- a/keyboards/nk65/readme.md
+++ b/keyboards/novelkeys/nk65/readme.md
@@ -19,7 +19,7 @@ NOTE: For PCBs with revision v1.4 or later please use nk65/v1_4 in the make comm
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nk65:via
+    make novelkeys/nk65:via
 
 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).
 
diff --git a/keyboards/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk
similarity index 100%
rename from keyboards/nk65/rules.mk
rename to keyboards/novelkeys/nk65/rules.mk
diff --git a/keyboards/nk65/v1_4/config.h b/keyboards/novelkeys/nk65/v1_4/config.h
similarity index 100%
rename from keyboards/nk65/v1_4/config.h
rename to keyboards/novelkeys/nk65/v1_4/config.h
diff --git a/keyboards/nk65/v1_4/readme.md b/keyboards/novelkeys/nk65/v1_4/readme.md
similarity index 100%
rename from keyboards/nk65/v1_4/readme.md
rename to keyboards/novelkeys/nk65/v1_4/readme.md
diff --git a/keyboards/nk65/v1_4/rules.mk b/keyboards/novelkeys/nk65/v1_4/rules.mk
similarity index 100%
rename from keyboards/nk65/v1_4/rules.mk
rename to keyboards/novelkeys/nk65/v1_4/rules.mk
diff --git a/keyboards/nk87/config.h b/keyboards/novelkeys/nk87/config.h
similarity index 100%
rename from keyboards/nk87/config.h
rename to keyboards/novelkeys/nk87/config.h
diff --git a/keyboards/nk87/halconf.h b/keyboards/novelkeys/nk87/halconf.h
similarity index 100%
rename from keyboards/nk87/halconf.h
rename to keyboards/novelkeys/nk87/halconf.h
diff --git a/keyboards/nk87/info.json b/keyboards/novelkeys/nk87/info.json
similarity index 100%
rename from keyboards/nk87/info.json
rename to keyboards/novelkeys/nk87/info.json
diff --git a/keyboards/nk87/keymaps/default/keymap.c b/keyboards/novelkeys/nk87/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nk87/keymaps/default/keymap.c
rename to keyboards/novelkeys/nk87/keymaps/default/keymap.c
diff --git a/keyboards/nk87/keymaps/default/readme.md b/keyboards/novelkeys/nk87/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nk87/keymaps/default/readme.md
rename to keyboards/novelkeys/nk87/keymaps/default/readme.md
diff --git a/keyboards/nk87/keymaps/via/keymap.c b/keyboards/novelkeys/nk87/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nk87/keymaps/via/keymap.c
rename to keyboards/novelkeys/nk87/keymaps/via/keymap.c
diff --git a/keyboards/nk87/keymaps/via/readme.md b/keyboards/novelkeys/nk87/keymaps/via/readme.md
similarity index 100%
rename from keyboards/nk87/keymaps/via/readme.md
rename to keyboards/novelkeys/nk87/keymaps/via/readme.md
diff --git a/keyboards/nk87/keymaps/via/rules.mk b/keyboards/novelkeys/nk87/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nk87/keymaps/via/rules.mk
rename to keyboards/novelkeys/nk87/keymaps/via/rules.mk
diff --git a/keyboards/nk87/mcuconf.h b/keyboards/novelkeys/nk87/mcuconf.h
similarity index 100%
rename from keyboards/nk87/mcuconf.h
rename to keyboards/novelkeys/nk87/mcuconf.h
diff --git a/keyboards/nk87/nk87.c b/keyboards/novelkeys/nk87/nk87.c
similarity index 100%
rename from keyboards/nk87/nk87.c
rename to keyboards/novelkeys/nk87/nk87.c
diff --git a/keyboards/nk87/nk87.h b/keyboards/novelkeys/nk87/nk87.h
similarity index 100%
rename from keyboards/nk87/nk87.h
rename to keyboards/novelkeys/nk87/nk87.h
diff --git a/keyboards/nk87/readme.md b/keyboards/novelkeys/nk87/readme.md
similarity index 96%
rename from keyboards/nk87/readme.md
rename to keyboards/novelkeys/nk87/readme.md
index 9ea4d99718..0de3e08b40 100755
--- a/keyboards/nk87/readme.md
+++ b/keyboards/novelkeys/nk87/readme.md
@@ -14,7 +14,7 @@ This is a standard fixed layout TKL PCB. It supports VIA and full per-key RGB.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nk87:default
+    make novelkeys/nk87: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).
 
diff --git a/keyboards/nk87/rules.mk b/keyboards/novelkeys/nk87/rules.mk
similarity index 100%
rename from keyboards/nk87/rules.mk
rename to keyboards/novelkeys/nk87/rules.mk
diff --git a/keyboards/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h
similarity index 100%
rename from keyboards/novelpad/config.h
rename to keyboards/novelkeys/novelpad/config.h
diff --git a/keyboards/novelpad/info.json b/keyboards/novelkeys/novelpad/info.json
similarity index 100%
rename from keyboards/novelpad/info.json
rename to keyboards/novelkeys/novelpad/info.json
diff --git a/keyboards/novelpad/keymaps/0xdec/keymap.c b/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
similarity index 100%
rename from keyboards/novelpad/keymaps/0xdec/keymap.c
rename to keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
diff --git a/keyboards/novelpad/keymaps/default/keymap.c b/keyboards/novelkeys/novelpad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/novelpad/keymaps/default/keymap.c
rename to keyboards/novelkeys/novelpad/keymaps/default/keymap.c
diff --git a/keyboards/novelpad/novelpad.c b/keyboards/novelkeys/novelpad/novelpad.c
similarity index 100%
rename from keyboards/novelpad/novelpad.c
rename to keyboards/novelkeys/novelpad/novelpad.c
diff --git a/keyboards/novelpad/novelpad.h b/keyboards/novelkeys/novelpad/novelpad.h
similarity index 100%
rename from keyboards/novelpad/novelpad.h
rename to keyboards/novelkeys/novelpad/novelpad.h
diff --git a/keyboards/novelpad/readme.md b/keyboards/novelkeys/novelpad/readme.md
similarity index 95%
rename from keyboards/novelpad/readme.md
rename to keyboards/novelkeys/novelpad/readme.md
index 0cde8337ca..49773b8dc0 100644
--- a/keyboards/novelpad/readme.md
+++ b/keyboards/novelkeys/novelpad/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [Novelkeys.xyz](https://novelkeys.xyz)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make novelpad:default
+    make novelkeys/novelpad: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).
diff --git a/keyboards/novelpad/rules.mk b/keyboards/novelkeys/novelpad/rules.mk
similarity index 100%
rename from keyboards/novelpad/rules.mk
rename to keyboards/novelkeys/novelpad/rules.mk

From 36ebc75e9a1be0750f5a10bdd81c37621a3229cd Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:39:56 +0800
Subject: [PATCH 216/867] [Keyboard] move yiancar's boards into yiancardesigns/
 (#15781)

---
 keyboards/{ => yiancardesigns}/barleycorn/barleycorn.c        | 0
 keyboards/{ => yiancardesigns}/barleycorn/barleycorn.h        | 0
 keyboards/{ => yiancardesigns}/barleycorn/config.h            | 0
 keyboards/{ => yiancardesigns}/barleycorn/info.json           | 0
 .../{ => yiancardesigns}/barleycorn/keymaps/default/keymap.c  | 0
 .../{ => yiancardesigns}/barleycorn/keymaps/default/readme.md | 0
 .../{ => yiancardesigns}/barleycorn/keymaps/iso/keymap.c      | 0
 .../{ => yiancardesigns}/barleycorn/keymaps/iso/readme.md     | 0
 .../{ => yiancardesigns}/barleycorn/keymaps/via/keymap.c      | 0
 .../{ => yiancardesigns}/barleycorn/keymaps/via/readme.md     | 0
 .../{ => yiancardesigns}/barleycorn/keymaps/via/rules.mk      | 0
 keyboards/{ => yiancardesigns}/barleycorn/matrix.c            | 0
 keyboards/{ => yiancardesigns}/barleycorn/readme.md           | 4 ++--
 keyboards/{ => yiancardesigns}/barleycorn/rules.mk            | 0
 keyboards/{ => yiancardesigns}/gingham/config.h               | 0
 keyboards/{ => yiancardesigns}/gingham/gingham.c              | 0
 keyboards/{ => yiancardesigns}/gingham/gingham.h              | 0
 keyboards/{ => yiancardesigns}/gingham/info.json              | 0
 .../gingham/keymaps/codecoffeecode/keymap.c                   | 0
 .../gingham/keymaps/codecoffeecode/readme.md                  | 0
 .../{ => yiancardesigns}/gingham/keymaps/default/keymap.c     | 0
 .../{ => yiancardesigns}/gingham/keymaps/default/readme.md    | 0
 keyboards/{ => yiancardesigns}/gingham/keymaps/iso/keymap.c   | 0
 keyboards/{ => yiancardesigns}/gingham/keymaps/iso/readme.md  | 0
 keyboards/{ => yiancardesigns}/gingham/keymaps/via/keymap.c   | 0
 keyboards/{ => yiancardesigns}/gingham/keymaps/via/readme.md  | 0
 keyboards/{ => yiancardesigns}/gingham/keymaps/via/rules.mk   | 0
 keyboards/{ => yiancardesigns}/gingham/matrix.c               | 0
 keyboards/{ => yiancardesigns}/gingham/readme.md              | 4 ++--
 keyboards/{ => yiancardesigns}/gingham/rules.mk               | 0
 keyboards/{ => yiancardesigns}/seigaiha/config.h              | 0
 keyboards/{ => yiancardesigns}/seigaiha/info.json             | 0
 .../{ => yiancardesigns}/seigaiha/keymaps/default/keymap.c    | 0
 .../{ => yiancardesigns}/seigaiha/keymaps/default/readme.md   | 0
 keyboards/{ => yiancardesigns}/seigaiha/keymaps/via/keymap.c  | 0
 keyboards/{ => yiancardesigns}/seigaiha/keymaps/via/readme.md | 0
 keyboards/{ => yiancardesigns}/seigaiha/keymaps/via/rules.mk  | 0
 keyboards/{ => yiancardesigns}/seigaiha/matrix.c              | 0
 keyboards/{ => yiancardesigns}/seigaiha/readme.md             | 4 ++--
 keyboards/{ => yiancardesigns}/seigaiha/rules.mk              | 0
 keyboards/{ => yiancardesigns}/seigaiha/seigaiha.c            | 0
 keyboards/{ => yiancardesigns}/seigaiha/seigaiha.h            | 0
 42 files changed, 6 insertions(+), 6 deletions(-)
 rename keyboards/{ => yiancardesigns}/barleycorn/barleycorn.c (100%)
 rename keyboards/{ => yiancardesigns}/barleycorn/barleycorn.h (100%)
 rename keyboards/{ => yiancardesigns}/barleycorn/config.h (100%)
 rename keyboards/{ => yiancardesigns}/barleycorn/info.json (100%)
 rename keyboards/{ => yiancardesigns}/barleycorn/keymaps/default/keymap.c (100%)
 rename keyboards/{ => yiancardesigns}/barleycorn/keymaps/default/readme.md (100%)
 rename keyboards/{ => yiancardesigns}/barleycorn/keymaps/iso/keymap.c (100%)
 rename keyboards/{ => yiancardesigns}/barleycorn/keymaps/iso/readme.md (100%)
 rename keyboards/{ => yiancardesigns}/barleycorn/keymaps/via/keymap.c (100%)
 rename keyboards/{ => yiancardesigns}/barleycorn/keymaps/via/readme.md (100%)
 rename keyboards/{ => yiancardesigns}/barleycorn/keymaps/via/rules.mk (100%)
 rename keyboards/{ => yiancardesigns}/barleycorn/matrix.c (100%)
 rename keyboards/{ => yiancardesigns}/barleycorn/readme.md (90%)
 rename keyboards/{ => yiancardesigns}/barleycorn/rules.mk (100%)
 rename keyboards/{ => yiancardesigns}/gingham/config.h (100%)
 rename keyboards/{ => yiancardesigns}/gingham/gingham.c (100%)
 rename keyboards/{ => yiancardesigns}/gingham/gingham.h (100%)
 rename keyboards/{ => yiancardesigns}/gingham/info.json (100%)
 rename keyboards/{ => yiancardesigns}/gingham/keymaps/codecoffeecode/keymap.c (100%)
 rename keyboards/{ => yiancardesigns}/gingham/keymaps/codecoffeecode/readme.md (100%)
 rename keyboards/{ => yiancardesigns}/gingham/keymaps/default/keymap.c (100%)
 rename keyboards/{ => yiancardesigns}/gingham/keymaps/default/readme.md (100%)
 rename keyboards/{ => yiancardesigns}/gingham/keymaps/iso/keymap.c (100%)
 rename keyboards/{ => yiancardesigns}/gingham/keymaps/iso/readme.md (100%)
 rename keyboards/{ => yiancardesigns}/gingham/keymaps/via/keymap.c (100%)
 rename keyboards/{ => yiancardesigns}/gingham/keymaps/via/readme.md (100%)
 rename keyboards/{ => yiancardesigns}/gingham/keymaps/via/rules.mk (100%)
 rename keyboards/{ => yiancardesigns}/gingham/matrix.c (100%)
 rename keyboards/{ => yiancardesigns}/gingham/readme.md (91%)
 rename keyboards/{ => yiancardesigns}/gingham/rules.mk (100%)
 rename keyboards/{ => yiancardesigns}/seigaiha/config.h (100%)
 rename keyboards/{ => yiancardesigns}/seigaiha/info.json (100%)
 rename keyboards/{ => yiancardesigns}/seigaiha/keymaps/default/keymap.c (100%)
 rename keyboards/{ => yiancardesigns}/seigaiha/keymaps/default/readme.md (100%)
 rename keyboards/{ => yiancardesigns}/seigaiha/keymaps/via/keymap.c (100%)
 rename keyboards/{ => yiancardesigns}/seigaiha/keymaps/via/readme.md (100%)
 rename keyboards/{ => yiancardesigns}/seigaiha/keymaps/via/rules.mk (100%)
 rename keyboards/{ => yiancardesigns}/seigaiha/matrix.c (100%)
 rename keyboards/{ => yiancardesigns}/seigaiha/readme.md (90%)
 rename keyboards/{ => yiancardesigns}/seigaiha/rules.mk (100%)
 rename keyboards/{ => yiancardesigns}/seigaiha/seigaiha.c (100%)
 rename keyboards/{ => yiancardesigns}/seigaiha/seigaiha.h (100%)

diff --git a/keyboards/barleycorn/barleycorn.c b/keyboards/yiancardesigns/barleycorn/barleycorn.c
similarity index 100%
rename from keyboards/barleycorn/barleycorn.c
rename to keyboards/yiancardesigns/barleycorn/barleycorn.c
diff --git a/keyboards/barleycorn/barleycorn.h b/keyboards/yiancardesigns/barleycorn/barleycorn.h
similarity index 100%
rename from keyboards/barleycorn/barleycorn.h
rename to keyboards/yiancardesigns/barleycorn/barleycorn.h
diff --git a/keyboards/barleycorn/config.h b/keyboards/yiancardesigns/barleycorn/config.h
similarity index 100%
rename from keyboards/barleycorn/config.h
rename to keyboards/yiancardesigns/barleycorn/config.h
diff --git a/keyboards/barleycorn/info.json b/keyboards/yiancardesigns/barleycorn/info.json
similarity index 100%
rename from keyboards/barleycorn/info.json
rename to keyboards/yiancardesigns/barleycorn/info.json
diff --git a/keyboards/barleycorn/keymaps/default/keymap.c b/keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/barleycorn/keymaps/default/keymap.c
rename to keyboards/yiancardesigns/barleycorn/keymaps/default/keymap.c
diff --git a/keyboards/barleycorn/keymaps/default/readme.md b/keyboards/yiancardesigns/barleycorn/keymaps/default/readme.md
similarity index 100%
rename from keyboards/barleycorn/keymaps/default/readme.md
rename to keyboards/yiancardesigns/barleycorn/keymaps/default/readme.md
diff --git a/keyboards/barleycorn/keymaps/iso/keymap.c b/keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/barleycorn/keymaps/iso/keymap.c
rename to keyboards/yiancardesigns/barleycorn/keymaps/iso/keymap.c
diff --git a/keyboards/barleycorn/keymaps/iso/readme.md b/keyboards/yiancardesigns/barleycorn/keymaps/iso/readme.md
similarity index 100%
rename from keyboards/barleycorn/keymaps/iso/readme.md
rename to keyboards/yiancardesigns/barleycorn/keymaps/iso/readme.md
diff --git a/keyboards/barleycorn/keymaps/via/keymap.c b/keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/barleycorn/keymaps/via/keymap.c
rename to keyboards/yiancardesigns/barleycorn/keymaps/via/keymap.c
diff --git a/keyboards/barleycorn/keymaps/via/readme.md b/keyboards/yiancardesigns/barleycorn/keymaps/via/readme.md
similarity index 100%
rename from keyboards/barleycorn/keymaps/via/readme.md
rename to keyboards/yiancardesigns/barleycorn/keymaps/via/readme.md
diff --git a/keyboards/barleycorn/keymaps/via/rules.mk b/keyboards/yiancardesigns/barleycorn/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/barleycorn/keymaps/via/rules.mk
rename to keyboards/yiancardesigns/barleycorn/keymaps/via/rules.mk
diff --git a/keyboards/barleycorn/matrix.c b/keyboards/yiancardesigns/barleycorn/matrix.c
similarity index 100%
rename from keyboards/barleycorn/matrix.c
rename to keyboards/yiancardesigns/barleycorn/matrix.c
diff --git a/keyboards/barleycorn/readme.md b/keyboards/yiancardesigns/barleycorn/readme.md
similarity index 90%
rename from keyboards/barleycorn/readme.md
rename to keyboards/yiancardesigns/barleycorn/readme.md
index dd96c69e9a..c98be3e042 100644
--- a/keyboards/barleycorn/readme.md
+++ b/keyboards/yiancardesigns/barleycorn/readme.md
@@ -10,11 +10,11 @@ An f-row less compact 1800 kit with only through hole components.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make barleycorn:default
+    make yiancardesigns/barleycorn:default
 
 Flashing example for this keyboard:
 
-    make barleycorn:default:flash
+    make yiancardesigns/barleycorn:default:flash
 
 Bootloader:
 use usbasploader from HSGW's repository.
diff --git a/keyboards/barleycorn/rules.mk b/keyboards/yiancardesigns/barleycorn/rules.mk
similarity index 100%
rename from keyboards/barleycorn/rules.mk
rename to keyboards/yiancardesigns/barleycorn/rules.mk
diff --git a/keyboards/gingham/config.h b/keyboards/yiancardesigns/gingham/config.h
similarity index 100%
rename from keyboards/gingham/config.h
rename to keyboards/yiancardesigns/gingham/config.h
diff --git a/keyboards/gingham/gingham.c b/keyboards/yiancardesigns/gingham/gingham.c
similarity index 100%
rename from keyboards/gingham/gingham.c
rename to keyboards/yiancardesigns/gingham/gingham.c
diff --git a/keyboards/gingham/gingham.h b/keyboards/yiancardesigns/gingham/gingham.h
similarity index 100%
rename from keyboards/gingham/gingham.h
rename to keyboards/yiancardesigns/gingham/gingham.h
diff --git a/keyboards/gingham/info.json b/keyboards/yiancardesigns/gingham/info.json
similarity index 100%
rename from keyboards/gingham/info.json
rename to keyboards/yiancardesigns/gingham/info.json
diff --git a/keyboards/gingham/keymaps/codecoffeecode/keymap.c b/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c
similarity index 100%
rename from keyboards/gingham/keymaps/codecoffeecode/keymap.c
rename to keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/keymap.c
diff --git a/keyboards/gingham/keymaps/codecoffeecode/readme.md b/keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/readme.md
similarity index 100%
rename from keyboards/gingham/keymaps/codecoffeecode/readme.md
rename to keyboards/yiancardesigns/gingham/keymaps/codecoffeecode/readme.md
diff --git a/keyboards/gingham/keymaps/default/keymap.c b/keyboards/yiancardesigns/gingham/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/gingham/keymaps/default/keymap.c
rename to keyboards/yiancardesigns/gingham/keymaps/default/keymap.c
diff --git a/keyboards/gingham/keymaps/default/readme.md b/keyboards/yiancardesigns/gingham/keymaps/default/readme.md
similarity index 100%
rename from keyboards/gingham/keymaps/default/readme.md
rename to keyboards/yiancardesigns/gingham/keymaps/default/readme.md
diff --git a/keyboards/gingham/keymaps/iso/keymap.c b/keyboards/yiancardesigns/gingham/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/gingham/keymaps/iso/keymap.c
rename to keyboards/yiancardesigns/gingham/keymaps/iso/keymap.c
diff --git a/keyboards/gingham/keymaps/iso/readme.md b/keyboards/yiancardesigns/gingham/keymaps/iso/readme.md
similarity index 100%
rename from keyboards/gingham/keymaps/iso/readme.md
rename to keyboards/yiancardesigns/gingham/keymaps/iso/readme.md
diff --git a/keyboards/gingham/keymaps/via/keymap.c b/keyboards/yiancardesigns/gingham/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/gingham/keymaps/via/keymap.c
rename to keyboards/yiancardesigns/gingham/keymaps/via/keymap.c
diff --git a/keyboards/gingham/keymaps/via/readme.md b/keyboards/yiancardesigns/gingham/keymaps/via/readme.md
similarity index 100%
rename from keyboards/gingham/keymaps/via/readme.md
rename to keyboards/yiancardesigns/gingham/keymaps/via/readme.md
diff --git a/keyboards/gingham/keymaps/via/rules.mk b/keyboards/yiancardesigns/gingham/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/gingham/keymaps/via/rules.mk
rename to keyboards/yiancardesigns/gingham/keymaps/via/rules.mk
diff --git a/keyboards/gingham/matrix.c b/keyboards/yiancardesigns/gingham/matrix.c
similarity index 100%
rename from keyboards/gingham/matrix.c
rename to keyboards/yiancardesigns/gingham/matrix.c
diff --git a/keyboards/gingham/readme.md b/keyboards/yiancardesigns/gingham/readme.md
similarity index 91%
rename from keyboards/gingham/readme.md
rename to keyboards/yiancardesigns/gingham/readme.md
index 089af1cf5e..994fcaac55 100644
--- a/keyboards/gingham/readme.md
+++ b/keyboards/yiancardesigns/gingham/readme.md
@@ -10,11 +10,11 @@ Hardware Availability: https://yiancar-designs.com/, https://novelkeys.xyz, http
 
 Make example for this keyboard (after setting up your build environment):
 
-    make gingham:default
+    make yiancardesigns/gingham:default
 
 Flashing example for this keyboard:
 
-    make gingham:default:flash
+    make yiancardesigns/gingham:default:flash
 
 Bootloader:
 use usbasploader HSGW's my repository.
diff --git a/keyboards/gingham/rules.mk b/keyboards/yiancardesigns/gingham/rules.mk
similarity index 100%
rename from keyboards/gingham/rules.mk
rename to keyboards/yiancardesigns/gingham/rules.mk
diff --git a/keyboards/seigaiha/config.h b/keyboards/yiancardesigns/seigaiha/config.h
similarity index 100%
rename from keyboards/seigaiha/config.h
rename to keyboards/yiancardesigns/seigaiha/config.h
diff --git a/keyboards/seigaiha/info.json b/keyboards/yiancardesigns/seigaiha/info.json
similarity index 100%
rename from keyboards/seigaiha/info.json
rename to keyboards/yiancardesigns/seigaiha/info.json
diff --git a/keyboards/seigaiha/keymaps/default/keymap.c b/keyboards/yiancardesigns/seigaiha/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/seigaiha/keymaps/default/keymap.c
rename to keyboards/yiancardesigns/seigaiha/keymaps/default/keymap.c
diff --git a/keyboards/seigaiha/keymaps/default/readme.md b/keyboards/yiancardesigns/seigaiha/keymaps/default/readme.md
similarity index 100%
rename from keyboards/seigaiha/keymaps/default/readme.md
rename to keyboards/yiancardesigns/seigaiha/keymaps/default/readme.md
diff --git a/keyboards/seigaiha/keymaps/via/keymap.c b/keyboards/yiancardesigns/seigaiha/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/seigaiha/keymaps/via/keymap.c
rename to keyboards/yiancardesigns/seigaiha/keymaps/via/keymap.c
diff --git a/keyboards/seigaiha/keymaps/via/readme.md b/keyboards/yiancardesigns/seigaiha/keymaps/via/readme.md
similarity index 100%
rename from keyboards/seigaiha/keymaps/via/readme.md
rename to keyboards/yiancardesigns/seigaiha/keymaps/via/readme.md
diff --git a/keyboards/seigaiha/keymaps/via/rules.mk b/keyboards/yiancardesigns/seigaiha/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/seigaiha/keymaps/via/rules.mk
rename to keyboards/yiancardesigns/seigaiha/keymaps/via/rules.mk
diff --git a/keyboards/seigaiha/matrix.c b/keyboards/yiancardesigns/seigaiha/matrix.c
similarity index 100%
rename from keyboards/seigaiha/matrix.c
rename to keyboards/yiancardesigns/seigaiha/matrix.c
diff --git a/keyboards/seigaiha/readme.md b/keyboards/yiancardesigns/seigaiha/readme.md
similarity index 90%
rename from keyboards/seigaiha/readme.md
rename to keyboards/yiancardesigns/seigaiha/readme.md
index fb0e8571ae..8c81723563 100644
--- a/keyboards/seigaiha/readme.md
+++ b/keyboards/yiancardesigns/seigaiha/readme.md
@@ -10,11 +10,11 @@ An alice layout kit with only through hole components.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make seigaiha:default
+    make yiancardesigns/seigaiha:default
 
 Flashing example for this keyboard:
 
-    make seigaiha:default:flash
+    make yiancardesigns/seigaiha:default:flash
 
 Bootloader:
 use usbasploader from HSGW's repository.
diff --git a/keyboards/seigaiha/rules.mk b/keyboards/yiancardesigns/seigaiha/rules.mk
similarity index 100%
rename from keyboards/seigaiha/rules.mk
rename to keyboards/yiancardesigns/seigaiha/rules.mk
diff --git a/keyboards/seigaiha/seigaiha.c b/keyboards/yiancardesigns/seigaiha/seigaiha.c
similarity index 100%
rename from keyboards/seigaiha/seigaiha.c
rename to keyboards/yiancardesigns/seigaiha/seigaiha.c
diff --git a/keyboards/seigaiha/seigaiha.h b/keyboards/yiancardesigns/seigaiha/seigaiha.h
similarity index 100%
rename from keyboards/seigaiha/seigaiha.h
rename to keyboards/yiancardesigns/seigaiha/seigaiha.h

From 93bacff1a60f2c05ee125d732fea3e677bb62567 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:40:22 +0800
Subject: [PATCH 217/867] [Keyboard] move prototypist boards into vendor folder
 (#15780)

---
 keyboards/{ => prototypist}/allison/allison.c                   | 0
 keyboards/{ => prototypist}/allison/allison.h                   | 0
 keyboards/{ => prototypist}/allison/config.h                    | 0
 keyboards/{ => prototypist}/allison/info.json                   | 0
 keyboards/{ => prototypist}/allison/keymaps/default/keymap.c    | 0
 keyboards/{ => prototypist}/allison/keymaps/default/readme.md   | 0
 keyboards/{ => prototypist}/allison/keymaps/via/keymap.c        | 0
 keyboards/{ => prototypist}/allison/keymaps/via/readme.md       | 0
 keyboards/{ => prototypist}/allison/keymaps/via/rules.mk        | 0
 keyboards/{ => prototypist}/allison/readme.md                   | 2 +-
 keyboards/{ => prototypist}/allison/rules.mk                    | 0
 keyboards/{ => prototypist}/allison_numpad/allison_numpad.c     | 0
 keyboards/{ => prototypist}/allison_numpad/allison_numpad.h     | 0
 keyboards/{ => prototypist}/allison_numpad/config.h             | 0
 keyboards/{ => prototypist}/allison_numpad/info.json            | 0
 .../{ => prototypist}/allison_numpad/keymaps/default/keymap.c   | 0
 .../{ => prototypist}/allison_numpad/keymaps/default/readme.md  | 0
 keyboards/{ => prototypist}/allison_numpad/keymaps/via/keymap.c | 0
 .../{ => prototypist}/allison_numpad/keymaps/via/readme.md      | 0
 keyboards/{ => prototypist}/allison_numpad/keymaps/via/rules.mk | 0
 keyboards/{ => prototypist}/allison_numpad/readme.md            | 2 +-
 keyboards/{ => prototypist}/allison_numpad/rules.mk             | 0
 22 files changed, 2 insertions(+), 2 deletions(-)
 rename keyboards/{ => prototypist}/allison/allison.c (100%)
 rename keyboards/{ => prototypist}/allison/allison.h (100%)
 rename keyboards/{ => prototypist}/allison/config.h (100%)
 rename keyboards/{ => prototypist}/allison/info.json (100%)
 rename keyboards/{ => prototypist}/allison/keymaps/default/keymap.c (100%)
 rename keyboards/{ => prototypist}/allison/keymaps/default/readme.md (100%)
 rename keyboards/{ => prototypist}/allison/keymaps/via/keymap.c (100%)
 rename keyboards/{ => prototypist}/allison/keymaps/via/readme.md (100%)
 rename keyboards/{ => prototypist}/allison/keymaps/via/rules.mk (100%)
 rename keyboards/{ => prototypist}/allison/readme.md (94%)
 rename keyboards/{ => prototypist}/allison/rules.mk (100%)
 rename keyboards/{ => prototypist}/allison_numpad/allison_numpad.c (100%)
 rename keyboards/{ => prototypist}/allison_numpad/allison_numpad.h (100%)
 rename keyboards/{ => prototypist}/allison_numpad/config.h (100%)
 rename keyboards/{ => prototypist}/allison_numpad/info.json (100%)
 rename keyboards/{ => prototypist}/allison_numpad/keymaps/default/keymap.c (100%)
 rename keyboards/{ => prototypist}/allison_numpad/keymaps/default/readme.md (100%)
 rename keyboards/{ => prototypist}/allison_numpad/keymaps/via/keymap.c (100%)
 rename keyboards/{ => prototypist}/allison_numpad/keymaps/via/readme.md (100%)
 rename keyboards/{ => prototypist}/allison_numpad/keymaps/via/rules.mk (100%)
 rename keyboards/{ => prototypist}/allison_numpad/readme.md (94%)
 rename keyboards/{ => prototypist}/allison_numpad/rules.mk (100%)

diff --git a/keyboards/allison/allison.c b/keyboards/prototypist/allison/allison.c
similarity index 100%
rename from keyboards/allison/allison.c
rename to keyboards/prototypist/allison/allison.c
diff --git a/keyboards/allison/allison.h b/keyboards/prototypist/allison/allison.h
similarity index 100%
rename from keyboards/allison/allison.h
rename to keyboards/prototypist/allison/allison.h
diff --git a/keyboards/allison/config.h b/keyboards/prototypist/allison/config.h
similarity index 100%
rename from keyboards/allison/config.h
rename to keyboards/prototypist/allison/config.h
diff --git a/keyboards/allison/info.json b/keyboards/prototypist/allison/info.json
similarity index 100%
rename from keyboards/allison/info.json
rename to keyboards/prototypist/allison/info.json
diff --git a/keyboards/allison/keymaps/default/keymap.c b/keyboards/prototypist/allison/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/allison/keymaps/default/keymap.c
rename to keyboards/prototypist/allison/keymaps/default/keymap.c
diff --git a/keyboards/allison/keymaps/default/readme.md b/keyboards/prototypist/allison/keymaps/default/readme.md
similarity index 100%
rename from keyboards/allison/keymaps/default/readme.md
rename to keyboards/prototypist/allison/keymaps/default/readme.md
diff --git a/keyboards/allison/keymaps/via/keymap.c b/keyboards/prototypist/allison/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/allison/keymaps/via/keymap.c
rename to keyboards/prototypist/allison/keymaps/via/keymap.c
diff --git a/keyboards/allison/keymaps/via/readme.md b/keyboards/prototypist/allison/keymaps/via/readme.md
similarity index 100%
rename from keyboards/allison/keymaps/via/readme.md
rename to keyboards/prototypist/allison/keymaps/via/readme.md
diff --git a/keyboards/allison/keymaps/via/rules.mk b/keyboards/prototypist/allison/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/allison/keymaps/via/rules.mk
rename to keyboards/prototypist/allison/keymaps/via/rules.mk
diff --git a/keyboards/allison/readme.md b/keyboards/prototypist/allison/readme.md
similarity index 94%
rename from keyboards/allison/readme.md
rename to keyboards/prototypist/allison/readme.md
index 60670cbad8..8101c3c715 100644
--- a/keyboards/allison/readme.md
+++ b/keyboards/prototypist/allison/readme.md
@@ -10,6 +10,6 @@ A custom luxurious 60 with F-row and Macro
 
 Make example for this keyboard (after setting up your build environment):
 
-    make allison:default
+    make prototypist/allison: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).
diff --git a/keyboards/allison/rules.mk b/keyboards/prototypist/allison/rules.mk
similarity index 100%
rename from keyboards/allison/rules.mk
rename to keyboards/prototypist/allison/rules.mk
diff --git a/keyboards/allison_numpad/allison_numpad.c b/keyboards/prototypist/allison_numpad/allison_numpad.c
similarity index 100%
rename from keyboards/allison_numpad/allison_numpad.c
rename to keyboards/prototypist/allison_numpad/allison_numpad.c
diff --git a/keyboards/allison_numpad/allison_numpad.h b/keyboards/prototypist/allison_numpad/allison_numpad.h
similarity index 100%
rename from keyboards/allison_numpad/allison_numpad.h
rename to keyboards/prototypist/allison_numpad/allison_numpad.h
diff --git a/keyboards/allison_numpad/config.h b/keyboards/prototypist/allison_numpad/config.h
similarity index 100%
rename from keyboards/allison_numpad/config.h
rename to keyboards/prototypist/allison_numpad/config.h
diff --git a/keyboards/allison_numpad/info.json b/keyboards/prototypist/allison_numpad/info.json
similarity index 100%
rename from keyboards/allison_numpad/info.json
rename to keyboards/prototypist/allison_numpad/info.json
diff --git a/keyboards/allison_numpad/keymaps/default/keymap.c b/keyboards/prototypist/allison_numpad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/allison_numpad/keymaps/default/keymap.c
rename to keyboards/prototypist/allison_numpad/keymaps/default/keymap.c
diff --git a/keyboards/allison_numpad/keymaps/default/readme.md b/keyboards/prototypist/allison_numpad/keymaps/default/readme.md
similarity index 100%
rename from keyboards/allison_numpad/keymaps/default/readme.md
rename to keyboards/prototypist/allison_numpad/keymaps/default/readme.md
diff --git a/keyboards/allison_numpad/keymaps/via/keymap.c b/keyboards/prototypist/allison_numpad/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/allison_numpad/keymaps/via/keymap.c
rename to keyboards/prototypist/allison_numpad/keymaps/via/keymap.c
diff --git a/keyboards/allison_numpad/keymaps/via/readme.md b/keyboards/prototypist/allison_numpad/keymaps/via/readme.md
similarity index 100%
rename from keyboards/allison_numpad/keymaps/via/readme.md
rename to keyboards/prototypist/allison_numpad/keymaps/via/readme.md
diff --git a/keyboards/allison_numpad/keymaps/via/rules.mk b/keyboards/prototypist/allison_numpad/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/allison_numpad/keymaps/via/rules.mk
rename to keyboards/prototypist/allison_numpad/keymaps/via/rules.mk
diff --git a/keyboards/allison_numpad/readme.md b/keyboards/prototypist/allison_numpad/readme.md
similarity index 94%
rename from keyboards/allison_numpad/readme.md
rename to keyboards/prototypist/allison_numpad/readme.md
index 82992339e1..ea5e449b03 100644
--- a/keyboards/allison_numpad/readme.md
+++ b/keyboards/prototypist/allison_numpad/readme.md
@@ -10,6 +10,6 @@ A custom luxurious numpad to match Allison
 
 Make example for this keyboard (after setting up your build environment):
 
-    make allison_numpad:default
+    make prototypist/allison_numpad: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).
diff --git a/keyboards/allison_numpad/rules.mk b/keyboards/prototypist/allison_numpad/rules.mk
similarity index 100%
rename from keyboards/allison_numpad/rules.mk
rename to keyboards/prototypist/allison_numpad/rules.mk

From 372c9102e23b1c669e27262f905d76299f52e628 Mon Sep 17 00:00:00 2001
From: jonavin <71780717+Jonavin@users.noreply.github.com>
Date: Mon, 10 Jan 2022 19:41:54 -0500
Subject: [PATCH 218/867] [Keymap] Jonavin gmmk pro iso keymap (#15775)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=>
---
 .../gmmk/pro/iso/keymaps/jonavin/config.h     |  39 ++++
 .../gmmk/pro/iso/keymaps/jonavin/keymap.c     | 191 ++++++++++++++++++
 .../gmmk/pro/iso/keymaps/jonavin/readme.md    |  53 +++++
 .../pro/iso/keymaps/jonavin/rgb_matrix_map.h  | 146 +++++++++++++
 .../gmmk/pro/iso/keymaps/jonavin/rules.mk     |  12 ++
 5 files changed, 441 insertions(+)
 create mode 100644 keyboards/gmmk/pro/iso/keymaps/jonavin/config.h
 create mode 100644 keyboards/gmmk/pro/iso/keymaps/jonavin/keymap.c
 create mode 100644 keyboards/gmmk/pro/iso/keymaps/jonavin/readme.md
 create mode 100644 keyboards/gmmk/pro/iso/keymaps/jonavin/rgb_matrix_map.h
 create mode 100644 keyboards/gmmk/pro/iso/keymaps/jonavin/rules.mk

diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/config.h b/keyboards/gmmk/pro/iso/keymaps/jonavin/config.h
new file mode 100644
index 0000000000..fa7ebec7e5
--- /dev/null
+++ b/keyboards/gmmk/pro/iso/keymaps/jonavin/config.h
@@ -0,0 +1,39 @@
+/* Copyright 2021 Jonavin Eng
+ *
+ * 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 TAPPING_TOGGLE 2
+// TT set to two taps
+
+/*  Handle GRAVESC combo keys */
+#define GRAVE_ESC_ALT_OVERRIDE
+    //Always send Escape if Alt is pressed
+#define GRAVE_ESC_CTRL_OVERRIDE
+    //Always send Escape if Control is pressed
+
+#define TAPPING_TERM 180
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#endif
+
+// add fifth layer for colemak  -- set "COLEMAK_LAYER_ENABLE = yes" in rules.mk to enable
+#if defined COLEMAK_LAYER_ENABLE
+#    define DYNAMIC_KEYMAP_LAYER_COUNT 5
+#    define _COLEMAK 4
+#endif // COLEMAK_LAYER_ENABLE
diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/iso/keymaps/jonavin/keymap.c
new file mode 100644
index 0000000000..3164ecbf68
--- /dev/null
+++ b/keyboards/gmmk/pro/iso/keymaps/jonavin/keymap.c
@@ -0,0 +1,191 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+   Copyright 2021 Jonavin
+   Copyright 2022 RustyBrakes (ISO conversion)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "rgb_matrix_map.h"
+#include "jonavin.h"
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Ins           Rotary(Mute)
+//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
+//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]                          PgUp
+//      Caps     A        S        D        F        G        H        J        K        L        ;        "        #        Enter             PgDn
+//      Sh_L     \        Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
+//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
+
+
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,           KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        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_PGUP,
+        TT(_LOWER), KC_A, KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGDN,
+        KC_LSFTCAPSWIN, KC_NUBS, KC_Z, KC_X, KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN1),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_FN1] = LAYOUT(
+        _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_CALC,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______,                   KC_HOME,
+        KC_CAPS, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_END,
+        _______, RESET,   RGB_NITE,RGB_HUI, _______, _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, _______,          _______, RGB_MOD, _______,
+        _______, KC_WINLCK, _______,                            _______,                          _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+    ),
+
+    [_LOWER] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_PMNS, KC_PPLS, _______,          _______,
+        _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______, KC_TAB,  KC_P4,   KC_P5,   KC_P6,   KC_PDOT, _______, _______,                   KC_HOME,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_NO,   KC_PAST, _______, KC_PENT,          KC_END,
+        _______, _______, KC_NO,   KC_DEL,  KC_INS,  KC_NO,   KC_NO,   KC_NO,   KC_P0, KC_00, KC_PDOT, KC_PSLS,         _______, RCTL(KC_PGUP), _______,
+        _______, _______, _______,                            KC_BSPC,                            _______, _______, _______, RCTL(KC_LEFT), RCTL(KC_PGDN), RCTL(KC_RIGHT)
+    ),
+
+#ifdef COLEMAK_LAYER_ENABLE
+    [_COLEMAK] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_INS,           KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC,                   KC_PGUP,
+        TT(_LOWER), KC_A, KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_NUHS, KC_ENT,           KC_PGDN,
+        KC_LSFTCAPSWIN, KC_NUBS, KC_Z, KC_X, KC_C,   KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN1),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+#endif // COLEMAK_LAYER_ENABLE
+};
+
+#if defined(ENCODER_ENABLE) && !defined(ENCODER_DEFAULTACTIONS_ENABLE)     // Encoder Functionality when not using userspace defaults
+    void encoder_action_rgbhue(bool clockwise) {
+        if (clockwise)
+            rgblight_increase_hue_noeeprom();
+        else
+            rgblight_decrease_hue_noeeprom();
+    }
+
+    bool encoder_update_user(uint8_t index, bool clockwise) {
+        uint8_t mods_state = get_mods();
+        if (mods_state & MOD_BIT(KC_LSFT) ) { // If you are holding L shift, encoder changes layers
+            encoder_action_layerchange(clockwise);
+        } else if (mods_state & MOD_BIT(KC_RSFT) ) { // If you are holding R shift, Page up/dn
+            unregister_mods(MOD_BIT(KC_RSFT));
+            encoder_action_navpage(clockwise);
+            register_mods(MOD_BIT(KC_RSFT));
+        } else if (mods_state & MOD_BIT(KC_LCTL)) {  // if holding Left Ctrl, navigate next/prev word
+            encoder_action_navword(clockwise);
+        } else if (mods_state & MOD_BIT(KC_RCTL)) {  // if holding Right Ctrl, change rgb hue/colour
+            encoder_action_rgbhue(clockwise);
+        } else if (mods_state & MOD_BIT(KC_LALT)) {  // if holding Left Alt, change media next/prev track
+            encoder_action_mediatrack(clockwise);
+        } else  {
+            switch(get_highest_layer(layer_state)) {
+            case _FN1:
+                #ifdef IDLE_TIMEOUT_ENABLE
+                    timeout_update_threshold(clockwise);
+                #endif
+                break;
+            default:
+                encoder_action_volume(clockwise);       // Otherwise it just changes volume
+                break;
+            }
+        }
+        return true;
+    }
+#endif // ENCODER_ENABLE && !ENCODER_DEFAULTACTIONS_ENABLE
+
+#ifdef RGB_MATRIX_ENABLE
+    // Capslock, Scroll lock and Numlock  indicator on Left side lights.
+    void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+        if (get_rgb_nightmode()) rgb_matrix_set_color_all(RGB_OFF);
+        if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) {
+            rgb_matrix_set_color(LED_L1, RGB_GREEN);
+            rgb_matrix_set_color(LED_L2, RGB_GREEN);
+        }
+
+        #ifdef INVERT_NUMLOCK_INDICATOR
+            if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) {   // on if NUM lock is OFF
+                rgb_matrix_set_color(LED_L3, RGB_MAGENTA);
+                rgb_matrix_set_color(LED_L4, RGB_MAGENTA);
+            }
+        #else
+            if (IS_HOST_LED_ON(USB_LED_NUM_LOCK)) {   // Normal, on if NUM lock is ON
+                rgb_matrix_set_color(LED_L3, RGB_MAGENTA);
+                rgb_matrix_set_color(LED_L4, RGB_MAGENTA);
+            }
+        #endif // INVERT_NUMLOCK_INDICATOR
+
+        if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+            rgb_matrix_set_color(LED_L5, RGB_RED);
+            rgb_matrix_set_color(LED_L6, RGB_RED);
+            rgb_matrix_set_color(LED_L7, RGB_RED);
+        }
+        if (keymap_config.no_gui) {
+            rgb_matrix_set_color(LED_LWIN, RGB_RED);  //light up Win key when disabled
+        }
+        switch(get_highest_layer(layer_state)){  // special handling per layer
+        case _FN1:  // on Fn layer select what the encoder does when pressed
+            rgb_matrix_set_color(LED_R2, RGB_RED);
+            rgb_matrix_set_color(LED_R3, RGB_RED);
+            rgb_matrix_set_color(LED_R4, RGB_RED);
+            rgb_matrix_set_color(LED_FN, RGB_RED); //FN key
+
+            // Add RGB Timeout Indicator -- shows 0 to 139 using F row and num row;  larger numbers using 16bit code
+            uint16_t timeout_threshold = get_timeout_threshold();
+            if (timeout_threshold <= 10) rgb_matrix_set_color(LED_LIST_FUNCROW[timeout_threshold], RGB_RED);
+            else if (timeout_threshold < 140) {
+                rgb_matrix_set_color(LED_LIST_FUNCROW[(timeout_threshold / 10)], RGB_RED);
+                rgb_matrix_set_color(LED_LIST_NUMROW[(timeout_threshold % 10)], RGB_RED);
+            } else { // >= 140 minutes, just show these 3 lights
+                rgb_matrix_set_color(LED_LIST_NUMROW[10], RGB_RED);
+                rgb_matrix_set_color(LED_LIST_NUMROW[11], RGB_RED);
+                rgb_matrix_set_color(LED_LIST_NUMROW[12], RGB_RED);
+            }
+            break;
+        case _LOWER:
+            for (uint8_t i=0; i<ARRAYSIZE(LED_LIST_NUMPAD); i++) {
+                rgb_matrix_set_color(LED_LIST_NUMPAD[i], RGB_MAGENTA);
+            }
+            rgb_matrix_set_color(LED_R4, RGB_MAGENTA);
+            rgb_matrix_set_color(LED_R5, RGB_MAGENTA);
+            rgb_matrix_set_color(LED_R6, RGB_MAGENTA);
+            break;
+        case _RAISE:
+            rgb_matrix_set_color(LED_R6, RGB_GREEN);
+            rgb_matrix_set_color(LED_R7, RGB_GREEN);
+            rgb_matrix_set_color(LED_R8, RGB_GREEN);
+            break;
+#ifdef COLEMAK_LAYER_ENABLE
+       case _COLEMAK:
+            for (uint8_t i=0; i<ARRAYSIZE(LED_SIDE_RIGHT); i++) {
+                rgb_matrix_set_color(LED_SIDE_RIGHT[i], RGB_BLUE);
+            }
+            break;
+#endif
+        default:
+            break;
+        }
+    }
+#endif
+
+
+void keyboard_post_init_keymap(void) {
+    // keyboard_post_init_user() moved to userspace
+    #ifdef RGB_MATRIX_ENABLE
+        rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);
+        rgb_matrix_set_color_all(RGB_NAUTILUS); // Default startup colour
+        activate_rgb_nightmode(false);  // Set to true if you want to startup in nightmode, otherwise use Fn + Z to toggle
+    #endif
+}
diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/readme.md b/keyboards/gmmk/pro/iso/keymaps/jonavin/readme.md
new file mode 100644
index 0000000000..f94a5eabbd
--- /dev/null
+++ b/keyboards/gmmk/pro/iso/keymaps/jonavin/readme.md
@@ -0,0 +1,53 @@
+# jonavin's GMMK Pro ISO layout
+# Thanks to RustyBrakes for the keymap adjustments and ISO Layout testing
+
+- Add Fn layer keys from Glorious Core mapping that's missing in the default qmk mapping
+- Add PrtScr, Scroll Lock, Break, NumLock to Fn layer
+- Implement Win key lock using Fn+Win like in Glorious Core firmware
+- Layer 2 mod on Caps Lock with double-tap to switch to this layer, double tap to switch back
+- Layer 2 provides arrows on WASD and additional nav keys + right hand numpad with 00; an be used for Alt Code entry
+- Layer 2 left spacebar Backspace
+- add double tap of Left Shift to toggle Caps Lock
+- additional encoder functionality
+    - FN Layer - change rgb idle timeout
+    - holding Left shift, change layers
+    - holding right shift, Navigate page up/down
+    - holding Left Ctrl, navigate prev/next word
+    - holding Right Ctrl, changes RGB hue/colour
+    - holding Left Alt, change media prev/next track
+    - default is change volume
+    
+- LED/RGB Functionality
+    - RGB idle timeout (default 5 minutes)
+        - Can be changed in FN layer with < and > or encoder
+        - setting to zero disables timeout
+        - indicators in FN layer using RGB in FN and number rows to show the timeout in minutes
+    - LED address location map as enum definition in rgb_matrix_map.h
+    - LED group lists for arrows, numpad, F row, num row, left and right side LEDs
+    - default startup in single mode with default colour 
+    - Capslock, Scroll Lock, and Num Lock (not set) indicator on left side LED
+    - Layer indicator on right side LED
+    - Fn key light up red when Fn layer activate
+    - Win Key light up red when Win Lock mode enabled
+    - Layer 2 activation lights up Numpad area
+    - Fn + Z to turn off all RGB lights except rgb indicators; press again to toggle
+
+rules.mk OPTIONS - Active features from userspace
+STARTUP_NUMLOCK_ON = yes
+    - turns on NUMLOCK by default
+
+ENCODER_DEFAULTACTIONS_ENABLE = yes
+    - Enabled default encoder funtions
+  
+TD_LSFT_CAPSLOCK_ENABLE = yes
+    - This will enable double tap on Left Shift to toggle CAPSLOCK when using KC_LSFTCAPS
+
+IDLE_TIMEOUT_ENABLE = yes
+    - Enables Timer functionality; for RGB idle timeouts that can be changed dynamically
+
+INVERT_NUMLOCK_INDICATOR
+    - inverts the Num lock indicator, LED is on when num lokc is off
+
+COLEMAK_LAYER_ENABLE = yes
+    - Enabled optional 5th layer for COLEMAK layout
+    - Use Shift and encoder to enter 5th layer, right led indicator lights up BLUE
diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/rgb_matrix_map.h b/keyboards/gmmk/pro/iso/keymaps/jonavin/rgb_matrix_map.h
new file mode 100644
index 0000000000..1aa31f2a0f
--- /dev/null
+++ b/keyboards/gmmk/pro/iso/keymaps/jonavin/rgb_matrix_map.h
@@ -0,0 +1,146 @@
+/* Copyright 2021 Jonavin Eng
+ * Copyright 2022 RustyBrakes (ISO conversion)
+ *
+ * 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/>.
+ */
+
+#ifdef RGB_MATRIX_ENABLE
+
+    // Custom RGB Colours
+    #define RGB_GODSPEED 0x00, 0xE4, 0xFF // colour for matching keycaps
+    #define RGB_NAUTILUS 0x00, 0xA4, 0xA9 // Naurilus Font colours
+
+    // RGB LED locations
+    enum led_location_map {
+        LED_ESC, // 0, ESC, k13
+        LED_GRV, // 1, `, k16
+        LEB_TAB, // 2, Tab, k11
+        LED_CAPS, // 3, Caps, k21
+        LED_LSFT, // 4, Sh_L, k00
+        LED_LCTL, // 5, Ct_L, k06
+        LED_F1, // 6, F1, k26
+        LED_1, // 7, 1, k17
+        LED_Q, // 8, Q, k10
+        LED_A, // 9, A, k12
+        LED_Z, // 10, Z, k14
+        LED_LWIN, // 11, Win_L, k90
+        LED_F2, // 12, F2, k36
+        LED_2, // 13, 2, k27
+        LED_W, // 14, W, k20
+        LED_S, // 15, S, k22
+        LED_X, // 16, X, k24
+        LED_LALT, // 17, Alt_L, k93
+        LED_F3, // 18, F3, k31
+        LED_3, // 19, 3, k37
+        LED_E, // 20, E, k30
+        LED_D, // 21, D, k32
+        LED_C, // 22, C, k34
+        LED_F4, // 23, F4, k33
+        LED_4, // 24, 4, k47
+        LED_R, // 25, R, k40
+        LED_F, // 26, F, k42
+        LED_V, // 27, V, k44
+        LED_F5, // 28, F5, k07
+        LED_5, // 29, 5, k46
+        LED_T, // 30, T, k41
+        LED_G, // 31, G, k43
+        LED_B, // 32, B, k45
+        LED_SPC, // 33, SPACE, k94
+        LED_F6, // 34, F6, k63
+        LED_6, // 35, 6, k56
+        LED_Y, // 36, Y, k51
+        LED_H, // 37, H, k53
+        LED_N, // 38, N, k55
+        LED_F7, // 39, F7, k71
+        LED_7, // 40, 7, k57
+        LED_U, // 41, U, k50
+        LED_J, // 42, J, k52
+        LED_M, // 43, M, k54
+        LED_F8, // 44, F8, k76
+        LED_8, // 45, 8, k67
+        LED_I, // 46, I, k60
+        LED_K, // 47, K, k62
+        LED_COMM, // 48, ,, k64
+        LED_RALT, // 49, Alt_R, k95
+        LED_F9, // 50, F9, ka6
+        LED_9, // 51, 9, k77
+        LED_O, // 52, O, k70
+        LED_L, // 53, L, k72
+        LED_DOT, // 54, ., k74
+        LED_FN, // 55, FN, k92
+        LED_F10, // 56, F10, ka7
+        LED_0, // 57, 0, k87
+        LED_P, // 58, P, k80
+        LED_SCLN, // 59, ;, k82
+        LED_SLSH, // 60, /, k85
+        LED_F11, // 61, F11, ka3
+        LED_MINS, // 62, -, k86
+        LED_LBRC, // 63, [, k81
+        LED_QUOT, // 64, ", k83
+        LED_RCTL, // 65, Ct_R, k04
+        LED_F12, // 66, F12, ka5
+        LED_BSLS, // 67, \, k23
+        LED_L1, // 68, LED, l01
+        LED_R1, // 69, LED, l11
+        LED_PRT, // 70, Prt, k97
+        LED_L2, // 71, LED, l02
+        LED_R2, // 72, LED, l12
+        LED_DEL, // 73, Del, k65
+        LED_L3, // 74, LED, l03
+        LED_R3, // 75, LED, l13
+        LED_PGUP, // 76, PgUp, k15
+        LED_L4, // 77, LED, l04
+        LED_R4, // 78, LED, l14
+        LED_EQL, // 79, =, k66
+        LED_RIGHT, // 80, Right, k05
+        LED_L5, // 81, LED, l05
+        LED_R5, // 82, LED, l15
+        LED_END, // 83, End, k75
+        LED_L6, // 84, LED, l06
+        LED_R6, // 85, LED, l16
+        LED_BSPC, // 86, BSpc, ka1
+        LED_PGDN, // 87, PgDn, k25
+        LED_L7, // 88, LED, l07
+        LED_R7, // 89, LED, l17
+        LED_RBRC, // 90, ], k61
+        LED_RSFT, // 91, Sh_R, k91
+        LED_L8, // 92, LED, l08
+        LED_R8, // 93, LED, l18
+        LED_UP, // 94, Up, k35
+        LED_HASH, // 95, #, k84
+        LED_LEFT, // 96, Left, k03
+        LED_ENT, // 97, Enter, ka4
+        LED_DOWN // 98, Down, k73
+    };
+
+    const uint8_t LED_LIST_WASD[] = { LED_W, LED_A, LED_S, LED_D };
+
+    const uint8_t LED_LIST_ARROWS[] = { LED_LEFT, LED_RIGHT, LED_UP, LED_DOWN };
+
+    const uint8_t LED_LIST_FUNCROW[] = { LED_ESC, LED_F1, LED_F2, LED_F3, LED_F4, LED_F5, LED_F6, LED_F7, LED_F8, LED_F9, LED_F10, LED_F11, LED_F12, LED_PRT};
+
+    const uint8_t LED_LIST_NUMROW[] = { LED_GRV, LED_1, LED_2, LED_3, LED_4, LED_5, LED_6, LED_7, LED_8, LED_9, LED_0, LED_MINS, LED_EQL, LED_BSPC, LED_DEL};
+
+    const uint8_t LED_LIST_NUMPAD[] = {
+        LED_7, LED_8, LED_9,
+        LED_U, LED_I, LED_O,
+        LED_J, LED_K, LED_L,
+        LED_M, LED_COMM, LED_DOT
+        };
+
+    const uint8_t LED_SIDE_LEFT[] = { LED_L1, LED_L2, LED_L3, LED_L4, LED_L5, LED_L6, LED_L7, LED_L8};
+
+    const uint8_t LED_SIDE_RIGHT[] = { LED_R1, LED_R2, LED_R3, LED_R4, LED_R5, LED_R6, LED_R7, LED_R8};
+
+#endif
diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/rules.mk b/keyboards/gmmk/pro/iso/keymaps/jonavin/rules.mk
new file mode 100644
index 0000000000..1ffc2058a2
--- /dev/null
+++ b/keyboards/gmmk/pro/iso/keymaps/jonavin/rules.mk
@@ -0,0 +1,12 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
+TAP_DANCE_ENABLE = yes
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+
+TD_LSFT_CAPSLOCK_ENABLE = yes
+IDLE_TIMEOUT_ENABLE = yes
+STARTUP_NUMLOCK_ON = yes
+ENCODER_DEFAULTACTIONS_ENABLE = no
+
+COLEMAK_LAYER_ENABLE = yes  #Enable Colemak layer / set to no to disable
+INVERT_NUMLOCK_INDICATOR = yes

From b1942d1d0c8fff71aa495f06768f570907af7ce8 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:42:13 +0800
Subject: [PATCH 219/867] [Keyboard] move cu24, cu75, cu80/v1 into capsunlocked
 folder (#15758)

---
 keyboards/{ => capsunlocked}/cu24/config.h     |  0
 keyboards/{ => capsunlocked}/cu24/cu24.c       |  0
 keyboards/{ => capsunlocked}/cu24/cu24.h       |  0
 keyboards/{ => capsunlocked}/cu24/info.json    |  0
 .../cu24/keymaps/default/keymap.c              |  0
 .../cu24/keymaps/default/readme.md             |  0
 keyboards/{ => capsunlocked}/cu24/readme.md    |  4 ++--
 keyboards/{ => capsunlocked}/cu24/rules.mk     |  0
 keyboards/{ => capsunlocked}/cu75/config.h     |  0
 keyboards/{ => capsunlocked}/cu75/cu75.c       |  0
 keyboards/{ => capsunlocked}/cu75/cu75.h       |  0
 keyboards/{ => capsunlocked/cu75}/cu75/.noci   |  0
 keyboards/{ => capsunlocked}/cu75/info.json    |  0
 .../cu75/keymaps/default/keymap.c              |  0
 .../cu75/keymaps/default/rules.mk              |  0
 .../cu75/keymaps/iso/keymap.c                  |  0
 .../cu75/keymaps/iso/rules.mk                  |  0
 keyboards/{ => capsunlocked}/cu75/readme.md    |  4 ++--
 keyboards/{ => capsunlocked}/cu75/rules.mk     |  0
 .../{cu80 => capsunlocked/cu80/v1}/config.h    |  0
 .../{cu80 => capsunlocked/cu80/v1}/info.json   |  0
 .../cu80/v1}/keymaps/default/keymap.c          |  0
 .../cu80/v1}/keymaps/default/readme.md         |  0
 .../{cu80 => capsunlocked/cu80/v1}/readme.md   |  4 ++--
 .../{cu80 => capsunlocked/cu80/v1}/rules.mk    |  0
 keyboards/capsunlocked/cu80/v1/v1.c            | 18 ++++++++++++++++++
 .../{cu80/cu80.h => capsunlocked/cu80/v1/v1.h} |  0
 keyboards/cu80/cu80.c                          |  1 -
 28 files changed, 24 insertions(+), 7 deletions(-)
 rename keyboards/{ => capsunlocked}/cu24/config.h (100%)
 rename keyboards/{ => capsunlocked}/cu24/cu24.c (100%)
 rename keyboards/{ => capsunlocked}/cu24/cu24.h (100%)
 rename keyboards/{ => capsunlocked}/cu24/info.json (100%)
 rename keyboards/{ => capsunlocked}/cu24/keymaps/default/keymap.c (100%)
 rename keyboards/{ => capsunlocked}/cu24/keymaps/default/readme.md (100%)
 rename keyboards/{ => capsunlocked}/cu24/readme.md (83%)
 rename keyboards/{ => capsunlocked}/cu24/rules.mk (100%)
 rename keyboards/{ => capsunlocked}/cu75/config.h (100%)
 rename keyboards/{ => capsunlocked}/cu75/cu75.c (100%)
 rename keyboards/{ => capsunlocked}/cu75/cu75.h (100%)
 rename keyboards/{ => capsunlocked/cu75}/cu75/.noci (100%)
 rename keyboards/{ => capsunlocked}/cu75/info.json (100%)
 rename keyboards/{ => capsunlocked}/cu75/keymaps/default/keymap.c (100%)
 rename keyboards/{ => capsunlocked}/cu75/keymaps/default/rules.mk (100%)
 rename keyboards/{ => capsunlocked}/cu75/keymaps/iso/keymap.c (100%)
 rename keyboards/{ => capsunlocked}/cu75/keymaps/iso/rules.mk (100%)
 rename keyboards/{ => capsunlocked}/cu75/readme.md (85%)
 rename keyboards/{ => capsunlocked}/cu75/rules.mk (100%)
 rename keyboards/{cu80 => capsunlocked/cu80/v1}/config.h (100%)
 rename keyboards/{cu80 => capsunlocked/cu80/v1}/info.json (100%)
 rename keyboards/{cu80 => capsunlocked/cu80/v1}/keymaps/default/keymap.c (100%)
 rename keyboards/{cu80 => capsunlocked/cu80/v1}/keymaps/default/readme.md (100%)
 rename keyboards/{cu80 => capsunlocked/cu80/v1}/readme.md (79%)
 rename keyboards/{cu80 => capsunlocked/cu80/v1}/rules.mk (100%)
 create mode 100644 keyboards/capsunlocked/cu80/v1/v1.c
 rename keyboards/{cu80/cu80.h => capsunlocked/cu80/v1/v1.h} (100%)
 delete mode 100644 keyboards/cu80/cu80.c

diff --git a/keyboards/cu24/config.h b/keyboards/capsunlocked/cu24/config.h
similarity index 100%
rename from keyboards/cu24/config.h
rename to keyboards/capsunlocked/cu24/config.h
diff --git a/keyboards/cu24/cu24.c b/keyboards/capsunlocked/cu24/cu24.c
similarity index 100%
rename from keyboards/cu24/cu24.c
rename to keyboards/capsunlocked/cu24/cu24.c
diff --git a/keyboards/cu24/cu24.h b/keyboards/capsunlocked/cu24/cu24.h
similarity index 100%
rename from keyboards/cu24/cu24.h
rename to keyboards/capsunlocked/cu24/cu24.h
diff --git a/keyboards/cu24/info.json b/keyboards/capsunlocked/cu24/info.json
similarity index 100%
rename from keyboards/cu24/info.json
rename to keyboards/capsunlocked/cu24/info.json
diff --git a/keyboards/cu24/keymaps/default/keymap.c b/keyboards/capsunlocked/cu24/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/cu24/keymaps/default/keymap.c
rename to keyboards/capsunlocked/cu24/keymaps/default/keymap.c
diff --git a/keyboards/cu24/keymaps/default/readme.md b/keyboards/capsunlocked/cu24/keymaps/default/readme.md
similarity index 100%
rename from keyboards/cu24/keymaps/default/readme.md
rename to keyboards/capsunlocked/cu24/keymaps/default/readme.md
diff --git a/keyboards/cu24/readme.md b/keyboards/capsunlocked/cu24/readme.md
similarity index 83%
rename from keyboards/cu24/readme.md
rename to keyboards/capsunlocked/cu24/readme.md
index ca3f3f5a04..250ff8847f 100644
--- a/keyboards/cu24/readme.md
+++ b/keyboards/capsunlocked/cu24/readme.md
@@ -1,6 +1,6 @@
 # CU24
 
-![CU24](https://geekhack.org/index.php?action=dlattach;topic=93289.0;attach=185492;image)
+![CU24](https://i.imgur.com/AU1QisF.jpg)
 
 A luxurious 24 key keypad with various layouts. Includes RGB underglow, backlight and an aluminium, brass and nylon case.
 
@@ -10,6 +10,6 @@ Hardware Availability: [caps-unlocked.com](http://caps-unlocked.com/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make CU24:default
+    make capsunlocked/cu24:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/cu24/rules.mk b/keyboards/capsunlocked/cu24/rules.mk
similarity index 100%
rename from keyboards/cu24/rules.mk
rename to keyboards/capsunlocked/cu24/rules.mk
diff --git a/keyboards/cu75/config.h b/keyboards/capsunlocked/cu75/config.h
similarity index 100%
rename from keyboards/cu75/config.h
rename to keyboards/capsunlocked/cu75/config.h
diff --git a/keyboards/cu75/cu75.c b/keyboards/capsunlocked/cu75/cu75.c
similarity index 100%
rename from keyboards/cu75/cu75.c
rename to keyboards/capsunlocked/cu75/cu75.c
diff --git a/keyboards/cu75/cu75.h b/keyboards/capsunlocked/cu75/cu75.h
similarity index 100%
rename from keyboards/cu75/cu75.h
rename to keyboards/capsunlocked/cu75/cu75.h
diff --git a/keyboards/cu75/.noci b/keyboards/capsunlocked/cu75/cu75/.noci
similarity index 100%
rename from keyboards/cu75/.noci
rename to keyboards/capsunlocked/cu75/cu75/.noci
diff --git a/keyboards/cu75/info.json b/keyboards/capsunlocked/cu75/info.json
similarity index 100%
rename from keyboards/cu75/info.json
rename to keyboards/capsunlocked/cu75/info.json
diff --git a/keyboards/cu75/keymaps/default/keymap.c b/keyboards/capsunlocked/cu75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/cu75/keymaps/default/keymap.c
rename to keyboards/capsunlocked/cu75/keymaps/default/keymap.c
diff --git a/keyboards/cu75/keymaps/default/rules.mk b/keyboards/capsunlocked/cu75/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/cu75/keymaps/default/rules.mk
rename to keyboards/capsunlocked/cu75/keymaps/default/rules.mk
diff --git a/keyboards/cu75/keymaps/iso/keymap.c b/keyboards/capsunlocked/cu75/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/cu75/keymaps/iso/keymap.c
rename to keyboards/capsunlocked/cu75/keymaps/iso/keymap.c
diff --git a/keyboards/cu75/keymaps/iso/rules.mk b/keyboards/capsunlocked/cu75/keymaps/iso/rules.mk
similarity index 100%
rename from keyboards/cu75/keymaps/iso/rules.mk
rename to keyboards/capsunlocked/cu75/keymaps/iso/rules.mk
diff --git a/keyboards/cu75/readme.md b/keyboards/capsunlocked/cu75/readme.md
similarity index 85%
rename from keyboards/cu75/readme.md
rename to keyboards/capsunlocked/cu75/readme.md
index 43603440fd..78882b2573 100644
--- a/keyboards/cu75/readme.md
+++ b/keyboards/capsunlocked/cu75/readme.md
@@ -1,6 +1,6 @@
 # CU75
 
-![CU75](https://geekhack.org/index.php?action=dlattach;topic=91767.0;attach=179167;image)
+![CU75](https://i.imgur.com/42ltqi6.jpg)
 
 A luxurious 75% keyboard with various layouts. Includes RGB underglow, backlight and an aluminium, brass and nylon case.
 
@@ -12,6 +12,6 @@ This PCB uses lighting libraries from LFKeyboards
 
 Make example for this keyboard (after setting up your build environment):
 
-    make CU75:default
+    make capsunlocked/cu75:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/cu75/rules.mk b/keyboards/capsunlocked/cu75/rules.mk
similarity index 100%
rename from keyboards/cu75/rules.mk
rename to keyboards/capsunlocked/cu75/rules.mk
diff --git a/keyboards/cu80/config.h b/keyboards/capsunlocked/cu80/v1/config.h
similarity index 100%
rename from keyboards/cu80/config.h
rename to keyboards/capsunlocked/cu80/v1/config.h
diff --git a/keyboards/cu80/info.json b/keyboards/capsunlocked/cu80/v1/info.json
similarity index 100%
rename from keyboards/cu80/info.json
rename to keyboards/capsunlocked/cu80/v1/info.json
diff --git a/keyboards/cu80/keymaps/default/keymap.c b/keyboards/capsunlocked/cu80/v1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/cu80/keymaps/default/keymap.c
rename to keyboards/capsunlocked/cu80/v1/keymaps/default/keymap.c
diff --git a/keyboards/cu80/keymaps/default/readme.md b/keyboards/capsunlocked/cu80/v1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/cu80/keymaps/default/readme.md
rename to keyboards/capsunlocked/cu80/v1/keymaps/default/readme.md
diff --git a/keyboards/cu80/readme.md b/keyboards/capsunlocked/cu80/v1/readme.md
similarity index 79%
rename from keyboards/cu80/readme.md
rename to keyboards/capsunlocked/cu80/v1/readme.md
index cb48c875b9..9d6141a4a0 100644
--- a/keyboards/cu80/readme.md
+++ b/keyboards/capsunlocked/cu80/v1/readme.md
@@ -1,6 +1,6 @@
 # CU80
 
-![cu80](https://cdn11.bigcommerce.com/s-vdedjo0w46/images/stencil/900x900/products/287/2336/DSCF3583__16019.1567722956.png?c=2)
+![cu80](https://i.imgur.com/p8D4POn.png)
 
 A customizable 80% keyboard.
 
@@ -10,6 +10,6 @@ A customizable 80% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make cu80:default
+    make capsunlocked/cu80/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).
diff --git a/keyboards/cu80/rules.mk b/keyboards/capsunlocked/cu80/v1/rules.mk
similarity index 100%
rename from keyboards/cu80/rules.mk
rename to keyboards/capsunlocked/cu80/v1/rules.mk
diff --git a/keyboards/capsunlocked/cu80/v1/v1.c b/keyboards/capsunlocked/cu80/v1/v1.c
new file mode 100644
index 0000000000..96161175b2
--- /dev/null
+++ b/keyboards/capsunlocked/cu80/v1/v1.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 Andy Holland
+
+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 "v1.h"
diff --git a/keyboards/cu80/cu80.h b/keyboards/capsunlocked/cu80/v1/v1.h
similarity index 100%
rename from keyboards/cu80/cu80.h
rename to keyboards/capsunlocked/cu80/v1/v1.h
diff --git a/keyboards/cu80/cu80.c b/keyboards/cu80/cu80.c
deleted file mode 100644
index f794161717..0000000000
--- a/keyboards/cu80/cu80.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "cu80.h"
\ No newline at end of file

From cd12b54650b4ac9023e697f036911c81b2eed693 Mon Sep 17 00:00:00 2001
From: Jordan Blackbourn <blackbournj@gmail.com>
Date: Tue, 11 Jan 2022 13:44:18 +1300
Subject: [PATCH 220/867] [Keyboard] Added via support for orthocode (#15777)

---
 keyboards/orthocode/config.h                 |  4 +-
 keyboards/orthocode/keymaps/default/keymap.c |  4 -
 keyboards/orthocode/keymaps/via/keymap.c     | 92 ++++++++++++++++++++
 keyboards/orthocode/keymaps/via/rules.mk     |  1 +
 keyboards/orthocode/orthocode.c              | 30 +++++++
 keyboards/orthocode/orthocode.h              | 14 +++
 keyboards/orthocode/rules.mk                 |  1 +
 7 files changed, 140 insertions(+), 6 deletions(-)
 create mode 100644 keyboards/orthocode/keymaps/via/keymap.c
 create mode 100644 keyboards/orthocode/keymaps/via/rules.mk

diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h
index 823a48e368..e548fe1d4e 100644
--- a/keyboards/orthocode/config.h
+++ b/keyboards/orthocode/config.h
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
+#define VENDOR_ID       0x3415 // orthocodekb.com
+#define PRODUCT_ID      0x0001 // orthocode
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Jrodna
 #define PRODUCT         OrthoCode
diff --git a/keyboards/orthocode/keymaps/default/keymap.c b/keyboards/orthocode/keymaps/default/keymap.c
index 800886a63d..75bac5ff3f 100644
--- a/keyboards/orthocode/keymaps/default/keymap.c
+++ b/keyboards/orthocode/keymaps/default/keymap.c
@@ -15,10 +15,6 @@
  */
 #include QMK_KEYBOARD_H
 
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
      /* Rotary                                                                                                                                  */
diff --git a/keyboards/orthocode/keymaps/via/keymap.c b/keyboards/orthocode/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0030bbb00d
--- /dev/null
+++ b/keyboards/orthocode/keymaps/via/keymap.c
@@ -0,0 +1,92 @@
+/* Copyright 2020 Jrodna
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+     /* Rotary                                                                                                                                  */
+        KC__MUTE,
+     /*           esc      1        2        3        4        5        6        7        8        9        0        -        =        home     */
+        RGB_TOG,    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_HOME,
+     /*           tab      Q        W        E        R        T        Y        U        I        O        P        \        delete   end      */
+        RGB_MOD,    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_DEL,  KC_END,
+     /*           caps     A        S        D        F        G        H        J        K        L        ;        '        enter             */
+        RGB_RMOD,   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,
+     /*           shift    Z        X        C        V        B        N        M        ,        .        /                 up                */
+                  KC_LSFT,   KC_Z,    KC_X,    KC_C,  KC_V,    KC_B,    KC_N,    KC_M,   KC_COMM, KC_DOT,  KC_SLSH,          KC_UP,
+     /*           ctrl     win      alt      fn       th1      th2      th3      th4      fn       alt      ctrl     left     down     right    */
+                  KC_LCTL, KC_LGUI, KC_LALT, MO(1),  KC_RSFT, KC_ENT,  KC_BSPC, KC_SPC, MO(1),   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT(
+     /* Rotary                                                                                                                                                  */
+        TG(2),
+     /*          esc      1        2        3        4       5       6        7            8          9           0        -         =     home  */
+      KC_TRNS, 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_TRNS,
+     /*          tab      Q       W        E        R        T       Y        U             I           O          P         \      delete     end */
+      RGB_HUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,  KC_TRNS,KC_TRNS, KC_TRNS, LSFT(KC_LBRC), LSFT(KC_RBRC), KC_TRNS, KC_TRNS,  KC_PAUS, KC_TRNS,
+     /*          caps      A       S        D        F        G      H         J            K          L         ;        '        enter    */
+      RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,     KC_LBRC,    KC_RBRC, KC_TRNS, KC_TRNS,  KC_TRNS,
+     /*         shift      Z         X        C       V       B       N       M             ,           .          /                       up      */
+              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, LSFT(KC_EQL), LSFT(KC_9), LSFT(KC_0), KC_TRNS,             KC_VOLU,
+     /*         ctrl     win      alt        fn     th1      th2     th3      th4          fn         alt       ctrl      left     down     right*/
+              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_VOLD,  KC_TRNS
+    ),
+    [2] = LAYOUT(
+     /* Rotary                                                                                                                                 */
+        KC_TRNS,
+     /*          esc      1        2        3        4        5        6        7        8        9        0        -        =        home     */
+        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,
+     /*          tab      Q        W        E        R        T        Y        U        I        O        P        \        delete   end      */
+        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,
+     /*          caps     A        S        D        F        G        H        J        K        L        ;        '        enter             */
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS,
+     /*          shift    Z        X        C        V        B        N        M        ,        .        /                 up                */
+                 KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+     /*          ctrl     win      alt      fn       th1      th2      th3      th4      fn       alt      ctrl     left     down     right    */
+                 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
+
+    ),
+    [3] = LAYOUT(
+     /* Rotary                                                                                                                                 */
+        KC_TRNS,
+     /*          esc      1        2        3        4        5        6        7        8        9        0        -        =        home     */
+        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,
+     /*          tab      Q        W        E        R        T        Y        U        I        O        P        \        delete   end      */
+        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,
+     /*          caps     A        S        D        F        G        H        J        K        L        ;        '        enter             */
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS,
+     /*          shift    Z        X        C        V        B        N        M        ,        .        /                 up                */
+                 KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+     /*          ctrl     win      alt      fn       th1      th2      th3      th4      fn       alt      ctrl     left     down     right    */
+                 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
+
+    ),
+    [4] = LAYOUT(
+     /* Rotary                                                                                                                                 */
+        KC_TRNS,
+     /*          esc      1        2        3        4        5        6        7        8        9        0        -        =        home     */
+        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,
+     /*          tab      Q        W        E        R        T        Y        U        I        O        P        \        delete   end      */
+        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,
+     /*          caps     A        S        D        F        G        H        J        K        L        ;        '        enter             */
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS,
+     /*          shift    Z        X        C        V        B        N        M        ,        .        /                 up                */
+                 KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+     /*          ctrl     win      alt      fn       th1      th2      th3      th4      fn       alt      ctrl     left     down     right    */
+                 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
+
+    )
+};
diff --git a/keyboards/orthocode/keymaps/via/rules.mk b/keyboards/orthocode/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/orthocode/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/orthocode/orthocode.c b/keyboards/orthocode/orthocode.c
index 23596d3e5b..8ddd32c396 100644
--- a/keyboards/orthocode/orthocode.c
+++ b/keyboards/orthocode/orthocode.c
@@ -15,6 +15,36 @@
  */
 #include "orthocode.h"
 
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+
+    static bool shiftspace_mods = false;
+    switch (keycode) {
+    case SHIFTSPACE:
+        if (record->event.pressed) {
+            if(get_mods() & MOD_BIT(KC_RSFT)) {
+                register_code(KC_MINS);
+                shiftspace_mods = true;
+            }
+            else {
+                register_code(KC_SPC);
+            }
+        } else {
+            if (shiftspace_mods) {
+                unregister_code(KC_MINS);
+                shiftspace_mods = false;
+            } else {
+                unregister_code(KC_SPC);
+            }
+        }
+        return false;
+        break;
+    }
+    return true;
+}
+
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/orthocode/orthocode.h b/keyboards/orthocode/orthocode.h
index 3abcd48c06..57f122a471 100644
--- a/keyboards/orthocode/orthocode.h
+++ b/keyboards/orthocode/orthocode.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #define _x_ KC_NO
+#define KC_SHSP SHIFTSPACE
 
 #include "quantum.h"
 
@@ -34,3 +35,16 @@
 {   K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_ }, \
 {   _x_, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E}   \
 }
+
+enum custom_keycodes {
+#ifdef VIA_ENABLE
+    SHIFTSPACE = USER00,
+#else
+    SHIFTSPACE = SAFE_RANGE,
+#endif
+#ifdef VIA_ENABLE
+    QWERTY = SAFE_RANGE
+#else
+    QWERTY
+#endif
+};
diff --git a/keyboards/orthocode/rules.mk b/keyboards/orthocode/rules.mk
index 3d44d1f85b..66c72d6022 100644
--- a/keyboards/orthocode/rules.mk
+++ b/keyboards/orthocode/rules.mk
@@ -20,3 +20,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enables the use of one or more encoders
+LTO_ENABLE = yes

From ecc06a97001163232e2dd58b3add603636587413 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:45:02 +0800
Subject: [PATCH 221/867] [Keyboard] Simplify default keymap to Seniply
 (#15731)

---
 keyboards/a_dux/keymaps/default/config.h    |  39 -------
 keyboards/a_dux/keymaps/default/keymap.c    |  40 +++++++
 keyboards/a_dux/keymaps/default/keymap.json | 106 -----------------
 keyboards/a_dux/keymaps/default/readme.md   | 122 --------------------
 4 files changed, 40 insertions(+), 267 deletions(-)
 delete mode 100644 keyboards/a_dux/keymaps/default/config.h
 create mode 100644 keyboards/a_dux/keymaps/default/keymap.c
 delete mode 100644 keyboards/a_dux/keymaps/default/keymap.json
 delete mode 100644 keyboards/a_dux/keymaps/default/readme.md

diff --git a/keyboards/a_dux/keymaps/default/config.h b/keyboards/a_dux/keymaps/default/config.h
deleted file mode 100644
index cf0fb7478e..0000000000
--- a/keyboards/a_dux/keymaps/default/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Pierre Chevalier <pierrechevalier83@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-// Set the mouse settings to a comfortable speed/accuracy trade-off,
-// assuming a screen refresh rate of 60 Htz or higher
-// The default is 50. This makes the mouse ~3 times faster and more accurate
-#define MOUSEKEY_INTERVAL 16
-// The default is 20. Since we made the mouse about 3 times faster with the previous setting,
-// give it more time to accelerate to max speed to retain precise control over short distances.
-#define MOUSEKEY_TIME_TO_MAX 40
-// The default is 300. Let's try and make this as low as possible while keeping the cursor responsive
-#define MOUSEKEY_DELAY 100
-// It makes sense to use the same delay for the mouseweel
-#define MOUSEKEY_WHEEL_DELAY 100
-// The default is 100
-#define MOUSEKEY_WHEEL_INTERVAL 50
-// The default is 40
-#define MOUSEKEY_WHEEL_TIME_TO_MAX 100
-
-// Pick good defaults for enabling homerow modifiers
-#define TAPPING_TERM 200
-#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
-#define TAPPING_FORCE_HOLD
diff --git a/keyboards/a_dux/keymaps/default/keymap.c b/keyboards/a_dux/keymaps/default/keymap.c
new file mode 100644
index 0000000000..560c5654e9
--- /dev/null
+++ b/keyboards/a_dux/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+// Copyright 2022 @filterpaper
+// SPDX-License-Identifier: GPL-2.0+
+
+#include QMK_KEYBOARD_H
+
+// Seniply layout
+// https://stevep99.github.io/seniply
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
+    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+                          LT(3,KC_TAB), KC_LSFT,     KC_SPC,  LT(1,KC_ENT)
+    ),
+    [1] = LAYOUT(
+    KC_EXLM, KC_AT,   KC_SCLN, KC_COLN, KC_UNDS,     KC_EQL,  KC_7,    KC_8,    KC_9,    KC_PLUS,
+    KC_BSLS, KC_PIPE, KC_LCBR, KC_LPRN, KC_LBRC,     KC_ASTR, KC_4,    KC_5,    KC_6,    KC_MINS,
+    KC_NO,   KC_NO,   KC_RCBR, KC_RPRN, KC_RBRC,     KC_0,    KC_1,    KC_2,    KC_3,    KC_SLSH,
+                               _______, MO(2),       _______, _______
+    ),
+    [2] = LAYOUT(
+    RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), KC_BRIU,     KC_NO,   KC_AMPR, KC_GRV,  KC_TILD, KC_NO,
+    KC_MUTE,    KC_VOLD,    KC_MPLY,    KC_VOLU,    KC_BRID,     KC_NO,   KC_DLR,  KC_PERC, KC_CIRC, KC_UNDS,
+    KC_EJCT,    KC_MPRV,    KC_MSTP,    KC_MNXT,    KC_NO,       KC_NO,   KC_EXLM, KC_AT,   KC_HASH, KC_NO,
+                                           _______, _______,     _______, _______
+    ),
+    [3] = LAYOUT(
+    KC_ESC,        LALT(KC_LEFT), LCTL(KC_F),    LALT(KC_RGHT), KC_INS,            KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_CAPS,
+    OSM(MOD_LALT), OSM(MOD_LGUI), OSM(MOD_LSFT), OSM(MOD_LCTL), OSM(MOD_RALT),     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,
+    LCTL(KC_Z),    LCTL(KC_X),    LCTL(KC_C),    KC_TAB,        LCTL(KC_V),        KC_ENT,  KC_BSPC, KC_RCTL, KC_LALT, KC_APP,
+                                                       _______, _______,           _______, MO(4)
+    ),
+    [4] = LAYOUT(
+    KC_NO,         KC_NO,         RCS(KC_F),     KC_PSCR,       KC_NO,             KC_F12,  KC_F7,   KC_F8,   KC_F9,   KC_NO,
+    OSM(MOD_LALT), OSM(MOD_LGUI), OSM(MOD_LSFT), OSM(MOD_LCTL), OSM(MOD_RALT),     KC_F11,  KC_F4,   KC_F5,   KC_F6,   KC_NO,
+    RCS(KC_Z),     RCS(KC_X),     RCS(KC_C),     LSFT(KC_TAB),  RCS(KC_V),         KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_NO,
+                                                       _______, _______,           _______, _______
+    )
+};
diff --git a/keyboards/a_dux/keymaps/default/keymap.json b/keyboards/a_dux/keymaps/default/keymap.json
deleted file mode 100644
index 555a86c0b0..0000000000
--- a/keyboards/a_dux/keymaps/default/keymap.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{    "version": 1,
-    "notes": "My awesome keymap",
-    "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
-    "keyboard": "a_dux",
-    "keymap": "default",
-    "layout": "LAYOUT",
-    "layers": [
-        ["KC_Q"        , "KC_W"        , "KC_E"           , "KC_R"          , "KC_T",
-         "KC_Y"        , "KC_U"        , "KC_I"           , "KC_O"          , "KC_P",
-
-         "LSFT_T(KC_A)", "LT(5,KC_S)"  , "LT(1,KC_D)"     , "LT(3,KC_F)"    , "KC_G",
-         "KC_H"        , "LT(4,KC_J)"  , "LT(2,KC_K)"     , "LT(6,KC_L)"    , "LSFT_T(KC_SCLN)",
-
-         "KC_Z"        , "LCTL_T(KC_X)", "LALT_T(KC_C)"   , "KC_V"          , "KC_B",
-         "KC_N"        , "KC_M"        , "LALT_T(KC_COMM)", "LCTL_T(KC_DOT)", "KC_SLSH",
-
-         "KC_P0"       , "KC_BSPC",
-         "LT(7,KC_SPC)", "KC_P1"
-        ],
-        ["KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
-         "KC_TRNS"     , "KC_BTN1"     , "KC_WH_U"        , "KC_BTN2"       , "KC_TRNS",
-
-         "KC_TRNS"     , "KC_BTN2"     , "KC_NO"          , "KC_BTN1"       , "KC_TRNS",
-         "KC_TRNS"     , "KC_MS_L"     , "KC_MS_D"        , "KC_MS_U"       , "KC_MS_R",
-
-         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
-         "KC_TRNS"     , "KC_WH_L"     , "KC_WH_D"        , "KC_WH_R"       , "KC_TRNS",
-
-         "KC_TRNS"     , "KC_TRNS",
-         "KC_TRNS"     , "KC_TRNS"
-        ],
-        ["KC_TRNS"     , "KC_TRNS"     , "KC_PGUP"        , "KC_TRNS"       , "KC_TRNS",
-         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
-
-         "KC_LEFT"     , "KC_UP"       , "KC_DOWN"        , "KC_RGHT"       , "KC_TRNS",
-         "KC_TRNS"     , "KC_LGUI"     , "KC_NO"          , "LCTL(KC_LALT)" , "LCA(KC_LSFT)",
-
-         "KC_TRNS"     , "KC_HOME"     , "KC_PGDN"        , "KC_END"        , "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_UNDS"     , "KC_PIPE"        , "KC_QUOT"       , "KC_TRNS",
-
-         "KC_CIRC"     , "KC_ASTR"     , "KC_AMPR"        , "KC_NO"         , "KC_TRNS",
-         "KC_HASH"     , "KC_TILD"     , "KC_SLSH"        , "KC_DQUO"       , "KC_DLR",
-
-         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
-         "KC_TRNS"     , "KC_MINS"     , "KC_BSLS"        , "KC_GRV"        , "KC_TRNS",
-
-         "KC_TRNS"     , "KC_TRNS",
-         "KC_TRNS"     , "KC_TRNS"
-        ],
-        ["KC_TRNS"     , "KC_COLN"     , "KC_LT"          , "KC_GT"         , "KC_SCLN",
-         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
-
-         "KC_LCBR"     , "KC_RCBR"     , "KC_LPRN"        , "KC_RPRN"       , "KC_AT",
-         "KC_TRNS"     , "KC_NO"       , "KC_EQL"         , "KC_PLUS"       , "KC_PERC",
-
-         "KC_TRNS"     , "KC_EXLM"     , "KC_LBRC"        , "KC_RBRC"       , "KC_TRNS",
-         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
-
-         "KC_VOLD"     , "KC_TRNS",
-         "KC_TRNS"     , "KC_VOLU"
-        ],
-        ["KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
-         "KC_TRNS"     , "KC_F7"       , "KC_F8"          , "KC_F9"         , "KC_F10",
-
-         "KC_TRNS"     , "KC_NO"       , "LCTL(KC_LALT)"  , "KC_TRNS"       , "KC_TRNS",
-         "KC_TRNS"     , "KC_F4"       , "KC_F5"          , "KC_F6"         , "KC_F11",
-
-         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
-         "KC_TRNS"     , "KC_F1"       , "KC_F2"          , "KC_F3"         , "KC_F12",
-
-         "KC_TRNS"     , "KC_TRNS",
-         "KC_TRNS"     , "KC_TRNS"
-        ],
-        ["KC_PSLS"     , "KC_7"        , "KC_8"           , "KC_9"          , "KC_PPLS",
-         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
-
-         "KC_0"        , "KC_1"        , "KC_2"           , "KC_3"          , "KC_PMNS",
-         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_NO"         , "KC_TRNS",
-
-         "KC_PAST"     , "KC_4"        , "KC_5"           , "KC_6"          , "KC_PEQL",
-         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
-
-         "KC_TRNS"     , "KC_TRNS",
-         "KC_TRNS"     , "KC_TRNS"
-        ],
-        ["KC_TRNS"     , "KC_TRNS"     , "KC_COLN"        , "KC_ESC"        , "KC_TRNS",
-         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_TRNS"       , "KC_DEL",
-
-         "KC_TRNS"     , "KC_PERC"     , "KC_SLSH"        , "KC_ENT"        , "KC_TRNS",
-         "DF(1)"       , "KC_LGUI"     , "KC_TRNS"        , "KC_TRNS"       , "KC_TRNS",
-
-         "KC_TRNS"     , "KC_TRNS"     , "KC_TRNS"        , "KC_EXLM"       , "KC_TRNS",
-         "DF(0)"       , "KC_TRNS"     , "RALT_T(KC_COMM)", "RCTL_T(KC_DOT)", "RESET",
-
-         "KC_TRNS"     , "KC_TAB",
-         "KC_NO"       , "KC_TRNS"
-        ]
-    ],
-    "author": "@pierrec83"
-}
diff --git a/keyboards/a_dux/keymaps/default/readme.md b/keyboards/a_dux/keymaps/default/readme.md
deleted file mode 100644
index 5f67a69cb2..0000000000
--- a/keyboards/a_dux/keymaps/default/readme.md
+++ /dev/null
@@ -1,122 +0,0 @@
-A usable default keymap for the A. Dux keyboard
-===============================================
-
-Keymaps in general are quite personal, so it is difficult to come up with a default that will suit every user.
-
-This keymap makes heavy use of keys behaving differently when tapped and held, so that all the keys one may need remain accessible despite the low number of thumb keys.
-
-It comes with a number of layers to give access to most of the keys one may need on a keyboard. It is not meant to be the best possible keymap, but rather a good base on which to build a keymap that works for you.
-
-This is not the only way to make 34 keys a comfortable typing experience, but it is one way to do so. If you don't already know of a better way, this may be as good a starting point as any :)
-
-Note that this keymap was built from the perspective that it is OK to take a steep learning curve if it results in a keymap that is easier to use in the long run. This means that it may take more effort to learn this keymap than some alternatives. "Easy to use" was assessed against the workflow of the author, so your mileage may vary on some of the details.
-
-What do all these layers do?
-----------------------------
-
-### Layer 0: Base layer
-
-![Layer 0](https://i.imgur.com/HjNHUPL.png)
-
-On tapping the keys, our base layer is qwerty with space on the right homing thumb and backspace on the left homing thumb.
-
-In this layer, the non-homing-thumb positions have 0 and 1. I recommend modifying this to some frequently accessed shortcut such as copy/paste, previous/next tab or anything that makes most sense in your own workflow. O and 1 are place-holders and make it easy to troubleshoot that all keys are working properly before soldering in the switches.
-The reason I recommend convenience shortcuts instead of more commonly used keys like tab or meta is that unhoming of the thumbs was a frequent source of typos for me when I used more than one thumb key frequently in the context of typing.
-
-Despite being missing on this layer, "meta", "tab", "esc" and such are accessible from any other layer: see Layer 7.
-
-The behaviour of some keys differ when held:
-* Both homing pinkies behave as shift.
-* Both bottom-row ring fingers behave as ctrl.
-* Both bottom-row middle fingers behave as alt.
-
-* The homing left ring finger gives access to the Function keys layer
-* The homing right ring finger gives access to the Numbers layer
-* The homing left middle finger gives access to the Mouse layer
-* The homing right middle finger gives access to the Navigation layer
-* The homing left index finger gives access to the Right symbols layer
-* The homing right index finger gives access to the Left symbols layer
-* The homing right thumb gives access to the Always accessible layer
-
-### Layer 1: Mouse
-
-![Layer 1](https://i.imgur.com/0fvTuB9.png)
-
-Layer 1 is a mouse layer: it can be used one-handed or two-handed. The most common way to use it is two handed, with left and right click on the homerow of the left hand and directions on the homerow of the right hand.
-Scrolling is available on the right hand with mid finger up and down for vertical scroll and index and ring finger down for horizontal scroll.
-On the right hand, left click and right click are also available with index and ring finger up to allow one handed operation. This can be particularly handy when enabling the mouse layer permanently (no need to hold the left middle finger), which can be done from Layer 7.
-
-Note that thanks to the transparency, shift, ctrl and alt are all accessible on the left hand while operating the mouse.
-
-### Layer 2: Navigation
-
-![Layer 2](https://i.imgur.com/ZquQJRq.png)
-
-The navigation layer somewhat mirrors the mouse layer. It is accessed by holding the right middle finger and gives access to arrow keys on the left homerow. Page up and down, Home and End mirror the vertical scrolling and horizontal scrolling on the mouse layer.
-
-On the right hand, in addition to ctrl and alt which are available through transparency, ctrl + alt, ctrl + alt + shift and meta are accessible on the homerow to enable common shortcuts in some window managers. This part is quite workflow dependent, so make sure to adapt it to your own workflow as appropriate.
-
-### Layer 3: Right symbols
-
-![Layer 3](https://i.imgur.com/9tLAUqG.png)
-
-When holding down the left index, one may access about half of the symbols. The pinkies store `^` and `$` symbols that represent begin and end in vim. The left homerow hosts `*` and `&`, symbols which are related in the way that they represent some form of indirection in programming languages such as rust. On the right hand, most symbols used when navigating the command line are stored together, organized by columns of related symbols. 
-
-### Layer 4: Left symbols
-
-![Layer 4](https://i.imgur.com/CkjUSW6.png)
-
-When holding down the right index, one may access the other symbols. On the left hand, most of the different brackets are laid out. The most frequent ones (round brackets and curly brackets) get a spot on the homerow. The rest of the layer hosts the remaining symbols that are easier to access here than on any other layers.
-
-### Layer 5: Function keys
-
-![Layer 5](https://i.imgur.com/fWgVqc4.png)
-
-By holding down the left ring finger, one may access the function keys, roughly in a numpad layout.
-This means that alt+F4 is easy to type, with F4 being on the homerow.
-There is a shortcut for ctrl+alt on the left hand to enable convenient switching between virtual terminals on Linux.
-
-### Layer 6: Numbers
-
-![Layer 6](https://i.imgur.com/S8gq9Kj.png)
-
-The number layer is accessed by holding the right ring finger. It hosts the numbers and some duplicated symbols that are commonly accessed next to numbers, such as mathematical operators.
-The number are layed out similarly to a numpad, but with the middle row and the homerow swapped so that the most used numbers: 0, 1, 2 and 3 are all available in homing positions. 
-
-### Layer 7: Always accessible
-
-![Layer 7](https://i.imgur.com/twqBeBb.png)
-
-Layer 7 is accessed by holding the right homing thumb down. Because this position is left transparent from every other layer, this layer is always accessible.
-It gives access to some essential keys that would typically be accessed on a thumb cluster or pinkies, such as meta, enter, tab, esc and delete.
-
-As the layer hosting esc, we duplicated some symbols here to allow for fast navigation in vim. For instance, esc, :, w, q can be done in a single roll.
-
-Where is the keymap.c?
-----------------------
-
-The keymap.c file is not published to the repository. It is generated from `keymap.json` by the build system.
-
-This avoids duplicating information and allow users to edit their keymap from the qmk configurator web interface.
-
-How do I edit and update the keymap?
-------------------------------------
-
-The `keymap.json` file is generated from the qmk configurator interface and formatted for better readability in the context of the A. Dux keyboard.
-
-To edit it, you may:
-* Edit it directly from a text editor.
-* Edit it from the qmk configurator.
-
-If you decide to use the latter workflow, here are the steps to follow:
-
-* From the qmk configurator, hit the "import QMK keymap json file" button (it has a drawing with an up arrow on it).
-* Browse to the location of your keymap (for example, `<your qmk repo>/keyboards/a_dux/keymaps/default/keymap.json`)
-* Perform any modification to the keymap in the web UI
-* Export the keymap to your downloads folder, by hitting the "Export QMK keymap json file" button (it has a drawing with a down arrow on it)
-* Override your original keymap with the output of formatting the exported keymap by running a command such as this one from the root of your qmk repo:
-  ```
-  ./keyboards/a_dux/keymaps/json2crab.py --input <Your download directory>/default.json > ./keyboards/a_dux/keymaps/default/keymap.json
-  ```
-  Note that you may first need to make json2crab executable by using `chmod +x` on it.
-  Also note that you may then want to remove the exported keymap from your dowload directory.

From 0fc1ae9e9c6184a690858064a618cd413ac779ce Mon Sep 17 00:00:00 2001
From: Matthew Dews <matthew-dews@users.noreply.github.com>
Date: Mon, 10 Jan 2022 19:48:49 -0500
Subject: [PATCH 222/867] [Keyboard] handwired/dactyl_manuform: add 6x7 version
 (#15704)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/handwired/dactyl_manuform/6x7/6x7.c |   4 +
 keyboards/handwired/dactyl_manuform/6x7/6x7.h |  35 ++++++
 .../handwired/dactyl_manuform/6x7/config.h    |  40 ++++++
 .../handwired/dactyl_manuform/6x7/info.json   | 114 ++++++++++++++++++
 .../6x7/keymaps/default/keymap.c              |  50 ++++++++
 .../handwired/dactyl_manuform/6x7/rules.mk    |  19 +++
 .../dactyl_manuform/dactyl_manuform.h         |   2 +
 keyboards/handwired/dactyl_manuform/readme.md |   7 +-
 8 files changed, 270 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/handwired/dactyl_manuform/6x7/6x7.c
 create mode 100644 keyboards/handwired/dactyl_manuform/6x7/6x7.h
 create mode 100644 keyboards/handwired/dactyl_manuform/6x7/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/6x7/info.json
 create mode 100644 keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/dactyl_manuform/6x7/rules.mk

diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.c b/keyboards/handwired/dactyl_manuform/6x7/6x7.c
new file mode 100644
index 0000000000..eea518da09
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/6x7.c
@@ -0,0 +1,4 @@
+// Copyright 2022 Matthew Dews (@matthew-dews)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "6x7.h"
diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.h b/keyboards/handwired/dactyl_manuform/6x7/6x7.h
new file mode 100644
index 0000000000..8d69ddd097
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/6x7.h
@@ -0,0 +1,35 @@
+// Copyright 2022 Matthew Dews (@matthew-dews)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "dactyl_manuform.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_6x7( \
+    L00, L01, L02, L03, L04, L05, L06,                         R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16,                         R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26,                         R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35, L36,                         R30, R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43, L44, L45, L46,                         R40, R41, R42, R43, R44, R45, R46, \
+                   L52, L53,                                             R52, R53, \
+                             L54, L55,                         R50, R51, \
+                                       L64, L65,      R60, R61, \
+                                       L62, L63,      R62, R63 \
+) { \
+    { L00, L01, L02, L03, L04, L05, L06 }, \
+    { L10, L11, L12, L13, L14, L15, L16 }, \
+    { L20, L21, L22, L23, L24, L25, L26 }, \
+    { L30, L31, L32, L33, L34, L35, L36 }, \
+    { L40, L41, L42, L43, L44, L45, L46 }, \
+    { XXX, XXX, XXX, L52, L53, L54, L55 }, \
+    { XXX, XXX, XXX, L62, L63, L64, L65 }, \
+\
+    { R00, R01, R02, R03, R04, R05, R06 }, \
+    { R10, R11, R12, R13, R14, R15, R16 }, \
+    { R20, R21, R22, R23, R24, R25, R26 }, \
+    { R30, R31, R32, R33, R34, R35, R36 }, \
+    { R40, R41, R42, R43, R44, R45, R46 }, \
+    { R50, R51, R52, R53, XXX, XXX, XXX }, \
+    { R60, R61, R62, R63, XXX, XXX, XXX } \
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x7/config.h b/keyboards/handwired/dactyl_manuform/6x7/config.h
new file mode 100644
index 0000000000..f66f4b036f
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/config.h
@@ -0,0 +1,40 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+#define PRODUCT_ID 0x3636
+#define DEVICE_VER 0x0001
+#define PRODUCT    Dactyl-Manuform (6x7)
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 14
+#define MATRIX_COLS 7
+
+// wiring of each half
+#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B7 }
+#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
+
+#define DIODE_DIRECTION COL2ROW
+
+// WS2812 RGB LED strip input and number of LEDs
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json
new file mode 100644
index 0000000000..7b08dd8881
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/info.json
@@ -0,0 +1,114 @@
+{
+    "keyboard_name": "Dactyl Manuform 6x7",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_6x7": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+                {"x": 17, "y": 0},
+                {"x": 18, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 17, "y": 1},
+                {"x": 18, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+                {"x": 17, "y": 2},
+                {"x": 18, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+                {"x": 17, "y": 3},
+                {"x": 18, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+                {"x": 6, "y": 4},
+
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+                {"x": 17, "y": 4},
+                {"x": 18, "y": 4},
+
+                {"x": 3, "y": 5},
+                {"x": 4, "y": 5},
+
+                {"x": 14, "y": 5},
+                {"x": 15, "y": 5},
+
+                {"x": 5, "y": 6},
+                {"x": 6, "y": 6},
+
+                {"x": 12, "y": 6},
+                {"x": 13, "y": 6},
+
+                {"x": 7, "y": 7},
+                {"x": 8, "y": 7},
+
+                {"x": 10, "y": 7},
+                {"x": 11, "y": 7},
+
+                {"x": 7, "y": 8},
+                {"x": 8, "y": 8},
+
+                {"x": 10, "y": 8},
+                {"x": 11, "y": 8}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2b699eb683
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+// Copyright 2022 Matthew Dews (@matthew-dews)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_layer {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_6x7(
+        KC_ESC , KC_F1   , KC_F2  , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,                         KC_F7 , KC_F8  , KC_F9  , KC_F10, KC_F11, KC_F12   , _______,
+        _______, KC_GRV  , KC_1   , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7   , KC_8   , KC_9  , KC_0  , KC_LBRC  , KC_RBRC,
+        _______, KC_TAB  , KC_Q   , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U   , KC_I   , KC_O  , KC_P  , KC_QUOT  , KC_BACKSLASH,
+        _______, KC_LSFT , KC_A   , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J   , KC_K   , KC_L  ,KC_SCLN, KC_LSFT  , _______,
+        _______, KC_LCTL , KC_Z   , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M   , KC_COMM, KC_DOT,KC_SLSH, KC_LCTL  , _______,
+                                    KC_LBRC,KC_RBRC,                                                         KC_PLUS, KC_EQL,
+                                                    RAISE ,KC_SPC ,                         KC_ENT,  LOWER ,
+                                                    KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
+                                                    KC_BSPC,KC_GRV,                         KC_LGUI, KC_LALT
+    ),
+
+    [_LOWER] = LAYOUT_6x7(
+        KC_ESC , KC_F1  , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6  ,                       KC_F7 , KC_F8  , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 , _______,
+        _______, KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                        KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL , _______,
+        _______, _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS, _______,
+        _______, _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN,                        KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE, _______,
+        _______, _______,_______,_______,_______,_______,_______,                        _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS, _______,
+                                 _______,KC_PSCR,                                                        _______, KC_P0,
+                                                _______,_______,                         _______,_______,
+                                                _______,_______,                         _______,_______,
+                                                _______,_______,                         _______,_______
+    ),
+
+    [_RAISE] = LAYOUT_6x7(
+        _______,KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 , _______,
+        _______,_______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE, _______,
+        _______,_______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU, _______,
+        _______,_______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD, _______,
+        _______,_______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,_______, _______,
+                                _______,_______,                                                        KC_EQL ,_______,
+                                                _______,_______,                        _______,_______,
+                                                _______,_______,                        _______,_______,
+                                                _______,_______,                        _______,_______
+    )
+};
diff --git a/keyboards/handwired/dactyl_manuform/6x7/rules.mk b/keyboards/handwired/dactyl_manuform/6x7/rules.mk
new file mode 100644
index 0000000000..0415379827
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
index 7a4ca6ea13..c6d71f9114 100644
--- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
+++ b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
@@ -16,6 +16,8 @@
 #    include "5x7.h"
 #elif defined(KEYBOARD_handwired_dactyl_manuform_6x6)
 #    include "6x6.h"
+#elif defined(KEYBOARD_handwired_dactyl_manuform_6x7)
+#    include "6x7.h"
 #elif defined(KEYBOARD_handwired_dactyl_manuform_dmote_62key)
 #    include "62key.h"
 #endif
diff --git a/keyboards/handwired/dactyl_manuform/readme.md b/keyboards/handwired/dactyl_manuform/readme.md
index 3221da0e9d..4882f4ab4b 100644
--- a/keyboards/handwired/dactyl_manuform/readme.md
+++ b/keyboards/handwired/dactyl_manuform/readme.md
@@ -1,4 +1,4 @@
-Dactyl Manuform (4x5, 5x6, 5x7, 6x6)
+Dactyl Manuform (4x5, 5x6, 5x7, 6x6, 6x7)
 ======
 the [Dactyl-Manuform](https://github.com/tshort/dactyl-keyboard) is a split curved keyboard based on the design of [adereth dactyl](https://github.com/adereth/dactyl-keyboard) and thumb cluster design of the [manuform](https://geekhack.org/index.php?topic=46015.0) keyboard, the hardware is similar to the let's split keyboard. all information needed for making one is in the first link.
 ![Imgur](https://i.imgur.com/7y0Vbyd.jpg)
@@ -53,6 +53,11 @@ Keymap of Loligagger from geekhack.
 #### Default
 Simple QWERTY layout with 3 Layers.
 
+### [Keymaps 6x7](/keyboards/handwired/dactyl_manuform/6x7/keymaps/)
+
+#### Default
+Simple QWERTY layout with 3 Layers.
+
 ## Required Hardware
 
 Apart from diodes and key switches for the keyboard matrix in each half, you

From 19fe7dcaaa3d1494333feff6e19d4655efc693eb Mon Sep 17 00:00:00 2001
From: GG <72414103+spbgzh@users.noreply.github.com>
Date: Tue, 11 Jan 2022 03:49:19 +0300
Subject: [PATCH 223/867] [Keyboard] Fixed bugs Wuque Mammoth Keyboard Series
 (#15700)

---
 keyboards/wuque/mammoth20x/config.h             |  6 ++++++
 keyboards/wuque/mammoth20x/keymaps/via/keymap.c |  4 ++--
 keyboards/wuque/mammoth75x/config.h             | 10 ++++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/keyboards/wuque/mammoth20x/config.h b/keyboards/wuque/mammoth20x/config.h
index a29ab2cb21..8fcfc03195 100644
--- a/keyboards/wuque/mammoth20x/config.h
+++ b/keyboards/wuque/mammoth20x/config.h
@@ -49,6 +49,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_B { D2 }
 
 #define ENCODERS 1
+
+#ifdef ENCODER_RESOLUTION
+    #undef ENCODER_RESOLUTION
+#endif
+#define ENCODER_RESOLUTION 2
+
 // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 3, 2 } }
 #define ENCODERS_CCW_KEY { { 3, 4 } }
diff --git a/keyboards/wuque/mammoth20x/keymaps/via/keymap.c b/keyboards/wuque/mammoth20x/keymaps/via/keymap.c
index c8f7c1bb85..e5fe34fd7b 100644
--- a/keyboards/wuque/mammoth20x/keymaps/via/keymap.c
+++ b/keyboards/wuque/mammoth20x/keymaps/via/keymap.c
@@ -18,8 +18,8 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_ESC,  KC_PAUS, KC_DEL,  KC_VOLU, KC_MUTE, KC_VOLD,
-        KC_LNUM, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_ESC,  KC_PAUS, KC_DEL,  KC_VOLD, KC_MUTE, KC_VOLU,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,
diff --git a/keyboards/wuque/mammoth75x/config.h b/keyboards/wuque/mammoth75x/config.h
index 019a70f50d..88ef0e5477 100644
--- a/keyboards/wuque/mammoth75x/config.h
+++ b/keyboards/wuque/mammoth75x/config.h
@@ -49,9 +49,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENCODERS_PAD_B { B1 }
 
 #define ENCODERS 1
+
+#ifdef ENCODER_RESOLUTION
+    #undef ENCODER_RESOLUTION
+#endif
+#define ENCODER_RESOLUTION 2
+
 // Note:  array is { col, row )
-#define ENCODERS_CW_KEY  { { 5, 5 } }
-#define ENCODERS_CCW_KEY { { 3, 5 } }
+#define ENCODERS_CW_KEY  { { 3, 5 } }
+#define ENCODERS_CCW_KEY { { 5, 5 } }
 
 #define LED_CAPS_LOCK_PIN B6
 #define LED_PIN_ON_STATE 0

From d7d3839b8d1a7ff3bb01a991a5c5291e88c314c0 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:49:50 +0800
Subject: [PATCH 224/867] [Keyboard] move ID80 to IDOBAO vendor folder (#15665)

---
 keyboards/{ => idobao}/id80/ansi/config.h                  | 0
 keyboards/{ => idobao}/id80/ansi/keymaps/default/keymap.c  | 0
 keyboards/{ => idobao}/id80/ansi/keymaps/default/readme.md | 0
 keyboards/{ => idobao}/id80/ansi/keymaps/msf/config.h      | 0
 keyboards/{ => idobao}/id80/ansi/keymaps/msf/keymap.c      | 0
 keyboards/{ => idobao}/id80/ansi/keymaps/msf/readme.md     | 0
 keyboards/{ => idobao}/id80/ansi/keymaps/msf/rules.mk      | 0
 keyboards/{ => idobao}/id80/ansi/keymaps/via/keymap.c      | 0
 keyboards/{ => idobao}/id80/ansi/keymaps/via/rules.mk      | 0
 keyboards/{ => idobao}/id80/ansi/readme.md                 | 0
 keyboards/{ => idobao}/id80/ansi/rules.mk                  | 0
 keyboards/{ => idobao}/id80/config.h                       | 0
 keyboards/{ => idobao}/id80/id80.c                         | 0
 keyboards/{ => idobao}/id80/id80.h                         | 0
 keyboards/{ => idobao}/id80/info.json                      | 0
 keyboards/{ => idobao}/id80/iso/config.h                   | 0
 keyboards/{ => idobao}/id80/iso/keymaps/default/keymap.c   | 0
 keyboards/{ => idobao}/id80/iso/keymaps/default/readme.md  | 0
 keyboards/{ => idobao}/id80/iso/keymaps/via/keymap.c       | 0
 keyboards/{ => idobao}/id80/iso/keymaps/via/rules.mk       | 0
 keyboards/{ => idobao}/id80/iso/readme.md                  | 0
 keyboards/{ => idobao}/id80/iso/rules.mk                   | 0
 keyboards/{ => idobao}/id80/keymaps/rverst/keymap.c        | 0
 keyboards/{ => idobao}/id80/keymaps/rverst/readme.md       | 0
 keyboards/{ => idobao}/id80/keymaps/rverst/rverst.json     | 0
 keyboards/{ => idobao}/id80/readme.md                      | 4 ++--
 keyboards/{ => idobao}/id80/rules.mk                       | 0
 27 files changed, 2 insertions(+), 2 deletions(-)
 rename keyboards/{ => idobao}/id80/ansi/config.h (100%)
 rename keyboards/{ => idobao}/id80/ansi/keymaps/default/keymap.c (100%)
 rename keyboards/{ => idobao}/id80/ansi/keymaps/default/readme.md (100%)
 rename keyboards/{ => idobao}/id80/ansi/keymaps/msf/config.h (100%)
 rename keyboards/{ => idobao}/id80/ansi/keymaps/msf/keymap.c (100%)
 rename keyboards/{ => idobao}/id80/ansi/keymaps/msf/readme.md (100%)
 rename keyboards/{ => idobao}/id80/ansi/keymaps/msf/rules.mk (100%)
 rename keyboards/{ => idobao}/id80/ansi/keymaps/via/keymap.c (100%)
 rename keyboards/{ => idobao}/id80/ansi/keymaps/via/rules.mk (100%)
 rename keyboards/{ => idobao}/id80/ansi/readme.md (100%)
 rename keyboards/{ => idobao}/id80/ansi/rules.mk (100%)
 rename keyboards/{ => idobao}/id80/config.h (100%)
 rename keyboards/{ => idobao}/id80/id80.c (100%)
 rename keyboards/{ => idobao}/id80/id80.h (100%)
 rename keyboards/{ => idobao}/id80/info.json (100%)
 rename keyboards/{ => idobao}/id80/iso/config.h (100%)
 rename keyboards/{ => idobao}/id80/iso/keymaps/default/keymap.c (100%)
 rename keyboards/{ => idobao}/id80/iso/keymaps/default/readme.md (100%)
 rename keyboards/{ => idobao}/id80/iso/keymaps/via/keymap.c (100%)
 rename keyboards/{ => idobao}/id80/iso/keymaps/via/rules.mk (100%)
 rename keyboards/{ => idobao}/id80/iso/readme.md (100%)
 rename keyboards/{ => idobao}/id80/iso/rules.mk (100%)
 rename keyboards/{ => idobao}/id80/keymaps/rverst/keymap.c (100%)
 rename keyboards/{ => idobao}/id80/keymaps/rverst/readme.md (100%)
 rename keyboards/{ => idobao}/id80/keymaps/rverst/rverst.json (100%)
 rename keyboards/{ => idobao}/id80/readme.md (94%)
 rename keyboards/{ => idobao}/id80/rules.mk (100%)

diff --git a/keyboards/id80/ansi/config.h b/keyboards/idobao/id80/ansi/config.h
similarity index 100%
rename from keyboards/id80/ansi/config.h
rename to keyboards/idobao/id80/ansi/config.h
diff --git a/keyboards/id80/ansi/keymaps/default/keymap.c b/keyboards/idobao/id80/ansi/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/id80/ansi/keymaps/default/keymap.c
rename to keyboards/idobao/id80/ansi/keymaps/default/keymap.c
diff --git a/keyboards/id80/ansi/keymaps/default/readme.md b/keyboards/idobao/id80/ansi/keymaps/default/readme.md
similarity index 100%
rename from keyboards/id80/ansi/keymaps/default/readme.md
rename to keyboards/idobao/id80/ansi/keymaps/default/readme.md
diff --git a/keyboards/id80/ansi/keymaps/msf/config.h b/keyboards/idobao/id80/ansi/keymaps/msf/config.h
similarity index 100%
rename from keyboards/id80/ansi/keymaps/msf/config.h
rename to keyboards/idobao/id80/ansi/keymaps/msf/config.h
diff --git a/keyboards/id80/ansi/keymaps/msf/keymap.c b/keyboards/idobao/id80/ansi/keymaps/msf/keymap.c
similarity index 100%
rename from keyboards/id80/ansi/keymaps/msf/keymap.c
rename to keyboards/idobao/id80/ansi/keymaps/msf/keymap.c
diff --git a/keyboards/id80/ansi/keymaps/msf/readme.md b/keyboards/idobao/id80/ansi/keymaps/msf/readme.md
similarity index 100%
rename from keyboards/id80/ansi/keymaps/msf/readme.md
rename to keyboards/idobao/id80/ansi/keymaps/msf/readme.md
diff --git a/keyboards/id80/ansi/keymaps/msf/rules.mk b/keyboards/idobao/id80/ansi/keymaps/msf/rules.mk
similarity index 100%
rename from keyboards/id80/ansi/keymaps/msf/rules.mk
rename to keyboards/idobao/id80/ansi/keymaps/msf/rules.mk
diff --git a/keyboards/id80/ansi/keymaps/via/keymap.c b/keyboards/idobao/id80/ansi/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/id80/ansi/keymaps/via/keymap.c
rename to keyboards/idobao/id80/ansi/keymaps/via/keymap.c
diff --git a/keyboards/id80/ansi/keymaps/via/rules.mk b/keyboards/idobao/id80/ansi/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/id80/ansi/keymaps/via/rules.mk
rename to keyboards/idobao/id80/ansi/keymaps/via/rules.mk
diff --git a/keyboards/id80/ansi/readme.md b/keyboards/idobao/id80/ansi/readme.md
similarity index 100%
rename from keyboards/id80/ansi/readme.md
rename to keyboards/idobao/id80/ansi/readme.md
diff --git a/keyboards/id80/ansi/rules.mk b/keyboards/idobao/id80/ansi/rules.mk
similarity index 100%
rename from keyboards/id80/ansi/rules.mk
rename to keyboards/idobao/id80/ansi/rules.mk
diff --git a/keyboards/id80/config.h b/keyboards/idobao/id80/config.h
similarity index 100%
rename from keyboards/id80/config.h
rename to keyboards/idobao/id80/config.h
diff --git a/keyboards/id80/id80.c b/keyboards/idobao/id80/id80.c
similarity index 100%
rename from keyboards/id80/id80.c
rename to keyboards/idobao/id80/id80.c
diff --git a/keyboards/id80/id80.h b/keyboards/idobao/id80/id80.h
similarity index 100%
rename from keyboards/id80/id80.h
rename to keyboards/idobao/id80/id80.h
diff --git a/keyboards/id80/info.json b/keyboards/idobao/id80/info.json
similarity index 100%
rename from keyboards/id80/info.json
rename to keyboards/idobao/id80/info.json
diff --git a/keyboards/id80/iso/config.h b/keyboards/idobao/id80/iso/config.h
similarity index 100%
rename from keyboards/id80/iso/config.h
rename to keyboards/idobao/id80/iso/config.h
diff --git a/keyboards/id80/iso/keymaps/default/keymap.c b/keyboards/idobao/id80/iso/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/id80/iso/keymaps/default/keymap.c
rename to keyboards/idobao/id80/iso/keymaps/default/keymap.c
diff --git a/keyboards/id80/iso/keymaps/default/readme.md b/keyboards/idobao/id80/iso/keymaps/default/readme.md
similarity index 100%
rename from keyboards/id80/iso/keymaps/default/readme.md
rename to keyboards/idobao/id80/iso/keymaps/default/readme.md
diff --git a/keyboards/id80/iso/keymaps/via/keymap.c b/keyboards/idobao/id80/iso/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/id80/iso/keymaps/via/keymap.c
rename to keyboards/idobao/id80/iso/keymaps/via/keymap.c
diff --git a/keyboards/id80/iso/keymaps/via/rules.mk b/keyboards/idobao/id80/iso/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/id80/iso/keymaps/via/rules.mk
rename to keyboards/idobao/id80/iso/keymaps/via/rules.mk
diff --git a/keyboards/id80/iso/readme.md b/keyboards/idobao/id80/iso/readme.md
similarity index 100%
rename from keyboards/id80/iso/readme.md
rename to keyboards/idobao/id80/iso/readme.md
diff --git a/keyboards/id80/iso/rules.mk b/keyboards/idobao/id80/iso/rules.mk
similarity index 100%
rename from keyboards/id80/iso/rules.mk
rename to keyboards/idobao/id80/iso/rules.mk
diff --git a/keyboards/id80/keymaps/rverst/keymap.c b/keyboards/idobao/id80/keymaps/rverst/keymap.c
similarity index 100%
rename from keyboards/id80/keymaps/rverst/keymap.c
rename to keyboards/idobao/id80/keymaps/rverst/keymap.c
diff --git a/keyboards/id80/keymaps/rverst/readme.md b/keyboards/idobao/id80/keymaps/rverst/readme.md
similarity index 100%
rename from keyboards/id80/keymaps/rverst/readme.md
rename to keyboards/idobao/id80/keymaps/rverst/readme.md
diff --git a/keyboards/id80/keymaps/rverst/rverst.json b/keyboards/idobao/id80/keymaps/rverst/rverst.json
similarity index 100%
rename from keyboards/id80/keymaps/rverst/rverst.json
rename to keyboards/idobao/id80/keymaps/rverst/rverst.json
diff --git a/keyboards/id80/readme.md b/keyboards/idobao/id80/readme.md
similarity index 94%
rename from keyboards/id80/readme.md
rename to keyboards/idobao/id80/readme.md
index 016d2a177f..bcc4a25d7d 100644
--- a/keyboards/id80/readme.md
+++ b/keyboards/idobao/id80/readme.md
@@ -12,7 +12,7 @@ A 75% hotswap keyboard from IDOBAO.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make id80/ansi:default
+    make idobao/id80/ansi:default
     
 ## ISO support:
 
@@ -22,6 +22,6 @@ Make example for this keyboard (after setting up your build environment):
 
 Make example for this keyboard (after setting up your build environment):
 
-    make id80/iso:default
+    make idobao/id80/iso: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).
diff --git a/keyboards/id80/rules.mk b/keyboards/idobao/id80/rules.mk
similarity index 100%
rename from keyboards/id80/rules.mk
rename to keyboards/idobao/id80/rules.mk

From 37ba5e489253a551e04b198d3d5d728db4775299 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bat=C4=B1n=20Ery=C4=B1lmaz?= <batineryilmaz@icloud.com>
Date: Tue, 11 Jan 2022 03:50:12 +0300
Subject: [PATCH 225/867] [Keymap] Add new The GMMK PRO keymap (#15664)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../gmmk/pro/ansi/keymaps/batin/keymap.c      | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/batin/keymap.c

diff --git a/keyboards/gmmk/pro/ansi/keymaps/batin/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/batin/keymap.c
new file mode 100644
index 0000000000..be88ea82f8
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/batin/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+      KC_ESC,  KC_F1,   KC_F2,   KC_BRID, KC_BRIU, RGB_VAD, RGB_VAI, RGB_RMOD, RGB_MOD, KC_F9,    KC_MPRV, KC_MPLY, KC_MNXT, KC_PSCR,       KC_MUTE,
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,     KC_8,    KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_DEL, 
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,     KC_I,    KC_O,     KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,       KC_PGUP, 
+      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_PGDN, 
+      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,     KC_COMM, KC_DOT,   KC_SLSH, KC_RSFT,            KC_UP,       KC_END, 
+      KC_LCTL, KC_LALT, KC_LGUI,                   KC_SPC,                              KC_RGUI,  MO(1),   KC_RCTL, KC_LEFT,   KC_DOWN,  KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F10,  KC_F12,  _______, KC_MUTE, 
+      _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+      _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______, 
+      _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+      _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          RGB_MOD, 
+      _______, _______, _______,                   _______,                   _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+    ),
+};
+// clang-format on
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+    return false;
+}
+#endif

From cb821b5f16c6b8aa79f1f6e1310b0654ae72079d Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 11 Jan 2022 01:51:09 +0100
Subject: [PATCH 226/867] [Keymap] fix: moving keymap to rev1 folder (#15663)

---
 .../bm60hsrgb_poker/{ => rev1}/keymaps/carlosala/config.h         | 0
 .../bm60hsrgb_poker/{ => rev1}/keymaps/carlosala/keymap.c         | 0
 .../bm60hsrgb_poker/{ => rev1}/keymaps/carlosala/rules.mk         | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/carlosala/config.h (100%)
 rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/carlosala/keymap.c (100%)
 rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/carlosala/rules.mk (100%)

diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/config.h
rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/keymap.c
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/keymap.c
rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/keymap.c
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/carlosala/rules.mk
rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk

From dd4e48b4a274810fc088dc43c1e9be6f0a248f1a Mon Sep 17 00:00:00 2001
From: LucW <luc.wastiaux@xsmail.com>
Date: Tue, 11 Jan 2022 08:52:54 +0800
Subject: [PATCH 227/867] [Keymap] dvorak 42 key layouts (Ergodox EZ / Atreus)
 updates (#15656)

Co-authored-by: luc wastiaux <luc.wastiaux@airpost.net>
---
 .../atreus/keymaps/dvorak_42_key/keymap.c     |  6 +++---
 .../ergodox_ez/keymaps/dvorak_42_key/keymap.c | 21 ++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
index 0c9ab59a92..dbe39a38bc 100644
--- a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
@@ -122,9 +122,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [BROWSER_CONTROL] = LAYOUT(
-    MEH(KC_0), KC_BTN3,      KC_MS_U,            KC_BTN1,             KC_BTN2,                      KC_UP,      KC_PGUP,            KC_PGDN,      KC_MS_WH_UP,   MEH(KC_9),
-    MEH(KC_1), KC_MS_L,      KC_MS_D,            KC_MS_R,             MEH(KC_6),                    KC_DOWN,    RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), KC_MS_WH_DOWN, LALT(KC_LEFT),
-    MEH(KC_2), W10_TASKVIEW, W10_WORKSPACE_LEFT, W10_WORKSPACE_RIGHT, MEH(KC_7),                    MEH(KC_8),  RCTL(KC_1),         RCTL(KC_9),   KC_F6,         KC_F5,
+    MEH(KC_C), KC_BTN3,      KC_MS_U,            KC_BTN1,             KC_BTN2,                      KC_UP,      KC_PGUP,            KC_PGDN,      KC_MS_WH_UP,   MEH(KC_9),
+    MEH(KC_D), KC_MS_L,      KC_MS_D,            KC_MS_R,             MEH(KC_6),                    KC_DOWN,    RSFT(RCTL(KC_TAB)), RCTL(KC_TAB), KC_MS_WH_DOWN, LALT(KC_LEFT),
+    MEH(KC_E), W10_TASKVIEW, W10_WORKSPACE_LEFT, W10_WORKSPACE_RIGHT, MEH(KC_7),                    MEH(KC_8),  RCTL(KC_1),         RCTL(KC_9),   KC_F6,         KC_F5,
     KC_TRNS,   KC_TRNS,      KC_TRNS,            KC_TRNS,             KC_TRNS, KC_TRNS, RCTL(KC_W), RCTL(KC_T), KC_TRNS,             KC_TRNS,     KC_TRNS,       KC_TRNS
   ),
 };
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index 86aa1c2e6b..67a09188ab 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -111,6 +111,7 @@ enum custom_keycodes {
 #define AS_CLASS LCTL(KC_N)
 #define AS_FINDUSAGE LALT(KC_F7)
 #define AS_BACK LCTL(LALT(KC_LEFT))
+#define AS_BRACKET LCTL(LSFT(KC_M))
 #define AS_GO_DECLARATION LCTL(KC_B)
 #define AS_GO_IMPLEMENTATION LCTL(LALT(KC_B))
 #define AS_CLOSETAB LCTL(KC_F4)
@@ -118,6 +119,12 @@ enum custom_keycodes {
 #define AS_COPYLINEDOWN LCTL(KC_D)
 #define AS_DEL_LINE LCTL(KC_Y)
 #define AS_LINE LCTL(KC_G)
+#define AS_CMT_BLOCK LCTL(LSFT(KC_SLSH))
+#define AS_CMT_LINE LCTL(KC_SLSH)
+#define AS_BM_PREV LALT(KC_P)
+#define AS_BM_NEXT LALT(KC_N)
+#define AS_BM_TOGGLE KC_F11
+#define AS_BM_LIST LSFT(KC_F11)
 
 // visual studio code shortcuts
 #define VS_FILE LCTL(KC_P)
@@ -148,7 +155,7 @@ enum custom_keycodes {
 #define VS_BM_PREV LCTL(LALT(KC_P))
 #define VS_BM_NEXT LCTL(LALT(KC_N))
 #define VS_BM_TOGGLE LCTL(LALT(KC_K))
-#define VS_BM_LABEL LCTL(LALT(KC_B))
+#define VS_BM_CLEARALL LCTL(LALT(KC_C))
 
 
 #define MACRO_SCREEN_NUM(MACRO_NAME,NUM) \
@@ -362,12 +369,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                KC_TRNS,
                                KC_TRNS,KC_TRNS,KC_TRNS,
        // right hand
-       KC_TRNS, KC_TRNS,         KC_TRNS,       KC_TRNS,           KC_TRNS,              KC_TRNS,              KC_TRNS,
-       KC_TRNS, AS_COPYLINEDOWN, AS_FINDUSAGE,  AS_GO_DECLARATION, AS_GO_IMPLEMENTATION, AS_LINE,              KC_TRNS,
-                AS_CLOSETAB,     AS_TABLEFT,    AS_TABRIGHT,       AS_SYMBOL,            AS_CLASS,             AS_BACK,
-       KC_TRNS, KC_TRNS,         KC_TRNS,       KC_TRNS,           KC_TRNS,              AS_CLOSETOOLWINDOW,   KC_TRNS,
+       KC_TRNS,      KC_TRNS,         KC_TRNS,       KC_TRNS,           KC_TRNS,              KC_TRNS,              KC_TRNS,
+       AS_CMT_LINE,  AS_COPYLINEDOWN, AS_FINDUSAGE,  AS_GO_DECLARATION, AS_GO_IMPLEMENTATION, AS_LINE,              AS_BRACKET,
+                     AS_CLOSETAB,     AS_TABLEFT,    AS_TABRIGHT,       AS_SYMBOL,            AS_CLASS,             AS_BACK,
+       AS_CMT_BLOCK, KC_TRNS,         AS_BM_PREV,    AS_BM_NEXT,        KC_TRNS,              AS_CLOSETOOLWINDOW,   AS_BM_TOGGLE,
                          // bottom row
-                         KC_TRNS,     KC_TRNS,     KC_TRNS,        KC_TRNS,              KC_TRNS,
+                         KC_TRNS,     AS_BM_LIST,    KC_TRNS,        KC_TRNS,              KC_TRNS,
        // thumb cluster
        KC_TRNS, KC_TRNS,
        KC_TRNS,
@@ -393,7 +400,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                      VS_CLOSETAB,      VS_TABLEFT,    VS_TABRIGHT,      VS_SYMBOLEDITOR,     VS_FILE,         VS_BACK,
        VS_CMT_BLOCK, KC_TRNS,          VS_BM_PREV,    VS_BM_NEXT,       VS_GROUP_1,          VS_GROUP_2,      VS_BM_TOGGLE,
                                        // bottom row
-                                       VS_COMMANDS,   VS_OPEN_FILE,     VS_TERMINAL,         VS_CLOSEPANEL,   VS_BM_LABEL,
+                                       VS_COMMANDS,   VS_BM_LIST,       VS_BM_LISTALL,       VS_CLOSEPANEL,   VS_BM_CLEARALL,
        // thumb cluster
        KC_TRNS, KC_TRNS,
        KC_TRNS,

From 101f5044359fed6455bccd9f99afa6d5cbdbbf13 Mon Sep 17 00:00:00 2001
From: Chuck Lauer Vose <vosechu@gmail.com>
Date: Mon, 10 Jan 2022 19:53:54 -0500
Subject: [PATCH 228/867] [Keyboard] Rename Laptreus to Shapeshifter4060
 (#15655)

---
 keyboards/laptreus/keymaps/debug/keymap.c     | 11 ---
 keyboards/laptreus/keymaps/vosechu/readme.md  |  0
 keyboards/laptreus/laptreus.c                 |  6 --
 keyboards/laptreus/laptreus.h                 | 19 -----
 keyboards/laptreus/readme.md                  | 35 --------
 .../{laptreus => shapeshifter4060}/config.h   | 18 ++--
 .../{laptreus => shapeshifter4060}/info.json  |  4 +-
 .../shapeshifter4060/keymaps/debug/keymap.c   | 28 +++++++
 .../keymaps/debug/readme.md                   |  8 +-
 .../keymaps/default/keymap.c                  | 17 ++++
 .../keymaps/default/readme.md                 |  2 +-
 .../keymaps/vosechu/keymap.c                  | 17 ++++
 .../keymaps/vosechu/readme.md                 | 82 +++++++++++++++++++
 keyboards/shapeshifter4060/readme.md          | 37 +++++++++
 .../{laptreus => shapeshifter4060}/rules.mk   |  6 --
 keyboards/shapeshifter4060/shapeshifter4060.c | 18 ++++
 keyboards/shapeshifter4060/shapeshifter4060.h | 34 ++++++++
 17 files changed, 251 insertions(+), 91 deletions(-)
 delete mode 100644 keyboards/laptreus/keymaps/debug/keymap.c
 delete mode 100644 keyboards/laptreus/keymaps/vosechu/readme.md
 delete mode 100644 keyboards/laptreus/laptreus.c
 delete mode 100644 keyboards/laptreus/laptreus.h
 delete mode 100644 keyboards/laptreus/readme.md
 rename keyboards/{laptreus => shapeshifter4060}/config.h (79%)
 rename keyboards/{laptreus => shapeshifter4060}/info.json (95%)
 create mode 100644 keyboards/shapeshifter4060/keymaps/debug/keymap.c
 rename keyboards/{laptreus => shapeshifter4060}/keymaps/debug/readme.md (94%)
 rename keyboards/{laptreus => shapeshifter4060}/keymaps/default/keymap.c (84%)
 rename keyboards/{laptreus => shapeshifter4060}/keymaps/default/readme.md (98%)
 rename keyboards/{laptreus => shapeshifter4060}/keymaps/vosechu/keymap.c (79%)
 create mode 100644 keyboards/shapeshifter4060/keymaps/vosechu/readme.md
 create mode 100644 keyboards/shapeshifter4060/readme.md
 rename keyboards/{laptreus => shapeshifter4060}/rules.mk (85%)
 create mode 100644 keyboards/shapeshifter4060/shapeshifter4060.c
 create mode 100644 keyboards/shapeshifter4060/shapeshifter4060.h

diff --git a/keyboards/laptreus/keymaps/debug/keymap.c b/keyboards/laptreus/keymaps/debug/keymap.c
deleted file mode 100644
index 8ffb06fa25..0000000000
--- a/keyboards/laptreus/keymaps/debug/keymap.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* ============================= DEBUG LAYER ============================= */
-  [0] = LAYOUT(
-    KC_A, KC_1, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,
-    KC_A, KC_2, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,
-    KC_A, KC_3, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,
-    KC_A, KC_4, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L
-  )
-};
diff --git a/keyboards/laptreus/keymaps/vosechu/readme.md b/keyboards/laptreus/keymaps/vosechu/readme.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/laptreus/laptreus.c b/keyboards/laptreus/laptreus.c
deleted file mode 100644
index 2e59ffd622..0000000000
--- a/keyboards/laptreus/laptreus.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "laptreus.h"
-
-void matrix_init_kb() {
-  // auto detect output on init
-  set_output(OUTPUT_AUTO);
-}
diff --git a/keyboards/laptreus/laptreus.h b/keyboards/laptreus/laptreus.h
deleted file mode 100644
index 2e7932e494..0000000000
--- a/keyboards/laptreus/laptreus.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#include "outputselect.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    k40, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k49, \
-    k41, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k48, \
-    k42, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k47, \
-    k43, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k46 \
-) { \
-    { 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, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, XXX, XXX, k46, k47, k48, k49 } \
-}
diff --git a/keyboards/laptreus/readme.md b/keyboards/laptreus/readme.md
deleted file mode 100644
index e27c206048..0000000000
--- a/keyboards/laptreus/readme.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Laptreus
-
-TODO: Insert cool photo
-
-Laptreus is a 40% bluetooth keyboard in the style of the Atreus, which is specifically designed to sit atop your laptop keyboard.
-
-Maintainer: [Chuck Lauer Vose](https://github.com/vosechu)
-MCU: Adafruit Feather 32u4 BLE
-Purchase link: GB coming soon
-Case link: GB coming soon
-Case design files: TODO
-
-## Flashing
-
-**NOTE**: Make sure you don't have a second QMK keyboard plugged in when you do this!
-
-[Default layout documentation](https://github.com/qmk/qmk_firmware/tree/master/keyboards/laptreus/keymaps/default)
-
-To compile and flash to the board:
-
-    make laptreus:default:avrdude
-
-To just compile:
-
-    make laptreus:default
-
-Then use QMK toolbox to write the file
-
-## Changelog
-
-v1.2: Mostly working, but JST connector is a little too tight and the reset switch is not connected.
-
-## Build log
-
-TODO
diff --git a/keyboards/laptreus/config.h b/keyboards/shapeshifter4060/config.h
similarity index 79%
rename from keyboards/laptreus/config.h
rename to keyboards/shapeshifter4060/config.h
index 0c13da4bd6..c8953821a7 100644
--- a/keyboards/laptreus/config.h
+++ b/keyboards/shapeshifter4060/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Chuck "@vosechu" Lauer Vose <vosechu@gmail.com>
+Copyright 2021 Chuck "@vosechu" Lauer Vose <vosechu@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -22,18 +22,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* USB Device descriptor parameter */
 
 #define VENDOR_ID       0x1209 // pid.codes Vendor ID
-#define PRODUCT_ID      0xA1F1 // FIXME: Need to send PR to pid.codes to make this official
-#define DEVICE_VER      0x0001
+#define PRODUCT_ID      0xA1F1 // Shapeshifter 4060: https://pid.codes/1209/A1F1/
+#define DEVICE_VER      0x0002
 #define MANUFACTURER    Vosechu
-#define PRODUCT         Laptreus
+#define PRODUCT         Shapeshifter 4060
 
 /* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 10
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
 
-#define MATRIX_ROW_PINS { F7, F6, F5, F1, F4 }
-#define MATRIX_COL_PINS { D6, B7, B6, D7, C6, D1, D0, D3, D2, F0 }
-#define UNUSED_PINS     { }
+#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
+#define MATRIX_COL_PINS { D0, D1, B1, B3, B2, B6, B5, B4, E6, D7, C6, D4 }
+#define UNUSED_PINS     { D2, D3 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/laptreus/info.json b/keyboards/shapeshifter4060/info.json
similarity index 95%
rename from keyboards/laptreus/info.json
rename to keyboards/shapeshifter4060/info.json
index f82cc8419d..5ec2bc2b03 100644
--- a/keyboards/laptreus/info.json
+++ b/keyboards/shapeshifter4060/info.json
@@ -1,6 +1,6 @@
 {
-    "keyboard_name": "Laptreus",
-    "url": "",
+    "keyboard_name": "Shapeshifter 4060",
+    "url": "kitsunekeyboards.com",
     "maintainer": "vosechu",
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/shapeshifter4060/keymaps/debug/keymap.c b/keyboards/shapeshifter4060/keymaps/debug/keymap.c
new file mode 100644
index 0000000000..06f9d8ea8f
--- /dev/null
+++ b/keyboards/shapeshifter4060/keymaps/debug/keymap.c
@@ -0,0 +1,28 @@
+/*
+Copyright 2021 Chuck "@vosechu" Lauer Vose <vosechu@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* ============================= DEBUG LAYER ============================= */
+  [0] = LAYOUT(
+    KC_A, KC_1, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,
+    KC_A, KC_2, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,
+    KC_A, KC_3, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,
+    KC_A, KC_4, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L
+  )
+};
diff --git a/keyboards/laptreus/keymaps/debug/readme.md b/keyboards/shapeshifter4060/keymaps/debug/readme.md
similarity index 94%
rename from keyboards/laptreus/keymaps/debug/readme.md
rename to keyboards/shapeshifter4060/keymaps/debug/readme.md
index fa4a27eda8..3dcbc27ae7 100644
--- a/keyboards/laptreus/keymaps/debug/readme.md
+++ b/keyboards/shapeshifter4060/keymaps/debug/readme.md
@@ -8,11 +8,15 @@ This layout is expressly for debugging to see if your keys are working.
 
 To compile and flash to the board:
 
-    make laptreus:debug:avrdude
+    make shapeshifter4060:debug:avrdude
+    
+If you want to use this with a Proton C, do this instead:
+
+    make shapeshifter4060:debug CTPC=yes
 
 To just compile:
 
-    make laptreus:debug
+    make shapeshifter4060:debug
 
 Then use QMK toolbox to write the file
 
diff --git a/keyboards/laptreus/keymaps/default/keymap.c b/keyboards/shapeshifter4060/keymaps/default/keymap.c
similarity index 84%
rename from keyboards/laptreus/keymaps/default/keymap.c
rename to keyboards/shapeshifter4060/keymaps/default/keymap.c
index b0e1c9f023..e390b5a36f 100644
--- a/keyboards/laptreus/keymaps/default/keymap.c
+++ b/keyboards/shapeshifter4060/keymaps/default/keymap.c
@@ -1,3 +1,20 @@
+/*
+Copyright 2021 Chuck "@vosechu" Lauer Vose <vosechu@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include QMK_KEYBOARD_H
 
 enum layer_names {
diff --git a/keyboards/laptreus/keymaps/default/readme.md b/keyboards/shapeshifter4060/keymaps/default/readme.md
similarity index 98%
rename from keyboards/laptreus/keymaps/default/readme.md
rename to keyboards/shapeshifter4060/keymaps/default/readme.md
index 0124ab9a9f..9dbe80e645 100644
--- a/keyboards/laptreus/keymaps/default/readme.md
+++ b/keyboards/shapeshifter4060/keymaps/default/readme.md
@@ -1,6 +1,6 @@
 # Default layout
 
-This is the default layout for the Laptreus
+This is the default layout for the Shapeshifter 4060
 
 ## Layout
 
diff --git a/keyboards/laptreus/keymaps/vosechu/keymap.c b/keyboards/shapeshifter4060/keymaps/vosechu/keymap.c
similarity index 79%
rename from keyboards/laptreus/keymaps/vosechu/keymap.c
rename to keyboards/shapeshifter4060/keymaps/vosechu/keymap.c
index 8bb08a8732..eb04506ec0 100644
--- a/keyboards/laptreus/keymaps/vosechu/keymap.c
+++ b/keyboards/shapeshifter4060/keymaps/vosechu/keymap.c
@@ -1,3 +1,20 @@
+/*
+Copyright 2021 Chuck "@vosechu" Lauer Vose <vosechu@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #include QMK_KEYBOARD_H
 
 #include "vosechu.h"
diff --git a/keyboards/shapeshifter4060/keymaps/vosechu/readme.md b/keyboards/shapeshifter4060/keymaps/vosechu/readme.md
new file mode 100644
index 0000000000..a438e5536d
--- /dev/null
+++ b/keyboards/shapeshifter4060/keymaps/vosechu/readme.md
@@ -0,0 +1,82 @@
+# Vosechu layout
+
+This is my personal layout for the Shapeshifter. It's taken a long time to get 
+to this point, but I think there are some things that are cool and special about
+it. 
+
+## Layout
+
+Some special things:
+
+* Lower/Raise are on the F/J keys. Tap to type the character, hold to activate the layer
+* Enter and Backspace also activate the Lift layer.
+* -- To get repeated backspace, hold BkLft and then press Shift
+
+
+### Dvorak
+
+    ,-----------------------------------------------------------------------------------.
+    | Nada |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Reset|
+    |------+------+------+------+------+-------------+------+------+------+------+------|
+    |  Esc |   A  |   O  |   E  | Lwr/U|   I  |   D  | Rse/H|   T  |   N  |   S  | Nada |
+    |------+------+------+------+------+------|------+------+------+------+------+------|
+    | Nada |   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  | Enter|
+    |------+------+------+------+------+------+------+------+------+------+------+------|
+    | Nada |Ctrl/~|AltTab|  Cmd | BkLft| Shift| Space|EntLft|   -  |   =  |   /  |   \  |
+    `-----------------------------------------------------------------------------------'
+
+### Qwerty
+
+    ,-----------------------------------------------------------------------------------.
+    |  Tab |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Back |
+    |------+------+------+------+------+-------------+------+------+------+------+------|
+    |  Esc |   A  |   S  |   D  | Lwr/F|   G  |   H  | Rse/J|   K  |   L  |   ;  |   "  |
+    |------+------+------+------+------+------|------+------+------+------+------+------|
+    | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | Enter|
+    |------+------+------+------+------+------+------+------+------+------+------+------|
+    | Hyper|Ctrl/~|AltTab|  Cmd | BkLft| Shift| Space|EntLft| Left | Down |  Up  | Right|
+    `-----------------------------------------------------------------------------------'
+
+### Raise
+
+    ,-----------------------------------------------------------------------------------.
+    |      |  <   |  >   |  {   |  }   |      |      |      |      |      |      |      |
+    |------+------+------+------+------+-------------+------+------+------+------+------|
+    |      |  (   |  )   |  [   |  ]   |      |      |      |      |      |      |      |
+    |------+------+------+------+------+------|------+------+------+------+------+------|
+    |      |      |      |      |      |      |      |      |      |      |      |      |
+    |------+------+------+------+------+------+------+------+------+------+------+------|
+    |      |      |      |      | BkLft| Shift| Space|EntLft|      |      |      |      |
+    `-----------------------------------------------------------------------------------'
+
+### Lower
+
+    ,-----------------------------------------------------------------------------------.
+    |      |      |      |      |      |      |      |   7  |   8  |   9  |      |      |
+    |------+------+------+------+------+-------------+------+------+------+------+------|
+    |      |      |      |      |      |      |      |   4  |   5  |   6  |      |      |
+    |------+------+------+------+------+------|------+------+------+------+------+------|
+    |      |      |      |      |      |      |      |   1  |   2  |   3  |      |      |
+    |------+------+------+------+------+------+------+------+------+------+------+------|
+    |      |      |      |      | BkLft| Shift| Space|   0  |   0  |   .  |      |      |
+    `-----------------------------------------------------------------------------------'
+
+### Lift
+
+    ,-----------------------------------------------------------------------------------.
+    |      |Hist ←| Tab ←|  ↑   | Tab →|Hist →| Mute |      |ScrLft|ScrFul|ScrRgt|      |
+    |------+------+------+------+------+-------------+------+------+------+------+------|
+    |      |      |  ←   |  ↓   |  →   | Pg Up|Vol up|Slk up|      |      |Qwerty|      |
+    |------+------+------+------+------+------|------+------+------+------+------+------|
+    |      |      |      |      |      | Pg Dn|Vol dn|Slk dn|      |      |Dvorak|      |
+    |------+------+------+------+------+------+------+------+------+------+------+------|
+    |      | Reset|      |      |      | Bksp |      | Shift|  Cmd |  Opt | Ctrl |      |
+    `-----------------------------------------------------------------------------------'
+
+Special things:
+
+* Hist: Back button in your browser
+* Tab: Move one tab left/right in most mac apps
+* Slk: Go to the previous/next unread conversation in Slack
+* Scr: Make this app fill the left/right side of your monitor (or full screen)
+* Since arrows are on this layer, the command keys are moved to the right side
diff --git a/keyboards/shapeshifter4060/readme.md b/keyboards/shapeshifter4060/readme.md
new file mode 100644
index 0000000000..2f134ce15b
--- /dev/null
+++ b/keyboards/shapeshifter4060/readme.md
@@ -0,0 +1,37 @@
+Shapeshifter 4060
+![Shapeshifter 4060](#TODO)
+
+The Shapeshifter 4060 is a 40% keyboard that takes inspiration from the Atreus and makes it accessible by putting it on a standard-sized 60% keyboard pcb. Ergonomics should be accessible by anyone!
+
+Keyboard Maintainer: [Chuck Lauer Vose](https://github.com/vosechu)
+Hardware Supported: Kitsune Shapeshifter 4060 (v3.0.3) with a Pro Micro Compatible board / Proton C
+Hardware Availability: GB coming soon
+
+Make example for this keyboard (after setting up your build environment):
+
+    make shapeshifter4060:default
+    
+For use with the Proton C
+    
+    make shapeshifter4060:default CTPC=yes
+    
+Flashing example for this keyboard:
+
+    make shapeshifter4060:default:flash
+    
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+-   **Physical reset button**: Briefly press the button on the top of the PCB
+-   **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+## Changelog
+
+v3.0.3: Complete rewrite using a standard pro micro pinout.
+
+## Build log
+
+https://docs.google.com/document/d/1ml2rBdiO6GhrUx2HyLqip0i24bCU8d-fQR8adSEPWzQ/edit
diff --git a/keyboards/laptreus/rules.mk b/keyboards/shapeshifter4060/rules.mk
similarity index 85%
rename from keyboards/laptreus/rules.mk
rename to keyboards/shapeshifter4060/rules.mk
index 687d837857..00cb7fbcf7 100644
--- a/keyboards/laptreus/rules.mk
+++ b/keyboards/shapeshifter4060/rules.mk
@@ -1,9 +1,6 @@
 # MCU name
 MCU = atmega32u4
 
-# Processor frequency
-F_CPU = 8000000
-
 # Bootloader selection
 BOOTLOADER = caterina
 
@@ -18,6 +15,3 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 #BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 KEY_LOCK_ENABLE = no
-
-BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
diff --git a/keyboards/shapeshifter4060/shapeshifter4060.c b/keyboards/shapeshifter4060/shapeshifter4060.c
new file mode 100644
index 0000000000..abe6d65e76
--- /dev/null
+++ b/keyboards/shapeshifter4060/shapeshifter4060.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Chuck "@vosechu" Lauer Vose <vosechu@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "shapeshifter4060.h"
diff --git a/keyboards/shapeshifter4060/shapeshifter4060.h b/keyboards/shapeshifter4060/shapeshifter4060.h
new file mode 100644
index 0000000000..0c5bd7e089
--- /dev/null
+++ b/keyboards/shapeshifter4060/shapeshifter4060.h
@@ -0,0 +1,34 @@
+/*
+Copyright 2021 Chuck "@vosechu" Lauer Vose <vosechu@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    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, \
+    k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47 \
+) { \
+    { 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 }, \
+    { k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47 }, \
+}

From 069ef7eb9eb454f47016ca8b7688b647a1e56583 Mon Sep 17 00:00:00 2001
From: adlainewson <adlainewson@users.noreply.github.com>
Date: Mon, 10 Jan 2022 16:54:22 -0800
Subject: [PATCH 229/867] [Docs] newbs_flashing.md: add link to build
 environment section (#15654)

---
 docs/newbs_flashing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/newbs_flashing.md b/docs/newbs_flashing.md
index c17ff4c956..6e90af9d10 100644
--- a/docs/newbs_flashing.md
+++ b/docs/newbs_flashing.md
@@ -96,7 +96,7 @@ This has been made pretty simple compared to what it used to be. When you are re
 
     qmk flash
 
-If you have not configured your keyboard/keymap name in the CLI, or you have multiple keyboards, you can specify the keyboard and keymap:
+If you did not configure your keyboard/keymap name in the CLI according to the [Configure your build environment](newbs_getting_started.md) section, or you have multiple keyboards, you can specify the keyboard and keymap:
 
     qmk flash -kb <my_keyboard> -km <my_keymap>
 

From c08ed73216428d3b810fb6dd05f0db29bd839738 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:55:37 +0800
Subject: [PATCH 230/867] [Keyboard] move ymd75 to ymdk vendor folder (#15645)

---
 keyboards/ymd75/ymd75.h                               | 11 -----------
 keyboards/{ => ymdk}/ymd75/config.h                   |  0
 keyboards/{ => ymdk}/ymd75/info.json                  |  0
 keyboards/{ => ymdk}/ymd75/keymaps/default/keymap.c   |  0
 .../{ => ymdk}/ymd75/keymaps/default_iso/keymap.c     |  0
 .../ymd75/keymaps/default_iso_rwkl/keymap.c           |  0
 keyboards/{ => ymdk}/ymd75/keymaps/via/keymap.c       |  0
 keyboards/{ => ymdk}/ymd75/keymaps/via/rules.mk       |  0
 keyboards/{ => ymdk}/ymd75/readme.md                  |  4 ++--
 keyboards/{ => ymdk}/ymd75/rev1/.noci                 |  0
 keyboards/{ => ymdk}/ymd75/rev1/config.h              |  0
 keyboards/{ => ymdk}/ymd75/rev1/rev1.c                |  0
 keyboards/{ => ymdk}/ymd75/rev1/rev1.h                |  0
 keyboards/{ => ymdk}/ymd75/rev1/rules.mk              |  0
 keyboards/{ => ymdk}/ymd75/rev2/.noci                 |  0
 keyboards/{ => ymdk}/ymd75/rev2/config.h              |  0
 keyboards/{ => ymdk}/ymd75/rev2/rev2.c                |  0
 keyboards/{ => ymdk}/ymd75/rev2/rev2.h                |  0
 keyboards/{ => ymdk}/ymd75/rev2/rules.mk              |  0
 keyboards/{ => ymdk}/ymd75/rev3/config.h              |  0
 keyboards/{ => ymdk}/ymd75/rev3/rev3.c                |  0
 keyboards/{ => ymdk}/ymd75/rev3/rev3.h                |  0
 keyboards/{ => ymdk}/ymd75/rev3/rules.mk              |  0
 keyboards/{ => ymdk}/ymd75/rules.mk                   |  0
 keyboards/{ => ymdk}/ymd75/ymd75.c                    |  0
 keyboards/ymdk/ymd75/ymd75.h                          | 11 +++++++++++
 26 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 keyboards/ymd75/ymd75.h
 rename keyboards/{ => ymdk}/ymd75/config.h (100%)
 rename keyboards/{ => ymdk}/ymd75/info.json (100%)
 rename keyboards/{ => ymdk}/ymd75/keymaps/default/keymap.c (100%)
 rename keyboards/{ => ymdk}/ymd75/keymaps/default_iso/keymap.c (100%)
 rename keyboards/{ => ymdk}/ymd75/keymaps/default_iso_rwkl/keymap.c (100%)
 rename keyboards/{ => ymdk}/ymd75/keymaps/via/keymap.c (100%)
 rename keyboards/{ => ymdk}/ymd75/keymaps/via/rules.mk (100%)
 rename keyboards/{ => ymdk}/ymd75/readme.md (94%)
 rename keyboards/{ => ymdk}/ymd75/rev1/.noci (100%)
 rename keyboards/{ => ymdk}/ymd75/rev1/config.h (100%)
 rename keyboards/{ => ymdk}/ymd75/rev1/rev1.c (100%)
 rename keyboards/{ => ymdk}/ymd75/rev1/rev1.h (100%)
 rename keyboards/{ => ymdk}/ymd75/rev1/rules.mk (100%)
 rename keyboards/{ => ymdk}/ymd75/rev2/.noci (100%)
 rename keyboards/{ => ymdk}/ymd75/rev2/config.h (100%)
 rename keyboards/{ => ymdk}/ymd75/rev2/rev2.c (100%)
 rename keyboards/{ => ymdk}/ymd75/rev2/rev2.h (100%)
 rename keyboards/{ => ymdk}/ymd75/rev2/rules.mk (100%)
 rename keyboards/{ => ymdk}/ymd75/rev3/config.h (100%)
 rename keyboards/{ => ymdk}/ymd75/rev3/rev3.c (100%)
 rename keyboards/{ => ymdk}/ymd75/rev3/rev3.h (100%)
 rename keyboards/{ => ymdk}/ymd75/rev3/rules.mk (100%)
 rename keyboards/{ => ymdk}/ymd75/rules.mk (100%)
 rename keyboards/{ => ymdk}/ymd75/ymd75.c (100%)
 create mode 100644 keyboards/ymdk/ymd75/ymd75.h

diff --git a/keyboards/ymd75/ymd75.h b/keyboards/ymd75/ymd75.h
deleted file mode 100644
index 134f08060f..0000000000
--- a/keyboards/ymd75/ymd75.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#if defined(KEYBOARD_ymd75_rev1)
-    #include "rev1.h"
-#elif defined(KEYBOARD_ymd75_rev2)
-    #include "rev2.h"
-#elif defined(KEYBOARD_ymd75_rev3)
-    #include "rev3.h"
-#endif
diff --git a/keyboards/ymd75/config.h b/keyboards/ymdk/ymd75/config.h
similarity index 100%
rename from keyboards/ymd75/config.h
rename to keyboards/ymdk/ymd75/config.h
diff --git a/keyboards/ymd75/info.json b/keyboards/ymdk/ymd75/info.json
similarity index 100%
rename from keyboards/ymd75/info.json
rename to keyboards/ymdk/ymd75/info.json
diff --git a/keyboards/ymd75/keymaps/default/keymap.c b/keyboards/ymdk/ymd75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ymd75/keymaps/default/keymap.c
rename to keyboards/ymdk/ymd75/keymaps/default/keymap.c
diff --git a/keyboards/ymd75/keymaps/default_iso/keymap.c b/keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c
similarity index 100%
rename from keyboards/ymd75/keymaps/default_iso/keymap.c
rename to keyboards/ymdk/ymd75/keymaps/default_iso/keymap.c
diff --git a/keyboards/ymd75/keymaps/default_iso_rwkl/keymap.c b/keyboards/ymdk/ymd75/keymaps/default_iso_rwkl/keymap.c
similarity index 100%
rename from keyboards/ymd75/keymaps/default_iso_rwkl/keymap.c
rename to keyboards/ymdk/ymd75/keymaps/default_iso_rwkl/keymap.c
diff --git a/keyboards/ymd75/keymaps/via/keymap.c b/keyboards/ymdk/ymd75/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ymd75/keymaps/via/keymap.c
rename to keyboards/ymdk/ymd75/keymaps/via/keymap.c
diff --git a/keyboards/ymd75/keymaps/via/rules.mk b/keyboards/ymdk/ymd75/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ymd75/keymaps/via/rules.mk
rename to keyboards/ymdk/ymd75/keymaps/via/rules.mk
diff --git a/keyboards/ymd75/readme.md b/keyboards/ymdk/ymd75/readme.md
similarity index 94%
rename from keyboards/ymd75/readme.md
rename to keyboards/ymdk/ymd75/readme.md
index 99e9f656c0..78b4d089af 100644
--- a/keyboards/ymd75/readme.md
+++ b/keyboards/ymdk/ymd75/readme.md
@@ -13,11 +13,11 @@ This firmware can also be flashed onto the KBDFans KBD75 Round 2 Bootmapper Clie
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ymd75/rev1:default
+    make ymdk/ymd75/rev1:default
 
 Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
 
-    make ymd75/rev1:default:flash
+    make ymdk/ymd75/rev1:default:flash
 
 **Reset Key**: Hold down the key located at *Key below the top right key*, commonly programmed as *Backspace* while plugging in the keyboard. On PCB revision 2, enter the bootloader by holding `L_CTRL` while plugging in the keyboard.
 
diff --git a/keyboards/ymd75/rev1/.noci b/keyboards/ymdk/ymd75/rev1/.noci
similarity index 100%
rename from keyboards/ymd75/rev1/.noci
rename to keyboards/ymdk/ymd75/rev1/.noci
diff --git a/keyboards/ymd75/rev1/config.h b/keyboards/ymdk/ymd75/rev1/config.h
similarity index 100%
rename from keyboards/ymd75/rev1/config.h
rename to keyboards/ymdk/ymd75/rev1/config.h
diff --git a/keyboards/ymd75/rev1/rev1.c b/keyboards/ymdk/ymd75/rev1/rev1.c
similarity index 100%
rename from keyboards/ymd75/rev1/rev1.c
rename to keyboards/ymdk/ymd75/rev1/rev1.c
diff --git a/keyboards/ymd75/rev1/rev1.h b/keyboards/ymdk/ymd75/rev1/rev1.h
similarity index 100%
rename from keyboards/ymd75/rev1/rev1.h
rename to keyboards/ymdk/ymd75/rev1/rev1.h
diff --git a/keyboards/ymd75/rev1/rules.mk b/keyboards/ymdk/ymd75/rev1/rules.mk
similarity index 100%
rename from keyboards/ymd75/rev1/rules.mk
rename to keyboards/ymdk/ymd75/rev1/rules.mk
diff --git a/keyboards/ymd75/rev2/.noci b/keyboards/ymdk/ymd75/rev2/.noci
similarity index 100%
rename from keyboards/ymd75/rev2/.noci
rename to keyboards/ymdk/ymd75/rev2/.noci
diff --git a/keyboards/ymd75/rev2/config.h b/keyboards/ymdk/ymd75/rev2/config.h
similarity index 100%
rename from keyboards/ymd75/rev2/config.h
rename to keyboards/ymdk/ymd75/rev2/config.h
diff --git a/keyboards/ymd75/rev2/rev2.c b/keyboards/ymdk/ymd75/rev2/rev2.c
similarity index 100%
rename from keyboards/ymd75/rev2/rev2.c
rename to keyboards/ymdk/ymd75/rev2/rev2.c
diff --git a/keyboards/ymd75/rev2/rev2.h b/keyboards/ymdk/ymd75/rev2/rev2.h
similarity index 100%
rename from keyboards/ymd75/rev2/rev2.h
rename to keyboards/ymdk/ymd75/rev2/rev2.h
diff --git a/keyboards/ymd75/rev2/rules.mk b/keyboards/ymdk/ymd75/rev2/rules.mk
similarity index 100%
rename from keyboards/ymd75/rev2/rules.mk
rename to keyboards/ymdk/ymd75/rev2/rules.mk
diff --git a/keyboards/ymd75/rev3/config.h b/keyboards/ymdk/ymd75/rev3/config.h
similarity index 100%
rename from keyboards/ymd75/rev3/config.h
rename to keyboards/ymdk/ymd75/rev3/config.h
diff --git a/keyboards/ymd75/rev3/rev3.c b/keyboards/ymdk/ymd75/rev3/rev3.c
similarity index 100%
rename from keyboards/ymd75/rev3/rev3.c
rename to keyboards/ymdk/ymd75/rev3/rev3.c
diff --git a/keyboards/ymd75/rev3/rev3.h b/keyboards/ymdk/ymd75/rev3/rev3.h
similarity index 100%
rename from keyboards/ymd75/rev3/rev3.h
rename to keyboards/ymdk/ymd75/rev3/rev3.h
diff --git a/keyboards/ymd75/rev3/rules.mk b/keyboards/ymdk/ymd75/rev3/rules.mk
similarity index 100%
rename from keyboards/ymd75/rev3/rules.mk
rename to keyboards/ymdk/ymd75/rev3/rules.mk
diff --git a/keyboards/ymd75/rules.mk b/keyboards/ymdk/ymd75/rules.mk
similarity index 100%
rename from keyboards/ymd75/rules.mk
rename to keyboards/ymdk/ymd75/rules.mk
diff --git a/keyboards/ymd75/ymd75.c b/keyboards/ymdk/ymd75/ymd75.c
similarity index 100%
rename from keyboards/ymd75/ymd75.c
rename to keyboards/ymdk/ymd75/ymd75.c
diff --git a/keyboards/ymdk/ymd75/ymd75.h b/keyboards/ymdk/ymd75/ymd75.h
new file mode 100644
index 0000000000..dbaf93e7db
--- /dev/null
+++ b/keyboards/ymdk/ymd75/ymd75.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "quantum.h"
+
+#if defined(KEYBOARD_ymdk_ymd75_rev1)
+    #include "rev1.h"
+#elif defined(KEYBOARD_ymdk_ymd75_rev2)
+    #include "rev2.h"
+#elif defined(KEYBOARD_ymdk_ymd75_rev3)
+    #include "rev3.h"
+#endif

From 65e7d0c01f4524db24b66a9dcb692f3557cf8c46 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:55:58 +0800
Subject: [PATCH 231/867] [Keyboard] move ymd96 to ymdk vendor folder (#15643)

---
 keyboards/{ => ymdk}/ymd96/config.h                         | 0
 keyboards/{ => ymdk}/ymd96/info.json                        | 0
 keyboards/{ => ymdk}/ymd96/keymaps/AnthonyWharton/README.md | 0
 keyboards/{ => ymdk}/ymd96/keymaps/AnthonyWharton/config.h  | 0
 keyboards/{ => ymdk}/ymd96/keymaps/AnthonyWharton/keymap.c  | 0
 keyboards/{ => ymdk}/ymd96/keymaps/default/keymap.c         | 0
 keyboards/{ => ymdk}/ymd96/keymaps/epx/keymap.c             | 0
 keyboards/{ => ymdk}/ymd96/keymaps/hgoel89/config.h         | 0
 keyboards/{ => ymdk}/ymd96/keymaps/hgoel89/keymap.c         | 0
 keyboards/{ => ymdk}/ymd96/keymaps/hgoel89/readme.md        | 0
 keyboards/{ => ymdk}/ymd96/keymaps/hgoel89/rules.mk         | 0
 keyboards/{ => ymdk}/ymd96/readme.md                        | 4 ++--
 keyboards/{ => ymdk}/ymd96/rules.mk                         | 0
 keyboards/{ => ymdk}/ymd96/ymd96.c                          | 0
 keyboards/{ => ymdk}/ymd96/ymd96.h                          | 0
 15 files changed, 2 insertions(+), 2 deletions(-)
 rename keyboards/{ => ymdk}/ymd96/config.h (100%)
 rename keyboards/{ => ymdk}/ymd96/info.json (100%)
 rename keyboards/{ => ymdk}/ymd96/keymaps/AnthonyWharton/README.md (100%)
 rename keyboards/{ => ymdk}/ymd96/keymaps/AnthonyWharton/config.h (100%)
 rename keyboards/{ => ymdk}/ymd96/keymaps/AnthonyWharton/keymap.c (100%)
 rename keyboards/{ => ymdk}/ymd96/keymaps/default/keymap.c (100%)
 rename keyboards/{ => ymdk}/ymd96/keymaps/epx/keymap.c (100%)
 rename keyboards/{ => ymdk}/ymd96/keymaps/hgoel89/config.h (100%)
 rename keyboards/{ => ymdk}/ymd96/keymaps/hgoel89/keymap.c (100%)
 rename keyboards/{ => ymdk}/ymd96/keymaps/hgoel89/readme.md (100%)
 rename keyboards/{ => ymdk}/ymd96/keymaps/hgoel89/rules.mk (100%)
 rename keyboards/{ => ymdk}/ymd96/readme.md (94%)
 rename keyboards/{ => ymdk}/ymd96/rules.mk (100%)
 rename keyboards/{ => ymdk}/ymd96/ymd96.c (100%)
 rename keyboards/{ => ymdk}/ymd96/ymd96.h (100%)

diff --git a/keyboards/ymd96/config.h b/keyboards/ymdk/ymd96/config.h
similarity index 100%
rename from keyboards/ymd96/config.h
rename to keyboards/ymdk/ymd96/config.h
diff --git a/keyboards/ymd96/info.json b/keyboards/ymdk/ymd96/info.json
similarity index 100%
rename from keyboards/ymd96/info.json
rename to keyboards/ymdk/ymd96/info.json
diff --git a/keyboards/ymd96/keymaps/AnthonyWharton/README.md b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/README.md
similarity index 100%
rename from keyboards/ymd96/keymaps/AnthonyWharton/README.md
rename to keyboards/ymdk/ymd96/keymaps/AnthonyWharton/README.md
diff --git a/keyboards/ymd96/keymaps/AnthonyWharton/config.h b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/config.h
similarity index 100%
rename from keyboards/ymd96/keymaps/AnthonyWharton/config.h
rename to keyboards/ymdk/ymd96/keymaps/AnthonyWharton/config.h
diff --git a/keyboards/ymd96/keymaps/AnthonyWharton/keymap.c b/keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
similarity index 100%
rename from keyboards/ymd96/keymaps/AnthonyWharton/keymap.c
rename to keyboards/ymdk/ymd96/keymaps/AnthonyWharton/keymap.c
diff --git a/keyboards/ymd96/keymaps/default/keymap.c b/keyboards/ymdk/ymd96/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ymd96/keymaps/default/keymap.c
rename to keyboards/ymdk/ymd96/keymaps/default/keymap.c
diff --git a/keyboards/ymd96/keymaps/epx/keymap.c b/keyboards/ymdk/ymd96/keymaps/epx/keymap.c
similarity index 100%
rename from keyboards/ymd96/keymaps/epx/keymap.c
rename to keyboards/ymdk/ymd96/keymaps/epx/keymap.c
diff --git a/keyboards/ymd96/keymaps/hgoel89/config.h b/keyboards/ymdk/ymd96/keymaps/hgoel89/config.h
similarity index 100%
rename from keyboards/ymd96/keymaps/hgoel89/config.h
rename to keyboards/ymdk/ymd96/keymaps/hgoel89/config.h
diff --git a/keyboards/ymd96/keymaps/hgoel89/keymap.c b/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
similarity index 100%
rename from keyboards/ymd96/keymaps/hgoel89/keymap.c
rename to keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c
diff --git a/keyboards/ymd96/keymaps/hgoel89/readme.md b/keyboards/ymdk/ymd96/keymaps/hgoel89/readme.md
similarity index 100%
rename from keyboards/ymd96/keymaps/hgoel89/readme.md
rename to keyboards/ymdk/ymd96/keymaps/hgoel89/readme.md
diff --git a/keyboards/ymd96/keymaps/hgoel89/rules.mk b/keyboards/ymdk/ymd96/keymaps/hgoel89/rules.mk
similarity index 100%
rename from keyboards/ymd96/keymaps/hgoel89/rules.mk
rename to keyboards/ymdk/ymd96/keymaps/hgoel89/rules.mk
diff --git a/keyboards/ymd96/readme.md b/keyboards/ymdk/ymd96/readme.md
similarity index 94%
rename from keyboards/ymd96/readme.md
rename to keyboards/ymdk/ymd96/readme.md
index 59d6b73379..6a967a49c2 100644
--- a/keyboards/ymd96/readme.md
+++ b/keyboards/ymdk/ymd96/readme.md
@@ -8,11 +8,11 @@ A 96-keyboard which supports both ANSI and ISO along with many different layout
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ymd96:default
+    make ymdk/ymd96:default
 
 Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
 
-    make ymd96:default:flash
+    make ymdk/ymd96:default:flash
 
 **Reset Key**: Hold down the key commonly programmed as *L_Ctrl* while plugging in the keyboard.
 
diff --git a/keyboards/ymd96/rules.mk b/keyboards/ymdk/ymd96/rules.mk
similarity index 100%
rename from keyboards/ymd96/rules.mk
rename to keyboards/ymdk/ymd96/rules.mk
diff --git a/keyboards/ymd96/ymd96.c b/keyboards/ymdk/ymd96/ymd96.c
similarity index 100%
rename from keyboards/ymd96/ymd96.c
rename to keyboards/ymdk/ymd96/ymd96.c
diff --git a/keyboards/ymd96/ymd96.h b/keyboards/ymdk/ymd96/ymd96.h
similarity index 100%
rename from keyboards/ymd96/ymd96.h
rename to keyboards/ymdk/ymd96/ymd96.h

From 2b212cf692ecc70b587389112bca0a7668cef050 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:56:59 +0800
Subject: [PATCH 232/867] [Keyboard] Rename ymdk_np21 to np21, move to ymdk
 vendor folder (#15641)

---
 keyboards/{ymdk_np21 => ymdk/np21}/config.h                  | 0
 keyboards/{ymdk_np21 => ymdk/np21}/info.json                 | 0
 keyboards/{ymdk_np21 => ymdk/np21}/keymaps/default/keymap.c  | 0
 keyboards/{ymdk_np21 => ymdk/np21}/keymaps/default/readme.md | 0
 keyboards/{ymdk_np21 => ymdk/np21}/keymaps/via/keymap.c      | 0
 keyboards/{ymdk_np21 => ymdk/np21}/keymaps/via/rules.mk      | 0
 keyboards/{ymdk_np21/ymdk_np21.c => ymdk/np21/np21.c}        | 2 +-
 keyboards/{ymdk_np21/ymdk_np21.h => ymdk/np21/np21.h}        | 0
 keyboards/{ymdk_np21 => ymdk/np21}/readme.md                 | 4 ++--
 keyboards/{ymdk_np21 => ymdk/np21}/rules.mk                  | 0
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename keyboards/{ymdk_np21 => ymdk/np21}/config.h (100%)
 rename keyboards/{ymdk_np21 => ymdk/np21}/info.json (100%)
 rename keyboards/{ymdk_np21 => ymdk/np21}/keymaps/default/keymap.c (100%)
 rename keyboards/{ymdk_np21 => ymdk/np21}/keymaps/default/readme.md (100%)
 rename keyboards/{ymdk_np21 => ymdk/np21}/keymaps/via/keymap.c (100%)
 rename keyboards/{ymdk_np21 => ymdk/np21}/keymaps/via/rules.mk (100%)
 rename keyboards/{ymdk_np21/ymdk_np21.c => ymdk/np21/np21.c} (96%)
 rename keyboards/{ymdk_np21/ymdk_np21.h => ymdk/np21/np21.h} (100%)
 rename keyboards/{ymdk_np21 => ymdk/np21}/readme.md (94%)
 rename keyboards/{ymdk_np21 => ymdk/np21}/rules.mk (100%)

diff --git a/keyboards/ymdk_np21/config.h b/keyboards/ymdk/np21/config.h
similarity index 100%
rename from keyboards/ymdk_np21/config.h
rename to keyboards/ymdk/np21/config.h
diff --git a/keyboards/ymdk_np21/info.json b/keyboards/ymdk/np21/info.json
similarity index 100%
rename from keyboards/ymdk_np21/info.json
rename to keyboards/ymdk/np21/info.json
diff --git a/keyboards/ymdk_np21/keymaps/default/keymap.c b/keyboards/ymdk/np21/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ymdk_np21/keymaps/default/keymap.c
rename to keyboards/ymdk/np21/keymaps/default/keymap.c
diff --git a/keyboards/ymdk_np21/keymaps/default/readme.md b/keyboards/ymdk/np21/keymaps/default/readme.md
similarity index 100%
rename from keyboards/ymdk_np21/keymaps/default/readme.md
rename to keyboards/ymdk/np21/keymaps/default/readme.md
diff --git a/keyboards/ymdk_np21/keymaps/via/keymap.c b/keyboards/ymdk/np21/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ymdk_np21/keymaps/via/keymap.c
rename to keyboards/ymdk/np21/keymaps/via/keymap.c
diff --git a/keyboards/ymdk_np21/keymaps/via/rules.mk b/keyboards/ymdk/np21/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ymdk_np21/keymaps/via/rules.mk
rename to keyboards/ymdk/np21/keymaps/via/rules.mk
diff --git a/keyboards/ymdk_np21/ymdk_np21.c b/keyboards/ymdk/np21/np21.c
similarity index 96%
rename from keyboards/ymdk_np21/ymdk_np21.c
rename to keyboards/ymdk/np21/np21.c
index 3ca0e8baa0..824cfb0d1a 100644
--- a/keyboards/ymdk_np21/ymdk_np21.c
+++ b/keyboards/ymdk/np21/np21.c
@@ -16,4 +16,4 @@ 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 "ymdk_np21.h"
+#include "np21.h"
diff --git a/keyboards/ymdk_np21/ymdk_np21.h b/keyboards/ymdk/np21/np21.h
similarity index 100%
rename from keyboards/ymdk_np21/ymdk_np21.h
rename to keyboards/ymdk/np21/np21.h
diff --git a/keyboards/ymdk_np21/readme.md b/keyboards/ymdk/np21/readme.md
similarity index 94%
rename from keyboards/ymdk_np21/readme.md
rename to keyboards/ymdk/np21/readme.md
index decd30b275..e9eaad9b7b 100644
--- a/keyboards/ymdk_np21/readme.md
+++ b/keyboards/ymdk/np21/readme.md
@@ -10,11 +10,11 @@ ps2avrGB based number-pad sold fully assembled by YMDK on Aliexpress.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ymdk_np21:default
+    make ymdk/np21:default
 
 Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
 
-    make ymdk_np21:default:flash
+    make ymdk/np21:default:flash
 
 **Reset Key**: Hold down the 'Top Left Key' (USB on top) while plugging in the keyboard.
 
diff --git a/keyboards/ymdk_np21/rules.mk b/keyboards/ymdk/np21/rules.mk
similarity index 100%
rename from keyboards/ymdk_np21/rules.mk
rename to keyboards/ymdk/np21/rules.mk

From 34602f4b25f24d3238c8e76fe7d65dc8b69bf9c8 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:57:20 +0800
Subject: [PATCH 233/867] [Keyboard] move reviung keyboards to a directory
 (#15636)

---
 keyboards/{ => reviung}/reviung33/config.h                        | 0
 keyboards/{ => reviung}/reviung33/info.json                       | 0
 keyboards/{ => reviung}/reviung33/keymaps/default/keymap.c        | 0
 keyboards/{ => reviung}/reviung33/keymaps/default/readme.md       | 0
 keyboards/{ => reviung}/reviung33/keymaps/default_jp/keymap.c     | 0
 keyboards/{ => reviung}/reviung33/keymaps/default_jp/readme.md    | 0
 keyboards/{ => reviung}/reviung33/readme.md                       | 0
 keyboards/{ => reviung}/reviung33/reviung33.c                     | 0
 keyboards/{ => reviung}/reviung33/reviung33.h                     | 0
 keyboards/{ => reviung}/reviung33/rules.mk                        | 0
 keyboards/{ => reviung}/reviung34/config.h                        | 0
 keyboards/{ => reviung}/reviung34/info.json                       | 0
 keyboards/{ => reviung}/reviung34/keymaps/default/keymap.c        | 0
 keyboards/{ => reviung}/reviung34/keymaps/default/readme.md       | 0
 keyboards/{ => reviung}/reviung34/keymaps/default_2uL/keymap.c    | 0
 keyboards/{ => reviung}/reviung34/keymaps/default_2uL/readme.md   | 0
 keyboards/{ => reviung}/reviung34/keymaps/default_jp/keymap.c     | 0
 keyboards/{ => reviung}/reviung34/keymaps/default_jp/readme.md    | 0
 keyboards/{ => reviung}/reviung34/keymaps/default_rgb/config.h    | 0
 keyboards/{ => reviung}/reviung34/keymaps/default_rgb/keymap.c    | 0
 keyboards/{ => reviung}/reviung34/keymaps/default_rgb/readme.md   | 0
 keyboards/{ => reviung}/reviung34/keymaps/default_rgb/rules.mk    | 0
 keyboards/{ => reviung}/reviung34/keymaps/default_rgb2u/config.h  | 0
 keyboards/{ => reviung}/reviung34/keymaps/default_rgb2u/keymap.c  | 0
 keyboards/{ => reviung}/reviung34/keymaps/default_rgb2u/readme.md | 0
 keyboards/{ => reviung}/reviung34/keymaps/default_rgb2u/rules.mk  | 0
 keyboards/{ => reviung}/reviung34/readme.md                       | 0
 keyboards/{ => reviung}/reviung34/reviung34.c                     | 0
 keyboards/{ => reviung}/reviung34/reviung34.h                     | 0
 keyboards/{ => reviung}/reviung34/rules.mk                        | 0
 keyboards/{ => reviung}/reviung39/config.h                        | 0
 keyboards/{ => reviung}/reviung39/info.json                       | 0
 keyboards/{ => reviung}/reviung39/keymaps/default/config.h        | 0
 keyboards/{ => reviung}/reviung39/keymaps/default/keymap.c        | 0
 keyboards/{ => reviung}/reviung39/keymaps/default/readme.md       | 0
 keyboards/{ => reviung}/reviung39/keymaps/default/rules.mk        | 0
 keyboards/{ => reviung}/reviung39/keymaps/default_s/config.h      | 0
 keyboards/{ => reviung}/reviung39/keymaps/default_s/keymap.c      | 0
 keyboards/{ => reviung}/reviung39/keymaps/default_s/readme.md     | 0
 keyboards/{ => reviung}/reviung39/keymaps/default_s/rules.mk      | 0
 keyboards/{ => reviung}/reviung39/keymaps/toshi0383/config.h      | 0
 keyboards/{ => reviung}/reviung39/keymaps/toshi0383/keymap.c      | 0
 keyboards/{ => reviung}/reviung39/keymaps/toshi0383/readme.md     | 0
 keyboards/{ => reviung}/reviung39/keymaps/toshi0383/rules.mk      | 0
 keyboards/{ => reviung}/reviung39/keymaps/via/keymap.c            | 0
 keyboards/{ => reviung}/reviung39/keymaps/via/rules.mk            | 0
 keyboards/{ => reviung}/reviung39/readme.md                       | 0
 keyboards/{ => reviung}/reviung39/reviung39.c                     | 0
 keyboards/{ => reviung}/reviung39/reviung39.h                     | 0
 keyboards/{ => reviung}/reviung39/rules.mk                        | 0
 keyboards/{ => reviung}/reviung41/config.h                        | 0
 keyboards/{ => reviung}/reviung41/info.json                       | 0
 keyboards/{ => reviung}/reviung41/keymaps/ciutadellla/config.h    | 0
 keyboards/{ => reviung}/reviung41/keymaps/ciutadellla/keymap.c    | 0
 keyboards/{ => reviung}/reviung41/keymaps/ciutadellla/rules.mk    | 0
 keyboards/{ => reviung}/reviung41/keymaps/default/keymap.c        | 0
 keyboards/{ => reviung}/reviung41/keymaps/default/readme.md       | 0
 keyboards/{ => reviung}/reviung41/keymaps/via/keymap.c            | 0
 keyboards/{ => reviung}/reviung41/keymaps/via/rules.mk            | 0
 keyboards/{ => reviung}/reviung41/readme.md                       | 0
 keyboards/{ => reviung}/reviung41/reviung41.c                     | 0
 keyboards/{ => reviung}/reviung41/reviung41.h                     | 0
 keyboards/{ => reviung}/reviung41/rules.mk                        | 0
 keyboards/{ => reviung}/reviung5/config.h                         | 0
 keyboards/{ => reviung}/reviung5/info.json                        | 0
 keyboards/{ => reviung}/reviung5/keymaps/default/keymap.c         | 0
 keyboards/{ => reviung}/reviung5/keymaps/default/readme.md        | 0
 keyboards/{ => reviung}/reviung5/keymaps/default_lre/keymap.c     | 0
 keyboards/{ => reviung}/reviung5/keymaps/default_lre/readme.md    | 0
 keyboards/{ => reviung}/reviung5/keymaps/default_rre/keymap.c     | 0
 keyboards/{ => reviung}/reviung5/keymaps/default_rre/readme.md    | 0
 keyboards/{ => reviung}/reviung5/readme.md                        | 0
 keyboards/{ => reviung}/reviung5/reviung5.c                       | 0
 keyboards/{ => reviung}/reviung5/reviung5.h                       | 0
 keyboards/{ => reviung}/reviung5/rules.mk                         | 0
 keyboards/{ => reviung}/reviung53/config.h                        | 0
 keyboards/{ => reviung}/reviung53/info.json                       | 0
 keyboards/{ => reviung}/reviung53/keymaps/default/keymap.c        | 0
 keyboards/{ => reviung}/reviung53/keymaps/default/readme.md       | 0
 keyboards/{ => reviung}/reviung53/keymaps/via/keymap.c            | 0
 keyboards/{ => reviung}/reviung53/keymaps/via/readme.md           | 0
 keyboards/{ => reviung}/reviung53/keymaps/via/rules.mk            | 0
 keyboards/{ => reviung}/reviung53/readme.md                       | 0
 keyboards/{ => reviung}/reviung53/reviung53.c                     | 0
 keyboards/{ => reviung}/reviung53/reviung53.h                     | 0
 keyboards/{ => reviung}/reviung53/rules.mk                        | 0
 keyboards/{ => reviung}/reviung61/config.h                        | 0
 keyboards/{ => reviung}/reviung61/info.json                       | 0
 keyboards/{ => reviung}/reviung61/keymaps/default/keymap.c        | 0
 keyboards/{ => reviung}/reviung61/keymaps/default/readme.md       | 0
 keyboards/{ => reviung}/reviung61/keymaps/default_rgb/config.h    | 0
 keyboards/{ => reviung}/reviung61/keymaps/default_rgb/keymap.c    | 0
 keyboards/{ => reviung}/reviung61/keymaps/default_rgb/readme.md   | 0
 keyboards/{ => reviung}/reviung61/keymaps/default_rgb/rules.mk    | 0
 keyboards/{ => reviung}/reviung61/readme.md                       | 0
 keyboards/{ => reviung}/reviung61/reviung61.c                     | 0
 keyboards/{ => reviung}/reviung61/reviung61.h                     | 0
 keyboards/{ => reviung}/reviung61/rules.mk                        | 0
 98 files changed, 0 insertions(+), 0 deletions(-)
 rename keyboards/{ => reviung}/reviung33/config.h (100%)
 rename keyboards/{ => reviung}/reviung33/info.json (100%)
 rename keyboards/{ => reviung}/reviung33/keymaps/default/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung33/keymaps/default/readme.md (100%)
 rename keyboards/{ => reviung}/reviung33/keymaps/default_jp/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung33/keymaps/default_jp/readme.md (100%)
 rename keyboards/{ => reviung}/reviung33/readme.md (100%)
 rename keyboards/{ => reviung}/reviung33/reviung33.c (100%)
 rename keyboards/{ => reviung}/reviung33/reviung33.h (100%)
 rename keyboards/{ => reviung}/reviung33/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung34/config.h (100%)
 rename keyboards/{ => reviung}/reviung34/info.json (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default/readme.md (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default_2uL/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default_2uL/readme.md (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default_jp/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default_jp/readme.md (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default_rgb/config.h (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default_rgb/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default_rgb/readme.md (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default_rgb/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default_rgb2u/config.h (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default_rgb2u/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default_rgb2u/readme.md (100%)
 rename keyboards/{ => reviung}/reviung34/keymaps/default_rgb2u/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung34/readme.md (100%)
 rename keyboards/{ => reviung}/reviung34/reviung34.c (100%)
 rename keyboards/{ => reviung}/reviung34/reviung34.h (100%)
 rename keyboards/{ => reviung}/reviung34/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung39/config.h (100%)
 rename keyboards/{ => reviung}/reviung39/info.json (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/default/config.h (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/default/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/default/readme.md (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/default/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/default_s/config.h (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/default_s/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/default_s/readme.md (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/default_s/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/toshi0383/config.h (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/toshi0383/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/toshi0383/readme.md (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/toshi0383/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/via/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung39/keymaps/via/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung39/readme.md (100%)
 rename keyboards/{ => reviung}/reviung39/reviung39.c (100%)
 rename keyboards/{ => reviung}/reviung39/reviung39.h (100%)
 rename keyboards/{ => reviung}/reviung39/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung41/config.h (100%)
 rename keyboards/{ => reviung}/reviung41/info.json (100%)
 rename keyboards/{ => reviung}/reviung41/keymaps/ciutadellla/config.h (100%)
 rename keyboards/{ => reviung}/reviung41/keymaps/ciutadellla/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung41/keymaps/ciutadellla/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung41/keymaps/default/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung41/keymaps/default/readme.md (100%)
 rename keyboards/{ => reviung}/reviung41/keymaps/via/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung41/keymaps/via/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung41/readme.md (100%)
 rename keyboards/{ => reviung}/reviung41/reviung41.c (100%)
 rename keyboards/{ => reviung}/reviung41/reviung41.h (100%)
 rename keyboards/{ => reviung}/reviung41/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung5/config.h (100%)
 rename keyboards/{ => reviung}/reviung5/info.json (100%)
 rename keyboards/{ => reviung}/reviung5/keymaps/default/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung5/keymaps/default/readme.md (100%)
 rename keyboards/{ => reviung}/reviung5/keymaps/default_lre/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung5/keymaps/default_lre/readme.md (100%)
 rename keyboards/{ => reviung}/reviung5/keymaps/default_rre/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung5/keymaps/default_rre/readme.md (100%)
 rename keyboards/{ => reviung}/reviung5/readme.md (100%)
 rename keyboards/{ => reviung}/reviung5/reviung5.c (100%)
 rename keyboards/{ => reviung}/reviung5/reviung5.h (100%)
 rename keyboards/{ => reviung}/reviung5/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung53/config.h (100%)
 rename keyboards/{ => reviung}/reviung53/info.json (100%)
 rename keyboards/{ => reviung}/reviung53/keymaps/default/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung53/keymaps/default/readme.md (100%)
 rename keyboards/{ => reviung}/reviung53/keymaps/via/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung53/keymaps/via/readme.md (100%)
 rename keyboards/{ => reviung}/reviung53/keymaps/via/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung53/readme.md (100%)
 rename keyboards/{ => reviung}/reviung53/reviung53.c (100%)
 rename keyboards/{ => reviung}/reviung53/reviung53.h (100%)
 rename keyboards/{ => reviung}/reviung53/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung61/config.h (100%)
 rename keyboards/{ => reviung}/reviung61/info.json (100%)
 rename keyboards/{ => reviung}/reviung61/keymaps/default/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung61/keymaps/default/readme.md (100%)
 rename keyboards/{ => reviung}/reviung61/keymaps/default_rgb/config.h (100%)
 rename keyboards/{ => reviung}/reviung61/keymaps/default_rgb/keymap.c (100%)
 rename keyboards/{ => reviung}/reviung61/keymaps/default_rgb/readme.md (100%)
 rename keyboards/{ => reviung}/reviung61/keymaps/default_rgb/rules.mk (100%)
 rename keyboards/{ => reviung}/reviung61/readme.md (100%)
 rename keyboards/{ => reviung}/reviung61/reviung61.c (100%)
 rename keyboards/{ => reviung}/reviung61/reviung61.h (100%)
 rename keyboards/{ => reviung}/reviung61/rules.mk (100%)

diff --git a/keyboards/reviung33/config.h b/keyboards/reviung/reviung33/config.h
similarity index 100%
rename from keyboards/reviung33/config.h
rename to keyboards/reviung/reviung33/config.h
diff --git a/keyboards/reviung33/info.json b/keyboards/reviung/reviung33/info.json
similarity index 100%
rename from keyboards/reviung33/info.json
rename to keyboards/reviung/reviung33/info.json
diff --git a/keyboards/reviung33/keymaps/default/keymap.c b/keyboards/reviung/reviung33/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/reviung33/keymaps/default/keymap.c
rename to keyboards/reviung/reviung33/keymaps/default/keymap.c
diff --git a/keyboards/reviung33/keymaps/default/readme.md b/keyboards/reviung/reviung33/keymaps/default/readme.md
similarity index 100%
rename from keyboards/reviung33/keymaps/default/readme.md
rename to keyboards/reviung/reviung33/keymaps/default/readme.md
diff --git a/keyboards/reviung33/keymaps/default_jp/keymap.c b/keyboards/reviung/reviung33/keymaps/default_jp/keymap.c
similarity index 100%
rename from keyboards/reviung33/keymaps/default_jp/keymap.c
rename to keyboards/reviung/reviung33/keymaps/default_jp/keymap.c
diff --git a/keyboards/reviung33/keymaps/default_jp/readme.md b/keyboards/reviung/reviung33/keymaps/default_jp/readme.md
similarity index 100%
rename from keyboards/reviung33/keymaps/default_jp/readme.md
rename to keyboards/reviung/reviung33/keymaps/default_jp/readme.md
diff --git a/keyboards/reviung33/readme.md b/keyboards/reviung/reviung33/readme.md
similarity index 100%
rename from keyboards/reviung33/readme.md
rename to keyboards/reviung/reviung33/readme.md
diff --git a/keyboards/reviung33/reviung33.c b/keyboards/reviung/reviung33/reviung33.c
similarity index 100%
rename from keyboards/reviung33/reviung33.c
rename to keyboards/reviung/reviung33/reviung33.c
diff --git a/keyboards/reviung33/reviung33.h b/keyboards/reviung/reviung33/reviung33.h
similarity index 100%
rename from keyboards/reviung33/reviung33.h
rename to keyboards/reviung/reviung33/reviung33.h
diff --git a/keyboards/reviung33/rules.mk b/keyboards/reviung/reviung33/rules.mk
similarity index 100%
rename from keyboards/reviung33/rules.mk
rename to keyboards/reviung/reviung33/rules.mk
diff --git a/keyboards/reviung34/config.h b/keyboards/reviung/reviung34/config.h
similarity index 100%
rename from keyboards/reviung34/config.h
rename to keyboards/reviung/reviung34/config.h
diff --git a/keyboards/reviung34/info.json b/keyboards/reviung/reviung34/info.json
similarity index 100%
rename from keyboards/reviung34/info.json
rename to keyboards/reviung/reviung34/info.json
diff --git a/keyboards/reviung34/keymaps/default/keymap.c b/keyboards/reviung/reviung34/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/reviung34/keymaps/default/keymap.c
rename to keyboards/reviung/reviung34/keymaps/default/keymap.c
diff --git a/keyboards/reviung34/keymaps/default/readme.md b/keyboards/reviung/reviung34/keymaps/default/readme.md
similarity index 100%
rename from keyboards/reviung34/keymaps/default/readme.md
rename to keyboards/reviung/reviung34/keymaps/default/readme.md
diff --git a/keyboards/reviung34/keymaps/default_2uL/keymap.c b/keyboards/reviung/reviung34/keymaps/default_2uL/keymap.c
similarity index 100%
rename from keyboards/reviung34/keymaps/default_2uL/keymap.c
rename to keyboards/reviung/reviung34/keymaps/default_2uL/keymap.c
diff --git a/keyboards/reviung34/keymaps/default_2uL/readme.md b/keyboards/reviung/reviung34/keymaps/default_2uL/readme.md
similarity index 100%
rename from keyboards/reviung34/keymaps/default_2uL/readme.md
rename to keyboards/reviung/reviung34/keymaps/default_2uL/readme.md
diff --git a/keyboards/reviung34/keymaps/default_jp/keymap.c b/keyboards/reviung/reviung34/keymaps/default_jp/keymap.c
similarity index 100%
rename from keyboards/reviung34/keymaps/default_jp/keymap.c
rename to keyboards/reviung/reviung34/keymaps/default_jp/keymap.c
diff --git a/keyboards/reviung34/keymaps/default_jp/readme.md b/keyboards/reviung/reviung34/keymaps/default_jp/readme.md
similarity index 100%
rename from keyboards/reviung34/keymaps/default_jp/readme.md
rename to keyboards/reviung/reviung34/keymaps/default_jp/readme.md
diff --git a/keyboards/reviung34/keymaps/default_rgb/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb/config.h
similarity index 100%
rename from keyboards/reviung34/keymaps/default_rgb/config.h
rename to keyboards/reviung/reviung34/keymaps/default_rgb/config.h
diff --git a/keyboards/reviung34/keymaps/default_rgb/keymap.c b/keyboards/reviung/reviung34/keymaps/default_rgb/keymap.c
similarity index 100%
rename from keyboards/reviung34/keymaps/default_rgb/keymap.c
rename to keyboards/reviung/reviung34/keymaps/default_rgb/keymap.c
diff --git a/keyboards/reviung34/keymaps/default_rgb/readme.md b/keyboards/reviung/reviung34/keymaps/default_rgb/readme.md
similarity index 100%
rename from keyboards/reviung34/keymaps/default_rgb/readme.md
rename to keyboards/reviung/reviung34/keymaps/default_rgb/readme.md
diff --git a/keyboards/reviung34/keymaps/default_rgb/rules.mk b/keyboards/reviung/reviung34/keymaps/default_rgb/rules.mk
similarity index 100%
rename from keyboards/reviung34/keymaps/default_rgb/rules.mk
rename to keyboards/reviung/reviung34/keymaps/default_rgb/rules.mk
diff --git a/keyboards/reviung34/keymaps/default_rgb2u/config.h b/keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
similarity index 100%
rename from keyboards/reviung34/keymaps/default_rgb2u/config.h
rename to keyboards/reviung/reviung34/keymaps/default_rgb2u/config.h
diff --git a/keyboards/reviung34/keymaps/default_rgb2u/keymap.c b/keyboards/reviung/reviung34/keymaps/default_rgb2u/keymap.c
similarity index 100%
rename from keyboards/reviung34/keymaps/default_rgb2u/keymap.c
rename to keyboards/reviung/reviung34/keymaps/default_rgb2u/keymap.c
diff --git a/keyboards/reviung34/keymaps/default_rgb2u/readme.md b/keyboards/reviung/reviung34/keymaps/default_rgb2u/readme.md
similarity index 100%
rename from keyboards/reviung34/keymaps/default_rgb2u/readme.md
rename to keyboards/reviung/reviung34/keymaps/default_rgb2u/readme.md
diff --git a/keyboards/reviung34/keymaps/default_rgb2u/rules.mk b/keyboards/reviung/reviung34/keymaps/default_rgb2u/rules.mk
similarity index 100%
rename from keyboards/reviung34/keymaps/default_rgb2u/rules.mk
rename to keyboards/reviung/reviung34/keymaps/default_rgb2u/rules.mk
diff --git a/keyboards/reviung34/readme.md b/keyboards/reviung/reviung34/readme.md
similarity index 100%
rename from keyboards/reviung34/readme.md
rename to keyboards/reviung/reviung34/readme.md
diff --git a/keyboards/reviung34/reviung34.c b/keyboards/reviung/reviung34/reviung34.c
similarity index 100%
rename from keyboards/reviung34/reviung34.c
rename to keyboards/reviung/reviung34/reviung34.c
diff --git a/keyboards/reviung34/reviung34.h b/keyboards/reviung/reviung34/reviung34.h
similarity index 100%
rename from keyboards/reviung34/reviung34.h
rename to keyboards/reviung/reviung34/reviung34.h
diff --git a/keyboards/reviung34/rules.mk b/keyboards/reviung/reviung34/rules.mk
similarity index 100%
rename from keyboards/reviung34/rules.mk
rename to keyboards/reviung/reviung34/rules.mk
diff --git a/keyboards/reviung39/config.h b/keyboards/reviung/reviung39/config.h
similarity index 100%
rename from keyboards/reviung39/config.h
rename to keyboards/reviung/reviung39/config.h
diff --git a/keyboards/reviung39/info.json b/keyboards/reviung/reviung39/info.json
similarity index 100%
rename from keyboards/reviung39/info.json
rename to keyboards/reviung/reviung39/info.json
diff --git a/keyboards/reviung39/keymaps/default/config.h b/keyboards/reviung/reviung39/keymaps/default/config.h
similarity index 100%
rename from keyboards/reviung39/keymaps/default/config.h
rename to keyboards/reviung/reviung39/keymaps/default/config.h
diff --git a/keyboards/reviung39/keymaps/default/keymap.c b/keyboards/reviung/reviung39/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/reviung39/keymaps/default/keymap.c
rename to keyboards/reviung/reviung39/keymaps/default/keymap.c
diff --git a/keyboards/reviung39/keymaps/default/readme.md b/keyboards/reviung/reviung39/keymaps/default/readme.md
similarity index 100%
rename from keyboards/reviung39/keymaps/default/readme.md
rename to keyboards/reviung/reviung39/keymaps/default/readme.md
diff --git a/keyboards/reviung39/keymaps/default/rules.mk b/keyboards/reviung/reviung39/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/reviung39/keymaps/default/rules.mk
rename to keyboards/reviung/reviung39/keymaps/default/rules.mk
diff --git a/keyboards/reviung39/keymaps/default_s/config.h b/keyboards/reviung/reviung39/keymaps/default_s/config.h
similarity index 100%
rename from keyboards/reviung39/keymaps/default_s/config.h
rename to keyboards/reviung/reviung39/keymaps/default_s/config.h
diff --git a/keyboards/reviung39/keymaps/default_s/keymap.c b/keyboards/reviung/reviung39/keymaps/default_s/keymap.c
similarity index 100%
rename from keyboards/reviung39/keymaps/default_s/keymap.c
rename to keyboards/reviung/reviung39/keymaps/default_s/keymap.c
diff --git a/keyboards/reviung39/keymaps/default_s/readme.md b/keyboards/reviung/reviung39/keymaps/default_s/readme.md
similarity index 100%
rename from keyboards/reviung39/keymaps/default_s/readme.md
rename to keyboards/reviung/reviung39/keymaps/default_s/readme.md
diff --git a/keyboards/reviung39/keymaps/default_s/rules.mk b/keyboards/reviung/reviung39/keymaps/default_s/rules.mk
similarity index 100%
rename from keyboards/reviung39/keymaps/default_s/rules.mk
rename to keyboards/reviung/reviung39/keymaps/default_s/rules.mk
diff --git a/keyboards/reviung39/keymaps/toshi0383/config.h b/keyboards/reviung/reviung39/keymaps/toshi0383/config.h
similarity index 100%
rename from keyboards/reviung39/keymaps/toshi0383/config.h
rename to keyboards/reviung/reviung39/keymaps/toshi0383/config.h
diff --git a/keyboards/reviung39/keymaps/toshi0383/keymap.c b/keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
similarity index 100%
rename from keyboards/reviung39/keymaps/toshi0383/keymap.c
rename to keyboards/reviung/reviung39/keymaps/toshi0383/keymap.c
diff --git a/keyboards/reviung39/keymaps/toshi0383/readme.md b/keyboards/reviung/reviung39/keymaps/toshi0383/readme.md
similarity index 100%
rename from keyboards/reviung39/keymaps/toshi0383/readme.md
rename to keyboards/reviung/reviung39/keymaps/toshi0383/readme.md
diff --git a/keyboards/reviung39/keymaps/toshi0383/rules.mk b/keyboards/reviung/reviung39/keymaps/toshi0383/rules.mk
similarity index 100%
rename from keyboards/reviung39/keymaps/toshi0383/rules.mk
rename to keyboards/reviung/reviung39/keymaps/toshi0383/rules.mk
diff --git a/keyboards/reviung39/keymaps/via/keymap.c b/keyboards/reviung/reviung39/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/reviung39/keymaps/via/keymap.c
rename to keyboards/reviung/reviung39/keymaps/via/keymap.c
diff --git a/keyboards/reviung39/keymaps/via/rules.mk b/keyboards/reviung/reviung39/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/reviung39/keymaps/via/rules.mk
rename to keyboards/reviung/reviung39/keymaps/via/rules.mk
diff --git a/keyboards/reviung39/readme.md b/keyboards/reviung/reviung39/readme.md
similarity index 100%
rename from keyboards/reviung39/readme.md
rename to keyboards/reviung/reviung39/readme.md
diff --git a/keyboards/reviung39/reviung39.c b/keyboards/reviung/reviung39/reviung39.c
similarity index 100%
rename from keyboards/reviung39/reviung39.c
rename to keyboards/reviung/reviung39/reviung39.c
diff --git a/keyboards/reviung39/reviung39.h b/keyboards/reviung/reviung39/reviung39.h
similarity index 100%
rename from keyboards/reviung39/reviung39.h
rename to keyboards/reviung/reviung39/reviung39.h
diff --git a/keyboards/reviung39/rules.mk b/keyboards/reviung/reviung39/rules.mk
similarity index 100%
rename from keyboards/reviung39/rules.mk
rename to keyboards/reviung/reviung39/rules.mk
diff --git a/keyboards/reviung41/config.h b/keyboards/reviung/reviung41/config.h
similarity index 100%
rename from keyboards/reviung41/config.h
rename to keyboards/reviung/reviung41/config.h
diff --git a/keyboards/reviung41/info.json b/keyboards/reviung/reviung41/info.json
similarity index 100%
rename from keyboards/reviung41/info.json
rename to keyboards/reviung/reviung41/info.json
diff --git a/keyboards/reviung41/keymaps/ciutadellla/config.h b/keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
similarity index 100%
rename from keyboards/reviung41/keymaps/ciutadellla/config.h
rename to keyboards/reviung/reviung41/keymaps/ciutadellla/config.h
diff --git a/keyboards/reviung41/keymaps/ciutadellla/keymap.c b/keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
similarity index 100%
rename from keyboards/reviung41/keymaps/ciutadellla/keymap.c
rename to keyboards/reviung/reviung41/keymaps/ciutadellla/keymap.c
diff --git a/keyboards/reviung41/keymaps/ciutadellla/rules.mk b/keyboards/reviung/reviung41/keymaps/ciutadellla/rules.mk
similarity index 100%
rename from keyboards/reviung41/keymaps/ciutadellla/rules.mk
rename to keyboards/reviung/reviung41/keymaps/ciutadellla/rules.mk
diff --git a/keyboards/reviung41/keymaps/default/keymap.c b/keyboards/reviung/reviung41/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/reviung41/keymaps/default/keymap.c
rename to keyboards/reviung/reviung41/keymaps/default/keymap.c
diff --git a/keyboards/reviung41/keymaps/default/readme.md b/keyboards/reviung/reviung41/keymaps/default/readme.md
similarity index 100%
rename from keyboards/reviung41/keymaps/default/readme.md
rename to keyboards/reviung/reviung41/keymaps/default/readme.md
diff --git a/keyboards/reviung41/keymaps/via/keymap.c b/keyboards/reviung/reviung41/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/reviung41/keymaps/via/keymap.c
rename to keyboards/reviung/reviung41/keymaps/via/keymap.c
diff --git a/keyboards/reviung41/keymaps/via/rules.mk b/keyboards/reviung/reviung41/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/reviung41/keymaps/via/rules.mk
rename to keyboards/reviung/reviung41/keymaps/via/rules.mk
diff --git a/keyboards/reviung41/readme.md b/keyboards/reviung/reviung41/readme.md
similarity index 100%
rename from keyboards/reviung41/readme.md
rename to keyboards/reviung/reviung41/readme.md
diff --git a/keyboards/reviung41/reviung41.c b/keyboards/reviung/reviung41/reviung41.c
similarity index 100%
rename from keyboards/reviung41/reviung41.c
rename to keyboards/reviung/reviung41/reviung41.c
diff --git a/keyboards/reviung41/reviung41.h b/keyboards/reviung/reviung41/reviung41.h
similarity index 100%
rename from keyboards/reviung41/reviung41.h
rename to keyboards/reviung/reviung41/reviung41.h
diff --git a/keyboards/reviung41/rules.mk b/keyboards/reviung/reviung41/rules.mk
similarity index 100%
rename from keyboards/reviung41/rules.mk
rename to keyboards/reviung/reviung41/rules.mk
diff --git a/keyboards/reviung5/config.h b/keyboards/reviung/reviung5/config.h
similarity index 100%
rename from keyboards/reviung5/config.h
rename to keyboards/reviung/reviung5/config.h
diff --git a/keyboards/reviung5/info.json b/keyboards/reviung/reviung5/info.json
similarity index 100%
rename from keyboards/reviung5/info.json
rename to keyboards/reviung/reviung5/info.json
diff --git a/keyboards/reviung5/keymaps/default/keymap.c b/keyboards/reviung/reviung5/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/reviung5/keymaps/default/keymap.c
rename to keyboards/reviung/reviung5/keymaps/default/keymap.c
diff --git a/keyboards/reviung5/keymaps/default/readme.md b/keyboards/reviung/reviung5/keymaps/default/readme.md
similarity index 100%
rename from keyboards/reviung5/keymaps/default/readme.md
rename to keyboards/reviung/reviung5/keymaps/default/readme.md
diff --git a/keyboards/reviung5/keymaps/default_lre/keymap.c b/keyboards/reviung/reviung5/keymaps/default_lre/keymap.c
similarity index 100%
rename from keyboards/reviung5/keymaps/default_lre/keymap.c
rename to keyboards/reviung/reviung5/keymaps/default_lre/keymap.c
diff --git a/keyboards/reviung5/keymaps/default_lre/readme.md b/keyboards/reviung/reviung5/keymaps/default_lre/readme.md
similarity index 100%
rename from keyboards/reviung5/keymaps/default_lre/readme.md
rename to keyboards/reviung/reviung5/keymaps/default_lre/readme.md
diff --git a/keyboards/reviung5/keymaps/default_rre/keymap.c b/keyboards/reviung/reviung5/keymaps/default_rre/keymap.c
similarity index 100%
rename from keyboards/reviung5/keymaps/default_rre/keymap.c
rename to keyboards/reviung/reviung5/keymaps/default_rre/keymap.c
diff --git a/keyboards/reviung5/keymaps/default_rre/readme.md b/keyboards/reviung/reviung5/keymaps/default_rre/readme.md
similarity index 100%
rename from keyboards/reviung5/keymaps/default_rre/readme.md
rename to keyboards/reviung/reviung5/keymaps/default_rre/readme.md
diff --git a/keyboards/reviung5/readme.md b/keyboards/reviung/reviung5/readme.md
similarity index 100%
rename from keyboards/reviung5/readme.md
rename to keyboards/reviung/reviung5/readme.md
diff --git a/keyboards/reviung5/reviung5.c b/keyboards/reviung/reviung5/reviung5.c
similarity index 100%
rename from keyboards/reviung5/reviung5.c
rename to keyboards/reviung/reviung5/reviung5.c
diff --git a/keyboards/reviung5/reviung5.h b/keyboards/reviung/reviung5/reviung5.h
similarity index 100%
rename from keyboards/reviung5/reviung5.h
rename to keyboards/reviung/reviung5/reviung5.h
diff --git a/keyboards/reviung5/rules.mk b/keyboards/reviung/reviung5/rules.mk
similarity index 100%
rename from keyboards/reviung5/rules.mk
rename to keyboards/reviung/reviung5/rules.mk
diff --git a/keyboards/reviung53/config.h b/keyboards/reviung/reviung53/config.h
similarity index 100%
rename from keyboards/reviung53/config.h
rename to keyboards/reviung/reviung53/config.h
diff --git a/keyboards/reviung53/info.json b/keyboards/reviung/reviung53/info.json
similarity index 100%
rename from keyboards/reviung53/info.json
rename to keyboards/reviung/reviung53/info.json
diff --git a/keyboards/reviung53/keymaps/default/keymap.c b/keyboards/reviung/reviung53/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/reviung53/keymaps/default/keymap.c
rename to keyboards/reviung/reviung53/keymaps/default/keymap.c
diff --git a/keyboards/reviung53/keymaps/default/readme.md b/keyboards/reviung/reviung53/keymaps/default/readme.md
similarity index 100%
rename from keyboards/reviung53/keymaps/default/readme.md
rename to keyboards/reviung/reviung53/keymaps/default/readme.md
diff --git a/keyboards/reviung53/keymaps/via/keymap.c b/keyboards/reviung/reviung53/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/reviung53/keymaps/via/keymap.c
rename to keyboards/reviung/reviung53/keymaps/via/keymap.c
diff --git a/keyboards/reviung53/keymaps/via/readme.md b/keyboards/reviung/reviung53/keymaps/via/readme.md
similarity index 100%
rename from keyboards/reviung53/keymaps/via/readme.md
rename to keyboards/reviung/reviung53/keymaps/via/readme.md
diff --git a/keyboards/reviung53/keymaps/via/rules.mk b/keyboards/reviung/reviung53/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/reviung53/keymaps/via/rules.mk
rename to keyboards/reviung/reviung53/keymaps/via/rules.mk
diff --git a/keyboards/reviung53/readme.md b/keyboards/reviung/reviung53/readme.md
similarity index 100%
rename from keyboards/reviung53/readme.md
rename to keyboards/reviung/reviung53/readme.md
diff --git a/keyboards/reviung53/reviung53.c b/keyboards/reviung/reviung53/reviung53.c
similarity index 100%
rename from keyboards/reviung53/reviung53.c
rename to keyboards/reviung/reviung53/reviung53.c
diff --git a/keyboards/reviung53/reviung53.h b/keyboards/reviung/reviung53/reviung53.h
similarity index 100%
rename from keyboards/reviung53/reviung53.h
rename to keyboards/reviung/reviung53/reviung53.h
diff --git a/keyboards/reviung53/rules.mk b/keyboards/reviung/reviung53/rules.mk
similarity index 100%
rename from keyboards/reviung53/rules.mk
rename to keyboards/reviung/reviung53/rules.mk
diff --git a/keyboards/reviung61/config.h b/keyboards/reviung/reviung61/config.h
similarity index 100%
rename from keyboards/reviung61/config.h
rename to keyboards/reviung/reviung61/config.h
diff --git a/keyboards/reviung61/info.json b/keyboards/reviung/reviung61/info.json
similarity index 100%
rename from keyboards/reviung61/info.json
rename to keyboards/reviung/reviung61/info.json
diff --git a/keyboards/reviung61/keymaps/default/keymap.c b/keyboards/reviung/reviung61/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/reviung61/keymaps/default/keymap.c
rename to keyboards/reviung/reviung61/keymaps/default/keymap.c
diff --git a/keyboards/reviung61/keymaps/default/readme.md b/keyboards/reviung/reviung61/keymaps/default/readme.md
similarity index 100%
rename from keyboards/reviung61/keymaps/default/readme.md
rename to keyboards/reviung/reviung61/keymaps/default/readme.md
diff --git a/keyboards/reviung61/keymaps/default_rgb/config.h b/keyboards/reviung/reviung61/keymaps/default_rgb/config.h
similarity index 100%
rename from keyboards/reviung61/keymaps/default_rgb/config.h
rename to keyboards/reviung/reviung61/keymaps/default_rgb/config.h
diff --git a/keyboards/reviung61/keymaps/default_rgb/keymap.c b/keyboards/reviung/reviung61/keymaps/default_rgb/keymap.c
similarity index 100%
rename from keyboards/reviung61/keymaps/default_rgb/keymap.c
rename to keyboards/reviung/reviung61/keymaps/default_rgb/keymap.c
diff --git a/keyboards/reviung61/keymaps/default_rgb/readme.md b/keyboards/reviung/reviung61/keymaps/default_rgb/readme.md
similarity index 100%
rename from keyboards/reviung61/keymaps/default_rgb/readme.md
rename to keyboards/reviung/reviung61/keymaps/default_rgb/readme.md
diff --git a/keyboards/reviung61/keymaps/default_rgb/rules.mk b/keyboards/reviung/reviung61/keymaps/default_rgb/rules.mk
similarity index 100%
rename from keyboards/reviung61/keymaps/default_rgb/rules.mk
rename to keyboards/reviung/reviung61/keymaps/default_rgb/rules.mk
diff --git a/keyboards/reviung61/readme.md b/keyboards/reviung/reviung61/readme.md
similarity index 100%
rename from keyboards/reviung61/readme.md
rename to keyboards/reviung/reviung61/readme.md
diff --git a/keyboards/reviung61/reviung61.c b/keyboards/reviung/reviung61/reviung61.c
similarity index 100%
rename from keyboards/reviung61/reviung61.c
rename to keyboards/reviung/reviung61/reviung61.c
diff --git a/keyboards/reviung61/reviung61.h b/keyboards/reviung/reviung61/reviung61.h
similarity index 100%
rename from keyboards/reviung61/reviung61.h
rename to keyboards/reviung/reviung61/reviung61.h
diff --git a/keyboards/reviung61/rules.mk b/keyboards/reviung/reviung61/rules.mk
similarity index 100%
rename from keyboards/reviung61/rules.mk
rename to keyboards/reviung/reviung61/rules.mk

From dce611bc9fd6c6d47e6c5d935ca263ff50a5afc2 Mon Sep 17 00:00:00 2001
From: Alan Pocklington <a.Pocklington@Gmail.com>
Date: Tue, 11 Jan 2022 00:57:41 +0000
Subject: [PATCH 234/867] [Keymap] AJP10304 layout, add Colemak-DHm layer
 (#15582)

---
 .../acheron/shark/keymaps/ajp10304/readme.md  | 21 +++++++---
 .../atreus50/keymaps/ajp10304/keymap.c        | 40 ++++++++++++++-----
 .../atreus50/keymaps/ajp10304/readme.md       | 22 +++++++---
 .../jj40/keymaps/ajp10304/readme.md           | 21 +++++++---
 keyboards/planck/keymaps/ajp10304/readme.md   | 21 +++++++---
 keyboards/quark/keymaps/ajp10304/keymap.c     | 40 ++++++++++++++-----
 keyboards/quark/keymaps/ajp10304/readme.md    | 21 +++++++---
 .../community/ortho_4x12/ajp10304/keymap.c    | 40 ++++++++++++++-----
 .../community/ortho_4x12/ajp10304/readme.md   | 21 +++++++---
 users/ajp10304/ajp10304.c                     | 10 ++++-
 users/ajp10304/ajp10304.h                     |  2 +
 users/ajp10304/readme.md                      | 21 +++++++---
 12 files changed, 203 insertions(+), 77 deletions(-)

diff --git a/keyboards/acheron/shark/keymaps/ajp10304/readme.md b/keyboards/acheron/shark/keymaps/ajp10304/readme.md
index cb8bcdae90..e091e5d318 100644
--- a/keyboards/acheron/shark/keymaps/ajp10304/readme.md
+++ b/keyboards/acheron/shark/keymaps/ajp10304/readme.md
@@ -22,6 +22,15 @@ Refer to the README.md of the keyboard you want to flash.
 | Shft |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  | Shft |
 | Fn   | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2  |
 
+##### Main Colemak-DHm Layer
+
+|      |      |      |     |       |      |       |       |       |      |      |      |
+| ---- |:----:| :---:|:---:|:-----:|:----:|:-----:|:-----:|:-----:|:----:|:----:| ----:|
+| Esc  |   Q  |   W  |  F  |   P   |  B   |   J   |   L   |   U   |  Y   |  ;:  | Bksp |
+| Tab  |   A  |   R  |  S  |   T   |  G   |   M   |   N   |   E   |  I   |  O   | Enter|
+| Shft |   Z  |   X  |  C  |   D   |  V   |   K   |   H   |  ,<   |  .>  |  /?  | Shft |
+| Fn   | Ctrl | Alt  | GUI | Lower | Bksp | Space | Raise | Shift | MENU | Ctrl | Fn2  |
+
 ##### Function Layer
 Activated when `fn` held in the above `qwerty` layer.
 
@@ -73,12 +82,12 @@ To finish the recording, press STOP. To replay the macro, press either PLAY1 or
 * MAC: Toggle MAC OS extensions to layers. This allows MLWR to be enabled with LOWER,
 MRSE with RAISE, MFNC with FUNC and MFNC2 with FUNC2 respectively.
 
-|       |      |      |      |      |      |      |      |      |      |      |      |
-| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |  Del |
-| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      |      |
-| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      |      |
-|       |      |      |      |      |      |      |      | DYN  |      |      |      |
+|       |      |      |      |      |      |      |      |      |      |      |         |
+| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|:-------:|
+| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |   Del   |
+| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      | Qwerty  |
+| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      | Colemak |
+|       |      |      |      |      |      |      |      | DYN  |      |      |         |
 
 ##### Function 2 Layer
 Activated when `fn` held in the above `qwerty` layer.
diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
index 0122455167..49a53cfe21 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/keymap.c
@@ -38,6 +38,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,    MO(_FUNC2)
 ),
 
+/* Colemak-DHm
+ * ,-----------------------------------------|             |-----------------------------------------.
+ * | Esc  |   Q  |   W  |   F  |   P  |   B  |             |   J  |   L  |   U  |   Y  |  ;:  | Bksp |
+ * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+ * | Tab  |   A  |   R  |   S  |   T  |   G  |             |   M  |   N  |   E  |   I  |  O  | Enter|
+ * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+ * | Shft |   Z  |   X  |   C  |   D  |   V  |             |   K  |   H  |  ,<  |  .>  |  /?  | Shft |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Fn   | Ctrl | Alt  | GUI  |Lower | Bksp | Ctrl | Alt  |Space |Raise | Shift| MENU | Ctrl | Fn2  |
+ * `-------------------------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT(
+  LT(_NUMPAD, KC_ESC),   KC_Q,       KC_W,        KC_F,      KC_P,    KC_B,                      KC_J,    KC_L,    KC_U,      KC_Y,      KC_SCLN,    KC_BSPC              ,
+  MT(MOD_LSFT, KC_TAB),  KC_A,       KC_R,        KC_S,      KC_T,    KC_G,                      KC_M,    KC_N,    KC_E,      KC_I,      KC_O,       MT(MOD_RSFT, KC_ENT) ,
+  KC_LSHIFT,             KC_Z,       KC_X,        KC_C,      KC_D,    KC_V,                      KC_K,    KC_H,    KC_COMM,   KC_DOT,    KC_SLSH,    KC_RSHIFT            ,
+  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,    MO(_FUNC2)
+),
+
 /* Function
  * ,------------------------------------------             |-----------------------------------------.
  * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |             |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
@@ -93,20 +111,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 /* Adjust (Lower + Raise)
- * ,------------------------------------------             |-----------------------------------------.
- * | ???? | Reset|Qwerty|      |      | REC1 |             | REC2 |      |      |      |      |  Del |
- * |------+------+------+------+------+-------             |------+------+------+------+------+------|
- * | CAPS |      |      |      |      | PLAY1|             | PLAY2| Mute | Vol+ | Play |      |      |
- * |------+------+------+------+------+------|             |------+------+------+------+------+------|
- * | PC/MC|      |      |      |      | STOP |             | STOP | Prev | Vol- | Next |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
- * `-------------------------------------------------------------------------------------------------'
+ * ,------------------------------------------             |------------------------------------------.
+ * | ???? | Reset|Qwerty|      |      | REC1 |             | REC2 |      |      |      |      |  Del  |
+ * |------+------+------+------+------+-------             |------+------+------+------+------+-------|
+ * | CAPS |      |      |      |      | PLAY1|             | PLAY2| Mute | Vol+ | Play |      |Qwerty |
+ * |------+------+------+------+------+------|             |------+------+------+------+------+-------|
+ * | PC/MC|      |      |      |      | STOP |             | STOP | Prev | Vol- | Next |      |Colemak|
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+-------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |      |       |
+ * `--------------------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT(
   M_CUSTOM, RESET,   QWERTY,  _______, _______, DYN_REC_START1,                    DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
-  KC_CAPS,  _______, _______, _______, _______, DYN_MACRO_PLAY1,                   DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  _______ ,
-  TG(_MAC), _______, _______, _______, _______, DYN_REC_STOP,                      DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  _______ ,
+  KC_CAPS,  _______, _______, _______, _______, DYN_MACRO_PLAY1,                   DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
+  TG(_MAC), _______, _______, _______, _______, DYN_REC_STOP,                      DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
   _______,  _______, _______, _______, _______, _______,         _______, _______, _______,         _______,             _______,           _______,              _______,  _______
 ),
 
diff --git a/keyboards/handwired/atreus50/keymaps/ajp10304/readme.md b/keyboards/handwired/atreus50/keymaps/ajp10304/readme.md
index 640bcc46f6..6ba052065d 100644
--- a/keyboards/handwired/atreus50/keymaps/ajp10304/readme.md
+++ b/keyboards/handwired/atreus50/keymaps/ajp10304/readme.md
@@ -22,6 +22,16 @@ Refer to the README.md of the keyboard you want to flash.
 | Shft |   Z  |   X  |   C  |   V  |   B  |      |      |   N  |   M  |  ,<  |  .>  |  /?  | Shft |
 | Fn   | Ctrl | Alt  | GUI  |Lower | Bksp | Ctrl | Alt  |Space |Raise | Shift| MENU | Ctrl | Fn2  |
 
+##### Main Colemak-DHm Layer
+
+|      |      |      |     |       |      |      |      |       |       |       |      |      |      |
+| ---- |:----:| :---:|:---:|:-----:|:----:| :---:| :---:|:-----:|:-----:|:-----:|:----:|:----:| ----:|
+| Esc  |   Q  |   W  |  F  |   P   |  B   |      |      |   J   |   L   |   U   |  Y   |  ;:  | Bksp |
+| Tab  |   A  |   R  |  S  |   T   |  G   |      |      |   M   |   N   |   E   |  I   |  O   | Enter|
+| Shft |   Z  |   X  |  C  |   D   |  V   |      |      |   K   |   H   |  ,<   |  .>  |  /?  | Shft |
+| Fn   | Ctrl | Alt  | GUI | Lower | Bksp | Ctrl | Alt  | Space | Raise | Shift | MENU | Ctrl | Fn2  |
+
+
 ##### Function Layer
 Activated when `fn` held in the above `qwerty` layer.
 
@@ -73,12 +83,12 @@ To finish the recording, press STOP. To replay the macro, press either PLAY1 or
 * MAC: Toggle MAC OS extensions to layers. This allows MLWR to be enabled with LOWER,
 MRSE with RAISE, MFNC with FUNC and MFNC2 with FUNC2 respectively.
 
-|       |      |      |      |      |      |      |      |      |      |      |      |      |      |
-| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ????  | Reset|Qwerty|      |      | REC1 |      |      | REC2 |      |      |      |      |  Del |
-| CAPS  |      |      |      |      | PLAY1|      |      |PLAY2 | Mute | Vol+ | Play |      |      |
-| MAC   |      |      |      |      | STOP1|      |      |STOP2 | Prev | Vol- | Next |      |      |
-|       |      |      |      |      |      | Ctrl | Alt  |      |      | DYN  |      |      |      |
+|       |      |      |      |      |      |      |      |      |      |      |      |      |         |
+| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|:-------:|
+| ????  | Reset|Qwerty|      |      | REC1 |      |      | REC2 |      |      |      |      |   Del   |
+| CAPS  |      |      |      |      | PLAY1|      |      |PLAY2 | Mute | Vol+ | Play |      | Qwerty  |
+| MAC   |      |      |      |      | STOP1|      |      |STOP2 | Prev | Vol- | Next |      | Colemak |
+|       |      |      |      |      |      | Ctrl | Alt  |      |      | DYN  |      |      |         |
 
 ##### Function 2 Layer
 Activated when `fn` held in the above `qwerty` layer.
diff --git a/keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md b/keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md
index 8a7562d742..9362c10650 100644
--- a/keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md
+++ b/keyboards/kprepublic/jj40/keymaps/ajp10304/readme.md
@@ -22,6 +22,15 @@ Refer to the README.md of the keyboard you want to flash.
 | Shft |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  | Shft |
 | Fn   | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2  |
 
+##### Main Colemak-DHm Layer
+
+|      |      |      |     |       |      |       |       |       |      |      |      |
+| ---- |:----:| :---:|:---:|:-----:|:----:|:-----:|:-----:|:-----:|:----:|:----:| ----:|
+| Esc  |   Q  |   W  |  F  |   P   |  B   |   J   |   L   |   U   |  Y   |  ;:  | Bksp |
+| Tab  |   A  |   R  |  S  |   T   |  G   |   M   |   N   |   E   |  I   |  O   | Enter|
+| Shft |   Z  |   X  |  C  |   D   |  V   |   K   |   H   |  ,<   |  .>  |  /?  | Shft |
+| Fn   | Ctrl | Alt  | GUI | Lower | Bksp | Space | Raise | Shift | MENU | Ctrl | Fn2  |
+
 ##### Function Layer
 Activated when `fn` held in the above `qwerty` layer.
 
@@ -73,12 +82,12 @@ To finish the recording, press STOP. To replay the macro, press either PLAY1 or
 * MAC: Toggle MAC OS extensions to layers. This allows MLWR to be enabled with LOWER,
 MRSE with RAISE, MFNC with FUNC and MFNC2 with FUNC2 respectively.
 
-|       |      |      |      |      |      |      |      |      |      |      |      |
-| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |  Del |
-| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      |      |
-| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      |      |
-|       |      |      |      |      |      |      |      | DYN  |      |      |      |
+|       |      |      |      |      |      |      |      |      |      |      |         |
+| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|:-------:|
+| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |   Del   |
+| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      | Qwerty  |
+| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      | Colemak |
+|       |      |      |      |      |      |      |      | DYN  |      |      |         |
 
 ##### Function 2 Layer
 Activated when `fn` held in the above `qwerty` layer.
diff --git a/keyboards/planck/keymaps/ajp10304/readme.md b/keyboards/planck/keymaps/ajp10304/readme.md
index c68ba49283..4b7a54bb54 100644
--- a/keyboards/planck/keymaps/ajp10304/readme.md
+++ b/keyboards/planck/keymaps/ajp10304/readme.md
@@ -22,6 +22,15 @@ Refer to the README.md of the keyboard you want to flash.
 | Shft |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  | Shft |
 | Fn   | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2  |
 
+##### Main Colemak-DHm Layer
+
+|      |      |      |     |       |      |       |       |       |      |      |      |
+| ---- |:----:| :---:|:---:|:-----:|:----:|:-----:|:-----:|:-----:|:----:|:----:| ----:|
+| Esc  |   Q  |   W  |  F  |   P   |  B   |   J   |   L   |   U   |  Y   |  ;:  | Bksp |
+| Tab  |   A  |   R  |  S  |   T   |  G   |   M   |   N   |   E   |  I   |  O   | Enter|
+| Shft |   Z  |   X  |  C  |   D   |  V   |   K   |   H   |  ,<   |  .>  |  /?  | Shft |
+| Fn   | Ctrl | Alt  | GUI | Lower | Bksp | Space | Raise | Shift | MENU | Ctrl | Fn2  |
+
 ##### Function Layer
 Activated when `fn` held in the above `qwerty` layer.
 
@@ -73,12 +82,12 @@ To finish the recording, press STOP. To replay the macro, press either PLAY1 or
 * MAC: Toggle MAC OS extensions to layers. This allows MLWR to be enabled with LOWER,
 MRSE with RAISE, MFNC with FUNC and MFNC2 with FUNC2 respectively.
 
-|       |      |      |      |      |      |      |      |      |      |      |      |
-| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |  Del |
-| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      |      |
-| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      |      |
-|       |      |      |      |      |      |      |      | DYN  |      |      |      |
+|       |      |      |      |      |      |      |      |      |      |      |         |
+| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|:-------:|
+| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |   Del   |
+| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      | Qwerty  |
+| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      | Colemak |
+|       |      |      |      |      |      |      |      | DYN  |      |      |         |
 
 ##### Function 2 Layer
 Activated when `fn` held in the above `qwerty` layer.
diff --git a/keyboards/quark/keymaps/ajp10304/keymap.c b/keyboards/quark/keymaps/ajp10304/keymap.c
index c55e99af79..273fbc536f 100644
--- a/keyboards/quark/keymaps/ajp10304/keymap.c
+++ b/keyboards/quark/keymaps/ajp10304/keymap.c
@@ -37,6 +37,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,    MO(_FUNC2)
 ),
 
+/* Colemak-DHm
+ * ,-----------------------------------------------------------------------------------.
+ * | Esc  |   Q  |   W  |   F  |   P  |   B  |   J  |   L  |   U  |   Y  |  ;:  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Tab  |   A  |   R  |   S  |   T  |   G  |   M  |   N  |   E  |   I  |   O  | Enter|
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shft |   Z  |   X  |   C  |   D  |   V  |   K  |   H  |  ,<  |  .>  |  /?  | Shft |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Fn   | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2  |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT_ortho_4x12(
+  LT(_NUMPAD, KC_ESC),   KC_Q,       KC_W,        KC_F,      KC_P,    KC_B,    KC_J,    KC_L,    KC_U,      KC_Y,      KC_SCLN,   KC_BSPC                 ,
+  MT(MOD_LSFT, KC_TAB),  KC_A,       KC_R,        KC_S,      KC_T,    KC_G,    KC_M,    KC_N,    KC_E,      KC_I,      KC_O,      MT(MOD_RSFT, KC_ENT)    ,
+  KC_LSHIFT,             KC_Z,       KC_X,        KC_C,      KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSHIFT               ,
+  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,   MO(_FUNC2)
+),
+
 /* Function
  * ,-----------------------------------------------------------------------------------.
  * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
@@ -92,20 +110,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 /* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | ???? | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | CAPS |      |      |      |      | PLAY1| PLAY2| Mute | Vol+ | Play |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | PC/MC|      |      |      |      | STOP | STOP | Prev | Vol- | Next |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
+ * ,------------------------------------------------------------------------------------.
+ * | ???? | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |  Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+-------|
+ * | CAPS |      |      |      |      | PLAY1| PLAY2| Mute | Vol+ | Play |      |Qwerty |
+ * |------+------+------+------+------+------|------+------+------+------+------+-------|
+ * | PC/MC|      |      |      |      | STOP | STOP | Prev | Vol- | Next |      |Colemak|
+ * |------+------+------+------+------+------+------+------+------+------+------+-------|
+ * |      |      |      |      |      |             |      |      |      |      |       |
+ * `------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
   M_CUSTOM, RESET,   QWERTY,  BL_ON,   BL_OFF,  DYN_REC_START1,  DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
-  KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  _______ ,
-  TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DYN_REC_STOP,    DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  _______ ,
+  KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
+  TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DYN_REC_STOP,    DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
   _______,  _______, _______, _______, _______, _______,         _______,         _______,             _______,           _______,              _______,  _______
 ),
 
diff --git a/keyboards/quark/keymaps/ajp10304/readme.md b/keyboards/quark/keymaps/ajp10304/readme.md
index 83af702e2a..5c9169fa47 100644
--- a/keyboards/quark/keymaps/ajp10304/readme.md
+++ b/keyboards/quark/keymaps/ajp10304/readme.md
@@ -22,6 +22,15 @@ Refer to the README.md of the keyboard you want to flash.
 | Shft |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  | Shft |
 | Fn   | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2  |
 
+##### Main Colemak-DHm Layer
+
+|      |      |      |     |       |      |       |       |       |      |      |      |
+| ---- |:----:| :---:|:---:|:-----:|:----:|:-----:|:-----:|:-----:|:----:|:----:| ----:|
+| Esc  |   Q  |   W  |  F  |   P   |  B   |   J   |   L   |   U   |  Y   |  ;:  | Bksp |
+| Tab  |   A  |   R  |  S  |   T   |  G   |   M   |   N   |   E   |  I   |  O   | Enter|
+| Shft |   Z  |   X  |  C  |   D   |  V   |   K   |   H   |  ,<   |  .>  |  /?  | Shft |
+| Fn   | Ctrl | Alt  | GUI | Lower | Bksp | Space | Raise | Shift | MENU | Ctrl | Fn2  |
+
 ##### Function Layer
 Activated when `fn` held in the above `qwerty` layer.
 
@@ -73,12 +82,12 @@ To finish the recording, press STOP. To replay the macro, press either PLAY1 or
 * MAC: Toggle MAC OS extensions to layers. This allows MLWR to be enabled with LOWER,
 MRSE with RAISE, MFNC with FUNC and MFNC2 with FUNC2 respectively.
 
-|       |      |      |      |      |      |      |      |      |      |      |      |
-| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |  Del |
-| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      |      |
-| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      |      |
-|       |      |      |      |      |      |      |      | DYN  |      |      |      |
+|       |      |      |      |      |      |      |      |      |      |      |         |
+| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|:-------:|
+| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |   Del   |
+| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      | Qwerty  |
+| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      | Colemak |
+|       |      |      |      |      |      |      |      | DYN  |      |      |         |
 
 ##### Function 2 Layer
 Activated when `fn` held in the above `qwerty` layer.
diff --git a/layouts/community/ortho_4x12/ajp10304/keymap.c b/layouts/community/ortho_4x12/ajp10304/keymap.c
index 4d9ddb1245..7f817e21c1 100644
--- a/layouts/community/ortho_4x12/ajp10304/keymap.c
+++ b/layouts/community/ortho_4x12/ajp10304/keymap.c
@@ -37,6 +37,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,    MO(_FUNC2)
 ),
 
+/* Colemak-DHm
+ * ,-----------------------------------------------------------------------------------.
+ * | Esc  |   Q  |   W  |   F  |   P  |   B  |   J  |   L  |   U  |   Y  |  ;:  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Tab  |   A  |   R  |   S  |   T  |   G  |   M  |   N  |   E  |   I  |   O  | Enter|
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shft |   Z  |   X  |   C  |   D  |   V  |   K  |   H  |  ,<  |  .>  |  /?  | Shft |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Fn   | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2  |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT_ortho_4x12(
+  LT(_NUMPAD, KC_ESC),   KC_Q,       KC_W,        KC_F,      KC_P,    KC_B,    KC_J,    KC_L,    KC_U,      KC_Y,      KC_SCLN,   KC_BSPC                 ,
+  MT(MOD_LSFT, KC_TAB),  KC_A,       KC_R,        KC_S,      KC_T,    KC_G,    KC_M,    KC_N,    KC_E,      KC_I,      KC_O,      MT(MOD_RSFT, KC_ENT)    ,
+  KC_LSHIFT,             KC_Z,       KC_X,        KC_C,      KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM,   KC_DOT,    KC_SLSH,   KC_RSHIFT               ,
+  MO(_FUNC),             KC_LCTL,    KC_LALT,     KC_LGUI,   LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_LSHIFT, KC_BTN2,   KC_RCTL,   MO(_FUNC2)
+),
+
 /* Function
  * ,-----------------------------------------------------------------------------------.
  * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
@@ -92,20 +110,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 /* Adjust (Lower + Raise)
- * ,-----------------------------------------------------------------------------------.
- * | ???? | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |  Del |
- * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | CAPS |      |      |      |      | PLAY1| PLAY2| Mute | Vol+ | Play |      |      |
- * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | PC/MC|      |      |      |      | STOP | STOP | Prev | Vol- | Next |      |      |
- * |------+------+------+------+------+------+------+------+------+------+------+------|
- * |      |      |      |      |      |             |      |      |      |      |      |
- * `-----------------------------------------------------------------------------------'
+ * ,------------------------------------------------------------------------------------.
+ * | ???? | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |  Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+-------|
+ * | CAPS |      |      |      |      | PLAY1| PLAY2| Mute | Vol+ | Play |      |Qwerty |
+ * |------+------+------+------+------+------|------+------+------+------+------+-------|
+ * | PC/MC|      |      |      |      | STOP | STOP | Prev | Vol- | Next |      |Colemak|
+ * |------+------+------+------+------+------+------+------+------+------+------+-------|
+ * |      |      |      |      |      |             |      |      |      |      |       |
+ * `------------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_4x12(
   M_CUSTOM, RESET,   QWERTY,  BL_ON,   BL_OFF,  DYN_REC_START1,  DYN_REC_START2,  _______,             _______,           _______,              _______,  KC_DEL  ,
-  KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  _______ ,
-  TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DYN_REC_STOP,    DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  _______ ,
+  KC_CAPS,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_AUDIO_MUTE,       KC_AUDIO_VOL_UP,   KC_MEDIA_PLAY_PAUSE,  _______,  QWERTY  ,
+  TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DYN_REC_STOP,    DYN_REC_STOP,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK,  _______,  COLEMAK ,
   _______,  _______, _______, _______, _______, _______,         _______,         _______,             _______,           _______,              _______,  _______
 ),
 
diff --git a/layouts/community/ortho_4x12/ajp10304/readme.md b/layouts/community/ortho_4x12/ajp10304/readme.md
index 6db0b851d9..402e9426dd 100644
--- a/layouts/community/ortho_4x12/ajp10304/readme.md
+++ b/layouts/community/ortho_4x12/ajp10304/readme.md
@@ -22,6 +22,15 @@ Refer to the README.md of the keyboard you want to flash.
 | Shft |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  | Shft |
 | Fn   | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2  |
 
+##### Main Colemak-DHm Layer
+
+|      |      |      |     |       |      |       |       |       |      |      |      |
+| ---- |:----:| :---:|:---:|:-----:|:----:|:-----:|:-----:|:-----:|:----:|:----:| ----:|
+| Esc  |   Q  |   W  |  F  |   P   |  B   |   J   |   L   |   U   |  Y   |  ;:  | Bksp |
+| Tab  |   A  |   R  |  S  |   T   |  G   |   M   |   N   |   E   |  I   |  O   | Enter|
+| Shft |   Z  |   X  |  C  |   D   |  V   |   K   |   H   |  ,<   |  .>  |  /?  | Shft |
+| Fn   | Ctrl | Alt  | GUI | Lower | Bksp | Space | Raise | Shift | MENU | Ctrl | Fn2  |
+
 ##### Function Layer
 Activated when `fn` held in the above `qwerty` layer.
 
@@ -73,12 +82,12 @@ To finish the recording, press STOP. To replay the macro, press either PLAY1 or
 * MAC: Toggle MAC OS extensions to layers. This allows MLWR to be enabled with LOWER,
 MRSE with RAISE, MFNC with FUNC and MFNC2 with FUNC2 respectively.
 
-|       |      |      |      |      |      |      |      |      |      |      |      |
-| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |  Del |
-| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      |      |
-| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      |      |
-|       |      |      |      |      |      |      |      | DYN  |      |      |      |
+|       |      |      |      |      |      |      |      |      |      |      |         |
+| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|:-------:|
+| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |   Del   |
+| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      | Qwerty  |
+| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      | Colemak |
+|       |      |      |      |      |      |      |      | DYN  |      |      |         |
 
 ##### Function 2 Layer
 Activated when `fn` held in the above `qwerty` layer.
diff --git a/users/ajp10304/ajp10304.c b/users/ajp10304/ajp10304.c
index dd13787d63..b8729b94d7 100644
--- a/users/ajp10304/ajp10304.c
+++ b/users/ajp10304/ajp10304.c
@@ -24,6 +24,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         set_single_persistent_default_layer(_QWERTY);
       }
       return false;
+    case COLEMAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_COLEMAK);
+      }
     case LOWER:
       if (record->event.pressed) {
         layer_on(_LOWER);
@@ -157,12 +161,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         break;
     case M_MODE:
         if (record->event.pressed) {
-            SEND_STRING("PC");
+            send_string("PC ");
+            send_string(get_highest_layer(default_layer_state) == _COLEMAK ? "COLEMAK" : "QWERTY");
         }
         break;
     case M_MODE_MAC:
         if (record->event.pressed) {
-            SEND_STRING("OSX");
+            send_string("OSX ");
+            send_string(get_highest_layer(default_layer_state) == _COLEMAK ? "COLEMAK" : "QWERTY");
         }
         break;
   }
diff --git a/users/ajp10304/ajp10304.h b/users/ajp10304/ajp10304.h
index ec1ed11c04..130c841607 100644
--- a/users/ajp10304/ajp10304.h
+++ b/users/ajp10304/ajp10304.h
@@ -18,6 +18,7 @@
 
 enum ajp10304_layers {
   _QWERTY,
+  _COLEMAK,
   _MAC,
   _LOWER,
   _MLWR,
@@ -34,6 +35,7 @@ enum ajp10304_layers {
 
 enum ajp10304_keycodes {
   QWERTY = SAFE_RANGE,
+  COLEMAK,
   MAC,
   FUNC,
   MFNC,
diff --git a/users/ajp10304/readme.md b/users/ajp10304/readme.md
index bfc39535c1..0683f42384 100644
--- a/users/ajp10304/readme.md
+++ b/users/ajp10304/readme.md
@@ -37,6 +37,15 @@ Refer to the README.md of the keyboard you want to flash.
 | Shft |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |  ,<  |  .>  |  /?  | Shft |
 | Fn   | Ctrl | Alt  | GUI  |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2  |
 
+##### Main Colemak-DHm Layer
+
+|      |      |      |     |       |      |       |       |       |      |      |      |
+| ---- |:----:| :---:|:---:|:-----:|:----:|:-----:|:-----:|:-----:|:----:|:----:| ----:|
+| Esc  |   Q  |   W  |  F  |   P   |  B   |   J   |   L   |   U   |  Y   |  ;:  | Bksp |
+| Tab  |   A  |   R  |  S  |   T   |  G   |   M   |   N   |   E   |  I   |  O   | Enter|
+| Shft |   Z  |   X  |  C  |   D   |  V   |   K   |   H   |  ,<   |  .>  |  /?  | Shft |
+| Fn   | Ctrl | Alt  | GUI | Lower | Bksp | Space | Raise | Shift | MENU | Ctrl | Fn2  |
+
 ##### Function Layer
 Activated when `fn` held in the above `qwerty` layer.
 
@@ -88,12 +97,12 @@ To finish the recording, press STOP. To replay the macro, press either PLAY1 or
 * MAC: Toggle MAC OS extensions to layers. This allows MLWR to be enabled with LOWER,
 MRSE with RAISE, MFNC with FUNC and MFNC2 with FUNC2 respectively.
 
-|       |      |      |      |      |      |      |      |      |      |      |      |
-| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|
-| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |  Del |
-| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      |      |
-| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      |      |
-|       |      |      |      |      |      |      |      | DYN  |      |      |      |
+|       |      |      |      |      |      |      |      |      |      |      |         |
+| :---: |:----:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:| :---:|:-------:|
+| ????  | Reset|Qwerty|      |      | REC1 | REC2 |      |      |      |      |   Del   |
+| CAPS  |      |      |      |      | PLAY1|PLAY2 | Mute | Vol+ | Play |      | Qwerty  |
+| MAC   |      |      |      |      | STOP1|STOP2 | Prev | Vol- | Next |      | Colemak |
+|       |      |      |      |      |      |      |      | DYN  |      |      |         |
 
 ##### Function 2 Layer
 Activated when `fn` held in the above `qwerty` layer.

From adaaee4edf485374362347198183f0cbdc42e418 Mon Sep 17 00:00:00 2001
From: rhmokey <57172003+rhmokey@users.noreply.github.com>
Date: Tue, 11 Jan 2022 09:07:09 +0800
Subject: [PATCH 235/867] [Keyboard] Add xox70hot (#15632)

---
 keyboards/mokey/xox70hot/config.h             | 36 ++++++++
 keyboards/mokey/xox70hot/info.json            | 85 +++++++++++++++++++
 .../mokey/xox70hot/keymaps/default/keymap.c   | 35 ++++++++
 keyboards/mokey/xox70hot/keymaps/via/keymap.c | 47 ++++++++++
 keyboards/mokey/xox70hot/keymaps/via/rules.mk |  1 +
 keyboards/mokey/xox70hot/readme.md            | 19 +++++
 keyboards/mokey/xox70hot/rules.mk             | 18 ++++
 keyboards/mokey/xox70hot/xox70hot.c           | 15 ++++
 keyboards/mokey/xox70hot/xox70hot.h           | 37 ++++++++
 9 files changed, 293 insertions(+)
 create mode 100644 keyboards/mokey/xox70hot/config.h
 create mode 100644 keyboards/mokey/xox70hot/info.json
 create mode 100644 keyboards/mokey/xox70hot/keymaps/default/keymap.c
 create mode 100644 keyboards/mokey/xox70hot/keymaps/via/keymap.c
 create mode 100644 keyboards/mokey/xox70hot/keymaps/via/rules.mk
 create mode 100644 keyboards/mokey/xox70hot/readme.md
 create mode 100644 keyboards/mokey/xox70hot/rules.mk
 create mode 100644 keyboards/mokey/xox70hot/xox70hot.c
 create mode 100644 keyboards/mokey/xox70hot/xox70hot.h

diff --git a/keyboards/mokey/xox70hot/config.h b/keyboards/mokey/xox70hot/config.h
new file mode 100644
index 0000000000..bc2279e3d1
--- /dev/null
+++ b/keyboards/mokey/xox70hot/config.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 Kyle McCreery
+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       0x6653
+#define PRODUCT_ID      0x3371
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Mokey
+#define PRODUCT         xox70hot
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 18
+
+#define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 }
+#define MATRIX_COL_PINS { F6, C7, F4, F5, F1, B6, D0, D2, D3, D1, D7, D4, D5, D6, B4, B5, C6, B7 }
+#define UNUSED_PINS
+
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/mokey/xox70hot/info.json b/keyboards/mokey/xox70hot/info.json
new file mode 100644
index 0000000000..08bcc556c2
--- /dev/null
+++ b/keyboards/mokey/xox70hot/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "xox70hot",
+    "url": "",
+    "maintainer": "Mokey",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k01", "x":1, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k06", "x":6, "y":0},
+                {"label":"k07", "x":7, "y":0},
+                {"label":"k08", "x":8, "y":0},
+                {"label":"k09", "x":9, "y":0},
+                {"label":"k0a", "x":10, "y":0},
+                {"label":"k0b", "x":11, "y":0},
+                {"label":"k0c", "x":12, "y":0},
+                {"label":"k0e", "x":13, "y":0, "w":2},
+                {"label":"k0f", "x":15.25, "y":0},
+                {"label":"k0g", "x":16.25, "y":0},
+                {"label":"k0h", "x":17.25, "y":0},
+                
+                {"label":"k10", "x":0, "y":1, "w":1.5},
+                {"label":"k12", "x":1.5, "y":1},
+                {"label":"k13", "x":2.5, "y":1},
+                {"label":"k14", "x":3.5, "y":1},
+                {"label":"k15", "x":4.5, "y":1},
+                {"label":"k16", "x":5.5, "y":1},
+                {"label":"k17", "x":6.5, "y":1},
+                {"label":"k18", "x":7.5, "y":1},
+                {"label":"k19", "x":8.5, "y":1},
+                {"label":"k1a", "x":9.5, "y":1},
+                {"label":"k1b", "x":10.5, "y":1},
+                {"label":"k1c", "x":11.5, "y":1},
+                {"label":"k1d", "x":12.5, "y":1},
+                {"label":"k1e", "x":13.5, "y":1, "w":1.5},
+                {"label":"k1f", "x":15.25, "y":1},
+                {"label":"k1g", "x":16.25, "y":1},
+                {"label":"k1h", "x":17.25, "y":1},
+                
+                {"label":"k20", "x":0, "y":2, "w":1.75},
+                {"label":"k22", "x":1.75, "y":2},
+                {"label":"k23", "x":2.75, "y":2},
+                {"label":"k24", "x":3.75, "y":2},
+                {"label":"k25", "x":4.75, "y":2},
+                {"label":"k26", "x":5.75, "y":2},
+                {"label":"k27", "x":6.75, "y":2},
+                {"label":"k28", "x":7.75, "y":2},
+                {"label":"k29", "x":8.75, "y":2},
+                {"label":"k2a", "x":9.75, "y":2},
+                {"label":"k2b", "x":10.75, "y":2},
+                {"label":"k2c", "x":11.75, "y":2},
+                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
+                
+                {"label":"k30", "x":0, "y":3, "w":2.25},
+                {"label":"k32", "x":2.25, "y":3},
+                {"label":"k33", "x":3.25, "y":3},
+                {"label":"k34", "x":4.25, "y":3},
+                {"label":"k35", "x":5.25, "y":3},
+                {"label":"k36", "x":6.25, "y":3},
+                {"label":"k37", "x":7.25, "y":3},
+                {"label":"k38", "x":8.25, "y":3},
+                {"label":"k39", "x":9.25, "y":3},
+                {"label":"k3a", "x":10.25, "y":3},
+                {"label":"k3b", "x":11.25, "y":3},
+                {"label":"k3d", "x":12.25, "y":3, "w":2.75},
+                {"label":"k3g", "x":16.25, "y":3},
+
+                {"label":"k40", "x":0, "y":4, "w":1.5},
+                {"label":"k41", "x":1.5, "y":4},
+                {"label":"k43", "x":2.5, "y":4, "w":1.5},
+                {"label":"k46", "x":4, "y":4, "w":7},
+                {"label":"k4a", "x":11, "y":4, "w":1.5},
+                {"label":"k4b", "x":12.5, "y":4},
+                {"label":"k4e", "x":13.5, "y":4, "w":1.5},
+                {"label":"k4f", "x":15.25, "y":4},
+                {"label":"k4g", "x":16.25, "y":4},
+                {"label":"k4h", "x":17.25, "y":4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/mokey/xox70hot/keymaps/default/keymap.c b/keyboards/mokey/xox70hot/keymaps/default/keymap.c
new file mode 100644
index 0000000000..574639fee9
--- /dev/null
+++ b/keyboards/mokey/xox70hot/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 Ocean
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT(
+        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_INSERT, KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DELETE, KC_END,  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, KC_GRV,  KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    LAYOUT(
+        _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______,                     _______, _______, _______
+    )
+};
diff --git a/keyboards/mokey/xox70hot/keymaps/via/keymap.c b/keyboards/mokey/xox70hot/keymaps/via/keymap.c
new file mode 100644
index 0000000000..bee84ef860
--- /dev/null
+++ b/keyboards/mokey/xox70hot/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2021 Ocean
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INSERT, KC_HOME, KC_PGUP,
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,KC_DELETE, KC_END,  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_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_RSFT,KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,KC_SPC,KC_RALT, KC_RGUI, KC_RCTL,KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_all(
+		KC_TRNS, 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_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/mokey/xox70hot/keymaps/via/rules.mk b/keyboards/mokey/xox70hot/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/mokey/xox70hot/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mokey/xox70hot/readme.md b/keyboards/mokey/xox70hot/readme.md
new file mode 100644
index 0000000000..eb5848917d
--- /dev/null
+++ b/keyboards/mokey/xox70hot/readme.md
@@ -0,0 +1,19 @@
+# xox70hot
+
+Support Atmega32u4 keyboard.
+
+* Keyboard Maintainer: [rhmokey](https://github.com/rhmokey)
+* Hardware Supported: Atmega32u4
+
+## Bootloader
+* **Physical reset button**: Short press the button on the back of the PCB to enter the Bootloader and flash the firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mokey/xox70hot:default
+
+Flashing example for this keyboard:
+
+    make mokey/xox70hot:default:flash
+
+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).
diff --git a/keyboards/mokey/xox70hot/rules.mk b/keyboards/mokey/xox70hot/rules.mk
new file mode 100644
index 0000000000..72aebf2d0b
--- /dev/null
+++ b/keyboards/mokey/xox70hot/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/keyboards/mokey/xox70hot/xox70hot.c b/keyboards/mokey/xox70hot/xox70hot.c
new file mode 100644
index 0000000000..728b5e4e39
--- /dev/null
+++ b/keyboards/mokey/xox70hot/xox70hot.c
@@ -0,0 +1,15 @@
+/* Copyright 2021 Ocean
+ * 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 "xox70hot.h"
\ No newline at end of file
diff --git a/keyboards/mokey/xox70hot/xox70hot.h b/keyboards/mokey/xox70hot/xox70hot.h
new file mode 100644
index 0000000000..e4ed4bff5c
--- /dev/null
+++ b/keyboards/mokey/xox70hot/xox70hot.h
@@ -0,0 +1,37 @@
+/* Copyright 2021 Ocean
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#pragma once
+
+#include "quantum.h"
+
+#define xxx KC_NO
+
+#define LAYOUT(\
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, k0h, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,           k3g, \
+    k40, k41,      k43,           k46,                k4a, k4b,           k4e, k4f, k4g, k4h \
+) \
+{ \
+    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,  KC_NO, k0e,     k0f,   k0g,   k0h }, \
+    { k10,  KC_NO, k12,   k13,  k14,  k15,   k16,  k17,   k18,  k19,   k1a,  k1b,  k1c,   k1d,  k1e,     k1f,   k1g,   k1h }, \
+    { k20,  KC_NO, k22,   k23,  k24,  k25,   k26,  k27,   k28,  k29,   k2a,  k2b,  k2c,   k2d,  KC_NO,  KC_NO, KC_NO,KC_NO }, \
+    { k30,  KC_NO, k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,  KC_NO, k3d,  KC_NO,  KC_NO,  k3g, KC_NO }, \
+    { k40,  k41,   KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4a,  k4b,  KC_NO, KC_NO,k4e,     k4f,   k4g,   k4h }  \
+}
+

From ffebc0407c75df06159fc136b8875f18b56f45fd Mon Sep 17 00:00:00 2001
From: mechlovin <57231893+mechlovin@users.noreply.github.com>
Date: Tue, 11 Jan 2022 08:08:32 +0700
Subject: [PATCH 236/867] [Keyboard] Add Kay60 PCB (#15566)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/mechlovin/kay60/config.h            | 136 ++++++++++++++++
 keyboards/mechlovin/kay60/info.json           | 147 ++++++++++++++++++
 keyboards/mechlovin/kay60/kay60.c             |  17 ++
 keyboards/mechlovin/kay60/kay60.h             |  66 ++++++++
 .../mechlovin/kay60/keymaps/default/keymap.c  |  36 +++++
 .../mechlovin/kay60/keymaps/default/readme.md |   1 +
 .../mechlovin/kay60/keymaps/via/keymap.c      |  50 ++++++
 .../mechlovin/kay60/keymaps/via/rules.mk      |   1 +
 keyboards/mechlovin/kay60/readme.md           |  26 ++++
 keyboards/mechlovin/kay60/rules.mk            |  18 +++
 10 files changed, 498 insertions(+)
 create mode 100644 keyboards/mechlovin/kay60/config.h
 create mode 100644 keyboards/mechlovin/kay60/info.json
 create mode 100644 keyboards/mechlovin/kay60/kay60.c
 create mode 100644 keyboards/mechlovin/kay60/kay60.h
 create mode 100644 keyboards/mechlovin/kay60/keymaps/default/keymap.c
 create mode 100644 keyboards/mechlovin/kay60/keymaps/default/readme.md
 create mode 100644 keyboards/mechlovin/kay60/keymaps/via/keymap.c
 create mode 100644 keyboards/mechlovin/kay60/keymaps/via/rules.mk
 create mode 100644 keyboards/mechlovin/kay60/readme.md
 create mode 100644 keyboards/mechlovin/kay60/rules.mk

diff --git a/keyboards/mechlovin/kay60/config.h b/keyboards/mechlovin/kay60/config.h
new file mode 100644
index 0000000000..ae321a6491
--- /dev/null
+++ b/keyboards/mechlovin/kay60/config.h
@@ -0,0 +1,136 @@
+/*
+Copyright 2021 Mechlovin'
+
+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    0x4D4C
+#define PRODUCT_ID   0x0601
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Mechlovin Studio
+#define PRODUCT      Kay60
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * 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 { D5, D3, D2, B1, B5}
+#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B2, B3, B7, B4, D7, D6, D4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+//#define LED_NUM_LOCK_PIN B0
+#define LED_CAPS_LOCK_PIN  B0
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 22
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+#    define RGBLIGHT_EFFECT_TWINKLE
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json
new file mode 100644
index 0000000000..513dcef12f
--- /dev/null
+++ b/keyboards/mechlovin/kay60/info.json
@@ -0,0 +1,147 @@
+{
+    "keyboard_name": "kay60",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/kay60/kay60.c b/keyboards/mechlovin/kay60/kay60.c
new file mode 100644
index 0000000000..61d968e48c
--- /dev/null
+++ b/keyboards/mechlovin/kay60/kay60.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Mechlovin'
+ *
+ * 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 "kay60.h"
diff --git a/keyboards/mechlovin/kay60/kay60.h b/keyboards/mechlovin/kay60/kay60.h
new file mode 100644
index 0000000000..52e2bb4893
--- /dev/null
+++ b/keyboards/mechlovin/kay60/kay60.h
@@ -0,0 +1,66 @@
+/* Copyright 2021 Mechlovin'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+#define XXX KC_NO
+
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2C │      │0D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └───────┘
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │       
+ *              ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤     
+ *              │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │     
+                ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌──────────┐
+                │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │   │3C        │ 2.75u RShift
+ *              ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤   └──────────┘
+ *              │40  │41  │42  │46                      │4A  │4B  │4C  │4D  │ Standard
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │40   │41 │42   │46                         │4B   │4C │4D   │ Tsangan/WKL
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,           \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      \
+    K40, K41, K42,           K46,                K4A, K4B, K4C, K4D            \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }, \
+}
+
+#define LAYOUT_60_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,      \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \
+    K40, K41, K42,           K46,                K4A, K4B, K4C, K4D       \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }, \
+}
+
diff --git a/keyboards/mechlovin/kay60/keymaps/default/keymap.c b/keyboards/mechlovin/kay60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..10546ece4d
--- /dev/null
+++ b/keyboards/mechlovin/kay60/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 Mechlovin' Studio
+ *
+ * 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
+
+#define LT1_CAP     LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        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,
+        LT1_CAP, 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_LSFT, TO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LGUI, KC_MENU, KC_LCTL
+    ),
+    [1] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PENT,
+        _______,          _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/mechlovin/kay60/keymaps/default/readme.md b/keyboards/mechlovin/kay60/keymaps/default/readme.md
new file mode 100644
index 0000000000..17a9cf38c5
--- /dev/null
+++ b/keyboards/mechlovin/kay60/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for kay60
\ No newline at end of file
diff --git a/keyboards/mechlovin/kay60/keymaps/via/keymap.c b/keyboards/mechlovin/kay60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..34b8cb9822
--- /dev/null
+++ b/keyboards/mechlovin/kay60/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2020 Mechlovin'
+ *
+ * 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
+
+#define LT1_CAP     LT(1, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        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,
+        LT1_CAP, 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_LSFT, TO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LGUI, KC_MENU, KC_LCTL
+    ),
+    [1] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PENT,
+        _______,          _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_P1,   KC_P2,   KC_P3,   _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/mechlovin/kay60/keymaps/via/rules.mk b/keyboards/mechlovin/kay60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/mechlovin/kay60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/kay60/readme.md b/keyboards/mechlovin/kay60/readme.md
new file mode 100644
index 0000000000..cc53c13175
--- /dev/null
+++ b/keyboards/mechlovin/kay60/readme.md
@@ -0,0 +1,26 @@
+# kay60
+
+![kay60](https://i.imgur.com/FVg59LUl.png)
+
+Kay60 PCB, 60% keyboard PCB.
+* Keyboard Maintainer: [Mechlovin'](https://mechlovin.studio)
+* Hardware Supported: Kay60, Atmega32U4
+* Hardware Availability: [Mechlovin'](https://mechlovin.studio)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/kay60:default
+
+Flashing example for this keyboard:
+
+    make mechlovin/kay60:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Physic button**: Press reset swith on the bottom of the PCB
diff --git a/keyboards/mechlovin/kay60/rules.mk b/keyboards/mechlovin/kay60/rules.mk
new file mode 100644
index 0000000000..f3ae57a374
--- /dev/null
+++ b/keyboards/mechlovin/kay60/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From c05d3eb365c8a3805c26f49a9abc7e4332d59155 Mon Sep 17 00:00:00 2001
From: Mewp <github@mewp.pl>
Date: Tue, 11 Jan 2022 02:09:15 +0100
Subject: [PATCH 237/867] [Keyboard] Fix suspend issues on ergodox_ez. (#15300)

Co-authored-by: Mewp <git@mewp.pl>
---
 keyboards/ergodox_ez/matrix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c
index c091b6eb97..e84a5e2bd3 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox_ez/matrix.c
@@ -70,7 +70,7 @@ void matrix_init_custom(void) {
 // Reads and stores a row, returning
 // whether a change occurred.
 static inline bool store_raw_matrix_row(uint8_t index) {
-    matrix_row_t temp = read_cols(index);
+    matrix_row_t temp = 0x3F & read_cols(index);
     if (raw_matrix[index] != temp) {
         raw_matrix[index] = temp;
         return true;

From 6a045e93f7f0240cacaf35a3f84102ec85920ec3 Mon Sep 17 00:00:00 2001
From: Khang <brew4k@gmail.com>
Date: Tue, 11 Jan 2022 09:11:57 +0800
Subject: [PATCH 238/867] [Keymap] Add keebio/iris keymap (#14688)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/keebio/iris/keymaps/khang/colors.h  | 67 +++++++++++++++
 keyboards/keebio/iris/keymaps/khang/config.h  | 33 ++++++++
 .../keebio/iris/keymaps/khang/extrakeys.h     | 81 +++++++++++++++++++
 keyboards/keebio/iris/keymaps/khang/keymap.c  | 71 ++++++++++++++++
 keyboards/keebio/iris/keymaps/khang/readme.md |  7 ++
 keyboards/keebio/iris/keymaps/khang/rules.mk  |  3 +
 6 files changed, 262 insertions(+)
 create mode 100644 keyboards/keebio/iris/keymaps/khang/colors.h
 create mode 100644 keyboards/keebio/iris/keymaps/khang/config.h
 create mode 100644 keyboards/keebio/iris/keymaps/khang/extrakeys.h
 create mode 100644 keyboards/keebio/iris/keymaps/khang/keymap.c
 create mode 100644 keyboards/keebio/iris/keymaps/khang/readme.md
 create mode 100644 keyboards/keebio/iris/keymaps/khang/rules.mk

diff --git a/keyboards/keebio/iris/keymaps/khang/colors.h b/keyboards/keebio/iris/keymaps/khang/colors.h
new file mode 100644
index 0000000000..245e76a8c2
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/khang/colors.h
@@ -0,0 +1,67 @@
+/* Copyright 2021 Nguyen Vu Khang <brew4k@gmail.com>
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#pragma once
+
+#define MINIMAL_BASEx(hue,sat) \
+    rgblight_sethsv_range(hue, sat, 0, 0, 12); \
+    rgblight_sethsv_range(hue, sat, 100, 5, 7)
+
+#define MINIMAL_BASE(hue, sat) \
+    {0, 12, hue, sat, 0}, \
+    {5, 2, hue, sat, 100}
+
+#define MINIMAL(hue, sat) \
+    {0, 12, hue, sat, 0}, \
+    {3, 1, hue, sat, 100}, \
+    {8, 1, hue, sat, 100}
+
+const int yellow = 30;
+const int green = 99;
+const int red = 252;
+const int base_sat = 120;
+
+const rgblight_segment_t PROGMEM _BL_rgblayer[] = RGBLIGHT_LAYER_SEGMENTS(
+    MINIMAL_BASE(yellow,250)
+);
+const rgblight_segment_t PROGMEM _FN_rgblayer[] = RGBLIGHT_LAYER_SEGMENTS(
+    MINIMAL(green,255)
+);
+const rgblight_segment_t PROGMEM _SL_rgblayer[] = RGBLIGHT_LAYER_SEGMENTS(
+    MINIMAL(red,255)
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    _BL_rgblayer,
+    _FN_rgblayer,
+    _SL_rgblayer
+);
+
+void keyboard_post_init_user(void) {
+    MINIMAL_BASEx(yellow,200);
+    rgblight_layers = my_rgb_layers;
+}
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _BL));
+    return state;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(1, layer_state_cmp(state, _FN));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _SL));
+    return state;
+}
diff --git a/keyboards/keebio/iris/keymaps/khang/config.h b/keyboards/keebio/iris/keymaps/khang/config.h
new file mode 100644
index 0000000000..28a3d269c6
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/khang/config.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 Nguyen Vu Khang <brew4k@gmail.com>
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#pragma once
+
+#define EE_HANDS
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_MAX_LAYERS 5
+#undef RGBLIGHT_ANIMATIONS
+#undef RGBLIGHT_EFFECT_ALTERNATING
+#undef RGBLIGHT_EFFECT_BREATHING
+#undef RGBLIGHT_EFFECT_CHRISTMAS
+#undef RGBLIGHT_EFFECT_KNIGHT
+#undef RGBLIGHT_EFFECT_RAINBOW_MOOD
+#undef RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#undef RGBLIGHT_EFFECT_RGB_TEST
+#undef RGBLIGHT_EFFECT_SNAKE
+#undef RGBLIGHT_EFFECT_STATIC_GRADIENT
+#undef RGBLIGHT_EFFECT_TWINKLE
+#undef MOUSEKEY_ENABLE
diff --git a/keyboards/keebio/iris/keymaps/khang/extrakeys.h b/keyboards/keebio/iris/keymaps/khang/extrakeys.h
new file mode 100644
index 0000000000..a9056f8bcf
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/khang/extrakeys.h
@@ -0,0 +1,81 @@
+/* Copyright 2021 Nguyen Vu Khang <brew4k@gmail.com>
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#pragma once
+
+enum my_keycodes {
+    ______ = SAFE_RANGE,
+    HYPR1, HYPR2, HYPR3, HYPR4, HYPR5, HYPR6, HYPR7, HYPR8, HYPR9, HYPR0,
+    HYPRL,
+    HYPRM,
+    HYPRP,
+    HYPRQ,
+    HYPRS,
+    HYPRT,
+    KC_STAB
+};
+
+#undef _______
+#define ______ KC_NO
+
+#define HYPR1 HYPR(KC_1)
+#define HYPR2 HYPR(KC_2)
+#define HYPR3 HYPR(KC_3)
+#define HYPR4 HYPR(KC_4)
+#define HYPR5 HYPR(KC_5)
+#define HYPR6 HYPR(KC_6)
+#define HYPR7 HYPR(KC_7)
+#define HYPR8 HYPR(KC_8)
+#define HYPR9 HYPR(KC_9)
+#define HYPR0 HYPR(KC_0)
+
+#define HYPRL HYPR(KC_L)
+#define HYPRM HYPR(KC_M)
+#define HYPRP HYPR(KC_P)
+#define HYPRQ HYPR(KC_Q)
+#define HYPRS HYPR(KC_S)
+#define HYPRT HYPR(KC_T)
+
+#define KC_STAB LSFT(KC_TAB)
+
+uint8_t mod_state;
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    mod_state = get_mods();
+    switch (keycode) {
+        case KC_BSPC: {
+            static bool delkey_registered;
+            if (record->event.pressed) { // on key-down of Backspace
+                if (mod_state & MOD_MASK_CTRL) {
+                    // Ctrl + Backspace -> Forward Delete
+                    del_mods(MOD_MASK_CTRL);
+                    register_code(KC_DEL);
+                    delkey_registered = true;
+                    set_mods(mod_state);
+                    return false;
+                }
+            } else { // on release of Backspace
+                if (delkey_registered) {
+                    unregister_code(KC_DEL);
+                    delkey_registered = false;
+                    return false;
+                }
+            }
+            return true;
+        };
+        break;
+    }
+    return true;
+};
diff --git a/keyboards/keebio/iris/keymaps/khang/keymap.c b/keyboards/keebio/iris/keymaps/khang/keymap.c
new file mode 100644
index 0000000000..71c36c8ff9
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/khang/keymap.c
@@ -0,0 +1,71 @@
+#include QMK_KEYBOARD_H
+
+enum keyboard_layers {
+    _BL = 0,
+    _FN,
+    _SL,
+    _BF,
+    _UP
+};
+
+#include "colors.h"
+#include "extrakeys.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_BL] = LAYOUT(
+    //┌────────┬────────┬────────┬────────┬────────┬────────┐                    ┌────────┬────────┬────────┬────────┬────────┬────────┐
+        KC_GRV ,  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 ,
+    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
+        KC_ESC ,  KC_A  ,  KC_S  ,  KC_D  ,  KC_F  ,  KC_G  ,                       KC_H  ,  KC_J  ,  KC_K  ,  KC_L  ,KC_SCLN ,KC_QUOT ,
+    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐  ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+       KC_LSFT ,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,KC_MINS ,   KC_PLUS ,  KC_N  ,  KC_M  ,KC_COMM , KC_DOT ,KC_SLSH ,MO(_FN) ,
+    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘  └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                      KC_LGUI ,KC_LCTL , KC_ENT ,             KC_SPC ,MO(_UP) ,KC_RALT
+                                  // └────────┴────────┴────────┘           └────────┴────────┴────────┘
+    ),
+
+    [_UP] = LAYOUT(
+    //┌────────┬────────┬────────┬────────┬────────┬────────┐                    ┌────────┬────────┬────────┬────────┬────────┬────────┐
+       KC_TILD ,KC_EXLM , KC_AT  ,KC_HASH , KC_DLR ,KC_PERC ,                      ______ , ______ , ______ ,KC_MINS , KC_EQL , KC_NO  ,
+    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
+        ______ , ______ , ______ , ______ , ______ , ______ ,                      ______ , ______ , ______ ,KC_LBRC ,KC_RBRC , ______ ,
+    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
+        ______ , ______ , ______ , ______ , ______ , ______ ,                     KC_LEFT ,KC_DOWN , KC_UP  ,KC_RGHT , ______ , ______ ,
+    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐  ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+       KC_LSFT , ______ , ______ , ______ , ______ , ______ , ______ ,    ______ , ______ , ______ , ______ , ______ , ______ , ______ ,
+    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘  └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                      KC_LGUI ,KC_LCTL , ______ ,             ______ , KC_NO  , ______
+                                  // └────────┴────────┴────────┘           └────────┴────────┴────────┘
+    ),
+
+    [_FN] = LAYOUT(
+    //┌────────┬────────┬────────┬────────┬────────┬────────┐                    ┌────────┬────────┬────────┬────────┬────────┬────────┐
+        ______ , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                      KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
+    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
+       KC_STAB , ______ , ______ , ______ , ______ , HYPRT  ,                      ______ , ______ , ______ , ______ , ______ , KC_F12 ,
+    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
+        ______ , ______ , HYPRS  , ______ , ______ , ______ ,                      ______ , ______ ,KC_BRID ,KC_BRIU , ______ , ______ ,
+    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐  ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+       MO(_SL) , ______ , ______ , ______ , ______ , ______ , ______ ,    ______ , ______ , HYPRM  ,KC_VOLD ,KC_VOLU , ______ , KC_NO  ,
+    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘  └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                       ______ , ______ , ______ ,            KC_MPLY ,KC_MPRV ,KC_MNXT
+                                  // └────────┴────────┴────────┘           └────────┴────────┴────────┘
+    ),
+
+    [_SL] = LAYOUT(
+    //┌────────┬────────┬────────┬────────┬────────┬────────┐                    ┌────────┬────────┬────────┬────────┬────────┬────────┐
+        ______ , HYPR1  , HYPR2  , HYPR3  , HYPR4  , HYPR5  ,                      HYPR6  , HYPR7  , HYPR8  , HYPR9  , HYPR0  , ______ ,
+    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
+        ______ , HYPRQ  , ______ , ______ , ______ , ______ ,                      ______ , ______ , ______ , ______ , HYPRP  , ______ ,
+    //├────────┼────────┼────────┼────────┼────────┼────────┤                    ├────────┼────────┼────────┼────────┼────────┼────────┤
+        ______ , ______ , ______ , ______ , ______ , ______ ,                      ______ , ______ , ______ ,HYPRL   , ______ , ______ ,
+    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐  ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+        KC_NO  , ______ , ______ , ______ , ______ , ______ , ______ ,    ______ , ______ , ______ , ______ , ______ , ______ , KC_NO  ,
+    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘  └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
+                                       ______ , ______ , ______ ,             RESET  , ______ , ______
+                                  // └────────┴────────┴────────┘           └────────┴────────┴────────┘
+    )
+};
diff --git a/keyboards/keebio/iris/keymaps/khang/readme.md b/keyboards/keebio/iris/keymaps/khang/readme.md
new file mode 100644
index 0000000000..c372ba54b2
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/khang/readme.md
@@ -0,0 +1,7 @@
+# Khang's Iris Keymap
+
+- QWERTY at heart
+- Space on right thumb
+- Enter on left thumb
+- Right-Shift as Fn
+- Minimal (disabled everything unused to save space)
diff --git a/keyboards/keebio/iris/keymaps/khang/rules.mk b/keyboards/keebio/iris/keymaps/khang/rules.mk
new file mode 100644
index 0000000000..316ec60f76
--- /dev/null
+++ b/keyboards/keebio/iris/keymaps/khang/rules.mk
@@ -0,0 +1,3 @@
+ENCODER_ENABLE = no
+MOUSEKEY_ENABLE = no
+RGBLIGHT_ENABLE = yes

From c20522369b881fadff215c83091f8b653e0071bb Mon Sep 17 00:00:00 2001
From: cedrikl <cedrikl.github@cedtadel.net>
Date: Mon, 10 Jan 2022 20:15:47 -0500
Subject: [PATCH 239/867] [Keymap] Add another GMMK Pro ANSI Keymap with custom
 RGB. (#14243)

Co-authored-by: Cedrik Lussier <lussier.cedrik@gmail.com>
---
 .../gmmk/pro/ansi/keymaps/cedrikl/keymap.c    | 154 +++++++++++++++
 .../pro/ansi/keymaps/cedrikl/rgb_matrix_map.h | 185 ++++++++++++++++++
 .../gmmk/pro/ansi/keymaps/cedrikl/rules.mk    |   2 +
 users/cedrikl/cedrikl.c                       |  36 ++++
 users/cedrikl/cedrikl.h                       |  21 ++
 users/cedrikl/config.h                        |  25 +++
 users/cedrikl/rules.mk                        |   4 +
 7 files changed, 427 insertions(+)
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/cedrikl/keymap.c
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/cedrikl/rgb_matrix_map.h
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/cedrikl/rules.mk
 create mode 100644 users/cedrikl/cedrikl.c
 create mode 100644 users/cedrikl/cedrikl.h
 create mode 100644 users/cedrikl/config.h
 create mode 100644 users/cedrikl/rules.mk

diff --git a/keyboards/gmmk/pro/ansi/keymaps/cedrikl/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/cedrikl/keymap.c
new file mode 100644
index 0000000000..2361ab5660
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/cedrikl/keymap.c
@@ -0,0 +1,154 @@
+/* Copyright 2021 Cedrik Lussier @cedrikl
+.* Directly inspired from the work of jonavin https://github.com/qmk/qmk_firmware/tree/master/keyboards/gmmk/pro/ansi/keymaps/jonavin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "rgb_matrix_map.h"
+#include "cedrikl.h"
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)
+//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
+//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
+//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
+//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
+//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
+
+
+    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
+    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
+    // if that's your preference.
+    //
+    // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
+    // it'll be back to normal when you plug it back in.
+    //
+    // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
+    // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
+    // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        EEP_RST, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET,            KC_MUTE,
+        KC_NLCK, KC_P1,   KC_P2,   KC_P3,   KC_P4,   KC_P5,   KC_P6,   KC_P7,   KC_P8,   KC_P9,   KC_P0,   KC_PMNS, KC_PPLS, KC_BSPC,          KC_PSCR,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_PSLS, KC_PAST, KC_BSLS,          KC_PGUP,
+        KC_CAPS, RGB_VAD, RGB_TOG, RGB_VAI, KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_PENT,          KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_PDOT, KC_SLSH,          KC_RSFT, KC_UP,   KC_INS,
+        KC_LCTL, KC_RGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_NO,   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
+// clang-format on
+
+#ifdef ENCODER_ENABLE
+    bool encoder_update_user(uint8_t index, bool clockwise) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+        return true;
+    }
+#endif // ENCODER_ENABLE
+
+
+#ifdef RGB_MATRIX_ENABLE
+//void set_layer_rgb(uint8_t led_min, uint8_t led_max, int layer) {
+//    const ledmap *l = &(ledmaps[layer]);
+//
+//    
+//
+//    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+//        HSV hsv = {
+//            .h = (*l)[i][0],
+//            .s = (*l)[i][1],
+//            .v = val,
+//        };
+//
+//        if (hsv.h || hsv.s) {
+//            RGB rgb = hsv_to_rgb(hsv);
+//            RGB_MATRIX_INDICATOR_SET_COLOR(i, rgb.r, rgb.g, rgb.b);
+//        }
+//    }
+//}
+
+    // These shorthands are used below to set led colors on each matrix cycle
+    void loop_colorset(const uint8_t *indices, int array_size, const HSV target_color) {
+        HSV work_color = target_color;
+        work_color.v = rgb_matrix_get_val();
+
+        RGB final_color = hsv_to_rgb(work_color);
+
+        for (int i = 0; i < array_size; i++) {
+            rgb_matrix_set_color(indices[i], final_color.r, final_color.g, final_color.b); // Set color A here
+        }
+    }
+
+    // Capslock, Scroll lock and Numlock  indicator on Left side lights.
+    void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+        loop_colorset(LED_REGION_A,      (sizeof(LED_REGION_A) / sizeof(LED_REGION_A[0])),           hsv_cl_blue);
+        loop_colorset(LED_REGION_B,      (sizeof(LED_REGION_B) / sizeof(LED_REGION_B[0])),           hsv_cl_purple);
+        loop_colorset(LED_REGION_L_SIDE, (sizeof(LED_REGION_L_SIDE) / sizeof(LED_REGION_L_SIDE[0])), hsv_cl_purple);
+        loop_colorset(LED_REGION_R_SIDE, (sizeof(LED_REGION_R_SIDE) / sizeof(LED_REGION_R_SIDE[0])), hsv_cl_purple);
+
+        switch(get_highest_layer(layer_state)){  // special handling per layer
+            case 1:  //layer 1
+                //rgb_matrix_set_color_all(RGB_AZURE);
+                loop_colorset(LED_REGION_NUMPAD, (sizeof(LED_REGION_NUMPAD) / sizeof(LED_REGION_NUMPAD[0])), hsv_cl_numpad);
+                loop_colorset(LED_REGION_OTHER,  (sizeof(LED_REGION_OTHER) / sizeof(LED_REGION_OTHER[0])),   hsv_cl_mods);
+            break;
+            default: //layer 0
+                //
+              break;
+            break;
+        }
+
+        HSV bad_hsv = hsv_cl_bad;
+        bad_hsv.v   = rgb_matrix_get_val();
+        RGB bad_rgb = hsv_to_rgb(bad_hsv);
+        led_t led_state = host_keyboard_led_state();
+
+        if (!led_state.num_lock) {   // on if NUM lock is OFF
+            rgb_matrix_set_color(LED_R1,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_R2,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_R3,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_R4,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_R5,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_R6,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_R7,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_R8,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+        }
+        if (led_state.caps_lock) {
+            rgb_matrix_set_color(LED_L1,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_L2,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_L3,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_L4,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_L5,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_L6,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_L7,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            rgb_matrix_set_color(LED_L8,   bad_rgb.r, bad_rgb.g, bad_rgb.b);
+            loop_colorset(LED_REGION_CAPS, (sizeof(LED_REGION_CAPS) / sizeof(LED_REGION_CAPS[0])), hsv_cl_bad);
+        }
+    }
+#endif
diff --git a/keyboards/gmmk/pro/ansi/keymaps/cedrikl/rgb_matrix_map.h b/keyboards/gmmk/pro/ansi/keymaps/cedrikl/rgb_matrix_map.h
new file mode 100644
index 0000000000..484f64b74c
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/cedrikl/rgb_matrix_map.h
@@ -0,0 +1,185 @@
+/* Copyright 2021 Cedrik Lussier @cedrikl
+.* Directly inspired from the work of jonavin https://github.com/qmk/qmk_firmware/tree/master/keyboards/gmmk/pro/ansi/keymaps/jonavin
+ *
+ * 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/>.
+ */
+
+#ifdef RGB_MATRIX_ENABLE
+
+    // Custom RGB Colours
+    const HSV hsv_cl_blue   = {150, 255, 255};
+    const HSV hsv_cl_purple = {188, 255, 255};
+    const HSV hsv_cl_numpad = {85,  255, 255};
+    const HSV hsv_cl_mods   = {42,  255, 255};
+    const HSV hsv_cl_bad    = {0,   255, 255};
+
+    // RGB LED locations
+    enum led_location_map {
+        LED_ESC, // 0, ESC, k13
+        LED_GRV, // 1, ~, k16
+        LED_TAB, // 2, Tab, k11
+        LED_CAPS, // 3, Caps, k21
+        LED_LSFT, // 4, Sh_L, k00
+        LED_LCTL, // 5, Ct_L, k06
+        LED_F1, // 6, F1, k26
+        LED_1, // 7, 1, k17
+        LED_Q, // 8, Q, k10
+        LED_A, // 9, A, k12
+        LED_Z, // 10, Z, k14
+        LED_LWIN, // 11, Win_L, k90
+        LED_F2, // 12, F2, k36
+        LED_2, // 13, 2, k27
+        LED_W, // 14, W, k20
+        LED_S, // 15, S, k22
+        LED_X, // 16, X, k24
+        LED_LALT, // 17, Alt_L, k93
+        LED_F3, // 18, F3, k31
+        LED_3, // 19, 3, k37
+        LED_E, // 20, E, k30
+        LED_D, // 21, D, k32
+        LED_C, // 22, C, k34
+        LED_F4, // 23, F4, k33
+        LED_4, // 24, 4, k47
+        LED_R, // 25, R, k40
+        LED_F, // 26, F, k42
+        LED_V, // 27, V, k44
+        LED_F5, // 28, F5, k07
+        LED_5, // 29, 5, k46
+        LED_T, // 30, T, k41
+        LED_G, // 31, G, k43
+        LED_B, // 32, B, k45
+        LED_SPC, // 33, SPACE, k94
+        LED_F6, // 34, F6, k63
+        LED_6, // 35, 6, k56
+        LED_Y, // 36, Y, k51
+        LED_H, // 37, H, k53
+        LED_N, // 38, N, k55
+        LED_F7, // 39, F7, k71
+        LED_7, // 40, 7, k57
+        LED_U, // 41, U, k50
+        LED_J, // 42, J, k52
+        LED_M, // 43, M, k54
+        LED_F8, // 44, F8, k76
+        LED_8, // 45, 8, k67
+        LED_I, // 46, I, k60
+        LED_K, // 47, K, k62
+        LED_COMM, // 48, ,, k64
+        LED_RALT, // 49, Alt_R, k95
+        LED_F9, // 50, F9, ka6
+        LED_9, // 51, 9, k77
+        LED_O, // 52, O, k70
+        LED_L, // 53, L, k72
+        LED_DOT, // 54, ., k74
+        LED_FN, // 55, FN, k92
+        LED_F10, // 56, F10, ka7
+        LED_0, // 57, 0, k87
+        LED_P, // 58, P, k80
+        LED_SCLN, // 59, ;, k82
+        LED_SLSH, // 60, ?, k85
+        LED_F11, // 61, F11, ka3
+        LED_MINS, // 62, -, k86
+        LED_LBRC, // 63, [, k81
+        LED_QUOT, // 64, ", k83
+        LED_RCTL, // 65, Ct_R, k04
+        LED_F12, // 66, F12, ka5
+        LED_L1, // 67, LED, l01
+        LED_R1, // 68, LED, l11
+        LED_DEL, // 69, Prt, k97  -- remapped to DEL
+        LED_L2, // 70, LED, l02
+        LED_R2, // 71, LED, l12
+        LED_HOME, // 72, Del, k65
+        LED_L3, // 73, LED, l03
+        LED_R3, // 74, LED, l13
+        LED_PGUP, // 75, PgUp, k15
+        LED_L4, // 76, LED, l04
+        LED_R4, // 77, LED, l14
+        LED_EQL, // 78, =, k66
+        LED_RGHT, // 79, Right, k05
+        LED_L5, // 80, LED, l05
+        LED_R5, // 81, LED, l15
+        LED_END, // 82, End, k75
+        LED_L6, // 83, LED, l06
+        LED_R6, // 84, LED, l16
+        LED_BSPC, // 85, BSpc, ka1
+        LED_PGDN, // 86, PgDn, k25
+        LED_L7, // 87, LED, l07
+        LED_R7, // 88, LED, l17
+        LED_RBRC, // 89, ], k61
+        LED_RSFT, // 90, Sh_R, k91
+        LED_L8, // 91, LED, l08
+        LED_R8, // 92, LED, l18
+        LED_BSLS, // 93, \, ka2
+        LED_UP, // 94, Up, k35
+        LED_LEFT, // 95, Left, k03
+        LED_ENT, // 96, Enter, ka4
+        LED_DOWN // 97, Down, k73
+    };
+
+const uint8_t LED_REGION_L_SIDE[] = {LED_L1, LED_L2, LED_L3, LED_L4, LED_L5, LED_L6, LED_L7,LED_L8};
+const uint8_t LED_REGION_R_SIDE[] = {LED_R1, LED_R2, LED_R3, LED_R4, LED_R5, LED_R6, LED_R7,LED_R8};
+
+    //const uint8_t LED_MATRIX[] = {
+    //    LED_ESC,  LED_F1,   LED_F2,   LED_F3,   LED_F4,   LED_F5,   LED_F6,   LED_F7,   LED_F8,   LED_F9,   LED_F10,  LED_F11,  LED_F12,  LED_DEL,
+    //    LED_GRV,  LED_1,    LED_2,    LED_3,    LED_4,    LED_5,    LED_6,    LED_7,    LED_8,    LED_9,    LED_0,    LED_MINS, LED_EQL,  LED_BSPC,           LED_HOME,
+    //    LED_TAB,  LED_Q,    LED_W,    LED_E,    LED_R,    LED_T,    LED_Y,    LED_U,    LED_I,    LED_O,    LED_P,    LED_LBRC, LED_RBRC, LED_BSLS,           LED_PGUP,
+    //    LED_CAPS, LED_A,    LED_S,    LED_D,    LED_F,    LED_G,    LED_H,    LED_J,    LED_K,    LED_L,    LED_SCLN, LED_QUOT,           LED_ENT,            LED_PGDN,
+    //    LED_LSFT,           LED_Z,    LED_X,    LED_C,    LED_V,    LED_B,    LED_N,    LED_M,    LED_COMM, LED_DOT,  LED_SLSH,           LED_RSFT, LED_UP,   LED_END,
+    //    LED_LCTL, LED_LWIN, LED_LALT,                            LED_SPC,                                   LED_RALT, LED_FN,   LED_RCTL, LED_LEFT, LED_DOWN, LED_RGHT
+    //};
+
+    const uint8_t LED_REGION_A[] = {
+        LED_ESC,                                                                                  LED_F9,   LED_F10,  LED_F11,  LED_F12,  LED_DEL,
+        LED_GRV,  LED_1,                                                                                    LED_0,    LED_MINS, LED_EQL,  LED_BSPC,           LED_HOME,
+        LED_TAB,  LED_Q,                                                                                    LED_P,    LED_LBRC, LED_RBRC, LED_BSLS,           LED_PGUP,
+        LED_CAPS, LED_A,                                                                                    LED_SCLN, LED_QUOT,           LED_ENT,            LED_PGDN,
+        LED_LSFT,           LED_Z,                                                                                              LED_SLSH,           LED_RSFT, LED_UP,   LED_END,
+        LED_LCTL, LED_LWIN, LED_LALT,                                                                                                     LED_RCTL, LED_LEFT, LED_DOWN, LED_RGHT
+    };
+    const uint8_t LED_REGION_B[] = {
+                  LED_F1,   LED_F2,   LED_F3,   LED_F4,   LED_F5,   LED_F6,   LED_F7,   LED_F8,
+                            LED_2,    LED_3,    LED_4,    LED_5,    LED_6,    LED_7,    LED_8,    LED_9,
+                            LED_W,    LED_E,    LED_R,    LED_T,    LED_Y,    LED_U,    LED_I,    LED_O,
+                            LED_S,    LED_D,    LED_F,    LED_G,    LED_H,    LED_J,    LED_K,    LED_L,
+                                      LED_X,    LED_C,    LED_V,    LED_B,    LED_N,    LED_M,    LED_COMM, LED_DOT, 
+                                                                 LED_SPC,                                   LED_RALT, LED_FN
+    };
+
+    const uint8_t LED_REGION_NUMPAD[] = {
+
+        LED_GRV,  LED_1,    LED_2,    LED_3,    LED_4,    LED_5,    LED_6,    LED_7,    LED_8,    LED_9,    LED_0,    LED_MINS, LED_EQL,
+                                                                                                                      LED_LBRC, LED_RBRC,
+                                                                                                                                          LED_ENT,
+                                                                                                            LED_DOT
+  
+    };
+
+    const uint8_t LED_REGION_OTHER[] = {
+        LED_ESC,                                                                                                                          LED_DEL,
+                                                                                                                                                              LED_HOME,
+
+                 LED_A,    LED_S,    LED_D,
+                                                                                                                                                              LED_END,
+                 LED_LWIN
+    };
+
+    const uint8_t LED_REGION_CAPS[] = {
+
+        LED_GRV,  LED_1,
+        LED_TAB,  LED_Q,
+        LED_CAPS, LED_A,
+        LED_LSFT,
+        LED_LCTL
+    };
+
+#endif
diff --git a/keyboards/gmmk/pro/ansi/keymaps/cedrikl/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/cedrikl/rules.mk
new file mode 100644
index 0000000000..4b7ed8bf0b
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/cedrikl/rules.mk
@@ -0,0 +1,2 @@
+IDLE_TIMEOUT_ENABLE = yes
+STARTUP_NUMLOCK_ON = yes
diff --git a/users/cedrikl/cedrikl.c b/users/cedrikl/cedrikl.c
new file mode 100644
index 0000000000..0479e22b5d
--- /dev/null
+++ b/users/cedrikl/cedrikl.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 Cedrik Lussier @cedrikl
+.* Directly inspired from the work of jonavin https://github.com/qmk/qmk_firmware/tree/master/keyboards/gmmk/pro/ansi/keymaps/jonavin
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include QMK_KEYBOARD_H
+#include "cedrikl.h"
+
+// Turn on/off NUM LOCK if current state is different
+void activate_numlock(bool turn_on) {
+    if (host_keyboard_led_state().num_lock != turn_on) {
+        tap_code(KC_NUMLOCK);
+    }
+}
+
+
+// INITIAL STARTUP
+
+void keyboard_post_init_user(void) {
+    #ifdef STARTUP_NUMLOCK_ON
+        activate_numlock(true); // turn on Num lock by default so that the numpad layer always has predictable results
+    #endif // STARTUP_NUMLOC_ON
+}
diff --git a/users/cedrikl/cedrikl.h b/users/cedrikl/cedrikl.h
new file mode 100644
index 0000000000..e25d274664
--- /dev/null
+++ b/users/cedrikl/cedrikl.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 Cedrik Lussier @cedrikl
+.* Directly inspired from the work of jonavin https://github.com/qmk/qmk_firmware/tree/master/keyboards/gmmk/pro/ansi/keymaps/jonavin
+
+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
+
+// OTHER FUNCTION PROTOTYPE
+void activate_numlock(bool turn_on);
diff --git a/users/cedrikl/config.h b/users/cedrikl/config.h
new file mode 100644
index 0000000000..741a2fe470
--- /dev/null
+++ b/users/cedrikl/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2021 Cedrik Lussier @cedrikl
+.* Directly inspired from the work of jonavin https://github.com/qmk/qmk_firmware/tree/master/keyboards/gmmk/pro/ansi/keymaps/jonavin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef RGB_MATRIX_ENABLE
+    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+    //#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED
+    #define RGB_MATRIX_STARTUP_VAL 120
+#endif
diff --git a/users/cedrikl/rules.mk b/users/cedrikl/rules.mk
new file mode 100644
index 0000000000..b5ee62c43a
--- /dev/null
+++ b/users/cedrikl/rules.mk
@@ -0,0 +1,4 @@
+SRC += cedrikl.c
+ifeq ($(strip $(STARTUP_NUMLOCK_ON)), yes)
+    OPT_DEFS += -DSTARTUP_NUMLOCK_ON
+endif

From 951fa1020b5c57bca656c25e20c8e12da8610f41 Mon Sep 17 00:00:00 2001
From: Tobias Minn <tobias.minn@gmail.com>
Date: Tue, 11 Jan 2022 02:17:11 +0100
Subject: [PATCH 240/867] DZ60 - ISO DE Arrow keymap + layout (#14221)

---
 keyboards/dz60/dz60.h                         | 27 ++++++
 .../dz60/keymaps/iso_de_arrow_0x544d/keymap.c | 96 +++++++++++++++++++
 .../keymaps/iso_de_arrow_0x544d/readme.md     | 10 ++
 3 files changed, 133 insertions(+)
 create mode 100644 keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c
 create mode 100644 keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md

diff --git a/keyboards/dz60/dz60.h b/keyboards/dz60/dz60.h
index 8062a74ce1..ba542dcbe8 100644
--- a/keyboards/dz60/dz60.h
+++ b/keyboards/dz60/dz60.h
@@ -331,6 +331,33 @@
     { k40,  k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, k4a,  k4b,  KC_NO, k4d,   k4e   }  \
 }
 
+/* LAYOUT_60_iso_arrow_one_bksp
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐2d  │
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │1e │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬──┴┬───┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3c    │3d │3e │
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤
+ * │40  │41  │43  │46                      │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT_60_iso_arrow_one_bksp( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a,      k3c, k3d, k3e, \
+    k40, k41,      k43,           k46,                k4a, k4b, k4c, k4d, k4e  \
+) { \
+    { k00,  k01,   k02,   k03,  k04,   k05,   k06,  k07,   k08,   k09,   k0a,  k0b,   k0c,  KC_NO, k0e   }, \
+    { k10,  KC_NO, k12,   k13,  k14,   k15,   k16,  k17,   k18,   k19,   k1a,  k1b,   k1c,  k1d,   k1e   }, \
+    { k20,  KC_NO, k22,   k23,  k24,   k25,   k26,  k27,   k28,   k29,   k2a,  k2b,   k2c,  k2d,   KC_NO }, \
+    { k30,  k31,   k32,   k33,  k34,   k35,   k36,  k37,   k38,   k39,   k3a,  KC_NO, k3c,  k3d,   k3e   }, \
+    { k40,  k41,   KC_NO, k43,  KC_NO, KC_NO, k46,  KC_NO, KC_NO, KC_NO, k4a,  k4b,   k4c,  k4d,   k4e   }  \
+}
+
 /* LAYOUT_60_abnt2
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
  * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
diff --git a/keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c b/keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c
new file mode 100644
index 0000000000..fb1bcd8dca
--- /dev/null
+++ b/keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c
@@ -0,0 +1,96 @@
+/* Copyright 2021 Tobias Minn (@0x544D) 
+  * 
+  * 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 layers_idx{
+  _BL = 0, // base layer
+  _FN1,    // function layer 1
+  _FN2     // function layer 2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+   /* ISO 60 layout by 0x544D (ISO German keyboard layout shown)
+   *
+   * Keyboard uses a HW layout with dedicated arrow keys. To accomplish that, the key on the
+   * left of the "UP arrow" key serves a dual purpose as "-_" when pressed short and as "RShift" key
+   * when you hold the key. To trigger the "underscore" you need to hold LShift and press "-_".
+   *
+   * ,-----------------------------------------------------------------------------------------.
+   * | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Backspace |
+   * |-----------------------------------------------------------------------------------------|
+   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Z  |  U  |  I  |  O  |  P  |  Ü  | + * | Enter  |
+   * |----------------------------------------------------------------------------------       |
+   * | MO(2)   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Ö  |  Ä  | # ' |       |
+   * |-----------------------------------------------------------------------------------------|
+   * | Shift | < > |  Y  |  X  |  C  |  V  |  B  |  N  |  M  | , ; | .: |-_ /Shift |  Up | Del |
+   * |-----------------------------------------------------------------------------------------|
+   * | LCtl  | LGUI  | LAlt  |            Space                  |RAlt| MO(1)| Lft | Dwn | Rgh |
+   * `-----------------------------------------------------------------------------------------'
+   */
+    [_BL] = LAYOUT_60_iso_arrow_one_bksp(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,         KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,         KC_RBRC,
+        MO(2),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,         KC_BSLS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT,         KC_DOWN, KC_RGHT
+    ),
+
+   /* Funtion Layer 1: Media Controls with arrow keys / RShift (Play Pause), F keys,
+   *                   RGB backlight control
+   * ,-----------------------------------------------------------------------------------------.
+   * | °^  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Delete  |
+   * |-----------------------------------------------------------------------------------------|
+   * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
+   * |----------------------------------------------------------------------------------       |
+   * |         |     |     |     |     |     |     |     |     |     |     |     |     |       |
+   * |-----------------------------------------------------------------------------------------|
+   * |       |     |     |     |     | RGB-|RGB_T| RGB+|     |     |     |  MPlay  |Vol_U|     |
+   * |-----------------------------------------------------------------------------------------|
+   * |       |       |       |                                   |     |Trans| MPrv|Vol_D| MNxt|
+   * `-----------------------------------------------------------------------------------------'
+   */
+    [_FN1] = LAYOUT_60_iso_arrow_one_bksp(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,          KC_F12,  KC_DEL,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_NO,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_NO,   KC_NO,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_RMOD,RGB_TOG, RGB_MOD, KC_NO,   KC_NO,   KC_NO,   KC_MPLY,         KC_VOLU, KC_NO,
+        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                     KC_NO,   KC_TRNS, KC_MPRV,         KC_VOLD, KC_MNXT
+    ),
+    
+
+   /* Funtion Layer 2: Media Controls left hand, F keys, Page up/down, Home/end, Program/RESET
+   * ,-----------------------------------------------------------------------------------------.
+   * | °^  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Delete  |
+   * |-----------------------------------------------------------------------------------------|
+   * |        |     |Vol_D|Vol_U|     |     |     |     |     |     |RESET|     |     |        |
+   * |----------------------------------------------------------------------------------       |
+   * |  Trans  |MPrv |MPlay| MNxt|     |     |     |     |     |     |     |     |     |       |
+   * |-----------------------------------------------------------------------------------------|
+   * |       |     |     |     |     |     |     |     |     |     |     |         |PGUP |     |
+   * |-----------------------------------------------------------------------------------------|
+   * |       |       |       |                                   |     |     | Home|PGDN | End |
+   * `-----------------------------------------------------------------------------------------'
+   */
+    [_FN2] = LAYOUT_60_iso_arrow_one_bksp(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,          KC_F12,  KC_DEL,
+        KC_NO,   KC_NO,   KC_VOLD, KC_VOLU, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RESET,   KC_NO,           KC_NO,
+        KC_TRNS, KC_MRWD, KC_MPLY, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_NO,   KC_NO,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_PGUP, KC_NO,
+        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                     KC_NO,   KC_NO,   KC_HOME,         KC_PGDN, KC_END
+    )
+};
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md b/keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md
new file mode 100644
index 0000000000..a3d58c159f
--- /dev/null
+++ b/keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md
@@ -0,0 +1,10 @@
+# DZ60 - ISO DE Arrow Layout
+
+![DZ60 ISO DE Arrow Layout Image](https://i.imgur.com/rfQRr7n.png)
+
+This is a modified version of the ISO DE layout for the DZ60 board. It has dedicated
+arrow keys and standard spacebar and backspace keys.
+
+The keyboard uses a hardware layout with dedicated arrow keys. To accomplish that, the key on the
+left of the "UP arrow" key serves a dual purpose as "-\_" when pressed short and as "RShift" key
+when you hold the key. To trigger the "underscore" you need to hold LShift and press "-\_".

From 6acfb61159cc055deeba219d398ebce95e114431 Mon Sep 17 00:00:00 2001
From: TerryMathews <terry@terrymathews.net>
Date: Mon, 10 Jan 2022 20:31:16 -0500
Subject: [PATCH 241/867] [Keyboard] TKC Candybar R3 (#15374)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 keyboards/tkc/candybar/lefty_r3/config.h      | 91 +++++++++++++++++++
 keyboards/tkc/candybar/lefty_r3/info.json     | 17 ++++
 .../lefty_r3/keymaps/default/keymap.c         | 40 ++++++++
 .../candybar/lefty_r3/keymaps/via/keymap.c    | 54 +++++++++++
 .../candybar/lefty_r3/keymaps/via/rules.mk    |  1 +
 keyboards/tkc/candybar/lefty_r3/lefty_r3.c    | 18 ++++
 keyboards/tkc/candybar/lefty_r3/lefty_r3.h    | 31 +++++++
 keyboards/tkc/candybar/lefty_r3/readme.md     | 22 +++++
 keyboards/tkc/candybar/lefty_r3/rules.mk      | 19 ++++
 keyboards/tkc/candybar/righty_r3/config.h     | 91 +++++++++++++++++++
 keyboards/tkc/candybar/righty_r3/info.json    | 16 ++++
 .../righty_r3/keymaps/default/keymap.c        | 40 ++++++++
 .../candybar/righty_r3/keymaps/via/keymap.c   | 54 +++++++++++
 .../candybar/righty_r3/keymaps/via/rules.mk   |  1 +
 keyboards/tkc/candybar/righty_r3/readme.md    | 22 +++++
 keyboards/tkc/candybar/righty_r3/righty_r3.c  | 17 ++++
 keyboards/tkc/candybar/righty_r3/righty_r3.h  | 30 ++++++
 keyboards/tkc/candybar/righty_r3/rules.mk     | 19 ++++
 18 files changed, 583 insertions(+)
 create mode 100644 keyboards/tkc/candybar/lefty_r3/config.h
 create mode 100644 keyboards/tkc/candybar/lefty_r3/info.json
 create mode 100644 keyboards/tkc/candybar/lefty_r3/keymaps/default/keymap.c
 create mode 100644 keyboards/tkc/candybar/lefty_r3/keymaps/via/keymap.c
 create mode 100644 keyboards/tkc/candybar/lefty_r3/keymaps/via/rules.mk
 create mode 100644 keyboards/tkc/candybar/lefty_r3/lefty_r3.c
 create mode 100644 keyboards/tkc/candybar/lefty_r3/lefty_r3.h
 create mode 100644 keyboards/tkc/candybar/lefty_r3/readme.md
 create mode 100644 keyboards/tkc/candybar/lefty_r3/rules.mk
 create mode 100644 keyboards/tkc/candybar/righty_r3/config.h
 create mode 100644 keyboards/tkc/candybar/righty_r3/info.json
 create mode 100644 keyboards/tkc/candybar/righty_r3/keymaps/default/keymap.c
 create mode 100644 keyboards/tkc/candybar/righty_r3/keymaps/via/keymap.c
 create mode 100644 keyboards/tkc/candybar/righty_r3/keymaps/via/rules.mk
 create mode 100644 keyboards/tkc/candybar/righty_r3/readme.md
 create mode 100644 keyboards/tkc/candybar/righty_r3/righty_r3.c
 create mode 100644 keyboards/tkc/candybar/righty_r3/righty_r3.h
 create mode 100644 keyboards/tkc/candybar/righty_r3/rules.mk

diff --git a/keyboards/tkc/candybar/lefty_r3/config.h b/keyboards/tkc/candybar/lefty_r3/config.h
new file mode 100644
index 0000000000..d7a4908430
--- /dev/null
+++ b/keyboards/tkc/candybar/lefty_r3/config.h
@@ -0,0 +1,91 @@
+/* Copyright 2021 Terry Mathews
+ *
+ * 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       0x544B //TK
+#define PRODUCT_ID      0x0003
+#define DEVICE_VER      0x0006
+#define MANUFACTURER    The Key Company
+#define PRODUCT         Candybar
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 17
+#define DIODE_DIRECTION COL2ROW
+#define MATRIX_ROW_PINS { F1, F0, D0, D2 }
+#define MATRIX_COL_PINS { B5, B6, C6, C7, F7, F6, F5, F4, D5, B3, B0, B1, B2, D4, D6, D7, B4 }
+
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+// #define WS2812_LED_N 2
+// #define RGBLED_NUM WS2812_LED_N
+// #define WS2812_TIM_N 2
+// #define WS2812_TIM_CH 2
+// #define PORT_WS2812     GPIOA
+// #define PIN_WS2812      1
+// #define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection)
+//#define WS2812_DMA_CHANNEL 7                  // DMA channel for TIMx_UP
+//#define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/tkc/candybar/lefty_r3/info.json b/keyboards/tkc/candybar/lefty_r3/info.json
new file mode 100644
index 0000000000..1ef3dcd54a
--- /dev/null
+++ b/keyboards/tkc/candybar/lefty_r3/info.json
@@ -0,0 +1,17 @@
+{
+    "keyboard_name": "TKC Candybar",
+    "url": "",
+    "maintainer": "terrymathews",
+    "width": 17,
+    "height": 4,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"Esc", "x":4, "y":0}, {"label":"Q", "x":5, "y":0}, {"label":"W", "x":6, "y":0}, {"label":"E", "x":7, "y":0}, {"label":"R", "x":8, "y":0}, {"label":"T", "x":9, "y":0}, {"label":"Y", "x":10, "y":0}, {"label":"U", "x":11, "y":0}, {"label":"I", "x":12, "y":0}, {"label":"O", "x":13, "y":0}, {"label":"P", "x":14, "y":0}, {"label":"{", "x":15, "y":0}, {"label":"}", "x":16, "y":0},
+                {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"Tab", "x":4, "y":1, "w":1.25}, {"label":"A", "x":5.25, "y":1}, {"label":"S", "x":6.25, "y":1}, {"label":"D", "x":7.25, "y":1}, {"label":"F", "x":8.25, "y":1}, {"label":"G", "x":9.25, "y":1}, {"label":"H", "x":10.25, "y":1}, {"label":"J", "x":11.25, "y":1}, {"label":"K", "x":12.25, "y":1}, {"label":"L", "x":13.25, "y":1}, {"label":":", "x":14.25, "y":1}, {"label":"Enter", "x":15.25, "y":1, "w":1.75},
+                {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2}, {"x":3, "y":2}, {"label":"Shift", "x":4, "y":2, "w":1.75}, {"label":"Z", "x":5.75, "y":2}, {"label":"X", "x":6.75, "y":2}, {"label":"C", "x":7.75, "y":2}, {"label":"V", "x":8.75, "y":2}, {"label":"B", "x":9.75, "y":2}, {"label":"N", "x":10.75, "y":2}, {"label":"M", "x":11.75, "y":2}, {"label":"<", "x":12.75, "y":2}, {"label":">", "x":13.75, "y":2}, {"label":"\u2191", "x":14.75, "y":2}, {"label":"Shift", "x":15.75, "y":2, "w":1.25},
+                {"label":"Fn", "x":0, "y":3}, {"label":"0", "x":1, "y":3}, {"label":".", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"Ctrl", "x":4, "y":3, "w":1.25}, {"label":"Win", "x":5.25, "y":3, "w":1.25}, {"label":"Alt", "x":6.5, "y":3, "w":1.25}, {"x":7.75, "y":3, "w":1.75}, {"x":9.5, "y":3}, {"x":10.5, "y":3, "w":2.25}, {"label":"Win", "x":12.75, "y":3, "w":1.25}, {"label":"\u2190", "x":14, "y":3}, {"label":"\u2193", "x":15, "y":3}, {"label":"\u2192", "x":16, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tkc/candybar/lefty_r3/keymaps/default/keymap.c b/keyboards/tkc/candybar/lefty_r3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2a66ec834f
--- /dev/null
+++ b/keyboards/tkc/candybar/lefty_r3/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 Terry Mathews
+ *
+ * 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 custom_layers {
+    _BL,
+    _FL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[_BL] = LAYOUT(
+  KC_P7  , KC_P8, KC_P9  , KC_PAST, KC_ESC , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_O   , KC_P   , KC_DEL , KC_BSPC , \
+  KC_P4  , KC_P5, KC_P6  , KC_PMNS, KC_TAB , KC_A   , KC_S   , KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_SCLN,          KC_ENT  , \
+  KC_P1  , KC_P2, KC_P3  , KC_PPLS, KC_LSFT,          KC_Z   , KC_X, KC_C   , KC_V  , KC_B, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_UP   ,KC_RSFT , \
+  MO(_FL), KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , KC_LEFT, KC_DOWN, KC_RGHT),
+
+  /* Keymap _FL: Function Layer
+  */
+  [_FL] = LAYOUT(
+  KC_P7 , KC_P8, KC_P9  , KC_VOLU, RESET  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC , \
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
+  KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
+};
diff --git a/keyboards/tkc/candybar/lefty_r3/keymaps/via/keymap.c b/keyboards/tkc/candybar/lefty_r3/keymaps/via/keymap.c
new file mode 100644
index 0000000000..40890bd7ac
--- /dev/null
+++ b/keyboards/tkc/candybar/lefty_r3/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2021 Terry Mathews
+ *
+ * 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 layer_names {
+    _BL, 
+    _FL, 
+    _AL, 
+    _LL, 
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[_BL] = LAYOUT(
+  KC_P7  , KC_P8, KC_P9  , KC_PAST, KC_ESC , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_O   , KC_P   , KC_DEL , KC_BSPC , \
+  KC_P4  , KC_P5, KC_P6  , KC_PMNS, KC_TAB , KC_A   , KC_S   , KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_SCLN,          KC_ENT  , \
+  KC_P1  , KC_P2, KC_P3  , KC_PPLS, KC_LSFT,          KC_Z   , KC_X, KC_C   , KC_V  , KC_B, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_UP   ,KC_RSFT , \
+  MO(_FL), KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , KC_LEFT, KC_DOWN, KC_RGHT),
+
+  /* Keymap _FL: Function Layer
+  */
+  [_FL] = LAYOUT(
+  KC_P7 , KC_P8, KC_P9  , KC_VOLU, RESET  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC , \
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
+  KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
+  
+  [_AL] = LAYOUT(
+  KC_P7 , KC_P8, KC_P9  , KC_VOLU, RESET  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC , \
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
+  KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
+  
+  [_LL] = LAYOUT(
+  KC_P7 , KC_P8, KC_P9  , KC_VOLU, RESET  , KC_Q   , KC_W   , KC_E, KC_R   , KC_T  , KC_Y, KC_U   , KC_I   , KC_LBRC, KC_RBRC, KC_INS , KC_BSPC , \
+  KC_P4 , KC_P5, KC_P6  , KC_VOLD, KC_TAB , KC_A   , KC_SLCK, KC_D, KC_F   , KC_G  , KC_H, KC_J   , KC_K   , KC_L   , KC_QUOT,          KC_BSLS , \
+  KC_P1 , KC_P2, KC_P3  , KC_PEQL, KC_LSFT,          KC_Z   , KC_X, KC_CAPS, KC_V  , KC_B, KC_NLCK, KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_PGUP , \
+  KC_END, KC_P0, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,       KC_SPC , KC_BSPC, KC_APP , MO(_FL), KC_HOME, KC_PGDN),
+};
diff --git a/keyboards/tkc/candybar/lefty_r3/keymaps/via/rules.mk b/keyboards/tkc/candybar/lefty_r3/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/tkc/candybar/lefty_r3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/tkc/candybar/lefty_r3/lefty_r3.c b/keyboards/tkc/candybar/lefty_r3/lefty_r3.c
new file mode 100644
index 0000000000..e5a821b7a9
--- /dev/null
+++ b/keyboards/tkc/candybar/lefty_r3/lefty_r3.c
@@ -0,0 +1,18 @@
+/* Copyright 2021 Terry Mathews
+ *
+ * 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 "lefty_r3.h"
+
diff --git a/keyboards/tkc/candybar/lefty_r3/lefty_r3.h b/keyboards/tkc/candybar/lefty_r3/lefty_r3.h
new file mode 100644
index 0000000000..d367e8d241
--- /dev/null
+++ b/keyboards/tkc/candybar/lefty_r3/lefty_r3.h
@@ -0,0 +1,31 @@
+/* Copyright 2021 Terry Mathews
+ *
+ * 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( \
+    k0d, k0e, k0f, k0g, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
+    k1d, k1e, k1f, k1g, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
+    k2d, k2e, k2f, k2g, k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
+    k3d, k3e, k3f, k3g, k30, k31, k32,           k35,      k37, k38, k39, k3a, k3b, k3c \
+) { \
+    { k00, k01  , k02, k03  , k04  , k05, k06  , k07, k08, k09, k0a, k0b  , k0c, k0d, k0e, k0f, k0g }  , \
+    { k10, k11  , k12, k13  , k14  , k15, k16  , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }  , \
+    { k20, KC_NO, k22, k23  , k24  , k25, k26  , k27, k28, k29, k2a, k2b  , k2c, k2d, k2e, k2f, k2g }  , \
+    { k30, k31  , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b  , k3c, k3d, k3e, k3f, k3g } \
+}
diff --git a/keyboards/tkc/candybar/lefty_r3/readme.md b/keyboards/tkc/candybar/lefty_r3/readme.md
new file mode 100644
index 0000000000..3de24a7fd5
--- /dev/null
+++ b/keyboards/tkc/candybar/lefty_r3/readme.md
@@ -0,0 +1,22 @@
+# TheKey.Company Candybar
+
+![Candybar](https://cdn.shopify.com/s/files/1/1679/2319/products/CBR3CollectionHERO_720x.jpg)
+
+The Key Company Candybar is a staggered 40% board with a numpad utilizing the ATmega32u4 microcontroller.
+
+* Keyboard Maintainer: [Terry Mathews](https://github.com/TerryMathews/)
+* Hardware Supported: TKC Candybar
+* Hardware Availability: [TheKey.Company](https://thekey.company/products/candybar-round-3)
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (default Escape key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make tkc/candybar/lefty_r3:default:flash
+
+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).
diff --git a/keyboards/tkc/candybar/lefty_r3/rules.mk b/keyboards/tkc/candybar/lefty_r3/rules.mk
new file mode 100644
index 0000000000..5021259667
--- /dev/null
+++ b/keyboards/tkc/candybar/lefty_r3/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes
diff --git a/keyboards/tkc/candybar/righty_r3/config.h b/keyboards/tkc/candybar/righty_r3/config.h
new file mode 100644
index 0000000000..f68e29013c
--- /dev/null
+++ b/keyboards/tkc/candybar/righty_r3/config.h
@@ -0,0 +1,91 @@
+/* Copyright 2021 Terry Mathews
+ *
+ * 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       0x544B //TK
+#define PRODUCT_ID      0x0002
+#define DEVICE_VER      0x0006
+#define MANUFACTURER    The Key Company
+#define PRODUCT         Candybar
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 17
+#define DIODE_DIRECTION COL2ROW
+#define MATRIX_ROW_PINS { F6, F7, D0, D2 }
+#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, C6, C7, D5, B1, B3, B2, B0, F0, F1, F4, F5 }
+
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+// #define WS2812_LED_N 2
+// #define RGBLED_NUM WS2812_LED_N
+// #define WS2812_TIM_N 2
+// #define WS2812_TIM_CH 2
+// #define PORT_WS2812     GPIOA
+// #define PIN_WS2812      1
+// #define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA stream for TIMx_UP (look up in reference manual under DMA Channel selection)
+//#define WS2812_DMA_CHANNEL 7                  // DMA channel for TIMx_UP
+//#define WS2812_EXTERNAL_PULLUP
diff --git a/keyboards/tkc/candybar/righty_r3/info.json b/keyboards/tkc/candybar/righty_r3/info.json
new file mode 100644
index 0000000000..81dc4f8ec5
--- /dev/null
+++ b/keyboards/tkc/candybar/righty_r3/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "TKC Candybar",
+    "url": "",
+    "maintainer": "terrymathews",
+    "width": 17,
+    "height": 4,
+    "layouts": {
+        "LAYOUT": {
+            "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":"Del", "x":11, "y":0}, {"label":"BkSp", "x":12, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"*", "x":16, "y":0},
+				{"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"-", "x":16, "y":1},
+				{"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":"&uarr;", "x":12, "y":2}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"+", "x":16, "y":2},
+				{"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3, "w":1}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"&larr;", "x":11, "y":3}, {"label":"&darr;", "x":12, "y":3}, {"label":"&rarr;", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}]
+        }
+    }
+}
diff --git a/keyboards/tkc/candybar/righty_r3/keymaps/default/keymap.c b/keyboards/tkc/candybar/righty_r3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..849f552961
--- /dev/null
+++ b/keyboards/tkc/candybar/righty_r3/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 Terry Mathews
+ *
+ * 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 layer_names {
+    _BL, 
+    _FL, 
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[_BL] = LAYOUT(
+  KC_ESC,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_DEL,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_PAST, \
+  KC_TAB,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_ENT,KC_P4,KC_P5,KC_P6,KC_PMNS, \
+  KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_RSFT,KC_UP,KC_P1,KC_P2,KC_P3,KC_PPLS, \
+  KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_LEFT,KC_DOWN,KC_RGHT,KC_P0,KC_PDOT,KC_PENT),
+
+  /* Keymap _FL: Function Layer
+   */
+[_FL] = LAYOUT(
+  RESET,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \
+  KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
+  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
+  KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
+};
diff --git a/keyboards/tkc/candybar/righty_r3/keymaps/via/keymap.c b/keyboards/tkc/candybar/righty_r3/keymaps/via/keymap.c
new file mode 100644
index 0000000000..269e3d727f
--- /dev/null
+++ b/keyboards/tkc/candybar/righty_r3/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2021 Terry Mathews
+ *
+ * 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 layer_names {
+    _BL, 
+    _FL, 
+    _AL, 
+    _LL, 
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[_BL] = LAYOUT(
+  KC_ESC,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_DEL,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_PAST, \
+  KC_TAB,KC_A,KC_S,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_SCLN,KC_ENT,KC_P4,KC_P5,KC_P6,KC_PMNS, \
+  KC_LSFT,KC_Z,KC_X,KC_C,KC_V,KC_B,KC_N,KC_M,KC_COMM,KC_DOT,KC_RSFT,KC_UP,KC_P1,KC_P2,KC_P3,KC_PPLS, \
+  KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_LEFT,KC_DOWN,KC_RGHT,KC_P0,KC_PDOT,KC_PENT),
+
+  /* Keymap _FL: Function Layer
+   */
+[_FL] = LAYOUT(
+  RESET,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \
+  KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
+  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
+  KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
+  
+  [_AL] = LAYOUT(
+  RESET,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \
+  KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
+  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
+  KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
+  
+  [_LL] = LAYOUT(
+  RESET,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_Y,KC_U,KC_I,KC_LBRC,KC_RBRC,KC_INS,KC_BSPC,KC_P7,KC_P8,KC_P9,KC_VOLU, \
+  KC_TAB,KC_A,KC_SLCK,KC_D,KC_F,KC_G,KC_H,KC_J,KC_K,KC_L,KC_QUOT,KC_BSLS,KC_P4,KC_P5,KC_P6,KC_VOLD, \
+  KC_LSFT,KC_Z,KC_X,KC_CAPS,KC_V,KC_B,KC_NLCK,KC_M,KC_COMM,KC_DOT,KC_SLSH,KC_PGUP,KC_P1,KC_P2,KC_P3,KC_PEQL, \
+  KC_LCTL,KC_LGUI,KC_LALT,KC_SPC,KC_SPC,KC_BSPC,KC_APP,MO(_FL),KC_HOME,KC_PGDN,KC_END,KC_P0,KC_PDOT,KC_PENT),
+};
diff --git a/keyboards/tkc/candybar/righty_r3/keymaps/via/rules.mk b/keyboards/tkc/candybar/righty_r3/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/tkc/candybar/righty_r3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/tkc/candybar/righty_r3/readme.md b/keyboards/tkc/candybar/righty_r3/readme.md
new file mode 100644
index 0000000000..e91a0015e9
--- /dev/null
+++ b/keyboards/tkc/candybar/righty_r3/readme.md
@@ -0,0 +1,22 @@
+# TheKey.Company Candybar
+
+![Candybar](https://cdn.shopify.com/s/files/1/1679/2319/products/CBR3CollectionHERO_720x.jpg)
+
+The Key Company Candybar is a staggered 40% board with a numpad utilizing the ATmega32u4 microcontroller.
+
+* Keyboard Maintainer: [Terry Mathews](https://github.com/TerryMathews/)
+* Hardware Supported: TKC Candybar
+* Hardware Availability: [TheKey.Company](https://thekey.company/products/candybar-round-3)
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (default Escape key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make tkc/candybar/righty_r3:default:flash
+
+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).
diff --git a/keyboards/tkc/candybar/righty_r3/righty_r3.c b/keyboards/tkc/candybar/righty_r3/righty_r3.c
new file mode 100644
index 0000000000..193c228f96
--- /dev/null
+++ b/keyboards/tkc/candybar/righty_r3/righty_r3.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Terry Mathews
+ *
+ * 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 "righty_r3.h"
diff --git a/keyboards/tkc/candybar/righty_r3/righty_r3.h b/keyboards/tkc/candybar/righty_r3/righty_r3.h
new file mode 100644
index 0000000000..faaef49394
--- /dev/null
+++ b/keyboards/tkc/candybar/righty_r3/righty_r3.h
@@ -0,0 +1,30 @@
+/* Copyright 2021 Terry Mathews
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include "quantum.h"
+
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, k1d, k1e, k1f, k1g, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
+    k30, k31, k32,           k35,      k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g \
+) { \
+    { k00, k01  , k02, k03  , k04  , k05, k06  , k07, k08, k09, k0a, k0b  , k0c, k0d, k0e, k0f, k0g }  , \
+    { k10, k11  , k12, k13  , k14  , k15, k16  , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g }  , \
+    { k20, KC_NO, k22, k23  , k24  , k25, k26  , k27, k28, k29, k2a, k2b  , k2c, k2d, k2e, k2f, k2g }  , \
+    { k30, k31  , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b  , k3c, k3d, k3e, k3f, k3g } \
+}
diff --git a/keyboards/tkc/candybar/righty_r3/rules.mk b/keyboards/tkc/candybar/righty_r3/rules.mk
new file mode 100644
index 0000000000..5021259667
--- /dev/null
+++ b/keyboards/tkc/candybar/righty_r3/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes

From 79a8b55af250932e7c30a5f5864eda23c829737e Mon Sep 17 00:00:00 2001
From: Bailey Boylson <69098787+ll3macorn@users.noreply.github.com>
Date: Tue, 11 Jan 2022 09:32:45 +0800
Subject: [PATCH 242/867] [Keyboard] add info.json for bongopad (#15355)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/ll3macorn/bongopad/info.json | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 keyboards/ll3macorn/bongopad/info.json

diff --git a/keyboards/ll3macorn/bongopad/info.json b/keyboards/ll3macorn/bongopad/info.json
new file mode 100644
index 0000000000..1431c3ca35
--- /dev/null
+++ b/keyboards/ll3macorn/bongopad/info.json
@@ -0,0 +1,10 @@
+{
+	"keyboard_name": "Bongopad", 
+	"url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ll3macorn/bongopad", 
+	"maintainer": "Ll3macorn", 
+	"layouts": {
+	    "LAYOUT_default": {
+		"layout": [{"x":0, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}]
+	    }
+	}
+    }
\ No newline at end of file

From da1a01b811a382ac92b44558dc4f6eec9314571f Mon Sep 17 00:00:00 2001
From: yiancar <yiangosyiangou@cytanet.com.cy>
Date: Tue, 11 Jan 2022 01:36:44 +0000
Subject: [PATCH 243/867] [Keyboard] Add Nebula65B (#15433)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: yiancar <yiancar@gmail.com>
---
 keyboards/nebula68b/config.h                  | 134 ++++++++++++++++++
 keyboards/nebula68b/info.json                 |  84 +++++++++++
 keyboards/nebula68b/keymaps/default/keymap.c  |  32 +++++
 keyboards/nebula68b/keymaps/default/readme.md |   7 +
 keyboards/nebula68b/keymaps/via/keymap.c      |  46 ++++++
 keyboards/nebula68b/keymaps/via/readme.md     |   7 +
 keyboards/nebula68b/keymaps/via/rules.mk      |   1 +
 keyboards/nebula68b/nebula68b.c               | 111 +++++++++++++++
 keyboards/nebula68b/nebula68b.h               |  36 +++++
 keyboards/nebula68b/readme.md                 |  32 +++++
 keyboards/nebula68b/rules.mk                  |  22 +++
 11 files changed, 512 insertions(+)
 create mode 100755 keyboards/nebula68b/config.h
 create mode 100755 keyboards/nebula68b/info.json
 create mode 100755 keyboards/nebula68b/keymaps/default/keymap.c
 create mode 100755 keyboards/nebula68b/keymaps/default/readme.md
 create mode 100755 keyboards/nebula68b/keymaps/via/keymap.c
 create mode 100755 keyboards/nebula68b/keymaps/via/readme.md
 create mode 100755 keyboards/nebula68b/keymaps/via/rules.mk
 create mode 100755 keyboards/nebula68b/nebula68b.c
 create mode 100755 keyboards/nebula68b/nebula68b.h
 create mode 100755 keyboards/nebula68b/readme.md
 create mode 100755 keyboards/nebula68b/rules.mk

diff --git a/keyboards/nebula68b/config.h b/keyboards/nebula68b/config.h
new file mode 100755
index 0000000000..1c0d6db233
--- /dev/null
+++ b/keyboards/nebula68b/config.h
@@ -0,0 +1,134 @@
+/*
+Copyright 2021 Yiancar
+
+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       0x8968
+#define PRODUCT_ID      0x5338
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Yiancar-Designs
+#define PRODUCT         NEBULA68B
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS { D4, D6, D7, B4, E6 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+// #define MATRIX_HAS_GHOST
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+// #define FORCE_NKRO
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* RGB options */
+
+#define RGB_DI_PIN B7
+#define DRIVER_LED_TOTAL 79
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+// // VIA lighting is handled by the keyboard-level code
+#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/nebula68b/info.json b/keyboards/nebula68b/info.json
new file mode 100755
index 0000000000..253e9682ed
--- /dev/null
+++ b/keyboards/nebula68b/info.json
@@ -0,0 +1,84 @@
+{
+    "keyboard_name": "NEBULA68B",
+    "url": "",
+    "maintainer": "yiancar",
+    "layouts": {
+        "LAYOUT_68_ansi_split_bs": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+                {"x":15.25, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":14.25, "y":4},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nebula68b/keymaps/default/keymap.c b/keyboards/nebula68b/keymaps/default/keymap.c
new file mode 100755
index 0000000000..efb16d920e
--- /dev/null
+++ b/keyboards/nebula68b/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2021 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_68_ansi_split_bs( /* Base */
+    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, 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_PGDN,
+    KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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(1),   KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_68_ansi_split_bs( /* FN */
+    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_TRNS, KC_DEL,  KC_TRNS, KC_TRNS,
+    KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
+    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/nebula68b/keymaps/default/readme.md b/keyboards/nebula68b/keymaps/default/readme.md
new file mode 100755
index 0000000000..699c741555
--- /dev/null
+++ b/keyboards/nebula68b/keymaps/default/readme.md
@@ -0,0 +1,7 @@
+# The default keymap for Nebula68. VIA support disabled.
+
+![Layer 0](https://i.imgur.com/dXyRwb1.png)
+
+![Layer 1](https://i.imgur.com/kxXnxVQ.png)
+
+Default layer is normal ANSI 68%
diff --git a/keyboards/nebula68b/keymaps/via/keymap.c b/keyboards/nebula68b/keymaps/via/keymap.c
new file mode 100755
index 0000000000..565e11bd36
--- /dev/null
+++ b/keyboards/nebula68b/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2021 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_68_ansi_split_bs( /* Base */
+    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL, 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_PGDN,
+    KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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(1),   KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_68_ansi_split_bs( /* FN */
+    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_TRNS, KC_DEL,  KC_TRNS, KC_TRNS,
+    KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
+    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_68_ansi_split_bs( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_68_ansi_split_bs( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/nebula68b/keymaps/via/readme.md b/keyboards/nebula68b/keymaps/via/readme.md
new file mode 100755
index 0000000000..75cbcac25e
--- /dev/null
+++ b/keyboards/nebula68b/keymaps/via/readme.md
@@ -0,0 +1,7 @@
+# The default keymap for Nebula68. VIA support enabled.
+
+![Layer 0](https://i.imgur.com/dXyRwb1.png)
+
+![Layer 1](https://i.imgur.com/kxXnxVQ.png)
+
+Default layer is normal ANSI 68%
diff --git a/keyboards/nebula68b/keymaps/via/rules.mk b/keyboards/nebula68b/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/nebula68b/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/nebula68b/nebula68b.c b/keyboards/nebula68b/nebula68b.c
new file mode 100755
index 0000000000..4842d9be92
--- /dev/null
+++ b/keyboards/nebula68b/nebula68b.c
@@ -0,0 +1,111 @@
+/* Copyright 2021 Yiancar
+ *
+ * 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 "nebula68b.h"
+#include <lib/lib8tion/lib8tion.h>
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+led_config_t g_led_config = { {
+    {  0,      1,  2,      4,      5,      6,  7,      9,     10, 11, 13, 14, 15, 18, 19 },
+    { 36,     35, 34,     33,     32,     31, 30,     29,     28, 27, 26, 25, 24, 16, 22 },
+    { 38,     39, 40,     41,     42,     43, 44,     45,     46, 47, 48, 49, 23, 50, 20 },
+    { 64, NO_LED, 63,     62,     61,     60, 59,     58,     57, 56, 55, 54, 53, 52, 21 },
+    { 65,     66, 68, NO_LED, NO_LED, NO_LED, 70, NO_LED, NO_LED, 72, 73, 74, 76, 77, 78 }
+}, {
+    {  6, 10}, { 19, 10}, { 32, 10}, { 44, 13}, { 45, 10}, { 58, 10}, { 71, 10}, { 84, 10}, { 88, 13}, { 97, 10}, {110, 10}, {123, 10}, {132, 13}, {136, 10}, {149, 10}, {162, 10},
+    {175, 10}, {179, 13}, {188, 10}, {205, 10}, {218, 10}, {218, 23}, {205, 23}, {185, 23}, {169, 23}, {156, 23}, {143, 23}, {130, 23}, {117, 23}, {104, 23}, { 91, 23}, { 78, 23},
+    { 65, 23}, { 52, 23}, { 39, 23}, { 26, 23}, { 10, 23}, {  4, 26}, { 11, 35}, { 29, 35}, { 42, 35}, { 55, 35}, { 68, 35}, { 81, 35}, { 94, 35}, {107, 35}, {120, 35}, {133, 35},
+    {146, 35}, {159, 35}, {180, 35}, {220, 32}, {205, 48}, {177, 48}, {153, 48}, {140, 48}, {127, 48}, {114, 48}, {101, 48}, { 88, 48}, { 75, 48}, { 62, 48}, { 49, 48}, { 36, 48},
+    { 15, 48}, {  8, 61}, { 24, 61}, { 32, 52}, { 41, 61}, { 82, 56}, { 89, 61}, {132, 53}, {138, 61}, {154, 61}, {170, 61}, {179, 53}, {192, 61}, {205, 61}, {218, 61}
+}, {
+    1, 4, 4, 2, 4, 4, 4, 4, 2, 4, 4, 4, 2, 4, 4, 4, 4, 2, 1, 1, 1,
+    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 2,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 2,
+    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 2, 1, 2, 4, 2, 1, 1, 1, 2, 1, 1, 1
+} };
+// clang-format on
+#endif
+
+#if defined(RGB_MATRIX_ENABLE) && defined(VIA_ENABLE)
+void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
+    uint8_t *command_id = &(data[0]);
+    uint8_t *command_data = &(data[1]);
+    switch (*command_id) {
+        case id_lighting_set_value: {
+            uint8_t *value_id   = &(command_data[0]);
+            uint8_t *value_data = &(command_data[1]);
+            switch (*value_id) {
+                case id_qmk_rgblight_brightness: {
+                    rgb_matrix_sethsv_noeeprom(rgb_matrix_get_hue(), rgb_matrix_get_sat(), scale8(value_data[0], RGB_MATRIX_MAXIMUM_BRIGHTNESS));
+                    break;
+                }
+                case id_qmk_rgblight_effect: {
+                    rgb_matrix_mode_noeeprom(value_data[0]);
+                    if (value_data[0] == 0) {
+                        rgb_matrix_disable_noeeprom();
+                    } else {
+                        rgb_matrix_enable_noeeprom();
+                    }
+                    break;
+                }
+                case id_qmk_rgblight_effect_speed: {
+                    rgb_matrix_set_speed_noeeprom(value_data[0] * 85);
+                    break;
+                }
+                case id_qmk_rgblight_color: {
+                    rgb_matrix_sethsv_noeeprom(value_data[0], value_data[1], rgb_matrix_get_val());
+                    break;
+                }
+            }
+            break;
+        }
+        case id_lighting_get_value: {
+            uint8_t *value_id   = &(command_data[0]);
+            uint8_t *value_data = &(command_data[1]);
+            switch (*value_id) {
+                case id_qmk_rgblight_brightness: {
+                    value_data[0] = ((uint16_t)rgb_matrix_get_val() * 255) / RGB_MATRIX_MAXIMUM_BRIGHTNESS;
+                    break;
+                }
+                case id_qmk_rgblight_effect: {
+                    value_data[0] = rgb_matrix_get_mode();
+                    break;
+                }
+                case id_qmk_rgblight_effect_speed: {
+                    value_data[0] = rgb_matrix_get_speed() / 85;
+                    break;
+                }
+                case id_qmk_rgblight_color: {
+                    value_data[0] = rgb_matrix_get_hue();
+                    value_data[1] = rgb_matrix_get_sat();
+                    break;
+                }
+            }
+            break;
+        }
+        case id_lighting_save: {
+            eeconfig_update_rgb_matrix();
+            break;
+        }
+        default: {
+            *command_id         = id_unhandled;
+            break;
+        }
+    }
+}
+#endif
diff --git a/keyboards/nebula68b/nebula68b.h b/keyboards/nebula68b/nebula68b.h
new file mode 100755
index 0000000000..dd3469c54e
--- /dev/null
+++ b/keyboards/nebula68b/nebula68b.h
@@ -0,0 +1,36 @@
+/* Copyright 2021 Yiancar
+ *
+ * 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 XXX KC_NO
+
+#include "quantum.h"
+
+// This a shortcut to help you visually see your layout.
+
+#define LAYOUT_68_ansi_split_bs( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, K2E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,      K1E, K3E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,                \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                \
+    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E            \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
diff --git a/keyboards/nebula68b/readme.md b/keyboards/nebula68b/readme.md
new file mode 100755
index 0000000000..c0834e463a
--- /dev/null
+++ b/keyboards/nebula68b/readme.md
@@ -0,0 +1,32 @@
+# Nebula68B
+
+This is a standard fixed layout 68% PCB. It supports VIA, full per-key RGB and underglow RGB. This is revision B.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A 68% keyboard with ATMEGA32U4
+* Hardware Availability: https://spaceholdings.net/
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nebula68b:via
+
+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).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or dfu-util (`make nebula65b:<keymap>:flash`)
diff --git a/keyboards/nebula68b/rules.mk b/keyboards/nebula68b/rules.mk
new file mode 100755
index 0000000000..92dd198801
--- /dev/null
+++ b/keyboards/nebula68b/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes     # Enable Per-key RGB
+RGB_MATRIX_DRIVER = WS2812  # Per-key RGB Driver
+
+LTO_ENABLE = yes

From 8920db2b57b616e162e2d3162577db6f021e7658 Mon Sep 17 00:00:00 2001
From: jecassis <jecassis@users.noreply.github.com>
Date: Tue, 11 Jan 2022 01:39:10 +0000
Subject: [PATCH 244/867] [Keyboard] Add system76/launch_1 keyboard (#15395)

* WIP: virgo keyboard

* Finish layout

* Enable debugging and format

* Debug keypresses

* Add function layer

* Fix whitespace

* Fix some more whitespace

* Add Jeremy's map

* Add left split ortho 2U board

* Enabled extrakeys for volume & media control

* More work on split ortho 2U...
...but still not complete

* Finish default layout

* Fix many issues by renaming the keyboard

* Add right half as a keyboard

* Update config for right side

* WIP: Add split ortho 2U board

* WIP: Correct rules & config

* More work on split ortho

* More work on split ortho 2u

* Nearing completion on split ortho

* Remove left and right separate keyboards.
Split ortho 2U is complete and they are not needed.

* Add uglydense keyboard

* Rename directory for uglydense

* Swap right Fn and right ctrl keys

* Add jeremy's layout

* Add ian layout

* Add reset key, which is very useful for flashing.

* Add Levi's layout

* Update Levi's layout

* Fix Levi's Layout

* Fix Levi's layout again

* Add a README with some basic information

* Add keymap customization info to uglydense readme

* Make the readme make a little more sense.

* Make John a layout with left fn and left super swapped

* Update John's layout

* Add Carl's layout

* Add Sean's layout

* Add reset keys to all layouts

* Swap LALT & LGUI on default layout

* shpurk keyboard: initial commit

* Add nathaniel & shpurk layouts

* Update instructions to include necesarry dependencies

* Add Lrrr keyboard, ruler of Omicron Persei 8

* Update README for Lrrr

* Update Lrrr it uses Caterina bootloader
Also B1 wasn't working for Row 6, so I changed that to F6

* Swap RCTL & RALT

* Un-swap RCTL and RALT, making RCTL closer to right thumb

* Add printscreen to my layout

* Rename lrrr to Launch, enbiggen L-Shift to 2U

* Add layout files for Launch

* Rename launch to launch_1

* Add levi layout for ortho_split_2u

* Update carl keymap

* Add launch testboard

* Implement keyboard keycode reading using raw hid

* Enable dynamic keymap

* Add config support to launch_1

* Implement probe command, make logical key names match configurator

* Update logical key names again

* Add layout generator for keyboard configurator

* Add board name and version

* Add board name and version to test board

* Fix issues with compiling board and version commands

* Rename uglydense to launch_alpha_1 and launch_1 to launch_alpha_2

* Generate layouts for other launch prototypes

* Fix launch_alpha_1 logical names

* Add launch_beta_1

* Fix building production hex file with atmel-dfu bootloader

* Limit backlight brightness

* USB mux handling

* Allow repeat start

* Do USB MUX init before bootmagic

* Fixes for mux init

* Fix register write size for programmable function control

* Ensure bit shifts are correct

* Improve documentation

* Fix when i2c read ack condition happens

* Fix extra start in i2c_set

* Add ISP instructions

* Add fuse information

* Refactor

* Add RGB matrix support

* Fix RGB matrix

* Update Jeremy layout

* Enable audio controls

* Update Jeremy layout

* Ensure that n-key rollover is used

* Port changes to other launch boards

* Configuration values for starting HSV and speed (#7740)

* Define default HSV and speed for RGB matrix.

* Documentation for configuration values RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT and RGB_MATRIX_STARTUP_VAL.

* Document RGB_MATRIX_STARTUP_SPD.

* Preserve the ordering.

* Set default RGB mode, hue, and saturation

* Reduce AVR clock to 8MHz

* Update launch_beta_1 with new USB ID

* Update default LED mode

* Set default hue

* Disable RGB while suspended

* Add led value and color commands

* Add max value to CMD_LED_GET_VALUE

* Do not save custom mode to eeprom

* Add reset to bootloader command for Launch keyboard

* Rename launch_beta_1 to launch_1

* Enable LTO when compiling for launch_1

* Allow setting individual LED's

* Convert tabs to spaces

* Unlock on RESET keypress:
- Display unlock pattern
- Disable LED get/set functions
- Enable reset to bootloader function

* Reduce brightness of rainbow backdrop in unlock pattern

* Add hid commands for setting led matrix mode

This changes the color setting to not change the mode, and set the hue
and saturation for QMK effects.

* Fix `CMD_LED_GET_MODE`

* Add Levi's Launch layout

* Fix layer mistake in Levi's Launch layout

* Add matrix command

* Define default RGB matrix speed

* Add active_keys effect

* Move definition of RGB modes inside ifdef testing for custom RGB modes

* RGB parameters per layer

* fix: Call `system76_ec_rgb_layer` after setting mode

* Include layer 3 and 4 in default layout for launch_1

I added support for layer 3 and 4 to the Configurator, but it seems to
load bogus values.

`dynamic_keymap_reset()` has a comment saying:
```
// Reset the keymaps in EEPROM to what is in flash.
// All keyboards using dynamic keymaps should define a layout
// for the same number of layers as DYNAMIC_KEYMAP_LAYER_COUNT
```

Other keyboards seem to have default layouts that only list the first
two layers while setting `DYNAMIC_KEYMAP_LAYER_COUNT` to 4, but
whatever. This appears to make the Configurator behave as expected with
layer 3 and 4.

* Use EEPROM to store RGB parameters

* Add layer 2 and 3 to other keymaps

* Add LED_SAVE command

* Use eeprom_update_block to improve performance

* Revert "Configuration values for starting HSV and speed (#7740)"

This reverts commit de1f60fd370b4769336b8a707ee12657aee46412.

* Update launch_1 rules.mk for changes in Qmk

* WIP keycodes matching EC behavior

* Modify default layout to match design

* Apply updates to jeremy layout

* Improvements to RGB keycodes

* system76_ec: Add mode to disable layer backlight

* launch_1: Use `KC_NO` instead of `KC_TRNS` for default layout

* Revert "launch_1: Use `KC_NO` instead of `KC_TRNS` for default layout"

This reverts commit f71c5e7ac3cecbbb1a1f8934db1f329407fef041.

* Fix building bootloader

* Workaround for upstream orientation

* Custom USB IDs for USB hubs, disable USB hub feature controller

* Set USB mux orientation in a loop for one second

* Set mux orientation 100 times with 10 ms delay

* Update Jeremy's keymap

* Update Levi's Launch keymap

* Update flashing instructions and rewrite layout design instructions

* Update README.md

* Add a system76_ec command to disable input events

For testing purposes.

* Enable system76/launch_1 keyboard to work with QMK Firmware 0.15.3

 - Migrate system76/launch_1 from 0.7.103:
   - Explicitly enable used RGB matrix effects
   - Initialize flags field of `rgb_config_t` union/struct
   - Account for header and source file location changes
   - Update AVR platform makefile with Atmel DFU bootloader option
   - Update ATmega32U4 bootloader to latest from Microchip
 - Format C sources with ClangFormat
 - Format Markdown text with Prettier

* Remove System76 pre-release or test keyboards and keymaps

* Add licensing and replace guards in headers for system76/launch_1

* Remove options impact for system76/launch_1

* Revert AVR platform changes for `atmel-dfu` bootloader

* Update system76/launch_1 README

* Add system76/launch_1 information JSON file

* Replace `util/delay.h` timing abstractions in system76/launch_1

* Use I2C QMK abstractions in system76/launch_1

* Fully revert AVR platform changes for `atmel-dfu` bootloader

* Move `layouts.sh` into `keyboards/system76`

* Implement GitHub PR suggestions for system76/launch_1

* Make additional system76/launch_1 updates

* Implement minor system76/launch_1 change requests

* Add custom version of Bootmagic Lite and document fuse values for system76/launch_1

* Remove the RESET HID command from system76/launch_1

* Reorder `process_record_user` in system76/launch_1

* Add `post_rules.mk` to system76/launch_1

* Fix overlapping key in sytem76/launch_1
---
 keyboards/system76/launch_1/config.h          | 121 +++++
 keyboards/system76/launch_1/info.json         |  94 ++++
 .../launch_1/keymaps/default/keymap.c         | 104 ++++
 keyboards/system76/launch_1/launch_1.c        | 240 +++++++++
 keyboards/system76/launch_1/launch_1.h        |  38 ++
 keyboards/system76/launch_1/post_rules.mk     |  12 +
 keyboards/system76/launch_1/readme.md         |  62 +++
 keyboards/system76/launch_1/rgb_matrix_kb.inc | 157 ++++++
 keyboards/system76/launch_1/rules.mk          |  33 ++
 keyboards/system76/launch_1/usb_mux.c         | 478 ++++++++++++++++++
 keyboards/system76/launch_1/usb_mux.h         |  21 +
 keyboards/system76/layouts.sh                 |  75 +++
 keyboards/system76/readme.md                  |   5 +
 keyboards/system76/system76_ec.c              | 416 +++++++++++++++
 14 files changed, 1856 insertions(+)
 create mode 100644 keyboards/system76/launch_1/config.h
 create mode 100644 keyboards/system76/launch_1/info.json
 create mode 100644 keyboards/system76/launch_1/keymaps/default/keymap.c
 create mode 100644 keyboards/system76/launch_1/launch_1.c
 create mode 100644 keyboards/system76/launch_1/launch_1.h
 create mode 100644 keyboards/system76/launch_1/post_rules.mk
 create mode 100644 keyboards/system76/launch_1/readme.md
 create mode 100644 keyboards/system76/launch_1/rgb_matrix_kb.inc
 create mode 100644 keyboards/system76/launch_1/rules.mk
 create mode 100644 keyboards/system76/launch_1/usb_mux.c
 create mode 100644 keyboards/system76/launch_1/usb_mux.h
 create mode 100755 keyboards/system76/layouts.sh
 create mode 100644 keyboards/system76/readme.md
 create mode 100644 keyboards/system76/system76_ec.c

diff --git a/keyboards/system76/launch_1/config.h b/keyboards/system76/launch_1/config.h
new file mode 100644
index 0000000000..19752d58de
--- /dev/null
+++ b/keyboards/system76/launch_1/config.h
@@ -0,0 +1,121 @@
+/*
+ *  Copyright (C) 2021  System76
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+// USB device descriptor parameter
+#define VENDOR_ID    0x3384
+#define PRODUCT_ID   0x0001
+#define DEVICE_VER   0x0001
+#define MANUFACTURER System76
+#define PRODUCT      Launch Configurable Keyboard (launch_1)
+
+// Key matrix size
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 14
+
+/*
+ * Key matrix pins
+ * ROWS: AVR pins used for rows, top to bottom
+ * COLS: AVR pins used for columns, left to right
+ */
+#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 }
+#define MATRIX_COL_PINS { D7, C7, C6, B6, B5, B4, D6, D4, E6, D5, D3, D2, B7, B0 }
+#define UNUSED_PINS
+
+/*
+ * Diode Direction
+ * COL2ROW = COL => Anode (+), ROW => Cathode (-)
+ * ROW2COL = ROW => Anode (+), COL => Cathode (-)
+ */
+#define DIODE_DIRECTION COL2ROW
+
+// Set 0 if debouncing isn't needed
+#define DEBOUNCE 5
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_DI_PIN E2
+#    define DRIVER_LED_TOTAL 84
+#    define RGB_MATRIX_KEYPRESSES                                      // Reacts to keypresses
+// #    define RGB_MATRIX_KEYRELEASES                                     // Reacts to keyreleases (instead of keypresses)
+// #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS                             // Enables framebuffer effects
+#    define RGB_DISABLE_TIMEOUT 0                                      // Number of milliseconds to wait until RGB automatically turns off
+#    define RGB_DISABLE_AFTER_TIMEOUT 0                                // OBSOLETE: Number of ticks to wait until disabling effects
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED                             // Turns off effects when suspended
+// Limit brightness to support USB-A at 0.5 A
+// TODO: Do this dynamically based on power source
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 176                          // Limits maximum brightness of LEDs to 176 out of 255. If not defined, maximum brightness is set to 255
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON  // Sets the default mode, if none has been set
+#    define RGB_MATRIX_STARTUP_HUE 142                                 // Sets the default hue value, if none has been set
+#    define RGB_MATRIX_STARTUP_SAT 255                                 // Sets the default saturation value, if none has been set
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS       // Sets the default brightness value, if none has been set
+#    define RGB_MATRIX_STARTUP_SPD 127                                 // Sets the default animation speed, if none has been set
+#    define RGB_MATRIX_DISABLE_KEYCODES                                // Disables control of rgb matrix by keycodes (must use code functions to control the feature)
+
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#endif  // RGB_MATRIX_ENABLE
+
+// 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
+
+// I2C {
+#define F_SCL 100000UL // Run I2C bus at 100 kHz
+#define I2C_START_RETRY_COUNT 20
+#define I2C_TIMEOUT 100 // milliseconds
+// } I2C
+
+// EEPROM {
+#define EEPROM_SIZE 1024
+// TODO: Refactor with new user EEPROM code (coming soon)
+#define EEPROM_MAGIC 0x76EC
+#define EEPROM_MAGIC_ADDR 64
+// Bump this every time we change what we store
+// This will automatically reset the EEPROM with defaults
+// and avoid loading invalid data from the EEPROM
+#define EEPROM_VERSION 0x02
+#define EEPROM_VERSION_ADDR (EEPROM_MAGIC_ADDR + 2)
+// } EEPROM
+
+// Dynamic keymap {
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
+#define DYNAMIC_KEYMAP_MACRO_COUNT 0
+// Dynamic keymap starts after EEPROM version
+#define DYNAMIC_KEYMAP_EEPROM_ADDR (EEPROM_VERSION_ADDR + 1)
+// Dynamic macro starts after dynamic keymaps, it is disabled
+#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR (DYNAMIC_KEYMAP_EEPROM_ADDR + (DYNAMIC_KEYMAP_LAYER_COUNT * MATRIX_ROWS * MATRIX_COLS * 2))
+#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 0
+// } Dynamic keymap
+
+// System76 EC {
+#define SYSTEM76_EC_EEPROM_ADDR (DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR + DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE)
+#define SYSTEM76_EC_EEPROM_SIZE (EEPROM_SIZE - SYSTEM76_EC_EEPROM_ADDR)
+// } System76 EC
diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json
new file mode 100644
index 0000000000..10d39cc758
--- /dev/null
+++ b/keyboards/system76/launch_1/info.json
@@ -0,0 +1,94 @@
+{
+    "keyboard_name": "System76 Launch Configurable Keyboard (launch_1)",
+    "url": "https://system76.com/accessories/launch",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 1, "y": 0 },
+                { "label": "F2", "x": 2, "y": 0 },
+                { "label": "F3", "x": 3, "y": 0 },
+                { "label": "F4", "x": 4, "y": 0 },
+                { "label": "F5", "x": 5, "y": 0 },
+                { "label": "F6", "x": 6, "y": 0 },
+                { "label": "F7", "x": 7, "y": 0 },
+                { "label": "F8", "x": 8, "y": 0 },
+                { "label": "F9", "x": 9, "y": 0 },
+                { "label": "F10", "x": 10, "y": 0 },
+                { "label": "F11", "x": 11, "y": 0 },
+                { "label": "F12", "x": 12, "y": 0 },
+                { "label": "Del", "x": 13, "y": 0, "w": 1.5 },
+                { "label": "Home", "x": 14.75, "y": 0 },
+                { "label": "`", "x": 0, "y": 1 },
+                { "label": "1", "x": 1, "y": 1 },
+                { "label": "2", "x": 2, "y": 1 },
+                { "label": "3", "x": 3, "y": 1 },
+                { "label": "4", "x": 4, "y": 1 },
+                { "label": "5", "x": 5, "y": 1 },
+                { "label": "6", "x": 6, "y": 1 },
+                { "label": "7", "x": 7, "y": 1 },
+                { "label": "8", "x": 8, "y": 1 },
+                { "label": "9", "x": 9, "y": 1 },
+                { "label": "0", "x": 10, "y": 1 },
+                { "label": "-", "x": 11, "y": 1 },
+                { "label": "=", "x": 12, "y": 1 },
+                { "label": "Bksp", "x": 13, "y": 1, "w": 1.5 },
+                { "label": "PgUp", "x": 14.75, "y": 1 },
+                { "label": "Tab", "x": 0, "y": 2, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 2 },
+                { "label": "W", "x": 2.5, "y": 2 },
+                { "label": "E", "x": 3.5, "y": 2 },
+                { "label": "R", "x": 4.5, "y": 2 },
+                { "label": "T", "x": 5.5, "y": 2 },
+                { "label": "Y", "x": 6.5, "y": 2 },
+                { "label": "U", "x": 7.5, "y": 2 },
+                { "label": "I", "x": 8.5, "y": 2 },
+                { "label": "O", "x": 9.5, "y": 2 },
+                { "label": "P", "x": 10.5, "y": 2 },
+                { "label": "[", "x": 11.5, "y": 2 },
+                { "label": "]", "x": 12.5, "y": 2 },
+                { "label": "\\", "x": 13.5, "y": 2 },
+                { "label": "PgDn", "x": 14.75, "y": 2 },
+                { "label": "Caps", "x": 0.25, "y": 3, "w": 1.5 },
+                { "label": "A", "x": 1.75, "y": 3 },
+                { "label": "S", "x": 2.75, "y": 3 },
+                { "label": "D", "x": 3.75, "y": 3 },
+                { "label": "F", "x": 4.75, "y": 3 },
+                { "label": "G", "x": 5.75, "y": 3 },
+                { "label": "H", "x": 6.75, "y": 3 },
+                { "label": "J", "x": 7.75, "y": 3 },
+                { "label": "K", "x": 8.75, "y": 3 },
+                { "label": "L", "x": 9.75, "y": 3 },
+                { "label": ";", "x": 10.75, "y": 3 },
+                { "label": "'", "x": 11.75, "y": 3 },
+                { "label": "Enter", "x": 12.75, "y": 3, "w": 1.5 },
+                { "label": "End", "x": 14.75, "y": 3 },
+                { "label": "LShift", "x": 0.25, "y": 4, "w": 2 },
+                { "label": "Z", "x": 2.25, "y": 4 },
+                { "label": "X", "x": 3.25, "y": 4 },
+                { "label": "C", "x": 4.25, "y": 4 },
+                { "label": "V", "x": 5.25, "y": 4 },
+                { "label": "B", "x": 6.25, "y": 4 },
+                { "label": "N", "x": 7.25, "y": 4 },
+                { "label": "M", "x": 8.25, "y": 4 },
+                { "label": ",", "x": 9.25, "y": 4 },
+                { "label": ".", "x": 10.25, "y": 4 },
+                { "label": "/", "x": 11.25, "y": 4 },
+                { "label": "RShift", "x": 12.25, "y": 4, "w": 1.5 },
+                { "label": "Up", "x": 13.75, "y": 4 },
+                { "label": "LCtrl", "x": 0.25, "y": 5, "w": 1.5 },
+                { "label": "LAlt", "x": 1.75, "y": 5 },
+                { "label": "LFn", "x": 2.75, "y": 5 },
+                { "label": "Super", "x": 3.75, "y": 5 },
+                { "label": "Space", "x": 4.75, "y": 5, "w": 2 },
+                { "label": "Space", "x": 6.75, "y": 5, "w": 2 },
+                { "label": "RCtrl", "x": 8.75, "y": 5 },
+                { "label": "RAlt", "x": 9.75, "y": 5 },
+                { "label": "RFn", "x": 10.75, "y": 5, "w": 1.5 },
+                { "label": "Left", "x": 12.75, "y": 5 },
+                { "label": "Down", "x": 13.75, "y": 5 },
+                { "label": "Right", "x": 14.75, "y": 5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/system76/launch_1/keymaps/default/keymap.c b/keyboards/system76/launch_1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f9f86b6584
--- /dev/null
+++ b/keyboards/system76/launch_1/keymaps/default/keymap.c
@@ -0,0 +1,104 @@
+/*
+ *  Copyright (C) 2021  System76
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* Layer 0, default layer
+ _________________________________________________________________________________________________________________________________  ________
+|        |        |        |        |        |        |        |        |        |        |        |        |        |            ||        |
+|  ESC   |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |   F7   |   F8   |   F9   |  F10   |  F11   |  F12   |  DELETE    ||  HOME  |
+|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________|
+|   ~    |   !    |   @    |   #    |   $    |   %    |   ^    |   &    |   *    |   (    |   )    |   _    |   +    |            ||        |
+|   `    |   1    |   2    |   3    |   4    |   5    |   6    |   7    |   8    |   9    |   0    |   -    |   =    | BACKSPACE  ||  PGUP  |
+|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________|
+|            |        |        |        |        |        |        |        |        |        |        |  [     |   ]    |   |    ||        |
+|     TAB    |   Q    |   W    |   E    |   R    |   T    |   Y    |   U    |   I    |   O    |   P    |  {     |   }    |   \    ||  PGDN  |
+|____________|________|________|________|________|________|________|________|________|________|________|________|________|________||________|
+  |            |        |        |        |        |        |        |        |        |        |   :    |   "    |            |   |        |
+  |    CAPS    |   A    |   S    |   D    |   F    |   G    |   H    |   J    |   K    |   L    |   ;    |   '    |   ENTER    |   |  END   |
+  |____________|________|________|________|________|________|________|________|________|________|________|________|____________|___|________|
+  |                |        |        |        |        |        |        |        |   <    |    >   |   ?    |            |        |
+  |     SHIFT      |   Z    |   X    |   C    |   V    |   B    |   N    |   M    |   ,    |    .   |   /    |   SHIFT    |   UP   |
+  |________________|________|________|________|________|________|________|________|________|________|________|____________|________|________
+  |            |        |       |        |                 |                 |        |        |             |   |        |        |        |
+  |    CTRL    |  LALT  | FN    | LGUI   |    SPACE        |      SPACE      | RCTRL  |  RALT  |     FN      |   |  LEFT  |  DOWN  | RIGHT  |
+  |____________|________|_______|________|_________________|_________________|________|________|_____________|   |________|________|________|
+   */
+
+  [0] = LAYOUT(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,     KC_HOME,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_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_PGDN,
+      KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,          KC_END,
+      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_LALT, MO(1),   KC_LGUI, KC_SPC,           KC_SPC,           KC_RCTL, KC_RALT, MO(1),           KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+    /* Layer 1, function layer
+ _________________________________________________________________________________________________________________________________  ________
+|        |        |        |        |        |        |        |        |        |        |        |        |        |            || PLAY/  |
+| RESET  |        |        |        |        |        |        |        |        |        |        |        |        |            || PAUSE  |
+|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________|
+|        |        |        |        |        |        |        |        |        |        |  LED   |  LED   |  LED   |            || VOLUME |
+|        |        |        |        |        |        |        |        |        |        | TOGGLE |  DOWN  |  UP    |            ||   UP   |
+|________|________|________|________|________|________|________|________|________|________|________|________|________|____________||________|
+|            |        |        |        |        |        |        |        |        |        |        |        |        |        || VOLUME |
+|PRINT SCREEN|        |        |        |        |        |  HOME  |  PGDN  |  PGUP  |  END   |        |        |        |        ||  DOWN  |
+|____________|________|________|________|________|________|________|________|________|________|________|________|________|________||________|
+  |            |        |        |        |        |        |        |        |        |        |        |        |            |   |        |
+  |            |        |        |        |        |        |  LEFT  |  DOWN  |   UP   | RIGHT  |        |        |            |   |  MUTE  |
+  |____________|________|________|________|________|________|________|________|________|________|________|________|____________|___|________|
+  |                |        |        |        |        |        |        |        |        |        |        |            |        |
+  |                |        |        |        |        |        |        |        |        |        |        |            |  PGUP  |
+  |________________|________|________|________|________|________|________|________|________|________|________|____________|________|________
+  |            |        |       |        |                 |                 |        |        |             |   |        |        |        |
+  |            |        |       |        |                 |                 |        |        |             |   |  HOME  |  PGDN  |  END   |
+  |____________|________|_______|________|_________________|_________________|________|________|_____________|   |________|________|________|
+
+   * `RESET' resets the controller and puts the board into firmware flashing mode.
+   * If this key is hit accidentally, just unplug the board and plug it back in.
+   */
+
+  [1] = LAYOUT(
+    RESET,   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_MPLY,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_VAD, RGB_VAI, KC_TRNS,    KC_VOLU,
+    KC_PSCR,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_VOLD,
+      KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS,         KC_MUTE,
+      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_PGUP,
+      KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS,           KC_HOME, KC_PGDN, KC_END
+  ),
+
+  [2] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+      KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+      KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,   KC_TRNS,
+      KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [3] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+      KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,
+      KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,   KC_TRNS,
+      KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+};
diff --git a/keyboards/system76/launch_1/launch_1.c b/keyboards/system76/launch_1/launch_1.c
new file mode 100644
index 0000000000..0250b9d9cc
--- /dev/null
+++ b/keyboards/system76/launch_1/launch_1.c
@@ -0,0 +1,240 @@
+/*
+ *  Copyright (C) 2021  System76
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "launch_1.h"
+
+#include "usb_mux.h"
+
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+// LEDs by index
+//    0   1   2   3   4   5   6   7   8   9
+// 00 LM4 LL4 LK4 LJ4 LI4 LH4 LG4 LF4 LE4 LD4
+// 10 LC4 LB4 LA4 LA5 LB5 LC5 LD5 LE5 LG5 LH5
+// 20 LI5 LJ5 LK5 LL5 LM5 LO3 LM3 LL3 LK3 LJ3
+// 30 LI3 LH3 LG3 LF3 LE3 LD3 LC3 LB3 LA3 LA2
+// 40 LB2 LC2 LD2 LE2 LF2 LG2 LH2 LI2 LJ2 LK2
+// 50 LL2 LM2 LN2 LO2 LO1 LN1 LM1 LL1 LK1 LJ1
+// 60 LI1 LH1 LG1 LF1 LE1 LD1 LC1 LB1 LA1 LA0
+// 70 LB0 LC0 LD0 LE0 LF0 LG0 LH0 LI0 LJ0 LK0
+// 80 LL0 LM0 LN0 LO0
+led_config_t g_led_config = { LAYOUT(
+    // Key matrix to LED index
+    /*  A   B   C   D   E   F   G   H   I   J   K   L   M   N   O */
+/* 0 */ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+/* 1 */ 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54,
+/* 2 */ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+/* 3 */ 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26,     25,
+/* 4 */ 12, 11, 10,  9,  8,  7,  6,  5,  4,  3,  2,  1,      0,
+/* 5 */ 13, 14, 15, 16, 17,     18,      19, 20, 21,    22, 23, 24
+), {
+    // LED index to physical position (see leds.sh in `launch' repo)
+/* 00 */ {209, 51}, {190, 51}, {171, 51}, {156, 51}, {140, 51}, {125, 51}, {110, 51}, {95, 51}, {80, 51}, {65, 51},
+/* 10 */ {49, 51}, {34, 51}, {11, 51}, {8, 64}, {27, 64}, {42, 64}, {57, 64}, {80, 64}, {110, 64}, {133, 64},
+/* 20 */ {148, 64}, {167, 64}, {194, 64}, {209, 64}, {224, 64}, {224, 38}, {197, 38}, {178, 38}, {163, 38}, {148, 38},
+/* 30 */ {133, 38}, {118, 38}, {103, 38}, {87, 38}, {72, 38}, {57, 38}, {42, 38}, {27, 38}, {8, 38}, {4, 26},
+/* 40 */ {23, 26}, {38, 26}, {53, 26}, {68, 26}, {84, 26}, {99, 26}, {114, 26}, {129, 26}, {144, 26}, {159, 26},
+/* 50 */ {175, 26}, {190, 26}, {205, 26}, {224, 26}, {224, 13}, {201, 13}, {182, 13}, {167, 13}, {152, 13}, {137, 13},
+/* 60 */ {121, 13}, {106, 13}, {91, 13}, {76, 13}, {61, 13}, {46, 13}, {30, 13}, {15, 13}, {0, 13}, {0, 0},
+/* 70 */ {15, 0}, {30, 0}, {46, 0}, {61, 0}, {76, 0}, {91, 0}, {106, 0}, {121, 0}, {137, 0}, {152, 0},
+/* 80 */ {167, 0}, {182, 0}, {201, 0}, {224, 0}
+}, {
+    // LED index to flags (set all to LED_FLAG_KEYLIGHT)
+    /*   0  1  2  3  4  5  6  7  8  9 */
+/* 00 */ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+/* 10 */ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+/* 20 */ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+/* 30 */ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+/* 40 */ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+/* 50 */ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+/* 60 */ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+/* 70 */ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+/* 80 */ 4, 4, 4, 4
+} };
+#endif // RGB_MATRIX_ENABLE
+
+bool eeprom_is_valid(void) { 
+    return (
+        eeprom_read_word(((void *)EEPROM_MAGIC_ADDR)) == EEPROM_MAGIC &&
+        eeprom_read_byte(((void *)EEPROM_VERSION_ADDR)) == EEPROM_VERSION
+    );
+}
+// clang-format on
+
+void eeprom_set_valid(bool valid) {
+    eeprom_update_word(((void *)EEPROM_MAGIC_ADDR), valid ? EEPROM_MAGIC : 0xFFFF);
+    eeprom_update_byte(((void *)EEPROM_VERSION_ADDR), valid ? EEPROM_VERSION : 0xFF);
+}
+
+void bootmagic_lite_reset_eeprom(void) {
+    // Set the keyboard-specific EEPROM state as invalid
+    eeprom_set_valid(false);
+    // Set the TMK/QMK EEPROM state as invalid
+    eeconfig_disable();
+}
+
+// The lite version of TMK's bootmagic based on Wilba.
+// 100% less potential for accidentally making the keyboard do stupid things.
+void bootmagic_lite(void) {
+    // Perform multiple scans because debouncing can't be turned off.
+    matrix_scan();
+#if defined(DEBOUNCE) && DEBOUNCE > 0
+    wait_ms(DEBOUNCE * 2);
+#else
+    wait_ms(30);
+#endif
+    matrix_scan();
+
+    // If the configured key (commonly Esc) is held down on power up,
+    // reset the EEPROM valid state and jump to bootloader.
+    uint8_t row = 0;  // BOOTMAGIC_LITE_ROW;
+    uint8_t col = 0;  // BOOTMAGIC_LITE_COLUMN;
+
+    if (matrix_get_row(row) & (1 << col)) {
+        bootmagic_lite_reset_eeprom();
+
+        // Jump to bootloader.
+        bootloader_jump();
+    }
+}
+
+void system76_ec_rgb_eeprom(bool write);
+void system76_ec_rgb_layer(layer_state_t layer_state);
+void system76_ec_unlock(void);
+bool system76_ec_is_unlocked(void);
+
+rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT];
+
+void matrix_init_kb(void) {
+    usb_mux_init();
+
+    bootmagic_lite();
+    if (!eeprom_is_valid()) {
+        dynamic_keymap_reset();
+        dynamic_keymap_macro_reset();
+        system76_ec_rgb_eeprom(true);
+        eeprom_set_valid(true);
+    } else {
+        system76_ec_rgb_eeprom(false);
+    }
+
+    system76_ec_rgb_layer(layer_state);
+}
+
+void matrix_scan_kb(void) {
+    usb_mux_event();
+
+    matrix_scan_user();
+}
+
+#define LEVEL(value) (uint8_t)(((uint16_t)value) * ((uint16_t)RGB_MATRIX_MAXIMUM_BRIGHTNESS) / ((uint16_t)255))
+
+// clang-format off
+static const uint8_t levels[] = {
+    LEVEL(48),
+    LEVEL(72),
+    LEVEL(96),
+    LEVEL(144),
+    LEVEL(192),
+    LEVEL(255)
+};
+// clang-format on
+
+static uint8_t toggle_level = RGB_MATRIX_MAXIMUM_BRIGHTNESS;
+extern bool    input_disabled;
+
+static void set_value_all_layers(uint8_t value) {
+    if (!system76_ec_is_unlocked()) {
+        for (int8_t layer = 0; layer < DYNAMIC_KEYMAP_LAYER_COUNT; layer++) {
+            layer_rgb[layer].hsv.v = value;
+        }
+        system76_ec_rgb_layer(layer_state);
+    }
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (input_disabled) {
+        return false;
+    }
+
+    if (!process_record_user(keycode, record)) {
+        return false;
+    }
+
+    switch (keycode) {
+        case RESET:
+            if (record->event.pressed) {
+                system76_ec_unlock();
+            }
+#ifdef SYSTEM76_EC
+            return false;
+#else
+            return true;
+#endif
+        case RGB_VAD:
+            if (record->event.pressed) {
+                uint8_t level = rgb_matrix_config.hsv.v;
+                for (int i = sizeof(levels) - 1; i >= 0; i--) {
+                    if (levels[i] < level) {
+                        level = levels[i];
+                        break;
+                    }
+                }
+                set_value_all_layers(level);
+            }
+            return false;
+        case RGB_VAI:
+            if (record->event.pressed) {
+                uint8_t level = rgb_matrix_config.hsv.v;
+                for (int i = 0; i < sizeof(levels); i++) {
+                    if (levels[i] > level) {
+                        level = levels[i];
+                        break;
+                    }
+                }
+                set_value_all_layers(level);
+            }
+            return false;
+        case RGB_TOG:
+            if (record->event.pressed) {
+                uint8_t level = 0;
+                if (rgb_matrix_config.hsv.v == 0) {
+                    level = toggle_level;
+                } else {
+                    toggle_level = rgb_matrix_config.hsv.v;
+                }
+                set_value_all_layers(level);
+            }
+            return false;
+    }
+
+    return true;
+}
+
+layer_state_t layer_state_set_kb(layer_state_t layer_state) {
+    system76_ec_rgb_layer(layer_state);
+
+    return layer_state_set_user(layer_state);
+}
+
+#ifdef CONSOLE_ENABLE
+void keyboard_post_init_user(void) {
+    debug_enable   = true;
+    debug_matrix   = false;
+    debug_keyboard = false;
+}
+#endif  // CONSOLE_ENABLE
diff --git a/keyboards/system76/launch_1/launch_1.h b/keyboards/system76/launch_1/launch_1.h
new file mode 100644
index 0000000000..335b8ecbdf
--- /dev/null
+++ b/keyboards/system76/launch_1/launch_1.h
@@ -0,0 +1,38 @@
+/*
+ *  Copyright (C) 2021  System76
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+// clang-format off
+#define LAYOUT( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K0E, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E, \
+  K20,  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2E, \
+   K30,  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, \
+   K40,   K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,    K4B,  K4C,      \
+   K50,  K51, K52, K53, K54,      K55,      K56, K57, K58,      K59, K5A, K5B  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K0E }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K1E }, \
+    { K50, K51, K52, K53, K54, K3D, K55, K56, K57, K58, K59, K5A, K5B, K2E }, \
+}
+// clang-format on
diff --git a/keyboards/system76/launch_1/post_rules.mk b/keyboards/system76/launch_1/post_rules.mk
new file mode 100644
index 0000000000..3751a8b8c3
--- /dev/null
+++ b/keyboards/system76/launch_1/post_rules.mk
@@ -0,0 +1,12 @@
+# System76 EC
+#   remove the RESET HID command
+VALID_SYSTEM76_EC_TYPES := yes
+SYSTEM76_EC_ENABLE ?= no
+ifneq ($(strip $(SYSTEM76_EC_ENABLE)),no)
+    ifeq ($(filter $(SYSTEM76_EC_ENABLE),$(VALID_SYSTEM76_EC_TYPES)),)
+        $(error SYSTEM76_EC_EN="$(strip $(SYSTEM76_EC_ENABLE))" is not a valid type for the System76 EC option)
+    endif
+    ifneq ($(strip $(SYSTEM76_EC_ENABLE)),no)
+        OPT_DEFS += -DSYSTEM76_EC
+    endif
+endif
diff --git a/keyboards/system76/launch_1/readme.md b/keyboards/system76/launch_1/readme.md
new file mode 100644
index 0000000000..1dcdeccc39
--- /dev/null
+++ b/keyboards/system76/launch_1/readme.md
@@ -0,0 +1,62 @@
+# System76 Launch Configurable Keyboard (launch_1)
+
+![System76 Launch Configurable Keyboard](https://images.prismic.io/system76/b71307ac-dae6-4863-b7ca-804cd61c7ef8_launch_overhead.png?auto=compress,format&w=750)
+
+The Launch Configurable Keyboard is engineered to be comfortable, fully customizable, and make your workflow more efficient.
+
+- High-speed USB Hub
+- Works on Linux, Windows and macOS
+- 100% Open Source
+- Made in Colorado
+
+Additional Launch Keyboard resources:
+
+- Keyboard Maintainer: [System76](https://github.com/system76)
+- Hardware Supported: [System76 Launch GitHub Repository](https://github.com/system76/launch)
+- Hardware Availability: [Shop System76](https://system76.com/accessories/launch)
+
+## Building Firmware
+
+To build the firmware using `make` (after setting up the build environment), e.g.:
+
+```bash
+make -r system76/launch_1:default
+```
+
+Equivalently, using the QMK CLI:
+
+```bash
+qmk compile -kb system76/launch_1 -km default
+```
+
+## Flashing Firmware (DFU)
+
+To build and flash the firmware on the keyboard, e.g.:
+
+```bash
+make -r system76/launch_1:default:flash
+```
+
+Equivalently, using the QMK CLI:
+
+```bash
+qmk flash -kb system76/launch_1 -km default
+```
+
+## Flashing Firmware (ISP)
+
+To flash the firmware (and/or bootloader) using ISP refer to the [_ISP Flashing Guide_](https://docs.qmk.fm/#/isp_flashing_guide).
+
+> **Factory fuse values** => Low: `0x5E`, High: `0x99`, Extended: `0xF3`, Lock Bits: `0xFF`
+
+## Environment Setup
+
+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. If new to QMK, start with the [_Complete Newbs Guide_](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard.
+- **Keycode in layout**: Press the key mapped to `RESET` in the second layer (Escape).
+- **Electrical reset**: Briefly short AVR ISP's GND (6) and RST (5) pads on the back of the PCB.
diff --git a/keyboards/system76/launch_1/rgb_matrix_kb.inc b/keyboards/system76/launch_1/rgb_matrix_kb.inc
new file mode 100644
index 0000000000..484483e0a1
--- /dev/null
+++ b/keyboards/system76/launch_1/rgb_matrix_kb.inc
@@ -0,0 +1,157 @@
+/*
+ *  Copyright (C) 2021  System76
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+RGB_MATRIX_EFFECT(active_keys)
+RGB_MATRIX_EFFECT(raw_rgb)
+RGB_MATRIX_EFFECT(unlocked)
+
+#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+#include "dynamic_keymap.h"
+
+static bool active_keys_initialized = false;
+static uint8_t active_keys_table[DRIVER_LED_TOTAL] = {0};
+
+static void active_keys_initialize(void) {
+    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
+        for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+            uint8_t led = g_led_config.matrix_co[row][col];
+            if (led < DRIVER_LED_TOTAL && row < 16 && col < 16) {
+                active_keys_table[led] = (row << 4) | col;
+            }
+        }
+    }
+    active_keys_initialized = true;
+}
+
+static bool active_keys(effect_params_t* params) {
+    if (!active_keys_initialized) {
+        active_keys_initialize();
+    }
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    uint8_t layer = get_highest_layer(layer_state);
+    RGB rgb = hsv_to_rgb(rgb_matrix_config.hsv);
+
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+
+        uint8_t rowcol = active_keys_table[i];
+        uint8_t row = rowcol >> 4;
+        uint8_t col = rowcol & 0xF;
+        uint16_t keycode = dynamic_keymap_get_keycode(layer, row, col);
+        switch (keycode) {
+            case KC_NO:
+            case KC_TRNS:
+                rgb_matrix_set_color(i, 0, 0, 0);
+                break;
+            default:
+                rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+                break;
+        }
+    }
+
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+RGB raw_rgb_data[DRIVER_LED_TOTAL] = {0};
+
+static uint8_t normalize_component(uint8_t component) {
+    uint16_t x = (uint16_t)component;
+    x *= rgb_matrix_config.hsv.v;  // Multiply by current brightness
+    x /= 255;                      // Divide by maximum brightness
+    return (uint8_t)x;
+}
+
+static RGB normalize_index(uint8_t i) {
+    RGB raw = raw_rgb_data[i];
+    RGB rgb = {
+        .r = normalize_component(raw.r),
+        .g = normalize_component(raw.g),
+        .b = normalize_component(raw.b),
+    };
+    return rgb;
+}
+
+static bool raw_rgb(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = normalize_index(i);
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+static uint8_t unlocked_keys[8][2] = {
+    {2, 7},  // U
+    {4, 6},  // N
+    {3, 9},  // L
+    {2, 9},  // O
+    {4, 3},  // C
+    {3, 8},  // K
+    {2, 3},  // E
+    {3, 3},  // D
+};
+
+static uint8_t unlocked_ticks      = 0;
+static uint8_t unlocked_i          = 0;
+static uint8_t unlocked_leds_count = 0;
+static uint8_t unlocked_leds[2]    = {0, 0};
+
+static bool unlocked(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    unlocked_ticks++;
+
+    if (params->init) {
+        unlocked_ticks = 0;
+        unlocked_i = 0;
+    }
+
+    if (unlocked_ticks == 0) {
+        if (unlocked_i == 8) {
+            unlocked_leds_count = 0;
+            unlocked_i = 0;
+        } else {
+            unlocked_leds_count = rgb_matrix_map_row_column_to_led(unlocked_keys[unlocked_i][0], unlocked_keys[unlocked_i][1], unlocked_leds);
+            unlocked_i++;
+        }
+    }
+
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+
+        HSV hsv = {
+            .h = i + unlocked_ticks,
+            .s = 0xFF,
+            .v = 0x70,
+        };
+        for (uint8_t j = 0; j < unlocked_leds_count; j++) {
+            if (i == unlocked_leds[j]) {
+                hsv.s = 0;
+                hsv.v = 0xFF;
+            }
+        }
+
+        RGB rgb = hsv_to_rgb(hsv);
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+#endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/system76/launch_1/rules.mk b/keyboards/system76/launch_1/rules.mk
new file mode 100644
index 0000000000..1a0cd63b0d
--- /dev/null
+++ b/keyboards/system76/launch_1/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = atmega32u4
+
+# CPU frequency divided by two since AVR is at 3.3 V
+F_CPU = 8000000
+
+# External oscillator is 16 MHz
+F_USB = 16000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build options
+#   change yes to no to disable
+BOOTMAGIC_ENABLE = no       # Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and system control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+DYNAMIC_KEYMAP_ENABLE = yes # Reconfigurable keyboard without flashing firmware
+NKRO_ENABLE = yes           # USB N-key rollover
+RAW_ENABLE = yes            # Raw HID commands (used by Keyboard Configurator)
+BACKLIGHT_ENABLE = no       # RGB backlight (conflicts with RGB matrix)
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+RGB_MATRIX_ENABLE = yes     # RGB matrix
+RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_CUSTOM_KB = yes  # Custom keyboard effects
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes            # Link-time optimization for smaller binary
+
+# Add System76 EC command interface as well as I2C and USB mux drivers
+SRC += system76_ec.c usb_mux.c
+QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/system76/launch_1/usb_mux.c b/keyboards/system76/launch_1/usb_mux.c
new file mode 100644
index 0000000000..6cb04dcdd7
--- /dev/null
+++ b/keyboards/system76/launch_1/usb_mux.c
@@ -0,0 +1,478 @@
+/*
+ *  Copyright (C) 2021  System76
+ *  Copyright (C) 2021  Jimmy Cassis <KernelOops@outlook.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "usb_mux.h"
+
+#include <stdbool.h>
+
+#include "i2c_master.h"
+#include "wait.h"
+
+#define REG_PF1_CTL 0xBF800C04
+#define REG_PIO64_OEN 0xBF800908
+#define REG_PIO64_OUT 0xBF800928
+#define REG_VID 0xBF803000
+#define REG_PRT_SWAP 0xBF8030FA
+#define REG_USB3_HUB_VID 0xBFD2E548
+#define REG_RUNTIME_FLAGS2 0xBFD23408
+#define REG_I2S_FEAT_SEL 0xBFD23412
+
+struct USB7206 {
+    uint8_t addr;
+};
+
+struct USB7206 usb_hub = {.addr = 0x2D};
+
+// Perform USB7206 register access.
+// Returns zero on success or a negative number on error.
+i2c_status_t usb7206_register_access(struct USB7206* self) {
+    uint8_t register_access[3] = {
+        0x99,
+        0x37,
+        0x00,
+    };
+
+    return i2c_transmit(self->addr << 1, register_access, sizeof(register_access), I2C_TIMEOUT);
+}
+
+// Read data from USB7206 register region.
+// Returns number of bytes read on success or a negative number on error.
+i2c_status_t usb7206_read_reg(struct USB7206* self, uint32_t addr, uint8_t* data, int length) {
+    i2c_status_t status;
+
+    uint8_t register_read[9] = {
+        0x00,                   // Buffer address MSB: always 0
+        0x00,                   // Buffer address LSB: always 0
+        0x06,                   // Number of bytes to write to command block buffer area
+        0x01,                   // Direction: 0 = write, 1 = read
+        (uint8_t)length,        // Number of bytes to read from register
+        (uint8_t)(addr >> 24),  // Register address byte 3
+        (uint8_t)(addr >> 16),  // Register address byte 2
+        (uint8_t)(addr >> 8),   // Register address byte 1
+        (uint8_t)(addr >> 0),   // Register address byte 0
+    };
+
+    status = i2c_transmit(self->addr << 1, register_read, sizeof(register_read), I2C_TIMEOUT);
+    if (status < 0) {
+        return status;
+    }
+
+    status = usb7206_register_access(self);
+    if (status < 0) {
+        return status;
+    }
+
+    uint8_t read[2] = {
+        0x00,  // Buffer address MSB: always 0
+        0x06,  // Buffer address LSB: 6 to skip header
+    };
+
+    status = i2c_start((self->addr << 1) | I2C_WRITE, I2C_TIMEOUT);
+    if (status >= 0) {
+        for (uint16_t i = 0; i < sizeof(read); i++) {
+            status = i2c_write(read[i], I2C_TIMEOUT);
+            if (status < 0) {
+                goto error;
+            }
+        }
+    } else {
+        goto error;
+    }
+
+    status = i2c_start((self->addr << 1) | I2C_READ, I2C_TIMEOUT);
+    if (status < 0) {
+        goto error;
+    }
+
+    // Read and ignore buffer length
+    status = i2c_read_ack(I2C_TIMEOUT);
+    if (status < 0) {
+        goto error;
+    }
+
+    for (uint16_t i = 0; i < (length - 1) && status >= 0; i++) {
+        status = i2c_read_ack(I2C_TIMEOUT);
+        if (status >= 0) {
+            data[i] = (uint8_t)status;
+        }
+    }
+
+    if (status >= 0) {
+        status = i2c_read_nack(I2C_TIMEOUT);
+        if (status >= 0) {
+            data[(length - 1)] = (uint8_t)status;
+        }
+    }
+
+error:
+    i2c_stop();
+
+    return (status < 0) ? status : length;
+}
+
+// Read 32-bit value from USB7206 register region.
+// Returns number of bytes read on success or a negative number on error.
+i2c_status_t usb7206_read_reg_32(struct USB7206* self, uint32_t addr, uint32_t* data) {
+    i2c_status_t status;
+
+    // First byte is available length
+    uint8_t bytes[4] = {0, 0, 0, 0};
+
+    status = usb7206_read_reg(self, addr, bytes, sizeof(bytes));
+    if (status < 0) {
+        return status;
+    }
+
+    // Convert from little endian
+    *data = (((uint32_t)bytes[0]) << 0) | (((uint32_t)bytes[1]) << 8) | (((uint32_t)bytes[2]) << 16) | (((uint32_t)bytes[3]) << 24);
+
+    return status;
+}
+
+// Write data to USB7206 register region.
+// Returns number of bytes written on success or a negative number on error.
+i2c_status_t usb7206_write_reg(struct USB7206* self, uint32_t addr, uint8_t* data, int length) {
+    i2c_status_t status;
+
+    uint8_t register_write[9] = {
+        0x00,                   // Buffer address MSB: always 0
+        0x00,                   // Buffer address LSB: always 0
+        ((uint8_t)length) + 6,  // Number of bytes to write to command block buffer area
+        0x00,                   // Direction: 0 = write, 1 = read
+        (uint8_t)length,        // Number of bytes to write to register
+        (uint8_t)(addr >> 24),  // Register address byte 3
+        (uint8_t)(addr >> 16),  // Register address byte 2
+        (uint8_t)(addr >> 8),   // Register address byte 1
+        (uint8_t)(addr >> 0),   // Register address byte 0
+    };
+
+    status = i2c_start((self->addr << 1) | I2C_WRITE, I2C_TIMEOUT);
+    if (status >= 0) {
+        for (uint16_t i = 0; i < sizeof(register_write); i++) {
+            status = i2c_write(register_write[i], I2C_TIMEOUT);
+            if (status < 0) {
+                goto error;
+            }
+        }
+
+        for (uint16_t i = 0; i < length; i++) {
+            status = i2c_write(data[i], I2C_TIMEOUT);
+            if (status < 0) {
+                goto error;
+            }
+        }
+    } else {
+        goto error;
+    }
+
+    i2c_stop();
+
+    status = usb7206_register_access(self);
+    if (status < 0) {
+        goto error;
+    }
+
+error:
+    i2c_stop();
+
+    return (status < 0) ? status : length;
+}
+
+// Write 8-bit value to USB7206 register region.
+// Returns number of bytes written on success or a negative number on error.
+i2c_status_t usb7206_write_reg_8(struct USB7206* self, uint32_t addr, uint8_t data) { return usb7206_write_reg(self, addr, &data, sizeof(data)); }
+
+// Write 32-bit value to USB7206 register region.
+// Returns number of bytes written on success or a negative number on error.
+i2c_status_t usb7206_write_reg_32(struct USB7206* self, uint32_t addr, uint32_t data) {
+    // Convert to little endian
+    uint8_t bytes[4] = {
+        (uint8_t)(data >> 0),
+        (uint8_t)(data >> 8),
+        (uint8_t)(data >> 16),
+        (uint8_t)(data >> 24),
+    };
+
+    return usb7206_write_reg(self, addr, bytes, sizeof(bytes));
+}
+
+// Initialize USB7206.
+// Returns zero on success or a negative number on error.
+int usb7206_init(struct USB7206* self) {
+    i2c_status_t status;
+    uint32_t     data;
+
+    // DM and DP are swapped on ports 2 and 3
+    status = usb7206_write_reg_8(self, REG_PRT_SWAP, 0x0C);
+    if (status < 0) {
+        return status;
+    }
+
+    // Disable audio
+    status = usb7206_write_reg_8(self, REG_I2S_FEAT_SEL, 0);
+    if (status < 0) {
+        return status;
+    }
+
+    // Set HFC_DISABLE
+    data   = 0;
+    status = usb7206_read_reg_32(self, REG_RUNTIME_FLAGS2, &data);
+    if (status < 0) {
+        return status;
+    }
+    data |= 1;
+    status = usb7206_write_reg_32(self, REG_RUNTIME_FLAGS2, data);
+    if (status < 0) {
+        return status;
+    }
+
+    // Set Vendor ID and Product ID of USB 2 hub
+    status = usb7206_write_reg_32(self, REG_VID, 0x00033384);
+    if (status < 0) {
+        return status;
+    }
+
+    // Set Vendor ID and Product ID of USB 3 hub
+    status = usb7206_write_reg_32(self, REG_USB3_HUB_VID, 0x00043384);
+    if (status < 0) {
+        return status;
+    }
+
+    return 0;
+}
+
+// Attach USB7206.
+// Returns bytes written on success or a negative number on error.
+i2c_status_t usb7206_attach(struct USB7206* self) {
+    uint8_t data[3] = {
+        0xAA,
+        0x56,
+        0x00,
+    };
+
+    return i2c_transmit(self->addr << 1, data, sizeof(data), I2C_TIMEOUT);
+}
+
+struct USB7206_GPIO {
+    struct USB7206* usb7206;
+    uint32_t        pf;
+};
+
+struct USB7206_GPIO usb_gpio_sink         = {.usb7206 = &usb_hub, .pf = 29};  // UP_SEL = PF29 = GPIO93
+struct USB7206_GPIO usb_gpio_source_left  = {.usb7206 = &usb_hub, .pf = 10};  // CL_SEL = PF10 = GPIO74
+struct USB7206_GPIO usb_gpio_source_right = {.usb7206 = &usb_hub, .pf = 25};  // CR_SEL = PF25 = GPIO88
+
+// Set USB7206 GPIO to specified value.
+// Returns zero on success or negative number on error.
+i2c_status_t usb7206_gpio_set(struct USB7206_GPIO* self, bool value) {
+    i2c_status_t status;
+    uint32_t     data;
+
+    data   = 0;
+    status = usb7206_read_reg_32(self->usb7206, REG_PIO64_OUT, &data);
+    if (status < 0) {
+        return status;
+    }
+
+    if (value) {
+        data |= (((uint32_t)1) << self->pf);
+    } else {
+        data &= ~(((uint32_t)1) << self->pf);
+    }
+    status = usb7206_write_reg_32(self->usb7206, REG_PIO64_OUT, data);
+    if (status < 0) {
+        return status;
+    }
+
+    return 0;
+}
+
+// Initialize USB7206 GPIO.
+// Returns zero on success or a negative number on error.
+i2c_status_t usb7206_gpio_init(struct USB7206_GPIO* self) {
+    i2c_status_t status;
+    uint32_t     data;
+
+    // Set programmable function to GPIO
+    status = usb7206_write_reg_8(self->usb7206, REG_PF1_CTL + (self->pf - 1), 0);
+    if (status < 0) {
+        return status;
+    }
+
+    // Set GPIO to false by default
+    usb7206_gpio_set(self, false);
+
+    // Set GPIO to output
+    data   = 0;
+    status = usb7206_read_reg_32(self->usb7206, REG_PIO64_OEN, &data);
+    if (status < 0) {
+        return status;
+    }
+
+    data |= (((uint32_t)1) << self->pf);
+    status = usb7206_write_reg_32(self->usb7206, REG_PIO64_OEN, data);
+    if (status < 0) {
+        return status;
+    }
+
+    return 0;
+}
+
+struct PTN5110 {
+    uint8_t              addr;
+    uint8_t              cc;
+    struct USB7206_GPIO* gpio;
+};
+
+struct PTN5110 usb_sink         = {.addr = 0x51, .gpio = &usb_gpio_sink};
+struct PTN5110 usb_source_left  = {.addr = 0x52, .gpio = &usb_gpio_source_left};
+struct PTN5110 usb_source_right = {.addr = 0x50, .gpio = &usb_gpio_source_right};
+
+// Initialize PTN5110.
+// Returns zero on success or a negative number on error.
+i2c_status_t ptn5110_init(struct PTN5110* self) {
+    // Set last cc to invalid value, to force update
+    self->cc = 0xFF;
+    // Initialize GPIO
+    return usb7206_gpio_init(self->gpio);
+}
+
+// Read PTN5110 CC_STATUS.
+// Returns zero on success or a negative number on error.
+i2c_status_t ptn5110_get_cc_status(struct PTN5110* self, uint8_t* cc) { return i2c_readReg(self->addr << 1, 0x1D, cc, 1, I2C_TIMEOUT); }
+
+// Set PTN5110 SSMUX orientation.
+// Returns zero on success or a negative number on error.
+i2c_status_t ptn5110_set_ssmux(struct PTN5110* self, bool orientation) { return usb7206_gpio_set(self->gpio, orientation); }
+
+// Write PTN5110 COMMAND.
+// Returns zero on success or negative number on error.
+i2c_status_t ptn5110_command(struct PTN5110* self, uint8_t command) { return i2c_writeReg(self->addr << 1, 0x23, &command, 1, I2C_TIMEOUT); }
+
+// Set orientation of PTN5110 operating as a sink, call this once.
+// Returns zero on success or a negative number on error.
+i2c_status_t ptn5110_sink_set_orientation(struct PTN5110* self) {
+    i2c_status_t status;
+    uint8_t      cc;
+
+    status = ptn5110_get_cc_status(self, &cc);
+    if (status < 0) {
+        return status;
+    }
+
+    if ((cc & 0x03) == 0) {
+        status = ptn5110_set_ssmux(self, false);
+        if (status < 0) {
+            return status;
+        }
+    } else {
+        status = ptn5110_set_ssmux(self, true);
+        if (status < 0) {
+            return status;
+        }
+    }
+
+    return 0;
+}
+
+// Update PTN5110 operating as a source, call this repeatedly.
+// Returns zero on success or a negative number on error.
+i2c_status_t ptn5110_source_update(struct PTN5110* self) {
+    i2c_status_t status;
+    uint8_t      cc;
+
+    status = ptn5110_get_cc_status(self, &cc);
+    if (status < 0) {
+        return status;
+    }
+
+    if (cc != self->cc) {
+        // WARNING: Setting this here will disable retries
+        self->cc = cc;
+
+        bool connected   = false;
+        bool orientation = false;
+        if ((cc & 0x03) == 2) {
+            connected   = true;
+            orientation = true;
+        } else if (((cc >> 2) & 0x03) == 2) {
+            connected   = true;
+            orientation = false;
+        }
+
+        if (connected) {
+            // Set SS mux orientation
+            status = ptn5110_set_ssmux(self, orientation);
+            if (status < 0) {
+                return status;
+            }
+
+            // Enable source Vbus command
+            status = ptn5110_command(self, 0b01110111);
+            if (status < 0) {
+                return status;
+            }
+        } else {
+            // Disable source Vbus command
+            status = ptn5110_command(self, 0b01100110);
+            if (status < 0) {
+                return status;
+            }
+        }
+    }
+
+    return 0;
+}
+
+void usb_mux_event(void) {
+    // Run this on every 1000th matrix scan
+    static int cycle = 0;
+    if (cycle >= 1000) {
+        cycle = 0;
+        ptn5110_source_update(&usb_source_left);
+        ptn5110_source_update(&usb_source_right);
+    } else {
+        cycle += 1;
+    }
+}
+
+void usb_mux_init(void) {
+    // Run I2C bus at 100 kHz
+    i2c_init();
+
+    // Set up hub
+    usb7206_init(&usb_hub);
+
+    // Set up sink
+    ptn5110_init(&usb_sink);
+    ptn5110_sink_set_orientation(&usb_sink);
+
+    // Set up sources
+    ptn5110_init(&usb_source_left);
+    ptn5110_init(&usb_source_right);
+
+    // Attach hub
+    usb7206_attach(&usb_hub);
+
+    // Ensure orientation is correct after attaching hub
+    // TODO: Find reason why GPIO for sink orientation is reset
+    for (int i = 0; i < 100; i++) {
+        ptn5110_sink_set_orientation(&usb_sink);
+        wait_ms(10);
+    }
+}
diff --git a/keyboards/system76/launch_1/usb_mux.h b/keyboards/system76/launch_1/usb_mux.h
new file mode 100644
index 0000000000..26f84de864
--- /dev/null
+++ b/keyboards/system76/launch_1/usb_mux.h
@@ -0,0 +1,21 @@
+/*
+ *  Copyright (C) 2021  System76
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+void usb_mux_init(void);
+void usb_mux_event(void);
diff --git a/keyboards/system76/layouts.sh b/keyboards/system76/layouts.sh
new file mode 100755
index 0000000000..1c9118562c
--- /dev/null
+++ b/keyboards/system76/layouts.sh
@@ -0,0 +1,75 @@
+#!/usr/bin/env bash
+#
+# This script produces layout data for the System76 Keyboard Configurator.
+#
+# Copyright (C) 2021  System76
+#
+# 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, version 3.
+#
+# 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 <https://www.gnu.org/licenses/>.
+
+set -eEuo pipefail
+
+R=$(git rev-parse --show-toplevel)
+cd "${R}"
+rm -rf .build/layouts
+mkdir -p .build/layouts
+D="$(realpath .build/layouts)"
+
+binary="${D}/keymap"
+source="${binary}.c"
+header="quantum/keycode.h"
+printf "#include <stdio.h>\n" >"$source"
+printf "#include \"%s\"\n\n" "${header}" >>"$source"
+echo "int main(int argc, char **argv) {" >>"$source"
+grep '^    KC_' "$header" |
+  cut -d ' ' -f5 |
+  cut -d ',' -f1 |
+  while read -r keycode; do
+    name=$(echo "${keycode}" | cut -d '_' -f2-)
+    printf "    printf(\"%s,0x%%04X\\\n\", $keycode);\n" "${name}" >>"$source"
+  done
+printf "\n    return 0;\n}\n" >>"$source"
+gcc -I. "$source" -o "$binary"
+"${binary}" | tee "${D}/keymap.csv"
+
+cd keyboards
+for board in system76/launch_*; do
+  file="$board/$(basename "$board").h"
+  if [ ! -e "$file" ]; then
+    continue
+  fi
+  echo "# ${board}"
+  mkdir -p "${D}/${board}"
+  cp "${D}/keymap.csv" "${D}/${board}"
+  row=0
+  rg \
+    --multiline \
+    --multiline-dotall \
+    --regexp '#define LAYOUT\(.*\) \{.*\}' \
+    "$file" |
+    grep --only-matching '\{.*\}' |
+    sed 's/^{ //' |
+    sed 's/ }$//' |
+    sed 's/, / /g' |
+    while read -r line; do
+      col=0
+      for word in $line; do
+        if [[ "${word}" != "___" ]]; then
+          echo "${word},${row},${col}"
+        fi
+        col=$((col + 1))
+      done
+      row=$((row + 1))
+    done |
+    sort -n |
+    tee "${D}/${board}/layout.csv"
+done
diff --git a/keyboards/system76/readme.md b/keyboards/system76/readme.md
new file mode 100644
index 0000000000..c0ebc942b8
--- /dev/null
+++ b/keyboards/system76/readme.md
@@ -0,0 +1,5 @@
+# System76 Keyboards
+
+Keyboards by [System76](https://system76.com/):
+
+- [launch_1](https://system76.com/accessories/launch)
diff --git a/keyboards/system76/system76_ec.c b/keyboards/system76/system76_ec.c
new file mode 100644
index 0000000000..7fff780e58
--- /dev/null
+++ b/keyboards/system76/system76_ec.c
@@ -0,0 +1,416 @@
+/*
+ *  Copyright (C) 2021  System76
+ *  Copyright (C) 2021  Jimmy Cassis <KernelOops@outlook.com>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+
+#include "dynamic_keymap.h"
+#include "raw_hid.h"
+#include "rgb_matrix.h"
+#include "version.h"
+
+enum Command {
+    CMD_PROBE         = 1,   // Probe for System76 EC protocol
+    CMD_BOARD         = 2,   // Read board string
+    CMD_VERSION       = 3,   // Read version string
+    CMD_RESET         = 6,   // Reset to bootloader
+    CMD_KEYMAP_GET    = 9,   // Get keyboard map index
+    CMD_KEYMAP_SET    = 10,  // Set keyboard map index
+    CMD_LED_GET_VALUE = 11,  // Get LED value by index
+    CMD_LED_SET_VALUE = 12,  // Set LED value by index
+    CMD_LED_GET_COLOR = 13,  // Get LED color by index
+    CMD_LED_SET_COLOR = 14,  // Set LED color by index
+    CMD_LED_GET_MODE  = 15,  // Get LED matrix mode and speed
+    CMD_LED_SET_MODE  = 16,  // Set LED matrix mode and speed
+    CMD_MATRIX_GET    = 17,  // Get currently pressed keys
+    CMD_LED_SAVE      = 18,  // Save LED settings to ROM
+    CMD_SET_NO_INPUT  = 19,  // Enable/disable no input mode
+};
+
+bool input_disabled = false;
+
+#define CMD_LED_INDEX_ALL 0xFF
+
+static bool keymap_get(uint8_t layer, uint8_t output, uint8_t input, uint16_t *value) {
+    if (layer < dynamic_keymap_get_layer_count()) {
+        if (output < MATRIX_ROWS) {
+            if (input < MATRIX_COLS) {
+                *value = dynamic_keymap_get_keycode(layer, output, input);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+static bool keymap_set(uint8_t layer, uint8_t output, uint8_t input, uint16_t value) {
+    if (layer < dynamic_keymap_get_layer_count()) {
+        if (output < MATRIX_ROWS) {
+            if (input < MATRIX_COLS) {
+                dynamic_keymap_set_keycode(layer, output, input, value);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+static bool bootloader_reset    = false;
+static bool bootloader_unlocked = false;
+
+void system76_ec_unlock(void) {
+#ifdef RGB_MATRIX_CUSTOM_KB
+    rgb_matrix_mode_noeeprom(RGB_MATRIX_CUSTOM_unlocked);
+#endif
+#ifdef SYSTEM76_EC
+    bootloader_unlocked = true;
+#endif
+}
+
+bool system76_ec_is_unlocked(void) { return bootloader_unlocked; }
+
+#ifdef RGB_MATRIX_CUSTOM_KB
+enum Mode {
+    MODE_SOLID_COLOR = 0,
+    MODE_PER_KEY,
+    MODE_CYCLE_ALL,
+    MODE_CYCLE_LEFT_RIGHT,
+    MODE_CYCLE_UP_DOWN,
+    MODE_CYCLE_OUT_IN,
+    MODE_CYCLE_OUT_IN_DUAL,
+    MODE_RAINBOW_MOVING_CHEVRON,
+    MODE_CYCLE_PINWHEEL,
+    MODE_CYCLE_SPIRAL,
+    MODE_RAINDROPS,
+    MODE_SPLASH,
+    MODE_MULTISPLASH,
+    MODE_ACTIVE_KEYS,
+    MODE_DISABLED,
+    MODE_LAST,
+};
+
+// clang-format off
+static enum rgb_matrix_effects mode_map[] = {
+    RGB_MATRIX_SOLID_COLOR,
+    RGB_MATRIX_CUSTOM_raw_rgb,
+    RGB_MATRIX_CYCLE_ALL,
+    RGB_MATRIX_CYCLE_LEFT_RIGHT,
+    RGB_MATRIX_CYCLE_UP_DOWN,
+    RGB_MATRIX_CYCLE_OUT_IN,
+    RGB_MATRIX_CYCLE_OUT_IN_DUAL,
+    RGB_MATRIX_RAINBOW_MOVING_CHEVRON,
+    RGB_MATRIX_CYCLE_PINWHEEL,
+    RGB_MATRIX_CYCLE_SPIRAL,
+    RGB_MATRIX_RAINDROPS,
+    RGB_MATRIX_SPLASH,
+    RGB_MATRIX_MULTISPLASH,
+    RGB_MATRIX_CUSTOM_active_keys,
+    RGB_MATRIX_NONE,
+};
+// clang-format on
+
+_Static_assert(sizeof(mode_map) == MODE_LAST, "mode_map_length");
+
+RGB raw_rgb_data[DRIVER_LED_TOTAL];
+
+// clang-format off
+rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT] = {
+    // Layer 0
+    {
+        .enable = 1,
+        .mode = RGB_MATRIX_STARTUP_MODE,
+        .hsv = {
+            .h = RGB_MATRIX_STARTUP_HUE,
+            .s = RGB_MATRIX_STARTUP_SAT,
+            .v = RGB_MATRIX_STARTUP_VAL,
+        },
+        .speed = RGB_MATRIX_STARTUP_SPD,
+        .flags = LED_FLAG_KEYLIGHT,
+    },
+    // Layer 1
+    {
+        .enable = 1,
+        .mode = RGB_MATRIX_CUSTOM_active_keys,
+        .hsv = {
+            .h = RGB_MATRIX_STARTUP_HUE,
+            .s = RGB_MATRIX_STARTUP_SAT,
+            .v = RGB_MATRIX_STARTUP_VAL,
+        },
+        .speed = RGB_MATRIX_STARTUP_SPD,
+        .flags = LED_FLAG_KEYLIGHT,
+    },
+    // Layer 2
+    {
+        .enable = 1,
+        .mode = RGB_MATRIX_CUSTOM_active_keys,
+        .hsv = {
+            .h = RGB_MATRIX_STARTUP_HUE,
+            .s = RGB_MATRIX_STARTUP_SAT,
+            .v = RGB_MATRIX_STARTUP_VAL,
+        },
+        .speed = RGB_MATRIX_STARTUP_SPD,
+        .flags = LED_FLAG_KEYLIGHT,
+    },
+    // Layer 3
+    {
+        .enable = 1,
+        .mode = RGB_MATRIX_CUSTOM_active_keys,
+        .hsv = {
+            .h = RGB_MATRIX_STARTUP_HUE,
+            .s = RGB_MATRIX_STARTUP_SAT,
+            .v = RGB_MATRIX_STARTUP_VAL,
+        },
+        .speed = RGB_MATRIX_STARTUP_SPD,
+        .flags = LED_FLAG_KEYLIGHT,
+    },
+};
+// clang-format on
+
+// Read or write EEPROM data with checks for being inside System76 EC region.
+static bool system76_ec_eeprom_op(void *buf, uint16_t size, uint16_t offset, bool write) {
+    uint16_t addr = SYSTEM76_EC_EEPROM_ADDR + offset;
+    uint16_t end  = addr + size;
+    // Check for overflow and zero size
+    if ((end > addr) && (addr >= SYSTEM76_EC_EEPROM_ADDR) && (end <= (SYSTEM76_EC_EEPROM_ADDR + SYSTEM76_EC_EEPROM_SIZE))) {
+        if (write) {
+            eeprom_update_block((const void *)buf, (void *)addr, size);
+        } else {
+            eeprom_read_block((void *)buf, (const void *)addr, size);
+        }
+        return true;
+    } else {
+        return false;
+    }
+}
+
+// Read or write EEPROM RGB parameters.
+void system76_ec_rgb_eeprom(bool write) {
+    uint16_t layer_rgb_size = sizeof(layer_rgb);
+    system76_ec_eeprom_op((void *)layer_rgb, layer_rgb_size, 0, write);
+    system76_ec_eeprom_op((void *)raw_rgb_data, sizeof(raw_rgb_data), layer_rgb_size, write);
+}
+
+// Update RGB parameters on layer change.
+void system76_ec_rgb_layer(layer_state_t layer_state) {
+    if (!bootloader_unlocked) {
+        uint8_t layer = get_highest_layer(layer_state);
+        if (layer < DYNAMIC_KEYMAP_LAYER_COUNT) {
+            rgb_matrix_config = layer_rgb[layer];
+        }
+    }
+}
+#endif  // RGB_MATRIX_CUSTOM_KB
+
+void raw_hid_receive(uint8_t *data, uint8_t length) {
+    // Error response by default, set to success by commands
+    data[1] = 1;
+
+    switch (data[0]) {
+        case CMD_PROBE:
+            // Signature
+            data[2] = 0x76;
+            data[3] = 0xEC;
+            // Version
+            data[4] = 0x01;
+            data[1] = 0;
+            break;
+        case CMD_BOARD:
+            strncpy((char *)&data[2], QMK_KEYBOARD, length - 2);
+            data[1] = 0;
+            break;
+        case CMD_VERSION:
+            strncpy((char *)&data[2], QMK_VERSION, length - 2);
+            data[1] = 0;
+            break;
+        case CMD_RESET:
+            if (bootloader_unlocked) {
+                data[1] = 0;
+                bootloader_reset = true;
+            }
+            break;
+        case CMD_KEYMAP_GET: {
+            uint16_t value = 0;
+            if (keymap_get(data[2], data[3], data[4], &value)) {
+                data[5] = (uint8_t)value;
+                data[6] = (uint8_t)(value >> 8);
+                data[1] = 0;
+            }
+        } break;
+        case CMD_KEYMAP_SET: {
+            uint16_t value = ((uint16_t)data[5]) | (((uint16_t)data[6]) << 8);
+            if (keymap_set(data[2], data[3], data[4], value)) {
+                data[1] = 0;
+            }
+        } break;
+#ifdef RGB_MATRIX_CUSTOM_KB
+        case CMD_LED_GET_VALUE:
+            if (!bootloader_unlocked) {
+                uint8_t index = data[2];
+                for (uint8_t layer = 0; layer < DYNAMIC_KEYMAP_LAYER_COUNT; layer++) {
+                    if (index == (0xF0 | layer)) {
+                        data[3] = layer_rgb[layer].hsv.v;
+                        data[4] = RGB_MATRIX_MAXIMUM_BRIGHTNESS;
+                        data[1] = 0;
+                        break;
+                    }
+                }
+            }
+            break;
+        case CMD_LED_SET_VALUE:
+            if (!bootloader_unlocked) {
+                uint8_t index = data[2];
+                uint8_t value = data[3];
+                if (value >= RGB_MATRIX_MAXIMUM_BRIGHTNESS) {
+                    value = RGB_MATRIX_MAXIMUM_BRIGHTNESS;
+                }
+                for (uint8_t layer = 0; layer < DYNAMIC_KEYMAP_LAYER_COUNT; layer++) {
+                    if (index == (0xF0 | layer)) {
+                        layer_rgb[layer].hsv.v = value;
+                        data[1] = 0;
+                        system76_ec_rgb_layer(layer_state);
+                        break;
+                    }
+                }
+            }
+            break;
+        case CMD_LED_GET_COLOR:
+            if (!bootloader_unlocked) {
+                uint8_t index = data[2];
+                if (index < DRIVER_LED_TOTAL) {
+                    data[3] = raw_rgb_data[index].r;
+                    data[4] = raw_rgb_data[index].g;
+                    data[5] = raw_rgb_data[index].b;
+                    data[1] = 0;
+                } else {
+                    for (uint8_t layer = 0; layer < DYNAMIC_KEYMAP_LAYER_COUNT; layer++) {
+                        if (index == (0xF0 | layer)) {
+                            data[3] = layer_rgb[layer].hsv.h;
+                            data[4] = layer_rgb[layer].hsv.s;
+                            data[5] = 0;
+                            data[1] = 0;
+                            break;
+                        }
+                    }
+                }
+            }
+            break;
+        case CMD_LED_SET_COLOR:
+            if (!bootloader_unlocked) {
+                uint8_t index = data[2];
+
+                RGB rgb = {
+                    .r = data[3],
+                    .g = data[4],
+                    .b = data[5],
+                };
+
+                if (index < DRIVER_LED_TOTAL) {
+                    raw_rgb_data[index] = rgb;
+                    data[1] = 0;
+                } else {
+                    for (uint8_t layer = 0; layer < DYNAMIC_KEYMAP_LAYER_COUNT; layer++) {
+                        if (index == (0xF0 | layer)) {
+                            layer_rgb[layer].hsv.h = rgb.r;
+                            layer_rgb[layer].hsv.s = rgb.g;
+                            // Ignore rgb.b
+                            data[1] = 0;
+                            system76_ec_rgb_layer(layer_state);
+                            break;
+                        }
+                    }
+                }
+            }
+            break;
+        case CMD_LED_GET_MODE:
+            if (!bootloader_unlocked) {
+                uint8_t layer = data[2];
+                if (layer < DYNAMIC_KEYMAP_LAYER_COUNT) {
+                    enum rgb_matrix_effects mode = layer_rgb[layer].mode;
+                    for (uint8_t i = 0; i < MODE_LAST; i++) {
+                        if (mode_map[i] == mode) {
+                            data[3] = i;
+                            data[4] = layer_rgb[layer].speed;
+                            data[1] = 0;
+                            break;
+                        }
+                    }
+                }
+            }
+            break;
+        case CMD_LED_SET_MODE:
+            if (!bootloader_unlocked) {
+                uint8_t layer = data[2];
+                uint8_t mode  = data[3];
+                uint8_t speed = data[4];
+                if (layer < DYNAMIC_KEYMAP_LAYER_COUNT && mode < MODE_LAST) {
+                    layer_rgb[layer].mode  = mode_map[mode];
+                    layer_rgb[layer].speed = speed;
+                    data[1] = 0;
+                    system76_ec_rgb_layer(layer_state);
+                }
+            }
+            break;
+        case CMD_LED_SAVE:
+            if (!bootloader_unlocked) {
+                system76_ec_rgb_eeprom(true);
+                data[1] = 0;
+            }
+            break;
+#endif  // RGB_MATRIX_CUSTOM_KB
+        case CMD_MATRIX_GET: {
+            // TODO: Improve performance?
+            data[2] = matrix_rows();
+            data[3] = matrix_cols();
+
+            uint8_t byte = 4;
+            uint8_t bit  = 0;
+
+            for (uint8_t row = 0; row < matrix_rows(); row++) {
+                for (uint8_t col = 0; col < matrix_cols(); col++) {
+                    if (byte < length) {
+                        if (matrix_is_on(row, col)) {
+                            data[byte] |= (1 << bit);
+                        } else {
+                            data[byte] &= ~(1 << bit);
+                        }
+                    }
+
+                    bit++;
+                    if (bit >= 8) {
+                        byte++;
+                        bit = 0;
+                    }
+                }
+            }
+            data[1] = 0;
+        } break;
+        case CMD_SET_NO_INPUT: {
+            clear_keyboard();
+            input_disabled = data[2] != 0;
+            data[1] = 0;
+        } break;
+    }
+
+    raw_hid_send(data, length);
+
+    if (bootloader_reset) {
+        // Give host time to read response
+        wait_ms(100);
+        // Jump to the bootloader
+        bootloader_jump();
+    }
+}

From 6823f01c107dafaa4e1876cb11677bd4435153ed Mon Sep 17 00:00:00 2001
From: MakotoKurauchi <pluis@me.com>
Date: Tue, 11 Jan 2022 10:43:36 +0900
Subject: [PATCH 245/867] [Keyboard] New kbd Navpad 1.0 (#15507)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: keyaki-namiki <28521374+keyaki-namiki@users.noreply.github.com>
---
 keyboards/yushakobo/navpad/10/10.c            |  17 +++
 keyboards/yushakobo/navpad/10/10.h            |  26 ++++
 keyboards/yushakobo/navpad/10/config.h        |  84 ++++++++++++
 keyboards/yushakobo/navpad/10/info.json       |  18 +++
 .../navpad/10/keymaps/default/config.h        |  25 ++++
 .../navpad/10/keymaps/default/keymap.c        |  92 +++++++++++++
 .../navpad/10/keymaps/default/readme.md       |  80 +++++++++++
 .../yushakobo/navpad/10/keymaps/via/config.h  |  25 ++++
 .../yushakobo/navpad/10/keymaps/via/keymap.c  | 105 +++++++++++++++
 .../yushakobo/navpad/10/keymaps/via/readme.md |  72 ++++++++++
 .../yushakobo/navpad/10/keymaps/via/rules.mk  |   1 +
 keyboards/yushakobo/navpad/10/readme.md       |  27 ++++
 keyboards/yushakobo/navpad/10/rev0/config.h   |  45 +++++++
 keyboards/yushakobo/navpad/10/rev0/rev0.c     |  17 +++
 keyboards/yushakobo/navpad/10/rev0/rev0.h     |  44 ++++++
 keyboards/yushakobo/navpad/10/rev0/rules.mk   |   0
 keyboards/yushakobo/navpad/10/rev1/config.h   |  49 +++++++
 keyboards/yushakobo/navpad/10/rev1/rev1.c     |  17 +++
 keyboards/yushakobo/navpad/10/rev1/rev1.h     |  44 ++++++
 keyboards/yushakobo/navpad/10/rev1/rules.mk   |   0
 keyboards/yushakobo/navpad/10/rules.mk        |  23 ++++
 .../yushakobo/navpad/10_helix_r/10_helix_r.c  |  17 +++
 .../yushakobo/navpad/10_helix_r/10_helix_r.h  |  50 +++++++
 .../yushakobo/navpad/10_helix_r/config.h      | 126 ++++++++++++++++++
 .../yushakobo/navpad/10_helix_r/info.json     |  17 +++
 .../10_helix_r/keymaps/default/config.h       |  25 ++++
 .../10_helix_r/keymaps/default/keymap.c       |  94 +++++++++++++
 .../10_helix_r/keymaps/default/readme.md      |  86 ++++++++++++
 .../yushakobo/navpad/10_helix_r/readme.md     |  33 +++++
 .../yushakobo/navpad/10_helix_r/rules.mk      |  23 ++++
 keyboards/yushakobo/navpad/navpad_prefs.c     | 104 +++++++++++++++
 keyboards/yushakobo/navpad/navpad_prefs.h     |  30 +++++
 keyboards/yushakobo/navpad/readme.md          |  14 ++
 33 files changed, 1430 insertions(+)
 create mode 100644 keyboards/yushakobo/navpad/10/10.c
 create mode 100644 keyboards/yushakobo/navpad/10/10.h
 create mode 100644 keyboards/yushakobo/navpad/10/config.h
 create mode 100644 keyboards/yushakobo/navpad/10/info.json
 create mode 100644 keyboards/yushakobo/navpad/10/keymaps/default/config.h
 create mode 100644 keyboards/yushakobo/navpad/10/keymaps/default/keymap.c
 create mode 100644 keyboards/yushakobo/navpad/10/keymaps/default/readme.md
 create mode 100644 keyboards/yushakobo/navpad/10/keymaps/via/config.h
 create mode 100644 keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
 create mode 100644 keyboards/yushakobo/navpad/10/keymaps/via/readme.md
 create mode 100644 keyboards/yushakobo/navpad/10/keymaps/via/rules.mk
 create mode 100644 keyboards/yushakobo/navpad/10/readme.md
 create mode 100644 keyboards/yushakobo/navpad/10/rev0/config.h
 create mode 100644 keyboards/yushakobo/navpad/10/rev0/rev0.c
 create mode 100644 keyboards/yushakobo/navpad/10/rev0/rev0.h
 create mode 100644 keyboards/yushakobo/navpad/10/rev0/rules.mk
 create mode 100644 keyboards/yushakobo/navpad/10/rev1/config.h
 create mode 100644 keyboards/yushakobo/navpad/10/rev1/rev1.c
 create mode 100644 keyboards/yushakobo/navpad/10/rev1/rev1.h
 create mode 100644 keyboards/yushakobo/navpad/10/rev1/rules.mk
 create mode 100644 keyboards/yushakobo/navpad/10/rules.mk
 create mode 100644 keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c
 create mode 100644 keyboards/yushakobo/navpad/10_helix_r/10_helix_r.h
 create mode 100644 keyboards/yushakobo/navpad/10_helix_r/config.h
 create mode 100644 keyboards/yushakobo/navpad/10_helix_r/info.json
 create mode 100644 keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h
 create mode 100644 keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
 create mode 100644 keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md
 create mode 100644 keyboards/yushakobo/navpad/10_helix_r/readme.md
 create mode 100644 keyboards/yushakobo/navpad/10_helix_r/rules.mk
 create mode 100644 keyboards/yushakobo/navpad/navpad_prefs.c
 create mode 100644 keyboards/yushakobo/navpad/navpad_prefs.h
 create mode 100644 keyboards/yushakobo/navpad/readme.md

diff --git a/keyboards/yushakobo/navpad/10/10.c b/keyboards/yushakobo/navpad/10/10.c
new file mode 100644
index 0000000000..c1f6fc485d
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/10.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "10.h"
diff --git a/keyboards/yushakobo/navpad/10/10.h b/keyboards/yushakobo/navpad/10/10.h
new file mode 100644
index 0000000000..5fd02cd073
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/10.h
@@ -0,0 +1,26 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+#include "navpad_prefs.h"
+
+#if defined(KEYBOARD_yushakobo_navpad_10_rev0)
+#    include "rev0.h"
+#elif defined(KEYBOARD_yushakobo_navpad_10_rev1)
+#    include "rev1.h"
+#endif
diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h
new file mode 100644
index 0000000000..c242ee60e2
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/config.h
@@ -0,0 +1,84 @@
+/*
+Copyright 2021 yushakobo
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+#define ENCODERS_PAD_A { B5 }
+#define ENCODERS_PAD_B { B6 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D2  // or D0, D1, D3, E6
+
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 9
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
+
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 132
+#define TAPPING_LAYER_TERM 90
\ No newline at end of file
diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json
new file mode 100644
index 0000000000..370b7623f2
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/info.json
@@ -0,0 +1,18 @@
+{
+    "keyboard_name": "navpad 1.0",
+    "url": "https://shop.yushakobo.jp/products/navpad-10",
+    "maintainer": "yushakobo",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y":  0},{"x": 1, "y":  0},{"x": 2, "y":  0},{"x": 3, "y":  0},
+                {"x": 0, "y":  1},{"x": 1, "y":  1},{"x": 2, "y":  1},{"x": 3, "y":  1},{"x": 4, "y":  1},{"x": 5, "y":  1},{"x": 6, "y":  1},
+                {"x": 0, "y":  2},{"x": 1, "y":  2},{"x": 2, "y":  2},{"x": 3, "y":  2},{"x": 4, "y":  2},{"x": 5, "y":  2},{"x": 6, "y":  2},
+                                                                      {"x": 3, "y":  3},{"x": 4, "y":  3},{"x": 5, "y":  3},{"x": 6, "y":  3},
+                {"x": 0, "y":  4},{"x": 1, "y":  4},{"x": 2, "y":  4},{"x": 3, "y":  4},{"x": 4, "y":  4},{"x": 5, "y":  4},{"x": 6, "y":  4},
+                {"x": 0, "y":  5},{"x": 1, "y":  5},{"x": 2, "y":  5},{"x": 3, "y":  5},{"x": 4, "y":  5},{"x": 5, "y":  5},{"x": 6, "y":  5}
+                
+            ]
+        }
+    }
+}
diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/config.h b/keyboards/yushakobo/navpad/10/keymaps/default/config.h
new file mode 100644
index 0000000000..b4d2122ab4
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/keymaps/default/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2021 yushakobo
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#ifdef RGB_DI_PIN
+
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_MAX_LAYERS 6
+
+#endif
diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c b/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c
new file mode 100644
index 0000000000..772d4e6f2c
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c
@@ -0,0 +1,92 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] =LAYOUT (
+    KC_PSCR,   KC_SLCK,   KC_PAUS,   KC_MUTE,
+    KC_INS,    KC_HOME,   KC_PGUP,   KC_ESC,    KC_PSLS,    KC_PAST,   KC_PMNS,
+    KC_DEL,    KC_END,    KC_PGDN,   KC_P7,     KC_P8,      KC_P9,     KC_PPLS,
+                                     KC_P4,     KC_P5,      KC_P6,     KC_PPLS,
+    S(KC_TAB), KC_UP,     KC_TAB,    KC_P1,     KC_P2,      KC_P3,     LT(1,KC_PENT),
+    KC_LEFT,   KC_DOWN,   KC_RGHT,   KC_P0,     TAP_00,     KC_PDOT,   LT(1,KC_PENT)
+  ),
+
+  [_FN1] =LAYOUT (
+    RESET,     EEP_RST,   KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NLCK,   KC_QUOT,   KC_PEQL,    KC_NO,
+    KC_CAPS,   KC_NLCK,   KC_SLCK,   S(KC_9),   KC_UP,     S(KC_0),    S(KC_SPC),
+                                     KC_LEFT,   KC_BTN3,   KC_RGHT,    S(KC_SPC),
+    KC_TRNS,   S(KC_ENT), KC_TRNS,   KC_BSPC,   KC_DOWN,   KC_DEL,     KC_TRNS,
+    KC_BTN1,   KC_ENT,    S(KC_SPC),LT(2,KC_SPC),KC_SPC,   KC_COMM,    KC_TRNS
+  ),
+
+  [_FN2] =LAYOUT (
+    RGB_TOG,   RGB_MOD,   RGB_RMOD,  KC_NO,
+    RGB_HUI,   RGB_SAI,   RGB_VAI,   KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    RGB_HUD,   RGB_SAD,   RGB_VAD,   KC_NO,     KC_NO,     KC_NO,     KC_NO,
+                                     KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO
+  ),
+
+  [_FN3] =LAYOUT (
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
+                                     KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO
+  )
+};
+
+#ifdef RGBLIGHT_LAYERS
+# define LOCK_COLOR_1 HSV_TEAL
+
+const rgblight_segment_t PROGMEM navpad_capslock[] = RGBLIGHT_LAYER_SEGMENTS(
+  {4, 1, LOCK_COLOR_1}
+);
+
+const rgblight_segment_t PROGMEM navpad_numlock[] = RGBLIGHT_LAYER_SEGMENTS(
+  {0, 1, LOCK_COLOR_1},
+  {5, 1, LOCK_COLOR_1}
+);
+
+const rgblight_segment_t PROGMEM navpad_scrolllock[] = RGBLIGHT_LAYER_SEGMENTS(
+  {2, 1, LOCK_COLOR_1},
+  {6, 1, LOCK_COLOR_1}
+);
+
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, host_keyboard_led_state().caps_lock);
+    rgblight_set_layer_state(1, (host_keyboard_led_state().num_lock && IS_LAYER_ON(_BASE)));
+    rgblight_set_layer_state(2, host_keyboard_led_state().scroll_lock);
+    return true;
+}
+
+const rgblight_segment_t* const PROGMEM navpad_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+  navpad_capslock,
+  navpad_numlock,
+  navpad_scrolllock
+);
+
+void keyboard_post_init_user(void) {
+    rgblight_sethsv_noeeprom(HSV_WHITE);
+    // Enable the LED layers
+    rgblight_layers = navpad_rgb_layers;
+}
+#endif
diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/readme.md b/keyboards/yushakobo/navpad/10/keymaps/default/readme.md
new file mode 100644
index 0000000000..3b45e937bc
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/keymaps/default/readme.md
@@ -0,0 +1,80 @@
+# The default keymap for navpad 1.0
+
+### Base layer
+```
+   ,-------------------------------. ,-------.
+   | KC_PSCR  | KC_SLCK  | KC_PAUS | |KC_MUTE|
+   |----------+----------+----------+-------------------------------------------------.
+   | KC_INS   | KC_HOME  | KC_PGUP  | KC_ESC   | KC_PSLS   | KC_PAST  | KC_PMNS       |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_DEL   | KC_END   | KC_PGDN  | KC_P7    | KC_P8     | KC_P9    | KC_PPLS       |
+   `--------------------------------+----------+-----------+----------+---------------|
+                                    | KC_P4    | KC_P5     | KC_P6    | KC_PPLS       |
+   ,--------------------------------+----------+-----------+----------+---------------|
+   | S(KC_TAB)| KC_UP    | KC_TAB   | KC_P1    | KC_P2     | KC_P3    | LT(1,KC_PENT) |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_LEFT  | KC_DOWN  | KC_RGHT  | KC_P0    | TAP_00    | KC_PDOT  | LT(1,KC_PENT) |
+   '----------------------------------------------------------------------------------`
+```
+### FN1 layer
+```
+   ,-------------------------------. ,-------.
+   | RESET    | EEP_RST  | KC_NO   | | KC_NO |
+   |----------+----------+----------+-------------------------------------------------.
+   | KC_NO    | KC_NO    | KC_NO    | KC_NLCK  | KC_QUOT   | KC_PEQL  | KC_NO         |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_CAPS  | KC_NLCK  | KC_SLCK  | S(KC_9)  | KC_UP     | S(KC_0)  | S(KC_SPC)     |
+   `--------------------------------+----------+-----------+----------+---------------|
+                                    | KC_LEFT  | KC_BTN3   | KC_RGHT  | S(KC_SPC)     |
+   ,--------------------------------+----------+-----------+----------+---------------|
+   | KC_TRNS  | S(KC_ENT)| KC_TRNS  | KC_BSPC  | KC_DOWN   | KC_DEL   | KC_TRNS       |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_BTN1  | KC_ENT   |S(KC_SPC)|LT(2,KC_SPC)|KC_SPC    | KC_COMM  | KC_TRNS       |
+   '----------------------------------------------------------------------------------`
+```
+### FN2 layer
+```
+   ,-------------------------------. ,-------.
+   | RGB_TOG  | RGB_MOD  | RGB_RMOD| | KC_NO |
+   |----------+----------+----------+-------------------------------------------------.
+   | RGB_HUI  | RGB_SAI  | RGB_VAI  | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | RGB_HUD  | RGB_SAD  | RGB_VAD  | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   `--------------------------------+----------+-----------+----------+---------------|
+                                    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   ,--------------------------------+----------+-----------+----------+---------------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   '----------------------------------------------------------------------------------`
+```
+### FN3 layer
+```
+   ,-------------------------------. ,-------.
+   | KC_NO    | KC_NO    | KC_NO   | | KC_NO |
+   |----------+----------+----------+-------------------------------------------------.
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   `--------------------------------+----------+-----------+----------+---------------|
+                                    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   ,--------------------------------+----------+-----------+----------+---------------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   '----------------------------------------------------------------------------------`
+```
+
+## custom keycodes behaviour
+
+|keycodes|actual input|behaviour|
+|---|---|---|
+|TAP_00|"00"|tap_code(KC_P0) twice|
+
+## rotary encoder behaviour
+
+|Encoder No.1|CW|CCW|
+|---|---|---|
+|BASE|KC_VOLU|KC_VOLD|
+|FN1|rgblight_increse_hue()|rgblight_decrese_hue()|
+|FN2|rgblight_increse_sat()|rgblight_decrese_sat()|
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/config.h b/keyboards/yushakobo/navpad/10/keymaps/via/config.h
new file mode 100644
index 0000000000..b4d2122ab4
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2021 yushakobo
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#ifdef RGB_DI_PIN
+
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_MAX_LAYERS 6
+
+#endif
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c b/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
new file mode 100644
index 0000000000..bd75cc77dd
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/keymap.c
@@ -0,0 +1,105 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] =LAYOUT (
+    KC_PSCR,   KC_SLCK,   KC_PAUS,   KC_MUTE,
+    KC_INS,    KC_HOME,   KC_PGUP,   KC_ESC,    KC_PSLS,    KC_PAST,   KC_PMNS,
+    KC_DEL,    KC_END,    KC_PGDN,   KC_P7,     KC_P8,      KC_P9,     KC_PPLS,
+                                     KC_P4,     KC_P5,      KC_P6,     KC_PPLS,
+    S(KC_TAB), KC_UP,     KC_TAB,    KC_P1,     KC_P2,      KC_P3,     LT(1,KC_PENT),
+    KC_LEFT,   KC_DOWN,   KC_RGHT,   KC_P0,     KC_P0,      KC_PDOT,   LT(1,KC_PENT)
+  ),
+
+  [_FN1] =LAYOUT (
+    RESET,     EEP_RST,   KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NLCK,   KC_QUOT,   KC_PEQL,    KC_NO,
+    KC_CAPS,   KC_NLCK,   KC_SLCK,   S(KC_9),   KC_UP,     S(KC_0),    S(KC_SPC),
+                                     KC_LEFT,   KC_BTN3,   KC_RGHT,    S(KC_SPC),
+    KC_TRNS,   S(KC_ENT), KC_TRNS,   KC_BSPC,   KC_DOWN,   KC_DEL,     KC_TRNS,
+    KC_BTN1,   KC_ENT,    S(KC_SPC),LT(2,KC_SPC),KC_SPC,   KC_COMM,    KC_TRNS
+  ),
+
+  [_FN2] =LAYOUT (
+    RGB_TOG,   RGB_MOD,   RGB_RMOD,  KC_NO,
+    RGB_HUI,   RGB_SAI,   RGB_VAI,   KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    RGB_HUD,   RGB_SAD,   RGB_VAD,   KC_NO,     KC_NO,     KC_NO,     KC_NO,
+                                     KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO
+  ),
+
+  [_FN3] =LAYOUT (
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
+                                     KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO
+  )
+};
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+  if (index == 0) { /* First encoder */
+    if (clockwise) {
+      tap_code16(KC_WH_U);
+    } else {
+      tap_code16(KC_WH_D);
+    }
+  }
+  return false;
+}
+#endif
+
+#ifdef RGBLIGHT_LAYERS
+# define LOCK_COLOR_1 HSV_TEAL
+
+const rgblight_segment_t PROGMEM navpad_capslock[] = RGBLIGHT_LAYER_SEGMENTS(
+  {4, 1, LOCK_COLOR_1}
+);
+
+const rgblight_segment_t PROGMEM navpad_numlock[] = RGBLIGHT_LAYER_SEGMENTS(
+  {0, 1, LOCK_COLOR_1},
+  {5, 1, LOCK_COLOR_1}
+);
+
+const rgblight_segment_t PROGMEM navpad_scrolllock[] = RGBLIGHT_LAYER_SEGMENTS(
+  {2, 1, LOCK_COLOR_1},
+  {6, 1, LOCK_COLOR_1}
+);
+
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, host_keyboard_led_state().caps_lock);
+    rgblight_set_layer_state(1, (host_keyboard_led_state().num_lock && IS_LAYER_ON(_BASE)));
+    rgblight_set_layer_state(2, host_keyboard_led_state().scroll_lock);
+    return true;
+}
+
+const rgblight_segment_t* const PROGMEM navpad_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+  navpad_capslock,
+  navpad_numlock,
+  navpad_scrolllock
+);
+
+void keyboard_post_init_user(void) {
+    rgblight_sethsv_noeeprom(HSV_WHITE);
+    // Enable the LED layers
+    rgblight_layers = navpad_rgb_layers;
+}
+#endif
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/readme.md b/keyboards/yushakobo/navpad/10/keymaps/via/readme.md
new file mode 100644
index 0000000000..f6ccaeee9e
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/readme.md
@@ -0,0 +1,72 @@
+# The via keymap for navpad 1.0
+
+### Base layer
+```
+   ,-------------------------------. ,-------.
+   | KC_PSCR  | KC_SLCK  | KC_PAUS | |KC_MUTE|
+   |----------+----------+----------+-------------------------------------------------.
+   | KC_INS   | KC_HOME  | KC_PGUP  | KC_ESC   | KC_PSLS   | KC_PAST  | KC_PMNS       |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_DEL   | KC_END   | KC_PGDN  | KC_P7    | KC_P8     | KC_P9    | KC_PPLS       |
+   `--------------------------------+----------+-----------+----------+---------------|
+                                    | KC_P4    | KC_P5     | KC_P6    | KC_PPLS       |
+   ,--------------------------------+----------+-----------+----------+---------------|
+   | S(KC_TAB)| KC_UP    | KC_TAB   | KC_P1    | KC_P2     | KC_P3    | LT(1,KC_PENT) |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_LEFT  | KC_DOWN  | KC_RGHT  | KC_P0    | KC_P0     | KC_PDOT  | LT(1,KC_PENT) |
+   '----------------------------------------------------------------------------------`
+```
+### FN1 layer
+```
+   ,-------------------------------. ,-------.
+   | RESET    | EEP_RST  | KC_NO   | | KC_NO |
+   |----------+----------+----------+-------------------------------------------------.
+   | KC_NO    | KC_NO    | KC_NO    | KC_NLCK  | KC_QUOT   | KC_PEQL  | KC_NO         |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_CAPS  | KC_NLCK  | KC_SLCK  | S(KC_9)  | KC_UP     | S(KC_0)  | S(KC_SPC)     |
+   `--------------------------------+----------+-----------+----------+---------------|
+                                    | KC_LEFT  | KC_BTN3   | KC_RGHT  | S(KC_SPC)     |
+   ,--------------------------------+----------+-----------+----------+---------------|
+   | KC_TRNS  | S(KC_ENT)| KC_TRNS  | KC_BSPC  | KC_DOWN   | KC_DEL   | KC_TRNS       |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_BTN1  | KC_ENT   |S(KC_SPC)|LT(2,KC_SPC)|KC_SPC    | KC_COMM  | KC_TRNS       |
+   '----------------------------------------------------------------------------------`
+```
+### FN2 layer
+```
+   ,-------------------------------. ,-------.
+   | RGB_TOG  | RGB_MOD  | RGB_RMOD| | KC_NO |
+   |----------+----------+----------+-------------------------------------------------.
+   | RGB_HUI  | RGB_SAI  | RGB_VAI  | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | RGB_HUD  | RGB_SAD  | RGB_VAD  | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   `--------------------------------+----------+-----------+----------+---------------|
+                                    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   ,--------------------------------+----------+-----------+----------+---------------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   '----------------------------------------------------------------------------------`
+```
+### FN3 layer
+```
+   ,-------------------------------. ,-------.
+   | KC_NO    | KC_NO    | KC_NO   | | KC_NO |
+   |----------+----------+----------+-------------------------------------------------.
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   `--------------------------------+----------+-----------+----------+---------------|
+                                    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   ,--------------------------------+----------+-----------+----------+---------------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   |----------+----------+----------+----------+-----------+----------+---------------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |
+   '----------------------------------------------------------------------------------`
+```
+
+## rotary encoder behaviour
+
+|Encoder No.1|CW|CCW|
+|---|---|---|
+|BASE|tap_code16(KC_WH_U)|tap_code16(KC_WH_D)|
diff --git a/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk b/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/yushakobo/navpad/10/readme.md b/keyboards/yushakobo/navpad/10/readme.md
new file mode 100644
index 0000000000..a330003a55
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/readme.md
@@ -0,0 +1,27 @@
+# navpad 1.0
+
+![navpad_10](https://imgur.com/zxElDdWh.jpg)
+
+Useful and easy to build numpad with nav-cluster
+
+* Keyboard Maintainer: [yushakobo](https://github.com/yushakobo)
+* Hardware Supported: NavPad 1.0 PCB, Pro Micro
+* Hardware Availability: https://shop.yushakobo.jp/products/navpad-10
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yushakobo/navpad/10:default
+
+Flashing example for this keyboard:
+
+    make yushakobo/navpad/10:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/yushakobo/navpad/10/rev0/config.h b/keyboards/yushakobo/navpad/10/rev0/config.h
new file mode 100644
index 0000000000..5ebdda599a
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/rev0/config.h
@@ -0,0 +1,45 @@
+/*
+Copyright 2021 yushakobo
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x3265
+#define PRODUCT_ID   0x0008
+#define DEVICE_VER   0x0000
+#define MANUFACTURER yushakobo
+#define PRODUCT      navpad 1.0
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 7
+
+/*
+ * 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 { D4, C6, D7, E6, B4, D0 }
+#define MATRIX_COL_PINS { F4, F5, F6, B2, B3, B1, F7 }
+#define UNUSED_PIN { D1 }
diff --git a/keyboards/yushakobo/navpad/10/rev0/rev0.c b/keyboards/yushakobo/navpad/10/rev0/rev0.c
new file mode 100644
index 0000000000..c1feab87a3
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/rev0/rev0.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "rev0.h"
diff --git a/keyboards/yushakobo/navpad/10/rev0/rev0.h b/keyboards/yushakobo/navpad/10/rev0/rev0.h
new file mode 100644
index 0000000000..97a651bc1c
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/rev0/rev0.h
@@ -0,0 +1,44 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+	k00, k01, k02, k03, \
+	k10, k11, k12, k13, k14, k15, k16, \
+	k20, k21, k22, k23, k24, k25, k26, \
+	               k33, k34, k35, k36, \
+	k40, k41, k42, k43, k44, k45, k46, \
+	k50, k51, k52, k53, k54, k55, k56  \
+	) \
+    {\
+	{ k00, k01, k02, k13, k14, k15, k16 }, \
+	{ k10, k11, k12, k23, k24, k25, k26 }, \
+	{ k20, k21, k22, k33, k34, k35, k36 }, \
+	{ k40, k41, k42, k43, k44, k45, k46 }, \
+	{ k50, k51, k52, k53, k54, k55, k56 }, \
+   	{ KC_NO, KC_NO, k03, KC_NO, KC_NO, KC_NO, KC_NO } \
+   	}
diff --git a/keyboards/yushakobo/navpad/10/rev0/rules.mk b/keyboards/yushakobo/navpad/10/rev0/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/yushakobo/navpad/10/rev1/config.h b/keyboards/yushakobo/navpad/10/rev1/config.h
new file mode 100644
index 0000000000..40bb31b156
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/rev1/config.h
@@ -0,0 +1,49 @@
+/*
+Copyright 2021 yushakobo
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x3265
+#define PRODUCT_ID   0x0008
+#define DEVICE_VER   0x0001
+#define MANUFACTURER yushakobo
+#define PRODUCT      "navpad 1.0"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 6
+
+/*
+ * 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 { D4, C6, D7, E6, B4, F4 }
+#define MATRIX_COL_PINS { F5, F6, B2, B3, B1, F7 }
+#define UNUSED_PIN      { D1, D0 }
+
+#ifdef RGB_DI_PIN
+#    define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7 }
+#endif
diff --git a/keyboards/yushakobo/navpad/10/rev1/rev1.c b/keyboards/yushakobo/navpad/10/rev1/rev1.c
new file mode 100644
index 0000000000..bf47612035
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/rev1/rev1.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "rev1.h"
diff --git a/keyboards/yushakobo/navpad/10/rev1/rev1.h b/keyboards/yushakobo/navpad/10/rev1/rev1.h
new file mode 100644
index 0000000000..50fd54a026
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/rev1/rev1.h
@@ -0,0 +1,44 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+	k00, k01, k02, k03, \
+	k10, k11, k12, k13, k14, k15, k16, \
+	k20, k21, k22, k23, k24, k25, k26, \
+	               k33, k34, k35, k36, \
+	k40, k41, k42, k43, k44, k45, k46, \
+	k50, k51, k52, k53, k54, k55, k56  \
+	) \
+    {\
+	{ k01, k02, k13, k14, k15, k16 }, \
+	{ k11, k12, k23, k24, k25, k26 }, \
+	{ k21, k22, k33, k34, k35, k36 }, \
+	{ k41, k42, k43, k44, k45, k46 }, \
+	{ k51, k52, k53, k54, k55, k56 }, \
+	{ k00, k03, k10, k20, k40, k50 } \
+   	}
diff --git a/keyboards/yushakobo/navpad/10/rev1/rules.mk b/keyboards/yushakobo/navpad/10/rev1/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/yushakobo/navpad/10/rules.mk b/keyboards/yushakobo/navpad/10/rules.mk
new file mode 100644
index 0000000000..53fb0ec174
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+ENCODER_ENABLE = yes
+
+SRC += navpad_prefs.c
+DEFAULT_FOLDER = yushakobo/navpad/10/rev1
diff --git a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c b/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c
new file mode 100644
index 0000000000..8be5220d56
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "10_helix_r.h"
diff --git a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.h b/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.h
new file mode 100644
index 0000000000..53e32fd6e9
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.h
@@ -0,0 +1,50 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+#include "navpad_prefs.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+	k00, k01, k02, k03, \
+	k10, k11, k12, k13, k14, k15, k16,       R10, R11, R12, R13, R14, R15,\
+	k20, k21, k22, k23, k24, k25, k26,       R20, R21, R22, R23, R24, R25,\
+	               k33, k34, k35, k36,       R30, R31, R32, R33, R34, R35,\
+	k40, k41, k42, k43, k44, k45, k46,  R46, R40, R41, R42, R43, R44, R45,\
+	k50, k51, k52, k53, k54, k55, k56,  R56, R50, R51, R52, R53, R54, R55\
+	) \
+    {\
+	{ k01, k02, k13, k14, k15, k16 }, \
+	{ k11, k12, k23, k24, k25, k26 }, \
+	{ k21, k22, k33, k34, k35, k36 }, \
+	{ k41, k42, k43, k44, k45, k46 }, \
+	{ k51, k52, k53, k54, k55, k56 }, \
+	{ k00, k03, k10, k20, k40, k50 }, \
+    { R15, R14, R13, R12, R11, R10, KC_NO }, \
+    { R25, R24, R23, R22, R21, R20, KC_NO }, \
+    { R35, R34, R33, R32, R31, R30, KC_NO }, \
+    { R45, R44, R43, R42, R41, R40, R46 }, \
+    { R55, R54, R53, R52, R51, R50, R56 } \
+   	}
diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h
new file mode 100644
index 0000000000..2d62885328
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10_helix_r/config.h
@@ -0,0 +1,126 @@
+/*
+Copyright 2021 yushakobo
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x3265
+#define PRODUCT_ID   0x0008
+#define DEVICE_VER   0x0001
+#define MANUFACTURER yushakobo
+#define PRODUCT      "navpad 1.0 with helix keyboard"
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 7
+
+/*
+ * 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       { D4, C6, D7, E6, B4, F4 }
+#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 }
+#define MATRIX_COL_PINS       { F5, F6, B2, B3, B1, F7, NO_PIN }
+#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2 }
+#define UNUSED_PIN            { D0, D1 }
+
+#define EE_HANDS
+
+#ifdef RGB_DI_PIN
+#    define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, 6, 8, 7, \//navpad side
+                                   9, 10, 11, 12, 13, 14, \//helix side
+                                  20, 19, 18, 17, 16, 15, \
+                                  21, 22, 23, 24, 25, 26, \
+                              33, 32, 31, 30, 29, 28, 27, \
+                              34, 35, 36, 37, 38, 39, 40 }
+#endif
+
+#define ENCODERS_PAD_A { B5 }
+#define ENCODERS_PAD_B { B6 }
+
+#define ENCODERS_PAD_A_RIGHT { B6 }
+#define ENCODERS_PAD_B_RIGHT { B5 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D2  // or D0, D1, D3, E6
+
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 9+32
+#    define RGBLED_SPLIT { 9, 32 }
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 120 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
+
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 132
+#define TAPPING_LAYER_TERM 90
\ No newline at end of file
diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json
new file mode 100644
index 0000000000..98e2314c91
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10_helix_r/info.json
@@ -0,0 +1,17 @@
+{
+    "keyboard_name": "navpad 1.0 w/ helix right hand side",
+    "url": "",
+    "maintainer": "yushakobo",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y":  0},{"x": 1, "y":  0},{"x": 2, "y":  0},{"x": 3, "y":  0},
+                {"x": 0, "y":  1},{"x": 1, "y":  1},{"x": 2, "y":  1},{"x": 3, "y":  1},{"x": 4, "y":  1},{"x": 5, "y":  1},{"x": 6, "y":  1},                  {"x": 8, "y":  1},{"x": 9, "y":  1},{"x": 10, "y":  1},{"x": 11, "y":  1},{"x": 12, "y":  1},{"x": 13, "y":  1},
+                {"x": 0, "y":  2},{"x": 1, "y":  2},{"x": 2, "y":  2},{"x": 3, "y":  2},{"x": 4, "y":  2},{"x": 5, "y":  2},{"x": 6, "y":  2},                  {"x": 8, "y":  2},{"x": 9, "y":  2},{"x": 10, "y":  2},{"x": 11, "y":  2},{"x": 12, "y":  2},{"x": 13, "y":  2},
+                                                                      {"x": 3, "y":  3},{"x": 4, "y":  3},{"x": 5, "y":  3},{"x": 6, "y":  3},                  {"x": 8, "y":  3},{"x": 9, "y":  3},{"x": 10, "y":  3},{"x": 11, "y":  3},{"x": 12, "y":  3},{"x": 13, "y":  3},
+                {"x": 0, "y":  4},{"x": 1, "y":  4},{"x": 2, "y":  4},{"x": 3, "y":  4},{"x": 4, "y":  4},{"x": 5, "y":  4},{"x": 6, "y":  4},{"x": 7, "y":  4},{"x": 8, "y":  4},{"x": 9, "y":  4},{"x": 10, "y":  4},{"x": 11, "y":  4},{"x": 12, "y":  4},{"x": 13, "y":  4},
+                {"x": 0, "y":  5},{"x": 1, "y":  5},{"x": 2, "y":  5},{"x": 3, "y":  5},{"x": 4, "y":  5},{"x": 5, "y":  5},{"x": 6, "y":  5},{"x": 7, "y":  5},{"x": 8, "y":  5},{"x": 9, "y":  5},{"x": 10, "y":  5},{"x": 11, "y":  5},{"x": 12, "y":  5},{"x": 13, "y":  5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h
new file mode 100644
index 0000000000..b4d2122ab4
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/config.h
@@ -0,0 +1,25 @@
+/*
+Copyright 2021 yushakobo
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#ifdef RGB_DI_PIN
+
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_MAX_LAYERS 6
+
+#endif
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4753aa6ee5
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] =LAYOUT (
+    KC_PSCR,   KC_SLCK,   KC_PAUS,   KC_MUTE,
+    KC_INS,    KC_HOME,   KC_PGUP,   KC_ESC,    KC_PSLS,    KC_PAST,   KC_PMNS,                     KC_6,       KC_7,       KC_8,       KC_9,       KC_0,       KC_DEL,
+    KC_DEL,    KC_END,    KC_PGDN,   KC_P7,     KC_P8,      KC_P9,     KC_PPLS,                     KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,       KC_BSPC,
+                                     KC_P4,     KC_P5,      KC_P6,     KC_PPLS,                     KC_H,       KC_J,       KC_K,       KC_L,       KC_SCLN,    KC_QUOT,
+    S(KC_TAB), KC_UP,     KC_TAB,    KC_P1,     KC_P2,      KC_P3,     LT(1,KC_PENT), KC_RBRC, 	    KC_N,       KC_M,       KC_COMM,    KC_DOT,     KC_SLSH,    KC_ENT,
+    KC_LEFT,   KC_DOWN,   KC_RGHT,   KC_P0,     KC_P0,      KC_PDOT,   LT(1,KC_PENT), LT(1,KC_SPC),LT(2,KC_ENT),KC_NO,      KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT
+  ),
+
+  [_FN1] =LAYOUT (
+    RESET,     EEP_RST,   KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NLCK,   KC_QUOT,   KC_PEQL,    KC_NO,                       KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       KC_DEL,
+    KC_CAPS,   KC_NLCK,   KC_SLCK,   S(KC_9),   KC_UP,     S(KC_0),    S(KC_SPC),                   KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       KC_BSPC,
+                                     KC_LEFT,   KC_BTN3,   KC_RGHT,    S(KC_SPC),                   KC_A,       KC_S,       KC_D,       KC_F,       KC_G,       KC_QUOT,
+    KC_TRNS,   S(KC_ENT), KC_TRNS,   KC_BSPC,   KC_DOWN,   KC_DEL,     KC_TRNS,       KC_RBRC,      KC_Z,       KC_X,       KC_C,       KC_V,       KC_B,       KC_ENT,
+    KC_BTN1,   KC_ENT,    S(KC_SPC),LT(2,KC_SPC),KC_SPC,   KC_COMM,    KC_TRNS,       KC_TRNS,      KC_TRNS,    KC_NO,      KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT
+  ),
+
+  [_FN2] =LAYOUT (
+    RGB_TOG,   RGB_MOD,   RGB_RMOD,  KC_NO,
+    RGB_HUI,   RGB_SAI,   RGB_VAI,   KC_NO,     KC_NO,     KC_NO,     KC_NO,                        KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+    RGB_HUD,   RGB_SAD,   RGB_VAD,   KC_NO,     KC_NO,     KC_NO,     KC_NO,                        KC_BSPC,    KC_DEL,     KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                                     KC_NO,     KC_NO,     KC_NO,     KC_NO,                        KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT,    KC_NO,      KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,         KC_RBRC,       KC_HOME,    KC_PGDN,    KC_PGUP,    KC_END,     KC_NO,      KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,         KC_TRNS,       KC_TRNS,    KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO
+  ),
+
+  [_FN3] =LAYOUT (
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,                        KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,                        KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                                     KC_NO,     KC_NO,     KC_NO,     KC_NO,                        KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,         KC_RBRC,       KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+    KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,     KC_NO,         KC_TRNS,       KC_TRNS,    KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO
+  )
+};
+
+#ifdef RGBLIGHT_LAYERS
+# define LOCK_COLOR_1 HSV_TEAL
+
+const rgblight_segment_t PROGMEM navpad_capslock[] = RGBLIGHT_LAYER_SEGMENTS(
+  {4,  1, LOCK_COLOR_1},
+  {15, 1, LOCK_COLOR_1}
+);
+
+const rgblight_segment_t PROGMEM navpad_numlock[] = RGBLIGHT_LAYER_SEGMENTS(
+  {0,  1, LOCK_COLOR_1},
+  {5,  1, LOCK_COLOR_1},
+  {14, 1, LOCK_COLOR_1}
+);
+
+const rgblight_segment_t PROGMEM navpad_scrolllock[] = RGBLIGHT_LAYER_SEGMENTS(
+  {2,  1, LOCK_COLOR_1},
+  {6,  1, LOCK_COLOR_1},
+  {26, 1, LOCK_COLOR_1}
+);
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, host_keyboard_led_state().caps_lock);
+    rgblight_set_layer_state(1, (host_keyboard_led_state().num_lock && IS_LAYER_ON(_BASE)));
+    rgblight_set_layer_state(2, host_keyboard_led_state().scroll_lock);
+    return true;
+}
+
+const rgblight_segment_t* const PROGMEM navpad_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+  navpad_capslock,
+  navpad_numlock,
+  navpad_scrolllock
+);
+
+void keyboard_post_init_user(void) {
+    rgblight_sethsv_noeeprom(HSV_WHITE);
+    // Enable the LED layers
+    rgblight_layers = navpad_rgb_layers;
+}
+#endif
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md
new file mode 100644
index 0000000000..640f8056c0
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md
@@ -0,0 +1,86 @@
+# The default keymap for navpad 1.0 with helix (right hand side)
+
+### Base layer
+```
+   ,-------------------------------. ,-------.
+   | KC_PSCR  | KC_SLCK  | KC_PAUS | |KC_MUTE|
+   |----------+----------+----------+-------------------------------------------------.                ,-----------------------------------------------------------------------.
+   | KC_INS   | KC_HOME  | KC_PGUP  | KC_ESC   | KC_PSLS   | KC_PAST  | KC_PMNS       |                | KC_6       | KC_7     | KC_8      | KC_9      | KC_0      | KC_DEL    |
+   |----------+----------+----------+----------+-----------+----------+---------------|                |------------+----------+-----------+-----------+-----------+-----------|
+   | KC_DEL   | KC_END   | KC_PGDN  | KC_P7    | KC_P8     | KC_P9    | KC_PPLS       |                | KC_Y       | KC_U     | KC_I      | KC_O      | KC_P      | KC_BSPC   |
+   `--------------------------------+----------+-----------+----------+---------------|                |------------+----------+-----------+-----------+-----------+-----------|
+                                    | KC_P4    | KC_P5     | KC_P6    | KC_PPLS       |                | KC_H       | KC_J     | KC_K      | KC_L      | KC_SCLN   | KC_QUOT   |
+   ,--------------------------------+----------+-----------+----------+---------------|  ,-------------+------------+----------+-----------+-----------+-----------+-----------|
+   | S(KC_TAB)| KC_UP    | KC_TAB   | KC_P1    | KC_P2     | KC_P3    | LT(1,KC_PENT) |  | KC_RBRC     | KC_N       | KC_M     | KC_COMM   | KC_DOT    | KC_SLSH   | KC_ENT    |
+   |----------+----------+----------+----------+-----------+----------+---------------|  |-------------+------------+----------+-----------+-----------+-----------+-----------|
+   | KC_LEFT  | KC_DOWN  | KC_RGHT  | KC_P0    | TAP_00    | KC_PDOT  | LT(1,KC_PENT) |  | LT(1,KC_SPC)|LT(2,KC_ENT)| KC_NO    | KC_LEFT   | KC_DOWN   | KC_UP     | KC_RGHT   |
+   '----------------------------------------------------------------------------------`  '-------------------------------------------------------------------------------------`
+```
+### FN1 layer
+```
+   ,-------------------------------. ,-------.
+   | RESET    | EEP_RST  | KC_NO   | | KC_NO |
+   |----------+----------+----------+-------------------------------------------------.                ,-----------------------------------------------------------------------.
+   | KC_NO    | KC_NO    | KC_NO    | KC_NLCK  | KC_QUOT   | KC_PEQL  | KC_NO         |                | KC_1       | KC_2     | KC_3      | KC_4      | KC_5      | KC_DEL    |
+   `--------------------------------+----------+-----------+----------+---------------|                |------------+----------+-----------+-----------+-----------+-----------|
+   | KC_CAPS  | KC_NLCK  | KC_SLCK  | S(KC_9)  | KC_UP     | S(KC_0)  | S(KC_SPC)     |                | KC_Q       | KC_W     | KC_E      | KC_R      | KC_T      | KC_BSPC   |
+   `--------------------------------+----------+-----------+----------+---------------|                |------------+----------+-----------+-----------+-----------+-----------|
+                                    | KC_LEFT  | KC_BTN3   | KC_RGHT  | S(KC_SPC)     |                | KC_A       | KC_S     | KC_D      | KC_F      | KC_G      | KC_QUOT   |
+   ,--------------------------------+----------+-----------+----------+---------------|  ,-------------+------------+----------+-----------+-----------+-----------+-----------|
+   | KC_TRNS  | S(KC_ENT)| KC_TRNS  | KC_BSPC  | KC_DOWN   | KC_DEL   | KC_TRNS       |  | KC_RBRC     | KC_Z       | KC_X     | KC_C      | KC_V      | KC_B      | KC_ENT    |
+   |----------+----------+----------+----------+-----------+----------+---------------|  |-------------+------------+----------+-----------+-----------+-----------+-----------|
+   | KC_BTN1  | KC_ENT   |S(KC_SPC)|LT(2,KC_SPC)|KC_SPC    | KC_COMM  | KC_TRNS       |  | KC_TRNS     | KC_TRNS    | KC_NO    | KC_LEFT   | KC_DOWN   | KC_UP     | KC_RGHT   |
+   '----------------------------------------------------------------------------------`  '-------------------------------------------------------------------------------------`
+```
+### FN2 layer
+```
+   ,-------------------------------. ,-------.
+   | RGB_TOG  | RGB_MOD  | RGB_RMOD| | KC_NO |
+   |----------+----------+----------+-------------------------------------------------.                ,-----------------------------------------------------------------------.
+   | RGB_HUI  | RGB_SAI  | RGB_VAI  | KC_NO    | KC_NO     | KC_NO    | KC_NO         |                | KC_NO      | KC_NO    | KC_NO     | KC_NO     | KC_NO     | KC_NO     |
+   `--------------------------------+----------+-----------+----------+---------------|                |------------+----------+-----------+-----------+-----------+-----------|
+   | RGB_HUD  | RGB_SAD  | RGB_VAD  | KC_NO    | KC_NO     | KC_NO    | KC_NO         |                | KC_BSPC    | KC_DEL   | KC_NO     | KC_NO     | KC_NO     | KC_NO     |
+   `--------------------------------+----------+-----------+----------+---------------|                |------------+----------+-----------+-----------+-----------+-----------|
+                                    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |                | KC_LEFT    | KC_DOWN  | KC_UP     | KC_RGHT   | KC_NO     | KC_NO     |
+   ,--------------------------------+----------+-----------+----------+---------------|  ,-------------+------------+----------+-----------+-----------+-----------+-----------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |  | KC_RBRC     | KC_HOME    | KC_PGDN  | KC_PGUP   | KC_END    | KC_NO     | KC_NO     |
+   |----------+----------+----------+----------+-----------+----------+---------------|  |-------------+------------+----------+-----------+-----------+-----------+-----------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |  | KC_TRNS     | KC_TRNS    | KC_NO    | KC_NO     | KC_NO     | KC_NO     | KC_NO     |
+   '----------------------------------------------------------------------------------`  '-------------------------------------------------------------------------------------`
+```
+### FN3 layer
+```
+   ,-------------------------------. ,-------.
+   | KC_NO    | KC_NO    | KC_NO   | | KC_NO |
+   |----------+----------+----------+-------------------------------------------------.                ,-----------------------------------------------------------------------.
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |                | KC_NO      | KC_NO    | KC_NO     | KC_NO     | KC_NO     | KC_NO     |
+   `--------------------------------+----------+-----------+----------+---------------|                |------------+----------+-----------+-----------+-----------+-----------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |                | KC_NO      | KC_NO    | KC_NO     | KC_NO     | KC_NO     | KC_NO     |
+   `--------------------------------+----------+-----------+----------+---------------|                |------------+----------+-----------+-----------+-----------+-----------|
+                                    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |                | KC_NO      | KC_NO    | KC_NO     | KC_NO     | KC_NO     | KC_NO     |
+   ,--------------------------------+----------+-----------+----------+---------------|  ,-------------+------------+----------+-----------+-----------+-----------+-----------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |  | KC_RBRC     | KC_NO      | KC_NO    | KC_NO     | KC_NO     | KC_NO     | KC_NO     |
+   |----------+----------+----------+----------+-----------+----------+---------------|  |-------------+------------+----------+-----------+-----------+-----------+-----------|
+   | KC_NO    | KC_NO    | KC_NO    | KC_NO    | KC_NO     | KC_NO    | KC_NO         |  | KC_TRNS     | KC_TRNS    | KC_NO    | KC_NO     | KC_NO     | KC_NO     | KC_NO     |
+   '----------------------------------------------------------------------------------`  '-------------------------------------------------------------------------------------`
+```
+
+## custom keycodes behaviour
+
+|keycodes|actual input|behaviour|
+|---|---|---|
+|TAP_00|"00"|tap_code(KC_P0) twice|
+
+## rotary encoder behaviour
+
+|Encoder No.1|CW|CCW|
+|---|---|---|
+|BASE|KC_VOLU|KC_VOLD|
+|FN1|rgblight_increse_hue()|rgblight_decrese_hue()|
+|FN2|rgblight_increse_sat()|rgblight_decrese_sat()|
+
+|Encoder No.2|CW|CCW|
+|---|---|---|
+|BASE|]|[|
+|FN1|)|(|
+|FN2|}|{|
diff --git a/keyboards/yushakobo/navpad/10_helix_r/readme.md b/keyboards/yushakobo/navpad/10_helix_r/readme.md
new file mode 100644
index 0000000000..99fa83c62d
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10_helix_r/readme.md
@@ -0,0 +1,33 @@
+# navpad 1.0 with Helix (Right hand side)
+
+![10_helix_r](https://imgur.com/ehTI37h.jpg)
+
+Navpad connected with helix keyboard (Right Side)
+
+* Keyboard Maintainer: [yushakobo](https://github.com/yushakobo)
+* Hardware Supported: Navpad 1.0 PCB and Helix PCB, Pro Micro
+* Hardware Availability: https://shop.yushakobo.jp/products/navpad-10
+
+Make example for this keyboard (after setting up your build environment):
+    
+    make yushakobo/navpad/10_helix_r:default
+
+Flashing examples for this keyboard...
+
+Helix side:
+    
+    make yushakobo/navpad/10_helix_r:default:avrdude-split-right
+    
+Navpad side:
+
+    make yushakobo/navpad/10_helix_r:default:avrdude-split-left
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/yushakobo/navpad/10_helix_r/rules.mk b/keyboards/yushakobo/navpad/10_helix_r/rules.mk
new file mode 100644
index 0000000000..54598940df
--- /dev/null
+++ b/keyboards/yushakobo/navpad/10_helix_r/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+SPLIT_KEYBOARD = yes
+ENCODER_ENABLE = yes
+
+SRC += navpad_prefs.c
diff --git a/keyboards/yushakobo/navpad/navpad_prefs.c b/keyboards/yushakobo/navpad/navpad_prefs.c
new file mode 100644
index 0000000000..fd2a7b0789
--- /dev/null
+++ b/keyboards/yushakobo/navpad/navpad_prefs.c
@@ -0,0 +1,104 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record)) { return false; }
+    switch (keycode) {
+  case TAP_00:
+    if (record->event.pressed){
+      tap_code(KC_P0);
+      tap_code(KC_P0);
+      }
+    break;
+
+  default:
+    break;
+  }
+  return true;
+}
+
+bool led_update_kb(led_t led_state) {
+    return led_update_user(led_state);
+}
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) { /* Navpad side encoder */
+      switch (get_highest_layer(layer_state|default_layer_state)) {
+      case _BASE:
+        if (clockwise) {
+          tap_code16(KC_VOLU);
+        } else {
+          tap_code16(KC_VOLD);
+        }
+        break;
+      
+      case _FN1:
+        if (clockwise) {
+          rgblight_increase_hue();
+        } else {
+          rgblight_decrease_hue();
+        }
+        break;
+      
+      case _FN2:
+        if (clockwise) {
+          rgblight_increase_sat();
+        } else {
+          rgblight_decrease_sat();
+        }
+        break;
+
+      default:
+        break;
+      }
+    }
+    if (index == 1) { /* Helix side encoder */
+      switch (get_highest_layer(layer_state|default_layer_state)) {
+      case _BASE:
+        if (clockwise) {
+          tap_code(KC_RBRC);
+        } else {
+          tap_code(KC_LBRC);
+        }
+        break;
+      
+      case _FN1:
+        if (clockwise) {
+          tap_code16(KC_RPRN);
+        } else {
+          tap_code16(KC_LPRN);
+        }
+        break;
+      
+      case _FN2:
+        if (clockwise) {
+          tap_code16(KC_RCBR);
+        } else {
+          tap_code16(KC_LCBR);
+        }
+        break;
+
+      default:
+        break;
+      }
+    }
+    return false;
+  }
+#endif
diff --git a/keyboards/yushakobo/navpad/navpad_prefs.h b/keyboards/yushakobo/navpad/navpad_prefs.h
new file mode 100644
index 0000000000..866b137c81
--- /dev/null
+++ b/keyboards/yushakobo/navpad/navpad_prefs.h
@@ -0,0 +1,30 @@
+/* Copyright 2021 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+enum custom_keycodes { 
+  TAP_00 = SAFE_RANGE
+};
+
+enum layer_name {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
diff --git a/keyboards/yushakobo/navpad/readme.md b/keyboards/yushakobo/navpad/readme.md
new file mode 100644
index 0000000000..4825ced4e5
--- /dev/null
+++ b/keyboards/yushakobo/navpad/readme.md
@@ -0,0 +1,14 @@
+# Navpad
+
+![navpad_10](https://imgur.com/zxElDdWh.jpg)
+
+Useful numpad with navigation cluster
+
+* keyboard Maintainer: [yushakobo](https://github.com/yushakobo)
+* Hardware Supported: Navpad PCBs, Pro Micro
+
+For each build, please check these links down below.
+
+* [navpad 1.0](10/): Entry, easy to build
+* [navpad 1.0 w/ Helix Righthand](10_helix_r/): Sample for extensions
+

From 7275680364ac9db87a03f5232d87bf203eaf3f40 Mon Sep 17 00:00:00 2001
From: Alin Marin Elena <alin@elena.space>
Date: Tue, 11 Jan 2022 01:47:52 +0000
Subject: [PATCH 246/867] [Keyboard] M60 simple 5x12 in lego keyboard (#15534)

* add m60 lego case, with stm32f401

* Update keyboards/mlego/m60/m60.h

* Update keyboards/mlego/m60/keymaps/default/keymap.c

* Update keyboards/mlego/m60/m60.h

* Update keyboards/mlego/m60/keymaps/via/keymap.c

* address the moving of enum in keymaps
---
 keyboards/mlego/m60/config.h                 |  37 ++++
 keyboards/mlego/m60/info.json                |  11 ++
 keyboards/mlego/m60/keymaps/default/config.h |  21 +++
 keyboards/mlego/m60/keymaps/default/keymap.c | 175 +++++++++++++++++++
 keyboards/mlego/m60/keymaps/via/config.h     |  20 +++
 keyboards/mlego/m60/keymaps/via/keymap.c     | 175 +++++++++++++++++++
 keyboards/mlego/m60/keymaps/via/rules.mk     |   1 +
 keyboards/mlego/m60/m60.c                    |  30 ++++
 keyboards/mlego/m60/m60.h                    |  57 ++++++
 keyboards/mlego/m60/readme.md                |  49 ++++++
 keyboards/mlego/m60/rev1/config.h            |  58 ++++++
 keyboards/mlego/m60/rev1/halconf.h           |  30 ++++
 keyboards/mlego/m60/rev1/mcuconf.h           |  30 ++++
 keyboards/mlego/m60/rev1/rules.mk            |  22 +++
 14 files changed, 716 insertions(+)
 create mode 100644 keyboards/mlego/m60/config.h
 create mode 100644 keyboards/mlego/m60/info.json
 create mode 100644 keyboards/mlego/m60/keymaps/default/config.h
 create mode 100644 keyboards/mlego/m60/keymaps/default/keymap.c
 create mode 100644 keyboards/mlego/m60/keymaps/via/config.h
 create mode 100644 keyboards/mlego/m60/keymaps/via/keymap.c
 create mode 100644 keyboards/mlego/m60/keymaps/via/rules.mk
 create mode 100644 keyboards/mlego/m60/m60.c
 create mode 100644 keyboards/mlego/m60/m60.h
 create mode 100644 keyboards/mlego/m60/readme.md
 create mode 100644 keyboards/mlego/m60/rev1/config.h
 create mode 100644 keyboards/mlego/m60/rev1/halconf.h
 create mode 100644 keyboards/mlego/m60/rev1/mcuconf.h
 create mode 100644 keyboards/mlego/m60/rev1/rules.mk

diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h
new file mode 100644
index 0000000000..07698f7539
--- /dev/null
+++ b/keyboards/mlego/m60/config.h
@@ -0,0 +1,37 @@
+/* Copyright 2021-2022 alin m elena <alinm.elena@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xBABA
+#define MANUFACTURER alin elena
+#define PRODUCT m60
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 12
+
+#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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/mlego/m60/info.json b/keyboards/mlego/m60/info.json
new file mode 100644
index 0000000000..75b7bc38aa
--- /dev/null
+++ b/keyboards/mlego/m60/info.json
@@ -0,0 +1,11 @@
+{
+    "keyboard_name": "mlego/m60",
+    "keyboard_folder": "mlego/m60",
+    "url": "https://gitlab.com/m-lego/m60",
+    "maintainer": "alin elena",
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/mlego/m60/keymaps/default/config.h b/keyboards/mlego/m60/keymaps/default/config.h
new file mode 100644
index 0000000000..b1aed18a18
--- /dev/null
+++ b/keyboards/mlego/m60/keymaps/default/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
+#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WINC
diff --git a/keyboards/mlego/m60/keymaps/default/keymap.c b/keyboards/mlego/m60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..18fdba688a
--- /dev/null
+++ b/keyboards/mlego/m60/keymaps/default/keymap.c
@@ -0,0 +1,175 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+#endif
+
+#define LOWER TT(_LWR)
+#define RAISE TT(_RSE)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_QW] = LAYOUT_ortho_5x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_APP,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+[_LWR] = LAYOUT_ortho_5x12(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+[_RSE] = LAYOUT_ortho_5x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+[_ADJ] =  LAYOUT_ortho_5x12(
+    _______, RESET,   _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, RESET,   _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+)
+
+};
+// clang-format on
+
+// let us assume we start with both layers off
+bool toggle_lwr = false;
+bool toggle_rse = false;
+
+bool led_update_user(led_t led_state) {
+    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
+    return false;
+}
+
+void matrix_scan_user(void) {
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        case (TT(_LWR)):
+            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
+                toggle_lwr = !layer_state_is(_LWR);
+            }
+            return true;
+            break;
+        case (TT(_RSE)):
+            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                toggle_rse = !layer_state_is(_RSE);
+            }
+            return true;
+            break;
+        default:
+            return true;
+    }
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+#endif
+    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
diff --git a/keyboards/mlego/m60/keymaps/via/config.h b/keyboards/mlego/m60/keymaps/via/config.h
new file mode 100644
index 0000000000..637c0a8faf
--- /dev/null
+++ b/keyboards/mlego/m60/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/mlego/m60/keymaps/via/keymap.c b/keyboards/mlego/m60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..18fdba688a
--- /dev/null
+++ b/keyboards/mlego/m60/keymaps/via/keymap.c
@@ -0,0 +1,175 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+#endif
+
+#define LOWER TT(_LWR)
+#define RAISE TT(_RSE)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_QW] = LAYOUT_ortho_5x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_APP,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+[_LWR] = LAYOUT_ortho_5x12(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+[_RSE] = LAYOUT_ortho_5x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+[_ADJ] =  LAYOUT_ortho_5x12(
+    _______, RESET,   _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, RESET,   _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+)
+
+};
+// clang-format on
+
+// let us assume we start with both layers off
+bool toggle_lwr = false;
+bool toggle_rse = false;
+
+bool led_update_user(led_t led_state) {
+    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
+    return false;
+}
+
+void matrix_scan_user(void) {
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        case (TT(_LWR)):
+            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
+                toggle_lwr = !layer_state_is(_LWR);
+            }
+            return true;
+            break;
+        case (TT(_RSE)):
+            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                toggle_rse = !layer_state_is(_RSE);
+            }
+            return true;
+            break;
+        default:
+            return true;
+    }
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+#endif
+    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
diff --git a/keyboards/mlego/m60/keymaps/via/rules.mk b/keyboards/mlego/m60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mlego/m60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mlego/m60/m60.c b/keyboards/mlego/m60/m60.c
new file mode 100644
index 0000000000..cce37837c6
--- /dev/null
+++ b/keyboards/mlego/m60/m60.c
@@ -0,0 +1,30 @@
+/* Copyright 2021-2022 alin elena <alin@elena.space>
+ *
+ * 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 "m60.h"
+
+/*
+void keyboard_pre_init_kb(void){
+
+  // Workaround for reversible pcb/mcu
+    palSetLineMode(C13, PAL_MODE_INPUT_PULLUP);
+    palSetLineMode(C15, PAL_MODE_INPUT_PULLUP);
+    palSetLineMode(B7, PAL_MODE_OUTPUT_OPENDRAIN);
+    palSetLineMode(A0, PAL_MODE_OUTPUT_OPENDRAIN);
+    palSetLineMode(A1, PAL_MODE_OUTPUT_OPENDRAIN);
+
+    keyboard_pre_init_user();
+    }
+*/
diff --git a/keyboards/mlego/m60/m60.h b/keyboards/mlego/m60/m60.h
new file mode 100644
index 0000000000..732b8d2e41
--- /dev/null
+++ b/keyboards/mlego/m60/m60.h
@@ -0,0 +1,57 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_ortho_5x12( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \
+    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411  \
+) { \
+    {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011}, \
+    {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111}, \
+    {K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211}, \
+    {K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311}, \
+    {K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411}  \
+}
+
+static inline void led_lwr(const bool on) {
+#ifdef LED_NUM_LOCK_PIN
+    writePin(LED_NUM_LOCK_PIN, on);
+#endif
+}
+
+static inline void led_rse(const bool on) {
+#ifdef LED_SCROLL_LOCK_PIN
+    writePin(LED_SCROLL_LOCK_PIN, on);
+#endif
+}
+static inline void led_caps(const bool on) {
+#ifdef LED_CAPS_LOCK_PIN
+    if ((DEVICE_VER == 0x0001) || (DEVICE_VER == 0x0003)) {
+        writePin(LED_CAPS_LOCK_PIN, !on);
+    }
+    if (DEVICE_VER == 0x0002) {
+        writePin(LED_CAPS_LOCK_PIN, on);
+    }
+#endif
+}
+
diff --git a/keyboards/mlego/m60/readme.md b/keyboards/mlego/m60/readme.md
new file mode 100644
index 0000000000..f695c33cff
--- /dev/null
+++ b/keyboards/mlego/m60/readme.md
@@ -0,0 +1,49 @@
+# M60
+
+![M60](https://i.imgur.com/Zm7LaHih.jpg)
+
+A  (12x5) ortholinear keyboard that can be hand wired or using a pcb.
+
+* Keyboard Maintainer: [Alin Elena](https://github.com/alinelena) ([@drFaustroll on GitLab](https://gitlab.com/drFaustroll))
+* Hardware Supported: custom pcb [see](https://gitlab.com/drFaustroll/m60) STM32F401 from we act (rev1)
+* Hardware Availability: [custom how to](https://gitlab.com/drFaustroll/m65)
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mlego/m60/rev1:default
+
+Flashing example for this keyboard:
+
+    make mlego/m60/rev1:default
+
+To enter flashing mode, press Lower+Raise also on microcontroller keep pressed BOOT0 and then NRST, release NRST and then after 0.5s or so  release BOOT0.
+
+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).
+
+## Layout and pins stm32f401
+
+similar for stm32f411
+
+| Rows  | C0    | C1    | C2    | C3    | C4    | C5    | C6    | C7    | C8    | C9    | C10   | C11   | Pins  |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| R0    | Esc   | 1     | 2     | 3     | 4     | 5     | 6     | 7     | 8     | 9     | 0     | BSpace|   A6  |
+| R1    | Tab   | q     | w     | e     | r     | t     | y     | u     | i     | o     | p     | Del   |   A7  |
+| R2    | #     | a     | s     | d     | f     | g     | h     | j     | k     | l     | ;     | '     |   B0  |
+| R3    | Shift | z     | x     | c     | v     | b     | n     | m     | ,     | .     | /     | Enter |   B1  |
+| R4    | Ctrl  | Menu  | Alt   | Fn    | Lower | Space | Space | Raise | Left  | Down  | Up    | Right |  B10  |
+| Pins  | A10   | A15   | B3    | B4    | B5    | B7    | B6    | A1    | A2    | A3    | A4    |  A5   |       |
+
+### Encoders:
+
+  - Pad_A: A0
+  - Pad_B: B8
+
+### Leds
+
+| Leds        | Pin |
+| ----------- | --- |
+| NUM_LOCK    | B12 |
+| CAPS_LOCK   | C13 |
+| SCROLL_LOCK | B13 |
+| RBG_dI      | B15 |
diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h
new file mode 100644
index 0000000000..c05f30813a
--- /dev/null
+++ b/keyboards/mlego/m60/rev1/config.h
@@ -0,0 +1,58 @@
+/* Copyright 2021-2022 alin m elena <alinm.elena@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID 0x0001
+#define DEVICE_VER 0x0001
+
+#define MATRIX_ROW_PINS \
+    { A6, A7, B0, B1, B10 }
+#define MATRIX_COL_PINS \
+    { A10, A15, B3, B4, B5, B7, B6, A1, A2, A3, A4, A5 }
+
+#define ENCODERS_PAD_A \
+    { A0 }
+#define ENCODERS_PAD_B \
+    { B8 }
+
+#define LED_NUM_LOCK_PIN B12
+#define LED_SCROLL_LOCK_PIN B13
+#define LED_CAPS_LOCK_PIN C13
+
+#define RGB_DI_PIN B15
+
+#define UNUSED_PINS
+#define RGBLIGHT_LAYERS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define MATRIX_IO_DELAY 5
+
+#define RGBLED_NUM 20
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/mlego/m60/rev1/halconf.h b/keyboards/mlego/m60/rev1/halconf.h
new file mode 100644
index 0000000000..89815e23b7
--- /dev/null
+++ b/keyboards/mlego/m60/rev1/halconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SERIAL TRUE
+
+#define SERIAL_USB_BUFFERS_SIZE 256
+
+#include_next <halconf.h>
diff --git a/keyboards/mlego/m60/rev1/mcuconf.h b/keyboards/mlego/m60/rev1/mcuconf.h
new file mode 100644
index 0000000000..4d90ec07ea
--- /dev/null
+++ b/keyboards/mlego/m60/rev1/mcuconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/mlego/m60/rev1/rules.mk b/keyboards/mlego/m60/rev1/rules.mk
new file mode 100644
index 0000000000..a3ccf0102d
--- /dev/null
+++ b/keyboards/mlego/m60/rev1/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes      # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes  # Enable keyboard RGB underglow
+AUDIO_ENABLE = no      # Audio output
+ENCODER_ENABLE = yes   # Enable encoder
+
+LAYOUTS = ortho_5x12

From c6ad2025837d93353de1948991c3be0b5c90e667 Mon Sep 17 00:00:00 2001
From: Winston Durand <me@winstondurand.com>
Date: Mon, 10 Jan 2022 17:57:20 -0800
Subject: [PATCH 247/867] [keymap] Add massdrop/ctrl R167 keymap (#15585)

---
 keyboards/massdrop/ctrl/keymaps/R167/keymap.c | 143 ++++++++++++++++++
 .../massdrop/ctrl/keymaps/R167/readme.md      |  14 ++
 2 files changed, 157 insertions(+)
 create mode 100644 keyboards/massdrop/ctrl/keymaps/R167/keymap.c
 create mode 100644 keyboards/massdrop/ctrl/keymaps/R167/readme.md

diff --git a/keyboards/massdrop/ctrl/keymaps/R167/keymap.c b/keyboards/massdrop/ctrl/keymaps/R167/keymap.c
new file mode 100644
index 0000000000..942a002d95
--- /dev/null
+++ b/keyboards/massdrop/ctrl/keymaps/R167/keymap.c
@@ -0,0 +1,143 @@
+// Copyright 2021 Winston Durand (@R167)
+// SPDX-License-Identifier: MIT
+
+#include QMK_KEYBOARD_H
+
+enum ctrl_keycodes {
+    U_T_AUTO = SAFE_RANGE,  // USB Extra Port Toggle Auto Detect / Always Active
+    U_T_AGCR,               // USB Toggle Automatic GCR control
+    DBG_TOG,                // DEBUG Toggle On / Off
+    DBG_MTRX,               // DEBUG Toggle Matrix Prints
+    DBG_KBD,                // DEBUG Toggle Keyboard Prints
+    DBG_MOU,                // DEBUG Toggle Mouse Prints
+    MD_BOOT,                // Restart into bootloader after hold timeout
+    SLEEP,                  // Macro to send CMD+ALT+Ejct & turn off lights
+};
+
+enum r167_layers {
+    _QWERTY = 0,    // Standard querty layout
+    _FN,            // Simple function keys
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_EJCT, KC_HOME, KC_VOLU,
+        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_END,  KC_VOLD,
+        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_LALT, KC_LGUI,                   KC_SPC,                             KC_RGUI, KC_RALT, MO(_FN), KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT(
+        SLEEP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, KC_MUTE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, SLEEP,     KC_MPLY, _______, _______,
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, _______, _______, _______, _______,   KC_MPRV, KC_MNXT, _______,
+        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
+    ), \
+    /*
+    [X] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                              _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            _______, _______, _______
+    ),
+    */
+};
+// clang-format on
+
+#define MODS_SHIFT (get_mods() & MOD_MASK_SHIFT)
+#define MODS_CTRL (get_mods() & MOD_MASK_CTRL)
+#define MODS_ALT (get_mods() & MOD_MASK_ALT)
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static uint32_t key_timer;
+    static bool     asleep = false;
+    if (asleep && record->event.pressed) {
+        asleep = false;
+        rgb_matrix_set_flags(LED_FLAG_ALL);
+        rgb_matrix_enable_noeeprom();
+    }
+
+    switch (keycode) {
+        case U_T_AUTO:
+            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
+                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
+            }
+            return false;
+        case U_T_AGCR:
+            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
+                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
+            }
+            return false;
+        case DBG_TOG:
+            if (record->event.pressed) {
+                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
+            }
+            return false;
+        case DBG_MTRX:
+            if (record->event.pressed) {
+                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
+            }
+            return false;
+        case DBG_KBD:
+            if (record->event.pressed) {
+                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
+            }
+            return false;
+        case DBG_MOU:
+            if (record->event.pressed) {
+                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
+            }
+            return false;
+        case MD_BOOT:
+            if (record->event.pressed) {
+                key_timer = timer_read32();
+            } else {
+                if (timer_elapsed32(key_timer) >= 500) {
+                    reset_keyboard();
+                }
+            }
+            return false;
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    } break;
+                    case LED_FLAG_UNDERGLOW: {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_disable_noeeprom();
+                    } break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                    } break;
+                }
+            }
+            return false;
+        case SLEEP:
+            if (record->event.pressed) {
+                // CMD+ALT+EJECT doesn't always reliably trigger. fall back mode
+                // tap_code16(G(A(KC_EJCT)));
+                tap_code16(LCTL(LGUI(KC_Q)));
+                asleep = true;
+                rgb_matrix_set_flags(LED_FLAG_NONE);
+                rgb_matrix_disable_noeeprom();
+            } else if (IS_RELEASED(record->event)) {
+                tap_code(KC_ESCAPE);
+            }
+            return false;
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/massdrop/ctrl/keymaps/R167/readme.md b/keyboards/massdrop/ctrl/keymaps/R167/readme.md
new file mode 100644
index 0000000000..1b805ea6a9
--- /dev/null
+++ b/keyboards/massdrop/ctrl/keymaps/R167/readme.md
@@ -0,0 +1,14 @@
+![Layer 0](https://i.imgur.com/iRwr7si.png)
+
+![Layer 1](https://i.imgur.com/b2qwYdR.png)
+
+# R167 massdrop ctrl
+
+The main layer is a ~standard QWERTY layout with the ALT/GUI swap for macOS
+in addition to shifting the `Fn` key one to the right so cmd/alt line up nicely.
+Addionally, I rarely use PgUp/Dn, so I've remapped those to volume control.
+
+The most interesting bit is the shortcut `Fn + Esc` which triggers the macOS sleep
+shortcut (`CMD + ALT + Eject`) and then disables LEDs since the computer will wake up
+peripherals even while the display is asleep. Keyboard is returned to all LEDs on after
+pressing any key.

From e2aee8f9bbb0885ede2c2918244902bad9136659 Mon Sep 17 00:00:00 2001
From: moyi4681 <moyi4681@users.noreply.github.com>
Date: Tue, 11 Jan 2022 11:12:17 +0800
Subject: [PATCH 248/867] [Keyboard] add kbd67mkiirgb v4 support (#15024)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h    |  2 +
 keyboards/kbdfans/kbd67/mkiirgb/readme.md    | 15 +++--
 keyboards/kbdfans/kbd67/mkiirgb/v4/config.h  | 70 ++++++++++++++++++++
 keyboards/kbdfans/kbd67/mkiirgb/v4/readme.md | 18 +++++
 keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk  | 20 ++++++
 keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c      | 49 ++++++++++++++
 keyboards/kbdfans/kbd67/mkiirgb/v4/v4.h      | 32 +++++++++
 7 files changed, 199 insertions(+), 7 deletions(-)
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v4/readme.md
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c
 create mode 100644 keyboards/kbdfans/kbd67/mkiirgb/v4/v4.h

diff --git a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h
index c297a02e88..dadc230626 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h
@@ -22,5 +22,7 @@
     #include "v2.h"
 #elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v3)
     #include "v3.h"
+#elif defined(KEYBOARD_kbdfans_kbd67_mkiirgb_v4)
+    #include "v4.h"	
 #endif
 #include "quantum.h"
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/readme.md b/keyboards/kbdfans/kbd67/mkiirgb/readme.md
index 58338df0f6..5b71c27f0e 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/readme.md
+++ b/keyboards/kbdfans/kbd67/mkiirgb/readme.md
@@ -3,19 +3,20 @@
 A customizable 65% RGB keyboard.
 
 * Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
-* Hardware Supported: KBD67 Mk.II RGB V1, V2, and V3
+* Hardware Supported: KBD67 Mk.II RGB V1, V2, V3 and V4
 * Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
 
-There are three versions of the KBD67 MKII RGB. Please use the appropriate firmware for your board. 
+There are four versions of the KBD67 MKII RGB. Please use the appropriate firmware for your board. 
 
 * V1: STM32F303 (Arm), takes `.bin` files
 * V2: ATmega32U4 (AVR), takes `.hex` files
-* V3: Atmega32U4 (AVR), takes  `.bin` files
+* V3 and V4: Atmega32U4 (AVR), takes  `.bin` files
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kbdfans/kbd67/mkiirgb/v1:default # Arm (STM32F303)
-    make kbdfans/kbd67/mkiirgb/v2:default # AVR (ATmega32U4)
-    make kbdfans/kbd67/mkiirgb/v3:default # AVR (ATmega32U4)
-
+    make kbdfans/kbd67/mkiirgb/v1:default # Arm (STM32F303+IS31FL3731)
+    make kbdfans/kbd67/mkiirgb/v2:default # AVR (ATmega32U4+IS31FL3731)
+    make kbdfans/kbd67/mkiirgb/v3:default # AVR (ATmega32U4+IS31FL3741)
+    make kbdfans/kbd67/mkiirgb/v4:default # AVR (ATmega32U4+SK6812MINI)
+	
 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).
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
new file mode 100644
index 0000000000..3d633bed2a
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -0,0 +1,70 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * 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       0x4B42
+#define PRODUCT_ID      0x1227
+#define DEVICE_VER      0x0004
+#define MANUFACTURER    KBDFANS
+#define PRODUCT         KBD67 MKII RGB V4
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+#define MATRIX_ROW_PINS { B1, F1, B2, B3, C6 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, B0, B7, D0, D1, D2, D3, D5, D4, D6, D7, B4}
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+#define USB_SUSPEND_WAKEUP_DELAY 5000
+
+#define RGB_DI_PIN C7
+#define RGBLED_NUM 68
+#define DRIVER_LED_TOTAL RGBLED_NUM
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define RGB_MATRIX_HUE_STEP 8
+#define RGB_MATRIX_SAT_STEP 8
+#define RGB_MATRIX_VAL_STEP 8
+#define RGB_MATRIX_SPD_STEP 10
+#endif
+
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/readme.md b/keyboards/kbdfans/kbd67/mkiirgb/v4/readme.md
new file mode 100644
index 0000000000..b603992f69
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/readme.md
@@ -0,0 +1,18 @@
+# KBD67MKIIRGBV4
+
+A customizable 80% keyboard.
+
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: KBDFANS
+* Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kbdfans/kbd67/mkiirgb/v4: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).
+
+## Bootloader Enter the bootloader in 3 ways:
+* **Bootmagic reset**: Hold down esc in the keyboard then replug
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET`
\ No newline at end of file
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk
new file mode 100644
index 0000000000..bf2c1d1a6e
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = lufa-ms
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c b/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c
new file mode 100644
index 0000000000..3c4b81132f
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * 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 "v4.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+led_config_t g_led_config = {
+{
+    {  0,  1,  2,  3,  4,      5,  6,      7,       8,      9,  10,  11, 12,    13,  14 },
+    {  29, 28, 27, 26, 25,     24, 23,     22,      21,     20, 19,  18, 17,    16,  15 },
+    {  30, 31, 32, 33, 34,     35, 36,     37,      38,     39, 40,  41, 42,NO_LED,  43 },
+    {  57, 56, 55, 54, 53,     52, 51,     50,      49,     48, 47,  46, NO_LED,45,  44 },
+    {  58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED,  NO_LED, 62,  63,  64, NO_LED,65,  66 }
+}, {
+    {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0},
+    {224,16},{206,16},{188,16},{173,16},{158,16},{143,16},{128,16},{113,16},{98,16},{83,16}, {68,16},{53,16},{38,16},{23,16},{4,16},
+    {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32},
+    {224,48},{210,48},{189,48},{169,48},{154,48},{139,48},{124,48},{109,48},{94,48},{79,48},{64,48},{49,48},{34,48},{9,48},	
+    {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
+}, {
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 4, 1, 1, 1, 1, 1	
+} };
+
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
+    }
+}
+
+#endif
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.h
new file mode 100644
index 0000000000..da507403d3
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/v4.h
@@ -0,0 +1,32 @@
+/* Copyright 2021 DZTECH <moyi4681@Live.cn>
+ *
+ * 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 XXX KC_NO
+#include "quantum.h"
+#define LAYOUT_65_ansi_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, k2C,      K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
+    K40, K41, K42,           K45,                K49, K4A, K4B,      K4D, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, k2C, XXX, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \
+    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, XXX, K4D, K4E }  \
+}

From 01e4d07de0786035979d0f311ef31f87555737d7 Mon Sep 17 00:00:00 2001
From: Alin Marin Elena <alin@elena.space>
Date: Tue, 11 Jan 2022 03:14:54 +0000
Subject: [PATCH 249/867] [m65] add via, new mcu gd32f303, stm32f401 weact
 support for encoder and led strip (#14381)

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 keyboards/mlego/m65/config.h                  |  33 +++
 keyboards/mlego/m65/info.json                 |  81 ++++++
 keyboards/mlego/m65/keymaps/default/config.h  |  20 ++
 keyboards/mlego/m65/keymaps/default/keymap.c  | 169 ++++++++++++
 keyboards/mlego/m65/keymaps/default/readme.md |  13 +
 keyboards/mlego/m65/keymaps/dk/config.h       |  20 ++
 keyboards/mlego/m65/keymaps/dk/keymap.c       | 170 ++++++++++++
 keyboards/mlego/m65/keymaps/dk/readme.md      |  13 +
 keyboards/mlego/m65/keymaps/uk/config.h       |  22 ++
 keyboards/mlego/m65/keymaps/uk/keymap.c       | 251 ++++++++++++++++++
 keyboards/mlego/m65/keymaps/uk/readme.md      |  13 +
 keyboards/mlego/m65/keymaps/uk/rules.mk       |   1 +
 keyboards/mlego/m65/keymaps/via/config.h      |  20 ++
 keyboards/mlego/m65/keymaps/via/keymap.c      | 168 ++++++++++++
 keyboards/mlego/m65/keymaps/via/rules.mk      |   1 +
 keyboards/mlego/m65/m65.c                     |  18 ++
 keyboards/mlego/m65/m65.h                     | 124 +++++++++
 keyboards/mlego/m65/readme.md                 | 129 +++++++++
 keyboards/mlego/m65/rev1/chconf.h             |  28 ++
 keyboards/mlego/m65/rev1/config.h             |  59 ++++
 keyboards/mlego/m65/rev1/mcuconf.h            |  27 ++
 keyboards/mlego/m65/rev1/rules.mk             |  19 ++
 keyboards/mlego/m65/rev2/board.h              |  20 ++
 keyboards/mlego/m65/rev2/chconf.h             |  28 ++
 keyboards/mlego/m65/rev2/config.h             |  70 +++++
 keyboards/mlego/m65/rev2/mcuconf.h            |  27 ++
 keyboards/mlego/m65/rev2/rules.mk             |  19 ++
 keyboards/mlego/m65/rev3/config.h             |  59 ++++
 keyboards/mlego/m65/rev3/halconf.h            |  30 +++
 keyboards/mlego/m65/rev3/mcuconf.h            |  30 +++
 keyboards/mlego/m65/rev3/rules.mk             |  19 ++
 31 files changed, 1701 insertions(+)
 create mode 100644 keyboards/mlego/m65/config.h
 create mode 100644 keyboards/mlego/m65/info.json
 create mode 100644 keyboards/mlego/m65/keymaps/default/config.h
 create mode 100644 keyboards/mlego/m65/keymaps/default/keymap.c
 create mode 100644 keyboards/mlego/m65/keymaps/default/readme.md
 create mode 100644 keyboards/mlego/m65/keymaps/dk/config.h
 create mode 100644 keyboards/mlego/m65/keymaps/dk/keymap.c
 create mode 100644 keyboards/mlego/m65/keymaps/dk/readme.md
 create mode 100644 keyboards/mlego/m65/keymaps/uk/config.h
 create mode 100644 keyboards/mlego/m65/keymaps/uk/keymap.c
 create mode 100644 keyboards/mlego/m65/keymaps/uk/readme.md
 create mode 100644 keyboards/mlego/m65/keymaps/uk/rules.mk
 create mode 100644 keyboards/mlego/m65/keymaps/via/config.h
 create mode 100644 keyboards/mlego/m65/keymaps/via/keymap.c
 create mode 100644 keyboards/mlego/m65/keymaps/via/rules.mk
 create mode 100644 keyboards/mlego/m65/m65.c
 create mode 100644 keyboards/mlego/m65/m65.h
 create mode 100644 keyboards/mlego/m65/readme.md
 create mode 100644 keyboards/mlego/m65/rev1/chconf.h
 create mode 100644 keyboards/mlego/m65/rev1/config.h
 create mode 100644 keyboards/mlego/m65/rev1/mcuconf.h
 create mode 100644 keyboards/mlego/m65/rev1/rules.mk
 create mode 100644 keyboards/mlego/m65/rev2/board.h
 create mode 100644 keyboards/mlego/m65/rev2/chconf.h
 create mode 100644 keyboards/mlego/m65/rev2/config.h
 create mode 100644 keyboards/mlego/m65/rev2/mcuconf.h
 create mode 100644 keyboards/mlego/m65/rev2/rules.mk
 create mode 100644 keyboards/mlego/m65/rev3/config.h
 create mode 100644 keyboards/mlego/m65/rev3/halconf.h
 create mode 100644 keyboards/mlego/m65/rev3/mcuconf.h
 create mode 100644 keyboards/mlego/m65/rev3/rules.mk

diff --git a/keyboards/mlego/m65/config.h b/keyboards/mlego/m65/config.h
new file mode 100644
index 0000000000..25d69d8b7a
--- /dev/null
+++ b/keyboards/mlego/m65/config.h
@@ -0,0 +1,33 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+#define VENDOR_ID 0xBABA
+#define MANUFACTURER Alin Elena
+#define PRODUCT m65
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 13
+
+#define DIODE_DIRECTION COL2ROW
+#define DEBOUNCE 5
+
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/mlego/m65/info.json b/keyboards/mlego/m65/info.json
new file mode 100644
index 0000000000..c06cf9a712
--- /dev/null
+++ b/keyboards/mlego/m65/info.json
@@ -0,0 +1,81 @@
+{
+    "keyboard_name": "M65",
+    "keyboard_folder": "mlego/m65",
+    "url": "https://gitlab.com/m-lego/m65",
+    "maintainer": "alin elena",
+    "layouts": {
+        "LAYOUT_ortho_5x13": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+                {"x": 6, "y": 4},
+                {"x": 7, "y": 4},
+                {"x": 8, "y": 4},
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mlego/m65/keymaps/default/config.h b/keyboards/mlego/m65/keymaps/default/config.h
new file mode 100644
index 0000000000..637c0a8faf
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/default/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/mlego/m65/keymaps/default/keymap.c b/keyboards/mlego/m65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..75ad22f398
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/default/keymap.c
@@ -0,0 +1,169 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+#endif
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QW] = LAYOUT_ortho_5x13(
+       KC_ESC, KC_1   , KC_2    , KC_3   , KC_4    , KC_5  , KC_6  , KC_7  , KC_8   , KC_9   , KC_0   , KC_MINS, KC_BSPC ,
+       KC_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_NUHS, 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_LSPO, KC_NUBS, KC_Z    , KC_X   , KC_C    , KC_V  , KC_B  , KC_N  , KC_M   , KC_COMM, KC_DOT , KC_UP  , KC_SLSH ,
+      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
+
+  [_LWR] = LAYOUT_ortho_5x13(
+       KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , KC_EQL  ,
+       KC_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+       KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+       _______, KC_BTN1, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_U, _______ ,
+       _______, KC_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R),
+
+  [_RSE] = LAYOUT_ortho_5x13(
+      KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12  ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_U, _______ ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
+
+  [_ADJ] = LAYOUT_ortho_5x13(
+      RGB_MOD, RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_SW,
+      RGB_HUI, RGB_HUD , RGB_M_P , _______, RESET  , RGB_M_T, _______, _______, _______, _______, _______, _______ , RGB_M_SN,
+      RGB_SAI, RGB_SAD , RGB_M_B , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_K ,
+      RGB_VAI, RGB_VAD , RGB_M_R , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_X ,
+      RGB_TOG, _______ , _______ , _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_TW, RGB_M_G),
+
+};
+// clang-format on
+
+// let us assume we start with both layers off
+bool toggle_lwr = false;
+bool toggle_rse = false;
+
+bool led_update_user(led_t led_state) {
+    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
+    return false;
+}
+
+void matrix_scan_user(void) {
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        case (TT(_LWR)):
+            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
+                toggle_lwr = !layer_state_is(_LWR);
+            }
+            return true;
+            break;
+        case (TT(_RSE)):
+            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                toggle_rse = !layer_state_is(_RSE);
+            }
+            return true;
+            break;
+        default:
+            return true;
+    }
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+#endif
+    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
diff --git a/keyboards/mlego/m65/keymaps/default/readme.md b/keyboards/mlego/m65/keymaps/default/readme.md
new file mode 100644
index 0000000000..ae71342232
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/default/readme.md
@@ -0,0 +1,13 @@
+![M65 Layout Image](https://i.imgur.com/Z2O8yhGh.png)
+
+# Default M65 Layout
+
+This is the default layout for M65. For the most part it's a straightforward and easy to follow layout inspired by ISO with a UK
+turn.  The only unusual key is the key in the upper left, which sends Escape normally, but Grave when in layer 1 aka LWR.  Similarly
+number row in layer 1 give the usual audio KC_GRV, KC_AUDIO_MUTE,  KC_AUDIO_VOL_UP,  KC_AUDIO_VOL_DOWN,   KC_MEDIA_PREV_TRACK,
+KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK, M_EXTDISP,  KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PSCREEN, KC_DEL, KC_EQL in layer 2 aka
+RSE one gets F1-F12 mouse emulation can be used in layer 1 and 2.
+
+flashing is done by LWR+RSE+r
+
+full layout below see in keymap.c
diff --git a/keyboards/mlego/m65/keymaps/dk/config.h b/keyboards/mlego/m65/keymaps/dk/config.h
new file mode 100644
index 0000000000..637c0a8faf
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/dk/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/mlego/m65/keymaps/dk/keymap.c b/keyboards/mlego/m65/keymaps/dk/keymap.c
new file mode 100644
index 0000000000..a4cb66bb91
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/dk/keymap.c
@@ -0,0 +1,170 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "keymap_danish.h"
+
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+#endif
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QW] = LAYOUT_ortho_5x13(
+       KC_ESC, DK_1   , DK_2    , DK_3   , DK_4    , DK_5  , DK_6  , DK_7  , DK_8   , DK_9   , DK_0   , DK_PLUS, KC_BSPC ,
+       KC_TAB, DK_Q   , DK_W    , DK_E   , DK_R    , DK_T  , DK_Y  , DK_U  , DK_I   , DK_O   , DK_P   , DK_ARNG, DK_DIAE ,
+      DK_QUOT, DK_A   , DK_S    , DK_D   , DK_F    , DK_G  , DK_H  , DK_J  , DK_K   , DK_L   , DK_AE  , DK_OSTR, KC_ENT  ,
+      KC_LSPO, DK_LABK, DK_Z    , DK_X   , DK_C    , DK_V  , DK_B  , DK_N  , DK_M   , DK_COMM, DK_DOT , KC_UP  , DK_MINS ,
+      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
+
+  [_LWR] = LAYOUT_ortho_5x13(
+       DK_HALF, KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , DK_ACUT  ,
+       KC_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+       KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+       _______, KC_BTN1, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_U, _______ ,
+       _______, KC_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R),
+
+  [_RSE] = LAYOUT_ortho_5x13(
+      KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12  ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_U, _______ ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
+
+    [_ADJ] = LAYOUT_ortho_5x13(
+      RGB_MOD,RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_SW ,
+      RGB_HUI, RGB_HUD, RGB_M_P , _______, RESET  , RGB_M_T, _______, _______, _______, _______, _______, _______, RGB_M_SN ,
+      RGB_SAI, RGB_SAD, RGB_M_B , _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_K ,
+      RGB_VAI, RGB_VAD, RGB_M_R , _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_X ,
+      RGB_TOG, _______, _______ , _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_TW, RGB_M_G),
+
+};
+// clang-format on
+
+// let us assume we start with both layers off
+bool toggle_lwr = false;
+bool toggle_rse = false;
+
+bool led_update_user(led_t led_state) {
+    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
+    return false;
+}
+
+void matrix_scan_user(void) {
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        case (TT(_LWR)):
+            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
+                toggle_lwr = !layer_state_is(_LWR);
+            }
+            return true;
+            break;
+        case (TT(_RSE)):
+            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                toggle_rse = !layer_state_is(_RSE);
+            }
+            return true;
+            break;
+        default:
+            return true;
+    }
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+#endif
+    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
diff --git a/keyboards/mlego/m65/keymaps/dk/readme.md b/keyboards/mlego/m65/keymaps/dk/readme.md
new file mode 100644
index 0000000000..06fed3bda6
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/dk/readme.md
@@ -0,0 +1,13 @@
+![M65 Layout Image](https://i.imgur.com/RQqsM4gh.png)
+
+# Default M65 Layout
+
+This is the Danish keymap for M65. For the most part it's a straightforward and easy to follow layout inspired by ISO with a DK
+turn.  The only unusual key is the key in the upper left, which sends Escape normally, but Grave when in layer 1 aka LWR.  Similarly
+number row in layer 1 give the usual audio KC_GRV, KC_AUDIO_MUTE,  KC_AUDIO_VOL_UP,  KC_AUDIO_VOL_DOWN,   KC_MEDIA_PREV_TRACK,
+KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK, M_EXTDISP,  KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PSCREEN, KC_DEL, DK_ACUT in layer 2 aka
+RSE one gets F1-F12 mouse emulation can be used in layer 1 and 2.
+
+flashing is done by LWR+RSE+r
+
+full layout below see in keymap.c
diff --git a/keyboards/mlego/m65/keymaps/uk/config.h b/keyboards/mlego/m65/keymaps/uk/config.h
new file mode 100644
index 0000000000..9d446777c0
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/uk/config.h
@@ -0,0 +1,22 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
+//#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WINC
+#define UNICODE_SELECTED_MODES UC_LNX
diff --git a/keyboards/mlego/m65/keymaps/uk/keymap.c b/keyboards/mlego/m65/keymaps/uk/keymap.c
new file mode 100644
index 0000000000..528105fc73
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/uk/keymap.c
@@ -0,0 +1,251 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "keymap_uk.h"
+
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
+#ifdef CONSOLE_ENABLE
+
+#include "print.h"
+
+#endif
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+#endif
+
+const uint32_t PROGMEM unicode_map[] = {
+    [la] = 0x03B1,  // å
+    [lA] = 0x0391,  // Å
+    [lb] = 0x03B2,  // β
+    [lB] = 0x0392,  // Β
+    [lc] = 0x03C7,  //
+    [lC] = 0x0307,  //
+    [ld] = 0x03B4,   [lD] = 0x2202, [le] = 0x03B5, [lE] = 0x2107,
+    [lf]  = 0x03C6,   //
+    [lF]  = 0x03C8,   //
+    [lg]  = 0x03B3,   //
+    [lG]  = 0x0393,   //
+    [lh]  = 0x210F,   //
+    [lH]  = 0x1D4D7,  //
+    [li]  = 0x222B,   //
+    [lI]  = 0x222E,   //
+    [lj]  = 0x2208,   //
+    [lJ]  = 0x2209,   //
+    [lk]  = 0x03F0,   //
+    [lK]  = 0x2206,   //
+    [ll]  = 0x03BB,   //
+    [lL]  = 0x039B,   //
+    [lm]  = 0x03BC,   //
+    [lM]  = 0x2218,   //
+    [ln]  = 0x03B7,   //
+    [lN]  = 0x222A,   //
+    [lo]  = 0x221E,   //
+    [lO]  = 0x2297,   //
+    [lp]  = 0x03C0,   //
+    [lP]  = 0x220F,   //
+    [lq]  = 0x03C3,   //
+    [lQ]  = 0x03D5,   //
+    [lr]  = 0x03C1,   //
+    [lR]  = 0x2207,   //
+    [ls]  = 0x2211,   //
+    [lS]  = 0x2A0B,   //
+    [lt]  = 0x03D1,   //
+    [lT]  = 0x03B8,   //
+    [lu]  = 0x03C4,   //
+    [lU]  = 0x2102,   //
+    [lv]  = 0x03BD,   //
+    [lV]  = 0x039D,   //
+    [lw]  = 0x03C9,   //
+    [lW]  = 0x03A9,   //
+    [lx]  = 0x03BE,   //
+    [lX]  = 0x039E,   //
+    [ly]  = 0x211d,
+    [lY]  = 0x2124,   //
+    [lz]  = 0x03B6,   //
+    [lZ]  = 0x2221,   //
+    [lZ]  = 0x2221,   //
+    [lc1] = 0x224A,   //
+    [lC1] = 0x2248,   //
+    [lp1] = 0x00B1,   //
+    [lP1] = 0x2213,   //
+    [lq1] = 0x00D7,   //
+    [lQ1] = 0x22C5,   //
+    [ll1] = 0x1D53C,  //
+    [lL1] = 0x212b,   //
+    [lk1] = 0x221D,   //
+    [lK1] = 0x2112,   //
+    [rc]  = 0x00E7,   // ç
+    [rC]  = 0x00C7,   // Ç
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QW] = LAYOUT_ortho_5x13(
+       KC_ESC, UK_1   , UK_2    , UK_3   , UK_4    , UK_5  , UK_6  , UK_7  , UK_8   , UK_9   , UK_0   , UK_MINS, KC_BSPC ,
+       KC_TAB, UK_Q   , UK_W    , UK_E   , UK_R    , UK_T  , UK_Y  , UK_U  , UK_I   , UK_O   , UK_P   , UK_LBRC, UK_RBRC ,
+      UK_HASH, UK_A   , UK_S    , UK_D   , UK_F    , UK_G  , UK_H  , UK_J  , UK_K   , UK_L   , UK_SCLN, UK_QUOT, KC_ENT  ,
+      KC_LSPO, UK_BSLS, UK_Z    , UK_X   , UK_C    , UK_V  , UK_B  , UK_N  , UK_M   , UK_COMM, UK_DOT , KC_UP  , UK_SLSH ,
+      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
+
+  [_LWR] = LAYOUT_ortho_5x13(
+     KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , UK_EQL  ,
+     KC_BTN3, XP(lq  , lQ)    , XP(lw  , lW)    , XP(le  , lE)    , XP(lr  , lR)    , XP(lt  , lT)    , XP(ly  , lY)     , XP(lu, lU)  , XP(li, lI)   , XP(lo, lO)   , XP(lp , lP)    , _______, _______,
+     KC_BTN2, XP(la  , lA)    , XP(ls  , lS)    , XP(ld  , lD)    , XP(lf  , lF)    , XP(lg  , lG)    , XP(lh  , lH)     , XP(lj, lJ)  , XP(lk, lK)   , XP(ll, lL)   , XP(ll1, lL1)   , XP(lk1 , lK1)   , _______,
+     _______, KC_BTN1, XP(lz  , lZ)    , XP(lx  , lX)    , XP(lc  , lC)    , XP(lv  , lV)    , XP(lb  , lB)    , XP(ln   , lN)  , XP(lm, lM)  , XP(lc1, lC1) , XP(lp1, lP1)  , KC_MS_U, XP(lq1 , lQ1)   ,
+     _______, KC_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R),
+
+
+  [_RSE] = LAYOUT_ortho_5x13(
+      KC_ESC , KC_F1  , KC_F2  , KC_F3  ,  KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12  ,
+      _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      KC_CAPS, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      _______, _______, _______, _______,XP(rc,rC), _______, _______, _______, _______, _______, _______, KC_WH_U, _______ ,
+      _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
+
+  [_ADJ] = LAYOUT_ortho_5x13(
+      RGB_MOD, RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_SW,
+      RGB_HUI, RGB_HUD , RGB_M_P , _______, RESET  , RGB_M_T, _______, _______, _______, _______, _______, _______ , RGB_M_SN,
+      RGB_SAI, RGB_SAD , RGB_M_B , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_K ,
+      RGB_VAI, RGB_VAD , RGB_M_R , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_X ,
+      RGB_TOG, _______ , _______ , _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_TW, RGB_M_G),
+};
+// clang-format on
+
+// let us assume we start with both layers off
+bool toggle_lwr = false;
+bool toggle_rse = false;
+
+bool led_update_user(led_t led_state) {
+    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
+    return false;
+}
+
+void matrix_scan_user(void) {
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+#ifdef CONSOLE_ENABLE
+    uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
+#endif
+
+    switch (keycode) {
+        case (TT(_LWR)):
+            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
+                toggle_lwr = !layer_state_is(_LWR);
+            }
+            return true;
+            break;
+        case (TT(_RSE)):
+            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                toggle_rse = !layer_state_is(_RSE);
+            }
+            return true;
+            break;
+        default:
+            return true;
+    }
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+#endif
+    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+#ifdef CONSOLE_ENABLE
+
+    debug_enable   = true;
+    debug_matrix   = true;
+    debug_keyboard = true;
+#endif
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
diff --git a/keyboards/mlego/m65/keymaps/uk/readme.md b/keyboards/mlego/m65/keymaps/uk/readme.md
new file mode 100644
index 0000000000..bc29d23905
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/uk/readme.md
@@ -0,0 +1,13 @@
+# Default M65 Layout
+
+![M65 Layout Image](https://i.imgur.com/KZFnAU5h.png)
+
+This is the default layout for M65. For the most part it's a straightforward and easy to follow layout inspired by ISO with a UK
+turn.  The only unusual key is the key in the upper left, which sends Escape normally, but Grave when in layer 1 aka LWR.  Similarly
+number row in layer 1 give the usual audio KC_GRV, KC_AUDIO_MUTE,  KC_AUDIO_VOL_UP,  KC_AUDIO_VOL_DOWN,   KC_MEDIA_PREV_TRACK,
+KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK, M_EXTDISP,  KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PSCREEN, KC_DEL, KC_EQL in layer 2 aka
+RSE one gets F1-F12 mouse emulation can be used in layer 1 and 2.
+
+flashing is done by LWR+RSE+r
+
+full layout below see in keymap.c
diff --git a/keyboards/mlego/m65/keymaps/uk/rules.mk b/keyboards/mlego/m65/keymaps/uk/rules.mk
new file mode 100644
index 0000000000..502b2def76
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/uk/rules.mk
@@ -0,0 +1 @@
+UNICODEMAP_ENABLE = yes
diff --git a/keyboards/mlego/m65/keymaps/via/config.h b/keyboards/mlego/m65/keymaps/via/config.h
new file mode 100644
index 0000000000..637c0a8faf
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/mlego/m65/keymaps/via/keymap.c b/keyboards/mlego/m65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f6bb77bcd4
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/via/keymap.c
@@ -0,0 +1,168 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+#endif
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QW] = LAYOUT_ortho_5x13(
+       KC_ESC, KC_1   , KC_2    , KC_3   , KC_4    , KC_5  , KC_6  , KC_7  , KC_8   , KC_9   , KC_0   , KC_MINS, KC_BSPC ,
+       KC_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_NUHS, 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_LSPO, KC_NUBS, KC_Z    , KC_X   , KC_C    , KC_V  , KC_B  , KC_N  , KC_M   , KC_COMM, KC_DOT , KC_UP  , KC_SLSH ,
+      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
+
+  [_LWR] = LAYOUT_ortho_5x13(
+       KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , KC_EQL  ,
+       KC_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+       KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+       _______, KC_BTN1, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_U, _______ ,
+       _______, KC_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R),
+
+  [_RSE] = LAYOUT_ortho_5x13(
+      KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12  ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_U, _______ ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
+
+  [_ADJ] = LAYOUT_ortho_5x13(
+      _______, _______, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      _______, _______, _______ , _______, RESET  , _______, _______, _______, _______, _______, _______, _______, _______ ,
+      _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+      _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+// clang-format on
+
+// let us assume we start with both layers off
+bool toggle_lwr = false;
+bool toggle_rse = false;
+
+bool led_update_user(led_t led_state) {
+    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
+    return false;
+}
+
+void matrix_scan_user(void) {
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        case (TT(_LWR)):
+            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
+                toggle_lwr = !layer_state_is(_LWR);
+            }
+            return true;
+            break;
+        case (TT(_RSE)):
+            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                toggle_rse = !layer_state_is(_RSE);
+            }
+            return true;
+            break;
+        default:
+            return true;
+    }
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+#endif
+    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
diff --git a/keyboards/mlego/m65/keymaps/via/rules.mk b/keyboards/mlego/m65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mlego/m65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mlego/m65/m65.c b/keyboards/mlego/m65/m65.c
new file mode 100644
index 0000000000..153359f337
--- /dev/null
+++ b/keyboards/mlego/m65/m65.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "m65.h"
diff --git a/keyboards/mlego/m65/m65.h b/keyboards/mlego/m65/m65.h
new file mode 100644
index 0000000000..a93a80be74
--- /dev/null
+++ b/keyboards/mlego/m65/m65.h
@@ -0,0 +1,124 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT_ortho_5x13( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
+    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 }, \
+    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412 }  \
+}
+
+enum unicode_names {
+    la = 0,
+    lA,
+    lb,
+    lB,
+    lc,
+    lC,
+    ld,
+    lD,
+    le,
+    lE,
+    lf,
+    lF,
+    lg,
+    lG,
+    lh,
+    lH,
+    li,
+    lI,
+    lj,
+    lJ,
+    lk,
+    lK,
+    ll,
+    lL,
+    lm,
+    lM,
+    ln,
+    lN,
+    lo,
+    lO,
+    lp,
+    lP,
+    lq,
+    lQ,
+    lr,
+    lR,
+    ls,
+    lS,
+    lt,
+    lT,
+    lu,
+    lU,
+    lv,
+    lV,
+    lw,
+    lW,
+    lx,
+    lX,
+    ly,
+    lY,
+    lz,
+    lZ,
+    lc1,
+    lC1,
+    lp1,
+    lP1,
+    lq1,
+    lQ1,
+    ll1,
+    lL1,
+    lk1,
+    lK1,
+    rc,
+    rC,
+};
+
+static inline void led_lwr(const bool on) {
+#ifdef LED_NUM_LOCK_PIN
+    writePin(LED_NUM_LOCK_PIN, on);
+#endif
+}
+
+static inline void led_rse(const bool on) {
+#ifdef LED_SCROLL_LOCK_PIN
+    writePin(LED_SCROLL_LOCK_PIN, on);
+#endif
+}
+static inline void led_caps(const bool on) {
+#ifdef LED_CAPS_LOCK_PIN
+    if ((DEVICE_VER == 0x0001) || (DEVICE_VER == 0x0003)) {
+        writePin(LED_CAPS_LOCK_PIN, !on);
+    }
+    if (DEVICE_VER == 0x0002) {
+        writePin(LED_CAPS_LOCK_PIN, on);
+    }
+#endif
+}
+
diff --git a/keyboards/mlego/m65/readme.md b/keyboards/mlego/m65/readme.md
new file mode 100644
index 0000000000..2526aed31e
--- /dev/null
+++ b/keyboards/mlego/m65/readme.md
@@ -0,0 +1,129 @@
+# M65
+
+![M65](https://i.imgur.com/gXuecush.jpg)
+
+A  (13x5) ortholinear keyboard that can be hand wired or using a pcb.
+
+* Keyboard Maintainer: [Alin Elena](https://github.com/alinelena) ([@drFaustroll on GitLab](https://gitlab.com/drFaustroll))
+* Hardware Supported: custom pcb [see](https://gitlab.com/m-lego/m65) STM/APM32F103C8T6, aka Black Pill (rev1),
+  GD32F303CCT6 from we act aka Blue Pill Plus (rev2), STM32F401 from we act (rev3)
+* Hardware Availability: [custom how to](https://alin.elena.space/blog/keeblego/)
+
+
+Make example for this keyboard (after setting up your build environment):
+
+For rev1
+
+    make mlego/m65/rev1:default
+
+Flashing example for this keyboard:
+
+    make mlego/m65/rev1:default:flash
+
+To enter flashing mode, press Lower+Raise+R.
+
+For rev2
+
+    make mlego/m65/rev2:default
+
+Flashing example for this keyboard:
+
+    make mlego/m65/rev2:default:flash
+
+To enter flashing mode, on microcontroller keep pressed KEY and then NRST, release NRST and then after 1s release KEY.
+
+For rev3
+
+    make mlego/m65/rev3:default
+
+Flashing example for this keyboard:
+
+    make mlego/m65/rev3:default:flash
+
+To enter flashing mode, on microcontroller keep pressed BOOT0 and then NRST, release NRST and then after 0.5s or so  release BOOT0.
+
+
+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).
+
+## Pins and leds rev1 STM/APM32F103C8T6
+
+similar pinout for STM32F303
+
+| Rows  | C0    | C1    | C2    | C3    | C4    | C5    | C6    | C7    | C8    | C9    | C10   | C11   | C12   | Pins  |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| R0    | Esc   | 1     | 2     | 3     | 4     | 5     | 6     | 7     | 8     | 9     | 0     | -     | Bksp  | B11   |
+| R1    | Tab   | q     | w     | e     | r     | t     | y     | u     | i     | o     | p     | [     | ]     | B0    |
+| R2    | #     | a     | s     | d     | f     | g     | h     | j     | k     | l     | ;     | '     | Enter | B1    |
+| R3    | Shift | \     | z     | x     | c     | v     | b     | n     | m     | ,     | .     | Up    | /     | A2    |
+| R4    | Ctrl  | Menu  | Lower | Alt   | Raise | Space | Space | Space | AltGr | Shift | Left  | Down  | Right | A3    |
+|       | A10   | A15   | B3    | B4    | B5    | B9    | B8    | B7    | B6    | C15   | A0    | A7    | B10   |       |
+
+### Encoders
+
+  - Pad_A: A8
+  - Pad_B: A9
+
+### Leds
+
+| Leds        | Pin |
+| ----------- | --- |
+| NUM_LOCK    | B12 |
+| CAPS_LOCK   | C13 |
+| SCROLL_LOCK | B13 |
+| RBG_DI      | B15 |
+
+## Pins and leds rev2 GD32F303CCT6
+
+
+| Rows  | C0    | C1    | C2    | C3    | C4    | C5    | C6    | C7    | C8    | C9    | C10   | C11   | C12   | Pins  |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| R0    | Esc   | 1     | 2     | 3     | 4     | 5     | 6     | 7     | 8     | 9     | 0     | -     | Bksp  | B11   |
+| R1    | Tab   | q     | w     | e     | r     | t     | y     | u     | i     | o     | p     | [     | ]     | B0    |
+| R2    | #     | a     | s     | d     | f     | g     | h     | j     | k     | l     | ;     | '     | Enter | B1    |
+| R3    | Shift | \     | z     | x     | c     | v     | b     | n     | m     | ,     | .     | Up    | /     | A2    |
+| R4    | Ctrl  | Menu  | Lower | Alt   | Raise | Space | Space | Space | AltGr | Shift | Left  | Down  | Right | A3    |
+|       | A10   | A15   | B3    | B4    | B5    | B9    | B8    | B7    | B6    | C15   | A0    | A7    | B10   |       |
+
+
+### Encoders
+
+  - Pad_A: A8
+  - Pad_B: A9
+
+### Leds
+
+| Leds        | Pin |
+| ----------- | --- |
+| NUM_LOCK    | B12 |
+| CAPS_LOCK   | B2  |
+| SCROLL_LOCK | B13 |
+| RBG_DI      | B15 |
+
+
+## Pins and leds rev3 stm32f401
+
+the pinout is the same for stm32f411
+
+| Rows  | C0    | C1    | C2    | C3    | C4    | C5    | C6    | C7    | C8    | C9    | C10   | C11   | C12   | Pins  |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| R0    | Esc   | 1     | 2     | 3     | 4     | 5     | 6     | 7     | 8     | 9     | 0     | -     | Bksp  | B10   |
+| R1    | Tab   | q     | w     | e     | r     | t     | y     | u     | i     | o     | p     | [     | ]     | A5    |
+| R2    | #     | a     | s     | d     | f     | g     | h     | j     | k     | l     | ;     | '     | Enter | A6    |
+| R3    | Shift | \     | z     | x     | c     | v     | b     | n     | m     | ,     | .     | Up    | /     | A7    |
+| R4    | Ctrl  | Menu  | Lower | Alt   | Raise | Space | Space | Space | AltGr | Shift | Left  | Down  | Right | B0    |
+|       | A10   | A15   | B3    | B4    | B5    | B9    | B8    | B7    | A1    | A2    | A3    | A4    | B1    |       |
+
+### Encoders
+
+  - Pad_A: A0
+  - Pad_B: B6
+
+### LEDS
+
+| Leds        | Pin |
+| ----------- | --- |
+| NUM_LOCK    | B12 |
+| CAPS_LOCK   | C13 |
+| SCROLL_LOCK | B13 |
+| RBG_DI      | B15 |
+
diff --git a/keyboards/mlego/m65/rev1/chconf.h b/keyboards/mlego/m65/rev1/chconf.h
new file mode 100644
index 0000000000..3ca88e0d2a
--- /dev/null
+++ b/keyboards/mlego/m65/rev1/chconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2021-2022 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/m65/rev1/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_TIMEDELTA 0
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h
new file mode 100644
index 0000000000..e0a703c978
--- /dev/null
+++ b/keyboards/mlego/m65/rev1/config.h
@@ -0,0 +1,59 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define DEVICE_VER 0x0001
+#define PRODUCT_ID 0x6060
+
+#define LED_NUM_LOCK_PIN B12
+#define LED_SCROLL_LOCK_PIN B13
+#define LED_CAPS_LOCK_PIN C13
+
+//                          0   1   2    3   4
+#define MATRIX_ROW_PINS \
+    { B11, B0, B1, A2, A3 }
+//                         0    1   2   3   4   5   6   7   8    9  10  11   12
+#define MATRIX_COL_PINS \
+    { A10, A15, B3, B4, B5, B9, B8, B7, B6, C15, A0, A7, B10 }
+
+#define ENCODERS_PAD_A \
+    { A8 }
+#define ENCODERS_PAD_B \
+    { A9 }
+
+#define RGB_DI_PIN B15
+
+#define UNUSED_PINS
+#define RGBLIGHT_LAYERS
+
+#define ENCODER_RESOLUTION 4
+
+#undef RGBLED_NUM
+#define RGBLED_NUM 20
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mlego/m65/rev1/mcuconf.h b/keyboards/mlego/m65/rev1/mcuconf.h
new file mode 100644
index 0000000000..6ba4f72b40
--- /dev/null
+++ b/keyboards/mlego/m65/rev1/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2021-2022 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/m65/rev1/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 FALSE
diff --git a/keyboards/mlego/m65/rev1/rules.mk b/keyboards/mlego/m65/rev1/rules.mk
new file mode 100644
index 0000000000..5e456c2606
--- /dev/null
+++ b/keyboards/mlego/m65/rev1/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = STM32F103
+
+# Bootloader selection
+BOOTLOADER = stm32duino
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes          # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
+ENCODER_ENABLE = yes       # Enable encoder
diff --git a/keyboards/mlego/m65/rev2/board.h b/keyboards/mlego/m65/rev2/board.h
new file mode 100644
index 0000000000..e0d0865776
--- /dev/null
+++ b/keyboards/mlego/m65/rev2/board.h
@@ -0,0 +1,20 @@
+/* Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+#include_next <board.h>
+#undef STM32F103xB
+#define STM32F103xE
diff --git a/keyboards/mlego/m65/rev2/chconf.h b/keyboards/mlego/m65/rev2/chconf.h
new file mode 100644
index 0000000000..3ca88e0d2a
--- /dev/null
+++ b/keyboards/mlego/m65/rev2/chconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2021-2022 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/m65/rev1/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_TIMEDELTA 0
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h
new file mode 100644
index 0000000000..a548b01827
--- /dev/null
+++ b/keyboards/mlego/m65/rev2/config.h
@@ -0,0 +1,70 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define DEVICE_VER 0x0002
+#define PRODUCT_ID 0x6060
+
+#define LED_NUM_LOCK_PIN B12
+#define LED_SCROLL_LOCK_PIN B13
+#define LED_CAPS_LOCK_PIN B2
+
+//                          0   1   2    3   4
+#define MATRIX_ROW_PINS \
+    { B11, B0, B1, A2, A3 }
+//                         0    1   2   3   4   5   6   7   8    9  10  11   12
+#define MATRIX_COL_PINS \
+    { A10, A15, B3, B4, B5, B9, B8, B7, B6, C15, A0, A7, B10 }
+
+#define ENCODERS_PAD_A \
+    { A8 }
+#define ENCODERS_PAD_B \
+    { A9 }
+
+#define RGB_DI_PIN B15
+
+#define UNUSED_PINS
+#define RGBLIGHT_LAYERS
+
+#define ENCODER_RESOLUTION 4
+
+#undef RGBLED_NUM
+#define RGBLED_NUM 20
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+
+#define EEPROM_PAGE_SIZE
+#define FEE_PAGE_SIZE 0x800
+#define FEE_PAGE_COUNT 4
+
+#define FEE_MCU_FLASH_SIZE_IGNORE_CHECK
+#define FEE_MCU_FLASH_SIZE                                \
+    ({                                                    \
+        uint16_t flash_size = *(uint16_t*)FLASHSIZE_BASE; \
+        (flash_size <= 512) ? flash_size : 512;           \
+    })
diff --git a/keyboards/mlego/m65/rev2/mcuconf.h b/keyboards/mlego/m65/rev2/mcuconf.h
new file mode 100644
index 0000000000..6ba4f72b40
--- /dev/null
+++ b/keyboards/mlego/m65/rev2/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2021-2022 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/m65/rev1/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 FALSE
diff --git a/keyboards/mlego/m65/rev2/rules.mk b/keyboards/mlego/m65/rev2/rules.mk
new file mode 100644
index 0000000000..1b7c586b71
--- /dev/null
+++ b/keyboards/mlego/m65/rev2/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = STM32F103  #GD32F303CCT6 weact
+
+# Bootloader selection
+BOOTLOADER = stm32duino
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover 
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable encoder
diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h
new file mode 100644
index 0000000000..97992ee844
--- /dev/null
+++ b/keyboards/mlego/m65/rev3/config.h
@@ -0,0 +1,59 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define DEVICE_VER 0x0003
+#define PRODUCT_ID 0x6060
+
+#define LED_NUM_LOCK_PIN B12
+#define LED_SCROLL_LOCK_PIN B13
+#define LED_CAPS_LOCK_PIN C13
+
+//                          0   1   2   3   4
+#define MATRIX_ROW_PINS \
+    { B10, A5, A6, A7, B0 }
+//                         0    1   2   3   4   5   6   7   8    9  10  11   12
+#define MATRIX_COL_PINS \
+    { A10, A15, B3, B4, B5, B9, B8, B7, A1, A2, A3, A4, B1 }
+
+#define ENCODERS_PAD_A \
+    { A0 }
+#define ENCODERS_PAD_B \
+    { B6 }
+
+#define RGB_DI_PIN B15
+
+#define UNUSED_PINS
+#define RGBLIGHT_LAYERS
+
+#define ENCODER_RESOLUTION 4
+
+#undef RGBLED_NUM
+#define RGBLED_NUM 20
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
diff --git a/keyboards/mlego/m65/rev3/halconf.h b/keyboards/mlego/m65/rev3/halconf.h
new file mode 100644
index 0000000000..89815e23b7
--- /dev/null
+++ b/keyboards/mlego/m65/rev3/halconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SERIAL TRUE
+
+#define SERIAL_USB_BUFFERS_SIZE 256
+
+#include_next <halconf.h>
diff --git a/keyboards/mlego/m65/rev3/mcuconf.h b/keyboards/mlego/m65/rev3/mcuconf.h
new file mode 100644
index 0000000000..4d90ec07ea
--- /dev/null
+++ b/keyboards/mlego/m65/rev3/mcuconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/mlego/m65/rev3/rules.mk b/keyboards/mlego/m65/rev3/rules.mk
new file mode 100644
index 0000000000..25df19c15f
--- /dev/null
+++ b/keyboards/mlego/m65/rev3/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes          # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
+ENCODER_ENABLE = yes       # Enable encoder

From 4c298a9dd5f93cd6e26238e16c0a3ea46fe593e7 Mon Sep 17 00:00:00 2001
From: Ibnu Daru Aji <ibnuda@users.noreply.github.com>
Date: Tue, 11 Jan 2022 10:20:01 +0700
Subject: [PATCH 250/867] [Keyboard] Add Alicia Cook keyboard (#11722)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: robby-hartana <robby@alumagubi.com>
---
 keyboards/alicia_cook/alicia_cook.c           |  17 ++
 keyboards/alicia_cook/alicia_cook.h           |  41 +++
 keyboards/alicia_cook/config.h                |  48 ++++
 keyboards/alicia_cook/info.json               |  62 +++++
 .../alicia_cook/keymaps/default/keymap.c      |  55 ++++
 .../alicia_cook/keymaps/default/readme.md     |   1 +
 keyboards/alicia_cook/keymaps/rick/config.h   |  23 ++
 keyboards/alicia_cook/keymaps/rick/keymap.c   | 246 ++++++++++++++++++
 keyboards/alicia_cook/keymaps/rick/readme.md  |   1 +
 keyboards/alicia_cook/keymaps/rick/rules.mk   |   2 +
 keyboards/alicia_cook/readme.md               |  26 ++
 keyboards/alicia_cook/rules.mk                |  18 ++
 12 files changed, 540 insertions(+)
 create mode 100644 keyboards/alicia_cook/alicia_cook.c
 create mode 100644 keyboards/alicia_cook/alicia_cook.h
 create mode 100644 keyboards/alicia_cook/config.h
 create mode 100644 keyboards/alicia_cook/info.json
 create mode 100644 keyboards/alicia_cook/keymaps/default/keymap.c
 create mode 100644 keyboards/alicia_cook/keymaps/default/readme.md
 create mode 100644 keyboards/alicia_cook/keymaps/rick/config.h
 create mode 100644 keyboards/alicia_cook/keymaps/rick/keymap.c
 create mode 100644 keyboards/alicia_cook/keymaps/rick/readme.md
 create mode 100644 keyboards/alicia_cook/keymaps/rick/rules.mk
 create mode 100644 keyboards/alicia_cook/readme.md
 create mode 100644 keyboards/alicia_cook/rules.mk

diff --git a/keyboards/alicia_cook/alicia_cook.c b/keyboards/alicia_cook/alicia_cook.c
new file mode 100644
index 0000000000..39f17e4a7d
--- /dev/null
+++ b/keyboards/alicia_cook/alicia_cook.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Ibnu D. Aji
+ *
+ * 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 "alicia_cook.h"
diff --git a/keyboards/alicia_cook/alicia_cook.h b/keyboards/alicia_cook/alicia_cook.h
new file mode 100644
index 0000000000..35c803b3ae
--- /dev/null
+++ b/keyboards/alicia_cook/alicia_cook.h
@@ -0,0 +1,41 @@
+/* Copyright 2021 Ibnu D. Aji
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05,    k06, k07, k08, k09, k0a, k0b, k0c, \
+    k10, k11, k12, k13, k14, k15,    k16, k17, k18, k19, k1a, k1b,      \
+    k20, k21, k22, k23, k24, k25,    k26, k27, k28, k29, k2a, k2b, k2c, \
+    k30, k31,      k33, k34, k35,    k36, k37, k38,           k3b, k3c  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c }, \
+    { k30, k31, XXX, k33, k34, k35, k36, k37, k38, XXX, XXX, k3b, k3c }  \
+}
diff --git a/keyboards/alicia_cook/config.h b/keyboards/alicia_cook/config.h
new file mode 100644
index 0000000000..28db5f3420
--- /dev/null
+++ b/keyboards/alicia_cook/config.h
@@ -0,0 +1,48 @@
+/*
+Copyright 2021 Ibnu D. Aji
+
+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   0x6955
+#define DEVICE_VER   0x0899
+#define MANUFACTURER Ibnu D. Aji
+#define PRODUCT      Alicia Cook
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+/*
+ * 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 { D2, D3, F4, F5 }
+#define MATRIX_COL_PINS { B5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/alicia_cook/info.json b/keyboards/alicia_cook/info.json
new file mode 100644
index 0000000000..c07be77190
--- /dev/null
+++ b/keyboards/alicia_cook/info.json
@@ -0,0 +1,62 @@
+{
+  "keyboard_name": "Alicia Cook",
+  "url": "https://github.com/ibnuda/alicia-cook",
+  "maintainer": "ibnuda",
+  "layouts": {
+      "LAYOUT_all": {
+          "layout": [
+            {"x":0,"y":0},
+            {"x":1,"y":0},
+            {"x":2,"y":0},
+            {"x":3,"y":0},
+            {"x":4,"y":0},
+            {"x":5,"y":0},
+            {"x":7,"y":0},
+            {"x":8,"y":0},
+            {"x":9,"y":0},
+            {"x":10,"y":0},
+            {"x":11,"y":0},
+            {"x":12,"y":0},
+            {"x":13,"y":0},
+
+            {"x":0,"y":1,"w":1.25},
+            {"x":1.25,"y":1},
+            {"x":2.25,"y":1},
+            {"x":3.25,"y":1},
+            {"x":4.25,"y":1},
+            {"x":5.25,"y":1},
+            {"x":7.25,"y":1},
+            {"x":8.25,"y":1},
+            {"x":9.25,"y":1},
+            {"x":10.25,"y":1},
+            {"x":11.25,"y":1},
+            {"x":12.25,"y":1,"w":1.75},
+
+            {"x":0,"y":2,"w":1.75},
+            {"x":1.75,"y":2},
+            {"x":2.75,"y":2},
+            {"x":3.75,"y":2},
+            {"x":4.75,"y":2},
+            {"x":5.75,"y":2},
+            {"x":6.75,"y":2},
+            {"x":7.75,"y":2},
+            {"x":8.75,"y":2},
+            {"x":9.75,"y":2},
+            {"x":10.75,"y":2},
+            {"x":11.75,"y":2},
+            {"x":12.75,"y":2,"w":1.25},
+
+            {"x":0,"y":3,"w":1.25},
+            {"x":1.25,"y":3,"w":1.25},
+            {"x":3.5,"y":3,"w":1.25},
+            {"x":4.75,"y":3},
+            {"x":5.75,"y":3},
+            {"x":6.75,"y":3,"w":1.25},
+            {"x":8,"y":3},
+            {"x":9,"y":3,"w":1.25},
+            {"x":11.5,"y":3,"w":1.25},
+            {"x":12.75,"y":3,"w":1.25}
+          ]
+      }
+  }
+}
diff --git a/keyboards/alicia_cook/keymaps/default/keymap.c b/keyboards/alicia_cook/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c28967f381
--- /dev/null
+++ b/keyboards/alicia_cook/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+/*
+Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#define LW_BSPC LT(2, KC_BSPC)
+#define RS_SPC  LT(1, KC_SPC)
+
+#define ALT_ENT ALT_T(KC_ENT)
+#define SFT_ESC SFT_T(KC_ESC)
+
+// home row mods.
+#define CT_S    RCTL_T(KC_S)
+#define CT_L    RCTL_T(KC_L)
+#define SH_A    RSFT_T(KC_A)
+#define SH_SCLN RSFT_T(KC_SCLN)
+#define AL_D    RALT_T(KC_D)
+#define AL_K    RALT_T(KC_K)
+#define GU_G    RGUI_T(KC_G)
+#define GU_H    RGUI_T(KC_H)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,            KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_DEL, KC_BSPC,
+        KC_LCTL,SH_A,   CT_S,   AL_D,   KC_F,   KC_G,            KC_H,   KC_J,   KC_K,   KC_L,   KC_QUOT,     KC_SCLN,
+        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,            KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(1),
+        KC_LGUI,KC_LALT,        KC_LGUI,LW_BSPC,SFT_ESC,         ALT_ENT,RS_SPC, KC_LALT,                KC_RGUI,KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,            KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_DEL, KC_BSPC,
+        KC_LCTL,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,         KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,   KC_SCLN,
+        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,            KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(2),
+        KC_LGUI,KC_LALT,        KC_LGUI,LW_BSPC,SFT_ESC,         ALT_ENT,RS_SPC, KC_LALT,                KC_RGUI,KC_RCTL
+    ),
+    [2] = LAYOUT_all(
+        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_F13,
+        KC_LCTL,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,         KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,   KC_SCLN,
+        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   RESET,           KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(1),
+        KC_LGUI,KC_LALT,        KC_LGUI,LW_BSPC,SFT_ESC,         ALT_ENT,RS_SPC, KC_LALT,                KC_RGUI,KC_RCTL
+    ),
+};
diff --git a/keyboards/alicia_cook/keymaps/default/readme.md b/keyboards/alicia_cook/keymaps/default/readme.md
new file mode 100644
index 0000000000..18f516f6fb
--- /dev/null
+++ b/keyboards/alicia_cook/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for alicia_cook
diff --git a/keyboards/alicia_cook/keymaps/rick/config.h b/keyboards/alicia_cook/keymaps/rick/config.h
new file mode 100644
index 0000000000..fc9cdfe786
--- /dev/null
+++ b/keyboards/alicia_cook/keymaps/rick/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2021 Ibnu D. Aji
+ *
+ * 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 COMBO_TERM  50
+#define COMBO_COUNT 50
+#define IGNORE_MOD_TAP_INTERRUPT
+#define PERMISSIVE_HOLD
+#define TAPPING_TERM 175
+#define TAPPING_TERM 175
diff --git a/keyboards/alicia_cook/keymaps/rick/keymap.c b/keyboards/alicia_cook/keymaps/rick/keymap.c
new file mode 100644
index 0000000000..35e0e1db97
--- /dev/null
+++ b/keyboards/alicia_cook/keymaps/rick/keymap.c
@@ -0,0 +1,246 @@
+/* Copyright 2021 Ibnu D. Aji
+ *
+ * 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
+#ifdef CONSOLE_ENABLE
+#include "print.h"
+#endif
+
+// enum for combos.
+enum combos {
+    // left hand combinations.
+    L_U_PINKY_RING,
+    L_U_RING_MIDDLE,
+    L_U_RING_INDEX,
+    L_U_MIDDLE_INDEX,
+    L_U_MIDDLE_INNER_INDEX,
+    L_U_INDEX_INNER_INDEX,
+    L_L_PINKY_RING,
+    L_L_RING_MIDDLE,
+    L_L_RING_INDEX,
+    L_L_MIDDLE_INDEX,
+    L_L_INDEX_INNER_INDEX,
+
+    L_U_RING_MIDDLE_INDEX,
+    L_L_RING_MIDDLE_INDEX,
+
+    // right hand combinations.
+    R_U_PINKY_RING,
+    R_U_RING_MIDDLE,
+    R_U_RING_INDEX,
+    R_U_MIDDLE_INDEX,
+    R_U_MIDDLE_INNER_INDEX,
+    R_U_INNER_INNER_INDEX,
+    R_L_PINKY_RING,
+    R_L_RING_MIDDLE,
+    R_L_MIDDLE_INDEX,
+    R_L_RING_INDEX,
+    R_L_INDEX_INNER_INDEX,
+
+    R_U_RING_MIDDLE_INDEX,
+    R_L_RING_MIDDLE_INDEX,
+
+    // both hands combinations.
+    B_L_MIDDLE_MIDDLE,
+};
+
+enum {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+enum custom_keycodes {
+  BASE = SAFE_RANGE,
+  LOWER,
+  RAISE,
+  ADJUST,
+};
+
+// keycode abstraction
+#define LUP  KC_Q
+#define LUR  KC_V
+#define LUM  KC_C
+#define LUI  KC_P
+#define LUII KC_B
+#define LMP  KC_R
+#define LMR  KC_S
+#define LMM  KC_T
+#define LMI  KC_H
+#define LMII KC_D
+#define LLP  KC_QUOT
+#define LLR  KC_J
+#define LLM  KC_G
+#define LLI  KC_K
+#define LLII KC_X
+
+#define RUP  KC_Z
+#define RUR  KC_Y
+#define RUM  KC_U
+#define RUI  KC_L
+#define RUII KC_DOT
+#define RMP  KC_O
+#define RMR  KC_I
+#define RMM  KC_A
+#define RMI  KC_N
+#define RMII KC_F
+#define RLP  KC_SLSH
+#define RLR  KC_COMM
+#define RLM  KC_W
+#define RLI  KC_M
+#define RLII KC_SCLN
+
+// thumb keys.
+#define TRAISE   TG(_RAISE)
+#define AL_ENT   ALT_T(KC_ENT)
+#define SF_BSPC  SFT_T(KC_BSPC)
+#define CT_ESC   CTL_T(KC_ESC)
+
+// home row mods.
+#define CTLR    LCTL_T(LMR)
+#define CTRR    RCTL_T(RMR)
+#define CT_LEFT LCTL_T(KC_LEFT)
+#define CT_SIX  RCTL_T(KC_6)
+
+#define SHLP    LSFT_T(LMP)
+#define SHRP    RSFT_T(RMP)
+#define SH_HASH LSFT_T(KC_HASH)
+#define SH_ZERO RSFT_T(KC_0)
+
+#define ALLM    LALT_T(LMM)
+#define ALRM    RALT_T(RMM)
+#define AL_DOWN LALT_T(KC_DOWN)
+#define AL_FIVE RALT_T(KC_5)
+
+#define GULII   RGUI_T(LMII)
+#define GURII   LGUI_T(RMII)
+#define GU_DLR  RGUI_T(KC_DLR)
+#define GU_EQL  LGUI_T(KC_EQL)
+
+// layer toggle.
+#define LW_E     LT(_LOWER, KC_E)
+#define RS_SPC   LT(_RAISE, KC_SPC)
+#define LW_RMI   LT(_LOWER, RMI)
+#define RS_LMI   LT(_RAISE, LMI)
+
+// idk, man. not used, i guess.
+#define ADDDD    MO(_ADJUST)
+
+// common shortcuts for windows and linux that i use.
+#define NXTTAB LCTL(KC_PGDN)
+#define PRVTAB LCTL(KC_PGUP)
+#define UPTAB  LCTL(LSFT(KC_PGUP))
+#define DNTAB  LCTL(LSFT(KC_PGDN))
+#define NXTWIN LALT(KC_TAB)
+#define PRVWIN LALT(LSFT(KC_TAB))
+#define CALDL  LCTL(LALT(KC_DELT))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+#define EXPLR  LGUI(KC_E)
+#define LCKGUI LGUI(KC_L)
+#define CONPST LSFT(KC_INS)
+#define CLSGUI LALT(KC_F4)
+
+// left hand combinations.
+const uint16_t PROGMEM lu_p_r_combo[]     = {LUP, LUR,  COMBO_END};
+const uint16_t PROGMEM lu_r_m_combo[]     = {LUR, LUM,  COMBO_END};
+const uint16_t PROGMEM lu_r_i_combo[]     = {LUR, LUI,  COMBO_END};
+const uint16_t PROGMEM lu_m_i_combo[]     = {LUM, LUI,  COMBO_END};
+const uint16_t PROGMEM lu_m_ii_combo[]    = {LUM, LUII, COMBO_END};
+const uint16_t PROGMEM lu_i_ii_combo[]    = {LUI, LUII, COMBO_END};
+const uint16_t PROGMEM ll_p_r_combo[]     = {LLP, LLR,  COMBO_END};
+const uint16_t PROGMEM ll_r_m_combo[]     = {LLR, LLM,  COMBO_END};
+const uint16_t PROGMEM ll_r_i_combo[]     = {LLR, LLI,  COMBO_END};
+const uint16_t PROGMEM ll_m_i_combo[]     = {LLM, LLI,  COMBO_END};
+const uint16_t PROGMEM ll_i_ii_combo[]    = {LLI, LLII, COMBO_END};
+
+const uint16_t PROGMEM lu_r_m_i_combo[]   = {LUR, LUM, LUI, COMBO_END};
+const uint16_t PROGMEM ll_r_m_i_combo[]   = {LLR, LLM, LLI, COMBO_END};
+
+// right hand combinations.
+const uint16_t PROGMEM ru_p_r_combo[]      = {RUP, RUR,  COMBO_END};
+const uint16_t PROGMEM ru_r_m_combo[]      = {RUR, RUM,  COMBO_END};
+const uint16_t PROGMEM ru_r_i_combo[]      = {RUR, RUI,  COMBO_END};
+const uint16_t PROGMEM ru_m_i_combo[]      = {RUM, RUI,  COMBO_END};
+const uint16_t PROGMEM ru_m_ii_combo[]     = {RUM, RUII, COMBO_END};
+const uint16_t PROGMEM ru_i_ii_combo[]     = {RUI, RUII, COMBO_END};
+const uint16_t PROGMEM rl_p_r_combo[]      = {RLP, RLR,  COMBO_END};
+const uint16_t PROGMEM rl_r_m_combo[]      = {RLR, RLM,  COMBO_END};
+const uint16_t PROGMEM rl_r_i_combo[]      = {RLR, RLI,  COMBO_END};
+const uint16_t PROGMEM rl_m_i_combo[]      = {RLM, RLI,  COMBO_END};
+const uint16_t PROGMEM rl_i_ii_combo[]     = {RLI, RLII, COMBO_END};
+
+const uint16_t PROGMEM ru_r_m_i_combo[]   =  {RUR, RUM, RUI, COMBO_END};
+const uint16_t PROGMEM rl_r_m_i_combo[]   =  {RLR, RLM, RLI, COMBO_END};
+
+// both hand combinations.
+const uint16_t PROGMEM bl_m_m_combo[]      = {LLM, RLM, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+    // left hand combinations.
+    [L_U_PINKY_RING]          = COMBO(lu_p_r_combo,  KC_TAB),
+    [L_U_RING_MIDDLE]         = COMBO(lu_r_m_combo,  KC_QUES),
+    [L_U_RING_INDEX]          = COMBO(lu_r_i_combo,  PRVTAB),
+    [L_U_MIDDLE_INDEX]        = COMBO(lu_m_i_combo,  KC_UNDS),
+    [L_U_MIDDLE_INNER_INDEX]  = COMBO(lu_m_ii_combo, KC_ENT),
+    [L_U_INDEX_INNER_INDEX]   = COMBO(lu_i_ii_combo, KC_PIPE),
+    [L_L_PINKY_RING]          = COMBO(ll_p_r_combo,  KC_ENT),
+    [L_L_RING_MIDDLE]         = COMBO(ll_r_m_combo,  LCTL(KC_W)),
+    [L_L_RING_INDEX]          = COMBO(ll_r_i_combo,  KC_TAB),
+    [L_L_MIDDLE_INDEX]        = COMBO(ll_m_i_combo,  KC_DELT),
+    [L_L_INDEX_INNER_INDEX]   = COMBO(ll_i_ii_combo, KC_TILD),
+
+    [L_U_RING_MIDDLE_INDEX]   = COMBO(lu_r_m_i_combo, KC_PIPE),
+    [L_L_RING_MIDDLE_INDEX]   = COMBO(ll_r_m_i_combo, KC_TILD),
+
+    // right hand combinations.
+    [R_U_PINKY_RING]          = COMBO(ru_p_r_combo,  KC_BSPC),
+    [R_U_RING_MIDDLE]         = COMBO(ru_r_m_combo,  KC_SLSH),
+    [R_U_RING_INDEX]          = COMBO(ru_r_i_combo,  NXTTAB),
+    [R_U_MIDDLE_INDEX]        = COMBO(ru_m_i_combo,  KC_MINS),
+    [R_U_MIDDLE_INNER_INDEX]  = COMBO(ru_m_ii_combo, KC_ENT),
+    [R_U_INNER_INNER_INDEX]   = COMBO(ru_i_ii_combo, KC_BSLS),
+    [R_L_PINKY_RING]          = COMBO(rl_p_r_combo,  KC_BSLS),
+    [R_L_RING_MIDDLE]         = COMBO(rl_r_m_combo,  KC_APP),
+    [R_L_RING_INDEX]          = COMBO(rl_r_i_combo,  LSFT(KC_TAB)),
+    [R_L_MIDDLE_INDEX]        = COMBO(rl_m_i_combo,  KC_DELT),
+    [R_L_INDEX_INNER_INDEX]   = COMBO(rl_i_ii_combo, KC_GRV),
+
+    [R_U_RING_MIDDLE_INDEX]   = COMBO(ru_r_m_i_combo, KC_BSLS),
+    [R_L_RING_MIDDLE_INDEX]   = COMBO(rl_r_m_i_combo, KC_GRV),
+
+    // both hand combinations.
+    [B_L_MIDDLE_MIDDLE]       = COMBO(bl_m_m_combo,  KC_ENT),
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC, LUP,    LUR,    LUM,    LUI,    LUII,            RUII,   RUI,    RUM,    RUR,    RUP,   KC_BSPC, KC_BSPC,
+        KC_LCTL,SHLP,   CTLR,   ALLM,   RS_LMI, GULII,           GURII,  LW_RMI, ALRM,   CTRR,   SHRP,  KC_ENT,
+        KC_LSFT,LLP,    LLR,    LLM,    LLI,    LLII,            RLII,   RLI,    RLM,    RLR,    RLP,   KC_RSFT,MO(1),
+        KC_LGUI,KC_LALT,        KC_LGUI,LW_E,   SF_BSPC,         AL_ENT, RS_SPC, KC_LALT,               KC_RGUI,KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,            KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_DEL, KC_BSPC,
+        KC_LCTL,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,         KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,   KC_SCLN,
+        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,            KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(2),
+        KC_LGUI,KC_LALT,        KC_LGUI,LW_E,   SF_BSPC,         AL_ENT, RS_SPC, KC_LALT,                KC_RGUI,KC_RCTL
+    ),
+    [2] = LAYOUT_all(
+        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_F13,
+        KC_LCTL,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_PERC,         KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,   KC_SCLN,
+        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   RESET,           KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(1),
+        KC_LGUI,KC_LALT,        KC_LGUI,LW_E,   SF_BSPC,         AL_ENT, RS_SPC, KC_LALT,                KC_RGUI,KC_RCTL
+    ),
+};
diff --git a/keyboards/alicia_cook/keymaps/rick/readme.md b/keyboards/alicia_cook/keymaps/rick/readme.md
new file mode 100644
index 0000000000..2bfb2a96fa
--- /dev/null
+++ b/keyboards/alicia_cook/keymaps/rick/readme.md
@@ -0,0 +1 @@
+# Rick's Keymap for Alicia Cook
diff --git a/keyboards/alicia_cook/keymaps/rick/rules.mk b/keyboards/alicia_cook/keymaps/rick/rules.mk
new file mode 100644
index 0000000000..6ecc620954
--- /dev/null
+++ b/keyboards/alicia_cook/keymaps/rick/rules.mk
@@ -0,0 +1,2 @@
+COMBO_ENABLE = yes
+CONSOLE_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/alicia_cook/readme.md b/keyboards/alicia_cook/readme.md
new file mode 100644
index 0000000000..4e37a366e7
--- /dev/null
+++ b/keyboards/alicia_cook/readme.md
@@ -0,0 +1,26 @@
+# Alicia Cook
+
+![Alicia Cook](https://raw.githubusercontent.com/ibnuda/alicia-cook/master-of-puppets/alicia-cook.jpg)
+
+40% Alice-style keyboard that can be split and uses IDC connector.
+
+* Keyboard Maintainer: [Ibnu D. Aji](https://github.com/ibnuda)
+* Hardware Supported: [Alicia Cook](https://github.com/ibnuda/alicia-cook)
+* Hardware Availability: [Alicia Cook](https://github.com/ibnuda/alicia-cook)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make alicia_cook:default
+
+Flashing example for this keyboard:
+
+    make alicia_cook:default:flash
+
+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).
+
+## Bootloader
+
+To enter the bootloader, there's only one way to do it:
+
+* **Keycode in layout**: Hold left spacebar and then tap `B` key in the default keymap.
+
diff --git a/keyboards/alicia_cook/rules.mk b/keyboards/alicia_cook/rules.mk
new file mode 100644
index 0000000000..f35bef0a63
--- /dev/null
+++ b/keyboards/alicia_cook/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From be1dcb9185d9ee3c1fa433703cc2e479efd6ba73 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 11 Jan 2022 14:20:33 +1100
Subject: [PATCH 251/867] Fix CI. (#15828)

* Fix CI.
---
 keyboards/idobao/id80/rules.mk                                | 2 +-
 keyboards/marksard/treadstone32/rules.mk                      | 2 +-
 keyboards/marksard/treadstone48/{treadstone48 => }/.noci      | 0
 .../treadstone48/{treadstone48 => }/common/glcdfont.c         | 0
 .../treadstone48/{treadstone48 => }/common/oled_helper.c      | 0
 .../treadstone48/{treadstone48 => }/common/oled_helper.h      | 0
 .../treadstone48/{treadstone48 => }/keymaps/default/config.h  | 2 +-
 .../treadstone48/{treadstone48 => }/keymaps/default/keymap.c  | 0
 .../treadstone48/{treadstone48 => }/keymaps/default/readme.md | 0
 .../{treadstone48 => }/keymaps/default/readme_jp.md           | 0
 .../treadstone48/{treadstone48 => }/keymaps/default/rules.mk  | 0
 .../treadstone48/{treadstone48 => }/keymaps/like_jis/config.h | 2 +-
 .../treadstone48/{treadstone48 => }/keymaps/like_jis/keymap.c | 0
 .../{treadstone48 => }/keymaps/like_jis/readme.md             | 0
 .../{treadstone48 => }/keymaps/like_jis/readme_jp.md          | 0
 .../treadstone48/{treadstone48 => }/keymaps/like_jis/rules.mk | 0
 keyboards/marksard/treadstone48/{treadstone48 => }/readme.md  | 0
 keyboards/marksard/treadstone48/{treadstone48 => }/rev1/.noci | 0
 .../marksard/treadstone48/{treadstone48 => }/rev1/config.h    | 0
 .../marksard/treadstone48/{treadstone48 => }/rev1/info.json   | 0
 .../{treadstone48 => }/rev1/keymaps/like_jis_rs/config.h      | 2 +-
 .../{treadstone48 => }/rev1/keymaps/like_jis_rs/keymap.c      | 0
 .../{treadstone48 => }/rev1/keymaps/like_jis_rs/readme.md     | 0
 .../{treadstone48 => }/rev1/keymaps/like_jis_rs/readme_jp.md  | 0
 .../{treadstone48 => }/rev1/keymaps/like_jis_rs/rules.mk      | 0
 .../marksard/treadstone48/{treadstone48 => }/rev1/rev1.c      | 0
 .../marksard/treadstone48/{treadstone48 => }/rev1/rev1.h      | 0
 .../marksard/treadstone48/{treadstone48 => }/rev1/rules.mk    | 0
 .../marksard/treadstone48/{treadstone48 => }/rev2/config.h    | 0
 .../marksard/treadstone48/{treadstone48 => }/rev2/info.json   | 0
 .../marksard/treadstone48/{treadstone48 => }/rev2/rev2.c      | 0
 .../marksard/treadstone48/{treadstone48 => }/rev2/rev2.h      | 0
 .../marksard/treadstone48/{treadstone48 => }/rev2/rules.mk    | 0
 keyboards/marksard/treadstone48/{treadstone48 => }/rules.mk   | 2 +-
 keyboards/salicylic_acid3/7skb/rules.mk                       | 4 ++--
 keyboards/salicylic_acid3/getta25/rules.mk                    | 2 +-
 keyboards/salicylic_acid3/jisplit89/rules.mk                  | 2 +-
 keyboards/salicylic_acid3/naked48/rules.mk                    | 2 +-
 keyboards/salicylic_acid3/naked60/rules.mk                    | 2 +-
 keyboards/salicylic_acid3/naked64/rules.mk                    | 2 +-
 keyboards/salicylic_acid3/setta21/rules.mk                    | 2 +-
 keyboards/{ => ymdk}/ymd75/.noci                              | 0
 keyboards/ymdk/ymd75/rules.mk                                 | 2 +-
 43 files changed, 15 insertions(+), 15 deletions(-)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/.noci (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/common/glcdfont.c (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/common/oled_helper.c (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/common/oled_helper.h (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/keymaps/default/config.h (94%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/keymaps/default/keymap.c (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/keymaps/default/readme.md (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/keymaps/default/readme_jp.md (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/keymaps/default/rules.mk (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/keymaps/like_jis/config.h (94%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/keymaps/like_jis/keymap.c (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/keymaps/like_jis/readme.md (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/keymaps/like_jis/readme_jp.md (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/keymaps/like_jis/rules.mk (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/readme.md (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev1/.noci (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev1/config.h (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev1/info.json (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev1/keymaps/like_jis_rs/config.h (95%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev1/keymaps/like_jis_rs/keymap.c (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev1/keymaps/like_jis_rs/readme.md (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev1/keymaps/like_jis_rs/readme_jp.md (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev1/keymaps/like_jis_rs/rules.mk (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev1/rev1.c (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev1/rev1.h (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev1/rules.mk (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev2/config.h (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev2/info.json (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev2/rev2.c (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev2/rev2.h (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rev2/rules.mk (100%)
 rename keyboards/marksard/treadstone48/{treadstone48 => }/rules.mk (93%)
 rename keyboards/{ => ymdk}/ymd75/.noci (100%)

diff --git a/keyboards/idobao/id80/rules.mk b/keyboards/idobao/id80/rules.mk
index eea8b69900..f988be4e29 100644
--- a/keyboards/idobao/id80/rules.mk
+++ b/keyboards/idobao/id80/rules.mk
@@ -1,5 +1,5 @@
 # Defalt to the ansi version
-DEFAULT_FOLDER = id80/ansi
+DEFAULT_FOLDER = idobao/id80/ansi
 
 # MCU name
 MCU = atmega32u4
diff --git a/keyboards/marksard/treadstone32/rules.mk b/keyboards/marksard/treadstone32/rules.mk
index 096c25856e..a0b43873cc 100644
--- a/keyboards/marksard/treadstone32/rules.mk
+++ b/keyboards/marksard/treadstone32/rules.mk
@@ -15,4 +15,4 @@ AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
 LEADER_ENABLE = no
 
-DEFAULT_FOLDER = treadstone32/rev1
+DEFAULT_FOLDER = marksard/treadstone32/rev1
diff --git a/keyboards/marksard/treadstone48/treadstone48/.noci b/keyboards/marksard/treadstone48/.noci
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/.noci
rename to keyboards/marksard/treadstone48/.noci
diff --git a/keyboards/marksard/treadstone48/treadstone48/common/glcdfont.c b/keyboards/marksard/treadstone48/common/glcdfont.c
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/common/glcdfont.c
rename to keyboards/marksard/treadstone48/common/glcdfont.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/common/oled_helper.c b/keyboards/marksard/treadstone48/common/oled_helper.c
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/common/oled_helper.c
rename to keyboards/marksard/treadstone48/common/oled_helper.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/common/oled_helper.h b/keyboards/marksard/treadstone48/common/oled_helper.h
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/common/oled_helper.h
rename to keyboards/marksard/treadstone48/common/oled_helper.h
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/config.h b/keyboards/marksard/treadstone48/keymaps/default/config.h
similarity index 94%
rename from keyboards/marksard/treadstone48/treadstone48/keymaps/default/config.h
rename to keyboards/marksard/treadstone48/keymaps/default/config.h
index baa4ec8461..a5f68e7a2b 100644
--- a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/config.h
+++ b/keyboards/marksard/treadstone48/keymaps/default/config.h
@@ -46,4 +46,4 @@
 // If you plug in the USB on the right side, please enable MASTER_RIGHT
 // #define RHYMESTONE_RIGHTHAND
 
-#define OLED_FONT_H "keyboards/treadstone48/common/glcdfont.c"
+#define OLED_FONT_H "keyboards/marksard/treadstone48/common/glcdfont.c"
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/keymap.c b/keyboards/marksard/treadstone48/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/keymaps/default/keymap.c
rename to keyboards/marksard/treadstone48/keymaps/default/keymap.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme.md b/keyboards/marksard/treadstone48/keymaps/default/readme.md
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme.md
rename to keyboards/marksard/treadstone48/keymaps/default/readme.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme_jp.md b/keyboards/marksard/treadstone48/keymaps/default/readme_jp.md
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/keymaps/default/readme_jp.md
rename to keyboards/marksard/treadstone48/keymaps/default/readme_jp.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/default/rules.mk b/keyboards/marksard/treadstone48/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/keymaps/default/rules.mk
rename to keyboards/marksard/treadstone48/keymaps/default/rules.mk
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/config.h b/keyboards/marksard/treadstone48/keymaps/like_jis/config.h
similarity index 94%
rename from keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/config.h
rename to keyboards/marksard/treadstone48/keymaps/like_jis/config.h
index baa4ec8461..a5f68e7a2b 100644
--- a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/config.h
+++ b/keyboards/marksard/treadstone48/keymaps/like_jis/config.h
@@ -46,4 +46,4 @@
 // If you plug in the USB on the right side, please enable MASTER_RIGHT
 // #define RHYMESTONE_RIGHTHAND
 
-#define OLED_FONT_H "keyboards/treadstone48/common/glcdfont.c"
+#define OLED_FONT_H "keyboards/marksard/treadstone48/common/glcdfont.c"
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/keymap.c b/keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/keymap.c
rename to keyboards/marksard/treadstone48/keymaps/like_jis/keymap.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme.md b/keyboards/marksard/treadstone48/keymaps/like_jis/readme.md
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme.md
rename to keyboards/marksard/treadstone48/keymaps/like_jis/readme.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme_jp.md b/keyboards/marksard/treadstone48/keymaps/like_jis/readme_jp.md
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/readme_jp.md
rename to keyboards/marksard/treadstone48/keymaps/like_jis/readme_jp.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/rules.mk b/keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/keymaps/like_jis/rules.mk
rename to keyboards/marksard/treadstone48/keymaps/like_jis/rules.mk
diff --git a/keyboards/marksard/treadstone48/treadstone48/readme.md b/keyboards/marksard/treadstone48/readme.md
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/readme.md
rename to keyboards/marksard/treadstone48/readme.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/.noci b/keyboards/marksard/treadstone48/rev1/.noci
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev1/.noci
rename to keyboards/marksard/treadstone48/rev1/.noci
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev1/config.h
rename to keyboards/marksard/treadstone48/rev1/config.h
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev1/info.json
rename to keyboards/marksard/treadstone48/rev1/info.json
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/config.h b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h
similarity index 95%
rename from keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/config.h
rename to keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h
index 95b58c23db..54ac1f2fce 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/config.h
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h
@@ -48,4 +48,4 @@
 // If you plug in the USB on the right side, please enable MASTER_RIGHT
 // #define RHYMESTONE_RIGHTHAND
 
-#define OLED_FONT_H "keyboards/treadstone48/common/glcdfont.c"
+#define OLED_FONT_H "keyboards/marksard/treadstone48/common/glcdfont.c"
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/keymap.c b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
rename to keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme.md b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme.md
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme.md
rename to keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md
rename to keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/readme_jp.md
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/rules.mk b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
rename to keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/rules.mk
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/rev1.c b/keyboards/marksard/treadstone48/rev1/rev1.c
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev1/rev1.c
rename to keyboards/marksard/treadstone48/rev1/rev1.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/rev1.h b/keyboards/marksard/treadstone48/rev1/rev1.h
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev1/rev1.h
rename to keyboards/marksard/treadstone48/rev1/rev1.h
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev1/rules.mk b/keyboards/marksard/treadstone48/rev1/rules.mk
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev1/rules.mk
rename to keyboards/marksard/treadstone48/rev1/rules.mk
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev2/config.h
rename to keyboards/marksard/treadstone48/rev2/config.h
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev2/info.json
rename to keyboards/marksard/treadstone48/rev2/info.json
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/rev2.c b/keyboards/marksard/treadstone48/rev2/rev2.c
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev2/rev2.c
rename to keyboards/marksard/treadstone48/rev2/rev2.c
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/rev2.h b/keyboards/marksard/treadstone48/rev2/rev2.h
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev2/rev2.h
rename to keyboards/marksard/treadstone48/rev2/rev2.h
diff --git a/keyboards/marksard/treadstone48/treadstone48/rev2/rules.mk b/keyboards/marksard/treadstone48/rev2/rules.mk
similarity index 100%
rename from keyboards/marksard/treadstone48/treadstone48/rev2/rules.mk
rename to keyboards/marksard/treadstone48/rev2/rules.mk
diff --git a/keyboards/marksard/treadstone48/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk
similarity index 93%
rename from keyboards/marksard/treadstone48/treadstone48/rules.mk
rename to keyboards/marksard/treadstone48/rules.mk
index 3bf42c85c6..67c171a7b7 100644
--- a/keyboards/marksard/treadstone48/treadstone48/rules.mk
+++ b/keyboards/marksard/treadstone48/rules.mk
@@ -22,4 +22,4 @@ RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 
-DEFAULT_FOLDER = treadstone48/rev1
+DEFAULT_FOLDER = marksard/treadstone48/rev1
diff --git a/keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk
index ea7399dc75..3ae2e899ca 100644
--- a/keyboards/salicylic_acid3/7skb/rules.mk
+++ b/keyboards/salicylic_acid3/7skb/rules.mk
@@ -15,8 +15,8 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = 7skb/rev1
+DEFAULT_FOLDER = salicylic_acid3/7skb/rev1
diff --git a/keyboards/salicylic_acid3/getta25/rules.mk b/keyboards/salicylic_acid3/getta25/rules.mk
index 54265d2285..977ef5bb1d 100644
--- a/keyboards/salicylic_acid3/getta25/rules.mk
+++ b/keyboards/salicylic_acid3/getta25/rules.mk
@@ -18,4 +18,4 @@ AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
 OLED_ENABLE = no
 
-DEFAULT_FOLDER = getta25/rev1
+DEFAULT_FOLDER = salicylic_acid3/getta25/rev1
diff --git a/keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk
index 5427cabfa2..a6a8510675 100644
--- a/keyboards/salicylic_acid3/jisplit89/rules.mk
+++ b/keyboards/salicylic_acid3/jisplit89/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = jisplit89/rev1
+DEFAULT_FOLDER = salicylic_acid3/jisplit89/rev1
diff --git a/keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk
index 6e848a2815..0e297ebf60 100644
--- a/keyboards/salicylic_acid3/naked48/rules.mk
+++ b/keyboards/salicylic_acid3/naked48/rules.mk
@@ -21,4 +21,4 @@ RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = naked48/rev1
+DEFAULT_FOLDER = salicylic_acid3/naked48/rev1
diff --git a/keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk
index 46aef17c7a..1aefc7b595 100644
--- a/keyboards/salicylic_acid3/naked60/rules.mk
+++ b/keyboards/salicylic_acid3/naked60/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = naked60/rev1
+DEFAULT_FOLDER = salicylic_acid3/naked60/rev1
diff --git a/keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk
index 7de80383e1..db027e3bda 100644
--- a/keyboards/salicylic_acid3/naked64/rules.mk
+++ b/keyboards/salicylic_acid3/naked64/rules.mk
@@ -21,4 +21,4 @@ USE_I2C = no
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = naked64/rev1
+DEFAULT_FOLDER = salicylic_acid3/naked64/rev1
diff --git a/keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk
index e31a7b5c7a..c7920fdfe8 100644
--- a/keyboards/salicylic_acid3/setta21/rules.mk
+++ b/keyboards/salicylic_acid3/setta21/rules.mk
@@ -21,6 +21,6 @@ USE_I2C = no
 RGB_MATRIX_ENABLE = no
 RGB_MATRIX_DRIVER = WS2812
 
-DEFAULT_FOLDER = setta21/rev1
+DEFAULT_FOLDER = salicylic_acid3/setta21/rev1
 
 LAYOUTS = numpad_6x4
diff --git a/keyboards/ymd75/.noci b/keyboards/ymdk/ymd75/.noci
similarity index 100%
rename from keyboards/ymd75/.noci
rename to keyboards/ymdk/ymd75/.noci
diff --git a/keyboards/ymdk/ymd75/rules.mk b/keyboards/ymdk/ymd75/rules.mk
index 756d20c54c..ec66e0734a 100644
--- a/keyboards/ymdk/ymd75/rules.mk
+++ b/keyboards/ymdk/ymd75/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = ymd75/rev1
+DEFAULT_FOLDER = ymdk/ymd75/rev1

From bda520198e573c4fcb0bc0af8d33085ad6e0f9c6 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 11 Jan 2022 09:42:58 -0800
Subject: [PATCH 252/867] [Keyboard] Fix KBD67 mark 2 v4 (#15835)

---
 keyboards/kbdfans/kbd67/mkiirgb/v4/config.h | 74 ++++++++++++++++++---
 1 file changed, 65 insertions(+), 9 deletions(-)

diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index 3d633bed2a..68ec07db37 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -56,15 +56,71 @@
 #define RGBLIGHT_EFFECT_TWINKLE
 
 #ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
-#define RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 8
-#define RGB_MATRIX_VAL_STEP 8
-#define RGB_MATRIX_SPD_STEP 10
+#    define RGB_MATRIX_KEYPRESSES           // reacts to keypresses
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_HUE_STEP 8
+#    define RGB_MATRIX_SAT_STEP 8
+#    define RGB_MATRIX_VAL_STEP 8
+#    define RGB_MATRIX_SPD_STEP 10
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#    define RGB_MATRIX_HUE_STEP 8
+#    define RGB_MATRIX_SAT_STEP 8
+#    define RGB_MATRIX_VAL_STEP 8
+#    define RGB_MATRIX_SPD_STEP 10
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+// #define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+// #define ENABLE_RGB_MATRIX_SPLASH
+// #define ENABLE_RGB_MATRIX_MULTISPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #endif
 
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

From 052a59fc3bff180244268d0d3509a9d22a86c89d Mon Sep 17 00:00:00 2001
From: Fredrik Larsen <fredrikhl@users.noreply.github.com>
Date: Tue, 11 Jan 2022 18:55:24 +0100
Subject: [PATCH 253/867] [Keyboard] Use correct callback in macro1
 implementation (#15819)

---
 keyboards/macro1/macro1.c | 42 ++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/keyboards/macro1/macro1.c b/keyboards/macro1/macro1.c
index b470ed523f..f1fbed1d15 100644
--- a/keyboards/macro1/macro1.c
+++ b/keyboards/macro1/macro1.c
@@ -1,29 +1,31 @@
- /* Copyright 2021 Laneware Peripherals
-  * 
-  * 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/>. 
-  */ 
-
+/* Copyright 2021 Laneware Peripherals
+ *
+ * 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 "macro1.h"
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
     if (index == 0) { /* First encoder */
         if (clockwise) {
             tap_code(KC_VOLU);
         } else {
             tap_code(KC_VOLD);
         }
-    } 
-        return false; 
+    }
+    return false;
 }
-

From 0963140149d43d40beef909bc4e181f8bd39acfd Mon Sep 17 00:00:00 2001
From: jonavin <71780717+Jonavin@users.noreply.github.com>
Date: Tue, 11 Jan 2022 12:56:01 -0500
Subject: [PATCH 254/867] [Keymap] Jonavin keymap kastenwagen48 (#15825)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=>
---
 .../kastenwagen48/keymaps/jonavin/config.h    | 31 +++++++++
 .../kastenwagen48/keymaps/jonavin/keymap.c    | 67 +++++++++++++++++++
 .../kastenwagen48/keymaps/jonavin/readme.md   | 54 +++++++++++++++
 .../kastenwagen48/keymaps/jonavin/rules.mk    | 11 +++
 users/jonavin/readme.md                       |  3 +-
 5 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/config.h
 create mode 100644 keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c
 create mode 100644 keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/readme.md
 create mode 100644 keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/rules.mk

diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/config.h b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/config.h
new file mode 100644
index 0000000000..c6de1b416c
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/config.h
@@ -0,0 +1,31 @@
+/* Copyright 2021, 2022 Jonavin Eng
+ *
+ * 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 TAPPING_TOGGLE 2
+// TT set to two taps
+
+/*  Handle GRAVESC combo keys */
+#define GRAVE_ESC_ALT_OVERRIDE
+    //Always send Escape if Alt is pressed
+#define GRAVE_ESC_CTRL_OVERRIDE
+    //Always send Escape if Control is pressed
+
+#define TAPPING_TERM 180
+
+#define ENCODER_DIRECTION_FLIP  // compensate for opposite encoder direction
+#define ENCODER_DEFAULTACTIONS_INDEX 1  // Set default encoder functions to encoder 1
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c
new file mode 100644
index 0000000000..29c12b0419
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2021 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ * Copyright 2022 Jonavin Eng, @Jonavin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "jonavin.h"
+
+#define L2_SPC      LT(2,KC_SPC)
+#define L3_SPC      LT(3,KC_SPC)
+#define RWINALT     RALT_T(KC_RGUI)
+#define ISO_LT      KC_NUBS
+#define ISO_GT      LSFT(KC_NUBS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_BASE] = LAYOUT_48(
+
+    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_BSPC  , KC_DEL ,
+    TT(_RAISE)  ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_ENT   , KC_PGUP,
+    KC_LSFTCAPS ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH, KC_SFTENT ,KC_UP , KC_PGDN,
+    KC_LCTL  ,KC_LALT  ,KC_LGUI ,KC_SPC       ,L3_SPC           ,MO(_LOWER) ,MO(_FN1) ,KC_RCTL   ,KC_LEFT,KC_DOWN,KC_RGHT
+    ),
+[_FN1] = LAYOUT_48(
+    KC_GRV  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_INS ,
+    KC_CAPS ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_PSCR, KC_SLCK, KC_PAUS,XXXXXXX,XXXXXXX,XXXXXXX    , KC_HOME,
+    _______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_NLCK ,XXXXXXX ,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,KC_PGUP,    KC_END ,
+    _______  ,_______  ,KC_WINLCK,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END
+    ),
+[_LOWER] = LAYOUT_48(
+    KC_TILD  ,KC_EXLM, KC_AT, KC_HASH,KC_DLR,KC_PERC,KC_CIRC, KC_AMPR, KC_ASTR,KC_LPRN, KC_RPRN,KC_MINS,KC_EQL     , RESET,
+    _______  ,KC_MINS, KC_EQL,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_QUES,KC_SLSH,KC_PIPE,KC_BSLS,KC_TILD,  XXXXXXX   ,XXXXXXX,
+    _______  ,KC_UNDS, KC_PLUS,XXXXXXX,KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC,KC_LT,KC_GT, XXXXXXX ,_______ ,XXXXXXX,XXXXXXX,
+    _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX
+    ),
+[_RAISE] = LAYOUT_48(
+ 	KC_ESC, KC_HOME,KC_UP,  KC_END, KC_PGUP,KC_PMNS,KC_PPLS,KC_P7,  KC_P8,  KC_P9,  KC_P0,  KC_PMNS, KC_PEQL     , KC_TSTOG,
+  	TT(_RAISE),KC_LEFT,KC_DOWN,KC_RIGHT,KC_PGDN,KC_PSLS,KC_TAB,KC_P4, KC_P5,  KC_P6,  KC_PDOT,KC_PAST,KC_PENT    , XXXXXXX,
+  	_______,   XXXXXXX,KC_DEL, KC_INS, KC_NO,  KC_PAST,KC_P0,  KC_P1,  KC_P2,  KC_P3,  KC_PSLS ,_______,   XXXXXXX,XXXXXXX,
+    _______  ,_______  ,_______,KC_BSPC              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX
+    )
+};
+
+#ifdef ENCODER_ENABLE       // Encoder Functionality
+bool encoder_update_keymap(uint8_t index, bool clockwise) {
+    switch (index) {
+        case 0:         // Top left encoder
+            encoder_action_volume(clockwise);
+            break;
+        default:
+            break;
+    }
+    return true;  // fall to encoder_update_user and encoder_update_kb definitions
+}
+#endif
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/readme.md b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/readme.md
new file mode 100644
index 0000000000..885e6b0dd7
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/readme.md
@@ -0,0 +1,54 @@
+Jonavin Kastenwagen 48 Keymap
+Designed to match my other keymaps
+
+NOTE: Uses userpace user/jonavin
+
+Feature changes from Default
+  - Bottom row mapping LCtrl, LAlt, LGui, spacebars, MO(2)/LOWER, MO(1)/FN, RCtrl
+  - CAPS as MO(3)/RAISE - tap to toggle
+  - numpad in MO(3) layer
+  - double tap L Shift for CAPS
+  - RESET moved to under encoder in MO(2)
+  - implement Win Key Lock 
+  - GRV Escape overides
+  - ENCODERS
+    - TOP LEFT
+      - Volume up/down
+    - TOP RIGHT
+      - Left Shift held - change layers
+      - Right Shift held - Page Up/Down
+      - Left Ctrl held - navigate next/prev words
+      - Left Alt held - change media next/prev track
+      - RAISE + Encode push toggles between volume change and tab scrolling
+    - ENCODER_DIRECTION_FLIP has been defined to avoid issues with encoder going in opposition direction
+
+OPTIONS in rules.mk
+---------------------------------------
+
+STARTUP_NUMLOCK_ON = yes
+- turns on NUMLOCK by default
+
+ENCODER_DEFAULTACTIONS_ENABLE = yes
+- Enabled default encoder funtions
+- When enabled, use this in the keymap for an additional encoder processing 
+-   bool encoder_update_keymap(uint8_t index, bool clockwise)
+  
+OPTION: set ENCODER_DEFAULTACTIONS_INDEX in config.h to the encoder number if the encoder is not index 0  -- set to 1 for top right encoder
+
+TD_LSFT_CAPSLOCK_ENABLE = yes
+- This will enable double tap on Left Shift to toggle CAPSLOCK
+-   KC_LSFTCAPS to bind to left Shift to enable feature
+-   KC_LSFTCAPSWIN does the same thing but will not turn on CAPS when Win Lkey is disabled
+    
+INVERT_NUMLOCK_INDICATOR
+- inverts the Num lock indicator, LED is on when num lock is off
+
+ALTTAB_SCROLL_ENABLE
+- When ENCODER_DEFAULTACTIONS_ENABLE = yes, 
+    Enables Alt-Tab scrolling functions in default encoder, 
+    bind KS_TSTOG to a key to enable/disable Alt-Tab vs Volume control
+- When defining your own encoder functions use encoder_action_alttabscroll(bool clockwise) to assign the encodr action
+
+
+Layout
+![image](https://user-images.githubusercontent.com/71780717/128580303-5d660a5f-1420-4e38-b40a-212573496b1c.png)
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/rules.mk b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/rules.mk
new file mode 100644
index 0000000000..97ccf0c354
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/jonavin/rules.mk
@@ -0,0 +1,11 @@
+VIA_ENABLE = yes            # VIA support
+LTO_ENABLE = yes            #
+
+TAP_DANCE_ENABLE = yes
+
+TD_LSFT_CAPSLOCK_ENABLE = yes
+STARTUP_NUMLOCK_ON = yes
+
+ENCODER_DEFAULTACTIONS_ENABLE = yes
+INVERT_NUMLOCK_INDICATOR = yes
+ALTTAB_SCROLL_ENABLE = yes
diff --git a/users/jonavin/readme.md b/users/jonavin/readme.md
index 7712eda1eb..204032ae1a 100644
--- a/users/jonavin/readme.md
+++ b/users/jonavin/readme.md
@@ -120,6 +120,5 @@ LIST OF COMPATIBLE KEYMAPS
 - mechwild/murphpad
 - mechwild/OBE
 - kbdfans/kdb67
-- nopunin10did/kastenwagen (*)
+- nopunin10did/kastenwagen48
 
-    (*) coming soon

From 3124dfc5cd739bba632814e0f04281715bf1b05e Mon Sep 17 00:00:00 2001
From: kb-elmo <lorwel@mailbox.org>
Date: Tue, 11 Jan 2022 18:57:03 +0100
Subject: [PATCH 255/867] [Keyboard] Add RGB matrix to CK60 (#15817)

---
 keyboards/senselessclay/ck60/ck60.c   |  30 ++++++-
 keyboards/senselessclay/ck60/config.h | 109 +++++++++-----------------
 keyboards/senselessclay/ck60/rules.mk |   9 ++-
 3 files changed, 69 insertions(+), 79 deletions(-)

diff --git a/keyboards/senselessclay/ck60/ck60.c b/keyboards/senselessclay/ck60/ck60.c
index a2fe38aac7..1c30b77185 100644
--- a/keyboards/senselessclay/ck60/ck60.c
+++ b/keyboards/senselessclay/ck60/ck60.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 Hadi Iskandarani
+/* Copyright 2022 kb-elmo<mail@elmo.space>
  *
  * 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
@@ -14,4 +14,30 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ck60.h"
\ No newline at end of file
+#include "ck60.h"
+
+#define __ NO_LED
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    //Key Matrix to LED Index
+    {   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,   10,  11,  12,  13  },
+    {   27,  26,  25,  24,  23,  22,  21,  20,  19,  18,  17,  16,  15,  14  },
+    {   28,  29,  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  __  },
+    {   53,  52,  51,  50,  49,  48,  47,  46,  45,  44,  43,  42,  41,  __  },
+    {   54,  55,  56,  __,  __,  __,  57,  __,  __,  __,  58,  59,  60,  61  }
+}, {
+    //LED Index to Physical Positon
+    { 0,   0  }, { 17,  0  }, { 34,  0  }, { 52,  0  }, { 69,  0  }, { 86,  0  }, { 103, 0  }, { 121, 0  }, { 138, 0  }, { 155, 0  }, { 172, 0  }, { 190, 0  }, { 207, 0  }, { 215, 0  },
+    { 224, 24 }, { 215, 16 }, { 198, 16 }, { 180, 16 }, { 164, 16 }, { 146, 16 }, { 129, 16 }, { 112, 16 }, { 95,  16 }, { 78,  16 }, { 60,  16 }, { 43,  16 }, { 26 , 16 }, { 0,   16 },
+    { 0,   32 }, { 30,  32 }, { 47,  32 }, { 65,  32 }, { 81,  32 }, { 99,  32 }, { 116, 32 }, { 133, 32 }, { 150, 32 }, { 168, 32 }, { 185, 32 }, { 202, 32 }, { 220, 32 },
+    { 207, 48 }, { 190, 48 }, { 172, 48 }, { 155, 48 }, { 138, 48 }, { 121, 48 }, { 103, 48 }, { 86,  48 }, { 69,  48 }, { 52,  48 }, { 34,  48 }, { 17,  48 }, { 0,   48 },
+    { 0,   64 }, { 17,  64 }, { 34,  64 },                                        { 103, 64 },                                        { 172, 64 }, { 190, 64 }, { 207, 64 }, { 224, 64 }
+}, {
+    1,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   1,
+    1,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   1,
+    1,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,
+    1,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   1,
+    1,   1,   1,                  4,                  1,   1,   1,   1
+} };
+#endif
diff --git a/keyboards/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h
index 7e4a493701..f826ad9ad7 100644
--- a/keyboards/senselessclay/ck60/config.h
+++ b/keyboards/senselessclay/ck60/config.h
@@ -30,90 +30,51 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
 
-/*
- * 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)
- *
- */
-/* rev0 */ 
+/* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { B3, B2, F1, F4, F5 }
 #define MATRIX_COL_PINS { F0, D5, D3, D2, D1, D0, C7, C6, B6, B5, B4, D7, D6, D4 }
 
-//#define UNUSED_PINS { B0, B7, E6 }
-
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+/* Debounce reduces chatter */
 #define DEBOUNCE 5
 
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
+/* RGB matrix lighting */ 
+#define RGB_DI_PIN B1
+#define DRIVER_LED_TOTAL 62
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160   // limit brightness to not overamp the USB
+#define RGB_MATRIX_LED_FLUSH_LIMIT 16       // 16 is equivalent to limiting to 60fps
+#define RGB_DISABLE_AFTER_TIMEOUT 0         // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED      // turn off effects when suspended
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 
-/* 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
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 /* disable these deprecated features by default */
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
-
-/* Bootmagic Lite key configuration */
-//#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
-
-/* RGB Backlighting */ 
-#define RGB_DI_PIN B1
-#define RGBLED_NUM 62
-#define RGBLIGHT_ANIMATIONS
-#define RGBLIGHT_LIMIT_VAL 128
-#define RGBLIGHT_SLEEP
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5
\ No newline at end of file
diff --git a/keyboards/senselessclay/ck60/rules.mk b/keyboards/senselessclay/ck60/rules.mk
index 6b490bdd04..56aec94425 100644
--- a/keyboards/senselessclay/ck60/rules.mk
+++ b/keyboards/senselessclay/ck60/rules.mk
@@ -8,11 +8,14 @@ BOOTLOADER = atmel-dfu
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no       # Mouse keys
+MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+RGB_MATRIX_ENABLE = yes     # RGB matrix lighting
+RGB_MATRIX_DRIVER = WS2812
\ No newline at end of file

From 3d63c814d321be7e97dfdef295ee6e1deb3a1fcc Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Wed, 12 Jan 2022 01:57:25 +0800
Subject: [PATCH 256/867] Correct matrix effect name (#15816)

---
 keyboards/3keyecosystem/2key2/config.h            | 2 +-
 keyboards/dtisaac/dosa40rgb/config.h              | 2 +-
 keyboards/kbdfans/boop65/rgb/config.h             | 2 +-
 keyboards/kbdfans/odin/rgb/config.h               | 2 +-
 keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h  | 2 +-
 keyboards/kprepublic/bm80hsrgb/config.h           | 2 +-
 keyboards/mechlovin/adelais/rgb_led/rev3/config.h | 2 +-
 keyboards/melgeek/mach80/config.h                 | 2 +-
 keyboards/mwstudio/mw75/config.h                  | 2 +-
 keyboards/sawnsprojects/satxri6key/config.h       | 2 +-
 keyboards/smallkeyboard/config.h                  | 2 +-
 keyboards/xelus/la_plus/config.h                  | 2 +-
 keyboards/xelus/pachi/rgb/rev1/config.h           | 2 +-
 keyboards/xelus/pachi/rgb/rev2/config.h           | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h
index 16cbd00a42..4ca0e830ee 100644
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -77,7 +77,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
index c2c0ebd6d4..c5c13bd270 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/config.h
@@ -85,7 +85,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/kbdfans/boop65/rgb/config.h b/keyboards/kbdfans/boop65/rgb/config.h
index 0d67db2110..20ee0df25a 100644
--- a/keyboards/kbdfans/boop65/rgb/config.h
+++ b/keyboards/kbdfans/boop65/rgb/config.h
@@ -82,7 +82,7 @@
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/kbdfans/odin/rgb/config.h b/keyboards/kbdfans/odin/rgb/config.h
index be6c4e92da..9e2a12fcca 100644
--- a/keyboards/kbdfans/odin/rgb/config.h
+++ b/keyboards/kbdfans/odin/rgb/config.h
@@ -67,7 +67,7 @@
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index b3bbed9110..8286b447a8 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -112,7 +112,7 @@
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index b1a2ad23a1..f56daf948c 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -100,7 +100,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
index b0f082cc88..c0817d6062 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h
@@ -87,7 +87,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/melgeek/mach80/config.h b/keyboards/melgeek/mach80/config.h
index f598751418..8f8377941f 100755
--- a/keyboards/melgeek/mach80/config.h
+++ b/keyboards/melgeek/mach80/config.h
@@ -75,7 +75,7 @@
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h
index 2853276653..1cc00618e8 100644
--- a/keyboards/mwstudio/mw75/config.h
+++ b/keyboards/mwstudio/mw75/config.h
@@ -78,7 +78,7 @@
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/sawnsprojects/satxri6key/config.h b/keyboards/sawnsprojects/satxri6key/config.h
index bb334c7221..5ad3f20093 100644
--- a/keyboards/sawnsprojects/satxri6key/config.h
+++ b/keyboards/sawnsprojects/satxri6key/config.h
@@ -102,7 +102,7 @@
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/smallkeyboard/config.h b/keyboards/smallkeyboard/config.h
index 0a7d06f39d..2630666359 100644
--- a/keyboards/smallkeyboard/config.h
+++ b/keyboards/smallkeyboard/config.h
@@ -84,7 +84,7 @@
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-// #define ENABLE_RGB_MATRIX_FRACTAL
+// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/xelus/la_plus/config.h b/keyboards/xelus/la_plus/config.h
index 26064ebde2..14cad0fa87 100755
--- a/keyboards/xelus/la_plus/config.h
+++ b/keyboards/xelus/la_plus/config.h
@@ -82,7 +82,7 @@
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h
index 75b477e069..e6cf1756bd 100644
--- a/keyboards/xelus/pachi/rgb/rev1/config.h
+++ b/keyboards/xelus/pachi/rgb/rev1/config.h
@@ -98,7 +98,7 @@
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index 6a5a583ce8..b803b2fd2c 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -98,7 +98,7 @@
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP

From f0c14507a521dbb7c6418ef5209b96057fffcdf7 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Wed, 12 Jan 2022 02:01:33 +0800
Subject: [PATCH 257/867] [Keyboard] move @nacly 's boards to nacly/ (#15801)

---
 keyboards/{ => nacly}/splitreus62/config.h                  | 0
 keyboards/{ => nacly}/splitreus62/info.json                 | 0
 keyboards/{ => nacly}/splitreus62/keymaps/default/keymap.c  | 0
 keyboards/{ => nacly}/splitreus62/keymaps/scheiklp/config.h | 0
 keyboards/{ => nacly}/splitreus62/keymaps/scheiklp/keymap.c | 0
 keyboards/{ => nacly}/splitreus62/keymaps/scheiklp/rules.mk | 0
 keyboards/{ => nacly}/splitreus62/readme.md                 | 2 +-
 keyboards/{ => nacly}/splitreus62/rules.mk                  | 0
 keyboards/{ => nacly}/splitreus62/splitreus62.c             | 0
 keyboards/{ => nacly}/splitreus62/splitreus62.h             | 0
 keyboards/{ => nacly}/ua62/config.h                         | 0
 keyboards/{ => nacly}/ua62/info.json                        | 0
 keyboards/{ => nacly}/ua62/keymaps/default/keymap.c         | 0
 keyboards/{ => nacly}/ua62/readme.md                        | 2 +-
 keyboards/{ => nacly}/ua62/rules.mk                         | 0
 keyboards/{ => nacly}/ua62/ua62.c                           | 0
 keyboards/{ => nacly}/ua62/ua62.h                           | 0
 17 files changed, 2 insertions(+), 2 deletions(-)
 rename keyboards/{ => nacly}/splitreus62/config.h (100%)
 rename keyboards/{ => nacly}/splitreus62/info.json (100%)
 rename keyboards/{ => nacly}/splitreus62/keymaps/default/keymap.c (100%)
 rename keyboards/{ => nacly}/splitreus62/keymaps/scheiklp/config.h (100%)
 rename keyboards/{ => nacly}/splitreus62/keymaps/scheiklp/keymap.c (100%)
 rename keyboards/{ => nacly}/splitreus62/keymaps/scheiklp/rules.mk (100%)
 rename keyboards/{ => nacly}/splitreus62/readme.md (95%)
 rename keyboards/{ => nacly}/splitreus62/rules.mk (100%)
 rename keyboards/{ => nacly}/splitreus62/splitreus62.c (100%)
 rename keyboards/{ => nacly}/splitreus62/splitreus62.h (100%)
 rename keyboards/{ => nacly}/ua62/config.h (100%)
 rename keyboards/{ => nacly}/ua62/info.json (100%)
 rename keyboards/{ => nacly}/ua62/keymaps/default/keymap.c (100%)
 rename keyboards/{ => nacly}/ua62/readme.md (95%)
 rename keyboards/{ => nacly}/ua62/rules.mk (100%)
 rename keyboards/{ => nacly}/ua62/ua62.c (100%)
 rename keyboards/{ => nacly}/ua62/ua62.h (100%)

diff --git a/keyboards/splitreus62/config.h b/keyboards/nacly/splitreus62/config.h
similarity index 100%
rename from keyboards/splitreus62/config.h
rename to keyboards/nacly/splitreus62/config.h
diff --git a/keyboards/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json
similarity index 100%
rename from keyboards/splitreus62/info.json
rename to keyboards/nacly/splitreus62/info.json
diff --git a/keyboards/splitreus62/keymaps/default/keymap.c b/keyboards/nacly/splitreus62/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/splitreus62/keymaps/default/keymap.c
rename to keyboards/nacly/splitreus62/keymaps/default/keymap.c
diff --git a/keyboards/splitreus62/keymaps/scheiklp/config.h b/keyboards/nacly/splitreus62/keymaps/scheiklp/config.h
similarity index 100%
rename from keyboards/splitreus62/keymaps/scheiklp/config.h
rename to keyboards/nacly/splitreus62/keymaps/scheiklp/config.h
diff --git a/keyboards/splitreus62/keymaps/scheiklp/keymap.c b/keyboards/nacly/splitreus62/keymaps/scheiklp/keymap.c
similarity index 100%
rename from keyboards/splitreus62/keymaps/scheiklp/keymap.c
rename to keyboards/nacly/splitreus62/keymaps/scheiklp/keymap.c
diff --git a/keyboards/splitreus62/keymaps/scheiklp/rules.mk b/keyboards/nacly/splitreus62/keymaps/scheiklp/rules.mk
similarity index 100%
rename from keyboards/splitreus62/keymaps/scheiklp/rules.mk
rename to keyboards/nacly/splitreus62/keymaps/scheiklp/rules.mk
diff --git a/keyboards/splitreus62/readme.md b/keyboards/nacly/splitreus62/readme.md
similarity index 95%
rename from keyboards/splitreus62/readme.md
rename to keyboards/nacly/splitreus62/readme.md
index 34fda47535..414b507d97 100644
--- a/keyboards/splitreus62/readme.md
+++ b/keyboards/nacly/splitreus62/readme.md
@@ -8,6 +8,6 @@ A split version of the [Atreus62](https://github.com/profet23/atreus62) by Profe
 
 Make example for this keyboard (after setting up your build environment):
 
-    make splitreus62:default
+    make nacly/splitreus62: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).
diff --git a/keyboards/splitreus62/rules.mk b/keyboards/nacly/splitreus62/rules.mk
similarity index 100%
rename from keyboards/splitreus62/rules.mk
rename to keyboards/nacly/splitreus62/rules.mk
diff --git a/keyboards/splitreus62/splitreus62.c b/keyboards/nacly/splitreus62/splitreus62.c
similarity index 100%
rename from keyboards/splitreus62/splitreus62.c
rename to keyboards/nacly/splitreus62/splitreus62.c
diff --git a/keyboards/splitreus62/splitreus62.h b/keyboards/nacly/splitreus62/splitreus62.h
similarity index 100%
rename from keyboards/splitreus62/splitreus62.h
rename to keyboards/nacly/splitreus62/splitreus62.h
diff --git a/keyboards/ua62/config.h b/keyboards/nacly/ua62/config.h
similarity index 100%
rename from keyboards/ua62/config.h
rename to keyboards/nacly/ua62/config.h
diff --git a/keyboards/ua62/info.json b/keyboards/nacly/ua62/info.json
similarity index 100%
rename from keyboards/ua62/info.json
rename to keyboards/nacly/ua62/info.json
diff --git a/keyboards/ua62/keymaps/default/keymap.c b/keyboards/nacly/ua62/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ua62/keymaps/default/keymap.c
rename to keyboards/nacly/ua62/keymaps/default/keymap.c
diff --git a/keyboards/ua62/readme.md b/keyboards/nacly/ua62/readme.md
similarity index 95%
rename from keyboards/ua62/readme.md
rename to keyboards/nacly/ua62/readme.md
index 62523e2146..cb4b870bcd 100644
--- a/keyboards/ua62/readme.md
+++ b/keyboards/nacly/ua62/readme.md
@@ -9,6 +9,6 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ua62:default
+    make nacly/ua62: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).
diff --git a/keyboards/ua62/rules.mk b/keyboards/nacly/ua62/rules.mk
similarity index 100%
rename from keyboards/ua62/rules.mk
rename to keyboards/nacly/ua62/rules.mk
diff --git a/keyboards/ua62/ua62.c b/keyboards/nacly/ua62/ua62.c
similarity index 100%
rename from keyboards/ua62/ua62.c
rename to keyboards/nacly/ua62/ua62.c
diff --git a/keyboards/ua62/ua62.h b/keyboards/nacly/ua62/ua62.h
similarity index 100%
rename from keyboards/ua62/ua62.h
rename to keyboards/nacly/ua62/ua62.h

From 37d801776ea84bcc93376d1f269e2c4093ea6d74 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Wed, 12 Jan 2022 02:05:06 +0800
Subject: [PATCH 258/867] [Keyboard] move @obosob 's boards into obosob/
 (#15799)

---
 keyboards/{ => obosob}/arch_36/arch_36.c                      | 0
 keyboards/{ => obosob}/arch_36/arch_36.h                      | 0
 keyboards/{ => obosob}/arch_36/config.h                       | 0
 keyboards/{ => obosob}/arch_36/info.json                      | 0
 keyboards/{ => obosob}/arch_36/keymaps/default/keymap.c       | 0
 keyboards/{ => obosob}/arch_36/keymaps/obosob/config.h        | 0
 keyboards/{ => obosob}/arch_36/keymaps/obosob/keymap.c        | 0
 keyboards/{ => obosob}/arch_36/keymaps/obosob/readme.md       | 0
 keyboards/{ => obosob}/arch_36/keymaps/obosob/rules.mk        | 0
 keyboards/{ => obosob}/arch_36/readme.md                      | 4 ++--
 keyboards/{ => obosob}/arch_36/rules.mk                       | 0
 keyboards/{ => obosob}/steal_this_keyboard/config.h           | 0
 keyboards/{ => obosob}/steal_this_keyboard/info.json          | 0
 .../{ => obosob}/steal_this_keyboard/keymaps/default/config.h | 0
 .../{ => obosob}/steal_this_keyboard/keymaps/default/keymap.c | 0
 keyboards/{ => obosob}/steal_this_keyboard/readme.md          | 2 +-
 keyboards/{ => obosob}/steal_this_keyboard/rules.mk           | 0
 .../{ => obosob}/steal_this_keyboard/steal_this_keyboard.c    | 0
 .../{ => obosob}/steal_this_keyboard/steal_this_keyboard.h    | 0
 19 files changed, 3 insertions(+), 3 deletions(-)
 rename keyboards/{ => obosob}/arch_36/arch_36.c (100%)
 rename keyboards/{ => obosob}/arch_36/arch_36.h (100%)
 rename keyboards/{ => obosob}/arch_36/config.h (100%)
 rename keyboards/{ => obosob}/arch_36/info.json (100%)
 rename keyboards/{ => obosob}/arch_36/keymaps/default/keymap.c (100%)
 rename keyboards/{ => obosob}/arch_36/keymaps/obosob/config.h (100%)
 rename keyboards/{ => obosob}/arch_36/keymaps/obosob/keymap.c (100%)
 rename keyboards/{ => obosob}/arch_36/keymaps/obosob/readme.md (100%)
 rename keyboards/{ => obosob}/arch_36/keymaps/obosob/rules.mk (100%)
 rename keyboards/{ => obosob}/arch_36/readme.md (88%)
 rename keyboards/{ => obosob}/arch_36/rules.mk (100%)
 rename keyboards/{ => obosob}/steal_this_keyboard/config.h (100%)
 rename keyboards/{ => obosob}/steal_this_keyboard/info.json (100%)
 rename keyboards/{ => obosob}/steal_this_keyboard/keymaps/default/config.h (100%)
 rename keyboards/{ => obosob}/steal_this_keyboard/keymaps/default/keymap.c (100%)
 rename keyboards/{ => obosob}/steal_this_keyboard/readme.md (93%)
 rename keyboards/{ => obosob}/steal_this_keyboard/rules.mk (100%)
 rename keyboards/{ => obosob}/steal_this_keyboard/steal_this_keyboard.c (100%)
 rename keyboards/{ => obosob}/steal_this_keyboard/steal_this_keyboard.h (100%)

diff --git a/keyboards/arch_36/arch_36.c b/keyboards/obosob/arch_36/arch_36.c
similarity index 100%
rename from keyboards/arch_36/arch_36.c
rename to keyboards/obosob/arch_36/arch_36.c
diff --git a/keyboards/arch_36/arch_36.h b/keyboards/obosob/arch_36/arch_36.h
similarity index 100%
rename from keyboards/arch_36/arch_36.h
rename to keyboards/obosob/arch_36/arch_36.h
diff --git a/keyboards/arch_36/config.h b/keyboards/obosob/arch_36/config.h
similarity index 100%
rename from keyboards/arch_36/config.h
rename to keyboards/obosob/arch_36/config.h
diff --git a/keyboards/arch_36/info.json b/keyboards/obosob/arch_36/info.json
similarity index 100%
rename from keyboards/arch_36/info.json
rename to keyboards/obosob/arch_36/info.json
diff --git a/keyboards/arch_36/keymaps/default/keymap.c b/keyboards/obosob/arch_36/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/arch_36/keymaps/default/keymap.c
rename to keyboards/obosob/arch_36/keymaps/default/keymap.c
diff --git a/keyboards/arch_36/keymaps/obosob/config.h b/keyboards/obosob/arch_36/keymaps/obosob/config.h
similarity index 100%
rename from keyboards/arch_36/keymaps/obosob/config.h
rename to keyboards/obosob/arch_36/keymaps/obosob/config.h
diff --git a/keyboards/arch_36/keymaps/obosob/keymap.c b/keyboards/obosob/arch_36/keymaps/obosob/keymap.c
similarity index 100%
rename from keyboards/arch_36/keymaps/obosob/keymap.c
rename to keyboards/obosob/arch_36/keymaps/obosob/keymap.c
diff --git a/keyboards/arch_36/keymaps/obosob/readme.md b/keyboards/obosob/arch_36/keymaps/obosob/readme.md
similarity index 100%
rename from keyboards/arch_36/keymaps/obosob/readme.md
rename to keyboards/obosob/arch_36/keymaps/obosob/readme.md
diff --git a/keyboards/arch_36/keymaps/obosob/rules.mk b/keyboards/obosob/arch_36/keymaps/obosob/rules.mk
similarity index 100%
rename from keyboards/arch_36/keymaps/obosob/rules.mk
rename to keyboards/obosob/arch_36/keymaps/obosob/rules.mk
diff --git a/keyboards/arch_36/readme.md b/keyboards/obosob/arch_36/readme.md
similarity index 88%
rename from keyboards/arch_36/readme.md
rename to keyboards/obosob/arch_36/readme.md
index d0e16434ee..77c07a2a3b 100644
--- a/keyboards/arch_36/readme.md
+++ b/keyboards/obosob/arch_36/readme.md
@@ -7,10 +7,10 @@ An ergonomic 30% split keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make arch_36:default
+    make obosob/arch_36:default
 
 Example of flashing this keyboard:
 
-    make arch_36:default:flash
+    make obosob/arch_36:default:flash
 
 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).
diff --git a/keyboards/arch_36/rules.mk b/keyboards/obosob/arch_36/rules.mk
similarity index 100%
rename from keyboards/arch_36/rules.mk
rename to keyboards/obosob/arch_36/rules.mk
diff --git a/keyboards/steal_this_keyboard/config.h b/keyboards/obosob/steal_this_keyboard/config.h
similarity index 100%
rename from keyboards/steal_this_keyboard/config.h
rename to keyboards/obosob/steal_this_keyboard/config.h
diff --git a/keyboards/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/info.json
similarity index 100%
rename from keyboards/steal_this_keyboard/info.json
rename to keyboards/obosob/steal_this_keyboard/info.json
diff --git a/keyboards/steal_this_keyboard/keymaps/default/config.h b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
similarity index 100%
rename from keyboards/steal_this_keyboard/keymaps/default/config.h
rename to keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
diff --git a/keyboards/steal_this_keyboard/keymaps/default/keymap.c b/keyboards/obosob/steal_this_keyboard/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/steal_this_keyboard/keymaps/default/keymap.c
rename to keyboards/obosob/steal_this_keyboard/keymaps/default/keymap.c
diff --git a/keyboards/steal_this_keyboard/readme.md b/keyboards/obosob/steal_this_keyboard/readme.md
similarity index 93%
rename from keyboards/steal_this_keyboard/readme.md
rename to keyboards/obosob/steal_this_keyboard/readme.md
index 395487f7b3..55384a9234 100644
--- a/keyboards/steal_this_keyboard/readme.md
+++ b/keyboards/obosob/steal_this_keyboard/readme.md
@@ -6,6 +6,6 @@ A split 34 keys column staggered keyboard named and decorated after the System o
 
 Make examples for this keyboard (after setting up your build environment):
 
-    make steal_this_keyboard:default
+    make obosob/steal_this_keyboard: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).
diff --git a/keyboards/steal_this_keyboard/rules.mk b/keyboards/obosob/steal_this_keyboard/rules.mk
similarity index 100%
rename from keyboards/steal_this_keyboard/rules.mk
rename to keyboards/obosob/steal_this_keyboard/rules.mk
diff --git a/keyboards/steal_this_keyboard/steal_this_keyboard.c b/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.c
similarity index 100%
rename from keyboards/steal_this_keyboard/steal_this_keyboard.c
rename to keyboards/obosob/steal_this_keyboard/steal_this_keyboard.c
diff --git a/keyboards/steal_this_keyboard/steal_this_keyboard.h b/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.h
similarity index 100%
rename from keyboards/steal_this_keyboard/steal_this_keyboard.h
rename to keyboards/obosob/steal_this_keyboard/steal_this_keyboard.h

From 1df37114320b816fe318316bce705d772859c610 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Wed, 12 Jan 2022 02:07:14 +0800
Subject: [PATCH 259/867] [Keyboard] AMJ84 (#15742)

---
 keyboards/amjkeyboard/amj84/amj84.c           |   4 +
 keyboards/amjkeyboard/amj84/amj84.h           |  30 +++++
 keyboards/amjkeyboard/amj84/config.h          | 112 ++++++++++++++++++
 keyboards/amjkeyboard/amj84/info.json         |  97 +++++++++++++++
 .../amj84/keymaps/default/keymap.c            |  53 +++++++++
 .../amj84/keymaps/default/readme.md           |   1 +
 keyboards/amjkeyboard/amj84/readme.md         |  27 +++++
 keyboards/amjkeyboard/amj84/rules.mk          |  18 +++
 8 files changed, 342 insertions(+)
 create mode 100644 keyboards/amjkeyboard/amj84/amj84.c
 create mode 100644 keyboards/amjkeyboard/amj84/amj84.h
 create mode 100644 keyboards/amjkeyboard/amj84/config.h
 create mode 100644 keyboards/amjkeyboard/amj84/info.json
 create mode 100644 keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
 create mode 100644 keyboards/amjkeyboard/amj84/keymaps/default/readme.md
 create mode 100644 keyboards/amjkeyboard/amj84/readme.md
 create mode 100644 keyboards/amjkeyboard/amj84/rules.mk

diff --git a/keyboards/amjkeyboard/amj84/amj84.c b/keyboards/amjkeyboard/amj84/amj84.c
new file mode 100644
index 0000000000..49116c48c3
--- /dev/null
+++ b/keyboards/amjkeyboard/amj84/amj84.c
@@ -0,0 +1,4 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "amj84.h"
diff --git a/keyboards/amjkeyboard/amj84/amj84.h b/keyboards/amjkeyboard/amj84/amj84.h
new file mode 100644
index 0000000000..19718da8cd
--- /dev/null
+++ b/keyboards/amjkeyboard/amj84/amj84.h
@@ -0,0 +1,30 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
+    K50, K51, K52,           K55,           K58, K59, K5A, K5B, K5C, K5D, K5E \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
+    { K50, K51, K52,KC_NO,KC_NO,K55,KC_NO,KC_NO,K58,K59,K5A, K5B, K5C, K5D, K5E }  \
+}
diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h
new file mode 100644
index 0000000000..279d1268e8
--- /dev/null
+++ b/keyboards/amjkeyboard/amj84/config.h
@@ -0,0 +1,112 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x00D8 //A+M+J
+#define PRODUCT_ID   0x6068
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Han Chen
+#define PRODUCT      AMJ84
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+/*
+ * 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 { D0, F7, F6, F5, F4, D5 }
+#define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7, D6, B3, D1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B2
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+#define BACKLIGHT_PIN B6
+#define BACKLIGHT_LEVELS 3
+#define BACKLIGHT_BREATHING
+
+
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json
new file mode 100644
index 0000000000..484823fcca
--- /dev/null
+++ b/keyboards/amjkeyboard/amj84/info.json
@@ -0,0 +1,97 @@
+{
+    "keyboard_name": "AMJ84",
+    "maintainer": "peepeetee",
+    "url": "",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 7, "y": 0 },
+                { "x": 8, "y": 0 },
+                { "x": 9, "y": 0 },
+                { "x": 10, "y": 0 },
+                { "x": 11, "y": 0 },
+                { "x": 12, "y": 0 },
+                { "x": 13, "y": 0 },
+                { "x": 14, "y": 0 },
+                { "x": 15, "y": 0 },
+                { "x": 0, "y": 1 },
+                { "x": 1, "y": 1 },
+                { "x": 2, "y": 1 },
+                { "x": 3, "y": 1 },
+                { "x": 4, "y": 1 },
+                { "x": 5, "y": 1 },
+                { "x": 6, "y": 1 },
+                { "x": 7, "y": 1 },
+                { "x": 8, "y": 1 },
+                { "x": 9, "y": 1 },
+                { "x": 10, "y": 1 },
+                { "x": 11, "y": 1 },
+                { "x": 12, "y": 1 },
+                { "w": 2, "x": 13, "y": 1 },
+                { "x": 15, "y": 1 },
+                { "w": 1.5, "x": 0, "y": 2 },
+                { "x": 1.5, "y": 2 },
+                { "x": 2.5, "y": 2 },
+                { "x": 3.5, "y": 2 },
+                { "x": 4.5, "y": 2 },
+                { "x": 5.5, "y": 2 },
+                { "x": 6.5, "y": 2 },
+                { "x": 7.5, "y": 2 },
+                { "x": 8.5, "y": 2 },
+                { "x": 9.5, "y": 2 },
+                { "x": 10.5, "y": 2 },
+                { "x": 11.5, "y": 2 },
+                { "x": 12.5, "y": 2 },
+                { "w": 1.5, "x": 13.5, "y": 2 },
+                { "x": 15, "y": 2 },
+                { "w": 1.75, "x": 0, "y": 3 },
+                { "x": 1.75, "y": 3 },
+                { "x": 2.75, "y": 3 },
+                { "x": 3.75, "y": 3 },
+                { "x": 4.75, "y": 3 },
+                { "x": 5.75, "y": 3 },
+                { "x": 6.75, "y": 3 },
+                { "x": 7.75, "y": 3 },
+                { "x": 8.75, "y": 3 },
+                { "x": 9.75, "y": 3 },
+                { "x": 10.75, "y": 3 },
+                { "x": 11.75, "y": 3 },
+                { "x": 12.75, "y": 3 },
+                { "w": 1.25, "x": 13.75, "y": 3 },
+                { "x": 15, "y": 3 },
+                { "w": 2.25, "x": 0, "y": 4 },
+                { "x": 2.25, "y": 4 },
+                { "x": 3.25, "y": 4 },
+                { "x": 4.25, "y": 4 },
+                { "x": 5.25, "y": 4 },
+                { "x": 6.25, "y": 4 },
+                { "x": 7.25, "y": 4 },
+                { "x": 8.25, "y": 4 },
+                { "x": 9.25, "y": 4 },
+                { "x": 10.25, "y": 4 },
+                { "x": 11.25, "y": 4 },
+                { "w": 1.75, "x": 12.25, "y": 4 },
+                { "x": 14, "y": 4 },
+                { "x": 15, "y": 4 },
+                { "w": 1.25, "x": 0, "y": 5 },
+                { "w": 1.25, "x": 1.25, "y": 5 },
+                { "w": 1.25, "x": 2.5, "y": 5 },
+                { "w": 5.25, "x": 3.75, "y": 5 },
+                { "x": 9, "y": 5 },
+                { "x": 10, "y": 5 },
+                { "x": 11, "y": 5 },
+                { "x": 12, "y": 5 },
+                { "x": 13, "y": 5 },
+                { "x": 14, "y": 5 },
+                { "x": 15, "y": 5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
new file mode 100644
index 0000000000..11f8482352
--- /dev/null
+++ b/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    /* Keymap 0: Default Layer
+     * ,----------------------------------------------------------------.
+     * |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Home    |Del|
+     * |------------------------------------------------------------|---|
+     * |`  |  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp  |PgU|
+     * |------------------------------------------------------------|---|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \ |PgD|
+     * |------------------------------------------------------------|---|
+     * |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return   |Ins|
+     * |------------------------------------------------------------|---|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift  |Up |Fn0|
+     * |------------------------------------------------------------|---|
+     * |Ctrl|Win |Alt |       Space        |END|Alt |Ctrl|Left |Down|Rig|
+     * `----------------------------------------------------------------'
+     */
+    [0] = LAYOUT(
+        KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_HOME,KC_DEL,
+        KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSPC,KC_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_PGDN,
+        KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_NO,  KC_ENT, KC_INS,
+        KC_LSFT,KC_NO,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,KC_UP,  MO(1),
+        KC_LCTL,KC_LGUI,KC_LALT,          KC_SPC,           KC_END, KC_NO,  KC_RALT,KC_RCTL,KC_LEFT,KC_DOWN,KC_RIGHT),
+    /* Keymap 1: Fn Layer
+     * ,-----------------------------------------------------------.
+     * |  `| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete |
+     * |-----------------------------------------------------------|
+     * |     |   |Up |   |   |   |Cal|   |Ins|   |Psc|Slk|Pau|     |
+     * |-----------------------------------------------------------|
+     * |      |Lef|Dow|Rig|   |   |   |   |   |   |Hom|PgU|        |
+     * |-----------------------------------------------------------|
+     * |        |   |App|Fn1|Fn2|Fn3|VoD|VoU|Mut|End|PgD|      |   |
+     * |-----------------------------------------------------------|
+     * |    |    |    |                        |    |    |    |    |
+     * `-----------------------------------------------------------'
+     */
+    [1] = LAYOUT(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_UP,  KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_TRNS,KC_INS, KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,KC_TRNS,
+        BL_BRTG,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_TRNS,KC_TRNS,KC_TRNS,
+        BL_STEP,KC_NO,  KC_TRNS,KC_APP, KC_FN1, KC_FN2, KC_FN3, KC_VOLD,KC_VOLU,KC_MUTE,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_SLEP,KC_TRNS,KC_TRNS,          KC_TRNS,          KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS)
+
+};
diff --git a/keyboards/amjkeyboard/amj84/keymaps/default/readme.md b/keyboards/amjkeyboard/amj84/keymaps/default/readme.md
new file mode 100644
index 0000000000..9233dcbfdb
--- /dev/null
+++ b/keyboards/amjkeyboard/amj84/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for amj84
diff --git a/keyboards/amjkeyboard/amj84/readme.md b/keyboards/amjkeyboard/amj84/readme.md
new file mode 100644
index 0000000000..c0df110eb0
--- /dev/null
+++ b/keyboards/amjkeyboard/amj84/readme.md
@@ -0,0 +1,27 @@
+# amj84
+
+![amj84](https://i.imgur.com/oKAkyBW.jpeg)
+
+A 84 key keyboard by AMJ
+
+* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
+* Hardware Supported: AMJ84
+* Hardware Availability: no longer available
+
+Make example for this keyboard (after setting up your build environment):
+
+    make amjkeyboard/amj84:default
+
+Flashing example for this keyboard:
+
+    make amjkeyboard/amj84:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/amjkeyboard/amj84/rules.mk b/keyboards/amjkeyboard/amj84/rules.mk
new file mode 100644
index 0000000000..8649486da6
--- /dev/null
+++ b/keyboards/amjkeyboard/amj84/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 349ca4b7ff0c98baedbeb9096442231e2267c817 Mon Sep 17 00:00:00 2001
From: dlgoodr <dlg@dsrw.org>
Date: Tue, 11 Jan 2022 12:07:51 -0600
Subject: [PATCH 260/867] [Keyboard] handwire: 3dfoxc (#15739)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/handwired/3dfoxc/3dfoxc.c           |  17 +
 keyboards/handwired/3dfoxc/3dfoxc.h           |  38 ++
 keyboards/handwired/3dfoxc/config.h           |  45 +++
 keyboards/handwired/3dfoxc/info.json          | 364 ++++++++++++++++++
 .../handwired/3dfoxc/keymaps/default/keymap.c |  69 ++++
 .../3dfoxc/keymaps/default/readme.md          |   3 +
 .../handwired/3dfoxc/keymaps/dlg/config.h     |  19 +
 .../handwired/3dfoxc/keymaps/dlg/keymap.c     | 112 ++++++
 .../handwired/3dfoxc/keymaps/dlg/readme.md    |  73 ++++
 keyboards/handwired/3dfoxc/readme.md          |  42 ++
 keyboards/handwired/3dfoxc/rules.mk           |  18 +
 11 files changed, 800 insertions(+)
 create mode 100644 keyboards/handwired/3dfoxc/3dfoxc.c
 create mode 100644 keyboards/handwired/3dfoxc/3dfoxc.h
 create mode 100644 keyboards/handwired/3dfoxc/config.h
 create mode 100644 keyboards/handwired/3dfoxc/info.json
 create mode 100644 keyboards/handwired/3dfoxc/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/3dfoxc/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/3dfoxc/keymaps/dlg/config.h
 create mode 100644 keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c
 create mode 100755 keyboards/handwired/3dfoxc/keymaps/dlg/readme.md
 create mode 100644 keyboards/handwired/3dfoxc/readme.md
 create mode 100644 keyboards/handwired/3dfoxc/rules.mk

diff --git a/keyboards/handwired/3dfoxc/3dfoxc.c b/keyboards/handwired/3dfoxc/3dfoxc.c
new file mode 100644
index 0000000000..e83a32d295
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/3dfoxc.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 david l goodrich <dlg@dsrw.org>
+ *
+ * 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 "3dfoxc.h"
diff --git a/keyboards/handwired/3dfoxc/3dfoxc.h b/keyboards/handwired/3dfoxc/3dfoxc.h
new file mode 100644
index 0000000000..b632cff2ce
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/3dfoxc.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 david l goodrich <dlg@dsrw.org>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \
+    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \
+    K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
+    { XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \
+}
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/3dfoxc/config.h b/keyboards/handwired/3dfoxc/config.h
new file mode 100644
index 0000000000..ea73f91ba0
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/config.h
@@ -0,0 +1,45 @@
+/* Copyright 2022 david l goodrich <dlg@dsrw.org>
+ *
+ * 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    dlgoodr
+#define PRODUCT         3dfoxc
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * 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 { F0, F1, C7, D5, B7 }
+#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 }
+
+#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/3dfoxc/info.json b/keyboards/handwired/3dfoxc/info.json
new file mode 100644
index 0000000000..06e849bb11
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/info.json
@@ -0,0 +1,364 @@
+{
+    "keyboard_name": "3dfoxc",
+    "url": "",
+    "maintainer": "dlgoodr",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "label": "K00 (B0,B5)",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "K01 (B0,B6)",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "K02 (B0,B7)",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "K03 (B0,C0)",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "K04 (B0,C1)",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "K05 (B0,C2)",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "K06 (B0,C3)",
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "label": "K07 (B0,C4)",
+                    "x": 7,
+                    "y": 0
+                },
+                {
+                    "label": "K08 (B0,C5)",
+                    "x": 8,
+                    "y": 0
+                },
+                {
+                    "label": "K09 (B0,C6)",
+                    "x": 9,
+                    "y": 0
+                },
+                {
+                    "label": "K0A (B0,C7)",
+                    "x": 10,
+                    "y": 0
+                },
+                {
+                    "label": "K0B (B0,D0)",
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "label": "K0C (B0,D1)",
+                    "x": 12,
+                    "y": 0
+                },
+                {
+                    "label": "K0D (B0,D2)",
+                    "x": 13,
+                    "y": 0
+                },
+                {
+                    "label": "K0E (B0,D3)",
+                    "x": 14,
+                    "y": 0
+                },
+                {
+                    "label": "K0F (B0,D4)",
+                    "x": 15,
+                    "y": 0
+                },
+                {
+                    "label": "K10 (B1,B5)",
+                    "x": 0,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "label": "K12 (B1,B7)",
+                    "x": 1.5,
+                    "y": 1
+                },
+                {
+                    "label": "K13 (B1,C0)",
+                    "x": 2.5,
+                    "y": 1
+                },
+                {
+                    "label": "K14 (B1,C1)",
+                    "x": 3.5,
+                    "y": 1
+                },
+                {
+                    "label": "K15 (B1,C2)",
+                    "x": 4.5,
+                    "y": 1
+                },
+                {
+                    "label": "K16 (B1,C3)",
+                    "x": 5.5,
+                    "y": 1
+                },
+                {
+                    "label": "K17 (B1,C4)",
+                    "x": 6.5,
+                    "y": 1
+                },
+                {
+                    "label": "K18 (B1,C5)",
+                    "x": 7.5,
+                    "y": 1
+                },
+                {
+                    "label": "K19 (B1,C6)",
+                    "x": 8.5,
+                    "y": 1
+                },
+                {
+                    "label": "K1A (B1,C7)",
+                    "x": 9.5,
+                    "y": 1
+                },
+                {
+                    "label": "K1B (B1,D0)",
+                    "x": 10.5,
+                    "y": 1
+                },
+                {
+                    "label": "K1C (B1,D1)",
+                    "x": 11.5,
+                    "y": 1
+                },
+                {
+                    "label": "K1D (B1,D2)",
+                    "x": 12.5,
+                    "y": 1
+                },
+                {
+                    "label": "K1E (B1,D3)",
+                    "x": 13.5,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "label": "K1F (B1,D4)",
+                    "x": 15,
+                    "y": 1
+                },
+                {
+                    "label": "K20 (B2,B5)",
+                    "x": 0,
+                    "y": 2,
+                    "w": 1.75
+                },
+                {
+                    "label": "K22 (B2,B7)",
+                    "x": 1.75,
+                    "y": 2
+                },
+                {
+                    "label": "K23 (B2,C0)",
+                    "x": 2.75,
+                    "y": 2
+                },
+                {
+                    "label": "K24 (B2,C1)",
+                    "x": 3.75,
+                    "y": 2
+                },
+                {
+                    "label": "K25 (B2,C2)",
+                    "x": 4.75,
+                    "y": 2
+                },
+                {
+                    "label": "K26 (B2,C3)",
+                    "x": 5.75,
+                    "y": 2
+                },
+                {
+                    "label": "K27 (B2,C4)",
+                    "x": 6.75,
+                    "y": 2
+                },
+                {
+                    "label": "K28 (B2,C5)",
+                    "x": 7.75,
+                    "y": 2
+                },
+                {
+                    "label": "K29 (B2,C6)",
+                    "x": 8.75,
+                    "y": 2
+                },
+                {
+                    "label": "K2A (B2,C7)",
+                    "x": 9.75,
+                    "y": 2
+                },
+                {
+                    "label": "K2B (B2,D0)",
+                    "x": 10.75,
+                    "y": 2
+                },
+                {
+                    "label": "K2C (B2,D1)",
+                    "x": 11.75,
+                    "y": 2
+                },
+                {
+                    "label": "K2D (B2,D2)",
+                    "x": 12.75,
+                    "y": 2,
+                    "w": 2.25
+                },
+                {
+                    "label": "K2F (B2,D4)",
+                    "x": 15,
+                    "y": 2
+                },
+                {
+                    "label": "K31 (B3,B6)",
+                    "x": 0,
+                    "y": 3,
+                    "w": 2.25
+                },
+                {
+                    "label": "K32 (B3,B7)",
+                    "x": 2.25,
+                    "y": 3
+                },
+                {
+                    "label": "K33 (B3,C0)",
+                    "x": 3.25,
+                    "y": 3
+                },
+                {
+                    "label": "K34 (B3,C1)",
+                    "x": 4.25,
+                    "y": 3
+                },
+                {
+                    "label": "K35 (B3,C2)",
+                    "x": 5.25,
+                    "y": 3
+                },
+                {
+                    "label": "K36 (B3,C3)",
+                    "x": 6.25,
+                    "y": 3
+                },
+                {
+                    "label": "K37 (B3,C4)",
+                    "x": 7.25,
+                    "y": 3
+                },
+                {
+                    "label": "K38 (B3,C5)",
+                    "x": 8.25,
+                    "y": 3
+                },
+                {
+                    "label": "K39 (B3,C6)",
+                    "x": 9.25,
+                    "y": 3
+                },
+                {
+                    "label": "K3A (B3,C7)",
+                    "x": 10.25,
+                    "y": 3
+                },
+                {
+                    "label": "K3B (B3,D0)",
+                    "x": 11.25,
+                    "y": 3
+                },
+                {
+                    "label": "K3D (B3,D2)",
+                    "x": 12.25,
+                    "y": 3,
+                    "w": 1.75
+                },
+                {
+                    "label": "K3E (B3,D3)",
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "label": "K3F (B3,D4)",
+                    "x": 15,
+                    "y": 3
+                },
+                {
+                    "label": "K40 (B4,B5)",
+                    "x": 0,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "K41 (B4,B6)",
+                    "x": 1.25,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "K43 (B4,C0)",
+                    "x": 2.5,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "K46 (B4,C3)",
+                    "x": 3.75,
+                    "y": 4,
+                    "w": 6.25
+                },
+                {
+                    "label": "K4A (B4,C7)",
+                    "x": 10,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "K4B (B4,D0)",
+                    "x": 11.25,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "label": "K4D (B4,D2)",
+                    "x": 13,
+                    "y": 4
+                },
+                {
+                    "label": "K4E (B4,D3)",
+                    "x": 14,
+                    "y": 4
+                },
+                {
+                    "label": "K4F (B4,D4)",
+                    "x": 15,
+                    "y": 4
+                }
+            ]
+        }
+    },
+    "meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
\ No newline at end of file
diff --git a/keyboards/handwired/3dfoxc/keymaps/default/keymap.c b/keyboards/handwired/3dfoxc/keymaps/default/keymap.c
new file mode 100644
index 0000000000..aaed418709
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/keymaps/default/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2022 david l goodrich <dlg@dsrw.org>
+ *
+ * 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 custom_layers {
+    _BL,
+    _FL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* Keymap _BL: (Base Layer) Default Layer
+   * ,---------------------------------------------------------------.
+   * |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ |~` |???|
+   * |---------------------------------------------------------------|
+   * |Tab  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |Bkspc|Del|
+   * |---------------------------------------------------------------|
+   * |Ctrl  | A | S | D | F | G | H | J | K | L | ; | ' | Enter  |PUp|
+   * |---------------------------------------------------------------|
+   * |Shift   | Z | X | C | V | B | N | M | , | . | / |Shift |Up |PDn|
+   * |---------------------------------------------------------------|
+   * |Ctrl|Win |Alt |        Space            |Alt |Fn  ||Lt |Dn |Rt |
+   * `--------------------------------------------------''-----------'
+   */
+
+    [_BL] = LAYOUT(
+       KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_NO,
+       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_BSPC,     KC_DEL,
+       KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
+       KC_LSFT,               KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,     KC_UP,   KC_PGDN,
+       KC_LCTL,    KC_LGUI,    KC_LALT,                         KC_SPC,                          KC_LALT,    MO(_FL),       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+  /* Keymap _FL: Function Layer
+   * ,---------------------------------------------------------------.
+   * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|   |RST|   |
+   * |---------------------------------------------------------------|
+   * |     |   |   |   |   |   |   |   |   |   |PSc|   |   |Del  |Ins|
+   * |---------------------------------------------------------------|
+   * |      |   |   |   |   |   |   |   |   |   |   |   |        |Hme|
+   * |---------------------------------------------------------------|
+   * |        |   |   |   |   |   |   |MUT|V- |V+ |   |      |PUp|End|
+   * |---------------------------------------------------------------|
+   * |    |    |    |                         |    |    ||Hme|PDn|End|
+   * `--------------------------------------------------''-----------'
+   */
+    [_FL] = LAYOUT(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RESET,   _______,
+        _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, KC_DEL,      KC_INS,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME,
+        _______,               _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,     KC_PGUP, KC_END,
+        _______,    _______,    _______,                         _______,                         _______,    _______,       KC_HOME, KC_PGDN, KC_END
+    )
+};
+ 
\ No newline at end of file
diff --git a/keyboards/handwired/3dfoxc/keymaps/default/readme.md b/keyboards/handwired/3dfoxc/keymaps/default/readme.md
new file mode 100644
index 0000000000..26ced1cb91
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# 3dfoxc "Default" keymap
+
+Set up just like the [original whitefox](https://input.club/whitefox/), except the function layer is totally made up.
\ No newline at end of file
diff --git a/keyboards/handwired/3dfoxc/keymaps/dlg/config.h b/keyboards/handwired/3dfoxc/keymaps/dlg/config.h
new file mode 100644
index 0000000000..d824330b04
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/keymaps/dlg/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 david l goodrich <dlg@dsrw.org>
+ *
+ * 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 GRAVE_ESC_ALT_OVERRIDE
diff --git a/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c b/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c
new file mode 100644
index 0000000000..c4431acecc
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c
@@ -0,0 +1,112 @@
+/* Copyright 2022 david l goodrich <dlg@dsrw.org>
+ *
+ * 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 custom_layers {
+    _BL,
+    _FL,
+    _MAC,
+    _LA,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* Keymap _BL: (Base Layer) Default Layer
+   * ,---------------------------------------------------------------.
+   * |~` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Bks|???|Esc|
+   * |---------------------------------------------------------------|
+   * |Tab  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \  |Del|
+   * |---------------------------------------------------------------|
+   * |Ctrl  | A | S | D | F | G | H | J | K | L | ; | ' | Enter  |PUp|
+   * |---------------------------------------------------------------|
+   * |Shift   | Z | X | C | V | B | N | M | , | . | / |Shift |Up |PDn|
+   * |---------------------------------------------------------------|
+   * |Ctrl|Win |Alt |        Space            |Alt |Fn  ||Lt |Dn |Rt |
+   * `--------------------------------------------------''-----------'
+   */
+    [_BL] = LAYOUT(
+       KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, XXXXXXX, 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_LBRC, KC_RBRC, KC_BSLS,     KC_DEL,
+       KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
+       KC_LSFT,               KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,     KC_UP,   KC_PGDN,
+       KC_LCTL,    KC_LGUI,    LM(_LA, MOD_LALT),               KC_SPC,                          KC_LALT,    MO(_FL),       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+  /* Keymap _FL: Function Layer
+   * ,---------------------------------------------------------------.
+   * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del|RST|   |
+   * |---------------------------------------------------------------|
+   * |     |   |   |   |   |   |   |   |mac|   |PSc|Br-|Br+|     |Ins|
+   * |---------------------------------------------------------------|
+   * |      |   |   |   |   |   |Lt |Dn |Up |Rt |   |   |        |Hme|
+   * |---------------------------------------------------------------|
+   * |        |   |   |   |   |   |   |MUT|V- |V+ |   |      |PUp|End|
+   * |---------------------------------------------------------------|
+   * |    |    |    |                         |    |    ||Hme|PDn|End|
+   * `--------------------------------------------------''-----------'
+   */
+    [_FL] = LAYOUT(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  RESET,   _______,
+        _______,      _______, _______, _______, _______, _______, _______, _______, TG(_MAC),_______, KC_PSCR, KC_BRID, KC_BRIU, _______,     KC_INS,
+        _______,          _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,          KC_HOME,
+        _______,               _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,     KC_PGUP, KC_END,
+        _______,    _______,    _______,                         _______,                         _______,    _______,       KC_HOME, KC_PGDN, KC_END
+    ),
+
+   /* Keymap _MAC: Mac Layer
+   * ,---------------------------------------------------------------.
+   * |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+   * |---------------------------------------------------------------|
+   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
+   * |---------------------------------------------------------------|
+   * |      |   |   |   |   |   |   |   |   |   |   |   |        |   |
+   * |---------------------------------------------------------------|
+   * |        |   |   |   |   |   |   |   |   |   |   |      |   |   |
+   * |---------------------------------------------------------------|
+   * |Ctrl|Alt |Win |                         |Win |    ||   |   |   |
+   * `--------------------------------------------------''-----------'
+   */
+   [_MAC] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______,
+        KC_LCTL,    KC_LALT,    KC_LGUI,                         _______,                         KC_RGUI,    _______,       _______, _______, _______
+    ),
+
+  /* Keymap _LA: Left Alt Layer - LALT-4 maps to LALT-F4 so I can quit apps
+   * ,---------------------------------------------------------------.
+   * |   |   |   |   |F4 |   |   |   |   |   |   |   |   |   |   |   |
+   * |---------------------------------------------------------------|
+   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
+   * |---------------------------------------------------------------|
+   * |      |   |   |   |   |   |   |   |   |   |   |   |        |   |
+   * |---------------------------------------------------------------|
+   * |        |   |   |   |   |   |   |   |   |   |   |      |   |   |
+   * |---------------------------------------------------------------|
+   * |    |    |    |                         |    |    ||   |   |   |
+   * `--------------------------------------------------''-----------'
+   */
+    [_LA] = LAYOUT(
+        _______, _______, _______, _______, KC_F4,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______,
+        _______,    _______,    _______,                         _______,                         _______,    _______,       _______, _______, _______
+    )
+
+};
diff --git a/keyboards/handwired/3dfoxc/keymaps/dlg/readme.md b/keyboards/handwired/3dfoxc/keymaps/dlg/readme.md
new file mode 100755
index 0000000000..487086e572
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/keymaps/dlg/readme.md
@@ -0,0 +1,73 @@
+# dlg's layout
+
+Inspired heavily by [my tada68 layout](https://github.com/qmk/qmk_firmware/tree/master/keyboards/tada68/keymaps/dlg).
+
+Notable deviation from the default keymap includes correctly placing `KC_BSLS` and moving `KC_BSPC` up to the top row where it belongs. The additional key on the top-row is a NOOP while I think of something fun.  I also swapped `Esc` and `~` as in my tada68 layout.
+
+
+### Base Layer
+
+```
+,---------------------------------------------------------------.
+|~` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Bks|???|Esc|
+|---------------------------------------------------------------|
+|Tab  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \  |Del|
+|---------------------------------------------------------------|
+|Ctrl  | A | S | D | F | G | H | J | K | L | ; | ' | Enter  |PUp|
+|---------------------------------------------------------------|
+|Shift   | Z | X | C | V | B | N | M | , | . | / |Shift |Up |PDn|
+|---------------------------------------------------------------|
+|Ctrl|Win |Alt |        Space            |Alt |Fn  ||Lt |Dn |Rt |
+`--------------------------------------------------''-----------'
+```
+
+
+### Fn Layer
+
+```
+,---------------------------------------------------------------.
+|   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del|RST|   |
+|---------------------------------------------------------------|
+|     |   |   |   |   |   |   |   |mac|   |PSc|Br-|Br+|     |Ins|
+|---------------------------------------------------------------|
+|      |   |   |   |   |   |Lt |Dn |Up |Rt |   |   |        |Hme|
+|---------------------------------------------------------------|
+|        |   |   |   |   |   |   |MUT|V- |V+ |   |      |PUp|End|
+|---------------------------------------------------------------|
+|    |    |    |                         |    |    ||Hme|PDn|End|
+`--------------------------------------------------''-----------'
+```
+
+### Mac Layer
+
+```
+,---------------------------------------------------------------.
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+|---------------------------------------------------------------|
+|     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
+|---------------------------------------------------------------|
+|      |   |   |   |   |   |   |   |   |   |   |   |        |   |
+|---------------------------------------------------------------|
+|        |   |   |   |   |   |   |   |   |   |   |      |   |   |
+|---------------------------------------------------------------|
+|Ctrl|Alt |Win |                         |Win |    ||   |   |   |
+`--------------------------------------------------''-----------'
+```
+
+### `LALT` Layer
+
+Left Alt Layer - LALT-4 maps to LALT-F4 so I can quit apps
+
+```
+,---------------------------------------------------------------.
+|   |   |   |   |F4 |   |   |   |   |   |   |   |   |   |   |   |
+|---------------------------------------------------------------|
+|     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
+|---------------------------------------------------------------|
+|      |   |   |   |   |   |   |   |   |   |   |   |        |   |
+|---------------------------------------------------------------|
+|        |   |   |   |   |   |   |   |   |   |   |      |   |   |
+|---------------------------------------------------------------|
+|    |    |    |                         |    |    ||   |   |   |
+`--------------------------------------------------''-----------'
+```
diff --git a/keyboards/handwired/3dfoxc/readme.md b/keyboards/handwired/3dfoxc/readme.md
new file mode 100644
index 0000000000..3d6e33a5c1
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/readme.md
@@ -0,0 +1,42 @@
+# 3dfoxc
+
+![3dfoxc](https://cdn.thingiverse.com/assets/12/3a/3e/5f/47/64A223C2-57E8-4124-B6AB-3031A0BA7973.jpeg)
+
+A [3d-printed whitefox](https://www.thingiverse.com/thing:2952008) with an Elite-C microcontroller.
+
+This is a build of [matt3o's "How to Build a Custom Keyboard" guide](https://matt3o.com/book/), except that I have replaced the Teensy with an [Elite-C v4](https://keeb.io/products/elite-c-low-profile-version-usb-c-pro-micro-replacement-atmega32u4). Presumably you could replace it with anything compatible.  The USB-C port had to be enlarged with dremel, and the mount for the Teensy was ground off and replaced with everyone's favorite rapid modeling polymer ... hot glue.
+
+* Keyboard Maintainer: [david l goodrich](mailto:dlg@dsrw.org)
+* Hardware Supported: 
+   * [3d-printed whitefox](https://www.thingiverse.com/thing:2952008)
+   * Elite-C microcontroller 
+* Hardware Availability: [keebio](https://keeb.io/products/elite-c-low-profile-version-usb-c-pro-micro-replacement-atmega32u4), [1up](https://1upkeyboards.com/shop/controllers/elite-c-v4-controller/), [keyhive](https://keyhive.xyz/shop/elite-c), [splitkb](https://splitkb.com/products/elite-c-low-profile-rev4-microcontroller)
+
+## Wiring
+
+Badly, because I have never done this before. Build pics available upon request, I guess.
+
+![wiring diagram](https://user-images.githubusercontent.com/6492494/148123622-36cae91e-97f3-40f7-a6fc-4d59b1a3ef02.png)
+
+
+## Flashing
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/3dfoxc:default
+
+Flashing example for this keyboard (use the `dfu` target for the Elite-C!):
+
+    make handwired/3dfoxc:default:dfu
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+
diff --git a/keyboards/handwired/3dfoxc/rules.mk b/keyboards/handwired/3dfoxc/rules.mk
new file mode 100644
index 0000000000..168a617754
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 1fdc42155a19a415b2d574ccbf61aac45e6543aa Mon Sep 17 00:00:00 2001
From: PollyV1 <70621744+PollyV1@users.noreply.github.com>
Date: Wed, 12 Jan 2022 02:08:35 +0800
Subject: [PATCH 261/867] [Keyboard] Carpolly (#15778)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/carpolly/carpolly.c       | 20 +++++++
 keyboards/handwired/carpolly/carpolly.h       | 36 ++++++++++++
 keyboards/handwired/carpolly/config.h         | 49 +++++++++++++++++
 keyboards/handwired/carpolly/info.json        | 55 +++++++++++++++++++
 .../carpolly/keymaps/default/keymap.c         | 53 ++++++++++++++++++
 keyboards/handwired/carpolly/readme.md        | 30 ++++++++++
 keyboards/handwired/carpolly/rules.mk         | 22 ++++++++
 7 files changed, 265 insertions(+)
 create mode 100644 keyboards/handwired/carpolly/carpolly.c
 create mode 100644 keyboards/handwired/carpolly/carpolly.h
 create mode 100644 keyboards/handwired/carpolly/config.h
 create mode 100644 keyboards/handwired/carpolly/info.json
 create mode 100644 keyboards/handwired/carpolly/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/carpolly/readme.md
 create mode 100644 keyboards/handwired/carpolly/rules.mk

diff --git a/keyboards/handwired/carpolly/carpolly.c b/keyboards/handwired/carpolly/carpolly.c
new file mode 100644
index 0000000000..119dfa962b
--- /dev/null
+++ b/keyboards/handwired/carpolly/carpolly.c
@@ -0,0 +1,20 @@
+/* Copyright 2021 Paul Enrico N. Viola
+ *
+ * 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 "carpolly.h"
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/carpolly/carpolly.h b/keyboards/handwired/carpolly/carpolly.h
new file mode 100644
index 0000000000..ddcf98fcdb
--- /dev/null
+++ b/keyboards/handwired/carpolly/carpolly.h
@@ -0,0 +1,36 @@
+/* Copyright 2021 Paul Enrico N. Viola
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, \
+    K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
+    K30, K31, K32, K36, K3A, K3B, K3C  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, XXX }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
+    { K30, K31, K32, XXX, XXX, XXX, K36, XXX, XXX, XXX, K3A, K3B, K3C }, \
+}
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/carpolly/config.h b/keyboards/handwired/carpolly/config.h
new file mode 100644
index 0000000000..e0890cf7ac
--- /dev/null
+++ b/keyboards/handwired/carpolly/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2021 Paul Enrico N. Viola
+ *
+ * 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       0x6532
+#define PRODUCT_ID      0x0017
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    paul
+#define PRODUCT         Carpolly
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+/*
+ * 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 { B0, B1, B2, B3 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, B6, B5, B4, D7, D6, D4, D5, C7 }
+
+#define DIODE_DIRECTION COL2ROW
+
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/carpolly/info.json b/keyboards/handwired/carpolly/info.json
new file mode 100644
index 0000000000..7a7395e914
--- /dev/null
+++ b/keyboards/handwired/carpolly/info.json
@@ -0,0 +1,55 @@
+{
+    "keyboard_name": "Carpolly",
+    "url": "https://github.com/PollyV1",
+    "maintainer": "Paul Enrico N. Viola",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "K00 (B0,F0)", "x": 0, "y": 0 },
+                { "label": "K01 (B0,F1)", "x": 1, "y": 0 },
+                { "label": "K02 (B0,F4)", "x": 2, "y": 0 },
+                { "label": "K03 (B0,F5)", "x": 3, "y": 0 },
+                { "label": "K04 (B0,F6)", "x": 4, "y": 0 },
+                { "label": "K05 (B0,B6)", "x": 5, "y": 0 },
+                { "label": "K06 (B0,B5)", "x": 6, "y": 0 },
+                { "label": "K07 (B0,B4)", "x": 7, "y": 0 },
+                { "label": "K08 (B0,D7)", "x": 8, "y": 0 },
+                { "label": "K09 (B0,D6)", "x": 9, "y": 0 },
+                { "label": "K0A (B0,D4)", "x": 10, "y": 0 },
+                { "label": "K0B (B0,D5)", "x": 11, "y": 0, "w": 1.75 },
+                { "label": "K10 (B1,F0)", "x": 0, "y": 1, "w": 1.25 },
+                { "label": "K11 (B1,F1)", "x": 1.25, "y": 1 },
+                { "label": "K12 (B1,F4)", "x": 2.25, "y": 1 },
+                { "label": "K13 (B1,F5)", "x": 3.25, "y": 1 },
+                { "label": "K14 (B1,F6)", "x": 4.25, "y": 1 },
+                { "label": "K15 (B1,B6)", "x": 5.25, "y": 1 },
+                { "label": "K16 (B1,B5)", "x": 6.25, "y": 1 },
+                { "label": "K17 (B1,B4)", "x": 7.25, "y": 1 },
+                { "label": "K18 (B1,D7)", "x": 8.25, "y": 1 },
+                { "label": "K19 (B1,D6)", "x": 9.25, "y": 1 },
+                { "label": "K1A (B1,D4)", "x": 10.25, "y": 1 },
+                { "label": "K1C (B1,C7)", "x": 11.25, "y": 1, "w": 1.5 },
+                { "label": "K20 (B2,F0)", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "K22 (B2,F4)", "x": 1.75, "y": 2 },
+                { "label": "K23 (B2,F5)", "x": 2.75, "y": 2 },
+                { "label": "K24 (B2,F6)", "x": 3.75, "y": 2 },
+                { "label": "K25 (B2,B6)", "x": 4.75, "y": 2 },
+                { "label": "K26 (B2,B5)", "x": 5.75, "y": 2 },
+                { "label": "K27 (B2,B4)", "x": 6.75, "y": 2 },
+                { "label": "K28 (B2,D7)", "x": 7.75, "y": 2 },
+                { "label": "K29 (B2,D6)", "x": 8.75, "y": 2 },
+                { "label": "K2A (B2,D4)", "x": 9.75, "y": 2 },
+                { "label": "K2B (B2,D5)", "x": 10.75, "y": 2 },
+                { "label": "K2C (B2,C7)", "x": 11.75, "y": 2 },
+                { "label": "K30 (B3,F0)", "x": 0, "y": 3, "w": 1.25 },
+                { "label": "K31 (B3,F1)", "x": 1.25, "y": 3 },
+                { "label": "K32 (B3,F4)", "x": 2.25, "y": 3, "w": 1.25 },
+                { "label": "K36 (B3,B5)", "x": 3.5, "y": 3, "w": 6.25 },
+                { "label": "K3A (B3,D4)", "x": 9.75, "y": 3 },
+                { "label": "K3B (B3,D5)", "x": 10.75, "y": 3 },
+                { "label": "K3C (B3,C7)", "x": 11.75, "y": 3 }
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/handwired/carpolly/keymaps/default/keymap.c b/keyboards/handwired/carpolly/keymaps/default/keymap.c
new file mode 100644
index 0000000000..78eb95a77f
--- /dev/null
+++ b/keyboards/handwired/carpolly/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 Paul Enrico N. Vola
+ *
+ * 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
+
+#define LT3_TAB     LT(3, KC_TAB)
+#define LT2_LAL     LT(2, KC_LALT)
+#define LT1_TAB     LT(1, KC_LGUI)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, 
+        LT3_TAB, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_COLN, KC_ENT,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_SLSH, KC_UP,   MO(1),   
+        KC_LCTL, KC_LGUI,  LT2_LAL, KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT  
+    ),
+
+    [1] = LAYOUT(
+        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_CAPS, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_ENT,  
+        KC_LSFT, KC_MPLY, KC_VOLD, KC_VOLU, _______, _______, _______, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, _______, 
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_HOME, KC_PGDN, KC_PGUP  
+    ),
+
+    [2] = LAYOUT(
+        RESET,   _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_INS,  
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RSFT, _______, 
+        _______, _______, _______, _______, _______, KC_DEL,  KC_INS   
+    ),
+
+    [3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, KC_SPC,  _______, _______, _______  
+    ),
+
+};
diff --git a/keyboards/handwired/carpolly/readme.md b/keyboards/handwired/carpolly/readme.md
new file mode 100644
index 0000000000..e79bd543e6
--- /dev/null
+++ b/keyboards/handwired/carpolly/readme.md
@@ -0,0 +1,30 @@
+# carpolly
+
+![carpool](https://i.imgur.com/w691sNnh.jpg)
+
+* Keyboard Maintainer: Paul Enrico N. Viola (https://github.com/PollyV1)
+* Hardware Supported: Teensy 2 controller
+* Hardware Availability: [PollyV1] https://github.com/PollyV1/Carpolly
+
+carpolly - a handwired keyboard on a teensy 2 controller
+
+## Make 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/carpolly:default
+
+## Flashing
+
+Flashing example for this keyboard:
+
+    make handwired/carpolly:default:flash
+    
+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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the RESET button on the controller.
+* **Keycode in layout**: Longpress ALT + ESC
diff --git a/keyboards/handwired/carpolly/rules.mk b/keyboards/handwired/carpolly/rules.mk
new file mode 100644
index 0000000000..a7f3367d86
--- /dev/null
+++ b/keyboards/handwired/carpolly/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+# generated by KBFirmware JSON to QMK Parser
+# https://noroadsleft.github.io/kbf_qmk_converter/

From 1f618c8302cc5053c382436a2d1fb11082c99057 Mon Sep 17 00:00:00 2001
From: Will Winder <wwinder.unh@gmail.com>
Date: Tue, 11 Jan 2022 15:17:37 -0500
Subject: [PATCH 262/867] keyhive sofle rgb: fix configuration. (#15339)

* keyhive sofle rgb: fix configuration.

* Add Colemak-DH and cycle layer keycode.

* Fix indentation.

* Add PLACEHOLDER for better readability.

* Fix breaking changes.

* Just one colemak.

* PR Cleanup

* Use NO_PIN definition instead of C7
* Define animations individually
* Remove via json file and update documentation
* Reduce LED brightness, one of the animations caused a crash

* More PR feedback.

* Better credit.
* Disable NKRO.

* Cleanup RGB configuration.

* animations defined in keymap.

* Update keyboards/sofle/keyhive/readme.md

* PR Feedback.

* Update phrasing from template.

* Disable RGBLIGHT_ENABLE in keymap for better compatibility with default keymap.

* Set a default animation.

* Use default in keyboard readme.

* Update keyboards/sofle/keyhive/info.json

* Move via specific layout into via keymap.
---
 keyboards/sofle/keyhive/config.h              |  97 +++++----
 keyboards/sofle/keyhive/info.json             |   2 +-
 keyboards/sofle/keyhive/keyhive.c             |  71 -------
 keyboards/sofle/keyhive/keyhive.h             |  25 ++-
 keyboards/sofle/keyhive/readme.md             |  62 +++---
 keyboards/sofle/keyhive/rules.mk              |   2 +-
 keyboards/sofle/keymaps/keyhive_via/config.h  |  48 +++++
 keyboards/sofle/keymaps/keyhive_via/encoder.c |  49 +++++
 keyboards/sofle/keymaps/keyhive_via/keymap.c  | 191 ++++++++++++++++++
 keyboards/sofle/keymaps/keyhive_via/oled.c    |  85 ++++++++
 keyboards/sofle/keymaps/keyhive_via/readme.md |  49 +++++
 keyboards/sofle/keymaps/keyhive_via/rules.mk  |   2 +
 keyboards/sofle/keymaps/via/keymap.c          |   6 +-
 13 files changed, 513 insertions(+), 176 deletions(-)
 create mode 100644 keyboards/sofle/keymaps/keyhive_via/config.h
 create mode 100644 keyboards/sofle/keymaps/keyhive_via/encoder.c
 create mode 100644 keyboards/sofle/keymaps/keyhive_via/keymap.c
 create mode 100644 keyboards/sofle/keymaps/keyhive_via/oled.c
 create mode 100644 keyboards/sofle/keymaps/keyhive_via/readme.md
 create mode 100644 keyboards/sofle/keymaps/keyhive_via/rules.mk

diff --git a/keyboards/sofle/keyhive/config.h b/keyboards/sofle/keyhive/config.h
index 14303be411..c934754e65 100755
--- a/keyboards/sofle/keyhive/config.h
+++ b/keyboards/sofle/keyhive/config.h
@@ -20,43 +20,33 @@
 #include "config_common.h"
 
 // USB Device descriptor parameter
-
 #define VENDOR_ID    0xFC32
 #define PRODUCT_ID   0x1287
 #define DEVICE_VER   0x0002
 #define MANUFACTURER Keyhive
-#define PRODUCT      Sofle  // VIA version for this PCB is incorrect for the bottom row
+#define PRODUCT      Sofle
 
 // Key matrix size
 // Rows are doubled-up. Added extra column for rotary encoder VIA mapping.
 #define MATRIX_ROWS  10
-#define MATRIX_COLS  6
+#define MATRIX_COLS  7
 
 // wiring of each half
-#define MATRIX_ROW_PINS \
-    { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS \
-    { B6, B2, B3, B1, F7, F6 }
-#define MATRIX_ROW_PINS_RIGHT \
-    { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS_RIGHT \
-    { F6, F7, B1, B3, B2, B6 }
+#define MATRIX_ROW_PINS       { C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS       { B6, B2, B3, B1, F7, F6, NO_PIN } // A virtual pin is needed for the encoder key matrix in via.
+#define MATRIX_ROW_PINS_RIGHT { C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS_RIGHT { F6, F7, B1, B3, B2, B6, NO_PIN } // A virtual pin is needed for the encoder key matrix in via.
 
 #define DIODE_DIRECTION COL2ROW
 
 #define DEBOUNCE        5
 
 // Encoder support
-#define ENCODERS_PAD_A \
-    { F5 }
-#define ENCODERS_PAD_B \
-    { F4 }
-#define ENCODERS_PAD_A_RIGHT \
-    { F4 }
-#define ENCODERS_PAD_B_RIGHT \
-    { F5 }
-#define ENCODER_RESOLUTIONS \
-    { 4, 2 }  // Left encoder seems to have double-output issue but right does not.
+#define ENCODERS_PAD_A       { F5 }
+#define ENCODERS_PAD_B       { F4 }
+#define ENCODERS_PAD_A_RIGHT { F4 }
+#define ENCODERS_PAD_B_RIGHT { F5 }
+#define ENCODER_RESOLUTIONS  { 4, 2 }  // Left encoder seems to have double-output issue but right does not.
 
 #define TAP_CODE_DELAY  10
 
@@ -72,34 +62,41 @@
 #define SPLIT_TRANSPORT_MIRROR
 
 // Add RGB underglow
-#define RGB_DI_PIN D3
-#define RGBLED_NUM 74
-#define RGBLED_SPLIT \
-    { 37, 37 }
+// by defining in the keyboard, incompatible keymaps will fail to compile.
+#ifdef RGBLIGHT_ENABLE
+#    define RGB_DI_PIN D3
+#    define RGBLED_NUM 74
+#    define RGBLED_SPLIT {37,37}
+#    define RGBLIGHT_LIMIT_VAL 100 // LED Brightness, high power draw may exceed the USB limitations of 0.6A and cause a crash.
+#    define RGBLIGHT_HUE_STEP  10
+#    define RGBLIGHT_SAT_STEP  17
+#    define RGBLIGHT_VAL_STEP  17
+//#    define RGBLIGHT_LAYERS //Enable layer light indicators. Not required as updates are done in layer_state_set_user and led_update_user (+588).
+#    define RGBLIGHT_SLEEP //Turn off LEDs when computer sleeping (+72)
 
-#define RGBLIGHT_LIMIT_VAL 160  // Power draw may exceed 0.6A at max brightness with white colour.
-#define RGBLIGHT_LAYERS
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
-#define RGBLIGHT_SLEEP
+//RGB LED Conversion macro from physical array to electric array (+146). This results in better looking animated effects.
+//First section is the LED matrix, second section is the electrical wiring order, and the third section is the desired mapping
+#    define LED_LAYOUT( \
+  L00,  L01,  L02,  L03,  L04,  L05,          L08,  L09,  L010, L011, L012, L013, \
+  L10,      L12,      L14,                              L19,      L111,     L113, \
+  L20,  L21,  L22,  L23,  L24,  L25,          L28,  L29,  L210, L211, L212, L213, \
+  L30,  L31,  L32,  L33,  L34,  L35,          L38,  L39,  L310, L311, L312, L313, \
+  L40,      L42,      L44,                              L49,      L411,     L413, \
+  L50,  L51,  L52,  L53,  L54,  L55,          L58,  L59,  L510, L511, L512, L513, \
+          L62,  L63,  L64,  L65,  L66,      L67,  L68,  L69,  L610, L611,         \
+      L71,                  L76,                  L77,                  L712     )\
+  { \
+    L14,L12,L10,L40,L42,L44,L71,L76,L66,L65,L55,L35,L25,L05,L04,L24,L34,L54,L64,L63,L53,L33,L23,L03,L02,L22,L32,L52,L62,L51,L31,L21,L01,L00,L20,L30,L50,L19,L111,L113,L413,L411,L49,L712,L77,L67,L68,L58,L38,L28,L08,L09,L29,L39,L59,L69,L610,L510,L310,L210,L010,L011,L211,L311,L511,L611,L512,L312,L212,L012,L013,L213,L313,L513, \
+  }
+//RGB LED logical order map
+#    define RGBLIGHT_LED_MAP LED_LAYOUT( \
+  5,  6,  17, 18, 29, 30,     43, 44, 55, 56, 67, 68, \
+  4,    16,   28,                     45,   57,   69, \
+  3,  7,  15, 19, 27, 31,     42, 46, 54, 58, 66, 70, \
+  2,  8,  14, 20, 26, 32,     41, 47, 53, 59, 65, 71, \
+  1,    13,   25,                     48,   60,   72, \
+  0,  9,  12, 21, 24, 33,     40, 49, 52, 61, 64, 73, \
+      11, 22, 23, 34, 35,   38, 39, 50, 51, 62,       \
+      10,       36,              37,       63        )
 
-#define DRIVER_LED_TOTAL RGBLED_NUM
-#define RGB_MATRIX_SPLIT RGBLED_SPLIT
-
-#define RGB_MATRIX_KEYPRESSES           // reacts to keypresses
-#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-#define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
-// #   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 150  // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-
-#define RGB_MATRIX_STARTUP_MODE       RGB_MATRIX_GRADIENT_LEFT_RIGHT
-
-#define RGB_MATRIX_HUE_STEP           8
-#define RGB_MATRIX_SAT_STEP           8
-#define RGB_MATRIX_VAL_STEP           8
-#define RGB_MATRIX_SPD_STEP           10
+#endif
diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json
index e2cbf0c716..aafc6a8c8b 100644
--- a/keyboards/sofle/keyhive/info.json
+++ b/keyboards/sofle/keyhive/info.json
@@ -6,7 +6,7 @@
                 {"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5},
                 {"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5},
                 {"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5},
-                {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5},
+                {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25},  {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5},
                 {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12, "y":4.15}, {"x":13, "y":4.125}, {"x":14, "y":4.375}
             ]
         }
diff --git a/keyboards/sofle/keyhive/keyhive.c b/keyboards/sofle/keyhive/keyhive.c
index c7ad988761..72e2d583f1 100755
--- a/keyboards/sofle/keyhive/keyhive.c
+++ b/keyboards/sofle/keyhive/keyhive.c
@@ -17,74 +17,3 @@
  */
 
 #include "keyhive.h"
-#ifdef RGB_MATRIX_ENABLE
-// Physical Layout
-// Columns
-// 0  1  2  3  4  5  6  7  8  9  10 11 12 13
-//                                           ROWS
-// 12 13 22 23 32 33       33 32 23 22 13 12  0
-//    02    03    04       04    03    02
-// 11 14 21 24 31 34       34 31 24 21 14 11  1
-//                01       01
-// 10 15 20 25 30 35       35 30 25 20 15 10  2
-//
-// 09 16 19 26 29 36       36 29 26 19 16 09  3
-//
-//     08 17 18 27 28     28 27 18 17 08      4
-//    07    06    05       05    06    07
-
-// clang-format off
-
-led_config_t g_led_config = {
-    {
-        {  11,  12,  21,  22,  31,  32 },
-        {  10,  13,  20,  23,  30,  33 },
-        {  9,   14,  19,  24,  29,  34},
-        {  8,   15,  18,  25,  28,  35},
-        {  7,   16,  17,  26,  27,  NO_LED },
-        {  47,  48,  57,  58,  67,  68},
-        {  46,  49,  56,  59,  66,  69},
-        {  45,  50,  55,  60,  65,  70},
-        {  44,  51,  54,  61,  64,  71},
-        {  43,  52,  53,  62,  63,  NO_LED }
-    },
-    {
-       // Left side underglow
-        {96, 40}, {16, 20}, {48, 10}, {80, 18}, {88, 60}, {56, 57}, {24,60},
-        // Left side Matrix
-        {32, 57}, { 0, 48}, { 0, 36}, { 0, 24}, { 0, 12},
-        {16, 12}, {16, 24}, {16, 36}, {16, 48}, {48, 55},
-        {64, 57}, {32, 45}, {32, 33}, {32, 21}, {32,  9},
-        {48,  7}, {48, 19}, {48, 31}, {48, 43}, {80, 59},
-        {96, 64}, {64, 45}, {64, 33}, {64, 21}, {64,  9},
-        {80, 10}, {80, 22}, {80, 34}, {80, 47},
-
-
-        // Right side underglow
-        {128, 40}, {208, 20}, {176, 10}, {144, 18}, {136, 60}, {168, 57}, {200,60},
-        // Right side Matrix
-        {192, 57}, {224, 48}, {224, 36}, {224, 24}, {224, 12},
-        {208, 12}, {208, 24}, {208, 36}, {208, 48}, {176, 55},
-        {160, 57}, {192, 45}, {192, 33}, {192, 21}, {192,  9},
-        {176,  7}, {176, 19}, {176, 31}, {176, 43}, {144, 59},
-        {128, 64}, {160, 45}, {160, 33}, {160, 21}, {160,  9},
-        {144, 10}, {144, 22}, {144, 34}, {144, 47},
-    },
-    {
-        LED_FLAG_NONE, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_NONE, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW, LED_FLAG_UNDERGLOW,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
-        LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT
-    }
-};
-#endif
diff --git a/keyboards/sofle/keyhive/keyhive.h b/keyboards/sofle/keyhive/keyhive.h
index d8b21e16d7..c4fdd85219 100755
--- a/keyboards/sofle/keyhive/keyhive.h
+++ b/keyboards/sofle/keyhive/keyhive.h
@@ -21,27 +21,26 @@
 #include "quantum.h"
 
 // clang-format off
-// Extra keys are added for rotary encoder support in VIA
+
 #define LAYOUT( \
     LA1, LA2, LA3, LA4, LA5, LA6,           RA6, RA5, RA4, RA3, RA2, RA1, \
     LB1, LB2, LB3, LB4, LB5, LB6,           RB6, RB5, RB4, RB3, RB2, RB1, \
     LC1, LC2, LC3, LC4, LC5, LC6,           RC6, RC5, RC4, RC3, RC2, RC1, \
     LD1, LD2, LD3, LD4, LD5, LD6, LE1, RE6, RD6, RD5, RD4, RD3, RD2, RD1, \
-              LE2, LE3, LE4, LE5, LE6, RE5, RE4, RE3, RE2, RE1 			  \
+              LE2, LE3, LE4, LE5, LE6, RE5, RE4, RE3, RE2, RE1 \
     ) \
     { \
-        { LA1, LA2, LA3, LA4, LA5, LA6 }, \
-        { LB1, LB2, LB3, LB4, LB5, LB6 }, \
-        { LC1, LC2, LC3, LC4, LC5, LC6 }, \
-        { LD1, LD2, LD3, LD4, LD5, LD6 }, \
-        { LE1, LE2, LE3, LE4, LE5, LE6 }, \
-        { RA1, RA2, RA3, RA4, RA5, RA6 }, \
-        { RB1, RB2, RB3, RB4, RB5, RB6 }, \
-        { RC1, RC2, RC3, RC4, RC5, RC6 }, \
-        { RD1, RD2, RD3, RD4, RD5, RD6 }, \
-        { RE1, RE2, RE3, RE4, RE5, RE6 }  \
+        { LA1, LA2, LA3, LA4, LA5, LA6, KC_NO }, \
+        { LB1, LB2, LB3, LB4, LB5, LB6, KC_NO }, \
+        { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO }, \
+        { LD1, LD2, LD3, LD4, LD5, LD6, KC_NO }, \
+        { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO }, \
+        { RA1, RA2, RA3, RA4, RA5, RA6, KC_NO }, \
+        { RB1, RB2, RB3, RB4, RB5, RB6, KC_NO }, \
+        { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO }, \
+        { RD1, RD2, RD3, RD4, RD5, RD6, KC_NO }, \
+        { RE1, RE2, RE3, RE4, RE5, RE6, KC_NO }  \
     }
 
-
 //RGB LED Conversion macro from physical array to electric array (+146 to firmware size)
 // clang-format on
diff --git a/keyboards/sofle/keyhive/readme.md b/keyboards/sofle/keyhive/readme.md
index 43813b856a..3847dfe6bb 100755
--- a/keyboards/sofle/keyhive/readme.md
+++ b/keyboards/sofle/keyhive/readme.md
@@ -1,66 +1,54 @@
-# Sofle Keyboard
+# Keyhive Sofle Keyboard
 
 ![SofleKeyboard version 2.1 RGB Keyhive](https://i.imgur.com/WH9OoWuh.jpg)
 
 Sofle is 6×4+5 keys column-staggered split keyboard. Based on Lily58, Corne and Helix keyboards.
 
-For detailed instructions on using VIA and flashing, please refer to the sections further down the page!
-
 For details about the keyboard design, refer to Josef's blog: [Sofle Keyboard - a split keyboard based on Lily58 and Crkbd](https://josef-adamcik.cz/electronics/let-me-introduce-you-sofle-keyboard-split-keyboard-based-on-lily58.html)
 
 Build guide: [Keyhive Sofle RGB build guide](https://github.com/keyhive/build_guides/blob/master/docs/keyboards/sofle-rgb.md)
 
-* Keyboard Maintainer: [Solartempest]
-* Hardware Supported: SofleKeyboard V2.1 RGB PCB, ProMicro / Elite-C
+* Keyboard Maintainer: [Winder](https://github.com/winder)
+* Hardware Supported: Keyhive Sofle RGB, ProMicro / Elite-C
 * Hardware Availability: [Keyhive](https://keyhive.xyz/shop/sofle)
 
-# Custom Features:
+### Acknowledgements
 
-### OLED Features:
--   Includes Snakey keyboard pet! Slithers according to WPM, bites, and sticks its tongue out at you!
--	OLED displays current layer, lock key status, WPM, custom logo, and custom name.
--	OLED shuts off on idle and when computer is sleeping.
--	Includes working Luna keyboard pet.
--	Includes working Bongocat (disable RGB for sufficient space).
--   Includes stock OLED code as well.
+* Solartempest - the image on this page and most of the code is either copied directly or inspired by their fork. [Solartempest's fork.](https://github.com/solartempest/qmk_firmware/tree/master/keyboards/solartempest/sofle).
+* [Keyhive fork](https://github.com/keyhive/qmk_firmware) defined all of the board settings.
 
-### RGB Features:
--   Adds custom layer lighting with custom gradients for each layer.
--   RGB underglow support and remapped to physical locations (nicer gradients and effects).
--   Adds white caps lock, scroll lock, and num lock key indicators using the top row/underglow LEDs.
+# Supported Keymaps
 
-### Rotary Encoder and VIA Features:
--   Fully emappable left encoder controls volume up/down/mute. Right encoder PGUP/PGDOWN.
--   Allows for  live remapping of per-layer rotary encoder functions in VIA.
--   VIA support included by default.
--   This fixes the Keyhive left bottom row offset issue in VIA. You will need to import sofle.json in VIA.
--   Custom macro key in VIA for Super Alt Tab, which is fully compatible with rotary encoders.
--   Custom macro key in VIA for moving windows to other monitors in Windows, which is fully compatible with rotary encoders.
+The keyhive schematic has been slightly modified compared to the open source sofle and not all keymaps are compatible.
 
-### Tap and Other Features:
--   Push left-shift + backspace to delete whole words. Right-shift + backspace to delete whole words in the opposite direction.
--   Double tap layers to stay on a layer instead of momentary push.
--   Adds key combo functionality.
--   Symmetric modifiers (CMD/Super, Alt/Opt, Ctrl, Shift).
+* **default**: Basic functionality, no rgb, no VIA.
+* [keyhive_via](../keymaps/keyhive_via/readme.md) - Includes rgblighting and special support for remapping encoders with VIA.
+* **Other**: may work but backwards compatibility is not guaranteed or tested.
 
-## Using with VIA
-
--   After flashing, in VIA make sure to Import Keymap, which is "sofle VIA keymap.json". This will alow VIA to recognize the updated layout and custom functions. VIA will not auto-recognize the keyboard with this firmware because of the necessary customization.
--   Go to Save+Load to Load Saved Layout. You can import my own layout "sofle VIA layout.json" or just use the Keymap tab to assign your own keys. Having another keyboard connected can be handy for doing this step.
--   It is a good idea to Save Current Layout after you decide on your mapping.
+# VIA Support
+As of 1.3.1, the VIA tool does not support Keyhive/Sofle V2 out of the box.
+See [keyhive_via](../keymaps/keyhive_via/readme.md) for details about configuring and using VIA.
 
+# Compiling
 
 Make example for this keyboard (after setting up your build environment):
 
     make sofle/keyhive:default
 
-Flashing example for this keyboard:
+## Flashing
 
-    make sofle/keyhive:default:flash
+Flash using the correct command below (or use QMK Toolbox). These commands can be mixed if, for example, you have an Elite C on the left and a pro micro on the right.
 
-Press reset button on he keyboard when asked.
+Press reset button on the keyboard when asked.
 
 Disconnect the first half, connect the second one and repeat the process.
 
+    # for Pro Micro-based builds
+    make sofle/keyhive:default:avrdude-split-left
+    make sofle/keyhive:default:avrdude-split-right
+
+    # for Elite C or DFU bootloader builds
+    make sofle/keyhive:default:dfu-split-left
+    make sofle/keyhive:default:dfu-split-right
 
 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).
diff --git a/keyboards/sofle/keyhive/rules.mk b/keyboards/sofle/keyhive/rules.mk
index bba84040b8..1934963819 100755
--- a/keyboards/sofle/keyhive/rules.mk
+++ b/keyboards/sofle/keyhive/rules.mk
@@ -14,7 +14,7 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/keyhive_via/config.h b/keyboards/sofle/keymaps/keyhive_via/config.h
new file mode 100644
index 0000000000..0e2cb6d2c4
--- /dev/null
+++ b/keyboards/sofle/keymaps/keyhive_via/config.h
@@ -0,0 +1,48 @@
+ /* Copyright 2020 Josef Adamcik
+  * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang
+  *
+  * 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
+
+/* The way how "handedness" is decided (which half is which),
+see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness
+for more options.
+*/
+
+// More lighting options in quantum/rgblight/rgblight.h
+#ifdef RGBLIGHT_ENABLE
+#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+2
+
+// Disabling some of these is a good way to save flash space.
+#    define RGBLIGHT_EFFECT_ALTERNATING     // 108
+#    define RGBLIGHT_EFFECT_RGB_TEST        // 158
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD    // 160
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT // 168
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL   // 192
+#    define RGBLIGHT_EFFECT_BREATHING       // 348
+#    define RGBLIGHT_EFFECT_KNIGHT          // 336
+#    define RGBLIGHT_EFFECT_SNAKE           // 406
+#    define RGBLIGHT_EFFECT_CHRISTMAS       // 508
+/*
+#define RGBLIGHT_EFFECT_TWINKLE         // 1156
+*/
+#endif
+
+// Disabled to save space
+#define NO_ACTION_ONESHOT  // 332
+#define NO_ACTION_MACRO    // 0
+#define NO_ACTION_FUNCTION // 0
+#define DISABLE_LEADER     // 0
diff --git a/keyboards/sofle/keymaps/keyhive_via/encoder.c b/keyboards/sofle/keymaps/keyhive_via/encoder.c
new file mode 100644
index 0000000000..0883c4a48a
--- /dev/null
+++ b/keyboards/sofle/keymaps/keyhive_via/encoder.c
@@ -0,0 +1,49 @@
+ /* Copyright 2020 Josef Adamcik
+  * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang
+  *
+  * 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/>.
+  */
+
+//Setting up what encoder rotation does. If your encoder can be pressed as a button, that function can be set in Via.
+
+#ifdef ENCODER_ENABLE
+    static uint8_t encoder_state[2] = {0};
+    //Use these keymap positions to specify the encoder functions on rotate.
+    static keypos_t encoder_ccw[2] = {{6, 3}, {6, 8}};
+    static keypos_t encoder_cw[2] = {{6, 1}, {6, 6}};
+
+    void encoder_action_unregister(void) {
+        for (int index = 0; index < 2; ++index) {
+            if (encoder_state[index]) {
+                keyevent_t encoder_event = (keyevent_t){.key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, .time = (timer_read() | 1)};
+                encoder_state[index] = 0;
+                action_exec(encoder_event);
+            }
+        }
+    }
+
+    void encoder_action_register(uint8_t index, bool clockwise) {
+        keyevent_t encoder_event = (keyevent_t){.key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, .time = (timer_read() | 1)};
+        encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
+        action_exec(encoder_event);
+    }
+
+    void matrix_scan_user(void) { encoder_action_unregister(); }
+
+    bool encoder_update_user(uint8_t index, bool clockwise) {
+        encoder_action_register(index, clockwise);
+        return false;
+    };
+#endif
+
diff --git a/keyboards/sofle/keymaps/keyhive_via/keymap.c b/keyboards/sofle/keymaps/keyhive_via/keymap.c
new file mode 100644
index 0000000000..878638e1a2
--- /dev/null
+++ b/keyboards/sofle/keymaps/keyhive_via/keymap.c
@@ -0,0 +1,191 @@
+ /* Copyright 2020 Josef Adamcik
+  * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+
+#include QMK_KEYBOARD_H
+
+#include "oled.c"
+#include "encoder.c"
+
+// Base layer is the number of layers CYCLE selects from.
+#define BASE_LAYERS 2
+
+enum custom_keycodes {
+    PLACEHOLDER = SAFE_RANGE,  // can always be here (4 bytes)
+    CYCLE                      // cycle through first BASE_LAYERS (62 bytes)
+};
+
+enum custom_layers {
+    _QWERTY,
+    _COLEMAK,
+    _LOWER,
+    _RAISE
+};
+
+// Extra keys are added for rotary encoder support in VIA
+#define LAYOUT_via( \
+    LA1, LA2, LA3, LA4, LA5, LA6,           RA6, RA5, RA4, RA3, RA2, RA1, \
+    LB1, LB2, LB3, LB4, LB5, LB6, LB7, RB7, RB6, RB5, RB4, RB3, RB2, RB1, \
+    LC1, LC2, LC3, LC4, LC5, LC6, LE1, RE6, RC6, RC5, RC4, RC3, RC2, RC1, \
+    LD1, LD2, LD3, LD4, LD5, LD6, LD7, RD7, RD6, RD5, RD4, RD3, RD2, RD1, \
+              LE2, LE3, LE4, LE5, LE6, RE5, RE4, RE3, RE2, RE1 \
+    ) \
+    { \
+        { LA1, LA2, LA3, LA4, LA5, LA6, KC_NO }, \
+        { LB1, LB2, LB3, LB4, LB5, LB6, LB7   }, \
+        { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO }, \
+        { LD1, LD2, LD3, LD4, LD5, LD6, LD7   }, \
+        { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO }, \
+        { RA1, RA2, RA3, RA4, RA5, RA6, KC_NO }, \
+        { RB1, RB2, RB3, RB4, RB5, RB6, RB7   }, \
+        { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO }, \
+        { RD1, RD2, RD3, RD4, RD5, RD6, RD7   }, \
+        { RE1, RE2, RE3, RE4, RE5, RE6, KC_NO } \
+    }
+
+//Default keymap. This can be changed in Via. Use oled.c to change beavior that Via cannot change.
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+ * QWERTY
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |  `   |   1  |   2  |   3  |   4  |   5  |-------.  E  ,-------|   6  |   7  |   8  |   9  |   0  |  `   |
+ * |------+------+------+------+------+------| VolUp |< N >| Pg Up |------+------+------+------+------+------|
+ * | ESC  |   Q  |   W  |   E  |   R  |   T  |-------.  C  ,-------|   Y  |   U  |   I  |   O  |   P  | Bspc |
+ * |------+------+------+------+------+------| Mute  |< O >|       |------+------+------+------+------+------|
+ * | Tab  |   A  |   S  |   D  |   F  |   G  |-------.  D  ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------| VolDn |< E >| Pg Dn |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|  R  |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /      \      \-----------------------------------------'
+ *            | LGUI | LAlt | LCTR |LOWER | /Enter  /        \Space \  |RAISE | RCTR | RAlt | RGUI |
+ *            |      |      |      |      |/       /          \      \ |      |      |      |      |
+ *            `-----------------------------------'            '------''---------------------------'
+ */
+
+[_QWERTY] = LAYOUT_via(
+   KC_GRV, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                         KC_6    , KC_7   , KC_8   , KC_9   , KC_0   , KC_GRV ,
+   KC_ESC, KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_VOLU,       KC_PGUP, KC_Y    , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC,
+   KC_TAB, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_MUTE,       KC_NO  , KC_H    , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
+  KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_VOLD,       KC_PGDN, KC_N    , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+                  KC_LGUI,KC_LALT ,KC_LCTRL,MO(_LOWER), KC_ENT ,           KC_SPC  ,MO(_RAISE),KC_RCTRL, KC_RALT, KC_RGUI
+),
+/*
+ * COLEMAK - Vanilla
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |  `   |   1  |   2  |   3  |   4  |   5  |-------.  E  ,-------|   6  |   7  |   8  |   9  |   0  |  `   |
+ * |------+------+------+------+------+------| VolUp |< N >| Pg Up |------+------+------+------+------+------|
+ * | ESC  |   Q  |   W  |   F  |   P  |   G  |-------.  C  ,-------|   J  |   L  |   U  |   Y  |   ;  | Bspc |
+ * |------+------+------+------+------+------| Mute  |< O >|       |------+------+------+------+------+------|
+ * | TAB  |   A  |   R  |   S  |   T  |   D  |-------.  D  ,-------|   H  |   N  |   E  |   I  |   O  |  '   |
+ * |------+------+------+------+------+------| VolDn |< E >| Pg Dn |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|  R  |-------|   K  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /      \      \-----------------------------------------'
+ *            | LGUI | LAlt | LCTR |LOWER | /Enter  /        \Space \  |RAISE | RCTR | RAlt | RGUI |
+ *            |      |      |      |      |/       /          \      \ |      |      |      |      |
+ *            `-----------------------------------'            '------''---------------------------'
+ */
+/*
+[_COLEMAK] = LAYOUT_via(
+  KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                          KC_6    , KC_7   , KC_8   , KC_9   , KC_0   , KC_GRV ,
+  KC_ESC , KC_Q   , KC_W   , KC_F   , KC_P   , KC_G   , KC_VOLU,       KC_PGUP,  KC_J    , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSPC,
+  KC_TAB , KC_A   , KC_R   , KC_S   , KC_T   , KC_D   , KC_MUTE,       KC_NO  ,  KC_H    , KC_N   , KC_E   , KC_I   , KC_O   , KC_QUOT,
+  KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_VOLD,       KC_PGDN,  KC_N    , KC_M   , KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+                  KC_LGUI, KC_LALT,KC_LCTRL,MO(_LOWER), KC_ENT ,           KC_SPC ,MO(_RAISE),KC_RCTRL, KC_RALT, KC_RGUI
+),
+*/
+
+/*
+ * COLEMAK-DH
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |  `   |   1  |   2  |   3  |   4  |   5  |-------.  E  ,-------|   6  |   7  |   8  |   9  |   0  |  `   |
+ * |------+------+------+------+------+------| VolUp |< N >| Pg Up |------+------+------+------+------+------|
+ * | ESC  |   Q  |   W  |   F  |   P  |   B  |-------.  C  ,-------|   J  |   L  |   U  |   Y  |   ;  | Bspc |
+ * |------+------+------+------+------+------| Mute  |< O >|       |------+------+------+------+------+------|
+ * | TAB  |   A  |   R  |   S  |   T  |   G  |-------.  D  ,-------|   M  |   N  |   E  |   I  |   O  |  '   |
+ * |------+------+------+------+------+------| VolDn |< E >| Pg Dn |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   D  |   V  |-------|  R  |-------|   K  |   H  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /      \      \-----------------------------------------'
+ *            | LGUI | LAlt | LCTR |LOWER | /Enter  /        \Space \  |RAISE | RCTR | RAlt | RGUI |
+ *            |      |      |      |      |/       /          \      \ |      |      |      |      |
+ *            `-----------------------------------'            '------''---------------------------'
+ */
+[_COLEMAK] = LAYOUT_via(
+  KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                          KC_6    , KC_7   , KC_8   , KC_9   , KC_0   , KC_GRV ,
+  KC_ESC , KC_Q   , KC_W   , KC_F   , KC_P   , KC_B   , KC_VOLU,       KC_PGUP,  KC_J    , KC_L   , KC_U   , KC_Y   , KC_SCLN, KC_BSPC,
+  KC_TAB , KC_A   , KC_R   , KC_S   , KC_T   , KC_G   , KC_MUTE,       KC_NO  ,  KC_M    , KC_N   , KC_E   , KC_I   , KC_O   , KC_QUOT,
+  KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_D   , KC_V   , KC_VOLD,       KC_PGDN,  KC_K    , KC_H   , KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,
+                  KC_LGUI, KC_LALT,KC_LCTRL,MO(_LOWER), KC_ENT ,           KC_SPC ,MO(_RAISE),KC_RCTRL, KC_RALT, KC_RGUI
+),
+
+/* LOWER
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |  F1  |  F2  |  F3  |  F4  |  F5  |-------.  E  ,-------|  F6  |  F7  |  F8  |  F9  | F10  | F11  |
+ * |------+------+------+------+------+------|       |< N >|       |------+------+------+------+------+------|
+ * |  `   |   1  |   2  |   3  |   4  |   5  |-------.  C  ,-------|   6  |   7  |   8  |   9  |   0  | F12  |
+ * |------+------+------+------+------+------|       |< O >|       |------+------+------+------+------+------|
+ * | Tab  |   !  |   @  |   #  |   $  |   %  |-------.  D  ,-------|   ^  |   &  |   *  |   (  |   )  |   |  |
+ * |------+------+------+------+------+------|       |< E >|       |------+------+------+------+------+------|
+ * | Shift|  =   |  -   |  +   |   {  |   }  |-------|  R  |-------|   [  |   ]  |   ;  |   :  |   \  |      |
+ * `-----------------------------------------/       /      \      \-----------------------------------------'
+ *            | LGUI | LAlt | LCTR |LOWER | /Enter  /        \Space \  |RAISE | RCTR | RAlt | RGUI |
+ *            |      |      |      |      |/       /          \      \ |      |      |      |      |
+ *            `-----------------------------------'            '------''---------------------------'
+ */
+[_LOWER] = LAYOUT_via(
+  _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                         KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 ,
+  KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , _______,       _______, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_F12 ,
+  _______, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC, _______,       _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
+  _______, KC_EQL , KC_MINS, KC_PLUS, KC_LCBR, KC_RCBR, _______,       _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_COLN, KC_BSLS, _______,
+                  _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______
+),
+/* RAISE
+ * ,----------------------------------------.                      ,-----------------------------------------.
+ * |Cycle |      |      |      |      |      |-------.  E  ,-------|      |      |      |      |      |      |
+ * |------+------+------+------+------+------|       |< N >|       |------+------+------+------+------+------|
+ * | Esc  | Ins  | Pscr | Menu |      |      |-------.  C  ,-------|      |      |  Up  |      | DLine| Bspc |
+ * |------+------+------+------+------+------|       |< O >|       |------+------+------+------+------+------|
+ * | Tab  | LAt  | LCtl |LShift|      | Caps |-------.  D  ,-------|      | Left | Down | Rigth|  Del | Bspc |
+ * |------+------+------+------+------+------|       |< E >|       |------+------+------+------+------+------|
+ * |Shift | Undo |  Cut | Copy | Paste|      |-------|  R  |-------|      | LStr |      | LEnd |      | Shift|
+ * `-----------------------------------------/      /       \      \-----------------------------------------'
+ *            | LGUI | LAlt | LCTR |LOWER | /Enter /         \Space \  |RAISE | RCTR | RAlt | RGUI |
+ *            |      |      |      |      |/      /           \      \ |      |      |      |      |
+ *            `----------------------------------'             '------''---------------------------'
+ */
+[_RAISE] = LAYOUT_via(
+    CYCLE, _______, _______, _______, _______ , _______,                       _______, _______, _______, _______, _______, _______,
+  _______, KC_INS , KC_PSCR, KC_APP , XXXXXXX , XXXXXXX, _______,    _______,  KC_PGUP, _______, KC_UP  , _______, _______, KC_BSPC,
+  _______, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX , KC_CAPS, _______,    _______,  KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , KC_BSPC,
+  _______, KC_UNDO, KC_CUT , KC_COPY, KC_PASTE, XXXXXXX, _______,    _______,  XXXXXXX, _______, XXXXXXX, _______, XXXXXXX, _______,
+                   _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______
+)
+};
+
+// Custom keycode handling.
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    // handling this once instead of in each keycode uses less program memory.
+    if ((keycode >= SAFE_RANGE) && !(record->event.pressed)) {
+        return false;
+    }
+
+    switch (keycode) {
+        case CYCLE:
+            set_single_persistent_default_layer((1+get_highest_layer(default_layer_state)) % BASE_LAYERS);
+            break;
+    }
+
+    // this uses less memory than returning in each case.
+    return keycode < SAFE_RANGE;
+};
diff --git a/keyboards/sofle/keymaps/keyhive_via/oled.c b/keyboards/sofle/keymaps/keyhive_via/oled.c
new file mode 100644
index 0000000000..ef3a189f9d
--- /dev/null
+++ b/keyboards/sofle/keymaps/keyhive_via/oled.c
@@ -0,0 +1,85 @@
+ /* Copyright 2020 Josef Adamcik
+  * Modification for VIA support and RGB underglow by Jens Bonk-Wiltfang
+  *
+  * 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/>.
+  */
+
+//Sets up what the OLED screens display.
+
+#ifdef OLED_ENABLE
+
+static void render_logo(void) {
+    static const char PROGMEM qmk_logo[] = {
+        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0
+    };
+
+    oled_write_P(qmk_logo, false);
+}
+
+static void print_status_narrow(void) {
+    // Print current mode
+    oled_write_P(PSTR("\n\n"), false);
+
+    switch (get_highest_layer(default_layer_state)) {
+        case 0: // _QWERTY
+            oled_write_ln_P(PSTR("Qwrt\n"), false);
+            break;
+        case 1: // _COLEMAK
+            oled_write_ln_P(PSTR("Clmk\n"), false);
+            break;
+        default:
+            oled_write_P(PSTR("Mod"), false);
+            break;
+    }
+    oled_write_P(PSTR("\n\n"), false);
+    // Print current layer
+    oled_write_ln_P(PSTR("LAYER"), false);
+    switch (get_highest_layer(layer_state)) {
+        case 0: // _QWERTY
+        case 1: // _COLEMAK
+            oled_write_P(PSTR("Base\n"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("Lower"), false);
+            break;
+        case 3:
+            oled_write_P(PSTR("Raise"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Undef"), false);
+    }
+    oled_write_P(PSTR("\n\n"), false);
+    led_t led_usb_state = host_keyboard_led_state();
+    oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock);
+}
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    if (is_keyboard_master()) {
+        return OLED_ROTATION_270;
+    }
+    return rotation;
+}
+
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        print_status_narrow();
+    } else {
+        render_logo();
+    }
+    return false;
+}
+
+#endif
diff --git a/keyboards/sofle/keymaps/keyhive_via/readme.md b/keyboards/sofle/keymaps/keyhive_via/readme.md
new file mode 100644
index 0000000000..e7a2beebcf
--- /dev/null
+++ b/keyboards/sofle/keymaps/keyhive_via/readme.md
@@ -0,0 +1,49 @@
+# Only compatible with sofle/keyhive firmware which adds an extra column of keys for encoder mapping.
+
+![SofleKeyboard version 2.1 RGB Keyhive](https://i.imgur.com/Oa6spvZ.png)
+
+# Configuring VIA / Vial App
+
+This firmware will not auto-recognize until [PR #1060](https://github.com/the-via/keyboards/pull/1060) is accepted to the VIA keyboard database. For now you must install the new layout:
+
+1. Download [keyhive_sofle_rgb.json](https://raw.githubusercontent.com/the-via/keyboards/48372baae5ab451d752988121fa4f1dd47b2c1ce/src/sofle/keyhive_sofle_rgb.json).
+2. In the VIA app, select `File > Import Keymap` from the menu.
+3. Open the file you just downloaded.
+
+**You'll have to do this every time you use VIA or Vial until the PR is accepted.**
+
+# Using with VIA
+* The default layouts should be loaded automatically.
+* Layouts can be backed up in VIA in the SAVE+LOAD section.
+* It is a good idea to Save Current Layout after you decide on your mapping.
+
+# Custom Features:
+
+### Rotary Encoder and VIA Features:
+* Fully remappable. Left encoder controls volume up/down/mute. Right encoder PGUP/PGDOWN.
+* Allows for live remapping of per-layer rotary encoder functions in VIA.
+* VIA support with **keyhive_via** keymap.
+
+# Compiling
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sofle/keyhive:keyhive_via
+
+## Flashing
+
+Flash using the correct command below (or use QMK Toolbox). These commands can be mixed if, for example, you have an Elite C on the left and a pro micro on the right.
+
+Press reset button on the keyboard when asked.
+
+Disconnect the first half, connect the second one and repeat the process.
+
+    # for Pro Micro-based builds
+    make sofle/keyhive:keyhive_via:avrdude-split-left
+    make sofle/keyhive:keyhive_via:avrdude-split-right
+
+    # for Elite C or DFU bootloader builds
+    make sofle/keyhive:keyhive_via:dfu-split-left
+    make sofle/keyhive:keyhive_via:dfu-split-right
+
+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).
diff --git a/keyboards/sofle/keymaps/keyhive_via/rules.mk b/keyboards/sofle/keymaps/keyhive_via/rules.mk
new file mode 100644
index 0000000000..2875254096
--- /dev/null
+++ b/keyboards/sofle/keymaps/keyhive_via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+RGBLIGHT_ENABLE = yes
diff --git a/keyboards/sofle/keymaps/via/keymap.c b/keyboards/sofle/keymaps/via/keymap.c
index 2f917f42dc..b8bbe195fe 100644
--- a/keyboards/sofle/keymaps/via/keymap.c
+++ b/keyboards/sofle/keymaps/via/keymap.c
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------/       /     \      \-----------------------------------------'
  *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
  *            |      |      |      |      |/       /         \      \ |      |      |      |      |
- *            `----------------------------------'           '------''---------------------------'
+ *            `-----------------------------------'           '------''---------------------------'
  */
 
 [1] = LAYOUT(
@@ -96,8 +96,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Esc  | Ins  | Pscr | Menu |      |      |                    |      | PWrd |  Up  | NWrd | DLine| Bspc |
  * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
  * | Tab  | LAt  | LCtl |LShift|      | Caps |-------.    ,-------|      | Left | Down | Rigth|  Del | Bspc |
- * |------+------+------+------+------+------|  MUTE  |    |       |------+------+------+------+------+------|
- * |Shift | Undo |  Cut | Copy | Paste|      |-------|    |-------|      | LStr |      | LEnd |      | Shift|
+ * |------+------+------+------+------+------|  MUTE  |   |       |------+------+------+------+------+------|
+ * |Shift | Undo |  Cut | Copy | Paste|      |--------|   |-------|      | LStr |      | LEnd |      | Shift|
  * `-----------------------------------------/       /     \      \-----------------------------------------'
  *            | LGUI | LAlt | LCTR |LOWER | /Enter  /       \Space \  |RAISE | RCTR | RAlt | RGUI |
  *            |      |      |      |      |/       /         \      \ |      |      |      |      |

From 2842ab405212aa7edca05eccc8ba892cd6cf54a4 Mon Sep 17 00:00:00 2001
From: Alabastard-64 <96358682+Alabastard-64@users.noreply.github.com>
Date: Tue, 11 Jan 2022 15:33:13 -0700
Subject: [PATCH 263/867] Add PMW3389 optical sensor Support (Updated) (#15740)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 common_features.mk                 |   5 +-
 docs/feature_pointing_device.md    |  23 ++
 drivers/sensors/pmw3360.c          |   5 +-
 drivers/sensors/pmw3360.h          |  11 -
 drivers/sensors/pmw3389.c          | 296 +++++++++++++++
 drivers/sensors/pmw3389.h          |  76 ++++
 drivers/sensors/pmw3389_firmware.h | 560 +++++++++++++++--------------
 quantum/pointing_device.h          |   3 +
 quantum/pointing_device_drivers.c  |  36 ++
 9 files changed, 721 insertions(+), 294 deletions(-)
 create mode 100644 drivers/sensors/pmw3389.c
 create mode 100644 drivers/sensors/pmw3389.h

diff --git a/common_features.mk b/common_features.mk
index 5cde023d10..b13f9a45d2 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -109,7 +109,7 @@ ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/mousekey.c
 endif
 
-VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_pinnacle_i2c cirque_pinnacle_spi pmw3360 pimoroni_trackball custom
+VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_pinnacle_i2c cirque_pinnacle_spi pmw3360 pmw3389 pimoroni_trackball custom
 POINTING_DEVICE_DRIVER ?= custom
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     ifeq ($(filter $(POINTING_DEVICE_DRIVER),$(VALID_POINTING_DEVICE_DRIVER_TYPES)),)
@@ -144,6 +144,9 @@ ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
         else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pmw3360)
             OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
             QUANTUM_LIB_SRC += spi_master.c
+        else ifeq ($(strip $(POINTING_DEVICE_DRIVER)), pmw3389)
+            OPT_DEFS += -DSTM32_SPI -DHAL_USE_SPI=TRUE
+            QUANTUM_LIB_SRC += spi_master.c
         endif
     endif
 endif
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index ecf6d5c6d4..def592a61c 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -155,6 +155,29 @@ The PMW 3360 is an SPI driven optical sensor, that uses a built in IR LED for su
 
 The CPI range is 100-12000, in increments of 100. Defaults to 1600 CPI.
 
+### PMW 3389 Sensor
+
+To use the PMW 3389 sensor, add this to your `rules.mk`
+
+```make
+POINTING_DEVICE_DRIVER = pmw3389
+```
+
+The PMW 3389 is an SPI driven optical sensor, that uses a built in IR LED for surface tracking.
+
+| Setting                         | Description                                                                                | Default       |
+|---------------------------------|--------------------------------------------------------------------------------------------|---------------|
+|`PMW3389_CS_PIN`                 | (Required) Sets the Cable Select pin connected to the sensor.                              | _not defined_ |
+|`PMW3389_CLOCK_SPEED`            | (Optional) Sets the clock speed that the sensor runs at.                                   | `2000000`     |
+|`PMW3389_SPI_LSBFIRST`           | (Optional) Sets the Least/Most Significant Byte First setting for SPI.                     | `false`       |
+|`PMW3389_SPI_MODE`               | (Optional) Sets the SPI Mode for the sensor.                                               | `3`           |
+|`PMW3389_SPI_DIVISOR`            | (Optional) Sets the SPI Divisor used for SPI communication.                                | _varies_      |
+|`PMW3389_LIFTOFF_DISTANCE`       | (Optional) Sets the lift off distance at run time                                          | `0x02`        |
+|`ROTATIONAL_TRANSFORM_ANGLE`     | (Optional) Allows for the sensor data to be rotated +/- 30 degrees directly in the sensor. | `0`           |
+|`PMW3389_LEGACY_FIRMWARE_UPLOAD` | (Optional) Switches to older, manual upload of firmware, for compatibility.                | _not defined_ |
+
+The CPI range is 50-16000, in increments of 50. Defaults to 2000 CPI.
+
 
 ### Custom Driver
 
diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index 4712f6015c..0dac600cc2 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -21,7 +21,7 @@
 #include "wait.h"
 #include "debug.h"
 #include "print.h"
-#include PMW3360_FIRMWARE_H
+#include "pmw3360_firmware.h"
 
 // Registers
 // clang-format off
@@ -79,9 +79,6 @@
 // clang-format on
 
 // limits to 0--119, resulting in a CPI range of 100 -- 12000 (as only steps of 100 are possible).
-// Note that for the PMW3389DM chip, the step size is 50 and supported range is
-// up to 16000. The datasheet does not indicate the minimum CPI though, neither
-// whether this uses 2 bytes (as 16000/50 == 320)
 #ifndef MAX_CPI
 #    define MAX_CPI 0x77
 #endif
diff --git a/drivers/sensors/pmw3360.h b/drivers/sensors/pmw3360.h
index b46fc9056e..4e17aa0c46 100644
--- a/drivers/sensors/pmw3360.h
+++ b/drivers/sensors/pmw3360.h
@@ -56,17 +56,6 @@
 #    error "No chip select pin defined -- missing PMW3360_CS_PIN"
 #endif
 
-/*
-The pmw33660 and pmw3389 use the same registers and timing and such.
-The only differences between the two is the firmware used, and the
-range for the DPI. So add a semi-secret hack to allow use of the
-pmw3389's firmware blob.  Also, can set the max cpi range too.
-This should work for the 3390 and 3391 too, in theory.
-*/
-#ifndef PMW3360_FIRMWARE_H
-#    define PMW3360_FIRMWARE_H "pmw3360_firmware.h"
-#endif
-
 typedef struct {
     int8_t  motion;
     bool    isMotion;     // True if a motion is detected.
diff --git a/drivers/sensors/pmw3389.c b/drivers/sensors/pmw3389.c
new file mode 100644
index 0000000000..11056bb89e
--- /dev/null
+++ b/drivers/sensors/pmw3389.c
@@ -0,0 +1,296 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ * Copyright 2020 Ploopy Corporation
+ *
+ * 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 "spi_master.h"
+#include "pmw3389.h"
+#include "wait.h"
+#include "debug.h"
+#include "print.h"
+#include "pmw3389_firmware.h"
+
+// Registers
+// clang-format off
+#define REG_Product_ID                 0x00
+#define REG_Revision_ID                0x01
+#define REG_Motion                     0x02
+#define REG_Delta_X_L                  0x03
+#define REG_Delta_X_H                  0x04
+#define REG_Delta_Y_L                  0x05
+#define REG_Delta_Y_H                  0x06
+#define REG_SQUAL                      0x07
+#define REG_RawData_Sum                0x08
+#define REG_Maximum_RawData            0x09
+#define REG_Minimum_RawData            0x0a
+#define REG_Shutter_Lower              0x0b
+#define REG_Shutter_Upper              0x0c
+#define REG_Ripple_Control             0x0d
+#define REG_Resolution_L               0x0e
+#define REG_Resolution_H               0x0f
+#define REG_Config2                    0x10
+#define REG_Angle_Tune                 0x11
+#define REG_Frame_Capture              0x12
+#define REG_SROM_Enable                0x13
+#define REG_Run_Downshift              0x14
+#define REG_Rest1_Rate_Lower           0x15
+#define REG_Rest1_Rate_Upper           0x16
+#define REG_Rest1_Downshift            0x17
+#define REG_Rest2_Rate_Lower           0x18
+#define REG_Rest2_Rate_Upper           0x19
+#define REG_Rest2_Downshift            0x1a
+#define REG_Rest3_Rate_Lower           0x1b
+#define REG_Rest3_Rate_Upper           0x1c
+#define REG_Observation                0x24
+#define REG_Data_Out_Lower             0x25
+#define REG_Data_Out_Upper             0x26
+#define REG_SROM_ID                    0x2a
+#define REG_Min_SQ_Run                 0x2b
+#define REG_RawData_Threshold          0x2c
+#define REG_Control2                   0x2d
+#define REG_Config5_L                  0x2e
+#define REG_Config5_H                  0x2f
+#define REG_Power_Up_Reset             0X3a
+#define REG_Shutdown                   0x3b
+#define REG_Inverse_Product_ID         0x3f
+#define REG_LiftCutoff_Cal3            0x41
+#define REG_Angle_Snap                 0x42
+#define REG_LiftCutoff_Cal1            0x4a
+#define REG_Motion_Burst               0x50
+#define REG_SROM_Load_Burst            0x62
+#define REG_Lift_Config                0x63
+#define REG_RawData_Burst              0x64
+#define REG_LiftCutoff_Cal2            0x65
+#define REG_LiftCutoff_Cal_Timeout     0x71
+#define REG_LiftCutoff_Cal_Min_Length  0x72
+#define REG_PWM_Period_Cnt             0x73
+#define REG_PWM_Width_Cnt              0x74
+
+#define CPI_STEP       50
+// clang-format on
+
+// limits to 0--319, resulting in a CPI range of 50 -- 16000 (as only steps of 50 are possible).
+#ifndef MAX_CPI
+#    define MAX_CPI 0x013f
+#endif
+
+bool _inBurst = false;
+
+#ifdef CONSOLE_ENABLE
+void print_byte(uint8_t byte) { dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0')); }
+#endif
+#define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
+
+bool pmw3389_spi_start(void) {
+    bool status = spi_start(PMW3389_CS_PIN, PMW3389_SPI_LSBFIRST, PMW3389_SPI_MODE, PMW3389_SPI_DIVISOR);
+    // tNCS-SCLK, 120ns
+    wait_us(1);
+    return status;
+}
+
+spi_status_t pmw3389_write(uint8_t reg_addr, uint8_t data) {
+    pmw3389_spi_start();
+
+    if (reg_addr != REG_Motion_Burst) {
+        _inBurst = false;
+    }
+
+    // send address of the register, with MSBit = 1 to indicate it's a write
+    spi_status_t status = spi_write(reg_addr | 0x80);
+    status              = spi_write(data);
+
+    // tSCLK-NCS for write operation is 35 us
+    wait_us(35);
+    spi_stop();
+
+    // tSWW/tSWR (=180us) minus tSCLK-NCS. Could be shortened, but is looks like a safe lower bound
+    wait_us(145);
+    return status;
+}
+
+uint8_t pmw3389_read(uint8_t reg_addr) {
+    pmw3389_spi_start();
+    // send adress of the register, with MSBit = 0 to indicate it's a read
+    spi_write(reg_addr & 0x7f);
+    // tSRAD (=160us)
+    wait_us(160);
+    uint8_t data = spi_read();
+
+    // tSCLK-NCS, 120ns
+    wait_us(1);
+    spi_stop();
+
+    //  tSRW/tSRR (=20us) minus tSCLK-NCS
+    wait_us(19);
+    return data;
+}
+
+bool pmw3389_init(void) {
+    setPinOutput(PMW3389_CS_PIN);
+
+    spi_init();
+    _inBurst = false;
+
+    spi_stop();
+    pmw3389_spi_start();
+    spi_stop();
+
+    pmw3389_write(REG_Shutdown, 0xb6);  // Shutdown first
+    wait_ms(300);
+
+    pmw3389_spi_start();
+    wait_us(40);
+    spi_stop();
+    wait_us(40);
+
+    // power up, need to first drive NCS high then low, see above.
+    pmw3389_write(REG_Power_Up_Reset, 0x5a);
+    wait_ms(50);
+
+    // read registers and discard
+    pmw3389_read(REG_Motion);
+    pmw3389_read(REG_Delta_X_L);
+    pmw3389_read(REG_Delta_X_H);
+    pmw3389_read(REG_Delta_Y_L);
+    pmw3389_read(REG_Delta_Y_H);
+
+    pmw3389_upload_firmware();
+
+    spi_stop();
+
+    wait_ms(10);
+    pmw3389_set_cpi(PMW3389_CPI);
+
+    wait_ms(1);
+
+    pmw3389_write(REG_Config2, 0x00);
+
+    pmw3389_write(REG_Angle_Tune, constrain(ROTATIONAL_TRANSFORM_ANGLE, -127, 127));
+
+    pmw3389_write(REG_Lift_Config, PMW3389_LIFTOFF_DISTANCE);
+
+    bool init_success = pmw3389_check_signature();
+#ifdef CONSOLE_ENABLE
+    if (init_success) {
+        dprintf("pmw3389 signature verified");
+    } else {
+        dprintf("pmw3389 signature verification failed!");
+    }
+#endif
+
+    writePinLow(PMW3389_CS_PIN);
+
+    return init_success;
+}
+
+void pmw3389_upload_firmware(void) {
+    // Datasheet claims we need to disable REST mode first, but during startup
+    // it's already disabled and we're not turning it on ...
+    // pmw3389_write(REG_Config2, 0x00);  // disable REST mode
+    pmw3389_write(REG_SROM_Enable, 0x1d);
+
+    wait_ms(10);
+
+    pmw3389_write(REG_SROM_Enable, 0x18);
+
+    pmw3389_spi_start();
+    spi_write(REG_SROM_Load_Burst | 0x80);
+    wait_us(15);
+
+#ifdef PMW3389_LEGACY_FIRMWARE_UPLOAD
+    unsigned char c;
+    for (int i = 0; i < FIRMWARE_LENGTH; i++) {
+        c = (unsigned char)pgm_read_byte(firmware_data + i);
+        spi_write(c);
+        wait_us(15);
+    }
+#else
+    spi_transmit(firmware_data, sizeof(firmware_data));
+#endif
+    wait_us(200);
+
+    pmw3389_read(REG_SROM_ID);
+    pmw3389_write(REG_Config2, 0x00);
+}
+
+bool pmw3389_check_signature(void) {
+    uint8_t pid      = pmw3389_read(REG_Product_ID);
+    uint8_t iv_pid   = pmw3389_read(REG_Inverse_Product_ID);
+    uint8_t SROM_ver = pmw3389_read(REG_SROM_ID);
+    return (pid == firmware_signature[0] && iv_pid == firmware_signature[1] && SROM_ver == firmware_signature[2]);  // signature for SROM 0x04
+}
+
+uint16_t pmw3389_get_cpi(void) {
+    uint16_t cpival = (pmw3389_read(REG_Resolution_H) << 8) | pmw3389_read(REG_Resolution_L);
+    return (uint16_t)((cpival + 1) & 0xffff) * CPI_STEP;
+}
+
+void pmw3389_set_cpi(uint16_t cpi) {
+    uint16_t cpival = constrain((cpi / CPI_STEP) - 1, 0, MAX_CPI);
+    // Sets upper byte first for more consistent setting of cpi
+    pmw3389_write(REG_Resolution_H, (cpival >> 8) & 0xff);
+    pmw3389_write(REG_Resolution_L, cpival & 0xff);
+}
+
+report_pmw3389_t pmw3389_read_burst(void) {
+    report_pmw3389_t report = {0};
+
+    if (!_inBurst) {
+#ifdef CONSOLE_ENABLE
+        dprintf("burst on");
+#endif
+        pmw3389_write(REG_Motion_Burst, 0x00);
+        _inBurst = true;
+    }
+
+    pmw3389_spi_start();
+    spi_write(REG_Motion_Burst);
+    wait_us(35);  // waits for tSRAD_MOTBR
+
+    report.motion = spi_read();
+    spi_read();  // skip Observation
+    // delta registers
+    report.dx  = spi_read();
+    report.mdx = spi_read();
+    report.dy  = spi_read();
+    report.mdy = spi_read();
+
+    if (report.motion & 0b111) {  // panic recovery, sometimes burst mode works weird.
+        _inBurst = false;
+    }
+
+    spi_stop();
+
+#ifdef CONSOLE_ENABLE
+    if (debug_mouse) {
+        print_byte(report.motion);
+        print_byte(report.dx);
+        print_byte(report.mdx);
+        print_byte(report.dy);
+        print_byte(report.mdy);
+        dprintf("\n");
+    }
+#endif
+
+    report.isMotion    = (report.motion & 0x80) != 0;
+    report.isOnSurface = (report.motion & 0x08) == 0;
+    report.dx |= (report.mdx << 8);
+    report.dx = report.dx * -1;
+    report.dy |= (report.mdy << 8);
+    report.dy = report.dy * -1;
+
+    return report;
+}
diff --git a/drivers/sensors/pmw3389.h b/drivers/sensors/pmw3389.h
new file mode 100644
index 0000000000..a7c95e6076
--- /dev/null
+++ b/drivers/sensors/pmw3389.h
@@ -0,0 +1,76 @@
+/* Copyright 2021 Alabastard (@Alabastard-64)
+ * Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ * Copyright 2020 Ploopy Corporation
+ *
+ * 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 <stdint.h>
+
+#ifndef PMW3389_CPI
+#    define PMW3389_CPI 2000
+#endif
+
+#ifndef PMW3389_CLOCK_SPEED
+#    define PMW3389_CLOCK_SPEED 2000000
+#endif
+
+#ifndef PMW3389_SPI_LSBFIRST
+#    define PMW3389_SPI_LSBFIRST false
+#endif
+
+#ifndef PMW3389_SPI_MODE
+#    define PMW3389_SPI_MODE 3
+#endif
+
+#ifndef PMW3389_SPI_DIVISOR
+#    ifdef __AVR__
+#        define PMW3389_SPI_DIVISOR (F_CPU / PMW3389_CLOCK_SPEED)
+#    else
+#        define PMW3389_SPI_DIVISOR 64
+#    endif
+#endif
+
+#ifndef PMW3389_LIFTOFF_DISTANCE
+#    define PMW3389_LIFTOFF_DISTANCE 0x02
+#endif
+
+#ifndef ROTATIONAL_TRANSFORM_ANGLE
+#    define ROTATIONAL_TRANSFORM_ANGLE 0x00
+#endif
+
+#ifndef PMW3389_CS_PIN
+#    error "No chip select pin defined -- missing PMW3389_CS_PIN"
+#endif
+
+typedef struct {
+    int8_t  motion;
+    bool    isMotion;     // True if a motion is detected.
+    bool    isOnSurface;  // True when a chip is on a surface
+    int16_t dx;           // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
+    int8_t  mdx;
+    int16_t dy;  // displacement on y directions.
+    int8_t  mdy;
+} report_pmw3389_t;
+
+bool     pmw3389_init(void);
+void     pmw3389_upload_firmware(void);
+bool     pmw3389_check_signature(void);
+uint16_t pmw3389_get_cpi(void);
+void     pmw3389_set_cpi(uint16_t cpi);
+/* Reads and clears the current delta values on the sensor */
+report_pmw3389_t pmw3389_read_burst(void);
diff --git a/drivers/sensors/pmw3389_firmware.h b/drivers/sensors/pmw3389_firmware.h
index 0564dab73a..cd9638b605 100644
--- a/drivers/sensors/pmw3389_firmware.h
+++ b/drivers/sensors/pmw3389_firmware.h
@@ -18,286 +18,290 @@
 
 #pragma once
 
+#include "progmem.h"
+
 // PID, Inverse PID, SROM version
 const uint8_t firmware_signature[] PROGMEM = {0x42, 0xBD, 0x04};
 
-// clang-format off
-// Firmware Blob foor PMW3389
-const uint16_t firmware_length = 4094;
-// clang-format off
-const uint8_t firmware_data[] PROGMEM = {    // SROM 0x04
-0x01, 0xe8, 0xba, 0x26, 0x0b, 0xb2, 0xbe, 0xfe, 0x7e, 0x5f, 0x3c, 0xdb, 0x15, 0xa8, 0xb3,
-0xe4, 0x2b, 0xb5, 0xe8, 0x53, 0x07, 0x6d, 0x3b, 0xd1, 0x20, 0xc2, 0x06, 0x6f, 0x3d, 0xd9,
-0x11, 0xa0, 0xc2, 0xe7, 0x2d, 0xb9, 0xd1, 0x20, 0xa3, 0xa5, 0xc8, 0xf3, 0x64, 0x4a, 0xf7,
-0x4d, 0x18, 0x93, 0xa4, 0xca, 0xf7, 0x6c, 0x5a, 0x36, 0xee, 0x5e, 0x3e, 0xfe, 0x7e, 0x7e,
-0x5f, 0x1d, 0x99, 0xb0, 0xc3, 0xe5, 0x29, 0xd3, 0x03, 0x65, 0x48, 0x12, 0x87, 0x6d, 0x58,
-0x32, 0xe6, 0x2f, 0xdc, 0x3a, 0xf2, 0x4f, 0xfd, 0x59, 0x11, 0x81, 0x61, 0x21, 0xc0, 0x02,
-0x86, 0x8e, 0x7f, 0x5d, 0x38, 0xf2, 0x47, 0x0c, 0x7b, 0x55, 0x28, 0xb3, 0xe4, 0x4a, 0x16,
-0xab, 0xbf, 0xdd, 0x38, 0xf2, 0x66, 0x4e, 0xff, 0x5d, 0x19, 0x91, 0xa0, 0xa3, 0xa5, 0xc8,
-0x12, 0xa6, 0xaf, 0xdc, 0x3a, 0xd1, 0x41, 0x60, 0x75, 0x58, 0x24, 0x92, 0xd4, 0x72, 0x6c,
-0xe0, 0x2f, 0xfd, 0x23, 0x8d, 0x1c, 0x5b, 0xb2, 0x97, 0x36, 0x3d, 0x0b, 0xa2, 0x49, 0xb1,
-0x58, 0xf2, 0x1f, 0xc0, 0xcb, 0xf8, 0x41, 0x4f, 0xcd, 0x1e, 0x6b, 0x39, 0xa7, 0x2b, 0xe9,
-0x30, 0x16, 0x83, 0xd2, 0x0e, 0x47, 0x8f, 0xe3, 0xb1, 0xdf, 0xa2, 0x15, 0xdb, 0x5d, 0x30,
-0xc5, 0x1a, 0xab, 0x31, 0x99, 0xf3, 0xfa, 0xb2, 0x86, 0x69, 0xad, 0x7a, 0xe8, 0xa7, 0x18,
-0x6a, 0xcc, 0xc8, 0x65, 0x23, 0x87, 0xa8, 0x5f, 0xf5, 0x21, 0x59, 0x75, 0x09, 0x71, 0x45,
-0x55, 0x25, 0x4b, 0xda, 0xa1, 0xc3, 0xf7, 0x41, 0xab, 0x59, 0xd9, 0x74, 0x12, 0x55, 0x5f,
-0xbc, 0xaf, 0xd9, 0xfd, 0xb0, 0x1e, 0xa3, 0x0f, 0xff, 0xde, 0x11, 0x16, 0x6a, 0xae, 0x0e,
-0xe1, 0x5d, 0x3c, 0x10, 0x43, 0x9a, 0xa1, 0x0b, 0x24, 0x8f, 0x0d, 0x7f, 0x0b, 0x5e, 0x4c,
-0x42, 0xa4, 0x84, 0x2c, 0x40, 0xd0, 0x55, 0x39, 0xe6, 0x4b, 0xf8, 0x9b, 0x2f, 0xdc, 0x28,
-0xff, 0xfa, 0xb5, 0x85, 0x19, 0xe5, 0x28, 0xa1, 0x77, 0xaa, 0x73, 0xf3, 0x03, 0xc7, 0x62,
-0xa6, 0x91, 0x18, 0xc9, 0xb0, 0xcd, 0x05, 0xdc, 0xca, 0x81, 0x26, 0x1a, 0x47, 0x40, 0xda,
-0x36, 0x7d, 0x6a, 0x53, 0xc8, 0x5a, 0x77, 0x5d, 0x19, 0xa4, 0x1b, 0x23, 0x83, 0xd0, 0xb2,
-0xaa, 0x0e, 0xbf, 0x77, 0x4e, 0x3a, 0x3b, 0x59, 0x00, 0x31, 0x0d, 0x02, 0x1b, 0x88, 0x7a,
-0xd4, 0xbd, 0x9d, 0xcc, 0x58, 0x04, 0x69, 0xf6, 0x3b, 0xca, 0x42, 0xe2, 0xfd, 0xc3, 0x3d,
-0x39, 0xc5, 0xd0, 0x71, 0xe4, 0xc8, 0xb7, 0x3e, 0x3f, 0xc8, 0xe9, 0xca, 0xc9, 0x3f, 0x04,
-0x4e, 0x1b, 0x79, 0xca, 0xa5, 0x61, 0xc2, 0xed, 0x1d, 0xa6, 0xda, 0x5a, 0xe9, 0x7f, 0x65,
-0x8c, 0xbe, 0x12, 0x6e, 0xa4, 0x5b, 0x33, 0x2f, 0x84, 0x28, 0x9c, 0x1c, 0x88, 0x2d, 0xff,
-0x07, 0xbf, 0xa6, 0xd7, 0x5a, 0x88, 0x86, 0xb0, 0x3f, 0xf6, 0x31, 0x5b, 0x11, 0x6d, 0xf5,
-0x58, 0xeb, 0x58, 0x02, 0x9e, 0xb5, 0x9a, 0xb1, 0xff, 0x25, 0x9d, 0x8b, 0x4f, 0xb6, 0x0a,
-0xf9, 0xea, 0x3e, 0x3f, 0x21, 0x09, 0x65, 0x21, 0x22, 0xfe, 0x3d, 0x4e, 0x11, 0x5b, 0x9e,
-0x5a, 0x59, 0x8b, 0xdd, 0xd8, 0xce, 0xd6, 0xd9, 0x59, 0xd2, 0x1e, 0xfd, 0xef, 0x0d, 0x1b,
-0xd9, 0x61, 0x7f, 0xd7, 0x2d, 0xad, 0x62, 0x09, 0xe5, 0x22, 0x63, 0xea, 0xc7, 0x31, 0xd9,
-0xa1, 0x38, 0x80, 0x5c, 0xa7, 0x32, 0x82, 0xec, 0x1b, 0xa2, 0x49, 0x5a, 0x06, 0xd2, 0x7c,
-0xc9, 0x96, 0x57, 0xbb, 0x17, 0x75, 0xfc, 0x7a, 0x8f, 0x0d, 0x77, 0xb5, 0x7a, 0x8e, 0x3e,
-0xf4, 0xba, 0x2f, 0x69, 0x13, 0x26, 0xd6, 0xd9, 0x21, 0x60, 0x2f, 0x21, 0x3e, 0x87, 0xee,
-0xfd, 0x87, 0x16, 0x0d, 0xc8, 0x08, 0x00, 0x25, 0x71, 0xac, 0x2c, 0x03, 0x2a, 0x37, 0x2d,
-0xb3, 0x34, 0x09, 0x91, 0xe3, 0x06, 0x2c, 0x38, 0x37, 0x95, 0x3b, 0x17, 0x7a, 0xaf, 0xac,
-0x99, 0x55, 0xab, 0x41, 0x39, 0x5f, 0x8e, 0xa6, 0x43, 0x80, 0x03, 0x88, 0x6f, 0x7d, 0xbd,
-0x5a, 0xb4, 0x2b, 0x32, 0x23, 0x5a, 0xa9, 0x31, 0x32, 0x39, 0x4c, 0x5b, 0xf4, 0x6b, 0xaf,
-0x66, 0x6f, 0x3c, 0x8e, 0x2d, 0x82, 0x97, 0x9f, 0x4a, 0x01, 0xdc, 0x99, 0x98, 0x00, 0xec,
-0x38, 0x7a, 0x79, 0x70, 0xa6, 0x85, 0xd6, 0x21, 0x63, 0x0d, 0x45, 0x9a, 0x2e, 0x5e, 0xa7,
-0xb1, 0xea, 0x66, 0x6a, 0xbc, 0x62, 0x2d, 0x7b, 0x7d, 0x85, 0xea, 0x95, 0x2f, 0xc0, 0xe8,
-0x6f, 0x35, 0xa0, 0x3a, 0x02, 0x25, 0xbc, 0xb2, 0x5f, 0x5c, 0x43, 0x96, 0xcc, 0x26, 0xd2,
-0x16, 0xb4, 0x96, 0x73, 0xd7, 0x13, 0xc7, 0xae, 0x53, 0x15, 0x31, 0x89, 0x68, 0x66, 0x6d,
-0x2c, 0x92, 0x1f, 0xcc, 0x5b, 0xa7, 0x8f, 0x5d, 0xbb, 0xc9, 0xdb, 0xe8, 0x3b, 0x9d, 0x61,
-0x74, 0x8b, 0x05, 0xa1, 0x58, 0x52, 0x68, 0xee, 0x3d, 0x39, 0x79, 0xa0, 0x9b, 0xdd, 0xe1,
-0x55, 0xc9, 0x60, 0xeb, 0xad, 0xb8, 0x5b, 0xc2, 0x5a, 0xb5, 0x2c, 0x18, 0x55, 0xa9, 0x50,
-0xc3, 0xf6, 0x72, 0x5f, 0xcc, 0xe2, 0xf4, 0x55, 0xb5, 0xd6, 0xb5, 0x4a, 0x99, 0xa5, 0x28,
-0x74, 0x97, 0x18, 0xe8, 0xc0, 0x84, 0x89, 0x50, 0x03, 0x86, 0x4d, 0x1a, 0xb7, 0x09, 0x90,
-0xa2, 0x01, 0x04, 0xbb, 0x73, 0x62, 0xcb, 0x97, 0x22, 0x70, 0x5d, 0x52, 0x41, 0x8e, 0xd9,
-0x90, 0x15, 0xaa, 0xab, 0x0a, 0x31, 0x65, 0xb4, 0xda, 0xd0, 0xee, 0x24, 0xc9, 0x41, 0x91,
-0x1e, 0xbc, 0x46, 0x70, 0x40, 0x9d, 0xda, 0x0e, 0x2a, 0xe4, 0xb2, 0x4c, 0x9f, 0xf2, 0xfc,
-0xf3, 0x84, 0x17, 0x44, 0x1e, 0xd7, 0xca, 0x23, 0x1f, 0x3f, 0x5a, 0x22, 0x3d, 0xaf, 0x9b,
-0x2d, 0xfc, 0x41, 0xad, 0x26, 0xb4, 0x45, 0x67, 0x0b, 0x80, 0x0e, 0xf9, 0x61, 0x37, 0xec,
-0x3b, 0xf4, 0x4b, 0x14, 0xdf, 0x5a, 0x0c, 0x3a, 0x50, 0x0b, 0x14, 0x0c, 0x72, 0xae, 0xc6,
-0xc5, 0xec, 0x35, 0x53, 0x2d, 0x59, 0xed, 0x91, 0x74, 0xe2, 0xc4, 0xc8, 0xf2, 0x25, 0x6b,
-0x97, 0x6f, 0xc9, 0x76, 0xce, 0xa9, 0xb1, 0x99, 0x8f, 0x5a, 0x92, 0x3b, 0xc4, 0x8d, 0x54,
-0x50, 0x40, 0x72, 0xd6, 0x90, 0x83, 0xfc, 0xe5, 0x49, 0x8b, 0x17, 0xf5, 0xfd, 0x6b, 0x8d,
-0x32, 0x02, 0xe9, 0x0a, 0xfe, 0xbf, 0x00, 0x6b, 0xa3, 0xad, 0x5f, 0x09, 0x4b, 0x97, 0x2b,
-0x00, 0x58, 0x65, 0x2e, 0x07, 0x49, 0x0a, 0x3b, 0x6b, 0x2e, 0x50, 0x6c, 0x1d, 0xac, 0xb7,
-0x6a, 0x26, 0xd8, 0x13, 0xa4, 0xca, 0x16, 0xae, 0xab, 0x93, 0xb9, 0x1c, 0x1c, 0xb4, 0x47,
-0x6a, 0x38, 0x36, 0x17, 0x27, 0xc9, 0x7f, 0xc7, 0x64, 0xcb, 0x89, 0x58, 0xc5, 0x61, 0xc2,
-0xc6, 0xea, 0x15, 0x0b, 0x34, 0x0c, 0x5d, 0x61, 0x76, 0x6e, 0x2b, 0x62, 0x40, 0x92, 0xa3,
-0x6c, 0xef, 0xf4, 0xe4, 0xc3, 0xa1, 0xa8, 0xf5, 0x94, 0x79, 0x0d, 0xd1, 0x3d, 0xcb, 0x3d,
-0x40, 0xb6, 0xd0, 0xf0, 0x10, 0x54, 0xd8, 0x47, 0x25, 0x51, 0xc5, 0x41, 0x79, 0x00, 0xe5,
-0xa0, 0x72, 0xde, 0xbb, 0x3b, 0x62, 0x17, 0xf6, 0xbc, 0x5d, 0x00, 0x76, 0x2e, 0xa7, 0x3b,
-0xb6, 0xf1, 0x98, 0x72, 0x59, 0x2a, 0x73, 0xb0, 0x21, 0xd6, 0x49, 0xe0, 0xc0, 0xd5, 0xeb,
-0x02, 0x7d, 0x4b, 0x41, 0x28, 0x70, 0x2d, 0xec, 0x2b, 0x71, 0x1f, 0x0b, 0xb9, 0x71, 0x63,
-0x06, 0xe6, 0xbc, 0x60, 0xbb, 0xf4, 0x9a, 0x62, 0x43, 0x09, 0x18, 0x4e, 0x93, 0x06, 0x4d,
-0x76, 0xfa, 0x7f, 0xbd, 0x02, 0xe4, 0x50, 0x91, 0x12, 0xe5, 0x86, 0xff, 0x64, 0x1e, 0xaf,
-0x7e, 0xb3, 0xb2, 0xde, 0x89, 0xc1, 0xa2, 0x6f, 0x40, 0x7b, 0x41, 0x51, 0x63, 0xea, 0x25,
-0xd1, 0x97, 0x57, 0x92, 0xa8, 0x45, 0xa1, 0xa5, 0x45, 0x21, 0x43, 0x7f, 0x83, 0x15, 0x29,
-0xd0, 0x30, 0x53, 0x32, 0xb4, 0x5a, 0x17, 0x96, 0xbc, 0xc2, 0x68, 0xa9, 0xb7, 0xaf, 0xac,
-0xdf, 0xf1, 0xe3, 0x89, 0xba, 0x24, 0x79, 0x54, 0xc6, 0x14, 0x07, 0x1c, 0x1e, 0x0d, 0x3a,
-0x6b, 0xe5, 0x3d, 0x4e, 0x10, 0x60, 0x96, 0xec, 0x6c, 0xda, 0x47, 0xae, 0x03, 0x25, 0x39,
-0x1d, 0x74, 0xc8, 0xac, 0x6a, 0xf2, 0x6b, 0x05, 0x2a, 0x9a, 0xe7, 0xe8, 0x92, 0xd6, 0xc2,
-0x6d, 0xfa, 0xe8, 0xa7, 0x9d, 0x5f, 0x48, 0xc9, 0x75, 0xf1, 0x66, 0x6a, 0xdb, 0x5d, 0x9a,
-0xcd, 0x27, 0xdd, 0xb9, 0x24, 0x04, 0x9c, 0x18, 0xc2, 0x6d, 0x0c, 0x91, 0x34, 0x48, 0x42,
-0x6f, 0xe9, 0x59, 0x70, 0xc4, 0x7e, 0x81, 0x0e, 0x32, 0x0a, 0x93, 0x48, 0xb0, 0xc0, 0x15,
-0x9e, 0x05, 0xac, 0x36, 0x16, 0xcb, 0x59, 0x65, 0xa0, 0x83, 0xdf, 0x3e, 0xda, 0xfb, 0x1d,
-0x1a, 0xdb, 0x65, 0xec, 0x9a, 0xc6, 0xc3, 0x8e, 0x3c, 0x45, 0xfd, 0xc8, 0xf5, 0x1c, 0x6a,
-0x67, 0x0d, 0x8f, 0x99, 0x7d, 0x30, 0x21, 0x8c, 0xea, 0x22, 0x87, 0x65, 0xc9, 0xb2, 0x4c,
-0xe4, 0x1b, 0x46, 0xba, 0x54, 0xbd, 0x7c, 0xca, 0xd5, 0x8f, 0x5b, 0xa5, 0x01, 0x04, 0xd8,
-0x0a, 0x16, 0xbf, 0xb9, 0x50, 0x2e, 0x37, 0x2f, 0x64, 0xf3, 0x70, 0x11, 0x02, 0x05, 0x31,
-0x9b, 0xa0, 0xb2, 0x01, 0x5e, 0x4f, 0x19, 0xc9, 0xd4, 0xea, 0xa1, 0x79, 0x54, 0x53, 0xa7,
-0xde, 0x2f, 0x49, 0xd3, 0xd1, 0x63, 0xb5, 0x03, 0x15, 0x4e, 0xbf, 0x04, 0xb3, 0x26, 0x8b,
-0x20, 0xb2, 0x45, 0xcf, 0xcd, 0x5b, 0x82, 0x32, 0x88, 0x61, 0xa7, 0xa8, 0xb2, 0xa0, 0x72,
-0x96, 0xc0, 0xdb, 0x2b, 0xe2, 0x5f, 0xba, 0xe3, 0xf5, 0x8a, 0xde, 0xf1, 0x18, 0x01, 0x16,
-0x40, 0xd9, 0x86, 0x12, 0x09, 0x18, 0x1b, 0x05, 0x0c, 0xb1, 0xb5, 0x47, 0xe2, 0x43, 0xab,
-0xfe, 0x92, 0x63, 0x7e, 0x95, 0x2b, 0xf0, 0xaf, 0xe1, 0xf1, 0xc3, 0x4a, 0xff, 0x2b, 0x09,
-0xbb, 0x4a, 0x0e, 0x9a, 0xc4, 0xd8, 0x64, 0x7d, 0x83, 0xa0, 0x4f, 0x44, 0xdb, 0xc4, 0xa8,
-0x58, 0xef, 0xfc, 0x9e, 0x77, 0xf9, 0xa6, 0x8f, 0x58, 0x8b, 0x12, 0xf4, 0xe9, 0x81, 0x12,
-0x47, 0x51, 0x41, 0x83, 0xef, 0xf6, 0x73, 0xbc, 0x8e, 0x0f, 0x4c, 0x8f, 0x4e, 0x69, 0x90,
-0x77, 0x29, 0x5d, 0x92, 0xb0, 0x6d, 0x06, 0x67, 0x29, 0x60, 0xbd, 0x4b, 0x17, 0xc8, 0x89,
-0x69, 0x28, 0x29, 0xd6, 0x78, 0xcb, 0x11, 0x4c, 0xba, 0x8b, 0x68, 0xae, 0x7e, 0x9f, 0xef,
-0x95, 0xda, 0xe2, 0x9e, 0x7f, 0xe9, 0x55, 0xe5, 0xe1, 0xe2, 0xb7, 0xe6, 0x5f, 0xbb, 0x2c,
-0xa2, 0xe6, 0xee, 0xc7, 0x0a, 0x60, 0xa9, 0xd1, 0x80, 0xdf, 0x7f, 0xd6, 0x97, 0xab, 0x1d,
-0x22, 0x25, 0xfc, 0x79, 0x23, 0xe0, 0xae, 0xc5, 0xef, 0x16, 0xa4, 0xa1, 0x0f, 0x92, 0xa9,
-0xc7, 0xe3, 0x3a, 0x55, 0xdf, 0x62, 0x49, 0xd9, 0xf5, 0x84, 0x49, 0xc5, 0x90, 0x34, 0xd3,
-0xe1, 0xac, 0x99, 0x21, 0xb1, 0x02, 0x76, 0x4a, 0xfa, 0xd4, 0xbb, 0xa4, 0x9c, 0xa2, 0xe2,
-0xcb, 0x3d, 0x3b, 0x14, 0x75, 0x60, 0xd1, 0x02, 0xb4, 0xa3, 0xb4, 0x72, 0x06, 0xf9, 0x19,
-0x9c, 0xe2, 0xe4, 0xa7, 0x0f, 0x25, 0x88, 0xc6, 0x86, 0xd6, 0x8c, 0x74, 0x4e, 0x6e, 0xfc,
-0xa8, 0x48, 0x9e, 0xa7, 0x9d, 0x1a, 0x4b, 0x37, 0x09, 0xc8, 0xb0, 0x10, 0xbe, 0x6f, 0xfe,
-0xa3, 0xc4, 0x7a, 0xb5, 0x3d, 0xe8, 0x30, 0xf1, 0x0d, 0xa0, 0xb2, 0x44, 0xfc, 0x9b, 0x8c,
-0xf8, 0x61, 0xed, 0x81, 0xd1, 0x62, 0x11, 0xb4, 0xe1, 0xd5, 0x39, 0x52, 0x89, 0xd3, 0xa8,
-0x49, 0x31, 0xdf, 0xb6, 0xf9, 0x91, 0xf4, 0x1c, 0x9d, 0x09, 0x95, 0x40, 0x56, 0xe7, 0xe3,
-0xcd, 0x5c, 0x92, 0xc1, 0x1d, 0x6b, 0xe9, 0x78, 0x6f, 0x8e, 0x94, 0x42, 0x66, 0xa2, 0xaa,
-0xd3, 0xc8, 0x2e, 0xe3, 0xf6, 0x07, 0x72, 0x0b, 0x6b, 0x1e, 0x7b, 0xb9, 0x7c, 0xe0, 0xa0,
-0xbc, 0xd9, 0x25, 0xdf, 0x87, 0xa8, 0x5f, 0x9c, 0xcc, 0xf0, 0xdb, 0x42, 0x8e, 0x07, 0x31,
-0x13, 0x01, 0x66, 0x32, 0xd1, 0xb8, 0xd6, 0xe3, 0x5e, 0x12, 0x76, 0x61, 0xd3, 0x38, 0x89,
-0xe6, 0x17, 0x6f, 0xa5, 0xf2, 0x71, 0x0e, 0xa5, 0xe2, 0x88, 0x30, 0xbb, 0xbe, 0x8a, 0xea,
-0xc7, 0x62, 0xc4, 0xcf, 0xb8, 0xcd, 0x33, 0x8d, 0x3d, 0x3e, 0xb5, 0x60, 0x3a, 0x03, 0x92,
-0xe4, 0x6d, 0x1b, 0xe0, 0xb4, 0x84, 0x08, 0x55, 0x88, 0xa7, 0x3a, 0xb9, 0x3d, 0x43, 0xc3,
-0xc0, 0xfa, 0x07, 0x6a, 0xca, 0x94, 0xad, 0x99, 0x55, 0xf1, 0xf1, 0xc0, 0x23, 0x87, 0x1d,
-0x3d, 0x1c, 0xd1, 0x66, 0xa0, 0x57, 0x10, 0x52, 0xa2, 0x7f, 0xbe, 0xf9, 0x88, 0xb6, 0x02,
-0xbf, 0x08, 0x23, 0xa9, 0x0c, 0x63, 0x17, 0x2a, 0xae, 0xf5, 0xf7, 0xb7, 0x21, 0x83, 0x92,
-0x31, 0x23, 0x0d, 0x20, 0xc3, 0xc2, 0x05, 0x21, 0x62, 0x8e, 0x45, 0xe8, 0x14, 0xc1, 0xda,
-0x75, 0xb8, 0xf8, 0x92, 0x01, 0xd0, 0x5d, 0x18, 0x9f, 0x99, 0x11, 0x19, 0xf5, 0x35, 0xe8,
-0x7f, 0x20, 0x88, 0x8c, 0x05, 0x75, 0xf5, 0xd7, 0x40, 0x17, 0xbb, 0x1e, 0x36, 0x52, 0xd9,
-0xa4, 0x9c, 0xc2, 0x9d, 0x42, 0x81, 0xd8, 0xc7, 0x8a, 0xe7, 0x4c, 0x81, 0xe0, 0xb7, 0x57,
-0xed, 0x48, 0x8b, 0xf0, 0x97, 0x15, 0x61, 0xd9, 0x2c, 0x7c, 0x45, 0xaf, 0xc2, 0xcd, 0xfc,
-0xaa, 0x13, 0xad, 0x59, 0xcc, 0xb2, 0xb2, 0x6e, 0xdd, 0x63, 0x9c, 0x32, 0x0f, 0xec, 0x83,
-0xbe, 0x78, 0xac, 0x91, 0x44, 0x1a, 0x1f, 0xea, 0xfd, 0x5d, 0x8e, 0xb4, 0xc0, 0x84, 0xd4,
-0xac, 0xb4, 0x87, 0x5f, 0xac, 0xef, 0xdf, 0xcd, 0x12, 0x56, 0xc8, 0xcd, 0xfe, 0xc5, 0xda,
-0xd3, 0xc1, 0x69, 0xf3, 0x61, 0x05, 0xea, 0x25, 0xe2, 0x12, 0x05, 0x8f, 0x39, 0x08, 0x08,
-0x7c, 0x37, 0xb6, 0x7e, 0x5b, 0xd8, 0xb1, 0x0e, 0xf2, 0xdb, 0x4b, 0xf1, 0xad, 0x90, 0x01,
-0x57, 0xcd, 0xa0, 0xb4, 0x52, 0xe8, 0xf3, 0xd7, 0x8a, 0xbd, 0x4f, 0x9f, 0x21, 0x40, 0x72,
-0xa4, 0xfc, 0x0b, 0x01, 0x2b, 0x2f, 0xb6, 0x4c, 0x95, 0x2d, 0x35, 0x33, 0x41, 0x6b, 0xa0,
-0x93, 0xe7, 0x2c, 0xf2, 0xd3, 0x72, 0x8b, 0xf4, 0x4f, 0x15, 0x3c, 0xaf, 0xd6, 0x12, 0xde,
-0x3f, 0x83, 0x3f, 0xff, 0xf8, 0x7f, 0xf6, 0xcc, 0xa6, 0x7f, 0xc9, 0x9a, 0x6e, 0x1f, 0xc1,
-0x0c, 0xfb, 0xee, 0x9c, 0xe7, 0xaf, 0xc9, 0x26, 0x54, 0xef, 0xb0, 0x39, 0xef, 0xb2, 0xe9,
-0x23, 0xc4, 0xef, 0xd1, 0xa1, 0xa4, 0x25, 0x24, 0x6f, 0x8d, 0x6a, 0xe5, 0x8a, 0x32, 0x3a,
-0xaf, 0xfc, 0xda, 0xce, 0x18, 0x25, 0x42, 0x07, 0x4d, 0x45, 0x8b, 0xdf, 0x85, 0xcf, 0x55,
-0xb2, 0x24, 0xfe, 0x9c, 0x69, 0x74, 0xa7, 0x6e, 0xa0, 0xce, 0xc0, 0x39, 0xf4, 0x86, 0xc6,
-0x8d, 0xae, 0xb9, 0x48, 0x64, 0x13, 0x0b, 0x40, 0x81, 0xa2, 0xc9, 0xa8, 0x85, 0x51, 0xee,
-0x9f, 0xcf, 0xa2, 0x8c, 0x19, 0x52, 0x48, 0xe2, 0xc1, 0xa8, 0x58, 0xb4, 0x10, 0x24, 0x06,
-0x58, 0x51, 0xfc, 0xb9, 0x12, 0xec, 0xfd, 0x73, 0xb4, 0x6d, 0x84, 0xfa, 0x06, 0x8b, 0x05,
-0x0b, 0x2d, 0xd6, 0xd6, 0x1f, 0x29, 0x82, 0x9f, 0x19, 0x12, 0x1e, 0xb2, 0x04, 0x8f, 0x7f,
-0x4d, 0xbd, 0x30, 0x2e, 0xe3, 0xe0, 0x88, 0x29, 0xc5, 0x93, 0xd6, 0x6c, 0x1f, 0x29, 0x45,
-0x91, 0xa7, 0x58, 0xcd, 0x05, 0x17, 0xd6, 0x6d, 0xb3, 0xca, 0x66, 0xcc, 0x3c, 0x4a, 0x74,
-0xfd, 0x08, 0x10, 0xa6, 0x99, 0x92, 0x10, 0xd2, 0x85, 0xab, 0x6e, 0x1d, 0x0e, 0x8b, 0x26,
-0x46, 0xd1, 0x6c, 0x84, 0xc0, 0x26, 0x43, 0x59, 0x68, 0xf0, 0x13, 0x1d, 0xfb, 0xe3, 0xd1,
-0xd2, 0xb4, 0x71, 0x9e, 0xf2, 0x59, 0x6a, 0x33, 0x29, 0x79, 0xd2, 0xd7, 0x26, 0xf1, 0xae,
-0x78, 0x9e, 0x1f, 0x0f, 0x3f, 0xe3, 0xe8, 0xd0, 0x27, 0x78, 0x77, 0xf6, 0xac, 0x9c, 0x56,
-0x39, 0x73, 0x8a, 0x6b, 0x2f, 0x34, 0x78, 0xb1, 0x11, 0xdb, 0xa4, 0x5c, 0x80, 0x01, 0x71,
-0x6a, 0xc2, 0xd1, 0x2e, 0x5e, 0x76, 0x28, 0x70, 0x93, 0xae, 0x3e, 0x78, 0xb0, 0x1f, 0x0f,
-0xda, 0xbf, 0xfb, 0x8a, 0x67, 0x65, 0x4f, 0x91, 0xed, 0x49, 0x75, 0x78, 0x62, 0xa2, 0x93,
-0xb5, 0x70, 0x7f, 0x4d, 0x08, 0x4e, 0x79, 0x61, 0xa8, 0x5f, 0x7f, 0xb4, 0x65, 0x9f, 0x91,
-0x54, 0x3a, 0xe8, 0x50, 0x33, 0xd3, 0xd5, 0x8a, 0x7c, 0xf3, 0x9e, 0x8b, 0x77, 0x7b, 0xc6,
-0xc6, 0x0c, 0x45, 0x95, 0x1f, 0xb0, 0xd0, 0x0b, 0x27, 0x4a, 0xfd, 0xc7, 0xf7, 0x0d, 0x5a,
-0x43, 0xc9, 0x7d, 0x35, 0xb0, 0x7d, 0xc4, 0x9c, 0x57, 0x1e, 0x76, 0x0d, 0xf1, 0x95, 0x30,
-0x71, 0xcc, 0xb3, 0x66, 0x3b, 0x63, 0xa8, 0x6c, 0xa3, 0x43, 0xa0, 0x24, 0xcc, 0xb7, 0x53,
-0xfe, 0xfe, 0xbc, 0x6e, 0x60, 0x89, 0xaf, 0x16, 0x21, 0xc8, 0x91, 0x6a, 0x89, 0xce, 0x80,
-0x2c, 0xf1, 0x59, 0xce, 0xc3, 0x60, 0x61, 0x3b, 0x0b, 0x19, 0xfe, 0x99, 0xac, 0x65, 0x90,
-0x15, 0x12, 0x05, 0xac, 0x7e, 0xff, 0x98, 0x7b, 0x66, 0x64, 0x0e, 0x4b, 0x5b, 0xaa, 0x8d,
-0x3b, 0xd2, 0x56, 0xcf, 0x99, 0x39, 0xee, 0x22, 0x81, 0xd0, 0x60, 0x06, 0x66, 0x20, 0x81,
-0x48, 0x3c, 0x6f, 0x3a, 0x77, 0xba, 0xcb, 0x52, 0xac, 0x79, 0x56, 0xaf, 0xe9, 0x16, 0x17,
-0x0a, 0xa3, 0x82, 0x08, 0xd5, 0x3c, 0x97, 0xcb, 0x09, 0xff, 0x7f, 0xf9, 0x4f, 0x60, 0x05,
-0xb9, 0x53, 0x26, 0xaa, 0xb8, 0x50, 0xaa, 0x19, 0x25, 0xae, 0x5f, 0xea, 0x8a, 0xd0, 0x89,
-0x12, 0x80, 0x43, 0x50, 0x24, 0x12, 0x21, 0x14, 0xcd, 0x77, 0xeb, 0x21, 0xcc, 0x5c, 0x09,
-0x64, 0xf3, 0xc7, 0xcb, 0xc5, 0x4b, 0xc3, 0xe7, 0xed, 0xe7, 0x86, 0x2c, 0x1d, 0x8e, 0x19,
-0x52, 0x9b, 0x2a, 0x0c, 0x18, 0x72, 0x0b, 0x1e, 0x1b, 0xb0, 0x0f, 0x42, 0x99, 0x04, 0xae,
-0xd5, 0xb7, 0x89, 0x1a, 0xb9, 0x4f, 0xd6, 0xaf, 0xf3, 0xc9, 0x93, 0x6f, 0xb0, 0x60, 0x83,
-0x6e, 0x6b, 0xd1, 0x5f, 0x3f, 0x1a, 0x83, 0x1e, 0x24, 0x00, 0x87, 0xb5, 0x3e, 0xdb, 0xf9,
-0x4d, 0xa7, 0x16, 0x2e, 0x19, 0x5b, 0x8f, 0x1b, 0x0d, 0x47, 0x72, 0x42, 0xe9, 0x0a, 0x11,
-0x08, 0x2d, 0x88, 0x1c, 0xbc, 0xc7, 0xb4, 0xbe, 0x29, 0x4d, 0x03, 0x5e, 0xec, 0xdf, 0xf3,
-0x3d, 0x2f, 0xe8, 0x1d, 0x9a, 0xd2, 0xd1, 0xab, 0x41, 0x3d, 0x87, 0x11, 0x45, 0xb0, 0x0d,
-0x46, 0xf5, 0xe8, 0x95, 0x62, 0x1c, 0x68, 0xf7, 0xa6, 0x5b, 0x39, 0x4e, 0xbf, 0x47, 0xba,
-0x5d, 0x7f, 0xb7, 0x6a, 0xf4, 0xba, 0x1d, 0x69, 0xf6, 0xa4, 0xe7, 0xe4, 0x6b, 0x3b, 0x0d,
-0x23, 0x16, 0x4a, 0xb2, 0x68, 0xf0, 0xb2, 0x0d, 0x09, 0x17, 0x6a, 0x63, 0x8c, 0x83, 0xd3,
-0xbd, 0x05, 0xc9, 0xf6, 0xf0, 0xa1, 0x31, 0x0b, 0x2c, 0xac, 0x83, 0xac, 0x80, 0x34, 0x32,
-0xb4, 0xec, 0xd0, 0xbc, 0x54, 0x82, 0x9a, 0xc8, 0xf6, 0xa0, 0x7d, 0xc6, 0x79, 0x73, 0xf4,
-0x20, 0x99, 0xf3, 0xb4, 0x01, 0xde, 0x91, 0x27, 0xf2, 0xc0, 0xdc, 0x81, 0x00, 0x4e, 0x7e,
-0x07, 0x99, 0xc8, 0x3a, 0x51, 0xbc, 0x38, 0xd6, 0x8a, 0xa2, 0xde, 0x3b, 0x6a, 0x8c, 0x1a,
-0x7c, 0x81, 0x0f, 0x3a, 0x1f, 0xe4, 0x05, 0x7b, 0x20, 0x35, 0x6b, 0xa5, 0x6a, 0xa7, 0xe7,
-0xbc, 0x9c, 0x20, 0xec, 0x00, 0x15, 0xe2, 0x51, 0xaf, 0x77, 0xeb, 0x29, 0x3c, 0x7d, 0x2e,
-0x00, 0x5c, 0x81, 0x21, 0xfa, 0x35, 0x6f, 0x40, 0xef, 0xfb, 0xd1, 0x3f, 0xcc, 0x9d, 0x55,
-0x53, 0xfb, 0x5a, 0xa5, 0x56, 0x89, 0x0b, 0x52, 0xeb, 0x57, 0x73, 0x4f, 0x1b, 0x67, 0x24,
-0xcb, 0xb8, 0x6a, 0x10, 0x69, 0xd6, 0xfb, 0x52, 0x40, 0xff, 0x20, 0xa5, 0xf3, 0x72, 0xe1,
-0x3d, 0xa4, 0x8c, 0x81, 0x66, 0x16, 0x0d, 0x5d, 0xad, 0xa8, 0x50, 0x25, 0x78, 0x31, 0x77,
-0x0c, 0x57, 0xe4, 0xe9, 0x15, 0x2d, 0xdb, 0x07, 0x87, 0xc8, 0xb0, 0x43, 0xde, 0xfc, 0xfe,
-0xa9, 0xeb, 0xf5, 0xb0, 0xd3, 0x7b, 0xe9, 0x1f, 0x6e, 0xca, 0xe4, 0x03, 0x95, 0xc5, 0xd1,
-0x59, 0x72, 0x63, 0xf0, 0x86, 0x54, 0xe8, 0x16, 0x62, 0x0b, 0x35, 0x29, 0xc2, 0x68, 0xd0,
-0xd6, 0x3e, 0x90, 0x60, 0x57, 0x1d, 0xc9, 0xed, 0x3f, 0xed, 0xb0, 0x2f, 0x7e, 0x97, 0x02,
-0x51, 0xec, 0xee, 0x6f, 0x82, 0x74, 0x76, 0x7f, 0xfb, 0xd6, 0xc4, 0xc3, 0xdd, 0xe8, 0xb1,
-0x60, 0xfc, 0xc6, 0xb9, 0x0d, 0x6a, 0x33, 0x78, 0xc6, 0xc1, 0xbf, 0x86, 0x2c, 0x50, 0xcc,
-0x9a, 0x70, 0x8e, 0x7b, 0xec, 0xab, 0x95, 0xac, 0x53, 0xa0, 0x4b, 0x07, 0x88, 0xaf, 0x42,
-0xed, 0x19, 0x8d, 0xf6, 0x32, 0x17, 0x48, 0x47, 0x1d, 0x41, 0x6f, 0xfe, 0x2e, 0xa7, 0x8f,
-0x4b, 0xa0, 0x51, 0xf3, 0xbf, 0x02, 0x0a, 0x48, 0x58, 0xf7, 0xa1, 0x6d, 0xea, 0xa5, 0x13,
-0x5a, 0x5b, 0xea, 0x0c, 0x9e, 0x52, 0x4f, 0x9e, 0xb9, 0x71, 0x7f, 0x23, 0x83, 0xda, 0x1b,
-0x86, 0x9a, 0x41, 0x29, 0xda, 0x70, 0xe7, 0x64, 0xa1, 0x7b, 0xd5, 0x0a, 0x22, 0x0d, 0x5c,
-0x40, 0xc4, 0x81, 0x07, 0x25, 0x35, 0x4a, 0x1c, 0x10, 0xdb, 0x45, 0x0a, 0xff, 0x36, 0xd4,
-0xe0, 0xeb, 0x5f, 0x68, 0xd6, 0x67, 0xc6, 0xd0, 0x8b, 0x76, 0x1a, 0x7d, 0x59, 0x42, 0xa1,
-0xcb, 0x96, 0x4d, 0x84, 0x09, 0x9a, 0x3d, 0xe0, 0x52, 0x85, 0x6e, 0x48, 0x90, 0x85, 0x2a,
-0x63, 0xb2, 0x69, 0xd2, 0x00, 0x43, 0x31, 0x37, 0xb3, 0x52, 0xaf, 0x62, 0xfa, 0xc1, 0xe0,
-0x03, 0xfb, 0x62, 0xaa, 0x88, 0xc9, 0xb2, 0x2c, 0xd5, 0xa8, 0xf5, 0xa5, 0x4c, 0x12, 0x59,
-0x4e, 0x06, 0x5e, 0x9b, 0x15, 0x66, 0x11, 0xb2, 0x27, 0x92, 0xdc, 0x98, 0x59, 0xde, 0xdf,
-0xfa, 0x9a, 0x32, 0x2e, 0xc0, 0x5d, 0x3c, 0x33, 0x41, 0x6d, 0xaf, 0xb2, 0x25, 0x23, 0x14,
-0xa5, 0x7b, 0xc7, 0x9b, 0x68, 0xf3, 0xda, 0xeb, 0xe3, 0xa9, 0xe2, 0x6f, 0x0e, 0x1d, 0x1c,
-0xba, 0x55, 0xb6, 0x34, 0x6a, 0x93, 0x1f, 0x1f, 0xb8, 0x34, 0xc8, 0x84, 0x08, 0xb1, 0x6b,
-0x6a, 0x28, 0x74, 0x74, 0xe5, 0xeb, 0x75, 0xe9, 0x7c, 0xd8, 0xba, 0xd8, 0x42, 0xa5, 0xee,
-0x1f, 0x80, 0xd9, 0x96, 0xb2, 0x2e, 0xe7, 0xbf, 0xba, 0xeb, 0xd1, 0x69, 0xbb, 0x8f, 0xfd,
-0x5a, 0x63, 0x8f, 0x39, 0x7f, 0xdf, 0x1d, 0x37, 0xd2, 0x18, 0x35, 0x9d, 0xb6, 0xcc, 0xe4,
-0x27, 0x81, 0x89, 0x38, 0x38, 0x68, 0x33, 0xe7, 0x78, 0xd8, 0x76, 0xf5, 0xee, 0xd0, 0x4a,
-0x07, 0x69, 0x19, 0x7a, 0xad, 0x18, 0xb1, 0x94, 0x61, 0x45, 0x53, 0xa2, 0x48, 0xda, 0x96,
-0x4a, 0xf9, 0xee, 0x94, 0x2a, 0x1f, 0x6e, 0x18, 0x3c, 0x92, 0x46, 0xd1, 0x1a, 0x28, 0x18,
-0x32, 0x1f, 0x3a, 0x45, 0xbe, 0x04, 0x35, 0x92, 0xe5, 0xa3, 0xcb, 0xb5, 0x2e, 0x32, 0x43,
-0xac, 0x65, 0x17, 0x89, 0x99, 0x15, 0x03, 0x9e, 0xb1, 0x23, 0x2f, 0xed, 0x76, 0x4d, 0xd8,
-0xac, 0x21, 0x40, 0xc4, 0x99, 0x4e, 0x65, 0x71, 0x2c, 0xb3, 0x45, 0xab, 0xfb, 0xe7, 0x72,
-0x39, 0x56, 0x30, 0x6d, 0xfb, 0x74, 0xeb, 0x99, 0xf3, 0xcd, 0x57, 0x5c, 0x78, 0x75, 0xe9,
-0x8d, 0xc3, 0xa2, 0xfb, 0x5d, 0xe0, 0x90, 0xc5, 0x55, 0xad, 0x91, 0x53, 0x4e, 0x9e, 0xbd,
-0x8c, 0x49, 0xa4, 0xa4, 0x69, 0x10, 0x0c, 0xc5, 0x76, 0xe9, 0x25, 0x86, 0x8d, 0x66, 0x23,
-0xa8, 0xdb, 0x5c, 0xe8, 0xd9, 0x30, 0xe1, 0x15, 0x7b, 0xc0, 0x99, 0x0f, 0x03, 0xec, 0xaa,
-0x12, 0xef, 0xce, 0xd4, 0xea, 0x55, 0x5c, 0x08, 0x86, 0xf4, 0xf4, 0xb0, 0x83, 0x42, 0x95,
-0x37, 0xb6, 0x38, 0xe0, 0x2b, 0x54, 0x89, 0xbd, 0x4e, 0x20, 0x9d, 0x3f, 0xc3, 0x4b, 0xb7,
-0xec, 0xfa, 0x5a, 0x14, 0x03, 0xcb, 0x64, 0xc8, 0x34, 0x4a, 0x4b, 0x6e, 0xf8, 0x6e, 0x56,
-0xf6, 0xdd, 0x5f, 0xa1, 0x24, 0xe2, 0xd4, 0xd0, 0x82, 0x64, 0x1f, 0x8e, 0x9b, 0xfa, 0xb4,
-0xcb, 0xdb, 0x0a, 0xe8, 0x15, 0xfc, 0x15, 0xab, 0x4b, 0x18, 0xbf, 0xd4, 0x42, 0x14, 0x48,
-0x82, 0x85, 0xdd, 0xeb, 0x49, 0x1b, 0x0b, 0x0b, 0x05, 0xe9, 0xb4, 0xa1, 0x33, 0x0a, 0x5d,
-0x0e, 0x6c, 0x4b, 0xc0, 0xd6, 0x6c, 0x7c, 0xfb, 0x69, 0x0b, 0x53, 0x19, 0xe4, 0xf3, 0x35,
-0xfc, 0xbe, 0xa1, 0x34, 0x02, 0x09, 0x4f, 0x74, 0x86, 0x92, 0xcd, 0x5d, 0x1a, 0xc1, 0x27,
-0x0c, 0xf2, 0xc5, 0xcf, 0xdd, 0x23, 0x93, 0x02, 0xbd, 0x41, 0x5e, 0x42, 0xf0, 0xa0, 0x9d,
-0x0c, 0x72, 0xc8, 0xec, 0x32, 0x0a, 0x8a, 0xfd, 0x3d, 0x5a, 0x41, 0x27, 0x0c, 0x88, 0x59,
-0xad, 0x94, 0x2e, 0xef, 0x5d, 0x8f, 0xc7, 0xdf, 0x66, 0xe4, 0xdd, 0x56, 0x6c, 0x7b, 0xca,
-0x55, 0x81, 0xae, 0xae, 0x5c, 0x1b, 0x1a, 0xab, 0xae, 0x99, 0x8d, 0xcc, 0x42, 0x97, 0x59,
-0xf4, 0x14, 0x3f, 0x75, 0xc6, 0xd1, 0x88, 0xba, 0xaa, 0x84, 0x4a, 0xd0, 0x34, 0x08, 0x3b,
-0x7d, 0xdb, 0x15, 0x06, 0xb0, 0x5c, 0xbd, 0x40, 0xf5, 0xa8, 0xec, 0xae, 0x36, 0x40, 0xdd,
-0x90, 0x1c, 0x3e, 0x0d, 0x7e, 0x73, 0xc7, 0xc2, 0xc5, 0x6a, 0xff, 0x52, 0x05, 0x7f, 0xbe,
-0xd0, 0x92, 0xfd, 0xb3, 0x6f, 0xff, 0x5d, 0xb7, 0x97, 0x64, 0x73, 0x7b, 0xca, 0xd1, 0x98,
-0x24, 0x6b, 0x0b, 0x01, 0x68, 0xdd, 0x27, 0x85, 0x85, 0xb5, 0x83, 0xc1, 0xe0, 0x50, 0x64,
-0xc7, 0xaf, 0xf1, 0xc6, 0x4d, 0xb1, 0xef, 0xc9, 0xb4, 0x0a, 0x6d, 0x65, 0xf3, 0x47, 0xcc,
-0xa3, 0x02, 0x21, 0x0c, 0xbe, 0x22, 0x29, 0x05, 0xcf, 0x5f, 0xe8, 0x94, 0x6c, 0xe5, 0xdc,
-0xc4, 0xdf, 0xbe, 0x3e, 0xa8, 0xb4, 0x18, 0xb0, 0x99, 0xb8, 0x6f, 0xff, 0x5d, 0xb9, 0xfd,
-0x3b, 0x5d, 0x16, 0xbf, 0x3e, 0xd8, 0xb3, 0xd8, 0x08, 0x34, 0xf6, 0x47, 0x35, 0x5b, 0x72,
-0x1a, 0x33, 0xad, 0x52, 0x5d, 0xb8, 0xd0, 0x77, 0xc6, 0xab, 0xba, 0x55, 0x09, 0x5f, 0x02,
-0xf8, 0xd4, 0x5f, 0x53, 0x06, 0x91, 0xcd, 0x74, 0x42, 0xae, 0x54, 0x91, 0x81, 0x62, 0x13,
-0x6f, 0xd8, 0xa9, 0x77, 0xc3, 0x6c, 0xcb, 0xf1, 0x29, 0x5a, 0xcc, 0xda, 0x35, 0xbd, 0x52,
-0x23, 0xbe, 0x59, 0xeb, 0x12, 0x6d, 0xb7, 0x53, 0xee, 0xfc, 0xb4, 0x1b, 0x13, 0x5e, 0xba,
-0x16, 0x7c, 0xc5, 0xf3, 0xe3, 0x6d, 0x07, 0x78, 0xf5, 0x2b, 0x21, 0x05, 0x88, 0x4c, 0xc0,
-0xa1, 0xe3, 0x36, 0x10, 0xf8, 0x1b, 0xd8, 0x17, 0xfb, 0x6a, 0x4e, 0xd8, 0xb3, 0x47, 0x2d,
-0x99, 0xbd, 0xbb, 0x5d, 0x37, 0x7d, 0xba, 0xf1, 0xe1, 0x7c, 0xc0, 0xc5, 0x54, 0x62, 0x7f,
-0xcf, 0x5a, 0x4a, 0x93, 0xcc, 0xf1, 0x1b, 0x34, 0xc8, 0xa6, 0x05, 0x4c, 0x55, 0x8b, 0x54,
-0x84, 0xd5, 0x77, 0xeb, 0xc0, 0x6d, 0x3a, 0x29, 0xbd, 0x75, 0x61, 0x09, 0x9a, 0x2c, 0xbb,
-0xf7, 0x18, 0x79, 0x34, 0x90, 0x24, 0xa5, 0x81, 0x70, 0x87, 0xc5, 0x02, 0x7c, 0xba, 0xd4,
-0x5e, 0x14, 0x8e, 0xe4, 0xed, 0xa2, 0x61, 0x6a, 0xb9, 0x6e, 0xb5, 0x4a, 0xb9, 0x01, 0x46,
-0xf4, 0xcf, 0xbc, 0x09, 0x2f, 0x27, 0x4b, 0xbd, 0x86, 0x7a, 0x10, 0xe1, 0xd4, 0xc8, 0xd9,
-0x20, 0x8d, 0x8a, 0x63, 0x00, 0x63, 0x44, 0xeb, 0x54, 0x0b, 0x75, 0x49, 0x10, 0xa2, 0xa7,
-0xad, 0xb9, 0xd1, 0x01, 0x80, 0x63, 0x25, 0xc8, 0x12, 0xa6, 0xce, 0x1e, 0xbe, 0xfe, 0x7e,
-0x5f, 0x3c, 0xdb, 0x34, 0xea, 0x37, 0xec, 0x3b, 0xd5, 0x28, 0xd2, 0x07, 0x8c, 0x9a, 0xb6,
-0xee, 0x5e, 0x3e, 0xdf, 0x1d, 0x99, 0xb0, 0xe2, 0x46, 0xef, 0x5c, 0x1b, 0xb4, 0xea, 0x56,
-0x2e, 0xde, 0x1f, 0x9d, 0xb8, 0xd3, 0x24, 0xab, 0xd4, 0x2a, 0xd6, 0x2e, 0xde, 0x1f, 0x9d,
-0xb8, 0xf2, 0x66, 0x2f, 0xbd, 0xf8, 0x72, 0x66, 0x4e, 0x1e, 0x9f, 0x9d, 0xb8, 0xf2, 0x47,
-0x0c, 0x9a, 0xb6, 0xee, 0x3f, 0xfc, 0x7a, 0x57, 0x0d, 0x79, 0x70, 0x62, 0x27, 0xad, 0xb9,
-0xd1, 0x01, 0x61, 0x40, 0x02, 0x67, 0x2d, 0xd8, 0x32, 0xe6, 0x2f, 0xdc, 0x3a, 0xd7, 0x2c,
-0xbb, 0xf4, 0x4b, 0xf5, 0x49, 0xf1, 0x60, 0x23, 0xc4, 0x0a, 0x77, 0x4d, 0xf9, 0x51, 0x01,
-0x80, 0x63, 0x25, 0xa9, 0xb1, 0xe0, 0x42, 0xe7, 0x4c, 0x1a, 0x97, 0xac, 0xbb, 0xf4, 0x6a,
-0x37, 0xcd, 0x18, 0xb2, 0xe6, 0x2f, 0xdc, 0x1b, 0x95, 0xa8, 0xd2, 0x07, 0x6d, 0x58, 0x32,
-0xe6, 0x4e, 0x1e, 0x9f, 0xbc, 0xfa, 0x57, 0x0d, 0x79, 0x51, 0x20, 0xc2, 0x06, 0x6f, 0x5c,
-0x1b, 0x95, 0xa8, 0xb3, 0xc5, 0xe9, 0x31, 0xe0, 0x23, 0xc4, 0x0a, 0x77, 0x4d, 0x18, 0x93,
-0x85, 0x69, 0x31, 0xc1, 0xe1, 0x21, 0xc0, 0xe3, 0x44, 0x0a, 0x77, 0x6c, 0x5a, 0x17, 0x8d,
-0x98, 0x93, 0xa4, 0xab, 0xd4, 0x2a, 0xb7, 0xec, 0x5a, 0x17, 0xac, 0xbb, 0xf4, 0x4b, 0x14,
-0xaa, 0xb7, 0xec, 0x3b, 0xd5, 0x28, 0xb3, 0xc5, 0xe9, 0x31, 0xc1, 0x00, 0x82, 0x67, 0x4c,
-0xfb, 0x55, 0x28, 0xd2, 0x26, 0xaf, 0xbd, 0xd9, 0x11, 0x81, 0x61, 0x21, 0xa1, 0xa1, 0xc0,
-0x02, 0x86, 0x6f, 0x5c, 0x1b, 0xb4, 0xcb, 0x14, 0x8b, 0x94, 0xaa, 0xd6, 0x2e, 0xbf, 0xdd,
-0x19, 0xb0, 0xe2, 0x46, 0x0e, 0x7f, 0x7c, 0x5b, 0x15, 0x89, 0x90, 0x83, 0x84, 0x6b, 0x54,
-0x0b, 0x75, 0x68, 0x52, 0x07, 0x6d, 0x58, 0x32, 0xc7, 0xed, 0x58, 0x32, 0xc7, 0xed, 0x58,
-0x32, 0xe6, 0x4e, 0xff, 0x7c, 0x7a, 0x76, 0x6e, 0x3f, 0xdd, 0x38, 0xd3, 0x05, 0x88, 0x92,
-0xa6, 0xaf, 0xdc, 0x1b, 0xb4, 0xcb, 0xf5, 0x68, 0x52, 0x07, 0x8c, 0x7b, 0x55, 0x09, 0x90,
-0x83, 0x84, 0x6b, 0x54, 0x2a, 0xb7, 0xec, 0x3b, 0xd5, 0x09, 0x90, 0xa2, 0xc6, 0x0e, 0x7f,
-0x7c, 0x7a, 0x57, 0x0d, 0x98, 0xb2, 0xc7, 0xed, 0x58, 0x32, 0xc7, 0x0c, 0x7b, 0x74, 0x4b,
-0x14, 0x8b, 0x94, 0xaa, 0xb7, 0xcd, 0x18, 0x93, 0xa4, 0xca, 0x16, 0xae, 0xbf, 0xdd, 0x19,
-0xb0, 0xe2, 0x46, 0x0e, 0x7f, 0x5d, 0x19, 0x91, 0x81, 0x80, 0x63, 0x44, 0xeb, 0x35, 0xc9,
-0x10, 0x83, 0x65, 0x48, 0x12, 0xa6, 0xce, 0x1e, 0x9f, 0xbc, 0xdb, 0x15, 0x89, 0x71, 0x60,
-0x23, 0xc4, 0xeb, 0x54, 0x2a, 0xb7, 0xec, 0x5a, 0x36, 0xcf, 0x81, 0x10, 0xac, 0x74 };
+#define FIRMWARE_LENGTH 4094
+
+// Firmware Blob for PMW3389
+
+// clang-format off
+const uint8_t firmware_data[FIRMWARE_LENGTH] PROGMEM = {
+    0x01, 0xe8, 0xba, 0x26, 0x0b, 0xb2, 0xbe, 0xfe, 0x7e, 0x5f, 0x3c, 0xdb, 0x15, 0xa8, 0xb3,
+    0xe4, 0x2b, 0xb5, 0xe8, 0x53, 0x07, 0x6d, 0x3b, 0xd1, 0x20, 0xc2, 0x06, 0x6f, 0x3d, 0xd9,
+    0x11, 0xa0, 0xc2, 0xe7, 0x2d, 0xb9, 0xd1, 0x20, 0xa3, 0xa5, 0xc8, 0xf3, 0x64, 0x4a, 0xf7,
+    0x4d, 0x18, 0x93, 0xa4, 0xca, 0xf7, 0x6c, 0x5a, 0x36, 0xee, 0x5e, 0x3e, 0xfe, 0x7e, 0x7e,
+    0x5f, 0x1d, 0x99, 0xb0, 0xc3, 0xe5, 0x29, 0xd3, 0x03, 0x65, 0x48, 0x12, 0x87, 0x6d, 0x58,
+    0x32, 0xe6, 0x2f, 0xdc, 0x3a, 0xf2, 0x4f, 0xfd, 0x59, 0x11, 0x81, 0x61, 0x21, 0xc0, 0x02,
+    0x86, 0x8e, 0x7f, 0x5d, 0x38, 0xf2, 0x47, 0x0c, 0x7b, 0x55, 0x28, 0xb3, 0xe4, 0x4a, 0x16,
+    0xab, 0xbf, 0xdd, 0x38, 0xf2, 0x66, 0x4e, 0xff, 0x5d, 0x19, 0x91, 0xa0, 0xa3, 0xa5, 0xc8,
+    0x12, 0xa6, 0xaf, 0xdc, 0x3a, 0xd1, 0x41, 0x60, 0x75, 0x58, 0x24, 0x92, 0xd4, 0x72, 0x6c,
+    0xe0, 0x2f, 0xfd, 0x23, 0x8d, 0x1c, 0x5b, 0xb2, 0x97, 0x36, 0x3d, 0x0b, 0xa2, 0x49, 0xb1,
+    0x58, 0xf2, 0x1f, 0xc0, 0xcb, 0xf8, 0x41, 0x4f, 0xcd, 0x1e, 0x6b, 0x39, 0xa7, 0x2b, 0xe9,
+    0x30, 0x16, 0x83, 0xd2, 0x0e, 0x47, 0x8f, 0xe3, 0xb1, 0xdf, 0xa2, 0x15, 0xdb, 0x5d, 0x30,
+    0xc5, 0x1a, 0xab, 0x31, 0x99, 0xf3, 0xfa, 0xb2, 0x86, 0x69, 0xad, 0x7a, 0xe8, 0xa7, 0x18,
+    0x6a, 0xcc, 0xc8, 0x65, 0x23, 0x87, 0xa8, 0x5f, 0xf5, 0x21, 0x59, 0x75, 0x09, 0x71, 0x45,
+    0x55, 0x25, 0x4b, 0xda, 0xa1, 0xc3, 0xf7, 0x41, 0xab, 0x59, 0xd9, 0x74, 0x12, 0x55, 0x5f,
+    0xbc, 0xaf, 0xd9, 0xfd, 0xb0, 0x1e, 0xa3, 0x0f, 0xff, 0xde, 0x11, 0x16, 0x6a, 0xae, 0x0e,
+    0xe1, 0x5d, 0x3c, 0x10, 0x43, 0x9a, 0xa1, 0x0b, 0x24, 0x8f, 0x0d, 0x7f, 0x0b, 0x5e, 0x4c,
+    0x42, 0xa4, 0x84, 0x2c, 0x40, 0xd0, 0x55, 0x39, 0xe6, 0x4b, 0xf8, 0x9b, 0x2f, 0xdc, 0x28,
+    0xff, 0xfa, 0xb5, 0x85, 0x19, 0xe5, 0x28, 0xa1, 0x77, 0xaa, 0x73, 0xf3, 0x03, 0xc7, 0x62,
+    0xa6, 0x91, 0x18, 0xc9, 0xb0, 0xcd, 0x05, 0xdc, 0xca, 0x81, 0x26, 0x1a, 0x47, 0x40, 0xda,
+    0x36, 0x7d, 0x6a, 0x53, 0xc8, 0x5a, 0x77, 0x5d, 0x19, 0xa4, 0x1b, 0x23, 0x83, 0xd0, 0xb2,
+    0xaa, 0x0e, 0xbf, 0x77, 0x4e, 0x3a, 0x3b, 0x59, 0x00, 0x31, 0x0d, 0x02, 0x1b, 0x88, 0x7a,
+    0xd4, 0xbd, 0x9d, 0xcc, 0x58, 0x04, 0x69, 0xf6, 0x3b, 0xca, 0x42, 0xe2, 0xfd, 0xc3, 0x3d,
+    0x39, 0xc5, 0xd0, 0x71, 0xe4, 0xc8, 0xb7, 0x3e, 0x3f, 0xc8, 0xe9, 0xca, 0xc9, 0x3f, 0x04,
+    0x4e, 0x1b, 0x79, 0xca, 0xa5, 0x61, 0xc2, 0xed, 0x1d, 0xa6, 0xda, 0x5a, 0xe9, 0x7f, 0x65,
+    0x8c, 0xbe, 0x12, 0x6e, 0xa4, 0x5b, 0x33, 0x2f, 0x84, 0x28, 0x9c, 0x1c, 0x88, 0x2d, 0xff,
+    0x07, 0xbf, 0xa6, 0xd7, 0x5a, 0x88, 0x86, 0xb0, 0x3f, 0xf6, 0x31, 0x5b, 0x11, 0x6d, 0xf5,
+    0x58, 0xeb, 0x58, 0x02, 0x9e, 0xb5, 0x9a, 0xb1, 0xff, 0x25, 0x9d, 0x8b, 0x4f, 0xb6, 0x0a,
+    0xf9, 0xea, 0x3e, 0x3f, 0x21, 0x09, 0x65, 0x21, 0x22, 0xfe, 0x3d, 0x4e, 0x11, 0x5b, 0x9e,
+    0x5a, 0x59, 0x8b, 0xdd, 0xd8, 0xce, 0xd6, 0xd9, 0x59, 0xd2, 0x1e, 0xfd, 0xef, 0x0d, 0x1b,
+    0xd9, 0x61, 0x7f, 0xd7, 0x2d, 0xad, 0x62, 0x09, 0xe5, 0x22, 0x63, 0xea, 0xc7, 0x31, 0xd9,
+    0xa1, 0x38, 0x80, 0x5c, 0xa7, 0x32, 0x82, 0xec, 0x1b, 0xa2, 0x49, 0x5a, 0x06, 0xd2, 0x7c,
+    0xc9, 0x96, 0x57, 0xbb, 0x17, 0x75, 0xfc, 0x7a, 0x8f, 0x0d, 0x77, 0xb5, 0x7a, 0x8e, 0x3e,
+    0xf4, 0xba, 0x2f, 0x69, 0x13, 0x26, 0xd6, 0xd9, 0x21, 0x60, 0x2f, 0x21, 0x3e, 0x87, 0xee,
+    0xfd, 0x87, 0x16, 0x0d, 0xc8, 0x08, 0x00, 0x25, 0x71, 0xac, 0x2c, 0x03, 0x2a, 0x37, 0x2d,
+    0xb3, 0x34, 0x09, 0x91, 0xe3, 0x06, 0x2c, 0x38, 0x37, 0x95, 0x3b, 0x17, 0x7a, 0xaf, 0xac,
+    0x99, 0x55, 0xab, 0x41, 0x39, 0x5f, 0x8e, 0xa6, 0x43, 0x80, 0x03, 0x88, 0x6f, 0x7d, 0xbd,
+    0x5a, 0xb4, 0x2b, 0x32, 0x23, 0x5a, 0xa9, 0x31, 0x32, 0x39, 0x4c, 0x5b, 0xf4, 0x6b, 0xaf,
+    0x66, 0x6f, 0x3c, 0x8e, 0x2d, 0x82, 0x97, 0x9f, 0x4a, 0x01, 0xdc, 0x99, 0x98, 0x00, 0xec,
+    0x38, 0x7a, 0x79, 0x70, 0xa6, 0x85, 0xd6, 0x21, 0x63, 0x0d, 0x45, 0x9a, 0x2e, 0x5e, 0xa7,
+    0xb1, 0xea, 0x66, 0x6a, 0xbc, 0x62, 0x2d, 0x7b, 0x7d, 0x85, 0xea, 0x95, 0x2f, 0xc0, 0xe8,
+    0x6f, 0x35, 0xa0, 0x3a, 0x02, 0x25, 0xbc, 0xb2, 0x5f, 0x5c, 0x43, 0x96, 0xcc, 0x26, 0xd2,
+    0x16, 0xb4, 0x96, 0x73, 0xd7, 0x13, 0xc7, 0xae, 0x53, 0x15, 0x31, 0x89, 0x68, 0x66, 0x6d,
+    0x2c, 0x92, 0x1f, 0xcc, 0x5b, 0xa7, 0x8f, 0x5d, 0xbb, 0xc9, 0xdb, 0xe8, 0x3b, 0x9d, 0x61,
+    0x74, 0x8b, 0x05, 0xa1, 0x58, 0x52, 0x68, 0xee, 0x3d, 0x39, 0x79, 0xa0, 0x9b, 0xdd, 0xe1,
+    0x55, 0xc9, 0x60, 0xeb, 0xad, 0xb8, 0x5b, 0xc2, 0x5a, 0xb5, 0x2c, 0x18, 0x55, 0xa9, 0x50,
+    0xc3, 0xf6, 0x72, 0x5f, 0xcc, 0xe2, 0xf4, 0x55, 0xb5, 0xd6, 0xb5, 0x4a, 0x99, 0xa5, 0x28,
+    0x74, 0x97, 0x18, 0xe8, 0xc0, 0x84, 0x89, 0x50, 0x03, 0x86, 0x4d, 0x1a, 0xb7, 0x09, 0x90,
+    0xa2, 0x01, 0x04, 0xbb, 0x73, 0x62, 0xcb, 0x97, 0x22, 0x70, 0x5d, 0x52, 0x41, 0x8e, 0xd9,
+    0x90, 0x15, 0xaa, 0xab, 0x0a, 0x31, 0x65, 0xb4, 0xda, 0xd0, 0xee, 0x24, 0xc9, 0x41, 0x91,
+    0x1e, 0xbc, 0x46, 0x70, 0x40, 0x9d, 0xda, 0x0e, 0x2a, 0xe4, 0xb2, 0x4c, 0x9f, 0xf2, 0xfc,
+    0xf3, 0x84, 0x17, 0x44, 0x1e, 0xd7, 0xca, 0x23, 0x1f, 0x3f, 0x5a, 0x22, 0x3d, 0xaf, 0x9b,
+    0x2d, 0xfc, 0x41, 0xad, 0x26, 0xb4, 0x45, 0x67, 0x0b, 0x80, 0x0e, 0xf9, 0x61, 0x37, 0xec,
+    0x3b, 0xf4, 0x4b, 0x14, 0xdf, 0x5a, 0x0c, 0x3a, 0x50, 0x0b, 0x14, 0x0c, 0x72, 0xae, 0xc6,
+    0xc5, 0xec, 0x35, 0x53, 0x2d, 0x59, 0xed, 0x91, 0x74, 0xe2, 0xc4, 0xc8, 0xf2, 0x25, 0x6b,
+    0x97, 0x6f, 0xc9, 0x76, 0xce, 0xa9, 0xb1, 0x99, 0x8f, 0x5a, 0x92, 0x3b, 0xc4, 0x8d, 0x54,
+    0x50, 0x40, 0x72, 0xd6, 0x90, 0x83, 0xfc, 0xe5, 0x49, 0x8b, 0x17, 0xf5, 0xfd, 0x6b, 0x8d,
+    0x32, 0x02, 0xe9, 0x0a, 0xfe, 0xbf, 0x00, 0x6b, 0xa3, 0xad, 0x5f, 0x09, 0x4b, 0x97, 0x2b,
+    0x00, 0x58, 0x65, 0x2e, 0x07, 0x49, 0x0a, 0x3b, 0x6b, 0x2e, 0x50, 0x6c, 0x1d, 0xac, 0xb7,
+    0x6a, 0x26, 0xd8, 0x13, 0xa4, 0xca, 0x16, 0xae, 0xab, 0x93, 0xb9, 0x1c, 0x1c, 0xb4, 0x47,
+    0x6a, 0x38, 0x36, 0x17, 0x27, 0xc9, 0x7f, 0xc7, 0x64, 0xcb, 0x89, 0x58, 0xc5, 0x61, 0xc2,
+    0xc6, 0xea, 0x15, 0x0b, 0x34, 0x0c, 0x5d, 0x61, 0x76, 0x6e, 0x2b, 0x62, 0x40, 0x92, 0xa3,
+    0x6c, 0xef, 0xf4, 0xe4, 0xc3, 0xa1, 0xa8, 0xf5, 0x94, 0x79, 0x0d, 0xd1, 0x3d, 0xcb, 0x3d,
+    0x40, 0xb6, 0xd0, 0xf0, 0x10, 0x54, 0xd8, 0x47, 0x25, 0x51, 0xc5, 0x41, 0x79, 0x00, 0xe5,
+    0xa0, 0x72, 0xde, 0xbb, 0x3b, 0x62, 0x17, 0xf6, 0xbc, 0x5d, 0x00, 0x76, 0x2e, 0xa7, 0x3b,
+    0xb6, 0xf1, 0x98, 0x72, 0x59, 0x2a, 0x73, 0xb0, 0x21, 0xd6, 0x49, 0xe0, 0xc0, 0xd5, 0xeb,
+    0x02, 0x7d, 0x4b, 0x41, 0x28, 0x70, 0x2d, 0xec, 0x2b, 0x71, 0x1f, 0x0b, 0xb9, 0x71, 0x63,
+    0x06, 0xe6, 0xbc, 0x60, 0xbb, 0xf4, 0x9a, 0x62, 0x43, 0x09, 0x18, 0x4e, 0x93, 0x06, 0x4d,
+    0x76, 0xfa, 0x7f, 0xbd, 0x02, 0xe4, 0x50, 0x91, 0x12, 0xe5, 0x86, 0xff, 0x64, 0x1e, 0xaf,
+    0x7e, 0xb3, 0xb2, 0xde, 0x89, 0xc1, 0xa2, 0x6f, 0x40, 0x7b, 0x41, 0x51, 0x63, 0xea, 0x25,
+    0xd1, 0x97, 0x57, 0x92, 0xa8, 0x45, 0xa1, 0xa5, 0x45, 0x21, 0x43, 0x7f, 0x83, 0x15, 0x29,
+    0xd0, 0x30, 0x53, 0x32, 0xb4, 0x5a, 0x17, 0x96, 0xbc, 0xc2, 0x68, 0xa9, 0xb7, 0xaf, 0xac,
+    0xdf, 0xf1, 0xe3, 0x89, 0xba, 0x24, 0x79, 0x54, 0xc6, 0x14, 0x07, 0x1c, 0x1e, 0x0d, 0x3a,
+    0x6b, 0xe5, 0x3d, 0x4e, 0x10, 0x60, 0x96, 0xec, 0x6c, 0xda, 0x47, 0xae, 0x03, 0x25, 0x39,
+    0x1d, 0x74, 0xc8, 0xac, 0x6a, 0xf2, 0x6b, 0x05, 0x2a, 0x9a, 0xe7, 0xe8, 0x92, 0xd6, 0xc2,
+    0x6d, 0xfa, 0xe8, 0xa7, 0x9d, 0x5f, 0x48, 0xc9, 0x75, 0xf1, 0x66, 0x6a, 0xdb, 0x5d, 0x9a,
+    0xcd, 0x27, 0xdd, 0xb9, 0x24, 0x04, 0x9c, 0x18, 0xc2, 0x6d, 0x0c, 0x91, 0x34, 0x48, 0x42,
+    0x6f, 0xe9, 0x59, 0x70, 0xc4, 0x7e, 0x81, 0x0e, 0x32, 0x0a, 0x93, 0x48, 0xb0, 0xc0, 0x15,
+    0x9e, 0x05, 0xac, 0x36, 0x16, 0xcb, 0x59, 0x65, 0xa0, 0x83, 0xdf, 0x3e, 0xda, 0xfb, 0x1d,
+    0x1a, 0xdb, 0x65, 0xec, 0x9a, 0xc6, 0xc3, 0x8e, 0x3c, 0x45, 0xfd, 0xc8, 0xf5, 0x1c, 0x6a,
+    0x67, 0x0d, 0x8f, 0x99, 0x7d, 0x30, 0x21, 0x8c, 0xea, 0x22, 0x87, 0x65, 0xc9, 0xb2, 0x4c,
+    0xe4, 0x1b, 0x46, 0xba, 0x54, 0xbd, 0x7c, 0xca, 0xd5, 0x8f, 0x5b, 0xa5, 0x01, 0x04, 0xd8,
+    0x0a, 0x16, 0xbf, 0xb9, 0x50, 0x2e, 0x37, 0x2f, 0x64, 0xf3, 0x70, 0x11, 0x02, 0x05, 0x31,
+    0x9b, 0xa0, 0xb2, 0x01, 0x5e, 0x4f, 0x19, 0xc9, 0xd4, 0xea, 0xa1, 0x79, 0x54, 0x53, 0xa7,
+    0xde, 0x2f, 0x49, 0xd3, 0xd1, 0x63, 0xb5, 0x03, 0x15, 0x4e, 0xbf, 0x04, 0xb3, 0x26, 0x8b,
+    0x20, 0xb2, 0x45, 0xcf, 0xcd, 0x5b, 0x82, 0x32, 0x88, 0x61, 0xa7, 0xa8, 0xb2, 0xa0, 0x72,
+    0x96, 0xc0, 0xdb, 0x2b, 0xe2, 0x5f, 0xba, 0xe3, 0xf5, 0x8a, 0xde, 0xf1, 0x18, 0x01, 0x16,
+    0x40, 0xd9, 0x86, 0x12, 0x09, 0x18, 0x1b, 0x05, 0x0c, 0xb1, 0xb5, 0x47, 0xe2, 0x43, 0xab,
+    0xfe, 0x92, 0x63, 0x7e, 0x95, 0x2b, 0xf0, 0xaf, 0xe1, 0xf1, 0xc3, 0x4a, 0xff, 0x2b, 0x09,
+    0xbb, 0x4a, 0x0e, 0x9a, 0xc4, 0xd8, 0x64, 0x7d, 0x83, 0xa0, 0x4f, 0x44, 0xdb, 0xc4, 0xa8,
+    0x58, 0xef, 0xfc, 0x9e, 0x77, 0xf9, 0xa6, 0x8f, 0x58, 0x8b, 0x12, 0xf4, 0xe9, 0x81, 0x12,
+    0x47, 0x51, 0x41, 0x83, 0xef, 0xf6, 0x73, 0xbc, 0x8e, 0x0f, 0x4c, 0x8f, 0x4e, 0x69, 0x90,
+    0x77, 0x29, 0x5d, 0x92, 0xb0, 0x6d, 0x06, 0x67, 0x29, 0x60, 0xbd, 0x4b, 0x17, 0xc8, 0x89,
+    0x69, 0x28, 0x29, 0xd6, 0x78, 0xcb, 0x11, 0x4c, 0xba, 0x8b, 0x68, 0xae, 0x7e, 0x9f, 0xef,
+    0x95, 0xda, 0xe2, 0x9e, 0x7f, 0xe9, 0x55, 0xe5, 0xe1, 0xe2, 0xb7, 0xe6, 0x5f, 0xbb, 0x2c,
+    0xa2, 0xe6, 0xee, 0xc7, 0x0a, 0x60, 0xa9, 0xd1, 0x80, 0xdf, 0x7f, 0xd6, 0x97, 0xab, 0x1d,
+    0x22, 0x25, 0xfc, 0x79, 0x23, 0xe0, 0xae, 0xc5, 0xef, 0x16, 0xa4, 0xa1, 0x0f, 0x92, 0xa9,
+    0xc7, 0xe3, 0x3a, 0x55, 0xdf, 0x62, 0x49, 0xd9, 0xf5, 0x84, 0x49, 0xc5, 0x90, 0x34, 0xd3,
+    0xe1, 0xac, 0x99, 0x21, 0xb1, 0x02, 0x76, 0x4a, 0xfa, 0xd4, 0xbb, 0xa4, 0x9c, 0xa2, 0xe2,
+    0xcb, 0x3d, 0x3b, 0x14, 0x75, 0x60, 0xd1, 0x02, 0xb4, 0xa3, 0xb4, 0x72, 0x06, 0xf9, 0x19,
+    0x9c, 0xe2, 0xe4, 0xa7, 0x0f, 0x25, 0x88, 0xc6, 0x86, 0xd6, 0x8c, 0x74, 0x4e, 0x6e, 0xfc,
+    0xa8, 0x48, 0x9e, 0xa7, 0x9d, 0x1a, 0x4b, 0x37, 0x09, 0xc8, 0xb0, 0x10, 0xbe, 0x6f, 0xfe,
+    0xa3, 0xc4, 0x7a, 0xb5, 0x3d, 0xe8, 0x30, 0xf1, 0x0d, 0xa0, 0xb2, 0x44, 0xfc, 0x9b, 0x8c,
+    0xf8, 0x61, 0xed, 0x81, 0xd1, 0x62, 0x11, 0xb4, 0xe1, 0xd5, 0x39, 0x52, 0x89, 0xd3, 0xa8,
+    0x49, 0x31, 0xdf, 0xb6, 0xf9, 0x91, 0xf4, 0x1c, 0x9d, 0x09, 0x95, 0x40, 0x56, 0xe7, 0xe3,
+    0xcd, 0x5c, 0x92, 0xc1, 0x1d, 0x6b, 0xe9, 0x78, 0x6f, 0x8e, 0x94, 0x42, 0x66, 0xa2, 0xaa,
+    0xd3, 0xc8, 0x2e, 0xe3, 0xf6, 0x07, 0x72, 0x0b, 0x6b, 0x1e, 0x7b, 0xb9, 0x7c, 0xe0, 0xa0,
+    0xbc, 0xd9, 0x25, 0xdf, 0x87, 0xa8, 0x5f, 0x9c, 0xcc, 0xf0, 0xdb, 0x42, 0x8e, 0x07, 0x31,
+    0x13, 0x01, 0x66, 0x32, 0xd1, 0xb8, 0xd6, 0xe3, 0x5e, 0x12, 0x76, 0x61, 0xd3, 0x38, 0x89,
+    0xe6, 0x17, 0x6f, 0xa5, 0xf2, 0x71, 0x0e, 0xa5, 0xe2, 0x88, 0x30, 0xbb, 0xbe, 0x8a, 0xea,
+    0xc7, 0x62, 0xc4, 0xcf, 0xb8, 0xcd, 0x33, 0x8d, 0x3d, 0x3e, 0xb5, 0x60, 0x3a, 0x03, 0x92,
+    0xe4, 0x6d, 0x1b, 0xe0, 0xb4, 0x84, 0x08, 0x55, 0x88, 0xa7, 0x3a, 0xb9, 0x3d, 0x43, 0xc3,
+    0xc0, 0xfa, 0x07, 0x6a, 0xca, 0x94, 0xad, 0x99, 0x55, 0xf1, 0xf1, 0xc0, 0x23, 0x87, 0x1d,
+    0x3d, 0x1c, 0xd1, 0x66, 0xa0, 0x57, 0x10, 0x52, 0xa2, 0x7f, 0xbe, 0xf9, 0x88, 0xb6, 0x02,
+    0xbf, 0x08, 0x23, 0xa9, 0x0c, 0x63, 0x17, 0x2a, 0xae, 0xf5, 0xf7, 0xb7, 0x21, 0x83, 0x92,
+    0x31, 0x23, 0x0d, 0x20, 0xc3, 0xc2, 0x05, 0x21, 0x62, 0x8e, 0x45, 0xe8, 0x14, 0xc1, 0xda,
+    0x75, 0xb8, 0xf8, 0x92, 0x01, 0xd0, 0x5d, 0x18, 0x9f, 0x99, 0x11, 0x19, 0xf5, 0x35, 0xe8,
+    0x7f, 0x20, 0x88, 0x8c, 0x05, 0x75, 0xf5, 0xd7, 0x40, 0x17, 0xbb, 0x1e, 0x36, 0x52, 0xd9,
+    0xa4, 0x9c, 0xc2, 0x9d, 0x42, 0x81, 0xd8, 0xc7, 0x8a, 0xe7, 0x4c, 0x81, 0xe0, 0xb7, 0x57,
+    0xed, 0x48, 0x8b, 0xf0, 0x97, 0x15, 0x61, 0xd9, 0x2c, 0x7c, 0x45, 0xaf, 0xc2, 0xcd, 0xfc,
+    0xaa, 0x13, 0xad, 0x59, 0xcc, 0xb2, 0xb2, 0x6e, 0xdd, 0x63, 0x9c, 0x32, 0x0f, 0xec, 0x83,
+    0xbe, 0x78, 0xac, 0x91, 0x44, 0x1a, 0x1f, 0xea, 0xfd, 0x5d, 0x8e, 0xb4, 0xc0, 0x84, 0xd4,
+    0xac, 0xb4, 0x87, 0x5f, 0xac, 0xef, 0xdf, 0xcd, 0x12, 0x56, 0xc8, 0xcd, 0xfe, 0xc5, 0xda,
+    0xd3, 0xc1, 0x69, 0xf3, 0x61, 0x05, 0xea, 0x25, 0xe2, 0x12, 0x05, 0x8f, 0x39, 0x08, 0x08,
+    0x7c, 0x37, 0xb6, 0x7e, 0x5b, 0xd8, 0xb1, 0x0e, 0xf2, 0xdb, 0x4b, 0xf1, 0xad, 0x90, 0x01,
+    0x57, 0xcd, 0xa0, 0xb4, 0x52, 0xe8, 0xf3, 0xd7, 0x8a, 0xbd, 0x4f, 0x9f, 0x21, 0x40, 0x72,
+    0xa4, 0xfc, 0x0b, 0x01, 0x2b, 0x2f, 0xb6, 0x4c, 0x95, 0x2d, 0x35, 0x33, 0x41, 0x6b, 0xa0,
+    0x93, 0xe7, 0x2c, 0xf2, 0xd3, 0x72, 0x8b, 0xf4, 0x4f, 0x15, 0x3c, 0xaf, 0xd6, 0x12, 0xde,
+    0x3f, 0x83, 0x3f, 0xff, 0xf8, 0x7f, 0xf6, 0xcc, 0xa6, 0x7f, 0xc9, 0x9a, 0x6e, 0x1f, 0xc1,
+    0x0c, 0xfb, 0xee, 0x9c, 0xe7, 0xaf, 0xc9, 0x26, 0x54, 0xef, 0xb0, 0x39, 0xef, 0xb2, 0xe9,
+    0x23, 0xc4, 0xef, 0xd1, 0xa1, 0xa4, 0x25, 0x24, 0x6f, 0x8d, 0x6a, 0xe5, 0x8a, 0x32, 0x3a,
+    0xaf, 0xfc, 0xda, 0xce, 0x18, 0x25, 0x42, 0x07, 0x4d, 0x45, 0x8b, 0xdf, 0x85, 0xcf, 0x55,
+    0xb2, 0x24, 0xfe, 0x9c, 0x69, 0x74, 0xa7, 0x6e, 0xa0, 0xce, 0xc0, 0x39, 0xf4, 0x86, 0xc6,
+    0x8d, 0xae, 0xb9, 0x48, 0x64, 0x13, 0x0b, 0x40, 0x81, 0xa2, 0xc9, 0xa8, 0x85, 0x51, 0xee,
+    0x9f, 0xcf, 0xa2, 0x8c, 0x19, 0x52, 0x48, 0xe2, 0xc1, 0xa8, 0x58, 0xb4, 0x10, 0x24, 0x06,
+    0x58, 0x51, 0xfc, 0xb9, 0x12, 0xec, 0xfd, 0x73, 0xb4, 0x6d, 0x84, 0xfa, 0x06, 0x8b, 0x05,
+    0x0b, 0x2d, 0xd6, 0xd6, 0x1f, 0x29, 0x82, 0x9f, 0x19, 0x12, 0x1e, 0xb2, 0x04, 0x8f, 0x7f,
+    0x4d, 0xbd, 0x30, 0x2e, 0xe3, 0xe0, 0x88, 0x29, 0xc5, 0x93, 0xd6, 0x6c, 0x1f, 0x29, 0x45,
+    0x91, 0xa7, 0x58, 0xcd, 0x05, 0x17, 0xd6, 0x6d, 0xb3, 0xca, 0x66, 0xcc, 0x3c, 0x4a, 0x74,
+    0xfd, 0x08, 0x10, 0xa6, 0x99, 0x92, 0x10, 0xd2, 0x85, 0xab, 0x6e, 0x1d, 0x0e, 0x8b, 0x26,
+    0x46, 0xd1, 0x6c, 0x84, 0xc0, 0x26, 0x43, 0x59, 0x68, 0xf0, 0x13, 0x1d, 0xfb, 0xe3, 0xd1,
+    0xd2, 0xb4, 0x71, 0x9e, 0xf2, 0x59, 0x6a, 0x33, 0x29, 0x79, 0xd2, 0xd7, 0x26, 0xf1, 0xae,
+    0x78, 0x9e, 0x1f, 0x0f, 0x3f, 0xe3, 0xe8, 0xd0, 0x27, 0x78, 0x77, 0xf6, 0xac, 0x9c, 0x56,
+    0x39, 0x73, 0x8a, 0x6b, 0x2f, 0x34, 0x78, 0xb1, 0x11, 0xdb, 0xa4, 0x5c, 0x80, 0x01, 0x71,
+    0x6a, 0xc2, 0xd1, 0x2e, 0x5e, 0x76, 0x28, 0x70, 0x93, 0xae, 0x3e, 0x78, 0xb0, 0x1f, 0x0f,
+    0xda, 0xbf, 0xfb, 0x8a, 0x67, 0x65, 0x4f, 0x91, 0xed, 0x49, 0x75, 0x78, 0x62, 0xa2, 0x93,
+    0xb5, 0x70, 0x7f, 0x4d, 0x08, 0x4e, 0x79, 0x61, 0xa8, 0x5f, 0x7f, 0xb4, 0x65, 0x9f, 0x91,
+    0x54, 0x3a, 0xe8, 0x50, 0x33, 0xd3, 0xd5, 0x8a, 0x7c, 0xf3, 0x9e, 0x8b, 0x77, 0x7b, 0xc6,
+    0xc6, 0x0c, 0x45, 0x95, 0x1f, 0xb0, 0xd0, 0x0b, 0x27, 0x4a, 0xfd, 0xc7, 0xf7, 0x0d, 0x5a,
+    0x43, 0xc9, 0x7d, 0x35, 0xb0, 0x7d, 0xc4, 0x9c, 0x57, 0x1e, 0x76, 0x0d, 0xf1, 0x95, 0x30,
+    0x71, 0xcc, 0xb3, 0x66, 0x3b, 0x63, 0xa8, 0x6c, 0xa3, 0x43, 0xa0, 0x24, 0xcc, 0xb7, 0x53,
+    0xfe, 0xfe, 0xbc, 0x6e, 0x60, 0x89, 0xaf, 0x16, 0x21, 0xc8, 0x91, 0x6a, 0x89, 0xce, 0x80,
+    0x2c, 0xf1, 0x59, 0xce, 0xc3, 0x60, 0x61, 0x3b, 0x0b, 0x19, 0xfe, 0x99, 0xac, 0x65, 0x90,
+    0x15, 0x12, 0x05, 0xac, 0x7e, 0xff, 0x98, 0x7b, 0x66, 0x64, 0x0e, 0x4b, 0x5b, 0xaa, 0x8d,
+    0x3b, 0xd2, 0x56, 0xcf, 0x99, 0x39, 0xee, 0x22, 0x81, 0xd0, 0x60, 0x06, 0x66, 0x20, 0x81,
+    0x48, 0x3c, 0x6f, 0x3a, 0x77, 0xba, 0xcb, 0x52, 0xac, 0x79, 0x56, 0xaf, 0xe9, 0x16, 0x17,
+    0x0a, 0xa3, 0x82, 0x08, 0xd5, 0x3c, 0x97, 0xcb, 0x09, 0xff, 0x7f, 0xf9, 0x4f, 0x60, 0x05,
+    0xb9, 0x53, 0x26, 0xaa, 0xb8, 0x50, 0xaa, 0x19, 0x25, 0xae, 0x5f, 0xea, 0x8a, 0xd0, 0x89,
+    0x12, 0x80, 0x43, 0x50, 0x24, 0x12, 0x21, 0x14, 0xcd, 0x77, 0xeb, 0x21, 0xcc, 0x5c, 0x09,
+    0x64, 0xf3, 0xc7, 0xcb, 0xc5, 0x4b, 0xc3, 0xe7, 0xed, 0xe7, 0x86, 0x2c, 0x1d, 0x8e, 0x19,
+    0x52, 0x9b, 0x2a, 0x0c, 0x18, 0x72, 0x0b, 0x1e, 0x1b, 0xb0, 0x0f, 0x42, 0x99, 0x04, 0xae,
+    0xd5, 0xb7, 0x89, 0x1a, 0xb9, 0x4f, 0xd6, 0xaf, 0xf3, 0xc9, 0x93, 0x6f, 0xb0, 0x60, 0x83,
+    0x6e, 0x6b, 0xd1, 0x5f, 0x3f, 0x1a, 0x83, 0x1e, 0x24, 0x00, 0x87, 0xb5, 0x3e, 0xdb, 0xf9,
+    0x4d, 0xa7, 0x16, 0x2e, 0x19, 0x5b, 0x8f, 0x1b, 0x0d, 0x47, 0x72, 0x42, 0xe9, 0x0a, 0x11,
+    0x08, 0x2d, 0x88, 0x1c, 0xbc, 0xc7, 0xb4, 0xbe, 0x29, 0x4d, 0x03, 0x5e, 0xec, 0xdf, 0xf3,
+    0x3d, 0x2f, 0xe8, 0x1d, 0x9a, 0xd2, 0xd1, 0xab, 0x41, 0x3d, 0x87, 0x11, 0x45, 0xb0, 0x0d,
+    0x46, 0xf5, 0xe8, 0x95, 0x62, 0x1c, 0x68, 0xf7, 0xa6, 0x5b, 0x39, 0x4e, 0xbf, 0x47, 0xba,
+    0x5d, 0x7f, 0xb7, 0x6a, 0xf4, 0xba, 0x1d, 0x69, 0xf6, 0xa4, 0xe7, 0xe4, 0x6b, 0x3b, 0x0d,
+    0x23, 0x16, 0x4a, 0xb2, 0x68, 0xf0, 0xb2, 0x0d, 0x09, 0x17, 0x6a, 0x63, 0x8c, 0x83, 0xd3,
+    0xbd, 0x05, 0xc9, 0xf6, 0xf0, 0xa1, 0x31, 0x0b, 0x2c, 0xac, 0x83, 0xac, 0x80, 0x34, 0x32,
+    0xb4, 0xec, 0xd0, 0xbc, 0x54, 0x82, 0x9a, 0xc8, 0xf6, 0xa0, 0x7d, 0xc6, 0x79, 0x73, 0xf4,
+    0x20, 0x99, 0xf3, 0xb4, 0x01, 0xde, 0x91, 0x27, 0xf2, 0xc0, 0xdc, 0x81, 0x00, 0x4e, 0x7e,
+    0x07, 0x99, 0xc8, 0x3a, 0x51, 0xbc, 0x38, 0xd6, 0x8a, 0xa2, 0xde, 0x3b, 0x6a, 0x8c, 0x1a,
+    0x7c, 0x81, 0x0f, 0x3a, 0x1f, 0xe4, 0x05, 0x7b, 0x20, 0x35, 0x6b, 0xa5, 0x6a, 0xa7, 0xe7,
+    0xbc, 0x9c, 0x20, 0xec, 0x00, 0x15, 0xe2, 0x51, 0xaf, 0x77, 0xeb, 0x29, 0x3c, 0x7d, 0x2e,
+    0x00, 0x5c, 0x81, 0x21, 0xfa, 0x35, 0x6f, 0x40, 0xef, 0xfb, 0xd1, 0x3f, 0xcc, 0x9d, 0x55,
+    0x53, 0xfb, 0x5a, 0xa5, 0x56, 0x89, 0x0b, 0x52, 0xeb, 0x57, 0x73, 0x4f, 0x1b, 0x67, 0x24,
+    0xcb, 0xb8, 0x6a, 0x10, 0x69, 0xd6, 0xfb, 0x52, 0x40, 0xff, 0x20, 0xa5, 0xf3, 0x72, 0xe1,
+    0x3d, 0xa4, 0x8c, 0x81, 0x66, 0x16, 0x0d, 0x5d, 0xad, 0xa8, 0x50, 0x25, 0x78, 0x31, 0x77,
+    0x0c, 0x57, 0xe4, 0xe9, 0x15, 0x2d, 0xdb, 0x07, 0x87, 0xc8, 0xb0, 0x43, 0xde, 0xfc, 0xfe,
+    0xa9, 0xeb, 0xf5, 0xb0, 0xd3, 0x7b, 0xe9, 0x1f, 0x6e, 0xca, 0xe4, 0x03, 0x95, 0xc5, 0xd1,
+    0x59, 0x72, 0x63, 0xf0, 0x86, 0x54, 0xe8, 0x16, 0x62, 0x0b, 0x35, 0x29, 0xc2, 0x68, 0xd0,
+    0xd6, 0x3e, 0x90, 0x60, 0x57, 0x1d, 0xc9, 0xed, 0x3f, 0xed, 0xb0, 0x2f, 0x7e, 0x97, 0x02,
+    0x51, 0xec, 0xee, 0x6f, 0x82, 0x74, 0x76, 0x7f, 0xfb, 0xd6, 0xc4, 0xc3, 0xdd, 0xe8, 0xb1,
+    0x60, 0xfc, 0xc6, 0xb9, 0x0d, 0x6a, 0x33, 0x78, 0xc6, 0xc1, 0xbf, 0x86, 0x2c, 0x50, 0xcc,
+    0x9a, 0x70, 0x8e, 0x7b, 0xec, 0xab, 0x95, 0xac, 0x53, 0xa0, 0x4b, 0x07, 0x88, 0xaf, 0x42,
+    0xed, 0x19, 0x8d, 0xf6, 0x32, 0x17, 0x48, 0x47, 0x1d, 0x41, 0x6f, 0xfe, 0x2e, 0xa7, 0x8f,
+    0x4b, 0xa0, 0x51, 0xf3, 0xbf, 0x02, 0x0a, 0x48, 0x58, 0xf7, 0xa1, 0x6d, 0xea, 0xa5, 0x13,
+    0x5a, 0x5b, 0xea, 0x0c, 0x9e, 0x52, 0x4f, 0x9e, 0xb9, 0x71, 0x7f, 0x23, 0x83, 0xda, 0x1b,
+    0x86, 0x9a, 0x41, 0x29, 0xda, 0x70, 0xe7, 0x64, 0xa1, 0x7b, 0xd5, 0x0a, 0x22, 0x0d, 0x5c,
+    0x40, 0xc4, 0x81, 0x07, 0x25, 0x35, 0x4a, 0x1c, 0x10, 0xdb, 0x45, 0x0a, 0xff, 0x36, 0xd4,
+    0xe0, 0xeb, 0x5f, 0x68, 0xd6, 0x67, 0xc6, 0xd0, 0x8b, 0x76, 0x1a, 0x7d, 0x59, 0x42, 0xa1,
+    0xcb, 0x96, 0x4d, 0x84, 0x09, 0x9a, 0x3d, 0xe0, 0x52, 0x85, 0x6e, 0x48, 0x90, 0x85, 0x2a,
+    0x63, 0xb2, 0x69, 0xd2, 0x00, 0x43, 0x31, 0x37, 0xb3, 0x52, 0xaf, 0x62, 0xfa, 0xc1, 0xe0,
+    0x03, 0xfb, 0x62, 0xaa, 0x88, 0xc9, 0xb2, 0x2c, 0xd5, 0xa8, 0xf5, 0xa5, 0x4c, 0x12, 0x59,
+    0x4e, 0x06, 0x5e, 0x9b, 0x15, 0x66, 0x11, 0xb2, 0x27, 0x92, 0xdc, 0x98, 0x59, 0xde, 0xdf,
+    0xfa, 0x9a, 0x32, 0x2e, 0xc0, 0x5d, 0x3c, 0x33, 0x41, 0x6d, 0xaf, 0xb2, 0x25, 0x23, 0x14,
+    0xa5, 0x7b, 0xc7, 0x9b, 0x68, 0xf3, 0xda, 0xeb, 0xe3, 0xa9, 0xe2, 0x6f, 0x0e, 0x1d, 0x1c,
+    0xba, 0x55, 0xb6, 0x34, 0x6a, 0x93, 0x1f, 0x1f, 0xb8, 0x34, 0xc8, 0x84, 0x08, 0xb1, 0x6b,
+    0x6a, 0x28, 0x74, 0x74, 0xe5, 0xeb, 0x75, 0xe9, 0x7c, 0xd8, 0xba, 0xd8, 0x42, 0xa5, 0xee,
+    0x1f, 0x80, 0xd9, 0x96, 0xb2, 0x2e, 0xe7, 0xbf, 0xba, 0xeb, 0xd1, 0x69, 0xbb, 0x8f, 0xfd,
+    0x5a, 0x63, 0x8f, 0x39, 0x7f, 0xdf, 0x1d, 0x37, 0xd2, 0x18, 0x35, 0x9d, 0xb6, 0xcc, 0xe4,
+    0x27, 0x81, 0x89, 0x38, 0x38, 0x68, 0x33, 0xe7, 0x78, 0xd8, 0x76, 0xf5, 0xee, 0xd0, 0x4a,
+    0x07, 0x69, 0x19, 0x7a, 0xad, 0x18, 0xb1, 0x94, 0x61, 0x45, 0x53, 0xa2, 0x48, 0xda, 0x96,
+    0x4a, 0xf9, 0xee, 0x94, 0x2a, 0x1f, 0x6e, 0x18, 0x3c, 0x92, 0x46, 0xd1, 0x1a, 0x28, 0x18,
+    0x32, 0x1f, 0x3a, 0x45, 0xbe, 0x04, 0x35, 0x92, 0xe5, 0xa3, 0xcb, 0xb5, 0x2e, 0x32, 0x43,
+    0xac, 0x65, 0x17, 0x89, 0x99, 0x15, 0x03, 0x9e, 0xb1, 0x23, 0x2f, 0xed, 0x76, 0x4d, 0xd8,
+    0xac, 0x21, 0x40, 0xc4, 0x99, 0x4e, 0x65, 0x71, 0x2c, 0xb3, 0x45, 0xab, 0xfb, 0xe7, 0x72,
+    0x39, 0x56, 0x30, 0x6d, 0xfb, 0x74, 0xeb, 0x99, 0xf3, 0xcd, 0x57, 0x5c, 0x78, 0x75, 0xe9,
+    0x8d, 0xc3, 0xa2, 0xfb, 0x5d, 0xe0, 0x90, 0xc5, 0x55, 0xad, 0x91, 0x53, 0x4e, 0x9e, 0xbd,
+    0x8c, 0x49, 0xa4, 0xa4, 0x69, 0x10, 0x0c, 0xc5, 0x76, 0xe9, 0x25, 0x86, 0x8d, 0x66, 0x23,
+    0xa8, 0xdb, 0x5c, 0xe8, 0xd9, 0x30, 0xe1, 0x15, 0x7b, 0xc0, 0x99, 0x0f, 0x03, 0xec, 0xaa,
+    0x12, 0xef, 0xce, 0xd4, 0xea, 0x55, 0x5c, 0x08, 0x86, 0xf4, 0xf4, 0xb0, 0x83, 0x42, 0x95,
+    0x37, 0xb6, 0x38, 0xe0, 0x2b, 0x54, 0x89, 0xbd, 0x4e, 0x20, 0x9d, 0x3f, 0xc3, 0x4b, 0xb7,
+    0xec, 0xfa, 0x5a, 0x14, 0x03, 0xcb, 0x64, 0xc8, 0x34, 0x4a, 0x4b, 0x6e, 0xf8, 0x6e, 0x56,
+    0xf6, 0xdd, 0x5f, 0xa1, 0x24, 0xe2, 0xd4, 0xd0, 0x82, 0x64, 0x1f, 0x8e, 0x9b, 0xfa, 0xb4,
+    0xcb, 0xdb, 0x0a, 0xe8, 0x15, 0xfc, 0x15, 0xab, 0x4b, 0x18, 0xbf, 0xd4, 0x42, 0x14, 0x48,
+    0x82, 0x85, 0xdd, 0xeb, 0x49, 0x1b, 0x0b, 0x0b, 0x05, 0xe9, 0xb4, 0xa1, 0x33, 0x0a, 0x5d,
+    0x0e, 0x6c, 0x4b, 0xc0, 0xd6, 0x6c, 0x7c, 0xfb, 0x69, 0x0b, 0x53, 0x19, 0xe4, 0xf3, 0x35,
+    0xfc, 0xbe, 0xa1, 0x34, 0x02, 0x09, 0x4f, 0x74, 0x86, 0x92, 0xcd, 0x5d, 0x1a, 0xc1, 0x27,
+    0x0c, 0xf2, 0xc5, 0xcf, 0xdd, 0x23, 0x93, 0x02, 0xbd, 0x41, 0x5e, 0x42, 0xf0, 0xa0, 0x9d,
+    0x0c, 0x72, 0xc8, 0xec, 0x32, 0x0a, 0x8a, 0xfd, 0x3d, 0x5a, 0x41, 0x27, 0x0c, 0x88, 0x59,
+    0xad, 0x94, 0x2e, 0xef, 0x5d, 0x8f, 0xc7, 0xdf, 0x66, 0xe4, 0xdd, 0x56, 0x6c, 0x7b, 0xca,
+    0x55, 0x81, 0xae, 0xae, 0x5c, 0x1b, 0x1a, 0xab, 0xae, 0x99, 0x8d, 0xcc, 0x42, 0x97, 0x59,
+    0xf4, 0x14, 0x3f, 0x75, 0xc6, 0xd1, 0x88, 0xba, 0xaa, 0x84, 0x4a, 0xd0, 0x34, 0x08, 0x3b,
+    0x7d, 0xdb, 0x15, 0x06, 0xb0, 0x5c, 0xbd, 0x40, 0xf5, 0xa8, 0xec, 0xae, 0x36, 0x40, 0xdd,
+    0x90, 0x1c, 0x3e, 0x0d, 0x7e, 0x73, 0xc7, 0xc2, 0xc5, 0x6a, 0xff, 0x52, 0x05, 0x7f, 0xbe,
+    0xd0, 0x92, 0xfd, 0xb3, 0x6f, 0xff, 0x5d, 0xb7, 0x97, 0x64, 0x73, 0x7b, 0xca, 0xd1, 0x98,
+    0x24, 0x6b, 0x0b, 0x01, 0x68, 0xdd, 0x27, 0x85, 0x85, 0xb5, 0x83, 0xc1, 0xe0, 0x50, 0x64,
+    0xc7, 0xaf, 0xf1, 0xc6, 0x4d, 0xb1, 0xef, 0xc9, 0xb4, 0x0a, 0x6d, 0x65, 0xf3, 0x47, 0xcc,
+    0xa3, 0x02, 0x21, 0x0c, 0xbe, 0x22, 0x29, 0x05, 0xcf, 0x5f, 0xe8, 0x94, 0x6c, 0xe5, 0xdc,
+    0xc4, 0xdf, 0xbe, 0x3e, 0xa8, 0xb4, 0x18, 0xb0, 0x99, 0xb8, 0x6f, 0xff, 0x5d, 0xb9, 0xfd,
+    0x3b, 0x5d, 0x16, 0xbf, 0x3e, 0xd8, 0xb3, 0xd8, 0x08, 0x34, 0xf6, 0x47, 0x35, 0x5b, 0x72,
+    0x1a, 0x33, 0xad, 0x52, 0x5d, 0xb8, 0xd0, 0x77, 0xc6, 0xab, 0xba, 0x55, 0x09, 0x5f, 0x02,
+    0xf8, 0xd4, 0x5f, 0x53, 0x06, 0x91, 0xcd, 0x74, 0x42, 0xae, 0x54, 0x91, 0x81, 0x62, 0x13,
+    0x6f, 0xd8, 0xa9, 0x77, 0xc3, 0x6c, 0xcb, 0xf1, 0x29, 0x5a, 0xcc, 0xda, 0x35, 0xbd, 0x52,
+    0x23, 0xbe, 0x59, 0xeb, 0x12, 0x6d, 0xb7, 0x53, 0xee, 0xfc, 0xb4, 0x1b, 0x13, 0x5e, 0xba,
+    0x16, 0x7c, 0xc5, 0xf3, 0xe3, 0x6d, 0x07, 0x78, 0xf5, 0x2b, 0x21, 0x05, 0x88, 0x4c, 0xc0,
+    0xa1, 0xe3, 0x36, 0x10, 0xf8, 0x1b, 0xd8, 0x17, 0xfb, 0x6a, 0x4e, 0xd8, 0xb3, 0x47, 0x2d,
+    0x99, 0xbd, 0xbb, 0x5d, 0x37, 0x7d, 0xba, 0xf1, 0xe1, 0x7c, 0xc0, 0xc5, 0x54, 0x62, 0x7f,
+    0xcf, 0x5a, 0x4a, 0x93, 0xcc, 0xf1, 0x1b, 0x34, 0xc8, 0xa6, 0x05, 0x4c, 0x55, 0x8b, 0x54,
+    0x84, 0xd5, 0x77, 0xeb, 0xc0, 0x6d, 0x3a, 0x29, 0xbd, 0x75, 0x61, 0x09, 0x9a, 0x2c, 0xbb,
+    0xf7, 0x18, 0x79, 0x34, 0x90, 0x24, 0xa5, 0x81, 0x70, 0x87, 0xc5, 0x02, 0x7c, 0xba, 0xd4,
+    0x5e, 0x14, 0x8e, 0xe4, 0xed, 0xa2, 0x61, 0x6a, 0xb9, 0x6e, 0xb5, 0x4a, 0xb9, 0x01, 0x46,
+    0xf4, 0xcf, 0xbc, 0x09, 0x2f, 0x27, 0x4b, 0xbd, 0x86, 0x7a, 0x10, 0xe1, 0xd4, 0xc8, 0xd9,
+    0x20, 0x8d, 0x8a, 0x63, 0x00, 0x63, 0x44, 0xeb, 0x54, 0x0b, 0x75, 0x49, 0x10, 0xa2, 0xa7,
+    0xad, 0xb9, 0xd1, 0x01, 0x80, 0x63, 0x25, 0xc8, 0x12, 0xa6, 0xce, 0x1e, 0xbe, 0xfe, 0x7e,
+    0x5f, 0x3c, 0xdb, 0x34, 0xea, 0x37, 0xec, 0x3b, 0xd5, 0x28, 0xd2, 0x07, 0x8c, 0x9a, 0xb6,
+    0xee, 0x5e, 0x3e, 0xdf, 0x1d, 0x99, 0xb0, 0xe2, 0x46, 0xef, 0x5c, 0x1b, 0xb4, 0xea, 0x56,
+    0x2e, 0xde, 0x1f, 0x9d, 0xb8, 0xd3, 0x24, 0xab, 0xd4, 0x2a, 0xd6, 0x2e, 0xde, 0x1f, 0x9d,
+    0xb8, 0xf2, 0x66, 0x2f, 0xbd, 0xf8, 0x72, 0x66, 0x4e, 0x1e, 0x9f, 0x9d, 0xb8, 0xf2, 0x47,
+    0x0c, 0x9a, 0xb6, 0xee, 0x3f, 0xfc, 0x7a, 0x57, 0x0d, 0x79, 0x70, 0x62, 0x27, 0xad, 0xb9,
+    0xd1, 0x01, 0x61, 0x40, 0x02, 0x67, 0x2d, 0xd8, 0x32, 0xe6, 0x2f, 0xdc, 0x3a, 0xd7, 0x2c,
+    0xbb, 0xf4, 0x4b, 0xf5, 0x49, 0xf1, 0x60, 0x23, 0xc4, 0x0a, 0x77, 0x4d, 0xf9, 0x51, 0x01,
+    0x80, 0x63, 0x25, 0xa9, 0xb1, 0xe0, 0x42, 0xe7, 0x4c, 0x1a, 0x97, 0xac, 0xbb, 0xf4, 0x6a,
+    0x37, 0xcd, 0x18, 0xb2, 0xe6, 0x2f, 0xdc, 0x1b, 0x95, 0xa8, 0xd2, 0x07, 0x6d, 0x58, 0x32,
+    0xe6, 0x4e, 0x1e, 0x9f, 0xbc, 0xfa, 0x57, 0x0d, 0x79, 0x51, 0x20, 0xc2, 0x06, 0x6f, 0x5c,
+    0x1b, 0x95, 0xa8, 0xb3, 0xc5, 0xe9, 0x31, 0xe0, 0x23, 0xc4, 0x0a, 0x77, 0x4d, 0x18, 0x93,
+    0x85, 0x69, 0x31, 0xc1, 0xe1, 0x21, 0xc0, 0xe3, 0x44, 0x0a, 0x77, 0x6c, 0x5a, 0x17, 0x8d,
+    0x98, 0x93, 0xa4, 0xab, 0xd4, 0x2a, 0xb7, 0xec, 0x5a, 0x17, 0xac, 0xbb, 0xf4, 0x4b, 0x14,
+    0xaa, 0xb7, 0xec, 0x3b, 0xd5, 0x28, 0xb3, 0xc5, 0xe9, 0x31, 0xc1, 0x00, 0x82, 0x67, 0x4c,
+    0xfb, 0x55, 0x28, 0xd2, 0x26, 0xaf, 0xbd, 0xd9, 0x11, 0x81, 0x61, 0x21, 0xa1, 0xa1, 0xc0,
+    0x02, 0x86, 0x6f, 0x5c, 0x1b, 0xb4, 0xcb, 0x14, 0x8b, 0x94, 0xaa, 0xd6, 0x2e, 0xbf, 0xdd,
+    0x19, 0xb0, 0xe2, 0x46, 0x0e, 0x7f, 0x7c, 0x5b, 0x15, 0x89, 0x90, 0x83, 0x84, 0x6b, 0x54,
+    0x0b, 0x75, 0x68, 0x52, 0x07, 0x6d, 0x58, 0x32, 0xc7, 0xed, 0x58, 0x32, 0xc7, 0xed, 0x58,
+    0x32, 0xe6, 0x4e, 0xff, 0x7c, 0x7a, 0x76, 0x6e, 0x3f, 0xdd, 0x38, 0xd3, 0x05, 0x88, 0x92,
+    0xa6, 0xaf, 0xdc, 0x1b, 0xb4, 0xcb, 0xf5, 0x68, 0x52, 0x07, 0x8c, 0x7b, 0x55, 0x09, 0x90,
+    0x83, 0x84, 0x6b, 0x54, 0x2a, 0xb7, 0xec, 0x3b, 0xd5, 0x09, 0x90, 0xa2, 0xc6, 0x0e, 0x7f,
+    0x7c, 0x7a, 0x57, 0x0d, 0x98, 0xb2, 0xc7, 0xed, 0x58, 0x32, 0xc7, 0x0c, 0x7b, 0x74, 0x4b,
+    0x14, 0x8b, 0x94, 0xaa, 0xb7, 0xcd, 0x18, 0x93, 0xa4, 0xca, 0x16, 0xae, 0xbf, 0xdd, 0x19,
+    0xb0, 0xe2, 0x46, 0x0e, 0x7f, 0x5d, 0x19, 0x91, 0x81, 0x80, 0x63, 0x44, 0xeb, 0x35, 0xc9,
+    0x10, 0x83, 0x65, 0x48, 0x12, 0xa6, 0xce, 0x1e, 0x9f, 0xbc, 0xdb, 0x15, 0x89, 0x71, 0x60,
+    0x23, 0xc4, 0xeb, 0x54, 0x2a, 0xb7, 0xec, 0x5a, 0x36, 0xcf, 0x81, 0x10, 0xac, 0x74
+};
 
 // clang-format off
diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h
index 00229e8a24..6ff267e491 100644
--- a/quantum/pointing_device.h
+++ b/quantum/pointing_device.h
@@ -47,6 +47,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #elif defined(POINTING_DEVICE_DRIVER_pmw3360)
 #    include "spi_master.h"
 #    include "drivers/sensors/pmw3360.h"
+#elif defined(POINTING_DEVICE_DRIVER_pmw3389)
+#    include "spi_master.h"
+#    include "drivers/sensors/pmw3389.h"
 #else
 void           pointing_device_driver_init(void);
 report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report);
diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device_drivers.c
index 260a6d2eb4..4333bbb095 100644
--- a/quantum/pointing_device_drivers.c
+++ b/quantum/pointing_device_drivers.c
@@ -242,6 +242,42 @@ const pointing_device_driver_t pointing_device_driver = {
     .get_cpi    = pmw3360_get_cpi
 };
 // clang-format on
+#elif defined(POINTING_DEVICE_DRIVER_pmw3389)
+static void pmw3389_device_init(void) { pmw3389_init(); }
+
+report_mouse_t pmw3389_get_report(report_mouse_t mouse_report) {
+    report_pmw3389_t data        = pmw3389_read_burst();
+    static uint16_t  MotionStart = 0;  // Timer for accel, 0 is resting state
+
+    if (data.isOnSurface && data.isMotion) {
+        // Reset timer if stopped moving
+        if (!data.isMotion) {
+            if (MotionStart != 0) MotionStart = 0;
+            return mouse_report;
+        }
+
+        // Set timer if new motion
+        if ((MotionStart == 0) && data.isMotion) {
+#    ifdef CONSOLE_ENABLE
+            if (debug_mouse) dprintf("Starting motion.\n");
+#    endif
+            MotionStart = timer_read();
+        }
+        mouse_report.x = constrain_hid(data.dx);
+        mouse_report.y = constrain_hid(data.dy);
+    }
+
+    return mouse_report;
+}
+
+// clang-format off
+const pointing_device_driver_t pointing_device_driver = {
+    .init       = pmw3389_device_init,
+    .get_report = pmw3389_get_report,
+    .set_cpi    = pmw3389_set_cpi,
+    .get_cpi    = pmw3389_get_cpi
+};
+// clang-format on
 #else
 __attribute__((weak)) void           pointing_device_driver_init(void) {}
 __attribute__((weak)) report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) { return mouse_report; }

From 93e55605d9f2de7f214a003058bcefbb5a5a0e00 Mon Sep 17 00:00:00 2001
From: JayceFayne <13365789+JayceFayne@users.noreply.github.com>
Date: Wed, 12 Jan 2022 01:07:24 +0000
Subject: [PATCH 264/867] [Docs] fix typo and remove trailing whitespace
 (#15842)

---
 docs/squeezing_avr.md | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md
index f48643d1d9..e4d8d7c146 100644
--- a/docs/squeezing_avr.md
+++ b/docs/squeezing_avr.md
@@ -1,16 +1,16 @@
 # Squeezing the most out of AVR
 
-AVR is severely resource-constrained, and as QMK continues to grow, it is approaching a point where support for AVR may need to be moved to legacy status as newer development is unable to fit into those constraints.  
+AVR is severely resource-constrained, and as QMK continues to grow, it is approaching a point where support for AVR may need to be moved to legacy status as newer development is unable to fit into those constraints.
 
-However, if you need to reduce the compiled size of your firmware, there are a number of options to do so. 
+However, if you need to reduce the compiled size of your firmware, there are a number of options to do so.
 
 ## `rules.mk` Settings
-First and foremost is enabling link time optimization.  To do so, add this to your rules.mk: 
+First and foremost is enabling link time optimization. To do so, add this to your rules.mk: 
 ```make
 LTO_ENABLE = yes
 ```
-This will cause the final step to take longer, but should get you a smaller compiled size.  This also disables Action Functions, and Action Macros, both of which are deprecated.
-This will get you the most savings, in most situations. 
+This will cause the final step to take longer, but should get you a smaller compiled size. This also disables Action Functions, and Action Macros, both of which are deprecated.
+This will get you the most savings, in most situations.
 
 From there, disabling extraneous systems will help -- e.g.: 
 ```make
@@ -19,7 +19,7 @@ COMMAND_ENABLE = no
 MOUSEKEY_ENABLE = no
 EXTRAKEY_ENABLE = no
 ```
-This disables some of the functionality that you may not need.  But note that extrakeys disables stuff like the media keys and system volume control.
+This disables some of the functionality that you may not need. But note that extrakeys disables stuff like the media keys and system volume control.
 
 If that isn't enough to get your firmware down to size, then there are some additional features that you can disable: 
 ```make
@@ -27,19 +27,19 @@ SPACE_CADET_ENABLE = no
 GRAVE_ESC_ENABLE = no 
 MAGIC_ENABLE = no
 ```
-These features are enabled by default, but may not be needed.  Double check to make sure, though.  
-Largest in size is "magic" -- the QMK magic keycodes -- which control things like NKRO toggling, GUI and ALT/CTRL swapping, etc.  Disabling it will disable those functions. 
+These features are enabled by default, but may not be needed. Double check to make sure, though. 
+Largest in size is "magic" -- the QMK magic keycodes -- which control things like NKRO toggling, GUI and ALT/CTRL swapping, etc. Disabling it will disable those functions.
 
 ## `config.h` Settings
 
-If you've done all of that, and you don't want to disable features like RGB, Audio, OLEDs, etc, there are some additional options that you can add to your config.h that can help. 
+If you've done all of that, and you don't want to disable features like RGB, Audio, OLEDs, etc, there are some additional options that you can add to your config.h that can help.
 
-Starting with Lock Key support.  If you have an Cherry MX Lock switch (lucky you!), you don't want to do this.  But chances are, you don't.  In that case, add this to your `config.h`:
+Starting with Lock Key support. If you have an Cherry MX Lock switch (lucky you!), you don't want to do this. But chances are, you don't. In that case, add this to your `config.h`:
 ```c
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
 ```
-Oneshots.  If you're not using these, you can disable the feature by adding this to your `config.h`: 
+Oneshots. If you're not using these, you can disable the feature by adding this to your `config.h`: 
 ```c
 #define NO_ACTION_ONESHOT
 ```
@@ -49,7 +49,7 @@ The same with tapping keys (mod tap, layer tap, etc)
 ```
 ## Audio Settings
 
-If you're using the Audio feature, by default that includes the music mode feature.  This tranlates matrix positions into notes.  It's neat for sure, but most likely, you're not using it.  You can disable it by adding this to your `config.h`:
+If you're using the Audio feature, by default that includes the music mode feature. This tranlates matrix positions into notes. It's neat for sure, but most likely, you're not using it. You can disable it by adding this to your `config.h`:
 ```c
 #define NO_MUSIC_MODE
 ```
@@ -60,7 +60,7 @@ MUSIC_ENABLE = no
 
 ## Layers
 
-There are also some options for layers, that can reduce the firmware size.  All of these settngs are for your `config.h`. 
+There are also some options for layers, that can reduce the firmware size. All of these settings are for your `config.h`.
 
 You can limit the number of layers that the firmware uses -- if you're using less than 8 layers in total:
 ```c
@@ -93,7 +93,7 @@ into this:
     oled_write_P(PSTR("WPM: "), false);
     oled_write(get_u8_str(get_current_wpm(), ' '), false);
 ```
-which outputs `WPM:   5`.  Or this: 
+which outputs `WPM:   5`. Or this: 
 ```c
     // NEW CODE
     oled_write_P(PSTR("WPM: "), false);
@@ -103,7 +103,7 @@ which outputs `WPM: 005`.
 
 ## RGB Settings
 
-If you're using RGB on your board, both RGB Light (Underglow) and RGB Matrix (per key RGB) now require defines to enable different animations -- some keyboards enable a lot of animations by default, so you can generally gain back some space by disabling specific animations if you don't use them..  For RGB Light you can disable these in your keymap's `config.h`: 
+If you're using RGB on your board, both RGB Light (Underglow) and RGB Matrix (per key RGB) now require defines to enable different animations -- some keyboards enable a lot of animations by default, so you can generally gain back some space by disabling specific animations if you don't use them. For RGB Light you can disable these in your keymap's `config.h`:
 ```c
 #undef RGBLIGHT_ANIMATIONS
 #undef RGBLIGHT_EFFECT_BREATHING
@@ -118,7 +118,7 @@ If you're using RGB on your board, both RGB Light (Underglow) and RGB Matrix (pe
 #undef RGBLIGHT_EFFECT_TWINKLE
 ```
 
-For RGB Matrix, these need to be explicitly enabled as well. To disable any that were enabled by the keyboard, add one or more of these to your keymap's `config.h`: 
+For RGB Matrix, these need to be explicitly enabled as well. To disable any that were enabled by the keyboard, add one or more of these to your keymap's `config.h`:
 ```c
 #undef ENABLE_RGB_MATRIX_ALPHAS_MODS
 #undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
@@ -168,7 +168,7 @@ For RGB Matrix, these need to be explicitly enabled as well. To disable any that
 
 # Final Thoughts
 
-If you've done all of this, and your firmware is still too large, then it's time.  It's time to consider making the switch to ARM.  Unfortunately, right now is the worst possible time for that, due to the silicon shortage, and supply chain issues. Getting an ARM chip is difficult, at best, and significantly overpriced, at worst. 
+If you've done all of this, and your firmware is still too large, then it's time. It's time to consider making the switch to ARM. Unfortunately, right now is the worst possible time for that, due to the silicon shortage, and supply chain issues. Getting an ARM chip is difficult, at best, and significantly overpriced, at worst.
  -- Drashna
 
 That said, there are a number of Pro Micro replacements with ARM controllers: 
@@ -176,5 +176,5 @@ That said, there are a number of Pro Micro replacements with ARM controllers:
 * [Bonsai C](https://github.com/customMK/Bonsai-C) (Open Source, DIY/PCBA)
 * [Raspberry Pi 2040](https://www.sparkfun.com/products/18288) (not currently supported, no ETA)
 
-There are other, non-Pro Micro compatible boards out there. The most popular being: 
+There are other, non-Pro Micro compatible boards out there. The most popular being:
 * [WeAct Blackpill F411](https://www.aliexpress.com/item/1005001456186625.html) (~$6 USD)

From c4b0a06c798432173ce1f7a18602410c03a45415 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 13 Jan 2022 06:05:45 +0800
Subject: [PATCH 265/867] [Docs] Improve Handedness by EEPROM documentation
 (#15615)

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: filterpaper <filterpaper@localhost>
---
 docs/feature_split_keyboard.md | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/docs/feature_split_keyboard.md b/docs/feature_split_keyboard.md
index c8ba18beeb..dbc7740f98 100644
--- a/docs/feature_split_keyboard.md
+++ b/docs/feature_split_keyboard.md
@@ -130,14 +130,17 @@ To enable this method, add the following to your `config.h` file:
 #define EE_HANDS
 ```
 
-However, you'll have to flash the EEPROM files for the correct hand to each controller.  You can do this manually, or there are targets for avrdude and dfu to do this, while flashing the firmware: 
+Next, you will have to flash the EEPROM files once for the correct hand to the controller on each halve. You can do this manually with the following bootloader targets while flashing the firmware:
 
-* `:avrdude-split-left`
-* `:avrdude-split-right`
-* `:dfu-split-left`
-* `:dfu-split-right`
-* `:dfu-util-split-left`
-* `:dfu-util-split-right`
+* AVR controllers with the Caterina bootloader (e.g. Pro Micro):
+  * `:avrdude-split-left`
+  * `:avrdude-split-right`
+* AVR controllers with the stock Amtel DFU or DFU compatible bootloader (e.g. Elite-C):
+  * `:dfu-split-left`
+  * `:dfu-split-right`
+* ARM controllers with a DFU compatible bootloader (e.g. Proton-C):
+  * `:dfu-util-split-left`
+  * `:dfu-util-split-right`
 
 Example:
 
@@ -145,9 +148,13 @@ Example:
 make crkbd:default:avrdude-split-left
 ```
 
+?> ARM controllers using `dfu-util` will require an EEPROM reset after setting handedness. This can be done using the `EEP_RST` keycode or [Bootmagic Lite](feature_bootmagic.md). Controllers using emulated EEPROM will always require handedness parameter when flashing the firmware.
+
+?> [QMK Toolbox]() can also be used to flash EEPROM handedness files. Place the controller in bootloader mode and select menu option Tools -> EEPROM -> Set Left/Right Hand
+
 This setting is not changed when re-initializing the EEPROM using the `EEP_RST` key, or using the `eeconfig_init()` function.  However, if you reset the EEPROM outside of the firmware's built in options (such as flashing a file that overwrites the `EEPROM`, like how the [QMK Toolbox]()'s "Reset EEPROM" button works), you'll need to re-flash the controller with the `EEPROM` files. 
 
-You can find the `EEPROM` files in the QMK firmware repo, [here](https://github.com/qmk/qmk_firmware/tree/master/quantum/split_common). 
+You can find the `EEPROM` files in the QMK firmware repo, [here](https://github.com/qmk/qmk_firmware/tree/master/quantum/split_common).
 
 #### Handedness by `#define`
 

From ed151979671b36cadb7cd3c0505205c44d3fba73 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 12 Jan 2022 14:08:37 -0800
Subject: [PATCH 266/867] NoPunIn10Did Kastenwagen touch-up (#15836)

---
 keyboards/nopunin10did/jabberwocky/readme.md  |  2 +-
 .../nopunin10did/kastenwagen1840/info.json    |  3 +-
 .../kastenwagen1840/kastenwagen1840.h         | 33 +++++++++----------
 .../kastenwagen1840/keymaps/default/keymap.c  |  8 ++---
 .../kastenwagen1840/keymaps/via/keymap.c      |  8 ++---
 .../nopunin10did/kastenwagen1840/readme.md    | 16 ++++-----
 .../nopunin10did/kastenwagen48/info.json      |  3 +-
 .../kastenwagen48/kastenwagen48.h             | 17 +++++++++-
 .../kastenwagen48/keymaps/default/keymap.c    |  8 ++---
 .../keymaps/via}/keymap.c                     |  8 ++---
 .../kastenwagen48/keymaps/via/rules.mk        |  2 ++
 .../nopunin10did/kastenwagen48/readme.md      | 18 +++++-----
 keyboards/nopunin10did/railroad/readme.md     |  2 +-
 .../nopunin10did/railroad/rev0/readme.md      |  2 +-
 keyboards/nopunin10did/readme.md              | 14 ++++++++
 15 files changed, 83 insertions(+), 61 deletions(-)
 rename keyboards/nopunin10did/{kastenwagen1840/keymaps/default48 => kastenwagen48/keymaps/via}/keymap.c (98%)
 create mode 100644 keyboards/nopunin10did/kastenwagen48/keymaps/via/rules.mk
 create mode 100644 keyboards/nopunin10did/readme.md

diff --git a/keyboards/nopunin10did/jabberwocky/readme.md b/keyboards/nopunin10did/jabberwocky/readme.md
index d3557be61d..98c514caa8 100644
--- a/keyboards/nopunin10did/jabberwocky/readme.md
+++ b/keyboards/nopunin10did/jabberwocky/readme.md
@@ -10,7 +10,7 @@ Both the Dexterous and Sinister use the same firmware.  The numpad and the four
 
 For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w).
 
-* Keyboard Maintainer: [Alex Ronke](https://nopunin10did.com/), also known as NoPunIn10Did.
+* Keyboard Maintainer: [Alex Ronke](https://nopunin10did.com/), also known as [NoPunIn10Did](https://github.com/NoPunIn10Did)
 * Hardware Supported: Dexterous Jabberwocky and Sinister Jabberwocky (2021 March)
 * Hardware Availability: Currently by request only
 
diff --git a/keyboards/nopunin10did/kastenwagen1840/info.json b/keyboards/nopunin10did/kastenwagen1840/info.json
index 63b401f8e3..fabfd31aea 100644
--- a/keyboards/nopunin10did/kastenwagen1840/info.json
+++ b/keyboards/nopunin10did/kastenwagen1840/info.json
@@ -2,9 +2,8 @@
     "keyboard_name": "Kastenwagen 1840",
     "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/kastenwagen1840",
     "maintainer": "NoPunIn10Did",
-    "manufacturer": "NoPunIn10Did",
     "layouts": {
-        "LAYOUT_1840": {
+        "LAYOUT_all": {
             "layout": [
                 {"x":0   ,  "y":0,    "label":"Esc"},
                 {"x":1   ,  "y":0,    "label":"Q"},
diff --git a/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.h b/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.h
index b06cd3596c..a6fad98d00 100644
--- a/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.h
+++ b/keyboards/nopunin10did/kastenwagen1840/kastenwagen1840.h
@@ -18,8 +18,22 @@
 
 #include "quantum.h"
 
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐  ┌───┬───┬───┬───┐
+ * │100│101│110│111│120│121│130│131│140│141│150│151│160   │  │170│171│180│181│
+ * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬─────┤  ├───┼───┼───┼───┤
+ * │202 │203│212│213│222│223│232│233│242│243│252│253│262  │  │272│273│282│283│
+ * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬──┘  ├───┼───┼───┼───┤   ┌───┐
+ * │304   │305│314│315│324│325│334│335│344│345│354│355 │┌───┐│374│375│384│385│   │   │
+ * ├────┬─┴──┬┴──┬┴───┴───┴─┬─┴───┴──┬┴──┬┴───┼───┴┬───┘│364│└───┼───┼───┼───┤   │487│ 2u NumEnter
+ * │406 │407 │416│417       │437     │446│447 │456 │┌───┼───┼───┐│477│486│487│   │   │
+ * └────┴────┴───┴──────────┴────────┴───┴────┴────┘│457│467│476│└───┴───┴───┘   └───┘
+ *           ┌───────────────────────────┐          └───┴───┴───┘┌───────┐
+ *           │417                        │ 7u Space              │477    │ 2u Num0
+ *           └───────────────────────────┘                       └───────┘
+ */
 
-#define LAYOUT_1840( \
+#define LAYOUT_all( \
 K100  , K101  , K110  , K111  , K120  , K121  , K130  , K131  , K140  , K141  , K150  , K151  , K160        ,   K170  , K171  , K180  , K181  , \
 K202    , K203  , K212  , K213  , K222  , K223  , K232  , K233  , K242  , K243  , K252  , K253  , K262      ,   K272  , K273  , K282  , K283  , \
 K304        , K305  , K314  , K315  , K324  , K325  , K334  , K335  , K344  , K345  , K354  , K355    , K364  , K374  , K375  , K384  , K385  , \
@@ -35,20 +49,3 @@ K406    , K407    , K416  , K417                , K437            , K446  , K447
 	{ K406 , K416 , KC_NO, KC_NO, K446 , K456 , KC_NO, K476 , K486 }, \
 	{ K407 , K417 , KC_NO, K437 , K447 , K457 , K467 , K477 , K487 } \
 }
-
-#define LAYOUT_48( \
-K100  , K101  , K110  , K111  , K120  , K121  , K130  , K131  , K140  , K141  , K150  , K151  , K160        ,   K170  , \
-K202    , K203  , K212  , K213  , K222  , K223  , K232  , K233  , K242  , K243  , K252  , K253  , K262      ,   K272  , \
-K304        , K305  , K314  , K315  , K324  , K325  , K334  , K335  , K344  , K345  , K354  , K355    , K364  , K374  , \
-K406    , K407    , K416  , K417                , K437            , K446  , K447    , K456    ,  K457 , K467 , K476     \
-) \
-{ \
-	{ K100 , K110 , K120 , K130 , K140 , K150 , K160 , K170  }, \
-	{ K101 , K111 , K121 , K131 , K141 , K151 , KC_NO, KC_NO }, \
-	{ K202 , K212 , K222 , K232 , K242 , K252 , K262 , K272  }, \
-	{ K203 , K213 , K223 , K233 , K243 , K253 , KC_NO, KC_NO }, \
-	{ K304 , K314 , K324 , K334 , K344 , K354 , K364 , K374  }, \
-	{ K305 , K315 , K325 , K335 , K345 , K355 , KC_NO, KC_NO }, \
-	{ K406 , K416 , KC_NO, KC_NO, K446 , K456 , KC_NO, K476  }, \
-	{ K407 , K417 , KC_NO, K437 , K447 , K457 , K467 , KC_NO } \
-}
\ No newline at end of file
diff --git a/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c b/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c
index b9e9ad1511..59a009211c 100644
--- a/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen1840/keymaps/default/keymap.c
@@ -28,26 +28,26 @@ uint16_t alt_tab_timer = 0;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = LAYOUT_1840(
+[0] = LAYOUT_all(
 
     KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_BSPC      , KC_P7  ,KC_P8  ,KC_P9  ,KC_PMNS,
     KC_TAB   ,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_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,
     KC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC ,KC_UP , KC_P1  ,KC_P2  ,KC_P3  ,KC_PAST,
     KC_LCTL  ,KC_LALT  ,MO(2)  ,L2_SPC               ,L3_SPC           ,MO(3)  ,RWINALT  ,MO(1)   ,KC_LEFT,KC_DOWN,KC_RGHT,KC_P0  ,KC_PDOT,L3_PENT  
     ),
-[1] = LAYOUT_1840(
+[1] = LAYOUT_all(
     RESET  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_HOME,XXXXXXX,KC_PGUP,XXXXXXX,
     KC_CAPS  ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX    , XXXXXXX,XXXXXXX,XXXXXXX,KC_PAST,
     _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,XXXXXXX,KC_PGDN,KC_PSLS,
     KC_RCTL  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END ,KC_INS ,KC_DEL ,KC_EQL   
     ),
-[2] = LAYOUT_1840(
+[2] = LAYOUT_all(
     KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL       , XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
     KC_TILD  ,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_UNDS,KC_LBRC,KC_RBRC,KC_BSLS    , XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
     _______      ,ISO_LT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
     _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX  
     ),
-[3] = LAYOUT_1840(
+[3] = LAYOUT_all(
     KC_TILD,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,KC_PLUS      , KC_NLCK,KC_PSLS,KC_PAST,XXXXXXX,
     _______  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_LCBR,KC_RCBR,KC_PIPE    , KC_PSCR,KC_SLCK,KC_PAUS,XXXXXXX,
     _______      ,ISO_GT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
diff --git a/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c b/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c
index b9e9ad1511..59a009211c 100644
--- a/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen1840/keymaps/via/keymap.c
@@ -28,26 +28,26 @@ uint16_t alt_tab_timer = 0;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = LAYOUT_1840(
+[0] = LAYOUT_all(
 
     KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_BSPC      , KC_P7  ,KC_P8  ,KC_P9  ,KC_PMNS,
     KC_TAB   ,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_P4  ,KC_P5  ,KC_P6  ,KC_PPLS,
     KC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC ,KC_UP , KC_P1  ,KC_P2  ,KC_P3  ,KC_PAST,
     KC_LCTL  ,KC_LALT  ,MO(2)  ,L2_SPC               ,L3_SPC           ,MO(3)  ,RWINALT  ,MO(1)   ,KC_LEFT,KC_DOWN,KC_RGHT,KC_P0  ,KC_PDOT,L3_PENT  
     ),
-[1] = LAYOUT_1840(
+[1] = LAYOUT_all(
     RESET  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_HOME,XXXXXXX,KC_PGUP,XXXXXXX,
     KC_CAPS  ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX    , XXXXXXX,XXXXXXX,XXXXXXX,KC_PAST,
     _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,XXXXXXX,KC_PGDN,KC_PSLS,
     KC_RCTL  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END ,KC_INS ,KC_DEL ,KC_EQL   
     ),
-[2] = LAYOUT_1840(
+[2] = LAYOUT_all(
     KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL       , XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
     KC_TILD  ,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_UNDS,KC_LBRC,KC_RBRC,KC_BSLS    , XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
     _______      ,ISO_LT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
     _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX  
     ),
-[3] = LAYOUT_1840(
+[3] = LAYOUT_all(
     KC_TILD,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,KC_PLUS      , KC_NLCK,KC_PSLS,KC_PAST,XXXXXXX,
     _______  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_LCBR,KC_RCBR,KC_PIPE    , KC_PSCR,KC_SLCK,KC_PAUS,XXXXXXX,
     _______      ,ISO_GT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,
diff --git a/keyboards/nopunin10did/kastenwagen1840/readme.md b/keyboards/nopunin10did/kastenwagen1840/readme.md
index e70890b48d..51d57ef8b2 100644
--- a/keyboards/nopunin10did/kastenwagen1840/readme.md
+++ b/keyboards/nopunin10did/kastenwagen1840/readme.md
@@ -4,14 +4,10 @@
 
 Kastenwagen 1840 is a 40% keyboard with a mini-numpad and dedicated arrows.  The main alpha block is 13.75u long, allowing for more dedicated punctuation keys to be paired with common Minivan-like mod keys.
 
-A second model of Kastenwagen, the [Kastenwagen 48](https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/kastenwagen48), is similar but replaces the numpad with a three-key macro column.
-
-Please note that the Kastenwagen 1840 via-compatible keymap firmware is also compatible with the Kastenwagen 48.  The Kastenwagen 48 does not have a dedicated via-compatible firmware.
-
 For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w).
 
-* Keyboard Maintainer: [Alex Ronke](diplomacyvariants.wordpress.com), also known as NoPunIn10Did. 
-* Hardware Supported: Kastenwagen 1840 & 48 (2021 June)
+* Keyboard Maintainer: [Alex Ronke](https://nopunin10did.com/), also known as [NoPunIn10Did](https://github.com/NoPunIn10Did)
+* Hardware Supported: Kastenwagen 1840 (2021 June)
 * Hardware Availability: Currently by request only
 
 To jump the bootloader, either:
@@ -19,14 +15,14 @@ To jump the bootloader, either:
 * Use the physical reset switch on the Elite C **OR**
 * Briefly jump the Reset and Ground pins of the Elite C
 
-Make example for the 1840 model (after setting up your build environment):
+Make example for this keyboard (after setting up your build environment):
 
     make nopunin10did/kastenwagen1840:default
     
-Make example for the 48 model:
+Flashing example for this keyboard:
 
-    make nopunin10did/kastenwagen48:default
+    make nopunin10did/kastenwagen1840:default:flash
 
 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).
 
-![Kastenwagen Default Layouts](https://diplomacyvariants.files.wordpress.com/2022/01/kastenwagen-default-layouts.png)
\ No newline at end of file
+![Kastenwagen Default Layouts](https://diplomacyvariants.files.wordpress.com/2022/01/kastenwagen-default-layouts.png)
diff --git a/keyboards/nopunin10did/kastenwagen48/info.json b/keyboards/nopunin10did/kastenwagen48/info.json
index bccfbeb36d..12d375863b 100644
--- a/keyboards/nopunin10did/kastenwagen48/info.json
+++ b/keyboards/nopunin10did/kastenwagen48/info.json
@@ -2,9 +2,8 @@
     "keyboard_name": "Kastenwagen 48",
     "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/kastenwagen48",
     "maintainer": "NoPunIn10Did",
-    "manufacturer": "NoPunIn10Did",
     "layouts": {
-        "LAYOUT_48": {
+        "LAYOUT_all": {
             "layout": [
                 {"x":0   ,  "y":0,    "label":"Esc"},
                 {"x":1   ,  "y":0,    "label":"Q"},
diff --git a/keyboards/nopunin10did/kastenwagen48/kastenwagen48.h b/keyboards/nopunin10did/kastenwagen48/kastenwagen48.h
index 8f948fca6a..65ed03d201 100644
--- a/keyboards/nopunin10did/kastenwagen48/kastenwagen48.h
+++ b/keyboards/nopunin10did/kastenwagen48/kastenwagen48.h
@@ -18,7 +18,22 @@
 
 #include "quantum.h"
 
-#define LAYOUT_48( \
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬──────┐  ┌───┐
+ * │100│101│110│111│120│121│130│131│140│141│150│151│160   │  │170│
+ * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬─────┤  ├───┤
+ * │202 │203│212│213│222│223│232│233│242│243│252│253│262  │  │272│
+ * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬──┘  ├───┤
+ * │304   │305│314│315│324│325│334│335│344│345│354│355 │┌───┐│374│
+ * ├────┬─┴──┬┴──┬┴───┴───┴─┬─┴───┴──┬┴──┬┴───┼───┴┬───┘│364│└───┘
+ * │406 │407 │416│417       │437     │446│447 │456 │┌───┼───┼───┐
+ * └────┴────┴───┴──────────┴────────┴───┴────┴────┘│457│467│476│
+ *           ┌───────────────────────────┐          └───┴───┴───┘
+ *           │417                        │ 7u Space
+ *           └───────────────────────────┘
+ */
+
+#define LAYOUT_all( \
 K100  , K101  , K110  , K111  , K120  , K121  , K130  , K131  , K140  , K141  , K150  , K151  , K160        ,   K170  , \
 K202    , K203  , K212  , K213  , K222  , K223  , K232  , K233  , K242  , K243  , K252  , K253  , K262      ,   K272  , \
 K304        , K305  , K314  , K315  , K324  , K325  , K334  , K335  , K344  , K345  , K354  , K355    , K364  , K374  , \
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c b/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c
index ca6b66d59c..397b75b901 100644
--- a/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/default/keymap.c
@@ -27,26 +27,26 @@ uint16_t alt_tab_timer = 0;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = LAYOUT_48(
+[0] = LAYOUT_all(
 
     KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_BSPC      , KC_DEL ,
     KC_TAB   ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_ENT     , KC_PGUP,
     KC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC ,KC_UP , KC_PGDN,
     KC_LCTL  ,KC_LALT  ,MO(2)  ,L2_SPC               ,L3_SPC           ,MO(3)  ,RWINALT  ,MO(1)   ,KC_LEFT,KC_DOWN,KC_RGHT 
     ),
-[1] = LAYOUT_48(
+[1] = LAYOUT_all(
     RESET  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_INS ,
     KC_CAPS  ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX    , KC_HOME,
     _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,
     KC_RCTL  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END  
     ),
-[2] = LAYOUT_48(
+[2] = LAYOUT_all(
     KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL       , XXXXXXX,
     KC_TILD  ,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_UNDS,KC_LBRC,KC_RBRC,KC_BSLS    , XXXXXXX,
     _______      ,ISO_LT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,
     _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX 
     ),
-[3] = LAYOUT_48(
+[3] = LAYOUT_all(
     KC_TILD,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,KC_PLUS      , XXXXXXX,
     _______  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_LCBR,KC_RCBR,KC_PIPE    , XXXXXXX,
     _______      ,ISO_GT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,
diff --git a/keyboards/nopunin10did/kastenwagen1840/keymaps/default48/keymap.c b/keyboards/nopunin10did/kastenwagen48/keymaps/via/keymap.c
similarity index 98%
rename from keyboards/nopunin10did/kastenwagen1840/keymaps/default48/keymap.c
rename to keyboards/nopunin10did/kastenwagen48/keymaps/via/keymap.c
index ca6b66d59c..397b75b901 100644
--- a/keyboards/nopunin10did/kastenwagen1840/keymaps/default48/keymap.c
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/via/keymap.c
@@ -27,26 +27,26 @@ uint16_t alt_tab_timer = 0;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-[0] = LAYOUT_48(
+[0] = LAYOUT_all(
 
     KC_ESC ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_LBRC,KC_BSPC      , KC_DEL ,
     KC_TAB   ,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,KC_ENT     , KC_PGUP,
     KC_LSPO      ,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSPC ,KC_UP , KC_PGDN,
     KC_LCTL  ,KC_LALT  ,MO(2)  ,L2_SPC               ,L3_SPC           ,MO(3)  ,RWINALT  ,MO(1)   ,KC_LEFT,KC_DOWN,KC_RGHT 
     ),
-[1] = LAYOUT_48(
+[1] = LAYOUT_all(
     RESET  ,KC_F1  ,KC_F2  ,KC_F3  ,KC_F4  ,KC_F5  ,KC_F6  ,KC_F7  ,KC_F8  ,KC_F9  ,KC_F10 ,KC_RBRC,KC_DEL       , KC_INS ,
     KC_CAPS  ,KC_F11 ,KC_F12 ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX    , KC_HOME,
     _______      ,XXXXXXX,XXXXXXX,KC_PSCR,KC_SLCK,KC_PAUS,KC_INS ,KC_APP ,KC_LGUI,KC_RGUI,XXXXXXX,_______ ,KC_PGUP,KC_END ,
     KC_RCTL  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,KC_HOME,KC_PGDN,KC_END  
     ),
-[2] = LAYOUT_48(
+[2] = LAYOUT_all(
     KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_MINS,KC_EQL       , XXXXXXX,
     KC_TILD  ,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_UNDS,KC_LBRC,KC_RBRC,KC_BSLS    , XXXXXXX,
     _______      ,ISO_LT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,
     _______  ,_______  ,_______,XXXXXXX              ,XXXXXXX          ,_______,_______  ,_______ ,XXXXXXX,XXXXXXX,XXXXXXX 
     ),
-[3] = LAYOUT_48(
+[3] = LAYOUT_all(
     KC_TILD,KC_EXLM,KC_AT  ,KC_HASH,KC_DLR ,KC_PERC,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_UNDS,KC_PLUS      , XXXXXXX,
     _______  ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,KC_LCBR,KC_RCBR,KC_PIPE    , XXXXXXX,
     _______      ,ISO_GT ,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______ ,XXXXXXX,XXXXXXX,
diff --git a/keyboards/nopunin10did/kastenwagen48/keymaps/via/rules.mk b/keyboards/nopunin10did/kastenwagen48/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/nopunin10did/kastenwagen48/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/nopunin10did/kastenwagen48/readme.md b/keyboards/nopunin10did/kastenwagen48/readme.md
index f6db1aa410..d0ea708313 100644
--- a/keyboards/nopunin10did/kastenwagen48/readme.md
+++ b/keyboards/nopunin10did/kastenwagen48/readme.md
@@ -4,13 +4,9 @@
 
 Kastenwagen 48 is a 40% keyboard with a macro column and dedicated arrows.  The main alpha block is 13.75u long, allowing for more dedicated punctuation keys to be paired with common Minivan-like mod keys.
 
-A second model of Kastenwagen, the [Kastenwagen 1840](https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/kastenwagen1840), is similar but replaces the macro column with a mini-numpad.
-
-Please note that the Kastenwagen 1840 via-compatible keymap firmware is also compatible with the Kastenwagen 48.  The Kastenwagen 48 does not have a dedicated via-compatible firmware.
-
 For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w).
 
-* Keyboard Maintainer: [Alex Ronke](diplomacyvariants.wordpress.com), also known as NoPunIn10Did. 
+* Keyboard Maintainer: [Alex Ronke](https://nopunin10did.com/), also known as [NoPunIn10Did](https://github.com/NoPunIn10Did)
 * Hardware Supported: Kastenwagen 48 (2021 June)
 * Hardware Availability: Currently by request only
 
@@ -18,11 +14,15 @@ To jump the bootloader, either:
 * If loaded with the default layout, use Function-Escape *(the function button is the farthest righthand 1.25u on the bottom row)* **OR**
 * Use the physical reset switch on the Elite C **OR**
 * Briefly jump the Reset and Ground pins of the Elite C
-    
-Make example for the 48 model:
 
-    make nopunin10did/kastenwagen48:default48
+Make example for this keyboard (after setting up your build environment):
+
+    make nopunin10did/kastenwagen48:default
+
+Flashing example for this keyboard:
+
+    make nopunin10did/kastenwagen48:default:flash
 
 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).
 
-![Kastenwagen Default Layouts](https://diplomacyvariants.files.wordpress.com/2022/01/kastenwagen-default-layouts.png)
\ No newline at end of file
+![Kastenwagen Default Layouts](https://diplomacyvariants.files.wordpress.com/2022/01/kastenwagen-default-layouts.png)
diff --git a/keyboards/nopunin10did/railroad/readme.md b/keyboards/nopunin10did/railroad/readme.md
index aac088f12e..91c4554c20 100644
--- a/keyboards/nopunin10did/railroad/readme.md
+++ b/keyboards/nopunin10did/railroad/readme.md
@@ -4,7 +4,7 @@
 
 A long keyboard with ortholinear alphas and semi-standard modifier keys. For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w).
 
-* Keyboard Maintainer: [Alex Ronke](diplomacyvariants.wordpress.com), also known as NoPunIn10Did. 
+* Keyboard Maintainer: [Alex Ronke](https://nopunin10did.com/), also known as [NoPunIn10Did](https://github.com/NoPunIn10Did)
 * Hardware Supported: The Railroad: 2020-07 Prototype
 * Hardware Availability: Currently by request only
 
diff --git a/keyboards/nopunin10did/railroad/rev0/readme.md b/keyboards/nopunin10did/railroad/rev0/readme.md
index e3b8dc8bcd..91c4554c20 100644
--- a/keyboards/nopunin10did/railroad/rev0/readme.md
+++ b/keyboards/nopunin10did/railroad/rev0/readme.md
@@ -4,7 +4,7 @@
 
 A long keyboard with ortholinear alphas and semi-standard modifier keys. For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w).
 
-* Keyboard Maintainer: [Alex Ronke](https://diplomacyvariants.wordpress.com/), also known as [NoPunIn10Did](https://github.com/nopunin10did). 
+* Keyboard Maintainer: [Alex Ronke](https://nopunin10did.com/), also known as [NoPunIn10Did](https://github.com/NoPunIn10Did)
 * Hardware Supported: The Railroad: 2020-07 Prototype
 * Hardware Availability: Currently by request only
 
diff --git a/keyboards/nopunin10did/readme.md b/keyboards/nopunin10did/readme.md
new file mode 100644
index 0000000000..a23f94e664
--- /dev/null
+++ b/keyboards/nopunin10did/readme.md
@@ -0,0 +1,14 @@
+# NoPunIn10Did
+
+Contains the codebases for keyboards designed by Alex Ronke, also known as NoPunIn10Did.
+
+* [GitHub](https://github.com/nopunin10did)
+* [Website](https://nopunin10did.com/)
+* [NoPunIn10Key Discord](https://discord.gg/sku2Y6w)
+
+## Keyboards
+
+* [Jabberwocky](jabberwocky/) - a full-size, columnar-staggered, Alice-style keyboard, featuring left- or right-side numpad
+* [Kastenwagen 1840](kastenwagen1840/) - a 40% keyboard with a mini-numpad and dedicated arrows
+* [Kastenwagen 48](kastenwagen48/) - a 40% keyboard with a macro column and dedicated arrows
+* [The Railroad](railroad/rev0/) - a 97-key keyboard combining ortholinear alphas with semi-standard modifier keys

From 2c18dcc619017d2c8abe0cecbb168b84d48124e8 Mon Sep 17 00:00:00 2001
From: mechlovin <57231893+mechlovin@users.noreply.github.com>
Date: Thu, 13 Jan 2022 05:09:33 +0700
Subject: [PATCH 267/867] [Keyboard] Add Hex4B rev.2 PCB (#15811)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/mechlovin/hex4b/config.h       | 19 +-------
 keyboards/mechlovin/hex4b/rev1/config.h  | 53 ++++++++++++++++++++++
 keyboards/mechlovin/hex4b/rev1/readme.md | 21 +++++++++
 keyboards/mechlovin/hex4b/rev1/rules.mk  | 21 +++++++++
 keyboards/mechlovin/hex4b/rev2/chconf.h  | 24 ++++++++++
 keyboards/mechlovin/hex4b/rev2/config.h  | 56 ++++++++++++++++++++++++
 keyboards/mechlovin/hex4b/rev2/halconf.h | 22 ++++++++++
 keyboards/mechlovin/hex4b/rev2/mcuconf.h | 26 +++++++++++
 keyboards/mechlovin/hex4b/rev2/readme.md | 28 ++++++++++++
 keyboards/mechlovin/hex4b/rev2/rules.mk  | 18 ++++++++
 10 files changed, 271 insertions(+), 17 deletions(-)
 create mode 100644 keyboards/mechlovin/hex4b/rev1/config.h
 create mode 100644 keyboards/mechlovin/hex4b/rev1/readme.md
 create mode 100644 keyboards/mechlovin/hex4b/rev1/rules.mk
 create mode 100644 keyboards/mechlovin/hex4b/rev2/chconf.h
 create mode 100644 keyboards/mechlovin/hex4b/rev2/config.h
 create mode 100644 keyboards/mechlovin/hex4b/rev2/halconf.h
 create mode 100644 keyboards/mechlovin/hex4b/rev2/mcuconf.h
 create mode 100644 keyboards/mechlovin/hex4b/rev2/readme.md
 create mode 100644 keyboards/mechlovin/hex4b/rev2/rules.mk

diff --git a/keyboards/mechlovin/hex4b/config.h b/keyboards/mechlovin/hex4b/config.h
index 789e5517b4..c8176d76b5 100644
--- a/keyboards/mechlovin/hex4b/config.h
+++ b/keyboards/mechlovin/hex4b/config.h
@@ -20,11 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID    0x4D4C //MechLovin
+#define VENDOR_ID    0x4D4C
 #define PRODUCT_ID   0x0675 //Hex-75
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Team Mechlovin
-#define PRODUCT      Hex 4B
+#define MANUFACTURER Mechlovin Studio
 
 /* key matrix size */
 #define MATRIX_ROWS 6
@@ -41,23 +39,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-#define MATRIX_ROW_PINS { B7, A2, A1, A3, A4, A5 }
-#define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, D1, D0 }
-#define UNUSED_PINS
-
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define LED_NUM_LOCK_PIN D6
-#define LED_CAPS_LOCK_PIN D7
-#define LED_SCROLL_LOCK_PIN D5
 #define LED_PIN_ON_STATE 0
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
-
-#define BACKLIGHT_PIN D4
-#define BACKLIGHT_LEVELS 5
-#define BACKLIGHT_BREATHING
 
 /* Bootmagic Lite key configuration, Backspace */
 #define BOOTMAGIC_LITE_ROW 1
diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h
new file mode 100644
index 0000000000..014209cefd
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/rev1/config.h
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Team Mechlovin
+
+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 DEVICE_VER   0x0001
+#define PRODUCT      Hex-4B Rev.1
+
+/*
+ * 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, A2, A1, A3, A4, A5 }
+#define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, D1, D0 }
+#define UNUSED_PINS
+
+#define LED_NUM_LOCK_PIN D6
+#define LED_CAPS_LOCK_PIN D7
+#define LED_SCROLL_LOCK_PIN D5
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+#define BACKLIGHT_PIN D4
+#define BACKLIGHT_LEVELS 5
+#define BACKLIGHT_BREATHING
+
+/* Bootmagic Lite key configuration, Backspace */
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 14
diff --git a/keyboards/mechlovin/hex4b/rev1/readme.md b/keyboards/mechlovin/hex4b/rev1/readme.md
new file mode 100644
index 0000000000..e47dd78a96
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/rev1/readme.md
@@ -0,0 +1,21 @@
+# hex4b
+
+![hex4b](https://i.imgur.com/lArfGgHh.jpeg)
+
+A PCB for HEX.4B 75% keyboard.
+
+* Keyboard Maintainer: [Mechlovin' Studio](https://github.com/mechlovin)
+* Hardware Supported: Hex.4B PCB, Atmega32A 
+* Hardware Availability: [Hex Keyboard](https://hexkeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/hex4b/rev1:default
+
+Flashing example for this keyboard:
+
+    make mechlovin/hex4b/rev1:default:flash
+
+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).
+
+Reset Key: To put the Hex4B into bootloader, hold esc key while plugging in (bootloader), hold backspace while plugging in (bootmagic) and plug cable.
diff --git a/keyboards/mechlovin/hex4b/rev1/rules.mk b/keyboards/mechlovin/hex4b/rev1/rules.mk
new file mode 100644
index 0000000000..c3a1785039
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/rev1/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32a
+
+# Bootloader selection
+BOOTLOADER = usbasploader
+
+# Processor frequency
+F_CPU = 16000000
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/mechlovin/hex4b/rev2/chconf.h b/keyboards/mechlovin/hex4b/rev2/chconf.h
new file mode 100644
index 0000000000..fe716d6552
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/rev2/chconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2020 QMK
+ *
+ * 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 CH_CFG_ST_TIMEDELTA 0
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
+
diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h
new file mode 100644
index 0000000000..af956f3ec0
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/rev2/config.h
@@ -0,0 +1,56 @@
+/*
+Copyright 2020 Team Mechlovin
+
+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 DEVICE_VER   0x0002
+#define PRODUCT      Hex-4B Rev.2
+
+
+
+/*
+ * 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 { A4, B12, B13, B14, B15, A1 }
+#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A3, C13, B7, B6, B5, B4, B3 }
+#define UNUSED_PINS
+
+#define LED_NUM_LOCK_PIN C15
+#define LED_CAPS_LOCK_PIN B9
+#define LED_SCROLL_LOCK_PIN A15
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+#define BACKLIGHT_PIN B8
+#define BACKLIGHT_LEVELS 5
+#define BACKLIGHT_PWM_DRIVER PWMD4
+#define BACKLIGHT_BREATHING
+
+/* Bootmagic Lite key configuration, Backspace */
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 14
\ No newline at end of file
diff --git a/keyboards/mechlovin/hex4b/rev2/halconf.h b/keyboards/mechlovin/hex4b/rev2/halconf.h
new file mode 100644
index 0000000000..1f5149b1aa
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/rev2/halconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 QMK
+ *
+ * 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 HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
+
diff --git a/keyboards/mechlovin/hex4b/rev2/mcuconf.h b/keyboards/mechlovin/hex4b/rev2/mcuconf.h
new file mode 100644
index 0000000000..10c578ca04
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/rev2/mcuconf.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 QMK
+ *
+ * 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_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM4
+#define STM32_PWM_USE_TIM4 TRUE
+
+
+
diff --git a/keyboards/mechlovin/hex4b/rev2/readme.md b/keyboards/mechlovin/hex4b/rev2/readme.md
new file mode 100644
index 0000000000..328c869704
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/rev2/readme.md
@@ -0,0 +1,28 @@
+# hex4b
+
+![hex4b](https://i.imgur.com/lArfGgHh.jpeg)
+
+A PCB for HEX.4B 75% keyboard.
+
+* Keyboard Maintainer: [Mechlovin' Studio](https://github.com/mechlovin)
+* Hardware Supported: Hex.4B Rev.2 PCB, APM32F103CBT6
+* Hardware Availability: [Hex Keyboard](https://hexkeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/hex4b/rev2:default
+
+Flashing example for this keyboard:
+
+    make mechlovin/hex4b/rev2:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Bootloader reset**: Hold down the key at (0,13) in the matrix (Backspace) and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Hardware reset**: Press reset button (located on the top side of the PCB)
\ No newline at end of file
diff --git a/keyboards/mechlovin/hex4b/rev2/rules.mk b/keyboards/mechlovin/hex4b/rev2/rules.mk
new file mode 100644
index 0000000000..a61a25009b
--- /dev/null
+++ b/keyboards/mechlovin/hex4b/rev2/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = STM32F103
+
+# Bootloader selection
+BOOTLOADER = stm32duino
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 59ea42099288dce99ec52f4517512124ae71caa0 Mon Sep 17 00:00:00 2001
From: owlab-git <88034417+owlab-git@users.noreply.github.com>
Date: Thu, 13 Jan 2022 06:10:16 +0800
Subject: [PATCH 268/867] [Keyboard] Add OwLab Spring (#15614)

---
 keyboards/owlab/spring/config.h               |  68 ++++++++++
 keyboards/owlab/spring/info.json              |  78 +++++++++++
 .../owlab/spring/keymaps/default/keymap.c     |  38 ++++++
 keyboards/owlab/spring/keymaps/via/keymap.c   |  54 ++++++++
 keyboards/owlab/spring/keymaps/via/rules.mk   |   2 +
 keyboards/owlab/spring/readme.md              |  21 +++
 keyboards/owlab/spring/rules.mk               |  18 +++
 keyboards/owlab/spring/spring.c               | 125 ++++++++++++++++++
 keyboards/owlab/spring/spring.h               |  33 +++++
 9 files changed, 437 insertions(+)
 create mode 100644 keyboards/owlab/spring/config.h
 create mode 100644 keyboards/owlab/spring/info.json
 create mode 100644 keyboards/owlab/spring/keymaps/default/keymap.c
 create mode 100644 keyboards/owlab/spring/keymaps/via/keymap.c
 create mode 100644 keyboards/owlab/spring/keymaps/via/rules.mk
 create mode 100644 keyboards/owlab/spring/readme.md
 create mode 100644 keyboards/owlab/spring/rules.mk
 create mode 100644 keyboards/owlab/spring/spring.c
 create mode 100644 keyboards/owlab/spring/spring.h

diff --git a/keyboards/owlab/spring/config.h b/keyboards/owlab/spring/config.h
new file mode 100644
index 0000000000..d4eef1e021
--- /dev/null
+++ b/keyboards/owlab/spring/config.h
@@ -0,0 +1,68 @@
+/* 
+Copyright 2021 OwLab
+
+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       0x4F53  //0x4F53 for OwLab
+#define PRODUCT_ID      0x5350  //0x514B SP for Spring
+#define DEVICE_VER      0x0001 
+#define MANUFACTURER    OwLab 
+#define PRODUCT         Spring
+
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* Keyboard Matrix Assignments */
+#define MATRIX_ROW_PINS { B0, B7, D0, D1, D2 }
+#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F4, F7, F6, F5, F1, F0 }
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* NKRO */
+#define FORCE_NKRO 
+
+/* RGB Strip*/
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+#    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
+#    define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLED_NUM 8
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 10
+#    define RGBLIGHT_LIMIT_VAL 255    
+#    define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
+#    define RGBLIGHT_DEFAULT_VAL RGBLIGHT_LIMIT_VAL/2
+#endif
+
+
diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json
new file mode 100644
index 0000000000..bbeee6628b
--- /dev/null
+++ b/keyboards/owlab/spring/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "Spring",
+    "url": "",
+    "maintainer": "OwLab",
+    "layouts": {
+        "LAYOUT_spring": {
+            "layout": [
+                {"x":0.5, "y":0},
+                {"x":1.75, "y":0},
+                {"x":2.75, "y":0},
+                {"x":3.75, "y":0},
+                {"x":4.75, "y":0},
+                {"x":5.75, "y":0},
+                {"x":6.75, "y":0},
+                {"x":7.75, "y":0},
+                {"x":8.75, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":13.75, "y":0},
+                {"x":14.75, "y":0, "w":2},
+                {"x":0.25, "y":1},
+                {"x":1.5, "y":1, "w":1.5},
+                {"x":3, "y":1},
+                {"x":4, "y":1},
+                {"x":5, "y":1},
+                {"x":6, "y":1},
+                {"x":7, "y":1},
+                {"x":8, "y":1},
+                {"x":9, "y":1},
+                {"x":10, "y":1},
+                {"x":11, "y":1},
+                {"x":12, "y":1},
+                {"x":13, "y":1},
+                {"x":14, "y":1},
+                {"x":15, "y":1, "w":1.5},
+                {"x":0, "y":2},
+                {"x":1.25, "y":2, "w":1.75},
+                {"x":3, "y":2},
+                {"x":4, "y":2},
+                {"x":5, "y":2},
+                {"x":6, "y":2},
+                {"x":7, "y":2},
+                {"x":8, "y":2},
+                {"x":9, "y":2},
+                {"x":10, "y":2},
+                {"x":11, "y":2},
+                {"x":12, "y":2},
+                {"x":13, "y":2},
+                {"x":14, "y":2, "w":2.25},
+                {"x":1, "y":3, "w":2.25},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3},
+                {"x":13.25, "y":3},
+                {"x":14.25, "y":3},
+                {"x":15.25, "y":3, "w":1.75},
+                {"x":1, "y":4, "w":1.25},
+                {"x":2.25, "y":4, "w":1.25},
+                {"x":4.75, "y":4, "w":1.25},
+                {"x":6, "y":4, "w":2.25},
+                {"x":8.25, "y":4, "w":2.75},
+                {"x":11, "y":4, "w":1.25},
+                {"x":13.25, "y":4},
+		        {"x":14.25, "y":4},
+                {"x":15.25, "y":4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/owlab/spring/keymaps/default/keymap.c b/keyboards/owlab/spring/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e48ae32418
--- /dev/null
+++ b/keyboards/owlab/spring/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* 
+Copyright 2021 qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_spring(
+		KC_ESC,  KC_GRV,  KC_1, KC_2, KC_3,   KC_4,   KC_5, KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 
+		KC_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_PGDN, KC_CAPS, KC_A, KC_S, KC_D,   KC_F,   KC_G, KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT, 
+		         KC_LSFT, KC_Z, KC_X, KC_C,   KC_V,   KC_B, KC_B, KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT, 
+		         KC_LCTL, KC_LGUI,    KC_LALT,  KC_SPC,  KC_SPC,    MO(1),                        KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1] = LAYOUT_spring(
+		KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  RESET, 
+		KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,  KC_PSCR, KC_SLCK, KC_PAUS, 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_INS,  KC_HOME, KC_TRNS, 
+		         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_DEL,  KC_END,  KC_TRNS, KC_TRNS, 
+		         KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                                      KC_TRNS, KC_TRNS, KC_TRNS
+	)
+
+};
\ No newline at end of file
diff --git a/keyboards/owlab/spring/keymaps/via/keymap.c b/keyboards/owlab/spring/keymaps/via/keymap.c
new file mode 100644
index 0000000000..06779ed4ed
--- /dev/null
+++ b/keyboards/owlab/spring/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* 
+Copyright 2021 qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_spring(
+		KC_ESC,  KC_GRV,  KC_1, KC_2, KC_3,   KC_4,   KC_5, KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 
+		KC_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_PGDN, KC_CAPS, KC_A, KC_S, KC_D,   KC_F,   KC_G, KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT, 
+		         KC_LSFT, KC_Z, KC_X, KC_C,   KC_V,   KC_B, KC_B, KC_N, KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_RSFT, 
+		         KC_LCTL, KC_LGUI,    KC_LALT,  KC_SPC,  KC_SPC,    MO(1),                        KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1] = LAYOUT_spring(
+		KC_TRNS, KC_TRNS, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  RESET, 
+		KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,  KC_PSCR, KC_SLCK, KC_PAUS, 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_INS,  KC_HOME, KC_TRNS, 
+		         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_DEL,  KC_END,  KC_TRNS, KC_TRNS, 
+		         KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,                                      KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[2] = LAYOUT_spring(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		         KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[3] = LAYOUT_spring(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		         KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
+	)
+
+};
\ No newline at end of file
diff --git a/keyboards/owlab/spring/keymaps/via/rules.mk b/keyboards/owlab/spring/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/owlab/spring/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/owlab/spring/readme.md b/keyboards/owlab/spring/readme.md
new file mode 100644
index 0000000000..d4ec27b910
--- /dev/null
+++ b/keyboards/owlab/spring/readme.md
@@ -0,0 +1,21 @@
+# Spring - PCB
+
+![Spring](https://i.imgur.com/Ro1LhHh.png)
+
+An Alice style board with arrowkeys made by OwLab, based on the Fate Arisu layout.
+
+* Keyboard Maintainer: [OwLab](https://github.com/owlab-git)
+* Hardware Supported: Spring PCB
+* Hardware Availability: 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make owlab/spring:default
+
+Flashing example for this keyboard:
+
+    make owlab/spring:default:flash
+
+**Bootloader:** Press the physical reset button on the bottom side of the PCB (labeled SW1) or hold down ESC while plugging in the board.
+
+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).
diff --git a/keyboards/owlab/spring/rules.mk b/keyboards/owlab/spring/rules.mk
new file mode 100644
index 0000000000..5f9bfe1f0c
--- /dev/null
+++ b/keyboards/owlab/spring/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes  # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes       # Enable N-Key Rollover	
+BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
+AUDIO_ENABLE = no       # Audio output
\ No newline at end of file
diff --git a/keyboards/owlab/spring/spring.c b/keyboards/owlab/spring/spring.c
new file mode 100644
index 0000000000..60982c1517
--- /dev/null
+++ b/keyboards/owlab/spring/spring.c
@@ -0,0 +1,125 @@
+/* 
+Copyright 2021 OwLab
+
+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 "spring.h"
+
+enum caps_modes{
+    CAPS_MODE_UPPER = 0, //UPPER CASE 
+    CAPS_MODE_LOWER      //LOWER CASE
+};
+
+uint8_t caps_mode_index;
+rgblight_config_t pre_rgb;
+uint8_t dir_hue, dir_sat;
+
+bool caps_in = false; 
+uint32_t caps_timer; 
+
+
+
+
+void switch_caps_mode(uint8_t mode){
+       switch(mode){
+            case CAPS_MODE_UPPER:
+            dir_hue = 0;
+            dir_sat = 240; 
+            break;
+
+            case CAPS_MODE_LOWER: 
+            dir_hue = 88;
+            dir_sat = 255;
+            break;
+
+            default:
+            break;           
+        }
+        rgblight_sethsv_noeeprom(dir_hue,dir_sat,pre_rgb.val); 
+    
+}
+
+
+void init_caps_mode(uint8_t mode){
+    pre_rgb.mode = rgblight_get_mode();
+    pre_rgb.hue = rgblight_get_hue();
+    pre_rgb.sat = rgblight_get_sat();
+    pre_rgb.val = rgblight_get_val();
+    caps_in = true;
+
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);  
+    switch_caps_mode(mode);
+
+}
+
+
+void set_caps_mode(uint8_t mode){
+    if(caps_in == false){
+       init_caps_mode(mode);
+    }else{
+        switch_caps_mode(mode);
+    }
+    caps_timer = timer_read32();
+    
+    
+}
+
+
+void matrix_scan_kb(void) {
+	if(caps_in){
+		if(timer_elapsed32(caps_timer) > 3000){
+            rgblight_sethsv(pre_rgb.hue, pre_rgb.sat, pre_rgb.val);	
+			rgblight_mode(pre_rgb.mode);
+            caps_in = false;
+		}
+	}
+
+    matrix_scan_user();
+}
+
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+    switch(keycode) {
+        case RGB_TOG:
+        case RGB_MOD:
+        case RGB_RMOD:
+        case RGB_HUI:
+        case RGB_HUD:
+        case RGB_SAI:
+        case RGB_SAD:
+        case RGB_VAI:
+        case RGB_VAD:
+            if(caps_in){  
+                return false;
+            }  
+        break;
+
+
+        case KC_CAPS:
+            if(IS_LED_ON(host_keyboard_leds(), USB_LED_CAPS_LOCK)){ 
+                caps_mode_index = CAPS_MODE_LOWER;
+            } else{
+                caps_mode_index = CAPS_MODE_UPPER;
+            }
+            set_caps_mode(caps_mode_index); 
+        break;
+
+   
+        default:
+        break;
+    }
+  }
+  return process_record_user(keycode, record);
+}
diff --git a/keyboards/owlab/spring/spring.h b/keyboards/owlab/spring/spring.h
new file mode 100644
index 0000000000..195d8cd4c8
--- /dev/null
+++ b/keyboards/owlab/spring/spring.h
@@ -0,0 +1,33 @@
+/* 
+Copyright 2021 OwLab
+
+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_spring( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \
+	      K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
+	      K400, K401,       K402, K404, K405, K409,                         K411, K412, K413  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  KC_NO }, \
+	{ K400,  K401,  K402,  KC_NO, K404,  K405,  KC_NO, KC_NO, KC_NO, K409,  KC_NO, K411,  K412,  K413,  KC_NO }  \
+}

From 9911ba51b09fb513955ae32862cf29748c6e9cb0 Mon Sep 17 00:00:00 2001
From: onefiftynine <jlee@projectkeyboard.com>
Date: Wed, 12 Jan 2022 16:10:58 -0600
Subject: [PATCH 269/867] [Keyboard] Add Signature65 (#15698)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/projectkb/signature65/chconf.h      | 37 +++++++++++++
 keyboards/projectkb/signature65/config.h      | 46 ++++++++++++++++
 keyboards/projectkb/signature65/halconf.h     | 37 +++++++++++++
 keyboards/projectkb/signature65/info.json     | 11 ++++
 .../signature65/keymaps/default/keymap.c      | 38 +++++++++++++
 .../signature65/keymaps/via/keymap.c          | 54 +++++++++++++++++++
 .../signature65/keymaps/via/rules.mk          |  2 +
 keyboards/projectkb/signature65/mcuconf.h     | 34 ++++++++++++
 keyboards/projectkb/signature65/readme.md     | 20 +++++++
 keyboards/projectkb/signature65/rules.mk      | 22 ++++++++
 keyboards/projectkb/signature65/signature65.c | 17 ++++++
 keyboards/projectkb/signature65/signature65.h | 35 ++++++++++++
 12 files changed, 353 insertions(+)
 create mode 100644 keyboards/projectkb/signature65/chconf.h
 create mode 100644 keyboards/projectkb/signature65/config.h
 create mode 100644 keyboards/projectkb/signature65/halconf.h
 create mode 100644 keyboards/projectkb/signature65/info.json
 create mode 100644 keyboards/projectkb/signature65/keymaps/default/keymap.c
 create mode 100644 keyboards/projectkb/signature65/keymaps/via/keymap.c
 create mode 100644 keyboards/projectkb/signature65/keymaps/via/rules.mk
 create mode 100644 keyboards/projectkb/signature65/mcuconf.h
 create mode 100644 keyboards/projectkb/signature65/readme.md
 create mode 100644 keyboards/projectkb/signature65/rules.mk
 create mode 100644 keyboards/projectkb/signature65/signature65.c
 create mode 100644 keyboards/projectkb/signature65/signature65.h

diff --git a/keyboards/projectkb/signature65/chconf.h b/keyboards/projectkb/signature65/chconf.h
new file mode 100644
index 0000000000..b1faf2e292
--- /dev/null
+++ b/keyboards/projectkb/signature65/chconf.h
@@ -0,0 +1,37 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_OPTIMIZE_SPEED FALSE
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
+
diff --git a/keyboards/projectkb/signature65/config.h b/keyboards/projectkb/signature65/config.h
new file mode 100644
index 0000000000..f37085c190
--- /dev/null
+++ b/keyboards/projectkb/signature65/config.h
@@ -0,0 +1,46 @@
+/*
+Copyright 2020 MechMerlin 
+
+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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x0159
+#define PRODUCT_ID      0x0165
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Project Keyboard
+#define PRODUCT         Signature65
+
+/* key matrix size */
+#define MATRIX_ROWS    5
+#define MATRIX_COLS    16
+
+//                        1    2   3   4   5   6   7   8    9    10   11  12  13  14  15  16
+#define MATRIX_COL_PINS { B14, A2, B9, B8, B5, B4, B3, A15, B11, B10, B2, A3, B1, B0, A4, A5 }
+//                        1   2   3    4   5
+#define MATRIX_ROW_PINS { A8, A9, B13, A6, A7 }
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* 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
diff --git a/keyboards/projectkb/signature65/halconf.h b/keyboards/projectkb/signature65/halconf.h
new file mode 100644
index 0000000000..0df5c77d32
--- /dev/null
+++ b/keyboards/projectkb/signature65/halconf.h
@@ -0,0 +1,37 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
+
diff --git a/keyboards/projectkb/signature65/info.json b/keyboards/projectkb/signature65/info.json
new file mode 100644
index 0000000000..15e08907b0
--- /dev/null
+++ b/keyboards/projectkb/signature65/info.json
@@ -0,0 +1,11 @@
+{
+    "keyboard_name": "Kepler FC65", 
+    "url": "https://store.projectkeyboard.com", 
+    "maintainer": "projectkeyboard", 
+    "layouts": {
+        "LAYOUT_all": {
+            "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":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Home", "x":15, "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":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"Pg Up", "x":15, "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":"Pg Dn", "x":15, "y":2}, {"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":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"Fn", "x":15, "y":3}, {"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":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/projectkb/signature65/keymaps/default/keymap.c b/keyboards/projectkb/signature65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..46927246ca
--- /dev/null
+++ b/keyboards/projectkb/signature65/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+// 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.
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+    KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,  KC_GRV,   KC_DEL,
+    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_BSPC,  KC_PGUP,
+    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_PGDN,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,              MO(1),
+    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_DEL,   KC_PSCR,
+    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,            RESET,    KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS
+  )
+};
\ No newline at end of file
diff --git a/keyboards/projectkb/signature65/keymaps/via/keymap.c b/keyboards/projectkb/signature65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..cbebc20952
--- /dev/null
+++ b/keyboards/projectkb/signature65/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+// 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.
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+    KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSLS,  KC_GRV,   KC_DEL,
+    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_BSPC,  KC_PGUP,
+    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_PGDN,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,              MO(1),
+    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RCTL,            KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_DEL,   KC_PSCR,
+    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,            RESET,    KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS
+  ),
+
+  [2] = LAYOUT_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS
+  ),
+  
+  [3] = LAYOUT_all(
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,            KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_TRNS,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS
+  )
+};
\ No newline at end of file
diff --git a/keyboards/projectkb/signature65/keymaps/via/rules.mk b/keyboards/projectkb/signature65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/projectkb/signature65/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/projectkb/signature65/mcuconf.h b/keyboards/projectkb/signature65/mcuconf.h
new file mode 100644
index 0000000000..630bfa7093
--- /dev/null
+++ b/keyboards/projectkb/signature65/mcuconf.h
@@ -0,0 +1,34 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/projectkb/signature87/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 TRUE
+
diff --git a/keyboards/projectkb/signature65/readme.md b/keyboards/projectkb/signature65/readme.md
new file mode 100644
index 0000000000..81fd434ff4
--- /dev/null
+++ b/keyboards/projectkb/signature65/readme.md
@@ -0,0 +1,20 @@
+# Signature65
+
+Project Keyboard ANSI only PCB for Kepler FC65. 
+
+* Keyboard Maintainer: [projectkeyboard](https://github.com/projectkeyboard)
+* Hardware Supported: STM32F072CBU6
+* Hardware Availability: [projectkeyboard](https://store.projectkeyboard.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make projectkb/signature65: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset switch/button**: Set the dipswitch to the "on" position. Briefly press the button on the back of the PCB. 
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available.
diff --git a/keyboards/projectkb/signature65/rules.mk b/keyboards/projectkb/signature65/rules.mk
new file mode 100644
index 0000000000..d08b1dfd88
--- /dev/null
+++ b/keyboards/projectkb/signature65/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/projectkb/signature65/signature65.c b/keyboards/projectkb/signature65/signature65.c
new file mode 100644
index 0000000000..c5255dddb9
--- /dev/null
+++ b/keyboards/projectkb/signature65/signature65.c
@@ -0,0 +1,17 @@
+ /* Copyright 2022 Project Keyboard
+  * 
+  * 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 "signature65.h"
diff --git a/keyboards/projectkb/signature65/signature65.h b/keyboards/projectkb/signature65/signature65.h
new file mode 100644
index 0000000000..89aa10e23a
--- /dev/null
+++ b/keyboards/projectkb/signature65/signature65.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 Project Keyboard
+ * 
+ * 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 KNO KC_NO
+
+#define LAYOUT_all( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, K1F, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2F, \
+  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C, K3D,      K3F, \
+  K40, K41, K42,           K45,                K49, K4A,      K4C, K4D,      K4F  \
+) { \
+  {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F  }, \
+  {  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KNO, K1E, K1F  }, \
+  {  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KNO, K2D, KNO, K2F  }, \
+  {  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KNO, K3C, K3D, KNO, K3F  }, \
+  {  K40, K41, K42, KNO, KNO, K45, KNO, KNO, KNO, K49, K4A, KNO, K4C, K4D, KNO, K4F  } \
+}

From 4c8bb05dab67d0048200f3941cb97ed753cc4ae5 Mon Sep 17 00:00:00 2001
From: EqualzC3 <93361153+EqualzC3@users.noreply.github.com>
Date: Thu, 13 Jan 2022 06:11:33 +0800
Subject: [PATCH 270/867] [Keyboard] Add Simpler60 support (#15499)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/ilumkb/simpler61/config.h           |  56 +++++++++
 keyboards/ilumkb/simpler61/info.json          |  76 ++++++++++++
 .../ilumkb/simpler61/keymaps/default/keymap.c |  35 ++++++
 .../ilumkb/simpler61/keymaps/via/keymap.c     |  49 ++++++++
 .../ilumkb/simpler61/keymaps/via/rules.mk     |   2 +
 keyboards/ilumkb/simpler61/readme.md          |  17 +++
 keyboards/ilumkb/simpler61/rules.mk           |  20 ++++
 keyboards/ilumkb/simpler61/simpler61.c        | 110 +++++++++++++++++
 keyboards/ilumkb/simpler61/simpler61.h        |  35 ++++++
 keyboards/ilumkb/simpler64/config.h           |  56 +++++++++
 keyboards/ilumkb/simpler64/info.json          |  79 ++++++++++++
 .../ilumkb/simpler64/keymaps/default/keymap.c |  35 ++++++
 .../ilumkb/simpler64/keymaps/via/keymap.c     |  49 ++++++++
 .../ilumkb/simpler64/keymaps/via/rules.mk     |   2 +
 keyboards/ilumkb/simpler64/readme.md          |  17 +++
 keyboards/ilumkb/simpler64/rules.mk           |  20 ++++
 keyboards/ilumkb/simpler64/simpler64.c        | 113 ++++++++++++++++++
 keyboards/ilumkb/simpler64/simpler64.h        |  35 ++++++
 18 files changed, 806 insertions(+)
 create mode 100644 keyboards/ilumkb/simpler61/config.h
 create mode 100644 keyboards/ilumkb/simpler61/info.json
 create mode 100644 keyboards/ilumkb/simpler61/keymaps/default/keymap.c
 create mode 100644 keyboards/ilumkb/simpler61/keymaps/via/keymap.c
 create mode 100644 keyboards/ilumkb/simpler61/keymaps/via/rules.mk
 create mode 100644 keyboards/ilumkb/simpler61/readme.md
 create mode 100644 keyboards/ilumkb/simpler61/rules.mk
 create mode 100644 keyboards/ilumkb/simpler61/simpler61.c
 create mode 100644 keyboards/ilumkb/simpler61/simpler61.h
 create mode 100644 keyboards/ilumkb/simpler64/config.h
 create mode 100644 keyboards/ilumkb/simpler64/info.json
 create mode 100644 keyboards/ilumkb/simpler64/keymaps/default/keymap.c
 create mode 100644 keyboards/ilumkb/simpler64/keymaps/via/keymap.c
 create mode 100644 keyboards/ilumkb/simpler64/keymaps/via/rules.mk
 create mode 100644 keyboards/ilumkb/simpler64/readme.md
 create mode 100644 keyboards/ilumkb/simpler64/rules.mk
 create mode 100644 keyboards/ilumkb/simpler64/simpler64.c
 create mode 100644 keyboards/ilumkb/simpler64/simpler64.h

diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h
new file mode 100644
index 0000000000..d9a132e066
--- /dev/null
+++ b/keyboards/ilumkb/simpler61/config.h
@@ -0,0 +1,56 @@
+/* Copyright 2021 Equalz
+ *
+ * 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       0xC3C3
+#define PRODUCT_ID      0xC361
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Equalz
+#define PRODUCT         Simpler
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 }
+#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 3
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_LED_PROCESS_LIMIT 4
+#define RGB_MATRIX_LED_FLUSH_LIMIT 26
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define DRIVER_ADDR_1 0b0110000
+#define DRIVER_COUNT 1
+#define DRIVER_1_LED_TOTAL 61
+#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/ilumkb/simpler61/info.json b/keyboards/ilumkb/simpler61/info.json
new file mode 100644
index 0000000000..01dc02797f
--- /dev/null
+++ b/keyboards/ilumkb/simpler61/info.json
@@ -0,0 +1,76 @@
+{
+    "keyboard_name": "Simpler61",
+    "url": "",
+    "maintainer": "Equalz",
+    "layouts": {
+        "LAYOUT_61_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":12.5, "y":4},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ilumkb/simpler61/keymaps/default/keymap.c b/keyboards/ilumkb/simpler61/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8e7fe51b99
--- /dev/null
+++ b/keyboards/ilumkb/simpler61/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 Equalz
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_61_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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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,          MO(1),
+		KC_LCTL, KC_LGUI, KC_LALT,                     KC_SPC,                                    KC_RALT, KC_RGUI,          KC_RCTL
+	),
+	[1] = LAYOUT_61_ansi(
+        KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+		_______, _______, KC_UP,   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, RESET,
+		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
+		_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, _______,          _______,
+		_______, _______, _______,                   _______,                                     _______, _______,          _______
+	)
+};
+
diff --git a/keyboards/ilumkb/simpler61/keymaps/via/keymap.c b/keyboards/ilumkb/simpler61/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c885617df0
--- /dev/null
+++ b/keyboards/ilumkb/simpler61/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 Equalz
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_61_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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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,          MO(1),
+		KC_LCTL, KC_LGUI, KC_LALT,                     KC_SPC,                                    KC_RALT, KC_RGUI,          KC_RCTL
+	),
+	[1] = LAYOUT_61_ansi(
+        KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+		_______, _______, KC_UP,   _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, RESET,
+		_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          EEP_RST,
+		_______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN, _______,          _______,
+		_______, _______, _______,                   _______,                                     _______, _______,          _______
+	),
+    [2] = LAYOUT_61_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     
+        _______, _______, _______,                   _______,                                     _______, _______,          _______
+	),
+    [3] = LAYOUT_61_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,     
+        _______, _______, _______,                   _______,                                     _______, _______,          _______
+	)
+};
+
diff --git a/keyboards/ilumkb/simpler61/keymaps/via/rules.mk b/keyboards/ilumkb/simpler61/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/ilumkb/simpler61/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/ilumkb/simpler61/readme.md b/keyboards/ilumkb/simpler61/readme.md
new file mode 100644
index 0000000000..5721be617a
--- /dev/null
+++ b/keyboards/ilumkb/simpler61/readme.md
@@ -0,0 +1,17 @@
+# iLumkb Simpler60% - 61 Keys Layout
+
+![iLumkb Simpler](https://i.imgur.com/QaalKfX.jpg)
+
+A hotswap 60% RGB Custom Mechanical keyboard.
+
+* Keyboard Maintainer: [Equalz](https://github.com/EqualzC3)
+* Hardware Supported: iLumkb Simpler61 (ATmega32U4)
+* Hardware Availability: [iLumkb](https://ilumkb.com/products/simpler60)
+
+Reset board into bootloader by holding down Esc key while plugging in USB-C cable.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ilumkb/simpler61: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).
diff --git a/keyboards/ilumkb/simpler61/rules.mk b/keyboards/ilumkb/simpler61/rules.mk
new file mode 100644
index 0000000000..ab16f67c8d
--- /dev/null
+++ b/keyboards/ilumkb/simpler61/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes          # Mouse keys
+EXTRAKEY_ENABLE = yes          # Audio control and System control
+CONSOLE_ENABLE = no            # Console for debug
+COMMAND_ENABLE = yes           # Commands for debug and configuration
+NKRO_ENABLE = yes              # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
+AUDIO_ENABLE = no              # Audio output
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/ilumkb/simpler61/simpler61.c b/keyboards/ilumkb/simpler61/simpler61.c
new file mode 100644
index 0000000000..0eca6e0b07
--- /dev/null
+++ b/keyboards/ilumkb/simpler61/simpler61.c
@@ -0,0 +1,110 @@
+/* Copyright 2021 Equalz
+ *
+ * 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 "simpler61.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
+    {0,  CS3_SW1,  CS2_SW1,  CS1_SW1},
+    {0,  CS3_SW2,  CS2_SW2,  CS1_SW2},
+    {0,  CS3_SW3,  CS2_SW3,  CS1_SW3},
+    {0,  CS3_SW4,  CS2_SW4,  CS1_SW4},
+    {0,  CS3_SW5,  CS2_SW5,  CS1_SW5},
+    {0,  CS3_SW6,  CS2_SW6,  CS1_SW6},
+    {0,  CS3_SW7,  CS2_SW7,  CS1_SW7},
+    {0,  CS3_SW8,  CS2_SW8,  CS1_SW8},
+    {0,  CS3_SW9,  CS2_SW9,  CS1_SW9},
+    {0, CS18_SW9, CS17_SW9, CS16_SW9},
+    {0, CS18_SW8, CS17_SW8, CS16_SW8},
+    {0, CS18_SW7, CS17_SW7, CS16_SW7},
+    {0, CS18_SW6, CS17_SW6, CS16_SW6},
+    {0, CS18_SW5, CS17_SW5, CS16_SW5},
+
+    {0,  CS6_SW1,  CS5_SW1,  CS4_SW1},
+    {0,  CS6_SW2,  CS5_SW2,  CS4_SW2},
+    {0,  CS6_SW3,  CS5_SW3,  CS4_SW3},
+    {0,  CS6_SW4,  CS5_SW4,  CS4_SW4},
+    {0,  CS6_SW5,  CS5_SW5,  CS4_SW5},
+    {0,  CS6_SW6,  CS5_SW6,  CS4_SW6},
+    {0,  CS6_SW7,  CS5_SW7,  CS4_SW7},
+    {0,  CS6_SW8,  CS5_SW8,  CS4_SW8},
+    {0,  CS6_SW9,  CS5_SW9,  CS4_SW9},
+	{0, CS21_SW9, CS20_SW9, CS19_SW9},
+    {0, CS21_SW8, CS20_SW8, CS19_SW8},
+    {0, CS21_SW7, CS20_SW7, CS19_SW7},
+    {0, CS21_SW6, CS20_SW6, CS19_SW6},
+    {0, CS21_SW5, CS20_SW5, CS19_SW5},
+
+    {0,  CS9_SW1,  CS8_SW1,  CS7_SW1},
+    {0,  CS9_SW2,  CS8_SW2,  CS7_SW2},
+    {0,  CS9_SW3,  CS8_SW3,  CS7_SW3},
+    {0,  CS9_SW4,  CS8_SW4,  CS7_SW4},
+    {0,  CS9_SW5,  CS8_SW5,  CS7_SW5},
+    {0,  CS9_SW6,  CS8_SW6,  CS7_SW6},
+    {0,  CS9_SW7,  CS8_SW7,  CS7_SW7},
+    {0,  CS9_SW8,  CS8_SW8,  CS7_SW8},
+    {0,  CS9_SW9,  CS8_SW9,  CS7_SW9},
+    {0, CS24_SW9, CS23_SW9, CS22_SW9},
+	{0, CS24_SW8, CS23_SW8, CS22_SW8},
+    {0, CS24_SW7, CS23_SW7, CS22_SW7},
+	{0, CS24_SW5, CS23_SW5, CS22_SW5},
+
+    {0, CS12_SW1, CS11_SW1, CS10_SW1},
+    {0, CS12_SW2, CS11_SW2, CS10_SW2},
+    {0, CS12_SW3, CS11_SW3, CS10_SW3},
+    {0, CS12_SW4, CS11_SW4, CS10_SW4},
+    {0, CS12_SW5, CS11_SW5, CS10_SW5},
+    {0, CS12_SW6, CS11_SW6, CS10_SW6},
+    {0, CS12_SW7, CS11_SW7, CS10_SW7},
+    {0, CS12_SW8, CS11_SW8, CS10_SW8},
+    {0, CS12_SW9, CS11_SW9, CS10_SW9},
+    {0, CS27_SW9, CS26_SW9, CS25_SW9},
+	{0, CS27_SW8, CS26_SW8, CS25_SW8},
+    {0, CS27_SW7, CS26_SW7, CS25_SW7},
+    {0, CS27_SW5, CS26_SW5, CS25_SW5},
+
+    {0, CS15_SW1, CS14_SW1, CS13_SW1},
+    {0, CS15_SW2, CS14_SW2, CS13_SW2},
+    {0, CS15_SW3, CS14_SW3, CS13_SW3},
+    {0, CS15_SW6, CS14_SW6, CS13_SW6},
+    {0, CS30_SW8, CS29_SW8, CS28_SW8},
+    {0, CS30_SW7, CS29_SW7, CS28_SW7},
+    {0, CS30_SW5, CS29_SW5, CS28_SW5},
+};
+
+led_config_t g_led_config = {
+	{
+		{  0,       1,       2,       3,       4,       5,       6,       7,       8,       9,      10,      11,      12,      13},
+		{ 14,      15,      16,      17,      18,      19,      20,      21,      22,      23,      24,      25,      26,      27},
+		{ 28,      29,      30,      31,      32,      33,      34,      35,      36,      37,      38,      39,  NO_LED,      40},
+		{ 41,      42,      43,      44,      45,      46,      47,      48,      49,      50,      51,      52,  NO_LED,      53},
+		{ 54,      55,      56,  NO_LED,  NO_LED,      57,  NO_LED,  NO_LED,  NO_LED,  NO_LED,      58,      59,  NO_LED,      60},
+    }, {
+		{0,  0}, {16,  0}, {32,  0},  {48, 0},  {64, 0},   {80, 0},   {96, 0},  {112, 0},  {128, 0},  {144, 0},  {160, 0},  {176, 0},  {192, 0},  {216, 0},
+		{4, 16}, {24, 16}, {40, 16}, {56, 16}, {72, 16},  {88, 16}, {104, 16}, {120, 16}, {136, 16}, {152, 16}, {168, 16}, {184, 16}, {200, 16}, {220, 16},
+		{2, 32}, {28, 32}, {44, 32}, {60, 32}, {76, 32},  {92, 32}, {108, 32}, {114, 32}, {130, 32}, {146, 32}, {162, 32}, {178, 32},            {204, 32},
+		{9, 48}, {36, 48}, {52, 48}, {68, 48}, {84, 48}, {100, 48}, {116, 48}, {132, 48}, {148, 48}, {164, 48}, {180, 48}, {202, 48},            {224, 48},
+		{4, 64}, {24, 64}, {44, 64},                     {112, 64},                                             {180, 64}, {200, 64},            {220, 64},
+	}, {
+		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4, 
+		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,
+		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,                4,
+		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,                4,
+		4,       4,       4,                         4,                                           4,       4,                4,
+	}
+};
+
+#endif
diff --git a/keyboards/ilumkb/simpler61/simpler61.h b/keyboards/ilumkb/simpler61/simpler61.h
new file mode 100644
index 0000000000..afa308b12d
--- /dev/null
+++ b/keyboards/ilumkb/simpler61/simpler61.h
@@ -0,0 +1,35 @@
+/* Copyright 2021 Equalz
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_61_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
+    K40, K41, K42,           K45,                     K4A, K4B,      K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
+    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, K4B, XXX, K4D }  \
+}
diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h
new file mode 100644
index 0000000000..0376d9e2d2
--- /dev/null
+++ b/keyboards/ilumkb/simpler64/config.h
@@ -0,0 +1,56 @@
+/* Copyright 2021 Equalz
+ *
+ * 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       0xC3C3
+#define PRODUCT_ID      0xC364
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Equalz
+#define PRODUCT         Simpler
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define MATRIX_ROW_PINS { F6, F5, F4, F1, F0 }
+#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 3
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_LED_PROCESS_LIMIT 4
+#define RGB_MATRIX_LED_FLUSH_LIMIT 26
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+#define DRIVER_ADDR_1 0b0110000
+#define DRIVER_COUNT 1
+#define DRIVER_1_LED_TOTAL 64
+#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define DRIVER_INDICATOR_LED_TOTAL 0
diff --git a/keyboards/ilumkb/simpler64/info.json b/keyboards/ilumkb/simpler64/info.json
new file mode 100644
index 0000000000..c0fd4800cc
--- /dev/null
+++ b/keyboards/ilumkb/simpler64/info.json
@@ -0,0 +1,79 @@
+{
+    "keyboard_name": "Simpler64",
+    "url": "",
+    "maintainer": "Equalz",
+    "layouts": {
+        "LAYOUT_64_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2},
+                {"x":2, "y":3},
+                {"x":3, "y":3},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+                {"x":9, "y":3},
+                {"x":10, "y":3},
+                {"x":11, "y":3},
+                {"x":12, "y":3},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/ilumkb/simpler64/keymaps/default/keymap.c b/keyboards/ilumkb/simpler64/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f3f83cc411
--- /dev/null
+++ b/keyboards/ilumkb/simpler64/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 Equalz
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_64_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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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,  MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
+	),
+	[1] = LAYOUT_64_ansi(
+        KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, NK_TOGG, _______, KC_END,  KC_PGDN, _______, _______, _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
+	)
+};
+
diff --git a/keyboards/ilumkb/simpler64/keymaps/via/keymap.c b/keyboards/ilumkb/simpler64/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f003f733b7
--- /dev/null
+++ b/keyboards/ilumkb/simpler64/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 Equalz
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_64_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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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,  MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
+	),
+	[1] = LAYOUT_64_ansi(
+        KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______,          EEP_RST,
+        _______, _______, _______, _______, _______, _______, NK_TOGG, _______, KC_END,  KC_PGDN, _______, _______, _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
+	),
+    [2] = LAYOUT_64_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     
+        _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
+	),
+    [3] = LAYOUT_64_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     
+        _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
+	)
+};
+
diff --git a/keyboards/ilumkb/simpler64/keymaps/via/rules.mk b/keyboards/ilumkb/simpler64/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/ilumkb/simpler64/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/ilumkb/simpler64/readme.md b/keyboards/ilumkb/simpler64/readme.md
new file mode 100644
index 0000000000..14cbb52ee6
--- /dev/null
+++ b/keyboards/ilumkb/simpler64/readme.md
@@ -0,0 +1,17 @@
+# iLumkb Simpler60% - 64 Keys Layout
+
+![iLumkb Simpler](https://i.imgur.com/QaalKfX.jpg)
+
+A hotswap 60% RGB Custom Mechanical keyboard.
+
+* Keyboard Maintainer: [Equalz](https://github.com/EqualzC3)
+* Hardware Supported: iLumkb Simpler64 (ATmega32U4)
+* Hardware Availability: [iLumkb](https://ilumkb.com/products/simpler60)
+
+Reset board into bootloader by holding down Esc key while plugging in USB-C cable.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ilumkb/simpler64: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).
diff --git a/keyboards/ilumkb/simpler64/rules.mk b/keyboards/ilumkb/simpler64/rules.mk
new file mode 100644
index 0000000000..ab16f67c8d
--- /dev/null
+++ b/keyboards/ilumkb/simpler64/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes          # Mouse keys
+EXTRAKEY_ENABLE = yes          # Audio control and System control
+CONSOLE_ENABLE = no            # Console for debug
+COMMAND_ENABLE = yes           # Commands for debug and configuration
+NKRO_ENABLE = yes              # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
+AUDIO_ENABLE = no              # Audio output
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
diff --git a/keyboards/ilumkb/simpler64/simpler64.c b/keyboards/ilumkb/simpler64/simpler64.c
new file mode 100644
index 0000000000..19e4320734
--- /dev/null
+++ b/keyboards/ilumkb/simpler64/simpler64.c
@@ -0,0 +1,113 @@
+/* Copyright 2021 Equalz
+ *
+ * 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 "simpler64.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
+    {0,  CS3_SW1,  CS2_SW1,  CS1_SW1},
+    {0,  CS3_SW2,  CS2_SW2,  CS1_SW2},
+    {0,  CS3_SW3,  CS2_SW3,  CS1_SW3},
+    {0,  CS3_SW4,  CS2_SW4,  CS1_SW4},
+    {0,  CS3_SW5,  CS2_SW5,  CS1_SW5},
+    {0,  CS3_SW6,  CS2_SW6,  CS1_SW6},
+    {0,  CS3_SW7,  CS2_SW7,  CS1_SW7},
+    {0,  CS3_SW8,  CS2_SW8,  CS1_SW8},
+    {0,  CS3_SW9,  CS2_SW9,  CS1_SW9},
+    {0, CS18_SW9, CS17_SW9, CS16_SW9},
+    {0, CS18_SW8, CS17_SW8, CS16_SW8},
+    {0, CS18_SW7, CS17_SW7, CS16_SW7},
+    {0, CS18_SW6, CS17_SW6, CS16_SW6},
+    {0, CS18_SW5, CS17_SW5, CS16_SW5},
+
+    {0,  CS6_SW1,  CS5_SW1,  CS4_SW1},
+    {0,  CS6_SW2,  CS5_SW2,  CS4_SW2},
+    {0,  CS6_SW3,  CS5_SW3,  CS4_SW3},
+    {0,  CS6_SW4,  CS5_SW4,  CS4_SW4},
+    {0,  CS6_SW5,  CS5_SW5,  CS4_SW5},
+    {0,  CS6_SW6,  CS5_SW6,  CS4_SW6},
+    {0,  CS6_SW7,  CS5_SW7,  CS4_SW7},
+    {0,  CS6_SW8,  CS5_SW8,  CS4_SW8},
+    {0,  CS6_SW9,  CS5_SW9,  CS4_SW9},
+	{0, CS21_SW9, CS20_SW9, CS19_SW9},
+    {0, CS21_SW8, CS20_SW8, CS19_SW8},
+    {0, CS21_SW7, CS20_SW7, CS19_SW7},
+    {0, CS21_SW6, CS20_SW6, CS19_SW6},
+    {0, CS21_SW5, CS20_SW5, CS19_SW5},
+
+    {0,  CS9_SW1,  CS8_SW1,  CS7_SW1},
+    {0,  CS9_SW2,  CS8_SW2,  CS7_SW2},
+    {0,  CS9_SW3,  CS8_SW3,  CS7_SW3},
+    {0,  CS9_SW4,  CS8_SW4,  CS7_SW4},
+    {0,  CS9_SW5,  CS8_SW5,  CS7_SW5},
+    {0,  CS9_SW6,  CS8_SW6,  CS7_SW6},
+    {0,  CS9_SW7,  CS8_SW7,  CS7_SW7},
+    {0,  CS9_SW8,  CS8_SW8,  CS7_SW8},
+    {0,  CS9_SW9,  CS8_SW9,  CS7_SW9},
+    {0, CS24_SW9, CS23_SW9, CS22_SW9},
+	{0, CS24_SW8, CS23_SW8, CS22_SW8},
+    {0, CS24_SW7, CS23_SW7, CS22_SW7},
+	{0, CS24_SW5, CS23_SW5, CS22_SW5},
+
+    {0, CS12_SW1, CS11_SW1, CS10_SW1},
+    {0, CS12_SW2, CS11_SW2, CS10_SW2},
+    {0, CS12_SW3, CS11_SW3, CS10_SW3},
+    {0, CS12_SW4, CS11_SW4, CS10_SW4},
+    {0, CS12_SW5, CS11_SW5, CS10_SW5},
+    {0, CS12_SW6, CS11_SW6, CS10_SW6},
+    {0, CS12_SW7, CS11_SW7, CS10_SW7},
+    {0, CS12_SW8, CS11_SW8, CS10_SW8},
+    {0, CS12_SW9, CS11_SW9, CS10_SW9},
+    {0, CS27_SW9, CS26_SW9, CS25_SW9},
+    {0, CS27_SW8, CS26_SW8, CS25_SW8},
+	{0, CS27_SW7, CS26_SW7, CS25_SW7},
+    {0, CS27_SW6, CS26_SW6, CS25_SW6},
+    {0, CS27_SW5, CS26_SW5, CS25_SW5},
+
+    {0, CS15_SW1, CS14_SW1, CS13_SW1},
+    {0, CS15_SW2, CS14_SW2, CS13_SW2},
+    {0, CS15_SW3, CS14_SW3, CS13_SW3},
+    {0, CS15_SW6, CS14_SW6, CS13_SW6},
+    {0, CS30_SW9, CS29_SW9, CS28_SW9},
+    {0, CS30_SW8, CS29_SW8, CS28_SW8},
+    {0, CS30_SW7, CS29_SW7, CS28_SW7},
+    {0, CS30_SW6, CS29_SW6, CS28_SW6},
+    {0, CS30_SW5, CS29_SW5, CS28_SW5},
+};
+
+led_config_t g_led_config = {
+	{
+		{  0,       1,       2,       3,       4,       5,       6,       7,       8,       9,      10,      11,      12,      13},
+		{ 14,      15,      16,      17,      18,      19,      20,      21,      22,      23,      24,      25,      26,      27},
+		{ 28,      29,      30,      31,      32,      33,      34,      35,      36,      37,      38,      39,  NO_LED,      40},
+		{ 41,      42,      43,      44,      45,      46,      47,      48,      49,      50,      51,      52,      53,      54},
+		{ 55,      56,      57,  NO_LED,  NO_LED,      58,  NO_LED,  NO_LED,  NO_LED,      59,      60,      61,      62,      63},
+    }, {
+		{0,  0}, {16,  0}, {32,  0},  {48, 0},  {64, 0},  {80, 0},   {96, 0},  {112, 0},  {128, 0},  {144, 0},  {160, 0},  {176, 0},  {192, 0},  {216, 0},
+		{4, 16}, {24, 16}, {40, 16}, {56, 16}, {72, 16}, {88, 16}, {104, 16}, {120, 16}, {136, 16}, {152, 16}, {168, 16}, {184, 16}, {200, 16}, {220, 16},
+		{6, 32}, {28, 32}, {44, 32}, {60, 32}, {76, 32}, {92, 32}, {108, 32}, {114, 32}, {130, 32}, {146, 32}, {162, 32}, {178, 32},            {204, 32},
+		{8, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {138, 48}, {154, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48}, {224, 48},
+		{2, 64}, {22, 64}, {42, 64},                    {102, 64},                                  {160, 64}, {176, 64}, {192, 64}, {208, 64}, {224, 64},
+	}, {
+		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4, 
+		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,
+		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,                4,
+		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,
+		4,       4,       4,                         4,                                  4,       4,       4,       4,       4,
+	}
+};
+
+#endif
diff --git a/keyboards/ilumkb/simpler64/simpler64.h b/keyboards/ilumkb/simpler64/simpler64.h
new file mode 100644
index 0000000000..01a8bbc34f
--- /dev/null
+++ b/keyboards/ilumkb/simpler64/simpler64.h
@@ -0,0 +1,35 @@
+/* Copyright 2021 Equalz
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_64_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D }  \
+}

From 92b2738bbbe98db0224972c612e06fe3f2f86045 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Thu, 13 Jan 2022 06:13:45 +0800
Subject: [PATCH 271/867] move @kakunpc 's keebs into kakunpc/ (#15814)

Co-authored-by: kakunpc <15257475+kakunpc@users.noreply.github.com>
---
 keyboards/{ => kakunpc}/angel17/.noci                         | 0
 keyboards/{ => kakunpc}/angel17/alpha/.noci                   | 0
 keyboards/{ => kakunpc}/angel17/alpha/alpha.c                 | 0
 keyboards/{ => kakunpc}/angel17/alpha/alpha.h                 | 0
 keyboards/{ => kakunpc}/angel17/alpha/config.h                | 0
 keyboards/{ => kakunpc}/angel17/alpha/rules.mk                | 0
 keyboards/{ => kakunpc}/angel17/info.json                     | 0
 keyboards/{ => kakunpc}/angel17/keymaps/default/keymap.c      | 0
 keyboards/{ => kakunpc}/angel17/keymaps/default/readme.md     | 0
 keyboards/{ => kakunpc}/angel17/readme.md                     | 2 +-
 keyboards/{ => kakunpc}/angel17/rev1/config.h                 | 0
 keyboards/{ => kakunpc}/angel17/rev1/rev1.c                   | 0
 keyboards/{ => kakunpc}/angel17/rev1/rev1.h                   | 0
 keyboards/{ => kakunpc}/angel17/rev1/rules.mk                 | 0
 keyboards/{ => kakunpc}/angel17/rules.mk                      | 2 +-
 keyboards/{ => kakunpc}/angel64/.noci                         | 0
 keyboards/{ => kakunpc}/angel64/alpha/.noci                   | 0
 keyboards/{ => kakunpc}/angel64/alpha/alpha.c                 | 0
 keyboards/{ => kakunpc}/angel64/alpha/alpha.h                 | 0
 keyboards/{ => kakunpc}/angel64/alpha/config.h                | 0
 keyboards/{ => kakunpc}/angel64/alpha/info.json               | 0
 .../{ => kakunpc}/angel64/alpha/keymaps/default/keymap.c      | 0
 .../{ => kakunpc}/angel64/alpha/keymaps/default/readme.md     | 0
 keyboards/{ => kakunpc}/angel64/alpha/matrix.c                | 0
 keyboards/{ => kakunpc}/angel64/alpha/readme.md               | 2 +-
 keyboards/{ => kakunpc}/angel64/alpha/rules.mk                | 0
 keyboards/{ => kakunpc}/angel64/readme.md                     | 2 +-
 keyboards/{ => kakunpc}/angel64/rev1/config.h                 | 0
 keyboards/{ => kakunpc}/angel64/rev1/info.json                | 0
 keyboards/{ => kakunpc}/angel64/rev1/keymaps/default/keymap.c | 0
 .../{ => kakunpc}/angel64/rev1/keymaps/default/readme.md      | 0
 keyboards/{ => kakunpc}/angel64/rev1/keymaps/kakunpc/config.h | 0
 keyboards/{ => kakunpc}/angel64/rev1/keymaps/kakunpc/keymap.c | 0
 .../{ => kakunpc}/angel64/rev1/keymaps/kakunpc/readme.md      | 0
 keyboards/{ => kakunpc}/angel64/rev1/matrix.c                 | 0
 keyboards/{ => kakunpc}/angel64/rev1/readme.md                | 2 +-
 keyboards/{ => kakunpc}/angel64/rev1/rev1.c                   | 0
 keyboards/{ => kakunpc}/angel64/rev1/rev1.h                   | 0
 keyboards/{ => kakunpc}/angel64/rev1/rules.mk                 | 0
 keyboards/{ => kakunpc}/angel64/rules.mk                      | 2 +-
 keyboards/{ => kakunpc}/business_card/.noci                   | 0
 keyboards/{ => kakunpc}/business_card/alpha/.noci             | 0
 keyboards/{ => kakunpc}/business_card/alpha/alpha.c           | 0
 keyboards/{ => kakunpc}/business_card/alpha/alpha.h           | 0
 keyboards/{ => kakunpc}/business_card/alpha/config.h          | 0
 keyboards/{ => kakunpc}/business_card/alpha/info.json         | 0
 .../business_card/alpha/keymaps/default/config.h              | 0
 .../business_card/alpha/keymaps/default/keymap.c              | 0
 .../business_card/alpha/keymaps/default/readme.md             | 0
 keyboards/{ => kakunpc}/business_card/alpha/rules.mk          | 0
 keyboards/{ => kakunpc}/business_card/beta/beta.c             | 0
 keyboards/{ => kakunpc}/business_card/beta/beta.h             | 0
 keyboards/{ => kakunpc}/business_card/beta/config.h           | 0
 keyboards/{ => kakunpc}/business_card/beta/info.json          | 0
 .../{ => kakunpc}/business_card/beta/keymaps/default/config.h | 0
 .../{ => kakunpc}/business_card/beta/keymaps/default/keymap.c | 0
 .../business_card/beta/keymaps/default/readme.md              | 0
 keyboards/{ => kakunpc}/business_card/beta/rules.mk           | 0
 keyboards/{ => kakunpc}/business_card/business_card.c         | 0
 keyboards/{ => kakunpc}/business_card/business_card.h         | 4 ++--
 keyboards/{ => kakunpc}/business_card/config.h                | 0
 keyboards/{ => kakunpc}/business_card/readme.md               | 2 +-
 keyboards/{ => kakunpc}/business_card/rules.mk                | 2 +-
 keyboards/{ => kakunpc}/choc_taro/choc_taro.c                 | 0
 keyboards/{ => kakunpc}/choc_taro/choc_taro.h                 | 0
 keyboards/{ => kakunpc}/choc_taro/config.h                    | 0
 keyboards/{ => kakunpc}/choc_taro/info.json                   | 0
 keyboards/{ => kakunpc}/choc_taro/keymaps/default/keymap.c    | 0
 keyboards/{ => kakunpc}/choc_taro/keymaps/default/readme.md   | 0
 keyboards/{ => kakunpc}/choc_taro/keymaps/via/keymap.c        | 0
 keyboards/{ => kakunpc}/choc_taro/keymaps/via/readme.md       | 0
 keyboards/{ => kakunpc}/choc_taro/keymaps/via/rules.mk        | 0
 keyboards/{ => kakunpc}/choc_taro/matrix.c                    | 0
 keyboards/{ => kakunpc}/choc_taro/readme.md                   | 2 +-
 keyboards/{ => kakunpc}/choc_taro/rules.mk                    | 0
 keyboards/{ => kakunpc}/rabbit_capture_plan/config.h          | 0
 keyboards/{ => kakunpc}/rabbit_capture_plan/info.json         | 0
 .../rabbit_capture_plan/keymaps/default/keymap.c              | 0
 .../rabbit_capture_plan/keymaps/default/readme.md             | 0
 .../{ => kakunpc}/rabbit_capture_plan/keymaps/via/keymap.c    | 0
 .../{ => kakunpc}/rabbit_capture_plan/keymaps/via/readme.md   | 0
 .../{ => kakunpc}/rabbit_capture_plan/keymaps/via/rules.mk    | 0
 .../{ => kakunpc}/rabbit_capture_plan/rabbit_capture_plan.c   | 0
 .../{ => kakunpc}/rabbit_capture_plan/rabbit_capture_plan.h   | 0
 keyboards/{ => kakunpc}/rabbit_capture_plan/readme.md         | 4 ++--
 keyboards/{ => kakunpc}/rabbit_capture_plan/rules.mk          | 0
 keyboards/{ => kakunpc}/suihankey/alpha/alpha.c               | 0
 keyboards/{ => kakunpc}/suihankey/alpha/alpha.h               | 0
 keyboards/{ => kakunpc}/suihankey/alpha/config.h              | 0
 keyboards/{ => kakunpc}/suihankey/alpha/info.json             | 0
 .../{ => kakunpc}/suihankey/alpha/keymaps/default/keymap.c    | 0
 .../{ => kakunpc}/suihankey/alpha/keymaps/default/readme.md   | 0
 keyboards/{ => kakunpc}/suihankey/alpha/readme.md             | 0
 keyboards/{ => kakunpc}/suihankey/alpha/rules.mk              | 0
 keyboards/{ => kakunpc}/suihankey/readme.md                   | 2 +-
 keyboards/{ => kakunpc}/suihankey/rev1/config.h               | 0
 keyboards/{ => kakunpc}/suihankey/rev1/info.json              | 0
 .../{ => kakunpc}/suihankey/rev1/keymaps/default/keymap.c     | 0
 .../{ => kakunpc}/suihankey/rev1/keymaps/default/readme.md    | 0
 keyboards/{ => kakunpc}/suihankey/rev1/readme.md              | 0
 keyboards/{ => kakunpc}/suihankey/rev1/rev1.c                 | 0
 keyboards/{ => kakunpc}/suihankey/rev1/rev1.h                 | 0
 keyboards/{ => kakunpc}/suihankey/rev1/rules.mk               | 0
 keyboards/{ => kakunpc}/suihankey/rules.mk                    | 2 +-
 keyboards/{ => kakunpc}/suihankey/split/.noci                 | 0
 keyboards/{ => kakunpc}/suihankey/split/alpha/.noci           | 0
 keyboards/{ => kakunpc}/suihankey/split/alpha/alpha.c         | 0
 keyboards/{ => kakunpc}/suihankey/split/alpha/alpha.h         | 0
 keyboards/{ => kakunpc}/suihankey/split/alpha/config.h        | 0
 keyboards/{ => kakunpc}/suihankey/split/alpha/readme.md       | 2 +-
 keyboards/{ => kakunpc}/suihankey/split/alpha/rules.mk        | 0
 keyboards/{ => kakunpc}/suihankey/split/info.json             | 0
 .../{ => kakunpc}/suihankey/split/keymaps/default/keymap.c    | 0
 .../{ => kakunpc}/suihankey/split/keymaps/default/readme.md   | 0
 keyboards/{ => kakunpc}/suihankey/split/readme.md             | 2 +-
 keyboards/{ => kakunpc}/suihankey/split/rev1/config.h         | 0
 keyboards/{ => kakunpc}/suihankey/split/rev1/readme.md        | 2 +-
 keyboards/{ => kakunpc}/suihankey/split/rev1/rev1.c           | 0
 keyboards/{ => kakunpc}/suihankey/split/rev1/rev1.h           | 0
 keyboards/{ => kakunpc}/suihankey/split/rev1/rules.mk         | 0
 keyboards/{ => kakunpc}/suihankey/split/rules.mk              | 0
 keyboards/{ => kakunpc}/thedogkeyboard/config.h               | 0
 keyboards/{ => kakunpc}/thedogkeyboard/info.json              | 0
 .../{ => kakunpc}/thedogkeyboard/keymaps/default/keymap.c     | 0
 .../{ => kakunpc}/thedogkeyboard/keymaps/default/readme.md    | 0
 .../{ => kakunpc}/thedogkeyboard/keymaps/kakunpc/keymap.c     | 0
 .../{ => kakunpc}/thedogkeyboard/keymaps/kakunpc/readme.md    | 0
 keyboards/{ => kakunpc}/thedogkeyboard/matrix.c               | 0
 keyboards/{ => kakunpc}/thedogkeyboard/readme.md              | 2 +-
 keyboards/{ => kakunpc}/thedogkeyboard/rules.mk               | 0
 keyboards/{ => kakunpc}/thedogkeyboard/thedogkeyboard.c       | 0
 keyboards/{ => kakunpc}/thedogkeyboard/thedogkeyboard.h       | 0
 132 files changed, 19 insertions(+), 19 deletions(-)
 rename keyboards/{ => kakunpc}/angel17/.noci (100%)
 rename keyboards/{ => kakunpc}/angel17/alpha/.noci (100%)
 rename keyboards/{ => kakunpc}/angel17/alpha/alpha.c (100%)
 rename keyboards/{ => kakunpc}/angel17/alpha/alpha.h (100%)
 rename keyboards/{ => kakunpc}/angel17/alpha/config.h (100%)
 rename keyboards/{ => kakunpc}/angel17/alpha/rules.mk (100%)
 rename keyboards/{ => kakunpc}/angel17/info.json (100%)
 rename keyboards/{ => kakunpc}/angel17/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kakunpc}/angel17/keymaps/default/readme.md (100%)
 rename keyboards/{ => kakunpc}/angel17/readme.md (94%)
 rename keyboards/{ => kakunpc}/angel17/rev1/config.h (100%)
 rename keyboards/{ => kakunpc}/angel17/rev1/rev1.c (100%)
 rename keyboards/{ => kakunpc}/angel17/rev1/rev1.h (100%)
 rename keyboards/{ => kakunpc}/angel17/rev1/rules.mk (100%)
 rename keyboards/{ => kakunpc}/angel17/rules.mk (94%)
 rename keyboards/{ => kakunpc}/angel64/.noci (100%)
 rename keyboards/{ => kakunpc}/angel64/alpha/.noci (100%)
 rename keyboards/{ => kakunpc}/angel64/alpha/alpha.c (100%)
 rename keyboards/{ => kakunpc}/angel64/alpha/alpha.h (100%)
 rename keyboards/{ => kakunpc}/angel64/alpha/config.h (100%)
 rename keyboards/{ => kakunpc}/angel64/alpha/info.json (100%)
 rename keyboards/{ => kakunpc}/angel64/alpha/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kakunpc}/angel64/alpha/keymaps/default/readme.md (100%)
 rename keyboards/{ => kakunpc}/angel64/alpha/matrix.c (100%)
 rename keyboards/{ => kakunpc}/angel64/alpha/readme.md (94%)
 rename keyboards/{ => kakunpc}/angel64/alpha/rules.mk (100%)
 rename keyboards/{ => kakunpc}/angel64/readme.md (94%)
 rename keyboards/{ => kakunpc}/angel64/rev1/config.h (100%)
 rename keyboards/{ => kakunpc}/angel64/rev1/info.json (100%)
 rename keyboards/{ => kakunpc}/angel64/rev1/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kakunpc}/angel64/rev1/keymaps/default/readme.md (100%)
 rename keyboards/{ => kakunpc}/angel64/rev1/keymaps/kakunpc/config.h (100%)
 rename keyboards/{ => kakunpc}/angel64/rev1/keymaps/kakunpc/keymap.c (100%)
 rename keyboards/{ => kakunpc}/angel64/rev1/keymaps/kakunpc/readme.md (100%)
 rename keyboards/{ => kakunpc}/angel64/rev1/matrix.c (100%)
 rename keyboards/{ => kakunpc}/angel64/rev1/readme.md (94%)
 rename keyboards/{ => kakunpc}/angel64/rev1/rev1.c (100%)
 rename keyboards/{ => kakunpc}/angel64/rev1/rev1.h (100%)
 rename keyboards/{ => kakunpc}/angel64/rev1/rules.mk (100%)
 rename keyboards/{ => kakunpc}/angel64/rules.mk (94%)
 rename keyboards/{ => kakunpc}/business_card/.noci (100%)
 rename keyboards/{ => kakunpc}/business_card/alpha/.noci (100%)
 rename keyboards/{ => kakunpc}/business_card/alpha/alpha.c (100%)
 rename keyboards/{ => kakunpc}/business_card/alpha/alpha.h (100%)
 rename keyboards/{ => kakunpc}/business_card/alpha/config.h (100%)
 rename keyboards/{ => kakunpc}/business_card/alpha/info.json (100%)
 rename keyboards/{ => kakunpc}/business_card/alpha/keymaps/default/config.h (100%)
 rename keyboards/{ => kakunpc}/business_card/alpha/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kakunpc}/business_card/alpha/keymaps/default/readme.md (100%)
 rename keyboards/{ => kakunpc}/business_card/alpha/rules.mk (100%)
 rename keyboards/{ => kakunpc}/business_card/beta/beta.c (100%)
 rename keyboards/{ => kakunpc}/business_card/beta/beta.h (100%)
 rename keyboards/{ => kakunpc}/business_card/beta/config.h (100%)
 rename keyboards/{ => kakunpc}/business_card/beta/info.json (100%)
 rename keyboards/{ => kakunpc}/business_card/beta/keymaps/default/config.h (100%)
 rename keyboards/{ => kakunpc}/business_card/beta/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kakunpc}/business_card/beta/keymaps/default/readme.md (100%)
 rename keyboards/{ => kakunpc}/business_card/beta/rules.mk (100%)
 rename keyboards/{ => kakunpc}/business_card/business_card.c (100%)
 rename keyboards/{ => kakunpc}/business_card/business_card.h (89%)
 rename keyboards/{ => kakunpc}/business_card/config.h (100%)
 rename keyboards/{ => kakunpc}/business_card/readme.md (93%)
 rename keyboards/{ => kakunpc}/business_card/rules.mk (93%)
 rename keyboards/{ => kakunpc}/choc_taro/choc_taro.c (100%)
 rename keyboards/{ => kakunpc}/choc_taro/choc_taro.h (100%)
 rename keyboards/{ => kakunpc}/choc_taro/config.h (100%)
 rename keyboards/{ => kakunpc}/choc_taro/info.json (100%)
 rename keyboards/{ => kakunpc}/choc_taro/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kakunpc}/choc_taro/keymaps/default/readme.md (100%)
 rename keyboards/{ => kakunpc}/choc_taro/keymaps/via/keymap.c (100%)
 rename keyboards/{ => kakunpc}/choc_taro/keymaps/via/readme.md (100%)
 rename keyboards/{ => kakunpc}/choc_taro/keymaps/via/rules.mk (100%)
 rename keyboards/{ => kakunpc}/choc_taro/matrix.c (100%)
 rename keyboards/{ => kakunpc}/choc_taro/readme.md (94%)
 rename keyboards/{ => kakunpc}/choc_taro/rules.mk (100%)
 rename keyboards/{ => kakunpc}/rabbit_capture_plan/config.h (100%)
 rename keyboards/{ => kakunpc}/rabbit_capture_plan/info.json (100%)
 rename keyboards/{ => kakunpc}/rabbit_capture_plan/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kakunpc}/rabbit_capture_plan/keymaps/default/readme.md (100%)
 rename keyboards/{ => kakunpc}/rabbit_capture_plan/keymaps/via/keymap.c (100%)
 rename keyboards/{ => kakunpc}/rabbit_capture_plan/keymaps/via/readme.md (100%)
 rename keyboards/{ => kakunpc}/rabbit_capture_plan/keymaps/via/rules.mk (100%)
 rename keyboards/{ => kakunpc}/rabbit_capture_plan/rabbit_capture_plan.c (100%)
 rename keyboards/{ => kakunpc}/rabbit_capture_plan/rabbit_capture_plan.h (100%)
 rename keyboards/{ => kakunpc}/rabbit_capture_plan/readme.md (88%)
 rename keyboards/{ => kakunpc}/rabbit_capture_plan/rules.mk (100%)
 rename keyboards/{ => kakunpc}/suihankey/alpha/alpha.c (100%)
 rename keyboards/{ => kakunpc}/suihankey/alpha/alpha.h (100%)
 rename keyboards/{ => kakunpc}/suihankey/alpha/config.h (100%)
 rename keyboards/{ => kakunpc}/suihankey/alpha/info.json (100%)
 rename keyboards/{ => kakunpc}/suihankey/alpha/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kakunpc}/suihankey/alpha/keymaps/default/readme.md (100%)
 rename keyboards/{ => kakunpc}/suihankey/alpha/readme.md (100%)
 rename keyboards/{ => kakunpc}/suihankey/alpha/rules.mk (100%)
 rename keyboards/{ => kakunpc}/suihankey/readme.md (94%)
 rename keyboards/{ => kakunpc}/suihankey/rev1/config.h (100%)
 rename keyboards/{ => kakunpc}/suihankey/rev1/info.json (100%)
 rename keyboards/{ => kakunpc}/suihankey/rev1/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kakunpc}/suihankey/rev1/keymaps/default/readme.md (100%)
 rename keyboards/{ => kakunpc}/suihankey/rev1/readme.md (100%)
 rename keyboards/{ => kakunpc}/suihankey/rev1/rev1.c (100%)
 rename keyboards/{ => kakunpc}/suihankey/rev1/rev1.h (100%)
 rename keyboards/{ => kakunpc}/suihankey/rev1/rules.mk (100%)
 rename keyboards/{ => kakunpc}/suihankey/rules.mk (94%)
 rename keyboards/{ => kakunpc}/suihankey/split/.noci (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/alpha/.noci (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/alpha/alpha.c (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/alpha/alpha.h (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/alpha/config.h (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/alpha/readme.md (94%)
 rename keyboards/{ => kakunpc}/suihankey/split/alpha/rules.mk (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/info.json (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/keymaps/default/readme.md (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/readme.md (94%)
 rename keyboards/{ => kakunpc}/suihankey/split/rev1/config.h (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/rev1/readme.md (94%)
 rename keyboards/{ => kakunpc}/suihankey/split/rev1/rev1.c (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/rev1/rev1.h (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/rev1/rules.mk (100%)
 rename keyboards/{ => kakunpc}/suihankey/split/rules.mk (100%)
 rename keyboards/{ => kakunpc}/thedogkeyboard/config.h (100%)
 rename keyboards/{ => kakunpc}/thedogkeyboard/info.json (100%)
 rename keyboards/{ => kakunpc}/thedogkeyboard/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kakunpc}/thedogkeyboard/keymaps/default/readme.md (100%)
 rename keyboards/{ => kakunpc}/thedogkeyboard/keymaps/kakunpc/keymap.c (100%)
 rename keyboards/{ => kakunpc}/thedogkeyboard/keymaps/kakunpc/readme.md (100%)
 rename keyboards/{ => kakunpc}/thedogkeyboard/matrix.c (100%)
 rename keyboards/{ => kakunpc}/thedogkeyboard/readme.md (94%)
 rename keyboards/{ => kakunpc}/thedogkeyboard/rules.mk (100%)
 rename keyboards/{ => kakunpc}/thedogkeyboard/thedogkeyboard.c (100%)
 rename keyboards/{ => kakunpc}/thedogkeyboard/thedogkeyboard.h (100%)

diff --git a/keyboards/angel17/.noci b/keyboards/kakunpc/angel17/.noci
similarity index 100%
rename from keyboards/angel17/.noci
rename to keyboards/kakunpc/angel17/.noci
diff --git a/keyboards/angel17/alpha/.noci b/keyboards/kakunpc/angel17/alpha/.noci
similarity index 100%
rename from keyboards/angel17/alpha/.noci
rename to keyboards/kakunpc/angel17/alpha/.noci
diff --git a/keyboards/angel17/alpha/alpha.c b/keyboards/kakunpc/angel17/alpha/alpha.c
similarity index 100%
rename from keyboards/angel17/alpha/alpha.c
rename to keyboards/kakunpc/angel17/alpha/alpha.c
diff --git a/keyboards/angel17/alpha/alpha.h b/keyboards/kakunpc/angel17/alpha/alpha.h
similarity index 100%
rename from keyboards/angel17/alpha/alpha.h
rename to keyboards/kakunpc/angel17/alpha/alpha.h
diff --git a/keyboards/angel17/alpha/config.h b/keyboards/kakunpc/angel17/alpha/config.h
similarity index 100%
rename from keyboards/angel17/alpha/config.h
rename to keyboards/kakunpc/angel17/alpha/config.h
diff --git a/keyboards/angel17/alpha/rules.mk b/keyboards/kakunpc/angel17/alpha/rules.mk
similarity index 100%
rename from keyboards/angel17/alpha/rules.mk
rename to keyboards/kakunpc/angel17/alpha/rules.mk
diff --git a/keyboards/angel17/info.json b/keyboards/kakunpc/angel17/info.json
similarity index 100%
rename from keyboards/angel17/info.json
rename to keyboards/kakunpc/angel17/info.json
diff --git a/keyboards/angel17/keymaps/default/keymap.c b/keyboards/kakunpc/angel17/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/angel17/keymaps/default/keymap.c
rename to keyboards/kakunpc/angel17/keymaps/default/keymap.c
diff --git a/keyboards/angel17/keymaps/default/readme.md b/keyboards/kakunpc/angel17/keymaps/default/readme.md
similarity index 100%
rename from keyboards/angel17/keymaps/default/readme.md
rename to keyboards/kakunpc/angel17/keymaps/default/readme.md
diff --git a/keyboards/angel17/readme.md b/keyboards/kakunpc/angel17/readme.md
similarity index 94%
rename from keyboards/angel17/readme.md
rename to keyboards/kakunpc/angel17/readme.md
index 8c9b806685..16914887a6 100644
--- a/keyboards/angel17/readme.md
+++ b/keyboards/kakunpc/angel17/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
 
 Make example for this keyboard (after setting up your build environment):
 
-    make angel17:default
+    make kakunpc/angel17/rev1: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).
diff --git a/keyboards/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h
similarity index 100%
rename from keyboards/angel17/rev1/config.h
rename to keyboards/kakunpc/angel17/rev1/config.h
diff --git a/keyboards/angel17/rev1/rev1.c b/keyboards/kakunpc/angel17/rev1/rev1.c
similarity index 100%
rename from keyboards/angel17/rev1/rev1.c
rename to keyboards/kakunpc/angel17/rev1/rev1.c
diff --git a/keyboards/angel17/rev1/rev1.h b/keyboards/kakunpc/angel17/rev1/rev1.h
similarity index 100%
rename from keyboards/angel17/rev1/rev1.h
rename to keyboards/kakunpc/angel17/rev1/rev1.h
diff --git a/keyboards/angel17/rev1/rules.mk b/keyboards/kakunpc/angel17/rev1/rules.mk
similarity index 100%
rename from keyboards/angel17/rev1/rules.mk
rename to keyboards/kakunpc/angel17/rev1/rules.mk
diff --git a/keyboards/angel17/rules.mk b/keyboards/kakunpc/angel17/rules.mk
similarity index 94%
rename from keyboards/angel17/rules.mk
rename to keyboards/kakunpc/angel17/rules.mk
index 6c73399ec1..35c999d465 100644
--- a/keyboards/angel17/rules.mk
+++ b/keyboards/kakunpc/angel17/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 LAYOUTS = numpad_5x4
 
-DEFAULT_FOLDER = angel17/rev1
+DEFAULT_FOLDER = kakunpc/angel17/rev1
diff --git a/keyboards/angel64/.noci b/keyboards/kakunpc/angel64/.noci
similarity index 100%
rename from keyboards/angel64/.noci
rename to keyboards/kakunpc/angel64/.noci
diff --git a/keyboards/angel64/alpha/.noci b/keyboards/kakunpc/angel64/alpha/.noci
similarity index 100%
rename from keyboards/angel64/alpha/.noci
rename to keyboards/kakunpc/angel64/alpha/.noci
diff --git a/keyboards/angel64/alpha/alpha.c b/keyboards/kakunpc/angel64/alpha/alpha.c
similarity index 100%
rename from keyboards/angel64/alpha/alpha.c
rename to keyboards/kakunpc/angel64/alpha/alpha.c
diff --git a/keyboards/angel64/alpha/alpha.h b/keyboards/kakunpc/angel64/alpha/alpha.h
similarity index 100%
rename from keyboards/angel64/alpha/alpha.h
rename to keyboards/kakunpc/angel64/alpha/alpha.h
diff --git a/keyboards/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h
similarity index 100%
rename from keyboards/angel64/alpha/config.h
rename to keyboards/kakunpc/angel64/alpha/config.h
diff --git a/keyboards/angel64/alpha/info.json b/keyboards/kakunpc/angel64/alpha/info.json
similarity index 100%
rename from keyboards/angel64/alpha/info.json
rename to keyboards/kakunpc/angel64/alpha/info.json
diff --git a/keyboards/angel64/alpha/keymaps/default/keymap.c b/keyboards/kakunpc/angel64/alpha/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/angel64/alpha/keymaps/default/keymap.c
rename to keyboards/kakunpc/angel64/alpha/keymaps/default/keymap.c
diff --git a/keyboards/angel64/alpha/keymaps/default/readme.md b/keyboards/kakunpc/angel64/alpha/keymaps/default/readme.md
similarity index 100%
rename from keyboards/angel64/alpha/keymaps/default/readme.md
rename to keyboards/kakunpc/angel64/alpha/keymaps/default/readme.md
diff --git a/keyboards/angel64/alpha/matrix.c b/keyboards/kakunpc/angel64/alpha/matrix.c
similarity index 100%
rename from keyboards/angel64/alpha/matrix.c
rename to keyboards/kakunpc/angel64/alpha/matrix.c
diff --git a/keyboards/angel64/alpha/readme.md b/keyboards/kakunpc/angel64/alpha/readme.md
similarity index 94%
rename from keyboards/angel64/alpha/readme.md
rename to keyboards/kakunpc/angel64/alpha/readme.md
index d646edeb7e..4de66e6706 100644
--- a/keyboards/angel64/alpha/readme.md
+++ b/keyboards/kakunpc/angel64/alpha/readme.md
@@ -10,6 +10,6 @@ Keyboard for tablets.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make angel64/alpha:default
+    make kakunpc/angel64/alpha: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).
diff --git a/keyboards/angel64/alpha/rules.mk b/keyboards/kakunpc/angel64/alpha/rules.mk
similarity index 100%
rename from keyboards/angel64/alpha/rules.mk
rename to keyboards/kakunpc/angel64/alpha/rules.mk
diff --git a/keyboards/angel64/readme.md b/keyboards/kakunpc/angel64/readme.md
similarity index 94%
rename from keyboards/angel64/readme.md
rename to keyboards/kakunpc/angel64/readme.md
index 791620144e..41f8233afb 100644
--- a/keyboards/angel64/readme.md
+++ b/keyboards/kakunpc/angel64/readme.md
@@ -10,6 +10,6 @@ Keyboard for tablets.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make angel64:default
+    make kakunpc/angel64/rev1: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).
diff --git a/keyboards/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h
similarity index 100%
rename from keyboards/angel64/rev1/config.h
rename to keyboards/kakunpc/angel64/rev1/config.h
diff --git a/keyboards/angel64/rev1/info.json b/keyboards/kakunpc/angel64/rev1/info.json
similarity index 100%
rename from keyboards/angel64/rev1/info.json
rename to keyboards/kakunpc/angel64/rev1/info.json
diff --git a/keyboards/angel64/rev1/keymaps/default/keymap.c b/keyboards/kakunpc/angel64/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/angel64/rev1/keymaps/default/keymap.c
rename to keyboards/kakunpc/angel64/rev1/keymaps/default/keymap.c
diff --git a/keyboards/angel64/rev1/keymaps/default/readme.md b/keyboards/kakunpc/angel64/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/angel64/rev1/keymaps/default/readme.md
rename to keyboards/kakunpc/angel64/rev1/keymaps/default/readme.md
diff --git a/keyboards/angel64/rev1/keymaps/kakunpc/config.h b/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/config.h
similarity index 100%
rename from keyboards/angel64/rev1/keymaps/kakunpc/config.h
rename to keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/config.h
diff --git a/keyboards/angel64/rev1/keymaps/kakunpc/keymap.c b/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/keymap.c
similarity index 100%
rename from keyboards/angel64/rev1/keymaps/kakunpc/keymap.c
rename to keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/keymap.c
diff --git a/keyboards/angel64/rev1/keymaps/kakunpc/readme.md b/keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/readme.md
similarity index 100%
rename from keyboards/angel64/rev1/keymaps/kakunpc/readme.md
rename to keyboards/kakunpc/angel64/rev1/keymaps/kakunpc/readme.md
diff --git a/keyboards/angel64/rev1/matrix.c b/keyboards/kakunpc/angel64/rev1/matrix.c
similarity index 100%
rename from keyboards/angel64/rev1/matrix.c
rename to keyboards/kakunpc/angel64/rev1/matrix.c
diff --git a/keyboards/angel64/rev1/readme.md b/keyboards/kakunpc/angel64/rev1/readme.md
similarity index 94%
rename from keyboards/angel64/rev1/readme.md
rename to keyboards/kakunpc/angel64/rev1/readme.md
index 4ce77807c9..4809710a43 100644
--- a/keyboards/angel64/rev1/readme.md
+++ b/keyboards/kakunpc/angel64/rev1/readme.md
@@ -10,6 +10,6 @@ Keyboard for tablets.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make angel64/rev1:default
+    make kakunpc/angel64/rev1: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).
diff --git a/keyboards/angel64/rev1/rev1.c b/keyboards/kakunpc/angel64/rev1/rev1.c
similarity index 100%
rename from keyboards/angel64/rev1/rev1.c
rename to keyboards/kakunpc/angel64/rev1/rev1.c
diff --git a/keyboards/angel64/rev1/rev1.h b/keyboards/kakunpc/angel64/rev1/rev1.h
similarity index 100%
rename from keyboards/angel64/rev1/rev1.h
rename to keyboards/kakunpc/angel64/rev1/rev1.h
diff --git a/keyboards/angel64/rev1/rules.mk b/keyboards/kakunpc/angel64/rev1/rules.mk
similarity index 100%
rename from keyboards/angel64/rev1/rules.mk
rename to keyboards/kakunpc/angel64/rev1/rules.mk
diff --git a/keyboards/angel64/rules.mk b/keyboards/kakunpc/angel64/rules.mk
similarity index 94%
rename from keyboards/angel64/rules.mk
rename to keyboards/kakunpc/angel64/rules.mk
index 9bf41a18cc..ca4e93f35c 100644
--- a/keyboards/angel64/rules.mk
+++ b/keyboards/kakunpc/angel64/rules.mk
@@ -22,4 +22,4 @@ CUSTOM_MATRIX = yes
 
 SRC += matrix.c
 
-DEFAULT_FOLDER = angel64/rev1
+DEFAULT_FOLDER = kakunpc/angel64/rev1
diff --git a/keyboards/business_card/.noci b/keyboards/kakunpc/business_card/.noci
similarity index 100%
rename from keyboards/business_card/.noci
rename to keyboards/kakunpc/business_card/.noci
diff --git a/keyboards/business_card/alpha/.noci b/keyboards/kakunpc/business_card/alpha/.noci
similarity index 100%
rename from keyboards/business_card/alpha/.noci
rename to keyboards/kakunpc/business_card/alpha/.noci
diff --git a/keyboards/business_card/alpha/alpha.c b/keyboards/kakunpc/business_card/alpha/alpha.c
similarity index 100%
rename from keyboards/business_card/alpha/alpha.c
rename to keyboards/kakunpc/business_card/alpha/alpha.c
diff --git a/keyboards/business_card/alpha/alpha.h b/keyboards/kakunpc/business_card/alpha/alpha.h
similarity index 100%
rename from keyboards/business_card/alpha/alpha.h
rename to keyboards/kakunpc/business_card/alpha/alpha.h
diff --git a/keyboards/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h
similarity index 100%
rename from keyboards/business_card/alpha/config.h
rename to keyboards/kakunpc/business_card/alpha/config.h
diff --git a/keyboards/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/info.json
similarity index 100%
rename from keyboards/business_card/alpha/info.json
rename to keyboards/kakunpc/business_card/alpha/info.json
diff --git a/keyboards/business_card/alpha/keymaps/default/config.h b/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
similarity index 100%
rename from keyboards/business_card/alpha/keymaps/default/config.h
rename to keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
diff --git a/keyboards/business_card/alpha/keymaps/default/keymap.c b/keyboards/kakunpc/business_card/alpha/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/business_card/alpha/keymaps/default/keymap.c
rename to keyboards/kakunpc/business_card/alpha/keymaps/default/keymap.c
diff --git a/keyboards/business_card/alpha/keymaps/default/readme.md b/keyboards/kakunpc/business_card/alpha/keymaps/default/readme.md
similarity index 100%
rename from keyboards/business_card/alpha/keymaps/default/readme.md
rename to keyboards/kakunpc/business_card/alpha/keymaps/default/readme.md
diff --git a/keyboards/business_card/alpha/rules.mk b/keyboards/kakunpc/business_card/alpha/rules.mk
similarity index 100%
rename from keyboards/business_card/alpha/rules.mk
rename to keyboards/kakunpc/business_card/alpha/rules.mk
diff --git a/keyboards/business_card/beta/beta.c b/keyboards/kakunpc/business_card/beta/beta.c
similarity index 100%
rename from keyboards/business_card/beta/beta.c
rename to keyboards/kakunpc/business_card/beta/beta.c
diff --git a/keyboards/business_card/beta/beta.h b/keyboards/kakunpc/business_card/beta/beta.h
similarity index 100%
rename from keyboards/business_card/beta/beta.h
rename to keyboards/kakunpc/business_card/beta/beta.h
diff --git a/keyboards/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h
similarity index 100%
rename from keyboards/business_card/beta/config.h
rename to keyboards/kakunpc/business_card/beta/config.h
diff --git a/keyboards/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/info.json
similarity index 100%
rename from keyboards/business_card/beta/info.json
rename to keyboards/kakunpc/business_card/beta/info.json
diff --git a/keyboards/business_card/beta/keymaps/default/config.h b/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
similarity index 100%
rename from keyboards/business_card/beta/keymaps/default/config.h
rename to keyboards/kakunpc/business_card/beta/keymaps/default/config.h
diff --git a/keyboards/business_card/beta/keymaps/default/keymap.c b/keyboards/kakunpc/business_card/beta/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/business_card/beta/keymaps/default/keymap.c
rename to keyboards/kakunpc/business_card/beta/keymaps/default/keymap.c
diff --git a/keyboards/business_card/beta/keymaps/default/readme.md b/keyboards/kakunpc/business_card/beta/keymaps/default/readme.md
similarity index 100%
rename from keyboards/business_card/beta/keymaps/default/readme.md
rename to keyboards/kakunpc/business_card/beta/keymaps/default/readme.md
diff --git a/keyboards/business_card/beta/rules.mk b/keyboards/kakunpc/business_card/beta/rules.mk
similarity index 100%
rename from keyboards/business_card/beta/rules.mk
rename to keyboards/kakunpc/business_card/beta/rules.mk
diff --git a/keyboards/business_card/business_card.c b/keyboards/kakunpc/business_card/business_card.c
similarity index 100%
rename from keyboards/business_card/business_card.c
rename to keyboards/kakunpc/business_card/business_card.c
diff --git a/keyboards/business_card/business_card.h b/keyboards/kakunpc/business_card/business_card.h
similarity index 89%
rename from keyboards/business_card/business_card.h
rename to keyboards/kakunpc/business_card/business_card.h
index f330a01822..125c3080d6 100644
--- a/keyboards/business_card/business_card.h
+++ b/keyboards/kakunpc/business_card/business_card.h
@@ -15,10 +15,10 @@
  */
 #pragma once
 
-#ifdef KEYBOARD_business_card_alpha
+#ifdef KEYBOARD_kakunpc_business_card_alpha
     #include "alpha.h"
 #endif
-#ifdef KEYBOARD_business_card_beta
+#ifdef KEYBOARD_kakunpc_business_card_beta
     #include "beta.h"
 #endif
 
diff --git a/keyboards/business_card/config.h b/keyboards/kakunpc/business_card/config.h
similarity index 100%
rename from keyboards/business_card/config.h
rename to keyboards/kakunpc/business_card/config.h
diff --git a/keyboards/business_card/readme.md b/keyboards/kakunpc/business_card/readme.md
similarity index 93%
rename from keyboards/business_card/readme.md
rename to keyboards/kakunpc/business_card/readme.md
index c1bb32c9c3..cbd05af410 100644
--- a/keyboards/business_card/readme.md
+++ b/keyboards/kakunpc/business_card/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: links to where you can find this hardware
 
 Make example for this keyboard (after setting up your build environment):
 
-    make business_card:default
+    make kakunpc/business_card/beta: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).
diff --git a/keyboards/business_card/rules.mk b/keyboards/kakunpc/business_card/rules.mk
similarity index 93%
rename from keyboards/business_card/rules.mk
rename to keyboards/kakunpc/business_card/rules.mk
index cda401220e..ad9ea936af 100644
--- a/keyboards/business_card/rules.mk
+++ b/keyboards/kakunpc/business_card/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-DEFAULT_FOLDER = business_card/beta
+DEFAULT_FOLDER = kakunpc/business_card/beta
diff --git a/keyboards/choc_taro/choc_taro.c b/keyboards/kakunpc/choc_taro/choc_taro.c
similarity index 100%
rename from keyboards/choc_taro/choc_taro.c
rename to keyboards/kakunpc/choc_taro/choc_taro.c
diff --git a/keyboards/choc_taro/choc_taro.h b/keyboards/kakunpc/choc_taro/choc_taro.h
similarity index 100%
rename from keyboards/choc_taro/choc_taro.h
rename to keyboards/kakunpc/choc_taro/choc_taro.h
diff --git a/keyboards/choc_taro/config.h b/keyboards/kakunpc/choc_taro/config.h
similarity index 100%
rename from keyboards/choc_taro/config.h
rename to keyboards/kakunpc/choc_taro/config.h
diff --git a/keyboards/choc_taro/info.json b/keyboards/kakunpc/choc_taro/info.json
similarity index 100%
rename from keyboards/choc_taro/info.json
rename to keyboards/kakunpc/choc_taro/info.json
diff --git a/keyboards/choc_taro/keymaps/default/keymap.c b/keyboards/kakunpc/choc_taro/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/choc_taro/keymaps/default/keymap.c
rename to keyboards/kakunpc/choc_taro/keymaps/default/keymap.c
diff --git a/keyboards/choc_taro/keymaps/default/readme.md b/keyboards/kakunpc/choc_taro/keymaps/default/readme.md
similarity index 100%
rename from keyboards/choc_taro/keymaps/default/readme.md
rename to keyboards/kakunpc/choc_taro/keymaps/default/readme.md
diff --git a/keyboards/choc_taro/keymaps/via/keymap.c b/keyboards/kakunpc/choc_taro/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/choc_taro/keymaps/via/keymap.c
rename to keyboards/kakunpc/choc_taro/keymaps/via/keymap.c
diff --git a/keyboards/choc_taro/keymaps/via/readme.md b/keyboards/kakunpc/choc_taro/keymaps/via/readme.md
similarity index 100%
rename from keyboards/choc_taro/keymaps/via/readme.md
rename to keyboards/kakunpc/choc_taro/keymaps/via/readme.md
diff --git a/keyboards/choc_taro/keymaps/via/rules.mk b/keyboards/kakunpc/choc_taro/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/choc_taro/keymaps/via/rules.mk
rename to keyboards/kakunpc/choc_taro/keymaps/via/rules.mk
diff --git a/keyboards/choc_taro/matrix.c b/keyboards/kakunpc/choc_taro/matrix.c
similarity index 100%
rename from keyboards/choc_taro/matrix.c
rename to keyboards/kakunpc/choc_taro/matrix.c
diff --git a/keyboards/choc_taro/readme.md b/keyboards/kakunpc/choc_taro/readme.md
similarity index 94%
rename from keyboards/choc_taro/readme.md
rename to keyboards/kakunpc/choc_taro/readme.md
index f0900c2fe4..8e641c72b8 100644
--- a/keyboards/choc_taro/readme.md
+++ b/keyboards/kakunpc/choc_taro/readme.md
@@ -10,6 +10,6 @@ gh60 compatible choc keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make choc_taro:default
+    make kakunpc/choc_taro: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).
diff --git a/keyboards/choc_taro/rules.mk b/keyboards/kakunpc/choc_taro/rules.mk
similarity index 100%
rename from keyboards/choc_taro/rules.mk
rename to keyboards/kakunpc/choc_taro/rules.mk
diff --git a/keyboards/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h
similarity index 100%
rename from keyboards/rabbit_capture_plan/config.h
rename to keyboards/kakunpc/rabbit_capture_plan/config.h
diff --git a/keyboards/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json
similarity index 100%
rename from keyboards/rabbit_capture_plan/info.json
rename to keyboards/kakunpc/rabbit_capture_plan/info.json
diff --git a/keyboards/rabbit_capture_plan/keymaps/default/keymap.c b/keyboards/kakunpc/rabbit_capture_plan/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/rabbit_capture_plan/keymaps/default/keymap.c
rename to keyboards/kakunpc/rabbit_capture_plan/keymaps/default/keymap.c
diff --git a/keyboards/rabbit_capture_plan/keymaps/default/readme.md b/keyboards/kakunpc/rabbit_capture_plan/keymaps/default/readme.md
similarity index 100%
rename from keyboards/rabbit_capture_plan/keymaps/default/readme.md
rename to keyboards/kakunpc/rabbit_capture_plan/keymaps/default/readme.md
diff --git a/keyboards/rabbit_capture_plan/keymaps/via/keymap.c b/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/rabbit_capture_plan/keymaps/via/keymap.c
rename to keyboards/kakunpc/rabbit_capture_plan/keymaps/via/keymap.c
diff --git a/keyboards/rabbit_capture_plan/keymaps/via/readme.md b/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/readme.md
similarity index 100%
rename from keyboards/rabbit_capture_plan/keymaps/via/readme.md
rename to keyboards/kakunpc/rabbit_capture_plan/keymaps/via/readme.md
diff --git a/keyboards/rabbit_capture_plan/keymaps/via/rules.mk b/keyboards/kakunpc/rabbit_capture_plan/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/rabbit_capture_plan/keymaps/via/rules.mk
rename to keyboards/kakunpc/rabbit_capture_plan/keymaps/via/rules.mk
diff --git a/keyboards/rabbit_capture_plan/rabbit_capture_plan.c b/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c
similarity index 100%
rename from keyboards/rabbit_capture_plan/rabbit_capture_plan.c
rename to keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c
diff --git a/keyboards/rabbit_capture_plan/rabbit_capture_plan.h b/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.h
similarity index 100%
rename from keyboards/rabbit_capture_plan/rabbit_capture_plan.h
rename to keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.h
diff --git a/keyboards/rabbit_capture_plan/readme.md b/keyboards/kakunpc/rabbit_capture_plan/readme.md
similarity index 88%
rename from keyboards/rabbit_capture_plan/readme.md
rename to keyboards/kakunpc/rabbit_capture_plan/readme.md
index bc6f9d5dea..fa80367a12 100644
--- a/keyboards/rabbit_capture_plan/readme.md
+++ b/keyboards/kakunpc/rabbit_capture_plan/readme.md
@@ -10,10 +10,10 @@ This is 70 keys split keyboard with trackball.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make rabbit_capture_plan:default
+    make kakunpc/rabbit_capture_plan:default
 
 Flashing example for this keyboard:
 
-    make rabbit_capture_plan:default:flash
+    make kakunpc/rabbit_capture_plan:default:flash
 
 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).
diff --git a/keyboards/rabbit_capture_plan/rules.mk b/keyboards/kakunpc/rabbit_capture_plan/rules.mk
similarity index 100%
rename from keyboards/rabbit_capture_plan/rules.mk
rename to keyboards/kakunpc/rabbit_capture_plan/rules.mk
diff --git a/keyboards/suihankey/alpha/alpha.c b/keyboards/kakunpc/suihankey/alpha/alpha.c
similarity index 100%
rename from keyboards/suihankey/alpha/alpha.c
rename to keyboards/kakunpc/suihankey/alpha/alpha.c
diff --git a/keyboards/suihankey/alpha/alpha.h b/keyboards/kakunpc/suihankey/alpha/alpha.h
similarity index 100%
rename from keyboards/suihankey/alpha/alpha.h
rename to keyboards/kakunpc/suihankey/alpha/alpha.h
diff --git a/keyboards/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h
similarity index 100%
rename from keyboards/suihankey/alpha/config.h
rename to keyboards/kakunpc/suihankey/alpha/config.h
diff --git a/keyboards/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json
similarity index 100%
rename from keyboards/suihankey/alpha/info.json
rename to keyboards/kakunpc/suihankey/alpha/info.json
diff --git a/keyboards/suihankey/alpha/keymaps/default/keymap.c b/keyboards/kakunpc/suihankey/alpha/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/suihankey/alpha/keymaps/default/keymap.c
rename to keyboards/kakunpc/suihankey/alpha/keymaps/default/keymap.c
diff --git a/keyboards/suihankey/alpha/keymaps/default/readme.md b/keyboards/kakunpc/suihankey/alpha/keymaps/default/readme.md
similarity index 100%
rename from keyboards/suihankey/alpha/keymaps/default/readme.md
rename to keyboards/kakunpc/suihankey/alpha/keymaps/default/readme.md
diff --git a/keyboards/suihankey/alpha/readme.md b/keyboards/kakunpc/suihankey/alpha/readme.md
similarity index 100%
rename from keyboards/suihankey/alpha/readme.md
rename to keyboards/kakunpc/suihankey/alpha/readme.md
diff --git a/keyboards/suihankey/alpha/rules.mk b/keyboards/kakunpc/suihankey/alpha/rules.mk
similarity index 100%
rename from keyboards/suihankey/alpha/rules.mk
rename to keyboards/kakunpc/suihankey/alpha/rules.mk
diff --git a/keyboards/suihankey/readme.md b/keyboards/kakunpc/suihankey/readme.md
similarity index 94%
rename from keyboards/suihankey/readme.md
rename to keyboards/kakunpc/suihankey/readme.md
index 29d82323d3..e8099dbca4 100644
--- a/keyboards/suihankey/readme.md
+++ b/keyboards/kakunpc/suihankey/readme.md
@@ -13,6 +13,6 @@ Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
 
 Make example for this keyboard (after setting up your build environment):
 
-    make suihankey:default
+    make kakunpc/suihankey/rev1: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).
diff --git a/keyboards/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h
similarity index 100%
rename from keyboards/suihankey/rev1/config.h
rename to keyboards/kakunpc/suihankey/rev1/config.h
diff --git a/keyboards/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json
similarity index 100%
rename from keyboards/suihankey/rev1/info.json
rename to keyboards/kakunpc/suihankey/rev1/info.json
diff --git a/keyboards/suihankey/rev1/keymaps/default/keymap.c b/keyboards/kakunpc/suihankey/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/suihankey/rev1/keymaps/default/keymap.c
rename to keyboards/kakunpc/suihankey/rev1/keymaps/default/keymap.c
diff --git a/keyboards/suihankey/rev1/keymaps/default/readme.md b/keyboards/kakunpc/suihankey/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/suihankey/rev1/keymaps/default/readme.md
rename to keyboards/kakunpc/suihankey/rev1/keymaps/default/readme.md
diff --git a/keyboards/suihankey/rev1/readme.md b/keyboards/kakunpc/suihankey/rev1/readme.md
similarity index 100%
rename from keyboards/suihankey/rev1/readme.md
rename to keyboards/kakunpc/suihankey/rev1/readme.md
diff --git a/keyboards/suihankey/rev1/rev1.c b/keyboards/kakunpc/suihankey/rev1/rev1.c
similarity index 100%
rename from keyboards/suihankey/rev1/rev1.c
rename to keyboards/kakunpc/suihankey/rev1/rev1.c
diff --git a/keyboards/suihankey/rev1/rev1.h b/keyboards/kakunpc/suihankey/rev1/rev1.h
similarity index 100%
rename from keyboards/suihankey/rev1/rev1.h
rename to keyboards/kakunpc/suihankey/rev1/rev1.h
diff --git a/keyboards/suihankey/rev1/rules.mk b/keyboards/kakunpc/suihankey/rev1/rules.mk
similarity index 100%
rename from keyboards/suihankey/rev1/rules.mk
rename to keyboards/kakunpc/suihankey/rev1/rules.mk
diff --git a/keyboards/suihankey/rules.mk b/keyboards/kakunpc/suihankey/rules.mk
similarity index 94%
rename from keyboards/suihankey/rules.mk
rename to keyboards/kakunpc/suihankey/rules.mk
index 8e1e7f7856..332c7d7355 100644
--- a/keyboards/suihankey/rules.mk
+++ b/keyboards/kakunpc/suihankey/rules.mk
@@ -20,4 +20,4 @@ OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 SPLIT_KEYBOARD = no
 
-DEFAULT_FOLDER = suihankey/rev1
+DEFAULT_FOLDER = kakunpc/suihankey/rev1
diff --git a/keyboards/suihankey/split/.noci b/keyboards/kakunpc/suihankey/split/.noci
similarity index 100%
rename from keyboards/suihankey/split/.noci
rename to keyboards/kakunpc/suihankey/split/.noci
diff --git a/keyboards/suihankey/split/alpha/.noci b/keyboards/kakunpc/suihankey/split/alpha/.noci
similarity index 100%
rename from keyboards/suihankey/split/alpha/.noci
rename to keyboards/kakunpc/suihankey/split/alpha/.noci
diff --git a/keyboards/suihankey/split/alpha/alpha.c b/keyboards/kakunpc/suihankey/split/alpha/alpha.c
similarity index 100%
rename from keyboards/suihankey/split/alpha/alpha.c
rename to keyboards/kakunpc/suihankey/split/alpha/alpha.c
diff --git a/keyboards/suihankey/split/alpha/alpha.h b/keyboards/kakunpc/suihankey/split/alpha/alpha.h
similarity index 100%
rename from keyboards/suihankey/split/alpha/alpha.h
rename to keyboards/kakunpc/suihankey/split/alpha/alpha.h
diff --git a/keyboards/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h
similarity index 100%
rename from keyboards/suihankey/split/alpha/config.h
rename to keyboards/kakunpc/suihankey/split/alpha/config.h
diff --git a/keyboards/suihankey/split/alpha/readme.md b/keyboards/kakunpc/suihankey/split/alpha/readme.md
similarity index 94%
rename from keyboards/suihankey/split/alpha/readme.md
rename to keyboards/kakunpc/suihankey/split/alpha/readme.md
index 2ea1503eb3..4a26a34b97 100644
--- a/keyboards/suihankey/split/alpha/readme.md
+++ b/keyboards/kakunpc/suihankey/split/alpha/readme.md
@@ -13,6 +13,6 @@ Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
 
 Make example for this keyboard (after setting up your build environment):
 
-    make suihankey/alpha:default
+    make kakunpc/suihankey/alpha: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).
diff --git a/keyboards/suihankey/split/alpha/rules.mk b/keyboards/kakunpc/suihankey/split/alpha/rules.mk
similarity index 100%
rename from keyboards/suihankey/split/alpha/rules.mk
rename to keyboards/kakunpc/suihankey/split/alpha/rules.mk
diff --git a/keyboards/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json
similarity index 100%
rename from keyboards/suihankey/split/info.json
rename to keyboards/kakunpc/suihankey/split/info.json
diff --git a/keyboards/suihankey/split/keymaps/default/keymap.c b/keyboards/kakunpc/suihankey/split/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/suihankey/split/keymaps/default/keymap.c
rename to keyboards/kakunpc/suihankey/split/keymaps/default/keymap.c
diff --git a/keyboards/suihankey/split/keymaps/default/readme.md b/keyboards/kakunpc/suihankey/split/keymaps/default/readme.md
similarity index 100%
rename from keyboards/suihankey/split/keymaps/default/readme.md
rename to keyboards/kakunpc/suihankey/split/keymaps/default/readme.md
diff --git a/keyboards/suihankey/split/readme.md b/keyboards/kakunpc/suihankey/split/readme.md
similarity index 94%
rename from keyboards/suihankey/split/readme.md
rename to keyboards/kakunpc/suihankey/split/readme.md
index 34d30580d1..ed2058290b 100644
--- a/keyboards/suihankey/split/readme.md
+++ b/keyboards/kakunpc/suihankey/split/readme.md
@@ -13,6 +13,6 @@ Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
 
 Make example for this keyboard (after setting up your build environment):
 
-    make suihankey/split:default
+    make kakunpc/suihankey/split: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).
diff --git a/keyboards/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h
similarity index 100%
rename from keyboards/suihankey/split/rev1/config.h
rename to keyboards/kakunpc/suihankey/split/rev1/config.h
diff --git a/keyboards/suihankey/split/rev1/readme.md b/keyboards/kakunpc/suihankey/split/rev1/readme.md
similarity index 94%
rename from keyboards/suihankey/split/rev1/readme.md
rename to keyboards/kakunpc/suihankey/split/rev1/readme.md
index f7c4bce166..a4e60fe1b9 100644
--- a/keyboards/suihankey/split/rev1/readme.md
+++ b/keyboards/kakunpc/suihankey/split/rev1/readme.md
@@ -13,6 +13,6 @@ Hardware Availability: booth([@kakunpc](https://kakunpc.booth.pm/))
 
 Make example for this keyboard (after setting up your build environment):
 
-    make suihankey/rev1:default
+    make kakunpc/suihankey/rev1: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).
diff --git a/keyboards/suihankey/split/rev1/rev1.c b/keyboards/kakunpc/suihankey/split/rev1/rev1.c
similarity index 100%
rename from keyboards/suihankey/split/rev1/rev1.c
rename to keyboards/kakunpc/suihankey/split/rev1/rev1.c
diff --git a/keyboards/suihankey/split/rev1/rev1.h b/keyboards/kakunpc/suihankey/split/rev1/rev1.h
similarity index 100%
rename from keyboards/suihankey/split/rev1/rev1.h
rename to keyboards/kakunpc/suihankey/split/rev1/rev1.h
diff --git a/keyboards/suihankey/split/rev1/rules.mk b/keyboards/kakunpc/suihankey/split/rev1/rules.mk
similarity index 100%
rename from keyboards/suihankey/split/rev1/rules.mk
rename to keyboards/kakunpc/suihankey/split/rev1/rules.mk
diff --git a/keyboards/suihankey/split/rules.mk b/keyboards/kakunpc/suihankey/split/rules.mk
similarity index 100%
rename from keyboards/suihankey/split/rules.mk
rename to keyboards/kakunpc/suihankey/split/rules.mk
diff --git a/keyboards/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h
similarity index 100%
rename from keyboards/thedogkeyboard/config.h
rename to keyboards/kakunpc/thedogkeyboard/config.h
diff --git a/keyboards/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/info.json
similarity index 100%
rename from keyboards/thedogkeyboard/info.json
rename to keyboards/kakunpc/thedogkeyboard/info.json
diff --git a/keyboards/thedogkeyboard/keymaps/default/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/thedogkeyboard/keymaps/default/keymap.c
rename to keyboards/kakunpc/thedogkeyboard/keymaps/default/keymap.c
diff --git a/keyboards/thedogkeyboard/keymaps/default/readme.md b/keyboards/kakunpc/thedogkeyboard/keymaps/default/readme.md
similarity index 100%
rename from keyboards/thedogkeyboard/keymaps/default/readme.md
rename to keyboards/kakunpc/thedogkeyboard/keymaps/default/readme.md
diff --git a/keyboards/thedogkeyboard/keymaps/kakunpc/keymap.c b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
similarity index 100%
rename from keyboards/thedogkeyboard/keymaps/kakunpc/keymap.c
rename to keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/keymap.c
diff --git a/keyboards/thedogkeyboard/keymaps/kakunpc/readme.md b/keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/readme.md
similarity index 100%
rename from keyboards/thedogkeyboard/keymaps/kakunpc/readme.md
rename to keyboards/kakunpc/thedogkeyboard/keymaps/kakunpc/readme.md
diff --git a/keyboards/thedogkeyboard/matrix.c b/keyboards/kakunpc/thedogkeyboard/matrix.c
similarity index 100%
rename from keyboards/thedogkeyboard/matrix.c
rename to keyboards/kakunpc/thedogkeyboard/matrix.c
diff --git a/keyboards/thedogkeyboard/readme.md b/keyboards/kakunpc/thedogkeyboard/readme.md
similarity index 94%
rename from keyboards/thedogkeyboard/readme.md
rename to keyboards/kakunpc/thedogkeyboard/readme.md
index 789149ca82..c3f73c5303 100644
--- a/keyboards/thedogkeyboard/readme.md
+++ b/keyboards/kakunpc/thedogkeyboard/readme.md
@@ -10,6 +10,6 @@ ProMicro 100% Keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make thedogkeyboard:default
+    make kakunpc/thedogkeyboard: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).
diff --git a/keyboards/thedogkeyboard/rules.mk b/keyboards/kakunpc/thedogkeyboard/rules.mk
similarity index 100%
rename from keyboards/thedogkeyboard/rules.mk
rename to keyboards/kakunpc/thedogkeyboard/rules.mk
diff --git a/keyboards/thedogkeyboard/thedogkeyboard.c b/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c
similarity index 100%
rename from keyboards/thedogkeyboard/thedogkeyboard.c
rename to keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c
diff --git a/keyboards/thedogkeyboard/thedogkeyboard.h b/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.h
similarity index 100%
rename from keyboards/thedogkeyboard/thedogkeyboard.h
rename to keyboards/kakunpc/thedogkeyboard/thedogkeyboard.h

From 6d06e7ce84f5e7133bf75764abdb012122468d7c Mon Sep 17 00:00:00 2001
From: Rifaa Subekti <68178825+oceeean@users.noreply.github.com>
Date: Thu, 13 Jan 2022 06:15:27 +0800
Subject: [PATCH 272/867] [Keyboard] add AddOn macropad (#15841)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/ocean/addon/addon.c                 | 15 ++++++
 keyboards/ocean/addon/addon.h                 | 35 +++++++++++++
 keyboards/ocean/addon/config.h                | 51 +++++++++++++++++++
 keyboards/ocean/addon/info.json               | 45 ++++++++++++++++
 .../ocean/addon/keymaps/default/keymap.c      | 50 ++++++++++++++++++
 keyboards/ocean/addon/keymaps/via/keymap.c    | 50 ++++++++++++++++++
 keyboards/ocean/addon/keymaps/via/rules.mk    |  2 +
 keyboards/ocean/addon/readme.md               | 24 +++++++++
 keyboards/ocean/addon/rules.mk                | 18 +++++++
 9 files changed, 290 insertions(+)
 create mode 100644 keyboards/ocean/addon/addon.c
 create mode 100644 keyboards/ocean/addon/addon.h
 create mode 100644 keyboards/ocean/addon/config.h
 create mode 100644 keyboards/ocean/addon/info.json
 create mode 100644 keyboards/ocean/addon/keymaps/default/keymap.c
 create mode 100644 keyboards/ocean/addon/keymaps/via/keymap.c
 create mode 100644 keyboards/ocean/addon/keymaps/via/rules.mk
 create mode 100644 keyboards/ocean/addon/readme.md
 create mode 100644 keyboards/ocean/addon/rules.mk

diff --git a/keyboards/ocean/addon/addon.c b/keyboards/ocean/addon/addon.c
new file mode 100644
index 0000000000..01a815a279
--- /dev/null
+++ b/keyboards/ocean/addon/addon.c
@@ -0,0 +1,15 @@
+/* Copyright 2022 Ocean
+ * 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 "addon.h"
diff --git a/keyboards/ocean/addon/addon.h b/keyboards/ocean/addon/addon.h
new file mode 100644
index 0000000000..82bc2eee27
--- /dev/null
+++ b/keyboards/ocean/addon/addon.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 Ocean
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT(\
+  K00, K01, K02,   K03, K04, K05, K06, \
+  K10, K11, K12,   K13, K14, K15, K16, \
+  K20, K21, K22,   K23, K24, K25, K26, \
+  K30, K31, K32,   K33, K34, K35, K36, \
+  K40, K41, K42,   K43, K44, K45, K46  \
+) \
+{ \
+  { K00, K01, K02, K03, K04, K05, K06 }, \
+  { K10, K11, K12, K13, K14, K15, K16 }, \
+  { K20, K21, K22, K23, K24, K25, K26 }, \
+  { K30, K31, K32, K33, K34, K35, K36 }, \
+  { K40, K41, K42, K43, K44, K45, K46 }  \
+}
diff --git a/keyboards/ocean/addon/config.h b/keyboards/ocean/addon/config.h
new file mode 100644
index 0000000000..1b221b65bd
--- /dev/null
+++ b/keyboards/ocean/addon/config.h
@@ -0,0 +1,51 @@
+/*Copyright 2022 Ocean
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+#define VENDOR_ID       0x9624
+#define PRODUCT_ID      0x0012
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Ocean
+#define PRODUCT         AddOn
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 7
+
+/*
+ * 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)
+ *
+ */
+/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
+#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5 }
+#define UNUSED_PINS     { D0, D1, D2, D3, D4, F4 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
diff --git a/keyboards/ocean/addon/info.json b/keyboards/ocean/addon/info.json
new file mode 100644
index 0000000000..75e1eb2c48
--- /dev/null
+++ b/keyboards/ocean/addon/info.json
@@ -0,0 +1,45 @@
+{
+    "keyboard_name": "AddOn",
+    "url": "tokopedia.com/kbdksp",
+    "maintainer": "Ocean",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0}, 
+                {"x":1, "y":0}, 
+                {"x":2, "y":0}, 
+                {"x":3.25, "y":0}, 
+                {"x":4.25, "y":0}, 
+                {"x":5.25, "y":0}, 
+                {"x":6.25, "y":0}, 
+                {"x":0, "y":1}, 
+                {"x":1, "y":1}, 
+                {"x":2, "y":1}, 
+                {"x":3.25, "y":1}, 
+                {"x":4.25, "y":1}, 
+                {"x":5.25, "y":1}, 
+                {"x":6.25, "y":1}, 
+                {"x":0, "y":2}, 
+                {"x":1, "y":2}, 
+                {"x":2, "y":2}, 
+                {"x":3.25, "y":2}, 
+                {"x":4.25, "y":2}, 
+                {"x":5.25, "y":2}, 
+                {"x":6.25, "y":2}, 
+                {"x":0, "y":3}, 
+                {"x":1, "y":3}, 
+                {"x":2, "y":3}, 
+                {"x":3.25, "y":3}, 
+                {"x":4.25, "y":3}, 
+                {"x":5.25, "y":3}, 
+                {"x":6.25, "y":3}, 
+                {"x":0, "y":4}, 
+                {"x":1, "y":4}, 
+                {"x":2, "y":4}, 
+                {"x":3.25, "y":4}, 
+                {"x":4.25, "y":4}, 
+                {"x":5.25, "y":4}, 
+                {"x":6.25, "y":4}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/ocean/addon/keymaps/default/keymap.c b/keyboards/ocean/addon/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b20eac7d1d
--- /dev/null
+++ b/keyboards/ocean/addon/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2022 Ocean
+ * 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
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_TRNS, KC_UP,   KC_TRNS,    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_LEFT,  KC_DOWN, KC_RGHT,   KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+  ),
+
+  [1] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [3] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+};
diff --git a/keyboards/ocean/addon/keymaps/via/keymap.c b/keyboards/ocean/addon/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b20eac7d1d
--- /dev/null
+++ b/keyboards/ocean/addon/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2022 Ocean
+ * 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
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_TRNS, KC_UP,   KC_TRNS,    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_LEFT,  KC_DOWN, KC_RGHT,   KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+  ),
+
+  [1] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [3] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+};
diff --git a/keyboards/ocean/addon/keymaps/via/rules.mk b/keyboards/ocean/addon/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/ocean/addon/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/ocean/addon/readme.md b/keyboards/ocean/addon/readme.md
new file mode 100644
index 0000000000..eaaef4e3bd
--- /dev/null
+++ b/keyboards/ocean/addon/readme.md
@@ -0,0 +1,24 @@
+# AddOn
+
+![AddOn](https://i.imgur.com/hd2ETLPl.jpeg)
+
+
+Navigation cluster and numpad for 60% keyboard
+
+* Keyboard Maintainer: Ocean
+* Hardware Supported: AddOn, Pro Micro
+* Hardware Availability: [Keyboard Kasep Co.](https://tokopedia.com/kbdksp/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ocean/addon:default
+
+Flashing example for this keyboard:
+
+    make ocean/addon:default:flash
+
+## Bootloader
+
+To Enter the bootloader you can double click reset button on board when you flash the firmware
+
+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).
diff --git a/keyboards/ocean/addon/rules.mk b/keyboards/ocean/addon/rules.mk
new file mode 100644
index 0000000000..7c70616682
--- /dev/null
+++ b/keyboards/ocean/addon/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From b79e329ab8e16c5b791591b44e04fd1b40d6bccc Mon Sep 17 00:00:00 2001
From: Kevin Hartley <kevin.s.hartley@gmail.com>
Date: Wed, 12 Jan 2022 15:20:54 -0700
Subject: [PATCH 273/867] [Keymap] Planck Keymap: Inkwell (#14311)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/planck/keymaps/inkwell/config.h  |  50 ++++++
 keyboards/planck/keymaps/inkwell/keymap.c  | 182 +++++++++++++++++++++
 keyboards/planck/keymaps/inkwell/readme.md |  19 +++
 keyboards/planck/keymaps/inkwell/rules.mk  |   3 +
 4 files changed, 254 insertions(+)
 create mode 100644 keyboards/planck/keymaps/inkwell/config.h
 create mode 100644 keyboards/planck/keymaps/inkwell/keymap.c
 create mode 100644 keyboards/planck/keymaps/inkwell/readme.md
 create mode 100644 keyboards/planck/keymaps/inkwell/rules.mk

diff --git a/keyboards/planck/keymaps/inkwell/config.h b/keyboards/planck/keymaps/inkwell/config.h
new file mode 100644
index 0000000000..0396720dff
--- /dev/null
+++ b/keyboards/planck/keymaps/inkwell/config.h
@@ -0,0 +1,50 @@
+/* Copyright 2021 Kevin Hartley
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+
+#pragma once
+
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PLANCK_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                  SONG(COLEMAK_SOUND), \
+                                  SONG(DVORAK_SOUND) \
+                                }
+#endif
+
+/*
+ * MIDI options
+ */
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+// Most tactile encoders have detents every 4 stages
+#define ENCODER_RESOLUTION 4
+#define MOUSEKEY_WHEEL_TIME_TO_MAX 10
+#define MOUSEKEY_MAX_SPEED 12
diff --git a/keyboards/planck/keymaps/inkwell/keymap.c b/keyboards/planck/keymaps/inkwell/keymap.c
new file mode 100644
index 0000000000..f5192d0bb4
--- /dev/null
+++ b/keyboards/planck/keymaps/inkwell/keymap.c
@@ -0,0 +1,182 @@
+/* Copyright 2015-2017 Jack Humbert
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "muse.h"
+
+
+enum planck_layers {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | ECDR | Ctrl | Alt  | GUI  |Space |Lower |Raise |Space | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_planck_grid(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+    RSFT_T(KC_MPLY),  KC_LCTL, KC_LALT, KC_LGUI, KC_SPC,  LOWER,   RAISE,   KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
+),
+
+/* Lower
+ *                                           v-------NUM PAD------v
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   !  |   @  |   #  |   *  |   /  |   7  |   8  |   9  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |   $  |   %  |   ^  |   +  |   -  |   4  |   5  |   6  |   [  |   ]  |   =  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Shift |   &  |   ?  |   :  |   ~  |   .  |   1  |   2  |   3  |   <  |   >  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | ECDR | Ctrl | Alt  | GUI  |Space |Lower |Raise |   0  | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_planck_grid(
+    KC_GRV,  KC_EXLM, KC_AT,    KC_HASH,  KC_ASTR,  KC_PSLS, KC_7,   KC_8,  KC_9,  KC_LPRN,  KC_RPRN,  KC_BSPC,
+    KC_ESC,  KC_DLR,  KC_PERC,  KC_CIRC,  KC_PLUS,  KC_MINS, KC_4,   KC_5,  KC_6,  KC_LBRC,  KC_RBRC,  KC_PEQL,
+    KC_LSFT, KC_AMPR, KC_QUES,  KC_COLN,  KC_TILD,  KC_DOT,  KC_1,   KC_2,  KC_3,  KC_LABK,  KC_RABK,  KC_ENT,
+    RSFT_T(KC_MPLY),  KC_LCTL,  KC_LALT,  KC_LGUI,  KC_SPC,  LOWER,  RAISE, KC_0,  KC_LEFT,  KC_DOWN,  KC_UP,  KC_RGHT
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |SLEEP |  BR- |  BR+ |  <<  | PLAY |  >>  | MUTE | VOL- | VOL+ |   (  |   )  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   "  |   \  |   [  |   ]  |   =  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Shift |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   ?  |   :  |   <  |   >  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | ECDR | Ctrl | Alt  | GUI  |Space |Lower |Raise |Space | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_planck_grid(
+    KC_SLEP, KC_BRID, KC_BRIU, KC_MPRV,  KC_MPLY, KC_MNXT, KC_MUTE, KC__VOLDOWN, KC__VOLUP, KC_LPRN, KC_RPRN,  KC_BSPC,
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_DQT,      KC_BSLS,   KC_LBRC, KC_RBRC,  KC_PEQL,
+    KC_LSFT, KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,  KC_F12,  KC_QUES,     KC_COLN,   KC_LABK, KC_RABK,  KC_ENT,
+    RSFT_T(KC_MPLY),  KC_LCTL, KC_LALT,  KC_LGUI, KC_SPC,  LOWER,   RAISE,       KC_SPC,    KC_LEFT, KC_DOWN,  KC_UP,  KC_RGHT
+),
+
+/* Adjust (Lower + Raise)
+ *                                                  v--------MOUSE CONTROL------v
+ * ,-----------------------------------------------------------------------------------.
+ * |Reset |      |      |      |      |      |      |MSE-1 |MSE-2 |MSE-S0|MSE-S1| Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | CALC | MAIL | MDIA |Debug |      |      |MSE-L |MSE-D |MSE-U |MSE-R |RGB-TG|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Shift |      |      |      |      |      |      |      |      |      |      |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | ECDR | Ctrl | Alt  | GUI  |Space |Lower |Raise |Space | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_planck_grid(
+    RESET,   _______,  _______,  _______,  _______, _______, _______, KC_BTN1, KC_MS_BTN2, KC_ACL1, KC_ACL2,  KC_BSPC ,
+    _______, KC_CALC,  KC_MAIL,  KC_MSEL,  DEBUG,   _______, _______, KC_MS_L, KC_MS_D,    KC_MS_U, KC_MS_R,  RGB_TOG,
+    KC_LSFT, _______,  _______,  _______,  _______, _______, _______, _______, _______,    _______, _______,  KC_ENT,
+    RSFT_T(KC_MPLY),   KC_LCTL,  KC_LALT,  KC_LGUI, KC_SPC,  LOWER,   RAISE,   KC_SPC,     KC_LEFT, KC_DOWN,  KC_UP,  KC_RGHT
+)
+
+};
+
+#ifdef AUDIO_ENABLE
+  float plover_song[][2]     = SONG(PLOVER_SOUND);
+  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (IS_LAYER_ON(_RAISE)) {
+        if (get_mods() & MOD_BIT(KC_RSFT)) {
+            // ZOOM
+            // Store which mods are held
+            uint8_t mod_state = get_mods();
+            // Ignore all shift keys
+            del_mods(MOD_MASK_SHIFT);
+            if (clockwise) {
+                tap_code16(LGUI(KC_PPLS));
+            } else {
+                tap_code16(LGUI(KC_PMNS));
+            }
+            // Add back shift keys
+            set_mods(mod_state);
+        } else if (get_mods() & MOD_BIT(KC_LSFT)) {
+            // SCROLL X
+            uint8_t mod_state = get_mods();
+            del_mods(MOD_MASK_SHIFT);
+            if (clockwise) {
+                tap_code16(KC_WH_L);
+            } else {
+                tap_code16(KC_WH_R);
+            }
+            set_mods(mod_state);
+        } else {
+            // SCROLL Y
+            if (clockwise) {
+                tap_code(KC_WH_U);
+            } else {
+                tap_code(KC_WH_D);
+            }
+        }
+    } else {
+        if (get_mods() & MOD_BIT(KC_RSFT)) {
+            // ZOOM
+            uint8_t mod_state = get_mods();
+            del_mods(MOD_MASK_SHIFT);
+            if (clockwise) {
+                tap_code16(LGUI(KC_PPLS));
+            } else {
+                tap_code16(LGUI(KC_PMNS));
+            }
+            set_mods(mod_state);
+        } else if (get_mods() & MOD_BIT(KC_LSFT)) {
+          // BRIGHTNESS
+          uint8_t mod_state = get_mods();
+          del_mods(MOD_MASK_SHIFT);
+          if (clockwise) {
+            tap_code16(KC_PAUSE);
+          } else {
+            tap_code16(KC_SCROLLLOCK);
+          }
+          set_mods(mod_state);
+      } else {
+          // VOLUME
+          if (clockwise) {
+            tap_code(KC__VOLUP);
+          } else {
+            tap_code(KC__VOLDOWN);
+          }
+      }
+  }
+  return true;
+}
diff --git a/keyboards/planck/keymaps/inkwell/readme.md b/keyboards/planck/keymaps/inkwell/readme.md
new file mode 100644
index 0000000000..8a158783c6
--- /dev/null
+++ b/keyboards/planck/keymaps/inkwell/readme.md
@@ -0,0 +1,19 @@
+# The Inkwell Planck Layout
+
+*/
+Plank keymap with Base, Lower, Raise, and Adjust layers, and 1 encoder.
+
+Features:
+- Number Pad
+- Symbol Pad
+- Function Pad
+- Programming utilities: ()[]{}<>
+- Mouse Control
+- Encoder:
+  - Volume (default turn)
+  - Brightness (shift+turn)
+  - Scroll Y(RSE+turn)
+  - Scroll X (RSE+shift+turn)
+  - Zoom (push+turn)
+  - Play/Pause (double click)
+/*
diff --git a/keyboards/planck/keymaps/inkwell/rules.mk b/keyboards/planck/keymaps/inkwell/rules.mk
new file mode 100644
index 0000000000..afd8d7a8c6
--- /dev/null
+++ b/keyboards/planck/keymaps/inkwell/rules.mk
@@ -0,0 +1,3 @@
+SRC += muse.c
+ENCODER_ENABLE = yes
+EXTRAKEY_ENABLE = yes

From ddc660148743b21fa936a966f50ff6dfc2c7cd35 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Thu, 13 Jan 2022 06:50:00 +0800
Subject: [PATCH 274/867] move id67 (#15662)

---
 keyboards/{ => idobao}/id67/default_rgb/config.h          | 0
 keyboards/{ => idobao}/id67/default_rgb/default_rgb.c     | 0
 keyboards/{ => idobao}/id67/default_rgb/default_rgb.h     | 0
 keyboards/{ => idobao}/id67/default_rgb/info.json         | 0
 keyboards/{ => idobao}/id67/default_rgb/readme.md         | 0
 keyboards/{ => idobao}/id67/default_rgb/rules.mk          | 0
 keyboards/{ => idobao}/id67/keymaps/default/keymap.c      | 0
 keyboards/{ => idobao}/id67/keymaps/via/keymap.c          | 0
 keyboards/{ => idobao}/id67/keymaps/via/rules.mk          | 0
 keyboards/{ => idobao}/id67/readme.md                     | 8 ++++----
 keyboards/{ => idobao}/id67/rgb/config.h                  | 0
 keyboards/{ => idobao}/id67/rgb/info.json                 | 0
 keyboards/{ => idobao}/id67/rgb/keymaps/default/keymap.c  | 0
 .../{ => idobao}/id67/rgb/keymaps/thewerther/config.h     | 0
 .../{ => idobao}/id67/rgb/keymaps/thewerther/keymap.c     | 0
 .../{ => idobao}/id67/rgb/keymaps/thewerther/rules.mk     | 0
 keyboards/{ => idobao}/id67/rgb/readme.md                 | 0
 keyboards/{ => idobao}/id67/rgb/rgb.c                     | 0
 keyboards/{ => idobao}/id67/rgb/rgb.h                     | 0
 keyboards/{ => idobao}/id67/rgb/rules.mk                  | 0
 20 files changed, 4 insertions(+), 4 deletions(-)
 rename keyboards/{ => idobao}/id67/default_rgb/config.h (100%)
 rename keyboards/{ => idobao}/id67/default_rgb/default_rgb.c (100%)
 rename keyboards/{ => idobao}/id67/default_rgb/default_rgb.h (100%)
 rename keyboards/{ => idobao}/id67/default_rgb/info.json (100%)
 rename keyboards/{ => idobao}/id67/default_rgb/readme.md (100%)
 rename keyboards/{ => idobao}/id67/default_rgb/rules.mk (100%)
 rename keyboards/{ => idobao}/id67/keymaps/default/keymap.c (100%)
 rename keyboards/{ => idobao}/id67/keymaps/via/keymap.c (100%)
 rename keyboards/{ => idobao}/id67/keymaps/via/rules.mk (100%)
 rename keyboards/{ => idobao}/id67/readme.md (84%)
 rename keyboards/{ => idobao}/id67/rgb/config.h (100%)
 rename keyboards/{ => idobao}/id67/rgb/info.json (100%)
 rename keyboards/{ => idobao}/id67/rgb/keymaps/default/keymap.c (100%)
 rename keyboards/{ => idobao}/id67/rgb/keymaps/thewerther/config.h (100%)
 rename keyboards/{ => idobao}/id67/rgb/keymaps/thewerther/keymap.c (100%)
 rename keyboards/{ => idobao}/id67/rgb/keymaps/thewerther/rules.mk (100%)
 rename keyboards/{ => idobao}/id67/rgb/readme.md (100%)
 rename keyboards/{ => idobao}/id67/rgb/rgb.c (100%)
 rename keyboards/{ => idobao}/id67/rgb/rgb.h (100%)
 rename keyboards/{ => idobao}/id67/rgb/rules.mk (100%)

diff --git a/keyboards/id67/default_rgb/config.h b/keyboards/idobao/id67/default_rgb/config.h
similarity index 100%
rename from keyboards/id67/default_rgb/config.h
rename to keyboards/idobao/id67/default_rgb/config.h
diff --git a/keyboards/id67/default_rgb/default_rgb.c b/keyboards/idobao/id67/default_rgb/default_rgb.c
similarity index 100%
rename from keyboards/id67/default_rgb/default_rgb.c
rename to keyboards/idobao/id67/default_rgb/default_rgb.c
diff --git a/keyboards/id67/default_rgb/default_rgb.h b/keyboards/idobao/id67/default_rgb/default_rgb.h
similarity index 100%
rename from keyboards/id67/default_rgb/default_rgb.h
rename to keyboards/idobao/id67/default_rgb/default_rgb.h
diff --git a/keyboards/id67/default_rgb/info.json b/keyboards/idobao/id67/default_rgb/info.json
similarity index 100%
rename from keyboards/id67/default_rgb/info.json
rename to keyboards/idobao/id67/default_rgb/info.json
diff --git a/keyboards/id67/default_rgb/readme.md b/keyboards/idobao/id67/default_rgb/readme.md
similarity index 100%
rename from keyboards/id67/default_rgb/readme.md
rename to keyboards/idobao/id67/default_rgb/readme.md
diff --git a/keyboards/id67/default_rgb/rules.mk b/keyboards/idobao/id67/default_rgb/rules.mk
similarity index 100%
rename from keyboards/id67/default_rgb/rules.mk
rename to keyboards/idobao/id67/default_rgb/rules.mk
diff --git a/keyboards/id67/keymaps/default/keymap.c b/keyboards/idobao/id67/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/id67/keymaps/default/keymap.c
rename to keyboards/idobao/id67/keymaps/default/keymap.c
diff --git a/keyboards/id67/keymaps/via/keymap.c b/keyboards/idobao/id67/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/id67/keymaps/via/keymap.c
rename to keyboards/idobao/id67/keymaps/via/keymap.c
diff --git a/keyboards/id67/keymaps/via/rules.mk b/keyboards/idobao/id67/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/id67/keymaps/via/rules.mk
rename to keyboards/idobao/id67/keymaps/via/rules.mk
diff --git a/keyboards/id67/readme.md b/keyboards/idobao/id67/readme.md
similarity index 84%
rename from keyboards/id67/readme.md
rename to keyboards/idobao/id67/readme.md
index 7949ee1af2..134d45b18e 100644
--- a/keyboards/id67/readme.md
+++ b/keyboards/idobao/id67/readme.md
@@ -16,14 +16,14 @@ Currently there are two variants for the id67:
 
 Make examples for this keyboard (after setting up your build environment):
 
-    make id67/default_rgb:default
+    make idobao/id67/default_rgb:default
 
-    make id67/rgb:default
+    make idobao/id67/rgb:default
 
 Flashing examples for this keyboard:
 
-    make id67/default_rgb:default:flash
+    make idobao/id67/default_rgb:default:flash
 
-    make id67/rgb:default:flash
+    make idobao/id67/rgb:default:flash
 
 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).
diff --git a/keyboards/id67/rgb/config.h b/keyboards/idobao/id67/rgb/config.h
similarity index 100%
rename from keyboards/id67/rgb/config.h
rename to keyboards/idobao/id67/rgb/config.h
diff --git a/keyboards/id67/rgb/info.json b/keyboards/idobao/id67/rgb/info.json
similarity index 100%
rename from keyboards/id67/rgb/info.json
rename to keyboards/idobao/id67/rgb/info.json
diff --git a/keyboards/id67/rgb/keymaps/default/keymap.c b/keyboards/idobao/id67/rgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/id67/rgb/keymaps/default/keymap.c
rename to keyboards/idobao/id67/rgb/keymaps/default/keymap.c
diff --git a/keyboards/id67/rgb/keymaps/thewerther/config.h b/keyboards/idobao/id67/rgb/keymaps/thewerther/config.h
similarity index 100%
rename from keyboards/id67/rgb/keymaps/thewerther/config.h
rename to keyboards/idobao/id67/rgb/keymaps/thewerther/config.h
diff --git a/keyboards/id67/rgb/keymaps/thewerther/keymap.c b/keyboards/idobao/id67/rgb/keymaps/thewerther/keymap.c
similarity index 100%
rename from keyboards/id67/rgb/keymaps/thewerther/keymap.c
rename to keyboards/idobao/id67/rgb/keymaps/thewerther/keymap.c
diff --git a/keyboards/id67/rgb/keymaps/thewerther/rules.mk b/keyboards/idobao/id67/rgb/keymaps/thewerther/rules.mk
similarity index 100%
rename from keyboards/id67/rgb/keymaps/thewerther/rules.mk
rename to keyboards/idobao/id67/rgb/keymaps/thewerther/rules.mk
diff --git a/keyboards/id67/rgb/readme.md b/keyboards/idobao/id67/rgb/readme.md
similarity index 100%
rename from keyboards/id67/rgb/readme.md
rename to keyboards/idobao/id67/rgb/readme.md
diff --git a/keyboards/id67/rgb/rgb.c b/keyboards/idobao/id67/rgb/rgb.c
similarity index 100%
rename from keyboards/id67/rgb/rgb.c
rename to keyboards/idobao/id67/rgb/rgb.c
diff --git a/keyboards/id67/rgb/rgb.h b/keyboards/idobao/id67/rgb/rgb.h
similarity index 100%
rename from keyboards/id67/rgb/rgb.h
rename to keyboards/idobao/id67/rgb/rgb.h
diff --git a/keyboards/id67/rgb/rules.mk b/keyboards/idobao/id67/rgb/rules.mk
similarity index 100%
rename from keyboards/id67/rgb/rules.mk
rename to keyboards/idobao/id67/rgb/rules.mk

From f2a31b944d11ed5f1b891aa80c0447d5e94ff121 Mon Sep 17 00:00:00 2001
From: Karl B <42804603+b-karl@users.noreply.github.com>
Date: Thu, 13 Jan 2022 00:05:19 +0100
Subject: [PATCH 275/867] [Keyboard] Add KBIC65 keyboard (#15151)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Karl Berggren <berggren.karl+git@gmail.com>
Co-authored-by: spacefrogfeds <73514335+spacefrogfeds@users.noreply.github.com>
Co-authored-by: Karl Berggren <karber@raysearchlabs.com>
---
 keyboards/karlb/kbic65/info.json              | 400 ++++++++++++++++++
 keyboards/karlb/kbic65/kbic65.c               |   4 +
 keyboards/karlb/kbic65/kbic65.h               |  28 ++
 .../karlb/kbic65/keymaps/default/keymap.c     |  22 +
 .../karlb/kbic65/keymaps/default/readme.md    |   5 +
 keyboards/karlb/kbic65/keymaps/iso/keymap.c   |  22 +
 keyboards/karlb/kbic65/keymaps/iso/readme.md  |   5 +
 .../karlb/kbic65/keymaps/iso_full/keymap.c    |  22 +
 .../karlb/kbic65/keymaps/iso_full/readme.md   |   5 +
 keyboards/karlb/kbic65/keymaps/via/keymap.c   |  22 +
 keyboards/karlb/kbic65/keymaps/via/readme.md  |   5 +
 keyboards/karlb/kbic65/keymaps/via/rules.mk   |   3 +
 keyboards/karlb/kbic65/readme.md              |  31 ++
 keyboards/karlb/kbic65/rules.mk               |  17 +
 14 files changed, 591 insertions(+)
 create mode 100644 keyboards/karlb/kbic65/info.json
 create mode 100644 keyboards/karlb/kbic65/kbic65.c
 create mode 100644 keyboards/karlb/kbic65/kbic65.h
 create mode 100644 keyboards/karlb/kbic65/keymaps/default/keymap.c
 create mode 100644 keyboards/karlb/kbic65/keymaps/default/readme.md
 create mode 100644 keyboards/karlb/kbic65/keymaps/iso/keymap.c
 create mode 100644 keyboards/karlb/kbic65/keymaps/iso/readme.md
 create mode 100644 keyboards/karlb/kbic65/keymaps/iso_full/keymap.c
 create mode 100644 keyboards/karlb/kbic65/keymaps/iso_full/readme.md
 create mode 100644 keyboards/karlb/kbic65/keymaps/via/keymap.c
 create mode 100644 keyboards/karlb/kbic65/keymaps/via/readme.md
 create mode 100644 keyboards/karlb/kbic65/keymaps/via/rules.mk
 create mode 100644 keyboards/karlb/kbic65/readme.md
 create mode 100644 keyboards/karlb/kbic65/rules.mk

diff --git a/keyboards/karlb/kbic65/info.json b/keyboards/karlb/kbic65/info.json
new file mode 100644
index 0000000000..560e162a3e
--- /dev/null
+++ b/keyboards/karlb/kbic65/info.json
@@ -0,0 +1,400 @@
+{
+    "keyboard_name": "KBIC65",
+    "url": "https://karlb.eu/kbic65/",
+    "maintainer": "b-karl",
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "cols": [
+            "B2",
+            "B6",
+            "B3",
+            "B1",
+            "F7",
+            "F6",
+            "F5",
+            "F4"
+        ],
+        "rows": [
+            "B5",
+            "D1",
+            "B4",
+            "D0",
+            "E6",
+            "D4",
+            "D7",
+            "C6",
+            "D2"
+        ]
+    },
+    "usb": {
+        "vid": "0x424B",
+        "pid": "0xD87A",
+        "device_ver": "0x0001"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "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": "BkSp1",
+                    "x": 13,
+                    "y": 0
+                },
+                {
+                    "label": "BkSp2",
+                    "x": 14,
+                    "y": 0
+                },
+                {
+                    "label": "Delete",
+                    "x": 15.5,
+                    "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": "Enter_ISO",
+                    "x": 13.75,
+                    "y": 1,
+                    "w": 1.25,
+                    "h": 2
+                },
+                {
+                    "label": "¬",
+                    "x": 15.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": "PgUp",
+                    "x": 15.5,
+                    "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": 1.75
+                },
+                {
+                    "label": "PgDn",
+                    "x": 15.5,
+                    "y": 3
+                },
+                {
+                    "label": "↑",
+                    "x": 14.25,
+                    "y": 3.25
+                },
+                {
+                    "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
+                },
+                {
+                    "label": "Space",
+                    "x": 3.75,
+                    "y": 4,
+                    "w": 6.25
+                },
+                {
+                    "label": "AltGr",
+                    "x": 10,
+                    "y": 4
+                },
+                {
+                    "label": "Win",
+                    "x": 11,
+                    "y": 4
+                },
+                {
+                    "label": "Ctrl",
+                    "x": 12,
+                    "y": 4
+                },
+                {
+                    "label": "←",
+                    "x": 13.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "↓",
+                    "x": 14.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "→",
+                    "x": 15.25,
+                    "y": 4.25
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/karlb/kbic65/kbic65.c b/keyboards/karlb/kbic65/kbic65.c
new file mode 100644
index 0000000000..910c2a6c72
--- /dev/null
+++ b/keyboards/karlb/kbic65/kbic65.c
@@ -0,0 +1,4 @@
+// Copyright 2021 Karl Berggren <@bkarl>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "kbic65.h"
diff --git a/keyboards/karlb/kbic65/kbic65.h b/keyboards/karlb/kbic65/kbic65.h
new file mode 100644
index 0000000000..112386bc60
--- /dev/null
+++ b/keyboards/karlb/kbic65/kbic65.h
@@ -0,0 +1,28 @@
+// Copyright 2021 Karl Berggren <@bkarl>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+// This a shortcut to help you visually see your layout.
+// The first section contains all of the arguements
+// The second converts the arguments into a two-dimensional array
+#define LAYOUT( \
+         K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K17, K07, \
+         K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K26,      K37, \
+         K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56,           K47, \
+         K70, K60, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76,      K66, K57, \
+         K80, K81, K82,                K83,                K84, K85, K86, K87, K77, K67  \
+) { \
+        {K00, K01, K02, K03, K04, K05, K06, K07}, \
+        {K10, K11, K12, K13, K14, K15, K16, K17}, \
+        {K20, K21, K22, K23, K24, K25, K26, KC_NO}, \
+        {K30, K31, K32, K33, K34, K35, K36, K37}, \
+        {K40, K41, K42, K43, K44, K45, KC_NO, K47}, \
+        {K50, K51, K52, K53, K54, K55, K56, K57}, \
+        {K60, K61, K62, K63, K64, K65, K66, K67}, \
+        {K70, K71, K72, K73, K74, K75, K76, K77}, \
+        {K80, K81, K82, K83, K84, K85, K86, K87} \
+}
+
diff --git a/keyboards/karlb/kbic65/keymaps/default/keymap.c b/keyboards/karlb/kbic65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1691cdd193
--- /dev/null
+++ b/keyboards/karlb/kbic65/keymaps/default/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2021 Karl Berggren <@bkarl>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+// Default ANSI keymap
+[0] = LAYOUT(
+KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,   _______,  KC_HOME,
+KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_PGUP,
+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_PGDN,
+KC_LSFT,  _______,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,             KC_UP,    KC_END,
+KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,   KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[1] = LAYOUT(
+KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   _______,  KC_INS,
+_______,   _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    _______,  _______,            _______,
+_______,   KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,  _______,                      _______,
+_______,   _______,  _______,  _______,  _______,  _______,  RESET,    _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,            KC_PGUP,  _______,
+_______,   _______,  _______,                                _______,                                _______,  _______,  _______, KC_HOME,   KC_PGDN,  KC_END)
+};
diff --git a/keyboards/karlb/kbic65/keymaps/default/readme.md b/keyboards/karlb/kbic65/keymaps/default/readme.md
new file mode 100644
index 0000000000..a071af6710
--- /dev/null
+++ b/keyboards/karlb/kbic65/keymaps/default/readme.md
@@ -0,0 +1,5 @@
+![KBIC65 layout options](https://github.com/b-karl/KBIC65/blob/main/img/layout-options.svg)
+
+# Default KBIC65 Layout
+
+This is the default layout for the KBIC65, it is recommended that you create your own keymap tailored to your specific needs. It is an ANSI keymap but uses the full KBIC65 layoutm, i.e., includes ISO backslash and split backspace but these are set to no action in this default layout. The layers are based on the KBDFans 67 rev 2 default keymap.
diff --git a/keyboards/karlb/kbic65/keymaps/iso/keymap.c b/keyboards/karlb/kbic65/keymaps/iso/keymap.c
new file mode 100644
index 0000000000..ad2b23626f
--- /dev/null
+++ b/keyboards/karlb/kbic65/keymaps/iso/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2021 Karl Berggren <@bkarl>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+// ISO keymap
+[0] = LAYOUT(
+KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,   _______,  KC_HOME,
+KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_ENT,              KC_PGUP,
+KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,                       KC_PGDN,
+KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,             KC_UP,    KC_END,
+KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,   KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[1] = LAYOUT(
+KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   _______,  KC_INS,
+_______,   _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    _______,  _______,            _______,
+_______,   KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,  _______,                      _______,
+_______,   _______,  _______,  _______,  _______,  _______,  RESET,    _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,            KC_PGUP,  _______,
+_______,   _______,  _______,                                _______,                                _______,  _______,  _______, KC_HOME,   KC_PGDN,  KC_END)
+};
diff --git a/keyboards/karlb/kbic65/keymaps/iso/readme.md b/keyboards/karlb/kbic65/keymaps/iso/readme.md
new file mode 100644
index 0000000000..8d83b91f09
--- /dev/null
+++ b/keyboards/karlb/kbic65/keymaps/iso/readme.md
@@ -0,0 +1,5 @@
+![KBIC65 layout options](https://github.com/b-karl/KBIC65/blob/main/img/layout-options.svg)
+
+# KBIC65 ISO Layout
+
+This is a basic ISO keymap for the KBIC65. It is based on the KBDFans 67 rev 2 default keymap.
diff --git a/keyboards/karlb/kbic65/keymaps/iso_full/keymap.c b/keyboards/karlb/kbic65/keymaps/iso_full/keymap.c
new file mode 100644
index 0000000000..671cc8b8a8
--- /dev/null
+++ b/keyboards/karlb/kbic65/keymaps/iso_full/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2021 Karl Berggren <@bkarl>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+// ISO keymap
+[0] = LAYOUT(
+KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,   KC_DEL,   KC_HOME,
+KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_ENT,              KC_PGUP,
+KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,                       KC_PGDN,
+KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,             KC_UP,    KC_END,
+KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,   KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[1] = LAYOUT(
+KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   _______,  KC_INS,
+_______,   _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    _______,  _______,            _______,
+_______,   KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,  _______,                      _______,
+_______,   _______,  _______,  _______,  _______,  _______,  RESET,    _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,            KC_PGUP,  _______,
+_______,   _______,  _______,                                _______,                                _______,  _______,  _______, KC_HOME,   KC_PGDN,  KC_END)
+};
diff --git a/keyboards/karlb/kbic65/keymaps/iso_full/readme.md b/keyboards/karlb/kbic65/keymaps/iso_full/readme.md
new file mode 100644
index 0000000000..9cd1d1c536
--- /dev/null
+++ b/keyboards/karlb/kbic65/keymaps/iso_full/readme.md
@@ -0,0 +1,5 @@
+![KBIC65 layout options](https://github.com/b-karl/KBIC65/blob/main/img/layout-options.svg)
+
+# KBIC65 ISO 70-key Layout
+
+This is a 70 key ISO keymap for the KBIC65 including split backspace, it uses the maximum amount of keys available on the KBIC65. It is recommended to modify the layout for your personal needs.
diff --git a/keyboards/karlb/kbic65/keymaps/via/keymap.c b/keyboards/karlb/kbic65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1691cdd193
--- /dev/null
+++ b/keyboards/karlb/kbic65/keymaps/via/keymap.c
@@ -0,0 +1,22 @@
+// Copyright 2021 Karl Berggren <@bkarl>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+// Default ANSI keymap
+[0] = LAYOUT(
+KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,   _______,  KC_HOME,
+KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,             KC_PGUP,
+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_PGDN,
+KC_LSFT,  _______,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,             KC_UP,    KC_END,
+KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,   KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[1] = LAYOUT(
+KC_GRV,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   _______,  KC_INS,
+_______,   _______,  KC_UP,    _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_UP,    _______,  _______,            _______,
+_______,   KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,  _______,  _______,  KC_HOME,  KC_PGUP,  KC_LEFT,  KC_RGHT,  _______,                      _______,
+_______,   _______,  _______,  _______,  _______,  _______,  RESET,    _______,  _______,  KC_END,   KC_PGDN,  KC_DOWN,  _______,            KC_PGUP,  _______,
+_______,   _______,  _______,                                _______,                                _______,  _______,  _______, KC_HOME,   KC_PGDN,  KC_END)
+};
diff --git a/keyboards/karlb/kbic65/keymaps/via/readme.md b/keyboards/karlb/kbic65/keymaps/via/readme.md
new file mode 100644
index 0000000000..50b9f63309
--- /dev/null
+++ b/keyboards/karlb/kbic65/keymaps/via/readme.md
@@ -0,0 +1,5 @@
+![KBIC65 layout options](https://github.com/b-karl/KBIC65/blob/main/img/layout-options.svg)
+
+# KBIC65 VIA Support
+
+VIA support for KBIC65 with same keymap as the default (ANSI).
diff --git a/keyboards/karlb/kbic65/keymaps/via/rules.mk b/keyboards/karlb/kbic65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..fcb7b9eab6
--- /dev/null
+++ b/keyboards/karlb/kbic65/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+MOUSEKEY_ENABLE = no
diff --git a/keyboards/karlb/kbic65/readme.md b/keyboards/karlb/kbic65/readme.md
new file mode 100644
index 0000000000..43d2e5cd70
--- /dev/null
+++ b/keyboards/karlb/kbic65/readme.md
@@ -0,0 +1,31 @@
+# KBIC65
+
+![KBIC65 top-down view](https://github.com/b-karl/KBIC65/blob/main/img/photoshoot/full_keyboard_straight_above.jpg)
+
+A 65%/70 key FR4-stack open-source keyboard with some design optimizations for wireless. For more info visit the [KBIC65 website](https://karlb.eu/kbic65/) or the [GitHub repo](https://github.com/b-karl/KBIC65).
+
+* Keyboard Maintainer: [Karl Berggren](https://github.com/b-karl)
+* Hardware Supported: [KBIC65](https://github.com/b-karl/KBIC65)
+* Hardware Availability: Open-source design [available on GitHub](https://github.com/b-karl/KBIC65)
+
+Firmware and default keymap have been tested using a KBIC65 with an Elite-C rev 4 controller.
+
+## Build firmware
+
+Make example for this keyboard (after setting up your build environment):
+
+```bash
+ qmk compile -kb karlb/kbic65 -km default
+```
+
+See the [QMK setup documentation](https://docs.qmk.fm/#/newbs_getting_started) to set up the QMK tools. I recommend flashing using
+
+```bash
+ qmk flash -kb karlb/kbic65 -km default
+```
+
+## Bootloader
+
+Since the keyboard is designed to have an exposed ProMicro the bootloader can always be entered by short circuiting the `RST` and `GND` pins on the ProMicro. If the keyboard is configured with the default keymap, the bootloader can be entered by pressing `R_GUI/FN + B`
+
+
diff --git a/keyboards/karlb/kbic65/rules.mk b/keyboards/karlb/kbic65/rules.mk
new file mode 100644
index 0000000000..f7da71aab2
--- /dev/null
+++ b/keyboards/karlb/kbic65/rules.mk
@@ -0,0 +1,17 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 5f2b62528c7f94b098baf6ec691c3b6d50e88328 Mon Sep 17 00:00:00 2001
From: moyi4681 <moyi4681@users.noreply.github.com>
Date: Thu, 13 Jan 2022 07:06:02 +0800
Subject: [PATCH 276/867] [Keyboard] add Endless80 keyboard (#15022)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/dztech/endless80/config.h           | 53 +++++++++++++++++
 keyboards/dztech/endless80/endless80.c        | 16 +++++
 keyboards/dztech/endless80/endless80.h        | 33 +++++++++++
 keyboards/dztech/endless80/info.json          | 13 ++++
 .../dztech/endless80/keymaps/default/keymap.c | 59 +++++++++++++++++++
 .../dztech/endless80/keymaps/via/keymap.c     | 59 +++++++++++++++++++
 .../dztech/endless80/keymaps/via/rules.mk     |  2 +
 keyboards/dztech/endless80/readme.md          | 18 ++++++
 keyboards/dztech/endless80/rules.mk           | 18 ++++++
 9 files changed, 271 insertions(+)
 create mode 100644 keyboards/dztech/endless80/config.h
 create mode 100644 keyboards/dztech/endless80/endless80.c
 create mode 100644 keyboards/dztech/endless80/endless80.h
 create mode 100644 keyboards/dztech/endless80/info.json
 create mode 100644 keyboards/dztech/endless80/keymaps/default/keymap.c
 create mode 100644 keyboards/dztech/endless80/keymaps/via/keymap.c
 create mode 100644 keyboards/dztech/endless80/keymaps/via/rules.mk
 create mode 100644 keyboards/dztech/endless80/readme.md
 create mode 100644 keyboards/dztech/endless80/rules.mk

diff --git a/keyboards/dztech/endless80/config.h b/keyboards/dztech/endless80/config.h
new file mode 100644
index 0000000000..9874ea99a8
--- /dev/null
+++ b/keyboards/dztech/endless80/config.h
@@ -0,0 +1,53 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "config_common.h"
+#define VENDOR_ID       0x445A
+#define PRODUCT_ID      0X1015
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    dztech
+#define PRODUCT         endless80
+
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, B5 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, C6, C7, F5, F4, F1, F0 }
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_PIN_ON_STATE 0
+#define LED_CAPS_LOCK_PIN E6
+
+#define RGB_DI_PIN F7
+#ifdef RGB_DI_PIN
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
+#define RGBLIGHT_DEFAULT_SPD 10
+#define RGBLED_NUM 30
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 10
+#define RGBLIGHT_VAL_STEP 10
+#define RGBLIGHT_LIMIT_VAL 130 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#endif
+#define DEBOUNCE 5
\ No newline at end of file
diff --git a/keyboards/dztech/endless80/endless80.c b/keyboards/dztech/endless80/endless80.c
new file mode 100644
index 0000000000..27135b54d4
--- /dev/null
+++ b/keyboards/dztech/endless80/endless80.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * 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 "endless80.h"
\ No newline at end of file
diff --git a/keyboards/dztech/endless80/endless80.h b/keyboards/dztech/endless80/endless80.h
new file mode 100644
index 0000000000..114f158a90
--- /dev/null
+++ b/keyboards/dztech/endless80/endless80.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * 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 XXX KC_NO
+#include "quantum.h"
+#define LAYOUT_all( \
+    K00, K01,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K1E, \
+    K10, K11,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, K3D, K3E, \
+    K20, K21,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K4C, K4D, K4E, \
+    K30, K31,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
+    K40, K53, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C, \
+    K50, K51, K52,                     K56, K57, K58, K59, K5A, K5B, K5D, K5E \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
+    { K50, K51, K52, K53, XXX, XXX, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }  \
+}
diff --git a/keyboards/dztech/endless80/info.json b/keyboards/dztech/endless80/info.json
new file mode 100644
index 0000000000..219d7ec0fe
--- /dev/null
+++ b/keyboards/dztech/endless80/info.json
@@ -0,0 +1,13 @@
+{
+    "keyboard_name": "endless80", 
+    "url": "", 
+    "maintainer": "moyi4681", 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+        }
+    }
+}
+
+
+
diff --git a/keyboards/dztech/endless80/keymaps/default/keymap.c b/keyboards/dztech/endless80/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e3a5258665
--- /dev/null
+++ b/keyboards/dztech/endless80/keymaps/default/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all( /* Layer Zero */
+    
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS, 
+	KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,           KC_INS,  KC_HOME, KC_PGUP, 
+	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN, 
+	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,                                      
+	KC_LSFT, KC_BSLS, 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, KC_RGUI,  KC_RCTL,                  KC_LEFT, KC_DOWN, KC_RGHT  
+  ),
+
+  [1] = LAYOUT_all( /* Layer One */
+    
+	KC_TRNS,           KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,               KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,           KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                      KC_TRNS,                                      
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,              KC_TRNS,                   KC_TRNS,           
+	KC_TRNS, KC_TRNS,  KC_TRNS,                                        KC_TRNS,                                                    KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS   
+  ),
+
+  [2] = LAYOUT_all( /* Layer Two */
+    
+	KC_TRNS,           KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,               KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,           KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                      KC_TRNS,                                      
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS,                   KC_TRNS,           
+	KC_TRNS, KC_TRNS,  KC_TRNS,                                        KC_TRNS,                                                    KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS   
+  ),
+
+  [3] = LAYOUT_all( /* Layer Three */
+    
+	KC_TRNS,           KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,               KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,           KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                      KC_TRNS,                                      
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,              KC_TRNS,                   KC_TRNS,           
+	KC_TRNS, KC_TRNS,  KC_TRNS,                                        KC_TRNS,                                                    KC_TRNS,   KC_TRNS,   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS   
+  )
+
+};
diff --git a/keyboards/dztech/endless80/keymaps/via/keymap.c b/keyboards/dztech/endless80/keymaps/via/keymap.c
new file mode 100644
index 0000000000..8140d7c1fb
--- /dev/null
+++ b/keyboards/dztech/endless80/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all( /* Layer Zero */
+    
+	KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,        KC_F5,   KC_F6,   KC_F7,   KC_F8,       KC_F9,   KC_F10,  KC_F11,  KC_F12,           KC_PSCR, KC_SLCK, KC_PAUS, 
+	KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,                   KC_INS,  KC_HOME, KC_PGUP, 
+	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN, 
+	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,                                      
+	KC_LSFT, KC_BSLS, 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, KC_RGUI, KC_APP, KC_RCTL,                  KC_LEFT, KC_DOWN, KC_RGHT  
+  ),
+
+  [1] = LAYOUT_all( /* Layer One */
+    
+	KC_TRNS,           KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,               KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,           KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                      KC_TRNS,                                      
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,              KC_TRNS,                   KC_TRNS,           
+	KC_TRNS, KC_TRNS,  KC_TRNS,                                        KC_TRNS,                                        KC_TRNS,            KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS   
+  ),
+
+  [2] = LAYOUT_all( /* Layer Two */
+    
+	KC_TRNS,           KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,               KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,           KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                      KC_TRNS,                                      
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS,                   KC_TRNS,           
+	KC_TRNS, KC_TRNS,  KC_TRNS,                                        KC_TRNS,                                        KC_TRNS,            KC_TRNS,    KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS   
+  ),
+
+  [3] = LAYOUT_all( /* Layer Three */
+    
+	KC_TRNS,           KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,        KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,               KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,           KC_TRNS,          KC_TRNS,  KC_TRNS, KC_TRNS, 
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,                      KC_TRNS,                                      
+	KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,              KC_TRNS,                   KC_TRNS,           
+	KC_TRNS, KC_TRNS,  KC_TRNS,                                        KC_TRNS,                                        KC_TRNS,            KC_TRNS,   KC_TRNS,   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS   
+  )
+
+};
diff --git a/keyboards/dztech/endless80/keymaps/via/rules.mk b/keyboards/dztech/endless80/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/dztech/endless80/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/dztech/endless80/readme.md b/keyboards/dztech/endless80/readme.md
new file mode 100644
index 0000000000..58238afefe
--- /dev/null
+++ b/keyboards/dztech/endless80/readme.md
@@ -0,0 +1,18 @@
+# ENDLESS80
+
+A customizable 80% keyboard.
+
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: ENDLESS80
+* Hardware Availability: [moyi4681](https://github.com/moyi4681)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dztech/endless80: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).
+
+## Bootloader Enter the bootloader in 3 ways:
+* **Bootmagic reset**: Hold down esc in the keyboard then replug
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET`
\ No newline at end of file
diff --git a/keyboards/dztech/endless80/rules.mk b/keyboards/dztech/endless80/rules.mk
new file mode 100644
index 0000000000..533eacc989
--- /dev/null
+++ b/keyboards/dztech/endless80/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 4eb284ef8db0d0bedb8aef207479f2df1b60550b Mon Sep 17 00:00:00 2001
From: Drashna Jael're <drashna@live.com>
Date: Wed, 12 Jan 2022 15:18:06 -0800
Subject: [PATCH 277/867] [Keyboard] Fix suihankey/split

---
 keyboards/kakunpc/suihankey/split/rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/kakunpc/suihankey/split/rules.mk b/keyboards/kakunpc/suihankey/split/rules.mk
index f0bdf744ee..6da41b20b8 100644
--- a/keyboards/kakunpc/suihankey/split/rules.mk
+++ b/keyboards/kakunpc/suihankey/split/rules.mk
@@ -1,4 +1,4 @@
 OLED_ENABLE = no
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = suihankey/split/rev1
+DEFAULT_FOLDER = kakunpc/suihankey/split/rev1

From 06b329cdb98fc3a57d41e5815ab0d1c7d9f74299 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 12 Jan 2022 18:13:35 -0800
Subject: [PATCH 278/867] kbdfans/kbd67/mkiirgb/v4: remove duplicate
 definitions from config.h (#15858)

---
 keyboards/kbdfans/kbd67/mkiirgb/v4/config.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index 68ec07db37..7de9281d40 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -65,14 +65,6 @@
 #    define RGB_MATRIX_SAT_STEP 8
 #    define RGB_MATRIX_VAL_STEP 8
 #    define RGB_MATRIX_SPD_STEP 10
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150  // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
-#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
-#    define RGB_MATRIX_HUE_STEP 8
-#    define RGB_MATRIX_SAT_STEP 8
-#    define RGB_MATRIX_VAL_STEP 8
-#    define RGB_MATRIX_SPD_STEP 10
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects

From 362a65510a0fe80a6fa56400b4b8089accde21c7 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 13 Jan 2022 10:29:13 +0800
Subject: [PATCH 279/867] [Docs] Move QMK newbs build environment guide to next
 section (#15386)

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
---
 docs/newbs_building_firmware.md | 16 +++++++++++++++-
 docs/newbs_getting_started.md   | 16 ----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/docs/newbs_building_firmware.md b/docs/newbs_building_firmware.md
index ed94a1460d..ed51a9aea5 100644
--- a/docs/newbs_building_firmware.md
+++ b/docs/newbs_building_firmware.md
@@ -2,6 +2,20 @@
 
 Now that you have setup your build environment you are ready to start building custom firmware. For this section of the guide we will bounce between 3 programs- your file manager, your text editor, and your terminal window. Keep all 3 open until you are done and happy with your keyboard firmware.
 
+## Configure Your Build Environment Defaults (Optional)
+
+You can configure your build environment to set the defaults and make working with QMK less tedious. Let's do that now!
+
+Most people new to QMK only have 1 keyboard. You can set this keyboard as your default with the `qmk config` command. For example, to set your default keyboard to `clueboard/66/rev4`:
+
+    qmk config user.keyboard=clueboard/66/rev4
+
+?> The keyboard option is the path relative to the keyboard directory, the above example would be found in `qmk_firmware/keyboards/clueboard/66/rev4`. If you're unsure you can view a full list of supported keyboards with `qmk list-keyboards`.
+
+You can also set your default keymap name. Most people use their GitHub username like the keymap name from the previous steps:
+
+    qmk config user.keymap=<github_username>
+
 ## Create a New Keymap
 
 To create your own keymap you'll want to create a copy of the `default` keymap. If you configured your build environment in the last step you can do that easily with the QMK CLI:
@@ -45,7 +59,7 @@ When your changes to the keymap are complete you will need to build the firmware
 
     qmk compile
 
-If you did not configure your environment, or you have multiple keyboards, you can specify a keyboard and/or keymap:
+If you did not configure defaults for your environment, or you have multiple keyboards, you can specify a keyboard and/or keymap:
 
     qmk compile -kb <keyboard> -km <keymap>
 
diff --git a/docs/newbs_getting_started.md b/docs/newbs_getting_started.md
index 5dbaa56169..d6c080173c 100644
--- a/docs/newbs_getting_started.md
+++ b/docs/newbs_getting_started.md
@@ -182,22 +182,6 @@ Checking file size of clueboard_66_rev3_default.hex
  * The firmware size is fine - 26356/28672 (2316 bytes free)
 ```
 
-## 5. Configure Your Build Environment (Optional)
-
-You can configure your build environment to set the defaults and make working with QMK less tedious. Let's do that now!
-
-Most people new to QMK only have 1 keyboard. You can set this keyboard as your default with the `qmk config` command. For example, to set your default keyboard to `clueboard/66/rev4`:
-
-    qmk config user.keyboard=clueboard/66/rev4
-
-You can also set your default keymap name. Most people use their GitHub username here, and we recommend that you do too.
-
-    qmk config user.keymap=<github_username>
-
-The keyboard can now be compiled without arguments using the following command after creating your keymap in the next section:
-
-    qmk compile
-
 # Creating Your Keymap
 
 You are now ready to create your own personal keymap! Move on to [Building Your First Firmware](newbs_building_firmware.md) for that.

From 731072fc5c280bb2da257b0ab2a9b601cebeb756 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 13 Jan 2022 10:38:34 +0800
Subject: [PATCH 280/867] [Keyboard] Fix compile error caused by variable
 exclusion on Moonlander (#15860)

---
 keyboards/moonlander/moonlander.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index ea50226f0c..e2e163f116 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -124,7 +124,9 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
     bool LED_3 = false;
     bool LED_4 = false;
     bool LED_5 = false;
+#if !defined(CAPS_LOCK_STATUS)
     bool LED_6 = false;
+#endif
 
     uint8_t layer = get_highest_layer(state);
     switch (layer) {

From a8482a4424ee3035d2a7487ea8d0de8684d3918f Mon Sep 17 00:00:00 2001
From: Alabastard-64 <96358682+Alabastard-64@users.noreply.github.com>
Date: Wed, 12 Jan 2022 19:51:05 -0700
Subject: [PATCH 281/867] PMW3389 Revert Firmware load during Initilization
 (#15859)

---
 docs/feature_pointing_device.md | 1 -
 drivers/sensors/pmw3389.c       | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index def592a61c..5f1260eede 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -174,7 +174,6 @@ The PMW 3389 is an SPI driven optical sensor, that uses a built in IR LED for su
 |`PMW3389_SPI_DIVISOR`            | (Optional) Sets the SPI Divisor used for SPI communication.                                | _varies_      |
 |`PMW3389_LIFTOFF_DISTANCE`       | (Optional) Sets the lift off distance at run time                                          | `0x02`        |
 |`ROTATIONAL_TRANSFORM_ANGLE`     | (Optional) Allows for the sensor data to be rotated +/- 30 degrees directly in the sensor. | `0`           |
-|`PMW3389_LEGACY_FIRMWARE_UPLOAD` | (Optional) Switches to older, manual upload of firmware, for compatibility.                | _not defined_ |
 
 The CPI range is 50-16000, in increments of 50. Defaults to 2000 CPI.
 
diff --git a/drivers/sensors/pmw3389.c b/drivers/sensors/pmw3389.c
index 11056bb89e..d6f02b6a59 100644
--- a/drivers/sensors/pmw3389.c
+++ b/drivers/sensors/pmw3389.c
@@ -210,16 +210,14 @@ void pmw3389_upload_firmware(void) {
     spi_write(REG_SROM_Load_Burst | 0x80);
     wait_us(15);
 
-#ifdef PMW3389_LEGACY_FIRMWARE_UPLOAD
+    // legacy only for PMW3389 spi_transmit failed to load firmware
     unsigned char c;
     for (int i = 0; i < FIRMWARE_LENGTH; i++) {
         c = (unsigned char)pgm_read_byte(firmware_data + i);
         spi_write(c);
         wait_us(15);
     }
-#else
-    spi_transmit(firmware_data, sizeof(firmware_data));
-#endif
+
     wait_us(200);
 
     pmw3389_read(REG_SROM_ID);

From aa9577b3714d2f0630c809df74b0a08623a9acda Mon Sep 17 00:00:00 2001
From: Choi Byungyoon <byungyoonc@gmail.com>
Date: Thu, 13 Jan 2022 13:59:45 +0900
Subject: [PATCH 282/867] [Keymap] Add personal keymap to GMMK Pro ANSI
 (#15314)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../gmmk/pro/ansi/keymaps/byungyoonc/config.h |  72 ++++++++++
 .../gmmk/pro/ansi/keymaps/byungyoonc/keymap.c | 129 ++++++++++++++++++
 .../pro/ansi/keymaps/byungyoonc/readme.md     |  41 ++++++
 .../keymaps/byungyoonc/rgb_matrix_user.inc    |   1 +
 .../gmmk/pro/ansi/keymaps/byungyoonc/rules.mk |   2 +
 users/byungyoonc/byungyoonc.c                 |  48 +++++++
 users/byungyoonc/byungyoonc.h                 |  27 ++++
 users/byungyoonc/readme.md                    |  14 ++
 users/byungyoonc/rules.mk                     |   1 +
 .../byungyoonc/saturated_solid_multisplash.h  |  50 +++++++
 10 files changed, 385 insertions(+)
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/byungyoonc/config.h
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/byungyoonc/keymap.c
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/byungyoonc/readme.md
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rgb_matrix_user.inc
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rules.mk
 create mode 100644 users/byungyoonc/byungyoonc.c
 create mode 100644 users/byungyoonc/byungyoonc.h
 create mode 100644 users/byungyoonc/readme.md
 create mode 100644 users/byungyoonc/rules.mk
 create mode 100644 users/byungyoonc/saturated_solid_multisplash.h

diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/config.h b/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/config.h
new file mode 100644
index 0000000000..16ac4f2407
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/config.h
@@ -0,0 +1,72 @@
+/* Copyright 2021 Choi Byungyoon <byungyoonc@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define RGB_MATRIX_KEYPRESSES
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+// #define ENABLE_RGB_MATRIX_BREATHING
+#undef ENABLE_RGB_MATRIX_BAND_SAT
+#undef ENABLE_RGB_MATRIX_BAND_VAL
+#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+// #define ENABLE_RGB_MATRIX_CYCLE_ALL
+// #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+// #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+// #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#undef ENABLE_RGB_MATRIX_DUAL_BEACON
+#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#undef ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// #define ENABLE_RGB_MATRIX_RAINDROPS
+// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#undef ENABLE_RGB_MATRIX_HUE_BREATHING
+#undef ENABLE_RGB_MATRIX_HUE_PENDULUM
+#undef ENABLE_RGB_MATRIX_HUE_WAVE
+// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#undef ENABLE_RGB_MATRIX_PIXEL_FLOW
+#undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+// #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#undef ENABLE_RGB_MATRIX_SPLASH
+// #define ENABLE_RGB_MATRIX_MULTISPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#undef DEBOUNCE
+/* High debounce time is required to avoid key chattering because of the debouncing algorithm sym_eager_pk */
+#define DEBOUNCE 40
diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/keymap.c
new file mode 100644
index 0000000000..1ad8417de2
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/keymap.c
@@ -0,0 +1,129 @@
+/* Copyright 2021 Choi Byungyoon <byungyoonc@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "byungyoonc.h"
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12      Prt           Rotary(Mic Mute)
+//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)      BackSpc           TaskMgr
+//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 Del
+//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             Home
+//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
+//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
+
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MMUT,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_TASK,
+        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_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_HOME,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        _______, KC_BRID, KC_BRIU, KC_CALC, KC_MSEL, RGB_VAD, RGB_VAI, KC_MRWD, KC_MPLY, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______,
+        _______, KC_SEC1, KC_SEC2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DEBUG,            _______,
+        _______, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, _______, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, RGB_HUI, RGB_HUD, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
+        _______, GUI_TOG, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+    ),
+
+
+};
+// clang-format on
+
+bool process_record_user_kb(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        rgblight_increase_hue();
+    }
+    return true;
+}
+
+#if defined(ENCODER_ENABLE)
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    uint8_t mod_state = get_mods();
+    if (mod_state & MOD_MASK_CTRL) {
+        unregister_mods(MOD_MASK_CTRL);
+        if (clockwise) {
+            tap_code16(LCTL(KC_RGHT));
+        } else {
+            tap_code16(LCTL(KC_LEFT));
+        }
+        set_mods(mod_state);
+    } else {
+        if (clockwise) {
+            tap_code16(KC_VOLU);
+        } else {
+            tap_code16(KC_VOLD);
+        }
+    }
+    return true;
+}
+#endif  // ENCODER_ENABLE
+
+static void set_rgb_caps_leds(void);
+
+static void set_rgb_caps_leds() {
+    rgb_matrix_set_color(73, 0xFF, 0x77, 0x77);  // Left side LED 3
+    rgb_matrix_set_color(74, 0xFF, 0x77, 0x77);  // Right side LED 3
+    rgb_matrix_set_color(76, 0xFF, 0x77, 0x77);  // Left side LED 4
+    rgb_matrix_set_color(77, 0xFF, 0x77, 0x77);  // Right side LED 4
+    rgb_matrix_set_color(80, 0xFF, 0x77, 0x77);  // Left side LED 5
+    rgb_matrix_set_color(81, 0xFF, 0x77, 0x77);  // Right side LED 5
+    rgb_matrix_set_color(83, 0xFF, 0x77, 0x77);  // Left side LED 6
+    rgb_matrix_set_color(84, 0xFF, 0x77, 0x77);  // Right side LED 6
+    rgb_matrix_set_color(3, 0xFF, 0x77, 0x77);   // CAPS LED
+}
+
+static void set_rgb_nlck_notset_leds(void);
+
+static void set_rgb_wlck_leds(void);
+
+static void set_rgb_nlck_notset_leds() {
+    rgb_matrix_set_color(67, 0x77, 0x77, 0xFF);  // Left side LED 1
+    rgb_matrix_set_color(68, 0x77, 0x77, 0xFF);  // Right side LED 1
+    rgb_matrix_set_color(70, 0x77, 0x77, 0xFF);  // Left side LED 2
+    rgb_matrix_set_color(71, 0x77, 0x77, 0xFF);  // Right side LED 2
+}
+
+static void set_rgb_wlck_leds() {
+    rgb_matrix_set_color(87, 0x77, 0xFF, 0x77);  // Left side LED 7
+    rgb_matrix_set_color(88, 0x77, 0xFF, 0x77);  // Right side LED 7
+    rgb_matrix_set_color(91, 0x77, 0xFF, 0x77);  // Left side LED 8
+    rgb_matrix_set_color(92, 0x77, 0xFF, 0x77);  // Right side LED 8
+}
+
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+        set_rgb_caps_leds();
+    }
+    if (!IS_HOST_LED_ON(USB_LED_NUM_LOCK)) {
+        set_rgb_nlck_notset_leds();
+    }
+    if (keymap_config.no_gui) {
+        set_rgb_wlck_leds();
+    }
+}
+
+void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
+    for (int i = 0; i < 20; i++) {
+        wait_cpuclock(STM32_SYSCLK / 1000000L);
+    }
+}
diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/readme.md b/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/readme.md
new file mode 100644
index 0000000000..d340bf86ed
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/readme.md
@@ -0,0 +1,41 @@
+byungyoonc's GMMK Pro Layout
+============================
+
+## Keymap
+
+### Base Layer
+![GMMK Pro Base Layer Layout Image](https://i.imgur.com/VvEL08Q.png)
+
+Made a bit of a change on the leftmost side of the keyboard to set Home and End closer to the arrow keys. Also uses a shortcut for Windows Task Manager, Windows PowerToys microphone mute.
+
+### Fn Layer
+![GMMK Pro Fn Layer Layout Image](https://i.imgur.com/uQy2gSh.png)
+
+F-row media functions roughly matches the Keychron keyboard's layout.
+
+Added Debug key for faster debugging iteration.
+
+Supports Secrets input by Fn + Numbers.
+
+The rest are pretty self-explanatory RGB controls, a GUI toggle and an NKRO toggle.
+
+## Rotary Encoder Rotation
+Volume control when no mods, Ctrl+Left/Right when Ctrl is pressed while rotating the encoder.
+
+## RGB Indicators
+Uses side strap RGB as the RGB indicators. 
+- Top third lights on when the Num Lock is turned off.
+- Middle third lights on when the Caps Lock is turned on.
+- Bottom third lights on when the GUI is disabled (via `GUI_TOG`).
+
+## Debounce
+Uses the `DEBOUNCE_TYPE` of `sym_eager_pk` for the shortest response time possible, and `DEBOUNCE` time of `40` in order to eliminate any key chattering.
+
+## NKRO
+N-key rollover is turned on by default.
+
+## RGB Matrix
+Keypresses effects are enabled.
+Disabled default several RGB effects.
+Added custom RGB matrix effect `saturated_solid_multisplash`.
+Every keypress increases the RGB hue value.
diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rgb_matrix_user.inc b/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rgb_matrix_user.inc
new file mode 100644
index 0000000000..0d61e19f4c
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rgb_matrix_user.inc
@@ -0,0 +1 @@
+#include "saturated_solid_multisplash.h"
diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rules.mk
new file mode 100644
index 0000000000..08f832c51b
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rules.mk
@@ -0,0 +1,2 @@
+DEBOUNCE_TYPE = sym_eager_pk
+RGB_MATRIX_CUSTOM_USER = yes
diff --git a/users/byungyoonc/byungyoonc.c b/users/byungyoonc/byungyoonc.c
new file mode 100644
index 0000000000..5059de0d97
--- /dev/null
+++ b/users/byungyoonc/byungyoonc.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 Choi Byungyoon <byungyoonc@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "byungyoonc.h"
+
+#if (__has_include("secrets.h") && !defined(NO_SECRETS))
+#    include "secrets.h"
+#else
+static const char *const secrets[] = {"test1", "test2"};
+#endif
+
+#if !defined(MACRO_TIMER)
+#   define MACRO_TIMER 20
+#endif
+
+/* replicaJunction's process_record_user_kb */
+__attribute__ ((weak))
+bool process_record_user_kb(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+    case KC_SEC1 ... KC_SEC2: /* Secrets!  Externally defined strings, not stored in repo */
+        if (!record->event.pressed) {
+            clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
+            send_string_with_delay(secrets[keycode - KC_SEC1], MACRO_TIMER);
+        }
+        return false;
+        break;
+    }
+    return process_record_user_kb(keycode, record);
+};
+
diff --git a/users/byungyoonc/byungyoonc.h b/users/byungyoonc/byungyoonc.h
new file mode 100644
index 0000000000..6d82370a01
--- /dev/null
+++ b/users/byungyoonc/byungyoonc.h
@@ -0,0 +1,27 @@
+/* Copyright 2021 Choi Byungyoon <byungyoonc@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+enum custom_keycodes {
+    KC_SEC1 = SAFE_RANGE,
+    KC_SEC2
+};
+
+#define KC_TASK LCTL(LSFT(KC_ESC))
+#define KC_MMUT LSG(KC_A)
+
+bool process_record_user_kb(uint16_t keycode, keyrecord_t *record);
diff --git a/users/byungyoonc/readme.md b/users/byungyoonc/readme.md
new file mode 100644
index 0000000000..d0bc8d14d4
--- /dev/null
+++ b/users/byungyoonc/readme.md
@@ -0,0 +1,14 @@
+byungyoonc QMK Userspace
+========================
+
+# Overview
+Defines some custom keycodes, alongside with the Secrets feature. Also incorporates `process_record_user_kb()` for further controls.
+
+Heavily influenced by the [Userspace code by replicaJunction](../replicaJunction/readme.md).
+
+# Features
+
+## Custom Keycodes
+- `KC_SEC#` for the Secrets input
+- `KC_TASK` for the Windows Task Manager shortcut `LCTL(LSFT(KC_ESC))`
+- `KC_MMUT` for the Windows PowerToys Conference Mute microphone `LSG(KC_A)`
diff --git a/users/byungyoonc/rules.mk b/users/byungyoonc/rules.mk
new file mode 100644
index 0000000000..39c65e2238
--- /dev/null
+++ b/users/byungyoonc/rules.mk
@@ -0,0 +1 @@
+SRC += byungyoonc.c
diff --git a/users/byungyoonc/saturated_solid_multisplash.h b/users/byungyoonc/saturated_solid_multisplash.h
new file mode 100644
index 0000000000..f302348524
--- /dev/null
+++ b/users/byungyoonc/saturated_solid_multisplash.h
@@ -0,0 +1,50 @@
+/* Copyright 2021 Choi Byungyoon <byungyoonc@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#if defined(RGB_MATRIX_KEYPRESSES)
+RGB_MATRIX_EFFECT(saturated_solid_multisplash)
+
+#   if defined(RGB_MATRIX_CUSTOM_EFFECT_IMPLS)
+
+static bool saturated_solid_multisplash(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t count = g_last_hit_tracker.count;
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        HSV hsv = rgb_matrix_config.hsv;
+        hsv.v   = 0;
+        for (uint8_t j = 0; j < count; j++) {
+            int16_t  dx   = g_led_config.point[i].x - g_last_hit_tracker.x[j];
+            int16_t  dy   = g_led_config.point[i].y - g_last_hit_tracker.y[j];
+            uint8_t  dist = sqrt16(dx * dx + dy * dy);
+            uint16_t tick = scale16by8(g_last_hit_tracker.tick[j], qadd8(rgb_matrix_config.speed, 1));
+
+            uint16_t effect = tick - dist;
+            if (effect > 255) effect = 255;
+            uint16_t vdiff = scale16by8(255 - effect, 255 - dist);
+            hsv.v = qadd8(hsv.v, vdiff);
+            hsv.s = qsub8(hsv.s, qsub8(127, effect));
+        }
+        hsv.v   = scale8(hsv.v, rgb_matrix_config.hsv.v);
+        RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+#   endif   // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif      // RGB_MATRIX_KEYPRESSES

From d0c8f2f822f320bc26a744ad05debf7effe76f3d Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Thu, 13 Jan 2022 04:47:25 -0800
Subject: [PATCH 283/867] [Keyboard] Fix Simpler6x boards (#15862)

* [Keyboard] Fix simpler64

* [Keyboard] Fix simpler61
---
 keyboards/ilumkb/simpler61/config.h    | 48 +++++++++++++++++++++++++
 keyboards/ilumkb/simpler61/simpler61.c |  4 +--
 keyboards/ilumkb/simpler64/config.h    | 49 ++++++++++++++++++++++++++
 keyboards/ilumkb/simpler64/simpler64.c |  4 +--
 4 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h
index d9a132e066..1efdb1af25 100644
--- a/keyboards/ilumkb/simpler61/config.h
+++ b/keyboards/ilumkb/simpler61/config.h
@@ -54,3 +54,51 @@
 #define DRIVER_1_LED_TOTAL 61
 #define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
 #define DRIVER_INDICATOR_LED_TOTAL 0
+
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+// #    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+// #    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+// #    define ENABLE_RGB_MATRIX_SPLASH
+// #    define ENABLE_RGB_MATRIX_MULTISPLASH
+// #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/ilumkb/simpler61/simpler61.c b/keyboards/ilumkb/simpler61/simpler61.c
index 0eca6e0b07..20a40e9169 100644
--- a/keyboards/ilumkb/simpler61/simpler61.c
+++ b/keyboards/ilumkb/simpler61/simpler61.c
@@ -17,7 +17,7 @@
 #include "simpler61.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
     {0,  CS3_SW1,  CS2_SW1,  CS1_SW1},
     {0,  CS3_SW2,  CS2_SW2,  CS1_SW2},
     {0,  CS3_SW3,  CS2_SW3,  CS1_SW3},
@@ -99,7 +99,7 @@ led_config_t g_led_config = {
 		{9, 48}, {36, 48}, {52, 48}, {68, 48}, {84, 48}, {100, 48}, {116, 48}, {132, 48}, {148, 48}, {164, 48}, {180, 48}, {202, 48},            {224, 48},
 		{4, 64}, {24, 64}, {44, 64},                     {112, 64},                                             {180, 64}, {200, 64},            {220, 64},
 	}, {
-		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4, 
+		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,
 		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,
 		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,                4,
 		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,                4,
diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h
index 0376d9e2d2..179b98113b 100644
--- a/keyboards/ilumkb/simpler64/config.h
+++ b/keyboards/ilumkb/simpler64/config.h
@@ -54,3 +54,52 @@
 #define DRIVER_1_LED_TOTAL 64
 #define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
 #define DRIVER_INDICATOR_LED_TOTAL 0
+
+
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+// #    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+// #    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+// #    define ENABLE_RGB_MATRIX_SPLASH
+// #    define ENABLE_RGB_MATRIX_MULTISPLASH
+// #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
diff --git a/keyboards/ilumkb/simpler64/simpler64.c b/keyboards/ilumkb/simpler64/simpler64.c
index 19e4320734..8ab72caaca 100644
--- a/keyboards/ilumkb/simpler64/simpler64.c
+++ b/keyboards/ilumkb/simpler64/simpler64.c
@@ -17,7 +17,7 @@
 #include "simpler64.h"
 
 #ifdef RGB_MATRIX_ENABLE
-const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
     {0,  CS3_SW1,  CS2_SW1,  CS1_SW1},
     {0,  CS3_SW2,  CS2_SW2,  CS1_SW2},
     {0,  CS3_SW3,  CS2_SW3,  CS1_SW3},
@@ -102,7 +102,7 @@ led_config_t g_led_config = {
 		{8, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {138, 48}, {154, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48}, {224, 48},
 		{2, 64}, {22, 64}, {42, 64},                    {102, 64},                                  {160, 64}, {176, 64}, {192, 64}, {208, 64}, {224, 64},
 	}, {
-		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4, 
+		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,
 		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,
 		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,                4,
 		4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,       4,

From e2d1547f31c0ceda27b68e26e79224b49cadaa97 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Fri, 14 Jan 2022 01:15:01 +0800
Subject: [PATCH 284/867] [Keyboard] Switch a_dux, cradio and ferris to
 split_3x5_2 (#15850)

---
 keyboards/a_dux/a_dux.h                      |  4 +++-
 keyboards/a_dux/info.json                    |  2 +-
 keyboards/a_dux/keymaps/default/keymap.c     | 10 +++++-----
 keyboards/cradio/cradio.h                    |  2 +-
 keyboards/cradio/info.json                   |  2 +-
 keyboards/cradio/keymaps/default/keymap.c    |  9 +++++----
 keyboards/ferris/0_1/0_1.h                   |  3 ++-
 keyboards/ferris/0_2/0_2.h                   |  3 ++-
 keyboards/ferris/info.json                   |  2 +-
 keyboards/ferris/keymaps/default/keymap.json |  2 +-
 keyboards/ferris/sweep/sweep.h               |  3 ++-
 11 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/keyboards/a_dux/a_dux.h b/keyboards/a_dux/a_dux.h
index d143295845..83c0a3692b 100644
--- a/keyboards/a_dux/a_dux.h
+++ b/keyboards/a_dux/a_dux.h
@@ -28,7 +28,7 @@
 // readability
 #define ___ KC_NO
 
-#define LAYOUT( \
+#define LAYOUT_split_3x5_2( \
         L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \
         L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \
         L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \
@@ -45,3 +45,5 @@
         { R16, R17, ___, ___, ___ }  \
     }
 
+#define LAYOUT LAYOUT_split_3x5_2
+
diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json
index f1869f7332..e276128a62 100644
--- a/keyboards/a_dux/info.json
+++ b/keyboards/a_dux/info.json
@@ -3,7 +3,7 @@
     "url": "https://github.com/tapioki/cephalopoda",
     "maintainer": "@tapioki",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_split_3x5_2": {
             "layout": [
                 {"x": 0, "y": 1.33},
                 {"x": 1, "y": 0.31},
diff --git a/keyboards/a_dux/keymaps/default/keymap.c b/keyboards/a_dux/keymaps/default/keymap.c
index 560c5654e9..b58c9d447f 100644
--- a/keyboards/a_dux/keymaps/default/keymap.c
+++ b/keyboards/a_dux/keymaps/default/keymap.c
@@ -7,31 +7,31 @@
 // https://stevep99.github.io/seniply
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_split_3x5_2(
     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
                           LT(3,KC_TAB), KC_LSFT,     KC_SPC,  LT(1,KC_ENT)
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_split_3x5_2(
     KC_EXLM, KC_AT,   KC_SCLN, KC_COLN, KC_UNDS,     KC_EQL,  KC_7,    KC_8,    KC_9,    KC_PLUS,
     KC_BSLS, KC_PIPE, KC_LCBR, KC_LPRN, KC_LBRC,     KC_ASTR, KC_4,    KC_5,    KC_6,    KC_MINS,
     KC_NO,   KC_NO,   KC_RCBR, KC_RPRN, KC_RBRC,     KC_0,    KC_1,    KC_2,    KC_3,    KC_SLSH,
                                _______, MO(2),       _______, _______
     ),
-    [2] = LAYOUT(
+    [2] = LAYOUT_split_3x5_2(
     RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), KC_BRIU,     KC_NO,   KC_AMPR, KC_GRV,  KC_TILD, KC_NO,
     KC_MUTE,    KC_VOLD,    KC_MPLY,    KC_VOLU,    KC_BRID,     KC_NO,   KC_DLR,  KC_PERC, KC_CIRC, KC_UNDS,
     KC_EJCT,    KC_MPRV,    KC_MSTP,    KC_MNXT,    KC_NO,       KC_NO,   KC_EXLM, KC_AT,   KC_HASH, KC_NO,
                                            _______, _______,     _______, _______
     ),
-    [3] = LAYOUT(
+    [3] = LAYOUT_split_3x5_2(
     KC_ESC,        LALT(KC_LEFT), LCTL(KC_F),    LALT(KC_RGHT), KC_INS,            KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_CAPS,
     OSM(MOD_LALT), OSM(MOD_LGUI), OSM(MOD_LSFT), OSM(MOD_LCTL), OSM(MOD_RALT),     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,
     LCTL(KC_Z),    LCTL(KC_X),    LCTL(KC_C),    KC_TAB,        LCTL(KC_V),        KC_ENT,  KC_BSPC, KC_RCTL, KC_LALT, KC_APP,
                                                        _______, _______,           _______, MO(4)
     ),
-    [4] = LAYOUT(
+    [4] = LAYOUT_split_3x5_2(
     KC_NO,         KC_NO,         RCS(KC_F),     KC_PSCR,       KC_NO,             KC_F12,  KC_F7,   KC_F8,   KC_F9,   KC_NO,
     OSM(MOD_LALT), OSM(MOD_LGUI), OSM(MOD_LSFT), OSM(MOD_LCTL), OSM(MOD_RALT),     KC_F11,  KC_F4,   KC_F5,   KC_F6,   KC_NO,
     RCS(KC_Z),     RCS(KC_X),     RCS(KC_C),     LSFT(KC_TAB),  RCS(KC_V),         KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_NO,
diff --git a/keyboards/cradio/cradio.h b/keyboards/cradio/cradio.h
index 29e81ef9b8..527cc16ad0 100644
--- a/keyboards/cradio/cradio.h
+++ b/keyboards/cradio/cradio.h
@@ -31,7 +31,7 @@
 // readability
 #define ___ KC_NO
 
-#define LAYOUT( \
+#define LAYOUT_split_3x5_2( \
         L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \
         L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \
         L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \
diff --git a/keyboards/cradio/info.json b/keyboards/cradio/info.json
index c553810656..78cb7ef195 100644
--- a/keyboards/cradio/info.json
+++ b/keyboards/cradio/info.json
@@ -3,7 +3,7 @@
     "url": "https://github.com/davidphilipbarr/Sweep",
     "maintainer": "@davidphilipbarr",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_split_3x5_2": {
             "layout": [
                 {"x": 0, "y": 1.27},
                 {"x": 1, "y": 0.31},
diff --git a/keyboards/cradio/keymaps/default/keymap.c b/keyboards/cradio/keymaps/default/keymap.c
index bb7e2d35e6..f060be4e39 100644
--- a/keyboards/cradio/keymaps/default/keymap.c
+++ b/keyboards/cradio/keymaps/default/keymap.c
@@ -24,28 +24,29 @@
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_split_3x5_2(
     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
     SFT_T(KC_A),ALT_T(KC_S),CTL_T(KC_D),GUI_T(KC_F), KC_G,    KC_H, GUI_T(KC_J),CTL_T(KC_K),ALT_T(KC_L),SFT_T(KC_SCLN),
     KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
                           LT(2,KC_TAB), KC_ENT,      KC_SPC,  LT(1,KC_BSPC)
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_split_3x5_2(
     _______, KC_1,    KC_2,    KC_3,    KC_VOLU,     KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_DQUO,
     _______, KC_4,    KC_5,    KC_6,    KC_VOLD,     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
     KC_CAPS, KC_7,    KC_8,    KC_9,    KC_0,        _______, _______, _______, _______, _______,
                                MO(3),   KC_GESC,     _______, _______
     ),
-    [2] = LAYOUT(
+    [2] = LAYOUT_split_3x5_2(
     _______, KC_LBRC, KC_LCBR, KC_RCBR, _______,     KC_CIRC, KC_LPRN, KC_RPRN, KC_RBRC, KC_TILD,
     KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,     KC_AMPR, KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
     _______, _______, _______, _______, _______,     KC_ASTR, KC_UNDS, KC_PLUS, KC_PIPE, _______,
                                _______, _______,     KC_DEL,  MO(3)
     ),
-    [3] = LAYOUT(
+    [3] = LAYOUT_split_3x5_2(
     _______, KC_F1,   KC_F2,   KC_F3,   KC_F10,      _______, KC_WH_U, KC_WH_D, _______, RESET,
     _______, KC_F4,   KC_F5,   KC_F6,   KC_F11,      KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_INS,
     _______, KC_F7,   KC_F8,   KC_F9,   KC_F12,      _______, KC_BTN1, KC_BTN2, _______, _______,
                                _______, _______,     _______, _______
     )
 };
+
diff --git a/keyboards/ferris/0_1/0_1.h b/keyboards/ferris/0_1/0_1.h
index 4602637ca6..2f58831df7 100644
--- a/keyboards/ferris/0_1/0_1.h
+++ b/keyboards/ferris/0_1/0_1.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // clang-format off
 
 /*              left hand                           right hand      */
-#define LAYOUT(\
+#define LAYOUT_split_3x5_2(\
     K0_0, K0_1, K0_2, K0_3, K0_4,       K0_5, K0_6, K0_7, K0_8, K0_9,\
     K1_0, K1_1, K1_2, K1_3, K1_4,       K1_5, K1_6, K1_7, K1_8, K1_9,\
     K2_0, K2_1, K2_2, K2_3, K2_4,       K2_5, K2_6, K2_7, K2_8, K2_9,\
@@ -41,3 +41,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 }
 
 // clang-format on
+#define LAYOUT LAYOUT_split_3x5_2
diff --git a/keyboards/ferris/0_2/0_2.h b/keyboards/ferris/0_2/0_2.h
index 4602637ca6..2f58831df7 100644
--- a/keyboards/ferris/0_2/0_2.h
+++ b/keyboards/ferris/0_2/0_2.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // clang-format off
 
 /*              left hand                           right hand      */
-#define LAYOUT(\
+#define LAYOUT_split_3x5_2(\
     K0_0, K0_1, K0_2, K0_3, K0_4,       K0_5, K0_6, K0_7, K0_8, K0_9,\
     K1_0, K1_1, K1_2, K1_3, K1_4,       K1_5, K1_6, K1_7, K1_8, K1_9,\
     K2_0, K2_1, K2_2, K2_3, K2_4,       K2_5, K2_6, K2_7, K2_8, K2_9,\
@@ -41,3 +41,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 }
 
 // clang-format on
+#define LAYOUT LAYOUT_split_3x5_2
diff --git a/keyboards/ferris/info.json b/keyboards/ferris/info.json
index d167bc3f37..93470c7253 100644
--- a/keyboards/ferris/info.json
+++ b/keyboards/ferris/info.json
@@ -3,7 +3,7 @@
     "url": "https://github.com/pierrechevalier83/ferris/",
     "maintainer": "@pierrec83",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_split_3x5_2": {
             "layout": [
                 {"x": 0, "y": 0.93},
                 {"x": 1, "y": 0.31},
diff --git a/keyboards/ferris/keymaps/default/keymap.json b/keyboards/ferris/keymaps/default/keymap.json
index f651b2d8c8..b7f635b758 100644
--- a/keyboards/ferris/keymaps/default/keymap.json
+++ b/keyboards/ferris/keymaps/default/keymap.json
@@ -3,7 +3,7 @@
     "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
     "keyboard": "ferris/0_1",
     "keymap": "default",
-    "layout": "LAYOUT",
+    "layout": "LAYOUT_split_3x5_2",
     "layers": [
         ["KC_Q"        , "KC_W"        , "KC_E"           , "KC_R"          , "KC_T",
          "KC_Y"        , "KC_U"        , "KC_I"           , "KC_O"          , "KC_P",
diff --git a/keyboards/ferris/sweep/sweep.h b/keyboards/ferris/sweep/sweep.h
index e8d66ebc67..ebfa4ede1d 100644
--- a/keyboards/ferris/sweep/sweep.h
+++ b/keyboards/ferris/sweep/sweep.h
@@ -28,7 +28,7 @@
 // readability
 #define ___ KC_NO
 
-#define LAYOUT( \
+#define LAYOUT_split_3x5_2( \
         L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \
         L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \
         L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \
@@ -45,3 +45,4 @@
         { R16, R17, ___, ___, ___ }  \
     }
 
+#define LAYOUT LAYOUT_split_3x5_2

From a3af4b09b0786e7c228828b2b3676fb7dd9a1c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reibl=20J=C3=A1nos=20D=C3=A1niel?=
 <janos.daniel.reibl@protonmail.com>
Date: Thu, 13 Jan 2022 18:16:03 +0100
Subject: [PATCH 285/867] [Keymap] Misc userspace and keymap improvements
 (#15844)

---
 keyboards/handwired/riblee_f411/config.h      |  5 +--
 keyboards/handwired/riblee_f411/rules.mk      |  7 ++-
 layouts/community/ortho_5x12/riblee/keymap.c  | 24 +++++-----
 layouts/community/ortho_5x12/riblee/readme.md | 21 +++++++--
 users/riblee/riblee.c                         | 45 +++++++------------
 users/riblee/riblee.h                         |  1 -
 6 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/keyboards/handwired/riblee_f411/config.h b/keyboards/handwired/riblee_f411/config.h
index 67399aafb1..f335871dec 100644
--- a/keyboards/handwired/riblee_f411/config.h
+++ b/keyboards/handwired/riblee_f411/config.h
@@ -29,13 +29,10 @@
 
 #define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 }
 #define MATRIX_COL_PINS { B10, B1, B0, B15, A8, B3, B4, B5, B14, A0, B8, B9 }
-#define UNUSED_PINS
+#define UNUSED_PINS { A1, A7, B2, B11, B12, B13 }
 
 #define DIODE_DIRECTION COL2ROW
 
-#define BACKLIGHT_PIN           A1
-#define BACKLIGHT_LEVELS         5
-
 #define MOUSEKEY_INTERVAL 32
 
 #define TAPPING_TERM 175
diff --git a/keyboards/handwired/riblee_f411/rules.mk b/keyboards/handwired/riblee_f411/rules.mk
index c3234dfe21..7d0652ad24 100644
--- a/keyboards/handwired/riblee_f411/rules.mk
+++ b/keyboards/handwired/riblee_f411/rules.mk
@@ -7,15 +7,14 @@ BOOTLOADER = stm32-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
-KEYBOARD_SHARED_EP = yes
+KEYBOARD_SHARED_EP = yes    # Free up some extra endpoints - needed if console+mouse+extra
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-BACKLIGHT_DRIVER = software
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
diff --git a/layouts/community/ortho_5x12/riblee/keymap.c b/layouts/community/ortho_5x12/riblee/keymap.c
index b722483759..fd748b03d4 100644
--- a/layouts/community/ortho_5x12/riblee/keymap.c
+++ b/layouts/community/ortho_5x12/riblee/keymap.c
@@ -44,15 +44,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise |  /   | Left | Down |Right |
+ * | Ctrl | GUI  | Alt  |Shift |Lower |    Space    |Raise |  /   | Left | Down |Right |
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = LAYOUT_ortho_5x12(
     KC_GRV,  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_DEL,
     KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
+    KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_RSPC, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
 ),
 
 /* Hungarian
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
-* | Brite| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise |  /   | Left | Down |Right |
+* | Ctrl | GUI  | Alt  |Shift |Lower |    Space    |Raise |  /   | Left | Down |Right |
 * `-----------------------------------------------------------------------------------'
 */
 [_HUNGARIAN] = LAYOUT_ortho_5x12(
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |  Up  |Enter |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |  /   | Left | Down |Right |
+ * | Ctrl | GUI  | Alt  |Shift |Lower |    Space    |Raise |  /   | Left | Down |Right |
  * `-----------------------------------------------------------------------------------'
  */
 [_COLEMAK] = LAYOUT_ortho_5x12(
@@ -94,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
     KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
+    KC_LCTL, KC_LGUI, KC_LALT, KC_RSPC, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
 ),
 
 /* Dvorak
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------|------+------+------+------+------+------|
  * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * | Ctrl | GUI  | Alt  |Shift |Lower |    Space    |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
 [_DVORAK] = LAYOUT_ortho_5x12(
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
     KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
     KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    KC_LCTL, KC_LGUI, KC_LALT, KC_RSPC, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 /* Workman
@@ -128,7 +128,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Shift|   Z  |   X  |   M  |   C  |   V  |   K  |   L  |   ,  |   .  |  Up  |Enter |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise |  /   | Left | Down |Right |
+ * | Ctrl | GUI  | Alt  |Shift |Lower |    Space    |Raise |  /   | Left | Down |Right |
  * `-----------------------------------------------------------------------------------'
  */
 [_WORKMAN] = LAYOUT_ortho_5x12(
@@ -136,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TAB,  KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,    KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, KC_DEL,
     KC_ESC,  KC_A,    KC_S,    KC_H,    KC_T,    KC_G,    KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,    KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
-    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
+    KC_LCTL, KC_LGUI, KC_LALT, KC_RSPC, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
 ),
 
 /* Lower
@@ -189,7 +189,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |------+------+------+------+------+-------------+------+------+------+------+------|
  * |      |      |Mu mod|Aud on|AudOff|AGnorm|AGswap|Qwerty|Colemk|Dvorak| HUN  |Wrkmn |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * |      |      |      |      |      |      | NKRO | Mac  |Linux |      |      |      |
+ * |      |      |      |      | UCM  | R_UCM| NKRO |CGNorm|CGSwap|      |      |      |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * |      |      |      |      |      |             |      |      |      |      |      |
  * `-----------------------------------------------------------------------------------'
@@ -198,7 +198,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,  KC_F11,    KC_F12,
     _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF, KC_INS,  KC_PSCR,   KC_DEL,
     _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  HUNGARIAN, WORKMAN,
-    _______, _______, _______, _______, _______, _______, NK_TOGG, CG_NORM, CG_SWAP,  _______, _______,   _______,
+    _______, _______, _______, _______, UC_MOD,  UC_RMOD, NK_TOGG, CG_NORM, CG_SWAP,  _______, _______,   _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______
 )
 
diff --git a/layouts/community/ortho_5x12/riblee/readme.md b/layouts/community/ortho_5x12/riblee/readme.md
index c792e70806..43ed0f34d1 100644
--- a/layouts/community/ortho_5x12/riblee/readme.md
+++ b/layouts/community/ortho_5x12/riblee/readme.md
@@ -14,7 +14,7 @@ Qwerty
 |------+------+------+------+------+------|------+------+------+------+------+------|
 | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
 |------+------+------+------+------+------+------+------+------+------+------+------|
-| Brite| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise |  /   | Left | Down |Right |
+| Ctrl | GUI  | Alt  |Shift |Lower |    Space    |Raise |  /   | Left | Down |Right |
 `-----------------------------------------------------------------------------------'
 
  Hungarian
@@ -27,7 +27,7 @@ Qwerty
 |------+------+------+------+------+------|------+------+------+------+------+------|
 | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
 |------+------+------+------+------+------+------+------+------+------+------+------|
-| Brite| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise |  /   | Left | Down |Right |
+| Ctrl | GUI  | Alt  |Shift |Lower |    Space    |Raise |  /   | Left | Down |Right |
 `-----------------------------------------------------------------------------------'
 
 Colemak
@@ -40,7 +40,7 @@ Colemak
 |------+------+------+------+------+------|------+------+------+------+------+------|
 | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
 |------+------+------+------+------+------+------+------+------+------+------+------|
-| Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+| Ctrl | GUI  | Alt  |Shift |Lower |    Space    |Raise | Left | Down |  Up  |Right |
 `-----------------------------------------------------------------------------------'
 
 Dvorak
@@ -53,7 +53,20 @@ Dvorak
 |------+------+------+------+------+------|------+------+------+------+------+------|
 | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
 |------+------+------+------+------+------+------+------+------+------+------+------|
-| Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+| Ctrl | GUI  | Alt  |Shift |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+`-----------------------------------------------------------------------------------'
+
+Workman
+,-----------------------------------------------------------------------------------.
+|   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| Tab  |   Q  |   D  |   R  |   W  |   B  |   J  |   F  |   U  |   P  |   ;  | Del  |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| Esc  |   A  |   S  |   H  |   T  |   G  |   Y  |   N  |   E  |   O  |   I  |  '   |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| Shift|   Z  |   X  |   M  |   C  |   V  |   K  |   L  |   ,  |   .  |  Up  |Enter |
+|------+------+------+------+------+------+------+------+------+------+------+------|
+| Ctrl | GUI  | Alt  |Shift |Lower |    Space    |Raise |  /   | Left | Down |Right |
 `-----------------------------------------------------------------------------------'
 
 Lower
diff --git a/users/riblee/riblee.c b/users/riblee/riblee.c
index 307c697204..02ba246f60 100644
--- a/users/riblee/riblee.c
+++ b/users/riblee/riblee.c
@@ -18,15 +18,13 @@
 #include "raw_hid.h"
 #include <string.h>
 
-const uint8_t shift = MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT);
-
 // Tap Dance functions
 void dance_key_a (qk_tap_dance_state_t *state, void *user_data) {
     if (state->count == 1) {
         SEND_STRING("a");
         reset_tap_dance(state);
     } else if (state->count == 2) {
-        if (!(keyboard_report->mods & shift)) {
+        if (!(keyboard_report->mods & MOD_MASK_SHIFT)) {
             send_unicode_string("á");
         } else {
             send_unicode_string("Á");
@@ -41,7 +39,7 @@ void dance_key_e (qk_tap_dance_state_t *state, void *user_data) {
         SEND_STRING("e");
         reset_tap_dance(state);
     } else if (state->count == 2) {
-        if (!(keyboard_report->mods & shift)) {
+        if (!(keyboard_report->mods & MOD_MASK_SHIFT)) {
             send_unicode_string("é");
         } else {
             send_unicode_string("É");
@@ -56,7 +54,7 @@ void dance_key_i (qk_tap_dance_state_t *state, void *user_data) {
         SEND_STRING("i");
         reset_tap_dance(state);
     } else if (state->count == 2) {
-        if (!(keyboard_report->mods & shift)) {
+        if (!(keyboard_report->mods & MOD_MASK_SHIFT)) {
             send_unicode_string("í");
         } else {
             send_unicode_string("Í");
@@ -71,7 +69,7 @@ void dance_key_o (qk_tap_dance_state_t *state, void *user_data) {
         SEND_STRING("o");
         reset_tap_dance(state);
     } else if (state->count == 2) {
-        if (!(keyboard_report->mods & shift)) {
+        if (!(keyboard_report->mods & MOD_MASK_SHIFT)) {
             send_unicode_string("ó");
         } else {
             send_unicode_string("Ó");
@@ -79,7 +77,7 @@ void dance_key_o (qk_tap_dance_state_t *state, void *user_data) {
 
         reset_tap_dance(state);
     } else if (state->count == 3) {
-        if (!(keyboard_report->mods & shift)) {
+        if (!(keyboard_report->mods & MOD_MASK_SHIFT)) {
             send_unicode_string("ö");
         } else {
             send_unicode_string("Ö");
@@ -87,7 +85,7 @@ void dance_key_o (qk_tap_dance_state_t *state, void *user_data) {
 
         reset_tap_dance(state);
     } else if (state->count == 4) {
-        if (!(keyboard_report->mods & shift)) {
+        if (!(keyboard_report->mods & MOD_MASK_SHIFT)) {
             send_unicode_string("ő");
         } else {
             send_unicode_string("Ő");
@@ -102,7 +100,7 @@ void dance_key_u (qk_tap_dance_state_t *state, void *user_data) {
         SEND_STRING("u");
         reset_tap_dance(state);
     } else if (state->count == 2) {
-        if (!(keyboard_report->mods & shift)) {
+        if (!(keyboard_report->mods & MOD_MASK_SHIFT)) {
             send_unicode_string("ú");
         } else {
             send_unicode_string("Ú");
@@ -110,7 +108,7 @@ void dance_key_u (qk_tap_dance_state_t *state, void *user_data) {
 
         reset_tap_dance(state);
     } else if (state->count == 3) {
-        if (!(keyboard_report->mods & shift)) {
+        if (!(keyboard_report->mods & MOD_MASK_SHIFT)) {
             send_unicode_string("ü");
         } else {
             send_unicode_string("Ü");
@@ -118,7 +116,7 @@ void dance_key_u (qk_tap_dance_state_t *state, void *user_data) {
 
         reset_tap_dance(state);
     } else if (state->count == 4) {
-        if (!(keyboard_report->mods & shift)) {
+        if (!(keyboard_report->mods & MOD_MASK_SHIFT)) {
             send_unicode_string("ű");
         } else {
             send_unicode_string("Ű");
@@ -164,23 +162,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
             return false;
             break;
-        case BACKLIT:
-            if (record->event.pressed) {
-                register_code(keycode_config(KC_LGUI));
-#ifdef BACKLIGHT_ENABLE
-                backlight_step();
-#endif
-            } else {
-                unregister_code(keycode_config(KC_LGUI));
-            }
-            return false;
-            break;
-        case CG_NORM:
-            set_unicode_input_mode(UC_MAC);
-            break;
-        case CG_SWAP:
-            set_unicode_input_mode(UC_LNX);
-            break;
     }
     return true;
 };
@@ -287,3 +268,11 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
 #endif
 
 #endif
+
+void keyboard_pre_init_user(void) {
+    // Set C13 pin as output
+    setPinOutput(C13);
+
+    // Turn off the LED
+    writePinHigh(C13);
+}
\ No newline at end of file
diff --git a/users/riblee/riblee.h b/users/riblee/riblee.h
index f7340d50b2..786e4c31ab 100644
--- a/users/riblee/riblee.h
+++ b/users/riblee/riblee.h
@@ -35,7 +35,6 @@ enum custom_keycodes {
     COLEMAK,
     DVORAK,
     WORKMAN,
-    BACKLIT
 };
 
 #define LOWER MO(_LOWER)

From 2c8098ea8839d242a5037821d6ba0255637cd15e Mon Sep 17 00:00:00 2001
From: Alin Marin Elena <alin@elena.space>
Date: Thu, 13 Jan 2022 17:16:26 +0000
Subject: [PATCH 286/867] [Keyboard] move enum_layers in keymaps, in sync with
 the other mlego/m* (#15832)

---
 keyboards/mlego/m48/keymaps/default/keymap.c | 50 ++++++++++++++++----
 keyboards/mlego/m48/keymaps/via/keymap.c     | 50 ++++++++++++++++----
 keyboards/mlego/m48/m48.h                    | 30 ------------
 3 files changed, 84 insertions(+), 46 deletions(-)

diff --git a/keyboards/mlego/m48/keymaps/default/keymap.c b/keyboards/mlego/m48/keymaps/default/keymap.c
index 8a76993c07..df9e1bb46e 100644
--- a/keyboards/mlego/m48/keymaps/default/keymap.c
+++ b/keyboards/mlego/m48/keymaps/default/keymap.c
@@ -17,6 +17,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
 #ifdef RGBLIGHT_ENABLE
 
 const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
@@ -148,14 +155,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
     }
 }
 
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    my_encoders(index, clockwise);
-    return true;
-}
-#endif
-
 layer_state_t layer_state_set_user(layer_state_t state) {
 #ifdef RGBLIGHT_ENABLE
 
@@ -180,3 +179,38 @@ void keyboard_post_init_user(void) {
     rgblight_layers = my_rgb_layers;
 }
 #endif
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
diff --git a/keyboards/mlego/m48/keymaps/via/keymap.c b/keyboards/mlego/m48/keymaps/via/keymap.c
index 54ef03cd5a..af625ef207 100644
--- a/keyboards/mlego/m48/keymaps/via/keymap.c
+++ b/keyboards/mlego/m48/keymaps/via/keymap.c
@@ -17,6 +17,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
 #ifdef RGBLIGHT_ENABLE
 
 const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
@@ -103,14 +110,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
     }
 }
 
-#ifdef ENCODER_ENABLE
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    my_encoders(index, clockwise);
-    return true;
-}
-#endif
-
 layer_state_t layer_state_set_user(layer_state_t state) {
 #ifdef RGBLIGHT_ENABLE
 
@@ -135,3 +134,38 @@ void keyboard_post_init_user(void) {
     rgblight_layers = my_rgb_layers;
 }
 #endif
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
diff --git a/keyboards/mlego/m48/m48.h b/keyboards/mlego/m48/m48.h
index 766f38124c..f9ef8aee39 100644
--- a/keyboards/mlego/m48/m48.h
+++ b/keyboards/mlego/m48/m48.h
@@ -31,7 +31,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }  \
 }
 
-enum layer_names { _QW = 0, _LWR, _RSE, _ADJ };
 static inline void led_lwr(const bool on) {
 #ifdef LED_NUM_LOCK_PIN
     writePin(LED_NUM_LOCK_PIN, on);
@@ -49,32 +48,3 @@ static inline void led_caps(const bool on) {
 #endif
 }
 
-#ifdef ENCODER_ENABLE
-
-#    define MEDIA_KEY_DELAY 10
-
-static inline void my_encoders(const uint8_t index, const bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (IS_LAYER_ON(_LWR)) {
-            if (clockwise) {
-                rgblight_decrease_val_noeeprom();
-            } else {
-                rgblight_increase_val_noeeprom();
-            }
-        } else if (IS_LAYER_ON(_RSE)) {
-            if (clockwise) {
-                rgblight_decrease_hue_noeeprom();
-            } else {
-                rgblight_increase_hue_noeeprom();
-            }
-
-        } else {
-            if (clockwise) {
-                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
-            } else {
-                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
-            }
-        }
-    }
-}
-#endif

From d1eac293542a622ad2d35b490340ca8baf2997f0 Mon Sep 17 00:00:00 2001
From: Alin Marin Elena <alin@elena.space>
Date: Thu, 13 Jan 2022 17:16:59 +0000
Subject: [PATCH 287/867] [Keyboard] remove duplicate m65 (#15831)

---
 keyboards/m65/config.h                  |  33 -------
 keyboards/m65/info.json                 |  81 -----------------
 keyboards/m65/keymaps/default/config.h  |  20 -----
 keyboards/m65/keymaps/default/keymap.c  | 113 -----------------------
 keyboards/m65/keymaps/default/readme.md |  13 ---
 keyboards/m65/keymaps/dk/config.h       |  20 -----
 keyboards/m65/keymaps/dk/keymap.c       | 114 ------------------------
 keyboards/m65/keymaps/dk/readme.md      |  13 ---
 keyboards/m65/keymaps/uk/config.h       |  20 -----
 keyboards/m65/keymaps/uk/keymap.c       | 114 ------------------------
 keyboards/m65/keymaps/uk/readme.md      |  13 ---
 keyboards/m65/m65.c                     |  19 ----
 keyboards/m65/m65.h                     |  34 -------
 keyboards/m65/readme.md                 |  22 -----
 keyboards/m65/rev1/chconf.h             |  29 ------
 keyboards/m65/rev1/config.h             |  32 -------
 keyboards/m65/rev1/mcuconf.h            |  27 ------
 keyboards/m65/rev1/readme.md            |   0
 keyboards/m65/rev1/rules.mk             |  18 ----
 19 files changed, 735 deletions(-)
 delete mode 100644 keyboards/m65/config.h
 delete mode 100644 keyboards/m65/info.json
 delete mode 100644 keyboards/m65/keymaps/default/config.h
 delete mode 100644 keyboards/m65/keymaps/default/keymap.c
 delete mode 100644 keyboards/m65/keymaps/default/readme.md
 delete mode 100644 keyboards/m65/keymaps/dk/config.h
 delete mode 100644 keyboards/m65/keymaps/dk/keymap.c
 delete mode 100644 keyboards/m65/keymaps/dk/readme.md
 delete mode 100644 keyboards/m65/keymaps/uk/config.h
 delete mode 100644 keyboards/m65/keymaps/uk/keymap.c
 delete mode 100644 keyboards/m65/keymaps/uk/readme.md
 delete mode 100644 keyboards/m65/m65.c
 delete mode 100644 keyboards/m65/m65.h
 delete mode 100644 keyboards/m65/readme.md
 delete mode 100644 keyboards/m65/rev1/chconf.h
 delete mode 100644 keyboards/m65/rev1/config.h
 delete mode 100644 keyboards/m65/rev1/mcuconf.h
 delete mode 100644 keyboards/m65/rev1/readme.md
 delete mode 100644 keyboards/m65/rev1/rules.mk

diff --git a/keyboards/m65/config.h b/keyboards/m65/config.h
deleted file mode 100644
index 49db1720a7..0000000000
--- a/keyboards/m65/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2021 Alin M Elena <alinm.elena@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "config_common.h"
-
-#define VENDOR_ID       0xBABA
-#define MANUFACTURER    Alin Elena
-#define PRODUCT         m65
-
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 13
-
-#define DIODE_DIRECTION COL2ROW
-#define DEBOUNCE 5
-
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/m65/info.json b/keyboards/m65/info.json
deleted file mode 100644
index 966a949466..0000000000
--- a/keyboards/m65/info.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "keyboard_name": "M65",
-    "keyboard_folder": "m65",
-    "url": "https://alin.elena.space/blog/keeblego/",
-    "maintainer": "alinelena",
-    "layouts": {
-        "LAYOUT_ortho_5x13": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-                {"x": 6, "y": 1},
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 4},
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4}
-                {"x": 12, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/m65/keymaps/default/config.h b/keyboards/m65/keymaps/default/config.h
deleted file mode 100644
index aabd6a2be6..0000000000
--- a/keyboards/m65/keymaps/default/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2021 Alin M Elena <alinm.elena@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/m65/keymaps/default/keymap.c b/keyboards/m65/keymaps/default/keymap.c
deleted file mode 100644
index 13093408b2..0000000000
--- a/keyboards/m65/keymaps/default/keymap.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-Copyright 2021 Alin M Elena <alinm.elena@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-
-enum layer_names { _QW = 0, _LWR, _RSE, _ADJ };
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QW] = LAYOUT_ortho_5x13(
-       KC_ESC, KC_1   , KC_2    , KC_3   , KC_4    , KC_5  , KC_6  , KC_7  , KC_8   , KC_9   , KC_0   , KC_MINS, KC_BSPC ,
-       KC_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_NUHS, 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_LSPO, KC_NUBS, KC_Z    , KC_X   , KC_C    , KC_V  , KC_B  , KC_N  , KC_M   , KC_COMM, KC_DOT , KC_UP  , KC_SLSH ,
-      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  [_LWR] = LAYOUT_ortho_5x13(
-       KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , KC_EQL  ,
-       KC_BTN3, 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_BTN2, 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_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS ,
-       KC_TRNS, KC_BTN4, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R),
-
-  [_RSE] = LAYOUT_ortho_5x13(
-      KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12  ,
-      KC_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_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_U, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R),
-
-  [_ADJ] = LAYOUT_ortho_5x13(
-      KC_TRNS, KC_TRNS, A(KC_F2), 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, RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
-// clang-format on
-
-// let us assume we start with both layers off
-bool toggle_lwr = false;
-bool toggle_rse = false;
-
-static inline void led_lwr(const bool on) {
-#ifdef LED_NUM_LOCK_PIN
-    writePin(LED_NUM_LOCK_PIN, on);
-#endif
-}
-
-static inline void led_rse(const bool on) {
-#ifdef LED_SCROLL_LOCK_PIN
-    writePin(LED_SCROLL_LOCK_PIN, on);
-#endif
-}
-
-static inline void led_caps(const bool on) {
-#ifdef LED_CAPS_LOCK_PIN
-    writePin(LED_CAPS_LOCK_PIN, on);
-#endif
-}
-
-bool led_update_user(led_t led_state) {
-    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
-    return false;
-}
-
-void matrix_scan_user(void) {
-    led_lwr(toggle_lwr);
-    led_rse(toggle_rse);
-    led_t led_state = host_keyboard_led_state();
-    led_caps(!led_state.caps_lock);
-    if (layer_state_is(_ADJ)) {
-        led_lwr(true);
-        led_rse(true);
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case (TT(_LWR)):
-            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
-                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
-                toggle_lwr = !layer_state_is(_LWR);
-            }
-            return true;
-            break;
-        case (TT(_RSE)):
-            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
-                toggle_rse = !layer_state_is(_RSE);
-            }
-            return true;
-            break;
-        default:
-            return true;
-    }
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LWR, _RSE, _ADJ); }
diff --git a/keyboards/m65/keymaps/default/readme.md b/keyboards/m65/keymaps/default/readme.md
deleted file mode 100644
index ae71342232..0000000000
--- a/keyboards/m65/keymaps/default/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-![M65 Layout Image](https://i.imgur.com/Z2O8yhGh.png)
-
-# Default M65 Layout
-
-This is the default layout for M65. For the most part it's a straightforward and easy to follow layout inspired by ISO with a UK
-turn.  The only unusual key is the key in the upper left, which sends Escape normally, but Grave when in layer 1 aka LWR.  Similarly
-number row in layer 1 give the usual audio KC_GRV, KC_AUDIO_MUTE,  KC_AUDIO_VOL_UP,  KC_AUDIO_VOL_DOWN,   KC_MEDIA_PREV_TRACK,
-KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK, M_EXTDISP,  KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PSCREEN, KC_DEL, KC_EQL in layer 2 aka
-RSE one gets F1-F12 mouse emulation can be used in layer 1 and 2.
-
-flashing is done by LWR+RSE+r
-
-full layout below see in keymap.c
diff --git a/keyboards/m65/keymaps/dk/config.h b/keyboards/m65/keymaps/dk/config.h
deleted file mode 100644
index aabd6a2be6..0000000000
--- a/keyboards/m65/keymaps/dk/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2021 Alin M Elena <alinm.elena@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/m65/keymaps/dk/keymap.c b/keyboards/m65/keymaps/dk/keymap.c
deleted file mode 100644
index 4a26f4eeda..0000000000
--- a/keyboards/m65/keymaps/dk/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-Copyright 2021 Alin M Elena <alinm.elena@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-#include "keymap_danish.h"
-
-enum layer_names { _QW = 0, _LWR, _RSE, _ADJ };
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QW] = LAYOUT_ortho_5x13(
-       KC_ESC, DK_1   , DK_2    , DK_3   , DK_4    , DK_5  , DK_6  , DK_7  , DK_8   , DK_9   , DK_0   , DK_PLUS, KC_BSPC ,
-       KC_TAB, DK_Q   , DK_W    , DK_E   , DK_R    , DK_T  , DK_Y  , DK_U  , DK_I   , DK_O   , DK_P   , DK_ARNG, DK_DIAE ,
-      DK_QUOT, DK_A   , DK_S    , DK_D   , DK_F    , DK_G  , DK_H  , DK_J  , DK_K   , DK_L   , DK_AE  , DK_OSTR, KC_ENT  ,
-      KC_LSPO, DK_LABK, DK_Z    , DK_X   , DK_C    , DK_V  , DK_B  , DK_N  , DK_M   , DK_COMM, DK_DOT , KC_UP  , DK_MINS ,
-      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  [_LWR] = LAYOUT_ortho_5x13(
-       DK_HALF, KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , DK_ACUT  ,
-       KC_BTN3, 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_BTN2, 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_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS ,
-       KC_TRNS, KC_BTN4, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R),
-
-  [_RSE] = LAYOUT_ortho_5x13(
-      KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12  ,
-      KC_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_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_U, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R),
-
-  [_ADJ] = LAYOUT_ortho_5x13(
-      KC_TRNS, KC_TRNS, A(KC_F2), 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, RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
-// clang-format on
-
-// let us assume we start with both layers off
-bool toggle_lwr = false;
-bool toggle_rse = false;
-
-static inline void led_lwr(const bool on) {
-#ifdef LED_NUM_LOCK_PIN
-    writePin(LED_NUM_LOCK_PIN, on);
-#endif
-}
-
-static inline void led_rse(const bool on) {
-#ifdef LED_SCROLL_LOCK_PIN
-    writePin(LED_SCROLL_LOCK_PIN, on);
-#endif
-}
-
-static inline void led_caps(const bool on) {
-#ifdef LED_CAPS_LOCK_PIN
-    writePin(LED_CAPS_LOCK_PIN, on);
-#endif
-}
-
-bool led_update_user(led_t led_state) {
-    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
-    return false;
-}
-
-void matrix_scan_user(void) {
-    led_lwr(toggle_lwr);
-    led_rse(toggle_rse);
-    led_t led_state = host_keyboard_led_state();
-    led_caps(!led_state.caps_lock);
-    if (layer_state_is(_ADJ)) {
-        led_lwr(true);
-        led_rse(true);
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case (TT(_LWR)):
-            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
-                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
-                toggle_lwr = !layer_state_is(_LWR);
-            }
-            return true;
-            break;
-        case (TT(_RSE)):
-            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
-                toggle_rse = !layer_state_is(_RSE);
-            }
-            return true;
-            break;
-        default:
-            return true;
-    }
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LWR, _RSE, _ADJ); }
diff --git a/keyboards/m65/keymaps/dk/readme.md b/keyboards/m65/keymaps/dk/readme.md
deleted file mode 100644
index 06fed3bda6..0000000000
--- a/keyboards/m65/keymaps/dk/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-![M65 Layout Image](https://i.imgur.com/RQqsM4gh.png)
-
-# Default M65 Layout
-
-This is the Danish keymap for M65. For the most part it's a straightforward and easy to follow layout inspired by ISO with a DK
-turn.  The only unusual key is the key in the upper left, which sends Escape normally, but Grave when in layer 1 aka LWR.  Similarly
-number row in layer 1 give the usual audio KC_GRV, KC_AUDIO_MUTE,  KC_AUDIO_VOL_UP,  KC_AUDIO_VOL_DOWN,   KC_MEDIA_PREV_TRACK,
-KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK, M_EXTDISP,  KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PSCREEN, KC_DEL, DK_ACUT in layer 2 aka
-RSE one gets F1-F12 mouse emulation can be used in layer 1 and 2.
-
-flashing is done by LWR+RSE+r
-
-full layout below see in keymap.c
diff --git a/keyboards/m65/keymaps/uk/config.h b/keyboards/m65/keymaps/uk/config.h
deleted file mode 100644
index aabd6a2be6..0000000000
--- a/keyboards/m65/keymaps/uk/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2021 Alin M Elena <alinm.elena@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define TAPPING_TOGGLE 2
diff --git a/keyboards/m65/keymaps/uk/keymap.c b/keyboards/m65/keymaps/uk/keymap.c
deleted file mode 100644
index 0f426f6149..0000000000
--- a/keyboards/m65/keymaps/uk/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-Copyright 2021 Alin M Elena <alinm.elena@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include QMK_KEYBOARD_H
-#include "keymap_uk.h"
-
-enum layer_names { _QW = 0, _LWR, _RSE, _ADJ };
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  [_QW] = LAYOUT_ortho_5x13(
-       KC_ESC, UK_1   , UK_2    , UK_3   , UK_4    , UK_5  , UK_6  , UK_7  , UK_8   , UK_9   , UK_0   , UK_MINS, KC_BSPC ,
-       KC_TAB, UK_Q   , UK_W    , UK_E   , UK_R    , UK_T  , UK_Y  , UK_U  , UK_I   , UK_O   , UK_P   , UK_LBRC, UK_RBRC ,
-      UK_HASH, UK_A   , UK_S    , UK_D   , UK_F    , UK_G  , UK_H  , UK_J  , UK_K   , UK_L   , UK_SCLN, UK_QUOT, KC_ENT  ,
-      KC_LSPO, UK_BSLS, UK_Z    , UK_X   , UK_C    , UK_V  , UK_B  , UK_N  , UK_M   , UK_COMM, UK_DOT , KC_UP  , UK_SLSH ,
-      KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
-
-  [_LWR] = LAYOUT_ortho_5x13(
-       KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , UK_EQL  ,
-       KC_BTN3, 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_BTN2, 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_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS ,
-       KC_TRNS, KC_BTN4, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R),
-
-  [_RSE] = LAYOUT_ortho_5x13(
-      KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12  ,
-      KC_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_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_U, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_R),
-
-  [_ADJ] = LAYOUT_ortho_5x13(
-      KC_TRNS, KC_TRNS, A(KC_F2), 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, RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
-      KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-};
-// clang-format on
-
-// let us assume we start with both layers off
-bool toggle_lwr = false;
-bool toggle_rse = false;
-
-static inline void led_lwr(const bool on) {
-#ifdef LED_NUM_LOCK_PIN
-    writePin(LED_NUM_LOCK_PIN, on);
-#endif
-}
-
-static inline void led_rse(const bool on) {
-#ifdef LED_SCROLL_LOCK_PIN
-    writePin(LED_SCROLL_LOCK_PIN, on);
-#endif
-}
-
-static inline void led_caps(const bool on) {
-#ifdef LED_CAPS_LOCK_PIN
-    writePin(LED_CAPS_LOCK_PIN, on);
-#endif
-}
-
-bool led_update_user(led_t led_state) {
-    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
-    return false;
-}
-
-void matrix_scan_user(void) {
-    led_lwr(toggle_lwr);
-    led_rse(toggle_rse);
-    led_t led_state = host_keyboard_led_state();
-    led_caps(!led_state.caps_lock);
-    if (layer_state_is(_ADJ)) {
-        led_lwr(true);
-        led_rse(true);
-    }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t* record) {
-    switch (keycode) {
-        case (TT(_LWR)):
-            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
-                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
-                toggle_lwr = !layer_state_is(_LWR);
-            }
-            return true;
-            break;
-        case (TT(_RSE)):
-            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
-                toggle_rse = !layer_state_is(_RSE);
-            }
-            return true;
-            break;
-        default:
-            return true;
-    }
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) { return update_tri_layer_state(state, _LWR, _RSE, _ADJ); }
diff --git a/keyboards/m65/keymaps/uk/readme.md b/keyboards/m65/keymaps/uk/readme.md
deleted file mode 100644
index bc29d23905..0000000000
--- a/keyboards/m65/keymaps/uk/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Default M65 Layout
-
-![M65 Layout Image](https://i.imgur.com/KZFnAU5h.png)
-
-This is the default layout for M65. For the most part it's a straightforward and easy to follow layout inspired by ISO with a UK
-turn.  The only unusual key is the key in the upper left, which sends Escape normally, but Grave when in layer 1 aka LWR.  Similarly
-number row in layer 1 give the usual audio KC_GRV, KC_AUDIO_MUTE,  KC_AUDIO_VOL_UP,  KC_AUDIO_VOL_DOWN,   KC_MEDIA_PREV_TRACK,
-KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_NEXT_TRACK, M_EXTDISP,  KC_SYSTEM_SLEEP, KC_SYSTEM_WAKE, KC_PSCREEN, KC_DEL, KC_EQL in layer 2 aka
-RSE one gets F1-F12 mouse emulation can be used in layer 1 and 2.
-
-flashing is done by LWR+RSE+r
-
-full layout below see in keymap.c
diff --git a/keyboards/m65/m65.c b/keyboards/m65/m65.c
deleted file mode 100644
index 35e2b41226..0000000000
--- a/keyboards/m65/m65.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2021 Alin M Elena <alinm.elena@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "m65.h"
diff --git a/keyboards/m65/m65.h b/keyboards/m65/m65.h
deleted file mode 100644
index 50065c9f89..0000000000
--- a/keyboards/m65/m65.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright 2021 Alin M Elena <alinm.elena@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x13( \
-  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
-  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \
-  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
-  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
-  K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412  \
-) { \
-  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012 }, \
-  { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112 }, \
-  { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212 }, \
-  { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312 }, \
-  { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412 }  \
-}
diff --git a/keyboards/m65/readme.md b/keyboards/m65/readme.md
deleted file mode 100644
index 9493a3fffc..0000000000
--- a/keyboards/m65/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# M65
-
-![M65](https://i.imgur.com/gXuecush.jpg)
-
-A  (13x5) ortholinear keyboard that can be hand wired or using a pcb.
-
-* Keyboard Maintainer: [Alin Elena](https://github.com/alinelena) ([@drFaustroll on GitLab](https://gitlab.com/drFaustroll))
-* Hardware Supported: custom pcb [see](https://gitlab.com/drFaustroll/m65) STM/APM32F103C8T6, aka Black Pill
-* Hardware Availability: [custom how to](https://alin.elena.space/blog/keeblego/)
-
-
-Make example for this keyboard (after setting up your build environment):
-
-    make m65/rev1:default
-
-Flashing example for this keyboard:
-
-    make m65/rev1:default:flash
-
-To enter flashing mode, press Lower+Raise+R.
-
-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).
diff --git a/keyboards/m65/rev1/chconf.h b/keyboards/m65/rev1/chconf.h
deleted file mode 100644
index 8c43fb2697..0000000000
--- a/keyboards/m65/rev1/chconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/m65/rev1/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_TIMEDELTA 0
-
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
-#include_next <chconf.h>
-
diff --git a/keyboards/m65/rev1/config.h b/keyboards/m65/rev1/config.h
deleted file mode 100644
index 090210f254..0000000000
--- a/keyboards/m65/rev1/config.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 Alin M Elena <alinm.elena@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define DEVICE_VER      0x0001
-#define PRODUCT_ID      0x6060
-
-#define LED_NUM_LOCK_PIN B12
-#define LED_SCROLL_LOCK_PIN B13
-#define LED_CAPS_LOCK_PIN C13
-
-//                          0   1   2    3   4
-#define MATRIX_ROW_PINS { B11, B0, B1,  A2, A3 }
-//                         0    1   2   3   4   5   6   7   8    9  10  11   12
-#define MATRIX_COL_PINS {A10, A15, B3, B4, B5, B9, B8, B7, B6, C15, A0, A7, B10 }
-
-#define UNUSED_PINS
diff --git a/keyboards/m65/rev1/mcuconf.h b/keyboards/m65/rev1/mcuconf.h
deleted file mode 100644
index 20df276a5a..0000000000
--- a/keyboards/m65/rev1/mcuconf.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/m65/rev1/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef STM32_SPI_USE_SPI2
-#define STM32_SPI_USE_SPI2 FALSE
diff --git a/keyboards/m65/rev1/readme.md b/keyboards/m65/rev1/readme.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/m65/rev1/rules.mk b/keyboards/m65/rev1/rules.mk
deleted file mode 100644
index 333b20640d..0000000000
--- a/keyboards/m65/rev1/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output

From ddc4c0d2527b059bdcd53e1e364a03907cf9c9fe Mon Sep 17 00:00:00 2001
From: Lucas W <31965233+LucasWaelti@users.noreply.github.com>
Date: Thu, 13 Jan 2022 18:17:54 +0100
Subject: [PATCH 288/867] [Keymap] Kyria new custom keymap lw (#15729)

---
 keyboards/splitkb/kyria/keymaps/lw/config.h  |  26 ++
 keyboards/splitkb/kyria/keymaps/lw/keymap.c  | 251 +++++++++++++++++++
 keyboards/splitkb/kyria/keymaps/lw/readme.md | 104 ++++++++
 keyboards/splitkb/kyria/keymaps/lw/rules.mk  |   6 +
 4 files changed, 387 insertions(+)
 create mode 100644 keyboards/splitkb/kyria/keymaps/lw/config.h
 create mode 100644 keyboards/splitkb/kyria/keymaps/lw/keymap.c
 create mode 100644 keyboards/splitkb/kyria/keymaps/lw/readme.md
 create mode 100644 keyboards/splitkb/kyria/keymaps/lw/rules.mk

diff --git a/keyboards/splitkb/kyria/keymaps/lw/config.h b/keyboards/splitkb/kyria/keymaps/lw/config.h
new file mode 100644
index 0000000000..038a8ff3dd
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/lw/config.h
@@ -0,0 +1,26 @@
+/* Copyright 2022 Lucas Waelti (@LucasWaelti)
+ *
+ * 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
+
+// Lets you roll mod-tap keys
+#define IGNORE_MOD_TAP_INTERRUPT
+
+// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
+// #define SPLIT_USB_DETECT
+// #define NO_USB_STARTUP_CHECK
+
+#define UNICODE_SELECTED_MODES UC_LNX, UC_WINC // support for Linux and Windows unicode 
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/lw/keymap.c b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
new file mode 100644
index 0000000000..411295e86c
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/lw/keymap.c
@@ -0,0 +1,251 @@
+/* Copyright 2022 Lucas Waelti (@LucasWaelti)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+#include <keymap_us_international.h>
+// US_ACUT KC_QUOT // ´ (dead)
+// US_DGRV KC_GRV  // ` (dead)
+// US_DCIR S(US_6)    // ^ (dead)
+// US_DIAE S(US_ACUT) // ¨ (dead)
+
+enum layers {
+    _QWERTZ = 0,    // base text layer
+    _SYM,           // symbol layer 
+    _NAV,           // navigation layer + accents 
+};
+
+enum unicode_names {
+    APOST,
+    QUOTE,
+    CIRCUM,
+    GRAVE,
+    ACUTE,
+    UMLAUT,
+    CEDIL_MAJ,
+    CEDIL,
+    SECTION,
+    DEGREE,
+};
+
+const uint32_t PROGMEM unicode_map[] = {
+    [APOST]         = 0x0027, // '
+    [QUOTE]         = 0x0022, // "
+    [ACUTE]         = 0x00B4, // ´
+    [GRAVE]         = 0x0060, // `
+    [CIRCUM]        = 0x005E, // ^ 
+    [UMLAUT]        = 0x00A8, // ¨
+    [CEDIL_MAJ]     = 0x00C7, // Ç
+    [CEDIL]         = 0x00E7, // ç
+    [SECTION]       = 0x00A7, // §
+    [DEGREE]        = 0x00B0, // °
+};
+// usage: X(ACUTE), XP(CEDIL,CEDIL_MAJ)
+
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+/*
+ * 0. Base Layer: QWERTZ
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |  Esc   |   Q  |   W  |   E  |   R  |   T  |                              |   Z  |   U  |   I  |   O  |   P  |  Del   |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |  Tab   |   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ' "  | BkSpace|
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * | LShift |   Y  |   X  |   C  |   V  |   B  | \ |  |  ` ~ |  |  (   |   )  |   N  |   M  | ,  < | . >  | ;  : | CpLock |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |LCtrl | LGUI | LAlt | Space| MO(1)|  | MO(2)| Enter| - _  |  !   | / ?  |
+ *                        |      |      |      |      |      |  |      |/shift|      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_QWERTZ] = LAYOUT(
+  KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                                        KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,  KC_DEL,
+  KC_TAB,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                        KC_H,    KC_J,    KC_K,    KC_L, XP(APOST,QUOTE), KC_BSPC, //  XP(APOST,QUOTE) or KC_QUOT
+ KC_LSFT,    KC_Y,    KC_X,    KC_C,    KC_V,    KC_B, KC_BSLS, KC_GRV,  KC_LPRN,    KC_RPRN, KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SCLN, KC_CAPS,
+                            KC_LCTL, KC_LGUI, KC_LALT,  KC_SPC,   MO(1),   MO(2),  KC_SFTENT, KC_MINS, KC_EXLM, KC_SLSH
+    ),
+
+// /*
+//  * 1. Sym Layer: Numbers and symbols (DEPRECATED)
+//  *
+//  * ,-------------------------------------------.                              ,-------------------------------------------.
+//  * |   F1   | F2   | F3   | F4   | F5   | F6   |                              |  F7  | F8   | F9   | F10  | F11  |  F12   |
+//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+//  * |    .   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   =    |
+//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+//  * |  LAlt  |   ?  |  !   |  @   |  #   |  <   |  [   |  {   |  |  }   |  ]   |   >  |  ^   |  /   |  *   |  -   |   +    |
+//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+//  *                        |  $   |  %   |  &   |      | MO(1)|  | MO(2)| RAlt |   ~  |   _  |  |   |
+//  *                        |      |      |      |      |      |  |      |      |      |      |      |
+//  *                        `----------------------------------'  `----------------------------------'
+//  */
+//     [_SYM] = LAYOUT(
+//    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_DOT,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_PEQL,
+//  KC_LALT, KC_QUES, KC_EXLM,   KC_AT, KC_HASH,   KC_LT, KC_LBRC, KC_LCBR, KC_RCBR, KC_RBRC,   KC_GT, KC_CIRC, KC_PSLS, KC_ASTR, KC_PMNS, KC_PLUS,
+//                              KC_DLR, KC_PERC, KC_AMPR, _______,   MO(1),   MO(2), KC_RALT, KC_TILD, KC_UNDS, KC_PIPE
+//     ),
+
+/*
+ * 1. Sym Layer: Numbers and symbols
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |   F1   |  F2  |  F3  |  F4  | LAlt | PASTE|                              |   ,  |  7   |  8   |  9   |  *   |  /     |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |   F5   |  F6  |  F7  |  F8  |  @   | COPY |                              |   .  |  6   |  7   |  8   |  =   |        |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |   F9   |  F10 |  F11 |  F12 |  &   |  CUT | UNDO | FIND |  |   [  |  ]   |   0  |  1   |  2   |  3   |  +   |   -    |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |  $   |  #   |  %   |      | MO(1)|  | MO(2)|      |  \ | |  {   |   }  |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_SYM] = LAYOUT(
+  KC_F1,   KC_F2,   KC_F3,   KC_F4, KC_LALT,LCTL(KC_V),                                         KC_COMM,     KC_7,    KC_8,    KC_9,  KC_ASTR, KC_PSLS,
+  KC_F5,   KC_F6,   KC_F7,   KC_F8, KC_AT,  LCTL(KC_C),                                          KC_DOT,     KC_4,    KC_5,    KC_6,  KC_PEQL, _______,
+  KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_AMPR,LCTL(KC_X),LCTL(KC_Z), LCTL(KC_F), KC_LBRC, KC_RBRC,   KC_0,     KC_1,    KC_2,    KC_3,  KC_PLUS, KC_PMNS,
+                            KC_DLR, KC_HASH,   KC_PERC, _______,   MO(1),        MO(2), _______, KC_BSLS, KC_LCBR, KC_RCBR
+    ),
+
+/*
+ * 2. Nav Layer: Media, navigation, accents
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        | Brt+ | Next | Fwd  | Play | Vol+ |                              | Home | PgUp |  Up  | PgDn |      | Del    |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        | Brt- | Prev | Bckw | Stop | Vol- |                              |  End | Left | Down | Right|ScrLck| BkSpace|
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * | LShift |  ´   |  `   |  ^   |  ¨   | Mute |      |UC_MOD|  |RShift| Menu | PrtSc| ç/Ç  | § °  |      | SAVE | Insert |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |LCtrl | LGUI | LAlt |      | MO(1)|  | MO(2)| UNDO |  CUT | COPY | PASTE|
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_NAV] = LAYOUT(
+ _______, KC_BRIU, KC_MNXT, KC_MFFD, KC_MPLY, KC_VOLU,                                     KC_HOME, KC_PGUP,   KC_UP, KC_PGDN, _______,  KC_DEL,
+ _______, KC_BRID, KC_MPRV, KC_MRWD, KC_MSTP, KC_VOLD,                                      KC_END, KC_LEFT, KC_DOWN, KC_RGHT, KC_SLCK, KC_BSPC,
+ KC_LSFT, US_ACUT, US_DGRV, US_DCIR, US_DIAE, KC_MUTE, _______,  UC_MOD, KC_RSFT,  KC_APP, KC_PSCR, XP(CEDIL,CEDIL_MAJ), XP(SECTION,DEGREE), _______, LCTL(KC_S),  KC_INS,
+                            KC_LCTL, KC_LGUI, KC_LALT, _______,   MO(1),   MO(2), LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V)
+    ),
+
+// /*
+//  * Layer template
+//  *
+//  * ,-------------------------------------------.                              ,-------------------------------------------.
+//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
+//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
+//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
+//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+//  *                        |      |      |      |      |      |  |      |      |      |      |      |
+//  *                        |      |      |      |      |      |  |      |      |      |      |      |
+//  *                        `----------------------------------'  `----------------------------------'
+//  */
+//     [_LAYERINDEX] = LAYOUT(
+//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+//     ),
+};
+
+/* The default OLED and rotary encoder code can be found at the bottom of qmk_firmware/keyboards/splitkb/kyria/rev1/rev1.c
+ * These default settings can be overriden by your own settings in your keymap.c
+ * For your convenience, here's a copy of those settings so that you can uncomment them if you wish to apply your own modifications.
+ * DO NOT edit the rev1.c file; instead override the weakly defined default functions by your own.
+ */
+
+/* DELETE THIS LINE TO UNCOMMENT (1/2)
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
+
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        // QMK Logo and version information
+        // clang-format off
+        static const char PROGMEM qmk_logo[] = {
+            0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+            0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+            0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
+        // clang-format on
+
+        oled_write_P(qmk_logo, false);
+        oled_write_P(PSTR("Kyria rev1.0\n\n"), false);
+
+        // Host Keyboard Layer Status
+        oled_write_P(PSTR("Layer: "), false);
+        switch (get_highest_layer(layer_state|default_layer_state)) {
+            case _QWERTZ:
+                oled_write_P(PSTR("QWERTZ\n"), false);
+                break;
+            case _NAV:
+                oled_write_P(PSTR("Nav\n"), false);
+                break;
+            case _SYM:
+                oled_write_P(PSTR("Sym\n"), false);
+                break;
+            default:
+                oled_write_P(PSTR("Undefined\n"), false);
+        }
+
+        // Write host Keyboard LED Status to OLEDs
+        led_t led_usb_state = host_keyboard_led_state();
+        oled_write_P(led_usb_state.num_lock    ? PSTR("NUMLCK ") : PSTR("       "), false);
+        oled_write_P(led_usb_state.caps_lock   ? PSTR("CAPLCK ") : PSTR("       "), false);
+        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
+    } else {
+        // clang-format off
+        static const char PROGMEM kyria_logo[] = {
+            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
+            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
+            0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
+        };
+        // clang-format on
+        oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
+    }
+    return false;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+
+    if (index == 0) {
+        // Volume control
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        // Page up/Page down
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
+#endif
+// DELETE THIS LINE TO UNCOMMENT (2/2) */
diff --git a/keyboards/splitkb/kyria/keymaps/lw/readme.md b/keyboards/splitkb/kyria/keymaps/lw/readme.md
new file mode 100644
index 0000000000..67be1950ab
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/lw/readme.md
@@ -0,0 +1,104 @@
+# Kyria's lw Keymap
+
+Custom keymap for the [kyria keyboard](https://blog.splitkb.com/blog/introducing-the-kyria). It is intended to be used with an *English (US, intl. with dead keys)* keyboard layout (includes the `keymap_us_international.h` header). 
+
+This layout is mainly designed for every day writing in either English, French or German and programming. 
+
+The layout implements all accents and symbols (leveraging dead keys) found on a **swiss** keyboard. It uses Unicode for special characters. It makes use of the [Linux built-in IBus Unicode input](https://docs.qmk.fm/#/feature_unicode?id=input-modes) and relies on [WinCompose](https://github.com/samhocevar/wincompose) for Windows. 
+
+## Build this keymap
+```bash
+qmk compile -kb splitkb/kyria/rev1 -km lw
+```
+
+## Flash this keymap
+
+> **Note**: this was tested for an Elite-C microcontroller. 
+
+First, check that the bootloader is visible. For instance:
+```bash
+$ lsusb
+...
+Bus 001 Device 034: ID 03eb:2ff4 Atmel Corp. atmega32u4 DFU bootloader
+...
+```
+If the bootloader is not visible, press the reset button of the microcontroller. The bootloader should become visible when running the `lsusb` command again. 
+
+The microcontroller can now be flashed: 
+```bash
+qmk flash -kb splitkb/kyria/rev1 -km lw
+```
+> **Note**: if there is any issue, run `qmk doctor` to see whether the qmk configuration is valid. 
+
+## Implemented keymaps
+The default keymap contains 5 layers which allows it to include all keys found on an ANSI layout TKL keyboard plus media keys.
+Hardware features of the Kyria such as OLEDs, rotary encoders and underglow are also supported.
+
+The five different layers are the following:
+1. Base layer (QWERTZ)
+2. Symbols/Numbers layer
+3. Navigation layer
+
+### Base layer
+This layer is activated by default. 
+
+```
+/*
+ * 0. Base Layer: QWERTZ
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |  Esc   |   Q  |   W  |   E  |   R  |   T  |                              |   Z  |   U  |   I  |   O  |   P  |  Del   |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |  Tab   |   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  | ' "  | BkSpace|
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * | LShift |   Y  |   X  |   C  |   V  |   B  | \ |  |  ` ~ |  |  (   |   )  |   N  |   M  | ,  < | . >  | ;  : | CpLock |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |LCtrl | LGUI | LAlt | Space| MO(1)|  | MO(2)| Enter| - _  |  !   | / ?  |
+ *                        |      |      |      |      |      |  |      |/shift|      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+```
+
+Hold down the `Enter` key to make it a shift. This compensates for the poor placement of the dedicated `LShift` key. 
+
+### Symbol layer
+This layer is activated when holding `MO(1)`.
+
+```
+/*
+ * 1. Sym Layer: Numbers and symbols
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |   F1   |  F2  |  F3  |  F4  | LAlt | PASTE|                              |   ,  |  7   |  8   |  9   |  *   |  /     |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |   F5   |  F6  |  F7  |  F8  |  @   | COPY |                              |   .  |  6   |  7   |  8   |  =   |        |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |   F9   |  F10 |  F11 |  F12 |  &   |  CUT | UNDO | FIND |  |   [  |  ]   |   0  |  1   |  2   |  3   |  +   |   -    |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |  $   |  #   |  %   |      | MO(1)|  | MO(2)|      |  \ | |  {   |   }  |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+```
+
+### Navigation layer
+This layer is activated when holding `MO(2)`.
+
+```
+/*
+ * 2. Nav Layer: Media, navigation, accents
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        | Brt+ | Next | Fwd  | Play | Vol+ |                              | Home | PgUp |  Up  | PgDn |      | Del    |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        | Brt- | Prev | Bckw | Stop | Vol- |                              |  End | Left | Down | Right|ScrLck| BkSpace|
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * | LShift |  ´   |  `   |  ^   |  ¨   | Mute |      |UC_MOD|  |RShift| Menu | PrtSc| ç/Ç  | § °  |      | SAVE | Insert |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |LCtrl | LGUI | LAlt |      | MO(1)|  | MO(2)| UNDO |  CUT | COPY | PASTE|
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+```
+
+The key `UC_MOD` allows to switch between Linux and Windows unicode. Note however that [WinCompose](https://github.com/samhocevar/wincompose) must be installed on Windows (simply download and install the latest release and it will run). 
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/lw/rules.mk b/keyboards/splitkb/kyria/keymaps/lw/rules.mk
new file mode 100644
index 0000000000..41156dd41c
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/lw/rules.mk
@@ -0,0 +1,6 @@
+OLED_ENABLE = no 
+OLED_DRIVER = SSD1306	# Enables the use of OLED displays
+ENCODER_ENABLE = no     # Enables the use of one or more encoders
+RGBLIGHT_ENABLE = no    # Enable keyboard RGB underglow
+
+UNICODEMAP_ENABLE = yes	# Enable unicode 
\ No newline at end of file

From 5c583851f965920a84847940b73562d5f26b5846 Mon Sep 17 00:00:00 2001
From: Dmitriy Kuminov <coding@dmik.org>
Date: Thu, 13 Jan 2022 20:18:20 +0300
Subject: [PATCH 289/867] [Keyboard] Add Dactyl Manuform 6x6_4 and Kinesis
 keyboards (#15475)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../handwired/dactyl_manuform/6x6_4/6x6_4.c   |   5 +
 .../handwired/dactyl_manuform/6x6_4/6x6_4.h   |  37 ++++++
 .../handwired/dactyl_manuform/6x6_4/config.h  |  40 +++++++
 .../handwired/dactyl_manuform/6x6_4/info.json | 108 ++++++++++++++++++
 .../6x6_4/keymaps/default/keymap.c            |  52 +++++++++
 .../handwired/dactyl_manuform/6x6_4/rules.mk  |  19 +++
 .../dactyl_manuform/6x6_kinesis/6x6_kinesis.c |   5 +
 .../dactyl_manuform/6x6_kinesis/6x6_kinesis.h |  37 ++++++
 .../dactyl_manuform/6x6_kinesis/config.h      |  40 +++++++
 .../dactyl_manuform/6x6_kinesis/info.json     | 108 ++++++++++++++++++
 .../6x6_kinesis/keymaps/default/keymap.c      |  52 +++++++++
 .../dactyl_manuform/6x6_kinesis/readme.md     |  85 ++++++++++++++
 .../dactyl_manuform/6x6_kinesis/rules.mk      |  19 +++
 .../dactyl_manuform/dactyl_manuform.h         |   4 +
 14 files changed, 611 insertions(+)
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_4/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_4/info.json
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md
 create mode 100644 keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk

diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c
new file mode 100644
index 0000000000..ad213e2b75
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c
@@ -0,0 +1,5 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "6x6_4.h"
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
new file mode 100644
index 0000000000..7c767cae7e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h
@@ -0,0 +1,37 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "dactyl_manuform.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_6x6_4( \
+    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+    L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+    L40, L41, L42, L43, L44, L45,                          R40, R41, R42, R43, R44, R45, \
+    L50, L51, L52, L53,                                              R52, R53, R54, R55, \
+                        L54, L55,                          R50, R51, \
+                                  L64, L65,      R60, R61, \
+                                  L62, L63,      R62, R63 \
+) { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, L31, L32, L33, L34, L35 }, \
+    { L40, L41, L42, L43, L44, L45 }, \
+    { L50, L51, L52, L53, L54, L55 }, \
+    { XXX, XXX, L62, L63, L64, L65 }, \
+\
+    { R00, R01, R02, R03, R04, R05 }, \
+    { R10, R11, R12, R13, R14, R15 }, \
+    { R20, R21, R22, R23, R24, R25 }, \
+    { R30, R31, R32, R33, R34, R35 }, \
+    { R40, R41, R42, R43, R44, R45 }, \
+    { R50, R51, R52, R53, R54, R55 }, \
+    { R60, R61, R62, R63, XXX, XXX } \
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/config.h b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
new file mode 100644
index 0000000000..8f965f6957
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/config.h
@@ -0,0 +1,40 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+#define PRODUCT_ID 0x3636
+#define DEVICE_VER 0x0001
+#define PRODUCT    Dactyl-Manuform (6x6+4)
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 14
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
+#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
+
+#define DIODE_DIRECTION COL2ROW
+
+// WS2812 RGB LED strip input and number of LEDs
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
new file mode 100644
index 0000000000..470e775c0e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Dactyl Manuform 6x6 4 extra keys",
+    "url": "",
+    "maintainer": "dmik",
+    "layouts": {
+        "LAYOUT_6x6_4": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+
+                {"x": 0, "y": 5},
+                {"x": 1, "y": 5},
+                {"x": 2, "y": 5},
+                {"x": 3, "y": 5},
+
+                {"x": 13, "y": 5},
+                {"x": 14, "y": 5},
+                {"x": 15, "y": 5},
+                {"x": 16, "y": 5},
+
+                {"x": 4, "y": 6},
+                {"x": 5, "y": 6},
+
+                {"x": 11, "y": 6},
+                {"x": 12, "y": 6},
+
+                {"x": 6, "y": 7},
+                {"x": 7, "y": 7},
+
+                {"x": 9, "y": 7},
+                {"x": 10, "y": 7},
+
+                {"x": 6, "y": 8},
+                {"x": 7, "y": 8},
+
+                {"x": 9, "y": 8},
+                {"x": 10, "y": 8}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9b4de373ec
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_6x6_4(
+        KC_F1  , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 ,                         KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,KC_F12 ,
+        KC_ESC , KC_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_MINS,
+        KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
+        KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
+        _______,_______, KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,_______,_______,
+                                         RAISE,KC_SPC,                        KC_ENT, LOWER,
+                                         KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
+                                         KC_BSPC, KC_GRV,                        KC_LGUI, KC_LALT
+    ),
+
+    [_LOWER] = LAYOUT_6x6_4(
+        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_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                        KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
+        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
+        _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN,                        KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
+        _______,_______,_______,_______,_______,_______,                        _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS,
+                                _______,_______,_______,KC_PSCR,            _______, KC_P0,_______,_______,
+                                                _______,_______,            _______,_______,
+                                                _______,_______,            _______,_______,
+                                                _______,_______,            _______,_______
+    ),
+
+    [_RAISE] = LAYOUT_6x6_4(
+        KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
+        _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+        _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
+        _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD,
+        _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,_______,
+                                _______,_______,_______,_______,            KC_EQL ,_______,_______,_______,
+                                                _______,_______,            _______,_______,
+                                               _______,_______,            _______,_______,
+                                               _______,_______,            _______,_______
+    )
+};
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
new file mode 100644
index 0000000000..0415379827
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c
new file mode 100644
index 0000000000..a564360b48
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c
@@ -0,0 +1,5 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "6x6_kinesis.h"
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
new file mode 100644
index 0000000000..00f931281b
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h
@@ -0,0 +1,37 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "dactyl_manuform.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_6x6_kinesis( \
+    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+    L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+    L40, L41, L42, L43, L44, L45,                          R40, R41, R42, R43, R44, R45, \
+    L50, L51, L52, L53,                                              R52, R53, R54, R55, \
+                        L54, L55,                          R50, R51, \
+                                  L64, L65,      R60, R61, \
+                                  L62, L63,      R62, R63 \
+) { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, L31, L32, L33, L34, L35 }, \
+    { L40, L41, L42, L43, L44, L45 }, \
+    { L50, L51, L52, L53, L54, L55 }, \
+    { XXX, XXX, L62, L63, L64, L65 }, \
+\
+    { R00, R01, R02, R03, R04, R05 }, \
+    { R10, R11, R12, R13, R14, R15 }, \
+    { R20, R21, R22, R23, R24, R25 }, \
+    { R30, R31, R32, R33, R34, R35 }, \
+    { R40, R41, R42, R43, R44, R45 }, \
+    { R50, R51, R52, R53, R54, R55 }, \
+    { R60, R61, R62, R63, XXX, XXX } \
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
new file mode 100644
index 0000000000..8f965f6957
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h
@@ -0,0 +1,40 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+#define PRODUCT_ID 0x3636
+#define DEVICE_VER 0x0001
+#define PRODUCT    Dactyl-Manuform (6x6+4)
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 14
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
+#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
+
+#define DIODE_DIRECTION COL2ROW
+
+// WS2812 RGB LED strip input and number of LEDs
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 12
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
new file mode 100644
index 0000000000..e106a04c69
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Dactyl Manuform 6x6 Kinesis Advantage edition",
+    "url": "",
+    "maintainer": "dmik",
+    "layouts": {
+        "LAYOUT_6x6_kinesis": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+
+                {"x": 1, "y": 5},
+                {"x": 2, "y": 5},
+                {"x": 3, "y": 5},
+                {"x": 4, "y": 5},
+
+                {"x": 12, "y": 5},
+                {"x": 13, "y": 5},
+                {"x": 14, "y": 5},
+                {"x": 15, "y": 5},
+
+                {"x": 5, "y": 7, "h": 2},
+                {"x": 6, "y": 7, "h": 2},
+
+                {"x": 10, "y": 7, "h": 2},
+                {"x": 11, "y": 7, "h": 2},
+
+                {"x": 6, "y": 6},
+                {"x": 7, "y": 6},
+
+                {"x": 9, "y": 6},
+                {"x": 10, "y": 6},
+
+                {"x": 7, "y": 8},
+                {"x": 7, "y": 7},
+
+                {"x": 9, "y": 7},
+                {"x": 9, "y": 8}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2ef9794d6d
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2021 Dmitriy Kuminov (@dmik)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_6x6_kinesis(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                         KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_CAPS,
+        KC_EQL , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                         KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS,
+        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_LCTL, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   ,                         KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,                         KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+                 KC_GRV , LOWER  , KC_LEFT, KC_RGHT,                                           KC_UP  , KC_DOWN, KC_LBRC, KC_RBRC,
+                                            KC_BSPC, KC_DEL ,                         KC_ENT , KC_SPC ,
+                                            KC_LGUI, KC_LALT,                         KC_RCTL, KC_RGUI,
+                                            KC_END , KC_HOME,                         KC_PGUP, KC_PGDN
+    ),
+
+    [_LOWER] = LAYOUT_6x6_kinesis(
+        _______, KC_F11 , KC_F12 , _______, _______, _______,                         KC_BRID, KC_BRIU, KC_MUTE, KC_VOLD, KC_VOLU, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______,                                           _______, _______, _______, _______,
+                                            _______, KC_INS ,                         _______, _______,
+                                            _______, _______,                         _______, _______,
+                                            _______, _______,                         _______, _______
+    ),
+
+    [_RAISE] = LAYOUT_6x6_kinesis(
+        _______, KC_F11 , KC_F12 , _______, _______, _______,                         KC_BRID, KC_BRIU, KC_MUTE, KC_VOLD, KC_VOLU, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                         _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______,                                           _______, _______, _______, _______,
+                                            _______, KC_INS ,                         _______, _______,
+                                            _______, _______,                         _______, _______,
+                                            _______, _______,                         _______, _______
+    ),
+};
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md b/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md
new file mode 100644
index 0000000000..1e44cc9601
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/readme.md
@@ -0,0 +1,85 @@
+# Kinesis Advantage Keymap
+
+## About this keymap
+
+This keymap is designed after Kinesis Advantage's QWERTY layout with the following key differences:
+ - There are only 10 F-keys in the main layer, F1 and F2 are moved to additional LOWER layer.
+ - The INS key acts like a LOWER layer activation key and Del in LOWER layer ats like INS.
+ - LCtl is placed where CAPS should be and CAPS is moved to a free key after F10.
+ - Brigtness and volume control keys are added to LOWER layer.
+
+ The keymap file also contains RAISE layer but it is currently equivalent to LOWER layer and does
+ not have an activation key mapped. It is intended for possible extensions.
+
+## Mapping details
+
+        Main QUERTY layer:
+        ,-------------------------------------------.                           ,-------------------------------------------.
+        | ESC    |  F1  |  F2  |  F3  |  F4  |  F5  |                           |  F6  |  F7  |  F8  |  F9  |  F10 | CAPS   |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        | =      |   1  |   2  |   3  |   4  |   5  |                           |   6  |   7  |   8  |   9  |   0  |   -    |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        | Tab    |   Q  |   W  |   E  |   R  |   T  |                           |   Y  |   U  |   I  |   O  |   P  |   \    |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        | LCtl   |   A  |   S  |   D  |   F  |   G  |                           |   H  |   J  |   K  |   L  |   ;  |   '    |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        | LShift |   Z  |   X  |   C  |   V  |   B  |                           |   N  |   M  |   ,  |   .  |   /  | RShift |
+        `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+                 |   `  | LOWER| Left | Rght |                                         |  Up  |  Dn  |   [  |   ]  |
+                 `---------------------------'                                         `---------------------------'
+                                                ,-------------.      ,-------------.
+                                                | LGui | LAlt |      | RCtl | RGui |
+                                         ,------|------|------|      |------+------+------.
+                                         |      |      | Home |      | PgUp |      |      |
+                                         | BkSp | Del  |------|      |------|Enter |Space |
+                                         |      |      | End  |      | PgDn |      |      |
+                                         `--------------------'      `--------------------'
+
+        LOWER layer:
+        ,-------------------------------------------.                           ,-------------------------------------------.
+        |        |  F11 |  F12 |      |      |      |                           |BriDn |BriUp |VMute |VolDn |VolUp |        |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |        |      |      |      |      |      |                           |      |      |      |      |      |        |
+        `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+                 |      |      |      |      |                                         |      |      |      |      |
+                 `---------------------------'                                         `---------------------------'
+                                                ,-------------.      ,-------------.
+                                                |      |      |      |      |      |
+                                         ,------|------|------|      |------+------+------.
+                                         |      |      |      |      |      |      |      |
+                                         |      | INS  |------|      |------|      |      |
+                                         |      |      |      |      |      |      |      |
+                                         `--------------------'      `--------------------'
+
+## Soldering details
+
+The below picture shows correspondence between the keys and the row/column wires of the left and
+right halves:
+
+        LOWER layer:
+        ,-------------------------------------------.                           ,-------------------------------------------.
+        |  L00   | L01  | L02  | L03  | L04  | L05  |                           | R00  | R01  | R02  | R03  | R04  |  R05   |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |  L10   | L11  | L12  | L13  | L14  | L15  |                           | R10  | R11  | R12  | R13  | R14  |  R15   |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |  L20   | L21  | L22  | L23  | L24  | L25  |                           | R20  | R21  | R22  | R23  | R24  |  R25   |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |  L30   | L31  | L32  | L33  | L34  | L35  |                           | R30  | R31  | R32  | R33  | R34  |  R35   |
+        |--------+------+------+------+------+------|                           |------+------+------+------+------+--------|
+        |  L40   | L41  | L42  | L43  | L44  | L45  |                           | R40  | R41  | R42  | R43  | R44  |  R45   |
+        `--------+------+------+------+------+------'                           `------+------+------+------+------+--------'
+                 | L50  | L51  | L52  | L53  |                                         | R52  | R53  | R54  | R55  |
+                 `---------------------------'                                         `---------------------------'
+                                                ,-------------.      ,-------------.
+                                                | L64  | L65  |      | R60  | R61  |
+                                         ,------|------|------|      |------+------+------.
+                                         |      |      | L63  |      | R62  |      |      |
+                                         | L54  | L55  |------|      |------| R50  | R51  |
+                                         |      |      | L62  |      | R63  |      |      |
+                                         `--------------------'      `--------------------'
diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk
new file mode 100644
index 0000000000..0415379827
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
index c6d71f9114..d304814d7d 100644
--- a/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
+++ b/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
@@ -16,6 +16,10 @@
 #    include "5x7.h"
 #elif defined(KEYBOARD_handwired_dactyl_manuform_6x6)
 #    include "6x6.h"
+#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6_4)
+#    include "6x6_4.h"
+#elif defined(KEYBOARD_handwired_dactyl_manuform_6x6_kinesis)
+#    include "6x6_kinesis.h"
 #elif defined(KEYBOARD_handwired_dactyl_manuform_6x7)
 #    include "6x7.h"
 #elif defined(KEYBOARD_handwired_dactyl_manuform_dmote_62key)

From 50baf28386b1cb8a7e033b1ad9629206c62a6131 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Fri, 14 Jan 2022 01:18:56 +0800
Subject: [PATCH 290/867] move winry25tc to winry/ (#15637)

---
 .../{spiderisland => winry}/winry25tc/config.h    |  0
 .../{spiderisland => winry}/winry25tc/info.json   |  0
 .../winry25tc/keymaps/default/keymap.c            |  0
 .../{spiderisland => winry}/winry25tc/readme.md   | 15 ++++++++++-----
 .../{spiderisland => winry}/winry25tc/rules.mk    |  0
 .../{spiderisland => winry}/winry25tc/winry25tc.c |  0
 .../{spiderisland => winry}/winry25tc/winry25tc.h |  0
 7 files changed, 10 insertions(+), 5 deletions(-)
 rename keyboards/{spiderisland => winry}/winry25tc/config.h (100%)
 rename keyboards/{spiderisland => winry}/winry25tc/info.json (100%)
 rename keyboards/{spiderisland => winry}/winry25tc/keymaps/default/keymap.c (100%)
 rename keyboards/{spiderisland => winry}/winry25tc/readme.md (52%)
 rename keyboards/{spiderisland => winry}/winry25tc/rules.mk (100%)
 rename keyboards/{spiderisland => winry}/winry25tc/winry25tc.c (100%)
 rename keyboards/{spiderisland => winry}/winry25tc/winry25tc.h (100%)

diff --git a/keyboards/spiderisland/winry25tc/config.h b/keyboards/winry/winry25tc/config.h
similarity index 100%
rename from keyboards/spiderisland/winry25tc/config.h
rename to keyboards/winry/winry25tc/config.h
diff --git a/keyboards/spiderisland/winry25tc/info.json b/keyboards/winry/winry25tc/info.json
similarity index 100%
rename from keyboards/spiderisland/winry25tc/info.json
rename to keyboards/winry/winry25tc/info.json
diff --git a/keyboards/spiderisland/winry25tc/keymaps/default/keymap.c b/keyboards/winry/winry25tc/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/spiderisland/winry25tc/keymaps/default/keymap.c
rename to keyboards/winry/winry25tc/keymaps/default/keymap.c
diff --git a/keyboards/spiderisland/winry25tc/readme.md b/keyboards/winry/winry25tc/readme.md
similarity index 52%
rename from keyboards/spiderisland/winry25tc/readme.md
rename to keyboards/winry/winry25tc/readme.md
index 45ba0bd5a4..9507aef74b 100644
--- a/keyboards/spiderisland/winry25tc/readme.md
+++ b/keyboards/winry/winry25tc/readme.md
@@ -1,14 +1,19 @@
-# SpiderIsland 25-key RGB Backlight Hot Swap Mechanical Keyboard
+# Winry 25-key RGB Backlight Hot Swap Mechanical Keyboard
+
+Keyboard from
+* [SpiderIsland on AliExpress(reseller)](https://a.aliexpress.com/_dVJsSpR). Seller provides [kbfirmware](https://kbfirmware.com/) JSON config that was converted to QMK.
+
 
-Keyboard from [SpiderIsland on AliExpress](https://a.aliexpress.com/_dVJsSpR). Seller provides [kbfirmware](https://kbfirmware.com/) JSON config that was converted to QMK.
 
 * Keyboard Maintainer: [andrzejressel](https://github.com/andrzejressel)
-* Hardware Availability: https://aliexpress.com/item/1005001523579896.html
+* Hardware Availability: 
+https://aliexpress.com/item/1005001523579896.html
+https://item.taobao.com/item.htm?id=599731303104
 
 Make example for this keyboard (after setting up your build environment):
 
-    make spiderisland/winry25tc:default
+    make winry/winry25tc:default
 
 **Reset Key**: Located on the other side of the keyboard.
 
-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).
\ No newline at end of file
+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).
diff --git a/keyboards/spiderisland/winry25tc/rules.mk b/keyboards/winry/winry25tc/rules.mk
similarity index 100%
rename from keyboards/spiderisland/winry25tc/rules.mk
rename to keyboards/winry/winry25tc/rules.mk
diff --git a/keyboards/spiderisland/winry25tc/winry25tc.c b/keyboards/winry/winry25tc/winry25tc.c
similarity index 100%
rename from keyboards/spiderisland/winry25tc/winry25tc.c
rename to keyboards/winry/winry25tc/winry25tc.c
diff --git a/keyboards/spiderisland/winry25tc/winry25tc.h b/keyboards/winry/winry25tc/winry25tc.h
similarity index 100%
rename from keyboards/spiderisland/winry25tc/winry25tc.h
rename to keyboards/winry/winry25tc/winry25tc.h

From 2f68e058841739c936bbe4fc2ddfe44409b68aab Mon Sep 17 00:00:00 2001
From: Ibnu Daru Aji <ibnuda@users.noreply.github.com>
Date: Fri, 14 Jan 2022 00:19:51 +0700
Subject: [PATCH 291/867] [Keyboard] new layout for squiggle (#15683)

---
 .../squiggle/keymaps/defaultfull/config.h     |  22 +++
 .../squiggle/keymaps/defaultfull/keymap.c     | 157 ++++++++++++++++++
 .../squiggle/keymaps/defaultfull/readme.md    |   6 +
 .../squiggle/keymaps/defaultfull/rules.mk     |   1 +
 keyboards/squiggle/readme.md                  |   7 +-
 keyboards/squiggle/rev1/rev1.h                |  18 ++
 6 files changed, 209 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/squiggle/keymaps/defaultfull/config.h
 create mode 100644 keyboards/squiggle/keymaps/defaultfull/keymap.c
 create mode 100644 keyboards/squiggle/keymaps/defaultfull/readme.md
 create mode 100644 keyboards/squiggle/keymaps/defaultfull/rules.mk

diff --git a/keyboards/squiggle/keymaps/defaultfull/config.h b/keyboards/squiggle/keymaps/defaultfull/config.h
new file mode 100644
index 0000000000..1c8cff4bb6
--- /dev/null
+++ b/keyboards/squiggle/keymaps/defaultfull/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 Ibnu D. Aji
+ *
+ * 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 COMBO_TERM 100
+#define COMBO_COUNT 38
+#define IGNORE_MOD_TAP_INTERRUPT
+#define PERMISSIVE_HOLD
diff --git a/keyboards/squiggle/keymaps/defaultfull/keymap.c b/keyboards/squiggle/keymaps/defaultfull/keymap.c
new file mode 100644
index 0000000000..97785f0614
--- /dev/null
+++ b/keyboards/squiggle/keymaps/defaultfull/keymap.c
@@ -0,0 +1,157 @@
+/* Copyright 2020 Ibnu D. Aji
+ *
+ * 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 for combos.
+enum combos {
+    // left hand combinations.
+    Q_W,
+    W_E,
+    E_R,
+    Z_X,
+    C_X,
+    C_V,
+
+    // right hand combinations.
+    P_O,
+    O_U,
+    U_I,
+    SLASH_DOT,
+    DOT_COMMA,
+    COMMA_M,
+
+    // both hands combinations.
+    SLASH_Z,
+    COMMA_X,
+    J_F,
+};
+
+enum {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+// thumb keys.
+#define ALT_ENT   ALT_T(KC_ENT)
+#define SFT_ESC   SFT_T(KC_ESC)
+
+// home row mods.
+#define CT_S    RCTL_T(KC_S)
+#define CT_L    RCTL_T(KC_L)
+#define SH_A    RSFT_T(KC_A)
+#define SH_SCLN RSFT_T(KC_SCLN)
+#define AL_D    RALT_T(KC_D)
+#define AL_K    RALT_T(KC_K)
+#define GU_G    RGUI_T(KC_G)
+#define GU_H    RGUI_T(KC_H)
+
+// layer toggle.
+#define LW_BSPC  LT(_LOWER, KC_BSPC)
+#define RS_SPC   LT(_RAISE, KC_SPC)
+
+// idk, man. not used, i guess.
+#define RAISE    MO(_RAISE)
+#define LOWER    MO(_LOWER)
+#define ADDDD    MO(_ADJUST)
+#define MUIS     MO(_MUIS)
+
+// common shortcuts for windows and linux that i use.
+#define NXTTAB LCTL(KC_PGDN)
+#define PRVTAB LCTL(KC_PGUP)
+#define UPTAB  LCTL(LSFT(KC_PGUP))
+#define DNTAB  LCTL(LSFT(KC_PGDN))
+#define NXTWIN LALT(KC_TAB)
+#define PRVWIN LALT(LSFT(KC_TAB))
+#define CALDL  LCTL(LALT(KC_DELT))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+#define EXPLR  LGUI(KC_E)
+#define LCKGUI LGUI(KC_L)
+#define CONPST LSFT(KC_INS)
+#define CLSGUI LALT(KC_F4)
+
+// left hand combinations.
+const uint16_t PROGMEM q_w_combo[]          = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM w_e_combo[]          = {KC_W, KC_E, COMBO_END};
+const uint16_t PROGMEM e_r_combo[]          = {KC_E, KC_R, COMBO_END};
+const uint16_t PROGMEM z_x_combo[]          = {KC_Z, KC_X, COMBO_END};
+const uint16_t PROGMEM x_c_combo[]          = {KC_X, KC_C, COMBO_END};
+const uint16_t PROGMEM c_v_combo[]          = {KC_C, KC_V, COMBO_END};
+
+// right hand combinations.
+const uint16_t PROGMEM p_o_combo[]          = {KC_P,    KC_O,   COMBO_END};
+const uint16_t PROGMEM o_u_combo[]          = {KC_O,    KC_U,   COMBO_END};
+const uint16_t PROGMEM u_i_combo[]          = {KC_U,    KC_I,   COMBO_END};
+const uint16_t PROGMEM slash_dot_combo[]    = {KC_SLSH, KC_DOT, COMBO_END};
+const uint16_t PROGMEM dot_comma_combo[]    = {KC_DOT,  KC_COMM,COMBO_END};
+const uint16_t PROGMEM comma_m_combo[]      = {KC_COMM, KC_M,   COMBO_END};
+
+// both hand combinations.
+const uint16_t PROGMEM z_slash_combo[]       = {KC_Z, KC_SLSH, COMBO_END};
+const uint16_t PROGMEM x_comma_combo[]       = {KC_X, KC_COMM, COMBO_END};
+const uint16_t PROGMEM j_f_combo[]           = {KC_F, KC_J,    COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+    // left hand combinations.
+    [Q_W]           = COMBO(q_w_combo, KC_TAB),
+    [W_E]           = COMBO(w_e_combo, KC_DQT),
+    [E_R]           = COMBO(e_r_combo, KC_UNDS),
+    [Z_X]           = COMBO(z_x_combo, KC_ENT),
+    [C_X]           = COMBO(x_c_combo, LCTL(KC_W)),
+    [C_V]           = COMBO(c_v_combo, KC_DELT),
+
+    // right hand combinations.
+    [P_O]           = COMBO(p_o_combo,       KC_BSPC),
+    [O_U]           = COMBO(o_u_combo,       KC_QUOT),
+    [U_I]           = COMBO(u_i_combo,       KC_MINS),
+    [SLASH_DOT]     = COMBO(slash_dot_combo, KC_PIPE),
+    [DOT_COMMA]     = COMBO(dot_comma_combo, KC_APP),
+    [COMMA_M]       = COMBO(comma_m_combo,   KC_DELT),
+
+    // both hand combinations.
+    [SLASH_Z]       = COMBO(z_slash_combo, KC_HOME),
+    [COMMA_X]       = COMBO(x_comma_combo, KC_END),
+    [J_F]           = COMBO(j_f_combo,     KC_ENT),
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT_full(
+    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,       KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,
+    SH_A,   CT_S,   AL_D,   KC_F,   GU_G,       GU_H,   KC_J,   AL_K,   CT_L,   SH_SCLN,
+    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,       KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,
+    KC_LCTL,KC_LGUI,KC_LALT,LW_BSPC,SFT_ESC,    ALT_ENT,RS_SPC, KC_RALT,KC_RGUI,KC_RCTL
+),
+
+[_RAISE] = LAYOUT_full(
+    KC_EXLM,KC_AT,  KC_UP,  KC_LCBR,KC_RCBR,    KC_BSLS,KC_7,   KC_8,   KC_9,   KC_ASTR ,
+    KC_HASH,KC_LEFT,KC_DOWN,KC_RGHT,KC_DLR,     KC_EQL, KC_4,   KC_5,   KC_6,   KC_0 ,
+    KC_LBRC,KC_RBRC,KC_LPRN,KC_RPRN,KC_AMPR,    KC_GRV, KC_1,   KC_2,   KC_3,   KC_PLUS ,
+    _______,_______,_______,ADDDD,  _______,    ALT_ENT,RS_SPC, _______,_______,_______
+),
+[_LOWER] = LAYOUT_full(
+    KC_ESC, KC_QUES,KC_UNDS,KC_F1,  KC_F2,      KC_F3,  KC_F4,  KC_MINS,KC_SLSH,KC_BSPC ,
+    KC_LSFT,KC_TAB, KC_PGUP,KC_F5,  KC_F6,      KC_F7,  KC_F8,  KC_HOME,KC_LALT,KC_ENT  ,
+    KC_CLCK,KC_SLCK,KC_PGDN,KC_F9,  KC_F10,     KC_F11, KC_F12, KC_END, KC_INS, KC_SLSH ,
+    _______,_______,_______,ADDDD,  _______,    KC_DELT,ADDDD,  _______,_______,_______
+),
+[_ADJUST] = LAYOUT_full(
+    _______,EXPLR,  KC_UP,  PRVTAB, PRVWIN,     NXTWIN, NXTTAB, _______,_______,LCKGUI,
+    TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB,      DNTAB,  KC_ENT, KC_LGUI,_______,CALDL,
+    _______,CLSGUI, _______,CONPST, RESET,      _______,_______,_______,_______,_______,
+    _______,_______,_______,_______,_______,    _______,_______,_______,_______,_______
+),
+};
diff --git a/keyboards/squiggle/keymaps/defaultfull/readme.md b/keyboards/squiggle/keymaps/defaultfull/readme.md
new file mode 100644
index 0000000000..41e1ef7b1c
--- /dev/null
+++ b/keyboards/squiggle/keymaps/defaultfull/readme.md
@@ -0,0 +1,6 @@
+# The default keymap for squiggle
+
+Because of the key count in this board is less than 40, it uses combo
+extensively.
+For example, to input `KC_TAB`, you have to press `KC_Q` and `KC_W`
+simultaneously.
diff --git a/keyboards/squiggle/keymaps/defaultfull/rules.mk b/keyboards/squiggle/keymaps/defaultfull/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/squiggle/keymaps/defaultfull/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/squiggle/readme.md b/keyboards/squiggle/readme.md
index dd1256e74a..8d7b58125e 100644
--- a/keyboards/squiggle/readme.md
+++ b/keyboards/squiggle/readme.md
@@ -5,17 +5,20 @@
 It's a keyboard family which has the following requirements:
 
 -  5 columns per hand.
--  At most 3 keys for each side's thumb row.
 -  No numrow.
 -  Split.
 -  Symmetric.
 
 * Keyboard Maintainer: [ibnuda](https://github.com/ibnuda)
 * Hardware Supported: Atmega32u4.
-* Hardware Availability: [shop](https://dactyl.bigcartel.com/product/squiggle-keyboard-kit) or [repo](https://github.com/ibnuda/squiggle).
+* Hardware Availability: [repo](https://github.com/ibnuda/squiggle).
 
 Make example for this keyboard (after setting up your build environment):
 
     make squiggle: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).
+
+To enter to the bootloader you need to:
+
+* Press the key mapped to `RESET`
diff --git a/keyboards/squiggle/rev1/rev1.h b/keyboards/squiggle/rev1/rev1.h
index e1eec20594..73cb7abd2f 100644
--- a/keyboards/squiggle/rev1/rev1.h
+++ b/keyboards/squiggle/rev1/rev1.h
@@ -99,3 +99,21 @@
     { R24, R23, R22, R21, R20 }, \
     { ___, R33, R32, R31, R30 }, \
 }
+
+#define LAYOUT_full(\
+  L00, L01, L02, L03, L04,                     R00, R01, R02, R03, R04, \
+  L10, L11, L12, L13, L14,                     R10, R11, R12, R13, R14, \
+  L20, L21, L22, L23, L24,                     R20, R21, R22, R23, R24, \
+            L30, L31, L32, L33, L34, R30, R31, R32, R33, R34            \
+) \
+{ \
+    { L00, L01, L02, L03, L04 }, \
+    { L10, L11, L12, L13, L14 }, \
+    { L20, L21, L22, L23, L24 }, \
+    { L30, L31, L32, L33, L34 }, \
+    { R04, R03, R02, R01, R00 }, \
+    { R14, R13, R12, R11, R10 }, \
+    { R24, R23, R22, R21, R20 }, \
+    { R34, R33, R32, R31, R30 }, \
+}
+

From 6770f77270d028a3d72f28e7891bb5213fdbae24 Mon Sep 17 00:00:00 2001
From: Andrew Kannan <andrew.kannan@gmail.com>
Date: Thu, 13 Jan 2022 12:20:29 -0500
Subject: [PATCH 292/867] [Keyboard] HoodrowG PCB (#15474)

Co-authored-by: Julian <julianzabala1@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/cannonkeys/hoodrowg/config.h        | 79 +++++++++++++++++++
 keyboards/cannonkeys/hoodrowg/hoodrowg.c      | 17 ++++
 keyboards/cannonkeys/hoodrowg/hoodrowg.h      | 41 ++++++++++
 keyboards/cannonkeys/hoodrowg/info.json       | 10 +++
 .../hoodrowg/keymaps/default/keymap.c         | 41 ++++++++++
 .../cannonkeys/hoodrowg/keymaps/via/keymap.c  | 49 ++++++++++++
 .../cannonkeys/hoodrowg/keymaps/via/rules.mk  |  1 +
 keyboards/cannonkeys/hoodrowg/readme.md       | 22 ++++++
 keyboards/cannonkeys/hoodrowg/rules.mk        | 18 +++++
 9 files changed, 278 insertions(+)
 create mode 100644 keyboards/cannonkeys/hoodrowg/config.h
 create mode 100644 keyboards/cannonkeys/hoodrowg/hoodrowg.c
 create mode 100644 keyboards/cannonkeys/hoodrowg/hoodrowg.h
 create mode 100644 keyboards/cannonkeys/hoodrowg/info.json
 create mode 100644 keyboards/cannonkeys/hoodrowg/keymaps/default/keymap.c
 create mode 100644 keyboards/cannonkeys/hoodrowg/keymaps/via/keymap.c
 create mode 100644 keyboards/cannonkeys/hoodrowg/keymaps/via/rules.mk
 create mode 100644 keyboards/cannonkeys/hoodrowg/readme.md
 create mode 100644 keyboards/cannonkeys/hoodrowg/rules.mk

diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
new file mode 100644
index 0000000000..91d89ec81d
--- /dev/null
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@@ -0,0 +1,79 @@
+/*
+Copyright 2015 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xCA04
+#define PRODUCT_ID      0x0006
+#define DEVICE_VER      0x0001
+#define MANUFACTURER CannonKeys
+#define PRODUCT HoodrowG
+
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 9
+
+#define MATRIX_COL_PINS { B5, B4, D7, F5, F6, F7, F4, D2, D0 }
+#define MATRIX_ROW_PINS { E6, B7, B0, B1, F1, F0, C6, C7, D4, D6, D5, D3 }
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN D1
+#define RGBLED_NUM 16
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* 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 DYNAMIC_KEYMAP_LAYER_COUNT 3
+
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+#define NO_DEBUG
+
+/* disable print */
+#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/hoodrowg/hoodrowg.c b/keyboards/cannonkeys/hoodrowg/hoodrowg.c
new file mode 100644
index 0000000000..f3aff6a32b
--- /dev/null
+++ b/keyboards/cannonkeys/hoodrowg/hoodrowg.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 CannonKeys LLC
+
+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 "hoodrowg.h"
diff --git a/keyboards/cannonkeys/hoodrowg/hoodrowg.h b/keyboards/cannonkeys/hoodrowg/hoodrowg.h
new file mode 100644
index 0000000000..6337699bf5
--- /dev/null
+++ b/keyboards/cannonkeys/hoodrowg/hoodrowg.h
@@ -0,0 +1,41 @@
+/*
+Copyright 2021 CannonKeys LLC
+
+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( \
+	K0100,        K0101, K0001, K0102, K0002, K0103, K0003, K0104, K0004, K0105, K0005, K0106, K0006, K0107, K0007, K0108, \
+    K0300, K0200, K0301, K0201, K0302, K0202, K0303, K0203, K0304, K0204, K0305, K0205, K0306, K0206, K0307, K0207, K0308, \
+    K0500, K0400, K0501, K0401, K0502, K0402, K0503, K0403, K0504, K0404, K0505, K0405, K0506, K0406, K0507, K0407, K0508, \
+    K0700, K0600, K0701, K0601, K0702, K0602, K0703, K0603, K0704, K0604, K0705, K0605, K0706, K0606,                      \
+    K0900, K0800, K0901, K0801, K0902, K0802, K0903, K0803, K0904, K0804, K0905, K0805,        K0806,        K0807,        \
+    K1100, K1000, K1101,                      K1103,                      K1105,        K1106, K1006, K1107, K1007, K1108  \
+) { \
+	{ KC_NO, K0001, K0002, K0003, K0004, K0005, K0006, K0007, KC_NO }, \
+	{ K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108 }, \
+    { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, KC_NO }, \
+	{ K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308 }, \
+    { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, KC_NO }, \
+	{ K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508 }, \
+	{ K0600, K0601, K0602, K0603, K0604, K0605, K0606, KC_NO, KC_NO }, \
+	{ K0700, K0701, K0702, K0703, K0704, K0705, K0706, KC_NO, KC_NO }, \
+	{ K0800, K0801, K0802, K0803, K0804, K0805, K0806, K0807, KC_NO }, \
+	{ K0900, K0901, K0902, K0903, K0904, K0905, KC_NO, KC_NO, KC_NO }, \
+	{ K1000, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1006, K1007, KC_NO }, \
+	{ K1100, K1101, KC_NO, K1103, KC_NO, K1105, K1106, K1107, K1108 } \
+}
diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json
new file mode 100644
index 0000000000..6b43a4b072
--- /dev/null
+++ b/keyboards/cannonkeys/hoodrowg/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "HoodrowG",
+    "url": "https://cannonkeys.com",
+    "maintainer": "awkannan",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Ctrl", "x":11, "y":5.5, "w":1.5}, {"label":"Win", "x":12.5, "y":5.5}, {"label":"Alt", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+        }
+    }
+}
diff --git a/keyboards/cannonkeys/hoodrowg/keymaps/default/keymap.c b/keyboards/cannonkeys/hoodrowg/keymaps/default/keymap.c
new file mode 100644
index 0000000000..18a23cb420
--- /dev/null
+++ b/keyboards/cannonkeys/hoodrowg/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/*
+Copyright 2021 CannonKeys LLC
+
+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 layer_names {
+    _BASE,
+    _FN1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT_all(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,                              KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,                 KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,                KC_RSFT,                          KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                                KC_RALT,    KC_RGUI,    KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
+
+  [_FN1] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DEC,  BL_INC,
+    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_VOLU,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_MPLY, KC_MNXT, KC_VOLD,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
+
+};
diff --git a/keyboards/cannonkeys/hoodrowg/keymaps/via/keymap.c b/keyboards/cannonkeys/hoodrowg/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a5bc67e9af
--- /dev/null
+++ b/keyboards/cannonkeys/hoodrowg/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2021 CannonKeys LLC
+
+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 layer_names {
+    _BASE,
+    _FN1,
+    _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT_all(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,     KC_F12,                              KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,                 KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,                 KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,                KC_RSFT,                          KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                                KC_RALT,    KC_RGUI,    KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
+
+  [_FN1] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,                        BL_TOGG, BL_DEC,  BL_INC,
+    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_VOLU,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_MPLY, KC_MNXT, KC_VOLD,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
+
+  [_FN2] = LAYOUT_all(
+    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,                        BL_TOGG, BL_DEC,  BL_INC,
+    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_VOLU,
+    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_MPLY, KC_MNXT, KC_VOLD,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS )
+};
diff --git a/keyboards/cannonkeys/hoodrowg/keymaps/via/rules.mk b/keyboards/cannonkeys/hoodrowg/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/cannonkeys/hoodrowg/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cannonkeys/hoodrowg/readme.md b/keyboards/cannonkeys/hoodrowg/readme.md
new file mode 100644
index 0000000000..e5baab539a
--- /dev/null
+++ b/keyboards/cannonkeys/hoodrowg/readme.md
@@ -0,0 +1,22 @@
+# CannonKeys HoodrowG
+
+"HoodrowG" Replacement PCB for Matrix 1.2OG
+
+* Keyboard Maintainer: [Andrew Kannan](https://github.com/awkannan)
+* Hardware Supported: Atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cannonkeys/hoodrowg:default
+    
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+
+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).
+
diff --git a/keyboards/cannonkeys/hoodrowg/rules.mk b/keyboards/cannonkeys/hoodrowg/rules.mk
new file mode 100644
index 0000000000..e25598e1d7
--- /dev/null
+++ b/keyboards/cannonkeys/hoodrowg/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 8a6da095d22d66c0ba36ce8731c9d821ca4262e9 Mon Sep 17 00:00:00 2001
From: fOmey <pauly.galea@gmail.com>
Date: Fri, 14 Jan 2022 05:59:16 +1100
Subject: [PATCH 293/867] [Keyboard] Atlantis AK81_VE support (#15392)

---
 keyboards/atlantis/ak81_ve/ak81_ve.c          |  60 +++++++++
 keyboards/atlantis/ak81_ve/ak81_ve.h          |  35 ++++++
 keyboards/atlantis/ak81_ve/config.h           | 117 ++++++++++++++++++
 keyboards/atlantis/ak81_ve/info.json          |  91 ++++++++++++++
 .../atlantis/ak81_ve/keymaps/default/keymap.c |  37 ++++++
 .../atlantis/ak81_ve/keymaps/via/keymap.c     |  69 +++++++++++
 .../atlantis/ak81_ve/keymaps/via/rules.mk     |   4 +
 keyboards/atlantis/ak81_ve/readme.md          |  23 ++++
 keyboards/atlantis/ak81_ve/rules.mk           |  22 ++++
 keyboards/atlantis/encoder_actions.c          |  68 ++++++++++
 keyboards/atlantis/encoder_actions.h          |  21 ++++
 keyboards/atlantis/readme.md                  |   7 ++
 12 files changed, 554 insertions(+)
 create mode 100644 keyboards/atlantis/ak81_ve/ak81_ve.c
 create mode 100644 keyboards/atlantis/ak81_ve/ak81_ve.h
 create mode 100644 keyboards/atlantis/ak81_ve/config.h
 create mode 100644 keyboards/atlantis/ak81_ve/info.json
 create mode 100644 keyboards/atlantis/ak81_ve/keymaps/default/keymap.c
 create mode 100644 keyboards/atlantis/ak81_ve/keymaps/via/keymap.c
 create mode 100644 keyboards/atlantis/ak81_ve/keymaps/via/rules.mk
 create mode 100644 keyboards/atlantis/ak81_ve/readme.md
 create mode 100644 keyboards/atlantis/ak81_ve/rules.mk
 create mode 100644 keyboards/atlantis/encoder_actions.c
 create mode 100644 keyboards/atlantis/encoder_actions.h
 create mode 100644 keyboards/atlantis/readme.md

diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.c b/keyboards/atlantis/ak81_ve/ak81_ve.c
new file mode 100644
index 0000000000..b8ef4ee225
--- /dev/null
+++ b/keyboards/atlantis/ak81_ve/ak81_ve.c
@@ -0,0 +1,60 @@
+/* Copyright 2022 @fOmey
+ *
+ * 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 "ak81_ve.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+  // Key Matrix to LED Index
+  { 12, 11, 10, 9,      8,      7,      6,  5,      4,      NO_LED, 3,  2,  1,      0 },            // 13 keys
+  { 27, 26, 25, 24,     23,     22,     21, 20,     19,     18,     17, 16, 15,     14, 13 },       // 15 keys
+  { 42, 41, 40, 39,     38,     37,     36, 35,     34,     33,     32, 31, 30,     29, 28 },       // 15 keys
+  { 56, 55, 54, 53,     52,     51,     50, 49,     48,     47,     46, 45, 44,     43, NO_LED },   // 14 keys
+  { 70, 69, 68, 67,     66,     65,     64, 63,     62,     61,     60, 59, NO_LED, 58, 57 },       // 14 keys
+  { 79, 78, 77, NO_LED, NO_LED, NO_LED, 76, NO_LED, NO_LED, NO_LED, 75, 74, 73,     72, 71 }        // 9 keys
+}, { 
+  // LED Index to Physical Positon
+  { 240,  0 }, { 224,  0 }, { 208,  0 }, { 192, 0 },   { 176, 0 },  { 160, 0 },  { 144, 0 },  { 128, 0 },  { 112, 0 },  { 96, 0 },  { 80, 0 },  { 64, 0 },             { 32, 0 },
+  { 240, 13 }, { 224, 13 }, { 208, 13 }, { 192 , 13 }, { 176, 13 }, { 160, 13 }, { 144, 13 }, { 128, 13 }, { 112, 13 }, { 96, 13 }, { 80, 13 }, { 64, 13}, { 48, 13 }, { 32, 13 }, { 16, 13 },
+  { 240, 26 }, { 224, 26 }, { 208, 26 }, { 192 , 26 }, { 176, 26 }, { 160, 26 }, { 144, 26 }, { 128, 26 }, { 112, 26 }, { 96, 26 }, { 80, 26 }, { 64, 26}, { 48, 26 }, { 32, 26 }, { 16, 26 },
+  { 240, 39 },       { 216, 39 },        { 192 , 39 }, { 176, 39 }, { 160, 39 }, { 144, 39 }, { 128, 39 }, { 112, 39 }, { 96, 39 }, { 80, 39 }, { 64, 39}, { 48, 39 }, { 32, 39 }, { 16, 39 },
+  { 240, 52 }, { 224, 52 }, { 208, 52 }, { 192 , 52 }, { 176, 52 }, { 160, 52 }, { 144, 52 }, { 128, 52 }, { 112, 52 }, { 96, 52 }, { 80, 52 }, { 64, 52}, { 48, 52 },       { 24, 52 },
+  { 240, 64 }, { 224, 64 }, { 208, 64 }, { 192, 64 },  { 176, 64 },                                        { 112, 64 },                                    { 48, 64 }, { 32, 64 }, { 16, 64 }
+}, {
+  // LED Index to Flag
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 
+  4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+  4, 4, 4, 1, 1, 4, 1, 1, 1, 
+  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+} };
+#endif
+
+#if !defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    if (clockwise) {
+        tap_code(KC_VOLD);
+    } else {
+        tap_code(KC_VOLU);
+    }
+    return true;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.h b/keyboards/atlantis/ak81_ve/ak81_ve.h
new file mode 100644
index 0000000000..c43f477c0a
--- /dev/null
+++ b/keyboards/atlantis/ak81_ve/ak81_ve.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 @fOmey
+ *
+ * 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"
+#include "encoder_actions.h"
+
+#define LAYOUT( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008,       K010, K011, K012, K013, K014, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414, \
+	K500, K501, K502,                   K506,                   K510, K511, K512, K513, K514  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  KC_NO, K010,  K011,  K012,  K013,  K014 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314 }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414 }, \
+	{ K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  K513,  K514 } \
+}
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
new file mode 100644
index 0000000000..0167d0e184
--- /dev/null
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -0,0 +1,117 @@
+/* Copyright 2022 @fOmey
+ *
+ * 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       0x416B
+#define PRODUCT_ID      0x0081
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Atlantis
+#define PRODUCT         AK81_VE
+
+/* Key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+/* Key matrix pins */
+#define MATRIX_ROW_PINS { F1, F7, F6, F5, F4, D5 }
+#define MATRIX_COL_PINS { F0, C7, C6, B6, B5, B4, D7, D6, B2, B7, D3, D2, D1, D0, B3 }
+#define UNUSED_PINS
+
+/* Encoder pins */
+#define ENCODERS_PAD_A { B0 }
+#define ENCODERS_PAD_B { E6 }
+#define ENCODER_RESOLUTION 4
+#define ENCODERS 1
+#define ENCODERS_CCW_KEY { { 3, 5 } } // Note:  array is { col, row )
+#define ENCODERS_CW_KEY  { { 4, 5 } } // Note:  array is { col, row )
+
+/* LED pins */
+#define LED_CAPS_LOCK_PIN D4
+#define LED_PIN_ON_STATE 0
+
+/* 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
+#define FORCE_NKRO
+
+#define RGB_DI_PIN B1
+#ifdef RGB_DI_PIN
+
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_DISABLE_WHEN_USB_SUSPENDED true
+#define DRIVER_LED_TOTAL 96
+#define RGB_MATRIX_STARTUP_HUE 170
+#define RGB_MATRIX_STARTUP_SAT 255
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
+#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+
+#define RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
+#define RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
+#define RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
+#define RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
+#define RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
+#define RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
+#define RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
+#define RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
+#define RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
+#define RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
+#define RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
+#define RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
+#define RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
+#define RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
+#define RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
+#define RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradent Chevron shapped scrolling left to right
+#define RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
+#define RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
+#define RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
+#define RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
+#define RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
+#define RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
+#define RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
+#define RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight ammount at the same time, then shifts back
+#define RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight ammount in a wave to the right, then back to the left
+#define RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight ammount and then back down in a wave to the right
+#define RGB_MATRIX_PIXEL_FRACTAL             // Single hue fractal filled keys pulsing horizontally out to edges
+#define RGB_MATRIX_PIXEL_RAIN                // Randomly light keys with random hues
+#define RGB_MATRIX_TYPING_HEATMAP            // How hot is your WPM!
+#define RGB_MATRIX_DIGITAL_RAIN              // That famous computer simulation
+#define RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
+#define RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
+#define RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
+#define RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
+#define RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
+#define RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+#define RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
+#define RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+#define RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
+#define RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
+#define RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
+#define RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
+
+#endif
\ No newline at end of file
diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json
new file mode 100644
index 0000000000..8d4a8ebf59
--- /dev/null
+++ b/keyboards/atlantis/ak81_ve/info.json
@@ -0,0 +1,91 @@
+{
+    "keyboard_name": "AK81_VE",
+    "maintainer": "fOmey",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 2, "y": 0 },
+                { "label": "F2", "x": 3, "y": 0 },
+                { "label": "F3", "x": 4, "y": 0 },
+                { "label": "F4", "x": 5, "y": 0 },
+                { "label": "F5", "x": 6.5, "y": 0 },
+                { "label": "F6", "x": 7.5, "y": 0 },
+                { "label": "F7", "x": 8.5, "y": 0 },
+                { "label": "F8", "x": 9.5, "y": 0 },
+                { "label": "F9", "x": 11, "y": 0 },
+                { "label": "F10", "x": 12, "y": 0 },
+                { "label": "F11", "x": 13, "y": 0 },
+                { "label": "F12", "x": 14, "y": 0 },
+                { "label": "Del", "x": 16.25, "y": 0 },
+                { "label": "~", "x": 0, "y": 1 },
+                { "label": "!", "x": 1, "y": 1 },
+                { "label": "@", "x": 2, "y": 1 },
+                { "label": "#", "x": 3, "y": 1 },
+                { "label": "$", "x": 4, "y": 1 },
+                { "label": "%", "x": 5, "y": 1 },
+                { "label": "^", "x": 6, "y": 1 },
+                { "label": "&", "x": 7, "y": 1 },
+                { "label": "*", "x": 8, "y": 1 },
+                { "label": "(", "x": 9, "y": 1 },
+                { "label": ")", "x": 10, "y": 1 },
+                { "label": "_", "x": 11, "y": 1 },
+                { "label": "+", "x": 12, "y": 1 },
+                { "label": "Backspace", "w": 2, "x": 13, "y": 1 },
+                { "label": "Home", "x": 16.25, "y": 1 },
+                { "label": "Tab", "w": 1.5, "x": 0, "y": 2 },
+                { "label": "Q", "x": 1.5, "y": 2 },
+                { "label": "W", "x": 2.5, "y": 2 },
+                { "label": "E", "x": 3.5, "y": 2 },
+                { "label": "R", "x": 4.5, "y": 2 },
+                { "label": "T", "x": 5.5, "y": 2 },
+                { "label": "Y", "x": 6.5, "y": 2 },
+                { "label": "U", "x": 7.5, "y": 2 },
+                { "label": "I", "x": 8.5, "y": 2 },
+                { "label": "O", "x": 9.5, "y": 2 },
+                { "label": "P", "x": 10.5, "y": 2 },
+                { "label": "{", "x": 11.5, "y": 2 },
+                { "label": "}", "x": 12.5, "y": 2 },
+                { "label": "|", "w": 1.5, "x": 13.5, "y": 2 },
+                { "label": "PageUp", "x": 16.25, "y": 2 },
+                { "label": "Capslock", "w": 1.75, "x": 0, "y": 3 },
+                { "label": "A", "x": 1.75, "y": 3 },
+                { "label": "S", "x": 2.75, "y": 3 },
+                { "label": "D", "x": 3.75, "y": 3 },
+                { "label": "F", "x": 4.75, "y": 3 },
+                { "label": "G", "x": 5.75, "y": 3 },
+                { "label": "H", "x": 6.75, "y": 3 },
+                { "label": "J", "x": 7.75, "y": 3 },
+                { "label": "K", "x": 8.75, "y": 3 },
+                { "label": "L", "x": 9.75, "y": 3 },
+                { "label": ":", "x": 10.75, "y": 3 },
+                { "label": "\"", "x": 11.75, "y": 3 },
+                { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3 },
+                { "label": "PageDown", "x": 16.25, "y": 3 },
+                { "label": "Shift", "w": 2.25, "x": 0, "y": 4 },
+                { "label": "Z", "x": 2.25, "y": 4 },
+                { "label": "X", "x": 3.25, "y": 4 },
+                { "label": "C", "x": 4.25, "y": 4 },
+                { "label": "V", "x": 5.25, "y": 4 },
+                { "label": "B", "x": 6.25, "y": 4 },
+                { "label": "N", "x": 7.25, "y": 4 },
+                { "label": "M", "x": 8.25, "y": 4 },
+                { "label": ",", "x": 9.25, "y": 4 },
+                { "label": ".", "x": 10.25, "y": 4 },
+                { "label": "?", "x": 11.25, "y": 4 },
+                { "label": "Shift", "w": 1.75, "x": 12.25, "y": 4 },
+                { "label": "Up", "x": 14.25, "y": 4.25 },
+                { "label": "End", "x": 16.25, "y": 4 },
+                { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5 },
+                { "label": "Win", "w": 1.25, "x": 1.25, "y": 5 },
+                { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5 },
+                { "w": 6.25, "x": 3.75, "y": 5 },
+                { "label": "Alt", "w": 1.25, "x": 10, "y": 5 },
+                { "label": "Fn", "w": 1.25, "x": 11.25, "y": 5 },
+                { "label": "Left", "x": 13.25, "y": 5.25 },
+                { "label": "Down", "x": 14.25, "y": 5.25 },
+                { "label": "Right", "x": 15.25, "y": 5.25 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/atlantis/ak81_ve/keymaps/default/keymap.c b/keyboards/atlantis/ak81_ve/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a11091c8b9
--- /dev/null
+++ b/keyboards/atlantis/ak81_ve/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2022 @fOmey
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, 
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, 
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
+		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_PGDN, 
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT(
+		KC_SYSTEM_SLEEP, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, RGB_TOG, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, 
+		_______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RGB_VAI, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, 
+		_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, RGB_HUI, RGB_SPD, 
+		_______, _______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI)
+
+};
\ No newline at end of file
diff --git a/keyboards/atlantis/ak81_ve/keymaps/via/keymap.c b/keyboards/atlantis/ak81_ve/keymaps/via/keymap.c
new file mode 100644
index 0000000000..106d966fa7
--- /dev/null
+++ b/keyboards/atlantis/ak81_ve/keymaps/via/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2022 @fOmey
+ *
+ * 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
+
+#define LAYOUT_via( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008,       K010, K011, K012, K013, K014, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414, \
+	K500, K501, K502, K503, K504,       K506,                   K510, K511, K512, K513, K514  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  KC_NO, K010,  K011,  K012,  K013,  K014 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314 }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414 }, \
+	{ K500,  K501,  K502,  K503,  K504, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  K513,  K514 } \
+}
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_via(
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, 
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, 
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
+		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_PGDN, 
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_VOLU, KC_VOLD, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_via(
+		KC_SYSTEM_SLEEP, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, RGB_TOG, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, 
+		_______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RGB_VAI, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, 
+		_______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, RGB_HUI, RGB_SPD, 
+		_______, _______, _______, RGB_MOD, RGB_RMOD, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI),
+
+	[2] = LAYOUT_via(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+	[3] = LAYOUT_via(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+
+};
\ No newline at end of file
diff --git a/keyboards/atlantis/ak81_ve/keymaps/via/rules.mk b/keyboards/atlantis/ak81_ve/keymaps/via/rules.mk
new file mode 100644
index 0000000000..041588872a
--- /dev/null
+++ b/keyboards/atlantis/ak81_ve/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
+SRC += encoder_actions.c
\ No newline at end of file
diff --git a/keyboards/atlantis/ak81_ve/readme.md b/keyboards/atlantis/ak81_ve/readme.md
new file mode 100644
index 0000000000..d9a6f9627c
--- /dev/null
+++ b/keyboards/atlantis/ak81_ve/readme.md
@@ -0,0 +1,23 @@
+# ATLANTIS AK81_VE
+
+![ATLANTIS AK81_VE](https://i.imgur.com/nfuocgS.jpeg)
+
+A 75% hotswap keyboard with per key RGB backlighting, RGB underglow and a rotary encoder.
+
+* Keyboard Maintainer: [fOmey](https://github.com/fOmey)
+* Hardware Supported: AK75X@AK81_VE
+* Hardware Availability: [AliExpress.com](https://aliexpress.com), [Shopee](https://shopee.com.my)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make atlantis/ak81_ve:default
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Physical reset pins**: Briefly short the reset pins using tweezers, a paperclip, or any other conductive material.
+
+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).
\ No newline at end of file
diff --git a/keyboards/atlantis/ak81_ve/rules.mk b/keyboards/atlantis/ak81_ve/rules.mk
new file mode 100644
index 0000000000..45d044f9fc
--- /dev/null
+++ b/keyboards/atlantis/ak81_ve/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Keyboard RGB underglow
+RGB_MATRIX_ENABLE = yes		# Enable RGB matrix effects
+RGB_MATRIX_DRIVER = WS2812
+AUDIO_ENABLE = no           # Audio output
+DYNAMIC_MACRO_ENABLE = yes
+ENCODER_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/atlantis/encoder_actions.c b/keyboards/atlantis/encoder_actions.c
new file mode 100644
index 0000000000..b41a248a83
--- /dev/null
+++ b/keyboards/atlantis/encoder_actions.c
@@ -0,0 +1,68 @@
+/* Copyright 2020 Neil Brian Ramirez
+ * Copyright 2021 drashna jael're (@drashna)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "encoder_actions.h"
+
+#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+
+#    ifdef ENCODERS
+static uint8_t  encoder_state[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[ENCODERS]   = ENCODERS_CCW_KEY;
+#    endif
+
+void encoder_action_unregister(void) {
+#    ifdef ENCODERS
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index]) {
+            keyevent_t encoder_event = (keyevent_t) {
+                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
+                .pressed = false,
+                .time = (timer_read() | 1)
+            };
+            encoder_state[index] = 0;
+            action_exec(encoder_event);
+        }
+    }
+#    endif
+}
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+#    ifdef ENCODERS
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = true,
+        .time = (timer_read() | 1)
+    };
+    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+#    endif
+}
+
+void matrix_scan_kb(void) {
+    encoder_action_unregister();
+    matrix_scan_user();
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    // don't return user actions, because they are in the keymap
+    // encoder_update_user(index, clockwise);
+    return true;
+};
+
+#endif
diff --git a/keyboards/atlantis/encoder_actions.h b/keyboards/atlantis/encoder_actions.h
new file mode 100644
index 0000000000..2484af52ae
--- /dev/null
+++ b/keyboards/atlantis/encoder_actions.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Neil Brian Ramirez
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+void encoder_action_unregister(void);
+
+void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/atlantis/readme.md b/keyboards/atlantis/readme.md
new file mode 100644
index 0000000000..50a2cc2fed
--- /dev/null
+++ b/keyboards/atlantis/readme.md
@@ -0,0 +1,7 @@
+# Atlantis
+
+A company that has been known to create some unorthodox and unique styled keyboard layouts, a great example of this is the AK82. The AK82 is a 60% layout with a numpad (numpad pictured commonly on the left, however a right side variant the AK82_VE exists).
+
+Atlantis also produce some more traditional layouts like the AK81 a 75% layout (AK81_VE variant includes a rotary enconder) and a large range of macro pads.
+
+Atlantis seem to be operating mainly out of Malaysia, products can be difficult to source internationally.
\ No newline at end of file

From b3c0548ed3cdb31c47d1a9e06c446c0804d6e1b6 Mon Sep 17 00:00:00 2001
From: druotoni <89318351+druotoni@users.noreply.github.com>
Date: Thu, 13 Jan 2022 20:00:35 +0100
Subject: [PATCH 294/867] [Keymap] Lily58 : HELL0 NAVI. Interface (#15469)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/lily58/keymaps/druotoni/boot.c      | 309 +++++++
 keyboards/lily58/keymaps/druotoni/boot.h      |   9 +
 keyboards/lily58/keymaps/druotoni/burst.c     | 252 ++++++
 keyboards/lily58/keymaps/druotoni/burst.h     |  24 +
 keyboards/lily58/keymaps/druotoni/config.h    |  55 ++
 .../lily58/keymaps/druotoni/draw_helper.c     | 768 ++++++++++++++++++
 .../lily58/keymaps/druotoni/draw_helper.h     |  47 ++
 .../lily58/keymaps/druotoni/fast_random.c     |  17 +
 .../lily58/keymaps/druotoni/fast_random.h     |   7 +
 keyboards/lily58/keymaps/druotoni/gui_state.c |  71 ++
 keyboards/lily58/keymaps/druotoni/gui_state.h |  18 +
 keyboards/lily58/keymaps/druotoni/keymap.c    | 253 ++++++
 .../lily58/keymaps/druotoni/layer_frame.c     | 105 +++
 .../lily58/keymaps/druotoni/layer_frame.h     |  15 +
 keyboards/lily58/keymaps/druotoni/navi_font.c | 139 ++++
 keyboards/lily58/keymaps/druotoni/navi_logo.c | 117 +++
 keyboards/lily58/keymaps/druotoni/navi_logo.h |   7 +
 keyboards/lily58/keymaps/druotoni/readme.md   | 133 +++
 keyboards/lily58/keymaps/druotoni/ring.c      | 494 +++++++++++
 keyboards/lily58/keymaps/druotoni/ring.h      |  11 +
 keyboards/lily58/keymaps/druotoni/rules.mk    |  28 +
 21 files changed, 2879 insertions(+)
 create mode 100644 keyboards/lily58/keymaps/druotoni/boot.c
 create mode 100644 keyboards/lily58/keymaps/druotoni/boot.h
 create mode 100644 keyboards/lily58/keymaps/druotoni/burst.c
 create mode 100644 keyboards/lily58/keymaps/druotoni/burst.h
 create mode 100644 keyboards/lily58/keymaps/druotoni/config.h
 create mode 100644 keyboards/lily58/keymaps/druotoni/draw_helper.c
 create mode 100644 keyboards/lily58/keymaps/druotoni/draw_helper.h
 create mode 100644 keyboards/lily58/keymaps/druotoni/fast_random.c
 create mode 100644 keyboards/lily58/keymaps/druotoni/fast_random.h
 create mode 100644 keyboards/lily58/keymaps/druotoni/gui_state.c
 create mode 100644 keyboards/lily58/keymaps/druotoni/gui_state.h
 create mode 100644 keyboards/lily58/keymaps/druotoni/keymap.c
 create mode 100644 keyboards/lily58/keymaps/druotoni/layer_frame.c
 create mode 100644 keyboards/lily58/keymaps/druotoni/layer_frame.h
 create mode 100644 keyboards/lily58/keymaps/druotoni/navi_font.c
 create mode 100644 keyboards/lily58/keymaps/druotoni/navi_logo.c
 create mode 100644 keyboards/lily58/keymaps/druotoni/navi_logo.h
 create mode 100644 keyboards/lily58/keymaps/druotoni/readme.md
 create mode 100644 keyboards/lily58/keymaps/druotoni/ring.c
 create mode 100644 keyboards/lily58/keymaps/druotoni/ring.h
 create mode 100644 keyboards/lily58/keymaps/druotoni/rules.mk

diff --git a/keyboards/lily58/keymaps/druotoni/boot.c b/keyboards/lily58/keymaps/druotoni/boot.c
new file mode 100644
index 0000000000..ba46f8e361
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/boot.c
@@ -0,0 +1,309 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#include "boot.h"
+#include "fast_random.h"
+#include "draw_helper.h"
+#include "gui_state.h"
+
+// boot
+#define ANIM_BOOT_FRAME_DURATION 8
+uint16_t anim_boot_timer         = 0;
+uint8_t  anim_boot_current_frame = 0;
+
+#define NAVI_DURATION 55
+
+// terminal stuff
+#define TERMINAL_DURATION 25
+#define TERMINAL_LINE_NUMBER 19
+#define TERMINAL_LINE_MAX 14
+
+#define LILY_DURATION 50
+
+// halt
+#define ANIM_HALT_FRAME_DURATION 55
+uint16_t anim_halt_timer = 0;
+
+void reset_boot(void) {
+    // frame zero
+    anim_boot_current_frame = 0;
+}
+
+static void draw_lily_key(uint8_t x, uint8_t y, uint8_t *key_number, unsigned long key_state, uint8_t color) {
+    uint8_t       v    = *key_number;
+    unsigned long mask = 1;
+    mask               = mask << v;
+
+    // ligth the key according to the mask
+    if (((key_state & mask) == mask)) {
+        color = !color;
+    }
+
+    draw_rectangle_fill(x, y, 3, 3, color);
+    *key_number = v + 1;
+}
+
+static void draw_lily_key_row(uint8_t x, uint8_t y, int w, uint8_t *key_number, unsigned long key_state, uint8_t color) {
+    // row of rectangle
+    for (uint8_t i = 0; i < w; i++) {
+        draw_lily_key(x + (i * 4), y, key_number, key_state, color);
+    }
+}
+
+static void draw_lily_render(unsigned long key_state) {
+    // different orientation base on side
+#if IS_LEFT
+
+    uint8_t x            = 0;
+    uint8_t y            = 56;
+    uint8_t x_ref        = 10 + x;
+    uint8_t y_ref        = 2 + y;
+    uint8_t i_key_number = 0;
+
+    for (uint8_t i = 0; i < 4; i++) {
+        draw_lily_key_row(x_ref, y_ref + (i * 4), 4, &i_key_number, key_state, true);
+        draw_lily_key_row(x_ref - 8, y_ref + 2 + (i * 4), 2, &i_key_number, key_state, true);
+    }
+
+    draw_lily_key_row(x_ref + 2, y_ref + (4 * 4), 3, &i_key_number, key_state, true);
+
+    uint8_t x_side = x_ref + (4 * 4);
+
+    draw_lily_key(x_side, y_ref + (2 * 4) + 2, &i_key_number, key_state, true);
+    draw_lily_key(x_side, y_ref + (4 * 4), &i_key_number, key_state, true);
+
+    // screen
+    draw_rectangle(x_side, y_ref, 4, 8, true);
+
+    // frame
+    drawline_hr(x + 1, y + 2, 8, true);
+    oled_write_pixel(x + 8, y + 1, true);
+    drawline_hr(x + 8, y, 23, true);
+
+    drawline_hr(x + 1, y + 20, 10, true);
+    oled_write_pixel(x + 10, y + 21, true);
+    drawline_hr(x + 10, y + 22, 16, true);
+
+    drawline_vb(x, y + 3, 17, true);
+    drawline_vb(x + 31, y + 1, 20, true);
+    oled_write_pixel(x + 30, y + 21, true);
+    oled_write_pixel(x + 29, y + 22, true);
+    oled_write_pixel(x + 28, y + 23, true);
+    oled_write_pixel(x + 27, y + 24, true);
+    oled_write_pixel(x + 26, y + 23, true);
+#endif
+
+#if IS_RIGHT
+    uint8_t i_key_number = 0;
+
+    for (uint8_t i = 0; i < 4; i++) {
+        draw_lily_key_row(7, 58 + (i * 4), 4, &i_key_number, key_state, true);
+        draw_lily_key_row(23, 60 + (i * 4), 2, &i_key_number, key_state, true);
+    }
+
+    draw_lily_key_row(9, 74, 3, &i_key_number, key_state, true);
+
+    draw_lily_key(3, 68, &i_key_number, key_state, true);
+    draw_lily_key(3, 74, &i_key_number, key_state, true);
+
+    // screen
+    draw_rectangle(2, 58, 4, 8, true);
+
+    // frame
+    drawline_hr(23, 58, 8, true);
+    oled_write_pixel(23, 57, true);
+    drawline_hr(1, 56, 23, true);
+
+    drawline_hr(21, 76, 10, true);
+    oled_write_pixel(21, 77, true);
+    drawline_hr(6, 78, 16, true);
+
+    drawline_vb(31, 59, 17, true);
+    drawline_vb(0, 57, 20, true);
+    oled_write_pixel(1, 77, true);
+    oled_write_pixel(2, 78, true);
+    oled_write_pixel(3, 79, true);
+    oled_write_pixel(4, 80, true);
+    oled_write_pixel(5, 79, true);
+#endif
+}
+
+static void draw_lily(uint8_t f) {
+    // frame for the events
+    uint8_t tres_stroke = 10;
+    uint8_t tres_boom   = 30;
+    uint8_t y_start     = 56;
+
+    if (f == 0 || f == tres_stroke || f == tres_boom) {
+        // clean screen
+        oled_clear();
+    }
+
+    // simple lily58 with all the keys
+    if (f < tres_stroke) {
+        draw_lily_render(0);
+    }
+
+    // increase number of random keys pressed
+    if (f >= tres_stroke && f < tres_boom) {
+        int inter_f = interpo_pourcent(tres_stroke, tres_boom, f);
+
+        unsigned long key_state = fastrand_long();
+        for (int r = 100 - inter_f; r > 0; r = r - 10) {
+            key_state &= fastrand_long();
+        }
+        draw_lily_render(key_state);
+    }
+
+    // statir explosion
+    if (f >= tres_boom) {
+        oled_clear();
+        uint8_t density = (f - tres_boom);
+        if (density > 4) density = 4;
+        draw_static(0, y_start - 8, 32, 32, true, density);
+    }
+}
+
+static void draw_startup_navi(uint8_t f) {
+    // text
+    oled_write_cursor(0, 5, "HELL0", false);
+    oled_write_cursor(0, 7, "NAVI.", false);
+
+    // prompt
+    if ((f % 8) > 4) {
+        oled_write_cursor(0, 12, "> ", false);
+    } else {
+        oled_write_cursor(0, 12, ">_", false);
+    }
+
+    // frame threshold
+    uint8_t tres_shell = 15;
+    uint8_t tres_load  = 35;
+
+    // rand text to init display
+    if (f > tres_shell) {
+        int inter_f = interpo_pourcent(tres_shell, tres_load, f);
+
+        draw_random_char(1, 12, 'i', 60 + inter_f, 0);
+        draw_random_char(2, 12, 'n', 20 + inter_f, 0);
+        draw_random_char(3, 12, 'i', inter_f, 0);
+        draw_random_char(4, 12, 't', 20 + inter_f, 0);
+    }
+
+    // loading propress bar
+    if (f > tres_load) {
+        int inter_f = interpo_pourcent(tres_load, 50, f);
+
+        // ease
+        float fv = inter_f / 100.00;
+        fv       = fv * fv * fv * fv;
+        inter_f  = fv * 100;
+
+        draw_rectangle(0, (15 * 8), 32, 8, 1);
+        draw_progress(0 + 3, (15 * 8) + 3, 26, 2, inter_f, 0, 1);
+    }
+}
+
+// text dispayed on terminal
+static char *boot_ref[TERMINAL_LINE_NUMBER] = {"LT:", "RT:", "M :", "    ", "cnx:", "A0:", "B0:", "    ", "0x40", "0x60", "0x85", "0x0F", "    ", "> run", "x ", "y ", " 100%", "    ", "> key"};
+
+// prompt style for char in the font
+char scan_font[5] = {'>', 1, 1, 1, 1};
+
+static char *get_terminal_line(uint8_t i) {
+    // display text
+    if (i < TERMINAL_LINE_NUMBER) {
+        return boot_ref[i];
+    }
+
+    // blank line every 3 lines
+    if (i % 3 == 0) {
+        return "     ";
+    }
+
+    // display consecutive chars in the font
+    i = (i - TERMINAL_LINE_NUMBER) * 4;
+
+    scan_font[1] = i;
+    scan_font[2] = i + 1;
+    scan_font[3] = i + 2;
+    scan_font[4] = i + 3;
+
+    return scan_font;
+}
+
+static void draw_startup_terminal(uint8_t f) {
+    // ease for printing on screen
+    f = f * 2;
+    f += (f / 5);
+
+    // scroll text
+    uint8_t i_start   = 0;
+    uint8_t i_nb_char = f;
+
+    if (f > TERMINAL_LINE_MAX) {
+        i_start   = f - TERMINAL_LINE_MAX;
+        i_nb_char = TERMINAL_LINE_MAX;
+    }
+
+    // display lines
+    oled_clear();
+    for (uint8_t i = 0; i < i_nb_char; i++) {
+        char *s = get_terminal_line(i + i_start);
+        oled_write_cursor(0, i, s, false);
+    }
+}
+
+bool render_boot(void) {
+    // end of the boot sequence
+    if (anim_boot_current_frame >= NAVI_DURATION + TERMINAL_DURATION + LILY_DURATION) {
+        anim_boot_current_frame = 0;
+        oled_clear();
+        return true;
+    }
+
+    if (timer_elapsed(anim_boot_timer) > ANIM_BOOT_FRAME_DURATION) {
+        anim_boot_timer = timer_read();
+        if (anim_boot_current_frame < NAVI_DURATION) {
+            // 55 frames
+            draw_startup_navi(anim_boot_current_frame);
+        } else {
+            if (anim_boot_current_frame >= NAVI_DURATION && anim_boot_current_frame < NAVI_DURATION + TERMINAL_DURATION) {
+                // 25
+                draw_startup_terminal(anim_boot_current_frame - NAVI_DURATION);
+            } else {
+                if (anim_boot_current_frame >= NAVI_DURATION + TERMINAL_DURATION) {
+                    // 25
+                    draw_lily(anim_boot_current_frame - NAVI_DURATION - TERMINAL_DURATION);
+                }
+            }
+        }
+
+        anim_boot_current_frame++;
+    }
+    return false;
+}
+
+void render_halt(void) {
+    if (timer_elapsed(anim_halt_timer) > ANIM_HALT_FRAME_DURATION) {
+        anim_halt_timer = timer_read();
+
+        // comb glitch for all the screen
+        draw_glitch_comb(0, 0, 32, 128, 3, true);
+
+        // random moving blocks of pixels
+        for (uint8_t i = 0; i < 6; i++) {
+            int     r  = fastrand();
+            int     rr = fastrand();
+            uint8_t x  = 4 + r % 28;
+            uint8_t y  = rr % 128;
+
+            uint8_t w = 7 + r % 20;
+            uint8_t h = 3 + rr % 10;
+            int     s = (fastrand() % 20) - 10;
+            move_block(x, y, w, h, s);
+        }
+    }
+}
diff --git a/keyboards/lily58/keymaps/druotoni/boot.h b/keyboards/lily58/keymaps/druotoni/boot.h
new file mode 100644
index 0000000000..7897e17923
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/boot.h
@@ -0,0 +1,9 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+bool render_boot(void);
+void render_halt(void);
+
+void reset_boot(void);
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/druotoni/burst.c b/keyboards/lily58/keymaps/druotoni/burst.c
new file mode 100644
index 0000000000..6dd6579e73
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/burst.c
@@ -0,0 +1,252 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// Copyright 2020 Richard Sutherland (rich@brickbots.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#include "gui_state.h"
+#include "fast_random.h"
+#include "burst.h"
+#include "draw_helper.h"
+
+// burst stuff
+static int      current_burst = 0;
+static uint16_t burst_timer   = 0;
+
+// WPM stuff
+static int      current_wpm = 0;
+static uint16_t wpm_timer   = 0;
+
+// This smoothing is 40 keystrokes
+static const float wpm_smoothing = WPM_SMOOTHING;
+
+// store values
+uint8_t burst_scope[SIZE_SCOPE] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+uint8_t wpm_scope[SIZE_SCOPE]   = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+// current max wpm
+int max_wpm = MAX_WPM_INIT;
+
+// scope animation stuff
+#define ANIM_SCOPE_FRAME_DURATION 40
+#define ANIM_SLEEP_SCOPE_FRAME_NUMBER 10
+
+uint16_t anim_scope_timer       = 0;
+uint16_t anim_scope_idle_timer  = 0;
+uint16_t anim_sleep_scope_timer = 0;
+
+uint8_t anim_sleep_scope_duration[ANIM_SLEEP_SCOPE_FRAME_NUMBER] = {30, 30, 30, 30, 20, 20, 30, 30, 32, 35};
+uint8_t current_sleep_scope_frame                                = 0;
+uint8_t sleep_scope_frame_destination                            = ANIM_SLEEP_SCOPE_FRAME_NUMBER - 1;
+
+// glitch animation
+int      current_glitch_scope_time  = 150;
+uint32_t glitch_scope_timer         = 0;
+uint8_t  current_glitch_scope_index = 0;
+
+static void update_wpm(void) {
+    if (wpm_timer > 0) {
+        current_wpm += ((60000 / timer_elapsed(wpm_timer) / WPM_ESTIMATED_WORD_SIZE) - current_wpm) * wpm_smoothing;
+        if (current_wpm > LIMIT_MAX_WPM) {
+            current_wpm = LIMIT_MAX_WPM;
+        }
+    }
+    wpm_timer = timer_read();
+}
+
+void update_scope(void) {
+    update_wpm();
+
+    uint16_t temps_ecoule = timer_elapsed(burst_timer);
+
+    if (temps_ecoule > BURST_FENETRE) {
+        // 1er frappe après longtemps
+        current_burst = 40;
+    } else {
+        int time_pourcent = ((100 * (temps_ecoule)) / (BURST_FENETRE));
+        current_burst     = 100 - time_pourcent;
+    }
+    burst_timer = timer_read();
+}
+
+static void update_scope_array(void) {
+    // shift array
+    for (uint8_t i = 0; i < SIZE_SCOPE - 1; i++) {
+        burst_scope[i] = burst_scope[i + 1];
+        wpm_scope[i]   = wpm_scope[i + 1];
+    }
+
+    int burst = current_burst;
+    int wpm   = current_wpm;
+
+    // compute max wpm
+    max_wpm = (wpm == 0) ? MAX_WPM_INIT : ((wpm > max_wpm) ? wpm : max_wpm);
+
+    // current wpm ratio VS max
+    wpm = (100 * wpm) / max_wpm;
+    if (wpm > 100) wpm = 100;
+
+    // update last slot of the arrays
+    burst_scope[SIZE_SCOPE - 1] = burst;
+    wpm_scope[SIZE_SCOPE - 1]   = wpm;
+
+    // apply decay to burst chart
+    uint8_t pBaisse = 0;
+    for (uint8_t i = 0; i < SIZE_SCOPE - (SIZE_SCOPE / 4); i++) {
+        pBaisse = 2 + ((SIZE_SCOPE - 1 - i)) / 2;
+        burst_scope[i] -= ((burst_scope[i] * pBaisse) / 100);
+    }
+}
+
+static void RenderScopeBlack(void) {
+    // clean central zone
+    draw_rectangle_fill(3, 82, 28, 120, false);
+
+    // redraw some parts of the frame
+    drawline_hr(1, SCOPE_Y_BOTTOM, 32, 1);
+    drawline_vt(0, SCOPE_Y_BOTTOM - 1, 42, 1);
+    drawline_vt(31, SCOPE_Y_BOTTOM - 1, 47, 1);
+}
+
+static void render_scope_white(void) {
+    static const char PROGMEM raw_logo[] = {
+        240, 8, 4, 226, 241, 248, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 0, 0, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 255, 255, 0, 0, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 255, 127, 128, 128, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, 128, 128, 127,
+    };
+    oled_write_raw_P_cursor(0, 10, raw_logo, sizeof(raw_logo));
+}
+
+static void render_scope_chart(void) {
+    // clean the frame
+    render_scope_white();
+
+    uint8_t y_offset = SCOPE_Y_BOTTOM - 3;
+
+    for (uint8_t i = 0; i < SIZE_SCOPE; i++) {
+        // offset
+        uint8_t x = 3 + i;
+
+        // new black vertical line for burst
+        uint8_t iCurrentBurst = burst_scope[i];
+        drawline_vt(x, y_offset, (iCurrentBurst * 4) / 10, 0);
+
+        // new black point for wpm, white if it's on the burst line
+        uint8_t iCurrentWpm = wpm_scope[i];
+        uint8_t yWpm        = y_offset - ((iCurrentWpm * 4) / 10);
+        oled_write_pixel(x, yWpm, !(iCurrentWpm > iCurrentBurst));
+    }
+}
+
+void reset_scope(void) {
+    // scope need wakeup
+    anim_sleep_scope_timer    = timer_read();
+    current_sleep_scope_frame = ANIM_SLEEP_SCOPE_FRAME_NUMBER - 1;
+
+    sleep_scope_frame_destination = 0;
+}
+
+static void render_glitch_square(void) {
+    if (timer_elapsed(anim_scope_idle_timer) > 60) {
+        anim_scope_idle_timer = timer_read();
+        RenderScopeBlack();
+
+        uint8_t color = 0;
+        uint8_t size  = 0;
+        for (uint8_t i = 0; i < 4; i++) {
+            size = 4 + (fastrand() % 6);
+
+            draw_gradient(3 + (fastrand() % 19), 85 + (fastrand() % 20), size, size, 255, 255, 4);
+
+            size  = (fastrand() % 6);
+            color = 100 + (fastrand() % 100);
+            draw_gradient(3 + (fastrand() % 19), 100 + (fastrand() % 20), size, size, color, color, 4);
+        }
+    }
+}
+
+void render_scope_idle(void) {
+    uint8_t glitch_prob = get_glitch_probability();
+    get_glitch_index(&glitch_scope_timer, &current_glitch_scope_time, &current_glitch_scope_index, 150, 350, glitch_prob, 2);
+
+    switch (current_glitch_scope_index) {
+        case 0:
+            RenderScopeBlack();
+            return;
+        case 1:
+            render_glitch_square();
+            return;
+    }
+}
+
+static void RenderScopeSleep(void) {
+    if (current_sleep_scope_frame == sleep_scope_frame_destination) {
+        // animation finished
+        render_scope_idle();
+        return;
+    }
+
+    if (timer_elapsed(anim_sleep_scope_timer) > anim_sleep_scope_duration[current_sleep_scope_frame]) {
+        anim_sleep_scope_timer = timer_read();
+
+        // clean scope
+        RenderScopeBlack();
+
+        // render animation
+        render_tv_animation(current_sleep_scope_frame, 3, 80, 25, 48);
+
+        // update frame number
+        if (sleep_scope_frame_destination > current_sleep_scope_frame) {
+            current_sleep_scope_frame++;
+        } else {
+            current_sleep_scope_frame--;
+        }
+    }
+}
+
+void render_scope(gui_state_t t) {
+    if (timer_elapsed(anim_scope_timer) > ANIM_SCOPE_FRAME_DURATION) {
+        anim_scope_timer = timer_read();
+
+        // shift arrays
+        update_scope_array();
+
+        // oled_set_cursor(0, 10);
+
+        if (t == _WAKINGUP) {
+            RenderScopeSleep();
+            return;
+        }
+
+        if (t == _IDLE) {
+            sleep_scope_frame_destination = ANIM_SLEEP_SCOPE_FRAME_NUMBER - 1;
+            RenderScopeSleep();
+            return;
+        }
+
+        render_scope_chart();
+    }
+}
+
+static void decay_burst(void) {
+    uint16_t temps_ecoule = timer_elapsed(burst_timer);
+
+    int poucentageEcoule = 100;
+
+    if (temps_ecoule <= BURST_FENETRE * 4) {
+        poucentageEcoule = ((100 * (temps_ecoule)) / (BURST_FENETRE * 4));
+    }
+
+    current_burst = current_burst - poucentageEcoule;
+    if (current_burst <= 0) current_burst = 0;
+}
+
+static void decay_wpm(void) {
+    if (timer_elapsed(wpm_timer) > 1000) {
+        wpm_timer = timer_read();
+        current_wpm += (-current_wpm) * wpm_smoothing;
+    }
+}
+
+void decay_scope(void) {
+    decay_burst();
+    decay_wpm();
+}
diff --git a/keyboards/lily58/keymaps/druotoni/burst.h b/keyboards/lily58/keymaps/druotoni/burst.h
new file mode 100644
index 0000000000..8bc8153508
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/burst.h
@@ -0,0 +1,24 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// Copyright 2020 Richard Sutherland (rich@brickbots.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// burst
+#define MAX_WPM_INIT 40
+#define BURST_FENETRE 500
+
+// wpm
+#define LIMIT_MAX_WPM 150
+#define WPM_ESTIMATED_WORD_SIZE 5
+#define WPM_SMOOTHING 0.0487
+
+// scope
+#define SIZE_SCOPE 26
+#define SCOPE_Y_BOTTOM 127
+
+void update_scope(void);
+void render_scope(gui_state_t t);
+
+void reset_scope(void);
+void decay_scope(void);
diff --git a/keyboards/lily58/keymaps/druotoni/config.h b/keyboards/lily58/keymaps/druotoni/config.h
new file mode 100644
index 0000000000..37124fcaaf
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/config.h
@@ -0,0 +1,55 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// Copyright 2012 Jun Wako <wakojun@gmail.com>
+// Copyright 2015 Jack Humbert
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define MASTER_LEFT
+#define OLED_DRIVER_ENABLE
+
+// tapping toggle for my layers
+#define TAPPING_TOGGLE 2
+
+// choose IS_LEFT or IS_RIGHT for compilation and flash firmware
+#define IS_LEFT 1
+//#define IS_RIGHT 1
+
+// logo glitch
+#define WITH_GLITCH
+// boot sequence
+#define WITH_BOOT
+
+// custom transport for displaying on both side
+#define SPLIT_TRANSACTION_IDS_USER USER_SYNC_A
+
+// custom font
+#ifdef OLED_FONT_H
+#    undef OLED_FONT_H
+#endif
+#define OLED_FONT_H "navi_font.c"
+#undef OLED_FONT_END
+#define OLED_FONT_END 125
+
+// more space
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+#define NO_ACTION_ONESHOT
+#define DISABLE_LEADER
+
+// ???
+#undef LOCKING_SUPPORT_ENABLE
+#undef LOCKING_RESYNC_ENABLE
+
+// small layer state
+#define LAYER_STATE_8BIT
+
+// no debug or trace
+#ifndef NO_DEBUG
+#    define NO_DEBUG
+#endif
+#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
+#    define NO_PRINT
+#endif 
+
+
diff --git a/keyboards/lily58/keymaps/druotoni/draw_helper.c b/keyboards/lily58/keymaps/druotoni/draw_helper.c
new file mode 100644
index 0000000000..c6761d725f
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/draw_helper.c
@@ -0,0 +1,768 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// Copyright 2021 ugfx
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#include "draw_helper.h"
+#include "fast_random.h"
+
+void drawline(uint8_t x, uint8_t y, uint8_t width, bool bHorizontal, bool bPositiveDirection, bool color) {
+    if (width <= 0) return;
+    uint8_t yPlus  = 0;
+    uint8_t yMois  = 0;
+    uint8_t nbtour = 0;
+
+    if (!bPositiveDirection) {
+        if (bHorizontal) {
+            x -= width;
+        } else {
+            y -= width;
+        }
+    }
+
+    yMois = (width / 2) - 1 + (width % 2);
+
+    yPlus  = (width / 2);
+    nbtour = (width / 4) + 1;
+
+    bool bWhite = color;
+
+    if (bHorizontal) {
+        for (uint8_t i = 0; i < nbtour; i++) {
+            oled_write_pixel(x + yPlus + i, y, bWhite);
+            oled_write_pixel(x + yMois - i, y, bWhite);
+
+            oled_write_pixel(x + i, y, bWhite);
+            oled_write_pixel(x + width - 1 - i, y, bWhite);
+        }
+    } else {
+        for (uint8_t i = 0; i < nbtour; i++) {
+            oled_write_pixel(x, y + yPlus + i, bWhite);
+            oled_write_pixel(x, y + yMois - i, bWhite);
+
+            oled_write_pixel(x, y + i, bWhite);
+
+            oled_write_pixel(x, y + width - 1 - i, bWhite);
+        }
+    }
+}
+
+void drawline_vb(uint8_t x, uint8_t y, uint8_t width, bool color) { drawline(x, y, width, false, true, color); }
+
+void drawline_vt(uint8_t x, uint8_t y, uint8_t width, bool color) { drawline(x, y, width, false, false, color); }
+
+void drawline_hr(uint8_t x, uint8_t y, uint8_t width, bool color) { drawline(x, y, width, true, true, color); }
+
+void drawline_hl(uint8_t x, uint8_t y, uint8_t width, bool color) { drawline(x, y, width, true, false, color); }
+
+void draw_rectangle(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, bool color) {
+    drawline_hr(x, y, width, color);
+    drawline_hr(x, y + heigth - 1, width, color);
+    drawline_vb(x, y, heigth, color);
+    drawline_vb(x + width - 1, y, heigth, color);
+}
+
+void draw_rectangle_fill(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, bool color) {
+    for (uint8_t i = 0; i < heigth; i++) {
+        drawline_hr(x, y + i, width, color);
+    }
+}
+
+void drawline_hr_heigth(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, bool color) {
+    for (int i = 0; i < heigth; i++) {
+        drawline_hr(x, y - i, width, color);
+        drawline_hr(x, y + i, width, color);
+    }
+}
+
+void drawline_point_hr(short x, short y, short x1, bool color) {
+    if (y < 0 || y > 127) return;
+
+    if (x1 < x) {
+        short iTemp = x;
+        x           = x1;
+        x1          = iTemp;
+    }
+
+    if (x1 > 31) x1 = 31;
+    if (x < 0) x = 0;
+    if (x > 31) x = 31;
+
+    drawline(x, y, x1 - x, true, true, color);
+}
+
+void flip_flap_x(short px, short py, uint8_t val, bool color) {
+    oled_write_pixel(px + val, py, color);
+    oled_write_pixel(px - val, py, color);
+}
+
+void draw_circle(uint8_t x, uint8_t y, uint8_t radius, bool color) {
+    short a, b, P;
+
+    // Calculate intermediates
+    a = 1;
+    b = radius;
+    P = 4 - radius;
+
+    short py, px;
+
+    // Away we go using Bresenham's circle algorithm
+    // Optimized to prevent double drawing
+    px = x;
+    py = y + b;
+    oled_write_pixel(px, py, color);
+    px = x;
+    py = y - b;
+    oled_write_pixel(px, py, color);
+
+    flip_flap_x(x, y, b, color);
+
+    do {
+        flip_flap_x(x, y + b, a, color);
+        flip_flap_x(x, y - b, a, color);
+        flip_flap_x(x, y + a, b, color);
+        flip_flap_x(x, y - a, b, color);
+
+        if (P < 0)
+            P += 3 + 2 * a++;
+        else
+            P += 5 + 2 * (a++ - b--);
+    } while (a < b);
+
+    flip_flap_x(x, y + b, a, color);
+    flip_flap_x(x, y - b, a, color);
+}
+
+void draw_ellipse(uint8_t x, uint8_t y, uint8_t a, uint8_t b, bool color) {
+    int dx, dy;
+    int a2, b2;
+    int err, e2;
+
+    //  short py, px;
+    // Calculate intermediates
+    dx  = 0;
+    dy  = b;
+    a2  = a * a;
+    b2  = b * b;
+    err = b2 - (2 * b - 1) * a2;
+
+    // Away we go using Bresenham's ellipse algorithm
+    do {
+        flip_flap_x(x, y + dy, dx, color);
+        flip_flap_x(x, y - dy, dx, color);
+
+        e2 = 2 * err;
+        if (e2 < (2 * dx + 1) * b2) {
+            dx++;
+            err += (2 * dx + 1) * b2;
+        }
+        if (e2 > -(2 * dy - 1) * a2) {
+            dy--;
+            err -= (2 * dy - 1) * a2;
+        }
+    } while (dy >= 0);
+}
+
+void draw_ellipse_fill(uint8_t x, uint8_t y, uint8_t a, uint8_t b, bool color) { return; }
+// void draw_ellipse_fill(uint8_t x, uint8_t y, uint8_t a, uint8_t b, uint8_t color) {
+//     int dx, dy;
+//     int a2, b2;
+//     int err, e2;
+
+//     // Calculate intermediates
+//     dx  = 0;
+//     dy  = b;
+//     a2  = a * a;
+//     b2  = b * b;
+//     err = b2 - (2 * b - 1) * a2;
+
+//     short py, px, px1;
+
+//     // Away we go using Bresenham's ellipse algorithm
+//     // This is optimized to prevent overdrawing by drawing a line only when a y is about to change value
+//     do {
+//         e2 = 2 * err;
+//         if (e2 < (2 * dx + 1) * b2) {
+//             dx++;
+//             err += (2 * dx + 1) * b2;
+//         }
+//         if (e2 > -(2 * dy - 1) * a2) {
+//             py  = y + dy;
+//             px  = x - dx;
+//             px1 = x + dx;
+//             drawline_point_hr(px, py, px1, color);
+//             if (y) {
+//                 py  = y - dy;
+//                 px  = x - dx;
+//                 px1 = x + dx;
+//                 drawline_point_hr(px, py, px1, color);
+//             }
+//             dy--;
+//             err -= (2 * dy - 1) * a2;
+//         }
+//     } while (dy >= 0);
+// }
+
+bool test_limit(short x, short y) { return !(y < 0 || y > 127 || x < 0 || x > 31); }
+
+void flip_flap_y_point(short px, short py, short px1, uint8_t val, bool color) {
+    // firmware size optimisation : one fonction for 2 lines of code
+    drawline_point_hr(px, py + val, px1, color);
+    drawline_point_hr(px, py - val, px1, color);
+}
+
+void draw_fill_circle(short x, short y, uint8_t radius, bool color) {
+    short a, b, P;
+
+    // Calculate intermediates
+    a = 1;
+    b = radius;
+    P = 4 - radius;
+
+    // Away we go using Bresenham's circle algorithm
+    // This is optimized to prevent overdrawing by drawing a line only when a variable is about to change value
+    short py, px, px1;
+
+    py  = y;
+    px  = x - b;
+    px1 = x + b;
+    drawline_point_hr(px, py, px1, color);
+
+    py = y + b;
+    px = x;
+    if (test_limit(px, py)) oled_write_pixel(px, py, color);
+    py = y - b;
+    px = x;
+    if (test_limit(px, py)) oled_write_pixel(px, py, color);
+    do {
+        flip_flap_y_point(x - b, y, x + b, a, color);
+
+        if (P < 0) {
+            P += 3 + 2 * a++;
+        } else {
+            flip_flap_y_point(x - a, y, x + a, b, color);
+
+            P += 5 + 2 * (a++ - b--);
+        }
+    } while (a < b);
+
+    flip_flap_y_point(x - b, y, x + b, a, color);
+}
+
+bool apres_moitie(int a, int b) { return (a > b / 2); }
+bool arrive_moitie(int a, int b) { return (a > b / 2); }
+bool avant_moitie(int a, int b) { return (a <= b / 2 && !apres_moitie(a, b)); }
+
+void draw_arc_sector(uint8_t x, uint8_t y, uint8_t radius, unsigned char sectors, unsigned char half, bool color) {
+    short a, b, P;
+    short py, px;
+    // Calculate intermediates
+    a = 1;       // x in many explanations
+    b = radius;  // y in many explanations
+    P = 4 - radius;
+
+    if (half != 2) {
+        // Away we go using Bresenham's circle algorithm
+        // Optimized to prevent double drawing
+        if (sectors & 0x06) {
+            px = x;
+            py = y - b;
+            oled_write_pixel(px, py, color);
+        }  // Upper upper
+        if (sectors & 0x60) {
+            px = x;
+            py = y + b;
+            oled_write_pixel(px, py, color);
+        }  // Lower lower
+        if (sectors & 0x81) {
+            px = x + b;
+            py = y;
+            oled_write_pixel(px, py, color);
+        }  // Right right
+        if (sectors & 0x18) {
+            px = x - b;
+            py = y;
+            oled_write_pixel(px, py, color);
+        }  // Left left
+    }
+
+    bool dessiner = false;
+
+    do {
+        if (half == 1 && arrive_moitie(a, b)) break;
+
+        if (half == 2 && avant_moitie(a, b)) {
+            dessiner = false;
+        } else {
+            dessiner = true;
+        }
+
+        if (dessiner) {
+            if (sectors & 0x01) {
+                px = x + b;
+                py = y - a;
+                oled_write_pixel(px, py, color);
+            }  // Upper right right
+            if (sectors & 0x02) {
+                px = x + a;
+                py = y - b;
+                oled_write_pixel(px, py, color);
+            }  // Upper upper right
+            if (sectors & 0x04) {
+                px = x - a;
+                py = y - b;
+                oled_write_pixel(px, py, color);
+            }  // Upper upper left
+            if (sectors & 0x08) {
+                px = x - b;
+                py = y - a;
+                oled_write_pixel(px, py, color);
+            }  // Upper left  left
+            if (sectors & 0x10) {
+                px = x - b;
+                py = y + a;
+                oled_write_pixel(px, py, color);
+            }  // Lower left  left
+            if (sectors & 0x20) {
+                px = x - a;
+                py = y + b;
+                oled_write_pixel(px, py, color);
+            }  // Lower lower left
+            if (sectors & 0x40) {
+                px = x + a;
+                py = y + b;
+                oled_write_pixel(px, py, color);
+            }  // Lower lower right
+            if (sectors & 0x80) {
+                px = x + b;
+                py = y + a;
+                oled_write_pixel(px, py, color);
+            }  // Lower right right
+        }
+
+        if (P < 0)
+            P += 3 + 2 * a++;
+        else
+            P += 5 + 2 * (a++ - b--);
+    } while (a < b);
+
+    if (half != 1) {
+        if (sectors & 0xC0) {
+            px = x + a;
+            py = y + b;
+            oled_write_pixel(px, py, color);
+        }  // Lower right
+        if (sectors & 0x03) {
+            px = x + a;
+            py = y - b;
+            oled_write_pixel(px, py, color);
+        }  // Upper right
+        if (sectors & 0x30) {
+            px = x - a;
+            py = y + b;
+            oled_write_pixel(px, py, color);
+        }  // Lower left
+        if (sectors & 0x0C) {
+            px = x - a;
+            py = y - b;
+            oled_write_pixel(px, py, color);
+        }  // Upper left
+    }
+}
+
+void draw_static(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, int color, uint8_t density) {
+    unsigned long rx        = fastrand_long();
+    unsigned long ry        = fastrand_long();
+    unsigned long maskx     = 1;
+    unsigned long masky     = 1;
+    unsigned long mask_base = 1;
+
+    // more 1 in the octet
+    for (int r = 0; r < density; r++) {
+        rx &= fastrand_long();
+        ry &= fastrand_long();
+    }
+
+    color = ((rx >> 1) % 2) == 0;
+
+    for (uint8_t i = 0; i < width; i++) {
+        for (uint8_t j = 0; j < heigth; j++) {
+            // new mask based on ij loop
+            maskx = (mask_base << i);
+            masky = (mask_base << j);
+
+            // logic AND with the masks
+            if (((rx & maskx) == maskx) && ((ry & masky) == masky)) {
+                oled_write_pixel(x + i, y + j, color);
+            }
+        }
+    }
+}
+
+void copy_pixel(int from, int shift, unsigned char mask) {
+    if (shift == 0) return;
+
+    // pixel cluster from
+    char c_from  = get_oled_char(from);
+    char extract = c_from & mask;
+
+    // pixel cluster shift
+    char c_from_shift = get_oled_char(from + shift);
+    c_from_shift &= ~(mask);
+    c_from_shift |= extract;
+    oled_write_raw_byte(c_from_shift, from + shift);
+
+    // fill blank with black
+    c_from &= ~(mask);
+    oled_write_raw_byte(c_from, from);
+}
+
+void draw_glitch_comb(uint8_t x, uint8_t y, uint8_t width, uint16_t height, uint8_t iSize, bool odd) {
+    // work only on row
+    uint16_t y_start = (y / 8) * 32;
+    uint8_t  nb_h    = height / 8;
+
+    uint8_t  w_max = width;
+    uint16_t index = y_start + x;
+
+    // shift pair even pixel
+    int mask_1 = 85;
+    int mask_2 = 170;
+
+    if (!odd) {
+        // shift odd pixel
+        mask_1 = 170;
+        mask_2 = 85;
+    }
+
+    //  wobble
+    uint16_t pos = 0;
+    for (uint16_t j = 0; j < nb_h; j++) {
+        // next line
+        index = (y_start + x) + (j * 32);
+
+        for (uint16_t i = 0; i < w_max; i++) {
+            if (i + iSize < w_max) {
+                pos = index + i;
+                copy_pixel(pos + iSize, iSize * -1, mask_1);
+            }
+
+            if (w_max - 1 - i - iSize >= 0) {
+                pos = (index + w_max - 1) - i;
+                copy_pixel(pos - iSize, iSize, mask_2);
+            }
+        }
+    }
+}
+
+void draw_random_char(uint8_t column, uint8_t row, char final_char, int value, uint8_t style) {
+    if (value < 0) return;
+
+    char c = final_char;
+
+    if (value < 100) {
+        c = ((fastrand() % 15) + 1);
+    }
+
+    oled_set_cursor(column, row);
+    oled_write_char(c, false);
+}
+
+void get_glitch_index_new(uint16_t *glitch_timer, uint8_t *current_glitch_scope_time, uint8_t *glitch_index, uint8_t min_time, uint16_t max_time, uint8_t glitch_probobility, uint8_t glitch_frame_number) {
+    if (timer_elapsed(*glitch_timer) > *current_glitch_scope_time) {
+        // end of the last glitch period
+        *glitch_timer = timer_read();
+
+        // new random glich period
+        *current_glitch_scope_time = min_time + fastrand() % (max_time - min_time);
+
+        bool bGenerateGlitch = (fastrand() % 100) < glitch_probobility;
+        if (!bGenerateGlitch) {
+            // no glitch
+            *glitch_index = 0;
+            return;
+        }
+
+        // get a new glitch index
+        *glitch_index = fastrand() % glitch_frame_number;
+    }
+}
+
+uint8_t get_glitch_frame_index(uint8_t glitch_probobility, uint8_t glitch_frame_number) {
+    bool bGenerateGlitch = (fastrand() % 100) < glitch_probobility;
+    if (!bGenerateGlitch) {
+        // no glitch
+        return 0;
+    }
+
+    // get a new glitch index
+    return fastrand() % glitch_frame_number;
+}
+
+uint8_t get_glitch_duration(uint8_t min_time, uint16_t max_time) { return min_time + fastrand() % (max_time - min_time); }
+
+void get_glitch_index(uint32_t *glitch_timer, int *current_glitch_scope_time, uint8_t *glitch_index, uint8_t min_time, uint16_t max_time, uint8_t glitch_probobility, uint8_t glitch_frame_number) {
+    if (timer_elapsed32(*glitch_timer) > *current_glitch_scope_time) {
+        // end of the last glitch period
+        *glitch_timer = timer_read32();
+
+        // new random glich period
+        *current_glitch_scope_time = min_time + fastrand() % (max_time - min_time);
+
+        bool bGenerateGlitch = (fastrand() % 100) < glitch_probobility;
+        if (!bGenerateGlitch) {
+            // no glitch
+            *glitch_index = 0;
+            return;
+        }
+
+        // get a new glitch index
+        *glitch_index = fastrand() % glitch_frame_number;
+    }
+}
+
+void draw_progress(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, int value, uint8_t style, bool color) {
+    if (value > 100) {
+        value = 100;
+    }
+    int lenght = (width * value) / 100;
+    for (uint8_t i = 0; i < lenght; i++) {
+        switch (style) {
+            case 0:
+                drawline_vb(x + i, y, heigth - 1, color);
+                break;
+
+                // case 1:
+                //     drawline_vb(x + i, y + 1, heigth - 3, ((i % 3) < 2));
+                //     break;
+                // case 2:
+                //     // . . . . .
+                //     drawline_vb(x + i, y + 3, 2, ((i % 2) == 0));
+                //     break;
+        }
+    }
+}
+
+void oled_write_raw_P_cursor(uint8_t col, uint8_t line, const char *data, uint16_t size) {
+    // raw_P at cursor position
+    oled_set_cursor(col, line);
+    oled_write_raw_P(data, size);
+}
+
+void oled_write_cursor(uint8_t col, uint8_t line, const char *data, bool invert) {
+    // write at cursor position
+    oled_set_cursor(col, line);
+    oled_write(data, invert);
+}
+
+void draw_label(const char *data, uint8_t len, uint8_t row, int value) {
+    if (value < 0) return;
+    if (row >= 16 || row < 0) return;
+    oled_write_cursor(0, row, data, false);
+}
+
+void draw_box(const char *data, uint8_t len, uint8_t row, long value, uint8_t style) {
+    if (value < 0) return;
+    if (row >= 16 || row < 0) return;
+
+    oled_write_cursor(0, row, data, false);
+
+    uint8_t y = row * 8;
+
+    uint8_t x = 6 * len;
+    uint8_t w = 32 - x;
+
+    if (value < 0) value = 0;
+    if (value > 100) value = 100;
+    draw_progress(x, y, w, 7, value, style, 1);
+}
+
+char get_oled_char(uint16_t start_index) {
+    oled_buffer_reader_t reader;
+    reader = oled_read_raw(start_index);
+    return *reader.current_element;
+}
+
+static int get_index_first_block(uint8_t y) { return ((y / 8) * 32); }
+
+void move_block(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, int shift) {
+    // clip
+    if (x >= 31) return;
+    if (y >= 127) return;
+
+    int max_screen = 32 - 1;
+    if ((width + x) > max_screen + 1) width = max_screen + 1 - x;
+
+    if (width <= 1) return;
+
+    if ((heigth + y) > 127) heigth = 127 - y;
+    if (heigth <= 1) return;
+
+    // [-32 & +32]
+    if (shift > max_screen) shift = max_screen;
+    if (shift < -1 * max_screen) shift = -1 * max_screen;
+
+    if ((width + x + shift) > max_screen) width = width - shift;
+
+    int pixelTop    = 8 - (y % 8);
+    int pixelBottom = (y + heigth) % 8;
+
+    unsigned char cMastTop    = ~((unsigned)255 >> (pixelTop));
+    unsigned char cMastBottom = ~((unsigned)255 << (pixelBottom));
+
+    int indexFirstBloc     = get_index_first_block(y) + x;
+    int indexFirstBlocFull = get_index_first_block(y + pixelTop) + x;
+    int indexFirstBlocEnd  = get_index_first_block(y + heigth) + x;
+
+    int nbBlockHeigth = (heigth - pixelTop - pixelBottom) / 8;
+
+    if (nbBlockHeigth < 0) {
+        // just single row
+        nbBlockHeigth = 0;
+        cMastBottom   = 0;
+    }
+
+    if (shift < 0) {
+        for (uint16_t i = 0; i < width; i++) {
+            copy_pixel(indexFirstBloc + i, shift, cMastTop);
+            copy_pixel(indexFirstBlocEnd + i, shift, cMastBottom);
+
+            for (uint16_t j = 0; j < nbBlockHeigth; j++) {
+                copy_pixel(indexFirstBlocFull + i + (j * 32), shift, 255);
+            }
+        }
+
+    } else {
+        for (int i = width - 1; i >= 0; i--) {
+            copy_pixel(indexFirstBloc + i, shift, cMastTop);
+            copy_pixel(indexFirstBlocEnd + i, shift, cMastBottom);
+
+            for (uint16_t j = 0; j < nbBlockHeigth; j++) {
+                copy_pixel(indexFirstBlocFull + i + (j * 32), shift, 255);
+            }
+        }
+    }
+}
+
+int interpo_pourcent(int min, int max, int v) {
+    // interpolation
+    float x0 = min;
+    float x1 = max;
+    float y0 = 0;
+    float y1 = 100;
+    float xp = v;
+    float yp = y0 + ((y1 - y0) / (x1 - x0)) * (xp - x0);
+
+    return (int)yp;
+}
+
+uint8_t BAYER_PATTERN_4[4][4] = {{15, 135, 45, 165}, {195, 75, 225, 105}, {60, 180, 30, 150}, {240, 120, 210, 90}};
+
+void draw_gradient(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, uint8_t color_start, uint8_t color_end, uint8_t tres) {
+    bool invert = color_start > color_end;
+
+    if (invert) {
+        color_start = 255 - color_start;
+        color_end   = 255 - color_end;
+    }
+
+    int step       = (100 / tres);
+    int step_minus = (100 / (tres - 1));
+    int distance   = color_end - color_start;
+
+    for (uint8_t i = 0; i < width; i++) {
+        int position = interpo_pourcent(0, width, i);
+
+        float color = position;
+        color       = ((int)(color / step)) * step_minus;
+
+        color = color_start + ((distance * color) / 100);
+
+        for (uint8_t j = 0; j < heigth; j++) {
+            uint8_t       m       = BAYER_PATTERN_4[i % 4][j % 4];
+            unsigned char color_d = (color > m) ? !invert : invert;
+
+            oled_write_pixel(x + i, y + j, color_d);
+        }
+    }
+}
+
+void render_tv_animation(uint8_t frame_number, uint8_t x, uint8_t y, uint8_t width, uint8_t heigth) {
+    uint8_t xCenter = x + (width / 2);
+    uint8_t yCenter = y + (heigth / 2);
+
+    switch (frame_number) {
+        case 0:
+            // a fond : allume
+            drawline_hr_heigth(x, yCenter, width, 17, true);
+            break;
+
+        case 1:
+            drawline_hr_heigth(x, yCenter, width, 12, true);
+            draw_ellipse_fill(xCenter, yCenter, 7, 15, true);
+            break;
+
+        case 2:
+            drawline_hr_heigth(x, yCenter, width, 5, true);
+            draw_ellipse_fill(xCenter, yCenter, 5, 8, true);
+            break;
+
+        case 3:
+            drawline_hr_heigth(x, yCenter, width, 3, true);
+            draw_ellipse_fill(xCenter, yCenter, 3, 4, true);
+            break;
+
+        case 4:
+            drawline_hr_heigth(x, yCenter, width, 2, true);
+            draw_fill_circle(xCenter, yCenter, 3, true);
+            break;
+
+        case 5:
+            // central line
+            drawline_hr(x, yCenter, width, true);
+            draw_fill_circle(xCenter, yCenter, 2, true);
+            break;
+
+        case 6:
+            // cross
+            drawline_hr(xCenter, yCenter + 1, 2, true);
+            drawline_hr(xCenter, yCenter - 1, 2, true);
+
+            // central line
+            drawline_hr(x, yCenter, width, true);
+            break;
+
+        case 7:
+            // cross
+            drawline_hr(xCenter, yCenter + 1, 2, true);
+            drawline_hr(xCenter, yCenter - 1, 2, true);
+            // central line
+            drawline_hr(xCenter - 8, yCenter, 18, true);
+            // static
+            oled_write_pixel(xCenter - 11, yCenter, true);
+            oled_write_pixel(xCenter + 12, yCenter, true);
+            break;
+
+        case 8:
+            // cross
+            drawline_hr(xCenter, yCenter + 1, 2, true);
+            drawline_hr(xCenter, yCenter - 1, 2, true);
+            // central line
+            drawline_hr(xCenter - 2, yCenter, 4, true);
+            // static
+            drawline_hr(xCenter - 7, yCenter, 2, true);
+            drawline_hr(xCenter + 6, yCenter, 3, true);
+
+            //  oled_write_pixel(xCenter - 11, yCenter, true);
+            oled_write_pixel(xCenter - 9, yCenter, true);
+            oled_write_pixel(xCenter + 12, yCenter, true);
+            oled_write_pixel(xCenter + 14, yCenter, true);
+            break;
+
+        case 9:
+            // central line
+            drawline_hr(xCenter, yCenter, 2, true);
+            break;
+    }
+}
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/druotoni/draw_helper.h b/keyboards/lily58/keymaps/druotoni/draw_helper.h
new file mode 100644
index 0000000000..991ab0d0a6
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/draw_helper.h
@@ -0,0 +1,47 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// Copyright 2021 ugfx
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// line
+void drawline_vb(uint8_t x, uint8_t y, uint8_t width, bool color);
+void drawline_vt(uint8_t x, uint8_t y, uint8_t width, bool color);
+void drawline_hr(uint8_t x, uint8_t y, uint8_t width, bool color);
+void drawline_hl(uint8_t x, uint8_t y, uint8_t width, bool color);
+void drawline_hr_heigth(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, bool color);
+
+// rectangle
+void draw_rectangle(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, bool color);
+void draw_rectangle_fill(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, bool color);
+void draw_gradient(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, uint8_t color_start, uint8_t color_end, uint8_t tres);
+
+// circle
+void draw_fill_circle(short x, short y, uint8_t radius, bool color);
+void draw_circle(uint8_t x, uint8_t y, uint8_t radius, bool color);
+void draw_ellipse(uint8_t x, uint8_t y, uint8_t a, uint8_t b, bool color);
+void draw_ellipse_fill(uint8_t x, uint8_t y, uint8_t a, uint8_t b, bool color);
+void draw_arc_sector(uint8_t x, uint8_t y, uint8_t radius, unsigned char sectors, unsigned char half, bool color);
+void draw_static(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, int color, uint8_t density);
+
+// text
+void draw_random_char(uint8_t column, uint8_t row, char final_char, int value, uint8_t style);
+void draw_label(const char *data, uint8_t len, uint8_t row, int value);
+void draw_box(const char *data, uint8_t len, uint8_t row, long value, uint8_t style);
+void draw_progress(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, int value, uint8_t style, bool color);
+
+// oled drivers stuff
+char get_oled_char(uint16_t start_index);
+void oled_write_cursor(uint8_t col, uint8_t line, const char *data, bool invert);
+void oled_write_raw_P_cursor(uint8_t col, uint8_t line, const char *data, uint16_t size);
+
+// pixel manipulation
+void copy_pixel(int from, int shift, unsigned char mask);
+void move_block(uint8_t x, uint8_t y, uint8_t width, uint8_t heigth, int shift);
+void draw_glitch_comb(uint8_t x, uint8_t y, uint8_t width, uint16_t height, uint8_t iSize, bool odd);
+
+// misc
+void render_tv_animation(uint8_t frame_number, uint8_t x, uint8_t y, uint8_t width, uint8_t heigth);
+int  interpo_pourcent(int min, int max, int v);
+void get_glitch_index(uint32_t *glitch_timer, int *current_glitch_scope_time, uint8_t *glitch_index, uint8_t min_time, uint16_t max_time, uint8_t glitch_probobility, uint8_t glitch_frame_number);
+void get_glitch_index_new(uint16_t *glitch_timer, uint8_t *current_glitch_scope_time, uint8_t *glitch_index, uint8_t min_time, uint16_t max_time, uint8_t glitch_probobility, uint8_t glitch_frame_number);
diff --git a/keyboards/lily58/keymaps/druotoni/fast_random.c b/keyboards/lily58/keymaps/druotoni/fast_random.c
new file mode 100644
index 0000000000..3028b57ac6
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/fast_random.c
@@ -0,0 +1,17 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "fast_random.h"
+
+// seed for random
+static unsigned long g_seed = 0;
+
+int fastrand(void) {
+    // todo : try with random16();
+    g_seed = (214013 * g_seed + 2531011);
+    return (g_seed >> 16) & 0x7FFF;
+}
+
+unsigned long fastrand_long(void) {
+    g_seed = (214013 * g_seed + 2531011);
+    return g_seed;
+}
diff --git a/keyboards/lily58/keymaps/druotoni/fast_random.h b/keyboards/lily58/keymaps/druotoni/fast_random.h
new file mode 100644
index 0000000000..fe8c4a40a2
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/fast_random.h
@@ -0,0 +1,7 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+int           fastrand(void);
+unsigned long fastrand_long(void);
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/druotoni/gui_state.c b/keyboards/lily58/keymaps/druotoni/gui_state.c
new file mode 100644
index 0000000000..d86e67ec7b
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/gui_state.c
@@ -0,0 +1,71 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#include "gui_state.h"
+#include "draw_helper.h"
+
+// timer for the gui state
+uint32_t global_sleep_timer     = 0;
+uint32_t global_waking_up_timer = 0;
+uint32_t global_booting_timer   = 0;
+
+// timers test for states
+#ifdef WITH_BOOT
+static bool IsBooting(void) { return (timer_elapsed32(global_booting_timer) < BOOTING_TIME_TRESHOLD); }
+#else
+static bool IsBooting(void) { return false; }
+#endif
+
+// state test
+static bool IsWakingUp(void) { return (timer_elapsed32(global_waking_up_timer) < WAKING_UP_TIME_TRESHOLD); }
+static bool IsIdle(void) { return (timer_elapsed32(global_sleep_timer) > IDLE_TIME_TRESHOLD && timer_elapsed32(global_sleep_timer) < HALTING_TIME_TRESHOLD); }
+static bool IsSleep(void) { return (timer_elapsed32(global_sleep_timer) >= SLEEP_TIME_TRESHOLD); }
+static bool IsHalting(void) { return (timer_elapsed32(global_sleep_timer) >= HALTING_TIME_TRESHOLD && timer_elapsed32(global_sleep_timer) < SLEEP_TIME_TRESHOLD); }
+
+gui_state_t get_gui_state(void) {
+    // get gui states by testing timers
+    if (IsBooting()) return _BOOTING;
+    if (IsWakingUp()) return _WAKINGUP;
+    if (IsIdle()) return _IDLE;
+    if (IsHalting()) return _HALTING;
+    if (IsSleep()) return _SLEEP;
+
+    return _UP;
+}
+
+void update_gui_state(void) {
+    // what to do when a key is pressed
+    gui_state_t t = get_gui_state();
+
+#ifdef WITH_BOOT
+    if (t == _SLEEP) {
+        // booting
+        global_booting_timer = timer_read32();
+    }
+
+    if (t == _BOOTING) {
+        // cancel booting
+        global_booting_timer = 1000000;
+    }
+#else
+    if (t == _SLEEP) {
+        // waking up
+        global_waking_up_timer = timer_read32();
+    }
+#endif
+
+    if (t == _IDLE || t == _HALTING || t == _BOOTING) {
+        // waking up
+        global_waking_up_timer = timer_read32();
+    }
+
+    // no sleep
+    global_sleep_timer = timer_read32();
+}
+
+uint8_t get_glitch_probability(void) {
+    // more gliches could occur when halting time is near
+    return interpo_pourcent(IDLE_TIME_TRESHOLD, HALTING_TIME_TRESHOLD, timer_elapsed32(global_sleep_timer));
+}
diff --git a/keyboards/lily58/keymaps/druotoni/gui_state.h b/keyboards/lily58/keymaps/druotoni/gui_state.h
new file mode 100644
index 0000000000..190e02d303
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/gui_state.h
@@ -0,0 +1,18 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// states timing
+#define BOOTING_TIME_TRESHOLD 7000
+#define WAKING_UP_TIME_TRESHOLD 300
+#define IDLE_TIME_TRESHOLD 4000
+#define HALTING_TIME_TRESHOLD IDLE_TIME_TRESHOLD + 6000
+#define SLEEP_TIME_TRESHOLD HALTING_TIME_TRESHOLD + 8000
+
+typedef uint8_t gui_state_t;
+enum gui_state { _WAKINGUP = 0, _IDLE, _SLEEP, _UP, _BOOTING, _HALTING };
+
+gui_state_t get_gui_state(void);
+void        update_gui_state(void);
+uint8_t     get_glitch_probability(void);
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/druotoni/keymap.c b/keyboards/lily58/keymaps/druotoni/keymap.c
new file mode 100644
index 0000000000..2db32047e0
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/keymap.c
@@ -0,0 +1,253 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "keymap_french.h"
+#include "transactions.h"
+
+// global
+#include "gui_state.h"
+#include "boot.h"
+#include "navi_logo.h"
+
+#include "draw_helper.h"
+#include "fast_random.h"
+
+// left side
+#include "layer_frame.h"
+#include "burst.h"
+
+// right side
+#include "ring.h"
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* QWERTY
+* ,-----------------------------------------.                    ,-----------------------------------------.
+* | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  DEL |
+* |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+* | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  ^   |
+* |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+* |LShift|   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |RShift|
+* |------+------+------+------+------+------|  "    |    |  )    |------+------+------+------+------+------|
+* |LCTRL |   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |  $   |
+* `-----------------------------------------/       /     \      \-----------------------------------------'
+*                   | LAlt |  SPE | Space| /  NAV  /       \Enter \  |BackSP| ]    | RGUI |
+*                   |      |      |      |/       /         \      \ |      |      |      |
+*                   `----------------------------'           '------''--------------------'
+*/
+    [_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_DELETE, 
+    KC_TAB,   KC_Q,   KC_W,    KC_E,          KC_R,    KC_T,                              KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    FR_CIRC, 
+    KC_LSFT,  KC_A,   KC_S,    KC_D,          KC_F,    KC_G,                              KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_RSFT, 
+    KC_LCTRL, KC_Z,   KC_X,    KC_C,          KC_V,    KC_B,    S(KC_Z),   FR_RPRN,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_QUOT, 
+    KC_LALT, TT(_RAISE),    KC_SPC, TT(_LOWER),                                           KC_ENT,  KC_BSPC, KC_RBRC, KC_RGUI 
+    ),
+
+ /* LOWER      
+* ,---------------------------------------------.                   ,------------------------------------------------.
+* |  ESC |  F1   |  F2   |  F3  |  F4   |  F5   |                   |   F6   |  F7    |  F8    |  F9   | F10  |  DEL | 
+* |------+-------+-------+------+-------+-------|                   |--------+--------+--------+-------+------+------|
+* |  RST |  F11  |  F12  | DEL  | paste | copy  |                   |  home  | pg up  |  print | redo  | w    |      |
+* |------+-------+-------+------+-------+-------|                   |--------+--------+--------+-------+------+------|
+* |      |  all  |       | SAV  | undo  | BackSP|-------.   ,-------|  left  | down   |  up    | right |      |      |
+* |------+-------+-------+------+-------+-------|  enter|   |       |--------+--------+--------+-------+------+------|
+* |  F9  |  F11  |  F10  | F5   | TAB   | cut   |-------|   |-------|  end   | pg dw  |        |       |      |      |
+* `---------------------------------------------/       /    \       \-----------------------------------------------'
+*                   |      | SPE  |          | /       /      \       \  |      | MENU |      |
+*                   |      |      |          |/       /        \       \ |      |      |      |
+*                   `--------------------------------'          '-------''--------------------'
+*/
+    [_LOWER] =  LAYOUT(
+    KC_ESC, KC_F1,      KC_F2,  KC_F3,      KC_F4,          KC_F5,                          KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,         KC_DELETE,
+    RESET,  KC_F11,     KC_F12, KC_DELETE,  RCTL(FR_V),     RCTL(FR_C),                     KC_HOME,    KC_PGUP,    KC_PSCR,    RCTL(FR_Y), RCTL(KC_RIGHT), _______,
+    _______,RCTL(FR_A), _______,RCTL(FR_S), RCTL(FR_Z),     KC_BSPC,                        KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,   _______,        _______,
+    KC_F9,  KC_F11,     KC_F10, KC_F5,      LALT(KC_TAB),   RCTL(FR_X), KC_ENT, _______,    KC_END,     KC_PGDN,    _______,    _______,    _______,        _______,
+    _______,TT(_RAISE), _______, _______,                                                   _______,    _______,    KC_APP,     _______),
+
+/* RAISE
+* ,-----------------------------------------.                    ,-------------------------------------------.
+* |      |      |      |      |      |      |                    |      |     |   /   |   *  |  -  | RGB TOG|
+* |------+------+------+------+------+------|                    |------+------+------+------+-----+--------|
+* |   `  |   [  |   ]  |      |      |      |                    |   ^  |   7  |   8  |   9  |  +  | RGB HUI|
+* |------+------+------+------+------+------|                    |------+------+------+------+-----+--------|
+* |      |  @   |  |   |  &   |  €   |  #   |-------.    ,-------|   $  |   4  |   5  |   6  |     |        |
+* |------+------+------+------+------+------|       |    |       |------+------+------+------+-----+--------|
+* |  F7  |  F8  |  F9  | F10  |  #   | F12  |-------|    |-------|      |   1  |   2  |   3  |     |        |
+* `-----------------------------------------/       /     \      \------------------------------------------'
+*                   |      |      |      | /       /       \      \  |       |   0  |  .   |
+*                   |      |      |      |/       /         \      \ |       |      |      |
+*                   `----------------------------'           '------''---------------------'
+*/
+    [_RAISE] = LAYOUT(
+    _______, _______,    _______,    _______,    _______, _______,                   _______,    _______, KC_PSLS, KC_PAST, KC_PMNS, RGB_TOG,
+    KC_GRV,  FR_LBRC,    FR_RBRC,    _______,    _______, _______,                   FR_EQL,     KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, RGB_HUI, 
+    _______, FR_AT,      FR_PIPE,    ALGR(KC_1), FR_EURO, FR_HASH,                   S(FR_EQL),  KC_KP_4, KC_KP_5, KC_KP_6, _______, _______,
+    KC_F7,   KC_F8,      KC_F9,      KC_F10,     FR_HASH, KC_F12, _______, _______,  _______,    KC_KP_1, KC_KP_2, KC_KP_3, _______, _______,
+    _______, _______,    _______,    _______,                                        _______,    _______, KC_KP_0, KC_KP_DOT)
+};
+// clang-format on
+
+// sync transport
+typedef struct _sync_keycode_t {
+    uint16_t keycode;
+} sync_keycode_t;
+
+// force rigth side to update
+bool b_sync_need_send = false;
+
+// last keycode typed
+sync_keycode_t last_keycode;
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    // vertical orientation
+    return OLED_ROTATION_270;
+}
+
+void render(gui_state_t t) {
+    // logo
+    render_logo(t);
+
+#if IS_LEFT
+    // left side
+    render_layer_frame(t);
+    render_gears();
+
+    decay_scope();
+    render_scope(t);
+#endif
+
+#if IS_RIGHT
+    // right side
+    render_circle(t);
+#endif
+}
+
+void update(uint16_t keycode) {
+#if IS_LEFT
+    update_scope();
+#endif
+
+#if IS_RIGHT
+    update_circle(keycode);
+#endif
+}
+
+void reset(void) {
+#if IS_LEFT
+    reset_scope();
+#endif
+
+#if IS_RIGHT
+    reset_ring();
+#endif
+}
+
+void set_wackingup_mode_clean(void) {
+    oled_clear();
+    reset();
+}
+
+bool oled_task_user(void) {
+    gui_state_t t = get_gui_state();
+
+    // in sleep mode => turn display off
+    if (t == _SLEEP) {
+        oled_off();
+        return false;
+    }
+
+    // not in sleep mode => screen is on
+    oled_on();
+
+#ifdef WITH_BOOT
+    // in booting mode => display booting animation
+    if (t == _BOOTING) {
+        bool boot_finished = render_boot();
+        if (boot_finished) {
+            // end of the boot : wacking up
+            set_wackingup_mode_clean();
+            update_gui_state();
+        }
+        return false;
+    }
+#endif
+
+    // in halting mode => display booting animation
+    if (t == _HALTING) {
+        render_halt();
+        return false;
+    }
+
+    render(t);
+    return false;
+}
+
+void process_key(uint16_t keycode) {
+    // update screen with the new key
+    update(keycode);
+
+    gui_state_t t = get_gui_state();
+
+    if (t == _IDLE) {
+        // wake up animation
+        reset();
+    }
+
+    if (t == _BOOTING || t == _HALTING) {
+        // cancel booting or halting : waking_up
+        set_wackingup_mode_clean();
+    }
+
+    if (t == _SLEEP) {
+        // boot sequence
+        set_wackingup_mode_clean();
+        reset_boot();
+    }
+
+    update_gui_state();
+}
+
+void user_sync_a_slave_handler(uint8_t in_buflen, const void* in_data, uint8_t out_buflen, void* out_data) {
+    const sync_keycode_t* m2s = (const sync_keycode_t*)in_data;
+    // get the last char typed on left side and update the right side
+    process_key(m2s->keycode);
+}
+
+void keyboard_post_init_user(void) {
+    // callback for tranport sync data
+    transaction_register_rpc(USER_SYNC_A, user_sync_a_slave_handler);
+}
+
+void housekeeping_task_user(void) {
+    // only for master side
+    if (!is_keyboard_master()) return;
+
+    // only if a new char was typed
+    if (!b_sync_need_send) return;
+
+    // send the char to the slave side : sync is done
+    if (transaction_rpc_send(USER_SYNC_A, sizeof(last_keycode), &last_keycode)) {
+        b_sync_need_send = false;
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    if (record->event.pressed) {
+        // master : store keycode to sent to the other side to be process_key
+        last_keycode.keycode = keycode;
+        b_sync_need_send     = true;
+
+        // gui process the input
+        process_key(keycode);
+    }
+    return true;
+}
+
+#if IS_LEFT
+layer_state_t layer_state_set_user(layer_state_t state) {
+    // update the frame with the layer name
+    update_layer_frame(state);
+    return state;
+}
+#endif
diff --git a/keyboards/lily58/keymaps/druotoni/layer_frame.c b/keyboards/lily58/keymaps/druotoni/layer_frame.c
new file mode 100644
index 0000000000..6f7ae1a253
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/layer_frame.c
@@ -0,0 +1,105 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#include "gui_state.h"
+#include "layer_frame.h"
+#include "draw_helper.h"
+
+#define ANIM_LAYER_FRAME_DURATION 2
+#define ANIM_LAYER_FRAME_MAX 7
+
+// current layer
+uint8_t current_layer = _QWERTY;
+
+// layer animation stuff
+uint16_t anim_layer_frame_timer  = 0;
+uint8_t  current_layer_frame     = ANIM_LAYER_FRAME_MAX;
+uint8_t  layer_frame_destination = ANIM_LAYER_FRAME_MAX;
+
+// layer name for display
+const char*        layer_name;
+static const char* layer_ref[3] = {LAYER_NAME_0, LAYER_NAME_1, LAYER_NAME_2};
+
+void update_layer_frame(layer_state_t state) {
+    // reset timer
+    anim_layer_frame_timer = timer_read();
+
+    // direction for animation base on layer selected
+    current_layer = get_highest_layer(state);
+    if (current_layer == _QWERTY) {
+        layer_frame_destination = 0;
+    } else {
+        layer_frame_destination = ANIM_LAYER_FRAME_MAX;
+    }
+}
+
+static void draw_black_screen(void) {
+    // clean frame center
+    draw_rectangle_fill(3, 42, 26, 20, false);
+    drawline_hr(17, 62, 12, false);
+}
+
+void render_gears(void) {
+    // 64 bytes, 8x8 font, 8 characters, 32x16 image, 4 columns, 2 rows
+    static const char PROGMEM raw_logo[] = {
+        0, 6, 6, 54, 118, 96, 230, 192, 192, 128, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 18, 226, 2, 18, 226, 2, 18, 226, 2, 1, 0, 0, 0, 0, 0, 128, 128, 128, 185, 187, 187, 131, 128, 184, 128, 128, 128, 128, 128, 128, 128, 128, 128, 191, 128, 128, 191, 128, 128, 191, 128, 0,
+    };
+
+    // extra line for complete the gui
+    oled_write_raw_P_cursor(0, 8, raw_logo, sizeof(raw_logo));
+}
+
+void render_layer_frame(gui_state_t t) {
+    // 96 bytes, 8x8 font, 12 characters, 32x24 image, 4 columns, 3 rows
+    static const char PROGMEM raw_logo[] = {
+        62, 1, 0, 56, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 124, 248, 241, 226, 4, 8, 240, 0, 28, 28, 28, 0, 0, 127, 4, 8, 16, 127, 0, 124, 18, 17, 18, 124, 0, 31, 32, 64, 32, 31, 0, 0, 0, 0, 255, 255, 0, 0, 255, 62, 64, 64, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 142, 30, 62, 126, 126, 70, 70, 126, 70, 70, 126, 70, 70, 127, 127, 0, 0, 255,
+    };
+    oled_write_raw_P_cursor(0, 5, raw_logo, sizeof(raw_logo));
+
+    // extra line for complete the gui
+    drawline_hr(2, 39, 25, 1);
+
+    if (current_layer_frame != layer_frame_destination) {
+        if (timer_elapsed(anim_layer_frame_timer) > ANIM_LAYER_FRAME_DURATION) {
+            anim_layer_frame_timer = timer_read();
+
+            if (layer_frame_destination > current_layer_frame) {
+                current_layer_frame++;
+            } else {
+                current_layer_frame--;
+            }
+        }
+
+        // black screen
+        draw_black_screen();
+
+        // gradient animation on layer selection
+        draw_gradient(3, 42, current_layer_frame * 4, 10, 0, 255, 7);
+        draw_gradient(3 + (27 - current_layer_frame * 4), 57, current_layer_frame * 4, 6, 255, 0, 7);
+
+        drawline_hr(3, 46, 22, false);
+        drawline_hr(3, 47, 23, false);
+
+        draw_rectangle_fill(3, 55, 24, 2, false);
+        draw_rectangle_fill(24, 48, 3, 7, false);
+
+        draw_rectangle_fill(3, 60, 12, 2, false);
+        oled_write_pixel(15, 61, false);
+        drawline_hr(14, 62, 3, false);
+        drawline_hr(14, 62, 3, false);
+        drawline_hr(3, 62, 11, true);
+    }
+
+    // get current layer name
+    layer_name = layer_ref[current_layer];
+
+    // gui on pause : no layer name on screen
+    if (t == _IDLE || t == _SLEEP || t == _WAKINGUP) {
+        layer_name = "   ";
+    }
+
+    // display layer name in the frame
+    oled_write_cursor(1, 6, layer_name, false);
+}
diff --git a/keyboards/lily58/keymaps/druotoni/layer_frame.h b/keyboards/lily58/keymaps/druotoni/layer_frame.h
new file mode 100644
index 0000000000..abbd948395
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/layer_frame.h
@@ -0,0 +1,15 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// layer name : must be 3 chars
+#define LAYER_NAME_0 "ABC"
+#define LAYER_NAME_1 "NAV"
+#define LAYER_NAME_2 "SPE"
+
+enum layer_number { _QWERTY = 0, _LOWER, _RAISE };
+
+void render_gears(void);
+void render_layer_frame(gui_state_t t);
+void update_layer_frame(layer_state_t state);
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/druotoni/navi_font.c b/keyboards/lily58/keymaps/druotoni/navi_font.c
new file mode 100644
index 0000000000..2412256e61
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/navi_font.c
@@ -0,0 +1,139 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+// This is the 'classic' fixed-space bitmap font for Adafruit_GFX since 1.0.
+// See gfxfont.h for newer custom bitmap font info.
+
+#include "progmem.h"
+
+// Standard ASCII 5x7 font
+const unsigned char font[] PROGMEM = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x42, 0x3A, 0x12, 0x12, 0x0E, 0x00,
+    0x0C, 0x44, 0x47, 0x24, 0x1C, 0x00,
+    0x24, 0x24, 0x14, 0x7F, 0x04, 0x00,
+    0x42, 0x3F, 0x02, 0x22, 0x1E, 0x00,
+    0x0A, 0x0A, 0x7F, 0x0A, 0x0A, 0x00,
+    0x02, 0x47, 0x42, 0x22, 0x1F, 0x00,
+    0x21, 0x15, 0x09, 0x15, 0x63, 0x00,
+    0x44, 0x44, 0x3F, 0x04, 0x04, 0x00,
+    0x22, 0x1A, 0x02, 0x7F, 0x12, 0x00,
+    0x22, 0x22, 0x12, 0x0A, 0x06, 0x00,
+    0x08, 0x47, 0x42, 0x22, 0x1E, 0x00,
+    0x10, 0x52, 0x54, 0x30, 0x16, 0x00,
+    0x40, 0x3A, 0x02, 0x3E, 0x42, 0x00,
+    0x5E, 0x52, 0x52, 0x52, 0x5E, 0x00,
+    0x04, 0x27, 0x44, 0x44, 0x3C, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x77, 0x00, 0x77, 0x00, 0x77, 0x00,
+    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+    0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
+    0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
+    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x1C, 0x1C, 0x1C, 0x00, 0x00,
+    0x00, 0x08, 0x1C, 0x08, 0x00, 0x00,
+    0x00, 0x00, 0x08, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
+    0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
+    0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
+    0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
+    0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
+    0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
+    0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
+    0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
+    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+    0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+    0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
+    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+    0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
+    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+    0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
+    0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
+    0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
+    0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
+    0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
+    0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
+    0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
+    0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
+    0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
+    0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
+    0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+    0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
+    0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
+    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+    0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
+    0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
+    0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
+    0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
+    0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
+    0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
+    0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
+    0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
+    0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
+    0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
+    0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
+    0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
+    0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
+    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
+    0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
+    0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
+    0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
+    0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
+    0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
+    0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
+    0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
+    0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
+    0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
+    0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
+    0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
+    0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
+    0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
+    0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
+    0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
+    0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
+    0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+    0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
+    0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
+    0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
+    0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
+    0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
+    0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
+    0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
+    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
+    0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
+    0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
+    0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
+    0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
+    0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
+    0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
+    0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
+    0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
+    0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
+    0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
+    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+    0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
+    0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
+    0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
+    0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
+    0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
+    0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
+    0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
+    0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
+    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+    0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
+    0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
+    0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
+    0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+    0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
+    0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
+    0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00
+};
diff --git a/keyboards/lily58/keymaps/druotoni/navi_logo.c b/keyboards/lily58/keymaps/druotoni/navi_logo.c
new file mode 100644
index 0000000000..6041aa5ebc
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/navi_logo.c
@@ -0,0 +1,117 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#include "gui_state.h"
+#include "navi_logo.h"
+#include "fast_random.h"
+#include "draw_helper.h"
+
+#define LOGO_SIZE 128
+
+// glitch stuff
+#define GLITCH_FRAME_NUMBER 11
+
+uint8_t  current_glitch_index = 0;
+int      current_glitch_time  = 150;
+uint32_t glitch_timer         = 0;
+
+static void render_logo_clean(void) {
+    // your logo here
+    static const char PROGMEM raw_logo[] = {
+        0, 0, 0, 0, 0, 0, 128, 128, 0, 0, 128, 128, 192, 192, 204, 222, 222, 204, 192, 192, 128, 0, 0, 0, 128, 128, 0, 0, 0, 0, 0, 0, 192, 240, 248, 28, 14, 7, 3, 249, 252, 255, 15, 7, 3, 225, 241, 241, 241, 241, 225, 3, 7, 15, 255, 252, 249, 3, 7, 14, 28, 248, 240, 192, 192, 227, 231, 206, 28, 56, 112, 99, 15, 31, 60, 120, 240, 225, 227, 3, 3, 227, 225, 240, 120, 60, 31, 15, 103, 112, 56, 28, 206, 231, 227, 192, 0, 1, 1, 0, 0, 0, 56, 120, 96, 192, 192, 192, 96, 127, 63, 0, 0, 63, 127, 96, 192, 192, 192, 96, 120, 56, 0, 0, 0, 1, 1, 0,
+    };
+    oled_write_raw_P(raw_logo, sizeof(raw_logo));
+}
+
+void render_glitch_bar(uint8_t x, uint8_t y, uint8_t width, uint8_t height, uint8_t iProb) {
+    // random horizontal scanlines
+    for (uint8_t i = 0; i < height; i++) {
+        bool bGenerateGlitch = (fastrand() % 100) < iProb;
+
+        if (bGenerateGlitch) {
+            drawline_hr(x, y + i, width, true);
+        }
+    }
+}
+
+void render_misc_glitch(uint8_t algo) {
+    char c = 0;
+    switch (algo) {
+        case 7:
+            // invert
+            for (uint8_t i = 0; i < LOGO_SIZE; i++) {
+                c = get_oled_char(i);
+                oled_write_raw_byte(~(c), i);
+            }
+            break;
+
+        case 8:
+            //  wobble
+            for (uint8_t i = 0; i < LOGO_SIZE; i++) {
+                if (i < LOGO_SIZE - 1) {
+                    copy_pixel(i + 1, -1, 85);
+
+                    copy_pixel(LOGO_SIZE - 1 - 1 - i, 1, 170);
+                }
+            }
+            break;
+    }
+}
+
+static void render_logo_glitch(void) {
+#ifdef WITH_GLITCH
+    // get a random glitch index
+    uint8_t glitch_prob = get_glitch_probability();
+    get_glitch_index(&glitch_timer, &current_glitch_time, &current_glitch_index, 0, 150, glitch_prob, GLITCH_FRAME_NUMBER);
+
+    // no glitch
+    if (current_glitch_index <= 3) {
+        render_logo_clean();
+        return;
+    }
+
+    // glitch time !
+    switch (current_glitch_index) {
+        case 4:
+            move_block(1, 11, 24, 3, 5);
+            move_block(2, 19, 14, 3, 4);
+            move_block(9, 22, 7, 4, 4);
+            return;
+
+        case 5:
+            move_block(6, 25, 20, 7, 4);
+            move_block(0, 8, 32, 8, 7);
+            return;
+        case 6:
+            move_block(3, 7, 27, 4, -3);
+            move_block(13, 23, 19, 4, -4);
+            return;
+
+        case 7:
+        case 8:
+            render_misc_glitch(current_glitch_index);
+            return;
+
+        case 9:
+            render_glitch_bar(0, 0, 32, 32, 25);
+            return;
+
+        case 10:
+            draw_static(0, 0, 32, 32, true, 0);
+            return;
+    }
+#endif
+}
+
+void render_logo(gui_state_t t) {
+    if (t == _IDLE) {
+        // on idle : glitch time !
+        render_logo_glitch();
+        return;
+    }
+
+    // standart logo
+    render_logo_clean();
+}
diff --git a/keyboards/lily58/keymaps/druotoni/navi_logo.h b/keyboards/lily58/keymaps/druotoni/navi_logo.h
new file mode 100644
index 0000000000..3504568e5d
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/navi_logo.h
@@ -0,0 +1,7 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+void render_logo(gui_state_t t);
+
diff --git a/keyboards/lily58/keymaps/druotoni/readme.md b/keyboards/lily58/keymaps/druotoni/readme.md
new file mode 100644
index 0000000000..c6d47da5d7
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/readme.md
@@ -0,0 +1,133 @@
+# HELL0 NAVI. Interface
+
+HELL0 NAVI. Interface is a GUI based en [Serial Experiments Lain](https://en.wikipedia.org/wiki/Serial_Experiments_Lain). Turn your [Lily58](https://github.com/kata0510/Lily58) keyboard into a Navi computer with its own Copland OS.
+
+
+Ready to dive into the Wired ?
+
+
+HELL0 NAVI provides interactive animations for both sides :
+- a scope on left side for burst, WPM and active layer
+- a ring on right side for the last key stroke
+
+
+
+
+
+
+
+## Typing animation
+
+The scope displays your burst time on a chart. The WPM is represented by an horizontal line.
+
+The ring display the last letter in the upper frame. Each time you enter a key, the Navi searches into the circular database and locks the position. A special animation is displayed when Enter, Backspce or Escape are struck.
+
+<img src="https://imgur.com/Yf7D6UN.gif" height="400" >
+
+## Startup animation
+
+Your Navi boots when it leaves the sleep mode. The animation can be canceled by typing.
+
+
+
+<img src="https://imgur.com/EXU92Ev.gif" height="400" >
+
+
+
+## Waking up animation
+
+After a period of inactivity, the scope and the ring turn off and the Navi runs in Idle mode. A new key stroke wakes them up.
+
+
+<img src="https://imgur.com/9GWa7rR.gif" height="400" >
+
+
+## Idle animation
+
+The Copland OS is still in beta test. After a while, some visual glitches will occur. 
+
+
+<img src="https://imgur.com/eKZ7qgC.gif" height="400" >
+
+
+
+## Shutdown animation
+The Navi runs in sleep mode after 10 seconds in Idle mode. A nice (and difficul to render in a gif) animation is run. The OLED display turns off. 
+
+# How to build & flash
+
+You need to flash each side with a specific version based on config.h configuration.
+
+ ## Left side (master)
+
+IS_RIGHT needs to be commented in config.h
+```
+#define IS_LEFT 1
+//#define IS_RIGHT 1
+```
+Connect the left side and flash
+
+ ## Right side (slave)
+
+Comment IS_LEFT and uncomment IS_RIGHT  in config.h
+```
+//#define IS_LEFT 1
+#define IS_RIGHT 1
+```
+Connect the right side and flash
+
+# Customization
+
+## Logo
+Logo can be change in navi_logo.c.
+The new logo must be 32x32 pixels.
+```
+static void render_logo_clean(void) {
+    // your logo here
+    static const char PROGMEM logo_raw[] = {
+        0, 0, 0, 0, 0, 0, 128, 128, 0, 0, 128, 128, 192, 192, 204, 222, 222, 204, 192, 192, 128, 0, 0, 0, 128, 128, 0, 0,
+        0, 0, 0, 0, 192, 240, 248, 28, 14, 7, 3, 249, 252, 255, 15, 7, 3, 225, 241, 241, 241, 241, 225, 3, 7, 15, 255, 252,
+        249, 3, 7, 14, 28, 248, 240, 192, 192, 227, 231, 206, 28, 56, 112, 99, 15, 31, 60, 120, 240, 225, 227, 3, 3, 227,
+        225, 240, 120, 60, 31, 15, 103, 112, 56, 28, 206, 231, 227, 192, 0, 1, 1, 0, 0, 0, 56, 120, 96, 192, 192, 192, 
+        96, 127, 63, 0, 0, 63, 127, 96, 192, 192, 192, 96, 120, 56, 0, 0, 0, 1, 1, 0,
+    };
+    oled_write_raw_P(logo_raw, sizeof(logo_raw));
+}
+```
+## Layer names
+
+The current version handle 3 differents layers. Names can be changed in layer_frame.h.
+```
+// layer name : must be 3 chars
+#define LAYER_NAME_0 "ABC"
+#define LAYER_NAME_1 "NAV"
+#define LAYER_NAME_2 "SPE"
+```
+
+## Timing
+
+You can tweak states timing in gui_state.h.
+```
+// states timing
+#define BOOTING_TIME_TRESHOLD 7000
+#define WAKING_UP_TIME_TRESHOLD 300
+#define IDLE_TIME_TRESHOLD 4000
+#define HALTING_TIME_TRESHOLD IDLE_TIME_TRESHOLD + 6000
+#define SLEEP_TIME_TRESHOLD HALTING_TIME_TRESHOLD + 8000
+```
+
+## Need space ?
+Boot and gliches can be commented in config.h
+```
+// states timing
+// logo glitch
+//#define WITH_GLITCH
+// boot sequence
+//#define WITH_BOOT
+```
+
+![My Navi](https://imgur.com/eYkgoZJ.png)
+> Keyboard : https://github.com/kata0510/Lily58
+> 
+> Case : https://github.com/BoardSodie/Lily58-Acrylic-Case
+
diff --git a/keyboards/lily58/keymaps/druotoni/ring.c b/keyboards/lily58/keymaps/druotoni/ring.c
new file mode 100644
index 0000000000..e3b7472872
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/ring.c
@@ -0,0 +1,494 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "gui_state.h"
+#include "ring.h"
+
+#include "fast_random.h"
+#include "draw_helper.h"
+
+char tListeTotal[SIZE_ARRAY_1]  = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P'};
+char tListeTotal2[SIZE_ARRAY_1] = {'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', ',', '.', '/', '1', '2', '3'};
+
+static char tRefArc[SIZE_ARRAY_1]  = {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P'};
+static char tRefArc2[SIZE_ARRAY_1] = {'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', ',', '.', '/', '1', '2', '3'};
+
+// ring target and previous char
+char c_target   = 'A';
+char c_target2  = 'Q';
+char c_last     = ' ';
+char c_previous = ' ';
+
+static const char PROGMEM code_to_name[60] = {' ', ' ', ' ', ' ', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'R', 'E', 'B', 'T', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ';', '\'', ' ', ',', '.', '/', ' ', ' ', ' '};
+
+// main circle
+#define CIRCLE_ANIM_FRAME_DURATION 40
+uint16_t circle_timer = 0;
+
+// special animation for special keys
+#define ANIM_CENTER_FRAME_NUMBER 5
+#define ANIM_CENTER_FRAME_DURATION 40
+uint16_t anim_center_timer         = 0;
+uint8_t  anim_center_current_frame = 0;
+
+// sleep animation
+#define ANIM_SLEEP_RING_FRAME_NUMBER 9
+#define ANIM_SLEEP_RING_FRAME_DURATION 20
+uint16_t anim_sleep_ring_timer        = 0;
+uint8_t  current_sleep_ring_frame     = 0;
+uint8_t  sleep_ring_frame_destination = ANIM_SLEEP_RING_FRAME_NUMBER - 1;
+
+// glitch animation
+uint16_t anim_ring_idle_timer      = 0;
+int      current_glitch_ring_time  = 150;
+uint32_t glitch_ring_timer         = 0;
+uint8_t  current_glitch_ring_index = 0;
+
+// central frame keylog animation
+#define ANIM_KEYLOG_FRAME_NUMBER 8
+#define ANIM_KEYLOG_FRAME_DURATION 20
+uint8_t  anim_keylog_current_frame = 0;
+uint16_t anim_keylog_timer         = 0;
+
+static const char PROGMEM raw_ring_sleep[4][64] = {{
+                                                       192, 32, 16, 8, 4, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 4, 4, 4, 8, 16, 32, 192, 3, 4, 8, 16, 32, 32, 32, 64, 64, 64, 64, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 64, 64, 64, 64, 32, 32, 32, 16, 8, 4, 3,
+                                                   },
+
+                                                   {
+                                                       128, 64, 32, 32, 16, 16, 16, 16, 16, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 16, 16, 16, 16, 16, 32, 32, 64, 128, 0, 1, 2, 2, 4, 4, 4, 4, 4, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 4, 4, 4, 4, 4, 2, 2, 1, 0,
+                                                   },
+
+                                                   {
+                                                       248, 192, 128, 128, 128, 128, 128, 128, 128, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 128, 0, 0, 128, 128, 128, 128, 128, 128, 128, 192, 248, 15, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 15,
+                                                   },
+
+                                                   {
+                                                       255, 240, 128, 128, 0, 128, 128, 0, 0, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 0, 0, 128, 128, 0, 128, 128, 248, 255, 255, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 255,
+                                                   }};
+
+static const char PROGMEM raw_circle[4][128] = {{
+                                                    0, 0, 0, 192, 32, 16, 8, 8, 4, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 4, 8, 8, 16, 32, 192, 0, 0, 0, 240, 14, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 129, 238, 240, 15, 112, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 192, 240, 255, 127, 15, 0, 0, 0, 3, 4, 8, 16, 16, 32, 64, 64, 64, 128, 128, 192, 192, 224, 224, 224, 240, 112, 120, 124, 60, 30, 30, 15, 7, 3, 0, 0, 0,
+                                                },
+                                                {
+                                                    0, 0, 0, 192, 32, 16, 8, 8, 4, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 4, 8, 8, 48, 224, 192, 0, 0, 0, 240, 14, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 255, 255, 254, 240, 15, 112, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 192, 224, 240, 248, 248, 254, 255, 255, 127, 15, 0, 0, 0, 3, 7, 15, 31, 30, 62, 126, 126, 126, 254, 254, 254, 254, 254, 255, 255, 255, 127, 127, 127, 63, 31, 31, 15, 7, 3, 0, 0, 0,
+                                                },
+                                                {
+                                                    0, 0, 0, 192, 32, 16, 8, 8, 4, 2, 2, 2, 1, 1, 1, 1, 3, 15, 255, 255, 254, 254, 254, 252, 248, 248, 240, 224, 192, 0, 0, 0, 240, 14, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 128, 192, 240, 248, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 254, 240, 15, 126, 252, 248, 248, 248, 248, 248, 252, 252, 254, 254, 255, 255, 255, 255, 255, 255, 255, 127, 63, 31, 15, 7, 7, 3, 3, 3, 7, 143, 127, 15, 0, 0, 0, 3, 7, 15, 31, 31, 63, 127, 127, 127, 255, 255, 255, 255, 255, 255, 195, 128, 64, 64, 64, 32, 16, 16, 8, 4, 3, 0, 0, 0,
+                                                },
+                                                {
+                                                    0, 0, 0, 192, 224, 240, 248, 248, 124, 62, 30, 14, 15, 7, 7, 3, 3, 3, 1, 1, 2, 2, 2, 4, 8, 8, 16, 32, 192, 0, 0, 0, 240, 254, 255, 31, 15, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 14, 240, 15, 115, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 112, 15, 0, 0, 0, 3, 4, 8, 16, 16, 32, 64, 64, 64, 128, 128, 128, 128, 128, 128, 128, 128, 64, 64, 64, 32, 16, 16, 8, 4, 3, 0, 0, 0,
+                                                }};
+
+static const char PROGMEM raw_bottom[] = {
+    127, 192, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 192, 127,
+};
+
+static const char PROGMEM raw_middle[] = {
+    240, 8, 4, 226, 241, 248, 124, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 56, 0, 1, 62, 255, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 28, 28, 0, 255, 0, 0, 127, 127, 70, 70, 126, 70, 70, 126, 70, 70, 126, 126, 62, 30, 142, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 78, 64, 64, 62, 1, 2, 114, 114, 2, 2, 114, 114, 2, 2, 114, 114, 2, 2, 2, 2, 1, 0, 0, 0, 128, 64, 64, 64, 64, 64, 64, 64, 64, 64, 128, 0, 0, 128, 131, 131, 132, 136, 179, 131, 132, 184, 131, 131, 188, 128, 128, 128, 128, 128, 128, 128, 143, 144, 149, 144, 149, 144, 149, 144, 149, 144, 143, 0,
+};
+
+static void rotate_right(char str[]) {
+    uint8_t iSize = SIZE_ARRAY_1;
+    char    cFist = str[0];
+
+    // rotate array to the right
+    for (uint8_t i = 0; i < iSize - 1; i++) {
+        str[i] = str[i + 1];
+    }
+    str[iSize - 1] = cFist;
+}
+
+static void rotate_left(char str[]) {
+    uint8_t iSize = SIZE_ARRAY_1;
+    char    cLast = str[iSize - 1];
+
+    // rotate array to the left
+    for (uint8_t i = iSize - 1; i > 0; i--) {
+        str[i] = str[i - 1];
+    }
+    str[0] = cLast;
+}
+
+static signed char GetPosition(char c, char tListe[]) {
+    uint8_t iSize = SIZE_ARRAY_1;
+
+    // find position of c in the array
+    for (uint8_t i = 0; i < iSize; i++) {
+        if (tListe[i] == c) return i;
+    }
+
+    // not found
+    return -1;
+}
+
+static signed char GetDistance(char cNew, char tListe[]) {
+    signed char iPositionNew = GetPosition(cNew, tListe);
+    if (iPositionNew == -1) {
+        // not found
+        return 0;
+    }
+
+    return iPositionNew - CURSOR_1;
+}
+
+static bool TesterEstDansListe(char c, char tListe[]) {
+    // char in the list ?
+    return GetPosition(c, tListe) != -1;
+}
+
+static void SmartRotation(char c, char tListe[]) {
+    signed char i = GetDistance(c, tListe);
+    if (i == 0) return;
+
+    // rotate in the shorter way
+    if (i < 0) {
+        rotate_left(tListe);
+        return;
+    }
+
+    if (i > 0) {
+        rotate_right(tListe);
+        return;
+    }
+}
+
+static void update_list(char cNouveau, char tListe[]) {
+    signed char iDistance = GetDistance(cNouveau, tListe);
+    if (iDistance != 0) {
+        // the new char is in the list : rotation
+        SmartRotation(cNouveau, tListe);
+    }
+}
+
+static void draw_arc_sector_16(uint8_t x, uint8_t y, uint8_t radius, int position, bool color) {
+    unsigned int s = 1;
+    s              = s << (position / 2);
+
+    if (position % 4 == 0 || position % 4 == 3) {
+        draw_arc_sector(x, y, radius, s, 1, color);
+    } else {
+        draw_arc_sector(x, y, radius, s, 2, color);
+    }
+}
+
+static void render_set(uint8_t x, uint8_t y, uint8_t r, int p, bool color) {
+    // 2 pixels arc sector
+    draw_arc_sector_16(x, y, r, p, color);
+    draw_arc_sector_16(x, y, r - 1, p, color);
+}
+
+static void draw_letter_circle(char t[], char tRef[], char ct, uint8_t x, uint8_t y, uint8_t r, bool invert) {
+    char c = t[CURSOR_1];
+
+    signed char p  = GetPosition(c, tRef);
+    signed char pt = GetPosition(ct, tRef);
+
+    if (!invert) {
+        draw_fill_circle(x, y, r, false);
+        draw_circle(x, y, r, false);
+        draw_circle(x, y, r - 1, false);
+        draw_circle(x, y, r - 2, false);
+        draw_circle(x, y, r - 4, true);
+        draw_circle(x, y, r - 5, true);
+    }
+
+    int pafter  = (pt + 1) % SIZE_ARRAY_1;
+    int pbefore = (pt + SIZE_ARRAY_1 - 1) % SIZE_ARRAY_1;
+    render_set(x, y, r, pt, true);
+    render_set(x, y, r, pafter, true);
+    render_set(x, y, r, pbefore, true);
+
+    pafter  = (pt + 2) % SIZE_ARRAY_1;
+    pbefore = (pt + SIZE_ARRAY_1 - 2) % SIZE_ARRAY_1;
+    render_set(x, y, r, pafter, true);
+    render_set(x, y, r, pbefore, true);
+
+    r -= 4;
+
+    pafter  = (p + 1) % SIZE_ARRAY_1;
+    pbefore = (p + SIZE_ARRAY_1 - 1) % SIZE_ARRAY_1;
+
+    render_set(x, y, r, p, false);
+    render_set(x, y, r, pafter, false);
+    render_set(x, y, r, pbefore, false);
+
+    draw_circle(x, y, r - 6, true);
+}
+
+static void draw_center_circle_frame(uint8_t x, uint8_t y, uint8_t r, uint8_t f) {
+    draw_fill_circle(x, y, r, 0);
+    draw_circle(x, y, r, 0);
+
+    if (f == 0) {
+        draw_circle(x, y, r, 1);
+    } else {
+        // animation
+        oled_write_raw_P_cursor(0, 11, raw_circle[f - 1], sizeof(raw_circle[f - 1]));
+    }
+}
+
+static void render_anim_center_circle(uint8_t x, uint8_t y, uint8_t r) {
+    if (anim_center_current_frame == ANIM_CENTER_FRAME_NUMBER) {
+        // last frame : no animation
+        return;
+    }
+
+    if (timer_elapsed(anim_center_timer) > ANIM_CENTER_FRAME_DURATION) {
+        anim_center_timer = timer_read();
+
+        draw_center_circle_frame(x, y, r, anim_center_current_frame);
+
+        anim_center_current_frame++;
+    }
+}
+
+static void write_char(char c) {
+    // write keylog char in the frame then offset to center
+    oled_set_cursor(2, 6);
+    oled_write_char(c, false);
+    move_block(12, 48, 6, 8, 2);
+}
+
+static void render_keylog(gui_state_t t) {
+    if (anim_keylog_current_frame != ANIM_KEYLOG_FRAME_NUMBER) {
+        if (timer_elapsed(anim_keylog_timer) > ANIM_KEYLOG_FRAME_DURATION) {
+            // update frame number
+            anim_keylog_timer = timer_read();
+            anim_keylog_current_frame++;
+        }
+
+        // clean frame
+        draw_rectangle_fill(7, 46, 21, 11, false);
+
+        // comb motion to merge current and previous
+        if (anim_keylog_current_frame < ANIM_KEYLOG_FRAME_NUMBER / 2) {
+            // expand the previous char
+            write_char(c_previous);
+            draw_glitch_comb(9, 6 * 8, 18, 8, anim_keylog_current_frame + 1, true);
+        } else {
+            // shrink the current char
+            write_char(c_last);
+            draw_glitch_comb(9, 6 * 8, 18, 8, ANIM_KEYLOG_FRAME_NUMBER - anim_keylog_current_frame, false);
+        }
+
+        return;
+    }
+
+    write_char(c_last);
+}
+
+void reset_ring(void) {
+    // need to open
+    anim_sleep_ring_timer        = timer_read();
+    current_sleep_ring_frame     = ANIM_SLEEP_RING_FRAME_NUMBER - 1;
+    sleep_ring_frame_destination = 0;
+}
+
+static void render_tv_circle(uint8_t x, uint8_t y, uint8_t r, uint8_t f) {
+    // raw image
+    if (f == 2 || f == 3) {
+        oled_write_raw_P_cursor(0, 12, raw_ring_sleep[f - 2], sizeof(raw_ring_sleep[f - 2]));
+        return;
+    }
+
+    // raw image
+    if (f == 5 || f == 6) {
+        oled_write_raw_P_cursor(0, 12, raw_ring_sleep[f - 3], sizeof(raw_ring_sleep[f - 3]));
+        return;
+    }
+
+    // other frames : lighter to draw than using raw image
+    switch (f) {
+        case 1:
+            draw_circle(x, y, r, 1);
+            break;
+
+        case 4:
+            drawline_hr(1, y, 12, 1);
+            drawline_hr(19, y, 12, 1);
+            drawline_vb(0, y - 1, 3, true);
+            drawline_vb(31, y - 1, 3, true);
+            break;
+
+        case 7:
+
+            oled_write_pixel(1, y, true);
+            oled_write_pixel(3, y, true);
+            oled_write_pixel(28, y, true);
+            oled_write_pixel(30, y, true);
+
+            drawline_vb(0, y - 12, 26, true);
+            drawline_vb(31, y - 12, 26, true);
+            break;
+
+        case 8:
+            drawline_vb(0, 88, 32, true);
+            drawline_vb(31, 88, 32, true);
+            break;
+    }
+}
+
+static void render_circle_white(void) {
+    // top
+    oled_write_raw_P_cursor(0, 5, raw_middle, sizeof(raw_middle));
+    drawline_hr(5, 39, 25, 1);
+
+    // clean center
+    draw_rectangle_fill(0, 80, 32, 40, false);
+
+    // bottom
+    drawline_vb(0, 80, 8, 1);
+    drawline_vb(31, 80, 8, 1);
+    oled_write_pixel(1, 80, true);
+    oled_write_pixel(30, 80, true);
+
+    oled_write_raw_P_cursor(0, 15, raw_bottom, sizeof(raw_bottom));
+}
+
+static void render_ring_clean_close(void) {
+    render_circle_white();
+    drawline_vb(0, 88, 32, true);
+    drawline_vb(31, 88, 32, true);
+}
+
+static void render_glitch_square(void) {
+    if (timer_elapsed(anim_ring_idle_timer) > 60) {
+        anim_ring_idle_timer = timer_read();
+
+        render_ring_clean_close();
+
+        uint8_t size = 0;
+        for (uint8_t i = 0; i < 4; i++) {
+            size = 4 + (fastrand() % 6);
+            draw_rectangle_fill(3 + (fastrand() % 19), 85 + (fastrand() % 20), size, size, true);
+
+            size = (fastrand() % 6);
+            draw_rectangle_fill(3 + (fastrand() % 19), 100 + (fastrand() % 20), size, size, true);
+        }
+    }
+}
+
+static void render_ring_idle(void) {
+    uint8_t glitch_prob = get_glitch_probability();
+    get_glitch_index(&glitch_ring_timer, &current_glitch_ring_time, &current_glitch_ring_index, 150, 350, glitch_prob, 2);
+
+    switch (current_glitch_ring_index) {
+        case 0:
+            // no glitch
+            render_ring_clean_close();
+            return;
+        case 1:
+            // square gliches
+            render_glitch_square();
+            return;
+    }
+}
+
+static void render_ring_sleep(void) {
+    if (current_sleep_ring_frame == sleep_ring_frame_destination) {
+        // no more animation needes : render the idle animation
+        render_ring_idle();
+        return;
+    }
+
+    // display wacking up / sleep animation
+    if (timer_elapsed(anim_sleep_ring_timer) > ANIM_SLEEP_RING_FRAME_DURATION) {
+        anim_sleep_ring_timer = timer_read();
+
+        // clean + new frame
+        render_circle_white();
+        render_tv_circle(15, 103, 11, current_sleep_ring_frame);
+
+        // update frame number
+        if (sleep_ring_frame_destination > current_sleep_ring_frame) {
+            current_sleep_ring_frame++;
+        } else {
+            current_sleep_ring_frame--;
+        }
+    }
+}
+
+static void render_circle_middle(void) {
+    // clean
+    render_circle_white();
+
+    // center special animation
+    if (anim_center_current_frame < ANIM_CENTER_FRAME_NUMBER) {
+        render_anim_center_circle(15, 103, 15 - 4);
+        return;
+    }
+
+    // ring render
+    if (anim_center_current_frame == ANIM_CENTER_FRAME_NUMBER) {
+        draw_letter_circle(tListeTotal, tRefArc, c_target, 15, 103, 15, false);
+        draw_letter_circle(tListeTotal2, tRefArc2, c_target2, 15, 103, 15, true);
+    }
+}
+
+void render_circle(gui_state_t t) {
+    if (timer_elapsed(circle_timer) > CIRCLE_ANIM_FRAME_DURATION) {
+        // new frame
+        circle_timer = timer_read();
+
+        // shift rings
+        update_list(c_target, tListeTotal);
+        update_list(c_target2, tListeTotal2);
+
+        // waking up animation
+        if (t == _WAKINGUP) {
+            render_ring_sleep();
+            return;
+        }
+
+        // idle animation
+        if (t == _IDLE) {
+            sleep_ring_frame_destination = ANIM_SLEEP_RING_FRAME_NUMBER - 1;
+            render_ring_sleep();
+            return;
+        }
+
+        // render on display
+        render_circle_middle();
+        render_keylog(t);
+    }
+}
+
+void update_circle(uint16_t keycode) {
+    // special animation for special keys
+    if (keycode == KC_ESC || keycode == KC_SPACE || keycode == KC_ENTER) {
+        anim_center_timer         = timer_read();
+        anim_center_current_frame = 0;
+        return;
+    }
+
+    // cancel special animation on a new key
+    anim_center_current_frame = ANIM_CENTER_FRAME_NUMBER;
+
+    // out of scope key
+    if (keycode >= 60) {
+        return;
+    }
+
+    // keycode to char
+    char c = pgm_read_byte(&code_to_name[keycode]);
+
+    // stock previous char
+    c_previous = c_last;
+    c_last     = c;
+
+    // start keylog animation
+    anim_keylog_current_frame = 0;
+
+    // update target in ring #1 position
+    if (TesterEstDansListe(c, tListeTotal)) {
+        c_target = c;
+        return;
+    }
+
+    // update target in #2 position
+    if (TesterEstDansListe(c, tListeTotal2)) {
+        c_target2 = c;
+        return;
+    }
+}
diff --git a/keyboards/lily58/keymaps/druotoni/ring.h b/keyboards/lily58/keymaps/druotoni/ring.h
new file mode 100644
index 0000000000..9ce4520e64
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/ring.h
@@ -0,0 +1,11 @@
+// Copyright 2021 Nicolas Druoton (druotoni)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define SIZE_ARRAY_1 16
+#define CURSOR_1 9
+
+void update_circle(uint16_t);
+void render_circle(gui_state_t t);
+void reset_ring(void);
diff --git a/keyboards/lily58/keymaps/druotoni/rules.mk b/keyboards/lily58/keymaps/druotoni/rules.mk
new file mode 100644
index 0000000000..c07761108e
--- /dev/null
+++ b/keyboards/lily58/keymaps/druotoni/rules.mk
@@ -0,0 +1,28 @@
+# Build Options
+#   change to "no" to disable the options, or define them in the Makefile in
+#   the appropriate keymap folder that will get included automatically
+#
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+# EXTRAFLAGS += -flto
+LTO_ENABLE = yes
+SPACE_CADET_ENABLE = no
+GRAVE_ESC_ENABLE = no
+MAGIC_ENABLE  = no
+
+# If you want to change the display of OLED, you need to change here
+SRC +=  ./lib/rgb_state_reader.c \
+        ./burst.c \
+        ./navi_logo.c \
+        ./gui_state.c \
+        ./fast_random.c \
+        ./layer_frame.c \
+        ./ring.c \
+        ./boot.c \
+        ./draw_helper.c \
+

From 4bc9adbc64732138ca3d158b8f546bfc4a3fc0b6 Mon Sep 17 00:00:00 2001
From: duoshock <33636898+duoshock@users.noreply.github.com>
Date: Thu, 13 Jan 2022 19:02:38 +0000
Subject: [PATCH 295/867] [Keyboard] Add UM-A Keyboard (#15584)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: online <33636898+online@users.noreply.github.com>
---
 keyboards/merge/uma/config.h                  |  47 +++++
 keyboards/merge/uma/info.json                 |  19 ++
 keyboards/merge/uma/keymaps/default/keymap.c  |  65 ++++++
 keyboards/merge/uma/keymaps/default/readme.md |   3 +
 keyboards/merge/uma/keymaps/default/rules.mk  |   1 +
 keyboards/merge/uma/keymaps/via/keymap.c      |  65 ++++++
 keyboards/merge/uma/keymaps/via/rules.mk      |   2 +
 keyboards/merge/uma/readme.md                 |  22 ++
 keyboards/merge/uma/rules.mk                  |  23 +++
 keyboards/merge/uma/uma.c                     | 109 ++++++++++
 keyboards/merge/uma/uma.h                     | 192 ++++++++++++++++++
 11 files changed, 548 insertions(+)
 create mode 100644 keyboards/merge/uma/config.h
 create mode 100644 keyboards/merge/uma/info.json
 create mode 100644 keyboards/merge/uma/keymaps/default/keymap.c
 create mode 100644 keyboards/merge/uma/keymaps/default/readme.md
 create mode 100644 keyboards/merge/uma/keymaps/default/rules.mk
 create mode 100644 keyboards/merge/uma/keymaps/via/keymap.c
 create mode 100644 keyboards/merge/uma/keymaps/via/rules.mk
 create mode 100644 keyboards/merge/uma/readme.md
 create mode 100644 keyboards/merge/uma/rules.mk
 create mode 100644 keyboards/merge/uma/uma.c
 create mode 100644 keyboards/merge/uma/uma.h

diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h
new file mode 100644
index 0000000000..46bad7185f
--- /dev/null
+++ b/keyboards/merge/uma/config.h
@@ -0,0 +1,47 @@
+/* Copyright 2021 duoshock 
+ * 
+ * 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 "config_common.h"
+
+#define VENDOR_ID       0x4D65
+#define PRODUCT_ID      0x3232
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Merge
+#define PRODUCT         UM-A
+
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
+#define UNUSED_PINS
+
+#define BACKLIGHT_PIN C6
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define SOFT_SERIAL_PIN D2
+#define SPLIT_USB_DETECT
+#define SPLIT_MODS_ENABLE
+
+#define DEBOUNCE 5
+
+#define ENCODERS_PAD_A { B4 }
+#define ENCODERS_PAD_B { B5 }
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json
new file mode 100644
index 0000000000..8cd1ca3ddd
--- /dev/null
+++ b/keyboards/merge/uma/info.json
@@ -0,0 +1,19 @@
+{
+    "keyboard_name": "UM-A",
+    "url": "https://mergedesign.store/products/um-a",
+    "maintainer": "duoshock",
+    "layouts": {
+        "LAYOUT_ansi_rspace_2u_bksp": {
+            "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"Backspace", "x":16.5, "y":0, "w":2}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"label":"Alt", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}]
+        },
+        "LAYOUT_ansi_rspace_split_bksp": {
+            "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"~", "x":16.5, "y":0}, {"label":"Backspace", "x":17.5, "y":0}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"label":"Alt", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}]
+        },
+        "LAYOUT_ansi_lspace_2u_bksp": {
+            "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"Backspace", "x":16.5, "y":0, "w":2}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":2.25}, {"label":"Alt", "x":7.5, "y":4, "w":1.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}]
+        },
+        "LAYOUT_ansi_lspace_split_bksp": {
+            "layout": [{"label":"Esc", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"~", "x":16.5, "y":0}, {"label":"Backspace", "x":17.5, "y":0}, {"label":"Encoder", "x":19, "y":0}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Home", "x":19, "y":1}, {"label":"M0", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"End", "x":19, "y":2}, {"label":"M1", "x":0, "y":3}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3.25}, {"label":"M2", "x":0, "y":4}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.25}, {"label":"Win", "x":2.75, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":2.25}, {"label":"Alt", "x":7.5, "y":4, "w":1.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4.25}, {"label":"\u2193", "x":17.75, "y":4.25}, {"label":"\u2192", "x":18.75, "y":4.25}]
+        }
+    }
+}
diff --git a/keyboards/merge/uma/keymaps/default/keymap.c b/keyboards/merge/uma/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7105d1e0a9
--- /dev/null
+++ b/keyboards/merge/uma/keymaps/default/keymap.c
@@ -0,0 +1,65 @@
+/* Copyright 2021 duoshock
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+ *          .---------------------------.          .-------------------------------.        .---.
+ *          |Esc|  1|  2|  3|  4|  5|  6|          |  7|  8|  9|  0|  -|  =|  Bsp  |        |EC |
+ *          |-------------------------.          .---------------------------------|        |---|
+ *          |Tab  |  Q|  W|  E|  R|  T|          |  Y|  U|  I|  O|  P|  [|  ]|  \  |        |Hom|
+ *   .---.  |-------------------------.          '---------------------------------|        |---|
+ *   |M0 |  |CapsL |  A|  S|  D|  F|  G|          |  H|  J|  K|  L|  ;|  :|   Retn |        |End|
+ *   |---|  |----------------------------.        '--------------------------------|  .---. '---'
+ *   |M1 |  |Shft|ISO\|  Z|  X|  C|  V|  B|          |  N|  M|  ,|  ,|  /|  Shift|     |Up |
+ *   |---|  |------------------- ---------|          |---------------------------' .-----------.
+ *   |M2 |  |Ctl |Gui|      |Alt |Space   |          |    Space|   Alt|   Ctl|     |Lef|Dow|Rig|
+ *   '---'  '----------- -----------------'          '-----------------------'     '-----------'
+ */
+
+[0] = LAYOUT_ansi_rspace_2u_bksp(
+            KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,                KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,       KC_BSPC,      KC_MUTE,
+            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_HOME,
+    KC_1,   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_END,
+    KC_2,   KC_LSFT,  KC_Z, KC_X, KC_C, KC_V, KC_B,                    KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,             KC_UP,
+    KC_3,   KC_LCTL, KC_LGUI,      KC_LALT, KC_SPC,                    KC_SPC, KC_RALT, KC_RCTL,                               KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+[1] = LAYOUT_ansi_rspace_2u_bksp(
+                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
+                KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, KC_TRNS
+),
+[2] = LAYOUT_ansi_rspace_2u_bksp(
+                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
+                KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, KC_TRNS
+),
+[3] = LAYOUT_ansi_rspace_2u_bksp(
+                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
+                KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, KC_TRNS
+),
+};
+
diff --git a/keyboards/merge/uma/keymaps/default/readme.md b/keyboards/merge/uma/keymaps/default/readme.md
new file mode 100644
index 0000000000..2ef78dd3aa
--- /dev/null
+++ b/keyboards/merge/uma/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# Default UM-A Layout
+
+![UM-A Layout Image](https://i.imgur.com/bKkO3gS.jpg)
diff --git a/keyboards/merge/uma/keymaps/default/rules.mk b/keyboards/merge/uma/keymaps/default/rules.mk
new file mode 100644
index 0000000000..90fc9b184b
--- /dev/null
+++ b/keyboards/merge/uma/keymaps/default/rules.mk
@@ -0,0 +1 @@
+WPM_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/merge/uma/keymaps/via/keymap.c b/keyboards/merge/uma/keymaps/via/keymap.c
new file mode 100644
index 0000000000..46688d4a76
--- /dev/null
+++ b/keyboards/merge/uma/keymaps/via/keymap.c
@@ -0,0 +1,65 @@
+/* Copyright 2021 duoshock
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+ *          .---------------------------.          .-------------------------------.        .---.
+ *          |Esc|  1|  2|  3|  4|  5|  6|          |  7|  8|  9|  0|  -|  =|  Bsp  |        |EC |
+ *          |-------------------------.          .---------------------------------|        |---|
+ *          |Tab  |  Q|  W|  E|  R|  T|          |  Y|  U|  I|  O|  P|  [|  ]|  \  |        |Hom|
+ *   .---.  |-------------------------.          '---------------------------------|        |---|
+ *   |M0 |  |CapsL |  A|  S|  D|  F|  G|          |  H|  J|  K|  L|  ;|  :|   Retn |        |End|
+ *   |---|  |----------------------------.        '--------------------------------|  .---. '---'
+ *   |M1 |  |Shft|ISO\|  Z|  X|  C|  V|  B|          |  N|  M|  ,|  ,|  /|  Shift|     |Up |
+ *   |---|  |------------------- ---------|          |---------------------------' .-----------.
+ *   |M2 |  |Ctl |Gui|      |Alt |Space   |          |    Space|   Alt|   Ctl|     |Lef|Dow|Rig|
+ *   '---'  '----------- -----------------'          '-----------------------'     '-----------'
+ */
+
+[0] = LAYOUT_all(
+            KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6,                KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV,  KC_BSPC,   KC_MUTE,
+            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_HOME,
+    KC_1,   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_END,
+    KC_2,   KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B,            KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,                   KC_UP,
+    KC_3,   KC_LCTL, KC_LGUI,      KC_LALT, KC_SPC,                    KC_SPC, KC_RALT, KC_RCTL,                               KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+[1] = LAYOUT_all(
+                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
+                KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, KC_TRNS
+),
+[2] = LAYOUT_all(
+                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
+                KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, KC_TRNS
+),
+[3] = LAYOUT_all(
+                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
+                KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,         KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS,                                        KC_TRNS, KC_TRNS, KC_TRNS
+),
+};
+
diff --git a/keyboards/merge/uma/keymaps/via/rules.mk b/keyboards/merge/uma/keymaps/via/rules.mk
new file mode 100644
index 0000000000..d03b5f1ca7
--- /dev/null
+++ b/keyboards/merge/uma/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+WPM_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/merge/uma/readme.md b/keyboards/merge/uma/readme.md
new file mode 100644
index 0000000000..7a7958b169
--- /dev/null
+++ b/keyboards/merge/uma/readme.md
@@ -0,0 +1,22 @@
+# UM-A
+
+![UM-A](https://i.imgur.com/Bm1mRDbl.jpg)
+
+A Alice like layout keyboard with arrow keys, encoder and OLED screen sold by Merge. [Product page](https://mergedesign.store/products/um-70)
+
+* Keyboard Maintainer: [duoshock](https://github.com/duoshock)
+* Hardware Availability: [Merge Store](https://mergedesign.store/products/um-a)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make merge/uma: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the Esc key on the left side or '7' key on the right side and plug in the keyboard.
+
+* **Physical reset button**: Briefly press the button on the back of the PCB.
diff --git a/keyboards/merge/uma/rules.mk b/keyboards/merge/uma/rules.mk
new file mode 100644
index 0000000000..27f0425b4f
--- /dev/null
+++ b/keyboards/merge/uma/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+SPLIT_KEYBOARD = yes
+LTO_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
diff --git a/keyboards/merge/uma/uma.c b/keyboards/merge/uma/uma.c
new file mode 100644
index 0000000000..376cdfd3fe
--- /dev/null
+++ b/keyboards/merge/uma/uma.c
@@ -0,0 +1,109 @@
+/* Copyright 2021 duoshock 
+ * 
+ * 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 "uma.h"
+
+#ifdef OLED_ENABLE
+void suspend_power_down_user(void) {
+    oled_off();
+}
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    if (is_keyboard_master()) {
+        return OLED_ROTATION_90;
+    }
+
+    return rotation;
+}
+
+static void render_logo(void) {
+    static const char PROGMEM raw_logo[] = {
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,192,192,224,224,224,224,224,224,224,224,224,224,224,224,224,224,192,192,128,128,192,192,224,224,224,224,224,224,224,224,192,192,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 15,  3,  1,  0,  1,255,255,255,255,255,255,255,255,255,255,255,255,255,255,254,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,254,254,254,  0,  0,  0,  0,  0,  0,254,254,254,  0,  0,  0,254,254,254,252,240,224,128,128,224,240,252,254,254,254,  0,  0,128,128,128,128,128,128,  0,  0,  0,  0,  0,224,248,252, 62, 62,252,240,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,240,192,128,  0,128,255,255,255,255,255,255,255,255,255,255,255,255,255,255,127, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0, 15, 31, 63,120,112,112,112,112,120, 63, 31, 15,  0,  0,  0,127,127,127,  0,  1,  7,  7,  7,  7,  1,  0,127,127,127,  0,  0,  3,  3,  3,  3,  3,  3,  1,  0,112,124,127, 31, 15, 14, 14, 14, 15, 15, 31,127,124, 32,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 
+        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  3,  3,  1,  1,  3,  3,  7,  7,  7,  7,  7,  7,  7,  7,  3,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+    };
+    oled_write_raw_P(raw_logo, sizeof(raw_logo));
+}
+
+
+// 32 * 18 Merge logos
+static const char PROGMEM merge_logo[] = {
+    0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0e,
+    0x06, 0x04, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0xc0,
+    0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xc0,
+    0x80, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f,
+    0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01,
+    0x01, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00
+};
+
+int current_wpm = 0;
+
+static void print_status_narrow(void) {
+    oled_set_cursor(0,1);
+    oled_write_raw_P(merge_logo, sizeof(merge_logo));
+    oled_set_cursor(0,5);
+    oled_write_P(PSTR("-----"), false);
+    oled_set_cursor(0,6);
+    oled_write_P(PSTR("LYR "), false);
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_P(PSTR("0"), false);
+            break;
+        case 1:
+            oled_write_P(PSTR("1"), false);
+            break;
+        case 2:
+            oled_write_P(PSTR("2"), false);
+            break;
+        case 3:
+            oled_write_P(PSTR("3"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Undef"), false);
+    }
+    led_t led_usb_state = host_keyboard_led_state();
+    oled_write_ln_P(PSTR(" "), false);
+    oled_write_P(PSTR("CAP "), false);
+    oled_write_P(PSTR("."), led_usb_state.caps_lock);
+    oled_write_P(PSTR("NUM "), false);
+    oled_write_P(PSTR("."), led_usb_state.num_lock);
+    oled_write_P(PSTR("SCR "), false);
+    oled_write_P(PSTR("."), led_usb_state.scroll_lock);
+    //oled_write_ln_P(PSTR(" "), false);
+    oled_write_P(PSTR("-----"), false);
+
+    // WPM counter Start
+    oled_set_cursor(0,13);
+    oled_write(" ", false);
+    oled_write(get_u8_str(get_current_wpm(), '0'), false);
+    oled_set_cursor(0,14);
+    oled_write(" WPM ", false);
+    // WPM counter End
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+    if (is_keyboard_master()) {
+        print_status_narrow();
+        //render_logo();
+    } else {
+        render_logo();
+        //print_status_narrow();
+    }
+    return false;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/merge/uma/uma.h b/keyboards/merge/uma/uma.h
new file mode 100644
index 0000000000..b7fb9a5d61
--- /dev/null
+++ b/keyboards/merge/uma/uma.h
@@ -0,0 +1,192 @@
+/* Copyright 2021 duoshock 
+ * 
+ * This program is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 2 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05, R06, R07,     R27, \
+            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
+    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
+    L46,    L30, L41, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
+    L47,    L40, L42,           L43, L44,                   R40, R41, R42,                              R43, R44, R45 \
+) { \
+    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
+    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
+    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
+    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
+    { L40, L41, L42, L43, L44, L45, L46, L47 }, \
+    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
+    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
+    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
+    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
+    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
+}
+
+#define LAYOUT_ansi_rspace_split_bksp( \
+            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05, R06, R07,     R27, \
+            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
+    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
+    L46,    L30, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
+    L47,    L40, L42,           L43, L44,                   R40, R41, R42,                              R43, R44, R45 \
+) { \
+    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
+    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
+    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
+    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
+    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
+    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
+    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
+    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
+    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
+}
+
+#define LAYOUT_ansi_rspace_2u_bksp( \
+            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05,    R07,       R27, \
+            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
+    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
+    L46,    L30, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
+    L47,    L40, L42,           L43, L44,                   R40, R41, R42,                              R43, R44, R45 \
+) { \
+    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
+    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
+    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
+    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
+    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { R00, R01, R02, R03, R04, R05, XXX, R07 }, \
+    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
+    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
+    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
+    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
+}
+
+#define LAYOUT_ansi_lspace_2u_bksp( \
+            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05,    R07,       R27, \
+            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
+    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
+    L46,    L30, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
+    L47,    L40, L42,           L44, L43,                   R40, R41, R42,                              R43, R44, R45 \
+) { \
+    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
+    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
+    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
+    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
+    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { R00, R01, R02, R03, R04, R05, XXX, R07 }, \
+    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
+    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
+    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
+    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
+}
+
+#define LAYOUT_ansi_lspace_split_bksp( \
+            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05, R06, R07,     R27, \
+            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
+    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
+    L46,    L30, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
+    L47,    L40, L42,           L44, L43,                   R40, R41, R42,                              R43, R44, R45 \
+) { \
+    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
+    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
+    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
+    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
+    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
+    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
+    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
+    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
+    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
+}
+
+#define LAYOUT_iso_rspace_split_bksp( \
+            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05, R06, R07,     R27, \
+            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
+    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
+    L46,    L30, L41, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
+    L47,    L40, L42,           L43, L44,                   R40, R41, R42,                              R43, R44, R45 \
+) { \
+    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
+    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
+    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
+    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
+    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
+    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
+    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
+    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
+    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
+}
+
+#define LAYOUT_iso_rspace_2u_bksp( \
+            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05,    R07,       R27, \
+            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
+    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
+    L46,    L30, L41, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
+    L47,    L40, L42,           L43, L44,                   R40, R41, R42,                              R43, R44, R45 \
+) { \
+    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
+    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
+    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
+    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
+    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { R00, R01, R02, R03, R04, R05, XXX, R07 }, \
+    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
+    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
+    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
+    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
+}
+
+#define LAYOUT_iso_lspace_2u_bksp( \
+            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05,    R07,       R27, \
+            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
+    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
+    L46,    L30, L41, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
+    L47,    L40, L42,           L44, L43,                   R40, R41, R42,                              R43, R44, R45 \
+) { \
+    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
+    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
+    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
+    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
+    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { R00, R01, R02, R03, R04, R05, XXX, R07 }, \
+    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
+    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
+    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
+    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
+}
+
+#define LAYOUT_iso_lspace_split_bksp( \
+            L00, L01, L02, L03, L04, L05, L06,              R00, R01, R02, R03, R04, R05, R06, R07,     R27, \
+            L10, L11, L12, L13, L14, L15,                   R10, R11, R12, R13, R14, R15, R16, R17,     R37, \
+    L45,    L20, L21, L22, L23, L24, L25,                   R20, R21, R22, R23, R24, R25, R26,          R47, \
+    L46,    L30, L41, L31, L32, L33, L34, L35,              R46, R30, R31, R32, R33, R34, R35,                    R36,\
+    L47,    L40, L42,           L44, L43,                   R40, R41, R42,                              R43, R44, R45 \
+) { \
+    { L00, L01, L02, L03, L04, L05, L06, XXX }, \
+    { L10, L11, L12, L13, L14, L15, XXX, XXX }, \
+    { L20, L21, L22, L23, L24, L25, XXX, XXX }, \
+    { L30, L31, L32, L33, L34, L35, XXX, XXX }, \
+    { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+    { R00, R01, R02, R03, R04, R05, R06, R07 }, \
+    { R10, R11, R12, R13, R14, R15, R16, R17 }, \
+    { R20, R21, R22, R23, R24, R25, R26, R27 }, \
+    { R30, R31, R32, R33, R34, R35, R36, R37 }, \
+    { R40, R41, R42, R43, R44, R45, R46, R47 }  \
+}

From 2fa43de6f6f13b3345b7226cb8e29de93636e6de Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Thu, 13 Jan 2022 11:58:19 -0800
Subject: [PATCH 296/867] [Keyboard] Fix xox70hot via layout (#15863)

---
 keyboards/mokey/xox70hot/keymaps/via/keymap.c | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/keyboards/mokey/xox70hot/keymaps/via/keymap.c b/keyboards/mokey/xox70hot/keymaps/via/keymap.c
index bee84ef860..4af0d343a8 100644
--- a/keyboards/mokey/xox70hot/keymaps/via/keymap.c
+++ b/keyboards/mokey/xox70hot/keymaps/via/keymap.c
@@ -17,31 +17,33 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT_all(
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INSERT, KC_HOME, KC_PGUP,
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,KC_DELETE, KC_END,  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_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_RSFT,KC_UP,
-		KC_LCTL, KC_LGUI, KC_LALT,KC_SPC,KC_RALT, KC_RGUI, KC_RCTL,KC_LEFT, KC_DOWN, KC_RGHT),
+    LAYOUT(
+        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_INSERT, KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DELETE, KC_END,  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, KC_GRV,  KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-	[1] = LAYOUT_all(
-		KC_TRNS, 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_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[2] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[3] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+    LAYOUT(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______,                     _______, _______, _______
+    ),
+    LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______,                     _______, _______, _______
+    ),
+    LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______,                     _______, _______, _______
+    ),
 };

From ae9feed5663a6ed96f49c5a614cea68a82afd323 Mon Sep 17 00:00:00 2001
From: peott-fr <70998091+peott-fr@users.noreply.github.com>
Date: Thu, 13 Jan 2022 12:43:40 -0800
Subject: [PATCH 297/867] Adding Quefrency keymap (#15852)

---
 .../quefrency/keymaps/peott-fr/keymap.c       | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c

diff --git a/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c b/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
new file mode 100644
index 0000000000..98f17f1870
--- /dev/null
+++ b/keyboards/keebio/quefrency/keymaps/peott-fr/keymap.c
@@ -0,0 +1,80 @@
+ /* Copyright 2022 peott
+  *
+  * 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
+
+// Only for actual custom keycodes (not just renaming existing tapdance etc...).
+//enum custom_keycodes {
+//  QWERTY = SAFE_RANGE,
+//};
+
+// Layers by name.
+enum custom_layers {
+    _BASE,
+    _FN,
+    _NUM
+};
+
+// Keycodes for cleaner code
+#define L_CTRL LCTL_T(KC_MPRV)
+#define L_GUI LGUI_T(KC_MPLY)
+#define L_ALT LALT_T(KC_MNXT)
+// Layers defined by function
+#define LR_SPC LT(_FN,KC_SPC)
+#define LR_BKSP LT(_FN,KC_BSPC)
+#define LR_NUM LT(_NUM,KC_HOME)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_60_with_macro(
+    KC_F1, KC_F2,  KC_ESC,  KC_1,  KC_2,  KC_3,   KC_4,   KC_5, KC_6, KC_7,    KC_8,    KC_9,    KC_0,    KC_9,    KC_MINS, KC_GRV,  KC_DEL, 
+    KC_F3, KC_F4,  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_F5, KC_F6,  KC_LCTL, KC_A,  KC_S,  KC_D,   KC_F,   KC_G,       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT, 
+    KC_F7, KC_F8,  KC_LSPO, KC_Z,  KC_X,  KC_C,   KC_V,   KC_B,       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, LR_NUM, 
+    KC_F9, KC_F10, L_CTRL,  L_GUI, L_ALT, KC_APP, LR_SPC,             LR_BKSP, LR_BKSP, KC_RALT, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+    [_FN] = LAYOUT_60_with_macro(
+    KC_TRNS, KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_LSFT, KC_CALC, KC_MYCM, KC_PSCR, KC_ENT,  KC_BSPC,        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_RALT, KC_HOME, KC_PGDN, KC_PGUP, KC_END
+    ),
+    [_NUM] = LAYOUT_60_with_macro(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_P7,   KC_P8,   KC_P9,   KC_PPLS, 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_P4,   KC_P5,   KC_P6,   KC_PCMM, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_P1,   KC_P2,   KC_P3,   KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_P0,   KC_P0,   KC_PDOT, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}

From 8fe320baa6d6aab7dc5cb1526a9b0df9cc666ed9 Mon Sep 17 00:00:00 2001
From: Tuk Bredsdorff <tiktuk@gmail.com>
Date: Thu, 13 Jan 2022 22:55:48 +0100
Subject: [PATCH 298/867] Fix keymap.json macro example (#15567)

---
 docs/feature_macros.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_macros.md b/docs/feature_macros.md
index f39c1a40e8..810028cf70 100644
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -46,7 +46,7 @@ If you type in a language other than English, or use a non-QWERTY layout like Co
 {
     "keyboard": "handwired/my_macropad",
     "keymap": "my_keymap",
-    "host_layout": "dvorak",
+    "host_language": "dvorak",
     "macros": [
         ["Hello, World!"]
     ],

From 5d51fd4015151c900e79fefc8ece887ce213fae3 Mon Sep 17 00:00:00 2001
From: Bartosz Nowak <bartosz.nowak@vimn.com>
Date: Fri, 14 Jan 2022 05:33:39 +0100
Subject: [PATCH 299/867] [Keyboard] Fixing dactyl manuform 6x6 warnings
 (#15868)

---
 keyboards/handwired/dactyl_manuform/6x6/6x6.h | 28 +++---
 .../handwired/dactyl_manuform/6x6/info.json   | 96 +++++++++++++++++++
 2 files changed, 113 insertions(+), 11 deletions(-)

diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.h b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
index 097d1095e8..7bff55701a 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/6x6.h
+++ b/keyboards/handwired/dactyl_manuform/6x6/6x6.h
@@ -43,14 +43,20 @@
                         L54,                                    R51, \
                                   L64, L65,      R60, R61, \
                                   L62, L63,      R62, R63 \
-) LAYOUT_6x6( \
-    L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
-    L40, L41, L42, L43, L44, L45,                          R40, R41, R42, R43, R44, R45, \
-              L52, L53,                                              R52, R53, \
-                        L54, XXX,                          XXX, R51, \
-                                  L64, L65,      R60, R61, \
-                                  L62, L63,      R62, R63 \
-)
+) { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, L31, L32, L33, L34, L35 }, \
+    { L40, L41, L42, L43, L44, L45 }, \
+    { XXX, XXX, L52, L53, L54, XXX }, \
+    { XXX, XXX, L62, L63, L64, L65 }, \
+\
+    { R00, R01, R02, R03, R04, R05 }, \
+    { R10, R11, R12, R13, R14, R15 }, \
+    { R20, R21, R22, R23, R24, R25 }, \
+    { R30, R31, R32, R33, R34, R35 }, \
+    { R40, R41, R42, R43, R44, R45 }, \
+    { XXX, R51, R52, R53, XXX, XXX }, \
+    { R60, R61, R62, R63, XXX, XXX } \
+}
diff --git a/keyboards/handwired/dactyl_manuform/6x6/info.json b/keyboards/handwired/dactyl_manuform/6x6/info.json
index 596126879e..9154312580 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/info.json
@@ -96,6 +96,102 @@
                 {"x": 6, "y": 8},
                 {"x": 7, "y": 8},
 
+                {"x": 9, "y": 8},
+                {"x": 10, "y": 8}
+            ]
+        },
+        
+        "LAYOUT_6x6_5_thumb": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+
+                {"x": 11, "y": 2},
+                {"x": 12, "y": 2},
+                {"x": 13, "y": 2},
+                {"x": 14, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+
+                {"x": 2, "y": 5},
+                {"x": 3, "y": 5},
+
+                {"x": 13, "y": 5},
+                {"x": 14, "y": 5},
+
+                {"x": 4, "y": 6},
+
+                {"x": 11, "y": 6},
+
+                {"x": 6, "y": 7},
+                {"x": 7, "y": 7},
+
+                {"x": 9, "y": 7},
+                {"x": 10, "y": 7},
+
+                {"x": 6, "y": 8},
+                {"x": 7, "y": 8},
+
                 {"x": 9, "y": 8},
                 {"x": 10, "y": 8}
             ]

From 851cb7e406ec775462b9eb9975f1b0f34445b48f Mon Sep 17 00:00:00 2001
From: DA <56441863+duongaanh@users.noreply.github.com>
Date: Fri, 14 Jan 2022 11:37:40 +0700
Subject: [PATCH 300/867] [Keyboard] and CB87v2 and CB87RGB and fixed CB1800
 and CB87 (#15824)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/cherrybstudio/cb1800/config.h       |   2 +-
 keyboards/cherrybstudio/cb87/config.h         |   2 +
 keyboards/cherrybstudio/cb87rgb/cb87rgb.c     |  60 ++++++++++
 keyboards/cherrybstudio/cb87rgb/cb87rgb.h     |  37 ++++++
 keyboards/cherrybstudio/cb87rgb/config.h      | 106 ++++++++++++++++++
 keyboards/cherrybstudio/cb87rgb/info.json     | 102 +++++++++++++++++
 .../cb87rgb/keymaps/default/keymap.c          |  34 ++++++
 .../cb87rgb/keymaps/default/readme.md         |   1 +
 .../cb87rgb/keymaps/via/keymap.c              |  51 +++++++++
 .../cb87rgb/keymaps/via/rules.mk              |   2 +
 keyboards/cherrybstudio/cb87rgb/readme.md     |  26 +++++
 keyboards/cherrybstudio/cb87rgb/rules.mk      |  21 ++++
 keyboards/cherrybstudio/cb87v2/cb87v2.c       |  14 +++
 keyboards/cherrybstudio/cb87v2/cb87v2.h       |  36 ++++++
 keyboards/cherrybstudio/cb87v2/config.h       |  74 ++++++++++++
 keyboards/cherrybstudio/cb87v2/info.json      | 103 +++++++++++++++++
 .../cb87v2/keymaps/default/keymap.c           |  34 ++++++
 .../cb87v2/keymaps/default/readme.md          |   1 +
 .../cherrybstudio/cb87v2/keymaps/via/keymap.c |  51 +++++++++
 .../cherrybstudio/cb87v2/keymaps/via/rules.mk |   2 +
 keyboards/cherrybstudio/cb87v2/readme.md      |  26 +++++
 keyboards/cherrybstudio/cb87v2/rules.mk       |  18 +++
 22 files changed, 802 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/cherrybstudio/cb87rgb/cb87rgb.c
 create mode 100644 keyboards/cherrybstudio/cb87rgb/cb87rgb.h
 create mode 100644 keyboards/cherrybstudio/cb87rgb/config.h
 create mode 100644 keyboards/cherrybstudio/cb87rgb/info.json
 create mode 100644 keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c
 create mode 100644 keyboards/cherrybstudio/cb87rgb/keymaps/default/readme.md
 create mode 100644 keyboards/cherrybstudio/cb87rgb/keymaps/via/keymap.c
 create mode 100644 keyboards/cherrybstudio/cb87rgb/keymaps/via/rules.mk
 create mode 100644 keyboards/cherrybstudio/cb87rgb/readme.md
 create mode 100644 keyboards/cherrybstudio/cb87rgb/rules.mk
 create mode 100644 keyboards/cherrybstudio/cb87v2/cb87v2.c
 create mode 100644 keyboards/cherrybstudio/cb87v2/cb87v2.h
 create mode 100644 keyboards/cherrybstudio/cb87v2/config.h
 create mode 100644 keyboards/cherrybstudio/cb87v2/info.json
 create mode 100644 keyboards/cherrybstudio/cb87v2/keymaps/default/keymap.c
 create mode 100644 keyboards/cherrybstudio/cb87v2/keymaps/default/readme.md
 create mode 100644 keyboards/cherrybstudio/cb87v2/keymaps/via/keymap.c
 create mode 100644 keyboards/cherrybstudio/cb87v2/keymaps/via/rules.mk
 create mode 100644 keyboards/cherrybstudio/cb87v2/readme.md
 create mode 100644 keyboards/cherrybstudio/cb87v2/rules.mk

diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index 81d24669dc..a9932fe735 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_CAPS_LOCK_PIN F5
 #define LED_NUM_LOCK_PIN F6
 #define LED_SCROLL_LOCK_PIN F7
-
+#define LED_PIN_ON_STATE 0
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
index 41a153081d..41c7f3f25b 100644
--- a/keyboards/cherrybstudio/cb87/config.h
+++ b/keyboards/cherrybstudio/cb87/config.h
@@ -49,6 +49,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #define LED_CAPS_LOCK_PIN F0
+#define LED_SCROLL_LOCK_PIN F4
+#define LED_PIN_ON_STATE 0
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
diff --git a/keyboards/cherrybstudio/cb87rgb/cb87rgb.c b/keyboards/cherrybstudio/cb87rgb/cb87rgb.c
new file mode 100644
index 0000000000..362a991652
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87rgb/cb87rgb.c
@@ -0,0 +1,60 @@
+/*
+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 "cb87rgb.h"
+
+//x = 224 / (NUMBER_OF_COLS - 1) * COL_POSITION
+//y =  64 / (NUMBER_OF_ROWS - 1) * ROW_POSITION
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+  { 0,       1,      2,      3,      4,      5,      6,      7,      8,      9 },
+  { 10,     11,     12,     13,     14,     15,     16,     17,     18,     19 },
+  { 20,     21,     22,     23,     24,     25,     26,     27,     28,     29 },
+  { 30,     31,     32,     33,     34,     35,     36,     37,     38,     39 },
+  { 40,     41,     42,     43,     44,     45,     46,     47,     48,     49 },
+  { 50,     51,     52,     53,     54,     55,     56,     57,     58,     59 },
+  { 60,     61,     62,     63,     64,     65,     66,     67,     68,     69 },
+  { 70,     71,     72,     73,     74,     75,     76,     77,     78,     79 },
+  { 80,     81,     82,     83,     84,     85,     86,     87,     88,     89 },
+  { 90,     91, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }
+}, {
+    // LED Index to Physical Position
+    {   0,   0 }, { 13,   0 }, { 26,   0 }, { 39,   0 }, { 52,   0 }, { 65,   0 }, { 78,   0 }, { 91,   0 }, { 104,   0 }, { 117,   0 }, { 130,   0 }, { 143,   0 }, { 156,   0 },                                 {   195,   0 }, {   208,   0 }, {   224,   0 },
+    {   0,  12 }, { 13,  12 }, { 26,  12 }, { 39,  12 }, { 52,  12 }, { 65,  12 }, { 78,  12 }, { 91,  12 }, { 104,  12 }, { 117,  12 }, { 130,  12 }, { 143,  12 }, { 156,  12 }, {   169,  12 }, {   182,  24 }, {   195,  12 }, {   208,  12 }, {   224,  12 },
+    {   0,  24 }, { 13,  24 }, { 26,  24 }, { 39,  24 }, { 52,  24 }, { 65,  24 }, { 78,  24 }, { 91,  24 }, { 104,  24 }, { 117,  24 }, { 130,  24 }, { 143,  24 }, { 156,  24 }, {   169,  24 },                 {   195,  24 }, {   208,  24 }, {   224,  24 },
+    {   0,  36 }, { 13,  36 }, { 26,  36 }, { 39,  36 }, { 52,  36 }, { 65,  36 }, { 78,  36 }, { 91,  36 }, { 104,  36 }, { 117,  36 }, { 130,  36 }, { 143,  36 }, { 156,  36 }, {   169,  36 },
+    {   0,  48 }, { 13,  48 }, { 26,  48 }, { 39,  48 }, { 52,  48 }, { 65,  48 }, { 78,  48 }, { 91,  48 }, { 104,  48 }, { 117,  48 }, { 130,  48 }, { 143,  48 }, { 156,  48 }, {   169,  48 },                                 {   208,  48 },
+    {   0,  64 }, { 13,  64 }, { 26,  64 },                                        { 78,  64 },                                          { 130,  64 }, { 143,  64 }, { 156,  64 }, {   169,  64 },                 {   195,  64 }, {   208,  64 }, {   224,  64 }, {   182,  0 }
+}, {
+    // LED Index to Flag
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,       1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,       1,
+    1, 1, 1,          1,          1, 1, 1, 1, 1, 1, 1, 1
+
+} };
+
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(51, 255, 255, 255);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        rgb_matrix_set_color(14, 255, 255, 255);
+    }
+}
+#endif
diff --git a/keyboards/cherrybstudio/cb87rgb/cb87rgb.h b/keyboards/cherrybstudio/cb87rgb/cb87rgb.h
new file mode 100644
index 0000000000..16702e516b
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87rgb/cb87rgb.h
@@ -0,0 +1,37 @@
+/*
+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( \
+    K000,    K001, K002, K003,K004,    K005, K006, K007,K008,    K009, K100, K101, K102, K901,  K103, K104, K105,    \
+    K106,  K107, K108, K109, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K300,  K301, K302, K303,    \
+    K304,    K305, K306, K307, K308, K309, K400, K401, K402, K403, K404, K405, K406,     K407,  K408, K409, K500,    \
+    K501,     K502, K503, K504, K505, K506, K507, K508, K509, K600, K601, K602,    K603, K604,                       \
+    K605, K606, K607, K608, K609, K700, K701, K702, K703, K704, K705, K706,     K707,    K708,        K709,          \
+    K800,  K801,  K802,                K803,                  K804, K805,   K806,  K807,        K808, K809, K900     \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,   }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,   }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,   }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,   }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,   }, \
+	{ K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509,   }, \
+	{ K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609,   }, \
+	{ K700,  K701,  K702,  K703,  K704,  K705,  K706,  K707,  K708,  K709,   }, \
+	{ K800,  K801,  K802,  K803,  K804,  K805,  K806,  K807,  K808,  K809,   }, \
+    { K900,  K901   }  \
+}
+
diff --git a/keyboards/cherrybstudio/cb87rgb/config.h b/keyboards/cherrybstudio/cb87rgb/config.h
new file mode 100644
index 0000000000..ccf7aceee9
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87rgb/config.h
@@ -0,0 +1,106 @@
+/*
+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       0x4342 // CB
+#define PRODUCT_ID      0x8785
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    CherryB.Studio
+#define PRODUCT         CB87RGB
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 10
+
+/*
+ * 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)
+ *
+ *                        0   1   2   3   4   5   6   7   8   9
+*/
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, F6 }
+#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 }
+//#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define RGB_DI_PIN E6
+#define DRIVER_LED_TOTAL 92
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+#define RGB_MATRIX_LED_FLUSH_LIMIT 16
+#define RGB_MATRIX_KEYPRESSES
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json
new file mode 100644
index 0000000000..e183066bd5
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87rgb/info.json
@@ -0,0 +1,102 @@
+    {
+        "keyboard_name": "cb87v2",
+        "url": "https://discord.gg/qVwv3gcq83",
+        "maintainer": "duongaanh",
+        "layouts": {
+            "LAYOUT_all": {
+                "layout": [
+                    {"label":"Esc", "x":0, "y":0},
+                    {"label":"F1", "x":1.25, "y":0},
+                    {"label":"F2", "x":2.25, "y":0},
+                    {"label":"F3", "x":3.25, "y":0},
+                    {"label":"F4", "x":4.25, "y":0},
+                    {"label":"F5", "x":5.5, "y":0},
+                    {"label":"F6", "x":6.5, "y":0},
+                    {"label":"F7", "x":7.5, "y":0},
+                    {"label":"F8", "x":8.5, "y":0},
+                    {"label":"F9", "x":9.75, "y":0},
+                    {"label":"F10", "x":10.75, "y":0},
+                    {"label":"F11", "x":11.75, "y":0},
+                    {"label":"F12", "x":12.75, "y":0},
+                    {"label":"Esc", "x":14, "y":0},
+                    {"label":"PrtSc", "x":15.25, "y":0},
+                    {"label":"Scroll Lock", "x":16.25, "y":0},
+                    {"label":"Pause", "x":17.25, "y":0},
+                    {"label":"~", "x":0, "y":1.5},
+                    {"label":"!", "x":1, "y":1.5},
+                    {"label":"@", "x":2, "y":1.5},
+                    {"label":"#", "x":3, "y":1.5},
+                    {"label":"$", "x":4, "y":1.5},
+                    {"label":"%", "x":5, "y":1.5},
+                    {"label":"^", "x":6, "y":1.5},
+                    {"label":"&", "x":7, "y":1.5},
+                    {"label":"*", "x":8, "y":1.5},
+                    {"label":"(", "x":9, "y":1.5},
+                    {"label":")", "x":10, "y":1.5},
+                    {"label":"_", "x":11, "y":1.5},
+                    {"label":"+", "x":12, "y":1.5},
+                    {"label":"Backspace", "x":13, "y":1.5},
+                    {"label":"Backspace", "x":14, "y":1.5},
+                    {"label":"Insert", "x":15.25, "y":1.5},
+                    {"label":"Home", "x":16.25, "y":1.5},
+                    {"label":"PgUp", "x":17.25, "y":1.5},
+                    {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                    {"label":"Q", "x":1.5, "y":2.5},
+                    {"label":"W", "x":2.5, "y":2.5},
+                    {"label":"E", "x":3.5, "y":2.5},
+                    {"label":"R", "x":4.5, "y":2.5},
+                    {"label":"T", "x":5.5, "y":2.5},
+                    {"label":"Y", "x":6.5, "y":2.5},
+                    {"label":"U", "x":7.5, "y":2.5},
+                    {"label":"I", "x":8.5, "y":2.5},
+                    {"label":"O", "x":9.5, "y":2.5},
+                    {"label":"P", "x":10.5, "y":2.5},
+                    {"label":"{", "x":11.5, "y":2.5},
+                    {"label":"}", "x":12.5, "y":2.5},
+                    {"label":"|", "x":13.5, "y":2.5, "w":1.5},
+                    {"label":"Delete", "x":15.25, "y":2.5},
+                    {"label":"End", "x":16.25, "y":2.5},
+                    {"label":"PgDn", "x":17.25, "y":2.5},
+                    {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                    {"label":"A", "x":1.75, "y":3.5},
+                    {"label":"S", "x":2.75, "y":3.5},
+                    {"label":"D", "x":3.75, "y":3.5},
+                    {"label":"F", "x":4.75, "y":3.5},
+                    {"label":"G", "x":5.75, "y":3.5},
+                    {"label":"H", "x":6.75, "y":3.5},
+                    {"label":"J", "x":7.75, "y":3.5},
+                    {"label":"K", "x":8.75, "y":3.5},
+                    {"label":"L", "x":9.75, "y":3.5},
+                    {"label":":", "x":10.75, "y":3.5},
+                    {"label":"\"", "x":11.75, "y":3.5},
+                    {"label":"ISO~", "x":12.75, "y":3.5},
+                    {"label":"Enter", "x":13.75, "y":3.5, "w":1.25},
+                    {"label":"LShift", "x":0, "y":4.5, "w":1.25},
+                    {"label":"ISO|", "x":1.25, "y":4.5},
+                    {"label":"Z", "x":2.25, "y":4.5},
+                    {"label":"X", "x":3.25, "y":4.5},
+                    {"label":"C", "x":4.25, "y":4.5},
+                    {"label":"V", "x":5.25, "y":4.5},
+                    {"label":"B", "x":6.25, "y":4.5},
+                    {"label":"N", "x":7.25, "y":4.5},
+                    {"label":"M", "x":8.25, "y":4.5},
+                    {"label":"<", "x":9.25, "y":4.5},
+                    {"label":">", "x":10.25, "y":4.5},
+                    {"label":"?", "x":11.25, "y":4.5},
+                    {"label":"RShift", "x":12.25, "y":4.5, "w":1.75},
+                    {"label":"RShift", "x":14, "y":4.5},
+                    {"label":"Up", "x":16.25, "y":4.5},
+                    {"label":"LCtrl", "x":0, "y":5.5, "w":1.25},
+                    {"label":"LWin", "x":1.25, "y":5.5, "w":1.25},
+                    {"label":"LAlt", "x":2.5, "y":5.5, "w":1.25},
+                    {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
+                    {"label":"RAlt", "x":10, "y":5.5, "w":1.25},
+                    {"label":"RWin", "x":11.25, "y":5.5, "w":1.25},
+                    {"label":"Menu", "x":12.5, "y":5.5, "w":1.25},
+                    {"label":"RCtrl", "x":13.75, "y":5.5, "w":1.25},
+                    {"label":"Left", "x":15.25, "y":5.5},
+                    {"label":"Down", "x":16.25, "y":5.5},
+                    {"label":"Right", "x":17.25, "y":5.5}]
+            }
+        }
+    }
diff --git a/keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c b/keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..343c3ebc1f
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87rgb/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+         KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, RESET,  KC_PSCR, KC_SLCK, KC_PAUS,
+         KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+         KC_TAB,     KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,     KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
+         KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,    KC_ENT,
+         KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT,             KC_UP,
+         KC_LCTL, KC_LGUI, KC_LALT,              KC_SPC,             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT_all(
+         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+         KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,  KC_TRNS,            KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+};
diff --git a/keyboards/cherrybstudio/cb87rgb/keymaps/default/readme.md b/keyboards/cherrybstudio/cb87rgb/keymaps/default/readme.md
new file mode 100644
index 0000000000..d68382007d
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87rgb/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for cb1800
\ No newline at end of file
diff --git a/keyboards/cherrybstudio/cb87rgb/keymaps/via/keymap.c b/keyboards/cherrybstudio/cb87rgb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..56646b57c3
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87rgb/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/*
+Copyright 2020 Tybera
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+         KC_ESC,   KC_F1, KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7, KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12, KC_ESC,  KC_PSCR, KC_SLCK, KC_PAUS,
+         KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+         KC_TAB,     KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,     KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
+         KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,    KC_ENT,
+         KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT,             KC_UP,
+         KC_LCTL, KC_LGUI, KC_LALT,              KC_SPC,             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT_all(
+         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+         KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,  KC_TRNS,            KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+         KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,  KC_TRNS,            KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+         KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,  KC_TRNS,            KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
+
diff --git a/keyboards/cherrybstudio/cb87rgb/keymaps/via/rules.mk b/keyboards/cherrybstudio/cb87rgb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..ca9fed0e6b
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87rgb/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/cherrybstudio/cb87rgb/readme.md b/keyboards/cherrybstudio/cb87rgb/readme.md
new file mode 100644
index 0000000000..f7c9985d8c
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87rgb/readme.md
@@ -0,0 +1,26 @@
+# CherryB Studio CB87RGB
+
+![cb87rgb](https://i.imgur.com/wG1qS4I.jpg)
+
+A RGB TKL PCB including hotswap and solderable variant for CherryB Studio NEO87 and many compatible TKLs
+
+* Keyboard Maintainer: duongaanh
+* Hardware Supported: cb87rgb, atmega32u4
+* Hardware Availability: [CherryB Studio](https://discord.gg/3gsCa8K)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cherrybstudio/cb87rgb:default
+
+Flashing example for this keyboard:
+
+    make cherrybstudio/cb87rgb:default:flash
+
+## Accessing Bootloader Mode
+
+To access Bootloader Mode, do one of the following:
+
+* Tap the Reset switch mounted on the top side of the PCB to the left of the spacebar
+* Hold the top left key of the keyboard while connecting the USB cable
+
+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).
diff --git a/keyboards/cherrybstudio/cb87rgb/rules.mk b/keyboards/cherrybstudio/cb87rgb/rules.mk
new file mode 100644
index 0000000000..9f610c8a90
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87rgb/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/cherrybstudio/cb87v2/cb87v2.c b/keyboards/cherrybstudio/cb87v2/cb87v2.c
new file mode 100644
index 0000000000..8d2fbba409
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87v2/cb87v2.c
@@ -0,0 +1,14 @@
+/*
+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 "cb87v2.h"
diff --git a/keyboards/cherrybstudio/cb87v2/cb87v2.h b/keyboards/cherrybstudio/cb87v2/cb87v2.h
new file mode 100644
index 0000000000..9f60aa6b51
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87v2/cb87v2.h
@@ -0,0 +1,36 @@
+/*
+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( \
+    K000,    K001, K002, K003,K004,    K005, K006, K007,K008,    K009, K100, K101, K102,        K103, K104, K105,    \
+    K106,  K107, K108, K109, K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K300,  K301, K302, K303,    \
+    K304,    K305, K306, K307, K308, K309, K400, K401, K402, K403, K404, K405, K406,     K407,  K408, K409, K500,    \
+    K501,     K502, K503, K504, K505, K506, K507, K508, K509, K600, K601, K602,    K603, K604,                       \
+    K605, K606, K607, K608, K609, K700, K701, K702, K703, K704, K705, K706,     K707,    K708,        K709,          \
+    K800,  K801,  K802,      K803,         K804,         K805,      K806,  K807,  K808,  K809,  K900, K901, K902     \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,   }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,   }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,   }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,   }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,   }, \
+	{ K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  K509,   }, \
+	{ K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609,   }, \
+	{ K700,  K701,  K702,  K703,  K704,  K705,  K706,  K707,  K708,  K709,   }, \
+	{ K800,  K801,  K802,  K803,  K804,  K805,  K806,  K807,  K808,  K809,   }, \
+    { K900,  K901,  K902   }  \
+}
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
new file mode 100644
index 0000000000..782262ebfb
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -0,0 +1,74 @@
+/*
+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       0x4342 // CB
+#define PRODUCT_ID      0x8788
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    CherryB.Studio
+#define PRODUCT         CB87v2
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 10
+
+/*
+ * 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)
+ *
+ *                        0   1   2   3   4   5   6   7   8   9
+*/
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, F6 }
+#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, F5, C6, C7, F7 }
+//#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+#define LED_CAPS_LOCK_PIN F0
+#define LED_SCROLL_LOCK_PIN F4
+#define LED_PIN_ON_STATE 0
+#define BACKLIGHT_PIN B6
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 3
+#endif
+
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define RGB_DI_PIN E6
+#ifdef RGB_DI_PIN
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 24
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#endif
diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json
new file mode 100644
index 0000000000..8b79d0623b
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87v2/info.json
@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "cb87v2",
+    "url": "https://discord.gg/qVwv3gcq83",
+    "maintainer": "duongaanh",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"PrtSc", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"!", "x":1, "y":1.25},
+                {"label":"@", "x":2, "y":1.25},
+                {"label":"#", "x":3, "y":1.25},
+                {"label":"$", "x":4, "y":1.25},
+                {"label":"%", "x":5, "y":1.25},
+                {"label":"^", "x":6, "y":1.25},
+                {"label":"&", "x":7, "y":1.25},
+                {"label":"*", "x":8, "y":1.25},
+                {"label":"(", "x":9, "y":1.25},
+                {"label":")", "x":10, "y":1.25},
+                {"label":"_", "x":11, "y":1.25},
+                {"label":"+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"PgUp", "x":17.25, "y":1.25},
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"{", "x":11.5, "y":2.25},
+                {"label":"}", "x":12.5, "y":2.25},
+                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"PgDn", "x":17.25, "y":2.25},
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":":", "x":10.75, "y":3.25},
+                {"label":"\"", "x":11.75, "y":3.25},
+                {"label":"ISO~", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":3.25, "w":1.25},
+                {"label":"lShift", "x":0, "y":4.25, "w":1.25},
+                {"label":"ISO|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":"<", "x":9.25, "y":4.25},
+                {"label":">", "x":10.25, "y":4.25},
+                {"label":"?", "x":11.25, "y":4.25},
+                {"label":"rShift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"rshift", "x":14, "y":4.25},
+                {"label":"up", "x":16.25, "y":4.25},
+                {"label":"lCtrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"lWin", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"lAlt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"space", "x":3.75, "y":5.25, "w":2.25},
+                {"label":"space", "x":6, "y":5.25, "w":1.25},
+                {"label":"space", "x":7.25, "y":5.25, "w":2.75},
+                {"label":"rAlt", "x":10, "y":5.25, "w":1.25},
+                {"label":"rWin", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"rCtrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"left", "x":15.25, "y":5.25},
+                {"label":"down", "x":16.25, "y":5.25},
+                {"label":"right", "x":17.25, "y":5.25}]
+        }
+    }
+}
diff --git a/keyboards/cherrybstudio/cb87v2/keymaps/default/keymap.c b/keyboards/cherrybstudio/cb87v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..0833509794
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87v2/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+         KC_ESC,    KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+         KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+         KC_TAB,     KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,     KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
+         KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,    KC_ENT,
+         KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT,             KC_UP,
+         KC_LCTL, KC_LGUI, KC_LALT,   KC_SPC,    KC_SPC,    KC_SPC,         KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT_all(
+         KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,
+         KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+         KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+         KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,  KC_TRNS,                     KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,    KC_TRNS,    KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+};
diff --git a/keyboards/cherrybstudio/cb87v2/keymaps/default/readme.md b/keyboards/cherrybstudio/cb87v2/keymaps/default/readme.md
new file mode 100644
index 0000000000..d68382007d
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87v2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for cb1800
\ No newline at end of file
diff --git a/keyboards/cherrybstudio/cb87v2/keymaps/via/keymap.c b/keyboards/cherrybstudio/cb87v2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..8c08f10a01
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87v2/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/*
+Copyright 2020 Tybera
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+         KC_ESC,    KC_F1, KC_F2, KC_F3, KC_F4,     KC_F5, KC_F6, KC_F7, KC_F8,     KC_F9, KC_F10, KC_F11, KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+         KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,
+         KC_TAB,     KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,     KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,
+         KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS,    KC_ENT,
+         KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT,             KC_UP,
+         KC_LCTL, KC_LGUI, KC_LALT,   KC_SPC,    KC_SPC,    KC_SPC,         KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT_all(
+         KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,
+         KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+         KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+         KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,  KC_TRNS,                     KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,    KC_TRNS,    KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+         KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,
+         KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+         KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+         KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,  KC_TRNS,                     KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,    KC_TRNS,    KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+         KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS,
+         KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+         KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+         KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,  KC_TRNS,                     KC_TRNS,
+         KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,    KC_TRNS,    KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
+
diff --git a/keyboards/cherrybstudio/cb87v2/keymaps/via/rules.mk b/keyboards/cherrybstudio/cb87v2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..ca9fed0e6b
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87v2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/cherrybstudio/cb87v2/readme.md b/keyboards/cherrybstudio/cb87v2/readme.md
new file mode 100644
index 0000000000..0fc32c40c1
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87v2/readme.md
@@ -0,0 +1,26 @@
+# CherryB Studio CB87v2
+
+![cb87v2](https://i.imgur.com/0DqZDXw.jpg)
+
+An advance TKL PCB with many configurable layouts
+
+* Keyboard Maintainer: duongaanh
+* Hardware Supported: cb87v2, atmega32u4
+* Hardware Availability: [CherryB Studio](https://discord.gg/qVwv3gcq83)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cherrybstudio/cb87v2:default
+
+Flashing example for this keyboard:
+
+    make cherrybstudio/cb87v2:default:flash
+
+## Accessing Bootloader Mode
+
+To access Bootloader Mode, do one of the following:
+
+* Tap the Reset switch behind the PCB near the MCU
+* Hold the top left key of the keyboard while connecting the USB cable
+
+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).
diff --git a/keyboards/cherrybstudio/cb87v2/rules.mk b/keyboards/cherrybstudio/cb87v2/rules.mk
new file mode 100644
index 0000000000..3bd45154f4
--- /dev/null
+++ b/keyboards/cherrybstudio/cb87v2/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 0f110737dba362596fcdbebd6c2bd4cc574f344b Mon Sep 17 00:00:00 2001
From: asdfire1 <45483619+asdfire1@users.noreply.github.com>
Date: Fri, 14 Jan 2022 05:38:25 +0100
Subject: [PATCH 301/867] [Keyboard] Add VIA support for the Drop Alt (#15857)

---
 keyboards/massdrop/alt/keymaps/via/keymap.c | 128 ++++++++++++++++++++
 keyboards/massdrop/alt/keymaps/via/rules.mk |   1 +
 2 files changed, 129 insertions(+)
 create mode 100644 keyboards/massdrop/alt/keymaps/via/keymap.c
 create mode 100644 keyboards/massdrop/alt/keymaps/via/rules.mk

diff --git a/keyboards/massdrop/alt/keymaps/via/keymap.c b/keyboards/massdrop/alt/keymaps/via/keymap.c
new file mode 100644
index 0000000000..fd1bf3c0b0
--- /dev/null
+++ b/keyboards/massdrop/alt/keymaps/via/keymap.c
@@ -0,0 +1,128 @@
+/* Copyright 2021 Asdfire (@asdfire1)
+ *
+ * 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 alt_keycodes {
+    U_T_AUTO = SAFE_RANGE, //USB Extra Port Toggle Auto Detect / Always Active
+    U_T_AGCR,              //USB Toggle Automatic GCR control
+    DBG_TOG,               //DEBUG Toggle On / Off
+    DBG_MTRX,              //DEBUG Toggle Matrix Prints
+    DBG_KBD,               //DEBUG Toggle Keyboard Prints
+    DBG_MOU,               //DEBUG Toggle Mouse Prints
+    MD_BOOT,               //Restart into bootloader after hold timeout
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi_blocker(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        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_HOME,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker(
+        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_MUTE,
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, U_T_AUTO,U_T_AGCR,_______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        _______, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______,          _______, KC_VOLU,
+        _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_PGUP, KC_VOLD,
+        _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END
+    ),
+    [2] = LAYOUT_65_ansi_blocker(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        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_HOME,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+};
+
+#define MODS_SHIFT  (get_mods() & MOD_BIT(KC_LSHIFT) || get_mods() & MOD_BIT(KC_RSHIFT))
+#define MODS_CTRL  (get_mods() & MOD_BIT(KC_LCTL) || get_mods() & MOD_BIT(KC_RCTRL))
+#define MODS_ALT  (get_mods() & MOD_BIT(KC_LALT) || get_mods() & MOD_BIT(KC_RALT))
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static uint32_t key_timer;
+
+    switch (keycode) {
+        case U_T_AUTO:
+            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
+                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
+            }
+            return false;
+        case U_T_AGCR:
+            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
+                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
+            }
+            return false;
+        case DBG_TOG:
+            if (record->event.pressed) {
+                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
+            }
+            return false;
+        case DBG_MTRX:
+            if (record->event.pressed) {
+                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
+            }
+            return false;
+        case DBG_KBD:
+            if (record->event.pressed) {
+                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
+            }
+            return false;
+        case DBG_MOU:
+            if (record->event.pressed) {
+                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
+            }
+            return false;
+        case MD_BOOT:
+            if (record->event.pressed) {
+                key_timer = timer_read32();
+            } else {
+                if (timer_elapsed32(key_timer) >= 500) {
+                    reset_keyboard();
+                }
+            }
+            return false;
+        case RGB_TOG:
+            if (record->event.pressed) {
+              switch (rgb_matrix_get_flags()) {
+                case LED_FLAG_ALL: {
+                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                    rgb_matrix_set_color_all(0, 0, 0);
+                  }
+                  break;
+                case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                    rgb_matrix_set_color_all(0, 0, 0);
+                  }
+                  break;
+                case LED_FLAG_UNDERGLOW: {
+                    rgb_matrix_set_flags(LED_FLAG_NONE);
+                    rgb_matrix_disable_noeeprom();
+                  }
+                  break;
+                default: {
+                    rgb_matrix_set_flags(LED_FLAG_ALL);
+                    rgb_matrix_enable_noeeprom();
+                  }
+                  break;
+              }
+            }
+            return false;
+        default:
+            return true; //Process all other keycodes normally
+    }
+}
diff --git a/keyboards/massdrop/alt/keymaps/via/rules.mk b/keyboards/massdrop/alt/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/massdrop/alt/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file

From e865cab48ec25c2fff958b23d89b1f86755d445c Mon Sep 17 00:00:00 2001
From: Eric Gebhart <e.a.gebhart@gmail.com>
Date: Thu, 13 Jan 2022 23:40:41 -0500
Subject: [PATCH 302/867] [Keymap] ericgebhart keymap and userspace updates
 (#15727)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Drashna Jael're <drashna@live.com>
---
 keyboards/crkbd/keymaps/ericgebhart/config.h  |  24 +
 keyboards/crkbd/keymaps/ericgebhart/keymap.c  |  60 ++
 .../ergodox_ez/keymaps/ericgebhart/keymap.c   | 378 +--------
 .../ergodox_ez/keymaps/ericgebhart/layouts.h  | 139 ++++
 .../viterbi/keymaps/ericgebhart/keymap.c      | 185 +----
 .../kinesis/keymaps/ericgebhart/keymap.c      |  53 ++
 .../kinesis/keymaps/ericgebhart/readme.md     |   5 +
 .../kinesis/keymaps/ericgebhart/rules.mk      |  16 +
 .../rebound/rev4/keymaps/ericgebhart/keymap.c | 101 +++
 .../rev4/keymaps/ericgebhart/layouts.h        | 113 +++
 .../rev4/keymaps/ericgebhart/readme.md        |   5 +
 .../rebound/rev4/keymaps/ericgebhart/rules.mk |  16 +
 .../xiudi/xd75/keymaps/ericgebhart/keymap.c   | 159 +---
 users/ericgebhart/altlocal_keys.c             |  94 +++
 users/ericgebhart/altlocal_keys.h             |  36 +
 users/ericgebhart/base_layers.h               | 283 -------
 users/ericgebhart/caps_word.c                 |  81 ++
 users/ericgebhart/caps_word.h                 |  35 +
 users/ericgebhart/combos.def                  |  10 +
 users/ericgebhart/config.h                    |  23 +-
 users/ericgebhart/core_keys.h                 | 229 +++---
 users/ericgebhart/core_keysets.h              | 508 ++++++------
 users/ericgebhart/edge_keys.h                 | 238 ++++++
 users/ericgebhart/ericgebhart.c               | 590 --------------
 users/ericgebhart/ericgebhart.h               |  80 +-
 users/ericgebhart/layers.h                    | 677 ++++++++++++++++
 users/ericgebhart/layouts.h                   | 720 ++++++++++++++++++
 users/ericgebhart/mod_layer.h                 | 178 +++++
 users/ericgebhart/oled_stuff.c                | 303 ++++++++
 users/ericgebhart/oled_stuff.h                |  24 +
 users/ericgebhart/process_records.c           | 255 +++++++
 users/ericgebhart/readme.md                   | 248 ++++--
 users/ericgebhart/rules.mk                    |  28 +-
 users/ericgebhart/tap_dances.c                | 269 +++++++
 users/ericgebhart/tap_dances.h                |  19 +
 35 files changed, 4202 insertions(+), 1980 deletions(-)
 create mode 100755 keyboards/crkbd/keymaps/ericgebhart/config.h
 create mode 100755 keyboards/crkbd/keymaps/ericgebhart/keymap.c
 create mode 100644 keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h
 create mode 100644 keyboards/kinesis/keymaps/ericgebhart/keymap.c
 create mode 100644 keyboards/kinesis/keymaps/ericgebhart/readme.md
 create mode 100644 keyboards/kinesis/keymaps/ericgebhart/rules.mk
 create mode 100644 keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/keymap.c
 create mode 100644 keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/layouts.h
 create mode 100644 keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/readme.md
 create mode 100644 keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/rules.mk
 create mode 100755 users/ericgebhart/altlocal_keys.c
 create mode 100644 users/ericgebhart/altlocal_keys.h
 delete mode 100644 users/ericgebhart/base_layers.h
 create mode 100644 users/ericgebhart/caps_word.c
 create mode 100644 users/ericgebhart/caps_word.h
 create mode 100644 users/ericgebhart/combos.def
 mode change 100644 => 100755 users/ericgebhart/core_keys.h
 mode change 100644 => 100755 users/ericgebhart/core_keysets.h
 create mode 100644 users/ericgebhart/edge_keys.h
 mode change 100644 => 100755 users/ericgebhart/ericgebhart.c
 mode change 100644 => 100755 users/ericgebhart/ericgebhart.h
 create mode 100755 users/ericgebhart/layers.h
 create mode 100644 users/ericgebhart/layouts.h
 create mode 100644 users/ericgebhart/mod_layer.h
 create mode 100755 users/ericgebhart/oled_stuff.c
 create mode 100755 users/ericgebhart/oled_stuff.h
 create mode 100755 users/ericgebhart/process_records.c
 mode change 100644 => 100755 users/ericgebhart/readme.md
 create mode 100755 users/ericgebhart/tap_dances.c
 create mode 100755 users/ericgebhart/tap_dances.h

diff --git a/keyboards/crkbd/keymaps/ericgebhart/config.h b/keyboards/crkbd/keymaps/ericgebhart/config.h
new file mode 100755
index 0000000000..d1844f6807
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ericgebhart/config.h
@@ -0,0 +1,24 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// otherwise the other promicro v3 isn't found
+#define SPLIT_USB_DETECT
diff --git a/keyboards/crkbd/keymaps/ericgebhart/keymap.c b/keyboards/crkbd/keymaps/ericgebhart/keymap.c
new file mode 100755
index 0000000000..e893ec596b
--- /dev/null
+++ b/keyboards/crkbd/keymaps/ericgebhart/keymap.c
@@ -0,0 +1,60 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "ericgebhart.h"
+
+#define Crkbd_base(...)        Base_3x6_3(__VA_ARGS__)
+#define Crkbd_bepo(...)        Base_bepo_3x6_3(__VA_ARGS__)
+#define Crkbd_bepo6(...)       Base_bepo6_3x6_3(__VA_ARGS__)
+#define Crkbd_transient(...)   Transient6_3x6_3(__VA_ARGS__)
+
+/*
+ * The `Crkbd_base` macro is a template to allow the use of identical
+ * modifiers for the default layouts (eg QWERTY, Colemak, Dvorak, etc), so
+ * that there is no need to set them up for each layout, and modify all of
+ * them if I want to change them.  This helps to keep consistency and ease
+ * of use. K## is a placeholder to pass through the individual keycodes
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // Qwerty based Base layers
+    [_DVORAK]  = Crkbd_base(___DVORAK___),
+    [_BEAKL]   = Crkbd_base(___BEAKL15___),
+    [_COLEMAK] = Crkbd_base(___COLEMAK_DH___),
+    [_QWERTY]  = Crkbd_base(___QWERTY___),
+
+    // Bepo base layers
+    [_BEAKL_BP]  = Crkbd_bepo(___BEAKL15_FR___),
+    [_DVORAK_BP] = Crkbd_bepo(___DVORAK_FR___),
+    [_BEPO]      = Crkbd_bepo6(___BEPO6___),
+
+    // Transient layers.
+    [_SYMB]    = Crkbd_transient(___SYMB_BEAKLB_3x12___),
+    [_SYMB_BP] = Crkbd_transient(___SYMB_BEAKLB_BP_3x12___),
+
+    [_KEYPAD]    = Crkbd_transient(___KP_C_3x12___),
+    [_KEYPAD_BP] = Crkbd_transient(___KP_C_BP_3x12___),
+
+    [_TOPROWS]    = Crkbd_transient(___TOPROWS_3x12___),
+    [_TOPROWS_BP] = Crkbd_transient(___TOPROWS_BP_3x12___),
+
+    [_NAV] = Crkbd_transient(___NAV_3x12___),
+
+    [_LAYERS] = Crkbd_transient(___LAYERS_3x12___),
+    //[_RGB] = Crkbd_transient(___RGB_3x12___),
+    [_ADJUST] = Crkbd_transient(___ADJUST_3x12___),
+    ///HPT_TOG, KC_NUKE, ___,        ___, TG_MODS, HPT_FBK
+};
diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c
index 55bf4209fd..e76e3296bf 100644
--- a/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/ericgebhart/keymap.c
@@ -16,369 +16,33 @@
 */
 #include "keymap_bepo.h"
 #include "ericgebhart.h"
-
+#include "layouts.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [DVORAK] = LAYOUT_ergodox_wrapper(
-      // left hand
-      KC_GRV,     ___NUMBER_L___,   OSL(LAYERS),
-      KC_LOCK,    ___DVORAK_L1___,  LCTL(KC_C),
-      TAB_BKTAB,  ___DVORAK_L2___,
-      KC_LSFT,    ___DVORAK_L3___,  TO(MDIA),
-
-      ___BOTTOM_LEFT___,
-      ___ERGODOX_THUMB_LEFT___,
-
-      // right hand
-      MDIA_SYMB_KP_LAYERS,  ___NUMBER_R___,   KC_EQL,
-      LCTL(KC_V), ___DVORAK_R1___,  KC_SLASH,
-      /*    */    ___DVORAK_R2___,  KC_MINUS,
-      TO(KEYPAD), ___DVORAK_R3___,  KC_RSFT,
-
-      ___BOTTOM_RIGHT___,
-      ___ERGODOX_THUMB_RIGHT___
-      ),
-
-  [XMONAD] = LAYOUT_ergodox_wrapper(
-      // left hand
-      ___,  ___FUNC_L___,     ___,
-      ___,  ___DVORAK_L1___,  ___,
-      ___,  ___DVORAK_L2___,
-      ___,  ___DVORAK_L3___,  ___,
-
-      ___BOTTOM_LEFT___,
-      ___ERGODOX_THUMB_LEFT___,
-
-      // right hand
-      ___,  ___FUNC_R___,     ___,
-      ___,  ___DVORAK_R1___,  ___,
-      /**/  ___DVORAK_R2___,  ___,
-      ___,  ___DVORAK_R3___,  ___,
-
-      ___BOTTOM_RIGHT___,
-      ___ERGODOX_THUMB_RIGHT___
-      ),
-
-  [QWERTY] = LAYOUT_ergodox_wrapper(
-                            // left hand
-      KC_GRV,     ___NUMBER_L___,   OSL(LAYERS),
-      KC_LOCK,    ___QWERTY_L1___,  LCTL(KC_C),
-      TAB_BKTAB,  ___QWERTY_L2___,
-      KC_LSFT,    ___QWERTY_L3___,  TO(MDIA),
-
-      ___BOTTOM_LEFT___,
-      ___ERGODOX_THUMB_LEFT___,
-
-      // right hand
-      MDIA_SYMB_KP_LAYERS,  ___NUMBER_R___,   KC_EQL,
-      LCTL(KC_V), ___QWERTY_R1___,  KC_SLASH,
-      /*       */ ___QWERTY_R2___,  KC_MINUS,
-      TO(KEYPAD), ___QWERTY_R3___,  KC_RSFT,
-
-      ___BOTTOM_RIGHT___,
-      ___ERGODOX_THUMB_RIGHT___
-          ),
-
-  [COLEMAK] = LAYOUT_ergodox_wrapper(
-      // left hand
-      KC_GRV,     ___NUMBER_L___,    OSL(LAYERS),
-      KC_LOCK,    ___COLEMAK_L1___,  LCTL(KC_C),
-      TAB_BKTAB,  ___COLEMAK_L2___,
-      KC_LSFT,    ___COLEMAK_L3___,  TO(MDIA),
-
-      ___BOTTOM_LEFT___,
-      ___ERGODOX_THUMB_LEFT___,
-
-      // right hand
-      MDIA_SYMB_KP_LAYERS,  ___NUMBER_R___,    KC_EQL,
-      LCTL(KC_V), ___COLEMAK_R1___,  KC_SLASH,
-      /*       */ ___COLEMAK_R2___,  KC_MINUS,
-      TO(KEYPAD), ___COLEMAK_R3___,  KC_RSFT,
-
-      ___BOTTOM_RIGHT___,
-      ___ERGODOX_THUMB_RIGHT___
-          ),
-
-  [WORKMAN] = LAYOUT_ergodox_wrapper(
-      // left hand
-      KC_GRV,     ___NUMBER_L___,    OSL(LAYERS),
-      KC_LOCK,    ___WORKMAN_L1___,  LCTL(KC_C),
-      TAB_BKTAB,  ___WORKMAN_L2___,
-      KC_LSFT,    ___WORKMAN_L3___,  TO(MDIA),
-
-      ___BOTTOM_LEFT___,
-      ___ERGODOX_THUMB_LEFT___,
-
-      // right hand
-      MDIA_SYMB_KP_LAYERS,  ___NUMBER_R___,    KC_EQL,
-      LCTL(KC_V), ___WORKMAN_R1___,  KC_SLASH,
-      /*    */    ___WORKMAN_R2___,  KC_MINUS,
-      TO(KEYPAD), ___WORKMAN_R3___,  KC_RSFT,
-
-      ___BOTTOM_RIGHT___,
-      ___ERGODOX_THUMB_RIGHT___
-      ),
-
-  [NORMAN] = LAYOUT_ergodox_wrapper(
-      // left hand
-      KC_GRV,     ___NUMBER_L___,   OSL(LAYERS),
-      KC_LOCK,    ___NORMAN_L1___,  LCTL(KC_C),
-      TAB_BKTAB,  ___NORMAN_L2___,
-      KC_LSFT,    ___NORMAN_L3___,  TO(MDIA),
-
-      ___BOTTOM_LEFT___,
-      ___ERGODOX_THUMB_LEFT___,
-
-      // right hand
-      MDIA_SYMB_KP_LAYERS,  ___NUMBER_R___,   KC_EQL,
-      LCTL(KC_V), ___NORMAN_R1___,  KC_SLASH,
-      /*       */ ___NORMAN_R2___,  KC_MINUS,
-      TO(KEYPAD), ___NORMAN_R3___,  KC_RSFT,
-
-      ___BOTTOM_RIGHT___,
-      ___ERGODOX_THUMB_RIGHT___
-      ),
-
-  [DVORAK_ON_BEPO] = LAYOUT_ergodox_wrapper(
-      // left hand
-      DB_GRV,     ___NUMBER_BEPO_L___,  OSL(LAYERS),
-      KC_LOCK,    ___DVORAK_FR_L1___,   DB_LBRC,
-      TAB_BKTAB,  ___DVORAK_FR_L2___,
-      KC_LSFT,    ___DVORAK_FR_L3___,   DB_LPRN,
-
-      ___BOTTOM_LEFT_FR___,
-      ___ERGODOX_THUMB_LEFT_BP___,
+    // Qwerty Base layers
+    [_DVORAK]  = Dox_base(___NUMS___, ___DVORAK___),
+    [_QWERTY]  = Dox_base(___NUMS___, ___QWERTY___),
+    [_COLEMAK] = Dox_base(___NUMS___, ___COLEMAK_DH___),
+    [_BEAKL]   = Dox_base(___NUMS___, ___BEAKL15___),
+    // Bepo Base layers
+    [_DVORAK_BP] = Dox_bepo_base(___NUMS_BP___,    ___DVORAK_FR___),
+    [_BEAKL_BP]  = Dox_bepo_base(___BKLNUMS_BP___, ___BEAKL15_FR___),
+    [_BEPO]      = Dox_bepo_base6(___BEPO6___),
 
 
-      // right hand
-      MDIA_SYMB_KP_LAYERS,   ___NUMBER_BEPO_R___,  DB_EQL,
-      DB_RBRC,     ___DVORAK_FR_R1___,   DB_SLASH,
+    // transient layers.
+    // Switch to using a transient layer macro
+    [_SYMB]    = Dox_transient(___12_FUNC___, ___SYMB_BEAKLA_3x12___),
+    [_SYMB_BP] = Dox_transient(___12_FUNC___, ___SYMB_BEAKLA_BP_3x12___),
 
-      /*      */   ___DVORAK_FR_R2___,   DB_MINUS,
-      DB_RPRN,     ___DVORAK_FR_R3___,   KC_RSFT,
+    [_TOPROWS]    = Dox_transient(___12___, ___TOPROWS_3x12___),
+    [_TOPROWS_BP] = Dox_transient(___12___, ___TOPROWS_BP_3x12___),
 
-      ___BOTTOM_RIGHT_FR___,
-      ___ERGODOX_THUMB_RIGHT_BP___
-      ),
+    [_KEYPAD]    = Dox_transient(___KEYPAD_BKL_FUNC_4x12___),
+    [_KEYPAD_BP] = Dox_transient(___KEYPAD_BKL_FUNC_BP_4x12___),
 
-  [BEPO] = LAYOUT_ergodox_wrapper(
-      // Left hand
-      BP_DLR,         ___SYMBOL_BEPO_L___,  OSL(LAYERS),
-      KC_LOCK,        ___BEPO_FR_L1___,     DB_LBRC,
-      TAB_BKTAB,      ___BEPO_FR_L2___,
-      BP_SFT_T_ECRC,  ___BEPO_FR_L3___,     DB_RBRC,
-
-      ___5___,
-      ___6___,
-
-
-      // Right hand
-      MDIA_SYMB_KP_LAYERS,  ___SYMBOL_BEPO_R___,  BP_EQL,
-      BP_DCIR, ___BEPO_FR_R1___, BP_W,
-      /*    */ ___BEPO_FR_R2___, BP_CCED,
-      BP_C,    ___BEPO_FR_R3___, KC_RSFT,
-
-      ___5___,
-      ___6___
-      ),
-
-  [XMONAD_FR] = LAYOUT_ergodox_wrapper(
-      // left hand
-      ___,  ___FUNC_L___,        ___,
-      ___,  ___DVORAK_FR_L1___,  ___,
-      ___,  ___DVORAK_FR_L2___,
-      ___,  ___DVORAK_FR_L3___,  ___,
-
-      ___BOTTOM_LEFT_FR___,
-      ___ERGODOX_THUMB_LEFT_BP___,
-
-
-      // right hand
-      ___,  ___FUNC_R___,         ___,
-      ___,  ___DVORAK_FR_R1___,   ___,
-      /**/  ___DVORAK_FR_R2___,   ___,
-      ___,  ___DVORAK_FR_R3___,   ___,
-
-      ___BOTTOM_RIGHT_FR___,
-      ___ERGODOX_THUMB_RIGHT_BP___
-      ),
-
-  // SYMBOLS
-  [SYMB] = LAYOUT_ergodox_wrapper(
-                          // left hand
-      ___FUNC_1_6___,    ___,
-      ___SYMBOLS6_1___,  ___,
-      ___SYMBOLS6_2___,
-      ___SYMBOLS6_3___,  ___,
-      ___SYMBOLS5_4___,
-      ___6___,
-
-
-      // right hand
-      ___,  ___FUNC_7_12___,
-      ___,  ___SYMPAD_1___,
-      /**/  ___SYMPAD_2___,
-      ___,  ___SYMPAD_3___,
-      /**/  ___5_SYMPAD_4___,
-      ___6___
-      ),
-
-  [SYMB_ON_BEPO] = LAYOUT_ergodox_wrapper(
-      // left hand
-      ___FUNC_1_6___,       ___,
-      ___SYMBOLS6_1_BP___,  ___,
-      ___SYMBOLS6_2_BP___,
-      ___SYMBOLS6_3_BP___,  ___,
-      ___SYMBOLS5_4_BP___,
-      ___6___,
-
-
-      // right hand
-      ___,  ___FUNC_7_12___,
-      ___,  ___SYMPAD_1_BP___,
-      /**/  ___SYMPAD_2_BP___,
-      ___,  ___SYMPAD_3_BP___,
-      /**/  ___5_SYMPAD_4_BP___,
-      ___6___
-      ),
-
-  [KEYPAD] = LAYOUT_ergodox_wrapper(
-      ___FUNC_1_6___,                ___,
-      ___2___, ___FUNCPAD_T___, ___, ___,
-      ___2___, ___FUNCPAD_1___, ___,
-      ___2___, ___FUNCPAD_2___, ___, ___,
-      ___2___, ___FUNCPAD_3___,
-      ___6___,
-
-      // right hand
-      ___,  ___FUNC_7_12___,
-      ___, ___, ___KEYPAD_1___, ___,
-      /**/ ___, ___KEYPAD_2___, ___,
-      ___, ___, ___KEYPAD_3___, ___,
-      /*     */ ___KEYPAD_4___, ___,
-      ___6___
-      ),
-
-  [KEYPAD_ON_BEPO] = LAYOUT_ergodox_wrapper(
-      ___FUNC_1_6___,                ___,
-      ___2___, ___FUNCPAD_T___, ___, ___,
-      ___2___, ___FUNCPAD_1___, ___,
-      ___2___, ___FUNCPAD_2___, ___, ___,
-      ___2___, ___FUNCPAD_3___,
-      ___6___,
-
-      // right hand
-      ___,  ___FUNC_7_12___,
-      ___, ___, ___KEYPAD_1_BP___, ___,
-      /**/ ___, ___KEYPAD_2_BP___, ___,
-      ___, ___, ___KEYPAD_3_BP___, ___,
-      /*     */ ___KEYPAD_4_BP___, ___,
-      ___6___
-      ),
-
-  // MEDIA AND MOUSE
-  [MDIA] = LAYOUT_ergodox_wrapper(
-      // left hand
-      ___FUNC_1_6___,      ___,
-      ___MOUSE_BTNS_L___,  ___, ___,
-      ___,  ___MOUSE_LDUR___,   ___,
-      ___,  ___MWHEEL_LDUR___,  XXX,  ___,
-      ___,  ___,  ___MOUSE_ACCL_012___,
-      ___6___,
-
-      // right hand
-      ___,  ___FUNC_7_12___,
-      ___,  KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___,
-      /**/  KC_VOLD, ___VI_ARROWS___,     ___,
-      ___,  ___,     ___MOUSE_BTNS_R___,
-      /*          */ KC_PGDN, KC_PGUP, ___3___,
-      ___6___
-      ),
-
-  [LAYERS] = LAYOUT_ergodox_wrapper(
-      // left hand
-      ___FUNC_1_6___,                           ___,
-      XXX,  XXX,  XXX, ___2_LAYERS_B1___,  XXX, ___,
-      XXX,  XXX,  XXX, ___2_LAYERS_B2___, XXX,
-      XXX,  XXX,  ___3_LAYERS_B3___,       XXX, ___,
-      ___5___,
-      ___6___,
-
-      // right hand
-      ___,  ___FUNC_7_12___,
-      ___,  XXX, ___3_LAYERS_T_BP___,  ___2___,
-      /**/  XXX, ___3_LAYERS_T___,     ___2___,
-      ___,  XXX, ___3_LAYERS_T_CTL___, ___2___,
-      ___5___,
-      ___6___
-      ),
+    [_NAV]    = Dox_transient(___12___, ___NAV_3x12___),
+    [_LAYERS] = Dox_transient(___12___, ___LAYERS_3x12___),
+    [_RGB]    = Dox_transient(___12___, ___RGB_3x12___),
 };
-
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-
-  uint8_t layer = biton32(layer_state);
-
-  ergodox_board_led_off();
-  ergodox_right_led_1_off();
-  ergodox_right_led_2_off();
-  ergodox_right_led_3_off();
-  if(!on_qwerty())
-    ergodox_right_led_1_on();
-  switch (layer) {
-    //case DVORAK:
-    //ergodox_right_led_1_off();
-    //break;
-    // first led on for a bepo software keyboard layer
-  case DVORAK_ON_BEPO:
-    ergodox_right_led_2_on();
-    break;
-  case BEPO:
-    ergodox_right_led_1_on();
-    ergodox_right_led_1_off();
-    ergodox_right_led_1_on();
-    ergodox_right_led_1_off();
-    ergodox_right_led_1_on();
-    break;
-  case SYMB:
-    ergodox_right_led_3_on();
-    break;
-  case MDIA:
-    ergodox_right_led_3_on();
-    break;
-  case LAYERS:
-    ergodox_right_led_1_on();
-    ergodox_right_led_2_on();
-    ergodox_right_led_3_on();
-    break;
-  default:
-    ergodox_board_led_off();
-    break;
-
-    /* default: */
-    /*   // none */
-    /*   break; */
-
-  }
-}
-
-
-/*
-  clear_oneshot_mods();
-  set_oneshot_locked_mods(mods);
-  register_mods(mods);
-
-  register_code(action.key.code);
-  unregister_code(action.key.code);
-
-  layer_on(action.layer_tap.val);
-  layer_off(action.layer_tap.val);
-
-  clear_oneshot_locked_mods();
-  clear_oneshot_mods();
-  unregister_mods(mods);
-
-*/
diff --git a/keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h b/keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h
new file mode 100644
index 0000000000..dd8f193dfc
--- /dev/null
+++ b/keyboards/ergodox_ez/keymaps/ericgebhart/layouts.h
@@ -0,0 +1,139 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/********************************************************************/
+/* Ergodox EZ                                                       */
+/********************************************************************/
+// This one is is set up to pass in the number row.
+// Beakl and bepo both change the number row.
+// Left, middle, right, bottom, and thumbs all stay the same.
+#define Base_dox(                                                       \
+                 K01, K02, K03, K04, K05,                               \
+                 K06, K07, K08, K09, K0A,                               \
+                 K11, K12, K13, K14, K15,                               \
+                 K16, K17, K18, K19, K1A,                               \
+                 K21, K22, K23, K24, K25,                               \
+                 K26, K27, K28, K29, K2A,                               \
+                 K31, K32, K33, K34, K35,                               \
+                 K36, K37, K38, K39, K3A                                \
+                                                                        ) \
+  LVARG_edox(                                                           \
+             ROW0_LEFT(K01, K02, K03, K04, K05),                        \
+             ___2_MIDDLE_1___,                                          \
+             ROW0_RIGHT(K06, K07, K08, K09, K0A),                       \
+                                                                        \
+             ROW1_LEFT(K11, K12, K13, K14, K15),                        \
+             ___2_MIDDLE_2___,                                          \
+             ROW1_RIGHT(K16, K17, K18, K19, K1A),                       \
+                                                                        \
+             ROW2_LEFT(K21, K22, K23, K24, K25),                        \
+             ROW2_RIGHT(K26, K27, K28, K29, K2A),                       \
+                                                                        \
+             ROW3_LEFT(K31, K32, K33, K34, K35),                        \
+             ___2_MIDDLE_3___,                                          \
+             ROW3_RIGHT(K36, K37, K38, K39, K3A),                       \
+             ___5_BOTTOM_LEFT___,   ___5_BOTTOM_RIGHT___,               \
+             ___12_DOX_ALL_THUMBS___                                    \
+                                                                        )
+
+#define Base_dox_bepo(                                                  \
+                      K01, K02, K03, K04, K05,                          \
+                      K06, K07, K08, K09, K0A,                          \
+                      K11, K12, K13, K14, K15,                          \
+                      K16, K17, K18, K19, K1A,                          \
+                      K21, K22, K23, K24, K25,                          \
+                      K26, K27, K28, K29, K2A,                          \
+                      K31, K32, K33, K34, K35,                          \
+                      K36, K37, K38, K39, K3A                           \
+                                                                        ) \
+  LVARG_edox(                                                           \
+             ROW0_LEFT(K01, K02, K03, K04, K05),                        \
+             ___2_MIDDLE_1___,                                          \
+             ROW0_RIGHT(K06, K07, K08, K09, K0A),                       \
+                                                                        \
+             ROW1_LEFT(K11, K12, K13, K14, K15),                        \
+             ___2_MIDDLE_2___,                                          \
+             ROW1_RIGHT(K16, K17, K18, K19, K1A),                       \
+                                                                        \
+             ROW2_LEFT(K21, K22, K23, K24, K25),                        \
+             ROW2_RIGHT(K26, K27, K28, K29, K2A),                       \
+                                                                        \
+             ROW3_LEFT(K31, K32, K33, K34, K35),                        \
+             ___2_MIDDLE_3___,                                          \
+             ROW3_RIGHT(K36, K37, K38, K39, K3A),                       \
+             ___5_BOTTOM_LEFT___, ___5_BOTTOM_RIGHT___,                 \
+             ___12_DOX_ALL_THUMBS_BP___                                 \
+                                                                        )
+
+
+#define Base_dox_bepo6(                                                 \
+                       K01, K02, K03, K04, K05, K06,                    \
+                       K07, K08, K09, K0A, K0B, K0C,                    \
+                       K11, K12, K13, K14, K15, K16,                    \
+                       K17, K18, K19, K1A, K1B, K1C,                    \
+                       K21, K22, K23, K24, K25, K26,                    \
+                       K27, K28, K29, K2A, K2B, K2C                     \
+                                                                        ) \
+  LVARG_edox(                                                           \
+             ___6SYMBOL_BEPO_L___,                                      \
+             ___2_MIDDLE_T_BP___,                                       \
+             ___6SYMBOL_BEPO_R___,                                      \
+             ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),               \
+             ___2_MIDDLE_2_BP___,                                       \
+             ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),              \
+                                                                        \
+             ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),               \
+             ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),              \
+                                                                        \
+             ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),               \
+             ___2_MIDDLE_3_BP___,                                       \
+             ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),              \
+                                                                        \
+             ___5_BOTTOM_LEFT_BP___, ___5_BOTTOM_RIGHT_BP___,           \
+             ___12_DOX_ALL_THUMBS_BP___                                 \
+                                                                        )
+
+#define Transient_dox6(                                                 \
+                       K01, K02, K03, K04, K05, K06,                    \
+                       K07, K08, K09, K0A, K0B, K0C,                    \
+                       K11, K12, K13, K14, K15, K16,                    \
+                       K17, K18, K19, K1A, K1B, K1C,                    \
+                       K21, K22, K23, K24, K25, K26,                    \
+                       K27, K28, K29, K2A, K2B, K2C,                    \
+                       K31, K32, K33, K34, K35, K36,                    \
+                       K37, K38, K39, K3A, K3B, K3C                     \
+                                                                        ) \
+  LVARG_edox(                                                           \
+             K01, K02, K03, K04, K05, K06,                              \
+             ___2___,                                                   \
+             K07, K08, K09, K0A, K0B, K0C,                              \
+             K11, K12, K13, K14, K15, K16,                              \
+             ___2___,                                                   \
+             K17, K18, K19, K1A, K1B, K1C,                              \
+             K21, K22, K23, K24, K25, K26,                              \
+             K27, K28, K29, K2A, K2B, K2C,                              \
+             K31, K32, K33, K34, K35, K36,                              \
+             ___2___,                                                   \
+             K37, K38, K39, K3A, K3B, K3C,                              \
+             ___5___, ___5___,                                          \
+             ___12___                                                   \
+                                                                        )
+
+#define Dox_base(...)        Base_dox(__VA_ARGS__)
+#define Dox_bepo_base(...)   Base_dox_bepo(__VA_ARGS__)
+#define Dox_bepo_base6(...)  Base_dox_bepo6(__VA_ARGS__)
+#define Dox_transient(...)   Transient_dox6(__VA_ARGS__)
diff --git a/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c b/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c
index baf6637eaa..60f7b74bc0 100644
--- a/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c
+++ b/keyboards/keebio/viterbi/keymaps/ericgebhart/keymap.c
@@ -19,175 +19,30 @@
 #include "ericgebhart.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  // 4x10
+  [_DVORAK]  = BASE_5x14(___NUMS___, ___DVORAK___),
+  [_QWERTY]  = BASE_5x14(___NUMS___, ___QWERTY___),
+  [_COLEMAK] = BASE_5x14(___NUMS___, ___COLEMAK_DH___),
+  [_BEAKL]   = BASE_5x14(___BKLNUMS___, ___BEAKL15___),
 
-    [DVORAK] = LAYOUT_ortho_5x14_wrapper(
-        KC_GRV,    ___12_DVORAK_1___,  KC_SLASH,
-        TAB_BKTAB, ___12_DVORAK_2___,  KC_MINUS,
-        KC_LSFT,   ___12_DVORAK_3___,  KC_RSFT,
-        ___ORTHO_14_BOTTOM___,
-        ___ORTHO_14_THUMBS_BOTTOM___
-        ),
+  //[_DVORAK_BP] = BASE_5x14_bepo(___DVORAK_FR___),
+  //[_BEAKL_BP]  = BASE_5x14_bepo(___BEAKL15_FR___),
 
-    [QWERTY] = LAYOUT_ortho_5x14_wrapper(
-        KC_GRV,    ___12_QWERTY_1___,  KC_SLASH,
-        TAB_BKTAB, ___12_QWERTY_2___,  KC_MINUS,
-        KC_LSFT,   ___12_QWERTY_3___,  KC_RSFT,
-        ___ORTHO_14_BOTTOM___,
-        ___ORTHO_14_THUMBS_BOTTOM___
-        ),
+  // 4x12
+  //[_BEPO]      = BASE_5x14_bepo6(___BEPO6_FR___),
 
-    [COLEMAK] = LAYOUT_ortho_5x14_wrapper(
-        KC_GRV,    ___12_COLEMAK_1___,  KC_SLASH,
-        TAB_BKTAB, ___12_COLEMAK_2___,  KC_MINUS,
-        KC_LSFT,   ___12_COLEMAK_3___,  KC_RSFT,
-        ___ORTHO_14_BOTTOM___,
-        ___ORTHO_14_THUMBS_BOTTOM___
-        ),
+  // transient macro takes a 3x12 for args
+  [_SYMB]    = TRANSIENT_5x14(___12___, ___SYMB_BEAKLA_3x12___),
+  //[_SYMB_BP] = TRANSIENT_5x14(___SYMB_BEAKLA_BP_3x12___),
 
-    [WORKMAN] = LAYOUT_ortho_5x14_wrapper(
-        KC_GRV,    ___12_WORKMAN_1___,  KC_SLASH,
-        TAB_BKTAB, ___12_WORKMAN_2___,  KC_MINUS,
-        KC_LSFT,   ___12_WORKMAN_3___,  KC_RSFT,
-        ___ORTHO_14_BOTTOM___,
-        ___ORTHO_14_THUMBS_BOTTOM___
-        ),
+  [_TOPROWS]    = TRANSIENT_5x14(___12___, ___TOPROWS_3x12___),
+  //[_TOPROWS_BP] = TRANSIENT_5x14(___TOPROWS_BP_3x12___),
 
-    [NORMAN] = LAYOUT_ortho_5x14_wrapper(
-        KC_GRV,    ___12_NORMAN_1___,  KC_SLASH,
-        TAB_BKTAB, ___12_NORMAN_2___,  KC_MINUS,
-        KC_LSFT,   ___12_NORMAN_3___,  KC_RSFT,
-        ___ORTHO_14_BOTTOM___,
-        ___ORTHO_14_THUMBS_BOTTOM___
-        ),
+  [_KEYPAD]    = TRANSIENT_5x14(___12___, ___KP_C_3x12___),
+  //[_KEYPAD_BP] = TRANSIENT_5x14(___KP_C_BP_3x12___),
 
-    [DVORAK_ON_BEPO] = LAYOUT_ortho_5x14_wrapper(
-        KC_GRV,    ___12_DVORAK_B_1___,  KC_SLASH,
-        TAB_BKTAB, ___12_DVORAK_B_2___,  KC_MINUS,
-        KC_LSFT,   ___12_DVORAK_B_3___,  KC_RSFT,
-        ___ORTHO_14_BOTTOM_FR___,
-        ___ORTHO_14_THUMBS_BOTTOM___
-        ),
-
-    [BEPO] = LAYOUT_ortho_5x14_wrapper(
-        KC_GRV,    ___12_DVORAK_B_1___,  KC_SLASH,
-        TAB_BKTAB, ___12_DVORAK_B_2___,  KC_MINUS,
-        KC_LSFT,   ___12_DVORAK_B_3___,  KC_RSFT,
-        ___ORTHO_14_BOTTOM_BP___,
-        ___ORTHO_14_THUMBS_BOTTOM___
-        ),
-
-    [XMONAD] = LAYOUT_ortho_5x14_wrapper(
-        ___, ___12_DVORAK_1___,  ___,
-        ___, ___12_DVORAK_2___,  ___,
-        ___, ___12_DVORAK_3___,  ___,
-        ___14___,
-        ___14___
-        ),
-
-    [XMONAD_FR] = LAYOUT_ortho_5x14_wrapper(
-        ___, ___12_DVORAK_B_1___,  ___,
-        ___, ___12_DVORAK_B_2___,  ___,
-        ___, ___12_DVORAK_B_3___,  ___,
-        ___14___,
-        ___14___
-        ),
-
-
-    // SYMBOLS
-    [SYMB] = LAYOUT_ortho_5x14_wrapper(
-        ___14_SYMB_1___,
-        ___14_SYMB_2___,
-        ___14_SYMB_3___,
-        ___14_SYMB_4___,
-        ___14___
-                                       ),
-
-    [KEYPAD] = LAYOUT_ortho_5x14_wrapper(
-        ___14_KP_1___,
-        ___14_KP_2___,
-        ___14_KP_3___,
-        ___14_KP_4___,
-        ___14___
-        ),
-
-    [KEYPAD_ON_BEPO] = LAYOUT_ortho_5x14_wrapper(
-        ___14_KP_B_1___,
-        ___14_KP_B_2___,
-        ___14_KP_B_3___,
-        ___14_KP_B_4___,
-        ___14___
-        ),
-
-    [SYMB_ON_BEPO] = LAYOUT_ortho_5x14_wrapper(
-        ___14_SYMB_B_1___,
-        ___14_SYMB_B_2___,
-        ___14_SYMB_B_3___,
-        ___14_SYMB_B_4___,
-        ___14___
-        ),
-
-    // MEDIA AND MOUSE
-    [MDIA] = LAYOUT_ortho_5x14_wrapper(
-        ___14_MDIA_1___,
-        ___14_MDIA_2___,
-        ___14_MDIA_3___,
-        ___14_MDIA_4___,
-        ___14___
-        ),
-
-    [LAYERS] = LAYOUT_ortho_5x14_wrapper(
-        ___14_LAYERS_1___,
-        ___14_LAYERS_2___,
-        ___14_LAYERS_3___,
-        ___14___,
-        ___14___
-                                         ),
-
-    [_RGB] = LAYOUT_ortho_5x14_wrapper(
-        ___14_RGB_1___,
-        ___14_RGB_2___,
-        ___14_RGB_3___,
-        ___14___,
-        ___14___
-        ),
+  // Navigation and control
+  [_NAV]    = TRANSIENT_5x14(___12___, ___NAV_3x12___),
+  [_LAYERS] = TRANSIENT_5x14(___12___, ___LAYERS_3x12___),
+  //[_RGB]  = TRANSIENT_5x14(___12___, ___RGB_3x12___),
 };
-
-/* bool process_record_user(uint16_t keycode, keyrecord_t *record) { */
-/*   switch (keycode) { */
-/*     case QWERTY: */
-/*       if (record->event.pressed) { */
-/*         set_single_persistent_default_layer(_QWERTY); */
-/*       } */
-/*       return false; */
-/*       break; */
-/*     case LOWER: */
-/*       if (record->event.pressed) { */
-/*         layer_on(_LOWER); */
-/*         update_tri_layer(_LOWER, _RAISE, _ADJUST); */
-/*       } else { */
-/*         layer_off(_LOWER); */
-/*         update_tri_layer(_LOWER, _RAISE, _ADJUST); */
-/*       } */
-/*       return false; */
-/*       break; */
-/*     case RAISE: */
-/*       if (record->event.pressed) { */
-/*         layer_on(_RAISE); */
-/*         update_tri_layer(_LOWER, _RAISE, _ADJUST); */
-/*       } else { */
-/*         layer_off(_RAISE); */
-/*         update_tri_layer(_LOWER, _RAISE, _ADJUST); */
-/*       } */
-/*       return false; */
-/*       break; */
-/*     case ADJUST: */
-/*       if (record->event.pressed) { */
-/*         layer_on(_ADJUST); */
-/*       } else { */
-/*         layer_off(_ADJUST); */
-/*       } */
-/*       return false; */
-/*       break; */
-/*   } */
-/*   return true; */
-/* } */
diff --git a/keyboards/kinesis/keymaps/ericgebhart/keymap.c b/keyboards/kinesis/keymaps/ericgebhart/keymap.c
new file mode 100644
index 0000000000..731e257b05
--- /dev/null
+++ b/keyboards/kinesis/keymaps/ericgebhart/keymap.c
@@ -0,0 +1,53 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "keymap_bepo.h"
+#include "ericgebhart.h"
+
+#define LAYOUT_PVARG(...)     LAYOUT_pretty(__VA_ARGS__)
+
+#define Kinesis_base(...)        Base_4x6_4_6(__VA_ARGS__)
+#define Kinesis_bepo_base(...)   Base_bepo_4x6_4_6(__VA_ARGS__)
+#define Kinesis_bepo_base6(...)  Base_bepo6_4x6_4_6(__VA_ARGS__)
+#define Kinesis_transient(...)   Transient6_4x6_4_6(__VA_ARGS__)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  // Qwerty Base layers
+  [_DVORAK]  = Kinesis_base(___NUMS___, ___DVORAK___),
+  [_QWERTY]  = Kinesis_base(___NUMS___, ___QWERTY___),
+  [_COLEMAK] = Kinesis_base(___NUMS___, ___COLEMAK_DH___),
+  [_BEAKL]   = Kinesis_base(___BKLNUMS___, ___BEAKL15___),
+  // Bepo Base layers
+  [_DVORAK_BP] = Kinesis_bepo_base(___NUMS_BP___, ___DVORAK_FR___),
+  [_BEAKL_BP]  = Kinesis_bepo_base(___BKLNUMS_BP___,   ___BEAKL15_FR___),
+
+  [_BEPO]      = Kinesis_bepo_base6(___BEPO6___),
+
+  // transient layers.
+  // Switch to using a transient layer macro
+  [_SYMB]    = Kinesis_transient(___12_FUNC___, ___SYMB_BEAKLA_3x12___),
+  [_SYMB_BP] = Kinesis_transient(___12_FUNC___, ___SYMB_BEAKLA_BP_3x12___),
+
+  [_TOPROWS]    = Kinesis_transient(___12___, ___TOPROWS_3x12___),
+  [_TOPROWS_BP] = Kinesis_transient(___12___, ___TOPROWS_BP_3x12___),
+
+  [_NAV]    = Kinesis_transient(___12___, ___NAV_3x12___),
+  [_LAYERS] = Kinesis_transient(___12___, ___LAYERS_3x12___),
+  [_ADJUST] = Kinesis_transient(___12___, ___ADJUST_3x12___),
+  //[_RGB]    = Kinesis_transient(___12___, ___RGB_3x12___),
+};
diff --git a/keyboards/kinesis/keymaps/ericgebhart/readme.md b/keyboards/kinesis/keymaps/ericgebhart/readme.md
new file mode 100644
index 0000000000..3a47968596
--- /dev/null
+++ b/keyboards/kinesis/keymaps/ericgebhart/readme.md
@@ -0,0 +1,5 @@
+Overview
+========
+
+These are my keymaps. There isn't much here. Go take a look at my Userspace readme.
+That's where all the code is.
diff --git a/keyboards/kinesis/keymaps/ericgebhart/rules.mk b/keyboards/kinesis/keymaps/ericgebhart/rules.mk
new file mode 100644
index 0000000000..61115e927a
--- /dev/null
+++ b/keyboards/kinesis/keymaps/ericgebhart/rules.mk
@@ -0,0 +1,16 @@
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = no         # Unicode
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+
diff --git a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/keymap.c b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/keymap.c
new file mode 100644
index 0000000000..59f2a23733
--- /dev/null
+++ b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/keymap.c
@@ -0,0 +1,101 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "ericgebhart.h"
+#include "layouts.h"
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  // Qwerty based Base layers
+  [_DVORAK]  = Rebound_base(___DVORAK___),
+  [_BEAKL]   = Rebound_base(___BEAKL15___),
+  [_COLEMAK] = Rebound_base(___COLEMAK_DH___),
+  [_QWERTY]  = Rebound_base(___QWERTY___),
+
+  // Bepo base layers
+  [_BEAKL_BP]  = Rebound_base_bepo(___BEAKL15_FR___),
+  [_DVORAK_BP] = Rebound_base_bepo(___DVORAK_FR___),
+  [_BEPO]      = Rebound_base_bepo6(___BEPO6___),
+
+  // Transient layers.
+  [_SYMB]    = Rebound_transient(___SYMB_BEAKLA_3x12___),
+  [_SYMB_BP] = Rebound_transient(___SYMB_BEAKLA_BP_3x12___),
+
+  [_KEYPAD]    = Rebound_transient(___KP_C_3x12___),
+  [_KEYPAD_BP] = Rebound_transient(___KP_C_BP_3x12___),
+
+  [_TOPROWS]    = Rebound_transient(___TOPROWS_3x12___),
+  [_TOPROWS_BP] = Rebound_transient(___TOPROWS_BP_3x12___),
+  [_NAV]    = Rebound_transient(___NAV_3x12___),
+  [_LAYERS] = Rebound_transient(___LAYERS_3x12___),
+};
+
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+  switch(get_highest_layer(layer_state)){
+  case _DVORAK:
+    if (clockwise) {
+      tap_code16(KC_VOLD);
+    } else {
+      tap_code16(KC_VOLU);
+    }
+    break;
+
+  case _NAV:
+    if (clockwise) {
+      tap_code16(S(KC_TAB));
+    } else {
+      tap_code16(KC_TAB);
+    }
+    break;
+  }
+  return true;
+}
+
+#ifdef OLED_ENABLE
+void oled_task_user(void) {
+  // Host Keyboard Layer Status
+  oled_write_P(PSTR(""), false);
+
+  switch (get_highest_layer(layer_state)) {
+  case _BASE:
+    oled_write_P(PSTR("Rebound\n"), false);
+    oled_write_P(PSTR("Rev4\n"), false);
+    break;
+  case _NAV:
+    oled_write_P(PSTR("Nav\n"), false);
+    break;
+  case _SYMB_BEAKL:
+  case _SYMB:
+    oled_write_P(PSTR("Symbols\n"), false);
+    break;
+  case _KEYPAD:
+    oled_write_P(PSTR("Top Rows\n"), false);
+    break;
+  default:
+    // Or use the write_ln shortcut over adding '\n' to the end of your string
+    oled_write_ln_P(PSTR("Undefined"), false);
+  }
+
+  // Host Keyboard LED Status
+  led_t led_state = host_keyboard_led_state();
+  oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+  oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
+  oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+
+}
+
+#endif
diff --git a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/layouts.h b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/layouts.h
new file mode 100644
index 0000000000..f6b7fc1513
--- /dev/null
+++ b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/layouts.h
@@ -0,0 +1,113 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/********************************************************************/
+/* Rebound 4 rows, 1x12, 3x13  */
+/********************************************************************/
+
+#define LVARG_rebound(...)    LAYOUT_all(__VA_ARGS__)
+#define LAYOUT_rebound_base(                                            \
+                            K01, K02, K03, K04, K05,                    \
+                            K06, K07, K08, K09, K0A,                    \
+                            K11, K12, K13, K14, K15,                    \
+                            K16, K17, K18, K19, K1A,                    \
+                            K21, K22, K23, K24, K25,                    \
+                            K26, K27, K28, K29, K2A                     \
+                                                                        ) \
+  LVARG_rebound(                                                        \
+                ROW1_LEFT(K01, K02, K03, K04, K05),                     \
+                ROW1_RIGHT(K06, K07, K08, K09, K0A),                    \
+                                                                        \
+                ROW2_LEFT(K11, K12, K13, K14, K15),                     \
+                KC_CCCV,                                                \
+                ROW2_RIGHT(K16, K17, K18, K19, K1A),                    \
+                                                                        \
+                ROW3_LEFT(K21, K22, K23, K24, K25),                     \
+                MO(_ADJUST),                                            \
+                ROW3_RIGHT(K26, K27, K28, K29, K2A),                    \
+                ___13_BOTTOM___                                         \
+                                                                        )
+
+#define LAYOUT_rebound_base_bepo(                                       \
+                                 K01, K02, K03, K04, K05,               \
+                                 K06, K07, K08, K09, K0A,               \
+                                 K11, K12, K13, K14, K15,               \
+                                 K16, K17, K18, K19, K1A,               \
+                                 K21, K22, K23, K24, K25,               \
+                                 K26, K27, K28, K29, K2A                \
+                                                                        ) \
+  LVARG_rebound(                                                        \
+                ROW1_LEFT_BP(K01, K02, K03, K04, K05),                  \
+                ROW1_RIGHT_BP(K06, K07, K08, K09, K0A),                 \
+                                                                        \
+                ROW2_LEFT_BP(K11, K12, K13, K14, K15),                  \
+                KC_CCCV,                                                \
+                ROW2_RIGHT_BP(K16, K17, K18, K19, K1A),                 \
+                                                                        \
+                ROW3_LEFT_BP(K21, K22, K23, K24, K25),                  \
+                MO(_ADJUST),                                            \
+                ROW3_RIGHT_BP(K26, K27, K28, K29, K2A),                 \
+                ___13_BOTTOM_BP___                                      \
+                                                                        )
+
+// Just for bepo because it's a 3x6 matrix on each side.
+// So 3 pairs of 6 keys, left and right.
+#define LAYOUT_rebound_base_bepo6(                                      \
+                                  K01, K02, K03, K04, K05, K06,         \
+                                  K07, K08, K09, K0A, K0B, K0C,         \
+                                  K11, K12, K13, K14, K15, K16,         \
+                                  K17, K18, K19, K1A, K1B, K1C,         \
+                                  K21, K22, K23, K24, K25, K26,         \
+                                  K27, K28, K29, K2A, K2B, K2C          \
+                                                                        ) \
+  LVARG_rebound(                                                        \
+                ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),            \
+                ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),           \
+                                                                        \
+                ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),            \
+                KC_CCCV,                                                \
+                ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),           \
+                                                                        \
+                ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),            \
+                MO(_ADJUST),                                            \
+                ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),           \
+                ___13_BOTTOM_BP___                                      \
+                                                                        )
+
+#define LAYOUT_rebound_transient(                                       \
+                                 K01, K02, K03, K04, K05, K06,          \
+                                 K07, K08, K09, K0A, K0B, K0C,          \
+                                 K11, K12, K13, K14, K15, K16,          \
+                                 K17, K18, K19, K1A, K1B, K1C,          \
+                                 K21, K22, K23, K24, K25, K26,          \
+                                 K27, K28, K29, K2A, K2B, K2C           \
+                                                                        ) \
+  LVARG_rebound(                                                        \
+                K01, K02, K03, K04, K05, K06,                           \
+                K07, K08, K09, K0A, K0B, K0C,                           \
+                K11, K12, K13, K14, K15, K16,                           \
+                ___,                                                    \
+                K17, K18, K19, K1A, K1B, K1C,                           \
+                K21, K22, K23, K24, K25, K26,                           \
+                ___,                                                    \
+                K27, K28, K29, K2A, K2B, K2C,                           \
+                ___, ___12___)
+
+#define Rebound_base(...)       LAYOUT_rebound_base(__VA_ARGS__)
+#define Rebound_base_bepo(...)  LAYOUT_rebound_base_bepo(__VA_ARGS__)
+#define Rebound_base_bepo6(...) LAYOUT_rebound_base_bepo6(__VA_ARGS__)
+#define Rebound_transient(...)  LAYOUT_rebound_transient(__VA_ARGS__)
diff --git a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/readme.md b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/readme.md
new file mode 100644
index 0000000000..3a47968596
--- /dev/null
+++ b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/readme.md
@@ -0,0 +1,5 @@
+Overview
+========
+
+These are my keymaps. There isn't much here. Go take a look at my Userspace readme.
+That's where all the code is.
diff --git a/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/rules.mk b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/rules.mk
new file mode 100644
index 0000000000..cf27df39b8
--- /dev/null
+++ b/keyboards/montsinger/rebound/rev4/keymaps/ericgebhart/rules.mk
@@ -0,0 +1,16 @@
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = no         # Unicode
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+TAP_DANCE_ENABLE = yes      # Enable the tap dance feature.
diff --git a/keyboards/xiudi/xd75/keymaps/ericgebhart/keymap.c b/keyboards/xiudi/xd75/keymaps/ericgebhart/keymap.c
index 9661972bfa..a500e4b682 100644
--- a/keyboards/xiudi/xd75/keymaps/ericgebhart/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/ericgebhart/keymap.c
@@ -20,136 +20,33 @@
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  // 4x10
+  [_DVORAK]  = BASE_5x15(___NUMS___, ___DVORAK___),
+  [_QWERTY]  = BASE_5x15(___NUMS___, ___QWERTY___),
+  [_COLEMAK] = BASE_5x15(___NUMS___, ___COLEMAK_DH___),
+  [_BEAKL]   = BASE_5x15(___BKLNUMS___, ___BEAKL15___),
 
-    [DVORAK] = LAYOUT_ortho_5x15_wrapper(
-        KC_GRV,     ___ORTHO_15_N___, KC_EQL,
-        KC_LOCK,    ___13_DVORAK_1___, KC_SLASH,
-        TAB_BKTAB,  ___13_DVORAK_2___, KC_MINUS,
-        KC_LSFT,    ___13_DVORAK_3___, KC_RSFT,
-        ___ORTHO_15_BOTTOM___
-        ),
+  //[_DVORAK_BP] = BASE_5x15_bepo(___DVORAK_FR___),
+  //[_BEAKL_BP]  = BASE_5x15_bepo(___BEAKL15_FR___),
 
-    [QWERTY] = LAYOUT_ortho_5x15_wrapper(
-        KC_GRV,     ___ORTHO_15_N___, KC_EQL,
-        KC_LOCK,    ___13_QWERTY_1___, KC_SLASH,
-        TAB_BKTAB,  ___13_QWERTY_2___, KC_MINUS,
-        KC_LSFT,    ___13_QWERTY_3___, KC_RSFT,
-        ___ORTHO_15_BOTTOM___
-        ),
+  // 4x12
+  //[_BEPO]      = BASE_5x15_bepo6(___BEPO6_FR___),
 
-    [COLEMAK] = LAYOUT_ortho_5x15_wrapper(
-        KC_GRV,     ___ORTHO_15_N___, KC_EQL,
-        KC_LOCK,    ___13_COLEMAK_1___, KC_SLASH,
-        TAB_BKTAB,  ___13_COLEMAK_2___, KC_MINUS,
-        KC_LSFT,    ___13_COLEMAK_3___, KC_RSFT,
-        ___ORTHO_15_BOTTOM___
-        ),
+  // transient macro takes a 4x12 for args
+  [_SYMB]    = TRANSIENT_5x15(___12___, ___SYMB_BEAKLA_3x12___),
+  //[_SYMB_BP] = TRANSIENT_5x15(___12___, ___SYMB_BEAKLA_BP_3x12___),
 
-    [WORKMAN] = LAYOUT_ortho_5x15_wrapper(
-        KC_GRV,     ___ORTHO_15_N___, KC_EQL,
-        KC_LOCK,    ___13_WORKMAN_1___, KC_SLASH,
-        TAB_BKTAB,  ___13_WORKMAN_2___, KC_MINUS,
-        KC_LSFT,    ___13_WORKMAN_3___, KC_RSFT,
-        ___ORTHO_15_BOTTOM___
-        ),
+  [_TOPROWS]    = TRANSIENT_5x15(___12___, ___TOPROWS_3x12___),
+  //[_TOPROWS_BP] = TRANSIENT_5x15(___12___, ___TOPROWS_BP_3x12___),
 
-    [NORMAN] = LAYOUT_ortho_5x15_wrapper(
-        KC_GRV,     ___ORTHO_15_N___, KC_EQL,
-        KC_LOCK,    ___13_NORMAN_1___,  KC_SLASH,
-        TAB_BKTAB,  ___13_NORMAN_2___,  KC_MINUS,
-        KC_LSFT,    ___13_NORMAN_3___,  KC_RSFT,
-        ___ORTHO_15_BOTTOM___
-        ),
+  [_KEYPAD]    = TRANSIENT_5x15(___12___, ___KP_C_3x12___),
+  //[_KEYPAD_BP] = TRANSIENT_5x15(___12___, ___KP_C_BP_3x12___),
 
-    [DVORAK_ON_BEPO] = LAYOUT_ortho_5x15_wrapper(
-        DB_GRV, ___ORTHO_15_B_N___, DB_EQL,
-        KC_LOCK,    ___13_DVORAK_B_1___,  DB_SLASH,
-        TAB_BKTAB,  ___13_DVORAK_B_2___,  DB_MINUS,
-        KC_LSFT,    ___13_DVORAK_B_3___,  KC_RSFT,
-        ___ORTHO_15_BOTTOM_FR___
-        ),
-
-    [XMONAD] = LAYOUT_ortho_5x15_wrapper(
-        ___ORTHO_15_FUNC_1_12___,
-        ___,  ___13_DVORAK_1___, ___,
-        ___,  ___13_DVORAK_2___, ___,
-        ___,  ___13_DVORAK_3___, ___,
-        ___15___
-        ),
-
-    [XMONAD_FR] = LAYOUT_ortho_5x15_wrapper(
-        ___ORTHO_15_FUNC_1_12___,
-        ___,  ___13_DVORAK_B_1___,  ___,
-        ___,  ___13_DVORAK_B_2___,  ___,
-        ___,  ___13_DVORAK_B_3___,  ___,
-        ___15___
-        ),
-
-    [BEPO] = LAYOUT_ortho_5x15_wrapper(
-        ___ORTHO_15_B_SYMB___,
-        KC_LOCK,        ___13_BEPO_1___, BP_W,
-        TAB_BKTAB,      ___13_BEPO_2___, BP_CCED,
-        BP_SFT_T_ECRC,  ___13_BEPO_3___, BP_SFT_T_W,
-        ___ORTHO_15_BOTTOM_BP___
-        ),
-
-    // SYMBOLS
-    [SYMB] = LAYOUT_ortho_5x15_wrapper(
-        ___ORTHO_15_FUNC_1_12___,
-        ___15_SYMB_1___,
-        ___15_SYMB_2___,
-        ___15_SYMB_3___,
-        ___15_SYMB_4___
-        ),
-
-    [KEYPAD] = LAYOUT_ortho_5x15_wrapper(
-        ___ORTHO_15_FUNC_1_12___,
-        ___15_KP_1___,
-        ___15_KP_2___,
-        ___15_KP_3___,
-        ___15_KP_4___
-        ),
-
-    [KEYPAD_ON_BEPO] = LAYOUT_ortho_5x15_wrapper(
-        ___ORTHO_15_FUNC_1_12___,
-        ___15_KP_B_1___,
-        ___15_KP_B_2___,
-        ___15_KP_B_3___,
-        ___15_KP_B_4___
-        ),
-
-    [SYMB_ON_BEPO] = LAYOUT_ortho_5x15_wrapper(
-        ___ORTHO_15_FUNC_1_12___,
-        ___15_SYMB_B_1___,
-        ___15_SYMB_B_2___,
-        ___15_SYMB_B_3___,
-        ___15_SYMB_B_4___
-        ),
-
-    // MEDIA AND MOUSE
-    [MDIA] = LAYOUT_ortho_5x15_wrapper(
-        ___ORTHO_15_FUNC_1_12___,
-        ___15_MDIA_1___,
-        ___15_MDIA_2___,
-        ___15_MDIA_3___,
-        ___15_MDIA_4___
-        ),
-
-    [LAYERS] = LAYOUT_ortho_5x15_wrapper(
-        ___ORTHO_15_FUNC_1_12___,
-        ___15_LAYERS_1___,
-        ___15_LAYERS_2___,
-        ___15_LAYERS_3___,
-        ___15___
-        ),
-
-    [_RGB] = LAYOUT_ortho_5x15_wrapper(
-        ___ORTHO_15_FUNC_1_12___,
-        ___15_RGB_1___,
-        ___15_RGB_2___,
-        ___15_RGB_3___,
-        ___15___
-        ),
+  // Navigation and control
+  [_NAV]    = TRANSIENT_5x15(___12___, ___NAV_3x12___),
+  [_LAYERS] = TRANSIENT_5x15(___12___, ___LAYERS_3x12___),
+  //[_RGB]  = TRANSIENT_5x15(___12___, ___RGB_3x12___),
+  [_ADJUST]    = TRANSIENT_5x15(___12___, ___ADJUST_3x12___),
 };
 
 
@@ -199,18 +96,18 @@ void keyboard_post_init_user(void) {
 
 layer_state_t layer_state_set_user(layer_state_t state) {
   // rgblight_set_layer_state(0, !on_qwerty());
-  rgblight_set_layer_state(0, layer_state_cmp(state, DVORAK));
+  rgblight_set_layer_state(0, layer_state_cmp(state, _DVORAK));
 
-  rgblight_set_layer_state(1, layer_state_cmp(state, BEPO));
-  rgblight_set_layer_state(2, layer_state_cmp(state, DVORAK));
+  rgblight_set_layer_state(1, layer_state_cmp(state, _BEPO));
+  rgblight_set_layer_state(2, layer_state_cmp(state, _DVORAK));
   //|| layer_state_cmp(state, DVORAK_ON_BEPO)));
-  rgblight_set_layer_state(3, layer_state_cmp(state, MDIA));
-  rgblight_set_layer_state(4, layer_state_cmp(state, SYMB) );
+  rgblight_set_layer_state(3, layer_state_cmp(state, _NAV));
+  rgblight_set_layer_state(4, layer_state_cmp(state, _SYMB) );
 
   //(layer_state_cmp(state, SYMB) || (layer_state_cmp(state, SYMB_ON_BEPO))));
-  rgblight_set_layer_state(5, layer_state_cmp(state, KEYPAD) );
+  rgblight_set_layer_state(5, layer_state_cmp(state, _KEYPAD) );
   ///(layer_state_cmp(state, KEYPAD) || (layer_state_cmp(state, KEYPAD_ON_BEPO))));
-  rgblight_set_layer_state(6, layer_state_cmp(state, LAYERS));
+  rgblight_set_layer_state(6, layer_state_cmp(state, _LAYERS));
   rgblight_set_layer_state(7, layer_state_cmp(state, _RGB));
   return state;
 }
diff --git a/users/ericgebhart/altlocal_keys.c b/users/ericgebhart/altlocal_keys.c
new file mode 100755
index 0000000000..285041b418
--- /dev/null
+++ b/users/ericgebhart/altlocal_keys.c
@@ -0,0 +1,94 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "ericgebhart.h"
+#include "altlocal_keys.h"
+
+#include "keymap_bepo.h"
+
+// These are the keys for dvorak on bepo.  column one is the keycode and mods for
+// the unshifted key, the second column is the keycode and mods for the shifted key.
+// GR is Good Range.  It subtracts SAFE_RANGE from the keycode so we can make a
+// reasnably sized array without difficulties. The macro is for the constant declarations
+// the function is for when we use it.
+const uint16_t key_translations[][2][2] = {
+  [GR(DB_1)] =      {{BP_DQUO, MOD_LSFT},      {BP_DCIR, MOD_LSFT}},
+  [GR(DB_2)] =      {{BP_LDAQ, MOD_LSFT},      {BP_AT, MOD_NONE}},
+  [GR(DB_3)] =      {{BP_RDAQ, MOD_LSFT},      {BP_DLR, MOD_LSFT}},
+  [GR(DB_4)] =      {{BP_LPRN, MOD_LSFT},      {BP_DLR, MOD_NONE}},
+  [GR(DB_5)] =      {{BP_RPRN, MOD_LSFT},      {BP_PERC, MOD_NONE}},
+  [GR(DB_6)] =      {{BP_AT, MOD_LSFT},        {BP_AT, MOD_BIT(KC_RALT)}},
+  [GR(DB_7)] =      {{BP_PLUS, MOD_LSFT},      {BP_P, MOD_BIT(KC_RALT)}},
+  [GR(DB_8)] =      {{BP_MINS, MOD_LSFT},      {BP_ASTR, MOD_NONE}},
+  [GR(DB_9)] =      {{BP_SLSH, MOD_LSFT},     {BP_LPRN, MOD_NONE}},
+  [GR(DB_0)] =      {{BP_ASTR, MOD_LSFT},      {BP_RPRN, MOD_NONE}},
+  [GR(DB_GRV)] =    {{BP_PERC, MOD_LSFT},      {BP_K, MOD_BIT(KC_RALT)}},
+  [GR(DB_SCOLON)] = {{BP_COMM, MOD_LSFT},      {BP_DOT, MOD_LSFT}},
+  [GR(DB_SLASH)] =  {{BP_SLSH, MOD_NONE},     {BP_QUOT, MOD_LSFT}},
+  [GR(DB_BACKSLASH)] = {{BP_AGRV, MOD_BIT(KC_RALT)}, {BP_B, MOD_BIT(KC_RALT)}},
+  [GR(DB_EQL)] =    {{BP_EQL, MOD_NONE},       {BP_PLUS, MOD_NONE}},
+  [GR(DB_COMM)] =   {{BP_COMM, MOD_NONE},     {BP_LDAQ, MOD_BIT(KC_RALT)}},
+  [GR(DB_DOT)] =    {{BP_DOT, MOD_NONE},       {BP_RDAQ, MOD_BIT(KC_RALT)}},
+  [GR(DB_QUOT)] =   {{BP_QUOT, MOD_NONE},      {BP_DQUO, MOD_NONE}},
+  [GR(DB_MINUS)] =  {{BP_MINS, MOD_NONE},     {KC_SPC, MOD_BIT(KC_RALT)}},
+  [GR(DB_LPRN)] =   {{BP_LPRN, MOD_NONE},      {BP_LPRN, MOD_BIT(KC_RALT)}},
+  [GR(DB_RPRN)] =   {{BP_RPRN, MOD_NONE},      {BP_RPRN, MOD_BIT(KC_RALT)}},
+  [GR(DB_LBRC)] =   {{BP_Y, MOD_BIT(KC_RALT)}, {BP_LPRN, MOD_BIT(KC_RALT)}},
+  [GR(DB_RBRC)] =   {{BP_X, MOD_BIT(KC_RALT)}, {BP_RPRN, MOD_BIT(KC_RALT)}},
+  // For the symbol layer
+  [GR(DB_HASH)] =   {{BP_DLR, MOD_LSFT},          {BP_DLR, MOD_LSFT}},
+  [GR(DB_LCBR)] =   {{BP_LPRN, MOD_BIT(KC_RALT)}, {BP_LPRN, MOD_BIT(KC_RALT)}},
+  [GR(DB_RCBR)] =   {{BP_LPRN, MOD_BIT(KC_RALT)}, {BP_RPRN, MOD_BIT(KC_RALT)}},
+  [GR(DB_PIPE)] =   {{BP_B, MOD_BIT(KC_RALT)},    {BP_B, MOD_BIT(KC_RALT)}},
+  [GR(DB_TILD)] =   {{BP_K, MOD_BIT(KC_RALT)},    {BP_K, MOD_BIT(KC_RALT)}},
+  [GR(DB_CIRC)] =   {{BP_AT, MOD_BIT(KC_RALT)},   {BP_AT, MOD_BIT(KC_RALT)}},
+  [GR(DB_LESS)] =   {{BP_LDAQ, MOD_BIT(KC_RALT)}, {BP_LDAQ, MOD_BIT(KC_RALT)}},
+  [GR(DB_GRTR)] =   {{BP_RDAQ, MOD_BIT(KC_RALT)}, {BP_RDAQ, MOD_BIT(KC_RALT)}},
+  // Keys for BEAKL on Qwerty
+  [GR(BQ_COMM)] =   {{KC_COMMA, MOD_NONE},    {KC_1, MOD_LSFT}},
+  [GR(BQ_DOT)]  =   {{KC_DOT, MOD_NONE},      {KC_2, MOD_LSFT}},
+  [GR(BQ_QUOT)] =   {{KC_QUOT, MOD_NONE},     {KC_GRV, MOD_NONE}},
+};
+
+
+uint8_t gr(uint16_t kc){
+    return (kc - SAFE_RANGE);
+}
+// send the right keycode for the right mod.
+// remove the mods we are taking care of,
+// send our keycodes then restore them.
+// all so we can make dvorak keys from bepo keycodes.
+void send_keycode(uint16_t kc){
+    uint8_t tmp_mods = get_mods();
+    bool is_shifted = ( tmp_mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)) );
+    //uint8_t key[2][2] = key_translations[GR(kc)];
+    // need to turn of the shift if it is on.
+    unregister_mods((MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)));
+    if(is_shifted){
+        register_mods(SHIFTED_MODS(kc));
+        register_code(SHIFTED_KEY(kc));
+        unregister_code(SHIFTED_KEY(kc));
+        unregister_mods(SHIFTED_MODS(kc));
+    } else{
+        register_mods(UNSHIFTED_MODS(kc));
+        register_code(UNSHIFTED_KEY(kc));
+        unregister_code(UNSHIFTED_KEY(kc));
+        unregister_mods(UNSHIFTED_MODS(kc));
+    }
+    clear_mods();
+  register_mods(tmp_mods);
+}
diff --git a/users/ericgebhart/altlocal_keys.h b/users/ericgebhart/altlocal_keys.h
new file mode 100644
index 0000000000..b7fa977b92
--- /dev/null
+++ b/users/ericgebhart/altlocal_keys.h
@@ -0,0 +1,36 @@
+#pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// for the creation of dvorak keys on an Bepo keyboard at the OS layer.
+// so we can create an array of reasonable size
+// for our translation keys. We have to create a
+// good range of numbers
+#define GR(x) (x-SAFE_RANGE)
+
+// void tap(uint16_t keycode){ register_code(keycode); unregister_code(keycode); };
+
+uint8_t gr(uint16_t);
+void send_keycode(uint16_t);
+
+#define MOD_NONE 0x00
+
+// indexs for the keycode translation table.
+#define UNSHIFTED_KEY(key)  key_translations[gr(key)][0][0]
+#define UNSHIFTED_MODS(key) key_translations[gr(key)][0][1]
+#define SHIFTED_KEY(key)    key_translations[gr(key)][1][0]
+#define SHIFTED_MODS(key)   key_translations[gr(key)][1][1]
diff --git a/users/ericgebhart/base_layers.h b/users/ericgebhart/base_layers.h
deleted file mode 100644
index fd88a40aef..0000000000
--- a/users/ericgebhart/base_layers.h
+++ /dev/null
@@ -1,283 +0,0 @@
-#pragma once
-/*
-  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "core_keysets.h"
-
-/******************************************************************/
-/* These are the keys for the middle and bottom edge of any layout*/
-/* That way we only need to set them once and use them everywhere */
-/* The thumb keys, the bottom rows, etc.                          */
-/******************************************************************/
-/******************************************************************/
-/* Middle Keysets for the XD75                                    */
-/******************************************************************/
-
-// For the middle keys of an xd75. It's got one more column in the middle than
-// the ergodox, or the viterbi. And the Ergodox is missing a key in column 7
-// counting from either end.  Which is the first and 3rd columns of these sets.
-
-// it's all an experient.  I'm not sure what make sense here.
-// stealing what I can from the ergodox layout.
-/* The XD75 has 3 keys inbetween the usual left and right hand */
-#define ___ORTHO_15_MIDDLE_T___ OSL(LAYERS), LCTL(KC_A),  MDIA_SYMB_KP_LAYERS
-#define ___ORTHO_15_MIDDLE_1___ LCTL(KC_C),  LCTL(KC_X),  LCTL(KC_V)
-#define ___ORTHO_15_MIDDLE_2___ TO(SYMB),    TO(_RGB),    TO(KEYPAD)
-#define ___ORTHO_15_MIDDLE_3___ OSL(SYMB),   TO(MDIA),    OSL(KEYPAD)
-#define ___ORTHO_15_MIDDLE_4___ CTL_BSPC,    ALT_DEL,     XMONAD_ESC,  ALT_ENT,   CTL_SPC
-
-// The same, for BEPO
-#define ___ORTHO_15_MIDDLE_T_BP___ OSL(LAYERS),       LCTL(BP_A),    MDIA_SYMB_KP_LAYERS
-#define ___ORTHO_15_MIDDLE_1_BP___ LCTL(BP_C),        LCTL(BP_X),    LCTL(BP_V)
-#define ___ORTHO_15_MIDDLE_2_BP___ TO(SYMB_ON_BEPO),  TO(_RGB),      TO(KEYPAD_ON_BEPO)
-#define ___ORTHO_15_MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), TO(MDIA),      OSL(KEYPAD_ON_BEPO)
-
-// The Viterbi only has 2 keys in the middle.
-#define ___ORTHO_14_MIDDLE_T___ OSL(LAYERS),  MDIA_SYMB_KP_LAYERS
-#define ___ORTHO_14_MIDDLE_1___ LCTL(KC_C),   LCTL(KC_V)
-#define ___ORTHO_14_MIDDLE_2___ TO(SYMB),     TO(KEYPAD)
-#define ___ORTHO_14_MIDDLE_3___ OSL(SYMB),    OSL(KEYPAD)
-
-// becomes the upper thumbs, the real 4th row if we throw away
-// the number row at the top
-#define ___ORTHO_14_MIDDLE_4___ LSFT(KC_TAB),    HOME_END,    KC_PGDN, KC_TAB
-// basically the thumb keys like on the ergodox.
-#define ___MIDDLE_THUMBS___ CTL_BSPC, ALT_DEL, XMONAD_ESC,   KC_PGDN, ALT_ENT, CTL_SPC
-
-// The same, for BEPO
-#define ___ORTHO_14_MIDDLE_T_BP___ OSL(LAYERS),       MDIA_SYMB_KP_LAYERS
-#define ___ORTHO_14_MIDDLE_1_BP___ LCTL(BP_C),        LCTL(BP_V)
-#define ___ORTHO_14_MIDDLE_2_BP___ TO(SYMB_ON_BEPO),  TO(KEYPAD_ON_BEPO)
-#define ___ORTHO_14_MIDDLE_3_BP___ OSL(SYMB_ON_BEPO), OSL(KEYPAD_ON_BEPO)
-
-#define ___ORTHO_14_MIDDLE_4_BP___ LSFT(KC_TAB), HOME_END, KC_PGUP, KC_TAB
-
-
-/********************************************************************/
-/**  The top rows for numbers, symbols and Fkeys.                  **/
-/********************************************************************/
-#define ___ORTHO_15_N___   ___NUMBER_L___,   ___ORTHO_15_MIDDLE_T___, ___NUMBER_R___
-#define ___ORTHO_15_B_N___ ___NUMBER_BEPO_L___, ___ORTHO_15_MIDDLE_T_BP___, ___NUMBER_BEPO_R___
-// the full bepo symbol row.
-#define ___ORTHO_15_B_SYMB___  BP_DLR, ___SYMBOL_BEPO_L___, ___ORTHO_15_MIDDLE_T_BP___, ___SYMBOL_BEPO_R___,  BP_EQL
-
-// transparent in the middle because I only put this on transient layers.
-#define ___ORTHO_15_FUNC_1_12___ ___FUNC_1_6___, ___3___, ___FUNC_7_12___
-
-
-/********************************************************************/
-/**  The bottom row and thumbs as needed.                          **/
-/********************************************************************/
-#define ___BOTTOM_LEFT___  LCTL(KC_C),  LCTL(KC_V),  KC_INS,  KC_LEFT, KC_RIGHT
-#define ___BOTTOM_RIGHT___ KC_UP,  KC_DOWN,  KC_BSLASH,  LCTL(KC_V),  LCTL(KC_C)
-
-// the bottom rows  for keyboards on bepo.
-// bepo on bepo - not enough space to go around....
-#define ___BOTTOM_LEFT_BP___  LCTL(BP_C),  BP_ECIR,  LCTL(BP_V),  KC_LEFT, KC_RIGHT
-#define ___BOTTOM_RIGHT_BP___ KC_UP,  KC_DOWN,  DB_BACKSLASH,  BP_CCED,  BP_PERC
-
-// for dvorak on bepo
-#define ___BOTTOM_LEFT_FR___  LCTL(BP_C),  LCTL(BP_C),  LCTL(BP_V),  KC_LEFT, KC_RIGHT
-#define ___BOTTOM_RIGHT_FR___ KC_UP,  KC_DOWN,  DB_BACKSLASH, LCTL(KC_V),  LCTL(KC_C)
-
-#define ___ORTHO_15_BOTTOM___     ___BOTTOM_LEFT___,    ___ORTHO_15_MIDDLE_4___, ___BOTTOM_RIGHT___
-#define ___ORTHO_15_BOTTOM_FR___  ___BOTTOM_LEFT_FR___, ___ORTHO_15_MIDDLE_4___, ___BOTTOM_RIGHT_FR___
-#define ___ORTHO_15_BOTTOM_BP___  ___BOTTOM_LEFT_BP___, ___ORTHO_15_MIDDLE_4___, ___BOTTOM_RIGHT_BP___
-
-#define ___ORTHO_14_BOTTOM___    ___BOTTOM_LEFT___,    ___ORTHO_14_MIDDLE_4___, ___BOTTOM_RIGHT___
-#define ___ORTHO_14_BOTTOM_FR___ ___BOTTOM_LEFT_FR___, ___ORTHO_14_MIDDLE_4___, ___BOTTOM_RIGHT_FR___
-#define ___ORTHO_14_BOTTOM_BP___ ___BOTTOM_LEFT_BP___, ___ORTHO_14_MIDDLE_4___, ___BOTTOM_RIGHT_BP___
-#define ___ORTHO_14_THUMBS_BOTTOM___   ___4___, ___MIDDLE_THUMBS___, ___4___
-
-
-#define ___ERGODOX_THUMB_LEFT___                \
-    OSL(SYMB), OSM(KC_LGUI),                    \
-        HOME_END,                               \
-        CTL_BSPC, ALT_DEL, XMONAD_ESC
-
-#define ___ERGODOX_THUMB_RIGHT___               \
-    XXX, OSL(KEYPAD),                           \
-        KC_PGUP,                                \
-        KC_PGDN, ALT_ENT, CTL_SPC
-
-#define ___ERGODOX_THUMB_RIGHT_BP___            \
-    XXX, OSL(KEYPAD_ON_BEPO),                   \
-        KC_PGUP,                                \
-        KC_PGDN, ALT_ENT, CTL_SPC
-
-#define ___ERGODOX_THUMB_LEFT_BP___             \
-    OSL(SYMB_ON_BEPO), OSM(KC_LGUI),            \
-        HOME_END,                               \
-        CTL_BSPC, ALT_DEL, XMONAD_ESC
-
-/********************************************************************************/
-/* the interior rows for ortholinear keyboards. the first number is the length  */
-/* So you can put what you want on the outside ends, make new middles as needed */
-/* It would be nice to make this a little more dynamic. There is little         */
-/*  differenc between them.                                                     */
-/********************************************************************************/
-
-//// ortho15 core rows.  used with my xd75.
-/***********************************************************/
-/* ORTHO15 interior rows.  used with my xd75 */
-/***********************************************************/
-#define ___13_DVORAK_1___  ___DVORAK_L1___,  ___ORTHO_15_MIDDLE_1___, ___DVORAK_R1___
-#define ___13_DVORAK_2___  ___DVORAK_L2___,  ___ORTHO_15_MIDDLE_2___, ___DVORAK_R2___
-#define ___13_DVORAK_3___  ___DVORAK_L3___,  ___ORTHO_15_MIDDLE_3___, ___DVORAK_R3___
-
-#define ___13_QWERTY_1___  ___QWERTY_L1___, ___ORTHO_15_MIDDLE_1___, ___QWERTY_R1___
-#define ___13_QWERTY_2___  ___QWERTY_L2___, ___ORTHO_15_MIDDLE_2___, ___QWERTY_R2___
-#define ___13_QWERTY_3___  ___QWERTY_L3___, ___ORTHO_15_MIDDLE_3___, ___QWERTY_R3___
-
-#define ___13_COLEMAK_1___ ___COLEMAK_L1___, ___ORTHO_15_MIDDLE_1___, ___COLEMAK_R1___
-#define ___13_COLEMAK_2___ ___COLEMAK_L2___, ___ORTHO_15_MIDDLE_2___, ___COLEMAK_R2___
-#define ___13_COLEMAK_3___ ___COLEMAK_L3___, ___ORTHO_15_MIDDLE_3___, ___COLEMAK_R3___
-
-#define ___13_WORKMAN_1___ ___WORKMAN_L1___, ___ORTHO_15_MIDDLE_1___, ___WORKMAN_R1___
-#define ___13_WORKMAN_2___ ___WORKMAN_L2___, ___ORTHO_15_MIDDLE_2___, ___WORKMAN_R2___
-#define ___13_WORKMAN_3___ ___WORKMAN_L3___, ___ORTHO_15_MIDDLE_3___, ___WORKMAN_R3___
-
-#define ___13_NORMAN_1___  ___NORMAN_L1___,  ___ORTHO_15_MIDDLE_1___, ___NORMAN_R1___
-#define ___13_NORMAN_2___  ___NORMAN_L2___,  ___ORTHO_15_MIDDLE_2___, ___NORMAN_R2___
-#define ___13_NORMAN_3___  ___NORMAN_L3___,  ___ORTHO_15_MIDDLE_3___, ___NORMAN_R3___
-
-#define ___13_DVORAK_B_1___ ___DVORAK_FR_L1___,  ___ORTHO_15_MIDDLE_1_BP___, ___DVORAK_FR_R1___
-#define ___13_DVORAK_B_2___ ___DVORAK_FR_L2___,  ___ORTHO_15_MIDDLE_2_BP___, ___DVORAK_FR_R2___
-#define ___13_DVORAK_B_3___ ___DVORAK_FR_L3___,  ___ORTHO_15_MIDDLE_3_BP___, ___DVORAK_FR_R3___
-
-#define ___13_BEPO_1___ ___BEPO_FR_L1___, ___ORTHO_15_MIDDLE_1_BP___, ___BEPO_FR_R1___
-#define ___13_BEPO_2___ ___BEPO_FR_L2___, ___ORTHO_15_MIDDLE_2_BP___, ___BEPO_FR_R2___
-#define ___13_BEPO_3___ ___BEPO_FR_L3___, ___ORTHO_15_MIDDLE_3_BP___, ___BEPO_FR_R3___
-
-// transparent xmonad/dvorak layer
-#define ___15_XMONAD_1___  ___,  ___DVORAK_L1___, ___3___, ___DVORAK_R1___,  ___
-#define ___15_XMONAD_2___  ___,  ___DVORAK_L2___, ___3___, ___DVORAK_R2___,  ___
-#define ___15_XMONAD_3___  ___,  ___DVORAK_L3___, ___3___, ___DVORAK_R3___,  ___
-
-// transparent xmonad/dvorak layer in bepo
-#define ___15_XMONAD_B_1___ ___,  ___DVORAK_FR_L1___,  ___3___, ___DVORAK_FR_R1___,   ___
-#define ___15_XMONAD_B_2___ ___,  ___DVORAK_FR_L2___,  ___3___, ___DVORAK_FR_R2___,   ___
-#define ___15_XMONAD_B_3___ ___,  ___DVORAK_FR_L3___,  ___3___, ___DVORAK_FR_R3___,   ___
-
-#define ___15_SYMB_1___ ___SYMBOLS6_1___,  ___3___, ___SYMPAD_1___
-#define ___15_SYMB_2___ ___SYMBOLS6_2___,  ___3___, ___SYMPAD_2___
-#define ___15_SYMB_3___ ___SYMBOLS6_3___,  ___3___, ___SYMPAD_3___
-#define ___15_SYMB_4___ ___SYMBOLS6_4___,  ___3___, ___SYMPAD_4___
-
-#define ___15_KP_1___ ___2___,  ___FUNCPAD_T___,  ___5___, ___KEYPAD_1___,  ___
-#define ___15_KP_2___ ___2___,  ___FUNCPAD_1___,  ___5___, ___KEYPAD_2___,  ___
-#define ___15_KP_3___ ___2___,  ___FUNCPAD_2___,  ___5___, ___KEYPAD_3___,  KC_PENT
-#define ___15_KP_4___ ___2___,  ___FUNCPAD_3___,  ___5___, ___KEYPAD_4___,  ___
-
-#define ___15_KP_B_1___ ___2___,  ___FUNCPAD_T___,  ___5___, ___KEYPAD_1_BP___,  ___
-#define ___15_KP_B_2___ ___2___,  ___FUNCPAD_1___,  ___5___, ___KEYPAD_2_BP___,  ___
-#define ___15_KP_B_3___ ___2___,  ___FUNCPAD_2___,  ___5___, ___KEYPAD_3_BP___,  KC_PENT
-#define ___15_KP_B_4___ ___2___,  ___FUNCPAD_3___,  ___5___, ___KEYPAD_4_BP___,  ___
-
-#define ___15_SYMB_B_1___ ___SYMBOLS6_1_BP___,  ___3___, ___SYMPAD_1_BP___
-#define ___15_SYMB_B_2___ ___SYMBOLS6_2_BP___,  ___3___, ___SYMPAD_2_BP___
-#define ___15_SYMB_B_3___ ___SYMBOLS6_3_BP___,  ___3___, ___SYMPAD_3_BP___
-#define ___15_SYMB_B_4___ ___SYMBOLS6_4_BP___,  ___3___, ___SYMPAD_4_BP___
-
-#define ___15_MDIA_1___ ___MOUSE_BTNS_L___,     ___4___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___
-#define ___15_MDIA_2___ ___, ___MOUSE_LDUR___,  ___4___, KC_VOLD, ___VI_ARROWS___, ___
-#define ___15_MDIA_3___ ___, ___MWHEEL_LDUR___, ___4___, KC_PGUP, ___MOUSE_BTNS_R___
-#define ___15_MDIA_4___ ___2___, ___MACCL___,   ___4___, KC_PGDN, ___5___
-
-#define ___15_LAYERS_1___ ___X3___, ___2_LAYERS_B1___,  ___5___,  ___3_LAYERS_T_BP___,  ___X2___
-#define ___15_LAYERS_2___ ___X3___, ___2_LAYERS_B2___,  ___5___,  ___3_LAYERS_T___,     ___X2___
-#define ___15_LAYERS_3___ ___X2___, ___3_LAYERS_B3___,  ___5___,  ___3_LAYERS_T_CTL___, ___X2___
-
-#define ___15_RGB_1___ ___, ___RGB_HUE_SAT_INT_UP___,          ___5___, ___5___
-#define ___15_RGB_2___ ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___4___, ___RGB_P_B_R_SW_SN___
-#define ___15_RGB_3___ ___5___,                                ___5___, ___RGB_KXGT___, ___
-
-
-
-/***********************************************************/
-/* ORTHO14 base layer interior rows.  used with my viterbi */
-/***********************************************************/
-#define ___12_DVORAK_1___  ___DVORAK_L1___,  ___ORTHO_14_MIDDLE_1___, ___DVORAK_R1___
-#define ___12_DVORAK_2___  ___DVORAK_L2___,  ___ORTHO_14_MIDDLE_2___, ___DVORAK_R2___
-#define ___12_DVORAK_3___  ___DVORAK_L3___,  ___ORTHO_14_MIDDLE_3___, ___DVORAK_R3___
-
-#define ___12_QWERTY_1___  ___QWERTY_L1___, ___ORTHO_14_MIDDLE_1___, ___QWERTY_R1___
-#define ___12_QWERTY_2___  ___QWERTY_L2___, ___ORTHO_14_MIDDLE_2___, ___QWERTY_R2___
-#define ___12_QWERTY_3___  ___QWERTY_L3___, ___ORTHO_14_MIDDLE_3___, ___QWERTY_R3___
-
-#define ___12_COLEMAK_1___ ___COLEMAK_L1___, ___ORTHO_14_MIDDLE_1___, ___COLEMAK_R1___
-#define ___12_COLEMAK_2___ ___COLEMAK_L2___, ___ORTHO_14_MIDDLE_2___, ___COLEMAK_R2___
-#define ___12_COLEMAK_3___ ___COLEMAK_L3___, ___ORTHO_14_MIDDLE_3___, ___COLEMAK_R3___
-
-#define ___12_WORKMAN_1___ ___WORKMAN_L1___, ___ORTHO_14_MIDDLE_1___, ___WORKMAN_R1___
-#define ___12_WORKMAN_2___ ___WORKMAN_L2___, ___ORTHO_14_MIDDLE_2___, ___WORKMAN_R2___
-#define ___12_WORKMAN_3___ ___WORKMAN_L3___, ___ORTHO_14_MIDDLE_3___, ___WORKMAN_R3___
-
-#define ___12_NORMAN_1___  ___NORMAN_L1___,  ___ORTHO_14_MIDDLE_1___, ___NORMAN_R1___
-#define ___12_NORMAN_2___  ___NORMAN_L2___,  ___ORTHO_14_MIDDLE_2___, ___NORMAN_R2___
-#define ___12_NORMAN_3___  ___NORMAN_L3___,  ___ORTHO_14_MIDDLE_3___, ___NORMAN_R3___
-
-#define ___12_DVORAK_B_1___ ___DVORAK_FR_L1___,  ___ORTHO_14_MIDDLE_1_BP___, ___DVORAK_FR_R1___
-#define ___12_DVORAK_B_2___ ___DVORAK_FR_L2___,  ___ORTHO_14_MIDDLE_2_BP___, ___DVORAK_FR_R2___
-#define ___12_DVORAK_B_3___ ___DVORAK_FR_L3___,  ___ORTHO_14_MIDDLE_3_BP___, ___DVORAK_FR_R3___
-
-#define ___12_BEPO_2___ ___BEPO_FR_L1___, ___ORTHO_14_MIDDLE_1_BP___, ___BEPO_FR_R1___
-#define ___12_BEPO_3___ ___BEPO_FR_L2___, ___ORTHO_14_MIDDLE_2_BP___, ___BEPO_FR_R2___
-#define ___12_BEPO_4___ ___BEPO_FR_L3___, ___ORTHO_14_MIDDLE_3_BP___, ___BEPO_FR_R3___
-
-
-// transparent layers.
-#define ___14_XMONAD_1___  ___,  ___DVORAK_L1___, ___2___, ___DVORAK_R1___,  ___
-#define ___14_XMONAD_2___  ___,  ___DVORAK_L2___, ___2___, ___DVORAK_R2___,  ___
-#define ___14_XMONAD_3___  ___,  ___DVORAK_L3___, ___2___, ___DVORAK_R3___,  ___
-
-#define ___14_XMONAD_B_1___ ___,  ___DVORAK_FR_L1___,  ___2___, ___DVORAK_FR_R1___,   ___
-#define ___14_XMONAD_B_2___ ___,  ___DVORAK_FR_L2___,  ___2___, ___DVORAK_FR_R2___,   ___
-#define ___14_XMONAD_B_3___ ___,  ___DVORAK_FR_L3___,  ___2___, ___DVORAK_FR_R3___,   ___
-
-#define ___14_SYMB_1___ ___SYMBOLS6_1___,  ___2___, ___SYMPAD_1___
-#define ___14_SYMB_2___ ___SYMBOLS6_2___,  ___2___, ___SYMPAD_2___
-#define ___14_SYMB_3___ ___SYMBOLS6_3___,  ___2___, ___SYMPAD_3___
-#define ___14_SYMB_4___ ___SYMBOLS6_4___,  ___2___, ___SYMPAD_4___
-
-#define ___14_KP_1___ ___2___,  ___FUNCPAD_T___,  ___4___, ___KEYPAD_1___,  ___
-#define ___14_KP_2___ ___2___,  ___FUNCPAD_1___,  ___4___, ___KEYPAD_2___,  ___
-#define ___14_KP_3___ ___2___,  ___FUNCPAD_2___,  ___4___, ___KEYPAD_3___,  KC_PENT
-#define ___14_KP_4___ ___2___,  ___FUNCPAD_3___,  ___4___, ___KEYPAD_4___,  ___
-
-#define ___14_KP_B_1___ ___2___,  ___FUNCPAD_T___,  ___4___, ___KEYPAD_1_BP___,  ___
-#define ___14_KP_B_2___ ___2___,  ___FUNCPAD_1___,  ___4___, ___KEYPAD_2_BP___,  ___
-#define ___14_KP_B_3___ ___2___,  ___FUNCPAD_2___,  ___4___, ___KEYPAD_3_BP___,  KC_PENT
-#define ___14_KP_B_4___ ___2___,  ___FUNCPAD_3___,  ___4___, ___KEYPAD_4_BP___,  ___
-
-#define ___14_SYMB_B_1___ ___SYMBOLS6_1_BP___,  ___2___, ___SYMPAD_1_BP___
-#define ___14_SYMB_B_2___ ___SYMBOLS6_2_BP___,  ___2___, ___SYMPAD_2_BP___
-#define ___14_SYMB_B_3___ ___SYMBOLS6_3_BP___,  ___2___, ___SYMPAD_3_BP___
-#define ___14_SYMB_B_4___ ___SYMBOLS6_4_BP___,  ___2___, ___SYMPAD_4_BP___
-
-#define ___14_MDIA_1___ ___MOUSE_BTNS_L___,     ___3___, KC_VOLU, ___MUTE_PRV_PLAY_NXT_STOP___
-#define ___14_MDIA_2___ ___, ___MOUSE_LDUR___,  ___3___, KC_VOLD, ___VI_ARROWS___, ___
-#define ___14_MDIA_3___ ___, ___MWHEEL_LDUR___, ___3___, KC_PGUP, ___MOUSE_BTNS_R___
-#define ___14_MDIA_4___ ___2___, ___MACCL___,   ___3___, KC_PGDN, ___5___
-
-#define ___14_LAYERS_1___ ___X3___, ___2_LAYERS_B1___,  ___4___,  ___3_LAYERS_T_BP___,  ___X2___
-#define ___14_LAYERS_2___ ___X3___, ___2_LAYERS_B2___,  ___4___,  ___3_LAYERS_T___,     ___X2___
-#define ___14_LAYERS_3___ ___X2___, ___3_LAYERS_B3___,  ___4___,  ___3_LAYERS_T_CTL___, ___X2___
-
-#define ___14_RGB_1___ ___, ___RGB_HUE_SAT_INT_UP___,          ___4___, ___5___
-#define ___14_RGB_2___ ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___3___, ___RGB_P_B_R_SW_SN___
-#define ___14_RGB_3___ ___5___,                                ___4___, ___RGB_KXGT___, ___
diff --git a/users/ericgebhart/caps_word.c b/users/ericgebhart/caps_word.c
new file mode 100644
index 0000000000..ba81c15d66
--- /dev/null
+++ b/users/ericgebhart/caps_word.c
@@ -0,0 +1,81 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+// For full documentation, see
+// https://getreuer.info/posts/keyboards/caps-word
+
+#include "caps_word.h"
+
+bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
+  static bool caps_word_enabled = false;
+  static bool shifted = false;
+#ifndef NO_ACTION_ONESHOT
+  const uint8_t mods = get_mods() | get_oneshot_mods();
+#else
+  const uint8_t mods = get_mods();
+#endif  // NO_ACTION_ONESHOT
+
+  if (!caps_word_enabled) {
+    // Pressing both shift keys at the same time enables caps word.
+    if ((mods & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
+      clear_mods();
+#ifndef NO_ACTION_ONESHOT
+      clear_oneshot_mods();
+#endif  // NO_ACTION_ONESHOT
+      shifted = false;
+      caps_word_enabled = true;
+      return false;
+    }
+    return true;
+  }
+
+  if (!record->event.pressed) { return true; }
+
+  if (!(mods & ~MOD_MASK_SHIFT)) {
+    switch (keycode) {
+    case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+    case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
+      // Earlier return if this has not been considered tapped yet.
+      if (record->tap.count == 0) { return true; }
+      // Get the base tapping keycode of a mod- or layer-tap key.
+      keycode &= 0xff;
+    }
+
+    switch (keycode) {
+      // Letter keys should be shifted.
+    case KC_A ... KC_Z:
+      if (!shifted) { register_code(KC_LSFT); }
+      shifted = true;
+      return true;
+
+      // Keycodes that continue caps word but shouldn't get shifted.
+    case KC_1 ... KC_0:
+    case KC_BSPC:
+    case KC_MINS:
+    case KC_UNDS:
+      if (shifted) { unregister_code(KC_LSFT); }
+      shifted = false;
+      return true;
+
+      // Any other keycode disables caps word.
+    }
+  }
+
+  // Disable caps word.
+  caps_word_enabled = false;
+  if (shifted) { unregister_code(KC_LSFT); }
+  shifted = false;
+  return true;
+}
diff --git a/users/ericgebhart/caps_word.h b/users/ericgebhart/caps_word.h
new file mode 100644
index 0000000000..a59b2e4338
--- /dev/null
+++ b/users/ericgebhart/caps_word.h
@@ -0,0 +1,35 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+// Caps Word, activated by pressing both shift keys at the same time.
+//
+// This library implements "Caps Word", which is like conventional Caps Lock,
+// but automatically disables itself at the end of the word. This is useful for
+// typing all-caps identifiers like `MOD_MASK_ALT`.
+//
+// Caps Word is activated by pressing the left and right shift keys at the same
+// time. This way you don't need a dedicated key for using Caps Word. I've
+// tested that this works as expected with one-shot mods and Space Cadet Shift.
+// If your shift keys are mod-taps, activate Caps Word by holding both shift
+// mod-tap keys until the tapping term, release them, then begin typing.
+//
+// For full documentation, see
+// https://getreuer.info/posts/keyboards/caps-word
+
+#pragma once
+
+#include QMK_KEYBOARD_H
+
+bool process_caps_word(uint16_t keycode, keyrecord_t* record);
diff --git a/users/ericgebhart/combos.def b/users/ericgebhart/combos.def
new file mode 100644
index 0000000000..9b5f2c8a9e
--- /dev/null
+++ b/users/ericgebhart/combos.def
@@ -0,0 +1,10 @@
+//   name      result           chord keys
+COMB(LNAV,      TG(_NAV),       SPC_TOPR, ENT_NAV)
+COMB(OSLSYM,    OSL(_SYMB),     ESC_TOPR, BSPC_SYMB)
+COMB(OSLSYMBP,  OSL(_SYMB_BP),  ESC_TOPR_BP, BSPC_SYMB_BP)
+COMB(LKEYPAD,   TG(_KEYPAD),    SPC_TOPR, BSPC_SYMB)
+COMB(LKEYPADBP, TG(_KEYPAD_BP), SPC_TOPR_BP, BSPC_SYMB_BP)
+COMB(LLAYERS,   OSL(_LAYERS),    KC_TAB, ENT_NAV)
+
+//COMB(JKL_SPC,  KC_SPC,   KC_J,  KC_X)
+//SUBS(TH_THE,   "the",    KC_T, KC_H) // SUBS uses SEND_STRING to output the given string.
diff --git a/users/ericgebhart/config.h b/users/ericgebhart/config.h
index 934c3debba..116d48f4ab 100755
--- a/users/ericgebhart/config.h
+++ b/users/ericgebhart/config.h
@@ -1,8 +1,29 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #ifndef USERSPACE_CONFIG_H
 #define USERSPACE_CONFIG_H
 
 #include "../../config.h"
 
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+#define COMBO_MUST_HOLD_MODS
+#define COMBO_HOLD_TERM 150
 // Sets good default for the speed of the mouse.
 #undef MOUSEKEY_INTERVAL
 #undef MOUSEKEY_DELAY
@@ -26,7 +47,7 @@
 #undef TAPPING_TERM
 #undef IGNORE_MOD_TAP_INTERRUPT
 
-#define TAPPING_TOGGLE  1
+#define TAPPING_TOGGLE  2
 #define TAPPING_TERM    200
 #define IGNORE_MOD_TAP_INTERRUPT
 
diff --git a/users/ericgebhart/core_keys.h b/users/ericgebhart/core_keys.h
old mode 100644
new mode 100755
index a71d905749..73beaaf7ab
--- a/users/ericgebhart/core_keys.h
+++ b/users/ericgebhart/core_keys.h
@@ -19,42 +19,13 @@
 #include "quantum.h"
 #include "process_keycode/process_tap_dance.h"
 #include "eeconfig.h"
+#include "keymap_bepo.h"
+#include "altlocal_keys.h"
 
 //#define ONESHOT_TAP_TOGGLE 2  /* Tapping this number of times holds the key until tapped once again. */
 
-void tap(uint16_t keycode);
 bool process_record_secrets(uint16_t keycode, keyrecord_t *record);
 
-
-typedef union {
-    uint8_t raw;
-     struct {
-          bool     clicky_enable    :1;
-          bool     rgb_layer_change :1;
-          bool     is_overwatch     :1;
-          bool     nuke_switch      :1;
-      };
-} userspace_config_t;
-
-
-// for the creation of dvorak keys on an Bepo keyboard at the OS layer.
-// so we can create an array of reasonable size
-// for our translation keys. We have to create a
-// good range of numbers
-#define GR(x) (x-SAFE_RANGE)
-
-uint8_t gr(uint8_t);
-void send_keycode(uint8_t);
-
-#define MOD_NONE 0x00
-
-// indexs for the keycode translation table.
-#define UNSHIFTED_KEY(key)  key_translations[gr(key)][0][0]
-#define UNSHIFTED_MODS(key) key_translations[gr(key)][0][1]
-#define SHIFTED_KEY(key)    key_translations[gr(key)][1][0]
-#define SHIFTED_MODS(key)   key_translations[gr(key)][1][1]
-
-
 enum userspace_custom_keycodes {
   // keep the keycodes using the send_key function close to SAFE_RANGE
   // so the array of keycodes remains a reasonbale size.
@@ -91,37 +62,106 @@ enum userspace_custom_keycodes {
   DB_LESS,
   DB_GRTR,
   // End of dvorak on bepo translation keys.
+  // BEAKL on Qwerty..
+  BQ_DOT,
+  BQ_COMM,
+  BQ_QUOT,
+  // End of beakl on qwerty
+  BB_DOT,
+  BB_COMM,
+  BB_QUOT,
+  // End of beakl on Bepo
 
   EPRM,
   VRSN,
-  KC_DVORAK_ON_BEPO,
-  KC_BEPO,
-  KC_NORMAN,
+  // Default keyboard layouts - Same order as enum.
+  KC_DVORAK,
   KC_QWERTY,
   KC_COLEMAK,
-  KC_DVORAK,
-  KC_WORKMAN,
+  KC_BEAKL,
+  // KC_WORKMAN,
+  // KC_NORMAN,
+  // KC_MALTRON,
+  // KC_EUCALYN,
+  // KC_CARPLAX,
+  KC_DVORAK_BP,
+  KC_BEAKL_BP,
+  KC_BEPO,
+  KC_LAYERS,
+
+  // Misc.
   KC_MAKE,
   KC_RESET,
   KC_RGB_T,
+  RGB_IDL,
   KC_SECRET_1,
   KC_SECRET_2,
   KC_SECRET_3,
   KC_SECRET_4,
   KC_SECRET_5,
-  KC_CCCV
+  KC_CCCV,      // Ctrl-C V in one key.
+  BP_CCCV,
+  KC_CTCN,      // Ctrl-T N in one key.
+  BP_CTCN,
+  KC_CWCQ,      // Ctrl-W Q in one key.
+  BP_CWCQ,
+  KC_XM_PORD,   // Xmonad gui-e, gui-t for the scratchpads or desktops.
+  BP_XM_PORD,
+  KC_OCPRN,   // Open, or open and close, cursor in the middle with hold.
+  BP_OCPRN,
+  KC_OCBRC,
+  BP_OCBRC,
+  KC_OCCBR,
+  BP_OCCBR,
+  KC_OCDQUO,
+  BP_OCDQUO,
+  KC_OCQUOT,
+  BP_OCQUOT,
+  KC_OCGRV,
+  BP_OCGRV,
+  KC_OCLTGT,
+  BP_OCLTGT,
+  UC_FLIP,
+  UC_TABL,
+  UC_SHRG,
+  UC_DISA,
+  KC_SPACETEST,
+  NEW_SAFE_RANGE
 };
 
-#define SFTGUI_T(kc) { MT(MOD_LGUI | MOD_LSFT, kc) }
-#define SFT_GUI_ESC MT(MOD_LSFT | MOD_LGUI, KC_PGDN)  // shift LGUI or Escape.
-#define ALT_ENT     ALT_T(KC_ENT)  // Alt or enter
-#define CTL_SPC     CTL_T(KC_SPC) // ctrl or space
-#define CTL_BSPC    CTL_T(KC_BSPC) // ctrl or backspace
-#define ALT_DEL     ALT_T(KC_DEL)  // Alt or delete
-#define GUI_ESC     GUI_T(KC_ESC)  // Gui or escape
-#define ALGR_SYMB   ALGR_T(TG(SYMB))  // Alt gre or toggle symbol layer
+#define CTLGUI_T(kc) MT(MOD_LGUI | MOD_LCTL, kc)
+#define SFTGUI_T(kc) MT(MOD_LGUI | MOD_LSFT, kc)
+#define ALTGUI_T(kc) MT(MOD_LGUI | MOD_LALT, kc)
 
+#define ALT_ENT     ALT_T(KC_ENT)       // Alt or enter
+#define CTL_SPC     CTL_T(KC_SPC)       // ctrl or space
+#define CTL_BSPC    CTL_T(KC_BSPC)      // ctrl or backspace
+#define ALT_DEL     ALT_T(KC_DEL)       // Alt or delete
+#define GUI_ESC     GUI_T(KC_ESC)       // Gui or escape
+#define ALGR_SYMB   ALGR_T(TG(_SYMB))    // Alt gre or toggle symbol layer
 
+#define ENT_NAV LT(_NAV, KC_ENT)
+#define ENT_TOPR LT(_TOPROWS, KC_ENT)
+#define ENT_TOPR_BP LT(_TOPROWS_BP, KC_ENT)
+#define ESC_TOPR LT(_TOPROWS, KC_ESC)
+#define ESC_TOPR_BP LT(_TOPROWS_BP, KC_ESC)
+#define ESC_SYMB LT(_SYMB, KC_ESC)
+#define ESC_SYMB_BP LT(_SYMB_BP, KC_ESC)
+#define SPC_NAV LT(_NAV, KC_SPC)
+#define SPC_TOPR LT(_TOPROWS, KC_SPC)
+#define SPC_TOPR_BP LT(_TOPROWS_BP, KC_SPC)
+#define SPC_LAYR LT(_LAYERS, KC_SPC)
+#define SPC_LAYR_BP LT(_LAYERS, KC_SPC)
+#define SPC_ADJ LT(_ADJUST, KC_SPC)
+#define SPC_ADJ_BP LT(_ADJUST, KC_SPC)
+#define BSPC_SYMB LT(_SYMB, KC_BSPC)
+#define BSPC_SYMB_BP LT(_SYMB_BP, KC_BSPC)
+#define BSPC_TOPR LT(_TOPROWS, KC_BSPC)
+#define BSPC_TOPR_BP LT(_TOPROWS_BP, KC_BSPC)
+#define SPC_NUM LT(_KEYPAD, KC_SPC)
+#define SPC_NUM_BP LT(_KEYPAD_BP, KC_SPC)
+#define BSPC_NUM LT(_KEYPAD, KC_BSPC)
+#define BSPC_NUM_BP LT(_KEYPAD_BP, KC_BSPC)
 
 // OSM keycodes, to keep things clean and easy to change
 #define KC_MLSF OSM(MOD_LSFT)
@@ -138,6 +178,9 @@ enum userspace_custom_keycodes {
 
 #define MG_NKRO MAGIC_TOGGLE_NKRO
 
+#define UC_IRNY UC(0x2E2E)
+#define UC_CLUE UC(0x203D)
+
 
 ////  TAP DANCE
 
@@ -166,11 +209,16 @@ enum {
       TD_DEF_LAYER_SW = 5,
       TD_DEF_OS_LAYER_SW = 6,
       TD_MOUSE_BTNS = 7,
-      TD_DVORAK_BEPO = 8
+      TD_DVORAK_BEPO = 8,
+      TD_UP_HOME = 9,
+      TD_DOWN_END = 10,
+      TD_RIGHT_TAB = 11,
+      TD_LEFT_BACKTAB = 12
 };
 
 
 // Tap dance
+#define KC_BKTAB       LSFT(KC_TAB)
 #define TAB_BKTAB       TD(TD_TAB_BKTAB)  // Tab or backtab tapdance.
 #define MDIA_SYMB_KP_LAYERS TD(TD_MDIA_SYMB)  // MDIA, symb, keypad, layouts layer tapdance toggle.
 #define DEF_LAYER_SW    TD(TD_DEF_LAYER_SW)  // dvorak, dvorak_on_bepo, bepo default layer
@@ -179,100 +227,34 @@ enum {
 #define XMONAD_ESC      TD(TD_XMONAD_ESC)  // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4
 #define DVORAK_ET_BEPO  TD(TD_DVORAK_BEPO)  // Escape, dvorak, media or symb. - tap and hold tap dance. 1-4
 #define TDMOUSE_BTNS    TD(TD_MOUSE_BTNS)  // hmmm. 1-5
+#define RIGHT_TAB       TD(TD_RIGHT_TAB)   // Bad idea these 4. Maybe with good timing...
+#define LEFT_BACKTAB    TD(TD_LEFT_BACKTAB)
+#define UP_HOME         TD(TD_UP_HOME)
+#define DOWN_END        TD(TD_DOWN_END)  //  No! Down Down Not End....
 
 // HOME ROW LAYER TOGGLE (LT) and Shift.
 // both sides of the home row have  "shift, ___, media , symb, ___"  and  "___, symb, media, ___, shift".
 // so pinky fingers are shift when held and the index and second fingers are symbol and
 // media layers when held.
 
-// Dvorak
-// shift and layer switch on hold on the home row.
-#define KC_SFT_T_A   SFT_T(KC_A)
-#define KC_SFT_T_S   SFT_T(KC_S)
-
-#define KC_LT_SYMB_U LT(SYMB, KC_U)
-#define KC_LT_SYMB_H LT(SYMB, KC_H)
-
-#define KC_LT_MDIA_E LT(MDIA, KC_E)
-#define KC_LT_MDIA_T LT(MDIA, KC_T)
-
-// Need to add this to the others.
-#define KC_LT_KP_N LT(KEYPAD, KC_N)
-#define KC_LT_KP_O LT(KEYPAD, KC_O)
-
-// for dvorak on bepo
-#define BP_SFT_T_A   SFT_T(BP_A)
-#define BP_SFT_T_S   SFT_T(BP_S)
-
-#define BP_LT_SYMB_U LT(SYMB, BP_U)
-#define BP_LT_SYMB_H LT(MDIA, BP_H)
-
-#define BP_LT_MDIA_E LT(MDIA, BP_E)
-#define BP_LT_MDIA_T LT(MDIA, BP_T)
-
-// Need to add this to the others.
-#define BP_LT_KP_N LT(KEYPAD, BP_N)
-#define BP_LT_KP_O LT(KEYPAD, BP_O)
-
-// for bepo on bepo
-#define BP_SFT_T_T    SFT_T(BP_T)
-#define BP_SFT_T_W    SFT_T(BP_W)
-
-#define BP_LT_SYMB_I  LT(SYMB_ON_BEPO, BP_I)
-#define BP_LT_MDIA_E  LT(MDIA, BP_E)
-#define BP_LT_KP_U    LT(KEYPAD, BP_U)
-
-#define BP_LT_SYMB_S  LT(SYMB_ON_BEPO, BP_S)
-#define BP_LT_MDIA_R  LT(MDIA, BP_R)
-#define BP_LT_KP_N    LT(KEYPAD, BP_N)
-
-#define BP_SFT_T_A SFT_T(BP_A)
-#define BP_SFT_T_S SFT_T(BP_S)
-#define BP_SFT_T_E SFT_T(BP_E)
-#define BP_SFT_T_M SFT_T(BP_M)
-
-#define BP_SFT_T_ECRC SFT_T(BP_ECIR)
-#define BP_SFT_T_CCED SFT_T(BP_CCED)
-#define BP_LT_SYMB_COMM LT(SYMB,BP_COMM)
-
-//QWERTY
-#define KC_SFT_T_SCLN   SFT_T(KC_SCLN)
-
-#define KC_LT_MDIA_D LT(MDIA, KC_D)
-#define KC_LT_MDIA_K LT(MDIA, KC_K)
-#define KC_LT_SYMB_F LT(SYMB, KC_F)
-#define KC_LT_SYMB_J LT(SYMB, KC_J)
-
-//COLEMAK
-#define KC_SFT_T_O   SFT_T(KC_O)
-#define KC_LT_MDIA_S LT(MDIA, KC_S)
-#define KC_LT_SYMB_T LT(SYMB, KC_T)
-
-#define KC_LT_MDIA_E LT(MDIA, KC_E)
-#define KC_LT_SYMB_N LT(SYMB, KC_N)
-
-//WORKMAN
-#define KC_SFT_T_I   SFT_T(KC_I)
-#define KC_LT_MDIA_H LT(MDIA, KC_H)
-
-//NORMAN
-// For keys on the homerow.  Hold for shift, keypad,mouse,and smbol layers
-#define KC_SFT_T_U   SFT_T(KC_U)
-#define KC_LT_MDIA_I LT(MDIA, KC_I)
-
 // The most portable copy/paste keys (windows (mostly), linux, and some terminal emulators).
+// The KC_CCCV key takes care of the last two...
 #define MK_CUT    LSFT(KC_DEL)  // shift + delete
 #define MK_COPY   LCTL(KC_INS)  // ctrl + insert
 #define MK_PASTE  LSFT(KC_INS)  // shift + insert
 
+#undef ___ //kint defines it as KC_NO
 #define ___ KC_TRNS
 #define XXX KC_NO
 
 // Blocking keys
+#define _X_ XXX
 #define ___X___ XXX
 #define ___X2___ XXX, XXX
 #define ___X3___ ___X2___, XXX
 #define ___X5___ ___X3___, XXX, XXX
+#define ___X6___ ___X5___, XXX
+#define ___X12___ ___X6___, ___X6___
 #define ___X15___ ___X5___, ___X5___,  ___X5___
 
 // Transparent keys
@@ -281,13 +263,18 @@ enum {
 #define ___4___ ___3___, ___
 #define ___5___ ___4___, ___
 #define ___6___ ___5___, ___
+#define ___12___ ___6___, ___6___
 #define ___14___ ___5___, ___4___,  ___5___
 #define ___15___ ___5___, ___5___,  ___5___
+#define ___16___ ___15___, ___
 
 int on_qwerty(void);
 int get_xmonad_layer(void);
+
+#ifdef TAP_DANCES_ENABLE
 int cur_dance (qk_tap_dance_state_t *state);
 
 //for the x tap dance. Put it here so it can be used in any keymap
 void x_finished (qk_tap_dance_state_t *state, void *user_data);
 void x_reset (qk_tap_dance_state_t *state, void *user_data);
+#endif
diff --git a/users/ericgebhart/core_keysets.h b/users/ericgebhart/core_keysets.h
old mode 100644
new mode 100755
index 5baf02ccf6..f51f743921
--- a/users/ericgebhart/core_keysets.h
+++ b/users/ericgebhart/core_keysets.h
@@ -17,137 +17,310 @@
 */
 
 #include "core_keys.h"
-
-/********************************************************************/
-/**  Parts are parts, pieces of keysets so we have some decent     **/
-/** building blocks to make keymaps with.                          **/
-/********************************************************************/
-
-
-// Since our quirky block definitions are basically a list of comma separated
-// arguments, we need a wrapper in order for these definitions to be
-// expanded before being used as arguments to the LAYOUT_xxx macro.
-#if (!defined(LAYOUT) && defined(KEYMAP))
-#define LAYOUT KEYMAP
-#endif
-
-#define LAYOUT_ergodox_wrapper(...)          LAYOUT_ergodox(__VA_ARGS__)
-#define LAYOUT_ergodox_pretty_wrapper(...)   LAYOUT_ergodox_pretty(__VA_ARGS__)
-#define KEYMAP_wrapper(...)                  LAYOUT(__VA_ARGS__)
-#define LAYOUT_wrapper(...)                  LAYOUT(__VA_ARGS__)
-
-#define LAYOUT_ortho_5x15_wrapper(...)       LAYOUT_ortho_5x15(__VA_ARGS__)
-#define LAYOUT_ortho_5x14_wrapper(...)       LAYOUT_ortho_5x14(__VA_ARGS__)
-
-
 /********************************************************************/
 /**  The Core rows of each given layout.                           **/
 /********************************************************************/
 //Dvorak on a qwerty software layer in the OS
-#define ___DVORAK_L1___ KC_QUOT,    KC_COMM, KC_DOT, KC_P,   KC_Y
-#define ___DVORAK_L2___ KC_SFT_T_A, KC_LT_KP_O,  KC_LT_MDIA_E,  KC_LT_SYMB_U, KC_I
-#define ___DVORAK_L3___ KC_SCLN,    KC_Q,    KC_J,   KC_K,   KC_X
+#define ___DVORAK_L1___ KC_QUOT,  KC_COMM, KC_DOT, KC_P,  KC_Y
+#define ___DVORAK_L2___ KC_A,     KC_O,    KC_E,   KC_U,  KC_I
+#define ___DVORAK_L3___ KC_SCLN,  KC_Q,    KC_J,   KC_K,  KC_X
 
-#define ___DVORAK_R1___ KC_F, KC_G,          KC_C, KC_R,   KC_L
-#define ___DVORAK_R2___ KC_D, KC_LT_SYMB_H,  KC_LT_MDIA_T, KC_LT_KP_N, KC_SFT_T_S
-#define ___DVORAK_R3___ KC_B, KC_M,          KC_W, KC_V,   KC_Z
+#define ___DVORAK_R1___ KC_F, KC_G,  KC_C, KC_R, KC_L
+#define ___DVORAK_R2___ KC_D, KC_H,  KC_T, KC_N, KC_S
+#define ___DVORAK_R3___ KC_B, KC_M,  KC_W, KC_V, KC_Z
+
+#define ___DVORAK___ ___DVORAK_L1___, ___DVORAK_R1___,  \
+        ___DVORAK_L2___, ___DVORAK_R2___,  \
+        ___DVORAK_L3___, ___DVORAK_R3___
+
+/* BEAKL 15 (main layer): */
+/*   40123 76598   */
+/*   qhoux gcrfz   */
+/* - yiea. dstnb ; */
+/*   j/,k' wmlpv   */
+
+// Remember the - and ; outside pinky keys.
+// Or use the 6 size.
+// Both are on the symbol layer too. So you
+// wont lose them at least.
+// BQ_COMM, BQ_QUOT, BQ_DOT - Beakl->Qwerty
+// BB_COMM, BB_QUOT, BB_DOT - Beakl->Bepo
+// take care of the different shifted chars.
+/* BEAKL 15 (shift layer): */
+/*   QHOUX GCRFZ   */
+/* - YIEA@ DSTNB ; */
+/*   J?!K` WMLPV   */
+#define ___BEAKL15_L1___ KC_Q, KC_H,     KC_O,    KC_U, KC_X
+#define ___BEAKL15_L2___ KC_Y, KC_I,     KC_E,    KC_A, BQ_DOT
+#define ___BEAKL15_L3___ KC_J, KC_SLASH, BQ_COMM, KC_K, BQ_QUOT
+
+#define ___BEAKL15_R1___ KC_G, KC_C,     KC_R,    KC_F, KC_Z
+#define ___BEAKL15_R2___ KC_D, KC_S,     KC_T,    KC_N, KC_B
+#define ___BEAKL15_R3___ KC_W, KC_M,     KC_L,    KC_P, KC_V
+
+#define ___BEAKL15___ ___BEAKL15_L1___, ___BEAKL15_R1___,       \
+        ___BEAKL15_L2___, ___BEAKL15_R2___,                     \
+        ___BEAKL15_L3___, ___BEAKL15_R3___
+
+#define ___6BEAKL15_L1___ ___,     KC_Q, KC_H,     KC_O,    KC_U, KC_X
+#define ___6BEAKL15_L2___ KC_MINS, KC_Y, KC_I,     KC_E,    KC_A, BQ_DOT
+#define ___6BEAKL15_L3___ ___,     KC_J, KC_SLASH, BQ_COMM, KC_K, BQ_QUOT
+
+#define ___6BEAKL15_R1___ KC_G, KC_C,     KC_R,    KC_F, KC_Z, ___
+#define ___6BEAKL15_R2___ KC_D, KC_S,     KC_T,    KC_N, KC_B, KC_SCLN
+#define ___6BEAKL15_R3___ KC_W, KC_M,     KC_L,    KC_P, KC_V, ___
+
+#define ___6BEAKL15___ ___6BEAKL15_L1___, ___6BEAKL15_R1___,    \
+        ___6BEAKL15_L2___, ___6BEAKL15_R2___,                   \
+        ___6BEAKL15_L3___, ___6BEAKL15_R3___
 
 // Qwerty based layers that I don't really use.
-#define ___QWERTY_L1___ KC_Q,        KC_W,    KC_E,          KC_R,         KC_T
-#define ___QWERTY_L2___ KC_SFT_T_A,  KC_S,    KC_LT_MDIA_D,  KC_LT_SYMB_F, KC_G
-#define ___QWERTY_L3___ KC_Z,        KC_X,    KC_C,          KC_V,         KC_B
+#define ___QWERTY_L1___ KC_Q,  KC_W,  KC_E,    KC_R,   KC_T
+#define ___QWERTY_L2___ KC_A,  KC_S,  KC_D,    KC_F,   KC_G
+#define ___QWERTY_L3___ KC_Z,  KC_X,  KC_C,    KC_V,   KC_B
 
-#define ___QWERTY_R1___ KC_Y,    KC_U,            KC_I,          KC_O,    KC_P
-#define ___QWERTY_R2___ KC_H,    KC_LT_SYMB_J,    KC_LT_MDIA_K,  KC_L,    KC_SFT_T_SCLN
-#define ___QWERTY_R3___ KC_N,    KC_M,            KC_COMM,       KC_DOT,  KC_SLASH
+#define ___QWERTY_R1___ KC_Y,  KC_U,  KC_I,    KC_O,   KC_P
+#define ___QWERTY_R2___ KC_H,  KC_J,  KC_K,    KC_L,   KC_SCLN
+#define ___QWERTY_R3___ KC_N,  KC_M,  KC_COMM, KC_DOT, KC_SLASH
+
+#define ___QWERTY___ ___QWERTY_L1___, ___QWERTY_R1___,          \
+        ___QWERTY_L2___, ___QWERTY_R2___,                       \
+        ___QWERTY_L3___, ___QWERTY_R3___
+
+// Qwerty based layers that I don't really use.
 
 // COLEMAK
-#define ___COLEMAK_L1___ KC_Q,       KC_W,    KC_F,          KC_P,          KC_G
-#define ___COLEMAK_L2___ KC_SFT_T_A, KC_R,    KC_LT_MDIA_S,  KC_LT_SYMB_T,  KC_D
-#define ___COLEMAK_L3___ KC_Z,       KC_X,    KC_C,          KC_V,          KC_B
+#define ___COLEMAK_L1___ KC_Q, KC_W,  KC_F,    KC_P,   KC_G
+#define ___COLEMAK_L2___ KC_A, KC_R,  KC_S,    KC_T,   KC_D
+#define ___COLEMAK_L3___ KC_Z, KC_X,  KC_C,    KC_V,   KC_B
 
-#define ___COLEMAK_R1___ KC_J,    KC_L,          KC_U,          KC_Y,    KC_SCLN
-#define ___COLEMAK_R2___ KC_H,    KC_LT_SYMB_N,  KC_LT_MDIA_E,  KC_I,    KC_SFT_T_O
-#define ___COLEMAK_R3___ KC_K,    KC_M,          KC_COMM,       KC_DOT,  KC_SLASH
+#define ___COLEMAK_R1___ KC_J, KC_L,  KC_U,    KC_Y,   KC_SCLN
+#define ___COLEMAK_R2___ KC_H, KC_N,  KC_E,    KC_I,   KC_O
+#define ___COLEMAK_R3___ KC_K, KC_M,  KC_COMM, KC_DOT, KC_SLASH
+
+#define ___COLEMAK___ ___COLEMAK_L1___, ___COLEMAK_R1___,       \
+        ___COLEMAK_L2___, ___COLEMAK_R2___,                     \
+        ___COLEMAK_L3___, ___COLEMAK_R3___
 
 // COLEMAK-DH
-#define ___COLEMAK_DH_L1___ KC_Q,        KC_W,    KC_F,          KC_P,          KC_B
-#define ___COLEMAK_DH_L2___ KC_SFT_T_A,  KC_R,    KC_LT_MDIA_S,  KC_LT_SYMB_T,  KC_G
-#define ___COLEMAK_DH_L3___ KC_Z,        KC_X,    KC_C,          KC_D,          KC_V
+#define ___COLEMAK_DH_L1___ KC_Q,  KC_W,  KC_F,  KC_P,  KC_B
+#define ___COLEMAK_DH_L2___ KC_A,  KC_R,  KC_S,  KC_T,  KC_G
+#define ___COLEMAK_DH_L3___ KC_Z,  KC_X,  KC_C,  KC_D,  KC_V
+
+#define ___COLEMAK_DH_R1___ KC_J,  KC_L,  KC_U,    KC_Y,    KC_SCLN
+#define ___COLEMAK_DH_R2___ KC_M,  KC_N,  KC_E,    KC_I,    KC_O
+#define ___COLEMAK_DH_R3___ KC_K,  KC_H,  KC_COMM, KC_DOT,  KC_SLASH
+
+#define ___COLEMAK_DH___ ___COLEMAK_DH_L1___, ___COLEMAK_DH_R1___,      \
+        ___COLEMAK_DH_L2___, ___COLEMAK_DH_R2___,                       \
+        ___COLEMAK_DH_L3___, ___COLEMAK_DH_R3___
 
-#define ___COLEMAK_DH_R1___ KC_J,  KC_L,          KC_U,          KC_Y,    KC_SCLN
-#define ___COLEMAK_DH_R2___ KC_M,  KC_LT_SYMB_N,  KC_LT_MDIA_E,  KC_I,    KC_SFT_T_O
-#define ___COLEMAK_DH_R3___ KC_K,  KC_H,          KC_COMM,       KC_DOT,  KC_SLASH
 
 // WORKMAN
-#define ___WORKMAN_L1___ KC_Q,        KC_D,    KC_R,          KC_W,          KC_B
-#define ___WORKMAN_L2___ KC_SFT_T_A,  KC_S,    KC_LT_MDIA_H,  KC_LT_SYMB_T,  KC_G
-#define ___WORKMAN_L3___ KC_Z,        KC_X,    KC_M,          KC_C,          KC_V
+#define ___WORKMAN_L1___ KC_Q,  KC_D,  KC_R,  KC_W,  KC_B
+#define ___WORKMAN_L2___ KC_A,  KC_S,  KC_H,  KC_T,  KC_G
+#define ___WORKMAN_L3___ KC_Z,  KC_X,  KC_M,  KC_C,  KC_V
+
+#define ___WORKMAN_R1___ KC_J,  KC_F,  KC_U,     KC_P,    KC_SCLN
+#define ___WORKMAN_R2___ KC_Y,  KC_N,  KC_E,     KC_O,    KC_I
+#define ___WORKMAN_R3___ KC_K,  KC_L,  KC_COMM,  KC_DOT,  KC_SLASH
+
+#define ___WORKMAN___ ___WORKMAN_L1___, ___WORKMAN_R1___,       \
+        ___WORKMAN_L2___, ___WORKMAN_R2___,                     \
+        ___WORKMAN_L3___, ___WORKMAN_R3___
 
-#define ___WORKMAN_R1___ KC_J,  KC_F,          KC_U,          KC_P,    KC_SCLN
-#define ___WORKMAN_R2___ KC_Y,  KC_LT_SYMB_N,  KC_LT_MDIA_E,  KC_O,    KC_SFT_T_I
-#define ___WORKMAN_R3___ KC_K,  KC_L,          KC_COMM,       KC_DOT,  KC_SLASH
 
 // NORMAN
-#define ___NORMAN_L1___ KC_Q,        KC_W,    KC_D,          KC_F,          KC_K
-#define ___NORMAN_L2___ KC_SFT_T_A,  KC_S,    KC_LT_MDIA_E,  KC_LT_SYMB_T,  KC_G
-#define ___NORMAN_L3___ KC_Z,        KC_X,    KC_C,          KC_V,          KC_B
+#define ___NORMAN_L1___ KC_Q,  KC_W,   KC_D,  KC_F,  KC_K
+#define ___NORMAN_L2___ KC_A,  KC_S,   KC_E,  KC_T,  KC_G
+#define ___NORMAN_L3___ KC_Z,  KC_X,   KC_C,  KC_V,  KC_B
 
-#define ___NORMAN_R1___ KC_J,   KC_U,          KC_R,          KC_L,    KC_SCLN
-#define ___NORMAN_R2___ KC_Y,   KC_LT_SYMB_N,  KC_LT_MDIA_I,  KC_O,    KC_SFT_T_U
-#define ___NORMAN_R3___ KC_P,   KC_M,          KC_COMM,       KC_DOT,  KC_SLASH
+#define ___NORMAN_R1___ KC_J,   KC_U,  KC_R,     KC_L,    KC_SCLN
+#define ___NORMAN_R2___ KC_Y,   KC_N,  KC_I,     KC_O,    KC_U
+#define ___NORMAN_R3___ KC_P,   KC_M,  KC_COMM,  KC_DOT,  KC_SLASH
 
-// BEPO MAPS
-// Dvorak on fr-bepo software layer in the OS.
+#define ___NORMAN___ ___NORMAN_L1___, ___NORMAN_R1___,     \
+        ___NORMAN_L2___, ___NORMAN_R2___,                  \
+        ___NORMAN_L3___, ___NORMAN_R3___
+
+
+#define ___MALTRON_L1___ KC_Q,    KC_P,    KC_Y,    KC_C,    KC_B
+#define ___MALTRON_L2___ KC_A,    KC_N,    KC_I,    KC_S,    KC_F
+#define ___MALTRON_L3___ KC_SCLN, KC_SLSH, KC_J,    KC_G,    KC_COMM
+
+#define ___MALTRON_R1___ KC_V,    KC_M,    KC_U,    KC_Z,    KC_L
+#define ___MALTRON_R2___ KC_D,    KC_T,    KC_D,    KC_O,    KC_R
+#define ___MALTRON_R3___ KC_DOT,  KC_W,    KC_K,    KC_MINS, KC_X
+
+#define ___MALTRON___ ___MALTRON_L1___, ___MALTRON_R1___,       \
+        ___MALTRON_L2___, ___MALTRON_R2___,                     \
+        ___MALTRON_L3___, ___MALTRON_R3___
+
+
+#define ___EUCALYN_L1___ KC_SLSH, KC_COMM, KC_DOT,  KC_F,    KC_Q
+#define ___EUCALYN_L2___ KC_A,    KC_O,    KC_E,    KC_I,    KC_U
+#define ___EUCALYN_L3___ KC_Z,    KC_X,    KC_C,    KC_V,    KC_W
+
+#define ___EUCALYN_R1___ KC_M,    KC_R,    KC_D,    KC_Y,    KC_P
+#define ___EUCALYN_R2___ KC_G,    KC_T,    KC_K,    KC_S,    KC_N
+#define ___EUCALYN_R3___ KC_B,    KC_H,    KC_J,    KC_L,    KC_SCLN
+
+#define ___EUCALYN___ ___EUCALYN_L1___, ___EUCALYN_R1___,       \
+        ___EUCALYN_L2___, ___EUCALYN_R2___,                     \
+        ___EUCALYN_L3___, ___EUCALYN_R3___
+
+
+#define ___CARPLAX_QFMLWY_L1___ KC_Q,    KC_F,    KC_M,    KC_L,    KC_W
+#define ___CARPLAX_QFMLWY_L2___ KC_D,    KC_S,    KC_T,    KC_N,    KC_R
+#define ___CARPLAX_QFMLWY_L3___ KC_Z,    KC_V,    KC_G,    KC_C,    KC_X
+
+#define ___CARPLAX_QFMLWY_R1___ KC_Y,    KC_U,    KC_O,    KC_B,    KC_J
+#define ___CARPLAX_QFMLWY_R2___ KC_I,    KC_A,    KC_E,    KC_H,    KC_SCLN
+#define ___CARPLAX_QFMLWY_R3___ KC_P,    KC_K,    KC_COMM, KC_DOT,  KC_SLSH
+
+#define ___CARPLAX_QFMLWY___ ___CARPLAX_QFMLWY_L1___, ___CARPLAX_QFMLWY_R1___, \
+        ___CARPLAX_QFMLWY_L2___, ___CARPLAX_QFMLWY_R2___,               \
+        ___CARPLAX_QFMLWY_L3___, ___CARPLAX_QFMLWY_R3___
+
+
+#define ___CARPLAX_QGMLWB_L1___ KC_Q,    KC_G,    KC_M,    KC_L,    KC_W
+#define ___CARPLAX_QGMLWB_L2___ KC_D,    KC_S,    KC_T,    KC_N,    KC_R
+#define ___CARPLAX_QGMLWB_L3___ KC_Z,    KC_X,    KC_C,    KC_F,    KC_J
+
+#define ___CARPLAX_QGMLWB_R1___ KC_B,    KC_Y,    KC_U,    KC_V,    KC_SCLN
+#define ___CARPLAX_QGMLWB_R2___ KC_I,    KC_A,    KC_E,    KC_O,    KC_H
+#define ___CARPLAX_QGMLWB_R3___ KC_K,    KC_P,    KC_COMM, KC_DOT,  KC_SLSH
+
+#define ___CARPLAX_QGMLWB___ ___CARPLAX_QGMLWB_L1___, ___CARPLAX_QGMLWB_R1___, \
+        ___CARPLAX_QGMLWB_L2___, ___CARPLAX_QGMLWB_R2___,               \
+        ___CARPLAX_QGMLWB_L3___, ___CARPLAX_QGMLWB_R3___
+
+
+#define ___CARPLAX_QGMLWY_L1___ KC_Q,    KC_G,    KC_M,    KC_L,    KC_W
+#define ___CARPLAX_QGMLWY_L2___ KC_D,    KC_S,    KC_T,    KC_N,    KC_R
+#define ___CARPLAX_QGMLWY_L3___ KC_Z,    KC_X,    KC_C,    KC_V,    KC_J
+
+#define ___CARPLAX_QGMLWY_R1___ KC_Y,    KC_F,    KC_U,    KC_B,    KC_SCLN
+#define ___CARPLAX_QGMLWY_R2___ KC_I,    KC_A,    KC_E,    KC_O,    KC_H
+#define ___CARPLAX_QGMLWY_R3___ KC_K,    KC_P,    KC_COMM, KC_DOT,  KC_SLSH
+
+#define ___CARPLAX_QGMLWY___ ___CARPLAX_QGMLWY_L1___, ___CARPLAX_QGMLWY_R1___, \
+        ___CARPLAX_QGMLWY_L2___, ___CARPLAX_QGMLWY_R2___,               \
+        ___CARPLAX_QGMLWY_L3___, ___CARPLAX_QGMLWY_R3___
+
+
+// BEPO Based Layouts.
+// Bepo, Dvorak and Beakl on fr-bepo software layer in the OS.
 // for dvorak and all the other qwerty like keyboards on bepo
-#define ___DVORAK_FR_L1___ DB_QUOT,    DB_COMM,  DB_DOT,  BP_P,        BP_Y
-#define ___DVORAK_FR_L2___ BP_SFT_T_A, BP_LT_KP_O,     BP_LT_MDIA_E,    BP_LT_SYMB_U,  BP_I
-#define ___DVORAK_FR_L3___ DB_SCOLON,  BP_Q,     BP_J,    BP_K,        BP_X
+#define ___DVORAK_FR_L1___ DB_QUOT,    DB_COMM,  DB_DOT,  BP_P,  BP_Y
+#define ___DVORAK_FR_L2___ BP_A,       BP_O,     BP_E,    BP_U,  BP_I
+#define ___DVORAK_FR_L3___ DB_SCOLON,    BP_Q,     BP_J,    BP_K,  BP_X
 
-#define ___DVORAK_FR_R1___ BP_F,    BP_G,        BP_C,  BP_R,  BP_L
-#define ___DVORAK_FR_R2___ BP_D,    BP_LT_SYMB_H,        BP_LT_MDIA_T,  BP_LT_KP_N,  BP_SFT_T_S
-#define ___DVORAK_FR_R3___ BP_B,    BP_M,        BP_W,  BP_V,  BP_Z
+#define ___DVORAK_FR_R1___ BP_F, BP_G, BP_C,  BP_R,  BP_L
+#define ___DVORAK_FR_R2___ BP_D, BP_H, BP_T,  BP_N,  BP_S
+#define ___DVORAK_FR_R3___ BP_B, BP_M, BP_W,  BP_V,  BP_Z
 
+#define ___DVORAK_FR___ ___DVORAK_FR_L1___, ___DVORAK_FR_R1___, \
+        ___DVORAK_FR_L2___, ___DVORAK_FR_R2___,                 \
+        ___DVORAK_FR_L3___, ___DVORAK_FR_R3___
 
-// Bepo on fr-bepo software layer
-// for bepo on bepo
-/* BP_DLR,   BP_DQUO, BP_LDAQ, BP_RDAQ, BP_LPRN, BP_RPRN, KC_DEL, */
-#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQUO,  BP_LDAQ,   BP_RDAQ,   BP_LPRN,   BP_RPRN
-/*   KC_DEL,  BP_AT,   BP_PLUS,  BP_MINS, BP_SLSH,     BP_ASTR, BP_EQL, */
-#define ___SYMBOL_BEPO_R___    BP_AT,    BP_PLUS,  BP_MINS,   BP_SLSH,  BP_ASTR /* BP_EQL,  BP_PERC */
+/* BEAKL 15 (main layer): */
 
-#define ___BEPO_FR_L1___             BP_B,        BP_EACU, BP_P,           BP_O,          BP_EGRV
-#define ___BEPO_FR_L2___             BP_SFT_T_A,  BP_LT_KP_U,    BP_LT_SYMB_I,   BP_LT_MDIA_E,  BP_COMM
-#define ___BEPO_FR_L3___ /*BP_ECIR*/ BP_AGRV,     BP_Y,    BP_X,           BP_DOT,        BP_K
+#define ___DVORAK6_FR_L1___ DB_GRV,    ___DVORAK_FR_L1___
+#define ___DVORAK6_FR_L2___ TAB_BKTAB, ___DVORAK_FR_L2___
+#define ___DVORAK6_FR_L3___ ___,       ___DVORAK_FR_L3___
 
-#define ___BEPO_FR_R1___  /* BP_DCIR,*/  BP_V, BP_D,  BP_L,    BP_J,  BP_Z
-#define ___BEPO_FR_R2___  /* BP_C,   */  BP_T, BP_LT_SYMB_S,    BP_LT_MDIA_R,  BP_LT_KP_N, BP_SFT_T_M  //BP_CCED
-#define ___BEPO_FR_R3___                 BP_QUOT,    BP_Q,    BP_G,  BP_H, BP_F //BP_SFT_T_W
+#define ___DVORAK6_FR_R1___ ___DVORAK_FR_R1___,  BP_MIN
+#define ___DVORAK6_FR_R2___ ___DVORAK_FR_R2___,  BP_SLSH
+#define ___DVORAK6_FR_R3___ ___DVORAK_FR_R3___,  DB_BACKSLASH
 
-/* BP_DLR,   BP_DQUO, BP_LDAQ, BP_RDAQ, BP_LPRN, BP_RPRN, KC_DEL, */
-/*   KC_TAB,   BP_B,    BP_EACU, BP_P,    BP_O,    BP_EGRV, KC_BSPC, */
-/*   KC_LSFT,  BP_A,    BP_U,    BP_I,    BP_E,    BP_COMM, */
-/*   KC_LCTRL, BP_AGRV, BP_Y,    BP_X,    BP_DOT,  BP_K,    KC_ENT, */
-/*   ESC_FN,   BP_ECIR, KC_LGUI, KC_LALT, SPC_RALT, */
-/*   TT(SWAP), KC_MNXT, */
-/*   KC_MPLY, */
-/*   TT(FN), TT(NUMS), KC_MPRV, */
+#define ___6DVORAK_FR___ ___6DVORAK_FR_L1___, ___6DVORAK_FR_R1___,      \
+        ___6DVORAK_FR_L2___, ___6DVORAK_FR_R2___,                       \
+        ___6DVORAK_FR_L3___, ___6DVORAK_FR_R3___
 
-/* /\* right hand *\/ */
-/*   KC_DEL,  BP_AT,   BP_PLUS,  BP_MINS, BP_SLSH,     BP_ASTR, BP_EQL, */
-/*   KC_BSPC, BP_DCIR, BP_V,     BP_D,    BP_L,        BP_J,    BP_Z, */
-/*   BP_C,    BP_T,     BP_S,    BP_R,        BP_N,    M_RSFT, */
-/*   KC_ENT,  BP_QUOT, BP_Q,     BP_G,    BP_H,        BP_F,    W_RCTL, */
+// dont forget ; and -.  the 'a' home row is official placement.
+#define ___BEAKL15_FR_L1___          BP_Q, BP_H,     BP_O,    BP_U, BP_X
+#define ___BEAKL15_FR_L2___          BP_Y, BP_I,     BP_E,    BP_A, BB_DOT
+#define ___BEAKL15_FR_L2a___ BP_MIN, BP_Y, BP_I,     BP_E,    BP_A, BB_DOT
+#define ___BEAKL15_FR_L3___          BP_J, BP_SLSH, BB_COMM, BP_K, BB_QUOT
+
+#define ___BEAKL15_FR_R1___  BP_G, BP_C, BP_R, BP_F, BP_Z
+#define ___BEAKL15_FR_R2___  BP_D, BP_S, BP_T, BP_N, BP_B
+#define ___BEAKL15_FR_R2a___ BP_D, BP_S, BP_T, BP_N, BP_B, DB_SCLN
+#define ___BEAKL15_FR_R3___  BP_W, BP_M, BP_L, BP_P, BP_V
+
+#define ___6BEAKL15_FR___ ___, ___BEAKL15_FR_L1___, ___BEAKL15_FR_R1___, ___, \
+        ___BEAKL15_FR_L2a___, ___BEAKL15_FR_R2a___,                     \
+        ___, ___BEAKL15_FR_L3___, ___BEAKL15_FR_R3___, ___
+
+#define ___BEAKL15_FR___ ___BEAKL15_FR_L1___, ___BEAKL15_FR_R1___, \
+        ___BEAKL15_FR_L2___, ___BEAKL15_FR_R2___,                \
+        ___BEAKL15_FR_L3___, ___BEAKL15_FR_R3___
+
+#define ___BEPO_L1___             BP_B,    BP_EACU, BP_P,   BP_O,   BP_EGRV
+#define ___BEPO_L2___             BP_A,    BP_U,    BP_I,   BP_E,   BP_COMM
+#define ___BEPO_L3___ /*BP_ECRC*/ BP_AGRV, BP_Y,    BP_X,   BP_DOT, BP_K
+
+#define ___BEPO_R1___  /* BP_DCRC,*/  BP_V,     BP_D,  BP_L,  BP_J,  BP_Z
+#define ___BEPO_R2___  /* BP_C,   */  BP_T,     BP_S,  BP_R,  BP_N,  BP_M  //BP_CCED
+#define ___BEPO_R3___                 BP_QUOT,  BP_Q,  BP_G,  BP_H,  BP_F //BP_SFT_T_W
+
+// Bepo for a 3x6 split.  CCED switched hands. :-(  'Altgr-c c'  does the same.
+// W has to drop down to the bottom. Silly unbalanced layout.
+#define ___BEPO6_L1___  BP_CCED,   ___BEPO_L1___
+#define ___BEPO6_L2___  TAB_BKTAB, ___BEPO_L2___
+#define ___BEPO6_L3___  BP_ECIR,   ___BEPO_L3___
+
+#define ___BEPO6_R1___   ___BEPO_R1___, BP_PERC
+#define ___BEPO6_R2___   ___BEPO_R2___,  BP_C
+#define ___BEPO6_R3___   ___BEPO_R3___, BP_W
+
+#define ___BEPO6___ ___BEPO6_L1___, ___BEPO6_R1___,  \
+        ___BEPO6_L2___, ___BEPO6_R2___,              \
+        ___BEPO6_L3___, ___BEPO6_R3___
+
+#define ___BEPO___ ___BEPO_L1___, ___BEPO_R1___,  \
+        ___BEPO_L2___, ___BEPO_R2___,             \
+        ___BEPO_L3___, ___BEPO_R3___
 
 
 /*******************************************************************/
-/** For the top rows.  Numbers for most things, symbols for Bepo. **/
+/** TOP ROWS  Func,Symbols, Numbers you find there.               **/
 /*******************************************************************/
-
 // for everything on qwerty.
 #define ___NUMBER_L___ KC_1,    KC_2,    KC_3,    KC_4,    KC_5
 #define ___NUMBER_R___ KC_6,    KC_7,    KC_8,    KC_9,    KC_0
 
+#define ___NUMBER_BEAKL15_L___ KC_4, KC_0, KC_1, KC_2, KC_3
+#define ___NUMBER_BEAKL15_R___ KC_7, KC_6, KC_5, KC_9, KC_8
+
+// a top symbol row if someone wants it.
+#define ___SYMB_L___   KC_EXLM,   KC_AT,    KC_HASH,  KC_DLR,   KC_PERC
+#define ___SYMB_R___   KC_CIRC,   KC_AMPR,  KC_ASTR,   KC_LPRN,  KC_RPRN
+
+/// BEPO ////
+// For numbers on bepo. Bepo has numbers on shifted keys, the
+// reverse of many layouts.
+#define ___NUMBER_BEPO_L___ DB_1,   DB_2,   DB_3,   DB_4,   DB_5
+#define ___NUMBER_BEPO_R___ DB_6,   DB_7,   DB_8,   DB_9,   DB_0
+
+// In case you want to try BEAKL 15 Numbers
+#define ___NUMBER_BEAKL15_BP_L___ DB_4, DB_0, DB_1, DB_2, DB_3
+#define ___NUMBER_BEAKL15_BP_R___ DB_7, DB_6, DB_5, DB_9, DB_8
+
+// The top row.  Bepo has symbols not numbers. Numbers are the shifted values.
+// There are actually 13 keys specified for bepo.
+#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQUO,  BP_LDAQ,   BP_RDAQ,   BP_LPRN,   BP_RPRN
+#define ___SYMBOL_BEPO_R___    BP_AT,    BP_PLUS,  BP_MINS,   BP_SLSH,  BP_ASTR /* BP_EQL,  BP_PERC */
+
+#define ___6SYMBOL_BEPO_L___  BP_DLR, ___SYMBOL_BEPO_L___
+#define ___6SYMBOL_BEPO_R___  ___SYMBOL_BEPO_R___, BP_EQL  /*  BP_PERC */
+
+// a top qwerty style symbol row if someone wants it.
+#define ___SYMB_L_FR___   DB_EXLM,   BP_AT,    BP_HASH,  BP_DLR,   BP_PERC
+#define ___SYMB_R_FR___   DB_CIRC,   BP_AMPR,  BP_ASTR,  BP_LPRN,  BP_RPRN
+
+
 // function key rows, works for everyone.
 #define ___FUNC_L___   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5
 #define ___FUNC_R___   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10
@@ -155,139 +328,18 @@
 #define ___FUNC_1_6___   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6
 #define ___FUNC_7_12___  KC_F7,   KC_F8,   KC_F9,   KC_F10, KC_F11, KC_F12
 
-// a top symbol row if someone wants it.
-#define ___SYMB_L___   KC_EXLM,   KC_AT,    KC_HASH,  KC_DLR,   KC_PERC
-#define ___SYMB_R___   KC_CIRC,   KC_AMPR,  KC_AST,   KC_LPRN,  KC_RPRN
+#define ___FUNC_BEAKL_L___ KC_F4, KC_F10, KC_F1, KC_F2, KC_F3
+#define ___FUNC_BEAKL_R___ KC_F7, KC_F6, KC_F5, KC_F9, KC_F8
 
-// For numbers on bepo. Bepo has numbers on shifted keys, the
-// reverse of most keyboard layouts.
-#define ___NUMBER_BEPO_L___ DB_1,   DB_2,   DB_3,   DB_4,   DB_5
-#define ___NUMBER_BEPO_R___ DB_6,   DB_7,   DB_8,   DB_9,   DB_0
+#define ___12_FUNC_BEAKL___ KC_F11, ___FUNC_BEAKL_L___, ___FUNC_BEAKL_R___, KC_F12
 
-
-/*******************************************************************/
-/* keysets for the auxillary layers.                               */
-/* the KC_P?  codes don't work for me. I don't use those shifted   */
-/* values anyway.                                                  */
-/*******************************************************************/
-// Keypads
-#define ___KEYPAD_1___ KC_7,  KC_8,    KC_9,     KC_PSLS
-#define ___KEYPAD_2___ KC_4,  KC_5,    KC_6,     KC_PAST
-#define ___KEYPAD_3___ KC_1,  KC_2,    KC_3,     KC_PMNS
-#define ___KEYPAD_4___ KC_0,  KC_DOT,  KC_PEQL,  KC_PPLS
-
-// Keypad from the default keymap.c of the xd75
-#define ___KEYPAD_1_ALT___ KC_P7, KC_P8,  KC_P9,   KC_MINS
-#define ___KEYPAD_2_ALT___ KC_P4, KC_P5,  KC_P6,   KC_PLUS
-#define ___KEYPAD_3_ALT___ KC_P1, KC_P2,  KC_P3,   KC_PENT
-#define ___KEYPAD_4_ALT___ KC_P0, KC_DOT, KC_PENT, KC_PENT
-
-// For Bepo
-#define ___KEYPAD_1_BP___ DB_7,  DB_8,    DB_9,     BP_SLSH
-#define ___KEYPAD_2_BP___ DB_4,  DB_5,    DB_6,     BP_ASTR
-#define ___KEYPAD_3_BP___ DB_1,  DB_2,    DB_3,     DB_MINUS
-#define ___KEYPAD_4_BP___ DB_0,  DB_DOT,  DB_EQL,   BP_PLUS
-
-
-// SYMBOLS
-// An arrangement for the left hand with a focus on the ()[]{}s.
-#define ___SYMBOLS_1___  KC_EXLM,  KC_AT,    KC_LCBR,  KC_RCBR,  KC_PIPE
-#define ___SYMBOLS_2___  KC_HASH,  KC_DLR,   KC_LPRN,  KC_RPRN,  KC_GRV
-#define ___SYMBOLS_3___  KC_PERC,  KC_CIRC,  KC_LBRC,  KC_RBRC,  KC_TILD
-
-// A larger 6 column arrangement for the left hand, A merge of dvorak and the above.
-#define ___SYMBOLS6_1___  KC_GRV,  KC_LT,    KC_GT,    KC_LCBR,  KC_RCBR,  KC_HASH
-#define ___SYMBOLS6_2___  KC_AMPR, KC_AT,    KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_PERC
-#define ___SYMBOLS6_3___  KC_DLR,  KC_DQT,   KC_QUOT,  KC_LBRC,  KC_RBRC,  KC_COLON
-#define ___SYMBOLS6_4___  ___2___, KC_TILD,  KC_DOT,   KC_EXLM,  KC_SCLN
-
-#define ___SYMBOLS5_4___  ___, KC_TILD,  KC_DOT,   KC_EXLM,  KC_SCLN
-
-
-// A symbol pad.  Basically the same layout as a number pad with the symbols
-// instead of the numbers with some extras around it, in familiar places for the
-// right hand.
-#define ___SYMPAD_1___  KC_GRV,  KC_AMPR, KC_ASTR, KC_LCBR,  KC_PLUS,  KC_PIPE
-#define ___SYMPAD_2___  KC_TILD, KC_DLR,  KC_PERC, KC_CIRC,  KC_ASTR,  KC_GRV
-#define ___SYMPAD_3___  ___,     KC_EXLM, KC_AT,   KC_HASH,  KC_MINUS, KC_SLASH
-#define ___SYMPAD_4___  ___,     KC_RCBR, KC_DOT,  KC_EQUAL, KC_UNDS,  KC_BSLASH
-
-#define ___5_SYMPAD_4___  KC_RCBR, KC_DOT,  KC_EQUAL, KC_UNDS,  KC_BSLASH
-
-// Function pad.  Same idea as above, but for function keys.
-#define ___FUNCPAD_T___   KC_F10,  KC_F11,  KC_F12
-#define ___FUNCPAD_1___   KC_F7,   KC_F8,   KC_F9
-#define ___FUNCPAD_2___   KC_F4,   KC_F5,   KC_F6
-#define ___FUNCPAD_3___   KC_F1,   KC_F2,   KC_F3
-
-
-//---  all over again for BEPO
-
-// SYMBOLS FOR BEPO
-// The top row.  Bepo has symbols not numbers. Numbers are the shifted values.
-#define ___SYMBOL_BEPO_L___ /* BP_DLR */ BP_DQUO,  BP_LDAQ,   BP_RDAQ,   BP_LPRN,   BP_RPRN
-/*   KC_DEL,  BP_AT,   BP_PLUS,  BP_MINS, BP_SLSH,     BP_ASTR, BP_EQL, */
-#define ___SYMBOL_BEPO_R___    BP_AT,    BP_PLUS,  BP_MINS,   BP_SLSH,  BP_ASTR /* BP_EQL,  BP_PERC */
-
-// An arrangement for the left hand with a focus on the ()[]{}s.
-#define ___SYMBOLS_1_BP___ KC_EXLM,  BP_AT,    DB_LCBR,  DB_RCBR,  DB_PIPE
-#define ___SYMBOLS_2_BP___ DB_HASH,  BP_DLR,   DB_LPRN,  DB_RPRN,  DB_GRV
-#define ___SYMBOLS_3_BP___ BP_PERC,  DB_CIRC,  DB_LBRC,  DB_RBRC,  DB_TILD
-
-// A larger 6 column arrangement for the left hand, A merge of dvorak and the above.
-#define ___SYMBOLS6_1_BP___  DB_GRV,  DB_LESS, DB_GRTR, DB_LCBR,  DB_RCBR,  DB_HASH
-#define ___SYMBOLS6_2_BP___  KC_AMPR, BP_AT,   BP_ASTR, DB_LPRN,  DB_RPRN,  BP_PERC
-#define ___SYMBOLS6_3_BP___  BP_DLR,  BP_DQUO, DB_QUOT, DB_LBRC,  DB_RBRC,  KC_COLON
-#define ___SYMBOLS6_4_BP___  ___2___, DB_TILD, DB_DOT,  KC_EXLM, DB_SCOLON
-
-#define ___SYMBOLS5_4_BP___  ___, DB_TILD, DB_DOT,  KC_EXLM, DB_SCOLON
-
-// A symbol pad.  Basically the same layout as a number pad with the symbols
-// instead of the numbers with some extras around it, in familiar places for the
-// right hand.
-#define ___SYMPAD_1_BP___  DB_GRV,  BP_AMPR, BP_ASTR, DB_LCBR,  BP_PLUS,  DB_PIPE
-#define ___SYMPAD_2_BP___  DB_TILD, BP_DLR,  BP_PERC, DB_CIRC,  BP_ASTR,  DB_GRV
-#define ___SYMPAD_3_BP___  ___,     BP_EXLM, BP_AT,   DB_HASH,  BP_MINS,  BP_SLSH
-#define ___SYMPAD_4_BP___  ___,     DB_RCBR, DB_DOT,  BP_EQL,   BP_MINS, DB_BACKSLASH
-
-#define ___5_SYMPAD_4_BP___  DB_RCBR, DB_DOT,  BP_EQL,   BP_MINS, DB_BACKSLASH
-
-// Parts are parts.
-// MOUSE, ARROW and MEDIA KEY SETS
-#define ___MOUSE_LDUR___      KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R
-#define ___MWHEEL_LDUR___     KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R
-#define ___MOUSE_BTNS_R___    KC_BTN1,  KC_BTN2,  KC_BTN3,  KC_BTN4,  KC_BTN5
-#define ___MOUSE_BTNS_L___    KC_BTN5,  KC_BTN4,  KC_BTN3,  KC_BTN2,  KC_BTN1
-#define ___MOUSE_ACCL_012___  KC_ACL0,  KC_ACL1,  KC_ACL2
-#define ___MACCL___ ___MOUSE_ACCL_012___
-
-#define ___PRV_PLAY_NXT_STOP KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP
-#define ___VDN_MUTE_VUP___ KC_VOLD, KC_MUTE, KC_VOLU
-
-#define ___MUTE_PRV_PLAY_NXT_STOP___  KC_MUTE,  KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP
-#define ___MUTE_PLAY_STOP___  KC_MUTE,  KC_MPLY,  KC_MSTP
-#define ___VI_ARROWS___       KC_LEFT,  KC_DOWN,  KC_UP, KC_RIGHT
-
-// RGB FUNCTION Keysets
-// RGB row for the _FN layer from the redo of the default keymap.c
-#define ___RGB_HUE_SAT_INT_UP___ RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD
-#define ___RGB_HUE_SAT_INT_DN___ RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD
-#define ___RGB_MODE_PRV_NXT___ RGB_RMOD, RGB_MOD
-#define ___RGB_TOGGLE___ RGB_TOG
-#define ___RGB_P_B_R_SW_SN___ RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN
-#define ___RGB_KXGT___ RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T
-
-// Print screen, screen lock, pause
-#define ___PSCR_SLCK_PAUS___ KC_PSCR, KC_SLCK, KC_PAUS
-
-// LAYER Keyset rows. Changing the Default base layer or the transient layers.
-// Some are full length. The baselayers leave the ends open. hence a 13.
-// for an ORtho 15.
-#define ___2_LAYERS_B1___ DF(BEPO), DF(DVORAK_ON_BEPO)
-#define ___2_LAYERS_B2___ DF(COLEMAK), DF(DVORAK)
-#define ___3_LAYERS_B3___ DF(QWERTY), DF(NORMAN), DF(WORKMAN)
-#define ___3_LAYERS_B4___ ___X3___
-// transient layers.
-#define ___3_LAYERS_T_BP___ TO(MDIA), TO(SYMB_ON_BEPO), TO(KEYPAD_ON_BEPO)
-#define ___3_LAYERS_T___    TO(MDIA), TO(SYMB), TO(KEYPAD)
-#define ___3_LAYERS_T_CTL___ TO(_RGB), ___X2___
+// Altogether. Defines all the various top rows that
+// are present with all these layouts.
+// All together as blocks of 10
+#define ___NUMS___      ___NUMBER_L___,         ___NUMBER_R___
+#define ___SYMS___      ___SYMB_L___,           ___SYMB_R___
+#define ___BKLNUMS___   ___NUMBER_BEAKL15_L___, ___NUMBER_BEAKL15_R___
+#define ___NUMS_BP___    ___NUMBER_BEPO_L___,    ___NUMBER_BEPO_R___
+#define ___SYMS_BEPO___ ___SYMBOL_BEPO_L___,    ___SYMBOL_BEPO_L___
+#define ___BKLNUMS_BP___  ___NUMBER_BEAKL15_BP_L___, ___NUMBER_BEAKL15_BP_R___
+#define ___FUNCS_1_10___ ___FUNC_L___, ___FUNC_R___
diff --git a/users/ericgebhart/edge_keys.h b/users/ericgebhart/edge_keys.h
new file mode 100644
index 0000000000..f37425322c
--- /dev/null
+++ b/users/ericgebhart/edge_keys.h
@@ -0,0 +1,238 @@
+#pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "core_keysets.h"
+
+/******************************************************************/
+/* This is where I put my Keyboard layouts, Everything on the     */
+/* edges, the functions on keys like LT() and SFT_T()             */
+/* can be applied here. The physical shape of the keyboard is     */
+/* also accounted for here. This makes it very simple to add a    */
+/* new keyboard and reuse all of my layouts and layers            */
+/*                                                                */
+/* The particular pieces we define here (as needed) are:          */
+/*     * Edge pinky keys, */
+/*     * Middle section keys */
+/*     * Bottom/5th row */
+/*     * Thumbkeys */
+/*     * Any functional additions to wrap the keys. ie. LT()      */
+/*                                                                */
+/* With all of that in hand, we then create a LAYOUT wrapper      */
+/* macro that takes a list of keys, to create a keyboard matrix   */
+/* that fits the keyboard. Simple.                                */
+/*                                                                */
+/* The thumb keys, the bottom rows, etc.                          */
+/*                                                                */
+/* An attempt has been made to adapt the kinesis and ergodox      */
+/* Thumb keys to the rectangular shapes of the xd75 and viterbi.  */
+/* which are 15x and 14x matrices respectively.                   */
+/* The Corne was a perfect fit                                    */
+/******************************************************************/
+
+/******************************************************************/
+/* * The XD75 is a 5x15 Ortholinear matrix which means it has 3   */
+/*       keys inbetween the usual left and right hand keys        */
+/* * The Viterbi is a split 5x14 Ortholinear with 2 middle keys.  */
+/* * The Ergodox is a split 5x14 Ortholinear with 2 middle keys,  */
+/*       thumbkeys. It is missing middle keys on (home) row 3.    */
+/* * The Corne is a split 3x12 with 6 thumb keys. It has no       */
+/*       extra middle keys                                        */
+/*                                                                */
+/******************************************************************/
+
+
+/******************************************************************/
+/*   In all cases these keyboards are defined in a matrix which is */
+/*   a set of rows. Maybe like so, or not.                         */
+/*                                                                 */
+/*   -------------------------|------------------------ */
+/*   | Left0 | Numbers L | mid|dle0 | numbers R | Right0 | */
+/*   | Left1 | keys0-5   | mid|dle1 | Keys6-10  | Right1 | */
+/*   | Left2 | keys11-15 | mid|dle2 | Keys16-20 | Right2 | */
+/*   | Left3 | keys20-25 | mid|dle3 | Keys25-30 | Right3 | */
+/*   | Row5L                  |                    Row5R | */
+/*   |               ThumbsL  | ThumbsR                  | */
+/*   -------------------------|------------------------ */
+
+/* Generally speaking, the keys on the right and left don't change. */
+/* Neither does the bottom row or the thumbs. Frequently the numbers */
+/* row is identical across layers. Mostly, we want our Base layers to */
+/* be predctable.                                                     */
+
+// EDGES
+// outside pinky keys row 0-3.
+// Qwerty and Bepo, - Applies
+// to foreign layouts on bepo. dvorak_bp, beakl_bp.
+#define LEFT0 KC_GRV
+#define LEFT1 KC_GRV
+#define LEFT2 KC_TAB
+#define LEFT3 KC_BSLASH
+//#define LEFT3 KC_COLN
+
+#define LEFT0_BP DB_GRV
+#define LEFT1_BP DB_GRV
+#define LEFT2_BP KC_TAB
+#define LEFT3_BP DB_BACKSLASH
+//#define LEFT3_BP BP_COLN
+
+#define RIGHT0 KC_EQL
+#define RIGHT1 KC_SLASH
+#define RIGHT2 KC_MINS
+#define RIGHT3 KC_SCLN
+
+#define RIGHT0_BP BP_EQL
+#define RIGHT1_BP BP_SLSH
+#define RIGHT2_BP BP_MINS
+#define RIGHT3_BP BP_SCLN
+
+/******************************************************************/
+/* Middle Keysets for various keyboards                           */
+// MIDDLES
+/// Middle left and right keys.
+/******************************************************************/
+#define ___MIDDLE_LT___ OSL(_LAYERS)
+#define ___MIDDLE_L1___ KC_CCCV
+#define ___MIDDLE_L2___ TO(_SYMB)
+#define ___MIDDLE_L3___ TO(_NAV)
+
+#define ___MIDDLE_RT___ _X_
+#define ___MIDDLE_R1___ KC_CCCV
+#define ___MIDDLE_R2___ TO(_TOPROWS)
+#define ___MIDDLE_R3___ OSL(_KEYPAD)
+
+#define ___MIDDLE_L1_BP___ BP_CCCV
+#define ___MIDDLE_L2_BP___  TO(_SYMB_BP)
+
+#define ___MIDDLE_R1_BP___ BP_CCCV
+#define ___MIDDLE_R2_BP___ TO(_KEYPAD_BP)
+#define ___MIDDLE_R3_BP___ OSL(_KEYPAD_BP)
+
+// 3 keys in the middle of a 15x matrix
+#define ___3_MIDDLE_T___ ___MIDDLE_LT___,    LCTL(KC_A),        ___MIDDLE_RT___
+#define ___3_MIDDLE_1___ ___MIDDLE_L1___,    LCTL(KC_X),        ___MIDDLE_R1___
+#define ___3_MIDDLE_2___ ___MIDDLE_L2___,    TO(_RGB),          ___MIDDLE_R2___
+#define ___3_MIDDLE_3___ ___MIDDLE_L3___,    TO(_SYMB),   ___MIDDLE_R3___
+
+// The same, for BEPO
+#define ___3_MIDDLE_T_BP___ ___MIDDLE_LT___,     LCTL(BP_A),         ___MIDDLE_RT___
+#define ___3_MIDDLE_1_BP___ ___MIDDLE_L1_BP___,  LCTL(BP_X),         ___MIDDLE_R1_BP___
+#define ___3_MIDDLE_2_BP___ ___MIDDLE_L2_BP___,  TO(_RGB),           ___MIDDLE_R2_BP___
+#define ___3_MIDDLE_3_BP___ ___MIDDLE_L3___,     TO(_SYMB_BP), ___MIDDLE_R3_BP___
+
+// 2 keys in the middle of a 14x matrix  - For viterbi and ergodox.
+#define ___2_MIDDLE_T___ ___MIDDLE_LT___,    ___MIDDLE_RT___
+#define ___2_MIDDLE_1___ ___MIDDLE_L1___,    ___MIDDLE_R1___
+#define ___2_MIDDLE_2___ ___MIDDLE_L2___,    ___MIDDLE_R2___
+#define ___2_MIDDLE_3___ ___MIDDLE_L3___,    ___MIDDLE_R3___
+
+// The same, for BEPO
+#define ___2_MIDDLE_T_BP___ ___MIDDLE_LT___,     ___MIDDLE_RT___
+#define ___2_MIDDLE_1_BP___ ___MIDDLE_L1_BP___,  ___MIDDLE_R1_BP___
+#define ___2_MIDDLE_2_BP___ ___MIDDLE_L2_BP___,  ___MIDDLE_R2_BP___
+#define ___2_MIDDLE_3_BP___ ___MIDDLE_L3___,     ___MIDDLE_R3_BP___
+
+/********************************************************************/
+/* THUMBS  */
+/* Define the thumb clusters for all the keyboards.                 */
+/********************************************************************/
+
+// for xd75 or other layouts with a center column.
+// #define ___5_MIDDLE_THUMBS___ CTL_BSPC,    ALT_DEL,     XMONAD_ESC,  ALT_ENT,   CTL_SPC
+#define ___5_MIDDLE_THUMBS___ ALT_DEL, BSPC_TOPR, ESC_SYMB, ENT_NAV, SPC_TOPR
+#define ___5_MIDDLE_THUMBS_BP___ ALT_DEL, BSPC_TOPR_BP, ESC_SYMB_BP, ENT_NAV, SPC_TOPR_BP
+
+// for a last, 4th thumb row. for rebound.
+// backtab, home end, ----, pgup, pgdn, tab ?
+#define ___13_BOTTOM___                                           \
+  KC_BKTAB, HOME_END, KC_TAB, TT(_NAV), BSPC_SYMB, ESC_TOPR,      \
+    OSL(_LAYERS),                                               \
+    ENT_NAV, SPC_TOPR, KC_LEFT, KC_PGUP, KC_PGDN, KC_RIGHT
+
+#define ___13_BOTTOM_BP___                                \
+  KC_BKTAB, HOME_END, KC_TAB, TT(_NAV), BSPC_SYMB_BP, ESC_TOPR_BP, \
+    OSL(_LAYERS),                                                  \
+    ENT_NAV, SPC_TOPR_BP, KC_LEFT, KC_PGUP, KC_PGDN, KC_RIGHT
+
+// becomes the upper thumbs, the real 4th row if we throw away
+// the number row at the top.
+// this is the 4th row on the viterbi above the thumbrow if the number
+// row is not used for numbers.
+#define ___4_MIDDLE_4___    LSFT(KC_TAB),    HOME_END,    KC_PGDN, KC_TAB
+#define ___4_MIDDLE_4b___   TAB_BKTAB,       HOME_END,    KC_PGDN, KC_PGUP
+
+/********************************************************************/
+/**  The bottom row and thumbs as needed.                          **/
+/********************************************************************/
+// I do not use those pinky keys. I had useful things there but there
+// are better more useful ways than those pinkys.
+#define ___5_BOTTOM_LEFT___  ___X2___,  KC_INS,  KC_LEFT, KC_RIGHT
+#define ___5_BOTTOM_RIGHT___ KC_UP,  KC_DOWN,  KC_BSLASH, ___X2___
+
+#define ___4_BOTTOM_LEFT___  LCTL(KC_V),  KC_INS,  KC_LEFT,   KC_RIGHT
+#define ___4_BOTTOM_RIGHT___ KC_UP,       KC_DOWN, KC_BSLASH, LCTL(KC_C)
+
+// the bottom rows  for keyboards on bepo.
+// bepo on bepo - not enough space to go around....
+#define ___5_BOTTOM_LEFT_BP___  _X_,    BP_EACU,  _X_,           KC_LEFT, KC_RIGHT
+#define ___5_BOTTOM_RIGHT_BP___ KC_UP,  KC_DOWN,  DB_BACKSLASH,  BP_CCED,  BP_PERC
+
+#define ___4_BOTTOM_LEFT_BP___  LCTL(BP_C),  BP_EACU,  KC_LEFT, KC_RIGHT
+#define ___4_BOTTOM_RIGHT_BP___ KC_UP,  KC_DOWN, DB_BACKSLASH,  BP_CCED
+
+// for dvorak and beakl on bepo
+#define ___5_BOTTOM_LEFT_FR___  ___X3___,  KC_LEFT, KC_RIGHT
+#define ___5_BOTTOM_RIGHT_FR___ KC_UP,  KC_DOWN,  DB_BACKSLASH, ___X2___
+
+// basically a 5th row in a 5x matrix. but maybe a 4th if there isnt a number row.
+#define ___15_BOTTOM___     ___5_BOTTOM_LEFT___,    ___5_MIDDLE_THUMBS___, ___5_BOTTOM_RIGHT___
+#define ___15_BOTTOM_FR___  ___5_BOTTOM_LEFT_FR___, ___5_MIDDLE_THUMBS___, ___5_BOTTOM_RIGHT_FR___
+#define ___15_BOTTOM_BP___  ___5_BOTTOM_LEFT_BP___, ___5_MIDDLE_THUMBS___, ___5_BOTTOM_RIGHT_BP___
+
+#define ___14_BOTTOM___    ___5_BOTTOM_LEFT___,    ___4_MIDDLE_4b___, ___5_BOTTOM_RIGHT___
+#define ___14_BOTTOM_FR___ ___5_BOTTOM_LEFT_FR___, ___4_MIDDLE_4b___, ___5_BOTTOM_RIGHT_FR___
+#define ___14_BOTTOM_BP___ ___5_BOTTOM_LEFT_BP___, ___4_MIDDLE_4b___, ___5_BOTTOM_RIGHT_BP___
+#define ___14_THUMBS_BOTTOM___   ___X4___, ___6_MIDDLE_THUMBS___, ___X4___
+
+// bottom row of ergodox thumbs, bottom middle of all layouts.
+// start with the minimilist thumb row of 6, like the Corne, 2x3.
+
+#define ___THUMBS_1___    TT(_KEYPAD),    MO(_ADJUST), MO(_LAYERS), OSL(_TOPROWS)
+#define ___THUMBS_1_BP___ TT(_KEYPAD_BP), MO(_ADJUST), MO(_LAYERS), OSL(_TOPROWS_BP)
+#define ___THUMBS_2___                      HOME_END,      KC_PGUP
+#define ___THUMBS_3___                         ___6_ERGO_THUMBS___
+
+#define ___4_THUMBS_1_BP___      TT(_KEYPAD_BP), KC_HOME, KC_PGUP, OSL(_TOPROWS_BP)
+#define ___4_THUMBS_1___           TT(_KEYPAD), KC_HOME, KC_PGUP, OSL(_TOPROWS)
+#define ___6_THUMBS_2___  KC_LSFT,    KC_BKTAB, KC_END,  KC_PGDN, KC_TAB, KC_RSFT
+
+#define ___6_THUMBS_2b___    BSPC_SYMB, ESC_TOPR, KC_END,  KC_PGUP, ENT_NAV, SPC_TOPR
+#define ___6_ERGO_THUMBSb___ TT(_LAYERS), BSPC_SYMB, KC_XM_PORD, KC_PGDN, TT(_NAV), KC_XM_PORD
+#define ___6_THUMBS_2b_BP___ BSPC_SYMB_BP, ESC_TOPR_BP, KC_END,  KC_PGDN, ENT_TOPR_BP, SPC_NAV
+
+#define ___6_ERGO_THUMBS___ TT(_NAV), BSPC_SYMB, ESC_TOPR, ENT_NAV, SPC_TOPR, KC_XM_PORD
+#define ___6_ERGO_THUMBS_BP___ TT(_NAV), BSPC_SYMB_BP, ESC_TOPR, ENT_NAV, SPC_TOPR_BP, BP_XM_PORD
+
+#define ___6_MIDDLE_THUMBS___ ___6_ERGO_THUMBS___
+
+#define ___12_DOX_ALL_THUMBS___    ___THUMBS_1___,    ___THUMBS_2___, ___THUMBS_3___
+#define ___12_DOX_ALL_THUMBS_BP___ ___THUMBS_1_BP___, ___THUMBS_2___, ___THUMBS_3___
+
+#define ___16_ALL_THUMBSb___  ___4_THUMBS_1___,   ___6_THUMBS_2b___, ___6_ERGO_THUMBSb___
+#define ___16_ALL_THUMBS___   ___4_THUMBS_1___,    ___6_THUMBS_2___, ___6_ERGO_THUMBS___
+#define ___16_ALL_THUMBSb_BP___ ___4_THUMBS_1_BP___, ___6_THUMBS_2b_BP___, ___6_ERGO_THUMBS___
+#define ___16_ALL_THUMBS_BP___ ___4_THUMBS_1_BP___, ___6_THUMBS_2_BP___, ___6_ERGO_THUMBS_BP___
diff --git a/users/ericgebhart/ericgebhart.c b/users/ericgebhart/ericgebhart.c
old mode 100644
new mode 100755
index d34563865d..2a34110ae2
--- a/users/ericgebhart/ericgebhart.c
+++ b/users/ericgebhart/ericgebhart.c
@@ -27,12 +27,8 @@
 float tone_copy[][2]            = SONG(SCROLL_LOCK_ON_SOUND);
 float tone_paste[][2]           = SONG(SCROLL_LOCK_OFF_SOUND);
 
-static uint16_t copy_paste_timer;
 userspace_config_t userspace_config;
 
-void tap(uint16_t keycode){ register_code(keycode); unregister_code(keycode); };
-
-
 // Add reconfigurable functions here, for keymap customization
 // This allows for a global, userspace functions, and continued
 // customization of the keymap.  Use _keymap instead of _user
@@ -43,16 +39,6 @@ void matrix_init_keymap(void) {}
 __attribute__ ((weak))
 void matrix_scan_keymap(void) {}
 
-__attribute__ ((weak))
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-__attribute__ ((weak))
-bool process_record_secrets(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
 __attribute__ ((weak))
 uint32_t layer_state_set_keymap (uint32_t state) {
   return state;
@@ -60,579 +46,3 @@ uint32_t layer_state_set_keymap (uint32_t state) {
 
 __attribute__ ((weak))
 void led_set_keymap(uint8_t usb_led) {}
-
-// check default layerstate to see which layer we are on.
-// if (biton32(layer_state) == _DIABLO) {  --- current layer
-// if (biton32(default_layer_state) == _DIABLO) { --- current default layer
-// check for left shift on.
-// if (mods & MOD_BIT(KC_LSFT)) register_code(KC_LSFT);
-
-static void switch_default_layer(uint8_t layer) {
-  default_layer_set(1UL<<layer);
-  clear_keyboard();
-}
-
-// so the keyboard remembers which layer it's in after power disconnect.
-/*
-  uint32_t default_layer_state_set_kb(uint32_t state) {
-  eeconfig_update_default_layer(state);
-  return state;
-  }
-*/
-
-// These are the keys for dvorak on bepo.  column one is the keycode and mods for
-// the unshifted key, the second column is the keycode and mods for the shifted key.
-// GR is Good Range.  It subtracts SAFE_RANGE from the keycode so we can make a
-// reasnably sized array without difficulties. The macro is for the constant declarations
-// the function is for when we use it.
-const uint8_t key_translations[][2][2] = {
-  [GR(DB_1)] =      {{BP_DQUO, MOD_LSFT},      {BP_DCIR, MOD_LSFT}},
-  [GR(DB_2)] =      {{BP_LDAQ, MOD_LSFT},      {BP_AT, MOD_NONE}},
-  [GR(DB_3)] =      {{BP_RDAQ, MOD_LSFT},      {BP_DLR, MOD_LSFT}},
-  [GR(DB_4)] =      {{BP_LPRN, MOD_LSFT},      {BP_DLR, MOD_NONE}},
-  [GR(DB_5)] =      {{BP_RPRN, MOD_LSFT},      {BP_PERC, MOD_NONE}},
-  [GR(DB_6)] =      {{BP_AT, MOD_LSFT},        {BP_AT, MOD_BIT(KC_RALT)}},
-  [GR(DB_7)] =      {{BP_PLUS, MOD_LSFT},      {BP_P, MOD_BIT(KC_RALT)}},
-  [GR(DB_8)] =      {{BP_MINS, MOD_LSFT},      {BP_ASTR, MOD_NONE}},
-  [GR(DB_9)] =      {{BP_SLSH, MOD_LSFT},     {BP_LPRN, MOD_NONE}},
-  [GR(DB_0)] =      {{BP_ASTR, MOD_LSFT},      {BP_RPRN, MOD_NONE}},
-  [GR(DB_GRV)] =    {{BP_PERC, MOD_LSFT},      {BP_K, MOD_BIT(KC_RALT)}},
-  [GR(DB_SCOLON)] = {{BP_COMM, MOD_LSFT},      {BP_DOT, MOD_LSFT}},
-  [GR(DB_SLASH)] =  {{BP_SLSH, MOD_NONE},     {BP_QUOT, MOD_LSFT}},
-  [GR(DB_BACKSLASH)] = {{BP_AGRV, MOD_BIT(KC_RALT)}, {BP_B, MOD_BIT(KC_RALT)}},
-  [GR(DB_EQL)] =    {{BP_EQL, MOD_NONE},       {BP_PLUS, MOD_NONE}},
-  [GR(DB_COMM)] =   {{BP_COMM, MOD_NONE},     {BP_LDAQ, MOD_BIT(KC_RALT)}},
-  [GR(DB_DOT)] =    {{BP_DOT, MOD_NONE},       {BP_RDAQ, MOD_BIT(KC_RALT)}},
-  [GR(DB_QUOT)] =   {{BP_QUOT, MOD_NONE},      {BP_DQUO, MOD_NONE}},
-  [GR(DB_MINUS)] =  {{BP_MINS, MOD_NONE},     {KC_SPC, MOD_BIT(KC_RALT)}},
-  [GR(DB_LPRN)] =   {{BP_LPRN, MOD_NONE},      {BP_LPRN, MOD_BIT(KC_RALT)}},
-  [GR(DB_RPRN)] =   {{BP_RPRN, MOD_NONE},      {BP_RPRN, MOD_BIT(KC_RALT)}},
-  [GR(DB_LBRC)] =   {{BP_Y, MOD_BIT(KC_RALT)}, {BP_LPRN, MOD_BIT(KC_RALT)}},
-  [GR(DB_RBRC)] =   {{BP_X, MOD_BIT(KC_RALT)}, {BP_RPRN, MOD_BIT(KC_RALT)}},
-  // For the symbol layer
-  [GR(DB_HASH)] =   {{BP_DLR, MOD_LSFT}, {BP_DLR, MOD_LSFT}},
-  [GR(DB_LCBR)] =   {{BP_LPRN, MOD_BIT(KC_RALT)}, {BP_LPRN, MOD_BIT(KC_RALT)}},
-  [GR(DB_RCBR)] =   {{BP_LPRN, MOD_BIT(KC_RALT)}, {BP_RPRN, MOD_BIT(KC_RALT)}},
-  [GR(DB_PIPE)] =   {{BP_B, MOD_BIT(KC_RALT)}, {BP_B, MOD_BIT(KC_RALT)}},
-  [GR(DB_TILD)] =   {{BP_K, MOD_BIT(KC_RALT)}, {BP_K, MOD_BIT(KC_RALT)}},
-  [GR(DB_CIRC)] =   {{BP_AT, MOD_BIT(KC_RALT)}, {BP_AT, MOD_BIT(KC_RALT)}},
-  [GR(DB_LESS)] =   {{BP_LDAQ, MOD_BIT(KC_RALT)}, {BP_LDAQ, MOD_BIT(KC_RALT)}},
-  [GR(DB_GRTR)] =   {{BP_RDAQ, MOD_BIT(KC_RALT)}, {BP_RDAQ, MOD_BIT(KC_RALT)}},
-};
-
-
-uint8_t gr(uint8_t kc){
-  return (kc - SAFE_RANGE);
-}
-// send the right keycode for the right mod.
-// remove the mods we are taking care of,
-// send our keycodes then restore them.
-// all so we can make dvorak keys from bepo keycodes.
-void send_keycode(uint8_t kc){
-  uint8_t tmp_mods = get_mods();
-  bool is_shifted = ( tmp_mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)) );
-  //uint8_t key[2][2] = key_translations[GR(kc)];
-  // need to turn of the shift if it is on.
-  unregister_mods((MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)));
-  if(is_shifted){
-    register_mods(SHIFTED_MODS(kc));
-    register_code(SHIFTED_KEY(kc));
-    unregister_code(SHIFTED_KEY(kc));
-    unregister_mods(SHIFTED_MODS(kc));
-  } else{
-    register_mods(UNSHIFTED_MODS(kc));
-    register_code(UNSHIFTED_KEY(kc));
-    unregister_code(UNSHIFTED_KEY(kc));
-    unregister_mods(UNSHIFTED_MODS(kc));
-  }
-  clear_mods();
-  register_mods(tmp_mods);
-}
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-
-// If console is enabled, it will print the matrix position and status of each key pressed
-#ifdef KEYLOGGER_ENABLE
-xprintf("KL: row: %u, column: %u, pressed: %u\n", record->event.key.col, record->event.key.row, record->event.pressed);
-#endif //KEYLOGGER_ENABLE
-
-// still dont know how to make #&_  And RALT is not ALTGR, That isn't working in the bepo keyboard
-// either.   No {} either probably for the same reasons.  ALtGR is the key to some of these.
-    switch (keycode) {
-      // Handle the key translations for Dvorak on bepo. It's best if these are the first
-      // enums after SAFE_RANGE.
-    case DB_1:
-    case DB_2:
-    case DB_3:
-    case DB_4:
-    case DB_5:
-    case DB_6:
-    case DB_7:
-    case DB_8:
-    case DB_9:
-    case DB_0:
-    case DB_GRV:
-    case DB_SCOLON:
-    case DB_SLASH:
-    case DB_BACKSLASH:
-    case DB_EQL:
-    case DB_DOT:
-    case DB_COMM:
-    case DB_QUOT:
-    case DB_MINUS:
-    case DB_LPRN:
-    case DB_RPRN:
-    case DB_LBRC:
-    case DB_RBRC:
-      if(record->event.pressed)
-        send_keycode(keycode);
-      unregister_code(keycode);
-    break;
-
-    case KC_QWERTY:
-    if (record->event.pressed) {
-        set_single_persistent_default_layer(QWERTY);
-    }
-    return false;
-    break;
-    case KC_COLEMAK:
-    if (record->event.pressed) {
-    set_single_persistent_default_layer(COLEMAK);
-    }
-    return false;
-    break;
-    case KC_DVORAK:
-    if (record->event.pressed) {
-        set_single_persistent_default_layer(DVORAK);
-    }
-    return false;
-    break;
-    case KC_WORKMAN:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(WORKMAN);
-      }
-    return false;
-    break;
-
-    case KC_MAKE:  // Compiles the firmware, and adds the flash command based on keyboard bootloader
-      if (!record->event.pressed) {
-        SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP
-#if  (defined(BOOTLOADER_DFU) || defined(BOOTLOADER_LUFA_DFU) || defined(BOOTLOADER_QMK_DFU))
-                    ":dfu"
-#elif defined(BOOTLOADER_HALFKAY)
-                    ":teensy"
-#elif defined(BOOTLOADER_CATERINA)
-                    ":avrdude"
-#endif // bootloader options
-                    SS_TAP(X_ENTER));
-      }
-    return false;
-    break;
-
-
-    case KC_RESET: // Custom RESET code
-      if (!record->event.pressed) {
-        reset_keyboard();
-      }
-    return false;
-    break;
-
-
-    case EPRM: // Resets EEPROM
-      if (record->event.pressed) {
-        eeconfig_init();
-        default_layer_set(1UL<<eeconfig_read_default_layer());
-        layer_state_set(layer_state);
-      }
-      return false;
-      break;
-    case VRSN: // Prints firmware version
-      if (record->event.pressed) {
-        SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE);
-      }
-    return false;
-    break;
-
-    /*  Code has been depreciated
-        case KC_SECRET_1 ... KC_SECRET_5: // Secrets!  Externally defined strings, not stored in repo
-        if (!record->event.pressed) {
-        clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-        send_string(decoy_secret[keycode - KC_SECRET_1]);
-        }
-        return false;
-        break;
-    */
-
-    // These are a serious of gaming macros.
-    // Only enables for the viterbi, basically,
-    // to save on firmware space, since it's limited.
-#ifdef MACROS_ENABLED
-  case KC_OVERWATCH: // Toggle's if we hit "ENTER" or "BACKSPACE" to input macros
-    if (record->event.pressed) { userspace_config.is_overwatch ^= 1; eeprom_update_byte(EECONFIG_USER, userspace_config.raw); }
-    return false; break;
-#endif // MACROS_ENABLED
-
-    case KC_CCCV:                                    // One key copy/paste
-      if(record->event.pressed){
-        copy_paste_timer = timer_read();
-      } else {
-        if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {   // Hold, copy
-          register_code(KC_LCTL);
-          tap(KC_C);
-          unregister_code(KC_LCTL);
-#ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_copy);
-#endif
-        } else {                                // Tap, paste
-          register_code(KC_LCTL);
-          tap(KC_V);
-          unregister_code(KC_LCTL);
-#ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_paste);
-#endif
-        }
-      }
-      return false;
-      break;
-      case CLICKY_TOGGLE:
-#ifdef AUDIO_CLICKY
-        userspace_config.clicky_enable = clicky_enable;
-        eeprom_update_byte(EECONFIG_USER, userspace_config.raw);
-#endif
-        break;
-#ifdef UNICODE_ENABLE
-        case UC_FLIP: // (╯°□°)╯ ︵ ┻━┻
-          if (record->event.pressed) {
-            register_code(KC_RSFT);
-            tap(KC_9);
-            unregister_code(KC_RSFT);
-            process_unicode((0x256F | QK_UNICODE), record); // Arm
-            process_unicode((0x00B0 | QK_UNICODE), record); // Eye
-            process_unicode((0x25A1 | QK_UNICODE), record); // Mouth
-            process_unicode((0x00B0 | QK_UNICODE), record); // Eye
-            register_code(KC_RSFT);
-            tap(KC_0);
-            unregister_code(KC_RSFT);
-            process_unicode((0x256F | QK_UNICODE), record); // Arm
-            tap(KC_SPC);
-            process_unicode((0x0361 | QK_UNICODE), record); // Flippy
-            tap(KC_SPC);
-            process_unicode((0x253B | QK_UNICODE), record); // Table
-            process_unicode((0x2501 | QK_UNICODE), record); // Table
-            process_unicode((0x253B | QK_UNICODE), record); // Table
-          }
-          return false;
-          break;
-#endif // UNICODE_ENABLE
-
-}
-
-return true;
-  //  return process_record_keymap(keycode, record) && process_record_secrets(keycode, record);
-}
-
-void tap_dance_mouse_btns (qk_tap_dance_state_t *state, void *user_data) {
-  switch(state->count){
-  case 1:
-    register_code(KC_BTN1);
-    break;
-  case 2:
-    register_code(KC_BTN2);
-    break;
-  case 3:
-    register_code(KC_BTN3);
-    break;
-  case 4:
-    register_code(KC_BTN4);
-    break;
-  case 5:
-    register_code(KC_BTN5);
-    break;
-  default:
-    break;
-  }
-  reset_tap_dance(state);
-}
-
-// counting on all the qwerty layers to be less than dvorak_on_bepo
-int on_qwerty(){
-  uint8_t deflayer = (biton32(default_layer_state));
-  return (deflayer < DVORAK_ON_BEPO);
-}
-
-void tap_dance_df_bepo_layers_switch (qk_tap_dance_state_t *state, void *user_data) {
-      switch(state->count){
-      case 1:
-        switch_default_layer(DVORAK_ON_BEPO);
-        break;
-      case 2:
-        switch_default_layer(BEPO);
-        break;
-      case 3:
-        layer_invert(LAYERS);
-        break;
-      default:
-        break;
-      }
-      reset_tap_dance(state);
-}
-
-void tap_dance_layer_switch (qk_tap_dance_state_t *state, void *user_data) {
-  switch(state->count){
-  case 1:
-    if(on_qwerty())
-      layer_invert(SYMB);
-    else
-      layer_invert(SYMB_ON_BEPO);
-    break;
-  case 2:
-    layer_invert(MDIA);
-    break;
-  case 3:
-    layer_invert(LAYERS);
-    break;
-  case 4:
-    if(on_qwerty())
-      layer_invert(KEYPAD);
-    else
-      layer_invert(KEYPAD_ON_BEPO);
-    break;
-  default:
-    break;
-  }
-  reset_tap_dance(state);
-}
-
-void tap_dance_default_layer_switch (qk_tap_dance_state_t *state, void *user_data) {
-  switch(state->count){
-  case 1:
-    switch_default_layer(DVORAK);
-    break;
-  case 2:
-    switch_default_layer(DVORAK_ON_BEPO);
-    break;
-  case 3:
-    switch_default_layer(BEPO);
-    break;
-  default:
-    break;
-  }
-  reset_tap_dance(state);
-}
-
-// switch the default layer to another qwerty based layer.
-void switch_default_layer_on_qwerty(int count) {
-  switch(count){
-  case 1:
-    switch_default_layer(DVORAK);
-    break;
-  case 2:
-    switch_default_layer(QWERTY);
-    break;
-  case 3:
-    switch_default_layer(COLEMAK);
-    break;
-  case 4:
-    switch_default_layer(WORKMAN);
-    break;
-  case 5:
-    switch_default_layer(NORMAN);
-    break;
-  default:
-    switch_default_layer(DVORAK);
-    break;
-  }
-}
-
-// switch the default layer to another bepo based layer.
-void switch_default_layer_on_bepo(int count) {
-  switch(count){
-  case 1:
-    switch_default_layer(DVORAK_ON_BEPO);
-    break;
-  case 2:
-    switch_default_layer(BEPO);
-    break;
-  default:
-    switch_default_layer(DVORAK_ON_BEPO);
-    break;
-  }
-}
-
-
-// tap to change the default layer. Distinguishes between layers that are based on
-// a qwerty software keyboard and a bepo software keyboard.
-// if shifted, choose layers based on the other software keyboard, otherwise choose only
-// layers that work on the current software keyboard.
-void tap_dance_default_os_layer_switch (qk_tap_dance_state_t *state, void *user_data) {
-  //uint8_t shifted = (get_mods() & MOD_BIT(KC_LSFT|KC_RSFT));
-  bool shifted = ( keyboard_report->mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)) );
-  int qwerty = on_qwerty();
-
-
-  // shifted, choose between layers on the other software keyboard
-  if(shifted){
-    if (qwerty)
-      switch_default_layer_on_bepo(state->count);
-    else
-          switch_default_layer_on_qwerty(state->count);
-
-    // not shifted, choose between layers on the same software keyboard
-  } else {
-    if (qwerty)
-      switch_default_layer_on_qwerty(state->count);
-    else
-      switch_default_layer_on_bepo(state->count);
-  }
-
-  reset_tap_dance(state);
-}
-
-
-/* Return an integer that corresponds to what kind of tap dance should be executed.
- *
- * How to figure out tap dance state: interrupted and pressed.
- *
- * Interrupted: If the state of a dance dance is "interrupted", that means that another key has been hit
- *  under the tapping term. This is typically indicitive that you are trying to "tap" the key.
- *
- * Pressed: Whether or not the key is still being pressed. If this value is true, that means the tapping term
- *  has ended, but the key is still being pressed down. This generally means the key is being "held".
- *
- * One thing that is currenlty not possible with qmk software in regards to tap dance is to mimic the "permissive hold"
- *  feature. In general, advanced tap dances do not work well if they are used with commonly typed letters.
- *  For example "A". Tap dances are best used on non-letter keys that are not hit while typing letters.
- *
- * Good places to put an advanced tap dance:
- *  z,q,x,j,k,v,b, any function key, home/end, comma, semi-colon
- *
- * Criteria for "good placement" of a tap dance key:
- *  Not a key that is hit frequently in a sentence
- *  Not a key that is used frequently to double tap, for example 'tab' is often double tapped in a terminal, or
- *    in a web form. So 'tab' would be a poor choice for a tap dance.
- *  Letters used in common words as a double. For example 'p' in 'pepper'. If a tap dance function existed on the
- *    letter 'p', the word 'pepper' would be quite frustating to type.
- *
- * For the third point, there does exist the 'DOUBLE_SINGLE_TAP', however this is not fully tested
- *
- */
-int cur_dance (qk_tap_dance_state_t *state) {
-  if (state->count == 1) {
-    if (state->interrupted || !state->pressed)  return SINGLE_TAP;
-    //key has not been interrupted, but they key is still held. Means you want to send a 'HOLD'.
-    else return SINGLE_HOLD;
-  }
-  else if (state->count == 2) {
-    /*
-     * DOUBLE_SINGLE_TAP is to distinguish between typing "pepper", and actually wanting a double tap
-     * action when hitting 'pp'. Suggested use case for this return value is when you want to send two
-     * keystrokes of the key, and not the 'double tap' action/macro.
-     */
-    if (state->interrupted) return DOUBLE_SINGLE_TAP;
-    else if (state->pressed) return DOUBLE_HOLD;
-    else return DOUBLE_TAP;
-  }
-  //Assumes no one is trying to type the same letter three times (at least not quickly).
-  //If your tap dance key is 'KC_W', and you want to type "www." quickly - then you will need to add
-  //an exception here to return a 'TRIPLE_SINGLE_TAP', and define that enum just like 'DOUBLE_SINGLE_TAP'
-  if (state->count == 3) {
-    if (state->interrupted || !state->pressed)  return TRIPLE_TAP;
-    else return TRIPLE_HOLD;
-  }
-  else return 8; //magic number. At some point this method will expand to work for more presses
-}
-//instanalize an instance of 'tap' for the 'x' tap dance.
-static tdtap xtap_state = {
-  .is_press_action = true,
-  .state = 0
-};
-/*
-  This so I can have a single key that acts like LGUI in DVORAK no
-  matter which keymap is my current default.
-  It also allows for the
-  shift gui and ctl gui, on the same key,  So the same key is Escape,
-  and the mostcommon modifiers in my xmonad control keymap, while also
-  insuring that dvorak is active for the xmonad command key
-  Single tap = ESC
-  tap and hold = dvorak with L_GUI
-  double tap = One shot dvorak layer with LSFT LGUI mods
-  double hold = dvorak with LCTL LGUI
-  double single tap = esc.
-*/
-int get_xmonad_layer(){
-  int qwerty = on_qwerty();
-
-  if (qwerty)
-    return(XMONAD);
-  else
-    return(XMONAD_FR);
-}
-
-
-void x_finished (qk_tap_dance_state_t *state, void *user_data) {
-  int xmonad_layer = get_xmonad_layer();
-  xtap_state.state = cur_dance(state);
-  switch (xtap_state.state) {
-  case SINGLE_TAP:
-    register_code(KC_ESC);
-    break;
-  case SINGLE_HOLD:
-    layer_on(xmonad_layer);
-    set_oneshot_mods (MOD_LGUI);
-    //set_oneshot_layer (DVORAK, ONESHOT_START);
-    break;
-  case DOUBLE_TAP:
-    set_oneshot_mods ((MOD_LCTL | MOD_LGUI));
-    layer_on (xmonad_layer);
-    set_oneshot_layer (xmonad_layer, ONESHOT_START);
-    break;
-  case DOUBLE_HOLD:
-    set_oneshot_mods (MOD_LSFT | MOD_LGUI);
-    if (xmonad_layer != -1)
-      layer_on(xmonad_layer);
-    break;
-  case DOUBLE_SINGLE_TAP:
-    register_code(KC_ESC);
-    unregister_code(KC_ESC);
-    register_code(KC_ESC);
-    //Last case is for fast typing. Assuming your key is `f`:
-    //For example, when typing the word `buffer`, and you want to make sure that you send `ff` and not `Esc`.
-    //In order to type `ff` when typing fast, the next character will have to be hit within the `TAPPING_TERM`, which by default is 200ms.
-  }
-}
-
-void x_reset (qk_tap_dance_state_t *state, void *user_data) {
-  int xmonad_layer = get_xmonad_layer();
-  switch (xtap_state.state) {
-  case SINGLE_TAP:
-    unregister_code(KC_ESC);
-    break;
-  case SINGLE_HOLD:
-    layer_off(xmonad_layer);
-    break;
-  case DOUBLE_TAP:
-    set_oneshot_layer (xmonad_layer, ONESHOT_PRESSED);
-    break;
-  case DOUBLE_HOLD:
-    layer_off(xmonad_layer);
-    break;
-  case DOUBLE_SINGLE_TAP:
-    unregister_code(KC_ESC);
-  }
-  xtap_state.state = 0;
-}
-
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-  //Tap once for Esc, twice for Caps Lock
-  [TD_ESC_CAPS]  = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS),
-  [TD_TAB_BKTAB] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, LSFT(KC_TAB)),
-  [TD_MDIA_SYMB] = ACTION_TAP_DANCE_FN(tap_dance_layer_switch),
-  [TD_DVORAK_BEPO] = ACTION_TAP_DANCE_FN(tap_dance_df_bepo_layers_switch),
-  [TD_DEF_LAYER_SW] = ACTION_TAP_DANCE_FN(tap_dance_default_layer_switch),
-  [TD_DEF_OS_LAYER_SW] = ACTION_TAP_DANCE_FN(tap_dance_default_os_layer_switch),
-  [TD_HOME_END]  = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END),
-  [TD_XMONAD_ESC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, x_finished, x_reset),
-  [TD_MOUSE_BTNS] = ACTION_TAP_DANCE_FN(tap_dance_mouse_btns)
-};
diff --git a/users/ericgebhart/ericgebhart.h b/users/ericgebhart/ericgebhart.h
old mode 100644
new mode 100755
index ad66a636ea..92f8f22d29
--- a/users/ericgebhart/ericgebhart.h
+++ b/users/ericgebhart/ericgebhart.h
@@ -1,32 +1,72 @@
 #pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #ifndef ericgebhart
 #define ericgebhart
 
 #include QMK_KEYBOARD_H
-#include "base_layers.h"
+#include "core_keysets.h"
+#include "layouts.h"
+#include "layers.h"
+#if defined(OLED_ENABLE)
+#    include "oled_stuff.h"
+#endif
 
 
 //#define ONESHOT_TAP_TOGGLE 2  /* Tapping this number of times holds the key until tapped once again. */
+/* Define layer names */
+enum userspace_layers {
+    _DVORAK = 0,
+    _QWERTY,
+    _COLEMAK,
+    _BEAKL,
+    //_WORKMAN,
+    //_NORMAN,
+    //_MALTRON,
+    //_EUCALYN,
+    //_CARPLAX,
+    _DVORAK_BP, // beginning of Bepo
+    _BEAKL_BP,
+    _BEPO,
+    _LAYERS,
+    _NAV,   // transient layers
+    _SYMB,
+    _SYMB_BP,
+    _KEYPAD,
+    _KEYPAD_BP,
+    _TOPROWS,
+    _TOPROWS_BP,
+    _RGB,
+    _ADJUST,
+};
 
-#define DVORAK 0 // dvorak layout (default)
-#define QWERTY 1
-#define COLEMAK 2
-#define WORKMAN 3
-#define NORMAN 4
-// bepo layers
-#define DVORAK_ON_BEPO 6 // dvorak layout (default)
-#define BEPO 7 // Bepo
-// non-default layers
-#define SYMB 8 // symbols and numbers
-#define SYMB_ON_BEPO 9 // symbols and numbers
-#define MDIA 10 // mouse knd media eys
-#define LAYERS 11 // layers and right mousekeys.
-#define XMONAD 12 // xmonad ie. dvorak.
-#define XMONAD_FR 13 // xmonad ie. dvorak.
-#define KEYPAD 14 // number and Fkey pads
-#define KEYPAD_ON_BEPO 15 // number and Fkey pads.
-#define _RGB 16 // RGB stuff.
-
+// clang-format off
+typedef union {
+  uint32_t raw;
+  struct {
+    bool    rgb_layer_change     :1;
+    bool    is_overwatch         :1;
+    bool    nuke_switch          :1;
+    bool    swapped_numbers      :1;
+    bool    rgb_matrix_idle_anim :1;
+  };
+} userspace_config_t;
+// clang-format on
+extern userspace_config_t userspace_config;
 
 #endif
diff --git a/users/ericgebhart/layers.h b/users/ericgebhart/layers.h
new file mode 100755
index 0000000000..5faaf01736
--- /dev/null
+++ b/users/ericgebhart/layers.h
@@ -0,0 +1,677 @@
+#pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "core_keys.h"
+/*********************************************************************/
+/* Non-Base Layer Definitions.                                       */
+/*                                                                   */
+/* Keypads, sympads, funcpads, symbols, RGB, Layers, Controls, etc.  */
+/* Qwerty and Bepo versions exist as needed.                         */
+/*                                                                   */
+/* This file defines every auxillary layer I use on every keyboard   */
+/* Ergodox, keebio/viterbi, xd75, rebound, crkbd, morpho, dactyl,..  */
+/*********************************************************************/
+/********************************************************************************/
+/* The following Transient/Non-Base Layers are provided within.                 */
+/* Each layer is named with the size of Keymatrix it has entries for.           */
+/* 3x12 or 4x12 are usual for these. Splitting is managed in the macros as      */
+/* needed. BP indicates the Bepo equivalent to the Qwerty layer when needed.    */
+/********************************************************************************/
+/*                                                                              */
+/* Explore below to see what they all are.                                      */
+/* Naming gives the sizes of things, a prefix number is the length.             */
+/* BP is the bepo version of things.                                            */
+/* BKL is the beakl 15 version of a layout or chunk.                            */
+/* C on the end of a name means its a compact version of something.             */
+/* Compact meaning for use on a 3 row layout.                                   */
+/*                                                                              */
+/* TOPROWS - numbers, symbols, functions, all on one layer.                     */
+/* ___TOPROWS_3x12___                                                           */
+/* ___TOPROWS_BP_3x12___                                                        */
+/*    // just numbers on the home row                                           */
+/* ___NUM_HOME_BEAKL_3x12___                                                    */
+/* ___NUM_HOME_BEAKL_BP_3x12___                                                 */
+/* ___NUM_HOME_3x12___                                                          */
+/* ___NUM_HOME_BP_3x12___                                                       */
+/*                                                                              */
+/* KEYPADS/FUNCPADS.                                                            */
+/* ___KEY_BKL_FUNC_4x12___   -- The BEAKL15 Keypad with a Funcpad on the right  */
+/* ___KEY_BKL_FUNC_BP_4x12___                                                   */
+/* ___FUNC_KEYPAD_4x12___    -- A Funcpad and a keypad                          */
+/* ___FUNC_KEYPAD_BP_4x12___ -- For Bepo                                        */
+/*                                                                              */
+/* // Compact Funcpad and keypad, 3x12                                          */
+/* ___KP_C_3x12___                                                              */
+/* ___KP_C_BP_3x12___                                                           */
+/* ___KP_C_BKL_FUNC_3x12___  -- BEAKL key/func pads.                            */
+/* ___KP_C_BKL_FUNC_BP_3x12___                                                  */
+/*                                                                              */
+/* SYMBOLS   -Beakl or Beakl extended                                           */
+/* ___SYMB_BEAKL_3x12___                                                        */
+/* ___SYMB_BEAKL_BP_3x12___                                                     */
+/*                                                                              */
+/* Beakl extended symbol layer with additional corner symbols.                  */
+/* For use with non-beakl base layers.                                          */
+/* ___SYMB_BEAKLA_3x12___                                                       */
+/* ___SYMB_BEAKLA_BP_3x12___                                                    */
+/* For use with vi bindings optimized                                           */
+/* ___SYMB_BEAKLB_3x12___                                                       */
+/* ___SYMB_BEAKLB_BP_3x12___                                                    */
+/*                                                                              */
+/* NAVIGATION                                                                   */
+/* ___NAV_3x12___                                                               */
+/* ___NAV_4x12___                                                               */
+/*                                                                              */
+/* CONTROLS                                                                     */
+/* ___RGB_3x12___                                                               */
+/* ___ADJUST_3x12___                                                            */
+/* ___LAYERS_3x12___                                                            */
+/********************************************************************************/
+/*********************************************************************/
+/* XXXXXX Layer chunk  -- These are the final layers.                */
+/*                                                                   */
+/* Each section defines the necessary pieces to create a layer.      */
+/* It builds them up into consistently shaped lists for the layout   */
+/* wrapper.                                                          */
+/*                                                                   */
+/* Each Section ends with a _Layer Chunk_. This is so the            */
+/* layer can be easily given to the Layout Wrapper macros which      */
+/* takes a list of keys in lengths of 2x3x5, 2x3x6, 2x4x5, or 2x4x6. */
+/*                                                                   */
+/* All of my keyboard definitions use these same chunks with similar */
+/* macros. The differences between keyboards are all managed in the  */
+/* macro. Here we just have nice rectangular sets of keys to         */
+/* complete a layout.                                                */
+/*********************************************************************/
+
+
+/*******************************************************************/
+/* A Top Rows layer.  Pick your parts.  Bepo and Qwerty            */
+/*                                                                 */
+/* This is, to me, a stop gap layer. If I need symbols, numbers or */
+/* function keys these rows are nicely predictable to most people. */
+/* I currently use the beakl number row with regular symbols.      */
+/* I never use function keys for anything.                         */
+/*******************************************************************/
+#define ___12_SYMB___        ___, ___SYMS___, ___
+#define ___12_SYMB_BP___       ___12_SYMS_BEPO___,
+
+#define ___12_NUM___         ___, ___NUMS___, ___
+#define ___12_NUM_BP___        ___, ___NUMS_BP___, ___
+#define ___12_NUM_BEAKL___   ___, ___BKLNUMS___, ___
+#define ___12_NUM_BEAKL_BP___ ___, ___BKLNUMS_BP___, ___
+
+#define ___12_FUNC___        ___FUNC_1_6___, ___FUNC_7_12___
+#define ___12_SYMS_BEPO___   ___6SYMBOL_BEPO_L___, ___6SYMBOL_BEPO_R___
+#define ___12_SYMS_FR___     ___SYMB_L_FR___, ___SYMB_R_FR___
+
+// Kinesis function key row. I don't use them. but might as well define them.
+#define ___KINTFUNC_L___ KC_ESC, ___FUNC_1_6___, KC_F7, KC_F8
+// #define ___KINTFUNC_RIGHT___ KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_FN0, RESET
+#define ___KINTFUNC_R___ KC_F9, KC_F10, KC_F11, KC_F12, XXX, XXX, XXX, XXX, RESET
+
+// A TOPROWS Layer.
+// set it how you like it, if you like it.
+#define ___TOPROW_1___    ___12_SYMB___
+#define ___TOPROW_2___    ___12_NUM_BEAKL___
+#define ___TOPROW_3___    ___12_FUNC___
+
+#define ___TOPROW_1_BP___ ___12_SYMS_BEPO___
+#define ___TOPROW_2_BP___ ___12_NUM_BEAKL_BP___
+#define ___TOPROW_3_BP___ ___12_FUNC___
+
+/********************************************************************************/
+/* TOPROWS Layer chunk                                                          */
+/********************************************************************************/
+// altogether in a chunk.
+#define ___TOPROWS_3x12___     ___TOPROW_1___,    ___TOPROW_2___,    ___TOPROW_3___
+#define ___TOPROWS_BP_3x12___ ___TOPROW_1_BP___, ___TOPROW_2_BP___, ___TOPROW_3_BP___
+
+// Some layers with just a home row of numbers.
+// The beakl ones, r the usual ones.
+#define ___NUM_HOME_BEAKL_3x12___    ___12___, ___12_NUM_BEAKL___,    ___12___
+#define ___NUM_HOME_BEAKL_BP_3x12___ ___12___, ___12_NUM_BEAKL_BP___, ___12___
+#define ___NUM_HOME_3x12___          ___12___, ___12_NUM___,          ___12___
+#define ___NUM_HOME_BP_3x12___       ___12___, ___12_NUM_BP___,       ___12___
+
+
+/********************************************************************************/
+/*  KEYPADS.  Mostly all in Bepo and Qwerty versions                            */
+/*      4 row Pads:                                                             */
+/*         * The BEAKL 15 Number pad, for the left hand.                        */
+/*         * Regular Number pad, for the right hand.                            */
+/*         * 12 Function pad.                                                   */
+/*      3 row pads:                                                             */
+/*         keypad                                                               */
+/*         function pad                                                         */
+/*                                                                              */
+/*  LAYERS:                                                                     */
+/*      4 Row:                                                                  */
+/*         * BEAKL with a compact FuncPad on the right.                         */
+/*         * Funcpad on the left, keypad on the right.                          */
+/*      3 Row:                                                                  */
+/*         * Funcpad on the left, keypad on the right.                          */
+/*         * BEAKL with a compact FuncPad on the right.                         */
+/*                                                                              */
+/********************************************************************************/
+
+// BEAKL 15 (numpad layer):
+/*    +=*   ^%~ */
+/*   ↹523:      */
+/* - 7.104      */
+/*   /698,      */
+
+// Keypads
+#define ___6KEYPAD_BEAKL_L1___     ___, _X_,        KC_PLUS,  KC_PEQL,  KC_ASTR, _X_
+#define ___6KEYPAD_BEAKL_L2___     ___, TAB_BKTAB,  KC_5,     KC_2,     KC_3,   KC_COLON
+#define ___6KEYPAD_BEAKL_L3___ KC_MINS, KC_7,       KC_DOT,   KC_1,     KC_0,   KC_4
+#define ___6KEYPAD_BEAKL_L4___     ___, KC_SLASH,   KC_6,     KC_9,     KC_8,   KC_COMM
+
+#define ___5KEYPAD_BEAKL_R1___     ___, KC_CIRC,  KC_PERC,  KC_TILD, ___
+
+#define ___6KEYPAD_BEAKL_L1_BP___     ___, _X_,        BP_PLUS,  BP_EQL,  BP_ASTR, _X_
+#define ___6KEYPAD_BEAKL_L2_BP___     ___, TAB_BKTAB,  BP_5,     BP_2,     BP_3,   BP_COLN
+#define ___6KEYPAD_BEAKL_L3_BP___ BP_MINS, BP_7,       BP_DOT,   BP_1,     BP_0,   BP_4
+#define ___6KEYPAD_BEAKL_L4_BP___     ___, BP_SLSH,   BP_6,     BP_9,     BP_8,   BP_COMM
+
+#define ___5KEYPAD_BEAKL_R1_BP___     ___, BP_CIRC,  BP_PERC,  BP_TILD, ___
+
+#define ___5KEYPAD_1___ _X_, KC_7,  KC_8,    KC_9,     KC_PSLS
+#define ___5KEYPAD_2___ _X_, KC_4,  KC_5,    KC_6,     KC_PAST
+#define ___5KEYPAD_3___ _X_, KC_1,  KC_2,    KC_3,     KC_PMNS
+#define ___5KEYPAD_4___ _X_, KC_0,  KC_DOT,  KC_PEQL,  KC_PPLS
+// For Bepo
+#define ___5KEYPAD_1_BP___ _X_, DB_7,  DB_8,    DB_9,     BP_SLSH
+#define ___5KEYPAD_2_BP___ _X_, DB_4,  DB_5,    DB_6,     BP_ASTR
+#define ___5KEYPAD_3_BP___ _X_, DB_1,  DB_2,    DB_3,     DB_MINUS
+#define ___5KEYPAD_4_BP___ _X_, DB_0,  DB_DOT,  DB_EQL,   BP_PLUS
+
+// Keypad from the default keymap.c of the xd75
+#define ___4KEYPAD_1_ALT___ _X_, KC_P7, KC_P8,  KC_P9,   KC_MINS
+#define ___4KEYPAD_2_ALT___ _X_, KC_P4, KC_P5,  KC_P6,   KC_PLUS
+#define ___4KEYPAD_3_ALT___ _X_, KC_P1, KC_P2,  KC_P3,   KC_PENT
+#define ___4KEYPAD_4_ALT___ _X_, KC_P0, KC_DOT, KC_PENT, KC_PENT
+
+// Function pad.  Same idea as above, but for function keys.
+// For the left side.
+#define ___5FUNCPAD_T___   _X_, KC_F10,  KC_F11,  KC_F12, _X_
+#define ___5FUNCPAD_1___   _X_, KC_F7,   KC_F8,   KC_F9, _X_
+#define ___5FUNCPAD_2___   _X_, KC_F4,   KC_F5,   KC_F6, _X_
+#define ___5FUNCPAD_3___   _X_, KC_F1,   KC_F2,   KC_F3, _X_
+
+
+// Put them together for complete left and right layers.
+// Beakl keypad with a funcpad
+#define ___12_KEYPAD_BKL_FUNCPAD_1___ ___6KEYPAD_BEAKL_L1___, _X_, ___5KEYPAD_BEAKL_R1___
+#define ___12_KEYPAD_BKL_FUNCPAD_2___ ___6KEYPAD_BEAKL_L2___, _X_, ___5_FUNCPADC_1___
+#define ___12_KEYPAD_BKL_FUNCPAD_3___ ___6KEYPAD_BEAKL_L3___, _X_, ___5_FUNCPADC_2___
+#define ___12_KEYPAD_BKL_FUNCPAD_4___ ___6KEYPAD_BEAKL_L4___, _X_, ___5_FUNCPADC_3___
+
+#define ___12_KEYPAD_BKL_FUNCPAD_1_BP___ ___6KEYPAD_BEAKL_L1_BP___, _X_, ___5KEYPAD_BEAKL_R1_BP___
+#define ___12_KEYPAD_BKL_FUNCPAD_2_BP___ ___6KEYPAD_BEAKL_L2_BP___, _X_, ___5_FUNCPADC_1___
+#define ___12_KEYPAD_BKL_FUNCPAD_3_BP___ ___6KEYPAD_BEAKL_L3_BP___, _X_, ___5_FUNCPADC_2___
+#define ___12_KEYPAD_BKL_FUNCPAD_4_BP___ ___6KEYPAD_BEAKL_L4_BP___, _X_, ___5_FUNCPADC_3___
+
+// Funcpad and keypad layer for Qwerty based layers.
+#define ___12_FUNCPAD_KEYPAD_1___ ___,  ___5FUNCPAD_T___,  ___5KEYPAD_1___,  ___
+#define ___12_FUNCPAD_KEYPAD_2___ ___,  ___5FUNCPAD_1___,  ___5KEYPAD_2___,  ___
+#define ___12_FUNCPAD_KEYPAD_3___ ___,  ___5FUNCPAD_2___,  ___5KEYPAD_3___,  KC_PENT
+#define ___12_FUNCPAD_KEYPAD_4___ ___,  ___5FUNCPAD_3___,  ___5KEYPAD_4___,  ___
+
+// Funcpad and keypad layer for BEPO
+#define ___12_FUNCPAD_KEYPAD_BP_1___    ___,  ___5FUNCPAD_T_BP___,  ___5KEYPAD_1_BP___,  ___
+#define ___12_FUNCPAD_KEYPAD_BP_2___    ___,  ___5FUNCPAD_1_BP___,  ___5KEYPAD_2_BP___,  ___
+#define ___12_FUNCPAD_KEYPAD_BP_3___    ___,  ___5FUNCPAD_2_BP___,  ___5KEYPAD_3_BP___,  KC_PENT
+#define ___12_FUNCPAD_KEYPAD_BP_4___    ___,  ___5FUNCPAD_3_BP___,  ___5KEYPAD_4_BP___,  ___
+
+/********************************************************************************/
+/* COMPACT - KEYPAD and FUNCPAD.  3 Rows.                                       */
+/********************************************************************************/
+// Compact versions of each. 3 rows.
+//Compact keypad, 3 rows.
+#define ___6KEYPADC_1___ ___,    KC_7,  KC_8,    KC_9,     KC_PSLS, ___
+#define ___6KEYPADC_2___ KC_DOT, KC_4,  KC_5,    KC_6,     KC_PAST, KC_PEQL
+#define ___6KEYPADC_3___ KC_0,   KC_1,  KC_2,    KC_3,     KC_PMNS, KC_PPLS
+// For Bepo
+#define ___6KEYPADC_1_BP___ ___,    DB_7,  DB_8,    DB_9,  BP_SLSH
+#define ___6KEYPADC_2_BP___ DB_DOT, DB_4,  DB_5,    DB_6,  BP_ASTR,  DB_EQL
+#define ___6KEYPADC_3_BP___ DB_0,   DB_1,  DB_2,    DB_3,  DB_MINUS, DB_PLUS
+
+// compact 1-12 funcpad for 3 row keyboards.
+#define ___5_FUNCPADC_1___   KC_F9, KC_F10, KC_F11, KC_F12, ___
+#define ___5_FUNCPADC_2___   KC_F5, KC_F6,  KC_F7,  KC_F8,  ___
+#define ___5_FUNCPADC_3___   KC_F1, KC_F2,  KC_F3,  KC_F4,  ___
+
+// Compact funcpads/keypad Layer
+#define ___12_KP_1C___ ___,  ___5_FUNCPADC_1___,   ___5KEYPAD_1___, ___
+#define ___12_KP_2C___ ___,  ___5_FUNCPADC_2___,   ___5KEYPAD_2___, ___
+#define ___12_KP_3C___ ___,  ___5_FUNCPADC_3___,   ___5KEYPAD_3___, ___
+// Reversed
+#define ___12_KP_FP_1C___ ___,  ___5KEYPAD_1___,   ___5_FUNCPADC_1___, ___
+#define ___12_KP_FP_2C___ ___,  ___5KEYPAD_2___,   ___5_FUNCPADC_2___, ___
+#define ___12_KP_FP_3C___ ___,  ___5KEYPAD_3___,   ___5_FUNCPADC_3___, ___
+
+//Bepo funcpad and keypad Layer
+#define ___12_KP_1_BP___ ___,  ___5_FUNCPADC_1___, ___5KEYPAD_1_BP___, ___
+#define ___12_KP_2_BP___ ___,  ___5_FUNCPADC_2___, ___5KEYPAD_2_BP___, ___
+#define ___12_KP_3_BP___ ___,  ___5_FUNCPADC_3___, ___5KEYPAD_3_BP___, ___
+
+/********************************************************************************/
+/* FUNCPAD and Keypad Layer chunks                                              */
+/********************************************************************************/
+// Full size, 4x12
+#define ___KEYPAD_BKL_FUNC_4x12___ \
+  ___12_KEYPAD_BKL_FUNCPAD_1___,                                        \
+    ___12_KEYPAD_BKL_FUNCPAD_2___,                                      \
+    ___12_KEYPAD_BKL_FUNCPAD_3___, \
+    ___12_KEYPAD_BKL_FUNCPAD_4___
+#define ___KEYPAD_BKL_FUNC_BP_4x12___                                   \
+   ___12_KEYPAD_BKL_FUNCPAD_1_BP___,                                    \
+     ___12_KEYPAD_BKL_FUNCPAD_2_BP___,                                  \
+     ___12_KEYPAD_BKL_FUNCPAD_3_BP___,                                  \
+     ___12_KEYPAD_BKL_FUNCPAD_4_BP___
+#define ___FUNC_KEYPAD_4x12___ \
+  ___12_FUNCPAD_KEYPAD_1___,                                    \
+    ___12_FUNCPAD_KEYPAD_2___,                                  \
+    ___12_FUNCPAD_KEYPAD_3___,                                \
+    ___12_FUNCPAD_KEYPAD_4___
+#define ___FUNC_KEYPAD_BP_4x12___ \
+    ___12_FUNCPAD_KEYPAD_BP_1___,                                       \
+      ___12_FUNCPAD_KEYPAD_BP_2___,                                     \
+      ___12_FUNCPAD_KEYPAD_BP_3___,                                     \
+      ___12_FUNCPAD_KEYPAD_BP_4___
+
+// Compact, 3x12
+#define ___KP_C_BKL_FUNC_3x12___                \
+  ___12_KEYPAD_BKL_FUNCPAD_2___,                \
+    ___12_KEYPAD_BKL_FUNCPAD_3___,              \
+    ___12_KEYPAD_BKL_FUNCPAD_4___
+#define ___KP_C_BKL_FUNC_BP_3x12___             \
+  ___12_KEYPAD_BKL_FUNCPAD_2_BP___,             \
+    ___12_KEYPAD_BKL_FUNCPAD_3_BP___,           \
+    ___12_KEYPAD_BKL_FUNCPAD_4_BP___
+
+#define ___KP_C_3x12___    ___12_KP_1C___,   ___12_KP_2C___,   ___12_KP_3C___
+#define ___KP_FP_C_3x12___  ___12_KP_FP_1C___,   ___12_KP_FP_2C___,   ___12_KP_FP_3C___
+#define ___KP_C_BP_3x12___ ___12_KP_1_BP___, ___12_KP_2_BP___, ___12_KP_3_BP___
+
+
+
+/********************************************************************************/
+/* SYMBOLS.  The BEAKL15 Symbol layer with or without additions.  */
+/*                                                                */
+/* Symbol layers:                                                 */
+/*                                                                */
+/*     BEAKL symbol layer                                         */
+/*         <$>   [_]                                              */
+/*      - \(")# %{=}| ;                                           */
+/*         :*+   &^~                                              */
+/*                                                                */
+/*     BEAKL Extended symbol layer                                */
+/*        `<$>' ?[_]                                              */
+/*      - \(")# %{=}| ;                                           */
+/*        @:*+; !&^~/                                             */
+/*                                                                */
+/* This layer has replaced my former Symbol pad and Symbols       */
+/* layer. The Sympad was nice, But this incorporates the matching */
+/* (){}[] that I had and at the same time provides an easily      */
+/* Learnable layer that makes sense. It was also easy to          */
+/* Supplement with new keys that other layouts might need.        */
+/*                                                                */
+/* The first Layer defined is the "Official" version.             */
+/* The second Layer defined only adds to the original by          */
+/* Placing 8 keys in the pinky and index corners                  */
+/* at the edges of the, 3x3, BEAKL home Region.                   */
+/*                                                                */
+/* Namely these: !?@`'/-;                                         */
+/*                                                                */
+/* Beakl has these keys in it's base layer which isn't the case   */
+/* for other layouts like dvorak, colemak, etc.                   */
+/*                                                                */
+/******************************************************************/
+
+/******************************************************************/
+/* Official BEAKL15 Symbol layer. */
+/* BEAKL 15 (punctuation layer): */
+/*                 */
+/*    <$>   [_]    */
+/* - \(")# %{=}| ; */
+/*    :*+   &^~    */
+/******************************************************************/
+/********************************************************************************/
+/* The expanded Beakl Symbol Layer                                              */
+/*                                                                              */
+/* Expanded with: !?@`'/-;                                                      */
+/*                                                                              */
+/* This insures access to all common symbols, regardless of availabilily on     */
+/* other layers. All the extra characters are added to the pinky and index      */
+/* corners which are empty in the BEAKL symbol layer.                           */
+/*                                                                              */
+/* Both ; and ' could find their dvorak positions.                              */
+/* Analysis showed that only caused pinky overuse. Rotating the symbols around  */
+/* Put better keys on the index finger which showed a huge improvement          */
+/* in efficiency.  The same is true of the exclamation point.                   */
+/*                                                                              */
+/* A:                                                                           */
+/*   `<$>' ?[_]                                              */
+/* - \(")# %{=}| ;                                           */
+/*   @:*+; !&^~/                                             */
+/*                                                                              */
+/* B:                                                                           */
+/*  With vi bindings /:? and a leader key for vi/emacs.*/
+/*  ; is popular, I use , it's easy in dvorak.:   */
+/*                                                                              */
+/*   `<$>' ?[_]-                                             */
+/* - \(")# !{:}/ ;                                           */
+/*   @=*+; %&^~|                                             */
+/********************************************************************************/
+// Left
+#define ___SB_L1___               KC_OCLTGT,     KC_DLR,   KC_GT
+#define ___SB_L2___   KC_BACKSLASH,  KC_OCPRN,   KC_OCDQUO,   KC_RPRN,  KC_HASH
+#define ___SB_L3___               KC_COLON,  KC_ASTR,  KC_PLUS
+#define ___SB_L3b___              KC_EQL,  KC_ASTR,  KC_PLUS
+
+// Bepo
+#define ___SB_L1_BP___                BP_OCLTGT,   BP_DLR,   DB_GRTR
+#define ___SB_L2_BP___  DB_BACKSLASH, DB_LPRN,   BP_OCDQUO,  DB_RPRN,  DB_HASH
+#define ___SB_L3_BP___                KC_COLON,  BP_ASTR,  BP_PLUS
+#define ___SB_L3b_BP___               BP_EQL,  BP_ASTR,  BP_PLUS
+
+// Right
+#define ___SB_R1___               KC_OCBRC,   KC_UNDS,  KC_RBRC
+#define ___SB_R2___    KC_PERC,   KC_OCCBR,   KC_EQL,   KC_RCBR,  KC_PIPE
+#define ___SB_R3___               KC_AMPR,   KC_CIRC,  KC_TILD
+
+#define ___SB_R2a___   KC_PERC, KC_OCCBR,   KC_EXLM,   KC_RCBR,  KC_PIPE
+#define ___SB_R2b___   KC_EXLM,   KC_OCCBR,   KC_COLN,  KC_RCBR,  KC_SLASH
+
+// Bepo
+#define ___SB_R1_BP___            BP_OCBRC,   BP_UNDS,  DB_RBRC
+#define ___SB_R2_BP___  BP_PERC, BP_OCCBR,   BP_EQL,   DB_RCBR,  DB_PIPE
+#define ___SB_R3_BP___            BP_AMPR,   DB_CIRC,  DB_TILD
+
+#define ___SB_R2a_BP___ BP_PERC, BP_OCCBR,   BP_EXLM,   DB_RCBR,  DB_PIPE
+#define ___SB_R2b_BP___ BP_EXLM, BP_OCCBR,   KC_COLON,   DB_RCBR,  DB_SLASH
+
+// ---------------------------
+// ---------------------------
+
+// Square it to 6, Add in the - and ;.
+#define ___6SYMBOLS_BEAKL_L1___  ___,     ___,  ___SB_L1___, ___
+#define ___6SYMBOLS_BEAKL_L2___  KC_MINS, ___SB_L2___
+#define ___6SYMBOLS_BEAKL_L3___  ___,     ___,  ___SB_L3___, ___
+
+#define ___6SYMBOLS_BEAKL_R1___  ___, ___SB_R1___,  ___, ___
+#define ___6SYMBOLS_BEAKL_R2___  ___SB_R2___,            KC_SCLN
+#define ___6SYMBOLS_BEAKL_R3___  ___, ___SB_R3___,  ___, ___
+// ---------------------------
+#define ___6SYMBOLS_BEAKL_L1a___  ___, KC_OCGRV,  ___SB_L1___,  KC_OCQUOT
+#define ___6SYMBOLS_BEAKL_L2a___  ___6SYMBOLS_BEAKL_L2___
+#define ___6SYMBOLS_BEAKL_L3a___  ___, KC_AT,  ___SB_L3___,  KC_SCLN
+
+#define ___6SYMBOLS_BEAKL_R1a___  LSFT(KC_SLASH), ___SB_R1___,  KC_MINS, ___
+#define ___6SYMBOLS_BEAKL_R2a___  ___SB_R2a___, KC_SCLN
+#define ___6SYMBOLS_BEAKL_R3a___  KC_EXLM, ___SB_R3___,  KC_SLASH,    ___
+// ---------------------------
+#define ___6SYMBOLS_BEAKL_L1b___  ___, KC_OCGRV,  ___SB_L1___,  KC_OCQUOT
+#define ___6SYMBOLS_BEAKL_L2b___  ___6SYMBOLS_BEAKL_L2___
+#define ___6SYMBOLS_BEAKL_L3b___  ___, KC_AT,  ___SB_L3b___,  KC_SCLN
+
+#define ___6SYMBOLS_BEAKL_R1b___ ___6SYMBOLS_BEAKL_R1a___
+#define ___6SYMBOLS_BEAKL_R2b___  ___SB_R2b___,            KC_SCLN
+#define ___6SYMBOLS_BEAKL_R3b___  KC_PERC, ___SB_R3___,  KC_PIPE,    ___
+
+// ---------------------------
+// ---------------------------
+// Bepo
+#define ___6SYMBOLS_BEAKL_L1_BP___    ___,     ___,  ___SB_L1_BP___, ___
+#define ___6SYMBOLS_BEAKL_L2_BP___    BP_MINS, ___SB_L2_BP___
+#define ___6SYMBOLS_BEAKL_L3_BP___    ___,     ___,  ___SB_L3_BP___, ___
+
+#define ___6SYMBOLS_BEAKL_R1_BP___   ___,     ___SB_R1_BP___,  ___, ___
+#define ___6SYMBOLS_BEAKL_R2_BP___   ___SB_R2_BP___,                BP_SCLN
+#define ___6SYMBOLS_BEAKL_R3_BP___   ___,     ___SB_R3_BP___,  ___, ___
+// ---------------------------
+#define ___6SYMBOLS_BEAKL_L1a_BP___  ___, BP_GRV, ___SB_L1_BP___,  BP_AT
+#define ___6SYMBOLS_BEAKL_L2a_BP___  ___6SYMBOLS_BEAKL_L2_BP___
+#define ___6SYMBOLS_BEAKL_L3a_BP___  ___, BP_AT, ___SB_L3_BP___,  BP_SCLN
+
+#define ___6SYMBOLS_BEAKL_R1a_BP___  BP_QUES, ___SB_R1_BP___,  BP_MINS, ___
+#define ___6SYMBOLS_BEAKL_R2a_BP___  ___SB_R2a_BP___, BP_SCLN
+#define ___6SYMBOLS_BEAKL_R3a_BP___  BP_EXLM, ___SB_R3_BP___,  BP_SLSH, ___
+// ---------------------------
+#define ___6SYMBOLS_BEAKL_L1b_BP___  ___, BP_GRV,  ___SB_L1___,  BP_OCQUOT
+#define ___6SYMBOLS_BEAKL_L2b_BP___  ___6SYMBOLS_BEAKL_L2_BP___
+#define ___6SYMBOLS_BEAKL_L3b_BP___  ___, BP_AT,  ___SB_L3b_BP___,  BP_SCLN
+
+#define ___6SYMBOLS_BEAKL_R1b_BP___  ___, ___SB_R1_BP___,  BP_MINS, ___
+#define ___6SYMBOLS_BEAKL_R2b_BP___  ___SB_R2b_BP___,            BP_SCLN
+#define ___6SYMBOLS_BEAKL_R3b_BP___  BP_PERC, ___SB_R3_BP___,  BP_PIPE, ___
+// ---------------------------
+
+// Some 12 column rows.
+#define ___12_SYM_BKL_1_BP___ ___6SYMBOLS_BEAKL_L1_BP___,  ___6SYMBOLS_BEAKL_R1_BP___
+#define ___12_SYM_BKL_2_BP___ ___6SYMBOLS_BEAKL_L2_BP___,  ___6SYMBOLS_BEAKL_R2_BP___
+#define ___12_SYM_BKL_3_BP___ ___6SYMBOLS_BEAKL_L3_BP___,  ___6SYMBOLS_BEAKL_R3_BP___
+
+#define ___12_SYM_BKL_1___    ___6SYMBOLS_BEAKL_L1___,  ___6SYMBOLS_BEAKL_R1___
+#define ___12_SYM_BKL_2___    ___6SYMBOLS_BEAKL_L2___,  ___6SYMBOLS_BEAKL_R2___
+#define ___12_SYM_BKL_3___    ___6SYMBOLS_BEAKL_L3___,  ___6SYMBOLS_BEAKL_R3___
+
+// Some 12 column rows.
+#define ___12_SYM_BKL_A1_BP___ ___6SYMBOLS_BEAKL_L1a_BP___,  ___6SYMBOLS_BEAKL_R1a_BP___
+#define ___12_SYM_BKL_A2_BP___ ___6SYMBOLS_BEAKL_L2a_BP___,  ___6SYMBOLS_BEAKL_R2a_BP___
+#define ___12_SYM_BKL_A3_BP___ ___6SYMBOLS_BEAKL_L3a_BP___,  ___6SYMBOLS_BEAKL_R3a_BP___
+
+#define ___12_SYM_BKL_A1___ ___6SYMBOLS_BEAKL_L1a___,  ___6SYMBOLS_BEAKL_R1a___
+#define ___12_SYM_BKL_A2___ ___6SYMBOLS_BEAKL_L2a___,  ___6SYMBOLS_BEAKL_R2a___
+#define ___12_SYM_BKL_A3___ ___6SYMBOLS_BEAKL_L3a___,  ___6SYMBOLS_BEAKL_R3a___
+
+#define ___12_SYM_BKL_B1_BP___ ___6SYMBOLS_BEAKL_L1b_BP___, ___6SYMBOLS_BEAKL_R1b_BP___
+#define ___12_SYM_BKL_B2_BP___ ___6SYMBOLS_BEAKL_L2b_BP___, ___6SYMBOLS_BEAKL_R2b_BP___
+#define ___12_SYM_BKL_B3_BP___ ___6SYMBOLS_BEAKL_L3b_BP___, ___6SYMBOLS_BEAKL_R3b_BP___
+
+#define ___12_SYM_BKL_B1___ ___6SYMBOLS_BEAKL_L1b___, ___6SYMBOLS_BEAKL_R1b___
+#define ___12_SYM_BKL_B2___ ___6SYMBOLS_BEAKL_L2b___, ___6SYMBOLS_BEAKL_R2b___
+#define ___12_SYM_BKL_B3___ ___6SYMBOLS_BEAKL_L3b___, ___6SYMBOLS_BEAKL_R3b___
+
+/********************************************************************************/
+/* The BEAKL and BEAKL-A SYMBOL LAYER Chunks                                    */
+/********************************************************************************/
+// The Official beakl symbol layer as a chunk, Bepo and Qwerty
+#define ___SYMB_BEAKL_BP_3x12___ ___12_SYM_BKL_1_BP___, \
+    ___12_SYM_BKL_2_BP___,                              \
+    ___12_SYM_BKL_3_BP___
+
+#define ___SYMB_BEAKL_3x12___    ___12_SYM_BKL_1___,    \
+    ___12_SYM_BKL_2___,                                 \
+    ___12_SYM_BKL_3___
+
+// Alternate Beakle symbol layer with additional corner symbols.
+#define ___SYMB_BEAKLA_BP_3x12___ ___12_SYM_BKL_A1_BP___, \
+    ___12_SYM_BKL_A2_BP___,                               \
+    ___12_SYM_BKL_A3_BP___
+
+#define ___SYMB_BEAKLA_3x12___    ___12_SYM_BKL_A1___,  \
+    ___12_SYM_BKL_A2___,                                \
+    ___12_SYM_BKL_A3___
+
+#define ___SYMB_BEAKLB_BP_3x12___ ___12_SYM_BKL_B1_BP___,       \
+    ___12_SYM_BKL_B2_BP___,                                     \
+    ___12_SYM_BKL_B3_BP___
+
+#define ___SYMB_BEAKLB_3x12___    ___12_SYM_BKL_B1___,  \
+    ___12_SYM_BKL_B2___,                                \
+    ___12_SYM_BKL_B3___
+
+/********************************************************************************/
+/* NAVIGATION  - MOUSE, Scroll, Buttons, Arrows, Tab, Home, page up/down, End   */
+/* Navigation layers:                                                           */
+/*    3 row Layer                                                               */
+/*    4 Row Layer with repeated and swapped VI arrows, and Scroll wheel.        */
+/********************************************************************************/
+/*                                                                              */
+/* Navigation layer with optional 4th Row....                                   */
+/*                                                                              */
+/* M = Mouse                                                                    */
+/* B = Button                                                                   */
+/* W = Wheel                                                                    */
+/* AC   = Acceleration                                                          */
+/* CCCV = Tap -> Ctrl-C, hold for double tap duration -> Ctrl-V                 */
+/* CTCN = Tap -> Ctrl-T, hold for double tap duration -> Ctrl-N                 */
+/* CWCQ = Tap -> Ctrl-W, hold for double tap duration -> Ctrl-Q                 */
+/* TAB  = Tap -> Tab,    Double-tap -> Back Tab                                 */
+/* HOME = Tap -> Home,   Double-tap -> End                                      */
+/*                                                                              */
+/* MB5  MB4    MB3    MB2  MB1     MAC0  |  CTCN  MB1    MB2    MB3  MB4   MB5 */
+/* TAB  MLeft  MDown  MUp  MRight  MAC1  |  CCCV  Left   Down   UP   Right TAB */
+/*      WLeft  WDown  WUp  WRight  MAC2  |  CWCQ  HOME   PGDN   PGUP END       */
+/*                                                                              */
+/*      Left   Down   Up   Right   CCCV  |  CCCV   MLeft  MDown  MUp  MRight    */
+/*                                                                              */
+/********************************************************************************/
+
+#define ___MOUSE_LDUR___      KC_MS_L,  KC_MS_D,  KC_MS_U,  KC_MS_R
+#define ___MWHEEL_LDUR___     KC_WH_L,  KC_WH_D,  KC_WH_U,  KC_WH_R
+//  really BTN 1, 2, 3, 8, 9 - according to xev.
+#define ___MOUSE_BTNS_R___    KC_BTN1,  KC_BTN3,  KC_BTN2,  KC_BTN4,  KC_BTN5
+//  really BTN 9, 8, 3, 2, 1 - according to xev
+#define ___MOUSE_BTNS_L___    KC_BTN5,  KC_BTN4,  KC_BTN2,  KC_BTN3,  KC_BTN1
+#define ___MOUSE_ACCL_012___  KC_ACL0,  KC_ACL1,  KC_ACL2
+#define ___MACCL___ ___MOUSE_ACCL_012___
+
+
+#define ___VI_ARROWS___          KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
+#define ___HOME_PGDN_PGUP_END___ KC_HOME, KC_PGDN, KC_PGUP, KC_END
+
+#define ___6NAV_L_1___ ___MOUSE_BTNS_L___,           KC_ACL0
+#define ___6NAV_L_2___ TAB_BKTAB, ___MOUSE_LDUR___,  KC_ACL1
+#define ___6NAV_L_3___ ___,       ___MWHEEL_LDUR___, KC_ACL2
+#define ___6NAV_L_4___ ___,       ___VI_ARROWS___,   KC_CCCV
+
+#define ___6NAV_R_1___ KC_CTCN, ___MOUSE_BTNS_R___
+#define ___6NAV_R_2___ KC_CCCV, ___VI_ARROWS___,          TAB_BKTAB
+#define ___6NAV_R_3___ KC_CWCQ, ___HOME_PGDN_PGUP_END___, ___
+#define ___6NAV_R_4___ KC_CCCV, ___MOUSE_LDUR___, ___
+
+  // compact. Initially for corne. So 3x12 per layer.
+#define ___12_NAV_1___ ___6NAV_L_1___, ___6NAV_R_1___
+#define ___12_NAV_2___ ___6NAV_L_2___, ___6NAV_R_2___
+#define ___12_NAV_3___ ___6NAV_L_3___, ___6NAV_R_3___
+
+#define ___12_NAV_4___ ___6NAV_L_4___, ___6NAV_R_4___
+
+/********************************************************************************/
+/* The Navigation LAYER Chunks                                                  */
+/********************************************************************************/
+// A Navigation Layer
+#define ___NAV_3x12___ ___12_NAV_1___, ___12_NAV_2___, ___12_NAV_3___
+#define ___NAV_4x12___ ___NAV_3x12___, ___12_NAV_4___
+
+
+/********************************************************************************/
+/* MEDIA  - Mute, Vol, play, pause, stop, next, prev, etc.   */
+/********************************************************************************/
+#define ___PRV_PLAY_NXT_STOP___ KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP
+#define ___VDN_MUTE_VUP___ KC_VOLD, KC_MUTE, KC_VOLU
+
+#define ___MUTE_PRV_PLAY_NXT_STOP___  KC_MUTE,  KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP
+#define ___MUTE_PLAY_STOP___  KC_MUTE,  KC_MPLY,  KC_MSTP
+
+
+/********************************************************************************/
+/* RGB  - Control those lights.                                                 */
+
+/* ___, HUE SAT_INT MOD (UP),            | */
+/* ___, HUE SAT INT MOD (DOWN), RGB_TOG  | P_B_R_SW_SN___, ___ */
+/* ___6___,                              | ___, ___RGB_KXGT___, ___ */
+/********************************************************************************/
+// RGB FUNCTION Keysets
+// RGB row for the _FN layer from the redo of the default keymap.c
+#define ___RGB_HUE_SAT_INT_UP___ RGB_HUI, RGB_SAI, RGB_VAI, RGB_RMOD
+#define ___RGB_HUE_SAT_INT_DN___ RGB_HUD, RGB_SAD, RGB_VAD, RGB_MOD
+#define ___RGB_MODE_PRV_NXT___   RGB_RMOD, RGB_MOD
+#define ___RGB_TOGGLE___         RGB_TOG
+#define ___RGB_P_B_R_SW_SN___    RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN
+#define ___RGB_KXGT___           RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T
+
+/// An RGB Layer
+#define ___12_RGB_1___ ___, ___RGB_HUE_SAT_INT_UP___, ___,     ___6___
+#define ___12_RGB_2___ ___, ___RGB_HUE_SAT_INT_DN___, RGB_TOG, ___RGB_P_B_R_SW_SN___, ___
+#define ___12_RGB_3___ ___6___,                                ___, ___RGB_KXGT___, ___
+
+/********************************************************************************/
+/* The RGB LAYER Chunk                                                          */
+/********************************************************************************/
+#define ___RGB_3x12___ ___12_RGB_1___, ___12_RGB_2___, ___12_RGB_3___
+
+
+/********************************************************************************/
+/* ADJUST - Miscellaneous Melange.                                              */
+/********************************************************************************/
+// For an Adjust layer. Like RBB with audio, flash, etc.
+#define ___6_ADJUST_L1___ KC_MAKE,  ___RGB_HUE_SAT_INT_UP___,       RGB_TOG
+#define ___6_ADJUST_L2___ VRSN,     MU_TOG, CK_TOGG, AU_ON, AU_OFF, CG_NORM
+#define ___6_ADJUST_L3___ MG_NKRO,  ___RGB_HUE_SAT_INT_DN___,        KC_RGB_T
+
+#define ___6_ADJUST_R1___  ___5___,                          KC_RESET
+#define ___6_ADJUST_R2___  ___,     ___PRV_PLAY_NXT_STOP___, EEP_RST
+#define ___6_ADJUST_R3___  MG_NKRO, ___VDN_MUTE_VUP___, ___, RGB_IDL
+
+/********************************************************************************/
+/* The Adjust LAYER Chunks                                                      */
+/********************************************************************************/
+#define ___ADJUST_3x12___  ___6_ADJUST_L1___, ___6_ADJUST_R1___,    \
+                           ___6_ADJUST_L2___, ___6_ADJUST_R2___,       \
+                           ___6_ADJUST_L3___, ___6_ADJUST_R3___
+
+
+/********************************************************************************/
+/* LAYERS - Define a base layer, switch to any layer. Get around. Experiment.   */
+/*                                                                              */
+/* Base Layers on the left hand,                                                */
+/* transient layers on the right. Centered on the home region.                  */
+/* A good place to attach an experimental layer.                                */
+/*                                                                              */
+/********************************************************************************/
+//  Base Layers
+#define ___5_LAYERS_B1___ ___,        KC_BEPO,    KC_DVORAK_BP, KC_BEAKL_BP, ___
+#define ___5_LAYERS_B2___ KC_QWERTY,  KC_COLEMAK, KC_DVORAK,    KC_BEAKL, ___
+
+#define ___5_LAYERS_B3___ ___, KC_QWERTY,    KC_NORMAN,    KC_WORKMAN, ___
+#define ___5_LAYERS_B4___ ___, DF(_MALTRON), DF(_EUCALYN), DF(_CARPLAX), ___
+
+#define ___5_LAYERS_B1b___ DF(_NORMAN),  DF(_MALTRON), DF(_CARPLAX), DF(_COLEMAK), ___
+#define ___5_LAYERS_B2b___ DF(_EUCALYN), DF(_WORKMAN), DF(_QWERTY),  DF(_DVORAK), ___
+#define ___5_LAYERS_B3b___ ___,          DF(_BEAKL),   DF(_BEPO),    DF(_DVORAK_BP), ___
+
+// transient layers.
+#define ___5_LAYERS_T___     ___, MO(_NAV),  MO(_SYMB),     MO(_KEYPAD),       MO(_TOPROWS)
+#define ___5_LAYERS_T_BP___  ___, MO(_NAV),  MO(_SYMB_BP),  MO(_KEYPAD_BP),    MO(_TOPROWS_BP)
+#define ___5_LAYERS_T_CTL___ ___, MO(_RGB),  ___,                 ___, MO(_ADJUST)
+
+
+/// A Layers Layer
+#define ___12_LAYERS_1___ ___, ___5_LAYERS_B1___,  ___5_LAYERS_T_BP___,  ___
+#define ___12_LAYERS_2___ ___, ___5_LAYERS_B2___,  ___5_LAYERS_T___,     ___
+#define ___12_LAYERS_3___ KC_SPACETEST, ___5___,            ___5_LAYERS_T_CTL___, ___
+
+/********************************************************************************/
+/* The LAYERS LAYER Chunk                                                       */
+/********************************************************************************/
+#define ___LAYERS_3x12___ ___12_LAYERS_1___, ___12_LAYERS_2___, ___12_LAYERS_3___
diff --git a/users/ericgebhart/layouts.h b/users/ericgebhart/layouts.h
new file mode 100644
index 0000000000..5ca9b00e6e
--- /dev/null
+++ b/users/ericgebhart/layouts.h
@@ -0,0 +1,720 @@
+#pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "core_keysets.h"
+#include "mod_layer.h"
+#include "edge_keys.h"
+
+/******************************************************************/
+/* This is where I put my Keyboard layouts.                       */
+/* The mod layer can be modified in mod_layer.h                   */
+/* can be applied here. The physical shape of the keyboard is     */
+/* also accounted for here. This makes it very simple to add a    */
+/* new keyboard and reuse all of my layouts and layers            */
+/*                                                                */
+/* With all of that in hand, we then create a LAYOUT wrapper      */
+/* macro that takes a list of keys, to create a keyboard matrix   */
+/* that fits the keyboard. Simple.                                */
+/*                                                                */
+/* The thumb keys, the bottom rows, etc.                          */
+/*                                                                */
+/* An attempt has been made to adapt the kinesis and ergodox      */
+/* Thumb keys to the rectangular shapes of the xd75, viterbi,     */
+/* and rebound.                                                   */
+/******************************************************************/
+
+/******************************************************************/
+/* * The XD75 is a 5x15 Ortholinear matrix which means it has 3   */
+/*       keys inbetween the usual left and right hand keys        */
+/* * The Viterbi is a split 5x14 Ortholinear with 2 middle keys.  */
+/* * The Ergodox is a split 5x14 Ortholinear with 2 middle keys,  */
+/*       thumbkeys. It is missing middle keys on (home) row 3.    */
+/* * The Corne is a split 3x12 with 6 thumb keys. It has no       */
+/*       extra middle keys                                        */
+/*                                                                */
+/******************************************************************/
+
+
+/******************************************************************/
+/*   In all cases these keyboards are defined in a matrix which is */
+/*   a set of rows. Maybe like so, or not.                         */
+/*                                                                 */
+/*   -------------------------|------------------------ */
+/*   | Left0 | Numbers L | mid|dle0 | numbers R | Right0 | */
+/*   | Left1 | keys0-5   | mid|dle1 | Keys6-10  | Right1 | */
+/*   | Left2 | keys11-15 | mid|dle2 | Keys16-20 | Right2 | */
+/*   | Left3 | keys20-25 | mid|dle3 | Keys25-30 | Right3 | */
+/*   | Row5L                  |                    Row5R | */
+/*   |               ThumbsL  | ThumbsR                  | */
+/*   -------------------------|------------------------ */
+
+/* Generally speaking, the keys on the right and left don't change. */
+/* Neither does the bottom row or the thumbs. Frequently the numbers */
+/* row is identical across layers. Mostly, we want our Base layers to */
+/* be predctable.                                                     */
+
+
+// Since our quirky block definitions are basically a list of comma separated
+// arguments, we need a wrapper in order for these definitions to be
+// expanded before being used as arguments to the LAYOUT_xxx macro.
+#if (!defined(LAYOUT) && defined(KEYMAP))
+#define LAYOUT KEYMAP
+#endif
+
+// every keyboard has it's Layout. We start there and make a var args
+// out of it.
+
+#define LVARG_ergodox(...)    LAYOUT_ergodox(__VA_ARGS__)
+#define LVARG_edox(...)       LAYOUT_ergodox_pretty(__VA_ARGS__)
+#define LAYOUT_VARG(...)      LAYOUT(__VA_ARGS__)
+#define LAYOUT_PVARG(...)     LAYOUT_pretty(__VA_ARGS__)
+
+#define LVARG_4x12(...)       LAYOUT_ortho_4x12(__VA_ARGS__)
+#define LVARG_5x12(...)       LAYOUT_ortho_5x12(__VA_ARGS__)
+#define LVARG_5x14(...)       LAYOUT_ortho_5x14(__VA_ARGS__)
+#define LVARG_5x15(...)       LAYOUT_ortho_5x15(__VA_ARGS__)
+
+/*
+  | Left | Numbers L | middle | numbers R | Right |
+  | Left | keys0-5   | middle | Keys6-10  | Right |
+  | Left | keys11-15 | middle | Keys16-20 | Right |
+  | Left | keys20-25 | middle | Keys25-30 | Right |
+  |Row5L                                  Row5R   |
+  |ThumbsL                                ThumbsR |
+*/
+
+/* Assuming that left, midddle, right, row5, and thumbs stay the same, */
+/* numbers, no numbers, numbers never change, whatever.                */
+/*   we can have a layout macro that takes a nice rectangle of keys.   */
+
+/* Actually, because of Bepo, each keyboard currently requires four of */
+/* these macros. One for Qwerty, One for foreign layouts on bepo like */
+/* dvorak and beakl on bepo instead of on Qwerty. Then another for the Bepo */
+/* layout because unlike the rest of the layouts Bepo doesn't fit in */
+/* 3x10. It wants 3x12. So there are potentially 4 macros per keyboard here. */
+/* XXXX_base, XXXX_base_bepo, XXXX_base_bepo6, The 4th macro */
+/* is XXXXX_transient and generally works for all other */
+/* non base layers.                                       */
+/* The base and transient versions are all that is necessary, if bepo is */
+/*   not needed. */
+
+
+/* All layouts are relatively simple to make. */
+/* The ROW macros add a universal mod layer so that mods can be defined once */
+/* and used everywhere. No matter the keymap or layer. this allows actual maps */
+/* like dvorak, qwerty, colemak, beakl, etc., to be defined simply. */
+
+
+/* Additional, more complicated layouts can be found here.*/
+/* examples can be found in crkbd/keymaps/ericgebhart */
+/* examples can be found in kinesis/keymaps/ericgebhart */
+/* examples can be found in ergodox/keymaps/ericgebhart */
+/* examples can be found in montsinger/rebound/rev4/keymaps/ericgebhart */
+
+
+
+/********************************************************************/
+/* xiudi/xd75  - Ortholinear 5x15  */
+/********************************************************************/
+/// These first two base layout templates take sets of 5 keys, left and right.
+// Using 4 sets allows for changing the number row if you have one.
+// if you never change the number row, then use 3 sets of left and right.
+// and define the number row here.
+#define LAYOUT_5x15_base(                                         \
+                         K01, K02, K03, K04, K05,                 \
+                         K06, K07, K08, K09, K0A,                 \
+                         K11, K12, K13, K14, K15,                 \
+                         K16, K17, K18, K19, K1A,                 \
+                         K21, K22, K23, K24, K25,                 \
+                         K26, K27, K28, K29, K2A,                 \
+                         K31, K32, K33, K34, K35,                 \
+                         K36, K37, K38, K39, K3A)                 \
+  LVARG_5x15(                                                     \
+            ROW0_LEFT(K01, K02, K03, K04, K05), \
+            ___3_MIDDLE_T___,                                           \
+            ROW0_RIGHT(K06, K07, K08, K09, K0A),                        \
+                                                                        \
+            ROW1_LEFT(K11, K12, K13, K14, K15),                         \
+            ___3_MIDDLE_1___,                                           \
+            ROW1_RIGHT(K16, K17, K18, K19, K1A),                        \
+                                                                        \
+            ROW2_LEFT(K21, K22, K23, K24, K25),                         \
+            ___3_MIDDLE_2___,                                           \
+            ROW2_RIGHT(K26, K27, K28, K29, K2A),                        \
+                                                                        \
+            ROW3_LEFT(K31, K32, K33, K34, K35),                         \
+            ___3_MIDDLE_3___,                                           \
+            ROW3_RIGHT(K36, K37, K38, K39, K3A),                        \
+            ___15_BOTTOM___                                             \
+    )
+
+#define LAYOUT_5x15_base_bepo(                                          \
+                         K01, K02, K03, K04, K05,                       \
+                         K06, K07, K08, K09, K0A,                       \
+                         K11, K12, K13, K14, K15,                       \
+                         K16, K17, K18, K19, K1A,                       \
+                         K21, K22, K23, K24, K25,                   \
+                         K26, K27, K28, K29, K2A,                   \
+                         K31, K32, K33, K34, K35,                   \
+                         K36, K37, K38, K39, K3A)                   \
+  LVARG_5x15(                                                           \
+             ROW0_LEFT_BP(K01, K02, K03, K04, K05),                   \
+             ___3_MIDDLE_T___,                                          \
+             ROW0_RIGHT_BP(K06, K07, K08, K09, K0A),                    \
+                                                                        \
+             ROW1_LEFT_BP(K11, K12, K13, K14, K15),                     \
+             ___3_MIDDLE_1_BP___,                                       \
+             ROW1_RIGHT_BP(K16, K17, K18, K19, K1A),                    \
+                                                                        \
+             ROW2_LEFT_BP(K21, K22, K23, K24, K25),                     \
+             ___3_MIDDLE_2_BP___,                                       \
+             ROW2_RIGHT_BP(K26, K27, K28, K29, K2A),                    \
+                                                                        \
+             ROW3_LEFT_BP(K31, K32, K33, K34, K35),                     \
+             ___3_MIDDLE_3_BP___,                                       \
+             ROW3_RIGHT_BP(K36, K37, K38, K39, K3A),                    \
+             ___15_BOTTOM_BP___                                         \
+                                                                        )
+
+// Just for bepo because it's a 3x6 matrix on each side.
+// So 3 pairs of 6 keys, left and right.
+#define Layout_5x15_base_bepo6(                                         \
+                               K01, K02, K03, K04, K05, K06,            \
+                               K07, K08, K09, K0A, K0B, K0C,            \
+                               K11, K12, K13, K14, K15, K16,            \
+                               K17, K18, K19, K1A, K1B, K1C,            \
+                               K21, K22, K23, K24, K25, K26,            \
+                               K27, K28, K29, K2A, K2B, K2C             \
+                                                   )                    \
+     LVARG_5x15(                                                        \
+                ___15_B_SYMB___,                                  \
+                ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),            \
+                ___3_MIDDLE_1_BP___,                                    \
+                ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),           \
+                                                                        \
+                ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),            \
+                ___3_MIDDLE_2___,                                       \
+                ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),           \
+                                                                        \
+                ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),            \
+                ___3_MIDDLE_3___,                                       \
+                ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),           \
+                ___15_BOTTOM_BP___                                      \
+                                                                        )
+
+     // 4  rows of 12. 3 columns transparent in the middle.
+#define LAYOUT_5x15_transient(                                          \
+                              K01, K02, K03, K04, K05, K06,             \
+                              K07, K08, K09, K0A, K0B, K0C,           \
+                              K11, K12, K13, K14, K15, K16,             \
+                              K17, K18, K19, K1A, K1B, K1C,             \
+                              K21, K22, K23, K24, K25, K26,             \
+                              K27, K28, K29, K2A, K2B, K2C,             \
+                              K31, K32, K33, K34, K35, K36,             \
+                              K37, K38, K39, K3A, K3B, K3C              \
+                                                                        ) \
+     LVARG_5x15(                                                  \
+                K01, K02, K03, K04, K05, K06,                           \
+                ___3___,                                                \
+                K07, K08, K09, K0A, K0B, K0C,                           \
+                K11, K12, K13, K14, K15, K16,                           \
+                ___3___,                                                \
+                K17, K18, K19, K1A, K1B, K1C,                           \
+                K21, K22, K23, K24, K25, K26,                           \
+                ___3___,                                                \
+                K27, K28, K29, K2A, K2B, K2C,                           \
+                K31, K32, K33, K34, K35, K36,                           \
+                ___3___,                                                \
+                K37, K38, K39, K3A, K3B, K3C,                           \
+                ___15___)                                               \
+
+#define BASE_5x15(...)       LAYOUT_5x15_base(__VA_ARGS__)
+#define BASE_5x15_bepo(...)  LAYOUT_5x15_base_bepo(__VA_ARGS__)
+#define BASE_5x15_bepo6(...) LAYOUT_5x15_base_bepo6(__VA_ARGS__)
+#define TRANSIENT_5x15(...)  LAYOUT_5x15_transient(__VA_ARGS__)
+
+/********************************************************************/
+
+
+/********************************************************************/
+/* viterbi  - Ortholinear 5x14  */
+/********************************************************************/
+#define LAYOUT_5x14_base(                                               \
+                         K01, K02, K03, K04, K05,                       \
+                         K06, K07, K08, K09, K0A,                       \
+                         K11, K12, K13, K14, K15,                       \
+                         K16, K17, K18, K19, K1A,                       \
+                         K21, K22, K23, K24, K25,                       \
+                         K26, K27, K28, K29, K2A,                       \
+                         K31, K32, K33, K34, K35,                       \
+                         K36, K37, K38, K39, K3A)                       \
+  LVARG_5x14(                                                           \
+             ROW0_LEFT(K01, K02, K03, K04, K05),                        \
+             ___2_MIDDLE_T___,                                          \
+             ROW0_RIGHT(K06, K07, K08, K09, K0A),                       \
+                                                                        \
+             ROW1_LEFT(K11, K12, K13, K14, K15),                        \
+             ___2_MIDDLE_1___,                                          \
+             ROW1_RIGHT(K16, K17, K18, K19, K1A),                       \
+                                                                        \
+             ROW2_LEFT(K21, K22, K23, K24, K25),                        \
+             ___2_MIDDLE_2___,                                          \
+             ROW2_RIGHT(K26, K27, K28, K29, K2A),                       \
+                                                                        \
+             ROW3_LEFT(K31, K32, K33, K34, K35),                        \
+             ___2_MIDDLE_3___,                                          \
+             ROW3_RIGHT(K36, K37, K38, K39, K3A),                       \
+             ___14_BOTTOM___                                            \
+                                                                        )
+
+#define LAYOUT_5x14_base_bepo(                                          \
+                              K01, K02, K03, K04, K05,                  \
+                              K06, K07, K08, K09, K0A,                  \
+                              K11, K12, K13, K14, K15,                  \
+                              K16, K17, K18, K19, K1A,                  \
+                              K21, K22, K23, K24, K25,                  \
+                              K26, K27, K28, K29, K2A,                  \
+                              K31, K32, K33, K34, K35,                  \
+                              K36, K37, K38, K39, K3A)                  \
+  LVARG_5x14(                                                           \
+            ROW0_LEFT_BP(K01, K02, K03, K04, K05),                      \
+            ___2_MIDDLE_T___,                                           \
+            ROW0_RIGHT_BP(K06, K07, K08, K09, K0A),                     \
+                                                                        \
+            ROW1_LEFT_BP(K11, K12, K13, K14, K15),                      \
+            ___2_MIDDLE_1_BP___,                                        \
+            ROW1_RIGHT_BP(K16, K17, K18, K19, K1A),                     \
+                                                                        \
+            ROW2_LEFT_BP(K21, K22, K23, K24, K25),                      \
+            ___2_MIDDLE_2_BP___,                                        \
+            ROW2_RIGHT_BP(K26, K27, K28, K29, K2A),                     \
+                                                                        \
+            ROW3_LEFT_BP(K31, K32, K33, K34, K35),                      \
+            ___2_MIDDLE_3_BP___,                                        \
+            ROW3_RIGHT_BP(K36, K37, K38, K39, K3A),                     \
+            ___14_BOTTOM_BP___                                          \
+    )
+
+  // Just for bepo because it's a 3x6 matrix on each side.
+// So 3 pairs of 6 keys, left and right.
+#define LAYOUT_5x14_base_bepo6(                                 \
+                               K01, K02, K03, K04, K05, K06,    \
+                               K07, K08, K09, K0A, K0B, K0C,    \
+                               K11, K12, K13, K14, K15, K16,    \
+                               K17, K18, K19, K1A, K1B, K1C,        \
+                               K21, K22, K23, K24, K25, K26,        \
+                               K27, K28, K29, K2A, K2B, K2C             \
+                                                   )                    \
+  LVARG_5x14(                                                           \
+             ___14_B_SYMB___,                                           \
+             ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),               \
+             ___2_MIDDLE_1_BP___,                                       \
+             ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),              \
+                                                                        \
+             ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),               \
+             ___2_MIDDLE_2___,                                          \
+             ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),              \
+                                                                        \
+             ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),               \
+             ___2_MIDDLE_3___,                                          \
+             ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),              \
+             ___14_BOTTOM_BP___                                         \
+                                                                        )
+
+// 4  rows of 12. 2 columns transparent in the middle.
+#define LAYOUT_5x14_transient(                                          \
+                              K01, K02, K03, K04, K05, K06,             \
+                              K07, K08, K09, K0A, K0B, K0C,             \
+                              K11, K12, K13, K14, K15, K16,             \
+                              K17, K18, K19, K1A, K1B, K1C,             \
+                              K21, K22, K23, K24, K25, K26,             \
+                              K27, K28, K29, K2A, K2B, K2C,             \
+                              K31, K32, K33, K34, K35, K36,             \
+                              K37, K38, K39, K3A, K3B, K3C              \
+                                                                        ) \
+  LVARG_5x14(                                                           \
+             K01, K02, K03, K04, K05, K06,                              \
+             ___2___,                                                   \
+             K07, K08, K09, K0A, K0B, K0C,                              \
+             K11, K12, K13, K14, K15, K16,                              \
+             ___2___,                                                   \
+             K17, K18, K19, K1A, K1B, K1C,                              \
+             K21, K22, K23, K24, K25, K26,                              \
+             ___2___,                                                   \
+             K27, K28, K29, K2A, K2B, K2C,                              \
+             K31, K32, K33, K34, K35, K36,                              \
+             ___2___,                                                   \
+             K37, K38, K39, K3A, K3B, K3C,                              \
+             ___14___                                                   \
+                                                                        ) \
+
+#define BASE_5x14(...)       LAYOUT_5x14_base(__VA_ARGS__)
+#define BASE_5x14_bepo(...)  LAYOUT_5x14_base_bepo(__VA_ARGS__)
+#define BASE_5x14_bepo6(...) LAYOUT_5x14_base_bepo6(__VA_ARGS__)
+#define TRANSIENT_5x14(...)  LAYOUT_5x14_transient(__VA_ARGS__)
+
+/********************************************************************/
+/* Ortholinear 4x12  */
+/********************************************************************/
+#define LAYOUT_4x12_base(                                               \
+                         K01, K02, K03, K04, K05,                       \
+                         K06, K07, K08, K09, K0A,                       \
+                         K11, K12, K13, K14, K15,                       \
+                         K16, K17, K18, K19, K1A,                       \
+                         K21, K22, K23, K24, K25,                       \
+                         K26, K27, K28, K29, K2A                        \
+                                                                        ) \
+  LVARG_4x12(                                                     \
+             ROW1_LEFT(K01, K02, K03, K04, K05),                  \
+             ROW1_RIGHT(K06, K07, K08, K09, K0A),                 \
+                                                                  \
+             ROW2_LEFT(K11, K12, K13, K14, K15),                  \
+             ROW2_RIGHT(K16, K17, K18, K19, K1A),                 \
+                                                                  \
+             ROW3_LEFT(K21, K22, K23, K24, K25),                  \
+             ROW3_RIGHT(K26, K27, K28, K29, K2A),                 \
+                                                                        \
+             ___12_BOTTOM___                                            \
+                                                                  )
+
+#define LAYOUT_4x12_base_bepo(                                          \
+                              K01, K02, K03, K04, K05,                  \
+                              K06, K07, K08, K09, K0A,                  \
+                              K11, K12, K13, K14, K15,                  \
+                              K16, K17, K18, K19, K1A,                  \
+                              K21, K22, K23, K24, K25,                  \
+                              K26, K27, K28, K29, K2A                  \
+                                                                        ) \
+     LVARG_4x12(                                                  \
+                ROW1_LEFT_BP(K01, K02, K03, K04, K05),              \
+                ROW1_RIGHT_BP(K06, K07, K08, K09, K0A),             \
+                                                                    \
+                ROW2_LEFT_BP(K11, K12, K13, K14, K15),              \
+                ROW2_RIGHT_BP(K16, K17, K18, K19, K1A),             \
+                                                                        \
+                ROW3_LEFT_BP(K21, K22, K23, K24, K25),                    \
+                ROW3_RIGHT_BP(K26, K27, K28, K29, K2A),                 \
+                                                                        \
+                ___12_BOTTOM_BP___                                      \
+                                                                  )
+
+     // Just for bepo because it's a 3x6 matrix on each side.
+     // So 3 pairs of 6 keys, left and right.
+#define Layout_4x12_base_bepo6(                                 \
+                               K01, K02, K03, K04, K05, K06,    \
+                               K07, K08, K09, K0A, K0B, K0C,    \
+                               K11, K12, K13, K14, K15, K16,           \
+                               K17, K18, K19, K1A, K1B, K1C,           \
+                               K21, K22, K23, K24, K25, K26,           \
+                               K27, K28, K29, K2A, K2B, K2C             \
+                                                                           ) \
+     LVARG_4x12(                                                        \
+                ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),            \
+                ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),           \
+                                                                        \
+                ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),            \
+                ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),           \
+                                                                        \
+                ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),            \
+                ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),           \
+                ___12_BOTTOM_BP___                                      \
+                                                                        )
+
+// takes 3 makes 4  rows of 12.
+#define LAYOUT_4x12_transient(                                          \
+                              K01, K02, K03, K04, K05, K06,             \
+                              K07, K08, K09, K0A, K0B, K0C,             \
+                              K11, K12, K13, K14, K15, K16,             \
+                              K17, K18, K19, K1A, K1B, K1C,             \
+                              K21, K22, K23, K24, K25, K26,             \
+                              K27, K28, K29, K2A, K2B, K2C              \
+                                                                        ) \
+  LVARG_4x12(                                                           \
+             K01, K02, K03, K04, K05, K06,                              \
+             K07, K08, K09, K0A, K0B, K0C,                              \
+             K11, K12, K13, K14, K15, K16,                              \
+             K17, K18, K19, K1A, K1B, K1C,                              \
+             K21, K22, K23, K24, K25, K26,                              \
+             K27, K28, K29, K2A, K2B, K2C,                              \
+             ___12___)                                                  \
+
+#define BASE_4x12(...)       LAYOUT_4x12_base(__VA_ARGS__)
+#define BASE_4x12_bepo(...)  LAYOUT_4x12_base_bepo(__VA_ARGS__)
+#define BASE_4x12_bepo6(...) LAYOUT_4x12_base_bepo6(__VA_ARGS__)
+#define TRANSIENT_4x12(...)  LAYOUT_4x12_transient(__VA_ARGS__)
+
+/********************************************************************/
+/* CRKBD  Corne                                                     */
+/*    The Corne has  3x6 matrix on both sides with 6 thumbs total   */
+/* This Macro takes 2x3x5 and gives it pinkies, and thumbs.         */
+/* Arg chunks are in the middle with the passthrough modifiers as   */
+/* needed.  Sama Sama apres cette fois.                             */
+/********************************************************************/
+#define Base_3x6_3(                                                     \
+                   K01, K02, K03, K04, K05,                             \
+                   K06, K07, K08, K09, K0A,                             \
+                   K11, K12, K13, K14, K15,                             \
+                   K16, K17, K18, K19, K1A,                             \
+                   K21, K22, K23, K24, K25,                             \
+                   K26, K27, K28, K29, K2A)                             \
+  LAYOUT_VARG(                                                          \
+              ROW1_LEFT(K01, K02, K03, K04, K05),                       \
+              ROW1_RIGHT(K06, K07, K08, K09, K0A),                      \
+                                                                        \
+              ROW2_LEFT(K11, K12, K13, K14, K15),                       \
+              ROW2_RIGHT(K16, K17, K18, K19, K1A),                      \
+                                                                        \
+              ROW3_LEFT(K21, K22, K23, K24, K25),                       \
+              ROW3_RIGHT(K26, K27, K28, K29, K2A),                      \
+              ___6_ERGO_THUMBS___                                       \
+                                                                        )
+
+// So we can have different transient layers for symbols and numbers on bepo.
+// for layouts like dvorak on bepo.
+#define Base_bepo_3x6_3(                                                \
+                        K01, K02, K03, K04, K05,                        \
+                        K06, K07, K08, K09, K0A,                        \
+                        K11, K12, K13, K14, K15,                        \
+                        K16, K17, K18, K19, K1A,                        \
+                        K21, K22, K23, K24, K25,                        \
+                        K26, K27, K28, K29, K2A                         \
+                                                                        ) \
+  LAYOUT_VARG(                                                          \
+              ROW1_LEFT_BP(K01, K02, K03, K04, K05),                    \
+              ROW1_RIGHT_BP(K06, K07, K08, K09, K0A),                   \
+                                                                        \
+              ROW2_LEFT_BP(K11, K12, K13, K14, K15),                    \
+              ROW2_RIGHT_BP(K16, K17, K18, K19, K1A),                   \
+                                                                        \
+              ROW3_LEFT_BP(K21, K22, K23, K24, K25),                    \
+              ROW3_RIGHT_BP(K26, K27, K28, K29, K2A),                   \
+              ___6_ERGO_THUMBS_BP___                                    \
+                                                                        )
+
+// No room for pinkies.
+// Just for bepo because it's a 3x6 matrix on each side.
+// So 3 pairs of 6 keys, And we lose our left and right.
+// Except it keeps the layer toggles along with the keycode
+// on the bottom.
+#define Base_bepo6_3x6_3(                                               \
+                         K01, K02, K03, K04, K05, K06,                  \
+                         K07, K08, K09, K0A, K0B, K0C,                  \
+                         K11, K12, K13, K14, K15, K16,                  \
+                         K17, K18, K19, K1A, K1B, K1C,                  \
+                         K21, K22, K23, K24, K25, K26,                  \
+                         K27, K28, K29, K2A, K2B, K2C                   \
+                                                                        ) \
+  LAYOUT_VARG(                                                          \
+              ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),              \
+              ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),             \
+                                                                        \
+              ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),              \
+              ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),             \
+                                                                        \
+              ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),              \
+              ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),             \
+              ___6_ERGO_THUMBS_BP___                                    \
+                                                                        )
+
+// All we really need is to add the see through thumbs to the end.
+#define Transient6_3x6_3(                                               \
+                         K01, K02, K03, K04, K05, K06,                  \
+                         K07, K08, K09, K0A, K0B, K0C,                  \
+                         K11, K12, K13, K14, K15, K16,                  \
+                         K17, K18, K19, K1A, K1B, K1C,                  \
+                         K21, K22, K23, K24, K25, K26,                  \
+                         K27, K28, K29, K2A, K2B, K2C                   \
+                                                                        ) \
+  LAYOUT_VARG(                                                          \
+              K01, K02, K03, K04, K05, K06,                             \
+              K07, K08, K09, K0A, K0B, K0C,                             \
+              K11, K12, K13, K14, K15, K16,                             \
+              K17, K18, K19, K1A, K1B, K1C,                             \
+              K21, K22, K23, K24, K25, K26,                             \
+              K27, K28, K29, K2A, K2B, K2C,                             \
+              ___6___)
+
+//---------------------------------------------------------
+//  3x5
+#define Base_3x5_3(                                                     \
+                   K01, K02, K03, K04, K05,                             \
+                   K06, K07, K08, K09, K0A,                             \
+                   K11, K12, K13, K14, K15,                             \
+                   K16, K17, K18, K19, K1A,                             \
+                   K21, K22, K23, K24, K25,                             \
+                   K26, K27, K28, K29, K2A)                             \
+  LAYOUT_VARG(                                                          \
+              ROW1_LEFT5(K01, K02, K03, K04, K05),                      \
+              ROW1_RIGHT5(K06, K07, K08, K09, K0A),                     \
+                                                                        \
+              ROW2_LEFT5(K11, K12, K13, K14, K15),                      \
+              ROW2_RIGHT5(K16, K17, K18, K19, K1A),                     \
+                                                                        \
+              ROW3_LEFT5(K21, K22, K23, K24, K25),                      \
+              ROW3_RIGHT5(K26, K27, K28, K29, K2A),                     \
+              ___6_ERGO_THUMBS___                                       \
+                                                                        )
+
+// So we can have different transient layers for symbols and numbers on bepo.
+// for layouts like dvorak on bepo.
+#define Base_bepo_3x5_3(                                                \
+                        K01, K02, K03, K04, K05,                        \
+                        K06, K07, K08, K09, K0A,                        \
+                        K11, K12, K13, K14, K15,                        \
+                        K16, K17, K18, K19, K1A,                        \
+                        K21, K22, K23, K24, K25,                        \
+                        K26, K27, K28, K29, K2A                         \
+                                                                        ) \
+  LAYOUT_VARG(                                                          \
+              ROW1_LEFT5_BP(K01, K02, K03, K04, K05),                   \
+              ROW1_RIGHT5_BP(K06, K07, K08, K09, K0A),                  \
+                                                                        \
+              ROW2_LEFT5_BP(K11, K12, K13, K14, K15),                   \
+              ROW2_RIGHT5_BP(K16, K17, K18, K19, K1A),                  \
+                                                                        \
+              ROW3_LEFT5_BP(K21, K22, K23, K24, K25),                   \
+              ROW3_RIGHT5_BP(K26, K27, K28, K29, K2A),                  \
+              ___6_ERGO_THUMBS_BP___                                    \
+                                                                        )
+
+// All we really need is to add the see through thumbs to the end.
+#define Transient5_3x5_3(                                               \
+                         K01, K02, K03, K04, K05,                       \
+                         K07, K08, K09, K0A, K0B,                       \
+                         K11, K12, K13, K14, K15,                       \
+                         K17, K18, K19, K1A, K1B,                       \
+                         K21, K22, K23, K24, K25,                       \
+                         K27, K28, K29, K2A, K2B                        \
+                                                                    )   \
+  LAYOUT_VARG(                                                          \
+              K01, K02, K03, K04, K05,                               \
+              K07, K08, K09, K0A, K0B,                              \
+              K11, K12, K13, K14, K15,                              \
+              K17, K18, K19, K1A, K1B,                              \
+              K21, K22, K23, K24, K25,                              \
+              K27, K28, K29, K2A, K2B,                          \
+              ___6___)
+
+/********************************************************************/
+/* Kinesis*/
+/********************************************************************/
+// Basically an ergodox ez without the 3 pairs of middle keys.
+// Left, right, bottom, and thumbs all stay the same.
+#define Base_4x6_4_6(                                                   \
+                     K01, K02, K03, K04, K05,                           \
+                     K06, K07, K08, K09, K0A,                           \
+                     K11, K12, K13, K14, K15,                           \
+                     K16, K17, K18, K19, K1A,                           \
+                     K21, K22, K23, K24, K25,                           \
+                     K26, K27, K28, K29, K2A,                           \
+                     K31, K32, K33, K34, K35,                           \
+                     K36, K37, K38, K39, K3A                            \
+                                                                        ) \
+  LAYOUT_PVARG(                                                         \
+               ___KINTFUNC_L___, ___KINTFUNC_R___,                      \
+               ROW0_LEFT(K01, K02, K03, K04, K05),                      \
+               ROW0_RIGHT(K06, K07, K08, K09, K0A),                     \
+                                                                        \
+               ROW1_LEFT(K11, K12, K13, K14, K15),                      \
+               ROW1_RIGHT(K16, K17, K18, K19, K1A),                     \
+                                                                        \
+               ROW2_LEFT(K21, K22, K23, K24, K25),                      \
+               ROW2_RIGHT(K26, K27, K28, K29, K2A),                     \
+                                                                        \
+               ROW3_LEFT(K31, K32, K33, K34, K35),                      \
+               ROW3_RIGHT(K36, K37, K38, K39, K3A),                     \
+               ___4_BOTTOM_LEFT___, ___4_BOTTOM_RIGHT___,               \
+               ___12_DOX_ALL_THUMBS___                                  \
+                                                                        )
+
+#define Base_bepo_4x6_4_6(                                              \
+                          K01, K02, K03, K04, K05,                      \
+                          K06, K07, K08, K09, K0A,                      \
+                          K11, K12, K13, K14, K15,                      \
+                          K16, K17, K18, K19, K1A,                      \
+                          K21, K22, K23, K24, K25,                      \
+                          K26, K27, K28, K29, K2A,                      \
+                          K31, K32, K33, K34, K35,                      \
+                          K36, K37, K38, K39, K3A                       \
+                                                                       ) \
+  LAYOUT_PVARG(                                                         \
+               ___KINTFUNC_L___, ___KINTFUNC_R___,                      \
+               ROW0_LEFT(K01, K02, K03, K04, K05),                      \
+               ROW0_RIGHT(K06, K07, K08, K09, K0A),                     \
+                                                                        \
+               ROW1_LEFT(K11, K12, K13, K14, K15),                      \
+               ROW1_RIGHT(K16, K17, K18, K19, K1A),                     \
+                                                                        \
+               ROW2_LEFT(K21, K22, K23, K24, K25),                      \
+               ROW2_RIGHT(K26, K27, K28, K29, K2A),                     \
+                                                                        \
+               ROW3_LEFT(K31, K32, K33, K34, K35),                      \
+               ROW3_RIGHT(K36, K37, K38, K39, K3A),                     \
+               ___4_BOTTOM_LEFT___, ___4_BOTTOM_RIGHT___,               \
+               ___12_DOX_ALL_THUMBS_BP___                               \
+                                                                        )
+
+
+// So 3 pairs of 6 keys, left and right.
+#define Base_bepo6_4x6_4_6(                                             \
+                           K01, K02, K03, K04, K05, K06,                \
+                           K07, K08, K09, K0A, K0B, K0C,                \
+                           K11, K12, K13, K14, K15, K16,                \
+                           K17, K18, K19, K1A, K1B, K1C,                \
+                           K21, K22, K23, K24, K25, K26,                \
+                           K27, K28, K29, K2A, K2B, K2C                 \
+                                                                   )    \
+  LAYOUT_PVARG(                                                         \
+               ___KINTFUNC_L___, ___KINTFUNC_R___,                      \
+               ___6SYMBOL_BEPO_L___,                                    \
+               ___6SYMBOL_BEPO_R___,                                    \
+               ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06),             \
+               ROW1_RIGHT_BP6(K07, K08, K09, K0A, K0B, K0C),            \
+                                                                        \
+               ROW2_LEFT_BP6(K11, K12, K13, K14, K15, K16),             \
+               ROW2_RIGHT_BP6(K17, K18, K19, K1A, K1B, K1C),            \
+                                                                        \
+               ROW3_LEFT_BP6(K21, K22, K23, K24, K25, K26),             \
+               ROW3_RIGHT_BP6(K27, K28, K29, K2A, K2B, K2C),            \
+               ___4_BOTTOM_LEFT_BP___, ___4_BOTTOM_RIGHT_BP___,         \
+               ___12_DOX_ALL_THUMBS_BP___                               \
+                                                                        )
+
+#define Transient6_4x6_4_6(                                             \
+                           K01, K02, K03, K04, K05, K06,                \
+                           K07, K08, K09, K0A, K0B, K0C,                \
+                           K11, K12, K13, K14, K15, K16,                \
+                           K17, K18, K19, K1A, K1B, K1C,                \
+                           K21, K22, K23, K24, K25, K26,                \
+                           K27, K28, K29, K2A, K2B, K2C,                \
+                           K31, K32, K33, K34, K35, K36,                \
+                           K37, K38, K39, K3A, K3B, K3C                 \
+                                                                        ) \
+  LAYOUT_PVARG(                                                         \
+               ___KINTFUNC_L___, ___KINTFUNC_R___,                      \
+               K01, K02, K03, K04, K05, K06,                            \
+               K07, K08, K09, K0A, K0B, K0C,                            \
+               K11, K12, K13, K14, K15, K16,                            \
+               K17, K18, K19, K1A, K1B, K1C,                            \
+               K21, K22, K23, K24, K25, K26,                            \
+               K27, K28, K29, K2A, K2B, K2C,                            \
+               K31, K32, K33, K34, K35, K36,                            \
+               K37, K38, K39, K3A, K3B, K3C,                            \
+               ___4___, ___4___,                                        \
+               ___12___                                                 \
+                                                                        )
diff --git a/users/ericgebhart/mod_layer.h b/users/ericgebhart/mod_layer.h
new file mode 100644
index 0000000000..a3c64b0bf7
--- /dev/null
+++ b/users/ericgebhart/mod_layer.h
@@ -0,0 +1,178 @@
+#pragma once
+
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+// define our rows for the mod layer
+// takes 5 keycodes, adds mods, and left and right
+// so we get keycodes in groups of 6.
+// There are 3 sets of 4 rows.
+// 1 for normal 6 columns, qwerty, dvorak etc.
+// 1 for bepo/normal 6 columns, qwerty, dvorak etc. on bepo.
+// 1 for bepo 6 columns provided instead of a 5, for bepo which needs 3x12.
+// A 5 column keyboard would need another set of MACROS.
+
+// These macros are used in the layout wrapper macros to introduce a mod
+// layer.  HomeRow mods and other things like that go here.
+
+
+#include "core_keys.h"
+
+//number row.
+#define ROW0_LEFT(K01, K02, K03, K04, K05)      \
+  LEFT0, K01, K02, K03, K04, K05
+
+#define ROW0_RIGHT(K01, K02, K03, K04, K05)     \
+  K01, K02, K03, K04, K05, RIGHT0
+
+#define ROW1_LEFT(K01, K02, K03, K04, K05)      \
+  LEFT1, K01, K02, K03, LT(_NAV, K04), K05
+
+#define ROW1_RIGHT(K01, K02, K03, K04, K05)     \
+  K01, K02, K03, K04, K05, RIGHT1
+
+// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
+// using MT so we can specify left and right.
+// caps_word needs left and right shift.
+#define ROW2_LEFT(K01, K02, K03, K04, K05)                              \
+  LEFT2, MT(MOD_LSFT, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LGUI, K04), K05
+
+#define ROW2_RIGHT(K01, K02, K03, K04, K05)                             \
+  K01, MT(MOD_RGUI, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), MT(MOD_RSFT, K05), RIGHT2 \
+
+#define ROW3_LEFT(K01, K02, K03, K04, K05)                              \
+  LEFT3, K01, LT(_TOPROWS, K02), K03, LT(_SYMB, K04), K05
+
+#define ROW3_RIGHT(K01, K02, K03, K04, K05)                             \
+  K01, LT(_SYMB, K02), LT(_NAV, K03), LT(_TOPROWS, K04), K05, RIGHT3
+
+
+//-----------------------------------------------y
+// For a 5 column keyboard - no edges added.
+//number row.
+#define ROW0_LEFT5(K01, K02, K03, K04, K05)     \
+  K01, K02, K03, K04, K05
+
+#define ROW0_RIGHT5(K01, K02, K03, K04, K05)    \
+  K01, K02, K03, K04, K05
+
+#define ROW1_LEFT5(K01, K02, K03, K04, K05)             \
+  LT(_LAYERS, K01), K02, LT(_KEYPAD, K03), K04, K05
+
+#define ROW1_RIGHT5(K01, K02, K03, K04, K05)            \
+  K01, K02, LT(_KEYPAD, K03), K04, LT(_LAYERS, K05)
+
+// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
+// using MT so we can specify left and right.
+// caps_word needs left and right shift.
+#define ROW2_LEFT5(K01, K02, K03, K04, K05)                             \
+  MT(MOD_LSFT, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LGUI, K04), K05
+
+#define ROW2_RIGHT5(K01, K02, K03, K04, K05)                            \
+  K01, MT(MOD_RGUI, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), MT(MOD_RSFT, K05)
+
+#define ROW3_LEFT5(K01, K02, K03, K04, K05)                     \
+  K01, LT(_TOPROWS, K02), LT(_NAV, K03), LT(_SYMB, K04), K05
+
+#define ROW3_RIGHT5(K01, K02, K03, K04, K05)                    \
+  K01, LT(_SYMB, K02), LT(_NAV, K03), LT(_TOPROWS, K04), K05
+
+
+//--------------------------------------------
+//bepo
+#define ROW0_LEFT_BP(K01, K02, K03, K04, K05)   \
+  LEFT0_BP, K01, K02, K03, K04, K05
+
+#define ROW0_RIGHT_BP(K01, K02, K03, K04, K05)  \
+  K01, K02, K03, K04, K05, RIGHT0_BP
+
+#define ROW1_LEFT_BP(K01, K02, K03, K04, K05)           \
+  LEFT1_BP, K01, K02, K03, LT(_KEYPAD, K04), K05
+
+#define ROW1_RIGHT_BP(K01, K02, K03, K04, K05)          \
+  K01, K02, LT(_KEYPAD, K03), K04, K05, RIGHT1_BP
+
+#define ROW2_LEFT_BP(K01, K02, K03, K04, K05)                           \
+  LEFT2_BP, MT(MOD_RSFT, K01), MT(MOD_LALT,K02), MT(MOD_RCTL, K03), \
+    MT(MOD_LGUI, K04), K05
+
+#define ROW2_RIGHT_BP(K01, K02, K03, K04, K05)                   \
+  K01, MT(MOD_RGUI, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), \
+    MT(MOD_RSFT, K05), RIGHT2_BP                                 \
+
+#define ROW3_LEFT_BP(K01, K02, K03, K04, K05)                           \
+  LEFT3_BP, K01, LT(_SYMB_BP, K02), LT(_NAV, K03), LT(_TOPROWS_BP, K04), K05
+
+#define ROW3_RIGHT_BP(K01, K02, K03, K04, K05)                          \
+  K01, LT(_SYMB_BP, K02), LT(_NAV, K03), LT(_TOPROWS_BP, K04), K05, RIGHT3_BP
+
+
+//-------------------------------------------------
+//bepo - 6 args, no left or right added.
+#define ROW0_LEFT_BP6(K01, K02, K03, K04, K05, K06)     \
+  K01, K02, K03, K04, K05, K06
+
+#define ROW0_RIGHT_BP6(K01, K02, K03, K04, K05, K06 )   \
+  K01, K02, K03, K04, K05, K06
+
+#define ROW1_LEFT_BP6(K01, K02, K03, K04, K05, K06)     \
+  K01, K02, K03, K04, K05, K06
+
+#define ROW1_RIGHT_BP6(K01, K02, K03, K04, K05, K06 )   \
+  K01, K02, K03, K04, K05, K06
+
+#define ROW2_LEFT_BP6(K01, K02, K03, K04, K05, K06)             \
+  K01, SFT_T(K02), ALT_T(K03), CTL_T(K04), GUI_T(K05), K06
+
+#define ROW2_RIGHT_BP6(K01, K02, K03, K04, K05, K06)            \
+  K01, GUI_T(K02), RCTL_T(K03), RALT_T(K04), RSFT_T(K05), K06
+
+#define ROW3_LEFT_BP6(K01, K02, K03, K04, K05, K06)     \
+  K01, K02, K03, K04, K05, K06
+
+#define ROW3_RIGHT_BP6(K01, K02, K03, K04, K05, K06 )   \
+  K01, K02, K03, K04, K05, K06
+
+
+//-------------------------------------------------
+// For a 5 column keyboard - no edges added.
+//number row.
+#define ROW0_LEFT5_BP(K01, K02, K03, K04, K05)  \
+  K01, K02, K03, K04, K05
+
+#define ROW0_RIGHT5_BP(K01, K02, K03, K04, K05) \
+  K01, K02, K03, K04, K05
+
+#define ROW1_LEFT5_BP(K01, K02, K03, K04, K05)          \
+  LT(_LAYERS, K01), K02, K03, LT(_KEYPAD_BP, K04), K05
+
+#define ROW1_RIGHT5_BP(K01, K02, K03, K04, K05)         \
+  K01, LT(_KEYPAD_BP, K02), K03, K04, K05
+
+// home row, shift, alt, ctl, gui - gui, ctl, alt, shift.
+// using MT so we can specify left and right.
+// caps_word needs left and right shift.
+#define ROW2_LEFT5_BP(K01, K02, K03, K04, K05)                          \
+  MT(MOD_LSFT, K01), MT(MOD_LALT, K02), MT(MOD_LCTL, K03), MT(MOD_LGUI, K04), K05
+
+#define ROW2_RIGHT5_BP(K01, K02, K03, K04, K05)                         \
+  K01, MT(MOD_RGUI, K02),  MT(MOD_RCTL, K03), MT(MOD_RALT, K04), MT(MOD_RSFT, K05)
+
+#define ROW3_LEFT5_BP(K01, K02, K03, K04, K05)                  \
+  K01, LT(_TOPROWS_BP, K02), LT(_NAV, K03), LT(_SYMB_BP, K04), K05
+
+#define ROW3_RIGHT5_BP(K01, K02, K03, K04, K05)                         \
+  K01, LT(_SYMB_BP, K02), LT(_NAV, K03), LT(_TOPROWS_BP, K04), K05
diff --git a/users/ericgebhart/oled_stuff.c b/users/ericgebhart/oled_stuff.c
new file mode 100755
index 0000000000..99a752ec2f
--- /dev/null
+++ b/users/ericgebhart/oled_stuff.c
@@ -0,0 +1,303 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "ericgebhart.h"
+#include <string.h>
+#include <stdio.h>
+
+void oled_render_default_layer_state(void) {
+  oled_write_P(PSTR("Layout: "), false);
+  switch (get_highest_layer(default_layer_state)) {
+    case _QWERTY:
+      oled_write_ln_P(PSTR("Qwerty"), false);
+      break;
+    case _COLEMAK:
+      oled_write_ln_P(PSTR("Colemak"), false);
+      break;
+    case _DVORAK_BP:
+    case _DVORAK:
+      oled_write_ln_P(PSTR("Dvorak"), false);
+      break;
+
+
+      /* case _WORKMAN: */
+      // oled_write_ln_P(PSTR("Workman\n"), false);
+      /*         break; */
+      /*     case _NORMAN: */
+      // oled_write_ln_P(PSTR("Norman\n"), false);
+      /*         break; */
+      /*     case _MALTRON: */
+      // oled_write_ln_P(PSTR("Maltron\n"), false);
+      /*         break; */
+
+      /* case _EUCALYN: */
+      // oled_write_ln_P(PSTR("Eucalyn\n"), false);
+      /*   break; */
+      /* case _CARPLAX: */
+      // oled_write_ln_P(PSTR("Carplax\n"), false);
+      /*   break; */
+
+    case _BEAKL:
+    case _BEAKL_BP:
+      oled_write_ln_P(PSTR("Beakl"), false);
+      break;
+    case _BEPO:
+      oled_write_ln_P(PSTR("Bepo"), false);
+      break;
+    }
+}
+
+void oled_render_layer_state(void) {
+  oled_write_P(PSTR("Layer: "), false);
+  switch (get_highest_layer(layer_state)) {
+    case _NAV:
+      oled_write_P(PSTR("Navigation"), false);
+      break;
+    case _LAYERS:
+      oled_write_P(PSTR("Layers"), false);
+      break;
+    case _RGB:
+      oled_write_P(PSTR("RGB"), false);
+      break;
+    case _TOPROWS:
+    case _TOPROWS_BP:
+      oled_write_P(PSTR("TopRows"), false);
+      break;
+    case _SYMB:
+    case _SYMB_BP:
+      oled_write_P(PSTR("Symbols"), false);
+      break;
+    case _KEYPAD:
+    case _KEYPAD_BP:
+      oled_write_P(PSTR("Keypad"), false);
+      break;
+    case _ADJUST:
+      oled_write_P(PSTR("Adjust"), false);
+      break;
+    }
+  oled_write_ln_P(PSTR(" "), false);
+}
+
+// this is part of my answer to a challenge.
+// My friend Ross thinks that the only use of an oled
+// is to say which layer.
+// I think there is more. this is just a beginning.
+void oled_render_layer_map(void) {
+  uint8_t lyr = get_highest_layer(layer_state);
+  if (lyr <= _BEPO) {
+    switch (get_highest_layer(default_layer_state)) {
+    case _QWERTY:
+      oled_write_ln_P(PSTR("   qwert  yuiop"), false);
+      oled_write_ln_P(PSTR("   asdfg  hjkl;"), false);
+      oled_write_ln_P(PSTR("   zxcvb  nm,./"), false);
+      break;
+    case _COLEMAK:
+      oled_write_ln_P(PSTR("   qwfpb  jluy;"), false);
+      oled_write_ln_P(PSTR("   arstg  mneio"), false);
+      oled_write_ln_P(PSTR("   zxcdv  kh,./"), false);
+      break;
+    case _DVORAK_BP:
+    case _DVORAK:
+      oled_write_ln_P(PSTR("   \",.py  fgcrl"), false);
+      oled_write_ln_P(PSTR("   aoeui  dhtns"), false);
+      oled_write_ln_P(PSTR("   ;qjkx  bmwvz "), false);
+      break;
+
+    case _BEAKL:
+    case _BEAKL_BP:
+      oled_write_ln_P(PSTR("   qhoux  gcrfz"), false);
+      oled_write_ln_P(PSTR("   yiea.  dstnb"), false);
+      oled_write_ln_P(PSTR("   j/,k'  wmlpv"), false);
+      break;
+
+    case _BEPO:
+      oled_write_P(PSTR("   cbe'po`e  vdljz %"), false);
+      oled_write_P(PSTR("    auie,    tsrnmc"), false);
+      oled_write_P(PSTR("   e^a'yx.k  'qghfw"), false);
+      break;
+    }
+
+  } else {
+
+    switch (lyr) {
+    case _TOPROWS:
+    case _TOPROWS_BP:
+      oled_write_ln_P(PSTR("   !@#$%  ^&*()"), false);
+      oled_write_ln_P(PSTR("   40123  76598"), false);
+      oled_write_ln_P(PSTR(" F1-    --    -F12"), false);
+      break;
+
+    case _SYMB:
+    case _SYMB_BP:
+      oled_write_ln_P(PSTR("   `<$>'  ?[_]-"), false);
+      oled_write_ln_P(PSTR("  -\\(\")#  !{:}/;"), false);
+      oled_write_ln_P(PSTR("   @=*+;  %&^~|"), false);
+      break;
+
+    case _NAV:
+      oled_write_ln_P(PSTR("54321 0  ctn 12345"), false);
+      oled_write_ln_P(PSTR(" ldur 1  ccv ldur"), false);
+      oled_write_ln_P(PSTR(" ldur 2  cwq hdue"), false);
+      break;
+
+    case _KEYPAD:
+      oled_write_ln_P(PSTR("     523:   F9-F12"), false);
+      oled_write_ln_P(PSTR("   -7.104   F5-F8"), false);
+      oled_write_ln_P(PSTR("    /698,   F1-F4"), false);
+      break;
+
+    case _LAYERS:
+      oled_write_ln_P(PSTR("  Bp Dv Bk|Nv S K TR"), false);
+      oled_write_ln_P(PSTR("Q Cl Dv Bk|Nv S K TR"), false);
+      oled_write_P(PSTR(" "), false);
+      //oled_write_ln_P(PSTR("Ctrls?-> RGB ___ ___ Adjust"), false);
+      break;
+    }
+  }
+}
+
+void oled_render_keylock_status(uint8_t led_usb_state) {
+  oled_write_P(PSTR("  Lock:"), false);
+  oled_write_P(PSTR(" "), false);
+  oled_write_P(PSTR("N"), led_usb_state & (1 << USB_LED_NUM_LOCK));
+  oled_write_P(PSTR("C"), led_usb_state & (1 << USB_LED_CAPS_LOCK));
+  oled_write_ln_P(PSTR("S"), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
+}
+
+void oled_render_mod_status(uint8_t modifiers) {
+  oled_write_P(PSTR("Mods:"), false);
+  oled_write_P(PSTR("S"), (modifiers & MOD_MASK_SHIFT));
+  oled_write_P(PSTR("C"), (modifiers & MOD_MASK_CTRL));
+  oled_write_P(PSTR("A"), (modifiers & MOD_MASK_ALT));
+  oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI));
+}
+
+void oled_render_mod_lock_status(){
+  oled_render_mod_status(get_mods() | get_oneshot_mods());
+  oled_render_keylock_status(host_keyboard_leds());
+}
+
+
+char mkeylog_str[22] = {};
+
+const char mcode_to_name[60] = {
+  ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
+  'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+  'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+  '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
+  'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
+  '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+
+
+void oled_render_keylog(void) {
+  oled_write_ln(mkeylog_str, false);
+  // sometimes there's an extra row. this is because sometimes it drops
+  // to the last line. and this clears it.
+  oled_write_ln_P(PSTR(" "), false);
+}
+
+
+void add_keylog(uint16_t keycode, keyrecord_t *record) {
+  char name = ' ';
+  if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
+      (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
+    keycode = keycode & 0xFF;
+  }
+  if (keycode < 60) {
+    name = mcode_to_name[keycode];
+  }
+
+  // update keylog
+  memset(mkeylog_str, ' ', sizeof(mkeylog_str) - 1);
+  snprintf(mkeylog_str, sizeof(mkeylog_str), "%dx%d, k%2d : %c",
+           record->event.key.row, record->event.key.col,
+           keycode, name);
+}
+
+__attribute__((weak)) oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return rotation; }
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+
+  // for the big screen.
+#ifdef OLED_DISPLAY_128X64
+  return OLED_ROTATION_180;
+#endif
+
+  return oled_init_keymap(rotation);
+}
+
+/* oled_rotation_t oled_init_user(oled_rotation_t rotation) { */
+/* memset(mkeylog_str, ' ', sizeof(mkeylog_str) - 1); */
+/*   if (is_keyboard_master()) { */
+/*     return OLED_ROTATION_270; */
+/*   } else { */
+/*     return OLED_ROTATION_180; */
+/*   } */
+/* } */
+
+bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+    //oled_timer = timer_read32();
+    add_keylog(keycode, record);
+    //add_keylog(keycode);
+  }
+  return true;
+}
+
+void render_bootmagic_status(bool status) {
+  /* Show Ctrl-Gui Swap options */
+  static const char PROGMEM logo[][2][3] = {
+    {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
+    {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
+  };
+  if (status) {
+    oled_write_ln_P(logo[0][0], false);
+    oled_write_ln_P(logo[0][1], false);
+  } else {
+    oled_write_ln_P(logo[1][0], false);
+    oled_write_ln_P(logo[1][1], false);
+  }
+}
+
+
+__attribute__((weak)) void oled_render_logo(void) {
+  // clang-format off
+  static const char PROGMEM qmk_logo[] = {
+    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
+  // clang-format on
+  oled_write_P(qmk_logo, false);
+}
+
+bool oled_task_user(void) {
+  if (is_keyboard_master()) {
+    oled_render_mod_lock_status();
+    oled_render_default_layer_state();
+    oled_render_layer_state();
+#ifdef OLED_DISPLAY_128X64
+    oled_render_layer_map();
+#endif
+    oled_render_keylog();
+  } else {
+    oled_render_logo();
+    oled_render_default_layer_state();
+  }
+  return(true);
+
+}
+/* oled_render_keylock_status(host_keyboard_leds()); */
+/* oled_render_mod_status(get_mods() | get_oneshot_mods()); */
diff --git a/users/ericgebhart/oled_stuff.h b/users/ericgebhart/oled_stuff.h
new file mode 100755
index 0000000000..df1f50985f
--- /dev/null
+++ b/users/ericgebhart/oled_stuff.h
@@ -0,0 +1,24 @@
+#pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "quantum.h"
+#include "oled_driver.h"
+
+void oled_render_mod_lock_status(void);
+void oled_driver_render_logo(void);
+bool process_record_user_oled(uint16_t keycode, keyrecord_t *record);
diff --git a/users/ericgebhart/process_records.c b/users/ericgebhart/process_records.c
new file mode 100755
index 0000000000..c1036c7f07
--- /dev/null
+++ b/users/ericgebhart/process_records.c
@@ -0,0 +1,255 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "ericgebhart.h"
+#include "caps_word.h"
+#include "g/keymap_combo.h"
+
+__attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; }
+
+__attribute__((weak)) bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { return true; }
+
+
+uint16_t tap_taplong_timer;
+
+inline void tap_taplong(uint16_t kc1, uint16_t kc2, keyrecord_t *record) {
+  if (record->event.pressed) {
+    tap_taplong_timer = timer_read();
+  } else {
+    if (timer_elapsed(tap_taplong_timer) > TAPPING_TERM) {
+      tap_code16(kc2);
+    } else {
+      tap_code16(kc1);
+    }
+  }
+}
+
+/* for (){}[]""''<>``. tap for open. Hold for open and close, ending inbetween. */
+/* Assumes a one character length.                                              */
+inline void open_openclose(uint16_t kc1, uint16_t kc2, keyrecord_t *record) {
+  if (record->event.pressed) {
+    tap_taplong_timer = timer_read();
+  }else{
+    if (timer_elapsed(tap_taplong_timer) > TAPPING_TERM) {
+      tap_code16(kc1);
+      tap_code16(kc2);
+      tap_code16(KC_LEFT);
+    } else {
+      tap_code16(kc1);
+    }
+  }
+}
+
+// Defines actions for my global custom keycodes. Defined in ericgebhart.h file
+// Then runs the _keymap's record handier if not processed here
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  // If console is enabled, it will print the matrix position and status of each key pressed
+
+#ifdef OLED_ENABLE
+  process_record_user_oled(keycode, record);
+#endif  // OLED
+
+  if (!process_caps_word(keycode, record)) { return false; }
+
+  if (process_record_keymap(keycode, record) && process_record_secrets(keycode, record)) {
+    switch (keycode) {
+
+      // Handle the key translations for Dvorak on bepo. It's best if these are the first
+      // enums after SAFE_RANGE.
+    case DB_1 ... BB_QUOT:
+      if(record->event.pressed)
+        send_keycode(keycode);
+      unregister_code(keycode);
+      break;
+
+      // Set the default layer. eeprom if shifted.
+    case KC_DVORAK ... KC_BEPO:
+      if (record->event.pressed) {
+        uint8_t mods = mod_config(get_mods() | get_oneshot_mods());
+        if (!mods) {
+          default_layer_set(1UL << (keycode - KC_DVORAK));
+        } else if (mods & MOD_MASK_SHIFT) {
+          set_single_persistent_default_layer(1UL << (keycode - KC_DVORAK));
+        }
+      }
+      break;
+
+
+    case KC_RESET: // Custom RESET code
+      if (!record->event.pressed) {
+        reset_keyboard();
+      }
+      return false;
+      break;
+
+    case KC_SPACETEST:  // test something.
+      // default_layer_set(1UL << _BEAKL);
+      // tap_code16(LSFT(KC_SPACE));
+      break;
+
+
+      // tap or long tap for different key.
+    case KC_CCCV:  // One key copy/paste
+      tap_taplong(LCTL(KC_C), LCTL(KC_V), record);
+      break;
+
+    case BP_CCCV:  // One key copy/paste
+      tap_taplong(LCTL(BP_C), LCTL(BP_V), record);
+      break;
+
+    case KC_CTCN:  // New TaB/Window
+      tap_taplong(LCTL(KC_T), LCTL(KC_N), record);
+      break;
+
+    case BP_CTCN:  // New TaB/Window
+        tap_taplong(LCTL(BP_T), LCTL(BP_N), record);
+        break;
+
+    case KC_CWCQ:  // Close Tab-window/Quit
+      tap_taplong(LCTL(KC_W), LCTL(KC_Q), record);
+      break;
+
+    case BP_CWCQ:  // Close Tab-window/Quit
+      tap_taplong(LCTL(BP_W), LCTL(BP_Q), record);
+      break;
+
+    case KC_XM_PORD:  // Xmonad scratch pads or desktop
+      tap_taplong(LGUI(KC_E), LGUI(KC_T), record);
+      break;
+
+    case BP_XM_PORD:  // Xmonad scratch pads or desktop
+      tap_taplong(LGUI(BP_E), LGUI(BP_T), record);
+      break;
+
+
+      // Open on tap and Open with close and back arrow on hold.
+    case KC_OCPRN:
+      open_openclose(KC_LPRN, KC_RPRN, record);
+      break;
+
+    case BP_OCPRN:
+      open_openclose(DB_LPRN, DB_RPRN, record);
+      break;
+
+    case KC_OCBRC:
+      open_openclose(KC_LBRC, KC_RBRC, record);
+      break;
+
+    case BP_OCBRC:
+      open_openclose(KC_RBRC, KC_LBRC, record);
+      break;
+
+    case KC_OCCBR:
+      open_openclose(KC_LCBR, KC_RCBR, record);
+      break;
+
+    case BP_OCCBR:
+      open_openclose(BP_LCBR, BP_RCBR, record);
+      break;
+
+    case KC_OCDQUO:
+      open_openclose(KC_DQUO, KC_DQUO, record);
+      break;
+
+    case BP_OCDQUO:
+      open_openclose(BP_DQUO, BP_DQUO, record);
+      break;
+
+    case KC_OCQUOT:
+      open_openclose(KC_QUOT, KC_QUOT, record);
+      break;
+
+    case BP_OCQUOT:
+      open_openclose(BP_QUOT, BP_QUOT, record);
+      break;
+
+    case KC_OCGRV:
+      open_openclose(KC_GRAVE, KC_GRAVE, record);
+      break;
+
+    case BP_OCGRV:
+      open_openclose(BP_GRV, BP_GRV, record);
+      break;
+
+    case KC_OCLTGT:
+      open_openclose(KC_LT, KC_GT, record);
+      break;
+
+    case BP_OCLTGT:
+      open_openclose(BP_LDAQ, BP_RDAQ, record);
+      break;
+
+
+      //Turn shift backspace into delete.
+      /* case KC_BSPC: */
+      /*   { */
+      /*     // Initialize a boolean variable that keeps track */
+      /*     // of the delete key status: registered or not? */
+      /*     static bool delkey_registered; */
+      /*     if (record->event.pressed) { */
+      /*       uint8_t mod_state = get_mods(); */
+      /*       // Detect the activation of either shift keys */
+      /*       if (mod_state & MOD_MASK_SHIFT) { */
+      /*         // First temporarily canceling both shifts so that */
+      /*         // shift isn't applied to the KC_DEL keycode */
+      /*         del_mods(MOD_MASK_SHIFT); */
+      /*         register_code(KC_DEL); */
+      /*         // Update the boolean variable to reflect the status of KC_DEL */
+      /*         delkey_registered = true; */
+      /*         // Reapplying modifier state so that the held shift key(s) */
+      /*         // still work even after having tapped the Backspace/Delete key. */
+      /*         set_mods(mod_state); */
+      /*         return false; */
+      /*       } */
+      /*     } else { // on release of KC_BSPC */
+      /*       // In case KC_DEL is still being sent even after the release of KC_BSPC */
+      /*       if (delkey_registered) { */
+      /*         unregister_code(KC_DEL); */
+      /*         delkey_registered = false; */
+      /*         return false; */
+      /*       } */
+      /*     } */
+      /*     // Let QMK process the KC_BSPC keycode as usual outside of shift */
+      /*     return true; */
+      /*   } */
+
+
+#ifdef UNICODE_ENABLE
+    case UC_FLIP:  // (ノಠ痊ಠ)ノ彡┻━┻
+      if (record->event.pressed) {
+        send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
+      }
+      break;
+    case UC_TABL:  // ┬─┬ノ( º _ ºノ)
+      if (record->event.pressed) {
+        send_unicode_string("┬─┬ノ( º _ ºノ)");
+      }
+      break;
+    case UC_SHRG:  // ¯\_(ツ)_/¯
+      if (record->event.pressed) {
+        send_unicode_string("¯\\_(ツ)_/¯");
+      }
+      break;
+    case UC_DISA:  // ಠ_ಠ
+      if (record->event.pressed) {
+        send_unicode_string("ಠ_ಠ");
+      }
+      break;
+#endif
+    }
+  }
+  return true;
+}
diff --git a/users/ericgebhart/readme.md b/users/ericgebhart/readme.md
old mode 100644
new mode 100755
index cd57735c2c..4a081bd344
--- a/users/ericgebhart/readme.md
+++ b/users/ericgebhart/readme.md
@@ -1,124 +1,212 @@
 Overview
 ========
 
-This is my personal userspace.  Most of my code exists here. I only have one keymap, and that
-is for an ergodox_ez.  There are a lot of layers, 7 of them are default layers. I primarily use 
-dvorak and Bepo. I've been using emacs in vi mode for over 23 years. I also us Xmonad as my 
-window manager, additionally I've been using a Kinesis advantage keyboard in dvorak for over 20
-years.  All of those things tend to color the layouts I have. 
+Warning: dvorak touch typist, that uses qwerty and bepo locales on my
+computer.  40+ years of vi, 30 years of vi in Emacs.
 
-The Bepo layer needs some love.  It is true to the layout at Bepo.fr, but I find it a little
-cumbersome, and I miss some of my favorite keys.
+Recent years I have gone minimal, I don't use most of the keys on my ergodox,
+or original edition dactyl. These maps work great on large and small keyboards,
+my preference seems to be 40% split ergo keyboards like the corne.
 
-There are 2 dvorak layers, one for a qwerty OS keyboard, and one for a Bepo OS keyboard. 
-There is a symbol/keypad layer for bepo and qwerty. And of course there is a mouse/media layer.  
-There are 2 Xmonad layers one for qwerty and one for Bepo. Layer selection happens automatically 
-based on your current default layer.  I use 2 tap dance keys for layer selection.
+I think that what is special here is the layouts. I don't worry too
+much about leds, or RGB, although I do like oled.  But really its mod_layer.h,
+all the simple layer chunks and definitions, and the ability to apply that
+to any keyboard with minimal effort. The other thing is the example it
+provides for defining keymaps based on different OS locales. I use both
+dvorak on Qwerty, and bepo/dvorak on bepo.  That means I must change my
+locale on my OS to match my keyboard which can do qwerty or bepo locales.
 
-There are also Qwerty, Colemak, Workman and Norman layers for qwerty.
+It is possible, as I do, to send a keycode invoking xmonad, to execute my
+qwerty - bepo switch on my computer. 
 
+Besides using dvorak, another thing that colors my keyboard code is that I 
+have used the kinesis
+advantage for for more than 2 decades. I have used the ergodox ez for several years 
+as well, so the evolution of my keymaps starts there with space, enter, backspace 
+and delete keys on the thumbs.
 
-Keyboard Layout Templates
--------------------------
+Layouts
+-----------
+This evolved from the old layout...wrapper code. Calling everything a wrapper seems
+silly. So I took a step back. 
 
-I borrowed the idea for the keyboard defines and some of the definitions from @drashna. 
-I think it is an awesome idea, It makes consistency between layout definitions so much easier.
-@drashna had this to say about it.
+Also, with all these layers it was a real pain to apply mods consistently and 
+easily. So I changed the way I use keymap macro wrappers and added in my own
+mod layer. The only thing it has is the mods to apply. No more editing keymaps
+to apply mods.  I do it once, and it works everywhere I want.
 
+All layouts, almost, boil down to a 3x5 x 2 matrix. Bepo is 3x6. Mostly, I want 
+my controls to stay the same. As we have been conditioned, these are the keys on 
+the edges, or middle. Not that they can't change but I don't usually change them
+much, except the side edges, - the extra pinky columns.
+the F keys, the columns to the left and right and the row on the bottom. 
+Thumb keys if you have them. Even the number row is practically the same.
 
-This borrows from @jola5's "Not quite neo" code.  This allows me to maintain blocks of keymaps in the userspace, so that I can modify the userspace, and this is reflected in all of the keyboards that use it, at once. 
+With that in mind, reducing my layouts to 3x10 or 12 matrices would be great.
+At the same time extracting my mods so they are easy to apply to any matrix.
+So that's what is here. 
 
-This makes adding tap/hold mods, or other special keycodes or functions to all keyboards super easy, as it's done to all of them at once. 
+At the bottom is the LAYOUT, needed by the keeb you have. Then I have my Layouts
+to feed it with my ROWS macros which are my MOD layer. At the end of it all,
+I give a 3x10 or 12 to a layout and I have a complete keyboard definition.
+Creating a new keyboard map is super simple.
 
-The caveat here is that the keymap needs a processor/wrapper, as it doesn't like the substitutions.  However, this is as simple as just pushing it through a define. For instance: 
+  * mod_layer.h is the place for home row mods or any other mods.
+  * layouts.h is where I define a new matrix using the ROW macros when I need one. 
+  * core_keys.h - where I define my custom keys. Ya know, the big enum.
+  * altlocal_keys.c - Alternate key/shift keys for emulation on other locales.
+  * core_keysets.h - Base layers; qwerty, dvorak, beakl, colemak, norman, carplax...
+  * edge_keys.h - defines the edges and bottom/thumb keys of a keyboard.
+  * layers.h - defines actual layers for navigation, symbols, keypad, layers, top rows, etc.
 
-`#define LAYOUT_ergodox_wrapper(...)   LAYOUT_ergodox(__VA_ARGS__)`
+Process_records.c
+--------------------
+This is where the keycodes are processed...
 
-Once that's been done and you've switched the keymaps to use the "wrapper", it will read the substitution blocks just fine. 
+Custom keys
+-------------------
+I have a lot of custom keys because of bepo. It is somewhat confusing this interaction
+between a keyboard and the software that receives it.
 
-Credit goes to @jola5 for first implementing this awesome idea.
+A lot of my pain is invoked by my desire to have dvorak on bepo. Which works just fine,
+although an english/cyrillic situation may not work so well. Currently I have
+dvorak and beakl on bepo in addition to bepo it's self. 
 
+Alternate keycodes for emulating a layout on another locale/language.
+-----------------------------
+Because of wanting dvorak and beakl on bepo there was the necessity to create keys
+from keycodes which were not combined. For this I have a special function that
+takes a keycode and gives a proper shifted character for it. It is only a 2 keycode
+definition, but it does the basic non-shifted and shifted characters as you define them.
 
-Custom Keycodes
----------------
+Combos/Chords
+----------------------------
+This is recently new to me. I'm using them on my thumb keys which are all LT's.
+the combos allow for layer locking for the Nav layer, and a oneshot for symbols 
+among other things.
 
-Keycodes are defined in the ericgebhart.h file and need to be included in the keymap.c files, so that they can be used there.  The keymap.c file has very little in it, the most important thing to see there are the keys that are at the ends of each row, ie. the 1st and last key on each row is defined there.
-Everything else is in ericgebhart.h.
+I followed the simple example at the end of the doc than uses the 
+combos.def file to define the combos.
 
-Layer Indication
-----------------
+Tap-mods
+-------------------------------------
+I had been using MT on my thumbs for GUI,CTRL,ALT on hold along with 
+Escape, Enter, space and backspace, my thumb keys. I then added shift to my home row pinky key.
+I had layer shifts to symbols, numbers, navigation all on the home row of both hands.
+It worked nicely but choppy I think, switching hands for the holder of the layer is
+a little like having no caps lock. It was a lot of work adding them to all my maps.
+This is what prompted my mod_layer.  So much easier. No maps to modify.
 
-The ergodox_ez only has 3 leds, layer indication is pretty lame.
-Currently the first led lights up if the default layer is not qwerty.  The symbol and media layers get
-the other 2 leds,  and all the leds light up if you are on the "layers" layer.
-I hope I can figure out how to make it better, but I just don't see a way with 3 leds and 11 layers.
+Then I moved to all home row mods with layers on my thumb keys.
 
+This does allow for more rolls, and I have found chord/rolls simply from having my
+xmonad controls be GUI-some-home-row-key-or-close. When Gui is your index finger,
+everything gets easier. 
 
-BEPO vs Qwerty Layers
+Somewhere along the way I got a corne, and everything had to be small. and I realized
+that everything really was small. My layers are blending back, with LTs near the
+home row, and all the thumbs. On my dactyl I currently have 8 thumb keys per thumb, 
+I don't know what to do with them all. Remembering a time I thought that would be 
+awesome.
+
+### tap_taplong and open_openclose
+In process_records.c I have a nice couple of functions,
+tap_taplong(), and open_openclose() for my non MT/LT functionality.
+
+  * I have home row mods for Shift, Ctrl, Alt, and Gui on both hands.
+  * I have a number of LT mods to raise layers nearby. Nav, toprows, symbol, keypad
+ are on both hands on the first and third rows around home row.
+  * Xmonad tap_taplong to pull up desktops or terminals with tap or hold.
+  * C-c/C-v, C-t/C-n, C-w/C-q are all on my Navigation layer as custom keys with tap_taplong.
+  * My thumbs are Enter/space and Esc/backspace which are also Navigation and toprows and symbol layers.  They used to be GUI,CTRL,ALT,SFT. but all that's on the home row now.
+  * All of the paired characters on my symbol layer have a hold which closes them, and moves the cursor back between.
+
+### caps word
+Holding both pinkies on home row for double tapping term, is effectively 
+right-shift and left-shift, invokes caps-word. The next word will be capitalized. 
+It continues until it shouldn't.
+
+BEPO vs Qwerty Locale/language/Layers
 ---------------------
+Essentially they are different keycode sets. So anything that needs them, causes a layer.
+So there are two symbol layers, two toprows layers, two keypad layers. 
+One for Qwerty and one for bepo. The Navigation layer is not affected.
 
-There are 7 base layers. Dvorak, qwerty, Colemak, Workman, and Norman work on a Qwerty software layer on the OS.  Dvorak_on_bepo and Bepo both work on a Bepo software layer on the os.
-Dvorak on qwerty is the default.  There is a function in ericgebhart.c which will allow the keyboard
-to persist it's default layer through power down. It is currently commented out.
+I only have bepo, dvorak and beakl on bepo.  There are a bunch for Qwerty.
+I have a ton of basic layers. I'm most interested in beakl at the moment, but I've used Dvorak for more than 20 years. There is also qwerty, colemak, norman, carplax, etc.
 
-I don't actually use Qwerty, but it seemed like I should have it,
-@drashna had it along with Colemak, Workman and Norman so I added them
-to my existing dvorak and bepo definitions.
+The navigation/mouse layer is not affected by bepo/qwerty, but symbols and numbers are. 
+There are bepo versions of everything that needs it.
 
-There are two tap dance functions that allow switching the default layers
-and the overlay layers.
+Navigation Layer
+-----------------------
+I do not use a mouse. I use Xmonad as my window manager, and I have
+practically no use for one.  They are necessary however. So I have
+a Navigation layer which is all mouse, arrows, home, end, tab, page
+up, down,  5 mouse buttons and so on. 
+This layer is not affected by bepo/qwerty, but symbols and numbers are. 
+There are bepo versions of everything that needs it.
 
-The default layers switch according to the current OS keyboard of the current Default layer.
-Shifting the key, causes the selection to use the other OS keyboard selections. ie,
-if you are on qwerty, you get dvorak, qwerty, colemak, workman and norman. If you shift it you get 
-dvorak on bepo and bepo.  If you are not on qwerty the unshifted taps get dvorak and bepo on bepo.
+Arrow combos work just fine, in emacs I use SFT(arrows) to move between windows.
+To do this; shift is my left pinky home, Nav is right thumb Enter, and one of the four
+home keys of my left hand are the arrows. Home row mods allow this to work well.
 
-The other tap dance for layers is for the symbol, mouse and layers layers.  The layers layer is just a
-safety layer, knowing I can get to if I screw something up...
+I don't use the arrows on the dactyl and kinesis, even though they are there.
+
+Symbol Layer
+-------------------
+The symbol layer is based on the Beakl15 symbol layer.
+The beakl symbol layer is intuitive and fairly easy to remember. There are 3 versions.
+The original, an extended called A, and an extended and enhanced for vi, called B.
+The primary purpose of the extension was to provide keys which might not be available
+elsewhere on the default layer. B, takes this further and moves :/? to better places.
+
+TopRows Layer
+--------------------
+I think, truly this is the layer that makes tiny keyboards accessible in the beginning.
+This is basically the number row, the shifted number row and the function key row.
+I have them so it is numbers on the home row, shifted keys above and functions below.
+There are multiple choices, I currently use the beakl number row, with everything 
+else as you would expect. 
+
+Keypad Layer
+--------------
+There are several variations of keypads and function key pads in various sizes. 
+Currently I am using a Beakl Keypad on the left hand and 3x4 funcpad on the right.
+
+OLED
+--------------------
+It shows the basic stuff I could find in most places. The 
+default layer, the current layer, the mods, the locks, the last key pressed, and
+a map of the current layer as simply as possible. I'm sure there is more that could
+be done. @Drashna has some fancy stuff. If the display is big enough, there is even 
+a display of the current layer's keymap.  
 
 XMonad
 ---------------------
+I use xmonad. Gui is my hot key for that.  With home row mods I have home
+row chords which give me access to my desktops, my scratchpads/terminals,
+custom key KC_XM_PORD, among others. It sometimes feels that I am playing
+an instrument when I invoke xmonad to do something.
 
-Additionally there is an advanced tap dance called XMONAD_ESC. One tap is Escape, tap and hold is
-LGUI with the proper XMONAD layer, it is essentially dvorak, for the
-given OS layer.  2 taps is Shift lgui with xmonad, and 2 taps and hold
-is Control LGUI with Xmonad.  This allows for the finger patterns for
-Xmonad to remain the same regarless of the keyboard in use.  The hold
-versions allow for secondary menu selection in Xmonad, the 2 tap function
-must be for a key that is in the top level keymap of Xmonad.  This is how
-many people use xmonad so it's not a real problem.  There are plenty of
-keys combinations to choose from with these choices. The function can
-be expanded to 3 taps and 3 tap and hold, and on and on....
+I had an xmonad layer at one time, it was basically dvorak, I would invoke it
+with a GUI mod, so that even on bepo, or colemak, my xmonad commands remain the same.
 
-I have a few other special keys,  for momentary symbols or shift on the home row of each hand.
+I'm going to need to revisit that, as things are, all the commands move when I change
+to a different default layer from dvorak.
+
+Combo's can alleviate some of this pain. More to play with.
 
-Also, after using a kinesis for many years I'm very accustomed to the
-space, enter, backspace and delete keys on the thumbs.  I've added control
-and alt as a secondary function. These are also the Control and Alt keys
-if held down.
 
 Tap Dance
 --------------------
-
-Additionally there are other tap dance functions,  tab-backtab,  home-end as well as I few I'm not actually using.
-
-Building  and flashing
------------------------
-
-```make ergodox_z:ericgebhart```   will compile the code.
-
-I use the teensy-loader cli  so that's all I know. There is a script here called flash_ergodox
-
-Use it like this, 
-
-```flash-ergodox <path to your hex file>```
-
-then use a paperclip to push the reset button on your keyboard.
+I have a lot of tap dance, It's turned off. It's big. tap-hold works pretty well most of the time, instead.
+My favorites were tab-backtab,  home-end.
 
 Switching the OS keyboard
 -------------------------
-
 This varies from system to system.  I use Arch Linux, so I use ```setxkbmap```.
 I've included a helper script which makes it easy to switch between EN and FR Bepo,
-called switch-kbd.
+called switch-kbd. In xmonad I invoke this with a keystroke. so, same deal. just map
+the keystroke to a key.
 
diff --git a/users/ericgebhart/rules.mk b/users/ericgebhart/rules.mk
index 698f6131ed..8afaeb7808 100755
--- a/users/ericgebhart/rules.mk
+++ b/users/ericgebhart/rules.mk
@@ -1,14 +1,34 @@
 SRC += ericgebhart.c
+SRC += tap_dances.c
+SRC += process_records.c
+SRC += caps_word.c
+SRC += altlocal_keys.c
+
+VPATH += keyboards/gboards
+
+OLED_ENABLE = yes
+
+ifeq ($(strip $(OLED_ENABLE)), yes)
+        SRC += $(USER_PATH)/oled_stuff.c
+endif
+
 
 MOUSEKEY_ENABLE  = yes # Mouse keys
 EXTRAKEY_ENABLE  = yes # Audio control and System control
 COMMAND_ENABLE   = no # Commands for debug and configuration
-NKRO_ENABLE      = no # USB Nkey Rollover - for issues, see github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE      = no # Enable N-Key Rollover
 SWAP_HANDS_ENABLE= no # Allow swapping hands of keyboard
-KEY_LOCK_ENABLE  = yes # Enable the KC_LOCK key
-TAP_DANCE_ENABLE = yes # Enable the tap dance feature.
+KEY_LOCK_ENABLE  = no # Enable the KC_LOCK key
+TAP_DANCE_ENABLE = no # Enable the tap dance feature.
 CONSOLE_ENABLE   = no  # Console for debug
 
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = no  # Enable Bootmagic Lite
 UNICODE_ENABLE   = no
 SLEEP_LED_ENABLE = no
+
+LTO_ENABLE = yes
+
+SPACE_CADET_ENABLE = no
+GRAVE_ESC_ENABLE = no
+MAGIC_ENABLE = no
+COMBO_ENABLE = yes
diff --git a/users/ericgebhart/tap_dances.c b/users/ericgebhart/tap_dances.c
new file mode 100755
index 0000000000..9f344986aa
--- /dev/null
+++ b/users/ericgebhart/tap_dances.c
@@ -0,0 +1,269 @@
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifdef TAP_DANCES_ENABLE
+
+#include "tap_dances.h"
+
+#include "action.h"
+#include "action_layer.h"
+#include "process_keycode/process_tap_dance.h"
+
+void tap_dance_mouse_btns (qk_tap_dance_state_t *state, void *user_data) {
+    switch(state->count){
+    case 1:
+        register_code(KC_BTN1);
+        break;
+    case 2:
+        register_code(KC_BTN2);
+        break;
+    case 3:
+        register_code(KC_BTN3);
+        break;
+    case 4:
+        register_code(KC_BTN4);
+        break;
+    case 5:
+        register_code(KC_BTN5);
+        break;
+    default:
+        break;
+    }
+    reset_tap_dance(state);
+}
+
+// counting on all the qwerty layers to be less than dvorak_on_bepo
+int on_qwerty(){
+    uint8_t deflayer = (biton32(default_layer_state));
+    return (deflayer < _DVORAK_BP);
+}
+
+static void switch_default_layer(uint8_t layer) {
+  default_layer_set(1UL<<layer);
+  clear_keyboard();
+}
+
+// so the keyboard remembers which layer it's in after power disconnect.
+/*
+  uint32_t default_layer_state_set_kb(uint32_t state) {
+  eeconfig_update_default_layer(state);
+  return state;
+  }
+*/
+
+void tap_dance_df_bepo_layers_switch (qk_tap_dance_state_t *state, void *user_data) {
+  switch(state->count){
+  case 1:
+    switch_default_layer(_DVORAK_BP);
+    break;
+  case 2:
+    switch_default_layer(_BEPO);
+    break;
+  case 3:
+    layer_invert(_LAYERS);
+    break;
+  default:
+    break;
+  }
+  reset_tap_dance(state);
+}
+
+void tap_dance_layer_switch (qk_tap_dance_state_t *state, void *user_data) {
+  switch(state->count){
+  case 1:
+    if(on_qwerty())
+      layer_invert(_SYMB);
+    else
+      layer_invert(_SYMB_BP);
+    break;
+  case 2:
+    layer_invert(_NAV);
+    break;
+  case 3:
+    layer_invert(_LAYERS);
+    break;
+  case 4:
+    if(on_qwerty())
+      layer_invert(_KEYPAD);
+    else
+      layer_invert(_KEYPAD_BP);
+    break;
+  default:
+    break;
+  }
+  reset_tap_dance(state);
+}
+
+void tap_dance_default_layer_switch (qk_tap_dance_state_t *state, void *user_data) {
+    switch(state->count){
+    case 1:
+      switch_default_layer(_DVORAK);
+      break;
+    case 2:
+      switch_default_layer(_DVORAK_BP);
+      break;
+    case 3:
+      switch_default_layer(_BEPO);
+      break;
+    default:
+        break;
+    }
+    reset_tap_dance(state);
+}
+
+// switch the default layer to another qwerty based layer.
+void switch_default_layer_on_qwerty(int count) {
+    switch(count){
+    case 1:
+      switch_default_layer(_DVORAK);
+      break;
+    case 2:
+      switch_default_layer(_QWERTY);
+      break;
+    case 3:
+      switch_default_layer(_COLEMAK);
+      break;
+
+      /* case 4: */
+      /*   switch_default_layer(_WORKMAN); */
+      /*   break; */
+      /* case 5: */
+      /*   switch_default_layer(_NORMAN); */
+      /*   break; */
+
+    default:
+      switch_default_layer(_DVORAK);
+      break;
+    }
+}
+
+// switch the default layer to another bepo based layer.
+void switch_default_layer_on_bepo(int count) {
+    switch(count){
+    case 1:
+      switch_default_layer(_DVORAK_BP);
+      break;
+    case 2:
+      switch_default_layer(_BEPO);
+      break;
+    default:
+      switch_default_layer(_DVORAK_BP);
+      break;
+    }
+}
+
+
+// tap to change the default layer. Distinguishes between layers that are based on
+// a qwerty software keyboard and a bepo software keyboard.
+// if shifted, choose layers based on the other software keyboard, otherwise choose only
+// layers that work on the current software keyboard.
+void tap_dance_default_os_layer_switch (qk_tap_dance_state_t *state, void *user_data) {
+    //uint8_t shifted = (get_mods() & MOD_BIT(KC_LSFT|KC_RSFT));
+    bool shifted = ( keyboard_report->mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)) );
+    int qwerty = on_qwerty();
+
+
+    // shifted, choose between layers on the other software keyboard
+    if(shifted){
+        if (qwerty)
+            switch_default_layer_on_bepo(state->count);
+        else
+            switch_default_layer_on_qwerty(state->count);
+
+        // not shifted, choose between layers on the same software keyboard
+    } else {
+        if (qwerty)
+            switch_default_layer_on_qwerty(state->count);
+        else
+            switch_default_layer_on_bepo(state->count);
+    }
+
+    reset_tap_dance(state);
+}
+
+
+/* Return an integer that corresponds to what kind of tap dance should be executed.
+ *
+ * How to figure out tap dance state: interrupted and pressed.
+ *
+ * Interrupted: If the state of a dance dance is "interrupted", that means that another key has been hit
+ *  under the tapping term. This is typically indicitive that you are trying to "tap" the key.
+ *
+ * Pressed: Whether or not the key is still being pressed. If this value is true, that means the tapping term
+ *  has ended, but the key is still being pressed down. This generally means the key is being "held".
+ *
+ * One thing that is currenlty not possible with qmk software in regards to tap dance is to mimic the "permissive hold"
+ *  feature. In general, advanced tap dances do not work well if they are used with commonly typed letters.
+ *  For example "A". Tap dances are best used on non-letter keys that are not hit while typing letters.
+ *
+ * Good places to put an advanced tap dance:
+ *  z,q,x,j,k,v,b, any function key, home/end, comma, semi-colon
+ *
+ * Criteria for "good placement" of a tap dance key:
+ *  Not a key that is hit frequently in a sentence
+ *  Not a key that is used frequently to double tap, for example 'tab' is often double tapped in a terminal, or
+ *    in a web form. So 'tab' would be a poor choice for a tap dance.
+ *  Letters used in common words as a double. For example 'p' in 'pepper'. If a tap dance function existed on the
+ *    letter 'p', the word 'pepper' would be quite frustating to type.
+ *
+ * For the third point, there does exist the 'DOUBLE_SINGLE_TAP', however this is not fully tested
+ *
+ */
+int cur_dance (qk_tap_dance_state_t *state) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed)  return SINGLE_TAP;
+        //key has not been interrupted, but they key is still held. Means you want to send a 'HOLD'.
+        else return SINGLE_HOLD;
+    }
+    else if (state->count == 2) {
+        /*
+         * DOUBLE_SINGLE_TAP is to distinguish between typing "pepper", and actually wanting a double tap
+         * action when hitting 'pp'. Suggested use case for this return value is when you want to send two
+         * keystrokes of the key, and not the 'double tap' action/macro.
+         */
+        if (state->interrupted) return DOUBLE_SINGLE_TAP;
+        else if (state->pressed) return DOUBLE_HOLD;
+        else return DOUBLE_TAP;
+    }
+    //Assumes no one is trying to type the same letter three times (at least not quickly).
+    //If your tap dance key is 'KC_W', and you want to type "www." quickly - then you will need to add
+    //an exception here to return a 'TRIPLE_SINGLE_TAP', and define that enum just like 'DOUBLE_SINGLE_TAP'
+    if (state->count == 3) {
+        if (state->interrupted || !state->pressed)  return TRIPLE_TAP;
+        else return TRIPLE_HOLD;
+    }
+    else return 8; //magic number. At some point this method will expand to work for more presses
+}
+
+//Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    //Tap once for Esc, twice for Caps Lock
+    [TD_ESC_CAPS]  = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS),
+    [TD_TAB_BKTAB] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, LSFT(KC_TAB)),
+    [TD_RIGHT_TAB] = ACTION_TAP_DANCE_DOUBLE(KC_RIGHT, KC_TAB),
+    [TD_LEFT_BACKTAB] = ACTION_TAP_DANCE_DOUBLE(KC_LEFT, LSFT(KC_TAB)),
+    [TD_UP_HOME] = ACTION_TAP_DANCE_DOUBLE(KC_UP, KC_HOME),
+    [TD_DOWN_END] = ACTION_TAP_DANCE_DOUBLE(KC_DOWN, KC_END),
+    [TD_MDIA_SYMB] = ACTION_TAP_DANCE_FN(tap_dance_layer_switch),
+    [TD_DVORAK_BEPO] = ACTION_TAP_DANCE_FN(tap_dance_df_bepo_layers_switch),
+    [TD_DEF_LAYER_SW] = ACTION_TAP_DANCE_FN(tap_dance_default_layer_switch),
+    [TD_DEF_OS_LAYER_SW] = ACTION_TAP_DANCE_FN(tap_dance_default_os_layer_switch),
+    [TD_HOME_END]  = ACTION_TAP_DANCE_DOUBLE(KC_HOME, KC_END),
+    [TD_MOUSE_BTNS] = ACTION_TAP_DANCE_FN(tap_dance_mouse_btns)
+
+};
+
+#endif
diff --git a/users/ericgebhart/tap_dances.h b/users/ericgebhart/tap_dances.h
new file mode 100755
index 0000000000..11978467a7
--- /dev/null
+++ b/users/ericgebhart/tap_dances.h
@@ -0,0 +1,19 @@
+#pragma once
+/*
+  Copyright 2018 Eric Gebhart <e.a.gebhart@gmail.com>
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "ericgebhart.h"

From fd4adbc0cc291a71a8f1e846f0b9b0bd81c1089e Mon Sep 17 00:00:00 2001
From: Ryan Smith <57497110+ryanstevensmith@users.noreply.github.com>
Date: Fri, 14 Jan 2022 04:42:11 +0000
Subject: [PATCH 303/867] [keyboard] Adding Atlas_65 (#15839)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/atlas_65/atlas_65.c                |  16 +++
 keyboards/atlas_65/atlas_65.h                |  42 ++++++
 keyboards/atlas_65/config.h                  | 130 +++++++++++++++++++
 keyboards/atlas_65/info.json                 |  82 ++++++++++++
 keyboards/atlas_65/keymaps/default/keymap.c  |  49 +++++++
 keyboards/atlas_65/keymaps/default/readme.md |   1 +
 keyboards/atlas_65/keymaps/via/keymap.c      |  49 +++++++
 keyboards/atlas_65/keymaps/via/rules.mk      |   2 +
 keyboards/atlas_65/readme.md                 |  26 ++++
 keyboards/atlas_65/rules.mk                  |  18 +++
 10 files changed, 415 insertions(+)
 create mode 100644 keyboards/atlas_65/atlas_65.c
 create mode 100644 keyboards/atlas_65/atlas_65.h
 create mode 100644 keyboards/atlas_65/config.h
 create mode 100644 keyboards/atlas_65/info.json
 create mode 100644 keyboards/atlas_65/keymaps/default/keymap.c
 create mode 100644 keyboards/atlas_65/keymaps/default/readme.md
 create mode 100644 keyboards/atlas_65/keymaps/via/keymap.c
 create mode 100644 keyboards/atlas_65/keymaps/via/rules.mk
 create mode 100644 keyboards/atlas_65/readme.md
 create mode 100644 keyboards/atlas_65/rules.mk

diff --git a/keyboards/atlas_65/atlas_65.c b/keyboards/atlas_65/atlas_65.c
new file mode 100644
index 0000000000..536d8edf71
--- /dev/null
+++ b/keyboards/atlas_65/atlas_65.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 Joshua Nguyen
+ *
+ * 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 "atlas_65.h"
diff --git a/keyboards/atlas_65/atlas_65.h b/keyboards/atlas_65/atlas_65.h
new file mode 100644
index 0000000000..c54140fd7d
--- /dev/null
+++ b/keyboards/atlas_65/atlas_65.h
@@ -0,0 +1,42 @@
+/* Copyright 2020 Joshua Nguyen
+ *
+ * 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"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define XXX KC_NO
+#define LAYOUT( \
+	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,           \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,           k2E, \
+	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,      k3E,  \
+	k40,      k42,      k44, k45, k46, k47,      k49,           k4C, k4D, k4E       \
+) \
+{ \
+	{ k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   XXX }, \
+	{ k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   k1E }, \
+	{ k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C,   XXX,   k2E }, \
+	{ k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   XXX,   k3D,   k3E }, \
+	{ k40,   XXX,   k42,   XXX,   k44,   k45,   k46,   k47,   XXX,   k49,   XXX,   XXX,   k4C,   k4D,   k4E } \
+}
diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h
new file mode 100644
index 0000000000..d96c2c3976
--- /dev/null
+++ b/keyboards/atlas_65/config.h
@@ -0,0 +1,130 @@
+/* Copyright 2020 Joshua Nguyen
+
+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       0x6565
+#define PRODUCT_ID      0x1000
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Joshua Nguyen
+#define PRODUCT         atlas_65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 { D0, D1, D2, D3, D5 }
+#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose 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
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/keyboards/atlas_65/info.json b/keyboards/atlas_65/info.json
new file mode 100644
index 0000000000..e95b25511c
--- /dev/null
+++ b/keyboards/atlas_65/info.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "atlas-65",
+    "url": "https://github.com/ryanstevensmith/atlas-65",
+    "maintainer": "Joshua Nguyen",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0, "w":2},
+                {"x":17.3, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1},
+                {"x":14.5, "y":1},
+                {"x":15.5, "y":1, "w":1.5},
+                {"x":17.3, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":2},
+                {"x":14.75, "y":2, "w":2.25},
+                {"x":17.3, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3},
+                {"x":13.25, "y":3},
+                {"x":14.25, "y":3, "w":1.75},
+                {"x":16.3, "y":3.25},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":3.25, "y":4, "w":1.5},
+                {"x":4.75, "y":4, "w":2},
+                {"x":6.75, "y":4, "w":1.25},
+                {"x":8.75, "y":4, "w":2.75},
+                {"x":11.5, "y":4, "w":1.5},
+                {"x":15.3, "y":4.25},
+                {"x":16.3, "y":4.25},
+                {"x":17.3, "y":4.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/atlas_65/keymaps/default/keymap.c b/keyboards/atlas_65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..55406a165f
--- /dev/null
+++ b/keyboards/atlas_65/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2020 Joshua Nguyen
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+    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_PGDN,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_LNUM,
+    KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI, KC_B,    KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
+  ) ,
+
+  [1] = LAYOUT(
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,   KC_F11,  KC_F12,  _______,
+    _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______,          _______,          _______, _______, _______, _______,          _______,                   _______, _______, _______
+  ) ,
+
+  [2] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______,          _______,          _______, _______, _______, _______,          _______,                   _______, _______, _______
+  ) ,
+  [3] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+    _______,          _______,          _______, _______, _______, _______,          _______,                   _______, _______, _______
+  )
+} ;
diff --git a/keyboards/atlas_65/keymaps/default/readme.md b/keyboards/atlas_65/keymaps/default/readme.md
new file mode 100644
index 0000000000..5086db264b
--- /dev/null
+++ b/keyboards/atlas_65/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for atlas-65
\ No newline at end of file
diff --git a/keyboards/atlas_65/keymaps/via/keymap.c b/keyboards/atlas_65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d519682cc9
--- /dev/null
+++ b/keyboards/atlas_65/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2020 Joshua Nguyen
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+    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_PGDN,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_LNUM,
+    KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI, KC_B,    KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
+  ) ,
+
+  [1] = LAYOUT(
+    KC_TRNS, 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_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+  ) ,
+
+  [2] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+  ) ,
+  [3] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+  )
+} ;
diff --git a/keyboards/atlas_65/keymaps/via/rules.mk b/keyboards/atlas_65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/atlas_65/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/atlas_65/readme.md b/keyboards/atlas_65/readme.md
new file mode 100644
index 0000000000..3bc401db39
--- /dev/null
+++ b/keyboards/atlas_65/readme.md
@@ -0,0 +1,26 @@
+
+# atlas_65
+
+A version of an Alice Keyboard with a full sized backspace and an extra B key. 
+
+* Keyboard Maintainer: Joshua Nguyen
+* Hardware Supported: atlas-65 keyboards
+* Hardware Availability: Message Josh
+
+Make example for this keyboard (after setting up your build environment):
+
+    make atlas_65:default
+
+Flashing example for this keyboard:
+
+    make atlas_65:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
\ No newline at end of file
diff --git a/keyboards/atlas_65/rules.mk b/keyboards/atlas_65/rules.mk
new file mode 100644
index 0000000000..476cf49f27
--- /dev/null
+++ b/keyboards/atlas_65/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 61f0292f11abbfc2665e4bf6414fcd4352a46365 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 15 Jan 2022 01:46:47 +1100
Subject: [PATCH 304/867] Remove network drive mapping comment for WSL (#15871)

---
 util/qmk_install.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/util/qmk_install.sh b/util/qmk_install.sh
index 5f22ba0ad5..3f49bd255a 100755
--- a/util/qmk_install.sh
+++ b/util/qmk_install.sh
@@ -53,8 +53,6 @@ case $(uname -a) in
             echo "*                                                                              *"
             echo "* Please install the QMK Toolbox instead:                                      *"
             echo "*    https://github.com/qmk/qmk_toolbox/releases                               *"
-            echo "* Then, map your WSL filesystem as a network drive:                            *"
-            echo "*    \\\\\\\\wsl$\\<distro>                                                           *"
             echo "********************************************************************************"
             echo
         fi

From 9e92d8a9054329200661efbc92022af7c67675bb Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 15 Jan 2022 01:47:36 +1100
Subject: [PATCH 305/867] Make note of upper limit for `UC()` (#15870)

---
 docs/keycodes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/keycodes.md b/docs/keycodes.md
index ba06e1b8b6..84a6d456ba 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -763,7 +763,7 @@ See also: [Unicode Support](feature_unicode.md)
 
 |Key                   |Aliases  |Description                                                     |
 |----------------------|---------|----------------------------------------------------------------|
-|`UC(c)`               |         |Send Unicode code point `c`                                     |
+|`UC(c)`               |         |Send Unicode code point `c`, up to `0x7FFF`                     |
 |`X(i)`                |         |Send Unicode code point at index `i` in `unicode_map`           |
 |`XP(i, j)`            |         |Send Unicode code point at index `i`, or `j` if Shift/Caps is on|
 |`UNICODE_MODE_FORWARD`|`UC_MOD` |Cycle through selected input modes                              |

From ca0f922e073db9804ab0b55c62a43d81a957dce8 Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Sat, 15 Jan 2022 02:58:09 +0800
Subject: [PATCH 306/867] [Keyboard] Add Keychron_q1 rev_0101 and Keychron q2
 series (#15025)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com>
Co-authored-by: lokher <lokher@gmail.com>
Co-authored-by: Adam Karim <adam@akarsoft.com>
---
 keyboards/keychron/q1/config.h                |  11 +-
 keyboards/keychron/q1/q1.h                    |   5 +-
 .../q1/rev_0100/keymaps/default/keymap.c      |  95 +++++++----
 .../keychron/q1/rev_0100/keymaps/via/keymap.c | 109 ++++++++----
 keyboards/keychron/q1/rev_0101/config.h       |  37 +++++
 .../q1/rev_0101/keymaps/default/info.json     |  97 +++++++++++
 .../q1/rev_0101/keymaps/default/keymap.c      |  90 ++++++++++
 .../q1/rev_0101/keymaps/via/info.json         | 100 +++++++++++
 .../keychron/q1/rev_0101/keymaps/via/keymap.c | 131 +++++++++++++++
 .../keychron/q1/rev_0101/keymaps/via/rules.mk |   2 +
 keyboards/keychron/q1/rev_0101/readme.md      |   4 +
 keyboards/keychron/q1/rev_0101/rev_0101.c     | 156 ++++++++++++++++++
 keyboards/keychron/q1/rev_0101/rev_0101.h     |  52 ++++++
 keyboards/keychron/q1/rev_0101/rules.mk       |  22 +++
 .../q1/rev_0102/keymaps/default/keymap.c      |  87 ++++++----
 .../keychron/q1/rev_0102/keymaps/via/keymap.c | 109 ++++++++----
 keyboards/keychron/q1/rev_0102/rev_0102.c     |   3 +-
 keyboards/keychron/q2/chconf.h                |  30 ++++
 keyboards/keychron/q2/config.h                |  54 ++++++
 keyboards/keychron/q2/halconf.h               |  26 +++
 keyboards/keychron/q2/matrix.c                | 139 ++++++++++++++++
 keyboards/keychron/q2/mcuconf.h               |  27 +++
 keyboards/keychron/q2/q2.c                    |  33 ++++
 keyboards/keychron/q2/q2.h                    |  29 ++++
 keyboards/keychron/q2/readme.md               |  19 +++
 keyboards/keychron/q2/rev_0110/config.h       |  21 +++
 keyboards/keychron/q2/rev_0110/info.json      |  82 +++++++++
 .../q2/rev_0110/keymaps/default/keymap.c      |  94 +++++++++++
 .../keychron/q2/rev_0110/keymaps/via/keymap.c | 112 +++++++++++++
 .../keychron/q2/rev_0110/keymaps/via/rules.mk |   2 +
 keyboards/keychron/q2/rev_0110/readme.md      |   1 +
 keyboards/keychron/q2/rev_0110/rev_0110.c     |  17 ++
 keyboards/keychron/q2/rev_0110/rev_0110.h     |  35 ++++
 keyboards/keychron/q2/rev_0110/rules.mk       |  34 ++++
 keyboards/keychron/q2/rev_0111/config.h       |  28 ++++
 .../q2/rev_0111/keymaps/default/info.json     |  82 +++++++++
 .../q2/rev_0111/keymaps/default/keymap.c      |  94 +++++++++++
 .../q2/rev_0111/keymaps/via/info.json         |  84 ++++++++++
 .../keychron/q2/rev_0111/keymaps/via/keymap.c | 154 +++++++++++++++++
 .../keychron/q2/rev_0111/keymaps/via/rules.mk |   2 +
 keyboards/keychron/q2/rev_0111/readme.md      |   5 +
 keyboards/keychron/q2/rev_0111/rev_0111.c     |  31 ++++
 keyboards/keychron/q2/rev_0111/rev_0111.h     |  48 ++++++
 keyboards/keychron/q2/rev_0111/rules.mk       |  34 ++++
 keyboards/keychron/q2/rev_0112/config.h       |  21 +++
 keyboards/keychron/q2/rev_0112/info.json      |  83 ++++++++++
 .../q2/rev_0112/keymaps/default/keymap.c      |  94 +++++++++++
 .../keychron/q2/rev_0112/keymaps/via/keymap.c | 112 +++++++++++++
 .../keychron/q2/rev_0112/keymaps/via/rules.mk |   2 +
 keyboards/keychron/q2/rev_0112/readme.md      |   1 +
 keyboards/keychron/q2/rev_0112/rev_0112.c     |  17 ++
 keyboards/keychron/q2/rev_0112/rev_0112.h     |  36 ++++
 keyboards/keychron/q2/rev_0112/rules.mk       |  34 ++++
 keyboards/keychron/q2/rev_0113/config.h       |  28 ++++
 .../q2/rev_0113/keymaps/default/info.json     |  83 ++++++++++
 .../q2/rev_0113/keymaps/default/keymap.c      |  94 +++++++++++
 .../q2/rev_0113/keymaps/via/info.json         |  85 ++++++++++
 .../keychron/q2/rev_0113/keymaps/via/keymap.c | 154 +++++++++++++++++
 .../keychron/q2/rev_0113/keymaps/via/rules.mk |   2 +
 keyboards/keychron/q2/rev_0113/readme.md      |   5 +
 keyboards/keychron/q2/rev_0113/rev_0113.c     |  31 ++++
 keyboards/keychron/q2/rev_0113/rev_0113.h     |  48 ++++++
 keyboards/keychron/q2/rev_0113/rules.mk       |  34 ++++
 63 files changed, 3255 insertions(+), 136 deletions(-)
 create mode 100644 keyboards/keychron/q1/rev_0101/config.h
 create mode 100644 keyboards/keychron/q1/rev_0101/keymaps/default/info.json
 create mode 100644 keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q1/rev_0101/keymaps/via/info.json
 create mode 100644 keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q1/rev_0101/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q1/rev_0101/readme.md
 create mode 100644 keyboards/keychron/q1/rev_0101/rev_0101.c
 create mode 100644 keyboards/keychron/q1/rev_0101/rev_0101.h
 create mode 100644 keyboards/keychron/q1/rev_0101/rules.mk
 create mode 100644 keyboards/keychron/q2/chconf.h
 create mode 100644 keyboards/keychron/q2/config.h
 create mode 100644 keyboards/keychron/q2/halconf.h
 create mode 100644 keyboards/keychron/q2/matrix.c
 create mode 100644 keyboards/keychron/q2/mcuconf.h
 create mode 100644 keyboards/keychron/q2/q2.c
 create mode 100644 keyboards/keychron/q2/q2.h
 create mode 100644 keyboards/keychron/q2/readme.md
 create mode 100644 keyboards/keychron/q2/rev_0110/config.h
 create mode 100644 keyboards/keychron/q2/rev_0110/info.json
 create mode 100644 keyboards/keychron/q2/rev_0110/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q2/rev_0110/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q2/rev_0110/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q2/rev_0110/readme.md
 create mode 100644 keyboards/keychron/q2/rev_0110/rev_0110.c
 create mode 100644 keyboards/keychron/q2/rev_0110/rev_0110.h
 create mode 100644 keyboards/keychron/q2/rev_0110/rules.mk
 create mode 100644 keyboards/keychron/q2/rev_0111/config.h
 create mode 100644 keyboards/keychron/q2/rev_0111/keymaps/default/info.json
 create mode 100644 keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q2/rev_0111/keymaps/via/info.json
 create mode 100644 keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q2/rev_0111/readme.md
 create mode 100644 keyboards/keychron/q2/rev_0111/rev_0111.c
 create mode 100644 keyboards/keychron/q2/rev_0111/rev_0111.h
 create mode 100644 keyboards/keychron/q2/rev_0111/rules.mk
 create mode 100644 keyboards/keychron/q2/rev_0112/config.h
 create mode 100644 keyboards/keychron/q2/rev_0112/info.json
 create mode 100644 keyboards/keychron/q2/rev_0112/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q2/rev_0112/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q2/rev_0112/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q2/rev_0112/readme.md
 create mode 100644 keyboards/keychron/q2/rev_0112/rev_0112.c
 create mode 100644 keyboards/keychron/q2/rev_0112/rev_0112.h
 create mode 100644 keyboards/keychron/q2/rev_0112/rules.mk
 create mode 100644 keyboards/keychron/q2/rev_0113/config.h
 create mode 100644 keyboards/keychron/q2/rev_0113/keymaps/default/info.json
 create mode 100644 keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c
 create mode 100644 keyboards/keychron/q2/rev_0113/keymaps/via/info.json
 create mode 100644 keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
 create mode 100644 keyboards/keychron/q2/rev_0113/keymaps/via/rules.mk
 create mode 100644 keyboards/keychron/q2/rev_0113/readme.md
 create mode 100644 keyboards/keychron/q2/rev_0113/rev_0113.c
 create mode 100644 keyboards/keychron/q2/rev_0113/rev_0113.h
 create mode 100644 keyboards/keychron/q2/rev_0113/rules.mk

diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h
index 8107dd6251..de69b9e929 100644
--- a/keyboards/keychron/q1/config.h
+++ b/keyboards/keychron/q1/config.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x3434
 #define MANUFACTURER    Keychron
@@ -49,6 +48,11 @@
 /* Disable RGB lighting when PC is in suspend */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
+/* Allow VIA to edit lighting */
+#ifdef VIA_ENABLE
+#define VIA_QMK_RGBLIGHT_ENABLE
+#endif
+
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
@@ -97,3 +101,8 @@
 #define ENABLE_RGB_MATRIX_MULTISPLASH
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+/* Allow VIA to edit lighting */
+#ifdef VIA_ENABLE
+#define VIA_QMK_RGBLIGHT_ENABLE
+#endif
diff --git a/keyboards/keychron/q1/q1.h b/keyboards/keychron/q1/q1.h
index eb9a7d69a7..cf6d196213 100644
--- a/keyboards/keychron/q1/q1.h
+++ b/keyboards/keychron/q1/q1.h
@@ -18,9 +18,10 @@
 
 #include "quantum.h"
 
-
 #if   defined(KEYBOARD_keychron_q1_rev_0100)
 #    include "rev_0100.h"
+#elif defined(KEYBOARD_keychron_q1_rev_0101)
+#    include "rev_0101.h"
 #elif defined(KEYBOARD_keychron_q1_rev_0102)
 #    include "rev_0102.h"
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/default/keymap.c b/keyboards/keychron/q1/rev_0100/keymaps/default/keymap.c
index e000dd7dd7..d1f71e9da6 100644
--- a/keyboards/keychron/q1/rev_0100/keymaps/default/keymap.c
+++ b/keyboards/keychron/q1/rev_0100/keymaps/default/keymap.c
@@ -16,49 +16,74 @@
 
 #include QMK_KEYBOARD_H
 
-
 enum layers{
-  MAC_BASE,
-  MAC_FN,
-  WIN_BASE,
-  WIN_FN
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = SAFE_RANGE,
+    KC_LAUNCHPAD
 };
 
 #define KC_TASK LGUI(KC_TAB)
 #define KC_FLXP LGUI(KC_E)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_82(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
+        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_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-[MAC_BASE] = LAYOUT_ansi_82( 
-     KC_ESC,             KC_BRID,  KC_BRIU,  KC_F3,    KC_F4,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
-     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_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [MAC_FN] = LAYOUT_ansi_82(
+        KC_TRNS,            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_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_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),
 
-[MAC_FN] = LAYOUT_ansi_82( 
-     KC_TRNS,            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_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_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),
+    [WIN_BASE] = LAYOUT_ansi_82(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
+        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(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-[WIN_BASE] = LAYOUT_ansi_82( 
-     KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
-     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(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [WIN_FN] = LAYOUT_ansi_82(
+        KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_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)
+};
 
-[WIN_FN] = LAYOUT_ansi_82( 
-     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_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)
-
-};
\ No newline at end of file
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/via/keymap.c b/keyboards/keychron/q1/rev_0100/keymaps/via/keymap.c
index e000dd7dd7..1e6316782d 100644
--- a/keyboards/keychron/q1/rev_0100/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1/rev_0100/keymaps/via/keymap.c
@@ -16,7 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-
 enum layers{
   MAC_BASE,
   MAC_FN,
@@ -24,41 +23,85 @@ enum layers{
   WIN_FN
 };
 
-#define KC_TASK LGUI(KC_TAB)
-#define KC_FLXP LGUI(KC_E)
+enum custom_keycodes {
+    KC_MISSION_CONTROL = USER00,
+    KC_LAUNCHPAD,
+    KC_TASK,
+    KC_FLXP
+};
+
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_82(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
+        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_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-[MAC_BASE] = LAYOUT_ansi_82( 
-     KC_ESC,             KC_BRID,  KC_BRIU,  KC_F3,    KC_F4,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
-     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_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [MAC_FN] = LAYOUT_ansi_82(
+        KC_TRNS,            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_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_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),
 
-[MAC_FN] = LAYOUT_ansi_82( 
-     KC_TRNS,            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_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_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),
+    [WIN_BASE] = LAYOUT_ansi_82(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
+        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(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-[WIN_BASE] = LAYOUT_ansi_82( 
-     KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
-     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(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [WIN_FN] = LAYOUT_ansi_82(
+        KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_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)
+};
 
-[WIN_FN] = LAYOUT_ansi_82( 
-     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_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)
-
-};
\ No newline at end of file
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_TASK:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_TAB);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_TAB);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_FLXP:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_E);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_E);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q1/rev_0101/config.h b/keyboards/keychron/q1/rev_0101/config.h
new file mode 100644
index 0000000000..c127a3630a
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/config.h
@@ -0,0 +1,37 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID      0x0101
+#define DEVICE_VER      0x0100
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D3, D2, B3, B2, B1, B0 }
+#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 59
+#define DRIVER_2_LED_TOTAL 23
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Encoder used pins */
+#define ENCODERS_PAD_A { E6 }
+#define ENCODERS_PAD_B { B7 }
+
+/* Specifies the number of pulses the encoder registers between each detent */
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/default/info.json b/keyboards/keychron/q1/rev_0101/keymaps/default/info.json
new file mode 100644
index 0000000000..56bf48acc1
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/keymaps/default/info.json
@@ -0,0 +1,97 @@
+{
+    "keyboard_name": "Keychron Q1",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_ansi_82": {
+            "layout": [
+            {"label":"Esc", "x":0, "y":0},
+            {"label":"F1", "x":1.25, "y":0},
+            {"label":"F2", "x":2.25, "y":0},
+            {"label":"F3", "x":3.25, "y":0},
+            {"label":"F4", "x":4.25, "y":0},
+            {"label":"F5", "x":5.5, "y":0},
+            {"label":"F6", "x":6.5, "y":0},
+            {"label":"F7", "x":7.5, "y":0},
+            {"label":"F8", "x":8.5, "y":0},
+            {"label":"F9", "x":9.75, "y":0},
+            {"label":"F10", "x":10.75, "y":0},
+            {"label":"F11", "x":11.75, "y":0},
+            {"label":"F12", "x":12.75, "y":0},
+            {"label":"Delete", "x":14, "y":0},
+            {"label":"Mute", "x":15.25, "y":0},
+        
+            {"label":"~", "x":0, "y":1.25},
+            {"label":"!", "x":1, "y":1.25},
+            {"label":"@", "x":2, "y":1.25},
+            {"label":"#", "x":3, "y":1.25},
+            {"label":"$", "x":4, "y":1.25},
+            {"label":"%", "x":5, "y":1.25},
+            {"label":"^", "x":6, "y":1.25},
+            {"label":"&", "x":7, "y":1.25},
+            {"label":"*", "x":8, "y":1.25},
+            {"label":"(", "x":9, "y":1.25},
+            {"label":")", "x":10, "y":1.25},
+            {"label":"_", "x":11, "y":1.25},
+            {"label":"+", "x":12, "y":1.25},
+            {"label":"Backspace", "x":13, "y":1.25, "w":2},
+            {"label":"Page Up", "x":15.25, "y":1.25},
+            
+            {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+            {"label":"Q", "x":1.5, "y":2.25},
+            {"label":"W", "x":2.5, "y":2.25},
+            {"label":"E", "x":3.5, "y":2.25},
+            {"label":"R", "x":4.5, "y":2.25},
+            {"label":"T", "x":5.5, "y":2.25},
+            {"label":"Y", "x":6.5, "y":2.25},
+            {"label":"U", "x":7.5, "y":2.25},
+            {"label":"I", "x":8.5, "y":2.25},
+            {"label":"O", "x":9.5, "y":2.25},
+            {"label":"P", "x":10.5, "y":2.25},
+            {"label":"{", "x":11.5, "y":2.25},
+            {"label":"}", "x":12.5, "y":2.25},
+            {"label":"|", "x":13.5, "y":2.25, "w":1.5},
+            {"label":"Page Down", "x":15.25, "y":2.25},
+
+            {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+            {"label":"A", "x":1.75, "y":3.25},
+            {"label":"S", "x":2.75, "y":3.25},
+            {"label":"D", "x":3.75, "y":3.25},
+            {"label":"F", "x":4.75, "y":3.25},
+            {"label":"G", "x":5.75, "y":3.25},
+            {"label":"H", "x":6.75, "y":3.25},
+            {"label":"J", "x":7.75, "y":3.25},
+            {"label":"K", "x":8.75, "y":3.25},
+            {"label":"L", "x":9.75, "y":3.25},
+            {"label":":", "x":10.75, "y":3.25},
+            {"label":"\"", "x":11.75, "y":3.25},
+            {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+            {"label":"Home", "x":15.25, "y":3.25},
+            
+            {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+            {"label":"Z", "x":2.25, "y":4.25},
+            {"label":"X", "x":3.25, "y":4.25},
+            {"label":"C", "x":4.25, "y":4.25},
+            {"label":"V", "x":5.25, "y":4.25},
+            {"label":"B", "x":6.25, "y":4.25},
+            {"label":"N", "x":7.25, "y":4.25},
+            {"label":"M", "x":8.25, "y":4.25},
+            {"label":"<", "x":9.25, "y":4.25},
+            {"label":">", "x":10.25, "y":4.25},
+            {"label":"?", "x":11.25, "y":4.25},
+            {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+            {"label":"Up", "x":14.25, "y":4.5},
+            
+            {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+            {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+            {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+            {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+            {"label":"Alt", "x":10, "y":5.25},
+            {"label":"Fn", "x":11, "y":5.25},
+            {"label":"Ctrl", "x":12, "y":5.25},
+            {"label":"Left", "x":13.25, "y":5.5},
+            {"label":"Down", "x":14.25, "y":5.5},
+            {"label":"Right", "x":15.25, "y":5.5} ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c b/keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c
new file mode 100644
index 0000000000..92806bf9fe
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c
@@ -0,0 +1,90 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = SAFE_RANGE,
+    KC_LAUNCHPAD
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_82(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
+        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_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_ansi_82(
+        KC_TRNS,            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_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_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),
+
+    [WIN_BASE] = LAYOUT_ansi_82(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
+        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(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_ansi_82(
+        KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/via/info.json b/keyboards/keychron/q1/rev_0101/keymaps/via/info.json
new file mode 100644
index 0000000000..a921ee3e4c
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/keymaps/via/info.json
@@ -0,0 +1,100 @@
+{
+    "keyboard_name": "Keychron Q1",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+
+                {"label":"Mute", "x":15.25, "y":0, "w":0.75},
+                {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
+                {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
+
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"!", "x":1, "y":1.25},
+                {"label":"@", "x":2, "y":1.25},
+                {"label":"#", "x":3, "y":1.25},
+                {"label":"$", "x":4, "y":1.25},
+                {"label":"%", "x":5, "y":1.25},
+                {"label":"^", "x":6, "y":1.25},
+                {"label":"&", "x":7, "y":1.25},
+                {"label":"*", "x":8, "y":1.25},
+                {"label":"(", "x":9, "y":1.25},
+                {"label":")", "x":10, "y":1.25},
+                {"label":"_", "x":11, "y":1},
+                {"label":"+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Page Up", "x":15.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"{", "x":11.5, "y":2.25},
+                {"label":"}", "x":12.5, "y":2.25},
+                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Page Down", "x":15.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":":", "x":10.75, "y":3.25},
+                {"label":"\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"Home", "x":15.25, "y":3.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":"<", "x":9.25, "y":4.25},
+                {"label":">", "x":10.25, "y":4.25},
+                {"label":"?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Up", "x":14.25, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25},
+                {"label":"Fn", "x":11, "y":5.25},
+                {"label":"Ctrl", "x":12, "y":5.25},
+                {"label":"Left", "x":13.25, "y":5.5},
+                {"label":"Down", "x":14.25, "y":5.5},
+                {"label":"Right", "x":15.25, "y":5.5} ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c b/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1103f74427
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
@@ -0,0 +1,131 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = USER00,
+    KC_LAUNCHPAD
+};
+
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+#define KC_TASK G(KC_TAB)
+#define KC_FLXP G(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_all(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
+        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_LALT,  KC_LGUI,                                KC_SPC,   KC_VOLD,  KC_VOLU,            KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_all(
+        KC_TRNS,            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_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+
+    [WIN_BASE] = LAYOUT_all(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_MUTE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
+        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_VOLD,  KC_VOLU,            KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_all(
+        KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
+
+#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+
+#define ENCODERS 1
+static uint8_t  encoder_state[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = {{ 8, 5 }};
+static keypos_t encoder_ccw[ENCODERS]  = {{ 7, 5 }};
+
+void encoder_action_unregister(void) {
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index]) {
+            keyevent_t encoder_event = (keyevent_t) {
+                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
+                .pressed = false,
+                .time = (timer_read() | 1)
+            };
+            encoder_state[index] = 0;
+            action_exec(encoder_event);
+        }
+    }
+}
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = true,
+        .time = (timer_read() | 1)
+    };
+    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+}
+
+void matrix_scan_user(void) {
+    encoder_action_unregister();
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    return false;
+};
+
+#endif
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/via/rules.mk b/keyboards/keychron/q1/rev_0101/keymaps/via/rules.mk
new file mode 100644
index 0000000000..bee21da528
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/keychron/q1/rev_0101/readme.md b/keyboards/keychron/q1/rev_0101/readme.md
new file mode 100644
index 0000000000..d7693349be
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/readme.md
@@ -0,0 +1,4 @@
+# The ANSI variant of the Keychron Q1
+- Enable EC11 rotary encoder
+- Turn colckwise to increase volume and turn anti-colckwise to decrease volume
+- Press top right key pushbutton to mute
\ No newline at end of file
diff --git a/keyboards/keychron/q1/rev_0101/rev_0101.c b/keyboards/keychron/q1/rev_0101/rev_0101.c
new file mode 100644
index 0000000000..dd7f69529e
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/rev_0101.c
@@ -0,0 +1,156 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, C_1,    A_1,    B_1},
+    {0, C_3,    A_3,    B_3},
+    {0, C_4,    A_4,    B_4},
+    {0, C_5,    A_5,    B_5},
+    {0, C_6,    A_6,    B_6},
+    {0, C_7,    A_7,    B_7},
+    {0, C_8,    A_8,    B_8},
+    {0, C_9,    A_9,    B_9},
+    {0, C_10,   A_10,   B_10},
+    {0, C_11,   A_11,   B_11},
+    {0, C_12,   A_12,   B_12},
+    {0, C_13,   A_13,   B_13},
+    {0, C_14,   A_14,   B_14},
+    {0, C_15,   A_15,   B_15},
+    {0, C_16,   A_16,   B_16},
+
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_14,   D_14,   E_14},
+    {0, F_16,   D_16,   E_16},
+
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
+    {0, I_16,   G_16,   H_16},
+
+    {0, L_1,    J_1,    K_1},
+    {0, L_2,    J_2,    K_2},
+    {0, L_3,    J_3,    K_3},
+    {0, L_4,    J_4,    K_4},
+    {0, L_5,    J_5,    K_5},
+    {0, L_6,    J_6,    K_6},
+    {0, L_7,    J_7,    K_7},
+    {0, L_8,    J_8,    K_8},
+    {0, L_9,    J_9,    K_9},
+    {0, L_10,   J_10,   K_10},
+    {0, L_11,   J_11,   K_11},
+    {0, L_12,   J_12,   K_12},
+    {0, L_14,   J_14,   K_14},
+    {0, L_16,   J_16,   K_16},
+
+    {1, C_1,    A_1,    B_1},
+    {1, C_3,    A_3,    B_3},
+    {1, C_4,    A_4,    B_4},
+    {1, C_5,    A_5,    B_5},
+    {1, C_6,    A_6,    B_6},
+    {1, C_7,    A_7,    B_7},
+    {1, C_8,    A_8,    B_8},
+    {1, C_9,    A_9,    B_9},
+    {1, C_10,   A_10,   B_10},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_14,   A_14,   B_14},
+    {1, C_15,   A_15,   B_15},
+
+    {1, F_1,    D_1,    E_1},
+    {1, F_2,    D_2,    E_2},
+    {1, F_3,    D_3,    E_3},
+    {1, F_7,    D_7,    E_7},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_13,   D_13,   E_13},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+    {1, F_16,   D_16,   E_16}
+};
+
+led_config_t g_led_config = {
+    {
+        {   0,     NO_LED,  1,      2,      3,      4,      5,      6,      7,      8,      9,     10,     11,      12,     14   },
+        {  15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,      28,     29   },
+        {  30,     31,     32,     33,     34,     35,     36,     37,     38,     39,     40,     41,     42,      43,     44   },
+        {  45,     46,     47,     48,     49,     50,     51,     52,     53,     54,     55,     56,     71,      57,     58   },
+        {  59,     NO_LED, 60,     61,     62,     63,     64,     65,     66,     67,     68,     69,     80,      70,     13   },
+        {  72,     73,     74,     NO_LED, NO_LED, NO_LED, 75,     NO_LED, NO_LED, NO_LED, 76,     77,     78,      79,     81   }
+    },
+    {
+        {0, 0},          {30, 0}, {45, 0}, {60, 0}, {75, 0}, {90, 0}, {105, 0}, {120, 0}, {135, 0}, {150, 0}, {165, 0}, {180, 0}, {195, 0}, {210, 0}, {224, 0},
+        {0,13}, {15,13}, {30,13}, {45,13}, {60,13}, {75,13}, {90,13}, {105,13}, {120,13}, {135,13}, {150,13}, {165,13}, {180,13}, {195,13},           {224,13},
+        {0,26}, {15,26}, {30,26}, {45,26}, {60,26}, {75,26}, {90,26}, {105,26}, {120,26}, {135,26}, {150,26}, {165,26}, {180,26}, {195,26},           {224,26},
+        {0,39}, {15,39}, {30,39}, {45,39}, {60,39}, {75,39}, {90,39}, {105,39}, {120,39}, {135,39}, {150,39}, {165,39},           {195,39},           {224,39},
+        {0,52},          {30,52}, {45,52}, {60,52}, {75,52}, {90,52}, {105,52}, {120,52}, {135,52}, {150,52}, {165,52},           {195,52}, {210,52},
+        {0,64}, {15,64}, {30,64},                            {90,64},                               {150,64}, {165,64}, {180,64}, {195,64}, {210,64}, {224,64}
+    },
+    {
+        4,              4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,
+        4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,              4,
+        4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,              4,
+        4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,      4,              4,              4,
+        4,              4,      4,      4,      4,      4,      4,      4,      4,      4,      4,              4,      4,
+        4,      4,      4,                              4,                              4,      4,      4,      4,      4,      4
+    }
+};
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/keychron/q1/rev_0101/rev_0101.h b/keyboards/keychron/q1/rev_0101/rev_0101.h
new file mode 100644
index 0000000000..132003c4f1
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/rev_0101.h
@@ -0,0 +1,52 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define xxx KC_NO
+
+#define LAYOUT_all( \
+        K00,       K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, K0E, \
+        K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, \
+        K20, K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, \
+        K30, K31,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      K3E, \
+        K40,       K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K3C,      \
+        K50, K51,  K52,                K56, K57, K58,      K5A, K5B, K5C, K5D, K4C, K5E  \
+    ) { \
+        { K00, xxx,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E }, \
+        { K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D, K1E }, \
+        { K20, K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,  K2C, K2D, K2E }, \
+        { K30, K31,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,  K3C, K3D, K3E }, \
+        { K40, xxx,  K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,  K4C, K4D, K4E }, \
+        { K50, K51,  K52, xxx, xxx, xxx, K56, K57, K58, xxx, K5A, K5B,  K5C, K5D, K5E }  \
+    }
+#define LAYOUT_ansi_82( \
+        K00,       K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, K0E, \
+        K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, \
+        K20, K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, \
+        K30, K31,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      K3E, \
+        K40,       K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K3C,      \
+        K50, K51,  K52,                K56,                K5A, K5B, K5C, K5D, K4C, K5E  \
+    ) { \
+        { K00, xxx,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E }, \
+        { K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D, K1E }, \
+        { K20, K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,  K2C, K2D, K2E }, \
+        { K30, K31,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,  K3C, K3D, K3E }, \
+        { K40, xxx,  K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,  K4C, K4D, K4E }, \
+        { K50, K51,  K52, xxx, xxx, xxx, K56, xxx, xxx, xxx, K5A, K5B,  K5C, K5D, K5E }  \
+    }
diff --git a/keyboards/keychron/q1/rev_0101/rules.mk b/keyboards/keychron/q1/rev_0101/rules.mk
new file mode 100644
index 0000000000..8d2be4eb5d
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3733
\ No newline at end of file
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/default/keymap.c b/keyboards/keychron/q1/rev_0102/keymaps/default/keymap.c
index b4a7d64427..3d0a9e5c6f 100644
--- a/keyboards/keychron/q1/rev_0102/keymaps/default/keymap.c
+++ b/keyboards/keychron/q1/rev_0102/keymaps/default/keymap.c
@@ -16,7 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-
 enum layers{
   MAC_BASE,
   MAC_FN,
@@ -24,41 +23,67 @@ enum layers{
   WIN_FN
 };
 
+enum custom_keycodes {
+    KC_MISSION_CONTROL = SAFE_RANGE,
+    KC_LAUNCHPAD
+};
+
 #define KC_TASK LGUI(KC_TAB)
 #define KC_FLXP LGUI(KC_E)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_83(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-[MAC_BASE] = LAYOUT_iso_83( 
-     KC_ESC,             KC_BRID,  KC_BRIU,  KC_F3,    KC_F4,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
-     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [MAC_FN] = LAYOUT_iso_83(
+        KC_TRNS,            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_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
+        KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 
-[MAC_FN] = LAYOUT_iso_83( 
-     KC_TRNS,            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_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS, 
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+    [WIN_BASE] = LAYOUT_iso_83(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-[WIN_BASE] = LAYOUT_iso_83( 
-     KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
-     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [WIN_FN] = LAYOUT_iso_83(
+        KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
+        KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+    };
 
-[WIN_FN] = LAYOUT_iso_83( 
-     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS, 
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
-
-};
\ No newline at end of file
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q1/rev_0102/keymaps/via/keymap.c b/keyboards/keychron/q1/rev_0102/keymaps/via/keymap.c
index b4a7d64427..d1652e65da 100644
--- a/keyboards/keychron/q1/rev_0102/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1/rev_0102/keymaps/via/keymap.c
@@ -16,7 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-
 enum layers{
   MAC_BASE,
   MAC_FN,
@@ -24,41 +23,85 @@ enum layers{
   WIN_FN
 };
 
-#define KC_TASK LGUI(KC_TAB)
-#define KC_FLXP LGUI(KC_E)
+enum custom_keycodes {
+    KC_MISSION_CONTROL = USER00,
+    KC_LAUNCHPAD,
+    KC_TASK,
+    KC_FLXP
+};
+
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_83(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-[MAC_BASE] = LAYOUT_iso_83( 
-     KC_ESC,             KC_BRID,  KC_BRIU,  KC_F3,    KC_F4,    RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
-     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [MAC_FN] = LAYOUT_iso_83(
+        KC_TRNS,            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_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
+        KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 
-[MAC_FN] = LAYOUT_iso_83( 
-     KC_TRNS,            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_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS, 
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+    [WIN_BASE] = LAYOUT_iso_83(
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
+        KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
+        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-[WIN_BASE] = LAYOUT_iso_83( 
-     KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
-     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
-     KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,             KC_HOME,
-     KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,            KC_RSFT,  KC_UP,
-     KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [WIN_FN] = LAYOUT_iso_83(
+        KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
+        KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+};
 
-[WIN_FN] = LAYOUT_iso_83( 
-     KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
-     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
-     RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,
-     KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS, 
-     KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
-
-};
\ No newline at end of file
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_TASK:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_TAB);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_TAB);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_FLXP:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_E);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_E);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q1/rev_0102/rev_0102.c b/keyboards/keychron/q1/rev_0102/rev_0102.c
index e8a2c85ae3..f1468d1094 100644
--- a/keyboards/keychron/q1/rev_0102/rev_0102.c
+++ b/keyboards/keychron/q1/rev_0102/rev_0102.c
@@ -16,7 +16,7 @@
 
 #include "quantum.h"
 
-
+#ifdef RGB_MATRIX_ENABLE
 const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 /* Refer to IS31 manual for these locations
  *   driver
@@ -141,3 +141,4 @@ led_config_t g_led_config = {
 
 	}
 };
+#endif
diff --git a/keyboards/keychron/q2/chconf.h b/keyboards/keychron/q2/chconf.h
new file mode 100644
index 0000000000..a331fdef37
--- /dev/null
+++ b/keyboards/keychron/q2/chconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/acheron/arctic/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_OPTIMIZE_SPEED FALSE
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
\ No newline at end of file
diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h
new file mode 100644
index 0000000000..263be4684f
--- /dev/null
+++ b/keyboards/keychron/q2/config.h
@@ -0,0 +1,54 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x3434
+#define MANUFACTURER    Keychron
+#define PRODUCT         Keychron Q2
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 }
+
+/* DIP switch */
+#define DIP_SWITCH_MATRIX_GRID  { {4, 4} }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Disable DIP switch in matrix data */
+#define MATRIX_MASKED
+
+/* NKRO */
+#define FORCE_NKRO
+
+/* turn off effects when suspended */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* Use 5 dynamic keymap layers */
+#define DYNAMIC_KEYMAP_LAYER_COUNT 5
+
+/* EEPROM Driver Configuration */
+#define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10100010
diff --git a/keyboards/keychron/q2/halconf.h b/keyboards/keychron/q2/halconf.h
new file mode 100644
index 0000000000..a9304b8592
--- /dev/null
+++ b/keyboards/keychron/q2/halconf.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/nk65/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/keychron/q2/matrix.c b/keyboards/keychron/q2/matrix.c
new file mode 100644
index 0000000000..1e493d33e2
--- /dev/null
+++ b/keyboards/keychron/q2/matrix.c
@@ -0,0 +1,139 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include "util.h"
+#include "matrix.h"
+#include "debounce.h"
+#include "quantum.h"
+
+#ifdef MATRIX_ROW_PINS
+static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+#endif  // MATRIX_ROW_PINS
+#ifdef MATRIX_COL_PINS
+static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif  // MATRIX_COL_PINS
+
+#define ROWS_PER_HAND (MATRIX_ROWS)
+
+/* matrix state(1:on, 0:off) */
+extern matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
+extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
+
+static inline void setPinOutput_writeLow(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinLow(pin);
+    }
+}
+
+static inline void setPinOutput_writeHigh(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinHigh(pin);
+    }
+}
+
+static inline void setPinInputHigh_atomic(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
+}
+
+static inline uint8_t readMatrixPin(pin_t pin) {
+    if (pin != NO_PIN) {
+        return readPin(pin);
+    } else {
+        return 1;
+    }
+}
+
+static bool select_col(uint8_t col) {
+    pin_t pin = col_pins[col];
+    if (pin != NO_PIN) {
+        setPinOutput_writeLow(pin);
+        return true;
+    }
+    return false;
+}
+
+static void unselect_col(uint8_t col) {
+    pin_t pin = col_pins[col];
+    if (pin != NO_PIN) {
+        setPinOutput_writeHigh(pin);
+    }
+}
+
+static void unselect_cols(void) {
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        unselect_col(x);
+    }
+}
+
+void matrix_init_pins(void) {
+    unselect_cols();
+    for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
+        if (row_pins[x] != NO_PIN) {
+            setPinInputHigh_atomic(row_pins[x]);
+        }
+    }
+}
+
+void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
+    bool key_pressed = false;
+
+    // Select col
+    if (!select_col(current_col)) {  // select col
+        return;                      // skip NO_PIN col
+    }
+    matrix_output_select_delay();
+
+    // For each row...
+    for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
+        // Check row pin state
+        if (readMatrixPin(row_pins[row_index]) == 0) {
+            // Pin LO, set col bit
+            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
+            key_pressed = true;
+        } else {
+            // Pin HI, clear col bit
+            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+    matrix_output_unselect_delay(current_col, key_pressed);  // wait for all Row signals to go HIGH
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    matrix_init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
+
+    // Set col, read rows
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+        matrix_read_rows_on_col(curr_matrix, current_col);
+    }
+
+    bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
+    if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
+
+    return (uint8_t)changed;
+}
diff --git a/keyboards/keychron/q2/mcuconf.h b/keyboards/keychron/q2/mcuconf.h
new file mode 100644
index 0000000000..6ab916aea1
--- /dev/null
+++ b/keyboards/keychron/q2/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/acheron/arctic/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
\ No newline at end of file
diff --git a/keyboards/keychron/q2/q2.c b/keyboards/keychron/q2/q2.c
new file mode 100644
index 0000000000..03d1ee7db5
--- /dev/null
+++ b/keyboards/keychron/q2/q2.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "q2.h"
+
+const matrix_row_t matrix_mask[] = {
+    0b1111111111111111,
+    0b1111111111111111,
+    0b1111111111111111,
+    0b1111111111111111,
+    0b1111111111101111,
+};
+
+bool dip_switch_update_kb(uint8_t index, bool active) {
+    if (!dip_switch_update_user(index, active)) { return false;}
+    if (index == 0) {
+        default_layer_set(1UL << (active ? 1 : 0));
+    }
+    return true;
+}
diff --git a/keyboards/keychron/q2/q2.h b/keyboards/keychron/q2/q2.h
new file mode 100644
index 0000000000..22bd1afe8e
--- /dev/null
+++ b/keyboards/keychron/q2/q2.h
@@ -0,0 +1,29 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#if   defined(KEYBOARD_keychron_q2_rev_0110)
+#    include "rev_0110.h"
+#elif defined(KEYBOARD_keychron_q2_rev_0111)
+#    include "rev_0111.h"
+#elif defined(KEYBOARD_keychron_q2_rev_0112)
+#    include "rev_0112.h"
+#elif defined(KEYBOARD_keychron_q2_rev_0113)
+#    include "rev_0113.h"
+#endif
diff --git a/keyboards/keychron/q2/readme.md b/keyboards/keychron/q2/readme.md
new file mode 100644
index 0000000000..bdceb98d48
--- /dev/null
+++ b/keyboards/keychron/q2/readme.md
@@ -0,0 +1,19 @@
+# Keychron Q2
+
+A customizable 65% keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q2
+* Hardware Availability: [Keychron](https://www.keychron.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keychron/q2/rev_0110:default
+
+Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+
+    make keychron/q2/rev_0110:default:flash
+
+**Reset Key**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
+
+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).
diff --git a/keyboards/keychron/q2/rev_0110/config.h b/keyboards/keychron/q2/rev_0110/config.h
new file mode 100644
index 0000000000..d9fc5c1744
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0110/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID 0x0110
+#define DEVICE_VER 0x0100
diff --git a/keyboards/keychron/q2/rev_0110/info.json b/keyboards/keychron/q2/rev_0110/info.json
new file mode 100644
index 0000000000..caf3ebf7c9
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0110/info.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "Keychron Q2",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_ansi_67": {
+            "layout": [
+            {"label":"Insert", "x":15.25, "y":0},
+
+            {"label":"Esc", "x":0, "y":0.25},
+            {"label":"!", "x":1, "y":0.25},
+            {"label":"@", "x":2, "y":0.25},
+            {"label":"", "x":3, "y":0.25},
+            {"label":"$", "x":4, "y":0.25},
+            {"label":"%", "x":5, "y":0.25},
+            {"label":"^", "x":6, "y":0.25},
+            {"label":"&", "x":7, "y":0.25},
+            {"label":"*", "x":8, "y":0.25},
+            {"label":"(", "x":9, "y":0.25},
+            {"label":")", "x":10, "y":0.25},
+            {"label":"_", "x":11, "y":0.25},
+            {"label":"+", "x":12, "y":0.25},
+            {"label":"Backspace", "x":13, "y":0.25, "w":2},
+
+            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+            {"label":"Q", "x":1.5, "y":1.25},
+            {"label":"W", "x":2.5, "y":1.25},
+            {"label":"E", "x":3.5, "y":1.25},
+            {"label":"R", "x":4.5, "y":1.25},
+            {"label":"T", "x":5.5, "y":1.25},
+            {"label":"Y", "x":6.5, "y":1.25},
+            {"label":"U", "x":7.5, "y":1.25},
+            {"label":"I", "x":8.5, "y":1.25},
+            {"label":"O", "x":9.5, "y":1.25},
+            {"label":"P", "x":10.5, "y":1.25},
+            {"label":"{", "x":11.5, "y":1.25},
+            {"label":"}", "x":12.5, "y":1.25},
+            {"label":"|", "x":13.5, "y":1.25, "w":1.5},
+            {"label":"Delete", "x":15.25, "y":1.25},
+
+            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+            {"label":"A", "x":1.75, "y":2.25},
+            {"label":"S", "x":2.75, "y":2.25},
+            {"label":"D", "x":3.75, "y":2.25},
+            {"label":"F", "x":4.75, "y":2.25},
+            {"label":"G", "x":5.75, "y":2.25},
+            {"label":"H", "x":6.75, "y":2.25},
+            {"label":"J", "x":7.75, "y":2.25},
+            {"label":"K", "x":8.75, "y":2.25},
+            {"label":"L", "x":9.75, "y":2.25},
+            {"label":":", "x":10.75, "y":2.25},
+            {"label":"\"", "x":11.75, "y":2.25},
+            {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
+            {"label":"Home", "x":15.25, "y":2.25},
+
+            {"label":"Shift", "x":0, "y":3.25, "w":2.25},
+            {"label":"Z", "x":2.25, "y":3.25},
+            {"label":"X", "x":3.25, "y":3.25},
+            {"label":"C", "x":4.25, "y":3.25},
+            {"label":"V", "x":5.25, "y":3.25},
+            {"label":"B", "x":6.25, "y":3.25},
+            {"label":"N", "x":7.25, "y":3.25},
+            {"label":"M", "x":8.25, "y":3.25},
+            {"label":"<", "x":9.25, "y":3.25},
+            {"label":">", "x":10.25, "y":3.25},
+            {"label":"?", "x":11.25, "y":3.25},
+            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+            {"label":"Up", "x":14.25, "y":3.5},
+
+            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+            {"label":"Alt", "x":10, "y":4.25},
+            {"label":"Fn1", "x":11, "y":4.25},
+            {"label":"Fn2", "x":12, "y":4.25},
+            {"label":"Left", "x":13.25, "y":4.5},
+            {"label":"Down", "x":14.25, "y":4.5},
+            {"label":"Right", "x":15.25, "y":4.5} ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0110/keymaps/default/keymap.c b/keyboards/keychron/q2/rev_0110/keymaps/default/keymap.c
new file mode 100644
index 0000000000..429157eef2
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0110/keymaps/default/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = SAFE_RANGE,
+    KC_LAUNCHPAD
+};
+
+#define KC_WAVE S(KC_GRV)
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_67(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,          KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,           KC_HOME,
+        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_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_ansi_67(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,          KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,           KC_HOME,
+        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(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [_FN1] = LAYOUT_ansi_67(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN2] = LAYOUT_ansi_67(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_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),
+
+    [_FN3] = LAYOUT_ansi_67(
+        KC_WAVE, 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_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0110/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0110/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b23c92e95e
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0110/keymaps/via/keymap.c
@@ -0,0 +1,112 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = USER00,
+    KC_LAUNCHPAD,
+    KC_TASK,
+    KC_FLXP
+};
+
+#define KC_WAVE S(KC_GRV)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_67(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,          KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,           KC_HOME,
+        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_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_ansi_67(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,  KC_BSLS,          KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,            KC_ENT,           KC_HOME,
+        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(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [_FN1] = LAYOUT_ansi_67(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN2] = LAYOUT_ansi_67(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_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),
+
+    [_FN3] = LAYOUT_ansi_67(
+        KC_WAVE, 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_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_TASK:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_TAB);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_TAB);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_FLXP:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_E);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_E);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0110/keymaps/via/rules.mk b/keyboards/keychron/q2/rev_0110/keymaps/via/rules.mk
new file mode 100644
index 0000000000..bee21da528
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0110/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/keychron/q2/rev_0110/readme.md b/keyboards/keychron/q2/rev_0110/readme.md
new file mode 100644
index 0000000000..d3134cedb5
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0110/readme.md
@@ -0,0 +1 @@
+# The ANSI variant of the Keychron Q2
diff --git a/keyboards/keychron/q2/rev_0110/rev_0110.c b/keyboards/keychron/q2/rev_0110/rev_0110.c
new file mode 100644
index 0000000000..d91a41fca1
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0110/rev_0110.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q2/rev_0110/rev_0110.h b/keyboards/keychron/q2/rev_0110/rev_0110.h
new file mode 100644
index 0000000000..669a79d310
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0110/rev_0110.h
@@ -0,0 +1,35 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_ansi_67( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,\
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2E,\
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,     \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K2C, K4E \
+) { \
+    { K00, K01,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E, }, \
+    { K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D, K1E, }, \
+    { K20, K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,  K2C, K2D, K2E, }, \
+    { K30, XXX,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,  XXX, K3D, K3E, }, \
+    { K40, K41,  K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B,  K4C, K4D, K4E, }  \
+}
diff --git a/keyboards/keychron/q2/rev_0110/rules.mk b/keyboards/keychron/q2/rev_0110/rules.mk
new file mode 100644
index 0000000000..0d4e745010
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0110/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+# MCU = STM32L432
+MCU = cortex-m4
+ARMV = 7
+MCU_FAMILY = STM32
+MCU_SERIES = STM32L4xx
+MCU_LDSCRIPT = STM32L432xB
+MCU_STARTUP = stm32l4xx
+BOARD = GENERIC_STM32_L433XC
+PLATFORM_NAME = platform_l432
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no         # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+EEPROM_DRIVER = i2c
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q2/rev_0111/config.h b/keyboards/keychron/q2/rev_0111/config.h
new file mode 100644
index 0000000000..cc50d0688a
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID      0x0111
+#define DEVICE_VER      0x0100
+
+/* Encoder used pins */
+#define ENCODERS_PAD_A { A10 }
+#define ENCODERS_PAD_B { B5 }
+
+/* Specifies the number of pulses the encoder registers between each detent */
+#define ENCODER_RESOLUTION 2
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/default/info.json b/keyboards/keychron/q2/rev_0111/keymaps/default/info.json
new file mode 100644
index 0000000000..590ed6d115
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/keymaps/default/info.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "Keychron Q2",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_ansi_": {
+            "layout": [
+            {"label":"Mute", "x":15.25, "y":0},
+
+            {"label":"Esc", "x":0, "y":0.25},
+            {"label":"!", "x":1, "y":0.25},
+            {"label":"@", "x":2, "y":0.25},
+            {"label":"", "x":3, "y":0.25},
+            {"label":"$", "x":4, "y":0.25},
+            {"label":"%", "x":5, "y":0.25},
+            {"label":"^", "x":6, "y":0.25},
+            {"label":"&", "x":7, "y":0.25},
+            {"label":"*", "x":8, "y":0.25},
+            {"label":"(", "x":9, "y":0.25},
+            {"label":")", "x":10, "y":0.25},
+            {"label":"_", "x":11, "y":0.25},
+            {"label":"+", "x":12, "y":0.25},
+            {"label":"Backspace", "x":13, "y":0.25, "w":2},
+
+            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+            {"label":"Q", "x":1.5, "y":1.25},
+            {"label":"W", "x":2.5, "y":1.25},
+            {"label":"E", "x":3.5, "y":1.25},
+            {"label":"R", "x":4.5, "y":1.25},
+            {"label":"T", "x":5.5, "y":1.25},
+            {"label":"Y", "x":6.5, "y":1.25},
+            {"label":"U", "x":7.5, "y":1.25},
+            {"label":"I", "x":8.5, "y":1.25},
+            {"label":"O", "x":9.5, "y":1.25},
+            {"label":"P", "x":10.5, "y":1.25},
+            {"label":"{", "x":11.5, "y":1.25},
+            {"label":"}", "x":12.5, "y":1.25},
+            {"label":"|", "x":13.5, "y":1.25, "w":1.5},
+            {"label":"Delete", "x":15.25, "y":1.25},
+
+            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+            {"label":"A", "x":1.75, "y":2.25},
+            {"label":"S", "x":2.75, "y":2.25},
+            {"label":"D", "x":3.75, "y":2.25},
+            {"label":"F", "x":4.75, "y":2.25},
+            {"label":"G", "x":5.75, "y":2.25},
+            {"label":"H", "x":6.75, "y":2.25},
+            {"label":"J", "x":7.75, "y":2.25},
+            {"label":"K", "x":8.75, "y":2.25},
+            {"label":"L", "x":9.75, "y":2.25},
+            {"label":":", "x":10.75, "y":2.25},
+            {"label":"\"", "x":11.75, "y":2.25},
+            {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
+            {"label":"Home", "x":15.25, "y":2.25},
+
+            {"label":"Shift", "x":0, "y":3.25, "w":2.25},
+            {"label":"Z", "x":2.25, "y":3.25},
+            {"label":"X", "x":3.25, "y":3.25},
+            {"label":"C", "x":4.25, "y":3.25},
+            {"label":"V", "x":5.25, "y":3.25},
+            {"label":"B", "x":6.25, "y":3.25},
+            {"label":"N", "x":7.25, "y":3.25},
+            {"label":"M", "x":8.25, "y":3.25},
+            {"label":"<", "x":9.25, "y":3.25},
+            {"label":">", "x":10.25, "y":3.25},
+            {"label":"?", "x":11.25, "y":3.25},
+            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+            {"label":"Up", "x":14.25, "y":3.5},
+
+            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+            {"label":"Alt", "x":10, "y":4.25},
+            {"label":"Fn1", "x":11, "y":4.25},
+            {"label":"Fn2", "x":12, "y":4.25},
+            {"label":"Left", "x":13.25, "y":4.5},
+            {"label":"Down", "x":14.25, "y":4.5},
+            {"label":"Right", "x":15.25, "y":4.5} ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c b/keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f5a0667601
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/keymaps/default/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = SAFE_RANGE,
+    KC_LAUNCHPAD
+};
+
+#define KC_WAVE S(KC_GRV)
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_ansi_67(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        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_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_HOME,
+        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_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_ansi_67(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,    KC_BSPC,          KC_MUTE,
+        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_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_HOME,
+        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(_FN2), MO(_FN3),  KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [_FN1] = LAYOUT_ansi_67(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,   KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,          KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN2] = LAYOUT_ansi_67(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,   KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,          KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_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),
+
+    [_FN3] = LAYOUT_ansi_67(
+        KC_WAVE, 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_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,          KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/via/info.json b/keyboards/keychron/q2/rev_0111/keymaps/via/info.json
new file mode 100644
index 0000000000..0e2ad8463f
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/keymaps/via/info.json
@@ -0,0 +1,84 @@
+{
+    "keyboard_name": "Keychron Q2",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_ansi_": {
+            "layout": [
+            {"label":"Mute", "x":15.25, "y":0, "w":0.75},
+            {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
+            {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
+
+            {"label":"Esc", "x":0, "y":0.25},
+            {"label":"!", "x":1, "y":0.25},
+            {"label":"@", "x":2, "y":0.25},
+            {"label":"", "x":3, "y":0.25},
+            {"label":"$", "x":4, "y":0.25},
+            {"label":"%", "x":5, "y":0.25},
+            {"label":"^", "x":6, "y":0.25},
+            {"label":"&", "x":7, "y":0.25},
+            {"label":"*", "x":8, "y":0.25},
+            {"label":"(", "x":9, "y":0.25},
+            {"label":")", "x":10, "y":0.25},
+            {"label":"_", "x":11, "y":0.25},
+            {"label":"+", "x":12, "y":0.25},
+            {"label":"Backspace", "x":13, "y":0.25, "w":2},
+
+            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+            {"label":"Q", "x":1.5, "y":1.25},
+            {"label":"W", "x":2.5, "y":1.25},
+            {"label":"E", "x":3.5, "y":1.25},
+            {"label":"R", "x":4.5, "y":1.25},
+            {"label":"T", "x":5.5, "y":1.25},
+            {"label":"Y", "x":6.5, "y":1.25},
+            {"label":"U", "x":7.5, "y":1.25},
+            {"label":"I", "x":8.5, "y":1.25},
+            {"label":"O", "x":9.5, "y":1.25},
+            {"label":"P", "x":10.5, "y":1.25},
+            {"label":"{", "x":11.5, "y":1.25},
+            {"label":"}", "x":12.5, "y":1.25},
+            {"label":"|", "x":13.5, "y":1.25, "w":1.5},
+            {"label":"Delete", "x":15.25, "y":1.25},
+
+            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+            {"label":"A", "x":1.75, "y":2.25},
+            {"label":"S", "x":2.75, "y":2.25},
+            {"label":"D", "x":3.75, "y":2.25},
+            {"label":"F", "x":4.75, "y":2.25},
+            {"label":"G", "x":5.75, "y":2.25},
+            {"label":"H", "x":6.75, "y":2.25},
+            {"label":"J", "x":7.75, "y":2.25},
+            {"label":"K", "x":8.75, "y":2.25},
+            {"label":"L", "x":9.75, "y":2.25},
+            {"label":":", "x":10.75, "y":2.25},
+            {"label":"\"", "x":11.75, "y":2.25},
+            {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
+            {"label":"Home", "x":15.25, "y":2.25},
+
+            {"label":"Shift", "x":0, "y":3.25, "w":2.25},
+            {"label":"Z", "x":2.25, "y":3.25},
+            {"label":"X", "x":3.25, "y":3.25},
+            {"label":"C", "x":4.25, "y":3.25},
+            {"label":"V", "x":5.25, "y":3.25},
+            {"label":"B", "x":6.25, "y":3.25},
+            {"label":"N", "x":7.25, "y":3.25},
+            {"label":"M", "x":8.25, "y":3.25},
+            {"label":"<", "x":9.25, "y":3.25},
+            {"label":">", "x":10.25, "y":3.25},
+            {"label":"?", "x":11.25, "y":3.25},
+            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+            {"label":"Up", "x":14.25, "y":3.5},
+
+            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+            {"label":"Alt", "x":10, "y":4.25},
+            {"label":"Fn1", "x":11, "y":4.25},
+            {"label":"Fn2", "x":12, "y":4.25},
+            {"label":"Left", "x":13.25, "y":4.5},
+            {"label":"Down", "x":14.25, "y":4.5},
+            {"label":"Right", "x":15.25, "y":4.5} ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
new file mode 100644
index 0000000000..15cdbb027e
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
@@ -0,0 +1,154 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = USER00,
+    KC_LAUNCHPAD,
+    KC_TASK,
+    KC_FLXP
+};
+
+#define KC_WAVE S(KC_GRV)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        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_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_HOME,
+        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_LOPT, KC_LCMD,                            KC_SPC,  KC_VOLD, KC_VOLU,          KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        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_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_HOME,
+        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_VOLD, KC_VOLU,          KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [_FN1] = LAYOUT_all(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN2] = LAYOUT_all(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN3] = LAYOUT_all(
+        KC_WAVE, 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_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+
+#define ENCODERS 1
+static uint8_t  encoder_state[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = {{ 8, 4 }};
+static keypos_t encoder_ccw[ENCODERS]  = {{ 7, 4 }};
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = true,
+        .time = (timer_read() | 1)
+    };
+    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+}
+
+void encoder_action_unregister(void) {
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index]) {
+            keyevent_t encoder_event = (keyevent_t) {
+                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
+                .pressed = false,
+                .time = (timer_read() | 1)
+            };
+            encoder_state[index] = 0;
+            action_exec(encoder_event);
+        }
+    }
+}
+
+void matrix_scan_user(void) {
+    encoder_action_unregister();
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    return false;
+};
+
+#endif
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_TASK:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_TAB);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_TAB);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_FLXP:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_E);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_E);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk b/keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk
new file mode 100644
index 0000000000..bee21da528
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/keychron/q2/rev_0111/readme.md b/keyboards/keychron/q2/rev_0111/readme.md
new file mode 100644
index 0000000000..2bb5d3bca8
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/readme.md
@@ -0,0 +1,5 @@
+# The ANSI variant of the Keychron Q2 and support encoder
+
+- Enable EC11 rotary encoder
+- Turn colckwise to increase volume and turn anti-colckwise to decrease volume
+- Press top right key pushbutton to mute
diff --git a/keyboards/keychron/q2/rev_0111/rev_0111.c b/keyboards/keychron/q2/rev_0111/rev_0111.c
new file mode 100644
index 0000000000..c9413d023d
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/rev_0111.c
@@ -0,0 +1,31 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/keychron/q2/rev_0111/rev_0111.h b/keyboards/keychron/q2/rev_0111/rev_0111.h
new file mode 100644
index 0000000000..0b1cfade1b
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/rev_0111.h
@@ -0,0 +1,48 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,\
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2E,\
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,     \
+    K40, K41, K42,                K46, K47, K48,      K4A, K4B, K4C, K4D, K2C, K4E \
+) { \
+    { K00, K01,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E, }, \
+    { K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D, K1E, }, \
+    { K20, K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,  K2C, K2D, K2E, }, \
+    { K30, XXX,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,  XXX, K3D, K3E, }, \
+    { K40, K41,  K42, XXX, XXX, XXX, K46, K47, K48, XXX, K4A, K4B,  K4C, K4D, K4E, }  \
+}
+#define LAYOUT_ansi_67( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,\
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2E,\
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,     \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K2C, K4E \
+) { \
+    { K00, K01,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E, }, \
+    { K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D, K1E, }, \
+    { K20, K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,  K2C, K2D, K2E, }, \
+    { K30, XXX,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,  XXX, K3D, K3E, }, \
+    { K40, K41,  K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B,  K4C, K4D, K4E, }  \
+}
diff --git a/keyboards/keychron/q2/rev_0111/rules.mk b/keyboards/keychron/q2/rev_0111/rules.mk
new file mode 100644
index 0000000000..52d0bce592
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+# MCU = STM32L432
+MCU = cortex-m4
+ARMV = 7
+MCU_FAMILY = STM32
+MCU_SERIES = STM32L4xx
+MCU_LDSCRIPT = STM32L432xB
+MCU_STARTUP = stm32l4xx
+BOARD = GENERIC_STM32_L433XC
+PLATFORM_NAME = platform_l432
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+EEPROM_DRIVER = i2c
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q2/rev_0112/config.h b/keyboards/keychron/q2/rev_0112/config.h
new file mode 100644
index 0000000000..b76640d650
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0112/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID      0x0112
+#define DEVICE_VER      0x0100
diff --git a/keyboards/keychron/q2/rev_0112/info.json b/keyboards/keychron/q2/rev_0112/info.json
new file mode 100644
index 0000000000..83a7addfeb
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0112/info.json
@@ -0,0 +1,83 @@
+{
+    "keyboard_name": "Keychron Q2",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_iso_68": {
+            "layout": [
+            {"label":"Insert", "x":15.25, "y":0},
+
+            {"label":"Esc", "x":0, "y":0.25},
+            {"label":"!", "x":1, "y":0.25},
+            {"label":"@", "x":2, "y":0.25},
+            {"label":"", "x":3, "y":0.25},
+            {"label":"$", "x":4, "y":0.25},
+            {"label":"%", "x":5, "y":0.25},
+            {"label":"^", "x":6, "y":0.25},
+            {"label":"&", "x":7, "y":0.25},
+            {"label":"*", "x":8, "y":0.25},
+            {"label":"(", "x":9, "y":0.25},
+            {"label":")", "x":10, "y":0.25},
+            {"label":"_", "x":11, "y":0.25},
+            {"label":"+", "x":12, "y":0.25},
+            {"label":"Backspace", "x":13, "y":0.25, "w":2},
+
+            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+            {"label":"Q", "x":1.5, "y":1.25},
+            {"label":"W", "x":2.5, "y":1.25},
+            {"label":"E", "x":3.5, "y":1.25},
+            {"label":"R", "x":4.5, "y":1.25},
+            {"label":"T", "x":5.5, "y":1.25},
+            {"label":"Y", "x":6.5, "y":1.25},
+            {"label":"U", "x":7.5, "y":1.25},
+            {"label":"I", "x":8.5, "y":1.25},
+            {"label":"O", "x":9.5, "y":1.25},
+            {"label":"P", "x":10.5, "y":1.25},
+            {"label":"{", "x":11.5, "y":1.25},
+            {"label":"}", "x":12.5, "y":1.25},
+            {"label":"Delete", "x":15.25, "y":1.25},
+
+            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+            {"label":"A", "x":1.75, "y":2.25},
+            {"label":"S", "x":2.75, "y":2.25},
+            {"label":"D", "x":3.75, "y":2.25},
+            {"label":"F", "x":4.75, "y":2.25},
+            {"label":"G", "x":5.75, "y":2.25},
+            {"label":"H", "x":6.75, "y":2.25},
+            {"label":"J", "x":7.75, "y":2.25},
+            {"label":"K", "x":8.75, "y":2.25},
+            {"label":"L", "x":9.75, "y":2.25},
+            {"label":":", "x":10.75, "y":2.25},
+            {"label":"\"", "x":11.75, "y":2.25},
+            {"label":"#~", "x":12.75, "y":2.25},
+            {"label":"Enter", "x":13.75, "y":2.25, "w":1.25}
+            {"label":"Home", "x":15.25, "y":2.25},
+
+            {"label":"Shift", "x":0, "y":3.25, "w":1.25},
+            {"label":"|", "x":1.25, "y":3.25},
+            {"label":"Z", "x":2.25, "y":3.25},
+            {"label":"X", "x":3.25, "y":3.25},
+            {"label":"C", "x":4.25, "y":3.25},
+            {"label":"V", "x":5.25, "y":3.25},
+            {"label":"B", "x":6.25, "y":3.25},
+            {"label":"N", "x":7.25, "y":3.25},
+            {"label":"M", "x":8.25, "y":3.25},
+            {"label":"<", "x":9.25, "y":3.25},
+            {"label":">", "x":10.25, "y":3.25},
+            {"label":"?", "x":11.25, "y":3.25},
+            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+            {"label":"Up", "x":14.25, "y":3.5},
+
+            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+            {"label":"Alt", "x":10, "y":4.25},
+            {"label":"Fn1", "x":11, "y":4.25},
+            {"label":"Fn2", "x":12, "y":4.25},
+            {"label":"Left", "x":13.25, "y":4.5},
+            {"label":"Down", "x":14.25, "y":4.5},
+            {"label":"Right", "x":15.25, "y":4.5} ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0112/keymaps/default/keymap.c b/keyboards/keychron/q2/rev_0112/keymaps/default/keymap.c
new file mode 100644
index 0000000000..75667b44c8
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0112/keymaps/default/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = SAFE_RANGE,
+    KC_LAUNCHPAD
+};
+
+#define KC_WAVE S(KC_GRV)
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_68(
+        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,                    KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
+        KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_iso_68(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,                    KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [_FN1] = LAYOUT_iso_68(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN2] = LAYOUT_iso_68(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN3] = LAYOUT_iso_68(
+        KC_WAVE, 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_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0112/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0112/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0a91857f1e
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0112/keymaps/via/keymap.c
@@ -0,0 +1,112 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = USER00,
+    KC_LAUNCHPAD,
+    KC_TASK,
+    KC_FLXP
+};
+
+#define KC_WAVE S(KC_GRV)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_68(
+        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,                    KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
+        KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_iso_68(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_INS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,                    KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [_FN1] = LAYOUT_iso_68(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN2] = LAYOUT_iso_68(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN3] = LAYOUT_iso_68(
+        KC_WAVE, 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_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_TASK:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_TAB);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_TAB);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_FLXP:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_E);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_E);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0112/keymaps/via/rules.mk b/keyboards/keychron/q2/rev_0112/keymaps/via/rules.mk
new file mode 100644
index 0000000000..bee21da528
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0112/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/keychron/q2/rev_0112/readme.md b/keyboards/keychron/q2/rev_0112/readme.md
new file mode 100644
index 0000000000..29404e03ca
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0112/readme.md
@@ -0,0 +1 @@
+# The ISO variant of the Keychron Q2
diff --git a/keyboards/keychron/q2/rev_0112/rev_0112.c b/keyboards/keychron/q2/rev_0112/rev_0112.c
new file mode 100644
index 0000000000..d91a41fca1
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0112/rev_0112.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q2/rev_0112/rev_0112.h b/keyboards/keychron/q2/rev_0112/rev_0112.h
new file mode 100644
index 0000000000..2ab66fb847
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0112/rev_0112.h
@@ -0,0 +1,36 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_iso_68( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,\
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D,      K2E,\
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,     \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K2C, K4E \
+) { \
+    { K00, K01,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E, }, \
+    { K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D, K1E, }, \
+    { K20, K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,  K2C, K2D, K2E, }, \
+    { K30, K31,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,  XXX, K3D, K3E, }, \
+    { K40, K41,  K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B,  K4C, K4D, K4E, }  \
+}
+
diff --git a/keyboards/keychron/q2/rev_0112/rules.mk b/keyboards/keychron/q2/rev_0112/rules.mk
new file mode 100644
index 0000000000..0d4e745010
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0112/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+# MCU = STM32L432
+MCU = cortex-m4
+ARMV = 7
+MCU_FAMILY = STM32
+MCU_SERIES = STM32L4xx
+MCU_LDSCRIPT = STM32L432xB
+MCU_STARTUP = stm32l4xx
+BOARD = GENERIC_STM32_L433XC
+PLATFORM_NAME = platform_l432
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no         # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+EEPROM_DRIVER = i2c
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q2/rev_0113/config.h b/keyboards/keychron/q2/rev_0113/config.h
new file mode 100644
index 0000000000..21ada693c0
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID      0x0113
+#define DEVICE_VER      0x0100
+
+/* Encoder used pins */
+#define ENCODERS_PAD_A { A10 }
+#define ENCODERS_PAD_B { B5 }
+
+/* Specifies the number of pulses the encoder registers between each detent */
+#define ENCODER_RESOLUTION 2
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/default/info.json b/keyboards/keychron/q2/rev_0113/keymaps/default/info.json
new file mode 100644
index 0000000000..8448d4c995
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/default/info.json
@@ -0,0 +1,83 @@
+{
+    "keyboard_name": "Keychron Q2",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_iso_68": {
+            "layout": [
+            {"label":"Mute", "x":15.25, "y":0},
+
+            {"label":"Esc", "x":0, "y":0.25},
+            {"label":"!", "x":1, "y":0.25},
+            {"label":"@", "x":2, "y":0.25},
+            {"label":"", "x":3, "y":0.25},
+            {"label":"$", "x":4, "y":0.25},
+            {"label":"%", "x":5, "y":0.25},
+            {"label":"^", "x":6, "y":0.25},
+            {"label":"&", "x":7, "y":0.25},
+            {"label":"*", "x":8, "y":0.25},
+            {"label":"(", "x":9, "y":0.25},
+            {"label":")", "x":10, "y":0.25},
+            {"label":"_", "x":11, "y":0.25},
+            {"label":"+", "x":12, "y":0.25},
+            {"label":"Backspace", "x":13, "y":0.25, "w":2},
+
+            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+            {"label":"Q", "x":1.5, "y":1.25},
+            {"label":"W", "x":2.5, "y":1.25},
+            {"label":"E", "x":3.5, "y":1.25},
+            {"label":"R", "x":4.5, "y":1.25},
+            {"label":"T", "x":5.5, "y":1.25},
+            {"label":"Y", "x":6.5, "y":1.25},
+            {"label":"U", "x":7.5, "y":1.25},
+            {"label":"I", "x":8.5, "y":1.25},
+            {"label":"O", "x":9.5, "y":1.25},
+            {"label":"P", "x":10.5, "y":1.25},
+            {"label":"{", "x":11.5, "y":1.25},
+            {"label":"}", "x":12.5, "y":1.25},
+            {"label":"Delete", "x":15.25, "y":1.25},
+
+            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+            {"label":"A", "x":1.75, "y":2.25},
+            {"label":"S", "x":2.75, "y":2.25},
+            {"label":"D", "x":3.75, "y":2.25},
+            {"label":"F", "x":4.75, "y":2.25},
+            {"label":"G", "x":5.75, "y":2.25},
+            {"label":"H", "x":6.75, "y":2.25},
+            {"label":"J", "x":7.75, "y":2.25},
+            {"label":"K", "x":8.75, "y":2.25},
+            {"label":"L", "x":9.75, "y":2.25},
+            {"label":":", "x":10.75, "y":2.25},
+            {"label":"\"", "x":11.75, "y":2.25},
+            {"label":"#~", "x":12.75, "y":2.25},
+            {"label":"Enter", "x":13.75, "y":2.25, "w":1.25},
+            {"label":"Home", "x":15.25, "y":2.25},
+
+            {"label":"Shift", "x":0, "y":3.25, "w":1.25},
+            {"label":"|", "x":1.25, "y":3.25},
+            {"label":"Z", "x":2.25, "y":3.25},
+            {"label":"X", "x":3.25, "y":3.25},
+            {"label":"C", "x":4.25, "y":3.25},
+            {"label":"V", "x":5.25, "y":3.25},
+            {"label":"B", "x":6.25, "y":3.25},
+            {"label":"N", "x":7.25, "y":3.25},
+            {"label":"M", "x":8.25, "y":3.25},
+            {"label":"<", "x":9.25, "y":3.25},
+            {"label":">", "x":10.25, "y":3.25},
+            {"label":"?", "x":11.25, "y":3.25},
+            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+            {"label":"Up", "x":14.25, "y":3.5},
+
+            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+            {"label":"Alt", "x":10, "y":4.25},
+            {"label":"Fn1", "x":11, "y":4.25},
+            {"label":"Fn2", "x":12, "y":4.25},
+            {"label":"Left", "x":13.25, "y":4.5},
+            {"label":"Down", "x":14.25, "y":4.5},
+            {"label":"Right", "x":15.25, "y":4.5} ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e3e6cf7376
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = SAFE_RANGE,
+    KC_LAUNCHPAD
+};
+
+#define KC_WAVE S(KC_GRV)
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_68(
+        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        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_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
+        KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_iso_68(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        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_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [_FN1] = LAYOUT_iso_68(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN2] = LAYOUT_iso_68(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN3] = LAYOUT_iso_68(
+        KC_WAVE, 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_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/info.json b/keyboards/keychron/q2/rev_0113/keymaps/via/info.json
new file mode 100644
index 0000000000..6111f83d23
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/via/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "Keychron Q2",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_iso_68": {
+            "layout": [
+            {"label":"Mute", "x":15.25, "y":0, "w":0.75},
+            {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
+            {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
+
+            {"label":"Esc", "x":0, "y":0.25},
+            {"label":"!", "x":1, "y":0.25},
+            {"label":"@", "x":2, "y":0.25},
+            {"label":"", "x":3, "y":0.25},
+            {"label":"$", "x":4, "y":0.25},
+            {"label":"%", "x":5, "y":0.25},
+            {"label":"^", "x":6, "y":0.25},
+            {"label":"&", "x":7, "y":0.25},
+            {"label":"*", "x":8, "y":0.25},
+            {"label":"(", "x":9, "y":0.25},
+            {"label":")", "x":10, "y":0.25},
+            {"label":"_", "x":11, "y":0.25},
+            {"label":"+", "x":12, "y":0.25},
+            {"label":"Backspace", "x":13, "y":0.25, "w":2},
+
+            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+            {"label":"Q", "x":1.5, "y":1.25},
+            {"label":"W", "x":2.5, "y":1.25},
+            {"label":"E", "x":3.5, "y":1.25},
+            {"label":"R", "x":4.5, "y":1.25},
+            {"label":"T", "x":5.5, "y":1.25},
+            {"label":"Y", "x":6.5, "y":1.25},
+            {"label":"U", "x":7.5, "y":1.25},
+            {"label":"I", "x":8.5, "y":1.25},
+            {"label":"O", "x":9.5, "y":1.25},
+            {"label":"P", "x":10.5, "y":1.25},
+            {"label":"{", "x":11.5, "y":1.25},
+            {"label":"}", "x":12.5, "y":1.25},
+            {"label":"Delete", "x":15.25, "y":1.25},
+
+            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+            {"label":"A", "x":1.75, "y":2.25},
+            {"label":"S", "x":2.75, "y":2.25},
+            {"label":"D", "x":3.75, "y":2.25},
+            {"label":"F", "x":4.75, "y":2.25},
+            {"label":"G", "x":5.75, "y":2.25},
+            {"label":"H", "x":6.75, "y":2.25},
+            {"label":"J", "x":7.75, "y":2.25},
+            {"label":"K", "x":8.75, "y":2.25},
+            {"label":"L", "x":9.75, "y":2.25},
+            {"label":":", "x":10.75, "y":2.25},
+            {"label":"\"", "x":11.75, "y":2.25},
+            {"label":"#~", "x":12.75, "y":2.25},
+            {"label":"Enter", "x":13.75, "y":2.25, "w":1.25},
+            {"label":"Home", "x":15.25, "y":2.25},
+
+            {"label":"Shift", "x":0, "y":3.25, "w":1.25},
+            {"label":"|", "x":1.25, "y":3.25},
+            {"label":"Z", "x":2.25, "y":3.25},
+            {"label":"X", "x":3.25, "y":3.25},
+            {"label":"C", "x":4.25, "y":3.25},
+            {"label":"V", "x":5.25, "y":3.25},
+            {"label":"B", "x":6.25, "y":3.25},
+            {"label":"N", "x":7.25, "y":3.25},
+            {"label":"M", "x":8.25, "y":3.25},
+            {"label":"<", "x":9.25, "y":3.25},
+            {"label":">", "x":10.25, "y":3.25},
+            {"label":"?", "x":11.25, "y":3.25},
+            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+            {"label":"Up", "x":14.25, "y":3.5},
+
+            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+            {"label":"Alt", "x":10, "y":4.25},
+            {"label":"Fn1", "x":11, "y":4.25},
+            {"label":"Fn2", "x":12, "y":4.25},
+            {"label":"Left", "x":13.25, "y":4.5},
+            {"label":"Down", "x":14.25, "y":4.5},
+            {"label":"Right", "x":15.25, "y":4.5} ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9c7ad72be7
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
@@ -0,0 +1,154 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = USER00,
+    KC_LAUNCHPAD,
+    KC_TASK,
+    KC_FLXP
+};
+
+#define KC_WAVE S(KC_GRV)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        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_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
+        KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,  KC_VOLD, KC_VOLU,          KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        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_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,  KC_VOLD, KC_VOLU,          KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [_FN1] = LAYOUT_all(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN2] = LAYOUT_all(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN3] = LAYOUT_all(
+        KC_WAVE, 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_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+
+#define ENCODERS 1
+static uint8_t  encoder_state[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = {{ 8, 4 }};
+static keypos_t encoder_ccw[ENCODERS]  = {{ 7, 4 }};
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = true,
+        .time = (timer_read() | 1)
+    };
+    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+}
+
+void encoder_action_unregister(void) {
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index]) {
+            keyevent_t encoder_event = (keyevent_t) {
+                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
+                .pressed = false,
+                .time = (timer_read() | 1)
+            };
+            encoder_state[index] = 0;
+            action_exec(encoder_event);
+        }
+    }
+}
+
+void matrix_scan_user(void) {
+    encoder_action_unregister();
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    return false;
+};
+
+#endif
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_TASK:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_TAB);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_TAB);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_FLXP:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_E);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_E);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/rules.mk b/keyboards/keychron/q2/rev_0113/keymaps/via/rules.mk
new file mode 100644
index 0000000000..bee21da528
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/keychron/q2/rev_0113/readme.md b/keyboards/keychron/q2/rev_0113/readme.md
new file mode 100644
index 0000000000..1d808cbb73
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/readme.md
@@ -0,0 +1,5 @@
+# The ISO variant of the Keychron Q2 and support encoder
+
+- Enable EC11 rotary encoder
+- Turn colckwise to increase volume and turn anti-colckwise to decrease volume
+- Press top right key pushbutton to mute
diff --git a/keyboards/keychron/q2/rev_0113/rev_0113.c b/keyboards/keychron/q2/rev_0113/rev_0113.c
new file mode 100644
index 0000000000..c9413d023d
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/rev_0113.c
@@ -0,0 +1,31 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/keychron/q2/rev_0113/rev_0113.h b/keyboards/keychron/q2/rev_0113/rev_0113.h
new file mode 100644
index 0000000000..21d20463e9
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/rev_0113.h
@@ -0,0 +1,48 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,\
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D,      K2E,\
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,     \
+    K40, K41, K42,                K46, K47, K48,      K4A, K4B, K4C, K4D, K2C, K4E \
+) { \
+    { K00, K01,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E, }, \
+    { K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D, K1E, }, \
+    { K20, K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,  K2C, K2D, K2E, }, \
+    { K30, K31,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,  XXX, K3D, K3E, }, \
+    { K40, K41,  K42, XXX, XXX, XXX, K46, K47, K48, XXX, K4A, K4B,  K4C, K4D, K4E, }  \
+}
+#define LAYOUT_iso_68( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,\
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D,      K2E,\
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,     \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K2C, K4E \
+) { \
+    { K00, K01,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E, }, \
+    { K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D, K1E, }, \
+    { K20, K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,  K2C, K2D, K2E, }, \
+    { K30, K31,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,  XXX, K3D, K3E, }, \
+    { K40, K41,  K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B,  K4C, K4D, K4E, }  \
+}
diff --git a/keyboards/keychron/q2/rev_0113/rules.mk b/keyboards/keychron/q2/rev_0113/rules.mk
new file mode 100644
index 0000000000..52d0bce592
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+# MCU = STM32L432
+MCU = cortex-m4
+ARMV = 7
+MCU_FAMILY = STM32
+MCU_SERIES = STM32L4xx
+MCU_LDSCRIPT = STM32L432xB
+MCU_STARTUP = stm32l4xx
+BOARD = GENERIC_STM32_L433XC
+PLATFORM_NAME = platform_l432
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+EEPROM_DRIVER = i2c
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c

From f8870a4c8a3f35e80b168fb8b302c6bf918269c7 Mon Sep 17 00:00:00 2001
From: Conor Burns <mail@conor-burns.com>
Date: Fri, 14 Jan 2022 20:06:24 +0100
Subject: [PATCH 307/867] [Keymap] added keymap conor with rgb layers (#15234)

---
 .../space65/keymaps/conor/config.h            | 25 +++++
 .../space65/keymaps/conor/keymap.c            | 93 +++++++++++++++++++
 .../space65/keymaps/conor/rules.mk            |  1 +
 3 files changed, 119 insertions(+)
 create mode 100644 keyboards/gray_studio/space65/keymaps/conor/config.h
 create mode 100644 keyboards/gray_studio/space65/keymaps/conor/keymap.c
 create mode 100644 keyboards/gray_studio/space65/keymaps/conor/rules.mk

diff --git a/keyboards/gray_studio/space65/keymaps/conor/config.h b/keyboards/gray_studio/space65/keymaps/conor/config.h
new file mode 100644
index 0000000000..e32150b1a4
--- /dev/null
+++ b/keyboards/gray_studio/space65/keymaps/conor/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2021 Conor Burns
+ *
+ * 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 RGBLIGHT_LAYERS
+#define GRAVE_ESC_GUI_OVERRIDE
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_EFFECT_BREATHING + 2
+#define RGBLIGHT_DEFAULT_HUE 152
+#define RGBLIGHT_DEFAULT_SAT 232
+#define RGBLIGHT_DEFAULT_VAR 255
+#define RGBLIGHT_DEFAULT_SPD 2
\ No newline at end of file
diff --git a/keyboards/gray_studio/space65/keymaps/conor/keymap.c b/keyboards/gray_studio/space65/keymaps/conor/keymap.c
new file mode 100644
index 0000000000..39bec338c5
--- /dev/null
+++ b/keyboards/gray_studio/space65/keymaps/conor/keymap.c
@@ -0,0 +1,93 @@
+/* Copyright 2021 Conor Burns
+ *
+ * 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 layer_names {
+  _HOME,
+  _FN2,
+  _FN3,
+  _FN4
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_HOME] = LAYOUT(
+        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_BSPC, KC_DEL,
+        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_HOME,
+        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
+        KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  MO(1),   KC_SPC,           KC_RALT, KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN2] = LAYOUT(
+        _______, KC_F1,   KC_F2,      KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,      KC_F9,   KC_F10,     KC_F11,  KC_F12,  _______, _______, _______,
+        _______,          _______,    _______, _______, _______, _______, _______, RALT(KC_U), _______, RALT(KC_O), _______, _______, _______, _______, _______,
+        _______,          _______,    _______, _______, _______, _______, _______, _______,    _______, _______,    _______, _______, _______,          _______,
+        _______, _______, RALT(KC_A), _______, _______, _______, _______, _______, _______,    _______, _______,    _______, _______,          _______, _______,
+        _______, _______, _______,                      MO(2),   _______, _______,             _______, _______,                      _______, _______, _______
+    ),
+    [_FN3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______, _______, MO(3),            _______, _______,                   _______, _______, _______
+    ),
+    [_FN4] = LAYOUT(
+        RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______,                   _______, _______, _______
+    ),
+};
+
+// RGB LED Indicators
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 3, HSV_PURPLE}    // Light 3 LEDs, starting with LED 0
+);
+const rgblight_segment_t PROGMEM my_2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {3, 1, HSV_PURPLE}    // Light 1 LED, starting with LED 3
+);
+const rgblight_segment_t PROGMEM my_3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {4, 1, HSV_PURPLE}    // Light 1 LED, starting with LED 4
+);
+const rgblight_segment_t PROGMEM my_4_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {5, 1, HSV_PURPLE}    // Light 1 LED, starting with LED 5
+);
+
+// Now define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer,  // 0
+    my_2_layer,  // 1
+    my_3_layer,  // 2
+    my_4_layer  // 3
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    return true;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(1, layer_state_cmp(state, _FN2));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _FN3));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _FN4));
+    return state;
+}
\ No newline at end of file
diff --git a/keyboards/gray_studio/space65/keymaps/conor/rules.mk b/keyboards/gray_studio/space65/keymaps/conor/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/gray_studio/space65/keymaps/conor/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes

From 08a42dc72c2e1f6ad42fb33d6a3fd51931d02d01 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Sat, 15 Jan 2022 01:04:58 +0000
Subject: [PATCH 308/867] Fix broken bootloader builds in develop. (#15880)

---
 keyboards/clueboard/60/info.json                 | 1 +
 keyboards/clueboard/66/rev4/info.json            | 1 +
 keyboards/clueboard/66_hotswap/gen1/info.json    | 1 +
 keyboards/clueboard/california/info.json         | 1 +
 keyboards/edi/hardlight/mk2/rules.mk             | 2 +-
 keyboards/ez_maker/directpins/proton_c/info.json | 1 +
 keyboards/forever65/info.json                    | 1 +
 keyboards/mechlovin/mechlovin9/rev1/rules.mk     | 3 +++
 keyboards/rgbkb/mun/rules.mk                     | 3 +++
 platforms/chibios/bootloaders/none.c             | 4 ++++
 10 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json
index 1698d221d3..6e0d90fe1d 100644
--- a/keyboards/clueboard/60/info.json
+++ b/keyboards/clueboard/60/info.json
@@ -5,6 +5,7 @@
   "debounce": 6,
   "processor": "STM32F303",
   "board": "QMK_PROTON_C",
+  "bootloader": "stm32-dfu",
   "diode_direction": "COL2ROW",
   "features": {
     "audio": true,
diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json
index f1f1ae4dec..b40abf402f 100644
--- a/keyboards/clueboard/66/rev4/info.json
+++ b/keyboards/clueboard/66/rev4/info.json
@@ -5,6 +5,7 @@
   "debounce": 5,
   "processor": "STM32F303",
   "board": "QMK_PROTON_C",
+  "bootloader": "stm32-dfu",
   "diode_direction": "COL2ROW",
   "features": {
     "audio": true,
diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json
index 5e0e5b8aca..cf6288b545 100644
--- a/keyboards/clueboard/66_hotswap/gen1/info.json
+++ b/keyboards/clueboard/66_hotswap/gen1/info.json
@@ -5,6 +5,7 @@
   "debounce": 5,
   "processor": "STM32F303",
   "board": "QMK_PROTON_C",
+  "bootloader": "stm32-dfu",
   "diode_direction": "COL2ROW",
   "features": {
     "audio": true,
diff --git a/keyboards/clueboard/california/info.json b/keyboards/clueboard/california/info.json
index e40b2338cd..24a9399923 100644
--- a/keyboards/clueboard/california/info.json
+++ b/keyboards/clueboard/california/info.json
@@ -4,6 +4,7 @@
     "maintainer": "skullydazed",
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
+    "bootloader": "stm32-dfu",
     "matrix_pins": {
         "direct": [
             ["A10", "A9"],
diff --git a/keyboards/edi/hardlight/mk2/rules.mk b/keyboards/edi/hardlight/mk2/rules.mk
index 5ffab4a55e..b3ff36943f 100644
--- a/keyboards/edi/hardlight/mk2/rules.mk
+++ b/keyboards/edi/hardlight/mk2/rules.mk
@@ -2,7 +2,7 @@
 MCU = STM32F072
 
 # Bootloader selection
-Bootloader = stm32-dfu
+BOOTLOADER = stm32-dfu
 
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF
diff --git a/keyboards/ez_maker/directpins/proton_c/info.json b/keyboards/ez_maker/directpins/proton_c/info.json
index a284e5c41f..e3d000424a 100644
--- a/keyboards/ez_maker/directpins/proton_c/info.json
+++ b/keyboards/ez_maker/directpins/proton_c/info.json
@@ -5,6 +5,7 @@
     "debounce": 5,
     "processor": "STM32F303",
     "board": "QMK_PROTON_C",
+    "bootloader": "stm32-dfu",
     "features": {
         "bootmagic": true,
         "extrakey": true,
diff --git a/keyboards/forever65/info.json b/keyboards/forever65/info.json
index 6cb2442a08..9f5a3539e3 100644
--- a/keyboards/forever65/info.json
+++ b/keyboards/forever65/info.json
@@ -3,6 +3,7 @@
     "manufacturer": "Nightingale Studios",
     "maintainer": "zvecr",
     "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
     "diode_direction": "COL2ROW",
     "matrix_pins": {
         "cols": ["A3", "F1", "F0", "C15", "C14", "C13", "B11", "B10", "B2", "B1", "B0", "A7", "A5", "A6", "A4", "B5"],
diff --git a/keyboards/mechlovin/mechlovin9/rev1/rules.mk b/keyboards/mechlovin/mechlovin9/rev1/rules.mk
index 1333470e59..927204fc74 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/rules.mk
+++ b/keyboards/mechlovin/mechlovin9/rev1/rules.mk
@@ -2,6 +2,9 @@
 MCU = STM32F303
 BOARD = QMK_PROTON_C
 
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
index c7e6594ead..d2ad9cdcc2 100644
--- a/keyboards/rgbkb/mun/rules.mk
+++ b/keyboards/rgbkb/mun/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = STM32F303
 
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Touch encoder needs
 SRC += ../common/touch_encoder.c
 SRC += ../common/common_oled.c
diff --git a/platforms/chibios/bootloaders/none.c b/platforms/chibios/bootloaders/none.c
index 624fbe242a..8379d35abf 100644
--- a/platforms/chibios/bootloaders/none.c
+++ b/platforms/chibios/bootloaders/none.c
@@ -16,4 +16,8 @@
 
 #include "bootloader.h"
 
+#pragma message "Unknown bootloader set, you may not be able to enter bootloader using software reset"
+
 __attribute__((weak)) void bootloader_jump(void) {}
+
+__attribute__((weak)) void enter_bootloader_mode_if_requested(void) {}

From 2e266c7ec1298edea38854495878563e9b2e381b Mon Sep 17 00:00:00 2001
From: GG <72414103+spbgzh@users.noreply.github.com>
Date: Sat, 15 Jan 2022 08:49:11 +0300
Subject: [PATCH 309/867] [Keyboard] Fix encoder bug zoom65 and zoom65_litte
 (#15876)

---
 keyboards/meletrix/zoom65/config.h      | 3 +++
 keyboards/meletrix/zoom65_lite/config.h | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/keyboards/meletrix/zoom65/config.h b/keyboards/meletrix/zoom65/config.h
index 4eb85aeb49..6d6f6d18eb 100644
--- a/keyboards/meletrix/zoom65/config.h
+++ b/keyboards/meletrix/zoom65/config.h
@@ -42,6 +42,9 @@
 #define ENCODERS_PAD_B { B0 }
 
 #define ENCODERS 1
+
+#define ENCODER_RESOLUTION 2
+
 // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 5, 4 } }
 #define ENCODERS_CCW_KEY { { 3, 4 } }
diff --git a/keyboards/meletrix/zoom65_lite/config.h b/keyboards/meletrix/zoom65_lite/config.h
index 062bda8794..1f98a4dfda 100644
--- a/keyboards/meletrix/zoom65_lite/config.h
+++ b/keyboards/meletrix/zoom65_lite/config.h
@@ -42,6 +42,9 @@
 #define ENCODERS_PAD_B { B0 }
 
 #define ENCODERS 1
+
+#define ENCODER_RESOLUTION 2
+
 // Note:  array is { col, row )
 #define ENCODERS_CW_KEY  { { 5, 4 } }
 #define ENCODERS_CCW_KEY { { 3, 4 } }

From b2ea12aaa50a47e3a142fc334018873f2a05b8b2 Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Sat, 15 Jan 2022 14:26:26 +0700
Subject: [PATCH 310/867] [Keyboard] Add Devil68 Pro (#15820)

---
 .../chinese_pcb/devil68_pro/config.h          | 103 ++++++++++
 .../chinese_pcb/devil68_pro/devil68_pro.c     |  49 +++++
 .../chinese_pcb/devil68_pro/devil68_pro.h     |  48 +++++
 .../chinese_pcb/devil68_pro/info.json         |  83 ++++++++
 .../devil68_pro/keymaps/default/keymap.c      | 187 ++++++++++++++++++
 .../devil68_pro/keymaps/default/readme.md     |   3 +
 .../devil68_pro/keymaps/via/config.h          |  23 +++
 .../devil68_pro/keymaps/via/keymap.c          | 187 ++++++++++++++++++
 .../devil68_pro/keymaps/via/readme.md         |   3 +
 .../devil68_pro/keymaps/via/rules.mk          |   2 +
 .../chinese_pcb/devil68_pro/readme.md         |  24 +++
 .../chinese_pcb/devil68_pro/rules.mk          |  22 +++
 keyboards/horrortroll/chinese_pcb/readme.md   |  13 ++
 keyboards/horrortroll/readme.md               |  11 ++
 14 files changed, 758 insertions(+)
 create mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
 create mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c
 create mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.h
 create mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
 create mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c
 create mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/readme.md
 create mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/config.h
 create mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c
 create mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/readme.md
 create mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/rules.mk
 create mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/readme.md
 create mode 100644 keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk
 create mode 100644 keyboards/horrortroll/chinese_pcb/readme.md
 create mode 100644 keyboards/horrortroll/readme.md

diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
new file mode 100644
index 0000000000..825b6d3e5b
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
@@ -0,0 +1,103 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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       0x7516
+#define PRODUCT_ID      0x6001
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    HorrorTroll
+#define PRODUCT         Devil68 Pro
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B7, B3, B2, F6, F7 }
+#define MATRIX_COL_PINS { B1, B0, B5, B6, C6, C7, E2, D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+
+#define BOOTMAGIC_LITE_ROW 3
+#define BOOTMAGIC_LITE_COLUMN 6
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Forcing to use NKRO instead 6KRO */
+#define FORCE_NKRO
+
+/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
+#define USB_POLLING_INTERVAL_MS 1
+#define QMK_KEYS_PER_SCAN 12
+
+#ifdef RGB_MATRIX_ENABLE
+    #define DRIVER_LED_TOTAL 86
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_KEYPRESSES
+
+    /* RGB Matrix config */
+    #define RGB_DI_PIN E6
+
+    /* RGB Matrix effect */
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_BREATHING
+    #define ENABLE_RGB_MATRIX_BAND_SAT
+    #define ENABLE_RGB_MATRIX_BAND_VAL
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+    #define ENABLE_RGB_MATRIX_CYCLE_ALL
+    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON
+    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+    #define ENABLE_RGB_MATRIX_RAINDROPS
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+    #define ENABLE_RGB_MATRIX_HUE_WAVE
+    #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+    #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+    #define ENABLE_RGB_MATRIX_SPLASH
+    #define ENABLE_RGB_MATRIX_MULTISPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c
new file mode 100644
index 0000000000..d8f581df6e
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 "devil68_pro.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    {       0,      1,      2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12, NO_LED,     13,     14 },
+    {      15, NO_LED,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     28,     29 },
+    {      30, NO_LED,     31,     32,     33,     34,     35,     36,     37,     38,     39,     40,     41,     42, NO_LED,     43 },
+    {  NO_LED,     44,     45,     46,     47,     48,     49,     50,     51,     52,     53,     54, NO_LED,     55,     56,     57 },
+    {      58,     59, NO_LED,     60, NO_LED, NO_LED,     61, NO_LED, NO_LED, NO_LED,     64,     62,     63,     65,     66,     67 }
+}, {
+    // Key matrix (0 -> 67)
+    {0  ,  0}, {15 ,  0}, {30 ,  0}, {45 ,  0}, {60 ,  0}, {75 ,  0}, {90 ,  0}, {105,  0}, {120,  0}, {135,  0}, {150,  0}, {165,  0}, {180,  0},            {202,  0}, {224,  0},
+    {3  , 16},            {21 , 16}, {36 , 16}, {51 , 16}, {66 , 16}, {81 , 16}, {96 , 16}, {111, 16}, {126, 16}, {141, 16}, {156, 16}, {171, 16}, {186, 16}, {205, 16}, {224, 16},
+    {5  , 32},            {25 , 32}, {40 , 32}, {55 , 32}, {70 , 32}, {85 , 32}, {100, 32}, {115, 32}, {130, 32}, {145, 32}, {160, 32}, {175, 32}, {200, 32},            {224, 32},
+               {8  , 48}, {31 , 48}, {46 , 48}, {61 , 48}, {76 , 48}, {91 , 48}, {106, 48}, {121, 48}, {136, 48}, {151, 48}, {166, 48},            {188, 48}, {210, 48}, {224, 48},
+    {2  , 64}, {19 , 64},            {36 , 64},                       {96 , 64},                                  {149, 64}, {164, 64}, {179, 64}, {194, 64}, {209, 64}, {224, 64},
+
+    // Underglow (68 -> 85)
+    {210, 60}, {186, 12}, {158, 12}, {130, 12}, {101, 12}, {71 , 12}, {39 , 12}, {13 , 12}, {13 , 35},
+    {13 , 12}, {39 , 12}, {71 , 12}, {101, 12}, {130, 12}, {158, 12}, {186, 12}, {210, 12}, {210, 35},
+}, {
+    // Key matrix (0 -> 67)
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 4,
+    1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    8,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    4,
+       1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 4, 4,
+    1, 1,    1,       4,          1, 1, 1, 4, 4, 4,
+
+    // Underglow (68 -> 85)
+    2, 2, 2, 2, 2, 2, 2, 2, 2,
+	2, 2, 2, 2, 2, 2, 2, 2, 2
+} };
+#endif
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.h
new file mode 100644
index 0000000000..0c83132f57
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.h
@@ -0,0 +1,48 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │0F │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │1F │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │2F │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │3F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+ * │40  │41  │43  │46                      │4A │4B │4C │4D │4E │4F │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+ */
+
+#define LAYOUT_65_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,     K0F, \
+     K10,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,   K1E,    K1F, \
+      K20,   K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,    K2D,      K2F, \
+       K31,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3D,     K3E, K3F, \
+    K40,  K41,  K43,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E, K0F }, \
+    { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \
+    { XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F }  \
+}
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
new file mode 100644
index 0000000000..9e7f4524a3
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/info.json
@@ -0,0 +1,83 @@
+{
+    "keyboard_name": "Devil68 Pro",
+    "url": "",
+    "maintainer": "HorrorTroll",
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"`~", "x":15, "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, "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":"PgUp", "x":15, "y":2},
+
+                {"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":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+                {"label":"PgDn", "x":15, "y":3},
+
+                {"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},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Fn", "x":11, "y":4},
+                {"label":"Ctrl", "x":12, "y":4},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
+                {"label":"\u2192", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b110cf8546
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c
@@ -0,0 +1,187 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 <string.h>
+#include <math.h>
+
+#include <lib/lib8tion/lib8tion.h>
+
+#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.
+
+enum layer_names {
+    _BASE = 0,
+    _FN = 1
+};
+
+enum user_rgb_mode {
+    RGB_MODE_ALL,
+    RGB_MODE_KEYLIGHT,
+    RGB_MODE_UNDERGLOW,
+    RGB_MODE_NONE,
+};
+
+typedef union {
+    uint32_t raw;
+    struct {
+        uint8_t rgb_mode :8;
+    };
+} user_config_t;
+
+user_config_t user_config;
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bakspc│ ` │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │Del│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │PgU│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ ↑ │PgD│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+       │LCrl│GUI │LAlt│         Space          │RAt│Fn │RCl│ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │ ~ │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+       │    │    │    │                        │   │   │   │   │   │   │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4     5     6       7     8     9        10       11       12       13       14       15     */
+    [_BASE] = LAYOUT_65_ansi(
+                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_GRV,
+                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_CAPS,          KC_A,    KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
+                         KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+                KC_LCTL, KC_LGUI,          KC_LALT,             KC_SPC,                      KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │Rst│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │     │   │ ↑ │   │   │   │   │   │Ins│   │PSc│   │   │ Hui │Mod│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │      │ ← │ ↓ │ → │   │   │   │   │   │Tog│   │   │        │Hom│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │        │   │   │Cal│   │   │   │Mut│VoD│VoU│   │      │Vai│End│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+       │    │    │    │                        │   │   │App│Spd│Vad│Spi│
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3         4        5        6        7        8        9        10       11       12       13       14     */
+    [_FN]   = LAYOUT_65_ansi(
+                _______, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, RESET,
+                _______,          _______, KC_UP,   _______,  _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, RGB_HUI, RGB_MOD,
+                _______,          KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______,          KC_HOME,
+                         _______, _______, _______,  KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, RGB_VAI, KC_END,
+                _______, _______,          _______,                    _______,                            _______, _______, KC_APP,  RGB_SPD, RGB_VAD, RGB_SPI
+            ),
+};
+
+void keyboard_post_init_kb(void) {
+    user_config.raw = eeconfig_read_user();
+    switch (user_config.rgb_mode) {
+        case RGB_MODE_ALL:
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_enable_noeeprom();
+            break;
+        case RGB_MODE_KEYLIGHT:
+            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case RGB_MODE_UNDERGLOW:
+            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case RGB_MODE_NONE:
+            rgb_matrix_set_flags(LED_FLAG_NONE);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_KEYLIGHT;
+                    }
+                    break;
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_UNDERGLOW;
+                    }
+                    break;
+                    case (LED_FLAG_UNDERGLOW): {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_NONE;
+                    }
+                    break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                        user_config.rgb_mode = RGB_MODE_ALL;
+                    }
+                    break;
+                }
+                eeconfig_update_user(user_config.raw);
+            }
+            return false;
+	}
+
+    return true;
+}
+
+void rgb_matrix_indicators_user(void) {
+    HSV      hsv = rgb_matrix_config.hsv;
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
+    hsv.h        = time;
+    RGB      rgb = hsv_to_rgb(hsv);
+
+    if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
+        if (host_keyboard_led_state().caps_lock) {
+            rgb_matrix_set_color(30, rgb.r, rgb.g, rgb.b);
+        }
+    } else {
+        if (host_keyboard_led_state().caps_lock) {
+            rgb_matrix_set_color(30, rgb.r, rgb.g, rgb.b);
+        } else {
+            rgb_matrix_set_color(30, 0, 0, 0);
+        }
+    }
+}
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/readme.md b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/readme.md
new file mode 100644
index 0000000000..820d3551c3
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# Default Layout
+
+Keymap is default 68 qwerty, 65% layout
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/config.h
new file mode 100644
index 0000000000..fe6aa8c1f7
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 DYNAMIC_KEYMAP_LAYER_COUNT 2
+
+#ifdef RGB_MATRIX_ENABLE
+    #define VIA_QMK_RGBLIGHT_ENABLE
+#endif
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b110cf8546
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c
@@ -0,0 +1,187 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 <string.h>
+#include <math.h>
+
+#include <lib/lib8tion/lib8tion.h>
+
+#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.
+
+enum layer_names {
+    _BASE = 0,
+    _FN = 1
+};
+
+enum user_rgb_mode {
+    RGB_MODE_ALL,
+    RGB_MODE_KEYLIGHT,
+    RGB_MODE_UNDERGLOW,
+    RGB_MODE_NONE,
+};
+
+typedef union {
+    uint32_t raw;
+    struct {
+        uint8_t rgb_mode :8;
+    };
+} user_config_t;
+
+user_config_t user_config;
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bakspc│ ` │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │Del│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │PgU│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ ↑ │PgD│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+       │LCrl│GUI │LAlt│         Space          │RAt│Fn │RCl│ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │ ~ │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │   │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+       │    │    │    │                        │   │   │   │   │   │   │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4     5     6       7     8     9        10       11       12       13       14       15     */
+    [_BASE] = LAYOUT_65_ansi(
+                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_GRV,
+                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_CAPS,          KC_A,    KC_S,    KC_D, KC_F, KC_G,   KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
+                         KC_LSFT, KC_Z,    KC_X,    KC_C, KC_V, KC_B,   KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+                KC_LCTL, KC_LGUI,          KC_LALT,             KC_SPC,                      KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │Rst│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │     │   │ ↑ │   │   │   │   │   │Ins│   │PSc│   │   │ Hui │Mod│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │      │ ← │ ↓ │ → │   │   │   │   │   │Tog│   │   │        │Hom│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │        │   │   │Cal│   │   │   │Mut│VoD│VoU│   │      │Vai│End│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+       │    │    │    │                        │   │   │App│Spd│Vad│Spi│
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3         4        5        6        7        8        9        10       11       12       13       14     */
+    [_FN]   = LAYOUT_65_ansi(
+                _______, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,           _______, RESET,
+                _______,          _______, KC_UP,   _______,  _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, RGB_HUI, RGB_MOD,
+                _______,          KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, RGB_TOG, _______, _______, _______,          KC_HOME,
+                         _______, _______, _______,  KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          _______, RGB_VAI, KC_END,
+                _______, _______,          _______,                    _______,                            _______, _______, KC_APP,  RGB_SPD, RGB_VAD, RGB_SPI
+            ),
+};
+
+void keyboard_post_init_kb(void) {
+    user_config.raw = eeconfig_read_user();
+    switch (user_config.rgb_mode) {
+        case RGB_MODE_ALL:
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_enable_noeeprom();
+            break;
+        case RGB_MODE_KEYLIGHT:
+            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case RGB_MODE_UNDERGLOW:
+            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case RGB_MODE_NONE:
+            rgb_matrix_set_flags(LED_FLAG_NONE);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_KEYLIGHT;
+                    }
+                    break;
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_UNDERGLOW;
+                    }
+                    break;
+                    case (LED_FLAG_UNDERGLOW): {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_NONE;
+                    }
+                    break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                        user_config.rgb_mode = RGB_MODE_ALL;
+                    }
+                    break;
+                }
+                eeconfig_update_user(user_config.raw);
+            }
+            return false;
+	}
+
+    return true;
+}
+
+void rgb_matrix_indicators_user(void) {
+    HSV      hsv = rgb_matrix_config.hsv;
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
+    hsv.h        = time;
+    RGB      rgb = hsv_to_rgb(hsv);
+
+    if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
+        if (host_keyboard_led_state().caps_lock) {
+            rgb_matrix_set_color(30, rgb.r, rgb.g, rgb.b);
+        }
+    } else {
+        if (host_keyboard_led_state().caps_lock) {
+            rgb_matrix_set_color(30, rgb.r, rgb.g, rgb.b);
+        } else {
+            rgb_matrix_set_color(30, 0, 0, 0);
+        }
+    }
+}
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/readme.md b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/readme.md
new file mode 100644
index 0000000000..af924c17b7
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/readme.md
@@ -0,0 +1,3 @@
+# Default Layout with VIA
+
+Keymap is default 68 qwerty, 65% layout
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/rules.mk b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/readme.md b/keyboards/horrortroll/chinese_pcb/devil68_pro/readme.md
new file mode 100644
index 0000000000..27bd974af4
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/readme.md
@@ -0,0 +1,24 @@
+# Devil68 Pro
+
+Support Atmega32u4 keyboard.
+
+* Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
+* Hardware Supported: Atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+    make horrortroll/chinese_pcb/devil68_pro:default
+
+Flashing example for this keyboard:
+
+    make horrortroll/chinese_pcb/devil68_pro:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (3,6) in the matrix (B key) and plug in the keyboard
+* **Reset by wire**: Using a wire, 1 head to GND hole and other one to Reset pin on MCU
+* **Keycode in layout**: Press the key mapped to RESET if it is available
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk b/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk
new file mode 100644
index 0000000000..66354d7926
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# RGB Matrix enabled
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/horrortroll/chinese_pcb/readme.md b/keyboards/horrortroll/chinese_pcb/readme.md
new file mode 100644
index 0000000000..4667678753
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/readme.md
@@ -0,0 +1,13 @@
+# A folder for some Chinese PCB without source code
+
+This is a folder for collection code of Chinese PCB, where they only sold one-time limited on Taobao and no source code or contact info of Maker. Everything was re-write by using multimeter and sometimes with ISP/ICP flashing!
+
+## List for the reason why these keyboard in here:
+<details>
+  <summary>Click to expand!</summary>
+
+  | Keyboard name | MCU         | Layout        | LED  | OLED | Other | Reason                                               |
+  | ------------- | ----------- | ------------- | ---- | ---- | ----- | ---------------------------------------------------- |
+  | Devil68 Pro   | Atmega32U4  | 68 Keys (65%) | RGB  | No   | No    | Lost contact info of Maker on Taobao, no source code |
+  |               |             |               |      |      |       |                                                      |
+</details>
diff --git a/keyboards/horrortroll/readme.md b/keyboards/horrortroll/readme.md
new file mode 100644
index 0000000000..0cef793ef9
--- /dev/null
+++ b/keyboards/horrortroll/readme.md
@@ -0,0 +1,11 @@
+# Welcome to my keyboard folder
+
+In here, you can find:
+- Chinese PCB that doesn't have source code (lost contact of Maker, can't found on Taobao, ... etc)
+- My keyboard (ETA on future)
+
+## Contact me if you have any problem
+
+**Discord:** HorrorTroll#0975  
+**Facebook:** https://www.facebook.com/PhamChonChe.Duc/  
+**Email:** sonicvipduc@gmail.com

From 922e29f16c660133ae1d25ab64b91d388fdd17d0 Mon Sep 17 00:00:00 2001
From: Paul James <paul@peej.co.uk>
Date: Sat, 15 Jan 2022 08:28:03 +0100
Subject: [PATCH 311/867] [Keyboard] Add Rosaline (#15595)

---
 keyboards/peej/rosaline/config.h              |  41 ++++++
 keyboards/peej/rosaline/info.json             | 126 ++++++++++++++++++
 .../peej/rosaline/keymaps/default/keymap.c    |  64 +++++++++
 .../peej/rosaline/keymaps/ortho/keymap.c      |  64 +++++++++
 .../peej/rosaline/keymaps/via-ortho/keymap.c  |  46 +++++++
 .../peej/rosaline/keymaps/via-ortho/rules.mk  |   1 +
 keyboards/peej/rosaline/keymaps/via/keymap.c  |  46 +++++++
 keyboards/peej/rosaline/keymaps/via/rules.mk  |   1 +
 keyboards/peej/rosaline/readme.md             |  18 +++
 keyboards/peej/rosaline/rosaline.c            |  29 ++++
 keyboards/peej/rosaline/rosaline.h            |  58 ++++++++
 keyboards/peej/rosaline/rules.mk              |  18 +++
 12 files changed, 512 insertions(+)
 create mode 100644 keyboards/peej/rosaline/config.h
 create mode 100644 keyboards/peej/rosaline/info.json
 create mode 100644 keyboards/peej/rosaline/keymaps/default/keymap.c
 create mode 100644 keyboards/peej/rosaline/keymaps/ortho/keymap.c
 create mode 100644 keyboards/peej/rosaline/keymaps/via-ortho/keymap.c
 create mode 100644 keyboards/peej/rosaline/keymaps/via-ortho/rules.mk
 create mode 100644 keyboards/peej/rosaline/keymaps/via/keymap.c
 create mode 100644 keyboards/peej/rosaline/keymaps/via/rules.mk
 create mode 100644 keyboards/peej/rosaline/readme.md
 create mode 100644 keyboards/peej/rosaline/rosaline.c
 create mode 100644 keyboards/peej/rosaline/rosaline.h
 create mode 100644 keyboards/peej/rosaline/rules.mk

diff --git a/keyboards/peej/rosaline/config.h b/keyboards/peej/rosaline/config.h
new file mode 100644
index 0000000000..603cad792f
--- /dev/null
+++ b/keyboards/peej/rosaline/config.h
@@ -0,0 +1,41 @@
+/* Copyright 2021 Paul James
+ *
+ * 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 0x706A
+#define PRODUCT_ID 0x0003
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Peej
+#define PRODUCT Rosaline
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 8
+#define MATRIX_ROW_PINS { C0, B5, B4, B3, B2, B1, C3, D5 }
+#define MATRIX_COL_PINS { B0, D7, D6, C2, D4, D1, D0, C1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define USB_MAX_POWER_CONSUMPTION 100
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/peej/rosaline/info.json b/keyboards/peej/rosaline/info.json
new file mode 100644
index 0000000000..8a6f71aae2
--- /dev/null
+++ b/keyboards/peej/rosaline/info.json
@@ -0,0 +1,126 @@
+{
+  "keyboard_name": "Rosaline",
+  "url": "https://github.com/peej/rosaline-keyboard",
+  "maintainer": "Peej",
+  "layouts": {
+    "LAYOUT_staggered_40": {
+      "layout": [
+        { "x": 0, "y": 0, "w": 1.5 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
+        { "x": 6, "y": 0 },
+        { "x": 7, "y": 0 },
+        { "x": 8, "y": 0 },
+        { "x": 9, "y": 0 },
+        { "x": 10, "y": 0 },
+        { "x": 11, "y": 0 },
+        { "x": 12, "y": 0 },
+        { "x": 13, "y": 0, "w": 1.5 },
+        { "x": 0, "y": 1, "w": 1.75 },
+        { "x": 1, "y": 1 },
+        { "x": 2, "y": 1 },
+        { "x": 3, "y": 1 },
+        { "x": 4, "y": 1 },
+        { "x": 5, "y": 1 },
+        { "x": 6, "y": 1 },
+        { "x": 7, "y": 1 },
+        { "x": 8, "y": 1 },
+        { "x": 9, "y": 1 },
+        { "x": 10, "y": 1 },
+        { "x": 11, "y": 1 },
+        { "x": 12, "y": 1, "w": 2.25 },
+        { "x": 0, "y": 2, "w": 2.25 },
+        { "x": 1, "y": 2 },
+        { "x": 2, "y": 2 },
+        { "x": 3, "y": 2 },
+        { "x": 4, "y": 2 },
+        { "x": 5, "y": 2 },
+        { "x": 6, "y": 2 },
+        { "x": 7, "y": 2 },
+        { "x": 8, "y": 2 },
+        { "x": 9, "y": 2 },
+        { "x": 10, "y": 2 },
+        { "x": 11, "y": 2, "w": 1.75 },
+        { "x": 12, "y": 2 },
+        { "x": 0, "y": 3, "w": 1.5 },
+        { "x": 1, "y": 3, "w": 1.5 },
+        { "x": 2, "y": 3, "w": 1.5 },
+        { "x": 3, "y": 3, "w": 2.75 },
+        { "x": 4, "y": 3 },
+        { "x": 5, "y": 3, "w": 2.25 },
+        { "x": 6, "y": 3 },
+        { "x": 7, "y": 3 },
+        { "x": 8, "y": 3 },
+        { "x": 9, "y": 3 },
+        { "x": 10, "y": 3 }
+      ]
+    },
+    "LAYOUT_ortho_4x15": {
+      "layout": [
+        { "x": 0, "y": 0 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
+        { "x": 6, "y": 0 },
+        { "x": 7, "y": 0 },
+        { "x": 8, "y": 0 },
+        { "x": 9, "y": 0 },
+        { "x": 10, "y": 0 },
+        { "x": 11, "y": 0 },
+        { "x": 12, "y": 0 },
+        { "x": 13, "y": 0 },
+        { "x": 14, "y": 0 },
+        { "x": 0, "y": 1 },
+        { "x": 1, "y": 1 },
+        { "x": 2, "y": 1 },
+        { "x": 3, "y": 1 },
+        { "x": 4, "y": 1 },
+        { "x": 5, "y": 1 },
+        { "x": 6, "y": 1 },
+        { "x": 7, "y": 1 },
+        { "x": 8, "y": 1 },
+        { "x": 9, "y": 1 },
+        { "x": 10, "y": 1 },
+        { "x": 11, "y": 1 },
+        { "x": 12, "y": 1 },
+        { "x": 13, "y": 1 },
+        { "x": 14, "y": 1 },
+        { "x": 0, "y": 2 },
+        { "x": 1, "y": 2 },
+        { "x": 2, "y": 2 },
+        { "x": 3, "y": 2 },
+        { "x": 4, "y": 2 },
+        { "x": 5, "y": 2 },
+        { "x": 6, "y": 2 },
+        { "x": 7, "y": 2 },
+        { "x": 8, "y": 2 },
+        { "x": 9, "y": 2 },
+        { "x": 10, "y": 2 },
+        { "x": 11, "y": 2 },
+        { "x": 12, "y": 2 },
+        { "x": 13, "y": 2 },
+        { "x": 14, "y": 2 },
+        { "x": 0, "y": 3 },
+        { "x": 1, "y": 3 },
+        { "x": 2, "y": 3 },
+        { "x": 3, "y": 3 },
+        { "x": 4, "y": 3 },
+        { "x": 5, "y": 3 },
+        { "x": 6, "y": 3 },
+        { "x": 7, "y": 3 },
+        { "x": 8, "y": 3 },
+        { "x": 9, "y": 3 },
+        { "x": 10, "y": 3 },
+        { "x": 11, "y": 3 },
+        { "x": 12, "y": 3 },
+        { "x": 13, "y": 3 },
+        { "x": 14, "y": 3 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/peej/rosaline/keymaps/default/keymap.c b/keyboards/peej/rosaline/keymaps/default/keymap.c
new file mode 100644
index 0000000000..fc659293f0
--- /dev/null
+++ b/keyboards/peej/rosaline/keymaps/default/keymap.c
@@ -0,0 +1,64 @@
+/* Copyright 2021 Paul James
+ *
+ * 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 layers {
+  _QWERTY = 0,
+  _FUNCTION
+};
+
+#define FN MO(_FUNCTION)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,--------.------.------.------.------.------.------.------.------.------.------.------.------.--------.
+ * | Tab    |  Q   |  W   |  E   |  R   |  T   |  Y   |  U   |  I   |  O   |  P   |  [   |  ]   | Bksp   |
+ * |--------'-.----'-.----'-.----'-.----'-.----'-.----'-.----'-.----'-.----'-.----'-.----'-.----'--------|
+ * | Esc      |  A   |  S   |  D   |  F   |  G   |  H   |  J   |  K   |  L   |  ;   |  '   | Enter       |
+ * |----------'---.--'---.--'---.--'---.--'---.--'---.--'---.--'---.--'---.--'---.--'---.--'------.------|
+ * | Shft         |  Z   |  X   |  C   |  V   |  B   |  N   |  M   |  ,   |  .   |  /   | Shft    |  Fn  |
+ * |--------.-----'.-----'--.---'------'------'---.--'------'--.---'--.---'--.---'--.---'--.------+------|
+ * | Ctrl   | Gui  | Alt    | Space               | Space      | Alt  | Ctrl | Left | Down |  Up  | Rght |
+ * `--------'------'--------'---------------------'------------'------'------'------'------'------'------'
+ */
+[_QWERTY] = LAYOUT_staggered_40(
+    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_BSPC,
+    KC_GESC, 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,   FN,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+),
+
+/* Function
+ * ,--------.------.------.------.------.------.------.------.------.------.------.------.------.--------.
+ * | Tab    |  1   |  2   |  3   |  4   |  5   |  6   |  7   |  8   |  9   |  0   |  -   |  =   | Del    |
+ * |--------'-.----'-.----'-.----'-.----'-.----'-.----'-.----'-.----'-.----'-.----'-.----'-.----'--------|
+ * | Esc      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 | Enter       |
+ * |----------'---.--'---.--'---.--'---.--'---.--'---.--'---.--'---.--'---.--'---.--'---.--'------.------|
+ * | Shft         |  Z   |  X   |  C   |  V   |  B   |  N   |  M   |  ,   |  .   |  /   | Shft    |  Fn  |
+ * |--------.-----'.-----'--.---'------'------'---.--'------'--.---'--.---'--.---'--.---'--.------+------|
+ * | Ctrl   | Gui  | Alt    | Space               | Space      | Alt  | Ctrl | Left | Down |  Up  | Rght |
+ * `--------'------'--------'---------------------'------------'------'------'------'------'------'------'
+ */
+[_FUNCTION] = LAYOUT_staggered_40(
+    _______, 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_DEL,
+    _______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,        _______,
+    _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______,    _______,
+    _______, _______, _______,     _______,          _______,             _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
+)
+
+};
diff --git a/keyboards/peej/rosaline/keymaps/ortho/keymap.c b/keyboards/peej/rosaline/keymaps/ortho/keymap.c
new file mode 100644
index 0000000000..e307ecccb3
--- /dev/null
+++ b/keyboards/peej/rosaline/keymaps/ortho/keymap.c
@@ -0,0 +1,64 @@
+/* Copyright 2021 Paul James
+ *
+ * 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 layers {
+  _QWERTY = 0,
+  _FUNCTION
+};
+
+#define FN MO(_FUNCTION)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,--------------------------------------------------------------------------------------------------------.
+ * | Tab  |  Q   |  W   |  E   |  R   |  T   |  7   |  8   |  9   |  Y   |  U   |  I   |  O   |  P   | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |  A   |  S   |  D   |  F   |  G   |  4   |  5   |  6   |  H   |  J   |  K   |  L   |  ;   |  '   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shft |  Z   |  X   |  C   |  V   |  B   |  1   |  2   |  3   |  N   |  M   |  ,   |  .   |  /   | Entr |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl |  Fn  | Alt  | Cmd  |  Fn  | Spac | Spac |  0   | Spac | Spac |  Fn  | Left | Down |  Up  | Rght |
+ * `--------------------------------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_ortho_4x15(
+    KC_TAB,  KC_Q, KC_W,    KC_E,    KC_R, KC_T,   KC_P7,  KC_P8, KC_P9,  KC_Y,   KC_U, KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_GESC, KC_A, KC_S,    KC_D,    KC_F, KC_G,   KC_P4,  KC_P5, KC_P6,  KC_H,   KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z, KC_X,    KC_C,    KC_V, KC_B,   KC_P1,  KC_P2, KC_P3,  KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+    KC_LCTL, FN,   KC_LALT, KC_LGUI, FN,   KC_SPC, KC_SPC, KC_P0, KC_SPC, KC_SPC, FN,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Function
+ * ,--------------------------------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |  F7  |  F8  |  F9  |   6  |   7  |   8  |   9  |   0  | Del  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F4  |  F5  |  F6  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F1  |  F2  |  F3  |  F12 |ISO # |ISO / |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |  F10 |      |      |      | Next | Vol- | Vol+ | Play |
+ * `--------------------------------------------------------------------------------------------------------'
+ */
+[_FUNCTION] = LAYOUT_ortho_4x15(
+    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_F7,   KC_F8,  KC_F9,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F4,   KC_F5,  KC_F6,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F1,   KC_F2,  KC_F3,   KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, KC_F10, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+)
+
+};
diff --git a/keyboards/peej/rosaline/keymaps/via-ortho/keymap.c b/keyboards/peej/rosaline/keymaps/via-ortho/keymap.c
new file mode 100644
index 0000000000..0a6068fa96
--- /dev/null
+++ b/keyboards/peej/rosaline/keymaps/via-ortho/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2021 Paul James
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_ortho_4x15(
+    KC_TAB,  KC_Q,   KC_W,     KC_E,    KC_R,   KC_T,     KC_P7,   KC_P8,   KC_P9,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_GESC, KC_A,   KC_S,     KC_D,    KC_F,   KC_G,     KC_P4,   KC_P5,   KC_P6,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,   KC_X,     KC_C,    KC_V,   KC_B,     KC_P1,   KC_P2,   KC_P3,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+    KC_LCTL, MO(1),  KC_LALT,  KC_LGUI, MO(1),  KC_SPC,   KC_SPC,  KC_P0,   KC_SPC,  KC_SPC,  MO(1),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+[1] = LAYOUT_ortho_4x15(
+    _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_F7,   KC_F8,   KC_F9,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F4,   KC_F5,   KC_F6,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, KC_F10,  _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+[2] = LAYOUT_ortho_4x15(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+[3] = LAYOUT_ortho_4x15(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+};
diff --git a/keyboards/peej/rosaline/keymaps/via-ortho/rules.mk b/keyboards/peej/rosaline/keymaps/via-ortho/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/peej/rosaline/keymaps/via-ortho/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/peej/rosaline/keymaps/via/keymap.c b/keyboards/peej/rosaline/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1d6ac2ed82
--- /dev/null
+++ b/keyboards/peej/rosaline/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2021 Paul James
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_staggered_40(
+    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_BSPC,
+    KC_GESC, 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, MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT
+),
+[1] = LAYOUT_staggered_40(
+    _______, 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_DEL,
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
+),
+[2] = LAYOUT_staggered_40(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+[3] = LAYOUT_staggered_40(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+};
diff --git a/keyboards/peej/rosaline/keymaps/via/rules.mk b/keyboards/peej/rosaline/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/peej/rosaline/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/peej/rosaline/readme.md b/keyboards/peej/rosaline/readme.md
new file mode 100644
index 0000000000..033faa34f2
--- /dev/null
+++ b/keyboards/peej/rosaline/readme.md
@@ -0,0 +1,18 @@
+# Rosaline
+
+## Through-hole 40% keyboard PCB for 60% cases
+
+![juliet](https://github.com/peej/rosaline-keyboard/raw/master/images/pcb.jpg)
+
+40% staggered or 4x15 ortholinear PCB for 60% tray mount cases with only through hole components.
+
+* Keyboard Maintainer: [Paul James](https://github.com/peej)
+* Hardware Supported: ATMEGA328p with vusb [PCB](https://github.com/peej/rosaline-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make peej/rosaline:default
+
+## Bootloader
+
+Use usbasploader in [hsgw's repository](https://github.com/hsgw/USBaspLoader/tree/plaid).
diff --git a/keyboards/peej/rosaline/rosaline.c b/keyboards/peej/rosaline/rosaline.c
new file mode 100644
index 0000000000..57141e8064
--- /dev/null
+++ b/keyboards/peej/rosaline/rosaline.c
@@ -0,0 +1,29 @@
+/* Copyright 2021 Paul James
+ *
+ * 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 "rosaline.h"
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    writePin(LED1, record->event.pressed);
+
+    return process_record_user(keycode, record);
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    writePin(LED2, state);
+
+    return layer_state_set_user(state);
+}
diff --git a/keyboards/peej/rosaline/rosaline.h b/keyboards/peej/rosaline/rosaline.h
new file mode 100644
index 0000000000..1e41a2e95e
--- /dev/null
+++ b/keyboards/peej/rosaline/rosaline.h
@@ -0,0 +1,58 @@
+/* Copyright 2021 Paul James
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_staggered_40( \
+	k00, k01, k10, k20, k21, k30, k31, k40, k41, k50, k60, k61, k70, k71, \
+	k02, k11, k12, k22, k23, k32, k33, k42, k51, k52, k62, k63, k72, \
+	k03, k13, k14, k24, k34, k35, k43, k44, k53, k54, k64, k73, k74, \
+	k04, k05, k15, k25, k45, k55, k56, k65, k66, k75, k76 \
+) \
+{ \
+	{ k00, k10, k20, k30, k40, k50, k60, k70 }, \
+	{ k01, k11, k21, k31, k41, k51, k61, k71 }, \
+	{ k02, k12, k22, k32, k42, k52, k62, k72 }, \
+	{ k03, k13, k23, k33, k43, k53, k63, k73 }, \
+	{ k04, k14, k24, k34, k44, k54, k64, k74 }, \
+	{ k05, k15, k25, k35, k45, k55, k65, k75 }, \
+	{ XXX, XXX, XXX, XXX, XXX, k56, k66, k76 }, \
+	{ XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
+}
+
+#define LAYOUT_ortho_4x15( \
+	k00, k04, k10, k14, k20, k24, k30, k34, k40, k44, k50, k54, k60, k64, k70, \
+	k01, k05, k11, k15, k21, k25, k31, k35, k41, k45, k51, k55, k61, k65, k71, \
+	k02, k06, k12, k16, k22, k26, k32, k36, k42, k46, k52, k56, k62, k66, k72, \
+	k03, k07, k13, k17, k23, k27, k33, k37, k43, k47, k53, k57, k63, k67, k73 \
+) \
+{ \
+	{ k00, k10, k20, k30, k40, k50, k60, k70 }, \
+	{ k01, k11, k21, k31, k41, k51, k61, k71 }, \
+	{ k02, k12, k22, k32, k42, k52, k62, k72 }, \
+	{ k03, k13, k23, k33, k43, k53, k63, k73 }, \
+	{ k04, k14, k24, k34, k44, k54, k64, XXX }, \
+	{ k05, k15, k25, k35, k45, k55, k65, XXX }, \
+	{ k06, k16, k26, k36, k46, k56, k66, XXX }, \
+	{ k07, k17, k27, k37, k47, k57, k67, XXX } \
+}
+
+#define LED1 C5
+#define LED2 C4
diff --git a/keyboards/peej/rosaline/rules.mk b/keyboards/peej/rosaline/rules.mk
new file mode 100644
index 0000000000..d8133b74ab
--- /dev/null
+++ b/keyboards/peej/rosaline/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega328p
+
+# Bootloader selection
+BOOTLOADER = USBasp
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 5bad37cb564fa2ce210c9dbeac99e046304a9614 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 14 Jan 2022 23:28:29 -0800
Subject: [PATCH 312/867] [Bug] Remove config.h include in dynamic_keymap.c
 (#15886)

---
 quantum/dynamic_keymap.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index f5525576d8..19a6bea59a 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
 #include "keymap.h"  // to get keymaps[][][]
 #include "eeprom.h"
 #include "progmem.h"  // to read default from flash

From 7edfb4deffdf648c69d080ff082bf786485708e0 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 14 Jan 2022 23:51:02 -0800
Subject: [PATCH 313/867] [Keyboard] Fix compilation issues for mechlovin hex4b
 (#15885)

---
 data/mappings/keyboard_aliases.json |  3 +++
 keyboards/mechlovin/hex4b/rules.mk  | 22 +---------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index 60c91b1bfc..c9467f7c84 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -344,6 +344,9 @@
     'mechlovin/hannah65/mechlovin9': {
           target: 'mechlovin/mechlovin9/rev1'
     },
+    'mechlovin/hex4b': {
+          target: 'mechlovin/hex4b/rev1'
+    },
     'melgeek/z70ultra': {
           target: 'melgeek/z70ultra/rev1'
     },
diff --git a/keyboards/mechlovin/hex4b/rules.mk b/keyboards/mechlovin/hex4b/rules.mk
index c3a1785039..e3d9ab46b4 100644
--- a/keyboards/mechlovin/hex4b/rules.mk
+++ b/keyboards/mechlovin/hex4b/rules.mk
@@ -1,21 +1 @@
-# MCU name
-MCU = atmega32a
-
-# Bootloader selection
-BOOTLOADER = usbasploader
-
-# Processor frequency
-F_CPU = 16000000
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-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
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+DEFAULT_FOLDER = mechlovin/hex4b/rev1

From 5380e6758c8ba974ceffbb101aab724b98aef968 Mon Sep 17 00:00:00 2001
From: Bartosz Nowak <bartosz.nowak@vimn.com>
Date: Sat, 15 Jan 2022 21:23:09 +0100
Subject: [PATCH 314/867] Fix dactyl manuform 6x6 LAYOUT_6x6_5_thumb rendering
 (#15891)

---
 keyboards/handwired/dactyl_manuform/6x6/info.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/keyboards/handwired/dactyl_manuform/6x6/info.json b/keyboards/handwired/dactyl_manuform/6x6/info.json
index 9154312580..1f4e7dc3a4 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/info.json
@@ -100,7 +100,7 @@
                 {"x": 10, "y": 8}
             ]
         },
-        
+
         "LAYOUT_6x6_5_thumb": {
             "layout": [
                 {"x": 0, "y": 0},
@@ -180,8 +180,7 @@
                 {"x": 14, "y": 5},
 
                 {"x": 4, "y": 6},
-
-                {"x": 11, "y": 6},
+                {"x": 12, "y": 6},
 
                 {"x": 6, "y": 7},
                 {"x": 7, "y": 7},

From 1d3c2cededd43dbe5a091c1495aafb6cebc99220 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Mon, 17 Jan 2022 03:48:09 +0800
Subject: [PATCH 315/867] Add init function to clear previous effect (#15815)

---
 quantum/rgb_matrix/animations/pixel_fractal_anim.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/quantum/rgb_matrix/animations/pixel_fractal_anim.h b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
index 8e25ec402c..35187b92de 100644
--- a/quantum/rgb_matrix/animations/pixel_fractal_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
@@ -31,6 +31,10 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
 
     inline uint32_t interval(void) { return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16); }
 
+    if (params->init) {
+        rgb_matrix_set_color_all(0, 0, 0);
+    }
+
     RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv);
     for (uint8_t h = 0; h < MATRIX_ROWS; ++h) {
         for (uint8_t l = 0; l < MID_COL - 1; ++l) {  // Light and move left columns outwards

From 15290f43669d1ca0a97631f144fa361477d329d3 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Mon, 17 Jan 2022 03:53:11 +0800
Subject: [PATCH 316/867] rename idobo to idobao/id75, move to vendor folder
 (#15661)

* rename idobo to idobao/id75, move to vendor folder

* add image, amend readme to id75

* add buying link
---
 data/mappings/keyboard_aliases.json                  |  3 +++
 keyboards/{idobo => idobao/id75}/config.h            |  0
 keyboards/{idobo/idobo.c => idobao/id75/id75.c}      |  2 +-
 keyboards/{idobo/idobo.h => idobao/id75/id75.h}      |  0
 keyboards/{idobo => idobao/id75}/info.json           |  0
 .../{idobo => idobao/id75}/keymaps/default/keymap.c  |  0
 .../{idobo => idobao/id75}/keymaps/default/readme.md |  0
 .../id75}/keymaps/default75/keymap.c                 |  0
 .../id75}/keymaps/default75/readme.md                |  0
 .../{idobo => idobao/id75}/keymaps/drewdobo/config.h |  0
 .../{idobo => idobao/id75}/keymaps/drewdobo/keymap.c |  0
 .../id75}/keymaps/drewdobo/readme.md                 |  0
 .../{idobo => idobao/id75}/keymaps/drewdobo/rules.mk |  0
 .../{idobo => idobao/id75}/keymaps/egstad/config.h   |  0
 .../{idobo => idobao/id75}/keymaps/egstad/keymap.c   |  0
 .../{idobo => idobao/id75}/keymaps/egstad/readme.md  |  0
 .../{idobo => idobao/id75}/keymaps/egstad/rules.mk   |  0
 .../{idobo => idobao/id75}/keymaps/gkbd/config.h     |  0
 .../{idobo => idobao/id75}/keymaps/gkbd/keymap.c     |  0
 .../{idobo => idobao/id75}/keymaps/gkbd/readme.md    |  0
 .../{idobo => idobao/id75}/keymaps/gkbd/rules.mk     |  0
 .../{idobo => idobao/id75}/keymaps/gkbd_75/config.h  |  0
 .../{idobo => idobao/id75}/keymaps/gkbd_75/keymap.c  |  0
 .../{idobo => idobao/id75}/keymaps/gkbd_75/readme.md |  0
 .../id75}/keymaps/gkbd_orthon/config.h               |  0
 .../id75}/keymaps/gkbd_orthon/keymap.c               |  0
 .../id75}/keymaps/gkbd_orthon/readme.md              |  0
 .../keyboard-layout-editor-gsm-idobo.json            |  0
 .../id75}/keymaps/greenshadowmaker/keymap.c          |  0
 .../id75}/keymaps/greenshadowmaker/readme.md         |  0
 .../id75}/keymaps/greenshadowmaker/rules.mk          |  0
 .../id75}/keymaps/ifohancroft/config.h               |  0
 .../id75}/keymaps/ifohancroft/keymap.c               |  0
 .../id75}/keymaps/ifohancroft/readme.md              |  0
 .../id75}/keymaps/ifohancroft/rules.mk               |  0
 .../id75}/keymaps/pathnirvana/config.h               |  0
 .../id75}/keymaps/pathnirvana/keymap.c               |  0
 .../id75}/keymaps/pathnirvana/rules.mk               |  0
 .../{idobo => idobao/id75}/keymaps/revok75/config.h  |  0
 .../{idobo => idobao/id75}/keymaps/revok75/keymap.c  |  0
 .../{idobo => idobao/id75}/keymaps/revok75/readme.md |  0
 .../{idobo => idobao/id75}/keymaps/revok75/rules.mk  |  0
 .../{idobo => idobao/id75}/keymaps/via/keymap.c      |  0
 .../{idobo => idobao/id75}/keymaps/via/rules.mk      |  0
 .../id75}/keymaps/xaceofspaidsx/config.h             |  0
 .../id75}/keymaps/xaceofspaidsx/keymap.c             |  0
 .../id75}/keymaps/xaceofspaidsx/readme.md            |  0
 .../id75}/keymaps/xaceofspaidsx/rules.mk             |  0
 keyboards/{idobo => idobao/id75}/readme.md           | 12 +++++++-----
 keyboards/{idobo => idobao/id75}/rules.mk            |  0
 50 files changed, 11 insertions(+), 6 deletions(-)
 rename keyboards/{idobo => idobao/id75}/config.h (100%)
 rename keyboards/{idobo/idobo.c => idobao/id75/id75.c} (97%)
 rename keyboards/{idobo/idobo.h => idobao/id75/id75.h} (100%)
 rename keyboards/{idobo => idobao/id75}/info.json (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/default/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/default/readme.md (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/default75/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/default75/readme.md (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/drewdobo/config.h (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/drewdobo/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/drewdobo/readme.md (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/drewdobo/rules.mk (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/egstad/config.h (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/egstad/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/egstad/readme.md (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/egstad/rules.mk (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/gkbd/config.h (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/gkbd/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/gkbd/readme.md (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/gkbd/rules.mk (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/gkbd_75/config.h (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/gkbd_75/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/gkbd_75/readme.md (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/gkbd_orthon/config.h (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/gkbd_orthon/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/gkbd_orthon/readme.md (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/greenshadowmaker/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/greenshadowmaker/readme.md (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/greenshadowmaker/rules.mk (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/ifohancroft/config.h (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/ifohancroft/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/ifohancroft/readme.md (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/ifohancroft/rules.mk (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/pathnirvana/config.h (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/pathnirvana/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/pathnirvana/rules.mk (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/revok75/config.h (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/revok75/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/revok75/readme.md (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/revok75/rules.mk (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/via/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/via/rules.mk (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/xaceofspaidsx/config.h (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/xaceofspaidsx/keymap.c (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/xaceofspaidsx/readme.md (100%)
 rename keyboards/{idobo => idobao/id75}/keymaps/xaceofspaidsx/rules.mk (100%)
 rename keyboards/{idobo => idobao/id75}/readme.md (61%)
 rename keyboards/{idobo => idobao/id75}/rules.mk (100%)

diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index c9467f7c84..d7d2afceeb 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -215,6 +215,9 @@
                   LAYOUT: 'LAYOUT_all'
           }
     },
+    idobo: {
+        target: 'idobao/id75'
+    },
     'jj40': {
           target: 'kprepublic/jj40'
     },
diff --git a/keyboards/idobo/config.h b/keyboards/idobao/id75/config.h
similarity index 100%
rename from keyboards/idobo/config.h
rename to keyboards/idobao/id75/config.h
diff --git a/keyboards/idobo/idobo.c b/keyboards/idobao/id75/id75.c
similarity index 97%
rename from keyboards/idobo/idobo.c
rename to keyboards/idobao/id75/id75.c
index ccf654f871..0a0e08cc32 100644
--- a/keyboards/idobo/idobo.c
+++ b/keyboards/idobao/id75/id75.c
@@ -13,4 +13,4 @@
  * 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 "idobo.h"
+#include "id75.h"
diff --git a/keyboards/idobo/idobo.h b/keyboards/idobao/id75/id75.h
similarity index 100%
rename from keyboards/idobo/idobo.h
rename to keyboards/idobao/id75/id75.h
diff --git a/keyboards/idobo/info.json b/keyboards/idobao/id75/info.json
similarity index 100%
rename from keyboards/idobo/info.json
rename to keyboards/idobao/id75/info.json
diff --git a/keyboards/idobo/keymaps/default/keymap.c b/keyboards/idobao/id75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/default/keymap.c
rename to keyboards/idobao/id75/keymaps/default/keymap.c
diff --git a/keyboards/idobo/keymaps/default/readme.md b/keyboards/idobao/id75/keymaps/default/readme.md
similarity index 100%
rename from keyboards/idobo/keymaps/default/readme.md
rename to keyboards/idobao/id75/keymaps/default/readme.md
diff --git a/keyboards/idobo/keymaps/default75/keymap.c b/keyboards/idobao/id75/keymaps/default75/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/default75/keymap.c
rename to keyboards/idobao/id75/keymaps/default75/keymap.c
diff --git a/keyboards/idobo/keymaps/default75/readme.md b/keyboards/idobao/id75/keymaps/default75/readme.md
similarity index 100%
rename from keyboards/idobo/keymaps/default75/readme.md
rename to keyboards/idobao/id75/keymaps/default75/readme.md
diff --git a/keyboards/idobo/keymaps/drewdobo/config.h b/keyboards/idobao/id75/keymaps/drewdobo/config.h
similarity index 100%
rename from keyboards/idobo/keymaps/drewdobo/config.h
rename to keyboards/idobao/id75/keymaps/drewdobo/config.h
diff --git a/keyboards/idobo/keymaps/drewdobo/keymap.c b/keyboards/idobao/id75/keymaps/drewdobo/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/drewdobo/keymap.c
rename to keyboards/idobao/id75/keymaps/drewdobo/keymap.c
diff --git a/keyboards/idobo/keymaps/drewdobo/readme.md b/keyboards/idobao/id75/keymaps/drewdobo/readme.md
similarity index 100%
rename from keyboards/idobo/keymaps/drewdobo/readme.md
rename to keyboards/idobao/id75/keymaps/drewdobo/readme.md
diff --git a/keyboards/idobo/keymaps/drewdobo/rules.mk b/keyboards/idobao/id75/keymaps/drewdobo/rules.mk
similarity index 100%
rename from keyboards/idobo/keymaps/drewdobo/rules.mk
rename to keyboards/idobao/id75/keymaps/drewdobo/rules.mk
diff --git a/keyboards/idobo/keymaps/egstad/config.h b/keyboards/idobao/id75/keymaps/egstad/config.h
similarity index 100%
rename from keyboards/idobo/keymaps/egstad/config.h
rename to keyboards/idobao/id75/keymaps/egstad/config.h
diff --git a/keyboards/idobo/keymaps/egstad/keymap.c b/keyboards/idobao/id75/keymaps/egstad/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/egstad/keymap.c
rename to keyboards/idobao/id75/keymaps/egstad/keymap.c
diff --git a/keyboards/idobo/keymaps/egstad/readme.md b/keyboards/idobao/id75/keymaps/egstad/readme.md
similarity index 100%
rename from keyboards/idobo/keymaps/egstad/readme.md
rename to keyboards/idobao/id75/keymaps/egstad/readme.md
diff --git a/keyboards/idobo/keymaps/egstad/rules.mk b/keyboards/idobao/id75/keymaps/egstad/rules.mk
similarity index 100%
rename from keyboards/idobo/keymaps/egstad/rules.mk
rename to keyboards/idobao/id75/keymaps/egstad/rules.mk
diff --git a/keyboards/idobo/keymaps/gkbd/config.h b/keyboards/idobao/id75/keymaps/gkbd/config.h
similarity index 100%
rename from keyboards/idobo/keymaps/gkbd/config.h
rename to keyboards/idobao/id75/keymaps/gkbd/config.h
diff --git a/keyboards/idobo/keymaps/gkbd/keymap.c b/keyboards/idobao/id75/keymaps/gkbd/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/gkbd/keymap.c
rename to keyboards/idobao/id75/keymaps/gkbd/keymap.c
diff --git a/keyboards/idobo/keymaps/gkbd/readme.md b/keyboards/idobao/id75/keymaps/gkbd/readme.md
similarity index 100%
rename from keyboards/idobo/keymaps/gkbd/readme.md
rename to keyboards/idobao/id75/keymaps/gkbd/readme.md
diff --git a/keyboards/idobo/keymaps/gkbd/rules.mk b/keyboards/idobao/id75/keymaps/gkbd/rules.mk
similarity index 100%
rename from keyboards/idobo/keymaps/gkbd/rules.mk
rename to keyboards/idobao/id75/keymaps/gkbd/rules.mk
diff --git a/keyboards/idobo/keymaps/gkbd_75/config.h b/keyboards/idobao/id75/keymaps/gkbd_75/config.h
similarity index 100%
rename from keyboards/idobo/keymaps/gkbd_75/config.h
rename to keyboards/idobao/id75/keymaps/gkbd_75/config.h
diff --git a/keyboards/idobo/keymaps/gkbd_75/keymap.c b/keyboards/idobao/id75/keymaps/gkbd_75/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/gkbd_75/keymap.c
rename to keyboards/idobao/id75/keymaps/gkbd_75/keymap.c
diff --git a/keyboards/idobo/keymaps/gkbd_75/readme.md b/keyboards/idobao/id75/keymaps/gkbd_75/readme.md
similarity index 100%
rename from keyboards/idobo/keymaps/gkbd_75/readme.md
rename to keyboards/idobao/id75/keymaps/gkbd_75/readme.md
diff --git a/keyboards/idobo/keymaps/gkbd_orthon/config.h b/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h
similarity index 100%
rename from keyboards/idobo/keymaps/gkbd_orthon/config.h
rename to keyboards/idobao/id75/keymaps/gkbd_orthon/config.h
diff --git a/keyboards/idobo/keymaps/gkbd_orthon/keymap.c b/keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/gkbd_orthon/keymap.c
rename to keyboards/idobao/id75/keymaps/gkbd_orthon/keymap.c
diff --git a/keyboards/idobo/keymaps/gkbd_orthon/readme.md b/keyboards/idobao/id75/keymaps/gkbd_orthon/readme.md
similarity index 100%
rename from keyboards/idobo/keymaps/gkbd_orthon/readme.md
rename to keyboards/idobao/id75/keymaps/gkbd_orthon/readme.md
diff --git a/keyboards/idobo/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json b/keyboards/idobao/id75/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json
similarity index 100%
rename from keyboards/idobo/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json
rename to keyboards/idobao/id75/keymaps/greenshadowmaker/keyboard-layout-editor-gsm-idobo.json
diff --git a/keyboards/idobo/keymaps/greenshadowmaker/keymap.c b/keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/greenshadowmaker/keymap.c
rename to keyboards/idobao/id75/keymaps/greenshadowmaker/keymap.c
diff --git a/keyboards/idobo/keymaps/greenshadowmaker/readme.md b/keyboards/idobao/id75/keymaps/greenshadowmaker/readme.md
similarity index 100%
rename from keyboards/idobo/keymaps/greenshadowmaker/readme.md
rename to keyboards/idobao/id75/keymaps/greenshadowmaker/readme.md
diff --git a/keyboards/idobo/keymaps/greenshadowmaker/rules.mk b/keyboards/idobao/id75/keymaps/greenshadowmaker/rules.mk
similarity index 100%
rename from keyboards/idobo/keymaps/greenshadowmaker/rules.mk
rename to keyboards/idobao/id75/keymaps/greenshadowmaker/rules.mk
diff --git a/keyboards/idobo/keymaps/ifohancroft/config.h b/keyboards/idobao/id75/keymaps/ifohancroft/config.h
similarity index 100%
rename from keyboards/idobo/keymaps/ifohancroft/config.h
rename to keyboards/idobao/id75/keymaps/ifohancroft/config.h
diff --git a/keyboards/idobo/keymaps/ifohancroft/keymap.c b/keyboards/idobao/id75/keymaps/ifohancroft/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/ifohancroft/keymap.c
rename to keyboards/idobao/id75/keymaps/ifohancroft/keymap.c
diff --git a/keyboards/idobo/keymaps/ifohancroft/readme.md b/keyboards/idobao/id75/keymaps/ifohancroft/readme.md
similarity index 100%
rename from keyboards/idobo/keymaps/ifohancroft/readme.md
rename to keyboards/idobao/id75/keymaps/ifohancroft/readme.md
diff --git a/keyboards/idobo/keymaps/ifohancroft/rules.mk b/keyboards/idobao/id75/keymaps/ifohancroft/rules.mk
similarity index 100%
rename from keyboards/idobo/keymaps/ifohancroft/rules.mk
rename to keyboards/idobao/id75/keymaps/ifohancroft/rules.mk
diff --git a/keyboards/idobo/keymaps/pathnirvana/config.h b/keyboards/idobao/id75/keymaps/pathnirvana/config.h
similarity index 100%
rename from keyboards/idobo/keymaps/pathnirvana/config.h
rename to keyboards/idobao/id75/keymaps/pathnirvana/config.h
diff --git a/keyboards/idobo/keymaps/pathnirvana/keymap.c b/keyboards/idobao/id75/keymaps/pathnirvana/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/pathnirvana/keymap.c
rename to keyboards/idobao/id75/keymaps/pathnirvana/keymap.c
diff --git a/keyboards/idobo/keymaps/pathnirvana/rules.mk b/keyboards/idobao/id75/keymaps/pathnirvana/rules.mk
similarity index 100%
rename from keyboards/idobo/keymaps/pathnirvana/rules.mk
rename to keyboards/idobao/id75/keymaps/pathnirvana/rules.mk
diff --git a/keyboards/idobo/keymaps/revok75/config.h b/keyboards/idobao/id75/keymaps/revok75/config.h
similarity index 100%
rename from keyboards/idobo/keymaps/revok75/config.h
rename to keyboards/idobao/id75/keymaps/revok75/config.h
diff --git a/keyboards/idobo/keymaps/revok75/keymap.c b/keyboards/idobao/id75/keymaps/revok75/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/revok75/keymap.c
rename to keyboards/idobao/id75/keymaps/revok75/keymap.c
diff --git a/keyboards/idobo/keymaps/revok75/readme.md b/keyboards/idobao/id75/keymaps/revok75/readme.md
similarity index 100%
rename from keyboards/idobo/keymaps/revok75/readme.md
rename to keyboards/idobao/id75/keymaps/revok75/readme.md
diff --git a/keyboards/idobo/keymaps/revok75/rules.mk b/keyboards/idobao/id75/keymaps/revok75/rules.mk
similarity index 100%
rename from keyboards/idobo/keymaps/revok75/rules.mk
rename to keyboards/idobao/id75/keymaps/revok75/rules.mk
diff --git a/keyboards/idobo/keymaps/via/keymap.c b/keyboards/idobao/id75/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/via/keymap.c
rename to keyboards/idobao/id75/keymaps/via/keymap.c
diff --git a/keyboards/idobo/keymaps/via/rules.mk b/keyboards/idobao/id75/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/idobo/keymaps/via/rules.mk
rename to keyboards/idobao/id75/keymaps/via/rules.mk
diff --git a/keyboards/idobo/keymaps/xaceofspaidsx/config.h b/keyboards/idobao/id75/keymaps/xaceofspaidsx/config.h
similarity index 100%
rename from keyboards/idobo/keymaps/xaceofspaidsx/config.h
rename to keyboards/idobao/id75/keymaps/xaceofspaidsx/config.h
diff --git a/keyboards/idobo/keymaps/xaceofspaidsx/keymap.c b/keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c
similarity index 100%
rename from keyboards/idobo/keymaps/xaceofspaidsx/keymap.c
rename to keyboards/idobao/id75/keymaps/xaceofspaidsx/keymap.c
diff --git a/keyboards/idobo/keymaps/xaceofspaidsx/readme.md b/keyboards/idobao/id75/keymaps/xaceofspaidsx/readme.md
similarity index 100%
rename from keyboards/idobo/keymaps/xaceofspaidsx/readme.md
rename to keyboards/idobao/id75/keymaps/xaceofspaidsx/readme.md
diff --git a/keyboards/idobo/keymaps/xaceofspaidsx/rules.mk b/keyboards/idobao/id75/keymaps/xaceofspaidsx/rules.mk
similarity index 100%
rename from keyboards/idobo/keymaps/xaceofspaidsx/rules.mk
rename to keyboards/idobao/id75/keymaps/xaceofspaidsx/rules.mk
diff --git a/keyboards/idobo/readme.md b/keyboards/idobao/id75/readme.md
similarity index 61%
rename from keyboards/idobo/readme.md
rename to keyboards/idobao/id75/readme.md
index 254616decb..9f0f87360c 100644
--- a/keyboards/idobo/readme.md
+++ b/keyboards/idobao/id75/readme.md
@@ -1,17 +1,19 @@
-# IDOBO
+# ID75
 
-![IDOBO](imgur.com image replace me!)
+![ID75](https://i.imgur.com/VOP1SzD.jpeg)
 
 75Keys Aluminum Mechanical Keyboard.
 
 Firmware here originally appeared on qmkeyboard.cn
 
 Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)  
-Hardware Supported: IDOBO PCB
-Hardware Availability: [IDOBO on Drop](https://drop.com/buy/id75-hot-swappable-ortholinear-keyboard-kit)
+Hardware Supported: ID75 PCB
+Hardware Availability:
+* [ID75 on Drop](https://drop.com/buy/id75-hot-swappable-ortholinear-keyboard-kit)
+* [ID75 on IDOBAO](https://idobao.net/products/idobao-id75v1-hot-swappable-mechanical-keyboard-kit)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make idobo:default
+    make idobao/id75: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).
diff --git a/keyboards/idobo/rules.mk b/keyboards/idobao/id75/rules.mk
similarity index 100%
rename from keyboards/idobo/rules.mk
rename to keyboards/idobao/id75/rules.mk

From b24603ab7d5b731c7a09738cbfe0bce277559a47 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Mon, 17 Jan 2022 03:53:43 +0800
Subject: [PATCH 317/867] update keyboard_aliases.json (#15649)

---
 data/mappings/keyboard_aliases.json | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index c9467f7c84..b1c1acba8f 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -60,16 +60,22 @@
           target: 'kprepublic/bm43a'
     },
     bm60poker: {
-          target: 'kprepublic/bm60poker'
+          target: 'kprepublic/bm60hsrgb_poker'
     },
     bm60rgb: {
-          target: 'kprepublic/bm60rgb'
+          target: 'kprepublic/bm60hsrgb'
     },
     bm60rgb_iso: {
-          target: 'kprepublic/bm60rgb_iso'
+          target: 'kprepublic/bm60hsrgb_iso'
+    },
+    bm65rgb:{
+          target: 'kprepublic/bm65hsrgb'
+    },
+    bm65rgb_iso:{
+        target: 'kprepublic/bm65hsrgb_iso'
     },
     bm68rgb: {
-          target: 'kprepublic/bm68rgb'
+          target: 'kprepublic/bm68hsrgb'
     },
     'bpiphany/pegasushoof': {
           target: 'bpiphany/pegasushoof/2013'

From d02be63000a4f5efe728f36608c33bcdaee08330 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 17 Jan 2022 06:58:48 +1100
Subject: [PATCH 318/867] Revert "update keyboard_aliases.json (#15649)"
 (#15903)

This reverts commit b24603ab7d5b731c7a09738cbfe0bce277559a47.
---
 data/mappings/keyboard_aliases.json | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index b1c1acba8f..c9467f7c84 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -60,22 +60,16 @@
           target: 'kprepublic/bm43a'
     },
     bm60poker: {
-          target: 'kprepublic/bm60hsrgb_poker'
+          target: 'kprepublic/bm60poker'
     },
     bm60rgb: {
-          target: 'kprepublic/bm60hsrgb'
+          target: 'kprepublic/bm60rgb'
     },
     bm60rgb_iso: {
-          target: 'kprepublic/bm60hsrgb_iso'
-    },
-    bm65rgb:{
-          target: 'kprepublic/bm65hsrgb'
-    },
-    bm65rgb_iso:{
-        target: 'kprepublic/bm65hsrgb_iso'
+          target: 'kprepublic/bm60rgb_iso'
     },
     bm68rgb: {
-          target: 'kprepublic/bm68hsrgb'
+          target: 'kprepublic/bm68rgb'
     },
     'bpiphany/pegasushoof': {
           target: 'bpiphany/pegasushoof/2013'

From 217ad5cfc05a33cffbf100fe867b750f1deae7e1 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Mon, 17 Jan 2022 04:01:00 +0800
Subject: [PATCH 319/867] move yd60mq to ymdk vendor folder (#15647)

---
 data/mappings/keyboard_aliases.json                  |  2 +-
 keyboards/{ => ymdk}/yd60mq/12led/config.h           |  0
 keyboards/{ => ymdk}/yd60mq/12led/readme.md          |  0
 keyboards/{ => ymdk}/yd60mq/12led/rules.mk           |  0
 keyboards/{ => ymdk}/yd60mq/16led/config.h           |  0
 keyboards/{ => ymdk}/yd60mq/16led/readme.md          |  0
 keyboards/{ => ymdk}/yd60mq/16led/rules.mk           |  0
 keyboards/{ => ymdk}/yd60mq/config.h                 |  0
 keyboards/{ => ymdk}/yd60mq/info.json                |  0
 keyboards/{ => ymdk}/yd60mq/keymaps/64key/keymap.c   |  0
 keyboards/{ => ymdk}/yd60mq/keymaps/default/keymap.c |  0
 keyboards/{ => ymdk}/yd60mq/keymaps/iso/keymap.c     |  0
 keyboards/{ => ymdk}/yd60mq/keymaps/krusli/keymap.c  |  0
 keyboards/{ => ymdk}/yd60mq/keymaps/via/keymap.c     |  0
 keyboards/{ => ymdk}/yd60mq/keymaps/via/rules.mk     |  0
 keyboards/{ => ymdk}/yd60mq/readme.md                | 12 ++++++------
 keyboards/{ => ymdk}/yd60mq/rules.mk                 |  0
 keyboards/{ => ymdk}/yd60mq/yd60mq.c                 |  0
 keyboards/{ => ymdk}/yd60mq/yd60mq.h                 |  0
 19 files changed, 7 insertions(+), 7 deletions(-)
 rename keyboards/{ => ymdk}/yd60mq/12led/config.h (100%)
 rename keyboards/{ => ymdk}/yd60mq/12led/readme.md (100%)
 rename keyboards/{ => ymdk}/yd60mq/12led/rules.mk (100%)
 rename keyboards/{ => ymdk}/yd60mq/16led/config.h (100%)
 rename keyboards/{ => ymdk}/yd60mq/16led/readme.md (100%)
 rename keyboards/{ => ymdk}/yd60mq/16led/rules.mk (100%)
 rename keyboards/{ => ymdk}/yd60mq/config.h (100%)
 rename keyboards/{ => ymdk}/yd60mq/info.json (100%)
 rename keyboards/{ => ymdk}/yd60mq/keymaps/64key/keymap.c (100%)
 rename keyboards/{ => ymdk}/yd60mq/keymaps/default/keymap.c (100%)
 rename keyboards/{ => ymdk}/yd60mq/keymaps/iso/keymap.c (100%)
 rename keyboards/{ => ymdk}/yd60mq/keymaps/krusli/keymap.c (100%)
 rename keyboards/{ => ymdk}/yd60mq/keymaps/via/keymap.c (100%)
 rename keyboards/{ => ymdk}/yd60mq/keymaps/via/rules.mk (100%)
 rename keyboards/{ => ymdk}/yd60mq/readme.md (70%)
 rename keyboards/{ => ymdk}/yd60mq/rules.mk (100%)
 rename keyboards/{ => ymdk}/yd60mq/yd60mq.c (100%)
 rename keyboards/{ => ymdk}/yd60mq/yd60mq.h (100%)

diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index d7d2afceeb..c8c39b246c 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -553,7 +553,7 @@
           target: 'xelus/valor/rev1'
     },
     yd60mq: {
-          target: 'yd60mq/12led'
+          target: 'ymdk/yd60mq/12led'
     },
     ymd75: {
           target: 'ymd75/rev1'
diff --git a/keyboards/yd60mq/12led/config.h b/keyboards/ymdk/yd60mq/12led/config.h
similarity index 100%
rename from keyboards/yd60mq/12led/config.h
rename to keyboards/ymdk/yd60mq/12led/config.h
diff --git a/keyboards/yd60mq/12led/readme.md b/keyboards/ymdk/yd60mq/12led/readme.md
similarity index 100%
rename from keyboards/yd60mq/12led/readme.md
rename to keyboards/ymdk/yd60mq/12led/readme.md
diff --git a/keyboards/yd60mq/12led/rules.mk b/keyboards/ymdk/yd60mq/12led/rules.mk
similarity index 100%
rename from keyboards/yd60mq/12led/rules.mk
rename to keyboards/ymdk/yd60mq/12led/rules.mk
diff --git a/keyboards/yd60mq/16led/config.h b/keyboards/ymdk/yd60mq/16led/config.h
similarity index 100%
rename from keyboards/yd60mq/16led/config.h
rename to keyboards/ymdk/yd60mq/16led/config.h
diff --git a/keyboards/yd60mq/16led/readme.md b/keyboards/ymdk/yd60mq/16led/readme.md
similarity index 100%
rename from keyboards/yd60mq/16led/readme.md
rename to keyboards/ymdk/yd60mq/16led/readme.md
diff --git a/keyboards/yd60mq/16led/rules.mk b/keyboards/ymdk/yd60mq/16led/rules.mk
similarity index 100%
rename from keyboards/yd60mq/16led/rules.mk
rename to keyboards/ymdk/yd60mq/16led/rules.mk
diff --git a/keyboards/yd60mq/config.h b/keyboards/ymdk/yd60mq/config.h
similarity index 100%
rename from keyboards/yd60mq/config.h
rename to keyboards/ymdk/yd60mq/config.h
diff --git a/keyboards/yd60mq/info.json b/keyboards/ymdk/yd60mq/info.json
similarity index 100%
rename from keyboards/yd60mq/info.json
rename to keyboards/ymdk/yd60mq/info.json
diff --git a/keyboards/yd60mq/keymaps/64key/keymap.c b/keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
similarity index 100%
rename from keyboards/yd60mq/keymaps/64key/keymap.c
rename to keyboards/ymdk/yd60mq/keymaps/64key/keymap.c
diff --git a/keyboards/yd60mq/keymaps/default/keymap.c b/keyboards/ymdk/yd60mq/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/yd60mq/keymaps/default/keymap.c
rename to keyboards/ymdk/yd60mq/keymaps/default/keymap.c
diff --git a/keyboards/yd60mq/keymaps/iso/keymap.c b/keyboards/ymdk/yd60mq/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/yd60mq/keymaps/iso/keymap.c
rename to keyboards/ymdk/yd60mq/keymaps/iso/keymap.c
diff --git a/keyboards/yd60mq/keymaps/krusli/keymap.c b/keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c
similarity index 100%
rename from keyboards/yd60mq/keymaps/krusli/keymap.c
rename to keyboards/ymdk/yd60mq/keymaps/krusli/keymap.c
diff --git a/keyboards/yd60mq/keymaps/via/keymap.c b/keyboards/ymdk/yd60mq/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/yd60mq/keymaps/via/keymap.c
rename to keyboards/ymdk/yd60mq/keymaps/via/keymap.c
diff --git a/keyboards/yd60mq/keymaps/via/rules.mk b/keyboards/ymdk/yd60mq/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/yd60mq/keymaps/via/rules.mk
rename to keyboards/ymdk/yd60mq/keymaps/via/rules.mk
diff --git a/keyboards/yd60mq/readme.md b/keyboards/ymdk/yd60mq/readme.md
similarity index 70%
rename from keyboards/yd60mq/readme.md
rename to keyboards/ymdk/yd60mq/readme.md
index 32073da631..9a8dece4da 100644
--- a/keyboards/yd60mq/readme.md
+++ b/keyboards/ymdk/yd60mq/readme.md
@@ -13,17 +13,17 @@ Customizable 60% PCB by [YMDK](https://ymdk.aliexpress.com/store/429151?spm=2114
 Make example for this keyboard (after setting up your build environment):
 
 ```sh
-make yd60mq:default        # builds the 12 LED variant
-make yd60mq/12led:default  # also builds the 12 LED variant
-make yd60mq/16led:default  # builds the 16 LED variant
+make ymdk/yd60mq:default        # builds the 12 LED variant
+make ymdk/yd60mq/12led:default  # also builds the 12 LED variant
+make ymdk/yd60mq/16led:default  # builds the 16 LED variant
 ```
 
 The keyboard uses a DFU bootloader. To make a keymap and use dfu to flash it:
 
 ```sh
-make yd60mq:default:flash        # builds and flashes the 12 LED variant
-make yd60mq/12led:default:flash  # also builds and flashes the 12 LED variant
-make yd60mq/16led:default:flash  # builds and flashes the 16 LED variant
+make ymdk/yd60mq:default:flash        # builds and flashes the 12 LED variant
+make ymdk/yd60mq/12led:default:flash  # also builds and flashes the 12 LED variant
+make ymdk/yd60mq/16led:default:flash  # builds and flashes the 16 LED variant
 ```
 
 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).
diff --git a/keyboards/yd60mq/rules.mk b/keyboards/ymdk/yd60mq/rules.mk
similarity index 100%
rename from keyboards/yd60mq/rules.mk
rename to keyboards/ymdk/yd60mq/rules.mk
diff --git a/keyboards/yd60mq/yd60mq.c b/keyboards/ymdk/yd60mq/yd60mq.c
similarity index 100%
rename from keyboards/yd60mq/yd60mq.c
rename to keyboards/ymdk/yd60mq/yd60mq.c
diff --git a/keyboards/yd60mq/yd60mq.h b/keyboards/ymdk/yd60mq/yd60mq.h
similarity index 100%
rename from keyboards/yd60mq/yd60mq.h
rename to keyboards/ymdk/yd60mq/yd60mq.h

From 557fbbd6afbff3bdd571e580ea79ba3905a28ce4 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 17 Jan 2022 07:12:58 +1100
Subject: [PATCH 320/867] Yet another bad `DEFAULT_FOLDER` fix. (#15904)

---
 keyboards/ymdk/yd60mq/rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/ymdk/yd60mq/rules.mk b/keyboards/ymdk/yd60mq/rules.mk
index 824b053a88..5161d11ac1 100644
--- a/keyboards/ymdk/yd60mq/rules.mk
+++ b/keyboards/ymdk/yd60mq/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_ansi_tsangan 60_hhkb 60_iso 60_iso_split_bs_rshift 60_iso_tsangan
 
-DEFAULT_FOLDER = yd60mq/12led
+DEFAULT_FOLDER = ymdk/yd60mq/12led

From c72ed7c02473dec4da6cb263c1e0fb2ca4856b94 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 17 Jan 2022 08:44:34 +1100
Subject: [PATCH 321/867] CLI: Parse USB device version BCD (#14580)

* CLI: Parse USB device version BCD

* Apply suggestions
---
 data/mappings/info_config.json                |  2 ++
 data/schemas/definitions.jsonschema           | 10 ++++++---
 data/schemas/keyboard.jsonschema              |  3 ++-
 docs/reference_info_json.md                   |  6 ++++--
 keyboards/40percentclub/25/config.h           |  6 +++---
 keyboards/40percentclub/5x5/config.h          |  6 +++---
 keyboards/40percentclub/6lit/config.h         |  6 +++---
 keyboards/40percentclub/foobar/config.h       |  6 +++---
 keyboards/40percentclub/half_n_half/config.h  |  6 +++---
 keyboards/boston_meetup/2019/config.h         |  2 +-
 keyboards/capsunlocked/cu80/v2_ansi/info.json |  2 +-
 keyboards/capsunlocked/cu80/v2_iso/info.json  |  2 +-
 keyboards/clueboard/17/info.json              |  2 +-
 keyboards/clueboard/2x1800/2019/info.json     |  2 +-
 keyboards/clueboard/60/info.json              |  2 +-
 keyboards/clueboard/66/rev1/info.json         |  2 +-
 keyboards/clueboard/66/rev2/info.json         |  2 +-
 keyboards/clueboard/66/rev3/info.json         |  2 +-
 keyboards/clueboard/66/rev4/info.json         |  2 +-
 keyboards/clueboard/66_hotswap/gen1/info.json |  2 +-
 .../clueboard/66_hotswap/prototype/info.json  |  2 +-
 keyboards/clueboard/card/info.json            |  2 +-
 keyboards/clueboard/info.json                 |  2 +-
 keyboards/coarse/ixora/config.h               |  2 +-
 keyboards/coarse/vinta/config.h               |  2 +-
 keyboards/cybergear/macro25/info.json         |  2 +-
 keyboards/dyz/dyz60/info.json                 |  2 +-
 .../ez_maker/directpins/promicro/info.json    |  2 +-
 .../ez_maker/directpins/proton_c/info.json    |  2 +-
 .../ez_maker/directpins/teensy_2/info.json    |  2 +-
 .../ez_maker/directpins/teensy_2pp/info.json  |  2 +-
 .../ez_maker/directpins/teensy_32/info.json   |  2 +-
 .../ez_maker/directpins/teensy_lc/info.json   |  2 +-
 keyboards/forever65/info.json                 |  2 +-
 keyboards/frooastboard/info.json              |  2 +-
 keyboards/handwired/qc60/config.h             |  2 +-
 keyboards/lets_split_eh/config.h              |  2 +-
 keyboards/ramonimbao/squishytkl/config.h      |  2 +-
 keyboards/spacetime/config.h                  |  2 +-
 keyboards/tempo_turtle/bradpad/info.json      |  2 +-
 lib/python/qmk/cli/generate/config_h.py       |  6 ++++++
 lib/python/qmk/info.py                        | 21 +++++++++++++++++++
 42 files changed, 88 insertions(+), 52 deletions(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index 3cb64dd3a2..cfe8807d43 100644
--- a/data/mappings/info_config.json
+++ b/data/mappings/info_config.json
@@ -15,6 +15,8 @@
     "COMBO_TERM": {"info_key": "combo.term", "value_type": "int"},
     "DEBOUNCE": {"info_key": "debounce", "value_type": "int"},
     "DEVICE_VER": {"info_key": "usb.device_ver", "value_type": "hex"},
+    # TODO: Replace ^^^ with vvv
+    #"DEVICE_VER": {"info_key": "usb.device_version", "value_type": "bcd_version"},
     "DESCRIPTION": {"info_key": "keyboard_folder", "to_json": false},
     "DIODE_DIRECTION": {"info_key": "diode_direction"},
     "FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "bool"},
diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 822f237073..3f92e289a7 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -20,6 +20,10 @@
         "type": "string",
         "pattern": "^0x[0-9A-F]{4}$"
     },
+    "bcd_version": {
+        "type": "string",
+        "pattern": "^[0-9]{1,2}\\.[0-9]\\.[0-9]$"
+    },
     "text_identifier": {
         "type": "string",
         "minLength": 1,
@@ -70,13 +74,13 @@
     "signed_int": {
         "type": "number",
         "multipleOf": 1
-    }
+    },
     "signed_int_8": {
         "type": "number",
         "min": -127,
         "max": 127,
         "multipleOf": 1
-    }
+    },
     "string_array": {
         "type": "array",
         "items": {
@@ -97,7 +101,7 @@
         "type": "number",
         "min": 0,
         "multipleOf": 1
-    }
+    },
     "unsigned_int_8": {
         "type": "number",
         "min": 0,
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 94bbbe7e85..f7b05d6655 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -320,7 +320,8 @@
             "type": "object",
             "additionalProperties": false,
             "properties": {
-                "device_ver": {"$ref": "qmk.definitions.v1#/hex_number_4d"},
+                "device_ver": {"$ref": "qmk.definitions.v1#/hex_number_4d"}, # Deprecated
+                "device_version": {"$ref": "qmk.definitions.v1#/bcd_version"},
                 "force_nkro": {"type": "boolean"},
                 "pid": {"$ref": "qmk.definitions.v1#/hex_number_4d"},
                 "vid": {"$ref": "qmk.definitions.v1#/hex_number_4d"},
diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index b2e6cae28e..3cc807c179 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -172,7 +172,7 @@ The following animations can be enabled:
 
 ### USB
 
-Every USB keyboard needs to have its USB parmaters defined. At a minimum you need to set vid, pid, and device version.
+Every USB keyboard needs to have its USB parameters defined. At a minimum you need to set the Vendor ID, Product ID, and device version.
 
 Example:
 
@@ -181,7 +181,9 @@ Example:
     "usb": {
         "vid": "0xC1ED",
         "pid": "0x23B0",
-        "device_ver": "0x0001"
+        "device_version": "1.0.0"
     }
 }
 ```
+
+The device version is a BCD (binary coded decimal) value, in the format `MMmr`, so the below value would look like `0x0100` in the generated code. This also means the maximum valid values for each part are `99.9.9`, despite it being a hexadecimal value under the hood.
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index 8ff5264671..d478131e95 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -19,9 +19,9 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025
-#define PRODUCT_ID      0x0A0C
-#define DEVICE_VER      0x0F25
+#define VENDOR_ID       0x4025 // 40%
+#define PRODUCT_ID      0x0F25
+#define DEVICE_VER      0x0100
 #define MANUFACTURER    di0ib
 #define PRODUCT         The 5x5 Keyboard
 
diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
index c9a83de737..c3bb5d6380 100644
--- a/keyboards/40percentclub/5x5/config.h
+++ b/keyboards/40percentclub/5x5/config.h
@@ -5,9 +5,9 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025
-#define PRODUCT_ID      0x0A0C
-#define DEVICE_VER      0x05B5
+#define VENDOR_ID       0x4025 // 40%
+#define PRODUCT_ID      0x05B5
+#define DEVICE_VER      0x0100
 #define MANUFACTURER    di0ib
 #define PRODUCT         The 5x5 Keyboard
 
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index f5c0ea3040..ae4ee1bad8 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -19,9 +19,9 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025
-#define PRODUCT_ID      0x0A0C
-#define DEVICE_VER      0x0F61
+#define VENDOR_ID       0x4025 // 40%
+#define PRODUCT_ID      0x0F61
+#define DEVICE_VER      0x0100
 #define MANUFACTURER    di0ib
 #define PRODUCT         The 6lit Macropad
 
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index a65b6e51bf..1e91d3bd10 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -19,9 +19,9 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025
-#define PRODUCT_ID      0x0A0C
-#define DEVICE_VER      0x0F00
+#define VENDOR_ID       0x4025 // 40%
+#define PRODUCT_ID      0x0F00
+#define DEVICE_VER      0x0100
 #define MANUFACTURER    di0ib
 #define PRODUCT         The foobar Keyboard
 
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
index f79f83839c..0c819031da 100644
--- a/keyboards/40percentclub/half_n_half/config.h
+++ b/keyboards/40percentclub/half_n_half/config.h
@@ -20,9 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025
-#define PRODUCT_ID      0x0A0C
-#define DEVICE_VER      0x4A1F
+#define VENDOR_ID       0x4025 // 40%
+#define PRODUCT_ID      0x4A1F
+#define DEVICE_VER      0x0100
 #define MANUFACTURER    di0ib
 #define PRODUCT         half_n_half
 
diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h
index 80896242e0..138dedab57 100644
--- a/keyboards/boston_meetup/2019/config.h
+++ b/keyboards/boston_meetup/2019/config.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /* USB Device descriptor parameter */
-#define DEVICE_VER 0x07E3
+#define DEVICE_VER 0x2019
 
 #undef MATRIX_ROWS
 #undef MATRIX_COLS
diff --git a/keyboards/capsunlocked/cu80/v2_ansi/info.json b/keyboards/capsunlocked/cu80/v2_ansi/info.json
index f0317de36d..7615d9f029 100644
--- a/keyboards/capsunlocked/cu80/v2_ansi/info.json
+++ b/keyboards/capsunlocked/cu80/v2_ansi/info.json
@@ -37,7 +37,7 @@
   },
   "url": "https://caps-unlocked.com/cu80-round-2/",
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x0081",
     "vid": "0x4355"
   },
diff --git a/keyboards/capsunlocked/cu80/v2_iso/info.json b/keyboards/capsunlocked/cu80/v2_iso/info.json
index c332156069..43f074f170 100644
--- a/keyboards/capsunlocked/cu80/v2_iso/info.json
+++ b/keyboards/capsunlocked/cu80/v2_iso/info.json
@@ -37,7 +37,7 @@
   },
   "url": "https://caps-unlocked.com/cu80-round-2/",
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x0080",
     "vid": "0x4355"
   },
diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json
index fb12f7dcce..5ea4937e50 100644
--- a/keyboards/clueboard/17/info.json
+++ b/keyboards/clueboard/17/info.json
@@ -32,7 +32,7 @@
   },
   "url": "",
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x2312",
     "vid": "0xC1ED"
   },
diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json
index a877cae8b0..886f3878bf 100644
--- a/keyboards/clueboard/2x1800/2019/info.json
+++ b/keyboards/clueboard/2x1800/2019/info.json
@@ -24,7 +24,7 @@
     "rows": ["C0", "C1", "C2", "C3", "C7", "F7", "B1", "F2", "F3", "F4", "F5", "F6", "C6"]
   },
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x23A0",
     "vid": "0xC1ED"
   },
diff --git a/keyboards/clueboard/60/info.json b/keyboards/clueboard/60/info.json
index 6e0d90fe1d..16f94644c9 100644
--- a/keyboards/clueboard/60/info.json
+++ b/keyboards/clueboard/60/info.json
@@ -25,7 +25,7 @@
     "rows": ["B0", "B1", "B2", "A15", "A10"]
   },
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x2350",
     "vid": "0xC1ED"
   },
diff --git a/keyboards/clueboard/66/rev1/info.json b/keyboards/clueboard/66/rev1/info.json
index 6ff733b3dd..bc3e1e23b6 100644
--- a/keyboards/clueboard/66/rev1/info.json
+++ b/keyboards/clueboard/66/rev1/info.json
@@ -37,7 +37,7 @@
     "saturation_steps": 17
   },
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x2301",
     "vid": "0xC1ED"
   },
diff --git a/keyboards/clueboard/66/rev2/info.json b/keyboards/clueboard/66/rev2/info.json
index 27d293552d..0cfb690388 100644
--- a/keyboards/clueboard/66/rev2/info.json
+++ b/keyboards/clueboard/66/rev2/info.json
@@ -37,7 +37,7 @@
     "saturation_steps": 17
   },
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x2320",
     "vid": "0xC1ED"
   },
diff --git a/keyboards/clueboard/66/rev3/info.json b/keyboards/clueboard/66/rev3/info.json
index 0f2eada753..208bc22dd1 100644
--- a/keyboards/clueboard/66/rev3/info.json
+++ b/keyboards/clueboard/66/rev3/info.json
@@ -37,7 +37,7 @@
     "saturation_steps": 17
   },
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x2370",
     "vid": "0xC1ED"
   },
diff --git a/keyboards/clueboard/66/rev4/info.json b/keyboards/clueboard/66/rev4/info.json
index b40abf402f..8733216f05 100644
--- a/keyboards/clueboard/66/rev4/info.json
+++ b/keyboards/clueboard/66/rev4/info.json
@@ -36,7 +36,7 @@
     "saturation_steps": 17
   },
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x2390",
     "vid": "0xC1ED"
   },
diff --git a/keyboards/clueboard/66_hotswap/gen1/info.json b/keyboards/clueboard/66_hotswap/gen1/info.json
index cf6288b545..2b42bf22e8 100644
--- a/keyboards/clueboard/66_hotswap/gen1/info.json
+++ b/keyboards/clueboard/66_hotswap/gen1/info.json
@@ -25,7 +25,7 @@
     "rows": ["B11", "A6", "A3", "A2", "A1", "B5", "B6", "C15", "C14", "C13"]
   },
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x2391",
     "vid": "0xC1ED"
   },
diff --git a/keyboards/clueboard/66_hotswap/prototype/info.json b/keyboards/clueboard/66_hotswap/prototype/info.json
index d3f81851f4..4940af8439 100644
--- a/keyboards/clueboard/66_hotswap/prototype/info.json
+++ b/keyboards/clueboard/66_hotswap/prototype/info.json
@@ -37,7 +37,7 @@
     "saturation_steps": 17
   },
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x2390",
     "vid": "0xC1ED"
   },
diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json
index 24088b2c41..62ccd9ced0 100644
--- a/keyboards/clueboard/card/info.json
+++ b/keyboards/clueboard/card/info.json
@@ -32,7 +32,7 @@
     "saturation_steps": 17
   },
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "pid": "0x2330",
     "vid": "0xC1ED"
   },
diff --git a/keyboards/clueboard/info.json b/keyboards/clueboard/info.json
index 47514f280b..4421643e10 100644
--- a/keyboards/clueboard/info.json
+++ b/keyboards/clueboard/info.json
@@ -2,7 +2,7 @@
   "manufacturer": "Clueboard",
   "maintainer": "skullydazed",
   "usb": {
-    "device_ver": "0x0001",
+    "device_version": "0.0.1",
     "vid": "0xC1ED"
   }
 }
diff --git a/keyboards/coarse/ixora/config.h b/keyboards/coarse/ixora/config.h
index ec7dfa705b..13246e9226 100644
--- a/keyboards/coarse/ixora/config.h
+++ b/keyboards/coarse/ixora/config.h
@@ -5,7 +5,7 @@
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x0C61
-#define DEVICE_VER      0x00C6
+#define DEVICE_VER      0x0100
 #define MANUFACTURER    PeiorisBoards
 #define PRODUCT         Ixora Rev1
 
diff --git a/keyboards/coarse/vinta/config.h b/keyboards/coarse/vinta/config.h
index d08994ae67..4e35b3461a 100644
--- a/keyboards/coarse/vinta/config.h
+++ b/keyboards/coarse/vinta/config.h
@@ -5,7 +5,7 @@
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x0C61
-#define DEVICE_VER      0x00C6
+#define DEVICE_VER      0x0100
 #define MANUFACTURER    PeiorisBoards
 #define PRODUCT         Vinta R1
 
diff --git a/keyboards/cybergear/macro25/info.json b/keyboards/cybergear/macro25/info.json
index a029ae1ce3..75078962bf 100644
--- a/keyboards/cybergear/macro25/info.json
+++ b/keyboards/cybergear/macro25/info.json
@@ -5,7 +5,7 @@
     "usb": {
         "vid": "0x1209",
         "pid": "0x69A1",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1",
     },
     "diode_direction": "COL2ROW",
     "layouts": {
diff --git a/keyboards/dyz/dyz60/info.json b/keyboards/dyz/dyz60/info.json
index 24ff257554..d946f9b97b 100644
--- a/keyboards/dyz/dyz60/info.json
+++ b/keyboards/dyz/dyz60/info.json
@@ -20,7 +20,7 @@
     "usb": {
         "vid": "0xD772",
         "pid": "0x000A",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/ez_maker/directpins/promicro/info.json b/keyboards/ez_maker/directpins/promicro/info.json
index 419450385c..264ee350c8 100644
--- a/keyboards/ez_maker/directpins/promicro/info.json
+++ b/keyboards/ez_maker/directpins/promicro/info.json
@@ -26,7 +26,7 @@
     },
     "processor": "atmega32u4",
     "usb": {
-        "device_ver": "0x0001",
+        "device_version": "0.0.1",
         "pid": "0x2320",
         "vid": "0xFEED"
     },
diff --git a/keyboards/ez_maker/directpins/proton_c/info.json b/keyboards/ez_maker/directpins/proton_c/info.json
index e3d000424a..d35fe9a90a 100644
--- a/keyboards/ez_maker/directpins/proton_c/info.json
+++ b/keyboards/ez_maker/directpins/proton_c/info.json
@@ -32,7 +32,7 @@
         ]
     },
     "usb": {
-        "device_ver": "0x0001",
+        "device_version": "0.0.1",
         "pid": "0x2321",
         "vid": "0xFEED"
     },
diff --git a/keyboards/ez_maker/directpins/teensy_2/info.json b/keyboards/ez_maker/directpins/teensy_2/info.json
index 0c8fa672a9..731d089322 100644
--- a/keyboards/ez_maker/directpins/teensy_2/info.json
+++ b/keyboards/ez_maker/directpins/teensy_2/info.json
@@ -28,7 +28,7 @@
         ]
     },
     "usb": {
-        "device_ver": "0x0001",
+        "device_version": "0.0.1",
         "pid": "0x2322",
         "vid": "0xFEED"
     },
diff --git a/keyboards/ez_maker/directpins/teensy_2pp/info.json b/keyboards/ez_maker/directpins/teensy_2pp/info.json
index e12544a5ef..214d4bdadc 100644
--- a/keyboards/ez_maker/directpins/teensy_2pp/info.json
+++ b/keyboards/ez_maker/directpins/teensy_2pp/info.json
@@ -35,7 +35,7 @@
         ]
     },
     "usb": {
-        "device_ver": "0x0001",
+        "device_version": "0.0.1",
         "pid": "0x2323",
         "vid": "0xFEED"
     },
diff --git a/keyboards/ez_maker/directpins/teensy_32/info.json b/keyboards/ez_maker/directpins/teensy_32/info.json
index e0c024ec94..851f9e67d1 100644
--- a/keyboards/ez_maker/directpins/teensy_32/info.json
+++ b/keyboards/ez_maker/directpins/teensy_32/info.json
@@ -27,7 +27,7 @@
         ]
     },
     "usb": {
-        "device_ver": "0x0001",
+        "device_version": "0.0.1",
         "pid": "0x2324",
         "vid": "0xFEED"
     },
diff --git a/keyboards/ez_maker/directpins/teensy_lc/info.json b/keyboards/ez_maker/directpins/teensy_lc/info.json
index bf93c41fab..8f64145e45 100644
--- a/keyboards/ez_maker/directpins/teensy_lc/info.json
+++ b/keyboards/ez_maker/directpins/teensy_lc/info.json
@@ -27,7 +27,7 @@
         ]
     },
     "usb": {
-        "device_ver": "0x0001",
+        "device_version": "0.0.1",
         "pid": "0x2325",
         "vid": "0xFEED"
     },
diff --git a/keyboards/forever65/info.json b/keyboards/forever65/info.json
index 9f5a3539e3..b50a2cf406 100644
--- a/keyboards/forever65/info.json
+++ b/keyboards/forever65/info.json
@@ -12,7 +12,7 @@
     "usb": {
         "vid": "0x4E53",
         "pid": "0x0F65",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "features": {
         "bootmagic": true,
diff --git a/keyboards/frooastboard/info.json b/keyboards/frooastboard/info.json
index ca99cf594a..4217439b5e 100644
--- a/keyboards/frooastboard/info.json
+++ b/keyboards/frooastboard/info.json
@@ -37,6 +37,6 @@
     "usb": {
         "vid": "0x4642",
         "pid": "0x6F21",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     }
 }
diff --git a/keyboards/handwired/qc60/config.h b/keyboards/handwired/qc60/config.h
index 0c27755910..db3d88dcf4 100644
--- a/keyboards/handwired/qc60/config.h
+++ b/keyboards/handwired/qc60/config.h
@@ -5,7 +5,7 @@
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x0C60
-#define DEVICE_VER      0x00C6
+#define DEVICE_VER      0x0100
 #define MANUFACTURER    PeiorisBoards
 #define PRODUCT         QC60
 
diff --git a/keyboards/lets_split_eh/config.h b/keyboards/lets_split_eh/config.h
index 7527c6b3d2..787b9783b8 100644
--- a/keyboards/lets_split_eh/config.h
+++ b/keyboards/lets_split_eh/config.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0xE401
-#define DEVICE_VER      0x0E41
+#define DEVICE_VER      0x0100
 #define MANUFACTURER    That-Canadian
 #define PRODUCT         Lets Split Eh?
 
diff --git a/keyboards/ramonimbao/squishytkl/config.h b/keyboards/ramonimbao/squishytkl/config.h
index 3e0812bb12..ebebc35bb4 100644
--- a/keyboards/ramonimbao/squishytkl/config.h
+++ b/keyboards/ramonimbao/squishytkl/config.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* USB Device descriptor parameter */
 #define VENDOR_ID    0xB16B
 #define PRODUCT_ID   0x00B1
-#define DEVICE_VER   0xE500
+#define DEVICE_VER   0x0100
 #define MANUFACTURER Ramon Imbao
 #define PRODUCT      SquishyTKL
 
diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h
index 3afcee1735..7dfca576a0 100644
--- a/keyboards/spacetime/config.h
+++ b/keyboards/spacetime/config.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x0A0C
-#define DEVICE_VER      0x4A1F
+#define DEVICE_VER      0x0100
 #define MANUFACTURER    Kyle Terry
 #define PRODUCT         spacetime
 
diff --git a/keyboards/tempo_turtle/bradpad/info.json b/keyboards/tempo_turtle/bradpad/info.json
index d32cc2c665..e1caeeeb88 100644
--- a/keyboards/tempo_turtle/bradpad/info.json
+++ b/keyboards/tempo_turtle/bradpad/info.json
@@ -10,7 +10,7 @@
     "usb":{
         "vid":"0x7474",
         "pid":"0x6270",
-        "device_ver":"0x0001"
+        "device_version":"0.0.1"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index f16dca1de8..6b1012fae7 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -108,6 +108,12 @@ def generate_config_items(kb_info_json, config_h_lines):
                 config_h_lines.append(f'#ifndef {key}')
                 config_h_lines.append(f'#   define {key} {value}')
                 config_h_lines.append(f'#endif // {key}')
+        elif key_type == 'bcd_version':
+            (major, minor, revision) = config_value.split('.')
+            config_h_lines.append('')
+            config_h_lines.append(f'#ifndef {config_key}')
+            config_h_lines.append(f'#   define {config_key} 0x{major.zfill(2)}{minor}{revision}')
+            config_h_lines.append(f'#endif // {config_key}')
         else:
             config_h_lines.append('')
             config_h_lines.append(f'#ifndef {config_key}')
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 6bdf2cb166..905f10ecc2 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -387,6 +387,19 @@ def _extract_matrix_info(info_data, config_c):
     return info_data
 
 
+# TODO: kill off usb.device_ver in favor of usb.device_version
+def _extract_device_version(info_data):
+    if info_data.get('usb'):
+        if info_data['usb'].get('device_version') and not info_data['usb'].get('device_ver'):
+            (major, minor, revision) = info_data['usb']['device_version'].split('.', 3)
+            info_data['usb']['device_ver'] = f'0x{major.zfill(2)}{minor}{revision}'
+        if not info_data['usb'].get('device_version') and info_data['usb'].get('device_ver'):
+            major = int(info_data['usb']['device_ver'][2:4])
+            minor = int(info_data['usb']['device_ver'][4])
+            revision = int(info_data['usb']['device_ver'][5])
+            info_data['usb']['device_version'] = f'{major}.{minor}.{revision}'
+
+
 def _extract_config_h(info_data):
     """Pull some keyboard information from existing config.h files
     """
@@ -430,6 +443,13 @@ def _extract_config_h(info_data):
                 elif key_type == 'int':
                     dotty_info[info_key] = int(config_c[config_key])
 
+                elif key_type == 'bcd_version':
+                    major = int(config_c[config_key][2:4])
+                    minor = int(config_c[config_key][4])
+                    revision = int(config_c[config_key][5])
+
+                    dotty_info[info_key] = f'{major}.{minor}.{revision}'
+
                 else:
                     dotty_info[info_key] = config_c[config_key]
 
@@ -444,6 +464,7 @@ def _extract_config_h(info_data):
     _extract_split_main(info_data, config_c)
     _extract_split_transport(info_data, config_c)
     _extract_split_right_pins(info_data, config_c)
+    _extract_device_version(info_data)
 
     return info_data
 

From b8951a0458f34f591299c6d35167a3189be8acb8 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Mon, 17 Jan 2022 22:11:58 +0800
Subject: [PATCH 322/867] Add LAYOUTS entry to rules.mk (#15900)

* Add layouts to rules.mk

* Remove excess settings.

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/a_dux/rules.mk        | 5 +++--
 keyboards/cradio/cradio.h       | 2 ++
 keyboards/cradio/rules.mk       | 1 +
 keyboards/ferris/0_1/rules.mk   | 2 ++
 keyboards/ferris/0_2/rules.mk   | 2 ++
 keyboards/ferris/sweep/rules.mk | 1 +
 6 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/keyboards/a_dux/rules.mk b/keyboards/a_dux/rules.mk
index 95847adba1..f4f3aaf382 100644
--- a/keyboards/a_dux/rules.mk
+++ b/keyboards/a_dux/rules.mk
@@ -15,6 +15,7 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+UNICODE_ENABLE = yes        # Unicode
 AUDIO_ENABLE = no           # Audio output
-UNICODE_ENABLE = yes
-SPLIT_KEYBOARD = yes
+SPLIT_KEYBOARD = yes        # Use shared split_common code
+LAYOUTS = split_3x5_2
diff --git a/keyboards/cradio/cradio.h b/keyboards/cradio/cradio.h
index 527cc16ad0..f013386bf8 100644
--- a/keyboards/cradio/cradio.h
+++ b/keyboards/cradio/cradio.h
@@ -48,3 +48,5 @@
         { R16, R17, ___, ___, ___ }  \
     }
 
+#define LAYOUT LAYOUT_split_3x5_2
+
diff --git a/keyboards/cradio/rules.mk b/keyboards/cradio/rules.mk
index aa1b1c0b36..1e4940ca7d 100644
--- a/keyboards/cradio/rules.mk
+++ b/keyboards/cradio/rules.mk
@@ -18,3 +18,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 UNICODE_ENABLE = yes        # Unicode
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes        # Use shared split_common code
+LAYOUTS = split_3x5_2
diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk
index 86db6e4d12..4b8f1f0c9a 100644
--- a/keyboards/ferris/0_1/rules.mk
+++ b/keyboards/ferris/0_1/rules.mk
@@ -23,3 +23,5 @@ LTO_ENABLE = yes
 
 SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
+
+LAYOUTS = split_3x5_2
diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk
index 0c12328cee..2d406f5c1d 100644
--- a/keyboards/ferris/0_2/rules.mk
+++ b/keyboards/ferris/0_2/rules.mk
@@ -23,3 +23,5 @@ LTO_ENABLE = no
 
 SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
+
+LAYOUTS = split_3x5_2
diff --git a/keyboards/ferris/sweep/rules.mk b/keyboards/ferris/sweep/rules.mk
index 9399838733..ffc17739f7 100644
--- a/keyboards/ferris/sweep/rules.mk
+++ b/keyboards/ferris/sweep/rules.mk
@@ -18,3 +18,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 UNICODE_ENABLE = yes        # Unicode
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes        # Use shared split_common code
+LAYOUTS = split_3x5_2

From 8a3dfe2246c4a6182cf18349e9c4d0d28cae4ec5 Mon Sep 17 00:00:00 2001
From: moyi4681 <moyi4681@users.noreply.github.com>
Date: Tue, 18 Jan 2022 03:00:48 +0800
Subject: [PATCH 323/867] [Keyboard] fix odin rgb light error (#15914)

---
 keyboards/kbdfans/odin/rgb/rgb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/kbdfans/odin/rgb/rgb.c b/keyboards/kbdfans/odin/rgb/rgb.c
index 3cc2555269..425597a7f6 100644
--- a/keyboards/kbdfans/odin/rgb/rgb.c
+++ b/keyboards/kbdfans/odin/rgb/rgb.c
@@ -23,7 +23,7 @@ led_config_t g_led_config = {
     { 37, 38,     39,  40,     41,     42,     43,      44,     45,     46,     47, 48, 49,     50, NO_LED, 51,     52, 53, 54, 55 },
     { 75, 74,     73,  72,     71,     70,     69,      68,     67,     66,     65,  64, NO_LED, 63, NO_LED, NO_LED, 58, 57, 56, NO_LED },
     { 76, NO_LED, 77,  78,     79,     80,     81,      82,     83,     84,     85,  86, NO_LED, 87, NO_LED, 88,     89, 90, 91, 92 },
-    { 105,104,    103, NO_LED, NO_LED, NO_LED, 102,     NO_LED, NO_LED, NO_LED, NO_LED, 100, NO_LED,     98, 97,     96,     95, 94, 93, NO_LED }
+    { 103,102,    101, NO_LED, NO_LED, NO_LED, 100,     NO_LED, NO_LED, NO_LED, NO_LED, 99, NO_LED,     98, 97,     96,     95, 94, 93, NO_LED }
 }, 
 {
     {   12*0,  0 }, {  12*2,  0 }, {  12*3,  0 }, {  12*4,  0 }, {  12*5,  0 }, { 12*7,  0 }, { 12*8,  0 }, { 12*9,  0 }, { 12*10,  0 }, { 12*11,  0 },    { 12*12,  0 }, { 12*13,  0 }, { 12*14,  0 }, { 12*15,  0 }, { 12*16,  0 }, { 12*17,  0 }, { 12*18,  0 }, { 224,  0 },

From f6a7f4d4aca4a1808850e2dcd8cc223ae5202062 Mon Sep 17 00:00:00 2001
From: IskandarMa <epiciskandar@gmail.com>
Date: Wed, 19 Jan 2022 02:24:02 +0800
Subject: [PATCH 324/867] update the Chinese translation based on the latest
 English version (#14924)

Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: Joy Lee <chang.li@westberrytech.com>
Co-authored-by: LitoMore <LitoMore@users.noreply.github.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
---
 docs/configurator_step_by_step.md             |   2 +-
 docs/contributing.md                          |   4 +-
 docs/easy_maker.md                            |   2 +-
 docs/other_eclipse.md                         |   2 +-
 docs/zh-cn/README.md                          |  45 +-
 docs/zh-cn/_summary.md                        | 310 ++++++-----
 docs/zh-cn/api_docs.md                        |  73 +++
 docs/zh-cn/api_overview.md                    |  20 +
 docs/zh-cn/cli.md                             |  43 ++
 docs/zh-cn/cli_commands.md                    | 503 ++++++++++++++++++
 docs/zh-cn/cli_configuration.md               | 126 +++++
 docs/zh-cn/cli_tab_complete.md                |  32 ++
 docs/zh-cn/configurator_architecture.md       |  66 +++
 docs/zh-cn/configurator_default_keymaps.md    | 198 +++++++
 docs/zh-cn/configurator_step_by_step.md       |  63 +++
 docs/zh-cn/configurator_troubleshooting.md    |  31 ++
 docs/zh-cn/contributing.md                    | 188 +++----
 docs/zh-cn/custom_quantum_functions.md        | 367 ++++++-------
 docs/zh-cn/driver_installation_zadig.md       | 102 ++++
 docs/zh-cn/easy_maker.md                      |  37 ++
 docs/zh-cn/faq.md                             |   6 -
 docs/zh-cn/faq_build.md                       | 129 ++---
 docs/zh-cn/faq_debug.md                       | 230 ++++----
 docs/zh-cn/faq_general.md                     |  59 +-
 docs/zh-cn/faq_keymap.md                      | 172 +++---
 docs/zh-cn/faq_misc.md                        | 108 ++++
 docs/zh-cn/feature_grave_esc.md               |  39 ++
 docs/zh-cn/feature_space_cadet.md             |  70 +++
 docs/zh-cn/flashing.md                        | 329 ++++++++++++
 docs/zh-cn/flashing_bootloadhid.md            |  75 +++
 docs/zh-cn/getting_started_docker.md          |  59 ++
 docs/zh-cn/getting_started_getting_help.md    |  15 -
 docs/zh-cn/getting_started_github.md          |   7 +-
 docs/zh-cn/getting_started_introduction.md    |   9 +-
 docs/zh-cn/getting_started_vagrant.md         |  61 +++
 docs/zh-cn/keymap.md                          | 209 ++++++++
 docs/zh-cn/mod_tap.md                         | 143 +++++
 docs/zh-cn/newbs.md                           |  36 +-
 docs/zh-cn/newbs_best_practices.md            | 163 ------
 docs/zh-cn/newbs_building_firmware.md         |  87 ++-
 .../newbs_building_firmware_configurator.md   |  18 +
 docs/zh-cn/newbs_flashing.md                  | 357 +++----------
 docs/zh-cn/newbs_getting_started.md           | 210 ++++++--
 docs/zh-cn/newbs_learn_more_resources.md      |  36 +-
 docs/zh-cn/newbs_testing_debugging.md         |  46 +-
 docs/zh-cn/reference_configurator_support.md  | 200 +++++++
 docs/zh-cn/reference_glossary.md              |  81 ++-
 docs/zh-cn/support.md                         |  22 +
 docs/zh-cn/syllabus.md                        |  77 +++
 docs/zh-cn/translating.md                     |  60 +++
 docs/zh-cn/zh_cn_doc_status.sh                |  35 ++
 51 files changed, 3973 insertions(+), 1389 deletions(-)
 create mode 100644 docs/zh-cn/api_docs.md
 create mode 100644 docs/zh-cn/api_overview.md
 create mode 100644 docs/zh-cn/cli.md
 create mode 100644 docs/zh-cn/cli_commands.md
 create mode 100644 docs/zh-cn/cli_configuration.md
 create mode 100644 docs/zh-cn/cli_tab_complete.md
 create mode 100644 docs/zh-cn/configurator_architecture.md
 create mode 100644 docs/zh-cn/configurator_default_keymaps.md
 create mode 100644 docs/zh-cn/configurator_step_by_step.md
 create mode 100644 docs/zh-cn/configurator_troubleshooting.md
 create mode 100644 docs/zh-cn/driver_installation_zadig.md
 create mode 100644 docs/zh-cn/easy_maker.md
 delete mode 100644 docs/zh-cn/faq.md
 create mode 100644 docs/zh-cn/faq_misc.md
 create mode 100644 docs/zh-cn/feature_grave_esc.md
 create mode 100644 docs/zh-cn/feature_space_cadet.md
 create mode 100644 docs/zh-cn/flashing.md
 create mode 100644 docs/zh-cn/flashing_bootloadhid.md
 create mode 100644 docs/zh-cn/getting_started_docker.md
 delete mode 100644 docs/zh-cn/getting_started_getting_help.md
 create mode 100644 docs/zh-cn/getting_started_vagrant.md
 create mode 100644 docs/zh-cn/keymap.md
 create mode 100644 docs/zh-cn/mod_tap.md
 delete mode 100644 docs/zh-cn/newbs_best_practices.md
 create mode 100644 docs/zh-cn/newbs_building_firmware_configurator.md
 create mode 100644 docs/zh-cn/reference_configurator_support.md
 create mode 100644 docs/zh-cn/support.md
 create mode 100644 docs/zh-cn/syllabus.md
 create mode 100644 docs/zh-cn/translating.md
 create mode 100644 docs/zh-cn/zh_cn_doc_status.sh

diff --git a/docs/configurator_step_by_step.md b/docs/configurator_step_by_step.md
index 965012a907..c3cc2bfcdb 100644
--- a/docs/configurator_step_by_step.md
+++ b/docs/configurator_step_by_step.md
@@ -43,7 +43,7 @@ Keycode Entry is accomplished in one of 3 ways:
 
 ## Step 5: Save Your Keymap for Future Changes
 
-When you're satisfied with your keymap or just want to work on it later, press the `Export Keymap` button. It will save your keymap to your computer. You can then load this .json file in the future by pressing the `Import Keymap` button.
+When you're satisfied with your keymap or just want to work on it later, press the `Download this QMK Keymap JSON File` button. It will save your keymap to your computer. You can then load this .json file in the future by pressing the `Upload a QMK Keymap JSON File` button.
 
 !> **CAUTION:** This is not the same type of .json file used for kbfirmware.com or any other tool. If you try to use this for those tools, or the .json from those tools with QMK Configurator, you will encounter problems.
 
diff --git a/docs/contributing.md b/docs/contributing.md
index eb033d167f..91833e30df 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -109,7 +109,7 @@ Before opening a pull request, you can preview your changes if you have set up t
 
 or if you only have Python 3 installed:
 
-    python3 -m http.server 8936
+    python3 -m http.server 8936 --directory docs
 
 and navigating to `http://localhost:8936/`.
 
@@ -165,4 +165,4 @@ To maintain a clear vision of how things are laid out in QMK we try to plan out
 
 # What Does the Code of Conduct Mean for Me?
 
-Our [Code of Conduct](https://github.com/qmk/qmk_firmware/blob/master/CODE_OF_CONDUCT.md) means that you are responsible for treating everyone on the project with respect and courtesy regardless of their identity. If you are the victim of any inappropriate behavior or comments as described in our Code of Conduct, we are here for you and will do the best to ensure that the abuser is reprimanded appropriately, per our code.
+Our [Code of Conduct](https://qmk.fm/coc/) means that you are responsible for treating everyone on the project with respect and courtesy regardless of their identity. If you are the victim of any inappropriate behavior or comments as described in our Code of Conduct, we are here for you and will do the best to ensure that the abuser is reprimanded appropriately, per our code.
diff --git a/docs/easy_maker.md b/docs/easy_maker.md
index dc97272333..6af6473815 100644
--- a/docs/easy_maker.md
+++ b/docs/easy_maker.md
@@ -7,7 +7,7 @@ There are different styles of Easy Maker available depending on your needs:
 * [Direct Pin](https://config.qmk.fm/#/?filter=ez_maker/direct) - Connect a single switch to a single pin
 * Direct Pin + Backlight (Coming Soon) - Like Direct Pin but dedicates a single pin to [Backlight](feature_backlight.md) control
 * Direct Pin + Numlock (Coming Soon) - Like Direct Pin but dedicates a single pin to the Numlock LED
-* Direct Pin + Capslock (Coming Soon) - Like Direct Pin but dedicates a single pin to the Numlock LED
+* Direct Pin + Capslock (Coming Soon) - Like Direct Pin but dedicates a single pin to the Capslock LED
 * Direct Pin + Encoder (Coming Soon) - Like Direct Pin but uses 2 pins to add a single rotary encoder
 
 ## Quickstart
diff --git a/docs/other_eclipse.md b/docs/other_eclipse.md
index 91557d07d7..58ab7e295d 100644
--- a/docs/other_eclipse.md
+++ b/docs/other_eclipse.md
@@ -11,7 +11,7 @@ Using an IDE such as Eclipse provides many advantages over a plain text editor,
 * static code analysis
 * many other tools such as debugging, code formatting, showing call hierarchies etc.
 
-The purpose of the is page is to document how to set-up Eclipse for developing AVR software, and working on the QMK code base.
+The purpose of this page is to document how to set-up Eclipse for developing AVR software, and working on the QMK code base.
 
 Note that this set-up has been tested on Ubuntu 16.04 only for the moment.
 
diff --git a/docs/zh-cn/README.md b/docs/zh-cn/README.md
index b42818d582..93dfbf1eef 100644
--- a/docs/zh-cn/README.md
+++ b/docs/zh-cn/README.md
@@ -1,31 +1,42 @@
-# QMK机械键盘固件
+# Quantum Mechanical Keyboard固件
 
-[![当前版本](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)
-[![异议](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh)
-[![文档状态](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm)
-[![GitHub贡献者](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
-[![GitHub分支](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
+<!---
+  original document: 0.15.12:docs/README.md
+  git diff 0.15.12 HEAD -- docs/README.md | cat
+-->
 
 ## 什么是 QMK 固件?
 
-QMK (*Quantum Mechanical Keyboard*) 是一个社区维护的开源软件，包括 QMK 固件, QMK 工具箱, qmk.fm网站, 和这些文档。QMK 固件是一个基于[tmk\_keyboard](https://github.com/tmk/tmk_keyboard)的键盘固件，它在爱特梅尔AVR微控制器实现一些有用的功能,确切地说, 是在 [OLKB product line](https://olkb.com), 在 [ErgoDox EZ](https://www.ergodox-ez.com) 键盘, 和 [Clueboard product line](https://clueboard.co/). 上。它被移植到使用ChibiOS的ARM芯片上. 它可以在飞线键盘或定制PCB键盘中发挥功能.
+QMK (*Quantum Mechanical Keyboard*) 是一个社区维护的用于开发计算机输入设备的开源软件。社区专注像键盘，鼠标，MIDI设备的各种电子输入设备。社区内的核心小组成员维护[QMK固件](https://github.com/qmk/qmk_firmware)，[QMK配置器](https://config.qmk.fm)（QMK Configurator），[QMK工具箱](https://github.com/qmk/qmk_toolbox)（QMK Toolbox），[qmk.fm](https://qmk.fm)，并与各位社区成员维护这份文档。
 
-## 如何得到它
+## 如何入门
 
-如果你打算贡献布局, 键盘, 或者其他QMK特性, 一下是最简单的方法：[从GitHub获得repo分支](https://github.com/qmk/qmk_firmware#fork-destination-box), 并克隆你的repo到本地进行编辑，推送，然后从你的分支打开 [Pull Request](https://github.com/qmk/qmk_firmware/pulls).
+<div class="flex-container">
 
-此外, 你也可以直接下载 ([zip](https://github.com/qmk/qmk_firmware/zipball/master), [tar](https://github.com/qmk/qmk_firmware/tarball/master)), 或者从git克隆 (`git@github.com:qmk/qmk_firmware.git`), 或 https (`https://github.com/qmk/qmk_firmware.git`).
+?> **基础方式** [QMK配置器](zh-cn/newbs_building_firmware_configurator.md) <br>
+用户友好的图形界面工具，无需具备编程知识基础。
 
-## 如何编译
+?> **进阶方式** [基于源代码](zh-cn/newbs.md) <br> 
+功能更强大，但门槛较高。
 
-在你能编译之前, 你需要[部署环境](zh-cn/getting_started_build_tools.md) 用于 AVR or/and ARM 开发。完成后, 你可以使用 `make` 命令来编译一个键盘和布局使用以下命令:
+</div>
 
-    make planck/rev4:default
+## 个性化定制
 
-这将建立 `planck`的`rev4` 修订版本并使用 `default`布局。并非所有键盘都有修订版本 (也叫做子项目或文件夹)，在此情况下，修订版本可以省略，如下:
+QMK提供了很多功能，对应着很多可供浏览的配套文档。大部分功能都是通过修改[键映射](zh-cn/keymap.md)及[键码](zh-cn/keycodes.md)实现的。
 
-    make preonic:default
+## 需要帮助？
 
-## 如何定制
+请查阅[寻求帮助页面](zh-cn/support.md)以了解如何获取QMK使用方法的帮助。
 
-QMK 有许多 [特性](zh-cn/features.md)来探索，也有很多 [参考文档](https://docs.qmk.fm) 供您发掘。你可以通过修改 [布局](zh-cn/keymap.md)和[键码](zh-cn/keycodes.md)来利用许多特性。
+## 回馈社区
+
+有多种回馈社区的方法，最简单的方法是开始使用QMK并向你的朋友们推荐它。
+
+* 可以在我们的论坛及聊天室进行互助：
+    * [/r/olkb](https://www.reddit.com/r/olkb/)
+    * [Discord服务器](https://discord.gg/Uq7gcHh)
+* 点击页面下方的“Edit This Page”，可以对文档提供贡献。
+* [将这份文档翻译为你的语言](zh-cn/translating.md)
+* [上报bug](https://github.com/qmk/qmk_firmware/issues/new/choose)
+* [发起Pull Request](zh-cn/contributing.md)
diff --git a/docs/zh-cn/_summary.md b/docs/zh-cn/_summary.md
index cedcfbd525..8a710a9ec1 100644
--- a/docs/zh-cn/_summary.md
+++ b/docs/zh-cn/_summary.md
@@ -1,133 +1,193 @@
-* [完全菜鸟指南](zh-cn/newbs.md)
+<!--for translators, see first: zh-cn/reference_glossary.md#terms-of-zh-cn-translate -->
+* 新手教程
+  * [介绍](zh-cn/newbs.md)
   * [入门](zh-cn/newbs_getting_started.md)
-  * [构建你的第一个固件](zh-cn/newbs_building_firmware.md)
-  * [刷新固件](zh-cn/newbs_flashing.md)
-  * [测试和调试](zh-cn/newbs_testing_debugging.md)
-  * [Git最佳实践](zh-cn/newbs_git_best_practices.md)
-    * [使用你分叉(fork)的主分支(master)](zh-cn/newbs_git_using_your_master_branch.md)
-    * [解决合并冲突](zh-cn/newbs_git_resolving_merge_conflicts.md)
-    * [重新同步一个分支](zh-cn/newbs_git_resynchronize_a_branch.md)
-  * [学习资源](zh-cn/newbs_learn_more_resources.md)
+  * [构建第一个固件](zh-cn/newbs_building_firmware.md)
+  * [刷写固件](zh-cn/newbs_flashing.md)
+  * [寻求帮助](zh-cn/support.md)
+  * [其它资源](zh-cn/newbs_learn_more_resources.md)
+  * [QMK大纲](zh-cn/syllabus.md)
 
-* [QMK基础](zh-cn/README.md)
-  * [QMK简介](zh-cn/getting_started_introduction.md)
-  * [QMK命令行工具](zh-cn/cli.md)
-  * [QMK命令行工具配置](zh-cn/cli_configuration.md)
-  * [向QMK贡献代码](zh-cn/contributing.md)
-  * [如何使用GitHub](zh-cn/getting_started_github.md)
-  * [获得帮助](zh-cn/getting_started_getting_help.md)
-
-* [非兼容性修改](zh-cn/breaking_changes.md)
-  * [我的PR已经被标记为非兼容性修改](zh-cn/breaking_changes_instructions.md)
-  * [2019年8月30日](zh-cn/ChangeLog/20190830.md)
-
-* [问题与解答](zh-cn/faq.md)
-  * [一般问题](zh-cn/faq_general.md)
-  * [构建/编译](zh-cn/faq_build.md)
-  * [调试/故障排除](zh-cn/faq_debug.md)
-  * [布局](zh-cn/faq_keymap.md)
-  * [Zadig驱动安装](zh-cn/driver_installation_zadig.md)
-
-* 详细指南
-  * [安装构建工具](zh-cn/getting_started_build_tools.md)
-  * [vagrant指南](zh-cn/getting_started_vagrant.md)
-  * [构建/编译指南](zh-cn/getting_started_make_guide.md)
-  * [刷新固件](zh-cn/flashing.md)
-  * [定制功能](zh-cn/custom_quantum_functions.md)
-  * [布局概述](zh-cn/keymap.md)
-
-* [硬件](zh-cn/hardware.md)
-  * [兼容的单片机](zh-cn/compatible_microcontrollers.md)
-  * [AVR处理器](zh-cn/hardware_avr.md)
-  * [驱动](zh-cn/hardware_drivers.md)
-
-* 参考
-  * [键盘指南](zh-cn/hardware_keyboard_guidelines.md)
-  * [配置选项](zh-cn/config_options.md)
-  * [键码](zh-cn/keycodes.md)
-  * [代码书写规范 - C](zh-cn/coding_conventions_c.md)
-  * [代码书写规范 - Python](zh-cn/coding_conventions_python.md)
-  * [文档书写规范](zh-cn/documentation_best_practices.md)
-  * [文档模板](zh-cn/documentation_templates.md)
+* FAQ
+  * [常规FAQ](zh-cn/faq_general.md)
+  * [构建/编译QMK](zh-cn/faq_build.md)
+  * [QMK问题排查](zh-cn/faq_misc.md)
+  * [调试QMK](zh-cn/faq_debug.md)
+  * [键映射FAQ](zh-cn/faq_keymap.md)
+  * [充分利用AVR的存储空间](zh-cn/squeezing_avr.md)
   * [术语表](zh-cn/reference_glossary.md)
-  * [单元测试](zh-cn/unit_testing.md)
-  * [实用函数](zh-cn/ref_functions.md)
-  * [配置器支持](zh-cn/reference_configurator_support.md)
-  * [info.json 格式](zh-cn/reference_info_json.md)
-  * [Python 命令行开发](zh-cn/cli_development.md)
 
-* [特性](zh-cn/features.md)
-  * [基本键码](zh-cn/keycodes_basic.md)
-  * [US ANSI控制码](zh-cn/keycodes_us_ansi_shifted.md)
-  * [量子键码](zh-cn/quantum_keycodes.md)
-  * [高级键码](zh-cn/feature_advanced_keycodes.md)
-  * [音频](zh-cn/feature_audio.md)
-  * [自动shift](zh-cn/feature_auto_shift.md)
-  * [背光](zh-cn/feature_backlight.md)
-  * [蓝牙](zh-cn/feature_bluetooth.md)
-  * [热改键](zh-cn/feature_bootmagic.md)
-  * [组合](zh-cn/feature_combo)
-  * [命令](zh-cn/feature_command.md)
-  * [消抖 API](zh-cn/feature_debounce_type.md)
-  * [拨动开关](zh-cn/feature_dip_switch.md)
-  * [动态宏指令](zh-cn/feature_dynamic_macros.md)
-  * [编码器](zh-cn/feature_encoders.md)
-  * [重音号Esc复合键](zh-cn/feature_grave_esc.md)
-  * [触摸反馈](zh-cn/feature_haptic_feedback.md)
-  * [HD44780 LCD控制器](zh-cn/feature_hd44780.md)
-  * [自锁键](zh-cn/feature_key_lock.md)
-  * [布局](zh-cn/feature_layouts.md)
-  * [前导键](zh-cn/feature_leader_key.md)
-  * [LED阵列](zh-cn/feature_led_matrix.md)
-  * [宏指令](zh-cn/feature_macros.md)
-  * [鼠标键](zh-cn/feature_mouse_keys.md)
-  * [OLED驱动](zh-cn/feature_oled_driver.md)
-  * [一键功能](zh-cn/one_shot_keys.md)
-  * [指针设备](zh-cn/feature_pointing_device.md)
-  * [PS/2鼠标](zh-cn/feature_ps2_mouse.md)
-  * [RGB灯光](zh-cn/feature_rgblight.md)
-  * [RGB矩阵](zh-cn/feature_rgb_matrix.md)
-  * [空格候补换挡](zh-cn/feature_space_cadet.md)
-  * [分体键盘](zh-cn/feature_split_keyboard.md)
-  * [速录机](zh-cn/feature_stenography.md)
-  * [换手](zh-cn/feature_swap_hands.md)
-  * [多击键](zh-cn/feature_tap_dance.md)
-  * [终端](zh-cn/feature_terminal.md)
-  * [热敏打印机](zh-cn/feature_thermal_printer.md)
-  * [Unicode](zh-cn/feature_unicode.md)
-  * [用户空间](zh-cn/feature_userspace.md)
-  * [速度键](zh-cn/feature_velocikey.md)
+* 配置器(Configurator)
+  * [总览](zh-cn/newbs_building_firmware_configurator.md)
+  * [入门](zh-cn/configurator_step_by_step.md)
+  * [问题排查](zh-cn/configurator_troubleshooting.md)
+  * [框架](zh-cn/configurator_architecture.md)
+  * QMK API
+    * [总览](zh-cn/api_overview.md)
+    * [API文档](zh-cn/api_docs.md)
+    * [键盘支持](zh-cn/reference_configurator_support.md)
+    * [添加默认键映射](zh-cn/configurator_default_keymaps.md)
 
-* 制造和定制者指南
-  * [手工连线指南](zh-cn/hand_wire.md)
-  * [ISP刷新指南](zh-cn/isp_flashing_guide.md)
-  * [ARM调试指南](zh-cn/arm_debugging.md)
-  * [ADC设备](zh-cn/adc_driver.md)
-  * [I2C设备](zh-cn/i2c_driver.md)
-  * [SPI设备](zh-cn/spi_driver.md)
-  * [WS2812设备](zh-cn/ws2812_driver.md)
-  * [EEPROM设备](zh-cn/eeprom_driver.md)
-  * [GPIO控制](zh-cn/internals_gpio_control.md)
-  * [自定义键盘矩阵](zh-cn/custom_matrix.md)
-  * [Proton C转换](zh-cn/proton_c_conversion.md)
+* CLI
+    * [总览](zh-cn/cli.md)
+    * [配置](zh-cn/cli_configuration.md)
+    * [命令](zh-cn/cli_commands.md)
+    * [Tab补全](zh-cn/cli_tab_complete.md)
 
-* 深入了解
-  * [键盘工作原理](zh-cn/how_keyboards_work.md)
-  * [深入了解QMK](zh-cn/understanding_qmk.md)
+* 使用QMK
+  * 导览
+    * [功能定制](zh-cn/custom_quantum_functions.md)
+    * [利用Zadig安装驱动](zh-cn/driver_installation_zadig.md)
+    * [极简式制作](zh-cn/easy_maker.md)
+    * [键映射总览](zh-cn/keymap.md)
+    * 开发环境
+      * [Docker指南](zh-cn/getting_started_docker.md)
+      * [Vagrant指南](zh-cn/getting_started_vagrant.md)
+    * 刷写(Flashing)
+      * [刷写](zh-cn/flashing.md)
+      * [刷写ATmega32A (ps2avrgb)](zh-cn/flashing_bootloadhid.md)
+    * IDE
+      * [在Eclipse中使用QMK](zh-cn/other_eclipse.md)
+      * [在VSCode中使用QMK](zh-cn/other_vscode.md)
+    * Git最佳实践
+      * [介绍](zh-cn/newbs_git_best_practices.md)
+      * [你自己的副本](zh-cn/newbs_git_using_your_master_branch.md)
+      * [冲突合并](zh-cn/newbs_git_resolving_merge_conflicts.md)
+      * [基于你的分支修复](zh-cn/newbs_git_resynchronize_a_branch.md)
+    * 键盘组装
+      * [飞线指南](zh-cn/hand_wire.md)
+      * [ISP刷写指南](zh-cn/isp_flashing_guide.md)
 
-* 其他话题
-  * [使用Eclipse开发QMK](zh-cn/other_eclipse.md)
-  * [使用VSCode开发QMK](zh-cn/other_vscode.md)
-  * [支持](zh-cn/getting_started_getting_help.md)
-  * [翻译QMK文档](zh-cn/translating.md)
+  * 键码入门
+    * [键码汇总](zh-cn/keycodes.md)
+    * [基础键码](zh-cn/keycodes_basic.md)
+    * [语言特定的键码](zh-cn/reference_keymap_extras.md)
+    * [修饰键](zh-cn/feature_advanced_keycodes.md)
+    * [原子键码](zh-cn/quantum_keycodes.md)
+    * [Magic键码](zh-cn/keycodes_magic.md)
 
-* QMK 内构 (正在编写)
-  * [定义](zh-cn/internals_defines.md)
-  * [输入回调寄存器](zh-cn/internals_input_callback_reg.md)
-  * [Midi设备](zh-cn/internals_midi_device.md)
-  * [Midi设备配置过程](zh-cn/internals_midi_device_setup_process.md)
-  * [Midi工具库](zh-cn/internals_midi_util.md)
-  * [发送函数](zh-cn/internals_send_functions.md)
-  * [Sysex工具](zh-cn/internals_sysex_tools.md)
-<!--fromen:20200126-6:03AM(GMT+8)-->
-<!--cn:20200211-11:04AM(GMT+8)-->
+  * 键码进阶
+    * [指令](zh-cn/feature_command.md)
+    * [动态宏](zh-cn/feature_dynamic_macros.md)
+    * [Grave Escape](zh-cn/feature_grave_esc.md)
+    * [前导键](zh-cn/feature_leader_key.md)
+    * [Mod-Tap](zh-cn/mod_tap.md)
+    * [宏](zh-cn/feature_macros.md)
+    * [鼠标键](zh-cn/feature_mouse_keys.md)
+    * [Space Cadet Shift](zh-cn/feature_space_cadet.md)
+    * [US ANSI上档键值](zh-cn/keycodes_us_ansi_shifted.md)
+
+  * 软件特性
+    * [自动Shift](zh-cn/feature_auto_shift.md)
+    * [组合键](zh-cn/feature_combo.md)
+    * [防抖API](zh-cn/feature_debounce_type.md)
+    * [按键锁定](zh-cn/feature_key_lock.md)
+    * [按键重定义](zh-cn/feature_key_overrides.md)
+    * [层](zh-cn/feature_layers.md)
+    * [粘滞键](zh-cn/one_shot_keys.md)
+    * [光标设备](zh-cn/feature_pointing_device.md)
+    * [原生HID](zh-cn/feature_rawhid.md)
+    * [Sequencer](zh-cn/feature_sequencer.md)
+    * [换手](zh-cn/feature_swap_hands.md)
+    * [一键多用](zh-cn/feature_tap_dance.md)
+    * [点按配置](zh-cn/tap_hold.md)
+    * [终端](zh-cn/feature_terminal.md)
+    * [Unicode](zh-cn/feature_unicode.md)
+    * [用户空间](zh-cn/feature_userspace.md)
+    * [WPM计算](zh-cn/feature_wpm.md)
+
+  * 硬件特性
+    * 显示
+      * [HD44780 LCD控制器](zh-cn/feature_hd44780.md)
+      * [ST7565 LCD驱动](zh-cn/feature_st7565.md)
+      * [OLED驱动](zh-cn/feature_oled_driver.md)
+    * 灯效
+      * [背光](zh-cn/feature_backlight.md)
+      * [LED矩阵](zh-cn/feature_led_matrix.md)
+      * [RGB灯光](zh-cn/feature_rgblight.md)
+      * [RGB矩阵](zh-cn/feature_rgb_matrix.md)
+    * [音频](zh-cn/feature_audio.md)
+    * [蓝牙](zh-cn/feature_bluetooth.md)
+    * [Bootmagic Lite](zh-cn/feature_bootmagic.md)
+    * [自定义矩阵](zh-cn/custom_matrix.md)
+    * [Digitizer](zh-cn/feature_digitizer.md)
+    * [拨动开关（DIP Switch）](zh-cn/feature_dip_switch.md)
+    * [编码器（旋钮）](zh-cn/feature_encoders.md)
+    * [触摸反馈](zh-cn/feature_haptic_feedback.md)
+    * [摇杆](zh-cn/feature_joystick.md)
+    * [LED指示](zh-cn/feature_led_indicators.md)
+    * [MIDI](zh-cn/feature_midi.md)
+    * [Proton C转换](zh-cn/proton_c_conversion.md)
+    * [PS/2鼠标](zh-cn/feature_ps2_mouse.md)
+    * [分体式键盘](zh-cn/feature_split_keyboard.md)
+    * [速记](zh-cn/feature_stenography.md)
+    * [热敏打印机](zh-cn/feature_thermal_printer.md)
+    * [Velocikey](zh-cn/feature_velocikey.md)
+
+* QMK开发
+  * [PR Checklist](zh-cn/pr_checklist.md)
+  * 打破兼容的改动
+    * [总览](zh-cn/breaking_changes.md)
+    * [我的PR已打上标记](zh-cn/breaking_changes_instructions.md)
+    * [近期的变更日志(Changelog)](zh-cn/ChangeLog/20210529.md "QMK v0.13.0 - 2021 May 29")
+    * [更早期的不兼容改动](zh-cn/breaking_changes_history.md)
+
+  * C语言开发
+    * [ARM调试指引](zh-cn/arm_debugging.md)
+    * [AVR处理器](zh-cn/hardware_avr.md)
+    * [C编码规范](zh-cn/coding_conventions_c.md)
+    * [兼容的微处理器](zh-cn/compatible_microcontrollers.md)
+    * [驱动](zh-cn/hardware_drivers.md)
+      * [ADC驱动](zh-cn/adc_driver.md)
+      * [Audio驱动](zh-cn/audio_driver.md)
+      * [I2C驱动](zh-cn/i2c_driver.md)
+      * [SPI驱动](zh-cn/spi_driver.md)
+      * [WS2812驱动](zh-cn/ws2812_driver.md)
+      * [EEPROM驱动](zh-cn/eeprom_driver.md)
+      * [串口驱动](zh-cn/serial_driver.md)
+      * [UART驱动](zh-cn/uart_driver.md)
+    * [操控GPIO](zh-cn/internals_gpio_control.md)
+    * [键盘开发指引](zh-cn/hardware_keyboard_guidelines.md)
+
+  * Python开发
+    * [编码规范](zh-cn/coding_conventions_python.md)
+    * [QMK CLI开发](zh-cn/cli_development.md)
+
+  * 配置器开发
+    * QMK API
+      * [开发环境](zh-cn/api_development_environment.md)
+      * [架构总览](zh-cn/api_development_overview.md)
+
+  * 硬件平台开发
+    * Arm/ChibiOS
+      * [选择MCU](zh-cn/platformdev_selecting_arm_mcu.md)
+      * [启动引导](zh-cn/platformdev_chibios_earlyinit.md)
+
+  * QMK参考信息
+    * [参与到QMK](zh-cn/contributing.md)
+    * [翻译QMK文档](zh-cn/translating.md)<!--but should we translate this? currently keep it fallback-->
+    * [配置](zh-cn/config_options.md)
+    * [数据驱动配置](zh-cn/data_driven_config.md)
+    * [Make指引](zh-cn/getting_started_make_guide.md)
+    * [编写文档的最佳实践](zh-cn/documentation_best_practices.md)
+    * [文档模板](zh-cn/documentation_templates.md)
+    * [贡献配列到社区](zh-cn/feature_layouts.md)
+    * [单元测试](zh-cn/unit_testing.md)
+    * [常用函数](zh-cn/ref_functions.md)
+    * [info.json参考资料](zh-cn/reference_info_json.md)
+
+  * 深入了解
+    * [键盘工作原理](zh-cn/how_keyboards_work.md)
+    * [键盘矩阵原理](zh-cn/how_a_matrix_works.md)
+    * [了解QMK](zh-cn/understanding_qmk.md)
+
+  * QMK内部细节 (编辑中)
+    * [定义](zh-cn/internals_defines.md)
+    * [输入回调的注册](zh-cn/internals_input_callback_reg.md)
+    * [Midi设备](zh-cn/internals_midi_device.md)
+    * [Midi设备驱动流程](zh-cn/internals_midi_device_setup_process.md)
+    * [Midi辅助功能](zh-cn/internals_midi_util.md)
+    * [发送函数](zh-cn/internals_send_functions.md)
+    * [Sysex工具](zh-cn/internals_sysex_tools.md)
+    
+<!--fromen:20211014-12:00(GMT+8) commit 04cf161aa01fd433b5dae69d9fd31569ed5dca59-->
diff --git a/docs/zh-cn/api_docs.md b/docs/zh-cn/api_docs.md
new file mode 100644
index 0000000000..a2df9ec20a
--- /dev/null
+++ b/docs/zh-cn/api_docs.md
@@ -0,0 +1,73 @@
+# QMK API
+
+<!---
+  original document: 0.15.12:docs/api_docs.md
+  git diff 0.15.12 HEAD -- docs/api_docs.md | cat
+-->
+
+本章节详述了QMK API的使用方法，若您是应用开发者，使用这套API可以实现[QMK](https://qmk.fm)键盘固件的编译支持。
+
+## 总览
+
+本服务提供了一套用于编译自定义键映射的异步API，通过POST方式发送JSON参数到API，定期检查执行状态，待固件编译完成后，即可下载生成的固件文件和固件的源文件（如果需要的话）。
+
+#### 荷载JSON参数示例：
+
+```json
+{
+  "keyboard": "clueboard/66/rev2",
+  "keymap": "my_awesome_keymap",
+  "layout": "LAYOUT_all",
+  "layers": [
+    ["KC_GRV","KC_1","KC_2","KC_3","KC_4","KC_5","KC_6","KC_7","KC_8","KC_9","KC_0","KC_MINS","KC_EQL","KC_GRV","KC_BSPC","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_PGDN","KC_CAPS","KC_A","KC_S","KC_D","KC_F","KC_G","KC_H","KC_J","KC_K","KC_L","KC_SCLN","KC_QUOT","KC_NUHS","KC_ENT","KC_LSFT","KC_NUBS","KC_Z","KC_X","KC_C","KC_V","KC_B","KC_N","KC_M","KC_COMM","KC_DOT","KC_SLSH","KC_RO","KC_RSFT","KC_UP","KC_LCTL","KC_LGUI","KC_LALT","KC_MHEN","KC_SPC","KC_SPC","KC_HENK","KC_RALT","KC_RCTL","MO(1)","KC_LEFT","KC_DOWN","KC_RIGHT"],
+    ["KC_ESC","KC_F1","KC_F2","KC_F3","KC_F4","KC_F5","KC_F6","KC_F7","KC_F8","KC_F9","KC_F10","KC_F11","KC_F12","KC_TRNS","KC_DEL","BL_STEP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","_______","KC_TRNS","KC_PSCR","KC_SLCK","KC_PAUS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_PGUP","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_LEFT","KC_PGDN","KC_RGHT"],
+    ["KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","RESET","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(2)","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","KC_TRNS","MO(1)","KC_TRNS","KC_TRNS","KC_TRNS"]
+  ]
+}
+```
+
+如上可见，荷载参数里有用于生成固件文件的所有键盘信息。每一个层定义都包含了与键盘 `LAYOUT` 宏定义一致的QMK键码列表数据，若该键盘有多个支持的 `LAYOUT` 宏定义，也可以指定使用的是哪一个。
+
+## 提交一个编译job
+
+若要将键映射配置编译成固件文件，仅需将JSON参数通过POST发送至 `/v1/compile` 节点。下面的示例中我们假设JSON荷载参数已存放在 `json_data` 文件中。
+
+```
+$ curl -H "Content-Type: application/json" -X POST -d "$(< json_data)" https://api.qmk.fm/v1/compile
+{
+  "enqueued": true,
+  "job_id": "ea1514b3-bdfc-4a7b-9b5c-08752684f7f6"
+}
+```
+
+## 检查状态
+
+键映射配置提交后，可以简单地通过 HTTP GET 请求来查询job状态：
+
+```
+$ curl https://api.qmk.fm/v1/compile/ea1514b3-bdfc-4a7b-9b5c-08752684f7f6
+{
+  "created_at": "Sat, 19 Aug 2017 21:39:12 GMT",
+  "enqueued_at": "Sat, 19 Aug 2017 21:39:12 GMT",
+  "id": "f5f9b992-73b4-479b-8236-df1deb37c163",
+  "status": "running",
+  "result": null
+}
+```
+
+这份信息告诉我们编译job已经提交到队列中且正在执行。job的状态有5种：
+
+* **failed（失败）**: 编译服务出现问题。
+* **finished（完成）**: 编译已完成，`result` 字段中保存了编译结果。
+* **queued（排队中）**: 键映射job在等待可用的编译服务器。
+* **running（执行中）**: 编译进行中，应当很快就会结束。
+* **unknown（未知）**: 出现了较严重的错误，请给我们[提交一个bug](https://github.com/qmk/qmk_compiler/issues).
+
+## 确认编译产出
+
+编译job完成后请查看 `result` 字段，该字段下保存了如下信息项的哈希表数据：
+
+* `firmware_binary_url`: 用于刷写的固件文件URL列表
+* `firmware_keymap_url`: `keymap.c` 文件URL列表
+* `firmware_source_url`: 完整的固件源代码URL列表
+* `output`: 编译job的stdout及stderr输出信息，所有错误信息都会在这里。
diff --git a/docs/zh-cn/api_overview.md b/docs/zh-cn/api_overview.md
new file mode 100644
index 0000000000..a07cfb7427
--- /dev/null
+++ b/docs/zh-cn/api_overview.md
@@ -0,0 +1,20 @@
+# QMK API
+
+<!---
+  original document: 0.15.12:docs/api_overview.md
+  git diff 0.15.12 HEAD -- docs/api_overview.md | cat
+-->
+
+QMK API提供了一套可用于Web及GUI工具可用的异步API，用于实现将任何[QMK](https://qmk.fm/)支持的键盘的键映射方案进行编译。已有的键映射模板支持所有的QMK键码并且不需要额外的C代码需求。键盘的维护团队可以提供新的模板来启用更多功能的支持。
+
+## App开发者
+
+若您是一位意愿将这套API引入您的程序中的移动端App开发者，请参阅[API使用指引](zh-cn/api_docs.md)。
+
+## 键盘维护团队
+
+若您希望强化您维护的键盘方案在QMK编译API中的支持，请参阅[键盘支持](zh-cn/reference_configurator_support.md)。
+
+## 后端开发者
+
+若您对这套API系统本身感兴趣，请参阅[开发环境](zh-cn/api_development_environment.md)搭建环境并继续深入探索[架构总览](zh-cn/api_development_overview.md)。
diff --git a/docs/zh-cn/cli.md b/docs/zh-cn/cli.md
new file mode 100644
index 0000000000..22c2db92c8
--- /dev/null
+++ b/docs/zh-cn/cli.md
@@ -0,0 +1,43 @@
+# QMK CLI :id=qmk-cli
+
+<!---
+  original document: 0.15.12:docs/cli.md
+  git diff 0.15.12 HEAD -- docs/cli.md | cat
+-->
+
+## 总览 :id=overview
+
+QMK CLI可以让构建QMK键盘的过程更轻松一些，我们已提供的一批指令可用于简化及流式化地处理一些常见工作，如获取并编译QMK固件，创建新的键映射等。
+
+### 依赖项 :id=requirements
+
+QMK依赖Python 3.6或更高版本。我们已经尽力缩减依赖项，但在[`requirements.txt`](https://github.com/qmk/qmk_firmware/blob/master/requirements.txt)中的依赖项是需安装的包。在安装QMK CLI时这些依赖项也会自动完成安装。
+
+### 通过 Homebrew 安装(macOS 及部分 Linux) :id=install-using-homebrew
+
+若已安装[Homebrew](https://brew.sh)，可以按如下方法安装QMK:
+
+```
+brew install qmk/qmk/qmk
+export QMK_HOME='~/qmk_firmware' # 可选，指定 `qmk_firmware` 的路径
+qmk setup  # 拉取 `qmk/qmk_firmware` 并选择性地配置构建环境
+```
+
+### 通过 pip 安装 :id=install-using-easy_install-or-pip
+
+未在以上列出的操作系统可以手动安装QMK。首先确认已安装Python 3.6（或更高版本）及 pip，然后通过如下指令安装QMK：
+
+```
+python3 -m pip install qmk
+export QMK_HOME='~/qmk_firmware' # 可选，指定 `qmk_firmware` 的路径
+qmk setup  # 拉取 `qmk/qmk_firmware` 并选择性地配置构建环境
+```
+
+### 其它操作系统的安装包 :id=packaging-for-other-operating-systems
+
+我们正在寻求可以制作维护更多操作系统下可用的 `qmk` 安装包的开发者，若您愿意为您的操作系统制作安装包，请遵循如下指引：
+
+* 当该系统下的最佳实践与本指引冲突时，请遵循系统的最佳实践方案
+    * 但请在注释中列明此处违反这份指引的原因
+* 在 virtualenv 下安装
+* 指引用户去设置 `QMK_HOME` 环境变量，使得固件源文件拉取路径不再是默认的 `~/qmk_firmware`
diff --git a/docs/zh-cn/cli_commands.md b/docs/zh-cn/cli_commands.md
new file mode 100644
index 0000000000..08d1cc7e79
--- /dev/null
+++ b/docs/zh-cn/cli_commands.md
@@ -0,0 +1,503 @@
+# QMK CLI 命令
+
+<!---
+  original document: 0.15.12:docs/cli_commands.md
+  git diff 0.15.12 HEAD -- docs/cli_commands.md | cat
+-->
+
+# 用户命令
+
+## `qmk compile`
+
+该命令用于在指定目录下编译固件，可用于构建<https://config.qmk.fm>导出的JSON数据，代码库中的键映射，或是当前目录下的键盘。
+
+该命令会尝试感知目录路径，当你在键盘或键映射目录下执行时，KEYBOARD及KEYMAP参数将被自动填入。
+
+**用于配置器导出的数据时**：
+
+```
+qmk compile [-c] <configuratorExport.json>
+```
+
+**用于键映射时**：
+
+```
+qmk compile [-c] [-e <var>=<value>] [-j <num_jobs>] -kb <keyboard_name> -km <keymap_name>
+```
+
+**在键盘目录下时**：  
+
+须在存在默认键映射的键盘目录下执行，或是在键盘的键映射子目录下，否则须指定参数 `--keymap <keymap_name>`
+```
+qmk compile
+```
+
+**构建所有支持该键映射的键盘时**：
+
+```
+qmk compile -kb all -km <keymap_name>
+```
+
+**示例**：
+```
+$ qmk config compile.keymap=default
+$ cd ~/qmk_firmware/keyboards/planck/rev6
+$ qmk compile
+Ψ Compiling keymap with make planck/rev6:default
+...
+```
+指定键映射参数时
+
+```
+$ cd ~/qmk_firmware/keyboards/clueboard/66/rev4 
+$ qmk compile -km 66_iso
+Ψ Compiling keymap with make clueboard/66/rev4:66_iso
+...
+```
+位于键盘目录下时
+
+```
+$ cd ~/qmk_firmware/keyboards/gh60/satan/keymaps/colemak
+$ qmk compile
+Ψ Compiling keymap with make make gh60/satan:colemak
+...
+```
+
+**在配列目录下时**：  
+
+必须是在 `qmk_firmware/layouts/` 下的键映射目录下。
+```
+qmk compile -kb <keyboard_name>
+```
+
+**示例**：
+```
+$ cd ~/qmk_firmware/layouts/community/60_ansi/mechmerlin-ansi
+$ qmk compile -kb dz60
+Ψ Compiling keymap with make dz60:mechmerlin-ansi
+...
+```
+
+**并行编译**：
+
+在编译时添加 `-j`/`--parallel` 开关可能有助于加快编译速度。
+```
+qmk compile -j <num_jobs> -kb <keyboard_name>
+```
+`num_jobs` 用于指定并行的job上限，将其设置为0可以实现无限制的并行编译。
+```
+qmk compile -j 0 -kb <keyboard_name>
+```
+
+## `qmk flash` :id=qmk-flash
+
+该命令与 `qmk compile` 类似，但额外地可以指定bootloader。bootloader参数是可选的，默认会指定为 `:flash`。可通过 `-bl <bootloader>` 来指定bootloader。请查阅[刷写固件](zh-cn/flashing.md)指引以深入了解可用的bootloader信息。
+
+该命令会尝试感知目录路径，当你在键盘或键映射目录下执行时，KEYBOARD及KEYMAP参数将被自动填入。
+
+**用于配置器导出的数据时**：
+
+```
+qmk flash [-bl <bootloader>] [-c] [-e <var>=<value>] [-j <num_jobs>] <configuratorExport.json>
+```
+
+**用于键映射时**：
+
+```
+qmk flash -kb <keyboard_name> -km <keymap_name> [-bl <bootloader>] [-c] [-e <var>=<value>] [-j <num_jobs>]
+```
+
+**列出所有bootloader**
+
+```
+qmk flash -b
+```
+
+## `qmk config`
+
+该命令用于配置QMK功能，完整的 `qmk config` 文档参见[CLI配置](zh-cn/cli_configuration.md)。
+
+**使用方法**：
+
+```
+qmk config [-ro] [config_token1] [config_token2] [...] [config_tokenN]
+```
+
+## `qmk cd`
+
+该命令会启动一个新的 shell 会话并定位到 `qmk_firmware` 所在目录。
+
+须留意如果你已经位于 `QMK_HOME` 下的某个位置（比如 `keyboards/` 目录中），该指令不会生效。
+
+若要退回到原来的 shell 会话，只需要执行 `exit`。
+
+**使用方法**:
+
+```
+qmk cd
+```
+
+## `qmk console`
+
+该命令用于连接键盘终端并展示调试信息。仅当键盘固件通过 `CONSOLE_ENABLE=yes` 编译时有效。
+
+**用法**：
+
+```
+qmk console [-d <pid>:<vid>[:<index>]] [-l] [-n] [-t] [-w <seconds>]
+```
+
+**示例**：
+
+连接到所有可用的键盘并输出终端信息：
+
+```
+qmk console
+```
+
+列出所有设备：
+
+```
+qmk console -l
+```
+
+仅输出 clueboard/66/rev3 键盘的信息:
+
+```
+qmk console -d C1ED:2370
+```
+
+仅输出第二把 clueboard/66/rev3 键盘的信息:
+
+```
+qmk console -d C1ED:2370:2
+```
+
+输出时间戳及VID:PID以替代键盘名：
+
+```
+qmk console -n -t
+```
+
+屏蔽bootloader的消息：
+
+```
+qmk console --no-bootloaders
+```
+
+## `qmk doctor`
+
+该命令用以检查你的开发环境并对发现的潜在的构建及刷写问题进行提醒，如果您乐意，它也可以修复其中大部分问题。
+
+**用法**：
+
+```
+qmk doctor [-y] [-n]
+```
+
+**示例**：
+
+检查开发环境中的问题并提示是否修复：
+
+    qmk doctor
+
+检查开发环境中的问题并自动进行修复：
+
+    qmk doctor -y
+
+检查开发环境中的问题，仅生成报告：
+
+    qmk doctor -n
+
+## `qmk format-json`
+
+将JSON文件格式化为（尽量）便于阅读的形式。会自动分辨JSON结构类型（info.json还是keymap.json），必要时也可以通过 `--format` 指定。
+
+**用法**：
+
+```
+qmk format-json [-f FORMAT] <json_file>
+```
+
+## `qmk info`
+
+展示QMK中的键盘及键映射信息，该命令用来获取键盘信息，输出配列，展示底层按键矩阵，及格式化地输出键映射JSON数据。
+
+**用法**：
+
+```
+qmk info [-f FORMAT] [-m] [-l] [-km KEYMAP] [-kb KEYBOARD]
+```
+
+该命令会尝试感知目录路径，当你在键盘或键映射目录下执行时，KEYBOARD及KEYMAP参数将被自动填入。
+
+**示例**：
+
+输出键盘的基础信息：
+
+    qmk info -kb planck/rev5
+
+输出键盘的矩阵信息：
+
+    qmk info -kb ergodox_ez -m
+
+输出键盘的键映射JSON数据：
+
+    qmk info -kb clueboard/california -km default
+
+## `qmk json2c`
+
+从QMK配置器导出的数据中生成 keymap.c 文件
+Creates a keymap.c from a QMK Configurator export.
+
+**用法**：
+
+```
+qmk json2c [-o OUTPUT] filename
+```
+
+## `qmk c2json`
+
+从 keymap.c 文件中生成 keymap.json
+**注意：** 解析C代码文件并不容易，该命令有可能无法对你的键映射文件生效，不使用C预处理代码有时可以解决问题。
+
+**用法**：
+
+```
+qmk c2json -km KEYMAP -kb KEYBOARD [-q] [--no-cpp] [-o OUTPUT] filename
+```
+
+## `qmk lint`
+
+检查键盘及键映射数据并提示出常见错误与问题，以及不符合模板规范的地方。
+
+**用法**：
+
+```
+qmk lint [-km KEYMAP] [-kb KEYBOARD] [--strict]
+```
+
+该命令会尝试感知目录路径，当你在键盘或键映射目录下执行时，KEYBOARD及KEYMAP参数将被自动填入。
+
+**示例**：
+
+基本的lint检查：
+
+    qmk lint -kb rominronin/katana60/rev2
+
+## `qmk list-keyboards`
+
+该命令可以列出 `qmk_firmware` 中所有的键盘
+
+**用法**：
+
+```
+qmk list-keyboards
+```
+
+## `qmk list-keymaps`
+
+该命令可以列出指定键盘（及指定版本）下的所有键映射。
+
+该命令会尝试感知目录路径，当你在键盘或键映射目录下执行时，KEYBOARD及KEYMAP参数将被自动填入。
+
+**用法**：
+
+```
+qmk list-keymaps -kb planck/ez
+```
+
+## `qmk new-keyboard`
+
+该命令可基于现有模板创建出新的键盘定义。
+
+对于未给出的参数，会提示你输入，若未传入 `-u` 参数且 .gitconfig 中设置了 `user.name`，则会提示你使用该值作为默认用户名。
+
+**用法**：
+
+```
+qmk new-keyboard [-kb KEYBOARD] [-t {avr,ps2avrgb}] -u USERNAME
+```
+
+## `qmk new-keymap`
+
+该命令可基于键盘已有的默认键映射创建新的键映射。
+
+该命令会尝试感知目录路径，当你在键盘或键映射目录下执行时，KEYBOARD及KEYMAP参数将被自动填入。
+
+**用法**：
+
+```
+qmk new-keymap [-kb KEYBOARD] [-km KEYMAP]
+```
+
+## `qmk clean`
+
+该命令会清理 `.build` 目录，若传入 `--all` 开关，在 `qmk_firmware` 下的所有.hex及.bin文件也会一并删除。
+
+**用法**：
+
+```
+qmk clean [-a]
+```
+
+---
+
+# 面向开发者的命令
+
+## `qmk format-text`
+
+该命令会重新格式化并统一文件的换行符。
+
+代码库下所有的文件须使用Unix换行符（LF）。
+若你在**Windows**下进行开发，必须确保文件中的换行符是正确的，才能让你的PR被允许合入。
+
+```
+qmk format-text
+```
+
+## `qmk format-c`
+
+该命令会使用clang-format来格式化C代码。
+
+不带参数地执行该命令以用来格式化核心代码相关的改动，默认会通过 `git diff` 来检查 `origin/master`， 可以通过 `-b <分支名>` 来改变检查的分支。
+
+带着 `-a` 开关执行命令会格式化所有的核心代码，也可以在命令行中传入文件名来指定格式化某个文件。
+
+**用以处理指定文件时**：
+
+```
+qmk format-c [file1] [file2] [...] [fileN]
+```
+
+**用以处理所有的核心代码时**：
+
+```
+qmk format-c -a
+```
+
+**用以处理 origin/master 下的所有改动时**：
+
+```
+qmk format-c
+```
+
+**用以处理指定分支下的所有改动时**：
+
+```
+qmk format-c -b branch_name
+```
+
+## `qmk generate-compilation-database`
+
+**用法**:
+
+```
+qmk generate-compilation-database [-kb KEYBOARD] [-km KEYMAP]
+```
+
+创建新 `compile_commands.json` 文件。
+
+你的IDE/编辑器是否使用了“编程语言本地服务器”（language server）且 _总是_ 无法找到全部的包含文件（include files）？是不是很讨厌红色的波浪线？想不想让你的编辑器看得懂 `#include QMK_KEYBOARD_H`？你需要的是一个[编译数据库](https://clang.llvm.org/docs/JSONCompilationDatabase.html)！而 QMK 可以帮助你构建出一个。
+
+该命令需要知道你在构建的是哪个键盘及键映射，它使用与 `qmk compile` 命令一样的选项：参数、当前目录以及配置文件。
+
+**示例：**
+
+```
+$ cd ~/qmk_firmware/keyboards/gh60/satan/keymaps/colemak
+$ qmk generate-compilation-database
+Ψ Making clean
+Ψ Gathering build instructions from make -n gh60/satan:colemak
+Ψ Found 50 compile commands
+Ψ Writing build database to /Users/you/src/qmk_firmware/compile_commands.json
+```
+
+现在可以打开你的开发环境并享受没有波浪线的日子了。
+
+## `qmk docs`
+
+该命令会在本地启动一个HTTP服务，从而你可以浏览及改进文档，默认端口号为8936，使用 `-b`/`--browser` 开关可以让该命令自动通过默认浏览器打开链接地址。
+
+**用法**：
+
+```
+qmk docs [-b] [-p PORT]
+```
+
+## `qmk generate-docs`
+
+该命令可以在本地生成QMK文档，用以文档的常规浏览使用，或进行文档改进工作。可以使用类似[serve](https://www.npmjs.com/package/serve)这样的工具来浏览生成的文档文件。
+
+**用法**：
+
+```
+qmk generate-docs
+```
+
+## `qmk generate-rgb-breathe-table`
+
+该命令可以生成用于[RGB灯光](zh-cn/feature_rgblight.md)的呼吸效果的查询表（LUT）头文件。将该文件命名为 `rgblight_breathe_table.h` 并放入键盘或键映射目录下，可以覆盖替换 `quantum/rgblight/` 下的默认LUT。
+
+**用法**：
+
+```
+qmk generate-rgb-breathe-table [-q] [-o OUTPUT] [-m MAX] [-c CENTER]
+```
+
+## `qmk kle2json`
+
+该命令可以将KLE原始数据转换成QMK配置器的JSON数据，可接受的输入可以是文件绝对路径，或当前目录下的文件名。若 `info.json` 文件存在，默认不会进行覆盖，通过指定 `-f` 或 `--force` 开关可以允许覆盖。
+
+**用法**：
+
+```
+qmk kle2json [-f] <filename>
+```
+
+**示例**：
+
+```
+$ qmk kle2json kle.txt 
+☒ File info.json already exists, use -f or --force to overwrite.
+```
+
+```
+$ qmk kle2json -f kle.txt -f
+Ψ Wrote out to info.json
+```
+
+## `qmk format-python`
+
+该命令可以对 `qmk_firmware` 下的python代码进行格式化。
+
+**用法**：
+
+```
+qmk format-python
+```
+
+## `qmk pytest`
+
+该命令会执行python测试框架，在你更改了python代码后，应确保该命令可以成功执行。
+
+**用法**：
+
+```
+qmk pytest
+```
+
+**示例**:
+
+执行全部的测试套件：
+
+    qmk pytest
+
+执行指定的测试用例组：
+
+    qmk pytest -t qmk.tests.test_cli_commands
+
+执行单个测试用例：
+
+    qmk pytest -t qmk.tests.test_cli_commands.test_c2json
+    qmk pytest -t qmk.tests.test_qmk_path
diff --git a/docs/zh-cn/cli_configuration.md b/docs/zh-cn/cli_configuration.md
new file mode 100644
index 0000000000..d3bca4a338
--- /dev/null
+++ b/docs/zh-cn/cli_configuration.md
@@ -0,0 +1,126 @@
+# QMK CLI 配置
+
+<!---
+  original document: 0.15.12:docs/cli_configuration.md
+  git diff 0.15.12 HEAD -- docs/cli_configuration.md | cat
+-->
+
+本文详述了 `qmk config` 功能及作用。
+
+# 介绍
+
+QMK CLI的配置系统是一套键/值（key/value）数据系统，每个键由一个子指令和一个参数名组成，通过点号（英文句号）分隔。这使得配置项可以简单直接地映射到命令行参数上。
+
+## 简单示例
+
+作为一个示例，对于指令 `qmk compile --keyboard clueboard/66/rev4 --keymap default`
+
+其存在两个命令行参数，可以通过如下方式从配置中读取：
+
+* `compile.keyboard`
+* `compile.keymap`
+
+可以这样设置：
+
+```
+$ qmk config compile.keyboard=clueboard/66/rev4 compile.keymap=default
+compile.keyboard: None -> clueboard/66/rev4
+compile.keymap: None -> default
+Ψ Wrote configuration to '/Users/example/Library/Application Support/qmk/qmk.ini'
+```
+
+现在每次执行 `qmk compile` 时都不需要指定键盘及键映射参数了。
+
+## 设置用户级的默认配置
+
+当你需要在多个命令中使用一致的配置项时，比如很多命令都需要的 `--keyboard` 参数，相比于每次执行命令都去指定该参数值，你可以直接设置用户级的配置值，即可将该配置用于所有的命令。
+
+示例：
+
+```
+$ qmk config user.keyboard=clueboard/66/rev4 user.keymap=default
+user.keyboard: None -> clueboard/66/rev4
+user.keymap: None -> default
+Ψ Wrote configuration to '/Users/example/Library/Application Support/qmk/qmk.ini'
+```
+
+# CLI文档 (`qmk config`)
+
+`qmk config` 命令可以管理配置数据。当不带额外参数执行时，会输出所有已有配置。存在参数时这些参数将被视为配置项参数，其格式须满足如下形式且无空格分隔：
+
+    <subcommand|general|default>[.<key>][=<value>]
+
+## 设置配置值
+
+在配置项的键后加 = 号进行值的设置，配置项的键必须是 `<section>.<key>` 的完整形式。
+
+举例：
+
+```
+$ qmk config default.keymap=default
+default.keymap: None -> default
+Ψ Wrote configuration to '/Users/example/Library/Application Support/qmk/qmk.ini'
+```
+
+## 读取配置值
+
+可以读取整个配置文件、单独配置键或是一整个配置系列，也可以同时指定读取多个配置项。
+
+### 全量配置读取示例
+
+    qmk config
+
+### 单系列配置读取示例
+
+    qmk config compile
+
+### 单配置项读取示例
+
+    qmk config compile.keyboard
+
+### 多配置项读取示例
+
+    qmk config user compile.keyboard compile.keymap
+
+## 删除配置值
+
+将配置值设置为 `None` 即可删除该配置值。
+
+示例：
+
+```
+$ qmk config default.keymap=None
+default.keymap: default -> None
+Ψ Wrote configuration to '/Users/example/Library/Application Support/qmk/qmk.ini'
+```
+
+## 批量操作
+
+一个指令中可以合并执行多个读写操作，将依序进行执行输出：
+
+```
+$ qmk config compile default.keymap=default compile.keymap=None
+compile.keymap=skully
+compile.keyboard=clueboard/66_hotswap/gen1
+default.keymap: None -> default
+compile.keymap: skully -> None
+Ψ Wrote configuration to '/Users/example/Library/Application Support/qmk/qmk.ini'
+```
+
+# 用户配置相关的配置项
+
+| 配置项 | 默认值 | 描述 |
+|-------|-------|------|
+| user.keyboard | None | 键盘路径（举例：`clueboard/66/rev4`） |
+| user.keymap | None | 键盘名称（举例：`default`） |
+| user.name | None | 用户的Github用户名 |
+
+# 所有配置项
+
+| 配置项 | 默认值 | 描述 |
+|-------|-------|------|
+| compile.keyboard | None | 键盘路径（举例：`clueboard/66/rev4`） |
+| compile.keymap | None | 键盘名称（举例：`default`） |
+| hello.name | None | 执行时展示的欢迎信息 |
+| new_keyboard.keyboard | None | 键盘路径（举例：`clueboard/66/rev4`） |
+| new_keyboard.keymap | None | 键盘名称（举例：`default`） |
diff --git a/docs/zh-cn/cli_tab_complete.md b/docs/zh-cn/cli_tab_complete.md
new file mode 100644
index 0000000000..7a16e9766c
--- /dev/null
+++ b/docs/zh-cn/cli_tab_complete.md
@@ -0,0 +1,32 @@
+# QMK Tab补全
+
+<!---
+  original document: 0.15.12:docs/cli_tab_complete.md
+  git diff 0.15.12 HEAD -- docs/cli_tab_complete.md | cat
+-->
+
+在使用Bash 4.2及更高版本、Zsh或FiSH时，可以启用QMK CLI的Tab补全功能，可以实现对 `qmk` 参数中的开关、键盘、文件等参数的自动补全。
+
+## 设置
+
+有以下几种启用Tab补全的方法。
+
+### 仅当前用户生效
+
+将以下内容添加到文件 `.profile` 或 `.bashrc` 的末尾:
+
+    source ~/qmk_firmware/util/qmk_tab_complete.sh
+
+若你的 `qmk_firmware` 存放在其它路径，以上路径也需要调整。
+
+### 系统级的符号关联
+
+若想让所有本地用户都可以实现Tab补全，可以按如下方法添加符号连接到 `qmk_tab_complete.sh` 脚本：
+
+    `ln -s ~/qmk_firmware/util/qmk_tab_complete.sh /etc/profile.d/qmk_tab_complete.sh`
+
+### 系统级的脚本拷贝
+
+有时符号连接的方案无效，可以改用拷贝文件到指定位置的方案。但须留意该Tab补全脚本可能会不定时更新，你需要定期重新拷贝一次该脚本。
+
+    cp util/qmk_tab_complete.sh /etc/profile.d
diff --git a/docs/zh-cn/configurator_architecture.md b/docs/zh-cn/configurator_architecture.md
new file mode 100644
index 0000000000..386ebd6899
--- /dev/null
+++ b/docs/zh-cn/configurator_architecture.md
@@ -0,0 +1,66 @@
+# QMK配置器框架
+
+<!---
+  original document: 0.15.12:docs/configurator_architecture.md
+  git diff 0.15.12 HEAD -- docs/configurator_architecture.md | cat
+-->
+
+本章节提供了QMK配置器前端技术框架信息，若你对QMK配置器前端工程本身感兴趣，可以从[QMK配置器](https://github.com/qmk/qmk_configurator)代码库开始。
+
+# 总览
+
+![QMK配置器技术框架图](./../configurator_diagram.svg)
+
+# 详述
+
+QMK配置器基于[单页面框架](https://en.wikipedia.org/wiki/Single-page_application)实现，供使用者创建兼容QMK键盘的自定义键映射方案。键映射方案可以导出为JSON格式的数据，也可以编译出可通过[QMK工具箱](https://github.com/qmk/qmk_toolbox)刷写到键盘中的固件文件。
+
+配置器从“键盘元数据仓库（Keyboard Metadata store）”获取键盘元数据，编译请求通过QMK API提交，编译产出放在S3兼容的数据仓库[Digital Ocean空间](https://www.digitalocean.com/products/spaces/)中。
+
+## 配置器前端
+
+地址：<https://config.qmk.fm>
+
+[配置器前端](https://config.qmk.fm)会编译并产出一些静态文件并通过Github Pages托管，每当[QMK配置器 `master`](https://github.com/qmk/qmk_configurator)分支收到推送的提交时都会触发。可以通过[QMK配置器 actions页面](https://github.com/qmk/qmk_configurator/actions/workflows/build.yml)查看这些job的状态。
+
+## 键盘元数据
+
+地址：<https://keyboards.qmk.fm>
+
+每当[qmk_firmware](https://github.com/qmk/qmk_firmware)仓库中的键盘定义变化时，会生成JSON格式的键盘元数据，并上传到指定空间用于配置器生成每种键盘的UI展现。可以在[QMK固件 actions页面](https://github.com/qmk/qmk_firmware/actions/workflows/api.yml)查看相关job的状态。如果你是QMK开发团队成员（Collaborator），可以使用 `workflow_dispatch` 事件触发器来手动执行该job。
+
+## QMK API
+
+地址：<http://api.qmk.fm>
+
+QMK API接受 `keymap.json` 文件输入并进行编译，这和你在 `qmk compile` 和 `qmk flash` 中使用的文件一样。当 `keymap.json` 文件被提交后，浏览器中的页面将定时查看job状态（每2秒一次，有时更久一些）直到job完成。最终产出的JSON描述信息里包含了键映射方案的源文件，及编译出的二进制的可下载链接地址。
+
+为遵循GPL协议，QMK API会确保源文件及编译产出总是同时提供的。
+
+API有3种非异常的回应状态-
+
+1. 编译job排队中
+2. 编译job执行中
+3. 编译job已完成
+
+### 编译job排队中
+
+此状态表明[QMK编译器](#QMK编译器)节点还未选中该job，在配置器页面此时会显示“等待一个可用的烤炉（Waiting for an oven）”。
+
+### 编译job执行中
+
+此状态说明编译job已经在执行中，配置器页面会显示为“烤制中”(Baking)。
+
+### 编译job已完成
+
+此状态说明编译job已经执行完毕，输出的JSON格式的状态信息里有源文件及编译产出的二进制文件的下载链接项。
+
+## Redis/RQ
+
+QMK API通过Redis队列分发job到可用的[QMK编译器](#QMK编译器)节点。接收到的 `keymap.json` 文件先送到RQ队列，而 `qmk_compiler` 节点则从中拉取执行。
+
+## QMK编译器
+
+[QMK编译器](https://github.com/qmk/qmk_compiler)负责执行 `keymap.json` 文件的实际编译工作。它的工作逻辑是先拉取有请求的 `qmk_firmware` 分支代码，执行 `qmk compile keymap.json`，最后上传源文件及二进制产出到Digital Ocean空间中。
+
+当用户需要下载源代码/二进制文件时，API会给出重定向后的已鉴权地址链接。
diff --git a/docs/zh-cn/configurator_default_keymaps.md b/docs/zh-cn/configurator_default_keymaps.md
new file mode 100644
index 0000000000..135029b7e2
--- /dev/null
+++ b/docs/zh-cn/configurator_default_keymaps.md
@@ -0,0 +1,198 @@
+# 向QMK配置器中添加默认键映射 :id=adding-default-keymaps
+
+<!---
+  original document: 0.15.12:docs/configurator_default_keymaps.md
+  git diff 0.15.12 HEAD -- docs/configurator_default_keymaps.md | cat
+-->
+
+本章节描述了如何向QMK配置器中添加一款键盘的默认键映射
+
+
+## 技术信息 :id=technical-information
+
+QMK配置器使用JSON作为键映射的本地文件格式。我们尽力确保其行为与在 `qmk_firmware` 中 执行 `make <keyboard>:default` 时一致。
+
+该目录下的键映射需要定义四个键值对：
+
+* `keyboard` (字符串)
+  * 键盘名称，与执行 `make` 进行编译时使用的一致（如 `make 1upkeyboards/1up60rgb:default`）。
+* `keymap` (字符串)
+  * 应设置为 `default`.
+* `layout` (字符串)
+  * 默认键映射应使用的配列宏定义。
+* `layers` (数组)
+  * 键映射数据。此键下的每行元素对应一个层定义，层定义中包含该层的键码组成信息。
+
+额外地，大部分键映射中还有一个 `commit` 项，该项并不是QMK配置器后端服务API所需，而是用于告知配置器维护者这份JSON键映射数据来源于代码库中的哪个版本的键映射。该值为 `qmk_firmware` 代码库中最后一次修改键盘默认 `keymap.c` 文件提交的commit的SHA标记。该SHA值的获取方式是拉取[`qmk/qmk_firmware` 库的 `master`分支](https://github.com/qmk/qmk_firmware/tree/master/)后，执行 `git log -1 --pretty=oneline -- keyboards/<keyboard>/keymaps/default/keymap.c`（若键盘有什么问题且存在 `keymap.json` 文件，则用之作为替代），执行结果应类似于：
+
+```
+f14629ed1cd7c7ec9089604d64f29a99981558e8 Remove/migrate action_get_macro()s from default keymaps (#5625)
+```
+
+本例中，`f14629ed1cd7c7ec9089604d64f29a99981558e8` 即应为 `commit` 的值。
+
+
+## 示例 :id=example
+
+若某人想添加H87a Hineybush键盘的默认键映射方案，应到 `qmk_firmware` 下H87a的默认键映射下执行上述 `git log` 命令：
+
+```
+user ~/qmk_firmware (master)
+$ git log -1 --pretty=oneline master -- keyboards/hineybush/h87a/keymaps/default/keymap.c
+ef8878fba5d3786e3f9c66436da63a560cd36ac9 Hineybush h87a lock indicators (#8237)
+```
+
+在我们获取了commit哈希值后，还需要键映射定义（为加强可读性进行了编辑处理）：
+
+```c
+...
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_all(
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,              KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_TRNS,                      KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT),
+
+  [1] = LAYOUT_all(
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,             BL_TOGG, BL_DEC,  BL_INC,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_VOLU,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_MPLY, KC_MNXT, KC_VOLD,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS),
+
+};
+```
+
+默认键映射使用了 `LAYOUT_all` 宏，最后其会成为 `layout` 项的值。编译为QMK配置器的JSON键映射数据后，输出文件应为：
+
+```json
+{
+  "keyboard": "hineybush/h87a",
+  "keymap": "default",
+  "commit": "ef8878fba5d3786e3f9c66436da63a560cd36ac9",
+  "layout": "LAYOUT_all",
+  "layers": [
+    [
+      "KC_ESC",             "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",                "KC_PSCR", "KC_SLCK", "KC_PAUS",
+      "KC_GRV",  "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_MINS", "KC_EQL",  "KC_BSPC", "KC_BSPC",    "KC_INS",  "KC_HOME", "KC_PGUP",
+      "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_LBRC", "KC_RBRC", "KC_BSLS",               "KC_DEL",  "KC_END",  "KC_PGDN",
+      "KC_CAPS", "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT", "KC_NUHS", "KC_ENT",
+      "KC_LSFT", "KC_NUBS", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH", "KC_RSFT", "KC_TRNS",                          "KC_UP",
+      "KC_LCTL", "KC_LGUI", "KC_LALT",                                  "KC_SPC",                                   "KC_RALT", "MO(1)",   "KC_RGUI", "KC_RCTL",               "KC_LEFT", "KC_DOWN", "KC_RGHT"
+    ],
+    [
+      "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG", "RGB_MOD", "RGB_HUD", "RGB_HUI", "RGB_SAD", "RGB_SAI", "RGB_VAD", "RGB_VAI",               "BL_TOGG", "BL_DEC",  "BL_INC",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",    "KC_TRNS", "KC_TRNS", "KC_VOLU",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RESET",   "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",               "KC_MPLY", "KC_MNXT", "KC_VOLD",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",                          "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "KC_TRNS",                                  "KC_TRNS",                                  "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",               "KC_TRNS", "KC_TRNS", "KC_TRNS"
+    ]
+  ]
+}
+```
+
+`layers` 数组中的空白区域不影响键映射功能，仅为了方便阅读。
+
+
+## 附加说明 :id=caveats
+
+### 层定义只能通过序号进行引用 :id=layer-references
+
+QMK中常见的一种做法是通过一系列 `#define` 或 `enum` 类型声明来对层定义进行命名：
+
+```c
+enum layer_names {
+    _BASE,
+    _MEDIA,
+    _FN
+};
+```
+
+对于C代码来讲可行，但对于配置器来讲，你*必须*使用层序号 - 上例中的`MO(_FN)` 应使用 `MO(2)`。
+
+### 不支持任何形式的定制化代码 :id=custom-code
+
+需要在 keymap.c 文件中添加函数代码的功能，如Tap Dance或是Unicode，都*完全*无法在配置器中构建。即便是在 `qmk_firmware` 代码库中在键盘定义中设置了 `TAP_DANCE_ENABLE = yes`，也只会导致*任何*固件构建在配置器中行不通。这是由API及JSON格式的键映射数据同时造成的限制。
+
+### 对自定义键码的不完全支持 :id=custom-keycodes
+
+仅有一个方案可以支持自定义键码：若自定义键码的逻辑实现是在 qmk_firmware 下的键盘定义中完成的，而非在键映射中，那么这个键码*可以*在配置器中使用且*可以*编译运行。（因此，）相对于在 `keymap.c` 中使用如下代码段：
+
+```c
+enum custom_keycodes {
+    MACRO_1 = SAFE_RANGE,
+    MACRO_2,
+    MACRO_3
+};
+...
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch(keycode) {
+        case MACRO_1:
+            if (record->event.pressed) {
+                SEND_STRING("This is macro #1.");
+            }
+            return false;
+        case MACRO_2:
+            if (record->event.pressed) {
+                SEND_STRING("This is macro #2.");
+            }
+            return false;
+        case MACRO_3:
+            if (record->event.pressed) {
+                SEND_STRING("This is macro #3.");
+            }
+            return false;
+    }
+    return true;
+};
+```
+
+... 请将键码的 `enum` 定义块添加到键盘的头文件（`<keyboard.h>`）中，例如（留意 `enum` 在这里命名为 `keyboard_keycodes`）：
+
+```c
+enum keyboard_keycodes {
+    MACRO_1 = SAFE_RANGE,
+    MACRO_2,
+    MACRO_3,
+    NEW_SAFE_RANGE  // 重要!
+};
+```
+
+... 之后在 `<keyboard>.c` 中的 `process_record_kb()` 代码逻辑应为：
+
+```c
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    switch(keycode) {
+        case MACRO_1:
+            if (record->event.pressed) {
+                SEND_STRING("This is macro #1.");
+            }
+            return false;
+        case MACRO_2:
+            if (record->event.pressed) {
+                SEND_STRING("This is macro #2.");
+            }
+            return false;
+        case MACRO_3:
+            if (record->event.pressed) {
+                SEND_STRING("This is macro #3.");
+            }
+            return false;
+    }
+    return process_record_user(keycode, record);
+};
+```
+
+注意最后的 `process_record_user()` 调用，若用户需要添加自定义键码到键映射中，须使用 `NEW_SAFE_RANGE` 替代 `SAFE_RANGE`，而其定义来自于上面键盘层定义中。
+
+
+## 更多资料 :id=additional-reading
+
+为了让QMK配置器支持你的键盘，你的键盘定义必须存在于 `qmk_firmware` 代码库的 `master` 分支中。相关操作指引，请参见[在QMK配置器中支持你的键盘](zh-cn/reference_configurator_support.md).
diff --git a/docs/zh-cn/configurator_step_by_step.md b/docs/zh-cn/configurator_step_by_step.md
new file mode 100644
index 0000000000..bbfb71d5a6
--- /dev/null
+++ b/docs/zh-cn/configurator_step_by_step.md
@@ -0,0 +1,63 @@
+# QMK 配置器: 入门
+
+<!---
+  original document: 0.15.12:docs/configurator_step_by_step.md
+  git diff 0.15.12 HEAD -- docs/configurator_step_by_step.md | cat
+-->
+
+本章节描述了如何使用QMK配置器构建出固件文件的过程。
+
+## 第一步：选择键盘
+
+从下拉列表中选择一款用于创建键映射的键盘。
+
+?> 当键盘有多个版本可选择时，请确保选择正确。
+
+因为很重要，这里我再次说一遍：
+
+!> **请选择正确的版本！**
+
+如果你的键盘声称是基于QMK的但未在列表中，可能是开发者还未提交给我们，或者提交还未被合并进来。若在[Pull Request](https://github.com/qmk/qmk_firmware/pulls?q=is%3Aopen+is%3Apr+label%3Akeyboard)中没有找到请求支持该键盘的issue，请到[QMK固件](https://github.com/qmk/qmk_firmware/issues)提交一个issue。也有一些基于QMK的键盘是由制造商自己的GitHub账号在维护着，请也确认一下。  <!-- FIXME(skullydazed): This feels too wordy and I'm not sure we want to encourage these kinds of issues. Also, should we prompt them to bug the manufacutrer? -->
+
+## 第二部：选择键盘配列
+
+选择最适合你要创建的键映射的配列，一些键盘的配列不完整或有问题，后续会逐渐支持。
+
+!> 有时会遇到没有特别适合的配列的情况，请选择 `LAYOUT_all`。
+
+## 第三步：命名你的键映射
+
+如何起名完全取决于你。
+
+?> 如果编译时遇到了问题，可能是因为QMK固件代码库中已经有了同名项，可以尝试改一下名字。
+
+## 第四步：设计你的键映射
+
+以下三种方法可以添加键码：
+
+1. 拖拽
+2. 点击布局上的空白项，再点击所需的键码
+3. 点击布局上的空白项, 再点击你物理键盘上的按键
+
+?> 鼠标在键上悬停时会有一个键码值的提示出现，详细描述信息请参见:
+
+* [基础键码资料](zh-cn/keycodes_basic.md)
+* [进阶键码资料](zh-cn/feature_advanced_keycodes.md)
+
+!> 如果你选择的配列与物理实机有出入，请将不需要的按键留空。如果不清楚应该用哪个键，例如，你只需要一个退格键，但 `LAYOUT_all` 中有两个退格键，须将两个键都放上一样的键码。
+
+## 第五步：保存键映射留待后续修订
+
+当你调整完毕键映射方案，或打算以后继续编辑，点击 `导出Keymap JSON文件（Download this QMK Keymap JSON File）` 按钮，当前键映射方案将保存到你的计算机中，之后可以点击 `导入Keymap JSON文件(Upload a QMK Keymap JSON File)` 按钮导入后继续编辑。
+
+!> **注意：** 导出的.json文件与 kbfirmware.com 和其它工具软件生成的并不兼容，如果你将导出的数据放到那些工具中，或尝试导入那些工具生成的.json文件，是不可行的。
+
+## 第六步：编译固件
+
+点击绿色的 `编译（Compile）` 按钮。
+
+编译完成后，可以点击绿色的 `固件（Download Firmware）` 下载固件文件。
+
+## 下一步：刷写到键盘中
+
+参见[刷写固件](zh-cn/newbs_flashing.md).
diff --git a/docs/zh-cn/configurator_troubleshooting.md b/docs/zh-cn/configurator_troubleshooting.md
new file mode 100644
index 0000000000..a48ad1dd72
--- /dev/null
+++ b/docs/zh-cn/configurator_troubleshooting.md
@@ -0,0 +1,31 @@
+# 配置器问题排查
+
+<!---
+  original document: 0.15.12:docs/configurator_troubleshooting.md
+  git diff 0.15.12 HEAD -- docs/configurator_troubleshooting.md | cat
+-->
+
+## 我的 .json 文件不可用
+
+如果该 .json 文件确实是QMK配置器中导出的，恭喜你遇到bug了，请在[QMK配置器](https://github.com/qmk/qmk_configurator/issues)库中提交一个issue。
+
+如果不是……那么页面顶部加大加粗的提示让你不要使用其它 .json 文件，你是怎么错过的？
+
+## 我的配列中有好多空格键，我应该怎么处理？
+
+如果你是说有三个空格键栏，最好的做法是都放上空格键。这个处理方案也适用于退格键和Shift键。
+
+## 用于...的键码是什么？
+
+参见：
+
+* [基础键码资料](zh-cn/keycodes_basic.md)
+* [进阶键码资料](zh-cn/feature_advanced_keycodes.md)
+
+## 无法编译
+
+请检查键映射中所有的层，确保没有随机（random）键。
+
+## Bug及其它问题
+
+我们很乐意倾听你的需求及bug报告，请到[QMK配置器](https://github.com/qmk/qmk_configurator/issues)代码库中提交吧。
diff --git a/docs/zh-cn/contributing.md b/docs/zh-cn/contributing.md
index 6424d330ce..03d3ea916a 100644
--- a/docs/zh-cn/contributing.md
+++ b/docs/zh-cn/contributing.md
@@ -1,123 +1,78 @@
 # 如何做贡献
 
+<!---
+  original document: 0.15.12:docs/contributing.md
+  git diff 0.15.12 HEAD -- docs/contributing.md | cat
+-->
+
 👍🎉 首先感谢各位百忙之中抽空阅读本文档，并为我们无私奉献。给您点赞啦！ 🎉👍
 
-第三方的帮助让Q酱成长了许多呢，Q酱也从你们那学到了不少新东西。Q酱希望每一个想帮助我的人都能很方便的做出有用的贡献。在这里我给摩拳擦掌的你们写了一点引导，让你们的代码在不对我做重大改动的情况下都能成功的被采纳哦。
+第三方的帮助让QMK获得了成长与进步。我们希望提供一套对贡献者和维护者都感到简便实用的PR（pull request）及贡献流程，因此我们整理出了一些准则，以免你的PR在被接纳前需要大改一番。
 
-* [项目概况](#项目概况)
-* [代码规范](#代码规范)
-* [一般教程](#一般教程)
-* [行为守则对于我来说有何意义?](#行为守则对于我来说有何意义?)
+* [项目概况](#project-overview)
+* [代码规范](#coding-conventions)
+* [一般教程](#general-guidelines)
+* [行为守则对于我来说有何意义？](#what-does-the-code-of-conduct-mean-for-me)
 
 ## 这文章巨长无比不想读啊! 我就想问个问题而已!
 
-您要是想问关于Q酱的问题的话可以在[OLKB Subreddit](https://reddit.com/r/olkb)或者是[Discord](https://discord.gg/Uq7gcHh)随意问。
+您要是有关于QMK的问题，请在[OLKB Subreddit](https://reddit.com/r/olkb)或者是[Discord](https://discord.gg/Uq7gcHh)上进行提问。
 
 请记住:
 
-* 维护Q酱的小可爱有的时候可能会有点忙，不能及时回答您的问题，耐心等等，他们都是很nice的人呀。
-* 维护Q酱的人都是很无私的善良的人。无论是贡献代码还是回答问题，都是义务的。有时见到他们努力回答各种问题，解决各种BUG，Q酱也是很心疼的。
+* 你的问题也许要过几个小时才会有人回复，请耐心一些。
+* 参与到QMK中的成员都是在无偿地贡献着自己的时间和精力，我们没有受雇于开发QMK或是专职回答你的疑问。
 * 您可以看看下面的教程，可以让您的问题浅显易懂，更容易回答：
   * https://opensource.com/life/16/10/how-ask-technical-questions
   * http://www.catb.org/esr/faqs/smart-questions.html
 
-# 项目概况
+# 项目概况 :id=project-overview
 
-Q酱很大一部分是用C语言组成的，不过有一小部分特性是C++的。怎么说呢，都是我的一部分，两个我都爱。Q酱一般是在键盘上的嵌入式处理器那里工作的，尤其与AVR([LUFA](https://www.fourwalledcubicle.com/LUFA.php))和ARM ([ChibiOS](https://www.chibios.org))两小哥哥搭配，干活不累，嘻嘻。如果您精通Arduino的话您会发现很多熟悉的概念，但也有点不爽，因为您以前的经验可能没法用来帮助Q酱。
+QMK很大一部分是C语言编写的，小部分特性是C++的。QMK的设计目标是在键盘上的嵌入式处理器中工作，如AVR([LUFA](https://www.fourwalledcubicle.com/LUFA.php))和ARM ([ChibiOS](https://www.chibios.org))。如果您对Arduino很熟悉的话，会发现优缺点也基本是相似的。但无论你之前是否有Arduino使用经验，都不会影响你参与到QMK贡献中来。
 
-<!-- 需要修正: 这里放些学习C语言的资源。另外感谢修正的小可爱。谢谢您了。-->
+<!-- FIXME: 这里应当放些C语言的学习资源。 -->
 
-# Q酱，我在哪能帮助你嘞?
+# 我到哪里寻求帮助？
 
 您要是有问题的话可以 [提出一个issue](https://github.com/qmk/qmk_firmware/issues) 或 [在Discord上交流一下](https://discord.gg/Uq7gcHh).
 
-# Q酱，我如何帮助你?
+# 我怎样才能做出贡献？
 
-您以前是否没为开源贡献过代码，而又想知道帮助Q酱是怎么一回事? 稍安勿躁，咱给您总结一下！
+您以前是否没有参与贡献过开源社区，而又想知道如何对QMK提供帮助？这里有一份快速指引！
+*译注：对于没有基本编程经验的人，请谨慎考虑这套操作流程，可参考，照着做很容易出问题，社区的语言障碍也会阻碍你对这些步骤的细节进行咨询*
 
 0. 先注册一个 [GitHub](https://github.com) 账户。
-1. 做好一个你要贡献的布局，那就要 [找一个你想解决的问题](https://github.com/qmk/qmk_firmware/issues)，或者 [找一个你想添加的特性](https://github.com/qmk/qmk_firmware/issues?q=is%3Aopen+is%3Aissue+label%3Afeature)。
-2. 把关联着问题的仓库分叉（fork）到你的仓库。这样你在`你的GitHub用户名/qmk_firmware`就有一个仓库备份啦。
-3. 使用 `git clone https://github.com/此处添GitHub用户名/此处添仓库名.git`这个命令把仓库同步到你的电脑中。
-4. 您要是想开发一个新特性的话可以先创建一个issue和Q酱的维护者讨论一下您要做什么。
-5. 使用`git checkout -b 此处写分支名字（别用汉字）`命令来创建一个分支（branch）用于开发。
+1. 完整整理出来你要贡献的键映射，或是 [找一个你想解决的问题](https://github.com/qmk/qmk_firmware/issues)，或者 [找一个你想添加的特性](https://github.com/qmk/qmk_firmware/issues?q=is%3Aopen+is%3Aissue+label%3Afeature)。
+2. 把关联着问题的仓库fork到你的仓库。这样在`你的GitHub用户名/qmk_firmware` 下就有一个副本啦。
+3. 使用 `git clone https://github.com/你的GitHub用户名/仓库名.git` 命令把仓库同步到你的电脑中。
+4. 您要是想开发一个新特性的话可以先创建一个issue和QMK的维护者讨论一下您要做什么。
+5. 使用 `git checkout -b 此处写分支名字（别用汉字）` 命令来创建一个新分支（branch）用于开发。
 6. 对要解决的问题或要添加的特性进行适当的更改。
 7. 使用 `git add 把改变的文件的目录写这里` 可以添加改变的文件内容到git用于管理工程状态的索引（快照）里。
 8. 使用 `git commit -m "这里写修改的相关信息"` 来描述你做出了什么修改。
 9. 使用 `git push origin 此处写分支名字`来把你的更改同步到GitHub库里（反正不是打篮球那个库里）。
 10. 提交一个[QMK 固件的pull request](https://github.com/qmk/qmk_firmware/pull/new/master)。
-11. 给你的pull request拟一个标题，包括简短的描述和问题或错误代码。比如, 你可以起一个这样的"Added more log outputting to resolve #4352"（最好用英语，毕竟Q酱的中文也不是那么的溜，有可能会看不懂中文）。
-12. 在描述（description）里面写你做了哪些更改，你的代码里还存在什么问题, 或者你想问维护的小可爱们的问题。你的your pull request有点小问题无伤大雅(本来也没有完美的代码嘛), 维护的小可爱们会竭尽全力帮您改进的！
+11. 给你的pull request拟一个标题，包括简短的描述和问题或错误代码。比如, 你可以起一个这样的"Added more log outputting to resolve #4352"（最好用英语，毕竟QMK的维护团队成员都是英语语系，有可能会看不懂中文）。
+12. 在描述（description）里面写你做了哪些更改，你的代码里还存在什么问题, 或者你想对QMK维护着询问的问题。你的pull request有点小问题无伤大雅（没有完美的pull request）, QMK维护团队会尽力帮您改进的！
 13. 维护人员审查代码可能需要一些时间。
 14. 维护人员会通知您要更改什么地方，然后您就按照建议改一改。
-15. 预祝您合并成功！
+15. 你的pull request合并成功了，恭喜！
 
-# 代码规范
+# 代码规范 :id=coding-conventions
 
-其实也没有什么特别严格的规范啦，但是俗话说的好：没有规矩，不成方圆。您可以看一下您的要改动的代码周围的画风，然后保持队形。如果你感觉周围都不知道是什么牛鬼蛇神的话就看看下面的建议：
+我们的编码风格很容易掌握，如果你有C语言或Python编码经验，跟随我们的编码风格不会有什么困难。
 
-* 我们用肆(4)个空格来缩进(软件中也可以设置到Tab键)
-* 我们使用改良的1TBS(允许单行样式)
-  * 左大括号: 在开放性语句块那行的末尾
-  * 右大括号: 和开放性语句块第一个字母对齐
-  * Else If: 将右大括号放在行的开头，下一个左大括号放在同一行的结尾
-  * 可选大括号: 可选大括号是必选的
-    * 应该这样: if (condition) { return false; }
-    * 不应该这样: if (condition) return false;
-* 建议使用C语言风格的注释: `/* */`
-  * 把注释想象成一个描述特征的故事
-  * 充分使用注释来描述你为何这样修改
-  * 有些公认的东西就不要写到注释里面了
-  * 如果你不知道注释是否多余,看下面
-* 一般不要主动换行，主动换行的话每行不要超过76列
-* 要把 `#pragma once` 放到头文件的开始哦，抛弃老土的(`#ifndef THIS_FILE_H`, `#define THIS_FILE_H`, ..., `#endif`)吧
-* 下面两种预处理命令都可以用: `#ifdef DEFINED` 还有 `#if defined(DEFINED)`
-  * 以上那句对处女座不是很友好哈，处女座的朋友们就别纠结了，直接 `#if defined(DEFINED)` 。
-  * 还有就是选好一种风格就一直用，一直用一直爽，不要朝三暮四, 除非你要变化到多重条件的 `#if`。
-  * `#` 和 `if`要挨在一起哦，再让本空格在中间冒充电灯泡本空格会生气的。
-  * 以下是缩进规则:
-    * 首先考虑可读性，强迫症的朋友们总想要保持代码的高一致性，这样可不好。
-    * 保证文件已有风格不变。如果代码本来就是杂糅风格，那就见机行事，让你的修改更有意义些。
-    * 其实你也可以在缩进的时候看看周围其他代码，然后范水模山，预处理命令可以有自己的缩进风格。
+* [编码规范 - C](zh-cn/coding_conventions_c.md)
+* [编码规范 - Python](zh-cn/coding_conventions_python.md)
 
-可以参照下面:
+# 基本准则 :id=general-guidelines
 
-```c
-/* foo 的 Enums*/
-enum foo_state {
-  FOO_BAR,
-  FOO_BAZ,
-};
-
-/* 有返回值的情况 */
-int foo(void) {
-  if (some_condition) {
-    return FOO_BAR;
-  } else {
-    return -1;
-  }
-}
-```
-
-# Clang-format的自动格式化
-[Clang-format](https://clang.llvm.org/docs/ClangFormat.html) 是LLVM的一部分，可以帮你自动格式化代码。我们给你准备好了一个适用于以上规范的配置文件，会帮你调整缩进和换行，你只需要写好括号就好。有了它，你再也不用担心调整代码格式太耗时，没有时间陪伴自己（虚构）的另一半了。
-
-使用[LLVM 完整安装](https://llvm.org/builds/)可以在Windows上安装clang-format, Ubuntu用户要用`sudo apt install clang-format`。
-
-命令行的朋友们, 加上 `-style=file`选项就会自动在QMK的根目录寻找.clang-format配置文件了。
-
-VSCode用户, 标准的 C/C++ 插件就支持clang-format, 或者可以用[独立扩展](https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.ClangFormat)也行。
-
-有些东西(比如LAYOUT宏) 会被clang-format打乱，所以那些文件就别用clang-format了,这里就教您一个小窍门，在`// clang-format off` 和 `//clang-format on`之间装上会被搞乱的代码就好了。
-
-# 一般教程
-
-你可以给Q酱的不同部分添砖加瓦，但也要用不同的方法严谨检查。不论你修改哪里最好还是看看下边。
+在QMK中存在多种类型的修改需求，因此也会有审查严格性上的差异。请在做出任何修改时留意，你的改动隶属于什么类型。
 
 * 将PR（pull request）分成一个个的逻辑单元。 比如，不要一次将两个新特性PR出去。要添加的特性排好队，一个一个来。
-* 提交之前看一眼，`git diff --check`的空格一定要写对了
+* 提交之前使用 `git diff --check` 做以下检查，不要提交多余的空格
 * 确定你的代码能通过编译
-  * 布局: 确定`make keyboard:your_new_keymap` 不返回错误
+  * 键映射: 确定`make keyboard:your_new_keymap` 不返回错误
   * 键盘: 确定 `make keyboard:all` 不返回错误
   * 核心代码: 确定 `make all` 不返回错误
 * 提交的信息尽量明确。第一行写点简短介绍(每行不多于70个英文字母), 第二行空着,第三行和后面就要写些必要的细节了。最好用英文写，比如:
@@ -130,13 +85,15 @@ The kerpleplork was intermittently failing with error code 23. The root cause wa
 Limited experimentation on the devices I have available shows that 7 is high enough to avoid confusing the kerpleplork, but I'd like to get some feedback from people with ARM devices to be sure.
 ```
 
+!> **特别留意：** 若你要对其它QMK使用者提交的代码进行功能修改或尝试修复bug，例如非默认的键映射、用户空间和配列部分，须在PR中标记出代码的原始提交者。很多QMK使用者都会对自己提交的代码在不知晓的情况下产生了改动感到困惑和沮丧，无论他的Git及Github经验丰富与否。
+
 ## 文档
 
-想帮助Q酱当然是先看文档最简单了。找到这个文档哪里错了然后改正它对于你来说超级简单! 我们也对有写文档能力的人求贤若渴，如果你是对的人[点这个](#Q酱，我在哪能帮助你嘞?)!
+对文档进行修正是最简单的参与贡献的一个办法，找到错误放置的文档或是修复不完备的部分很容易！我们也急需能修订文档的贡献者参与进来，所以如果你具备这样的能力但不清楚如何开始，请[看这里](#我怎样才能做出贡献？)！
 
-文档呢，都静静的放在`qmk_firmware/docs` 目录里, 也或者您想为网页做贡献的话也是可以的哦。
+文档位于 `qmk_firmware/docs` 目录下，如果你习惯于在web页面中完成工作目标，可以在 https://docs.qmk.fm/ 各文档页面下方点击“Edit this page”在线进行编辑。
 
-在文档中附代码案例时, 先观察文档其他地方的命名规范。比如, 把enums的名字都改成像`my_layers`或者`my_keycodes`来防止名字不一致的enums被当作特务枪毙:
+在文档中附代码案例时, 先观察文档其他地方的命名规范。比如, 将enum类型的定义命名为 `my_layers` 或 `my_keycodes` 的形式可以保持前后一致性：
 
 ```c
 enum my_layers {
@@ -150,56 +107,69 @@ enum my_keycodes {
 };
 ```
 
-## 布局
+### 预览文档 :id=previewing-the-documentation
 
-大多数QMK新手都从创建一个自己的布局开始。我们尽力保证布局规范宽松 (毕竟布局是个性的体现) 不过建议遵守以下准则，这样可以让别人更好理解你的代码
+在发起pull request前，请通过文档预览来检查你的本地更改。可以在 `qmk_firmware/` 目录下执行以下命令来配置文档开发环境：
 
-* 用 [模板](documentation_templates.md)写个`readme.md`。
-* 所有的布局PR都会被squash, 如果你想知道你的提交是怎么被squash的那你就自己来吧
-* 不要把新特性和布局一起PR。可以分别PR他们
-* 布局文件夹就不要放`Makefile`了，这个操作都过时啦
-* 更新文件头部的copyrights(看`%YOUR_NAME%`那)
+    qmk docs
+
+或者，如果你有安装Python 3，可以尝试：
+
+    python3 -m http.server 8936 --directory docs
+
+然后在本地浏览器打开 `http://localhost:8936/`.
+
+## 键映射
+
+大多数QMK新手都从创建一个自己的键映射
+开始。我们尽力保证键映射规范宽松 (毕竟键映射体现的是个人喜好) 不过我们仍要求须遵守以下准则，以便他人更好地发现并理解你的键映射代码。
+
+* 使用这份 [模板](zh-cn/documentation_templates.md) 写一份 `readme.md`。
+* 所有的键映射PR都会被压缩处理（squashed，参见[Github文档](https://docs.github.com/cn/github/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges)），如果你对commit被压缩很介意，请自行处理
+* 不要把新特性和键映射放在一个PR中。先提交新特性，再通过PR提交键映射
+* 键映射文件夹中不要提交 `Makefile` 文件（已不再使用）
+* 更新头文件中的copyrights信息(看 `%YOUR_NAME%` 部分)
 
 ## 键盘
 
-QMK的最终归宿是键盘。有些键盘是社区维护的，有一些是制作这些键盘的人维护的。`readme.md`会告诉你是谁维护了这个键盘，如果你对某个键盘有疑问，可以 [创建一个Issue](https://github.com/qmk/qmk_firmware/issues) 来问一问维护者。
+QMK的最终归宿是键盘。有些键盘是社区维护的，有一些是制作这些键盘的人维护的。`readme.md` 会告诉你是谁维护了这个键盘，如果你对某个键盘有疑问，可以 [创建一个Issue](https://github.com/qmk/qmk_firmware/issues) 来问一问维护者。
 
 我们建议你按下面的来操作:
 
-* 用[模板](documentation_templates.md)写`readme.md`。
-* 提交数量尽量合理，不然我们可就要把你的PR给squash了。
-* 不要把新特性和新键盘一起PR。可以分别PR他们
-* 用父文件夹的名字命名 `.c`/`.h`文件, 比如`/keyboards/<kb1>/<kb2>/<kb2>.[ch]`
+* 基于[模板](zh-cn/documentation_templates.md)编写 `readme.md`。
+* commit数量尽量合理，否则你的PR可能会被我们压缩。
+* 不要把新特性和新键盘定义放在一个PR中。先提交新特性，再通过PR提交新键盘定义
+* 用最近一级的父文件夹的名字命名 `.c`/`.h` 文件, 比如 `/keyboards/<kb1>/<kb2>/<kb2>.[ch]`
 * 键盘文件夹就不要放`Makefile`了，这个操作都过时啦
 * 更新文件头部的copyrights(看`%YOUR_NAME%`那)
 
 ## Quantum/TMK 核心
 
-在您废寝忘食地开发Q酱新特性或者帮Q酱驱虫之前，一定要确保你的工作是有意义的。看看[了解QMK](understanding_qmk.md)你会对Q酱有更深的了解，这个文档将带你领略QMK的程序流程。现在你应该和维护团对谈谈来了解实现你想法的最佳方法了。一下渠道都可以：
+在你投入大量精力到新功能开发中之前，请先确保使用了最佳的实现方案。通过阅读[了解QMK](zh-cn/understanding_qmk.md)可以获得对QMK的基本认知，这个文档将带你领略QMK的程序流程，然后你可以和维护团队探讨一下实现你想法的最佳方法的思路，以下渠道都可以：
 
-* [在Discord交流](https://discord.gg/Uq7gcHh)
+* [在Discord中交流](https://discord.gg/Uq7gcHh)
 * [建立一个Issue](https://github.com/qmk/qmk_firmware/issues/new)
 
-新特性和BUG的修复影响所有键盘。开发组也在翻修QMK。所以，在实施重大返修之前一定要讨论一下。如果你在没有事先与维护团队沟通的情况下提交了一个PR，而且你的选择与维护团队的计划方向不符，那你可能要面临大改了。
+新特性和BUG的修复影响所有键盘，开发组也在翻修QMK。所以，在实施重大改动之前一定要讨论一下。如果你在没有事先与维护团队沟通的情况下提交了一个PR，而且你的选择与维护团队的计划方向不符，那你可能要面临大改了。
 
 修复BUG或者开发新特性之前看看这个：
 
-* **默认不启用** - QMK运行的芯片多数内存有限，所以首要考虑的还应该是布局不要被破坏，于是特性默认是不启用的。你喜欢什么特性的话就打开它，如果你觉得有些特性应该默认开启或者你能帮助缩减代码，那就联系维护组吧。
-* **提交之前在本地编译** - 这个简直就是家喻户晓了，但是也确实需要编译啊！ 我们的Travis系统会发现一切问题，但是自己编译一下可要比在线等快多了。
-* **注意版本和芯片平台** - 有那么几个键盘有支持不同配置甚至是不同芯片的版本。试着写一个能AVR和ARM两个平台运行的特性，或者在不支持的平台自动禁用。
+* **默认不启用** - QMK运行的芯片多数内存有限，首要考虑的应是已有的键映射不要被破坏，因此你的功能应当是“可以**启用**”的，而不是“可以禁用”的。如果你觉得该特性应该默认开启或者你能帮助缩减代码，请先和我们沟通一下。
+* **提交之前在本地编译** - 这个简直就是家喻户晓了，但是也确实需要编译啊！ 在你发起PR前，请确保任何改动都通过了编译验证。
+* **注意版本和芯片平台兼容性** - 有那么几个键盘有支持不同配置甚至是不同芯片的版本。请确保你开发的特性同时支持AVR和ARM两个平台，或者在不支持的平台自动禁用。
 * **解释你的新特性** - 在`docs/`写个文档, 你可以创建新文档或者写到现有文档中。如果你不把它记录下来，其他人就无法从你的努力中获益。
 
 也可以看看以下建议：
 
-* 提交数量尽量合理，不然我们可就要把你的PR给squash了。
-* 不要把新特性、布局和键盘一起PR。可以分别PR他们。
-* 给你的特性写[单元测试](unit_testing.md)。
-* 你编辑的文件风格要一致，如果风格不明确或者是混搭风的，你就要先看看[代码规范](#代码规范)确认情况。
+* commit数量尽量合理，否则你的PR可能会被我们压缩。
+* 不要把新键盘定义或新键映射与关键改动放在一个PR中。先提交关键改动。
+* 给你的特性编写[单元测试](zh-cn/unit_testing.md)。
+* 你编辑的文件风格要一致，如果风格不明确或者是混搭风的，请先阅读上方的[代码规范](#coding-conventions)。
 
 ## 重构
 
-为了保持QMK脉络清晰，Q酱打算深入规划重构一下自己，然后让合作者进行修改。如果你有重构的思路或建议[创建一个issue](https://github.com/qmk/qmk_firmware/issues), Q酱很乐意讨论一下怎么改进一下。
+为了保持QMK脉络清晰，QMK的深度重构工作已在规划中，并会通过合作者进行相应的修改。如果你有重构的思路或建议请[创建一个issue](https://github.com/qmk/qmk_firmware/issues), 我们很乐意讨论一下QMK可以如何改进。
 
-# 行为守则对于我来说有何意义?
+# 行为守则对于我来说有何意义？ :id=what-does-the-code-of-conduct-mean-for-me
 
-我们的[行为守则](https://github.com/qmk/qmk_firmware/blob/master/CODE_OF_CONDUCT.md) 是说明您有责任尊重和礼貌地对待项目中的每个人，无论他们的身份如何。 如果你是我们行为准则所描述的不当行为的受害者，我们将站在你这边，并按照行为准则对施暴者进行适当谴责。
+我们的[行为守则](https://qmk.fm/coc/) 指出您有责任尊重并礼貌地对待项目中的每个人，无论他们的身份如何。如果你是我们行为守则所描述的不当行为的受害者，我们将站在你这边，尽最大努力对施暴者进行谴责。
diff --git a/docs/zh-cn/custom_quantum_functions.md b/docs/zh-cn/custom_quantum_functions.md
index 1ae996e392..29c5089052 100644
--- a/docs/zh-cn/custom_quantum_functions.md
+++ b/docs/zh-cn/custom_quantum_functions.md
@@ -1,31 +1,35 @@
-# 如何定制你键盘的功能
+# 如何定制化键盘功能
 
-对于很多人来说客制化键盘可不只是向你的电脑发送你按了那个件这么简单。你肯定想实现比简单按键和宏更复杂的功能。QMK有能让你注入代码的钩子, 覆盖功能, 另外，还可以自定义键盘在不同情况下的行为。
+<!---
+  original document: 0.15.12:docs/custom_quantum_functions.md
+  git diff 0.15.12 HEAD -- docs/custom_quantum_functions.md | cat
+-->
 
-本页不假定任何特殊的QMK知识，但阅读[理解QMK](understanding_qmk.md)将会在更基础的层面帮你理解发生了什么。
+对于很多人来说对客制化键盘的诉求不只是向电脑输入按下的键。你肯定想实现比简单按键和宏更复杂的功能。QMK支持基于注入点的代码注入，功能重写，另外还可以自定义键盘在不同情况下的行为。
 
-## A Word on Core vs 键盘 vs 布局
+本页不要求任何额外的QMK知识基础，但阅读[理解QMK](zh-cn/understanding_qmk.md)将会在更基础的层面帮你理解发生了什么。
 
-我们把qmk组织成一个层次结构：
+## 核心/键盘/键映射的概念 :id=a-word-on-core-vs-keyboards-vs-keymap
+
+QMK基于如下层级组成：
 
 * Core (`_quantum`)
   * Keyboard/Revision (`_kb`)
     * Keymap (`_user`)
 
-下面描述的每一个函数都可以在定义上加一个`_kb()`或 `_user()` 后缀。 建议在键盘/修订层使用`_kb()`后缀，在布局层使用`_user()`后缀。
+该文后续部分所提及的函数在定义时皆可添加 `_kb()` 或 `_user()` 后缀，我们建议在键盘及其子版本中使用 `_kb()` 后缀，而在键映射中使用 `_user()` 后缀。
 
-在键盘/修订层定义函数时，`_kb()`在执行任何代码前先调用`_user()`是必要的，不然布局层函数就不要被调用。
-<!-- 翻译问题：上面那句翻译的不太好-->
+在键盘及其子版本中定义函数时，一个重要的点是在 `_kb()` 函数执行任何逻辑前，应先调用 `_user()` 函数，否则这些键映射中的函数将没有机会被执行。
 # 自定义键码
 
 到目前为止，最常见的任务是更改现有键码的行为或创建新的键码。从代码角度来看这些操作都很相似。
 
 ## 定义一个新键码
 
-创建键码第一步，先枚举出它全部，也就是给键码起个名字并分配唯一数值。QMK没有直接限制最大键码值大小，而是提供了一个`SAFE_RANGE`宏。你可以在枚举时用`SAFE_RANGE`来保证你取得了唯一的键码值。
+创建键码的第一步，是先定义其枚举值，也就是给键码起个名字并分配一个唯一值。QMK没有直接限制最大可用的键码值，而是提供了一个 `SAFE_RANGE` 宏。你可以在定义枚举时用 `SAFE_RANGE` 来保证你取得了唯一的键码值。
 
 
-这有枚举两个键码的例子。把这块加到`keymap.c`的话你就在布局中能用`FOO`和`BAR`了。
+这有定义两个键码的枚举值的例子。添加以下代码块至 `keymap.c` 后你就可以在布局中使用 `FOO` 和 `BAR` 了。
 
 ```c
 enum my_keycodes {
@@ -34,15 +38,15 @@ enum my_keycodes {
 };
 ```
 
-## 为键码的行为编程
+## 编程设计你的键码的行为 :id=programming-the-behavior-of-any-keycode
 
-当你覆盖一个已存在按键的行为时，或将这个行为赋给新键时，你要用`process_record_kb()`和`process_record_user()`函数。这俩函数在键处理中真实键事件被处理前被QMK调用。如果这俩函数返回`true`，QMK将会用正常的方式处理键码。这样可以很方便的扩展键码的功能而不是替换它。如果函数返回`false` QMK会跳过正常键处理，然后发送键子抬起还是按下事件就由你决定了。
+当你覆盖一个已存在按键的行为时，或是给新按键设计功能时，请使用 `process_record_kb()` 和 `process_record_user()` 函数。QMK会在响应并处理按键事件前调用这些函数，如果这些函数返回值为 `true`，QMK将继续用常规的方式处理键码，这样可以很方便的扩展键码的功能而不需要替换代码实现。如果函数返回`false` QMK会跳过常规的键处理逻辑，需要发送的按键按下或抬起事件则需交由你负责完成。
 
-当某个键按下或释放时这俩函数会被调用。
+任意按键在按下或抬起时，每次都会调用这些函数。
 
-### process_record_user()`函数示例实现
+### process_record_user()` 实现示例
 
-这个例子做了两个事。自定义了一个叫做`FOO`的键码的行为，并补充了在按下回车时播放音符。
+这个例子做了两个事。自定义了一个叫做 `FOO` 的键码的行为，并提供了在按下回车时播放音符的功能。
 
 ```c
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -51,7 +55,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if (record->event.pressed) {
         // 按下时做些什么
       } else {
-        // 释放时做些什么
+        // 抬起时做些什么
       }
       return false; // 跳过此键的所有进一步处理
     case KC_ENTER:
@@ -59,21 +63,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if (record->event.pressed) {
         PLAY_SONG(tone_qwerty);
       }
-      return true; // 让QMK触发回车按下/释放事件
+      return true; // 让QMK响应回车按下/抬起事件
     default:
-      return true; // 正常处理其他键码
+      return true; // 正常响应其他键码
   }
 }
 ```
 
-### `process_record_*` 函数文档
+### `process_record_*` 实现示例
 
-* 键盘/修订: `bool process_record_kb(uint16_t keycode, keyrecord_t *record)`
-* 布局: `bool process_record_user(uint16_t keycode, keyrecord_t *record)`
+* 键盘/各子版本：`bool process_record_kb(uint16_t keycode, keyrecord_t *record)`
+* 键映射：`bool process_record_user(uint16_t keycode, keyrecord_t *record)`
 
-`keycode(键码)`参数是在布局上定义的，比如`MO(1)`, `KC_L`, 等等。 你要用 `switch...case` 块来处理这些事件。
+`keycode` 参数为键映射中形如 `MO(1)`，`KC_L` 等定义的键值项。 应使用 `switch...case` 代码块来处理这些事件。
 
-`record`参数含有实际按键的信息：
+`record` 参数含有按键的真实状态信息：
 
 ```c
 keyrecord_t record {
@@ -88,108 +92,31 @@ keyrecord_t record {
 }
 ```
 
-# LED控制
-
-qmk提供了读取HID规范包含的5个LED的方法。:
-
-* `USB_LED_NUM_LOCK`
-* `USB_LED_CAPS_LOCK`
-* `USB_LED_SCROLL_LOCK`
-* `USB_LED_COMPOSE`
-* `USB_LED_KANA`
-
-这五个常量对应于主机LED状态的位置位。
-有两种方法可以获得主机LED状态：
-
-* 通过执行 `led_set_user()`
-* 通过调用 `host_keyboard_leds()`
-
-## `led_set_user()`
-
-当5个LED中任何一个的状态需要改变时，此函数将被调用。此函数通过参数输入LED参数。
-使用`IS_LED_ON(usb_led, led_name)`和`IS_LED_OFF(usb_led, led_name)`这两个宏来检查LED状态。
-
-!> `host_keyboard_leds()`可能会在`led_set_user()`被调用前返回新值。
-
-### `led_set_user()`函数示例实现
-
-```c
-void led_set_user(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-        writePinLow(B0);
-    } else {
-        writePinHigh(B0);
-    }
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-        writePinLow(B1);
-    } else {
-        writePinHigh(B1);
-    }
-    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-        writePinLow(B2);
-    } else {
-        writePinHigh(B2);
-    }
-    if (IS_LED_ON(usb_led, USB_LED_COMPOSE)) {
-        writePinLow(B3);
-    } else {
-        writePinHigh(B3);
-    }
-    if (IS_LED_ON(usb_led, USB_LED_KANA)) {
-        writePinLow(B4);
-    } else {
-        writePinHigh(B4);
-    }
-}
-```
-
-### `led_set_*`函数文档
-
-* 键盘/修订: `void led_set_kb(uint8_t usb_led)`
-* 布局: `void led_set_user(uint8_t usb_led)`
-
-## `host_keyboard_leds()`
-
-调用这个函数会返回最后收到的LED状态。这个函数在`led_set_*`之外读取LED状态时很有用，比如在[`matrix_scan_user()`](#矩阵扫描代码).
-为了便捷，你可以用`IS_HOST_LED_ON(led_name)`和`IS_HOST_LED_OFF(led_name)` 宏，而不直接调用和检查`host_keyboard_leds()`。
-
-## 设置物理LED状态
-
-一些键盘实现了为设置物理LED的状态提供了方便的方法。
-
-### Ergodox Boards
-
-Ergodox实现了提供`ergodox_right_led_1`/`2`/`3_on`/`off()`来让每个LED开或关, 也可以用 `ergodox_right_led_on`/`off(uint8_t led)` 按索引打开或关闭他们。
-
-此外，还可以使用`ergodox_led_all_set(uint8_t n)`指定所有LED的亮度级别；针对每个LED用`ergodox_right_led_1`/`2`/`3_set(uint8_t n)`；使用索引的话用`ergodox_right_led_set(uint8_t led, uint8_t n)`。
-
-Ergodox boards 同时定义了最低亮度级别`LED_BRIGHTNESS_LO`和最高亮度级别`LED_BRIGHTNESS_HI`(默认最高).
-
 # 键盘初始化代码
 
-键盘初始化过程有几个步骤。你是用那个函数取决于你想要做什么。
+键盘初始化过程须经过几个步骤，而你的目的决定了你需要关注哪些函数。
 
 有三个主要初始化函数，按调用顺序列出。
 
-* `keyboard_pre_init_*` - 会在大多数其他东西运行前运行。适用于哪些需要提前运行的硬件初始化。
-* `matrix_init_*` - 在固件启动过程中间被调用。此时硬件已初始化，功能尚未初始化。
-* `keyboard_post_init_*` - 在固件启动过程最后被调用。大多数情况下，你的“客制化”代码都可以放在这里。
+* `keyboard_pre_init_*` - 会在大多数其他功能运行前执行。适用于那些需要尽早执行的硬件初始化工作。
+* `matrix_init_*` - 在固件启动过程中被调用。此时硬件已初始化，但部分功能还不可用。
+* `keyboard_post_init_*` - 在固件启动过程的最后被调用。大多数情况下，你的“客制化”代码都可以放在这里。
 
-!> 对于大多数人来说`keyboard_post_init_user`是你想要调用的函数。例如, 此时你可以设置RGB灯发光。
+!> 对于大多数人来说 `keyboard_post_init_user` 是你想要关注的函数。例如, 你可以在这里启动RGB背光灯。
 
 ## 键盘预初始化代码
 
-这代码极早运行，甚至都在USB初始化前运行。
+这部分代码执行的非常早，甚至是在USB通信功能启动之前。
 
-在这之后不久矩阵就被初始化了。
+在这之后不久即会完成矩阵的初始化。
 
-对于大多数用户来说,这用不到，因为它主要是用于面向硬件的初始化。
+对于大多数用户来说不应在此处进行修改，因为它主要用于硬件初始化。
 
-但如果你有硬件初始化的话放在这里再好不过了(比如初始化LED引脚一类的).
+但如果你有硬件须初始化的话放在这里再好不过了（比如初始化LED引脚）.
 
-### `keyboard_pre_init_user()`函数示例实现
+### `keyboard_pre_init_user()` 实现示例
 
-本例中在键盘级别，设定 B0, B1, B2, B3, 和 B4 是LED引脚。
+本例中，在键盘层将 B0, B1, B2, B3, 和 B4 引脚设置为LED引脚。
 
 ```c
 void keyboard_pre_init_user(void) {
@@ -206,95 +133,110 @@ void keyboard_pre_init_user(void) {
 
 ### `keyboard_pre_init_*` 函数文档
 
-* 键盘/修订: `void keyboard_pre_init_kb(void)`
-* 布局: `void keyboard_pre_init_user(void)`
+* 键盘/各子版本：`void keyboard_pre_init_kb(void)`
+* 键映射：`void keyboard_pre_init_user(void)`
 
 ## 矩阵初始化代码
 
-这将会在矩阵初始化时被调用，在某些硬件设置好后，但在一些功能被初始化前。 
+在矩阵初始化后被调用。此时一部分硬件已设置完成，但一些功能尚未完成初始化。 
 
-这在你设置其他地方会用到的东西的时候会很有用，但与硬件无关，也不依赖于它的启动位置。
+此处可以用来设置一些与硬件无关，且对初始化位置没有特殊要求的功能。
 
 
-### `matrix_init_*`函数文档
+### `matrix_init_*` 函数文档
 
-* 键盘/修订: `void matrix_init_kb(void)`
-* 布局: `void matrix_init_user(void)`
+* 键盘/各子版本：`void matrix_init_kb(void)`
+* 键映射：`void matrix_init_user(void)`
 
+### 低级矩阵函数的重写 :id=low-level-matrix-overrides
+
+* GPIO引脚初始化：`void matrix_init_pins(void)`
+  * 此处须完成低级行列引脚的初始化。默认实现中，这里会参考可选的键盘设置项 `ROW2COL`，`COL2ROW` 及 `DIRECT_PINS` 来初始化所有 `MATRIX_ROW_PINS` 及 `MATRIX_COL_PINS` 中定义的GPIO引脚的输入/输出状态。当键盘设计者重写该函数后，QMK本身不会进行任何引脚的初始化，只会听从重写的函数的实现逻辑。
+* `COL2ROW`-从行中读: `void matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)`
+* `ROW2COL`-从列中读: `void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)`
+* `DIRECT_PINS`-直读: `void matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)`
+  * 以上三个函数须参考矩阵类别，从底层矩阵的相关引脚状态中获取输入信息，并且应该只需要实现三者之一。默认情况下，在遍历 `MATRIX_ROW_PINS` and `MATRIX_COL_PINS` 时，会根据是否设置了 `ROW2COL`，`COL2ROW` 或 `DIRECT_PINS` 来配置输入输出方式。当键盘设计者重写该函数后，QMK本身不会进行任何矩阵GPIO引脚状态的变更，只会听从重写的函数的实现逻辑。
 
 ## 键盘后初始化代码
 
-这是键盘初始化过程中的最后一个任务。如果您想更改某些特性，这会很有用，因为此时应该对它们进行初始化。
+这是键盘初始化过程中的最后一个任务。此时您可以配置并调整某些特性，因为此时这些特性已初始化完毕。
 
+### `keyboard_post_init_user()` 实现示例
 
-### `keyboard_post_init_user()`示例实现
-
-本示例在所有初始化完成后运行，配置RGB灯。
+本示例在所有初始化完成后运行，配置RGB背光。
 
 ```c
 void keyboard_post_init_user(void) {
   // 调用后初始化代码
   rgblight_enable_noeeprom(); // 使能Rgb，不保存设置
-  rgblight_sethsv_noeeprom(180, 255, 255); // 将颜色设置到蓝绿色(青色)不保存
-  rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3); // 设置快速呼吸模式不保存
+  rgblight_sethsv_noeeprom(180, 255, 255); // 将颜色设置到蓝绿色(青色)，不保存设置
+  rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 3); // 设置快速呼吸模式，不保存设置
 }
 ```
 
 ### `keyboard_post_init_*` 函数文档
 
-* 键盘/修订: `void keyboard_post_init_kb(void)`
+* 键盘/各子版本：`void keyboard_post_init_kb(void)`
 * 布局: `void keyboard_post_init_user(void)`
 
-# 矩阵扫描代码
+# 矩阵扫描码
 
-可能的话你要用`process_record_*()`自定义键盘，以这种方式连接到事件中，以确保代码不会对键盘产生负面的性能影响。然而，在极少数情况下，有必要进行矩阵扫描。在这些函数中要特别注意代码的性能，因为它每秒至少被调用10次。
+应尽量使用 `process_record_*()` 实现所需的键盘自定义以及事件监听，以确保这些代码不会对键盘性能产生负面的影响。然而，在极少数情况下需要在矩阵扫描中添加监听，此时需要极端留意这些函数代码的性能表现，因为这些函数每秒可能被执行十数次。
 
-### `matrix_scan_*`示例实现
+### `matrix_scan_*` 实现示例
 
-这个例子被故意省略了。在hook这样一个对性能及其敏感的区域之前，您应该足够了解qmk的内部结构，以便在没有示例的情况下编写。如果你需要帮助，请[建立一个issue](https://github.com/qmk/qmk_firmware/issues/new)或[在Discord上与我们交流](https://discord.gg/Uq7gcHh).
+这个例子被故意省略了。在监听处理这样一个对性能及其敏感的部分之前，您应该足够了解qmk的内部结构，才可以在没有示例的情况下编写。如果你需要帮助，请[新建一个issue](https://github.com/qmk/qmk_firmware/issues/new)或[在Discord上与我们交流](https://discord.gg/Uq7gcHh).
 
 ### `matrix_scan_*` 函数文档
 
-* 键盘/修订: `void matrix_scan_kb(void)`
+* 键盘/各子版本：`void matrix_scan_kb(void)`
 * 布局: `void matrix_scan_user(void)`
 
 该函数在每次矩阵扫描时被调用，这基本与MCU处理能力上限相同。在这里写代码要谨慎，因为它会运行很多次。
 
-你会在自定义矩阵扫描代码时用到这个函数。这也可以用作自定义状态输出(比如LED灯或者屏幕)或者其他即便用户不输入你也想定期运行的功能。
+在需要自定义矩阵扫描代码时可以使用该函数。这也可以用作自定义状态输出(比如LED灯或者屏幕)或者其他即便用户没有输入时你也想定期运行的功能。
 
+# Keyboard housekeeping
+
+* 键盘/各子版本：`void housekeeping_task_kb(void)`
+* 键映射：`void housekeeping_task_user(void)`
+
+该函数在所有QMK处理工作完毕后，下一轮开始执行前被执行。可以放心地假设此时QMK已对最新的矩阵扫描结果完成了所有的处理工作 -- 更新层状态，发送USB事件，更新LED状态，刷新显示屏。
+
+与 `matrix_scan_*` 类似，这些函数会频繁调用直至MCU处理能力上限。为了确保键盘的响应能力，建议在这些函数中尽量做最少的事情，在你确实需要在这里实现特别的功能时，可能会影响到其它功能的表现。
 
 # 键盘 空闲/唤醒 代码
 
-如果键盘支持就可以通过停止一大票功能来达到"空闲"。RGB灯和背光就是很好的例子。这可以节约能耗，也可能让你键盘风味更佳。
+在主控板支持情况下，暂停大部分功能可以实现“空闲”状态，例如RGB灯光和背光。既可以节省电量消耗，也可能增强键盘的表现。
 
-用两个函数控制: `suspend_power_down_*`和`suspend_wakeup_init_*`, 分别在系统板空闲和唤醒时调用。
+这由两个函数控制: `suspend_power_down_*` 和 `suspend_wakeup_init_*`，分别在主控板空闲和唤醒时被调用。
 
 
-### suspend_power_down_user()和suspend_wakeup_init_user()示例实现
+### suspend_power_down_user() 和 suspend_wakeup_init_user() 的实现示例
 
 
 ```c
 void suspend_power_down_user(void) {
-    // code will run multiple times while keyboard is suspended
+    // 当键盘挂起时会被多次调用的代码
 }
 
 void suspend_wakeup_init_user(void) {
-    // code will run on keyboard wakeup
+    // 键盘唤醒时被调用的代码
 }
 ```
 
 ### 键盘 挂起/唤醒 函数文档
 
-* 键盘/修订: `void suspend_power_down_kb(void)` 和`void suspend_wakeup_init_user(void)`
-* 布局: `void suspend_power_down_kb(void)` 和 `void suspend_wakeup_init_user(void)`
+* 键盘/各子版本：`void suspend_power_down_kb(void)` 和 `void suspend_wakeup_init_user(void)`
+* 键映射：`void suspend_power_down_kb(void)` 和 `void suspend_wakeup_init_user(void)`
 
-# 层改变代码
+# 层切换代码 :id=layer-change-code
 
-每当层改变这个就运行代码。这对于层指示或自定义层处理很有用。
+每当层发生切换时被执行，可用于感知层切换事件，或自定义层处理逻辑。
 
-### `layer_state_set_*` 示例实现
+### `layer_state_set_*` 实现示例
 
-本例使用了Planck键盘示范了如何设置 [RGB背光灯](feature_rgblight.md)使之与层对应
+本例中，通过Planck键盘示范了如何将[RGB背光灯](zh-cn/feature_rgblight.md)设置为与层同步。
 
 ```c
 layer_state_t layer_state_set_user(layer_state_t state) {
@@ -311,36 +253,41 @@ layer_state_t layer_state_set_user(layer_state_t state) {
     case _ADJUST:
         rgblight_setrgb (0x7A,  0x00, 0xFF);
         break;
-    default: //  for any other layers, or the default layer
+    default: // 默认层及其它层
         rgblight_setrgb (0x00,  0xFF, 0xFF);
         break;
     }
   return state;
 }
 ```
+
+可以通过 `IS_LAYER_ON_STATE(state, layer)` 和 `IS_LAYER_OFF_STATE(state, layer)` 宏来确认常规层的状态。
+
+如果不在 `layer_state_set_*` 函数中，可以通过 `IS_LAYER_ON(layer)` 和 `IS_LAYER_OFF(layer)` 宏来确认全局的层状态。
+
 ### `layer_state_set_*` 函数文档
 
-* 键盘/修订: `uint32_t layer_state_set_kb(uint32_t state)`
+* 键盘/各子版本：`uint32_t layer_state_set_kb(uint32_t state)`
 * 布局: `layer_state_t layer_state_set_user(layer_state_t state)`
 
 
-该`状态`是活动层的bitmask, 详见[布局概述](keymap.md#布局的层状态)
+此处的 `state` 为当前活跃层的位掩码, 详见[键映射概述](zh-cn/keymap.md#keymap-layer-status)
 
 
-# 掉电保存配置 (EEPROM)
+# 配置的持久存储（EEPROM）
 
-这会让你的配置长期的保存在键盘中。这些配置保存在你主控的EEPROM里，掉电不会消失。 设置可以用`eeconfig_read_kb`和`eeconfig_read_user`读取，可以用`eeconfig_update_kb`和`eeconfig_update_user`写入。这对于您希望能够切换的功能很有用(比如切换RGB层指示。此外，你可以用`eeconfig_init_kb`和`eeconfig_init_user`来设置EEPROM默认值。 
+该功能可以让键盘的配置持久存储下来。这些配置存储在控制器的EEPROM中，即便掉电后依旧可以留存下来。可以通过 `eeconfig_read_kb` 和 `eeconfig_read_user` 来读取，通过 `eeconfig_update_kb` and `eeconfig_update_user` 来进行保存。该功能常用于保存一些开关状态（比如rgb层指示灯）。此外，可以通过 `eeconfig_init_kb` 和 `eeconfig_init_user` 来设置EEPROM的默认配置值。
 
-最复杂的部分可能是，有很多方法可以通过EEPROM存储和访问数据，并且并没有用哪种方法是“政治正确”的。你每个功能只有一个双字(四字节)空间。
+复杂的地方是，有很多方法可以存储和访问EEPROM数据，并且没有哪种方法是“正确”的。但是，每个功能只有一个双字(四字节)空间可用。
 
-记住EEPROM是有写入寿命的。尽管写入寿命很高，但是并不是只有设置写道EEPROM中。如果你写入频繁，你的MCU寿命将会变短。
+记住EEPROM是有写入寿命的。尽管写入寿命很高，但是并不是只有这些配置信息会写到EEPROM中。如果你写入过于频繁，你的MCU寿命将会急速减少。
 
-* 如果您不理解这个例子，那么您可能希望避免使用这个特性，因为它相当复杂。
+* 如果您不理解这个例子，那么您可以不使用这个特性，因为它相当复杂。
 
-### 示例实现
-
-本例讲解了如何添加设置，并且读写。本里使用了用户布局。这是一个复杂的函数，有很多事情要做。实际上，它使用了很多上述函数来工作！
+### 实现示例
 
+本例讲解了如何添加并读写设置项。本例使用用户键映射来实现。这是一个复杂的函数，有很多事情要做。实际上，它使用了很多前述的函数来工作！
+（译注：该示例由于英文行文，可能会觉得看得稀里糊涂。实现的功能很简单，即开启了层指示功能（RGB_LYR）时，rgb背光灯会展示当前层的特定颜色用以指示层状态，而触发任何改变rgb背光颜色的键码时，rgb背光灯将回归普通的背光灯角色，不再作为层指示器）
 
 在你的keymap.c文件中，将以下代码添加至顶部:
 ```c
@@ -354,14 +301,14 @@ typedef union {
 user_config_t user_config;
 ```
 
-以上代码建立了一个结构体，该结构体可以存储设置并可用于写入EEPROM。如此这般将无需定义变量，因为在结构体中已然定义。要记住`bool` (布尔)值使用1位, `uint8_t`使用8位, `uint16_t`使用16位。你可以混合搭配使用，但是顺序记错可能会招致麻烦，因为那会改变写入写出的值。 
+以上代码建立了一个32位的结构体，用于在内存及EEPROM中存储配置项。此时不再需要再单独声明变量，因为都已经在该结构体中定义了。须记住 `bool`（布尔）值占用1位，`uint8_t` 占用8位，`uint16_t` 占用16位。你可以混合搭配使用，但改变这些顺序会因为错误的读写而招致问题。
 
- `layer_state_set_*`函数中使用了`rgb_layer_change`，使用了`keyboard_post_init_user`和`process_record_user`来配置一切。
+我们在 `layer_state_set_*` 函数中会使用 `rgb_layer_change`。通过 `keyboard_post_init_user` 和 `process_record_user` 来配置所需的一切。
 
-首先要使用`keyboard_post_init_user，你要加入`eeconfig_read_user()`来填充你刚刚创建的结构体。然后您可以立即使用这个结构来控制您的布局中的功能。就像这样： 
+在编写 `keyboard_post_init_user` 时，你需要使用 `eeconfig_read_user()` 来计算并填充你刚刚创建的结构体。然后即可以使用结构体数据来控制键映射中的功能。就像这样： 
 ```c
 void keyboard_post_init_user(void) {
-  // 调用布局级别的矩阵初始化
+  // 调用键映射级别的矩阵初始化
 
   // 从EEPROM读用户配置
   user_config.raw = eeconfig_read_user();
@@ -374,7 +321,7 @@ void keyboard_post_init_user(void) {
   }
 }
 ```
-以上函数会在读EEPROM配置后立即使用该设置来设置默认层RGB颜色。"raw"的值是从你上面基于"union"创建的结构体中转换来的。 
+以上函数会在读EEPROM配置后立即设置默认层的RGB颜色。"raw"值将被转换为上述创建的实际使用的"union"结构体。 
 
 ```c
 layer_state_t layer_state_set_user(layer_state_t state) {
@@ -398,7 +345,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
   return state;
 }
 ```
-这样仅在值使能时会改变RGB背光灯。现在配置这个值, 为`process_record_user`创建一个新键码叫做`RGB_LYR`。我们要确保，如果使用正常的RGB代码，使用上面的示例将其关闭，请将其设置为：
+这样仅在相关值使能时才会改变RGB背光灯。若要配置该值, 为 `process_record_user` 创建一个新键码 `RGB_LYR`。此时我们想实现的是，如果触发了常规的RGB码，以上示例中的逻辑都将不生效，形如：
 ```c
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -407,7 +354,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       if (record->event.pressed) {
         // 按下时做点什么
       } else {
-        // 释放时做点什么
+        // 抬起时做点什么
       }
       return false; // 跳过此键的进一步处理
     case KC_ENTER:
@@ -415,76 +362,116 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         if (record->event.pressed) {
             PLAY_SONG(tone_qwerty);
         }
-        return true; // 让QMK产生回车按下/释放事件
-    case RGB_LYR:  // 本句让underglow作为层指示，或正常使用。
+        return true; // 让QMK产生回车按下/抬起事件
+    case RGB_LYR:  // 这允许我们将背光灯作为层指示，或正常用途
         if (record->event.pressed) { 
             user_config.rgb_layer_change ^= 1; // 切换状态
             eeconfig_update_user(user_config.raw); // 向EEPROM写入新状态
-            if (user_config.rgb_layer_change) { // 如果层状态被使能
+            if (user_config.rgb_layer_change) { // 如果层指示功能被使能
                 layer_state_set(layer_state);   // 那么立刻更新层颜色
             }
         }
         return false;
-    case RGB_MODE_FORWARD ... RGB_MODE_GRADIENT: // 对于所有的RGB代码 (see quantum_keycodes.h, L400 可以参考)
-        if (record->event.pressed) { //本句失能层指示，假设你改变了这个…你要把它禁用
+    case RGB_MODE_FORWARD ... RGB_MODE_GRADIENT: // 对于所有的RGB代码 (参考 quantum_keycodes.h, 400 行处)
+        if (record->event.pressed) { // 本句失能层指示功能，假设你现在要调整该功能…你要把它禁用
             if (user_config.rgb_layer_change) {        // 仅当使能时
-                user_config.rgb_layer_change = false;  // 失能，然后 
+                user_config.rgb_layer_change = false;  // 失能，然后
                 eeconfig_update_user(user_config.raw); // 向EEPROM写入设置
             }
         }
         return true; break;
     default:
-      return true; // 按其他键正常
+      return true; // 其他键码正常处理
   }
 }
 ```
-最后你要加入`eeconfig_init_user`函数，所以当EEPROM重置时，可以指定默认值, 甚至自定义操作。想强制重置EEPROM，请用`EEP_RST`键码或[Bootmagic](feature_bootmagic.md)函数。比如，如果要在默认情况下设置RGB层指示，并保存默认值
+最后，须添加 `eeconfig_init_user` 函数，从而当EEPROM重置时，可以指定默认值, 甚至自定义操作。若想强制重置EEPROM，请用 `EEP_RST` 键码或[Bootmagic](zh-cn/feature_bootmagic.md) 功能。比如，在你想重置RGB层指示配置，并保存默认值时。
 
 ```c
-void eeconfig_init_user(void) {  // EEPROM正被重置
+void eeconfig_init_user(void) {  // EEPROM被重置
   user_config.raw = 0;
   user_config.rgb_layer_change = true; // 我们想要默认使能
   eeconfig_update_user(user_config.raw); // 向EEPROM写入默认值
 
-  // use the non noeeprom versions, 还要向EEPROM写入这些值
+  // 通过使用非'noeeprom'版本的函数，可以同时写入这些配置到EEPROM中。
   rgblight_enable(); // 默认使能RGB
   rgblight_sethsv_cyan();  // 默认设置青色
   rgblight_mode(1); // 默认设置长亮
 }
 ```
 
-然后就完事了。RGB层指示会在你想让它工作时工作。这个设置会一直保存，即便你拔下键盘。如果你使用其他RGB代码，层指示将失能，现在它可以做你所想了。 
+一切已就绪，RGB层指示将在需要时生效。这个设置会持久存储，即便是拔下键盘。如果你使用其他RGB码，层指示将失效，从而可以停留在期望的模式及颜色下。
 
 ### 'EECONFIG' 函数文档
 
-* 键盘/修订: `void eeconfig_init_kb(void)`, `uint32_t eeconfig_read_kb(void)`和`void eeconfig_update_kb(uint32_t val)`
-* 布局: `void eeconfig_init_user(void)`, `uint32_t eeconfig_read_user(void)`和`void eeconfig_update_user(uint32_t val)`
+* 键盘/各子版本：`void eeconfig_init_kb(void)`, `uint32_t eeconfig_read_kb(void)` 和 `void eeconfig_update_kb(uint32_t val)`
+* 键映射：`void eeconfig_init_user(void)`, `uint32_t eeconfig_read_user(void)` 和 `void eeconfig_update_user(uint32_t val)`
 
 `val` 是你想写入EEPROM的值，`eeconfig_read_*`函数会从EEPROM返回一个32位(双字)的值。
 
-# 自定义击键-长按临界值(TAPPING_TERM)
-默认情况下,击键-长按临界值是全球统一的，并且不能通过键进行配置。对于大多数用户来说这很好。但是在有些情况下，对于`LT`键来说按键延时对双功能键的提升更大，可能是因为有些键比其他的键更容易按住。为了不给每个都自定义键码，本功能可以为每个键定义`TAPPING_TERM`。
+### 定时执行 :id=deferred-execution
 
-想使能这个功能的话, 要先在`config.h`加上`#define TAPPING_TERM_PER_KEY`。
+QMK支持在特定时间间隔后执行回调，以代替手动的计时器管理。
 
+#### 定时回调函数
 
-## `get_tapping_term`示例实现
-
-想要修改基于键码的`TAPPING TERM`,你要向`keymap.c`文件添加如下代码: 
+所有的 _定时回调函数_ 使用同样的函数签名，如下：
 
 ```c
-uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case SFT_T(KC_SPC):
-      return TAPPING_TERM + 1250;
-    case LT(1, KC_GRV):
-      return 130;
-    default:
-      return TAPPING_TERM;
-  }
+uint32_t my_callback(uint32_t trigger_time, void *cb_arg) {
+    /* 处理了一些工作 */
+    bool repeat = my_deferred_functionality();
+    return repeat ? 500 : 0;
 }
 ```
 
-### `get_tapping_term` 函数文档
+第一个参数 `trigger_time` 为预期的执行时间，如果因为其它事情造成了延迟未能在准确的时间点执行，可以利用这个参数“追赶”或者跳过这次间隔，取决于你的目的是什么。
+
+第二个参数 `cb_arg` 为下述的 `defer_exec()` 传入的参数，由此可以获取调用时的状态信息。
+
+返回值为该函数下一次期望被回调的时间间隔毫秒数 -- 若返回 `0` 则会自动被注销掉。上例中，通过执行假想的 `my_deferred_functionality()` 函数来决策回调是否继续下去 -- 若是，则给出一个 `500` 毫秒的延迟计划，否则，返回 `0` 来告知定时处理后台任务该计划已执行完毕。
+
+?> 须留意返回的延时时间是相对原定的触发时间点的，而不是回调执行完的时间点。这样可以防止偶发的执行延迟影响稳定的定时事件计划。
+
+#### 注册定时回调
+
+在定义好回调后，通过如下API进行定时回调注册：
+
+```c
+deferred_token my_token = defer_exec(1500, my_callback, NULL);
+```
+
+第一个参数为执行 `my_callback` 的毫秒时间延迟 -- 上例中为 `1500` 毫秒，即 1.5 秒。
+
+第三个参数为回调执行时传入的 `cb_arg` 参数。须确保该值在回调时依旧有效 -- 局部函数内的变量会在回调执行前就被释放掉因此不能用。如果并不需要这个参数，可以传入 `NULL`。
+
+返回值 `deferred_token` 可被用于在回调执行前取消该定时计划。如果该函数调用失败，会返回 `INVALID_DEFERRED_TOKEN`，一般错误原因是延时值被设置为 `0` 或回调函数参数为 `NULL`，还有一种可能是已有过量的回调在等待被处理 -- 可以按照下述方法修改这个阈值。
+
+#### 延长定时回调时间
+
+由 `defer_exec()` 返回的 `deferred_token` 可以用来修改回调执行所需等待的时延值：
+```c
+// 重新调整 my_token 后续的执行计划为当前时间起800ms后
+extend_deferred_exec(my_token, 800);
+```
+
+#### 取消定时回调
+
+由 `defer_exec()` 返回的 `deferred_token` 可以用来取消掉后续的执行计划：
+```c
+// 取消 my_token 的后续回调
+cancel_deferred_exec(my_token);
+```
+
+一旦 token 被取消了，即视为不再可用。重新使用该 token 是不支持的。
+
+#### 定时回调的限制
+
+可安排的定时回调计划数量是有限的，由 `MAX_DEFERRED_EXECUTORS` 定义的值确定。
+
+如果定时回调注册失败了，可以在对应的键盘或键映射下的 `config.h` 文件中修改该值，比如将默认的 8 改为 16：
+
+```c
+#define MAX_DEFERRED_EXECUTORS 16
+```
 
-不像这篇的其他功能,这个不需要quantum或者键盘级别的函数，只要用户级函数即可。
diff --git a/docs/zh-cn/driver_installation_zadig.md b/docs/zh-cn/driver_installation_zadig.md
new file mode 100644
index 0000000000..db9bb9a3fd
--- /dev/null
+++ b/docs/zh-cn/driver_installation_zadig.md
@@ -0,0 +1,102 @@
+# 利用Zadig安装Bootloader驱动
+
+<!---
+  original document: 0.15.12:docs/driver_installation_zadig.md
+  git diff 0.15.12 HEAD -- docs/driver_installation_zadig.md | cat
+-->
+
+QMK在主机侧会展现为一台HID键盘设备，因此不需要额外的驱动。但若要在Windows下刷写键盘固件，重置主控板时出现的bootloader设备则通常需要一些驱动程序。
+
+已知的特例有两个：常见于Pro Micro的Caterina bootloader，以及PJRC Teensys上的HalfKay bootloader, 会同时提供一个串行端口设备及一个HID设备，因此不需要额外的驱动。
+
+这里我们推荐使用[Zadig](https://zadig.akeo.ie/)工具软件。若你在MSYS2中配置了开发环境，`qmk_install.sh` 脚本已经替你安装了相关驱动。
+
+## 安装
+
+将键盘重置为bootloader模式，点击 `RESET` 键码（可能在别的层中），或按一下通常在主控板背面上的重置开关，如果你的键盘上没有前两者，尝试在按住Esc键或空格+`B`键时插上键盘（更多信息参见[Bootmagic](zh-cn/feature_bootmagic.md)）。有些键盘使用[指令](zh-cn/feature_command.md)功能来代替Bootmagic，这种情况下，可以在键盘插入状态下点击 左Shift+右Shift+`B` 或 左Shift+右Shift+Esc组合键来进入bootloader模式。
+也有一些键盘需要特别的操作才能进入bootloader状态。例如，[Bootmagic](zh-cn/feature_bootmagic.md)键（默认为：Esc键）在其它键上，比如左Control；或是指令组合键（默认为：左Shift+右Shift）为其它组合，如左Control+右Control。当不确定的时候，可以查阅一下主控板的README文件。
+
+若要将USBaspLoader设备置为bootloader模式，请在按住 `BOOT` 按钮时点击 `RESET` 按钮，或是在按住 `BOOT` 按钮时插入USB线缆。
+
+Zadig可以自动检测到bootloader设备，但有时你需要在 **Options（选项） → List All Devices（列出所有设备）** 的下拉列表中选择正确的设备。
+
+!> 如果Zadig中列出的一个或多个设备为 `HidUsb` 驱动的，那么你的键盘应该没有进入bootloader模式，此时箭头会标记成橙色并会询问你确认是否要修改系统驱动，此时**不要**允许该操作。
+
+如果箭头呈现绿色，选择所需的驱动，点击**Install Driver（安装驱动）**。如何选择正确的驱动进行安装请参见[已知驱动列表](#list-of-known-bootloaders)。
+
+![在Zadig中安装了正确的bootloader驱动](https://i.imgur.com/b8VgXzx.png)
+
+最后，重新拔插一次键盘，确认驱动可以正常加载。如果你在使用QMK工具箱进行刷写，记得也重启一下，因为有时它不会检测到驱动的变化。
+
+## 从错误的驱动安装中恢复
+
+如果你发现键盘无法输入了，应当是因为错误地替换了键盘本身的驱动，而不是bootloader的驱动，你的键盘没有进入bootloader模式就进行安装时就会遇到这个问题。在Zadig中很容易看出这个问题 - 正常的键盘在其所有的接口上都应该有 `HidUsb` 驱动：
+
+![在Zadig中的一个正常的键盘](https://i.imgur.com/Hx0E5kC.png)
+
+打开Device Manager（设备管理器），选择**View（查看） → Devices by container（依类型排序设备）**，并定位到你键盘名所在的节点。
+
+![在设备管理器中安装了错误的驱动的主控板](https://i.imgur.com/o7WLvBl.png)
+
+在这些节点上右键，选择**Uninstall device（卸载）**。如果出现了**Delete the driver software for this device（同时卸载该设备驱动文件）**也请勾选上。
+
+![设备卸载确认对话框，选中了“删除驱动文件”](https://i.imgur.com/aEs2RuA.png)
+
+点击 **Action（操作） → Scan for hardware changes（扫描检测硬件改动）**。此时，键盘应该恢复可用状态了。再确认一下Zadig中键盘是否在使用 `HidUsb` 驱动，如果是，键盘即完全恢复可用状态了，如果不是，重复这一步直到Zadig中报告了正确的驱动。
+
+?> 在这一步有时需要重启电脑，以便Windows可以选用新驱动文件。
+
+## 卸载
+
+卸载bootloadeer设备要比安装过程复杂一些。
+
+打开设备管理器，选择**查看 → 依类型排序设备**，并找到bootloader设备，寻找USB VID和PID与Zadig的[该表格](#list-of-known-bootloaders)中一致的项。
+
+在设备属性的详细信息tab中，找到 `Inf name（INF名称）` 值，通常该值类似于 `oemXX.inf`：
+
+![设备属性中的INF名称值](https://i.imgur.com/Bu4mk9m.png)
+
+之后使用管理员权限打开一个命令行窗口（在开始菜单处输出 `cmd` 并点击Ctrl+Shift+回车）。执行 `pnputil /enum-drivers` 并找到 `INF名称` 与 `Published Name（发布名称）` 一致的项：
+
+![对pnputil输出中匹配驱动项进行高亮展示](https://i.imgur.com/3RrSjzW.png)
+
+执行 `pnputil /delete-driver oemXX.inf /uninstall`，之后该驱动会被删除，相关设备也不再使用该驱动，但设备是不会被移除的。
+
+与上一节相似，本流程也可能需要执行多次，因为一个设备可能会有多个可用的驱动。
+
+!> **警告：** 操作过程中*务必非常小心*！以免不小心卸载掉其它关键驱动。如果你对操作不是很确定，多次检查 `/enum-drivers`的输出信息，也可以考虑执行 `/delete-driver` 时不添加 `/uninstall` 开关\。
+
+## 已知驱动列表 :id=list-of-known-bootloaders
+
+该表列出了已知的bootloader设备及其USB VID（厂商ID）和PID（产品ID），以及可用于QMK刷写固件的驱动。留意usbser及HidUsb驱动是随Windows附带的，无法通过Zadig安装 - 如果你的设备驱动不符，请参照上节来卸载这些驱动。
+
+此处列出的设备名应与Zadig中的一致，但不一定与设备管理器及QMK工具箱展示的一致。
+
+|Bootloader    |设备名                         |VID/PID       |驱动   |
+|--------------|------------------------------|--------------|-------|
+|`atmel-dfu`   |ATmega16u2 DFU                |`03EB:2FEF`   |libusb0|
+|`atmel-dfu`   |ATmega32U2 DFU                |`03EB:2FF0`   |libusb0|
+|`atmel-dfu`   |ATm16U4 DFU V1.0.2            |`03EB:2FF3`   |libusb0|
+|`atmel-dfu`   |ATm32U4DFU                    |`03EB:2FF4`   |libusb0|
+|`atmel-dfu`   |*none* (AT90USB64)            |`03EB:2FF9`   |libusb0|
+|`atmel-dfu`   |AT90USB128 DFU                |`03EB:2FFB`   |libusb0|
+|`qmk-dfu`     |(键盘名) Bootloader            |同`atmel-dfu` |libusb0|
+|`halfkay`     |*none*                        |`16C0:0478`   |HidUsb |
+|`caterina`    |Pro Micro 3.3V                |`1B4F:9203`   |usbser |
+|`caterina`    |Pro Micro 5V                  |`1B4F:9205`   |usbser |
+|`caterina`    |LilyPadUSB                    |`1B4F:9207`   |usbser |
+|`caterina`    |Pololu A-Star 32U4 Bootloader |`1FFB:0101`   |usbser |
+|`caterina`    |Arduino Leonardo              |`2341:0036`   |usbser |
+|`caterina`    |Arduino Micro                 |`2341:0037`   |usbser |
+|`caterina`    |Adafruit Feather 32u4         |`239A:000C`   |usbser |
+|`caterina`    |Adafruit ItsyBitsy 32u4 3V    |`239A:000D`   |usbser |
+|`caterina`    |Adafruit ItsyBitsy 32u4 5V    |`239A:000E`   |usbser |
+|`caterina`    |Arduino Leonardo              |`2A03:0036`   |usbser |
+|`caterina`    |Arduino Micro                 |`2A03:0037`   |usbser |
+|`bootloadhid` |HIDBoot                       |`16C0:05DF`   |HidUsb |
+|`usbasploader`|USBasp                        |`16C0:05DC`   |libusbK|
+|`apm32-dfu`   |APM32 DFU ISP Mode            |`314B:0106`   |WinUSB |
+|`stm32-dfu`   |STM32 BOOTLOADER              |`0483:DF11`   |WinUSB |
+|`kiibohd`     |Kiibohd DFU Bootloader        |`1C11:B007`   |WinUSB |
+|`stm32duino`  |Maple 003                     |`1EAF:0003`   |WinUSB |
+|`qmk-hid`     |(键盘名) Bootloader            |`03EB:2067`   |HidUsb |
diff --git a/docs/zh-cn/easy_maker.md b/docs/zh-cn/easy_maker.md
new file mode 100644
index 0000000000..420c77d3af
--- /dev/null
+++ b/docs/zh-cn/easy_maker.md
@@ -0,0 +1,37 @@
+# 极简式制作 - 通过配置器进行一次性的工程构建
+
+<!---
+  original document: 0.15.12:docs/easy_maker.md
+  git diff 0.15.12 HEAD -- docs/easy_maker.md | cat
+-->
+
+你是否需要一种极简的控制器编程方案，类似Proton C或Teensy 2.0，以进行一次性的工程构建？QMK提供了极简制作器，通过QMK配置器可以在几分钟内制作一个固件。
+
+有几种极简制作器，取决于你需要什么样的：
+
+* [引脚直连](https://config.qmk.fm/#/?filter=ez_maker/direct) - 将每个开关独立直连到一个引脚
+* 引脚直连 + 背光 (即将可用) - 类似引脚直连，单独加一个引脚连接到[背光](zh-cn/feature_backlight.md)控制器上
+* 引脚直连 + 小键盘锁 (即将可用) - 类似引脚直连，单独加一个引脚连接到Numlock LED上
+* 引脚直连 + 大写锁 (即将可用) - 类似引脚直连， 单独加一个引脚连接到Capslock LED上
+* 引脚直连 + 编码器 (即将可用) - 类似引脚直连， 再加两个引脚用于连接一个旋钮编码器
+
+## 快速指引
+
+最简单的情况是使用一个引脚直连的主控板，将每个引脚连接到一个开关，另一端再接地即可，从以下键盘列表中可以选择一款支持的MCU：
+
+* <https://config.qmk.fm/#/?filter=ez_maker/direct>
+
+更多信息请参见[引脚直连](#direct-pin)一节。
+
+# 引脚直连 :id=direct-pin
+
+与其名字表意相同，它的原理是一个引脚连接一个开关，每个开关的另一端接地（VSS或GND），不需要额外的部件，通常MCU内部自带上拉电阻，因此可以感知开关动作。
+
+
+这里有一个示意图，展示了如何将一个按钮连接到ProMicro的A3引脚上：
+
+![该示意图中的ProMicro的A3引脚导出一根线，连接到了开关的左边，另一根线从开关右边引出并接地。](https://i.imgur.com/JcDhZll.png)
+
+在开关连接到各自的引脚后，在键盘下拉列表中选择所使用的MCU，将键码指定到对应的引脚上即可构建出固件。以下链接仅展示支持引脚直连的极简式制作：
+
+* <https://config.qmk.fm/#/?filter=ez_maker/direct>
diff --git a/docs/zh-cn/faq.md b/docs/zh-cn/faq.md
deleted file mode 100644
index 3d0b65c6fd..0000000000
--- a/docs/zh-cn/faq.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# 常见问题
-
-* [一般问题](faq_general.md)
-* [构建和编译QMK](faq_build.md)
-* [QMK调试和故障排除](faq_debug.md)
-* [布局问题](faq_keymap.md)
diff --git a/docs/zh-cn/faq_build.md b/docs/zh-cn/faq_build.md
index c4b6e64d8d..84cd3c6a4e 100644
--- a/docs/zh-cn/faq_build.md
+++ b/docs/zh-cn/faq_build.md
@@ -1,122 +1,73 @@
-# 关于构建的常见问题
+# 常被问及的编译问题
 
-本页所写是QMK构建的常见问题.如果你还没有进行过编译,就看一下[构建环境搭建](getting_started_build_tools.md) 和 [make的说明](getting_started_make_guide.md).
+<!---
+  original document: 0.15.12:docs/faq_build.md
+  git diff 0.15.12 HEAD -- docs/faq_build.md | cat
+-->
 
-## 如果您不能在Linux上编程
-您需要适当的权限才能操作设备。对于Linux用户, 请参阅下方有关`udev`规则的说明。如果您对`udev`有问题，解决方法是用`sudo`命令。如果您不熟悉此命令，使用`man sudo`查看其手册或[看这个网页](https://linux.die.net/man/8/sudo).
+本页涉及所有编译QMK的问题，如果你还没有试过，请先阅读[编译环境配置](zh-cn/getting_started_build_tools.md)及[Make指引](zh-cn/getting_started_make_guide.md)。
 
-在你的主控是ATMega32u4时，以下是使用`sudo`命令的样例：
+## 无法在Linux下编程
+操作设备需要足够的权限，对于Linux用户，请参阅下方有关 `udev` 的规则说明。如果你对 `udev` 有困惑，可以先试试 `sudo` 命令，如果你对这个命令不熟悉，可以通过 `man sudo` 或 [这个web页面](https://linux.die.net/man/8/sudo)进行了解。
+
+一个使用 `sudo` 的示例，这里假设你的控制器是ATMega32u4:
 
     $ sudo dfu-programmer atmega32u4 erase --force
     $ sudo dfu-programmer atmega32u4 flash your.hex
     $ sudo dfu-programmer atmega32u4 reset
 
-或只用；
+或者只是:
 
-    $ sudo make <keyboard>:<keymap>:dfu
+    $ sudo make <keyboard>:<keymap>:flash
 
-使用`sudo`运行`make`一般来说**不**推荐，如果可能，尽量使用前一种方法之一。
+但请留意，用 `sudo` 来执行 `make` 通常***不是***一个好主意，请尽量考虑使用上面的办法。
 
-### Linux `udev` 规则
-在Linux上，您需要适当的权限才能访问MCU。你也可以在刷新固件时使用 `sudo`，或把这些文件放到`/etc/udev/rules.d/`。
+### Linux `udev` 规则 :id=linux-udev-rules
 
-**/etc/udev/rules.d/50-atmel-dfu.rules:**
-```
-# Atmel ATMega32U4
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff4", MODE:="0666"
-# Atmel USBKEY AT90USB1287
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffb", MODE:="0666"
-# Atmel ATMega32U2
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff0", MODE:="0666"
-```
+在linux下，需要足够的权限才能读写bootloader设备，可以使用 `sudo` 来刷写固件（不推荐），也可以将[这个文件](https://github.com/qmk/qmk_firmware/tree/master/util/udev/50-qmk.rules) 放到 `/etc/udev/rules.d/` 目录下。
 
-**/etc/udev/rules.d/52-tmk-keyboard.rules:**
-```
-# tmk键盘产品     https://github.com/tmk/tmk_keyboard
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="feed", MODE:="0666"
-```
-**/etc/udev/rules.d/54-input-club-keyboard.rules:**
+放好后，执行：
 
 ```
-# Input Club keyboard bootloader
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1c11", MODE:="0666"
+sudo udevadm control --reload-rules
+sudo udevadm trigger
 ```
 
-### 串行设备在Linux上检测不到bootloader模式
-确保您的内核对您的设备有相应的支持。 如果你的设备是 USB ACM, 比如Pro Micro (Atmega32u4)，就要加上`CONFIG_USB_ACM=y`. 其他设备可能需要`USB_SERIAL` 及其任何子选项。
+**注意：**在旧版ModeManager（<1.12）中，过滤功能仅在严格模式（strict mode）下可用，可以调整一下配置：
 
-## DFU Bootloader的未知设备
+```
+printf '[Service]\nExecStart=\nExecStart=/usr/sbin/ModemManager --filter-policy=default' | sudo tee /etc/systemd/system/ModemManager.service.d/policy.conf
+sudo systemctl daemon-reload
+sudo systemctl restart ModemManager
+```
 
-如果您在使用Windows来刷新键盘的时候碰到了问题，检查设备管理器。如果在键盘处于 "bootloader模式"时你看到 "未知设备"，说明你可能面临设备问题。
+### 在Linux下无法检测到bootloader模式下的串口设备
+确认一下你的内核版本是否已配置为支持该设备。如果你的设备使用USB ACM，如Pro Micro（Atmega32u4），确认内核 配置中包含 `CONFIG_USB_ACM=y`，其它类型的设备可能需要 `USB_SERIAL` 及相关子配置的支持。
 
-重新运行MSYS2上的安装脚本或许会凑效（比如在MSYS2/WSL运行 `./util/qmk_install.sh`) 或者重新安装QMK工具箱也可能会解决你的问题。
+## DFU Bootloader显示为未知设备
 
-如果以上方法还是短针攻疽，那您可能需要使用[Zadig Utility](https://zadig.akeo.ie/)。下载此程序, 找到设备问题, 然后选择 `WinUSB`选项, 然后点击"Reinstall driver"。完成后再试试刷新你的键盘。倘若依然徒劳无功，那就尝试所有选项直到好用为止。
+在Windows下刷写键盘固件时很常见的一个问题。主要原因是安装了错误的驱动，或者压根没有装驱动。
 
-?> 事实上没有一个驱动的最佳选择，有些选项就是和某些系统相辅相成。但libUSB和WinUSB似乎也算是这里的最佳选择了。
-如果bootloader在设备列表中没有显示，你可能要使能 "List all devices"选项在选项菜单中`Options`，然后找到有问题的bootloader设备。(译者注：在win10中可能为 查看-显示隐藏的设备)
+要修复这个问题，可以尝试重新执行QMK安装脚本(位于MSYS2或WSL中的 `qmk_firmware` 目录下的 `./util/qmk_install.sh`)或重新安装QMK工具箱。此外，也可以尝试下载安装[QMK驱动安装包 `qmk_driver_installer`](https://github.com/qmk/qmk_driver_installer)来修复。
+
+如果问题依旧，可能是需要下载安装Zadig，具体请参考[通过Zadig安装bootloader驱动](zh-cn/driver_installation_zadig.md)。
 
 ## USB VID 和 PID
-你可以在编辑`config.h`时使用任何你想用的ID值。实际上，使用任何可能未使用的ID都没有问题，除了有极低的与其他产品发生冲突的可能性。
+通过编辑 `config.h` 你可以自由指定ID，随便选一个看起来不常用的ID一般不会有什么问题，冲突的概率很低。
 
-大多数QMK主板使用`0xFEED`作为vendor ID。您应该查看其他键盘，以确保选择了唯一的Product ID。
+大部分QMK设备都选用 `0xFEED` 作为VID，选取PID前请先看一下其它键盘的情况再决定。
 
-也要看看这个。
+同时请阅读这个issue：
 https://github.com/tmk/tmk_keyboard/issues/150
 
-一也可以在下方链接购买一个唯一的VID:PID。不过个人使用似乎用不着这个。
+你可以在以下地址购买唯一的VID:PID，但我觉得个人使用情况下没有必要。
 - https://www.obdev.at/products/vusb/license.html
 - https://www.mcselec.com/index.php?page=shop.product_details&flypage=shop.flypage&product_id=92&option=com_phpshop&Itemid=1
 
-## AVR的BOOTLOADER_SIZE
-注意Teensy2.0++ bootloader的大小是2048字节。有些Makefile注释错了。
+### 在我刷写完键盘后就没响应了/点了没动静了 -- 设备是arm的（rev6 planck, clueboard 60, hs60v2等）(2019年2月)
+因为ARM平台下EEPROM特殊的工作模式，已保存的配置可能会失效。主要影响的是默认层，有概率在特定情况下会导致键盘不可用，我们还没有搞明白原因。这个问题可以在重置EEPROM后恢复。
 
-```
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 2048
-#   Atmel DFU loader 4096       (TMK Alt Controller)
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=2048
-```
+[Planck rev6 上重置 EEPROM](https://cdn.discordapp.com/attachments/473506116718952450/539284620861243409/planck_rev6_default.bin) 可以用于强制重置EEPROM。刷入这个文件后，再次刷入正常固件，会将键盘恢复到_正常_工作状态。
+[Preonic rev3 上重置 EEPROM](https://cdn.discordapp.com/attachments/473506116718952450/537849497313738762/preonic_rev3_default.bin)
 
-## 在MacOS上 `avr-gcc: internal compiler error: Abort trap: 6 (program cc1)` 
-这是brew更新的问题，导致AVR GCC依赖的符号链接被损坏。
-
-解决方案是移除并重新安装所有受影响的模块。
-
-```
-brew rm avr-gcc
-brew rm dfu-programmer
-brew rm dfu-util
-brew rm gcc-arm-none-eabi
-brew rm avrdude
-brew install avr-gcc
-brew install dfu-programmer
-brew install dfu-util
-brew install gcc-arm-none-eabi
-brew install avrdude
-```
-
-### avr-gcc 8.1 和 LUFA
-
-如果你把avr-gcc升级到7以上你可能会遇到关于LUFA的问题。比如:
-
-`lib/lufa/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h:380:5: error: 'const' attribute on function returning 'void'`
-
-那你就需要在brew中把avr-gcc回退到7。
-
-```
-brew uninstall --force avr-gcc
-brew install avr-gcc@8
-brew link --force avr-gcc@8
-```
-
-### 我刷新了我的键盘但是键盘不工作/按键没有注册 - 而且还是ARM的 (rev6 planck, clueboard 60, hs60v2, etc...) (Feb 2019)
-由于EEPROM在基于ARM的芯片上的工作原理，保存的设置可能不再有效。这会影响默认层，而且*或许*在某些情况下，会使键盘不好用，我们仍在调查这些情况。重置EEPROM将解决此问题。
-
-[Planck rev6键盘重置EEPROM](https://cdn.discordapp.com/attachments/473506116718952450/539284620861243409/planck_rev6_default.bin) 是用于强制重置EEPROM的。刷入这个文件后，再次刷入正常固件，这会将键盘恢复到_正常_工作状态。
-[Preonic rev3键盘重置EEPROM](https://cdn.discordapp.com/attachments/473506116718952450/537849497313738762/preonic_rev3_default.bin)
-
-如果以任何形式启用了bootmagic， 那么您还需要(看[Bootmagic文档](feature_bootmagic.md) 以及键盘信息，以了解如何执行此操作的详细信息).
+也可以考虑使用bootmagic，只要它可以用。（参见[Bootmagic文档](zh-cn/feature_bootmagic.md)并结合键盘情况来了解如何操作）
diff --git a/docs/zh-cn/faq_debug.md b/docs/zh-cn/faq_debug.md
index 4dba44c275..63d688ed9e 100644
--- a/docs/zh-cn/faq_debug.md
+++ b/docs/zh-cn/faq_debug.md
@@ -1,136 +1,136 @@
-# 调试的常见问题
+#  调试 FAQ
 
-本篇详细介绍了人们在键盘故障排除时的各种常见问题。
+<!---
+  original document: 0.15.12:docs/faq_debug.md
+  git diff 0.15.12 HEAD -- docs/faq_debug.md | cat
+-->
 
-# 调试控制台
+此页面详细介绍了人们对键盘故障排除的各种常见问题。
 
-## `hid_listen` 无法识别设备
-当设备的调试控制台未就绪时，您将看到如下内容：
+## 调试 :id=debugging
+
+如果你在 `rules.mk` 中配置了 `CONSOLE_ENABLE = yes`，你的键盘将会输出调试信息。默认情况下输出很有限，可以启用调试模式来增加调试输出的丰富度。使用你的键映射方案中的 `DEBUG` 键码，或使用[指令](zh-cn/feature_command.md)功能来启动调试模式，或者将下面这段代码放到你的键映射中：
+
+```c
+void keyboard_post_init_user(void) {
+  // 通过调整这些值可以改变其表现
+  debug_enable=true;
+  debug_matrix=true;
+  //debug_keyboard=true;
+  //debug_mouse=true;
+}
+```
+
+## 调试工具
+
+有多种可用于调试的工具。
+
+### 使用QMK工具箱调试
+
+在兼容的平台上，[QMK工具箱](https://github.com/qmk/qmk_toolbox)可以展示你的键盘的调试输出。
+
+### 使用 QMK CLI 进行调试
+
+倾向于在终端进行调试？使用 [QMK CLI 命令行](zh-cn/cli_commands.md#qmk-console)可以展示键盘输出的调试信息。
+
+### 使用hid_listen调试
+
+更喜欢使用终端的方案？PJRC提供的[hid_listen](https://www.pjrc.com/teensy/hid_listen.html)也可以用来展示调试信息，已有Windows、Linux及MacOS下预编译好的可执行文件。
+
+## 发送自定义调试信息 :id=debug-api
+
+有时在[自定义代码](zh-cn/custom_quantum_functions.md)中输出调试信息非常有用，要做到这个功能也很简单，在代码文件头部包含 `print.h` 文件：
+
+```c
+#include "print.h"
+```
+
+然后可以使用以下输出函数：
+
+* `print("string")`: 字符串输出
+* `uprintf("%s string", var)`: 格式化字符串输出
+* `dprint("string")` 仅调试模式下，字符串输出
+* `dprintf("%s string", var)`: 仅调试模式下，格式化字符串输出
+
+## 调试示例
+
+以下列出了一些实际出现过的调试范例，更多资料参见[调试/定位QMK问题](zh-cn/faq_debug.md)。
+
+### 当前按下的键的矩阵坐标是什么？
+
+在移植或尝试诊断PCB问题时，确认按下的键被正确扫描到是很有用的排查步骤。要启用该场景的日志输出，请在 `keymap.c` 中添加：
+
+```c
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  // If console is enabled, it will print the matrix position and status of each key pressed
+#ifdef CONSOLE_ENABLE
+    uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
+#endif 
+  return true;
+}
+```
+
+输出示例
+```text
+Waiting for device:.......
+Listening:
+KL: kc: 169, col: 0, row: 0, pressed: 1
+KL: kc: 169, col: 0, row: 0, pressed: 0
+KL: kc: 174, col: 1, row: 0, pressed: 1
+KL: kc: 174, col: 1, row: 0, pressed: 0
+KL: kc: 172, col: 2, row: 0, pressed: 1
+KL: kc: 172, col: 2, row: 0, pressed: 0
+```
+
+### 扫描到一个键码需要多久？
+
+调试性能问题时，知晓开关矩阵的扫描频率是很有用的排查步骤。要启用该场景的日志输出，请在 `config.h` 中添加：
+
+```c
+#define DEBUG_MATRIX_SCAN_RATE
+```
+
+输出示例
+```text
+  > matrix scan frequency: 315
+  > matrix scan frequency: 313
+  > matrix scan frequency: 316
+  > matrix scan frequency: 316
+  > matrix scan frequency: 316
+  > matrix scan frequency: 316
+```
+
+## `hid_listen` 无法识别到设备
+
+如果设备没有就绪，在命令行下调试会看到如下输出：
 
 ```
 Waiting for device:.........
 ```
 
-插入设备后，*hid_listen*找到该设备，您将收到以下消息：
+当设备插入后，*hid_listen*可以发现设备，会有如下输出：
 
 ```
 Waiting for new device:.........................
 Listening:
 ```
 
-如果您无法获得这条“Listening:”消息，请尝试在[Makefile]中使用 `CONSOLE_ENABLE=yes`
+若无法出现'Listening:'消息，尝试在[Makefile]中添加 `CONSOLE_ENABLE=yes`
 
-在Linux这样的操作系统上，你可能需要一些权限。
-- 使用`sudo hid_listen`
+在类Linux系统下，访问设备可能需要一定权限，尝试使用 `sudo hid_listen`。
 
-## 控制台没有返回消息
-检查:
-- *hid_listen* 找到了你的设备。看前面。
-- 输入**Magic**+d打开调试。详见[Magic Commands](https://github.com/tmk/tmk_keyboard#magic-commands)。
-- 设置`debug_enable=true` ，一般存在于**matrix.c**的`matrix_init()`中。
-- 尝试使用'print'函数而不要用调试输出。详见**common/print.h**。
-- 断开其他有控制台功能的设备。 详见[Issue #97](https://github.com/tmk/tmk_keyboard/issues/97)。
-
-## Linux或UNIX这样的系统如何请求超级用户权限
-用'sudo'来执行*hid_listen*就有权限了。
-```
-$ sudo hid_listen
-```
-
-或者把一个文件放到规则文件夹来为TMK设备添加*udev规则*，不同系统的目录可能有所不同。
-
-文件: /etc/udev/rules.d/52-tmk-keyboard.rules(在Ubuntu系统的情况下)
-```
-# tmk keyboard products     https://github.com/tmk/tmk_keyboard
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="feed", MODE:="0666"
-```
-
-***
-
-# 其他
-## 安全注意事项
-
-你应该不想要把你的键盘变成"砖头"吧，就是变成没法重写固件的那种。
-下面讲解一些参数来告诉你什么风险很大（其实也不是很大）。
-
-- 假如你键盘表面没有设计重置键"RESET", 那你要进入bootloader的话就要按PCB上的RESET了。
-  按PCB上的RESET要拧开键盘底部。
-- 如果 tmk_core / common 里面的文件丢失键盘可能失灵。
-- .hex太大可能不太好; `make dfu` 会删除块，检验大小（咦?好像反了...）。
-  一但出错，刷新键盘失败的话就困在DFU出不去了。
-  - 所以, 要知道大小限制。 Planck键盘上.hex文件最大大小是 is 7000h (十进制是28672)
+此外，很多Linux发行版可以通过创建如下内容的文件 `/etc/udev/rules.d/70-hid-listen.rules` 来避免通过root权限执行hid_listen：
 
 ```
-Linking: .build/planck_rev4_cbbrowne.elf                                                            [OK]
-Creating load file for Flash: .build/planck_rev4_cbbrowne.hex                                       [OK]
-
-Size after:
-   text    data     bss     dec     hex filename
-      0   22396       0   22396    577c planck_rev4_cbbrowne.hex
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="abcd", ATTRS{idProduct}=="def1", TAG+="uaccess", RUN{builtin}+="uaccess"
 ```
 
-  - 上面那个文件大小是 22396/577ch，比28672/7000h小
-  - 当你有一个合适的.hex文件时，你就要重试加载那个了
-  - 您在键盘Makefile中的某些选项可能消耗额外内存；注意以下这几个
-    BOOTMAGIC_ENABLE, MOUSEKEY_ENABLE, EXTRAKEY_ENABLE, CONSOLE_ENABLE, API_SYSEX_ENABLE
-- DFU 工具/不/可以写入bootloader (unless you throw in extra fruit salad of options), 
-  所以还是有点危险的
-- EEPROM大概有100000次循环寿命。不要总是频繁重写固件；EEPROM会玩坏的。
-## 全键无冲不好用
-首先你要在**Makefile**用如下命令编译固件`NKRO_ENABLE`。
+使用设备的真实VID和PID替换上面的abcd和def1，留意必须全小写。其中 `RUN{builtin}+="uaccess"` 仅在较老的发行版中需要使用。
 
-全键无冲还不好用的话试着用`Magic` **N** 命令(默认是`LShift+RShift+N`)。这个命令会在**全键无冲**和**六键无冲**之间临时切换。有些情况**全键无冲**不好用你就需要使用**六键无冲**模式，尤其是在BIOS中。
-
-
-## 指点杆需要复位电路(PS/2 鼠标支持)
-如果没有复位电路，由于硬件初始化不正确，您将得到不一致的结果。查看TPM754复位电路。
-
-- https://geekhack.org/index.php?topic=50176.msg1127447#msg1127447
-- https://www.mikrocontroller.net/attachment/52583/tpm754.pdf
-
-
-## 矩阵不可读16以上的列
-当列超过16时[matrix.h]的`read_cols()`中，用`1UL<<16`而不要用`1<<16`。
-
-在C语言中`1` 是一个[int] 类型的[16 bit]值，在AVR中你不能左移大于15次。如果你使用`1<<16`的话会得到意外的零。你要用 [unsigned long]类型，比如`1UL`。
-
-https://deskthority.net/workshop-f7/rebuilding-and-redesigning-a-classic-thinkpad-keyboard-t6181-60.html#p146279
-
-## 特殊额外键不起作用(系统，音频控制键)
-你要在`rules.mk`定义`EXTRAKEY_ENABLE`在QMK中使用它们。
-
-```
-EXTRAKEY_ENABLE = yes          # 音频控制和系统控制
-```
-
-## 睡眠唤醒不好用
-
-在Windows查看设备管理器中该键盘设备属性中电源管理选项卡中的`允许此设备唤醒计算机(O)`是否勾选。同时看一眼BIOS设置。
-
-在主机睡眠时按下任何键都可以唤醒了。
-
-## 使用Arduino?
-
-**注意Arduino的针脚名字和主控芯片的不一样。** 比如, Arduino的`D0`并不是`PD0`。自己用原理图捋一下电路。
-
-- https://arduino.cc/en/uploads/Main/arduino-leonardo-schematic_3b.pdf
-- https://arduino.cc/en/uploads/Main/arduino-micro-schematic.pdf
-
-Arduino Leonardo和micro使用**ATMega32U4**，该芯片TMK可用，但Arduino的bootloader会导致问题。
-
-## USB 3 兼容性
-据传说有些人用USB3接口会有问题，用USB2的试试。
-
-
-## Mac 兼容性
-### OS X 10.11 和集线器
-https://geekhack.org/index.php?topic=14290.msg1884034#msg1884034
-
-
-## 对于BIOS (UEFI)/恢复(睡眠和唤醒)/重新启动 有问题
-有人说他们的键盘在BIOS中，或许是恢复(睡眠和唤醒)后不工作.
-
-截止至目前，其根本原因未知，不排除与某些构建选项有关。试着在Makefile中失能`CONSOLE_ENABLE`, `NKRO_ENABLE`, `SLEEP_LED_ENABLE`这样的选项，也试试其他的。
-
-https://github.com/tmk/tmk_keyboard/issues/266
-https://geekhack.org/index.php?topic=41989.msg1967778#msg1967778
+## 命令行无法成功输出消息
+请检查:
+- *hid_listen*确实找到了设备，如前文所述。
+- 通过**Magic**+d命令启用调试模式，参见[Magic Commands](https://github.com/tmk/tmk_keyboard#magic-commands).
+- 配置`debug_enable=true`. 参见[调试](#debugging)
+- 尝试用 `print` 替代 `dprint`， 参见**common/print.h**.
+- 拔出其它可能影响命令行的设备，参见[Issue #97](https://github.com/tmk/tmk_keyboard/issues/97).
diff --git a/docs/zh-cn/faq_general.md b/docs/zh-cn/faq_general.md
index 4949acb8c9..cc8ef3d19a 100644
--- a/docs/zh-cn/faq_general.md
+++ b/docs/zh-cn/faq_general.md
@@ -1,19 +1,58 @@
-# ��������
+# 常见问题（FAQ）
 
-## QMK��ʲô?
+<!---
+  original document: 0.15.12:docs/faq_general.md
+  git diff 0.15.12 HEAD -- docs/faq_general.md | cat
+-->
 
-[QMK](https://github.com/qmk), �����ӻ�е����(Quantum Mechanical Keyboard)����д����һȺ��Դ������Ϊ���Ƽ��̿����Ĺ��ߡ����Ǵ�[QMK�̼�](https://github.com/qmk/qmk_firmware)��ʼ������[TMK](https://github.com/tmk/tmk_keyboard)��ħ�ķֲ档
+## QMK是什么?
 
-### Ϊʲô������(Quantum)?
+[QMK](https://github.com/qmk), 是量子机械键盘（Quantum Mechanical Keyboard）的缩写, 是制作自定义键盘工具的人组成的组织。 一切始于[QMK固件](https://github.com/qmk/qmk_firmware)项目, 可以认为是[TMK](https://github.com/tmk/tmk_keyboard)的改进版本.
 
-<!-- ���޸� �����²ۣ��ĵ����߾�ȻҲ��֪��Ϊɶ������ -->
+## 不知道从哪开始搞！
 
-## QMK��TMK��ʲô����?
+这样的话建议从[新手指引](zh-cn/newbs.md)开始。那里有你需要的高质量的入门信息。
 
-TMK�����[Jun Wako](https://github.com/tmk)��ƺ�ִ�С�QMKʼ��[Jack Humbert](https://github.com/jackhumbert)ΪPlanck���̴�����TMK�ֲ档һ��ʱ���Jack�ķֲ�ͺ�TMK��ȥ��Զ�ˣ�������2015�꣬Jack��������QMK��
+如果还是搞不懂的话，直接跳到[QMK配置器](https://config.qmk.fm)吧，你核心需要的东西都在那里。
 
-�Ӽ����۵�������QMK��TMK����һЩ�¹��ܶ��ɵġ�������QMK��չ�˿��õļ��룬ʹ�߼����ܽ�һ���ḻ���� `S()`, `LCTL()`, �� `MO()`��ȫ�������[����](keycodes.md).
+## 我的固件如何刷写到硬件上？
 
-�ӹ��̵�������������TMK�Լ�ά�������йٷ�֧�ֵļ��̣�ֻ�к�Сһ��������֧�֡���������ά���Ѵ��ڷֲ��Ϊ�������̴����ķֲ档Ĭ��֧�ֺ��ٵļ��룬�����û�ͨ�����������˷������֡�QMK����ͨ�����й����ֿ�������ֺͼ��̣����ǻ�������з���������׼��PR����ͼ���ı�֤������ά����ͬʱQMKС��Ҳ���ڱ�Ҫʱ���������
+先参考[编译/刷写固件FAQ](zh-cn/faq_build.md)，里面有充足的资料，常见的问题也给出了足够多的解决办法。
 
-�����ַ����������ŵ��ȱ�㣬���Ҵ�����������ʱ��TMK��QMK֮������������
+## 我的问题这里找不到相关信息怎么办？
+
+没有关系，请到[GitHub上发issue](https://github.com/qmk/qmk_firmware/issues)看看是否有人遇到了相同的问题（留意一定是相同的问题，而不是相似的）。
+
+如果还是找不到解决办法，请[新建issue](https://github.com/qmk/qmk_firmware/issues/new)！
+
+## 我好像找到了bug？
+
+那么新建一个[issue](https://github.com/qmk/qmk_firmware/issues/new)吧，如果你还知道怎么修，带着修复方案发个Pull Request吧。
+
+## 但是 `git` 和 `GitHub` 我实在是玩不转！
+
+别担心，这里有很好的[入门指引](zh-cn/newbs_git_best_practices.md)可以教你怎么轻松快乐地使用 `git` 和GitHub进行开发。
+
+更多的 `git` 和GitHub知识，参考[这里](zh-cn/newbs_learn_more_resources.md)。
+
+## 我可以添加一个支持的键盘
+
+太棒啦！请发Pull Request吧，在代码审阅后，我们会合并进去！
+
+### 我可以打上 `QMK` 的标吗?
+
+很好啊！我们甚至乐意帮你这么做！
+
+我们有[一整页](https://qmk.fm/powered/)的资料旨在帮你在页面和键盘上打上QMK的标，里面有QMK官方提供的所有支援（信息及图片）。
+
+如果你有任何疑问，可以发issue或通过[Discord](https://discord.gg/Uq7gcHh)联系我们。
+
+## QMK和TMK区别是什么？
+
+TMK原先是由[Jun Wako](https://github.com/tmk)设计实现的，QMK来源于[Jack Humbert](https://github.com/jackhumbert)的Planck的TMK fork。一段时间后，Jack的这个fork与TMK渐行渐远，到2015年时，Jack决定将这份fork重命名为QMK。
+
+技术上讲QMK等同于基于TMK增加了一些新功能，最显著的是在扩充了可用键码后，实现了很多诸如 `S()`, `LCTL()` 及 `MO()` 这样的高级功能，所有这些键码可以参见[键码](zh-cn/keycodes.md)页。
+
+从工程项目及社区维护角度来看，TMK维护了一份官方支持的键盘及很少量的社区贡献，社区中各自维护着各自的fork，且因为默认键映射很少，TMK的使用者基本不会共享键映射。QMK通过统一的集约式仓库（repo）管理来鼓励分享键盘及键映射，任何符合质量基线的pull request都会被采纳，因此绝大部分贡献都来源于社区，QMK小组会在必要时提供支援。
+
+两种模式各有利弊，并且TMK和QMK之间也会有合乎理法的代码交流。
diff --git a/docs/zh-cn/faq_keymap.md b/docs/zh-cn/faq_keymap.md
index ff38f38894..f674129717 100644
--- a/docs/zh-cn/faq_keymap.md
+++ b/docs/zh-cn/faq_keymap.md
@@ -1,151 +1,157 @@
-# 布局常见问题
+# 键映射FAQ
 
-本页本页包含人们经常遇到的关于布局的问题。如果你觉得没什么问题，请先看[布局概览](keymap.md)。
+<!---
+  original document: 0.15.12:docs/faq_keymap.md
+  git diff 0.15.12 HEAD -- docs/faq_keymap.md | cat
+-->
 
-## 我能用什么键码?
-看[键码](keycodes.md)你可以找到你能用的键码索引。可以的话这些链接可以连接到更广泛的文档。
+本页包含人们经常遇到的关于键映射的问题，如果你还没阅读过[键映射概览](zh-cn/keymap.md)，请先阅读一下。
 
-键码实际上定义在[common/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/keycode.h).
+## 我能使用的键码有哪些?
+所有可用键码收录在[键码](zh-cn/keycodes.md)页，在有更详尽的文档时，我们会更新这个链接。
 
-## 默认的键码什么样?
+所有键码实际定义在[quantum/keycode.h](https://github.com/qmk/qmk_firmware/blob/master/quantum/keycode.h).
 
-世界上有三种标准键盘设计，分别是：ANSI, ISO, and JIS. 主要是北美用ANSI(译者注：中国很多键盘使用这个), 欧洲和非洲主要使用ISO，日本使用JIS。未提及的区域通常使用ANSI或ISO。与这些设计对应的键代码如下所示：
+## 默认键码是什么?
 
-<!-- 该图片的来源: https://www.keyboard-layout-editor.com/#/gists/bf431647d1001cff5eff20ae55621e9a -->
-![键盘设计图](https://i.imgur.com/5wsh5wM.png)
+广为使用的键盘配列有三种——ANSI，ISO及JIS。北美主要使用ANSI，欧洲及非洲主要使用ISO，日本主要使用JIS，其它区域多为ANSI或ISO。这三种配列的键码可查阅：
 
-## 我有一些键变成了其他功能或者不工作了
+<!-- Source for this image: https://www.keyboard-layout-editor.com/#/gists/bf431647d1001cff5eff20ae55621e9a -->
+![键盘配列示意图](https://i.imgur.com/5wsh5wM.png)
 
-QMK有两个功能，Bootmagic和命令行，它允许您在运行中更改键盘的行为。该功能包括但不仅限于, 交换Ctrl/Caps，关闭界面，交换Alt/Gui，交换 Backspace/Backslash，禁用所有键，以及其他的行为改变。
+## 如何对复杂的键码指定自定义的名称？
 
-快速解决方法是插入键盘时按住`Space`+`Backspace`。该操作将重置已保存设置，让这些键回复初始功能。这招不好用的话参阅下方：
+使用更容易理解的自定义的名字去指代一些键码有时很实用，通常我们使用 `#define` 来实现：
 
-* [Bootmagic](feature_bootmagic.md)
-* [命令](feature_command.md) 
+```c
+#define FN_CAPS LT(_FL, KC_CAPSLOCK)
+#define ALT_TAB LALT(KC_TAB)
+```
 
-## 菜单键不好用
+这样键映射代码中就可以使用 `FN_CAPS` 和 `ALT_TAB` 了，可读性好得多。
 
-现在大多数键盘 `KC_RGUI`和`KC_RCTL`中间的键子叫做`KC_APP`。这是因为在这个键子发明之前相关标准里就已经有键叫做`MENU(菜单)`了，所以微软叫他`APP(应用)`键。
+## 一些按键发生了交换，或是不能用了
 
-## `KC_SYSREQ` 不工作
-使用抓屏的键码(`KC_PSCREEN`或`KC_PSCR`)而不用`KC_SYSREQ`。组合键'Alt + Print Screen'会被当作'System request'。
+QMK有两个功能系列，Bootmagic及指令，都可以让键盘随时变得灵活多变，功能包含但不限于交换Ctrl/Caps、锁定Gui键、交换Alt/Gui、交换Backspace/Backslash、禁用所有按键等。
 
-见[issue #168](https://github.com/tmk/tmk_keyboard/issues/168)和
+快速恢复的办法是插入键盘时按住空格+`Backspace`键，这样会重置键盘内存储的设置信息，键盘就会恢复常态。如果问题依旧存在，请参考：
+
+* [Bootmagic](zh-cn/feature_bootmagic.md)
+* [指令](zh-cn/feature_command.md) 
+
+## 菜单键（Menu）不可用
+
+现代键盘上，位于 `KC_RGUI` 及 `KC_RCTL` 间的按键实际上叫做 `KC_APP`。原因是该键被发明时，相关标准中已经有了 `菜单（MENU）` 键，因此微软将该键命名为 `APP` 键。
+
+## `KC_SYSREQ` 不可用
+请使用截图键码（`KC_PSCREEN` 及 `KC_PSCR`）替代 `KC_SYSREQ`，组合键’Alt + Print Screen‘实际上会被识别为’System request‘。
+
+具体参见[issue #168](https://github.com/tmk/tmk_keyboard/issues/168)以及
 * https://en.wikipedia.org/wiki/Magic_SysRq_key
 * https://en.wikipedia.org/wiki/System_request
 
 ## 电源键不工作
 
-这有点让人困惑,QMK有两个"Power(电源)"键码: `KC_POWER` 在键盘/小键盘的HID使用页面中，`KC_SYSTEM_POWER` (或者叫`KC_PWR`)在用户页。
+QMK有两个容易让人迷惑的“电源键”键码：HID键盘页的 `KC_POWER`，及用户页的 `KC_SYSTEM_POWER`（或 `KC_PWR`）。
 
-前者只能被macOS识别，但是后者，即`KC_SLEP`和`KC_WAKE`三大主要操作系统全都支持，所以推荐使用这两个。Windows下这些键立即生效，macOS要长按直到弹出对话框。
+前者只有macOS支持，后者连同 `KC_SLEP` 及 `KC_WAKE` 在所有主流操作系统上都支持，因此使用后者是推荐的做法。在Windows下，按下按键即刻就会生效，而macOS下必须按住直到系统弹出一个对话框。
 
-## 自动大小写锁定
-可以解决'the'问题(正常应为The)。我经常在输入'The'时不慎输入了'the'或者'THe'。自动大小写锁定可以修正此类问题。详见下方链接。
+## 单发修饰键
+用来解决我自己的’the‘麻烦，我总是会将’The‘错输入为’the‘或’THe‘，单发Shift键缓解了我的这个麻烦。
 https://github.com/tmk/tmk_keyboard/issues/67
 
-## 修改 键/层 卡住
-除非正确配置层切换，否则修改键或层可能会卡住。
-对于修改键和图层操作，必须把`KC_TRANS`放到目标层的相同位置，用于注销修改键或在释放事件时返回到上一层。
+## 修饰键/层 卡住了
+层切换功能只有在正确配置的情况下，才不会出现卡住修饰键和层的问题。
+对于修饰键和层切换操作来讲，必须确保 `KC_TRANS` 在切换到目标layer时正确置位，才能让修饰键正确释放。或者在释放动作中确保返回到了之前的层。
+
 * https://github.com/tmk/tmk_core/blob/master/doc/keymap.md#31-momentary-switching
 * https://geekhack.org/index.php?topic=57008.msg1492604#msg1492604
 * https://github.com/tmk/tmk_keyboard/issues/248
 
 
-## 机械自锁开关支持Mechanical Lock Switch Support
+## 机械锁定式开关支持
 
-本功能用于*机械自锁开关*比如[this Alps one](https://deskthority.net/wiki/Alps_SKCL_Lock)。你可以通过向`config.h`添加以下宏来使能该功能：
+该功能支持形如[Alps这款](https://deskthority.net/wiki/Alps_SKCL_Lock)的*机械锁定式开关*，启用该功能须在 `config.h` 中添加如下定义：
 
 ```
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 ```
 
-在使能该功能后，要在键盘中使用`KC_LCAP`, `KC_LNUM` 和 `KC_LSCR`这三个键码。
+启用该功能后，在你的键映射中须改为使用 `KC_LCAP`，`KC_LNUM` 和 `KC_LSCR`。
 
-远古机械键盘偶尔会有自锁机械开关，现在几乎没有了。***大多数情况下你不需要使用该功能，且要使用`KC_CAPS`, `KC_NLCK`和`KC_SLCK`这三个键码。***
+旧式复古风（vintage style）键盘偶尔能见到锁定式开关，但在现代键盘中见不到了。***因此你基本不会需要这个功能的，直接使用 `KC_CAPS`，`KC_NLCK` 和 `KC_SLCK` 就好***
 
-## 输入ASCII之外的特殊字符比如Cédille 'Ç'
+## 输入形如法语中软音'Ç'这样的非ASCII字符
 
-请见[Unicode](feature_unicode.md)功能。
+参见[Unicode](zh-cn/feature_unicode.md)功能.
 
-## macOS上的`Fn` 
+## macOS系统下的 `Fn`
 
-不像大多数FN键，苹果上那个有自己的键码...呃，基本上算吧。 他取缔了基本6键无冲HID报告的第六个键码 -- 所以苹果键盘其实是5键无冲的。
+和其它键盘不同，Apple键盘上的Fn有自己的键码...在某种程度上。其占用了基础6KRO HID事件上报中的第六个键码 —— 因此Apple键盘实际上只是5KRO（5键无冲）的。
 
-技术上说QMK可以发送这个键。但是，这样做需要修改报告格式以添加FN键的状态。这还不是最糟糕的，你的键盘的VID和PID和真的苹果键盘不一样的话还不会被识别。
-QMK官方支持这个会被律师函的，所以就当我没说过。
+技术上讲QMK确实能发送这种键码，但这么做需要修改上报事件中Fn键状态的格式。更麻烦的是，只有你的键盘的VID及PID与Apple键盘一致时才会生效。QMK对此提供官方支持可能会有法律风险，换句话说，我们不太可能去这么做的。
 
-详见[issue#2179](https://github.com/qmk/qmk_firmware/issues/2179)。
+具体信息请参见[这个issue](https://github.com/qmk/qmk_firmware/issues/2179)。
 
+## Mac OSX下支持的键有哪些？
+你可以通过查阅以下代码确认OSX下支持的键码。
 
-## Mac OSX的媒体控制键
-#### KC_MNXT 和 KC_MPRV 在Mac上不好用
-使用 `KC_MFFD`(`KC_MEDIA_FAST_FORWARD`) 和 `KC_MRWD`(`KC_MEDIA_REWIND`)，不要用 `KC_MNXT` 和 `KC_MPRV`.
-详见 https://github.com/tmk/tmk_keyboard/issues/195
-
-
-## Mac OSX中支持那些键?
-你可以从此源码中获知在OSX中支持哪些键码
-
-`usb_2_adb_keymap` 阵列映射 键盘/小键盘 页用于ADB扫描码(OSX内部键码).
+`usb_2_adb_keymap` 数组实现了从 Keyboard/Keypad 页到 ADB 扫描码（OSX内部使用的键码）的转换。
 
 https://opensource.apple.com/source/IOHIDFamily/IOHIDFamily-606.1.7/IOHIDFamily/Cosmo_USB2ADB.c
 
-`IOHIDConsumer::dispatchConsumerEvent`会处理用户页面用法。
-<!--翻译问题：上面那两句翻译的不好-> handles Consumer page usages. -->
+以及 `IOHIDConsumer::dispatchConsumerEvent` 负责处理用户页部分。
+
 https://opensource.apple.com/source/IOHIDFamily/IOHIDFamily-606.1.7/IOHIDFamily/IOHIDConsumer.cpp
 
 
-## Mac OSX中的JIS键
-岛国特别键比如`無変換(Muhenkan)`, `変換(Henkan)`, `ひらがな(hiragana)`OSX是不是别的。You can use **Seil** to enable those keys, try following options.
-<!--翻译问题：以上“岛国特别键”没有任何地域歧视的意思 -->
-* 在电脑键盘上使能NFER键
-* 在电脑键盘上使能XFER键
-* 在电脑键盘上使能KATAKAN键
+## Mac OSX下的JIS键
+日语体系的JIS键盘有些特殊键码：`無変換(Muhenkan)`, `変換(Henkan)`, `ひらがな(hiragana)` 在OSX下无法被识别，可以尝试通过以下配置借助 **Seil** 来启用这些键。
+
+* 在PC键盘中启用NFER键
+* 在PC键盘中启用XFER键
+* 在PC键盘中启用KATAKANA键
 
 https://pqrs.org/osx/karabiner/seil.html
 
 
-## RN-42蓝牙模块与Karabiner不能有效协同工作
-Karabiner - Mac OSX的改键软件 - 默认RN-42模块是不会被响应的。想要Karabiner和你的键盘协同工作你要使能此选项：
-https://github.com/tekezo/Karabiner/issues/403#issuecomment-102559237
-
-此问题详见下方链接。
+## RN-42蓝牙模块与Karabiner的兼容性问题
+Karabiner - Mac OSX系统下的键映射工具 - 默认会忽略RN-42模块的输入事件。须在Karabiner开启相关选项来支持你的键盘。
+https://github.com/tekezo/Karabiner/issues/403#issuecomment-102559230
+这个问题的其它详细信息参见
 https://github.com/tmk/tmk_keyboard/issues/213
 https://github.com/tekezo/Karabiner/issues/403
 
 
-## Esc 和 <code>&#96;</code> 双功能键
+## Esc和<code>&#96;</code>位于同一个键位
 
-请见[Grave Escape](feature_grave_esc.md)功能。
+参见[Grave Escape](zh-cn/feature_grave_esc.md)功能.
 
-## Mac OSX的弹出键
-`KC_EJCT` 键码在OSX可以使用 https://github.com/tmk/tmk_keyboard/issues/250
-似乎Windows10会忽略该键码，Linux/Xorg可以识别该键码但默认不映射。
+## Mac OSX下的弹出功能
+`KC_EJCT` 在OSX下可用。 https://github.com/tmk/tmk_keyboard/issues/250
+Windows 10应该是忽略了这个键码，Linux/Xorg能识别到，但默认没有映射处理。
 
-目前尚不清楚如何在真正的苹果键盘按出弹出键。HHKB使用`F20`用于弹出键(`Fn+f`)，该功能在MAC模式有效但不保证与苹果弹出键码相符。
+目前尚不清楚Apple键盘上弹出键到底是啥，HHKB在Mac模式下使用 `F20` 来作为弹出键（`Fn+f`），但应该和Apple的弹出键码不是一回事儿。
 
+## 在 `action_util.c` 中的 `weak_mods` 和 `real_mods` 是什么东西？
+___待完善的内容___
 
-## `action_util.c`中的 `weak_mods`和`real_mods`是什么
-___待改善___
+real_mods保存的是现实的/物理上的修饰键状态，而weak_mods保存的是虚拟的或临时的修饰键状态，且不应该影响到真实的修饰键的状态。
 
-real_mods 用于保存实际(物理)修改键的实际状态。
-weak_mods 用于保存虚拟或临时修改键，它将不会影响实际修改键。
+例如你按住了物理键盘上的左shift键，又输入了 ACTION_MODS_KEY(LSHIFT, KC_A)，
 
-以按下左侧Shift键然后输入ACTION_MODS_KEY(LSHIFT, KC_A)为例，
+在weak_mods下,
+* (1) 按住左shift: real_mods |= MOD_BIT(LSHIFT)
+* (2) 按下 ACTION_MODS_KEY(LSHIFT, KC_A): weak_mods |= MOD_BIT(LSHIFT)
+* (3) 松开 ACTION_MODS_KEY(LSHIFT, KC_A): weak_mods &= ~MOD_BIT(LSHIFT)
+real_mods依然保留着修饰键的状态值。
 
-在weak_mods时，
-* (1) 按下不抬起左Shift: real_mods |= MOD_BIT(LSHIFT)
-* (2) 按 ACTION_MODS_KEY(LSHIFT, KC_A): weak_mods |= MOD_BIT(LSHIFT)
-* (3) 抬起 ACTION_MODS_KEY(LSHIFT, KC_A): weak_mods &= ~MOD_BIT(LSHIFT)
-real_mods 还是保持在修改状态。
+非weak_mods时,
+* (1) 按住左shift: real_mods |= MOD_BIT(LSHIFT)
+* (2) 按下 ACTION_MODS_KEY(LSHIFT, KC_A): real_mods |= MOD_BIT(LSHIFT)
+* (3) 松开 ACTION_MODS_KEY(LSHIFT, KC_A): real_mods &= ~MOD_BIT(LSHIFT)
+这时real_mods失去了‘物理键左shift’的状态值。
 
-在没有weak_mods时，
-* (1) 按下不抬起左Shift: real_mods |= MOD_BIT(LSHIFT)
-* (2) 按 ACTION_MODS_KEY(LSHIFT, KC_A): real_mods |= MOD_BIT(LSHIFT)
-* (3) 抬起 ACTION_MODS_KEY(LSHIFT, KC_A): real_mods &= ~MOD_BIT(LSHIFT)
-此时real_mods失去‘实际左Shift’的状态。
-
-weak_mods和real_mods现已全部加入键盘数据包发送豪华套餐。
+在键盘事件发送时，weak_mods会与real_mods求逻辑或。
 https://github.com/tmk/tmk_core/blob/master/common/action_util.c#L57
diff --git a/docs/zh-cn/faq_misc.md b/docs/zh-cn/faq_misc.md
new file mode 100644
index 0000000000..d01caba3be
--- /dev/null
+++ b/docs/zh-cn/faq_misc.md
@@ -0,0 +1,108 @@
+# 其它 FAQ
+
+<!---
+  original document: 0.15.12:docs/faq_misc.md
+  git diff 0.15.12 HEAD -- docs/faq_misc.md | cat
+-->
+
+## 怎么对键盘进行测试？ :id=testing
+
+测试键盘就简单直接，把每个按键按一遍后确认发送的是正确的就行。也可以使用[QMK配置器](https://config.qmk.fm/#/test/)的测试模式检查键盘，即便这键盘没有运行着QMK。
+
+## 安全措施
+
+你应该不想见到键盘变砖，变得不能再刷写固件。这里给出了一些非常危险（或相反不太危险）的因素。
+
+- 如果你的键盘没有RESET键，在你需要进入DFU模式时，不得不需要用螺丝刀打开后盖去按PCB上的RESET键。
+- 把 tmk_core/common 下的文件搞乱的话，容易导致键盘无法使用
+- .hex文件太大的话也会引起问题。`make dfu` 会先擦除存储块，再检查固件大小（哎呀，顺序错了），此时发现错误进而导致刷写失败，键盘停留在DFU模式下。
+  - 因此，请留意.hex文件尺寸有大小限制，例如在Planck上是十六进制7000（十进制的28672）
+
+```
+Linking: .build/planck_rev4_cbbrowne.elf                                                            [OK]
+Creating load file for Flash: .build/planck_rev4_cbbrowne.hex                                       [OK]
+
+Size after:
+   text    data     bss     dec     hex filename
+      0   22396       0   22396    577c planck_rev4_cbbrowne.hex
+```
+
+  - 上面的文件大小是22396/577ch, 小于28672/7000h
+  - 任何合适的其它.hex文件，都可以尝试加载
+  - 在键盘的Makefile中你添加的一些配置也会额外占用空间，在使用BOOTMAGIC_ENABLE,
+    MOUSEKEY_ENABLE, EXTRAKEY_ENABLE, CONSOLE_ENABLE, API_SYSEX_ENABLE
+    时请留意
+- DFU工具/不会/允许bootloader被覆写（除非你往DFU工具上塞自己的东西），这个风险不大。
+- EEPROM的写循环一般是 100000（100k）次，不应不停地持续重复地刷写固件，不然很快就烧毁了。
+
+## NKRO 不好使
+首先请确保在编译固件时有在**Makefile**中启用 `NKRO_ENABLE`
+
+如果依旧不行，尝试一下 `Magic` **N** 指令（默认是左Shift+右Shift+N），这个指令可以让键盘在**NKRO**和**6KRO**模式间临时切换。有的场景下**NKRO**无法工作必须切换到**6KRO**模式，比如在BIOS中操作时。
+
+如果你的固件编译时指定了 `BOOTMAGIC_ENABLE` ，则需要使用 `BootMagic`**N** 指令（默认是空格+N）。这个配置保存在EEPROM中，断电也会留存。
+
+https://github.com/tmk/tmk_keyboard#boot-magic-configuration---virtual-dip-switch
+
+
+## 轨迹球需要复位电路 (PS/2鼠标支持)
+缺失复位电路的情况下，由于不正确的硬件初始化，可能会导致设备不稳定，具体请参阅TPM754的电路原理图：
+
+- https://geekhack.org/index.php?topic=50176.msg1127447#msg1127447
+- https://www.mikrocontroller.net/attachment/52583/tpm754.pdf
+
+
+## 无法读到大于16的矩阵列
+当列数大于16时，在 [matrix.h] 中的 `read_cols()` 中请用 `1UL<<16` 替代 `1<<16`。
+
+在C语言中，对于AVR上的 `1`，会被视作一种[16位]的[整形(int)]类型，因此无法左移超过15位。因此 `1<<16` 的计算结果会错误地变成0。解决办法就是将类型改为[无符号长整形(unsigned long)]类型的 `1UL`。
+
+https://deskthority.net/workshop-f7/rebuilding-and-redesigning-a-classic-thinkpad-keyboard-t6181-60.html#p146279
+
+## 有些额外的按键不好使（系统，音频控制键）
+在QMK的 `rules.mk` 中须定义 `EXTRAKEY_ENABLE`
+
+```
+EXTRAKEY_ENABLE = yes          # 音频及系统控制
+```
+
+## 无法从休眠唤醒
+
+在Windows的**电源管理**的**设备管理**中，检查 `允许该设备唤醒计算机` 选项，同时检查一下BIOS中的相关设置，任意一个按键都应该能将计算机从休眠状态唤醒。
+
+## 在使用Arduino?
+
+**注意Arduino的引脚编号与芯片的引脚编号是不同的**。例如，Arduino的 `D0` 引脚并不是 `PD0`，请对照其电路图检查电路。
+
+- https://arduino.cc/en/uploads/Main/arduino-leonardo-schematic_3b.pdf
+- https://arduino.cc/en/uploads/Main/arduino-micro-schematic.pdf
+
+Arduino Leonardo 以及 micro 使用的是**ATMega32U4**因此可以用TMK，但bootloader可能会是个麻烦的问题。
+
+## 启用JTAG
+
+默认情况下，键盘启动后JTAG调试接口就被禁用了。支持JTAG的MCU出场时会带着 `JTAGEN` 保险丝，而键盘因为需要这部分MCU的引脚去控制开关矩阵、LED等功能。
+
+如果你希望启用JTAG，在 `config.h` 中添加定义：
+
+```c
+#define NO_JTAG_DISABLE
+```
+
+## USB 3兼容性问题
+将设备从USB 3.x端口改插到USB 2.0端口能解决一些问题。
+
+
+## Mac相关兼容性问题
+### OS X 10.11 和 Hub
+参见: https://geekhack.org/index.php?topic=14290.msg1884034#msg1884034
+
+
+## BIOS (UEFI) 配置/恢复 (休眠 & 唤醒)/电源循环
+有人反馈过他们的键盘在BIOS下或是从休眠状态唤醒后会不可用。
+
+目前这个问题的原因还不清楚，但一些编译选项应该和这个问题有关，你可以在Makefile中禁用 `CONSOLE_ENABLE`, `NKRO_ENABLE`, `SLEEP_LED_ENABLE` 或其他的试一试。
+
+更多信息：
+- https://github.com/tmk/tmk_keyboard/issues/266
+- https://geekhack.org/index.php?topic=41989.msg1967778#msg1967778
diff --git a/docs/zh-cn/feature_grave_esc.md b/docs/zh-cn/feature_grave_esc.md
new file mode 100644
index 0000000000..f57dabeaff
--- /dev/null
+++ b/docs/zh-cn/feature_grave_esc.md
@@ -0,0 +1,39 @@
+# Grave Escape
+
+<!---
+  original document: 0.15.12:docs/feature_grave_esc.md
+  git diff 0.15.12 HEAD -- docs/feature_grave_esc.md | cat
+-->
+
+*译注：Grave键即标准键盘中Tab键上方的 <code>&#96;</code> 键，该符号用于英法语等西语体系，辅助调整发音，中文中没有对应概念；Escape即Esc键*
+
+若你使用60%或其它没有Fn键配列的键盘，会留意到没有独立的Escape键。Grave Escape功能可以让Grave键(<code>&#96;</code>及`~`)与Escape共享一个按键
+
+## 使用方法
+
+在配列中使用 `KC_GESC` 替换 `KC_GRAVE` （一般都在`1`键左边）。默认点击会输出 `KC_ESC`，按下Shift或GUI键时，点击会输出 `KC_GRV`
+
+## 操作系统视角
+
+假如翠花按下GESC键，系统接收到的是KC_ESC字符。若翠花按住Shift再按下GESC，将输出 `~` 或是反引号。若翠花按住GUI/CMD/Win键，将仅输出<code>&#96;</code>字符
+
+## 键码
+
+|键       |别名       |描述                                                               |
+|---------|-----------|------------------------------------------------------------------|
+|`KC_GESC`|`GRAVE_ESC`|单击输出Escape, 按住Shift或GUI时输出<code>&#96;</code>               |
+
+### 须留意
+
+在macOS上 Command+<code>&#96;</code>默认行为是“移动焦点到下一个窗口”，因此不会输出反引号。另外，即便在键盘配置中更改过快捷键，终端程序(Terminal)也通常会将这个操作视为循环切换窗口
+
+## 配置
+
+有几种键组合可以变更这种行为，如Windows下的Control+Shift+Escape、macOS下的Command+Option+Escape。若要调整，可以在 `config.h` 中通过 `#define` 配置
+
+|定义                      |描述                                      |
+|--------------------------|-----------------------------------------|
+|`GRAVE_ESC_ALT_OVERRIDE`  |按住Alt时输出Escape                       |
+|`GRAVE_ESC_CTRL_OVERRIDE` |按住Control时输出Escape                   |
+|`GRAVE_ESC_GUI_OVERRIDE`  |按住GUI时输出Escape                       |
+|`GRAVE_ESC_SHIFT_OVERRIDE`|按住Shift时输出Escape                     |
diff --git a/docs/zh-cn/feature_space_cadet.md b/docs/zh-cn/feature_space_cadet.md
new file mode 100644
index 0000000000..e3dab9c727
--- /dev/null
+++ b/docs/zh-cn/feature_space_cadet.md
@@ -0,0 +1,70 @@
+# Space Cadet: The Future, Built In
+<!-- Deliberately not translated, leave it to a suitable translation -->
+
+<!---
+  original document: 0.15.12:docs/feature_space_cadet.md
+  git diff 0.15.12 HEAD -- docs/feature_space_cadet.md | cat
+-->
+
+*译注：Space Cadet来源于(在西方早期程序员中)著名的键盘Space Cadet Keyboard，具体信息参见下面的链接或[维基百科](https://en.wikipedia.org/wiki/Space-cadet_keyboard)*
+
+Steve Losh 在 [Space Cadet Shift](https://stevelosh.com/blog/2012/10/a-modern-space-cadet/) 详细地描述了该功能. 简而言之，点击左Shift时，会输出左括号；点击右Shift时，会输出右括号。如果按住Shift键，常规的Shift将正常工作。这功能实际上和听起来的一样爽，更爽的是现在连Control和Alt也支持！
+
+## 使用指南
+
+首先，在你的配列中完成以下任一项：
+- 替换左Shift为 `KC_LSPO`（左Shift，左括号），替换右Shift为 `KC_RSPC`（右Shift，右括号）。
+- 替换左Control为 `KC_LCPO`（左Control，左括号），替换右Control为 `KC_RCPC`（右Control，右括号）。
+- 替换左Alt为 `KC_LAPO`（左Alt，左括号），替换右Alt为 `KC_RAPC`（右Alt，右括号）。
+- 替换任意一个Shift为 `KC_SFTENT`（右Shift，回车）。
+
+## 键码
+
+|键码       |描述                          |
+|-----------|-----------------------------|
+|`KC_LSPO`  |按住时左Shift，点击时 `(`      |
+|`KC_RSPC`  |按住时右Shift，点击时 `)`      |
+|`KC_LCPO`  |按住时左Control，点击时 `(`    |
+|`KC_RCPC`  |按住时右Control，点击时 `)`    |
+|`KC_LAPO`  |按住时左Alt，点击时 `(`        |
+|`KC_RAPC`  |按住时右Alt，点击时 `)`        |
+|`KC_SFTENT`|按住时右Shift，点击时回车       |
+
+## 须留意
+
+同时按下两边的Shift键时会与Space Cadet功能冲突。请参见[指令功能](zh-cn/feature_command.md)以了解如何解决，也可以在 `rules.mk` 中禁用指令：
+
+```make
+COMMAND_ENABLE = no
+```
+
+## 配置
+
+默认情况下Space Cadet假设键盘布局为US ANSI，如果你的布局使用不同的括号符，可以在 `config.h` 中重定义。可以修改修饰键点击时发送的字符，亦或阻止修饰键工作。这个新的配置项依次绑定了三个键码：按住或组合其它键使用时的修饰键；点击时发送的修饰键点击（`Tap Modifier`）（在 `KC_TRNS` 中没有修饰键时）；最后是点击时发送的键码。请记住，例如'KC_RSFT'按住时点击 `KC_KSPO` 及 `KC_TRNS` 时，修饰键依旧会对键码生效，即属于修饰键点击。
+
+|定义             |默认值                          |描述                                                            |
+|----------------|-------------------------------|----------------------------------------------------------------|
+|`LSPO_KEYS`     |`KC_LSFT, LSPO_MOD, LSPO_KEY`  |按住时发送`KC_LSFT`，点击时发送 `LSPO_MOD` 及 `LSPO_KEY` 定义的键码. |
+|`RSPC_KEYS`     |`KC_RSFT, RSPC_MOD, RSPC_KEY`  |按住时发送`KC_RSFT`，点击时发送 `RSPC_MOD` 及 `RSPC_KEY` 定义的键码. |
+|`LCPO_KEYS`     |`KC_LCTL, KC_LSFT, KC_9`       |按住时发送`KC_LCTL`，点击时发送 `KC_LSFT` 及 `KC_9`.                |
+|`RCPC_KEYS`     |`KC_RCTL, KC_RSFT, KC_0`       |按住时发送`KC_RCTL`，点击时发送 `KC_RSFT` 及 `KC_0`.                |
+|`LAPO_KEYS`     |`KC_LALT, KC_LSFT, KC_9`       |按住时发送`KC_LALT`，点击时发送 `KC_LSFT` 及 `KC_9`.                |
+|`RAPC_KEYS`     |`KC_RALT, KC_RSFT, KC_0`       |按住时发送`KC_RALT`，点击时发送 `KC_RSFT` 及 `KC_0`.                |
+|`SFTENT_KEYS`   |`KC_RSFT, KC_TRNS, SFTENT_KEY` |按住时发送`KC_RSFT`，点击时发送 `SFTENT_KEY`.                       |
+|`SPACE_CADET_MODIFIER_CARRYOVER`   |*未定义*     |在尝试触发其它修饰键的修饰键点击前，暂存目前的修饰键。这在尝试触发Space Cadet前频繁发生修饰键提前松开时会有用。(译注[^1]) |
+
+
+## 过时的配置项
+
+以下是一些内部用于向后兼容的定义，目前仍可以使用，但上面的定义适用性要强得多。例如，若你点击 `KC_LSPO` 时不想按住修饰键，在旧定义中只有一个办法，使用 `DISABLE_SPACE_CADET_MODIFIER`。但现在可以定义为：`#define LSPO_KEYS KC_LSFT, KC_TRNS, KC_9`，效果是在按住按键时触发左Shift，点击则发送 `KC_9`。
+
+|定义                           |默认值        |描述                                 |
+|------------------------------|-------------|-------------------------------------|
+|`LSPO_KEY`                    |`KC_9`       |点击左Shift时发送的键码                |
+|`RSPC_KEY`                    |`KC_0`       |点击右Shift时发送的键码                |
+|`LSPO_MOD`                    |`KC_LSFT`    |应用在 `LSPO_KEY` 上的修饰键           |
+|`RSPC_MOD`                    |`KC_RSFT`    |应用在 `RSPC_KEY` 上的修饰键           |
+|`SFTENT_KEY`                  |`KC_ENT`     |点击Shift时发送的键码                  |
+|`DISABLE_SPACE_CADET_MODIFIER`|*未定义*      |定义时将阻止修饰键应用在Space Cadet上   |
+
+[^1]这句实在是绕，不能确保翻译到位，请参考英文文档
diff --git a/docs/zh-cn/flashing.md b/docs/zh-cn/flashing.md
new file mode 100644
index 0000000000..da3ceefc32
--- /dev/null
+++ b/docs/zh-cn/flashing.md
@@ -0,0 +1,329 @@
+# 刷写指引及Bootloader资料
+
+<!---
+  original document: 0.15.12:docs/flashing.md
+  git diff 0.15.12 HEAD -- docs/flashing.md | cat
+-->
+
+用于键盘的bootloader有很多种，几乎每一种都在使用私有的刷写协议及工具。幸运的是，形如[QMK工具箱](https://github.com/qmk/qmk_toolbox/releases)这样的工程目标就是尽量支持这些工具，本文会探讨各种bootloader的差异，以及可用的刷写方案。
+
+针对基于AVR的键盘，QMK会自动检查所要刷写的 `.hex` 文件大小是否与在 `rules.mk` 中设置的 `BOOTLOADER` 值所匹配，同时会输出字节大小信息（及最大限制）。
+
+同时也可以使用CLI工具刷写键盘，执行：
+```
+$ qmk flash -kb <keyboard> -km <keymap>
+```
+更多信息参见文档[`qmk flash`](zh-cn/cli_commands.md#qmk-flash)。
+
+## Atmel DFU
+
+Atmel系列的DFU bootloader默认配备在所有USB AVR系列上（16/32U4RC除外），广泛用于一些PCB上具备私有集成电路模块（IC）的键盘上（老款OLKB、Clueboards等）。有些使用的是LUFA实现的DFU bootloader，或是QMK的分支版本（新款OLKB），后者对硬件功能进行了扩充加强。
+
+为保证对DFU bootloader的兼容性，请确保在 `rules.mk` 中存在如下部分内容（可选的值还有 `lufa-dfu` 或 `qmk-dfu`）：
+
+```make
+# 选择Bootloader
+BOOTLOADER = atmel-dfu
+```
+
+兼容的刷写工具：
+
+* [QMK工具箱](https://github.com/qmk/qmk_toolbox/releases)（推荐的图形化工具）
+* [dfu-programmer](https://github.com/dfu-programmer/dfu-programmer) / QMK中将构建目标设为 `:dfu`（推荐的命令行工具）
+
+刷写过程：
+
+1. 使用如下任一方式进入bootloader模式：
+    * 点击 `RESET` 键码
+    * 如果PCB上有 `RESET` 键，点击之
+    * 快速短接一下RST到GND
+2. 等待操作系统识别到设备
+3. 清空flash存储数据（如果使用QMK工具箱或CLI的 `make`会自动进行）
+4. 将.hex文件刷写进去
+5. 重置设备进入应用模式（如上，会自动进行）
+
+### QMK DFU
+
+QMK维护了[一个LUFA DFU bootloader的分支版本](https://github.com/qmk/lufa/tree/master/Bootloaders/DFU)，其可以进行一次矩阵扫描来退出bootloader进入应用模式，同时会让LED闪烁或蜂鸣器响一声。若要启用该功能，将以下定义添加到 `config.h`：
+
+```c
+#define QMK_ESC_OUTPUT F1  // COL pin if COL2ROW
+#define QMK_ESC_INPUT  D5  // ROW pin if COL2ROW
+// 可选:
+//#define QMK_LED E6
+//#define QMK_SPEAKER C6
+```
+目前来讲不推荐将 `QMK_ESC` 键设置成与[Bootmagic](zh-cn/feature_bootmagic.md)同一个键，否则按下该键时只会让MCU在bootloader模式上反复进出。
+
+制造商及型号字符串自动从 `config.h` 中获取，并会在型号后追加 " Bootloader"。
+
+要生成该bootloader，需指定 `bootloader` 构建目标，即 `make planck/rev4:default:bootloader`。要生成可部署到正式产品的.hex文件（同时包含QMK及bootloader），使用 `production` 构建目标，即 `make planck/rev4:default:production`。
+
+### `make` 构建目标
+
+* `:dfu`: 每5秒检测一次直到发现可用的DFU设备，然后进行固件刷写。
+* `:dfu-split-left` 和 `:dfu-split-right`: 同 `:dfu` 一样会刷写固件，但额外地会设置手性设置到EEPROM中，对于基于Elite-C的分体式键盘这是理想的方法。
+
+## Caterina
+
+Arduino及其仿制板使用[Caterina bootloader](https://github.com/arduino/ArduinoCore-avr/tree/master/bootloaders/caterina)或某种变体（使用Pro Micro或其仿制芯片、Pololu A-Star等构建的所有键盘），并基于虚拟串口使用AVR109协议进行通信。
+
+为确保对Caterina bootloader的兼容性，请添加如下代码块至 `rules.mk`：
+
+```make
+# 选择Bootloader
+BOOTLOADER = caterina
+```
+
+兼容的刷写工具：
+
+* [QMK工具箱](https://github.com/qmk/qmk_toolbox/releases) （推荐的图形化工具）
+* [avrdude](https://www.nongnu.org/avrdude/) QMK中须基于 `avr109` 编程器 / `:avrdude` 构建目标 （推荐的命令行工具）
+* [AVRDUDESS](https://github.com/zkemble/AVRDUDESS)
+
+刷写过程：
+
+1. 使用如下任一方式进入bootloader模式（进入该模式后只有7秒时间可以刷写；一些型号需要你在750ms内重置两次）：
+    * 点击 `RESET` 键码
+    * 如果PCB上有 `RESET` 键，点击之
+    * 快速短接一下RST到GND
+2. 等待操作系统识别到设备
+3. 将.hex文件刷写进去
+4. 等待设备自动重置
+
+### `make` 构建目标
+
+* `:avrdude`: 每5秒检测一次直到发现可用的Caterina设备（通过检测新COM端口），然后进行固件刷写。
+* `:avrdude-loop`: 同 `:avrdude` 一样刷写固件，但会在一个设备刷写完后再次尝试刷写。主要用于批量刷写设备。按 Ctrl+C 以终止循环检测。
+* `:avrdude-split-left` 和 `:avrdude-split-right`: 同 `:avrdude` 一样会刷写固件，但额外地会设置手性设置到EEPROM中，对于基于Pro Micro的分体式键盘这是理想的方法。
+
+## HalfKay
+
+HalfKay是一款由PJRC开发的超精简的bootloader，且呈现为HID设备（因此不需要额外的驱动），在所有的Teensys，即"the 2.0"，上已经预刷写过。该bootloader目前是闭源的，因此一旦覆写（即通过ISP刷入其它bootloader）掉，就无法复原了。
+
+为确保对Halfkay bootloader的兼容性，请添加如下代码块至 `rules.mk`：
+
+```make
+# 选择Bootloader
+BOOTLOADER = halfkay
+```
+
+兼容的刷写工具：
+
+* [QMK工具箱](https://github.com/qmk/qmk_toolbox/releases)（推荐的图形化工具）
+* [Teensy Loader Command Line](https://www.pjrc.com/teensy/loader_cli.html) / QMK中将构建目标设为 `:teensy`（推荐的命令行工具）
+* [Teensy Loader](https://www.pjrc.com/teensy/loader.html)
+
+刷写过程：
+
+1. 使用如下任一方式进入bootloader模式（进入该模式后只有7秒时间可以刷写）：
+    * 点击 `RESET` 键码
+    * 如果Teensy上或PCB上有 `RESET` 键，点击之
+    * 快速短接一下RST到GND
+2. 等待操作系统识别到设备
+3. 将.hex文件刷写进去
+4. 重置设备进入应用模式（可能会自动进行）
+
+## USBasploader
+
+USBasploader是一款来源于[Objective Development](https://www.obdev.at/products/vusb/usbasploader.html)的bootloader。它通过模拟出一个USBasp ISP编程器来运行V-USB以用于一些形如ATmega328P这样的“非USB AVR芯片”。
+
+为确保对USBasploader bootloader的兼容性，请添加如下代码块至 `rules.mk`：
+
+```make
+# 选择Bootloader
+BOOTLOADER = usbasploader
+```
+
+兼容的刷写工具：
+
+* [QMK工具箱](https://github.com/qmk/qmk_toolbox/releases)（推荐的图形化工具）
+* [avrdude](https://www.nongnu.org/avrdude/) QMK中须基于 `usbasp` 编程器 / `:usbasp` 构建目标（推荐的命令行工具）
+* [AVRDUDESS](https://github.com/zkemble/AVRDUDESS)
+
+刷写过程：
+
+1. 使用如下任一方式进入bootloader模式：
+    * 点击 `RESET` 键码
+    * 在按住 `BOOT` 按钮时，快速点击一下PCB上的 `RESET`
+2. 等待操作系统识别到设备
+3. 将.hex文件刷写进去
+4. 点击PCB上的 `RESET` 按钮或将RST短接至GND一下。
+
+## BootloadHID
+
+BootloadHID是一款用于AVR微控制器的bootloader，其呈现为HID输入设备，和HalkKay很像，因此在Windows下也无需安装驱动。
+
+为确保对bootloadHID bootloader的兼容性，请添加如下代码块至 `rules.mk`：
+
+```make
+# 选择Bootloader
+BOOTLOADER = bootloadhid
+```
+
+兼容的刷写工具：
+
+* [QMK工具箱](https://github.com/qmk/qmk_toolbox/releases)（推荐的图形化工具）
+* [bootloadHID CLI](https://www.obdev.at/products/vusb/bootloadhid.html) / QMK中将构建目标设为 `:bootloadhid`（推荐的命令行工具）
+* [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash)
+
+
+刷写过程：
+
+1. 使用如下任一方式进入bootloader模式：
+    * 点击 `RESET` 键码
+    * 在按住“盐键”（salt key）时插入键盘 - 在PS2AVRGB板上，通常在MCU的A0及B0引脚上有这个按键，否则请查看键盘的使用说明。
+2. 等待操作系统识别到设备
+3. 将.hex文件刷写进去
+4. 重置设备到应用模式（可能会自动进行）
+
+### QMK HID
+
+QMK维护了[一个LUFA HID bootloader的分支版本](https://github.com/qmk/lufa/tree/master/Bootloaders/HID)，通过USB HID节点设备进行刷写，工作模式类似于PJRC的Teensy Loader刷写器以及HalfKay bootloader。其可以进行一次矩阵扫描来退出bootloader进入应用模式，同时会让LED闪烁或蜂鸣器响一声。
+
+为确保对QMK HID bootloader的兼容性，请添加如下代码块至 `rules.mk`：
+
+```make
+# 选择Bootloader
+BOOTLOADER = qmk-hid
+```
+
+要启用额外的功能支持，请添加如下定义至 `config.h`：
+
+```c
+#define QMK_ESC_OUTPUT F1  // COL pin if COL2ROW
+#define QMK_ESC_INPUT  D5  // ROW pin if COL2ROW
+// 可选:
+//#define QMK_LED E6
+//#define QMK_SPEAKER C6
+```
+
+目前来讲不推荐将 `QMK_ESC` 键设置成与[Bootmagic Lite](zh-cn/feature_bootmagic.md)同一个键，否则按下该键时只会让MCU在bootloader模式上反复进出。
+
+制造商及型号字符串自动从 `config.h` 中获取，并会在型号后追加 " Bootloader"。
+
+要生成该bootloader，需指定 `bootloader` 构建目标，即 `make planck/rev4:default:bootloader`。要生成可部署到正式产品的.hex文件（同时包含QMK及bootloader），使用 `production` 构建目标，即 `make planck/rev4:default:production`。
+
+兼容的刷写工具：
+
+* TBD
+  * 目前只能选择使用该 [Python脚本](https://github.com/qmk/lufa/tree/master/Bootloaders/HID/HostLoaderApp_python), 或从LUFA仓库中构建[`hid_bootloader_cli`](https://github.com/qmk/lufa/tree/master/Bootloaders/HID/HostLoaderApp)。Homebrew也许（即将）能直接支持（通过 `brew install qmk/qmk/hid_bootloader_cli`）。
+
+刷写过程：
+
+1. 使用如下任一方式进入bootloader模式：
+    * 点击 `RESET` 键码
+    * 如果PCB上有 `RESET` 键，点击之
+    * 快速短接一下RST到GND
+2. 等待操作系统识别到设备
+4. 将.hex文件刷写进去
+5. 重置设备进入应用模式（可能会自动进行）
+
+### `make` 构建目标
+
+* `:qmk-hid`: 每5秒检测一次直到发现可用的DFU设备，然后进行固件刷写。
+
+## STM32/APM32 DFU
+
+所有的STM32及APM32 MCU系列，除F103型号外（参见[STM32duino小节](#stm32duino)）都在出场时预装了bootloader且无法修改或删除。
+
+为确保对STM32-DFU bootloader的兼容性，请添加如下代码块至 `rules.mk`（可选替代项为 `apm32-dfu`）：
+
+```make
+# 选择Bootloader
+BOOTLOADER = stm32-dfu
+```
+
+兼容的刷写工具：
+
+* [QMK工具箱](https://github.com/qmk/qmk_toolbox/releases) （推荐的图形化工具）
+* [dfu-util](https://dfu-util.sourceforge.net/) / QMK中将构建目标设为 `:dfu-util`（推荐的命令行工具）
+
+刷写过程：
+
+1. 使用如下任一方式进入bootloader模式（进入该模式后只有7秒时间可以刷写）：
+    * 点击 `RESET` 键码（对STM32F042设备可能无效）
+    * 如果有重置电路，点击PCB上的 `RESET` 键；有些主控板上可能会有一个开关需要先打开
+    * 否则，你需要将 `BOOT0` 接线到VCC（通过 `BOOT0` 按钮或跳线），短接 `RESET` 至GND（通过 `RESET` 按钮或条线），然后断开 `BOOT0` 的接线。
+2. 等待操作系统识别到设备
+3. 将.bin文件刷写进去
+4. 重置设备进入应用模式（可能会自动进行）
+
+### `make` 构建目标
+
+* `:dfu-util`: 每5秒检测一次直到发现可用的STM32 bootloader设备，然后进行固件刷写。
+* `:dfu-util-split-left` 和 `:dfu-util-split-right`: 同 `:avrdude` 一样会刷写固件，但额外地会设置手性设置到EEPROM中，对于基于Proton-C的分体式键盘这是理想的方法。
+* `:st-link-cli`: 通过ST-Link CLI工具集而非dfu-util进行刷写，需要有ST-Link电子狗。
+* `:st-flash`: 通过[STLink工具](https://github.com/stlink-org/stlink)内的 `st-flash` 工具而非dfu-util进行刷写，需要有ST-Link电子狗。
+
+## STM32duino :id=stm32duino
+
+该bootloader几乎是STM32F103板专用，该型号出厂不带USB DFU bootloader。其源代码及预编译好的二进制文件[在这里](https://github.com/rogerclarkmelbourne/STM32duino-bootloader)。
+
+为确保对STM32duino bootloader的兼容性，请添加如下代码块至 `rules.mk`：
+
+```make
+# 选择Bootloader
+BOOTLOADER = stm32duino
+```
+
+兼容的刷写工具：
+
+* [QMK工具箱](https://github.com/qmk/qmk_toolbox/releases) （推荐的图形化工具）
+* [dfu-util](https://dfu-util.sourceforge.net/) / QMK中将构建目标设为 `:dfu-util`（推荐的命令行工具）
+
+刷写过程：
+
+1. 使用如下任一方式进入bootloader模式（进入该模式后只有7秒时间可以刷写）：
+    * 点击 `RESET` 键码（对STM32F042设备可能无效）
+    * 如果有重置电路，点击PCB上的 `RESET` 键；有些主控板上可能会有一个开关需要先打开
+    * 否则，你需要将 `BOOT0` 接线到VCC（通过 `BOOT0` 按钮或跳线），短接 `RESET` 至GND（通过 `RESET` 按钮或条线），然后断开 `BOOT0` 的接线。
+2. 等待操作系统识别到设备
+3. 将.bin文件刷写进去
+4. 重置设备进入应用模式（可能会自动进行）
+
+## Kiibohd DFU
+
+Input Club出品的键盘使用NXP Kinetis微控制器而非STM32，并使用了独有的[自制bootloader](https://github.com/kiibohd/controller/tree/master/Bootloader)，然而处理器 及协议上两者大部分是一致的。
+
+在 `rules.mk` 中该bootloader的设置项为 `kiibohd`，但既然该bootloader仅用在Input Club主控板上，就不必要设置到键映射或是用户级<!--译：不清楚这里的“user level”是个啥……-->了。
+
+兼容的刷写工具：
+
+* [QMK工具箱](https://github.com/qmk/qmk_toolbox/releases)（推荐的图形化工具）
+* [dfu-util](https://dfu-util.sourceforge.net/) / QMK中将构建目标设为 `:dfu-util`（推荐的命令行工具）
+
+刷写过程：
+
+1. 使用如下任一方式进入bootloader模式：
+    * 点击 `RESET` 键码（有可能只能进入到“安全”bootloader模式，参见[这里](https://github.com/qmk/qmk_firmware/issues/6112)）
+    * 如果PCB上有 `RESET` 键，点击之
+2. 等待操作系统识别到设备
+3. 将.bin文件刷写进去
+4. 重置设备进入应用模式（可能会自动进行）
+
+## tinyuf2
+
+键盘可以考虑支持tinyuf2 bootloader，目前唯一支持的设备是F401/F411 blackpill。
+
+在 `rules.mk` 中该bootloader的设置项为 `tinyuf2`，也可指定到键映射及用户级中。
+
+为确保对tinyuf2 bootloader的兼容性，请添加如下代码块至 `rules.mk`：
+
+```make
+# 选择Bootloader
+BOOTLOADER = tinyuf2
+```
+
+兼容的刷写工具：
+
+* 任何具备文件拷贝能力的程序，如 _macOS Finder_ 或 _Windows Explorer_ *。
+
+刷写过程：
+
+1. 使用如下任一方式进入bootloader模式：
+    * 点击 `RESET` 键码
+    * 双击PCB上的 `nRST` 键
+2. 等待操作系统识别到设备
+3. 将.uf2文件拷贝到新出现的USB存储设备上
+4. 等待设备恢复可用状态
diff --git a/docs/zh-cn/flashing_bootloadhid.md b/docs/zh-cn/flashing_bootloadhid.md
new file mode 100644
index 0000000000..70139c1e12
--- /dev/null
+++ b/docs/zh-cn/flashing_bootloadhid.md
@@ -0,0 +1,75 @@
+# BootloadHID刷写指引及资料
+
+<!---
+  original document: 0.15.12:docs/flashing_bootloadhid.md
+  git diff 0.15.12 HEAD -- docs/flashing_bootloadhid.md | cat
+-->
+
+ps2avr(GB)基于一片ATmega32A微控制器及特殊的bootloader，无法使用常规的QMK方法进行刷写。
+
+常规刷写过程：
+
+1. 使用如下任一方式进入bootloader模式：
+    * 点击 `RESET` 键码（一些设备上不管用）
+    * 在按住“盐键”（salt key）时插入键盘（该键一般会在键盘使用说明上写明）
+2. 等待操作系统识别到设备
+3. 将.hex文件刷写进去
+4. 重置设备到应用模式（可能会自动进行）
+
+## 用于bootloadHID刷写的构建目标
+
+?> 使用QMK安装脚本，具体[参见这里](zh-cn/newbs_getting_started.md)，所需的bootloadHID工具应自动被安装上。
+
+若希望通过命令行进行刷写，通过如下命令指定 `:bootloadhid` 构建目标：
+
+    make <keyboard>:<keymap>:bootloadhid
+
+## 基于图形化界面的刷写方法
+
+### Windows
+1. 下载[HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash)
+2. 重置键盘
+3. 确认VID为 `16c0` 且PID为 `05df`
+4. 点击 `查找设备（Find Device）` 并确认目标键盘可见
+5. 点击 `打开.hex文件（Open .hex File）` 并定位到你创建的.hex文件
+6. 点击 `刷写设备（Flash Device）` 并等待刷写完毕
+
+## 在命令行中进行刷写
+
+1. 重置键盘 
+2. 通过输入 `bootloadHID -r` 并追加 `.hex` 文件的路径进行主控板的刷写
+
+### Windows系统上手动安装
+针对MSYS2:
+1. 下载BootloadHID固件包：https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.tar.gz
+2. 使用合适的工具解压，如7-Zip
+3. 将解压出的 `commandline/bootloadHID.exe` 拷贝至MSYS目录下，一般是 `C:\msys64\usr\bin`
+
+针对Windows本地环境刷写，`bootloadHID.exe` 可以直接在非MSYS2环境下执行。
+
+### Linux系统上手动安装
+1. 安装libusb开发依赖项：
+    ```bash
+    # 该操作具体取决于系统 - Debian下可以这样
+    sudo apt-get install libusb-dev
+    ```
+2. 下载BootloadHID固件包：
+    ```
+    wget https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.tar.gz -O - | tar -xz -C /tmp
+    ```
+3. 构建bootloadHID可执行程序：
+    ```
+    cd /tmp/bootloadHID.2012-12-08/commandline/
+    make
+    sudo cp bootloadHID /usr/local/bin
+    ```
+
+### MacOS系统上手动安装
+1. 执行以下命令安装Homebrew：
+    ```
+    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+    ```
+2. 安装以下包：
+    ```
+    brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
+    ```
diff --git a/docs/zh-cn/getting_started_docker.md b/docs/zh-cn/getting_started_docker.md
new file mode 100644
index 0000000000..038f17f9ac
--- /dev/null
+++ b/docs/zh-cn/getting_started_docker.md
@@ -0,0 +1,59 @@
+# Docker快速上手指引
+
+<!---
+  original document: 0.15.12:docs/getting_started_docker.md
+  git diff 0.15.12 HEAD -- docs/getting_started_docker.md | cat
+-->
+
+本工程包含了一套Docker工作流，可以方便地在不更改你主系统环境情况下完成新固件文件的构建工作。这同时也保证了在你拉取该工程代码后的编译环境与其他人以及QMK开发者的一致。当你需要其他人协助你排查遇到的问题时会方便很多。
+
+## 需求
+
+核心需求是一个已安装的可用的 `docker` 或 `podman`。
+* [Docker CE](https://docs.docker.com/install/#supported-platforms)
+* [Podman](https://podman.io/getting-started/installation)
+
+## 用法
+
+拉取QMK仓库到本地（包括所有的子模块）：
+
+```bash
+git clone --recurse-submodules https://github.com/qmk/qmk_firmware.git
+cd qmk_firmware
+```
+
+执行以下命令构建键映射：
+```bash
+util/docker_build.sh <keyboard>:<keymap>
+# 例: util/docker_build.sh planck/rev6:default
+```
+
+如上可以构建所需的键盘/键映射，可用于刷写的 `.hex` 及 `.bin` 输出文件存放在QMK目录下。如果省略了 `:keymap` 参数，所有的键映射都会被编译。留意编译参数格式与 `make` 构建时的一致。
+
+同时也支持直接从Docker中编译和刷写，只需要指定 `target`：
+
+```bash
+util/docker_build.sh keyboard:keymap:target
+# 例: util/docker_build.sh planck/rev6:default:flash
+```
+
+可以不带参数地执行该脚本，其会依次要求你输入这些参数，也许你会觉得这样更好用：
+
+```bash
+util/docker_build.sh
+# 从输入中读取参数 (留空则构建所有的键盘/键映射)
+```
+
+可以通过设置环境变量 `RUNTIME` 为想使用的容器运行时的名称或路径来指定运行时，默认其会检测并自动选取docker或podman，相比于podman会更倾向于用docker。
+
+```bash
+RUNTIME="podman" util/docker_build.sh keyboard:keymap:target
+```
+
+## FAQ
+
+### 为什么我无法在我的Windows/macOS下刷写固件
+
+在Windows及macOS上，需要有[Docker Machine](http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos/)运行着，配置过程很繁琐，因此我们没有做推荐。请考虑使用[QMK工具箱](https://github.com/qmk/qmk_toolbox)。
+
+!> Windows下需要启用[Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v)才能运行Docker，这也意味着它无法运行在没有Hyper-V的Windows版本下，如Windows 7，Windows 8及**Windows 10家庭版**。
diff --git a/docs/zh-cn/getting_started_getting_help.md b/docs/zh-cn/getting_started_getting_help.md
deleted file mode 100644
index 8c0ebaa243..0000000000
--- a/docs/zh-cn/getting_started_getting_help.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# 获得帮助
-
-有很多方法来获得关于QMK的帮助.
-
-## 实时聊天
-
-你可以在我们的主要[Discord服务器](https://discord.gg/Uq7gcHh)找到QMK的开发者和用户。有很多讨论固件的不同频道, 工具箱(Toolbox), 硬件,配置工具(configurator).
-
-## OLKB Subreddit
-
-QMK的官方论坛是[/r/olkb](https://reddit.com/r/olkb) 在[reddit.com](https://reddit.com)上.
-
-## GitHub的Issue
-
-你可以在GitHub上 [提出issue](https://github.com/qmk/qmk_firmware/issues).当您的问题需要长期讨论或调试时，这尤其方便。
diff --git a/docs/zh-cn/getting_started_github.md b/docs/zh-cn/getting_started_github.md
index b4e8e9fa5d..2a5ec8ca4f 100644
--- a/docs/zh-cn/getting_started_github.md
+++ b/docs/zh-cn/getting_started_github.md
@@ -1,6 +1,11 @@
 # 如何在QMK中使用GitHub
 
-GitHub can be a little tricky to those that aren't familiar with it - this guide will walk through each step of forking, cloning, and submitting a pull request with QMK.
+<!---
+  original document: 0.15.12:docs/getting_started_github.md
+  git diff 0.15.12 HEAD -- docs/getting_started_github.md | cat
+-->
+
+对不熟悉 GitHub 的人来说，使用GitHub 可能会有些难度。此教程会教您 fork 和 clone QMK，以及向 QMK 提交 pull request 。
 
 ?> 本教程假设您已安装GitHub，并且您喜欢使用命令行工作。
 
diff --git a/docs/zh-cn/getting_started_introduction.md b/docs/zh-cn/getting_started_introduction.md
index b977b63390..82d50355eb 100644
--- a/docs/zh-cn/getting_started_introduction.md
+++ b/docs/zh-cn/getting_started_introduction.md
@@ -1,5 +1,10 @@
 # 介绍
 
+<!---
+  original document: 0.15.12:docs/getting_started_introduction.md
+  git diff 0.15.12 HEAD -- docs/getting_started_introduction.md | cat
+-->
+
 本页解释了使用QMK项目所需的基本信息。它假定您能熟练使用Unix shell，但您不熟悉C语言也不熟悉使用make编译。
 
 ## 基本QMK结构
@@ -8,7 +13,7 @@ QMK是[Jun Wako](https://github.com/tmk)的[tmk_keyboard](https://github.com/tmk
 
 ### 用户空间结构
 
-在`users`文件夹里面的目录是每个用户的目录。这个文件夹里面放的是用户们在不同键盘都能用到的代码。详见[用户空间特性](feature_userspace.md) 
+在`users`文件夹里面的目录是每个用户的目录。这个文件夹里面放的是用户们在不同键盘都能用到的代码。详见[用户空间特性](zh-cn/feature_userspace.md) 
 
 ### 键盘项目结构
 
@@ -25,7 +30,7 @@ QMK是[Jun Wako](https://github.com/tmk)的[tmk_keyboard](https://github.com/tmk
 * `config.h`: 配置布局的选项
 * `keymap.c`: 布局的全部代码, 必要文件
 * `rules.mk`: 使能的QMK特性
-* `readme.md`:介绍你的布局,告诉别人怎么使用，附上功能说明。请将图片上传到imgur等图床（译者注：imgur可能已被墙，为了方便国人访问，建议使用国内可以直接访问的图床）。
+* `readme.md`:介绍你的布局,告诉别人怎么使用，附上功能说明。请将图片上传到imgur等图床（译注：imgur可能已被墙，为了方便国人访问，建议使用国内可以直接访问的图床）。
 
 # `config.h` 文件
 
diff --git a/docs/zh-cn/getting_started_vagrant.md b/docs/zh-cn/getting_started_vagrant.md
new file mode 100644
index 0000000000..5e5de44552
--- /dev/null
+++ b/docs/zh-cn/getting_started_vagrant.md
@@ -0,0 +1,61 @@
+# Vagrant快速上手指引
+
+<!---
+  original document: 0.15.12:docs/getting_started_vagrant.md
+  git diff 0.15.12 HEAD -- docs/getting_started_vagrant.md | cat
+-->
+
+本工程包含一份 `Vagrantfile`，可以方便地在不更改你系统环境情况下完成新固件文件的构建工作。这同时也保证了在你拉取该工程代码后的编译环境与也使用Vagrantfile的其它人的一致。当你需要其他人协助你排查遇到的问题时会方便很多。
+
+## 需求
+
+本工程中的 `Vagrantfile` 需要安装[Vagrant](https://www.vagrantup.com/)以及可用的虚拟机服务：
+
+* [VirtualBox](https://www.virtualbox.org/) (5.0.12及以后版本)
+  * 卖点是'最适用于Vagrant的平台'
+* [VMware Workstation](https://www.vmware.com/products/workstation) 及 [Vagrant VMware插件](https://www.vagrantup.com/vmware)
+  * （付费购买的）VMware插件需要在经过正版授权的VMware Workstation/Fusion上运行
+* [Docker](https://www.docker.com/)
+
+安装了Vagrant之后，在安装合适的虚拟机服务后可能需要重启机器。拉取本工程后在工程目录下执行 'vagrant up' 将启动一个包含了所有本工程所需工具的构建环境（虚拟机或是容器）。最后会有一个vagrant启动提示告知你一切正常就绪，否则你也可以参考一下下面的构建文档。
+
+## 刷写固件
+
+比较“简单”的方案是在你的宿主系统上借助以下工具刷写固件：
+
+* [QMK工具箱](https://github.com/qmk/qmk_toolbox) (推荐)
+* [Teensy Loader](https://www.pjrc.com/teensy/loader.html)
+
+如果你希望通过命令行进行编程工作，可以在Vagrantfile中取消掉['modifyvm']的注释以允许USB直通到Linux环境，既可以使用dfu-util/dfu-programmer之类的命令行工具进行编程工作，或是安装Teensy的命令行版本。
+
+## Vagrantfile概览
+开发环境被配置为运行QMK Docker镜像 `qmkfm/qmk_cli`，不仅让各系统下的功能预期一致，也是我们CI环境的镜像。
+
+## FAQ
+
+### 为什么我的VirtualBox环境会有问题？
+VirtualBox 5的某些版本与工程中Vagrantfile中指定的VirtualBox扩展存在兼容问题。如果你遇到了/vagrant挂载不成功的问题，请升级VirtualBox至5.0.12或更高版本。**或者，可以尝试执行如下命令：**
+
+```console
+vagrant plugin install vagrant-vbguest
+```
+
+### 如何移除一个现有环境？
+不再需要这个环境了是吗？在本工程目录下的任何位置，执行：
+
+```console
+vagrant destroy
+```
+
+### 如果我是想直接用Docker呢？
+想在不使用虚拟机技术的情况下也能使用Vagrant工作流？Vagrangfile已配置为允许绕过运行虚拟机，直接运行容器。通过如下方式执行命令可以强制使用Docker来启动环境：
+```console
+vagrant up --provider=docker
+```
+
+### 如何访问虚拟机环境而非Docker容器？
+通过如下方法跳过 `vagrant` 的用户初始化过程以在QMK构建镜像中直接执行：
+
+```console
+vagrant ssh -c 'sudo -i'
+```
diff --git a/docs/zh-cn/keymap.md b/docs/zh-cn/keymap.md
new file mode 100644
index 0000000000..b4433ed49f
--- /dev/null
+++ b/docs/zh-cn/keymap.md
@@ -0,0 +1,209 @@
+# 键映射总览
+
+<!---
+  original document: 0.15.12:docs/keymap.md
+  git diff 0.15.12 HEAD -- docs/keymap.md | cat
+-->
+
+QMK键映射定义在C源文件中，其数据结构上是一个容纳了数组的数组。外层数组容纳了各个层，内层各数组则为层内的键列表。基本所有键盘都通过定义 `LAYOUT()` 宏来创建该两级数组。
+
+
+## 键映射与配列 :id=keymap-and-layers
+在QMK中, **`const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS]`** 容纳了多个 **层**， 每个**层**下包含了由**16位**的**动作码**所组成的键映射信息。 最多可以定义**32个层**。
+
+对于常规键的定义，其**动作码**的高8位皆为0，低8位保存了USB HID中使用的各个键对应的**键码**。
+
+不同的层可以同时生效，层的编号从0至31，编号越高的层优先级越高。
+（译注：由于是ascii图，掺杂中文会导致排版错乱，各翻译标注在图下方。下同）
+
+    Keymap: 32 Layers                   Layer: action code matrix
+    -----------------                   ---------------------
+    stack of layers                     array_of_action_code[row][column]
+           ____________ precedence               _______________________
+          /           / | high                  / ESC / F1  / F2  / F3   ....
+      31 /___________// |                      /-----/-----/-----/-----
+      30 /___________// |                     / TAB /  Q  /  W  /  E   ....
+      29 /___________/  |                    /-----/-----/-----/-----
+       :   _:_:_:_:_:__ |               :   /LCtrl/  A  /  S  /  D   ....
+       :  / : : : : : / |               :  /  :     :     :     :
+       2 /___________// |               2 `--------------------------
+       1 /___________// |               1 `--------------------------
+       0 /___________/  V low           0 `--------------------------
+翻译：
+
+|原文                       |译文         |
+|--------------------------|-------------|
+|Keymap: 32 Layers         | 键映射：32个层|
+|stack of layers           | 层堆栈       |
+|precedence                | 优先级       |
+|high/low                  | 高/低        |
+|layer: action code matrix | 层：动作码矩阵|
+|row/column                | 行/列        |
+
+有时，键映射中存储的动作码在一些文档中也被称作键码，主要是由TMK沿袭而来的习惯。
+
+### 键映射的层状态 :id=keymap-layer-status
+
+键映射的层状态由两个32位参数决定：
+
+* **`default_layer_state`** 指向一个总是可用的键映射层（0-31）（即默认层）。
+* **`layer_state`** 每一位标记对应层的启用/停用状态。
+
+通常键映射中的'0'层为 `default_layer（默认层）`，其它层在启动时会被固件置为停用状态，不过这些可以通过 `config.h` 进行配置。当你换了一个按键布局时可用于更改 `default_layer`，比如从Qwerty布局切换到了Colemak布局。
+
+    Initial state of Keymap          Change base layout
+    -----------------------          ------------------
+
+      31                               31
+      30                               30
+      29                               29
+       :                                :
+       :                                :   ____________
+       2   ____________                 2  /           /
+       1  /           /              ,->1 /___________/
+    ,->0 /___________/               |  0
+    |                                |
+    `--- default_layer = 0           `--- default_layer = 1
+         layer_state   = 0x00000001       layer_state   = 0x00000002
+翻译：
+
+|原文                    |译文         |
+|-----------------------|-------------|
+|Initial state of Keymap| 键映射原始状态|
+|Change base layout     | 更改了基础层  |
+
+另外，可以通过修改 `layer_state` 做到其他层对基础层的覆盖，以实现诸如导航键、功能键（F1-F12）、多媒体键等特殊动作。
+
+    Overlay feature layer
+    ---------------------      bit|status
+           ____________        ---+------
+      31  /           /        31 |   0
+      30 /___________// -----> 30 |   1
+      29 /___________/  -----> 29 |   1
+       :                        : |   :
+       :   ____________         : |   :
+       2  /           /         2 |   0
+    ,->1 /___________/  ----->  1 |   1
+    |  0                        0 |   0
+    |                                 +
+    `--- default_layer = 1            |
+         layer_state   = 0x60000002 <-'
+
+
+
+### 层优先级及穿透
+须记住**层堆栈中更高的层有着更高的优先级**。固件会从最高的活跃层开始向下找键码，一旦固件在活跃层上找到了一个非 `KC_TRNS`（穿透）键码，就会停止查找，再往下的层级不会被查看。
+
+           ____________
+          /           /  <--- 较高的层
+         /  KC_TRNS  //
+        /___________//   <--- 较低的层 (KC_A)
+        /___________/
+    
+    这个场景中，较高层级中的非穿透键是可用的，如果定义为 `KC_TRNS`（及同等效果的），较低层级的键码 `KC_A` 将被采纳。
+
+**注意：** 在层中定义合法的穿透键的方法有：
+* `KC_TRANSPARENT`
+* `KC_TRNS`（别名）
+* `_______`（别名）
+
+这些键码允许在搜索非穿透键码时可以穿透当前层下落到更低层去。
+
+## `keymap.c` 文件解析
+
+本例中我们将深入到[Clueboard 66%的一款旧版的默认键映射](https://github.com/qmk/qmk_firmware/blob/ca01d94005f67ec4fa9528353481faa622d949ae/keyboards/clueboard/keymaps/default/keymap.c)方案中去。将该文件在另一个浏览器窗口中打开，以便对照本文进行同步阅览。
+
+在一个 `keymap.c` 文件中会有三个你可能会关心的部分：
+
+* [预定义](#definitions)
+* [层/键映射数据结构](#layers-and-keymaps)
+* [自定义函数](#custom-functions)，若有的话
+
+### 预定义
+
+文件头部可以看到：
+
+    #include QMK_KEYBOARD_H
+
+    // Helpful defines
+    // 译：便捷性的宏定义
+    #define GRAVE_MODS  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT)|MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI)|MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+     *  You can use _______ in place for KC_TRNS (transparent)   *
+     *  Or you can use XXXXXXX for KC_NO (NOOP)                  *
+     * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+    // 译：可以用 _______ 替代 KC_TRNS（穿透），用 XXXXXXX 替代 KC_NO (空操作)
+
+    // Each layer gets a name for readability.
+    // 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, and you can also skip them entirely
+    // and just use numbers.
+    // 译：每一层为了便于识别可以起一个名字，下划线没有实际意义 - 叫STUFF之类的也行的，
+    // 译：层名不需要都一样长，甚至不定义这些直接用层号也是可以的
+    #define _BL 0
+    #define _FL 1
+    #define _CL 2
+
+以上是一些便于编写键映射及自定义函数时可用的预定义，`GRAVE_MODS` 后续会用在自定义函数中，之后的 `_BL`, `_FL` 及 `_CL` 便于我们在代码中引用这些层。
+
+注：在一些更早的键映射文件中，你可能会发现一些形如 `_______` 或 `XXXXXXX` 的定义，这些可以分别代替 `KC_TRNS` 及 `KC_NO`，这样可以更清楚地分辨出各层中定义了哪些键的键值。现在这些定义是不需要的，因为我们默认已经提供了这些定义。
+
+### 层和键映射
+
+这个文件中最主要的部分是 `keymaps[]` 定义，这里须列出你的层以及层中的内容。这一部分应该以如下定义起始：
+
+    const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+之后是一个LAYOUT()宏组成的列表，一个LAYOUT()下定义了一个层中的键列表，一般你需要至少一个“基础层”（如QWERTY、Dvorak或Colemak），之后是在其之上的多个“功能”层。受限于对层的处理顺序，较低的层无法覆盖在较高的层上。
+
+QMK在 `keymaps[][MATRIX_ROWS][MATRIX_COLS]` 中保存着16位的动作码（有些时候也被称作键码），对于与常规键一致的键码，其高字节为0，低字节为USB HID 键盘所使用的键码值。
+
+> QMK的前身TMK中使用 `const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS]` 来存储8位的键码，一些键码被保留用于引用执行 `fn_actions[]` 数组中的特定功能。
+
+#### 基础层
+
+以下示例是Clueboard的基础层定义：
+
+      /* Keymap _BL: Base Layer (Default Layer)
+       */
+    [_BL] = LAYOUT(
+      F(0),    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_GRV,  KC_BSPC,          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_PGDN, \
+      KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,                             \
+      KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH,  KC_RO,    KC_RSFT,          KC_UP,            \
+      KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN,          KC_SPC,KC_SPC,                        KC_HENK,  KC_RALT,  KC_RCTL,  MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT),
+
+这里有一些值得留意的地方：
+
+* 站在C语言源代码的角度看，这只是一个数组，但我们掺杂了大量括号使得每个键可以在视觉上与物理设备对齐。
+* 常规的键盘扫描码以KC_起始，而那些“特殊”键则不是。
+* 最左上的键可以触发自定义函数0（`F(0)`）
+* "Fn"键定义为 `MO(_FL)`，当按住该键时会切换到 `_FL` 层。
+
+#### 功能覆盖层
+
+对于功能层，从代码角度讲与基础层没有任何区别。但在概念上讲，应该将其作为覆盖层而非替代层来定义。对大部分人来讲这个区别不重要，但当你构建越来越复杂的层结构时，其重要性会越来越凸显。
+
+    [_FL] = LAYOUT(
+      KC_GRV,  KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______, KC_DEL,           BL_STEP, \
+      _______, _______, _______,_______,_______,_______,_______,_______,KC_PSCR,KC_SLCK, KC_PAUS,  _______,  _______,  _______,                   _______, \
+      _______, _______, MO(_CL),_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,                           \
+      _______, _______, _______,_______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______,          KC_PGUP,         \
+      _______, _______, _______, _______,        _______,_______,                        _______,  _______,  _______,  MO(_FL), KC_HOME, KC_PGDN, KC_END),
+
+这里值得留意的有：
+
+* 我们使用 `_______` 定义来替代 `KC_TRNS`， 以便凸显在该层中有变化的那些键。
+* 对于这一层来讲，如果点击的是一个 `_______` 键，实际生效的将是其下的活跃层中的键。
+
+# 核心细节
+
+在阅读完本节后，你应该掌握了构建自己的键映射的基础能力，更多的资料请参见：
+
+* [键码](zh-cn/keycodes.md)
+* [键映射FAQ](zh-cn/faq_keymap.md)
+
+我们仍在优化这份文档，如果你有更好的优化建议，请[提交一份issue](https://github.com/qmk/qmk_firmware/issues/new)！
diff --git a/docs/zh-cn/mod_tap.md b/docs/zh-cn/mod_tap.md
new file mode 100644
index 0000000000..5bf18a1527
--- /dev/null
+++ b/docs/zh-cn/mod_tap.md
@@ -0,0 +1,143 @@
+# Mod-Tap
+
+<!---
+  original document: 0.15.12:docs/mod_tap.md
+  git diff 0.15.12 HEAD -- docs/mod_tap.md | cat
+-->
+
+Mod-Tap键 `MT(mod, kc)` 在按住时功能为修饰键，在点击时则是常规键码。举例来讲，可以设计出一个按键，当点击时发送Escape，按下时则作为Control或Shift
+
+修饰键码及`OSM()`将会被缀以`MOD_`前缀，而非`KC_`
+
+|修饰键码  |描述                                        |
+|----------|------------------------------------------|
+|`MOD_LCTL`|左Control                                 |
+|`MOD_LSFT`|左Shift                                   |
+|`MOD_LALT`|左Alt                                     |
+|`MOD_LGUI`|左GUI (Windows/Command/Meta键)          |
+|`MOD_RCTL`|右Control                                 |
+|`MOD_RSFT`|右Shift                                   |
+|`MOD_RALT`|右Alt (AltGr)                             |
+|`MOD_RGUI`|右GUI (Windows/Command/Meta键)          |
+|`MOD_HYPR`|Hyper (左Control, Shift, Alt 及 GUI同时按下)|
+|`MOD_MEH` |Meh (左Control, Shift, 及 Alt同时按下)      |
+
+可以通过逻辑或进行组合：
+
+```c
+MT(MOD_LCTL | MOD_LSFT, KC_ESC)
+```
+
+此时按住该键将触发左Control及左Shift，点击将发送Escape。
+
+为了方便配列，QMK已包含一些常见的Mod-Tap：
+
+|键          |别名                                                              |描述                                         |
+|------------|-----------------------------------------------------------------|---------------------------------------------|
+|`LCTL_T(kc)`|`CTL_T(kc)`                                                      |按住时为左Control，点击时为 `kc`                |
+|`LSFT_T(kc)`|`SFT_T(kc)`                                                      |按住时为左Shift，点击时为 `kc`                  |
+|`LALT_T(kc)`|`LOPT_T(kc)`, `ALT_T(kc)`, `OPT_T(kc)`                           |按住时为左Alt，点击时为 `kc`                    |
+|`LGUI_T(kc)`|`LCMD_T(kc)`, `LWIN_T(kc)`, `GUI_T(kc)`, `CMD_T(kc)`, `WIN_T(kc)`|按住时为左GUI，点击时为 `kc`                    |
+|`RCTL_T(kc)`|                                                                 |按住时为右 Control，点击时为 `kc`               |
+|`RSFT_T(kc)`|                                                                 |按住时为右 Shift，点击时为 `kc`                 |
+|`RALT_T(kc)`|`ROPT_T(kc)`, `ALGR_T(kc)`                                       |按住时为右 Alt，点击时为 `kc`                   |
+|`RGUI_T(kc)`|`RCMD_T(kc)`, `RWIN_T(kc)`                                       |按住时为右 GUI，点击时为 `kc`                   |
+|`LSG_T(kc)` |`SGUI_T(kc)`, `SCMD_T(kc)`, `SWIN_T(kc)`                         |按住时为左Shift及GUI，点击时为 `kc`             |
+|`LAG_T(kc)` |                                                                 |按住时为左Alt及GUI，点击时为 `kc`               |
+|`RSG_T(kc)` |                                                                 |按住时为右 Shift及GUI，点击时为 `kc`            |
+|`RAG_T(kc)` |                                                                 |按住时为右 Alt及GUI，点击时为 `kc`              |
+|`LCA_T(kc)` |                                                                 |按住时为左Control及Alt，点击时为 `kc`           |
+|`LSA_T(kc)` |                                                                 |按住时为左Shift及Alt，点击时为 `kc`             |
+|`RSA_T(kc)` |`SAGR_T(kc)`                                                     |按住时为右 Shift及右 Alt (AltGr)，点击时为 `kc`  |
+|`RCS_T(kc)` |                                                                 |按住时为右 Control及右 Shift，点击时为 `kc`      |
+|`LCAG_T(kc)`|                                                                 |按住时为左Control，Alt及GUI，点击时为 `kc`       |
+|`RCAG_T(kc)`|                                                                 |按住时为右 Control，Alt及GUI，点击时为 `kc`      |
+|`C_S_T(kc)` |                                                                 |按住时为左Control及Shift，点击时为 `kc`          |
+|`MEH_T(kc)` |                                                                 |按住时为左Control，Shift及Alt，点击时为 `kc`     |
+|`HYPR_T(kc)`|`ALL_T(kc)`                                                      |按住时为左Control，Shift，Alt及GUI，点击时为 `kc` - 更多[参见这里](https://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/)|
+
+## 注意
+
+目前 `MT()` 的 `kc`参数限制在[基础键码集](zh-cn/keycodes_basic.md)中，因此不能使用 `LCTL()`，`KC_TILD` 及其它大于 `0xFF` 的键码。原因是，QMK使用16位的键码，其中3位是功能标记，1位标记左右修饰键，4位存储修饰键码，仅剩8位存储键码。当一次Mod-Tap触发时，只要有一个右修饰键被激发，其它的修饰键也都被视为右修饰键，因此无法混搭形如左Control+右Shift的形式，会被视为右Control+右Shift
+
+若展开讲就比较复杂了。迁移到32位的键码可以很大程度解决这个问题，但同时会招致配列矩阵大小翻倍，也可能会有其它未知问题。若是想用修饰键配合按键，可以考虑使用[Tap Dance/多击键](zh-cn/feature_tap_dance.md#example-5-using-tap-dance-for-advanced-mod-tap-and-layer-tap-keys)
+
+在使用Windows远程桌面时你可能会发现有些问题，这是因为远程桌面对键码响应过快。若要修复，可以打开远程桌面的“配置”，在“本地资源”页中的键盘属性，调整为“本地计算器”，此时功能即可恢复正常。另一个办法是加大[`TAP_CODE_DELAY`](zh-cn/config_options.md#behaviors-that-can-be-configured)。
+
+## 截获Mod-Taps
+
+### 改变点击功能
+
+若要在Mod-Tap中突破基础键码的限制，可以在 `process_record_user` 中实现。如，上档键码 `KC_DQUO` 无法与 `MT()` 共用，因为它实际上是 `LSFT(KC_QUOT)` 的别名，`KC_DQUO` 上的修饰键码会被 `MT()` 覆盖。但可以使用如下代码截获点击，手动发送 `KC_DQUO`：
+
+```c
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case LCTL_T(KC_DQUO):
+            if (record->tap.count && record->event.pressed) {
+                tap_code16(KC_DQUO); // 点击时发送 KC_DQUO
+                return false;        // 通过返回false阻止对该键的其它处理
+            }
+            break;
+    }
+    return true;
+}
+```
+
+### 改变按住功能
+
+类似地，同样可以使用这段自定义代码改变按住功能。下面的例子会在 `LT(0, kc)` （layer-tap键无实际意义，因为layer 0默认被激活）按住时对X，C和V键附加剪切，复制和粘贴功能：
+
+```c
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case LT(0,KC_X):
+            if (record->tap.count && record->event.pressed) {
+                return true;         // 返回true来发送常规键码
+            } else if (record->event.pressed) {
+                tap_code16(C(KC_X)); // 截获按住功能来发送Ctrl-X
+            }
+            return false;
+        case LT(0,KC_C):
+            if (record->tap.count && record->event.pressed) {
+                return true;         // 返回true来发送常规键码
+            } else if (record->event.pressed) {
+                tap_code16(C(KC_C)); // 截获按住功能来发送Ctrl-C
+            }
+            return false;
+        case LT(0,KC_V):
+            if (record->tap.count && record->event.pressed) {
+                return true;         // 返回true来发送常规键码
+            } else if (record->event.pressed) {
+                tap_code16(C(KC_V)); // 截获按住功能来发送Ctrl-V
+            }
+            return false;
+    }
+    return true;
+}
+```
+
+在数字及字母键上使用Mod-Tap时推荐启用 `IGNORE_MOD_TAP_INTERRUPT`，以避免在快速按下下一个键时保持功能优先级。参见[忽略Mod Tap中断](zh-cn/tap_hold.md#ignore-mod-tap-interrupt)。
+
+### 同时改变点击和按住功能
+
+最后一个例子通过 `LT(0,KC_NO)` 实现了点击复制，按住粘贴的功能：
+
+```c
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case LT(0,KC_NO):
+            if (record->tap.count && record->event.pressed) {
+                tap_code16(C(KC_C)); // 截获点击来发送Ctrl-C
+            } else if (record->event.pressed) {
+                tap_code16(C(KC_V)); // 截获按住功能来发送Ctrl-V
+            }
+            return false;
+    }
+    return true;
+}
+```
+
+## 其它信息
+
+在[点按配置](zh-cn/tap_hold.md)中描述了影响Mod-Tap行为的标记。
diff --git a/docs/zh-cn/newbs.md b/docs/zh-cn/newbs.md
index eca8c14e5f..3be4626211 100644
--- a/docs/zh-cn/newbs.md
+++ b/docs/zh-cn/newbs.md
@@ -1,23 +1,29 @@
-# QMK菜鸟教程
+# QMK入门教程
 
-QMK是为你机械硬盘设计的的一个强大的开源固件。使用QMK可以很简单的让你的定制键盘变得强大。看完这篇文章，无论你是菜鸟还是大佬，都可以顺利的使用QMK来定制键盘。
+<!---
+  original document: 0.15.12:docs/newbs.md
+  git diff 0.15.12 HEAD -- docs/newbs.md | cat
+-->
 
-你是否为不知道你的键盘能不能运行QMK而苦恼? 如果你的机械键盘是你自己做的，那么这把键盘一般可以运行QMK。我们提供了[一大堆自制键盘](https://qmk.fm/keyboards/), 所以即便你的键盘不能运行QMK你也很容易能找到满足你需求的键盘。
+就像计算机一样，每把键盘里也有一个处理器，它的职责是在你点击键盘时，检测到这个动作并反馈给计算机。QMK固件即是为了这个目的而设计的一种"软件"，负责检测点击，反馈给电脑。当你构建出一个自定义键映射时，就是在创建一个新的键盘"软件"。
 
-## 概览
+QMK的愿景是提供强有力的功能，让不可能的事情变得可能，简单的事情依旧简单。即便是不会编程也可以创建强大的键映射方案。
 
-这个教程有7个主要部分：
+想知道你的键盘是否能运行QMK？如果这个键盘是你自己组建的，那么很可能是可以的。我们[已经支持很多键盘](https://qmk.fm/keyboards/)，所以即便你的键盘不能运行QMK，你也很容易能买到满足要求的键盘。
 
-* [新手上路](newbs_getting_started.md)
-* [用命令行构建你的第一个固件](newbs_building_firmware.md)
-* [用在线界面构建你的第一个固件](newbs_building_firmware_configurator.md)
-* [刷新固件](newbs_flashing.md)
-* [测试和调试](newbs_testing_debugging.md)
-* [Git最佳实践](newbs_best_practices.md)
-* [其他学习资源](newbs_learn_more_resources.md)
+?> **这份指南适合于我吗？**<br>
+编程对你是个困难的话，可以看看我们的[在线GUI页面](zh-cn/newbs_building_firmware_configurator.md)。</div>
 
-这份教程旨在帮助没有固件构建经验的人，也是根据该目的做出选择和建议。这些程序有很多替代方法，大部分替代我们都支持。如果你对完成一个任务有疑问，可以[向我们寻求帮助](getting_started_getting_help.md).
+## 总览
 
-## 其他资源
+这份指南适用于想通过源代码编译出键盘固件的需求。对于程序员，全过程都会感觉很熟悉。教程主要分3部分：
 
-* [Thomas Baart的 QMK基础博客](https://thomasbaart.nl/category/mechanical-keyboards/firmware/qmk/qmk-basics/) – 这是一个用户创建的博客，涵盖了为新手准备的使用QMK的基础知识。
+1. [环境配置](zh-cn/newbs_getting_started.md)
+2. [构建第一个固件](zh-cn/newbs_building_firmware.md)
+3. [刷写固件](zh-cn/newbs_flashing.md)
+
+该指南的目的是帮助那些从未编译过软件的人，很多取舍及建议都是基于这个考量。完成一个目标可能有多种方案，我们尽量都去支持，如果你搞不明白你的目标如何实现，可以[向我们寻求帮助](zh-cn/support.md)。
+
+## 更多资料
+
+这份指南之外，也有一些其它能帮助你学习QMK的资料。我们归纳整理在[大纲](zh-cn/syllabus.md)页面和[学习资料](zh-cn/newbs_learn_more_resources.md)页面
diff --git a/docs/zh-cn/newbs_best_practices.md b/docs/zh-cn/newbs_best_practices.md
deleted file mode 100644
index fa58dc75e8..0000000000
--- a/docs/zh-cn/newbs_best_practices.md
+++ /dev/null
@@ -1,163 +0,0 @@
-# 最佳实践
-
-## 或者说, "我应如何学会不再担心并开始爱上Git。"
-
-本文档旨在指导新手以最佳方式获得为QMK做出贡献的丝滑体验。我们将介绍为QMK做出贡献的过程，详细介绍使这项任务更容易的一些方法，然后我们将制造一些问题，来教你如何解决它们。
-
-本文假设了一些内容:
-
-1. 一有个GitHub账户, 并[创建qmk_firmware仓库分叉](getting_started_github.md)到你的帐户.
-2. 你已经[建立你的构建环境](newbs_getting_started.md?id=environment-setup).
-
-
-## 你分叉的主分支: 一直在上传，但不要提交
-
-十分推荐您在QMK开发过程中无论开发是否完成都要保持你的 `master` 分支更新，但是 ***一定不要*** 提交。相反，你应该在一个开发分叉中做出你所有修改并在开发时提交pull request。
-
-减少合并冲突的可能性 &mdash; 两个或多个用户同时编辑文件的同一部分的实例 &mdash; 保持 `master` 分支最新，并创建一个新的分支来开始新的开发。
-
-### 更新你的主分支
-
-保持你的 `master` 更新, 推荐你添加QMK Firmware仓库作为Git的远程仓库，想这么做的话, 你可以打开你的Git命令行接口然后输入:
-
-```
-git remote add upstream https://github.com/qmk/qmk_firmware.git
-```
-
-运行 `git remote -v`, 来确定这个仓库已经添加，以下是回显:
-
-```
-$ git remote -v
-origin  https://github.com/<your_username>/qmk_firmware.git (fetch)
-origin  https://github.com/<your_username>/qmk_firmware.git (push)
-upstream        https://github.com/qmk/qmk_firmware.git (fetch)
-upstream        https://github.com/qmk/qmk_firmware.git (push)
-```
-
-现在添加已完成，你可以用`git fetch upstream`来检查仓库的更新. 这会检索branches 和 tags &mdash; 统称为"refs" &mdash; 从QMK仓库, 也就是 `upstream`。我们可以比较我们的分叉和QMK的 `origin` 数据的不同。
-
-要更新你的分叉的主分支，请运行以下命令，在每行之后按Enter键:
-
-```
-git checkout master
-git fetch upstream
-git pull upstream master
-git push origin master
-```
-
-这回切换到你的`master` 分支, 检索你QMK仓库的refs, 下载当前QMK `master` 分支到你的电脑, 并上传到你的分叉.
-
-### 做改动
-
-你可以输入以下命令来创建一个新的分支来做改动:
-
-```
-git checkout -b dev_branch
-git push --set-upstream origin dev_branch
-```
-
-这回建立一个叫做 `dev_branch`的新分支, 检查一下, 然后想你的分叉保存分支. 使用 `--set-upstream` 参数来告诉git使用你的分叉并且当每次你对你的分支用`git push` 或 `git pull`时要使用`dev_branch`。 它仅需要在第一次push的时候使用；然后你就可以很安全的用 `git push` 或 `git pull`, 并不需要其他参数了。
-
-!> 使用 `git push`, 你可以用 `-u` 来代替 `--set-upstream` &mdash; `-u`是`--set-upstream`的简写。
-
-您可以将您的分支命名为您想要的任何名称，但建议将其命名为与您要进行的更改相关的内容。
-
-默认情况下 `git checkout -b` 在已经检出的分支上建立新的分支。您可以将新的分支建立在未检出的现有分支的基础上，方法是将现有分支的名称添加到命令：
-
-```
-git checkout -b dev_branch master
-```
-
-现在您已经有了一个开发分支，那么就打开您的文本编辑器并进行您需要做的任何更改。建议对您的分支进行许多小的提交；这样，任何引起问题的更改都可以在需要时更容易地跟踪和撤消。要进行更改，编辑并保存任何需要更新的文件，请将它们添加到Git的 *staging area* ，然后将它们提交到您的分支：
-
-```
-git add path/to/updated_file
-git commit -m "My commit message."
-```
-
-` git add`添加已更改到Git的*临时区域*也就是Git的“加载区域”的文件。其中包含使用 `git commit` 命令 *提交* 的并已经保存到仓库的更改。建议您使用描述性的提交消息，这样您就可以一目了然地知道更改了什么。
-
-!> 如果你修改了很多文件，但所有的文件都是同一个更改的一部分，你可以用 `git add .` 来添加当前目录中所有已更改的文件而不是单独添加每个文件.
-
-### 发布更改
-
-最后一步是将更改推送到您的分叉。 输入 `git push`来推送. 现在Git将`dev_branch`的当前状态发布到您的分叉。
-
-
-## 解决合并冲突
-
-有时，当您在某个分支中的工作需要很长时间才能完成时，其他人所做的更改与您在打开pull request时对该分支所做的更改相冲突。这称为*rebase* 即合并冲突，当多个人编辑同一文件的同一部分时会发生这种情况。
-
-### 重新调整您的更改
-
-*rebase*是Git的一种方法，它获取在某一点上应用的更改，撤销它们，然后将相同的更改应用到另一点。在合并冲突的情况下，您可以重新设置您的分支以获取在创建分支时和当前时间之间的那段时间所做的更改。
-
-运行以下命令来开始：
-
-```
-git fetch upstream
-git rev-list --left-right --count HEAD...upstream/master
-```
-
- 这里的`git rev-list` 命令返回当前分支和qmk的主分支之间不同的提交数。我们首先运行`git fetch`，以确保我们有代表upstream仓库的refs。 `git rev-list` 命令的回显有两个数字：
-
-```
-$ git rev-list --left-right --count HEAD...upstream/master
-7       35
-```
-
-第一个数字表示自创建以来当前分支的提交数, 第二个数字是自创建当前分支以来对 `upstream/master` 进行的提交数, 因此, 当前分支中未记录变动。
-
-既然知道当前分支和upstream仓库的当前状态，我们可以开始一个rebase操作：
-
-```
-git rebase upstream/master
-```
-
-这就是让Git撤销当前分支上的提交，然后根据QMK的主分支重新应用它们。
-
-```
-$ git rebase upstream/master
-First, rewinding head to replay your work on top of it...
-Applying: Commit #1
-Using index info to reconstruct a base tree...
-M       conflicting_file_1.txt
-Falling back to patching base and 3-way merge...
-Auto-merging conflicting_file_1.txt
-CONFLICT (content): Merge conflict in conflicting_file_1.txt
-error: Failed to merge in the changes.
-hint: Use 'git am --show-current-patch' to see the failed patch
-Patch failed at 0001 Commit #1
-
-Resolve all conflicts manually, mark them as resolved with
-"git add/rm <conflicted_files>", then run "git rebase --continue".
-You can instead skip this commit: run "git rebase --skip".
-To abort and get back to the state before "git rebase", run "git rebase --abort".
-```
-
-这告诉我们有一个合并冲突，并给出带有冲突的文件的名称。在文本编辑器中打开冲突的文件，在该文件的某个位置，您会发现如下内容：
-
-```
-<<<<<<< HEAD
-<p>For help with any issues, email us at support@webhost.us.</p>
-=======
-<p>Need help? Email support@webhost.us.</p>
->>>>>>> Commit #1
-```
-
- `<<<<<<< HEAD`行标记合并冲突的开始, `>>>>>>> Commit #1` 行标记结束, 冲突选项被 `=======`分隔。`HEAD`那端的部分来自文件的qmk master版本，标记有commit消息的部分来自当前的分支持和提交。
-
-因为Git跟踪 *对文件的更改* 而不是直接跟踪文件的内容，所以如果Git在提交之前找不到文件中的文本，它将不知道如何编辑该文件。重新编辑文件将解决冲突。进行更改，然后保存文件。
-
-```
-<p>Need help? Email support@webhost.us.</p>
-```
-
-现在运行:
-
-```
-git add conflicting_file_1.txt
-git rebase --continue
-```
-
-Git记录对冲突文件的更改，并继续应用来自我们的分支的提交，直到它到达末尾。
diff --git a/docs/zh-cn/newbs_building_firmware.md b/docs/zh-cn/newbs_building_firmware.md
index fc43583c2b..681c7ba8f6 100644
--- a/docs/zh-cn/newbs_building_firmware.md
+++ b/docs/zh-cn/newbs_building_firmware.md
@@ -1,81 +1,68 @@
 # 构建第一个固件
 
-现在您已经建立了构建环境，就可以开始构建自定义固件了。对于本指南的这一部分，我们将在3个程序之间切换——文件管理器、文本编辑器和终端窗口。请保持所有3个程序打开，直到您完成并对键盘固件满意。
+<!---
+  original document: 0.15.12:docs/newbs_building_firmware.md
+  git diff 0.15.12 HEAD -- docs/newbs_building_firmware.md | cat
+-->
 
-如果您在按照指南第一部分的操作之后关闭并重新打开了终端窗口，请不要忘记输入“cd qmk_firmware”，来使您的终端位于正确的目录。
+现在您已经准备好了构建环境，就可以开始构建自定义固件了。在这节指南中，我们将在3个程序中开展工作——文件管理器、文本编辑器和终端。在做出心满意足的固件前，请不要关闭它们。
+## 新建键映射
 
-## 导航到您的keymaps文件夹
+也许你会考虑从默认键映射复制一份来开始，如果你遵循编译环境配置指南到了最后，那么使用QMK命令行可以简单地做到：
 
-首先导航到键盘的 `keymaps` 文件夹.
+    qmk new-keymap
 
-?> 如果您使用的是MacOS或Windows，可以使用以下命令轻松地打开keymaps文件夹。
+如果你的环境没有那样配置，或者你有多个键盘要做，可以指定键盘名：
 
-?> macOS:
+    qmk new-keymap -kb <keyboard_name>
 
-    open keyboards/<keyboard_folder>/keymaps
+检查命令行输出，应该类似于：
 
-?> Windows:
+    Ψ <github_username> keymap directory created in: /home/me/qmk_firmware/keyboards/clueboard/66/rev3/keymaps/<github_username>
 
-    start .\\keyboards\\<keyboard_folder>\\keymaps
+上面就是创建出的新 `keymap.c` 文件的路径。
 
-## 创建`default` 布局副本
+## 使用趁手的编辑器打开 `keymap.c`
 
-打开`keymaps`文件夹后，您将需要创建`default`文件夹的副本。我们强烈建议您将文件夹命名为与GitHub用户名相同的名称，但您也可以使用任何您想使用的名称，只要它只包含小写字母、数字和下划线字符。
-
-要自动执行此过程，您还可以选择运行`new_keymap.sh`脚本。
-
-导航到`qmk_firmware/util` 目录然后输入以下命令：
-
-```
-./new_keymap.sh <keyboard path> <username>
-```
-
-例如，一个名字叫ymzcdg的用户要创建1up60hse的布局，他需要输入
-
-```
-./new_keymap.sh 1upkeyboards/1up60hse ymzcdg
-```
-
-## 在你最钟爱的文本编辑器中打开`keymap.c`
-
-打开你的`keymap.c`. 在这个文件中，您可以找到控制键盘行为的结构。 在你的`keymap.c` 的顶部有一些让布局更易读的define和enum。在靠下的位置你会找到一行和下面这句很像的:
+在编辑器中打开 `keymap.c`，可以看到控制键盘所有功能的关键结构。`keymap.c` 文件头部的一些define和enum定义能让代码容易阅读一些，继续往下会找到这么一行：
 
     const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-从这一行开始便是层列表。这行下面你会看到包括 `LAYOUT` 或 `KEYMAP`这两个词的几行, 从这些行开始就是层。在这一行下面是组成该特定层的键的列表。
+这行是所有层定义的起点，往下能看到有 `LAYOUT` 的行，都是一个层定义的起始，其下方为该层的组成定义。
 
-!> 编辑您的keymap文件时，注意不要添加或删除任何逗号。如果这样做，您将阻止您的固件编译，并且您可能不容易找出多余的或缺少的逗号在哪里。
+!> 编辑时请非常留意不要错误增加/删除了逗号分隔符，否则很可能无法编译固件，且很难排查是哪里的逗号不对。
 
-## 根据您的喜好自定义布局
+## 按照个人喜好设计层级
 
-如何完成这一步骤完全取决于您。改变一直困扰着你的问题，或者完全重做所有的事情。如果您不需要全部图层，可以删除图层，或者将图层总数增加到32个。查看以下文档，了解可以在此处定义的内容:
+这一步的目标完全取决于你，既可以去修复一个你不爽的问题，也可以完全重写一个新的。你可以删除不需要的层，或是增加层到32个的上限，QMK功能丰富，可以在左边的导航栏中寻找“使用QMK”一节，浏览完整的功能信息，也可以看看这些比较简单的：
 
-* [键码](keycodes.md)
-* [特性](features.md)
-* [问题与解答](faq.md)
+* [基础键码](zh-cn/keycodes_basic.md)
+* [量子键码](zh-cn/quantum_keycodes.md)
+* [Grave/Escape](zh-cn/feature_grave_esc.md)
+* [鼠标键](zh-cn/feature_mouse_keys.md)
 
-?> 当你明白布局是怎么工作时，您也要让每次改变尽可能小。一次改变很大在调试时找出问题会十分困难。
+?> 你大概理解了键映射如何工作的话，留心尽量少去做改动，改动越多出了问题越难排查。
 
-## 构建你的固件
+## 构建固件 :id=build-your-firmware
 
-完成对布局的更改后，您就要构建固件了。为此，请返回终端窗口并运行build命令:
+对键映射做完修改后，该编译固件了。回到终端中使用编译命令：
 
-    make <my_keyboard>:<my_keymap>
+    qmk compile
 
-例如，如果您的keymap名为“xyverz”，并且您正在为rev5 planck构建一个keymap，那么您将使用此命令：
+如果没有完整地配置环境，或你有多个目标键盘，可以指定键盘及键映射：
 
-    make planck/rev5:xyverz
+    qmk compile -kb <keyboard> -km <keymap>
 
-在编译过程中，你将看到屏幕上有很多输出，通知您正在编译哪些文件他应该以与下文类似的输出结束:
+编译完成后，会输出详尽的编译产出文件信息，其末尾应该看起来像这样：
 
 ```
-Linking: .build/planck_rev5_xyverz.elf                                                              [OK]
-Creating load file for flashing: .build/planck_rev5_xyverz.hex                                      [OK]
-Copying planck_rev5_xyverz.hex to qmk_firmware folder                                               [OK]
-Checking file size of planck_rev5_xyverz.hex                                                        [OK]
- * File size is fine - 18392/28672
+Linking: .build/planck_rev5_default.elf                                                             [OK]
+Creating load file for flashing: .build/planck_rev5_default.hex                                     [OK]
+Copying planck_rev5_default.hex to qmk_firmware folder                                              [OK]
+Checking file size of planck_rev5_default.hex                                                       [OK]
+ * The firmware size is fine - 27312/28672 (95%, 1360 bytes free)
 ```
 
-## 刷新你的固件
+## 刷写固件
 
-请移步 [Flashing Firmware](newbs_flashing.md) 来继续。
+参阅[刷写固件](zh-cn/newbs_flashing.md)以了解如何将固件写入键盘主控。
diff --git a/docs/zh-cn/newbs_building_firmware_configurator.md b/docs/zh-cn/newbs_building_firmware_configurator.md
new file mode 100644
index 0000000000..c4cd114318
--- /dev/null
+++ b/docs/zh-cn/newbs_building_firmware_configurator.md
@@ -0,0 +1,18 @@
+# QMK配置器
+
+<!---
+  original document: 0.15.12:docs/newbs_building_firmware_configurator.md
+  git diff 0.15.12 HEAD -- docs/newbs_building_firmware_configurator.md | cat
+-->
+
+[![QMK配置器截图](https://i.imgur.com/anw9cOL.png)](https://config.qmk.fm/)
+
+[QMK配置器](https://config.qmk.fm)是一个可用于生成`.hex`和`.bin`格式的QMK固件文件的在线交互页面。
+
+这里有[视频教程](https://www.youtube.com/watch?v=-imgglzDMdY). 很多人给我们反馈该视频包含了足够多的知识可以用来开始编写自己的键盘程序。
+
+QMK配置器在Chrome及Firefox中工作良好。
+
+!> **来自于第三方工具的文件数据无法保证与QMK兼容，如Keyboard Layout Editor(KLE)或kbfirmware，请不要加载或导入这些文件。QMK配置器是一个独立的工具。**
+
+更多信息请参见[QMK配置器: 入门](zh-cn/configurator_step_by_step.md)。
diff --git a/docs/zh-cn/newbs_flashing.md b/docs/zh-cn/newbs_flashing.md
index 05a9eb55ee..9ffb792793 100644
--- a/docs/zh-cn/newbs_flashing.md
+++ b/docs/zh-cn/newbs_flashing.md
@@ -1,307 +1,124 @@
-# 刷新你的键盘 
+# 刷写键盘固件 
 
-现在您已经构建了一个自定义固件文件，那么您就需要刷新键盘了。
+<!---
+  original document: 0.15.12:docs/newbs_flashing.md
+  git diff 0.15.12 HEAD -- docs/newbs_flashing.md | cat
+-->
 
-## 用QMK工具箱刷新键盘
+在自定义的固件文件构建出来后，可以刷写到键盘中了。
 
-刷新键盘的最简单方法是使用[QMK 工具箱](https://github.com/qmk/qmk_toolbox/releases). 
+## 将键盘调至DFU（Bootloader）模式
 
-但是，QMK工具箱目前仅适用于Windows和MacOS。如果您使用的是Linux（或者只是希望从命令行刷新固件），则必须使用 [方法概述](newbs_flashing.md#flash-your-keyboard-from-the-command-line).
+在你将自定义固件刷写到键盘前，键盘必须处于特有的刷写模式下。此时，键盘会处于不会响应点击等常规操作的状态，并且一定留意不要打断刷写工作，刷写固件过程中不可以把键盘拔下来。
 
-### 将文件加载到QMK工具箱中
+不同的键盘进入刷写模式的方法都是不同的，如果你的键盘运行的是QMK、TMK或PS2AVRGB(Bootmapper客户端)且没有写明特别的操作说明的话，可以依次尝试以下操作：
 
-首先打开QMK工具箱应用程序。您将要在访达或资源管理器中找到固件文件。您的键盘固件可能是两种格式之一`.hex`或`.bin`。qmk会尝试将键盘的相应文件复制到“qmk_firmware”根目录中。
+* 按住两边的Shift键，点击Pause
+* 按住两边的Shift键，点击B
+* 拔出键盘，同时按住“空格”键及B键，再插上键盘，等两秒后松开
+* 拔出键盘，按住键盘左上或左下的按键（一般来讲是Escape或左Control），在插上键盘
+* 按重置按键（Reset），一般在PCB背面
+* 在PCB上寻找导出的 `RESET` 和 `GND` 引脚，在插电的情况下短接一下
 
-?> 如果您在Windows或MacOS上，可以使用以下命令轻松地在资源管理器或访达中打开当前固件文件夹。
+如果上面的方法没有用，且键盘主板上的芯片是 `STM32` 系列，情况要复杂一些。通常在[Discord](https://discord.gg/Uq7gcHh)上寻求帮助是最好的办法，并且很可能需要你提供一些键盘主板的照片 —— 所以如果你能提前准备好，我们沟通起来会快得多。
 
-?> Windows:
-
-    start .
-
-?> macOS:
-
-    open .
-
-固件文件始终遵循此命名格式:
-
-    <keyboard_name>_<keymap_name>.{bin,hex}
-
-例如，使用 `default` 布局的 `plank/rev5` 将使用以下名字：
-
-    planck_rev5_default.hex
-
-找到固件文件后，将其拖到QMK工具箱中的“Local file”框中，或单击“Open”并导航到固件文件的存储位置。
-
-### 将键盘置于DFU（Bootloader）模式
-
-要刷新自定义固件，您必须将键盘置于特殊的刷新模式。在此模式下，您将无法键入或使用键盘。在写入固件时，不要拔下键盘插头或以其他方式中断刷新过程，这一点非常重要。
-
-不同的键盘有不同的方式进入这种特殊模式。如果您的键盘当前运行的是QMK或TMK，而您没有得到特定的指示，请按顺序尝试以下操作:
-
-* 按住两个shift键并按 `Pause`
-* 按住两个shift键并按 `B`
-* 拔下键盘插头, 同时按住空格键和 `B` , 插上键盘然后等一会再放开按键
-* 按下PCB底部的 `RESET` 物理键
-* 找到PCB上标记有 `BOOT0` 或 `RESET`的金属点, 在插入PCB的同时短接它们
-
-成功后，您将在QMK工具箱中看到类似以下内容的消息:
+如果没有遇到什么问题，你会在QMK工具箱的输出信息里找到类似下面的黄色文字的信息：
 
 ```
-*** Clueboard - Clueboard 66% HotSwap disconnected -- 0xC1ED:0x2390
-*** DFU device connected
+*** DFU device connected: Atmel Corp. ATmega32U4 (03EB:2FF4:0000)
 ```
 
-### 刷新你的键盘
+已进入bootloader状态的设备也可以在设备管理器、系统信息或 `lsusb` 中看到。
 
-单击QMK工具箱中的 `Flash` 按钮。您将看到类似以下内容的输出:
+## 使用QMK工具箱刷写固件
+
+使用[QMK工具箱](https://github.com/qmk/qmk_toolbox/releases)刷写固件是最简单的方案。
+
+然而该工具箱仅支持Windows及macOS，如果你在使用Linux环境（或是希望用命令行刷写固件），请参阅[在命令行中刷写固件](#使用命令行刷写固件)一节。
+
+### 加载固件到QMK工具箱
+
+打开QMK工具箱，在Finder或文件管理器中找到固件文件。键盘固件文件名后缀通常是 `.hex` 或 `.bin`，QMK工具箱会尝试将正确的文件拷贝到qmk根目录 `qmk_firmware` 中。
+
+在Windows或macOS上，使用下面的指令可以快速打开当前目录。
+
+<!-- tabs:start -->
+
+#### ** Windows **
 
 ```
-*** Clueboard - Clueboard 66% HotSwap disconnected -- 0xC1ED:0x2390
-*** DFU device connected
+start .
+```
+
+#### ** macOS **
+
+```
+open .
+```
+
+<!-- tabs:end -->
+
+固件文件的文件名格式为：
+
+```
+<keyboard_name>_<keymap_name>.{bin,hex}
+<键盘名>_<键映射名>.{bin,hex}
+```
+
+例如， `planck/rev5` 的 `default` 键映射对应的文件名是：
+
+```
+planck_rev5_default.hex
+```
+
+找到固件文件后，将其拖拽至QMK工具箱的"Local file"框，或点击“Open”并定位至固件文件。
+
+### 刷写到键盘
+
+点击QMK工具箱的`Flash`，将看到如下输出信息：
+
+```
+*** DFU device connected: Atmel Corp. ATmega32U4 (03EB:2FF4:0000)
 *** Attempting to flash, please don't remove device
->>> dfu-programmer atmega32u4 erase --force
+>>> dfu-programmer.exe atmega32u4 erase --force
     Erasing flash...  Success
     Checking memory from 0x0 to 0x6FFF...  Empty.
->>> dfu-programmer atmega32u4 flash /Users/skully/qmk_firmware/clueboard_66_hotswap_gen1_skully.hex
-    Checking memory from 0x0 to 0x55FF...  Empty.
-    0%                            100%  Programming 0x5600 bytes...
+>>> dfu-programmer.exe atmega32u4 flash "D:\Git\qmk_firmware\gh60_satan_default.hex"
+    Checking memory from 0x0 to 0x3F7F...  Empty.
+    0%                            100%  Programming 0x3F80 bytes...
     [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
     0%                            100%  Reading 0x7000 bytes...
     [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
     Validating...  Success
-    0x5600 bytes written into 0x7000 bytes memory (76.79%).
->>> dfu-programmer atmega32u4 reset
+    0x3F80 bytes written into 0x7000 bytes memory (56.70%).
+>>> dfu-programmer.exe atmega32u4 reset
     
-*** DFU device disconnected
-*** Clueboard - Clueboard 66% HotSwap connected -- 0xC1ED:0x2390
+*** DFU device disconnected: Atmel Corp: ATmega32U4 (03EB:2FF4:0000)
 ```
 
-## 使用命令行刷新键盘
+## 使用命令行刷写固件
 
-首先，您需要知道您的键盘使用的是哪个bootloader。通常是以下四个常见的bootloader。Pro-Micro 和 clones 使用 CATERINA, Teensy 使用 Halfkay, OLKB 键盘使用 QMK-DFU, 其他的atmega32u4芯片使用DFU。
+现在已经没有以前那样繁琐了，在编译固件后需要刷写时，打开终端输入如下刷写指令：
 
-您可以在以下文章中了解更多关于bootloader[刷新指令和Bootloader信息](flashing.md)。 
+    qmk flash
 
-如果您知道正在使用的bootloader是哪种，那么在编译固件时，可以向“make”命令里添加一些额外参数，以自动执行刷新过程。
+如果未通过命令行工具配置过键盘/键映射名，或有多个目标键盘，可以指定目标键盘和键映射：
 
-### DFU
+    qmk flash -kb <键盘名> -km <键映射名>
 
-对于DFU引导加载程序，当您准备好编译和刷新固件时，打开终端窗口并运行构建命令: 
+QMK将核查键盘配置，并尝试使用合适的bootloader进行刷写。也就是说，你不用关注应该使用什么bootloader，这些重活儿让qmk指令去承担就好。
 
-    make <my_keyboard>:<my_keymap>:dfu
+但是，先决条件是键盘配置中已经设置了bootloader，如果未配置，或你的键盘板子不支持配置的刷写方式，你会看到这些错误信息：
 
-例如，如果您的布局名为“xyverz”，并且您正在为rev5 planck构建一个布局，那么您可以使用此命令：
+    WARNING: This board's bootloader is not specified or is not supported by the ":flash" target at this time.
 
-    make planck/rev5:xyverz:dfu
+此时，只能退回到需要指定bootloader的方法，具体参见[刷写固件](zh-cn/flashing.md)指引。
 
-编译完成后，应输出以下内容：
+## 上手试试键盘吧！
 
-```
-Linking: .build/planck_rev5_xyverz.elf                                                              [OK]
-Creating load file for flashing: .build/planck_rev5_xyverz.hex                                      [OK]
-Copying planck_rev5_xyverz.hex to qmk_firmware folder                                               [OK]
-Checking file size of planck_rev5_xyverz.hex                                                        
- * File size is fine - 18574/28672
- ```
+恭喜你，你的自定义固件成功刷写到键盘中了，快去试试吧！
 
-到了这个时候, 构建脚本将每隔5秒查找一次DFU。它将重复以下操作，直到找到设备或将其取消。
+运气不差的话一切都会是正常工作的，如果不幸遇到了些问题，有一些参考方案可以帮助你排查问题原因。
+键盘测试就简单直接了，依次按一下各按键，检查它是不是发送了正确的输入。可以使用[QMK配置器](https://config.qmk.fm/#/test/)中的测试模式进行测试，即便你的键盘并不运行QMK。
 
-    dfu-programmer: no device present.
-    Error: Bootloader not found. Trying again in 5s.
-
-一旦出现以上回显，您将需要重置控制器。然后，它应该显示与以下类似的输出：
-
-```
-*** Attempting to flash, please don't remove device
->>> dfu-programmer atmega32u4 erase --force
-    Erasing flash...  Success
-    Checking memory from 0x0 to 0x6FFF...  Empty.
->>> dfu-programmer atmega32u4 flash /Users/skully/qmk_firmware/clueboard_66_hotswap_gen1_skully.hex
-    Checking memory from 0x0 to 0x55FF...  Empty.
-    0%                            100%  Programming 0x5600 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    0%                            100%  Reading 0x7000 bytes...
-    [>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>]  Success
-    Validating...  Success
-    0x5600 bytes written into 0x7000 bytes memory (76.79%).
->>> dfu-programmer atmega32u4 reset
-```
-
-如果您对此有任何问题，您可能需要这样做：
-
-    sudo make <my_keyboard>:<my_keymap>:dfu
-
-#### DFU命令
-
-有许多DFU命令可用于将固件下载到DFU设备：
-
-* `:dfu` - 这是正常选项，等待DFU设备可用，然后刷新固件。这将每隔5秒检查一次，以查看是否出现了DFU设备。
-* `:dfu-ee` - 这将刷新一个`eep`文件，而不是普通的十六进制文件。这很不常见。
-* `:dfu-split-left` - 这将刷新正常固件，就像默认选项 (`:dfu`)一样. 但是，这也会刷新“左侧”EEPROM文件，用于分割键盘。 _这是基于Elite C的键盘的推荐选择。_
-* `:dfu-split-right` - 这将刷新正常固件，就像默认选项(`:dfu`). 但是，这也会刷新“右侧”EEPROM文件，用于分割键盘。 _这是基于Elite C的键盘的推荐选择。_
-
-
-### Caterina 
-
-对于Arduino板以及其克隆版来说(比如SparkFun和ProMicro), 准备好编译和刷新固件后，打开终端窗口并运行构建命令: 
-
-    make <my_keyboard>:<my_keymap>:avrdude
-
-比如, 你的布局叫"xyverz"你要创建一个rev2 Lets Split的布局,你要用以下命令:
-
-    make lets_split/rev2:xyverz:avrdude
-
-固件完成编译后，它将输出类似以下的内容: 
-
-```
-Linking: .build/lets_split_rev2_xyverz.elf                                                            [OK]
-Creating load file for flashing: .build/lets_split_rev2_xyverz.hex                                    [OK]
-Checking file size of lets_split_rev2_xyverz.hex                                                      [OK]
- * File size is fine - 27938/28672
-Detecting USB port, reset your controller now..............
-```
-
-此时，复位，然后脚本将检测bootloader，然后刷新固件。输出应该像这样:
-
-```
-Detected controller on USB port at /dev/ttyS15
-
-Connecting to programmer: .
-Found programmer: Id = "CATERIN"; type = S
-    Software Version = 1.0; No Hardware Version given.
-Programmer supports auto addr increment.
-Programmer supports buffered memory access with buffersize=128 bytes.
-
-Programmer supports the following devices:
-    Device code: 0x44
-
-avrdude.exe: AVR device initialized and ready to accept instructions
-
-Reading | ################################################## | 100% 0.00s
-
-avrdude.exe: Device signature = 0x1e9587 (probably m32u4)
-avrdude.exe: NOTE: "flash" memory has been specified, an erase cycle will be performed
-             To disable this feature, specify the -D option.
-avrdude.exe: erasing chip
-avrdude.exe: reading input file "./.build/lets_split_rev2_xyverz.hex"
-avrdude.exe: input file ./.build/lets_split_rev2_xyverz.hex auto detected as Intel Hex
-avrdude.exe: writing flash (27938 bytes):
-
-Writing | ################################################## | 100% 2.40s
-
-avrdude.exe: 27938 bytes of flash written
-avrdude.exe: verifying flash memory against ./.build/lets_split_rev2_xyverz.hex:
-avrdude.exe: load data flash data from input file ./.build/lets_split_rev2_xyverz.hex:
-avrdude.exe: input file ./.build/lets_split_rev2_xyverz.hex auto detected as Intel Hex
-avrdude.exe: input file ./.build/lets_split_rev2_xyverz.hex contains 27938 bytes
-avrdude.exe: reading on-chip flash data:
-
-Reading | ################################################## | 100% 0.43s
-
-avrdude.exe: verifying ...
-avrdude.exe: 27938 bytes of flash verified
-
-avrdude.exe: safemode: Fuses OK (E:CB, H:D8, L:FF)
-
-avrdude.exe done.  Thank you.
-```
-如果您对此有任何问题，您可能需要这样做：
-
-    sudo make <my_keyboard>:<my_keymap>:avrdude
-
-
-此外，如果要刷新多个板，请使用以下命令：
-
-    make <keyboard>:<keymap>:avrdude-loop
-
-当你完成了刷新后，你需要按下ctrl+c或者其他正确的按键来让你的操作系统终止循环。
-
-
-## HalfKay
-
-对于PJRC设备（Teensy），当您准备好编译和刷新固件时，打开终端窗口并运行构建命令: 
-
-    make <my_keyboard>:<my_keymap>:teensy
-
-比如, 如果你的布局叫做"xyverz"你想创建Ergodox or Ergodox EZ的布局,你要使用以下命令:
-
-    make erdogox_ez:xyverz:teensy
-
-固件完成编译后，它将输出如下内容：
-
-```
-Linking: .build/ergodox_ez_xyverz.elf                                                               [OK]
-Creating load file for flashing: .build/ergodox_ez_xyverz.hex                                       [OK]
-Checking file size of ergodox_ez_xyverz.hex                                                         [OK]
- * File size is fine - 25584/32256
- Teensy Loader, Command Line, Version 2.1
-Read "./.build/ergodox_ez_xyverz.hex": 25584 bytes, 79.3% usage
-Waiting for Teensy device...
- (hint: press the reset button)
- ```
-
-此时，复位键盘。完成后，您将看到如下输出：
-
- ```
- Found HalfKay Bootloader
-Read "./.build/ergodox_ez_xyverz.hex": 28532 bytes, 88.5% usage
-Programming............................................................................................................................................................................
-...................................................
-Booting
-```
-
-## STM32 (ARM)
-
-对于大多数ARM板（包括Proton C、Planck Rev 6和Preonic Rev 3），当您准备好编译和刷新固件时，打开终端窗口并运行构建命令：
-
-    make <my_keyboard>:<my_keymap>:dfu-util
-
-例如，如果您的keymap被命名为“xyverz”，并且您正在为Planck Revision 6键盘构建一个布局，那么您需要使用以下命令，然后将键盘重新启动到bootloader（在完成编译之前）：
-
-    make planck/rev6:xyverz:dfu-util
-
-固件完成编译后，它将输出如下内容：
-
-```
-Linking: .build/planck_rev6_xyverz.elf                                                             [OK]
-Creating binary load file for flashing: .build/planck_rev6_xyverz.bin                               [OK]
-Creating load file for flashing: .build/planck_rev6_xyverz.hex                                     [OK]
-
-Size after:
-   text    data     bss     dec     hex filename
-      0   41820       0   41820    a35c .build/planck_rev6_xyverz.hex
-
-Copying planck_rev6_xyverz.bin to qmk_firmware folder                                              [OK]
-dfu-util 0.9
-
-Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc.
-Copyright 2010-2016 Tormod Volden and Stefan Schmidt
-This program is Free Software and has ABSOLUTELY NO WARRANTY
-Please report bugs to http://sourceforge.net/p/dfu-util/tickets/
-
-Invalid DFU suffix signature
-A valid DFU suffix will be required in a future dfu-util release!!!
-Opening DFU capable USB device...
-ID 0483:df11
-Run-time device DFU version 011a
-Claiming USB DFU Interface...
-Setting Alternate Setting #0 ...
-Determining device status: state = dfuERROR, status = 10
-dfuERROR, clearing status
-Determining device status: state = dfuIDLE, status = 0
-dfuIDLE, continuing
-DFU mode device DFU version 011a
-Device returned transfer size 2048
-DfuSe interface name: "Internal Flash  "
-Downloading to address = 0x08000000, size = 41824
-Download        [=========================] 100%        41824 bytes
-Download done.
-File downloaded successfully
-Transitioning to dfuMANIFEST state
-```
-
-## 试一试吧!
-
-恭喜您! 您的自定义固件已经刷写到您的键盘
-
-试一试，确保一切按你想的方式进行。我们写了[测试和调试](newbs_testing_debugging.md)来完善新手引导。 因此，请前往那里了解如何排除自定义功能的故障。
+还是不行吗？参阅一下FAQ或[通过Discord和我们聊聊](https://discord.gg/Uq7gcHh)吧。
diff --git a/docs/zh-cn/newbs_getting_started.md b/docs/zh-cn/newbs_getting_started.md
index 596ab78f7f..7ca9871aa7 100644
--- a/docs/zh-cn/newbs_getting_started.md
+++ b/docs/zh-cn/newbs_getting_started.md
@@ -1,93 +1,183 @@
-# 介绍
+# 配置环境
 
-你的电脑键盘里面包含一个处理器, 这个处理器和你电脑里面的不太一样。这个处理器负责运行一些特殊的软件，这些软件可以监测按钮按下并将按钮处于按下还是释放状态的数据发送出去。QMK就是这样一种软件，即监测按钮被按下并发送这样的信息到作为主机的计算机上。当你创建了你的布局, 你也就创建了你的键盘运行的的可执行程序。
+<!---
+  original document: 0.15.12:docs/newbs_getting_started.md
+  git diff 0.15.12 HEAD -- docs/newbs_getting_started.md | cat
+-->
 
-QMK试图通过使简单的事情变得更简单，使使不可能成为可能来把大量的权力交给你。你不需要懂如何通过程序创建强大的布局——你只需要遵循简单的语法规则。
+构建键映射前，有一些必须安装配置的构建工具，但无论你要编译多少个固件，这一步只需要做一次。
 
-# 新手上路
+## 1. 必备工具
 
-在你能创建布局前,你要安装一些软件来建立你的开发环境。无论你想编译多少固件，这个操作都只需要进行一次。
+首先需要确保一些基本的软件配备。
 
-如果您更喜欢图形化界面, 请考虑使用在线工具[QMK配置器](https://config.qmk.fm)。 请参考 [使用在线GUI构建您的第一个固件](newbs_building_firmware_configurator.md)。
+* [文本编辑器](zh-cn/newbs_learn_more_resources.md#text-editor-resources)
+  * 你需要至少一个能编辑常规文本的软件。系统自带的编辑器通常不会如实保存（会做一些额外的处理，如回车），所以选择编辑器时需要留意。
+* [QMK工具箱(可选)](https://github.com/qmk/qmk_toolbox)
+  * 在Windows及macOS上可用的图形程序，用于编辑及调试你的键盘
 
+?> 如果你没有Linux/Unix命令行使用经验，有些基本概念需要先学习一下。[这些资料](zh-cn/newbs_learn_more_resources.md#command-line-resources)是个使用QMK很好的参考。
 
-## 下载软件
+## 2. 准备构建环境 :id=set-up-your-environment
 
-### 文本编辑器
+我们已经尽力让QMK易于配置了，你只要准备好Linux或Unix环境，剩余的交给QMK来安装。
 
-你需要一个可以编辑 **纯文本** 文件的程序。在Windows上你可以用Notepad, 在Linux上使用gedit，这两个都是简单又实用的文本编辑工具。 在macOS上, 请小心使用 “文本编辑” 这个默认软件: 如果你不明确的选择_格式_菜单中的 _制作纯文本_ 的话文本将不会被保存为纯文本。
+<!-- tabs:start -->
 
-你也可以下载并安装一个专用编辑器 [Sublime Text](https://www.sublimetext.com/) 或 [VS Code](https://code.visualstudio.com/)。 这大概是跨平台的最好方法了, 这些编辑器是专门为了编辑代码设计的。
+### ** Windows **
 
-?>搞不清用哪种编辑器? Laurence Bradford 写了篇关于编辑器选择的文章 [a great introduction](https://learntocodewith.me/programming/basics/text-editors/)。
+QMK有维护一套基于MSYS2的软件包，所有命令行程序和依赖都是齐备的。通过 `QMK MSYS` 快捷命令可以快速启动开发环境。
 
-### QMK 工具箱
+#### 依赖项
 
-QMK 工具箱 是一种可选的Windows和macOS下的图形化工具，它可以对你的定制键盘进行编程和调试。你可能会发现它就是你能简单的刷新你的键盘固件并查看调试信息的稀世珍宝。
+需安装[QMK MSYS](https://msys.qmk.fm/)，最新版在[这里](https://github.com/qmk/qmk_distro_msys/releases/latest)。
 
-[在这里下载最新发布版本](https://github.com/qmk/qmk_toolbox/releases/latest)
+此外，如果想自行安装MSYS2环境，下面给出了具体的步骤。
 
-* Windows用户: `qmk_toolbox.exe` (绿色版) 或 `qmk_toolbox_install.exe` (安装版)
-* macOS用户: `QMK.Toolbox.app.zip` (绿色版) or `QMK.Toolbox.pkg` (安装版)
+<details>
+  <summary>自行安装</summary>
 
-## 建立你的环境
+?> 若决定使用 `QMK MSYS`，请跳过此节.
 
-我们为了使QMK环境变得更容易建立已竭尽所能。你只需要准备Linux 或 Unix 环境, 然后让QMK安装剩余部分。
+#### 依赖项
 
-?> 如果你从未使用过Linux/Unix的命令行,有一些你需要学习的基础概念和命令，以下资料将教会您使用QMK环境的必要能力:<br>
-[必会Linux命令](https://www.guru99.com/must-know-linux-commands.html)<br>
-[一些基本的Unix命令](https://www.tjhsst.edu/~dhyatt/superap/unixcmd.html)
+遵循 https://www.msys2.org 上的指引，安装MSYS2、Git和Python。
 
-### Windows
+在MSYS2安装完毕后，关闭所有的MSYS终端，启动新的MinGW 64-bit终端。
 
-你需要安装MSYS2和Git.
+!> **注意:** MinGW 64-bit 终端*不同于*安装包最后打开的MSYS终端，窗口标题应当是紫色的"MINGW64"而不是"MSYS"。具体的差异可以[参考这里](https://www.msys2.org/wiki/MSYS2-introduction/#subsystems)。
 
-* 按照以下安装说明进行操作[MSYS2 主页](https://www.msys2.org)。
-* 关闭所有打开的MSYS2终端并打开新的MSYS2 MinGW 64-bit终端。
-* 使用以下命令安装Git: `pacman -S git`。
+执行如下命令：
 
-### macOS
+    pacman --needed --noconfirm --disable-download-timeout -S git mingw-w64-x86_64-toolchain mingw-w64-x86_64-python3-pip
 
-你需要安装Homebrew。按照以下说明进行操作 [Homebrew 主页](https://brew.sh)。
+#### 安装
 
-在Homebrew安装完成后, 继续 _同步QMK工程_. 这一步你将会通过运行一个脚本安装其他包。
+安装QMK命令行程序:
 
-### Linux
+    python3 -m pip install qmk
 
-你将需要安装Git.你很有可能已经安装,但若你尚未安装,可以使用以下命令进行安装:
+</details>
 
-* Debian / Ubuntu / Devuan: `apt-get install git`
-* Fedora / Red Hat / CentOS: `yum install git`
-* Arch: `pacman -S git`
+### ** macOS **
 
-?> 无论你使用哪种平台，Docker都可以是你的选择[点这里进一步了解](getting_started_build_tools.md#docker)
+QMK维护了一套Homebrew tap和formula以用于自动安装命令行程序及依赖项。
 
-## 同步QMK工程
+#### 依赖项
 
-当你建立Linux/Unix环境后,你就已经可以下载QMK了.下载时我们可以用Git来 "clone" QMK仓库. 打开一个终端或MSYS2 MinGW 窗口，在阅读剩余的指南时请保持窗口打开。在窗口里面运行以下两句命令:
+须先安装Homebrew，可以参考 https://brew.sh
 
-```shell
-git clone --recurse-submodules https://github.com/qmk/qmk_firmware.git
-cd qmk_firmware
-```
+#### 安装
 
-?> 如果您已经知道[如何使用GitHub](getting_started_github.md), 我们推荐您创建您自己的分支并克隆。 如果您不知道这是什么, 您完全可以忽略这句无关紧要的话。
+安装QMK命令行程序：
 
-QMK附带一个脚本，可帮助您设置剩余的所需内容.您可以通过输入此命令来运行它:
+    brew install qmk/qmk/qmk
 
-    util/qmk_install.sh
+### ** Linux/WSL **
 
-## 测试你的开发环境
+?> **WSL用户注意**: 默认情况下，QMK仓库会被clone到home目录下，如果想指定其它目录，务必留意要放在WSL文件系统中（即，非 `/mnt` 目录下），否则文件读写会[非常慢](https://github.com/microsoft/WSL/issues/4197).
 
-现在你的QMK环境已经建立完毕, 你可以为你的键盘创建固件了。开始试着创建键盘的默认固件吧。 你需要使用以下格式的命令创建固件:
+#### 依赖项
 
-    make <keyboard>:default
+须安装Git及Python，通常你肯定已经有了，如果确实没有，请使用下面的方法尝试安装：
 
-比如, 制作一个Clueboard 66%的固件，需要用:
+* Debian / Ubuntu / Devuan: `sudo apt install -y git python3-pip`
+* Fedora / Red Hat / CentOS: `sudo yum -y install git python3-pip`
+* Arch / Manjaro: `sudo pacman --needed --noconfirm -S git python-pip libffi`
+* Void: `sudo xbps-install -y git python3-pip`
+* Solus: `sudo eopkg -y install git python3`
+* Sabayon: `sudo equo install dev-vcs/git dev-python/pip`
+* Gentoo: `sudo emerge dev-vcs/git dev-python/pip`
 
-    make clueboard/66/rev3:default
+#### 安装
 
-当完成后你要看到一些回显，尾部如下:
+安装QMK命令行程序：
+
+    python3 -m pip install --user qmk
+
+#### 社区提供的包
+
+有一些社区成员提供的包，可能版本会有落后或是功能不全的问题，如果你遇到了什么问题，请联系维护它的社区成员。
+
+Arch系环境下可以使用官方源安装命令行程序（在写这份文档时，有些依赖项被标记为可选的，其实不是）：
+
+    sudo pacman -S qmk
+
+也可以尝试AUR的 `qmk-git`：
+
+    yay -S qmk-git
+
+###  ** FreeBSD **
+
+#### 安装
+
+使用FreeBSD包安装QMK命令行程序：
+
+    pkg install -g "py*-qmk"
+
+请遵循安装后输出的指引操作进行配置（使用 `pkg info -Dg "py*-qmk"` 可以显示这份指引）。
+
+<!-- tabs:end -->
+
+## 3. 执行QMK配置 :id=set-up-qmk
+*译注：由于setup过程中需要从github clone依赖项，请先确保科学上网*
+
+<!-- tabs:start -->
+
+### ** Windows **
+
+安装QMK后，执行：
+
+    qmk setup
+
+通常所有的询问回复 `y` 就行了。
+
+### ** macOS **
+
+安装QMK后，执行：
+
+    qmk setup
+
+通常所有的询问回复 `y` 就行了。
+
+### ** Linux/WSL **
+
+安装QMK后，执行：
+
+    qmk setup
+
+通常所有的询问回复 `y` 就行了。
+
+?>**Debian及Ubuntu系环境须留意**:
+也许你会遇到 `bash: qmk: command not found` 错误，主要是因为Debian上的Bash 4.4版本引入的一个[bug](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=839155)，`$HOME/.local/bin` 被从PATH环境变量中删除了，后续版本中这个问题已被修复。
+然而Ubuntu很挫地再次引入了这个bug[且没有修复](https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1588562)。
+不过修复也很容易，在当前账户中执行：`echo 'PATH="$HOME/.local/bin:$PATH"' >> $HOME/.bashrc && source $HOME/.bashrc`
+
+###  ** FreeBSD **
+
+安装QMK后，执行：
+
+    qmk setup
+
+通常所有的询问回复 `y` 就行了。
+
+<!-- tabs:end -->
+
+?> QMK的home目录可以在安装时通过 `qmk setup -H <path>` 来指定，安装后也可以通过[命令行程序来配置](zh-cn/cli_configuration.md?id=single-key-example)`user.qmk_home`变量，可以通过 `qmk setup --help` 查看所有可用配置。
+
+?> 若你熟悉GitHub，[推荐阅读这份指引](zh-cn/getting_started_github.md)通过 `qmk setup <github_username>/qmk_firmware` 来clone你自己的fork。如果你看不懂这一段啥意思，忽略就是了。
+
+## 4. 测试你的构建环境
+
+QMK构建环境搭建完成，可以尝试构建一个键盘固件。使用以下指令格式，先试试编译默认提供的键映射：
+
+    qmk compile -kb <keyboard> -km default
+
+例如，要构建一个Clueboard 66%，就这样执行：
+
+    qmk compile -kb clueboard/66/rev3 -km default
+
+你应当能看到像这样的输出信息：
 
 ```
 Linking: .build/clueboard_66_rev3_default.elf                                                       [OK]
@@ -97,6 +187,22 @@ Checking file size of clueboard_66_rev3_default.hex
  * The firmware size is fine - 26356/28672 (2316 bytes free)
 ```
 
-# 创建你的布局
+## 5. 配置你的构建环境 (可选的)
 
-现在你可以创建属于你自己的布局了! 请移步 [构建你的第一个固件](newbs_building_firmware.md)来继续。
+通过对默认配置的简单调整，QMK用起来会更有趣一些，我们来试试！
+
+大部分QMK新手手头只有一把键盘，可以通过 `qmk config` 命令将它设置为默认键盘，例如你想将 `clueboard/66/rev4` 设置为默认，可以这样：
+
+    qmk config user.keyboard=clueboard/66/rev4
+
+也可以调整默认的键映射名称。社区上大家常用自己的GitHub用户名，这也是我们推荐的做法。
+
+    qmk config user.keymap=<github_username>
+
+完成后，这些配置就不用管了，编译键盘固件就可以直接这样执行：
+
+    qmk compile
+
+# 制作你自己的键映射
+
+万事俱备啦！请继续阅读[构建第一个固件](zh-cn/newbs_building_firmware.md).
diff --git a/docs/zh-cn/newbs_learn_more_resources.md b/docs/zh-cn/newbs_learn_more_resources.md
index ccb4fa326c..20fed1f358 100644
--- a/docs/zh-cn/newbs_learn_more_resources.md
+++ b/docs/zh-cn/newbs_learn_more_resources.md
@@ -1,15 +1,35 @@
 # 学习资源
 
-这些资源旨在让QMK社区的新成员更了解新成员文档中提供的信息。
+<!---
+  original document: 0.15.12:docs/newbs_learn_more_resources.md
+  git diff 0.15.12 HEAD -- docs/newbs_learn_more_resources.md | cat
+-->
 
-Git 资源:
+这些资源旨在让QMK社区的新成员更了解新手教程中的基础知识。
 
-* [很好的通用教程](https://www.codecademy.com/learn/learn-git)
-* [从例子中学习Git游戏](https://learngitbranching.js.org/)
-* [了解有关GitHub的更多信息的Git资源](getting_started_github.md)
-* [专门针对QMK的Git资源](contributing.md)
+*译注：以下资料超出了QMK核心概念范畴，恕不另行翻译*
 
+### QMK参考资料
 
-命令行资源:
+* [Thomas Baart's QMK Basics Blog](https://thomasbaart.nl/category/mechanical-keyboards/firmware/qmk/qmk-basics/) – 一个站在新人视角，探讨如何使用QMK固件的个人博客。
 
-* [超棒的命令行通用教程](https://www.codecademy.com/learn/learn-the-command-line)
+### 命令行操作参考资料 :id=command-line-resources
+
+* [Good General Tutorial on Command Line](https://www.codecademy.com/learn/learn-the-command-line)
+* [Must Know Linux Commands](https://www.guru99.com/must-know-linux-commands.html)<br>
+* [Some Basic Unix Commands](https://www.tjhsst.edu/~dhyatt/superap/unixcmd.html)
+
+### 文本编辑器相关参考资料 :id=text-editor-resources
+
+对文本编辑器有选择困难？
+* [a great introduction to the subject](https://learntocodewith.me/programming/basics/text-editors/)
+
+更适用于编程的文本编辑器：
+* [Sublime Text](https://www.sublimetext.com/)
+* [VS Code](https://code.visualstudio.com/)
+
+### Git参考资料
+
+* [Great General Tutorial](https://www.codecademy.com/learn/learn-git)
+* [Flight Rules For Git](https://github.com/k88hudson/git-flight-rules)
+* [Git Game To Learn From Examples](https://learngitbranching.js.org/)
diff --git a/docs/zh-cn/newbs_testing_debugging.md b/docs/zh-cn/newbs_testing_debugging.md
index d88d9b6f2d..0016d3b816 100644
--- a/docs/zh-cn/newbs_testing_debugging.md
+++ b/docs/zh-cn/newbs_testing_debugging.md
@@ -1,46 +1,14 @@
 # 测试和调试
 
-使用自定义固件刷新键盘后，您就可以测试它了。如果您幸运，一切都会完美运行，但如果没有，这份文件将帮助您找出问题所在。
-
+<!---
+  original document: 0.15.12:docs/newbs_testing_debugging.md
+  git diff 0.15.12 HEAD -- docs/newbs_testing_debugging.md | cat
+-->
 ## 测试
 
-测试键盘通常非常简单。按下每一个键并确保它发送的是您期望的键。甚至有一些程序可以帮助您确保没有任何键失效。
+[已移到这里](zh-cn/faq_misc.md#testing)
 
-注意：这些程序不是由QMK提供或认可的。
+## 调试 :id=debugging
 
-* [QMK Configurator](https://config.qmk.fm/#/test/) (网页版)
-* [Switch Hitter](https://web.archive.org/web/20190413233743/https://elitekeyboards.com/switchhitter.php) (仅Windows)
-* [Keyboard Viewer](https://www.imore.com/how-use-keyboard-viewer-your-mac) (仅Mac)
-* [Keyboard Tester](https://www.keyboardtester.com) (网页版)
-* [Keyboard Checker](https://keyboardchecker.com) (网页版)
+[已移到这里](zh-cn/faq_debug.md#debugging)
 
-## 使用QMK工具箱进行调试
-
-[QMK工具箱](https://github.com/qmk/qmk_toolbox) 将会在你的`rules.mk`中有`CONSOLE_ENABLE = yes`的时候显示你键盘发来的消息。 默认情况下，输出极为有限，不过您可以打开调试模式来增加输出信息量。使用你键盘布局中的`DEBUG`键码,使用 [命令](feature_command.md) 特性来使能调试模式, 或者向你的布局中添加以下代码。
-
-```c
-void keyboard_post_init_user(void) {
-  // Customise these values to desired behaviour
-  debug_enable=true;
-  debug_matrix=true;
-  //debug_keyboard=true;
-  //debug_mouse=true;
-}
-```
-
-<!-- 需要修改之处:这里要添加调试回显。 -->
-
-## 发送您自己的调试消息
-
-有时用[custom code](custom_quantum_functions.md)发送自定义调试信息很有用. 这么做很简单. 首先在你文件头部包含`print.h`:
-
-```c
-#include "print.h"
-```
-
-之后，您可以使用一些不同的打印功能:
-
-* `print("string")`: 打印简单字符串.
-* `uprintf("%s string", var)`: 打印格式化字符串
-* `dprint("string")`: 仅在调试模式使能时打印简单字符串
-* `dprintf("%s string", var)`: 仅在调试模式使能时打印格式化字符串
diff --git a/docs/zh-cn/reference_configurator_support.md b/docs/zh-cn/reference_configurator_support.md
new file mode 100644
index 0000000000..aa174ceedb
--- /dev/null
+++ b/docs/zh-cn/reference_configurator_support.md
@@ -0,0 +1,200 @@
+# 在QMK配置器中支持您的键盘
+
+<!---
+  original document: 0.15.12:docs/reference_configurator_support.md
+  git diff 0.15.12 HEAD -- docs/reference_configurator_support.md | cat
+-->
+
+本章节详述了如何在[QMK配置器](https://config.qmk.fm/)中对键盘进行支持。
+
+
+## 配置器如何理解键盘
+
+若要了解配置器如何理解键盘，须先理解配列的宏定义。这里有一份练习，假设这里有一个17键的小键盘PCB方案，就叫做 `numpad`。
+
+```
+|---------------|
+|NLk| / | * | - |
+|---+---+---+---|
+|7  |8  |9  | + |
+|---+---+---|   |
+|4  |5  |6  |   |
+|---+---+---+---|
+|1  |2  |3  |Ent|
+|-------+---|   |
+|0      | . |   |
+|---------------|
+```
+
+?> 配列宏定义的更多资料，参见[理解QMK：矩阵扫描](zh-cn/understanding_qmk.md?id=matrix-scanning)及[理解QMK：矩阵到物理配列的映射](zh-cn/understanding_qmk.md?id=matrix-to-physical-layout-map)。
+
+配置器的API会从 `qmk_firmware/keyboards/<keyboard>/<keyboard>.h` 中读取键盘定义的 `.h` 文件。在上面的小键盘示例中，对应文件应为 `qmk_firmware/keyboards/numpad/numpad.h`：
+
+```c
+#pragma once
+
+#define LAYOUT( \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13, \
+    k20, k21, k22,      \
+    k30, k31, k32, k33, \
+    k40,      k42       \
+  ) { \
+    { k00, k01,   k02, k03   }, \
+    { k10, k11,   k12, k13   }, \
+    { k20, k21,   k22, KC_NO }, \
+    { k30, k31,   k32, k33   }, \
+    { k40, KC_NO, k42, KC_NO }  \
+}
+```
+
+QMK使用 `KC_NO` 去标记开关矩阵中的空位。有时也会因方便或调试用途而使用 `XXX`，`___` 或 `____` 来替代。通产定义写在 `.h` 文件起始位置附近：
+
+```c
+#pragma once
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13, \
+    k20, k21, k22,      \
+    k30, k31, k32, k33, \
+    k40,      k42       \
+  ) { \
+    { k00, k01, k02, k03 }, \
+    { k10, k11, k12, k13 }, \
+    { k20, k21, k22, XXX }, \
+    { k30, k31, k32, k33 }, \
+    { k40, XXX, k42, XXX }  \
+}
+```
+
+!> 注意这里的使用模式与键映射中的宏完全不同，后者几乎都在用 `XXXXXXX`（7个大写X）替代 `KC_NO`，用 `_______`（7个下划线）替代 `KC_TRNS`。
+
+!> 为避免混淆，推荐使用 `KC_NO`。
+
+配列宏定义描述该键盘有17个按键，分布在五行四列。我们将这些开关命名为 `k<行号><列号>`，从0计起。命名成什么不太重要，但须确保负责从键映射中接收键码的上半段，与描述矩阵中按键位置的下半段定义匹配一致。
+
+为了能够重现键盘的物理组成样式，须构建并提供一份用于描述按键物理位置和尺寸与开关矩阵绑定关系的JSON文件，以告知配置器程序这些信息。
+
+## 构建JSON文件
+
+构建该JSON描述文件最简便的办法是使用[Keyboard Layout Editor](https://www.keyboard-layout-editor.com/) ("KLE"), 从中获取的原始数据（Raw Data）可以经QMK工具转换为配置器可用的JSON格式数据。由于KLE默认打开显示的是一个小键盘配列，请移除新手引导部分，从剩余部分开始使用。
+
+在配列编辑完毕后，从KLE的原始数据（Raw Data tab）页中拷贝类似如下的内容：
+
+```
+["Num Lock","/","*","-"],
+["7\nHome","8\n↑","9\nPgUp",{h:2},"+"],
+["4\n←","5","6\n→"],
+["1\nEnd","2\n↓","3\nPgDn",{h:2},"Enter"],
+[{w:2},"0\nIns",".\nDel"]
+```
+
+要将这份数据转换为我们可用的JSON格式，请跳转至[QMK KLE-JSON转换工具](https://qmk.fm/converter/)页面并粘贴到输入框，点击转换按钮。稍后输出框中即可看到所需的JSON数据。将输出数据拷贝到文本文档中，并命名为 `info.json`，保存到 `numpad.h` 所在目录。
+
+可以通过 `keyboard_name` 元素来指定键盘名称。这里为了演示，会将每个按键独立分行，以更方便于阅读，这不影响配置器的功能。
+
+```json
+{
+    "keyboard_name": "Numpad",
+    "url": "",
+    "maintainer": "qmk",
+    "tags": {
+        "form_factor": "numpad"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Num Lock", "x":0, "y":0},
+                {"label":"/", "x":1, "y":0},
+                {"label":"*", "x":2, "y":0},
+                {"label":"-", "x":3, "y":0},
+                {"label":"7", "x":0, "y":1},
+                {"label":"8", "x":1, "y":1},
+                {"label":"9", "x":2, "y":1},
+                {"label":"+", "x":3, "y":1, "h":2},
+                {"label":"4", "x":0, "y":2},
+                {"label":"5", "x":1, "y":2},
+                {"label":"6", "x":2, "y":2},
+                {"label":"1", "x":0, "y":3},
+                {"label":"2", "x":1, "y":3},
+                {"label":"3", "x":2, "y":3},
+                {"label":"Enter", "x":3, "y":3, "h":2},
+                {"label":"0", "x":0, "y":4, "w":2},
+                {"label":".", "x":2, "y":4}
+            ]
+        }
+    }
+}
+```
+
+`layouts` 对象描述了键盘的物理配列信息，其下的 `LAYOUT` 对象命名须与 `numpad.h` 中的一致，而 `LAYOUT` 下的 `layout` 对象，其下每个JSON对象描述了各物理按键，格式如下：
+
+```
+  按键名，不会在配置器中展现。
+  |
+  |                   按键的X坐标，从键盘左侧开始数。
+  |                   |
+  |                   |
+  |                   |      按键的Y坐标，从键盘上侧（后视角）开始数。
+  |                   |      |
+  ↓                   ↓      ↓
+{"label":"Num Lock", "x":0, "y":0},
+```
+
+部分对象包含 `"w"` 和 `"h"` 字段，用以描述按键的宽高值。
+
+?> 关于 `info.json` 文件的详细信息，参见[`info.json` 文件格式](zh-cn/reference_info_json.md)。
+
+
+## 配置器如何配置按键
+
+配置器API基于配列宏定义及JSON描述文件创建出键盘的可视化展现，并将每个可视化元素依序绑定到指定的按键：
+
+配列宏定义中的键 | 所使用的JSON对象
+:---: | :----
+k00   | {"label":"Num Lock", "x":0, "y":0}
+k01   | {"label":"/", "x":1, "y":0}
+k02   | {"label":"*", "x":2, "y":0}
+k03   | {"label":"-", "x":3, "y":0}
+k10   | {"label":"7", "x":0, "y":1}
+k11   | {"label":"8", "x":1, "y":1}
+k12   | {"label":"9", "x":2, "y":1}
+k13   | {"label":"+", "x":3, "y":1, "h":2}
+k20   | {"label":"4", "x":0, "y":2}
+k21   | {"label":"5", "x":1, "y":2}
+k22   | {"label":"6", "x":2, "y":2}
+k30   | {"label":"1", "x":0, "y":3}
+k31   | {"label":"2", "x":1, "y":3}
+k32   | {"label":"3", "x":2, "y":3}
+k33   | {"label":"Enter", "x":3, "y":3, "h":2}
+k40   | {"label":"0", "x":0, "y":4, "w":2}
+k42   | {"label":".", "x":2, "y":4}
+
+当用户在配置器中选中左上角的按键，并赋予数字区锁定键（NumLock）时，配置器会将 `KC_NLCK` 作为第一个按键进行键映射文件的构建工作，其它按键逻辑类似。其中 `label` 键值未被用到，其用于用户在调试 `info.json` 文件时，可以参考辨认出各按键。
+
+
+## 问题及副作用
+
+目前配置器还不支持按键偏转及类似ISO回车键这种非矩形按键。另外，对于纵向上偏离其行的按键 &mdash; 特别是像[TKC1800](https://github.com/qmk/qmk_firmware/tree/4ac48a61a66206beaf2fdd5f2939d8bbedd0004c/keyboards/tkc1800/)这种1800配列的键盘中的方向键 &mdash; 如果 `info.json` 文件的贡献者没有做出修正，KLE转JSON数据工具将会不知如何处理。
+
+### 解决方案
+
+#### 非矩阵形状的按键
+
+针对ISO回车键的情况，QMK会将其定制化显示成一个矩形键，宽1.25u高2u，按键矩阵的右边与字母区的右边对齐。
+
+![](https://i.imgur.com/JKngtTw.png)  
+*一款60% ISO配列的键盘, 在QMK配置器中的渲染样式。*
+
+#### 纵向偏移的按键
+
+对于纵向偏移的按键，将其视作未偏移的样子放入KLE，最后在转换后的JSON文件中，按需编辑其Y偏移值。
+
+![](https://i.imgur.com/fmDvDzR.png)  
+*一款1800配列键盘在KLE中的渲染样式，方向键未进行纵向偏移移动。*
+
+![](https://i.imgur.com/8beYMBR.png)  
+*这份Unix差异文件，展示了我们需要在JSON文件中进行的纵向偏移改动。*
diff --git a/docs/zh-cn/reference_glossary.md b/docs/zh-cn/reference_glossary.md
index 06d3632505..e1dfccddd2 100644
--- a/docs/zh-cn/reference_glossary.md
+++ b/docs/zh-cn/reference_glossary.md
@@ -1,5 +1,10 @@
 # QMK术语表
 
+<!---
+  original document: 0.15.12:docs/reference_glossary.md
+  git diff 0.15.12 HEAD -- docs/reference_glossary.md | cat
+-->
+
 ## ARM
 多家公司生产的32位单片机系列，例如Atmel, Cypress, Kinetis, NXP, ST, 和 TI等公司。
 
@@ -7,16 +12,16 @@
 [Atmel](https://www.microchip.com/)公司的单片机系列。 AVR是TMK的初始支持平台。
 
 ## AZERTY
-Français (法国)标准键盘布局。用键盘的前六个字母命名。
+Français （法语）标准键盘布局。用键盘的前六个字母命名。
 
 ## Backlight(背光)
-键盘上照明的通称。背光通常是一组LED灯，通过键帽或者按轴发光，但也不总是这样。
+键盘上照明的通称。背光通常是一组LED灯，穿过键帽或者轴体发光，但也不总是这样。
 
 ## Bluetooth(蓝牙)
-一种短距离点对点无线协议。许多多无线键盘使用此协议。
+一种短距离点对点无线传输协议。许多无线键盘使用此协议。
 
 ## Bootloader(引导加载程序)
-一种写到你单片机的保护区的特殊的程序，该程序可以使单片机升级自己的固件，通常是通过USB来升级。
+一种写到你单片机保护区的特殊程序，该程序可以使单片机升级自己的固件，通常是通过USB来升级。
 
 ## Bootmagic(热改键)
 允许各种键盘行为动态变化的功能，如交换或禁用常用键。
@@ -36,12 +41,12 @@ Français (法国)标准键盘布局。用键盘的前六个字母命名。
 ## Dynamic Macro(动态宏)
 一种记录在键盘上的宏，当键盘拔出或计算机重新启动时，宏将丢失。
 
-* [动态宏文档](feature_dynamic_macros.md)
+* [动态宏文档](zh-cn/feature_dynamic_macros.md)
 
 ## Eclipse
 是一种受C语言开发者追捧的集成开发环境(IDE)。
 
-* [Eclipse安装说明](eclipse.md)
+* [Eclipse安装说明](zh-cn/other_eclipse.md)
 
 ## Firmware(固件)
 用来控制单片机的软件。
@@ -52,14 +57,14 @@ Français (法国)标准键盘布局。用键盘的前六个字母命名。
 ## GitHub
 负责大多数QMK项目的网站。它是Git、问题跟踪和其他帮助我们运行qmk的功能的集成平台。
 
-## ISP(在系统编程)
-在系统编程(In-system programming), 使用外部硬件和JTAG管脚对AVR芯片进行编程的一种方法。
+## ISP(在线系统编程)
+在线系统编程(In-system programming), 使用外部硬件和JTAG管脚对AVR芯片进行编程的一种方法。
 
 ## hid_listen
 从键盘接收调试消息的接口。 您可以使用[QMK Flasher](https://github.com/qmk/qmk_flasher)或[PJRC's hid_listen](https://www.pjrc.com/teensy/hid_listen.html)查看这些消息
 
 ## Keycode(键码)
-表示特定键的2字节数据。`0x00`-`0xFF`用于[基本键码](keycodes_basic.md)而`0x100`-`0xFFFF`用于[量子键码](quantum_keycodes.md).
+表示特定键的2字节数据。`0x00`-`0xFF`用于[基本键码](zh-cn/keycodes_basic.md)而`0x100`-`0xFFFF`用于[量子键码](zh-cn/quantum_keycodes.md).
 
 ## Key Down
 一个键按下尚未抬起时触发的事件。
@@ -71,12 +76,12 @@ Français (法国)标准键盘布局。用键盘的前六个字母命名。
 映射到物理键盘布局的一组键码，在按键和按键释放时进行处理。有时翻译为布局，意为软件上表示的布局，即映射。
 
 ## Layer(层)
-为了让一个键实现多个功能的抽象结构。最高活动层有限。
+为了让一个键实现多个功能的抽象结构。可用层数有上限。
 
 ## Leader Key(前导键、设置菜单键)
 本功能允许您点击前导键，然后按顺序按1-3个键子来激活按键或其他量子功能。
 
-* [前导键文档](feature_leader_key.md)
+* [前导键文档](zh-cn/feature_leader_key.md)
 
 ## LED
 发光二极管，键盘上最常用的指示灯装置。
@@ -90,18 +95,18 @@ Français (法国)标准键盘布局。用键盘的前六个字母命名。
 ## Macro(宏)
 本功能可以在敲击单个键后发送多个按键事件(hid报告)。
 
-* [宏文档](feature_macros.md)
+* [宏文档](zh-cn/feature_macros.md)
 
 ## MCU(单片机、微控制单元)
 微控制单元，键盘的处理器。
 
-## Modifier(修改键、修饰键、功能键)
+## Modifier(修饰键、修改键、功能键)
 按住该键将会改变其他键的功能，修饰键包括 Ctrl, Alt, 和 Shift。
 
 ## Mousekeys(鼠标键)
 本功能在您敲击键盘时会控制鼠标光标。
 
-* [鼠标键文档](feature_mouse_keys.md)
+* [鼠标键文档](zh-cn/feature_mouse_keys.md)
 
 ## N-Key Rollover (NKRO、全键无冲)
 一种术语，适用于能够同时报告任意数量按键的键盘。
@@ -128,17 +133,17 @@ Français (法国)标准键盘布局。用键盘的前六个字母命名。
 HID报告中的一个1字节的数字，表示一个键子。这些数字在下列文档中[HID Usage Tables](https://www.usb.org/sites/default/files/documents/hut1_12v2.pdf)该文档发布于[USB-IF](https://www.usb.org/)。
 
 ## Space Cadet键盘的shift键
-一种特使的shift设置，能让你通过敲击左或右shift一次或多次键入不同的括号。
+一种特殊的shift设置，能让你通过敲击左或右shift一次或多次键入不同的括号。
 
-* [Space Cadet键盘文档](feature_space_cadet.md)
+* [Space Cadet键盘文档](zh-cn/feature_space_cadet.md)
 
 ## Tap(敲击、单击)
-按下并释放一个键。在某些情况下您需要区分键按下和键抬起，但是单击把两个事件都包括了。
+按下并抬起一个键。在某些情况下您需要区分键按下和键抬起，但是单击把两个事件都包括了。
 
 ## Tap Dance(多击键)
 本功能允许向同一个键子分配多个键码，并根据按键次数区分。
 
-* [多击键文档](feature_tap_dance.md)
+* [多击键文档](zh-cn/feature_tap_dance.md)
 
 ## Teensy
 一种低成本AVR开发板<!--译者吐槽：我怎么感觉成本不低。好吧，我穷。 -->，通常用于手工连线键盘。这个teensy是有点小贵但是halfkay bootloader会让它刷写十分简单，所以也很常用。
@@ -147,21 +152,47 @@ HID报告中的一个1字节的数字，表示一个键子。这些数字在下
 用于照亮电路板底面的LED的总称。这些LED通常从印刷电路板的底部向键盘所在的表面发光。
 
 ## Unicode
-在较大的计算机世界中，Unicode是一组编码方案，用于表示任何语言中的字符。 与qmk相关的是，它意味着使用各种操作系统方案来发送Unicode代码点，而不是扫描码。
+在广阔的计算机世界中，Unicode是一组编码方案，用于表示任何语言中的字符。 与qmk相关的是，它意味着使用各种操作系统方案来发送Unicode码点，而不是扫描码。
 
-* [Unicode文档](feature_unicode.md)
+* [Unicode文档](zh-cn/feature_unicode.md)
 
 ## Unit Testing(单元测试)
-针对qmk的自动运行测试框架。单元测试帮助我们确信我们的更改不会破坏任何东西。
+针对qmk的自动测试框架。单元测试帮助我们确信我们的更改不会破坏任何东西。
 
-* [单元测试文档](unit_testing.md)
+* [单元测试文档](zh-cn/unit_testing.md)
 
 ## USB
 通用串行总线，键盘最常见的有线接口。
 
-## USB 主机 (或简易主机)
-USB诸暨市你的电脑，或者你的键盘所插的任何设备。
+## USB 主机 (简称主机)
+USB主机就是你的电脑，或者你的键盘所插的任何设备。
 
 # 并没有找到你想找到的术语?
 
-[建立一个issue](https://github.com/qmk/qmk_firmware/issues) ，想好你的问题，或许你所问的术语就会添加到这里。创建一个PR帮我们添加需要添加的术语当然坠吼了:)
+[新建一个issue](https://github.com/qmk/qmk_firmware/issues) ，想好你的问题，或许你所问的术语就会添加到这里。创建一个PR帮我们添加需要添加的术语当然坠吼了:)
+
+## 中文翻译术语特别说明（terms of Chinese translation）:id=terms-of-zh-cn-translate
+!>如果你对QMK文档翻译中的细节不关心，请跳过该节
+
+由于语言及文化差异，QMK英文文档中的部分内容，很难在**保持原句结构**的情况下，完美地翻译为中文，而保持翻译前后的语句结构一致对于开源代码的文档翻译来讲十分重要，这样才能确保不同的文档贡献者不会*夹带私货*，防止不同的翻译风格、不同的翻译水准、不同的理解与润色最终产生糟糕的混合。
+因此，这里会对一些词组的的翻译进行规范化，并希望阅读者及后续文档翻译维护者，维持这种统一的范式。
+
+### keyboard（键盘）及keymap（键映射）
+QMK文档中使用最多的两个术语是keyboard及keymap
+* 键盘：在中文语境下，我们提及键盘，基本是在指物理键盘，而在QMK文档中到处可见的“键盘”一词，多对应的是代码中 `keyboards\` 目录下的键盘定义，其更接近于我们讲的“配列”的概念，主要描述了键盘的大体结构，物理键数量及排列。
+* 键映射：keymap的作用是定义物理键盘到实际输出键值(keycode)的映射关系，也是QMK最重要、涉及最多的概念。QMK很多功能就是为了能够在不改变键盘物理排列/电路组成/芯片程序的情况下，动态地改变物理按键输出的键值。如，通过层切换，将原先的wasd键，切换到可以上下左右的模式，或是一键切换CapsLock和Control，实现这些功能的核心工作就是一套动态的keymap，即键映射逻辑。这里不使用“布局”一词作为keymap的翻译，是因为该词过于宽泛。键映射即便是不好听，至少解释了意思且语境中不容易误解。
+
+### mod-tap
+倾向于不翻译，直接使用原词。因为找不到合适的译法
+
+### dead key
+直译为死键，西语体系下使用的特殊符号，中文中无对应概念。
+
+### flashing（firmware）
+使用“刷写”而非容易迷惑的“刷新”
+
+### option/configuration/setting
+根据上下文灵活考虑。对于组件化配置的概念，如一个功能支持与否，使用“配置”一词；对于客观上一定存在的某项设置值，使用“设置”一词。
+
+### commit/push/pull等Git术语
+倾向于不翻译。这些词语的对应中文词语过于宽泛或词性不明，非常容易混淆上下文。
diff --git a/docs/zh-cn/support.md b/docs/zh-cn/support.md
new file mode 100644
index 0000000000..e636d29c97
--- /dev/null
+++ b/docs/zh-cn/support.md
@@ -0,0 +1,22 @@
+# 寻求帮助
+
+<!---
+  original document: 0.15.12:docs/support.md
+  git diff 0.15.12 HEAD -- docs/support.md | cat
+-->
+
+你可以从很多渠道获取QMK帮助。
+
+在你前往社区进行沟通前，请先阅览我们的社区[行为守则](https://qmk.fm/coc/)
+
+## 实时沟通
+
+在你需要帮助时，最便捷的办法是通过我们的[Discord服务器](https://discord.gg/Uq7gcHh)进行沟通，通常会有人在线，也有很多乐于助人的人。
+
+## OLKB Subreddit
+
+QMK的官方论坛是[reddit.com](https://reddit.com)上的[/r/olkb](https://reddit.com/r/olkb).
+
+## GitHub Issues
+
+你可以在[Github上发Issue](https://github.com/qmk/qmk_firmware/issues)，对于需要深入讨论或需要调试的问题，会方便得多。
diff --git a/docs/zh-cn/syllabus.md b/docs/zh-cn/syllabus.md
new file mode 100644
index 0000000000..d0b861530a
--- /dev/null
+++ b/docs/zh-cn/syllabus.md
@@ -0,0 +1,77 @@
+# QMK大纲
+
+<!---
+  original document: 0.15.12:docs/syllabus.md
+  git diff 0.15.12 HEAD -- docs/syllabus.md | cat
+-->
+
+这一页旨在帮你建立关于QMK的相关基础知识，并提供能引导你成为QMK大师所需的所有概念。
+
+# 基本概念
+
+如果你还没有看其它部分，先阅读这一节吧。在阅读了[介绍](zh-cn/newbs.md)之后，你可以制作、编译、刷写一个简单的键映射了，以下文档可以助你充实各系列的知识。
+
+* **了解如何使用QMK**
+    * [介绍](zh-cn/newbs.md)
+    * [CLI](zh-cn/cli.md)
+    * [GIT](zh-cn/newbs_git_best_practices.md)
+* **了解键映射**
+    * [层](zh-cn/feature_layers.md)
+    * [键码](zh-cn/keycodes.md)
+        * 含所有可用键码，一些会涉及进阶或高级的话题。
+* **配置IDE** - 可选的
+    * [Eclipse](zh-cn/other_eclipse.md)
+    * [VS Code](zh-cn/other_vscode.md)
+
+# 进阶话题
+
+包含窥探QMK主要功能内部原理的话题。你可以不用阅读这些，然而，跳过这些话题的话，去看高级话题的时候会让你很迷惑。
+
+* **各功能的配置**
+    <!-- * Configuration Overview  FIXME(skullydazed/anyone): write this document -->
+    * [音频](zh-cn/feature_audio.md)
+    * 灯光
+        * [背光](zh-cn/feature_backlight.md)
+        * [LED矩阵](zh-cn/feature_led_matrix.md)
+        * [RGB灯光](zh-cn/feature_rgblight.md)
+        * [RGB矩阵](zh-cn/feature_rgb_matrix.md)
+    * [点按配置](zh-cn/tap_hold.md)
+    * [充分利用AVR的存储空间](zh-cn/squeezing_avr.md)
+* **深入键映射**
+    * [键映射](zh-cn/keymap.md)
+    * [键码与自定义函数](zh-cn/custom_quantum_functions.md)
+    * 宏
+        * [动态宏](zh-cn/feature_dynamic_macros.md)
+        * [宏](zh-cn/feature_macros.md)
+    * [Tap Dance](zh-cn/feature_tap_dance.md)
+    * [组合键](zh-cn/feature_combo.md)
+    * [用户空间](zh-cn/feature_userspace.md)
+    * [按键重定义](zh-cn/feature_key_overrides.md)
+
+# 高级话题
+
+这些话题需要较多基础知识，使用这些高级功能前，你应该对如何通过 `config.h` 和 `rules.mk` 来配置键盘选项非常熟悉。
+
+* **维护QMK键盘**
+    * [飞线指南](zh-cn/hand_wire.md)
+    * [键盘开发指引](zh-cn/hardware_keyboard_guidelines.md)
+    * [info.json参考资料](zh-cn/reference_info_json.md)
+    * [防抖API](zh-cn/feature_debounce_type.md)
+* **高级功能**
+    * [Unicode](zh-cn/feature_unicode.md)
+    * [API](zh-cn/api_overview.md)
+    * [Bootmagic Lite](zh-cn/feature_bootmagic.md)
+* **硬件相关**
+    * [键盘工作原理](zh-cn/how_keyboards_work.md)
+    * [键盘矩阵原理](zh-cn/how_a_matrix_works.md)
+    * [分体键盘](zh-cn/feature_split_keyboard.md)
+    * [速记](zh-cn/feature_stenography.md)
+    * [光标设备](zh-cn/feature_pointing_device.md)
+* **开发核心知识**
+    * [C编码规范](zh-cn/coding_conventions_c.md)
+    * [兼容的微处理器](zh-cn/compatible_microcontrollers.md)
+    * [自定义矩阵](zh-cn/custom_matrix.md)
+    * [理解QMK](zh-cn/understanding_qmk.md)
+* **CLI开发**
+    * [编码规范](zh-cn/coding_conventions_python.md)
+    * [CLI开发总览](zh-cn/cli_development.md)
diff --git a/docs/zh-cn/translating.md b/docs/zh-cn/translating.md
new file mode 100644
index 0000000000..fa80ffd7f8
--- /dev/null
+++ b/docs/zh-cn/translating.md
@@ -0,0 +1,60 @@
+# 翻译QMK文档
+
+<!---
+  original document: 0.15.12:docs/translating.md
+  git diff 0.15.12 HEAD -- docs/translating.md | cat
+-->
+
+根目录下（`docs/`）的所有文件应当是英语的 - 其它语言应使用 ISO 639-1 中定义的语言编码建立子目录，后跟随一个 `-` 以及必要的国家编码。[常见的语言编码可见这里](https://www.andiamo.co.uk/resources/iso-language-codes/)。如果此目录不存在，可以新建。每个翻译过的文件的文件名，都应保持与英语版本的一致，以确保超链接的退化兼容性。
+
+文件夹下的 `_summary.md` 文件中，有链接向其它文件的地址，在翻译过的名称后，跟随的链接前应添加该语言的目录名：
+
+```markdown
+ * [QMK简介](zh-cn/getting_started_introduction.md)
+```
+
+所有导向其它文档页面的链接也必须有语言目录名前缀，若还指向了页面指定位置（即特定的标题），必须使用标题的英文ID，如：
+
+```markdown
+[建立你的环境](zh-cn/newbs-getting-started.md#set-up-your-environment)
+
+## 建立你的环境 :id=set-up-your-environment
+```
+
+在翻译后，以下文件也需要进行修改：
+
+* [`docs/_langs.md`](https://github.com/qmk/qmk_firmware/blob/master/docs/_langs.md)  
+  中的每一行应包含该语言国家国旗的[GitHub emoji编码](https://github.com/ikatyang/emoji-cheat-sheet/blob/master/README.md#country-flag)标志：
+
+  ```markdown
+   - [:cn: 中文](/zh-cn/)
+  ```
+
+* [`docs/index.html`](https://github.com/qmk/qmk_firmware/blob/master/docs/index.html)  
+  `placeholder` 及 `noData` 对象应有一个指向对应语言的入口项：
+
+  ```js
+  '/zh-cn/': '没有结果!',
+  ```
+
+  用于 "QMK固件" 边栏标题链接的 `nameLink` 同样需要添加对应配置：
+
+  ```js
+  '/zh-cn/': '/#/zh-cn/',
+  ```
+
+  最后确保在 `fallbackLanguages` 列表中添加该语言项，这样未翻译的文档链接将回退到英文版，而不是出现404页面：
+
+  ```js
+  fallbackLanguages: [
+    // ...
+    'zh-cn',
+    // ...
+  ],
+  ```
+
+## 预览你的翻译成果
+
+请阅读[文档预览](zh-cn/contributing.md#previewing-the-documentation)来设置文档的本地预览 - 在页面右上角的 "Translations" 菜单中应当可以看到你翻译的语言的入口。
+
+当你觉得一切就绪了，请发起pull request给我们吧！
diff --git a/docs/zh-cn/zh_cn_doc_status.sh b/docs/zh-cn/zh_cn_doc_status.sh
new file mode 100644
index 0000000000..84693e5461
--- /dev/null
+++ b/docs/zh-cn/zh_cn_doc_status.sh
@@ -0,0 +1,35 @@
+#! /bin/sh
+#
+# Script to display Simplified Chinese translation status of documents
+# Copied from the japanese one
+#
+if [ ! -d docs/zh-cn ]; then
+    echo "'docs/zh-cn' not found."
+    echo "do:"
+    echo "  cd \$(QMK_TOP)"
+    echo "  ./docs/zh-cn/zh-cn_doc_status.sh"
+    exit 1
+fi
+
+en_docs=`cd docs;ls -1 [a-z]*.md`
+zh_cn_docs=`cd docs/zh-cn;ls -1 [a-z]*.md`
+en_count=`echo $en_docs | wc -w`
+zh_cn_count=`echo $zh_cn_docs | wc -w`
+echo "English documents  $en_count files."
+echo "Simplified Chinese documents $zh_cn_count files."
+
+echo "Files that have not been translated yet:"
+for docfile in $en_docs
+do
+    if [ ! -f docs/zh-cn/$docfile ]; then
+        wc docs/$docfile
+    fi
+done | sort
+echo "Files that have not been updated yet:"
+grep --no-filename "^[ ]*git diff" docs/zh-cn/*.md | while read cmd
+do
+  cline=`echo $cmd | sh | wc -l`
+  if [ $cline -gt 0 ]; then
+    echo "$cline $cmd"
+ fi
+done | sort

From 47f978e9ccb58c4df702258cbda588e8bf5264da Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 18 Jan 2022 16:18:45 -0800
Subject: [PATCH 325/867] Remove `keyboard_folder` instances from `info.json`
 files (#15932)

* remove `keyboard_folder` instance from caffeinated/serpent65

* remove `keyboard_folder` instances from dumbpad

* remove `keyboard_folder` instances from mlego directory

* remove `keyboard_folder` instance from neopad/rev1

* remove `keyboard_folder` instance from spaceman/pancake/rev2
---
 keyboards/caffeinated/serpent65/info.json   | 1 -
 keyboards/dumbpad/v0x/info.json             | 1 -
 keyboards/dumbpad/v0x_dualencoder/info.json | 1 -
 keyboards/dumbpad/v0x_right/info.json       | 1 -
 keyboards/dumbpad/v1x/info.json             | 1 -
 keyboards/dumbpad/v1x_dualencoder/info.json | 1 -
 keyboards/dumbpad/v1x_right/info.json       | 1 -
 keyboards/mlego/m48/info.json               | 1 -
 keyboards/mlego/m60/info.json               | 1 -
 keyboards/mlego/m65/info.json               | 1 -
 keyboards/neopad/rev1/info.json             | 1 -
 keyboards/spaceman/pancake/rev2/info.json   | 1 -
 12 files changed, 12 deletions(-)

diff --git a/keyboards/caffeinated/serpent65/info.json b/keyboards/caffeinated/serpent65/info.json
index b1511c51cf..6e83b4b707 100644
--- a/keyboards/caffeinated/serpent65/info.json
+++ b/keyboards/caffeinated/serpent65/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "Serpent65",
-    "keyboard_folder": "caffeinated/serpent65",
     "url": "https",
     "maintainer": "jrfhoutx",
     "layouts": {
diff --git a/keyboards/dumbpad/v0x/info.json b/keyboards/dumbpad/v0x/info.json
index b8caefd14d..01fe1d5178 100644
--- a/keyboards/dumbpad/v0x/info.json
+++ b/keyboards/dumbpad/v0x/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "dumbpad/v0x",
-    "keyboard_folder": "dumbpad/v0x",
     "url": "https://www.github.com/imchipwood/dumbpad",
     "maintainer": "imchipwood",
     "layouts": {
diff --git a/keyboards/dumbpad/v0x_dualencoder/info.json b/keyboards/dumbpad/v0x_dualencoder/info.json
index fcccdaa532..f4bf8be585 100644
--- a/keyboards/dumbpad/v0x_dualencoder/info.json
+++ b/keyboards/dumbpad/v0x_dualencoder/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "dumbpad/v0x_dualencoder",
-    "keyboard_folder": "dumbpad/v0x_dualencoder",
     "url": "https://www.github.com/imchipwood/dumbpad",
     "maintainer": "imchipwood",
     "layouts": {
diff --git a/keyboards/dumbpad/v0x_right/info.json b/keyboards/dumbpad/v0x_right/info.json
index 4a6fec1e3f..7269fe3d08 100644
--- a/keyboards/dumbpad/v0x_right/info.json
+++ b/keyboards/dumbpad/v0x_right/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "dumbpad/v0x_right",
-    "keyboard_folder": "dumbpad/v0x_right",
     "url": "https://www.github.com/imchipwood/dumbpad",
     "maintainer": "imchipwood",
     "layouts": {
diff --git a/keyboards/dumbpad/v1x/info.json b/keyboards/dumbpad/v1x/info.json
index 24c73bfece..d8cd5b2304 100644
--- a/keyboards/dumbpad/v1x/info.json
+++ b/keyboards/dumbpad/v1x/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "dumbpad/v1x",
-    "keyboard_folder": "dumbpad/v1x",
     "url": "https://www.github.com/imchipwood/dumbpad",
     "maintainer": "imchipwood",
     "layouts": {
diff --git a/keyboards/dumbpad/v1x_dualencoder/info.json b/keyboards/dumbpad/v1x_dualencoder/info.json
index 3e4cffbc5c..42eb5a3e77 100644
--- a/keyboards/dumbpad/v1x_dualencoder/info.json
+++ b/keyboards/dumbpad/v1x_dualencoder/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "dumbpad/v1x_dualencoder",
-    "keyboard_folder": "dumbpad/v1x_dualencoder",
     "url": "https://www.github.com/imchipwood/dumbpad",
     "maintainer": "imchipwood",
     "layouts": {
diff --git a/keyboards/dumbpad/v1x_right/info.json b/keyboards/dumbpad/v1x_right/info.json
index 31c0cac447..05734d16b0 100644
--- a/keyboards/dumbpad/v1x_right/info.json
+++ b/keyboards/dumbpad/v1x_right/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "dumbpad/v1x_right",
-    "keyboard_folder": "dumbpad/v1x_right",
     "url": "https://www.github.com/imchipwood/dumbpad",
     "maintainer": "imchipwood",
     "layouts": {
diff --git a/keyboards/mlego/m48/info.json b/keyboards/mlego/m48/info.json
index cc6b273f0d..d22cfc54fd 100644
--- a/keyboards/mlego/m48/info.json
+++ b/keyboards/mlego/m48/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "mlego/m48",
-    "keyboard_folder": "mlego/m48",
     "url": "https://gitlab.com/m-lego/m48",
     "maintainer": "alin elena",
     "layouts": {
diff --git a/keyboards/mlego/m60/info.json b/keyboards/mlego/m60/info.json
index 75b7bc38aa..12924b5ea6 100644
--- a/keyboards/mlego/m60/info.json
+++ b/keyboards/mlego/m60/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "mlego/m60",
-    "keyboard_folder": "mlego/m60",
     "url": "https://gitlab.com/m-lego/m60",
     "maintainer": "alin elena",
     "layouts": {
diff --git a/keyboards/mlego/m65/info.json b/keyboards/mlego/m65/info.json
index c06cf9a712..175c6638c5 100644
--- a/keyboards/mlego/m65/info.json
+++ b/keyboards/mlego/m65/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "M65",
-    "keyboard_folder": "mlego/m65",
     "url": "https://gitlab.com/m-lego/m65",
     "maintainer": "alin elena",
     "layouts": {
diff --git a/keyboards/neopad/rev1/info.json b/keyboards/neopad/rev1/info.json
index 900f280df3..b5868084d1 100755
--- a/keyboards/neopad/rev1/info.json
+++ b/keyboards/neopad/rev1/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "neopad",
-    "keyboard_folder": "neopad/rev1",
     "url": "https://github.com/rookiebwoy/neopad)",
     "maintainer": "rookiebwoy",
     "layouts": {
diff --git a/keyboards/spaceman/pancake/rev2/info.json b/keyboards/spaceman/pancake/rev2/info.json
index 1af0dbcdb4..a5a4aad132 100644
--- a/keyboards/spaceman/pancake/rev2/info.json
+++ b/keyboards/spaceman/pancake/rev2/info.json
@@ -1,6 +1,5 @@
 {
   "keyboard_name": "Pancake 2",
-  "keyboard_folder": "pancake/rev2",
   "url": "",
   "maintainer": "Spaceman",
   "layouts": {

From 91e50209e74f870d2195753402ab6816d1e378be Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 19 Jan 2022 11:21:08 +1100
Subject: [PATCH 326/867] Fixup build. (#15931)

---
 keyboards/handwired/sono1/keymaps/via/config.h |  4 ++++
 keyboards/handwired/sono1/keymaps/via/keymap.c | 11 +----------
 2 files changed, 5 insertions(+), 10 deletions(-)
 create mode 100644 keyboards/handwired/sono1/keymaps/via/config.h

diff --git a/keyboards/handwired/sono1/keymaps/via/config.h b/keyboards/handwired/sono1/keymaps/via/config.h
new file mode 100644
index 0000000000..5b953c8db2
--- /dev/null
+++ b/keyboards/handwired/sono1/keymaps/via/config.h
@@ -0,0 +1,4 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/handwired/sono1/keymaps/via/keymap.c b/keyboards/handwired/sono1/keymaps/via/keymap.c
index 8c1dc160dd..d4a7f7c60e 100644
--- a/keyboards/handwired/sono1/keymaps/via/keymap.c
+++ b/keyboards/handwired/sono1/keymaps/via/keymap.c
@@ -60,16 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,         _______, _______,   _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                           _______,      _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______,  _______, _______, _______, _______,
-    _______, _______, _______,          _______,       _______,         _______,     _______,     _______,   _______,                              _______,      _______, _______,    _______,
-                                          _______, _______
-    ),
-    [3] = LAYOUT(
-    _______,  _______,   _______,  _______,  _______,  _______,  _______,     _______,  _______,  _______,  _______,  _______,               _______, _______,   _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,   _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,         _______, _______,   _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                           _______,      _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______, _______,  _______, _______, _______, _______,
     _______, _______, _______,          _______,       _______,         _______,     _______,     _______,   _______,                              _______,      _______, _______,    _______,
                                           _______, _______
     )
-};
\ No newline at end of file
+};

From dcb0c4e51e59fc796fe6957f1483ead988442b45 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 19 Jan 2022 20:34:59 +1100
Subject: [PATCH 327/867] Add example implementations for compatible MCUs list
 (#15935)

* Add example implementations for compatible MCUs list

* Update docs/compatible_microcontrollers.md

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 docs/compatible_microcontrollers.md | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/compatible_microcontrollers.md b/docs/compatible_microcontrollers.md
index 1f46a1c634..b74d49d0e3 100644
--- a/docs/compatible_microcontrollers.md
+++ b/docs/compatible_microcontrollers.md
@@ -1,6 +1,6 @@
 # Compatible Microcontrollers
 
-QMK runs on any USB-capable AVR or ARM microcontroller with enough flash space - generally 32kB or more, though it will *just* squeeze into 16kB with most features disabled.
+QMK runs on any USB-capable AVR or ARM microcontroller with enough flash space - generally 32kB+ for AVR, and 64kB+ for ARM. With significant disabling of features, QMK may *just* squeeze into 16kB AVR MCUs.
 
 ## Atmel AVR
 
@@ -8,7 +8,11 @@ The following use [LUFA](https://www.fourwalledcubicle.com/LUFA.php) as the USB
 
 * [ATmega16U2](https://www.microchip.com/wwwproducts/en/ATmega16U2) / [ATmega32U2](https://www.microchip.com/wwwproducts/en/ATmega32U2)
 * [ATmega16U4](https://www.microchip.com/wwwproducts/en/ATmega16U4) / [ATmega32U4](https://www.microchip.com/wwwproducts/en/ATmega32U4)
+  * SparkFun Pro Micro (and clones)
+  * PJRC Teensy 2.0
+  * Adafruit Feather 32U4
 * [AT90USB64](https://www.microchip.com/wwwproducts/en/AT90USB646) / [AT90USB128](https://www.microchip.com/wwwproducts/en/AT90USB1286)
+  * PJRC Teensy++ 2.0
 * [AT90USB162](https://www.microchip.com/wwwproducts/en/AT90USB162)
 
 Certain MCUs which do not have native USB will use [V-USB](https://www.obdev.at/products/vusb/index.html) instead:
@@ -25,11 +29,15 @@ You can also use any ARM chip with USB that [ChibiOS](https://www.chibios.org) s
 
  * [STM32F0x2](https://www.st.com/en/microcontrollers-microprocessors/stm32f0x2.html)
  * [STM32F103](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html)
+   * Bluepill (with STM32duino bootloader)
  * [STM32F303](https://www.st.com/en/microcontrollers-microprocessors/stm32f303.html)
+   * QMK Proton-C
  * [STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)
+   * WeAct Blackpill
  * [STM32F405](https://www.st.com/en/microcontrollers-microprocessors/stm32f405-415.html)
  * [STM32F407](https://www.st.com/en/microcontrollers-microprocessors/stm32f407-417.html)
  * [STM32F411](https://www.st.com/en/microcontrollers-microprocessors/stm32f411.html)
+   * WeAct Blackpill
  * [STM32F446](https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html)
  * [STM32G431](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x1.html)
  * [STM32G474](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x4.html)
@@ -45,13 +53,16 @@ You can also use any ARM chip with USB that [ChibiOS](https://www.chibios.org) s
 ### NXP (Kinetis)
 
  * [MKL26Z64](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/kl-series-cortex-m0-plus/kinetis-kl2x-72-96-mhz-usb-ultra-low-power-microcontrollers-mcus-based-on-arm-cortex-m0-plus-core:KL2x)
+   * PJRC Teensy LC
  * [MK20DX128](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/k-series-cortex-m4/k2x-usb/kinetis-k20-50-mhz-full-speed-usb-mixed-signal-integration-microcontrollers-based-on-arm-cortex-m4-core:K20_50)
  * [MK20DX256](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/k-series-cortex-m4/k2x-usb/kinetis-k20-72-mhz-full-speed-usb-mixed-signal-integration-microcontrollers-mcus-based-on-arm-cortex-m4-core:K20_72)
+   * PJRC Teensy 3.2
  * [MK66FX1M0](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/k-series-cortex-m4/k6x-ethernet/kinetis-k66-180-mhz-dual-high-speed-full-speed-usbs-2mb-flash-microcontrollers-mcus-based-on-arm-cortex-m4-core:K66_180)
+   * PJRC Teensy 3.6
 
 ## Atmel ATSAM
 
-There is limited support for one of Atmel's ATSAM microcontrollers, that being the [ATSAMD51J18A](https://www.microchip.com/wwwproducts/en/ATSAMD51J18A) used by the [Massdrop keyboards](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop).
+There is limited support for one of Atmel's ATSAM microcontrollers, that being the [ATSAMD51J18A](https://www.microchip.com/wwwproducts/en/ATSAMD51J18A) used by the [Massdrop keyboards](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop). However, it is not recommended to design a board with this microcontroller as the support is quite specialized to Massdrop hardware.
 
 ## RISC-V
 

From d840ef2b2855c7c6094e5881a4bc78a05297a488 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 19 Jan 2022 17:38:48 +0000
Subject: [PATCH 328/867] Relocate matrix_scan_quantum tasks (#15882)

* Move matrix_scan_quantum tasks

* Fix tests

* Fix up missing refs
---
 quantum/keyboard.c | 70 ++++++++++++++++++++++++++++++++++++++++++++
 quantum/quantum.c  | 73 ++--------------------------------------------
 2 files changed, 72 insertions(+), 71 deletions(-)

diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 67f7381f74..fa20c675c3 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -16,6 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <stdint.h>
+#include "quantum.h"
 #include "keyboard.h"
 #include "matrix.h"
 #include "keymap.h"
@@ -450,6 +451,73 @@ MATRIX_LOOP_END:
     return matrix_changed;
 }
 
+/** \brief Tasks previously located in matrix_scan_quantum
+ *
+ * TODO: rationalise against keyboard_task and current split role
+ */
+void quantum_task(void) {
+#ifdef SPLIT_KEYBOARD
+    // some tasks should only run on master
+    if (!is_keyboard_master()) return;
+#endif
+
+#if defined(AUDIO_ENABLE) && defined(AUDIO_INIT_DELAY)
+    // There are some tasks that need to be run a little bit
+    // after keyboard startup, or else they will not work correctly
+    // because of interaction with the USB device state, which
+    // may still be in flux...
+    //
+    // At the moment the only feature that needs this is the
+    // startup song.
+    static bool     delayed_tasks_run  = false;
+    static uint16_t delayed_task_timer = 0;
+    if (!delayed_tasks_run) {
+        if (!delayed_task_timer) {
+            delayed_task_timer = timer_read();
+        } else if (timer_elapsed(delayed_task_timer) > 300) {
+            audio_startup();
+            delayed_tasks_run = true;
+        }
+    }
+#endif
+
+#if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
+    music_task();
+#endif
+
+#ifdef KEY_OVERRIDE_ENABLE
+    key_override_task();
+#endif
+
+#ifdef SEQUENCER_ENABLE
+    sequencer_task();
+#endif
+
+#ifdef TAP_DANCE_ENABLE
+    tap_dance_task();
+#endif
+
+#ifdef COMBO_ENABLE
+    combo_task();
+#endif
+
+#ifdef WPM_ENABLE
+    decay_wpm();
+#endif
+
+#ifdef HAPTIC_ENABLE
+    haptic_task();
+#endif
+
+#ifdef DIP_SWITCH_ENABLE
+    dip_switch_read(false);
+#endif
+
+#ifdef AUTO_SHIFT_ENABLE
+    autoshift_matrix_scan();
+#endif
+}
+
 /** \brief Keyboard task: Do keyboard routine jobs
  *
  * Do routine keyboard jobs:
@@ -465,6 +533,8 @@ void keyboard_task(void) {
     bool matrix_changed = matrix_scan_task();
     (void)matrix_changed;
 
+    quantum_task();
+
 #if defined(RGBLIGHT_ENABLE)
     rgblight_task();
 #endif
diff --git a/quantum/quantum.c b/quantum/quantum.c
index c106f795d0..ac99bcbd45 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -47,10 +47,6 @@ float default_layer_songs[][16][2] = DEFAULT_LAYER_SONGS;
 #    endif
 #endif
 
-#ifdef AUTO_SHIFT_ENABLE
-#    include "process_auto_shift.h"
-#endif
-
 uint8_t extract_mod_bits(uint16_t code) {
     switch (code) {
         case QK_MODS ... QK_MODS_MAX:
@@ -400,73 +396,8 @@ void matrix_init_quantum() {
     matrix_init_kb();
 }
 
-void matrix_scan_quantum() {
-#if defined(AUDIO_ENABLE) && defined(AUDIO_INIT_DELAY)
-    // There are some tasks that need to be run a little bit
-    // after keyboard startup, or else they will not work correctly
-    // because of interaction with the USB device state, which
-    // may still be in flux...
-    //
-    // At the moment the only feature that needs this is the
-    // startup song.
-    static bool     delayed_tasks_run  = false;
-    static uint16_t delayed_task_timer = 0;
-    if (!delayed_tasks_run) {
-        if (!delayed_task_timer) {
-            delayed_task_timer = timer_read();
-        } else if (timer_elapsed(delayed_task_timer) > 300) {
-            audio_startup();
-            delayed_tasks_run = true;
-        }
-    }
-#endif
-
-#if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
-    music_task();
-#endif
-
-#ifdef KEY_OVERRIDE_ENABLE
-    key_override_task();
-#endif
-
-#ifdef SEQUENCER_ENABLE
-    sequencer_task();
-#endif
-
-#ifdef TAP_DANCE_ENABLE
-    tap_dance_task();
-#endif
-
-#ifdef COMBO_ENABLE
-    combo_task();
-#endif
-
-#ifdef LED_MATRIX_ENABLE
-    led_matrix_task();
-#endif
-
-#ifdef WPM_ENABLE
-    decay_wpm();
-#endif
-
-#ifdef HAPTIC_ENABLE
-    haptic_task();
-#endif
-
-#ifdef DIP_SWITCH_ENABLE
-    dip_switch_read(false);
-#endif
-
-#ifdef AUTO_SHIFT_ENABLE
-    autoshift_matrix_scan();
-#endif
-
-    matrix_scan_kb();
-}
-
-#ifdef HD44780_ENABLED
-#    include "hd44780.h"
-#endif
+// TODO: remove legacy api
+void matrix_scan_quantum() { matrix_scan_kb(); }
 
 //------------------------------------------------------------------------------
 // Override these functions in your keymap file to play different tunes on

From 6156e6da8d1af60da5c0b64ca7b45908984d1660 Mon Sep 17 00:00:00 2001
From: Andre Brait <andrebrait@gmail.com>
Date: Wed, 19 Jan 2022 21:53:21 +0100
Subject: [PATCH 329/867] Small code improvements, fix KVM switch issues with
 GMMK Pro on andrebrait's keymap (#15943)

* Add LED table

* Make constants constant

* Disable Mousekey to fix issues with KVM

Fixes #15939

* Update GMMK/pro/ansi/andrebrait README
---
 .../gmmk/pro/ansi/keymaps/andrebrait/keymap.c | 21 ++++++++++++++-----
 .../pro/ansi/keymaps/andrebrait/readme.md     |  1 +
 .../gmmk/pro/ansi/keymaps/andrebrait/rules.mk |  1 +
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c
index b801640436..74a45b7036 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c
+++ b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c
@@ -214,12 +214,12 @@ void rgb_matrix_indicators_user() {
     #if RGB_CONFIRMATION_BLINKING_TIME > 0
     if (effect_started_time > 0) {
         /* Render blinking EFFECTS */
-        uint16_t deltaTime = sync_timer_elapsed(effect_started_time);
+        const uint16_t deltaTime = sync_timer_elapsed(effect_started_time);
         if (deltaTime <= RGB_CONFIRMATION_BLINKING_TIME) {
-            uint8_t led_state = ((~deltaTime) >> TIME_SELECTED_BIT) & 0x01;
-            uint8_t val_r = led_state * r_effect;
-            uint8_t val_g = led_state * g_effect;
-            uint8_t val_b = led_state * b_effect;
+            const uint8_t led_state = ((~deltaTime) >> TIME_SELECTED_BIT) & 0x01;
+            const uint8_t val_r = led_state * r_effect;
+            const uint8_t val_g = led_state * g_effect;
+            const uint8_t val_b = led_state * b_effect;
             rgb_matrix_set_color_all(val_r, val_g, val_b);
             if (host_keyboard_led_state().caps_lock) {
                 set_rgb_caps_leds();
@@ -264,6 +264,17 @@ static void start_effects() {
 }
 #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
 
+// RGB led number layout, function of the key
+
+//  67, led 01   0, ESC    6, F1      12, F2      18, F3   23, F4   28, F5      34, F6   39, F7   44, F8      50, F9   56, F10   61, F11    66, F12    69, Prt       Rotary(Mute)   68, led 12
+//  70, led 02   1, ~      7, 1       13, 2       19, 3    24, 4    29, 5       35, 6    40, 7    45, 8       51, 9    57, 0     62, -_     78, (=+)   85, BackSpc   72, Home       71, led 13
+//  73, led 03   2, Tab    8, Q       14, W       20. E    25, R    30, T       36, Y    41, U    46, I       52, O    58, P     63, [{     89, ]}     93, \|        75, PgUp       74, led 14
+//  76, led 04   3, Caps   9, A       15, S       21, D    26, F    31, G       37, H    42, J    47, K       53, L    59, ;:    64, '"                96, Enter     86, PgDn       77, led 15
+//  80, led 05   4, Sh_L   10, Z      16, X       22, C    27, V    32, B       38, N    43, M    48, ,<      54, .<   60, /?               90, Sh_R   94, Up        82, End        81, led 16
+//  83, led 06   5, Ct_L   11,Win_L   17, Alt_L                     33, SPACE                     49, Alt_R   55, FN             65, Ct_R   95, Left   97, Down      79, Right      84, led 17
+//  87, led 07                                                                                                                                                                      88, led 18
+//  91, led 08                                                                                                                                                                      92, led 19
+
 static void set_rgb_caps_leds() {
     rgb_matrix_set_color(67, 0xFF, 0x0, 0x0); // Left side LED 1
     rgb_matrix_set_color(68, 0xFF, 0x0, 0x0); // Right side LED 1
diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md
index e7f9978cee..5cb49bd836 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md
+++ b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md
@@ -5,6 +5,7 @@ It basically reflects my needs for both Delete and Insert being readily availabl
 
 The differences are as follows:
 
+- Disabled Mouse Keys (to fix issues with KVM switches and also because they're not used here anyway)
 - Short DEBOUNCE time (5 ms)
 - Per-key debounce algorithm (sym_defer_pk)
 - RGB turns off after 20 minutes of inactivity
diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk
index 650c79fbdc..6024d42f1d 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk
+++ b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk
@@ -1,3 +1,4 @@
 # Enable additional features.
 
 DEBOUNCE_TYPE = sym_defer_pk
+MOUSEKEY_ENABLE = no

From 6ebb44f17e7bb3df8492c6498289a44c01c59277 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Thu, 20 Jan 2022 09:23:16 -0800
Subject: [PATCH 330/867] [Bug][Core] Fix optical sensor firmware upload
 (#15919)

---
 docs/feature_pointing_device.md    | 19 ++++++++++---------
 drivers/sensors/adns9800.c         |  6 ++----
 drivers/sensors/adns9800_srom_A6.h |  2 +-
 drivers/sensors/pmw3360.c          | 12 ++++--------
 drivers/sensors/pmw3389.c          | 10 ++++------
 5 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 5f1260eede..84ab885738 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -40,13 +40,13 @@ POINTING_DEVICE_DRIVER = adns9800
 
 The ADNS 9800 is an SPI driven optical sensor, that uses laser output for surface tracking. 
 
-| Setting                | Description                                                            | Default       |
-|------------------------|------------------------------------------------------------------------|---------------|
-|`ADNS9800_CLOCK_SPEED`  | (Optional) Sets the clock speed that the sensor runs at.               | `2000000`     |
-|`ADNS9800_SPI_LSBFIRST` | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false`       |
-|`ADNS9800_SPI_MODE`     | (Optional) Sets the SPI Mode for the sensor.                           | `3`           |
-|`ADNS9800_SPI_DIVISOR`  | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_      |
-|`ADNS9800_CS_PIN`       | (Required) Sets the Cable Select pin connected to the sensor.          | _not defined_ |
+| Setting                        | Description                                                            | Default       |
+|--------------------------------|------------------------------------------------------------------------|---------------|
+|`ADNS9800_CLOCK_SPEED`          | (Optional) Sets the clock speed that the sensor runs at.               | `2000000`     |
+|`ADNS9800_SPI_LSBFIRST`         | (Optional) Sets the Least/Most Significant Byte First setting for SPI. | `false`       |
+|`ADNS9800_SPI_MODE`             | (Optional) Sets the SPI Mode for the sensor.                           | `3`           |
+|`ADNS9800_SPI_DIVISOR`          | (Optional) Sets the SPI Divisor used for SPI communication.            | _varies_      |
+|`ADNS9800_CS_PIN`               | (Required) Sets the Cable Select pin connected to the sensor.          | _not defined_ |
 
 
 The CPI range is 800-8200, in increments of 200. Defaults to 1800 CPI. 
@@ -150,8 +150,8 @@ The PMW 3360 is an SPI driven optical sensor, that uses a built in IR LED for su
 |`PMW3360_SPI_MODE`               | (Optional) Sets the SPI Mode for the sensor.                                               | `3`           |
 |`PMW3360_SPI_DIVISOR`            | (Optional) Sets the SPI Divisor used for SPI communication.                                | _varies_      |
 |`PMW3360_LIFTOFF_DISTANCE`       | (Optional) Sets the lift off distance at run time                                          | `0x02`        |
-|`ROTATIONAL_TRANSFORM_ANGLE`     | (Optional) Allows for the sensor data to be rotated +/- 127 degrees directly in the sensor. | `0`           |
-|`PMW3360_LEGACY_FIRMWARE_UPLOAD` | (Optional) Switches to older, manual upload of firmware, for compatibility.                | _not defined_     |
+|`ROTATIONAL_TRANSFORM_ANGLE`     | (Optional) Allows for the sensor data to be rotated +/- 127 degrees directly in the sensor.| `0`           |
+|`PMW3360_FIRMWARE_UPLOAD_FAST`   | (Optional) Skips the 15us wait between firmware blocks.                                    | _not defined_ |
 
 The CPI range is 100-12000, in increments of 100. Defaults to 1600 CPI.
 
@@ -174,6 +174,7 @@ The PMW 3389 is an SPI driven optical sensor, that uses a built in IR LED for su
 |`PMW3389_SPI_DIVISOR`            | (Optional) Sets the SPI Divisor used for SPI communication.                                | _varies_      |
 |`PMW3389_LIFTOFF_DISTANCE`       | (Optional) Sets the lift off distance at run time                                          | `0x02`        |
 |`ROTATIONAL_TRANSFORM_ANGLE`     | (Optional) Allows for the sensor data to be rotated +/- 30 degrees directly in the sensor. | `0`           |
+|`PMW3389_FIRMWARE_UPLOAD_FAST`   | (Optional) Skips the 15us wait between firmware blocks.                                    | _not defined_ |
 
 The CPI range is 50-16000, in increments of 50. Defaults to 2000 CPI.
 
diff --git a/drivers/sensors/adns9800.c b/drivers/sensors/adns9800.c
index 425cf9912f..d167841968 100644
--- a/drivers/sensors/adns9800.c
+++ b/drivers/sensors/adns9800.c
@@ -135,10 +135,8 @@ void adns9800_init() {
     wait_us(15);
 
     // send all bytes of the firmware
-    unsigned char c;
-    for (int i = 0; i < FIRMWARE_LENGTH; i++) {
-        c = (unsigned char)pgm_read_byte(adns9800_firmware_data + i);
-        spi_write(c);
+    for (uint16_t i = 0; i < FIRMWARE_LENGTH; i++) {
+        spi_write(pgm_read_byte(firmware_data + i));
         wait_us(15);
     }
 
diff --git a/drivers/sensors/adns9800_srom_A6.h b/drivers/sensors/adns9800_srom_A6.h
index d86ecbbd9e..e698a401b9 100644
--- a/drivers/sensors/adns9800_srom_A6.h
+++ b/drivers/sensors/adns9800_srom_A6.h
@@ -6,7 +6,7 @@
 
 // clang-format off
 
-const uint8_t adns9800_firmware_data[FIRMWARE_LENGTH] PROGMEM = {
+const uint8_t firmware_data[FIRMWARE_LENGTH] PROGMEM = {
     0x03, 0xA6, 0x68, 0x1E, 0x7D, 0x10, 0x7E, 0x7E, 0x5F, 0x1C, 0xB8, 0xF2, 0x47, 0x0C, 0x7B, 0x74,
     0x4B, 0x14, 0x8B, 0x75, 0x66, 0x51, 0x0B, 0x8C, 0x76, 0x74, 0x4B, 0x14, 0xAA, 0xD6, 0x0F, 0x9C,
     0xBA, 0xF6, 0x6E, 0x3F, 0xDD, 0x38, 0xD5, 0x02, 0x80, 0x9B, 0x82, 0x6D, 0x58, 0x13, 0xA4, 0xAB,
diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index 0dac600cc2..8d1b08e22b 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -206,16 +206,12 @@ void pmw3360_upload_firmware(void) {
     spi_write(REG_SROM_Load_Burst | 0x80);
     wait_us(15);
 
-#ifdef PMW3360_LEGACY_FIRMWARE_UPLOAD
-    unsigned char c;
-    for (int i = 0; i < FIRMWARE_LENGTH; i++) {
-        c = (unsigned char)pgm_read_byte(firmware_data + i);
-        spi_write(c);
+    for (uint16_t i = 0; i < FIRMWARE_LENGTH; i++) {
+        spi_write(pgm_read_byte(firmware_data + i));
+#ifndef PMW3360_FIRMWARE_UPLOAD_FAST
         wait_us(15);
-    }
-#else
-    spi_transmit(firmware_data, sizeof(firmware_data));
 #endif
+    }
     wait_us(200);
 
     pmw3360_read(REG_SROM_ID);
diff --git a/drivers/sensors/pmw3389.c b/drivers/sensors/pmw3389.c
index d6f02b6a59..963925bd38 100644
--- a/drivers/sensors/pmw3389.c
+++ b/drivers/sensors/pmw3389.c
@@ -210,14 +210,12 @@ void pmw3389_upload_firmware(void) {
     spi_write(REG_SROM_Load_Burst | 0x80);
     wait_us(15);
 
-    // legacy only for PMW3389 spi_transmit failed to load firmware
-    unsigned char c;
-    for (int i = 0; i < FIRMWARE_LENGTH; i++) {
-        c = (unsigned char)pgm_read_byte(firmware_data + i);
-        spi_write(c);
+    for (uint16_t i = 0; i < FIRMWARE_LENGTH; i++) {
+        spi_write(pgm_read_byte(firmware_data + i));
+#ifndef PMW3389_FIRMWARE_UPLOAD_FAST
         wait_us(15);
+#endif
     }
-
     wait_us(200);
 
     pmw3389_read(REG_SROM_ID);

From 39a5ffd782e5455d3294293a1f535673fedb3cbc Mon Sep 17 00:00:00 2001
From: npspears <40127181+npspears@users.noreply.github.com>
Date: Thu, 20 Jan 2022 11:24:51 -0600
Subject: [PATCH 331/867] [Keyboard] add Plexus75_HE (#15634)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/checkerboards/plexus75_he/config.h  |  64 ++++++++++
 keyboards/checkerboards/plexus75_he/info.json |  16 +++
 .../plexus75_he/keymaps/2x2u/config.h         |  18 +++
 .../plexus75_he/keymaps/2x2u/keymap.c         |  88 ++++++++++++++
 .../plexus75_he/keymaps/7u/config.h           |  18 +++
 .../plexus75_he/keymaps/7u/keymap.c           |  65 +++++++++++
 .../plexus75_he/keymaps/default/config.h      |  18 +++
 .../plexus75_he/keymaps/default/keymap.c      |  88 ++++++++++++++
 .../plexus75_he/keymaps/default/readme.md     |   1 +
 .../plexus75_he/keymaps/via/keymap.c          | 109 ++++++++++++++++++
 .../plexus75_he/keymaps/via/rules.mk          |   1 +
 .../checkerboards/plexus75_he/plexus75_he.c   |  17 +++
 .../checkerboards/plexus75_he/plexus75_he.h   |  76 ++++++++++++
 keyboards/checkerboards/plexus75_he/readme.md |  17 +++
 keyboards/checkerboards/plexus75_he/rules.mk  |  18 +++
 15 files changed, 614 insertions(+)
 create mode 100644 keyboards/checkerboards/plexus75_he/config.h
 create mode 100644 keyboards/checkerboards/plexus75_he/info.json
 create mode 100644 keyboards/checkerboards/plexus75_he/keymaps/2x2u/config.h
 create mode 100644 keyboards/checkerboards/plexus75_he/keymaps/2x2u/keymap.c
 create mode 100644 keyboards/checkerboards/plexus75_he/keymaps/7u/config.h
 create mode 100644 keyboards/checkerboards/plexus75_he/keymaps/7u/keymap.c
 create mode 100644 keyboards/checkerboards/plexus75_he/keymaps/default/config.h
 create mode 100644 keyboards/checkerboards/plexus75_he/keymaps/default/keymap.c
 create mode 100644 keyboards/checkerboards/plexus75_he/keymaps/default/readme.md
 create mode 100644 keyboards/checkerboards/plexus75_he/keymaps/via/keymap.c
 create mode 100644 keyboards/checkerboards/plexus75_he/keymaps/via/rules.mk
 create mode 100644 keyboards/checkerboards/plexus75_he/plexus75_he.c
 create mode 100644 keyboards/checkerboards/plexus75_he/plexus75_he.h
 create mode 100644 keyboards/checkerboards/plexus75_he/readme.md
 create mode 100644 keyboards/checkerboards/plexus75_he/rules.mk

diff --git a/keyboards/checkerboards/plexus75_he/config.h b/keyboards/checkerboards/plexus75_he/config.h
new file mode 100644
index 0000000000..62e177684c
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/config.h
@@ -0,0 +1,64 @@
+/* Copyright 2021 Nathan Spears
+ *
+ * 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       0x7070
+#define PRODUCT_ID      0x5339
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Nasp
+#define PRODUCT         Plexus75_HE
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { C2, D0, D1, D2, D6, B0, B3, B2, C6, B1 }
+#define MATRIX_COL_PINS { C4, C5, D3, C7, B7, B6, B5, B4 }
+#define UNUSED_PINS
+
+/* 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
+
+// ws2812 options
+#define RGB_DI_PIN D4 // pin the DI on the ws2812 is hooked-up to
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 18 // number of LEDs
+#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
+#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
+#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/keyboards/checkerboards/plexus75_he/info.json b/keyboards/checkerboards/plexus75_he/info.json
new file mode 100644
index 0000000000..d19e58d8ca
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Plexus75_he",
+    "url": "https://www.github.com/qmk/qmk_firmware/tree/master/keyboards/checkerboards/plexus75_he",
+    "maintainer": "nasp",
+    "layouts": {
+        "LAYOUT_2x3u": {
+            "layout": [{"label":"=", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"[", "x":6, "y":0}, {"label":"]", "x":7, "y":0}, {"label":"`", "x":8, "y":0}, {"label":"6", "x":9, "y":0}, {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"9", "x":13, "y":0}, {"label":"-", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"7", "x":6, "y":1}, {"label":"8", "x":7, "y":1}, {"label":"9", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"Back Space", "x":14, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"4", "x":6, "y":2}, {"label":"5", "x":7, "y":2}, {"label":"6", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":";", "x":13, "y":2}, {"label":"'", "x":14, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"1", "x":6, "y":3}, {"label":"2", "x":7, "y":3}, {"label":"3", "x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":",", "x":11, "y":3}, {"label":".", "x":12, "y":3}, {"label":"/", "x":13, "y":3}, {"label":"Return", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"OS", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":3}, {"x":7, "y":4}, {"x":8, "y":4, "w":3}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"OS", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+                      },
+	"LAYOUT_2x2u": {
+	    "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"1,1", "x":2, "y":0}, {"label":"1,2", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"0,3", "x":5, "y":0}, {"label":"1,3", "x":6, "y":0}, {"label":"1,4", "x":7, "y":0}, {"label":"0,4", "x":8, "y":0}, {"label":"0,5", "x":9, "y":0}, {"label":"1,5", "x":10, "y":0}, {"label":"1,6", "x":11, "y":0}, {"label":"0,6", "x":12, "y":0}, {"label":"0,7", "x":13, "y":0}, {"label":"1,7", "x":14, "y":0}, {"label":"2,0", "x":0, "y":1}, {"label":"2,1", "x":1, "y":1}, {"label":"3,1", "x":2, "y":1}, {"label":"3,2", "x":3, "y":1}, {"label":"2,2", "x":4, "y":1}, {"label":"2,3", "x":5, "y":1}, {"label":"3,3", "x":6, "y":1}, {"label":"3,4", "x":7, "y":1}, {"label":"2,4", "x":8, "y":1}, {"label":"2,5", "x":9, "y":1}, {"label":"3,5", "x":10, "y":1}, {"label":"3,6", "x":11, "y":1}, {"label":"2,6", "x":12, "y":1}, {"label":"2,7", "x":13, "y":1}, {"label":"3,7", "x":14, "y":1}, {"label":"4,0", "x":0, "y":2}, {"label":"4,1", "x":1, "y":2}, {"label":"5,1", "x":2, "y":2}, {"label":"5,2", "x":3, "y":2}, {"label":"4,2", "x":4, "y":2}, {"label":"4,3", "x":5, "y":2}, {"label":"5,3", "x":6, "y":2}, {"label":"5,4", "x":7, "y":2}, {"label":"4,4", "x":8, "y":2}, {"label":"4,5", "x":9, "y":2}, {"label":"5,5", "x":10, "y":2}, {"label":"5,6", "x":11, "y":2}, {"label":"4,6", "x":12, "y":2}, {"label":"4,7", "x":13, "y":2}, {"label":"5,7", "x":14, "y":2}, {"label":"6,0", "x":0, "y":3}, {"label":"6,1", "x":1, "y":3}, {"label":"7,1", "x":2, "y":3}, {"label":"7,2", "x":3, "y":3}, {"label":"6,2", "x":4, "y":3}, {"label":"6,3", "x":5, "y":3}, {"label":"7,3", "x":6, "y":3}, {"label":"7,4", "x":7, "y":3}, {"label":"6,4", "x":8, "y":3}, {"label":"6,5", "x":9, "y":3}, {"label":"7,5", "x":10, "y":3}, {"label":"7,6", "x":11, "y":3}, {"label":"6,6", "x":12, "y":3}, {"label":"6,7", "x":13, "y":3}, {"label":"7,7", "x":14, "y":3}, {"label":"8,0", "x":0, "y":4, "w":1.5}, {"label":"8,1", "x":1.5, "y":4}, {"label":"8,2", "x":2.5, "y":4, "w":1.5}, {"label":"9,2", "x":4, "y":4}, {"label":"8,3", "x":5, "y":4, "w":2}, {"label":"8,4", "x":7, "y":4}, {"label":"8,5", "x":8, "y":4, "w":2}, {"label":"9,5", "x":10, "y":4}, {"label":"8,6", "x":11, "y":4, "w":1.5}, {"label":"8,7", "x":12.5, "y":4}, {"label":"9,7", "x":13.5, "y":4, "w":1.5}]
+                      },
+        "LAYOUT_7u": {
+            "layout": [{"label":"=", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"[", "x":6, "y":0}, {"label":"]", "x":7, "y":0}, {"label":"`", "x":8, "y":0}, {"label":"6", "x":9, "y":0}, {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"9", "x":13, "y":0}, {"label":"-", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"7", "x":6, "y":1}, {"label":"8", "x":7, "y":1}, {"label":"9", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"Back Space", "x":14, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"4", "x":6, "y":2}, {"label":"5", "x":7, "y":2}, {"label":"6", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":";", "x":13, "y":2}, {"label":"'", "x":14, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"1", "x":6, "y":3}, {"label":"2", "x":7, "y":3}, {"label":"3", "x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":",", "x":11, "y":3}, {"label":".", "x":12, "y":3}, {"label":"/", "x":13, "y":3}, {"label":"Return", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"OS", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"label":"", "x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"OS", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
+                      }
+               }
+}
diff --git a/keyboards/checkerboards/plexus75_he/keymaps/2x2u/config.h b/keyboards/checkerboards/plexus75_he/keymaps/2x2u/config.h
new file mode 100644
index 0000000000..9028fcf9fb
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/keymaps/2x2u/config.h
@@ -0,0 +1,18 @@
+/*
+ * 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 TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/plexus75_he/keymaps/2x2u/keymap.c b/keyboards/checkerboards/plexus75_he/keymaps/2x2u/keymap.c
new file mode 100644
index 0000000000..a851edd29a
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/keymaps/2x2u/keymap.c
@@ -0,0 +1,88 @@
+/* Copyright 2021 Nathan Spears
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Base Layer
+     * .-----------------------------------------------------------------------------------------------------------------------------------------'
+     * |  =        | 1      | 2      | 3      | 4      | 5      | [      | ]      | `      | 6      | 7      | 8      | 9      | 0      | -      |
+     * |-----------+--------+--------+------- +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | TAB       | Q      | W      | E      | R      | T      | 7      | 8      | 9      | Y      | U      | I      | O      | P      | BCKSPC |
+     * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | ESC(CTRL) | A      | S      | D      | F      | G      | 4      | 5      |  6     | H      | J      | K      | L      | ;      | '      |
+     * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+------- +--------+--------+--------|
+     * | LSHIFT    | Z      | X      | C      | V      | B      | 1      | 2      | 3      | N      | M      | ,      | .      | /      | ENTER  |
+     * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * |    PRNSCRN    |   LGUI    |   LALT   |    MENU    |    TT(1)   |     O    |    SPACE (2)    |  RGB_TOG  |   RALT  |   RGUI   |   CAPS   |
+     * '-----------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [0] = LAYOUT_2x2u(
+      KC_EQL,        KC_1,    KC_2,    KC_3,     KC_4,    KC_5,    KC_LBRC,       KC_RBRC,   KC_GRV,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+      KC_TAB,        KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,    KC_P7,         KC_P8,     KC_P9,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+      CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,     KC_F,    KC_G,    KC_P4,         KC_P5,     KC_P6,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,       KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_P1,         KC_P2,     KC_P3,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+      KC_PSCR,       KC_LGUI, KC_LALT, KC_MENU,  TT(1),   KC_P0,   LT(2, KC_SPC), RGB_TOG,   KC_RALT,   KC_RGUI,   KC_CAPS
+    ),
+
+    /* Function Layer
+     * .-------------------------------------------------------------------------------------------------------------------------------------'
+     * | `      | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | F13   | DEL    |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------+--------|
+     * |        |        | MENU   |        |        |        |        |        |        |        |        |        | PRT SC |        |       |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+----------------|
+     * |        |        |        |        |        |        |        |        |        |        |        |        |        | RESET   |      |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+----------------|
+     * |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP | \      |        |       |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+----------------|
+     * | RESET        | RESET       |           |           |           |          |          |          |           |           |           |
+     * '-------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [1] = LAYOUT_2x2u(
+        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_F13, KC_DEL,
+        _______, _______, KC_APP,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______,
+        RESET, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    /* 2nd Function Layer
+     * .-------------------------------------------------------------------------------------------------------------------------------------'
+     * |        |        |RGB ON OFF|HUE INC|HUE DEC|SAT INC |SAT DEC |        |        |        |        |        |        |       |PRNSCRN |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------+--------|
+     * | `      | 1      | 2      | 3      | 4      | 5      |        |        |        | 6      | 7      | 8      | 9      |  0    |        |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+----------------|
+     * |  ~     | !      |  @     |  #     |  $     |  %     |        |        |        |  ^     |  &     |  *     |  (     |  )    | BCKSPC |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+----------------|
+     * |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP | \      |       |        |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+----------------|
+     * | RESET        | RESET       |           |           |           |          |          |          |           |           |           |
+     * '-------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [2] = LAYOUT_2x2u(
+        _______, _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
+        KC_GRV,     KC_1,   KC_2,     KC_3,    KC_4,    KC_5, _______, _______, _______,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______,
+        RESET, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/checkerboards/plexus75_he/keymaps/7u/config.h b/keyboards/checkerboards/plexus75_he/keymaps/7u/config.h
new file mode 100644
index 0000000000..9028fcf9fb
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/keymaps/7u/config.h
@@ -0,0 +1,18 @@
+/*
+ * 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 TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/plexus75_he/keymaps/7u/keymap.c b/keyboards/checkerboards/plexus75_he/keymaps/7u/keymap.c
new file mode 100644
index 0000000000..4dee2683b1
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/keymaps/7u/keymap.c
@@ -0,0 +1,65 @@
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* Base Layer
+   * .-----------------------------------------------------------------------------------------------------------------------------------------'
+   * |  =        | 1      | 2      | 3      | 4      | 5      | [      | ]      | `      | 6      | 7      | 8      | 9      | 0      | -      |
+   * |-----------+--------+--------+------- +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+   * | TAB       | Q      | W      | E      | R      | T      | 7      | 8      | 9      | Y      | U      | I      | O      | P      | BCKSPC |
+   * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+   * | ESC(CTRL) | A      | S      | D      | F      | G      | 4      | 5      |  6     | H      | J      | K      | L      | ;      | '      |
+   * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+------- +--------+--------+--------|
+   * | LSHIFT    | Z      | X      | C      | V      | B      | 1      | 2      | 3      | N      | M      | ,      | .      | /      | ENTER  |
+   * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+   *            |  LCTRL  |  LGUI  |  LALT   |                        SPACE                            | RALT  |  MO (FN)  | APP    |
+   *'------------------------------------------------------------------------------------------------------------------------------------------'
+   */
+    [0] = LAYOUT_7u(
+      KC_EQL,        KC_1,    KC_2,    KC_3,     KC_4,    KC_5,    KC_LBRC,   KC_RBRC,   KC_GRV,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+      KC_TAB,        KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,    KC_P7,     KC_P8,     KC_P9,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+      CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,     KC_F,    KC_G,    KC_P4,     KC_P5,     KC_P6,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,       KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_P1,     KC_P2,     KC_P3,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+           KC_LCTL,  KC_LGUI,  KC_LALT,                                      KC_SPC,                                    KC_RALT,     MO(1),    KC_MENU
+    ),
+
+    /* Function Layer
+    * .-------------------------------------------------------------------------------------------------------------------------------------'
+    * | `      | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | F13   | DEL    |
+    * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------+--------|
+    * |        |        | MENU   |        |        |        |        |        |        |        |        |        | PRT SC |        |       |
+    * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+----------------|
+    * |        |        |        |        |        |        |        |        |        |        |        |        |        | RESET   |      |
+    * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+----------------|
+    * |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP | \      |        |       |
+    * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+----------------|
+    *          |        |       |        |                                                              |         |        |        |
+    *'--------------------------------------------------------------------------------------------------------------------------------------'
+    */
+    [1] = LAYOUT_7u(
+      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_F13, KC_DEL,
+      _______, _______, KC_APP,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______,
+        _______, _______, _______,                                 _______,                                        _______, _______, _______
+    )
+};
diff --git a/keyboards/checkerboards/plexus75_he/keymaps/default/config.h b/keyboards/checkerboards/plexus75_he/keymaps/default/config.h
new file mode 100644
index 0000000000..9028fcf9fb
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/keymaps/default/config.h
@@ -0,0 +1,18 @@
+/*
+ * 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 TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/plexus75_he/keymaps/default/keymap.c b/keyboards/checkerboards/plexus75_he/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b344c6d9ab
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/keymaps/default/keymap.c
@@ -0,0 +1,88 @@
+/* Copyright 2021 Nathan Spears
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Base Layer
+     * .-----------------------------------------------------------------------------------------------------------------------------------------'
+     * |  =        | 1      | 2      | 3      | 4      | 5      | [      | ]      | `      | 6      | 7      | 8      | 9      | 0      | -      |
+     * |-----------+--------+--------+------- +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | TAB       | Q      | W      | E      | R      | T      | 7      | 8      | 9      | Y      | U      | I      | O      | P      | BCKSPC |
+     * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | ESC(CTRL) | A      | S      | D      | F      | G      | 4      | 5      |  6     | H      | J      | K      | L      | ;      | '      |
+     * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+------- +--------+--------+--------|
+     * | LSHIFT    | Z      | X      | C      | V      | B      | 1      | 2      | 3      | N      | M      | ,      | .      | /      | ENTER  |
+     * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * |  PRNSCRN   |   LGUI   |    LALT    |  TT(_FN)  |    SPACE   |     O      |    SPACE    |   TT(_FN1)   |   RALT  |   RGUI   |    CAPS    |
+     * '-----------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [0] = LAYOUT_2x3u(
+      KC_EQL,        KC_1,    KC_2,    KC_3,     KC_4,    KC_5,    KC_LBRC,   KC_RBRC,   KC_GRV,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+      KC_TAB,        KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,    KC_P7,     KC_P8,     KC_P9,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+      CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,     KC_F,    KC_G,    KC_P4,     KC_P5,     KC_P6,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,       KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_P1,     KC_P2,     KC_P3,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+      KC_PSCR,       KC_LGUI, KC_LALT, TT(1),    KC_P0,   LT(2, KC_SPC),      KC_RALT,   KC_RGUI,   KC_CAPS
+    ),
+
+    /* Function Layer
+     * .-------------------------------------------------------------------------------------------------------------------------------------'
+     * | `      | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | F13   | DEL    |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------+--------|
+     * |        |        | MENU   |        |        |        |        |        |        |        |        |        | PRT SC |        |       |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+----------------|
+     * |        |        |        |        |        |        |        |        |        |        |        |        |        | RESET   |      |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+----------------|
+     * |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP | \      |        |       |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+----------------|
+     * |             | RESET  | RESET  |        |        |        |        |        |        |        |        |        |                    |
+     * '-------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [1] = LAYOUT_2x3u(
+        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_F13, KC_DEL,
+        _______, _______, KC_APP,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______,
+        RESET, RESET, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    /* 2nd Function Layer
+     * .-------------------------------------------------------------------------------------------------------------------------------------'
+     * |        |        |RGB ON OFF|HUE INC|HUE DEC|SAT INC |SAT DEC |        |        |        |        |        |        |       |PRNSCRN |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------+--------|
+     * | `      | 1      | 2      | 3      | 4      | 5      |        |        |        | 6      | 7      | 8      | 9      |  0    |        |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+----------------|
+     * |  ~     | !      |  @     |  #     |  $     |  %     |        |        |        |  ^     |  &     |  *     |  (     |  )    | BCKSPC |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+----------------|
+     * |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP | \      |       |        |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+----------------|
+     * |             | RESET  | RESET  |        |        |        |        |        |        |        |        |        |                    |
+     * '-------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [2] = LAYOUT_2x3u(
+        _______, _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
+        KC_GRV,     KC_1,   KC_2,     KC_3,    KC_4,    KC_5, _______, _______, _______,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______,
+        RESET, RESET, _______, _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/checkerboards/plexus75_he/keymaps/default/readme.md b/keyboards/checkerboards/plexus75_he/keymaps/default/readme.md
new file mode 100644
index 0000000000..353debb7d6
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Plexus75_HE with 2x3u bars
diff --git a/keyboards/checkerboards/plexus75_he/keymaps/via/keymap.c b/keyboards/checkerboards/plexus75_he/keymaps/via/keymap.c
new file mode 100644
index 0000000000..bb1d5657e5
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/keymaps/via/keymap.c
@@ -0,0 +1,109 @@
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Base Layer
+     * .-----------------------------------------------------------------------------------------------------------------------------------------'
+     * |  =        | 1      | 2      | 3      | 4      | 5      | [      | ]      | `      | 6      | 7      | 8      | 9      | 0      | -      |
+     * |-----------+--------+--------+------- +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | TAB       | Q      | W      | E      | R      | T      | 7      | 8      | 9      | Y      | U      | I      | O      | P      | BCKSPC |
+     * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | ESC(CTRL) | A      | S      | D      | F      | G      | 4      | 5      |  6     | H      | J      | K      | L      | ;      | '      |
+     * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+------- +--------+--------+--------|
+     * | LSHIFT    | Z      | X      | C      | V      | B      | 1      | 2      | 3      | N      | M      | ,      | .      | /      | ENTER  |
+     * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * |  PRNSCRN   |   LGUI   |    LALT    |  TT(_FN)  |    SPACE   |     O      |    SPACE    |   TT(_FN1)   |   RALT  |   RGUI   |    CAPS    |
+     * '-----------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [0] = LAYOUT_2x3u(
+      KC_EQL,        KC_1,    KC_2,    KC_3,     KC_4,    KC_5,    KC_LBRC,   KC_RBRC,   KC_GRV,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+      KC_TAB,        KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,    KC_P7,     KC_P8,     KC_P9,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+      CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,     KC_F,    KC_G,    KC_P4,     KC_P5,     KC_P6,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,       KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_P1,     KC_P2,     KC_P3,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+      KC_PSCR,    KC_LGUI, KC_LALT,    KC_SPC,   TT(1),   KC_SPC,  KC_RALT,  KC_RGUI, KC_CAPS
+    ),
+
+    /* 1st Layer
+     * .-------------------------------------------------------------------------------------------------------------------------------------'
+     * | `      | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | F13   | DEL    |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------+--------|
+     * |        |        | MENU   |        |        |        |        |        |        |        |        |        | PRT SC |        |       |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+----------------|
+     * |        |        |        |        |        |        |        |        |        |        |        |        |        | RESET   |      |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+----------------|
+     * |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP | \      |        |       |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+----------------|
+     * |             | RESET  | RESET  |        |        |        |        |        |        |        |        |        |                    |
+     * '-------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [1] = LAYOUT_2x3u(
+        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_F13,  KC_DEL,
+        _______, _______,  KC_APP, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   RESET, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______,
+        RESET, RESET, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    /* 2nd Layer
+     * .-------------------------------------------------------------------------------------------------------------------------------------'
+     * |        |        |RGB ON OFF|HUE INC|HUE DEC|SAT INC |SAT DEC |        |        |        |        |        |        |       |PRNSCRN |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------+--------|
+     * | `      | 1      | 2      | 3      | 4      | 5      |        |        |        | 6      | 7      | 8      | 9      |  0    |        |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+----------------|
+     * |  ~     | !      |  @     |  #     |  $     |  %     |        |        |        |  ^     |  &     |  *     |  (     |  )    | BCKSPC |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+----------------|
+     * |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP | \      |       |        |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+----------------|
+     * |             | RESET  | RESET  |        |        |        |        |        |        |        |        |        |                    |
+     * '-------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [2] = LAYOUT_2x3u(
+        _______, _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
+         KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5, _______, _______, _______,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
+        KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______,
+        RESET, RESET, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    /* 3rd Function Layer
+     * .-------------------------------------------------------------------------------------------------------------------------------------'
+     * |        |        |RGB ON OFF|HUE INC|HUE DEC|SAT INC |SAT DEC |        |        |        |        |        |        |       |PRNSCRN |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------+--------|
+     * | `      | 1      | 2      | 3      | 4      | 5      |        |        |        | 6      | 7      | 8      | 9      |  0    |        |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+----------------|
+     * |  ~     | !      |  @     |  #     |  $     |  %     |        |        |        |  ^     |  &     |  *     |  (     |  )    | BCKSPC |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+----------------|
+     * |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP | \      |       |        |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+----------------|
+     * |             | RESET  | RESET  |        |        |        |        |        |        |        |        |        |                    |
+     * '-------------------------------------------------------------------------------------------------------------------------------------'
+     */
+
+    [3] = LAYOUT_2x3u(
+        _______, _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
+        KC_GRV,     KC_1,   KC_2,     KC_3,    KC_4,    KC_5, _______, _______, _______,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______,
+        RESET, RESET, _______, _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/checkerboards/plexus75_he/keymaps/via/rules.mk b/keyboards/checkerboards/plexus75_he/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/checkerboards/plexus75_he/plexus75_he.c b/keyboards/checkerboards/plexus75_he/plexus75_he.c
new file mode 100644
index 0000000000..1c7dad7ab7
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/plexus75_he.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Nathan Spears
+ *
+ * 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 "plexus75_he.h"
diff --git a/keyboards/checkerboards/plexus75_he/plexus75_he.h b/keyboards/checkerboards/plexus75_he/plexus75_he.h
new file mode 100644
index 0000000000..0a01c6e144
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/plexus75_he.h
@@ -0,0 +1,76 @@
+/* Copyright 2021 Nathan Spears
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_2x2u( \
+    k00, k01, k11, k12, k02, k03, k13, k14, k04, k05, k15, k16, k06, k07, k17, \
+    k20, k21, k31, k32, k22, k23, k33, k34, k24, k25, k35, k36, k26, k27, k37, \
+    k40, k41, k51, k52, k42, k43, k53, k54, k44, k45, k55, k56, k46, k47, k57, \
+    k60, k61, k71, k72, k62, k63, k73, k74, k64, k65, k75, k76, k66, k67, k77, \
+    k80, k81, k82, k92, k83, k84, k85, k95, k86, k87, k97 \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
+    { XXX, k31, k32, k33, k34, k35, k36, k37 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
+    { XXX, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
+    { XXX, k71, k72, k73, k74, k75, k76, k77 }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87 }, \
+    { XXX, XXX, k92, XXX, XXX, k95, XXX, k97 }  \
+}
+#define LAYOUT_2x3u( \
+    k00, k01, k11, k12, k02, k03, k13, k14, k04, k05, k15, k16, k06, k07, k17, \
+    k20, k21, k31, k32, k22, k23, k33, k34, k24, k25, k35, k36, k26, k27, k37, \
+    k40, k41, k51, k52, k42, k43, k53, k54, k44, k45, k55, k56, k46, k47, k57, \
+    k60, k61, k71, k72, k62, k63, k73, k74, k64, k65, k75, k76, k66, k67, k77, \
+    k80, k81, k82, k83, k84, k85, k86, k87, k97 \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
+    { XXX, k31, k32, k33, k34, k35, k36, k37 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
+    { XXX, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
+    { XXX, k71, k72, k73, k74, k75, k76, k77 }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87 }, \
+    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k97 }  \
+}
+#define LAYOUT_7u( \
+    k00, k01, k11, k12, k02, k03, k13, k14, k04, k05, k15, k16, k06, k07, k17, \
+    k20, k21, k31, k32, k22, k23, k33, k34, k24, k25, k35, k36, k26, k27, k37, \
+    k40, k41, k51, k52, k42, k43, k53, k54, k44, k45, k55, k56, k46, k47, k57, \
+    k60, k61, k71, k72, k62, k63, k73, k74, k64, k65, k75, k76, k66, k67, k77, \
+    k80, k81, k82, k84, k86, k87, k97 \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { XXX, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
+    { XXX, k31, k32, k33, k34, k35, k36, k37 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
+    { XXX, k51, k52, k53, k54, k55, k56, k57 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
+    { XXX, k71, k72, k73, k74, k75, k76, k77 }, \
+    { k80, k81, k82, XXX, k84, XXX, k86, k87 }, \
+    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k97 }  \
+}
diff --git a/keyboards/checkerboards/plexus75_he/readme.md b/keyboards/checkerboards/plexus75_he/readme.md
new file mode 100644
index 0000000000..2b59e0da6d
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/readme.md
@@ -0,0 +1,17 @@
+# Plexus75_HE
+
+![Plexus75_HE](https://i.imgur.com/niz4raR.png)
+
+The Plexus75_HE is a hotswap version of the Plexus75. Another difference is the included RGB underglow. What is the OG Plexus75? It is a 60% ortholinear keyboard based on the XD75 but instead of an all 1u bottom row the Plexus75 has a more traditional bottom row similar to reg. 60% boards.
+
+* Keyboard Maintainer: [Nasp](https://github.com/npspears)
+* Hardware Supported: Plexus75_HE PCB
+* Hardware Availability: https://www.checkerboards.xyz/Plexus75-Hotswap-PCB_p_46.html
+
+Make example for this keyboard (after setting up your build environment):
+
+    make plexus75_he:default
+
+To enter the bootloader, short the two pins just underneath the spacebar on the left side.
+
+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).
diff --git a/keyboards/checkerboards/plexus75_he/rules.mk b/keyboards/checkerboards/plexus75_he/rules.mk
new file mode 100644
index 0000000000..95964a1fa5
--- /dev/null
+++ b/keyboards/checkerboards/plexus75_he/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 1a676c927fa45760e209348feeca758270eaf505 Mon Sep 17 00:00:00 2001
From: Gigahawk <jasperchan515@gmail.com>
Date: Thu, 20 Jan 2022 12:11:24 -0800
Subject: [PATCH 332/867] Add missing STM32F405 definition in qmk.constants
 (#15937)

---
 lib/python/qmk/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index 754091a97e..433b110523 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -13,7 +13,7 @@ QMK_FIRMWARE_UPSTREAM = 'qmk/qmk_firmware'
 MAX_KEYBOARD_SUBFOLDERS = 5
 
 # Supported processor types
-CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66FX1M0', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L433', 'STM32L443', 'GD32VF103', 'WB32F3G71'
+CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66FX1M0', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L433', 'STM32L443', 'GD32VF103', 'WB32F3G71'
 LUFA_PROCESSORS = 'at90usb162', 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None
 VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85'
 

From be06ef6af5bffa8aa6fd03fb4e1139ee780a1482 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <encukou@gmail.com>
Date: Thu, 20 Jan 2022 21:14:09 +0100
Subject: [PATCH 333/867] [Docs] Fix typo in ADNS 9800 sensor name (#15956)

---
 docs/feature_pointing_device.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 098a787ed8..fb6936620c 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -30,7 +30,7 @@ The ADNS 5050 sensor uses a serial type protocol for communication, and requires
 
 The CPI range is 125-1375, in increments of 125. Defaults to 500 CPI.
 
-### ADSN 9800 Sensor
+### ADNS 9800 Sensor
 
 To use the ADNS 9800 sensor, add this to your `rules.mk`
 

From e7cd8c48062c27b580126066a41684576e000d7b Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 21 Jan 2022 10:19:50 +1100
Subject: [PATCH 334/867] Remove `QMK_SUBPROJECT` definitions in makefile
 (#15958)

---
 build_keyboard.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/build_keyboard.mk b/build_keyboard.mk
index c12aa0fce0..6473e3e473 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -425,8 +425,7 @@ OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
 $(KEYMAP_OUTPUT)_SRC := $(SRC)
 $(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) \
 -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" \
--DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
--DQMK_SUBPROJECT -DQMK_SUBPROJECT_H -DQMK_SUBPROJECT_CONFIG_H
+-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\"
 $(KEYMAP_OUTPUT)_INC :=  $(VPATH) $(EXTRAINCDIRS)
 $(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)
 $(KEYBOARD_OUTPUT)_SRC := $(PLATFORM_SRC)

From 682ccec853ae14c6f418b84210fa4a97b86c2b0c Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 21 Jan 2022 10:20:24 +1100
Subject: [PATCH 335/867] Remove community-supported keyboards list from readme
 (#15957)

---
 keyboards/readme.md | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/keyboards/readme.md b/keyboards/readme.md
index a23d0845b2..856be49093 100644
--- a/keyboards/readme.md
+++ b/keyboards/readme.md
@@ -32,35 +32,4 @@ Designed and built in Felton, CA, Clueboards keyboard emphasize quality and loca
 
 These keyboards are part of the QMK repository, but their manufacturers are not official maintainers of the repository.
 
-* [9key](/keyboards/9key) &mdash; A 9-key minipad sold by Bishop Keyboards.
-* [Alps64](/keyboards/alps64) &mdash; A 60% keyboard for Alps keyswitches.
-* [AMJ60](/keyboards/amj60) &mdash; DIY/Assembled compact 60% keyboard.
-* [Arrow Pad](/keyboards/handwired/arrow_pad) &mdash; A custom creation by IBNobody.
-* [Atreus](/keyboards/atreus) &mdash; Made by Technomancy.
-* [Bantam44](/keyboards/bantam44) &mdash; It is a 44-key 40% staggered keyboard.
-* [DataHand](/keyboards/handwired/datahand) &mdash; DataHand keyboard converted to use a Teensy board.
-* [Ergodox Infinity](/keyboards/ergodox_infinity) - Ergonomic Split Keyboard by Input Club.
-* [GH60](/keyboards/gh60) &mdash; A 60% Geekhack community-driven project.
-* [GON NerD](/keyboards/gonnerd) &mdash; Korean custom 60% PCB
-* [Happy Hacking Keyboard](/keyboards/hhkb) &mdash; The Happy Hacking keyboard can be hacked with a custom controller to run QMK.
-* [Infinity 60%](/keyboards/infinity60) - &mdash; Compact community keyboard by Input Club.
-* [JD45](/keyboards/jd45) &mdash; Another Geekhack community project, designed by jdcarpe.
-* [JJ40](/keyboards/jj40) &mdash; ps2avrGB based ortholinear sold by KPrepublic
-* [JJ50](/keyboards/jj50) &mdash; A compact 50% (5x12) ortholinear keyboard sold by KPrepublic.
-* [KBD75](/keyboards/kbd75) &mdash; A 75% keyboard made by made by KBDFans.
-* [KC60](/keyboards/kc60) &mdash; A programmable Chinese-made keyboard, lost in the mists of time.
-* [Kinesis Advantage](/keyboards/kinesis) &mdash; Contoured ergonomic keyboard by Kinesis Computer Ergonomics.
-* [KMAC](/keyboards/kmac) &mdash; Korean custom keyboard.
-* [The Kitten Paw](/keyboards/kitten_paw) &mdash; A replacement controller (2016 revision) for the Filco Majestouch by [Bathroom Epiphanies](https://github.com/BathroomEpiphanies).
-* [Lets Split](/keyboards/lets_split) - Split ortholinear 40% keyboard.
-* [Phantom](/keyboards/phantom) &mdash; A tenkeyless kit by Teel, also from Geekhack.
-* [Retro Refit](/keyboards/handwired/retro_refit) &mdash; Another creation by IBNobody.
-* [S60-x](/keyboards/s60_x) &mdash; DIY compact keyboard designed by VinnyCordeiro for Sentraq.
-* [Satan](/keyboards/satan) &mdash; A GH60 variant.
-* [SixKeyBoard](/keyboards/sixkeyboard) &mdash; A 6-key keyboard made by TechKeys.
-* [TheVan 44](/keyboards/tv44) &mdash; A 44-key staggered keybard by Evangs.
-* [WhiteFox](/keyboards/whitefox) &mdash; A 65% keyboard designed as a partnership by matt3o, Massdrop and Input Club
-* [Vision Division](/keyboards/vision_division) &mdash; Full Size / Split Linear Keyboard by IBNobody.
-* [XD004](/keyboards/xd004) &mdash; 1x4 macro keyboard sold by KPrepublic.
-* [XD75](/keyboards/xd75) &mdash; 15x5 ortholinear keyboard by XIUDI.
-* [YMDK NP21](/keyboards/ymdk_np21) &mdash; ps2avrGB based number pad (numpad) sold by YMDK on Aliexpress.
+Since there are too many to list here and keep updated, please see the folder listing instead.

From 2baca55cda06d21c1f899aa0f9ea8b399083726a Mon Sep 17 00:00:00 2001
From: Gigahawk <jasperchan515@gmail.com>
Date: Thu, 20 Jan 2022 15:20:56 -0800
Subject: [PATCH 336/867] docs: fix typo in rgblight docs (#15960)

---
 docs/feature_rgblight.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index e707502613..e293b580d0 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -345,7 +345,7 @@ If you need to change your RGB lighting in code, for example in a macro to chang
 ### Low level Functions
 |Function                                    |Description                                |
 |--------------------------------------------|-------------------------------------------|
-|`rgblight_set()`                            |Flash out led buffers to LEDs              |
+|`rgblight_set()`                            |Flush out led buffers to LEDs              |
 |`rgblight_set_clipping_range(pos, num)`     |Set clipping Range. see [Clipping Range](#clipping-range) |
 
 Example:

From 94624d64bab74b11d93b86d8796dd83b4677e024 Mon Sep 17 00:00:00 2001
From: Wolf Van Herreweghe <wolfvanh@gmail.com>
Date: Fri, 21 Jan 2022 02:30:17 +0100
Subject: [PATCH 337/867] Update keymap on the TS60 (#15963)

Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
---
 keyboards/wolf/ts60/keymaps/default/keymap.c | 2 +-
 keyboards/wolf/ts60/keymaps/via/keymap.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/wolf/ts60/keymaps/default/keymap.c b/keyboards/wolf/ts60/keymaps/default/keymap.c
index fa2ac46964..9165bea341 100644
--- a/keyboards/wolf/ts60/keymaps/default/keymap.c
+++ b/keyboards/wolf/ts60/keymaps/default/keymap.c
@@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),  KC_RCTL
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(
diff --git a/keyboards/wolf/ts60/keymaps/via/keymap.c b/keyboards/wolf/ts60/keymaps/via/keymap.c
index 9d1b9aab62..65d06d649d 100644
--- a/keyboards/wolf/ts60/keymaps/via/keymap.c
+++ b/keyboards/wolf/ts60/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),  KC_RCTL
     ),
 
     [_LAYER1] = LAYOUT_60_ansi(

From ad09160b03d5139a1fa05ac1fb44c1451485a616 Mon Sep 17 00:00:00 2001
From: Gigahawk <jasperchan515@gmail.com>
Date: Fri, 21 Jan 2022 06:17:19 -0800
Subject: [PATCH 338/867] docs: fix typo in led matrix docs (#15972)

---
 docs/feature_led_matrix.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
index dfd63503f2..37f38cc6ed 100644
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -333,7 +333,7 @@ Where `28` is an unused index from `eeconfig.h`.
 If you want to set custom indicators, such as an LED for Caps Lock, or layer indication, you can use the `led_matrix_indicators_kb` or `led_matrix_indicators_user` function for that: 
 ```c
 void led_matrix_indicators_kb(void) {
-    led_matrix_set_color(index, value);
+    led_matrix_set_value(index, value);
 }
 ```
 

From 8901c9eca1db8d10b06f544553a5fc941eda51ae Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Fri, 21 Jan 2022 23:48:35 +0800
Subject: [PATCH 339/867] Add Atom editor suggestion (#15969)

---
 docs/newbs_learn_more_resources.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/newbs_learn_more_resources.md b/docs/newbs_learn_more_resources.md
index 1afdc206bd..a66ee4ab26 100644
--- a/docs/newbs_learn_more_resources.md
+++ b/docs/newbs_learn_more_resources.md
@@ -20,6 +20,7 @@ Not sure which text editor to use?
 Editors specifically made for code:
 * [Sublime Text](https://www.sublimetext.com/)
 * [VS Code](https://code.visualstudio.com/)
+* [Atom](https://atom.io/)
 
 ### Git resources
 

From b45a037c7edcd9c1cfadceb69ed51e7d42aa58c1 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 22 Jan 2022 14:34:15 +1100
Subject: [PATCH 340/867] Rename some Quantum keycodes (#15968)

* Rename some Quantum keycodes

* Tweak EEPROM clear and debug keycode short aliases
---
 docs/feature_grave_esc.md                   | 10 +++++-----
 docs/keycodes.md                            | 16 ++++++++--------
 docs/quantum_keycodes.md                    | 10 +++++-----
 quantum/process_keycode/process_grave_esc.c |  4 ++--
 quantum/quantum.c                           |  6 +++---
 quantum/quantum_keycodes.h                  | 16 ++++++++++------
 quantum/quantum_keycodes_legacy.h           | 13 +++++++++++++
 quantum/via_ensure_keycode.h                |  6 +++---
 8 files changed, 49 insertions(+), 32 deletions(-)
 create mode 100644 quantum/quantum_keycodes_legacy.h

diff --git a/docs/feature_grave_esc.md b/docs/feature_grave_esc.md
index f135b1dede..09d098ee4e 100644
--- a/docs/feature_grave_esc.md
+++ b/docs/feature_grave_esc.md
@@ -4,17 +4,17 @@ If you're using a 60% keyboard, or any other layout with no F-row, you will have
 
 ## Usage
 
-Replace the `KC_GRV` key in your keymap (usually to the left of the `1` key) with `KC_GESC`. Most of the time this key will output `KC_ESC` when pressed. However, when Shift or GUI are held down it will output `KC_GRV` instead.
+Replace the `KC_GRV` key in your keymap (usually to the left of the `1` key) with `QK_GESC`. Most of the time this key will output `KC_ESC` when pressed. However, when Shift or GUI are held down it will output `KC_GRV` instead.
 
 ## What Your OS Sees
 
-If Mary presses GESC on her keyboard, the OS will see an KC_ESC character. Now if Mary holds Shift down and presses GESC it will output `~`, or a shifted backtick. Now if she holds GUI/CMD/WIN, it will output a simple <code>&#96;</code> character.
+If Mary presses `QK_GESC` on her keyboard, the OS will see an KC_ESC character. Now if Mary holds Shift down and presses `QK_GESC` it will output `~`, or a shifted backtick. Now if she holds GUI/CMD/WIN, it will output a simple <code>&#96;</code> character.
 
 ## Keycodes
 
-|Key      |Aliases    |Description                                                       |
-|---------|-----------|------------------------------------------------------------------|
-|`KC_GESC`|`GRAVE_ESC`|Escape when pressed, <code>&#96;</code> when Shift or GUI are held|
+|Key              |Aliases  |Description                                                       |
+|-----------------|---------|------------------------------------------------------------------|
+|`QK_GRAVE_ESCAPE`|`QK_GESC`|Escape when pressed, <code>&#96;</code> when Shift or GUI are held|
 
 ### Caveats
 
diff --git a/docs/keycodes.md b/docs/keycodes.md
index dba530fc79..58ce43d309 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -219,11 +219,11 @@ See also: [Basic Keycodes](keycodes_basic.md)
 
 See also: [Quantum Keycodes](quantum_keycodes.md#qmk-keycodes)
 
-|Key           |Aliases  |Description                                            |
-|--------------|---------|-------------------------------------------------------|
-|`RESET`       |         |Put the keyboard into bootloader mode for flashing     |
-|`DEBUG`       |         |Toggle debug mode                                      |
-|`EEPROM_RESET`|`EEP_RST`|Reinitializes the keyboard's EEPROM (persistent memory)|
+|Key              |Aliases  |Description                                            |
+|-----------------|---------|-------------------------------------------------------|
+|`QK_BOOTLOADER`  |`QK_BOOT`|Put the keyboard into bootloader mode for flashing     |
+|`QK_DEBUG_TOGGLE`|`DB_TOGG`|Toggle debug mode                                      |
+|`QK_CLEAR_EEPROM`|`EE_CLR` |Reinitializes the keyboard's EEPROM (persistent memory)|
 
 ## Audio Keys :id=audio-keys
 
@@ -283,9 +283,9 @@ See also: [Dynamic Macros](feature_dynamic_macros.md)
 
 See also: [Grave Escape](feature_grave_esc.md)
 
-|Key        |Aliases  |Description                                                       |
-|-----------|---------|------------------------------------------------------------------|
-|`GRAVE_ESC`|`KC_GESC`|Escape when pressed, <code>&#96;</code> when Shift or GUI are held|
+|Key              |Aliases  |Description                                                       |
+|-----------------|---------|------------------------------------------------------------------|
+|`QK_GRAVE_ESCAPE`|`QK_GESC`|Escape when pressed, <code>&#96;</code> when Shift or GUI are held|
 
 ## Key Lock :id=key-lock
 
diff --git a/docs/quantum_keycodes.md b/docs/quantum_keycodes.md
index 7ebad2c1ee..8e29e05886 100644
--- a/docs/quantum_keycodes.md
+++ b/docs/quantum_keycodes.md
@@ -8,8 +8,8 @@ On this page we have documented keycodes between `0x00FF` and `0xFFFF` which are
 
 ## QMK Keycodes :id=qmk-keycodes
 
-|Key           |Aliases  |Description                                            |
-|--------------|---------|-------------------------------------------------------|
-|`RESET`       |         |Put the keyboard into bootloader mode for flashing     |
-|`DEBUG`       |         |Toggle debug mode                                      |
-|`EEPROM_RESET`|`EEP_RST`|Reinitializes the keyboard's EEPROM (persistent memory)|
+|Key              |Aliases  |Description                                            |
+|-----------------|---------|-------------------------------------------------------|
+|`QK_BOOTLOADER`  |`QK_BOOT`|Put the keyboard into bootloader mode for flashing     |
+|`QK_DEBUG_TOGGLE`|`DB_TOGG`|Toggle debug mode                                      |
+|`QK_CLEAR_EEPROM`|`EE_CLR` |Reinitializes the keyboard's EEPROM (persistent memory)|
diff --git a/quantum/process_keycode/process_grave_esc.c b/quantum/process_keycode/process_grave_esc.c
index 41c50f5cb8..ddf027391d 100644
--- a/quantum/process_keycode/process_grave_esc.c
+++ b/quantum/process_keycode/process_grave_esc.c
@@ -15,13 +15,13 @@
  */
 #include "process_grave_esc.h"
 
-/* true if the last press of GRAVE_ESC was shifted (i.e. GUI or SHIFT were pressed), false otherwise.
+/* true if the last press of QK_GRAVE_ESCAPE was shifted (i.e. GUI or SHIFT were pressed), false otherwise.
  * Used to ensure that the correct keycode is released if the key is released.
  */
 static bool grave_esc_was_shifted = false;
 
 bool process_grave_esc(uint16_t keycode, keyrecord_t *record) {
-    if (keycode == GRAVE_ESC) {
+    if (keycode == QK_GRAVE_ESCAPE) {
         const uint8_t mods    = get_mods();
         uint8_t       shifted = mods & MOD_MASK_SG;
 
diff --git a/quantum/quantum.c b/quantum/quantum.c
index ac99bcbd45..f12b1a9526 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -302,12 +302,12 @@ bool process_record_quantum(keyrecord_t *record) {
     if (record->event.pressed) {
         switch (keycode) {
 #ifndef NO_RESET
-            case RESET:
+            case QK_BOOTLOADER:
                 reset_keyboard();
                 return false;
 #endif
 #ifndef NO_DEBUG
-            case DEBUG:
+            case QK_DEBUG_TOGGLE:
                 debug_enable ^= 1;
                 if (debug_enable) {
                     print("DEBUG: enabled.\n");
@@ -316,7 +316,7 @@ bool process_record_quantum(keyrecord_t *record) {
                 }
 #endif
                 return false;
-            case EEPROM_RESET:
+            case QK_CLEAR_EEPROM:
                 eeconfig_init();
                 return false;
 #ifdef VELOCIKEY_ENABLE
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 3950a3bcae..15ea0276a7 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -80,8 +80,8 @@ enum quantum_keycodes {
     QK_UNICODEMAP_PAIR_MAX = 0xFFFF,
 
     // Loose keycodes - to be used directly
-    RESET = 0x5C00,
-    DEBUG,  // 5C01
+    QK_BOOTLOADER = 0x5C00,
+    QK_DEBUG_TOGGLE,  // 5C01
 
     // Magic
     MAGIC_SWAP_CONTROL_CAPSLOCK,       // 5C02
@@ -106,7 +106,7 @@ enum quantum_keycodes {
     MAGIC_TOGGLE_ALT_GUI,              // 5C15
 
     // Grave Escape
-    GRAVE_ESC,  // 5C16
+    QK_GRAVE_ESCAPE,  // 5C16
 
     // Auto Shift
     KC_ASUP,   // 5C17
@@ -379,7 +379,7 @@ enum quantum_keycodes {
     OUT_USB,   // 5CDE
 
     // Clear EEPROM
-    EEPROM_RESET,  // 5CDF
+    QK_CLEAR_EEPROM,  // 5CDF
 
     // Unicode
     UNICODE_MODE_FORWARD,  // 5CE0
@@ -716,9 +716,11 @@ enum quantum_keycodes {
 #define MACROTAP(kc) (QK_MACRO | (FUNC_TAP << 8) | (kc))
 #define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE)
 
-#define KC_GESC GRAVE_ESC
+#define QK_GESC QK_GRAVE_ESCAPE
 
-#define EEP_RST EEPROM_RESET
+#define QK_BOOT QK_BOOTLOADER
+#define DB_TOGG QK_DEBUG_TOGGLE
+#define EE_CLR QK_CLEAR_EEPROM
 
 // Audio Clicky aliases
 #define CK_TOGG CLICKY_TOGGLE
@@ -964,3 +966,5 @@ enum quantum_keycodes {
 #define PB_32 PROGRAMMABLE_BUTTON_32
 #define PROGRAMMABLE_BUTTON_MIN PROGRAMMABLE_BUTTON_1
 #define PROGRAMMABLE_BUTTON_MAX PROGRAMMABLE_BUTTON_32
+
+#include "quantum_keycodes_legacy.h"
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
new file mode 100644
index 0000000000..ed9455ee74
--- /dev/null
+++ b/quantum/quantum_keycodes_legacy.h
@@ -0,0 +1,13 @@
+#pragma once
+
+// clang-format off
+
+// Deprecated Quantum keycodes
+
+#define RESET        QK_BOOTLOADER
+#define DEBUG        QK_DEBUG_TOGGLE
+#define GRAVE_ESC    QK_GRAVE_ESCAPE
+#define EEPROM_RESET QK_CLEAR_EEPROM
+
+#define KC_GESC QK_GRAVE_ESCAPE
+#define EEP_RST QK_CLEAR_EEPROM
diff --git a/quantum/via_ensure_keycode.h b/quantum/via_ensure_keycode.h
index 1aba0cdd2a..75f816b560 100644
--- a/quantum/via_ensure_keycode.h
+++ b/quantum/via_ensure_keycode.h
@@ -244,12 +244,12 @@ _Static_assert(KC_LT                  == 0x0236, "");
 _Static_assert(KC_GT                  == 0x0237, "");
 _Static_assert(KC_QUES                == 0x0238, "");
 
-_Static_assert(RESET                  == 0x5C00, "");
-_Static_assert(DEBUG                  == 0x5C01, "");
+_Static_assert(QK_BOOTLOADER          == 0x5C00, "");
+_Static_assert(QK_DEBUG_TOGGLE        == 0x5C01, "");
 
 _Static_assert(MAGIC_TOGGLE_NKRO      == 0x5C14, "");
 
-_Static_assert(KC_GESC                == 0x5C16, "");
+_Static_assert(QK_GRAVE_ESCAPE        == 0x5C16, "");
 
 _Static_assert(AU_ON                  == 0x5C1D, "");
 _Static_assert(AU_OFF                 == 0x5C1E, "");

From b090ff03ed4391f27e8e3d9a843f529bedd08e19 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 21 Jan 2022 19:36:52 -0800
Subject: [PATCH 341/867] [Keymap] Drashna's OLED rewrite (#15981)

---
 .../tractyl_manuform/5x6_right/config.h       |   2 -
 .../5x6_right/elite_c/config.h                |   1 -
 .../tractyl_manuform/5x6_right/f411/config.h  |  11 +-
 .../5x6_right/f411/post_config.h              |  20 +
 .../5x6_right/keymaps/drashna/config.h        |   6 +-
 .../5x6_right/keymaps/drashna/keymap.c        | 145 +--
 .../5x6_right/keymaps/drashna/rules.mk        |   2 +
 .../tractyl_manuform/tractyl_manuform.h       |   2 +
 keyboards/moonlander/keymaps/drashna/keymap.c |   2 +-
 .../splitkb/kyria/keymaps/drashna/keymap.c    |   2 +-
 layouts/community/ergodox/drashna/keymap.c    |   4 -
 layouts/community/ergodox/drashna/rules.mk    |   3 -
 layouts/community/ortho_4x12/drashna/keymap.c |   2 +-
 .../community/split_3x6_3/drashna/keymap.c    |   2 +-
 users/drashna/callbacks.c                     |  15 +-
 users/drashna/config.h                        |  20 +-
 users/drashna/drashna.c                       |  96 +-
 users/drashna/drashna.h                       |   3 +-
 .../autocorrection/autocorrection.c           |  19 +-
 users/drashna/keyrecords/caps_word.c          |  10 +
 users/drashna/keyrecords/process_records.c    |  23 +-
 users/drashna/keyrecords/tap_dances.c         |  12 +-
 users/drashna/keyrecords/unicode.c            |  27 +
 users/drashna/oled/oled_stuff.c               | 670 ++++++++++++--
 users/drashna/oled/oled_stuff.h               |  22 +-
 users/drashna/oled/sh110x.c                   | 860 ++++++++++++++++++
 users/drashna/pointing/pointing.c             |   2 +-
 users/drashna/rules.mk                        |  17 +-
 users/drashna/split/transport_sync.c          |  67 +-
 users/drashna/split/transport_sync.h          |   4 +
 30 files changed, 1776 insertions(+), 295 deletions(-)
 create mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h
 create mode 100644 users/drashna/oled/sh110x.c

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
index d7618912f7..59cd098fdb 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
@@ -50,7 +50,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-#define OLED_DISPLAY_128X64
-
 #define POINTING_DEVICE_TASK_THROTTLE
 #define POINTING_DEVICE_RIGHT
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
index 9daec0cd8f..d8d36e824c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h
@@ -35,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_SPLIT \
     { 10, 10 }
 #define RGBLIGHT_LIMIT_VAL 80
-#define OLED_BRIGHTNESS    50
 
 #define AUDIO_PIN       C6
 
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 986ccae69b..6ae51ca6f0 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -43,12 +43,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
 #define WS2812_DMA_STREAM   STM32_DMA1_STREAM7  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
 #define WS2812_DMA_CHANNEL  3                   // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_TARGET_PERIOD 800000
+
 
 #define RGBLED_NUM          52
 #define RGBLIGHT_SPLIT
 #define RGBLED_SPLIT \
     { 26, 26 }
-#define RGBLIGHT_LIMIT_VAL 150
 
 #define DEBUG_LED_PIN      C13
 
@@ -68,6 +69,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SERIAL_USART_RX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
 #define SERIAL_USART_TIMEOUT     100  // USART driver timeout. default 100
 
+
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
 /* i2c config for oleds */
 #define I2C_DRIVER        I2CD1
 #define I2C1_SCL_PIN      B8
@@ -75,9 +80,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define I2C1_SCL_PAL_MODE 4
 #define I2C1_SDA_PAL_MODE 4
 // #define I2C1_CLOCK_SPEED  400000
-/* For Legacy Compatibility: */
-#define I2C1_SCL 8
-#define I2C1_SDA 9
 
 /* encoder config */
 #define ENCODERS_PAD_A \
@@ -110,3 +112,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PMW3360_CS_PIN                       B0
 #define PMW3360_SPI_MODE                     3
 #define PMW3360_SPI_DIVISOR                  64
+#define PMW3360_FIRMWARE_UPLOAD_FAST
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h
new file mode 100644
index 0000000000..0e33129e1a
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/post_config.h
@@ -0,0 +1,20 @@
+// Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifndef RGBLIGHT_LIMIT_VAL
+#    if defined(OLED_ENABLE)
+#        define RGBLIGHT_LIMIT_VAL 100
+#    else
+#        define RGBLIGHT_LIMIT_VAL 150
+#    endif
+#endif
+
+#ifndef OLED_BRIGHTNESS
+#    ifdef RGBLIGHT_ENABLE
+#        define OLED_BRIGHTNESS 80
+#    else
+#        define OLED_BRIGHTNESS 150
+#    endif
+#endif
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
index 85ddef103a..0b33138ec0 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
@@ -18,5 +18,9 @@
 
 #define TRACKBALL_DPI_OPTIONS { 1200, 1800, 2600, 3400 }
 
-#define DEBOUNCE 45
+#define DEBOUNCE 60
 #define ENCODER_DEFAULT_POS 0x3
+
+#ifdef OLED_DRIVER_SH1107
+#    undef OLED_DISPLAY_128X64
+#endif
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
index 958f694172..b5310b37dd 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KEYLOCK, _________________ADJUST_L2_________________,                      _________________ADJUST_R2_________________, TG_MODS,
         UC_MOD,  _________________ADJUST_L3_________________,                      _________________ADJUST_R3_________________, KC_MPLY,
                    TG(_DIABLOII), AUTO_CTN,                                                          TG_GAME, TG_DBLO,
-                                            _______, _______,                               KC_NUKE,
+                                            _______, REBOOT,                                KC_NUKE,
                                                      _______, _______,             _______,
                                                      _______, _______,    KC_NUKE, _______
     ),
@@ -145,7 +145,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [_MEDIA]           = { { _______, _______ }, { _______, _______ } },
     [_RAISE]           = { { _______, _______ }, { KC_PGDN, KC_PGUP } },
     [_LOWER]           = { { RGB_MOD, RGB_RMOD}, { RGB_HUD, RGB_HUI } },
-    [_ADJUST]          = { { CK_DOWN, CK_UP   }, { _______, _______ } },
+    [_ADJUST]          = { { CK_DOWN, CK_UP   }, { _______, _F______ } },
 };
 // clang-format on
 #else
@@ -165,144 +165,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 #endif
 
 #ifdef OLED_ENABLE
-// WPM-responsive animation stuff here
-#    define SLEEP_FRAMES 2
-#    define SLEEP_SPEED  10  // below this wpm value your animation will idle
-
-#    define WAKE_FRAMES  2  // uncomment if >1
-
-#    define KAKI_FRAMES  3
-#    define KAKI_SPEED   40  // above this wpm value typing animation to triggere
-
-#    define RTOGI_FRAMES 2
-//#define LTOGI_FRAMES 2
-
-//#define ANIM_FRAME_DURATION 500 // how long each frame lasts in ms
-// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
-#    define ANIM_SIZE    512  // number of bytes in array, minimize for adequate firmware size, max is 1024
-
-uint32_t anim_timer          = 0;
-uint32_t anim_frame_duration = 500;
-uint8_t  current_sleep_frame = 0;
-uint8_t  current_wake_frame  = 0;  // uncomment if WAKE_FRAMES >1
-uint8_t  current_kaki_frame  = 0;
-uint8_t  current_rtogi_frame = 0;
-// uint8_t current_ltogi_frame = 0;
-
-void render_kitty(void) {
-    // Images credit j-inc(/James Incandenza) and pixelbenny. Credit to obosob for initial animation approach.
-    static const char PROGMEM sleep[SLEEP_FRAMES][ANIM_SIZE] = {{
-                                                                    // 'sleep1', 128x32px
-                                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xa8, 0x48, 0xa8, 0x18, 0x08, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x80, 0x44, 0x84, 0x06, 0x05, 0x04, 0x80, 0x40, 0x20, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x18, 0x04, 0x04, 0x02, 0x7a, 0x86, 0x01, 0x80, 0x80, 0x01, 0x03, 0x05, 0x07, 0x01, 0x00, 0x00, 0x80, 0x83, 0x45, 0xfa, 0x3c, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10, 0x33, 0x24, 0x28, 0x28, 0x29, 0x29, 0x29, 0x3a, 0x18, 0x1c, 0x39, 0x24, 0x24, 0x3a, 0x2d, 0x26, 0x31, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                },
-                                                                {// 'sleep2', 128x32px
-                                                                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x3a, 0x2a, 0x26, 0x22, 0x80, 0xc0, 0x80, 0x00, 0x24, 0x34, 0x2c, 0xe4, 0x60, 0x10, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x38, 0x04, 0x02, 0x02, 0x01, 0x79, 0x87, 0x01, 0x80, 0x81, 0x83, 0x05, 0x05, 0x03, 0x01, 0x00, 0x00, 0x80, 0x43, 0x05, 0xfa, 0x3c, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10, 0x33, 0x24, 0x28, 0x28, 0x28, 0x29, 0x29, 0x3a, 0x18, 0x1c, 0x39, 0x24, 0x24, 0x3a, 0x2d, 0x26, 0x31, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-    static const char PROGMEM wake[WAKE_FRAMES][ANIM_SIZE]   = {{
-                                                                  // 'mati2', 128x32px
-                                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x08, 0x10, 0x60, 0x80, 0x00, 0x80, 0x60, 0x10, 0x08, 0x30, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x80, 0x40, 0x40, 0x5c, 0x00, 0x01, 0x41, 0x01, 0x00, 0x5c, 0x40, 0x40, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x80, 0xe1, 0x12, 0x0a, 0x06, 0x00, 0x80, 0x00, 0x06, 0x0a, 0x12, 0xe1, 0x80, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x11, 0x10, 0x10, 0x14, 0x14, 0x1f, 0x1c, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                              },
-                                                              {// 'mati3', 128x32px
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x08, 0x10, 0x60, 0x80, 0x00, 0x80, 0x60, 0x10, 0x08, 0x30, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x90, 0x12, 0x0a, 0x02, 0xf4, 0x09, 0x0d, 0xf1, 0x04, 0x02, 0x0a, 0x12, 0x90, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x80, 0xe1, 0x12, 0x0a, 0x06, 0x01, 0x81, 0x00, 0x06, 0x0a, 0x12, 0xe1, 0x80, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x11, 0x10, 0x10, 0x14, 0x14, 0x1f, 0x1c, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-    static const char PROGMEM kaki[KAKI_FRAMES][ANIM_SIZE]   = {{
-                                                                  // 'jare2', 128x32px
-                                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x40, 0x80, 0x80, 0x80, 0x00, 0xfc, 0x84, 0x08, 0x08, 0x10, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x60, 0x80, 0x00, 0x00, 0x91, 0xa1, 0x80, 0x00, 0x00, 0x22, 0x84, 0x40, 0x50, 0x48, 0xc1, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x41, 0x82, 0xe2, 0x12, 0x0a, 0x06, 0x00, 0x80, 0x88, 0x4f, 0x02, 0x22, 0xe2, 0x9f, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x14, 0x10, 0x10, 0x10, 0x10, 0x10, 0x14, 0x14, 0x1f, 0x1a, 0x0a, 0x0a, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                              },
-                                                              {
-                                                                  // 'kaki1', 128x32px
-                                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                  0x00, 0x00, 0x06, 0x1a, 0x22, 0xc2, 0x04, 0x04, 0x04, 0x07, 0x00, 0xc0, 0x20, 0x10, 0x80, 0x80, 0x01, 0x01, 0x02, 0xfc, 0xfe, 0x02, 0x3c, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d, 0x55, 0x50, 0x94, 0xf0, 0x10, 0x09, 0x08, 0x00, 0x80, 0x00, 0x06, 0x09, 0x1b, 0xee, 0x00, 0x00, 0x00, 0x00, 0x81, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                  0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c, 0x14, 0x16, 0x15, 0x14, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                              },
-                                                              {// 'kaki2', 128x32px
-                                                               0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x01, 0x02, 0x04, 0x04, 0x03, 0x80, 0x40, 0x40, 0x20, 0x00, 0x01, 0x02, 0x8c, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d, 0x55, 0x50, 0x94, 0xf0, 0x10, 0x0a, 0x0e, 0x1d, 0x95, 0x24, 0x24, 0x27, 0x13, 0xe1, 0x01, 0x01, 0x01, 0x01, 0x02, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c, 0x14, 0x14, 0x17, 0x14, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-    static const char PROGMEM rtogi[KAKI_FRAMES][ANIM_SIZE]  = {{
-                                                                   // 'rtogi1', 128x32px
-                                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02, 0x01, 0x0f, 0x90, 0x10, 0x20, 0xf0, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x48, 0x47, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x88, 0xc7, 0xc4, 0x62, 0x23, 0x11, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                   0x80, 0x40, 0x20, 0x10, 0x88, 0xcc, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                   0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                               },
-                                                               {// 'rtogi2', 128x32px
-                                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02, 0x01, 0x1f, 0xa0, 0x20, 0x40, 0x80, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x48, 0x47, 0x88, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x28, 0x6b, 0x40, 0xa0, 0x99, 0x86, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                0x0f, 0x11, 0x22, 0x44, 0x48, 0x4c, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c, 0x04, 0x06, 0x06, 0x06, 0x0e, 0x0e, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
-
-    // assumes 1 frame prep stage
-    void        animation_phase(void) {
-        if (tap_toggling) {
-            anim_frame_duration = 300;
-            current_rtogi_frame = (current_rtogi_frame + 1) % RTOGI_FRAMES;
-            oled_write_raw_P(rtogi[abs((RTOGI_FRAMES - 1) - current_rtogi_frame)], ANIM_SIZE);
-        } else {
-            if (get_current_wpm() <= SLEEP_SPEED) {
-                anim_frame_duration = 500;
-                current_sleep_frame = (current_sleep_frame + 1) % SLEEP_FRAMES;
-                oled_write_raw_P(sleep[abs((SLEEP_FRAMES - 1) - current_sleep_frame)], ANIM_SIZE);
-            }
-            // if(get_current_wpm() >IDLE_SPEED && get_current_wpm() <TAP_SPEED){
-            if (get_current_wpm() > SLEEP_SPEED) {
-                anim_frame_duration = 800;
-                current_wake_frame  = (current_wake_frame + 1) % WAKE_FRAMES;
-                oled_write_raw_P(wake[abs((WAKE_FRAMES - 1) - current_wake_frame)], ANIM_SIZE);
-                // oled_write_raw_P(wake[0], ANIM_SIZE);  // remove if IDLE_FRAMES >1
-            }
-            if (get_current_wpm() >= KAKI_SPEED) {
-                anim_frame_duration = 500;
-                current_kaki_frame  = (current_kaki_frame + 1) % KAKI_FRAMES;
-                oled_write_raw_P(kaki[abs((KAKI_FRAMES - 1) - current_kaki_frame)], ANIM_SIZE);
-            }
-        }
-    }
-    if (get_current_wpm() != 000) {
-        // if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-        if (timer_elapsed32(anim_timer) > anim_frame_duration) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-    } else {
-        // if(timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-        if (timer_elapsed32(anim_timer) > anim_frame_duration) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-    }
-}
-
-void oled_driver_render_logo_left(void) {
-    render_kitty();
-
-    oled_set_cursor(6, 0);
-    oled_write_P(PSTR("  Tractyl      "), false);
-    oled_set_cursor(6, 1);
-    oled_write_P(PSTR("     Manuform  "), false);
-    oled_set_cursor(6, 2);
-#    if defined(WPM_ENABLE)
-    render_wpm(1);
-#    endif
-    oled_set_cursor(6, 3);
-#    if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right)
-    render_pointing_dpi_status(0);
-#    endif
-    oled_set_cursor(0, 4);
-}
+oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_180; }
 #endif
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
index 0765bb2c6e..9ef58ab5ec 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
@@ -32,3 +32,5 @@ ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/teensy2pp)
     CAPS_WORD_ENABLE             = yes
 endif
 # DEBOUNCE_TYPE = sym_eager_pk
+
+OLED_DRIVER = custom
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
index 6aa40fc18b..c3acade6f1 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
@@ -43,6 +43,8 @@ typedef struct {
     uint16_t device_cpi;
 } kb_config_data_t;
 
+extern kb_config_data_t                      kb_config;
+
 void trackball_set_cpi(uint16_t cpi);
 void matrix_init_sub_kb(void);
 void matrix_scan_sub_kb(void);
diff --git a/keyboards/moonlander/keymaps/drashna/keymap.c b/keyboards/moonlander/keymaps/drashna/keymap.c
index 82abdb0055..ba07834614 100644
--- a/keyboards/moonlander/keymaps/drashna/keymap.c
+++ b/keyboards/moonlander/keymaps/drashna/keymap.c
@@ -111,7 +111,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KEYLOCK, _________________ADJUST_L2_________________, _______,        _______, _________________ADJUST_R2_________________, RGB_IDL,
         UC_MOD,  _________________ADJUST_L3_________________,                          _________________ADJUST_R3_________________, TG_MODS,
         _______, _______, _______, _______, _______,          _______,        _______,          _______, _______, _______, _______, AUTO_CTN,
-                                            _______, _______, _______,        _______, _______, _______
+                                            REBOOT,  _______, _______,        _______, _______, _______
     ),
 };
 
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
index 6c7ac34d51..1346616b20 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_MAKE, _________________ADJUST_L1_________________,                                       _________________ADJUST_R1_________________, KC_RESET,
         VRSN,    _________________ADJUST_L2_________________,                                       _________________ADJUST_R2_________________, EEP_RST,
         UC_MOD,  _________________ADJUST_L3_________________, HPT_TOG, HPT_FBK,   MG_NKRO, UC_MOD,  _________________ADJUST_R3_________________, TG_MODS,
-                                   _______, _______, KEYLOCK, KC_NUKE, _______,   _______, _______, _______, _______, _______
+                                   REBOOT,  _______, KEYLOCK, KC_NUKE, _______,   _______, _______, _______, _______, AUTO_CTN
     ),
 //     [_LAYERINDEX] = LAYOUT_wrapper(
 //       _______, _______, _______, _______, _______, _______,                                       _______, _______, _______, _______, _______, _______,
diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c
index 798680628f..0b81232af9 100644
--- a/layouts/community/ergodox/drashna/keymap.c
+++ b/layouts/community/ergodox/drashna/keymap.c
@@ -16,10 +16,6 @@
 
 #include "drashna.h"
 
-#ifdef UNICODEMAP_ENABLE
-#    include "drashna_unicode.h"
-#endif  // UNICODEMAP_ENABLE
-#include "drivers/sensors/pimoroni_trackball.h"
 enum more_custom_keycodes {
     KC_SWAP_NUM = NEW_SAFE_RANGE,
     PM_SCROLL,
diff --git a/layouts/community/ergodox/drashna/rules.mk b/layouts/community/ergodox/drashna/rules.mk
index 61b6263071..f5e9b500e0 100644
--- a/layouts/community/ergodox/drashna/rules.mk
+++ b/layouts/community/ergodox/drashna/rules.mk
@@ -2,7 +2,6 @@ BOOTMAGIC_ENABLE   = yes      # Enable Bootmagic Lite
 TAP_DANCE_ENABLE   = no
 COMMAND_ENABLE     = no  # Commands for debug and configuration
 CONSOLE_ENABLE     = no
-SPACE_CADET_ENABLE = no
 
 ifeq ($(strip $(KEYBOARD)), ergodox_ez)
     RGBLIGHT_ENABLE            = yes
@@ -16,5 +15,3 @@ endif
 UNICODE_ENABLE        = no
 UNICDOEMAP_ENABLE     = no
 CUSTOM_UNICODE_ENABLE = no
-
-DEBOUNCE_TYPE     = sym_eager_pr
diff --git a/layouts/community/ortho_4x12/drashna/keymap.c b/layouts/community/ortho_4x12/drashna/keymap.c
index ce241fd76d..522fc772b4 100644
--- a/layouts/community/ortho_4x12/drashna/keymap.c
+++ b/layouts/community/ortho_4x12/drashna/keymap.c
@@ -106,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST,
     VRSN,    _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
     TH_LVL,  _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,
-    KEYLOCK, _______, _______, _______, _______, KC_NUKE, _______, _______, _______, _______, _______, TG_MODS
+    KEYLOCK, _______, _______, REBOOT,  _______, KC_NUKE, _______, _______, AUTO_CTN,_______, _______, TG_MODS
   )
 
 };
diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c
index 476ca5fcef..4bd4618d0c 100644
--- a/layouts/community/split_3x6_3/drashna/keymap.c
+++ b/layouts/community/split_3x6_3/drashna/keymap.c
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_MAKE, _________________ADJUST_L1_________________,                    _________________ADJUST_R1_________________, KC_RESET,
     VRSN,    _________________ADJUST_L2_________________,                    _________________ADJUST_R2_________________, EEP_RST,
     KEYLOCK, _________________ADJUST_L3_________________,                    _________________ADJUST_R3_________________, RGB_IDL,
-                                     AUTO_CTN,KC_NUKE, _______,        _______, TG_MODS, HPT_FBK
+                                     REBOOT, KC_NUKE, _______,        _______, TG_MODS, AUTO_CTN
   )
 };
 // clang-format on
diff --git a/users/drashna/callbacks.c b/users/drashna/callbacks.c
index 48b076b6ba..ffc777692e 100644
--- a/users/drashna/callbacks.c
+++ b/users/drashna/callbacks.c
@@ -70,6 +70,15 @@ void                       shutdown_user(void) {
 __attribute__((weak)) void suspend_power_down_keymap(void) {}
 
 void suspend_power_down_user(void) {
+    if (layer_state_is(_GAMEPAD)) {
+        layer_off(_GAMEPAD);
+    }
+    if (layer_state_is(_DIABLO)) {
+        layer_off(_DIABLO);
+    }
+    if (layer_state_is(_DIABLOII)) {
+        layer_off(_DIABLOII);
+    }
 #ifdef OLED_ENABLE
     oled_off();
 #endif
@@ -78,12 +87,6 @@ void suspend_power_down_user(void) {
 
 __attribute__((weak)) void suspend_wakeup_init_keymap(void) {}
 void                       suspend_wakeup_init_user(void) {
-    if (layer_state_is(_GAMEPAD)) {
-        layer_off(_GAMEPAD);
-    }
-    if (layer_state_is(_DIABLO)) {
-        layer_off(_DIABLO);
-    }
     suspend_wakeup_init_keymap();
 }
 
diff --git a/users/drashna/config.h b/users/drashna/config.h
index 46cd276dd4..a6b4beb741 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -29,7 +29,7 @@
 #        define SELECT_SOFT_SERIAL_SPEED 1
 #    endif
 #    ifdef CUSTOM_SPLIT_TRANSPORT_SYNC
-#        define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_STATE_SYNC, RPC_ID_USER_KEYMAP_SYNC, RPC_ID_USER_CONFIG_SYNC, RPC_ID_USER_WATCHDOG_SYNC
+#        define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_STATE_SYNC, RPC_ID_USER_KEYMAP_SYNC, RPC_ID_USER_CONFIG_SYNC, RPC_ID_USER_WATCHDOG_SYNC, RPC_ID_USER_KEYLOG_STR
 #    endif
 #endif
 
@@ -271,3 +271,21 @@
 #    define C14 PAL_LINE(GPIOC, 14)
 #    define C15 PAL_LINE(GPIOC, 15)
 #endif
+
+#ifdef OLED_DRIVER_SH1107
+#    define OLED_DISPLAY_CUSTOM
+#    define OLED_IC_SH1107 2
+#    define OLED_DISPLAY_128X128
+#    define OLED_DISPLAY_WIDTH 128
+#    define OLED_DISPLAY_HEIGHT 128
+#    define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH)
+#    define OLED_BLOCK_TYPE uint16_t
+#    define OLED_SOURCE_MAP \
+        { 0, 8, 16, 24, 32, 40, 48, 56 }
+#    define OLED_TARGET_MAP \
+        { 56, 48, 40, 32, 24, 16, 8, 0 }
+#    define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8)
+#    define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)
+#    define OLED_COM_PINS COM_PINS_ALT
+#    define OLED_IC OLED_IC_SH1107
+#endif
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index 9128a89bc6..6e8d4ac9bd 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -2,25 +2,37 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "drashna.h"
+#ifdef __AVR__
+#    include <avr/wdt.h>
+#endif
 
 userspace_config_t userspace_config;
 
+/**
+ * @brief Handle registering a keycode, with optional modifer based on timed event
+ *
+ * @param code keycode to send to host
+ * @param mod_code modifier to send with code, if held for tapping term or longer
+ * @param pressed the press/release event (can use "record->event.pressed" for this)
+ * @return true exits function
+ * @return false exits function
+ */
 bool mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed) {
     static uint16_t this_timer;
-    if (pressed) {
-        this_timer = timer_read();
-    } else {
-        if (timer_elapsed(this_timer) < TAPPING_TERM) {
-            tap_code(code);
-        } else {
-            register_code(mod_code);
-            tap_code(code);
-            unregister_code(mod_code);
-        }
-    }
+    mod_key_press(code, mod_code, pressed, this_timer);
     return false;
 }
 
+/**
+ * @brief Handle registation of keycode, with optional modifier based on custom timer
+ *
+ * @param code keycode to send to host
+ * @param mod_code modifier keycode to send with code, if held for tapping term or longer
+ * @param pressed the press/release event
+ * @param this_timer custom timer to use
+ * @return true
+ * @return false
+ */
 bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer) {
     if (pressed) {
         this_timer = timer_read();
@@ -36,6 +48,14 @@ bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this
     return false;
 }
 
+/**
+ * @brief Performs exact match for modifier values
+ *
+ * @param value the modifer varible (get_mods/get_oneshot_mods/get_weak_mods)
+ * @param mask the modifier mask to check for
+ * @return true Has the exact modifiers specifed
+ * @return false Does not have the exact modifiers specified
+ */
 bool hasAllBitsInMask(uint8_t value, uint8_t mask) {
     value &= 0xF;
     mask &= 0xF;
@@ -43,10 +63,62 @@ bool hasAllBitsInMask(uint8_t value, uint8_t mask) {
     return (value & mask) == mask;
 }
 
-void tap_code16_nomods(uint8_t kc) {
+/**
+ * @brief Tap keycode, with no mods
+ *
+ * @param kc keycode to use
+ */
+void tap_code16_nomods(uint16_t kc) {
     uint8_t temp_mod = get_mods();
     clear_mods();
     clear_oneshot_mods();
     tap_code16(kc);
     set_mods(temp_mod);
 }
+
+/**
+ * @brief Run shutdown routine and soft reboot firmware.
+ *
+ */
+
+#ifdef HAPTIC_ENABLE
+#    include "haptic.h"
+#endif
+
+#ifdef AUDIO_ENABLE
+#    ifndef GOODBYE_SONG
+#        define GOODBYE_SONG SONG(GOODBYE_SOUND)
+#    endif
+float reset_song[][2] = GOODBYE_SONG;
+#endif
+
+void software_reset(void) {
+    clear_keyboard();
+#if defined(MIDI_ENABLE) && defined(MIDI_BASIC)
+    process_midi_all_notes_off();
+#endif
+#ifdef AUDIO_ENABLE
+#    ifndef NO_MUSIC_MODE
+    music_all_notes_off();
+#    endif
+    uint16_t timer_start = timer_read();
+    PLAY_SONG(reset_song);
+    shutdown_user();
+    while (timer_elapsed(timer_start) < 250) wait_ms(1);
+    stop_all_notes();
+#else
+    shutdown_user();
+    wait_ms(250);
+#endif
+#ifdef HAPTIC_ENABLE
+    haptic_shutdown();
+#endif
+
+#if defined(PROTOCOL_LUFA)
+    wdt_enable(WDTO_250MS);
+#elif defined(PROTOCOL_CHIBIOS)
+#    if defined(MCU_STM32) || defined(MCU_KINETIS)
+    NVIC_SystemReset();
+#    endif
+#endif
+}
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index 5a9da16273..0bf1de84cf 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -78,7 +78,8 @@ enum userspace_layers {
 bool mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed);
 bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer);
 bool hasAllBitsInMask(uint8_t value, uint8_t mask);
-void tap_code16_nomods(uint8_t kc);
+void tap_code16_nomods(uint16_t kc);
+void software_reset(void);
 
 // clang-format off
 typedef union {
diff --git a/users/drashna/keyrecords/autocorrection/autocorrection.c b/users/drashna/keyrecords/autocorrection/autocorrection.c
index e561224374..c7e938a341 100644
--- a/users/drashna/keyrecords/autocorrection/autocorrection.c
+++ b/users/drashna/keyrecords/autocorrection/autocorrection.c
@@ -17,6 +17,14 @@
 #        error Dictionary size excees maximum size permitted
 #    endif
 
+/**
+ * @brief Process handler for autocorrect feature
+ *
+ * @param keycode Keycode registered by matrix press, per keymap
+ * @param record keyrecord_t structure
+ * @return true Continue processing keycodes, and send to host
+ * @return false Stop processing keycodes, and don't send to host
+ */
 bool process_autocorrection(uint16_t keycode, keyrecord_t* record) {
     static uint8_t typo_buffer[AUTOCORRECTION_MAX_LENGTH] = {KC_SPC};
     static uint8_t typo_buffer_size                       = 1;
@@ -53,6 +61,14 @@ bool process_autocorrection(uint16_t keycode, keyrecord_t* record) {
             keycode &= 0xFF;
             break;
 #    endif
+#    ifdef SWAP_HANDS_ENABLE
+        case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
+            if (keycode >= 0x56F0 || record->event.pressed || !record->tap.count) {
+                return true;
+            }
+            keycode &= 0xFF;
+            break;
+#    endif
 #    ifndef NO_ACTION_ONESHOT
         case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:
             if ((keycode & 0xF) == MOD_LSFT) {
@@ -70,7 +86,6 @@ bool process_autocorrection(uint16_t keycode, keyrecord_t* record) {
             }
     }
 
-
     // Subtract buffer for Backspace key, reset for other non-alpha.
     if (!(KC_A <= keycode && keycode <= KC_Z)) {
         if (keycode == KC_BSPC) {
@@ -83,7 +98,7 @@ bool process_autocorrection(uint16_t keycode, keyrecord_t* record) {
             // Set a word boundary if space, period, digit, etc. is pressed.
             // Behave more conservatively for the enter key. Reset, so that enter
             // can't be used on a word ending.
-            if (keycode == KC_ENT) {
+            if (keycode == KC_ENT || (keycode == KC_MINUS && (get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT)) {
                 typo_buffer_size = 0;
             }
             keycode = KC_SPC;
diff --git a/users/drashna/keyrecords/caps_word.c b/users/drashna/keyrecords/caps_word.c
index cc9ca93b72..0c7cd6cfe5 100644
--- a/users/drashna/keyrecords/caps_word.c
+++ b/users/drashna/keyrecords/caps_word.c
@@ -10,6 +10,16 @@
 bool caps_word_enabled = false;
 bool caps_word_shifted = false;
 
+/**
+ * @brief Handler for Caps Word feature.
+ *
+ * This checks the keycodes, and applies shift to the correct keys, if and when needid.
+ *
+ * @param keycode Keycode from matrix
+ * @param record keyrecord_t data structure
+ * @return true Continue processing keycode and sent to host
+ * @return false Stop processing keycode, and do not send to host
+ */
 bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
     if (!caps_word_enabled) {
         // Pressing both shift keys at the same time enables caps word.
diff --git a/users/drashna/keyrecords/process_records.c b/users/drashna/keyrecords/process_records.c
index f49ac6ef64..012a57f7e4 100644
--- a/users/drashna/keyrecords/process_records.c
+++ b/users/drashna/keyrecords/process_records.c
@@ -18,8 +18,24 @@ bool     host_driver_disabled = false;
 // Defines actions tor my global custom keycodes. Defined in drashna.h file
 // Then runs the _keymap's record handier if not processed here
 
+/**
+ * @brief Keycode handler for keymaps
+ *
+ * This handles the keycodes at the keymap level, useful for keyboard specific customization
+ */
 __attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; }
 __attribute__((weak)) bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { return true; }
+
+/**
+ * @brief Main user keycode handler
+ *
+ * This handles all of the keycodes for the user, including calling feature handlers.
+ *
+ * @param keycode Keycode from matrix
+ * @param record keyrecord_t data structure
+ * @return true Continue processing keycode and send to host
+ * @return false Stop process keycode and do not send to host
+ */
 bool                       process_record_user(uint16_t keycode, keyrecord_t *record) {
     // If console is enabled, it will print the matrix position and status of each key pressed
 #ifdef KEYLOGGER_ENABLE
@@ -215,12 +231,7 @@ bool                       process_record_user(uint16_t keycode, keyrecord_t *re
             return false;
         case REBOOT:
             if (record->event.pressed) {
-                shutdown_user();
-#ifdef __AVR__
-                wdt_enable(WDTO_250MS);
-#else
-                NVIC_SystemReset();
-#endif
+                software_reset();
             }
             return false;
 
diff --git a/users/drashna/keyrecords/tap_dances.c b/users/drashna/keyrecords/tap_dances.c
index 63eb0c3348..a1a7439164 100644
--- a/users/drashna/keyrecords/tap_dances.c
+++ b/users/drashna/keyrecords/tap_dances.c
@@ -11,7 +11,12 @@ diablo_timer_t diablo_timer[NUM_OF_DIABLO_KEYS];
 // Otherwise, you will need to hit a bunch of times, or hit the "clear" command
 uint8_t diablo_times[] = {0, 1, 3, 5, 10, 30};
 
-// Cycle through the times for the macro, starting at 0, for disabled.
+/**
+ * @brief Main function for handling diable related tap dances.
+ *
+ * @param state Main data struction contining information about events
+ * @param user_data Local data for the dance. Allows customization to be passed on to function
+ */
 void diablo_tapdance_master(qk_tap_dance_state_t *state, void *user_data) {
     diable_keys_t *diablo_keys = (diable_keys_t *)user_data;
     // Sets the keycode based on the index
@@ -43,7 +48,10 @@ qk_tap_dance_action_t tap_dance_actions[] = {
     [TD_D3_4] = ACTION_TAP_DANCE_DIABLO(3, KC_4),
 };
 
-// Checks each of the 4 timers/keys to see if enough time has elapsed
+/**
+ * @brief Runs check to see if timer has elapsed for each dance, and sends keycodes, if it has.
+ *
+ */
 void run_diablo_macro_check(void) {
     for (uint8_t index = 0; index < NUM_OF_DIABLO_KEYS; index++) {
         // if key_interval is 0, it's disabled, so only run if it's set.  If it's set, check the timer.
diff --git a/users/drashna/keyrecords/unicode.c b/users/drashna/keyrecords/unicode.c
index 4010b9c1c6..db2058e5d1 100644
--- a/users/drashna/keyrecords/unicode.c
+++ b/users/drashna/keyrecords/unicode.c
@@ -8,6 +8,11 @@
 
 uint16_t typing_mode;
 
+/**
+ * @brief Registers the unicode keystrokes based on desired unicode
+ *
+ * @param glyph Unicode character, supports up to 0x1FFFF (or higher)
+ */
 void tap_unicode_glyph_nomods(uint32_t glyph) {
     uint8_t temp_mod = get_mods();
     clear_mods();
@@ -43,6 +48,15 @@ typedef uint32_t (*translator_function_t)(bool is_shifted, uint32_t keycode);
         return ret;                                                             \
     }
 
+/**
+ * @brief Handler function for outputting unicode.
+ *
+ * @param keycode Keycode from matrix.
+ * @param record keyrecord_t data structure
+ * @param translator translator lut for different unicode modes
+ * @return true Continue processing matrix press, and send to host
+ * @return false Replace keycode, and do not send to host
+ */
 bool process_record_glyph_replacement(uint16_t keycode, keyrecord_t *record, translator_function_t translator) {
     uint8_t temp_mod   = get_mods();
     uint8_t temp_osm   = get_oneshot_mods();
@@ -182,6 +196,15 @@ bool process_record_zalgo(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
+/**
+ * @brief Main handler for unicode input
+ *
+ * @param keycode Keycode from switch matrix
+ * @param record keyrecord_t data struture
+ * @return true Send keycode from matrix to host
+ * @return false Stop processing and do not send to host
+ */
+
 bool process_record_unicode(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case UC_FLIP:  // (ノಠ痊ಠ)ノ彡┻━┻
@@ -265,6 +288,10 @@ bool process_record_unicode(uint16_t keycode, keyrecord_t *record) {
     return process_unicode_common(keycode, record);
 }
 
+/**
+ * @brief Initialize the default unicode mode on firmware startu
+ *
+ */
 void matrix_init_unicode(void) {
     unicode_input_mode_init();
 }
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index de84766725..eeca010de0 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -22,17 +22,12 @@
 
 extern bool host_driver_disabled;
 
-#ifndef KEYLOGGER_LENGTH
-// #    ifdef OLED_DISPLAY_128X64
-#    define KEYLOGGER_LENGTH ((uint8_t)(OLED_DISPLAY_HEIGHT / OLED_FONT_WIDTH))
-// #    else
-// #        define KEYLOGGER_LENGTH (uint8_t *(OLED_DISPLAY_WIDTH / OLED_FONT_HEIGHT))
-// #    endif
-#endif
+uint32_t                  oled_timer                            = 0;
+char                      keylog_str[OLED_KEYLOGGER_LENGTH]     = {0};
+static uint16_t           log_timer                             = 0;
+static const char PROGMEM display_border[3]                     = {0x0, 0xFF, 0x0};
 
-uint32_t        oled_timer                       = 0;
-static char     keylog_str[KEYLOGGER_LENGTH + 1] = {0};
-static uint16_t log_timer                        = 0;
+deferred_token kittoken;
 
 // clang-format off
 static const char PROGMEM code_to_name[256] = {
@@ -56,10 +51,16 @@ static const char PROGMEM code_to_name[256] = {
 };
 // clang-format on
 
+/**
+ * @brief parses pressed keycodes and saves to buffer
+ *
+ * @param keycode Keycode pressed from switch matrix
+ * @param record keyrecord_t data structure
+ */
 void add_keylog(uint16_t keycode, keyrecord_t *record) {
     if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
         if (((keycode & 0xFF) == KC_BSPC) && mod_config(get_mods() | get_oneshot_mods()) & MOD_MASK_CTRL) {
-            memset(keylog_str, ' ', sizeof(keylog_str) - 1);
+            memset(keylog_str, ' ', OLED_KEYLOGGER_LENGTH);
             return;
         }
         if (record->tap.count) {
@@ -72,23 +73,29 @@ void add_keylog(uint16_t keycode, keyrecord_t *record) {
         return;
     }
 
-    for (uint8_t i = 1; i < KEYLOGGER_LENGTH; i++) {
-        keylog_str[i - 1] = keylog_str[i];
-    }
+    memmove(keylog_str, keylog_str + 1, OLED_KEYLOGGER_LENGTH - 1);
 
     if (keycode < (sizeof(code_to_name) / sizeof(char))) {
-        keylog_str[(KEYLOGGER_LENGTH - 1)] = pgm_read_byte(&code_to_name[keycode]);
+        keylog_str[(OLED_KEYLOGGER_LENGTH - 1)] = pgm_read_byte(&code_to_name[keycode]);
     }
 
     log_timer = timer_read();
 }
 
+/**
+ * @brief Keycode handler for oled display.
+ *
+ * This adds pressed keys to buffer, but also resets the oled timer
+ *
+ * @param keycode Keycode from matrix
+ * @param record keyrecord data struture
+ * @return true
+ * @return false
+ */
 bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
-#ifdef OLED_ENABLE
         oled_timer = timer_read32();
         add_keylog(keycode, record);
-#endif
     }
     return true;
 }
@@ -99,12 +106,29 @@ void update_log(void) {
     }
 }
 
+/**
+ * @brief Renders keylogger buffer to oled
+ *
+ */
 void render_keylogger_status(void) {
+#ifdef OLED_DISPLAY_VERBOSE
+    oled_set_cursor(1, 7);
+#endif
     oled_write_P(PSTR(OLED_RENDER_KEYLOGGER), false);
     oled_write(keylog_str, false);
+#ifdef OLED_DISPLAY_VERBOSE
+    oled_advance_page(true);
+#endif
 }
 
+/**
+ * @brief Renders default layer state (aka layout) to oled
+ *
+ */
 void render_default_layer_state(void) {
+#ifdef OLED_DISPLAY_VERBOSE
+    oled_set_cursor(5, 2);
+#endif
     oled_write_P(PSTR(OLED_RENDER_LAYOUT_NAME), false);
     switch (get_highest_layer(default_layer_state)) {
         case _QWERTY:
@@ -120,46 +144,150 @@ void render_default_layer_state(void) {
             oled_write_P(PSTR(OLED_RENDER_LAYOUT_DVORAK), false);
             break;
     }
-#ifdef OLED_DISPLAY_128X64
+#ifdef OLED_DISPLAY_VERBOSE
     oled_advance_page(true);
 #endif
 }
 
+/**
+ * @brief Renders the active layers to the OLED
+ *
+ */
 void render_layer_state(void) {
-    oled_write_P(PSTR(OLED_RENDER_LAYER_NAME), false);
-#ifdef OLED_DISPLAY_128X64
+#ifdef OLED_DISPLAY_VERBOSE
+    static const char PROGMEM tri_layer_image[4][3][18] = {
+        {
+            {
+                0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
+                0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
+                0x20, 0x20, 0x40, 0x40, 0x80, 0x80
+            },
+            {
+                0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E,
+                0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C,
+                0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88
+            },
+            {
+                0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
+                0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
+                0x02, 0x02, 0x01, 0x01, 0x00, 0x00
+            }
+        },
+        {
+            {
+                0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
+                0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0,
+                0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80
+            },
+            {
+                0x88, 0x88, 0x55, 0x55, 0x23, 0x23,
+                0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47,
+                0x23, 0x23, 0x55, 0x55, 0x88, 0x88
+            },
+            {
+                0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
+                0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
+                0x02, 0x02, 0x01, 0x01, 0x00, 0x00
+            }
+        },
+        {
+            {
+                0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
+                0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
+                0x20, 0x20, 0x40, 0x40, 0x80, 0x80
+            },
+            {
+                0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2,
+                0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4,
+                0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88
+            },
+            {
+                0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
+                0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07,
+                0x03, 0x03, 0x01, 0x01, 0x00, 0x00
+            }
+        },
+        {
+            {
+                0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0,
+                0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0,
+                0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80
+            },
+            {
+                0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6,
+                0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6,
+                0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88
+            },
+            {
+                0x00, 0x00, 0x01, 0x01, 0x03, 0x02,
+                0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06,
+                0x03, 0x02, 0x01, 0x01, 0x00, 0x00
+            }
+        }
+    };
+
+    uint8_t layer_is = 0;
+    if (layer_state_is(_ADJUST)) {
+        layer_is = 3;
+    } else if (layer_state_is(_RAISE)) {
+        layer_is = 1;
+    } else if (layer_state_is(_LOWER)) {
+        layer_is = 2;
+    }
+
+    oled_set_cursor(1, 2);
+    oled_write_raw_P(tri_layer_image[layer_is][0], sizeof(tri_layer_image[0][0]));
+    oled_set_cursor(5, 3);
+    oled_write_P(PSTR("Diablo2"), layer_state_is(_DIABLOII));
     oled_write_P(PSTR(" "), false);
-#endif
-    oled_write_P(PSTR(OLED_RENDER_LAYER_LOWER), layer_state_is(_LOWER));
-#ifdef OLED_DISPLAY_128X64
-    oled_write_P(PSTR(" "), false);
-#endif
-    oled_write_P(PSTR(OLED_RENDER_LAYER_RAISE), layer_state_is(_RAISE));
-#ifdef OLED_DISPLAY_128X64
+    oled_write_P(PSTR("Diablo3"), layer_state_is(_DIABLO));
     oled_advance_page(true);
-    oled_write_P(PSTR(" "), false);
+
+    oled_set_cursor(1, 3);
+    oled_write_raw_P(tri_layer_image[layer_is][1], sizeof(tri_layer_image[0][0]));
+    oled_set_cursor(5, 4);
     oled_write_P(PSTR("GamePad"), layer_state_is(_GAMEPAD));
     oled_write_P(PSTR(" "), false);
-    oled_write_P(PSTR("Diablo"), layer_state_is(_DIABLO));
-    oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR("Mouse"), layer_state_is(_MOUSE));
+    oled_advance_page(true);
+
+    oled_set_cursor(1, 4);
+    oled_write_raw_P(tri_layer_image[layer_is][2], sizeof(tri_layer_image[0][0]));
+
+#else
+    oled_write_P(PSTR(OLED_RENDER_LAYER_NAME), false);
+    oled_write_P(PSTR(OLED_RENDER_LAYER_LOWER), layer_state_is(_LOWER));
+    oled_write_P(PSTR(OLED_RENDER_LAYER_RAISE), layer_state_is(_RAISE));
+    oled_advance_page(true);
 #endif
 }
 
+/**
+ * @brief Renders the current lock status to oled
+ *
+ * @param led_usb_state Current keyboard led state
+ */
 void render_keylock_status(uint8_t led_usb_state) {
+#if defined(OLED_DISPLAY_VERBOSE)
+    oled_set_cursor(1, 6);
+#endif
     oled_write_P(PSTR(OLED_RENDER_LOCK_NAME), false);
-#if !defined(OLED_DISPLAY_128X64)
+#if !defined(OLED_DISPLAY_VERBOSE)
     oled_write_P(PSTR(" "), false);
 #endif
     oled_write_P(PSTR(OLED_RENDER_LOCK_NUML), led_usb_state & (1 << USB_LED_NUM_LOCK));
     oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR(OLED_RENDER_LOCK_CAPS), led_usb_state & (1 << USB_LED_CAPS_LOCK));
-#if defined(OLED_DISPLAY_128X64)
+#if defined(OLED_DISPLAY_VERBOSE)
     oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR(OLED_RENDER_LOCK_SCLK), led_usb_state & (1 << USB_LED_SCROLL_LOCK));
 #endif
 }
 
+/**
+ * @brief Renders the matrix scan rate to the host system
+ *
+ */
 void render_matrix_scan_rate(void) {
 #ifdef DEBUG_MATRIX_SCAN_RATE
     oled_write_P(PSTR("MS:"), false);
@@ -167,10 +295,18 @@ void render_matrix_scan_rate(void) {
 #endif
 }
 
+/**
+ * @brief Renders the modifier state
+ *
+ * @param modifiers Modifiers to check against (real, weak, onesheot, etc;)
+ */
 void render_mod_status(uint8_t modifiers) {
     static const char PROGMEM mod_status[5][3] = {{0xE8, 0xE9, 0}, {0xE4, 0xE5, 0}, {0xE6, 0xE7, 0}, {0xEA, 0xEB, 0}, {0xEC, 0xED, 0}};
+#if defined(OLED_DISPLAY_VERBOSE)
+    oled_set_cursor(1, 5);
+#endif
     oled_write_P(PSTR(OLED_RENDER_MODS_NAME), false);
-#if defined(OLED_DISPLAY_128X64)
+#if defined(OLED_DISPLAY_VERBOSE)
     oled_write_P(mod_status[0], (modifiers & MOD_BIT(KC_LSHIFT)));
     oled_write_P(mod_status[!keymap_config.swap_lctl_lgui ? 3 : 4], (modifiers & MOD_BIT(KC_LGUI)));
     oled_write_P(mod_status[2], (modifiers & MOD_BIT(KC_LALT)));
@@ -200,26 +336,27 @@ void render_bootmagic_status(void) {
     };
 
     bool is_bootmagic_on;
-#ifdef OLED_DISPLAY_128X64
+#ifdef OLED_DISPLAY_VERBOSE
+    oled_set_cursor(7, 4);
     is_bootmagic_on = !keymap_config.swap_lctl_lgui;
 #else
     is_bootmagic_on = keymap_config.swap_lctl_lgui;
 #endif
 
-    oled_write_P(PSTR(OLED_RENDER_BOOTMAGIC_NAME), false);
-#ifdef OLED_DISPLAY_128X64
+#ifdef OLED_DISPLAY_VERBOSE
     if (keymap_config.swap_lctl_lgui)
 #else
+    oled_write_P(PSTR(OLED_RENDER_BOOTMAGIC_NAME), false);
     oled_write_P(PSTR(" "), false);
 #endif
     {
         oled_write_P(logo[1][0], is_bootmagic_on);
-#ifdef OLED_DISPLAY_128X64
+#ifdef OLED_DISPLAY_VERBOSE
     } else {
 #endif
         oled_write_P(logo[0][0], !is_bootmagic_on);
     }
-#ifndef OLED_DISPLAY_128X64
+#ifndef OLED_DISPLAY_VERBOSE
     oled_write_P(PSTR(" "), false);
     oled_write_P(logo[1][1], is_bootmagic_on);
     oled_write_P(logo[0][1], !is_bootmagic_on);
@@ -232,10 +369,8 @@ void render_bootmagic_status(void) {
 #else
     oled_write_P(PSTR(OLED_RENDER_BOOTMAGIC_NOGUI), keymap_config.no_gui);
 #endif
-#ifdef OLED_DISPLAY_128X64
-    oled_advance_page(true);
-    oled_write_P(PSTR("Magic"), false);
-    oled_write_P(PSTR(" "), false);
+#ifdef OLED_DISPLAY_VERBOSE
+    oled_set_cursor(7, 5);
     if (keymap_config.swap_lctl_lgui) {
         oled_write_P(logo[1][1], is_bootmagic_on);
     } else {
@@ -248,9 +383,6 @@ void render_bootmagic_status(void) {
     oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR(OLED_RENDER_BOOTMAGIC_SWAP), swap_hands);
 #endif
-#ifdef OLED_DISPLAY_128X64
-    oled_advance_page(true);
-#endif
 }
 
 #if defined(POINTING_DEVICE_ENABLE)
@@ -268,14 +400,17 @@ void render_user_status(void) {
     is_audio_on  = is_audio_on();
     is_clicky_on = is_clicky_on();
 #    endif
+#endif
+#if defined(OLED_DISPLAY_VERBOSE)
+    oled_set_cursor(1, 6);
 #endif
     oled_write_P(PSTR(OLED_RENDER_USER_NAME), false);
-#if !defined(OLED_DISPLAY_128X64)
+#if !defined(OLED_DISPLAY_VERBOSE)
     oled_write_P(PSTR(" "), false);
 #endif
 #if defined(RGB_MATRIX_ENABLE)
     oled_write_P(PSTR(OLED_RENDER_USER_ANIM), userspace_config.rgb_matrix_idle_anim);
-#    if !defined(OLED_DISPLAY_128X64)
+#    if !defined(OLED_DISPLAY_VERBOSE)
     oled_write_P(PSTR(" "), false);
 #    endif
 #elif defined(POINTING_DEVICE_ENABLE)
@@ -289,7 +424,7 @@ void render_user_status(void) {
 #    ifdef AUDIO_CLICKY
     static const char PROGMEM audio_clicky_status[2][3] = {{0xF4, 0xF5, 0}, {0xF6, 0xF7, 0}};
     oled_write_P(audio_clicky_status[is_clicky_on && is_audio_on], false);
-#        if !defined(OLED_DISPLAY_128X64)
+#        if !defined(OLED_DISPLAY_VERBOSE)
     oled_write_P(PSTR(" "), false);
 #        endif
 #    endif
@@ -304,30 +439,20 @@ void render_user_status(void) {
     oled_write_P(uc_mod_status[get_unicode_input_mode() == UC_MAC], false);
 #endif
     if (userspace_config.nuke_switch) {
-#if !defined(OLED_DISPLAY_128X64)
+#if !defined(OLED_DISPLAY_VERBOSE)
         oled_write_P(PSTR(" "), false);
 #endif
         static const char PROGMEM nukem_good[2] = {0xFA, 0};
         oled_write_P(nukem_good, false);
-#if !defined(OLED_DISPLAY_128X64)
+#if !defined(OLED_DISPLAY_VERBOSE)
         oled_advance_page(true);
 #endif
     }
-#if defined(OLED_DISPLAY_128X64)
+#if defined(OLED_DISPLAY_VERBOSE)
     oled_advance_page(true);
 #endif
 }
 
-void oled_driver_render_logo(void) {
-    // clang-format off
-    static const char PROGMEM qmk_logo[] = {
-        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-    // clang-format on
-    oled_write_P(qmk_logo, false);
-}
-
 void render_wpm(uint8_t padding) {
 #ifdef WPM_ENABLE
 
@@ -356,49 +481,389 @@ void                    render_pointing_dpi_status(uint8_t padding) {
 #endif
 
 __attribute__((weak)) void oled_driver_render_logo_right(void) {
-#if defined(OLED_DISPLAY_128X64)
-    oled_driver_render_logo();
+#if defined(OLED_DISPLAY_VERBOSE)
+    oled_set_cursor(0, 2);
     render_default_layer_state();
-    oled_set_cursor(0, 4);
 #else
     render_default_layer_state();
 #endif
 }
 
-__attribute__((weak)) void oled_driver_render_logo_left(void) {
-#if defined(OLED_DISPLAY_128X64)
-    oled_driver_render_logo();
-#    ifdef DEBUG_MATRIX_SCAN_RATE
+// WPM-responsive animation stuff here
+#define OLED_SLEEP_FRAMES 2
+#define OLED_SLEEP_SPEED 10  // below this wpm value your animation will idle
+
+#define OLED_WAKE_FRAMES 2                // uncomment if >1
+#define OLED_WAKE_SPEED OLED_SLEEP_SPEED  // below this wpm value your animation will idle
+
+#define OLED_KAKI_FRAMES 3
+#define OLED_KAKI_SPEED 40  // above this wpm value typing animation to triggere
+
+#define OLED_RTOGI_FRAMES 2
+//#define OLED_LTOGI_FRAMES 2
+
+//#define ANIM_FRAME_DURATION 500 // how long each frame lasts in ms
+// #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
+#define OLED_ANIM_SIZE 32  // number of bytes in array, minimize for adequate firmware size, max is 1024
+#define OLED_ANIM_ROWS 4
+#define OLED_ANIM_MAX_FRAMES 3
+#if (OLED_SLEEP_FRAMES > OLED_ANIM_MAX_FRAMES) || (OLED_WAKE_FRAMES > OLED_ANIM_MAX_FRAMES) || (OLED_KAKI_FRAMES > OLED_ANIM_MAX_FRAMES) || (OLED_RTOGI_FRAMES > OLED_ANIM_MAX_FRAMES)
+#    error frame size too large
+#endif
+
+static uint8_t  animation_frame     = 0;
+static uint8_t  animation_type      = 0;
+
+void render_kitty(void) {
+    // Images credit j-inc(/James Incandenza) and pixelbenny.
+    // Credit to obosob for initial animation approach.
+    // heavily modified by drashna because he's a glutton for punishment
+
+    // clang-format off
+    static const char PROGMEM animation[4][OLED_ANIM_MAX_FRAMES][OLED_ANIM_ROWS][OLED_ANIM_SIZE] = {
+        // sleep frames
+        {
+            {
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08,
+                    0xa8, 0x48, 0xa8, 0x18, 0x08, 0x00, 0x00, 0x00,
+                    0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03,
+                    0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x80,
+                    0x44, 0x84, 0x06, 0x05, 0x04, 0x80, 0x40, 0x20,
+                    0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20,
+                    0x18, 0x04, 0x04, 0x02, 0x7a, 0x86, 0x01, 0x80,
+                    0x80, 0x01, 0x03, 0x05, 0x07, 0x01, 0x00, 0x00,
+                    0x80, 0x83, 0x45, 0xfa, 0x3c, 0xe0, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08,
+                    0x10, 0x10, 0x10, 0x10, 0x10, 0x33, 0x24, 0x28,
+                    0x28, 0x29, 0x29, 0x29, 0x3a, 0x18, 0x1c, 0x39,
+                    0x24, 0x24, 0x3a, 0x2d, 0x26, 0x31, 0x1f, 0x00
+                }
+            },
+            {
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x22, 0x22, 0x3a, 0x2a, 0x26, 0x22, 0x80, 0xc0,
+                    0x80, 0x00, 0x24, 0x34, 0x2c, 0xe4, 0x60, 0x10,
+                    0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x38,
+                    0x04, 0x02, 0x02, 0x01, 0x79, 0x87, 0x01, 0x80,
+                    0x81, 0x83, 0x05, 0x05, 0x03, 0x01, 0x00, 0x00,
+                    0x80, 0x43, 0x05, 0xfa, 0x3c, 0xe0, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08,
+                    0x10, 0x10, 0x10, 0x10, 0x10, 0x33, 0x24, 0x28,
+                    0x28, 0x28, 0x29, 0x29, 0x3a, 0x18, 0x1c, 0x39,
+                    0x24, 0x24, 0x3a, 0x2d, 0x26, 0x31, 0x1f, 0x00
+                }
+            }
+        },
+        // wake frames
+        {
+            {
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0xc0, 0x30, 0x08, 0x10, 0x60, 0x80,
+                    0x00, 0x80, 0x60, 0x10, 0x08, 0x30, 0xc0, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x7f, 0x80, 0x40, 0x40, 0x5c, 0x00, 0x01,
+                    0x41, 0x01, 0x00, 0x5c, 0x40, 0x40, 0x80, 0x7f,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+                    0x40, 0x40, 0x80, 0xe1, 0x12, 0x0a, 0x06, 0x00,
+                    0x80, 0x00, 0x06, 0x0a, 0x12, 0xe1, 0x80, 0x40,
+                    0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
+                    0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
+                    0x0f, 0x18, 0x10, 0x10, 0x1f, 0x11, 0x10, 0x10,
+                    0x14, 0x14, 0x1f, 0x1c, 0x14, 0x14, 0x14, 0x08
+                }
+            },
+            {
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0xc0, 0x30, 0x08, 0x10, 0x60, 0x80,
+                    0x00, 0x80, 0x60, 0x10, 0x08, 0x30, 0xc0, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x7f, 0x90, 0x12, 0x0a, 0x02, 0xf4, 0x09,
+                    0x0d, 0xf1, 0x04, 0x02, 0x0a, 0x12, 0x90, 0x7f,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+                    0x40, 0x40, 0x80, 0xe1, 0x12, 0x0a, 0x06, 0x01,
+                    0x81, 0x00, 0x06, 0x0a, 0x12, 0xe1, 0x80, 0x40,
+                    0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
+                    0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
+                    0x0f, 0x18, 0x10, 0x10, 0x1f, 0x11, 0x10, 0x10,
+                    0x14, 0x14, 0x1f, 0x1c, 0x14, 0x14, 0x14, 0x08
+                }
+            }
+        },
+        // kaki frames
+        {
+            {
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x40,
+                    0x80, 0x80, 0x80, 0x00, 0xfc, 0x84, 0x08, 0x08,
+                    0x10, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x60,
+                    0x80, 0x00, 0x00, 0x91, 0xa1, 0x80, 0x00, 0x00,
+                    0x22, 0x84, 0x40, 0x50, 0x48, 0xc1, 0x3e, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+                    0x40, 0x41, 0x82, 0xe2, 0x12, 0x0a, 0x06, 0x00,
+                    0x80, 0x88, 0x4f, 0x02, 0x22, 0xe2, 0x9f, 0x40,
+                    0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
+                    0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
+                    0x0f, 0x18, 0x14, 0x10, 0x10, 0x10, 0x10, 0x10,
+                    0x14, 0x14, 0x1f, 0x1a, 0x0a, 0x0a, 0x04, 0x00
+                }
+            },
+            {
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0xf0, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x06, 0x1a, 0x22, 0xc2, 0x04, 0x04,
+                    0x04, 0x07, 0x00, 0xc0, 0x20, 0x10, 0x80, 0x80,
+                    0x01, 0x01, 0x02, 0xfc, 0xfe, 0x02, 0x3c, 0x20,
+                    0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d,
+                    0x55, 0x50, 0x94, 0xf0, 0x10, 0x09, 0x08, 0x00,
+                    0x80, 0x00, 0x06, 0x09, 0x1b, 0xee, 0x00, 0x00,
+                    0x00, 0x00, 0x81, 0xfe, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
+                    0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
+                    0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c,
+                    0x14, 0x16, 0x15, 0x14, 0x14, 0x14, 0x14, 0x08
+                }
+            },
+            {
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x20, 0x40,
+                    0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x01,
+                    0x02, 0x04, 0x04, 0x03, 0x80, 0x40, 0x40, 0x20,
+                    0x00, 0x01, 0x02, 0x8c, 0x70, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d,
+                    0x55, 0x50, 0x94, 0xf0, 0x10, 0x0a, 0x0e, 0x1d,
+                    0x95, 0x24, 0x24, 0x27, 0x13, 0xe1, 0x01, 0x01,
+                    0x01, 0x01, 0x02, 0xfc, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
+                    0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
+                    0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c,
+                    0x14, 0x14, 0x17, 0x14, 0x14, 0x14, 0x14, 0x08
+                }
+            }
+        },
+        // rtogi frames
+        {
+            {
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02,
+                    0x01, 0x0f, 0x90, 0x10, 0x20, 0xf0, 0xf8, 0xf8
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+                    0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08,
+                    0x48, 0x47, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x08, 0x88, 0xc7, 0xc4, 0x62, 0x23, 0x11, 0x3f
+                },
+                {
+                    0x80, 0x40, 0x20, 0x10, 0x88, 0xcc, 0x43, 0x80,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0,
+                    0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c,
+                    0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                {
+                    0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
+                    0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04,
+                    0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                }
+            },
+            {
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02,
+                    0x01, 0x1f, 0xa0, 0x20, 0x40, 0x80, 0x00, 0xf0
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+                    0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08,
+                    0x48, 0x47, 0x88, 0x00, 0x00, 0x00, 0x00, 0x24,
+                    0x24, 0x28, 0x6b, 0x40, 0xa0, 0x99, 0x86, 0xff
+                },
+                {
+                    0x0f, 0x11, 0x22, 0x44, 0x48, 0x4c, 0x43, 0x80,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0,
+                    0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c,
+                    0x04, 0x06, 0x06, 0x06, 0x0e, 0x0e, 0x06, 0x01
+                },
+                {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04,
+                    0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                }
+            }
+        }
+    };
+    // clang-format on
+
+    for (uint8_t i = 0; i < 4; i++) {
+        oled_set_cursor(1, i + 2);
+        oled_write_raw_P(animation[animation_type][animation_frame][i], OLED_ANIM_SIZE);
+    }
+}
+
+uint32_t kitty_animation_phases(uint32_t triger_time, void *cb_arg) {
+    uint32_t anim_frame_duration = 500;
+    // can't change animation frame duration here, otherwise, it gets stuck.
+    // weirdly, it seems to work fine if it's in keymap.c but not here.
+    // Should move this block to the deferred execution?
+#ifdef POINTING_DEVICE_ENABLE
+    if (tap_toggling) {
+        animation_frame = (animation_frame + 1) % OLED_RTOGI_FRAMES;
+        animation_type = 3;
+        anim_frame_duration = 300;
+    } else
+#endif
+    {
+        if (get_current_wpm() <= OLED_SLEEP_SPEED) {
+            animation_frame     = (animation_frame + 1) % OLED_SLEEP_FRAMES;
+            animation_type      = 0;
+            anim_frame_duration = 500;
+        } else if (get_current_wpm() > OLED_WAKE_SPEED) {
+            animation_frame     = (animation_frame + 1) % OLED_WAKE_FRAMES;
+            animation_type      = 1;
+            anim_frame_duration = 800;
+        } else if (get_current_wpm() >= OLED_KAKI_SPEED) {
+            animation_frame     = (animation_frame + 1) % OLED_KAKI_FRAMES;
+            animation_type      = 2;
+            anim_frame_duration = 500;
+        }
+    }
+    return anim_frame_duration;
+}
+
+void oled_driver_render_logo_left(void) {
+#if defined(OLED_DISPLAY_VERBOSE)
+    oled_set_cursor(0, 2);
+    render_kitty();
+
+#    if defined(KEYBOARD_handwired_tractyl_manuform)
+    oled_set_cursor(7, 0);
+    oled_write_P(PSTR("Tractyl"), true);
+#    elif defined(KEYBOARD_bastardkb_charybdis)
+    oled_set_cursor(6, 0);
+    oled_write_P(PSTR("Charybdis"), true);
+#    else
+    oled_set_cursor(8, 0);
+    oled_write_P(PSTR("Left"), true);
+#    endif
+    oled_set_cursor(7, 2);
+#    if defined(DEBUG_MATRIX_SCAN_RATE)
     render_matrix_scan_rate();
 #    elif defined(WPM_ENABLE)
-    render_wpm(0);
+    render_wpm(1);
 #    endif
-    oled_write_P(PSTR("  "), false);
-#    if defined(KEYBOARD_handwired_tractyl_manuform) || defined(KEYBOARD_bastardkb_charybdis)
+    oled_set_cursor(7, 3);
+#    if defined(KEYBOARD_handwired_tractyl_manuform)
+    render_pointing_dpi_status(0);
+#    elif defined(KEYBOARD_bastardkb_charybdis)
     render_pointing_dpi_status(1);
 #    endif
-    oled_set_cursor(0, 4);
+    oled_set_cursor(0, 6);
 #else
     render_default_layer_state();
 #endif
 }
 
 void render_status_secondary(void) {
+#    if defined(KEYBOARD_handwired_tractyl_manuform)
+    oled_set_cursor(7, 0);
+    oled_write_P(PSTR("Manuform"), true);
+#    elif defined(KEYBOARD_bastardkb_charybdis)
+    oled_set_cursor(6, 0);
+    oled_write_P(PSTR("Charybdis"), true);
+#    else
+    oled_set_cursor(8, 0);
+    oled_write_P(PSTR("Right"), true);
+#    endif
     oled_driver_render_logo_right();
     /* Show Keyboard Layout  */
     render_layer_state();
     render_mod_status(get_mods() | get_oneshot_mods());
-#if !defined(OLED_DISPLAY_128X64) && defined(WPM_ENABLE) && !defined(CONVERT_TO_PROTON_C)
+#if !defined(OLED_DISPLAY_VERBOSE) && defined(WPM_ENABLE) && !defined(CONVERT_TO_PROTON_C)
     render_wpm(2);
 #endif
-    // render_keylock_status(host_keyboard_leds());
+    render_keylock_status(host_keyboard_leds());
 }
 
 void render_status_main(void) {
     oled_driver_render_logo_left();
 
     /* Show Keyboard Layout  */
-    // render_keylock_status(host_keyboard_leds());
     render_bootmagic_status();
     render_user_status();
 
@@ -408,8 +873,14 @@ void render_status_main(void) {
 __attribute__((weak)) oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return rotation; }
 
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    memset(keylog_str, ' ', sizeof(keylog_str) - 1);
+    if (is_keyboard_master()) {
+        memset(keylog_str, ' ', OLED_KEYLOGGER_LENGTH);
+    }
 
+    kittoken = defer_exec(3000, kitty_animation_phases, NULL);
+
+    oled_clear();
+    oled_render();
     return oled_init_keymap(rotation);
 }
 
@@ -417,22 +888,61 @@ bool oled_task_user(void) {
     update_log();
 
     if (is_keyboard_master()) {
+#ifndef OLED_DISPLAY_TEST
         if (timer_elapsed32(oled_timer) > 30000) {
             oled_off();
             return false;
-        } else {
+        } else
+#endif
+        {
             oled_on();
         }
     }
+#if defined(OLED_DISPLAY_VERBOSE)
+     static const char PROGMEM header_image[] = {
+         0,192, 32, 16,  8,  4,  2,  1,  1,  1,  1,  1,  1,  1,  1,  3,  7, 15, 31, 63,127,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,127, 63, 31, 15,  7,  3,  1,  1,  1,  1,  1,  1,  1,  1,  2,  4,  8, 16, 32,192,  0,
+         0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  7, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  7,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,  0
+     };
+     static const char PROGMEM footer_image[] = {
+         0,  3,  4,  8, 16, 32, 64,128,128,128,128,128,128,128,192,224,240,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,240,224,192,128,128,128,128,128,128,128, 64, 32, 16,  8,  4,  3,  0
+     };
+    oled_write_raw_P(header_image, sizeof(header_image));
+    oled_set_cursor(0, 1);
+#endif
+
+#ifndef OLED_DISPLAY_TEST
     if (is_keyboard_left()) {
+#endif
         render_status_main();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+#ifndef OLED_DISPLAY_TEST
     } else {
         render_status_secondary();
     }
-    if (is_keyboard_master()) {
+#endif
+
+#if defined(OLED_DISPLAY_128X128)
+    if (is_keyboard_left()) {
         render_keylogger_status();
-    } else {
-        render_keylock_status(host_keyboard_leds());
     }
+#endif
+
+#if defined(OLED_DISPLAY_VERBOSE)
+    uint8_t num_of_rows;
+#    if defined(OLED_DISPLAY_128X128)
+    num_of_rows = 15;
+#    else
+    num_of_rows = 7;
+#    endif
+    for (uint8_t i= 1; i < num_of_rows; i++) {
+        oled_set_cursor(0, i);
+        oled_write_raw_P(display_border, sizeof(display_border));
+        oled_set_cursor(21, i);
+        oled_write_raw_P(display_border, sizeof(display_border));
+    }
+
+    oled_set_cursor(0, num_of_rows);
+    oled_write_raw_P(footer_image, sizeof(footer_image));
+#endif
+
     return false;
 }
diff --git a/users/drashna/oled/oled_stuff.h b/users/drashna/oled/oled_stuff.h
index 8795684d6a..985153c2ff 100644
--- a/users/drashna/oled/oled_stuff.h
+++ b/users/drashna/oled/oled_stuff.h
@@ -18,6 +18,7 @@
 
 #include "quantum.h"
 #include "oled_driver.h"
+extern deferred_token kittoken;
 
 void            oled_driver_render_logo(void);
 bool            process_record_user_oled(uint16_t keycode, keyrecord_t *record);
@@ -37,12 +38,16 @@ void            render_pointing_dpi_status(uint8_t padding);
 void            oled_driver_render_logo_left(void);
 void            oled_driver_render_logo_right(void);
 
-#ifdef OLED_DISPLAY_128X64
-#    define OLED_RENDER_KEYLOGGER         "Keylogger: "
+#if defined(OLED_DISPLAY_128X128) || defined(OLED_DISPLAY_128X64)
+#    define OLED_DISPLAY_VERBOSE
 
+#    define OLED_RENDER_KEYLOGGER         "Keylogger: "
+#    ifndef OLED_KEYLOGGER_LENGTH
+#        define OLED_KEYLOGGER_LENGTH         9
+#    endif
 #    define OLED_RENDER_LAYOUT_NAME       "Layout: "
 #    define OLED_RENDER_LAYOUT_QWERTY     "Qwerty"
-#    define OLED_RENDER_LAYOUT_COLEMAK_DH "Colemak-DH"
+#    define OLED_RENDER_LAYOUT_COLEMAK_DH "ColemkDH"
 #    define OLED_RENDER_LAYOUT_COLEMAK    "Colemak"
 #    define OLED_RENDER_LAYOUT_DVORAK     "Dvorak"
 #    define OLED_RENDER_LAYOUT_WORKMAN    "Workman"
@@ -58,11 +63,11 @@ void            oled_driver_render_logo_right(void);
 #    define OLED_RENDER_LAYER_MODS        "Mods"
 
 #    define OLED_RENDER_LOCK_NAME         "Lock: "
-#    define OLED_RENDER_LOCK_NUML         "NUML"
+#    define OLED_RENDER_LOCK_NUML         "NUM"
 #    define OLED_RENDER_LOCK_CAPS         "CAPS"
 #    define OLED_RENDER_LOCK_SCLK         "SCLK"
 
-#    define OLED_RENDER_MODS_NAME         "Mods:"
+#    define OLED_RENDER_MODS_NAME         "Mods"
 #    define OLED_RENDER_MODS_SFT          "Sft"
 #    define OLED_RENDER_MODS_CTL          "Ctl"
 #    define OLED_RENDER_MODS_ALT          "Alt"
@@ -84,6 +89,9 @@ void            oled_driver_render_logo_right(void);
 #    define OLED_RENDER_WPM_COUNTER       "WPM: "
 #else
 #    define OLED_RENDER_KEYLOGGER         "KLogr"
+#    ifndef OLED_KEYLOGGER_LENGTH
+#        define OLED_KEYLOGGER_LENGTH         5
+#    endif
 
 #    define OLED_RENDER_LAYOUT_NAME       "Lyout"
 #    define OLED_RENDER_LAYOUT_QWERTY     " QRTY"
@@ -127,5 +135,7 @@ void            oled_driver_render_logo_right(void);
 #    define OLED_RENDER_USER_NUKE         "Nuke"
 
 #    define OLED_RENDER_WPM_COUNTER       "WPM: "
-
 #endif
+
+
+extern char                      keylog_str[OLED_KEYLOGGER_LENGTH];
diff --git a/users/drashna/oled/sh110x.c b/users/drashna/oled/sh110x.c
new file mode 100644
index 0000000000..c850a47538
--- /dev/null
+++ b/users/drashna/oled/sh110x.c
@@ -0,0 +1,860 @@
+/*
+Copyright 2019 Ryan Caltabiano <https://github.com/XScorpion2>
+
+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 "i2c_master.h"
+#include "oled_driver.h"
+#include OLED_FONT_H
+#include "timer.h"
+#include "print.h"
+
+#include <string.h>
+
+#include "progmem.h"
+
+#include "keyboard.h"
+
+// Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf
+// for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf
+
+// Fundamental Commands
+#define CONTRAST 0x81
+#define DISPLAY_ALL_ON 0xA5
+#define DISPLAY_ALL_ON_RESUME 0xA4
+#define NORMAL_DISPLAY 0xA6
+#define INVERT_DISPLAY 0xA7
+#define DISPLAY_ON 0xAF
+#define DISPLAY_OFF 0xAE
+#define NOP 0xE3
+
+// Scrolling Commands
+#define ACTIVATE_SCROLL 0x2F
+#define DEACTIVATE_SCROLL 0x2E
+#define SCROLL_RIGHT 0x26
+#define SCROLL_LEFT 0x27
+#define SCROLL_RIGHT_UP 0x29
+#define SCROLL_LEFT_UP 0x2A
+
+// Addressing Setting Commands
+#define MEMORY_MODE 0x20
+#define COLUMN_ADDR 0x21
+#define PAGE_ADDR 0x22
+#define PAM_SETCOLUMN_LSB 0x00
+#define PAM_SETCOLUMN_MSB 0x10
+#define PAM_PAGE_ADDR 0xB0  // 0xb0 -- 0xb7
+
+// Hardware Configuration Commands
+#define DISPLAY_START_LINE 0x40
+#define SEGMENT_REMAP 0xA0
+#define SEGMENT_REMAP_INV 0xA1
+#define MULTIPLEX_RATIO 0xA8
+#define COM_SCAN_INC 0xC0
+#define COM_SCAN_DEC 0xC8
+#define DISPLAY_OFFSET 0xD3
+#define COM_PINS 0xDA
+#define COM_PINS_SEQ 0x02
+#define COM_PINS_ALT 0x12
+#define COM_PINS_SEQ_LR 0x22
+#define COM_PINS_ALT_LR 0x32
+
+// Timing & Driving Commands
+#define DISPLAY_CLOCK 0xD5
+#define PRE_CHARGE_PERIOD 0xD9
+#define VCOM_DETECT 0xDB
+
+// Advance Graphic Commands
+#define FADE_BLINK 0x23
+#define ENABLE_FADE 0x20
+#define ENABLE_BLINK 0x30
+
+// Charge Pump Commands
+#define CHARGE_PUMP 0x8D
+
+// Commands specific to the SH1107 chip
+#define SH1107_DISPLAY_START_LINE 0xDC
+#define SH1107_MEMORY_MODE_PAGE 0x20
+#define SH1107_MEMORY_MODE_VERTICAL 0x21
+
+// Misc defines
+#ifndef OLED_BLOCK_COUNT
+#    define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8)
+#endif
+#ifndef OLED_BLOCK_SIZE
+#    define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)
+#endif
+
+#define OLED_ALL_BLOCKS_MASK (((((OLED_BLOCK_TYPE)1 << (OLED_BLOCK_COUNT - 1)) - 1) << 1) | 1)
+
+#define OLED_IC_HAS_HORIZONTAL_MODE (OLED_IC == OLED_IC_SSD1306)
+#define OLED_IC_COM_PINS_ARE_COLUMNS (OLED_IC == OLED_IC_SH1107)
+
+#ifndef OLED_COM_PIN_COUNT
+#    if OLED_IC == OLED_IC_SH1106
+#        define OLED_COM_PIN_COUNT 64
+#    elif OLED_IC == OLED_IC_SH1107
+#        define OLED_COM_PIN_COUNT 128
+#    else
+#        error Invalid OLED_IC value
+#    endif
+#endif
+
+#ifndef OLED_COM_PIN_OFFSET
+#    define OLED_COM_PIN_OFFSET 0
+#endif
+
+// i2c defines
+#define I2C_CMD 0x00
+#define I2C_DATA 0x40
+#if defined(__AVR__)
+#    define I2C_TRANSMIT_P(data) i2c_transmit_P((OLED_DISPLAY_ADDRESS << 1), &data[0], sizeof(data), OLED_I2C_TIMEOUT)
+#else  // defined(__AVR__)
+#    define I2C_TRANSMIT_P(data) i2c_transmit((OLED_DISPLAY_ADDRESS << 1), &data[0], sizeof(data), OLED_I2C_TIMEOUT)
+#endif  // defined(__AVR__)
+#define I2C_TRANSMIT(data) i2c_transmit((OLED_DISPLAY_ADDRESS << 1), &data[0], sizeof(data), OLED_I2C_TIMEOUT)
+#define I2C_WRITE_REG(mode, data, size) i2c_writeReg((OLED_DISPLAY_ADDRESS << 1), mode, data, size, OLED_I2C_TIMEOUT)
+
+#define HAS_FLAGS(bits, flags) ((bits & flags) == flags)
+
+// Display buffer's is the same as the OLED memory layout
+// this is so we don't end up with rounding errors with
+// parts of the display unusable or don't get cleared correctly
+// and also allows for drawing & inverting
+uint8_t         oled_buffer[OLED_MATRIX_SIZE];
+uint8_t *       oled_cursor;
+OLED_BLOCK_TYPE oled_dirty          = 0;
+bool            oled_initialized    = false;
+bool            oled_active         = false;
+bool            oled_scrolling      = false;
+bool            oled_inverted       = false;
+uint8_t         oled_brightness     = OLED_BRIGHTNESS;
+oled_rotation_t oled_rotation       = 0;
+uint8_t         oled_rotation_width = 0;
+uint8_t         oled_scroll_speed   = 0;  // this holds the speed after being remapped to ssd1306 internal values
+uint8_t         oled_scroll_start   = 0;
+uint8_t         oled_scroll_end     = 7;
+#if OLED_TIMEOUT > 0
+uint32_t oled_timeout;
+#endif
+#if OLED_SCROLL_TIMEOUT > 0
+uint32_t oled_scroll_timeout;
+#endif
+#if OLED_UPDATE_INTERVAL > 0
+uint16_t oled_update_timeout;
+#endif
+
+// Internal variables to reduce math instructions
+
+#if defined(__AVR__)
+// identical to i2c_transmit, but for PROGMEM since all initialization is in PROGMEM arrays currently
+// probably should move this into i2c_master...
+static i2c_status_t i2c_transmit_P(uint8_t address, const uint8_t *data, uint16_t length, uint16_t timeout) {
+    i2c_status_t status = i2c_start(address | I2C_WRITE, timeout);
+
+    for (uint16_t i = 0; i < length && status >= 0; i++) {
+        status = i2c_write(pgm_read_byte((const char *)data++), timeout);
+        if (status) break;
+    }
+
+    i2c_stop();
+
+    return status;
+}
+#endif
+
+// Flips the rendering bits for a character at the current cursor position
+static void InvertCharacter(uint8_t *cursor) {
+    const uint8_t *end = cursor + OLED_FONT_WIDTH;
+    while (cursor < end) {
+        *cursor = ~(*cursor);
+        cursor++;
+    }
+}
+
+bool oled_init(oled_rotation_t rotation) {
+#if defined(USE_I2C) && defined(SPLIT_KEYBOARD)
+    if (!is_keyboard_master()) {
+        return true;
+    }
+#endif
+
+    oled_rotation = oled_init_user(oled_init_kb(rotation));
+    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
+        oled_rotation_width = OLED_DISPLAY_WIDTH;
+    } else {
+        oled_rotation_width = OLED_DISPLAY_HEIGHT;
+    }
+    i2c_init();
+
+    static const uint8_t PROGMEM display_setup1[] = {
+        I2C_CMD,
+        DISPLAY_OFF,
+        DISPLAY_CLOCK,
+        0x80,
+        MULTIPLEX_RATIO,
+#if OLED_IC_COM_PINS_ARE_COLUMNS
+        OLED_DISPLAY_WIDTH - 1,
+#else
+        OLED_DISPLAY_HEIGHT - 1,
+#endif
+        DISPLAY_OFFSET,
+        0x00,
+        DISPLAY_START_LINE | 0x00,
+        CHARGE_PUMP,
+        0x14,
+#if (OLED_IC != OLED_IC_SH1106)
+        // MEMORY_MODE is unsupported on SH1106 (Page Addressing only)
+        MEMORY_MODE,
+        0x00,  // Horizontal addressing mode
+#elif OLED_IC == OLED_IC_SH1107
+        // Page addressing mode
+        SH1107_MEMORY_MODE_PAGE,
+#endif
+    };
+    if (I2C_TRANSMIT_P(display_setup1) != I2C_STATUS_SUCCESS) {
+        print("oled_init cmd set 1 failed\n");
+        return false;
+    }
+
+    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_180)) {
+        static const uint8_t PROGMEM display_normal[] = {
+            I2C_CMD, SEGMENT_REMAP_INV, COM_SCAN_DEC, DISPLAY_OFFSET, OLED_COM_PIN_OFFSET,
+        };
+        if (I2C_TRANSMIT_P(display_normal) != I2C_STATUS_SUCCESS) {
+            print("oled_init cmd normal rotation failed\n");
+            return false;
+        }
+    } else {
+        static const uint8_t PROGMEM display_flipped[] = {
+            I2C_CMD, SEGMENT_REMAP, COM_SCAN_INC, DISPLAY_OFFSET, (OLED_COM_PIN_COUNT - OLED_COM_PIN_OFFSET) % OLED_COM_PIN_COUNT,
+        };
+        if (I2C_TRANSMIT_P(display_flipped) != I2C_STATUS_SUCCESS) {
+            print("display_flipped failed\n");
+            return false;
+        }
+    }
+
+    static const uint8_t PROGMEM display_setup2[] = {I2C_CMD, COM_PINS, OLED_COM_PINS, CONTRAST, OLED_BRIGHTNESS, PRE_CHARGE_PERIOD, 0x22, VCOM_DETECT, 0x35, DISPLAY_ALL_ON_RESUME, NORMAL_DISPLAY, DEACTIVATE_SCROLL, DISPLAY_ON};    if (I2C_TRANSMIT_P(display_setup2) != I2C_STATUS_SUCCESS) {
+        print("display_setup2 failed\n");
+        return false;
+    }
+
+#if OLED_TIMEOUT > 0
+    oled_timeout = timer_read32() + OLED_TIMEOUT;
+#endif
+#if OLED_SCROLL_TIMEOUT > 0
+    oled_scroll_timeout = timer_read32() + OLED_SCROLL_TIMEOUT;
+#endif
+
+    oled_clear();
+    oled_initialized = true;
+    oled_active      = true;
+    oled_scrolling   = false;
+    return true;
+}
+
+__attribute__((weak)) oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return rotation; }
+__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { return rotation; }
+
+void oled_clear(void) {
+    memset(oled_buffer, 0, sizeof(oled_buffer));
+    oled_cursor = &oled_buffer[0];
+    oled_dirty  = OLED_ALL_BLOCKS_MASK;
+}
+
+static void calc_bounds(uint8_t update_start, uint8_t *cmd_array) {
+    // Calculate commands to set memory addressing bounds.
+    uint8_t start_page   = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_WIDTH;
+    uint8_t start_column = OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_WIDTH;
+#if !OLED_IC_HAS_HORIZONTAL_MODE
+    // Commands for Page Addressing Mode. Sets starting page and column; has no end bound.
+    // Column value must be split into high and low nybble and sent as two commands.
+    cmd_array[0] = PAM_PAGE_ADDR | start_page;
+    cmd_array[1] = PAM_SETCOLUMN_LSB | ((OLED_COLUMN_OFFSET + start_column) & 0x0f);
+    cmd_array[2] = PAM_SETCOLUMN_MSB | ((OLED_COLUMN_OFFSET + start_column) >> 4 & 0x0f);
+    cmd_array[3] = NOP;
+    cmd_array[4] = NOP;
+    cmd_array[5] = NOP;
+#else
+    // Commands for use in Horizontal Addressing mode.
+    cmd_array[1] = start_column + OLED_COLUMN_OFFSET;
+    cmd_array[4] = start_page;
+    cmd_array[2] = (OLED_BLOCK_SIZE + OLED_DISPLAY_WIDTH - 1) % OLED_DISPLAY_WIDTH + cmd_array[1];
+    cmd_array[5] = (OLED_BLOCK_SIZE + OLED_DISPLAY_WIDTH - 1) / OLED_DISPLAY_WIDTH - 1 + cmd_array[4];
+#endif
+}
+
+static void calc_bounds_90(uint8_t update_start, uint8_t *cmd_array) {
+    // Block numbering starts from the bottom left corner, going up and then to
+    // the right.  The controller needs the page and column numbers for the top
+    // left and bottom right corners of that block.
+
+    // Total number of pages across the screen height.
+    const uint8_t height_in_pages = OLED_DISPLAY_HEIGHT / 8;
+
+    // Difference of starting page numbers for adjacent blocks; may be 0 if
+    // blocks are large enough to occupy one or more whole 8px columns.
+    const uint8_t page_inc_per_block = OLED_BLOCK_SIZE % OLED_DISPLAY_HEIGHT / 8;
+
+    // Top page number for a block which is at the bottom edge of the screen.
+    const uint8_t bottom_block_top_page = (height_in_pages - page_inc_per_block) % height_in_pages;
+
+#if !OLED_IC_HAS_HORIZONTAL_MODE
+    // Only the Page Addressing Mode is supported
+    uint8_t start_page   = bottom_block_top_page - (OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_HEIGHT / 8);
+    uint8_t start_column = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_HEIGHT * 8;
+    cmd_array[0] = PAM_PAGE_ADDR | start_page;
+    cmd_array[1] = PAM_SETCOLUMN_LSB | ((OLED_COLUMN_OFFSET + start_column) & 0x0f);
+    cmd_array[2] = PAM_SETCOLUMN_MSB | ((OLED_COLUMN_OFFSET + start_column) >> 4 & 0x0f);
+#else
+    cmd_array[1] = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_HEIGHT * 8 + OLED_COLUMN_OFFSET;
+    cmd_array[4] = bottom_block_top_page - (OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_HEIGHT / 8);
+    cmd_array[2] = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) / OLED_DISPLAY_HEIGHT * 8 - 1 + cmd_array[1];
+    cmd_array[5] = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) % OLED_DISPLAY_HEIGHT / 8 + cmd_array[4];
+#endif
+}
+
+uint8_t crot(uint8_t a, int8_t n) {
+    const uint8_t mask = 0x7;
+    n &= mask;
+    return a << n | a >> (-n & mask);
+}
+
+static void rotate_90(const uint8_t *src, uint8_t *dest) {
+    for (uint8_t i = 0, shift = 7; i < 8; ++i, --shift) {
+        uint8_t selector = (1 << i);
+        for (uint8_t j = 0; j < 8; ++j) {
+            dest[i] |= crot(src[j] & selector, shift - (int8_t)j);
+        }
+    }
+}
+
+void oled_render(void) {
+    if (!oled_initialized) {
+        return;
+    }
+
+    // Do we have work to do?
+    oled_dirty &= OLED_ALL_BLOCKS_MASK;
+    if (!oled_dirty || oled_scrolling) {
+        return;
+    }
+
+    // Find first dirty block
+    uint8_t update_start = 0;
+    while (!(oled_dirty & ((OLED_BLOCK_TYPE)1 << update_start))) {
+        ++update_start;
+    }
+
+    // Set column & page position
+#if OLED_IC_HAS_HORIZONTAL_MODE
+    static uint8_t display_start[] = {I2C_CMD, COLUMN_ADDR, 0, OLED_DISPLAY_WIDTH - 1, PAGE_ADDR, 0, OLED_DISPLAY_HEIGHT / 8 - 1};
+#else
+    static uint8_t display_start[] = {I2C_CMD, PAM_PAGE_ADDR, PAM_SETCOLUMN_LSB, PAM_SETCOLUMN_MSB};
+#endif
+    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
+        calc_bounds(update_start, &display_start[1]);  // Offset from I2C_CMD byte at the start
+    } else {
+        calc_bounds_90(update_start, &display_start[1]);  // Offset from I2C_CMD byte at the start
+    }
+
+    // Send column & page position
+    if (I2C_TRANSMIT(display_start) != I2C_STATUS_SUCCESS) {
+        print("oled_render offset command failed\n");
+        return;
+    }
+
+    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
+        // Send render data chunk as is
+        if (I2C_WRITE_REG(I2C_DATA, &oled_buffer[OLED_BLOCK_SIZE * update_start], OLED_BLOCK_SIZE) != I2C_STATUS_SUCCESS) {
+            print("oled_render data failed\n");
+            return;
+        }
+    } else {
+        // Rotate the render chunks
+        const static uint8_t source_map[] = OLED_SOURCE_MAP;
+        const static uint8_t target_map[] = OLED_TARGET_MAP;
+
+        static uint8_t temp_buffer[OLED_BLOCK_SIZE];
+        memset(temp_buffer, 0, sizeof(temp_buffer));
+        for (uint8_t i = 0; i < sizeof(source_map); ++i) {
+            rotate_90(&oled_buffer[OLED_BLOCK_SIZE * update_start + source_map[i]], &temp_buffer[target_map[i]]);
+        }
+
+#if OLED_IC_HAS_HORIZONTAL_MODE
+        // Send render data chunk after rotating
+        if (I2C_WRITE_REG(I2C_DATA, &temp_buffer[0], OLED_BLOCK_SIZE) != I2C_STATUS_SUCCESS) {
+            print("oled_render90 data failed\n");
+            return;
+        }
+#else
+        // For SH1106 or SH1107 the data chunk must be split into separate pieces for each page
+        const uint8_t columns_in_block = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) / OLED_DISPLAY_HEIGHT * 8;
+        const uint8_t num_pages = OLED_BLOCK_SIZE / columns_in_block;
+        for (uint8_t i = 0; i < num_pages; ++i) {
+            // Send column & page position for all pages except the first one
+            if (i > 0) {
+                display_start[1]++;
+                if (I2C_TRANSMIT(display_start) != I2C_STATUS_SUCCESS) {
+                    print("oled_render offset command failed\n");
+                    return;
+                }
+            }
+            // Send data for the page
+            if (I2C_WRITE_REG(I2C_DATA, &temp_buffer[columns_in_block * i], columns_in_block) != I2C_STATUS_SUCCESS) {
+                print("oled_render90 data failed\n");
+                return;
+            }
+        }
+#endif
+    }
+
+    // Turn on display if it is off
+    oled_on();
+
+    // Clear dirty flag
+    oled_dirty &= ~((OLED_BLOCK_TYPE)1 << update_start);
+}
+
+void oled_set_cursor(uint8_t col, uint8_t line) {
+    uint16_t index = line * oled_rotation_width + col * OLED_FONT_WIDTH;
+
+    // Out of bounds?
+    if (index >= OLED_MATRIX_SIZE) {
+        index = 0;
+    }
+
+    oled_cursor = &oled_buffer[index];
+}
+
+void oled_advance_page(bool clearPageRemainder) {
+    uint16_t index     = oled_cursor - &oled_buffer[0];
+    uint8_t  remaining = oled_rotation_width - (index % oled_rotation_width);
+
+    if (clearPageRemainder) {
+        // Remaining Char count
+        remaining = remaining / OLED_FONT_WIDTH;
+
+        // Write empty character until next line
+        while (remaining--) oled_write_char(' ', false);
+    } else {
+        // Next page index out of bounds?
+        if (index + remaining >= OLED_MATRIX_SIZE) {
+            index     = 0;
+            remaining = 0;
+        }
+
+        oled_cursor = &oled_buffer[index + remaining];
+    }
+}
+
+void oled_advance_char(void) {
+    uint16_t nextIndex      = oled_cursor - &oled_buffer[0] + OLED_FONT_WIDTH;
+    uint8_t  remainingSpace = oled_rotation_width - (nextIndex % oled_rotation_width);
+
+    // Do we have enough space on the current line for the next character
+    if (remainingSpace < OLED_FONT_WIDTH) {
+        nextIndex += remainingSpace;
+    }
+
+    // Did we go out of bounds
+    if (nextIndex >= OLED_MATRIX_SIZE) {
+        nextIndex = 0;
+    }
+
+    // Update cursor position
+    oled_cursor = &oled_buffer[nextIndex];
+}
+
+// Main handler that writes character data to the display buffer
+void oled_write_char(const char data, bool invert) {
+    // Advance to the next line if newline
+    if (data == '\n') {
+        // Old source wrote ' ' until end of line...
+        oled_advance_page(true);
+        return;
+    }
+
+    if (data == '\r') {
+        oled_advance_page(false);
+        return;
+    }
+
+    // copy the current render buffer to check for dirty after
+    static uint8_t oled_temp_buffer[OLED_FONT_WIDTH];
+    memcpy(&oled_temp_buffer, oled_cursor, OLED_FONT_WIDTH);
+
+    _Static_assert(sizeof(font) >= ((OLED_FONT_END + 1 - OLED_FONT_START) * OLED_FONT_WIDTH), "OLED_FONT_END references outside array");
+
+    // set the reder buffer data
+    uint8_t cast_data = (uint8_t)data;  // font based on unsigned type for index
+    if (cast_data < OLED_FONT_START || cast_data > OLED_FONT_END) {
+        memset(oled_cursor, 0x00, OLED_FONT_WIDTH);
+    } else {
+        const uint8_t *glyph = &font[(cast_data - OLED_FONT_START) * OLED_FONT_WIDTH];
+        memcpy_P(oled_cursor, glyph, OLED_FONT_WIDTH);
+    }
+
+    // Invert if needed
+    if (invert) {
+        InvertCharacter(oled_cursor);
+    }
+
+    // Dirty check
+    if (memcmp(&oled_temp_buffer, oled_cursor, OLED_FONT_WIDTH)) {
+        uint16_t index = oled_cursor - &oled_buffer[0];
+        oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE));
+        // Edgecase check if the written data spans the 2 chunks
+        oled_dirty |= ((OLED_BLOCK_TYPE)1 << ((index + OLED_FONT_WIDTH - 1) / OLED_BLOCK_SIZE));
+    }
+
+    // Finally move to the next char
+    oled_advance_char();
+}
+
+void oled_write(const char *data, bool invert) {
+    const char *end = data + strlen(data);
+    while (data < end) {
+        oled_write_char(*data, invert);
+        data++;
+    }
+}
+
+void oled_write_ln(const char *data, bool invert) {
+    oled_write(data, invert);
+    oled_advance_page(true);
+}
+
+void oled_pan(bool left) {
+    uint16_t i = 0;
+    for (uint16_t y = 0; y < OLED_DISPLAY_HEIGHT / 8; y++) {
+        if (left) {
+            for (uint16_t x = 0; x < OLED_DISPLAY_WIDTH - 1; x++) {
+                i              = y * OLED_DISPLAY_WIDTH + x;
+                oled_buffer[i] = oled_buffer[i + 1];
+            }
+        } else {
+            for (uint16_t x = OLED_DISPLAY_WIDTH - 1; x > 0; x--) {
+                i              = y * OLED_DISPLAY_WIDTH + x;
+                oled_buffer[i] = oled_buffer[i - 1];
+            }
+        }
+    }
+    oled_dirty = OLED_ALL_BLOCKS_MASK;
+}
+
+oled_buffer_reader_t oled_read_raw(uint16_t start_index) {
+    if (start_index > OLED_MATRIX_SIZE) start_index = OLED_MATRIX_SIZE;
+    oled_buffer_reader_t ret_reader;
+    ret_reader.current_element         = &oled_buffer[start_index];
+    ret_reader.remaining_element_count = OLED_MATRIX_SIZE - start_index;
+    return ret_reader;
+}
+
+void oled_write_raw_byte(const char data, uint16_t index) {
+    if (index > OLED_MATRIX_SIZE) index = OLED_MATRIX_SIZE;
+    if (oled_buffer[index] == data) return;
+    oled_buffer[index] = data;
+    oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE));
+}
+
+void oled_write_raw(const char *data, uint16_t size) {
+    uint16_t cursor_start_index = oled_cursor - &oled_buffer[0];
+    if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index;
+    for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) {
+        uint8_t c = *data++;
+        if (oled_buffer[i] == c) continue;
+        oled_buffer[i] = c;
+        oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE));
+    }
+}
+
+void oled_write_pixel(uint8_t x, uint8_t y, bool on) {
+    if (x >= oled_rotation_width) {
+        return;
+    }
+    uint16_t index = x + (y / 8) * oled_rotation_width;
+    if (index >= OLED_MATRIX_SIZE) {
+        return;
+    }
+    uint8_t data = oled_buffer[index];
+    if (on) {
+        data |= (1 << (y % 8));
+    } else {
+        data &= ~(1 << (y % 8));
+    }
+    if (oled_buffer[index] != data) {
+        oled_buffer[index] = data;
+        oled_dirty |= ((OLED_BLOCK_TYPE)1 << (index / OLED_BLOCK_SIZE));
+    }
+}
+
+#if defined(__AVR__)
+void oled_write_P(const char *data, bool invert) {
+    uint8_t c = pgm_read_byte(data);
+    while (c != 0) {
+        oled_write_char(c, invert);
+        c = pgm_read_byte(++data);
+    }
+}
+
+void oled_write_ln_P(const char *data, bool invert) {
+    oled_write_P(data, invert);
+    oled_advance_page(true);
+}
+
+void oled_write_raw_P(const char *data, uint16_t size) {
+    uint16_t cursor_start_index = oled_cursor - &oled_buffer[0];
+    if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index;
+    for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) {
+        uint8_t c = pgm_read_byte(data++);
+        if (oled_buffer[i] == c) continue;
+        oled_buffer[i] = c;
+        oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE));
+    }
+}
+#endif  // defined(__AVR__)
+
+bool oled_on(void) {
+    if (!oled_initialized) {
+        return oled_active;
+    }
+
+#if OLED_TIMEOUT > 0
+    oled_timeout = timer_read32() + OLED_TIMEOUT;
+#endif
+
+    static const uint8_t PROGMEM display_on[] =
+#ifdef OLED_FADE_OUT
+        {I2C_CMD, FADE_BLINK, 0x00};
+#else
+        {I2C_CMD, DISPLAY_ON};
+#endif
+
+    if (!oled_active) {
+        if (I2C_TRANSMIT_P(display_on) != I2C_STATUS_SUCCESS) {
+            print("oled_on cmd failed\n");
+            return oled_active;
+        }
+        oled_active = true;
+    }
+    return oled_active;
+}
+
+bool oled_off(void) {
+    if (!oled_initialized) {
+        return !oled_active;
+    }
+
+    static const uint8_t PROGMEM display_off[] =
+#ifdef OLED_FADE_OUT
+        {I2C_CMD, FADE_BLINK, ENABLE_FADE | OLED_FADE_OUT_INTERVAL};
+#else
+        {I2C_CMD, DISPLAY_OFF};
+#endif
+
+    if (oled_active) {
+        if (I2C_TRANSMIT_P(display_off) != I2C_STATUS_SUCCESS) {
+            print("oled_off cmd failed\n");
+            return oled_active;
+        }
+        oled_active = false;
+    }
+    return !oled_active;
+}
+
+bool is_oled_on(void) { return oled_active; }
+
+uint8_t oled_set_brightness(uint8_t level) {
+    if (!oled_initialized) {
+        return oled_brightness;
+    }
+
+    uint8_t set_contrast[] = {I2C_CMD, CONTRAST, level};
+    if (oled_brightness != level) {
+        if (I2C_TRANSMIT(set_contrast) != I2C_STATUS_SUCCESS) {
+            print("set_brightness cmd failed\n");
+            return oled_brightness;
+        }
+        oled_brightness = level;
+    }
+    return oled_brightness;
+}
+
+uint8_t oled_get_brightness(void) { return oled_brightness; }
+
+// Set the specific 8 lines rows of the screen to scroll.
+// 0 is the default for start, and 7 for end, which is the entire
+// height of the screen.  For 128x32 screens, rows 4-7 are not used.
+void oled_scroll_set_area(uint8_t start_line, uint8_t end_line) {
+    oled_scroll_start = start_line;
+    oled_scroll_end   = end_line;
+}
+
+void oled_scroll_set_speed(uint8_t speed) {
+    // Sets the speed for scrolling... does not take effect
+    // until scrolling is either started or restarted
+    // the ssd1306 supports 8 speeds
+    // FrameRate2   speed = 7
+    // FrameRate3   speed = 4
+    // FrameRate4   speed = 5
+    // FrameRate5   speed = 0
+    // FrameRate25  speed = 6
+    // FrameRate64  speed = 1
+    // FrameRate128 speed = 2
+    // FrameRate256 speed = 3
+    // for ease of use these are remaped here to be in order
+    static const uint8_t scroll_remap[8] = {7, 4, 5, 0, 6, 1, 2, 3};
+    oled_scroll_speed                    = scroll_remap[speed];
+}
+
+bool oled_scroll_right(void) {
+    if (!oled_initialized) {
+        return oled_scrolling;
+    }
+
+    // Dont enable scrolling if we need to update the display
+    // This prevents scrolling of bad data from starting the scroll too early after init
+    if (!oled_dirty && !oled_scrolling) {
+        uint8_t display_scroll_right[] = {I2C_CMD, SCROLL_RIGHT, 0x00, oled_scroll_start, oled_scroll_speed, oled_scroll_end, 0x00, 0xFF, ACTIVATE_SCROLL};
+        if (I2C_TRANSMIT(display_scroll_right) != I2C_STATUS_SUCCESS) {
+            print("oled_scroll_right cmd failed\n");
+            return oled_scrolling;
+        }
+        oled_scrolling = true;
+    }
+    return oled_scrolling;
+}
+
+bool oled_scroll_left(void) {
+    if (!oled_initialized) {
+        return oled_scrolling;
+    }
+
+    // Dont enable scrolling if we need to update the display
+    // This prevents scrolling of bad data from starting the scroll too early after init
+    if (!oled_dirty && !oled_scrolling) {
+        uint8_t display_scroll_left[] = {I2C_CMD, SCROLL_LEFT, 0x00, oled_scroll_start, oled_scroll_speed, oled_scroll_end, 0x00, 0xFF, ACTIVATE_SCROLL};
+        if (I2C_TRANSMIT(display_scroll_left) != I2C_STATUS_SUCCESS) {
+            print("oled_scroll_left cmd failed\n");
+            return oled_scrolling;
+        }
+        oled_scrolling = true;
+    }
+    return oled_scrolling;
+}
+
+bool oled_scroll_off(void) {
+    if (!oled_initialized) {
+        return !oled_scrolling;
+    }
+
+    if (oled_scrolling) {
+        static const uint8_t PROGMEM display_scroll_off[] = {I2C_CMD, DEACTIVATE_SCROLL};
+        if (I2C_TRANSMIT_P(display_scroll_off) != I2C_STATUS_SUCCESS) {
+            print("oled_scroll_off cmd failed\n");
+            return oled_scrolling;
+        }
+        oled_scrolling = false;
+        oled_dirty     = OLED_ALL_BLOCKS_MASK;
+    }
+    return !oled_scrolling;
+}
+
+bool is_oled_scrolling(void) { return oled_scrolling; }
+
+bool oled_invert(bool invert) {
+    if (!oled_initialized) {
+        return oled_inverted;
+    }
+
+    if (invert && !oled_inverted) {
+        static const uint8_t PROGMEM display_inverted[] = {I2C_CMD, INVERT_DISPLAY};
+        if (I2C_TRANSMIT_P(display_inverted) != I2C_STATUS_SUCCESS) {
+            print("oled_invert cmd failed\n");
+            return oled_inverted;
+        }
+        oled_inverted = true;
+    } else if (!invert && oled_inverted) {
+        static const uint8_t PROGMEM display_normal[] = {I2C_CMD, NORMAL_DISPLAY};
+        if (I2C_TRANSMIT_P(display_normal) != I2C_STATUS_SUCCESS) {
+            print("oled_invert cmd failed\n");
+            return oled_inverted;
+        }
+        oled_inverted = false;
+    }
+
+    return oled_inverted;
+}
+
+uint8_t oled_max_chars(void) {
+    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
+        return OLED_DISPLAY_WIDTH / OLED_FONT_WIDTH;
+    }
+    return OLED_DISPLAY_HEIGHT / OLED_FONT_WIDTH;
+}
+
+uint8_t oled_max_lines(void) {
+    if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
+        return OLED_DISPLAY_HEIGHT / OLED_FONT_HEIGHT;
+    }
+    return OLED_DISPLAY_WIDTH / OLED_FONT_HEIGHT;
+}
+
+void oled_task(void) {
+    if (!oled_initialized) {
+        return;
+    }
+
+#if OLED_UPDATE_INTERVAL > 0
+    if (timer_elapsed(oled_update_timeout) >= OLED_UPDATE_INTERVAL) {
+        oled_update_timeout = timer_read();
+        oled_set_cursor(0, 0);
+        oled_task_kb();
+    }
+#else
+    oled_set_cursor(0, 0);
+    oled_task_kb();
+#endif
+
+#if OLED_SCROLL_TIMEOUT > 0
+    if (oled_dirty && oled_scrolling) {
+        oled_scroll_timeout = timer_read32() + OLED_SCROLL_TIMEOUT;
+        oled_scroll_off();
+    }
+#endif
+
+    // Smart render system, no need to check for dirty
+    oled_render();
+
+    // Display timeout check
+#if OLED_TIMEOUT > 0
+    if (oled_active && timer_expired32(timer_read32(), oled_timeout)) {
+        oled_off();
+    }
+#endif
+
+#if OLED_SCROLL_TIMEOUT > 0
+    if (!oled_scrolling && timer_expired32(timer_read32(), oled_scroll_timeout)) {
+#    ifdef OLED_SCROLL_TIMEOUT_RIGHT
+        oled_scroll_right();
+#    else
+        oled_scroll_left();
+#    endif
+    }
+#endif
+}
+
+__attribute__((weak)) bool oled_task_kb(void) { return oled_task_user(); }
+__attribute__((weak)) bool oled_task_user(void) { return true; }
diff --git a/users/drashna/pointing/pointing.c b/users/drashna/pointing/pointing.c
index 0bd14e4775..0116ce0900 100644
--- a/users/drashna/pointing/pointing.c
+++ b/users/drashna/pointing/pointing.c
@@ -105,7 +105,7 @@ bool process_record_pointing(uint16_t keycode, keyrecord_t* record) {
                 mouse_timer = timer_read();
                 break;
             }
-            if (layer_state_is(_MOUSE) && !mouse_keycode_tracker) {
+            if (layer_state_is(_MOUSE) && !mouse_keycode_tracker && !tap_toggling) {
                 layer_off(_MOUSE);
             }
             mouse_keycode_tracker = 0;
diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk
index 445d1cf5ac..553cc2cbc7 100644
--- a/users/drashna/rules.mk
+++ b/users/drashna/rules.mk
@@ -78,10 +78,20 @@ endif
 
 CUSTOM_OLED_DRIVER ?= yes
 ifeq ($(strip $(OLED_ENABLE)), yes)
-    ifeq ($(strip $(CUSTOM_OLED_DRIVER)), yes)
-        SRC += $(USER_PATH)/oled/oled_stuff.c
-        OPT_DEFS += -DCUSTOM_OLED_DRIVER_CODE
+    ifeq ($(strip $(OLED_DRIVER)), custom)
+        OPT_DEFS += -DOLED_ENABLE \
+            -DOLED_DRIVER_SH1107
+        SRC += $(USER_PATH)/oled/sh110x.c
+        QUANTUM_LIB_SRC += i2c_master.c
     endif
+    ifeq ($(strip $(CUSTOM_OLED_DRIVER)), yes)
+        OPT_DEFS += -DCUSTOM_OLED_DRIVER_CODE
+        SRC += $(USER_PATH)/oled/oled_stuff.c
+    endif
+    ifeq ($(strip $(OLED_DISPLAY_TEST)), yes)
+        OPT_DEFS += -DOLED_DISPLAY_TEST
+    endif
+    DEFERRED_EXEC_ENABLE = yes
 endif
 
 CUSTOM_POINTING_DEVICE ?= yes
@@ -97,6 +107,7 @@ ifeq ($(strip $(CUSTOM_SPLIT_TRANSPORT_SYNC)), yes)
         QUANTUM_LIB_SRC += $(USER_PATH)/split/transport_sync.c
         OPT_DEFS += -DCUSTOM_SPLIT_TRANSPORT_SYNC
     endif
+
 endif
 
 AUTOCORRECTION_ENABLE ?= no
diff --git a/users/drashna/split/transport_sync.c b/users/drashna/split/transport_sync.c
index 794664293c..2509e448cb 100644
--- a/users/drashna/split/transport_sync.c
+++ b/users/drashna/split/transport_sync.c
@@ -9,7 +9,7 @@
 #endif
 
 #ifdef CUSTOM_UNICODE_ENABLE
-#include "process_unicode_common.h"
+#    include "process_unicode_common.h"
 extern unicode_config_t unicode_config;
 #endif
 #ifdef AUDIO_ENABLE
@@ -24,8 +24,10 @@ extern bool tap_toggling;
 extern bool swap_hands;
 #endif
 
-static bool watchdog_ping_done = false;
-static uint32_t watchdog_timer = 0;
+#if defined(SPLIT_WATCHDOG_TIMEOUT)
+static bool     watchdog_ping_done = false;
+static uint32_t watchdog_timer     = 0;
+#endif
 
 extern userspace_config_t userspace_config;
 extern bool               host_driver_disabled;
@@ -51,20 +53,35 @@ void user_config_sync(uint8_t initiator2target_buffer_size, const void* initiato
     }
 }
 
+#if defined(SPLIT_WATCHDOG_TIMEOUT)
 void watchdog_handler(uint8_t in_buflen, const void* in_data, uint8_t out_buflen, void* out_data) { watchdog_ping_done = true; }
+#endif
 
+#ifdef OLED_ENABLE
+#include "oled/oled_stuff.h"
+void keylogger_string_sync(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
+    if (initiator2target_buffer_size == OLED_KEYLOGGER_LENGTH) {
+        memcpy(&keylog_str, initiator2target_buffer, initiator2target_buffer_size);
+    }
+}
+#endif
 
 void keyboard_post_init_transport_sync(void) {
     // Register keyboard state sync split transaction
     transaction_register_rpc(RPC_ID_USER_STATE_SYNC, user_state_sync);
     transaction_register_rpc(RPC_ID_USER_KEYMAP_SYNC, user_keymap_sync);
     transaction_register_rpc(RPC_ID_USER_CONFIG_SYNC, user_config_sync);
-
-#ifdef __AVR__
-    wdt_disable();
+#ifdef OLED_ENABLE
+    transaction_register_rpc(RPC_ID_USER_KEYLOG_STR, keylogger_string_sync);
 #endif
+
+#if defined(SPLIT_WATCHDOG_TIMEOUT)
+#    if defined(PROTOCOL_LUFA)
+    wdt_disable();
+#    endif
     transaction_register_rpc(RPC_ID_USER_WATCHDOG_SYNC, watchdog_handler);
     watchdog_timer = timer_read32();
+#endif
 }
 
 void user_transport_update(void) {
@@ -107,9 +124,12 @@ void user_transport_update(void) {
 void user_transport_sync(void) {
     if (is_keyboard_master()) {
         // Keep track of the last state, so that we can tell if we need to propagate to slave
-        static uint16_t              last_keymap = 0;
-        static uint32_t              last_config = 0, last_sync[3], last_user_state = 0;
-        bool                         needs_sync = false;
+        static uint16_t last_keymap = 0;
+        static uint32_t last_config = 0, last_sync[4], last_user_state = 0;
+        bool            needs_sync = false;
+#ifdef OLED_ENABLE
+        static char     keylog_temp[OLED_KEYLOGGER_LENGTH] = { 0 };
+#endif
 
         // Check if the state values are different
         if (memcmp(&transport_user_state, &last_user_state, sizeof(transport_user_state))) {
@@ -164,9 +184,30 @@ void user_transport_sync(void) {
             if (transaction_rpc_send(RPC_ID_USER_CONFIG_SYNC, sizeof(transport_userspace_config), &transport_userspace_config)) {
                 last_sync[2] = timer_read32();
             }
+            needs_sync = false;
         }
+
+#ifdef OLED_ENABLE
+        // Check if the state values are different
+        if (memcmp(&keylog_str, &keylog_temp, OLED_KEYLOGGER_LENGTH)) {
+            needs_sync = true;
+            memcpy(&keylog_temp, &keylog_str, OLED_KEYLOGGER_LENGTH);
+        }
+        if (timer_elapsed32(last_sync[3]) > 250) {
+            needs_sync = true;
+        }
+
+        // Perform the sync if requested
+        if (needs_sync) {
+            if (transaction_rpc_send(RPC_ID_USER_KEYLOG_STR, OLED_KEYLOGGER_LENGTH, &keylog_str)) {
+                last_sync[3] = timer_read32();
+            }
+            needs_sync = false;
+        }
+#endif
     }
 
+#if defined(SPLIT_WATCHDOG_TIMEOUT)
     if (!watchdog_ping_done) {
         if (is_keyboard_master()) {
             if (timer_elapsed32(watchdog_timer) > 100) {
@@ -180,16 +221,14 @@ void user_transport_sync(void) {
             }
         } else {
             if (timer_elapsed32(watchdog_timer) > 3500) {
-#ifdef __AVR__
-                wdt_enable(WDTO_250MS);
-#else
-                NVIC_SystemReset();
-#endif
+                software_reset();
                 while (1) {
                 }
             }
         }
     }
+#endif
+
 }
 
 void housekeeping_task_user(void) {
diff --git a/users/drashna/split/transport_sync.h b/users/drashna/split/transport_sync.h
index 6b6f0c388b..884586dfdd 100644
--- a/users/drashna/split/transport_sync.h
+++ b/users/drashna/split/transport_sync.h
@@ -4,6 +4,10 @@
 #pragma once
 
 #include "drashna.h"
+#ifdef OLED_ENABLE
+#    include "oled/oled_stuff.h"
+extern char keylog_str[OLED_KEYLOGGER_LENGTH];
+#endif
 
 typedef union {
     uint32_t raw;

From ad702096a97677eab5c1931d6f0d4a51e1a564a5 Mon Sep 17 00:00:00 2001
From: XScorpion2 <rcalt2vt@gmail.com>
Date: Fri, 21 Jan 2022 21:51:12 -0600
Subject: [PATCH 342/867] [Keyboard] Sol 3 Keyboard from RGBKB (#15687)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Franklyn Tackitt <franklyn@tackitt.net>
---
 keyboards/rgbkb/common/touch_encoder.c        |   6 +-
 keyboards/rgbkb/common/touch_encoder.h        |   4 +-
 keyboards/rgbkb/mun/config.h                  |   6 +-
 keyboards/rgbkb/mun/keymaps/default/keymap.c  |   4 +-
 keyboards/rgbkb/mun/keymaps/via/keymap.c      |   4 +-
 keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c  |   4 +-
 keyboards/rgbkb/sol3/.noci                    |   0
 keyboards/rgbkb/sol3/config.h                 | 182 +++++++++++
 keyboards/rgbkb/sol3/halconf.h                |  22 ++
 keyboards/rgbkb/sol3/keymaps/default/config.h |  24 ++
 keyboards/rgbkb/sol3/keymaps/default/keymap.c | 173 +++++++++++
 .../rgbkb/sol3/keymaps/kageurufu/config.h     |  32 ++
 .../rgbkb/sol3/keymaps/kageurufu/keymap.c     |  61 ++++
 .../rgbkb/sol3/keymaps/kageurufu/rules.mk     |   1 +
 keyboards/rgbkb/sol3/keymaps/via/config.h     |  32 ++
 keyboards/rgbkb/sol3/keymaps/via/keymap.c     | 218 +++++++++++++
 keyboards/rgbkb/sol3/keymaps/via/rules.mk     |   1 +
 keyboards/rgbkb/sol3/mcuconf.h                |  30 ++
 keyboards/rgbkb/sol3/rev1/config.h            |  12 +
 keyboards/rgbkb/sol3/rev1/rev1.c              | 287 ++++++++++++++++++
 keyboards/rgbkb/sol3/rev1/rev1.h              |  74 +++++
 keyboards/rgbkb/sol3/rev1/rules.mk            |   0
 keyboards/rgbkb/sol3/rules.mk                 |  49 +++
 keyboards/rgbkb/sol3/sol3.c                   |  38 +++
 keyboards/rgbkb/sol3/sol3.h                   |  18 ++
 25 files changed, 1268 insertions(+), 14 deletions(-)
 create mode 100644 keyboards/rgbkb/sol3/.noci
 create mode 100644 keyboards/rgbkb/sol3/config.h
 create mode 100644 keyboards/rgbkb/sol3/halconf.h
 create mode 100644 keyboards/rgbkb/sol3/keymaps/default/config.h
 create mode 100644 keyboards/rgbkb/sol3/keymaps/default/keymap.c
 create mode 100644 keyboards/rgbkb/sol3/keymaps/kageurufu/config.h
 create mode 100644 keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c
 create mode 100644 keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk
 create mode 100644 keyboards/rgbkb/sol3/keymaps/via/config.h
 create mode 100644 keyboards/rgbkb/sol3/keymaps/via/keymap.c
 create mode 100644 keyboards/rgbkb/sol3/keymaps/via/rules.mk
 create mode 100644 keyboards/rgbkb/sol3/mcuconf.h
 create mode 100644 keyboards/rgbkb/sol3/rev1/config.h
 create mode 100644 keyboards/rgbkb/sol3/rev1/rev1.c
 create mode 100644 keyboards/rgbkb/sol3/rev1/rev1.h
 create mode 100644 keyboards/rgbkb/sol3/rev1/rules.mk
 create mode 100644 keyboards/rgbkb/sol3/rules.mk
 create mode 100644 keyboards/rgbkb/sol3/sol3.c
 create mode 100644 keyboards/rgbkb/sol3/sol3.h

diff --git a/keyboards/rgbkb/common/touch_encoder.c b/keyboards/rgbkb/common/touch_encoder.c
index 6293739ec9..1e6c54e8eb 100644
--- a/keyboards/rgbkb/common/touch_encoder.c
+++ b/keyboards/rgbkb/common/touch_encoder.c
@@ -292,7 +292,7 @@ void touch_encoder_calibrate(void) {
     write_register8(QT_CALIBRATE, 0x01);
 }
 
-bool touch_encoder_calibrating(void) {
+bool touch_encoder_is_calibrating(void) {
     return touch_raw[0] & CALIBRATION_BIT;
 }
 
@@ -300,8 +300,8 @@ void touch_encoder_toggle(void) {
     touch_disabled = !touch_disabled;
 }
 
-bool touch_encoder_toggled(void) {
-    return touch_disabled;
+bool touch_encoder_is_on(void) {
+    return !touch_disabled;
 }
 
 void touch_encoder_slave_sync(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
diff --git a/keyboards/rgbkb/common/touch_encoder.h b/keyboards/rgbkb/common/touch_encoder.h
index 022f619063..bc9a9ccb7f 100644
--- a/keyboards/rgbkb/common/touch_encoder.h
+++ b/keyboards/rgbkb/common/touch_encoder.h
@@ -34,10 +34,10 @@ void touch_encoder_init(void);
 void touch_encoder_update(int8_t transaction_id);
 
 void touch_encoder_calibrate(void);
-bool touch_encoder_calibrating(void);
+bool touch_encoder_is_calibrating(void);
 
 void touch_encoder_toggle(void);
-bool touch_encoder_toggled(void);
+bool touch_encoder_is_on(void);
 
 // Called when touch encoder is tapped, weak function overridable by the kb
 bool touch_encoder_tapped_kb(uint8_t index, uint8_t section);
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index af0876861e..eec3009d8c 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -21,8 +21,8 @@
 
 /* Matrix Configuration - Rows are doubled up */
 #define MATRIX_ROWS 14
-// B1, A2 reserved for encoder / touch encoder support
-#define MATRIX_ROW_PINS { A1, A3, B3, A13, B15, B1, A2 }
+// Last pins reserved for encoder / touch encoder support
+#define MATRIX_ROW_PINS { A1, A3, B3, A13, B15, NO_PIN, NO_PIN }
 #define MATRIX_COLS 7
 #define MATRIX_COL_PINS { A0, B11, B0, B10, B12, B2, A8 }
 #define MATRIX_IO_DELAY 5
@@ -35,11 +35,11 @@
 #define TOUCH_DEADZONE 50 // width of a "button", wider inputs will be interpreted as a swipe
 #define TOUCH_TERM 350 // time of a "button" touch, longer inputs will be a swipe
 #define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster
+#define TOUCH_SEGMENTS 3
 
 /* Encoder Configuration */
 #define ENCODERS_PAD_A { B8, B9 }
 #define ENCODERS_PAD_B { A14, A15 }
-#define TOUCH_SEGMENTS 3
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/rgbkb/mun/keymaps/default/keymap.c b/keyboards/rgbkb/mun/keymaps/default/keymap.c
index 866b8a0d15..bdc2ea9811 100644
--- a/keyboards/rgbkb/mun/keymaps/default/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/default/keymap.c
@@ -226,8 +226,8 @@ static void render_leds(void)
 static void render_touch(void)
 {
     // Host Touch LED Status
-    oled_write_P(!touch_encoder_toggled() ? PSTR("TOUCH")  : PSTR("     "), false);
-    oled_write_P(touch_encoder_calibrating() ? PSTR("CLBRT")  : PSTR("     "), false);
+    oled_write_P(touch_encoder_is_on() ? PSTR("TOUCH")  : PSTR("     "), false);
+    oled_write_P(touch_encoder_is_calibrating() ? PSTR("CLBRT")  : PSTR("     "), false);
 }
 
 bool oled_task_user(void) {
diff --git a/keyboards/rgbkb/mun/keymaps/via/keymap.c b/keyboards/rgbkb/mun/keymaps/via/keymap.c
index 866b8a0d15..bdc2ea9811 100644
--- a/keyboards/rgbkb/mun/keymaps/via/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/via/keymap.c
@@ -226,8 +226,8 @@ static void render_leds(void)
 static void render_touch(void)
 {
     // Host Touch LED Status
-    oled_write_P(!touch_encoder_toggled() ? PSTR("TOUCH")  : PSTR("     "), false);
-    oled_write_P(touch_encoder_calibrating() ? PSTR("CLBRT")  : PSTR("     "), false);
+    oled_write_P(touch_encoder_is_on() ? PSTR("TOUCH")  : PSTR("     "), false);
+    oled_write_P(touch_encoder_is_calibrating() ? PSTR("CLBRT")  : PSTR("     "), false);
 }
 
 bool oled_task_user(void) {
diff --git a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
index ae5c0c9b19..0b01d43eb2 100644
--- a/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
+++ b/keyboards/rgbkb/mun/keymaps/xulkal2/keymap.c
@@ -189,8 +189,8 @@ static void render_leds(void)
 static void render_touch(void)
 {
     // Host Touch LED Status
-    oled_write_P(!touch_encoder_toggled() ? PSTR("TOUCH")  : PSTR("     "), false);
-    oled_write_P(touch_encoder_calibrating() ? PSTR("CLBRT")  : PSTR("     "), false);
+    oled_write_P(touch_encoder_is_on() ? PSTR("TOUCH")  : PSTR("     "), false);
+    oled_write_P(touch_encoder_is_calibrating() ? PSTR("CLBRT")  : PSTR("     "), false);
 }
 #else
 static uint32_t scan_counter = 0;
diff --git a/keyboards/rgbkb/sol3/.noci b/keyboards/rgbkb/sol3/.noci
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
new file mode 100644
index 0000000000..a333ef788a
--- /dev/null
+++ b/keyboards/rgbkb/sol3/config.h
@@ -0,0 +1,182 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x3535
+#define PRODUCT_ID      0x3510
+#define MANUFACTURER    RGBKB
+#define PRODUCT         Sol 3
+
+#define USB_POLLING_INTERVAL_MS 1
+
+/* Matrix Configuration - Rows are doubled up */
+#define MATRIX_ROWS 12
+// Last pins reserved for encoder / touch encoder support
+#define MATRIX_ROW_PINS       { B15,  A8, A15, B12, A3, NO_PIN }
+#define MATRIX_ROW_PINS_RIGHT { B15, B14,  A8, A13, A7, NO_PIN }
+#define MATRIX_COLS 8
+// Empty matrix entries used for encoder / touch encoder support
+#define MATRIX_COL_PINS       { A6, A7, B0, B2, B1,  B9,  B3,  B4 }
+#define MATRIX_COL_PINS_RIGHT { B9, B8, B4, A6, A3, B10, B12, B11 }
+#define MATRIX_IO_DELAY 5
+
+#define BUSY_WAIT
+#define BUSY_WAIT_INSTRUCTIONS 35 // Increase if two rows are pressed at the same time.
+#define GPIO_INPUT_PIN_DELAY 10
+
+/* Touchbar adjustments */
+#define TOUCH_DEADZONE 50 // width of a "button", wider inputs will be interpreted as a swipe
+#define TOUCH_TERM 350 // time of a "button" touch, longer inputs will be a swipe
+#define TOUCH_RESOLUTION 25 // sensitivity of swipes, lower=faster
+#define TOUCH_SEGMENTS 3
+
+/* Encoder Configuration */
+//      Matrix Entries  k36/k35(E1SW>B13), k33/k32, k7/k28
+#define ENCODERS_PAD_A { A1, B10, A13 }
+#define ENCODERS_PAD_B { A2, B11, B14 }
+//      Matrix Entries  k72/k71(E5SW>B0), k69/k68, k43/k64
+#define ENCODERS_PAD_A_RIGHT { A1, C15,  B3 }
+#define ENCODERS_PAD_B_RIGHT { A2, C14, B13 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* CRC Configuration */
+#define CRC8_OPTIMIZE_SPEED
+#define CRC8_USE_TABLE
+
+/* Split Keyboard Configuration */
+#define SPLIT_HAND_PIN C13
+#define SPLIT_USB_DETECT
+// also handles the SERIAL_USART_TX_PIN define
+#define SOFT_SERIAL_PIN A9
+#define SERIAL_USART_TX_PAL_MODE 7
+#define SERIAL_USART_TIMEOUT 5
+#define SERIAL_USART_DRIVER SD1
+//#define SERIAL_USART_FULL_DUPLEX - Waiting on reunification pr
+#if SERIAL_USART_FULL_DUPLEX
+    #define SERIAL_USART_RX_PIN A10
+    #define SERIAL_USART_RX_PAL_MODE 7
+    // Mun connects TX to TX and RX to RX as we were planning on i2c split, so we need pin swap for full duplex
+    #define SERIAL_USART_PIN_SWAP
+    #define SERIAL_USART_SPEED (2 * 1024 * 1024)
+#else
+    #define SERIAL_USART_SPEED (1 * 1024 * 1024)
+#endif
+
+/* Split Transport Features */
+#define SPLIT_TRANSPORT_MIRROR
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
+#define SPLIT_TRANSACTION_IDS_KB TOUCH_ENCODER_SYNC, RGB_MENU_SYNC
+
+/* LED Turbo DIP Switch */
+#define DIP_SWITCH_PINS { A14, B13 }
+#define DIP_SWITCH_PINS_RIGHT { A14, B0 }
+
+/* RGB LED Configuration */
+#define RGB_DI_PIN B5
+#define RGBLED_NUM 156
+#define RGBLED_SPLIT { 78, 78 }
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
+#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#define RGB_MATRIX_CENTER { 81, 28 }
+#define RGB_MATRIX_LED_FLUSH_LIMIT 33
+#define RGB_MATRIX_LED_PROCESS_LIMIT 10
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#if RGB_UNLIMITED_POWER
+  #define RGBLIGHT_LIMIT_VAL 255
+#else
+  #define RGBLIGHT_LIMIT_VAL 127
+#endif
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
+
+#define WS2812_PWM_DRIVER PWMD3
+#define WS2812_PWM_CHANNEL 2
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_DMA_CHANNEL 3
+
+#define TOUCH_UPDATE_INTERVAL 33
+#define OLED_UPDATE_INTERVAL 33
+#define TAP_CODE_DELAY 5
+
+/* Audio Configuration */
+#define AUDIO_PIN A4
+#define AUDIO_PIN_ALT A5
+#define AUDIO_PIN_ALT_AS_NEGATIVE
+#define AUDIO_CLICKY
+#define AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE
+#define AUDIO_DAC_OFF_VALUE 0
diff --git a/keyboards/rgbkb/sol3/halconf.h b/keyboards/rgbkb/sol3/halconf.h
new file mode 100644
index 0000000000..f882cef085
--- /dev/null
+++ b/keyboards/rgbkb/sol3/halconf.h
@@ -0,0 +1,22 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+#define HAL_USE_DAC TRUE
+
+#define HAL_USE_GPT TRUE
+
+#define HAL_USE_I2C TRUE
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SERIAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/rgbkb/sol3/keymaps/default/config.h b/keyboards/rgbkb/sol3/keymaps/default/config.h
new file mode 100644
index 0000000000..b239f5bb80
--- /dev/null
+++ b/keyboards/rgbkb/sol3/keymaps/default/config.h
@@ -0,0 +1,24 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+// No need for the single versions when multi performance isn't a problem =D
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#undef ENABLE_RGB_MATRIX_SPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+
+// 20m timeout (20m * 60s * 1000mil)
+// #define RGB_DISABLE_TIMEOUT 1200000
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+#define STM32_ONBOARD_EEPROM_SIZE 2048
+
diff --git a/keyboards/rgbkb/sol3/keymaps/default/keymap.c b/keyboards/rgbkb/sol3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c1d1a04d79
--- /dev/null
+++ b/keyboards/rgbkb/sol3/keymaps/default/keymap.c
@@ -0,0 +1,173 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#include QMK_KEYBOARD_H
+
+/* Qwerty
+ * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐
+ * │ GESC │   1  │   2  │   3  │   4  │   5  │   -  │  │   =  │   6  │   7  │   8  │   9  │   0  │ BkSp │
+ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+ * │ Tab  │   Q  │   W  │   E  │   R  │   T  │   [  │  │   ]  │   Y  │   U  │   I  │   O  │   P  │   \  │
+ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+ * │FNCAPS│   A  │   S  │   D  │   F  │   G  │   (  │  │   )  │   H  │   J  │   K  │   L  │   ;  │   '  │
+ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+ * │Shift │   Z  │   X  │   C  │   V  │   B  │   {  │  │   }  │   N  │   M  │   ,  │   .  │   /  │Enter │
+ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+ * │ Ctrl │  Win │  Alt │  RGB │ ADJ  │      │ DEL  │  │ Enter│      │  FN  │ Left │ Down │ Up   │Right │
+ * └──────┴──────┴──────┴──────┴──────┤ Space├──────┤  ├──────┤ Space├──────┴──────┴──────┴──────┴──────┘
+ *                                    │      │ DEL  │  │ Enter│      │
+ *                                    └──────┴──────┘  └──────┴──────┘
+ * ┌──────┬──────┬──────┬──────┬──────┬──────┐                ┌──────┬──────┬──────┬──────┬──────┬──────┐
+ * │Vol Dn│Vol Up│Vol Dn│Vol Up│Vol Dn│Vol Up│                │Vol Dn│Vol Up│Vol Dn│Vol Up│Vol Dn│Vol Up│
+ * └──────┴──────┴──────┴──────┴──────┴──────┘                └──────┴──────┴──────┴──────┴──────┴──────┘
+ * ┌──────┬──────┬──────┬──────┬──────┐                              ┌──────┬──────┬──────┬──────┬──────┐
+ * │Vol Dn│Vol Up│ Prev │ Play │ Next │                              │Vol Dn│Vol Up│ Prev │ Play │ Next │
+ * └──────┴──────┴──────┴──────┴──────┘                              └──────┴──────┴──────┴──────┴──────┘
+ */
+
+enum sol_layers {
+    _QWERTY,
+    _COLEMAK,
+    _GAME,
+    _FN,
+    _ADJUST
+};
+
+enum sol_keycodes {
+    // Disables touch processing
+    TCH_TOG = SAFE_RANGE,
+    MENU_BTN,
+    MENU_UP,
+    MENU_DN,
+    RGB_RST
+};
+
+#define FN       MO(_FN)
+#define ADJUST   MO(_ADJUST)
+#define COLEMAK  DF(_COLEMAK)
+#define GAME     DF(_GAME)
+#define QWERTY   DF(_QWERTY)
+#define FN_CAPS  LT(_FN, KC_CAPS)
+//#define RGB_ADJ  LT(_ADJUST, RGB_TOG)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_QWERTY] = LAYOUT(
+        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                  KC_EQL,  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_LBRC,                  KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        FN_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,                  KC_RPRN, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,                  KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
+        KC_LCTL,  KC_LGUI, KC_LALT, RGB_TOG, ADJUST,  KC_SPC,  KC_PGDN, KC_DEL, KC_ENT,  KC_PGUP, KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_RCTL,
+
+        KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU,                                     KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU,
+        KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV,                                                       KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV
+    ),
+
+    [_COLEMAK] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    _______,                   _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, _______,
+        _______, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______,                   _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    _______,
+        _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______,                   _______, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
+    ),
+
+    [_GAME] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, KC_F1,                     KC_F5,   _______, _______, _______, _______, _______, _______,
+        _______, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_F2,                     KC_F6,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    _______,
+        _______, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_F3,                     KC_F7,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, _______,
+        _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_F4,                     KC_F8,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
+        _______, KC_NO,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
+    ),
+
+    [_FN] = LAYOUT(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                    KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+        _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______,                   _______, _______, KC_HOME, KC_UP,   KC_END,  KC_PSCR, KC_PGUP,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,                   _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_PGDN,
+        _______,  AU_TOG,  MU_TOG,  MU_MOD, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, CK_TOGG,   CK_UP, CK_DOWN, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
+
+        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
+    ),
+
+    [_ADJUST] = LAYOUT(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                    KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+        _______, RGB_SAD, RGB_VAI, RGB_SAI, RESET,   _______, _______,                   _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
+        _______, RGB_HUD, RGB_VAD, RGB_HUI, RGB_RST, _______, DM_REC1,                   _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,
+        _______, RGB_SPD, _______, RGB_SPI, _______, _______, DM_RSTP,                   _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, GAME,
+        _______, RGB_RMOD,RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NLCK, QWERTY,  COLEMAK,
+
+        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
+    ),
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode)
+    {
+        case MENU_BTN:
+            if (record->event.pressed) {
+                rgb_menu_selection();
+            }
+            return false;
+        case MENU_UP:
+            if (record->event.pressed) {
+                rgb_menu_action(true);
+            }
+            return false;
+        case MENU_DN:
+            if (record->event.pressed) {
+                rgb_menu_action(false);
+            }
+            return false;
+        case RGB_RST:
+            if (record->event.pressed) {
+                eeconfig_update_rgb_matrix_default();
+            }
+            return false;
+        case TCH_TOG:
+            if (record->event.pressed) {
+                touch_encoder_toggle();
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;
+    }
+}
+
+void render_layer_status(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer"), false);
+    switch (get_highest_layer(layer_state)) {
+        case _QWERTY:
+            oled_write_ln_P(PSTR("QWRTY"), false);
+            break;
+        case _COLEMAK:
+            oled_write_ln_P(PSTR("Colemk"), false);
+            break;
+        case _GAME:
+            oled_write_ln_P(PSTR("Game  "), false);
+            break;
+        case _FN:
+            oled_write_ln_P(PSTR("FN   "), false);
+            break;
+        case _ADJUST:
+            oled_write_ln_P(PSTR("Adjst"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Undef"), false);
+    }
+}
diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h b/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h
new file mode 100644
index 0000000000..400848aa35
--- /dev/null
+++ b/keyboards/rgbkb/sol3/keymaps/kageurufu/config.h
@@ -0,0 +1,32 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/kageurufu> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. Frank Tackitt
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+// No need for the single versions when multi performance isn't a problem =D
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define DISABLE_RGB_MATRIX_SPLASH
+#define DISABLE_RGB_MATRIX_SOLID_SPLASH
+
+// 20m timeout (20m * 60s * 1000mil)
+// #define RGB_DISABLE_TIMEOUT 1200000
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
+// 224B per layer right now
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
+
+#define VIA_QMK_RGBLIGHT_ENABLE
+
+#define STM32_ONBOARD_EEPROM_SIZE 2048
+
diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c
new file mode 100644
index 0000000000..90773203b5
--- /dev/null
+++ b/keyboards/rgbkb/sol3/keymaps/kageurufu/keymap.c
@@ -0,0 +1,61 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/kageurufu> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. Frank Tackitt
+ * ----------------------------------------------------------------------------
+ */
+
+#include QMK_KEYBOARD_H
+#include "kageurufu.h"
+
+extern keymap_config_t keymap_config;
+
+/* Base Layout
+  * ,------------------------------------------------.  ,------------------------------------------------.
+  * |   `  |      |      |      |      |      |      |  |      |      |      |      |      |      | BkSp |
+  * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
+  * | Tab  |      |      |      |      |      |      |  |      |      |      |      |      |      |   \  |
+  * |------+------+------+------+------+------|------|  |------|------+------+------+------+------+------|
+  * | Esc  |      |      |      |      |      |      |  |      |      |      |      |      |      |   '  |
+  * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
+  * | Sft( |      |      |      |      |      |      |  |      |      |      |      |      |      | Sft) |
+  * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
+  * | Ctrl |  Win |  Win |  Alt |  FN  | Space|  RGB |  |  FN  |  FN  |   -  |   =  | Down | PgUp | PgDn |
+  * |------+------+------+------+------+------+------|  |------+------+------+------+------+------+------|
+  *                                    | Space| Bksp |  | Enter| Space|
+  *                                    `-------------'  `--------=----'
+  */
+#define EXPAND_LAYOUT(...) LAYOUT(__VA_ARGS__, \
+      KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU,                                     KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, \
+      KC_MNXT, KC_MPLY, KC_MPRV, KC_VOLD, KC_VOLU,                                                       KC_MNXT, KC_MPLY, KC_MPRV, KC_VOLD, KC_VOLU )
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = EXPAND_LAYOUT(
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    RGB_MOD,                   KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+      KC_TAB,  _________________QWERTY_L1_________________, KC_LBRC,                   KC_RBRC, _________________QWERTY_R1_________________, KC_BSLS,
+      FN_ESC,  _________________QWERTY_L2_________________, RGB_SAI,                   RGB_VAI, _________________QWERTY_R2_________________, KC_QUOT,
+      KC_LSPO, _________________QWERTY_L3_________________, RGB_SAD,                   RGB_VAD, _________________QWERTY_R3_________________, KC_RSPC,
+      KC_LCTL, KC_LGUI, KC_LGUI, KC_LALT, FN,      KC_SPC,  KC_MUTE, KC_BSPC, KC_ENT,  FN,      KC_SPC,  KC_MINS, KC_EQL,  KC_DOWN, KC_PGUP, KC_PGDN
+  ),
+
+  [_FN] = EXPAND_LAYOUT(
+      ________________FUNCTION_L1________________, _______,                   KC_PSCR, ________________FUNCTION_R1________________,
+      ________________FUNCTION_L2________________, _______,                   _______, ________________FUNCTION_R2________________,
+      ________________FUNCTION_L3________________, _______,                   _______, ________________FUNCTION_R3________________,
+      ________________FUNCTION_L4________________, _______,                   _______, ________________FUNCTION_R4________________,
+      ________________FUNCTION_L5________________, ADJ,     KC_DEL,  _______, ADJ,     ________________FUNCTION_R5________________
+      ),
+
+  [_ADJ] = EXPAND_LAYOUT(
+      _________________ADJUST_L1_________________, _______,                   _______, _________________ADJUST_R1_________________,
+      _________________ADJUST_L2_________________, _______,                   _______, _________________ADJUST_R2_________________,
+      _________________ADJUST_L3_________________, _______,                   _______, _________________ADJUST_R3_________________,
+      _________________ADJUST_L4_________________, _______,                   _______, _________________ADJUST_R4_________________,
+      _________________ADJUST_L5_________________, _______, _______, _______, _______, _________________ADJUST_R5_________________
+
+      )
+
+};
diff --git a/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/rgbkb/sol3/keymaps/kageurufu/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/rgbkb/sol3/keymaps/via/config.h b/keyboards/rgbkb/sol3/keymaps/via/config.h
new file mode 100644
index 0000000000..3934e6c491
--- /dev/null
+++ b/keyboards/rgbkb/sol3/keymaps/via/config.h
@@ -0,0 +1,32 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+// No need for the single versions when multi performance isn't a problem =D
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#undef ENABLE_RGB_MATRIX_SPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+
+// 20m timeout (20m * 60s * 1000mil)
+// #define RGB_DISABLE_TIMEOUT 1200000
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
+// 224B per layer right now
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
+
+#define VIA_QMK_RGBLIGHT_ENABLE
+
+#define STM32_ONBOARD_EEPROM_SIZE 2048
+
diff --git a/keyboards/rgbkb/sol3/keymaps/via/keymap.c b/keyboards/rgbkb/sol3/keymaps/via/keymap.c
new file mode 100644
index 0000000000..740d3cc084
--- /dev/null
+++ b/keyboards/rgbkb/sol3/keymaps/via/keymap.c
@@ -0,0 +1,218 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#include QMK_KEYBOARD_H
+
+/* Qwerty
+ * ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐
+ * │ GESC │   1  │   2  │   3  │   4  │   5  │   -  │  │   =  │   6  │   7  │   8  │   9  │   0  │ BkSp │
+ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+ * │ Tab  │   Q  │   W  │   E  │   R  │   T  │   [  │  │   ]  │   Y  │   U  │   I  │   O  │   P  │   \  │
+ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+ * │FNCAPS│   A  │   S  │   D  │   F  │   G  │   (  │  │   )  │   H  │   J  │   K  │   L  │   ;  │   '  │
+ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+ * │Shift │   Z  │   X  │   C  │   V  │   B  │   {  │  │   }  │   N  │   M  │   ,  │   .  │   /  │Enter │
+ * ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+ * │ Ctrl │  Win │  Alt │  RGB │ ADJ  │      │ DEL  │  │ Enter│      │  FN  │ Left │ Down │ Up   │Right │
+ * └──────┴──────┴──────┴──────┴──────┤ Space├──────┤  ├──────┤ Space├──────┴──────┴──────┴──────┴──────┘
+ *                                    │      │ DEL  │  │ Enter│      │
+ *                                    └──────┴──────┘  └──────┴──────┘
+ * ┌──────┬──────┬──────┬──────┬──────┬──────┐                ┌──────┬──────┬──────┬──────┬──────┬──────┐
+ * │Vol Dn│Vol Up│Vol Dn│Vol Up│Vol Dn│Vol Up│                │Vol Dn│Vol Up│Vol Dn│Vol Up│Vol Dn│Vol Up│
+ * └──────┴──────┴──────┴──────┴──────┴──────┘                └──────┴──────┴──────┴──────┴──────┴──────┘
+ * ┌──────┬──────┬──────┬──────┬──────┐                              ┌──────┬──────┬──────┬──────┬──────┐
+ * │Vol Dn│Vol Up│ Prev │ Play │ Next │                              │Vol Dn│Vol Up│ Prev │ Play │ Next │
+ * └──────┴──────┴──────┴──────┴──────┘                              └──────┴──────┴──────┴──────┴──────┘
+ */
+
+enum sol_layers {
+    _QWERTY,
+    _COLEMAK,
+    _GAME,
+    _FN,
+    _ADJUST,
+    _VIA1,
+    _VIA2,
+    _VIA3
+};
+
+enum sol_keycodes {
+    // Disables touch processing
+    TCH_TOG = SAFE_RANGE,
+    MENU_BTN,
+    MENU_UP,
+    MENU_DN,
+    RGB_RST
+};
+
+#define FN       MO(_FN)
+#define ADJUST   MO(_ADJUST)
+#define COLEMAK  DF(_COLEMAK)
+#define GAME     DF(_GAME)
+#define QWERTY   DF(_QWERTY)
+#define FN_CAPS  LT(_FN, KC_CAPS)
+//#define RGB_ADJ  LT(_ADJUST, RGB_TOG)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_QWERTY] = LAYOUT(
+        KC_GESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,                  KC_EQL,  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_LBRC,                  KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        FN_CAPS,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LPRN,                  KC_RPRN, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LCBR,                  KC_RCBR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SFTENT,
+        KC_LCTL,  KC_LGUI, KC_LALT, RGB_TOG, ADJUST,  KC_SPC,  KC_PGDN, KC_DEL, KC_ENT,  KC_PGUP, KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_RCTL,
+
+        KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU,                                     KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU,
+        KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV,                                                       KC_VOLD, KC_VOLU, KC_MNXT, KC_MPLY, KC_MPRV
+    ),
+
+    [_COLEMAK] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    _______,                   _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, _______,
+        _______, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______,                   _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    _______,
+        _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______,                   _______, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
+    ),
+
+    [_GAME] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, KC_F1,                     KC_F5,   _______, _______, _______, _______, _______, _______,
+        _______, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_F2,                     KC_F6,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    _______,
+        _______, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_F3,                     KC_F7,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, _______,
+        _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_F4,                     KC_F8,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _______,
+        _______, KC_NO,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
+    ),
+
+    [_FN] = LAYOUT(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                    KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+        _______, KC_HOME, KC_UP,   KC_END,  _______, _______, _______,                   _______, _______, KC_HOME, KC_UP,   KC_END,  KC_PSCR, KC_PGUP,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,                   _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_PGDN,
+        _______,  AU_TOG,  MU_TOG,  MU_MOD, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, CK_TOGG,   CK_UP, CK_DOWN, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
+
+        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
+    ),
+
+    [_ADJUST] = LAYOUT(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,                    KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+        _______, RGB_SAD, RGB_VAI, RGB_SAI, RESET,   _______, _______,                   _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
+        _______, RGB_HUD, RGB_VAD, RGB_HUI, RGB_RST, _______, DM_REC1,                   _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,
+        _______, RGB_SPD, _______, RGB_SPI, _______, _______, DM_RSTP,                   _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, GAME,
+        _______, RGB_RMOD,RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_NLCK, QWERTY,  COLEMAK,
+
+        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
+    ),
+
+    [_VIA1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
+    ),
+
+    [_VIA2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
+    ),
+
+    [_VIA3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______
+    )
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode)
+    {
+        case MENU_BTN:
+            if (record->event.pressed) {
+                rgb_menu_selection();
+            }
+            return false;
+        case MENU_UP:
+            if (record->event.pressed) {
+                rgb_menu_action(true);
+            }
+            return false;
+        case MENU_DN:
+            if (record->event.pressed) {
+                rgb_menu_action(false);
+            }
+            return false;
+        case RGB_RST:
+            if (record->event.pressed) {
+                eeconfig_update_rgb_matrix_default();
+            }
+            return false;
+        case TCH_TOG:
+            if (record->event.pressed) {
+                touch_encoder_toggle();
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;
+    }
+}
+
+void render_layer_status(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer"), false);
+    switch (get_highest_layer(layer_state)) {
+        case _QWERTY:
+            oled_write_ln_P(PSTR("QWRTY"), false);
+            break;
+        case _COLEMAK:
+            oled_write_ln_P(PSTR("Colemk"), false);
+            break;
+        case _GAME:
+            oled_write_ln_P(PSTR("Game  "), false);
+            break;
+        case _FN:
+            oled_write_ln_P(PSTR("FN   "), false);
+            break;
+        case _ADJUST:
+            oled_write_ln_P(PSTR("Adjst"), false);
+            break;
+        case _VIA1:
+            oled_write_ln_P(PSTR("VIA1 "), false);
+            break;
+        case _VIA2:
+            oled_write_ln_P(PSTR("VIA2 "), false);
+            break;
+        case _VIA3:
+            oled_write_ln_P(PSTR("VIA3 "), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Undef"), false);
+    }
+}
diff --git a/keyboards/rgbkb/sol3/keymaps/via/rules.mk b/keyboards/rgbkb/sol3/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/rgbkb/sol3/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/rgbkb/sol3/mcuconf.h b/keyboards/rgbkb/sol3/mcuconf.h
new file mode 100644
index 0000000000..e68a680f48
--- /dev/null
+++ b/keyboards/rgbkb/sol3/mcuconf.h
@@ -0,0 +1,30 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_DAC_USE_DAC1_CH1
+#define STM32_DAC_USE_DAC1_CH1 TRUE
+
+#undef STM32_DAC_USE_DAC1_CH2
+#define STM32_DAC_USE_DAC1_CH2 TRUE
+
+#undef STM32_GPT_USE_TIM6
+#define STM32_GPT_USE_TIM6 TRUE
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/rgbkb/sol3/rev1/config.h b/keyboards/rgbkb/sol3/rev1/config.h
new file mode 100644
index 0000000000..7ff0b54903
--- /dev/null
+++ b/keyboards/rgbkb/sol3/rev1/config.h
@@ -0,0 +1,12 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+#define DEVICE_VER 0x0001
diff --git a/keyboards/rgbkb/sol3/rev1/rev1.c b/keyboards/rgbkb/sol3/rev1/rev1.c
new file mode 100644
index 0000000000..32b278f3d8
--- /dev/null
+++ b/keyboards/rgbkb/sol3/rev1/rev1.c
@@ -0,0 +1,287 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#include "rev1.h"
+#include "split_util.h"
+
+#define NUMBER_OF_TOUCH_ENCODERS 2
+#define TOUCH_ENCODER_OPTIONS TOUCH_SEGMENTS + 2
+
+#define NUMBER_OF_ENCODERS 6
+#define ENCODER_OPTIONS 2
+
+typedef struct PACKED {
+    uint8_t r;
+    uint8_t c;
+} encodermap_t;
+
+// this maps encoders and then touch encoders to their respective electrical matrix entry
+// mapping is row (y) then column (x) when looking at the electrical layout
+const encodermap_t encoder_map[NUMBER_OF_ENCODERS][ENCODER_OPTIONS] = 
+{
+    { {  5, 0 }, {  5, 1 } }, // Encoder 0 matrix entries
+    { {  5, 2 }, {  5, 3 } }, // Encoder 1 matrix entries
+    { {  5, 4 }, {  5, 5 } }, // Encoder 2 matrix entries
+    { { 11, 0 }, { 11, 1 } }, // Encoder 3 matrix entries
+    { { 11, 2 }, { 11, 3 } }, // Encoder 4 matrix entries
+    { { 11, 4 }, { 11, 5 } }  // Encoder 5 matrix entries
+};
+
+const encodermap_t touch_encoder_map[NUMBER_OF_TOUCH_ENCODERS][TOUCH_ENCODER_OPTIONS] = 
+{
+    { { 1, 7 }, { 0, 7 }, { 2, 7 }, {  5, 6 }, {  5, 7 }, }, // Touch Encoder 0 matrix entries
+    { { 7, 7 }, { 6, 7 }, { 8, 7 }, { 11, 6 }, { 11, 7 }, }  // Touch Encoder 1 matrix entries
+};
+
+static bool limit_lightning = false;
+
+RGB rgb_matrix_hsv_to_rgb(HSV hsv) {
+    if (limit_lightning) hsv.v /= 2;
+    return hsv_to_rgb(hsv); 
+}
+
+bool dip_switch_update_kb(uint8_t index, bool active) {
+    if (!dip_switch_update_user(index, active))
+        return false;
+
+    switch(index) {
+        case 0: {
+            limit_lightning = active;
+            break;
+        }
+        case 1: {
+            // Handle RGB Encoder switch press
+            action_exec((keyevent_t){
+                .key = (keypos_t){.row = isLeftHand ? 4 : 10, .col = 6},
+                .pressed = active, .time = (timer_read() | 1) /* time should not be 0 */
+            });
+            break;
+        }
+    }
+    return false;
+}
+
+static void process_encoder_matrix(encodermap_t pos) {
+    action_exec((keyevent_t){
+        .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = true, .time = (timer_read() | 1) /* time should not be 0 */
+    });
+#if TAP_CODE_DELAY > 0
+    wait_ms(TAP_CODE_DELAY);
+#endif
+    action_exec((keyevent_t){
+        .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = false, .time = (timer_read() | 1) /* time should not be 0 */
+    });
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise))
+        return false;
+
+    // Mapping clockwise (typically increase) to zero, and counter clockwise (decrease) to 1
+    process_encoder_matrix(encoder_map[index][clockwise ? 0 : 1]);
+    return false;
+}
+
+bool touch_encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!touch_encoder_update_user(index, clockwise))
+        return false;
+
+    // Mapping clockwise (typically increase) to zero, and counter clockwise (decrease) to 1
+    process_encoder_matrix(touch_encoder_map[index][clockwise ? 0 : 1]);
+    return false;
+}
+
+bool touch_encoder_tapped_kb(uint8_t index, uint8_t section) {
+    if (!touch_encoder_tapped_user(index, section))
+        return false;
+
+    process_encoder_matrix(touch_encoder_map[index][section + 2]);
+    return false;
+}
+
+void matrix_slave_scan_kb() {
+    dip_switch_read(false);
+    matrix_slave_scan_user();
+}
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+led_config_t g_led_config = { {
+    {  41,  42,  43,  44,  45,  46,  47 },
+    {  54,  53,  52,  51,  50,  49,  48 },
+    {  55,  56,  57,  58,  59,  60,  61 },
+    {  68,  67,  66,  65,  64,  63,  62 },
+    {  69,  70,  71,  72,  73,  74,  75,  76 },
+    { 119, 120, 121, 122, 123, 124, 125 },
+    { 132, 131, 130, 129, 128, 127, 126 },
+    { 133, 134, 135, 136, 137, 138, 139 },
+    { 146, 145, 144, 143, 142, 141, 140 },
+    { 147, 148, 149, 150, 151, 152, 153 }
+}, { // ALL XY VALUES DIVIDE BY 2, THEN ADD 5
+    {   1,   6 }, {   1,  13 }, {   1,  19 }, {   1,  25 }, {   1,  31 }, {   1,  37 }, {   1,  43 }, {   1,  49 }, {   4,  52 }, {  11,  52 },
+    {  17,  52 }, {  23,  52 }, {  29,  52 }, {  35,  52 }, {  41,  54 }, {  46,  57 }, {  52,  60 }, {  57,  63 }, {  62,  66 }, {  68,  69 },
+    {  73,  67 }, {  76,  62 }, {  79,  57 }, {  78,  51 }, {  77,  45 }, {  76,  39 }, {  76,  33 }, {  76,  27 }, {  76,  21 }, {  76,  14 },
+    {  76,   8 }, {  72,   3 }, {  59,   3 }, {  53,   3 }, {  46,   3 }, {  40,   3 }, {  34,   3 }, {  28,   3 }, {  22,   3 }, {  10,   3 }, {   3,   3 },
+    {   9,   6 }, {  21,   6 }, {  30,   6 }, {  40,   6 }, {  49,   6 }, {  59,   6 }, {  71,   6 },
+    {  71,  16 }, {  59,  16 }, {  49,  16 }, {  40,  16 }, {  30,  16 }, {  21,  16 }, {   9,  16 },
+    {   9,  25 }, {  21,  25 }, {  30,  25 }, {  40,  25 }, {  49,  25 }, {  59,  25 }, {  71,  25 },
+    {  71,  35 }, {  59,  35 }, {  49,  35 }, {  40,  35 }, {  30,  35 }, {  21,  35 }, {   9,  35 },
+    {   9,  44 }, {  21,  44 }, {  30,  44 }, {  40,  44 }, {  49,  44 }, {  66,  50 }, {  75,  54 }, {  70,  62 }, {  60,  60 },
+
+    { 160,   6 }, { 160,  13 }, { 160,  19 }, { 160,  25 }, { 160,  31 }, { 160,  37 }, { 160,  43 }, { 160,  49 }, { 157,  52 }, { 151,  52 },
+    { 145,  52 }, { 138,  52 }, { 132,  52 }, { 126,  52 }, { 120,  54 }, { 115,  57 }, { 110,  60 }, { 105,  63 }, {  99,  66 }, {  94,  69 },
+    {  89,  67 }, {  86,  62 }, {  83,  57 }, {  83,  51 }, {  85,  45 }, {  86,  39 }, {  86,  33 }, {  86,  27 }, {  86,  21 }, {  86,  14 },
+    {  86,   8 }, {  90,   3 }, { 103,   3 }, { 109,   3 }, { 115,   3 }, { 121,   3 }, { 127,   3 }, { 133,   3 }, { 140,   3 }, { 152,   3 }, { 158,   3 },
+    { 153,   6 }, { 141,   6 }, { 131,   6 }, { 122,   6 }, { 112,   6 }, { 103,   6 }, {  91,   6 },
+    {  91,  16 }, { 103,  16 }, { 112,  16 }, { 122,  16 }, { 131,  16 }, { 141,  16 }, { 153,  16 },
+    { 153,  25 }, { 141,  25 }, { 131,  25 }, { 122,  25 }, { 112,  25 }, { 103,  25 }, {  91,  25 },
+    {  91,  35 }, { 103,  35 }, { 112,  35 }, { 122,  35 }, { 131,  35 }, { 141,  35 }, { 153,  35 },
+    { 153,  44 }, { 141,  44 }, { 131,  44 }, { 122,  44 }, { 112,  44 }, {  96,  50 }, {  87,  54 }, {  92,  62 }, { 102,  60 },
+}, {
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1,
+
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1
+} };
+// clang-format on
+
+void rgb_matrix_increase_flags(void)
+{
+    switch (rgb_matrix_get_flags()) {
+        case LED_FLAG_ALL: {
+            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
+            rgb_matrix_set_color_all(0, 0, 0);
+            }
+            break;
+        case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
+            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+            rgb_matrix_set_color_all(0, 0, 0);
+            }
+            break;
+        case LED_FLAG_UNDERGLOW: {
+            rgb_matrix_set_flags(LED_FLAG_NONE);
+            rgb_matrix_disable_noeeprom();
+            }
+            break;
+        default: {
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_enable_noeeprom();
+            }
+            break;
+    }
+}
+#endif
+
+
+__attribute__((weak)) 
+void render_layer_status(void) {
+    // Keymap specific, expected to be overridden
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer"), false);
+    oled_write_ln_P(PSTR("Undef"), false);
+}
+
+__attribute__((weak))
+void render_leds_status(void)
+{
+    // Host Keyboard LED Status
+    static const char PROGMEM led_icon[] = {
+        0x0F,0x3A,0
+    };
+    oled_write_P(led_icon, false);
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(   led_state.num_lock ? PSTR("N") : PSTR(" "), false);
+    oled_write_P(  led_state.caps_lock ? PSTR("C") : PSTR(" "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("S") : PSTR(" "), false);
+}
+
+__attribute__((weak))
+void render_touch_status(void)
+{
+    // Host Touch LED Status
+    static const char PROGMEM touch_icon[] = {
+        0x12,0x3A,0
+    };
+    oled_write_P(touch_icon, false);
+    oled_write_P(         touch_encoder_is_on() ? PSTR("T") : PSTR(" "), false);
+    oled_write_P(touch_encoder_is_calibrating() ? PSTR("C") : PSTR(" "), false);
+    oled_write_P(PSTR(" "), false);
+}
+
+__attribute__((weak))
+void render_audio_status(void)
+{
+    // Host Audio Status
+    static const char PROGMEM audio_icon[] = {
+        0x0E,0x3A,0
+    };
+    oled_write_P(audio_icon, false);
+    oled_write_P( audio_is_on() ? PSTR("A")  : PSTR(" "), false);
+    oled_write_P(is_clicky_on() ? PSTR("C")  : PSTR(" "), false);
+    oled_write_P( is_music_on() ? PSTR("M")  : PSTR(" "), false);
+}
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    // Sol 3 uses OLED_ROTATION_270 for default rotation on both halves
+    return oled_init_user(OLED_ROTATION_270);
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user())
+        return false;
+    
+    if (is_keyboard_left()) {
+        render_icon();
+        oled_write_P(PSTR("     "), false);
+        render_layer_status();
+        oled_write_P(PSTR("     "), false);
+        render_leds_status();
+        oled_write_P(PSTR("     "), false);
+        render_touch_status();
+        oled_write_P(PSTR("     "), false);
+        render_audio_status();
+    }
+    else {
+        render_icon();
+        oled_write_P(PSTR("     "), false);
+        render_rgb_menu();
+    }
+    return false;
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (!process_record_user(keycode, record))
+        return false;
+
+    switch(keycode) {
+#ifdef RGB_MATRIX_ENABLE
+        case RGB_TOG:
+            if (record->event.pressed) {
+                rgb_matrix_increase_flags();
+            }
+            return false;
+#endif
+    }
+    return true;
+};
\ No newline at end of file
diff --git a/keyboards/rgbkb/sol3/rev1/rev1.h b/keyboards/rgbkb/sol3/rev1/rev1.h
new file mode 100644
index 0000000000..e80f8c298d
--- /dev/null
+++ b/keyboards/rgbkb/sol3/rev1/rev1.h
@@ -0,0 +1,74 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+#include "sol3.h"
+
+// clang-format off
+/* Blank ascii map to reuse, with labeled possible encoder positions, *rgb encoder only
+┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐  ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐
+│      │      │      │      │      │      │  E2  │  │  E5  │      │      │      │      │      │      │
+├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+│      │      │      │      │      │      │      │  │      │      │      │      │      │      │      │
+├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+│      │      │      │      │      │      │      │  │      │      │      │      │      │      │      │
+├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+│      │      │      │      │      │      │  E2  │  │  E5  │      │      │      │      │      │      │
+├──────┼──────┼──────┼──────┼──────┼──────┼──────┤  ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤
+│      │      │      │  E1  │  E1  │      │  E0* │  │  E3* │      │  E4  │  E4  │      │      │      │
+└──────┴──────┴──────┴──────┴──────┤      ├──────┤  ├──────┤      ├──────┴──────┴──────┴──────┴──────┘
+                                   │      │  E0  │  │  E3  │      │
+                                   └──────┴──────┘  └──────┴──────┘
+┌──────┬──────┬──────┬──────┬──────┬──────┐                ┌──────┬──────┬──────┬──────┬──────┬──────┐
+│  E0↑ │  E0↓ │  E1↑ │  E1↓ │  E2↑ │  E2↓ │                │  E3↑ │  E3↓ │  E4↑ │  E4↓ │  E5↑ │  E5↓ │
+└──────┴──────┴──────┴──────┴──────┴──────┘                └──────┴──────┴──────┴──────┴──────┴──────┘
+┌──────┬──────┬──────┬──────┬──────┐                              ┌──────┬──────┬──────┬──────┬──────┐
+│      │      │      │      │      │                              │      │      │      │      │      │
+└──────┴──────┴──────┴──────┴──────┘                              └──────┴──────┴──────┴──────┴──────┘
+*/
+
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05, L06,           R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15, L16,           R10, R11, R12, R13, R14, R15, R16, \
+    L20, L21, L22, L23, L24, L25, L26,           R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32, L33, L34, L35, L36,           R30, R31, R32, R33, R34, R35, R36, \
+    L40, L41, L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47, \
+    \
+    E0L, E0R, E1L, E1R, E2L, E2R,                     E3L, E3R, E4L, E4R, E5L, E5R, \
+    LT0, LT1, LT2, LSL, LSR,                               RT0, RT1, RT2, RSL, RSR \
+) \
+{ \
+    /* Left Half */ \
+    { L00, L01, L02, L03, L04, L05, L06, LT0   }, \
+    { L10, L11, L12, L13, L14, L15, L16, LT1   }, \
+    { L20, L21, L22, L23, L24, L25, L26, LT2   }, \
+    { L30, L31, L32, L33, L34, L35, L36, KC_NO }, \
+    { L40, L41, L42, L43, L44, L45, L46, L47   }, \
+    { E0L, E0R, E1L, E1R, E2L, E2R, LSL, LSR   }, \
+    /* Right Half */ \
+    { R06, R05, R04, R03, R02, R01, R00, RT0   }, \
+    { R16, R15, R14, R13, R12, R11, R10, RT1   }, \
+    { R26, R25, R24, R23, R22, R21, R20, RT2   }, \
+    { R36, R35, R34, R33, R32, R31, R30, KC_NO }, \
+    { R47, R46, R45, R44, R43, R42, R41, R40   }, \
+    { E3L, E3R, E4L, E4R, E5L, E5R, RSL, RSR   } \
+}
+// clang-format on
+
+// weak functions overridable by the user
+void render_layer_status(void);
+void render_leds_status(void);
+void render_touch_status(void);
+void render_audio_status(void);
+
+#ifdef RGB_MATRIX_ENABLE
+// utility function to cycle active led zones
+void rgb_matrix_increase_flags(void);
+#endif
\ No newline at end of file
diff --git a/keyboards/rgbkb/sol3/rev1/rules.mk b/keyboards/rgbkb/sol3/rev1/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
new file mode 100644
index 0000000000..8389a7a9c4
--- /dev/null
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -0,0 +1,49 @@
+# MCU name
+MCU = STM32F303
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Touch encoder needs
+SRC += ../common/touch_encoder.c
+SRC += ../common/common_oled.c
+QUANTUM_LIB_SRC += i2c_master.c
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # 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           # Enable N-Key Rollover
+AUDIO_ENABLE = yes          # Audio output
+AUDIO_DRIVER = dac_additive
+
+DYNAMIC_MACRO_ENABLE = yes
+DIP_SWITCH_ENABLE = yes
+
+WS2812_DRIVER = pwm
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306    # Enable the OLED Driver
+
+ENCODER_ENABLE = yes
+
+SPLIT_KEYBOARD = yes
+SERIAL_DRIVER = usart
+LTO_ENABLE = yes
+OPT = 3
+
+OPT_DEFS += -DOLED_FONT_H=\"../common/glcdfont.c\"
+OPT_DEFS += -Ikeyboards/rgbkb/common
+
+# TODO: Implement fast matrix scanning
+# matrix optimisations
+# SRC += matrix.c
+
+DEFAULT_FOLDER = rgbkb/sol3/rev1
diff --git a/keyboards/rgbkb/sol3/sol3.c b/keyboards/rgbkb/sol3/sol3.c
new file mode 100644
index 0000000000..97ae5bc5de
--- /dev/null
+++ b/keyboards/rgbkb/sol3/sol3.c
@@ -0,0 +1,38 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#include "sol3.h"
+#include "eeconfig.h"
+#include "audio.h"
+#include <transactions.h>
+
+extern audio_config_t audio_config;
+
+void keyboard_post_init_kb(void) {
+    touch_encoder_init();
+    transaction_register_rpc(TOUCH_ENCODER_SYNC, touch_encoder_slave_sync);
+    transaction_register_rpc(RGB_MENU_SYNC, rgb_menu_slave_sync);
+    keyboard_post_init_user();
+}
+
+void eeconfig_init_kb(void) {
+    // Reset Keyboard EEPROM value to blank, rather than to a set value
+    eeconfig_update_kb(0);
+
+    audio_config.raw = eeconfig_read_audio();
+    audio_config.clicky_enable = false;
+    eeconfig_update_audio(audio_config.raw);
+
+    eeconfig_init_user();
+}
+
+void housekeeping_task_kb(void) {
+    touch_encoder_update(TOUCH_ENCODER_SYNC);
+    rgb_menu_update(RGB_MENU_SYNC);
+}
diff --git a/keyboards/rgbkb/sol3/sol3.h b/keyboards/rgbkb/sol3/sol3.h
new file mode 100644
index 0000000000..06d5dcdea0
--- /dev/null
+++ b/keyboards/rgbkb/sol3/sol3.h
@@ -0,0 +1,18 @@
+/*
+ * ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <https://github.com/Legonut> wrote this file.  As long as you retain this
+ * notice you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return. David Rauseo
+ * ----------------------------------------------------------------------------
+ */
+
+#pragma once
+
+#if defined(KEYBOARD_rgbkb_sol3_rev1)
+#    include "rev1.h"
+#endif
+
+#include "quantum.h"
+#include "touch_encoder.h"
+#include "common_oled.h"

From 7ecb47958c7e13ffb87e9ee25ee639daeb78b36d Mon Sep 17 00:00:00 2001
From: CMMS-Freather <72902384+CMMS-Freather@users.noreply.github.com>
Date: Fri, 21 Jan 2022 19:53:53 -0800
Subject: [PATCH 343/867] [Keyboard] add fuji65 keyboard (#15765)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/cmm_studio/fuji65/config.h          | 67 ++++++++++++++++
 keyboards/cmm_studio/fuji65/fuji65.c          | 20 +++++
 keyboards/cmm_studio/fuji65/fuji65.h          | 38 +++++++++
 keyboards/cmm_studio/fuji65/info.json         | 79 +++++++++++++++++++
 .../fuji65/keymaps/default/keymap.c           | 36 +++++++++
 .../cmm_studio/fuji65/keymaps/via/keymap.c    | 51 ++++++++++++
 .../cmm_studio/fuji65/keymaps/via/rules.mk    |  1 +
 keyboards/cmm_studio/fuji65/readme.md         | 18 +++++
 keyboards/cmm_studio/fuji65/rules.mk          | 21 +++++
 9 files changed, 331 insertions(+)
 create mode 100644 keyboards/cmm_studio/fuji65/config.h
 create mode 100644 keyboards/cmm_studio/fuji65/fuji65.c
 create mode 100644 keyboards/cmm_studio/fuji65/fuji65.h
 create mode 100644 keyboards/cmm_studio/fuji65/info.json
 create mode 100644 keyboards/cmm_studio/fuji65/keymaps/default/keymap.c
 create mode 100644 keyboards/cmm_studio/fuji65/keymaps/via/keymap.c
 create mode 100644 keyboards/cmm_studio/fuji65/keymaps/via/rules.mk
 create mode 100644 keyboards/cmm_studio/fuji65/readme.md
 create mode 100644 keyboards/cmm_studio/fuji65/rules.mk

diff --git a/keyboards/cmm_studio/fuji65/config.h b/keyboards/cmm_studio/fuji65/config.h
new file mode 100644
index 0000000000..fea03d26a8
--- /dev/null
+++ b/keyboards/cmm_studio/fuji65/config.h
@@ -0,0 +1,67 @@
+/* Copyright 2021 CMM.Studio Freather
+ *
+ * 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       0x434D
+#define PRODUCT_ID      0x364D
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    CMM.Studio
+#define PRODUCT         Fuji65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 { B5, B4, D7, D6, B6 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, D5, D3, D2, D1, D0 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN E6
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 8
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+    #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
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/fuji65.c b/keyboards/cmm_studio/fuji65/fuji65.c
new file mode 100644
index 0000000000..07a03710c4
--- /dev/null
+++ b/keyboards/cmm_studio/fuji65/fuji65.c
@@ -0,0 +1,20 @@
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * 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 "fuji65.h"
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/fuji65.h b/keyboards/cmm_studio/fuji65/fuji65.h
new file mode 100644
index 0000000000..479c0a4fda
--- /dev/null
+++ b/keyboards/cmm_studio/fuji65/fuji65.h
@@ -0,0 +1,38 @@
+/* Copyright 2021 CMM.Studio Freather
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
+    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX }, \
+}
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json
new file mode 100644
index 0000000000..3a679103e5
--- /dev/null
+++ b/keyboards/cmm_studio/fuji65/info.json
@@ -0,0 +1,79 @@
+{
+    "keyboard_name": "cmm.studio fuji65",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "K00 (B5,F7)", "x": 0, "y": 0 },
+                { "label": "K01 (B5,F6)", "x": 1, "y": 0 },
+                { "label": "K02 (B5,F5)", "x": 2, "y": 0 },
+                { "label": "K03 (B5,F4)", "x": 3, "y": 0 },
+                { "label": "K04 (B5,F1)", "x": 4, "y": 0 },
+                { "label": "K05 (B5,F0)", "x": 5, "y": 0 },
+                { "label": "K06 (B5,B0)", "x": 6, "y": 0 },
+                { "label": "K07 (B5,B1)", "x": 7, "y": 0 },
+                { "label": "K08 (B5,B2)", "x": 8, "y": 0 },
+                { "label": "K09 (B5,B3)", "x": 9, "y": 0 },
+                { "label": "K0A (B5,D5)", "x": 10, "y": 0 },
+                { "label": "K0B (B5,D3)", "x": 11, "y": 0 },
+                { "label": "K0C (B5,D2)", "x": 12, "y": 0 },
+                { "label": "K0D (B5,D1)", "x": 13, "y": 0 },
+                { "label": "K0E (B5,D0)", "x": 14, "y": 0 },
+                { "label": "K10 (B4,F7)", "x": 0, "y": 1 },
+                { "label": "K11 (B4,F6)", "x": 1.5, "y": 1 },
+                { "label": "K12 (B4,F5)", "x": 2.5, "y": 1 },
+                { "label": "K13 (B4,F4)", "x": 3.5, "y": 1 },
+                { "label": "K14 (B4,F1)", "x": 4.5, "y": 1 },
+                { "label": "K15 (B4,F0)", "x": 5.5, "y": 1 },
+                { "label": "K16 (B4,B0)", "x": 6.5, "y": 1 },
+                { "label": "K17 (B4,B1)", "x": 7.5, "y": 1 },
+                { "label": "K18 (B4,B2)", "x": 8.5, "y": 1 },
+                { "label": "K19 (B4,B3)", "x": 9.5, "y": 1 },
+                { "label": "K1A (B4,D5)", "x": 10.5, "y": 1 },
+                { "label": "K1B (B4,D3)", "x": 11.5, "y": 1 },
+                { "label": "K1C (B4,D2)", "x": 12.5, "y": 1 },
+                { "label": "K1D (B4,D1)", "x": 13.5, "y": 1, "w": 1.5 },
+                { "label": "K1E (B4,D0)", "x": 15, "y": 1 },
+                { "label": "K20 (D7,F7)", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "K21 (D7,F6)", "x": 1.75, "y": 2 },
+                { "label": "K22 (D7,F5)", "x": 2.75, "y": 2 },
+                { "label": "K23 (D7,F4)", "x": 3.75, "y": 2 },
+                { "label": "K24 (D7,F1)", "x": 4.75, "y": 2 },
+                { "label": "K25 (D7,F0)", "x": 5.75, "y": 2 },
+                { "label": "K26 (D7,B0)", "x": 6.75, "y": 2 },
+                { "label": "K27 (D7,B1)", "x": 7.75, "y": 2 },
+                { "label": "K28 (D7,B2)", "x": 8.75, "y": 2 },
+                { "label": "K29 (D7,B3)", "x": 9.75, "y": 2 },
+                { "label": "K2A (D7,D5)", "x": 10.75, "y": 2 },
+                { "label": "K2B (D7,D3)", "x": 11.75, "y": 2 },
+                { "label": "K2C (D7,D2)", "x": 12.75, "y": 2, "w": 2.25 },
+                { "label": "K2E (D7,D0)", "x": 15, "y": 2 },
+                { "label": "K30 (D6,F7)", "x": 0, "y": 3, "w": 2.25 },
+                { "label": "K32 (D6,F5)", "x": 2.25, "y": 3 },
+                { "label": "K33 (D6,F4)", "x": 3.25, "y": 3 },
+                { "label": "K34 (D6,F1)", "x": 4.25, "y": 3 },
+                { "label": "K35 (D6,F0)", "x": 5.25, "y": 3 },
+                { "label": "K36 (D6,B0)", "x": 6.25, "y": 3 },
+                { "label": "K37 (D6,B1)", "x": 7.25, "y": 3 },
+                { "label": "K38 (D6,B2)", "x": 8.25, "y": 3 },
+                { "label": "K39 (D6,B3)", "x": 9.25, "y": 3 },
+                { "label": "K3A (D6,D5)", "x": 10.25, "y": 3 },
+                { "label": "K3B (D6,D3)", "x": 11.25, "y": 3 },
+                { "label": "K3C (D6,D2)", "x": 12.25, "y": 3, "w": 1.75 },
+                { "label": "K3D (D6,D1)", "x": 14, "y": 3 },
+                { "label": "K3E (D6,D0)", "x": 15, "y": 3 },
+                { "label": "K40 (B6,F7)", "x": 0, "y": 4, "w": 1.25 },
+                { "label": "K41 (B6,F6)", "x": 1.25, "y": 4, "w": 1.25 },
+                { "label": "K42 (B6,F5)", "x": 2.5, "y": 4, "w": 1.25 },
+                { "label": "K46 (B6,B0)", "x": 3.75, "y": 4, "w": 6.25 },
+                { "label": "K49 (B6,B3)", "x": 10, "y": 4, "w": 1.25 },
+                { "label": "K4A (B6,D5)", "x": 11.25, "y": 4, "w": 1.25 },
+                { "label": "K4B (B6,D3)", "x": 13, "y": 4 },
+                { "label": "K4C (B6,D2)", "x": 14, "y": 4 },
+                { "label": "K4D (B6,D1)", "x": 15, "y": 4 }
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/cmm_studio/fuji65/keymaps/default/keymap.c b/keyboards/cmm_studio/fuji65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e5b609e235
--- /dev/null
+++ b/keyboards/cmm_studio/fuji65/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
+      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_TRNS,
+      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_TRNS,
+      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_TRNS,
+      KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT(
+      KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
+      KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+};
diff --git a/keyboards/cmm_studio/fuji65/keymaps/via/keymap.c b/keyboards/cmm_studio/fuji65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1d1467d8fa
--- /dev/null
+++ b/keyboards/cmm_studio/fuji65/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 CMM.Studio Freather
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
+        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_TRNS,
+        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_TRNS,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_TRNS,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+};
diff --git a/keyboards/cmm_studio/fuji65/keymaps/via/rules.mk b/keyboards/cmm_studio/fuji65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/cmm_studio/fuji65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/cmm_studio/fuji65/readme.md b/keyboards/cmm_studio/fuji65/readme.md
new file mode 100644
index 0000000000..debfeeb409
--- /dev/null
+++ b/keyboards/cmm_studio/fuji65/readme.md
@@ -0,0 +1,18 @@
+# CMM.Studio Fuji65
+
+CMM.Studio Fuji65 Keyboard
+
+![CMM.Studio Fuji65](https://i.imgur.com/dUPQpkZh.png)
+
+
+* Keyboard Maintainer: [CMM.Studio Freather](https://github.com/CMMS-Freather)
+* Hardware Supported: PCB, Atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cmm_studio/fuji65:default
+
+
+For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode
+
+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).
diff --git a/keyboards/cmm_studio/fuji65/rules.mk b/keyboards/cmm_studio/fuji65/rules.mk
new file mode 100644
index 0000000000..bf28e77646
--- /dev/null
+++ b/keyboards/cmm_studio/fuji65/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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 = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# generated by KBFirmware JSON to QMK Parser
+# https://noroadsleft.github.io/kbf_qmk_converter/

From b131ebb8dd9dd94c3b2b7378acb5c2902fa2f6f5 Mon Sep 17 00:00:00 2001
From: joedinkle <brandon.bonton@gmail.com>
Date: Fri, 21 Jan 2022 20:26:46 -0800
Subject: [PATCH 344/867] [Keyboard] Add The Boulevard keyboard (#15583)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/eyeohdesigns/theboulevard/config.h  |  52 ++++++
 keyboards/eyeohdesigns/theboulevard/info.json |  38 ++++
 .../theboulevard/keymaps/default/keymap.c     |  48 +++++
 .../theboulevard/keymaps/ortho2/keymap.c      |  48 +++++
 .../theboulevard/keymaps/ortho3/keymap.c      |  48 +++++
 .../theboulevard/keymaps/ortho4/keymap.c      |  48 +++++
 .../theboulevard/keymaps/ortho5/keymap.c      |  48 +++++
 .../theboulevard/keymaps/stagger1/keymap.c    |  48 +++++
 .../theboulevard/keymaps/stagger2/keymap.c    |  48 +++++
 .../theboulevard/keymaps/stagger3/keymap.c    |  48 +++++
 .../theboulevard/keymaps/stagger4/keymap.c    |  48 +++++
 .../theboulevard/keymaps/stagger5/keymap.c    |  48 +++++
 keyboards/eyeohdesigns/theboulevard/readme.md |  21 +++
 keyboards/eyeohdesigns/theboulevard/rules.mk  |  19 ++
 .../eyeohdesigns/theboulevard/theboulevard.c  |  31 ++++
 .../eyeohdesigns/theboulevard/theboulevard.h  | 169 ++++++++++++++++++
 16 files changed, 810 insertions(+)
 create mode 100644 keyboards/eyeohdesigns/theboulevard/config.h
 create mode 100644 keyboards/eyeohdesigns/theboulevard/info.json
 create mode 100644 keyboards/eyeohdesigns/theboulevard/keymaps/default/keymap.c
 create mode 100644 keyboards/eyeohdesigns/theboulevard/keymaps/ortho2/keymap.c
 create mode 100644 keyboards/eyeohdesigns/theboulevard/keymaps/ortho3/keymap.c
 create mode 100644 keyboards/eyeohdesigns/theboulevard/keymaps/ortho4/keymap.c
 create mode 100644 keyboards/eyeohdesigns/theboulevard/keymaps/ortho5/keymap.c
 create mode 100644 keyboards/eyeohdesigns/theboulevard/keymaps/stagger1/keymap.c
 create mode 100644 keyboards/eyeohdesigns/theboulevard/keymaps/stagger2/keymap.c
 create mode 100644 keyboards/eyeohdesigns/theboulevard/keymaps/stagger3/keymap.c
 create mode 100644 keyboards/eyeohdesigns/theboulevard/keymaps/stagger4/keymap.c
 create mode 100644 keyboards/eyeohdesigns/theboulevard/keymaps/stagger5/keymap.c
 create mode 100644 keyboards/eyeohdesigns/theboulevard/readme.md
 create mode 100644 keyboards/eyeohdesigns/theboulevard/rules.mk
 create mode 100644 keyboards/eyeohdesigns/theboulevard/theboulevard.c
 create mode 100644 keyboards/eyeohdesigns/theboulevard/theboulevard.h

diff --git a/keyboards/eyeohdesigns/theboulevard/config.h b/keyboards/eyeohdesigns/theboulevard/config.h
new file mode 100644
index 0000000000..db734bbb6c
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/config.h
@@ -0,0 +1,52 @@
+/*
+Copyright 2021 eye oh designs
+
+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 eye oh designs
+#define PRODUCT theboulevard
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 13
+#define ENCODERS_PAD_A {F5}
+#define ENCODERS_PAD_B {F4}
+#define ENCODER_RESOLUTION 2
+
+#define MATRIX_ROW_PINS { F7, B1, E6, F0, F1 }
+#define MATRIX_COL_PINS { B0, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN F6
+#define RGBLED_NUM 2
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#define RGBLIGHT_EFFECT_BREATHING
+
+#define DEBOUNCE 5
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/theboulevard/info.json b/keyboards/eyeohdesigns/theboulevard/info.json
new file mode 100644
index 0000000000..ca2b888648
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/info.json
@@ -0,0 +1,38 @@
+{
+    "keyboard_name": "the boulevard", 
+    "url": "", 
+    "maintainer": "eye oh designs", 
+    "layouts": {
+        "LAYOUT_ortho1": {
+            "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5}, {"label":"A", "x":2.5, "y":2.5}, {"label":"S", "x":3.5, "y":2.5}, {"label":"D", "x":4.5, "y":2.5}, {"label":"F", "x":5.5, "y":2.5}, {"label":"G", "x":6.5, "y":2.5}, {"label":"H", "x":7.5, "y":2.5}, {"label":"J", "x":8.5, "y":2.5}, {"label":"K", "x":9.5, "y":2.5}, {"label":"L", "x":10.5, "y":2.5}, {"label":";", "x":11.5, "y":2.5}, {"label":"ENTER", "x":12.5, "y":2.5}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5}, {"label":"Z", "x":2.5, "y":3.5}, {"label":"X", "x":3.5, "y":3.5}, {"label":"C", "x":4.5, "y":3.5}, {"label":"V", "x":5.5, "y":3.5}, {"label":"B", "x":6.5, "y":3.5}, {"label":"N", "x":7.5, "y":3.5}, {"label":"M", "x":8.5, "y":3.5}, {"label":",", "x":9.5, "y":3.5}, {"label":".", "x":10.5, "y":3.5}, {"label":"/", "x":11.5, "y":3.5}, {"label":"SHIFT", "x":12.5, "y":3.5}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5}, {"x":3.5, "y":4.5}, {"x":4.5, "y":4.5}, {"x":5.5, "y":4.5}, {"x":6.5, "y":4.5, "w":2}, {"x":8.5, "y":4.5}, {"x":9.5, "y":4.5}, {"x":10.5, "y":4.5}, {"x":11.5, "y":4.5}, {"x":12.5, "y":4.5}]
+        },
+        "LAYOUT_ortho2": {
+            "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5}, {"label":"A", "x":2.5, "y":2.5}, {"label":"S", "x":3.5, "y":2.5}, {"label":"D", "x":4.5, "y":2.5}, {"label":"F", "x":5.5, "y":2.5}, {"label":"G", "x":6.5, "y":2.5}, {"label":"H", "x":7.5, "y":2.5}, {"label":"J", "x":8.5, "y":2.5}, {"label":"K", "x":9.5, "y":2.5}, {"label":"L", "x":10.5, "y":2.5}, {"label":";", "x":11.5, "y":2.5}, {"label":"ENTER", "x":12.5, "y":2.5}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5}, {"label":"Z", "x":2.5, "y":3.5}, {"label":"X", "x":3.5, "y":3.5}, {"label":"C", "x":4.5, "y":3.5}, {"label":"V", "x":5.5, "y":3.5}, {"label":"B", "x":6.5, "y":3.5}, {"label":"N", "x":7.5, "y":3.5}, {"label":"M", "x":8.5, "y":3.5}, {"label":",", "x":9.5, "y":3.5}, {"label":".", "x":10.5, "y":3.5}, {"label":"/", "x":11.5, "y":3.5}, {"label":"SHIFT", "x":12.5, "y":3.5}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5}, {"x":3.5, "y":4.5}, {"x":4.5, "y":4.5}, {"x":5.5, "y":4.5, "w":2}, {"x":7.5, "y":4.5, "w":2}, {"x":9.5, "y":4.5}, {"x":10.5, "y":4.5}, {"x":11.5, "y":4.5}, {"x":12.5, "y":4.5}]
+        },
+        "LAYOUT_ortho3": {
+            "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5}, {"label":"A", "x":2.5, "y":2.5}, {"label":"S", "x":3.5, "y":2.5}, {"label":"D", "x":4.5, "y":2.5}, {"label":"F", "x":5.5, "y":2.5}, {"label":"G", "x":6.5, "y":2.5}, {"label":"H", "x":7.5, "y":2.5}, {"label":"J", "x":8.5, "y":2.5}, {"label":"K", "x":9.5, "y":2.5}, {"label":"L", "x":10.5, "y":2.5}, {"label":";", "x":11.5, "y":2.5}, {"label":"ENTER", "x":12.5, "y":2.5}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5}, {"label":"Z", "x":2.5, "y":3.5}, {"label":"X", "x":3.5, "y":3.5}, {"label":"C", "x":4.5, "y":3.5}, {"label":"V", "x":5.5, "y":3.5}, {"label":"B", "x":6.5, "y":3.5}, {"label":"N", "x":7.5, "y":3.5}, {"label":"M", "x":8.5, "y":3.5}, {"label":",", "x":9.5, "y":3.5}, {"label":".", "x":10.5, "y":3.5}, {"label":"/", "x":11.5, "y":3.5}, {"label":"SHIFT", "x":12.5, "y":3.5}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5, "w":1.25}, {"x":2.75, "y":4.5}, {"x":3.75, "y":4.5, "w":1.25}, {"x":5, "y":4.5, "w":2.75}, {"x":7.75, "y":4.5, "w":2.25}, {"x":10, "y":4.5, "w":1.25}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.25}]
+        },
+        "LAYOUT_ortho4": {
+            "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5}, {"label":"A", "x":2.5, "y":2.5}, {"label":"S", "x":3.5, "y":2.5}, {"label":"D", "x":4.5, "y":2.5}, {"label":"F", "x":5.5, "y":2.5}, {"label":"G", "x":6.5, "y":2.5}, {"label":"H", "x":7.5, "y":2.5}, {"label":"J", "x":8.5, "y":2.5}, {"label":"K", "x":9.5, "y":2.5}, {"label":"L", "x":10.5, "y":2.5}, {"label":";", "x":11.5, "y":2.5}, {"label":"ENTER", "x":12.5, "y":2.5}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5}, {"label":"Z", "x":2.5, "y":3.5}, {"label":"X", "x":3.5, "y":3.5}, {"label":"C", "x":4.5, "y":3.5}, {"label":"V", "x":5.5, "y":3.5}, {"label":"B", "x":6.5, "y":3.5}, {"label":"N", "x":7.5, "y":3.5}, {"label":"M", "x":8.5, "y":3.5}, {"label":",", "x":9.5, "y":3.5}, {"label":".", "x":10.5, "y":3.5}, {"label":"/", "x":11.5, "y":3.5}, {"label":"SHIFT", "x":12.5, "y":3.5}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5, "w":1.25}, {"x":2.75, "y":4.5}, {"x":3.75, "y":4.5, "w":6.25}, {"x":10, "y":4.5, "w":1.25}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.25}]
+        },
+        "LAYOUT_ortho5": {
+            "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5}, {"label":"A", "x":2.5, "y":2.5}, {"label":"S", "x":3.5, "y":2.5}, {"label":"D", "x":4.5, "y":2.5}, {"label":"F", "x":5.5, "y":2.5}, {"label":"G", "x":6.5, "y":2.5}, {"label":"H", "x":7.5, "y":2.5}, {"label":"J", "x":8.5, "y":2.5}, {"label":"K", "x":9.5, "y":2.5}, {"label":"L", "x":10.5, "y":2.5}, {"label":";", "x":11.5, "y":2.5}, {"label":"ENTER", "x":12.5, "y":2.5}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5}, {"label":"Z", "x":2.5, "y":3.5}, {"label":"X", "x":3.5, "y":3.5}, {"label":"C", "x":4.5, "y":3.5}, {"label":"V", "x":5.5, "y":3.5}, {"label":"B", "x":6.5, "y":3.5}, {"label":"N", "x":7.5, "y":3.5}, {"label":"M", "x":8.5, "y":3.5}, {"label":",", "x":9.5, "y":3.5}, {"label":".", "x":10.5, "y":3.5}, {"label":"/", "x":11.5, "y":3.5}, {"label":"SHIFT", "x":12.5, "y":3.5}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5, "w":1.5}, {"x":4, "y":4.5, "w":7}, {"x":11, "y":4.5, "w":1.5}, {"x":12.5, "y":4.5}]
+        },
+        "LAYOUT_stagger1": {
+            "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5, "w":1.25}, {"label":"A", "x":2.75, "y":2.5}, {"label":"S", "x":3.75, "y":2.5}, {"label":"D", "x":4.75, "y":2.5}, {"label":"F", "x":5.75, "y":2.5}, {"label":"G", "x":6.75, "y":2.5}, {"label":"H", "x":7.75, "y":2.5}, {"label":"J", "x":8.75, "y":2.5}, {"label":"K", "x":9.75, "y":2.5}, {"label":"L", "x":10.75, "y":2.5}, {"label":"Enter", "x":11.75, "y":2.5, "w":1.75}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5, "w":1.75}, {"label":"Z", "x":3.25, "y":3.5}, {"label":"X", "x":4.25, "y":3.5}, {"label":"C", "x":5.25, "y":3.5}, {"label":"V", "x":6.25, "y":3.5}, {"label":"B", "x":7.25, "y":3.5}, {"label":"N", "x":8.25, "y":3.5}, {"label":"M", "x":9.25, "y":3.5}, {"label":",", "x":10.25, "y":3.5}, {"label":".", "x":11.25, "y":3.5}, {"label":"Shift", "x":12.25, "y":3.5, "w":1.25}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5}, {"x":3.5, "y":4.5}, {"x":4.5, "y":4.5}, {"x":5.5, "y":4.5}, {"x":6.5, "y":4.5, "w":2}, {"x":8.5, "y":4.5}, {"x":9.5, "y":4.5}, {"x":10.5, "y":4.5}, {"x":11.5, "y":4.5}, {"x":12.5, "y":4.5}]
+        },
+        "LAYOUT_stagger2": {
+            "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5, "w":1.25}, {"label":"A", "x":2.75, "y":2.5}, {"label":"S", "x":3.75, "y":2.5}, {"label":"D", "x":4.75, "y":2.5}, {"label":"F", "x":5.75, "y":2.5}, {"label":"G", "x":6.75, "y":2.5}, {"label":"H", "x":7.75, "y":2.5}, {"label":"J", "x":8.75, "y":2.5}, {"label":"K", "x":9.75, "y":2.5}, {"label":"L", "x":10.75, "y":2.5}, {"label":"Enter", "x":11.75, "y":2.5, "w":1.75}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5, "w":1.75}, {"label":"Z", "x":3.25, "y":3.5}, {"label":"X", "x":4.25, "y":3.5}, {"label":"C", "x":5.25, "y":3.5}, {"label":"V", "x":6.25, "y":3.5}, {"label":"B", "x":7.25, "y":3.5}, {"label":"N", "x":8.25, "y":3.5}, {"label":"M", "x":9.25, "y":3.5}, {"label":",", "x":10.25, "y":3.5}, {"label":".", "x":11.25, "y":3.5}, {"label":"Shift", "x":12.25, "y":3.5, "w":1.25}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5}, {"x":3.5, "y":4.5}, {"x":4.5, "y":4.5}, {"x":5.5, "y":4.5, "w":2}, {"x":7.5, "y":4.5, "w":2}, {"x":9.5, "y":4.5}, {"x":10.5, "y":4.5}, {"x":11.5, "y":4.5}, {"x":12.5, "y":4.5}]
+        },
+        "LAYOUT_stagger3": {
+            "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5, "w":1.25}, {"label":"A", "x":2.75, "y":2.5}, {"label":"S", "x":3.75, "y":2.5}, {"label":"D", "x":4.75, "y":2.5}, {"label":"F", "x":5.75, "y":2.5}, {"label":"G", "x":6.75, "y":2.5}, {"label":"H", "x":7.75, "y":2.5}, {"label":"J", "x":8.75, "y":2.5}, {"label":"K", "x":9.75, "y":2.5}, {"label":"L", "x":10.75, "y":2.5}, {"label":"Enter", "x":11.75, "y":2.5, "w":1.75}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5, "w":1.75}, {"label":"Z", "x":3.25, "y":3.5}, {"label":"X", "x":4.25, "y":3.5}, {"label":"C", "x":5.25, "y":3.5}, {"label":"V", "x":6.25, "y":3.5}, {"label":"B", "x":7.25, "y":3.5}, {"label":"N", "x":8.25, "y":3.5}, {"label":"M", "x":9.25, "y":3.5}, {"label":",", "x":10.25, "y":3.5}, {"label":".", "x":11.25, "y":3.5}, {"label":"Shift", "x":12.25, "y":3.5, "w":1.25}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5, "w":1.25}, {"x":2.75, "y":4.5}, {"x":3.75, "y":4.5, "w":1.25}, {"x":5, "y":4.5, "w":2.75}, {"x":7.75, "y":4.5, "w":2.25}, {"x":10, "y":4.5, "w":1.25}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.25}]
+        },
+        "LAYOUT_stagger4": {
+            "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5, "w":1.25}, {"label":"A", "x":2.75, "y":2.5}, {"label":"S", "x":3.75, "y":2.5}, {"label":"D", "x":4.75, "y":2.5}, {"label":"F", "x":5.75, "y":2.5}, {"label":"G", "x":6.75, "y":2.5}, {"label":"H", "x":7.75, "y":2.5}, {"label":"J", "x":8.75, "y":2.5}, {"label":"K", "x":9.75, "y":2.5}, {"label":"L", "x":10.75, "y":2.5}, {"label":"Enter", "x":11.75, "y":2.5, "w":1.75}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5, "w":1.75}, {"label":"Z", "x":3.25, "y":3.5}, {"label":"X", "x":4.25, "y":3.5}, {"label":"C", "x":5.25, "y":3.5}, {"label":"V", "x":6.25, "y":3.5}, {"label":"B", "x":7.25, "y":3.5}, {"label":"N", "x":8.25, "y":3.5}, {"label":"M", "x":9.25, "y":3.5}, {"label":",", "x":10.25, "y":3.5}, {"label":".", "x":11.25, "y":3.5}, {"label":"Shift", "x":12.25, "y":3.5, "w":1.25}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5, "w":1.25}, {"x":2.75, "y":4.5}, {"x":3.75, "y":4.5, "w":6.25}, {"x":10, "y":4.5, "w":1.25}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.25}]
+        },
+        "LAYOUT_stagger5": {
+            "layout": [{"label":"Knob", "x":0, "y":0}, {"x":1.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":0, "y":1.5}, {"label":"ESC", "x":1.5, "y":1.5}, {"label":"Q", "x":2.5, "y":1.5}, {"label":"W", "x":3.5, "y":1.5}, {"label":"E", "x":4.5, "y":1.5}, {"label":"R", "x":5.5, "y":1.5}, {"label":"T", "x":6.5, "y":1.5}, {"label":"Y", "x":7.5, "y":1.5}, {"label":"U", "x":8.5, "y":1.5}, {"label":"I", "x":9.5, "y":1.5}, {"label":"O", "x":10.5, "y":1.5}, {"label":"P", "x":11.5, "y":1.5}, {"label":"BKSPC", "x":12.5, "y":1.5}, {"x":0, "y":2.5}, {"label":"TAB", "x":1.5, "y":2.5, "w":1.25}, {"label":"A", "x":2.75, "y":2.5}, {"label":"S", "x":3.75, "y":2.5}, {"label":"D", "x":4.75, "y":2.5}, {"label":"F", "x":5.75, "y":2.5}, {"label":"G", "x":6.75, "y":2.5}, {"label":"H", "x":7.75, "y":2.5}, {"label":"J", "x":8.75, "y":2.5}, {"label":"K", "x":9.75, "y":2.5}, {"label":"L", "x":10.75, "y":2.5}, {"label":"Enter", "x":11.75, "y":2.5, "w":1.75}, {"x":0, "y":3.5}, {"label":"SHIFT", "x":1.5, "y":3.5, "w":1.75}, {"label":"Z", "x":3.25, "y":3.5}, {"label":"X", "x":4.25, "y":3.5}, {"label":"C", "x":5.25, "y":3.5}, {"label":"V", "x":6.25, "y":3.5}, {"label":"B", "x":7.25, "y":3.5}, {"label":"N", "x":8.25, "y":3.5}, {"label":"M", "x":9.25, "y":3.5}, {"label":",", "x":10.25, "y":3.5}, {"label":".", "x":11.25, "y":3.5}, {"label":"Shift", "x":12.25, "y":3.5, "w":1.25}, {"x":0, "y":4.5}, {"x":1.5, "y":4.5}, {"x":2.5, "y":4.5, "w":1.5}, {"x":4, "y":4.5, "w":7}, {"x":11, "y":4.5, "w":1.5}, {"x":12.5, "y":4.5}]
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/default/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/default/keymap.c
new file mode 100644
index 0000000000..bda0c900d0
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 eye oh designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY,
+    _FUNCTN,
+    _NUMBRS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_ortho1(
+        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F1,   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_F2,   KC_CAPS, KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,    KC_SCLN, KC_ENT,
+        KC_F3,   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_F4,   KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT, MO(_NUMBRS),  KC_SPACE,   MO(_FUNCTN), MO(_NUMBRS), KC_RALT, KC_RCTL, KC_RGUI
+         ),
+
+    [_FUNCTN] = LAYOUT_ortho1(
+        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT, KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
+        KC_F6,   KC_CAPS, KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT, KC_SCLN, KC_ENT,
+        KC_F7,   KC_LSFT, KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   KC_BSLS, KC_RSFT,
+        KC_F8,   KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT, MO(_NUMBRS),  KC_SPACE,    MO(_FUNCTN), MO(_NUMBRS), KC_RALT,  KC_RCTL, KC_RGUI
+         ),
+    [_NUMBRS] = LAYOUT_ortho1(
+        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F9,   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_F10,  KC_CAPS, KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,    KC_0,    KC_ENT,
+        KC_F11,  KC_LSFT, KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN, KC_RPRN, KC_RSFT,
+        KC_F12,  KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT, MO(_NUMBRS),  KC_SPACE,      MO(_FUNCTN), MO(_NUMBRS), KC_RALT, KC_RCTL, KC_RGUI
+         )
+};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/ortho2/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho2/keymap.c
new file mode 100644
index 0000000000..38d4bbfb47
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho2/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 eye oh designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY,
+    _FUNCTN,
+    _NUMBRS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_ortho2(
+        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F1,   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_F2,   KC_CAPS, KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,    KC_SCLN, KC_ENT,
+        KC_F3,   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_F4,   KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT,    MO(_NUMBRS),      KC_SPACE,         MO(_FUNCTN), KC_RALT, KC_RCTL, KC_RGUI
+         ),
+
+    [_FUNCTN] = LAYOUT_ortho2(
+        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT, KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
+        KC_F6,   KC_CAPS, KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT, KC_SCLN, KC_ENT,
+        KC_F7,   KC_LSFT, KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   KC_BSLS, KC_RSFT,
+        KC_F8,   KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT,    MO(_NUMBRS),      KC_SPACE,          MO(_FUNCTN), KC_RALT, KC_RCTL, KC_RGUI
+         ),
+    [_NUMBRS] = LAYOUT_ortho2(
+        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F9,   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_F10,  KC_CAPS, KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,    KC_0,    KC_ENT,
+        KC_F11,  KC_LSFT, KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN, KC_RPRN, KC_RSFT,
+        KC_F12,  KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT,    MO(_NUMBRS),        KC_SPACE,          MO(_FUNCTN), KC_RALT, KC_RCTL, KC_RGUI
+         )
+};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/ortho3/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho3/keymap.c
new file mode 100644
index 0000000000..d4dbd5aa92
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho3/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 eye oh designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY,
+    _FUNCTN,
+    _NUMBRS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_ortho3(
+        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F1,   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_F2,   KC_CAPS, KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,    KC_SCLN, KC_ENT,
+        KC_F3,   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_F4,   KC_LCTL, KC_LGUI, KC_LALT,         MO(_NUMBRS),      KC_SPACE,                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
+         ),
+
+    [_FUNCTN] = LAYOUT_ortho3(
+        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT, KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
+        KC_F6,   KC_CAPS, KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT, KC_SCLN, KC_ENT,
+        KC_F7,   KC_LSFT, KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   KC_BSLS, KC_RSFT,
+        KC_F8,   KC_LCTL, KC_LGUI, KC_LALT,         MO(_NUMBRS),      KC_SPACE,                   MO(_FUNCTN),       KC_RCTL,    KC_RGUI
+         ),
+    [_NUMBRS] = LAYOUT_ortho3(
+        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F9,   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_F10,  KC_CAPS, KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,    KC_0,    KC_ENT,
+        KC_F11,  KC_LSFT, KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN, KC_RPRN, KC_RSFT,
+        KC_F12,  KC_LCTL, KC_LGUI, KC_LALT,         MO(_NUMBRS),      KC_SPACE,                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
+         )
+};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/ortho4/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho4/keymap.c
new file mode 100644
index 0000000000..2c9f792e51
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho4/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 eye oh designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY,
+    _FUNCTN,
+    _NUMBRS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_ortho4(
+        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F1,   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_F2,   KC_CAPS, KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,    KC_SCLN, KC_ENT,
+        KC_F3,   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_F4,   KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
+         ),
+
+    [_FUNCTN] = LAYOUT_ortho4(
+        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT, KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
+        KC_F6,   KC_CAPS, KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT, KC_SCLN, KC_ENT,
+        KC_F7,   KC_LSFT, KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   KC_BSLS, KC_RSFT,
+        KC_F8,   KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
+         ),
+    [_NUMBRS] = LAYOUT_ortho4(
+        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F9,   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_F10,  KC_CAPS, KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,    KC_0,    KC_ENT,
+        KC_F11,  KC_LSFT, KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN, KC_RPRN, KC_RSFT,
+        KC_F12,  KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
+         )
+};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/ortho5/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho5/keymap.c
new file mode 100644
index 0000000000..09fc9e5fac
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/ortho5/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 eye oh designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY,
+    _FUNCTN,
+    _NUMBRS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_ortho5(
+        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F1,   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_F2,   KC_CAPS, KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,    KC_SCLN, KC_ENT,
+        KC_F3,   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_F4,   KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                                    MO(_FUNCTN),  KC_RGUI
+         ),
+
+    [_FUNCTN] = LAYOUT_ortho5(
+        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT, KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
+        KC_F6,   KC_CAPS, KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT, KC_SCLN, KC_ENT,
+        KC_F7,   KC_LSFT, KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   KC_BSLS, KC_RSFT,
+        KC_F8,   KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                                    MO(_FUNCTN),  KC_RGUI
+         ),
+    [_NUMBRS] = LAYOUT_ortho5(
+        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F9,   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_F10,  KC_CAPS, KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,    KC_0,    KC_ENT,
+        KC_F11,  KC_LSFT, KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN, KC_RPRN, KC_RSFT,
+        KC_F12,  KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                                    MO(_FUNCTN),  KC_RGUI
+         )
+};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger1/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger1/keymap.c
new file mode 100644
index 0000000000..f0a19ce659
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger1/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 eye oh designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY,
+    _FUNCTN,
+    _NUMBRS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_stagger1(
+        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F1,   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_F2,   KC_CAPS,   KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,        KC_SCLN,
+        KC_F3,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,      KC_B,    KC_N, KC_M,        KC_COMM,     KC_DOT, RSFT_T(KC_SLSH),
+        KC_F4,   KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT, MO(_NUMBRS),  KC_SPACE,   MO(_FUNCTN), MO(_NUMBRS), KC_RALT, KC_RCTL, KC_RGUI
+         ),
+
+    [_FUNCTN] = LAYOUT_stagger1(
+        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
+        KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
+        KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
+        KC_F8,   KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT, MO(_NUMBRS),  KC_SPACE,    MO(_FUNCTN), MO(_NUMBRS), KC_RALT,  KC_RCTL, KC_RGUI
+         ),
+    [_NUMBRS] = LAYOUT_stagger1(
+        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F9,   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_F10,  KC_CAPS,   KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,         KC_0,    
+        KC_F11,  KC_LSFT,       KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN,    KC_RPRN,
+        KC_F12,  KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT, MO(_NUMBRS),  KC_SPACE,      MO(_FUNCTN), MO(_NUMBRS), KC_RALT, KC_RCTL, KC_RGUI
+         )
+};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger2/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger2/keymap.c
new file mode 100644
index 0000000000..189e584371
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger2/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 eye oh designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY,
+    _FUNCTN,
+    _NUMBRS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_stagger2(
+        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F1,   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_F2,   KC_CAPS,   KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,        KC_SCLN,
+        KC_F3,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,      KC_B,    KC_N, KC_M,        KC_COMM,     KC_DOT, RSFT_T(KC_SLSH),
+        KC_F4,   KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT,    MO(_NUMBRS),      KC_SPACE,         MO(_FUNCTN), KC_RALT, KC_RCTL, KC_RGUI
+         ),
+
+    [_FUNCTN] = LAYOUT_stagger2(
+        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
+        KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
+        KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
+        KC_F8,   KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT,    MO(_NUMBRS),      KC_SPACE,         MO(_FUNCTN), KC_RALT, KC_RCTL, KC_RGUI
+         ),
+    [_NUMBRS] = LAYOUT_stagger2(
+        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F9,   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_F10,  KC_CAPS,   KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,         KC_0,    
+        KC_F11,  KC_LSFT,       KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN,    KC_RPRN,
+        KC_F12,  KC_LCTL, KC_LGUI, MO(_FUNCTN), KC_LALT,    MO(_NUMBRS),      KC_SPACE,         MO(_FUNCTN), KC_RALT, KC_RCTL, KC_RGUI
+         )
+};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger3/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger3/keymap.c
new file mode 100644
index 0000000000..da25899479
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger3/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 eye oh designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY,
+    _FUNCTN,
+    _NUMBRS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_stagger3(
+        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F1,   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_F2,   KC_CAPS,   KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,        KC_SCLN,
+        KC_F3,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,      KC_B,    KC_N, KC_M,        KC_COMM,     KC_DOT, RSFT_T(KC_SLSH),
+        KC_F4,   KC_LCTL, KC_LGUI, KC_LALT,         MO(_NUMBRS),      KC_SPACE,                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
+         ),
+
+    [_FUNCTN] = LAYOUT_stagger3(
+        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
+        KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
+        KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
+        KC_F8,   KC_LCTL, KC_LGUI, KC_LALT,         MO(_NUMBRS),      KC_SPACE,                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
+         ),
+    [_NUMBRS] = LAYOUT_stagger3(
+        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F9,   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_F10,  KC_CAPS,   KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,         KC_0,    
+        KC_F11,  KC_LSFT,       KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN,    KC_RPRN,
+        KC_F12,  KC_LCTL, KC_LGUI, KC_LALT,         MO(_NUMBRS),      KC_SPACE,                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
+         )
+};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger4/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger4/keymap.c
new file mode 100644
index 0000000000..2a4910965c
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger4/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 eye oh designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY,
+    _FUNCTN,
+    _NUMBRS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_stagger4(
+        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F1,   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_F2,   KC_CAPS,   KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,        KC_SCLN,
+        KC_F3,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,      KC_B,    KC_N, KC_M,        KC_COMM,     KC_DOT, RSFT_T(KC_SLSH),
+        KC_F4,   KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
+         ),
+
+    [_FUNCTN] = LAYOUT_stagger4(
+        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
+        KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
+        KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
+        KC_F8,   KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
+         ),
+    [_NUMBRS] = LAYOUT_stagger4(
+        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F9,   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_F10,  KC_CAPS,   KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,         KC_0,    
+        KC_F11,  KC_LSFT,       KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN,    KC_RPRN,
+        KC_F12,  KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                   MO(_FUNCTN),     KC_RCTL,    KC_RGUI
+         )
+};
diff --git a/keyboards/eyeohdesigns/theboulevard/keymaps/stagger5/keymap.c b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger5/keymap.c
new file mode 100644
index 0000000000..367cf1ccb5
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/keymaps/stagger5/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2021 eye oh designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _QWERTY,
+    _FUNCTN,
+    _NUMBRS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_stagger5(
+        KC_MUTE, KC_ESC,                                                                                     RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F1,   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_F2,   KC_CAPS,   KC_A,    KC_S,        KC_D,    KC_F,      KC_G,    KC_H, KC_J,        KC_K,        KC_L,        KC_SCLN,
+        KC_F3,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,      KC_B,    KC_N, KC_M,        KC_COMM,     KC_DOT, RSFT_T(KC_SLSH),
+        KC_F4,   KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                                    MO(_FUNCTN),  KC_RGUI
+         ),
+
+    [_FUNCTN] = LAYOUT_stagger5(
+        RESET,   RGB_TOG,                                                                                     RGB_HUD,  RGB_VAD, RGB_SAD,
+        KC_F5,   KC_TAB,  KC_Q,    KC_PGUP,     KC_E,    KC_R,    KC_T,    KC_QUOT,    KC_U,        KC_UP,       KC_O,     KC_P,    KC_BSPC,
+        KC_F6,   KC_CAPS,   KC_HOME, KC_PGDN,     KC_END,  KC_F,    KC_MINS, KC_EQL,  KC_LEFT,     KC_DOWN,     KC_RIGHT,          KC_ENT,
+        KC_F7,   KC_LSFT,       KC_Z,    KC_X,        KC_C,    KC_V,    KC_LBRC, KC_RBRC, KC_M,        KC_COMM,     KC_DOT,   RSFT_T(KC_BSLS),
+        KC_F8,   KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                                    MO(_FUNCTN),  KC_RGUI
+         ),
+    [_NUMBRS] = LAYOUT_stagger5(
+        KC_MUTE, KC_GRAVE,                                                                                      RGB_HUI, RGB_VAI, RGB_SAI,
+        KC_F9,   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_F10,  KC_CAPS,   KC_1,    KC_2,        KC_3,    KC_4,      KC_5,    KC_6,    KC_7,        KC_8,        KC_9,         KC_0,    
+        KC_F11,  KC_LSFT,       KC_EXLM, KC_AT,       KC_HASH, KC_DLR,    KC_PERC, KC_CIRC, KC_AMPR,     KC_ASTR,     KC_LPRN,    KC_RPRN,
+        KC_F12,  KC_LCTL,     KC_LALT,                      LT(_NUMBRS,KC_SPC),                                    MO(_FUNCTN),  KC_RGUI
+         )
+};
diff --git a/keyboards/eyeohdesigns/theboulevard/readme.md b/keyboards/eyeohdesigns/theboulevard/readme.md
new file mode 100644
index 0000000000..c1f29becb7
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/readme.md
@@ -0,0 +1,21 @@
+# theboulevard
+
+![theboulevard](https://i.imgur.com/LavWn91.jpg)
+
+The Boulevard is an open source battlestation style keyboard.
+
+* Keyboard Maintainer: [eye oh designs](https://github.com/yourusername)
+* Hardware Supported: The Boulevard ver 1.00
+* Hardware Availability: https://github.com/joedinkle/eyeohdesigns
+
+Make example for this keyboard (after setting up your build environment):
+
+    make eyeohdesigns/theboulevard:default
+
+Flashing example for this keyboard:
+
+    make eyeohdesigns/theboulevard:default:flash
+
+To enter the bootloader, either depress the reset button on the back of the PCB, or use the 'RESET' keycode found on the function layer.
+
+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).
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/theboulevard/rules.mk b/keyboards/eyeohdesigns/theboulevard/rules.mk
new file mode 100644
index 0000000000..824dd0089f
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/theboulevard/theboulevard.c b/keyboards/eyeohdesigns/theboulevard/theboulevard.c
new file mode 100644
index 0000000000..a2b40cd9e9
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/theboulevard.c
@@ -0,0 +1,31 @@
+/* Copyright 2021 eye oh designs
+ *
+ * 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 "theboulevard.h" 
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/theboulevard/theboulevard.h b/keyboards/eyeohdesigns/theboulevard/theboulevard.h
new file mode 100644
index 0000000000..0b4828a1b1
--- /dev/null
+++ b/keyboards/eyeohdesigns/theboulevard/theboulevard.h
@@ -0,0 +1,169 @@
+/* Copyright 2021 eye oh designs
+ *
+ * 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_ortho1( \
+    k00, k01,                                                           k0a, k0b, k0c, \
+    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
+	k20, k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, k2b, k2c, \
+	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
+	k40, k41,   k42,   k43,   k44,   k45,      k47,       k48,   k49,   k4a, k4b, k4c  \
+) \
+{ \
+    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
+    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
+	{ k20, k21, k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, k2b, k2c },\
+	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
+	{ k40, k41, k42,   k43,   k44,   k45,      k47,       k48,   k49,   k4a, k4b, k4c }\
+}
+
+#define LAYOUT_ortho2( \
+    k00, k01,                                                           k0a, k0b, k0c, \
+    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
+	k20, k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, k2b, k2c, \
+	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
+	k40, k41,   k42,   k43,   k44,       k45,          k48,      k49,   k4a, k4b, k4c  \
+) \
+{ \
+    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
+    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
+	{ k20, k21, k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, k2b, k2c },\
+	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
+	{ k40, k41, k42,   k43,   k44,   k45,   KC_NO, KC_NO, k48,   k49,   k4a, k4b, k4c }\
+}
+
+#define LAYOUT_ortho3( \
+    k00, k01,                                                           k0a, k0b, k0c, \
+    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
+	k20, k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, k2b, k2c, \
+	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
+	k40, k41,   k42,   k43,          k45,          k48,                 k4a, k4b, k4c  \
+) \
+{ \
+    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
+    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
+	{ k20, k21, k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, k2b, k2c },\
+	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
+	{ k40, k41, k42,   k43,   KC_NO, k45,   KC_NO, KC_NO, k48,   KC_NO, k4a, k4b, k4c }\
+}
+
+#define LAYOUT_ortho4( \
+    k00, k01,                                                           k0a, k0b, k0c, \
+    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
+	k20, k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, k2b, k2c, \
+	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
+	k40, k41,   k42,                    k46,                            k4a, k4b, k4c  \
+) \
+{ \
+    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
+    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
+	{ k20, k21, k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, k2b, k2c },\
+	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
+	{ k40, k41, k42,   KC_NO, KC_NO, KC_NO, k46,   KC_NO, KC_NO, KC_NO, k4a, k4b, k4c }\
+}
+
+#define LAYOUT_ortho5( \
+    k00, k01,                                                           k0a, k0b, k0c, \
+    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
+	k20, k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, k2b, k2c, \
+	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
+	k40, k41,   k42,                    k47,                                 k4b, k4c  \
+) \
+{ \
+    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a,   k0b, k0c },\
+    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a,   k1b, k1c },\
+	{ k20, k21, k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,   k2b, k2c },\
+	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a,   k3b, k3c }, \
+	{ k40, k41, k42,   KC_NO, KC_NO, KC_NO, KC_NO, k47,   KC_NO, KC_NO, KC_NO, k4b, k4c }\
+}
+
+#define LAYOUT_stagger1( \
+    k00, k01,                                                           k0a, k0b, k0c, \
+    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
+	k20, k21,          k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,      k2c, \
+	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
+	k40, k41,   k42,   k43,   k44,   k45,      k47,       k48,   k49,   k4a, k4b, k4c  \
+) \
+{ \
+    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
+    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
+	{ k20, k21, KC_NO,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
+	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
+	{ k40, k41, k42,   k43,   k44,   k45,      k47,       k48,   k49,   k4a, k4b, k4c }\
+}
+
+#define LAYOUT_stagger2( \
+    k00, k01,                                                           k0a, k0b, k0c, \
+    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
+	k20, k21,          k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,      k2c, \
+	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
+	k40, k41,   k42,   k43,   k44,       k45,          k48,      k49,   k4a, k4b, k4c  \
+) \
+{ \
+    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
+    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
+	{ k20, k21, KC_NO,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
+	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
+	{ k40, k41, k42,   k43,   k44,   k45,   KC_NO, KC_NO, k48,   k49,   k4a, k4b, k4c }\
+}
+
+#define LAYOUT_stagger3( \
+    k00, k01,                                                           k0a, k0b, k0c, \
+    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
+	k20, k21,          k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,      k2c, \
+	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
+	k40, k41,   k42,   k43,          k45,          k48,                 k4a, k4b, k4c  \
+) \
+{ \
+    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
+    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
+	{ k20, k21, KC_NO,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
+	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
+	{ k40, k41, k42,   k43,   KC_NO, k45,   KC_NO, KC_NO, k48,   KC_NO, k4a, k4b, k4c }\
+}
+
+#define LAYOUT_stagger4( \
+    k00, k01,                                                           k0a, k0b, k0c, \
+    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
+	k20, k21,          k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,      k2c, \
+	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
+	k40, k41,   k42,                    k46,                            k4a, k4b, k4c  \
+) \
+{ \
+    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
+    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
+	{ k20, k21, KC_NO,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
+	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
+	{ k40, k41, k42,   KC_NO, KC_NO, KC_NO, k46,   KC_NO, KC_NO, KC_NO, k4a, k4b, k4c }\
+}
+
+#define LAYOUT_stagger5( \
+    k00, k01,                                                           k0a, k0b, k0c, \
+    k10, k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c, \
+	k20, k21,          k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a,      k2c, \
+	k30, k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c, \
+	k40, k41,   k42,                    k47,                                 k4b, k4c  \
+) \
+{ \
+    { k00, k01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, k0a, k0b, k0c },\
+    { k10, k11, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1a, k1b, k1c },\
+	{ k20, k21, KC_NO,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2a, KC_NO, k2c },\
+	{ k30, k31, k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3a, k3b, k3c }, \
+	{ k40, k41, k42,   KC_NO, KC_NO, KC_NO, KC_NO, k47,   KC_NO, KC_NO, KC_NO, k4b, k4c }\
+}

From 909003cce92ada1094d40ef4ea31574227070d31 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 21 Jan 2022 20:59:19 -0800
Subject: [PATCH 345/867] [Bug] Fix hack for chibiOS reset name (#15984)

---
 quantum/keymap.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quantum/keymap.h b/quantum/keymap.h
index 191e813977..3fc41cafd8 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -35,9 +35,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keycode_config.h"
 
 // ChibiOS uses RESET in its FlagStatus enumeration
-// Therefore define it as QK_RESET here, to avoid name collision
+// Therefore define it as QK_BOOTLOADER here, to avoid name collision
 #if defined(PROTOCOL_CHIBIOS)
-#    define RESET QK_RESET
+#    define RESET QK_BOOTLOADER
 #endif
 // Gross hack, remove me and change RESET keycode to QK_BOOT
 #if defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__)

From 814821727e0107a2cf3247eb807ed1f3703b7327 Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Sat, 22 Jan 2022 12:31:27 +0700
Subject: [PATCH 346/867] [Keyboard] Move Handwired K552 into my folder name
 (#15973)

---
 .../handwired_k552}/boards/k552/board.c            |  0
 .../handwired_k552}/boards/k552/board.h            |  0
 .../handwired_k552}/boards/k552/board.mk           |  0
 .../k552 => horrortroll/handwired_k552}/chconf.h   |  7 ++-----
 .../k552 => horrortroll/handwired_k552}/config.h   | 14 +++++++-------
 .../k552 => horrortroll/handwired_k552}/halconf.h  |  4 ++--
 .../handwired_k552/handwired_k552.c}               |  2 +-
 .../handwired_k552/handwired_k552.h}               |  0
 .../k552 => horrortroll/handwired_k552}/info.json  |  2 +-
 .../handwired_k552}/keymaps/default/keymap.c       |  0
 .../handwired_k552/keymaps/default}/keymap_stuff.h |  6 +-----
 .../keymaps/default/led/cool_diagonal.c            |  0
 .../keymaps/default/led/custom_gradient.c          |  0
 .../handwired_k552}/keymaps/default/led/diagonal.c |  0
 .../handwired_k552}/keymaps/default/led/kitt.c     |  0
 .../keymaps/default/led/random_breath_rainbow.c    |  0
 .../keymaps/default/oled/oled_stuff.h              |  0
 .../handwired_k552}/keymaps/default/readme.md      |  0
 .../keymaps/default/rgb_matrix_user.inc            |  0
 .../handwired_k552}/keymaps/default/rules.mk       |  0
 .../handwired_k552}/keymaps/via/config.h           |  4 ++++
 .../handwired_k552}/keymaps/via/keymap.c           |  0
 .../handwired_k552/keymaps/via}/keymap_stuff.h     |  6 +-----
 .../keymaps/via/led/cool_diagonal.c                |  0
 .../keymaps/via/led/custom_gradient.c              |  0
 .../handwired_k552}/keymaps/via/led/diagonal.c     |  0
 .../handwired_k552}/keymaps/via/led/kitt.c         |  0
 .../keymaps/via/led/random_breath_rainbow.c        |  0
 .../handwired_k552}/keymaps/via/oled/oled_stuff.h  |  0
 .../handwired_k552}/keymaps/via/readme.md          |  0
 .../keymaps/via/rgb_matrix_user.inc                |  0
 .../handwired_k552}/keymaps/via/rules.mk           |  0
 .../handwired_k552}/ld/k552_f103.ld                |  0
 .../handwired_k552}/lib/bongocat.c                 |  0
 .../handwired_k552}/lib/galaxy.c                   |  0
 .../handwired_k552}/lib/glcdfont.c                 |  0
 .../k552 => horrortroll/handwired_k552}/lib/logo.c |  0
 .../k552 => horrortroll/handwired_k552}/lib/wave.c |  0
 .../k552 => horrortroll/handwired_k552}/mcuconf.h  |  4 ++--
 .../k552 => horrortroll/handwired_k552}/readme.md  |  6 +++---
 .../k552 => horrortroll/handwired_k552}/rules.mk   |  0
 41 files changed, 24 insertions(+), 31 deletions(-)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/boards/k552/board.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/boards/k552/board.h (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/boards/k552/board.mk (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/chconf.h (80%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/config.h (93%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/halconf.h (80%)
 rename keyboards/{handwired/horrortroll/k552/k552.c => horrortroll/handwired_k552/handwired_k552.c} (98%)
 rename keyboards/{handwired/horrortroll/k552/k552.h => horrortroll/handwired_k552/handwired_k552.h} (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/info.json (99%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/default/keymap.c (100%)
 rename keyboards/{handwired/horrortroll/k552/keymaps/via => horrortroll/handwired_k552/keymaps/default}/keymap_stuff.h (98%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/default/led/cool_diagonal.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/default/led/custom_gradient.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/default/led/diagonal.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/default/led/kitt.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/default/led/random_breath_rainbow.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/default/oled/oled_stuff.h (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/default/readme.md (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/default/rgb_matrix_user.inc (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/default/rules.mk (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/via/config.h (91%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/via/keymap.c (100%)
 rename keyboards/{handwired/horrortroll/k552/keymaps/default => horrortroll/handwired_k552/keymaps/via}/keymap_stuff.h (98%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/via/led/cool_diagonal.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/via/led/custom_gradient.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/via/led/diagonal.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/via/led/kitt.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/via/led/random_breath_rainbow.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/via/oled/oled_stuff.h (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/via/readme.md (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/via/rgb_matrix_user.inc (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/keymaps/via/rules.mk (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/ld/k552_f103.ld (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/lib/bongocat.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/lib/galaxy.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/lib/glcdfont.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/lib/logo.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/lib/wave.c (100%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/mcuconf.h (79%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/readme.md (86%)
 rename keyboards/{handwired/horrortroll/k552 => horrortroll/handwired_k552}/rules.mk (100%)

diff --git a/keyboards/handwired/horrortroll/k552/boards/k552/board.c b/keyboards/horrortroll/handwired_k552/boards/k552/board.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/boards/k552/board.c
rename to keyboards/horrortroll/handwired_k552/boards/k552/board.c
diff --git a/keyboards/handwired/horrortroll/k552/boards/k552/board.h b/keyboards/horrortroll/handwired_k552/boards/k552/board.h
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/boards/k552/board.h
rename to keyboards/horrortroll/handwired_k552/boards/k552/board.h
diff --git a/keyboards/handwired/horrortroll/k552/boards/k552/board.mk b/keyboards/horrortroll/handwired_k552/boards/k552/board.mk
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/boards/k552/board.mk
rename to keyboards/horrortroll/handwired_k552/boards/k552/board.mk
diff --git a/keyboards/handwired/horrortroll/k552/chconf.h b/keyboards/horrortroll/handwired_k552/chconf.h
similarity index 80%
rename from keyboards/handwired/horrortroll/k552/chconf.h
rename to keyboards/horrortroll/handwired_k552/chconf.h
index 41c38c33e4..4ad4a3be34 100644
--- a/keyboards/handwired/horrortroll/k552/chconf.h
+++ b/keyboards/horrortroll/handwired_k552/chconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 QMK
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
  *
  * 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
@@ -16,14 +16,11 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/wolfmarkclub/wm1/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/horrortroll/handwired_k552/chconf.h -r platforms/chibios/common/configs/chconf.h`
  */
 
 #pragma once
 
 #define CH_CFG_ST_TIMEDELTA 0
 
-#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
-
 #include_next <chconf.h>
-
diff --git a/keyboards/handwired/horrortroll/k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
similarity index 93%
rename from keyboards/handwired/horrortroll/k552/config.h
rename to keyboards/horrortroll/handwired_k552/config.h
index 1071b7ff31..87908a1dcd 100644
--- a/keyboards/handwired/horrortroll/k552/config.h
+++ b/keyboards/horrortroll/handwired_k552/config.h
@@ -19,23 +19,26 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x7516 //Redragon
+#define VENDOR_ID       0x7516
 #define PRODUCT_ID      0x5104
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Redragon
+#define MANUFACTURER    HorrorTroll
 #define PRODUCT         K552 Kumara
 
 /* Key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
 
-/* Key matrix pin           0    1,   2,  3,  4,  5,  6,   7,   8,  9, 10, 11, 12,  13, 14, 15, 16 */
+/* key matrix pins */
 #define MATRIX_ROW_PINS { C12, C10, A10, A8, C8, C9 }
 #define MATRIX_COL_PINS { B15,  C6,  C7, A3, A1, C3, C1, B14, B13, A9, B3, B4, A0, C11, A2, C0, C2 }
 
-/* Direction of diode (COL2ROW or ROW2COL) */
+/* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
 /* Bootmagic reset */
 #define BOOTMAGIC_LITE_ROW 4
 #define BOOTMAGIC_LITE_COLUMN 6
@@ -47,9 +50,6 @@
 #define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 12
 
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
 /* EEPROM size */
 #define EEPROM_PAGE_SIZE
 #define FEE_PAGE_SIZE 0x800
diff --git a/keyboards/handwired/horrortroll/k552/halconf.h b/keyboards/horrortroll/handwired_k552/halconf.h
similarity index 80%
rename from keyboards/handwired/horrortroll/k552/halconf.h
rename to keyboards/horrortroll/handwired_k552/halconf.h
index e872252b6e..2ef68f8fb2 100644
--- a/keyboards/handwired/horrortroll/k552/halconf.h
+++ b/keyboards/horrortroll/handwired_k552/halconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 QMK
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
  *
  * 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
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/wolfmarkclub/wm1/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/horrortroll/handwired_k552/halconf.h -r platforms/chibios/common/configs/halconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/horrortroll/k552/k552.c b/keyboards/horrortroll/handwired_k552/handwired_k552.c
similarity index 98%
rename from keyboards/handwired/horrortroll/k552/k552.c
rename to keyboards/horrortroll/handwired_k552/handwired_k552.c
index 31ce5d1bbf..31012d8a33 100644
--- a/keyboards/handwired/horrortroll/k552/k552.c
+++ b/keyboards/horrortroll/handwired_k552/handwired_k552.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "k552.h"
+#include "handwired_k552.h"
 
 // OLED animation
 #include "lib/logo.c"
diff --git a/keyboards/handwired/horrortroll/k552/k552.h b/keyboards/horrortroll/handwired_k552/handwired_k552.h
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/k552.h
rename to keyboards/horrortroll/handwired_k552/handwired_k552.h
diff --git a/keyboards/handwired/horrortroll/k552/info.json b/keyboards/horrortroll/handwired_k552/info.json
similarity index 99%
rename from keyboards/handwired/horrortroll/k552/info.json
rename to keyboards/horrortroll/handwired_k552/info.json
index d7cbb2b448..2db30bb552 100644
--- a/keyboards/handwired/horrortroll/k552/info.json
+++ b/keyboards/horrortroll/handwired_k552/info.json
@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "Redragon K552 Kumara",
+    "keyboard_name": "Handwired K552 Kumara",
     "url": "",
     "maintainer": "HorrorTroll",
     "layouts": {
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/keymap.c b/keyboards/horrortroll/handwired_k552/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/keymap.c
rename to keyboards/horrortroll/handwired_k552/keymaps/default/keymap.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/keymap_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h
similarity index 98%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/keymap_stuff.h
rename to keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h
index c328e03e00..a97b46e5e4 100644
--- a/keyboards/handwired/horrortroll/k552/keymaps/via/keymap_stuff.h
+++ b/keyboards/horrortroll/handwired_k552/keymaps/default/keymap_stuff.h
@@ -14,10 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rgb_matrix.h"
-#include "progmem.h"
-#include "config.h"
-#include "eeprom.h"
 #include <string.h>
 #include <math.h>
 
@@ -84,7 +80,7 @@ enum layer_keycodes {
     RGB_C_E,             //Cycle user effect
 };
 
-void keyboard_post_init_kb(void) {
+void keyboard_post_init_user(void) {
     user_config.raw = eeconfig_read_user();
     switch (user_config.rgb_mode) {
         case RGB_MODE_ALL:
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/cool_diagonal.c b/keyboards/horrortroll/handwired_k552/keymaps/default/led/cool_diagonal.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/led/cool_diagonal.c
rename to keyboards/horrortroll/handwired_k552/keymaps/default/led/cool_diagonal.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/custom_gradient.c b/keyboards/horrortroll/handwired_k552/keymaps/default/led/custom_gradient.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/led/custom_gradient.c
rename to keyboards/horrortroll/handwired_k552/keymaps/default/led/custom_gradient.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/diagonal.c b/keyboards/horrortroll/handwired_k552/keymaps/default/led/diagonal.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/led/diagonal.c
rename to keyboards/horrortroll/handwired_k552/keymaps/default/led/diagonal.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/kitt.c b/keyboards/horrortroll/handwired_k552/keymaps/default/led/kitt.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/led/kitt.c
rename to keyboards/horrortroll/handwired_k552/keymaps/default/led/kitt.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/led/random_breath_rainbow.c b/keyboards/horrortroll/handwired_k552/keymaps/default/led/random_breath_rainbow.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/led/random_breath_rainbow.c
rename to keyboards/horrortroll/handwired_k552/keymaps/default/led/random_breath_rainbow.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/oled/oled_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/default/oled/oled_stuff.h
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/oled/oled_stuff.h
rename to keyboards/horrortroll/handwired_k552/keymaps/default/oled/oled_stuff.h
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/readme.md b/keyboards/horrortroll/handwired_k552/keymaps/default/readme.md
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/readme.md
rename to keyboards/horrortroll/handwired_k552/keymaps/default/readme.md
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/rgb_matrix_user.inc b/keyboards/horrortroll/handwired_k552/keymaps/default/rgb_matrix_user.inc
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/rgb_matrix_user.inc
rename to keyboards/horrortroll/handwired_k552/keymaps/default/rgb_matrix_user.inc
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/rules.mk b/keyboards/horrortroll/handwired_k552/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/rules.mk
rename to keyboards/horrortroll/handwired_k552/keymaps/default/rules.mk
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/config.h b/keyboards/horrortroll/handwired_k552/keymaps/via/config.h
similarity index 91%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/config.h
rename to keyboards/horrortroll/handwired_k552/keymaps/via/config.h
index a36ce468bc..ba3e8e9a03 100644
--- a/keyboards/handwired/horrortroll/k552/keymaps/via/config.h
+++ b/keyboards/horrortroll/handwired_k552/keymaps/via/config.h
@@ -17,3 +17,7 @@
 #pragma once
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
+
+#ifdef RGB_MATRIX_ENABLE
+    #define VIA_QMK_RGBLIGHT_ENABLE
+#endif
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/keymap.c b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/keymap.c
rename to keyboards/horrortroll/handwired_k552/keymaps/via/keymap.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/default/keymap_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
similarity index 98%
rename from keyboards/handwired/horrortroll/k552/keymaps/default/keymap_stuff.h
rename to keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
index c328e03e00..a97b46e5e4 100644
--- a/keyboards/handwired/horrortroll/k552/keymaps/default/keymap_stuff.h
+++ b/keyboards/horrortroll/handwired_k552/keymaps/via/keymap_stuff.h
@@ -14,10 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rgb_matrix.h"
-#include "progmem.h"
-#include "config.h"
-#include "eeprom.h"
 #include <string.h>
 #include <math.h>
 
@@ -84,7 +80,7 @@ enum layer_keycodes {
     RGB_C_E,             //Cycle user effect
 };
 
-void keyboard_post_init_kb(void) {
+void keyboard_post_init_user(void) {
     user_config.raw = eeconfig_read_user();
     switch (user_config.rgb_mode) {
         case RGB_MODE_ALL:
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/cool_diagonal.c b/keyboards/horrortroll/handwired_k552/keymaps/via/led/cool_diagonal.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/led/cool_diagonal.c
rename to keyboards/horrortroll/handwired_k552/keymaps/via/led/cool_diagonal.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/custom_gradient.c b/keyboards/horrortroll/handwired_k552/keymaps/via/led/custom_gradient.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/led/custom_gradient.c
rename to keyboards/horrortroll/handwired_k552/keymaps/via/led/custom_gradient.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/diagonal.c b/keyboards/horrortroll/handwired_k552/keymaps/via/led/diagonal.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/led/diagonal.c
rename to keyboards/horrortroll/handwired_k552/keymaps/via/led/diagonal.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/kitt.c b/keyboards/horrortroll/handwired_k552/keymaps/via/led/kitt.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/led/kitt.c
rename to keyboards/horrortroll/handwired_k552/keymaps/via/led/kitt.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/led/random_breath_rainbow.c b/keyboards/horrortroll/handwired_k552/keymaps/via/led/random_breath_rainbow.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/led/random_breath_rainbow.c
rename to keyboards/horrortroll/handwired_k552/keymaps/via/led/random_breath_rainbow.c
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/oled/oled_stuff.h b/keyboards/horrortroll/handwired_k552/keymaps/via/oled/oled_stuff.h
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/oled/oled_stuff.h
rename to keyboards/horrortroll/handwired_k552/keymaps/via/oled/oled_stuff.h
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/readme.md b/keyboards/horrortroll/handwired_k552/keymaps/via/readme.md
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/readme.md
rename to keyboards/horrortroll/handwired_k552/keymaps/via/readme.md
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/rgb_matrix_user.inc b/keyboards/horrortroll/handwired_k552/keymaps/via/rgb_matrix_user.inc
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/rgb_matrix_user.inc
rename to keyboards/horrortroll/handwired_k552/keymaps/via/rgb_matrix_user.inc
diff --git a/keyboards/handwired/horrortroll/k552/keymaps/via/rules.mk b/keyboards/horrortroll/handwired_k552/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/keymaps/via/rules.mk
rename to keyboards/horrortroll/handwired_k552/keymaps/via/rules.mk
diff --git a/keyboards/handwired/horrortroll/k552/ld/k552_f103.ld b/keyboards/horrortroll/handwired_k552/ld/k552_f103.ld
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/ld/k552_f103.ld
rename to keyboards/horrortroll/handwired_k552/ld/k552_f103.ld
diff --git a/keyboards/handwired/horrortroll/k552/lib/bongocat.c b/keyboards/horrortroll/handwired_k552/lib/bongocat.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/lib/bongocat.c
rename to keyboards/horrortroll/handwired_k552/lib/bongocat.c
diff --git a/keyboards/handwired/horrortroll/k552/lib/galaxy.c b/keyboards/horrortroll/handwired_k552/lib/galaxy.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/lib/galaxy.c
rename to keyboards/horrortroll/handwired_k552/lib/galaxy.c
diff --git a/keyboards/handwired/horrortroll/k552/lib/glcdfont.c b/keyboards/horrortroll/handwired_k552/lib/glcdfont.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/lib/glcdfont.c
rename to keyboards/horrortroll/handwired_k552/lib/glcdfont.c
diff --git a/keyboards/handwired/horrortroll/k552/lib/logo.c b/keyboards/horrortroll/handwired_k552/lib/logo.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/lib/logo.c
rename to keyboards/horrortroll/handwired_k552/lib/logo.c
diff --git a/keyboards/handwired/horrortroll/k552/lib/wave.c b/keyboards/horrortroll/handwired_k552/lib/wave.c
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/lib/wave.c
rename to keyboards/horrortroll/handwired_k552/lib/wave.c
diff --git a/keyboards/handwired/horrortroll/k552/mcuconf.h b/keyboards/horrortroll/handwired_k552/mcuconf.h
similarity index 79%
rename from keyboards/handwired/horrortroll/k552/mcuconf.h
rename to keyboards/horrortroll/handwired_k552/mcuconf.h
index c2c0e9a2f6..c9970fa28b 100644
--- a/keyboards/handwired/horrortroll/k552/mcuconf.h
+++ b/keyboards/horrortroll/handwired_k552/mcuconf.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 QMK
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
  *
  * 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
@@ -16,7 +16,7 @@
 
 /*
  * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/wolfmarkclub/wm1/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
+ *    `qmk chibios-confmigrate -i keyboards/horrortroll/handwired_k552/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h`
  */
 
 #pragma once
diff --git a/keyboards/handwired/horrortroll/k552/readme.md b/keyboards/horrortroll/handwired_k552/readme.md
similarity index 86%
rename from keyboards/handwired/horrortroll/k552/readme.md
rename to keyboards/horrortroll/handwired_k552/readme.md
index f1b30afae5..85e99f4cd4 100644
--- a/keyboards/handwired/horrortroll/k552/readme.md
+++ b/keyboards/horrortroll/handwired_k552/readme.md
@@ -1,15 +1,15 @@
-# Redragon K552 Kumara
+# Handwired K552 Kumara
 
 ![K552](https://i.imgur.com/XpNmJpBh.png)
 
 A handwired K552 Kumara. Built using STM32F103RCT6 Mini
 
 * Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
-* Hardware Supported: Redragon K552 Kumara and STM32F103RCT6 Mini
+* Hardware Supported: STM32F103RCT6
 
 Make example for this keyboard (after setting up your build environment):
 
-    make handwired/horrortroll/k552:default
+    make horrortroll/handwired_k552: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).
 
diff --git a/keyboards/handwired/horrortroll/k552/rules.mk b/keyboards/horrortroll/handwired_k552/rules.mk
similarity index 100%
rename from keyboards/handwired/horrortroll/k552/rules.mk
rename to keyboards/horrortroll/handwired_k552/rules.mk

From ef091d39d2ae5d6b5d90d82c87dc8135fe12f7eb Mon Sep 17 00:00:00 2001
From: Charly Delay <0xcharly@users.noreply.github.com>
Date: Sat, 22 Jan 2022 14:55:04 +0900
Subject: [PATCH 347/867] bastardkb/charybdis: add support for Charybdis (4x6
 and 3x5) (#15333)

---
 keyboards/bastardkb/charybdis/3x5/3x5.c       |  83 +++++
 keyboards/bastardkb/charybdis/3x5/3x5.h       |  67 ++++
 keyboards/bastardkb/charybdis/3x5/config.h    |  87 +++++
 keyboards/bastardkb/charybdis/3x5/info.json   |  86 +++++
 .../charybdis/3x5/keymaps/default/config.h    |  54 +++
 .../charybdis/3x5/keymaps/default/keymap.c    |  70 ++++
 .../charybdis/3x5/keymaps/default/readme.md   |   7 +
 .../charybdis/3x5/keymaps/via/config.h        | 118 ++++++
 .../charybdis/3x5/keymaps/via/keymap.c        | 263 ++++++++++++++
 .../charybdis/3x5/keymaps/via/readme.md       |  63 ++++
 .../charybdis/3x5/keymaps/via/rules.mk        |   1 +
 keyboards/bastardkb/charybdis/3x5/readme.md   |  15 +
 keyboards/bastardkb/charybdis/3x5/rules.mk    |  38 ++
 keyboards/bastardkb/charybdis/4x6/4x6.c       |  94 +++++
 keyboards/bastardkb/charybdis/4x6/4x6.h       |  44 +++
 keyboards/bastardkb/charybdis/4x6/config.h    |  84 +++++
 keyboards/bastardkb/charybdis/4x6/info.json   |  67 ++++
 .../charybdis/4x6/keymaps/default/config.h    |  39 ++
 .../charybdis/4x6/keymaps/default/keymap.c    |  75 ++++
 .../charybdis/4x6/keymaps/default/readme.md   |   7 +
 .../charybdis/4x6/keymaps/via/config.h        |  72 ++++
 .../charybdis/4x6/keymaps/via/keymap.c        | 166 +++++++++
 .../charybdis/4x6/keymaps/via/readme.md       |  61 ++++
 .../charybdis/4x6/keymaps/via/rules.mk        |   1 +
 keyboards/bastardkb/charybdis/4x6/readme.md   |  15 +
 keyboards/bastardkb/charybdis/4x6/rules.mk    |  37 ++
 keyboards/bastardkb/charybdis/charybdis.c     | 343 ++++++++++++++++++
 keyboards/bastardkb/charybdis/charybdis.h     | 126 +++++++
 keyboards/bastardkb/charybdis/config.h        |  35 ++
 keyboards/bastardkb/charybdis/post_config.h   | 109 ++++++
 keyboards/bastardkb/charybdis/readme.md       | 178 +++++++++
 31 files changed, 2505 insertions(+)
 create mode 100644 keyboards/bastardkb/charybdis/3x5/3x5.c
 create mode 100644 keyboards/bastardkb/charybdis/3x5/3x5.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/info.json
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/default/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/default/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/via/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/via/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/3x5/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/3x5/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/4x6/4x6.c
 create mode 100644 keyboards/bastardkb/charybdis/4x6/4x6.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/config.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/info.json
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/default/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/via/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/via/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/4x6/readme.md
 create mode 100644 keyboards/bastardkb/charybdis/4x6/rules.mk
 create mode 100644 keyboards/bastardkb/charybdis/charybdis.c
 create mode 100644 keyboards/bastardkb/charybdis/charybdis.h
 create mode 100644 keyboards/bastardkb/charybdis/config.h
 create mode 100644 keyboards/bastardkb/charybdis/post_config.h
 create mode 100644 keyboards/bastardkb/charybdis/readme.md

diff --git a/keyboards/bastardkb/charybdis/3x5/3x5.c b/keyboards/bastardkb/charybdis/3x5/3x5.c
new file mode 100644
index 0000000000..d896cf6923
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/3x5.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Publicw 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 "3x5.h"
+
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+/**
+ * \brief LEDs index.
+ *
+ * ╭────────────────────╮                 ╭────────────────────╮
+ *    2   3   8   9  12                     30  27  26  21  20
+ * ├────────────────────┤                 ├────────────────────┤
+ *    1   4   7  10  13                     31  28  25  22  19
+ * ├────────────────────┤                 ├────────────────────┤
+ *    0   5   6  11  14                     32  29  24  23  18
+ * ╰────────────────────╯                 ╰────────────────────╯
+ *                   15  16  17     33  34  XX
+ *                 ╰────────────╯ ╰────────────╯
+ */
+led_config_t g_led_config = { {
+    /* Key Matrix to LED index. */
+    // Left split.
+    {      2,      3,      8,      9,     12 }, // Top row
+    {      1,      4,      7,     10,     13 }, // Middle row
+    {      0,      5,      6,     11,     14 }, // Bottom row
+    {     17, NO_LED,     15,     16, NO_LED }, // Thumb cluster
+    // Right split.
+    {     20,     21,     26,     27,     30 }, // Top row
+    {     19,     22,     25,     28,     31 }, // Middle row
+    {     18,     23,     24,     29,     32 }, // Bottom row
+    {     33, NO_LED,     34, NO_LED, NO_LED }, // Thumb cluster
+}, {
+    /* LED index to physical position. */
+    // Left split.
+    /* index=0  */ {   0,  42 }, {   0,  21 }, {   0,   0 }, // col 1 (left most)
+    /* index=3  */ {  18,   0 }, {  18,  21 }, {  18,  42 }, // col 2
+    /* index=6  */ {  36,  42 }, {  36,  21 }, {  36,   0 },
+    /* index=9  */ {  54,   0 }, {  54,  21 }, {  54,  42 },
+    /* index=12 */ {  72,   0 }, {  72,  21 }, {  72,  42 },
+    /* index=15 */ {  72,  64 }, {  90,  64 }, { 108,  64 }, // Thumb cluster
+    // Right split.
+    /* index=18 */ { 224,  42 }, { 224,  21 }, { 224,   0 }, // col 10 (right most)
+    /* index=21 */ { 206,   0 }, { 206,  21 }, { 206,  42 }, // col 9
+    /* index=24 */ { 188,  42 }, { 188,  21 }, { 188,   0 },
+    /* index=27 */ { 170,   0 }, { 170,  21 }, { 170,  42 },
+    /* index=30 */ { 152,   0 }, { 152,  21 }, { 152,  42 },
+    /* index=33 */ { 152,  64 }, { 134,  64 },
+}, {
+    /* LED index to flag. */
+    // Left split.
+    /* index=0  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 1
+    /* index=3  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 2
+    /* index=6  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=9  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=12 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=15 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster
+    // Right split.
+    /* index=18 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 10
+    /* index=21 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 9
+    /* index=24 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=27 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=30 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=33 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // Thumb cluster
+} };
+#endif
+// clang-format on
diff --git a/keyboards/bastardkb/charybdis/3x5/3x5.h b/keyboards/bastardkb/charybdis/3x5/3x5.h
new file mode 100644
index 0000000000..665fcbeec2
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/3x5.h
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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 "charybdis.h"
+
+// clang-format off
+#define LAYOUT_charybdis_3x5(                           \
+  k00, k01, k02, k03, k04,     k44, k43, k42, k41, k40, \
+  k10, k11, k12, k13, k14,     k54, k53, k52, k51, k50, \
+  k20, k21, k22, k23, k24,     k64, k63, k62, k61, k60, \
+            k32, k33, k30,     k70, k72                 \
+)                                                       \
+{                                                       \
+  {   k00,   k01,   k02,   k03,   k04 },                \
+  {   k10,   k11,   k12,   k13,   k14 },                \
+  {   k20,   k21,   k22,   k23,   k24 },                \
+  {   k30, KC_NO,   k32,   k33, KC_NO },                \
+  {   k40,   k41,   k42,   k43,   k44 },                \
+  {   k50,   k51,   k52,   k53,   k54 },                \
+  {   k60,   k61,   k62,   k63,   k64 },                \
+  {   k70, KC_NO,   k72, KC_NO, KC_NO },                \
+}
+
+/**
+ * \brief Compatibility layout with the split_3x5_3 community layout.
+ *
+ * This effectively renders the Charbdis Nano compatible with existing layout
+ * implementations relying on the `split_3x5_3` layout, which includes, among
+ * others, Manna-Harbour's (@manna_harbour) Miryoku layout.
+ *
+ * The last key on the layout is ignored, to transform the input 36-keys layout
+ * into the Charybdis Nano's 35-keys layout.
+ */
+#define LAYOUT_split_3x5_3(                             \
+  k00, k01, k02, k03, k04,     k44, k43, k42, k41, k40, \
+  k10, k11, k12, k13, k14,     k54, k53, k52, k51, k50, \
+  k20, k21, k22, k23, k24,     k64, k63, k62, k61, k60, \
+            k32, k33, k30,     k70, k72, ___            \
+)                                                       \
+{                                                       \
+  {   k00,   k01,   k02,   k03,   k04 },                \
+  {   k10,   k11,   k12,   k13,   k14 },                \
+  {   k20,   k21,   k22,   k23,   k24 },                \
+  {   k30, KC_NO,   k32,   k33, KC_NO },                \
+  {   k40,   k41,   k42,   k43,   k44 },                \
+  {   k50,   k51,   k52,   k53,   k54 },                \
+  {   k60,   k61,   k62,   k63,   k64 },                \
+  {   k70, KC_NO,   k72, KC_NO, KC_NO },                \
+}
+// clang-format on
diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h
new file mode 100644
index 0000000000..9c69f7c358
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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 VENDOR_ID 0xA8F8
+#define PRODUCT_ID 0x1832
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Bastard Keyboards
+#define PRODUCT Charybdis Nano
+
+/* Key matrix configuration. */
+
+// Rows are doubled-up.
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 5
+
+// Wiring configuration for each half.
+#define MATRIX_ROW_PINS \
+    { B7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { C7, F0, D7, E6, B4 }
+
+#define MATRIX_ROW_PINS_RIGHT \
+    { F0, C6, D4, B5 }
+#define MATRIX_COL_PINS_RIGHT \
+    { C7, B7, D7, E6, B4 }
+
+#define DIODE_DIRECTION ROW2COL
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* Bootmagic Lite configuration. */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+#define BOOTMAGIC_LITE_ROW_RIGHT 4
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
+
+/* serial.c configuration (for split keyboard) */
+#define SOFT_SERIAL_PIN D2
+
+/* Set 0 if debouncing isn't needed. */
+#define DEBOUNCE 5
+
+/* Disable action features. */
+#define NO_ACTION_MACRO     // Disable old-style macro handling.
+#define NO_ACTION_FUNCTION  // Disable old-style function handling.
+
+/* PMW3360 settings. */
+#define PMW3360_CS_PIN B0
+
+// Trackball angle adjustment.
+#define ROTATIONAL_TRANSFORM_ANGLE -25
+
+/* RGB settings. */
+
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 35
+#define RGBLED_SPLIT \
+    { 18, 17 }
+
+/* RGB matrix support. */
+#ifdef RGB_MATRIX_ENABLE
+#    define SPLIT_TRANSPORT_MIRROR
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_KEYPRESSES
+#endif
diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json
new file mode 100644
index 0000000000..03fb05664f
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/info.json
@@ -0,0 +1,86 @@
+{
+    "keyboard_name": "Charybdis Nano",
+    "url": "https://www.bastardkb.com",
+    "maintainer": "Quentin Lebastard",
+    "layouts": {
+        "LAYOUT_charybdis_3x5": {
+            "layout": [
+                { "label": "L00", "x": 0, "y": 0 },
+                { "label": "L01", "x": 1, "y": 0 },
+                { "label": "L02", "x": 2, "y": 0 },
+                { "label": "L03", "x": 3, "y": 0 },
+                { "label": "L04", "x": 4, "y": 0 },
+                { "label": "R00", "x": 11, "y": 0 },
+                { "label": "R01", "x": 12, "y": 0 },
+                { "label": "R02", "x": 13, "y": 0 },
+                { "label": "R03", "x": 14, "y": 0 },
+                { "label": "R04", "x": 15, "y": 0 },
+                { "label": "L10", "x": 0, "y": 1 },
+                { "label": "L11", "x": 1, "y": 1 },
+                { "label": "L12", "x": 2, "y": 1 },
+                { "label": "L13", "x": 3, "y": 1 },
+                { "label": "L14", "x": 4, "y": 1 },
+                { "label": "R10", "x": 11, "y": 1 },
+                { "label": "R11", "x": 12, "y": 1 },
+                { "label": "R12", "x": 13, "y": 1 },
+                { "label": "R13", "x": 14, "y": 1 },
+                { "label": "R14", "x": 15, "y": 1 },
+                { "label": "L20", "x": 0, "y": 2 },
+                { "label": "L21", "x": 1, "y": 2 },
+                { "label": "L22", "x": 2, "y": 2 },
+                { "label": "L23", "x": 3, "y": 2 },
+                { "label": "L24", "x": 4, "y": 2 },
+                { "label": "R20", "x": 11, "y": 2 },
+                { "label": "R21", "x": 12, "y": 2 },
+                { "label": "R22", "x": 13, "y": 2 },
+                { "label": "R23", "x": 14, "y": 2 },
+                { "label": "R24", "x": 15, "y": 2 },
+                { "label": "L30", "x": 4, "y": 3 },
+                { "label": "L31", "x": 5, "y": 3 },
+                { "label": "L32", "x": 6, "y": 3 },
+                { "label": "R30", "x": 9, "y": 3 },
+                { "label": "R31", "x": 10, "y": 3 }
+            ]
+        },
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                { "label": "L00", "x": 0, "y": 0 },
+                { "label": "L01", "x": 1, "y": 0 },
+                { "label": "L02", "x": 2, "y": 0 },
+                { "label": "L03", "x": 3, "y": 0 },
+                { "label": "L04", "x": 4, "y": 0 },
+                { "label": "R00", "x": 11, "y": 0 },
+                { "label": "R01", "x": 12, "y": 0 },
+                { "label": "R02", "x": 13, "y": 0 },
+                { "label": "R03", "x": 14, "y": 0 },
+                { "label": "R04", "x": 15, "y": 0 },
+                { "label": "L10", "x": 0, "y": 1 },
+                { "label": "L11", "x": 1, "y": 1 },
+                { "label": "L12", "x": 2, "y": 1 },
+                { "label": "L13", "x": 3, "y": 1 },
+                { "label": "L14", "x": 4, "y": 1 },
+                { "label": "R10", "x": 11, "y": 1 },
+                { "label": "R11", "x": 12, "y": 1 },
+                { "label": "R12", "x": 13, "y": 1 },
+                { "label": "R13", "x": 14, "y": 1 },
+                { "label": "R14", "x": 15, "y": 1 },
+                { "label": "L20", "x": 0, "y": 2 },
+                { "label": "L21", "x": 1, "y": 2 },
+                { "label": "L22", "x": 2, "y": 2 },
+                { "label": "L23", "x": 3, "y": 2 },
+                { "label": "L24", "x": 4, "y": 2 },
+                { "label": "R20", "x": 11, "y": 2 },
+                { "label": "R21", "x": 12, "y": 2 },
+                { "label": "R22", "x": 13, "y": 2 },
+                { "label": "R23", "x": 14, "y": 2 },
+                { "label": "R24", "x": 15, "y": 2 },
+                { "label": "L30", "x": 4, "y": 3 },
+                { "label": "L31", "x": 5, "y": 3 },
+                { "label": "L32", "x": 6, "y": 3 },
+                { "label": "R30", "x": 9, "y": 3 },
+                { "label": "R31", "x": 10, "y": 3 },
+                { "label": "R32", "x": 11, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/default/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/default/config.h
new file mode 100644
index 0000000000..f2dd86c653
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/default/config.h
@@ -0,0 +1,54 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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
+
+#ifndef TAPPING_TERM
+/**
+ * \brief Configure the global tapping term (default: 200ms).
+ *
+ * If you have a lot of accidental mod activations, crank up the tapping term.
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
+ */
+#    define TAPPING_TERM 200
+#endif  // TAPPING_TERM
+
+/* RGB Matrix. */
+
+#ifdef RGB_MATRIX_ENABLE
+// Disable control of RGB matrix by keycodes (must use firmware implementation
+// to control the feature).
+#    define RGB_MATRIX_DISABLE_KEYCODES
+
+// Limit maximum brightness to keep power consumption reasonable, and avoid
+// disconnects.
+#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
+
+// Rainbow swirl as startup mode.
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+
+// Slow swirl at startup.
+#    define RGB_MATRIX_STARTUP_SPD 32
+
+// Startup values.
+#    define RGB_MATRIX_STARTUP_HUE 0
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
new file mode 100644
index 0000000000..18fe860527
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/default/keymap.c
@@ -0,0 +1,70 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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 charybdis_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_LOWER,
+    LAYER_RAISE,
+};
+
+#define LOWER MO(LAYER_LOWER)
+#define RAISE MO(LAYER_RAISE)
+
+#define CTL_BSP CTL_T(KC_BSPC)
+#define SFT_SPC SFT_T(KC_SPC)
+#define GUI_ENT GUI_T(KC_ENT)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_charybdis_3x5(
+  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
+          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,
+  // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
+                         CTL_BSP, SFT_SPC,   LOWER,      RAISE, GUI_ENT
+  //                   ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_LOWER] = LAYOUT_charybdis_3x5(
+  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
+       RGB_TOG, KC_MNXT, KC_MPLY, KC_MPRV, XXXXXXX,    KC_LBRC,    KC_7,    KC_8,    KC_9, KC_RBRC,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,    KC_4,    KC_5,    KC_6, KC_PMNS,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST,   RESET,    KC_PAST,    KC_1,    KC_2,    KC_3, KC_PSLS,
+  // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
+                         XXXXXXX, XXXXXXX, _______,    XXXXXXX, _______
+  //                   ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_RAISE] = LAYOUT_charybdis_3x5(
+  // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
+       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI,
+  // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
+       KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,      RESET, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX,
+  // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
+                         _______, _______, XXXXXXX,    _______, XXXXXXX
+  //                   ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+};
+// clang-format on
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/default/readme.md b/keyboards/bastardkb/charybdis/3x5/keymaps/default/readme.md
new file mode 100644
index 0000000000..3908656820
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/default/readme.md
@@ -0,0 +1,7 @@
+# Charybdis (3x5) default keymap
+
+> :bulb: Have a look at the [`via` keymap](../via) for a more feature-rich layout.
+
+The Charydbis (3x5) default keymap is inspired from the original [Dactyl Manuform](../../../../../handwired/dactyl_manuform) default keymap.
+
+This layout supports RGB matrix. However, due to space constraints on the MCU, only a limited number of effect can be enabled at once. Look at the `config.h` file and enable your favorite effect.
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
new file mode 100644
index 0000000000..f515d85334
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
@@ -0,0 +1,118 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#ifdef VIA_ENABLE
+/* VIA configuration. */
+#    define DYNAMIC_KEYMAP_LAYER_COUNT 7
+#endif  // VIA_ENABLE
+
+/* Disable unused features. */
+#define NO_ACTION_ONESHOT
+
+#ifndef TAPPING_TERM
+/**
+ * \brief Configure the global tapping term (default: 200ms).
+ *
+ * If you have a lot of accidental mod activations, crank up the tapping term.
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
+ */
+#    define TAPPING_TERM 200
+#endif  // TAPPING_TERM
+
+/**
+ * \brief Enable rapid switch from tap to hold.
+ *
+ * Note that a side-effect of this setting is to disable auto-repeat when
+ * pressing key twice, except for one-shot keys.
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
+ */
+#define TAPPING_FORCE_HOLD
+
+/*
+ * Tap-or-Hold decision modes.
+ *
+ * Note that the following flags behave differently when combined (ie. when 2 or
+ * more are enabled).
+ *
+ * See bit.ly/tap-or-hold for a visual explanation of the following tap-or-hold
+ * decision modes.
+ */
+
+/**
+ * \brief Faster tap-hold trigger.
+ *
+ * Without `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ ae
+ * With `PERMISSIVE_HOLD`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 e🠕 Mod(a)🠕 ➞ Mod+e
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
+ */
+#define PERMISSIVE_HOLD
+
+/**
+ * \brief Prevent normal rollover on alphas from accidentally triggering mods.
+ *
+ * Ignores key presses that interrupt a mod-tap.  Must-have for Home Row mod.
+ *
+ * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
+ * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
+ *   Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
+ */
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/* Charybdis-specific features. */
+
+#ifdef POINTING_DEVICE_ENABLE
+// Enable pointer acceleration, which increases the speed by ~2x for large
+// displacement, while maintaining 1x speed for slow movements.  See also:
+// - `CHARYBDIS_POINTER_ACCELERATION_FACTOR`
+#    define CHARYBDIS_POINTER_ACCELERATION_ENABLE
+
+// Automatically enable the pointer layer when moving the trackball.  See also:
+// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS`
+// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
+// #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#endif  // POINTING_DEVICE_ENABLE
+
+/* RGB Matrix. */
+
+#ifdef RGB_MATRIX_ENABLE
+// Limit maximum brightness to keep power consumption reasonable, and avoid
+// disconnects.
+#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
+
+// Rainbow swirl as startup mode.
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+
+// Slow swirl at startup.
+#    define RGB_MATRIX_STARTUP_SPD 32
+
+// Startup values.
+#    define RGB_MATRIX_STARTUP_HUE 0
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ba549deecf
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/keymap.c
@@ -0,0 +1,263 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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
+
+#ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#    include "timer.h"
+#endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+
+enum charybdis_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_FUNCTION,
+    LAYER_NAVIGATION,
+    LAYER_MEDIA,
+    LAYER_POINTER,
+    LAYER_NUMERAL,
+    LAYER_SYMBOLS,
+};
+
+// Automatically enable sniping-mode on the pointer layer.
+#define CHARYBDIS_AUTO_SNIPING_ON_LAYER LAYER_POINTER
+
+#ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+static uint16_t auto_pointer_layer_timer = 0;
+
+#    ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
+#        define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
+#    endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
+
+#    ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
+#        define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
+#    endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
+#endif      // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+
+#define ESC_MED LT(LAYER_MEDIA, KC_ESC)
+#define SPC_NAV LT(LAYER_NAVIGATION, KC_SPC)
+#define TAB_FUN LT(LAYER_FUNCTION, KC_TAB)
+#define ENT_SYM LT(LAYER_SYMBOLS, KC_ENT)
+#define BSP_NUM LT(LAYER_NUMERAL, KC_BSPC)
+#define _L_PTR(KC) LT(LAYER_POINTER, KC)
+
+// clang-format off
+/** \brief QWERTY layout (3 rows, 10 columns). */
+#define LAYOUT_LAYER_BASE                                                                     \
+       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, \
+       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_QUOT, \
+       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, \
+                      ESC_MED, SPC_NAV, TAB_FUN, ENT_SYM, BSP_NUM
+
+/** Convenience row shorthands. */
+#define _______________DEAD_HALF_ROW_______________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+#define ______________HOME_ROW_GACS_L______________ KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX
+#define ______________HOME_ROW_GACS_R______________ XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI
+
+/*
+ * Layers used on the Charybdis Nano.
+ *
+ * These layers started off heavily inspired by the Miryoku layout, but trimmed
+ * down and tailored for a stock experience that is meant to be fundation for
+ * further personalization.
+ *
+ * See https://github.com/manna-harbour/miryoku for the original layout.
+ */
+
+/**
+ * \brief Function layer.
+ *
+ * Secondary right-hand layer has function keys mirroring the numerals on the
+ * primary layer with extras on the pinkie column, plus system keys on the inner
+ * column. App is on the tertiary thumb key and other thumb keys are duplicated
+ * from the base layer to enable auto-repeat.
+ */
+#define LAYOUT_LAYER_FUNCTION                                                                 \
+    _______________DEAD_HALF_ROW_______________, KC_PSCR,   KC_F7,   KC_F8,   KC_F9,  KC_F12, \
+    ______________HOME_ROW_GACS_L______________, KC_SLCK,   KC_F4,   KC_F5,   KC_F6,  KC_F11, \
+    _______________DEAD_HALF_ROW_______________, KC_PAUS,   KC_F1,   KC_F2,   KC_F3,  KC_F10, \
+                      XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX
+
+/**
+ * \brief Media layer.
+ *
+ * Tertiary left- and right-hand layer is media and RGB control.  This layer is
+ * symmetrical to accomodate the left- and right-hand trackball.
+ */
+#define LAYOUT_LAYER_MEDIA                                                                    \
+    XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, \
+    KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, \
+    XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST,   RESET,   RESET, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, \
+                      _______, KC_MPLY, KC_MSTP, KC_MSTP, KC_MPLY
+
+/** \brief Mouse emulation and pointer functions. */
+#define LAYOUT_LAYER_POINTER                                                                  \
+    XXXXXXX, XXXXXXX, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, XXXXXXX, XXXXXXX, \
+    ______________HOME_ROW_GACS_L______________, ______________HOME_ROW_GACS_R______________, \
+    _______, DRGSCRL, SNIPING, EEP_RST,   RESET,   RESET, EEP_RST, SNIPING, DRGSCRL, _______, \
+                      KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN3, KC_BTN1
+
+/**
+ * \brief Navigation layer.
+ *
+ * Primary right-hand layer (left home thumb) is navigation and editing. Cursor
+ * keys are on the home position, line and page movement below, clipboard above,
+ * caps lock and insert on the inner column. Thumb keys are duplicated from the
+ * base layer to avoid having to layer change mid edit and to enable auto-repeat.
+ */
+#define LAYOUT_LAYER_NAVIGATION                                                               \
+    _______________DEAD_HALF_ROW_______________, _______________DEAD_HALF_ROW_______________, \
+    ______________HOME_ROW_GACS_L______________, KC_CLCK, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, \
+    _______________DEAD_HALF_ROW_______________,  KC_INS, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, \
+                      XXXXXXX, _______, XXXXXXX,  KC_ENT, KC_BSPC
+
+/**
+ * \brief Numeral layout.
+ *
+ * Primary left-hand layer (right home thumb) is numerals and symbols. Numerals
+ * are in the standard numpad locations with symbols in the remaining positions.
+ * `KC_DOT` is duplicated from the base layer.
+ */
+#define LAYOUT_LAYER_NUMERAL                                                                  \
+    KC_LBRC,    KC_7,    KC_8,    KC_9, KC_RBRC, _______________DEAD_HALF_ROW_______________, \
+    KC_SCLN,    KC_4,    KC_5,    KC_6,  KC_EQL, ______________HOME_ROW_GACS_R______________, \
+     KC_GRV,    KC_1,    KC_2,    KC_3, KC_BSLS, _______________DEAD_HALF_ROW_______________, \
+                       KC_DOT,    KC_0, KC_MINS, XXXXXXX, _______
+
+/**
+ * \brief Symbols layer.
+ *
+ * Secondary left-hand layer has shifted symbols in the same locations to reduce
+ * chording when using mods with shifted symbols. `KC_LPRN` is duplicated next to
+ * `KC_RPRN`.
+ */
+#define LAYOUT_LAYER_SYMBOLS                                                                  \
+    KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, _______________DEAD_HALF_ROW_______________, \
+    KC_COLN,  KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, ______________HOME_ROW_GACS_R______________, \
+    KC_TILD, KC_EXLM,   KC_AT, KC_HASH, KC_PIPE, _______________DEAD_HALF_ROW_______________, \
+                      KC_LPRN, KC_RPRN, KC_UNDS, _______, XXXXXXX
+
+/**
+ * \brief Add Home Row mod to a layout.
+ *
+ * Expects a 10-key per row layout.  Adds support for GACS (Gui, Alt, Ctl, Shift)
+ * home row.  The layout passed in parameter must contain at least 20 keycodes.
+ *
+ * This is meant to be used with `LAYER_ALPHAS_QWERTY` defined above, eg.:
+ *
+ *     HOME_ROW_MOD_GACS(LAYER_ALPHAS_QWERTY)
+ */
+#define _HOME_ROW_MOD_GACS(                                            \
+    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,                  \
+    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,                  \
+    ...)                                                               \
+             L00,         L01,         L02,         L03,         L04,  \
+             R05,         R06,         R07,         R08,         R09,  \
+      LGUI_T(L10), LALT_T(L11), LCTL_T(L12), LSFT_T(L13),        L14,  \
+             R15,  RSFT_T(R16), RCTL_T(R17), LALT_T(R18), RGUI_T(R19), \
+      __VA_ARGS__
+#define HOME_ROW_MOD_GACS(...) _HOME_ROW_MOD_GACS(__VA_ARGS__)
+
+/**
+ * \brief Add pointer layer keys to a layout.
+ *
+ * Expects a 10-key per row layout.  The layout passed in parameter must contain
+ * at least 30 keycodes.
+ *
+ * This is meant to be used with `LAYER_ALPHAS_QWERTY` defined above, eg.:
+ *
+ *     POINTER_MOD(LAYER_ALPHAS_QWERTY)
+ */
+#define _POINTER_MOD(                                                  \
+    L00, L01, L02, L03, L04, R05, R06, R07, R08, R09,                  \
+    L10, L11, L12, L13, L14, R15, R16, R17, R18, R19,                  \
+    L20, L21, L22, L23, L24, R25, R26, R27, R28, R29,                  \
+    ...)                                                               \
+             L00,         L01,         L02,         L03,         L04,  \
+             R05,         R06,         R07,         R08,         R09,  \
+             L10,         L11,         L12,         L13,         L14,  \
+             R15,         R16,         R17,         R18,         R19,  \
+      _L_PTR(L20),        L21,         L22,         L23,         L24,  \
+             R25,         R26,         R27,         R28,  _L_PTR(R29), \
+      __VA_ARGS__
+#define POINTER_MOD(...) _POINTER_MOD(__VA_ARGS__)
+
+#define LAYOUT_wrapper(...) LAYOUT_charybdis_3x5(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_wrapper(
+    POINTER_MOD(HOME_ROW_MOD_GACS(LAYOUT_LAYER_BASE))
+  ),
+  [LAYER_FUNCTION] = LAYOUT_wrapper(LAYOUT_LAYER_FUNCTION),
+  [LAYER_NAVIGATION] = LAYOUT_wrapper(LAYOUT_LAYER_NAVIGATION),
+  [LAYER_MEDIA] = LAYOUT_wrapper(LAYOUT_LAYER_MEDIA),
+  [LAYER_NUMERAL] = LAYOUT_wrapper(LAYOUT_LAYER_NUMERAL),
+  [LAYER_POINTER] = LAYOUT_wrapper(LAYOUT_LAYER_POINTER),
+  [LAYER_SYMBOLS] = LAYOUT_wrapper(LAYOUT_LAYER_SYMBOLS),
+};
+// clang-format on
+
+#ifdef POINTING_DEVICE_ENABLE
+#    ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
+    if (abs(mouse_report.x) > CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD || abs(mouse_report.y) > CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD) {
+        if (auto_pointer_layer_timer == 0) {
+            layer_on(LAYER_POINTER);
+#        ifdef RGB_MATRIX_ENABLE
+            rgb_matrix_mode_noeeprom(RGB_MATRIX_NONE);
+            rgb_matrix_sethsv_noeeprom(HSV_GREEN);
+#        endif  // RGB_MATRIX_ENABLE
+        }
+        auto_pointer_layer_timer = timer_read();
+    }
+    return mouse_report;
+}
+
+void matrix_scan_kb(void) {
+    if (auto_pointer_layer_timer != 0 && TIMER_DIFF_16(timer_read(), auto_pointer_layer_timer) >= CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS) {
+        auto_pointer_layer_timer = 0;
+        layer_off(LAYER_POINTER);
+#        ifdef RGB_MATRIX_ENABLE
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
+#        endif  // RGB_MATRIX_ENABLE
+    }
+    matrix_scan_user();
+}
+#    endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+
+#    ifdef CHARYBDIS_AUTO_SNIPING_ON_LAYER
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    state = layer_state_set_user(state);
+    charybdis_set_pointer_sniping_enabled(layer_state_cmp(state, CHARYBDIS_AUTO_SNIPING_ON_LAYER));
+    return state;
+}
+#    endif  // CHARYBDIS_AUTO_SNIPING_ON_LAYER
+#endif      // POINTING_DEVICE_ENABLE
+
+#ifdef RGB_MATRIX_ENABLE
+// Forward-declare this helper function since it is defined in rgb_matrix.c.
+void rgb_matrix_update_pwm_buffers(void);
+#endif
+
+void shutdown_user(void) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_enable_noeeprom();
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+    rgblight_setrgb_red();
+#endif  // RGBLIGHT_ENABLE
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_set_color_all(RGB_RED);
+    rgb_matrix_update_pwm_buffers();
+#endif  // RGB_MATRIX_ENABLE
+}
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/readme.md b/keyboards/bastardkb/charybdis/3x5/keymaps/via/readme.md
new file mode 100644
index 0000000000..dc7f6f2d30
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/readme.md
@@ -0,0 +1,63 @@
+# Charybdis (3x5) `via` keymap
+
+The Charydbis (3x5) `via` keymap is based on a QWERTY layout with [home row mods](https://precondition.github.io/home-row-mods) and [Miryoku-inspired layers](https://github.com/manna-harbour/miryoku), and some features and changes specific to the Charybdis.
+
+This layout supports RGB matrix. However, due to space constraints on the MCU, only a limited number of effect can be enabled at once. Look at the `config.h` file and enable your favorite effect.
+
+This layout also supports VIA.
+
+## Customizing the keymap
+
+### Dynamic DPI scaling
+
+Use the following keycodes to change the default DPI:
+
+-   `POINTER_DEFAULT_DPI_FORWARD`: increases the DPI; decreases when shifted;
+-   `POINTER_DEFAULT_DPI_REVERSE`: decreases the DPI; increases when shifted.
+
+There's a maximum of 16 possible values for the sniping mode DPI. See the [Charybdis documentation](../../README.md) for more information.
+
+Use the following keycodes to change the sniping mode DPI:
+
+-   `POINTER_SNIPING_DPI_FORWARD`: increases the DPI; decreases when shifted;
+-   `POINTER_SNIPING_DPI_REVERSE`: decreases the DPI; increases when shifted.
+
+There's a maximum of 4 possible values for the sniping mode DPI. See the [Charybdis documentation](../../README.md) for more information.
+
+### Drag-scroll
+
+Use the `DRAGSCROLL_MODE` keycode to enable drag-scroll on hold. Use the `DRAGSCROLL_TOGGLE` keycode to enable/disable drag-scroll on key press.
+
+### Sniping
+
+Use the `SNIPING_MODE` keycode to enable sniping mode on hold. Use the `SNIPING_TOGGLE` keycode to enable/disable sniping mode on key press.
+
+Change the value of `CHARYBDIS_AUTO_SNIPING_ON_LAYER` to automatically enable sniping mode on layer change. By default, sniping mode is enabled on the pointer layer:
+
+```c
+#define CHARYBDIS_AUTO_SNIPING_ON_LAYER LAYER_POINTER
+```
+
+### Auto pointer layer
+
+The pointer layer can be automatically enabled when moving the trackball. To enable or disable this behavior, add or remove the following define:
+
+```c
+#define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+```
+
+By default, the layer is turned off 1 second after the last registered trackball movement:
+
+```c
+#define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
+```
+
+The trigger sensibility can also be tuned. The lower the value, the more sensible the trigger:
+
+```c
+#define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
+```
+
+## Layout
+
+![Keymap layout (generated with keyboard-layout-editor.com)](https://i.imgur.com/uHEnqEN.png)
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/3x5/readme.md b/keyboards/bastardkb/charybdis/3x5/readme.md
new file mode 100644
index 0000000000..7a91035bea
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/readme.md
@@ -0,0 +1,15 @@
+# Charybdis Nano (3x5)
+
+An ergonomic keyboard with integrated trackball.
+
+The Charybdis is available in 4x6 and 3x5 form factor at [bastardkb.com](https://bastardkb.com).
+
+## Keymaps
+
+### [`default`](keymaps/default)
+
+A simple QWERTY layout with 4 layers.
+
+### [`via`](keymaps/via)
+
+A [Miryoku-inspired](https://github.com/manna-harbour/miryoku), feature-rich, keymap with VIA support.
diff --git a/keyboards/bastardkb/charybdis/3x5/rules.mk b/keyboards/bastardkb/charybdis/3x5/rules.mk
new file mode 100644
index 0000000000..c5f3f0fb8c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/rules.mk
@@ -0,0 +1,38 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+# Enable link-time optimization by default.  The Charybdis packs a lot of
+# features (RGB, Via, trackball) in a small atmega32u4 package.
+LTO_ENABLE = yes
+
+# Charybdis nano is a split 3x5 keyboard with a maximum of 3 thumb keys (2 on
+# the trackball side).
+SPLIT_KEYBOARD = yes
+LAYOUTS = split_3x5_3 # Support community layout, in particular Manna-Harbour's Miryoku layout
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+# https://qmk.fm/changes/2018-11-16-use-a-single-endpoint-for-hid-reports
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/4x6/4x6.c b/keyboards/bastardkb/charybdis/4x6/4x6.c
new file mode 100644
index 0000000000..6cd8fffee7
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/4x6.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Publicw 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 "4x6.h"
+
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+/**
+ * \brief LEDs index.
+ *
+ * ╭────────────────────────╮                 ╭────────────────────────╮
+ *    0   7   8  15  16  20                     49  45  44  37  36  29
+ * ├────────────────────────┤                 ├────────────────────────┤
+ *    1   6   9  14  17  21                     50  46  43  38  35  30
+ * ├────────────────────────┤                 ├────────────────────────┤
+ *    2   5  10  13  18  22                     51  47  42  39  34  31
+ * ├────────────────────────┤                 ├────────────────────────┤
+ *    3   4  11  12  19  23                     52  48  41  40  33  32
+ * ╰────────────────────────╯                 ╰────────────────────────╯
+ *                       26  27  28     53  54  XX
+ *                           25  24     55  XX
+ *                     ╰────────────╯ ╰────────────╯
+ */
+led_config_t g_led_config = { {
+    /* Key Matrix to LED index. */
+    // Left split.
+    {      0,      7,      8,     15,     16,     20 }, // Num row
+    {      1,      6,      9,     14,     17,     21 }, // Top row
+    {      2,      5,     10,     13,     18,     22 }, // Middle row
+    {      3,      4,     11,     12,     19,     23 }, // Bottom row
+    { NO_LED,     28,     24,     26,     27,     25 }, // Thumb cluster
+    // Right split.
+    {     29,     36,     37,     44,     45,     49 }, // Num row
+    {     30,     35,     38,     43,     46,     50 }, // Top row
+    {     31,     34,     39,     42,     47,     51 }, // Middle row
+    {     32,     33,     40,     41,     48,     52 }, // Bottom row
+    { NO_LED,     53,     55,     54, NO_LED, NO_LED }, // Thumb cluster
+}, {
+    /* LED index to physical position. */
+    // Left split.
+    /* index=0  */ {   0,   0 }, {   0,  12 }, {   0,  24 }, {   0,  36 }, // col 1 (left most)
+    /* index=4  */ {  16,  36 }, {  16,  24 }, {  16,  12 }, {  16,   0 }, // col 2
+    /* index=8  */ {  32,   0 }, {  32,  12 }, {  32,  24 }, {  32,  36 },
+    /* index=12 */ {  48,  36 }, {  48,  24 }, {  48,  12 }, {  48,   0 },
+    /* index=16 */ {  64,   0 }, {  64,  12 }, {  64,  24 }, {  64,  36 },
+    /* index=20 */ {  80,   0 }, {  80,  12 }, {  80,  24 }, {  80,  36 },
+    /* index=24 */ { 112,  64 }, {  96,  64 }, {  80,  52 },
+    /* index=27 */ {  96,  52 }, { 112,  52 },
+    // Right split.
+    /* index=29 */ { 224,   0 }, { 224,  12 }, { 224,  24 }, { 224,  36 }, // col 12 (right most)
+    /* index=33 */ { 208,  36 }, { 208,  24 }, { 208,  12 }, { 208,   0 }, // col 11
+    /* index=37 */ { 192,   0 }, { 192,  12 }, { 192,  24 }, { 192,  36 },
+    /* index=41 */ { 176,  36 }, { 176,  24 }, { 176,  12 }, { 176,   0 },
+    /* index=45 */ { 160,   0 }, { 160,  12 }, { 160,  24 }, { 160,  36 },
+    /* index=49 */ { 144,   0 }, { 144,  12 }, { 144,  24 }, { 144,  36 },
+    /* index=53 */ { 112,  52 }, { 128,  64 }, { 112,  64 },
+}, {
+    /* LED index to flag. */
+    // Left split.
+    /* index=0  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 1
+    /* index=4  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 2
+    /* index=8  */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=12 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=16 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=20 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=24 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster top
+    /* index=27 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER,                    // Thumb cluster bottom
+    // Right split.
+    /* index=29 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 12
+    /* index=33 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 11
+    /* index=37 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=41 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=45 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=49 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
+    /* index=53 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // Thumb cluster
+} };
+#endif
+// clang-format on
diff --git a/keyboards/bastardkb/charybdis/4x6/4x6.h b/keyboards/bastardkb/charybdis/4x6/4x6.h
new file mode 100644
index 0000000000..c26d356d69
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/4x6.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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 "charybdis.h"
+
+// clang-format off
+#define LAYOUT_charybdis_4x6(                                     \
+  k00, k01, k02, k03, k04, k05,     k55, k54, k53, k52, k51, k50, \
+  k10, k11, k12, k13, k14, k15,     k65, k64, k63, k62, k61, k60, \
+  k20, k21, k22, k23, k24, k25,     k75, k74, k73, k72, k71, k70, \
+  k30, k31, k32, k33, k34, k35,     k85, k84, k83, k82, k81, k80, \
+                 k43, k44, k41,     k91, k93,                     \
+                      k45, k42,     k95                           \
+)                                                                 \
+{                                                                 \
+  {   k00,   k01,   k02,   k03,   k04,   k05 },                   \
+  {   k10,   k11,   k12,   k13,   k14,   k15 },                   \
+  {   k20,   k21,   k22,   k23,   k24,   k25 },                   \
+  {   k30,   k31,   k32,   k33,   k34,   k35 },                   \
+  { KC_NO,   k41,   k42,   k43,   k44,   k45 },                   \
+  {   k50,   k51,   k52,   k53,   k54,   k55 },                   \
+  {   k60,   k61,   k62,   k63,   k64,   k65 },                   \
+  {   k70,   k71,   k72,   k73,   k74,   k75 },                   \
+  {   k80,   k81,   k82,   k83,   k84,   k85 },                   \
+  { KC_NO,   k91, KC_NO,   k93, KC_NO,   k95 },                   \
+}
+// clang-format on
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
new file mode 100644
index 0000000000..f00fb382f6
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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 VENDOR_ID 0xA8F8
+#define PRODUCT_ID 0x1833
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Bastard Keyboards
+#define PRODUCT Charybdis
+
+/* Key matrix configuration. */
+
+// Rows are doubled-up.
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+
+// Wiring configuration for each half.
+#define MATRIX_ROW_PINS \
+    { F1, B7, C6, D4, B5 }
+#define MATRIX_COL_PINS \
+    { D5, C7, F0, D7, E6, B4 }
+
+#define MATRIX_ROW_PINS_RIGHT \
+    { D5, F0, C6, D4, B5 }
+#define MATRIX_COL_PINS_RIGHT \
+    { F1, C7, B7, D7, E6, B4 }
+
+#define DIODE_DIRECTION ROW2COL
+
+#define ROTATIONAL_TRANSFORM_ANGLE -25
+
+/* Handedness. */
+#define MASTER_RIGHT
+
+/* Bootmagic Lite configuration. */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+#define BOOTMAGIC_LITE_ROW_RIGHT 5
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
+
+/* serial.c configuration (for split keyboard) */
+#define SOFT_SERIAL_PIN D2
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Disable action features. */
+#define NO_ACTION_MACRO     // Disable old-style macro handling.
+#define NO_ACTION_FUNCTION  // Disable old-style function handling.
+
+/* PMW3360 settings. */
+#define PMW3360_CS_PIN B0
+
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 56
+#define RGBLED_SPLIT \
+    { 29, 27 }
+
+/* RGB matrix support. */
+#ifdef RGB_MATRIX_ENABLE
+#    define SPLIT_TRANSPORT_MIRROR
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#    define RGB_MATRIX_KEYPRESSES
+#endif
diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json
new file mode 100644
index 0000000000..956dfe88f5
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/info.json
@@ -0,0 +1,67 @@
+{
+    "keyboard_name": "Charybdis",
+    "url": "https://www.bastardkb.com",
+    "maintainer": "Quentin Lebastard",
+    "layouts": {
+        "LAYOUT_charybdis_4x6": {
+            "layout": [
+                { "label": "L00", "x": 0, "y": 0 },
+                { "label": "L01", "x": 1, "y": 0 },
+                { "label": "L02", "x": 2, "y": 0 },
+                { "label": "L03", "x": 3, "y": 0 },
+                { "label": "L04", "x": 4, "y": 0 },
+                { "label": "L05", "x": 5, "y": 0 },
+                { "label": "R00", "x": 11, "y": 0 },
+                { "label": "R01", "x": 12, "y": 0 },
+                { "label": "R02", "x": 13, "y": 0 },
+                { "label": "R03", "x": 14, "y": 0 },
+                { "label": "R04", "x": 15, "y": 0 },
+                { "label": "R05", "x": 16, "y": 0 },
+                { "label": "L10", "x": 0, "y": 1 },
+                { "label": "L11", "x": 1, "y": 1 },
+                { "label": "L12", "x": 2, "y": 1 },
+                { "label": "L13", "x": 3, "y": 1 },
+                { "label": "L14", "x": 4, "y": 1 },
+                { "label": "L15", "x": 5, "y": 1 },
+                { "label": "R10", "x": 11, "y": 1 },
+                { "label": "R11", "x": 12, "y": 1 },
+                { "label": "R12", "x": 13, "y": 1 },
+                { "label": "R13", "x": 14, "y": 1 },
+                { "label": "R14", "x": 15, "y": 1 },
+                { "label": "R15", "x": 16, "y": 1 },
+                { "label": "L20", "x": 0, "y": 2 },
+                { "label": "L21", "x": 1, "y": 2 },
+                { "label": "L22", "x": 2, "y": 2 },
+                { "label": "L23", "x": 3, "y": 2 },
+                { "label": "L24", "x": 4, "y": 2 },
+                { "label": "L25", "x": 5, "y": 2 },
+                { "label": "R20", "x": 11, "y": 2 },
+                { "label": "R21", "x": 12, "y": 2 },
+                { "label": "R22", "x": 13, "y": 2 },
+                { "label": "R23", "x": 14, "y": 2 },
+                { "label": "R24", "x": 15, "y": 2 },
+                { "label": "R25", "x": 16, "y": 2 },
+                { "label": "L30", "x": 0, "y": 3 },
+                { "label": "L31", "x": 1, "y": 3 },
+                { "label": "L32", "x": 2, "y": 3 },
+                { "label": "L33", "x": 3, "y": 3 },
+                { "label": "L34", "x": 4, "y": 3 },
+                { "label": "L35", "x": 5, "y": 3 },
+                { "label": "R30", "x": 11, "y": 3 },
+                { "label": "R31", "x": 12, "y": 3 },
+                { "label": "R32", "x": 13, "y": 3 },
+                { "label": "R33", "x": 14, "y": 3 },
+                { "label": "R34", "x": 15, "y": 3 },
+                { "label": "R35", "x": 16, "y": 3 },
+                { "label": "L40", "x": 5, "y": 4 },
+                { "label": "L41", "x": 6, "y": 4 },
+                { "label": "L42", "x": 7, "y": 4 },
+                { "label": "R40", "x": 9, "y": 4 },
+                { "label": "R41", "x": 10, "y": 4 },
+                { "label": "L50", "x": 6, "y": 5 },
+                { "label": "L51", "x": 7, "y": 5 },
+                { "label": "R50", "x": 9, "y": 5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h
new file mode 100644
index 0000000000..383b3f9dc3
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/default/config.h
@@ -0,0 +1,39 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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
+
+/* RGB Matrix. */
+
+#ifdef RGB_MATRIX_ENABLE
+// Limit maximum brightness to keep power consumption reasonable, and avoid
+// disconnects.
+#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
+
+// Rainbow swirl as startup mode.
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+
+// Slow swirl at startup.
+#    define RGB_MATRIX_STARTUP_SPD 32
+
+// Startup values.
+#    define RGB_MATRIX_STARTUP_HUE 0
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
new file mode 100644
index 0000000000..de8eed9c03
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/default/keymap.c
@@ -0,0 +1,75 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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 charybdis_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_LOWER,
+    LAYER_RAISE,
+};
+
+#define LOWER MO(LAYER_LOWER)
+#define RAISE MO(LAYER_RAISE)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_charybdis_4x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+        KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,       KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_LSFT,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_LCTL,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_LALT,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                   KC_LGUI, KC_SPC,   LOWER,      RAISE,  KC_ENT,
+                                           KC_LALT, KC_BSPC,     KC_DEL
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_LOWER] = LAYOUT_charybdis_4x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+       KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_LBRC,   KC_P7,   KC_P8,   KC_P9, KC_RBRC, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       RGB_TOG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,   KC_P4,   KC_P5,   KC_P6, KC_PMNS, KC_PEQL,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+      RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST,   RESET,    KC_PAST,   KC_P1,   KC_P2,   KC_P3, KC_PSLS, KC_PDOT,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  XXXXXXX, XXXXXXX, _______,    XXXXXXX, _______,
+                                           XXXXXXX, XXXXXXX,      KC_P0
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_RAISE] = LAYOUT_charybdis_4x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+        KC_F12,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MPLY, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, KC_MUTE,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,      RESET, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  _______, _______, XXXXXXX,    _______, XXXXXXX,
+                                           _______, _______,    XXXXXXX
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+};
+// clang-format on
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/default/readme.md b/keyboards/bastardkb/charybdis/4x6/keymaps/default/readme.md
new file mode 100644
index 0000000000..23a85e54d5
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/default/readme.md
@@ -0,0 +1,7 @@
+# Charybdis (4x6) default keymap
+
+> :bulb: Have a look at the [`via` keymap](../via) for a more feature-rich layout.
+
+The Charydbis (4x6) default keymap is inspired from the original [Dactyl Manuform](../../../../../handwired/dactyl_manuform) default keymap.
+
+This layout supports RGB matrix. However, due to space constraints on the MCU, only a limited number of effect can be enabled at once. Look at the `config.h` file and enable your favorite effect.
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
new file mode 100644
index 0000000000..75eb2240f3
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/config.h
@@ -0,0 +1,72 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#ifdef VIA_ENABLE
+/* VIA configuration. */
+#    define DYNAMIC_KEYMAP_LAYER_COUNT 4
+#endif  // VIA_ENABLE
+
+/* Disable unused features. */
+#define NO_ACTION_ONESHOT
+
+#ifndef TAPPING_TERM
+/**
+ * \brief Configure the global tapping term (default: 200ms).
+ *
+ * If you have a lot of accidental mod activations, crank up the tapping term.
+ *
+ * See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
+ */
+#    define TAPPING_TERM 200
+#endif  // TAPPING_TERM
+
+/* Charybdis-specific features. */
+
+#ifdef POINTING_DEVICE_ENABLE
+// Enable pointer acceleration, which increases the speed by ~2x for large
+// displacement, while maintaining 1x speed for slow movements.
+// - `CHARYBDIS_POINTER_ACCELERATION_FACTOR`
+#    define CHARYBDIS_POINTER_ACCELERATION_ENABLE
+
+// Automatically enable the pointer layer when moving the trackball.  See also:
+// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS`
+// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
+// #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#endif  // POINTING_DEVICE_ENABLE
+
+/* RGB Matrix. */
+
+#ifdef RGB_MATRIX_ENABLE
+// Limit maximum brightness to keep power consumption reasonable, and avoid
+// disconnects.
+#    undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
+
+// Rainbow swirl as startup mode.
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+
+// Slow swirl at startup.
+#    define RGB_MATRIX_STARTUP_SPD 32
+
+// Startup values.
+#    define RGB_MATRIX_STARTUP_HUE 0
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#    define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
+#endif  // RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d53d580a48
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/keymap.c
@@ -0,0 +1,166 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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
+
+#ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+#    include "timer.h"
+#endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+
+enum charybdis_keymap_layers {
+    LAYER_BASE = 0,
+    LAYER_LOWER,
+    LAYER_RAISE,
+    LAYER_POINTER,
+};
+
+/** \brief Automatically enable sniping-mode on the pointer layer. */
+#define CHARYBDIS_AUTO_SNIPING_ON_LAYER LAYER_POINTER
+
+#ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+static uint16_t auto_pointer_layer_timer = 0;
+
+#    ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
+#        define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
+#    endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
+
+#    ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
+#        define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
+#    endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
+#endif      // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+
+#define LOWER MO(LAYER_LOWER)
+#define RAISE MO(LAYER_RAISE)
+#define PT_Z LT(LAYER_POINTER, KC_Z)
+#define PT_SLSH LT(LAYER_POINTER, KC_SLSH)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [LAYER_BASE] = LAYOUT_charybdis_4x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+        KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,       KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_BSLS,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_LSFT,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,       KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_LCTL,    PT_Z,    KC_X,    KC_C,    KC_V,    KC_B,       KC_N,    KC_M, KC_COMM,  KC_DOT, PT_SLSH, KC_LALT,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                   KC_LGUI, KC_SPC,   LOWER,      RAISE,  KC_ENT,
+                                           KC_LALT, KC_BSPC,     KC_DEL
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_LOWER] = LAYOUT_charybdis_4x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+       KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_LBRC,   KC_P7,   KC_P8,   KC_P9, KC_RBRC, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       RGB_TOG, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    KC_PPLS,   KC_P4,   KC_P5,   KC_P6, KC_PMNS, KC_PEQL,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+      RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_PAST,   KC_P1,   KC_P2,   KC_P3, KC_PSLS, KC_PDOT,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  XXXXXXX, XXXXXXX, _______,    XXXXXXX, _______,
+                                           XXXXXXX, XXXXXXX,      KC_P0
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_RAISE] = LAYOUT_charybdis_4x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+        KC_F12,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MNXT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MPLY, KC_LEFT,   KC_UP, KC_DOWN, KC_RGHT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, KC_MUTE,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       KC_MPRV, KC_HOME, KC_PGUP, KC_PGDN,  KC_END, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLD,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  _______, _______, XXXXXXX,    _______, XXXXXXX,
+                                           _______, _______,    XXXXXXX
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+
+  [LAYER_POINTER] = LAYOUT_charybdis_4x6(
+  // ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
+       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DPI_MOD, S_D_MOD,    S_D_MOD, DPI_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX,    XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
+  // ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
+       XXXXXXX, _______, DRGSCRL, SNIPING, EEP_RST,   RESET,      RESET, EEP_RST, SNIPING, DRGSCRL, _______, XXXXXXX,
+  // ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
+                                  KC_BTN2, KC_BTN1, KC_BTN3,    KC_BTN3, KC_BTN1,
+                                           XXXXXXX, KC_BTN2,    KC_BTN2
+  //                            ╰───────────────────────────╯ ╰──────────────────╯
+  ),
+};
+// clang-format on
+
+#ifdef POINTING_DEVICE_ENABLE
+#    ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
+    if (abs(mouse_report.x) > CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD || abs(mouse_report.y) > CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD) {
+        if (auto_pointer_layer_timer == 0) {
+            layer_on(LAYER_POINTER);
+#        ifdef RGB_MATRIX_ENABLE
+            rgb_matrix_mode_noeeprom(RGB_MATRIX_NONE);
+            rgb_matrix_sethsv_noeeprom(HSV_GREEN);
+#        endif  // RGB_MATRIX_ENABLE
+        }
+        auto_pointer_layer_timer = timer_read();
+    }
+    return mouse_report;
+}
+
+void matrix_scan_kb(void) {
+    if (auto_pointer_layer_timer != 0 && TIMER_DIFF_16(timer_read(), auto_pointer_layer_timer) >= CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS) {
+        auto_pointer_layer_timer = 0;
+        layer_off(LAYER_POINTER);
+#        ifdef RGB_MATRIX_ENABLE
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
+#        endif  // RGB_MATRIX_ENABLE
+    }
+    matrix_scan_user();
+}
+#    endif  // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+
+#    ifdef CHARYBDIS_AUTO_SNIPING_ON_LAYER
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    state = layer_state_set_user(state);
+    charybdis_set_pointer_sniping_enabled(layer_state_cmp(state, CHARYBDIS_AUTO_SNIPING_ON_LAYER));
+    return state;
+}
+#    endif  // CHARYBDIS_AUTO_SNIPING_ON_LAYER
+#endif      // POINTING_DEVICE_ENABLE
+
+#ifdef RGB_MATRIX_ENABLE
+// Forward-declare this helper function since it is defined in rgb_matrix.c.
+void rgb_matrix_update_pwm_buffers(void);
+#endif
+
+void shutdown_user(void) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_enable_noeeprom();
+    rgblight_mode_noeeprom(1);
+    rgblight_setrgb_red();
+#endif  // RGBLIGHT_ENABLE
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_set_color_all(RGB_RED);
+    rgb_matrix_update_pwm_buffers();
+#endif  // RGB_MATRIX_ENABLE
+}
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/readme.md b/keyboards/bastardkb/charybdis/4x6/keymaps/via/readme.md
new file mode 100644
index 0000000000..ad2634ef0c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/readme.md
@@ -0,0 +1,61 @@
+# Charybdis (4x6) `via` keymap
+
+The Charydbis (4x6) `via` keymap is inspired from the original [Dactyl Manuform](../../../../../handwired/dactyl_manuform) default keymap, with some features and changes specific to the Charybdis.
+
+This layout supports RGB matrix. However, due to space constraints on the MCU, only a limited number of effect can be enabled at once. Look at the `config.h` file and enable your favorite effect.
+
+## Customizing the keymap
+
+### Dynamic DPI scaling
+
+Use the following keycodes to change the default DPI:
+
+-   `POINTER_DEFAULT_DPI_FORWARD`: increases the DPI; decreases when shifted;
+-   `POINTER_DEFAULT_DPI_REVERSE`: decreases the DPI; increases when shifted.
+
+There's a maximum of 16 possible values for the sniping mode DPI. See the [Charybdis documentation](../../README.md) for more information.
+
+Use the following keycodes to change the sniping mode DPI:
+
+-   `POINTER_SNIPING_DPI_FORWARD`: increases the DPI; decreases when shifted;
+-   `POINTER_SNIPING_DPI_REVERSE`: decreases the DPI; increases when shifted.
+
+There's a maximum of 4 possible values for the sniping mode DPI. See the [Charybdis documentation](../../README.md) for more information.
+
+### Drag-scroll
+
+Use the `DRAGSCROLL_MODE` keycode to enable drag-scroll on hold. Use the `DRAGSCROLL_TOGGLE` keycode to enable/disable drag-scroll on key press.
+
+### Sniping
+
+Use the `SNIPING_MODE` keycode to enable sniping mode on hold. Use the `SNIPING_TOGGLE` keycode to enable/disable sniping mode on key press.
+
+Change the value of `CHARYBDIS_AUTO_SNIPING_ON_LAYER` to automatically enable sniping mode on layer change. By default, sniping mode is enabled on the pointer layer:
+
+```c
+#define CHARYBDIS_AUTO_SNIPING_ON_LAYER LAYER_POINTER
+```
+
+### Auto pointer layer
+
+The pointer layer can be automatically enabled when moving the trackball. To enable or disable this behavior, add or remove the following define:
+
+```c
+#define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
+```
+
+By default, the layer is turned off 1 second after the last registered trackball movement:
+
+```c
+#define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
+```
+
+The trigger sensibility can also be tuned. The lower the value, the more sensible the trigger:
+
+```c
+#define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
+```
+
+## Layout
+
+![Keymap layout (generated with keyboard-layout-editor.com)](https://i.imgur.com/qI7phR7.png)
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/via/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/bastardkb/charybdis/4x6/readme.md b/keyboards/bastardkb/charybdis/4x6/readme.md
new file mode 100644
index 0000000000..af2396cd6d
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/readme.md
@@ -0,0 +1,15 @@
+# Charybdis (4x6)
+
+An ergonomic keyboard with integrated trackball.
+
+The Charybdis is available in 4x6 and 3x5 form factor at [bastardkb.com](https://bastardkb.com).
+
+## Keymaps
+
+### [`default`](keymaps/default)
+
+A simple QWERTY layout with 3 layers.
+
+### [`via`](keymaps/via)
+
+Same as the [default](keymaps/default) keymap, but with VIA support.
diff --git a/keyboards/bastardkb/charybdis/4x6/rules.mk b/keyboards/bastardkb/charybdis/4x6/rules.mk
new file mode 100644
index 0000000000..e137f5d4cc
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/rules.mk
@@ -0,0 +1,37 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+AUDIO_SUPPORTED = no        # Audio is not supported.
+RGB_MATRIX_SUPPORTED = yes  # RGB matrix is supported and enabled by default.
+RGBLIGHT_SUPPORTED = yes    # RGB underglow is supported, but not enabled by default.
+RGB_MATRIX_ENABLE = yes     # Enable keyboard RGB matrix functionality
+RGB_MATRIX_DRIVER = WS2812
+
+# Enable link-time optimization by default.  The Charybdis packs a lot of
+# features (RGB, Via, trackball) in a small atmega32u4 package.
+LTO_ENABLE = yes
+
+# Charybdis is a split 4x6 keyboard with a maximum of 5 thumb keys (3 on the
+# trackball side).
+SPLIT_KEYBOARD = yes
+
+POINTING_DEVICE_ENABLE = yes # Enable trackball
+POINTING_DEVICE_DRIVER = pmw3360
+# https://qmk.fm/changes/2018-11-16-use-a-single-endpoint-for-hid-reports
+MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
diff --git a/keyboards/bastardkb/charybdis/charybdis.c b/keyboards/bastardkb/charybdis/charybdis.c
new file mode 100644
index 0000000000..f94682ba41
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/charybdis.c
@@ -0,0 +1,343 @@
+/*
+ * Copyright 2020 Christopher Courtney <drashna@live.com> (@drashna)
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Publicw 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 "charybdis.h"
+
+#ifdef CONSOLE_ENABLE
+#    include "print.h"
+#endif  // CONSOLE_ENABLE
+
+#ifdef POINTING_DEVICE_ENABLE
+#    ifndef CHARYBDIS_MINIMUM_DEFAULT_DPI
+#        define CHARYBDIS_MINIMUM_DEFAULT_DPI 400
+#    endif  // CHARYBDIS_MINIMUM_DEFAULT_DPI
+
+#    ifndef CHARYBDIS_DEFAULT_DPI_CONFIG_STEP
+#        define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 200
+#    endif  // CHARYBDIS_DEFAULT_DPI_CONFIG_STEP
+
+#    ifndef CHARYBDIS_MINIMUM_SNIPING_DPI
+#        define CHARYBDIS_MINIMUM_SNIPING_DPI 200
+#    endif  // CHARYBDIS_MINIMUM_SNIPER_MODE_DPI
+
+#    ifndef CHARYBDIS_SNIPING_DPI_CONFIG_STEP
+#        define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
+#    endif  // CHARYBDIS_SNIPING_DPI_CONFIG_STEP
+
+// Fixed DPI for drag-scroll.
+#    ifndef CHARYBDIS_DRAGSCROLL_DPI
+#        define CHARYBDIS_DRAGSCROLL_DPI 100
+#    endif  // CHARYBDIS_DRAGSCROLL_DPI
+
+#    ifndef CHARYBDIS_DRAGSCROLL_BUFFER_SIZE
+#        define CHARYBDIS_DRAGSCROLL_BUFFER_SIZE 6
+#    endif  // !CHARYBDIS_DRAGSCROLL_BUFFER_SIZE
+
+#    ifndef CHARYBDIS_POINTER_ACCELERATION_FACTOR
+#        define CHARYBDIS_POINTER_ACCELERATION_FACTOR 24
+#    endif  // !CHARYBDIS_POINTER_ACCELERATION_FACTOR
+
+typedef union {
+    uint8_t raw;
+    struct {
+        uint8_t pointer_default_dpi : 4;  // 16 steps available.
+        uint8_t pointer_sniping_dpi : 2;  // 4 steps available.
+        bool    is_dragscroll_enabled : 1;
+        bool    is_sniping_enabled : 1;
+    } __attribute__((packed));
+} charybdis_config_t;
+
+static charybdis_config_t g_charybdis_config = {0};
+
+/**
+ * \brief Set the value of `config` from EEPROM.
+ *
+ * Note that `is_dragscroll_enabled` and `is_sniping_enabled` are purposefully
+ * ignored since we do not want to persist this state to memory.  In practice,
+ * this state is always written to maximize write-performances.  Therefore, we
+ * explicitly set them to `false` in this function.
+ */
+static void read_charybdis_config_from_eeprom(charybdis_config_t* config) {
+    config->raw                   = eeconfig_read_kb() & 0xff;
+    config->is_dragscroll_enabled = false;
+    config->is_sniping_enabled    = false;
+}
+
+/**
+ * \brief Save the value of `config` to eeprom.
+ *
+ * Note that all values are written verbatim, including whether drag-scroll
+ * and/or sniper mode are enabled.  `read_charybdis_config_from_eeprom(…)`
+ * resets these 2 values to `false` since it does not make sense to persist
+ * these across reboots of the board.
+ */
+static void write_charybdis_config_to_eeprom(charybdis_config_t* config) { eeconfig_update_kb(config->raw); }
+
+/** \brief Return the current value of the pointer's default DPI. */
+static uint16_t get_pointer_default_dpi(charybdis_config_t* config) { return (uint16_t)config->pointer_default_dpi * CHARYBDIS_DEFAULT_DPI_CONFIG_STEP + CHARYBDIS_MINIMUM_DEFAULT_DPI; }
+
+/** \brief Return the current value of the pointer's sniper-mode DPI. */
+static uint16_t get_pointer_sniping_dpi(charybdis_config_t* config) { return (uint16_t)config->pointer_sniping_dpi * CHARYBDIS_SNIPING_DPI_CONFIG_STEP + CHARYBDIS_MINIMUM_SNIPING_DPI; }
+
+/** \brief Set the appropriate DPI for the input config. */
+static void maybe_update_pointing_device_cpi(charybdis_config_t* config) {
+    if (config->is_dragscroll_enabled) {
+        pointing_device_set_cpi(CHARYBDIS_DRAGSCROLL_DPI);
+    } else if (config->is_sniping_enabled) {
+        pointing_device_set_cpi(get_pointer_sniping_dpi(config));
+    } else {
+        pointing_device_set_cpi(get_pointer_default_dpi(config));
+    }
+}
+
+/**
+ * \brief Update the pointer's default DPI to the next or previous step.
+ *
+ * Increases the DPI value if `forward` is `true`, decreases it otherwise.
+ * The increment/decrement steps are equal to CHARYBDIS_DEFAULT_DPI_CONFIG_STEP.
+ */
+static void step_pointer_default_dpi(charybdis_config_t* config, bool forward) {
+    config->pointer_default_dpi += forward ? 1 : -1;
+    maybe_update_pointing_device_cpi(config);
+}
+
+/**
+ * \brief Update the pointer's sniper-mode DPI to the next or previous step.
+ *
+ * Increases the DPI value if `forward` is `true`, decreases it otherwise.
+ * The increment/decrement steps are equal to CHARYBDIS_SNIPING_DPI_CONFIG_STEP.
+ */
+static void step_pointer_sniping_dpi(charybdis_config_t* config, bool forward) {
+    config->pointer_sniping_dpi += forward ? 1 : -1;
+    maybe_update_pointing_device_cpi(config);
+}
+
+uint16_t charybdis_get_pointer_default_dpi(void) { return get_pointer_default_dpi(&g_charybdis_config); }
+
+uint16_t charybdis_get_pointer_sniping_dpi(void) { return get_pointer_sniping_dpi(&g_charybdis_config); }
+
+void charybdis_cycle_pointer_default_dpi_noeeprom(bool forward) { step_pointer_default_dpi(&g_charybdis_config, forward); }
+
+void charybdis_cycle_pointer_default_dpi(bool forward) {
+    step_pointer_default_dpi(&g_charybdis_config, forward);
+    write_charybdis_config_to_eeprom(&g_charybdis_config);
+}
+
+void charybdis_cycle_pointer_sniping_dpi_noeeprom(bool forward) { step_pointer_sniping_dpi(&g_charybdis_config, forward); }
+
+void charybdis_cycle_pointer_sniping_dpi(bool forward) {
+    step_pointer_sniping_dpi(&g_charybdis_config, forward);
+    write_charybdis_config_to_eeprom(&g_charybdis_config);
+}
+
+bool charybdis_get_pointer_sniping_enabled(void) { return g_charybdis_config.is_sniping_enabled; }
+
+void charybdis_set_pointer_sniping_enabled(bool enable) {
+    g_charybdis_config.is_sniping_enabled = enable;
+    maybe_update_pointing_device_cpi(&g_charybdis_config);
+}
+
+bool charybdis_get_pointer_dragscroll_enabled(void) { return g_charybdis_config.is_dragscroll_enabled; }
+
+void charybdis_set_pointer_dragscroll_enabled(bool enable) {
+    g_charybdis_config.is_dragscroll_enabled = enable;
+    maybe_update_pointing_device_cpi(&g_charybdis_config);
+}
+
+void pointing_device_init_kb(void) { maybe_update_pointing_device_cpi(&g_charybdis_config); }
+
+#    ifndef CONSTRAIN_HID
+#        define CONSTRAIN_HID(value) ((value) < -127 ? -127 : ((value) > 127 ? 127 : (value)))
+#    endif  // !CONSTRAIN_HID
+
+/**
+ * \brief Add optional acceleration effect.
+ *
+ * If `CHARYBDIS_ENABLE_POINTER_ACCELERATION` is defined, add a simple and naive
+ * acceleration effect to the provided value.  Return the value unchanged
+ * otherwise.
+ */
+#    ifndef DISPLACEMENT_WITH_ACCELERATION
+#        ifdef CHARYBDIS_POINTER_ACCELERATION_ENABLE
+#            define DISPLACEMENT_WITH_ACCELERATION(d) (CONSTRAIN_HID(d > 0 ? d * d / CHARYBDIS_POINTER_ACCELERATION_FACTOR + d : -d * d / CHARYBDIS_POINTER_ACCELERATION_FACTOR + d))
+#        else  // !CHARYBDIS_POINTER_ACCELERATION_ENABLE
+#            define DISPLACEMENT_WITH_ACCELERATION(d) (d)
+#        endif  // CHARYBDIS_POINTER_ACCELERATION_ENABLE
+#    endif      // !DISPLACEMENT_WITH_ACCELERATION
+
+/**
+ * \brief Augment the pointing device behavior.
+ *
+ * Implement the Charybdis-specific features for pointing devices:
+ *   - Drag-scroll
+ *   - Sniping
+ *   - Acceleration
+ */
+static void pointing_device_task_charybdis(report_mouse_t* mouse_report) {
+    static int16_t scroll_buffer_x = 0;
+    static int16_t scroll_buffer_y = 0;
+    if (g_charybdis_config.is_dragscroll_enabled) {
+#    ifdef CHARYBDIS_DRAGSCROLL_REVERSE_X
+        scroll_buffer_x -= mouse_report->x;
+#    else
+        scroll_buffer_x += mouse_report->x;
+#    endif  // CHARYBDIS_DRAGSCROLL_REVERSE_X
+#    ifdef CHARYBDIS_DRAGSCROLL_REVERSE_Y
+        scroll_buffer_y -= mouse_report->y;
+#    else
+        scroll_buffer_y += mouse_report->y;
+#    endif  // CHARYBDIS_DRAGSCROLL_REVERSE_Y
+        mouse_report->x = 0;
+        mouse_report->y = 0;
+        if (abs(scroll_buffer_x) > CHARYBDIS_DRAGSCROLL_BUFFER_SIZE) {
+            mouse_report->h = scroll_buffer_x > 0 ? 1 : -1;
+            scroll_buffer_x = 0;
+        }
+        if (abs(scroll_buffer_y) > CHARYBDIS_DRAGSCROLL_BUFFER_SIZE) {
+            mouse_report->v = scroll_buffer_y > 0 ? 1 : -1;
+            scroll_buffer_y = 0;
+        }
+    } else if (!g_charybdis_config.is_sniping_enabled) {
+        mouse_report->x = DISPLACEMENT_WITH_ACCELERATION(mouse_report->x);
+        mouse_report->y = DISPLACEMENT_WITH_ACCELERATION(mouse_report->y);
+    }
+}
+
+report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
+    if (is_keyboard_master()) {
+        pointing_device_task_charybdis(&mouse_report);
+        mouse_report = pointing_device_task_user(mouse_report);
+    }
+    return mouse_report;
+}
+
+#    if defined(POINTING_DEVICE_ENABLE) && !defined(NO_CHARYBDIS_KEYCODES)
+/** \brief Whether SHIFT mod is enabled. */
+static bool has_shift_mod(void) {
+#        ifdef NO_ACTION_ONESHOT
+    return mod_config(get_mods()) & MOD_MASK_SHIFT;
+#        else
+    return mod_config(get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT;
+#        endif  // NO_ACTION_ONESHOT
+}
+#    endif  // POINTING_DEVICE_ENABLE && !NO_CHARYBDIS_KEYCODES
+
+/**
+ * \brief Outputs the Charybdis configuration to console.
+ *
+ * Prints the in-memory configuration structure to console, for debugging.
+ * Includes:
+ *   - raw value
+ *   - drag-scroll: on/off
+ *   - sniping: on/off
+ *   - default DPI: internal table index/actual DPI
+ *   - sniping DPI: internal table index/actual DPI
+ */
+static void debug_charybdis_config_to_console(charybdis_config_t* config) {
+#    ifdef CONSOLE_ENABLE
+    dprintf("(charybdis) process_record_kb: config = {\n"
+            "\traw = 0x%04X,\n"
+            "\t{\n"
+            "\t\tis_dragscroll_enabled=%b\n"
+            "\t\tis_sniping_enabled=%b\n"
+            "\t\tdefault_dpi=0x%02X (%ld)\n"
+            "\t\tsniping_dpi=0x%01X (%ld)\n"
+            "\t}\n"
+            "}\n",
+            config->raw, config->is_dragscroll_enabled, config->is_sniping_enabled, config->pointer_default_dpi, get_pointer_default_dpi(config), config->pointer_sniping_dpi, get_pointer_sniping_dpi(config));
+#    endif  // CONSOLE_ENABLE
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
+    if (!process_record_user(keycode, record)) {
+        debug_charybdis_config_to_console(&g_charybdis_config);
+        return false;
+    }
+#    ifdef POINTING_DEVICE_ENABLE
+#        ifndef NO_CHARYBDIS_KEYCODES
+    switch (keycode) {
+        case POINTER_DEFAULT_DPI_FORWARD:
+            if (record->event.pressed) {
+                // Step backward if shifted, forward otherwise.
+                charybdis_cycle_pointer_default_dpi(/* forward= */ !has_shift_mod());
+            }
+            break;
+        case POINTER_DEFAULT_DPI_REVERSE:
+            if (record->event.pressed) {
+                // Step forward if shifted, backward otherwise.
+                charybdis_cycle_pointer_default_dpi(/* forward= */ has_shift_mod());
+            }
+            break;
+        case POINTER_SNIPING_DPI_FORWARD:
+            if (record->event.pressed) {
+                // Step backward if shifted, forward otherwise.
+                charybdis_cycle_pointer_sniping_dpi(/* forward= */ !has_shift_mod());
+            }
+            break;
+        case POINTER_SNIPING_DPI_REVERSE:
+            if (record->event.pressed) {
+                // Step forward if shifted, backward otherwise.
+                charybdis_cycle_pointer_sniping_dpi(/* forward= */ has_shift_mod());
+            }
+            break;
+        case SNIPING_MODE:
+            charybdis_set_pointer_sniping_enabled(record->event.pressed);
+            break;
+        case SNIPING_MODE_TOGGLE:
+            if (record->event.pressed) {
+                charybdis_set_pointer_sniping_enabled(!charybdis_get_pointer_sniping_enabled());
+            }
+            break;
+        case DRAGSCROLL_MODE:
+            charybdis_set_pointer_dragscroll_enabled(record->event.pressed);
+            break;
+        case DRAGSCROLL_MODE_TOGGLE:
+            if (record->event.pressed) {
+                charybdis_set_pointer_dragscroll_enabled(!charybdis_get_pointer_dragscroll_enabled());
+            }
+            break;
+    }
+#        endif  // !NO_CHARYBDIS_KEYCODES
+#        ifndef MOUSEKEY_ENABLE
+    // Simulate mouse keys if full support is not enabled (reduces firmware size
+    // while maintaining support for mouse keys).
+    if (IS_MOUSEKEY_BUTTON(keycode)) {
+        report_mouse_t mouse_report = pointing_device_get_report();
+        mouse_report.buttons        = pointing_device_handle_buttons(mouse_report.buttons, record->event.pressed, keycode - KC_MS_BTN1);
+        pointing_device_set_report(mouse_report);
+        pointing_device_send();
+    }
+#        endif  // !MOUSEKEY_ENABLE
+#    endif      // POINTING_DEVICE_ENABLE
+    debug_charybdis_config_to_console(&g_charybdis_config);
+    return true;
+}
+
+void eeconfig_init_kb(void) {
+    g_charybdis_config.raw = 0;
+    write_charybdis_config_to_eeprom(&g_charybdis_config);
+    maybe_update_pointing_device_cpi(&g_charybdis_config);
+    eeconfig_init_user();
+}
+
+void matrix_init_kb(void) {
+    read_charybdis_config_from_eeprom(&g_charybdis_config);
+    matrix_init_user();
+}
+#endif  // POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/charybdis/charybdis.h b/keyboards/bastardkb/charybdis/charybdis.h
new file mode 100644
index 0000000000..42423c0c92
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/charybdis.h
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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
+
+// clang-format off
+#if defined(KEYBOARD_bastardkb_charybdis_3x5)
+#    include "3x5.h"
+#elif defined(KEYBOARD_bastardkb_charybdis_4x6)
+#    include "4x6.h"
+#else
+#    error "Unsuported format"
+#endif
+// clang-format on
+
+#include "quantum.h"
+
+#ifdef POINTING_DEVICE_ENABLE
+#    ifndef NO_CHARYBDIS_KEYCODES
+enum charybdis_keycodes {
+#        ifdef VIA_ENABLE
+    POINTER_DEFAULT_DPI_FORWARD = USER00,
+#        else
+    POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE,
+#        endif  // VIA_ENABLE
+    POINTER_DEFAULT_DPI_REVERSE,
+    POINTER_SNIPING_DPI_FORWARD,
+    POINTER_SNIPING_DPI_REVERSE,
+    SNIPING_MODE,
+    SNIPING_MODE_TOGGLE,
+    DRAGSCROLL_MODE,
+    DRAGSCROLL_MODE_TOGGLE,
+    CHARYBDIS_SAFE_RANGE,
+};
+
+#        define DPI_MOD POINTER_DEFAULT_DPI_FORWARD
+#        define DPI_RMOD POINTER_DEFAULT_DPI_REVERSE
+#        define S_D_MOD POINTER_SNIPING_DPI_FORWARD
+#        define S_D_RMOD POINTER_SNIPING_DPI_REVERSE
+#        define SNIPING SNIPING_MODE
+#        define SNP_TOG SNIPING_MODE_TOGGLE
+#        define DRGSCRL DRAGSCROLL_MODE
+#        define DRG_TOG DRAGSCROLL_MODE_TOGGLE
+#    endif  // !NO_CHARYBDIS_KEYCODES
+
+/** \brief Return the current DPI value for the pointer's default mode. */
+uint16_t charybdis_get_pointer_default_dpi(void);
+
+/**
+ * \brief Update the pointer's default DPI to the next or previous step.
+ *
+ * Increases the DPI value if `forward` is `true`, decreases it otherwise.
+ * The increment/decrement steps are equal to CHARYBDIS_DEFAULT_DPI_CONFIG_STEP.
+ *
+ * The new value is persisted in EEPROM.
+ */
+void charybdis_cycle_pointer_default_dpi(bool forward);
+
+/**
+ * \brief Same as `charybdis_cycle_pointer_default_dpi`, but do not write to
+ * EEPROM.
+ *
+ * This means that reseting the board will revert the value to the last
+ * persisted one.
+ */
+void charybdis_cycle_pointer_default_dpi_noeeprom(bool forward);
+
+/** \brief Return the current DPI value for the pointer's sniper-mode. */
+uint16_t charybdis_get_pointer_sniping_dpi(void);
+
+/**
+ * \brief Update the pointer's sniper-mode DPI to the next or previous step.
+ *
+ * Increases the DPI value if `forward` is `true`, decreases it otherwise.
+ * The increment/decrement steps are equal to CHARYBDIS_SNIPING_DPI_CONFIG_STEP.
+ *
+ * The new value is persisted in EEPROM.
+ */
+void charybdis_cycle_pointer_sniping_dpi(bool forward);
+
+/**
+ * \brief Same as `charybdis_cycle_pointer_sniping_dpi`, but do not write to
+ * EEPROM.
+ *
+ * This means that reseting the board will revert the value to the last
+ * persisted one.
+ */
+void charybdis_cycle_pointer_sniping_dpi_noeeprom(bool forward);
+
+/** \brief Whether sniper-mode is enabled. */
+bool charybdis_get_pointer_sniping_enabled(void);
+
+/**
+ * \brief Enable/disable sniper mode.
+ *
+ * When sniper mode is enabled the dpi is reduced to slow down the pointer for
+ * more accurate movements.
+ */
+void charybdis_set_pointer_sniping_enabled(bool enable);
+
+/** \brief Whether drag-scroll is enabled. */
+bool charybdis_get_pointer_dragscroll_enabled(void);
+
+/**
+ * \brief Enable/disable drag-scroll mode.
+ *
+ * When drag-scroll mode is enabled, horizontal and vertical pointer movements
+ * are translated into horizontal and vertical scroll movements.
+ */
+void charybdis_set_pointer_dragscroll_enabled(bool enable);
+#endif  // POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/charybdis/config.h b/keyboards/bastardkb/charybdis/config.h
new file mode 100644
index 0000000000..c88451335e
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/config.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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"
+
+/* Pointing device configuration. */
+
+// Enable use of pointing device on slave split.
+#define SPLIT_POINTING_ENABLE
+
+// Pointing device is on the right split.
+#define POINTING_DEVICE_RIGHT
+
+// Limits the frequency that the sensor is polled for motion.
+#define POINTING_DEVICE_TASK_THROTTLE_MS 1
+
+/** \brief Invert X axis on mouse reports. */
+#define POINTING_DEVICE_INVERT_X
diff --git a/keyboards/bastardkb/charybdis/post_config.h b/keyboards/bastardkb/charybdis/post_config.h
new file mode 100644
index 0000000000..540751f6c6
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/post_config.h
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2012 Jun Wako <wakojun@gmail.com>
+ * Copyright 2015 Jack Humbert
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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
+
+/* Mouse config. */
+
+#ifndef MOUSEKEY_MOVE_DELTA
+#    ifndef MK_KINETIC_SPEED
+#        define MOUSEKEY_MOVE_DELTA 5
+#    else  // MK_KINETIC_SPEED
+#        define MOUSEKEY_MOVE_DELTA 25
+#    endif  // !MK_KINETIC_SPEED
+#endif      // !MOUSEKEY_MOVE_DELTA
+
+#ifndef MOUSEKEY_DELAY
+#    ifndef MK_KINETIC_SPEED
+#        define MOUSEKEY_DELAY 300
+#    else  // MK_KINETIC_SPEED
+#        define MOUSEKEY_DELAY 8
+#    endif  // !MK_KINETIC_SPEED
+#endif      // !MOUSEKEY_DELAY
+
+#ifndef MOUSEKEY_INTERVAL
+#    ifndef MK_KINETIC_SPEED
+#        define MOUSEKEY_INTERVAL 50
+#    else  // MK_KINETIC_SPEED
+#        define MOUSEKEY_INTERVAL 20
+#    endif  // !MK_KINETIC_SPEED
+#endif      // !MOUSEKEY_INTERNAL
+
+#ifndef MOUSEKEY_MAX_SPEED
+#    define MOUSEKEY_MAX_SPEED 7
+#endif  // !MOUSEKEY_MAX_SPEED
+
+#ifndef MOUSEKEY_TIME_TO_MAX
+#    define MOUSEKEY_TIME_TO_MAX 60
+#endif  // !MOUSEKEY_TIME_TO_MAX
+
+#ifndef MOUSEKEY_INITIAL_SPEED
+#    define MOUSEKEY_INITIAL_SPEED 100
+#endif  // !MOUSEKEY_INITIAL_SPEED
+
+#ifndef MOUSEKEY_BASE_SPEED
+#    define MOUSEKEY_BASE_SPEED 1000
+#endif  // !MOUSEKEY_BASE_SPEED
+
+#ifndef MOUSEKEY_DECELERATED_SPEED
+#    define MOUSEKEY_DECELERATED_SPEED 400
+#endif  // !MOUSEKEY_DECELERATED_SPEED
+
+#ifndef MOUSEKEY_ACCELERATED_SPEED
+#    define MOUSEKEY_ACCELERATED_SPEED 3000
+#endif  // !MOUSEKEY_ACCELERATED_SPEED
+
+/* Mouse scroll config. */
+
+#ifndef MOUSEKEY_WHEEL_DELAY
+#    define MOUSEKEY_WHEEL_DELAY 15
+#endif  // !MOUSEKEY_WHEEL_DELAY
+
+#ifndef MOUSEKEY_WHEEL_DELTA
+#    define MOUSEKEY_WHEEL_DELTA 1
+#endif  // !MOUSEKEY_WHEEL_DELTA
+
+#ifndef MOUSEKEY_WHEEL_INTERVAL
+#    define MOUSEKEY_WHEEL_INTERVAL 50
+#endif  // !MOUSEKEY_WHEEL_INTERVAL
+
+#ifndef MOUSEKEY_WHEEL_MAX_SPEED
+#    define MOUSEKEY_WHEEL_MAX_SPEED 8
+#endif  // !MOUSEKEY_WHEEL_MAX_SPEED
+
+#ifndef MOUSEKEY_WHEEL_TIME_TO_MAX
+#    define MOUSEKEY_WHEEL_TIME_TO_MAX 80
+#endif  // !MOUSEKEY_WHEEL_TIME_TO_MAX
+
+#ifndef MOUSEKEY_WHEEL_INITIAL_MOVEMENTS
+#    define MOUSEKEY_WHEEL_INITIAL_MOVEMENTS 8
+#endif  // !MOUSEKEY_WHEEL_INITIAL_MOVEMENTS
+
+#ifndef MOUSEKEY_WHEEL_BASE_MOVEMENTS
+#    define MOUSEKEY_WHEEL_BASE_MOVEMENTS 48
+#endif  // !MOUSEKEY_WHEEL_BASE_MOVEMENTS
+
+#ifndef MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS
+#    define MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS 48
+#endif  // !MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS
+
+#ifndef MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS
+#    define MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS 8
+#endif  // !MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS
diff --git a/keyboards/bastardkb/charybdis/readme.md b/keyboards/bastardkb/charybdis/readme.md
new file mode 100644
index 0000000000..461f33117c
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/readme.md
@@ -0,0 +1,178 @@
+# Charybdis (6x4, 5x3 "Nano")
+
+An ergonomic keyboard with integrated trackball.
+
+Engineered to be a full mouse replacement solution with high-quality, custom-developed components.
+
+There are 6x4 and 5x3 "Nano" versions.
+
+-   Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb)
+-   Hardware Supported: elite-C V4
+-   Hardware Availability: [Bastard Keyboards](https://bastardkb.com)
+
+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 the [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+Check out the [keyboard build guides](https://docs.bastardkb.com) for the Charybdis and other ergonomic keyboards.
+
+## Building the firmware
+
+### Charybdis (4x6)
+
+The `default` keymap is inspired from the original [Dactyl Manuform](../../handwired/dactyl_manuform) layout.
+
+```shell
+qmk compile -kb bastardkb/charybdis/4x6 -km default
+```
+
+Check out the `via` layout if you're looking for VIA support:
+
+```shell
+qmk compile -kb bastardkb/charybdis/4x6 -km via
+```
+
+### Charybdis (3x5)
+
+The `default` keymap is inspired from the original [Dactyl Manuform](../../handwired/dactyl_manuform) layout.
+
+```shell
+qmk compile -kb bastardkb/charybdis/3x5 -km default
+```
+
+Check out the `via` layout if you're looking for VIA support:
+
+```shell
+qmk compile -kb bastardkb/charybdis/3x5 -km via
+```
+
+## Customizing the firmware
+
+### Dynamic DPI scaling
+
+The pointer's DPI can be changed at runtime.
+
+By default, the DPI is set to `400`. The Charybdis supports up to 16 different DPI values. By default, it cycles between `400` and `3400`, with a step of `200` (_ie._ `400`, `600`, `800`, …, `3400`).
+
+Calling `charybdis_cycle_pointer_default_dpi(bool forward)` will cycle forward or backward the possible values.
+
+Use `charybdis_cycle_pointer_default_dpi_noeeprom(bool forward)` to change the DPI value without persisting the change to EEPROM (_ie._ resetting the board will revert to the last saved value).
+
+`charybdis_get_pointer_default_dpi()` returns the current DPI value.
+
+This behavior can be further customized with the following defines:
+
+```c
+#define CHARYBDIS_MINIMUM_DEFAULT_DPI 400
+#define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 200
+```
+
+### Drag-scroll
+
+Drag-scroll enables scrolling with the trackball. When drag-scroll is enabled, the trackball's `x` and `y` movements are converted into `h` (horizontal) and `v` (vertical) movement, effectively sending scroll instructions to the host system.
+
+Call `charybdis_set_pointer_dragscroll_enabled(bool enable)` to enable/disable drag-scroll.
+
+`charybdis_get_pointer_dragscroll_enabled()` returns whether sniping mode is currently enabled.
+
+To invert the horizontal scrolling direction, define `CHARYBDIS_DRAGSCROLL_REVERSE_X`:
+
+```c
+#define CHARYBDIS_DRAGSCROLL_REVERSE_X
+```
+
+To invert the vertical scrolling direction (_ie._ mimic macOS "natural" scroll direction), define `CHARYBDIS_DRAGSCROLL_REVERSE_Y`:
+
+```c
+#define CHARYBDIS_DRAGSCROLL_REVERSE_Y
+```
+
+This only affects the vertical scroll direction.
+
+### Sniping mode
+
+Sniping mode slows down the pointer for more precise gestures. It is useful when combined with a higher default DPI.
+
+Call `charybdis_set_pointer_sniping_enabled(bool enable)` to enable/disable sniping mode.
+
+`charybdis_get_pointer_sniping_enabled()` returns whether sniping mode is currently enabled.
+
+Like the default pointer's DPI, the sniper mode DPI can be changed at runtime.
+
+By default, sniping mode lowers the DPI to `200`. This can be changed at runtime: the Charybdis supports up to 4 different DPI values for sniping mode. By default, it cycles between `200`, `300`, `400` and `500`.
+
+Calling `charybdis_cycle_pointer_sniping_dpi(bool forward)` will cycle forward or backward the possible values.
+
+Use `charybdis_cycle_pointer_sniping_dpi_noeeprom(bool forward)` to change the sniping mode DPI value without persisting the change to EEPROM (_ie._ resetting the board will revert to the last saved value).
+
+`charybdis_get_pointer_sniping_dpi()` returns the current sniping mode DPI value.
+
+This behavior can be further customized with the following defines:
+
+```c
+#define CHARYBDIS_MINIMUM_SNIPING_DPI 200
+#define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
+```
+
+### Acceleration
+
+By default, the pointer's movements are linear. To enable acceleration, add the following define:
+
+```c
+#define CHARYBDIS_POINTER_ACCELERATION_ENABLE
+```
+
+The acceleration factor can be further tune _via_ the `CHARYBDIS_POINTER_ACCELERATION_FACTOR`:
+
+```c
+#define CHARYBDIS_POINTER_ACCELERATION_FACTOR 24
+```
+
+### Custom keycodes
+
+The Charybdis firmware defines a number of keycodes to leverage its features, namely:
+
+```
+#ifndef NO_CHARYBDIS_KEYCODES
+enum charybdis_keycodes {
+  POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE,
+  POINTER_DEFAULT_DPI_REVERSE,
+  POINTER_SNIPING_DPI_FORWARD,
+  POINTER_SNIPING_DPI_REVERSE,
+  SNIPING_MODE,
+  SNIPING_MODE_TOGGLE,
+  DRAGSCROLL_MODE,
+  DRAGSCROLL_MODE_TOGGLE,
+  CHARYBDIS_SAFE_RANGE,
+};
+
+#define DPI_MOD POINTER_DEFAULT_DPI_FORWARD
+#define DPI_RMOD POINTER_DEFAULT_DPI_REVERSE
+#define S_D_MOD POINTER_SNIPING_DPI_FORWARD
+#define S_D_RMOD POINTER_SNIPING_DPI_REVERSE
+#define SNIPING SNIPING_MODE
+#define SNP_TOG SNIPING_MODE_TOGGLE
+#define DRGSCRL DRAGSCROLL_MODE
+#define DRG_TOG DRAGSCROLL_MODE_TOGGLE
+#endif // !NO_CHARYBDIS_KEYCODES
+```
+
+Users extending the keycode set themselves (either in their keymap, or in their userspace) must start at `CHARYBDIS_SAFE_RANGE` to avoid conflicts, _eg._:
+
+```c
+enum userspace_keycodes {
+#ifndef NO_CHARYBDIS_KEYCODES
+  MY_FIRST_KEYCODE = CHARYBDIS_SAFE_RANGE,
+#else
+  MY_FIRST_KEYCODE = SAFE_RANGE,
+#endif // !NO_CHARYBDIS_KEYCODES
+  MY_SECOND_KEYCODE,
+  …
+};
+```
+
+To disable the custom keycodes, and reduce binary size, simply add a definition in `config.h`:
+
+```c
+#define NO_CHARYBDIS_KEYCODES
+```

From 61246deec549050ae614fac007002da8e088780d Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Sat, 22 Jan 2022 13:57:03 +0800
Subject: [PATCH 348/867] [Keyboard] Code consistency updates for CRKBD
 (#15779)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/crkbd/keymaps/default/config.h | 21 +++++++++++++--------
 keyboards/crkbd/keymaps/default/rules.mk |  7 +++++--
 keyboards/crkbd/keymaps/via/config.h     | 24 ++++++++++++++----------
 keyboards/crkbd/keymaps/via/rules.mk     | 12 ++++++------
 keyboards/crkbd/rev1/config.h            |  4 ++--
 5 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/keyboards/crkbd/keymaps/default/config.h b/keyboards/crkbd/keymaps/default/config.h
index 937d67e25f..8f4d73ca22 100644
--- a/keyboards/crkbd/keymaps/default/config.h
+++ b/keyboards/crkbd/keymaps/default/config.h
@@ -28,19 +28,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define USE_SERIAL_PD2
-
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 100
+//#define TAPPING_FORCE_HOLD
+//#define TAPPING_TERM 100
 
 #ifdef RGBLIGHT_ENABLE
-    #undef RGBLED_NUM
-    #define RGBLIGHT_ANIMATIONS
-    #define RGBLED_NUM 27
+    #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
+    #define RGBLIGHT_EFFECT_TWINKLE
     #define RGBLIGHT_LIMIT_VAL 120
     #define RGBLIGHT_HUE_STEP 10
     #define RGBLIGHT_SAT_STEP 17
     #define RGBLIGHT_VAL_STEP 17
 #endif
 
-#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
\ No newline at end of file
+#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/default/rules.mk b/keyboards/crkbd/keymaps/default/rules.mk
index d34d066ded..c14c202fae 100644
--- a/keyboards/crkbd/keymaps/default/rules.mk
+++ b/keyboards/crkbd/keymaps/default/rules.mk
@@ -1,2 +1,5 @@
-OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
+MOUSEKEY_ENABLE = yes    # Mouse keys
+RGBLIGHT_ENABLE = yes    # Enable WS2812 RGB underlight.
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
+LTO_ENABLE      = yes
diff --git a/keyboards/crkbd/keymaps/via/config.h b/keyboards/crkbd/keymaps/via/config.h
index fc8e7c4781..806b77d013 100644
--- a/keyboards/crkbd/keymaps/via/config.h
+++ b/keyboards/crkbd/keymaps/via/config.h
@@ -25,16 +25,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define EE_HANDS
 
 #ifdef RGBLIGHT_ENABLE
-#    undef RGBLED_NUM
-#    define RGBLIGHT_ANIMATIONS
-#    define RGBLED_NUM 54
-#    undef RGBLED_SPLIT
-#    define RGBLED_SPLIT \
-        { 27, 27 }
-#    define RGBLIGHT_LIMIT_VAL 120
-#    define RGBLIGHT_HUE_STEP  10
-#    define RGBLIGHT_SAT_STEP  17
-#    define RGBLIGHT_VAL_STEP  17
+    #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
+//  #define RGBLIGHT_EFFECT_TWINKLE
+    #define RGBLIGHT_LIMIT_VAL 120
+    #define RGBLIGHT_HUE_STEP 10
+    #define RGBLIGHT_SAT_STEP 17
+    #define RGBLIGHT_VAL_STEP 17
 #endif
 
 #define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
diff --git a/keyboards/crkbd/keymaps/via/rules.mk b/keyboards/crkbd/keymaps/via/rules.mk
index 69841c2358..ee593dcbb7 100644
--- a/keyboards/crkbd/keymaps/via/rules.mk
+++ b/keyboards/crkbd/keymaps/via/rules.mk
@@ -1,6 +1,6 @@
-MOUSEKEY_ENABLE     = no     # Mouse keys
-RGBLIGHT_ENABLE     = yes    # Enable WS2812 RGB underlight.
-VIA_ENABLE          = yes         # Enable VIA
-OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
-LTO_ENABLE          = yes
+MOUSEKEY_ENABLE = no     # Mouse keys
+RGBLIGHT_ENABLE = yes    # Enable WS2812 RGB underlight.
+VIA_ENABLE      = yes    # Enable VIA
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
+LTO_ENABLE      = yes
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
index 337859d05c..9f196a7166 100644
--- a/keyboards/crkbd/rev1/config.h
+++ b/keyboards/crkbd/rev1/config.h
@@ -25,9 +25,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN      D3
 
 #ifdef RGBLIGHT_ENABLE
-#    define RGBLED_NUM 12 // Number of LEDs
+#    define RGBLED_NUM 54 // Number of LEDs
 #    define RGBLED_SPLIT \
-        { 6, 6 }
+        { 27, 27 }
 #    define RGBLIGHT_SPLIT
 #endif
 

From fc914e617e63f5ec32c04e01efaffd9ec4545e89 Mon Sep 17 00:00:00 2001
From: Rifaa Subekti <68178825+oceeean@users.noreply.github.com>
Date: Sat, 22 Jan 2022 14:09:00 +0800
Subject: [PATCH 349/867] [Keyboard] add Yuri (#15874)

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/ocean/yuri/config.h                 | 50 ++++++++++++++++
 keyboards/ocean/yuri/info.json                | 59 +++++++++++++++++++
 keyboards/ocean/yuri/keymaps/default/keymap.c | 45 ++++++++++++++
 keyboards/ocean/yuri/keymaps/via/keymap.c     | 45 ++++++++++++++
 keyboards/ocean/yuri/keymaps/via/rules.mk     |  2 +
 keyboards/ocean/yuri/readme.md                | 24 ++++++++
 keyboards/ocean/yuri/rules.mk                 | 18 ++++++
 keyboards/ocean/yuri/yuri.c                   | 15 +++++
 keyboards/ocean/yuri/yuri.h                   | 31 ++++++++++
 9 files changed, 289 insertions(+)
 create mode 100644 keyboards/ocean/yuri/config.h
 create mode 100644 keyboards/ocean/yuri/info.json
 create mode 100644 keyboards/ocean/yuri/keymaps/default/keymap.c
 create mode 100644 keyboards/ocean/yuri/keymaps/via/keymap.c
 create mode 100644 keyboards/ocean/yuri/keymaps/via/rules.mk
 create mode 100644 keyboards/ocean/yuri/readme.md
 create mode 100644 keyboards/ocean/yuri/rules.mk
 create mode 100644 keyboards/ocean/yuri/yuri.c
 create mode 100644 keyboards/ocean/yuri/yuri.h

diff --git a/keyboards/ocean/yuri/config.h b/keyboards/ocean/yuri/config.h
new file mode 100644
index 0000000000..d8313fd71f
--- /dev/null
+++ b/keyboards/ocean/yuri/config.h
@@ -0,0 +1,50 @@
+/*Copyright 2022 Ocean
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+#define VENDOR_ID       0x9624
+#define PRODUCT_ID      0x0003
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Ocean
+#define PRODUCT         Yuri
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 14
+
+/*
+ * 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)
+ *
+ */
+/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
+#define MATRIX_ROW_PINS {F4, F5, F6, F7}
+#define MATRIX_COL_PINS {D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1}
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
diff --git a/keyboards/ocean/yuri/info.json b/keyboards/ocean/yuri/info.json
new file mode 100644
index 0000000000..68d9668579
--- /dev/null
+++ b/keyboards/ocean/yuri/info.json
@@ -0,0 +1,59 @@
+{
+    "keyboard_name": "Yuri", 
+    "url": "tokopedia.com/strat0s", 
+    "maintainer": "Ocean", 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"x":0, "y":0}, 
+                       {"x":1.25, "y":0}, 
+                       {"x":2.25, "y":0}, 
+                       {"x":3.25, "y":0}, 
+                       {"x":4.25, "y":0}, 
+                       {"x":5.25, "y":0}, 
+                       {"x":6.25, "y":0}, 
+                       {"x":9.25, "y":0}, 
+                       {"x":10.25, "y":0}, 
+                       {"x":11.25, "y":0}, 
+                       {"x":12.25, "y":0}, 
+                       {"x":13.25, "y":0}, 
+                       {"x":14.25, "y":0}, 
+                       {"x":15.25, "y":0}, 
+                       {"x":0, "y":1}, 
+                       {"x":1.25, "y":1, "w":1.25}, 
+                       {"x":2.5, "y":1}, 
+                       {"x":3.5, "y":1}, 
+                       {"x":4.5, "y":1}, 
+                       {"x":5.5, "y":1}, 
+                       {"x":6.5, "y":1}, 
+                       {"x":9.5, "y":1}, 
+                       {"x":10.5, "y":1}, 
+                       {"x":11.5, "y":1}, 
+                       {"x":12.5, "y":1}, 
+                       {"x":13.5, "y":1}, 
+                       {"x":14.5, "y":1, "w":1.75}, 
+                       {"x":0, "y":2}, 
+                       {"x":1.25, "y":2, "w":1.75}, 
+                       {"x":3, "y":2},
+                       {"x":4, "y":2}, 
+                       {"x":5, "y":2}, 
+                       {"x":6, "y":2}, 
+                       {"x":7, "y":2}, 
+                       {"x":9, "y":2}, 
+                       {"x":10, "y":2},
+                       {"x":11, "y":2}, 
+                       {"x":12, "y":2}, 
+                       {"x":13, "y":2}, 
+                       {"x":14, "y":2}, 
+                       {"x":15, "y":2, "w":1.25}, 
+                       {"x":1.25, "y":3, "w":1.5},
+                       {"x":2.75, "y":3, "w":1.25},
+                       {"x":4, "y":3, "w":1.5}, 
+                       {"x":5.5, "y":3, "w":2.25},
+                       {"x":9.5, "y":3, "w":2.75}, 
+                       {"x":12.25, "y":3, "w":1.25},
+                       {"x":13.5, "y":3, "w":1.25},
+                       {"x":14.75, "y":3, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ocean/yuri/keymaps/default/keymap.c b/keyboards/ocean/yuri/keymaps/default/keymap.c
new file mode 100644
index 0000000000..24c2830d14
--- /dev/null
+++ b/keyboards/ocean/yuri/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2022 Ocean
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_PSCR, KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, KC_BSPC,
+    KC_PGUP, KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+    KC_PGDN, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,  KC_RSFT,
+             KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT,          MO(1),  KC_RCTRL
+  ),
+
+  [1] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS
+  ),
+
+  [3] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS
+  ),
+};
diff --git a/keyboards/ocean/yuri/keymaps/via/keymap.c b/keyboards/ocean/yuri/keymaps/via/keymap.c
new file mode 100644
index 0000000000..24c2830d14
--- /dev/null
+++ b/keyboards/ocean/yuri/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2022 Ocean
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_PSCR, KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, KC_BSPC,
+    KC_PGUP, KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+    KC_PGDN, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,  KC_RSFT,
+             KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT,          MO(1),  KC_RCTRL
+  ),
+
+  [1] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS
+  ),
+
+  [3] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS
+  ),
+};
diff --git a/keyboards/ocean/yuri/keymaps/via/rules.mk b/keyboards/ocean/yuri/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/ocean/yuri/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/ocean/yuri/readme.md b/keyboards/ocean/yuri/readme.md
new file mode 100644
index 0000000000..a2db8a3d29
--- /dev/null
+++ b/keyboards/ocean/yuri/readme.md
@@ -0,0 +1,24 @@
+# Yuri
+
+![Yuri](https://i.imgur.com/boFAMKal.jpeg)
+
+
+40 percent alice
+
+* Keyboard Maintainer: Ocean
+* Hardware Supported: Yuri, Pro Micro
+* Hardware Availability: [Local Marketplace](https://tokopedia.com/strat0s/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ocean/yuri:default
+
+Flashing example for this keyboard:
+
+    make ocean/yuri:default:flash
+
+## Bootloader
+
+To Enter the bootloader you can double click reset button on board when you flash the firmware
+
+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).
diff --git a/keyboards/ocean/yuri/rules.mk b/keyboards/ocean/yuri/rules.mk
new file mode 100644
index 0000000000..7c70616682
--- /dev/null
+++ b/keyboards/ocean/yuri/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes       # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/ocean/yuri/yuri.c b/keyboards/ocean/yuri/yuri.c
new file mode 100644
index 0000000000..f02e35dce7
--- /dev/null
+++ b/keyboards/ocean/yuri/yuri.c
@@ -0,0 +1,15 @@
+/* Copyright 2022 Ocean
+ * 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 "yuri.h"
diff --git a/keyboards/ocean/yuri/yuri.h b/keyboards/ocean/yuri/yuri.h
new file mode 100644
index 0000000000..3f8c2b17da
--- /dev/null
+++ b/keyboards/ocean/yuri/yuri.h
@@ -0,0 +1,31 @@
+/* Copyright 2022 Ocean
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT(\
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+       K31, K32, K33,      K35,           K38,      K3A,      K3C, K3D \
+) \
+{ \
+  { K00, K01, K02, K03, K04,   K05,   K06, K07,   K08, K09, K0A, K0B, K0C, K0D }, \
+  { K10, K11, K12, K13, K14,   K15,   K16, K17,   K18, K19, K1A, K1B, K1C      }, \
+  { K20, K21, K22, K23, K24,   K25,   K26, K27,   K28, K29, K2A, K2B, K2C, K2D }, \
+  {      K31, K32, K33,        K35,               K38,      K3A,      K3C, K3D }, \
+}

From fed36fc5f88b7266c0419cebcda875f5a70894c9 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Sat, 22 Jan 2022 14:09:44 +0800
Subject: [PATCH 350/867] Adjust mouse key defaults (#15883)

---
 docs/feature_mouse_keys.md | 18 +++++++++---------
 quantum/mousekey.h         | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/feature_mouse_keys.md b/docs/feature_mouse_keys.md
index 8e2a3a4cd1..a9fa71abdc 100644
--- a/docs/feature_mouse_keys.md
+++ b/docs/feature_mouse_keys.md
@@ -59,13 +59,13 @@ This is the default mode. You can adjust the cursor and scrolling acceleration u
 
 |Define                      |Default|Description                                              |
 |----------------------------|-------|---------------------------------------------------------|
-|`MOUSEKEY_DELAY`            |300    |Delay between pressing a movement key and cursor movement|
-|`MOUSEKEY_INTERVAL`         |50     |Time between cursor movements in milliseconds            |
-|`MOUSEKEY_MOVE_DELTA`       |5      |Step size                                                |
+|`MOUSEKEY_DELAY`            |10     |Delay between pressing a movement key and cursor movement|
+|`MOUSEKEY_INTERVAL`         |20     |Time between cursor movements in milliseconds            |
+|`MOUSEKEY_MOVE_DELTA`       |8      |Step size                                                |
 |`MOUSEKEY_MAX_SPEED`        |10     |Maximum cursor speed at which acceleration stops         |
-|`MOUSEKEY_TIME_TO_MAX`      |20     |Time until maximum cursor speed is reached               |
-|`MOUSEKEY_WHEEL_DELAY`      |300    |Delay between pressing a wheel key and wheel movement    |
-|`MOUSEKEY_WHEEL_INTERVAL`   |100    |Time between wheel movements                             |
+|`MOUSEKEY_TIME_TO_MAX`      |30     |Time until maximum cursor speed is reached               |
+|`MOUSEKEY_WHEEL_DELAY`      |10     |Delay between pressing a wheel key and wheel movement    |
+|`MOUSEKEY_WHEEL_INTERVAL`   |80     |Time between wheel movements                             |
 |`MOUSEKEY_WHEEL_MAX_SPEED`  |8      |Maximum number of scroll steps per scroll action         |
 |`MOUSEKEY_WHEEL_TIME_TO_MAX`|40     |Time until maximum scroll speed is reached               |
 
@@ -85,9 +85,9 @@ This is an extension of the accelerated mode. The kinetic mode uses a quadratic
 |Define                                |Default  |Description                                                    |
 |--------------------------------------|---------|---------------------------------------------------------------|
 |`MK_KINETIC_SPEED`                    |undefined|Enable kinetic mode                                            |
-|`MOUSEKEY_DELAY`                      |8        |Delay between pressing a movement key and cursor movement      |
-|`MOUSEKEY_INTERVAL`                   |8        |Time between cursor movements in milliseconds                  |
-|`MOUSEKEY_MOVE_DELTA`                 |25       |Step size for accelerating from initial to base speed          |
+|`MOUSEKEY_DELAY`                      |5        |Delay between pressing a movement key and cursor movement      |
+|`MOUSEKEY_INTERVAL`                   |10       |Time between cursor movements in milliseconds                  |
+|`MOUSEKEY_MOVE_DELTA`                 |5        |Step size for accelerating from initial to base speed          |
 |`MOUSEKEY_INITIAL_SPEED`              |100      |Initial speed of the cursor in pixel per second                |
 |`MOUSEKEY_BASE_SPEED`                 |1000     |Maximum cursor speed at which acceleration stops               |
 |`MOUSEKEY_DECELERATED_SPEED`          |400      |Decelerated cursor speed                                       |
diff --git a/quantum/mousekey.h b/quantum/mousekey.h
index 56c91b5f1b..03da5f282a 100644
--- a/quantum/mousekey.h
+++ b/quantum/mousekey.h
@@ -37,9 +37,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #    ifndef MOUSEKEY_MOVE_DELTA
 #        ifndef MK_KINETIC_SPEED
-#            define MOUSEKEY_MOVE_DELTA 5
+#            define MOUSEKEY_MOVE_DELTA 8
 #        else
-#            define MOUSEKEY_MOVE_DELTA 25
+#            define MOUSEKEY_MOVE_DELTA 5
 #        endif
 #    endif
 #    ifndef MOUSEKEY_WHEEL_DELTA
@@ -47,29 +47,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    endif
 #    ifndef MOUSEKEY_DELAY
 #        ifndef MK_KINETIC_SPEED
-#            define MOUSEKEY_DELAY 300
+#            define MOUSEKEY_DELAY 10
 #        else
-#            define MOUSEKEY_DELAY 8
+#            define MOUSEKEY_DELAY 5
 #        endif
 #    endif
 #    ifndef MOUSEKEY_INTERVAL
 #        ifndef MK_KINETIC_SPEED
-#            define MOUSEKEY_INTERVAL 50
+#            define MOUSEKEY_INTERVAL 20
 #        else
-#            define MOUSEKEY_INTERVAL 8
+#            define MOUSEKEY_INTERVAL 10
 #        endif
 #    endif
 #    ifndef MOUSEKEY_MAX_SPEED
 #        define MOUSEKEY_MAX_SPEED 10
 #    endif
 #    ifndef MOUSEKEY_TIME_TO_MAX
-#        define MOUSEKEY_TIME_TO_MAX 20
+#        define MOUSEKEY_TIME_TO_MAX 30
 #    endif
 #    ifndef MOUSEKEY_WHEEL_DELAY
-#        define MOUSEKEY_WHEEL_DELAY 300
+#        define MOUSEKEY_WHEEL_DELAY 10
 #    endif
 #    ifndef MOUSEKEY_WHEEL_INTERVAL
-#        define MOUSEKEY_WHEEL_INTERVAL 100
+#        define MOUSEKEY_WHEEL_INTERVAL 80
 #    endif
 #    ifndef MOUSEKEY_WHEEL_MAX_SPEED
 #        define MOUSEKEY_WHEEL_MAX_SPEED 8

From fa9afb9763106fa488eb3a3e8b1d062747c5e7e2 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Fri, 21 Jan 2022 22:11:51 -0800
Subject: [PATCH 351/867] Format code according to conventions (#15986)

---
 keyboards/cmm_studio/fuji65/config.h          | 134 +++++++--------
 keyboards/cmm_studio/fuji65/fuji65.c          |  40 ++---
 keyboards/cmm_studio/fuji65/fuji65.h          |  76 ++++-----
 keyboards/cmm_studio/fuji65/info.json         | 158 +++++++++---------
 .../fuji65/keymaps/default/keymap.c           |  72 ++++----
 .../cmm_studio/fuji65/keymaps/via/keymap.c    | 102 +++++------
 keyboards/cmm_studio/fuji65/readme.md         |  36 ++--
 7 files changed, 309 insertions(+), 309 deletions(-)

diff --git a/keyboards/cmm_studio/fuji65/config.h b/keyboards/cmm_studio/fuji65/config.h
index fea03d26a8..e93ae62c67 100644
--- a/keyboards/cmm_studio/fuji65/config.h
+++ b/keyboards/cmm_studio/fuji65/config.h
@@ -1,67 +1,67 @@
-/* Copyright 2021 CMM.Studio Freather
- *
- * 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       0x434D
-#define PRODUCT_ID      0x364D
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    CMM.Studio
-#define PRODUCT         Fuji65
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-/*
- * 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 { B5, B4, D7, D6, B6 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, D5, D3, D2, D1, D0 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN E6
-#ifdef RGB_DI_PIN
-    #define RGBLED_NUM 8
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-    #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
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
+/* Copyright 2021 CMM.Studio Freather
+ *
+ * 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       0x434D
+#define PRODUCT_ID      0x364D
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    CMM.Studio
+#define PRODUCT         Fuji65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 { B5, B4, D7, D6, B6 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B0, B1, B2, B3, D5, D3, D2, D1, D0 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN E6
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 8
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+    #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
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/fuji65.c b/keyboards/cmm_studio/fuji65/fuji65.c
index 07a03710c4..46695a0d21 100644
--- a/keyboards/cmm_studio/fuji65/fuji65.c
+++ b/keyboards/cmm_studio/fuji65/fuji65.c
@@ -1,20 +1,20 @@
-/* Copyright 2020 CMM.Studio Freather
- *
- * 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 "fuji65.h"
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * 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 "fuji65.h"
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/fuji65.h b/keyboards/cmm_studio/fuji65/fuji65.h
index 479c0a4fda..d5c1e02ece 100644
--- a/keyboards/cmm_studio/fuji65/fuji65.h
+++ b/keyboards/cmm_studio/fuji65/fuji65.h
@@ -1,38 +1,38 @@
-/* Copyright 2021 CMM.Studio Freather
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
-    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
-    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
+/* Copyright 2021 CMM.Studio Freather
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
+    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX }, \
+}
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json
index 3a679103e5..9311f25453 100644
--- a/keyboards/cmm_studio/fuji65/info.json
+++ b/keyboards/cmm_studio/fuji65/info.json
@@ -1,79 +1,79 @@
-{
-    "keyboard_name": "cmm.studio fuji65",
-    "url": "",
-    "maintainer": "qmk",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                { "label": "K00 (B5,F7)", "x": 0, "y": 0 },
-                { "label": "K01 (B5,F6)", "x": 1, "y": 0 },
-                { "label": "K02 (B5,F5)", "x": 2, "y": 0 },
-                { "label": "K03 (B5,F4)", "x": 3, "y": 0 },
-                { "label": "K04 (B5,F1)", "x": 4, "y": 0 },
-                { "label": "K05 (B5,F0)", "x": 5, "y": 0 },
-                { "label": "K06 (B5,B0)", "x": 6, "y": 0 },
-                { "label": "K07 (B5,B1)", "x": 7, "y": 0 },
-                { "label": "K08 (B5,B2)", "x": 8, "y": 0 },
-                { "label": "K09 (B5,B3)", "x": 9, "y": 0 },
-                { "label": "K0A (B5,D5)", "x": 10, "y": 0 },
-                { "label": "K0B (B5,D3)", "x": 11, "y": 0 },
-                { "label": "K0C (B5,D2)", "x": 12, "y": 0 },
-                { "label": "K0D (B5,D1)", "x": 13, "y": 0 },
-                { "label": "K0E (B5,D0)", "x": 14, "y": 0 },
-                { "label": "K10 (B4,F7)", "x": 0, "y": 1 },
-                { "label": "K11 (B4,F6)", "x": 1.5, "y": 1 },
-                { "label": "K12 (B4,F5)", "x": 2.5, "y": 1 },
-                { "label": "K13 (B4,F4)", "x": 3.5, "y": 1 },
-                { "label": "K14 (B4,F1)", "x": 4.5, "y": 1 },
-                { "label": "K15 (B4,F0)", "x": 5.5, "y": 1 },
-                { "label": "K16 (B4,B0)", "x": 6.5, "y": 1 },
-                { "label": "K17 (B4,B1)", "x": 7.5, "y": 1 },
-                { "label": "K18 (B4,B2)", "x": 8.5, "y": 1 },
-                { "label": "K19 (B4,B3)", "x": 9.5, "y": 1 },
-                { "label": "K1A (B4,D5)", "x": 10.5, "y": 1 },
-                { "label": "K1B (B4,D3)", "x": 11.5, "y": 1 },
-                { "label": "K1C (B4,D2)", "x": 12.5, "y": 1 },
-                { "label": "K1D (B4,D1)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K1E (B4,D0)", "x": 15, "y": 1 },
-                { "label": "K20 (D7,F7)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K21 (D7,F6)", "x": 1.75, "y": 2 },
-                { "label": "K22 (D7,F5)", "x": 2.75, "y": 2 },
-                { "label": "K23 (D7,F4)", "x": 3.75, "y": 2 },
-                { "label": "K24 (D7,F1)", "x": 4.75, "y": 2 },
-                { "label": "K25 (D7,F0)", "x": 5.75, "y": 2 },
-                { "label": "K26 (D7,B0)", "x": 6.75, "y": 2 },
-                { "label": "K27 (D7,B1)", "x": 7.75, "y": 2 },
-                { "label": "K28 (D7,B2)", "x": 8.75, "y": 2 },
-                { "label": "K29 (D7,B3)", "x": 9.75, "y": 2 },
-                { "label": "K2A (D7,D5)", "x": 10.75, "y": 2 },
-                { "label": "K2B (D7,D3)", "x": 11.75, "y": 2 },
-                { "label": "K2C (D7,D2)", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "K2E (D7,D0)", "x": 15, "y": 2 },
-                { "label": "K30 (D6,F7)", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "K32 (D6,F5)", "x": 2.25, "y": 3 },
-                { "label": "K33 (D6,F4)", "x": 3.25, "y": 3 },
-                { "label": "K34 (D6,F1)", "x": 4.25, "y": 3 },
-                { "label": "K35 (D6,F0)", "x": 5.25, "y": 3 },
-                { "label": "K36 (D6,B0)", "x": 6.25, "y": 3 },
-                { "label": "K37 (D6,B1)", "x": 7.25, "y": 3 },
-                { "label": "K38 (D6,B2)", "x": 8.25, "y": 3 },
-                { "label": "K39 (D6,B3)", "x": 9.25, "y": 3 },
-                { "label": "K3A (D6,D5)", "x": 10.25, "y": 3 },
-                { "label": "K3B (D6,D3)", "x": 11.25, "y": 3 },
-                { "label": "K3C (D6,D2)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K3D (D6,D1)", "x": 14, "y": 3 },
-                { "label": "K3E (D6,D0)", "x": 15, "y": 3 },
-                { "label": "K40 (B6,F7)", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K41 (B6,F6)", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "K42 (B6,F5)", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "K46 (B6,B0)", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "K49 (B6,B3)", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "K4A (B6,D5)", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "K4B (B6,D3)", "x": 13, "y": 4 },
-                { "label": "K4C (B6,D2)", "x": 14, "y": 4 },
-                { "label": "K4D (B6,D1)", "x": 15, "y": 4 }
-            ]
-        }
-    }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
-}
+{
+    "keyboard_name": "cmm.studio fuji65",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "K00 (B5,F7)", "x": 0, "y": 0 },
+                { "label": "K01 (B5,F6)", "x": 1, "y": 0 },
+                { "label": "K02 (B5,F5)", "x": 2, "y": 0 },
+                { "label": "K03 (B5,F4)", "x": 3, "y": 0 },
+                { "label": "K04 (B5,F1)", "x": 4, "y": 0 },
+                { "label": "K05 (B5,F0)", "x": 5, "y": 0 },
+                { "label": "K06 (B5,B0)", "x": 6, "y": 0 },
+                { "label": "K07 (B5,B1)", "x": 7, "y": 0 },
+                { "label": "K08 (B5,B2)", "x": 8, "y": 0 },
+                { "label": "K09 (B5,B3)", "x": 9, "y": 0 },
+                { "label": "K0A (B5,D5)", "x": 10, "y": 0 },
+                { "label": "K0B (B5,D3)", "x": 11, "y": 0 },
+                { "label": "K0C (B5,D2)", "x": 12, "y": 0 },
+                { "label": "K0D (B5,D1)", "x": 13, "y": 0 },
+                { "label": "K0E (B5,D0)", "x": 14, "y": 0 },
+                { "label": "K10 (B4,F7)", "x": 0, "y": 1 },
+                { "label": "K11 (B4,F6)", "x": 1.5, "y": 1 },
+                { "label": "K12 (B4,F5)", "x": 2.5, "y": 1 },
+                { "label": "K13 (B4,F4)", "x": 3.5, "y": 1 },
+                { "label": "K14 (B4,F1)", "x": 4.5, "y": 1 },
+                { "label": "K15 (B4,F0)", "x": 5.5, "y": 1 },
+                { "label": "K16 (B4,B0)", "x": 6.5, "y": 1 },
+                { "label": "K17 (B4,B1)", "x": 7.5, "y": 1 },
+                { "label": "K18 (B4,B2)", "x": 8.5, "y": 1 },
+                { "label": "K19 (B4,B3)", "x": 9.5, "y": 1 },
+                { "label": "K1A (B4,D5)", "x": 10.5, "y": 1 },
+                { "label": "K1B (B4,D3)", "x": 11.5, "y": 1 },
+                { "label": "K1C (B4,D2)", "x": 12.5, "y": 1 },
+                { "label": "K1D (B4,D1)", "x": 13.5, "y": 1, "w": 1.5 },
+                { "label": "K1E (B4,D0)", "x": 15, "y": 1 },
+                { "label": "K20 (D7,F7)", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "K21 (D7,F6)", "x": 1.75, "y": 2 },
+                { "label": "K22 (D7,F5)", "x": 2.75, "y": 2 },
+                { "label": "K23 (D7,F4)", "x": 3.75, "y": 2 },
+                { "label": "K24 (D7,F1)", "x": 4.75, "y": 2 },
+                { "label": "K25 (D7,F0)", "x": 5.75, "y": 2 },
+                { "label": "K26 (D7,B0)", "x": 6.75, "y": 2 },
+                { "label": "K27 (D7,B1)", "x": 7.75, "y": 2 },
+                { "label": "K28 (D7,B2)", "x": 8.75, "y": 2 },
+                { "label": "K29 (D7,B3)", "x": 9.75, "y": 2 },
+                { "label": "K2A (D7,D5)", "x": 10.75, "y": 2 },
+                { "label": "K2B (D7,D3)", "x": 11.75, "y": 2 },
+                { "label": "K2C (D7,D2)", "x": 12.75, "y": 2, "w": 2.25 },
+                { "label": "K2E (D7,D0)", "x": 15, "y": 2 },
+                { "label": "K30 (D6,F7)", "x": 0, "y": 3, "w": 2.25 },
+                { "label": "K32 (D6,F5)", "x": 2.25, "y": 3 },
+                { "label": "K33 (D6,F4)", "x": 3.25, "y": 3 },
+                { "label": "K34 (D6,F1)", "x": 4.25, "y": 3 },
+                { "label": "K35 (D6,F0)", "x": 5.25, "y": 3 },
+                { "label": "K36 (D6,B0)", "x": 6.25, "y": 3 },
+                { "label": "K37 (D6,B1)", "x": 7.25, "y": 3 },
+                { "label": "K38 (D6,B2)", "x": 8.25, "y": 3 },
+                { "label": "K39 (D6,B3)", "x": 9.25, "y": 3 },
+                { "label": "K3A (D6,D5)", "x": 10.25, "y": 3 },
+                { "label": "K3B (D6,D3)", "x": 11.25, "y": 3 },
+                { "label": "K3C (D6,D2)", "x": 12.25, "y": 3, "w": 1.75 },
+                { "label": "K3D (D6,D1)", "x": 14, "y": 3 },
+                { "label": "K3E (D6,D0)", "x": 15, "y": 3 },
+                { "label": "K40 (B6,F7)", "x": 0, "y": 4, "w": 1.25 },
+                { "label": "K41 (B6,F6)", "x": 1.25, "y": 4, "w": 1.25 },
+                { "label": "K42 (B6,F5)", "x": 2.5, "y": 4, "w": 1.25 },
+                { "label": "K46 (B6,B0)", "x": 3.75, "y": 4, "w": 6.25 },
+                { "label": "K49 (B6,B3)", "x": 10, "y": 4, "w": 1.25 },
+                { "label": "K4A (B6,D5)", "x": 11.25, "y": 4, "w": 1.25 },
+                { "label": "K4B (B6,D3)", "x": 13, "y": 4 },
+                { "label": "K4C (B6,D2)", "x": 14, "y": 4 },
+                { "label": "K4D (B6,D1)", "x": 15, "y": 4 }
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/cmm_studio/fuji65/keymaps/default/keymap.c b/keyboards/cmm_studio/fuji65/keymaps/default/keymap.c
index e5b609e235..da0538c82e 100644
--- a/keyboards/cmm_studio/fuji65/keymaps/default/keymap.c
+++ b/keyboards/cmm_studio/fuji65/keymaps/default/keymap.c
@@ -1,36 +1,36 @@
-/* Copyright 2020 CMM.Studio Freather
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT(
-      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
-      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_TRNS,
-      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_TRNS,
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_TRNS,
-      KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  [1] = LAYOUT(
-      KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
-      KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-      KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-      KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
-      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
-  ),
-
-};
+/* Copyright 2020 CMM.Studio Freather
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
+      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_TRNS,
+      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_TRNS,
+      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_TRNS,
+      KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT(
+      KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
+      KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+};
diff --git a/keyboards/cmm_studio/fuji65/keymaps/via/keymap.c b/keyboards/cmm_studio/fuji65/keymaps/via/keymap.c
index 1d1467d8fa..6b37798c9d 100644
--- a/keyboards/cmm_studio/fuji65/keymaps/via/keymap.c
+++ b/keyboards/cmm_studio/fuji65/keymaps/via/keymap.c
@@ -1,51 +1,51 @@
-/* Copyright 2021 CMM.Studio Freather
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
-        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_TRNS,
-        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_TRNS,
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_TRNS,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    [1] = LAYOUT(
-        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [2] = LAYOUT(
-        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [3] = LAYOUT(
-        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
-        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
-};
+/* Copyright 2021 CMM.Studio Freather
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
+        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_TRNS,
+        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_TRNS,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_TRNS,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT(
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,
+        KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+};
diff --git a/keyboards/cmm_studio/fuji65/readme.md b/keyboards/cmm_studio/fuji65/readme.md
index debfeeb409..d5438c5915 100644
--- a/keyboards/cmm_studio/fuji65/readme.md
+++ b/keyboards/cmm_studio/fuji65/readme.md
@@ -1,18 +1,18 @@
-# CMM.Studio Fuji65
-
-CMM.Studio Fuji65 Keyboard
-
-![CMM.Studio Fuji65](https://i.imgur.com/dUPQpkZh.png)
-
-
-* Keyboard Maintainer: [CMM.Studio Freather](https://github.com/CMMS-Freather)
-* Hardware Supported: PCB, Atmega32u4
-
-Make example for this keyboard (after setting up your build environment):
-
-    make cmm_studio/fuji65:default
-
-
-For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode
-
-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).
+# CMM.Studio Fuji65
+
+CMM.Studio Fuji65 Keyboard
+
+![CMM.Studio Fuji65](https://i.imgur.com/dUPQpkZh.png)
+
+
+* Keyboard Maintainer: [CMM.Studio Freather](https://github.com/CMMS-Freather)
+* Hardware Supported: PCB, Atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cmm_studio/fuji65:default
+
+
+For reset instruction, use the physical reset button on the back of the keyboard to enter bootloader mode
+
+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).

From 489475814a7cff2bbcbe75b94024092173d01345 Mon Sep 17 00:00:00 2001
From: Ryan Hausen <ryan.hausen@gmail.com>
Date: Fri, 21 Jan 2022 22:12:14 -0800
Subject: [PATCH 352/867] fixed typo in orange HSV colors decalartion (#15976)

---
 quantum/color.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/color.h b/quantum/color.h
index e2cfc46927..135ad623b5 100644
--- a/quantum/color.h
+++ b/quantum/color.h
@@ -60,7 +60,7 @@
 #define HSV_GOLDENROD    30, 218, 218
 #define HSV_GREEN        85, 255, 255
 #define HSV_MAGENTA     213, 255, 255
-#define HSV_ORANGE       28, 255, 255
+#define HSV_ORANGE       21, 255, 255
 #define HSV_PINK        234, 128, 255
 #define HSV_PURPLE      191, 255, 255
 #define HSV_RED           0, 255, 255

From c587df3b6660f7ec25794443909eadd7135e8d26 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 22 Jan 2022 17:12:34 +1100
Subject: [PATCH 353/867] Fix build failures for `mschwingen/modelm` (#15987)

---
 keyboards/mschwingen/modelm/matrix.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/keyboards/mschwingen/modelm/matrix.c b/keyboards/mschwingen/modelm/matrix.c
index ffc1284ead..7ea20b5a11 100644
--- a/keyboards/mschwingen/modelm/matrix.c
+++ b/keyboards/mschwingen/modelm/matrix.c
@@ -24,8 +24,6 @@
 #include "print.h"
 #include "modelm.h"
 
-#define DEBUG 0
-
 #define SPI_TIMEOUT 100
 
 /* Keyboard Matrix Assignments */
@@ -62,10 +60,9 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
     row_data = spi_read() << 8;
     row_data |= spi_read();
 
-#if DEBUG
-    print_hex8(~row_data);
-    uprint(" ");
-#endif
+    debug_hex8(~row_data);
+    dprint(" ");
+
     // For each row...
     for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
         // Store last value of row prior to reading
@@ -105,9 +102,8 @@ void matrix_init_custom(void) {
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     bool changed = false;
 
-#if DEBUG
-    uprint("\r\nScan: ");
-#endif
+    dprint("\r\nScan: ");
+
     // Set col, read rows
     for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
         changed |= read_rows_on_col(current_matrix, current_col);

From 24eac9d3cec3a2848a595fd580c125602e82fb4e Mon Sep 17 00:00:00 2001
From: Domanic Calleja <82970232+Malevolti@users.noreply.github.com>
Date: Sat, 22 Jan 2022 06:15:46 +0000
Subject: [PATCH 354/867] [Keyboard] Amend SuperLyra readme (#15942)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/malevolti/superlyra/readme.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/malevolti/superlyra/readme.md b/keyboards/malevolti/superlyra/readme.md
index b222f0f34c..23eccd6d49 100644
--- a/keyboards/malevolti/superlyra/readme.md
+++ b/keyboards/malevolti/superlyra/readme.md
@@ -15,6 +15,5 @@ Flashing example for this keyboard:
 
 Press reset button on the keyboard when asked.
 
-Disconnect the first half, connect the second one and repeat the process.
 
 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).

From 25cffa26171be0615ca2a5da8920985f7bc5cbe1 Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Sat, 22 Jan 2022 13:16:16 +0700
Subject: [PATCH 355/867] [Keyboard] Add M63 RGB keyboard (#15887)

---
 .../horrortroll/chinese_pcb/m63_rgb/config.h  | 107 ++++++++++
 .../horrortroll/chinese_pcb/m63_rgb/info.json |  78 ++++++++
 .../m63_rgb/keymaps/default/keymap.c          | 187 ++++++++++++++++++
 .../m63_rgb/keymaps/default/readme.md         |   3 +
 .../chinese_pcb/m63_rgb/keymaps/via/config.h  |  23 +++
 .../chinese_pcb/m63_rgb/keymaps/via/keymap.c  | 187 ++++++++++++++++++
 .../chinese_pcb/m63_rgb/keymaps/via/readme.md |   3 +
 .../chinese_pcb/m63_rgb/keymaps/via/rules.mk  |   1 +
 .../horrortroll/chinese_pcb/m63_rgb/m63_rgb.c |  49 +++++
 .../horrortroll/chinese_pcb/m63_rgb/m63_rgb.h |  48 +++++
 .../horrortroll/chinese_pcb/m63_rgb/readme.md |  24 +++
 .../horrortroll/chinese_pcb/m63_rgb/rules.mk  |  22 +++
 keyboards/horrortroll/chinese_pcb/readme.md   |  11 +-
 13 files changed, 738 insertions(+), 5 deletions(-)
 create mode 100644 keyboards/horrortroll/chinese_pcb/m63_rgb/config.h
 create mode 100644 keyboards/horrortroll/chinese_pcb/m63_rgb/info.json
 create mode 100644 keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/keymap.c
 create mode 100644 keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/readme.md
 create mode 100644 keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/config.h
 create mode 100644 keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/keymap.c
 create mode 100644 keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/readme.md
 create mode 100644 keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/rules.mk
 create mode 100644 keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.c
 create mode 100644 keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.h
 create mode 100644 keyboards/horrortroll/chinese_pcb/m63_rgb/readme.md
 create mode 100644 keyboards/horrortroll/chinese_pcb/m63_rgb/rules.mk

diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h b/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h
new file mode 100644
index 0000000000..2983971258
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h
@@ -0,0 +1,107 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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       0x7516
+#define PRODUCT_ID      0x6002
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    HorrorTroll
+#define PRODUCT         M63 RGB
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B3, B4, A0,  A2, A3 }
+#define MATRIX_COL_PINS { B0, B1, B2, B10, A7, A6, A5, A4, B5, B6, A1, B7, B8, B9 }
+
+#define BOOTMAGIC_LITE_ROW 3
+#define BOOTMAGIC_LITE_COLUMN 5
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Forcing to use NKRO instead 6KRO */
+#define FORCE_NKRO
+
+/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
+#define USB_POLLING_INTERVAL_MS 1
+#define QMK_KEYS_PER_SCAN 12
+
+#ifdef RGB_MATRIX_ENABLE
+    #define DRIVER_LED_TOTAL 75
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_KEYPRESSES
+    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+    /* RGB Matrix config */
+    #define RGB_DI_PIN B15
+
+    /* RGB Matrix effect */
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_BREATHING
+    #define ENABLE_RGB_MATRIX_BAND_SAT
+    #define ENABLE_RGB_MATRIX_BAND_VAL
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+    #define ENABLE_RGB_MATRIX_CYCLE_ALL
+    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON
+    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+    #define ENABLE_RGB_MATRIX_RAINDROPS
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+    #define ENABLE_RGB_MATRIX_HUE_WAVE
+    #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+    #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+    #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+    #define ENABLE_RGB_MATRIX_SPLASH
+    #define ENABLE_RGB_MATRIX_MULTISPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/info.json b/keyboards/horrortroll/chinese_pcb/m63_rgb/info.json
new file mode 100644
index 0000000000..651e58a100
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "M63 RGB",
+    "url": "",
+    "maintainer": "HorrorTroll",
+    "layouts": {
+        "LAYOUT_60_ansi_arrow": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "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":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"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":"Shift", "x":11.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":13, "y":3},
+                {"label":"/?", "x":14, "y":3},
+
+                {"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},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Fn", "x":11, "y":4},
+                {"label":"\u2190", "x":12, "y":4},
+                {"label":"\u2193", "x":13, "y":4},
+                {"label":"\u2192", "x":14, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/keymap.c b/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8f421c22f5
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/keymap.c
@@ -0,0 +1,187 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 <string.h>
+#include <math.h>
+
+#include <lib/lib8tion/lib8tion.h>
+
+#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.
+
+enum layer_names {
+    _BASE = 0,
+    _FN = 1
+};
+
+enum user_rgb_mode {
+    RGB_MODE_ALL,
+    RGB_MODE_KEYLIGHT,
+    RGB_MODE_UNDERGLOW,
+    RGB_MODE_NONE,
+};
+
+typedef union {
+    uint32_t raw;
+    struct {
+        uint8_t rgb_mode :8;
+    };
+} user_config_t;
+
+user_config_t user_config;
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bakspc│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ RSft │ ↑ │ / │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤
+       │LCrl│GUI │LAlt│         Space          │RAt│Fn │ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ RSft │   │ ? │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤
+       │    │    │    │                        │   │   │   │   │   │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3     4     5       6     7     8        9        10               11       12       13      */
+    [_BASE] = LAYOUT_60_ansi_arrow(
+                KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8,    KC_9,    KC_0,            KC_MINS, KC_EQL,  KC_BSPC,
+                KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,            KC_LBRC, KC_RBRC, KC_BSLS,
+                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,  RSFT_T(KC_SLSH),          KC_UP,   KC_SLSH,
+                KC_LCTL, KC_LGUI, KC_LALT,             KC_SPC,                      KC_RALT, MO(_FN),         KC_LEFT, KC_DOWN, KC_RIGHT
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+       │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│ Delete│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+       │Reset│   │   │   │   │   │   │   │Ins│   │PSc│   │Hui│ Mod │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │      │   │   │   │   │   │   │   │   │Tog│   │   │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
+       │        │   │   │Cal│   │   │   │Mut│VoD│VoU│      │Vai│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤
+       │    │    │    │                        │   │   │Spd│Vad│Spi│
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13     */
+    [_FN]   = LAYOUT_60_ansi_arrow(
+                KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+                RESET,   _______, _______, _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, RGB_HUI, RGB_MOD,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,
+                _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          RGB_VAI, _______,
+                _______, _______, _______,                   _______,                            _______, _______, RGB_SPD, RGB_VAD, RGB_SPI
+            ),
+};
+
+void keyboard_post_init_user(void) {
+    user_config.raw = eeconfig_read_user();
+    switch (user_config.rgb_mode) {
+        case RGB_MODE_ALL:
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_enable_noeeprom();
+            break;
+        case RGB_MODE_KEYLIGHT:
+            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case RGB_MODE_UNDERGLOW:
+            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case RGB_MODE_NONE:
+            rgb_matrix_set_flags(LED_FLAG_NONE);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_KEYLIGHT;
+                    }
+                    break;
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_UNDERGLOW;
+                    }
+                    break;
+                    case (LED_FLAG_UNDERGLOW): {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_NONE;
+                    }
+                    break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                        user_config.rgb_mode = RGB_MODE_ALL;
+                    }
+                    break;
+                }
+                eeconfig_update_user(user_config.raw);
+            }
+            return false;
+	}
+
+    return true;
+}
+
+void rgb_matrix_indicators_user(void) {
+    HSV      hsv = rgb_matrix_config.hsv;
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
+    hsv.h        = time;
+    RGB      rgb = hsv_to_rgb(hsv);
+
+    if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
+        if (host_keyboard_led_state().caps_lock) {
+            rgb_matrix_set_color(28, rgb.r, rgb.g, rgb.b);
+        }
+    } else {
+        if (host_keyboard_led_state().caps_lock) {
+            rgb_matrix_set_color(28, rgb.r, rgb.g, rgb.b);
+        } else {
+            rgb_matrix_set_color(28, 0, 0, 0);
+        }
+    }
+}
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/readme.md b/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/readme.md
new file mode 100644
index 0000000000..01ff3523b9
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# Default Layout
+
+Keymap is default 63 qwerty, 60% arrow layout
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/config.h b/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/config.h
new file mode 100644
index 0000000000..fe6aa8c1f7
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 DYNAMIC_KEYMAP_LAYER_COUNT 2
+
+#ifdef RGB_MATRIX_ENABLE
+    #define VIA_QMK_RGBLIGHT_ENABLE
+#endif
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/keymap.c b/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..8f421c22f5
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/keymap.c
@@ -0,0 +1,187 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 <string.h>
+#include <math.h>
+
+#include <lib/lib8tion/lib8tion.h>
+
+#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.
+
+enum layer_names {
+    _BASE = 0,
+    _FN = 1
+};
+
+enum user_rgb_mode {
+    RGB_MODE_ALL,
+    RGB_MODE_KEYLIGHT,
+    RGB_MODE_UNDERGLOW,
+    RGB_MODE_NONE,
+};
+
+typedef union {
+    uint32_t raw;
+    struct {
+        uint8_t rgb_mode :8;
+    };
+} user_config_t;
+
+user_config_t user_config;
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bakspc│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ RSft │ ↑ │ / │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤
+       │LCrl│GUI │LAlt│         Space          │RAt│Fn │ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ RSft │   │ ? │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤
+       │    │    │    │                        │   │   │   │   │   │
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3     4     5       6     7     8        9        10               11       12       13      */
+    [_BASE] = LAYOUT_60_ansi_arrow(
+                KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5,   KC_6, KC_7, KC_8,    KC_9,    KC_0,            KC_MINS, KC_EQL,  KC_BSPC,
+                KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T,   KC_Y, KC_U, KC_I,    KC_O,    KC_P,            KC_LBRC, KC_RBRC, KC_BSLS,
+                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,  RSFT_T(KC_SLSH),          KC_UP,   KC_SLSH,
+                KC_LCTL, KC_LGUI, KC_LALT,             KC_SPC,                      KC_RALT, MO(_FN),         KC_LEFT, KC_DOWN, KC_RIGHT
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+       │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│ Delete│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+       │Reset│   │   │   │   │   │   │   │Ins│   │PSc│   │Hui│ Mod │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │      │   │   │   │   │   │   │   │   │Tog│   │   │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
+       │        │   │   │Cal│   │   │   │Mut│VoD│VoU│      │Vai│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤
+       │    │    │    │                        │   │   │Spd│Vad│Spi│
+       └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13     */
+    [_FN]   = LAYOUT_60_ansi_arrow(
+                KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+                RESET,   _______, _______, _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, RGB_HUI, RGB_MOD,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,
+                _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,          RGB_VAI, _______,
+                _______, _______, _______,                   _______,                            _______, _______, RGB_SPD, RGB_VAD, RGB_SPI
+            ),
+};
+
+void keyboard_post_init_user(void) {
+    user_config.raw = eeconfig_read_user();
+    switch (user_config.rgb_mode) {
+        case RGB_MODE_ALL:
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_enable_noeeprom();
+            break;
+        case RGB_MODE_KEYLIGHT:
+            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case RGB_MODE_UNDERGLOW:
+            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case RGB_MODE_NONE:
+            rgb_matrix_set_flags(LED_FLAG_NONE);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_KEYLIGHT;
+                    }
+                    break;
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_UNDERGLOW;
+                    }
+                    break;
+                    case (LED_FLAG_UNDERGLOW): {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_NONE;
+                    }
+                    break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                        user_config.rgb_mode = RGB_MODE_ALL;
+                    }
+                    break;
+                }
+                eeconfig_update_user(user_config.raw);
+            }
+            return false;
+	}
+
+    return true;
+}
+
+void rgb_matrix_indicators_user(void) {
+    HSV      hsv = rgb_matrix_config.hsv;
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
+    hsv.h        = time;
+    RGB      rgb = hsv_to_rgb(hsv);
+
+    if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
+        if (host_keyboard_led_state().caps_lock) {
+            rgb_matrix_set_color(28, rgb.r, rgb.g, rgb.b);
+        }
+    } else {
+        if (host_keyboard_led_state().caps_lock) {
+            rgb_matrix_set_color(28, rgb.r, rgb.g, rgb.b);
+        } else {
+            rgb_matrix_set_color(28, 0, 0, 0);
+        }
+    }
+}
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/readme.md b/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/readme.md
new file mode 100644
index 0000000000..c60a188047
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/readme.md
@@ -0,0 +1,3 @@
+# Default Layout with VIA
+
+Keymap is default 63 qwerty, 60% arrow layout
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/rules.mk b/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.c b/keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.c
new file mode 100644
index 0000000000..ef1eabddf8
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 "m63_rgb.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    {  0,      1,      2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12,     13 },
+    { 14,     15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27 },
+    { 28,     29,     30,     31,     32,     33,     34,     35,     36,     37,     38,     39, NO_LED,     40 },
+    { 41,     42,     43,     44,     45,     46,     47,     48,     49,     50,     51, NO_LED,     52,     53 },
+    { 54,     55,     56, NO_LED, NO_LED,     57, NO_LED, NO_LED, NO_LED,     58,     59,     60,     61,     62 }
+}, {
+    // Key matrix (0 -> 62)
+    {0  ,  0}, {16 ,  0}, {33 ,  0}, {49 ,  0}, {66 ,  0}, {82 ,  0}, {99 ,  0}, {115,  0}, {132,  0}, {148,  0}, {165,  0}, {181,  0}, {198,  0}, {214,  0},
+    {3  , 16}, {23 , 16}, {39 , 16}, {56 , 16}, {72 , 16}, {88 , 16}, {105, 16}, {121, 16}, {138, 16}, {154, 16}, {171, 16}, {187, 16}, {204, 16}, {220, 16},
+    {5  , 32}, {26 , 32}, {42 , 32}, {59 , 32}, {75 , 32}, {92 , 32}, {108, 32}, {124, 32}, {141, 32}, {157, 32}, {174, 32}, {190, 32},            {214, 32},
+    {8  , 48}, {28 , 48}, {48 , 48}, {65 , 48}, {81 , 48}, {98 , 48}, {114, 48}, {131, 48}, {147, 48}, {164, 48}, {186, 48},            {208, 48}, {224, 48},
+    {2  , 64}, {20 , 64}, {38 , 64},                       {100, 64},                                  {160, 64}, {176, 64}, {192, 64}, {208, 64}, {224, 64},
+
+    // Underglow (63 -> 74)
+    {216, 56}, {181, 57}, {138, 59}, {105, 58}, {52 , 60}, {10 , 60},
+    {20 , 12}, {54 , 12}, {102, 10}, {145, 13}, {182,  9}, {211, 10},
+}, {
+    // Key matrix (0 -> 62)
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    4, 4,
+    1, 1, 1,       4,          1, 1, 4, 4, 4,
+
+    // Underglow (63 -> 74)
+    2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2
+} };
+#endif
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.h b/keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.h
new file mode 100644
index 0000000000..b2461758e2
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/m63_rgb.h
@@ -0,0 +1,48 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┬───┤
+ * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A    │3C │3D │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬───┼───┼───┤
+ * │40  │41  │42  │45                      │49 │4A │4B │4C │4D │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+ */
+
+#define LAYOUT_60_ansi_arrow( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0D,     \
+     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D,    \
+      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K2D,      \
+       K30,   K31, K32, K33, K34, K35, K36, K37, K38, K39,    K3A,     K3C, K3D, \
+    K40,  K41,  K42,                K45,                K49, K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3C, K3D }, \
+    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D }  \
+}
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/readme.md b/keyboards/horrortroll/chinese_pcb/m63_rgb/readme.md
new file mode 100644
index 0000000000..7ec01047b1
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/readme.md
@@ -0,0 +1,24 @@
+# M63 RGB
+
+Support STM32F072CBU6 keyboard.
+
+* Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
+* Hardware Supported: STM32F072CBU6
+
+Make example for this keyboard (after setting up your build environment):
+
+    make horrortroll/chinese_pcb/m63_rgb:default
+
+Flashing example for this keyboard:
+
+    make horrortroll/chinese_pcb/m63_rgb:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (3,5) in the matrix (B key) and plug in the keyboard
+* **Physical reset button**: Press and hold the button on the back of the PCB, then plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/rules.mk b/keyboards/horrortroll/chinese_pcb/m63_rgb/rules.mk
new file mode 100644
index 0000000000..9291499b77
--- /dev/null
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# RGB Matrix enabled
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/horrortroll/chinese_pcb/readme.md b/keyboards/horrortroll/chinese_pcb/readme.md
index 4667678753..3aa0ce6195 100644
--- a/keyboards/horrortroll/chinese_pcb/readme.md
+++ b/keyboards/horrortroll/chinese_pcb/readme.md
@@ -2,12 +2,13 @@
 
 This is a folder for collection code of Chinese PCB, where they only sold one-time limited on Taobao and no source code or contact info of Maker. Everything was re-write by using multimeter and sometimes with ISP/ICP flashing!
 
-## List for the reason why these keyboard in here:
+## List for those keyboard in here:
 <details>
   <summary>Click to expand!</summary>
 
-  | Keyboard name | MCU         | Layout        | LED  | OLED | Other | Reason                                               |
-  | ------------- | ----------- | ------------- | ---- | ---- | ----- | ---------------------------------------------------- |
-  | Devil68 Pro   | Atmega32U4  | 68 Keys (65%) | RGB  | No   | No    | Lost contact info of Maker on Taobao, no source code |
-  |               |             |               |      |      |       |                                                      |
+  | Keyboard name | MCU           | Layout        | Hotswap | LED  | OLED | Other |
+  | ------------- | ------------- | ------------- | ------- | ---- | ---- | ----- |
+  | Devil68 Pro   | Atmega32U4    | 68 Keys (65%) | Yes     | RGB  | No   | No    |
+  | M63 RGB       | STM32F072CBU6 | 63 Keys (60%) | Yes     | RGB  | No   | No    |
+  |               |               |               |         |      |      |       |
 </details>

From 57d116796a4eaa1415bc8c6776ece59366001cfb Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Sat, 22 Jan 2022 18:25:51 +0800
Subject: [PATCH 356/867] Add rgb  matrix support for q2 of keychron.  (#15946)

* Add new keyboard keychron_q1_rev_0101 for Keychron.

* Update keymaps of keychron_q1_rev_0100 and keychron_q1_rev_0102.

* Update keyboards/keychron/q1/rev_0101/rev_0101.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keymap.c

* Add new info.json.

* Update info.json

* Update keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keychron/q1/rev_0101/rev_0101.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keychron/q1/rev_0101/rev_0101.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keymap.c

* Update info.json

* Update all via keymaps keymaps of q1 series.  KC_TASK and KC_FLXP are now defined using the VIA user keycodes range so they can be renamed "TASK" and "TILE" as a shortName in VIA.

* Add keyboards keychron_q2 series.

* Update default keymaps of keychron_q2 series.

* Update rules.mk and MCU_LDSCRIPT specified as STM32L432xB.

* Update keyboards/keychron/q1/rev_0101/rev_0101.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update config.h

* Update config.h

* Update config.h

* removed duplicated ifdef

* Update keyboards/keychron/q1/rev_0101/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/keychron/q2/rev_0110/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/keychron/q2/rev_0110/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/keychron/q2/rev_0113/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/keychron/q2/rev_0111/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/keychron/q2/rev_0111/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/keychron/q2/rev_0112/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/keychron/q2/rev_0112/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/keychron/q2/rev_0113/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update rev_0101.c

* Update rev_0101.

* Enable support for edit RGB lighting in VIA.

The updated design file at https://git.io/JyE0K includes only the
enabled RGB_MATRIX modes.

* Update q1.

* Add rgb matrix support for q2 of keychron.

* Update rule.mk.

* Delete comment block which is unwanted.

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com>
Co-authored-by: lokher <lokher@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Adam Karim <adam@akarsoft.com>
---
 keyboards/keychron/q2/chconf.h            |   7 +-
 keyboards/keychron/q2/config.h            |  65 +++++++++++++
 keyboards/keychron/q2/halconf.h           |   7 +-
 keyboards/keychron/q2/mcuconf.h           |   7 +-
 keyboards/keychron/q2/rev_0110/config.h   |   5 +
 keyboards/keychron/q2/rev_0110/rev_0110.c | 106 +++++++++++++++++++++
 keyboards/keychron/q2/rev_0110/rules.mk   |  17 +---
 keyboards/keychron/q2/rev_0111/config.h   |   7 +-
 keyboards/keychron/q2/rev_0111/rev_0111.c | 106 +++++++++++++++++++++
 keyboards/keychron/q2/rev_0111/rules.mk   |  17 +---
 keyboards/keychron/q2/rev_0112/config.h   |   5 +
 keyboards/keychron/q2/rev_0112/rev_0112.c | 107 ++++++++++++++++++++++
 keyboards/keychron/q2/rev_0112/rules.mk   |  17 +---
 keyboards/keychron/q2/rev_0113/config.h   |   5 +
 keyboards/keychron/q2/rev_0113/rev_0113.c | 107 ++++++++++++++++++++++
 keyboards/keychron/q2/rev_0113/rules.mk   |  17 +---
 16 files changed, 527 insertions(+), 75 deletions(-)

diff --git a/keyboards/keychron/q2/chconf.h b/keyboards/keychron/q2/chconf.h
index a331fdef37..cbbae31079 100644
--- a/keyboards/keychron/q2/chconf.h
+++ b/keyboards/keychron/q2/chconf.h
@@ -14,11 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/acheron/arctic/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
 #pragma once
 
 #define CH_CFG_ST_FREQUENCY 10000
@@ -27,4 +22,4 @@
 
 #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
 
-#include_next <chconf.h>
\ No newline at end of file
+#include_next <chconf.h>
diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h
index 263be4684f..8252b83df8 100644
--- a/keyboards/keychron/q2/config.h
+++ b/keyboards/keychron/q2/config.h
@@ -38,6 +38,14 @@
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
+/* RGB Matrix Driver Configuration */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110111
+#define DRIVER_ADDR_2 0b1110100
+
+/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
+#define PHASE_CHANNEL MSKPHASE_9CHANNEL
+
 /* Disable DIP switch in matrix data */
 #define MATRIX_MASKED
 
@@ -50,5 +58,62 @@
 /* Use 5 dynamic keymap layers */
 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
 
+/* We have 2KB EEPROM size on STM32L432 */
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
+
 /* EEPROM Driver Configuration */
 #define EXTERNAL_EEPROM_I2C_BASE_ADDRESS 0b10100010
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+// #define ENABLE_RGB_MATRIX_BAND_SAT
+// #define ENABLE_RGB_MATRIX_BAND_VAL
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+// #define ENABLE_RGB_MATRIX_HUE_BREATHING
+// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// #define ENABLE_RGB_MATRIX_HUE_WAVE
+// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+/* Allow VIA to edit lighting */
+#ifdef VIA_ENABLE
+#    define VIA_QMK_RGBLIGHT_ENABLE
+#endif
diff --git a/keyboards/keychron/q2/halconf.h b/keyboards/keychron/q2/halconf.h
index a9304b8592..41bddcb279 100644
--- a/keyboards/keychron/q2/halconf.h
+++ b/keyboards/keychron/q2/halconf.h
@@ -14,13 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/nk65/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
- */
-
 #pragma once
 
 #define HAL_USE_I2C TRUE
 
-#include_next <halconf.h>
\ No newline at end of file
+#include_next <halconf.h>
diff --git a/keyboards/keychron/q2/mcuconf.h b/keyboards/keychron/q2/mcuconf.h
index 6ab916aea1..0ca8c64850 100644
--- a/keyboards/keychron/q2/mcuconf.h
+++ b/keyboards/keychron/q2/mcuconf.h
@@ -14,14 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/acheron/arctic/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
- */
-
 #pragma once
 
 #include_next <mcuconf.h>
 
 #undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 TRUE
\ No newline at end of file
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keychron/q2/rev_0110/config.h b/keyboards/keychron/q2/rev_0110/config.h
index d9fc5c1744..e41857d9b2 100644
--- a/keyboards/keychron/q2/rev_0110/config.h
+++ b/keyboards/keychron/q2/rev_0110/config.h
@@ -19,3 +19,8 @@
 /* USB Device descriptor parameter */
 #define PRODUCT_ID 0x0110
 #define DEVICE_VER 0x0100
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 34
+#define DRIVER_2_LED_TOTAL 33
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/keychron/q2/rev_0110/rev_0110.c b/keyboards/keychron/q2/rev_0110/rev_0110.c
index d91a41fca1..fe52490177 100644
--- a/keyboards/keychron/q2/rev_0110/rev_0110.c
+++ b/keyboards/keychron/q2/rev_0110/rev_0110.c
@@ -15,3 +15,109 @@
  */
 
 #include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to CKLED manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, C_1,    A_1,    B_1},
+    {0, C_2,    A_2,    B_2},
+    {0, C_3,    A_3,    B_3},
+    {0, C_4,    A_4,    B_4},
+    {0, C_5,    A_5,    B_5},
+    {0, C_6,    A_6,    B_6},
+    {0, C_7,    A_7,    B_7},
+    {0, C_8,    A_8,    B_8},
+    {0, C_9,    A_9,    B_9},
+    {0, C_10,   A_10,   B_10},
+    {0, C_11,   A_11,   B_11},
+    {0, C_12,   A_12,   B_12},
+    {0, C_13,   A_13,   B_13},
+    {0, C_14,   A_14,   B_14},
+    {0, C_16,   A_16,   B_16},
+
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_14,   D_14,   E_14},
+    {0, F_16,   D_16,   E_16},
+
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {1, I_5,    G_5,    H_5},
+    {1, I_6,    G_6,    H_6},
+    {1, I_7,    G_7,    H_7},
+    {1, I_8,    G_8,    H_8},
+    {1, I_9,    G_9,    H_9},
+    {1, I_10,   G_10,   H_10},
+    {1, I_11,   G_11,   H_11},
+    {1, I_12,   G_12,   H_12},
+    {1, I_14,   G_14,   H_14},
+    {1, I_16,   G_16,   H_16},
+
+    {1, C_1,    A_1,    B_1},
+    {1, C_3,    A_3,    B_3},
+    {1, C_4,    A_4,    B_4},
+    {1, C_5,    A_5,    B_5},
+    {1, C_6,    A_6,    B_6},
+    {1, C_7,    A_7,    B_7},
+    {1, C_8,    A_8,    B_8},
+    {1, C_9,    A_9,    B_9},
+    {1, C_10,   A_10,   B_10},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_14,   A_14,   B_14},
+    {1, C_15,   A_15,   B_15},
+
+    {1, F_1,    D_1,    E_1},
+    {1, F_2,    D_2,    E_2},
+    {1, F_3,    D_3,    E_3},
+    {1, F_7,    D_7,    E_7},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_13,   D_13,   E_13},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+    {1, F_16,   D_16,   E_16},
+};
+
+led_config_t g_led_config = {
+     {
+        {   0,      1,      2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12,     13,     14  },
+        {  15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     28,     29  },
+        {  30,     31,     32,     33,     34,     35,     36,     37,     38,     39,     40,     41,     65,     42,     43  },
+        {  44, NO_LED,     45,     46,     47,     48,     49,     50,     51,     52,     53,     54, NO_LED,     55,     56  },
+        {  57,     58,     59, NO_LED, NO_LED, NO_LED,     60, NO_LED, NO_LED, NO_LED,     61,     62,     63,     64,     66  },
+    },
+    {
+        {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, {90, 0}, {105, 0}, {120, 0}, {135, 0}, {150, 0}, {165, 0}, {180, 0}, {195, 0},           {224, 0},
+        {0,16}, {15,16}, {30,16}, {45,16}, {60,16}, {75,16}, {90,16}, {105,16}, {120,16}, {135,16}, {150,16}, {165,16}, {180,16}, {195,16},           {224,16},
+        {0,32}, {15,32}, {30,32}, {45,32}, {60,32}, {75,32}, {90,32}, {105,32}, {120,32}, {135,32}, {150,32}, {165,32},           {195,32},           {224,32},
+        {0,48},          {30,48}, {45,48}, {60,48}, {75,48}, {90,48}, {105,48}, {120,48}, {135,48}, {150,48}, {165,48},           {180,48}, {210,48},
+        {0,64}, {15,64}, {30,64},                            {90,64},                               {150,64}, {165,64}, {180,64}, {195,64}, {210,64}, {224,64},
+    },
+    {
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,          4,
+        4,          4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,    4,
+        4,    4,    4,                      4,                      4,    4,    4,    4,    4,    4,
+    }
+};
+#endif
diff --git a/keyboards/keychron/q2/rev_0110/rules.mk b/keyboards/keychron/q2/rev_0110/rules.mk
index 0d4e745010..957680ab11 100644
--- a/keyboards/keychron/q2/rev_0110/rules.mk
+++ b/keyboards/keychron/q2/rev_0110/rules.mk
@@ -1,13 +1,5 @@
 # MCU name
-# MCU = STM32L432
-MCU = cortex-m4
-ARMV = 7
-MCU_FAMILY = STM32
-MCU_SERIES = STM32L4xx
-MCU_LDSCRIPT = STM32L432xB
-MCU_STARTUP = stm32l4xx
-BOARD = GENERIC_STM32_L433XC
-PLATFORM_NAME = platform_l432
+MCU = STM32L433
 
 # Build Options
 #   change yes to no to disable
@@ -23,12 +15,9 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no         # Enable Encoder
 DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = i2c
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
-# custom matrix setup
-CUSTOM_MATRIX = lite
-
-SRC += matrix.c
diff --git a/keyboards/keychron/q2/rev_0111/config.h b/keyboards/keychron/q2/rev_0111/config.h
index cc50d0688a..76cd5d0e78 100644
--- a/keyboards/keychron/q2/rev_0111/config.h
+++ b/keyboards/keychron/q2/rev_0111/config.h
@@ -20,9 +20,14 @@
 #define PRODUCT_ID      0x0111
 #define DEVICE_VER      0x0100
 
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 34
+#define DRIVER_2_LED_TOTAL 33
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
 /* Encoder used pins */
 #define ENCODERS_PAD_A { A10 }
 #define ENCODERS_PAD_B { B5 }
 
 /* Specifies the number of pulses the encoder registers between each detent */
-#define ENCODER_RESOLUTION 2
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/keychron/q2/rev_0111/rev_0111.c b/keyboards/keychron/q2/rev_0111/rev_0111.c
index c9413d023d..cbadafc458 100644
--- a/keyboards/keychron/q2/rev_0111/rev_0111.c
+++ b/keyboards/keychron/q2/rev_0111/rev_0111.c
@@ -16,6 +16,112 @@
 
 #include "quantum.h"
 
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to CKLED manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, C_1,    A_1,    B_1},
+    {0, C_2,    A_2,    B_2},
+    {0, C_3,    A_3,    B_3},
+    {0, C_4,    A_4,    B_4},
+    {0, C_5,    A_5,    B_5},
+    {0, C_6,    A_6,    B_6},
+    {0, C_7,    A_7,    B_7},
+    {0, C_8,    A_8,    B_8},
+    {0, C_9,    A_9,    B_9},
+    {0, C_10,   A_10,   B_10},
+    {0, C_11,   A_11,   B_11},
+    {0, C_12,   A_12,   B_12},
+    {0, C_13,   A_13,   B_13},
+    {0, C_14,   A_14,   B_14},
+    {0, C_16,   A_16,   B_16},
+
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_14,   D_14,   E_14},
+    {0, F_16,   D_16,   E_16},
+
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {1, I_5,    G_5,    H_5},
+    {1, I_6,    G_6,    H_6},
+    {1, I_7,    G_7,    H_7},
+    {1, I_8,    G_8,    H_8},
+    {1, I_9,    G_9,    H_9},
+    {1, I_10,   G_10,   H_10},
+    {1, I_11,   G_11,   H_11},
+    {1, I_12,   G_12,   H_12},
+    {1, I_14,   G_14,   H_14},
+    {1, I_16,   G_16,   H_16},
+
+    {1, C_1,    A_1,    B_1},
+    {1, C_3,    A_3,    B_3},
+    {1, C_4,    A_4,    B_4},
+    {1, C_5,    A_5,    B_5},
+    {1, C_6,    A_6,    B_6},
+    {1, C_7,    A_7,    B_7},
+    {1, C_8,    A_8,    B_8},
+    {1, C_9,    A_9,    B_9},
+    {1, C_10,   A_10,   B_10},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_14,   A_14,   B_14},
+    {1, C_15,   A_15,   B_15},
+
+    {1, F_1,    D_1,    E_1},
+    {1, F_2,    D_2,    E_2},
+    {1, F_3,    D_3,    E_3},
+    {1, F_7,    D_7,    E_7},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_13,   D_13,   E_13},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+    {1, F_16,   D_16,   E_16},
+};
+
+led_config_t g_led_config = {
+     {
+        {   0,      1,      2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12,     13,     14  },
+        {  15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     28,     29  },
+        {  30,     31,     32,     33,     34,     35,     36,     37,     38,     39,     40,     41,     65,     42,     43  },
+        {  44, NO_LED,     45,     46,     47,     48,     49,     50,     51,     52,     53,     54, NO_LED,     55,     56  },
+        {  57,     58,     59, NO_LED, NO_LED, NO_LED,     60, NO_LED, NO_LED, NO_LED,     61,     62,     63,     64,     66  },
+    },
+    {
+        {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, {90, 0}, {105, 0}, {120, 0}, {135, 0}, {150, 0}, {165, 0}, {180, 0}, {195, 0},           {224, 0},
+        {0,16}, {15,16}, {30,16}, {45,16}, {60,16}, {75,16}, {90,16}, {105,16}, {120,16}, {135,16}, {150,16}, {165,16}, {180,16}, {195,16},           {224,16},
+        {0,32}, {15,32}, {30,32}, {45,32}, {60,32}, {75,32}, {90,32}, {105,32}, {120,32}, {135,32}, {150,32}, {165,32},           {195,32},           {224,32},
+        {0,48},          {30,48}, {45,48}, {60,48}, {75,48}, {90,48}, {105,48}, {120,48}, {135,48}, {150,48}, {165,48},           {180,48}, {210,48},
+        {0,64}, {15,64}, {30,64},                            {90,64},                               {150,64}, {165,64}, {180,64}, {195,64}, {210,64}, {224,64},
+    },
+    {
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,          4,
+        4,          4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,    4,
+        4,    4,    4,                      4,                      4,    4,    4,    4,    4,    4,
+    }
+};
+#endif
+
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/keychron/q2/rev_0111/rules.mk b/keyboards/keychron/q2/rev_0111/rules.mk
index 52d0bce592..3b931ef9fe 100644
--- a/keyboards/keychron/q2/rev_0111/rules.mk
+++ b/keyboards/keychron/q2/rev_0111/rules.mk
@@ -1,13 +1,5 @@
 # MCU name
-# MCU = STM32L432
-MCU = cortex-m4
-ARMV = 7
-MCU_FAMILY = STM32
-MCU_SERIES = STM32L4xx
-MCU_LDSCRIPT = STM32L432xB
-MCU_STARTUP = stm32l4xx
-BOARD = GENERIC_STM32_L433XC
-PLATFORM_NAME = platform_l432
+MCU = STM32L433
 
 # Build Options
 #   change yes to no to disable
@@ -23,12 +15,9 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = i2c
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
-# custom matrix setup
-CUSTOM_MATRIX = lite
-
-SRC += matrix.c
diff --git a/keyboards/keychron/q2/rev_0112/config.h b/keyboards/keychron/q2/rev_0112/config.h
index b76640d650..70a60fd026 100644
--- a/keyboards/keychron/q2/rev_0112/config.h
+++ b/keyboards/keychron/q2/rev_0112/config.h
@@ -19,3 +19,8 @@
 /* USB Device descriptor parameter */
 #define PRODUCT_ID      0x0112
 #define DEVICE_VER      0x0100
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 34
+#define DRIVER_2_LED_TOTAL 34
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/keychron/q2/rev_0112/rev_0112.c b/keyboards/keychron/q2/rev_0112/rev_0112.c
index d91a41fca1..b994679725 100644
--- a/keyboards/keychron/q2/rev_0112/rev_0112.c
+++ b/keyboards/keychron/q2/rev_0112/rev_0112.c
@@ -15,3 +15,110 @@
  */
 
 #include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, C_1,    A_1,    B_1},
+    {0, C_2,    A_2,    B_2},
+    {0, C_3,    A_3,    B_3},
+    {0, C_4,    A_4,    B_4},
+    {0, C_5,    A_5,    B_5},
+    {0, C_6,    A_6,    B_6},
+    {0, C_7,    A_7,    B_7},
+    {0, C_8,    A_8,    B_8},
+    {0, C_9,    A_9,    B_9},
+    {0, C_10,   A_10,   B_10},
+    {0, C_11,   A_11,   B_11},
+    {0, C_12,   A_12,   B_12},
+    {0, C_13,   A_13,   B_13},
+    {0, C_14,   A_14,   B_14},
+    {0, C_16,   A_16,   B_16},
+
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_16,   D_16,   E_16},
+
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {1, I_5,    G_5,    H_5},
+    {1, I_6,    G_6,    H_6},
+    {1, I_7,    G_7,    H_7},
+    {1, I_8,    G_8,    H_8},
+    {1, I_9,    G_9,    H_9},
+    {1, I_10,   G_10,   H_10},
+    {1, I_11,   G_11,   H_11},
+    {1, I_12,   G_12,   H_12},
+    {1, I_14,   G_14,   H_14},
+    {0, F_14,   D_14,   E_14},
+    {1, I_16,   G_16,   H_16},
+
+    {1, C_1,    A_1,    B_1},
+	{1, C_2,    A_2,    B_2},
+    {1, C_3,    A_3,    B_3},
+    {1, C_4,    A_4,    B_4},
+    {1, C_5,    A_5,    B_5},
+    {1, C_6,    A_6,    B_6},
+    {1, C_7,    A_7,    B_7},
+    {1, C_8,    A_8,    B_8},
+    {1, C_9,    A_9,    B_9},
+    {1, C_10,   A_10,   B_10},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_14,   A_14,   B_14},
+    {1, C_15,   A_15,   B_15},
+
+    {1, F_1,    D_1,    E_1},
+    {1, F_2,    D_2,    E_2},
+    {1, F_3,    D_3,    E_3},
+    {1, F_7,    D_7,    E_7},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_13,   D_13,   E_13},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+    {1, F_16,   D_16,   E_16}
+};
+
+led_config_t g_led_config = {
+     {
+        {   0,      1,      2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12,     13,     14  },
+        {  15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     42,     28  },
+        {  29,     30,     31,     32,     33,     34,     35,     36,     37,     38,     39,     40,     66,     41,     43  },
+        {  44,     45,     46,     47,     48,     49,     50,     51,     52,     53,     54,     55, NO_LED,     56,     57  },
+        {  58,     59,     60,  NO_LED, NO_LED, NO_LED,    61, NO_LED, NO_LED, NO_LED,     62,     63,     64,     65,     67  }
+    },
+    {
+        {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, {90, 0}, {105, 0}, {120, 0}, {135, 0}, {150, 0}, {165, 0}, {180, 0}, {195, 0},           {224, 0},
+        {0,16}, {15,16}, {30,16}, {45,16}, {60,16}, {75,16}, {90,16}, {105,16}, {120,16}, {135,16}, {150,16}, {165,16}, {180,16},                     {224,16},
+        {0,32}, {15,32}, {30,32}, {45,32}, {60,32}, {75,32}, {90,32}, {105,32}, {120,32}, {135,32}, {150,32}, {165,32}, {180,32}, {195,16},           {224,32},
+        {0,48}, {15,48}, {30,48}, {45,48}, {60,48}, {75,48}, {90,48}, {105,48}, {120,48}, {135,48}, {150,48}, {165,48},           {180,48}, {210,48},
+        {0,64}, {15,64}, {30,64},                            {90,64},                               {150,64}, {165,64}, {180,64}, {195,64}, {210,64}, {224,64}
+    },
+    {
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,          4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,    4,
+        4,    4,    4,                      4,                      4,    4,    4,    4,    4,    4
+    }
+};
+#endif
diff --git a/keyboards/keychron/q2/rev_0112/rules.mk b/keyboards/keychron/q2/rev_0112/rules.mk
index 0d4e745010..957680ab11 100644
--- a/keyboards/keychron/q2/rev_0112/rules.mk
+++ b/keyboards/keychron/q2/rev_0112/rules.mk
@@ -1,13 +1,5 @@
 # MCU name
-# MCU = STM32L432
-MCU = cortex-m4
-ARMV = 7
-MCU_FAMILY = STM32
-MCU_SERIES = STM32L4xx
-MCU_LDSCRIPT = STM32L432xB
-MCU_STARTUP = stm32l4xx
-BOARD = GENERIC_STM32_L433XC
-PLATFORM_NAME = platform_l432
+MCU = STM32L433
 
 # Build Options
 #   change yes to no to disable
@@ -23,12 +15,9 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no         # Enable Encoder
 DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = i2c
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
-# custom matrix setup
-CUSTOM_MATRIX = lite
-
-SRC += matrix.c
diff --git a/keyboards/keychron/q2/rev_0113/config.h b/keyboards/keychron/q2/rev_0113/config.h
index 21ada693c0..92b9c2e364 100644
--- a/keyboards/keychron/q2/rev_0113/config.h
+++ b/keyboards/keychron/q2/rev_0113/config.h
@@ -20,6 +20,11 @@
 #define PRODUCT_ID      0x0113
 #define DEVICE_VER      0x0100
 
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 34
+#define DRIVER_2_LED_TOTAL 34
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
 /* Encoder used pins */
 #define ENCODERS_PAD_A { A10 }
 #define ENCODERS_PAD_B { B5 }
diff --git a/keyboards/keychron/q2/rev_0113/rev_0113.c b/keyboards/keychron/q2/rev_0113/rev_0113.c
index c9413d023d..e1d66976dd 100644
--- a/keyboards/keychron/q2/rev_0113/rev_0113.c
+++ b/keyboards/keychron/q2/rev_0113/rev_0113.c
@@ -16,6 +16,113 @@
 
 #include "quantum.h"
 
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, C_1,    A_1,    B_1},
+    {0, C_2,    A_2,    B_2},
+    {0, C_3,    A_3,    B_3},
+    {0, C_4,    A_4,    B_4},
+    {0, C_5,    A_5,    B_5},
+    {0, C_6,    A_6,    B_6},
+    {0, C_7,    A_7,    B_7},
+    {0, C_8,    A_8,    B_8},
+    {0, C_9,    A_9,    B_9},
+    {0, C_10,   A_10,   B_10},
+    {0, C_11,   A_11,   B_11},
+    {0, C_12,   A_12,   B_12},
+    {0, C_13,   A_13,   B_13},
+    {0, C_14,   A_14,   B_14},
+    {0, C_16,   A_16,   B_16},
+
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_16,   D_16,   E_16},
+
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {1, I_5,    G_5,    H_5},
+    {1, I_6,    G_6,    H_6},
+    {1, I_7,    G_7,    H_7},
+    {1, I_8,    G_8,    H_8},
+    {1, I_9,    G_9,    H_9},
+    {1, I_10,   G_10,   H_10},
+    {1, I_11,   G_11,   H_11},
+    {1, I_12,   G_12,   H_12},
+    {1, I_14,   G_14,   H_14},
+    {0, F_14,   D_14,   E_14},
+    {1, I_16,   G_16,   H_16},
+
+    {1, C_1,    A_1,    B_1},
+	{1, C_2,    A_2,    B_2},
+    {1, C_3,    A_3,    B_3},
+    {1, C_4,    A_4,    B_4},
+    {1, C_5,    A_5,    B_5},
+    {1, C_6,    A_6,    B_6},
+    {1, C_7,    A_7,    B_7},
+    {1, C_8,    A_8,    B_8},
+    {1, C_9,    A_9,    B_9},
+    {1, C_10,   A_10,   B_10},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_14,   A_14,   B_14},
+    {1, C_15,   A_15,   B_15},
+
+    {1, F_1,    D_1,    E_1},
+    {1, F_2,    D_2,    E_2},
+    {1, F_3,    D_3,    E_3},
+    {1, F_7,    D_7,    E_7},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_13,   D_13,   E_13},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+    {1, F_16,   D_16,   E_16}
+};
+
+led_config_t g_led_config = {
+     {
+        {   0,      1,      2,      3,      4,      5,      6,      7,      8,      9,     10,     11,     12,     13,     14  },
+        {  15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     42,     28  },
+        {  29,     30,     31,     32,     33,     34,     35,     36,     37,     38,     39,     40,     66,     41,     43  },
+        {  44,     45,     46,     47,     48,     49,     50,     51,     52,     53,     54,     55, NO_LED,     56,     57  },
+        {  58,     59,     60,  NO_LED, NO_LED, NO_LED,    61, NO_LED, NO_LED, NO_LED,     62,     63,     64,     65,     67  }
+    },
+    {
+        {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, {90, 0}, {105, 0}, {120, 0}, {135, 0}, {150, 0}, {165, 0}, {180, 0}, {195, 0},           {224, 0},
+        {0,16}, {15,16}, {30,16}, {45,16}, {60,16}, {75,16}, {90,16}, {105,16}, {120,16}, {135,16}, {150,16}, {165,16}, {180,16},                     {224,16},
+        {0,32}, {15,32}, {30,32}, {45,32}, {60,32}, {75,32}, {90,32}, {105,32}, {120,32}, {135,32}, {150,32}, {165,32}, {180,32}, {195,16},           {224,32},
+        {0,48}, {15,48}, {30,48}, {45,48}, {60,48}, {75,48}, {90,48}, {105,48}, {120,48}, {135,48}, {150,48}, {165,48},           {180,48}, {210,48},
+        {0,64}, {15,64}, {30,64},                            {90,64},                               {150,64}, {165,64}, {180,64}, {195,64}, {210,64}, {224,64}
+    },
+    {
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,          4,
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,          4,    4,
+        4,    4,    4,                      4,                      4,    4,    4,    4,    4,    4
+    }
+};
+#endif
+
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
diff --git a/keyboards/keychron/q2/rev_0113/rules.mk b/keyboards/keychron/q2/rev_0113/rules.mk
index 52d0bce592..3b931ef9fe 100644
--- a/keyboards/keychron/q2/rev_0113/rules.mk
+++ b/keyboards/keychron/q2/rev_0113/rules.mk
@@ -1,13 +1,5 @@
 # MCU name
-# MCU = STM32L432
-MCU = cortex-m4
-ARMV = 7
-MCU_FAMILY = STM32
-MCU_SERIES = STM32L4xx
-MCU_LDSCRIPT = STM32L432xB
-MCU_STARTUP = stm32l4xx
-BOARD = GENERIC_STM32_L433XC
-PLATFORM_NAME = platform_l432
+MCU = STM32L433
 
 # Build Options
 #   change yes to no to disable
@@ -23,12 +15,9 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = i2c
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-
-# custom matrix setup
-CUSTOM_MATRIX = lite
-
-SRC += matrix.c

From 1bc1b1b3133ef85426fb537ff576998958f693f5 Mon Sep 17 00:00:00 2001
From: dnlsmy <dnlsmy@gmail.com>
Date: Sat, 22 Jan 2022 10:03:50 -0500
Subject: [PATCH 357/867] Update readme.md (#15989)

Spelling correction
---
 keyboards/keychron/q1/rev_0101/readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/keychron/q1/rev_0101/readme.md b/keyboards/keychron/q1/rev_0101/readme.md
index d7693349be..b89c9ad7ad 100644
--- a/keyboards/keychron/q1/rev_0101/readme.md
+++ b/keyboards/keychron/q1/rev_0101/readme.md
@@ -1,4 +1,4 @@
 # The ANSI variant of the Keychron Q1
 - Enable EC11 rotary encoder
-- Turn colckwise to increase volume and turn anti-colckwise to decrease volume
-- Press top right key pushbutton to mute
\ No newline at end of file
+- Turn clockwise to increase volume and turn anti-clockwise to decrease volume
+- Press top right key pushbutton to mute

From 8ec18d147613d3539764b33e92af5c9542dd5f46 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 23 Jan 2022 05:24:02 +1100
Subject: [PATCH 358/867] Remove `action_function()` from LFKeyboards boards
 (#15993)

---
 .../amj84/keymaps/default/keymap.c            |   4 +-
 keyboards/capsunlocked/cu75/cu75.c            |  56 ----
 keyboards/capsunlocked/cu75/cu75.h            |  13 -
 keyboards/capsunlocked/cu75/cu75/.noci        |   0
 .../lfk65_hs/keymaps/default/keymap.c         |  84 +++--
 .../lfk78/keymaps/ca178858/keymap.c           | 210 ++++++-------
 .../lfk78/keymaps/default/keymap.c            |  15 +-
 .../lfkeyboards/lfk78/keymaps/iso/keymap.c    |  15 +-
 .../lfk78/keymaps/split_bs_osx/keymap.c       |  15 +-
 keyboards/lfkeyboards/lfk78/lfk78.c           |  67 ----
 keyboards/lfkeyboards/lfk78/lfk78.h           |  13 -
 .../lfk87/keymaps/ca178858/keymap.c           | 297 ++++++++----------
 .../lfk87/keymaps/default/keymap.c            | 150 +++++----
 .../lfkeyboards/lfk87/keymaps/gbchk/keymap.c  | 150 +++++----
 .../lfkeyboards/lfk87/keymaps/iso/keymap.c    | 160 +++++-----
 keyboards/lfkeyboards/lfk87/lfk87.c           |  55 ----
 keyboards/lfkeyboards/lfk87/lfk87.h           |  14 -
 .../mini1800/keymaps/ca178858/keymap.c        | 153 +++++----
 .../mini1800/keymaps/default/keymap.c         | 147 ++++-----
 keyboards/lfkeyboards/mini1800/mini1800.c     |  58 ----
 keyboards/lfkeyboards/mini1800/mini1800.h     |  14 -
 .../smk65/keymaps/default/keymap.c            |  90 +++---
 .../lfkeyboards/smk65/keymaps/iso/keymap.c    |  90 +++---
 keyboards/lfkeyboards/smk65/revb/revb.c       |  56 ----
 keyboards/lfkeyboards/smk65/revb/revb.h       |  13 -
 keyboards/rocketboard_16/keycode_lookup.c     |  34 +-
 26 files changed, 716 insertions(+), 1257 deletions(-)
 delete mode 100644 keyboards/capsunlocked/cu75/cu75/.noci

diff --git a/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c b/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
index 11f8482352..3f83fc8236 100644
--- a/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
+++ b/keyboards/amjkeyboard/amj84/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * |-----------------------------------------------------------|
      * |      |Lef|Dow|Rig|   |   |   |   |   |   |Hom|PgU|        |
      * |-----------------------------------------------------------|
-     * |        |   |App|Fn1|Fn2|Fn3|VoD|VoU|Mut|End|PgD|      |   |
+     * |        |   |App|   |   |   |VoD|VoU|Mut|End|PgD|      |   |
      * |-----------------------------------------------------------|
      * |    |    |    |                        |    |    |    |    |
      * `-----------------------------------------------------------'
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_TRNS,KC_TRNS,KC_UP,  KC_TRNS,KC_TRNS,KC_TRNS,KC_CALC,KC_TRNS,KC_INS, KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,KC_TRNS,
         BL_BRTG,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_PGUP,KC_TRNS,KC_TRNS,KC_TRNS,
-        BL_STEP,KC_NO,  KC_TRNS,KC_APP, KC_FN1, KC_FN2, KC_FN3, KC_VOLD,KC_VOLU,KC_MUTE,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,KC_TRNS,
+        BL_STEP,KC_NO,  KC_TRNS,KC_APP, KC_TRNS,KC_TRNS,KC_TRNS,KC_VOLD,KC_VOLU,KC_MUTE,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,KC_TRNS,
         KC_SLEP,KC_TRNS,KC_TRNS,          KC_TRNS,          KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS)
 
 };
diff --git a/keyboards/capsunlocked/cu75/cu75.c b/keyboards/capsunlocked/cu75/cu75.c
index 273dd09271..e52edd90fa 100644
--- a/keyboards/capsunlocked/cu75/cu75.c
+++ b/keyboards/capsunlocked/cu75/cu75.c
@@ -98,62 +98,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
     return process_record_user(keycode, record);
 }
 
-void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
-{
-#ifdef AUDIO_ENABLE
-    int8_t sign = 1;
-#endif
-    if(id == LFK_ESC_TILDE){
-        // Send ~ on shift-esc
-        void (*method)(uint8_t) = (event->event.pressed) ? &add_key : &del_key;
-        uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT));
-        method(shifted ? KC_GRAVE : KC_ESCAPE);
-        send_keyboard_report();
-    }else if(event->event.pressed){
-        switch(id){
-            case LFK_SET_DEFAULT_LAYER:
-                // set/save the current base layer to eeprom, falls through to LFK_CLEAR
-                eeconfig_update_default_layer(1UL << opt);
-                default_layer_set(1UL << opt);
-            case LFK_CLEAR:
-                // Go back to default layer
-                layer_clear();
-                break;
-#ifdef AUDIO_ENABLE
-            case LFK_CLICK_FREQ_LOWER:
-                sign = -1;  // continue to next statement
-            case LFK_CLICK_FREQ_HIGHER:
-                click_hz += sign * 100;
-                click(click_hz, click_time);
-                break;
-            case LFK_CLICK_TOGGLE:
-                if(click_toggle){
-                    click_toggle = 0;
-                    click(4000, 100);
-                    click(1000, 100);
-                }else{
-                    click_toggle = 1;
-                    click(1000, 100);
-                    click(4000, 100);
-                }
-                break;
-            case LFK_CLICK_TIME_SHORTER:
-                sign = -1;  // continue to next statement
-            case LFK_CLICK_TIME_LONGER:
-                click_time += sign;
-                click(click_hz, click_time);
-                break;
-#endif
-            case LFK_DEBUG_SETTINGS:
-                dprintf("Click:\n");
-                dprintf("  toggle: %d\n", click_toggle);
-                dprintf("  freq(hz): %d\n", click_hz);
-                dprintf("  duration(ms): %d\n", click_time);
-                break;
-        }
-    }
-}
-
 void reset_keyboard_kb(){
 #ifdef WATCHDOG_ENABLE
     MCUSR = 0;
diff --git a/keyboards/capsunlocked/cu75/cu75.h b/keyboards/capsunlocked/cu75/cu75.h
index 444c8daaec..11a01b8b7e 100644
--- a/keyboards/capsunlocked/cu75/cu75.h
+++ b/keyboards/capsunlocked/cu75/cu75.h
@@ -19,19 +19,6 @@ typedef struct Layer_Info {
 extern const uint32_t layer_count;
 extern const Layer_Info layer_info[];
 
-enum action_functions {
-    LFK_CLEAR = 0,          // Resets all layers
-    LFK_ESC_TILDE,          // esc+lshift = ~
-    LFK_SET_DEFAULT_LAYER,  // changes and saves current base layer to eeprom
-    LFK_CLICK_TOGGLE,       // Adjusts click duration
-    LFK_CLICK_FREQ_HIGHER,  // Adjusts click frequency
-    LFK_CLICK_FREQ_LOWER,   // Adjusts click frequency
-    LFK_CLICK_TIME_LONGER,  // Adjusts click duration
-    LFK_CLICK_TIME_SHORTER, // Adjusts click duration
-    LFK_DEBUG_SETTINGS,     // prints LED and click settings to HID
-    LFK_LED_TEST            // cycles through switch and RGB LEDs
-};
-
 #define CLICK_HZ 500
 #define CLICK_MS 2
 #define CLICK_ENABLED 0
diff --git a/keyboards/capsunlocked/cu75/cu75/.noci b/keyboards/capsunlocked/cu75/cu75/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c
index cced607b0c..8d8b4b751b 100644
--- a/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk65_hs/keymaps/default/keymap.c
@@ -1,54 +1,50 @@
 #include QMK_KEYBOARD_H
 
-//Define a shorter 'transparent' key code to make the keymaps more compact
-#define KC_TR KC_TRNS
-
 enum keymap_layout {
     BASE = 0,
     FUNC,
 };
 
-// #define uint16_t int
-// #define uint8_t int
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[BASE] = LAYOUT_ansi(
-  /* Keymap VANILLA: (Base Layer) Default Layer
-   * ,------------------------------------------------------------.----.
-   * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa| Ins|
-   * |------------------------------------------------------------|----|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \| Del|
-   * |------------------------------------------------------------|----|
-   * |CAPS    |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |------------------------------------------------------------|----|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift  |Up |PgDn|
-   * |-----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |       Space         |Alt |Ctrl|Func|Lft| Dn |Rig |
-   * `-----------------------------------------------------------------'
-   */
-    KC_GESC,KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,   KC_BSPC,  KC_INS,
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,  KC_DEL,
-    KC_CAPS,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,      KC_ENT,  KC_PGUP,
-    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,   KC_UP,  KC_PGDN,
-    KC_LCTL, KC_LGUI, KC_LALT,         KC_SPC,       KC_RALT, KC_RCTL, MO(FUNC), KC_LEFT, KC_DOWN,  KC_RGHT),
+    /* Keymap VANILLA: (Base Layer) Default Layer
+     * ,------------------------------------------------------------.----.
+     * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa| Ins|
+     * |------------------------------------------------------------|----|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \| Del|
+     * |------------------------------------------------------------|----|
+     * |CAPS    |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
+     * |------------------------------------------------------------|----|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift  |Up |PgDn|
+     * |-----------------------------------------------------------------|
+     * |Ctrl|Win |Alt |       Space         |Alt |Ctrl|Func|Lft| Dn |Rig |
+     * `-----------------------------------------------------------------'
+     */
+    [BASE] = LAYOUT_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_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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL, MO(FUNC), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-[FUNC] = LAYOUT_ansi(
-   /*Keymap VANILLA: Function Layer
-   * ,------------------------------------------------------------.----.
-   * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa| Ins|
-   * |------------------------------------------------------------|----|
-   * |MuMode | |  |  |E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \| Del|
-   * |------------------------------------------------------------|----|
-   * |AudTgl|Hz+|MS+| |  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |------------------------------------------------------------|----|
-   * |ClickTgl|Hz-|MS-|| C|  V|  B| N|MuTgl|  ,|  .|  /|Shift |Up |PgDn|
-   * |-----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |       Space         |Alt |Ctrl|Func|Lft| Dn |Rig |
-   * `-----------------------------------------------------------------'
-   */
-    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_F13,  KC_F14,
-    MU_MOD, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR,     KC_TR,  RGB_TOG,
-    AU_TOG,  F(1),F(3), KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR, KC_TR,           RESET,  RGB_MOD,
-    F(5),    F(2),F(4), KC_TR, KC_TR, KC_TR, KC_TR, MU_TOG, RGB_VAD, RGB_VAI, KC_TR, KC_TR,        RGB_HUI,  KC_TR,
-    KC_TR, KC_TR, KC_TR,         KC_TR,       KC_TR, KC_TR, KC_TR, RGB_SAD, RGB_HUD,  RGB_SAI),
+    /* Keymap VANILLA: Function Layer
+     * ,------------------------------------------------------------.----.
+     * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa| Ins|
+     * |------------------------------------------------------------|----|
+     * |MuMode | |  |  |E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \| Del|
+     * |------------------------------------------------------------|----|
+     * |AudTgl|Hz+|MS+| |  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
+     * |------------------------------------------------------------|----|
+     * |ClickTgl|Hz-|MS-|| C|  V|  B| N|MuTgl|  ,|  .|  /|Shift |Up |PgDn|
+     * |-----------------------------------------------------------------|
+     * |Ctrl|Win |Alt |       Space         |Alt |Ctrl|Func|Lft| Dn |Rig |
+     * `-----------------------------------------------------------------'
+     */
+    [FUNC] = LAYOUT_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_F13,  KC_F14,
+        MU_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
+        AU_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RESET,   RGB_MOD,
+        _______,          _______, _______, _______, _______, _______, _______, MU_TOG,  RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI
+    )
 };
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
index 9e79a73555..bd35bfbf22 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/ca178858/keymap.c
@@ -15,108 +15,104 @@ enum {
 
 bool spam_space = false;
 
-
-  // {0x00000000, 0xFFFFFFFF, {0x0000, 0x0FFF, 0x0000}}, // base layer - green
-  // {0x00000008, 0xFFFFFFF8, {0x07FF, 0x07FF, 0x0000}}, // CSGO layer - orange
-  // {0x00000010, 0xFFFFFFF0, {0x0000, 0x0000, 0x0FFF}}, // function layer - blue
-  // {0x00000020, 0xFFFFFFE0, {0x0FFF, 0x0000, 0x0FFF}}, // settings layer - magenta
-  // {0xFFFFFFFF, 0xFFFFFFFF, {0x0FFF, 0x0FFF, 0x0FFF}}, // unknown layer - REQUIRED - white
-
+// {0x00000000, 0xFFFFFFFF, {0x0000, 0x0FFF, 0x0000}}, // base layer - green
+// {0x00000008, 0xFFFFFFF8, {0x07FF, 0x07FF, 0x0000}}, // CSGO layer - orange
+// {0x00000010, 0xFFFFFFF0, {0x0000, 0x0000, 0x0FFF}}, // function layer - blue
+// {0x00000020, 0xFFFFFFE0, {0x0FFF, 0x0000, 0x0FFF}}, // settings layer - magenta
+// {0xFFFFFFFF, 0xFFFFFFFF, {0x0FFF, 0x0FFF, 0x0FFF}}, // unknown layer - REQUIRED - white
 
 // Colors of the layer indicator LED
 // This list needs to define layer 0xFFFFFFFF, it is the end of the list, and the unknown layer
 const Layer_Info layer_info[] = {
-  // Layer     Mask           Red     Green   Blue
-  {0x00000000, 0xFFFFFFFF, {0x0000, 0x0FFF, 0x0000}}, // base layer - green
-  {0x00000002, 0xFFFFFFFE, {0x07FF, 0x07FF, 0x0000}}, // CSGO layer - orange
-  {0x00000004, 0xFFFFFFFC, {0x0000, 0x0000, 0x0FFF}}, // function layer - blue
-  {0x00000008, 0xFFFFFFE8, {0x0FFF, 0x0000, 0x0FFF}}, // settings layer - magenta
-  {0xFFFFFFFF, 0xFFFFFFFF, {0x0FFF, 0x0FFF, 0x0FFF}}, // unknown layer - REQUIRED - white
+    // Layer     Mask           Red     Green   Blue
+    {0x00000000, 0xFFFFFFFF, {0x0000, 0x0FFF, 0x0000}}, // base layer - green
+    {0x00000002, 0xFFFFFFFE, {0x07FF, 0x07FF, 0x0000}}, // CSGO layer - orange
+    {0x00000004, 0xFFFFFFFC, {0x0000, 0x0000, 0x0FFF}}, // function layer - blue
+    {0x00000008, 0xFFFFFFE8, {0x0FFF, 0x0000, 0x0FFF}}, // settings layer - magenta
+    {0xFFFFFFFF, 0xFFFFFFFF, {0x0FFF, 0x0FFF, 0x0FFF}}, // unknown layer - REQUIRED - white
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap BASE: (Base Layer) Default Layer
-   * ,---------.  ,------------------------------------------------------------.  ,---------.
-   * |Vol-|Vol+|  |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa|  | Ins|PgUp|
-   * |---------|  |------------------------------------------------------------|  |---------|
-   * | F3 | F4 |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \|  | Del|PgDn|
-   * |---------|  |------------------------------------------------------------|  `---------'
-   * | F5 | F6 |  |Control |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |---------|  |------------------------------------------------------------|  ,----.
-   * | F7 | F8 |  |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  Shift    |  | Up |
-   * |---------|  |-------------------------------------------------------------------------.
-   * | F9 | F10|  |Func|Alt |Cmd |      Space            |Cmd |Alt |Func |    |Lft| Dn |Rig |
-   * `---------'  `------------------------------------------------------'    `-------------'
-   */
-  [VANILLA] = LAYOUT_split_rshift(
-    KC_VOLD, KC_VOLU, 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,            LALT(KC_F5), KC_PGUP, \
-    KC_F3,   KC_F4,   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_PGDN, \
-    KC_F5,   KC_F6,   TD(TD_ESC_FUNC), 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_F7,   KC_F8,   KC_LSFT,         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,      MO(CS_GO),          KC_UP,                \
-    KC_F9,   KC_F10,  KC_LCTL,         KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC),                KC_LEFT, KC_DOWN, KC_RGHT      \
-  ),
+    /* Keymap BASE: (Base Layer) Default Layer
+     * ,---------.  ,------------------------------------------------------------.  ,---------.
+     * |Vol-|Vol+|  |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa|  | Ins|PgUp|
+     * |---------|  |------------------------------------------------------------|  |---------|
+     * | F3 | F4 |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \|  | Del|PgDn|
+     * |---------|  |------------------------------------------------------------|  `---------'
+     * | F5 | F6 |  |Control |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+     * |---------|  |------------------------------------------------------------|  ,----.
+     * | F7 | F8 |  |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|  Shift    |  | Up |
+     * |---------|  |-------------------------------------------------------------------------.
+     * | F9 | F10|  |Func|Alt |Cmd |      Space            |Cmd |Alt |Func |    |Lft| Dn |Rig |
+     * `---------'  `------------------------------------------------------'    `-------------'
+     */
+    [VANILLA] = LAYOUT_split_rshift(
+        KC_VOLD, KC_VOLU, 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,            LALT(KC_F5), KC_PGUP,
+        KC_F3,   KC_F4,   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_PGDN,
+        KC_F5,   KC_F6,   TD(TD_ESC_FUNC), 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_F7,   KC_F8,   KC_LSFT,         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,      MO(CS_GO),          KC_UP,
+        KC_F9,   KC_F10,  KC_LCTL,         KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC),                KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  [CS_GO] = LAYOUT_split_rshift(
-    _______, _______, KC_GESC,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,            F(0),        _______, \
-    _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,            _______,     _______, \
-    _______, _______, KC_LCTL,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______,                                  \
-    _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                          _______,              \
-    _______, _______, _______,         _______, _______,                            _______,                            _______, _______, _______,                 _______, _______, _______      \
-  ),
+    [CS_GO] = LAYOUT_split_rshift(
+        _______, _______, KC_GESC,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,            F(0),        _______,
+        _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,            _______,     _______,
+        _______, _______, KC_LCTL,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______,
+        _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                          _______,
+        _______, _______, _______,         _______, _______,                            _______,                            _______, _______, _______,                 _______, _______, _______
+    ),
 
-  /* Keymap FUNCTION: Function Layer
-   * ,---------.  ,-------------------------------------------------------------.  ,---------.
-   * | V- | V+ |  | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  | Ins|Home|
-   * |---------|  |-------------------------------------------------------------|  |---------|
-   * |    |    |  |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  | Del|End |
-   * |---------|  |-------------------------------------------------------------|  `---------'
-   * |    |    |  |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-   * |---------|  |-------------------------------------------------------------|  ,----.
-   * |    |    |  |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|  | Up |
-   * |---------|  |--------------------------------------------------------------------------.
-   * |    | F10|  |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |     |Lft| Dn |Rig |
-   * `---------'  `------------------------------------------------------'     `-------------'
-   */
-  [FUNC] = LAYOUT_split_rshift(
-    _______, _______, KC_GRV,          KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_DEL,             TO(CS_GO),   KC_HOME, \
-    _______, _______, XXXXXXX,         KC_PGUP, KC_UP,   KC_PGDN, KC_HOME, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,            _______,     KC_END,  \
-    _______, _______, _______,         KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,               XXXXXXX,                                  \
-    _______, _______, _______,         XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,          TG(SETTINGS), XXXXXXX,            _______,              \
-    _______, _______, _______,         _______, _______,                            KC_PGDN,                            _______, _______, _______,                 _______, _______, _______      \
-  ),
+    /* Keymap FUNCTION: Function Layer
+     * ,---------.  ,-------------------------------------------------------------.  ,---------.
+     * | V- | V+ |  | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  | Ins|Home|
+     * |---------|  |-------------------------------------------------------------|  |---------|
+     * |    |    |  |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  | Del|End |
+     * |---------|  |-------------------------------------------------------------|  `---------'
+     * |    |    |  |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
+     * |---------|  |-------------------------------------------------------------|  ,----.
+     * |    |    |  |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|  | Up |
+     * |---------|  |--------------------------------------------------------------------------.
+     * |    | F10|  |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |     |Lft| Dn |Rig |
+     * `---------'  `------------------------------------------------------'     `-------------'
+     */
+    [FUNC] = LAYOUT_split_rshift(
+        _______, _______, KC_GRV,          KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,       KC_DEL,             TO(CS_GO),   KC_HOME,
+        _______, _______, XXXXXXX,         KC_PGUP, KC_UP,   KC_PGDN, KC_HOME, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,            _______,     KC_END,
+        _______, _______, _______,         KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,               XXXXXXX,
+        _______, _______, _______,         XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,          TG(SETTINGS), XXXXXXX,            _______,
+        _______, _______, _______,         _______, _______,                            KC_PGDN,                            _______, _______, _______,                 _______, _______, _______
+    ),
 
-  /* Keymap SETTINGS: Settings Layer
-   * ,---------.  ,-----------------------------------------------------------.  ,-------------.
-   * |    |    |  |FN0 |BL0|BL1|BL2|BL3|   |   |   |   |  |   |BL-|BL+|BL Togl|  |RGB Tog |Val+|
-   * |---------|  |-----------------------------------------------------------|  |-------------|
-   * |    |    |  |Debug|   |   |   |   |   |   |   |   |   |   |   |  |RGBTst|  |RGB Mode|Val-|
-   * |---------|  |-----------------------------------------------------------|  `-------------'
-   * |    |    |  |LayrClr|Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-   * |---------|  |-----------------------------------------------------------|  ,----.
-   * |    |    |  |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |  |Hue+|
-   * |---------|  |------------------------------------------------------------------------.
-   * |    |    |  |    |    |    |      Print Debug      |    |    |     |  |Sat-|Hue-|Sat+|
-   * `---------'  `------------------------------------------------------'  `--------------'
-   */
-  [SETTINGS] = LAYOUT_split_rshift(
-    XXXXXXX, XXXXXXX, F(0),            F(3),    F(4),    F(5),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,       BL_TOGG,            RGB_TOG,     RGB_VAI, \
-    XXXXXXX, XXXXXXX, DEBUG,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,            RGB_MOD,     RGB_VAD, \
-    XXXXXXX, XXXXXXX, F(0),            F(6),    F(8),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RESET,                                    \
-    XXXXXXX, XXXXXXX, F(10),           F(7),    F(9),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          F(0),         XXXXXXX,            RGB_HUI,              \
-    XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX,                            F(12),                              XXXXXXX, XXXXXXX, F(0),                    RGB_SAD, RGB_HUD, RGB_SAI      \
-  ),
+    /* Keymap SETTINGS: Settings Layer
+     * ,---------.  ,-----------------------------------------------------------.  ,-------------.
+     * |    |    |  |FN0 |BL0|BL1|BL2|BL3|   |   |   |   |  |   |BL-|BL+|BL Togl|  |RGB Tog |Val+|
+     * |---------|  |-----------------------------------------------------------|  |-------------|
+     * |    |    |  |Debug|   |   |   |   |   |   |   |   |   |   |   |  |RGBTst|  |RGB Mode|Val-|
+     * |---------|  |-----------------------------------------------------------|  `-------------'
+     * |    |    |  |LayrClr|Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
+     * |---------|  |-----------------------------------------------------------|  ,----.
+     * |    |    |  |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |  |Hue+|
+     * |---------|  |------------------------------------------------------------------------.
+     * |    |    |  |    |    |    |      Print Debug      |    |    |     |  |Sat-|Hue-|Sat+|
+     * `---------'  `------------------------------------------------------'  `--------------'
+     */
+    [SETTINGS] = LAYOUT_split_rshift(
+        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,       BL_TOGG,            RGB_TOG,     RGB_VAI,
+        XXXXXXX, XXXXXXX, DEBUG,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX,            RGB_MOD,     RGB_VAD,
+        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RESET,
+        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,      XXXXXXX,            RGB_HUI,
+        XXXXXXX, XXXXXXX, XXXXXXX,         XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,                 RGB_SAD, RGB_HUD, RGB_SAI
+    )
 };
 
-
 void tap_space_spam_finished(qk_tap_dance_state_t *state, void *user_data) {
-    if(get_mods() & (MOD_BIT(KC_LGUI))){
+    if (get_mods() & (MOD_BIT(KC_LGUI))) {
       return;
     }
-    if(state->pressed){
+    if (state->pressed) {
         spam_space = true;
     }
-    register_code(KC_SPC);
-    unregister_code(KC_SPC);
+    tap_code(KC_SPC);
 }
 
 void tap_space_spam_reset(qk_tap_dance_state_t *state, void *user_data) {
@@ -125,11 +121,10 @@ void tap_space_spam_reset(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 void tap_esc_func_finished(qk_tap_dance_state_t *state, void *user_data) {
-    if(state->pressed){
+    if (state->pressed) {
         layer_on(FUNC);
-    }else{
-        register_code(KC_ESC);
-        unregister_code(KC_ESC);
+    } else {
+        tap_code(KC_ESC);
     }
 }
 
@@ -138,40 +133,21 @@ void tap_esc_func_reset(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESC_FUNC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_esc_func_finished, tap_esc_func_reset),
-  [TD_SPC_SPAM] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_space_spam_finished, tap_space_spam_reset),
+    [TD_ESC_FUNC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_esc_func_finished, tap_esc_func_reset),
+    [TD_SPC_SPAM] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_space_spam_finished, tap_space_spam_reset),
 };
 
-
-const uint16_t PROGMEM fn_actions[] = {
-    ACTION_FUNCTION(LFK_CLEAR),                               // FN0 - reset layers
-    ACTION_FUNCTION(LFK_ESC_TILDE),                           // FN1 - esc+shift = ~, else escape
-    ACTION_FUNCTION(LFK_LED_TEST),                            // FN2 - cycle through LEDs for testing
-    ACTION_FUNCTION_OPT(LFK_SET_DEFAULT_LAYER, VANILLA),      // FN3 - set base layer to 0 and save
-    ACTION_FUNCTION_OPT(LFK_SET_DEFAULT_LAYER, VANILLA),  // FN4 - set base layer to 1 and save
-    ACTION_FUNCTION_OPT(LFK_SET_DEFAULT_LAYER, VANILLA),  // FN5 - set base layer to 2 and save
-    ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER),                   // FN6 - Increase Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER),                    // FN7 - Decrease Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_LONGER),                   // FN8 - Increase length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER),                  // FN9 - Decrease length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TOGGLE),                        // FN10 - Toggle audio click
-    ACTION_FUNCTION(LFK_LED_TEST),                            // FN11 - cycle through LEDs for testing
-    ACTION_FUNCTION(LFK_DEBUG_SETTINGS),                      // FN12 - prints LED and click settings to HID
-  };
-
 void matrix_scan_user(void) {
-    if(spam_space && !(get_mods() & (MOD_BIT(KC_LGUI)))){
-        register_code(KC_SPC);
-        unregister_code(KC_SPC);
+    if (spam_space && !(get_mods() & (MOD_BIT(KC_LGUI)))) {
+        tap_code(KC_SPC);
     }
 }
 
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if((layer_state & (1 << CS_GO)) && (keycode == 44)){
-    if(get_mods() & (MOD_BIT(KC_LGUI))){
-      return false;
+    if ((layer_state & (1 << CS_GO)) && (keycode == 44)) {
+        if (get_mods() & (MOD_BIT(KC_LGUI))) {
+            return false;
+        }
     }
-  }
-  return true;
+    return true;
 }
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
index a92a506c12..8faa099453 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/default/keymap.c
@@ -73,23 +73,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------'  `--------------------------------------------------------'  `--------------'
      */
     [SETTINGS] = LAYOUT(
-        XXXXXXX, XXXXXXX, F(0),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,          RGB_TOG, RGB_VAI,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,          RGB_TOG, RGB_VAI,
         XXXXXXX, XXXXXXX, MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RGB_MOD, RGB_VAD,
-        XXXXXXX, XXXXXXX, AU_TOG,  F(1),    F(3),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,
-        XXXXXXX, XXXXXXX, F(5),             F(2),    F(4),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          RGB_HUI,
+        XXXXXXX, XXXXXXX, AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,
+        XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          RGB_HUI,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,          RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-    ACTION_FUNCTION(LFK_CLEAR),              // FN0 - reset layers
-    ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER),  // FN1 - Increase Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER),   // FN2 - Decrease Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_LONGER),  // FN3 - Increase length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER), // FN4 - Decrease length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TOGGLE)        // FN5 - Toggle audio click
-};
-
 void matrix_init_user(void) {
     // This keymap only has a single base layer, so reset the default if needed
     if (eeconfig_read_default_layer() > 1) {
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
index 3dbc775579..ec054b33e7 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/iso/keymap.c
@@ -73,23 +73,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------'  `--------------------------------------------------------'  `--------------'
      */
     [SETTINGS] = LAYOUT_iso(
-        XXXXXXX, XXXXXXX, F(0),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,          RGB_TOG, RGB_VAI,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,          RGB_TOG, RGB_VAI,
         XXXXXXX, XXXXXXX, MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RGB_MOD, RGB_VAD,
-        XXXXXXX, XXXXXXX, AU_TOG,  F(1),    F(3),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,
-        XXXXXXX, XXXXXXX, F(5),    F(2),    F(4),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          RGB_HUI,
+        XXXXXXX, XXXXXXX, AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          RGB_HUI,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,          RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-    ACTION_FUNCTION(LFK_CLEAR),              // FN0 - reset layers
-    ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER),  // FN1 - Increase Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER),   // FN2 - Decrease Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_LONGER),  // FN3 - Increase length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER), // FN4 - Decrease length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TOGGLE)        // FN5 - Toggle audio click
-};
-
 void matrix_init_user(void) {
     // This keymap only has a single base layer, so reset the default if needed
     if (eeconfig_read_default_layer() > 1) {
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
index da7593d39c..0a9c2aa4f9 100644
--- a/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
+++ b/keyboards/lfkeyboards/lfk78/keymaps/split_bs_osx/keymap.c
@@ -73,23 +73,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------'  `--------------------------------------------------------'  `--------------'
      */
     [SETTINGS] = LAYOUT_split_bs(
-        XXXXXXX, XXXXXXX, F(0),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  XXXXXXX, XXXXXXX,          RGB_TOG, RGB_VAI,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  XXXXXXX, XXXXXXX,          RGB_TOG, RGB_VAI,
         XXXXXXX, XXXXXXX, MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_TOGG,                   RGB_MOD, RGB_VAD,
-        XXXXXXX, XXXXXXX, AU_TOG,  F(1),    F(3),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,
-        XXXXXXX, XXXXXXX, F(5),    F(2),    F(4),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,                   RGB_HUI,
+        XXXXXXX, XXXXXXX, AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,                   RGB_HUI,
         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,                   RGB_SAD, RGB_HUD, RGB_SAI
     )
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-    ACTION_FUNCTION(LFK_CLEAR),              // FN0 - reset layers
-    ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER),  // FN1 - Increase Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER),   // FN2 - Decrease Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_LONGER),  // FN3 - Increase length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER), // FN4 - Decrease length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TOGGLE)        // FN5 - Toggle audio click
-};
-
 void matrix_init_user(void) {
     // This keymap only has a single base layer, so reset the default if needed
     if (eeconfig_read_default_layer() > 1) {
diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c
index 5b283f979d..2f8f1b34ef 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.c
+++ b/keyboards/lfkeyboards/lfk78/lfk78.c
@@ -134,73 +134,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
     return process_record_user(keycode, record);
 }
 
-void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) {
-#ifdef AUDIO_ENABLE
-    int8_t sign = 1;
-#endif
-
-    if (id == LFK_ESC_TILDE) {
-        // Send ~ on shift-esc
-        void (*method)(uint8_t) = (event->event.pressed) ? &add_key : &del_key;
-        uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT));
-
-        if (layer_state == 0) {
-            method(shifted ? KC_GRAVE : KC_ESCAPE);
-        } else {
-            method(shifted ? KC_ESCAPE : KC_GRAVE);
-        }
-
-        send_keyboard_report();
-    } else if (event->event.pressed) {
-        switch (id) {
-            case LFK_SET_DEFAULT_LAYER:
-                // set/save the current base layer to eeprom, falls through to LFK_CLEAR
-                eeconfig_update_default_layer(1UL << opt);
-                default_layer_set(1UL << opt);
-            case LFK_CLEAR:
-                // Go back to default layer
-                layer_clear();
-                break;
-#ifdef ISSI_ENABLE
-            case LFK_LED_TEST:
-                led_test();
-                break;
-#endif
-#ifdef AUDIO_ENABLE
-            case LFK_CLICK_FREQ_LOWER:
-                sign = -1; // continue to next statement
-            case LFK_CLICK_FREQ_HIGHER:
-                click_hz += sign * 100;
-                click(click_hz, click_time);
-                break;
-            case LFK_CLICK_TOGGLE:
-                if (click_toggle) {
-                    click_toggle = 0;
-                    click(4000, 100);
-                    click(1000, 100);
-                } else {
-                    click_toggle = 1;
-                    click(1000, 100);
-                    click(4000, 100);
-                }
-                break;
-            case LFK_CLICK_TIME_SHORTER:
-                sign = -1; // continue to next statement
-            case LFK_CLICK_TIME_LONGER:
-                click_time += sign;
-                click(click_hz, click_time);
-                break;
-#endif
-            case LFK_DEBUG_SETTINGS:
-                dprintf("Click:\n");
-                dprintf("  toggle: %d\n", click_toggle);
-                dprintf("  freq(hz): %d\n", click_hz);
-                dprintf("  duration(ms): %d\n", click_time);
-                break;
-        }
-    }
-}
-
 void reset_keyboard_kb() {
 #ifdef WATCHDOG_ENABLE
     MCUSR = 0;
diff --git a/keyboards/lfkeyboards/lfk78/lfk78.h b/keyboards/lfkeyboards/lfk78/lfk78.h
index 711baddece..ffa4894bbc 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.h
+++ b/keyboards/lfkeyboards/lfk78/lfk78.h
@@ -25,19 +25,6 @@ typedef struct Layer_Info {
 extern const uint32_t layer_count;
 extern const Layer_Info layer_info[];
 
-enum action_functions {
-    LFK_CLEAR = 0,          // Resets all layers
-    LFK_ESC_TILDE,          // esc+lshift = ~
-    LFK_SET_DEFAULT_LAYER,  // changes and saves current base layer to eeprom
-    LFK_CLICK_TOGGLE,       // Adjusts click duration
-    LFK_CLICK_FREQ_HIGHER,  // Adjusts click frequency
-    LFK_CLICK_FREQ_LOWER,   // Adjusts click frequency
-    LFK_CLICK_TIME_LONGER,  // Adjusts click duration
-    LFK_CLICK_TIME_SHORTER, // Adjusts click duration
-    LFK_DEBUG_SETTINGS,     // prints LED and click settings to HID
-    LFK_LED_TEST            // cycles through switch and RGB LEDs
-};
-
 #define CLICK_HZ 500
 #define CLICK_MS 2
 #define CLICK_ENABLED 0
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
index c6799ea532..b62ea93440 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/ca178858/keymap.c
@@ -13,156 +13,153 @@ enum {
     TD_ESC_FUNC = 0,
 };
 
-
 // Colors of the layer indicator LED
 // This list needs to define layer 0xFFFFFFFF, it is the end of the list, and the unknown layer
 const Layer_Info layer_info[] = {
-  // Layer     Mask           Red     Green   Blue
-  {0x00000000, 0xFFFFFFF8, {0x00, 0xFF, 0x00}}, // base layers (VANILLA, DEFAULT_WKL, DEFAULT_OSX) - green
-  {0x00000008, 0xFFFFFFF8, {0x07FF, 0x07FF, 0x0000}}, // CSGO layer - orange
-  {0x00000010, 0xFFFFFFF0, {0x0000, 0x0000, 0x0FFF}}, // function layer - blue
-  {0x00000020, 0xFFFFFFE0, {0x0FFF, 0x0000, 0x0FFF}}, // settings layer - magenta
-  {0xFFFFFFFF, 0xFFFFFFFF, {0x0FFF, 0x0FFF, 0x0FFF}}, // unknown layer - REQUIRED - white
+    // Layer     Mask           Red     Green   Blue
+    {0x00000000, 0xFFFFFFF8, {0x00, 0xFF, 0x00}}, // base layers (VANILLA, DEFAULT_WKL, DEFAULT_OSX) - green
+    {0x00000008, 0xFFFFFFF8, {0x07FF, 0x07FF, 0x0000}}, // CSGO layer - orange
+    {0x00000010, 0xFFFFFFF0, {0x0000, 0x0000, 0x0FFF}}, // function layer - blue
+    {0x00000020, 0xFFFFFFE0, {0x0FFF, 0x0000, 0x0FFF}}, // settings layer - magenta
+    {0xFFFFFFFF, 0xFFFFFFFF, {0x0FFF, 0x0FFF, 0x0FFF}}, // unknown layer - REQUIRED - white
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap VANILLA: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------------------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-   * |-----------------------------------------------------------|  |--------------|
-   * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-   * |-----------------------------------------------------------|  |--------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-   * |-----------------------------------------------------------|  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|        ,----.
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |Ctrl|Gui |Alt |      Space            |ALT |GUI |CTRL |Func|   |Lft| Dn |Rig |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [VANILLA] = LAYOUT_tkl_ansi(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_0,    KC_1,     KC_2,              KC_3,    KC_4,    KC_5,    \
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,           KC_INS,  KC_HOME, KC_PGUP, \
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,           KC_DEL,  KC_END,  KC_PGDN, \
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_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_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC), MO(SETTINGS),      KC_LEFT, KC_DOWN, KC_RGHT  \
-  ),
+    /* Keymap VANILLA: (Base Layer) Default Layer
+     * ,-----------------------------------------------------------------------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
+     * |-----------------------------------------------------------|  |--------------|
+     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
+     * |-----------------------------------------------------------|  |--------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
+     * |-----------------------------------------------------------|  `--------------'
+     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+     * |-----------------------------------------------------------|        ,----.
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
+     * |-----------------------------------------------------------|   ,-------------.
+     * |Ctrl|Gui |Alt |      Space            |ALT |GUI |CTRL |Func|   |Lft| Dn |Rig |
+     * `-----------------------------------------------------------'   `-------------'
+     */
+    [VANILLA] = LAYOUT_tkl_ansi(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_0,    KC_1,     KC_2,              KC_3,    KC_4,    KC_5,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,           KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,           KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_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_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC), MO(SETTINGS),      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  /* Keymap DEFAULT_TKL: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------------------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-   * |-----------------------------------------------------------|  |--------------|
-   * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-   * |-----------------------------------------------------------|  |--------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-   * |-----------------------------------------------------------|  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|       ,----.
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |       | Up |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |Ctrl|    |Alt |      Space            |ALT |    |CTRL |Func|   |Lft| Dn |Rig |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [DEFAULT_WKL] = LAYOUT_tkl_ansi(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS, \
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_INS,  KC_HOME, KC_PGUP, \
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,       KC_DEL,  KC_END,  KC_PGDN, \
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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, KC_RGUI, KC_RCTL, MO(FUNC),      KC_LEFT, KC_DOWN, KC_RGHT  \
-  ),
+    /* Keymap DEFAULT_TKL: (Base Layer) Default Layer
+     * ,-----------------------------------------------------------------------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
+     * |-----------------------------------------------------------|  |--------------|
+     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
+     * |-----------------------------------------------------------|  |--------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
+     * |-----------------------------------------------------------|  `--------------'
+     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+     * |-----------------------------------------------------------|       ,----.
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |       | Up |
+     * |-----------------------------------------------------------|   ,-------------.
+     * |Ctrl|    |Alt |      Space            |ALT |    |CTRL |Func|   |Lft| Dn |Rig |
+     * `-----------------------------------------------------------'   `-------------'
+     */
+    [DEFAULT_WKL] = LAYOUT_tkl_ansi(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,        KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,       KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,       KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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, KC_RGUI, KC_RCTL, MO(FUNC),      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  /* Keymap DEFAULT_OSX: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------------------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-   * |-----------------------------------------------------------|  |--------------|
-   * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-   * |-----------------------------------------------------------|  |--------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-   * |-----------------------------------------------------------|  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|        ,----.
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |Ctrl| Opt |Cmd |      Space           |Cmd |Opt |CTRL |Func|   |Lft| Dn |Rig |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [DEFAULT_OSX] = LAYOUT_tkl_ansi(
-    KC_ESC,                   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,             KC_SLCK, KC_PAUS, LALT(KC_F5), \
-    KC_GRV,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,     \
-    KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,     \
-    TD(TD_ESC_FUNC), 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_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC), MO(SETTINGS),       KC_LEFT, KC_DOWN, KC_RGHT      \
-  ),
+    /* Keymap DEFAULT_OSX: (Base Layer) Default Layer
+     * ,-----------------------------------------------------------------------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
+     * |-----------------------------------------------------------|  |--------------|
+     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
+     * |-----------------------------------------------------------|  |--------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
+     * |-----------------------------------------------------------|  `--------------'
+     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+     * |-----------------------------------------------------------|        ,----.
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
+     * |-----------------------------------------------------------|   ,-------------.
+     * |Ctrl| Opt |Cmd |      Space           |Cmd |Opt |CTRL |Func|   |Lft| Dn |Rig |
+     * `-----------------------------------------------------------'   `-------------'
+     */
+    [DEFAULT_OSX] = LAYOUT_tkl_ansi(
+        KC_ESC,                   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,             KC_SLCK, KC_PAUS, LALT(KC_F5),
+        KC_GRV,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
+        TD(TD_ESC_FUNC), 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_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC), MO(SETTINGS),       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  [CS_GO] = LAYOUT_tkl_ansi(
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      F(0),    _______, _______, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, \
-    KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                 \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,               _______,          \
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______,      _______, _______, _______  \
-  ),
+    [CS_GO] = LAYOUT_tkl_ansi(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
+        KC_LCTL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,               _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,      _______, _______, _______
+    ),
 
-  /* Keymap FUNCTION: Function Layer
-   * ,-------------------------------------------------------------.  ,--------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-   * |-------------------------------------------------------------|  |--------------|
-   * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
-   * |-------------------------------------------------------------|  |--------------|
-   * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
-   * |-------------------------------------------------------------|  `--------------'
-   * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-   * |-------------------------------------------------------------|       ,----.
-   * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
-   * |-------------------------------------------------------------'   ,-------------.
-   * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
-   * `------------------------------------------------------'          `-------------'
-   */
-  [FUNC] = LAYOUT_tkl_ansi(
-    KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR,   KC_SLCK, KC_PAUS, \
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            TO(CS_GO), _______, _______, \
-    XXXXXXX, KC_PGUP, KC_UP,   KC_PGDN, KC_HOME, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           _______,   _______, _______, \
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,                                        \
-    _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),                 _______,          \
-    _______, _______, _______,                            KC_PGDN,                            _______, _______, _______, _______,             _______, _______, _______  \
-  ),
+    /* Keymap FUNCTION: Function Layer
+     * ,-------------------------------------------------------------.  ,--------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
+     * |-------------------------------------------------------------|  |--------------|
+     * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
+     * |-------------------------------------------------------------|  |--------------|
+     * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
+     * |-------------------------------------------------------------|  `--------------'
+     * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
+     * |-------------------------------------------------------------|       ,----.
+     * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
+     * |-------------------------------------------------------------'   ,-------------.
+     * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
+     * `------------------------------------------------------'          `-------------'
+     */
+    [FUNC] = LAYOUT_tkl_ansi(
+        KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR,   KC_SLCK, KC_PAUS,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            TO(CS_GO), _______, _______,
+        XXXXXXX, KC_PGUP, KC_UP,   KC_PGDN, KC_HOME, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           _______,   _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
+        _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),                 _______,
+        _______, _______, _______,                            KC_PGDN,                            _______, _______, _______, _______,             _______, _______, _______
+    ),
 
-  /* Keymap SETTINGS: Settings Layer
-   * ,-----------------------------------------------------------.     ,-------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-   * |-------------------------------------------------------------|  |--------------|
-   * |LayClr|   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
-   * |-----------------------------------------------------------|    |-------------|
-   * |Debug|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
-   * |-----------------------------------------------------------|    `-------------'
-   * |AU_TOG |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-   * |-----------------------------------------------------------|  ,----.
-   * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |  |Hue+|
-   * |------------------------------------------------------------------------.
-   * |    |    |    |      Print Debug      |    |    |     |  |Sat-|Hue-|Sat+|
-   * `------------------------------------------------------'  `--------------'
-   */
-  [SETTINGS] = LAYOUT_tkl_ansi(
-    F(13),            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX, \
-    F(0),    F(3),    F(4),    F(5),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX, \
-    MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(2),         RGB_MOD, RGB_VAD, XXXXXXX, \
-    AU_TOG,  F(6),    F(8),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,                                   \
-    F(10),   F(7),    F(9),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   F(0),                  RGB_HUI,          \
-    XXXXXXX, XXXXXXX, XXXXXXX,                            F(12),                              XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI  \
-  ),
+    /* Keymap SETTINGS: Settings Layer
+     * ,-----------------------------------------------------------.     ,-------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
+     * |-------------------------------------------------------------|  |--------------|
+     * |LayClr|   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
+     * |-----------------------------------------------------------|    |-------------|
+     * |Debug|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
+     * |-----------------------------------------------------------|    `-------------'
+     * |AU_TOG |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
+     * |-----------------------------------------------------------|  ,----.
+     * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |  |Hue+|
+     * |------------------------------------------------------------------------.
+     * |    |    |    |      Print Debug      |    |    |     |  |Sat-|Hue-|Sat+|
+     * `------------------------------------------------------'  `--------------'
+     */
+    [SETTINGS] = LAYOUT_tkl_ansi(
+        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
+        MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
+        AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
+        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI
+    )
 };
 
 void tap_esc_func_finished(qk_tap_dance_state_t *state, void *user_data) {
-    if(state->pressed){
+    if (state->pressed) {
         layer_on(FUNC);
-    }else{
-        register_code(KC_ESC);
-        unregister_code(KC_ESC);
+    } else {
+        tap_code(KC_ESC);
     }
 }
 
@@ -171,32 +168,14 @@ void tap_esc_func_reset(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESC_FUNC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_esc_func_finished, tap_esc_func_reset),
+    [TD_ESC_FUNC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_esc_func_finished, tap_esc_func_reset),
 };
 
-
-const uint16_t PROGMEM fn_actions[] = {
-    ACTION_FUNCTION(LFK_CLEAR),                               // FN0 - reset layers
-    ACTION_FUNCTION(LFK_ESC_TILDE),                           // FN1 - esc+shift = ~, else escape
-    ACTION_FUNCTION(LFK_LED_TEST),                            // FN2 - cycle through LEDs for testing
-    ACTION_FUNCTION_OPT(LFK_SET_DEFAULT_LAYER, VANILLA),      // FN3 - set base layer to 0 and save
-    ACTION_FUNCTION_OPT(LFK_SET_DEFAULT_LAYER, DEFAULT_WKL),  // FN4 - set base layer to 1 and save
-    ACTION_FUNCTION_OPT(LFK_SET_DEFAULT_LAYER, DEFAULT_OSX),  // FN5 - set base layer to 2 and save
-    ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER),                   // FN6 - Increase Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER),                    // FN7 - Decrease Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_LONGER),                   // FN8 - Increase length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER),                  // FN9 - Decrease length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TOGGLE),                        // FN10 - Toggle audio click
-    ACTION_FUNCTION(LFK_LED_TEST),                            // FN11 - cycle through LEDs for testing
-    ACTION_FUNCTION(LFK_DEBUG_SETTINGS),                      // FN12 - prints LED and click settings to HID
-    ACTION_FUNCTION(LFK_PLAY_ONEUP),
-  };
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if((layer_state & (1 << CS_GO)) && (keycode == 44)){
-    if(get_mods() & (MOD_BIT(KC_LGUI))){
-      return false;
+    if ((layer_state & (1 << CS_GO)) && (keycode == 44)) {
+        if (get_mods() & (MOD_BIT(KC_LGUI))) {
+            return false;
+        }
     }
-  }
-  return true;
+    return true;
 }
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
index 3ee5399cd3..789a6f9737 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/default/keymap.c
@@ -16,93 +16,83 @@ const Layer_Info layer_info[] = {
     {0xFFFFFFFF, 0xFFFFFFFF, {0xFF, 0xFF, 0xFF}}, // unknown layer - REQUIRED - white
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap VANILLA: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------------------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-   * |-----------------------------------------------------------|  |--------------|
-   * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-   * |-----------------------------------------------------------|  |--------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-   * |-----------------------------------------------------------|  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|        ,----.
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |Ctrl|Gui |Alt |      Space            |ALT |GUI |Func|CTRL |   |Lft| Dn |Rig |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [VANILLA] = LAYOUT_tkl_ansi(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_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, KC_RGUI, MO(FUNC), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-  ),
+    /* Keymap VANILLA: (Base Layer) Default Layer
+     * ,-----------------------------------------------------------------------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
+     * |-----------------------------------------------------------|  |--------------|
+     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
+     * |-----------------------------------------------------------|  |--------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
+     * |-----------------------------------------------------------|  `--------------'
+     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+     * |-----------------------------------------------------------|        ,----.
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
+     * |-----------------------------------------------------------|   ,-------------.
+     * |Ctrl|Gui |Alt |      Space            |ALT |GUI |Func|CTRL |   |Lft| Dn |Rig |
+     * `-----------------------------------------------------------'   `-------------'
+     */
+    [VANILLA] = LAYOUT_tkl_ansi(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,       KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_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, KC_RGUI, MO(FUNC), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  /* Keymap FUNCTION: Function Layer
-   * ,-------------------------------------------------------------.  ,--------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-   * |-------------------------------------------------------------|  |--------------|
-   * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
-   * |-------------------------------------------------------------|  |--------------|
-   * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
-   * |-------------------------------------------------------------|  `--------------'
-   * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-   * |-------------------------------------------------------------|       ,----.
-   * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
-   * |-------------------------------------------------------------'   ,-------------.
-   * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
-   * `------------------------------------------------------'          `-------------'
-   */
-  [FUNC] = LAYOUT_tkl_ansi(
-    KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR, KC_SLCK, KC_PAUS,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            _______, _______, _______,
-    XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           _______, _______, _______,
-    _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
-    _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),               _______,
-    _______, _______, _______,                            KC_PGDN,                            _______, _______, _______, _______,           _______, _______, _______
-  ),
+    /* Keymap FUNCTION: Function Layer
+     * ,-------------------------------------------------------------.  ,--------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
+     * |-------------------------------------------------------------|  |--------------|
+     * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
+     * |-------------------------------------------------------------|  |--------------|
+     * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
+     * |-------------------------------------------------------------|  `--------------'
+     * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
+     * |-------------------------------------------------------------|       ,----.
+     * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
+     * |-------------------------------------------------------------'   ,-------------.
+     * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
+     * `------------------------------------------------------'          `-------------'
+     */
+    [FUNC] = LAYOUT_tkl_ansi(
+        KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR, KC_SLCK, KC_PAUS,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            _______, _______, _______,
+        XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           _______, _______, _______,
+        _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
+        _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),               _______,
+        _______, _______, _______,                            KC_PGDN,                            _______, _______, _______, _______,           _______, _______, _______
+    ),
 
-  /* Keymap SETTINGS: Settings Layer
-   * ,------------------------------------------------------------.  ,-------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12 |  |Prnt|ScLk|Paus|
-   * |------------------------------------------------------------|  |--------------|
-   * |FN0 |   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl |  |RGB Tog |Val+|
-   * |------------------------------------------------------------|  |-------------|
-   * |MuMode|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|  |RGB Mode|Val-|
-   * |------------------------------------------------------------|  `-------------'
-   * |AudTgl |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST   |
-   * |------------------------------------------------------------|       ,----.
-   * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr  |       |Hue+|
-   * |------------------------------------------------------------------------------.
-   * |    |    |    |                        |    |    |    |     |  |Sat-|Hue-|Sat+|
-   * `------------------------------------------------------------------------------'
-   */
-  [SETTINGS] = LAYOUT_tkl_ansi(
-    F(0),             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
-    F(0),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
-    MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(2),         RGB_MOD, RGB_VAD, XXXXXXX,
-    AU_TOG,  F(1),    F(3),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,
-    F(5),    F(2),    F(4),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
-    XXXXXXX, XXXXXXX, XXXXXXX,                            F(12),                              XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI
-  ),
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-    ACTION_FUNCTION(LFK_CLEAR),                               // FN0 - reset layers
-    ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER),                   // FN1 - Increase Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER),                    // FN2 - Decrease Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_LONGER),                   // FN3 - Increase length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER),                  // FN4 - Decrease length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TOGGLE),                        // FN5 - Toggle audio click
+    /* Keymap SETTINGS: Settings Layer
+     * ,------------------------------------------------------------.  ,-------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12 |  |Prnt|ScLk|Paus|
+     * |------------------------------------------------------------|  |--------------|
+     * |FN0 |   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl |  |RGB Tog |Val+|
+     * |------------------------------------------------------------|  |-------------|
+     * |MuMode|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|  |RGB Mode|Val-|
+     * |------------------------------------------------------------|  `-------------'
+     * |AudTgl |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST   |
+     * |------------------------------------------------------------|       ,----.
+     * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr  |       |Hue+|
+     * |------------------------------------------------------------------------------.
+     * |    |    |    |                        |    |    |    |     |  |Sat-|Hue-|Sat+|
+     * `------------------------------------------------------------------------------'
+     */
+    [SETTINGS] = LAYOUT_tkl_ansi(
+        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
+        MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
+        AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
+        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI
+    )
 };
 
 void matrix_init_user(void) {
     // This keymap only has a single base layer, so reset the default if needed
-    if(eeconfig_read_default_layer() > 1){
+    if (eeconfig_read_default_layer() > 1) {
         eeconfig_update_default_layer(1);
         default_layer_set(1);
     }
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
index 4dfb098538..c946856dbe 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/gbchk/keymap.c
@@ -16,93 +16,83 @@ const Layer_Info layer_info[] = {
     {0xFFFFFFFF, 0xFFFFFFFF, {0xFF, 0xFF, 0xFF}}, // unknown layer - REQUIRED - white
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap VANILLA: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------------------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-   * |-----------------------------------------------------------|  |--------------|
-   * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-   * |-----------------------------------------------------------|  |--------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-   * |-----------------------------------------------------------|  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|        ,----.
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |Ctrl|Gui |Alt |      Space            |ALT |GUI |Func|CTRL |   |Lft| Dn |Rig |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [VANILLA] = LAYOUT_tkl_ansi(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   LGUI(KC_D), KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,      KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,       KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,       KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,       KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_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, KC_RGUI, MO(FUNC), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-  ),
+    /* Keymap VANILLA: (Base Layer) Default Layer
+     * ,-----------------------------------------------------------------------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
+     * |-----------------------------------------------------------|  |--------------|
+     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
+     * |-----------------------------------------------------------|  |--------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
+     * |-----------------------------------------------------------|  `--------------'
+     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+     * |-----------------------------------------------------------|        ,----.
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
+     * |-----------------------------------------------------------|   ,-------------.
+     * |Ctrl|Gui |Alt |      Space            |ALT |GUI |Func|CTRL |   |Lft| Dn |Rig |
+     * `-----------------------------------------------------------'   `-------------'
+     */
+    [VANILLA] = LAYOUT_tkl_ansi(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   LGUI(KC_D), KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,      KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,       KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,       KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,  KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,       KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_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, KC_RGUI, MO(FUNC), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  /* Keymap FUNCTION: Function Layer
-   * ,-------------------------------------------------------------.  ,--------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-   * |-------------------------------------------------------------|  |--------------|
-   * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
-   * |-------------------------------------------------------------|  |--------------|
-   * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
-   * |-------------------------------------------------------------|  `--------------'
-   * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-   * |-------------------------------------------------------------|       ,----.
-   * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
-   * |-------------------------------------------------------------'   ,-------------.
-   * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
-   * `------------------------------------------------------'          `-------------'
-   */
-  [FUNC] = LAYOUT_tkl_ansi(
-    KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR, KC_SLCK, KC_PAUS,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            _______, _______, _______,
-    XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           _______, _______, _______,
-    _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
-    _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),               _______,
-    _______, _______, _______,                            KC_PGDN,                            _______, _______, _______, _______,           _______, _______, _______
-  ),
+    /* Keymap FUNCTION: Function Layer
+     * ,-------------------------------------------------------------.  ,--------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
+     * |-------------------------------------------------------------|  |--------------|
+     * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
+     * |-------------------------------------------------------------|  |--------------|
+     * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
+     * |-------------------------------------------------------------|  `--------------'
+     * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
+     * |-------------------------------------------------------------|       ,----.
+     * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
+     * |-------------------------------------------------------------'   ,-------------.
+     * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
+     * `------------------------------------------------------'          `-------------'
+     */
+    [FUNC] = LAYOUT_tkl_ansi(
+        KC_ESC,           _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR, KC_SLCK, KC_PAUS,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            _______, _______, _______,
+        XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,           _______, _______, _______,
+        _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,
+        _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),               _______,
+        _______, _______, _______,                            KC_PGDN,                            _______, _______, _______, _______,           _______, _______, _______
+    ),
 
-  /* Keymap SETTINGS: Settings Layer
-   * ,-----------------------------------------------------------.     ,-------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-   * |-------------------------------------------------------------|  |--------------|
-   * |FN0 |   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
-   * |-----------------------------------------------------------|    |-------------|
-   * |MuMode|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
-   * |-----------------------------------------------------------|    `-------------'
-   * |AudTgl |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-   * |-----------------------------------------------------------|      ,----.
-   * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |      |Hue+|
-   * |--------------------------------------------------------------------------.
-   * |    |    |    |                       |    |    |    |     | |Sat-|Hue-|Sat+|
-   * `----------------------------------------------------------------------------'
-   */
-  [SETTINGS] = LAYOUT_tkl_ansi(
-    F(0),             XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
-    F(0),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
-    MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(2),         RGB_MOD, RGB_VAD, XXXXXXX,
-    AU_TOG,  KC_F1,   F(3),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,
-    F(5),    F(2),    F(4),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
-    XXXXXXX, XXXXXXX, XXXXXXX,                            F(12),                              XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI
-  ),
+    /* Keymap SETTINGS: Settings Layer
+     * ,-----------------------------------------------------------.     ,-------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
+     * |-------------------------------------------------------------|  |--------------|
+     * |FN0 |   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
+     * |-----------------------------------------------------------|    |-------------|
+     * |MuMode|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
+     * |-----------------------------------------------------------|    `-------------'
+     * |AudTgl |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
+     * |-----------------------------------------------------------|      ,----.
+     * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |      |Hue+|
+     * |--------------------------------------------------------------------------.
+     * |    |    |    |                       |    |    |    |     | |Sat-|Hue-|Sat+|
+     * `----------------------------------------------------------------------------'
+     */
+    [SETTINGS] = LAYOUT_tkl_ansi(
+        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
+        MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD, RGB_VAD, XXXXXXX,
+        AU_TOG,  KC_F1,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,               RGB_HUI,
+        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, _______,      RGB_SAD, RGB_HUD, RGB_SAI
+    )
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-    ACTION_FUNCTION(LFK_CLEAR),                               // FN0 - reset layers
-    ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER),                   // FN1 - Increase Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER),                    // FN2 - Decrease Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_LONGER),                   // FN3 - Increase length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER),                  // FN4 - Decrease length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TOGGLE),                        // FN5 - Toggle audio click
-  };
-
 void matrix_init_user(void) {
     // This keymap only has a single base layer, so reset the default if needed
-    if(eeconfig_read_default_layer() > 1){
+    if (eeconfig_read_default_layer() > 1) {
         eeconfig_update_default_layer(1);
         default_layer_set(1);
     }
diff --git a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
index 428277c33f..b36de66c6a 100644
--- a/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/lfk87/keymaps/iso/keymap.c
@@ -9,100 +9,90 @@ enum keymap_layout {
 // Colors of the layer indicator LED
 // This list needs to define layer 0xFFFFFFFF, it is the end of the list, and the unknown layer
 const Layer_Info layer_info[] = {
-  // Layer     Mask         Red   Green Blue
-  {0x00000000, 0xFFFFFFFF, {0x00, 0x00, 0x00}}, // base layer - off
-  {0x00000002, 0xFFFFFFFE, {0x00, 0x00, 0x7F}}, // function layer - blue
-  {0x00000004, 0xFFFFFFFC, {0x7F, 0x00, 0x00}}, // settings layer - red
-  {0xFFFFFFFF, 0xFFFFFFFF, {0x0F, 0x0F, 0x0F}}, // unknown layer - REQUIRED - white
+    // Layer     Mask         Red   Green Blue
+    {0x00000000, 0xFFFFFFFF, {0x00, 0x00, 0x00}}, // base layer - off
+    {0x00000002, 0xFFFFFFFE, {0x00, 0x00, 0x7F}}, // function layer - blue
+    {0x00000004, 0xFFFFFFFC, {0x7F, 0x00, 0x00}}, // settings layer - red
+    {0xFFFFFFFF, 0xFFFFFFFF, {0x0F, 0x0F, 0x0F}}, // unknown layer - REQUIRED - white
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap VANILLA: (Base Layer) Default Layer
-  * ,-----------------------------------------------------------------------------.
-  * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-  * |-----------------------------------------------------------|  |--------------|
-  * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-  * |-----------------------------------------------------------|  |--------------|
-  * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  Ret|  | Del| End|PgDn|
-  * |--------------------------------------------------------.  |  `--------------'
-  * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  # |  |
-  * |-----------------------------------------------------------|        ,----.
-  * |Shft| \ |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-  * |-----------------------------------------------------------|   ,-------------.
-  * |Ctrl|Gui |Alt |      Space            |ALT |GUI | Func|CTRL|   |Lft| Dn |Rig |
-  * `-----------------------------------------------------------'   `-------------'
-  */
-  [VANILLA] = LAYOUT_tkl_iso(
-    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,       KC_PSCR, KC_LSCR, KC_PAUS,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                KC_DEL,  KC_END,  KC_PGDN,
-    KC_LCAP, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,  KC_ENT,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,           KC_RSFT,               KC_UP,
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(FUNC), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
-  ),
+    /* Keymap VANILLA: (Base Layer) Default Layer
+     * ,-----------------------------------------------------------------------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
+     * |-----------------------------------------------------------|  |--------------|
+     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
+     * |-----------------------------------------------------------|  |--------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  Ret|  | Del| End|PgDn|
+     * |--------------------------------------------------------.  |  `--------------'
+     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  # |  |
+     * |-----------------------------------------------------------|        ,----.
+     * |Shft| \ |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
+     * |-----------------------------------------------------------|   ,-------------.
+     * |Ctrl|Gui |Alt |      Space            |ALT |GUI | Func|CTRL|   |Lft| Dn |Rig |
+     * `-----------------------------------------------------------'   `-------------'
+     */
+    [VANILLA] = LAYOUT_tkl_iso(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,       KC_PSCR, KC_LSCR, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,                KC_DEL,  KC_END,  KC_PGDN,
+        KC_LCAP, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,  KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,           KC_RSFT,               KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(FUNC), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  /* Keymap FUNCTION: Function Layer
-   * ,-------------------------------------------------------------.  ,--------------.
-   * |     |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-   * |-------------------------------------------------------------|  |--------------|
-   * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
-   * |-------------------------------------------------------------|  |--------------|
-   * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |   |   |  |    |    |    |
-   * |---------------------------------------------------------.   |  `--------------'
-   * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |     |   |
-   * |-------------------------------------------------------------|       ,----.
-   * |Shift|  |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
-   * |-------------------------------------------------------------'   ,-------------.
-   * |Func|Win |Alt |         PgD             |ALT |GUI | Func|CTRL|   |Lft| Dn |Rig |
-   * `-------------------------------------------------------------'   `-------------'
-   */
-  [FUNC] = LAYOUT_tkl_iso(
-    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR, KC_SLCK, KC_PAUS,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            _______, _______, _______,
-    XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                    _______, _______, _______,
-    _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    _______, XXXXXXX, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,          TG(SETTINGS),               _______,
-    _______, _______, _______,                            KC_PGDN,                            _______, _______, _______, _______,           _______, _______, _______
-   ),
+    /* Keymap FUNCTION: Function Layer
+     * ,-------------------------------------------------------------.  ,--------------.
+     * |     |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
+     * |-------------------------------------------------------------|  |--------------|
+     * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
+     * |-------------------------------------------------------------|  |--------------|
+     * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |   |   |  |    |    |    |
+     * |---------------------------------------------------------.   |  `--------------'
+     * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |     |   |
+     * |-------------------------------------------------------------|       ,----.
+     * |Shift|  |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
+     * |-------------------------------------------------------------'   ,-------------.
+     * |Func|Win |Alt |         PgD             |ALT |GUI | Func|CTRL|   |Lft| Dn |Rig |
+     * `-------------------------------------------------------------'   `-------------'
+     */
+    [FUNC] = LAYOUT_tkl_iso(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_PSCR, KC_SLCK, KC_PAUS,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,            _______, _______, _______,
+        XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                    _______, _______, _______,
+        _______, KC_HOME, KC_PGDN, KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        _______, XXXXXXX, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,          TG(SETTINGS),               _______,
+        _______, _______, _______,                            KC_PGDN,                            _______, _______, _______, _______,           _______, _______, _______
+    ),
 
-   /* Keymap SETTINGS: Settings Layer
-    * ,-----------------------------------------------------------.     ,-------------.
-    * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-    * |-------------------------------------------------------------|  |--------------|
-    * |FN3 |BL0|BL1|BL2|BL3|   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
-    * |-----------------------------------------------------------|    |-------------|
-    * |Debug|   |   |   |   |   |   |   |   |   |   |   |   | RST |    |RGB Mode|Val-|
-    * |--------------------------------------------------------.  |    `-------------'
-    * |LayrClr|Hz+|MS+|   |   |   |   |   |   |   |   |   |    |  |
-    * |-----------------------------------------------------------|  ,----.
-    * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |  |Hue+|
-    * |------------------------------------------------------------------------.
-    * |    |    |    |                             |    |    |  |  |Sat-|Hue-|Sat+|
-    * `------------------------------------------------------'  `--------------'
-    */
-  [SETTINGS] = LAYOUT_tkl_iso(
-    XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
-    F(0),    F(3),    F(4),    F(5),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
-    MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_MOD, RGB_VAD, XXXXXXX,
-    AU_TOG,  F(3),    F(5),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,
-    F(7),    XXXXXXX, F(4),    F(6),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,          F(0),                  RGB_HUI,
-    XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, F(0),         RGB_SAD, RGB_HUD, RGB_SAI
-  ),
+    /* Keymap SETTINGS: Settings Layer
+     * ,-----------------------------------------------------------.     ,-------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
+     * |-------------------------------------------------------------|  |--------------|
+     * |FN3 |BL0|BL1|BL2|BL3|   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
+     * |-----------------------------------------------------------|    |-------------|
+     * |Debug|   |   |   |   |   |   |   |   |   |   |   |   | RST |    |RGB Mode|Val-|
+     * |--------------------------------------------------------.  |    `-------------'
+     * |LayrClr|Hz+|MS+|   |   |   |   |   |   |   |   |   |    |  |
+     * |-----------------------------------------------------------|  ,----.
+     * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |  |Hue+|
+     * |------------------------------------------------------------------------.
+     * |    |    |    |                             |    |    |  |  |Sat-|Hue-|Sat+|
+     * `------------------------------------------------------'  `--------------'
+     */
+    [SETTINGS] = LAYOUT_tkl_iso(
+        XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,       XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,      RGB_TOG, RGB_VAI, XXXXXXX,
+        MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,               RGB_MOD, RGB_VAD, XXXXXXX,
+        AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,               RGB_HUI,
+        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_SAD, RGB_HUD, RGB_SAI
+    )
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-    [0] = ACTION_FUNCTION(LFK_CLEAR),                               // FN0 - reset layers
-    [3] = ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER),                   // FN3 - Increase Freq of audio click
-    [4] = ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER),                    // FN4 - Decrease Freq of audio click
-    [5] = ACTION_FUNCTION(LFK_CLICK_TIME_LONGER),                   // FN5 - Increase length of audio click
-    [6] = ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER),                  // FN6 - Decrease length of audio click
-    [7] = ACTION_FUNCTION(LFK_CLICK_TOGGLE),                        // FN7 - Toggle audio click
-  };
-
 void matrix_init_user(void) {
     // This keymap only has a single base layer, so reset the default if needed
-    if(eeconfig_read_default_layer() > 1){
+    if (eeconfig_read_default_layer() > 1) {
         eeconfig_update_default_layer(1);
         default_layer_set(1);
     }
diff --git a/keyboards/lfkeyboards/lfk87/lfk87.c b/keyboards/lfkeyboards/lfk87/lfk87.c
index 10fc14a8aa..17eeeeffe8 100644
--- a/keyboards/lfkeyboards/lfk87/lfk87.c
+++ b/keyboards/lfkeyboards/lfk87/lfk87.c
@@ -116,61 +116,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
     return process_record_user(keycode, record);
 }
 
-void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
-{
-#ifdef AUDIO_ENABLE
-    int8_t sign = 1;
-#endif
-    if(id == LFK_ESC_TILDE){
-        // Send ~ on shift-esc
-        void (*method)(uint8_t) = (event->event.pressed) ? &add_key : &del_key;
-        uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT));
-        method(shifted ? KC_GRAVE : KC_ESCAPE);
-        send_keyboard_report();
-    }else if(event->event.pressed){
-        switch(id){
-            case LFK_SET_DEFAULT_LAYER:
-                // set/save the current base layer to eeprom, falls through to LFK_CLEAR
-                eeconfig_update_default_layer(1UL << opt);
-                default_layer_set(1UL << opt);
-            case LFK_CLEAR:
-                // Go back to default layer
-                layer_clear();
-                break;
-#ifdef ISSI_ENABLE
-            case LFK_LED_TEST:
-                led_test();
-                break;
-#endif
-#ifdef AUDIO_ENABLE
-            case LFK_CLICK_FREQ_LOWER:
-                sign = -1;  // continue to next statement
-            case LFK_CLICK_FREQ_HIGHER:
-                click_hz += sign * 100;
-                click(click_hz, click_time);
-                break;
-            case LFK_CLICK_TOGGLE:
-                if(click_toggle){
-                    click_toggle = 0;
-                    click(4000, 100);
-                    click(1000, 100);
-                }else{
-                    click_toggle = 1;
-                    click(1000, 100);
-                    click(4000, 100);
-                }
-                break;
-            case LFK_CLICK_TIME_SHORTER:
-                sign = -1;  // continue to next statement
-            case LFK_CLICK_TIME_LONGER:
-                click_time += sign;
-                click(click_hz, click_time);
-                break;
-#endif
-        }
-    }
-}
-
 void reset_keyboard_kb(){
 #ifdef WATCHDOG_ENABLE
     MCUSR = 0;
diff --git a/keyboards/lfkeyboards/lfk87/lfk87.h b/keyboards/lfkeyboards/lfk87/lfk87.h
index 1b1368659b..5bd353a89e 100644
--- a/keyboards/lfkeyboards/lfk87/lfk87.h
+++ b/keyboards/lfkeyboards/lfk87/lfk87.h
@@ -19,20 +19,6 @@ typedef struct Layer_Info {
 extern const uint32_t layer_count;
 extern const Layer_Info layer_info[];
 
-enum action_functions {
-    LFK_CLEAR = 0,          // Resets all layers
-    LFK_ESC_TILDE,          // esc+lshift = ~
-    LFK_SET_DEFAULT_LAYER,  // changes and saves current base layer to eeprom
-    LFK_CLICK_TOGGLE,       // Adjusts click duration
-    LFK_CLICK_FREQ_HIGHER,  // Adjusts click frequency
-    LFK_CLICK_FREQ_LOWER,   // Adjusts click frequency
-    LFK_CLICK_TIME_LONGER,  // Adjusts click duration
-    LFK_CLICK_TIME_SHORTER, // Adjusts click duration
-    LFK_DEBUG_SETTINGS,     // prints LED and click settings to HID
-    LFK_LED_TEST,           // cycles through switch and RGB LEDs
-    LFK_PLAY_ONEUP
-};
-
 #define CLICK_HZ 500
 #define CLICK_MS 2
 #define CLICK_ENABLED 0
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
index 2a16bf4ccf..f5faf7215a 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/keymap.c
@@ -22,84 +22,82 @@ const Layer_Info layer_info[] = {
     {0xFFFFFFFF, 0xFFFFFFFF, {0xFF, 0xFF, 0xFF}}, // unknown layer - REQUIRED - white
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap VANILLA: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------------------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-   * |-----------------------------------------------------------|  |--------------|
-   * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-   * |-----------------------------------------------------------|  |--------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-   * |-----------------------------------------------------------|  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|        ,----.
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |Ctrl|Gui |Alt |      Space            |ALT |GUI |Func|CTRL |   |Lft| Dn |Rig |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [VANILLA] = LAYOUT(
-    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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,     \
-    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_P7,   KC_P8,   KC_P9,   KC_PPLS,     \
-    TD(TD_ESC_FUNC), 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_P4,   KC_P5,   KC_P6,   LALT(KC_F5), \
-    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_P1,   KC_P2,   KC_P3,   KC_PENT,     \
-    KC_LCTL,         KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC),     KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT               \
-  ),
+    /* Keymap VANILLA: (Base Layer) Default Layer
+     * ,-----------------------------------------------------------------------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
+     * |-----------------------------------------------------------|  |--------------|
+     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
+     * |-----------------------------------------------------------|  |--------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
+     * |-----------------------------------------------------------|  `--------------'
+     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+     * |-----------------------------------------------------------|        ,----.
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
+     * |-----------------------------------------------------------|   ,-------------.
+     * |Ctrl|Gui |Alt |      Space            |ALT |GUI |Func|CTRL |   |Lft| Dn |Rig |
+     * `-----------------------------------------------------------'   `-------------'
+     */
+    [VANILLA] = LAYOUT(
+        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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        TD(TD_ESC_FUNC), 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_P4,   KC_P5,   KC_P6,   LALT(KC_F5),
+        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_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL,         KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, KC_RCTL, MO(FUNC),     KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT
+    ),
 
-  /* Keymap FUNCTION: Function Layer
-   * ,-------------------------------------------------------------.  ,--------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-   * |-------------------------------------------------------------|  |--------------|
-   * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
-   * |-------------------------------------------------------------|  |--------------|
-   * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
-   * |-------------------------------------------------------------|  `--------------'
-   * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-   * |-------------------------------------------------------------|       ,----.
-   * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
-   * |-------------------------------------------------------------'   ,-------------.
-   * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
-   * `------------------------------------------------------'          `-------------'
-   */
-  [FUNC] = LAYOUT(
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,                        _______, _______, _______, _______, \
-    XXXXXXX, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       _______, _______, _______, _______, \
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,                       _______, _______, _______, _______, \
-    _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),     _______,     _______, _______, _______, _______, \
-    _______, _______, _______,                            KC_PGDN,                            _______, _______, _______,          _______, _______, _______,     _______, _______           \
-  ),
+    /* Keymap FUNCTION: Function Layer
+     * ,-------------------------------------------------------------.  ,--------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
+     * |-------------------------------------------------------------|  |--------------|
+     * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
+     * |-------------------------------------------------------------|  |--------------|
+     * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
+     * |-------------------------------------------------------------|  `--------------'
+     * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
+     * |-------------------------------------------------------------|       ,----.
+     * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
+     * |-------------------------------------------------------------'   ,-------------.
+     * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
+     * `------------------------------------------------------'          `-------------'
+     */
+    [FUNC] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,                        _______, _______, _______, _______,
+        XXXXXXX, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,                       _______, _______, _______, _______,
+        _______, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),     _______,     _______, _______, _______, _______,
+        _______, _______, _______,                            KC_PGDN,                            _______, _______, _______,          _______, _______, _______,     _______, _______
+    ),
 
-  /* Keymap SETTINGS: Settings Layer
-   * ,-----------------------------------------------------------.     ,-------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-   * |-------------------------------------------------------------|  |--------------|
-   * |FN0 |   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
-   * |-----------------------------------------------------------|    |-------------|
-   * |MuMode|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
-   * |-----------------------------------------------------------|    `-------------'
-   * |AudTgl |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-   * |-----------------------------------------------------------|      ,----.
-   * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |      |Hue+|
-   * |--------------------------------------------------------------------------.
-   * |    |    |    |                       |    |    |    |     | |Sat-|Hue-|Sat+|
-   * `----------------------------------------------------------------------------'
-   */
-  [SETTINGS] = LAYOUT(
-    F(0),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,                  RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX, \
-    MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(2),                     RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX, \
-    AU_TOG,  KC_F1,   F(3),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-    F(5),    F(2),    F(4),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,     RGB_HUI,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
-    XXXXXXX, XXXXXXX, XXXXXXX,                            F(12),                              XXXXXXX, XXXXXXX, XXXXXXX,     RGB_SAD, RGB_HUD, RGB_SAI,     XXXXXXX, XXXXXXX           \
-  ),
+    /* Keymap SETTINGS: Settings Layer
+     * ,-----------------------------------------------------------.     ,-------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
+     * |-------------------------------------------------------------|  |--------------|
+     * |FN0 |   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
+     * |-----------------------------------------------------------|    |-------------|
+     * |MuMode|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
+     * |-----------------------------------------------------------|    `-------------'
+     * |AudTgl |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
+     * |-----------------------------------------------------------|      ,----.
+     * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |      |Hue+|
+     * |--------------------------------------------------------------------------.
+     * |    |    |    |                       |    |    |    |     | |Sat-|Hue-|Sat+|
+     * `----------------------------------------------------------------------------'
+     */
+    [SETTINGS] = LAYOUT(
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,                  RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX,
+        MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                  RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX,
+        AU_TOG,  KC_F1,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,     RGB_HUI,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,     RGB_SAD, RGB_HUD, RGB_SAI,     XXXXXXX, XXXXXXX
+    )
 };
 
 void tap_esc_func_finished(qk_tap_dance_state_t *state, void *user_data) {
-    if(state->pressed){
+    if (state->pressed) {
         layer_on(FUNC);
-    }else{
-        register_code(KC_ESC);
-        unregister_code(KC_ESC);
+    } else {
+        tap_code(KC_ESC);
     }
 }
 
@@ -108,21 +106,12 @@ void tap_esc_func_reset(qk_tap_dance_state_t *state, void *user_data) {
 }
 
 qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_ESC_FUNC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_esc_func_finished, tap_esc_func_reset),
+    [TD_ESC_FUNC] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_esc_func_finished, tap_esc_func_reset),
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-    ACTION_FUNCTION(LFK_CLEAR),                               // FN0 - reset layers
-    ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER),                   // FN1 - Increase Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER),                    // FN2 - Decrease Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_LONGER),                   // FN3 - Increase length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER),                  // FN4 - Decrease length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TOGGLE),                        // FN5 - Toggle audio click
-  };
-
 void matrix_init_user(void) {
     // This keymap only has a single base layer, so reset the default if needed
-    if(eeconfig_read_default_layer() > 1){
+    if (eeconfig_read_default_layer() > 1) {
         eeconfig_update_default_layer(1);
         default_layer_set(1);
     }
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
index 1d29cb1c56..13cb6c22f5 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/mini1800/keymaps/default/keymap.c
@@ -1,8 +1,5 @@
 #include QMK_KEYBOARD_H
 
-//Define a shorter 'transparent' key code to make the keymaps more compact
-#define KC_TR KC_TRNS
-
 enum keymap_layout {
     VANILLA = 0,  // matches MF68 layout
     FUNC,         // 0x08
@@ -19,90 +16,80 @@ const Layer_Info layer_info[] = {
     {0xFFFFFFFF, 0xFFFFFFFF, {0xFF, 0xFF, 0xFF}}, // unknown layer - REQUIRED - white
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap VANILLA: (Base Layer) Default Layer
-   * ,-----------------------------------------------------------------------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
-   * |-----------------------------------------------------------|  |--------------|
-   * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
-   * |-----------------------------------------------------------|  |--------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
-   * |-----------------------------------------------------------|  `--------------'
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
-   * |-----------------------------------------------------------|        ,----.
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
-   * |-----------------------------------------------------------|   ,-------------.
-   * |Ctrl|Gui |Alt |      Space            |ALT |GUI |Func|CTRL |   |Lft| Dn |Rig |
-   * `-----------------------------------------------------------'   `-------------'
-   */
-  [VANILLA] = LAYOUT(
-    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_NLCK, KC_PSLS, KC_PAST, KC_PEQL,
-    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_P7,   KC_P8,   KC_P9,   KC_PMNS,
-    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_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    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_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL, MO(FUNC),     KC_LEFT, KC_DOWN, KC_RGHT,      KC_P0,   KC_PDOT
-  ),
+    /* Keymap VANILLA: (Base Layer) Default Layer
+     * ,-----------------------------------------------------------------------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12|  |Prnt|ScLk|Paus|
+     * |-----------------------------------------------------------|  |--------------|
+     * | ~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backsp |  | Ins|Home|PgUp|
+     * |-----------------------------------------------------------|  |--------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|  | Del| End|PgDn|
+     * |-----------------------------------------------------------|  `--------------'
+     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |
+     * |-----------------------------------------------------------|        ,----.
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |        | Up |
+     * |-----------------------------------------------------------|   ,-------------.
+     * |Ctrl|Gui |Alt |      Space            |ALT |GUI |Func|CTRL |   |Lft| Dn |Rig |
+     * `-----------------------------------------------------------'   `-------------'
+     */
+    [VANILLA] = LAYOUT(
+        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_NLCK, KC_PSLS, KC_PAST, KC_PEQL,
+        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_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        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_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL, MO(FUNC),     KC_LEFT, KC_DOWN, KC_RGHT,      KC_P0,   KC_PDOT
+    ),
 
-  /* Keymap FUNCTION: Function Layer
-   * ,-------------------------------------------------------------.  ,--------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-   * |-------------------------------------------------------------|  |--------------|
-   * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
-   * |-------------------------------------------------------------|  |--------------|
-   * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
-   * |-------------------------------------------------------------|  `--------------'
-   * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
-   * |-------------------------------------------------------------|       ,----.
-   * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
-   * |-------------------------------------------------------------'   ,-------------.
-   * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
-   * `------------------------------------------------------'          `-------------'
-   */
-  [FUNC] = LAYOUT(
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,                        _______, _______, _______, _______,
-    XXXXXXX, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       _______, _______, _______, _______,
-    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,                       _______, _______, _______, _______,
-    _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),     _______,     _______, _______, _______, _______,
-    _______, _______, _______,                            KC_PGDN,                            _______, _______, _______,          _______, _______, _______,     _______, _______
-  ),
+    /* Keymap FUNCTION: Function Layer
+     * ,-------------------------------------------------------------.  ,--------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
+     * |-------------------------------------------------------------|  |--------------|
+     * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete   |  |    |    |    |
+     * |-------------------------------------------------------------|  |--------------|
+     * |Tab  |   |PgU|   |   |   |   |   | Up|   |   |   |   |       |  |    |    |    |
+     * |-------------------------------------------------------------|  `--------------'
+     * |Control|Hme|PgD|End|   |   |   |Lft|Dwn|Rgt|   |   |         |
+     * |-------------------------------------------------------------|       ,----.
+     * |Shift   |   |Del|   |   |   |   |Mute|V- |V+ |  |TG(SETTINGS)|       | Up |
+     * |-------------------------------------------------------------'   ,-------------.
+     * |Func|Win |Alt |        PgD           |Alt |Ctrl |Func |          |Lft| Dn |Rig |
+     * `------------------------------------------------------'          `-------------'
+     */
+    [FUNC] = LAYOUT(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,                        _______, _______, _______, _______,
+        XXXXXXX, KC_HOME, KC_UP,   KC_END,  KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                       _______, _______, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX, XXXXXXX,          XXXXXXX,                       _______, _______, _______, _______,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX,                   TG(SETTINGS),     _______,     _______, _______, _______, _______,
+        _______, _______, _______,                            KC_PGDN,                            _______, _______, _______,          _______, _______, _______,     _______, _______
+    ),
 
-  /* Keymap SETTINGS: Settings Layer
-   * ,-----------------------------------------------------------.     ,-------------.
-   * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
-   * |-------------------------------------------------------------|  |--------------|
-   * |FN0 |   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
-   * |-----------------------------------------------------------|    |-------------|
-   * |MuMode|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
-   * |-----------------------------------------------------------|    `-------------'
-   * |AudTgl |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
-   * |-----------------------------------------------------------|      ,----.
-   * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |      |Hue+|
-   * |--------------------------------------------------------------------------.
-   * |    |    |    |                       |    |    |    |     | |Sat-|Hue-|Sat+|
-   * `----------------------------------------------------------------------------'
-   */
-  [SETTINGS] = LAYOUT(
-    F(0),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,                  RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX,
-    MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, F(2),                     RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX,
-    AU_TOG,  F(1),    F(3),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    F(5),    F(2),    F(4),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,     RGB_HUI,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
-    XXXXXXX, XXXXXXX, XXXXXXX,                            F(12),                              XXXXXXX, XXXXXXX, XXXXXXX,     RGB_SAD, RGB_HUD, RGB_SAI,     XXXXXXX, XXXXXXX
-  ),
+    /* Keymap SETTINGS: Settings Layer
+     * ,-----------------------------------------------------------.     ,-------------.
+     * |Esc  |f1| f2| f3| f4|  | f5| f6| f7| f8|   | f9|f10|f11|f12  |  |Prnt|ScLk|Paus|
+     * |-------------------------------------------------------------|  |--------------|
+     * |FN0 |   |   |   |   |   |   |   |   |  |   |BL-|BL+|BL Togl|    |RGB Tog |Val+|
+     * |-----------------------------------------------------------|    |-------------|
+     * |MuMode|   |   |   |   |   |   |   |   |   |   |   |  |LEDTst|    |RGB Mode|Val-|
+     * |-----------------------------------------------------------|    `-------------'
+     * |AudTgl |Hz+|MS+|   |   |   |   |   |   |   |   |   |  RST  |
+     * |-----------------------------------------------------------|      ,----.
+     * |ClickTgl|Hz-|MS-|   |   |   |   |   |   |   |   |Layer Clr |      |Hue+|
+     * |--------------------------------------------------------------------------.
+     * |    |    |    |                       |    |    |    |     | |Sat-|Hue-|Sat+|
+     * `----------------------------------------------------------------------------'
+     */
+    [SETTINGS] = LAYOUT(
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC,  BL_INC,  BL_TOGG,                  RGB_TOG, RGB_VAI, XXXXXXX, XXXXXXX,
+        MU_MOD,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                  RGB_MOD, RGB_VAD, XXXXXXX, XXXXXXX,
+        AU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          RESET,                    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MU_TOG,  XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX,     RGB_HUI,     XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX,                            XXXXXXX,                            XXXXXXX, XXXXXXX, XXXXXXX,     RGB_SAD, RGB_HUD, RGB_SAI,     XXXXXXX, XXXXXXX
+    )
 };
 
-const uint16_t PROGMEM fn_actions[] = {
-    ACTION_FUNCTION(LFK_CLEAR),                               // FN0 - reset layers
-    ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER),                   // FN1 - Increase Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER),                    // FN2 - Decrease Freq of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_LONGER),                   // FN3 - Increase length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER),                  // FN4 - Decrease length of audio click
-    ACTION_FUNCTION(LFK_CLICK_TOGGLE),                        // FN5 - Toggle audio click
-  };
-
 void matrix_init_user(void) {
     // This keymap only has a single base layer, so reset the default if needed
-    if(eeconfig_read_default_layer() > 1){
+    if (eeconfig_read_default_layer() > 1) {
         eeconfig_update_default_layer(1);
         default_layer_set(1);
     }
diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c
index 4c897ac693..8819d3465a 100644
--- a/keyboards/lfkeyboards/mini1800/mini1800.c
+++ b/keyboards/lfkeyboards/mini1800/mini1800.c
@@ -122,64 +122,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
     return process_record_user(keycode, record);
 }
 
-void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
-{
-#ifdef AUDIO_ENABLE
-    int8_t sign = 1;
-#endif
-    if(id == LFK_ESC_TILDE){
-        // Send ~ on shift-esc
-        void (*method)(uint8_t) = (event->event.pressed) ? &add_key : &del_key;
-        uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT));
-        method(shifted ? KC_GRAVE : KC_ESCAPE);
-        send_keyboard_report();
-    }else if(event->event.pressed){
-        switch(id){
-            case LFK_SET_DEFAULT_LAYER:
-                // set/save the current base layer to eeprom, falls through to LFK_CLEAR
-                eeconfig_update_default_layer(1UL << opt);
-                default_layer_set(1UL << opt);
-            case LFK_CLEAR:
-                // Go back to default layer
-                layer_clear();
-                break;
-#ifdef ISSI_ENABLE
-            case LFK_LED_TEST:
-                led_test();
-                break;
-#endif
-#ifdef AUDIO_ENABLE
-            case LFK_CLICK_FREQ_LOWER:
-                sign = -1;  // continue to next statement
-            case LFK_CLICK_FREQ_HIGHER:
-                click_hz += sign * 100;
-                click(click_hz, click_time);
-                break;
-            case LFK_CLICK_TOGGLE:
-                if(click_toggle){
-                    click_toggle = 0;
-                    click(4000, 100);
-                    click(1000, 100);
-                }else{
-                    click_toggle = 1;
-                    click(1000, 100);
-                    click(4000, 100);
-                }
-                break;
-            case LFK_CLICK_TIME_SHORTER:
-                sign = -1;  // continue to next statement
-            case LFK_CLICK_TIME_LONGER:
-                click_time += sign;
-                click(click_hz, click_time);
-                break;
-#endif
-            case LFK_PLAY_ONEUP:
-                PLAY_SONG(my_song);
-                break;
-        }
-    }
-}
-
 void reset_keyboard_kb(){
 #ifdef WATCHDOG_ENABLE
     MCUSR = 0;
diff --git a/keyboards/lfkeyboards/mini1800/mini1800.h b/keyboards/lfkeyboards/mini1800/mini1800.h
index 3e460c8a11..3586c75221 100644
--- a/keyboards/lfkeyboards/mini1800/mini1800.h
+++ b/keyboards/lfkeyboards/mini1800/mini1800.h
@@ -19,20 +19,6 @@ typedef struct Layer_Info {
 extern const uint32_t layer_count;
 extern const Layer_Info layer_info[];
 
-enum action_functions {
-    LFK_CLEAR = 0,          // Resets all layers
-    LFK_ESC_TILDE,          // esc+lshift = ~
-    LFK_SET_DEFAULT_LAYER,  // changes and saves current base layer to eeprom
-    LFK_CLICK_TOGGLE,       // Adjusts click duration
-    LFK_CLICK_FREQ_HIGHER,  // Adjusts click frequency
-    LFK_CLICK_FREQ_LOWER,   // Adjusts click frequency
-    LFK_CLICK_TIME_LONGER,  // Adjusts click duration
-    LFK_CLICK_TIME_SHORTER, // Adjusts click duration
-    LFK_DEBUG_SETTINGS,     // prints LED and click settings to HID
-    LFK_LED_TEST,           // cycles through switch and RGB LEDs
-    LFK_PLAY_ONEUP
-};
-
 #define CLICK_HZ 500
 #define CLICK_MS 2
 #define CLICK_ENABLED 0
diff --git a/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c b/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c
index 1470f95022..0e6b2820d0 100644
--- a/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c
+++ b/keyboards/lfkeyboards/smk65/keymaps/default/keymap.c
@@ -21,55 +21,45 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap VANILLA: (Base Layer) Default Layer
-   * ,------------------------------------------------------------.----.
-   * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa| Ins|
-   * |------------------------------------------------------------|----|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \| Del|
-   * |------------------------------------------------------------|----|
-   * |CAPS    |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |------------------------------------------------------------|----|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift  |Up |PgDn|
-   * |-----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |       Space         |Alt |Ctrl|Func|Lft| Dn |Rig |
-   * `-----------------------------------------------------------------'
-   */
-  [_BASE] = LAYOUT_65_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_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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,  KC_PGUP,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,           KC_UP,   KC_PGDN,
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL, MO(_FN),  KC_LEFT, KC_DOWN, KC_RGHT
-  ),
+    /* Keymap VANILLA: (Base Layer) Default Layer
+     * ,------------------------------------------------------------.----.
+     * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa| Ins|
+     * |------------------------------------------------------------|----|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \| Del|
+     * |------------------------------------------------------------|----|
+     * |CAPS    |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
+     * |------------------------------------------------------------|----|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift  |Up |PgDn|
+     * |-----------------------------------------------------------------|
+     * |Ctrl|Win |Alt |       Space         |Alt |Ctrl|Func|Lft| Dn |Rig |
+     * `-----------------------------------------------------------------'
+     */
+    [_BASE] = LAYOUT_65_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_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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,           KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,           KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL, MO(_FN),  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  /* Keymap VANILLA: Function Layer
-   * ,------------------------------------------------------------.----.
-   * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa| Ins|
-   * |------------------------------------------------------------|----|
-   * |MuMode | |  |  |E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \| Del|
-   * |------------------------------------------------------------|----|
-   * |AudTgl|Hz+|MS+| |  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |------------------------------------------------------------|----|
-   * |ClickTgl|Hz-|MS-|| C|  V|  B| N|MuTgl|  ,|  .|  /|Shift |Up |PgDn|
-   * |-----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |       Space         |Alt |Ctrl|Func|Lft| Dn |Rig |
-   * `-----------------------------------------------------------------'
-   */
-  [_FN] = LAYOUT_65_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_F13,  KC_F14,
-    MU_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
-    AU_TOG,  F(1),    F(3),    _______, _______, _______, _______, _______, _______, _______, _______, _______,          RESET,   RGB_MOD,
-    F(5),    F(2),    F(4),    _______, _______, _______, _______, MU_TOG,  RGB_VAD, RGB_VAI, _______, _______,          RGB_HUI, _______,
-    _______, _______, _______,                            _______,                   _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI
-  )
+    /* Keymap VANILLA: Function Layer
+     * ,------------------------------------------------------------.----.
+     * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa| Ins|
+     * |------------------------------------------------------------|----|
+     * |MuMode | |  |  |E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \| Del|
+     * |------------------------------------------------------------|----|
+     * |AudTgl|Hz+|MS+| |  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
+     * |------------------------------------------------------------|----|
+     * |ClickTgl|Hz-|MS-|| C|  V|  B| N|MuTgl|  ,|  .|  /|Shift |Up |PgDn|
+     * |-----------------------------------------------------------------|
+     * |Ctrl|Win |Alt |       Space         |Alt |Ctrl|Func|Lft| Dn |Rig |
+     * `-----------------------------------------------------------------'
+     */
+    [_FN] = LAYOUT_65_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_F13,  KC_F14,
+        MU_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
+        AU_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RESET,   RGB_MOD,
+        _______, _______, _______, _______, _______, _______, _______, MU_TOG,  RGB_VAD, RGB_VAI, _______, _______,          RGB_HUI, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI
+    )
 };
-
-#ifndef NO_ACTION_FUNCTION
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER),             // FN1 - Increase Freq of audio click
-    [2] = ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER),              // FN2 - Decrease Freq of audio click
-    [3] = ACTION_FUNCTION(LFK_CLICK_TIME_LONGER),             // FN3 - Increase length of audio click
-    [4] = ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER),            // FN4 - Decrease length of audio click
-    [5] = ACTION_FUNCTION(LFK_CLICK_TOGGLE),                  // FN5 - Toggle audio click
-};
-#endif
diff --git a/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c b/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c
index 3a1701ce86..881ff99c9d 100644
--- a/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c
+++ b/keyboards/lfkeyboards/smk65/keymaps/iso/keymap.c
@@ -21,55 +21,45 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap VANILLA: (Base Layer) Default Layer
-   * ,------------------------------------------------------------.----.
-   * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa| Ins|
-   * |------------------------------------------------------------|----|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  Ret | Del|
-   * |--------------------------------------------------------.   |----|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  # |   |PgUp|
-   * |------------------------------------------------------------|----|
-   * |Shft| \ |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up |PgDn|
-   * |-----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |       Space         |Alt |Ctrl|Func|Lft| Dn |Rig |
-   * `-----------------------------------------------------------------'
-   */
-  [_BASE] = LAYOUT_65_iso(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_INS,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,          KC_DEL,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,  KC_PGUP,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,   KC_PGDN,
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL, MO(_FN),  KC_LEFT, KC_DOWN, KC_RGHT
-  ),
+    /* Keymap VANILLA: (Base Layer) Default Layer
+     * ,------------------------------------------------------------.----.
+     * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa| Ins|
+     * |------------------------------------------------------------|----|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  Ret | Del|
+     * |--------------------------------------------------------.   |----|
+     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  # |   |PgUp|
+     * |------------------------------------------------------------|----|
+     * |Shft| \ |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up |PgDn|
+     * |-----------------------------------------------------------------|
+     * |Ctrl|Win |Alt |       Space         |Alt |Ctrl|Func|Lft| Dn |Rig |
+     * `-----------------------------------------------------------------'
+     */
+    [_BASE] = LAYOUT_65_iso(
+        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_INS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,  KC_RBRC,          KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS, KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL, MO(_FN),  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-  /* Keymap VANILLA: Function Layer
-   * ,------------------------------------------------------------.----.
-   * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa| Ins|
-   * |------------------------------------------------------------|----|
-   * |MuMode | |  |  |E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| RESET| Del|
-   * |--------------------------------------------------------.   |----|
-   * |AudTgl|Hz+|MS+| |  D|  F|  G|  H|  J|  K|  L|  ;|  '|   |   |PgUp|
-   * |------------------------------------------------------------|----|
-   * |CTgl|   |Hz-|MS-|| C|  V|  B| N|MuTgl|  ,|  .|  /|Shift |Up |PgDn|
-   * |-----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |       Space         |Alt |Ctrl|Func|Lft| Dn |Rig |
-   * `-----------------------------------------------------------------'
-   */
-  [_FN] = LAYOUT_65_iso(
-    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_F13,  KC_F14,
-    MU_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
-    AU_TOG,  F(1),    F(3),    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   RGB_MOD,
-    F(5),    _______, F(2),    F(4),    _______, _______, _______, _______, MU_TOG,  RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______,
-    _______, _______, _______,                            _______,                   _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI
-  ),
+    /* Keymap VANILLA: Function Layer
+     * ,------------------------------------------------------------.----.
+     * |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa| Ins|
+     * |------------------------------------------------------------|----|
+     * |MuMode | |  |  |E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| RESET| Del|
+     * |--------------------------------------------------------.   |----|
+     * |AudTgl|Hz+|MS+| |  D|  F|  G|  H|  J|  K|  L|  ;|  '|   |   |PgUp|
+     * |------------------------------------------------------------|----|
+     * |CTgl|   |Hz-|MS-|| C|  V|  B| N|MuTgl|  ,|  .|  /|Shift |Up |PgDn|
+     * |-----------------------------------------------------------------|
+     * |Ctrl|Win |Alt |       Space         |Alt |Ctrl|Func|Lft| Dn |Rig |
+     * `-----------------------------------------------------------------'
+     */
+    [_FN] = LAYOUT_65_iso(
+        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_F13,  KC_F14,
+        MU_MOD,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          RGB_TOG,
+        AU_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   RGB_MOD,
+        _______, _______, _______, _______, _______, _______, _______, _______, MU_TOG,  RGB_VAD, RGB_VAI, _______, _______, RGB_HUI, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, RGB_SAD, RGB_HUD, RGB_SAI
+    )
 };
-
-#ifndef NO_ACTION_FUNCTION
-const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_FUNCTION(LFK_CLICK_FREQ_HIGHER),                   // FN1 - Increase Freq of audio click
-    [2] = ACTION_FUNCTION(LFK_CLICK_FREQ_LOWER),                    // FN2 - Decrease Freq of audio click
-    [3] = ACTION_FUNCTION(LFK_CLICK_TIME_LONGER),                   // FN3 - Increase length of audio click
-    [4] = ACTION_FUNCTION(LFK_CLICK_TIME_SHORTER),                  // FN4 - Decrease length of audio click
-    [5] = ACTION_FUNCTION(LFK_CLICK_TOGGLE),                        // FN5 - Toggle audio click
-};
-#endif
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.c b/keyboards/lfkeyboards/smk65/revb/revb.c
index 01c339f06b..9b34eff1c3 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.c
+++ b/keyboards/lfkeyboards/smk65/revb/revb.c
@@ -81,62 +81,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record)
     return process_record_user(keycode, record);
 }
 
-void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
-{
-#ifdef AUDIO_ENABLE
-    int8_t sign = 1;
-#endif
-    if(id == LFK_ESC_TILDE){
-        // Send ~ on shift-esc
-        void (*method)(uint8_t) = (event->event.pressed) ? &add_key : &del_key;
-        uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT));
-        method(shifted ? KC_GRAVE : KC_ESCAPE);
-        send_keyboard_report();
-    }else if(event->event.pressed){
-        switch(id){
-            case LFK_SET_DEFAULT_LAYER:
-                // set/save the current base layer to eeprom, falls through to LFK_CLEAR
-                eeconfig_update_default_layer(1UL << opt);
-                default_layer_set(1UL << opt);
-            case LFK_CLEAR:
-                // Go back to default layer
-                layer_clear();
-                break;
-#ifdef AUDIO_ENABLE
-            case LFK_CLICK_FREQ_LOWER:
-                sign = -1;  // continue to next statement
-            case LFK_CLICK_FREQ_HIGHER:
-                click_hz += sign * 100;
-                click(click_hz, click_time);
-                break;
-            case LFK_CLICK_TOGGLE:
-                if(click_toggle){
-                    click_toggle = 0;
-                    click(4000, 100);
-                    click(1000, 100);
-                }else{
-                    click_toggle = 1;
-                    click(1000, 100);
-                    click(4000, 100);
-                }
-                break;
-            case LFK_CLICK_TIME_SHORTER:
-                sign = -1;  // continue to next statement
-            case LFK_CLICK_TIME_LONGER:
-                click_time += sign;
-                click(click_hz, click_time);
-                break;
-#endif
-            case LFK_DEBUG_SETTINGS:
-                dprintf("Click:\n");
-                dprintf("  toggle: %d\n", click_toggle);
-                dprintf("  freq(hz): %d\n", click_hz);
-                dprintf("  duration(ms): %d\n", click_time);
-                break;
-        }
-    }
-}
-
 void reset_keyboard_kb(){
 #ifdef WATCHDOG_ENABLE
     MCUSR = 0;
diff --git a/keyboards/lfkeyboards/smk65/revb/revb.h b/keyboards/lfkeyboards/smk65/revb/revb.h
index dbb25b869a..28fed40aa2 100644
--- a/keyboards/lfkeyboards/smk65/revb/revb.h
+++ b/keyboards/lfkeyboards/smk65/revb/revb.h
@@ -33,19 +33,6 @@ typedef struct Layer_Info {
 extern const uint32_t layer_count;
 extern const Layer_Info layer_info[];
 
-enum action_functions {
-    LFK_CLEAR = 0,          // Resets all layers
-    LFK_ESC_TILDE,          // esc+lshift = ~
-    LFK_SET_DEFAULT_LAYER,  // changes and saves current base layer to eeprom
-    LFK_CLICK_TOGGLE,       // Adjusts click duration
-    LFK_CLICK_FREQ_HIGHER,  // Adjusts click frequency
-    LFK_CLICK_FREQ_LOWER,   // Adjusts click frequency
-    LFK_CLICK_TIME_LONGER,  // Adjusts click duration
-    LFK_CLICK_TIME_SHORTER, // Adjusts click duration
-    LFK_DEBUG_SETTINGS,     // prints LED and click settings to HID
-    LFK_LED_TEST            // cycles through switch and RGB LEDs
-};
-
 #define CLICK_HZ 500
 #define CLICK_MS 2
 #define CLICK_ENABLED 0
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index 9e1c5f92af..d967a03c31 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -55,7 +55,7 @@ char* translate_keycode_to_string(uint16_t code)
     return (return_p);
 }
 
-lookup_table_t lookup_table[366] =
+lookup_table_t lookup_table[334] =
 {
  {"KC_NO", KC_NO},
  {"KC_TRNS", KC_TRNS},
@@ -243,38 +243,6 @@ lookup_table_t lookup_table[366] =
  {"KC_MRWD", KC_MRWD},
  {"KC_BRIU", KC_BRIU},
  {"KC_BRID", KC_BRID},
- {"KC_FN0", KC_FN0},
- {"KC_FN1", KC_FN1},
- {"KC_FN2", KC_FN2},
- {"KC_FN3", KC_FN3},
- {"KC_FN4", KC_FN4},
- {"KC_FN5", KC_FN5},
- {"KC_FN6", KC_FN6},
- {"KC_FN7", KC_FN7},
- {"KC_FN8", KC_FN8},
- {"KC_FN9", KC_FN9},
- {"KC_FN10", KC_FN10},
- {"KC_FN11", KC_FN11},
- {"KC_FN12", KC_FN12},
- {"KC_FN13", KC_FN13},
- {"KC_FN14", KC_FN14},
- {"KC_FN15", KC_FN15},
- {"KC_FN16", KC_FN16},
- {"KC_FN17", KC_FN17},
- {"KC_FN18", KC_FN18},
- {"KC_FN19", KC_FN19},
- {"KC_FN20", KC_FN20},
- {"KC_FN21", KC_FN21},
- {"KC_FN22", KC_FN22},
- {"KC_FN23", KC_FN23},
- {"KC_FN24", KC_FN24},
- {"KC_FN25", KC_FN25},
- {"KC_FN26", KC_FN26},
- {"KC_FN27", KC_FN27},
- {"KC_FN28", KC_FN28},
- {"KC_FN29", KC_FN29},
- {"KC_FN30", KC_FN30},
- {"KC_FN31", KC_FN31},
  {"KC_LCTL", KC_LCTL},
  {"KC_LSFT", KC_LSFT},
  {"KC_LALT", KC_LALT},

From 448a90f6b0b68ef074b1a19a081eceaafcc7425e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 23 Jan 2022 06:56:44 +1100
Subject: [PATCH 359/867] `rocketboard_16`: Fix mismatched LUT sizes (#15997)

---
 keyboards/rocketboard_16/keycode_lookup.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/rocketboard_16/keycode_lookup.h b/keyboards/rocketboard_16/keycode_lookup.h
index f51dcfd52a..218b709b47 100644
--- a/keyboards/rocketboard_16/keycode_lookup.h
+++ b/keyboards/rocketboard_16/keycode_lookup.h
@@ -26,4 +26,4 @@ typedef struct
 
 char* translate_keycode_to_string(uint16_t code);
 
-extern lookup_table_t lookup_table[366];
+extern lookup_table_t lookup_table[334];

From 6e83b449409f7fe479210a9fab808e8bcae64977 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 22 Jan 2022 21:17:02 +0000
Subject: [PATCH 360/867] Align location of some host led logic (#15954)

* Align location of host led logic

* Move more

* align ifdefs

* Fix up includes

* Move callback defs

* Convert comment to build message
---
 keyboards/converter/usb_usb/custom_matrix.cpp |  2 +-
 keyboards/sirius/unigo66/custom_matrix.cpp    |  2 +-
 quantum/keyboard.c                            | 26 -----------
 quantum/keyboard.h                            |  2 -
 quantum/led.c                                 | 44 ++++++++++++++++++-
 quantum/led.h                                 | 12 +++++
 quantum/quantum.c                             | 11 +----
 quantum/quantum.h                             |  5 ---
 8 files changed, 58 insertions(+), 46 deletions(-)

diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp
index 91986f6eb9..265fb2c68d 100644
--- a/keyboards/converter/usb_usb/custom_matrix.cpp
+++ b/keyboards/converter/usb_usb/custom_matrix.cpp
@@ -185,7 +185,7 @@ extern "C"
             // restore LED state when keyboard comes up
             if (usb_state == USB_STATE_RUNNING) {
                 dprintf("speed: %s\n", usb_host.getVbusState()==FSHOST ? "full" : "low");
-                keyboard_set_leds(host_keyboard_leds());
+                led_set(host_keyboard_leds());
             }
         }
         matrix_scan_quantum();
diff --git a/keyboards/sirius/unigo66/custom_matrix.cpp b/keyboards/sirius/unigo66/custom_matrix.cpp
index dfcf82c779..955ce189a8 100644
--- a/keyboards/sirius/unigo66/custom_matrix.cpp
+++ b/keyboards/sirius/unigo66/custom_matrix.cpp
@@ -166,7 +166,7 @@ extern "C"
             // restore LED state when keyboard comes up
             if (usb_state == USB_STATE_RUNNING) {
                 dprintf("speed: %s\n", usb_host.getVbusState()==FSHOST ? "full" : "low");
-                keyboard_set_leds(host_keyboard_leds());
+                led_set(host_keyboard_leds());
             }
         }
         return 1;
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index fa20c675c3..60f5afb7a2 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -350,32 +350,6 @@ void keyboard_init(void) {
     keyboard_post_init_kb(); /* Always keep this last */
 }
 
-/** \brief keyboard set leds
- *
- * FIXME: needs doc
- */
-void keyboard_set_leds(uint8_t leds) {
-    if (debug_keyboard) {
-        debug("keyboard_set_led: ");
-        debug_hex8(leds);
-        debug("\n");
-    }
-    led_set(leds);
-}
-
-/** \brief set host led state
- *
- * Only sets state if change detected
- */
-void led_task(void) {
-    static uint8_t led_status = 0;
-    // update LED
-    if (led_status != host_keyboard_leds()) {
-        led_status = host_keyboard_leds();
-        keyboard_set_leds(led_status);
-    }
-}
-
 /** \brief key_event_task
  *
  * This function is responsible for calling into other systems when they need to respond to electrical switch press events.
diff --git a/quantum/keyboard.h b/quantum/keyboard.h
index 08f4e84f94..9b0fb3cef8 100644
--- a/quantum/keyboard.h
+++ b/quantum/keyboard.h
@@ -58,8 +58,6 @@ void keyboard_setup(void);
 void keyboard_init(void);
 /* it runs repeatedly in main loop */
 void keyboard_task(void);
-/* it runs when host LED status is updated */
-void keyboard_set_leds(uint8_t leds);
 /* it runs whenever code has to behave differently on a slave */
 bool is_keyboard_master(void);
 /* it runs whenever code has to behave differently on left vs right split */
diff --git a/quantum/led.c b/quantum/led.c
index 8f0eccf55d..7ee67b55e6 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -13,13 +13,15 @@
  * 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 "quantum.h"
+#include "led.h"
+#include "host.h"
+#include "debug.h"
 
 #ifdef BACKLIGHT_ENABLE
 #    include "backlight.h"
 extern backlight_config_t backlight_config;
 #else
-// Cannot use BACKLIGHT_CAPS_LOCK without backlight being enabled
+#    pragma message "Cannot use BACKLIGHT_CAPS_LOCK without backlight being enabled"
 #    undef BACKLIGHT_CAPS_LOCK
 #endif
 
@@ -135,3 +137,41 @@ __attribute__((weak)) void led_set(uint8_t usb_led) {
     led_set_kb(usb_led);
     led_update_kb((led_t)usb_led);
 }
+
+/** \brief Trigger behaviour on transition to suspend
+ */
+void led_suspend(void) {
+    uint8_t leds_off = 0;
+#ifdef BACKLIGHT_CAPS_LOCK
+    if (is_backlight_enabled()) {
+        // Don't try to turn off Caps Lock indicator as it is backlight and backlight is already off
+        leds_off |= (1 << USB_LED_CAPS_LOCK);
+    }
+#endif
+    led_set(leds_off);
+}
+
+/** \brief Trigger behaviour on transition from suspend
+ */
+void led_wakeup(void) { led_set(host_keyboard_leds()); }
+
+/** \brief set host led state
+ *
+ * Only sets state if change detected
+ */
+void led_task(void) {
+    static uint8_t last_led_status = 0;
+
+    // update LED
+    uint8_t led_status = host_keyboard_leds();
+    if (last_led_status != led_status) {
+        last_led_status = led_status;
+
+        if (debug_keyboard) {
+            debug("led_task: ");
+            debug_hex8(led_status);
+            debug("\n");
+        }
+        led_set(led_status);
+    }
+}
diff --git a/quantum/led.h b/quantum/led.h
index 0fe38ea035..934d25312c 100644
--- a/quantum/led.h
+++ b/quantum/led.h
@@ -49,6 +49,18 @@ void led_set(uint8_t usb_led);
 
 void led_init_ports(void);
 
+void led_suspend(void);
+
+void led_wakeup(void);
+
+void led_task(void);
+
+/* Callbacks */
+void led_set_user(uint8_t usb_led);
+void led_set_kb(uint8_t usb_led);
+bool led_update_user(led_t led_state);
+bool led_update_kb(led_t led_state);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/quantum/quantum.c b/quantum/quantum.c
index f12b1a9526..b59fcc9857 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -433,14 +433,7 @@ void suspend_power_down_quantum(void) {
 #    endif
 
     // Turn off LED indicators
-    uint8_t leds_off = 0;
-#    if defined(BACKLIGHT_CAPS_LOCK) && defined(BACKLIGHT_ENABLE)
-    if (is_backlight_enabled()) {
-        // Don't try to turn off Caps Lock indicator as it is backlight and backlight is already off
-        leds_off |= (1 << USB_LED_CAPS_LOCK);
-    }
-#    endif
-    led_set(leds_off);
+    led_suspend();
 
 // Turn off audio
 #    ifdef AUDIO_ENABLE
@@ -491,7 +484,7 @@ __attribute__((weak)) void suspend_wakeup_init_quantum(void) {
 #endif
 
     // Restore LED indicators
-    led_set(host_keyboard_leds());
+    led_wakeup();
 
 // Wake up underglow
 #if defined(RGBLIGHT_SLEEP) && defined(RGBLIGHT_ENABLE)
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 5d3a665887..020e455941 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -249,11 +249,6 @@ void register_code16(uint16_t code);
 void unregister_code16(uint16_t code);
 void tap_code16(uint16_t code);
 
-void led_set_user(uint8_t usb_led);
-void led_set_kb(uint8_t usb_led);
-bool led_update_user(led_t led_state);
-bool led_update_kb(led_t led_state);
-
 const char *get_numeric_str(char *buf, size_t buf_len, uint32_t curr_num, char curr_pad);
 const char *get_u8_str(uint8_t curr_num, char curr_pad);
 const char *get_u16_str(uint16_t curr_num, char curr_pad);

From eddd1c05674ce48dd5db0d7da996a4da2ecd705a Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 22 Jan 2022 23:11:42 +0000
Subject: [PATCH 361/867] Fix BACKLIGHT_CAPS_LOCK warning (#15999)

* Fix BACKLIGHT_CAPS_LOCK warning

* align defs
---
 quantum/led.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/quantum/led.c b/quantum/led.c
index 7ee67b55e6..68494af3c2 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -17,19 +17,21 @@
 #include "host.h"
 #include "debug.h"
 
-#ifdef BACKLIGHT_ENABLE
-#    include "backlight.h"
+#ifdef BACKLIGHT_CAPS_LOCK
+#    ifdef BACKLIGHT_ENABLE
+#        include "backlight.h"
 extern backlight_config_t backlight_config;
-#else
-#    pragma message "Cannot use BACKLIGHT_CAPS_LOCK without backlight being enabled"
-#    undef BACKLIGHT_CAPS_LOCK
+#    else
+#        pragma message "Cannot use BACKLIGHT_CAPS_LOCK without backlight being enabled"
+#        undef BACKLIGHT_CAPS_LOCK
+#    endif
 #endif
 
 #ifndef LED_PIN_ON_STATE
 #    define LED_PIN_ON_STATE 1
 #endif
 
-#if defined(BACKLIGHT_CAPS_LOCK)
+#ifdef BACKLIGHT_CAPS_LOCK
 /** \brief Caps Lock indicator using backlight (for keyboards without dedicated LED)
  */
 static void handle_backlight_caps_lock(led_t led_state) {

From 8101a836a410c54f14c4f61738bfedf5912e903e Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 22 Jan 2022 15:43:39 -0800
Subject: [PATCH 362/867] [Bug] Fix compilation issues for led indicators
 (#16001)

---
 quantum/led.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quantum/led.c b/quantum/led.c
index 68494af3c2..7b3f877208 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -16,6 +16,7 @@
 #include "led.h"
 #include "host.h"
 #include "debug.h"
+#include "gpio.h"
 
 #ifdef BACKLIGHT_CAPS_LOCK
 #    ifdef BACKLIGHT_ENABLE

From a8700404f7a73ba3a5da4670a04cf5f999578abd Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 23 Jan 2022 02:41:57 +0000
Subject: [PATCH 363/867] Relocate matrix_init_quantum content (#15953)

* Relocate matrix_init_quantum content

* Update include order

* Fix cherry pick from 15722
---
 quantum/keyboard.c      | 44 +++++++++++++++++++++++++++++++++++++++++
 quantum/matrix.c        |  6 ------
 quantum/matrix_common.c |  6 ------
 quantum/quantum.c       | 30 +---------------------------
 4 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 60f5afb7a2..6bb2800910 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -20,6 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keyboard.h"
 #include "matrix.h"
 #include "keymap.h"
+#include "magic.h"
 #include "host.h"
 #include "led.h"
 #include "keycode.h"
@@ -101,6 +102,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef SLEEP_LED_ENABLE
 #    include "sleep_led.h"
 #endif
+#ifdef SPLIT_KEYBOARD
+#    include "split_util.h"
+#endif
+#ifdef BLUETOOTH_ENABLE
+#    include "outputselect.h"
+#endif
 
 static uint32_t last_input_modification_time = 0;
 uint32_t        last_input_activity_time(void) { return last_input_modification_time; }
@@ -291,6 +298,36 @@ void housekeeping_task(void) {
     housekeeping_task_user();
 }
 
+/** \brief Init tasks previously located in matrix_init_quantum
+ *
+ * TODO: rationalise against keyboard_init and current split role
+ */
+void quantum_init(void) {
+    magic();
+    led_init_ports();
+#ifdef BACKLIGHT_ENABLE
+    backlight_init_ports();
+#endif
+#ifdef AUDIO_ENABLE
+    audio_init();
+#endif
+#ifdef LED_MATRIX_ENABLE
+    led_matrix_init();
+#endif
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_init();
+#endif
+#if defined(UNICODE_COMMON_ENABLE)
+    unicode_input_mode_init();
+#endif
+#ifdef HAPTIC_ENABLE
+    haptic_init();
+#endif
+#if defined(BLUETOOTH_ENABLE) && defined(OUTPUT_AUTO_ENABLE)
+    set_output(OUTPUT_AUTO);
+#endif
+}
+
 /** \brief keyboard_init
  *
  * FIXME: needs doc
@@ -300,8 +337,12 @@ void keyboard_init(void) {
     sync_timer_init();
 #ifdef VIA_ENABLE
     via_init();
+#endif
+#ifdef SPLIT_KEYBOARD
+    split_pre_init();
 #endif
     matrix_init();
+    quantum_init();
 #if defined(CRC_ENABLE)
     crc_init();
 #endif
@@ -342,6 +383,9 @@ void keyboard_init(void) {
 #ifdef VIRTSER_ENABLE
     virtser_init();
 #endif
+#ifdef SPLIT_KEYBOARD
+    split_post_init();
+#endif
 
 #if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE)
     debug_enable = true;
diff --git a/quantum/matrix.c b/quantum/matrix.c
index a58cc752fb..1dd9655e57 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -252,8 +252,6 @@ __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[]
 
 void matrix_init(void) {
 #ifdef SPLIT_KEYBOARD
-    split_pre_init();
-
     // Set pinout for right half if pinout for that half is defined
     if (!isLeftHand) {
 #    ifdef DIRECT_PINS_RIGHT
@@ -292,10 +290,6 @@ void matrix_init(void) {
     debounce_init(ROWS_PER_HAND);
 
     matrix_init_quantum();
-
-#ifdef SPLIT_KEYBOARD
-    split_post_init();
-#endif
 }
 
 #ifdef SPLIT_KEYBOARD
diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c
index 98b83ddcf6..d67aaf508c 100644
--- a/quantum/matrix_common.c
+++ b/quantum/matrix_common.c
@@ -139,8 +139,6 @@ __attribute__((weak)) void matrix_slave_scan_user(void) {}
 
 __attribute__((weak)) void matrix_init(void) {
 #ifdef SPLIT_KEYBOARD
-    split_pre_init();
-
     thisHand = isLeftHand ? 0 : (ROWS_PER_HAND);
     thatHand = ROWS_PER_HAND - thisHand;
 #endif
@@ -156,10 +154,6 @@ __attribute__((weak)) void matrix_init(void) {
     debounce_init(ROWS_PER_HAND);
 
     matrix_init_quantum();
-
-#ifdef SPLIT_KEYBOARD
-    split_post_init();
-#endif
 }
 
 __attribute__((weak)) uint8_t matrix_scan(void) {
diff --git a/quantum/quantum.c b/quantum/quantum.c
index b59fcc9857..21f499165a 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -15,7 +15,6 @@
  */
 
 #include "quantum.h"
-#include "magic.h"
 
 #ifdef BLUETOOTH_ENABLE
 #    include "outputselect.h"
@@ -368,35 +367,8 @@ layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_
 
 void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) { layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3)); }
 
-void matrix_init_quantum() {
-    magic();
-    led_init_ports();
-#ifdef BACKLIGHT_ENABLE
-    backlight_init_ports();
-#endif
-#ifdef AUDIO_ENABLE
-    audio_init();
-#endif
-#ifdef LED_MATRIX_ENABLE
-    led_matrix_init();
-#endif
-#ifdef RGB_MATRIX_ENABLE
-    rgb_matrix_init();
-#endif
-#if defined(UNICODE_COMMON_ENABLE)
-    unicode_input_mode_init();
-#endif
-#ifdef HAPTIC_ENABLE
-    haptic_init();
-#endif
-#if defined(BLUETOOTH_ENABLE) && defined(OUTPUT_AUTO_ENABLE)
-    set_output(OUTPUT_AUTO);
-#endif
-
-    matrix_init_kb();
-}
-
 // TODO: remove legacy api
+void matrix_init_quantum() { matrix_init_kb(); }
 void matrix_scan_quantum() { matrix_scan_kb(); }
 
 //------------------------------------------------------------------------------

From 8776b4b08891b1aea88af5bc280296e5dec41712 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 23 Jan 2022 07:10:59 -0800
Subject: [PATCH 364/867] [Keyboard] Fix erroneous SRC for Clueboard 66 hotswap
 (#16007)

---
 keyboards/clueboard/66_hotswap/gen1/rules.mk | 2 --
 1 file changed, 2 deletions(-)

diff --git a/keyboards/clueboard/66_hotswap/gen1/rules.mk b/keyboards/clueboard/66_hotswap/gen1/rules.mk
index c73b4c4731..e69de29bb2 100644
--- a/keyboards/clueboard/66_hotswap/gen1/rules.mk
+++ b/keyboards/clueboard/66_hotswap/gen1/rules.mk
@@ -1,2 +0,0 @@
-# project specific files
-SRC =	led.c

From 812836e22f7e1c49723140cb75065ab2dc00af87 Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Mon, 24 Jan 2022 03:37:17 +0700
Subject: [PATCH 365/867] [Keyboard] Fixed RGB number for Devil68 Pro (#16003)

---
 keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c     | 2 +-
 .../chinese_pcb/devil68_pro/keymaps/default/keymap.c            | 2 +-
 .../horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c
index d8f581df6e..8b51920b81 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/devil68_pro.c
@@ -22,7 +22,7 @@ led_config_t g_led_config = { {
     {      15, NO_LED,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     28,     29 },
     {      30, NO_LED,     31,     32,     33,     34,     35,     36,     37,     38,     39,     40,     41,     42, NO_LED,     43 },
     {  NO_LED,     44,     45,     46,     47,     48,     49,     50,     51,     52,     53,     54, NO_LED,     55,     56,     57 },
-    {      58,     59, NO_LED,     60, NO_LED, NO_LED,     61, NO_LED, NO_LED, NO_LED,     64,     62,     63,     65,     66,     67 }
+    {      58,     59, NO_LED,     60, NO_LED, NO_LED,     61, NO_LED, NO_LED, NO_LED,     62,     63,     64,     65,     66,     67 }
 }, {
     // Key matrix (0 -> 67)
     {0  ,  0}, {15 ,  0}, {30 ,  0}, {45 ,  0}, {60 ,  0}, {75 ,  0}, {90 ,  0}, {105,  0}, {120,  0}, {135,  0}, {150,  0}, {165,  0}, {180,  0},            {202,  0}, {224,  0},
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c
index b110cf8546..48416c84c9 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/default/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             ),
 };
 
-void keyboard_post_init_kb(void) {
+void keyboard_post_init_user(void) {
     user_config.raw = eeconfig_read_user();
     switch (user_config.rgb_mode) {
         case RGB_MODE_ALL:
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c
index b110cf8546..48416c84c9 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keymaps/via/keymap.c
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             ),
 };
 
-void keyboard_post_init_kb(void) {
+void keyboard_post_init_user(void) {
     user_config.raw = eeconfig_read_user();
     switch (user_config.rgb_mode) {
         case RGB_MODE_ALL:

From c30bdcbca8afe1d8d005843acec075f921813d44 Mon Sep 17 00:00:00 2001
From: Olli <olli@suruatoel.xyz>
Date: Sun, 23 Jan 2022 21:38:02 +0100
Subject: [PATCH 366/867] =?UTF-8?q?[Keymap]=20Remove=20Ergodox=20community?=
 =?UTF-8?q?=20layout=20=E2=80=9Ccoderkun=5Fneo2=E2=80=9D=20(#16011)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../community/ergodox/coderkun_neo2/keymap.c  | 265 ------------------
 .../community/ergodox/coderkun_neo2/readme.md | 129 ---------
 .../community/ergodox/coderkun_neo2/rules.mk  |   3 -
 3 files changed, 397 deletions(-)
 delete mode 100644 layouts/community/ergodox/coderkun_neo2/keymap.c
 delete mode 100644 layouts/community/ergodox/coderkun_neo2/readme.md
 delete mode 100644 layouts/community/ergodox/coderkun_neo2/rules.mk

diff --git a/layouts/community/ergodox/coderkun_neo2/keymap.c b/layouts/community/ergodox/coderkun_neo2/keymap.c
deleted file mode 100644
index b731ab4950..0000000000
--- a/layouts/community/ergodox/coderkun_neo2/keymap.c
+++ /dev/null
@@ -1,265 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "action_layer.h"
-#include "led.h"
-#include "keymap_extras/keymap_neo2.h"
-
-// Layer names
-#define BASE 0      // default layer
-#define PMQ  1      // poor man’s QWERTZ
-#define PMN  2      // poor man’s Neo
-#define FMU  3      // FMU layer
-#define NHL  4      // Neo’s software layer 4 rebuilt in Hardware
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-/* Layer 0: default
- * ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐     ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
- * │  TAB  │  1  │  2  │  3  │  4  │  5  │  `  │     │  ´  │  6  │  7  │  8  │  9  │  0  │ BKSPC │
- * ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤     ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
- * │   Y   │  X  │  V  │  L  │  C  │  W  │ HOM │     │ END │  K  │  H  │  G  │  F  │  Q  │  ß    │
- * ├───────┼─────┼─────┼─────╆─────╅─────┤  E  │     │     ├─────╆─────╅─────┼─────┼─────┼───────┤
- * │ Mod3  │  U  │  I  │  A  │  E  │  O  ├─────┤     ├─────┤  S  │  N  │  R  │  T  │  D  │ Mod3  │
- * ├───────┼─────┼─────┼─────╄─────╃─────┤ TL2 │     │ TL3 ├─────╄─────╃─────┼─────┼─────┼───────┤
- * │ LSHFT │  Ü  │  Ö  │  Ä  │  P  │  Z  │     │     │     │  B  │  M  │  ,  │  .  │  J  │ Shift │
- * └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘     └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
- *   │ CTL │ ALT │ MO1 │ Win │ Mod4│                             │ Mod4│ Win │ MO1 │ ALT │ CTL │
- *   └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
- *                                   │  ←  │  ↑  │ │  ↓  │  →  │
- *                             ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
- *                             │     │     │  ─  │ │  ─  │     │     │
- *                             │ SPC │ RTN ├─────┤ ├─────┤ RTN │ SPC │
- *                             │     │     │ HYP │ │ MEH │     │     │
- *                             └─────┴─────┴─────┘ └─────┴─────┴─────┘
- */
-[BASE] = LAYOUT_ergodox(
-        // left hand
-        KC_TAB,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   NE_GRV,
-        NE_Y,      NE_X,  NE_V,  NE_L,  NE_C,  NE_W,  KC_HOME,
-        NE_L3L,   NE_U,  NE_I,  NE_A,  NE_E,  NE_O,
-        KC_LSFT,    NE_UDIA, NE_ODIA, NE_ADIA, NE_P,  NE_Z,  TG(PMQ),
-        KC_LCTL,    KC_LALT,MO(FMU),KC_LGUI,NE_L4L,
-                                                    KC_LEFT,    KC_UP,
-                                                                KC_MINS,
-                                            KC_SPC, KC_ENT,    ALL_T(KC_NO),
-        // right hand
-        NE_ACUT,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_BSPC,
-        KC_END,     NE_K,  NE_H,  NE_G,  NE_F,  NE_Q,  NE_SS,
-                    NE_S,  NE_N,  NE_R,  NE_T,  NE_D,  NE_L3R,
-        TG(PMN),    NE_B,  NE_M,  KC_COMM,KC_DOT, NE_J,  KC_RSFT,
-                            NE_L4R,KC_RGUI,MO(FMU),KC_LALT,KC_RCTL,
-        KC_DOWN,    KC_RGHT,
-        KC_MINS,
-        MEH_T(KC_NO),KC_ENT,KC_SPC
-    ),
-
-/* Layer 1: poor man’s QWERTZ
- * based on kaimi’s layout
- * ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐     ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
- * │  TAB  │  1  │  2  │  3  │  4  │  5  │  `  │     │  ´  │  6  │  7  │  8  │  9  │  0  │ BKSPC │
- * ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤     ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
- * │   C   │  P  │  T  │  F  │  K  │  L  │ HOM │     │ END │  B  │  A  │  S  │  G  │  V  │  Y    │
- * ├───────┼─────┼─────┼─────╆─────╅─────┤  E  │     │     ├─────╆─────╅─────┼─────┼─────┼───────┤
- * │ Mod3  │  D  │  H  │  Ö  │  O  │  I  ├─────┤     ├─────┤  U  │  -  │  Z  │  E  │  X  │ Mod3  │
- * ├───────┼─────┼─────┼─────╄─────╃─────┤(TL2)│     │(TL3)├─────╄─────╃─────┼─────┼─────┼───────┤
- * │ LSHFT │  Ä  │  Q  │  R  │  W  │  N  │     │     │     │  J  │  M  │  ,  │  .  │  ẞ  │ Shift │
- * └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘     └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
- *   │ CTL │ ALT │ MO1 │ Win │ MO4 │                             │ M04 │ Win │ MO1 │ ALT │ CTL │
- *   └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
- *                                   │  ←  │  ↑  │ │  ↓  │  →  │
- *                             ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
- *                             │     │     │  ─  │ │  ─  │     │     │
- *                             │ SPC │ RTN ├─────┤ ├─────┤ RTN │ SPC │
- *                             │     │     │ HYP │ │ MEH │     │     │
- *                             └─────┴─────┴─────┘ └─────┴─────┴─────┘
- */
-[PMQ] = LAYOUT_ergodox(
-        // left hand
-        KC_TAB,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_EQL,
-        DE_C,       DE_P,   DE_T,   DE_F,   DE_K,   DE_L,   KC_HOME,
-        NE_L3L,   DE_D,   DE_H,   DE_ODIA,DE_O,   DE_I,
-        KC_LSFT,    DE_ADIA,DE_Q,   DE_R,   DE_W,   DE_N,   KC_TRNS,
-        KC_LCTL,    KC_LALT,MO(FMU),KC_LGUI,MO(NHL),
-                                                    KC_LEFT,    KC_UP,
-                                                                KC_MINS,
-                                            KC_SPC, KC_ENT,    ALL_T(KC_NO),
-        // right hand
-        DE_ACUT,    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_BSPC,
-        KC_END,     DE_B,   DE_A,   DE_S,   DE_G,   DE_V,   DE_Y,
-                    DE_U,   DE_MINS,DE_Z,   DE_E,   DE_X,   NE_L3R,
-        KC_TRNS,    DE_J,   DE_M,   DE_COMM,DE_DOT, DE_SS,  KC_RSFT,
-                            MO(NHL),KC_RGUI,MO(FMU),KC_LALT,KC_RCTL,
-        KC_DOWN,    KC_RGHT,
-        KC_MINS,
-        MEH_T(KC_NO),KC_ENT,KC_SPC
-    ),
-
-/* Layer 2: poor man’s Neo
- * based on kaimi’s layout
- * ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐     ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
- * │  TAB  │  1  │  2  │  3  │  4  │  5  │  `  │     │  ´  │  6  │  7  │  8  │  9  │  0  │ BKSPC │
- * ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤     ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
- * │   Y   │  X  │  V  │  L  │  C  │  W  │ HOM │     │ END │  K  │  H  │  G  │  F  │  Q  │  ß    │
- * ├───────┼─────┼─────┼─────╆─────╅─────┤  E  │     │     ├─────╆─────╅─────┼─────┼─────┼───────┤
- * │ Mod3  │  U  │  I  │  A  │  E  │  O  ├─────┤     ├─────┤  S  │  N  │  R  │  T  │  D  │ Mod3  │
- * ├───────┼─────┼─────┼─────╄─────╃─────┤(TL2)│     │(TL3)├─────╄─────╃─────┼─────┼─────┼───────┤
- * │ LSHFT │  Ü  │  Ö  │  Ä  │  P  │  Z  │     │     │     │  B  │  M  │  ,  │  .  │  J  │ Shift │
- * └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘     └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
- *   │ CTL │ ALT │ MO1 │ Win │ MO4 │                             │ M04 │ Win │ MO1 │ ALT │ CTL │
- *   └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
- *                                   │  ←  │  ↑  │ │  ↓  │  →  │
- *                             ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
- *                             │     │     │  ─  │ │  ─  │     │     │
- *                             │ SPC │ RTN ├─────┤ ├─────┤ RTN │ SPC │
- *                             │     │     │ HYP │ │ MEH │     │     │
- *                             └─────┴─────┴─────┘ └─────┴─────┴─────┘
- */
-[PMN] = LAYOUT_ergodox(
-        KC_TAB,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_EQL,
-        DE_Y,       DE_X,   DE_V,   DE_L,   DE_C,   DE_W,   KC_HOME,
-        KC_NO,      DE_U,   DE_I,   DE_A,   DE_E,   DE_O,
-        KC_LSFT,    DE_UDIA,DE_ODIA,DE_ADIA,DE_P,   DE_Z,   KC_TRNS,
-        KC_LCTL,    KC_LALT,MO(FMU),KC_LGUI,MO(NHL),
-                                                    KC_LEFT,    KC_UP,
-                                                                KC_MINS,
-                                            KC_SPC, KC_ENT,    ALL_T(KC_NO),
-        // right hand
-        DE_ACUT,    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_BSPC,
-        KC_END,     DE_K,   DE_H,   DE_G,   DE_F,   DE_Q,   DE_SS,
-                    DE_S,   DE_N,   DE_R,   DE_T,   DE_D,   KC_NO,
-        KC_TRNS,    DE_B,   DE_M,   KC_COMM,KC_DOT, DE_J,   KC_RSFT,
-                            MO(NHL),KC_RGUI,MO(FMU),KC_LALT,KC_RCTL,
-        KC_DOWN,    KC_RGHT,
-        KC_MINS,
-        MEH_T(KC_NO),KC_ENT,KC_SPC
-    ),
-
-/* Layer 3: F-keys, Mouse and Unicode
- * ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐     ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
- * │       │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │     │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │       │
- * ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤     ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
- * │       │  ┌  │  ┬  │  ┐  │  ─  │  │  │     │     │     │  ↔  │  ←  │  →  │  ↑  │  ↓  │       │
- * ├───────┼─────┼─────┼─────╆─────╅─────┤     │     │     ├─────╆─────╅─────┼─────┼─────┼───────┤
- * │       │  ├  │  ┼  │  ┤  │  〈 │  〉 ├─────┤     ├─────┤     │  ✓  │  ✕  │  •  │  ∶  │       │
- * ├───────┼─────┼─────┼─────╄─────╃─────┤(TL2)│     │(TL3)├─────╄─────╃─────┼─────┼─────┼───────┤
- * │       │  └  │  ┴  │  ┘  │     │     │     │     │     │  ⇔  │  ⇐  │  ⇒  │  ⇑  │  ⇓  │       │
- * └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘     └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
- *   │     │     │(MO1)│     │(MO4)│                             │(MO4)│     │(MO1)│     │     │
- *   └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
- *                                   │ Ms← │ Ms↑ │ │ Ms↓ │ Ms→ │
- *                             ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
- *                             │     │     │ MLC │ │ MRC │     │     │
- *                             │     │     ├─────┤ ├─────┤     │     │
- *                             │     │     │     │ │     │     │     │
- *                             └─────┴─────┴─────┘ └─────┴─────┴─────┘
- */
-[FMU] = LAYOUT_ergodox(
-        // left hand
-        KC_TRNS,    KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,
-        KC_TRNS,    UC(0x250C),UC(0x252C),UC(0x2510),UC(0x2500),UC(0x2502),KC_TRNS,
-        KC_TRNS,    UC(0x251C),UC(0x253C),UC(0x2524),UC(0x3008),UC(0x3009),
-        KC_TRNS,    UC(0x2514),UC(0x2534),UC(0x2518),KC_TRNS,   KC_TRNS,   KC_TRNS,
-        KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-                                                     KC_MS_L,   KC_MS_U,
-                                                                KC_BTN1,
-                                            KC_TRNS, KC_TRNS,   KC_TRNS,
-        // right hand
-        KC_F7,      KC_F8,     KC_F9,     KC_F10,    KC_F11,    KC_F12,    KC_TRNS,
-        KC_TRNS,    UC(0x2194),UC(0x2190),UC(0x2192),UC(0x2191),UC(0x2193),KC_TRNS,
-                    KC_TRNS,   UC(0x2713),UC(0x2715),UC(0x2022),UC(0x2236),KC_TRNS,
-        KC_TRNS,    UC(0x21D4),UC(0x21D0),UC(0x21D2),UC(0x21D1),UC(0x21D3),KC_TRNS,
-                               KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-        KC_MS_D,    KC_MS_R,
-        KC_BTN2,
-        KC_TRNS,    KC_TRNS,   KC_TRNS
-    ),
-
-/* Layer 4: Neo’s software layer 4 rebuilt in Hardware
- * based on kaimi’s layout
- * ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐     ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
- * │       │     │     │     │     │     │     │     │     │     │     │     │     │     │       │
- * ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤     ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
- * │       │ PgUp│ BSpc│  ↑  │ Del │ PgDn│     │     │     │     │  7  │  8  │  9  │  +  │   −   │
- * ├───────┼─────┼─────┼─────╆─────╅─────┤     │     │     ├─────╆─────╅─────┼─────┼─────┼───────┤
- * │       │ Home│  ←  │  ↓  │  →  │ End ├─────┤     ├─────┤     │  4  │  5  │  6  │  ,  │   .   │
- * ├───────┼─────┼─────┼─────╄─────╃─────┤(TL2)│     │(TL3)├─────╄─────╃─────┼─────┼─────┼───────┤
- * │       │ Esc │ Tab │ Ins │ Ret │ Undo│     │     │     │     │  1  │  2  │  3  │     │       │
- * └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘     └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
- *   │     │     │(MO1)│     │(MO4)│                             │(MO4)│     │(MO1)│     │     │
- *   └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
- *                                   │     │     │ │     │     │
- *                             ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
- *                             │     │     │     │ │     │     │     │
- *                             │     │     ├─────┤ ├─────┤     │     │
- *                             │     │     │     │ │     │     │     │
- *                             └─────┴─────┴─────┘ └─────┴─────┴─────┘
- */
-[NHL] = LAYOUT_ergodox(
-        // left hand
-        KC_NO,      KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-        KC_NO,      KC_PGUP,KC_BSPC,KC_UP,  KC_DEL, KC_PGDN,KC_NO,
-        KC_NO,      KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_END,
-        KC_NO,      KC_ESC, KC_TAB, KC_INS, KC_ENT, KC_UNDO,KC_TRNS,
-        KC_NO,      KC_NO,  KC_TRNS,KC_NO,  KC_TRNS,
-                                                    KC_NO,      KC_NO,
-                                                                KC_NO,
-                                            KC_NO,  KC_NO,      KC_NO,
-        // right hand
-        KC_NO,      KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-        KC_NO,      KC_NO,  KC_7,   KC_8,   KC_9,   DE_PLUS,DE_MINS,
-                    KC_NO,  KC_4,   KC_5,   KC_6,   KC_COMM,KC_DOT,
-        KC_TRNS,    KC_NO,  KC_1,   KC_2,   KC_3,   KC_NO,  KC_NO,
-                            KC_TRNS,KC_NO,  KC_TRNS,KC_NO,  KC_NO,
-        KC_NO,      KC_NO,
-        KC_NO,
-        KC_NO,      KC_NO,  KC_NO
-    ),
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-    set_unicode_input_mode(UC_LNX);
-};
-
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void)
-{
-    uint8_t layer = biton32(layer_state);
-
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-        case FMU:
-            ergodox_right_led_1_on();
-        break;
-        case PMQ:
-            ergodox_right_led_2_on();
-        break;
-        case PMN:
-            ergodox_right_led_3_on();
-        break;
-        default:
-            if(host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) {
-                ergodox_led_all_set(LED_BRIGHTNESS_HI);
-                ergodox_right_led_1_on();
-            }
-            else {
-                ergodox_board_led_off();
-            }
-        break;
-    }
-
-};
-
-
-// Override Unicode start method to use NE_U instead of KC_U
-void unicode_input_start (void) {
-    register_code(KC_LCTL);
-    register_code(KC_LSFT);
-    register_code(NE_U);
-    unregister_code(NE_U);
-    unregister_code(KC_LSFT);
-    unregister_code(KC_LCTL);
-};
diff --git a/layouts/community/ergodox/coderkun_neo2/readme.md b/layouts/community/ergodox/coderkun_neo2/readme.md
deleted file mode 100644
index 0c9290bf08..0000000000
--- a/layouts/community/ergodox/coderkun_neo2/readme.md
+++ /dev/null
@@ -1,129 +0,0 @@
-# coderkun’s Neo2 layout for the ErgoDox EZ
-
-The idea of this layout is to use it for [Neo2](http://www.neo-layout.org) but also provide layers to use QWERTZ with activated Neo driver and to use (basic) Neo when no driver is available (standard QWERTZ driver is active) (e. g. on other computers, in virtual machines) and to make heavily use of thumb keys.
-
-The main goal of the default layer is to provide a complete symmetric layout with each modifier equally placed for both hands (mirror, of course).
-
-It also features a layer for additional keys like F-keys (F1 – F12), some mouse keys and some useful Unicode symbols.
-
-
-## Build
-
-    ```
-    make clean
-    make coderkun_neo2
-    ```
-
-
-## Keymap
-
-0. Default layer for Neo2
-1. Poor man’s QWERTZ
-2. Poor man’s Neo
-3. F-keys, mouse keys und Unicode symbols
-4. Neo’s software layers 4 rebuilt in hardware
-
-
-### Layer 0: Default layer for Neo2
-
-    ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐     ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
-    │  TAB  │  1  │  2  │  3  │  4  │  5  │  `  │     │  ´  │  6  │  7  │  8  │  9  │  0  │ BKSPC │
-    ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤     ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
-    │   Y   │  X  │  V  │  L  │  C  │  W  │ HOM │     │ END │  K  │  H  │  G  │  F  │  Q  │  ß    │
-    ├───────┼─────┼─────┼─────╆─────╅─────┤  E  │     │     ├─────╆─────╅─────┼─────┼─────┼───────┤
-    │ Mod3  │  U  │  I  │  A  │  E  │  O  ├─────┤     ├─────┤  S  │  N  │  R  │  T  │  D  │ Mod3  │
-    ├───────┼─────┼─────┼─────╄─────╃─────┤ TL2 │     │ TL3 ├─────╄─────╃─────┼─────┼─────┼───────┤
-    │ LSHFT │  Ü  │  Ö  │  Ä  │  P  │  Z  │     │     │     │  B  │  M  │  ,  │  .  │  J  │ Shift │
-    └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘     └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
-      │ CTL │ ALT │ MO1 │ Win │ Mod4│                             │ Mod4│ Win │ MO1 │ Alt │ CTL │
-      └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
-                                      │  ←  │  ↑  │ │  ↓  │  →  │
-                                ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
-                                │     │     │  ─  │ │  ─  │     │     │
-                                │ SPC │ RTN ├─────┤ ├─────┤ RTN │ SPC │
-                                │     │     │ HYP │ │ MEH │     │     │
-                                └─────┴─────┴─────┘ └─────┴─────┴─────┘
-
-
-### Layer 1: Poor man’s QWERTZ
-
-    ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐     ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
-    │  TAB  │  1  │  2  │  3  │  4  │  5  │  `  │     │  ´  │  6  │  7  │  8  │  9  │  0  │ BKSPC │
-    ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤     ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
-    │   C   │  P  │  T  │  F  │  K  │  L  │ HOM │     │ END │  B  │  A  │  S  │  G  │  V  │  Y    │
-    ├───────┼─────┼─────┼─────╆─────╅─────┤  E  │     │     ├─────╆─────╅─────┼─────┼─────┼───────┤
-    │ Mod3  │  D  │  H  │  Ö  │  O  │  I  ├─────┤     ├─────┤  U  │  -  │  Z  │  E  │  X  │ Mod3  │
-    ├───────┼─────┼─────┼─────╄─────╃─────┤(TL2)│     │(TL3)├─────╄─────╃─────┼─────┼─────┼───────┤
-    │ LSHFT │  Ä  │  Q  │  R  │  W  │  N  │     │     │     │  J  │  M  │  ,  │  .  │  ẞ  │ Shift │
-    └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘     └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
-      │ CTL │ ALT │ MO1 │ Win │ MO4 │                             │ M04 │ Win │ MO1 │ Alt │ CTL │
-      └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
-                                      │  ←  │  ↑  │ │  ↓  │  →  │
-                                ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
-                                │     │     │  ─  │ │  ─  │     │     │
-                                │ SPC │ RTN ├─────┤ ├─────┤ RTN │ SPC │
-                                │     │     │ HYP │ │ MEH │     │     │
-                                └─────┴─────┴─────┘ └─────┴─────┴─────┘
-
-
-### Layer 2: Poor man’s Neo
-
-    ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐     ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
-    │  TAB  │  1  │  2  │  3  │  4  │  5  │  `  │     │  ´  │  6  │  7  │  8  │  9  │  0  │ BKSPC │
-    ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤     ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
-    │   Y   │  X  │  V  │  L  │  C  │  W  │ HOM │     │ END │  K  │  H  │  G  │  F  │  Q  │  ß    │
-    ├───────┼─────┼─────┼─────╆─────╅─────┤  E  │     │     ├─────╆─────╅─────┼─────┼─────┼───────┤
-    │ Mod3  │  U  │  I  │  A  │  E  │  O  ├─────┤     ├─────┤  S  │  N  │  R  │  T  │  D  │ Mod3  │
-    ├───────┼─────┼─────┼─────╄─────╃─────┤(TL2)│     │(TL3)├─────╄─────╃─────┼─────┼─────┼───────┤
-    │ LSHFT │  Ü  │  Ö  │  Ä  │  P  │  Z  │     │     │     │  B  │  M  │  ,  │  .  │  J  │ Shift │
-    └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘     └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
-      │ CTL │ ALT │ MO1 │ Win │ MO4 │                             │ M04 │ Win │ MO1 │ Alt │ CTL │
-      └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
-                                      │  ←  │  ↑  │ │  ↓  │  →  │
-                                ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
-                                │     │     │  ─  │ │  ─  │     │     │
-                                │ SPC │ RTN ├─────┤ ├─────┤ RTN │ SPC │
-                                │     │     │ HYP │ │ MEH │     │     │
-                                └─────┴─────┴─────┘ └─────┴─────┴─────┘
-
-
-### Layer 3: F-keys, mouse keys und Unicode symbols
-
-    ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐     ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
-    │       │ F1  │ F2  │ F3  │ F4  │ F5  │ F6  │     │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │       │
-    ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤     ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
-    │       │  ┌  │  ┬  │  ┐  │  ─  │  │  │     │     │     │  ↔  │  ←  │  →  │  ↑  │  ↓  │       │
-    ├───────┼─────┼─────┼─────╆─────╅─────┤     │     │     ├─────╆─────╅─────┼─────┼─────┼───────┤
-    │       │  ├  │  ┼  │  ┤  │ 〈  │  〉 ├─────┤     ├─────┤     │  ✓  │  ✕  │  •  │  ∶  │       │
-    ├───────┼─────┼─────┼─────╄─────╃─────┤(TL2)│     │(TL3)├─────╄─────╃─────┼─────┼─────┼───────┤
-    │       │  └  │  ┴  │  ┘  │     │     │     │     │     │  ⇔  │  ⇐  │  ⇒  │  ⇑  │  ⇓  │       │
-    └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘     └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
-      │     │     │(MO1)│     │(MO4)│                             │(MO4)│     │(MO1)│     │     │
-      └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
-                                      │ Ms← │ Ms↑ │ │ Ms↓ │ Ms→ │
-                                ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
-                                │     │     │ MLC │ │ MRC │     │     │
-                                │     │     ├─────┤ ├─────┤     │     │
-                                │     │     │     │ │     │     │     │
-                                └─────┴─────┴─────┘ └─────┴─────┴─────┘
-
-
-### Layer 4: Neo’s software layers 4 rebuilt in hardware
-
-    ┌───────┬─────┬─────┬─────┬─────┬─────┬─────┐     ┌─────┬─────┬─────┬─────┬─────┬─────┬───────┐
-    │       │     │     │     │     │     │     │     │     │     │     │     │     │     │       │
-    ├───────┼─────┼─────┼─────┼─────┼─────┼─────┤     ├─────┼─────┼─────┼─────┼─────┼─────┼───────┤
-    │       │ PgUp│ BSpc│  ↑  │ Del │ PgDn│     │     │     │     │  7  │  8  │  9  │  +  │   −   │
-    ├───────┼─────┼─────┼─────╆─────╅─────┤     │     │     ├─────╆─────╅─────┼─────┼─────┼───────┤
-    │       │ Home│  ←  │  ↓  │  →  │ End ├─────┤     ├─────┤     │  4  │  5  │  6  │  ,  │   .   │
-    ├───────┼─────┼─────┼─────╄─────╃─────┤(TL2)│     │(TL3)├─────╄─────╃─────┼─────┼─────┼───────┤
-    │       │ Esc │ Tab │ Ins │ Ret │ Undo│     │     │     │     │  1  │  2  │  3  │     │       │
-    └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘     └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘
-      │     │     │(MO1)│     │(MO4)│                             │(MO4)│     │(MO1)│     │     │
-      └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘
-                                      │     │     │ │     │     │
-                                ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐
-                                │     │     │     │ │     │     │     │
-                                │     │     ├─────┤ ├─────┤     │     │
-                                │     │     │     │ │     │     │     │
-                                └─────┴─────┴─────┘ └─────┴─────┴─────┘
diff --git a/layouts/community/ergodox/coderkun_neo2/rules.mk b/layouts/community/ergodox/coderkun_neo2/rules.mk
deleted file mode 100644
index b0fe90ab1d..0000000000
--- a/layouts/community/ergodox/coderkun_neo2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-SLEEP_LED_ENABLE = no
-UNICODE_ENABLE = yes
-COMMAND_ENABLE = no

From 77062e9a36b3167ea1ff747e5577a67969273c31 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 24 Jan 2022 08:49:36 +1100
Subject: [PATCH 367/867] Add L432, L442. (#16016)

---
 builddefs/mcu_selection.mk                    |  37 +++
 data/schemas/keyboard.jsonschema              |   2 +-
 docs/compatible_microcontrollers.md           |   2 +
 .../handwired/onekey/nucleo_l432kc/config.h   |  21 ++
 .../handwired/onekey/nucleo_l432kc/readme.md  |   5 +
 .../handwired/onekey/nucleo_l432kc/rules.mk   |   5 +
 lib/python/qmk/constants.py                   |   2 +-
 .../GENERIC_STM32_L432XC/board/board.mk       |   9 +
 .../GENERIC_STM32_L432XC/configs/config.h     |  10 +
 .../GENERIC_STM32_L432XC/configs/mcuconf.h    | 267 ++++++++++++++++++
 10 files changed, 358 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/handwired/onekey/nucleo_l432kc/config.h
 create mode 100644 keyboards/handwired/onekey/nucleo_l432kc/readme.md
 create mode 100644 keyboards/handwired/onekey/nucleo_l432kc/rules.mk
 create mode 100644 platforms/chibios/boards/GENERIC_STM32_L432XC/board/board.mk
 create mode 100644 platforms/chibios/boards/GENERIC_STM32_L432XC/configs/config.h
 create mode 100644 platforms/chibios/boards/GENERIC_STM32_L432XC/configs/mcuconf.h

diff --git a/builddefs/mcu_selection.mk b/builddefs/mcu_selection.mk
index 3a5768de73..9fdd22c3b6 100644
--- a/builddefs/mcu_selection.mk
+++ b/builddefs/mcu_selection.mk
@@ -502,6 +502,43 @@ ifneq ($(findstring STM32G474, $(MCU)),)
   STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
 endif
 
+ifneq (,$(filter $(MCU),STM32L432 STM32L442))
+  # Cortex version
+  MCU = cortex-m4
+
+  # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
+  ARMV = 7
+
+  ## chip/board settings
+  # - the next two should match the directories in
+  #   <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
+  MCU_FAMILY = STM32
+  MCU_SERIES = STM32L4xx
+
+  # Linker script to use
+  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
+  #   or <keyboard_dir>/ld/
+  MCU_LDSCRIPT ?= STM32L432xC
+
+  # Startup code to use
+  #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
+  MCU_STARTUP ?= stm32l4xx
+
+  # Board: it should exist either in <chibios>/os/hal/boards/,
+  # <keyboard_dir>/boards/, or drivers/boards/
+  BOARD ?= GENERIC_STM32_L432XC
+
+  PLATFORM_NAME ?= platform_l432
+
+  USE_FPU ?= yes
+
+  # UF2 settings
+  UF2_FAMILY ?= STM32L4
+
+  # Bootloader address for STM32 DFU
+  STM32_BOOTLOADER_ADDRESS ?= 0x1FFF0000
+endif
+
 ifneq (,$(filter $(MCU),STM32L433 STM32L443))
   # Cortex version
   MCU = cortex-m4
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index f7b05d6655..547df94d1f 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -13,7 +13,7 @@
         },
         "processor": {
             "type": "string",
-            "enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK66FX1M0", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F405", "STM32F407", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "STM32L412", "STM32L422", "STM32L433", "STM32L443", "GD32VF103", "WB32F3G71", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"]
+            "enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK66FX1M0", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F405", "STM32F407", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "STM32L412", "STM32L422", "STM32L432", "STM32L433", "STM32L442", "STM32L443", "GD32VF103", "WB32F3G71", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"]
         },
         "audio": {
             "type": "object",
diff --git a/docs/compatible_microcontrollers.md b/docs/compatible_microcontrollers.md
index b74d49d0e3..1c5e37f724 100644
--- a/docs/compatible_microcontrollers.md
+++ b/docs/compatible_microcontrollers.md
@@ -43,7 +43,9 @@ You can also use any ARM chip with USB that [ChibiOS](https://www.chibios.org) s
  * [STM32G474](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x4.html)
  * [STM32L412](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x2.html)
  * [STM32L422](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x2.html)
+ * [STM32L432](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x2.html)
  * [STM32L433](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x3.html)
+ * [STM32L442](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x2.html)
  * [STM32L443](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x3.html)
 
 ### WestBerryTech (WB32)
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/config.h b/keyboards/handwired/onekey/nucleo_l432kc/config.h
new file mode 100644
index 0000000000..7aa74f6682
--- /dev/null
+++ b/keyboards/handwired/onekey/nucleo_l432kc/config.h
@@ -0,0 +1,21 @@
+// Copyright 2021 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "config_common.h"
+
+#define PRODUCT Onekey L432KC
+
+#define MATRIX_COL_PINS { A2 }
+#define MATRIX_ROW_PINS { A1 }
+#define UNUSED_PINS
+
+#define BACKLIGHT_PIN         B8
+#define BACKLIGHT_PWM_DRIVER  PWMD4
+#define BACKLIGHT_PWM_CHANNEL 3
+#define BACKLIGHT_PAL_MODE    2
+
+#define RGB_DI_PIN A0
+#define RGB_CI_PIN B13
+
+#define ADC_PIN A0
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/readme.md b/keyboards/handwired/onekey/nucleo_l432kc/readme.md
new file mode 100644
index 0000000000..c7d13cb973
--- /dev/null
+++ b/keyboards/handwired/onekey/nucleo_l432kc/readme.md
@@ -0,0 +1,5 @@
+# STM32 Nucleo-L432 onekey
+
+To trigger keypress, short together pins *A1* and *A2*.
+
+You'll also need to connect `VIN`, `GND`, USB `D+` to `PA12`/`D2`, and USB `D-` to `PA11`/`D10`.
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/rules.mk b/keyboards/handwired/onekey/nucleo_l432kc/rules.mk
new file mode 100644
index 0000000000..64dae7746e
--- /dev/null
+++ b/keyboards/handwired/onekey/nucleo_l432kc/rules.mk
@@ -0,0 +1,5 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index 433b110523..00e453189f 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -13,7 +13,7 @@ QMK_FIRMWARE_UPSTREAM = 'qmk/qmk_firmware'
 MAX_KEYBOARD_SUBFOLDERS = 5
 
 # Supported processor types
-CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66FX1M0', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L433', 'STM32L443', 'GD32VF103', 'WB32F3G71'
+CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66FX1M0', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F405', 'STM32F407', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L432', 'STM32L433', 'STM32L442', 'STM32L443', 'GD32VF103', 'WB32F3G71'
 LUFA_PROCESSORS = 'at90usb162', 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None
 VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85'
 
diff --git a/platforms/chibios/boards/GENERIC_STM32_L432XC/board/board.mk b/platforms/chibios/boards/GENERIC_STM32_L432XC/board/board.mk
new file mode 100644
index 0000000000..1250385eb8
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_STM32_L432XC/board/board.mk
@@ -0,0 +1,9 @@
+# List of all the board related files.
+BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO32_L432KC/board.c
+
+# Required include directories
+BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO32_L432KC
+
+# Shared variables
+ALLCSRC += $(BOARDSRC)
+ALLINC  += $(BOARDINC)
diff --git a/platforms/chibios/boards/GENERIC_STM32_L432XC/configs/config.h b/platforms/chibios/boards/GENERIC_STM32_L432XC/configs/config.h
new file mode 100644
index 0000000000..b1838b30a8
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_STM32_L432XC/configs/config.h
@@ -0,0 +1,10 @@
+// Copyright 2021 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+// Fixup equivalent usages within QMK as the base board definitions only go up to high
+#define PAL_STM32_OSPEED_HIGHEST PAL_STM32_OSPEED_HIGH
+
+#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#endif
diff --git a/platforms/chibios/boards/GENERIC_STM32_L432XC/configs/mcuconf.h b/platforms/chibios/boards/GENERIC_STM32_L432XC/configs/mcuconf.h
new file mode 100644
index 0000000000..707134d49e
--- /dev/null
+++ b/platforms/chibios/boards/GENERIC_STM32_L432XC/configs/mcuconf.h
@@ -0,0 +1,267 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * STM32L4xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 15...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#ifndef MCUCONF_H
+#define MCUCONF_H
+
+#define STM32L4xx_MCUCONF
+#define STM32L432_MCUCONF
+#define STM32L433_MCUCONF
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_VOS                           STM32_VOS_RANGE1
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI16_ENABLED                 TRUE
+#define STM32_HSI48_ENABLED                 TRUE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   FALSE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_MSIPLL_ENABLED                FALSE
+#define STM32_MSIRANGE                      STM32_MSIRANGE_4M
+#define STM32_MSISRANGE                     STM32_MSISRANGE_4M
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSI16
+#define STM32_PLLM_VALUE                    1
+#define STM32_PLLN_VALUE                    10
+#define STM32_PLLPDIV_VALUE                 0
+#define STM32_PLLP_VALUE                    7
+#define STM32_PLLQ_VALUE                    2
+#define STM32_PLLR_VALUE                    2
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE1                         STM32_PPRE1_DIV1
+#define STM32_PPRE2                         STM32_PPRE2_DIV1
+#define STM32_STOPWUCK                      STM32_STOPWUCK_MSI
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_MCOPRE                        STM32_MCOPRE_DIV1
+#define STM32_LSCOSEL                       STM32_LSCOSEL_NOCLOCK
+#define STM32_PLLSAI1N_VALUE                24
+#define STM32_PLLSAI1PDIV_VALUE             0
+#define STM32_PLLSAI1P_VALUE                7
+#define STM32_PLLSAI1Q_VALUE                2
+#define STM32_PLLSAI1R_VALUE                2
+
+/*
+ * Peripherals clock sources.
+ */
+#define STM32_USART1SEL                     STM32_USART1SEL_SYSCLK
+#define STM32_USART2SEL                     STM32_USART2SEL_SYSCLK
+#define STM32_LPUART1SEL                    STM32_LPUART1SEL_SYSCLK
+#define STM32_I2C1SEL                       STM32_I2C1SEL_SYSCLK
+#define STM32_I2C3SEL                       STM32_I2C3SEL_SYSCLK
+#define STM32_LPTIM1SEL                     STM32_LPTIM1SEL_PCLK1
+#define STM32_LPTIM2SEL                     STM32_LPTIM2SEL_PCLK1
+#define STM32_SAI1SEL                       STM32_SAI1SEL_OFF
+#define STM32_CLK48SEL                      STM32_CLK48SEL_HSI48
+#define STM32_ADCSEL                        STM32_ADCSEL_SYSCLK
+#define STM32_SWPMI1SEL                     STM32_SWPMI1SEL_PCLK1
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+
+/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_PRIORITY            6
+#define STM32_IRQ_EXTI1_PRIORITY            6
+#define STM32_IRQ_EXTI2_PRIORITY            6
+#define STM32_IRQ_EXTI3_PRIORITY            6
+#define STM32_IRQ_EXTI4_PRIORITY            6
+#define STM32_IRQ_EXTI5_9_PRIORITY          6
+#define STM32_IRQ_EXTI10_15_PRIORITY        6
+#define STM32_IRQ_EXTI1635_38_PRIORITY      6
+#define STM32_IRQ_EXTI18_PRIORITY           6
+#define STM32_IRQ_EXTI19_PRIORITY           6
+#define STM32_IRQ_EXTI20_PRIORITY           6
+#define STM32_IRQ_EXTI21_22_PRIORITY        15
+
+#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY   7
+#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY    7
+#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7
+#define STM32_IRQ_TIM1_CC_PRIORITY          7
+#define STM32_IRQ_TIM2_PRIORITY             7
+#define STM32_IRQ_TIM6_PRIORITY             7
+#define STM32_IRQ_TIM7_PRIORITY             7
+
+#define STM32_IRQ_USART1_PRIORITY           12
+#define STM32_IRQ_USART2_PRIORITY           12
+#define STM32_IRQ_LPUART1_PRIORITY          12
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_COMPACT_SAMPLES           FALSE
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_ADC12_IRQ_PRIORITY        5
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     5
+#define STM32_ADC_ADC123_CLOCK_MODE         ADC_CCR_CKMODE_AHB_DIV1
+#define STM32_ADC_ADC123_PRESC              ADC_CCR_PRESC_DIV2
+
+/*
+ * CAN driver system settings.
+ */
+#define STM32_CAN_USE_CAN1                  FALSE
+#define STM32_CAN_CAN1_IRQ_PRIORITY         11
+
+/*
+ * DAC driver system settings.
+ */
+#define STM32_DAC_DUAL_MODE                 FALSE
+#define STM32_DAC_USE_DAC1_CH1              FALSE
+#define STM32_DAC_USE_DAC1_CH2              FALSE
+#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY     10
+#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY     10
+#define STM32_DAC_DAC1_CH1_DMA_PRIORITY     2
+#define STM32_DAC_DAC1_CH2_DMA_PRIORITY     2
+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(2, 4)
+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM6                  FALSE
+#define STM32_GPT_USE_TIM7                  FALSE
+#define STM32_GPT_USE_TIM15                 FALSE
+#define STM32_GPT_USE_TIM16                 FALSE
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  FALSE
+#define STM32_I2C_USE_I2C3                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_I2C3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
+#define STM32_I2C_I2C3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
+#define STM32_I2C_I2C1_IRQ_PRIORITY         5
+#define STM32_I2C_I2C3_IRQ_PRIORITY         5
+#define STM32_I2C_I2C1_DMA_PRIORITY         3
+#define STM32_I2C_I2C3_DMA_PRIORITY         3
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM15                 FALSE
+#define STM32_ICU_USE_TIM16                 FALSE
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM15                 FALSE
+#define STM32_PWM_USE_TIM16                 FALSE
+
+/*
+ * RTC driver system settings.
+ */
+#define STM32_RTC_PRESA_VALUE               32
+#define STM32_RTC_PRESS_VALUE               1024
+#define STM32_RTC_CR_INIT                   0
+#define STM32_RTC_TAMPCR_INIT               0
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USE_LPUART1            FALSE
+#define STM32_SERIAL_USART1_PRIORITY        12
+#define STM32_SERIAL_USART2_PRIORITY        12
+#define STM32_SERIAL_LPUART1_PRIORITY       12
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI3                  FALSE
+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 3)
+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 4)
+#define STM32_SPI_SPI3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 1)
+#define STM32_SPI_SPI3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 2)
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI3_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         10
+#define STM32_SPI_SPI3_IRQ_PRIORITY         10
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               8
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * TRNG driver system settings.
+ */
+#define STM32_TRNG_USE_RNG1                 FALSE
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USART1_RX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 7)
+#define STM32_UART_USART1_TX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 6)
+#define STM32_UART_USART2_RX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 6)
+#define STM32_UART_USART2_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 7)
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_HP_IRQ_PRIORITY      13
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+/*
+ * WDG driver system settings.
+ */
+#define STM32_WDG_USE_IWDG                  FALSE
+
+/*
+ * WSPI driver system settings.
+ */
+#define STM32_WSPI_USE_QUADSPI1             FALSE
+#define STM32_WSPI_QUADSPI1_DMA_STREAM      STM32_DMA_STREAM_ID(2, 7)
+#define STM32_WSPI_QUADSPI1_PRESCALER_VALUE 1
+
+#endif /* MCUCONF_H */

From 7d6e15423be8c34dd456cd2c057f50f5c3d0a70c Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 24 Jan 2022 09:15:09 +1100
Subject: [PATCH 368/867] Add some clarity regarding new board definitions
 (#16018)

---
 docs/pr_checklist.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index 25f3d7662e..1bd6200b82 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -110,6 +110,8 @@ Also, specific to ChibiOS:
     - a lot of the time, an equivalent Nucleo board can be used with a different flash size or slightly different model in the same family
         - example: For an STM32L082KZ, given the similarity to an STM32L073RZ, you can use `BOARD = ST_NUCLEO64_L073RZ` in rules.mk
     - QMK is migrating to not having custom board definitions if at all possible, due to the ongoing maintenance burden when upgrading ChibiOS
+- New board definitions must not be embedded in a keyboard PR
+    - See _Core PRs_ below for the procedure for adding a new board to QMK
 - if a board definition is unavoidable, `board.c` must have a standard `__early_init()` (as per normal ChibiOS board defs) and an empty `boardInit()`:
     - see Arm/ChibiOS [early initialization](https://docs.qmk.fm/#/platformdev_chibios_earlyinit?id=board-init)
     - `__early_init()` should be replaced by either `early_hardware_init_pre()` or `early_hardware_init_post()` as appropriate
@@ -118,7 +120,7 @@ Also, specific to ChibiOS:
 ## Core PRs
 
 - must now target `develop` branch, which will subsequently be merged back to `master` on the breaking changes timeline
-- any support for new hardware now requires a corresponding test board under `keyboards/handwired/onekey`
+- any new boards adding support for new hardware now requires a corresponding test board under `keyboards/handwired/onekey`
     - for new MCUs, a new "child" keyboard should be added that targets your newly-added MCU, so that builds can be verified
     - for new hardware support such as display panels, core-side matrix implementations, or other peripherals, an associated keymap should be provided
     - if an existing keymap exists that can leverage this functionality this may not be required (e.g. a new RGB driver chip, supported by the `rgb` keymap) -- consult with the QMK Collaborators on Discord to determine if there is sufficient overlap already

From 0015f15f9ad10a84cf9a8071fc4543056057ddec Mon Sep 17 00:00:00 2001
From: Tobias Minn <tobias.minn@gmail.com>
Date: Mon, 24 Jan 2022 02:32:59 +0100
Subject: [PATCH 369/867] DZ60 - QMK Configurator fix for ISO DE Arrow layout
 (#15941)

---
 keyboards/dz60/info.json | 72 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/keyboards/dz60/info.json b/keyboards/dz60/info.json
index bb607a4a29..9673315168 100644
--- a/keyboards/dz60/info.json
+++ b/keyboards/dz60/info.json
@@ -793,6 +793,78 @@
                 {"x": 13.75, "y": 4, "w": 1.25}
             ]
         },
+        "LAYOUT_60_iso_arrow_one_bksp": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w":2},
+
+                {"x": 0, "y": 1, "w":1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                
+                {"x": 0, "y": 2, "w":1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 1, "w":1.25, "h":2},
+
+                {"x": 0, "y": 3, "w":1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3, "w":1.75},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+
+                {"x": 0, "y": 4, "w":1.25},
+                {"x": 1.25, "y": 4, "w":1.25},
+                {"x": 2.5, "y": 4, "w":1.25},
+                {"x": 3.75, "y": 4, "w":6.25},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4}
+            ]
+        },
         "LAYOUT_60_hhkb": {
             "layout": [
                 {"x": 0, "y": 0},

From 0c3c34e589e7b6cfe52b94be2c05197c3baaf444 Mon Sep 17 00:00:00 2001
From: fOmey <pauly.galea@gmail.com>
Date: Mon, 24 Jan 2022 12:37:26 +1100
Subject: [PATCH 370/867] RGB matrix effects definiton fix (#15930)

* RGB matrix effects definiton fix

* Move LTO to board rules & add some comments

* Whitespace fix

* Whitespace fix 2

Co-authored-by: Ryan <fauxpark@gmail.com>

* Whitespace fix 3

Co-authored-by: Ryan <fauxpark@gmail.com>

* Comment fix

Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
---
 keyboards/atlantis/ak81_ve/config.h           | 84 +++++++++----------
 .../atlantis/ak81_ve/keymaps/via/rules.mk     |  1 -
 keyboards/atlantis/ak81_ve/rules.mk           |  5 +-
 3 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index 0167d0e184..44507c47f7 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -71,47 +71,47 @@
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 130
 #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 
-#define RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
-#define RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
-#define RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
-#define RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
-#define RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
-#define RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
-#define RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
-#define RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
-#define RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
-#define RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
-#define RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
-#define RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
-#define RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
-#define RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
-#define RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
-#define RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradent Chevron shapped scrolling left to right
-#define RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
-#define RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
-#define RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
-#define RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
-#define RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
-#define RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
-#define RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
-#define RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight ammount at the same time, then shifts back
-#define RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight ammount in a wave to the right, then back to the left
-#define RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight ammount and then back down in a wave to the right
-#define RGB_MATRIX_PIXEL_FRACTAL             // Single hue fractal filled keys pulsing horizontally out to edges
-#define RGB_MATRIX_PIXEL_RAIN                // Randomly light keys with random hues
-#define RGB_MATRIX_TYPING_HEATMAP            // How hot is your WPM!
-#define RGB_MATRIX_DIGITAL_RAIN              // That famous computer simulation
-#define RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
-#define RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
-#define RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
-#define RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
-#define RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
-#define RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
-#define RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
-#define RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
-#define RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
-#define RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
-#define RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
-#define RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes
+#define ENABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation
+#define ENABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
+#define ENABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness
+#define ENABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradent Chevron shapped scrolling left to right
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
+#define ENABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard
+#define ENABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation
+#define ENABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight ammount at the same time, then shifts back
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight ammount in a wave to the right, then back to the left
+#define ENABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight ammount and then back down in a wave to the right
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL             // Single hue fractal filled keys pulsing horizontally out to edges
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN                // Randomly light keys with random hues
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP            // How hot is your WPM!
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN              // That famous computer simulation
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
 
 #endif
\ No newline at end of file
diff --git a/keyboards/atlantis/ak81_ve/keymaps/via/rules.mk b/keyboards/atlantis/ak81_ve/keymaps/via/rules.mk
index 041588872a..f74ca2c244 100644
--- a/keyboards/atlantis/ak81_ve/keymaps/via/rules.mk
+++ b/keyboards/atlantis/ak81_ve/keymaps/via/rules.mk
@@ -1,4 +1,3 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
 
 SRC += encoder_actions.c
\ No newline at end of file
diff --git a/keyboards/atlantis/ak81_ve/rules.mk b/keyboards/atlantis/ak81_ve/rules.mk
index 45d044f9fc..f0a3589a4b 100644
--- a/keyboards/atlantis/ak81_ve/rules.mk
+++ b/keyboards/atlantis/ak81_ve/rules.mk
@@ -15,8 +15,9 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes		# Enable RGB matrix effects
-RGB_MATRIX_DRIVER = WS2812
 AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+LTO_ENABLE = yes
 DYNAMIC_MACRO_ENABLE = yes
 ENCODER_ENABLE = yes
\ No newline at end of file

From 8f22819d47a1eee0277e248c677637e9f839cd70 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 25 Jan 2022 01:18:05 +1100
Subject: [PATCH 371/867] Default EEPROM implementation should be transient
 when not implemented. Removed the equivalent eeprom_teensy fallback. (#16020)

---
 common_features.mk                | 18 ++++++++--
 platforms/chibios/eeprom_teensy.c | 59 +------------------------------
 2 files changed, 17 insertions(+), 60 deletions(-)

diff --git a/common_features.mk b/common_features.mk
index b13f9a45d2..d07c137066 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -158,47 +158,61 @@ ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
 else
   OPT_DEFS += -DEEPROM_ENABLE
   ifeq ($(strip $(EEPROM_DRIVER)), custom)
+    # Custom EEPROM implementation -- only needs to implement init/erase/read_block/write_block
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_CUSTOM
     COMMON_VPATH += $(DRIVER_PATH)/eeprom
     SRC += eeprom_driver.c
   else ifeq ($(strip $(EEPROM_DRIVER)), i2c)
+    # External I2C EEPROM implementation
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_I2C
     COMMON_VPATH += $(DRIVER_PATH)/eeprom
     QUANTUM_LIB_SRC += i2c_master.c
     SRC += eeprom_driver.c eeprom_i2c.c
   else ifeq ($(strip $(EEPROM_DRIVER)), spi)
+    # External SPI EEPROM implementation
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_SPI
     COMMON_VPATH += $(DRIVER_PATH)/eeprom
     QUANTUM_LIB_SRC += spi_master.c
     SRC += eeprom_driver.c eeprom_spi.c
   else ifeq ($(strip $(EEPROM_DRIVER)), transient)
+    # Transient EEPROM implementation -- no data storage but provides runtime area for it
     OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
     COMMON_VPATH += $(DRIVER_PATH)/eeprom
     SRC += eeprom_driver.c eeprom_transient.c
   else ifeq ($(strip $(EEPROM_DRIVER)), vendor)
+    # Vendor-implemented EEPROM
     OPT_DEFS += -DEEPROM_VENDOR
     ifeq ($(PLATFORM),AVR)
       # Automatically provided by avr-libc, nothing required
     else ifeq ($(PLATFORM),CHIBIOS)
       ifneq ($(filter STM32F3xx_% STM32F1xx_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
+        # Emulated EEPROM
         OPT_DEFS += -DEEPROM_DRIVER
         COMMON_VPATH += $(DRIVER_PATH)/eeprom
         SRC += eeprom_driver.c
         SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c
         SRC += $(PLATFORM_COMMON_DIR)/flash_stm32.c
       else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
+        # True EEPROM on STM32L0xx, L1xx
         OPT_DEFS += -DEEPROM_DRIVER
         COMMON_VPATH += $(DRIVER_PATH)/eeprom
         COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
         SRC += eeprom_driver.c
         SRC += eeprom_stm32_L0_L1.c
+      else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
+        # Teensy EEPROM implementations
+        SRC += eeprom_teensy.c
       else
-        # This will effectively work the same as "transient" if not supported by the chip
-        SRC += $(PLATFORM_COMMON_DIR)/eeprom_teensy.c
+        # Fall back to transient, i.e. non-persistent
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_TRANSIENT
+        COMMON_VPATH += $(DRIVER_PATH)/eeprom
+        SRC += eeprom_driver.c eeprom_transient.c
       endif
     else ifeq ($(PLATFORM),ARM_ATSAM)
+      # arm_atsam EEPROM
       SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
     else ifeq ($(PLATFORM),TEST)
+      # Test harness "EEPROM"
       SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
     endif
   endif
diff --git a/platforms/chibios/eeprom_teensy.c b/platforms/chibios/eeprom_teensy.c
index 4aaf665269..2093f9b4b2 100644
--- a/platforms/chibios/eeprom_teensy.c
+++ b/platforms/chibios/eeprom_teensy.c
@@ -524,64 +524,7 @@ void eeprom_write_block(const void *buf, void *addr, uint32_t len) {
 }
 
 #else
-// No EEPROM supported, so emulate it
-
-#    ifndef EEPROM_SIZE
-#        include "eeconfig.h"
-#        define EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4)  // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
-#    endif
-__attribute__((aligned(4))) static uint8_t buffer[EEPROM_SIZE];
-
-uint8_t eeprom_read_byte(const uint8_t *addr) {
-    uint32_t offset = (uint32_t)addr;
-    return buffer[offset];
-}
-
-void eeprom_write_byte(uint8_t *addr, uint8_t value) {
-    uint32_t offset = (uint32_t)addr;
-    buffer[offset]  = value;
-}
-
-uint16_t eeprom_read_word(const uint16_t *addr) {
-    const uint8_t *p = (const uint8_t *)addr;
-    return eeprom_read_byte(p) | (eeprom_read_byte(p + 1) << 8);
-}
-
-uint32_t eeprom_read_dword(const uint32_t *addr) {
-    const uint8_t *p = (const uint8_t *)addr;
-    return eeprom_read_byte(p) | (eeprom_read_byte(p + 1) << 8) | (eeprom_read_byte(p + 2) << 16) | (eeprom_read_byte(p + 3) << 24);
-}
-
-void eeprom_read_block(void *buf, const void *addr, size_t len) {
-    const uint8_t *p    = (const uint8_t *)addr;
-    uint8_t *      dest = (uint8_t *)buf;
-    while (len--) {
-        *dest++ = eeprom_read_byte(p++);
-    }
-}
-
-void eeprom_write_word(uint16_t *addr, uint16_t value) {
-    uint8_t *p = (uint8_t *)addr;
-    eeprom_write_byte(p++, value);
-    eeprom_write_byte(p, value >> 8);
-}
-
-void eeprom_write_dword(uint32_t *addr, uint32_t value) {
-    uint8_t *p = (uint8_t *)addr;
-    eeprom_write_byte(p++, value);
-    eeprom_write_byte(p++, value >> 8);
-    eeprom_write_byte(p++, value >> 16);
-    eeprom_write_byte(p, value >> 24);
-}
-
-void eeprom_write_block(const void *buf, void *addr, size_t len) {
-    uint8_t *      p   = (uint8_t *)addr;
-    const uint8_t *src = (const uint8_t *)buf;
-    while (len--) {
-        eeprom_write_byte(p++, *src++);
-    }
-}
-
+#    error Unsupported Teensy EEPROM.
 #endif /* chip selection */
 // The update functions just calls write for now, but could probably be optimized
 

From 6cc4e32e61a275a624061fd9be643973476cad9c Mon Sep 17 00:00:00 2001
From: tofurky <4065513+tofurky@users.noreply.github.com>
Date: Mon, 24 Jan 2022 10:57:50 -0500
Subject: [PATCH 372/867] [Keyboard] Fix frosty_flake LED pin assignment
 (#16000)

4c080be seemed to swap the LED pins for the 20130602 and 20140521
variants. 20140521 is fine now, 20130602 untested but per the
schematics at https://deskthority.net/wiki/Costar_replacement_controllers
it seems correct.
---
 keyboards/bpiphany/frosty_flake/20130602/20130602.c | 8 ++++----
 keyboards/bpiphany/frosty_flake/20140521/20140521.c | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/keyboards/bpiphany/frosty_flake/20130602/20130602.c b/keyboards/bpiphany/frosty_flake/20130602/20130602.c
index be4e1a3124..2c875d1a7f 100644
--- a/keyboards/bpiphany/frosty_flake/20130602/20130602.c
+++ b/keyboards/bpiphany/frosty_flake/20130602/20130602.c
@@ -1,9 +1,9 @@
 #include "frosty_flake.h"
 
 void keyboard_pre_init_kb() {
-    setPinOutput(B7); // num lock
+    setPinOutput(B7); // caps lock
     writePinHigh(B7);
-    setPinOutput(C5); // caps lock
+    setPinOutput(C5); // num lock
     writePinHigh(C7);
     setPinOutput(C6); // scroll lock
     writePinHigh(C6);
@@ -16,8 +16,8 @@ bool led_update_kb(led_t usb_led) {
     if (!led_update_user(usb_led))
         return true;
 
-    writePin(C5, !usb_led.caps_lock);
-    writePin(B7, !usb_led.num_lock);
+    writePin(C5, !usb_led.num_lock);
+    writePin(B7, !usb_led.caps_lock);
     writePin(C6, !usb_led.scroll_lock);
 
     return true;
diff --git a/keyboards/bpiphany/frosty_flake/20140521/20140521.c b/keyboards/bpiphany/frosty_flake/20140521/20140521.c
index cd425cffa1..be4e1a3124 100644
--- a/keyboards/bpiphany/frosty_flake/20140521/20140521.c
+++ b/keyboards/bpiphany/frosty_flake/20140521/20140521.c
@@ -16,8 +16,8 @@ bool led_update_kb(led_t usb_led) {
     if (!led_update_user(usb_led))
         return true;
 
-    writePin(B7, !usb_led.caps_lock);
-    writePin(C5, !usb_led.num_lock);
+    writePin(C5, !usb_led.caps_lock);
+    writePin(B7, !usb_led.num_lock);
     writePin(C6, !usb_led.scroll_lock);
 
     return true;

From 1d11ae3087f583c4f4756169802b33adea71ed94 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 25 Jan 2022 08:22:20 +1100
Subject: [PATCH 373/867] Rip out old macro and action_function system (#16025)

* Rip out old macro and action_function system

* Update quantum/action_util.c

Co-authored-by: Joel Challis <git@zvecr.com>
---
 common_features.mk                            |   1 -
 data/templates/avr/config.h                   |   4 -
 data/templates/ps2avrgb/config.h              |   4 -
 docs/config_options.md                        |   5 -
 docs/feature_haptic_feedback.md               |   3 -
 docs/keymap.md                                |   2 +-
 .../deltasplit75/keymaps/default/keymap.c     |   4 +-
 keyboards/mechmini/v2/keymaps/via/keymap.c    |   2 +-
 quantum/action.c                              |  26 +---
 quantum/action.h                              |  17 ---
 quantum/action_code.h                         |  32 -----
 quantum/action_macro.c                        |  93 -------------
 quantum/action_macro.h                        | 123 ------------------
 quantum/action_util.c                         |  33 +----
 quantum/action_util.h                         |   7 -
 quantum/keycode.h                             |  43 +-----
 quantum/keymap.h                              |   5 -
 quantum/keymap_common.c                       |  41 ------
 quantum/process_keycode/process_haptic.c      |   3 -
 quantum/quantum_keycodes.h                    |  10 --
 tests/basic/test_macro.cpp                    |  88 -------------
 21 files changed, 8 insertions(+), 538 deletions(-)
 delete mode 100644 quantum/action_macro.c
 delete mode 100644 quantum/action_macro.h
 delete mode 100644 tests/basic/test_macro.cpp

diff --git a/common_features.mk b/common_features.mk
index d07c137066..e00f95f8e4 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -20,7 +20,6 @@ QUANTUM_SRC += \
     $(QUANTUM_DIR)/led.c \
     $(QUANTUM_DIR)/action.c \
     $(QUANTUM_DIR)/action_layer.c \
-    $(QUANTUM_DIR)/action_macro.c \
     $(QUANTUM_DIR)/action_tapping.c \
     $(QUANTUM_DIR)/action_util.c \
     $(QUANTUM_DIR)/eeconfig.c \
diff --git a/data/templates/avr/config.h b/data/templates/avr/config.h
index 7c15e8e704..97f7bb6fad 100644
--- a/data/templates/avr/config.h
+++ b/data/templates/avr/config.h
@@ -129,10 +129,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/data/templates/ps2avrgb/config.h b/data/templates/ps2avrgb/config.h
index 876a60252f..ef29da0de0 100644
--- a/data/templates/ps2avrgb/config.h
+++ b/data/templates/ps2avrgb/config.h
@@ -119,10 +119,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/docs/config_options.md b/docs/config_options.md
index b661b55ee0..7657fae02e 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -124,10 +124,6 @@ If you define these options you will disable the associated feature, which can s
   * disable tap dance and other tapping features
 * `#define NO_ACTION_ONESHOT`
   * disable one-shot modifiers
-* `#define NO_ACTION_MACRO`
-  * disable old-style macro handling using `MACRO()`, `action_get_macro()` _(deprecated)_
-* `#define NO_ACTION_FUNCTION`
-  * disable old-style function handling using `fn_actions`, `action_function()` _(deprecated)_
 
 ## Features That Can Be Enabled
 
@@ -383,7 +379,6 @@ This is a [make](https://www.gnu.org/software/make/manual/make.html) file that i
   * A list of [layouts](feature_layouts.md) this keyboard supports.
 * `LTO_ENABLE`
   * Enables Link Time Optimization (LTO) when compiling the keyboard.  This makes the process take longer, but it can significantly reduce the compiled size (and since the firmware is small, the added time is not noticeable).
-However, this will automatically disable the legacy TMK Macros and Functions features, as these break when LTO is enabled.  It does this by automatically defining `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION`.  (Note: This does not affect QMK [Macros](feature_macros.md) and [Layers](feature_layers.md).)
 
 ## AVR MCU Options
 * `MCU = atmega32u4`
diff --git a/docs/feature_haptic_feedback.md b/docs/feature_haptic_feedback.md
index bbdf7e122c..63ac4305ff 100644
--- a/docs/feature_haptic_feedback.md
+++ b/docs/feature_haptic_feedback.md
@@ -191,9 +191,6 @@ With the entry of `#define NO_HAPTIC_MOD` in config.h, the following keys will n
 * `TT()` layer tap toggle keys, when held to activate a layer. However when tapped `TAPPING_TOGGLE` times to permanently toggle the layer, on the last tap haptic feedback is still triggered.
 * `MT()` mod tap keys, when held to keep a usual modifier key pressed. However when tapped, and the key is quickly released, and sends a keycode, haptic feedback is still triggered. See also [Mod-Tap](mod_tap.md).
 
-### NO_HAPTIC_FN
-With the entry of `#define NO_HAPTIC_FN` in config.h, deprecated `fn_actions` type function keys will not trigger a feedback.
-
 ### NO_HAPTIC_ALPHA
 With the entry of `#define NO_HAPTIC_ALPHA` in config.h, none of the alpha keys (A ... Z) will trigger a feedback.
 
diff --git a/docs/keymap.md b/docs/keymap.md
index bec781e684..a7c9c50d74 100644
--- a/docs/keymap.md
+++ b/docs/keymap.md
@@ -136,7 +136,7 @@ After this you'll find a list of LAYOUT() macros. A LAYOUT() is simply a list of
 
 `keymaps[][MATRIX_ROWS][MATRIX_COLS]` in QMK holds the 16 bit action code (sometimes referred as the quantum keycode) in it.  For the keycode representing typical keys, its high byte is 0 and its low byte is the USB HID usage ID for keyboard.
 
-> TMK from which QMK was forked uses `const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS]` instead and holds the 8 bit keycode.  Some keycode values are reserved to induce execution of certain action codes via the `fn_actions[]` array.
+> TMK from which QMK was forked uses `const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS]` instead and holds the 8 bit keycode.
 
 #### Base Layer
 
diff --git a/keyboards/deltasplit75/keymaps/default/keymap.c b/keyboards/deltasplit75/keymaps/default/keymap.c
index c13b0627c0..7d698eb329 100644
--- a/keyboards/deltasplit75/keymaps/default/keymap.c
+++ b/keyboards/deltasplit75/keymaps/default/keymap.c
@@ -20,8 +20,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
     KC_BSLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, KC_VOLU, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    M(1),    KC_LEFT, KC_DOWN, KC_RGHT, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, KC_VOLD, M(0),    KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, KC_VOLD, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______, _______
   ),
 
diff --git a/keyboards/mechmini/v2/keymaps/via/keymap.c b/keyboards/mechmini/v2/keymaps/via/keymap.c
index 7c7c2103c0..e77d9d8859 100644
--- a/keyboards/mechmini/v2/keymaps/via/keymap.c
+++ b/keyboards/mechmini/v2/keymaps/via/keymap.c
@@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_ortho(
 		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
-		KC_TRNS, KC_TRNS, KC_TRNS, M(1), M(1), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_END, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY),
 
 	[2] = LAYOUT_ortho(
diff --git a/quantum/action.c b/quantum/action.c
index ea2310a4d9..d932c01688 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "led.h"
 #include "action_layer.h"
 #include "action_tapping.h"
-#include "action_macro.h"
 #include "action_util.h"
 #include "action.h"
 #include "wait.h"
@@ -634,12 +633,7 @@ void process_action(keyrecord_t *record, action_t action) {
             break;
 #    endif
 #endif
-            /* Extentions */
-#ifndef NO_ACTION_MACRO
-        case ACT_MACRO:
-            action_macro_play(action_get_macro(record, action.func.id, action.func.opt));
-            break;
-#endif
+
 #ifdef SWAP_HANDS_ENABLE
         case ACT_SWAP_HANDS:
             switch (action.swap.code) {
@@ -712,11 +706,6 @@ void process_action(keyrecord_t *record, action_t action) {
                     }
 #    endif
             }
-#endif
-#ifndef NO_ACTION_FUNCTION
-        case ACT_FUNCTION:
-            action_function(record, action.func.id, action.func.opt);
-            break;
 #endif
         default:
             break;
@@ -1041,7 +1030,6 @@ void clear_keyboard_but_mods_and_keys() {
     host_consumer_send(0);
 #endif
     clear_weak_mods();
-    clear_macro_mods();
     send_keyboard_report();
 #ifdef MOUSEKEY_ENABLE
     mousekey_clear();
@@ -1104,12 +1092,6 @@ bool is_tap_action(action_t action) {
                     return true;
             }
             return false;
-        case ACT_MACRO:
-        case ACT_FUNCTION:
-            if (action.func.opt & FUNC_TAP) {
-                return true;
-            }
-            return false;
     }
     return false;
 }
@@ -1166,12 +1148,6 @@ void debug_action(action_t action) {
         case ACT_LAYER_TAP_EXT:
             dprint("ACT_LAYER_TAP_EXT");
             break;
-        case ACT_MACRO:
-            dprint("ACT_MACRO");
-            break;
-        case ACT_FUNCTION:
-            dprint("ACT_FUNCTION");
-            break;
         case ACT_SWAP_HANDS:
             dprint("ACT_SWAP_HANDS");
             break;
diff --git a/quantum/action.h b/quantum/action.h
index b562f18c5b..671a8bc190 100644
--- a/quantum/action.h
+++ b/quantum/action.h
@@ -22,22 +22,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keyboard.h"
 #include "keycode.h"
 #include "action_code.h"
-#include "action_macro.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Disable macro and function features when LTO is enabled, since they break */
-#ifdef LTO_ENABLE
-#    ifndef NO_ACTION_MACRO
-#        define NO_ACTION_MACRO
-#    endif
-#    ifndef NO_ACTION_FUNCTION
-#        define NO_ACTION_FUNCTION
-#    endif
-#endif
-
 #ifndef TAP_CODE_DELAY
 #    define TAP_CODE_DELAY 0
 #endif
@@ -72,12 +61,6 @@ void action_exec(keyevent_t event);
 action_t action_for_key(uint8_t layer, keypos_t key);
 action_t action_for_keycode(uint16_t keycode);
 
-/* macro */
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);
-
-/* user defined special function */
-void action_function(keyrecord_t *record, uint8_t id, uint8_t opt);
-
 /* keyboard-specific key event (pre)processing */
 bool process_record_quantum(keyrecord_t *record);
 
diff --git a/quantum/action_code.h b/quantum/action_code.h
index eb18c36ae8..20b3e459d2 100644
--- a/quantum/action_code.h
+++ b/quantum/action_code.h
@@ -79,19 +79,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * 101E|LLLL|1111 0100   One Shot Layer         (0xF4)   [TAP]
  * 101E|LLLL|1111 xxxx   Reserved               (0xF5-FF)
  *   ELLLL: layer 0-31(E: extra bit for layer 16-31)
- *
- * Extensions(11xx)
- * ----------------
- * ACT_MACRO(1100):
- * 1100|opt | id(8)      Macro play?
- * 1100|1111| id(8)      Macro record?
- *
- * 1101|xxxx xxxx xxxx   (reserved)
- * 1110|xxxx xxxx xxxx   (reserved)
- *
- * ACT_FUNCTION(1111):
- * 1111| address(12)     Function?
- * 1111|opt | id(8)      Function?
  */
 enum action_kind_id {
     /* Key Actions */
@@ -111,9 +98,6 @@ enum action_kind_id {
     ACT_LAYER_MODS    = 0b1001,
     ACT_LAYER_TAP     = 0b1010, /* Layer  0-15 */
     ACT_LAYER_TAP_EXT = 0b1011, /* Layer 16-31 */
-    /* Extensions */
-    ACT_MACRO    = 0b1100,
-    ACT_FUNCTION = 0b1111
 };
 
 /** \brief Action Code Struct
@@ -164,11 +148,6 @@ typedef union {
         uint8_t  page : 2;
         uint8_t  kind : 4;
     } usage;
-    struct action_function {
-        uint8_t id : 8;
-        uint8_t opt : 4;
-        uint8_t kind : 4;
-    } func;
     struct action_swap {
         uint8_t code : 8;
         uint8_t opt : 4;
@@ -275,17 +254,6 @@ enum layer_param_tap_op {
 #define ACTION_DEFAULT_LAYER_BIT_XOR(part, bits) ACTION_LAYER_BITOP(OP_BIT_XOR, (part), (bits), 0)
 #define ACTION_DEFAULT_LAYER_BIT_SET(part, bits) ACTION_LAYER_BITOP(OP_BIT_SET, (part), (bits), 0)
 
-/* Macro */
-#define ACTION_MACRO(id) ACTION(ACT_MACRO, (id))
-#define ACTION_MACRO_TAP(id) ACTION(ACT_MACRO, FUNC_TAP << 8 | (id))
-#define ACTION_MACRO_OPT(id, opt) ACTION(ACT_MACRO, (opt) << 8 | (id))
-/* Function */
-enum function_opts {
-    FUNC_TAP = 0x8, /* indciates function is tappable */
-};
-#define ACTION_FUNCTION(id) ACTION(ACT_FUNCTION, (id))
-#define ACTION_FUNCTION_TAP(id) ACTION(ACT_FUNCTION, FUNC_TAP << 8 | (id))
-#define ACTION_FUNCTION_OPT(id, opt) ACTION(ACT_FUNCTION, (opt) << 8 | (id))
 /* OneHand Support */
 enum swap_hands_param_tap_op {
     OP_SH_TOGGLE = 0xF0,
diff --git a/quantum/action_macro.c b/quantum/action_macro.c
deleted file mode 100644
index 92228c0ba8..0000000000
--- a/quantum/action_macro.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-Copyright 2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "action.h"
-#include "action_util.h"
-#include "action_macro.h"
-#include "wait.h"
-
-#ifdef DEBUG_ACTION
-#    include "debug.h"
-#else
-#    include "nodebug.h"
-#endif
-
-#ifndef NO_ACTION_MACRO
-
-#    define MACRO_READ() (macro = MACRO_GET(macro_p++))
-/** \brief Action Macro Play
- *
- * FIXME: Needs doc
- */
-void action_macro_play(const macro_t *macro_p) {
-    macro_t macro    = END;
-    uint8_t interval = 0;
-
-    if (!macro_p) return;
-    while (true) {
-        switch (MACRO_READ()) {
-            case KEY_DOWN:
-                MACRO_READ();
-                dprintf("KEY_DOWN(%02X)\n", macro);
-                if (IS_MOD(macro)) {
-                    add_macro_mods(MOD_BIT(macro));
-                    send_keyboard_report();
-                } else {
-                    register_code(macro);
-                }
-                break;
-            case KEY_UP:
-                MACRO_READ();
-                dprintf("KEY_UP(%02X)\n", macro);
-                if (IS_MOD(macro)) {
-                    del_macro_mods(MOD_BIT(macro));
-                    send_keyboard_report();
-                } else {
-                    unregister_code(macro);
-                }
-                break;
-            case WAIT:
-                MACRO_READ();
-                dprintf("WAIT(%u)\n", macro);
-                {
-                    uint8_t ms = macro;
-                    while (ms--) wait_ms(1);
-                }
-                break;
-            case INTERVAL:
-                interval = MACRO_READ();
-                dprintf("INTERVAL(%u)\n", interval);
-                break;
-            case 0x04 ... 0x73:
-                dprintf("DOWN(%02X)\n", macro);
-                register_code(macro);
-                break;
-            case 0x84 ... 0xF3:
-                dprintf("UP(%02X)\n", macro);
-                unregister_code(macro & 0x7F);
-                break;
-            case END:
-            default:
-                return;
-        }
-        // interval
-        {
-            uint8_t ms = interval;
-            while (ms--) wait_ms(1);
-        }
-    }
-}
-#endif
diff --git a/quantum/action_macro.h b/quantum/action_macro.h
deleted file mode 100644
index 685e2c6ffc..0000000000
--- a/quantum/action_macro.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-Copyright 2013 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include <stdint.h>
-#include "progmem.h"
-
-typedef uint8_t macro_t;
-
-#define MACRO_NONE (macro_t *)0
-#define MACRO(...)                                          \
-    ({                                                      \
-        static const macro_t __m[] PROGMEM = {__VA_ARGS__}; \
-        &__m[0];                                            \
-    })
-#define MACRO_GET(p) pgm_read_byte(p)
-
-// Sends press when the macro key is pressed, release when release, or tap_macro when the key has been tapped
-#define MACRO_TAP_HOLD(record, press, release, tap_macro) (((record)->event.pressed) ? (((record)->tap.count <= 0 || (record)->tap.interrupted) ? (press) : MACRO_NONE) : (((record)->tap.count > 0 && !((record)->tap.interrupted)) ? (tap_macro) : (release)))
-
-// Holds down the modifier mod when the macro key is held, or sends macro instead when tapped
-#define MACRO_TAP_HOLD_MOD(record, macro, mod) MACRO_TAP_HOLD(record, (MACRO(D(mod), END)), MACRO(U(mod), END), macro)
-
-// Holds down the modifier mod when the macro key is held, or pressed a shifted key when tapped (eg: shift+3 for #)
-#define MACRO_TAP_SHFT_KEY_HOLD_MOD(record, key, mod) MACRO_TAP_HOLD_MOD(record, (MACRO(I(10), D(LSFT), T(key), U(LSFT), END)), mod)
-
-// Momentary switch layer when held, sends macro if tapped
-#define MACRO_TAP_HOLD_LAYER(record, macro, layer)                                                         \
-    (((record)->event.pressed) ? (((record)->tap.count <= 0 || (record)->tap.interrupted) ? ({             \
-        layer_on((layer));                                                                                 \
-        MACRO_NONE;                                                                                        \
-    })                                                                                                     \
-                                                                                          : MACRO_NONE)    \
-                               : (((record)->tap.count > 0 && !((record)->tap.interrupted)) ? (macro) : ({ \
-                                     layer_off((layer));                                                   \
-                                     MACRO_NONE;                                                           \
-                                 })))
-
-// Momentary switch layer when held, presses a shifted key when tapped (eg: shift+3 for #)
-#define MACRO_TAP_SHFT_KEY_HOLD_LAYER(record, key, layer) MACRO_TAP_HOLD_LAYER(record, MACRO(I(10), D(LSFT), T(key), U(LSFT), END), layer)
-
-#ifndef NO_ACTION_MACRO
-void action_macro_play(const macro_t *macro_p);
-#else
-#    define action_macro_play(macro)
-#endif
-
-/* Macro commands
- *   code(0x04-73)                      // key down(1byte)
- *   code(0x04-73) | 0x80               // key up(1byte)
- *   { KEY_DOWN, code(0x04-0xff) }      // key down(2bytes)
- *   { KEY_UP,   code(0x04-0xff) }      // key up(2bytes)
- *   WAIT                               // wait milli-seconds
- *   INTERVAL                           // set interval between macro commands
- *   END                                // stop macro execution
- *
- * Ideas(Not implemented):
- *   modifiers
- *   system usage
- *   consumer usage
- *   unicode usage
- *   function call
- *   conditionals
- *   loop
- */
-enum macro_command_id {
-    /* 0x00 - 0x03 */
-    END = 0x00,
-    KEY_DOWN,
-    KEY_UP,
-
-    /* 0x04 - 0x73 (reserved for keycode down) */
-
-    /* 0x74 - 0x83 */
-    WAIT = 0x74,
-    INTERVAL,
-
-    /* 0x84 - 0xf3 (reserved for keycode up) */
-
-    /* 0xf4 - 0xff */
-};
-
-/* TODO: keycode:0x04-0x73 can be handled by 1byte command  else 2bytes are needed
- * if keycode between 0x04 and 0x73
- *      keycode / (keycode|0x80)
- * else
- *      {KEY_DOWN, keycode} / {KEY_UP, keycode}
- */
-#define DOWN(key) KEY_DOWN, (key)
-#define UP(key) KEY_UP, (key)
-#define TYPE(key) DOWN(key), UP(key)
-#define WAIT(ms) WAIT, (ms)
-#define INTERVAL(ms) INTERVAL, (ms)
-
-/* key down */
-#define D(key) DOWN(KC_##key)
-/* key up */
-#define U(key) UP(KC_##key)
-/* key type */
-#define T(key) TYPE(KC_##key)
-/* wait */
-#define W(ms) WAIT(ms)
-/* interval */
-#define I(ms) INTERVAL(ms)
-
-/* for backward comaptibility */
-#define MD(key) DOWN(KC_##key)
-#define MU(key) UP(KC_##key)
diff --git a/quantum/action_util.c b/quantum/action_util.c
index 7e30593fb1..9eb2a6d30d 100644
--- a/quantum/action_util.c
+++ b/quantum/action_util.c
@@ -25,9 +25,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 extern keymap_config_t keymap_config;
 
-static uint8_t real_mods  = 0;
-static uint8_t weak_mods  = 0;
-static uint8_t macro_mods = 0;
+static uint8_t real_mods = 0;
+static uint8_t weak_mods = 0;
 #ifdef KEY_OVERRIDE_ENABLE
 static uint8_t weak_override_mods = 0;
 static uint8_t suppressed_mods    = 0;
@@ -224,7 +223,6 @@ bool is_oneshot_enabled(void) { return keymap_config.oneshot_disable; }
 void send_keyboard_report(void) {
     keyboard_report->mods = real_mods;
     keyboard_report->mods |= weak_mods;
-    keyboard_report->mods |= macro_mods;
 
 #ifndef NO_ACTION_ONESHOT
     if (oneshot_mods) {
@@ -325,33 +323,6 @@ void set_suppressed_override_mods(uint8_t mods) { suppressed_mods = mods; }
 void clear_suppressed_override_mods(void) { suppressed_mods = 0; }
 #endif
 
-/* macro modifier */
-/** \brief get macro mods
- *
- * FIXME: needs doc
- */
-uint8_t get_macro_mods(void) { return macro_mods; }
-/** \brief add macro mods
- *
- * FIXME: needs doc
- */
-void add_macro_mods(uint8_t mods) { macro_mods |= mods; }
-/** \brief del macro mods
- *
- * FIXME: needs doc
- */
-void del_macro_mods(uint8_t mods) { macro_mods &= ~mods; }
-/** \brief set macro mods
- *
- * FIXME: needs doc
- */
-void set_macro_mods(uint8_t mods) { macro_mods = mods; }
-/** \brief clear macro mods
- *
- * FIXME: needs doc
- */
-void clear_macro_mods(void) { macro_mods = 0; }
-
 #ifndef NO_ACTION_ONESHOT
 /** \brief get oneshot mods
  *
diff --git a/quantum/action_util.h b/quantum/action_util.h
index f2b3897ae5..bfd0a6cf95 100644
--- a/quantum/action_util.h
+++ b/quantum/action_util.h
@@ -49,13 +49,6 @@ void    del_weak_mods(uint8_t mods);
 void    set_weak_mods(uint8_t mods);
 void    clear_weak_mods(void);
 
-/* macro modifier */
-uint8_t get_macro_mods(void);
-void    add_macro_mods(uint8_t mods);
-void    del_macro_mods(uint8_t mods);
-void    set_macro_mods(uint8_t mods);
-void    clear_macro_mods(void);
-
 /* oneshot modifier */
 uint8_t get_oneshot_mods(void);
 void    add_oneshot_mods(uint8_t mods);
diff --git a/quantum/keycode.h b/quantum/keycode.h
index 38a29b439b..a932550635 100644
--- a/quantum/keycode.h
+++ b/quantum/keycode.h
@@ -35,8 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define IS_SYSTEM(code) (KC_PWR <= (code) && (code) <= KC_WAKE)
 #define IS_CONSUMER(code) (KC_MUTE <= (code) && (code) <= KC_BRID)
 
-#define IS_FN(code) (KC_FN0 <= (code) && (code) <= KC_FN31)
-
 #define IS_MOUSEKEY(code) (KC_MS_UP <= (code) && (code) <= KC_MS_ACCEL2)
 #define IS_MOUSEKEY_MOVE(code) (KC_MS_UP <= (code) && (code) <= KC_MS_RIGHT)
 #define IS_MOUSEKEY_BUTTON(code) (KC_MS_BTN1 <= (code) && (code) <= KC_MS_BTN8)
@@ -62,11 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MOD_MASK_SAG (MOD_MASK_SHIFT | MOD_MASK_ALT | MOD_MASK_GUI)
 #define MOD_MASK_CSAG (MOD_MASK_CTRL | MOD_MASK_SHIFT | MOD_MASK_ALT | MOD_MASK_GUI)
 
-#define FN_BIT(code) (1 << FN_INDEX(code))
-#define FN_INDEX(code) ((code)-KC_FN0)
-#define FN_MIN KC_FN0
-#define FN_MAX KC_FN31
-
 // clang-format off
 
 /*
@@ -509,41 +502,7 @@ enum internal_special_keycodes {
     KC_MEDIA_FAST_FORWARD,
     KC_MEDIA_REWIND,
     KC_BRIGHTNESS_UP,
-    KC_BRIGHTNESS_DOWN,
-
-    /* Fn keys */
-    KC_FN0 = 0xC0,
-    KC_FN1,
-    KC_FN2,
-    KC_FN3,
-    KC_FN4,
-    KC_FN5,
-    KC_FN6,
-    KC_FN7,
-    KC_FN8,
-    KC_FN9,
-    KC_FN10,
-    KC_FN11,
-    KC_FN12,
-    KC_FN13,
-    KC_FN14,
-    KC_FN15,
-    KC_FN16,  // 0xD0
-    KC_FN17,
-    KC_FN18,
-    KC_FN19,
-    KC_FN20,
-    KC_FN21,
-    KC_FN22,
-    KC_FN23,
-    KC_FN24,
-    KC_FN25,
-    KC_FN26,
-    KC_FN27,
-    KC_FN28,
-    KC_FN29,
-    KC_FN30,
-    KC_FN31
+    KC_BRIGHTNESS_DOWN
 };
 
 enum mouse_keys {
diff --git a/quantum/keymap.h b/quantum/keymap.h
index 3fc41cafd8..2ee2e1b576 100644
--- a/quantum/keymap.h
+++ b/quantum/keymap.h
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include <ch.h>
 #endif
 #include "keycode.h"
-#include "action_macro.h"
 #include "report.h"
 #include "host.h"
 // #include "print.h"
@@ -49,8 +48,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // translates key to keycode
 uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key);
 
-// translates function id to action
-uint16_t keymap_function_id_to_action(uint16_t function_id);
-
 extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS];
-extern const uint16_t fn_actions[];
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index 5007f15f11..cd67f71a8f 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -20,7 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "keycode.h"
 #include "action_layer.h"
 #include "action.h"
-#include "action_macro.h"
 #include "debug.h"
 #include "quantum.h"
 
@@ -80,24 +79,6 @@ action_t action_for_keycode(uint16_t keycode) {
             // Split it up
             action.code = ACTION_MODS_KEY(keycode >> 8, keycode & 0xFF);  // adds modifier to key
             break;
-#ifndef NO_ACTION_FUNCTION
-        case KC_FN0 ... KC_FN31:
-            action.code = keymap_function_id_to_action(FN_INDEX(keycode));
-            break;
-        case QK_FUNCTION ... QK_FUNCTION_MAX:;
-            // Is a shortcut for function action_layer, pull last 12bits
-            // This means we have 4,096 FN macros at our disposal
-            action.code = keymap_function_id_to_action((int)keycode & 0xFFF);
-            break;
-#endif
-#ifndef NO_ACTION_MACRO
-        case QK_MACRO ... QK_MACRO_MAX:
-            if (keycode & 0x800)  // tap macros have upper bit set
-                action.code = ACTION_MACRO_TAP(keycode & 0xFF);
-            else
-                action.code = ACTION_MACRO(keycode & 0xFF);
-            break;
-#endif
 #ifndef NO_ACTION_LAYER
         case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
             action.code = ACTION_LAYER_TAP_KEY((keycode >> 0x8) & 0xF, keycode & 0xFF);
@@ -165,30 +146,8 @@ action_t action_for_keycode(uint16_t keycode) {
     return action;
 }
 
-__attribute__((weak)) const uint16_t PROGMEM fn_actions[] = {
-
-};
-
-/* Macro */
-__attribute__((weak)) const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { return MACRO_NONE; }
-
-/* Function */
-__attribute__((weak)) void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {}
-
 // translates key to keycode
 __attribute__((weak)) uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) {
     // Read entire word (16bits)
     return pgm_read_word(&keymaps[(layer)][(key.row)][(key.col)]);
 }
-
-// translates function id to action
-__attribute__((weak)) uint16_t keymap_function_id_to_action(uint16_t function_id) {
-// The compiler sees the empty (weak) fn_actions and generates a warning
-// This function should not be called in that case, so the warning is too strict
-// If this function is called however, the keymap should have overridden fn_actions, and then the compile
-// is comparing against the wrong array
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Warray-bounds"
-    return pgm_read_word(&fn_actions[function_id]);
-#pragma GCC diagnostic pop
-}
diff --git a/quantum/process_keycode/process_haptic.c b/quantum/process_keycode/process_haptic.c
index 85b2ffcddd..0f07f9ac75 100644
--- a/quantum/process_keycode/process_haptic.c
+++ b/quantum/process_keycode/process_haptic.c
@@ -35,9 +35,6 @@ __attribute__((weak)) bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t
         case QK_MOMENTARY ... QK_MOMENTARY_MAX:
         case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
 #endif
-#ifdef NO_HAPTIC_FN
-        case KC_FN0 ... KC_FN31:
-#endif
 #ifdef NO_HAPTIC_ALPHA
         case KC_A ... KC_Z:
 #endif
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 15ea0276a7..b5b3566786 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -37,10 +37,6 @@ enum quantum_keycodes {
     QK_RALT                 = 0x1400,
     QK_RGUI                 = 0x1800,
     QK_MODS_MAX             = 0x1FFF,
-    QK_FUNCTION             = 0x2000,
-    QK_FUNCTION_MAX         = 0x2FFF,
-    QK_MACRO                = 0x3000,
-    QK_MACRO_MAX            = 0x3FFF,
     QK_LAYER_TAP            = 0x4000,
     QK_LAYER_TAP_MAX        = 0x4FFF,
     QK_TO                   = 0x5000,
@@ -710,12 +706,6 @@ enum quantum_keycodes {
 #define A(kc) LALT(kc)
 #define G(kc) LGUI(kc)
 
-// Deprecated - do not use
-#define F(kc) (QK_FUNCTION | (kc))
-#define M(kc) (QK_MACRO | (kc))
-#define MACROTAP(kc) (QK_MACRO | (FUNC_TAP << 8) | (kc))
-#define MACRODOWN(...) (record->event.pressed ? MACRO(__VA_ARGS__) : MACRO_NONE)
-
 #define QK_GESC QK_GRAVE_ESCAPE
 
 #define QK_BOOT QK_BOOTLOADER
diff --git a/tests/basic/test_macro.cpp b/tests/basic/test_macro.cpp
deleted file mode 100644
index ae2f3b32e3..0000000000
--- a/tests/basic/test_macro.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright 2017 Fred Sundvik
- *
- * 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 "test_common.hpp"
-#include "time.h"
-
-using testing::InSequence;
-using testing::InvokeWithoutArgs;
-
-class Macro : public TestFixture {};
-
-#define AT_TIME(t) WillOnce(InvokeWithoutArgs([current_time]() { EXPECT_EQ(timer_elapsed32(current_time), t); }))
-
-extern "C" const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-    if (record->event.pressed) {
-        switch (id) {
-            case 0:
-                return MACRO(D(LSFT), T(H), U(LSFT), T(E), T(L), T(L), T(O), T(SPACE), W(100), D(LSFT), T(W), U(LSFT), I(10), T(O), T(R), T(L), T(D), D(LSFT), T(1), U(LSFT), END);
-        }
-    }
-    return MACRO_NONE;
-};
-
-TEST_F(Macro, PlayASimpleMacro) {
-    TestDriver driver;
-    InSequence s;
-    auto       key_macro = KeymapKey(0, 8, 0, M(0));
-
-    set_keymap({key_macro});
-
-    key_macro.press();
-
-    uint32_t current_time = timer_read32();
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT))).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_H))).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT))).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_E))).AT_TIME(0);
-    // The macro system could actually skip these empty keyboard reports
-    // it should be enough to just send a report with the next key down
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_L))).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_L))).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_O))).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_SPACE))).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(0);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT))).AT_TIME(100);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_W))).AT_TIME(100);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT))).AT_TIME(100);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(100);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_O)))
-        // BUG: The timer should not really have advanced 10 ms here
-        // See issue #1477
-        .AT_TIME(110);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport()))
-        // BUG: The timer should not advance on both keydown and key-up
-        // See issue #1477
-        .AT_TIME(120);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_R))).AT_TIME(130);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(140);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_L))).AT_TIME(150);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(160);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_D))).AT_TIME(170);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(180);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT))).AT_TIME(190);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT, KC_1))).AT_TIME(200);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LEFT_SHIFT))).AT_TIME(210);
-    EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(220);
-    run_one_scan_loop();
-
-    key_macro.release();
-}

From 5249a606f11049603b982bacb26da1fd9a60adee Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 24 Jan 2022 22:20:08 +0000
Subject: [PATCH 374/867] Fix up issue with PROGMEM and hand_swap_config
 (#16027)

---
 quantum/action.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quantum/action.h b/quantum/action.h
index 671a8bc190..39b5da63b8 100644
--- a/quantum/action.h
+++ b/quantum/action.h
@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "progmem.h"
 #include "keyboard.h"
 #include "keycode.h"
 #include "action_code.h"

From c71c0fba9000cb586588da4c6bbf877d21d061b6 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 25 Jan 2022 09:28:13 +1100
Subject: [PATCH 375/867] Fix bootloader_jump for certain CTRL boards (#16026)

---
 platforms/arm_atsam/bootloaders/md_boot.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/platforms/arm_atsam/bootloaders/md_boot.c b/platforms/arm_atsam/bootloaders/md_boot.c
index e7508ffe51..9cf16f3597 100644
--- a/platforms/arm_atsam/bootloaders/md_boot.c
+++ b/platforms/arm_atsam/bootloaders/md_boot.c
@@ -18,15 +18,14 @@
 
 #include "samd51j18a.h"
 
-#ifdef KEYBOARD_massdrop_ctrl
 // WARNING: These are only for CTRL bootloader release "v2.18Jun 22 2018 17:28:08" for bootloader_jump support
 extern uint32_t _eram;
-
-#    define BOOTLOADER_MAGIC 0x3B9ACA00
-#    define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4)
+#define BOOTLOADER_MAGIC 0x3B9ACA00
+#define MAGIC_ADDR (uint32_t *)((intptr_t)(&_eram) - 4)
 
 // CTRL keyboards released with bootloader version below must use RAM method. Otherwise use WDT method.
 void bootloader_jump(void) {
+#ifdef KEYBOARD_massdrop_ctrl
     uint8_t  ver_ram_method[] = "v2.18Jun 22 2018 17:28:08";  // The version to match (NULL terminated by compiler)
     uint8_t *ver_check        = ver_ram_method;               // Pointer to version match string for traversal
     uint8_t *ver_rom          = (uint8_t *)0x21A0;            // Pointer to address in ROM where this specific bootloader version would exist
@@ -39,16 +38,12 @@ void bootloader_jump(void) {
     if (!*ver_check) {                   // If check version pointer is NULL, all characters have matched
         *MAGIC_ADDR = BOOTLOADER_MAGIC;  // Set magic number into RAM
         NVIC_SystemReset();              // Perform system reset
-
         while (1)
             ;  // Won't get here
     }
-}
+#endif
 
-#else
-
-// Set watchdog timer to reset. Directs the bootloader to stay in programming mode.
-void bootloader_jump(void) {
+    // Set watchdog timer to reset. Directs the bootloader to stay in programming mode.
     WDT->CTRLA.bit.ENABLE = 0;
 
     while (WDT->SYNCBUSY.bit.ENABLE)
@@ -65,8 +60,6 @@ void bootloader_jump(void) {
         ;
     while (!WDT->CTRLA.bit.ENABLE)
         ;
-
     while (1)
         ;  // Wait on timeout
 }
-#endif

From bf9569db93d9f9ce5e3a0ce7190f09e950b9f85b Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 24 Jan 2022 23:54:56 +0000
Subject: [PATCH 376/867] Various Makefile optimisations (#16015)

---
 Makefile          | 80 +++++++++++++++++------------------------------
 build_keyboard.mk |  9 ++++++
 2 files changed, 37 insertions(+), 52 deletions(-)

diff --git a/Makefile b/Makefile
index 88f430619e..b435837d30 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,10 @@ endif
 # Otherwise the [OK], [ERROR] and [WARN] messages won't be displayed correctly
 override SILENT := false
 
+ifdef SKIP_VERSION
+    SKIP_GIT := yes
+endif
+
 ifndef SUB_IS_SILENT
 ifndef SKIP_GIT
     QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null)
@@ -50,48 +54,12 @@ ABS_ROOT_MAKEFILE := $(abspath $(ROOT_MAKEFILE))
 ABS_STARTING_DIR := $(dir $(ABS_STARTING_MAKEFILE))
 ABS_ROOT_DIR := $(dir $(ABS_ROOT_MAKEFILE))
 STARTING_DIR := $(subst $(ABS_ROOT_DIR),,$(ABS_STARTING_DIR))
-BUILD_DIR := $(ROOT_DIR)/.build
-TEST_DIR := $(BUILD_DIR)/test
+
+include paths.mk
+
+TEST_OUTPUT_DIR := $(BUILD_DIR)/test
 ERROR_FILE := $(BUILD_DIR)/error_occurred
 
-# Helper function to process the newt element of a space separated path
-# It works a bit like the traditional functional head tail
-# so the CURRENT_PATH_ELEMENT will become the new head
-# and the PATH_ELEMENTS are the rest that are still unprocessed
-define NEXT_PATH_ELEMENT
-    $$(eval CURRENT_PATH_ELEMENT := $$(firstword  $$(PATH_ELEMENTS)))
-    $$(eval PATH_ELEMENTS := $$(wordlist  2,9999,$$(PATH_ELEMENTS)))
-endef
-
-# We change the / to spaces so that we more easily can work with the elements
-# separately
-PATH_ELEMENTS := $(subst /, ,$(STARTING_DIR))
-# Initialize the path elements list for further processing
-$(eval $(call NEXT_PATH_ELEMENT))
-
-
-# Phony targets to enable a few simple make commands outside the main processing below.
-.PHONY: list-keyboards
-list-keyboards:
-	util/list_keyboards.sh | sort -u | tr '\n' ' '
-
-.PHONY: generate-keyboards-file
-generate-keyboards-file:
-	util/list_keyboards.sh | sort -u
-
-.PHONY: clean
-clean:
-	echo -n 'Deleting .build/ ... '
-	rm -rf $(BUILD_DIR)
-	echo 'done.'
-
-.PHONY: distclean
-distclean: clean
-	echo -n 'Deleting *.bin, *.hex, and *.uf2 ... '
-	rm -f *.bin *.hex *.uf2
-	echo 'done.'
-
-
 .DEFAULT_GOAL := all:all
 
 
@@ -387,7 +355,7 @@ define BUILD_TEST
     MAKE_MSG := $$(MSG_MAKE_TEST)
     $$(eval $$(call BUILD))
     ifneq ($$(MAKE_TARGET),clean)
-        TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf
+        TEST_EXECUTABLE := $$(TEST_OUTPUT_DIR)/$$(TEST_NAME).elf
         TESTS += $$(TEST_NAME)
         TEST_MSG := $$(MSG_TEST)
         $$(TEST_NAME)_COMMAND := \
@@ -404,6 +372,7 @@ define PARSE_TEST
     TESTS :=
     TEST_NAME := $$(firstword $$(subst :, ,$$(RULE)))
     TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME):,,$$(RULE)))
+    include $(ROOT_DIR)/testlist.mk
     ifeq ($$(TEST_NAME),all)
         MATCHED_TESTS := $$(TEST_LIST)
     else
@@ -426,7 +395,6 @@ define SET_SILENT_MODE
     endif
 endef
 
-include paths.mk
 include $(BUILDDEFS_PATH)/message.mk
 
 ifeq ($(strip $(BREAK_ON_ERRORS)), yes)
@@ -496,14 +464,22 @@ git-submodule:
 	git submodule sync --recursive
 	git submodule update --init --recursive --progress
 
-# Generate the version.h file
-ifdef SKIP_GIT
-VERSION_H_FLAGS := --skip-git
-endif
-ifdef SKIP_VERSION
-VERSION_H_FLAGS := --skip-all
-SKIP_GIT := yes
-endif
-$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o quantum/version.h)
+.PHONY: list-keyboards
+list-keyboards:
+	util/list_keyboards.sh | sort -u | tr '\n' ' '
 
-include $(ROOT_DIR)/testlist.mk
+.PHONY: generate-keyboards-file
+generate-keyboards-file:
+	util/list_keyboards.sh | sort -u
+
+.PHONY: clean
+clean:
+	echo -n 'Deleting .build/ ... '
+	rm -rf $(BUILD_DIR)
+	echo 'done.'
+
+.PHONY: distclean
+distclean: clean
+	echo -n 'Deleting *.bin, *.hex, and *.uf2 ... '
+	rm -f *.bin *.hex *.uf2
+	echo 'done.'
diff --git a/build_keyboard.mk b/build_keyboard.mk
index 6473e3e473..e8c3bfe5fa 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -37,6 +37,15 @@ ifdef SKIP_VERSION
     OPT_DEFS += -DSKIP_VERSION
 endif
 
+# Generate the version.h file
+ifdef SKIP_VERSION
+VERSION_H_FLAGS := --skip-all
+endif
+ifdef SKIP_GIT
+VERSION_H_FLAGS := --skip-git
+endif
+$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o quantum/version.h)
+
 # Determine which subfolders exist.
 KEYBOARD_FOLDER_PATH_1 := $(KEYBOARD)
 KEYBOARD_FOLDER_PATH_2 := $(patsubst %/,%,$(dir $(KEYBOARD_FOLDER_PATH_1)))

From 5f233458869bc5fd2d91b24f59c8519d5f99c9a6 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 25 Jan 2022 10:58:53 +1100
Subject: [PATCH 377/867] Add a script that simplifies running commands under
 docker. (#16028)

---
 util/docker_cmd.sh | 59 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100755 util/docker_cmd.sh

diff --git a/util/docker_cmd.sh b/util/docker_cmd.sh
new file mode 100755
index 0000000000..2ea113d24a
--- /dev/null
+++ b/util/docker_cmd.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+# NOTE: This script uses tabs for indentation
+
+errcho() {
+	echo "$@" >&2
+}
+
+USAGE="Usage: $0 <command>"
+
+# Check preconditions
+for arg; do
+	if [ "$arg" = "--help" ]; then
+		echo "$USAGE"
+		exit 0
+	fi
+done
+
+# Allow $RUNTIME to be overriden by the user as an environment variable
+# Else check if either docker or podman exit and set them as runtime
+# if none are found error out
+if [ -z "$RUNTIME" ]; then
+	if command -v docker >/dev/null 2>&1; then
+		RUNTIME="docker"
+	elif command -v podman >/dev/null 2>&1; then
+		RUNTIME="podman"
+	else
+		errcho "Error: no compatible container runtime found."
+		errcho "Either podman or docker are required."
+		errcho "See https://podman.io/getting-started/installation"
+		errcho "or https://docs.docker.com/install/#supported-platforms"
+		errcho "for installation instructions."
+		exit 2
+	fi
+fi
+
+
+# IF we are using docker on non Linux and docker-machine isn't working print an error
+# ELSE set usb_args
+if [ ! "$(uname)" = "Linux" ] && [ "$RUNTIME" = "docker" ] && ! docker-machine active >/dev/null 2>&1; then
+    errcho "Error: target requires docker-machine to work on your platform"
+    errcho "See http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos"
+    exit 3
+else
+    usb_args="--privileged -v /dev:/dev"
+fi
+dir=$(pwd -W 2>/dev/null) || dir=$PWD  # Use Windows path if on Windows
+
+if [ "$RUNTIME" = "docker" ]; then
+	uid_arg="--user $(id -u):$(id -g)"
+fi
+
+# Run container and build firmware
+"$RUNTIME" run --rm -it \
+	$usb_args \
+	$uid_arg \
+	-w /qmk_firmware \
+	-v "$dir":/qmk_firmware \
+	qmkfm/qmk_cli \
+	"$@"

From 7df371750f297480ba5e78559ad3314b2d580888 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 25 Jan 2022 00:50:35 +0000
Subject: [PATCH 378/867] Workaround in Makefile for recursive rule matching
 (#15988)

* Bodge for recursive rule matching

* Bodge for recursive rule matching - force python3

* Tidy up
---
 Makefile | 51 +++++++++------------------------------------------
 1 file changed, 9 insertions(+), 42 deletions(-)

diff --git a/Makefile b/Makefile
index b435837d30..22c79880a3 100644
--- a/Makefile
+++ b/Makefile
@@ -87,53 +87,20 @@ endef
 # a function that returns the value
 COMPARE_AND_REMOVE_FROM_RULE = $(eval $(call COMPARE_AND_REMOVE_FROM_RULE_HELPER,$1))$(RULE_FOUND)
 
-
-# Recursively try to find a match for the start of the rule to be checked
-# $1 The list to be checked
-# If a match is found, then RULE_FOUND is set to true
-# and MATCHED_ITEM to the item that was matched
-define TRY_TO_MATCH_RULE_FROM_LIST_HELPER3
-    ifneq ($1,)
-        ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,$$(firstword $1)),true)
-            MATCHED_ITEM := $$(firstword $1)
-        else
-            $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER3,$$(wordlist 2,9999,$1)))
-        endif
-    endif
-endef
-
-# A recursive helper function for finding the longest match
-# $1 The list to be checked
-# It works by always removing the currently matched item from the list
-define TRY_TO_MATCH_RULE_FROM_LIST_HELPER2
-    # Stop the recursion when the list is empty
-    ifneq ($1,)
-        RULE_BEFORE := $$(RULE)
-        $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER3,$1))
-        # If a match is found in the current list, otherwise just return what we had before
-        ifeq ($$(RULE_FOUND),true)
-            # Save the best match so far and call itself recursively
-            BEST_MATCH := $$(MATCHED_ITEM)
-            BEST_MATCH_RULE := $$(RULE)
-            RULE_FOUND := false
-            RULE := $$(RULE_BEFORE)
-            $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER2,$$(filter-out $$(MATCHED_ITEM),$1)))
-        endif
-     endif
-endef
-
-
-# Recursively try to find the longest match for the start of the rule to be checked
+# Try to find a match for the start of the rule to be checked
 # $1 The list to be checked
 # If a match is found, then RULE_FOUND is set to true
 # and MATCHED_ITEM to the item that was matched
 define TRY_TO_MATCH_RULE_FROM_LIST_HELPER
-    BEST_MATCH :=
-    $$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER2,$1))
-    ifneq ($$(BEST_MATCH),)
+    # Split on ":", padding with empty strings to avoid indexing issues
+    TOKEN1:=$$(shell python3 -c "import sys; print((sys.argv[1].split(':',1)+[''])[0])" $$(RULE))
+    TOKENr:=$$(shell python3 -c "import sys; print((sys.argv[1].split(':',1)+[''])[1])" $$(RULE))
+
+    FOUNDx:=$$(shell echo $1 | tr " " "\n" | grep -Fx $$(TOKEN1))
+    ifneq ($$(FOUNDx),)
+        RULE := $$(TOKENr)
         RULE_FOUND := true
-        RULE := $$(BEST_MATCH_RULE)
-        MATCHED_ITEM := $$(BEST_MATCH)
+        MATCHED_ITEM := $$(TOKEN1)
     else
         RULE_FOUND := false
         MATCHED_ITEM :=

From 2da12182f33b2909338b653420cf8ae0eed53414 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 25 Jan 2022 13:10:51 +0000
Subject: [PATCH 379/867] Fix handwired/ms_sculpt_mobile default keymap
 (#16032)

---
 .../ms_sculpt_mobile/{ => keymaps/milestogo}/babblePaste.c     | 0
 .../ms_sculpt_mobile/{ => keymaps/milestogo}/babblePaste.h     | 0
 .../ms_sculpt_mobile/{ => keymaps/milestogo}/babblePaste.txt   | 0
 .../handwired/ms_sculpt_mobile/keymaps/milestogo/rules.mk      | 3 +++
 keyboards/handwired/ms_sculpt_mobile/rules.mk                  | 3 ---
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename keyboards/handwired/ms_sculpt_mobile/{ => keymaps/milestogo}/babblePaste.c (100%)
 rename keyboards/handwired/ms_sculpt_mobile/{ => keymaps/milestogo}/babblePaste.h (100%)
 rename keyboards/handwired/ms_sculpt_mobile/{ => keymaps/milestogo}/babblePaste.txt (100%)

diff --git a/keyboards/handwired/ms_sculpt_mobile/babblePaste.c b/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.c
similarity index 100%
rename from keyboards/handwired/ms_sculpt_mobile/babblePaste.c
rename to keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.c
diff --git a/keyboards/handwired/ms_sculpt_mobile/babblePaste.h b/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.h
similarity index 100%
rename from keyboards/handwired/ms_sculpt_mobile/babblePaste.h
rename to keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.h
diff --git a/keyboards/handwired/ms_sculpt_mobile/babblePaste.txt b/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.txt
similarity index 100%
rename from keyboards/handwired/ms_sculpt_mobile/babblePaste.txt
rename to keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/babblePaste.txt
diff --git a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/rules.mk b/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/rules.mk
index 6d1eae2bf9..5b45f586b5 100644
--- a/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/rules.mk
+++ b/keyboards/handwired/ms_sculpt_mobile/keymaps/milestogo/rules.mk
@@ -15,3 +15,6 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+
+# Keymap specific files
+SRC = babblePaste.c
diff --git a/keyboards/handwired/ms_sculpt_mobile/rules.mk b/keyboards/handwired/ms_sculpt_mobile/rules.mk
index 72015d93d8..6498fa6c76 100644
--- a/keyboards/handwired/ms_sculpt_mobile/rules.mk
+++ b/keyboards/handwired/ms_sculpt_mobile/rules.mk
@@ -24,6 +24,3 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
-
-# Project specific files
-SRC = babblePaste.c

From 3e0ee6fb74e125d14ac22c922d80def4649f6784 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 26 Jan 2022 00:40:55 +1100
Subject: [PATCH 380/867] Fix joystick button off-by-one error (#16037)

---
 quantum/process_keycode/process_joystick.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/quantum/process_keycode/process_joystick.c b/quantum/process_keycode/process_joystick.c
index 3ffaf42bf8..fa9c2c1dbc 100644
--- a/quantum/process_keycode/process_joystick.c
+++ b/quantum/process_keycode/process_joystick.c
@@ -28,10 +28,11 @@ bool process_joystick_buttons(uint16_t keycode, keyrecord_t *record) {
     if (keycode < JS_BUTTON0 || keycode > JS_BUTTON_MAX) {
         return true;
     } else {
+        uint8_t button_idx = (keycode - JS_BUTTON0);
         if (record->event.pressed) {
-            joystick_status.buttons[(keycode - JS_BUTTON0) / 8] |= 1 << (keycode % 8);
+            joystick_status.buttons[button_idx / 8] |= 1 << (button_idx % 8);
         } else {
-            joystick_status.buttons[(keycode - JS_BUTTON0) / 8] &= ~(1 << (keycode % 8));
+            joystick_status.buttons[button_idx / 8] &= ~(1 << (button_idx % 8));
         }
 
         joystick_status.status |= JS_UPDATED;

From ca10e4d07579ae85c6720fdd3db3a0bfb5ebff36 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 25 Jan 2022 05:42:54 -0800
Subject: [PATCH 381/867] [Keyboard] Fix orientation issues for Ploopy pointing
 devices (#16035)

---
 keyboards/ploopyco/trackball_mini/config.h | 2 +-
 keyboards/ploopyco/trackball_nano/config.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/ploopyco/trackball_mini/config.h b/keyboards/ploopyco/trackball_mini/config.h
index 52d7390ca2..af1e63eb71 100644
--- a/keyboards/ploopyco/trackball_mini/config.h
+++ b/keyboards/ploopyco/trackball_mini/config.h
@@ -61,4 +61,4 @@
 #define ADNS5050_SDIO_PIN         C6
 #define ADNS5050_CS_PIN           B4
 
-#define POINTING_DEVICE_ROTATION_90
+#define POINTING_DEVICE_ROTATION_270
diff --git a/keyboards/ploopyco/trackball_nano/config.h b/keyboards/ploopyco/trackball_nano/config.h
index 7d109db99e..4c0aab8c62 100644
--- a/keyboards/ploopyco/trackball_nano/config.h
+++ b/keyboards/ploopyco/trackball_nano/config.h
@@ -50,4 +50,4 @@
 #define ADNS5050_SDIO_PIN         C6
 #define ADNS5050_CS_PIN           B4
 
-#define POINTING_DEVICE_ROTATION_90
+#define POINTING_DEVICE_ROTATION_270

From 4f6c0d0ea5eb922d98413f30c1710b7800aa2bd3 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 26 Jan 2022 07:21:08 +1100
Subject: [PATCH 382/867] More keyboard rules.mk cleanups (#16044)

* More keyboard rules.mk cleanups

* Found a couple more
---
 keyboards/adalyn/rules.mk                |  7 ++-----
 keyboards/contender/rules.mk             |  5 ++---
 keyboards/deltapad/rules.mk              |  5 +----
 keyboards/dtisaac/cg108/rules.mk         |  1 -
 keyboards/dtisaac/dosa40rgb/rules.mk     |  1 -
 keyboards/edi/hardlight/mk2/rules.mk     |  5 +----
 keyboards/eternal_keypad/rules.mk        |  2 +-
 keyboards/handwired/carpolly/rules.mk    |  1 -
 keyboards/handwired/croxsplit44/rules.mk |  7 ++-----
 keyboards/handwired/dygma/raise/rules.mk |  2 +-
 keyboards/handwired/ortho_brass/rules.mk |  7 ++-----
 keyboards/jolofsor/denial75/rules.mk     |  3 +--
 keyboards/matrix/abelx/rules.mk          |  3 +--
 keyboards/noxary/valhalla/rules.mk       |  2 +-
 keyboards/paprikman/albacore/rules.mk    |  5 +----
 keyboards/peej/rosaline/rules.mk         |  2 +-
 keyboards/ramonimbao/mona/v32a/rules.mk  |  3 +--
 keyboards/reviung/reviung53/rules.mk     |  3 +--
 keyboards/senselessclay/gos65/rules.mk   | 13 +++++--------
 keyboards/viktus/smolka/rules.mk         |  3 +--
 keyboards/wren/rules.mk                  |  7 +++----
 21 files changed, 28 insertions(+), 59 deletions(-)

diff --git a/keyboards/adalyn/rules.mk b/keyboards/adalyn/rules.mk
index 078a9bca06..4574cfd83a 100644
--- a/keyboards/adalyn/rules.mk
+++ b/keyboards/adalyn/rules.mk
@@ -12,11 +12,8 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
+NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 COMBO_ENABLE = no
diff --git a/keyboards/contender/rules.mk b/keyboards/contender/rules.mk
index 72c7f6b2ff..155e14ca68 100644
--- a/keyboards/contender/rules.mk
+++ b/keyboards/contender/rules.mk
@@ -12,8 +12,7 @@ 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
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no            # USB Nkey Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/deltapad/rules.mk b/keyboards/deltapad/rules.mk
index 9906266f48..1275531ef6 100644
--- a/keyboards/deltapad/rules.mk
+++ b/keyboards/deltapad/rules.mk
@@ -12,10 +12,7 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no            # USB Nkey Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/dtisaac/cg108/rules.mk b/keyboards/dtisaac/cg108/rules.mk
index 5786064c56..e0403a960b 100644
--- a/keyboards/dtisaac/cg108/rules.mk
+++ b/keyboards/dtisaac/cg108/rules.mk
@@ -15,5 +15,4 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/dtisaac/dosa40rgb/rules.mk b/keyboards/dtisaac/dosa40rgb/rules.mk
index 58f478a96c..91d3c94ba5 100644
--- a/keyboards/dtisaac/dosa40rgb/rules.mk
+++ b/keyboards/dtisaac/dosa40rgb/rules.mk
@@ -15,7 +15,6 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes      # Enable Bluetooth
 BLUETOOTH_DRIVER = AdafruitBLE
diff --git a/keyboards/edi/hardlight/mk2/rules.mk b/keyboards/edi/hardlight/mk2/rules.mk
index b3ff36943f..3ee5e5a9c4 100644
--- a/keyboards/edi/hardlight/mk2/rules.mk
+++ b/keyboards/edi/hardlight/mk2/rules.mk
@@ -15,10 +15,7 @@ MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
+NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/eternal_keypad/rules.mk b/keyboards/eternal_keypad/rules.mk
index ef9b9d80de..e0403a960b 100644
--- a/keyboards/eternal_keypad/rules.mk
+++ b/keyboards/eternal_keypad/rules.mk
@@ -12,7 +12,7 @@ MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # USB Nkey Rollover
+NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/handwired/carpolly/rules.mk b/keyboards/handwired/carpolly/rules.mk
index a7f3367d86..0cc90c1160 100644
--- a/keyboards/handwired/carpolly/rules.mk
+++ b/keyboards/handwired/carpolly/rules.mk
@@ -15,7 +15,6 @@ COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 
 # generated by KBFirmware JSON to QMK Parser
diff --git a/keyboards/handwired/croxsplit44/rules.mk b/keyboards/handwired/croxsplit44/rules.mk
index 0b2170c456..87f77b103a 100644
--- a/keyboards/handwired/croxsplit44/rules.mk
+++ b/keyboards/handwired/croxsplit44/rules.mk
@@ -12,10 +12,7 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no            # USB Nkey Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk
index 0fd9955715..a0120c8159 100644
--- a/keyboards/handwired/dygma/raise/rules.mk
+++ b/keyboards/handwired/dygma/raise/rules.mk
@@ -12,7 +12,7 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = no        # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # USB Nkey Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/handwired/ortho_brass/rules.mk b/keyboards/handwired/ortho_brass/rules.mk
index 19154c58f9..4e3b0d925a 100644
--- a/keyboards/handwired/ortho_brass/rules.mk
+++ b/keyboards/handwired/ortho_brass/rules.mk
@@ -1,7 +1,7 @@
 # MCU name
 MCU = atmega32u4
 
-# Bootloader
+# Bootloader selection
 BOOTLOADER = qmk-dfu
 
 # Build Options
@@ -10,13 +10,10 @@ MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # N-key Rollover
+NKRO_ENABLE = yes           # Enable N-key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable RGB underlight.
 
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
 LAYOUTS = ortho_4x12
 
 RGBLIGHT_SUPPORTED = no
diff --git a/keyboards/jolofsor/denial75/rules.mk b/keyboards/jolofsor/denial75/rules.mk
index 0d5a61e255..61ec6a921a 100644
--- a/keyboards/jolofsor/denial75/rules.mk
+++ b/keyboards/jolofsor/denial75/rules.mk
@@ -12,8 +12,7 @@ MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes           # USB Nkey Rollover
+NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/matrix/abelx/rules.mk b/keyboards/matrix/abelx/rules.mk
index ac00984eae..d4a065662b 100644
--- a/keyboards/matrix/abelx/rules.mk
+++ b/keyboards/matrix/abelx/rules.mk
@@ -28,7 +28,7 @@ USE_FPU = yes
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
@@ -36,7 +36,6 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 NO_USB_STARTUP_CHECK = yes  # Disable initialization only when usb is plugged in
 
diff --git a/keyboards/noxary/valhalla/rules.mk b/keyboards/noxary/valhalla/rules.mk
index f7365adecf..75490909f3 100644
--- a/keyboards/noxary/valhalla/rules.mk
+++ b/keyboards/noxary/valhalla/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = stm32-dfu
 # Build options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
diff --git a/keyboards/paprikman/albacore/rules.mk b/keyboards/paprikman/albacore/rules.mk
index baf1b10f28..cbfd971b0f 100644
--- a/keyboards/paprikman/albacore/rules.mk
+++ b/keyboards/paprikman/albacore/rules.mk
@@ -12,10 +12,7 @@ MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no            # USB Nkey Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/peej/rosaline/rules.mk b/keyboards/peej/rosaline/rules.mk
index d8133b74ab..d1dde8af62 100644
--- a/keyboards/peej/rosaline/rules.mk
+++ b/keyboards/peej/rosaline/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega328p
 
 # Bootloader selection
-BOOTLOADER = USBasp
+BOOTLOADER = usbasploader
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/ramonimbao/mona/v32a/rules.mk b/keyboards/ramonimbao/mona/v32a/rules.mk
index 0ed8962504..fe2be33f82 100644
--- a/keyboards/ramonimbao/mona/v32a/rules.mk
+++ b/keyboards/ramonimbao/mona/v32a/rules.mk
@@ -15,8 +15,7 @@ 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
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no            # USB Nkey Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/reviung/reviung53/rules.mk b/keyboards/reviung/reviung53/rules.mk
index 90670e4b9e..bc1c6f2dc0 100644
--- a/keyboards/reviung/reviung53/rules.mk
+++ b/keyboards/reviung/reviung53/rules.mk
@@ -12,8 +12,7 @@ MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no            # USB Nkey Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/senselessclay/gos65/rules.mk b/keyboards/senselessclay/gos65/rules.mk
index 08b268c041..b5761555d4 100644
--- a/keyboards/senselessclay/gos65/rules.mk
+++ b/keyboards/senselessclay/gos65/rules.mk
@@ -7,15 +7,12 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes     # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = no       # Mouse keys
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes            # USB Nkey Rollover
+NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/viktus/smolka/rules.mk b/keyboards/viktus/smolka/rules.mk
index 04821bd6e7..5f58c5684b 100644
--- a/keyboards/viktus/smolka/rules.mk
+++ b/keyboards/viktus/smolka/rules.mk
@@ -12,8 +12,7 @@ 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
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = yes            # USB Nkey Rollover
+NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/wren/rules.mk b/keyboards/wren/rules.mk
index 76e0fdf55d..7fa6b51f4b 100644
--- a/keyboards/wren/rules.mk
+++ b/keyboards/wren/rules.mk
@@ -12,10 +12,9 @@ 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
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no            # USB Nkey Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes       # Enables the use of one or more encoders
-SPLIT_KEYBOARD = yes       # Enables split keyboard
+ENCODER_ENABLE = yes        # Enables the use of one or more encoders
+SPLIT_KEYBOARD = yes        # Enables split keyboard

From 0a2a7641558a80aeb115c14cb99655132c30413b Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 26 Jan 2022 11:23:18 -0800
Subject: [PATCH 383/867] Krush60 Solder Refactor (#16029)

* solder.h: add matrix diagram

* solder.h: remove unnecessary comments

* rework LAYOUT_60_iso to LAYOUT_60_isoenter_split_bs

True ISO layouts are not supported on this keyboard because the PCB lacks support for split Left Shift. Renames the `iso` to `isoenter` to specify this.

- denotes use of Split Backspace
- move Backslash keycode to home row

* info.json: remove trailing whitespace

* info.json: clean up

Sort the layout trees into the same order as `solder.h`, and remove the `LAYOUT_60_all` tree (doesn't exist in source).

* solder.h: align positional arguments

Helps me proof-read the layouts at a glance. No logic change.

* fix syntax errors in keymaps

* remove ISO layouts

As previously noted, ISO layouts are not supported due to the PCB's lack of support for split Left Shift.

* rename LAYOUT_60_ansi_tsangan_split_bs to LAYOUT_60_tsangan_hhkb

Also renames `60_tsangan_splt_bs` keymap to `60_tsangan_hhkb`.

* rename LAYOUT_60_ansi_tsangan to LAYOUT_60_ansi_tsangan_split_rshift

Also renames `60_tsangan` keymap to `60_ansi_tsangan_split_rshift`.

* rename LAYOUT_60_ansi_arrow_split_bs_7u_spc to LAYOUT_60_ansi_arrow_tsangan_split_bs

Also rename `60_ansi_arrow_splt_bs_7u` to `60_ansi_arrow_tsangan_split_bs`.

* rename LAYOUT_60_ansi_arrow_7u_spc to LAYOUT_60_ansi_arrow_tsangan

Also renames `60_ansi_arrow_7u` keymap to `60_ansi_arrow_tsangan`.

* rename keymaps based on layout macro used

Making this easier to track in my head while I work on it.

* info.json: fix syntax errors

* rename LAYOUT_60_ansi_split_bs_7u_spc to LAYOUT_60_ansi_tsangan_split_bs

- renames `60_ansi_split_bs_7u_spc` keymap to `60_ansi_tsangan_split_bs`
- removes `layout_aliases` entry from `info.json` (creates incompatible data conflict)

* rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan

- renames `60_ansi_7u_spc` keymap to `60_ansi_tsangan`

* info.json: remove LAYOUT_60_ansi_tsangan layout_aliases entry

Causes an incompatible data conflict.

* add second layer to 60_ansi keymap

* update via keymap

Now matches the behaviour of the default keymap.

* fix syntax errors in keymaps, take 2

* add RGB and Navigation keycodes

Adds RGB and Navigation keycodes to the `60_isoenter_split_bs`, `default` and `via` keymaps.
---
 .../krush/krush60/solder/info.json            | 551 ++++++------------
 .../krush60/solder/keymaps/60_all/keymap.c    |  35 --
 .../krush60/solder/keymaps/60_all/readme.md   |   1 -
 .../krush60/solder/keymaps/60_ansi/keymap.c   |  37 ++
 .../krush60/solder/keymaps/60_ansi/readme.md  |   3 +
 .../solder/keymaps/60_ansi_7u/readme.md       |   1 -
 .../solder/keymaps/60_ansi_arrow/keymap.c     |  16 +-
 .../solder/keymaps/60_ansi_arrow/readme.md    |   4 +-
 .../solder/keymaps/60_ansi_arrow_7u/readme.md |   1 -
 .../keymap.c                                  |  16 +-
 .../keymaps/60_ansi_arrow_split_bs/readme.md  |   4 +
 .../keymap.c                                  |  18 +-
 .../60_ansi_arrow_split_bs_spc/readme.md      |   5 +
 .../keymap.c                                  |  18 +-
 .../keymaps/60_ansi_arrow_split_spc/readme.md |   4 +
 .../keymaps/60_ansi_arrow_splt_bs/readme.md   |   1 -
 .../60_ansi_arrow_splt_bs_7u/readme.md        |   1 -
 .../60_ansi_arrow_splt_bs_spc/readme.md       |   1 -
 .../keymaps/60_ansi_arrow_splt_spc/readme.md  |   1 -
 .../keymap.c                                  |  20 +-
 .../keymaps/60_ansi_arrow_tsangan/readme.md   |   4 +
 .../keymap.c                                  |  22 +-
 .../60_ansi_arrow_tsangan_split_bs/readme.md  |   5 +
 .../solder/keymaps/60_ansi_split_bs/keymap.c  |  37 ++
 .../solder/keymaps/60_ansi_split_bs/readme.md |   4 +
 .../keymap.c                                  |  10 +-
 .../keymaps/60_ansi_split_bs_spc/readme.md    |   5 +
 .../keymap.c                                  |   8 +-
 .../keymaps/60_ansi_split_spc/readme.md       |   4 +
 .../solder/keymaps/60_ansi_splt_bs/keymap.c   |  35 --
 .../solder/keymaps/60_ansi_splt_bs/readme.md  |   1 -
 .../keymaps/60_ansi_splt_bs_7u/keymap.c       |  35 --
 .../keymaps/60_ansi_splt_bs_7u/readme.md      |   1 -
 .../keymaps/60_ansi_splt_bs_spc/readme.md     |   1 -
 .../solder/keymaps/60_ansi_splt_spc/readme.md |   1 -
 .../{60_ansi_7u => 60_ansi_tsangan}/keymap.c  |  20 +-
 .../solder/keymaps/60_ansi_tsangan/readme.md  |   4 +
 .../keymaps/60_ansi_tsangan_split_bs/keymap.c |  37 ++
 .../60_ansi_tsangan_split_bs/readme.md        |   5 +
 .../keymap.c                                  |  23 +-
 .../60_ansi_tsangan_split_rshift/readme.md    |   5 +
 .../keymaps/60_isoenter_split_bs/keymap.c     |  38 ++
 .../keymaps/60_isoenter_split_bs/readme.md    |   5 +
 .../solder/keymaps/60_tsangan/readme.md       |   1 -
 .../keymap.c                                  |  22 +-
 .../solder/keymaps/60_tsangan_hhkb/readme.md  |   6 +
 .../keymaps/60_tsangan_splt_bs/readme.md      |   1 -
 .../krush60/solder/keymaps/default/keymap.c   |  39 +-
 .../krush60/solder/keymaps/default/readme.md  |   4 +-
 .../krush/krush60/solder/keymaps/via/keymap.c |  46 +-
 .../krush60/solder/keymaps/via/readme.md      |   2 +-
 .../krush/krush60/solder/solder.h             | 413 ++++++-------
 52 files changed, 755 insertions(+), 827 deletions(-)
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_all/keymap.c
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_all/readme.md
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/keymap.c
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/readme.md
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_7u/readme.md
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_7u/readme.md
 rename keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_arrow_splt_bs => 60_ansi_arrow_split_bs}/keymap.c (74%)
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/readme.md
 rename keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_arrow_splt_bs_spc => 60_ansi_arrow_split_bs_spc}/keymap.c (71%)
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/readme.md
 rename keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_arrow_splt_spc => 60_ansi_arrow_split_spc}/keymap.c (72%)
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/readme.md
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs/readme.md
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_7u/readme.md
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_spc/readme.md
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_spc/readme.md
 rename keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_arrow_7u => 60_ansi_arrow_tsangan}/keymap.c (71%)
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/readme.md
 rename keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_arrow_splt_bs_7u => 60_ansi_arrow_tsangan_split_bs}/keymap.c (70%)
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/readme.md
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/readme.md
 rename keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_splt_bs_spc => 60_ansi_split_bs_spc}/keymap.c (74%)
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/readme.md
 rename keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_splt_spc => 60_ansi_split_spc}/keymap.c (75%)
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/readme.md
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs/keymap.c
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs/readme.md
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_7u/keymap.c
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_7u/readme.md
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_spc/readme.md
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_spc/readme.md
 rename keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_ansi_7u => 60_ansi_tsangan}/keymap.c (71%)
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/readme.md
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/readme.md
 rename keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_tsangan => 60_ansi_tsangan_split_rshift}/keymap.c (67%)
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/readme.md
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/keymap.c
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/readme.md
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan/readme.md
 rename keyboards/sawnsprojects/krush/krush60/solder/keymaps/{60_tsangan_splt_bs => 60_tsangan_hhkb}/keymap.c (68%)
 create mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/readme.md
 delete mode 100644 keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_splt_bs/readme.md

diff --git a/keyboards/sawnsprojects/krush/krush60/solder/info.json b/keyboards/sawnsprojects/krush/krush60/solder/info.json
index 79f0aed87f..d95c475509 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush60/solder/info.json
@@ -2,6 +2,10 @@
     "keyboard_name": "Krush60 Solder",
     "url": "",
     "maintainer": "MaiTheSan",
+    "layout_aliases": {
+        "LAYOUT_60_ansi_arrow_split_bs_7u_spc": "LAYOUT_60_ansi_arrow_tsangan_split_bs",
+        "LAYOUT_60_ansi_arrow_7u_spc": "LAYOUT_60_ansi_arrow_tsangan"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -74,7 +78,7 @@
                 {"x":10, "y": 4},
                 {"x":11, "y": 4},
                 {"x":12, "y": 4},
-                {"x":13, "y": 4}, 
+                {"x":13, "y": 4},
                 {"x":14, "y": 4}
             ]
         },
@@ -147,78 +151,7 @@
                 {"x":13.75, "y":4, "w":1.25}
             ]
         },
-        "LAYOUT_60_ansi_arrow": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
-
-                {"x":0, "y":3, "w":2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3, "w":1.75},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
-
-                {"x":0, "y": 4, "w": 1.25},
-                {"x":1.25, "y": 4, "w": 1.25},
-                {"x":2.5, "y": 4, "w": 1.25},
-                {"x":3.75, "y": 4, "w": 6.25},
-                {"x":10, "y": 4},
-                {"x":11, "y": 4},
-                {"x":12, "y": 4},
-                {"x":13, "y": 4}, 
-                {"x":14, "y": 4}
-            ]
-        },
-        "LAYOUT_60_ansi_arrow_split_bs_7u_spc": {
+        "LAYOUT_60_isoenter_split_bs": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -249,7 +182,6 @@
                 {"x":10.5, "y":1},
                 {"x":11.5, "y":1},
                 {"x":12.5, "y":1},
-                {"x":13.5, "y":1, "w":1.5},
 
                 {"x":0, "y":2, "w":1.75},
                 {"x":1.75, "y":2},
@@ -263,9 +195,10 @@
                 {"x":9.75, "y":2},
                 {"x":10.75, "y":2},
                 {"x":11.75, "y":2},
-                {"x":12.75, "y":2, "w":2.25},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
 
-                {"x":0, "y":3, "w":2.25},
+                {"x": 0, "y": 3, "w": 2.25},
                 {"x":2.25, "y":3},
                 {"x":3.25, "y":3},
                 {"x":4.25, "y":3},
@@ -275,18 +208,17 @@
                 {"x":8.25, "y":3},
                 {"x":9.25, "y":3},
                 {"x":10.25, "y":3},
-                {"x":11.25, "y":3, "w":1.75},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
 
-                {"x":0, "y": 4, "w": 1.5},
-                {"x":1.5, "y": 4},
-                {"x":2.5, "y": 4, "w": 1.5},
-                {"x":4, "y": 4, "w": 7},
-                {"x":11, "y": 4},
-                {"x":12, "y": 4},
-                {"x":13, "y": 4},
-                {"x":14, "y": 4}
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
             ]
         },
         "LAYOUT_60_ansi_split_bs": {
@@ -502,7 +434,7 @@
                 {"x":13.75, "y":4, "w":1.25}
             ]
         },
-        "LAYOUT_60_ansi_7u_spc": {
+        "LAYOUT_60_ansi_tsangan": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -567,10 +499,10 @@
                 {"x":4, "y": 4, "w": 7},
                 {"x":11, "y": 4, "w": 1.5},
                 {"x":12.5, "y": 4},
-                {"x":13.5, "y": 4, "w": 1.5},
+                {"x":13.5, "y": 4, "w": 1.5}
             ]
         },
-        "LAYOUT_60_ansi_split_bs_7u_spc": {
+        "LAYOUT_60_ansi_tsangan_split_bs": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -636,7 +568,7 @@
                 {"x": 4, "y": 4, "w": 7},
                 {"x": 11, "y": 4, "w": 1.5},
                 {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5},
+                {"x": 13.5, "y": 4, "w": 1.5}
             ]
         },
         "LAYOUT_60_ansi_arrow_split_bs": {
@@ -707,7 +639,7 @@
                 {"x":10, "y": 4},
                 {"x":11, "y": 4},
                 {"x":12, "y": 4},
-                {"x":13, "y": 4}, 
+                {"x":13, "y": 4},
                 {"x":14, "y": 4}
             ]
         },
@@ -780,7 +712,7 @@
                 {"x":10, "y": 4},
                 {"x":11, "y": 4},
                 {"x":12, "y": 4},
-                {"x":13, "y": 4}, 
+                {"x":13, "y": 4},
                 {"x":14, "y": 4}
             ]
         },
@@ -854,11 +786,11 @@
                 {"x":10, "y": 4},
                 {"x":11, "y": 4},
                 {"x":12, "y": 4},
-                {"x":13, "y": 4}, 
+                {"x":13, "y": 4},
                 {"x":14, "y": 4}
             ]
         },
-        "LAYOUT_60_ansi_arrow_7u_spc": {
+        "LAYOUT_60_ansi_arrow_tsangan": {
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},
@@ -928,7 +860,149 @@
                 {"x":14, "y": 4}
             ]
         },
-        "LAYOUT_60_ansi_tsangan": {
+        "LAYOUT_60_ansi_arrow": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
+
+                {"x":0, "y": 4, "w": 1.25},
+                {"x":1.25, "y": 4, "w": 1.25},
+                {"x":2.5, "y": 4, "w": 1.25},
+                {"x":3.75, "y": 4, "w": 6.25},
+                {"x":10, "y": 4},
+                {"x":11, "y": 4},
+                {"x":12, "y": 4},
+                {"x":13, "y": 4},
+                {"x":14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_ansi_arrow_tsangan_split_bs": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3, "w":1.75},
+                {"x":13, "y":3},
+                {"x":14, "y":3},
+
+                {"x":0, "y": 4, "w": 1.5},
+                {"x":1.5, "y": 4},
+                {"x":2.5, "y": 4, "w": 1.5},
+                {"x":4, "y": 4, "w": 7},
+                {"x":11, "y": 4},
+                {"x":12, "y": 4},
+                {"x":13, "y": 4},
+                {"x":14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan_split_rshift": {
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},
@@ -994,10 +1068,10 @@
                 {"x": 4, "y": 4, "w": 7},
                 {"x": 11, "y": 4, "w": 1.5},
                 {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5},
+                {"x": 13.5, "y": 4, "w": 1.5}
             ]
         },
-        "LAYOUT_60_ansi_tsangan_split_bs": {
+        "LAYOUT_60_tsangan_hhkb": {
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},
@@ -1064,286 +1138,7 @@
                 {"x": 4, "y": 4, "w": 7},
                 {"x": 11, "y": 4, "w": 1.5},
                 {"x": 12.5, "y": 4},
-                {"x": 13.5, "y": 4, "w": 1.5},
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-
-                {"x":0, "y": 4, "w": 1.5},
-                {"x":1.5, "y": 4},
-                {"x":2.5, "y": 4, "w": 1.5},
-                {"x":4, "y": 4, "w": 7},
-                {"x":11, "y": 4, "w": 1.5},
-                {"x":12.5, "y": 4},
-                {"x":13.5, "y": 4, "w": 1.5},
-            ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x":2.25, "y":3},
-                {"x":3.25, "y":3},
-                {"x":4.25, "y":3},
-                {"x":5.25, "y":3},
-                {"x":6.25, "y":3},
-                {"x":7.25, "y":3},
-                {"x":8.25, "y":3},
-                {"x":9.25, "y":3},
-                {"x":10.25, "y":3},
-                {"x":11.25, "y":3},
-                {"x":12.25, "y":3, "w":2.75},
-
-                {"x":0, "y":4, "w":1.25},
-                {"x":1.25, "y":4, "w":1.25},
-                {"x":2.5, "y":4, "w":1.25},
-                {"x":3.75, "y":4, "w":6.25},
-                {"x":10, "y":4, "w":1.25},
-                {"x":11.25, "y":4, "w":1.25},
-                {"x":12.5, "y":4, "w":1.25},
-                {"x":13.75, "y":4, "w":1.25}
-            ]
-        },
-        "LAYOUT_60_iso_tsangan": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0},
-                {"x":14, "y":0},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 1.75},
-                {"x": 14, "y": 3},
-
-                {"x":0, "y": 4, "w": 1.5},
-                {"x":1.5, "y": 4},
-                {"x":2.5, "y": 4, "w": 1.5},
-                {"x":4, "y": 4, "w": 7},
-                {"x":11, "y": 4, "w": 1.5},
-                {"x":12.5, "y": 4},
-                {"x":13.5, "y": 4, "w": 1.5},
-            ]
-        },
-        "LAYOUT_60_all": {
-            "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7, "y":0},
-                {"x":8, "y":0},
-                {"x":9, "y":0},
-                {"x":10, "y":0},
-                {"x":11, "y":0},
-                {"x":12, "y":0},
-                {"x":13, "y":0, "w":2},
-
-                {"x":0, "y":1, "w":1.5},
-                {"x":1.5, "y":1},
-                {"x":2.5, "y":1},
-                {"x":3.5, "y":1},
-                {"x":4.5, "y":1},
-                {"x":5.5, "y":1},
-                {"x":6.5, "y":1},
-                {"x":7.5, "y":1},
-                {"x":8.5, "y":1},
-                {"x":9.5, "y":1},
-                {"x":10.5, "y":1},
-                {"x":11.5, "y":1},
-                {"x":12.5, "y":1},
-
-                {"x":0, "y":2, "w":1.75},
-                {"x":1.75, "y":2},
-                {"x":2.75, "y":2},
-                {"x":3.75, "y":2},
-                {"x":4.75, "y":2},
-                {"x":5.75, "y":2},
-                {"x":6.75, "y":2},
-                {"x":7.75, "y":2},
-                {"x":8.75, "y":2},
-                {"x":9.75, "y":2},
-                {"x":10.75, "y":2},
-                {"x":11.75, "y":2},
-                {"x":12.75, "y":2},
-                {"x":13.75, "y":1, "w":1.25, "h":2},
-
-                {"x":0, "y":3, "w":2},
-                {"x":2, "y":3},
-                {"x":3, "y":3},
-                {"x":4, "y":3},
-                {"x":5, "y":3},
-                {"x":6, "y":3},
-                {"x":7, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":3},
-                {"x":10, "y":3},
-                {"x":11, "y":3},
-                {"x":12, "y":3},
-                {"x":13, "y":3},
-                {"x":14, "y":3},
-
-                {"x":0, "y": 4, "w": 1.5},
-                {"x":1.5, "y": 4},
-                {"x":2.5, "y": 4, "w": 1.5},
-                {"x":4, "y": 4, "w": 7},
-                {"x":11, "y": 4, "w": 1.5},
-                {"x":12.5, "y": 4},
-                {"x":13.5, "y": 4, "w": 1.5},
+                {"x": 13.5, "y": 4, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_all/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_all/keymap.c
deleted file mode 100644
index b8b48194a6..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_all/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, 
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_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_SLSH, 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT  
-    ),
-    [1] = LAYOUT_all(
-        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_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,  
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
-    ),
-};
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_all/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_all/readme.md
deleted file mode 100644
index e8ab0065f2..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_all/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder full layout
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/keymap.c
new file mode 100644
index 0000000000..922ed190f6
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2021 REPLACE_WITH_YOUR_NAME
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_60_ansi(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/readme.md
new file mode 100644
index 0000000000..56cc403367
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi/readme.md
@@ -0,0 +1,3 @@
+# The 60_ansi keymap for krush60 solder
+
+* Standard 60% ANSI layout
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_7u/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_7u/readme.md
deleted file mode 100644
index b7ec93ca7b..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_7u/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder layout ansi 7U
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/keymap.c
index b6fb88bb8a..b198c248bb 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/keymap.c
@@ -24,12 +24,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_RSFT, KC_UP,   KC_SLSH,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    )
+    ),
+
     [1] = LAYOUT_60_ansi_arrow(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
\ No newline at end of file
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/readme.md
index 561b615d24..d601194a07 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/readme.md
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow/readme.md
@@ -1 +1,3 @@
-# The keymap for krush60 solder layout ansi arrow
\ No newline at end of file
+# The 60_ansi_arrow keymap for krush60 solder
+
+* 60% ANSI with Arrows layout
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_7u/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_7u/readme.md
deleted file mode 100644
index 578753b3ae..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_7u/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder layout ansi 7U arrow
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/keymap.c
similarity index 74%
rename from keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs/keymap.c
rename to keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/keymap.c
index 8ba292cfd4..7d31b685d3 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/keymap.c
@@ -24,12 +24,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_RSFT, KC_UP,   KC_SLSH,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    )
+    ),
+
     [1] = LAYOUT_60_ansi_arrow_split_bs(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______
+    ),
+
 };
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/readme.md
new file mode 100644
index 0000000000..618b721d22
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs/readme.md
@@ -0,0 +1,4 @@
+# The 60_ansi_arrow_split_bs keymap for krush60 solder
+
+* 60% ANSI with Arrows layout
+  * split Backspace
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_spc/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/keymap.c
similarity index 71%
rename from keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_spc/keymap.c
rename to keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/keymap.c
index 8673ce02d1..ff75a4903f 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_spc/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/keymap.c
@@ -23,13 +23,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    )
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
     [1] = LAYOUT_60_ansi_arrow_split_bs_spc(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, 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_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
+    ),
+
 };
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/readme.md
new file mode 100644
index 0000000000..db21ea0871
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_bs_spc/readme.md
@@ -0,0 +1,5 @@
+# The 60_ansi_arrow_split_bs_spc keymap for krush60 solder
+
+* 60% ANSI with Arrows layout
+  * split Backspace
+  * split Spacebar
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_spc/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/keymap.c
similarity index 72%
rename from keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_spc/keymap.c
rename to keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/keymap.c
index 1da11323e4..95ad0386a5 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_spc/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/keymap.c
@@ -23,15 +23,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    )
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
     [1] = LAYOUT_60_ansi_arrow_split_spc(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
+    ),
+
 };
-
-
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/readme.md
new file mode 100644
index 0000000000..68409cf47a
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_split_spc/readme.md
@@ -0,0 +1,4 @@
+# The 60_ansi_arrow_split_spc keymap for krush60 solder
+
+* 60% ANSI with Arrows layout
+  * split Spacebar
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs/readme.md
deleted file mode 100644
index 505c1ec9bc..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder layout ansi arrow split backspace
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_7u/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_7u/readme.md
deleted file mode 100644
index 059534d5df..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_7u/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder layout ansi arrow, 7u spacebar & split backspace
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_spc/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_spc/readme.md
deleted file mode 100644
index 2355c409a0..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_spc/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder layout ansi arrow, split spacebar & split backspace
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_spc/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_spc/readme.md
deleted file mode 100644
index af2fce05c2..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_spc/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder layout ansi arrow & split spacebar
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_7u/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/keymap.c
similarity index 71%
rename from keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_7u/keymap.c
rename to keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/keymap.c
index f22e073bf5..9e3ad13073 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_7u/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/keymap.c
@@ -18,18 +18,20 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_60_ansi_arrow_7u_spc(
+    [0] = LAYOUT_60_ansi_arrow_tsangan(
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    )
-    [1] = LAYOUT_60_ansi_arrow_7u_spc(
+    ),
+
+    [1] = LAYOUT_60_ansi_arrow_tsangan(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
\ No newline at end of file
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/readme.md
new file mode 100644
index 0000000000..6590eb3034
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan/readme.md
@@ -0,0 +1,4 @@
+# The 60_ansi_arrow_tsangan keymap for krush60 solder
+
+* 60% ANSI with Arrows layout
+  * 7u Spacebar
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_7u/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/keymap.c
similarity index 70%
rename from keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_7u/keymap.c
rename to keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/keymap.c
index 56a713d56e..e5723c0807 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_splt_bs_7u/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/keymap.c
@@ -18,18 +18,20 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_60_ansi_arrow_split_bs_7u_spc(
+    [0] = LAYOUT_60_ansi_arrow_tsangan_split_bs(
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT, KC_UP,   KC_SLSH,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
-    )
-    [1] = LAYOUT_60_ansi_arrow_split_bs_7u_spc(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
\ No newline at end of file
+    ),
+
+    [1] = LAYOUT_60_ansi_arrow_tsangan_split_bs(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/readme.md
new file mode 100644
index 0000000000..b48a892a23
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_arrow_tsangan_split_bs/readme.md
@@ -0,0 +1,5 @@
+# The 60_ansi_arrow_tsangan_split_bs keymap for krush60 solder
+
+* 60% ANSI with Arrows layout
+  * 7u Spacebar
+  * split Backspace
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c
new file mode 100644
index 0000000000..1e9d26d20d
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2021 SawnsProjects
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_60_ansi_split_bs(
+        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_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_ansi_split_bs(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/readme.md
new file mode 100644
index 0000000000..b0075b8c7b
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs/readme.md
@@ -0,0 +1,4 @@
+# The 60_ansi_split_bs keymap for krush60 solder
+
+* 60% ANSI layout
+  * split Backspace
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_spc/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c
similarity index 74%
rename from keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_spc/keymap.c
rename to keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c
index e3982e2507..88a87b3f0d 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_spc/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/keymap.c
@@ -26,10 +26,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI,          MO(1),   KC_RCTL),
 
     [1] = LAYOUT_60_ansi_split_bs_spc(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN,          _______,
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______)
 };
 
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/readme.md
new file mode 100644
index 0000000000..922e791c40
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_bs_spc/readme.md
@@ -0,0 +1,5 @@
+# The 60_ansi_split_bs_spc keymap for krush60 solder
+
+* 60% ANSI layout
+  * split Backspace
+  * split Spacebar
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_spc/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/keymap.c
similarity index 75%
rename from keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_spc/keymap.c
rename to keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/keymap.c
index abcd186ccc..f180ac68b1 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_spc/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/keymap.c
@@ -27,9 +27,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT_60_ansi_split_spc(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
+        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN,          _______,
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______,          _______, _______)
 };
 
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/readme.md
new file mode 100644
index 0000000000..d98e08c875
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_split_spc/readme.md
@@ -0,0 +1,4 @@
+# The 60_ansi_split_spc keymap for krush60 solder
+
+* 60% ANSI layout
+  * split Spacebar
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs/keymap.c
deleted file mode 100644
index ff0fd21deb..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_60_ansi_split_bs(
-        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_BSPC,
-        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI,          MO(1),   KC_RCTL),
-
-    [0] = LAYOUT_60_ansi_split_bs(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs/readme.md
deleted file mode 100644
index 80634c350f..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder layout split backspace
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_7u/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_7u/keymap.c
deleted file mode 100644
index 431fb483fd..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_7u/keymap.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_60_ansi_split_bs_7u_spc(
-        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_BSPC,
-        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                               KC_RALT, MO(1),   KC_RCTL),
-
-    [0] = LAYOUT_60_ansi_split_bs_7u_spc(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
-        KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP, KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,  KC_TRNS, KC_DEL,  KC_END,  KC_PGDN,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                              KC_TRNS, KC_TRNS, KC_TRNS)
-};
-
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_7u/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_7u/readme.md
deleted file mode 100644
index 70b3a8617b..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_7u/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder layout 7u spacebar & split backspace
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_spc/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_spc/readme.md
deleted file mode 100644
index 6e1981c3ce..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_bs_spc/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder layout split spacebar & split backspace
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_spc/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_spc/readme.md
deleted file mode 100644
index 80634c350f..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_splt_spc/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder layout split backspace
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_7u/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/keymap.c
similarity index 71%
rename from keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_7u/keymap.c
rename to keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/keymap.c
index 3d454579cb..17a06223eb 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_7u/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/keymap.c
@@ -18,20 +18,20 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_60_ansi_7u_spc(
+    [0] = LAYOUT_60_ansi_tsangan(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL
-    )
-    [1] = LAYOUT_60_ansi_7u_spc(
+    ),
+
+    [1] = LAYOUT_60_ansi_tsangan(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
-    )
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN,          _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______
+    ),
+
 };
-
-
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/readme.md
new file mode 100644
index 0000000000..11453644ea
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan/readme.md
@@ -0,0 +1,4 @@
+# The 60_ansi_tsangan keymap for krush60 solder
+
+* 60% ANSI layout
+  * Tsangan bottom row
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c
new file mode 100644
index 0000000000..e749252274
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2021 SawnsProjects
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_60_ansi_tsangan_split_bs(
+        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_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_ansi_tsangan_split_bs(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
+        _______,          _______, _______, _______, _______, _______,_______,  _______, KC_DEL,  KC_END,  KC_PGDN,          _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/readme.md
new file mode 100644
index 0000000000..5bc89c6b26
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_bs/readme.md
@@ -0,0 +1,5 @@
+# The 60_ansi_tsangan_split_bs keymap for krush60 solder
+
+* 60% ANSI layout
+  * Tsangan bottom row
+  * split Backspace
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/keymap.c
similarity index 67%
rename from keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan/keymap.c
rename to keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/keymap.c
index cc8067cc99..71bec072c6 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/keymap.c
@@ -18,19 +18,20 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_60_ansi_tsangan(
+    [0] = LAYOUT_60_ansi_tsangan_split_rshift(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         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, MO(1),
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL
-    )
-    [1] = LAYOUT_60_ansi_tsangan(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
-    )
-};
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
+    ),
 
+    [1] = LAYOUT_60_ansi_tsangan_split_rshift(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/readme.md
new file mode 100644
index 0000000000..63bfb36224
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_ansi_tsangan_split_rshift/readme.md
@@ -0,0 +1,5 @@
+# The 60_ansi_tsangan_split_rshift keymap for krush60 solder
+
+* 60% ANSI layout
+  * Tsangan bottom row
+  * split Right Shift
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/keymap.c
new file mode 100644
index 0000000000..3a4e0d4ab9
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2021 SawnsProjects
+ *           2022 QMK / James Young (@noroadsleft)
+*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_60_isoenter_split_bs(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_isoenter_split_bs(
+        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,  _______, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/readme.md
new file mode 100644
index 0000000000..1a837607e9
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_isoenter_split_bs/readme.md
@@ -0,0 +1,5 @@
+# The 60_isoenter_split_bs keymap for krush60
+
+* 60% ANSI layout
+  * ISO Enter with 2.25u Left Shift
+  * split Backspace
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan/readme.md
deleted file mode 100644
index 5bdb4a1026..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder Tsangan
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_splt_bs/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/keymap.c
similarity index 68%
rename from keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_splt_bs/keymap.c
rename to keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/keymap.c
index 9fba9e6bf3..e557c078aa 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_splt_bs/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/keymap.c
@@ -18,18 +18,20 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_60_ansi_tsangan_split_bs(
+    [0] = LAYOUT_60_tsangan_hhkb(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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, MO(1),
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL
-    )
-    [1] = LAYOUT_60_ansi_tsangan_split_bs(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_TRNS,
-        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_HOME, KC_PGUP,          KC_TRNS,
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
-    )
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_tsangan_hhkb(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______,
+        _______, _______, _______,                            _______,                                     _______, _______, _______
+    ),
+
 };
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/readme.md
new file mode 100644
index 0000000000..3d98346483
--- /dev/null
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_hhkb/readme.md
@@ -0,0 +1,6 @@
+# The 60_tsangan_hhkb keymap for krush60 solder
+
+* 60% ANSI layout
+  * Tsangan bottom row
+  * split Backspace
+  * split Right Shift
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_splt_bs/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_splt_bs/readme.md
deleted file mode 100644
index 03c0444cc6..0000000000
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/60_tsangan_splt_bs/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush60 solder Tsangan & split backspace
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/keymap.c
index f1ef9911dd..6e194461c4 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 REPLACE_WITH_YOUR_NAME
+/* Copyright 2021 SawnsProjects
  *
  * 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
@@ -17,24 +17,21 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /*
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
-     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
-     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
-     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
-     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
-     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│
-     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
-     */
-    [0] = LAYOUT_60_ansi(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL
-    )
+
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_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_SLSH,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT_all(
+        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,  _______, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,                   _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
+    ),
+
 };
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/readme.md
index 88157e507e..1f6a41724d 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/readme.md
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/default/readme.md
@@ -1 +1,3 @@
-# The keymap default for krush60
\ No newline at end of file
+# The default keymap for krush60 solder
+
+Assigns a keycode to every possible switch location.
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c
index 6f033b17cb..f9a62db7d3 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/keymap.c
@@ -19,31 +19,35 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_all(
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, 
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_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_RSFT,   KC_SLSH, 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(0),   KC_LEFT, KC_RALT, KC_RCTL  
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_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_SLSH,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
+
     [1] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,  
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  
+        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,  _______, _______,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,  KC_HOME, KC_PGUP,                   _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
     ),
+
     [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,  
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
     ),
+
     [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,  
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  
-    ),    
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______, _______
+    ),
+
 };
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/readme.md b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/readme.md
index 8f8d7a19bd..a7ca3b9c27 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/readme.md
+++ b/keyboards/sawnsprojects/krush/krush60/solder/keymaps/via/readme.md
@@ -1 +1 @@
-# The keymap VIA for krush60
\ No newline at end of file
+# The VIA keymap for krush60 solder
diff --git a/keyboards/sawnsprojects/krush/krush60/solder/solder.h b/keyboards/sawnsprojects/krush/krush60/solder/solder.h
index ede9c07452..9fb7f834f2 100644
--- a/keyboards/sawnsprojects/krush/krush60/solder/solder.h
+++ b/keyboards/sawnsprojects/krush/krush60/solder/solder.h
@@ -17,14 +17,44 @@
 #pragma once
 
 #include "quantum.h"
+
 #define XXX KC_NO
-//x
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+ * │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │26 │17 │      │26     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤      └─┬─────┤
+ * │20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │36 │46   │        │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤     ┌──┴┐47  │ ISO Enter
+ * │40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │47      │     │46 │    │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌─┴───┴────┤                ┌──────┬───┬───┐
+ * │60      │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │66    │77 │   │66        │ 2.75u RShift   │75    │66 │77 │ 1.75/1/1u RShift
+ * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤   └──────────┘                └──────┴───┴───┘
+ * │80  │90  │81  │82      │92  │84        │94 │85 │86 │95 │97 │ Split Space Arrow
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+ * ┌────┬────┬────┬────────┬────┬──────────┬────┬────┬────┬────┐
+ * │80  │90  │81  │82      │92  │84        │94  │85  │95  │97  │ Split Space
+ * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+ * ┌────┬────┬────┬────────────────────────┬───┬───┬───┬───┬───┐
+ * │80  │90  │81  │92                      │94 │85 │86 │95 │97 │ 6.25u Arrow
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘
+ * ┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+ * │80  │90  │81  │92                      │94  │85  │95  │97  │ Standard
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ * ┌─────┬───┬─────┬───────────────────────────┬───┬───┬───┬───┐
+ * │80   │90 │81   │92                         │85 │86 │95 │97 │ 7u Arrow
+ * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ * │80   │90 │81   │92                         │85   │95 │97   │ 7u Tsangan/WKL/HHKB
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
 #define LAYOUT_all( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K77, \
-    K80, K90, K81, K82, K92, K84, K94, K85, K86, K95, K97  \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36,      K46, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,           K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K77, \
+    K80, K90, K81,           K82, K92, K84,           K94, K85, K86, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -38,14 +68,12 @@
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
 
-//LAYOUT_60_ansi
-//x
 #define LAYOUT_60_ansi( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K92, K94, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,                K92,                K94, K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
@@ -58,14 +86,13 @@
     { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_iso
-//x
-#define LAYOUT_60_iso(\
+
+#define LAYOUT_60_isoenter_split_bs(\
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K92, K94, K85, K95, K97  \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36,      \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,                K92,                K94, K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -78,13 +105,13 @@
     { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_split_bs
+
 #define LAYOUT_60_ansi_split_bs( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K92, K94, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,                K92,                K94, K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -97,13 +124,13 @@
     { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_split_spc
+
 #define LAYOUT_60_ansi_split_spc( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K82, K92, K84, K94, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,           K82, K92, K84,           K94, K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
@@ -116,13 +143,13 @@
     { K80, K81, K82, XXX, K84, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_split_bs_spc
+
 #define LAYOUT_60_ansi_split_bs_spc( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K82, K92, K84, K94, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,           K82, K92, K84,           K94, K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -135,167 +162,165 @@
     { K80, K81, K82, XXX, K84, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_7u_spc
-#define LAYOUT_60_ansi_7u_spc( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K92, K85, K95, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
-    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
-    { K60, K61, K62, K63, K64, K65, K66, XXX }, \
-    { K70, K71, K72, K73, K74, XXX, XXX, XXX }, \
-    { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
-    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
-}
-//LAYOUT_60_ansi_split_7u_spc
-#define LAYOUT_60_ansi_split_bs_7u_spc( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, \
-    K80, K90, K81, K92, K85, K95, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
-    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
-    { K60, K61, K62, K63, K64, K65, K66, XXX }, \
-    { K70, K71, K72, K73, K74, XXX, XXX, XXX }, \
-    { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
-    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
-}
-//LAYOUT_60_ansi_arrow_split_bs
-#define LAYOUT_60_ansi_arrow_split_bs( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
-    K80, K90, K81, K92, K94, K85, K86, K95, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
-    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
-    { K60, K61, K62, K63, K64, XXX, K66, XXX }, \
-    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
-    { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
-    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
-}
-//LAYOUT_60_ansi_arrow_split_spc
-#define LAYOUT_60_ansi_arrow_split_spc( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
-    K80, K90, K81, K82, K92, K84, K94, K85, K86, K95, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
-    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
-    { K60, K61, K62, K63, K64, XXX, K66, XXX }, \
-    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
-    { K80, K81, K82, XXX, K84, K85, K86, XXX }, \
-    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
-}
-//LAYOUT_60_ansi_arrow_split_bs_spc
-#define LAYOUT_60_ansi_arrow_split_bs_spc( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
-    K80, K90, K81, K82, K92, K84, K94, K85, K86, K95, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
-    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
-    { K60, K61, K62, K63, K64, XXX, K66, XXX }, \
-    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
-    { K80, K81, K82, XXX, K84, K85, K86, XXX }, \
-    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
-}
-//LAYOUT_60_ansi_arrow_7u_spc
-#define LAYOUT_60_ansi_arrow_7u_spc( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
-    K80, K90, K81, K92, K85, K86, K95, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
-    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
-    { K60, K61, K62, K63, K64, XXX, K66, XXX }, \
-    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
-    { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
-    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
-}
-//LAYOUT_60_ansi_arrow
-//x
-#define LAYOUT_60_ansi_arrow( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
-    K80, K90, K81, K92, K94, K85, K86, K95, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
-    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
-    { K60, K61, K62, K63, K64, XXX, K66, XXX }, \
-    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
-    { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
-    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
-}
-//x
-//LAYOUT_60_ansi_arrow_split_bs_7u_spc
-#define LAYOUT_60_ansi_arrow_split_bs_7u_spc( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
-    K80, K90, K81, K92, K85, K86, K95, K97  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
-    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
-    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
-    { K60, K61, K62, K63, K64, XXX, K66, XXX }, \
-    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
-    { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
-    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
-}
-//LAYOUT_60_ansi_tsangan
+
 #define LAYOUT_60_ansi_tsangan( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, K77, \
-    K80, K90, K81, K92, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,                K92,                     K85, K95, K97  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
+    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
+    { K60, K61, K62, K63, K64, K65, K66, XXX }, \
+    { K70, K71, K72, K73, K74, XXX, XXX, XXX }, \
+    { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
+    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
+}
+
+#define LAYOUT_60_ansi_tsangan_split_bs( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65,      K66, \
+    K80, K90, K81,                K92,                     K85, K95, K97  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
+    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
+    { K60, K61, K62, K63, K64, K65, K66, XXX }, \
+    { K70, K71, K72, K73, K74, XXX, XXX, XXX }, \
+    { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
+    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
+}
+
+#define LAYOUT_60_ansi_arrow_split_bs( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
+    K80, K90, K81,                K92,           K94, K85, K86, K95, K97  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
+    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
+    { K60, K61, K62, K63, K64, XXX, K66, XXX }, \
+    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
+    { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
+    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
+}
+
+#define LAYOUT_60_ansi_arrow_split_spc( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
+    K80, K90, K81,           K82, K92, K84,      K94, K85, K86, K95, K97  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
+    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
+    { K60, K61, K62, K63, K64, XXX, K66, XXX }, \
+    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
+    { K80, K81, K82, XXX, K84, K85, K86, XXX }, \
+    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
+}
+
+#define LAYOUT_60_ansi_arrow_split_bs_spc( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
+    K80, K90, K81,           K82, K92, K84,      K94, K85, K86, K95, K97  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
+    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
+    { K60, K61, K62, K63, K64, XXX, K66, XXX }, \
+    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
+    { K80, K81, K82, XXX, K84, K85, K86, XXX }, \
+    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
+}
+
+#define LAYOUT_60_ansi_arrow_tsangan( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
+    K80, K90, K81,                K92,                K85, K86, K95, K97  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
+    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
+    { K60, K61, K62, K63, K64, XXX, K66, XXX }, \
+    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
+    { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
+    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
+}
+
+#define LAYOUT_60_ansi_arrow( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
+    K80, K90, K81,                K92,           K94, K85, K86, K95, K97  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
+    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
+    { K60, K61, K62, K63, K64, XXX, K66, XXX }, \
+    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
+    { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
+    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
+}
+
+#define LAYOUT_60_ansi_arrow_tsangan_split_bs( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K75, K66, K77, \
+    K80, K90, K81,                K92,                K85, K86, K95, K97  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, XXX }, \
+    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
+    { K30, K31, K32, K33, K34, K35, K36, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
+    { K50, K51, K52, K53, K54, K55, XXX, XXX }, \
+    { K60, K61, K62, K63, K64, XXX, K66, XXX }, \
+    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
+    { K80, K81, XXX, XXX, XXX, K85, K86, XXX }, \
+    { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
+}
+
+#define LAYOUT_60_ansi_tsangan_split_rshift( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, K77, \
+    K80, K90, K81,                K92,                     K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
@@ -308,13 +333,13 @@
     { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
 }
-//LAYOUT_60_ansi_tsangan_split_bs
-#define LAYOUT_60_ansi_tsangan_split_bs( \
+
+#define LAYOUT_60_tsangan_hhkb( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, K77, \
-    K80, K90, K81, K92, K85, K95, K97  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K66, K77, \
+    K80, K90, K81,                K92,                     K85, K95, K97  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, XXX }, \
     { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
@@ -327,7 +352,3 @@
     { K80, K81, XXX, XXX, XXX, K85, XXX, XXX }, \
     { K90, XXX, K92, XXX, XXX, K95, XXX, K97 }, \
 }
-//LAYOUT_60_iso_tsangan
-#define LAYOUT_60_iso_tsangan  LAYOUT_60_ansi_tsangan
-//LAYOUT_60_iso_tsangan_split_bs
-#define LAYOUT_60_iso_tsangan_split_bs  LAYOUT_60_ansi_tsangan_split_bs

From 7b31fc54df6543e3426cce159a915fdaa947b57d Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Wed, 26 Jan 2022 19:24:29 +0000
Subject: [PATCH 384/867] Enable a default task throttle for split pointing.
 (#15925)

---
 docs/feature_pointing_device.md     | 2 +-
 quantum/pointing_device.c           | 6 +-----
 quantum/pointing_device.h           | 3 +++
 quantum/split_common/transactions.c | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 84ab885738..1972406ff7 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -204,7 +204,7 @@ void           pointing_device_driver_set_cpi(uint16_t cpi) {}
 |`POINTING_DEVICE_MOTION_PIN`      | (Optional) If supported, will only read from sensor if pin is active. | _not defined_     |
 |`POINTING_DEVICE_TASK_THROTTLE_MS`      | (Optional) Limits the frequency that the sensor is polled for motion. | _not defined_     |
 
-!> When using `SPLIT_POINTING_ENABLE` the `POINTING_DEVICE_MOTION_PIN` functionality is not supported and would recommend `POINTING_DEVICE_TASK_THROTTLE_MS` be set to `1`. Increasing this value will increase transport performance at the cost of possible mouse responsiveness.
+!> When using `SPLIT_POINTING_ENABLE` the `POINTING_DEVICE_MOTION_PIN` functionality is not supported and `POINTING_DEVICE_TASK_THROTTLE_MS` will default to `1`. Increasing this value will increase transport performance at the cost of possible mouse responsiveness.
 
 
 ## Split Keyboard Configuration
diff --git a/quantum/pointing_device.c b/quantum/pointing_device.c
index 23d93fa15f..cce292e0bf 100644
--- a/quantum/pointing_device.c
+++ b/quantum/pointing_device.c
@@ -217,16 +217,12 @@ __attribute__((weak)) void pointing_device_task(void) {
     };
 #endif
 
-#if defined(POINTING_DEVICE_TASK_THROTTLE_MS)
+#if (POINTING_DEVICE_TASK_THROTTLE_MS > 0)
     static uint32_t last_exec = 0;
     if (timer_elapsed32(last_exec) < POINTING_DEVICE_TASK_THROTTLE_MS) {
         return;
     }
     last_exec = timer_read32();
-#else
-#    if defined(SPLIT_POINTING_ENABLE)
-#        pragma message("It's recommended you enable a throttle when sharing pointing devices.")
-#    endif
 #endif
 
     // Gather report info
diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h
index 6ff267e491..8394c20952 100644
--- a/quantum/pointing_device.h
+++ b/quantum/pointing_device.h
@@ -94,6 +94,9 @@ report_mouse_t pointing_device_adjust_by_defines(report_mouse_t mouse_report);
 #if defined(SPLIT_POINTING_ENABLE)
 void     pointing_device_set_shared_report(report_mouse_t report);
 uint16_t pointing_device_get_shared_cpi(void);
+#    if !defined(POINTING_DEVICE_TASK_THROTTLE_MS)
+#        define POINTING_DEVICE_TASK_THROTTLE_MS 1
+#    endif
 #    if defined(POINTING_DEVICE_COMBINED)
 void           pointing_device_set_cpi_on_side(bool left, uint16_t cpi);
 report_mouse_t pointing_device_combine_reports(report_mouse_t left_report, report_mouse_t right_report);
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 81f9836382..d9e8fd1f6b 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -624,7 +624,7 @@ static void pointing_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
 #    endif
     report_mouse_t temp_report;
     uint16_t       temp_cpi;
-#    ifdef POINTING_DEVICE_TASK_THROTTLE_MS
+#    if (POINTING_DEVICE_TASK_THROTTLE_MS > 0)
     static uint32_t last_exec = 0;
     if (timer_elapsed32(last_exec) < POINTING_DEVICE_TASK_THROTTLE_MS) {
         return;

From 8c56bfe854eceed4b733d256b1d012fb34defcf1 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 27 Jan 2022 09:01:11 +1100
Subject: [PATCH 385/867] CU65: Fix VIA keymap (#16062)

---
 keyboards/capsunlocked/cu65/keymaps/via/keymap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/capsunlocked/cu65/keymaps/via/keymap.c b/keyboards/capsunlocked/cu65/keymaps/via/keymap.c
index 1bd833294e..fb0031f2b0 100644
--- a/keyboards/capsunlocked/cu65/keymaps/via/keymap.c
+++ b/keyboards/capsunlocked/cu65/keymaps/via/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,
         KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUBS, KC_ENT,  KC_PGUP,
-        KC_LSFT,          KC_NUHS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
         KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(

From 6a9ec74b329e458c32db4a2e3a3e0478ac8e72b5 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 26 Jan 2022 22:57:28 +0000
Subject: [PATCH 386/867] Remove unused suspend_idle (#16063)

---
 platforms/arm_atsam/suspend.c |  7 -------
 platforms/avr/suspend.c       | 13 -------------
 platforms/chibios/suspend.c   |  9 ---------
 platforms/suspend.h           |  1 -
 4 files changed, 30 deletions(-)

diff --git a/platforms/arm_atsam/suspend.c b/platforms/arm_atsam/suspend.c
index e51426128d..73bebc4308 100644
--- a/platforms/arm_atsam/suspend.c
+++ b/platforms/arm_atsam/suspend.c
@@ -3,13 +3,6 @@
 #include "md_rgb_matrix.h"
 #include "suspend.h"
 
-/** \brief Suspend idle
- *
- * FIXME: needs doc
- */
-void suspend_idle(uint8_t time) { /* Note: Not used anywhere currently */
-}
-
 /** \brief Run user level Power down
  *
  * FIXME: needs doc
diff --git a/platforms/avr/suspend.c b/platforms/avr/suspend.c
index b614746e6c..7b164a34b1 100644
--- a/platforms/avr/suspend.c
+++ b/platforms/avr/suspend.c
@@ -16,19 +16,6 @@
 #    include "vusb.h"
 #endif
 
-/** \brief Suspend idle
- *
- * FIXME: needs doc
- */
-void suspend_idle(uint8_t time) {
-    cli();
-    set_sleep_mode(SLEEP_MODE_IDLE);
-    sleep_enable();
-    sei();
-    sleep_cpu();
-    sleep_disable();
-}
-
 // TODO: This needs some cleanup
 
 #if !defined(NO_SUSPEND_POWER_DOWN) && defined(WDT_vect)
diff --git a/platforms/chibios/suspend.c b/platforms/chibios/suspend.c
index 9310a99920..d10ddf4501 100644
--- a/platforms/chibios/suspend.c
+++ b/platforms/chibios/suspend.c
@@ -13,15 +13,6 @@
 #include "led.h"
 #include "wait.h"
 
-/** \brief suspend idle
- *
- * FIXME: needs doc
- */
-void suspend_idle(uint8_t time) {
-    // TODO: this is not used anywhere - what units is 'time' in?
-    wait_ms(time);
-}
-
 /** \brief suspend power down
  *
  * FIXME: needs doc
diff --git a/platforms/suspend.h b/platforms/suspend.h
index 081735f90e..e4f7f39ddb 100644
--- a/platforms/suspend.h
+++ b/platforms/suspend.h
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-void suspend_idle(uint8_t timeout);
 void suspend_power_down(void);
 bool suspend_wakeup_condition(void);
 void suspend_wakeup_init(void);

From b39fc98b4db4afb84233bdd0b98c4caa91744d84 Mon Sep 17 00:00:00 2001
From: Tim Liu <74063834+Timliuzhaolu@users.noreply.github.com>
Date: Thu, 27 Jan 2022 13:01:33 +0800
Subject: [PATCH 387/867] [Keyboard] Creatkeebs (#15766)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/creatkeebs/readme.md                |   3 +
 keyboards/creatkeebs/thera/config.h           |  64 +++++++++++
 keyboards/creatkeebs/thera/info.json          | 107 ++++++++++++++++++
 .../creatkeebs/thera/keymaps/default/keymap.c |  30 +++++
 keyboards/creatkeebs/thera/readme.md          |  29 +++++
 keyboards/creatkeebs/thera/rules.mk           |  18 +++
 keyboards/creatkeebs/thera/thera.c            |  17 +++
 keyboards/creatkeebs/thera/thera.h            |  36 ++++++
 8 files changed, 304 insertions(+)
 create mode 100644 keyboards/creatkeebs/readme.md
 create mode 100644 keyboards/creatkeebs/thera/config.h
 create mode 100644 keyboards/creatkeebs/thera/info.json
 create mode 100644 keyboards/creatkeebs/thera/keymaps/default/keymap.c
 create mode 100644 keyboards/creatkeebs/thera/readme.md
 create mode 100644 keyboards/creatkeebs/thera/rules.mk
 create mode 100644 keyboards/creatkeebs/thera/thera.c
 create mode 100644 keyboards/creatkeebs/thera/thera.h

diff --git a/keyboards/creatkeebs/readme.md b/keyboards/creatkeebs/readme.md
new file mode 100644
index 0000000000..6ba019d6b4
--- /dev/null
+++ b/keyboards/creatkeebs/readme.md
@@ -0,0 +1,3 @@
+# Creatkeebs
+
+For more information please visit our [website](https://eschit.com/) 
diff --git a/keyboards/creatkeebs/thera/config.h b/keyboards/creatkeebs/thera/config.h
new file mode 100644
index 0000000000..e9ba1ca131
--- /dev/null
+++ b/keyboards/creatkeebs/thera/config.h
@@ -0,0 +1,64 @@
+/* Copyright 2022 Tim (https://github.com/Timliuzhaolu)
+  * 
+  * 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      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    creatkeebs
+#define PRODUCT         thera
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B2, B1, B0, E6, B3, B7 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 0
+#endif
+
+
+#ifdef RGB_DI_PIN
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 0
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#endif
+
+
diff --git a/keyboards/creatkeebs/thera/info.json b/keyboards/creatkeebs/thera/info.json
new file mode 100644
index 0000000000..856aae93bf
--- /dev/null
+++ b/keyboards/creatkeebs/thera/info.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "jelly epoch",
+    "url": "https://eschit.com/collections/thera75",
+    "maintainer": "https://github.com/Timliuzhaolu",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0},
+
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+
+                {"x":14, "y":0},
+
+                {"x":0, "y":1.5},
+                {"x":1, "y":1.5},
+                {"x":2, "y":1.5},
+                {"x":3, "y":1.5},
+                {"x":4, "y":1.5},
+                {"x":5, "y":1.5},
+                {"x":6, "y":1.5},
+                {"x":7, "y":1.5},
+                {"x":8, "y":1.5},
+                {"x":9, "y":1.5},
+                {"x":10, "y":1.5},
+                {"x":11, "y":1.5},
+                {"x":12, "y":1.5},
+                {"x":13, "y":1.5, "w":2},
+
+                {"x":15.5, "y":1.5},
+
+                {"x":0, "y":2.5, "w":1.5},
+                {"x":1.5, "y":2.5},
+                {"x":2.5, "y":2.5},
+                {"x":3.5, "y":2.5},
+                {"x":4.5, "y":2.5},
+                {"x":5.5, "y":2.5},
+                {"x":6.5, "y":2.5},
+                {"x":7.5, "y":2.5},
+                {"x":8.5, "y":2.5},
+                {"x":9.5, "y":2.5},
+                {"x":10.5, "y":2.5},
+                {"x":11.5, "y":2.5},
+                {"x":12.5, "y":2.5},
+                {"x":13.5, "y":2.5, "w":1.5},
+
+                {"x":15.5, "y":2.5},
+
+                {"x":0, "y":3.5, "w":1.75},
+                {"x":1.75, "y":3.5},
+                {"x":2.75, "y":3.5},
+                {"x":3.75, "y":3.5},
+                {"x":4.75, "y":3.5},
+                {"x":5.75, "y":3.5},
+                {"x":6.75, "y":3.5},
+                {"x":7.75, "y":3.5},
+                {"x":8.75, "y":3.5},
+                {"x":9.75, "y":3.5},
+                {"x":10.75, "y":3.5},
+                {"x":11.75, "y":3.5},
+                {"x":12.75, "y":3.5, "w":2.25},
+
+                {"x":15.5, "y":3.5},
+
+                {"x":0, "y":4.5, "w":2.25},
+                {"x":2.25, "y":4.5},
+                {"x":3.25, "y":4.5},
+                {"x":4.25, "y":4.5},
+                {"x":5.25, "y":4.5},
+                {"x":6.25, "y":4.5},
+                {"x":7.25, "y":4.5},
+                {"x":8.25, "y":4.5},
+                {"x":9.25, "y":4.5},
+                {"x":10.25, "y":4.5},
+                {"x":11.25, "y":4.5},
+                {"x":12.25, "y":4.5, "w":1.75},
+
+                {"x":14.25, "y":4.75},
+
+
+                {"x":0, "y":5.5, "w":1.25},
+                {"x":1.25, "y":5.5, "w":1.25},
+                {"x":2.5, "y":5.5, "w":1.25},
+                {"x":3.75, "y":5.5, "w":6.25},
+                {"x":10, "y":5.5},
+                {"x":11, "y":5.5},
+                {"x":12, "y":5.5},
+
+                {"x":13.25, "y":5.75},
+                {"x":14.25, "y":5.75},
+                {"x":15.25, "y":5.75}
+            ]
+        }
+    }
+}
diff --git a/keyboards/creatkeebs/thera/keymaps/default/keymap.c b/keyboards/creatkeebs/thera/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4af1d96a2b
--- /dev/null
+++ b/keyboards/creatkeebs/thera/keymaps/default/keymap.c
@@ -0,0 +1,30 @@
+ /* Copyright 2022 Tim
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+		KC_ESC,  KC_F1,   KC_F2,   KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8,    KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_PSCR,
+		KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,     KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,     KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+		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_PGDN,
+		KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,        KC_RALT, KC_RGUI, KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT),
+
+};
+
diff --git a/keyboards/creatkeebs/thera/readme.md b/keyboards/creatkeebs/thera/readme.md
new file mode 100644
index 0000000000..a03f9c184e
--- /dev/null
+++ b/keyboards/creatkeebs/thera/readme.md
@@ -0,0 +1,29 @@
+# thera
+A 75% keyboard
+
+![thera](https://i.imgur.com/7w7ARcPh.jpg)
+
+### Features
+* Plateless PCB gasket
+* Decent amount of layout compatibility - [View supported layouts](https://cdn.shopify.com/s/files/1/0481/5840/8853/products/8038a8b71a5149f5bad362b28368da3_590x.png?v=1628765539)
+* Ti badge
+* PVD weight (upgrade available)
+
+### Additional Information
+* Keyboard Maintainer: [Tim](https://github.com/Timliuzhaolu/qmk_firmware)
+* Hardware Supported: thera PCB
+* Hardware Availability: [ESCHIT.com](https://eschit.com/products/gb-thera75)
+
+### Entering Bootloader
+
+Enter the bootloader in 2 ways:
+
+* Physical reset button: Press the `RESET` button on the back of the PCB.
+* Keycode in layout: Press the key mapped to `RESET` if it is available.
+
+### Building the Firmware
+Make example for this keyboard (after setting up your build environment):
+
+    make creatkeebs/thera: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).
diff --git a/keyboards/creatkeebs/thera/rules.mk b/keyboards/creatkeebs/thera/rules.mk
new file mode 100644
index 0000000000..1275531ef6
--- /dev/null
+++ b/keyboards/creatkeebs/thera/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/creatkeebs/thera/thera.c b/keyboards/creatkeebs/thera/thera.c
new file mode 100644
index 0000000000..db4f27d908
--- /dev/null
+++ b/keyboards/creatkeebs/thera/thera.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 Tim (https://github.com/Timliuzhaolu)
+  * 
+  * 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 "thera.h"
diff --git a/keyboards/creatkeebs/thera/thera.h b/keyboards/creatkeebs/thera/thera.h
new file mode 100644
index 0000000000..35f93ea002
--- /dev/null
+++ b/keyboards/creatkeebs/thera/thera.h
@@ -0,0 +1,36 @@
+/* Copyright 2022 Tim (https://github.com/Timliuzhaolu)
+  * 
+  * 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( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
+	K400,       K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, \
+	K500, K501, K502,                   K506,             K509, K510, K511, K512, K513, K514  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  ____ }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  ____,  K313,  K314 }, \
+	{ K400,  ____,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  ____ }, \
+	{ K500,  K501,  K502,  ____,  ____,  ____,  K506,  ____,  ____,  K509,  K510,  K511,  K512,  K513,  K514 }  \
+}
+

From 9e6874bd4d5b049065019eaa65ab7bd164b94f97 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 26 Jan 2022 21:12:42 -0800
Subject: [PATCH 388/867] CK60: LAYOUT_60_iso compatibility (#16066)

---
 keyboards/senselessclay/ck60/ck60.h           | 24 ++---
 keyboards/senselessclay/ck60/info.json        | 88 +++++++++++++++++--
 .../ck60/keymaps/default/keymap.c             | 54 ++++++------
 .../senselessclay/ck60/keymaps/via/keymap.c   | 54 ++++++------
 keyboards/senselessclay/ck60/rules.mk         |  4 +-
 5 files changed, 152 insertions(+), 72 deletions(-)

diff --git a/keyboards/senselessclay/ck60/ck60.h b/keyboards/senselessclay/ck60/ck60.h
index fa83202dfa..a9408ba2ea 100644
--- a/keyboards/senselessclay/ck60/ck60.h
+++ b/keyboards/senselessclay/ck60/ck60.h
@@ -18,18 +18,18 @@
 
 #include "quantum.h"
 
-#define ____ KC_NO
+#define ___ KC_NO
 
-#define LAYOUT( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       \
-    K400, K401, K402,                   K406,                   K410, K411, K412, K413  \
+#define LAYOUT_60_iso( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C, \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D  \
 ) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____ }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, ____ }, \
-    { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, K410, K411, K412, K413 }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___ }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D }  \
 }
diff --git a/keyboards/senselessclay/ck60/info.json b/keyboards/senselessclay/ck60/info.json
index e188740c3c..55a7e95b46 100644
--- a/keyboards/senselessclay/ck60/info.json
+++ b/keyboards/senselessclay/ck60/info.json
@@ -1,10 +1,80 @@
 {
-  "keyboard_name": "CK60", 
-  "url": "https://candykeys.com", 
-  "maintainer": "hadi", 
-  "layouts": {
-      "LAYOUT": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
-      }
-  }
-}
\ No newline at end of file
+    "keyboard_name": "CK60",
+    "url": "https://candykeys.com",
+    "maintainer": "had-i",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60_iso"
+    },
+    "layouts": {
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":13.75, "y":4, "w":1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/senselessclay/ck60/keymaps/default/keymap.c b/keyboards/senselessclay/ck60/keymaps/default/keymap.c
index 2ac1e06981..d88f9e303c 100644
--- a/keyboards/senselessclay/ck60/keymaps/default/keymap.c
+++ b/keyboards/senselessclay/ck60/keymaps/default/keymap.c
@@ -23,29 +23,33 @@ enum layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_0] = LAYOUT(
+    [_0] = LAYOUT_60_iso(
         /*Base*/
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, 
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, 
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, 
-		KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, 
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL),
-    [_1] = LAYOUT(
-		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
-		KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-    [_2] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 
-    [_3] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
\ No newline at end of file
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL
+    ),
+    [_1] = LAYOUT_60_iso(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,
+        KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, _______, KC_INS,  KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, KC_DOWN,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+    [_2] = LAYOUT_60_iso(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+    [_3] = LAYOUT_60_iso(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/senselessclay/ck60/keymaps/via/keymap.c b/keyboards/senselessclay/ck60/keymaps/via/keymap.c
index 2ac1e06981..d88f9e303c 100644
--- a/keyboards/senselessclay/ck60/keymaps/via/keymap.c
+++ b/keyboards/senselessclay/ck60/keymaps/via/keymap.c
@@ -23,29 +23,33 @@ enum layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_0] = LAYOUT(
+    [_0] = LAYOUT_60_iso(
         /*Base*/
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, 
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, 
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, 
-		KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, 
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL),
-    [_1] = LAYOUT(
-		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
-		KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-    [_2] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 
-    [_3] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
\ No newline at end of file
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL
+    ),
+    [_1] = LAYOUT_60_iso(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,
+        KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, _______, KC_INS,  KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, KC_DOWN,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+    [_2] = LAYOUT_60_iso(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+    [_3] = LAYOUT_60_iso(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/senselessclay/ck60/rules.mk b/keyboards/senselessclay/ck60/rules.mk
index 56aec94425..ba0eba494f 100644
--- a/keyboards/senselessclay/ck60/rules.mk
+++ b/keyboards/senselessclay/ck60/rules.mk
@@ -18,4 +18,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 RGB_MATRIX_ENABLE = yes     # RGB matrix lighting
-RGB_MATRIX_DRIVER = WS2812
\ No newline at end of file
+RGB_MATRIX_DRIVER = WS2812
+
+LAYOUTS = 60_iso

From 52e12588c950e5bd19d3c0abbe6b5cc3da6d7c22 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 26 Jan 2022 21:13:07 -0800
Subject: [PATCH 389/867] Krush65 Solder Refactor (#16065)

---
 .../krush/krush65/solder/info.json            | 508 ++++++++----------
 .../solder/keymaps/ansi_blocker/keymap.c      |  22 +-
 .../solder/keymaps/ansi_blocker/readme.md     |   4 +-
 .../keymaps/ansi_blocker_split_all/keymap.c   |  38 --
 .../keymaps/ansi_blocker_split_all/readme.md  |   1 -
 .../keymaps/ansi_blocker_split_bs/keymap.c    |  22 +-
 .../keymaps/ansi_blocker_split_bs/readme.md   |   5 +-
 .../krush65/solder/keymaps/default/keymap.c   |  22 +-
 .../krush65/solder/keymaps/default/readme.md  |   6 +-
 .../krush/krush65/solder/keymaps/via/keymap.c |  44 +-
 .../krush65/solder/keymaps/via/readme.md      |   6 +-
 .../krush/krush65/solder/solder.h             | 101 ++--
 12 files changed, 346 insertions(+), 433 deletions(-)
 delete mode 100644 keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/keymap.c
 delete mode 100644 keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/readme.md

diff --git a/keyboards/sawnsprojects/krush/krush65/solder/info.json b/keyboards/sawnsprojects/krush/krush65/solder/info.json
index 6c10d660e2..b72946bf55 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/info.json
+++ b/keyboards/sawnsprojects/krush/krush65/solder/info.json
@@ -2,297 +2,237 @@
     "keyboard_name": "Krush65 Solder",
     "url": "",
     "maintainer": "MaiTheSan",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker_split_bs_sp"
+    },
     "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                { "label": "K00 (B1,C7)", "x": 0, "y": 0 },
-                { "label": "K10 (B2,C7)", "x": 1, "y": 0 },
-                { "label": "K01 (B1,C6)", "x": 2, "y": 0 },
-                { "label": "K11 (B2,C6)", "x": 3, "y": 0 },
-                { "label": "K02 (B1,B6)", "x": 4, "y": 0 },
-                { "label": "K12 (B2,B6)", "x": 5, "y": 0 },
-                { "label": "K03 (B1,B5)", "x": 6, "y": 0 },
-                { "label": "K13 (B2,B5)", "x": 7, "y": 0 },
-                { "label": "K04 (B1,B4)", "x": 8, "y": 0 },
-                { "label": "K14 (B2,B4)", "x": 9, "y": 0 },
-                { "label": "K05 (B1,D7)", "x": 10, "y": 0 },
-                { "label": "K15 (B2,D7)", "x": 11, "y": 0 },
-                { "label": "K06 (B1,D5)", "x": 12, "y": 0 },
-                { "label": "K26 (D1,D5)", "x": 13, "y": 0 },
-                { "label": "K17 (B2,D3)", "x": 14, "y": 0 },
-                { "label": "K07 (B1,D3)", "x": 15, "y": 0 },
-                { "label": "K20 (D1,C7)", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K30 (D2,C7)", "x": 1.5, "y": 1 },
-                { "label": "K21 (D1,C6)", "x": 2.5, "y": 1 },
-                { "label": "K31 (D2,C6)", "x": 3.5, "y": 1 },
-                { "label": "K22 (D1,B6)", "x": 4.5, "y": 1 },
-                { "label": "K32 (D2,B6)", "x": 5.5, "y": 1 },
-                { "label": "K23 (D1,B5)", "x": 6.5, "y": 1 },
-                { "label": "K33 (D2,B5)", "x": 7.5, "y": 1 },
-                { "label": "K24 (D1,B4)", "x": 8.5, "y": 1 },
-                { "label": "K34 (D2,B4)", "x": 9.5, "y": 1 },
-                { "label": "K25 (D1,D7)", "x": 10.5, "y": 1 },
-                { "label": "K35 (D2,D7)", "x": 11.5, "y": 1 },
-                { "label": "K36 (D2,D5)", "x": 12.5, "y": 1 },
-                { "label": "K46 (D4,D5)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K37 (D2,D3)", "x": 15, "y": 1 },
-                { "label": "K40 (D4,C7)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K50 (D6,C7)", "x": 1.75, "y": 2 },
-                { "label": "K41 (D4,C6)", "x": 2.75, "y": 2 },
-                { "label": "K51 (D6,C6)", "x": 3.75, "y": 2 },
-                { "label": "K42 (D4,B6)", "x": 4.75, "y": 2 },
-                { "label": "K52 (D6,B6)", "x": 5.75, "y": 2 },
-                { "label": "K43 (D4,B5)", "x": 6.75, "y": 2 },
-                { "label": "K53 (D6,B5)", "x": 7.75, "y": 2 },
-                { "label": "K44 (D4,B4)", "x": 8.75, "y": 2 },
-                { "label": "K54 (D6,B4)", "x": 9.75, "y": 2 },
-                { "label": "K45 (D4,D7)", "x": 10.75, "y": 2 },
-                { "label": "K55 (D6,D7)", "x": 11.75, "y": 2 },
-                { "label": "K47 (D4,D3)", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "K57 (D6,D3)", "x": 15, "y": 2 },
-                { "label": "K60 (F6,C7)", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "K70 (F7,C7)", "x": 2.25, "y": 3 },
-                { "label": "K61 (F6,C6)", "x": 3.25, "y": 3 },
-                { "label": "K71 (F7,C6)", "x": 4.25, "y": 3 },
-                { "label": "K62 (F6,B6)", "x": 5.25, "y": 3 },
-                { "label": "K72 (F7,B6)", "x": 6.25, "y": 3 },
-                { "label": "K63 (F6,B5)", "x": 7.25, "y": 3 },
-                { "label": "K73 (F7,B5)", "x": 8.25, "y": 3 },
-                { "label": "K64 (F6,B4)", "x": 9.25, "y": 3 },
-                { "label": "K74 (F7,B4)", "x": 10.25, "y": 3 },
-                { "label": "K65 (F6,D7)", "x": 11.25, "y": 3 },
-                { "label": "K75 (F7,D7)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K77 (F7,D3)", "x": 14, "y": 3 },
-                { "label": "K67 (F6,D3)", "x": 15, "y": 3 },
-                { "label": "K80 (F5,C7)", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K90 (F4,C7)", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "K81 (F5,C6)", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "K82 (F5,B6)", "x": 3.75, "y": 4, "w": 2.25 },
-                { "label": "K92 (F4,B6)", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "K93 (F4,B5)", "x": 7.25, "y": 4, "w": 2.75 },
-                { "label": "K94 (F4,B4)", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "K85 (F5,D7)", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "K95 (F4,D7)", "x": 13, "y": 4 },
-                { "label": "K97 (F4,D3)", "x": 14, "y": 4 },
-                { "label": "K87 (F5,D3)", "x": 15, "y": 4 }
-            ]
-        },
         "LAYOUT_65_ansi_blocker_split_bs_sp": {
             "layout": [
-                { "label": "K00 (B1,C7)", "x": 0, "y": 0 },
-                { "label": "K10 (B2,C7)", "x": 1, "y": 0 },
-                { "label": "K01 (B1,C6)", "x": 2, "y": 0 },
-                { "label": "K11 (B2,C6)", "x": 3, "y": 0 },
-                { "label": "K02 (B1,B6)", "x": 4, "y": 0 },
-                { "label": "K12 (B2,B6)", "x": 5, "y": 0 },
-                { "label": "K03 (B1,B5)", "x": 6, "y": 0 },
-                { "label": "K13 (B2,B5)", "x": 7, "y": 0 },
-                { "label": "K04 (B1,B4)", "x": 8, "y": 0 },
-                { "label": "K14 (B2,B4)", "x": 9, "y": 0 },
-                { "label": "K05 (B1,D7)", "x": 10, "y": 0 },
-                { "label": "K15 (B2,D7)", "x": 11, "y": 0 },
-                { "label": "K06 (B1,D5)", "x": 12, "y": 0 },
-                { "label": "K26 (D1,D5)", "x": 13, "y": 0 },
-                { "label": "K17 (B2,D3)", "x": 14, "y": 0 },
-                { "label": "K07 (B1,D3)", "x": 15, "y": 0 },
-                { "label": "K20 (D1,C7)", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K30 (D2,C7)", "x": 1.5, "y": 1 },
-                { "label": "K21 (D1,C6)", "x": 2.5, "y": 1 },
-                { "label": "K31 (D2,C6)", "x": 3.5, "y": 1 },
-                { "label": "K22 (D1,B6)", "x": 4.5, "y": 1 },
-                { "label": "K32 (D2,B6)", "x": 5.5, "y": 1 },
-                { "label": "K23 (D1,B5)", "x": 6.5, "y": 1 },
-                { "label": "K33 (D2,B5)", "x": 7.5, "y": 1 },
-                { "label": "K24 (D1,B4)", "x": 8.5, "y": 1 },
-                { "label": "K34 (D2,B4)", "x": 9.5, "y": 1 },
-                { "label": "K25 (D1,D7)", "x": 10.5, "y": 1 },
-                { "label": "K35 (D2,D7)", "x": 11.5, "y": 1 },
-                { "label": "K36 (D2,D5)", "x": 12.5, "y": 1 },
-                { "label": "K46 (D4,D5)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K37 (D2,D3)", "x": 15, "y": 1 },
-                { "label": "K40 (D4,C7)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K50 (D6,C7)", "x": 1.75, "y": 2 },
-                { "label": "K41 (D4,C6)", "x": 2.75, "y": 2 },
-                { "label": "K51 (D6,C6)", "x": 3.75, "y": 2 },
-                { "label": "K42 (D4,B6)", "x": 4.75, "y": 2 },
-                { "label": "K52 (D6,B6)", "x": 5.75, "y": 2 },
-                { "label": "K43 (D4,B5)", "x": 6.75, "y": 2 },
-                { "label": "K53 (D6,B5)", "x": 7.75, "y": 2 },
-                { "label": "K44 (D4,B4)", "x": 8.75, "y": 2 },
-                { "label": "K54 (D6,B4)", "x": 9.75, "y": 2 },
-                { "label": "K45 (D4,D7)", "x": 10.75, "y": 2 },
-                { "label": "K55 (D6,D7)", "x": 11.75, "y": 2 },
-                { "label": "K47 (D4,D3)", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "K57 (D6,D3)", "x": 15, "y": 2 },
-                { "label": "K60 (F6,C7)", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "K70 (F7,C7)", "x": 2.25, "y": 3 },
-                { "label": "K61 (F6,C6)", "x": 3.25, "y": 3 },
-                { "label": "K71 (F7,C6)", "x": 4.25, "y": 3 },
-                { "label": "K62 (F6,B6)", "x": 5.25, "y": 3 },
-                { "label": "K72 (F7,B6)", "x": 6.25, "y": 3 },
-                { "label": "K63 (F6,B5)", "x": 7.25, "y": 3 },
-                { "label": "K73 (F7,B5)", "x": 8.25, "y": 3 },
-                { "label": "K64 (F6,B4)", "x": 9.25, "y": 3 },
-                { "label": "K74 (F7,B4)", "x": 10.25, "y": 3 },
-                { "label": "K65 (F6,D7)", "x": 11.25, "y": 3 },
-                { "label": "K75 (F7,D7)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K77 (F7,D3)", "x": 14, "y": 3 },
-                { "label": "K67 (F6,D3)", "x": 15, "y": 3 },
-                { "label": "K80 (F5,C7)", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K90 (F4,C7)", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "K81 (F5,C6)", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "K82 (F5,B6)", "x": 3.75, "y": 4, "w": 2.25 },
-                { "label": "K92 (F4,B6)", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "K93 (F4,B5)", "x": 7.25, "y": 4, "w": 2.75 },
-                { "label": "K94 (F4,B4)", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "K85 (F5,D7)", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "K95 (F4,D7)", "x": 13, "y": 4 },
-                { "label": "K97 (F4,D3)", "x": 14, "y": 4 },
-                { "label": "K87 (F5,D3)", "x": 15, "y": 4 }
-            ]
-        },
+                {"label":"K00 (B1,C7)", "x":0, "y":0},
+                {"label":"K10 (B2,C7)", "x":1, "y":0},
+                {"label":"K01 (B1,C6)", "x":2, "y":0},
+                {"label":"K11 (B2,C6)", "x":3, "y":0},
+                {"label":"K02 (B1,B6)", "x":4, "y":0},
+                {"label":"K12 (B2,B6)", "x":5, "y":0},
+                {"label":"K03 (B1,B5)", "x":6, "y":0},
+                {"label":"K13 (B2,B5)", "x":7, "y":0},
+                {"label":"K04 (B1,B4)", "x":8, "y":0},
+                {"label":"K14 (B2,B4)", "x":9, "y":0},
+                {"label":"K05 (B1,D7)", "x":10, "y":0},
+                {"label":"K15 (B2,D7)", "x":11, "y":0},
+                {"label":"K06 (B1,D5)", "x":12, "y":0},
+                {"label":"K26 (D1,D5)", "x":13, "y":0},
+                {"label":"K17 (B2,D3)", "x":14, "y":0},
+                {"label":"K07 (B1,D3)", "x":15, "y":0},
 
-	"LAYOUT_65_ansi_blocker": {
-            "layout": [
-                { "label": "K00 (B1,C7)", "x": 0, "y": 0 },
-                { "label": "K10 (B2,C7)", "x": 1, "y": 0 },
-                { "label": "K01 (B1,C6)", "x": 2, "y": 0 },
-                { "label": "K11 (B2,C6)", "x": 3, "y": 0 },
-                { "label": "K02 (B1,B6)", "x": 4, "y": 0 },
-                { "label": "K12 (B2,B6)", "x": 5, "y": 0 },
-                { "label": "K03 (B1,B5)", "x": 6, "y": 0 },
-                { "label": "K13 (B2,B5)", "x": 7, "y": 0 },
-                { "label": "K04 (B1,B4)", "x": 8, "y": 0 },
-                { "label": "K14 (B2,B4)", "x": 9, "y": 0 },
-                { "label": "K05 (B1,D7)", "x": 10, "y": 0 },
-                { "label": "K15 (B2,D7)", "x": 11, "y": 0 },
-                { "label": "K06 (B1,D5)", "x": 12, "y": 0 },
-                { "label": "K26 (D1,D5)", "x": 13, "y": 0, "w": 2 },
-                { "label": "K07 (B1,D3)", "x": 15, "y": 0 },
-                { "label": "K20 (D1,C7)", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K30 (D2,C7)", "x": 1.5, "y": 1 },
-                { "label": "K21 (D1,C6)", "x": 2.5, "y": 1 },
-                { "label": "K31 (D2,C6)", "x": 3.5, "y": 1 },
-                { "label": "K22 (D1,B6)", "x": 4.5, "y": 1 },
-                { "label": "K32 (D2,B6)", "x": 5.5, "y": 1 },
-                { "label": "K23 (D1,B5)", "x": 6.5, "y": 1 },
-                { "label": "K33 (D2,B5)", "x": 7.5, "y": 1 },
-                { "label": "K24 (D1,B4)", "x": 8.5, "y": 1 },
-                { "label": "K34 (D2,B4)", "x": 9.5, "y": 1 },
-                { "label": "K25 (D1,D7)", "x": 10.5, "y": 1 },
-                { "label": "K35 (D2,D7)", "x": 11.5, "y": 1 },
-                { "label": "K36 (D2,D5)", "x": 12.5, "y": 1 },
-                { "label": "K46 (D4,D5)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K37 (D2,D3)", "x": 15, "y": 1 },
-                { "label": "K40 (D4,C7)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K50 (D6,C7)", "x": 1.75, "y": 2 },
-                { "label": "K41 (D4,C6)", "x": 2.75, "y": 2 },
-                { "label": "K51 (D6,C6)", "x": 3.75, "y": 2 },
-                { "label": "K42 (D4,B6)", "x": 4.75, "y": 2 },
-                { "label": "K52 (D6,B6)", "x": 5.75, "y": 2 },
-                { "label": "K43 (D4,B5)", "x": 6.75, "y": 2 },
-                { "label": "K53 (D6,B5)", "x": 7.75, "y": 2 },
-                { "label": "K44 (D4,B4)", "x": 8.75, "y": 2 },
-                { "label": "K54 (D6,B4)", "x": 9.75, "y": 2 },
-                { "label": "K45 (D4,D7)", "x": 10.75, "y": 2 },
-                { "label": "K55 (D6,D7)", "x": 11.75, "y": 2 },
-                { "label": "K47 (D4,D3)", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "K57 (D6,D3)", "x": 15, "y": 2 },
-                { "label": "K60 (F6,C7)", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "K70 (F7,C7)", "x": 2.25, "y": 3 },
-                { "label": "K61 (F6,C6)", "x": 3.25, "y": 3 },
-                { "label": "K71 (F7,C6)", "x": 4.25, "y": 3 },
-                { "label": "K62 (F6,B6)", "x": 5.25, "y": 3 },
-                { "label": "K72 (F7,B6)", "x": 6.25, "y": 3 },
-                { "label": "K63 (F6,B5)", "x": 7.25, "y": 3 },
-                { "label": "K73 (F7,B5)", "x": 8.25, "y": 3 },
-                { "label": "K64 (F6,B4)", "x": 9.25, "y": 3 },
-                { "label": "K74 (F7,B4)", "x": 10.25, "y": 3 },
-                { "label": "K65 (F6,D7)", "x": 11.25, "y": 3 },
-                { "label": "K75 (F7,D7)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K77 (F7,D3)", "x": 14, "y": 3 },
-                { "label": "K67 (F6,D3)", "x": 15, "y": 3 },
-                { "label": "K80 (F5,C7)", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K90 (F4,C7)", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "K81 (F5,C6)", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "K92 (F4,B6)", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "K94 (F4,B4)", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "K85 (F5,D7)", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "K95 (F4,D7)", "x": 13, "y": 4 },
-                { "label": "K97 (F4,D3)", "x": 14, "y": 4 },
-                { "label": "K87 (F5,D3)", "x": 15, "y": 4 }
+                {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5},
+                {"label":"K30 (D2,C7)", "x":1.5, "y":1},
+                {"label":"K21 (D1,C6)", "x":2.5, "y":1},
+                {"label":"K31 (D2,C6)", "x":3.5, "y":1},
+                {"label":"K22 (D1,B6)", "x":4.5, "y":1},
+                {"label":"K32 (D2,B6)", "x":5.5, "y":1},
+                {"label":"K23 (D1,B5)", "x":6.5, "y":1},
+                {"label":"K33 (D2,B5)", "x":7.5, "y":1},
+                {"label":"K24 (D1,B4)", "x":8.5, "y":1},
+                {"label":"K34 (D2,B4)", "x":9.5, "y":1},
+                {"label":"K25 (D1,D7)", "x":10.5, "y":1},
+                {"label":"K35 (D2,D7)", "x":11.5, "y":1},
+                {"label":"K36 (D2,D5)", "x":12.5, "y":1},
+                {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K37 (D2,D3)", "x":15, "y":1},
+
+                {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75},
+                {"label":"K50 (D6,C7)", "x":1.75, "y":2},
+                {"label":"K41 (D4,C6)", "x":2.75, "y":2},
+                {"label":"K51 (D6,C6)", "x":3.75, "y":2},
+                {"label":"K42 (D4,B6)", "x":4.75, "y":2},
+                {"label":"K52 (D6,B6)", "x":5.75, "y":2},
+                {"label":"K43 (D4,B5)", "x":6.75, "y":2},
+                {"label":"K53 (D6,B5)", "x":7.75, "y":2},
+                {"label":"K44 (D4,B4)", "x":8.75, "y":2},
+                {"label":"K54 (D6,B4)", "x":9.75, "y":2},
+                {"label":"K45 (D4,D7)", "x":10.75, "y":2},
+                {"label":"K55 (D6,D7)", "x":11.75, "y":2},
+                {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K57 (D6,D3)", "x":15, "y":2},
+
+                {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25},
+                {"label":"K70 (F7,C7)", "x":2.25, "y":3},
+                {"label":"K61 (F6,C6)", "x":3.25, "y":3},
+                {"label":"K71 (F7,C6)", "x":4.25, "y":3},
+                {"label":"K62 (F6,B6)", "x":5.25, "y":3},
+                {"label":"K72 (F7,B6)", "x":6.25, "y":3},
+                {"label":"K63 (F6,B5)", "x":7.25, "y":3},
+                {"label":"K73 (F7,B5)", "x":8.25, "y":3},
+                {"label":"K64 (F6,B4)", "x":9.25, "y":3},
+                {"label":"K74 (F7,B4)", "x":10.25, "y":3},
+                {"label":"K65 (F6,D7)", "x":11.25, "y":3},
+                {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75},
+                {"label":"K77 (F7,D3)", "x":14, "y":3},
+                {"label":"K67 (F6,D3)", "x":15, "y":3},
+
+                {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25},
+                {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25},
+                {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25},
+                {"label":"K82 (F5,B6)", "x":3.75, "y":4, "w":2.25},
+                {"label":"K92 (F4,B6)", "x":6, "y":4, "w":1.25},
+                {"label":"K93 (F4,B5)", "x":7.25, "y":4, "w":2.75},
+                {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25},
+                {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K95 (F4,D7)", "x":13, "y":4},
+                {"label":"K97 (F4,D3)", "x":14, "y":4},
+                {"label":"K87 (F5,D3)", "x":15, "y":4}
             ]
         },
-	"LAYOUT_65_ansi_blocker_split_bs": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "label": "K00 (B1,C7)", "x": 0, "y": 0 },
-                { "label": "K10 (B2,C7)", "x": 1, "y": 0 },
-                { "label": "K01 (B1,C6)", "x": 2, "y": 0 },
-                { "label": "K11 (B2,C6)", "x": 3, "y": 0 },
-                { "label": "K02 (B1,B6)", "x": 4, "y": 0 },
-                { "label": "K12 (B2,B6)", "x": 5, "y": 0 },
-                { "label": "K03 (B1,B5)", "x": 6, "y": 0 },
-                { "label": "K13 (B2,B5)", "x": 7, "y": 0 },
-                { "label": "K04 (B1,B4)", "x": 8, "y": 0 },
-                { "label": "K14 (B2,B4)", "x": 9, "y": 0 },
-                { "label": "K05 (B1,D7)", "x": 10, "y": 0 },
-                { "label": "K15 (B2,D7)", "x": 11, "y": 0 },
-                { "label": "K06 (B1,D5)", "x": 12, "y": 0 },
-                { "label": "K26 (D1,D5)", "x": 13, "y": 0 },
-                { "label": "K17 (B2,D3)", "x": 14, "y": 0 },
-                { "label": "K07 (B1,D3)", "x": 15, "y": 0 },
-                { "label": "K20 (D1,C7)", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K30 (D2,C7)", "x": 1.5, "y": 1 },
-                { "label": "K21 (D1,C6)", "x": 2.5, "y": 1 },
-                { "label": "K31 (D2,C6)", "x": 3.5, "y": 1 },
-                { "label": "K22 (D1,B6)", "x": 4.5, "y": 1 },
-                { "label": "K32 (D2,B6)", "x": 5.5, "y": 1 },
-                { "label": "K23 (D1,B5)", "x": 6.5, "y": 1 },
-                { "label": "K33 (D2,B5)", "x": 7.5, "y": 1 },
-                { "label": "K24 (D1,B4)", "x": 8.5, "y": 1 },
-                { "label": "K34 (D2,B4)", "x": 9.5, "y": 1 },
-                { "label": "K25 (D1,D7)", "x": 10.5, "y": 1 },
-                { "label": "K35 (D2,D7)", "x": 11.5, "y": 1 },
-                { "label": "K36 (D2,D5)", "x": 12.5, "y": 1 },
-                { "label": "K46 (D4,D5)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K37 (D2,D3)", "x": 15, "y": 1 },
-                { "label": "K40 (D4,C7)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K50 (D6,C7)", "x": 1.75, "y": 2 },
-                { "label": "K41 (D4,C6)", "x": 2.75, "y": 2 },
-                { "label": "K51 (D6,C6)", "x": 3.75, "y": 2 },
-                { "label": "K42 (D4,B6)", "x": 4.75, "y": 2 },
-                { "label": "K52 (D6,B6)", "x": 5.75, "y": 2 },
-                { "label": "K43 (D4,B5)", "x": 6.75, "y": 2 },
-                { "label": "K53 (D6,B5)", "x": 7.75, "y": 2 },
-                { "label": "K44 (D4,B4)", "x": 8.75, "y": 2 },
-                { "label": "K54 (D6,B4)", "x": 9.75, "y": 2 },
-                { "label": "K45 (D4,D7)", "x": 10.75, "y": 2 },
-                { "label": "K55 (D6,D7)", "x": 11.75, "y": 2 },
-                { "label": "K47 (D4,D3)", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "K57 (D6,D3)", "x": 15, "y": 2 },
-                { "label": "K60 (F6,C7)", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "K70 (F7,C7)", "x": 2.25, "y": 3 },
-                { "label": "K61 (F6,C6)", "x": 3.25, "y": 3 },
-                { "label": "K71 (F7,C6)", "x": 4.25, "y": 3 },
-                { "label": "K62 (F6,B6)", "x": 5.25, "y": 3 },
-                { "label": "K72 (F7,B6)", "x": 6.25, "y": 3 },
-                { "label": "K63 (F6,B5)", "x": 7.25, "y": 3 },
-                { "label": "K73 (F7,B5)", "x": 8.25, "y": 3 },
-                { "label": "K64 (F6,B4)", "x": 9.25, "y": 3 },
-                { "label": "K74 (F7,B4)", "x": 10.25, "y": 3 },
-                { "label": "K65 (F6,D7)", "x": 11.25, "y": 3 },
-                { "label": "K75 (F7,D7)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K77 (F7,D3)", "x": 14, "y": 3 },
-                { "label": "K67 (F6,D3)", "x": 15, "y": 3 },
-                { "label": "K80 (F5,C7)", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K90 (F4,C7)", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "K81 (F5,C6)", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "K92 (F4,B6)", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "K94 (F4,B4)", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "K85 (F5,D7)", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "K95 (F4,D7)", "x": 13, "y": 4 },
-                { "label": "K97 (F4,D3)", "x": 14, "y": 4 },
-                { "label": "K87 (F5,D3)", "x": 15, "y": 4 }
+                {"label":"K00 (B1,C7)", "x":0, "y":0},
+                {"label":"K10 (B2,C7)", "x":1, "y":0},
+                {"label":"K01 (B1,C6)", "x":2, "y":0},
+                {"label":"K11 (B2,C6)", "x":3, "y":0},
+                {"label":"K02 (B1,B6)", "x":4, "y":0},
+                {"label":"K12 (B2,B6)", "x":5, "y":0},
+                {"label":"K03 (B1,B5)", "x":6, "y":0},
+                {"label":"K13 (B2,B5)", "x":7, "y":0},
+                {"label":"K04 (B1,B4)", "x":8, "y":0},
+                {"label":"K14 (B2,B4)", "x":9, "y":0},
+                {"label":"K05 (B1,D7)", "x":10, "y":0},
+                {"label":"K15 (B2,D7)", "x":11, "y":0},
+                {"label":"K06 (B1,D5)", "x":12, "y":0},
+                {"label":"K26 (D1,D5)", "x":13, "y":0, "w":2},
+                {"label":"K07 (B1,D3)", "x":15, "y":0},
+
+                {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5},
+                {"label":"K30 (D2,C7)", "x":1.5, "y":1},
+                {"label":"K21 (D1,C6)", "x":2.5, "y":1},
+                {"label":"K31 (D2,C6)", "x":3.5, "y":1},
+                {"label":"K22 (D1,B6)", "x":4.5, "y":1},
+                {"label":"K32 (D2,B6)", "x":5.5, "y":1},
+                {"label":"K23 (D1,B5)", "x":6.5, "y":1},
+                {"label":"K33 (D2,B5)", "x":7.5, "y":1},
+                {"label":"K24 (D1,B4)", "x":8.5, "y":1},
+                {"label":"K34 (D2,B4)", "x":9.5, "y":1},
+                {"label":"K25 (D1,D7)", "x":10.5, "y":1},
+                {"label":"K35 (D2,D7)", "x":11.5, "y":1},
+                {"label":"K36 (D2,D5)", "x":12.5, "y":1},
+                {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K37 (D2,D3)", "x":15, "y":1},
+
+                {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75},
+                {"label":"K50 (D6,C7)", "x":1.75, "y":2},
+                {"label":"K41 (D4,C6)", "x":2.75, "y":2},
+                {"label":"K51 (D6,C6)", "x":3.75, "y":2},
+                {"label":"K42 (D4,B6)", "x":4.75, "y":2},
+                {"label":"K52 (D6,B6)", "x":5.75, "y":2},
+                {"label":"K43 (D4,B5)", "x":6.75, "y":2},
+                {"label":"K53 (D6,B5)", "x":7.75, "y":2},
+                {"label":"K44 (D4,B4)", "x":8.75, "y":2},
+                {"label":"K54 (D6,B4)", "x":9.75, "y":2},
+                {"label":"K45 (D4,D7)", "x":10.75, "y":2},
+                {"label":"K55 (D6,D7)", "x":11.75, "y":2},
+                {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K57 (D6,D3)", "x":15, "y":2},
+
+                {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25},
+                {"label":"K70 (F7,C7)", "x":2.25, "y":3},
+                {"label":"K61 (F6,C6)", "x":3.25, "y":3},
+                {"label":"K71 (F7,C6)", "x":4.25, "y":3},
+                {"label":"K62 (F6,B6)", "x":5.25, "y":3},
+                {"label":"K72 (F7,B6)", "x":6.25, "y":3},
+                {"label":"K63 (F6,B5)", "x":7.25, "y":3},
+                {"label":"K73 (F7,B5)", "x":8.25, "y":3},
+                {"label":"K64 (F6,B4)", "x":9.25, "y":3},
+                {"label":"K74 (F7,B4)", "x":10.25, "y":3},
+                {"label":"K65 (F6,D7)", "x":11.25, "y":3},
+                {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75},
+                {"label":"K77 (F7,D3)", "x":14, "y":3},
+                {"label":"K67 (F6,D3)", "x":15, "y":3},
+
+                {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25},
+                {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25},
+                {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25},
+                {"label":"K92 (F4,B6)", "x":3.75, "y":4, "w":6.25},
+                {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25},
+                {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K95 (F4,D7)", "x":13, "y":4},
+                {"label":"K97 (F4,D3)", "x":14, "y":4},
+                {"label":"K87 (F5,D3)", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                {"label":"K00 (B1,C7)", "x":0, "y":0},
+                {"label":"K10 (B2,C7)", "x":1, "y":0},
+                {"label":"K01 (B1,C6)", "x":2, "y":0},
+                {"label":"K11 (B2,C6)", "x":3, "y":0},
+                {"label":"K02 (B1,B6)", "x":4, "y":0},
+                {"label":"K12 (B2,B6)", "x":5, "y":0},
+                {"label":"K03 (B1,B5)", "x":6, "y":0},
+                {"label":"K13 (B2,B5)", "x":7, "y":0},
+                {"label":"K04 (B1,B4)", "x":8, "y":0},
+                {"label":"K14 (B2,B4)", "x":9, "y":0},
+                {"label":"K05 (B1,D7)", "x":10, "y":0},
+                {"label":"K15 (B2,D7)", "x":11, "y":0},
+                {"label":"K06 (B1,D5)", "x":12, "y":0},
+                {"label":"K26 (D1,D5)", "x":13, "y":0},
+                {"label":"K17 (B2,D3)", "x":14, "y":0},
+                {"label":"K07 (B1,D3)", "x":15, "y":0},
+
+                {"label":"K20 (D1,C7)", "x":0, "y":1, "w":1.5},
+                {"label":"K30 (D2,C7)", "x":1.5, "y":1},
+                {"label":"K21 (D1,C6)", "x":2.5, "y":1},
+                {"label":"K31 (D2,C6)", "x":3.5, "y":1},
+                {"label":"K22 (D1,B6)", "x":4.5, "y":1},
+                {"label":"K32 (D2,B6)", "x":5.5, "y":1},
+                {"label":"K23 (D1,B5)", "x":6.5, "y":1},
+                {"label":"K33 (D2,B5)", "x":7.5, "y":1},
+                {"label":"K24 (D1,B4)", "x":8.5, "y":1},
+                {"label":"K34 (D2,B4)", "x":9.5, "y":1},
+                {"label":"K25 (D1,D7)", "x":10.5, "y":1},
+                {"label":"K35 (D2,D7)", "x":11.5, "y":1},
+                {"label":"K36 (D2,D5)", "x":12.5, "y":1},
+                {"label":"K46 (D4,D5)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K37 (D2,D3)", "x":15, "y":1},
+
+                {"label":"K40 (D4,C7)", "x":0, "y":2, "w":1.75},
+                {"label":"K50 (D6,C7)", "x":1.75, "y":2},
+                {"label":"K41 (D4,C6)", "x":2.75, "y":2},
+                {"label":"K51 (D6,C6)", "x":3.75, "y":2},
+                {"label":"K42 (D4,B6)", "x":4.75, "y":2},
+                {"label":"K52 (D6,B6)", "x":5.75, "y":2},
+                {"label":"K43 (D4,B5)", "x":6.75, "y":2},
+                {"label":"K53 (D6,B5)", "x":7.75, "y":2},
+                {"label":"K44 (D4,B4)", "x":8.75, "y":2},
+                {"label":"K54 (D6,B4)", "x":9.75, "y":2},
+                {"label":"K45 (D4,D7)", "x":10.75, "y":2},
+                {"label":"K55 (D6,D7)", "x":11.75, "y":2},
+                {"label":"K47 (D4,D3)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K57 (D6,D3)", "x":15, "y":2},
+
+                {"label":"K60 (F6,C7)", "x":0, "y":3, "w":2.25},
+                {"label":"K70 (F7,C7)", "x":2.25, "y":3},
+                {"label":"K61 (F6,C6)", "x":3.25, "y":3},
+                {"label":"K71 (F7,C6)", "x":4.25, "y":3},
+                {"label":"K62 (F6,B6)", "x":5.25, "y":3},
+                {"label":"K72 (F7,B6)", "x":6.25, "y":3},
+                {"label":"K63 (F6,B5)", "x":7.25, "y":3},
+                {"label":"K73 (F7,B5)", "x":8.25, "y":3},
+                {"label":"K64 (F6,B4)", "x":9.25, "y":3},
+                {"label":"K74 (F7,B4)", "x":10.25, "y":3},
+                {"label":"K65 (F6,D7)", "x":11.25, "y":3},
+                {"label":"K75 (F7,D7)", "x":12.25, "y":3, "w":1.75},
+                {"label":"K77 (F7,D3)", "x":14, "y":3},
+                {"label":"K67 (F6,D3)", "x":15, "y":3},
+
+                {"label":"K80 (F5,C7)", "x":0, "y":4, "w":1.25},
+                {"label":"K90 (F4,C7)", "x":1.25, "y":4, "w":1.25},
+                {"label":"K81 (F5,C6)", "x":2.5, "y":4, "w":1.25},
+                {"label":"K92 (F4,B6)", "x":3.75, "y":4, "w":6.25},
+                {"label":"K94 (F4,B4)", "x":10, "y":4, "w":1.25},
+                {"label":"K85 (F5,D7)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K95 (F4,D7)", "x":13, "y":4},
+                {"label":"K97 (F4,D3)", "x":14, "y":4},
+                {"label":"K87 (F5,D3)", "x":15, "y":4}
             ]
         }
     }
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/keymap.c b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/keymap.c
index e318957ac8..b684282b65 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/keymap.c
@@ -18,22 +18,20 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-
     [0] = LAYOUT_65_ansi_blocker(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,  
-        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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP, 
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SPC,  KC_UP,   KC_PGDN, 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+        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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_SPC,  KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [1] = LAYOUT_65_ansi_blocker(
-        KC_TRNS, 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_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
 };
-
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md
index 181cc9a013..d69d73d349 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker/readme.md
@@ -1 +1,3 @@
-# The keymap for krush65 solder layout ansi blocker
\ No newline at end of file
+# The ansi_blocker keymap for krush65 solder
+
+* 65% ANSI layout with blocker
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/keymap.c b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/keymap.c
deleted file mode 100644
index e74181129a..0000000000
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2021 SawnsProjects
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-    [0] = LAYOUT_65_ansi_blocker_split_bs_sp(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,  KC_PSCR, 
-        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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP, 
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_PGDN, 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  
-    ),
-
-    [1] = LAYOUT_65_ansi_blocker_split_bs_sp(
-        KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
-    ),
-
-};
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/readme.md
deleted file mode 100644
index b6d1da89aa..0000000000
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_all/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The keymap for krush65 solder layout ansi blocker with split backspace and split spacebar
\ No newline at end of file
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/keymap.c b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/keymap.c
index 54f2975c27..c238e92a59 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/keymap.c
@@ -18,22 +18,20 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-
-
     [0] = LAYOUT_65_ansi_blocker_split_bs(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,  KC_PSCR, 
-        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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP, 
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN, 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,  KC_PSCR,
+        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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [1] = LAYOUT_65_ansi_blocker_split_bs(
-        KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
 };
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md
index 162da7a903..fffebdf6a0 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/ansi_blocker_split_bs/readme.md
@@ -1 +1,4 @@
-# The keymap for krush65 solder layout ansi blocker with split backspace
\ No newline at end of file
+# The ansi_blocker_split_bs keymap for krush65 solder
+
+* 65% ANSI layout with blocker
+  * split Backspace
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/keymap.c b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/keymap.c
index 13883d07e4..fcadaac844 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/keymap.c
@@ -18,22 +18,20 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-
     [0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,  KC_PSCR, 
-        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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP, 
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_PGDN, 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,  KC_PSCR,
+        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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [1] = LAYOUT_all(
-        KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______,          _______, _______, _______
     ),
 
 };
-
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md
index 1f98b857ce..9e7dd186d9 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/default/readme.md
@@ -1 +1,5 @@
-# The default keymap for krush65 solder
\ No newline at end of file
+# The default keymap for krush65 solder
+
+* 65% ANSI layout with blocker
+  * split Backspace
+  * split Spacebar
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/keymap.c b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/keymap.c
index 873df5cb9f..59eebc774e 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/keymap.c
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/keymap.c
@@ -18,34 +18,36 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-
     [0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,  KC_PSCR, 
-        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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP, 
-        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_PGDN, 
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,  KC_PSCR,
+        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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [1] = LAYOUT_all(
-        KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______,          _______, _______, _______
     ),
+
     [2] = LAYOUT_all(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______,          _______, _______, _______
     ),
+
     [3] = LAYOUT_all(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______,          _______, _______, _______
     ),
+
 };
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md
index 2c88050060..1c17d4e53b 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md
+++ b/keyboards/sawnsprojects/krush/krush65/solder/keymaps/via/readme.md
@@ -1 +1,5 @@
-# The VIA keymap for krush65 solder
\ No newline at end of file
+# The VIA keymap for krush65 solder
+
+* 65% ANSI layout with blocker
+  * split Backspace
+  * split Spacebar
diff --git a/keyboards/sawnsprojects/krush/krush65/solder/solder.h b/keyboards/sawnsprojects/krush/krush65/solder/solder.h
index 58f6bed57b..11140aac9c 100644
--- a/keyboards/sawnsprojects/krush/krush65/solder/solder.h
+++ b/keyboards/sawnsprojects/krush/krush65/solder/solder.h
@@ -18,76 +18,79 @@
 
 #include "quantum.h"
 
-#define LAYOUT_all( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, K07, \
-    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
-    K80, K90, K81, K82, K92, K93, K94, K85, K95, K97, K87  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, KC_NO, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37 }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, KC_NO, K57 }, \
-    { K60, K61, K62, K63, K64, K65, KC_NO, K67 }, \
-    { K70, K71, K72, K73, K74, K75, KC_NO, K77 }, \
-    { K80, K81, K82, KC_NO, KC_NO, K85, KC_NO, K87 }, \
-    { K90, KC_NO, K92, K93, K94, K95, KC_NO, K97 }, \
-}
+#define XXX KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+ * │00 │10 │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │26 │17 │07 │      │26     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      └─┬─────┤
+ * │20   │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │36 │46   │37 │        │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤     ┌──┴┐47  │ ISO Enter
+ * │40    │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │47      │57 │     │46 │    │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤     └───┴────┘
+ * │60      │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75    │77 │67 │
+ * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │80  │90  │81  │82      │92  │93        │94  │85  │ │95 │97 │87 │ Split Spacebar
+ * └────┴────┴────┴────────┴────┴──────────┴────┴────┘ └───┴───┴───┘
+ * ┌────┬────┬────┬────────────────────────┬────┬────┐
+ * │80  │90  │81  │92                      │94  │85  │ Standard
+ * └────┴────┴────┴────────────────────────┴────┴────┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ * │80   │90 │81   │92                         │85   │ Tsangan
+ * └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
 #define LAYOUT_65_ansi_blocker( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K07, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
-    K80, K90, K81, K92, K94, K85, K95, K97, K87  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
+    K80, K90, K81,                K92,           K94, K85,      K95, K97, K87  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, KC_NO, KC_NO }, \
-    { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \
+    { K10, K11, K12, K13, K14, K15, XXX, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
     { K30, K31, K32, K33, K34, K35, K36, K37 }, \
     { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, KC_NO, K57 }, \
-    { K60, K61, K62, K63, K64, K65, KC_NO, K67 }, \
-    { K70, K71, K72, K73, K74, K75, KC_NO, K77 }, \
-    { K80, K81, KC_NO, KC_NO, KC_NO, K85, KC_NO, K87 }, \
-    { K90, KC_NO, K92, KC_NO, K94, K95, KC_NO, K97 }, \
+    { K50, K51, K52, K53, K54, K55, XXX, K57 }, \
+    { K60, K61, K62, K63, K64, K65, XXX, K67 }, \
+    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
+    { K80, K81, XXX, XXX, XXX, K85, XXX, K87 }, \
+    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
 #define LAYOUT_65_ansi_blocker_split_bs( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, K07, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
-    K80, K90, K81, K92, K94, K85, K95, K97, K87  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
+    K80, K90, K81,                K92,           K94, K85,      K95, K97, K87  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, KC_NO, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \
+    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
     { K30, K31, K32, K33, K34, K35, K36, K37 }, \
     { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, KC_NO, K57 }, \
-    { K60, K61, K62, K63, K64, K65, KC_NO, K67 }, \
-    { K70, K71, K72, K73, K74, K75, KC_NO, K77 }, \
-    { K80, K81, KC_NO, KC_NO, KC_NO, K85, KC_NO, K87 }, \
-    { K90, KC_NO, K92, KC_NO, K94, K95, KC_NO, K97 }, \
+    { K50, K51, K52, K53, K54, K55, XXX, K57 }, \
+    { K60, K61, K62, K63, K64, K65, XXX, K67 }, \
+    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
+    { K80, K81, XXX, XXX, XXX, K85, XXX, K87 }, \
+    { K90, XXX, K92, XXX, K94, K95, XXX, K97 }, \
 }
 #define LAYOUT_65_ansi_blocker_split_bs_sp( \
     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K26, K17, K07, \
     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, K46, K37, \
-    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K47, K57, \
-    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
-    K80, K90, K81, K82, K92, K93, K94, K85, K95, K97, K87  \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K47, K57, \
+    K60,      K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K77, K67, \
+    K80, K90, K81,           K82, K92, K93,      K94, K85,      K95, K97, K87  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07 }, \
-    { K10, K11, K12, K13, K14, K15, KC_NO, K17 }, \
-    { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \
+    { K10, K11, K12, K13, K14, K15, XXX, K17 }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX }, \
     { K30, K31, K32, K33, K34, K35, K36, K37 }, \
     { K40, K41, K42, K43, K44, K45, K46, K47 }, \
-    { K50, K51, K52, K53, K54, K55, KC_NO, K57 }, \
-    { K60, K61, K62, K63, K64, K65, KC_NO, K67 }, \
-    { K70, K71, K72, K73, K74, K75, KC_NO, K77 }, \
-    { K80, K81, K82, KC_NO, KC_NO, K85, KC_NO, K87 }, \
-    { K90, KC_NO, K92, K93, K94, K95, KC_NO, K97 }, \
+    { K50, K51, K52, K53, K54, K55, XXX, K57 }, \
+    { K60, K61, K62, K63, K64, K65, XXX, K67 }, \
+    { K70, K71, K72, K73, K74, K75, XXX, K77 }, \
+    { K80, K81, K82, XXX, XXX, K85, XXX, K87 }, \
+    { K90, XXX, K92, K93, K94, K95, XXX, K97 }, \
 }
-

From be59e8af2b8efcee2933f3b9e40129bc1d8f9d1c Mon Sep 17 00:00:00 2001
From: Stefan Kerkmann <karlk90@pm.me>
Date: Thu, 27 Jan 2022 06:13:27 +0100
Subject: [PATCH 390/867] Deprecate split transactions status field (#16023)

---
 drivers/serial.h                         | 19 +-----------
 platforms/avr/drivers/serial.c           | 39 +++++-------------------
 platforms/chibios/drivers/serial.c       | 19 ++++--------
 platforms/chibios/drivers/serial_usart.c | 32 ++++++-------------
 quantum/split_common/transactions.c      |  7 ++---
 quantum/split_common/transactions.h      |  1 -
 quantum/split_common/transport.c         |  2 +-
 7 files changed, 28 insertions(+), 91 deletions(-)

diff --git a/drivers/serial.h b/drivers/serial.h
index d9c2a69e96..0cfdbd9959 100644
--- a/drivers/serial.h
+++ b/drivers/serial.h
@@ -26,21 +26,4 @@ void soft_serial_initiator_init(void);
 // target is interrupt accept side
 void soft_serial_target_init(void);
 
-// initiator result
-#define TRANSACTION_END 0
-#define TRANSACTION_NO_RESPONSE 0x1
-#define TRANSACTION_DATA_ERROR 0x2
-#define TRANSACTION_TYPE_ERROR 0x4
-int soft_serial_transaction(int sstd_index);
-
-// target status
-// *SSTD_t.status has
-//   initiator:
-//       TRANSACTION_END
-//    or TRANSACTION_NO_RESPONSE
-//    or TRANSACTION_DATA_ERROR
-//   target:
-//       TRANSACTION_DATA_ERROR
-//    or TRANSACTION_ACCEPTED
-#define TRANSACTION_ACCEPTED 0x8
-int soft_serial_get_and_clean_status(int sstd_index);
+bool soft_serial_transaction(int sstd_index);
diff --git a/platforms/avr/drivers/serial.c b/platforms/avr/drivers/serial.c
index ab0b52afd1..62908e5875 100644
--- a/platforms/avr/drivers/serial.c
+++ b/platforms/avr/drivers/serial.c
@@ -409,13 +409,7 @@ ISR(SERIAL_PIN_INTERRUPT) {
 
     // target recive phase
     if (trans->initiator2target_buffer_size > 0) {
-        if (serial_recive_packet((uint8_t *)split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size)) {
-            *trans->status = TRANSACTION_ACCEPTED;
-        } else {
-            *trans->status = TRANSACTION_DATA_ERROR;
-        }
-    } else {
-        *trans->status = TRANSACTION_ACCEPTED;
+        serial_recive_packet((uint8_t *)split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size);
     }
 
     sync_recv();  // weit initiator output to high
@@ -424,19 +418,13 @@ ISR(SERIAL_PIN_INTERRUPT) {
 /////////
 //  start transaction by initiator
 //
-// int  soft_serial_transaction(int sstd_index)
+// bool  soft_serial_transaction(int sstd_index)
 //
-// Returns:
-//    TRANSACTION_END
-//    TRANSACTION_NO_RESPONSE
-//    TRANSACTION_DATA_ERROR
 // this code is very time dependent, so we need to disable interrupts
-int soft_serial_transaction(int sstd_index) {
-    if (sstd_index > NUM_TOTAL_TRANSACTIONS) return TRANSACTION_TYPE_ERROR;
+bool soft_serial_transaction(int sstd_index) {
+    if (sstd_index > NUM_TOTAL_TRANSACTIONS) return false;
     split_transaction_desc_t *trans = &split_transaction_table[sstd_index];
 
-    if (!trans->status) return TRANSACTION_TYPE_ERROR;  // not registered
-
     cli();
 
     // signal to the target that we want to start a transaction
@@ -463,9 +451,8 @@ int soft_serial_transaction(int sstd_index) {
             // slave failed to pull the line low, assume not present
             serial_output();
             serial_high();
-            *trans->status = TRANSACTION_NO_RESPONSE;
             sei();
-            return TRANSACTION_NO_RESPONSE;
+            return false;
         }
         _delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT);
     }
@@ -476,9 +463,8 @@ int soft_serial_transaction(int sstd_index) {
         if (!serial_recive_packet((uint8_t *)split_trans_target2initiator_buffer(trans), trans->target2initiator_buffer_size)) {
             serial_output();
             serial_high();
-            *trans->status = TRANSACTION_DATA_ERROR;
             sei();
-            return TRANSACTION_DATA_ERROR;
+            return false;
         }
     }
 
@@ -493,19 +479,8 @@ int soft_serial_transaction(int sstd_index) {
     // always, release the line when not in use
     sync_send();
 
-    *trans->status = TRANSACTION_END;
     sei();
-    return TRANSACTION_END;
-}
-
-int soft_serial_get_and_clean_status(int sstd_index) {
-    split_transaction_desc_t *trans = &split_transaction_table[sstd_index];
-    cli();
-    int retval     = *trans->status;
-    *trans->status = 0;
-    ;
-    sei();
-    return retval;
+    return true;
 }
 #endif
 
diff --git a/platforms/chibios/drivers/serial.c b/platforms/chibios/drivers/serial.c
index ef6f0aa8d5..17d0b32be8 100644
--- a/platforms/chibios/drivers/serial.c
+++ b/platforms/chibios/drivers/serial.c
@@ -179,8 +179,6 @@ void interrupt_handler(void *arg) {
     // wait for the sync to finish sending
     serial_delay();
 
-    *trans->status = (checksum_computed == checksum_received) ? TRANSACTION_ACCEPTED : TRANSACTION_DATA_ERROR;
-
     // end transaction
     serial_input();
 
@@ -193,17 +191,12 @@ void interrupt_handler(void *arg) {
 /////////
 //  start transaction by initiator
 //
-// int  soft_serial_transaction(int sstd_index)
+// bool  soft_serial_transaction(int sstd_index)
 //
-// Returns:
-//    TRANSACTION_END
-//    TRANSACTION_NO_RESPONSE
-//    TRANSACTION_DATA_ERROR
 // this code is very time dependent, so we need to disable interrupts
-int soft_serial_transaction(int sstd_index) {
-    if (sstd_index > NUM_TOTAL_TRANSACTIONS) return TRANSACTION_TYPE_ERROR;
+bool soft_serial_transaction(int sstd_index) {
+    if (sstd_index > NUM_TOTAL_TRANSACTIONS) return false;
     split_transaction_desc_t *trans = &split_transaction_table[sstd_index];
-    if (!trans->status) return TRANSACTION_TYPE_ERROR;  // not registered
 
     // TODO: remove extra delay between transactions
     serial_delay();
@@ -226,7 +219,7 @@ int soft_serial_transaction(int sstd_index) {
         // slave failed to pull the line low, assume not present
         dprintf("serial::NO_RESPONSE\n");
         chSysUnlock();
-        return TRANSACTION_NO_RESPONSE;
+        return false;
     }
 
     // if the slave is present syncronize with it
@@ -266,7 +259,7 @@ int soft_serial_transaction(int sstd_index) {
         serial_high();
 
         chSysUnlock();
-        return TRANSACTION_DATA_ERROR;
+        return false;
     }
 
     // always, release the line when not in use
@@ -274,5 +267,5 @@ int soft_serial_transaction(int sstd_index) {
     serial_output();
 
     chSysUnlock();
-    return TRANSACTION_END;
+    return true;
 }
diff --git a/platforms/chibios/drivers/serial_usart.c b/platforms/chibios/drivers/serial_usart.c
index 124e4be685..42c476a374 100644
--- a/platforms/chibios/drivers/serial_usart.c
+++ b/platforms/chibios/drivers/serial_usart.c
@@ -36,7 +36,7 @@ static SerialDriver* serial_driver = &SERIAL_USART_DRIVER;
 static inline bool react_to_transactions(void);
 static inline bool __attribute__((nonnull)) receive(uint8_t* destination, const size_t size);
 static inline bool __attribute__((nonnull)) send(const uint8_t* source, const size_t size);
-static inline int  initiate_transaction(uint8_t sstd_index);
+static inline bool initiate_transaction(uint8_t sstd_index);
 static inline void usart_clear(void);
 
 /**
@@ -206,14 +206,12 @@ static inline bool react_to_transactions(void) {
      to signal that the slave is ready to receive possible transaction buffers  */
     sstd_index ^= HANDSHAKE_MAGIC;
     if (!send(&sstd_index, sizeof(sstd_index))) {
-        *trans->status = TRANSACTION_DATA_ERROR;
         return false;
     }
 
     /* Receive transaction buffer from the master. If this transaction requires it.*/
     if (trans->initiator2target_buffer_size) {
         if (!receive(split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size)) {
-            *trans->status = TRANSACTION_DATA_ERROR;
             return false;
         }
     }
@@ -226,12 +224,10 @@ static inline bool react_to_transactions(void) {
     /* Send transaction buffer to the master. If this transaction requires it. */
     if (trans->target2initiator_buffer_size) {
         if (!send(split_trans_target2initiator_buffer(trans), trans->target2initiator_buffer_size)) {
-            *trans->status = TRANSACTION_DATA_ERROR;
             return false;
         }
     }
 
-    *trans->status = TRANSACTION_ACCEPTED;
     return true;
 }
 
@@ -252,11 +248,9 @@ void soft_serial_initiator_init(void) {
  * @brief Start transaction from the master half to the slave half.
  *
  * @param index Transaction Table index of the transaction to start.
- * @return int TRANSACTION_NO_RESPONSE in case of Timeout.
- *             TRANSACTION_TYPE_ERROR in case of invalid transaction index.
- *             TRANSACTION_END in case of success.
+ * @return bool Indicates success of transaction.
  */
-int soft_serial_transaction(int index) {
+bool soft_serial_transaction(int index) {
     /* Clear the receive queue, to start with a clean slate.
      * Parts of failed transactions or spurious bytes could still be in it. */
     usart_clear();
@@ -266,25 +260,19 @@ int soft_serial_transaction(int index) {
 /**
  * @brief Initiate transaction to slave half.
  */
-static inline int initiate_transaction(uint8_t sstd_index) {
+static inline bool initiate_transaction(uint8_t sstd_index) {
     /* Sanity check that we are actually starting a valid transaction. */
     if (sstd_index >= NUM_TOTAL_TRANSACTIONS) {
         dprintln("USART: Illegal transaction Id.");
-        return TRANSACTION_TYPE_ERROR;
+        return false;
     }
 
     split_transaction_desc_t* trans = &split_transaction_table[sstd_index];
 
-    /* Transaction is not registered. Abort. */
-    if (!trans->status) {
-        dprintln("USART: Transaction not registered.");
-        return TRANSACTION_TYPE_ERROR;
-    }
-
     /* Send transaction table index to the slave, which doubles as basic handshake token. */
     if (!send(&sstd_index, sizeof(sstd_index))) {
         dprintln("USART: Send Handshake failed.");
-        return TRANSACTION_TYPE_ERROR;
+        return false;
     }
 
     uint8_t sstd_index_shake = 0xFF;
@@ -295,14 +283,14 @@ static inline int initiate_transaction(uint8_t sstd_index) {
      */
     if (!receive(&sstd_index_shake, sizeof(sstd_index_shake)) || (sstd_index_shake != (sstd_index ^ HANDSHAKE_MAGIC))) {
         dprintln("USART: Handshake failed.");
-        return TRANSACTION_NO_RESPONSE;
+        return false;
     }
 
     /* Send transaction buffer to the slave. If this transaction requires it. */
     if (trans->initiator2target_buffer_size) {
         if (!send(split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size)) {
             dprintln("USART: Send failed.");
-            return TRANSACTION_NO_RESPONSE;
+            return false;
         }
     }
 
@@ -310,9 +298,9 @@ static inline int initiate_transaction(uint8_t sstd_index) {
     if (trans->target2initiator_buffer_size) {
         if (!receive(split_trans_target2initiator_buffer(trans), trans->target2initiator_buffer_size)) {
             dprintln("USART: Receive failed.");
-            return TRANSACTION_NO_RESPONSE;
+            return false;
         }
     }
 
-    return TRANSACTION_END;
+    return true;
 }
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index d9e8fd1f6b..4b059a2b8a 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -35,11 +35,11 @@
 #define sizeof_member(type, member) sizeof(((type *)NULL)->member)
 
 #define trans_initiator2target_initializer_cb(member, cb) \
-    { &dummy, sizeof_member(split_shared_memory_t, member), offsetof(split_shared_memory_t, member), 0, 0, cb }
+    { sizeof_member(split_shared_memory_t, member), offsetof(split_shared_memory_t, member), 0, 0, cb }
 #define trans_initiator2target_initializer(member) trans_initiator2target_initializer_cb(member, NULL)
 
 #define trans_target2initiator_initializer_cb(member, cb) \
-    { &dummy, 0, 0, sizeof_member(split_shared_memory_t, member), offsetof(split_shared_memory_t, member), cb }
+    { 0, 0, sizeof_member(split_shared_memory_t, member), offsetof(split_shared_memory_t, member), cb }
 #define trans_target2initiator_initializer(member) trans_target2initiator_initializer_cb(member, NULL)
 
 #define transport_write(id, data, length) transport_execute_transaction(id, data, length, NULL, 0)
@@ -658,10 +658,9 @@ static void pointing_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
 
 ////////////////////////////////////////////////////
 
-uint8_t                  dummy;
 split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = {
     // Set defaults
-    [0 ...(NUM_TOTAL_TRANSACTIONS - 1)] = {NULL, 0, 0, 0, 0, 0},
+    [0 ...(NUM_TOTAL_TRANSACTIONS - 1)] = {0, 0, 0, 0, 0},
 
 #ifdef USE_I2C
     [I2C_EXECUTE_CALLBACK] = trans_initiator2target_initializer(transaction_id),
diff --git a/quantum/split_common/transactions.h b/quantum/split_common/transactions.h
index 53610d6f8e..e38ec79ce9 100644
--- a/quantum/split_common/transactions.h
+++ b/quantum/split_common/transactions.h
@@ -27,7 +27,6 @@ typedef void (*slave_callback_t)(uint8_t initiator2target_buffer_size, const voi
 
 // Split transaction Descriptor
 typedef struct _split_transaction_desc_t {
-    uint8_t *        status;
     uint8_t          initiator2target_buffer_size;
     uint16_t         initiator2target_offset;
     uint8_t          target2initiator_buffer_size;
diff --git a/quantum/split_common/transport.c b/quantum/split_common/transport.c
index bcc0261417..060ba8a927 100644
--- a/quantum/split_common/transport.c
+++ b/quantum/split_common/transport.c
@@ -99,7 +99,7 @@ bool transport_execute_transaction(int8_t id, const void *initiator2target_buf,
         memcpy(split_trans_initiator2target_buffer(trans), initiator2target_buf, len);
     }
 
-    if (soft_serial_transaction(id) != TRANSACTION_END) {
+    if (!soft_serial_transaction(id)) {
         return false;
     }
 

From a211887978b5f2f1fef6cee42bb15c601d56c312 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 26 Jan 2022 21:16:09 -0800
Subject: [PATCH 391/867] Keychron QMK Configurator Refactor (#16034)

---
 keyboards/keychron/q1/rev_0101/info.json      | 191 ++++++++++++++++++
 .../q1/rev_0101/keymaps/default/info.json     |  97 ---------
 .../q1/rev_0101/keymaps/via/info.json         | 100 ---------
 .../keychron/q1/rev_0101/keymaps/via/keymap.c |  16 +-
 keyboards/keychron/q1/rev_0101/rev_0101.h     |   4 +-
 keyboards/keychron/q2/rev_0110/info.json      | 136 ++++++-------
 keyboards/keychron/q2/rev_0111/info.json      | 159 +++++++++++++++
 .../q2/rev_0111/keymaps/default/info.json     |  82 --------
 .../q2/rev_0111/keymaps/via/info.json         |  84 --------
 .../keychron/q2/rev_0111/keymaps/via/keymap.c |  20 +-
 keyboards/keychron/q2/rev_0111/rev_0111.h     |   4 +-
 keyboards/keychron/q2/rev_0112/info.json      | 138 ++++++-------
 keyboards/keychron/q2/rev_0113/info.json      | 161 +++++++++++++++
 .../q2/rev_0113/keymaps/default/info.json     |  83 --------
 .../q2/rev_0113/keymaps/via/info.json         |  85 --------
 .../keychron/q2/rev_0113/keymaps/via/keymap.c |  20 +-
 keyboards/keychron/q2/rev_0113/rev_0113.h     |   4 +-
 17 files changed, 682 insertions(+), 702 deletions(-)
 create mode 100644 keyboards/keychron/q1/rev_0101/info.json
 delete mode 100644 keyboards/keychron/q1/rev_0101/keymaps/default/info.json
 delete mode 100644 keyboards/keychron/q1/rev_0101/keymaps/via/info.json
 create mode 100644 keyboards/keychron/q2/rev_0111/info.json
 delete mode 100644 keyboards/keychron/q2/rev_0111/keymaps/default/info.json
 delete mode 100644 keyboards/keychron/q2/rev_0111/keymaps/via/info.json
 create mode 100644 keyboards/keychron/q2/rev_0113/info.json
 delete mode 100644 keyboards/keychron/q2/rev_0113/keymaps/default/info.json
 delete mode 100644 keyboards/keychron/q2/rev_0113/keymaps/via/info.json

diff --git a/keyboards/keychron/q1/rev_0101/info.json b/keyboards/keychron/q1/rev_0101/info.json
new file mode 100644
index 0000000000..75fb2d04e8
--- /dev/null
+++ b/keyboards/keychron/q1/rev_0101/info.json
@@ -0,0 +1,191 @@
+{
+    "keyboard_name": "Keychron Q1",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_ansi_82": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+                {"label":"Mute", "x":15.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Page Up", "x":15.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Page Down", "x":15.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"Home", "x":15.25, "y":3.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Up", "x":14.25, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25},
+                {"label":"Fn", "x":11, "y":5.25},
+                {"label":"Ctrl", "x":12, "y":5.25},
+                {"label":"Left", "x":13.25, "y":5.5},
+                {"label":"Down", "x":14.25, "y":5.5},
+                {"label":"Right", "x":15.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0.5},
+                {"label":"F1", "x":1.25, "y":0.5},
+                {"label":"F2", "x":2.25, "y":0.5},
+                {"label":"F3", "x":3.25, "y":0.5},
+                {"label":"F4", "x":4.25, "y":0.5},
+                {"label":"F5", "x":5.5, "y":0.5},
+                {"label":"F6", "x":6.5, "y":0.5},
+                {"label":"F7", "x":7.5, "y":0.5},
+                {"label":"F8", "x":8.5, "y":0.5},
+                {"label":"F9", "x":9.75, "y":0.5},
+                {"label":"F10", "x":10.75, "y":0.5},
+                {"label":"F11", "x":11.75, "y":0.5},
+                {"label":"F12", "x":12.75, "y":0.5},
+                {"label":"Delete", "x":14, "y":0.5},
+                {"label":"CCW", "x":15.15, "y":0, "w":0.6, "h":0.5},
+                {"label":"Mute", "x":15.25, "y":0.5},
+                {"label":"CW", "x":15.75, "y":0, "w":0.6, "h":0.5},
+
+                {"label":"`~", "x":0, "y":1.75},
+                {"label":"1!", "x":1, "y":1.75},
+                {"label":"2@", "x":2, "y":1.75},
+                {"label":"3#", "x":3, "y":1.75},
+                {"label":"4$", "x":4, "y":1.75},
+                {"label":"5%", "x":5, "y":1.75},
+                {"label":"6^", "x":6, "y":1.75},
+                {"label":"7&", "x":7, "y":1.75},
+                {"label":"8*", "x":8, "y":1.75},
+                {"label":"9(", "x":9, "y":1.75},
+                {"label":"0)", "x":10, "y":1.75},
+                {"label":"-_", "x":11, "y":1.75},
+                {"label":"=+", "x":12, "y":1.75},
+                {"label":"Backspace", "x":13, "y":1.75, "w":2},
+                {"label":"Page Up", "x":15.25, "y":1.75},
+
+                {"label":"Tab", "x":0, "y":2.75, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.75},
+                {"label":"W", "x":2.5, "y":2.75},
+                {"label":"E", "x":3.5, "y":2.75},
+                {"label":"R", "x":4.5, "y":2.75},
+                {"label":"T", "x":5.5, "y":2.75},
+                {"label":"Y", "x":6.5, "y":2.75},
+                {"label":"U", "x":7.5, "y":2.75},
+                {"label":"I", "x":8.5, "y":2.75},
+                {"label":"O", "x":9.5, "y":2.75},
+                {"label":"P", "x":10.5, "y":2.75},
+                {"label":"[{", "x":11.5, "y":2.75},
+                {"label":"]}", "x":12.5, "y":2.75},
+                {"label":"\\|", "x":13.5, "y":2.75, "w":1.5},
+                {"label":"Page Down", "x":15.25, "y":2.75},
+
+                {"label":"Caps Lock", "x":0, "y":3.75, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.75},
+                {"label":"S", "x":2.75, "y":3.75},
+                {"label":"D", "x":3.75, "y":3.75},
+                {"label":"F", "x":4.75, "y":3.75},
+                {"label":"G", "x":5.75, "y":3.75},
+                {"label":"H", "x":6.75, "y":3.75},
+                {"label":"J", "x":7.75, "y":3.75},
+                {"label":"K", "x":8.75, "y":3.75},
+                {"label":"L", "x":9.75, "y":3.75},
+                {"label":";:", "x":10.75, "y":3.75},
+                {"label":"'\"", "x":11.75, "y":3.75},
+                {"label":"Enter", "x":12.75, "y":3.75, "w":2.25},
+                {"label":"Home", "x":15.25, "y":3.75},
+
+                {"label":"Shift", "x":0, "y":4.75, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.75},
+                {"label":"X", "x":3.25, "y":4.75},
+                {"label":"C", "x":4.25, "y":4.75},
+                {"label":"V", "x":5.25, "y":4.75},
+                {"label":"B", "x":6.25, "y":4.75},
+                {"label":"N", "x":7.25, "y":4.75},
+                {"label":"M", "x":8.25, "y":4.75},
+                {"label":",<", "x":9.25, "y":4.75},
+                {"label":".>", "x":10.25, "y":4.75},
+                {"label":"/?", "x":11.25, "y":4.75},
+                {"label":"Shift", "x":12.25, "y":4.75, "w":1.75},
+                {"label":"Up", "x":14.25, "y":5},
+
+                {"label":"Ctrl", "x":0, "y":5.75, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.75, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.75, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.75, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.75},
+                {"label":"Fn", "x":11, "y":5.75},
+                {"label":"Ctrl", "x":12, "y":5.75},
+                {"label":"Left", "x":13.25, "y":6},
+                {"label":"Down", "x":14.25, "y":6},
+                {"label":"Right", "x":15.25, "y":6}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/default/info.json b/keyboards/keychron/q1/rev_0101/keymaps/default/info.json
deleted file mode 100644
index 56bf48acc1..0000000000
--- a/keyboards/keychron/q1/rev_0101/keymaps/default/info.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    "keyboard_name": "Keychron Q1",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "layouts": {
-        "LAYOUT_ansi_82": {
-            "layout": [
-            {"label":"Esc", "x":0, "y":0},
-            {"label":"F1", "x":1.25, "y":0},
-            {"label":"F2", "x":2.25, "y":0},
-            {"label":"F3", "x":3.25, "y":0},
-            {"label":"F4", "x":4.25, "y":0},
-            {"label":"F5", "x":5.5, "y":0},
-            {"label":"F6", "x":6.5, "y":0},
-            {"label":"F7", "x":7.5, "y":0},
-            {"label":"F8", "x":8.5, "y":0},
-            {"label":"F9", "x":9.75, "y":0},
-            {"label":"F10", "x":10.75, "y":0},
-            {"label":"F11", "x":11.75, "y":0},
-            {"label":"F12", "x":12.75, "y":0},
-            {"label":"Delete", "x":14, "y":0},
-            {"label":"Mute", "x":15.25, "y":0},
-        
-            {"label":"~", "x":0, "y":1.25},
-            {"label":"!", "x":1, "y":1.25},
-            {"label":"@", "x":2, "y":1.25},
-            {"label":"#", "x":3, "y":1.25},
-            {"label":"$", "x":4, "y":1.25},
-            {"label":"%", "x":5, "y":1.25},
-            {"label":"^", "x":6, "y":1.25},
-            {"label":"&", "x":7, "y":1.25},
-            {"label":"*", "x":8, "y":1.25},
-            {"label":"(", "x":9, "y":1.25},
-            {"label":")", "x":10, "y":1.25},
-            {"label":"_", "x":11, "y":1.25},
-            {"label":"+", "x":12, "y":1.25},
-            {"label":"Backspace", "x":13, "y":1.25, "w":2},
-            {"label":"Page Up", "x":15.25, "y":1.25},
-            
-            {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-            {"label":"Q", "x":1.5, "y":2.25},
-            {"label":"W", "x":2.5, "y":2.25},
-            {"label":"E", "x":3.5, "y":2.25},
-            {"label":"R", "x":4.5, "y":2.25},
-            {"label":"T", "x":5.5, "y":2.25},
-            {"label":"Y", "x":6.5, "y":2.25},
-            {"label":"U", "x":7.5, "y":2.25},
-            {"label":"I", "x":8.5, "y":2.25},
-            {"label":"O", "x":9.5, "y":2.25},
-            {"label":"P", "x":10.5, "y":2.25},
-            {"label":"{", "x":11.5, "y":2.25},
-            {"label":"}", "x":12.5, "y":2.25},
-            {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-            {"label":"Page Down", "x":15.25, "y":2.25},
-
-            {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-            {"label":"A", "x":1.75, "y":3.25},
-            {"label":"S", "x":2.75, "y":3.25},
-            {"label":"D", "x":3.75, "y":3.25},
-            {"label":"F", "x":4.75, "y":3.25},
-            {"label":"G", "x":5.75, "y":3.25},
-            {"label":"H", "x":6.75, "y":3.25},
-            {"label":"J", "x":7.75, "y":3.25},
-            {"label":"K", "x":8.75, "y":3.25},
-            {"label":"L", "x":9.75, "y":3.25},
-            {"label":":", "x":10.75, "y":3.25},
-            {"label":"\"", "x":11.75, "y":3.25},
-            {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-            {"label":"Home", "x":15.25, "y":3.25},
-            
-            {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-            {"label":"Z", "x":2.25, "y":4.25},
-            {"label":"X", "x":3.25, "y":4.25},
-            {"label":"C", "x":4.25, "y":4.25},
-            {"label":"V", "x":5.25, "y":4.25},
-            {"label":"B", "x":6.25, "y":4.25},
-            {"label":"N", "x":7.25, "y":4.25},
-            {"label":"M", "x":8.25, "y":4.25},
-            {"label":"<", "x":9.25, "y":4.25},
-            {"label":">", "x":10.25, "y":4.25},
-            {"label":"?", "x":11.25, "y":4.25},
-            {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-            {"label":"Up", "x":14.25, "y":4.5},
-            
-            {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-            {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-            {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-            {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-            {"label":"Alt", "x":10, "y":5.25},
-            {"label":"Fn", "x":11, "y":5.25},
-            {"label":"Ctrl", "x":12, "y":5.25},
-            {"label":"Left", "x":13.25, "y":5.5},
-            {"label":"Down", "x":14.25, "y":5.5},
-            {"label":"Right", "x":15.25, "y":5.5} ]
-        }
-    }
-}
\ No newline at end of file
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/via/info.json b/keyboards/keychron/q1/rev_0101/keymaps/via/info.json
deleted file mode 100644
index a921ee3e4c..0000000000
--- a/keyboards/keychron/q1/rev_0101/keymaps/via/info.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "keyboard_name": "Keychron Q1",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"F1", "x":1.25, "y":0},
-                {"label":"F2", "x":2.25, "y":0},
-                {"label":"F3", "x":3.25, "y":0},
-                {"label":"F4", "x":4.25, "y":0},
-                {"label":"F5", "x":5.5, "y":0},
-                {"label":"F6", "x":6.5, "y":0},
-                {"label":"F7", "x":7.5, "y":0},
-                {"label":"F8", "x":8.5, "y":0},
-                {"label":"F9", "x":9.75, "y":0},
-                {"label":"F10", "x":10.75, "y":0},
-                {"label":"F11", "x":11.75, "y":0},
-                {"label":"F12", "x":12.75, "y":0},
-                {"label":"Delete", "x":14, "y":0},
-
-                {"label":"Mute", "x":15.25, "y":0, "w":0.75},
-                {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
-                {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
-
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Page Up", "x":15.25, "y":1.25},
-
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Page Down", "x":15.25, "y":2.25},
-
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"Home", "x":15.25, "y":3.25},
-
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
-                {"label":"Up", "x":14.25, "y":4.5},
-
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25},
-                {"label":"Fn", "x":11, "y":5.25},
-                {"label":"Ctrl", "x":12, "y":5.25},
-                {"label":"Left", "x":13.25, "y":5.5},
-                {"label":"Down", "x":14.25, "y":5.5},
-                {"label":"Right", "x":15.25, "y":5.5} ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c b/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
index 1103f74427..ad053648e5 100644
--- a/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c
@@ -35,36 +35,36 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_all(
-        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,   KC_MUTE,
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_DEL,     KC_VOLD,  KC_MUTE,  KC_VOLU,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
         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_LALT,  KC_LGUI,                                KC_SPC,   KC_VOLD,  KC_VOLU,            KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI, MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [MAC_FN] = LAYOUT_all(
-        KC_TRNS,            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_TRNS,  KC_TRNS,
+        KC_TRNS,            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_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
         KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
 
     [WIN_BASE] = LAYOUT_all(
-        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_MUTE,
+        KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,     KC_VOLD,  KC_MUTE,  KC_VOLU,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,            KC_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_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,            KC_ENT,             KC_HOME,
         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_VOLD,  KC_VOLU,            KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+        KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
     [WIN_FN] = LAYOUT_all(
-        KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  KC_TRNS,
+        KC_TRNS,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
         KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,
         KC_TRNS,  RGB_RMOD, RGB_VAD,  RGB_HUD,  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_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                                KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
 };
 
 #if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
diff --git a/keyboards/keychron/q1/rev_0101/rev_0101.h b/keyboards/keychron/q1/rev_0101/rev_0101.h
index 132003c4f1..e4e8205b71 100644
--- a/keyboards/keychron/q1/rev_0101/rev_0101.h
+++ b/keyboards/keychron/q1/rev_0101/rev_0101.h
@@ -21,12 +21,12 @@
 #define xxx KC_NO
 
 #define LAYOUT_all( \
-        K00,       K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E, K0E, \
+        K00,       K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4E,   K57, K0E, K58, \
         K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E, \
         K20, K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, \
         K30, K31,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      K3E, \
         K40,       K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D, K3C,      \
-        K50, K51,  K52,                K56, K57, K58,      K5A, K5B, K5C, K5D, K4C, K5E  \
+        K50, K51,  K52,                K56,                K5A, K5B, K5C, K5D, K4C, K5E  \
     ) { \
         { K00, xxx,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E }, \
         { K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D, K1E }, \
diff --git a/keyboards/keychron/q2/rev_0110/info.json b/keyboards/keychron/q2/rev_0110/info.json
index caf3ebf7c9..fb34a2427a 100644
--- a/keyboards/keychron/q2/rev_0110/info.json
+++ b/keyboards/keychron/q2/rev_0110/info.json
@@ -5,78 +5,78 @@
     "layouts": {
         "LAYOUT_ansi_67": {
             "layout": [
-            {"label":"Insert", "x":15.25, "y":0},
+                {"label":"Esc", "x":0, "y":0.25},
+                {"label":"1!", "x":1, "y":0.25},
+                {"label":"2@", "x":2, "y":0.25},
+                {"label":"3#", "x":3, "y":0.25},
+                {"label":"4$", "x":4, "y":0.25},
+                {"label":"5%", "x":5, "y":0.25},
+                {"label":"6^", "x":6, "y":0.25},
+                {"label":"7&", "x":7, "y":0.25},
+                {"label":"8*", "x":8, "y":0.25},
+                {"label":"9(", "x":9, "y":0.25},
+                {"label":"0)", "x":10, "y":0.25},
+                {"label":"-_", "x":11, "y":0.25},
+                {"label":"=+", "x":12, "y":0.25},
+                {"label":"Backspace", "x":13, "y":0.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":0},
 
-            {"label":"Esc", "x":0, "y":0.25},
-            {"label":"!", "x":1, "y":0.25},
-            {"label":"@", "x":2, "y":0.25},
-            {"label":"", "x":3, "y":0.25},
-            {"label":"$", "x":4, "y":0.25},
-            {"label":"%", "x":5, "y":0.25},
-            {"label":"^", "x":6, "y":0.25},
-            {"label":"&", "x":7, "y":0.25},
-            {"label":"*", "x":8, "y":0.25},
-            {"label":"(", "x":9, "y":0.25},
-            {"label":")", "x":10, "y":0.25},
-            {"label":"_", "x":11, "y":0.25},
-            {"label":"+", "x":12, "y":0.25},
-            {"label":"Backspace", "x":13, "y":0.25, "w":2},
+                {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1.25},
+                {"label":"W", "x":2.5, "y":1.25},
+                {"label":"E", "x":3.5, "y":1.25},
+                {"label":"R", "x":4.5, "y":1.25},
+                {"label":"T", "x":5.5, "y":1.25},
+                {"label":"Y", "x":6.5, "y":1.25},
+                {"label":"U", "x":7.5, "y":1.25},
+                {"label":"I", "x":8.5, "y":1.25},
+                {"label":"O", "x":9.5, "y":1.25},
+                {"label":"P", "x":10.5, "y":1.25},
+                {"label":"[{", "x":11.5, "y":1.25},
+                {"label":"]}", "x":12.5, "y":1.25},
+                {"label":"\\|", "x":13.5, "y":1.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":1.25},
 
-            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
-            {"label":"Q", "x":1.5, "y":1.25},
-            {"label":"W", "x":2.5, "y":1.25},
-            {"label":"E", "x":3.5, "y":1.25},
-            {"label":"R", "x":4.5, "y":1.25},
-            {"label":"T", "x":5.5, "y":1.25},
-            {"label":"Y", "x":6.5, "y":1.25},
-            {"label":"U", "x":7.5, "y":1.25},
-            {"label":"I", "x":8.5, "y":1.25},
-            {"label":"O", "x":9.5, "y":1.25},
-            {"label":"P", "x":10.5, "y":1.25},
-            {"label":"{", "x":11.5, "y":1.25},
-            {"label":"}", "x":12.5, "y":1.25},
-            {"label":"|", "x":13.5, "y":1.25, "w":1.5},
-            {"label":"Delete", "x":15.25, "y":1.25},
+                {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":2.25},
+                {"label":"S", "x":2.75, "y":2.25},
+                {"label":"D", "x":3.75, "y":2.25},
+                {"label":"F", "x":4.75, "y":2.25},
+                {"label":"G", "x":5.75, "y":2.25},
+                {"label":"H", "x":6.75, "y":2.25},
+                {"label":"J", "x":7.75, "y":2.25},
+                {"label":"K", "x":8.75, "y":2.25},
+                {"label":"L", "x":9.75, "y":2.25},
+                {"label":";:", "x":10.75, "y":2.25},
+                {"label":"'\"", "x":11.75, "y":2.25},
+                {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
+                {"label":"Home", "x":15.25, "y":2.25},
 
-            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
-            {"label":"A", "x":1.75, "y":2.25},
-            {"label":"S", "x":2.75, "y":2.25},
-            {"label":"D", "x":3.75, "y":2.25},
-            {"label":"F", "x":4.75, "y":2.25},
-            {"label":"G", "x":5.75, "y":2.25},
-            {"label":"H", "x":6.75, "y":2.25},
-            {"label":"J", "x":7.75, "y":2.25},
-            {"label":"K", "x":8.75, "y":2.25},
-            {"label":"L", "x":9.75, "y":2.25},
-            {"label":":", "x":10.75, "y":2.25},
-            {"label":"\"", "x":11.75, "y":2.25},
-            {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
-            {"label":"Home", "x":15.25, "y":2.25},
+                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3.25},
+                {"label":"X", "x":3.25, "y":3.25},
+                {"label":"C", "x":4.25, "y":3.25},
+                {"label":"V", "x":5.25, "y":3.25},
+                {"label":"B", "x":6.25, "y":3.25},
+                {"label":"N", "x":7.25, "y":3.25},
+                {"label":"M", "x":8.25, "y":3.25},
+                {"label":",<", "x":9.25, "y":3.25},
+                {"label":".>", "x":10.25, "y":3.25},
+                {"label":"/?", "x":11.25, "y":3.25},
+                {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+                {"label":"Up", "x":14.25, "y":3.5},
 
-            {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-            {"label":"Z", "x":2.25, "y":3.25},
-            {"label":"X", "x":3.25, "y":3.25},
-            {"label":"C", "x":4.25, "y":3.25},
-            {"label":"V", "x":5.25, "y":3.25},
-            {"label":"B", "x":6.25, "y":3.25},
-            {"label":"N", "x":7.25, "y":3.25},
-            {"label":"M", "x":8.25, "y":3.25},
-            {"label":"<", "x":9.25, "y":3.25},
-            {"label":">", "x":10.25, "y":3.25},
-            {"label":"?", "x":11.25, "y":3.25},
-            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
-            {"label":"Up", "x":14.25, "y":3.5},
-
-            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
-            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
-            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
-            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
-            {"label":"Alt", "x":10, "y":4.25},
-            {"label":"Fn1", "x":11, "y":4.25},
-            {"label":"Fn2", "x":12, "y":4.25},
-            {"label":"Left", "x":13.25, "y":4.5},
-            {"label":"Down", "x":14.25, "y":4.5},
-            {"label":"Right", "x":15.25, "y":4.5} ]
+                {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":4.25},
+                {"label":"Fn1", "x":11, "y":4.25},
+                {"label":"Fn2", "x":12, "y":4.25},
+                {"label":"Left", "x":13.25, "y":4.5},
+                {"label":"Down", "x":14.25, "y":4.5},
+                {"label":"Right", "x":15.25, "y":4.5}
+            ]
         }
     }
 }
diff --git a/keyboards/keychron/q2/rev_0111/info.json b/keyboards/keychron/q2/rev_0111/info.json
new file mode 100644
index 0000000000..f6ce1d9b27
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0111/info.json
@@ -0,0 +1,159 @@
+{
+    "keyboard_name": "Keychron Q2",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_ansi_67": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0.25},
+                {"label":"1!", "x":1, "y":0.25},
+                {"label":"2@", "x":2, "y":0.25},
+                {"label":"3#", "x":3, "y":0.25},
+                {"label":"4$", "x":4, "y":0.25},
+                {"label":"5%", "x":5, "y":0.25},
+                {"label":"6^", "x":6, "y":0.25},
+                {"label":"7&", "x":7, "y":0.25},
+                {"label":"8*", "x":8, "y":0.25},
+                {"label":"9(", "x":9, "y":0.25},
+                {"label":"0)", "x":10, "y":0.25},
+                {"label":"-_", "x":11, "y":0.25},
+                {"label":"=+", "x":12, "y":0.25},
+                {"label":"Backspace", "x":13, "y":0.25, "w":2},
+                {"label":"Mute", "x":15.25, "y":0},
+
+                {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1.25},
+                {"label":"W", "x":2.5, "y":1.25},
+                {"label":"E", "x":3.5, "y":1.25},
+                {"label":"R", "x":4.5, "y":1.25},
+                {"label":"T", "x":5.5, "y":1.25},
+                {"label":"Y", "x":6.5, "y":1.25},
+                {"label":"U", "x":7.5, "y":1.25},
+                {"label":"I", "x":8.5, "y":1.25},
+                {"label":"O", "x":9.5, "y":1.25},
+                {"label":"P", "x":10.5, "y":1.25},
+                {"label":"[{", "x":11.5, "y":1.25},
+                {"label":"]}", "x":12.5, "y":1.25},
+                {"label":"\\|", "x":13.5, "y":1.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":1.25},
+
+                {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":2.25},
+                {"label":"S", "x":2.75, "y":2.25},
+                {"label":"D", "x":3.75, "y":2.25},
+                {"label":"F", "x":4.75, "y":2.25},
+                {"label":"G", "x":5.75, "y":2.25},
+                {"label":"H", "x":6.75, "y":2.25},
+                {"label":"J", "x":7.75, "y":2.25},
+                {"label":"K", "x":8.75, "y":2.25},
+                {"label":"L", "x":9.75, "y":2.25},
+                {"label":";:", "x":10.75, "y":2.25},
+                {"label":"'\"", "x":11.75, "y":2.25},
+                {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
+                {"label":"Home", "x":15.25, "y":2.25},
+
+                {"label":"Shift", "x":0, "y":3.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3.25},
+                {"label":"X", "x":3.25, "y":3.25},
+                {"label":"C", "x":4.25, "y":3.25},
+                {"label":"V", "x":5.25, "y":3.25},
+                {"label":"B", "x":6.25, "y":3.25},
+                {"label":"N", "x":7.25, "y":3.25},
+                {"label":"M", "x":8.25, "y":3.25},
+                {"label":",<", "x":9.25, "y":3.25},
+                {"label":".>", "x":10.25, "y":3.25},
+                {"label":"/?", "x":11.25, "y":3.25},
+                {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+                {"label":"Up", "x":14.25, "y":3.5},
+
+                {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":4.25},
+                {"label":"Fn1", "x":11, "y":4.25},
+                {"label":"Fn2", "x":12, "y":4.25},
+                {"label":"Left", "x":13.25, "y":4.5},
+                {"label":"Down", "x":14.25, "y":4.5},
+                {"label":"Right", "x":15.25, "y":4.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0.75},
+                {"label":"1!", "x":1, "y":0.75},
+                {"label":"2@", "x":2, "y":0.75},
+                {"label":"3#", "x":3, "y":0.75},
+                {"label":"4$", "x":4, "y":0.75},
+                {"label":"5%", "x":5, "y":0.75},
+                {"label":"6^", "x":6, "y":0.75},
+                {"label":"7&", "x":7, "y":0.75},
+                {"label":"8*", "x":8, "y":0.75},
+                {"label":"9(", "x":9, "y":0.75},
+                {"label":"0)", "x":10, "y":0.75},
+                {"label":"-_", "x":11, "y":0.75},
+                {"label":"=+", "x":12, "y":0.75},
+                {"label":"Backspace", "x":13, "y":0.75, "w":2},
+                {"label":"CCW", "x":15.15, "y":0, "w":0.6, "h":0.5},
+                {"label":"Mute", "x":15.25, "y":0.5},
+                {"label":"CW", "x":15.75, "y":0, "w":0.6, "h":0.5},
+
+                {"label":"Tab", "x":0, "y":1.75, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1.75},
+                {"label":"W", "x":2.5, "y":1.75},
+                {"label":"E", "x":3.5, "y":1.75},
+                {"label":"R", "x":4.5, "y":1.75},
+                {"label":"T", "x":5.5, "y":1.75},
+                {"label":"Y", "x":6.5, "y":1.75},
+                {"label":"U", "x":7.5, "y":1.75},
+                {"label":"I", "x":8.5, "y":1.75},
+                {"label":"O", "x":9.5, "y":1.75},
+                {"label":"P", "x":10.5, "y":1.75},
+                {"label":"[{", "x":11.5, "y":1.75},
+                {"label":"]}", "x":12.5, "y":1.75},
+                {"label":"\\|", "x":13.5, "y":1.75, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":1.75},
+
+                {"label":"Caps Lock", "x":0, "y":2.75, "w":1.75},
+                {"label":"A", "x":1.75, "y":2.75},
+                {"label":"S", "x":2.75, "y":2.75},
+                {"label":"D", "x":3.75, "y":2.75},
+                {"label":"F", "x":4.75, "y":2.75},
+                {"label":"G", "x":5.75, "y":2.75},
+                {"label":"H", "x":6.75, "y":2.75},
+                {"label":"J", "x":7.75, "y":2.75},
+                {"label":"K", "x":8.75, "y":2.75},
+                {"label":"L", "x":9.75, "y":2.75},
+                {"label":";:", "x":10.75, "y":2.75},
+                {"label":"'\"", "x":11.75, "y":2.75},
+                {"label":"Enter", "x":12.75, "y":2.75, "w":2.25},
+                {"label":"Home", "x":15.25, "y":2.75},
+
+                {"label":"Shift", "x":0, "y":3.75, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3.75},
+                {"label":"X", "x":3.25, "y":3.75},
+                {"label":"C", "x":4.25, "y":3.75},
+                {"label":"V", "x":5.25, "y":3.75},
+                {"label":"B", "x":6.25, "y":3.75},
+                {"label":"N", "x":7.25, "y":3.75},
+                {"label":"M", "x":8.25, "y":3.75},
+                {"label":",<", "x":9.25, "y":3.75},
+                {"label":".>", "x":10.25, "y":3.75},
+                {"label":"/?", "x":11.25, "y":3.75},
+                {"label":"Shift", "x":12.25, "y":3.75, "w":1.75},
+                {"label":"Up", "x":14.25, "y":4},
+
+                {"label":"Ctrl", "x":0, "y":4.75, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4.75, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4.75, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4.75, "w":6.25},
+                {"label":"Alt", "x":10, "y":4.75},
+                {"label":"Fn1", "x":11, "y":4.75},
+                {"label":"Fn2", "x":12, "y":4.75},
+                {"label":"Left", "x":13.25, "y":5},
+                {"label":"Down", "x":14.25, "y":5},
+                {"label":"Right", "x":15.25, "y":5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/default/info.json b/keyboards/keychron/q2/rev_0111/keymaps/default/info.json
deleted file mode 100644
index 590ed6d115..0000000000
--- a/keyboards/keychron/q2/rev_0111/keymaps/default/info.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "keyboard_name": "Keychron Q2",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "layouts": {
-        "LAYOUT_ansi_": {
-            "layout": [
-            {"label":"Mute", "x":15.25, "y":0},
-
-            {"label":"Esc", "x":0, "y":0.25},
-            {"label":"!", "x":1, "y":0.25},
-            {"label":"@", "x":2, "y":0.25},
-            {"label":"", "x":3, "y":0.25},
-            {"label":"$", "x":4, "y":0.25},
-            {"label":"%", "x":5, "y":0.25},
-            {"label":"^", "x":6, "y":0.25},
-            {"label":"&", "x":7, "y":0.25},
-            {"label":"*", "x":8, "y":0.25},
-            {"label":"(", "x":9, "y":0.25},
-            {"label":")", "x":10, "y":0.25},
-            {"label":"_", "x":11, "y":0.25},
-            {"label":"+", "x":12, "y":0.25},
-            {"label":"Backspace", "x":13, "y":0.25, "w":2},
-
-            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
-            {"label":"Q", "x":1.5, "y":1.25},
-            {"label":"W", "x":2.5, "y":1.25},
-            {"label":"E", "x":3.5, "y":1.25},
-            {"label":"R", "x":4.5, "y":1.25},
-            {"label":"T", "x":5.5, "y":1.25},
-            {"label":"Y", "x":6.5, "y":1.25},
-            {"label":"U", "x":7.5, "y":1.25},
-            {"label":"I", "x":8.5, "y":1.25},
-            {"label":"O", "x":9.5, "y":1.25},
-            {"label":"P", "x":10.5, "y":1.25},
-            {"label":"{", "x":11.5, "y":1.25},
-            {"label":"}", "x":12.5, "y":1.25},
-            {"label":"|", "x":13.5, "y":1.25, "w":1.5},
-            {"label":"Delete", "x":15.25, "y":1.25},
-
-            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
-            {"label":"A", "x":1.75, "y":2.25},
-            {"label":"S", "x":2.75, "y":2.25},
-            {"label":"D", "x":3.75, "y":2.25},
-            {"label":"F", "x":4.75, "y":2.25},
-            {"label":"G", "x":5.75, "y":2.25},
-            {"label":"H", "x":6.75, "y":2.25},
-            {"label":"J", "x":7.75, "y":2.25},
-            {"label":"K", "x":8.75, "y":2.25},
-            {"label":"L", "x":9.75, "y":2.25},
-            {"label":":", "x":10.75, "y":2.25},
-            {"label":"\"", "x":11.75, "y":2.25},
-            {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
-            {"label":"Home", "x":15.25, "y":2.25},
-
-            {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-            {"label":"Z", "x":2.25, "y":3.25},
-            {"label":"X", "x":3.25, "y":3.25},
-            {"label":"C", "x":4.25, "y":3.25},
-            {"label":"V", "x":5.25, "y":3.25},
-            {"label":"B", "x":6.25, "y":3.25},
-            {"label":"N", "x":7.25, "y":3.25},
-            {"label":"M", "x":8.25, "y":3.25},
-            {"label":"<", "x":9.25, "y":3.25},
-            {"label":">", "x":10.25, "y":3.25},
-            {"label":"?", "x":11.25, "y":3.25},
-            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
-            {"label":"Up", "x":14.25, "y":3.5},
-
-            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
-            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
-            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
-            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
-            {"label":"Alt", "x":10, "y":4.25},
-            {"label":"Fn1", "x":11, "y":4.25},
-            {"label":"Fn2", "x":12, "y":4.25},
-            {"label":"Left", "x":13.25, "y":4.5},
-            {"label":"Down", "x":14.25, "y":4.5},
-            {"label":"Right", "x":15.25, "y":4.5} ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/via/info.json b/keyboards/keychron/q2/rev_0111/keymaps/via/info.json
deleted file mode 100644
index 0e2ad8463f..0000000000
--- a/keyboards/keychron/q2/rev_0111/keymaps/via/info.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-    "keyboard_name": "Keychron Q2",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "layouts": {
-        "LAYOUT_ansi_": {
-            "layout": [
-            {"label":"Mute", "x":15.25, "y":0, "w":0.75},
-            {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
-            {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
-
-            {"label":"Esc", "x":0, "y":0.25},
-            {"label":"!", "x":1, "y":0.25},
-            {"label":"@", "x":2, "y":0.25},
-            {"label":"", "x":3, "y":0.25},
-            {"label":"$", "x":4, "y":0.25},
-            {"label":"%", "x":5, "y":0.25},
-            {"label":"^", "x":6, "y":0.25},
-            {"label":"&", "x":7, "y":0.25},
-            {"label":"*", "x":8, "y":0.25},
-            {"label":"(", "x":9, "y":0.25},
-            {"label":")", "x":10, "y":0.25},
-            {"label":"_", "x":11, "y":0.25},
-            {"label":"+", "x":12, "y":0.25},
-            {"label":"Backspace", "x":13, "y":0.25, "w":2},
-
-            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
-            {"label":"Q", "x":1.5, "y":1.25},
-            {"label":"W", "x":2.5, "y":1.25},
-            {"label":"E", "x":3.5, "y":1.25},
-            {"label":"R", "x":4.5, "y":1.25},
-            {"label":"T", "x":5.5, "y":1.25},
-            {"label":"Y", "x":6.5, "y":1.25},
-            {"label":"U", "x":7.5, "y":1.25},
-            {"label":"I", "x":8.5, "y":1.25},
-            {"label":"O", "x":9.5, "y":1.25},
-            {"label":"P", "x":10.5, "y":1.25},
-            {"label":"{", "x":11.5, "y":1.25},
-            {"label":"}", "x":12.5, "y":1.25},
-            {"label":"|", "x":13.5, "y":1.25, "w":1.5},
-            {"label":"Delete", "x":15.25, "y":1.25},
-
-            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
-            {"label":"A", "x":1.75, "y":2.25},
-            {"label":"S", "x":2.75, "y":2.25},
-            {"label":"D", "x":3.75, "y":2.25},
-            {"label":"F", "x":4.75, "y":2.25},
-            {"label":"G", "x":5.75, "y":2.25},
-            {"label":"H", "x":6.75, "y":2.25},
-            {"label":"J", "x":7.75, "y":2.25},
-            {"label":"K", "x":8.75, "y":2.25},
-            {"label":"L", "x":9.75, "y":2.25},
-            {"label":":", "x":10.75, "y":2.25},
-            {"label":"\"", "x":11.75, "y":2.25},
-            {"label":"Enter", "x":12.75, "y":2.25, "w":2.25},
-            {"label":"Home", "x":15.25, "y":2.25},
-
-            {"label":"Shift", "x":0, "y":3.25, "w":2.25},
-            {"label":"Z", "x":2.25, "y":3.25},
-            {"label":"X", "x":3.25, "y":3.25},
-            {"label":"C", "x":4.25, "y":3.25},
-            {"label":"V", "x":5.25, "y":3.25},
-            {"label":"B", "x":6.25, "y":3.25},
-            {"label":"N", "x":7.25, "y":3.25},
-            {"label":"M", "x":8.25, "y":3.25},
-            {"label":"<", "x":9.25, "y":3.25},
-            {"label":">", "x":10.25, "y":3.25},
-            {"label":"?", "x":11.25, "y":3.25},
-            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
-            {"label":"Up", "x":14.25, "y":3.5},
-
-            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
-            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
-            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
-            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
-            {"label":"Alt", "x":10, "y":4.25},
-            {"label":"Fn1", "x":11, "y":4.25},
-            {"label":"Fn2", "x":12, "y":4.25},
-            {"label":"Left", "x":13.25, "y":4.5},
-            {"label":"Down", "x":14.25, "y":4.5},
-            {"label":"Right", "x":15.25, "y":4.5} ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
index 15cdbb027e..a22143eb02 100644
--- a/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
+++ b/keyboards/keychron/q2/rev_0111/keymaps/via/keymap.c
@@ -37,39 +37,39 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,            KC_VOLD, KC_MUTE, KC_VOLU,
         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_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_HOME,
         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_LOPT, KC_LCMD,                            KC_SPC,  KC_VOLD, KC_VOLU,          KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
 
     [WIN_BASE] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,            KC_VOLD, KC_MUTE, KC_VOLU,
         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_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_HOME,
         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_VOLD, KC_VOLU,          KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
 
     [_FN1] = LAYOUT_all(
-        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,          KC_TRNS,
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     [_FN2] = LAYOUT_all(
-        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,          KC_TRNS,
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
     [_FN3] = LAYOUT_all(
-        KC_WAVE, 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_TRNS,          KC_TRNS,
+        KC_WAVE, 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_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
 #if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
diff --git a/keyboards/keychron/q2/rev_0111/rev_0111.h b/keyboards/keychron/q2/rev_0111/rev_0111.h
index 0b1cfade1b..5033db61fc 100644
--- a/keyboards/keychron/q2/rev_0111/rev_0111.h
+++ b/keyboards/keychron/q2/rev_0111/rev_0111.h
@@ -21,11 +21,11 @@
 #define XXX KC_NO
 
 #define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,\
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K47, K0E, K48, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1E,\
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2E,\
     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,     \
-    K40, K41, K42,                K46, K47, K48,      K4A, K4B, K4C, K4D, K2C, K4E \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K2C, K4E \
 ) { \
     { K00, K01,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E, }, \
     { K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D, K1E, }, \
diff --git a/keyboards/keychron/q2/rev_0112/info.json b/keyboards/keychron/q2/rev_0112/info.json
index 83a7addfeb..5f0d4ab249 100644
--- a/keyboards/keychron/q2/rev_0112/info.json
+++ b/keyboards/keychron/q2/rev_0112/info.json
@@ -5,79 +5,79 @@
     "layouts": {
         "LAYOUT_iso_68": {
             "layout": [
-            {"label":"Insert", "x":15.25, "y":0},
+                {"label":"Esc", "x":0, "y":0.25},
+                {"label":"1!", "x":1, "y":0.25},
+                {"label":"2\"", "x":2, "y":0.25},
+                {"label":"3\u00a3", "x":3, "y":0.25},
+                {"label":"4$", "x":4, "y":0.25},
+                {"label":"5%", "x":5, "y":0.25},
+                {"label":"6^", "x":6, "y":0.25},
+                {"label":"7&", "x":7, "y":0.25},
+                {"label":"8*", "x":8, "y":0.25},
+                {"label":"9(", "x":9, "y":0.25},
+                {"label":"0)", "x":10, "y":0.25},
+                {"label":"-_", "x":11, "y":0.25},
+                {"label":"=+", "x":12, "y":0.25},
+                {"label":"Backspace", "x":13, "y":0.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":0},
 
-            {"label":"Esc", "x":0, "y":0.25},
-            {"label":"!", "x":1, "y":0.25},
-            {"label":"@", "x":2, "y":0.25},
-            {"label":"", "x":3, "y":0.25},
-            {"label":"$", "x":4, "y":0.25},
-            {"label":"%", "x":5, "y":0.25},
-            {"label":"^", "x":6, "y":0.25},
-            {"label":"&", "x":7, "y":0.25},
-            {"label":"*", "x":8, "y":0.25},
-            {"label":"(", "x":9, "y":0.25},
-            {"label":")", "x":10, "y":0.25},
-            {"label":"_", "x":11, "y":0.25},
-            {"label":"+", "x":12, "y":0.25},
-            {"label":"Backspace", "x":13, "y":0.25, "w":2},
+                {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1.25},
+                {"label":"W", "x":2.5, "y":1.25},
+                {"label":"E", "x":3.5, "y":1.25},
+                {"label":"R", "x":4.5, "y":1.25},
+                {"label":"T", "x":5.5, "y":1.25},
+                {"label":"Y", "x":6.5, "y":1.25},
+                {"label":"U", "x":7.5, "y":1.25},
+                {"label":"I", "x":8.5, "y":1.25},
+                {"label":"O", "x":9.5, "y":1.25},
+                {"label":"P", "x":10.5, "y":1.25},
+                {"label":"[{", "x":11.5, "y":1.25},
+                {"label":"]}", "x":12.5, "y":1.25},
+                {"label":"Delete", "x":15.25, "y":1.25},
 
-            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
-            {"label":"Q", "x":1.5, "y":1.25},
-            {"label":"W", "x":2.5, "y":1.25},
-            {"label":"E", "x":3.5, "y":1.25},
-            {"label":"R", "x":4.5, "y":1.25},
-            {"label":"T", "x":5.5, "y":1.25},
-            {"label":"Y", "x":6.5, "y":1.25},
-            {"label":"U", "x":7.5, "y":1.25},
-            {"label":"I", "x":8.5, "y":1.25},
-            {"label":"O", "x":9.5, "y":1.25},
-            {"label":"P", "x":10.5, "y":1.25},
-            {"label":"{", "x":11.5, "y":1.25},
-            {"label":"}", "x":12.5, "y":1.25},
-            {"label":"Delete", "x":15.25, "y":1.25},
+                {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":2.25},
+                {"label":"S", "x":2.75, "y":2.25},
+                {"label":"D", "x":3.75, "y":2.25},
+                {"label":"F", "x":4.75, "y":2.25},
+                {"label":"G", "x":5.75, "y":2.25},
+                {"label":"H", "x":6.75, "y":2.25},
+                {"label":"J", "x":7.75, "y":2.25},
+                {"label":"K", "x":8.75, "y":2.25},
+                {"label":"L", "x":9.75, "y":2.25},
+                {"label":";:", "x":10.75, "y":2.25},
+                {"label":"'@", "x":11.75, "y":2.25},
+                {"label":"#~", "x":12.75, "y":2.25},
+                {"label":"Enter", "x":13.75, "y":1.25, "w":1.25, "h":2},
+                {"label":"Home", "x":15.25, "y":2.25},
 
-            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
-            {"label":"A", "x":1.75, "y":2.25},
-            {"label":"S", "x":2.75, "y":2.25},
-            {"label":"D", "x":3.75, "y":2.25},
-            {"label":"F", "x":4.75, "y":2.25},
-            {"label":"G", "x":5.75, "y":2.25},
-            {"label":"H", "x":6.75, "y":2.25},
-            {"label":"J", "x":7.75, "y":2.25},
-            {"label":"K", "x":8.75, "y":2.25},
-            {"label":"L", "x":9.75, "y":2.25},
-            {"label":":", "x":10.75, "y":2.25},
-            {"label":"\"", "x":11.75, "y":2.25},
-            {"label":"#~", "x":12.75, "y":2.25},
-            {"label":"Enter", "x":13.75, "y":2.25, "w":1.25}
-            {"label":"Home", "x":15.25, "y":2.25},
+                {"label":"Shift", "x":0, "y":3.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3.25},
+                {"label":"Z", "x":2.25, "y":3.25},
+                {"label":"X", "x":3.25, "y":3.25},
+                {"label":"C", "x":4.25, "y":3.25},
+                {"label":"V", "x":5.25, "y":3.25},
+                {"label":"B", "x":6.25, "y":3.25},
+                {"label":"N", "x":7.25, "y":3.25},
+                {"label":"M", "x":8.25, "y":3.25},
+                {"label":",<", "x":9.25, "y":3.25},
+                {"label":".>", "x":10.25, "y":3.25},
+                {"label":"/?", "x":11.25, "y":3.25},
+                {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+                {"label":"Up", "x":14.25, "y":3.5},
 
-            {"label":"Shift", "x":0, "y":3.25, "w":1.25},
-            {"label":"|", "x":1.25, "y":3.25},
-            {"label":"Z", "x":2.25, "y":3.25},
-            {"label":"X", "x":3.25, "y":3.25},
-            {"label":"C", "x":4.25, "y":3.25},
-            {"label":"V", "x":5.25, "y":3.25},
-            {"label":"B", "x":6.25, "y":3.25},
-            {"label":"N", "x":7.25, "y":3.25},
-            {"label":"M", "x":8.25, "y":3.25},
-            {"label":"<", "x":9.25, "y":3.25},
-            {"label":">", "x":10.25, "y":3.25},
-            {"label":"?", "x":11.25, "y":3.25},
-            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
-            {"label":"Up", "x":14.25, "y":3.5},
-
-            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
-            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
-            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
-            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
-            {"label":"Alt", "x":10, "y":4.25},
-            {"label":"Fn1", "x":11, "y":4.25},
-            {"label":"Fn2", "x":12, "y":4.25},
-            {"label":"Left", "x":13.25, "y":4.5},
-            {"label":"Down", "x":14.25, "y":4.5},
-            {"label":"Right", "x":15.25, "y":4.5} ]
+                {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":4.25},
+                {"label":"Fn1", "x":11, "y":4.25},
+                {"label":"Fn2", "x":12, "y":4.25},
+                {"label":"Left", "x":13.25, "y":4.5},
+                {"label":"Down", "x":14.25, "y":4.5},
+                {"label":"Right", "x":15.25, "y":4.5}
+            ]
         }
     }
 }
diff --git a/keyboards/keychron/q2/rev_0113/info.json b/keyboards/keychron/q2/rev_0113/info.json
new file mode 100644
index 0000000000..151f42455d
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/info.json
@@ -0,0 +1,161 @@
+{
+    "keyboard_name": "Keychron Q2",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_iso_68": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0.25},
+                {"label":"1!", "x":1, "y":0.25},
+                {"label":"2\"", "x":2, "y":0.25},
+                {"label":"3\u00a3", "x":3, "y":0.25},
+                {"label":"4$", "x":4, "y":0.25},
+                {"label":"5%", "x":5, "y":0.25},
+                {"label":"6^", "x":6, "y":0.25},
+                {"label":"7&", "x":7, "y":0.25},
+                {"label":"8*", "x":8, "y":0.25},
+                {"label":"9(", "x":9, "y":0.25},
+                {"label":"0)", "x":10, "y":0.25},
+                {"label":"-_", "x":11, "y":0.25},
+                {"label":"=+", "x":12, "y":0.25},
+                {"label":"Backspace", "x":13, "y":0.25, "w":2},
+                {"label":"Mute", "x":15.25, "y":0},
+
+                {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1.25},
+                {"label":"W", "x":2.5, "y":1.25},
+                {"label":"E", "x":3.5, "y":1.25},
+                {"label":"R", "x":4.5, "y":1.25},
+                {"label":"T", "x":5.5, "y":1.25},
+                {"label":"Y", "x":6.5, "y":1.25},
+                {"label":"U", "x":7.5, "y":1.25},
+                {"label":"I", "x":8.5, "y":1.25},
+                {"label":"O", "x":9.5, "y":1.25},
+                {"label":"P", "x":10.5, "y":1.25},
+                {"label":"[{", "x":11.5, "y":1.25},
+                {"label":"]}", "x":12.5, "y":1.25},
+                {"label":"Delete", "x":15.25, "y":1.25},
+
+                {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":2.25},
+                {"label":"S", "x":2.75, "y":2.25},
+                {"label":"D", "x":3.75, "y":2.25},
+                {"label":"F", "x":4.75, "y":2.25},
+                {"label":"G", "x":5.75, "y":2.25},
+                {"label":"H", "x":6.75, "y":2.25},
+                {"label":"J", "x":7.75, "y":2.25},
+                {"label":"K", "x":8.75, "y":2.25},
+                {"label":"L", "x":9.75, "y":2.25},
+                {"label":";:", "x":10.75, "y":2.25},
+                {"label":"'@", "x":11.75, "y":2.25},
+                {"label":"#~", "x":12.75, "y":2.25},
+                {"label":"Enter", "x":13.75, "y":1.25, "w":1.25, "h":2},
+                {"label":"Home", "x":15.25, "y":2.25},
+
+                {"label":"Shift", "x":0, "y":3.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3.25},
+                {"label":"Z", "x":2.25, "y":3.25},
+                {"label":"X", "x":3.25, "y":3.25},
+                {"label":"C", "x":4.25, "y":3.25},
+                {"label":"V", "x":5.25, "y":3.25},
+                {"label":"B", "x":6.25, "y":3.25},
+                {"label":"N", "x":7.25, "y":3.25},
+                {"label":"M", "x":8.25, "y":3.25},
+                {"label":",<", "x":9.25, "y":3.25},
+                {"label":".>", "x":10.25, "y":3.25},
+                {"label":"/?", "x":11.25, "y":3.25},
+                {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+                {"label":"Up", "x":14.25, "y":3.5},
+
+                {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":4.25},
+                {"label":"Fn1", "x":11, "y":4.25},
+                {"label":"Fn2", "x":12, "y":4.25},
+                {"label":"Left", "x":13.25, "y":4.5},
+                {"label":"Down", "x":14.25, "y":4.5},
+                {"label":"Right", "x":15.25, "y":4.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0.75},
+                {"label":"1!", "x":1, "y":0.75},
+                {"label":"2\"", "x":2, "y":0.75},
+                {"label":"3\u00a3", "x":3, "y":0.75},
+                {"label":"4$", "x":4, "y":0.75},
+                {"label":"5%", "x":5, "y":0.75},
+                {"label":"6^", "x":6, "y":0.75},
+                {"label":"7&", "x":7, "y":0.75},
+                {"label":"8*", "x":8, "y":0.75},
+                {"label":"9(", "x":9, "y":0.75},
+                {"label":"0)", "x":10, "y":0.75},
+                {"label":"-_", "x":11, "y":0.75},
+                {"label":"=+", "x":12, "y":0.75},
+                {"label":"Backspace", "x":13, "y":0.75, "w":2},
+                {"label":"CCW", "x":15.15, "y":0, "w":0.6, "h":0.5},
+                {"label":"Mute", "x":15.25, "y":0.5},
+                {"label":"CW", "x":15.75, "y":0, "w":0.6, "h":0.5},
+
+                {"label":"Tab", "x":0, "y":1.75, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1.75},
+                {"label":"W", "x":2.5, "y":1.75},
+                {"label":"E", "x":3.5, "y":1.75},
+                {"label":"R", "x":4.5, "y":1.75},
+                {"label":"T", "x":5.5, "y":1.75},
+                {"label":"Y", "x":6.5, "y":1.75},
+                {"label":"U", "x":7.5, "y":1.75},
+                {"label":"I", "x":8.5, "y":1.75},
+                {"label":"O", "x":9.5, "y":1.75},
+                {"label":"P", "x":10.5, "y":1.75},
+                {"label":"[{", "x":11.5, "y":1.75},
+                {"label":"]}", "x":12.5, "y":1.75},
+                {"label":"Delete", "x":15.25, "y":1.75},
+
+                {"label":"Caps Lock", "x":0, "y":2.75, "w":1.75},
+                {"label":"A", "x":1.75, "y":2.75},
+                {"label":"S", "x":2.75, "y":2.75},
+                {"label":"D", "x":3.75, "y":2.75},
+                {"label":"F", "x":4.75, "y":2.75},
+                {"label":"G", "x":5.75, "y":2.75},
+                {"label":"H", "x":6.75, "y":2.75},
+                {"label":"J", "x":7.75, "y":2.75},
+                {"label":"K", "x":8.75, "y":2.75},
+                {"label":"L", "x":9.75, "y":2.75},
+                {"label":";:", "x":10.75, "y":2.75},
+                {"label":"'@", "x":11.75, "y":2.75},
+                {"label":"#~", "x":12.75, "y":2.75},
+                {"label":"Enter", "x":13.75, "y":1.75, "w":1.25, "h":2},
+                {"label":"Home", "x":15.25, "y":2.75},
+
+                {"label":"Shift", "x":0, "y":3.75, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":3.75},
+                {"label":"Z", "x":2.25, "y":3.75},
+                {"label":"X", "x":3.25, "y":3.75},
+                {"label":"C", "x":4.25, "y":3.75},
+                {"label":"V", "x":5.25, "y":3.75},
+                {"label":"B", "x":6.25, "y":3.75},
+                {"label":"N", "x":7.25, "y":3.75},
+                {"label":"M", "x":8.25, "y":3.75},
+                {"label":",<", "x":9.25, "y":3.75},
+                {"label":".>", "x":10.25, "y":3.75},
+                {"label":"/?", "x":11.25, "y":3.75},
+                {"label":"Shift", "x":12.25, "y":3.75, "w":1.75},
+                {"label":"Up", "x":14.25, "y":4},
+
+                {"label":"Ctrl", "x":0, "y":4.75, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4.75, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4.75, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4.75, "w":6.25},
+                {"label":"Alt", "x":10, "y":4.75},
+                {"label":"Fn1", "x":11, "y":4.75},
+                {"label":"Fn2", "x":12, "y":4.75},
+                {"label":"Left", "x":13.25, "y":5},
+                {"label":"Down", "x":14.25, "y":5},
+                {"label":"Right", "x":15.25, "y":5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/default/info.json b/keyboards/keychron/q2/rev_0113/keymaps/default/info.json
deleted file mode 100644
index 8448d4c995..0000000000
--- a/keyboards/keychron/q2/rev_0113/keymaps/default/info.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "keyboard_name": "Keychron Q2",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "layouts": {
-        "LAYOUT_iso_68": {
-            "layout": [
-            {"label":"Mute", "x":15.25, "y":0},
-
-            {"label":"Esc", "x":0, "y":0.25},
-            {"label":"!", "x":1, "y":0.25},
-            {"label":"@", "x":2, "y":0.25},
-            {"label":"", "x":3, "y":0.25},
-            {"label":"$", "x":4, "y":0.25},
-            {"label":"%", "x":5, "y":0.25},
-            {"label":"^", "x":6, "y":0.25},
-            {"label":"&", "x":7, "y":0.25},
-            {"label":"*", "x":8, "y":0.25},
-            {"label":"(", "x":9, "y":0.25},
-            {"label":")", "x":10, "y":0.25},
-            {"label":"_", "x":11, "y":0.25},
-            {"label":"+", "x":12, "y":0.25},
-            {"label":"Backspace", "x":13, "y":0.25, "w":2},
-
-            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
-            {"label":"Q", "x":1.5, "y":1.25},
-            {"label":"W", "x":2.5, "y":1.25},
-            {"label":"E", "x":3.5, "y":1.25},
-            {"label":"R", "x":4.5, "y":1.25},
-            {"label":"T", "x":5.5, "y":1.25},
-            {"label":"Y", "x":6.5, "y":1.25},
-            {"label":"U", "x":7.5, "y":1.25},
-            {"label":"I", "x":8.5, "y":1.25},
-            {"label":"O", "x":9.5, "y":1.25},
-            {"label":"P", "x":10.5, "y":1.25},
-            {"label":"{", "x":11.5, "y":1.25},
-            {"label":"}", "x":12.5, "y":1.25},
-            {"label":"Delete", "x":15.25, "y":1.25},
-
-            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
-            {"label":"A", "x":1.75, "y":2.25},
-            {"label":"S", "x":2.75, "y":2.25},
-            {"label":"D", "x":3.75, "y":2.25},
-            {"label":"F", "x":4.75, "y":2.25},
-            {"label":"G", "x":5.75, "y":2.25},
-            {"label":"H", "x":6.75, "y":2.25},
-            {"label":"J", "x":7.75, "y":2.25},
-            {"label":"K", "x":8.75, "y":2.25},
-            {"label":"L", "x":9.75, "y":2.25},
-            {"label":":", "x":10.75, "y":2.25},
-            {"label":"\"", "x":11.75, "y":2.25},
-            {"label":"#~", "x":12.75, "y":2.25},
-            {"label":"Enter", "x":13.75, "y":2.25, "w":1.25},
-            {"label":"Home", "x":15.25, "y":2.25},
-
-            {"label":"Shift", "x":0, "y":3.25, "w":1.25},
-            {"label":"|", "x":1.25, "y":3.25},
-            {"label":"Z", "x":2.25, "y":3.25},
-            {"label":"X", "x":3.25, "y":3.25},
-            {"label":"C", "x":4.25, "y":3.25},
-            {"label":"V", "x":5.25, "y":3.25},
-            {"label":"B", "x":6.25, "y":3.25},
-            {"label":"N", "x":7.25, "y":3.25},
-            {"label":"M", "x":8.25, "y":3.25},
-            {"label":"<", "x":9.25, "y":3.25},
-            {"label":">", "x":10.25, "y":3.25},
-            {"label":"?", "x":11.25, "y":3.25},
-            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
-            {"label":"Up", "x":14.25, "y":3.5},
-
-            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
-            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
-            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
-            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
-            {"label":"Alt", "x":10, "y":4.25},
-            {"label":"Fn1", "x":11, "y":4.25},
-            {"label":"Fn2", "x":12, "y":4.25},
-            {"label":"Left", "x":13.25, "y":4.5},
-            {"label":"Down", "x":14.25, "y":4.5},
-            {"label":"Right", "x":15.25, "y":4.5} ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/info.json b/keyboards/keychron/q2/rev_0113/keymaps/via/info.json
deleted file mode 100644
index 6111f83d23..0000000000
--- a/keyboards/keychron/q2/rev_0113/keymaps/via/info.json
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-    "keyboard_name": "Keychron Q2",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "layouts": {
-        "LAYOUT_iso_68": {
-            "layout": [
-            {"label":"Mute", "x":15.25, "y":0, "w":0.75},
-            {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
-            {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
-
-            {"label":"Esc", "x":0, "y":0.25},
-            {"label":"!", "x":1, "y":0.25},
-            {"label":"@", "x":2, "y":0.25},
-            {"label":"", "x":3, "y":0.25},
-            {"label":"$", "x":4, "y":0.25},
-            {"label":"%", "x":5, "y":0.25},
-            {"label":"^", "x":6, "y":0.25},
-            {"label":"&", "x":7, "y":0.25},
-            {"label":"*", "x":8, "y":0.25},
-            {"label":"(", "x":9, "y":0.25},
-            {"label":")", "x":10, "y":0.25},
-            {"label":"_", "x":11, "y":0.25},
-            {"label":"+", "x":12, "y":0.25},
-            {"label":"Backspace", "x":13, "y":0.25, "w":2},
-
-            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
-            {"label":"Q", "x":1.5, "y":1.25},
-            {"label":"W", "x":2.5, "y":1.25},
-            {"label":"E", "x":3.5, "y":1.25},
-            {"label":"R", "x":4.5, "y":1.25},
-            {"label":"T", "x":5.5, "y":1.25},
-            {"label":"Y", "x":6.5, "y":1.25},
-            {"label":"U", "x":7.5, "y":1.25},
-            {"label":"I", "x":8.5, "y":1.25},
-            {"label":"O", "x":9.5, "y":1.25},
-            {"label":"P", "x":10.5, "y":1.25},
-            {"label":"{", "x":11.5, "y":1.25},
-            {"label":"}", "x":12.5, "y":1.25},
-            {"label":"Delete", "x":15.25, "y":1.25},
-
-            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
-            {"label":"A", "x":1.75, "y":2.25},
-            {"label":"S", "x":2.75, "y":2.25},
-            {"label":"D", "x":3.75, "y":2.25},
-            {"label":"F", "x":4.75, "y":2.25},
-            {"label":"G", "x":5.75, "y":2.25},
-            {"label":"H", "x":6.75, "y":2.25},
-            {"label":"J", "x":7.75, "y":2.25},
-            {"label":"K", "x":8.75, "y":2.25},
-            {"label":"L", "x":9.75, "y":2.25},
-            {"label":":", "x":10.75, "y":2.25},
-            {"label":"\"", "x":11.75, "y":2.25},
-            {"label":"#~", "x":12.75, "y":2.25},
-            {"label":"Enter", "x":13.75, "y":2.25, "w":1.25},
-            {"label":"Home", "x":15.25, "y":2.25},
-
-            {"label":"Shift", "x":0, "y":3.25, "w":1.25},
-            {"label":"|", "x":1.25, "y":3.25},
-            {"label":"Z", "x":2.25, "y":3.25},
-            {"label":"X", "x":3.25, "y":3.25},
-            {"label":"C", "x":4.25, "y":3.25},
-            {"label":"V", "x":5.25, "y":3.25},
-            {"label":"B", "x":6.25, "y":3.25},
-            {"label":"N", "x":7.25, "y":3.25},
-            {"label":"M", "x":8.25, "y":3.25},
-            {"label":"<", "x":9.25, "y":3.25},
-            {"label":">", "x":10.25, "y":3.25},
-            {"label":"?", "x":11.25, "y":3.25},
-            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
-            {"label":"Up", "x":14.25, "y":3.5},
-
-            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
-            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
-            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
-            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
-            {"label":"Alt", "x":10, "y":4.25},
-            {"label":"Fn1", "x":11, "y":4.25},
-            {"label":"Fn2", "x":12, "y":4.25},
-            {"label":"Left", "x":13.25, "y":4.5},
-            {"label":"Down", "x":14.25, "y":4.5},
-            {"label":"Right", "x":15.25, "y":4.5} ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
index 9c7ad72be7..4e3b431bdf 100644
--- a/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
+++ b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
@@ -37,39 +37,39 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,            KC_VOLD, KC_MUTE, KC_VOLU,
         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_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
-        KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,  KC_VOLD, KC_VOLU,          KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
 
     [WIN_BASE] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,            KC_VOLD, KC_MUTE, KC_VOLU,
         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_DEL,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_NUHS,  KC_ENT,           KC_HOME,
         KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,            KC_RSFT, KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,  KC_VOLD, KC_VOLU,          KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
 
     [_FN1] = LAYOUT_all(
-        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
         KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
 
     [_FN2] = LAYOUT_all(
-        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
         KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
 
     [_FN3] = LAYOUT_all(
-        KC_WAVE, 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_TRNS,          KC_TRNS,
+        KC_WAVE, 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_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
         KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS)
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS)
 };
 
 #if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
diff --git a/keyboards/keychron/q2/rev_0113/rev_0113.h b/keyboards/keychron/q2/rev_0113/rev_0113.h
index 21d20463e9..3b0b2d3377 100644
--- a/keyboards/keychron/q2/rev_0113/rev_0113.h
+++ b/keyboards/keychron/q2/rev_0113/rev_0113.h
@@ -21,11 +21,11 @@
 #define XXX KC_NO
 
 #define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E,\
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K47, K0E, K48,\
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1E,\
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D,      K2E,\
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,     \
-    K40, K41, K42,                K46, K47, K48,      K4A, K4B, K4C, K4D, K2C, K4E \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K2C, K4E \
 ) { \
     { K00, K01,  K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B,  K0C, K0D, K0E, }, \
     { K10, K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B,  K1C, K1D, K1E, }, \

From de3fdef2caabf625413eb8617b6556e2c06f1f87 Mon Sep 17 00:00:00 2001
From: Damien Guard <damien@envytech.co.uk>
Date: Thu, 27 Jan 2022 14:48:45 +0000
Subject: [PATCH 392/867] Mehkee96 LED state & count + transposed keys fixes
 (#16061)

* Fix transposed keys at top right of board.

* Correct LED on state

* Correct number of LEDs

* Default LED state is fine
---
 keyboards/mehkee96/config.h   | 3 +--
 keyboards/mehkee96/mehkee96.h | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/keyboards/mehkee96/config.h b/keyboards/mehkee96/config.h
index 44ded13a57..98e359f980 100644
--- a/keyboards/mehkee96/config.h
+++ b/keyboards/mehkee96/config.h
@@ -18,11 +18,10 @@
 
 #define LED_NUM_LOCK_PIN D0
 #define LED_CAPS_LOCK_PIN D1
-#define LED_PIN_ON_STATE 0
 
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
-#define RGBLED_NUM 16
+#define RGBLED_NUM 18
 #define RGBLIGHT_ANIMATIONS
 /* key combination for command */
diff --git a/keyboards/mehkee96/mehkee96.h b/keyboards/mehkee96/mehkee96.h
index a92e7ffe0f..32d4fa72a1 100644
--- a/keyboards/mehkee96/mehkee96.h
+++ b/keyboards/mehkee96/mehkee96.h
@@ -5,7 +5,7 @@
 #define XXX KC_NO
 
 #define LAYOUT( \
-    k50, k52, k53, k54, k55, k60, k6A, k7A, k70, k5B, k5C, k5D, k5E, k1D, k2E, k0D, k76, k78, k79, \
+    k50, k52, k53, k54, k55, k60, k6A, k7A, k70, k5B, k5C, k5D, k5E, k1D, k2E, k0D, k76, k79, k78, \
     k40, k41, k42, k43, k44, k45, k61, k6B, k7B, k71, k4A, k4B, k4C, k4E,      k46, k47, k48, k49, \
     k30, k31, k32, k33, k34, k35, k62, k6C, k7C, k72, k3A, k3B, k3C, k3D,      k36, k37, k38, k39, \
     k20, k21, k22, k23, k24, k25, k63, k6D, k7D, k73, k2A, k2B, k2D,           k26, k27, k28, k29, \

From f6d3bede9aa1c298919a415118d7a0200517e1da Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Thu, 27 Jan 2022 06:50:04 -0800
Subject: [PATCH 393/867] [Keyboard] Fix compilation issues for creatkeebs
 thera (#16071)

---
 keyboards/creatkeebs/thera/thera.h | 59 +++++++++++++++---------------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/keyboards/creatkeebs/thera/thera.h b/keyboards/creatkeebs/thera/thera.h
index 35f93ea002..8603c3605b 100644
--- a/keyboards/creatkeebs/thera/thera.h
+++ b/keyboards/creatkeebs/thera/thera.h
@@ -1,36 +1,37 @@
 /* Copyright 2022 Tim (https://github.com/Timliuzhaolu)
-  * 
-  * 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/>. 
-  */ 
+  *
+  * 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( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
-	K400,       K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, \
-	K500, K501, K502,                   K506,             K509, K510, K511, K512, K513, K514  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  ____ }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  ____,  K313,  K314 }, \
-	{ K400,  ____,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  ____ }, \
-	{ K500,  K501,  K502,  ____,  ____,  ____,  K506,  ____,  ____,  K509,  K510,  K511,  K512,  K513,  K514 }  \
-}
+#define ____ KC_NO
 
+#define LAYOUT( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
+    K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \
+    K500, K501, K502,                   K506,             K509, K510, K511, K512, K513, K514  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  ____ }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
+    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  ____,  K313,  K314 }, \
+    { K400,  ____,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  ____ }, \
+    { K500,  K501,  K502,  ____,  ____,  ____,  K506,  ____,  ____,  K509,  K510,  K511,  K512,  K513,  K514 }  \
+}

From b31f814e8cdd139ea2493d4cf4012c336048b891 Mon Sep 17 00:00:00 2001
From: KraXen72 <DPELECH1@GMAil.com>
Date: Thu, 27 Jan 2022 16:36:43 +0100
Subject: [PATCH 394/867] Fixes for slovak language-specific keycodes (#16019)

---
 quantum/keymap_extras/keymap_slovak.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/quantum/keymap_extras/keymap_slovak.h b/quantum/keymap_extras/keymap_slovak.h
index 0e1ed1fda1..bf0b7275ce 100644
--- a/quantum/keymap_extras/keymap_slovak.h
+++ b/quantum/keymap_extras/keymap_slovak.h
@@ -141,9 +141,8 @@
  */
 // Row 1
 #define SK_TILD ALGR(SK_PLUS) // ~
-#define SK_CIRC ALGR(SK_LCAR) // ^ (dead)
-#define SK_BREV ALGR(SK_SCAR) // ˘ (dead)
-#define SK_RNGA ALGR(SK_CCAR) // ° (dead)
+#define SK_CIRC ALGR(SK_SCAR) // ^ (dead)
+#define SK_BREV ALGR(SK_CCAR) // ˘ (dead)
 #define SK_OGON ALGR(SK_TCAR) // ˛ (dead)
 #define SK_GRV  ALGR(SK_ZCAR) // `
 #define SK_DOTA ALGR(SK_YACU) // ˙ (dead)

From f39e65493ec6a512def0f9cfe329b8fb70ea2f5b Mon Sep 17 00:00:00 2001
From: p4yne <p4yne@users.noreply.github.com>
Date: Thu, 27 Jan 2022 16:41:47 +0100
Subject: [PATCH 395/867] [Keyboard] fixed led_config: missing key,
 missing/wrong flags (#16048)

* fixed ledmap: missing key, missing/wrong flags

* Update keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>

* corrected c&p error user name in GPL header

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
---
 .../kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c  | 56 ++++++++++---------
 keyboards/kprepublic/bm65hsrgb_iso/config.h   |  9 ++-
 2 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c b/keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c
index 134c271824..3d7f586d76 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c
+++ b/keyboards/kprepublic/bm65hsrgb_iso/bm65hsrgb_iso.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 ipetepete, 2021 deadolus
+/* Copyright 2020 ipetepete, 2021 deadolus, 2022 p4yne
  *
  * 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
@@ -17,37 +17,41 @@
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
-  { 0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,     12,     13 ,    14},
+  // Key Matrix to LED Index
+  { 0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,     12,     13,     14},
   { 15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     28,     29},
   { 30,     NO_LED, 31,     32,     33,     34,     35,     36,     37,     38,     39,     40,     41,     42,     43},
   { 44,     45,     46,     47,     48,     49,     50,     51,     52,     53,     54,     55,     56,     57,     58},
   { 59,     60,     NO_LED, NO_LED, NO_LED, 61,     NO_LED, NO_LED, 62,     63, NO_LED,     64,     65,     66,     67}
+
 }, {
-    // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace
-    {   0,   0 }, {  15,   0 }, {  30,   0 }, {  45,   0 }, {  60,   0 }, {  75,   0 }, {  90,   0 }, { 105,   0 }, { 120,   0 }, { 135,   0 }, { 150,   0 }, { 165,   0 }, { 180,   0 }, { 202,   0 },{ 224,   0 },
-    // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ],  ,
-    {   7,  16 }, {  22,  16 }, {  37,  16 }, {  52,  16 }, {  67,  16 }, {  82,  16 }, {  97,  16 }, { 112,  16 }, { 127,  16 }, { 142,  16 }, { 157,  16 }, { 172,  16 }, { 187,  16 }, { 206,  16 },{ 224,   16},
-    // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter
-    {  11,  32 }, {  26,  32 }, {  41,  32 }, {  56,  32 }, {  71,  32 }, {  86,  32 }, { 101,  32 }, { 116,  32 }, { 131,  32 }, { 146,  32 }, { 161,  32 }, { 176,  32 }, { 198,  32 }, { 224,   32 },
-    // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up,
-    {  18,  48 }, {  30,  48 }, {  45,  48 }, {  60,  48 }, {  75,  48 }, {  90,  48 }, { 105,  48 }, { 120,  48 }, { 135,  48 }, { 150,  48 }, { 165,  48 }, { 195,  48 }, { 209,   48 }, { 224,   48 },
-    // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
-    {   3,  64 }, {  22,  64 }, {  33,  64 }, { 101,  64 }, { 135,  64 }, { 153,  64 }, { 194,  64 }, { 209,  64 },{ 224,  64 },
-    // UNDERGLOW
-    {   216, 32 }, {  180,  32 }, {  144, 32 }, { 108,  32 }, { 72,  32 }, { 36,  32 }
+  // LED Index to Physical Position
+  // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace, Delete
+  {   0,   0 }, {  15,   0 }, {  30,   0 }, {  45,   0 }, {  60,   0 }, {  75,   0 }, {  90,   0 }, { 105,   0 }, { 120,   0 }, { 135,   0 }, { 150,   0 }, { 165,   0 }, { 180,   0 }, { 202,   0 }, { 224,   0 },
+  // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ], Enter, Pos1
+  {   7,  16 }, {  22,  16 }, {  37,  16 }, {  52,  16 }, {  67,  16 }, {  82,  16 }, {  97,  16 }, { 112,  16 }, { 127,  16 }, { 142,  16 }, { 157,  16 }, { 172,  16 }, { 187,  16 }, { 206,  16 }, { 224,  16 },
+  // Capslock, A, S, D, F, G, H, J, K, L, ;, ',  , PageUp
+  {  11,  32 }, {  26,  32 }, {  41,  32 }, {  56,  32 }, {  71,  32 }, {  86,  32 }, { 101,  32 }, { 116,  32 }, { 131,  32 }, { 146,  32 }, { 161,  32 }, { 176,  32 }, { 198,  32 }, { 224,  32 },
+  // LShift, <,  Z, X, C, V, B, N, M, ,, ., /, Shift, Up, PageDown
+  {   3,  48 }, {  18,  48 }, {  33,  48 }, {  48,  48 }, {  63,  48 }, {  78,  48 }, {  93,  48 }, { 108,  48 }, { 123,  48 }, { 138,  48 }, { 153,  48 }, { 168,  48 }, { 190,  48 }, { 209,  48 }, { 224,  48 },
+  // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
+  {   3,  64 }, {  22,  64 }, {  33,  64 }, { 101,  64 }, { 135,  64 }, { 153,  64 }, { 194,  64 }, { 209,  64 },{ 224,  64 },
+  // UNDERGLOW
+  {   216, 32 }, {  180,  32 }, {  144, 32 }, { 108,  32 }, { 72,  32 }, { 36,  32 }
 }, {
-    // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ],  ,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
-    1, 1, 1, 4, 1, 1, 1, 1, 1,
-    // UNDERGLOW
-    2, 2, 2, 2, 2, 2
+  // LED Index to Flag
+  // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace, Delete
+  1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+  // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ], Enter, Pos1
+  1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+  // Capslock, A, S, D, F, G, H, J, K, L, ;, ',  , PageUp
+  1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+  // LShift, <, Z, X, C, V, B, N, M, ,, ., /, RShift, Up, PageDown
+  1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
+  // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right
+  1, 1, 1, 4, 1, 1, 1, 1, 1,
+  // UNDERGLOW
+  2, 2, 2, 2, 2, 2
 } };
 
 __attribute__ ((weak))
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/config.h b/keyboards/kprepublic/bm65hsrgb_iso/config.h
index 30b27dc26e..aafb43bb51 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/config.h
+++ b/keyboards/kprepublic/bm65hsrgb_iso/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 ipetepete, 2021 deadolus
+Copyright 2020 ipetepete, 2021 deadolus, 2022 p4yne
 
 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
@@ -29,6 +29,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
+
+/* Force NKRO */
 #define FORCE_NKRO
 
 /*
@@ -105,8 +107,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
 #    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_BAND_SAT
-#    define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-                           /*== all animations enable ==*/
+/* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#    define RGBLIGHT_SLEEP 
+/*== all animations enable ==*/
 #    define RGBLIGHT_EFFECT_BREATHING
 #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL

From d55337ba4dae45f327b0dd6a9317cd9739f36520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= <alvaro.volpato@usp.br>
Date: Thu, 27 Jan 2022 12:50:42 -0300
Subject: [PATCH 396/867] Add support for Mode SeventyFive (#16030)

* Initial M75H support

* Remove BSLS key

* Add M75S initial support

* Define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR to allow VIA

* Add layer 1 for M75H

* Add layer 1 for M75H

* Fix layouts

* Add BOOTLOADER and remove BOOTLOADER address from rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/mode/m75h/chconf.h                 | 30 ++++++++
 keyboards/mode/m75h/config.h                 | 75 ++++++++++++++++++++
 keyboards/mode/m75h/halconf.h                | 26 +++++++
 keyboards/mode/m75h/keymaps/default/keymap.c | 53 ++++++++++++++
 keyboards/mode/m75h/keymaps/via/keymap.c     | 53 ++++++++++++++
 keyboards/mode/m75h/keymaps/via/rules.mk     |  1 +
 keyboards/mode/m75h/m75h.c                   | 23 ++++++
 keyboards/mode/m75h/m75h.h                   | 39 ++++++++++
 keyboards/mode/m75h/mcuconf.h                | 40 +++++++++++
 keyboards/mode/m75h/readme.md                | 19 +++++
 keyboards/mode/m75h/rules.mk                 | 23 ++++++
 keyboards/mode/m75s/chconf.h                 | 30 ++++++++
 keyboards/mode/m75s/config.h                 | 75 ++++++++++++++++++++
 keyboards/mode/m75s/halconf.h                | 26 +++++++
 keyboards/mode/m75s/keymaps/default/keymap.c | 53 ++++++++++++++
 keyboards/mode/m75s/keymaps/via/keymap.c     | 53 ++++++++++++++
 keyboards/mode/m75s/keymaps/via/rules.mk     |  1 +
 keyboards/mode/m75s/m75s.c                   | 23 ++++++
 keyboards/mode/m75s/m75s.h                   | 39 ++++++++++
 keyboards/mode/m75s/mcuconf.h                | 40 +++++++++++
 keyboards/mode/m75s/readme.md                | 19 +++++
 keyboards/mode/m75s/rules.mk                 | 23 ++++++
 22 files changed, 764 insertions(+)
 create mode 100644 keyboards/mode/m75h/chconf.h
 create mode 100644 keyboards/mode/m75h/config.h
 create mode 100644 keyboards/mode/m75h/halconf.h
 create mode 100755 keyboards/mode/m75h/keymaps/default/keymap.c
 create mode 100755 keyboards/mode/m75h/keymaps/via/keymap.c
 create mode 100644 keyboards/mode/m75h/keymaps/via/rules.mk
 create mode 100644 keyboards/mode/m75h/m75h.c
 create mode 100644 keyboards/mode/m75h/m75h.h
 create mode 100644 keyboards/mode/m75h/mcuconf.h
 create mode 100644 keyboards/mode/m75h/readme.md
 create mode 100644 keyboards/mode/m75h/rules.mk
 create mode 100644 keyboards/mode/m75s/chconf.h
 create mode 100644 keyboards/mode/m75s/config.h
 create mode 100644 keyboards/mode/m75s/halconf.h
 create mode 100755 keyboards/mode/m75s/keymaps/default/keymap.c
 create mode 100755 keyboards/mode/m75s/keymaps/via/keymap.c
 create mode 100644 keyboards/mode/m75s/keymaps/via/rules.mk
 create mode 100644 keyboards/mode/m75s/m75s.c
 create mode 100644 keyboards/mode/m75s/m75s.h
 create mode 100644 keyboards/mode/m75s/mcuconf.h
 create mode 100644 keyboards/mode/m75s/readme.md
 create mode 100644 keyboards/mode/m75s/rules.mk

diff --git a/keyboards/mode/m75h/chconf.h b/keyboards/mode/m75h/chconf.h
new file mode 100644
index 0000000000..dedd4d5e28
--- /dev/null
+++ b/keyboards/mode/m75h/chconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/acheron/austin/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_OPTIMIZE_SPEED FALSE
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
diff --git a/keyboards/mode/m75h/config.h b/keyboards/mode/m75h/config.h
new file mode 100644
index 0000000000..980ebc5b66
--- /dev/null
+++ b/keyboards/mode/m75h/config.h
@@ -0,0 +1,75 @@
+/*
+ Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x00DE
+#define PRODUCT_ID      0x7572 // For 75H
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Mode
+#define PRODUCT         Mode 75H
+
+/* key matrix size */
+#define MATRIX_ROWS 7
+#define MATRIX_COLS 16
+                        //C0, C1, C2,  C3,  C4,  C5,  C6,  C7, C8,  C9, C10, C11, C12, C13, C14, C15
+#define MATRIX_COL_PINS { C8, C7, A10, B13, B12, B10, B1, C10, C11, D2, C12, B3,  B4,  B5,  B8,  B9 }
+                        //R0, R1, R2,  R3,  R4,  R5 , R6
+#define MATRIX_ROW_PINS { C5, B0, B14, B15, A8 , C9 , A15} 
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* 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 EEPROM_I2C_24LC256
+//#define I2C1_CLOCK_SPEED 400000
+//#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
+
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
+#define STM32_HSECLK 8000000
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+#define TAP_CODE_DELAY 50
+
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 16383 // Overriding to use more EEPROM
diff --git a/keyboards/mode/m75h/halconf.h b/keyboards/mode/m75h/halconf.h
new file mode 100644
index 0000000000..6c53f594c7
--- /dev/null
+++ b/keyboards/mode/m75h/halconf.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/acheron/austin/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/mode/m75h/keymaps/default/keymap.c b/keyboards/mode/m75h/keymaps/default/keymap.c
new file mode 100755
index 0000000000..1c90f89fb7
--- /dev/null
+++ b/keyboards/mode/m75h/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_all(
+        KC_ESC  , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6,  KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12,           KC_DEL , 
+        KC_TILD , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6,   KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,          KC_HOME,
+        KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y,   KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_PGDN,
+        KC_LSFT ,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B,   KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
+        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT 
+	),
+    [1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_MUTE,
+        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_VOLU,
+        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_VOLD, 
+        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_MPLY, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        ),
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+        ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+        )
+};
diff --git a/keyboards/mode/m75h/keymaps/via/keymap.c b/keyboards/mode/m75h/keymaps/via/keymap.c
new file mode 100755
index 0000000000..1c90f89fb7
--- /dev/null
+++ b/keyboards/mode/m75h/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_all(
+        KC_ESC  , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6,  KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12,           KC_DEL , 
+        KC_TILD , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6,   KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,          KC_HOME,
+        KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y,   KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_PGDN,
+        KC_LSFT ,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B,   KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
+        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT 
+	),
+    [1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_MUTE,
+        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_VOLU,
+        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_VOLD, 
+        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_MPLY, 
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        ),
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+        ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+        )
+};
diff --git a/keyboards/mode/m75h/keymaps/via/rules.mk b/keyboards/mode/m75h/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mode/m75h/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mode/m75h/m75h.c b/keyboards/mode/m75h/m75h.c
new file mode 100644
index 0000000000..3306a6538b
--- /dev/null
+++ b/keyboards/mode/m75h/m75h.c
@@ -0,0 +1,23 @@
+/*
+ Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 "m75h.h"
+
+void board_init(void) {
+    setPinInput(B9);
+    setPinInput(B10);
+}
diff --git a/keyboards/mode/m75h/m75h.h b/keyboards/mode/m75h/m75h.h
new file mode 100644
index 0000000000..a7c48853d8
--- /dev/null
+++ b/keyboards/mode/m75h/m75h.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 ___ KC_NO
+
+#define LAYOUT_all( \
+	K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
+	K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C,      K4E, K4F, \
+	K50, K51, K52,                K66,                K6A, K6B,      K6D, K6E, K6F  \
+) { \
+	{ K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F }, \
+	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, ___, K3E, K3F }, \
+	{ K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C, ___, K4E, K4F }, \
+	{ K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+        { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, K6A, K6B, ___, K6D, K6E, K6F }  \
+}
diff --git a/keyboards/mode/m75h/mcuconf.h b/keyboards/mode/m75h/mcuconf.h
new file mode 100644
index 0000000000..97f2ee51ee
--- /dev/null
+++ b/keyboards/mode/m75h/mcuconf.h
@@ -0,0 +1,40 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/acheron/austin/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+#undef STM32_PLLM_VALUE
+#undef STM32_PLLN_VALUE
+#undef STM32_PLLP_VALUE
+#undef STM32_PLLQ_VALUE
+#undef STM32_PPRE1
+#undef STM32_PPRE2
+
+#define STM32_PLLM_VALUE                    4
+#define STM32_PLLN_VALUE                    168
+#define STM32_PLLP_VALUE                    4
+#define STM32_PLLQ_VALUE                    7
+#define STM32_PPRE1                         STM32_PPRE1_DIV2
+#define STM32_PPRE2                         STM32_PPRE2_DIV1
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/mode/m75h/readme.md b/keyboards/mode/m75h/readme.md
new file mode 100644
index 0000000000..a663847278
--- /dev/null
+++ b/keyboards/mode/m75h/readme.md
@@ -0,0 +1,19 @@
+# Mode SixtyFive M65S
+
+![MODE75](https://raw.githubusercontent.com/Gondolindrim/file_hosting/main/mode_sixtyfive/Group_95_1024x1024.jpg)
+
+The M65S is the solderable PCB for the Mode SixtyFive keyboard, a sixty-five-percent high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/).
+
+-   Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim)
+-   Hardware Supported: proprietary PCB using STM32F401 controller
+-   Hardware Availability: you can get a Mode SeventyFive via when preorders open in 2022 [Mode Designs](https://shop.modedesigns.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mode/m65s:default
+
+Flashing example for this keyboard:
+
+    make mode/m65s:default:flash
+
+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).
diff --git a/keyboards/mode/m75h/rules.mk b/keyboards/mode/m75h/rules.mk
new file mode 100644
index 0000000000..f7659378cc
--- /dev/null
+++ b/keyboards/mode/m75h/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes      # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+EEPROM_DRIVER = i2c
+LTO_ENABLE = yes
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE
diff --git a/keyboards/mode/m75s/chconf.h b/keyboards/mode/m75s/chconf.h
new file mode 100644
index 0000000000..dedd4d5e28
--- /dev/null
+++ b/keyboards/mode/m75s/chconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/acheron/austin/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_OPTIMIZE_SPEED FALSE
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h
new file mode 100644
index 0000000000..8ac31b069e
--- /dev/null
+++ b/keyboards/mode/m75s/config.h
@@ -0,0 +1,75 @@
+/*
+ Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x00DE
+#define PRODUCT_ID      0x7583 // For 75S
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Mode
+#define PRODUCT         Mode 75S
+
+/* key matrix size */
+#define MATRIX_ROWS 7
+#define MATRIX_COLS 16
+                        //C0, C1, C2,  C3,  C4,  C5,  C6,  C7, C8,  C9, C10, C11, C12, C13, C14, C15
+#define MATRIX_COL_PINS { C8, A8, A10, B13, B12, B10, B1, C10, C11, D2, C12, B3,  B4,  B5,  B8,  B9 }
+                        //R0, R1, R2,  R3,  R4,  R5 , R6
+#define MATRIX_ROW_PINS { C5, B0, B14, B15, C7 , C9 , A15} 
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* 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 EEPROM_I2C_24LC128
+//#define I2C1_CLOCK_SPEED 400000
+//#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
+
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
+#define STM32_HSECLK 8000000
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+#define TAP_CODE_DELAY 50
+
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 16383 // Overriding to use more EEPROM
diff --git a/keyboards/mode/m75s/halconf.h b/keyboards/mode/m75s/halconf.h
new file mode 100644
index 0000000000..6c53f594c7
--- /dev/null
+++ b/keyboards/mode/m75s/halconf.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/acheron/austin/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/mode/m75s/keymaps/default/keymap.c b/keyboards/mode/m75s/keymaps/default/keymap.c
new file mode 100755
index 0000000000..dcea4af059
--- /dev/null
+++ b/keyboards/mode/m75s/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_all(
+        KC_ESC  , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6,  KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12,            KC_DEL , 
+        KC_TILD , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6,   KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,  KC_HOME,
+        KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y,   KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,           KC_PGUP,
+        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_NUBS, KC_ENT ,           KC_PGDN,
+        KC_LSFT , KC_NUHS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B,   KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  ,  KC_END ,
+        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN,  KC_RGHT 
+	),
+   [1] = LAYOUT_all(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
+        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_VOLU,
+        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_VOLD,
+        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_MPLY,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        ),
+   [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        ),
+   [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        )
+};
diff --git a/keyboards/mode/m75s/keymaps/via/keymap.c b/keyboards/mode/m75s/keymaps/via/keymap.c
new file mode 100755
index 0000000000..dcea4af059
--- /dev/null
+++ b/keyboards/mode/m75s/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT_all(
+        KC_ESC  , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6,  KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12,            KC_DEL , 
+        KC_TILD , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6,   KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,  KC_HOME,
+        KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y,   KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,           KC_PGUP,
+        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_NUBS, KC_ENT ,           KC_PGDN,
+        KC_LSFT , KC_NUHS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B,   KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  ,  KC_END ,
+        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN,  KC_RGHT 
+	),
+   [1] = LAYOUT_all(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
+        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_VOLU,
+        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_VOLD,
+        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_MPLY,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        ),
+   [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        ),
+   [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        )
+};
diff --git a/keyboards/mode/m75s/keymaps/via/rules.mk b/keyboards/mode/m75s/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mode/m75s/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mode/m75s/m75s.c b/keyboards/mode/m75s/m75s.c
new file mode 100644
index 0000000000..e0424a6a64
--- /dev/null
+++ b/keyboards/mode/m75s/m75s.c
@@ -0,0 +1,23 @@
+/*
+ Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 "m75s.h"
+
+void board_init(void) {
+    setPinInput(B9);
+    setPinInput(B10);
+}
diff --git a/keyboards/mode/m75s/m75s.h b/keyboards/mode/m75s/m75s.h
new file mode 100644
index 0000000000..11a08d0dce
--- /dev/null
+++ b/keyboards/mode/m75s/m75s.h
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+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 ___ KC_NO
+
+#define LAYOUT_all( \
+	K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C,      K4E, K4F, \
+	K50, K51, K52,                K66,                K6A, K6B,      K6D, K6E, K6F  \
+) { \
+	{ K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F }, \
+	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
+	{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C, ___, K4E, K4F }, \
+	{ K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+        { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, K6A, K6B, ___, K6D, K6E, K6F }  \
+}
diff --git a/keyboards/mode/m75s/mcuconf.h b/keyboards/mode/m75s/mcuconf.h
new file mode 100644
index 0000000000..97f2ee51ee
--- /dev/null
+++ b/keyboards/mode/m75s/mcuconf.h
@@ -0,0 +1,40 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/acheron/austin/mcuconf.h -r platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+#undef STM32_PLLM_VALUE
+#undef STM32_PLLN_VALUE
+#undef STM32_PLLP_VALUE
+#undef STM32_PLLQ_VALUE
+#undef STM32_PPRE1
+#undef STM32_PPRE2
+
+#define STM32_PLLM_VALUE                    4
+#define STM32_PLLN_VALUE                    168
+#define STM32_PLLP_VALUE                    4
+#define STM32_PLLQ_VALUE                    7
+#define STM32_PPRE1                         STM32_PPRE1_DIV2
+#define STM32_PPRE2                         STM32_PPRE2_DIV1
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/mode/m75s/readme.md b/keyboards/mode/m75s/readme.md
new file mode 100644
index 0000000000..a663847278
--- /dev/null
+++ b/keyboards/mode/m75s/readme.md
@@ -0,0 +1,19 @@
+# Mode SixtyFive M65S
+
+![MODE75](https://raw.githubusercontent.com/Gondolindrim/file_hosting/main/mode_sixtyfive/Group_95_1024x1024.jpg)
+
+The M65S is the solderable PCB for the Mode SixtyFive keyboard, a sixty-five-percent high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/).
+
+-   Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim)
+-   Hardware Supported: proprietary PCB using STM32F401 controller
+-   Hardware Availability: you can get a Mode SeventyFive via when preorders open in 2022 [Mode Designs](https://shop.modedesigns.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mode/m65s:default
+
+Flashing example for this keyboard:
+
+    make mode/m65s:default:flash
+
+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).
diff --git a/keyboards/mode/m75s/rules.mk b/keyboards/mode/m75s/rules.mk
new file mode 100644
index 0000000000..f7659378cc
--- /dev/null
+++ b/keyboards/mode/m75s/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes      # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+EEPROM_DRIVER = i2c
+LTO_ENABLE = yes
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -DDEBUG_EEPROM_OUTPUT=TRUE

From 0f0e90971b6da2b1a125acc1620c3d33d0f1864c Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 27 Jan 2022 23:56:20 +0800
Subject: [PATCH 397/867] [Docs] OLED documentation edits (#15977)

* Clarify OLED_TIMEOUT

* Add a section on logo file location
---
 docs/feature_oled_driver.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/feature_oled_driver.md b/docs/feature_oled_driver.md
index 0c926f6742..0d04f007f8 100644
--- a/docs/feature_oled_driver.md
+++ b/docs/feature_oled_driver.md
@@ -84,6 +84,8 @@ static void render_logo(void) {
 }
 ```
 
+?> The default font file is located at `drivers/oled/glcdfont.c` and its location can be overwritten with the `OLED_FONT_H` configuration option. Font file content can be edited with external tools such as [Helix Font Editor](https://helixfonteditor.netlify.app/) and [Logo Editor](https://joric.github.io/qle/).
+
 ## Buffer Read Example
 For some purposes, you may need to read the current state of the OLED display
 buffer. The `oled_read_raw` function can be used to safely read bytes from the
@@ -162,7 +164,7 @@ These configuration options should be placed in `config.h`. Example:
 |`OLED_FONT_END`            |`223`            |The ending character index for custom fonts                                                                               |
 |`OLED_FONT_WIDTH`          |`6`              |The font width                                                                                                            |
 |`OLED_FONT_HEIGHT`         |`8`              |The font height (untested)                                                                                                |
-|`OLED_TIMEOUT`             |`60000`          |Turns off the OLED screen after 60000ms of keyboard inactivity. Helps reduce OLED Burn-in. Set to 0 to disable.           |
+|`OLED_TIMEOUT`             |`60000`          |Turns off the OLED screen after 60000ms of screen update inactivity. Helps reduce OLED Burn-in. Set to 0 to disable.      |
 |`OLED_FADE_OUT`            |*Not defined*    |Enables fade out animation. Use together with `OLED_TIMEOUT`.                                                             |
 |`OLED_FADE_OUT_INTERVAL`   |`0`              |The speed of fade out animation, from 0 to 15. Larger values are slower.                                                  |
 |`OLED_SCROLL_TIMEOUT`      |`0`              |Scrolls the OLED screen after 0ms of OLED inactivity. Helps reduce OLED Burn-in. Set to 0 to disable.                     |

From db56db2f798a83a7736fc7681c1fb58070dd7511 Mon Sep 17 00:00:00 2001
From: wyethGR <48162735+wyethGR@users.noreply.github.com>
Date: Fri, 28 Jan 2022 15:33:26 -0800
Subject: [PATCH 398/867] [Keymap] Added personal 36 key layout for
 40percentclub's nori (#15980)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../nori/keymaps/wings_36key/config.h         |  27 ++++
 .../nori/keymaps/wings_36key/keymap.c         | 118 ++++++++++++++++++
 .../nori/keymaps/wings_36key/readme.md        |   3 +
 .../nori/keymaps/wings_36key/rules.mk         |   1 +
 4 files changed, 149 insertions(+)
 create mode 100644 keyboards/40percentclub/nori/keymaps/wings_36key/config.h
 create mode 100644 keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
 create mode 100644 keyboards/40percentclub/nori/keymaps/wings_36key/readme.md
 create mode 100644 keyboards/40percentclub/nori/keymaps/wings_36key/rules.mk

diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
new file mode 100644
index 0000000000..eacfacc5a7
--- /dev/null
+++ b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
@@ -0,0 +1,27 @@
+/* Copyright 2018
+ *
+ * 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 IGNORE_MOD_TAP_INTERRUPT  // MT key must be held longer than tapping term for
+                                  // modifer to be registered
+#define RETRO_TAPPING_PER_KEY
+#define TAPPING_TERM_PER_KEY
+
+#define COMBO_COUNT 2             // number of combos used
+#define COMBO_TERM 40             // time out for combos in ms
+#define TAPPING_TERM 200          // time out for tap-hold in ms
+
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c b/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
new file mode 100644
index 0000000000..7d9d516590
--- /dev/null
+++ b/keyboards/40percentclub/nori/keymaps/wings_36key/keymap.c
@@ -0,0 +1,118 @@
+#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.
+enum custom_layers {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+#define LOWER  MO(_LOWER)
+#define RAISE  MO(_RAISE)
+
+#define _ESC MT(MOD_LGUI, KC_ESC) // escape on tap, gui on hold
+#define _SFT MT(MOD_LSFT, KC_ENT) // enter on tap, shift on hold
+#define _SPC MT(MOD_LCTL, KC_SPC) // space on tap, ctrl on hold
+
+const uint16_t PROGMEM df_tab[] = {KC_D, KC_F, COMBO_END};
+const uint16_t PROGMEM jk_alt[] = {KC_J, KC_K, COMBO_END};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * .-----------------------------------------------------------------------------------.
+ * |   Q  |   W  |   E  |   R  |   T  |      |      |   Y  |   U  |   I  |   O  |   P  |
+ * +------+------+------+------+-------------+------+------+------+------+------+------+
+ * |   A  |   S  |   D  |   F  |   G  |      |      |   H  |   J  |   K  |   L  | :  ; |
+ * +------+------+------+------+------|------+------+------+------+------+------+------+
+ * |   Z  |   X  |   C  |   V  |   B  |      |      |   N  |   M  | <  , | >  . | ?  / |
+ * +------+------+------+------+------+------+------+------+------+------+------+------+
+ * |      |      | Esc  |Enter |Raise |      |      |Lower |Space |Delete|      |      |
+ * .-----------------------------------------------------------------------------------.
+ * esc   on tap, gui   on hold
+ * enter on tap, shift on hold
+ * space on tap, ctl   on hold
+ */
+[_QWERTY] = LAYOUT_ortho_4x12(
+  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   XXXXXXX, XXXXXXX, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   XXXXXXX, XXXXXXX, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
+  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   XXXXXXX, XXXXXXX, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+  XXXXXXX, XXXXXXX, _ESC,    _SFT,    RAISE,  XXXXXXX, XXXXXXX, LOWER,   _SPC,    KC_BSPC, XXXXXXX, XXXXXXX
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   !  |   @  |   #  |   $  |      |      |   %  |   ^  |   &  |   *  |  \   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |   ~  |   |  |   [  |   ]  |   {  |      |      |   }  |   (  |   )  |   "  |  '   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |Shift |   +  |   =  |   -  |  _   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |RAISE |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_ortho_4x12(
+  KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  XXXXXXX, XXXXXXX, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_BSLS,
+  KC_TILD, KC_PIPE, KC_LBRC, KC_RBRC, KC_LCBR, XXXXXXX, XXXXXXX, KC_RCBR, KC_LPRN, KC_RPRN, KC_DQUO, KC_QUOT,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LSFT, KC_PLUS, KC_EQL,  KC_MINS, KC_UNDS,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RAISE,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   1  |   2  |   3  |   4  |   5  |      |      |   6  |   7  |   8  |   9  |   0  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |   F1 |   F2 |   F3 |   F4 |   F5 |      |      |      |  GUI |  SFT |  CTL |  ALT |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |   F6 |   F7 |   F8 |   F9 |  F10 |      |      |  F11 |  F12 |      |      |  Esc |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |Lower |Space |Delete|      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_ortho_4x12(
+  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    XXXXXXX, XXXXXXX, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   XXXXXXX, XXXXXXX, XXXXXXX, KC_LGUI, KC_LSFT, KC_LCTL, KC_LALT,
+  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  XXXXXXX, XXXXXXX, KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, KC_ESC,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, LOWER,   _SPC,    KC_BSPC, XXXXXXX, XXXXXXX
+),
+
+/* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * |PntSrn|      |      | PgUp |BrtUp |      |      | Mute |VolDw |VolUp |Ply/Ps|RESET |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      | PgDw |BrtDw |      |      | Left | Down |  Up  |Right |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      | Prev | Next |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] =  LAYOUT_ortho_4x12(
+  KC_PSCR, XXXXXXX, XXXXXXX, KC_PGUP, KC_BRIU, XXXXXXX, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, RESET,
+  XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, KC_BRID, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MPRV, KC_MNXT, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+)
+};
+
+combo_t key_combos[COMBO_COUNT] = {
+  COMBO(df_tab, KC_TAB),
+  COMBO(jk_alt, KC_LALT),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}        
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case _SFT:
+      return TAPPING_TERM - 100;
+    default:
+      return TAPPING_TERM;
+  }
+}
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/readme.md b/keyboards/40percentclub/nori/keymaps/wings_36key/readme.md
new file mode 100644
index 0000000000..16eb6d9e11
--- /dev/null
+++ b/keyboards/40percentclub/nori/keymaps/wings_36key/readme.md
@@ -0,0 +1,3 @@
+# 36 Key QWERTY Layout
+
+Offers more hand seperation with a 2 key gap down the middle of the board.
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/rules.mk b/keyboards/40percentclub/nori/keymaps/wings_36key/rules.mk
new file mode 100644
index 0000000000..446213032e
--- /dev/null
+++ b/keyboards/40percentclub/nori/keymaps/wings_36key/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes 					# Custom chords

From bd8e257f842e40f01041706a217be2cf85ae7f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= <alvaro.volpato@usp.br>
Date: Fri, 28 Jan 2022 21:19:11 -0300
Subject: [PATCH 399/867] [Keyboard] Adds Elongate Revision Delta PCB support
 (#15498)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/acheron/elongate/beta/beta.c        | 17 ++++
 keyboards/acheron/elongate/beta/beta.h        | 44 ++++++++++
 .../acheron/elongate/{ => beta}/config.h      |  4 +
 .../acheron/elongate/{ => beta}/info.json     |  0
 .../{ => beta}/keymaps/default/keymap.c       |  0
 .../{ => beta}/keymaps/default/readme.md      |  0
 .../elongate/{ => beta}/keymaps/via/config.h  |  0
 .../elongate/{ => beta}/keymaps/via/keymap.c  |  0
 .../elongate/{ => beta}/keymaps/via/rules.mk  |  0
 keyboards/acheron/elongate/beta/readme.md     | 43 ++++++++++
 .../acheron/elongate/{ => beta}/rules.mk      |  0
 keyboards/acheron/elongate/delta/chconf.h     | 25 ++++++
 keyboards/acheron/elongate/delta/config.h     | 81 +++++++++++++++++++
 keyboards/acheron/elongate/delta/delta.c      | 78 ++++++++++++++++++
 keyboards/acheron/elongate/delta/delta.h      | 34 ++++++++
 keyboards/acheron/elongate/delta/halconf.h    | 23 ++++++
 .../elongate/delta/keymaps/default/keymap.c   | 44 ++++++++++
 .../elongate/delta/keymaps/via/keymap.c       | 44 ++++++++++
 .../elongate/delta/keymaps/via/rules.mk       |  1 +
 keyboards/acheron/elongate/delta/mcuconf.h    | 25 ++++++
 keyboards/acheron/elongate/delta/readme.md    | 43 ++++++++++
 keyboards/acheron/elongate/delta/rules.mk     | 20 +++++
 keyboards/acheron/elongate/elongate.c         | 14 +---
 keyboards/acheron/elongate/elongate.h         | 31 ++-----
 keyboards/acheron/elongate/readme.md          | 25 ------
 25 files changed, 533 insertions(+), 63 deletions(-)
 create mode 100644 keyboards/acheron/elongate/beta/beta.c
 create mode 100644 keyboards/acheron/elongate/beta/beta.h
 rename keyboards/acheron/elongate/{ => beta}/config.h (98%)
 rename keyboards/acheron/elongate/{ => beta}/info.json (100%)
 rename keyboards/acheron/elongate/{ => beta}/keymaps/default/keymap.c (100%)
 rename keyboards/acheron/elongate/{ => beta}/keymaps/default/readme.md (100%)
 rename keyboards/acheron/elongate/{ => beta}/keymaps/via/config.h (100%)
 rename keyboards/acheron/elongate/{ => beta}/keymaps/via/keymap.c (100%)
 rename keyboards/acheron/elongate/{ => beta}/keymaps/via/rules.mk (100%)
 create mode 100755 keyboards/acheron/elongate/beta/readme.md
 rename keyboards/acheron/elongate/{ => beta}/rules.mk (100%)
 create mode 100755 keyboards/acheron/elongate/delta/chconf.h
 create mode 100755 keyboards/acheron/elongate/delta/config.h
 create mode 100755 keyboards/acheron/elongate/delta/delta.c
 create mode 100755 keyboards/acheron/elongate/delta/delta.h
 create mode 100755 keyboards/acheron/elongate/delta/halconf.h
 create mode 100755 keyboards/acheron/elongate/delta/keymaps/default/keymap.c
 create mode 100755 keyboards/acheron/elongate/delta/keymaps/via/keymap.c
 create mode 100755 keyboards/acheron/elongate/delta/keymaps/via/rules.mk
 create mode 100755 keyboards/acheron/elongate/delta/mcuconf.h
 create mode 100755 keyboards/acheron/elongate/delta/readme.md
 create mode 100755 keyboards/acheron/elongate/delta/rules.mk
 delete mode 100644 keyboards/acheron/elongate/readme.md

diff --git a/keyboards/acheron/elongate/beta/beta.c b/keyboards/acheron/elongate/beta/beta.c
new file mode 100644
index 0000000000..ffa13d4fe1
--- /dev/null
+++ b/keyboards/acheron/elongate/beta/beta.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Gondolindrim
+ *
+ * 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 "beta.h"
diff --git a/keyboards/acheron/elongate/beta/beta.h b/keyboards/acheron/elongate/beta/beta.h
new file mode 100644
index 0000000000..6ff32b4f75
--- /dev/null
+++ b/keyboards/acheron/elongate/beta/beta.h
@@ -0,0 +1,44 @@
+/* Copyright 2020 Gondolindrim
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the Keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define KNO KC_NO
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K49, K41, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,      K1B, K1C, K4A, K42, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K4B, K44, \
+    K30, K31, K32,      K34,           K37,      K3A, K3B, K3C, K3D, K4C, K47  \
+)\
+{\
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KNO, K1B, K1C }, \
+    { K20, KNO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
+    { K30, K31, K32, KNO, K34, KNO, KNO, K37, KNO, K3A, K3B, K3C, K3D }, \
+    { KNO, K41, K42, KNO, K44, KNO, KNO, K47, KNO, K49, K4A, K4B, K4C }  \
+}
diff --git a/keyboards/acheron/elongate/config.h b/keyboards/acheron/elongate/beta/config.h
similarity index 98%
rename from keyboards/acheron/elongate/config.h
rename to keyboards/acheron/elongate/beta/config.h
index 434e62cd86..c02cf08979 100644
--- a/keyboards/acheron/elongate/config.h
+++ b/keyboards/acheron/elongate/beta/config.h
@@ -144,3 +144,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
+
+#define LED_NUM_LOCK_PIN D2
+#define LED_CAPS_LOCK_PIN D1
+#define LED_SCROLL_LOCK_PIN D0
diff --git a/keyboards/acheron/elongate/info.json b/keyboards/acheron/elongate/beta/info.json
similarity index 100%
rename from keyboards/acheron/elongate/info.json
rename to keyboards/acheron/elongate/beta/info.json
diff --git a/keyboards/acheron/elongate/keymaps/default/keymap.c b/keyboards/acheron/elongate/beta/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/acheron/elongate/keymaps/default/keymap.c
rename to keyboards/acheron/elongate/beta/keymaps/default/keymap.c
diff --git a/keyboards/acheron/elongate/keymaps/default/readme.md b/keyboards/acheron/elongate/beta/keymaps/default/readme.md
similarity index 100%
rename from keyboards/acheron/elongate/keymaps/default/readme.md
rename to keyboards/acheron/elongate/beta/keymaps/default/readme.md
diff --git a/keyboards/acheron/elongate/keymaps/via/config.h b/keyboards/acheron/elongate/beta/keymaps/via/config.h
similarity index 100%
rename from keyboards/acheron/elongate/keymaps/via/config.h
rename to keyboards/acheron/elongate/beta/keymaps/via/config.h
diff --git a/keyboards/acheron/elongate/keymaps/via/keymap.c b/keyboards/acheron/elongate/beta/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/acheron/elongate/keymaps/via/keymap.c
rename to keyboards/acheron/elongate/beta/keymaps/via/keymap.c
diff --git a/keyboards/acheron/elongate/keymaps/via/rules.mk b/keyboards/acheron/elongate/beta/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/acheron/elongate/keymaps/via/rules.mk
rename to keyboards/acheron/elongate/beta/keymaps/via/rules.mk
diff --git a/keyboards/acheron/elongate/beta/readme.md b/keyboards/acheron/elongate/beta/readme.md
new file mode 100755
index 0000000000..8a8949fdfe
--- /dev/null
+++ b/keyboards/acheron/elongate/beta/readme.md
@@ -0,0 +1,43 @@
+# Acheron Elongate rev. Beta QMK firmware repository
+
+![](https://i.imgur.com/G9LESkUh.jpg)
+
+* Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim)
+* Hardware Supported: [open-source PCB](https://github.com/AcheronProject/Elongate) powered by STM32F072 microcontroller
+* Hardware Availability: the revision beta of Elongate was never publicly sold.
+
+## Introduction
+
+This is the QMK firmware repository for the Elongate PCB revision Beta and pre-revision Beta versions, which was the initial revision PCB for this keyboard; hence it was never sold publicly.
+
+The Elongate PCB is an Open-Hardware-guideline-compliant PCB which files can be found at [this repository](https://github.com/AcheronProject/Elongate). Its designer and maintainer is [Gondolindrim](https://github.com/Gondolindrim).
+
+## How to flash
+
+### Enter bootloader
+
+The DFU state in the bootloader can be accessed in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: press the button on the front of the PCB.
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available.
+
+## Compile firmware
+
+You can build the default layout firwmare for Elongate after setting up your build environment by using:
+
+    make acheron/elongate/beta:default
+
+After entering DFU state in your PCB, you can download the binary file generated through `dfu-util` or a GUI like QMK Toolbox.
+
+To directly flash the PCB after it is put into a DFU state, use
+
+    make acheron/elongate/beta:default:flash
+
+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).
+
+## PCB Documentation
+
+See the [AcheronDocs](https://acheronproject.com/pcbs/elongate/) page for the ElongatePCB full documentation. You can also check the KiCad PCB files at the [Elongate GitHub repository](https://github.com/AcheronProject/Elongate).
+
+Before using the files for personal or commercial use, please read the [Acheron Open-Hardware License V1.4](https://acheronproject.com/AOHL14/) under which the Elongate PCB is published.
diff --git a/keyboards/acheron/elongate/rules.mk b/keyboards/acheron/elongate/beta/rules.mk
similarity index 100%
rename from keyboards/acheron/elongate/rules.mk
rename to keyboards/acheron/elongate/beta/rules.mk
diff --git a/keyboards/acheron/elongate/delta/chconf.h b/keyboards/acheron/elongate/delta/chconf.h
new file mode 100755
index 0000000000..cbbae31079
--- /dev/null
+++ b/keyboards/acheron/elongate/delta/chconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * 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 CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_OPTIMIZE_SPEED FALSE
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h
new file mode 100755
index 0000000000..957a6e39cd
--- /dev/null
+++ b/keyboards/acheron/elongate/delta/config.h
@@ -0,0 +1,81 @@
+/*
+Copyright 2020 Gondolindrim
+
+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 0x4150 //AP for AcheronProject
+#define PRODUCT_ID 0x454D // EL+1 for Elongate revision Delta
+#define DEVICE_VER 0x0002
+#define MANUFACTURER Acheron Project
+#define PRODUCT Elongate
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_COL_PINS { A10, A9, A8, B14, B12, B11, B10, B2, B1, A7, A5, B9, B8, B7, B6 }
+#define MATRIX_ROW_PINS { B3, A15, B0, B4, B5 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_PIN A6
+#define BACKLIGHT_PWM_DRIVER PWMD3
+#define BACKLIGHT_PWM_CHANNEL 1
+#define BACKLIGHT_PAL_MODE 1
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 20
+#define BACKLIGHT_DEFAULT_LEVEL	10
+#define BREATHING_PERIOD 3
+
+#define RGB_DI_PIN B15
+#define RGBLED_NUM 16
+#define RGBLIGHT_LIMIT_VAL 200
+#define RGBLIGHT_SLEEP
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5)
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+// Elongate has six indicator LEDs. These def's are the indicator pin defs. The LEDs are distributed in two clusters: one next to the numpad and another between spacebars; LEDs are numbered top-to-bottom.
+
+#define LED1_PIN A2
+#define LED2_PIN A1
+#define LED3_PIN A0
+#define LED4_PIN A4
+#define LED5_PIN A3
+#define LED6_PIN F1
diff --git a/keyboards/acheron/elongate/delta/delta.c b/keyboards/acheron/elongate/delta/delta.c
new file mode 100755
index 0000000000..520dde4e24
--- /dev/null
+++ b/keyboards/acheron/elongate/delta/delta.c
@@ -0,0 +1,78 @@
+/* Copyright 2021 Gondolindrim
+ *
+ * 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 "delta.h"
+
+#define LED_PIN_ON_STATE 1
+// Inits all indicator LEDs as push-pull outputs
+void led_init_ports(void) {
+    palSetLineMode(LED1_PIN, PAL_MODE_OUTPUT_PUSHPULL);
+    palSetLineMode(LED2_PIN, PAL_MODE_OUTPUT_PUSHPULL);
+    palSetLineMode(LED3_PIN, PAL_MODE_OUTPUT_PUSHPULL);
+    palSetLineMode(LED4_PIN, PAL_MODE_OUTPUT_PUSHPULL);
+    palSetLineMode(LED5_PIN, PAL_MODE_OUTPUT_PUSHPULL);
+    palSetLineMode(LED6_PIN, PAL_MODE_OUTPUT_PUSHPULL);
+}
+
+// This function updates LEDs 1, 2 and 3 according to num, caps and scroll lock states
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(res) {
+        writePin(LED1_PIN, !led_state.num_lock);
+        writePin(LED2_PIN, !led_state.caps_lock);
+        writePin(LED3_PIN, !led_state.scroll_lock);
+    }
+    return res;
+}
+
+// Turns off all bottom LEDs
+void turn_off_bottom_leds(void){
+	writePin(LED4_PIN, 1);
+	writePin(LED5_PIN, 1);
+	writePin(LED6_PIN, 1);
+}
+
+/*
+Here the bottom LEDs get updated. The idea being that LED4 is lit when the default layer is active, LED5 when layer 1 is active and LED6 when layer 2.
+Before updating, however, all bottom LEDs are turned off.
+*/
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    turn_off_bottom_leds();
+    switch (get_highest_layer(state)) {
+// The base layer, or layer zero, will be handled by the default case.
+    case 1:
+	writePin(LED4_PIN, 1);
+	writePin(LED5_PIN, 0);
+	writePin(LED6_PIN, 1);
+        break;
+    case 2:
+	writePin(LED4_PIN, 1);
+	writePin(LED5_PIN, 1);
+	writePin(LED6_PIN, 0);
+        break;
+    default:
+	writePin(LED4_PIN, 0);
+	writePin(LED5_PIN, 1);
+	writePin(LED6_PIN, 1);
+        break;
+    }
+  return state;
+}
+
+// Since the keyboard starts at layer 0, the init function starts LED4 as lit up.
+void keyboard_post_init_kb(void){
+	writePin(LED4_PIN, 0);
+}
diff --git a/keyboards/acheron/elongate/delta/delta.h b/keyboards/acheron/elongate/delta/delta.h
new file mode 100755
index 0000000000..119521215f
--- /dev/null
+++ b/keyboards/acheron/elongate/delta/delta.h
@@ -0,0 +1,34 @@
+/* Copyright 2021 Gondolindrim
+ *
+ * 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 ___ KC_NO
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,      K1B, K1C, K1D, K1E, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K4B, K4C, K4D, K4E, \
+    K30, K31, K32,      K34,           K37,      K39, K3A, K3B, K3C, K3D, K3E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, ___, K1B, K1C, K1D, K1E }, \
+    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___, ___, ___, ___ }, \
+    { K30, K31, K32, ___, K34, ___, ___, K37, ___, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, K4B, K4C, K4D, K4E } \
+}
diff --git a/keyboards/acheron/elongate/delta/halconf.h b/keyboards/acheron/elongate/delta/halconf.h
new file mode 100755
index 0000000000..2a91ab9737
--- /dev/null
+++ b/keyboards/acheron/elongate/delta/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2020 QMK
+ *
+ * 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 HAL_USE_PWM TRUE
+
+#define HAL_USE_SPI TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/acheron/elongate/delta/keymaps/default/keymap.c b/keyboards/acheron/elongate/delta/keymaps/default/keymap.c
new file mode 100755
index 0000000000..a701d9ed9b
--- /dev/null
+++ b/keyboards/acheron/elongate/delta/keymaps/default/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2020 Gondolindrim
+ *
+ * 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
+#define SPC_L2 LT(2, KC_SPACE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = 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,  KC_KP_7,  KC_KP_8, KC_KP_9,
+    KC_TAB , KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENTER, KC_KP_4,  KC_KP_5, KC_KP_6,
+    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, MO(1)  , KC_UP,    KC_KP_1,  KC_KP_2, KC_KP_3,
+    KC_LCTL, KC_LWIN, KC_LALT,          SPC_L2,                    KC_SPC,           KC_RALT, KC_LEFT, KC_DOWN,  KC_RIGHT, KC_KP_0, KC_DOT
+),
+[1] = LAYOUT_all( /* Base */
+    KC_F1,   KC_F2,   KC_F2,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_LBRC, KC_RBRC, KC_MINS,  KC_EQL,  KC_NLCK, KC_SLCK, KC_CAPS,
+    KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_RSFT, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_TRNS,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_SPC,           KC_TRNS, KC_HOME,  KC_PGDN, KC_END , KC_TRNS, KC_TRNS
+),
+[2] = LAYOUT_all( /* Base */                                    
+    RESET  , KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,          RGB_TOG, RGB_MOD,  RGB_RMOD, RGB_M_T, 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_SPC,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+),
+[3] = LAYOUT_all( /* Base */                                    
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,                   KC_SPC,           KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+)
+};
diff --git a/keyboards/acheron/elongate/delta/keymaps/via/keymap.c b/keyboards/acheron/elongate/delta/keymaps/via/keymap.c
new file mode 100755
index 0000000000..a701d9ed9b
--- /dev/null
+++ b/keyboards/acheron/elongate/delta/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2020 Gondolindrim
+ *
+ * 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
+#define SPC_L2 LT(2, KC_SPACE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = 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,  KC_KP_7,  KC_KP_8, KC_KP_9,
+    KC_TAB , KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENTER, KC_KP_4,  KC_KP_5, KC_KP_6,
+    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, MO(1)  , KC_UP,    KC_KP_1,  KC_KP_2, KC_KP_3,
+    KC_LCTL, KC_LWIN, KC_LALT,          SPC_L2,                    KC_SPC,           KC_RALT, KC_LEFT, KC_DOWN,  KC_RIGHT, KC_KP_0, KC_DOT
+),
+[1] = LAYOUT_all( /* Base */
+    KC_F1,   KC_F2,   KC_F2,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_LBRC, KC_RBRC, KC_MINS,  KC_EQL,  KC_NLCK, KC_SLCK, KC_CAPS,
+    KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_RSFT, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SCLN, KC_QUOT, KC_SLSH, KC_TRNS,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_SPC,           KC_TRNS, KC_HOME,  KC_PGDN, KC_END , KC_TRNS, KC_TRNS
+),
+[2] = LAYOUT_all( /* Base */                                    
+    RESET  , KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,          RGB_TOG, RGB_MOD,  RGB_RMOD, RGB_M_T, 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_SPC,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+),
+[3] = LAYOUT_all( /* Base */                                    
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,           KC_TRNS,                   KC_SPC,           KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+)
+};
diff --git a/keyboards/acheron/elongate/delta/keymaps/via/rules.mk b/keyboards/acheron/elongate/delta/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/acheron/elongate/delta/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/acheron/elongate/delta/mcuconf.h b/keyboards/acheron/elongate/delta/mcuconf.h
new file mode 100755
index 0000000000..d712a1e5a7
--- /dev/null
+++ b/keyboards/acheron/elongate/delta/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 QMK
+ *
+ * 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_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SPI_USE_SPI2
+#define STM32_SPI_USE_SPI2 TRUE
diff --git a/keyboards/acheron/elongate/delta/readme.md b/keyboards/acheron/elongate/delta/readme.md
new file mode 100755
index 0000000000..055b02ee04
--- /dev/null
+++ b/keyboards/acheron/elongate/delta/readme.md
@@ -0,0 +1,43 @@
+# Acheron Elongate rev. Delta QMK firmware repository
+
+![](https://i.imgur.com/G9LESkUh.jpg)
+
+* Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim)
+* Hardware Supported: [open-source PCB](https://github.com/AcheronProject/Elongate) powered by STM32F072 microcontroller
+* Hardware Availability: as of december 2021, the group buy for Elongate is already over and extras sales are pending.
+
+## Introduction
+
+This is the QMK firmware repository for the Elongate PCB revision Delta, which was the revision publicly sold at the group buy. Revisions Alpha and Beta were sold in private group buys and never ran publicly.
+
+The Elongate PCB is an Open-Hardware-guideline-compliant PCB which files can be found at [this repository](https://github.com/AcheronProject/Elongate). Its designer and maintainer is [Gondolindrim](https://github.com/Gondolindrim).
+
+## How to flash
+
+### Enter bootloader
+
+The DFU state in the bootloader can be accessed in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: press the button on the front of the PCB, next to caps lock, for at least five seconds
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available (escape key at layer 2 in the default firmware)
+
+## Compile firmware
+
+You can build the default layout firwmare for Elongate after setting up your build environment by using:
+
+    make acheron/elongate/delta:default
+
+After entering DFU state in your PCB, you can download the binary file generated through `dfu-util` or a GUI like QMK Toolbox.
+
+To directly flash the PCB after it is put into a DFU state, use
+
+    make acheron/elongate/delta:default:flash
+
+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).
+
+## PCB Documentation
+
+See the [AcheronDocs](https://acheronproject.com/pcbs/elongate/) page for the ElongatePCB full documentation. You can also check the KiCad PCB files at the [Elongate GitHub repository](https://github.com/AcheronProject/Elongate).
+
+Before using the files for personal or commercial use, please read the [Acheron Open-Hardware License V1.4](https://acheronproject.com/AOHL14/) under which the Elongate PCB is published.
diff --git a/keyboards/acheron/elongate/delta/rules.mk b/keyboards/acheron/elongate/delta/rules.mk
new file mode 100755
index 0000000000..20a0bab85e
--- /dev/null
+++ b/keyboards/acheron/elongate/delta/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/acheron/elongate/elongate.c b/keyboards/acheron/elongate/elongate.c
index 31c4720360..9bf0d893a9 100644
--- a/keyboards/acheron/elongate/elongate.c
+++ b/keyboards/acheron/elongate/elongate.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 Gondolindrim
+/* Copyright 2021 Gondolindrim
  *
  * 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
@@ -9,18 +9,6 @@
  * 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 "elongate.h"
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        writePin(D2, led_state.num_lock);
-        writePin(D1, led_state.caps_lock);
-        writePin(D0, led_state.scroll_lock);
-    }
-    return res;
-}
diff --git a/keyboards/acheron/elongate/elongate.h b/keyboards/acheron/elongate/elongate.h
index 6ff32b4f75..2e58871643 100644
--- a/keyboards/acheron/elongate/elongate.h
+++ b/keyboards/acheron/elongate/elongate.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 Gondolindrim
+/* Copyright 2020-2022 Gondolindrim
  *
  * 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
@@ -18,27 +18,8 @@
 
 #include "quantum.h"
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the Keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-#define KNO KC_NO
-
-#define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K49, K41, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,      K1B, K1C, K4A, K42, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K4B, K44, \
-    K30, K31, K32,      K34,           K37,      K3A, K3B, K3C, K3D, K4C, K47  \
-)\
-{\
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KNO, K1B, K1C }, \
-    { K20, KNO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
-    { K30, K31, K32, KNO, K34, KNO, KNO, K37, KNO, K3A, K3B, K3C, K3D }, \
-    { KNO, K41, K42, KNO, K44, KNO, KNO, K47, KNO, K49, K4A, K4B, K4C }  \
-}
+#if defined(KEYBOARD_acheron_elongate_beta)
+  #include "beta.h"
+#elif defined(KEYBOARD_acheron_elongate_delta)
+  #include "delta.h"
+#endif
diff --git a/keyboards/acheron/elongate/readme.md b/keyboards/acheron/elongate/readme.md
deleted file mode 100644
index 83c0eeada1..0000000000
--- a/keyboards/acheron/elongate/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Acheron Aχξρων 45-S-ATMEGA-MX-TH-WI (codename "Elongate") QMK firmware
-
-<p align="center">
-  <img align="middle" src="https://raw.githubusercontent.com/Gondolindrim/acheronLibrary/master/graphics/acheronLong.png"  width="400"> 
-</p>
-
-## Introduction
-
-This is the QMK firmware repository for the ElongatePCN, compatible with revisions Beta and pre-Beta.
-
-The ElongatePCB is an Open-Hardware guidelines compliant PCB which files can be found at [this link](https://github.com/Gondolindrim/AElongate). Its designer and maintainer is [Gondolindrim](https://github.com/Gondolindrim).
-
-## PCB Documentation
-
-See the [AcheronDocs](https://gondolindrim.github.io/AcheronDocs/elongate/introduction.html) page for the ElongatePCB full documentation. You can also check the KiCad PCB files at the [Elongate GitHub repository](https://github.com/Gondolindrim/Elongate).
-
-Before using the files for personal or commercial use, please read the [Acheron Open-Hardware License V1.2](https://gondolindrim.github.io/AcheronDocs/license/license.html) under which the Austin PCB is published.
-
-## How to compile
-
-After setting up your build environment, you can compile the Austin default keymap by using:
-
-    make acheron/elongate: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).

From dcff1a34c7eabce20bb751313867579941222acf Mon Sep 17 00:00:00 2001
From: Gabriel Harel <gabrielj.harel@gmail.com>
Date: Fri, 28 Jan 2022 19:34:38 -0600
Subject: [PATCH 400/867] Remove missing and trailing commas in info.json
 files. (#16088)

---
 keyboards/bkf/info.json                            | 2 +-
 keyboards/dtisaac/dtisaac01/info.json              | 4 ++--
 keyboards/ez_maker/directpins/teensy_2pp/info.json | 2 +-
 keyboards/ez_maker/directpins/teensy_32/info.json  | 2 +-
 keyboards/ez_maker/directpins/teensy_lc/info.json  | 2 +-
 keyboards/fjlabs/7vhotswap/info.json               | 2 +-
 keyboards/frooastboard/info.json                   | 2 +-
 keyboards/handwired/hillside/0_1/info.json         | 4 ++--
 keyboards/macro3/info.json                         | 2 +-
 keyboards/mini_ten_key_plus/info.json              | 4 ++--
 keyboards/mntre/info.json                          | 2 +-
 keyboards/mokey/ginkgo65hot/info.json              | 2 +-
 keyboards/ogurec/info.json                         | 2 +-
 keyboards/ramonimbao/squishyfrl/info.json          | 2 +-
 keyboards/tgr/jane/v2ce/info.json                  | 2 +-
 keyboards/tkc/portico/info.json                    | 2 +-
 keyboards/work_louder/loop/info.json               | 2 +-
 keyboards/work_louder/nano/info.json               | 2 +-
 keyboards/ymdk/np24/u4rgb6/info.json               | 2 +-
 keyboards/z12/info.json                            | 2 +-
 20 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/keyboards/bkf/info.json b/keyboards/bkf/info.json
index 1ab228c1c2..c7b109d651 100644
--- a/keyboards/bkf/info.json
+++ b/keyboards/bkf/info.json
@@ -9,7 +9,7 @@
 
         "LAYOUT_2x3uC": {
             "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"{", "x":11.5, "y":0}, {"label":"}", "x":12.5, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"S", "x":2.75, "y":1}, {"label":"D", "x":3.75, "y":1}, {"label":"F", "x":4.75, "y":1}, {"label":"G", "x":5.75, "y":1}, {"label":"H", "x":6.75, "y":1}, {"label":"J", "x":7.75, "y":1}, {"label":"K", "x":8.75, "y":1}, {"label":"L", "x":9.75, "y":1}, {"label":":", "x":10.75, "y":1}, {"label":"Control", "x":11.75, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":2.25}, {"label":"Z", "x":2.25, "y":2}, {"label":"X", "x":3.25, "y":2}, {"label":"C", "x":4.25, "y":2}, {"label":"V", "x":5.25, "y":2}, {"label":"B", "x":6.25, "y":2}, {"label":"N", "x":7.25, "y":2}, {"label":"M", "x":8.25, "y":2}, {"label":"<", "x":9.25, "y":2}, {"label":">", "x":10.25, "y":2}, {"label":"?", "x":11.25, "y":2}, {"label":"Shift", "x":12.25, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"label":"", "x":3.75, "y":3, "w":3}, {"label":"", "x":6.75, "y":3, "w":3}, {"label":"Alt", "x":9.75, "y":3, "w":1.25}, {"label":"Win", "x":11, "y":3, "w":1.25}, {"label":"Menu", "x":12.25, "y":3, "w":1.25}]
-        },
+        }
         
     }
 }
diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json
index bf3582d2a2..eac22cda30 100644
--- a/keyboards/dtisaac/dtisaac01/info.json
+++ b/keyboards/dtisaac/dtisaac01/info.json
@@ -88,10 +88,10 @@
 				{"label":"K100", "x":10, "y":5.5, "w":1.25}, 
                 {"label":"K111", "x":11.25, "y":5.5, "w":1.25}, 
                 {"label":"K112", "x":12.5, "y":5.5, "w":1.25}, 
-                {"label":"K113", "x":13.75, "y":5.5, "w":1.25}
+                {"label":"K113", "x":13.75, "y":5.5, "w":1.25},
 				{"label":"K114", "x":15.25, "y":5.5}, 
 				{"label":"K115", "x":16.25, "y":5.5}, 
-				{"label":"K116", "x":17.25, "y":5.5},
+				{"label":"K116", "x":17.25, "y":5.5}
             ]
         }
     }
diff --git a/keyboards/ez_maker/directpins/teensy_2pp/info.json b/keyboards/ez_maker/directpins/teensy_2pp/info.json
index e12544a5ef..578fe1c0db 100644
--- a/keyboards/ez_maker/directpins/teensy_2pp/info.json
+++ b/keyboards/ez_maker/directpins/teensy_2pp/info.json
@@ -31,7 +31,7 @@
             ["C4", "A7", "A3", "F4"],
             ["C5", null, null, "F5"],
             ["C6", null, null, "F6"],
-            ["C7", null, null, "F7"],
+            ["C7", null, null, "F7"]
         ]
     },
     "usb": {
diff --git a/keyboards/ez_maker/directpins/teensy_32/info.json b/keyboards/ez_maker/directpins/teensy_32/info.json
index e0c024ec94..207bc4fd0b 100644
--- a/keyboards/ez_maker/directpins/teensy_32/info.json
+++ b/keyboards/ez_maker/directpins/teensy_32/info.json
@@ -23,7 +23,7 @@
             ["LINE_PIN9",  null,         "LINE_PIN16"],
             ["LINE_PIN10", null,         "LINE_PIN15"],
             ["LINE_PIN11", null,         "LINE_PIN14"],
-            ["LINE_PIN12", "E30",        "LINE_PIN13"],
+            ["LINE_PIN12", "E30",        "LINE_PIN13"]
         ]
     },
     "usb": {
diff --git a/keyboards/ez_maker/directpins/teensy_lc/info.json b/keyboards/ez_maker/directpins/teensy_lc/info.json
index bf93c41fab..8477fd0d83 100644
--- a/keyboards/ez_maker/directpins/teensy_lc/info.json
+++ b/keyboards/ez_maker/directpins/teensy_lc/info.json
@@ -23,7 +23,7 @@
             ["LINE_PIN9",  null,         "LINE_PIN16"],
             ["LINE_PIN10", null,         "LINE_PIN15"],
             ["LINE_PIN11", null,         "LINE_PIN14"],
-            ["LINE_PIN12", "E30",        "LINE_PIN13"],
+            ["LINE_PIN12", "E30",        "LINE_PIN13"]
         ]
     },
     "usb": {
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json
index 87e492bc4c..a4955756e9 100644
--- a/keyboards/fjlabs/7vhotswap/info.json
+++ b/keyboards/fjlabs/7vhotswap/info.json
@@ -18,7 +18,7 @@
                 {"label":"F10", "x":10.75, "y":0},
                 {"label":"F11", "x":11.75, "y":0},
                 {"label":"F12", "x":12.75, "y":0},
-                {"label":"Print Screen", "x":14, "y":0}
+                {"label":"Print Screen", "x":14, "y":0},
 
                 {"label":"~", "x":0, "y":1.25},
                 {"label":"!", "x":1, "y":1.25},
diff --git a/keyboards/frooastboard/info.json b/keyboards/frooastboard/info.json
index ca99cf594a..bb63e10920 100644
--- a/keyboards/frooastboard/info.json
+++ b/keyboards/frooastboard/info.json
@@ -28,7 +28,7 @@
               "y": 1
             }
           ]
-        },
+        }
     },
     "matrix_pins": {
         "rows": ["B0", "B1"],
diff --git a/keyboards/handwired/hillside/0_1/info.json b/keyboards/handwired/hillside/0_1/info.json
index e45e4571f5..4505bf3e35 100644
--- a/keyboards/handwired/hillside/0_1/info.json
+++ b/keyboards/handwired/hillside/0_1/info.json
@@ -1,7 +1,7 @@
 {
     "matrix_pins": {
         "rows": ["D7", "E6", "B4", "B5"],
-        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
+        "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
      },    
     "diode_direction": "COL2ROW",
 
@@ -9,5 +9,5 @@
       "vid": "0xFEED",
       "pid": "0x67C0",
       "device_ver": "0x0001"
-    },
+    }
 }
diff --git a/keyboards/macro3/info.json b/keyboards/macro3/info.json
index b25779cb70..a29313c2b3 100644
--- a/keyboards/macro3/info.json
+++ b/keyboards/macro3/info.json
@@ -13,7 +13,7 @@
                 {"x": 0, "y": 1},
                 {"x": 1, "y": 1},
                 {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
+                {"x": 3, "y": 1}
             ]
         }
     }
diff --git a/keyboards/mini_ten_key_plus/info.json b/keyboards/mini_ten_key_plus/info.json
index c300a0bcff..7dd50afbf3 100644
--- a/keyboards/mini_ten_key_plus/info.json
+++ b/keyboards/mini_ten_key_plus/info.json
@@ -9,7 +9,7 @@
                 {"label":"Backspace", "x":0, "y":1},{"label":"7", "x":1, "y":1}         ,{"label":"8", "x":2, "y":1},{"label":"9", "x":3, "y":1},{"label":"+", "x":4, "y":1},
                 {"label":"(", "x":0, "y":2}        ,{"label":"4", "x":1, "y":2}         ,{"label":"5", "x":2, "y":2},{"label":"6", "x":3, "y":2},{"label":"+", "x":4, "y":2},
                 {"label":")", "x":0, "y":3}        ,{"label":"1", "x":1, "y":3}         ,{"label":"2", "x":2, "y":3},{"label":"3", "x":3, "y":3},{"label":"Enter", "x":4, "y":3},
-                {"label":"y", "x":0, "y":4}        ,{"label":"00", "x":1, "y":4}        ,{"label":"0", "x":2, "y":4},{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":4},
+                {"label":"y", "x":0, "y":4}        ,{"label":"00", "x":1, "y":4}        ,{"label":"0", "x":2, "y":4},{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":4}
             ]
         },
         "LAYOUT_standard_numpad": {
@@ -18,7 +18,7 @@
                 {"label":"Backspace", "x":0, "y":1},{"label":"7", "x":1, "y":1}         ,{"label":"8", "x":2, "y":1},{"label":"9", "x":3, "y":1},
                 {"label":"(", "x":0, "y":2}        ,{"label":"4", "x":1, "y":2}         ,{"label":"5", "x":2, "y":2},{"label":"6", "x":3, "y":2},{"label":"+", "x":4, "y":2, "h":2},
                 {"label":")", "x":0, "y":3}        ,{"label":"1", "x":1, "y":3}         ,{"label":"2", "x":2, "y":3},{"label":"3", "x":3, "y":3},
-                {"label":"y", "x":0, "y":4}        ,{"label":"0", "x":1, "y":4 ,"w":2}  ,{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":3, "h":2},
+                {"label":"y", "x":0, "y":4}        ,{"label":"0", "x":1, "y":4 ,"w":2}  ,{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":3, "h":2}
             ]
         }
     }
diff --git a/keyboards/mntre/info.json b/keyboards/mntre/info.json
index 05e4bd4fd0..cf3ce47394 100644
--- a/keyboards/mntre/info.json
+++ b/keyboards/mntre/info.json
@@ -91,7 +91,7 @@
                 {"label": "PGDOWN",  "x": 10.5, "y": 5},
                 {"label": "LEFT",    "x": 11.5, "y": 5},
                 {"label": "DOWN",    "x": 12.5, "y": 5},
-                {"label": "RIGHT",   "x": 13.5, "y": 5},
+                {"label": "RIGHT",   "x": 13.5, "y": 5}
             ]
         }
     }
diff --git a/keyboards/mokey/ginkgo65hot/info.json b/keyboards/mokey/ginkgo65hot/info.json
index d4e32f436d..e2e96c167c 100644
--- a/keyboards/mokey/ginkgo65hot/info.json
+++ b/keyboards/mokey/ginkgo65hot/info.json
@@ -35,7 +35,7 @@
                 {"label":"k1b", "x":11.5, "y":1},
                 {"label":"k1c", "x":12.5, "y":1},
                 {"label":"k1d", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1e", "x":15, "y":1,},
+                {"label":"k1e", "x":15, "y":1},
                 
                 {"label":"k20", "x":0, "y":2, "w":1.75},
                 {"label":"k21", "x":1.75, "y":2},
diff --git a/keyboards/ogurec/info.json b/keyboards/ogurec/info.json
index bc4e637b32..1cb6823f95 100644
--- a/keyboards/ogurec/info.json
+++ b/keyboards/ogurec/info.json
@@ -80,7 +80,7 @@
                 {"label":"<", "x":9, "y":2}, 
                 {"label":">", "x":10, "y":2}, 
                 {"label":"?", "x":11, "y":2}]
-        },
+        }
 
     }
 }
diff --git a/keyboards/ramonimbao/squishyfrl/info.json b/keyboards/ramonimbao/squishyfrl/info.json
index 03cdda4fd9..15a1cd1f86 100644
--- a/keyboards/ramonimbao/squishyfrl/info.json
+++ b/keyboards/ramonimbao/squishyfrl/info.json
@@ -67,7 +67,7 @@
                 {"x":10.25, "y":3}, 
                 {"x":11.25, "y":3}, 
                 {"x":12.25, "y":3, "w":1.75},
-                {"x":14, "y":3} 
+                {"x":14, "y":3}, 
                 {"x":16.25, "y":3}, 
                 
                 {"x":0, "y":4, "w":1.25}, 
diff --git a/keyboards/tgr/jane/v2ce/info.json b/keyboards/tgr/jane/v2ce/info.json
index 582bfcd30e..97e12227f2 100644
--- a/keyboards/tgr/jane/v2ce/info.json
+++ b/keyboards/tgr/jane/v2ce/info.json
@@ -27,7 +27,7 @@
 
       "LAYOUT_tkl_f13_iso_tsangan": {
         "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":2.75}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
-      }
+      },
 
       "LAYOUT_tkl_f13_iso_tsangan_split_rshift": {
         "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.75, "y":2.5, "w":1.25, "h":2}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.5}, {"x":1.5, "y":5.5}, {"x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"x":11, "y":5.5, "w":1.5}, {"x":12.5, "y":5.5}, {"x":13.5, "y":5.5, "w":1.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
diff --git a/keyboards/tkc/portico/info.json b/keyboards/tkc/portico/info.json
index 4fd61be674..b2ff8054c7 100644
--- a/keyboards/tkc/portico/info.json
+++ b/keyboards/tkc/portico/info.json
@@ -3,7 +3,7 @@
     "url": "",
     "maintainer": "TerryMathews",
     "layout_aliases": {
-        "LAYOUT_all": "LAYOUT_65_ansi_blocker",
+        "LAYOUT_all": "LAYOUT_65_ansi_blocker"
     },
     "layouts": {
         "LAYOUT_65_ansi_blocker": {
diff --git a/keyboards/work_louder/loop/info.json b/keyboards/work_louder/loop/info.json
index 6e5f76c7f4..2190f53512 100644
--- a/keyboards/work_louder/loop/info.json
+++ b/keyboards/work_louder/loop/info.json
@@ -17,7 +17,7 @@
                 {"label": "k08", "x": 8, "y": 1, "w": 0},
                 {"label": "k09", "x": 9, "y": 1, "w": 0},
                 {"label": "k0a", "x": 10, "y": 1, "w": 0},
-                {"label": "k0b", "x": 11, "y": 1, "w": 0},
+                {"label": "k0b", "x": 11, "y": 1, "w": 0}
             ]
         }
     }
diff --git a/keyboards/work_louder/nano/info.json b/keyboards/work_louder/nano/info.json
index 4c21048597..a80ef21d63 100644
--- a/keyboards/work_louder/nano/info.json
+++ b/keyboards/work_louder/nano/info.json
@@ -7,7 +7,7 @@
             "layout": [
                 {"label": "k00", "x": 0, "y": 0},
                 {"label": "k01", "x": 1, "y": 0},
-                {"label": "k02", "x": 2, "y": 0},
+                {"label": "k02", "x": 2, "y": 0}
             ]
         }
     }
diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json
index 1a107c0b98..fe5a940c08 100644
--- a/keyboards/ymdk/np24/u4rgb6/info.json
+++ b/keyboards/ymdk/np24/u4rgb6/info.json
@@ -81,7 +81,7 @@
                 {"x": 2.5, "y": 1},
                 {"x": 3.5, "y": 1},
                 {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1,},
+                {"x": 5.5, "y": 1},
 
                 {"x": 0, "y": 2, "w": 1.5},
                 {"x": 1.5, "y": 2},
diff --git a/keyboards/z12/info.json b/keyboards/z12/info.json
index 3ae8937571..2395401e47 100644
--- a/keyboards/z12/info.json
+++ b/keyboards/z12/info.json
@@ -19,7 +19,7 @@
 
                 {"x": 0.5, "y": 3},
                 {"x": 1.5, "y": 3},
-                {"x": 2.5, "y": 3},
+                {"x": 2.5, "y": 3}
             ]
         }
     }

From b2fcc923cb212bb118a080fc5046ae70d50a8cc5 Mon Sep 17 00:00:00 2001
From: Monksoffunk <monksoffunk@users.noreply.github.com>
Date: Sat, 29 Jan 2022 12:26:42 +0900
Subject: [PATCH 401/867] [Docs] Update Encoder docs about multiple encoders
 (#16036)

---
 docs/feature_encoders.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md
index f301f7068d..37d5a75311 100644
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -132,7 +132,10 @@ The A an B lines of the encoders should be wired directly to the MCU, and the C/
 
 ## Multiple Encoders
 
-Multiple encoders may share pins so long as each encoder has a distinct pair of pins. 
+Multiple encoders may share pins so long as each encoder has a distinct pair of pins when the following conditions are met:
+- using detent encoders
+- pads must be high at the detent stability point which is called 'default position' in QMK
+- no more than two encoders sharing a pin can be turned at the same time 
 
 For example you can support two encoders using only 3 pins like this
 ```

From 1af65a22487927f667e8d193dd893a9c8d9cdf38 Mon Sep 17 00:00:00 2001
From: Christian Sandven <christian.sandven@kindly.ai>
Date: Sat, 29 Jan 2022 04:28:00 +0100
Subject: [PATCH 402/867] [Keyboard] Add keyprez unicorn (#15998)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/keyprez/unicorn/config.h            | 148 ++++++++++++++++++
 keyboards/keyprez/unicorn/info.json           |  10 ++
 .../keyprez/unicorn/keymaps/default/keymap.c  |  31 ++++
 .../keyprez/unicorn/keymaps/default/readme.md |   1 +
 .../keyprez/unicorn/keymaps/jorge/keymap.c    |  33 ++++
 .../keyprez/unicorn/keymaps/jorge/readme.md   |   1 +
 keyboards/keyprez/unicorn/readme.md           |  25 +++
 keyboards/keyprez/unicorn/rules.mk            |  20 +++
 keyboards/keyprez/unicorn/unicorn.c           |  18 +++
 keyboards/keyprez/unicorn/unicorn.h           |  36 +++++
 10 files changed, 323 insertions(+)
 create mode 100644 keyboards/keyprez/unicorn/config.h
 create mode 100644 keyboards/keyprez/unicorn/info.json
 create mode 100644 keyboards/keyprez/unicorn/keymaps/default/keymap.c
 create mode 100644 keyboards/keyprez/unicorn/keymaps/default/readme.md
 create mode 100644 keyboards/keyprez/unicorn/keymaps/jorge/keymap.c
 create mode 100644 keyboards/keyprez/unicorn/keymaps/jorge/readme.md
 create mode 100644 keyboards/keyprez/unicorn/readme.md
 create mode 100644 keyboards/keyprez/unicorn/rules.mk
 create mode 100644 keyboards/keyprez/unicorn/unicorn.c
 create mode 100644 keyboards/keyprez/unicorn/unicorn.h

diff --git a/keyboards/keyprez/unicorn/config.h b/keyboards/keyprez/unicorn/config.h
new file mode 100644
index 0000000000..fcfc6fe926
--- /dev/null
+++ b/keyboards/keyprez/unicorn/config.h
@@ -0,0 +1,148 @@
+// Copyright 2022 Keyprez (https://github.com/keyprez)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x6B7A
+#define PRODUCT_ID   0x7563
+#define DEVICE_VER   0x0001
+#define MANUFACTURER keyprez
+#define PRODUCT      unicorn
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 8
+
+/*
+ * 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 MASTER_RIGHT
+#define MATRIX_ROW_PINS { F4, D3, F6, F7, B1, B3 }
+#define MATRIX_COL_PINS { F5, B2, B5, D7, B4, B6, E6, D4 }
+#define MATRIX_ROW_PINS_RIGHT { F4, B2, F6, F7, B1, B3 }
+#define MATRIX_COL_PINS_RIGHT { F5, D3, B5, D7, B4, B6, E6, C6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
+
+#define ENCODERS_PAD_A { D2 }
+#define ENCODERS_PAD_B { D4 }
+#define ENCODER_RESOLUTIONS { 4 }
+#define ENCODERS_PAD_A_RIGHT { D2 }
+#define ENCODERS_PAD_B_RIGHT { D4 }
+#define ENCODER_RESOLUTIONS_RIGHT {4}
diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/info.json
new file mode 100644
index 0000000000..6fb2ea74eb
--- /dev/null
+++ b/keyboards/keyprez/unicorn/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Unicorn",
+    "url": "",
+    "maintainer": "Keyprez",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"|", "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":8, "y":0}, {"label":"*", "x":9, "y":0}, {"label":"(", "x":10, "y":0}, {"label":")", "x":11, "y":0}, {"label":"_", "x":12, "y":0}, {"label":"+", "x":13, "y":0}, {"label":"Backspace", "x":14, "y":0, "w":2}, {"label":"Home", "x":16, "y":0}, {"label":"Rotary", "x":17, "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":7.5, "y":1}, {"label":"u", "x":8.5, "y":1}, {"label":"i", "x":9.5, "y":1}, {"label":"o", "x":10.5, "y":1}, {"label":"p", "x":11.5, "y":1}, {"label":"\u00e5", "x":12.5, "y":1}, {"label":"^", "x":13.5, "y":1}, {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2}, {"label":"End", "x":16, "y":1}, {"label":"Delete", "x":17, "y":1}, {"label":"Esc", "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":7.75, "y":2}, {"label":"j", "x":8.75, "y":2}, {"label":"k", "x":9.75, "y":2}, {"label":"l", "x":10.75, "y":2}, {"label":"\u00f8", "x":11.75, "y":2}, {"label":"\u00e6", "x":12.75, "y":2}, {"label":"'", "x":13.75, "y":2}, {"label":"PgUp", "x":16, "y":2}, {"label":"Insert", "x":17, "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":8.25, "y":3}, {"label":"m", "x":9.25, "y":3}, {"label":",", "x":10.25, "y":3}, {"label":".", "x":11.25, "y":3}, {"label":"-", "x":12.25, "y":3}, {"label":"Shift", "x":13.25, "y":3, "w":1.75}, {"label":"\u2191", "x":15, "y":3}, {"label":"PgDn", "x":16, "y":3}, {"label":"Copy", "x":17, "y":3}, {"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}, {"label":"space", "x":3.75, "y":4, "w":2.25}, {"label":"space", "x":6, "y":4, "w":1.25}, {"label":"space", "x":8.25, "y":4, "w":2.75}, {"label":"AltGr", "x":11, "y":4}, {"label":"Mod", "x":12, "y":4}, {"label":"Ctrl", "x":13, "y":4}, {"label":"\u2190", "x":14, "y":4}, {"label":"\u2193", "x":15, "y":4}, {"label":"\u2192", "x":16, "y":4}, {"label":"Paste", "x":17, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/keyprez/unicorn/keymaps/default/keymap.c b/keyboards/keyprez/unicorn/keymaps/default/keymap.c
new file mode 100644
index 0000000000..14a22167f4
--- /dev/null
+++ b/keyboards/keyprez/unicorn/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+// Copyright 2022 Keyprez (https://github.com/keyprez)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+#define FN MO(_FN)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        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_HOME, KC_MUTE,
+        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_END, KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGUP, KC_INSERT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_COPY,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,                             KC_SPC,  KC_RALT, FN,      KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PASTE
+    ),
+
+    [_FN] = LAYOUT(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+};
+
diff --git a/keyboards/keyprez/unicorn/keymaps/default/readme.md b/keyboards/keyprez/unicorn/keymaps/default/readme.md
new file mode 100644
index 0000000000..f3e626cc76
--- /dev/null
+++ b/keyboards/keyprez/unicorn/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for unicorn
diff --git a/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c b/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c
new file mode 100644
index 0000000000..f66e5670b0
--- /dev/null
+++ b/keyboards/keyprez/unicorn/keymaps/jorge/keymap.c
@@ -0,0 +1,33 @@
+// Copyright 2022 Keyprez (https://github.com/keyprez)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN,
+    _CMD
+};
+
+#define FN   MO(_FN)
+#define CMD   MO(_CMD)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_GRV, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, KC_MUTE,
+        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_END, KC_DEL,
+        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_NUHS, KC_ENT, KC_PGUP, KC_INSERT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_COPY,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  FN,                             KC_SPC,  KC_RALT, FN,      KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PASTE
+    ),
+
+    [_FN] = LAYOUT(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_BRIU, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC
+    ),
+};
+
diff --git a/keyboards/keyprez/unicorn/keymaps/jorge/readme.md b/keyboards/keyprez/unicorn/keymaps/jorge/readme.md
new file mode 100644
index 0000000000..f3e626cc76
--- /dev/null
+++ b/keyboards/keyprez/unicorn/keymaps/jorge/readme.md
@@ -0,0 +1 @@
+# The default keymap for unicorn
diff --git a/keyboards/keyprez/unicorn/readme.md b/keyboards/keyprez/unicorn/readme.md
new file mode 100644
index 0000000000..2db5de362d
--- /dev/null
+++ b/keyboards/keyprez/unicorn/readme.md
@@ -0,0 +1,25 @@
+# Unicorn
+
+Unicorn is a split 65% keyboard with an extra column on the right side. 
+It has support for optional hot swap sockets and a rotary encoder on the right side.
+
+* Keyboard Maintainer: [Keyprez](https://github.com/keyprez)
+* Hardware Supported: *Pro micro compatible controllers*
+* Hardware Availability: *TBA*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keyprez/unicorn:default
+
+Flashing example for this keyboard:
+
+    make keyprez/unicorns:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the Enter key while holding down the right fn key
diff --git a/keyboards/keyprez/unicorn/rules.mk b/keyboards/keyprez/unicorn/rules.mk
new file mode 100644
index 0000000000..b529cf6456
--- /dev/null
+++ b/keyboards/keyprez/unicorn/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
+ENCODER_ENABLE = yes
diff --git a/keyboards/keyprez/unicorn/unicorn.c b/keyboards/keyprez/unicorn/unicorn.c
new file mode 100644
index 0000000000..0ddd49658b
--- /dev/null
+++ b/keyboards/keyprez/unicorn/unicorn.c
@@ -0,0 +1,18 @@
+// Copyright 2022 Keyprez (https://github.com/keyprez)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "unicorn.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/keyprez/unicorn/unicorn.h b/keyboards/keyprez/unicorn/unicorn.h
new file mode 100644
index 0000000000..5eb036f50a
--- /dev/null
+++ b/keyboards/keyprez/unicorn/unicorn.h
@@ -0,0 +1,36 @@
+// Copyright 2022 Keyprez (https://github.com/keyprez)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+  LA1, LA2, LA3, LA4, LA5, LA6, LA7, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
+  LB1, LB2, LB3, LB4, LB5, LB6,      RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
+  LC1, LC2, LC3, LC4, LC5, LC6,      RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, RC10, \
+  LD1, LD2, LD3, LD4, LD5, LD6, LD7, RD1, RD2, RD3, RD4, RD5, RD6, RD7, RD8, RD9, \
+  LE1, LE2, LE3,      LE5, LE6,      RE1, RE2, RE3, RE4, RE5, RE6, RE7, RE8 \
+  ) \
+  { \
+    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, KC_NO }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, KC_NO, KC_NO }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO, KC_NO }, \
+    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, KC_NO }, \
+    { LE1, LE2, LE3, KC_NO, LE5, LE6, KC_NO, KC_NO }, \
+    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8 }, \
+    { RD1, RD2, RD3, RD4, RD5, RD6, RD7, RD8 }, \
+    { RE1, RE2, RE3, RE4, RE5, RE6, RE7, RE8 }, \
+    { KC_NO, KC_NO, RA9, RB9, RB8, RC10, RC9, RD9 } \
+  }

From 1ca636819f081a6427ab7a0896302b068349a6dd Mon Sep 17 00:00:00 2001
From: yiancar <yiangosyiangou@cytanet.com.cy>
Date: Sat, 29 Jan 2022 06:42:39 +0000
Subject: [PATCH 403/867] [Keyboard] Fix Nasu Indicators (#15878)

Co-authored-by: yiancar <yiancar@gmail.com>
---
 keyboards/nasu/config.h | 1 -
 keyboards/nasu/nasu.c   | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/keyboards/nasu/config.h b/keyboards/nasu/config.h
index e68df3719f..15ed75d5c0 100644
--- a/keyboards/nasu/config.h
+++ b/keyboards/nasu/config.h
@@ -46,7 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_CAPS_LOCK_PIN B1
 #define LED_NUM_LOCK_PIN B0
 #define LED_SCROLL_LOCK_PIN A7
-#define LED_PIN_ON_STATE 0
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
diff --git a/keyboards/nasu/nasu.c b/keyboards/nasu/nasu.c
index b5e41409f3..e7ae6a369e 100644
--- a/keyboards/nasu/nasu.c
+++ b/keyboards/nasu/nasu.c
@@ -14,10 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "nasu.h"
-
-void led_init_ports(void) {
-    // Set our LED pins as open drain outputs
-    palSetLineMode(LED_CAPS_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN);
-    palSetLineMode(LED_NUM_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN);
-    palSetLineMode(LED_SCROLL_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN);
-}

From 13e6517460718dbdddd10661d176480a2388c69d Mon Sep 17 00:00:00 2001
From: IFo Hancroft <contact@ifohancroft.com>
Date: Sat, 29 Jan 2022 08:58:28 +0200
Subject: [PATCH 404/867] [Keymap] Further improvements to ifohancroft ErgoDox
 keymap (#15672)

---
 .../ergodox_ez/keymaps/ifohancroft/config.h   |   2 -
 .../ergodox_ez/keymaps/ifohancroft/keymap.c   | 138 ++++++++++++------
 .../ergodox_ez/keymaps/ifohancroft/readme.md  |  19 +--
 .../ergodox_ez/keymaps/ifohancroft/rules.mk   |   3 +-
 4 files changed, 101 insertions(+), 61 deletions(-)

diff --git a/keyboards/ergodox_ez/keymaps/ifohancroft/config.h b/keyboards/ergodox_ez/keymaps/ifohancroft/config.h
index fcc7c11be7..9a0d0e54f7 100644
--- a/keyboards/ergodox_ez/keymaps/ifohancroft/config.h
+++ b/keyboards/ergodox_ez/keymaps/ifohancroft/config.h
@@ -19,5 +19,3 @@
 // place overrides here
 #define USB_POLLING_INTERVAL_MS 1
 #define FORCE_NKRO
-#undef DEBOUNCE
-#define DEBOUNCE 5
diff --git a/keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c b/keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c
index 27524b1782..56c1ff28a7 100644
--- a/keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/ifohancroft/keymap.c
@@ -24,19 +24,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
     * | Tab     | Q       | W       | E       | R       | T       | [       |                             | ]       | Y       | U       | I       | O       | P       | \       |
     * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * | ESC     | A       | S       | D       | F       | G       |         |                             |         | H       | J       | K       | L       | ;       | '       |
+    * | ESC     | A       | S       | D       | F       | G       | Del     |                             |         | H       | J       | K       | L       | ;       | '       |
     * |---------+---------+---------+---------+---------+---------+---------*                             *---------+---------+---------+---------+---------+---------+---------|
     * | Shift   | Z       | X       | C       | V       | B       |                                                 | N       | M       | ,       | .       | /       | Shift   |
     * |---------+---------+---------+---------+---------+---------*                                                 *---------+---------+---------+---------+---------+---------|
-    * | Ctrl    | Super   | Alt     | TT(3)   | MO(2)   |                                                                     | MO(2)   | Left    | Down    | Up      | Right   |
+    * | Ctrl    | Super   | Alt     | MO(4)   | MO(3)   |                                                                     | MO(3)   | Left    | Down    | Up      | Right   |
     * *-------------------------------------------------*                                                                     *-------------------------------------------------*
     *
     *                                                             *-------------------*         *-------------------*
-    *                                                             |         | TG(1)   |         |         |         |
+    *                                                             | MO(2)   |         |         |         |         |
     *                                                   *---------+---------+---------|         |---------+---------+---------*
     *                                                   |         |         |         |         |         |         |         |
     *                                                   | Bckspc  | Enter   |---------|         |---------| Enter   | Space   |
-    *                                                   |         |         | PgDn    |         | PgUp    |         |         |
+    *                                                   |         |         | Space   |         |         |         |         |
     *                                                   *---------+---------+---------*         *---------+---------+---------*
     */
 
@@ -44,14 +44,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_GRV,   KC_1,     KC_2,     KC_3,    KC_4,      KC_5,     KC_MINS,                                KC_EQL,   KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_DEL,
         KC_TAB,   KC_Q,     KC_W,     KC_E,    KC_R,      KC_T,     KC_LBRC,                                KC_RBRC,  KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
         KC_ESC,   KC_A,     KC_S,     KC_D,    KC_F,      KC_G,                                                       KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
-        KC_LSFT,  KC_Z,     KC_X,     KC_C,    KC_V,      KC_B,     KC_NO,                                  KC_NO,    KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
-        KC_LCTL,  KC_LGUI,  KC_LALT,  TT(3),   MO(2),                                                                           MO(2),    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,    KC_V,      KC_B,     KC_DEL,                                 KC_NO,    KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
+        KC_LCTL,  KC_LGUI,  KC_LALT,  MO(4),   MO(3),                                                                           MO(3),    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,
 
-                                                                    KC_NO,    TG(1),              KC_NO,    KC_NO,
+                                                                    MO(2),    KC_NO,              KC_NO,    KC_NO,
                                                                               KC_NO,              KC_NO,
-                                                          KC_BSPC,  KC_ENT,   KC_PGDN,            KC_PGUP,  KC_ENT,   KC_SPC
+                                                          KC_BSPC,  KC_ENT,   KC_SPC,             KC_NO,    KC_ENT,   KC_SPC
     ),
 
+
+
     /* Gaming Layer
     * *---------------------------------------------------------------------*                             *---------------------------------------------------------------------*
     * |         |         |         |         |         |         | 6       |                             |         |         |         |         |         |         |         |
@@ -86,13 +88,87 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                           KC_SPC,   _______,  _______,            _______,  _______,  _______
     ),
 
+
+
+    /* Left Hand Layer
+    * *---------------------------------------------------------------------*                             *---------------------------------------------------------------------*
+    * |         | 6       | 7       | 8       | 9       | 0       | =       |                             |         |         |         |         |         |         |         |
+    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
+    * | \       | Y       | U       | I       | O       | P       | ]       |                             |         |         |         |         |         |         |         |
+    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
+    * | '       | H       | J       | K       | L       | ;       |         |                             |         |         |         |         |         |         |         |
+    * |---------+---------+---------+---------+---------+---------+---------*                             *---------+---------+---------+---------+---------+---------+---------|
+    * |         | N       | M       | ,       | .       | /       |                                                 |         |         |         |         |         |         |
+    * |---------+---------+---------+---------+---------+---------*                                                 *---------+---------+---------+---------+---------+---------|
+    * |         |         |         |         |         |                                                                     |         |         |         |         |         |
+    * *-------------------------------------------------*                                                                     *-------------------------------------------------*
+    *
+    *                                                             *-------------------*         *-------------------*
+    *                                                             |         |         |         |         |         |
+    *                                                   *---------+---------+---------|         |---------+---------+---------*
+    *                                                   |         |         |         |         |         |         |         |
+    *                                                   |         |         |---------|         |---------|         |         |
+    *                                                   |         |         |         |         |         |         |         |
+    *                                                   *---------+---------+---------*         *---------+---------+---------*
+    */
+
+    LAYOUT_ergodox_pretty(
+        _______,  KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_EQL,                                 _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        KC_BSLS,  KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_RBRC,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        KC_QUOT,  KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,                                                    _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
+
+                                                                    _______,  _______,            _______,  _______,
+                                                                              _______,            _______,
+                                                          _______,  _______,  _______,            _______,  _______,  _______
+    ),
+
+
+
     /* Function Keys Layer
     * *---------------------------------------------------------------------*                             *---------------------------------------------------------------------*
-    * |         | F1      | F2      | F3      | F4      | F5      | F11     |                             | F12     | F6      | F7      | F8      | F9      | F10     |         |
+    * | NumLock | F1      | F2      | F3      | F4      | F5      | F11     |                             | F12     | F6      | F7      | F8      | F9      | F10     |         |
     * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * |         |         | Up      |         |         |         |         |                             |         |         |         |         |         |         |         |
+    * |         | +       | 7       | 8       | 9       | *       |         |                             |         |         |         |         |         |         |         |
     * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * |         | Left    | Down    | Right   |         |         |         |                             |         | Left    | Down    | Up      | Right   |         |         |
+    * |         | -       | 4       | 5       | 6       | /       |         |                             |         | Left    | Down    | Up      | Right   |         |         |
+    * |---------+---------+---------+---------+---------+---------+---------*                             *---------+---------+---------+---------+---------+---------+---------|
+    * |         | 0       | 1       | 2       | 3       | .       |                                                 |         |         |         |         |         |         |
+    * |---------+---------+---------+---------+---------+---------*                                                 *---------+---------+---------+---------+---------+---------|
+    * |         |         |         |         |         |                                                                     |         |         |         |         |         |
+    * *-------------------------------------------------*                                                                     *-------------------------------------------------*
+    *
+    *                                                             *-------------------*         *-------------------*
+    *                                                             |         |         |         |         |         |
+    *                                                   *---------+---------+---------|         |---------+---------+---------*
+    *                                                   |         |         |         |         |         |         |         |
+    *                                                   |         | Enter   |---------|         |---------|         |         |
+    *                                                   |         |         | PgUp    |         | PgDn    |         |         |
+    *                                                   *---------+---------+---------*         *---------+---------+---------*
+    */
+
+    LAYOUT_ergodox_pretty(
+        KC_NUM,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,                                 KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
+        _______,  KC_PPLS,  KC_P7,    KC_P8,    KC_P9,    KC_PAST,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  KC_PMNS,  KC_P4,    KC_P5,    KC_P6,    KC_PSLS,                                                    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,
+        _______,  KC_P0,    KC_P1,    KC_P2,    KC_P3,    KC_PDOT,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
+
+                                                                    _______,  _______,            _______,  _______,
+                                                                              _______,            _______,
+                                                          _______,  KC_PENT,  KC_PGUP,            KC_PGDN,  _______,  _______
+    ),
+
+
+
+    /* Layers Layer
+    * *---------------------------------------------------------------------*                             *---------------------------------------------------------------------*
+    * |         | TO(0)   | TO(1)   |         |         |         |         |                             |         |         |         |         |         |         |         |
+    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
+    * |         |         |         |         |         |         |         |                             |         |         |         |         |         |         |         |
+    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
+    * |         |         |         |         |         |         |         |                             |         |         |         |         |         |         |         |
     * |---------+---------+---------+---------+---------+---------+---------*                             *---------+---------+---------+---------+---------+---------+---------|
     * |         |         |         |         |         |         |                                                 |         |         |         |         |         |         |
     * |---------+---------+---------+---------+---------+---------*                                                 *---------+---------+---------+---------+---------+---------|
@@ -109,49 +185,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 
     LAYOUT_ergodox_pretty(
-        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F11,                                 KC_F12,   KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,
-        _______,  _______,  KC_UP,    _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  KC_LEFT,  KC_DOWN,  KC_RGHT,  _______,  _______,                                                    KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,
+        _______,  TO(0),    TO(1),    _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,                                                    _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
 
                                                                     _______,  _______,            _______,  _______,
                                                                               _______,            _______,
                                                           _______,  _______,  _______,            _______,  _______,  _______
-    ),
-
-    /* CAD Layer
-    * *---------------------------------------------------------------------*                             *---------------------------------------------------------------------*
-    * | Del     | 0       | 9       | 8       | 7       | 6       | =       |                             |         |         |         |         |         |         |         |
-    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * | \       | P       | O       | I       | U       | Y       | ]       |                             |         |         |         |         |         |         |         |
-    * |---------+---------+---------+---------+---------+---------+---------|                             |---------+---------+---------+---------+---------+---------+---------|
-    * | '       | ;       | L       | K       | J       | H       |         |                             |         |         |         |         |         |         |         |
-    * |---------+---------+---------+---------+---------+---------+---------*                             *---------+---------+---------+---------+---------+---------+---------|
-    * |         | /       | .       | ,       | M       | N       |                                                 |         |         |         |         |         |         |
-    * |---------+---------+---------+---------+---------+---------*                                                 *---------+---------+---------+---------+---------+---------|
-    * |         |         |         |         |         |                                                                     |         |         |         |         |         |
-    * *-------------------------------------------------*                                                                     *-------------------------------------------------*
-    *
-    *                                                             *-------------------*         *-------------------*
-    *                                                             |         |         |         |         |         |
-    *                                                   *---------+---------+---------|         |---------+---------+---------*
-    *                                                   |         |         |         |         |         |         |         |
-    *                                                   | Space   |         |---------|         |---------|         |         |
-    *                                                   |         |         | PgUp    |         |         |         |         |
-    *                                                   *---------+---------+---------*         *---------+---------+---------*
-    */
-
-    LAYOUT_ergodox_pretty(
-        KC_DEL,   KC_0,     KC_9,     KC_8,     KC_7,     KC_6,     KC_EQL,                                 _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        KC_BSLS,  KC_P,     KC_O,     KC_I,     KC_U,     KC_Y,     KC_RBRC,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        KC_QUOT,  KC_SCLN,  KC_L,     KC_K,     KC_J,     KC_H,                                                       _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  KC_SLSH,  KC_DOT,   KC_COMM,  KC_M,     KC_N,     _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______,
-        _______,  _______,  _______,  _______,  _______,                                                                        _______,  _______,  _______,  _______,  _______,
-
-                                                                    _______,  _______,            _______,  _______,
-                                                                              _______,            _______,
-                                                          KC_SPC,   _______,  KC_PGUP,            _______,  _______,  _______
     )
 
 };
diff --git a/keyboards/ergodox_ez/keymaps/ifohancroft/readme.md b/keyboards/ergodox_ez/keymaps/ifohancroft/readme.md
index 6bda1f2fc5..daa581062c 100644
--- a/keyboards/ergodox_ez/keymaps/ifohancroft/readme.md
+++ b/keyboards/ergodox_ez/keymaps/ifohancroft/readme.md
@@ -1,19 +1,20 @@
-![IFo Hancroft ErgoDox EZ Layout Image](https://i.imgur.com/v0kRHX5.png)
+![IFo Hancroft ErgoDox EZ Layout Image](https://i.imgur.com/BlH0ZdE.png)
 
 # IFo Hancroft's ErgoDox EZ Layout
 
-- Layer 0: A Standard ANSI QWERTY Layer.
-- Layer 1: A Gaming Layer. It replaces the Backspace with a Space, and the Dash with a 6, so you can play CS:GO without needing to lift your right hand from the mouse.
-- Layer 2: A function layer. It contains the F1-F12 keys and arrows on WASD.
-- Layer 3: A CAD Layer. It is basically a mirrored version of the right hand side, so you can use CAD without needing to lift your right hand from the the mouse.
+- Layer 0: A Standard ANSI QWERTY Layer. It adds some additional keys from the right half in-order to avoid having to lift your right hand of the mouse.
+- Layer 1: A Gaming Layer. It replaces the Backspace with a Space, and the Dash with a 6, so you can play CS:GO without needing to lift your right hand of the mouse.
+- Layer 2: A Left Hand Layer. It is basically a left hand version of the right half, so you can have access to a full-sized keyboard without needing to lift your right hand from the the mouse.
+- Layer 3: A Function Layer. It contains the F1-F12 keys, PgUp, PgDn, Numpad, and arrows on HJKL.
+- Layer 4: A Layer Switching Layer. The keys in this layer turn on a specific layer while disabling the rest. Basically, you come here to switch between the QWERTY and Gaming layers.
+
 
 This keymap also does the following:
 
 - Sets the polling rate of the keyboard to 1ms
-- Sets the debounce time to 5ms
-- NKRO (Forced on)
+- Forces NKRO on
+- Enables:
+    - Command
 - Disables:
     - Mouse Key
     - Extra Key
-    - Unicode
-    - Swap Hands
diff --git a/keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk b/keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk
index bf0efc77e5..775ecbd12b 100644
--- a/keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk
+++ b/keyboards/ergodox_ez/keymaps/ifohancroft/rules.mk
@@ -1,4 +1,3 @@
 MOUSEKEY_ENABLE = no
 EXTRAKEY_ENABLE = no
-UNICODE_ENABLE = no
-SWAP_HANDS_ENABLE = no
+COMMAND_ENABLE = yes

From 1f59fe6d1b1da209fa4475f10d082455ee1381eb Mon Sep 17 00:00:00 2001
From: Ga68 <Ga68@users.noreply.github.com>
Date: Fri, 28 Jan 2022 23:03:21 -0800
Subject: [PATCH 405/867] Adjust tap_code16 to account for TAP_HOLD_CAPS_DELAY
 (#15635)

Co-authored-by: Ga68 <github.ga68.e@grxme.com>
---
 quantum/quantum.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 21f499165a..833f53175f 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -93,9 +93,12 @@ __attribute__((weak)) void unregister_code16(uint16_t code) {
 
 __attribute__((weak)) void tap_code16(uint16_t code) {
     register_code16(code);
-#if TAP_CODE_DELAY > 0
-    wait_ms(TAP_CODE_DELAY);
-#endif
+    if (code == KC_CAPS_LOCK) {
+        wait_ms(TAP_HOLD_CAPS_DELAY);
+    }
+    else if (TAP_CODE_DELAY > 0) {
+        wait_ms(TAP_CODE_DELAY); 
+    }
     unregister_code16(code);
 }
 

From 002a1add8b68ca8b1c7c2c21f75dca88df15ad2e Mon Sep 17 00:00:00 2001
From: Chris Broekema <broekema-github@fuzzms.nl>
Date: Sat, 29 Jan 2022 08:04:42 +0100
Subject: [PATCH 406/867] [Keyboard] Add misterdeck 3d-printed handwired stream
 deck (#15556)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/misterdeck/config.h       | 45 +++++++++++++++++++
 keyboards/handwired/misterdeck/info.json      |  5 +++
 .../misterdeck/keymaps/default/config.h       | 20 +++++++++
 .../misterdeck/keymaps/default/keymap.c       | 37 +++++++++++++++
 .../misterdeck/keymaps/nobuttons/config.h     | 22 +++++++++
 .../misterdeck/keymaps/nobuttons/keymap.c     | 37 +++++++++++++++
 keyboards/handwired/misterdeck/misterdeck.c   | 17 +++++++
 keyboards/handwired/misterdeck/misterdeck.h   | 29 ++++++++++++
 keyboards/handwired/misterdeck/readme.md      | 21 +++++++++
 keyboards/handwired/misterdeck/rules.mk       | 21 +++++++++
 10 files changed, 254 insertions(+)
 create mode 100644 keyboards/handwired/misterdeck/config.h
 create mode 100644 keyboards/handwired/misterdeck/info.json
 create mode 100644 keyboards/handwired/misterdeck/keymaps/default/config.h
 create mode 100644 keyboards/handwired/misterdeck/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
 create mode 100644 keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
 create mode 100644 keyboards/handwired/misterdeck/misterdeck.c
 create mode 100644 keyboards/handwired/misterdeck/misterdeck.h
 create mode 100644 keyboards/handwired/misterdeck/readme.md
 create mode 100644 keyboards/handwired/misterdeck/rules.mk

diff --git a/keyboards/handwired/misterdeck/config.h b/keyboards/handwired/misterdeck/config.h
new file mode 100644
index 0000000000..3aaef79d0a
--- /dev/null
+++ b/keyboards/handwired/misterdeck/config.h
@@ -0,0 +1,45 @@
+/*
+Copyright 2021 Chris Broekema (broekema@gmail.com)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xBEEF
+#define PRODUCT_ID   0x6969
+#define DEVICE_VER   0x0001
+#define MANUFACTURER QMK
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 4
+
+#define MATRIX_ROW_PINS { D1, D0, D4 }
+#define MATRIX_COL_PINS { D7, E6, B4, B5 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+//#define JOYSTICK_AXES_COUNT 4
+//#define JOYSTICK_BUTTON_COUNT 8
diff --git a/keyboards/handwired/misterdeck/info.json b/keyboards/handwired/misterdeck/info.json
new file mode 100644
index 0000000000..84c3863107
--- /dev/null
+++ b/keyboards/handwired/misterdeck/info.json
@@ -0,0 +1,5 @@
+{
+    "keyboard_name": "MisteRdeck",
+    "url": "https://www.thingiverse.com/thing:4627779",
+    "maintainer": "broekema",
+}
diff --git a/keyboards/handwired/misterdeck/keymaps/default/config.h b/keyboards/handwired/misterdeck/keymaps/default/config.h
new file mode 100644
index 0000000000..c21c29910b
--- /dev/null
+++ b/keyboards/handwired/misterdeck/keymaps/default/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 Chris Broekema (broekema@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define JOYSTICK_AXES_COUNT 4
+#define JOYSTICK_BUTTON_COUNT 4
diff --git a/keyboards/handwired/misterdeck/keymaps/default/keymap.c b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a6b6ee467e
--- /dev/null
+++ b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2021 Chris Broekema (broekema@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "joystick.h"
+
+enum layers {
+  NORMAL_LAYER = 0
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [NORMAL_LAYER] = LAYOUT( C(S(KC_F1)), C(S(KC_F2)), C(S(KC_F3)), C(S(KC_F4)),
+			   C(S(KC_F5)), C(S(KC_F6)), C(S(KC_F7)), C(S(KC_F8)),
+			   JS_BUTTON0,  JS_BUTTON1,  JS_BUTTON2,  JS_BUTTON3 ),
+};
+
+
+
+joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+    [0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023),
+    [1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023),
+    [2] = JOYSTICK_AXIS_IN(F6, 0, 512, 1023),
+    [3] = JOYSTICK_AXIS_IN(F7, 0, 512, 1023)
+};
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h b/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
new file mode 100644
index 0000000000..bd150139c1
--- /dev/null
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
@@ -0,0 +1,22 @@
+/*
+Copyright 2021 Chris Broekema (broekema@gmail.com)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#pragma once
+
+#define JOYSTICK_AXES_COUNT 4
+#define JOYSTICK_BUTTON_COUNT 0
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c b/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
new file mode 100644
index 0000000000..fbeb636cf2
--- /dev/null
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2021 Chris Broekema (broekema@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "joystick.h"
+
+enum layers {
+  NORMAL_LAYER = 0
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [NORMAL_LAYER] = LAYOUT( C(S(KC_F1)), C(S(KC_F2)), C(S(KC_F3)), C(S(KC_F4)),
+			   C(S(KC_F5)), C(S(KC_F6)), C(S(KC_F7)), C(S(KC_F8)),
+			   C(S(KC_F9)), C(S(KC_F10)), C(S(KC_F11)), C(S(KC_F12))),
+};
+
+
+
+joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
+    [0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023),
+    [1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023),
+    [2] = JOYSTICK_AXIS_IN(F6, 0, 512, 1023),
+    [3] = JOYSTICK_AXIS_IN(F7, 0, 512, 1023)
+};
diff --git a/keyboards/handwired/misterdeck/misterdeck.c b/keyboards/handwired/misterdeck/misterdeck.c
new file mode 100644
index 0000000000..a096e9ce95
--- /dev/null
+++ b/keyboards/handwired/misterdeck/misterdeck.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Chris Broekema (broekema@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "misterdeck.h"
diff --git a/keyboards/handwired/misterdeck/misterdeck.h b/keyboards/handwired/misterdeck/misterdeck.h
new file mode 100644
index 0000000000..a86ca2c2c9
--- /dev/null
+++ b/keyboards/handwired/misterdeck/misterdeck.h
@@ -0,0 +1,29 @@
+/* Copyright 2021 Chris Broekema (broekema@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+  k00, k01, k02, k03, \
+  k10, k11, k12, k13, \
+  k20, k21, k22, k23  \
+) { \
+    { k00, k01, k02, k03 }, \
+    { k10, k11, k12, k13 }, \
+    { k20, k21, k22, k23 }  \
+}
diff --git a/keyboards/handwired/misterdeck/readme.md b/keyboards/handwired/misterdeck/readme.md
new file mode 100644
index 0000000000..b9d472319a
--- /dev/null
+++ b/keyboards/handwired/misterdeck/readme.md
@@ -0,0 +1,21 @@
+# MisterDeck
+
+![MisteRdeck](https://i.imgur.com/FTPWqkXh.jpeg)
+
+A 3D-printed streamdeck like keyboard featuring 12 keys and 4 sliders
+
+* Keyboard Maintainer: [Chris Broekema](https://github.com/broekema)
+* Hardware Supported: MisteRdeck by MisteR_ofcl 
+* Hardware Availability: [Thingiverse](https://www.thingiverse.com/thing:4627779)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/misterdeck:default
+
+Flashing example for this keyboard:
+
+    make handwired/misterdeck:default:flash
+
+Connect a momentary switch to RST and GND, hit twice in succession to reset the board into bootloader mode.
+
+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).
\ No newline at end of file
diff --git a/keyboards/handwired/misterdeck/rules.mk b/keyboards/handwired/misterdeck/rules.mk
new file mode 100644
index 0000000000..c19a30931a
--- /dev/null
+++ b/keyboards/handwired/misterdeck/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+# use joystick feature for sliders
+JOYSTICK_ENABLE = yes

From 59502f930e44e64c931de6ab6f6ab801e582c707 Mon Sep 17 00:00:00 2001
From: SandwichRising <46250499+SandwichRising@users.noreply.github.com>
Date: Fri, 28 Jan 2022 23:07:00 -0800
Subject: [PATCH 407/867] [Keyboard] Added sandwich/keeb68 to keyboards
 (#15007)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 keyboards/sandwich/keeb68/config.h            | 152 ++++++++++++++++++
 keyboards/sandwich/keeb68/keeb68.c            |  17 ++
 keyboards/sandwich/keeb68/keeb68.h            |  42 +++++
 .../sandwich/keeb68/keymaps/default/keymap.c  |  42 +++++
 .../sandwich/keeb68/keymaps/grv_esc/keymap.c  |  42 +++++
 .../sandwich/keeb68/keymaps/grv_esc/readme.md |   1 +
 keyboards/sandwich/keeb68/readme.md           |  29 ++++
 keyboards/sandwich/keeb68/rules.mk            |  18 +++
 8 files changed, 343 insertions(+)
 create mode 100644 keyboards/sandwich/keeb68/config.h
 create mode 100644 keyboards/sandwich/keeb68/keeb68.c
 create mode 100644 keyboards/sandwich/keeb68/keeb68.h
 create mode 100644 keyboards/sandwich/keeb68/keymaps/default/keymap.c
 create mode 100644 keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
 create mode 100644 keyboards/sandwich/keeb68/keymaps/grv_esc/readme.md
 create mode 100644 keyboards/sandwich/keeb68/readme.md
 create mode 100644 keyboards/sandwich/keeb68/rules.mk

diff --git a/keyboards/sandwich/keeb68/config.h b/keyboards/sandwich/keeb68/config.h
new file mode 100644
index 0000000000..7dddf54d76
--- /dev/null
+++ b/keyboards/sandwich/keeb68/config.h
@@ -0,0 +1,152 @@
+/*
+Copyright 2021 sandwich
+
+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 sandwich
+#define PRODUCT      Keeb68 (Patron Saint Edition)
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * 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 { F0, F1, F4, F5, F6 }
+#define MATRIX_COL_PINS { B6, C6, F7, E6, B7, D0, D1, D2, D3, D4, D6, D7, B4, B5 }
+#define UNUSED_PINS { D5, B0 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+#define BACKLIGHT_PIN C7
+#define BACKLIGHT_LEVELS 5
+#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/sandwich/keeb68/keeb68.c b/keyboards/sandwich/keeb68/keeb68.c
new file mode 100644
index 0000000000..c040d1a976
--- /dev/null
+++ b/keyboards/sandwich/keeb68/keeb68.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 sandwich
+ *
+ * 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 "keeb68.h"
diff --git a/keyboards/sandwich/keeb68/keeb68.h b/keyboards/sandwich/keeb68/keeb68.h
new file mode 100644
index 0000000000..10182dd9a1
--- /dev/null
+++ b/keyboards/sandwich/keeb68/keeb68.h
@@ -0,0 +1,42 @@
+/* Copyright 2021 sandwich
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_65_ansi( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
+	K400, K401, K402,             K405, K406, K407, K408, K409, K410, K411, K412, K413 \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
+	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
+	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
+	{ K400, K401, K402, KC_NO , KC_NO , K405 , K406, K407, K408, K409, K410, K411, K412, K413 } \
+}
+
diff --git a/keyboards/sandwich/keeb68/keymaps/default/keymap.c b/keyboards/sandwich/keeb68/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ce08cceabf
--- /dev/null
+++ b/keyboards/sandwich/keeb68/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2021 sandwich
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_65_ansi(
+        KC_ESC,   	KC_1,    KC_2,		KC_3,	KC_4,	KC_5,	KC_6,	KC_7,	KC_8,	KC_9,	KC_0,	 KC_MINS,	KC_BSPC,	KC_GRV,
+		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_BSLS, 	KC_DEL,
+        KC_CAPS, 	KC_A, 	 KC_S,  	KC_D,  	KC_F,  	KC_G,  	KC_H,  	KC_J,  	KC_K,  	KC_L,  	KC_SCLN, KC_QUOT,   KC_ENT,  	KC_PGUP,
+        KC_LSFT, 	KC_Z,  	 KC_X, 		KC_C,  	KC_V,  	KC_B,  	KC_N,  	KC_M, 	KC_COMM,KC_DOT,	KC_SLSH, KC_RSFT, 	KC_UP,   	KC_PGDN,
+        KC_LCTL, 	KC_LGUI, KC_LALT,               	KC_SPC, KC_EQL,	KC_RBRC,KC_RALT,MO(_FN),KC_RCTL, KC_LEFT, 	KC_DOWN, 	KC_RGHT
+		
+    ),
+    [_FN] = LAYOUT_65_ansi(
+        _______, 	KC_F1,	 KC_F2, 	KC_F3, 	KC_F4, 	KC_F5, 	KC_F6, 	KC_F7, 	KC_F8,  KC_F9, 	KC_F10,  KC_F11, 	KC_DEL,		KC_PSCREEN,
+		_______,	_______, BL_INC,	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,	KC_PAUSE,
+		_______,	BL_TOGG, BL_DEC,	BL_BRTG,_______,_______,_______,_______,_______,_______,_______,_______,	_______,	KC_HOME,
+		_______,	_______, _______,	_______,_______,_______,_______,_______,_______,_______,_______,_______,	KC_VOLU,	KC_END,
+		_______,	RESET, 	 _______,					_______,KC_F12, _______,_______,MO(_FN),_______,_______,	KC_VOLD,	_______
+		
+    )
+};
diff --git a/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c b/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
new file mode 100644
index 0000000000..b7853b3c31
--- /dev/null
+++ b/keyboards/sandwich/keeb68/keymaps/grv_esc/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2021 sandwich
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_65_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_BSPC,	KC_INS,
+		KC_TAB,		KC_Q,  	 KC_W,  	KC_E,  	KC_R,  	KC_T,  	KC_Y,  	KC_U,  	KC_I,  	KC_O,  	KC_P,    KC_LBRC,  	KC_BSLS, 	KC_DEL,
+        KC_CAPS, 	KC_A, 	 KC_S,  	KC_D,  	KC_F,  	KC_G,  	KC_H,  	KC_J,  	KC_K,  	KC_L,  	KC_SCLN, KC_QUOT,   KC_ENT,  	KC_PGUP,
+        KC_LSFT, 	KC_Z,  	 KC_X, 		KC_C,  	KC_V,  	KC_B,  	KC_N,  	KC_M, 	KC_COMM,KC_DOT,	KC_SLSH, KC_RSFT, 	KC_UP,   	KC_PGDN,
+        KC_LCTL, 	KC_LGUI, KC_LALT,               	KC_SPC, KC_EQL,	KC_RBRC,KC_RALT,MO(_FN),KC_RCTL, KC_LEFT, 	KC_DOWN, 	KC_RGHT
+		
+    ),
+    [_FN] = LAYOUT_65_ansi(
+        _______, 	KC_F1,	 KC_F2, 	KC_F3, 	KC_F4, 	KC_F5, 	KC_F6, 	KC_F7, 	KC_F8,  KC_F9, 	KC_F10,  KC_F11, 	KC_DEL,		KC_PSCREEN,
+		_______,	_______, BL_INC,	_______,_______,_______,_______,_______,_______,_______,_______,_______,	_______,	KC_PAUSE,
+		_______,	BL_TOGG, BL_DEC,	BL_BRTG,_______,_______,_______,_______,_______,_______,_______,_______,	_______,	KC_HOME,
+		_______,	_______, _______,	_______,_______,_______,_______,_______,_______,_______,_______,_______,	KC_VOLU,	KC_END,
+		_______,	RESET, 	 _______,					_______,KC_F12, _______,_______,MO(_FN),_______,_______,	KC_VOLD,	_______
+		
+    )
+};
diff --git a/keyboards/sandwich/keeb68/keymaps/grv_esc/readme.md b/keyboards/sandwich/keeb68/keymaps/grv_esc/readme.md
new file mode 100644
index 0000000000..61f0460aa4
--- /dev/null
+++ b/keyboards/sandwich/keeb68/keymaps/grv_esc/readme.md
@@ -0,0 +1 @@
+# The default keymap for keeb68
diff --git a/keyboards/sandwich/keeb68/readme.md b/keyboards/sandwich/keeb68/readme.md
new file mode 100644
index 0000000000..783d8f00b7
--- /dev/null
+++ b/keyboards/sandwich/keeb68/readme.md
@@ -0,0 +1,29 @@
+# keeb68
+
+![keeb68](https://imgur.com/b3ftFIKh.jpg)
+
+A small-batch run of 68 key goodness
+
+* Keyboard Maintainer: [sandwich](https://github.com/SandwichRising)
+* Hardware Supported: Sandwich's Keeb68 Patron Saint Edition
+* Hardware Availability: Limited Run
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sandwich/keeb68:default
+
+Flashing example for this keyboard:
+
+    make sandwich/keeb68:default:flash
+    
+Toggle NRKO on/off by holding space+n and then inserting the keyboard's USB cable. 
+Some BIOSs may not detect keypresses properly while NRKO is enabled according to QMK documentation.
+    
+## Bootloader
+
+Enter the bootloader in 2 ways (all keys assume default layout):
+
+* **Keycode in layout**:  Hold Fn key and press the Windows(GUI) key (mapped to `RESET`)
+* **Physical reset button**: Briefly press the button on the back of the PCB (labeled sw1)
+
+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).
diff --git a/keyboards/sandwich/keeb68/rules.mk b/keyboards/sandwich/keeb68/rules.mk
new file mode 100644
index 0000000000..ba835590bb
--- /dev/null
+++ b/keyboards/sandwich/keeb68/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 70b51dc1bff371c0cd889cfdbaaf0d6130c9e591 Mon Sep 17 00:00:00 2001
From: Cable Car Designs <17062872+westfoxtrot@users.noreply.github.com>
Date: Sat, 29 Jan 2022 07:10:41 +0000
Subject: [PATCH 408/867] [Keyboard] add cypher rev6 (#14647)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../cablecardesigns/cypher/rev6/config.h      |  56 +++++++++
 .../cablecardesigns/cypher/rev6/info.json     | 108 ++++++++++++++++++
 .../cypher/rev6/keymaps/default/config.h      |   7 ++
 .../cypher/rev6/keymaps/default/keymap.c      |  60 ++++++++++
 .../cypher/rev6/keymaps/default/readme.md     |   1 +
 .../cypher/rev6/keymaps/default_iso/config.h  |   7 ++
 .../cypher/rev6/keymaps/default_iso/keymap.c  |  60 ++++++++++
 .../cypher/rev6/keymaps/default_iso/readme.md |   1 +
 .../cypher/rev6/keymaps/via/config.h          |   7 ++
 .../cypher/rev6/keymaps/via/keymap.c          |  71 ++++++++++++
 .../cypher/rev6/keymaps/via/rules.mk          |   2 +
 .../cablecardesigns/cypher/rev6/readme.md     |  25 ++++
 keyboards/cablecardesigns/cypher/rev6/rev6.c  |   3 +
 keyboards/cablecardesigns/cypher/rev6/rev6.h  |  27 +++++
 .../cablecardesigns/cypher/rev6/rules.mk      |  18 +++
 15 files changed, 453 insertions(+)
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/config.h
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/info.json
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/keymaps/default/config.h
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/keymaps/default/readme.md
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/config.h
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/readme.md
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/keymaps/via/config.h
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/keymaps/via/rules.mk
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/readme.md
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/rev6.c
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/rev6.h
 create mode 100644 keyboards/cablecardesigns/cypher/rev6/rules.mk

diff --git a/keyboards/cablecardesigns/cypher/rev6/config.h b/keyboards/cablecardesigns/cypher/rev6/config.h
new file mode 100644
index 0000000000..51d86d721e
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/config.h
@@ -0,0 +1,56 @@
+// Copyright 2022 Cable Car Designs (@westfoxtrot)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x41FF
+#define PRODUCT_ID      0xAA99
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    cablecardesigns
+#define PRODUCT         cypher
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 10
+
+#define MATRIX_ROW_PINS { B0, F1, F5, F6, F7, D1, F4, D4, C6, C7 }
+#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, B7, B3, B2, B1, F0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL, or CUSTOM_MATRIX */
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 5
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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 BACKLIGHT_PIN D0
+
+#define RGB_DI_PIN D5
+#ifdef RGB_DI_PIN
+   #define RGBLED_NUM 3
+   #define RGBLIGHT_HUE_STEP 12
+   #define RGBLIGHT_SAT_STEP 25
+   #define RGBLIGHT_VAL_STEP 12
+   #define RGBLIGHT_LIMIT_VAL 255
+   #define RGBLIGHT_SLEEP
+   #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
+   #define RGBLIGHT_EFFECT_TWINKLE
+#endif
diff --git a/keyboards/cablecardesigns/cypher/rev6/info.json b/keyboards/cablecardesigns/cypher/rev6/info.json
new file mode 100644
index 0000000000..385ee8810a
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/info.json
@@ -0,0 +1,108 @@
+{
+    "keyboard_name": "Cypher Rev6",
+    "layouts": {
+      "LAYOUT_all": {
+        "layout": [
+          {"label":"~","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},
+          {"label":"~","x":14,"y":0},
+
+          {"label":"Num Lock","x":15.5,"y":0},
+          {"label":"/","x":16.5,"y":0},
+          {"label":"*","x":17.5,"y":0},
+          {"label":"-","x":18.5,"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":"7","x":15.5,"y":1},
+          {"label":"8","x":16.5,"y":1},
+          {"label":"9","x":17.5,"y":1},
+          {"label":"+","x":18.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":"NUHS","x":12.75,"y":2},
+          {"label":"Enter","x":13.75,"y":2,"w":1.25},
+
+          {"label":"4","x":15.5,"y":2},
+          {"label":"5","x":16.5,"y":2},
+          {"label":"6","x":17.5,"y":2},
+          {"label":"=","x":18.5,"y":2},
+
+          {"label":"Shift","x":0,"y":3,"w":1.25},
+          {"label":"Shift","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":1.75},
+
+          {"label":"Up","x":14.25,"y":3.25},
+
+          {"label":"1","x":15.5,"y":3},
+          {"label":"2","x":16.5,"y":3},
+          {"label":"3","x":17.5,"y":3},
+          {"label":"Enter","x":18.5,"y":3},
+
+          {"label":"Ctrl","x":0,"y":4,"w":1.25},
+          {"label":"Win","x":1.25,"y":4},
+          {"label":"Alt","x":2.25,"y":4,"w":1.25},
+          {"label":"Space","x":3.5,"y":4,"w":1.5},
+          {"label":"Space","x":5,"y":4,"w":3},
+          {"label":"Space","x":8,"y":4,"w":1.5},
+          {"label":"Alt","x":9.5,"y":4,"w":1.25},
+          {"label":"Win","x":10.75,"y":4},
+          {"label":"Ctrl","x":11.75,"y":4,"w":1.25},
+
+          {"label":"Left","x":13.25,"y":4.25},
+          {"label":"Down","x":14.25,"y":4.25},
+          {"label":"Right","x":15.25,"y":4.25},
+
+          {"label":"0","x":16.5,"y":4},
+          {"label":".","x":17.5,"y":4},
+          {"label":"Backspace","x":18.5,"y":4}
+        ]
+      }
+    }
+  }
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default/config.h b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/config.h
new file mode 100644
index 0000000000..eda93545b4
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/config.h
@@ -0,0 +1,7 @@
+// Copyright 2022 Cable Car Designs (@westfoxtrot)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+#define RGBLIGHT_DEFAULT_VAL 0
\ No newline at end of file
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6a39580735
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/keymap.c
@@ -0,0 +1,60 @@
+// Copyright 2022 Cable Car Designs (@westfoxtrot)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _MA,
+    _F1,
+};
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {1, 1, HSV_GREEN}
+);
+
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {2, 1, HSV_BLUE}
+);
+
+const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_RED}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer,
+    my_numlock_layer,
+    my_layer1_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    rgblight_set_layer_state(1, led_state.num_lock);
+    return true;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(2, layer_state_cmp(state, _F1));
+    return state;
+}
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MA] = LAYOUT_all( /* Base */
+  KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_NO, 	 	KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  KC_TAB,    RGB_TOG,   RGB_MODE_RGBTEST,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC, KC_RBRC,	    KC_BSLS, 	 	KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+  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_NO,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
+  KC_LSFT,KC_NO ,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_P1,   KC_P2,   KC_P3,   KC_PENT,
+  KC_LCTL, KC_LGUI,KC_LALT,                    KC_SPC,KC_SPC,KC_SPC,        KC_RALT,KC_RALT,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
+
+[_F1] = LAYOUT_all( /* Function Layer */
+  RESET,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, KC_DEL , _______,       _______, _______, _______, _______,
+  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_INC,BL_DEC,BL_BRTG,_______,_______,_______,_______, _______,	    _______, 	 	    _______, _______, _______, _______,
+  _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,  _______,  	 	_______, _______, _______, _______,
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______, 	_______, _______, _______, _______,
+  _______, _______,_______,                    _______,_______,_______,        _______,_______,_______,          _______,_______,_______,    _______, _______, _______),
+
+};
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default/readme.md b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/readme.md
new file mode 100644
index 0000000000..05c3700266
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for cypher
\ No newline at end of file
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/config.h b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/config.h
new file mode 100644
index 0000000000..eda93545b4
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/config.h
@@ -0,0 +1,7 @@
+// Copyright 2022 Cable Car Designs (@westfoxtrot)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+#define RGBLIGHT_DEFAULT_VAL 0
\ No newline at end of file
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..82c9e836c0
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/keymap.c
@@ -0,0 +1,60 @@
+// Copyright 2022 Cable Car Designs (@westfoxtrot)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _MA,
+    _F1,
+};
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {1, 1, HSV_GREEN}
+);
+
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {2, 1, HSV_BLUE}
+);
+
+const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_RED}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer,
+    my_numlock_layer,
+    my_layer1_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    rgblight_set_layer_state(1, led_state.num_lock);
+    return true;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(2, layer_state_cmp(state, _F1));
+    return state;
+}
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MA] = LAYOUT_all( /* Base */
+  KC_GESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 	 	KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  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_NO,                KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+  KC_CAPS,    KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,	KC_QUOT,KC_NUHS,     KC_ENT,  	 	KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
+  KC_LSFT,KC_NUBS,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT,  KC_SLSH,        KC_RSFT,        KC_UP,  	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+  KC_LCTRL, KC_LGUI,KC_LALT,          KC_NO,KC_SPC,KC_NO,                  KC_RALT,KC_RGUI,MO(_F1),              KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
+
+[_F1] = LAYOUT_all( /* Function Layer */
+  RESET,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11,  KC_F12, _______, _______,		_______, _______, _______, _______,
+  _______,   BL_TOGG,BL_STEP,BL_ON,BL_OFF,BL_INC,BL_DEC,BL_BRTG,_______,_______,_______,_______, _______,_______,                   _______, _______, _______, _______,
+  _______,    _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,  _______,_______,_______,  	 	    _______, _______, _______, _______,
+  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______,        _______,       _______,  _______, _______, _______, _______,
+  _______, _______,_______,          _______,_______,_______,                  _______,_______,_______,           _______,_______,_______,	 _______, _______, _______),
+
+};
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/readme.md b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/readme.md
new file mode 100644
index 0000000000..81a4a677fd
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/default_iso/readme.md
@@ -0,0 +1 @@
+# The default iso keymap for cypher
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/config.h b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/config.h
new file mode 100644
index 0000000000..eda93545b4
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/config.h
@@ -0,0 +1,7 @@
+// Copyright 2022 Cable Car Designs (@westfoxtrot)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+#define RGBLIGHT_DEFAULT_VAL 0
\ No newline at end of file
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
new file mode 100644
index 0000000000..967e508a29
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
@@ -0,0 +1,71 @@
+// Copyright 2022 Cable Car Designs (@westfoxtrot)
+// SPDX-License-Identifier: GPL-2.0-or-later
+/* VIA Layout > http://www.keyboard-layout-editor.com/#/gists/0e8d4957e77f3179aa09bd6e195f7afa */
+
+#include QMK_KEYBOARD_H
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {1, 1, HSV_GREEN}
+);
+
+const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {2, 1, HSV_BLUE}
+);
+
+const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0, 1, HSV_RED}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer,
+    my_numlock_layer,
+    my_layer1_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    rgblight_set_layer_state(1, led_state.num_lock);
+    return true;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(2, layer_state_cmp(state, _F1));
+    return state;
+}
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL, 	     	  KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+  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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+  KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,   KC_NUHS,     KC_ENT,  	          KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
+  KC_LSFT, KC_BSLS,  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_P1,   KC_P2,   KC_P3,   KC_PENT,
+  KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,  KC_SPC,  KC_SPC,                 KC_RALT, KC_RALT, MO(1),                   KC_LEFT,KC_DOWN,KC_RGHT,    KC_P0,   KC_PDOT, KC_BSPC),
+
+[1] = LAYOUT_all(
+  RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS,    BL_TOGG, BL_STEP, BL_ON,   BL_OFF,  BL_INC,  BL_DEC,  BL_BRTG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, 	 	      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,  	          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,         KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,KC_TRNS,KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_all(
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, 	 	      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,  	          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,         KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,KC_TRNS,KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_all(
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, 	 	      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,  	          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,         KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+  KC_TRNS, KC_TRNS, KC_TRNS,                  KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS,                 KC_TRNS,KC_TRNS,KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS),
+
+};
diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/rules.mk b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/cablecardesigns/cypher/rev6/readme.md b/keyboards/cablecardesigns/cypher/rev6/readme.md
new file mode 100644
index 0000000000..13016e86a1
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/readme.md
@@ -0,0 +1,25 @@
+# cypher rev6
+
+PCB for the cypher keyboard, this is rev6 of this PCB
+
+* Keyboard Maintainer: [westfoxtrot](https://github.com/westfoxtrot)
+* Hardware Supported: Cypher PCB revisions 6 (Rev # is printed on PCB)
+* Hardware Availability: with keyboard release + [Files released here](https://github.com/westfoxtrot/Cypher_PCB)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cablecardesigns/cypher/rev6:default
+
+Flashing example for this keyboard:
+
+    make cablecardesigns/cypher/rev6:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: There are 2 holes underneath the spacebar position that if shorted will enter bootloader
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/cablecardesigns/cypher/rev6/rev6.c b/keyboards/cablecardesigns/cypher/rev6/rev6.c
new file mode 100644
index 0000000000..56e615122a
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/rev6.c
@@ -0,0 +1,3 @@
+// Copyright 2022 Cable Car Designs (@westfoxtrot)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "rev6.h"
\ No newline at end of file
diff --git a/keyboards/cablecardesigns/cypher/rev6/rev6.h b/keyboards/cablecardesigns/cypher/rev6/rev6.h
new file mode 100644
index 0000000000..6a5db7f0f2
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/rev6.h
@@ -0,0 +1,27 @@
+// Copyright 2022 Cable Car Designs (@westfoxtrot)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define ___ KC_NO
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, K51, K52, K53, K54, 		  K55, K56, K57, K58,\
+      K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K60, K61, K62, K63,     	  K65, K66, K67, K68,   \
+		K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K70, K71, K72, K73,         K75, K76, K77, K78,   \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K80, K81, K82, 		K83,      K85, K86, K87, K88,   \
+	K40, K41, K42,       K44,      K46,  K47,     K49, K90, K91,       K92, K93, K95, K96, K97, K98   \
+) \
+{ \
+    { 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, K36, K37, K38, K39 }, \
+    { K40, K41, K42, ___, K44, ___, K46, K47, ___, K49 }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
+    { K60, K61, K62, K63, ___, K65, K66, K67, K68 }, \
+    { K70, K71, K72, K73, ___, K75, K76, K77, K78 }, \
+    { K80, K81, K82, K83, ___, K85, K86, K87, K88 }, \
+    { K90, K91, K92, K93, ___, K95, K96, K97, K98 } \
+}
diff --git a/keyboards/cablecardesigns/cypher/rev6/rules.mk b/keyboards/cablecardesigns/cypher/rev6/rules.mk
new file mode 100644
index 0000000000..374d3f8e0c
--- /dev/null
+++ b/keyboards/cablecardesigns/cypher/rev6/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes            # Enable N-key Rollover
+BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From d700447ddac307ab6b1e39b0485ddef76ed1fe7f Mon Sep 17 00:00:00 2001
From: Pete Sevander <pete.sevander@gmail.com>
Date: Sat, 29 Jan 2022 09:19:36 +0200
Subject: [PATCH 409/867] Combo `TAP_CODE_DELAY` and `clear_weak_mods` (#15866)

---
 quantum/process_keycode/process_combo.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index 8040ede528..21fd737ab7 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -17,6 +17,7 @@
 #include "print.h"
 #include "process_combo.h"
 #include "action_tapping.h"
+#include "action.h"
 
 #ifdef COMBO_COUNT
 __attribute__((weak)) combo_t key_combos[COMBO_COUNT];
@@ -193,6 +194,9 @@ void clear_combos(void) {
 static inline void dump_key_buffer(void) {
     /* First call start from 0 index; recursive calls need to start from i+1 index */
     static uint8_t key_buffer_next = 0;
+#if TAP_CODE_DELAY > 0
+    bool delay_done = false;
+#endif
 
     if (key_buffer_size == 0) {
         return;
@@ -218,6 +222,15 @@ static inline void dump_key_buffer(void) {
 #endif
         }
         record->event.time = 0;
+        clear_weak_mods();
+
+#if TAP_CODE_DELAY > 0
+        // only delay once and for a non-tapping key
+        if (!delay_done && !is_tap_record(record)) {
+            delay_done = true;
+            wait_ms(TAP_CODE_DELAY);
+        }
+#endif
     }
 
     key_buffer_next = key_buffer_size = 0;

From b79b8dcdd036c1ad727985f088be1a03c5642be2 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Sat, 29 Jan 2022 04:25:49 -0800
Subject: [PATCH 410/867] Format code according to conventions (#16110)

---
 quantum/quantum.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 833f53175f..ca3e4027dc 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -95,9 +95,8 @@ __attribute__((weak)) void tap_code16(uint16_t code) {
     register_code16(code);
     if (code == KC_CAPS_LOCK) {
         wait_ms(TAP_HOLD_CAPS_DELAY);
-    }
-    else if (TAP_CODE_DELAY > 0) {
-        wait_ms(TAP_CODE_DELAY); 
+    } else if (TAP_CODE_DELAY > 0) {
+        wait_ms(TAP_CODE_DELAY);
     }
     unregister_code16(code);
 }

From 9e79f27547f5c3f291aec37b3d2f8cf3c54eeb47 Mon Sep 17 00:00:00 2001
From: IskandarMa <epiciskandar@gmail.com>
Date: Sat, 29 Jan 2022 22:27:57 +0800
Subject: [PATCH 411/867] [Docs] zh-cn document translate: IDE configuration
 (#15575)

Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
---
 docs/zh-cn/other_eclipse.md |  90 ++++++++++++++++++++++++++
 docs/zh-cn/other_vscode.md  | 122 ++++++++++++++++++++++++++++++++++++
 2 files changed, 212 insertions(+)
 create mode 100644 docs/zh-cn/other_eclipse.md
 create mode 100644 docs/zh-cn/other_vscode.md

diff --git a/docs/zh-cn/other_eclipse.md b/docs/zh-cn/other_eclipse.md
new file mode 100644
index 0000000000..d0783c2070
--- /dev/null
+++ b/docs/zh-cn/other_eclipse.md
@@ -0,0 +1,90 @@
+# 在Eclipse中设置QMK开发环境
+
+<!---
+  original document: 0.15.16:docs/other_eclipse.md 
+  git diff 0.15.16 HEAD -- docs/other_eclipse.md  | cat
+-->
+
+
+[Eclipse][1]是一款广泛用于Java开发的[集成开发环境](https://en.wikipedia.org/wiki/Integrated_development_environment)（IDE），但有着强大的插件体系允许自定义开发其它语言及用途。
+
+相对于使用普通的文本编辑器，使用形如Eclipse这样的IDE有着诸多好处，例如：
+* 智能代码补全
+* 快速代码跳转
+* 重构工具
+* 构建自动化（无需使用命令行）
+* 图形化交互的GIT
+* 静态代码分析
+* 以及大量其它工具，如调试器，代码格式化，显示调用链等。
+
+本文专注于阐述如何将Eclipse配置为AVR软件开发环境，并用于基于QMK代码的开发工作。
+
+注意，在本文编写时，仅在Ubuntu 16.04环境中进行过验证。
+
+# 需求
+## 构建环境
+在开始之前，你需要确保遵循了新手教程中的[新手指引](zh-cn/newbs_getting_started.md)一节。通常，此时你应该具备了[通过 `qmk complile` 命令](zh-cn/newbs_building_firmware.md#build-your-firmware)构建固件文件的能力。
+
+## Java
+Eclipse为Java程序，因此需要安装Java 8或更高版本才能运行。你可以选择JRE或JDK，后者在进行Java开发时需要用到。
+
+# 安装Eclipse及插件
+Eclipse有[多种可选安装方式](https://www.eclipse.org/downloads/eclipse-packages/)，取决于你的使用目标。目前没有完备的AVR开发栈安装包，所以我们需要从Eclipse CDT（C/C++ 开发工具环境）开始并安装对应的插件。
+
+## 下载安装Eclipse CDT
+如果系统中已安装了Eclipse CDT，可以跳过本步骤。同时，为了确保版本支持情况，我们推荐保持其更新至最新版。
+
+如果你已安装了Eclipse包，通常也可以[在上面再安装CDT插件](https://eclipse.org/cdt/downloads.php)。但是可能更好的方案是重新全新安装一下，以确保环境轻量，以及防止已安装的工具对后续的工程开发工作产生干扰。
+
+安装很简单：遵循[Eclipse安装5步走](https://eclipse.org/downloads/eclipse-packages/?show_instructions=TRUE)，并在第三步选择 **用于C/C++开发者的Eclipse IDE（Eclipse IDE for C/C++ Developers）**。
+
+此外，也可以选择直接[下载 用于C/C++开发者的Eclipse IDE](https://www.eclipse.org/downloads/eclipse-packages/)（[最新版直达链接](https://www.eclipse.org/downloads/packages/eclipse-ide-cc-developers/neonr)）并解压至任意目录下（会生成 `eclipse` 目录）。
+
+## 首次运行
+在安装完毕后，点击<kbd>运行</kbd>按钮。（如果是手动解压的，请在安装目录下双击 `eclipse` 可执行程序
+
+在提示你选择工作区目录时，选择一个可用于存储Eclipse元数据及工程的目录。**不要选择 `qmk_firmware` 目录**，这是你的项目目录。可以使用其父目录，或其它（最好是空）目录（默认目标目录如果未作他用亦可使用）。
+
+启动后，点击右上角的<kbd>工作台（Workbench）</kbd>按钮切换到工作台视图（启动时的欢迎页最下方有个确认框可以在下次启动时不再展示欢迎页）。
+
+## 安装必要的插件
+注意：无需在每个插件安装完成时重启Eclipse，全部安装完毕后重启一次即可。
+
+### [AVR插件](https://avr-eclipse.sourceforge.net/)
+这是最重要的一个插件，可以帮助Eclipse理解AVR下的C语言代码。参照执行[更新网址使用指引](https://avr-eclipse.sourceforge.net/wiki/index.php/Plugin_Download#Update_Site)，并允许那些未签名内容产生的警告。
+
+### [ANSI Escape in Console（命令行下的ANSI转义符）](https://marketplace.eclipse.org/content/ansi-escape-console)
+该插件可以允许QMK makefile产生的具有颜色标记的构建输出信息能够正确显示。
+
+1. 打开<kbd>帮助</kbd> > <kbd>Eclipse插件市场…</kbd>
+2. 搜索_ANSI Escape in Console_
+3. 点击插件的<samp>安装</samp>按钮
+4. 跟随安装指引并再次允许那些未签名的内容产生的警告。
+
+在插件皆安装完毕后，依照提示重启Eclipse。
+
+# 配置Eclipse QMK环境
+## 导入工程
+1. 点击<kbd>文件</kbd> > <kbd>新建</kbd> > <kbd>现有的Makefile工程代码</kbd>
+2. 在之后这一页中：
+  * 选择仓库所克隆到的目录位置作为 _现有代码位置_；
+  * （可选地）指定一个不同的工程名，如 _QMK_ 或 _Quantum_ ；
+  * 选择 _AVR-GCC Toolchain_;
+  * 其它选项保留不动，点击<kbd>完成</kbd>
+
+  ![Importing QMK in Eclipse](https://i.imgur.com/oHYR1yW.png)
+
+3. 工程即完成加载及分析，其下的文件可以方便地在左侧的 _Project Explorer_ 中查看了。
+
+¹ 导入工程时若自定义名称有时会遇到些问题，如果行不通，保留默认的工程名（即目录名，通常是 `qmk_firmware`）再试一次。
+
+## 构建你的键盘
+
+我们将默认构建目标从 `all` 调整到我们期望构建的键盘及键映射组合上，即 `kinesis/kint36:stapelberg`。此时，形如清理、构建等工程级别的操作可以很快地执行完毕，而不至于耗费大量时间且导致Eclipse卡住。
+
+1. 焦点置于工程下的任一编辑器tab中
+2. 打开`工程` > `属性`窗口， 选择 `C/C++构建` 菜单项并切至 `Behavior` 标签。
+3. 将 `Make build target`选项中的全量构建 `all` 改为 `kinesis/kint41:stapelberg`。
+4. 点击 `工程` > `清理...` 以确认配置正确。
+
+  [1]: https://en.wikipedia.org/wiki/Eclipse_(software)
diff --git a/docs/zh-cn/other_vscode.md b/docs/zh-cn/other_vscode.md
new file mode 100644
index 0000000000..e4bca0711c
--- /dev/null
+++ b/docs/zh-cn/other_vscode.md
@@ -0,0 +1,122 @@
+#  在Visual Studio Code中设置QMK开发环境
+
+<!---
+  original document: 0.15.12:docs/other_vscode.md 
+  git diff 0.15.12 HEAD -- docs/other_vscode.md  | cat
+-->
+
+[Visual Studio Code](https://code.visualstudio.com/) (VS Code) 是一款支援非常多种不同编程语言的开源编辑器。
+
+相比于使用简陋的文本编辑器，形如VS Code这样的多功能编辑器有诸多优势，比如：
+* 智能的代码补全
+* 便捷的代码导航
+* 重构工具
+* 自动化构建支持（不再需要命令行操作）
+* 图形化的GIT界面
+* 调试器、代码格式化、显示调用层级等多种工具
+
+本章节旨在阐述如何配置VS Code以在其上进行QMK固件开发。
+
+这份指引提供了在Windows及Ubuntu 18.04下所有的配置方法。
+
+# 配置VS Code
+一开始，你需要首先确认所有的构建工具已经安装配置完成，且QMK Firmware仓库已拷贝至本地。前往参阅[新人指引](zh-cn/newbs_getting_started.md)确保已完成初始配置。
+
+## Windows
+
+### 依赖项
+
+* [Git for Windows](https://git-scm.com/download/win) (该链接会自动提示你保存或运行安装包)
+
+  1. 除 `Git LFS (Large File Support)（大文件支援）` 及 `Check daily for Git for Windows updates（每天检查更新）` 外取消所有可选项。
+  2. 将默认编辑器改为 `Use Visual Studio Code as Git's default editor（将VS Code作为默认编辑器）`
+  3. 选择 `Use Git from Git Bash only（仅在Git Bash中使用Git）`，这是应使用的方案。
+  4. 在 `Choosing HTTPS transport backend（选择HTTPS传输服务）` 选项上，皆可。
+  5. 选择 `Checkout as-is, commit Unix-style line endings（检出不作更改，提交时使用Unix风格换行符）`，QMK仓库使用的是Unix style提交。
+  6. 在额外选项页，保持默认选择即可。
+
+  该软件是VS Code支持Git的所需项目，是有可能不去使用它，但直接用它会省很多事。
+
+* [Git Credential Manager for Windows（Windows版Git凭据管理器）](https://github.com/Microsoft/Git-Credential-Manager-for-Windows/releases) （可选）
+
+  该软件提供了更好的git 凭据加密存储、多因素身份认证（MFA）及私有访问token生成器。
+
+  这个不是严格必须的，但我们依旧推荐使用。
+
+
+### 安装VS Code
+
+1. 到[VS Code](https://code.visualstudio.com/)下载安装包
+2. 运行安装包
+
+很简单的操作。然而，仍有一些配置我们需要确保是设置正确的。
+
+### VS Code设置
+
+首先来配置IntelliSense，虽不是严格必要的，但能让你后续使用便捷**很多**。首先，在QMK Firmware目录下创建文件 `.vscode/c_cpp_properties.json`，之后的操作可以手动完成，但我已经完成了大部分。
+
+获取[这份文件](https://gist.github.com/drashna/48e2c49ce877be592a1650f91f8473e8)，如果你的MSYS2没有安装在默认路径，或在用WSL/LxSS，你可能需要做一下编辑修改。
+
+在保存妥当后，如果你有已打开的VS Code，你需要reload一下。
+
+?> 在 `.vscode` 目录下你应该还能看到 `extensions.json` 和 `settings.json` 文件。
+
+现在，我们配置MSYS2作为VSCode的集成终端。这么做有很多好处，最主要的是可以通过按住control点击错误消息直接跳转到文件，调试起来会简单得多，另外的好处是，你不用在窗口间切换。
+
+1. 点击 <kbd><kbd>文件</kbd> > <kbd>首选项 ></kbd> > <kbd>设置</kbd> </kbd>
+2. 点击上方右侧的 <kbd>{}</kbd> 按钮，打开 `settings.json` 文件。
+3. 将文件改为：
+
+   ```json
+   {
+        "terminal.integrated.profiles.windows": {
+            "QMK_MSYS": {
+                "path": "C:/QMK_MSYS/usr/bin/bash.exe",
+                "env": {
+                    "MSYSTEM": "MINGW64",
+                    "CHERE_INVOKING": "1"
+                },
+                "args": ["--login"]
+            }
+        },
+
+        "terminal.integrated.cursorStyle": "line"
+    }
+    ```
+
+   如果该文件内已经有一些配置项，将上面的内容粘贴在最外层的花括号内，并用一个逗号将新旧内容分隔开。
+
+?> 如果你的MSYS2安装在不同的目录下，你需要将 `terminal.integrated.shell.windows` 更改为你系统中正确的目录。
+
+4. 点击Ctrl-<code>&#96;</code> (Grave) 或在 <kbd><kbd>视图</kbd> > <kbd>终端</kbd></kbd> 可以打开终端界面 (`workbench.action.terminal.toggleTerminal` 命令)。如果没有终端它会自动打开一个。
+
+   终端应启动于工程目录中（即 `qmk_firmware` 目录），之后你可以构建键盘了。
+
+
+## 其它系统
+
+1. 到[VS Code](https://code.visualstudio.com/)下载安装包
+2. 运行安装包
+3. 搞定
+
+是的，确实是搞定了。安装的时候所有所需的路径配置都会被包含进来，在检查当前工程文件并进行IntelliSense解析上表现也会更好。
+
+## 插件
+
+有一些你可能感兴趣的扩展可以安装：<!-- 老外自己也分不清plugin和extension啊-_-||| -->
+
+* [Git Extension Pack](https://marketplace.visualstudio.com/items?itemName=donjayamanne.git-extension-pack) - 提供了一系列的Git工具可以让你在QMK Firmware中使用Git便捷一些。
+* [EditorConfig for VS Code](https://marketplace.visualstudio.com/items?itemName=EditorConfig.EditorConfig) - _[可选]_ -  可以让你的代码更符合QMK规范。
+* [Bracket Pair Colorizer 2](https://marketplace.visualstudio.com/items?itemName=CoenraadS.bracket-pair-colorizer-2) - _[可选]_ - 可以给大括号着色，可以更好地阅读嵌套代码。
+* [GitHub Markdown Preview](https://marketplace.visualstudio.com/items?itemName=bierner.github-markdown-preview) - _[可选]_ - 使得VS Code下的markdown预览更符合Github的效果。
+* [VS Live Share Extension Pack](https://marketplace.visualstudio.com/items?itemName=MS-vsliveshare.vsliveshare-pack) - _[可选]_ - 这个扩展允许他人访问你的工作区（或反之）进行协作，在你遇到问题需要他人帮助时挺有用。
+* [VIM Keymap](https://marketplace.visualstudio.com/items?itemName=GiuseppeCesarano.vim-keymap) - _[可选]_ - 为那些更喜欢VIM风格的按键操作的人所准备。这样的扩展还有挺多。
+
+安装扩展后需要重启VS Code。
+
+# 配置VS Code下的QMK
+1. 点击 <kbd><kbd>文件</kbd> > <kbd>打开目录</kbd></kbd>
+2. 打开你从Github克隆的QMK固件仓库所在目录。
+3. 点击 <kbd><kbd>文件</kbd> > <kbd>保存工作区为...</kbd></kbd>
+
+此时你已完成了在VS Code下编写QMK固件的准备工作。

From cc6017517d466ed2f7f409adda3066bc00930d44 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 29 Jan 2022 14:28:13 +0000
Subject: [PATCH 412/867] Planck/Preonic - Enable default encoder behaviour on
 configurator (#16104)

---
 keyboards/planck/planck.c   | 20 ++++++++++++++++++++
 keyboards/preonic/preonic.c | 20 ++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/keyboards/planck/planck.c b/keyboards/planck/planck.c
index a17036fcf1..e9bd90bdfe 100644
--- a/keyboards/planck/planck.c
+++ b/keyboards/planck/planck.c
@@ -27,3 +27,23 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_planck_grid(
 	12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
 	 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11
 );
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (get_highest_layer(layer_state) > 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    } else {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/preonic/preonic.c b/keyboards/preonic/preonic.c
index 16c99d9a80..2b56805202 100644
--- a/keyboards/preonic/preonic.c
+++ b/keyboards/preonic/preonic.c
@@ -7,3 +7,23 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT_preonic_grid(
   12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11
 );
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (get_highest_layer(layer_state) > 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    } else {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return true;
+}
+#endif

From d48bff834235cad7b356f56da92a908be60f141f Mon Sep 17 00:00:00 2001
From: IskandarMa <epiciskandar@gmail.com>
Date: Sun, 30 Jan 2022 00:06:19 +0800
Subject: [PATCH 413/867] [Docs] zh-cn documentation translate: hand-wire
 (#15666)

Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
---
 docs/zh-cn/hand_wire.md | 255 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 255 insertions(+)
 create mode 100644 docs/zh-cn/hand_wire.md

diff --git a/docs/zh-cn/hand_wire.md b/docs/zh-cn/hand_wire.md
new file mode 100644
index 0000000000..97e80251fe
--- /dev/null
+++ b/docs/zh-cn/hand_wire.md
@@ -0,0 +1,255 @@
+# 手工搭建指南
+
+<!---
+  original document: 0.15.17:docs/hand_wire.md 
+  git diff 0.15.17 HEAD -- docs/hand_wire.md  | cat
+-->
+
+## 模块清单
+
+你需要的模块有：（*x*为你设计的键盘的键数）
+
+* QMK所兼容的主控板（Teensy, Pro-Micro, QMK Proton C 等）
+* *x* 个键轴 （MX, Matias, Gateron 等）
+* *x* 个通孔二极管（译注：即普通的直插二极管）
+* 定位板及卫星轴
+* 电线
+* 电烙铁
+* 松香/焊油
+* 通风的环境/风扇通风
+* 剪线钳
+
+可选地但比较有用的：
+
+* 剥线钳/一把锋利的剪刀
+* 镊子及小尖嘴钳
+* 焊台/一位助手
+
+## 前期工作
+
+组装PCB矩阵的方法多种多样，这份指引会描述一些基础信息并给出一些推荐方案。
+
+既然我们要进行手工飞线搭建，这里就假设你已经有了定位板。如果你想构建完全定制化的配列，有 [ai03 Plate Generator](https://kbplate.ai03.me/) 以及 [Swillkb Plate & Case Builder](http://builder.swillkb.com/) 这样的工具可以助你设计出一个新的。
+
+首先从安装键轴及卫星轴开始，考虑厚度及材质的影响，可能需要热熔胶来固定。
+
+## 设计矩阵 :id=planning-the-matrix
+
+如果你在参考已有的手工搭建指南（比如[自制键盘固件目录](https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired)下的键盘），可以跳过该步骤，确保是按照文中的矩阵方案连线即可。
+
+如果你的方案是将每个开关的一个引脚与两边的开关相连（行方向），另一个引脚与上下的开关相连（列方向），并串联一个二极管到一端，最常用的方案是二极管背对着连接到行方向的引脚（列向行）。即让远离二极管黑线一端连接到开关上（电流只能从一个方向通过二极管）。
+
+可以很容易地设计出正交连接的键盘（如Planck）。
+（译注：这里的“正交”意思是行列方向连接规整）
+
+![Planck矩阵示例图](https://i.imgur.com/FRShcLD.png)
+[作者：RoastPotatoe "如何手工搭建Planck键盘"](https://blog.roastpotatoes.co/guide/2015/11/04/how-to-handwire-a-planck/) （英文）内的图例
+
+键盘配列越大，功能越丰富，则矩阵也会更复杂。[Keyboard Firmware Builder](https://kbfirmware.com/) 可以帮助你设计矩阵配列（下图为通过 [Keyboard Layout Editor](https://www.keyboard-layout-editor.com) 导出的全尺寸ISO键盘）。
+
+![ISO键盘矩阵示例图](https://i.imgur.com/UlJ4ZDP.png)
+
+必须时刻留意矩阵的行列数总和不能超出控制器的IO引脚数，因此上图的方案可以使用 Proton C 或 Teensy++ 控制器，但常规 Teensy 或 Pro Micro 不行。
+
+### 常见微控制器板 :id=common-microcontroller-boards
+
+| 控制器板       | 控制器方案     | # I/O引脚数  | 引脚图 |
+| :------------ |:-------------:| ------:| ------ |
+| Pro Micro*    | ATmega32u4    |     20 | [链接](https://learn.sparkfun.com/tutorials/pro-micro--fio-v3-hookup-guide/hardware-overview-pro-micro#Teensy++_2.0)       |
+| Teensy 2.0    | ATmega32u4    |     25 | [链接](https://www.pjrc.com/teensy/pinout.html)       |
+| [QMK Proton C](https://qmk.fm/proton-c/)      | STM32F303xC   |     36 | [链接 1](https://i.imgur.com/RhtrAlc.png), [2](https://deskthority.net/wiki/QMK_Proton_C)       |
+| Teensy++ 2.0  | AT90USB1286   |     46 | [链接](https://www.pjrc.com/teensy/pinout.html#Teensy_2.0)       |
+
+*Elite C 与 Pro Micro 除将 Micro USB 替换为 USB-C 外其余无差别。
+
+一些主控板专门为手工接线设计，除可直接连接少量开关外还有额外的引脚，但这些通常会更贵一些，也更难掌控。
+
+<img src="https://i.imgur.com/QiA3ta6.jpg" alt="实装的 Postage mini 主控板" width="500"/>
+
+| 控制器板       | 控制器方案    | # I/O引脚数  |
+| :------------ |:-------------:| ------:|
+| [Swiss helper](https://www.reddit.com/r/MechanicalKeyboards/comments/8jg5d6/hand_wiring_this_might_help/) |  ATmega32u4 | 20 |
+| [Postage 主控板](https://github.com/LifeIsOnTheWire/Postage-Board/)| ATmega32u4| 25 |
+| [Postage mini 主控板](https://geekhack.org/index.php?topic=101460.0)| ATmega32u4| 25 |
+
+## 矩阵布线
+
+布线方案不是唯一的，要达成的效果是可以正确连接所有的焊点并不会出现预期外的短路。
+
+公开的材料和技术方案：
+
+（译注：链接文章及标题恕不翻译）
+
+| 技术方案     | 示例 | 优点 | 缺点 | 图片
+| :-----------| :------- | :------ | :--- | :---
+| 间断开口的线缆 | [Sasha Solomon's Dactyl](https://medium.com/@sachee/building-my-first-keyboard-and-you-can-too-512c0f8a4c5f) 以及 [Cribbit's modern hand wire](https://geekhack.org/index.php?topic=87689.0) | 整洁 | 线缆开口的操作会有些困难 | ![开口的线缆](https://i.imgur.com/0GNIYY0.jpg)
+| 适宜长度的线缆 | [u/xicolinguada's ortho build](https://www.reddit.com/r/MechanicalKeyboards/comments/c39k4f/my_first_hand_wired_keyboard_its_not_perfect_but/) | 剥线容易 | 较难固定位置 | ![适宜长度的线缆](https://i.imgur.com/mBe5vkL.jpg)
+| 漆包线 | [fknraiden's custom board](https://geekhack.org/index.php?topic=74223.0) | 可以直接焊接（烧掉绝缘层） | 外观差？ | ![漆包线](https://i.imgur.com/b4b7KDb.jpg)
+| 弯折二极管引脚作为行方向连线 | [Matt3o's Brownfox](https://deskthority.net/viewtopic.php?f=7&t=6050) | 焊点更少 | 绝缘性差 | ![弯折了的二极管引脚](https://i.imgur.com/aTnG8TV.jpg)
+| 硬线（如铜管） | [u/d_stilgar's invisible hardline](https://www.reddit.com/r/MechanicalKeyboards/comments/8aw5j2/invisible_hardline_keyboard_progress_update_april/) 以及 [u/jonasfasler's first attempt](https://www.reddit.com/r/MechanicalKeyboards/comments/de1jyv/my_first_attempt_at_handwiring_a_keyboard/) | 非常漂亮 | 难度高，没有物理绝缘 | ![手工连接的硬线](https://i.imgur.com/CnASmPo.jpg)
+| 用绝缘胶带（如高温胶带*）隔离开的裸线 | [Matt3o's 65% on his website](https://matt3o.com/hand-wiring-a-custom-keyboard/) | 简单（不用剥线） | 丑拒 | ![裸线](https://i.imgur.com/AvXZShD.jpg)
+| 铜箔胶带 | [ManuForm Dactyl](https://github.com/tshort/dactyl-keyboard) | 非常简单 | 只适用于定位板/外壳与开关底部平齐的情况 | ![铜箔胶带](https://i.imgur.com/RFyNMlL.jpg)
+
+（*译注：原文是聚酰亚胺胶带，在中国通常叫高温胶带）
+
+
+以上方案可以结合使用，在焊接前请准备好各种长度的线缆。
+
+
+### 分体键盘的注意事项
+
+如果你想制作的是分体键盘（如Dactyl），每一半边都需要一个控制器以及连通两方的通信用线（如TRRS或硬连接线）。更多资料参见[QMK分体键盘文档](zh-cn/feature_split_keyboard.md)。
+（译注：TRRS即一种常用的4线耳机线插口，具体信息请查阅维基百科或[这份知乎文章](https://zhuanlan.zhihu.com/p/144233538)）
+
+
+### 焊接
+
+你可以找到很多焊接指导及技巧，这里列出了最相关及最关键的部分：
+
+要想焊接的牢固需要确保焊料与焊接两端的金属面充分地接触，一个好办法（也不是必须）是上锡前先（将线缆）在针脚上绕一圈或先拧在一起。
+
+<img src="https://i.imgur.com/eHJjmnU.jpg" alt="杆上绕圈" width="200"/> <img src="https://i.imgur.com/8nbxmmr.jpg?1" alt="绕环的二极管引脚" width="200"/>
+
+如果二极管还在包装条上且需要弯折（作为绕圈的起点处或用于连接到邻接处），一个简便的办法是找一个盒子、桌子或尺子的直边上进行弯折。由于弯折统一在二极管一侧，也有助于区分二极管的方向。
+
+<img src="https://i.imgur.com/oITudbX.jpg" alt="弯折二极管引脚" width="200"/>
+
+如果你的电烙铁有温控功能，将其设置在 315ºC（600ºF）。
+
+热起来后，给电烙铁上锡 - 即融化一部分锡料到烙铁头上然后立刻用湿海绵或烙铁头海绵擦掉，这样烙铁头上会有一层光滑明亮的焊料，以防止氧化且有助于焊料的焊接操作。
+
+接下来进行焊接，先将烙铁头在焊接面上接触一会儿进行加热，然后上焊料焊接两侧。加热焊接面的目的是为了确保焊料可以粘附且不会过早冷却下来。
+
+不能让焊料/焊点加热过度，热量会通过接触面烧毁原件（融毁开关外壳等）。并且，由于焊锡中有帮助[“浸润”](https://en.m.wikipedia.org/wiki/Wetting)（即上锡）的助焊剂，加热的越久助焊剂蒸发掉的越多，最终导致焊接点虚焊，除了看起来糟糕外，还有导致电路短路的风险。
+
+#### 焊接二极管
+
+从左上角的那个开关开始，将二极管放到开关上（用镊子，如果有的话）并纵向放直，有黑线的一端朝向你。让二极管间并联（二极管的阴极不应连接到其它二极管的阳极），二极管的阳极应连接到开关的左引脚上，而弯曲的阴极应朝向右边放置，如图：
+
+![soldering-diodes-01.png](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/docs/hand_wire/soldering-diodes-01.png)
+
+在放稳二极管后，拿起焊锡，将其与左轴脚同时接触到电烙铁上 - 在松香的帮助下焊锡会很容易地覆盖在二极管及轴脚上。二极管可能会有些位移，此时你可以抓住二极管另外一端弯折过的引脚，小心地放回到位置上 - 但请留意另一端是会迅速变得烫手的。如果二极管容易乱跑，可以使用尖嘴钳之类的东西在焊接时辅助保持稳固。
+
+松香加热时升起的烟有害，注意保护口鼻，不要熏到眼睛或皮肤。
+
+焊接到位时，可以将焊点升起的烟吹走以免熏脸，也能帮助焊点快速降温。焊点在冷却后会形成沙哑状（无光泽）的表面，但请注意此时它依旧非常烫，需要几分钟时间的冷却才可以触摸，多吹吹有助于快速冷却。
+
+在第一个二极管焊接完毕后，第二个二极管需要焊接轴脚以及上一个二极管弯折的那一端，看起来像这样：
+
+![soldering-diodes-02.png](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/docs/hand_wire/soldering-diodes-02.png)
+
+在焊接完毕一整行后，用剪线钳剪掉二极管上方（绕轴脚后多出的部分），以及这一行最后侧多出来的引脚部分。在每一行焊接完毕后都要记得这一步。
+
+在你完成了所有的二极管的焊接工作后，最好是逐一测试一下以确保焊接牢固稳定 - 再往后不是不能回头修正，但会越来越困难。
+
+#### 纵向上的焊接
+
+这一步你有几个可选项需考虑 - 给横向电缆进行绝缘处理是个好主意（毕竟二极管没有绝缘层），但如果你足够小心，横向电缆裸露着也行 - 但仍旧不建议这么做。如果你用的是单芯线，先将外皮整个褪下来再酌情装回去可能是最好的办法，但会因尺寸及材质原因造成操作困难，你可以将线缆上需要焊接到开关轴的部分裸露出来。
+
+如果你使用多股线/铜绞线，可能最简单的方案就是用不固定长度的小段电线来纵向连接开关。通过融化掉焊接点的外皮的方式来用一整根线不是不可以，但这里不推荐这样做，这种操作会产生更多的有害烟尘，也会毁掉你的电烙铁。
+
+在进行焊接操作前，先预弯折好线缆（如果是单芯线），或至少心中已经规划好焊接路线顺序（特别是你要做的设计是错列的时）。实际上焊接顺序不是特别重要，因为我们是通过焊接方案来确定键映射定义的 - 只要确保一行上的所有按键都有独自的列，且从左到右依次排列。
+
+如果你不做任何的绝缘处理，可以将纵向的线升高一些，焊接在轴脚尖端上 - 如果线缆本身足够稳固，不会短路到连接着二极管的横线线缆上。
+
+## 连接控制器
+
+在矩阵焊接完成后，可以将其焊接到微控制器板上了。
+
+将微控制器放在预期的位置上，同时要考虑到安装及外壳对齐问题。须记得USB槽的位置是可以与微控制器分开的，只需使用一小段公对母线接驳下即可。
+
+找到微控制器板的引脚定义/文档（[链接](#common-microcontroller-boards)）并将所有的I/O引脚标出来（留意像teensy这种的控制器，模拟I/O引脚可能是数字I/O引脚的两倍），将线缆连接到这些引脚上。
+
+----
+
+### 针对 Teensy 2.0 的特殊说明
+
+Teensy 上的部分引脚有点特殊，像 D6（片上LED），及一些 UART、SPI、I2C或PWM通道，不过只是在你计划着在键盘上还有其它功能设计时才需避免使用。如果你还不是很确定以后会不会增加什么功能上去，引脚应该还是足够充足到可以剩一部分出来的。
+
+那些无论在什么控制器上都不应去使用的引脚，有：GND、VCC、AREF以及RST - 其它所有引脚都是可以用且也能在固件中访问的到的。
+
+----
+
+
+将电线切割为控制器到各行/列上某一点距离的长度。可以焊到各行的任意位置上，只需要确保是在二极管之后 - 焊接到二极管前面（轴脚侧）的话该行将无法正常使用。
+
+这里用排线的话会显得非常整洁，你也可以考虑如何排布线缆以连接到各行/列的近处。
+
+<img src="https://i.imgur.com/z2QlKfB.jpg" alt="排线" width="350"/>
+
+在往控制器上焊接电线时，请记住各引脚连接的是哪一行/列，在后续制作固件时我们需要用到这些信息来定义矩阵。
+
+在你往下继续以前，请确保控制器已装配到位 - 切掉线缆再重新焊接非常麻烦！
+
+
+## 一些基础的固件配置
+
+至此，在你构建好固件后，键盘就应该能正常工作了。
+
+通过 [Keyboard Firmware Builder](https://kbfirmware.com/) 网站可以轻松地创建一个简单的固件。通过 [Keyboard Layout Editor](https://www.keyboard-layout-editor.com) 可以自己制作配列数据，之后就可以导入进来并重新构建矩阵信息（如果你没有在先前的 [设计矩阵](#planning-the-matrix) 完成的话）。
+
+继续完成剩下的步骤，在逐一配置完所有的按键后就可以编译下载固件了。其中 .hex 文件可以用来直接刷写到键盘上，而 .zip 包中的源代码可以用来添加高级功能并通过 [构建第一个固件](zh-cn/newbs_building_firmware?id=build-your-firmware) 中详述的方法进行本地构建。
+
+Keyboard Firmware Builder提供的源代码是QMK的，但版本是2017年初的。如果要用现今版本的QMK来构建 .zip 中的源代码，需要在打开 .zip 后遵循以下几步：
+
+1. 解压 `kb` 目录到 `qmk_firmware/keyboards/handwired/`。
+2. 进入解压的 `kb` 目录，转到 `keymaps/default/` 目录下，打开 `keymap.c`。
+3. 找到并删除 `action_get_macro` 代码段：
+   ```
+    const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+        ...
+        return MACRO_NONE;
+    }
+   ```
+4. 保存并关闭 `keymap.c`。
+
+## 刷写固件
+
+安装 [QMK Toolbox](https://github.com/qmk/qmk_toolbox).
+
+![QMK Toolbox](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/docs/hand_wire/qmk_toolbox.png "QMK Toolbox 0.0.16 on Windows 8.1")
+
+在 “Local File” 栏处定位到你新创建的 .hex 文件，在 “MicroController” 中选择你的控制器板（常见型号[这里](#common-microcontroller-boards)有）。
+
+插上你的键盘后在QMK Toolbox中点击reset（重置）按钮（如果没有重置按钮，短接一下Reset和接地引脚）再点击“Flash”（刷写）按钮。
+
+
+## 测试固件
+
+可以用 [QMK配置器的键盘测试器](https://config.qmk.fm/#/test)、[Keyboard Tester](https://www.keyboardtester.com/tester.html) 或 [Keyboard Checker](https://keyboardchecker.com/) 进行测试，也可以打开一个文本编辑器并试着输入 - 你应该能成功输入键映射方案中的所有字符。对每个按键进行测试，并记录下不能正常工作的按键。对这些不能正常工作的按键，这里有一个快速排查指引：
+
+1. 将键盘翻过来，用一段金属物短接一下轴脚 - 这么做可以排除掉需要更换掉的坏轴的可能性。
+2. 检查轴脚上的焊点 - 应该是饱满且完整覆盖的。如果你稍加用力就能将其弄下来，那么就是焊接不到位。
+3. 检查二极管的焊点 - 如果二极管虚焊了，部分行可以使用，但其它的可能就不行了。
+4. 检查连接到各行的焊点 - 如果这里虚焊了，这些行就无法正常使用。
+5. 检查 Teensy 两侧的进/出线的焊点 - 两侧的线缆都必须确保已被良好地焊接。
+6. 检查 `<project_name>.h` 文件中是否有错误或不当的 `KC_NO` - 如果不确定在哪里，用已有的 k*xy* 变量替换一下。
+7. 检查固件文件确实经过编译且正确刷写到Teensy上了。除非你在终端看到了错误消息，或是刷写时出现了弹框，否则一切应该是正常的。
+8. 使用万用表实测一下，触发开关时是否成功闭合（按下时可以连通电路）。
+
+如果你完成了上述所有检查，应当留意有时可能是多种因素共同造成了开关的异常，因此最后将其短路掉来排查问题并没有什么害处。
+
+## 即将完成
+
+在确认键盘可以正常使用后，如果你用的是独立的控制器模块（非手工构建用），须将其固定好。办法有很多，比如热熔胶、双面胶带、3D打印的盒子、电工胶带等。
+
+如果你觉得成就感满满，可以试着增加一些额外的功能，比如 [轴内LED](https://geekhack.org/index.php?topic=94258.0)，[轴内RGB](https://www.reddit.com/r/MechanicalKeyboards/comments/5s1l5u/photoskeyboard_science_i_made_a_handwired_rgb/)，[RGB背光](https://medium.com/@DavidNZ/hand-wired-custom-keyboard-cdd14429c7b3#.7a1ovebsk) 甚至可以是 [OLED显示屏！](https://www.reddit.com/r/olkb/comments/5zy7og/adding_ssd1306_oled_display_to_your_build/) 
+
+固件的潜力非常大 - 阅览 [docs.qmk.fm](https://docs.qmk.fm) 可以看到全部功能的列表，也能深入了解人们是如何使用那些五花八门的键盘的。随时欢迎到 [OLKB subreddit](https://reddit.com/r/olkb) 或 [QMK Discord](https://discord.gg/Uq7gcHh) 上寻求帮助！
+
+## 其它指引链接
+
+- [matt3o 的分步指引 (BrownFox build)](https://deskthority.net/viewtopic.php?f=7&t=6050) 以及他的 [个人站点](https://matt3o.com/hand-wiring-a-custom-keyboard/) 和 [指导视频](https://www.youtube.com/watch?v=LVzpsjFWPP4)
+- [Cribbit：“现代化的手工搭建指南 - 强大，简洁，友好”](https://geekhack.org/index.php?topic=87689.0) 
+- [Sasha Solomon：“打造我的第一把键盘”](https://medium.com/@sachee/building-my-first-keyboard-and-you-can-too-512c0f8a4c5f)
+- [RoastPotatoe： “如何手工搭建Planck键盘”](https://blog.roastpotatoes.co/guide/2015/11/04/how-to-handwire-a-planck/)
+- [Masterzen：“手工搭建键盘记录”](https://www.masterzen.fr/2018/12/16/handwired-keyboard-build-log-part-1/)
+
+
+# 遗留内容
+
+以前本页内还有其它内容，现在我们已经将他们单独分离出去了。以下的内容是一些重定向链接，以供那些从老链接地址过来的人能找到自己要找的内容。
+
+## 序: 键盘矩阵是如何工作的（以及为什么需要二极管） :id=preamble-how-a-keyboard-matrix-works-and-why-we-need-diodes
+
+* [键盘矩阵是如何工作的](zh-cn/how_a_matrix_works.md)

From 3307a8e057bcd2590f6943d954647c520a823458 Mon Sep 17 00:00:00 2001
From: Alex Grover <hello@alexgrover.me>
Date: Sat, 29 Jan 2022 11:27:29 -0700
Subject: [PATCH 414/867] [Keymap] Add media keys to default UT47.2 keymap
 (#15893)

---
 keyboards/planck/keymaps/default/keymap.c | 6 +++---
 keyboards/ut472/keymaps/default/keymap.c  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index 7c787e0366..b5ec2e8082 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * ,-----------------------------------------------------------------------------------.
  * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  '   |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
@@ -80,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Dvorak
  * ,-----------------------------------------------------------------------------------.
- * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
+ * | Tab  |   '  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
  * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
diff --git a/keyboards/ut472/keymaps/default/keymap.c b/keyboards/ut472/keymaps/default/keymap.c
index c6509e97a6..e303f2220c 100644
--- a/keyboards/ut472/keymaps/default/keymap.c
+++ b/keyboards/ut472/keymaps/default/keymap.c
@@ -68,7 +68,7 @@ LAYOUT( /* Right */
    * |-------------------------------------------------------------------------+
    * |       | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 |     |
    * |-------------------------------------------------------------------------+
-   * |     |     |     |Capsl|      |          |       | Home| PgDn| PgUp| End |
+   * |     |     |     |Capsl|      |          |       | Next| Vol-| Vol+| Play|
    * `-------------------------------------------------------------------------'
    */
 
@@ -76,7 +76,7 @@ LAYOUT( /* Left */
   KC_TILDE,  KC_EXCLAIM,  KC_AT,  KC_HASH,  KC_DOLLAR, KC_PERCENT, KC_CIRCUMFLEX, KC_AMPERSAND, KC_ASTERISK, KC_LEFT_PAREN, KC_RIGHT_PAREN, KC_DELETE,
   _______, _______, _______, _______, _______, _______, _______, KC_UNDERSCORE, KC_PLUS, KC_LEFT_CURLY_BRACE, KC_RIGHT_CURLY_BRACE, KC_PIPE,
   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
-  _______, _______, _______, KC_CAPS, _______,     _______,      _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
+  _______, _______, _______, KC_CAPS, _______,     _______,      _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
 ),
 
   /* FN Layer 3

From 2100a7ca7b67eabba43ead29a49e630de24c835e Mon Sep 17 00:00:00 2001
From: Felipe Bastos <felipe.v.b@icloud.com>
Date: Sat, 29 Jan 2022 13:28:00 -0500
Subject: [PATCH 415/867] Move kbdpad_mk2 to kbdpad/mk2, add numpad layout to
 mk2.h (#15892)

---
 .../{kbdpad_mk2 => kbdpad/mk2}/config.h       |  0
 .../{kbdpad_mk2 => kbdpad/mk2}/info.json      |  0
 .../mk2}/keymaps/default/keymap.c             | 10 ++---
 .../mk2}/keymaps/default/readme.md            |  0
 .../mk2}/keymaps/iracing_replay/keymap.c      |  0
 .../mk2}/keymaps/iracing_replay/readme.md     |  0
 .../mk2}/keymaps/iracing_replay/rules.mk      |  0
 .../mk2}/keymaps/tester/keymap.c              |  0
 .../mk2}/keymaps/tester/readme.md             |  0
 .../mk2}/keymaps/via/keymap.c                 |  0
 .../mk2}/keymaps/via/rules.mk                 |  0
 .../kbdpad_mk2.c => kbdpad/mk2/mk2.c}         |  2 +-
 .../kbdpad_mk2.h => kbdpad/mk2/mk2.h}         | 37 ++++++++++++++-----
 .../{kbdpad_mk2 => kbdpad/mk2}/readme.md      |  0
 .../{kbdpad_mk2 => kbdpad/mk2}/rules.mk       |  0
 15 files changed, 33 insertions(+), 16 deletions(-)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/config.h (100%)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/info.json (100%)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/keymaps/default/keymap.c (81%)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/keymaps/default/readme.md (100%)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/keymaps/iracing_replay/keymap.c (100%)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/keymaps/iracing_replay/readme.md (100%)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/keymaps/iracing_replay/rules.mk (100%)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/keymaps/tester/keymap.c (100%)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/keymaps/tester/readme.md (100%)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/keymaps/via/keymap.c (100%)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/keymaps/via/rules.mk (100%)
 rename keyboards/kbdfans/{kbdpad_mk2/kbdpad_mk2.c => kbdpad/mk2/mk2.c} (96%)
 rename keyboards/kbdfans/{kbdpad_mk2/kbdpad_mk2.h => kbdpad/mk2/mk2.h} (62%)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/readme.md (100%)
 rename keyboards/kbdfans/{kbdpad_mk2 => kbdpad/mk2}/rules.mk (100%)

diff --git a/keyboards/kbdfans/kbdpad_mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h
similarity index 100%
rename from keyboards/kbdfans/kbdpad_mk2/config.h
rename to keyboards/kbdfans/kbdpad/mk2/config.h
diff --git a/keyboards/kbdfans/kbdpad_mk2/info.json b/keyboards/kbdfans/kbdpad/mk2/info.json
similarity index 100%
rename from keyboards/kbdfans/kbdpad_mk2/info.json
rename to keyboards/kbdfans/kbdpad/mk2/info.json
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/default/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/default/keymap.c
similarity index 81%
rename from keyboards/kbdfans/kbdpad_mk2/keymaps/default/keymap.c
rename to keyboards/kbdfans/kbdpad/mk2/keymaps/default/keymap.c
index fb9b074587..3213eca482 100644
--- a/keyboards/kbdfans/kbdpad_mk2/keymaps/default/keymap.c
+++ b/keyboards/kbdfans/kbdpad/mk2/keymaps/default/keymap.c
@@ -19,10 +19,10 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_ortho_6x4( /* Base */
     KC_ESC,  KC_LCTL, KC_LALT, KC_BSPC,
-	KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
-	KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-	KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
-	KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-	KC_P0,   KC_P0,   KC_PDOT, KC_PENT
+    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_P0,   KC_P0,   KC_PDOT, KC_PENT
   ),
 };
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/default/readme.md b/keyboards/kbdfans/kbdpad/mk2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kbdfans/kbdpad_mk2/keymaps/default/readme.md
rename to keyboards/kbdfans/kbdpad/mk2/keymaps/default/readme.md
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c
similarity index 100%
rename from keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/keymap.c
rename to keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/keymap.c
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/readme.md b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/readme.md
similarity index 100%
rename from keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/readme.md
rename to keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/readme.md
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/rules.mk b/keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/rules.mk
similarity index 100%
rename from keyboards/kbdfans/kbdpad_mk2/keymaps/iracing_replay/rules.mk
rename to keyboards/kbdfans/kbdpad/mk2/keymaps/iracing_replay/rules.mk
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/tester/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/tester/keymap.c
similarity index 100%
rename from keyboards/kbdfans/kbdpad_mk2/keymaps/tester/keymap.c
rename to keyboards/kbdfans/kbdpad/mk2/keymaps/tester/keymap.c
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/tester/readme.md b/keyboards/kbdfans/kbdpad/mk2/keymaps/tester/readme.md
similarity index 100%
rename from keyboards/kbdfans/kbdpad_mk2/keymaps/tester/readme.md
rename to keyboards/kbdfans/kbdpad/mk2/keymaps/tester/readme.md
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/via/keymap.c b/keyboards/kbdfans/kbdpad/mk2/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/kbdfans/kbdpad_mk2/keymaps/via/keymap.c
rename to keyboards/kbdfans/kbdpad/mk2/keymaps/via/keymap.c
diff --git a/keyboards/kbdfans/kbdpad_mk2/keymaps/via/rules.mk b/keyboards/kbdfans/kbdpad/mk2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kbdfans/kbdpad_mk2/keymaps/via/rules.mk
rename to keyboards/kbdfans/kbdpad/mk2/keymaps/via/rules.mk
diff --git a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c b/keyboards/kbdfans/kbdpad/mk2/mk2.c
similarity index 96%
rename from keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c
rename to keyboards/kbdfans/kbdpad/mk2/mk2.c
index 1d6e1642b9..2449724126 100644
--- a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c
+++ b/keyboards/kbdfans/kbdpad/mk2/mk2.c
@@ -13,4 +13,4 @@
  * 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 "kbdpad_mk2.h"
+#include "mk2.h"
diff --git a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.h b/keyboards/kbdfans/kbdpad/mk2/mk2.h
similarity index 62%
rename from keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.h
rename to keyboards/kbdfans/kbdpad/mk2/mk2.h
index 328aeaac9b..0dfa995fe2 100644
--- a/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.h
+++ b/keyboards/kbdfans/kbdpad/mk2/mk2.h
@@ -27,17 +27,34 @@
  */
 #define LAYOUT_ortho_6x4( \
     K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21, K22, K23, \
-	K30, K31, K32, K33, \
-	K40, K41, K42, K43, \
-	K50, K51, K52, K53  \
+    K10, K11, K12, K13, \
+    K20, K21, K22, K23, \
+    K30, K31, K32, K33, \
+    K40, K41, K42, K43, \
+    K50, K51, K52, K53  \
 ) \
 { \
     { K00, K01, K02, K03 }, \
-	{ K10, K11, K12, K13 }, \
-	{ K20, K21, K22, K23 }, \
-	{ K30, K31, K32, K33 }, \
-	{ K40, K41, K42, K43 }, \
-	{ K50, K51, K52, K53 }  \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, K23 }, \
+    { K30, K31, K32, K33 }, \
+    { K40, K41, K42, K43 }, \
+    { K50, K51, K52, K53 }  \
+}
+
+#define LAYOUT_numpad_6x4( \
+    K00, K01, K02, K03, \
+    K10, K11, K12, K13, \
+    K20, K21, K22, \
+    K30, K31, K32, K33, \
+    K40, K41, K42, \
+    K50,      K52, K53  \
+) \
+{ \
+    { K00, K01,   K02, K03 }, \
+    { K10, K11,   K12, K13 }, \
+    { K20, K21,   K22, KC_NO }, \
+    { K30, K31,   K32, K33 }, \
+    { K40, K41,   K42, KC_NO }, \
+    { K50, KC_NO, K52, K53 } \
 }
diff --git a/keyboards/kbdfans/kbdpad_mk2/readme.md b/keyboards/kbdfans/kbdpad/mk2/readme.md
similarity index 100%
rename from keyboards/kbdfans/kbdpad_mk2/readme.md
rename to keyboards/kbdfans/kbdpad/mk2/readme.md
diff --git a/keyboards/kbdfans/kbdpad_mk2/rules.mk b/keyboards/kbdfans/kbdpad/mk2/rules.mk
similarity index 100%
rename from keyboards/kbdfans/kbdpad_mk2/rules.mk
rename to keyboards/kbdfans/kbdpad/mk2/rules.mk

From d59c982d17f8e0596bc362c3b095f6d409975a97 Mon Sep 17 00:00:00 2001
From: Bahrul Hidayat <dayat.py@gmail.com>
Date: Sun, 30 Jan 2022 02:28:38 +0800
Subject: [PATCH 416/867] [Keyboard] add synthesis60 (#15864)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/dyz/synthesis60/config.h            |  37 ++++++
 keyboards/dyz/synthesis60/info.json           | 113 ++++++++++++++++++
 .../dyz/synthesis60/keymaps/default/keymap.c  |  56 +++++++++
 .../dyz/synthesis60/keymaps/via/keymap.c      |  56 +++++++++
 .../dyz/synthesis60/keymaps/via/rules.mk      |   1 +
 keyboards/dyz/synthesis60/rules.mk            |  20 ++++
 keyboards/dyz/synthesis60/synthesis60.c       |  31 +++++
 keyboards/dyz/synthesis60/synthesis60.h       |  41 +++++++
 8 files changed, 355 insertions(+)
 create mode 100644 keyboards/dyz/synthesis60/config.h
 create mode 100644 keyboards/dyz/synthesis60/info.json
 create mode 100644 keyboards/dyz/synthesis60/keymaps/default/keymap.c
 create mode 100644 keyboards/dyz/synthesis60/keymaps/via/keymap.c
 create mode 100644 keyboards/dyz/synthesis60/keymaps/via/rules.mk
 create mode 100644 keyboards/dyz/synthesis60/rules.mk
 create mode 100644 keyboards/dyz/synthesis60/synthesis60.c
 create mode 100644 keyboards/dyz/synthesis60/synthesis60.h

diff --git a/keyboards/dyz/synthesis60/config.h b/keyboards/dyz/synthesis60/config.h
new file mode 100644
index 0000000000..8b14dd4fe6
--- /dev/null
+++ b/keyboards/dyz/synthesis60/config.h
@@ -0,0 +1,37 @@
+/*
+Copyright 2022 dayatz
+
+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 MANUFACTURER    dyz
+#define PRODUCT         Synthesis60 v2.1
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+#define LED_CAPS_LOCK_PIN D5
+#define LED_NUM_LOCK_PIN C7
+#define LED_PIN_ON_STATE 0
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/info.json
new file mode 100644
index 0000000000..381e7efb36
--- /dev/null
+++ b/keyboards/dyz/synthesis60/info.json
@@ -0,0 +1,113 @@
+{
+    "keyboard_name": "synthesis60",
+    "url": "https://github.com/dayatz/mechanical-keyboards/tree/master/synthesis60",
+    "maintainer": "dayatz",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": [
+            "F7",
+            "F6",
+            "F5",
+            "F4",
+            "F1",
+            "F0",
+            "D7",
+            "D3",
+            "D2",
+            "E6",
+            "B3",
+            "B2",
+            "B1",
+            "B0"
+        ],
+        "rows": ["B4", "B5", "B6", "D6", "D4"]
+    },
+    "rgblight": {
+        "led_count": 19,
+        "pin": "B7",
+        "hue_steps": 10,
+        "saturation_steps": 10,
+        "brightness_steps": 10,
+        "animations": {
+            "all": true
+        }
+    },
+    "usb": {
+        "vid": "0xD772",
+        "pid": "0x0017",
+        "device_ver": "0x0001"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Home", "x": 0, "y": 0 },
+                { "label": "~", "x": 1.25, "y": 0 },
+                { "label": "!", "x": 2.25, "y": 0 },
+                { "label": "@", "x": 3.25, "y": 0 },
+                { "label": "#", "x": 4.25, "y": 0 },
+                { "label": "$", "x": 5.25, "y": 0 },
+                { "label": "%", "x": 6.25, "y": 0 },
+                { "label": "^", "x": 7.25, "y": 0 },
+                { "label": "&", "x": 10.25, "y": 0 },
+                { "label": "*", "x": 11.25, "y": 0 },
+                { "label": "(", "x": 12.25, "y": 0 },
+                { "label": ")", "x": 13.25, "y": 0 },
+                { "label": "_", "x": 14.25, "y": 0 },
+                { "label": "+", "x": 15.25, "y": 0 },
+                { "label": "|", "x": 16.25, "y": 0 },
+                { "label": "~", "x": 17.25, "y": 0 },
+                { "label": "PgUp", "x": 0, "y": 1 },
+                { "label": "Tab", "x": 1.25, "y": 1, "w": 1.5 },
+                { "label": "Q", "x": 2.75, "y": 1 },
+                { "label": "W", "x": 3.75, "y": 1 },
+                { "label": "E", "x": 4.75, "y": 1 },
+                { "label": "R", "x": 5.75, "y": 1 },
+                { "label": "T", "x": 6.75, "y": 1 },
+                { "label": "Y", "x": 9.75, "y": 1 },
+                { "label": "U", "x": 10.75, "y": 1 },
+                { "label": "I", "x": 11.75, "y": 1 },
+                { "label": "O", "x": 12.75, "y": 1 },
+                { "label": "P", "x": 13.75, "y": 1 },
+                { "label": "{", "x": 14.75, "y": 1 },
+                { "label": "}", "x": 15.75, "y": 1 },
+                { "label": "Backspace", "x": 16.75, "y": 1, "w": 1.5 },
+                { "label": "PgDn", "x": 0, "y": 2 },
+                { "label": "Caps Lock", "x": 1.25, "y": 2, "w": 1.75 },
+                { "label": "A", "x": 3, "y": 2 },
+                { "label": "S", "x": 4, "y": 2 },
+                { "label": "D", "x": 5, "y": 2 },
+                { "label": "F", "x": 6, "y": 2 },
+                { "label": "G", "x": 7, "y": 2 },
+                { "label": "H", "x": 10, "y": 2 },
+                { "label": "J", "x": 11, "y": 2 },
+                { "label": "K", "x": 12, "y": 2 },
+                { "label": "L", "x": 13, "y": 2 },
+                { "label": ":", "x": 14, "y": 2 },
+                { "label": "\"", "x": 15, "y": 2 },
+                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
+                { "label": "Shift", "x": 1.25, "y": 3, "w": 2.25 },
+                { "label": "Z", "x": 3.5, "y": 3 },
+                { "label": "X", "x": 4.5, "y": 3 },
+                { "label": "C", "x": 5.5, "y": 3 },
+                { "label": "V", "x": 6.5, "y": 3 },
+                { "label": "B", "x": 7.5, "y": 3 },
+                { "label": "B", "x": 9.5, "y": 3 },
+                { "label": "N", "x": 10.5, "y": 3 },
+                { "label": "M", "x": 11.5, "y": 3 },
+                { "label": "<", "x": 12.5, "y": 3 },
+                { "label": ">", "x": 13.5, "y": 3 },
+                { "label": "?", "x": 14.5, "y": 3 },
+                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
+                { "label": "Fn", "x": 17.25, "y": 3 },
+                { "label": "Ctrl", "x": 1.25, "y": 4, "w": 1.5 },
+                { "label": "Alt", "x": 4, "y": 4, "w": 1.5 },
+                { "label": "Space", "x": 5.5, "y": 4, "w": 2.25 },
+                { "label": "Space", "x": 7.75, "y": 4 },
+                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
+                { "label": "Space", "x": 11, "y": 4, "w": 1.25 },
+                { "label": "Alt", "x": 12.25, "y": 4, "w": 1.5 },
+                { "label": "Ctrl", "x": 16.75, "y": 4, "w": 1.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/dyz/synthesis60/keymaps/default/keymap.c b/keyboards/dyz/synthesis60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5cf1b94cf3
--- /dev/null
+++ b/keyboards/dyz/synthesis60/keymaps/default/keymap.c
@@ -0,0 +1,56 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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 layer_names {
+    _BASE,
+    _FN,
+    _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all( /* Base */
+    KC_HOME, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    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_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,         KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,
+             KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_B, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_DEL,
+             KC_LCTL,                    KC_LALT, KC_SPC, MO(1),                 KC_SPC, KC_SPC, KC_RALT, KC_RCTL
+  ),
+  [_FN] = LAYOUT_all(
+    RGB_TOG, _______,  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_VOLU, _______,  _______,    KC_HOME,    KC_UP,    KC_END,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,
+    KC_VOLD, _______, _______,    KC_LEFT,    KC_DOWN,    KC_RIGHT,    _______,    _______,    _______,    _______,    _______,    _______, _______,                   _______,
+             _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,
+             _______,          _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+  [_FN2] = LAYOUT_all(
+    _______, _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______, _______,
+    _______, _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,
+    _______, _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,                   _______,
+             _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,
+             _______,          _______, _______, _______, _______, _______, _______, _______, _______
+  )
+};
+
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    if (get_highest_layer(state) != 0) {
+        writePinLow(C6);
+    } else {
+        writePinHigh(C6);
+    }
+    return state;
+}
diff --git a/keyboards/dyz/synthesis60/keymaps/via/keymap.c b/keyboards/dyz/synthesis60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..5cf1b94cf3
--- /dev/null
+++ b/keyboards/dyz/synthesis60/keymaps/via/keymap.c
@@ -0,0 +1,56 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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 layer_names {
+    _BASE,
+    _FN,
+    _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_all( /* Base */
+    KC_HOME, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,         KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    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_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,         KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,
+             KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_B, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_DEL,
+             KC_LCTL,                    KC_LALT, KC_SPC, MO(1),                 KC_SPC, KC_SPC, KC_RALT, KC_RCTL
+  ),
+  [_FN] = LAYOUT_all(
+    RGB_TOG, _______,  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_VOLU, _______,  _______,    KC_HOME,    KC_UP,    KC_END,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,
+    KC_VOLD, _______, _______,    KC_LEFT,    KC_DOWN,    KC_RIGHT,    _______,    _______,    _______,    _______,    _______,    _______, _______,                   _______,
+             _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,
+             _______,          _______, _______, _______, _______, _______, _______, _______, _______
+  ),
+  [_FN2] = LAYOUT_all(
+    _______, _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______, _______,
+    _______, _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,
+    _______, _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,                   _______,
+             _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,
+             _______,          _______, _______, _______, _______, _______, _______, _______, _______
+  )
+};
+
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    if (get_highest_layer(state) != 0) {
+        writePinLow(C6);
+    } else {
+        writePinHigh(C6);
+    }
+    return state;
+}
diff --git a/keyboards/dyz/synthesis60/keymaps/via/rules.mk b/keyboards/dyz/synthesis60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/dyz/synthesis60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/dyz/synthesis60/rules.mk b/keyboards/dyz/synthesis60/rules.mk
new file mode 100644
index 0000000000..fe65a2143c
--- /dev/null
+++ b/keyboards/dyz/synthesis60/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no
+OLED_ENABLE = yes
diff --git a/keyboards/dyz/synthesis60/synthesis60.c b/keyboards/dyz/synthesis60/synthesis60.c
new file mode 100644
index 0000000000..c56a61b1ec
--- /dev/null
+++ b/keyboards/dyz/synthesis60/synthesis60.c
@@ -0,0 +1,31 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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 "synthesis60.h"
+
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+    if (!oled_task_kb()) { return false; }
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Synthesis60\nLayer: "), false);
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+
+    return true;
+}
+#endif
diff --git a/keyboards/dyz/synthesis60/synthesis60.h b/keyboards/dyz/synthesis60/synthesis60.h
new file mode 100644
index 0000000000..0ad730e128
--- /dev/null
+++ b/keyboards/dyz/synthesis60/synthesis60.h
@@ -0,0 +1,41 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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 KNO KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+	K40, K00, K01, K02, K03, K04, K05, K06,     K07, K08, K09, K0A, K0B, K0C, K0D, K4D, \
+    K41, K10, K11, K12, K13, K14, K15,          K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K42, K20, K21, K22, K23, K24, K25,          K26, K27, K28, K29, K2A, K2B, K2C,     \
+         K30, K31, K32, K33, K34, K35,          K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+         K43,           K44, K45, K46,          K47, K48, K49,                     K4C \
+) { \
+	{ K00,  K01,  K02,  K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+	{ K10,  K11,  K12,  K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+	{ K20,  K21,  K22,  K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KNO }, \
+	{ K30,  K31,  K32,  K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+	{ K40,  K41,  K42,  K43, K44, K45, K46, K47, K48, K49, KNO, KNO, K4C, K4D }  \
+}

From dd9bbd8d4a7e794ac42edb7e49700bed65645435 Mon Sep 17 00:00:00 2001
From: ojthetiny <65928618+ojthetiny@users.noreply.github.com>
Date: Sat, 29 Jan 2022 18:49:54 +0000
Subject: [PATCH 417/867] [Keyboard] Add the demiurge keyboard (#16074)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/demiurge/config.h                 | 79 +++++++++++++++++++++
 keyboards/demiurge/demiurge.c               | 18 +++++
 keyboards/demiurge/demiurge.h               | 36 ++++++++++
 keyboards/demiurge/info.json                | 10 +++
 keyboards/demiurge/keymaps/default/keymap.c | 39 ++++++++++
 keyboards/demiurge/keymaps/via/keymap.c     | 54 ++++++++++++++
 keyboards/demiurge/keymaps/via/rules.mk     |  1 +
 keyboards/demiurge/readme.md                | 24 +++++++
 keyboards/demiurge/rules.mk                 | 18 +++++
 9 files changed, 279 insertions(+)
 create mode 100755 keyboards/demiurge/config.h
 create mode 100755 keyboards/demiurge/demiurge.c
 create mode 100755 keyboards/demiurge/demiurge.h
 create mode 100644 keyboards/demiurge/info.json
 create mode 100755 keyboards/demiurge/keymaps/default/keymap.c
 create mode 100755 keyboards/demiurge/keymaps/via/keymap.c
 create mode 100755 keyboards/demiurge/keymaps/via/rules.mk
 create mode 100644 keyboards/demiurge/readme.md
 create mode 100755 keyboards/demiurge/rules.mk

diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h
new file mode 100755
index 0000000000..abe6c193c4
--- /dev/null
+++ b/keyboards/demiurge/config.h
@@ -0,0 +1,79 @@
+/*
+Copyright 2021 ojthetiny
+
+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       0x6F6A
+#define PRODUCT_ID      0x6475
+#define DEVICE_VER      0x0001    
+#define PRODUCT         Demiurge
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 17
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F0, F4, F6, F7, C7 }
+#define MATRIX_COL_PINS { E6, F5, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B7, B3, B2 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* number of backlight levels */
+
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 1
+#endif
+
+#define RGB_DI_PIN F1
+#ifdef RGB_DI_PIN
+#define RGBLED_NUM 21
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_LIMIT_VAL 153
+#endif
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/demiurge/demiurge.c b/keyboards/demiurge/demiurge.c
new file mode 100755
index 0000000000..4bd588d6e9
--- /dev/null
+++ b/keyboards/demiurge/demiurge.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 ojthetiny
+
+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 "demiurge.h"
\ No newline at end of file
diff --git a/keyboards/demiurge/demiurge.h b/keyboards/demiurge/demiurge.h
new file mode 100755
index 0000000000..6ec656881b
--- /dev/null
+++ b/keyboards/demiurge/demiurge.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 ojthetiny
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      K1G, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F,      \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E,      K3G, \
+	K40, K41, K42, K43, K44,                K48,                K4C,      K4E,      K4G  \
+) { \
+	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, XXX, K1G }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F, XXX }, \
+	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E, XXX, K3G }, \
+	{ K40, K41, K42, K43, K44, XXX, XXX, XXX, K48, XXX, XXX, XXX, K4C, XXX, K4E, XXX, K4G }  \
+}
diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json
new file mode 100644
index 0000000000..639f37a888
--- /dev/null
+++ b/keyboards/demiurge/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Demiurge", 
+    "url": "", 
+    "maintainer": "ojthetiny", 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"!", "x":3.5, "y":0}, {"label":"@", "x":4.5, "y":0}, {"label":"#", "x":5.5, "y":0}, {"label":"$", "x":6.5, "y":0}, {"label":"%", "x":7.5, "y":0}, {"label":"^", "x":8.5, "y":0}, {"label":"&", "x":9.5, "y":0}, {"label":"*", "x":10.5, "y":0}, {"label":"(", "x":11.5, "y":0}, {"label":")", "x":12.5, "y":0}, {"label":"_", "x":13.5, "y":0}, {"label":"+", "x":14.5, "y":0}, {"label":"|", "x":15.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0, "w":2}, {"label":"Del", "x":16.5, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"Backspace", "x":16, "y":1, "w":1.5}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":9.25, "y":2}, {"label":"J", "x":10.25, "y":2}, {"label":"K", "x":11.25, "y":2}, {"label":"L", "x":12.25, "y":2}, {"label":":", "x":13.25, "y":2}, {"label":"\"", "x":14.25, "y":2}, {"label":"Enter", "x":15.25, "y":2, "w":2.25}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.5, "y":3, "w":2.25}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":9.75, "y":3}, {"label":"M", "x":10.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":">", "x":12.75, "y":3}, {"label":"?", "x":13.75, "y":3}, {"label":"Shift", "x":14.75, "y":3, "w":1.75}, {"label":"Shift", "x":14.75, "y":3, "w":2.75}, {"label":"Fn", "x":16.5, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.5, "y":4, "w":1.5}, {"label":"Alt", "x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":7}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":16, "y":4, "w":1.5}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/demiurge/keymaps/default/keymap.c b/keyboards/demiurge/keymaps/default/keymap.c
new file mode 100755
index 0000000000..233ae88cf5
--- /dev/null
+++ b/keyboards/demiurge/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2021 ojthetiny
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_F1,   KC_F2,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  
+		KC_F3,   KC_F4,   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_F5,   KC_F6,   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_F7,   KC_F8,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          MO(1),   
+		KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_RGUI,          KC_RCTL
+	),
+
+	[1] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,          KC_TRNS,          KC_TRNS
+	),
+
+
+};
\ No newline at end of file
diff --git a/keyboards/demiurge/keymaps/via/keymap.c b/keyboards/demiurge/keymaps/via/keymap.c
new file mode 100755
index 0000000000..4d707a3cac
--- /dev/null
+++ b/keyboards/demiurge/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/*
+Copyright 2021 ojthetiny
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_F1,   KC_F2,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  
+		KC_F3,   KC_F4,   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_F5,   KC_F6,   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_F7,   KC_F8,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,          MO(1),   
+		KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_RGUI,          KC_RCTL
+	),
+
+	[1] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,          KC_TRNS,          KC_TRNS
+	),
+
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,          KC_TRNS,          KC_TRNS
+	),
+
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS,          KC_TRNS,          KC_TRNS
+	)
+
+};
\ No newline at end of file
diff --git a/keyboards/demiurge/keymaps/via/rules.mk b/keyboards/demiurge/keymaps/via/rules.mk
new file mode 100755
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/demiurge/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/demiurge/readme.md b/keyboards/demiurge/readme.md
new file mode 100644
index 0000000000..6e7845c8b4
--- /dev/null
+++ b/keyboards/demiurge/readme.md
@@ -0,0 +1,24 @@
+# Demiurge
+
+![demiurge-img-1](https://i.imgur.com/gnQ2Pj6h.jpeg)
+
+# Keyboard Info
+
+- 60% XT
+- Keyboard Maintainer: [ojthetiny](https://github.com/ojthetiny)
+- Hardware Supported: Demiurge PCB
+- Hardware Availability: Through group-buy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make demiurge:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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).
diff --git a/keyboards/demiurge/rules.mk b/keyboards/demiurge/rules.mk
new file mode 100755
index 0000000000..672ec13b0c
--- /dev/null
+++ b/keyboards/demiurge/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file

From 9482a097c83264792cc593cb5f96a5b06e09192b Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 30 Jan 2022 08:17:18 +1100
Subject: [PATCH 418/867] Fix Cypher rev6 VIA keymap (#16117)

---
 keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
index 967e508a29..371b876623 100644
--- a/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
+++ b/keyboards/cablecardesigns/cypher/rev6/keymaps/via/keymap.c
@@ -34,7 +34,7 @@ bool led_update_user(led_t led_state) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(2, layer_state_cmp(state, _F1));
+    rgblight_set_layer_state(2, layer_state_cmp(state, 1));
     return state;
 }
 

From 8219472cc9e0d0e7456c2c8f65d6e72753ae8331 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 29 Jan 2022 13:29:12 -0800
Subject: [PATCH 419/867] CK65: LAYOUT_65_iso compatibility (#16118)

* info.json: apply friendly formatting

* ck65.h: use QMK 3-character notation

* move Enter keycode/argument to home row

This commit makes the `LAYOUT` macro conformant to `LAYOUT_65_iso` in QMK.

* rename LAYOUT to LAYOUT_65_iso

* use QMK-native KC_TRNS alias in keymaps

Replaces instances of `KC_TRNS` with `_______` in keymaps.

* info.json: update maintainer field
---
 keyboards/senselessclay/ck65/ck65.h           | 24 ++---
 keyboards/senselessclay/ck65/info.json        | 95 +++++++++++++++++--
 .../ck65/keymaps/default/keymap.c             | 54 ++++++-----
 .../senselessclay/ck65/keymaps/via/keymap.c   | 54 ++++++-----
 keyboards/senselessclay/ck65/rules.mk         |  4 +-
 5 files changed, 159 insertions(+), 72 deletions(-)

diff --git a/keyboards/senselessclay/ck65/ck65.h b/keyboards/senselessclay/ck65/ck65.h
index 1d258ee346..cd33e428ba 100644
--- a/keyboards/senselessclay/ck65/ck65.h
+++ b/keyboards/senselessclay/ck65/ck65.h
@@ -18,18 +18,18 @@
 
 #include "quantum.h"
 
-#define ____ KC_NO
+#define ___ KC_NO
 
-#define LAYOUT( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
-    K400, K401, K402,                   K406,             K409, K410, K411, K412, K413, K414 \
+#define LAYOUT_65_iso( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E \
 ) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, ____, ____, ____, K406, ____, ____, K409, K410, K411, K412, K413, K414 }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E }  \
 }
diff --git a/keyboards/senselessclay/ck65/info.json b/keyboards/senselessclay/ck65/info.json
index fbcc959376..c1dcf3cebd 100644
--- a/keyboards/senselessclay/ck65/info.json
+++ b/keyboards/senselessclay/ck65/info.json
@@ -1,10 +1,87 @@
 {
-  "keyboard_name": "CK65", 
-  "url": "https://candykeys.com", 
-  "maintainer": "hadi", 
-  "layouts": {
-      "LAYOUT": {
-          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
-      }
-  }
-}
\ No newline at end of file
+    "keyboard_name": "CK65",
+    "url": "https://candykeys.com",
+    "maintainer": "had-i",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_iso"
+    },
+    "layouts": {
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Home", "x":15, "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":"End", "x":15, "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":"Page Up", "x":15, "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":1.75},
+                {"label":"\u2191", "x":14, "y":3},
+                {"label":"Page Down", "x":15, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"GUI", "x":11, "y":4},
+                {"label":"Fn", "x":12, "y":4},
+                {"label":"\u2190", "x":13, "y":4},
+                {"label":"\u2193", "x":14, "y":4},
+                {"label":"\u2192", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/senselessclay/ck65/keymaps/default/keymap.c b/keyboards/senselessclay/ck65/keymaps/default/keymap.c
index be627f899d..2767c9c776 100644
--- a/keyboards/senselessclay/ck65/keymaps/default/keymap.c
+++ b/keyboards/senselessclay/ck65/keymaps/default/keymap.c
@@ -23,29 +23,33 @@ enum layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_0] = LAYOUT(
+    [_0] = LAYOUT_65_iso(
         /*Base*/
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, 
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_END,
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_PGUP,
-		KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
-    [_1] = LAYOUT(
-		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END,  KC_PGDN, KC_DOWN, 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),
-    [_2] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 
-    [_3] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
\ No newline at end of file
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_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_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_1] = LAYOUT_65_iso(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,          _______,
+        KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, _______, KC_INS,  KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+    [_2] = LAYOUT_65_iso(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+    [_3] = LAYOUT_65_iso(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/senselessclay/ck65/keymaps/via/keymap.c b/keyboards/senselessclay/ck65/keymaps/via/keymap.c
index be627f899d..2767c9c776 100644
--- a/keyboards/senselessclay/ck65/keymaps/via/keymap.c
+++ b/keyboards/senselessclay/ck65/keymaps/via/keymap.c
@@ -23,29 +23,33 @@ enum layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_0] = LAYOUT(
+    [_0] = LAYOUT_65_iso(
         /*Base*/
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, 
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_END,
-		KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_PGUP,
-		KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
-    [_1] = LAYOUT(
-		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_LEFT, KC_RIGHT, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_END,  KC_PGDN, KC_DOWN, 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),
-    [_2] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 
-    [_3] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
-};
\ No newline at end of file
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_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_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_1] = LAYOUT_65_iso(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______,          _______,
+        KC_CAPS, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, _______, KC_INS,  KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  KC_END,  KC_PGDN, KC_DOWN, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+    [_2] = LAYOUT_65_iso(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+    [_3] = LAYOUT_65_iso(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/senselessclay/ck65/rules.mk b/keyboards/senselessclay/ck65/rules.mk
index 6b490bdd04..a5e9413383 100644
--- a/keyboards/senselessclay/ck65/rules.mk
+++ b/keyboards/senselessclay/ck65/rules.mk
@@ -15,4 +15,6 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 65_iso

From cabdef8395b068b2585605233a0cb6d4cc82de8d Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 29 Jan 2022 13:29:45 -0800
Subject: [PATCH 420/867] Studio Kestra Bourgeau: rename LAYOUT_all to
 LAYOUT_75_ansi_rwkl (#16119)

* rename LAYOUT_all to LAYOUT_75_ansi_rwkl

The only supported layout is 75% ANSI, with two modifier keys on the right of the Spacebar instead of three.

* info.json: use maintainer's GitHub username
---
 keyboards/studiokestra/bourgeau/bourgeau.h               | 2 +-
 keyboards/studiokestra/bourgeau/info.json                | 7 +++++--
 keyboards/studiokestra/bourgeau/keymaps/default/keymap.c | 4 ++--
 keyboards/studiokestra/bourgeau/keymaps/via/keymap.c     | 8 ++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/keyboards/studiokestra/bourgeau/bourgeau.h b/keyboards/studiokestra/bourgeau/bourgeau.h
index 32a848eca7..170b7eb329 100644
--- a/keyboards/studiokestra/bourgeau/bourgeau.h
+++ b/keyboards/studiokestra/bourgeau/bourgeau.h
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT_all( \
+#define LAYOUT_75_ansi_rwkl( \
 	K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015, \
 	K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,         K114,  K115, \
 	K200,         K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215, \
diff --git a/keyboards/studiokestra/bourgeau/info.json b/keyboards/studiokestra/bourgeau/info.json
index 8fd62f6518..a2170cabf6 100644
--- a/keyboards/studiokestra/bourgeau/info.json
+++ b/keyboards/studiokestra/bourgeau/info.json
@@ -1,9 +1,12 @@
 {
     "keyboard_name": "Bourgeau",
     "url": "https://studiokestra.ca/bourgeau/",
-    "maintainer": "Studio Kestra",
+    "maintainer": "studiokestra",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_75_ansi_rwkl"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_75_ansi_rwkl": {
             "layout": [
                 {"label":"Esc", "x":0, "y":0}, 
                 {"label":"F1", "x":1, "y":0}, 
diff --git a/keyboards/studiokestra/bourgeau/keymaps/default/keymap.c b/keyboards/studiokestra/bourgeau/keymaps/default/keymap.c
index 31d7d70a09..62e3209582 100644
--- a/keyboards/studiokestra/bourgeau/keymaps/default/keymap.c
+++ b/keyboards/studiokestra/bourgeau/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_all( /* Base */
+  [_BASE] = LAYOUT_75_ansi_rwkl( /* Base */
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_INS,  KC_DEL,
     KC_GRAVE,KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
@@ -31,7 +31,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,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP, KC_END,
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                            MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
   ),
-  [_FN] = LAYOUT_all( /* FN */
+  [_FN] = LAYOUT_75_ansi_rwkl( /* FN */
     RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/studiokestra/bourgeau/keymaps/via/keymap.c b/keyboards/studiokestra/bourgeau/keymaps/via/keymap.c
index d0491c30a9..c1604b5633 100644
--- a/keyboards/studiokestra/bourgeau/keymaps/via/keymap.c
+++ b/keyboards/studiokestra/bourgeau/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all( 
+  [0] = LAYOUT_75_ansi_rwkl( 
     KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_INS,  KC_DEL,
     KC_GRAVE,KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
@@ -27,7 +27,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,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP, KC_END,
     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                            MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
   ),
-  [1] = LAYOUT_all( /* FN */
+  [1] = LAYOUT_75_ansi_rwkl( /* FN */
     RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 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
   ),
-  [2] = LAYOUT_all( /* Layer 3 */
+  [2] = LAYOUT_75_ansi_rwkl( /* Layer 3 */
     RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,                                KC_TRNS,                        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
-  [3] = LAYOUT_all( /* Layer 3 */
+  [3] = LAYOUT_75_ansi_rwkl( /* Layer 3 */
     RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,

From c2905437ea0c2b6c23451a095fc81f99c0ea1fe2 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 29 Jan 2022 15:26:47 -0800
Subject: [PATCH 421/867] Cutie Club x Keebcats Denis: codebase touch-up and
 info.json update (#16124)

* denis.h: use QMK 3-character notation

* info.json: apply friendly formatting

* info.json: add missing layout trees

* info.json: fix key sequence on ISO layouts
---
 keyboards/cutie_club/keebcats/denis/denis.h   | 182 ++--
 keyboards/cutie_club/keebcats/denis/info.json | 810 ++++++++++++++----
 2 files changed, 712 insertions(+), 280 deletions(-)

diff --git a/keyboards/cutie_club/keebcats/denis/denis.h b/keyboards/cutie_club/keebcats/denis/denis.h
index 7ba152b8ea..dea20e8880 100644
--- a/keyboards/cutie_club/keebcats/denis/denis.h
+++ b/keyboards/cutie_club/keebcats/denis/denis.h
@@ -18,138 +18,140 @@
 
 #include "quantum.h"
 
+#define ___ KC_NO
+
 #define LAYOUT_all( \
-    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, \
-    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13,         \
-    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13,         \
-    k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13,         \
-    k04_00, k04_01, k04_02, k04_04, k04_06, k04_08, k04_10, k04_11, k04_12, k04_13                                          \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,      \
+    k40, k41, k42,           k44, k46, k48,           k4A, k4B, k4C, k4D       \
 ) \
 { \
-    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14 }, \
-    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, KC_NO },  \
-    { k02_00,  k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, KC_NO }, \
-    { k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, KC_NO },  \
-    { k04_00, k04_01, k04_02, KC_NO, k04_04, KC_NO, k04_06, KC_NO, k04_08, KC_NO, k04_10, k04_11, k04_12, k04_13, KC_NO }       \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___ }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
+    { k40, k41, k42, ___, k44, ___, k46, ___, k48, ___, k4A, k4B, k4C, k4D, ___ }  \
 }
 
 #define LAYOUT_60_ansi( \
-    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_14, \
-    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, \
-    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_13,         \
-    k03_00, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12,                 \
-    k04_00, k04_01, k04_02, k04_06, k04_10, k04_11, k04_12, k04_13                                                  \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, \
+    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D  \
 ) \
 { \
-    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, KC_NO, k00_14 }, \
-    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, KC_NO }, \
-    { k02_00,  k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, KC_NO, k02_13, KC_NO }, \
-    { k03_00, KC_NO, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, KC_NO, KC_NO },   \
-    { k04_00, k04_01, k04_02, KC_NO, KC_NO, KC_NO, k04_06, KC_NO, KC_NO, KC_NO, k04_10, k04_11, k04_12, k04_13, KC_NO }        \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___ }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___ }, \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, ___ }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, ___ }  \
 }
 
 #define LAYOUT_60_ansi_split_bs_rshift( \
-    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, \
-    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13,         \
-    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_13,                 \
-    k03_00, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13,                 \
-    k04_00, k04_01, k04_02, k04_06, k04_10, k04_11, k04_12, k04_13                                                          \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D,      \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,      \
+    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D       \
 ) \
 { \
-    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14 }, \
-    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, KC_NO },  \
-    { k02_00,  k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, KC_NO, k02_13, KC_NO },  \
-    { k03_00, KC_NO, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, KC_NO },   \
-    { k04_00, k04_01, k04_02, KC_NO, KC_NO, KC_NO, k04_06, KC_NO, KC_NO, KC_NO, k04_10, k04_11, k04_12, k04_13, KC_NO }         \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___ }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___ }, \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, ___ }  \
 }
 
 #define LAYOUT_60_ansi_tsangan( \
-    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_14, \
-    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, \
-    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_13,         \
-    k03_00, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12,                 \
-    k04_00, k04_01, k04_02, k04_06, k04_11, k04_12, k04_13                                                          \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, \
+    k40, k41, k42,                k46,                     k4B, k4C, k4D  \
 ) \
 { \
-    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, KC_NO, k00_14 }, \
-    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, KC_NO }, \
-    { k02_00,  k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, KC_NO, k02_13, KC_NO }, \
-    { k03_00, KC_NO, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, KC_NO, KC_NO },   \
-    { k04_00, k04_01, k04_02, KC_NO, KC_NO, KC_NO, k04_06, KC_NO, KC_NO, KC_NO, KC_NO, k04_11, k04_12, k04_13, KC_NO }         \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___ }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___ }, \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, ___ }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, ___, k4B, k4C, k4D, ___ }  \
 }
 
 #define LAYOUT_60_hhkb( \
-    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, \
-    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13,         \
-    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_13,                 \
-    k03_00, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13,                 \
-    k04_01, k04_02, k04_06, k04_11, k04_12                                                                                  \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D,      \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,      \
+         k41, k42,                k46,                     k4B, k4C            \
 ) \
 { \
-    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14 }, \
-    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, KC_NO },  \
-    { k02_00,  k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, KC_NO, k02_13, KC_NO },  \
-    { k03_00, KC_NO, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, KC_NO },   \
-    { KC_NO, k04_01, k04_02, KC_NO, KC_NO, KC_NO, k04_06, KC_NO, KC_NO, KC_NO, KC_NO, k04_11, k04_12, KC_NO, KC_NO }            \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___ }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___ }, \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
+    { ___, k41, k42, ___, ___, ___, k46, ___, ___, ___, ___, k4B, k4C, ___, ___ }  \
 }
 
 #define LAYOUT_60_tsangan_hhkb( \
-    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, \
-    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13,         \
-    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_13,                 \
-    k03_00, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13,                 \
-    k04_00, k04_01, k04_02, k04_06, k04_11, k04_12, k04_13                                                                  \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D,      \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,      \
+    k40, k41, k42,                k46,                     k4B, k4C, k4D       \
 ) \
 { \
-    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14 }, \
-    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, KC_NO },  \
-    { k02_00,  k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, KC_NO, k02_13, KC_NO },  \
-    { k03_00, KC_NO, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, KC_NO },   \
-    { k04_00, k04_01, k04_02, KC_NO, KC_NO, KC_NO, k04_06, KC_NO, KC_NO, KC_NO, KC_NO, k04_11, k04_12, k04_13, KC_NO }          \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___ }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___ }, \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, ___, k4B, k4C, k4D, ___ }  \
 }
 
 
 #define LAYOUT_60_iso( \
-    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_14, \
-    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12,         \
-    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, \
-    k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12,         \
-    k04_00, k04_01, k04_02, k04_06, k04_10, k04_11, k04_12, k04_13                                                  \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      \
+    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D  \
 ) \
 { \
-    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, KC_NO, k00_14 },  \
-    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, KC_NO, KC_NO },   \
-    { k02_00,  k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, KC_NO }, \
-    { k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, KC_NO, KC_NO },   \
-    { k04_00, k04_01, k04_02, KC_NO, KC_NO, KC_NO, k04_06, KC_NO, KC_NO, KC_NO, k04_10, k04_11, k04_12, k04_13, KC_NO }         \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, ___ }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, ___ }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, ___ }  \
 }
 
 #define LAYOUT_60_iso_split_bs_rshift( \
-    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, \
-    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12,                 \
-    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13,         \
-    k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13,         \
-    k04_00, k04_01, k04_02, k04_06, k04_10, k04_11, k04_12, k04_13                                                          \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,      \
+    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D       \
 ) \
 { \
-    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14 }, \
-    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, KC_NO, KC_NO },   \
-    { k02_00,  k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, KC_NO }, \
-    { k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, KC_NO },  \
-    { k04_00, k04_01, k04_02, KC_NO, KC_NO, KC_NO, k04_06, KC_NO, KC_NO, KC_NO, k04_10, k04_11, k04_12, k04_13, KC_NO }         \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, ___ }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___ }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4A, k4B, k4C, k4D, ___ }  \
 }
 
 #define LAYOUT_60_iso_tsangan( \
-    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_14, \
-    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12,         \
-    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, \
-    k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12,         \
-    k04_00, k04_01, k04_02, k04_06, k04_11, k04_12, k04_13                                                          \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      \
+    k40, k41, k42,                k46,                     k4B, k4C, k4D  \
 ) \
 { \
-    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, KC_NO, k00_14 },  \
-    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, KC_NO, KC_NO },   \
-    { k02_00,  k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, KC_NO }, \
-    { k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, KC_NO, KC_NO },   \
-    { k04_00, k04_01, k04_02, KC_NO, KC_NO, KC_NO, k04_06, KC_NO, KC_NO, KC_NO, KC_NO, k04_11, k04_12, k04_13, KC_NO }          \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, ___ }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___ }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, ___ }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, ___, k4B, k4C, k4D, ___ }  \
 }
diff --git a/keyboards/cutie_club/keebcats/denis/info.json b/keyboards/cutie_club/keebcats/denis/info.json
index a19a16a15c..72a84e62e8 100644
--- a/keyboards/cutie_club/keebcats/denis/info.json
+++ b/keyboards/cutie_club/keebcats/denis/info.json
@@ -5,204 +5,634 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 12, "y": 0 },
-                { "x": 13, "y": 0 },
-                { "x": 14, "y": 0 },
-                { "x": 0, "y": 1, "w": 1.5 },
-                { "x": 1.5, "y": 1 },
-                { "x": 2.5, "y": 1 },
-                { "x": 3.5, "y": 1 },
-                { "x": 4.5, "y": 1 },
-                { "x": 5.5, "y": 1 },
-                { "x": 6.5, "y": 1 },
-                { "x": 7.5, "y": 1 },
-                { "x": 8.5, "y": 1 },
-                { "x": 9.5, "y": 1 },
-                { "x": 10.5, "y": 1 },
-                { "x": 11.5, "y": 1 },
-                { "x": 12.5, "y": 1 },
-                { "x": 13.5, "y": 1, "w": 1.5 },
-                { "x": 0, "y": 2, "w": 1.75 },
-                { "x": 1.75, "y": 2 },
-                { "x": 2.75, "y": 2 },
-                { "x": 3.75, "y": 2 },
-                { "x": 4.75, "y": 2 },
-                { "x": 5.75, "y": 2 },
-                { "x": 6.75, "y": 2 },
-                { "x": 7.75, "y": 2 },
-                { "x": 8.75, "y": 2 },
-                { "x": 9.75, "y": 2 },
-                { "x": 10.75, "y": 2 },
-                { "x": 11.75, "y": 2 },
-                { "x": 12.75, "y": 2 },
-                { "x": 14, "y": 2 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3 },
-                { "x": 2.25, "y": 3 },
-                { "x": 3.25, "y": 3 },
-                { "x": 4.25, "y": 3 },
-                { "x": 5.25, "y": 3 },
-                { "x": 6.25, "y": 3 },
-                { "x": 7.25, "y": 3 },
-                { "x": 8.25, "y": 3 },
-                { "x": 9.25, "y": 3 },
-                { "x": 10.25, "y": 3 },
-                { "x": 11.25, "y": 3 },
-                { "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14, "y": 3 },
-                { "x": 0, "y": 4, "w": 1.25 },
-                { "x": 1.25, "y": 4, "w": 1.25 },
-                { "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 2.25 },
-                { "x": 6, "y": 4, "w": 1.25 },
-                { "x": 7.25, "y": 4, "w": 2.75 },
-                { "x": 10, "y": 4, "w": 1.25 },
-                { "x": 11.25, "y": 4, "w": 1.25 },
-                { "x": 12.5, "y": 4, "w": 1.25 },
-                { "x": 13.75, "y": 4, "w": 1.25 }
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"`~", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "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":"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":2, "w":1.25},
+
+                {"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":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Space", "x":7.25, "y":4, "w":2.75},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":4, "w":1.25},
+                {"label":"App", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
             ]
         },
         "LAYOUT_60_iso": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 12, "y": 0 },
-                { "x": 13, "y": 0, "w": 2 },
-                { "x": 0, "y": 1, "w": 1.5 },
-                { "x": 1.5, "y": 1 },
-                { "x": 2.5, "y": 1 },
-                { "x": 3.5, "y": 1 },
-                { "x": 4.5, "y": 1 },
-                { "x": 5.5, "y": 1 },
-                { "x": 6.5, "y": 1 },
-                { "x": 7.5, "y": 1 },
-                { "x": 8.5, "y": 1 },
-                { "x": 9.5, "y": 1 },
-                { "x": 10.5, "y": 1 },
-                { "x": 11.5, "y": 1 },
-                { "x": 12.5, "y": 1 },
-                { "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
-                { "x": 0, "y": 2, "w": 1.75 },
-                { "x": 1.75, "y": 2 },
-                { "x": 2.75, "y": 2 },
-                { "x": 3.75, "y": 2 },
-                { "x": 4.75, "y": 2 },
-                { "x": 5.75, "y": 2 },
-                { "x": 6.75, "y": 2 },
-                { "x": 7.75, "y": 2 },
-                { "x": 8.75, "y": 2 },
-                { "x": 9.75, "y": 2 },
-                { "x": 10.75, "y": 2 },
-                { "x": 11.75, "y": 2 },
-                { "x": 12.75, "y": 2 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3 },
-                { "x": 2.25, "y": 3 },
-                { "x": 3.25, "y": 3 },
-                { "x": 4.25, "y": 3 },
-                { "x": 5.25, "y": 3 },
-                { "x": 6.25, "y": 3 },
-                { "x": 7.25, "y": 3 },
-                { "x": 8.25, "y": 3 },
-                { "x": 9.25, "y": 3 },
-                { "x": 10.25, "y": 3 },
-                { "x": 11.25, "y": 3 },
-                { "x": 12.25, "y": 3, "w": 2.75 },
-                { "x": 0, "y": 4, "w": 1.25 },
-                { "x": 1.25, "y": 4, "w": 1.25 },
-                { "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "x": 10, "y": 4, "w": 1.25 },
-                { "x": 11.25, "y": 4, "w": 1.25 },
-                { "x": 12.5, "y": 4, "w": 1.25 },
-                { "x": 13.75, "y": 4, "w": 1.25 }
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "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":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":4, "w":1.25},
+                {"label":"App", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"`~", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "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":"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":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":4, "w":1.25},
+                {"label":"App", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_iso_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "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.5},
+                {"label":"GUI", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"GUI", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
             ]
         },
         "LAYOUT_60_ansi": {
             "layout": [
-                { "x": 0, "y": 0 },
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "y": 0 },
-                { "x": 5, "y": 0 },
-                { "x": 6, "y": 0 },
-                { "x": 7, "y": 0 },
-                { "x": 8, "y": 0 },
-                { "x": 9, "y": 0 },
-                { "x": 10, "y": 0 },
-                { "x": 11, "y": 0 },
-                { "x": 12, "y": 0 },
-                { "x": 13, "y": 0, "w": 2 },
-                { "x": 0, "y": 1, "w": 1.5 },
-                { "x": 1.5, "y": 1 },
-                { "x": 2.5, "y": 1 },
-                { "x": 3.5, "y": 1 },
-                { "x": 4.5, "y": 1 },
-                { "x": 5.5, "y": 1 },
-                { "x": 6.5, "y": 1 },
-                { "x": 7.5, "y": 1 },
-                { "x": 8.5, "y": 1 },
-                { "x": 9.5, "y": 1 },
-                { "x": 10.5, "y": 1 },
-                { "x": 11.5, "y": 1 },
-                { "x": 12.5, "y": 1 },
-                { "x": 13.75, "y": 1, "w": 1.25 },
-                { "x": 0, "y": 2, "w": 1.75 },
-                { "x": 1.75, "y": 2 },
-                { "x": 2.75, "y": 2 },
-                { "x": 3.75, "y": 2 },
-                { "x": 4.75, "y": 2 },
-                { "x": 5.75, "y": 2 },
-                { "x": 6.75, "y": 2 },
-                { "x": 7.75, "y": 2 },
-                { "x": 8.75, "y": 2 },
-                { "x": 9.75, "y": 2 },
-                { "x": 10.75, "y": 2 },
-                { "x": 11.75, "y": 2 },
-                { "x": 12.75, "y": 2, "w": 2.25 },
-                { "x": 0, "y": 3, "w": 2.25 },
-                { "x": 2.25, "y": 3 },
-                { "x": 3.25, "y": 3 },
-                { "x": 4.25, "y": 3 },
-                { "x": 5.25, "y": 3 },
-                { "x": 6.25, "y": 3 },
-                { "x": 7.25, "y": 3 },
-                { "x": 8.25, "y": 3 },
-                { "x": 9.25, "y": 3 },
-                { "x": 10.25, "y": 3 },
-                { "x": 11.25, "y": 3 },
-                { "x": 12.25, "y": 3, "w": 2.75 },
-                { "x": 0, "y": 4, "w": 1.25 },
-                { "x": 1.25, "y": 4, "w": 1.25 },
-                { "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "x": 10, "y": 4, "w": 1.25 },
-                { "x": 11.25, "y": 4, "w": 1.25 },
-                { "x": 12.5, "y": 4, "w": 1.25 },
-                { "x": 13.75, "y": 4, "w": 1.25 }
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "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":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"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":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":4, "w":1.25},
+                {"label":"App", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"`~", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "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":"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":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":4, "w":1.25},
+                {"label":"App", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "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":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"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":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"GUI", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"`~", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "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":"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":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"GUI", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"GUI", "x":12.5, "y":4}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"`~", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "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":"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":1.75},
+                {"label":"Fn", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"GUI", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
             ]
         }
     }

From bfc691eaab52ca58540e3d15a9a7d735504e9ee6 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 29 Jan 2022 15:28:14 -0800
Subject: [PATCH 422/867] Wuque Mammoth75x: refactor (#16122)

* info.json: apply/polish friendly formatting

* refactor LAYOUT_all macro

- move the argument/keycode for the right half of split Backspace next to the left half
- update QMK Configurator layout data

* update QMK Configurator layout data for the other macros

Moves the EncoderClick objects up, and offsets the arrow keys down 0.25u.
---
 keyboards/wuque/mammoth75x/info.json          | 1020 ++++++++---------
 .../wuque/mammoth75x/keymaps/default/keymap.c |   24 +-
 .../wuque/mammoth75x/keymaps/via/keymap.c     |   48 +-
 keyboards/wuque/mammoth75x/mammoth75x.h       |   12 +-
 4 files changed, 552 insertions(+), 552 deletions(-)

diff --git a/keyboards/wuque/mammoth75x/info.json b/keyboards/wuque/mammoth75x/info.json
index 4e65f83537..877d03dec9 100644
--- a/keyboards/wuque/mammoth75x/info.json
+++ b/keyboards/wuque/mammoth75x/info.json
@@ -5,566 +5,566 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.5, "y": 0 },
-                { "label": "F2", "x": 2.5, "y": 0 },
-                { "label": "F3", "x": 3.5, "y": 0 },
-                { "label": "F4", "x": 4.5, "y": 0 },
-                { "label": "F5", "x": 6, "y": 0 },
-                { "label": "F6", "x": 7, "y": 0 },
-                { "label": "F7", "x": 8, "y": 0 },
-                { "label": "F8", "x": 9, "y": 0 },
-                { "label": "F9", "x": 10.5, "y": 0 },
-                { "label": "F10", "x": 11.5, "y": 0 },
-                { "label": "F11", "x": 12.5, "y": 0 },
-                { "label": "F12", "x": 13.5, "y": 0 },
-                { "label": "Delete", "x": 15, "y": 0 },
-                { "label": "EncoderRotateL", "x": 15.25, "y": 1.25, "w": 0.25 },
-                { "label": "EncoderClick", "x": 15.75, "y": 1.25 },
-                { "label": "EncoderRotateR", "x": 16.75, "y": 1.25, "w": 0.25 },
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+                {"label":"EncoderRotateL", "x":15.65, "y":0.125, "w":0.6, "h":0.5},
+                {"label":"EncoderClick", "x":15.75, "y":0.625},
+                {"label":"EncoderRotateR", "x":16.25, "y":0.125, "w":0.6, "h":0.5},
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25 },
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"1", "x":1, "y":1.25},
+                {"label":"2", "x":2, "y":1.25},
+                {"label":"3", "x":3, "y":1.25},
+                {"label":"4", "x":4, "y":1.25},
+                {"label":"5", "x":5, "y":1.25},
+                {"label":"6", "x":6, "y":1.25},
+                {"label":"7", "x":7, "y":1.25},
+                {"label":"8", "x":8, "y":1.25},
+                {"label":"9", "x":9, "y":1.25},
+                {"label":"0", "x":10, "y":1.25},
+                {"label":"-", "x":11, "y":1.25},
+                {"label":"=", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25},
+                {"label":"Backspace1", "x":14, "y":1.25},
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Home", "x": 15.25, "y": 2.25 },
-                { "label": "PageUp", "x": 16.25, "y": 2.25 },
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[", "x":11.5, "y":2.25},
+                {"label":"]", "x":12.5, "y":2.25},
+                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Home", "x":15.25, "y":2.25},
+                {"label":"PageUp", "x":16.25, "y":2.25},
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
-                { "label": "End", "x": 15.25, "y": 3.25 },
-                { "label": "PageDown", "x": 16.25, "y": 3.25 },
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";", "x":10.75, "y":3.25},
+                {"label":"'", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"End", "x":15.25, "y":3.25},
+                {"label":"PageDown", "x":16.25, "y":3.25},
 
-                { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-                { "label": "Shift2", "x": 1.25, "y": 4.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 15.25, "y": 4.25 },
+                {"label":"Shift1", "x":0, "y":4.25, "w":1.25},
+                {"label":"Shift2", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",", "x":9.25, "y":4.25},
+                {"label":".", "x":10.25, "y":4.25},
+                {"label":"/", "x":11.25, "y":4.25},
+                {"label":"Shift1", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Shift2", "x":14, "y":4.25},
+                {"label":"\u2191", "x":15.25, "y":4.5},
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 2.25 },
-                { "label": "Space","x": 6, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 7.25, "y": 5.25, "w": 2.75 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 5.25 },
-                { "label": "\u2193", "x": 15.25, "y": 5.25 },
-                { "label": "\u2192", "x": 16.25, "y": 5.25 }
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":2.25},
+                {"label":"Space", "x":6, "y":5.25, "w":1.25},
+                {"label":"Space", "x":7.25, "y":5.25, "w":2.75},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":5.5},
+                {"label":"\u2193", "x":15.25, "y":5.5},
+                {"label":"\u2192", "x":16.25, "y":5.5}
             ]
         },
         "LAYOUT_75_ansi": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.5, "y": 0 },
-                { "label": "F2", "x": 2.5, "y": 0 },
-                { "label": "F3", "x": 3.5, "y": 0 },
-                { "label": "F4", "x": 4.5, "y": 0 },
-                { "label": "F5", "x": 6, "y": 0 },
-                { "label": "F6", "x": 7, "y": 0 },
-                { "label": "F7", "x": 8, "y": 0 },
-                { "label": "F8", "x": 9, "y": 0 },
-                { "label": "F9", "x": 10.5, "y": 0 },
-                { "label": "F10", "x": 11.5, "y": 0 },
-                { "label": "F11", "x": 12.5, "y": 0 },
-                { "label": "F12", "x": 13.5, "y": 0 },
-                { "label": "Delete", "x": 15, "y": 0 },
-                { "label": "EncoderClick", "x": 15.75, "y": 1.25 },
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+                {"label":"EncoderClick", "x":15.75, "y":0.625},
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w":2},
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"1", "x":1, "y":1.25},
+                {"label":"2", "x":2, "y":1.25},
+                {"label":"3", "x":3, "y":1.25},
+                {"label":"4", "x":4, "y":1.25},
+                {"label":"5", "x":5, "y":1.25},
+                {"label":"6", "x":6, "y":1.25},
+                {"label":"7", "x":7, "y":1.25},
+                {"label":"8", "x":8, "y":1.25},
+                {"label":"9", "x":9, "y":1.25},
+                {"label":"0", "x":10, "y":1.25},
+                {"label":"-", "x":11, "y":1.25},
+                {"label":"=", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Home", "x": 15.25, "y": 2.25 },
-                { "label": "PageUp", "x": 16.25, "y": 2.25 },
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[", "x":11.5, "y":2.25},
+                {"label":"]", "x":12.5, "y":2.25},
+                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Home", "x":15.25, "y":2.25},
+                {"label":"PageUp", "x":16.25, "y":2.25},
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "End", "x": 15.25, "y": 3.25 },
-                { "label": "PageDown", "x": 16.25, "y": 3.25 },
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";", "x":10.75, "y":3.25},
+                {"label":"'", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"End", "x":15.25, "y":3.25},
+                {"label":"PageDown", "x":16.25, "y":3.25},
 
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 15.25, "y": 4.25 },
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",", "x":9.25, "y":4.25},
+                {"label":".", "x":10.25, "y":4.25},
+                {"label":"/", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":15.25, "y":4.5},
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 5.25 },
-                { "label": "\u2193", "x": 15.25, "y": 5.25 },
-                { "label": "\u2192", "x": 16.25, "y": 5.25 }
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":5.5},
+                {"label":"\u2193", "x":15.25, "y":5.5},
+                {"label":"\u2192", "x":16.25, "y":5.5}
             ]
         },
         "LAYOUT_75_ansi_split_lshift": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.5, "y": 0 },
-                { "label": "F2", "x": 2.5, "y": 0 },
-                { "label": "F3", "x": 3.5, "y": 0 },
-                { "label": "F4", "x": 4.5, "y": 0 },
-                { "label": "F5", "x": 6, "y": 0 },
-                { "label": "F6", "x": 7, "y": 0 },
-                { "label": "F7", "x": 8, "y": 0 },
-                { "label": "F8", "x": 9, "y": 0 },
-                { "label": "F9", "x": 10.5, "y": 0 },
-                { "label": "F10", "x": 11.5, "y": 0 },
-                { "label": "F11", "x": 12.5, "y": 0 },
-                { "label": "F12", "x": 13.5, "y": 0 },
-                { "label": "Delete", "x": 15, "y": 0 },
-                { "label": "EncoderClick", "x": 15.75, "y": 1.25 },
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+                {"label":"EncoderClick", "x":15.75, "y":0.625},
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w":2},
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"1", "x":1, "y":1.25},
+                {"label":"2", "x":2, "y":1.25},
+                {"label":"3", "x":3, "y":1.25},
+                {"label":"4", "x":4, "y":1.25},
+                {"label":"5", "x":5, "y":1.25},
+                {"label":"6", "x":6, "y":1.25},
+                {"label":"7", "x":7, "y":1.25},
+                {"label":"8", "x":8, "y":1.25},
+                {"label":"9", "x":9, "y":1.25},
+                {"label":"0", "x":10, "y":1.25},
+                {"label":"-", "x":11, "y":1.25},
+                {"label":"=", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Home", "x": 15.25, "y": 2.25 },
-                { "label": "PageUp", "x": 16.25, "y": 2.25 },
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[", "x":11.5, "y":2.25},
+                {"label":"]", "x":12.5, "y":2.25},
+                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Home", "x":15.25, "y":2.25},
+                {"label":"PageUp", "x":16.25, "y":2.25},
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "End", "x": 15.25, "y": 3.25 },
-                { "label": "PageDown", "x": 16.25, "y": 3.25 },
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";", "x":10.75, "y":3.25},
+                {"label":"'", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"End", "x":15.25, "y":3.25},
+                {"label":"PageDown", "x":16.25, "y":3.25},
 
-                { "label": "Shift1", "x": 0, "y": 4.25, "w": 1.25 },
-                { "label": "Shift2", "x": 1.25, "y": 4.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 15.25, "y": 4.25 },
+                {"label":"Shift1", "x":0, "y":4.25, "w":1.25},
+                {"label":"Shift2", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",", "x":9.25, "y":4.25},
+                {"label":".", "x":10.25, "y":4.25},
+                {"label":"/", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":15.25, "y":4.5},
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 5.25 },
-                { "label": "\u2193", "x": 15.25, "y": 5.25 },
-                { "label": "\u2192", "x": 16.25, "y": 5.25 }
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":5.5},
+                {"label":"\u2193", "x":15.25, "y":5.5},
+                {"label":"\u2192", "x":16.25, "y":5.5}
             ]
         },
         "LAYOUT_75_ansi_split_rshift": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.5, "y": 0 },
-                { "label": "F2", "x": 2.5, "y": 0 },
-                { "label": "F3", "x": 3.5, "y": 0 },
-                { "label": "F4", "x": 4.5, "y": 0 },
-                { "label": "F5", "x": 6, "y": 0 },
-                { "label": "F6", "x": 7, "y": 0 },
-                { "label": "F7", "x": 8, "y": 0 },
-                { "label": "F8", "x": 9, "y": 0 },
-                { "label": "F9", "x": 10.5, "y": 0 },
-                { "label": "F10", "x": 11.5, "y": 0 },
-                { "label": "F11", "x": 12.5, "y": 0 },
-                { "label": "F12", "x": 13.5, "y": 0 },
-                { "label": "Delete", "x": 15, "y": 0 },
-                { "label": "EncoderClick", "x": 15.75, "y": 1.25 },
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+                {"label":"EncoderClick", "x":15.75, "y":0.625},
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w":2},
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"1", "x":1, "y":1.25},
+                {"label":"2", "x":2, "y":1.25},
+                {"label":"3", "x":3, "y":1.25},
+                {"label":"4", "x":4, "y":1.25},
+                {"label":"5", "x":5, "y":1.25},
+                {"label":"6", "x":6, "y":1.25},
+                {"label":"7", "x":7, "y":1.25},
+                {"label":"8", "x":8, "y":1.25},
+                {"label":"9", "x":9, "y":1.25},
+                {"label":"0", "x":10, "y":1.25},
+                {"label":"-", "x":11, "y":1.25},
+                {"label":"=", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Home", "x": 15.25, "y": 2.25 },
-                { "label": "PageUp", "x": 16.25, "y": 2.25 },
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[", "x":11.5, "y":2.25},
+                {"label":"]", "x":12.5, "y":2.25},
+                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Home", "x":15.25, "y":2.25},
+                {"label":"PageUp", "x":16.25, "y":2.25},
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "End", "x": 15.25, "y": 3.25 },
-                { "label": "PageDown", "x": 16.25, "y": 3.25 },
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";", "x":10.75, "y":3.25},
+                {"label":"'", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"End", "x":15.25, "y":3.25},
+                {"label":"PageDown", "x":16.25, "y":3.25},
 
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift1", "x": 12.25, "y": 4.25, "w": 1.75 },
-                { "label": "Shift2", "x": 14, "y": 4.25 },
-                { "label": "\u2191", "x": 15.25, "y": 4.25 },
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",", "x":9.25, "y":4.25},
+                {"label":".", "x":10.25, "y":4.25},
+                {"label":"/", "x":11.25, "y":4.25},
+                {"label":"Shift1", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Shift2", "x":14, "y":4.25},
+                {"label":"\u2191", "x":15.25, "y":4.5},
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 5.25 },
-                { "label": "\u2193", "x": 15.25, "y": 5.25 },
-                { "label": "\u2192", "x": 16.25, "y": 5.25 }
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":5.5},
+                {"label":"\u2193", "x":15.25, "y":5.5},
+                {"label":"\u2192", "x":16.25, "y":5.5}
             ]
         },
         "LAYOUT_75_ansi_split_bs": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.5, "y": 0 },
-                { "label": "F2", "x": 2.5, "y": 0 },
-                { "label": "F3", "x": 3.5, "y": 0 },
-                { "label": "F4", "x": 4.5, "y": 0 },
-                { "label": "F5", "x": 6, "y": 0 },
-                { "label": "F6", "x": 7, "y": 0 },
-                { "label": "F7", "x": 8, "y": 0 },
-                { "label": "F8", "x": 9, "y": 0 },
-                { "label": "F9", "x": 10.5, "y": 0 },
-                { "label": "F10", "x": 11.5, "y": 0 },
-                { "label": "F11", "x": 12.5, "y": 0 },
-                { "label": "F12", "x": 13.5, "y": 0 },
-                { "label": "Delete", "x": 15, "y": 0 },
-                { "label": "EncoderClick", "x": 15.75, "y": 1.25 },
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+                {"label":"EncoderClick", "x":15.75, "y":0.625},
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25},
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"1", "x":1, "y":1.25},
+                {"label":"2", "x":2, "y":1.25},
+                {"label":"3", "x":3, "y":1.25},
+                {"label":"4", "x":4, "y":1.25},
+                {"label":"5", "x":5, "y":1.25},
+                {"label":"6", "x":6, "y":1.25},
+                {"label":"7", "x":7, "y":1.25},
+                {"label":"8", "x":8, "y":1.25},
+                {"label":"9", "x":9, "y":1.25},
+                {"label":"0", "x":10, "y":1.25},
+                {"label":"-", "x":11, "y":1.25},
+                {"label":"=", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25},
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Home", "x": 15.25, "y": 2.25 },
-                { "label": "PageUp", "x": 16.25, "y": 2.25 },
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[", "x":11.5, "y":2.25},
+                {"label":"]", "x":12.5, "y":2.25},
+                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Home", "x":15.25, "y":2.25},
+                {"label":"PageUp", "x":16.25, "y":2.25},
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "Backspace1", "x": 14, "y": 1.25 },
-                { "label": "End", "x": 15.25, "y": 3.25 },
-                { "label": "PageDown", "x": 16.25, "y": 3.25 },
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";", "x":10.75, "y":3.25},
+                {"label":"'", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"Backspace1", "x":14, "y":1.25},
+                {"label":"End", "x":15.25, "y":3.25},
+                {"label":"PageDown", "x":16.25, "y":3.25},
 
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 15.25, "y": 4.25 },
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",", "x":9.25, "y":4.25},
+                {"label":".", "x":10.25, "y":4.25},
+                {"label":"/", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":15.25, "y":4.5},
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 6.25 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 5.25 },
-                { "label": "\u2193", "x": 15.25, "y": 5.25 },
-                { "label": "\u2192", "x": 16.25, "y": 5.25 }
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":5.5},
+                {"label":"\u2193", "x":15.25, "y":5.5},
+                {"label":"\u2192", "x":16.25, "y":5.5}
             ]
         },
         "LAYOUT_75_ansi_split_space": {
             "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "F1", "x": 1.5, "y": 0 },
-                { "label": "F2", "x": 2.5, "y": 0 },
-                { "label": "F3", "x": 3.5, "y": 0 },
-                { "label": "F4", "x": 4.5, "y": 0 },
-                { "label": "F5", "x": 6, "y": 0 },
-                { "label": "F6", "x": 7, "y": 0 },
-                { "label": "F7", "x": 8, "y": 0 },
-                { "label": "F8", "x": 9, "y": 0 },
-                { "label": "F9", "x": 10.5, "y": 0 },
-                { "label": "F10", "x": 11.5, "y": 0 },
-                { "label": "F11", "x": 12.5, "y": 0 },
-                { "label": "F12", "x": 13.5, "y": 0 },
-                { "label": "Delete", "x": 15, "y": 0 },
-                { "label": "EncoderClick", "x": 15.75, "y": 1.25 },
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Delete", "x":14, "y":0},
+                {"label":"EncoderClick", "x":15.75, "y":0.625},
 
-                { "label": "~", "x": 0, "y": 1.25 },
-                { "label": "1", "x": 1, "y": 1.25 },
-                { "label": "2", "x": 2, "y": 1.25 },
-                { "label": "3", "x": 3, "y": 1.25 },
-                { "label": "4", "x": 4, "y": 1.25 },
-                { "label": "5", "x": 5, "y": 1.25 },
-                { "label": "6", "x": 6, "y": 1.25 },
-                { "label": "7", "x": 7, "y": 1.25 },
-                { "label": "8", "x": 8, "y": 1.25 },
-                { "label": "9", "x": 9, "y": 1.25 },
-                { "label": "0", "x": 10, "y": 1.25 },
-                { "label": "-", "x": 11, "y": 1.25 },
-                { "label": "=", "x": 12, "y": 1.25 },
-                { "label": "Backspace", "x": 13, "y": 1.25, "w":2},
+                {"label":"~", "x":0, "y":1.25},
+                {"label":"1", "x":1, "y":1.25},
+                {"label":"2", "x":2, "y":1.25},
+                {"label":"3", "x":3, "y":1.25},
+                {"label":"4", "x":4, "y":1.25},
+                {"label":"5", "x":5, "y":1.25},
+                {"label":"6", "x":6, "y":1.25},
+                {"label":"7", "x":7, "y":1.25},
+                {"label":"8", "x":8, "y":1.25},
+                {"label":"9", "x":9, "y":1.25},
+                {"label":"0", "x":10, "y":1.25},
+                {"label":"-", "x":11, "y":1.25},
+                {"label":"=", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
 
-                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 2.25 },
-                { "label": "W", "x": 2.5, "y": 2.25 },
-                { "label": "E", "x": 3.5, "y": 2.25 },
-                { "label": "R", "x": 4.5, "y": 2.25 },
-                { "label": "T", "x": 5.5, "y": 2.25 },
-                { "label": "Y", "x": 6.5, "y": 2.25 },
-                { "label": "U", "x": 7.5, "y": 2.25 },
-                { "label": "I", "x": 8.5, "y": 2.25 },
-                { "label": "O", "x": 9.5, "y": 2.25 },
-                { "label": "P", "x": 10.5, "y": 2.25 },
-                { "label": "[", "x": 11.5, "y": 2.25 },
-                { "label": "]", "x": 12.5, "y": 2.25 },
-                { "label": "\\", "x": 13.5,"y": 2.25, "w": 1.5 },
-                { "label": "Home", "x": 15.25, "y": 2.25 },
-                { "label": "PageUp", "x": 16.25, "y": 2.25 },
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[", "x":11.5, "y":2.25},
+                {"label":"]", "x":12.5, "y":2.25},
+                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Home", "x":15.25, "y":2.25},
+                {"label":"PageUp", "x":16.25, "y":2.25},
 
-                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 3.25 },
-                { "label": "S", "x": 2.75, "y": 3.25 },
-                { "label": "D", "x": 3.75, "y": 3.25 },
-                { "label": "F", "x": 4.75, "y": 3.25 },
-                { "label": "G", "x": 5.75, "y": 3.25 },
-                { "label": "H", "x": 6.75, "y": 3.25 },
-                { "label": "J", "x": 7.75, "y": 3.25 },
-                { "label": "K", "x": 8.75, "y": 3.25 },
-                { "label": "L", "x": 9.75, "y": 3.25 },
-                { "label": ";", "x": 10.75, "y": 3.25 },
-                { "label": "'", "x": 11.75, "y": 3.25 },
-                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
-                { "label": "End", "x": 15.25, "y": 3.25 },
-                { "label": "PageDown", "x": 16.25, "y": 3.25 },
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";", "x":10.75, "y":3.25},
+                {"label":"'", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"End", "x":15.25, "y":3.25},
+                {"label":"PageDown", "x":16.25, "y":3.25},
 
-                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
-                { "label": "Z", "x": 2.25, "y": 4.25 },
-                { "label": "X", "x": 3.25, "y": 4.25 },
-                { "label": "C", "x": 4.25, "y": 4.25 },
-                { "label": "V", "x": 5.25, "y": 4.25 },
-                { "label": "B", "x": 6.25, "y": 4.25 },
-                { "label": "N", "x": 7.25, "y": 4.25 },
-                { "label": "M", "x": 8.25, "y": 4.25 },
-                { "label": ",", "x": 9.25, "y": 4.25 },
-                { "label": ".", "x": 10.25, "y": 4.25 },
-                { "label": "/", "x": 11.25, "y": 4.25 },
-                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 2.75 },
-                { "label": "\u2191", "x": 15.25, "y": 4.25 },
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",", "x":9.25, "y":4.25},
+                {"label":".", "x":10.25, "y":4.25},
+                {"label":"/", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":15.25, "y":4.5},
 
-                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
-                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
-                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 3.75, "y": 5.25, "w": 2.25 },
-                { "label": "Space","x": 6, "y": 5.25, "w": 1.25 },
-                { "label": "Space","x": 7.25, "y": 5.25, "w": 2.75 },
-                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
-                { "label": "Ctrl", "x": 11.25, "y": 5.25, "w": 1.25 },
-                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
-                { "label": "\u2190", "x": 14.25, "y": 5.25 },
-                { "label": "\u2193", "x": 15.25, "y": 5.25 },
-                { "label": "\u2192", "x": 16.25, "y": 5.25 }
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":2.25},
+                {"label":"Space", "x":6, "y":5.25, "w":1.25},
+                {"label":"Space", "x":7.25, "y":5.25, "w":2.75},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":5.5},
+                {"label":"\u2193", "x":15.25, "y":5.5},
+                {"label":"\u2192", "x":16.25, "y":5.5}
             ]
         }
     }
diff --git a/keyboards/wuque/mammoth75x/keymaps/default/keymap.c b/keyboards/wuque/mammoth75x/keymaps/default/keymap.c
index 9f998a3dd6..6dd789e179 100644
--- a/keyboards/wuque/mammoth75x/keymaps/default/keymap.c
+++ b/keyboards/wuque/mammoth75x/keymaps/default/keymap.c
@@ -18,19 +18,19 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,   KC_VOLD, KC_MUTE,KC_VOLU,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-        KC_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_INS, KC_PGUP,
-        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_BSPC,      KC_END, KC_PGDN,
-        KC_LSFT, 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_RSFT,      KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(1),   KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_VOLD, KC_MUTE,KC_VOLU,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_INS, KC_PGUP,
+        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_END, KC_PGDN,
+        KC_LSFT, 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_RSFT,               KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(1),   KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_MPRV, KC_MPLY, KC_MNXT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, RESET,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,      _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______, RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,               _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/mammoth75x/keymaps/via/keymap.c b/keyboards/wuque/mammoth75x/keymaps/via/keymap.c
index d35ff6bccc..bb62bedefe 100644
--- a/keyboards/wuque/mammoth75x/keymaps/via/keymap.c
+++ b/keyboards/wuque/mammoth75x/keymaps/via/keymap.c
@@ -18,35 +18,35 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,   KC_VOLD, KC_MUTE,KC_VOLU,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-        KC_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_INS, KC_PGUP,
-        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_BSPC,      KC_END, KC_PGDN,
-        KC_LSFT, 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_RSFT,      KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(1),   KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_VOLD, KC_MUTE,KC_VOLU,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,               KC_INS, KC_PGUP,
+        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_END, KC_PGDN,
+        KC_LSFT, 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_RSFT,               KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, MO(1),   KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_MPRV, KC_MPLY, KC_MNXT,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, RESET,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,      _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______, RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,               _______, _______, _______
     ),
     [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,      _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,               _______, _______, _______
     ),
     [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,      _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,               _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______,               _______, _______, _______
     ),
 };
diff --git a/keyboards/wuque/mammoth75x/mammoth75x.h b/keyboards/wuque/mammoth75x/mammoth75x.h
index a3ab71caa1..4c419474dc 100644
--- a/keyboards/wuque/mammoth75x/mammoth75x.h
+++ b/keyboards/wuque/mammoth75x/mammoth75x.h
@@ -37,12 +37,12 @@
  *                                                           └───┴───┴───┘
  */
 #define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K53, K0E, K55, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E,      \
-    K50, K51, K52,      K54,      K56,      K58,      K5A, K5B, K5C, K5D, K5E, K5F  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K53, K0E, K55, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D,           \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3C,      K3E, K3F, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4E,      \
+    K50, K51, K52,      K54,      K56,      K58,      K5A, K5B, K5C,      K5D, K5E, K5F  \
 ) { \
     { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   KC_NO  }, \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   KC_NO, KC_NO  }, \

From e0de2b0279394360acea82adf856a4a753ca0b14 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 29 Jan 2022 15:28:57 -0800
Subject: [PATCH 423/867] Takashi Company QooLee: correct info.json key
 sequence (#16121)

* info.json: apply friendly formatting

* info.json: correct maintainer field

Fixes a typo.

* info.json: correct key sequence
---
 keyboards/takashicompany/qoolee/info.json | 186 +++++-----------------
 1 file changed, 39 insertions(+), 147 deletions(-)

diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json
index b2245a91c7..56ef36b6e9 100644
--- a/keyboards/takashicompany/qoolee/info.json
+++ b/keyboards/takashicompany/qoolee/info.json
@@ -1,156 +1,48 @@
 {
     "keyboard_name": "QooLee",
     "url": "https://github.com/takashicompany/qoolee",
-    "maintainer": "takachicompany",
+    "maintainer": "takashicompany",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "x": 0,
-                    "y": 0,
-                    "w": 1.5
-                },
-                {
-                    "x": 1.5,
-                    "y": 0
-                },
-                {
-                    "x": 2.5,
-                    "y": 0
-                },
-                {
-                    "x": 3.5,
-                    "y": 0
-                },
-                {
-                    "x": 4.5,
-                    "y": 0
-                },
-                {
-                    "x": 5.5,
-                    "y": 0
-                },
-                {
-                    "x": 6.5,
-                    "y": 0
-                },
-                {
-                    "x": 7.5,
-                    "y": 0
-                },
-                {
-                    "x": 8.5,
-                    "y": 0
-                },
-                {
-                    "x": 9.5,
-                    "y": 0
-                },
-                {
-                    "x": 10.5,
-                    "y": 0
-                },
-                {
-                    "x": 11.75,
-                    "y": 0,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "x": 0,
-                    "y": 1,
-                    "w": 1.75
-                },
-                {
-                    "x": 1.75,
-                    "y": 1
-                },
-                {
-                    "x": 2.75,
-                    "y": 1
-                },
-                {
-                    "x": 3.75,
-                    "y": 1
-                },
-                {
-                    "x": 4.75,
-                    "y": 1
-                },
-                {
-                    "x": 5.75,
-                    "y": 1
-                },
-                {
-                    "x": 6.75,
-                    "y": 1
-                },
-                {
-                    "x": 7.75,
-                    "y": 1
-                },
-                {
-                    "x": 8.75,
-                    "y": 1
-                },
-                {
-                    "x": 9.75,
-                    "y": 1
-                },
-                {
-                    "x": 10.75,
-                    "y": 1
-                },
-                {
-                    "x": 0,
-                    "y": 2,
-                    "w": 2
-                },
-                {
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "x": 5,
-                    "y": 2
-                },
-                {
-                    "x": 6,
-                    "y": 2
-                },
-                {
-                    "x": 7,
-                    "y": 2
-                },
-                {
-                    "x": 8,
-                    "y": 2
-                },
-                {
-                    "x": 9,
-                    "y": 2
-                },
-                {
-                    "x": 10,
-                    "y": 2
-                },
-                {
-                    "x": 11,
-                    "y": 2
-                },
-                {
-                    "x": 12,
-                    "y": 2
-                }
+                {"x":0, "y":0, "w":1.5},
+                {"x":1.5, "y":0},
+                {"x":2.5, "y":0},
+                {"x":3.5, "y":0},
+                {"x":4.5, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.5, "y":0},
+                {"x":10.5, "y":0},
+
+                {"x":0, "y":1, "w":1.75},
+                {"x":1.75, "y":1},
+                {"x":2.75, "y":1},
+                {"x":3.75, "y":1},
+                {"x":4.75, "y":1},
+                {"x":5.75, "y":1},
+                {"x":6.75, "y":1},
+                {"x":7.75, "y":1},
+                {"x":8.75, "y":1},
+                {"x":9.75, "y":1},
+                {"x":10.75, "y":1},
+                {"x":11.75, "y":0, "w":1.25, "h":2},
+
+                {"x":0, "y":2, "w":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+                {"x":4, "y":2},
+                {"x":5, "y":2},
+                {"x":6, "y":2},
+                {"x":7, "y":2},
+                {"x":8, "y":2},
+                {"x":9, "y":2},
+                {"x":10, "y":2},
+                {"x":11, "y":2},
+                {"x":12, "y":2}
             ]
         }
     }
-}
\ No newline at end of file
+}

From 66c81ed82e6cdefe61a7fa3cfb13b696f53ed654 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 29 Jan 2022 15:29:42 -0800
Subject: [PATCH 424/867] Takashi Company Center x Enter: correct info.json key
 sequence (#16120)

* info.json: apply friendly formatting

* info.json: update labels for clarity

* info.json: correct key sequence
---
 .../takashicompany/center_enter/info.json     | 219 +++---------------
 1 file changed, 38 insertions(+), 181 deletions(-)

diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json
index f0f3af1f39..cd7861f453 100644
--- a/keyboards/takashicompany/center_enter/info.json
+++ b/keyboards/takashicompany/center_enter/info.json
@@ -5,187 +5,44 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "label": "201",
-                    "x": 0,
-                    "y": 0,
-                    "w": 1.5
-                },
-                {
-                    "label": "1",
-                    "x": 1.5,
-                    "y": 0
-                },
-                {
-                    "label": "2",
-                    "x": 2.5,
-                    "y": 0
-                },
-                {
-                    "label": "3",
-                    "x": 3.5,
-                    "y": 0
-                },
-                {
-                    "label": "4",
-                    "x": 4.5,
-                    "y": 0
-                },
-                {
-                    "label": "5",
-                    "x": 5.5,
-                    "y": 0
-                },
-                {
-                    "label": "901",
-                    "x": 6.75,
-                    "y": 0,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "label": "6",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "7",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "8",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": "9",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "10",
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "label": "301",
-                    "x": 0,
-                    "y": 1,
-                    "w": 1.75
-                },
-                {
-                    "label": "11",
-                    "x": 1.75,
-                    "y": 1
-                },
-                {
-                    "label": "12",
-                    "x": 2.75,
-                    "y": 1
-                },
-                {
-                    "label": "13",
-                    "x": 3.75,
-                    "y": 1
-                },
-                {
-                    "label": "14",
-                    "x": 4.75,
-                    "y": 1
-                },
-                {
-                    "label": "15",
-                    "x": 5.75,
-                    "y": 1
-                },
-                {
-                    "label": "16",
-                    "x": 8,
-                    "y": 1
-                },
-                {
-                    "label": "17",
-                    "x": 9,
-                    "y": 1
-                },
-                {
-                    "label": "18",
-                    "x": 10,
-                    "y": 1
-                },
-                {
-                    "label": "19",
-                    "x": 11,
-                    "y": 1
-                },
-                {
-                    "label": "20",
-                    "x": 12,
-                    "y": 1
-                },
-                {
-                    "label": "401",
-                    "x": 0,
-                    "y": 2,
-                    "w": 2
-                },
-                {
-                    "label": "21",
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "label": "22",
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "label": "23",
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "label": "24",
-                    "x": 5,
-                    "y": 2
-                },
-                {
-                    "label": "25",
-                    "x": 6,
-                    "y": 2
-                },
-                {
-                    "label": "31",
-                    "x": 7,
-                    "y": 2
-                },
-                {
-                    "label": "26",
-                    "x": 8,
-                    "y": 2
-                },
-                {
-                    "label": "27",
-                    "x": 9,
-                    "y": 2
-                },
-                {
-                    "label": "28",
-                    "x": 10,
-                    "y": 2
-                },
-                {
-                    "label": "29",
-                    "x": 11,
-                    "y": 2
-                },
-                {
-                    "label": "30",
-                    "x": 12,
-                    "y": 2
-                }
+                {"label":"Tab", "x":0, "y":0, "w":1.5},
+                {"label":"Q", "x":1.5, "y":0},
+                {"label":"W", "x":2.5, "y":0},
+                {"label":"E", "x":3.5, "y":0},
+                {"label":"R", "x":4.5, "y":0},
+                {"label":"T", "x":5.5, "y":0},
+                {"label":"Y", "x":8, "y":0},
+                {"label":"U", "x":9, "y":0},
+                {"label":"I", "x":10, "y":0},
+                {"label":"O", "x":11, "y":0},
+                {"label":"P", "x":12, "y":0},
+
+                {"label":"Ctrl", "x":0, "y":1, "w":1.75},
+                {"label":"A", "x":1.75, "y":1},
+                {"label":"S", "x":2.75, "y":1},
+                {"label":"D", "x":3.75, "y":1},
+                {"label":"F", "x":4.75, "y":1},
+                {"label":"G", "x":5.75, "y":1},
+                {"label":"Switch Language", "x":6.75, "y":0, "w":1.25, "h":2},
+                {"label":"H", "x":8, "y":1},
+                {"label":"J", "x":9, "y":1},
+                {"label":"K", "x":10, "y":1},
+                {"label":"L", "x":11, "y":1},
+                {"label":"Enter", "x":12, "y":1},
+
+                {"label":"Shift", "x":0, "y":2, "w":2},
+                {"label":"Z", "x":2, "y":2},
+                {"label":"X", "x":3, "y":2},
+                {"label":"C", "x":4, "y":2},
+                {"label":"V", "x":5, "y":2},
+                {"label":"B", "x":6, "y":2},
+                {"label":"Space", "x":7, "y":2},
+                {"label":"N", "x":8, "y":2},
+                {"label":"M", "x":9, "y":2},
+                {"label":",<", "x":10, "y":2},
+                {"label":".>", "x":11, "y":2},
+                {"label":"Backspace", "x":12, "y":2}
             ]
         }
     }
-}
\ No newline at end of file
+}

From aee6ff5c081bce8b4aba75c38ec12d25856abe8e Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 29 Jan 2022 23:11:50 -0800
Subject: [PATCH 425/867] Xelus Pachi: add info.json files; rename layout
 macros (#16123)

* xelus/pachi/mini_32u4: add info.json

* xelus/pachi/rev1: add info.json

* xelus/pachi/rgb/rev1: add info.json

* xelus/pachi/rgb/rev2: add info.json

* rename LAYOUT_ansi_tsangan to LAYOUT_tkl_ansi_tsangan

Rename `LAYOUT_ansi_tsangan` to `LAYOUT_tkl_ansi_tsangan` for the Pachi RGB revisions.
---
 keyboards/xelus/pachi/mini_32u4/info.json     | 107 ++++++++++++++++++
 keyboards/xelus/pachi/rev1/info.json          | 107 ++++++++++++++++++
 .../xelus/pachi/rgb/keymaps/default/keymap.c  |   4 +-
 .../xelus/pachi/rgb/keymaps/via/keymap.c      |   6 +-
 keyboards/xelus/pachi/rgb/rev1/info.json      | 105 +++++++++++++++++
 keyboards/xelus/pachi/rgb/rev1/rev1.h         |   2 +-
 keyboards/xelus/pachi/rgb/rev2/info.json      | 105 +++++++++++++++++
 keyboards/xelus/pachi/rgb/rev2/rev2.h         |   2 +-
 8 files changed, 431 insertions(+), 7 deletions(-)
 create mode 100644 keyboards/xelus/pachi/mini_32u4/info.json
 create mode 100644 keyboards/xelus/pachi/rev1/info.json
 create mode 100644 keyboards/xelus/pachi/rgb/rev1/info.json
 create mode 100644 keyboards/xelus/pachi/rgb/rev2/info.json

diff --git a/keyboards/xelus/pachi/mini_32u4/info.json b/keyboards/xelus/pachi/mini_32u4/info.json
new file mode 100644
index 0000000000..3b0128ee82
--- /dev/null
+++ b/keyboards/xelus/pachi/mini_32u4/info.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "Xelus Pachi Mini",
+    "url": "",
+    "maintainer": "Xelus22",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F13", "x":1.25, "y":0},
+                {"label":"F1", "x":2.25, "y":0},
+                {"label":"F2", "x":3.25, "y":0},
+                {"label":"F3", "x":4.25, "y":0},
+                {"label":"F4", "x":5.5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.75, "y":0},
+                {"label":"F9", "x":10.75, "y":0},
+                {"label":"F10", "x":11.75, "y":0},
+                {"label":"F11", "x":12.75, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1},
+                {"label":"1!", "x":1, "y":1},
+                {"label":"2@", "x":2, "y":1},
+                {"label":"3#", "x":3, "y":1},
+                {"label":"4$", "x":4, "y":1},
+                {"label":"5%", "x":5, "y":1},
+                {"label":"6^", "x":6, "y":1},
+                {"label":"7&", "x":7, "y":1},
+                {"label":"8*", "x":8, "y":1},
+                {"label":"9(", "x":9, "y":1},
+                {"label":"0)", "x":10, "y":1},
+                {"label":"-_", "x":11, "y":1},
+                {"label":"=+", "x":12, "y":1},
+                {"label":"Backspace", "x":13, "y":1},
+                {"label":"Backspace", "x":14, "y":1},
+                {"label":"Insert", "x":15.25, "y":1},
+                {"label":"Home", "x":16.25, "y":1},
+                {"label":"Page Up", "x":17.25, "y":1},
+
+                {"label":"Tab", "x":0, "y":2, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2},
+                {"label":"W", "x":2.5, "y":2},
+                {"label":"E", "x":3.5, "y":2},
+                {"label":"R", "x":4.5, "y":2},
+                {"label":"T", "x":5.5, "y":2},
+                {"label":"Y", "x":6.5, "y":2},
+                {"label":"U", "x":7.5, "y":2},
+                {"label":"I", "x":8.5, "y":2},
+                {"label":"O", "x":9.5, "y":2},
+                {"label":"P", "x":10.5, "y":2},
+                {"label":"[{", "x":11.5, "y":2},
+                {"label":"]}", "x":12.5, "y":2},
+                {"label":"\\|", "x":13.5, "y":2, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2},
+                {"label":"End", "x":16.25, "y":2},
+                {"label":"Page Down", "x":17.25, "y":2},
+
+                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
+                {"label":"A", "x":1.75, "y":3},
+                {"label":"S", "x":2.75, "y":3},
+                {"label":"D", "x":3.75, "y":3},
+                {"label":"F", "x":4.75, "y":3},
+                {"label":"G", "x":5.75, "y":3},
+                {"label":"H", "x":6.75, "y":3},
+                {"label":"J", "x":7.75, "y":3},
+                {"label":"K", "x":8.75, "y":3},
+                {"label":"L", "x":9.75, "y":3},
+                {"label":";:", "x":10.75, "y":3},
+                {"label":"'\"", "x":11.75, "y":3},
+                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4},
+                {"label":"Z", "x":2.25, "y":4},
+                {"label":"X", "x":3.25, "y":4},
+                {"label":"C", "x":4.25, "y":4},
+                {"label":"V", "x":5.25, "y":4},
+                {"label":"B", "x":6.25, "y":4},
+                {"label":"N", "x":7.25, "y":4},
+                {"label":"M", "x":8.25, "y":4},
+                {"label":",<", "x":9.25, "y":4},
+                {"label":".>", "x":10.25, "y":4},
+                {"label":"/?", "x":11.25, "y":4},
+                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
+                {"label":"Fn", "x":14, "y":4},
+                {"label":"\u2191", "x":16.25, "y":4},
+
+                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5, "w":1.25},
+                {"label":"App", "x":11.25, "y":5, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5},
+                {"label":"\u2193", "x":16.25, "y":5},
+                {"label":"\u2192", "x":17.25, "y":5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/pachi/rev1/info.json b/keyboards/xelus/pachi/rev1/info.json
new file mode 100644
index 0000000000..2fb0c55479
--- /dev/null
+++ b/keyboards/xelus/pachi/rev1/info.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "Xelus Pachi Rev 1",
+    "url": "",
+    "maintainer": "Xelus22",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F13", "x":1.25, "y":0},
+                {"label":"F1", "x":2.25, "y":0},
+                {"label":"F2", "x":3.25, "y":0},
+                {"label":"F3", "x":4.25, "y":0},
+                {"label":"F4", "x":5.5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.75, "y":0},
+                {"label":"F9", "x":10.75, "y":0},
+                {"label":"F10", "x":11.75, "y":0},
+                {"label":"F11", "x":12.75, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25},
+                {"label":"Backspace", "x":14, "y":1.25},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":14, "y":4.25},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"App", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/pachi/rgb/keymaps/default/keymap.c b/keyboards/xelus/pachi/rgb/keymaps/default/keymap.c
index c863d4413f..63ce070200 100644
--- a/keyboards/xelus/pachi/rgb/keymaps/default/keymap.c
+++ b/keyboards/xelus/pachi/rgb/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-      [0] = LAYOUT_ansi_tsangan(
+      [0] = LAYOUT_tkl_ansi_tsangan(
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
@@ -25,7 +25,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,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                              KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,          KC_RGUI, KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT),
 
-      [1] = LAYOUT_ansi_tsangan(
+      [1] = LAYOUT_tkl_ansi_tsangan(
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET  ,            RGB_TOG, RGB_HUI, RGB_SAI,
         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,            RGB_MOD, RGB_HUD, RGB_SAD,
diff --git a/keyboards/xelus/pachi/rgb/keymaps/via/keymap.c b/keyboards/xelus/pachi/rgb/keymaps/via/keymap.c
index d6a17a5fe0..dafc1c18ce 100644
--- a/keyboards/xelus/pachi/rgb/keymaps/via/keymap.c
+++ b/keyboards/xelus/pachi/rgb/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-      [0] = LAYOUT_ansi_tsangan(
+      [0] = LAYOUT_tkl_ansi_tsangan(
         KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
@@ -25,7 +25,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,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                              KC_UP,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,          KC_RGUI, KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT),
 
-      [1] = LAYOUT_ansi_tsangan(
+      [1] = LAYOUT_tkl_ansi_tsangan(
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET  ,            KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                              KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS),
 
-      [2] = LAYOUT_ansi_tsangan(
+      [2] = LAYOUT_tkl_ansi_tsangan(
         KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/info.json
new file mode 100644
index 0000000000..7448e755f0
--- /dev/null
+++ b/keyboards/xelus/pachi/rgb/rev1/info.json
@@ -0,0 +1,105 @@
+{
+    "keyboard_name": "Xelus Pachi RGB Rev 1",
+    "url": "",
+    "maintainer": "Xelus22",
+    "layout_aliases": {
+        "LAYOUT_ansi_tsangan": "LAYOUT_tkl_ansi_tsangan"
+    },
+    "layouts": {
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"GUI", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15, "y":5.25},
+                {"label":"\u2193", "x":16, "y":5.25},
+                {"label":"\u2192", "x":17, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/pachi/rgb/rev1/rev1.h b/keyboards/xelus/pachi/rgb/rev1/rev1.h
index 894519ebe2..d2db5ebfc0 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rev1.h
+++ b/keyboards/xelus/pachi/rgb/rev1/rev1.h
@@ -19,7 +19,7 @@
 
 #define ____ KC_NO
 
-#define LAYOUT_ansi_tsangan( \
+#define LAYOUT_tkl_ansi_tsangan( \
     K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,   K014, K015, K016, \
     K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,   K114, K115, K116, \
     K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,   K214, K215, K216, \
diff --git a/keyboards/xelus/pachi/rgb/rev2/info.json b/keyboards/xelus/pachi/rgb/rev2/info.json
new file mode 100644
index 0000000000..7448e755f0
--- /dev/null
+++ b/keyboards/xelus/pachi/rgb/rev2/info.json
@@ -0,0 +1,105 @@
+{
+    "keyboard_name": "Xelus Pachi RGB Rev 1",
+    "url": "",
+    "maintainer": "Xelus22",
+    "layout_aliases": {
+        "LAYOUT_ansi_tsangan": "LAYOUT_tkl_ansi_tsangan"
+    },
+    "layouts": {
+        "LAYOUT_tkl_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":5.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Space", "x":4, "y":5.25, "w":7},
+                {"label":"Alt", "x":11, "y":5.25, "w":1.5},
+                {"label":"GUI", "x":12.5, "y":5.25},
+                {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":15, "y":5.25},
+                {"label":"\u2193", "x":16, "y":5.25},
+                {"label":"\u2192", "x":17, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/xelus/pachi/rgb/rev2/rev2.h b/keyboards/xelus/pachi/rgb/rev2/rev2.h
index edc164d729..d7c3725d5d 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rev2.h
+++ b/keyboards/xelus/pachi/rgb/rev2/rev2.h
@@ -19,7 +19,7 @@
 
 #define _____ KC_NO
 
-#define LAYOUT_ansi_tsangan( \
+#define LAYOUT_tkl_ansi_tsangan( \
     K0000,        K0001, K0101, K0002, K0102, K0003, K0103, K0004, K0104, K0005, K0105, K0006, K0106, K0007, K0107, K0008, \
     K0200, K0300, K0201, K0301, K0202, K0302, K0203, K0303, K0204, K0304, K0205, K0305, K0206, K0306, K0207, K0307, K0208, \
     K0400, K0500, K0401, K0501, K0402, K0502, K0403, K0503, K0404, K0504, K0405, K0505, K0406, K0506, K0407, K0507, K0408, \

From 7d685956cc616a8d76aa7866f42bf569a9ca3fca Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 31 Jan 2022 04:29:42 +1100
Subject: [PATCH 426/867] Rename `AdafruitBLE` to `BluefruitLE` (#16127)

---
 common_features.mk                            | 10 +--
 data/schemas/keyboard.jsonschema              |  2 +-
 docs/config_options.md                        |  4 +-
 docs/feature_bluetooth.md                     | 10 +--
 .../{adafruit_ble.cpp => bluefruit_le.cpp}    | 64 +++++++++----------
 .../{adafruit_ble.h => bluefruit_le.h}        | 20 +++---
 drivers/bluetooth/outputselect.c              |  8 +--
 keyboards/10bleoledhub/rules.mk               |  2 +-
 .../mf68/keymaps/mf68_ble/rules.mk            |  2 +-
 keyboards/atreus/feather/rules.mk             |  2 +-
 keyboards/bioi/main.c                         |  6 +-
 keyboards/converter/m0110_usb/readme.md       |  2 +-
 keyboards/converter/usb_usb/ble/config.h      |  4 +-
 keyboards/converter/usb_usb/ble/rules.mk      |  2 +-
 keyboards/dtisaac/dosa40rgb/readme.md         |  2 +-
 keyboards/dtisaac/dosa40rgb/rules.mk          |  2 +-
 keyboards/handwired/42/rules.mk               |  2 +-
 keyboards/handwired/bdn9_ble/rules.mk         |  2 +-
 keyboards/handwired/fruity60/rules.mk         |  2 +-
 keyboards/handwired/prkl30/feather/rules.mk   |  2 +-
 .../promethium/keymaps/default/keymap.c       |  6 +-
 .../promethium/keymaps/priyadi/keymap.c       |  6 +-
 keyboards/handwired/promethium/promethium.c   |  4 +-
 keyboards/handwired/promethium/rules.mk       |  2 +-
 keyboards/handwired/pterodactyl/rules.mk      |  2 +-
 keyboards/handwired/slash/rules.mk            |  2 +-
 keyboards/latin47ble/rules.mk                 |  2 +-
 keyboards/latin64ble/rules.mk                 |  2 +-
 keyboards/latinpadble/rules.mk                |  2 +-
 keyboards/meira/featherble/rules.mk           |  2 +-
 keyboards/nek_type_a/rules.mk                 |  2 +-
 .../spaceman/pancake/rev1/feather/rules.mk    |  2 +-
 keyboards/tokyokeyboard/alix40/rules.mk       |  2 +-
 tmk_core/protocol/lufa/lufa.c                 | 30 ++++-----
 users/wanleg/rules.mk                         |  2 +-
 35 files changed, 109 insertions(+), 109 deletions(-)
 rename drivers/bluetooth/{adafruit_ble.cpp => bluefruit_le.cpp} (92%)
 rename drivers/bluetooth/{adafruit_ble.h => bluefruit_le.h} (70%)

diff --git a/common_features.mk b/common_features.mk
index e00f95f8e4..d3da487e69 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -717,7 +717,7 @@ ifeq ($(strip $(USBPD_ENABLE)), yes)
 endif
 
 BLUETOOTH_ENABLE ?= no
-VALID_BLUETOOTH_DRIVER_TYPES := AdafruitBLE RN42 custom
+VALID_BLUETOOTH_DRIVER_TYPES := BluefruitLE RN42 custom
 ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     ifeq ($(filter $(strip $(BLUETOOTH_DRIVER)),$(VALID_BLUETOOTH_DRIVER_TYPES)),)
         $(error "$(BLUETOOTH_DRIVER)" is not a valid Bluetooth driver type)
@@ -727,15 +727,15 @@ ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     COMMON_VPATH += $(DRIVER_PATH)/bluetooth
     SRC += outputselect.c
 
-    ifeq ($(strip $(BLUETOOTH_DRIVER)), AdafruitBLE)
-        OPT_DEFS += -DMODULE_ADAFRUIT_BLE
+    ifeq ($(strip $(BLUETOOTH_DRIVER)), BluefruitLE)
+        OPT_DEFS += -DBLUETOOTH_BLUEFRUIT_LE
         SRC += analog.c
-        SRC += $(DRIVER_PATH)/bluetooth/adafruit_ble.cpp
+        SRC += $(DRIVER_PATH)/bluetooth/bluefruit_le.cpp
         QUANTUM_LIB_SRC += spi_master.c
     endif
 
     ifeq ($(strip $(BLUETOOTH_DRIVER)), RN42)
-        OPT_DEFS += -DMODULE_RN42
+        OPT_DEFS += -DBLUETOOTH_RN42
         SRC += $(DRIVER_PATH)/bluetooth/rn42.c
         QUANTUM_LIB_SRC += uart.c
     endif
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 547df94d1f..132484b708 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -45,7 +45,7 @@
             "properties": {
                 "driver": {
                     "type": "string",
-                    "enum": ["AdafruitBLE", "RN42"]
+                    "enum": ["BluefruitLE", "RN42"]
                 },
                 "lto": {"type": "boolean"},
             }
diff --git a/docs/config_options.md b/docs/config_options.md
index 7657fae02e..832af78b22 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -429,8 +429,8 @@ Use these to enable or disable building certain features. The more you have enab
   * MIDI controls
 * `UNICODE_ENABLE`
   * Unicode
-* `BLUETOOTH`
-  * Current options are AdafruitBLE, RN42
+* `BLUETOOTH_ENABLE`
+  * Current options are BluefruitLE, RN42
 * `SPLIT_KEYBOARD`
   * Enables split keyboard support (dual MCU like the let's split and bakingpy's boards) and includes all necessary files located at quantum/split_common
 * `CUSTOM_MATRIX`
diff --git a/docs/feature_bluetooth.md b/docs/feature_bluetooth.md
index f6fb02d948..d4ed494053 100644
--- a/docs/feature_bluetooth.md
+++ b/docs/feature_bluetooth.md
@@ -7,7 +7,7 @@ Currently Bluetooth support is limited to AVR based chips. For Bluetooth 2.1, QM
 |Board                                                           |Bluetooth Protocol  |Connection Type|rules.mk                        |Bluetooth Chip|
 |----------------------------------------------------------------|--------------------|---------------|--------------------------------|--------------|
 |Roving Networks RN-42 (Sparkfun Bluesmirf)                      |Bluetooth Classic   |UART           |`BLUETOOTH_DRIVER = RN42`       |RN-42         |
-|[Bluefruit LE SPI Friend](https://www.adafruit.com/product/2633)|Bluetooth Low Energy|SPI            |`BLUETOOTH_DRIVER = AdafruitBLE`|nRF51822      |
+|[Bluefruit LE SPI Friend](https://www.adafruit.com/product/2633)|Bluetooth Low Energy|SPI            |`BLUETOOTH_DRIVER = BluefruitLE`|nRF51822      |
 
 Not Supported Yet but possible:
 * [Bluefruit LE UART Friend](https://www.adafruit.com/product/2479). [Possible tmk implementation found in](https://github.com/tmk/tmk_keyboard/issues/514)
@@ -17,9 +17,9 @@ Not Supported Yet but possible:
 
 ### Adafruit BLE SPI Friend
 Currently The only bluetooth chipset supported by QMK is the Adafruit Bluefruit SPI Friend. It's a Nordic nRF51822 based chip running Adafruit's custom firmware. Data is transmitted via Adafruit's SDEP over Hardware SPI. The [Feather 32u4 Bluefruit LE](https://www.adafruit.com/product/2829) is supported as it's an AVR mcu connected via SPI to the Nordic BLE chip with Adafruit firmware. If Building a custom board with the SPI friend it would be easiest to just use the pin selection that the 32u4 feather uses but you can change the pins in the config.h options with the following defines:
-* `#define ADAFRUIT_BLE_RST_PIN D4`
-* `#define ADAFRUIT_BLE_CS_PIN  B4`
-* `#define ADAFRUIT_BLE_IRQ_PIN E6`
+* `#define BLUEFRUIT_LE_RST_PIN D4`
+* `#define BLUEFRUIT_LE_CS_PIN  B4`
+* `#define BLUEFRUIT_LE_IRQ_PIN E6`
 
 A Bluefruit UART friend can be converted to an SPI friend, however this [requires](https://github.com/qmk/qmk_firmware/issues/2274) some reflashing and soldering directly to the MDBT40 chip.
 
@@ -32,7 +32,7 @@ Add the following to your `rules.mk`:
 
 ```make
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE # or RN42
+BLUETOOTH_DRIVER = BluefruitLE # or RN42
 ```
 
 ## Bluetooth Keycodes
diff --git a/drivers/bluetooth/adafruit_ble.cpp b/drivers/bluetooth/bluefruit_le.cpp
similarity index 92%
rename from drivers/bluetooth/adafruit_ble.cpp
rename to drivers/bluetooth/bluefruit_le.cpp
index 34a780e9a5..86581a1a48 100644
--- a/drivers/bluetooth/adafruit_ble.cpp
+++ b/drivers/bluetooth/bluefruit_le.cpp
@@ -1,4 +1,4 @@
-#include "adafruit_ble.h"
+#include "bluefruit_le.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -16,20 +16,20 @@
 // These are the pin assignments for the 32u4 boards.
 // You may define them to something else in your config.h
 // if yours is wired up differently.
-#ifndef ADAFRUIT_BLE_RST_PIN
-#    define ADAFRUIT_BLE_RST_PIN D4
+#ifndef BLUEFRUIT_LE_RST_PIN
+#    define BLUEFRUIT_LE_RST_PIN D4
 #endif
 
-#ifndef ADAFRUIT_BLE_CS_PIN
-#    define ADAFRUIT_BLE_CS_PIN B4
+#ifndef BLUEFRUIT_LE_CS_PIN
+#    define BLUEFRUIT_LE_CS_PIN B4
 #endif
 
-#ifndef ADAFRUIT_BLE_IRQ_PIN
-#    define ADAFRUIT_BLE_IRQ_PIN E6
+#ifndef BLUEFRUIT_LE_IRQ_PIN
+#    define BLUEFRUIT_LE_IRQ_PIN E6
 #endif
 
-#ifndef ADAFRUIT_BLE_SCK_DIVISOR
-#    define ADAFRUIT_BLE_SCK_DIVISOR 2  // 4MHz SCK/8MHz CPU, calculated for Feather 32U4 BLE
+#ifndef BLUEFRUIT_LE_SCK_DIVISOR
+#    define BLUEFRUIT_LE_SCK_DIVISOR 2  // 4MHz SCK/8MHz CPU, calculated for Feather 32U4 BLE
 #endif
 
 #define SAMPLE_BATTERY
@@ -143,7 +143,7 @@ static bool at_command_P(const char *cmd, char *resp, uint16_t resplen, bool ver
 
 // Send a single SDEP packet
 static bool sdep_send_pkt(const struct sdep_msg *msg, uint16_t timeout) {
-    spi_start(ADAFRUIT_BLE_CS_PIN, false, 0, ADAFRUIT_BLE_SCK_DIVISOR);
+    spi_start(BLUEFRUIT_LE_CS_PIN, false, 0, BLUEFRUIT_LE_SCK_DIVISOR);
     uint16_t timerStart = timer_read();
     bool     success    = false;
     bool     ready      = false;
@@ -157,7 +157,7 @@ static bool sdep_send_pkt(const struct sdep_msg *msg, uint16_t timeout) {
         // Release it and let it initialize
         spi_stop();
         wait_us(SdepBackOff);
-        spi_start(ADAFRUIT_BLE_CS_PIN, false, 0, ADAFRUIT_BLE_SCK_DIVISOR);
+        spi_start(BLUEFRUIT_LE_CS_PIN, false, 0, BLUEFRUIT_LE_SCK_DIVISOR);
     } while (timer_elapsed(timerStart) < timeout);
 
     if (ready) {
@@ -190,7 +190,7 @@ static bool sdep_recv_pkt(struct sdep_msg *msg, uint16_t timeout) {
     bool     ready      = false;
 
     do {
-        ready = readPin(ADAFRUIT_BLE_IRQ_PIN);
+        ready = readPin(BLUEFRUIT_LE_IRQ_PIN);
         if (ready) {
             break;
         }
@@ -198,7 +198,7 @@ static bool sdep_recv_pkt(struct sdep_msg *msg, uint16_t timeout) {
     } while (timer_elapsed(timerStart) < timeout);
 
     if (ready) {
-        spi_start(ADAFRUIT_BLE_CS_PIN, false, 0, ADAFRUIT_BLE_SCK_DIVISOR);
+        spi_start(BLUEFRUIT_LE_CS_PIN, false, 0, BLUEFRUIT_LE_SCK_DIVISOR);
 
         do {
             // Read the command type, waiting for the data to be ready
@@ -207,7 +207,7 @@ static bool sdep_recv_pkt(struct sdep_msg *msg, uint16_t timeout) {
                 // Release it and let it initialize
                 spi_stop();
                 wait_us(SdepBackOff);
-                spi_start(ADAFRUIT_BLE_CS_PIN, false, 0, ADAFRUIT_BLE_SCK_DIVISOR);
+                spi_start(BLUEFRUIT_LE_CS_PIN, false, 0, BLUEFRUIT_LE_SCK_DIVISOR);
                 continue;
             }
 
@@ -233,7 +233,7 @@ static void resp_buf_read_one(bool greedy) {
         return;
     }
 
-    if (readPin(ADAFRUIT_BLE_IRQ_PIN)) {
+    if (readPin(BLUEFRUIT_LE_IRQ_PIN)) {
         struct sdep_msg msg;
 
     again:
@@ -244,7 +244,7 @@ static void resp_buf_read_one(bool greedy) {
                 dprintf("recv latency %dms\n", TIMER_DIFF_16(timer_read(), last_send));
             }
 
-            if (greedy && resp_buf.peek(last_send) && readPin(ADAFRUIT_BLE_IRQ_PIN)) {
+            if (greedy && resp_buf.peek(last_send) && readPin(BLUEFRUIT_LE_IRQ_PIN)) {
                 goto again;
             }
         }
@@ -295,16 +295,16 @@ static bool ble_init(void) {
     state.configured   = false;
     state.is_connected = false;
 
-    setPinInput(ADAFRUIT_BLE_IRQ_PIN);
+    setPinInput(BLUEFRUIT_LE_IRQ_PIN);
 
     spi_init();
 
     // Perform a hardware reset
-    setPinOutput(ADAFRUIT_BLE_RST_PIN);
-    writePinHigh(ADAFRUIT_BLE_RST_PIN);
-    writePinLow(ADAFRUIT_BLE_RST_PIN);
+    setPinOutput(BLUEFRUIT_LE_RST_PIN);
+    writePinHigh(BLUEFRUIT_LE_RST_PIN);
+    writePinLow(BLUEFRUIT_LE_RST_PIN);
     wait_ms(10);
-    writePinHigh(ADAFRUIT_BLE_RST_PIN);
+    writePinHigh(BLUEFRUIT_LE_RST_PIN);
 
     wait_ms(1000);  // Give it a second to initialize
 
@@ -424,9 +424,9 @@ bool at_command_P(const char *cmd, char *resp, uint16_t resplen, bool verbose) {
     return at_command(cmdbuf, resp, resplen, verbose);
 }
 
-bool adafruit_ble_is_connected(void) { return state.is_connected; }
+bool bluefruit_le_is_connected(void) { return state.is_connected; }
 
-bool adafruit_ble_enable_keyboard(void) {
+bool bluefruit_le_enable_keyboard(void) {
     char resbuf[128];
 
     if (!state.initialized && !ble_init()) {
@@ -498,16 +498,16 @@ static void set_connected(bool connected) {
     }
 }
 
-void adafruit_ble_task(void) {
+void bluefruit_le_task(void) {
     char resbuf[48];
 
-    if (!state.configured && !adafruit_ble_enable_keyboard()) {
+    if (!state.configured && !bluefruit_le_enable_keyboard()) {
         return;
     }
     resp_buf_read_one(true);
     send_buf_send_one(SdepShortTimeout);
 
-    if (resp_buf.empty() && (state.event_flags & UsingEvents) && readPin(ADAFRUIT_BLE_IRQ_PIN)) {
+    if (resp_buf.empty() && (state.event_flags & UsingEvents) && readPin(BLUEFRUIT_LE_IRQ_PIN)) {
         // Must be an event update
         if (at_command_P(PSTR("AT+EVENTSTATUS"), resbuf, sizeof(resbuf))) {
             uint32_t mask = strtoul(resbuf, NULL, 16);
@@ -609,7 +609,7 @@ static bool process_queue_item(struct queue_item *item, uint16_t timeout) {
     }
 }
 
-void adafruit_ble_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uint8_t nkeys) {
+void bluefruit_le_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uint8_t nkeys) {
     struct queue_item item;
     bool              didWait = false;
 
@@ -643,7 +643,7 @@ void adafruit_ble_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uint8_t nk
     }
 }
 
-void adafruit_ble_send_consumer_key(uint16_t usage) {
+void bluefruit_le_send_consumer_key(uint16_t usage) {
     struct queue_item item;
 
     item.queue_type = QTConsumer;
@@ -655,7 +655,7 @@ void adafruit_ble_send_consumer_key(uint16_t usage) {
 }
 
 #ifdef MOUSE_ENABLE
-void adafruit_ble_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan, uint8_t buttons) {
+void bluefruit_le_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan, uint8_t buttons) {
     struct queue_item item;
 
     item.queue_type        = QTMouseMove;
@@ -671,9 +671,9 @@ void adafruit_ble_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan,
 }
 #endif
 
-uint32_t adafruit_ble_read_battery_voltage(void) { return state.vbat; }
+uint32_t bluefruit_le_read_battery_voltage(void) { return state.vbat; }
 
-bool adafruit_ble_set_mode_leds(bool on) {
+bool bluefruit_le_set_mode_leds(bool on) {
     if (!state.configured) {
         return false;
     }
@@ -689,7 +689,7 @@ bool adafruit_ble_set_mode_leds(bool on) {
 }
 
 // https://learn.adafruit.com/adafruit-feather-32u4-bluefruit-le/ble-generic#at-plus-blepowerlevel
-bool adafruit_ble_set_power_level(int8_t level) {
+bool bluefruit_le_set_power_level(int8_t level) {
     char cmd[46];
     if (!state.configured) {
         return false;
diff --git a/drivers/bluetooth/adafruit_ble.h b/drivers/bluetooth/bluefruit_le.h
similarity index 70%
rename from drivers/bluetooth/adafruit_ble.h
rename to drivers/bluetooth/bluefruit_le.h
index b43e0771d9..de301c6167 100644
--- a/drivers/bluetooth/adafruit_ble.h
+++ b/drivers/bluetooth/bluefruit_le.h
@@ -16,43 +16,43 @@ extern "C" {
 #endif
 
 /* Instruct the module to enable HID keyboard support and reset */
-extern bool adafruit_ble_enable_keyboard(void);
+extern bool bluefruit_le_enable_keyboard(void);
 
 /* Query to see if the BLE module is connected */
-extern bool adafruit_ble_query_is_connected(void);
+extern bool bluefruit_le_query_is_connected(void);
 
 /* Returns true if we believe that the BLE module is connected.
  * This uses our cached understanding that is maintained by
  * calling ble_task() periodically. */
-extern bool adafruit_ble_is_connected(void);
+extern bool bluefruit_le_is_connected(void);
 
 /* Call this periodically to process BLE-originated things */
-extern void adafruit_ble_task(void);
+extern void bluefruit_le_task(void);
 
 /* Generates keypress events for a set of keys.
  * The hid modifier mask specifies the state of the modifier keys for
  * this set of keys.
  * Also sends a key release indicator, so that the keys do not remain
  * held down. */
-extern void adafruit_ble_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uint8_t nkeys);
+extern void bluefruit_le_send_keys(uint8_t hid_modifier_mask, uint8_t *keys, uint8_t nkeys);
 
 /* Send a consumer usage.
  * (milliseconds) */
-extern void adafruit_ble_send_consumer_key(uint16_t usage);
+extern void bluefruit_le_send_consumer_key(uint16_t usage);
 
 #ifdef MOUSE_ENABLE
 /* Send a mouse/wheel movement report.
  * The parameters are signed and indicate positive or negative direction
  * change. */
-extern void adafruit_ble_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan, uint8_t buttons);
+extern void bluefruit_le_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan, uint8_t buttons);
 #endif
 
 /* Compute battery voltage by reading an analog pin.
  * Returns the integer number of millivolts */
-extern uint32_t adafruit_ble_read_battery_voltage(void);
+extern uint32_t bluefruit_le_read_battery_voltage(void);
 
-extern bool adafruit_ble_set_mode_leds(bool on);
-extern bool adafruit_ble_set_power_level(int8_t level);
+extern bool bluefruit_le_set_mode_leds(bool on);
+extern bool bluefruit_le_set_power_level(int8_t level);
 
 #ifdef __cplusplus
 }
diff --git a/drivers/bluetooth/outputselect.c b/drivers/bluetooth/outputselect.c
index f758c65280..cdd2e64cfd 100644
--- a/drivers/bluetooth/outputselect.c
+++ b/drivers/bluetooth/outputselect.c
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "lufa.h"
 #endif
 
-#ifdef MODULE_ADAFRUIT_BLE
-#    include "adafruit_ble.h"
+#ifdef BLUETOOTH_BLUEFRUIT_LE
+#    include "bluefruit_le.h"
 #endif
 
 uint8_t desired_output = OUTPUT_DEFAULT;
@@ -54,8 +54,8 @@ uint8_t auto_detect_output(void) {
         return OUTPUT_USB;
     }
 
-#ifdef MODULE_ADAFRUIT_BLE
-    if (adafruit_ble_is_connected()) {
+#ifdef BLUETOOTH_BLUEFRUIT_LE
+    if (bluefruit_le_is_connected()) {
         return OUTPUT_BLUETOOTH;
     }
 #endif
diff --git a/keyboards/10bleoledhub/rules.mk b/keyboards/10bleoledhub/rules.mk
index 33170c43a2..bd10e11022 100644
--- a/keyboards/10bleoledhub/rules.mk
+++ b/keyboards/10bleoledhub/rules.mk
@@ -20,7 +20,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/40percentclub/mf68/keymaps/mf68_ble/rules.mk b/keyboards/40percentclub/mf68/keymaps/mf68_ble/rules.mk
index 160b3684b3..975c581883 100644
--- a/keyboards/40percentclub/mf68/keymaps/mf68_ble/rules.mk
+++ b/keyboards/40percentclub/mf68/keymaps/mf68_ble/rules.mk
@@ -5,5 +5,5 @@ F_CPU = 8000000
 #   change yes to no to disable
 #
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
 BACKLIGHT_ENABLE = no
diff --git a/keyboards/atreus/feather/rules.mk b/keyboards/atreus/feather/rules.mk
index ad0b4a5046..6280275c1e 100644
--- a/keyboards/atreus/feather/rules.mk
+++ b/keyboards/atreus/feather/rules.mk
@@ -11,5 +11,5 @@ BOOTLOADER = caterina
 #   change yes to no to disable
 #
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
 CONSOLE_ENABLE = no
diff --git a/keyboards/bioi/main.c b/keyboards/bioi/main.c
index 7c8922c0a0..54caf6937b 100644
--- a/keyboards/bioi/main.c
+++ b/keyboards/bioi/main.c
@@ -45,8 +45,8 @@ extern keymap_config_t keymap_config;
 #endif
 
 #ifdef BLUETOOTH_ENABLE
-#ifdef MODULE_ADAFRUIT_BLE
-#include "adafruit_ble.h"
+#ifdef BLUETOOTH_BLUEFRUIT_LE
+#include "bluefruit_le.h"
 #else
 #include "bluetooth.h"
 #endif
@@ -319,7 +319,7 @@ int main(void)
     setup_usb();
     sei();
 
-#if defined(MODULE_ADAFRUIT_EZKEY) || defined(MODULE_RN42)
+#if defined(BLUETOOTH_RN42)
     serial_init();
 #endif
 
diff --git a/keyboards/converter/m0110_usb/readme.md b/keyboards/converter/m0110_usb/readme.md
index a148091cd9..d066aa5a7c 100644
--- a/keyboards/converter/m0110_usb/readme.md
+++ b/keyboards/converter/m0110_usb/readme.md
@@ -5,7 +5,7 @@ This is a port of the original M0110 converter from TMK to QMK. The original con
 
 ## Enabling Bluetooth for the Adafruit Feather 32U4 BLE
 
-Simply add `BLUETOOTH = AdafruitBLE` to your `rules.mk` file. This enables code specifically for the Adafruit Feather 32U4 BLE. If enabled, the device will use the `PRODUCT` value from `config.h` for the device name displayed by the Feather on host devices. You can simply change these values to change the device name.
+Simply add `BLUETOOTH = BluefruitLE` to your `rules.mk` file. This enables code specifically for the Adafruit Feather 32U4 BLE. If enabled, the device will use the `PRODUCT` value from `config.h` for the device name displayed by the Feather on host devices. You can simply change these values to change the device name.
 
 
 ## Pins
diff --git a/keyboards/converter/usb_usb/ble/config.h b/keyboards/converter/usb_usb/ble/config.h
index 80e4968c41..92df24d003 100644
--- a/keyboards/converter/usb_usb/ble/config.h
+++ b/keyboards/converter/usb_usb/ble/config.h
@@ -4,8 +4,8 @@
 #define PRODUCT         QMK BLE Adapter
 
 // Turn off the mode leds on the BLE module
-#define ADAFRUIT_BLE_ENABLE_MODE_LEDS 0
-#define ADAFRUIT_BLE_ENABLE_POWER_LED 0
+#define BLUEFRUIT_LE_ENABLE_MODE_LEDS 0
+#define BLUEFRUIT_LE_ENABLE_POWER_LED 0
 
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
diff --git a/keyboards/converter/usb_usb/ble/rules.mk b/keyboards/converter/usb_usb/ble/rules.mk
index 596f719630..df5bc36635 100644
--- a/keyboards/converter/usb_usb/ble/rules.mk
+++ b/keyboards/converter/usb_usb/ble/rules.mk
@@ -12,6 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
 
 LTO_ENABLE = yes
diff --git a/keyboards/dtisaac/dosa40rgb/readme.md b/keyboards/dtisaac/dosa40rgb/readme.md
index 5f288c6b76..a2995a5c0f 100644
--- a/keyboards/dtisaac/dosa40rgb/readme.md
+++ b/keyboards/dtisaac/dosa40rgb/readme.md
@@ -5,7 +5,7 @@
 A 40 percent keyboard dosa40rgb Bluetooth Low Energy
 
 * Keyboard Maintainer: [DTIsaac](https://github.com/daotakisaac)
-* Hardware Supported: ATmega32U4 + AdafruitBLE SPI
+* Hardware Supported: ATmega32U4 + Bluefruit LE SPI
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/dtisaac/dosa40rgb/rules.mk b/keyboards/dtisaac/dosa40rgb/rules.mk
index 91d3c94ba5..caecba365e 100644
--- a/keyboards/dtisaac/dosa40rgb/rules.mk
+++ b/keyboards/dtisaac/dosa40rgb/rules.mk
@@ -17,7 +17,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes      # Enable Bluetooth
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
 
diff --git a/keyboards/handwired/42/rules.mk b/keyboards/handwired/42/rules.mk
index 5742e84bf5..655ce00bef 100644
--- a/keyboards/handwired/42/rules.mk
+++ b/keyboards/handwired/42/rules.mk
@@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/handwired/bdn9_ble/rules.mk b/keyboards/handwired/bdn9_ble/rules.mk
index e5abbcfb88..a3082cf364 100644
--- a/keyboards/handwired/bdn9_ble/rules.mk
+++ b/keyboards/handwired/bdn9_ble/rules.mk
@@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = no
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/handwired/fruity60/rules.mk b/keyboards/handwired/fruity60/rules.mk
index 74628e3e6f..c84f68f0bf 100644
--- a/keyboards/handwired/fruity60/rules.mk
+++ b/keyboards/handwired/fruity60/rules.mk
@@ -20,6 +20,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
 
 LAYOUTS = 60_tsangan_hhkb
diff --git a/keyboards/handwired/prkl30/feather/rules.mk b/keyboards/handwired/prkl30/feather/rules.mk
index f83173fa0b..7578dcef74 100644
--- a/keyboards/handwired/prkl30/feather/rules.mk
+++ b/keyboards/handwired/prkl30/feather/rules.mk
@@ -22,4 +22,4 @@ AUDIO_ENABLE  = no          # This can be enabled if a speaker is connected to t
 RGBLIGHT_ENABLE  = no       # This can be enabled if a ws2812 strip is connected to the expansion port.
 
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index 14a293bb39..e12142c50b 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -137,7 +137,7 @@ enum planck_keycodes {
 #ifndef FAUXCLICKY_ENABLE
   FC_TOG,
 #endif
-#ifndef MODULE_ADAFRUIT_BLE
+#ifndef BLUETOOTH_BLUEFRUIT_LE
   OUT_BT,
 #endif
   RGBDEMO,
@@ -1261,7 +1261,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void set_output_user(uint8_t output) {
-#ifdef MODULE_ADAFRUIT_BLE
+#ifdef BLUETOOTH_BLUEFRUIT_LE
   switch(output) {
     case OUTPUT_USB:
       led_set_output_usb();
@@ -1285,7 +1285,7 @@ void matrix_init_user() {
 #endif
 
   // auto detect output on init
-#ifdef MODULE_ADAFRUIT_BLE
+#ifdef BLUETOOTH_BLUEFRUIT_LE
   uint8_t output = auto_detect_output();
   if (output == OUTPUT_USB) {
     set_output(OUTPUT_USB);
diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
index 094eb15762..94b505aa2c 100644
--- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c
@@ -140,7 +140,7 @@ enum planck_keycodes {
 #ifndef FAUXCLICKY_ENABLE
   FC_TOG,
 #endif
-#ifndef MODULE_ADAFRUIT_BLE
+#ifndef BLUETOOTH_BLUEFRUIT_LE
   OUT_BT,
 #endif
   RGBDEMO,
@@ -1264,7 +1264,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void set_output_user(uint8_t output) {
-#ifdef MODULE_ADAFRUIT_BLE
+#ifdef BLUETOOTH_BLUEFRUIT_LE
   switch(output) {
     case OUTPUT_USB:
       led_set_output_usb();
@@ -1288,7 +1288,7 @@ void matrix_init_user() {
 #endif
 
   // auto detect output on init
-#ifdef MODULE_ADAFRUIT_BLE
+#ifdef BLUETOOTH_BLUEFRUIT_LE
   uint8_t output = auto_detect_output();
   if (output == OUTPUT_USB) {
     set_output(OUTPUT_USB);
diff --git a/keyboards/handwired/promethium/promethium.c b/keyboards/handwired/promethium/promethium.c
index 8eb1680d84..0df6c28e9b 100644
--- a/keyboards/handwired/promethium/promethium.c
+++ b/keyboards/handwired/promethium/promethium.c
@@ -3,7 +3,7 @@
 #include "timer.h"
 #include "matrix.h"
 #include "musical_notes.h"
-#include "adafruit_ble.h"
+#include "bluefruit_le.h"
 
 float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_A4, 0.0625);
 float fauxclicky_released_note[2] = MUSICAL_NOTE(_A4, 0.0625);
@@ -12,7 +12,7 @@ float fauxclicky_beep_note[2] = MUSICAL_NOTE(_C6, 0.25);
 // cubic fit {3.3, 0}, {3.5, 2.9}, {3.6, 5}, {3.7, 8.6}, {3.8, 36},  {3.9, 62}, {4.0, 73}, {4.05, 83}, {4.1, 89}, {4.15, 94}, {4.2, 100}
 
 uint8_t battery_level(void) {
-    float voltage = adafruit_ble_read_battery_voltage() * 2 * 3.3 / 1024;
+    float voltage = bluefruit_le_read_battery_voltage() * 2 * 3.3 / 1024;
     if (voltage < MIN_VOLTAGE) return 0;
     if (voltage > MAX_VOLTAGE) return 255;
     return (voltage - MIN_VOLTAGE) / (MAX_VOLTAGE - MIN_VOLTAGE) * 255;
diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk
index f41e88b0c4..383800ee01 100644
--- a/keyboards/handwired/promethium/rules.mk
+++ b/keyboards/handwired/promethium/rules.mk
@@ -23,7 +23,7 @@ PS2_MOUSE_ENABLE = yes
 PS2_USE_INT = yes
 CUSTOM_MATRIX = yes
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
 
 SRC += ws2812.c
 SRC += rgbsps.c
diff --git a/keyboards/handwired/pterodactyl/rules.mk b/keyboards/handwired/pterodactyl/rules.mk
index 629b30e385..fd63e2ad48 100644
--- a/keyboards/handwired/pterodactyl/rules.mk
+++ b/keyboards/handwired/pterodactyl/rules.mk
@@ -22,7 +22,7 @@ AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
 CUSTOM_MATRIX = yes
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
 
 SRC += matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/handwired/slash/rules.mk b/keyboards/handwired/slash/rules.mk
index 275a2eb7eb..53d114978f 100644
--- a/keyboards/handwired/slash/rules.mk
+++ b/keyboards/handwired/slash/rules.mk
@@ -20,4 +20,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/latin47ble/rules.mk b/keyboards/latin47ble/rules.mk
index 95044a18bd..015c454728 100644
--- a/keyboards/latin47ble/rules.mk
+++ b/keyboards/latin47ble/rules.mk
@@ -20,6 +20,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
 
 LAYOUTS = planck_mit
diff --git a/keyboards/latin64ble/rules.mk b/keyboards/latin64ble/rules.mk
index 30f105ef49..97717333de 100644
--- a/keyboards/latin64ble/rules.mk
+++ b/keyboards/latin64ble/rules.mk
@@ -20,4 +20,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/latinpadble/rules.mk b/keyboards/latinpadble/rules.mk
index aac9dde15f..06816c2ef8 100644
--- a/keyboards/latinpadble/rules.mk
+++ b/keyboards/latinpadble/rules.mk
@@ -21,7 +21,7 @@ RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
 OLED_ENABLE = yes
 OLED_DRIVER = SSD1306
 ENCODER_ENABLE = yes
diff --git a/keyboards/meira/featherble/rules.mk b/keyboards/meira/featherble/rules.mk
index d3e985e8c2..01f1af1ae8 100644
--- a/keyboards/meira/featherble/rules.mk
+++ b/keyboards/meira/featherble/rules.mk
@@ -2,4 +2,4 @@
 F_CPU = 8000000
 
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
diff --git a/keyboards/nek_type_a/rules.mk b/keyboards/nek_type_a/rules.mk
index ea79c962da..0a8adccb52 100644
--- a/keyboards/nek_type_a/rules.mk
+++ b/keyboards/nek_type_a/rules.mk
@@ -22,6 +22,6 @@ AUDIO_ENABLE = no           # Audio output
 CUSTOM_MATRIX = yes
 DEBUG_ENABLE = yes
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
 
 SRC += matrix.c mcp23017.c
diff --git a/keyboards/spaceman/pancake/rev1/feather/rules.mk b/keyboards/spaceman/pancake/rev1/feather/rules.mk
index 6530422734..c213c70872 100644
--- a/keyboards/spaceman/pancake/rev1/feather/rules.mk
+++ b/keyboards/spaceman/pancake/rev1/feather/rules.mk
@@ -20,7 +20,7 @@ BACKLIGHT_ENABLE  = no  # Custom backlighting code is used, so this should not b
 AUDIO_ENABLE  = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
 RGBLIGHT_ENABLE  = no # This can be enabled if a ws2812 strip is connected to the expansion port.
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
 
 LAYOUTS = ortho_4x12 planck_mit
 
diff --git a/keyboards/tokyokeyboard/alix40/rules.mk b/keyboards/tokyokeyboard/alix40/rules.mk
index f9e5e2485a..358de97c5a 100644
--- a/keyboards/tokyokeyboard/alix40/rules.mk
+++ b/keyboards/tokyokeyboard/alix40/rules.mk
@@ -20,4 +20,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 BLUETOOTH_ENABLE = yes
-BLUETOOTH_DRIVER = AdafruitBLE
+BLUETOOTH_DRIVER = BluefruitLE
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index b9c2616058..3943f8c92b 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -67,9 +67,9 @@ extern keymap_config_t keymap_config;
 
 #ifdef BLUETOOTH_ENABLE
 #    include "outputselect.h"
-#    ifdef MODULE_ADAFRUIT_BLE
-#        include "adafruit_ble.h"
-#    elif MODULE_RN42
+#    ifdef BLUETOOTH_BLUEFRUIT_LE
+#        include "bluefruit_le.h"
+#    elif BLUETOOTH_RN42
 #        include "rn42.h"
 #    endif
 #endif
@@ -645,9 +645,9 @@ static void send_keyboard(report_keyboard_t *report) {
 
 #ifdef BLUETOOTH_ENABLE
     if (where_to_send() == OUTPUT_BLUETOOTH) {
-#    ifdef MODULE_ADAFRUIT_BLE
-        adafruit_ble_send_keys(report->mods, report->keys, sizeof(report->keys));
-#    elif MODULE_RN42
+#    ifdef BLUETOOTH_BLUEFRUIT_LE
+        bluefruit_le_send_keys(report->mods, report->keys, sizeof(report->keys));
+#    elif BLUETOOTH_RN42
         rn42_send_keyboard(report);
 #    endif
         return;
@@ -691,10 +691,10 @@ static void send_mouse(report_mouse_t *report) {
 
 #    ifdef BLUETOOTH_ENABLE
     if (where_to_send() == OUTPUT_BLUETOOTH) {
-#        ifdef MODULE_ADAFRUIT_BLE
+#        ifdef BLUETOOTH_BLUEFRUIT_LE
         // FIXME: mouse buttons
-        adafruit_ble_send_mouse_move(report->x, report->y, report->v, report->h, report->buttons);
-#        elif MODULE_RN42
+        bluefruit_le_send_mouse_move(report->x, report->y, report->v, report->h, report->buttons);
+#        elif BLUETOOTH_RN42
         rn42_send_mouse(report);
 #        endif
         return;
@@ -763,9 +763,9 @@ static void send_consumer(uint16_t data) {
 #ifdef EXTRAKEY_ENABLE
 #    ifdef BLUETOOTH_ENABLE
     if (where_to_send() == OUTPUT_BLUETOOTH) {
-#        ifdef MODULE_ADAFRUIT_BLE
-        adafruit_ble_send_consumer_key(data);
-#        elif MODULE_RN42
+#        ifdef BLUETOOTH_BLUEFRUIT_LE
+        bluefruit_le_send_consumer_key(data);
+#        elif BLUETOOTH_RN42
         rn42_send_consumer(data);
 #        endif
         return;
@@ -1013,7 +1013,7 @@ void protocol_pre_init(void) {
     setup_usb();
     sei();
 
-#if defined(MODULE_RN42)
+#if defined(BLUETOOTH_RN42)
     rn42_init();
 #endif
 
@@ -1066,8 +1066,8 @@ void protocol_post_task(void) {
     MIDI_Device_USBTask(&USB_MIDI_Interface);
 #endif
 
-#ifdef MODULE_ADAFRUIT_BLE
-    adafruit_ble_task();
+#ifdef BLUETOOTH_BLUEFRUIT_LE
+    bluefruit_le_task();
 #endif
 
 #ifdef VIRTSER_ENABLE
diff --git a/users/wanleg/rules.mk b/users/wanleg/rules.mk
index 410803512d..de4decf78a 100644
--- a/users/wanleg/rules.mk
+++ b/users/wanleg/rules.mk
@@ -22,7 +22,7 @@ ifeq ($(strip $(BT)), yes)
   OPT_DEFS += -DBLUEFRUIT
   #Adafruit Bluefruit controller settings
   BLUETOOTH_ENABLE = yes
-  BLUETOOTH_DRIVER = AdafruitBLE
+  BLUETOOTH_DRIVER = BluefruitLE
   F_CPU = 8000000
   CONSOLE_ENABLE = no 		# Console for debug(+400)
   COMMAND_ENABLE = no 		# Commands for debug and configuration

From 42ba4e8cae6da1ad0cdc083221449ff19041dc30 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 30 Jan 2022 10:35:43 -0800
Subject: [PATCH 427/867] Cutie Club Giant Macro Pad: Update QMK Configurator
 Implementation (#16132)

---
 keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h       | 2 +-
 keyboards/cutie_club/giant_macro_pad/info.json               | 5 ++++-
 .../cutie_club/giant_macro_pad/keymaps/default/keymap.c      | 2 +-
 keyboards/cutie_club/giant_macro_pad/keymaps/via/keymap.c    | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h b/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h
index 8e0b612f3c..478846e3c2 100755
--- a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h
+++ b/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h
@@ -26,7 +26,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT_all( \
+#define LAYOUT_ortho_20x20( \
     k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15, k00_16, k00_17, k00_18, k00_19, \
     k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, k01_14, k01_15, k01_16, k01_17, k01_18, k01_19, \
     k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, k02_14, k02_15, k02_16, k02_17, k02_18, k02_19, \
diff --git a/keyboards/cutie_club/giant_macro_pad/info.json b/keyboards/cutie_club/giant_macro_pad/info.json
index 348f3a3f5a..f8225fdae7 100644
--- a/keyboards/cutie_club/giant_macro_pad/info.json
+++ b/keyboards/cutie_club/giant_macro_pad/info.json
@@ -2,8 +2,11 @@
     "keyboard_name": "Cupar19 Giant Macro Pad",
     "url": "",
     "maintainer": "cutie-club",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_ortho_20x20"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_ortho_20x20": {
             "layout": [
                 {"label":"k00_00", "x":0, "y":0},
                 {"label":"k00_01", "x":1, "y":0},
diff --git a/keyboards/cutie_club/giant_macro_pad/keymaps/default/keymap.c b/keyboards/cutie_club/giant_macro_pad/keymaps/default/keymap.c
index 2db71e990c..4226060472 100755
--- a/keyboards/cutie_club/giant_macro_pad/keymaps/default/keymap.c
+++ b/keyboards/cutie_club/giant_macro_pad/keymaps/default/keymap.c
@@ -421,7 +421,7 @@ enum custom_keycodes {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_all(
+    [0] = LAYOUT_ortho_20x20(
         NUM_0,  NUM_1,  NUM_2,  NUM_3,  NUM_4,  NUM_5,  NUM_6,  NUM_7,  NUM_8,  NUM_9,  NUM_10, NUM_11, NUM_12, NUM_13, NUM_14, NUM_15, NUM_16, NUM_17, NUM_18, NUM_19,
         NUM_20, NUM_21, NUM_22, NUM_23, NUM_24, NUM_25, NUM_26, NUM_27, NUM_28, NUM_29, NUM_30, NUM_31, NUM_32, NUM_33, NUM_34, NUM_35, NUM_36, NUM_37, NUM_38, NUM_39,
         NUM_40, NUM_41, NUM_42, NUM_43, NUM_44, NUM_45, NUM_46, NUM_47, NUM_48, NUM_49, NUM_50, NUM_51, NUM_52, NUM_53, NUM_54, NUM_55, NUM_56, NUM_57, NUM_58, NUM_59,
diff --git a/keyboards/cutie_club/giant_macro_pad/keymaps/via/keymap.c b/keyboards/cutie_club/giant_macro_pad/keymaps/via/keymap.c
index 64b3f2b530..db9a718a9b 100755
--- a/keyboards/cutie_club/giant_macro_pad/keymaps/via/keymap.c
+++ b/keyboards/cutie_club/giant_macro_pad/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_all(
+    [0] = LAYOUT_ortho_20x20(
         KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,
         KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,
         KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,

From 7a81d5ee0dae6ad3a8c4ce14458fe996f91cc773 Mon Sep 17 00:00:00 2001
From: Andrew Garver <andrewsgarver@gmail.com>
Date: Sun, 30 Jan 2022 11:46:54 -0700
Subject: [PATCH 428/867] [Keyboard] added via keymap for ferris sweep (#16130)

---
 keyboards/ferris/keymaps/via/keymap.c | 43 +++++++++++++++++++++++++++
 keyboards/ferris/keymaps/via/rules.mk |  2 ++
 2 files changed, 45 insertions(+)
 create mode 100644 keyboards/ferris/keymaps/via/keymap.c
 create mode 100644 keyboards/ferris/keymaps/via/rules.mk

diff --git a/keyboards/ferris/keymaps/via/keymap.c b/keyboards/ferris/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b1ccd84fee
--- /dev/null
+++ b/keyboards/ferris/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+// this is the style you want to emulate.
+// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
+
+#include QMK_KEYBOARD_H
+
+#define KC_CTSC RCTL_T(KC_SCLN)
+#define KC_CTLA LCTL_T(KC_A)
+#define KC_LSHZ LSFT_T(KC_Z)
+#define KC_RLSH RSFT_T(KC_SLSH)
+#define KC_SPM2 LT(2, KC_SPC)
+#define KC_BSM1 LT(1, KC_BSPC)
+#define KC_GUTA GUI_T(KC_TAB)
+#define KC_CLGV CTL_T(KC_GRV)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            KC_Y,    KC_U,  KC_I,    KC_O,   KC_P,
+    KC_CTLA, KC_S,    KC_D,    KC_F,    KC_G,            KC_H,    KC_J,  KC_K,    KC_L,   KC_SCLN,
+    KC_LSHZ, KC_X,    KC_C,    KC_V,    KC_B,            KC_N,    KC_M,  KC_COMM, KC_DOT, KC_RLSH,
+                                    KC_CLGV, KC_BSM1, KC_SPM2, KC_GUTA
+  ),
+
+  [1] = LAYOUT(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    KC_GESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,         KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ENT,
+                                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
+  ),
+
+  [2] = LAYOUT(
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,           KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
+    KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_PIPE,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, RESET,
+                                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [3] = LAYOUT(
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+};
diff --git a/keyboards/ferris/keymaps/via/rules.mk b/keyboards/ferris/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/ferris/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file

From 62851b5abd9eef864af5f4431c4ee8ad1762c53b Mon Sep 17 00:00:00 2001
From: Christian Grumbein <33924002+hachetman@users.noreply.github.com>
Date: Sun, 30 Jan 2022 19:47:11 +0100
Subject: [PATCH 429/867] [Keymap] Add hachetman layout for GMMK Pro (#16131)

---
 .../gmmk/pro/ansi/keymaps/hachetman/config.h  |  22 ++
 .../gmmk/pro/ansi/keymaps/hachetman/keymap.c  | 307 ++++++++++++++++++
 .../gmmk/pro/ansi/keymaps/hachetman/readme.md |  26 ++
 .../gmmk/pro/ansi/keymaps/hachetman/rules.mk  |   5 +
 4 files changed, 360 insertions(+)
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/hachetman/config.h
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/hachetman/keymap.c
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/hachetman/readme.md
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/hachetman/rules.mk

diff --git a/keyboards/gmmk/pro/ansi/keymaps/hachetman/config.h b/keyboards/gmmk/pro/ansi/keymaps/hachetman/config.h
new file mode 100644
index 0000000000..1438d317fb
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/hachetman/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Andre Brait
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef RGB_MATRIX_ENABLE
+    #define RGB_DISABLE_TIMEOUT 1200000     // 20 minutes (20 * 60 * 1000ms)
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED
+#endif
diff --git a/keyboards/gmmk/pro/ansi/keymaps/hachetman/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/hachetman/keymap.c
new file mode 100644
index 0000000000..19694d54c1
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/hachetman/keymap.c
@@ -0,0 +1,307 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+   Copyright 2021 Andre Brait <andrebrait@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#ifdef RGB_MATRIX_ENABLE
+    #ifndef RGB_CONFIRMATION_BLINKING_TIME
+        #define RGB_CONFIRMATION_BLINKING_TIME 2000 // 2 seconds
+    #endif
+#endif // RGB_MATRIX_ENABLE
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Del          Rotary(Play/Pause)
+//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Home
+//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
+//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
+//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
+//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
+
+
+    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
+    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
+    // if that's your preference.
+    //
+    // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
+    // it'll be back to normal when you plug it back in.
+    //
+    // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
+    // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
+    // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_INS,           _______,
+        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PSCR,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+    ),
+
+
+};
+// clang-format on
+
+const key_override_t up_key_override = ko_make_basic(MOD_MASK_CTRL, KC_UP, KC_PGUP);
+const key_override_t dn_key_override = ko_make_basic(MOD_MASK_CTRL, KC_DOWN, KC_PGDN);
+
+// This globally defines all key overrides to be used
+const key_override_t **key_overrides = (const key_override_t *[]){
+       &up_key_override,
+       &dn_key_override,
+       NULL // Null terminate the array of overrides!
+};
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+      tap_code(KC_VOLU);
+    } else {
+      tap_code(KC_VOLD);
+    }
+    return true;
+}
+#endif // ENCODER_ENABLE
+
+#ifdef RGB_MATRIX_ENABLE
+
+/* Renaming those to make the purpose on this keymap clearer */
+#define LED_FLAG_CAPS LED_FLAG_NONE
+#define LED_FLAG_EFFECTS LED_FLAG_INDICATOR
+
+static void set_rgb_caps_leds(void);
+
+#if RGB_CONFIRMATION_BLINKING_TIME > 0
+static uint16_t effect_started_time = 0;
+static uint8_t r_effect = 0x0, g_effect = 0x0, b_effect = 0x0;
+static void start_effects(void);
+
+/* The higher this is, the slower the blinking will be */
+#ifndef TIME_SELECTED_BIT
+    #define TIME_SELECTED_BIT 8
+#endif
+#if TIME_SELECTED_BIT < 0 || TIME_SELECTED_BIT >= 16
+    #error "TIME_SELECTED_BIT must be a positive integer smaller than 16"
+#endif
+#define effect_red() r_effect = 0xFF, g_effect = 0x0, b_effect = 0x0
+#define effect_green() r_effect = 0x0, g_effect = 0xFF, b_effect = 0x0
+#endif // RGB_CONFIRMATION_BLINKING_TIME > 0
+
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
+        if (!rgb_matrix_is_enabled()) {
+            /* Turn ON the RGB Matrix for CAPS LOCK */
+            rgb_matrix_set_flags(LED_FLAG_CAPS);
+            rgb_matrix_enable();
+        }
+    } else if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
+        /* RGB Matrix was only ON because of CAPS LOCK. Turn it OFF. */
+        rgb_matrix_set_flags(LED_FLAG_ALL);
+        rgb_matrix_disable();
+    }
+    return true;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+    #ifdef NKRO_ENABLE
+    #if RGB_CONFIRMATION_BLINKING_TIME > 0
+        case NK_TOGG:
+            if (record->event.pressed) {
+                if (keymap_config.nkro) {
+                    /* Turning NKRO OFF */
+                    effect_red();
+                } else {
+                    /* Turning NKRO ON */
+                    effect_green();
+                }
+                start_effects();
+            }
+            break;
+        case NK_ON:
+            if (record->event.pressed) {
+                if (!keymap_config.nkro) {
+                    /* Turning NKRO ON */
+                    effect_green();
+                    start_effects();
+                }
+            }
+            break;
+        case NK_OFF:
+            if (record->event.pressed) {
+                if (keymap_config.nkro) {
+                    /* Turning NKRO OFF */
+                    effect_red();
+                    start_effects();
+                }
+            }
+            break;
+    #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
+    #endif // NKRO_ENABLE
+        case RGB_MOD:
+        case RGB_RMOD:
+        case RGB_HUI:
+        case RGB_HUD:
+        case RGB_SAI:
+        case RGB_SAD:
+        case RGB_VAI:
+        case RGB_VAD:
+        case RGB_SPI:
+        case RGB_SPD:
+            if (record->event.pressed) {
+                if (rgb_matrix_get_flags() != LED_FLAG_ALL) {
+                    /* Ignore changes to RGB settings while only it's supposed to be OFF */
+                    return false;
+                }
+            }
+            break;
+        case RGB_TOG:
+            if (record->event.pressed) {
+                if (rgb_matrix_is_enabled()) {
+                    switch (rgb_matrix_get_flags()) {
+                        #if RGB_CONFIRMATION_BLINKING_TIME > 0
+                        case LED_FLAG_EFFECTS:
+                        #endif
+                        case LED_FLAG_CAPS:
+                            /* Turned ON because of EFFECTS or CAPS, is actually OFF */
+                            /* Change to LED_FLAG_ALL to signal it's really ON */
+                            rgb_matrix_set_flags(LED_FLAG_ALL);
+                            /* Will be re-enabled by the processing of the toggle */
+                            rgb_matrix_disable_noeeprom();
+                            break;
+                        case LED_FLAG_ALL:
+                            /* Is actually ON */
+                            #if RGB_CONFIRMATION_BLINKING_TIME > 0
+                            if (effect_started_time > 0) {
+                                /* Signal EFFECTS */
+                                rgb_matrix_set_flags(LED_FLAG_EFFECTS);
+                                /* Will be re-enabled by the processing of the toggle */
+                                rgb_matrix_disable_noeeprom();
+                            } else
+                            #endif
+                            if (host_keyboard_led_state().caps_lock) {
+                                /* Signal CAPS */
+                                rgb_matrix_set_flags(LED_FLAG_CAPS);
+                                /* Will be re-enabled by the processing of the toggle */
+                                rgb_matrix_disable_noeeprom();
+                            }
+                            break;
+                    }
+                }
+            }
+            break;
+    }
+    return true;
+}
+
+
+void rgb_matrix_indicators_user() {
+    #if RGB_CONFIRMATION_BLINKING_TIME > 0
+    if (effect_started_time > 0) {
+        /* Render blinking EFFECTS */
+        const uint16_t deltaTime = sync_timer_elapsed(effect_started_time);
+        if (deltaTime <= RGB_CONFIRMATION_BLINKING_TIME) {
+            const uint8_t led_state = ((~deltaTime) >> TIME_SELECTED_BIT) & 0x01;
+            const uint8_t val_r = led_state * r_effect;
+            const uint8_t val_g = led_state * g_effect;
+            const uint8_t val_b = led_state * b_effect;
+            rgb_matrix_set_color_all(val_r, val_g, val_b);
+            if (host_keyboard_led_state().caps_lock) {
+                set_rgb_caps_leds();
+            }
+            return;
+        } else {
+            /* EFFECTS duration is finished */
+            effect_started_time = 0;
+            if (rgb_matrix_get_flags() == LED_FLAG_EFFECTS) {
+                /* It was turned ON because of EFFECTS */
+                if (host_keyboard_led_state().caps_lock) {
+                    /* CAPS is still ON. Demote to CAPS */
+                    rgb_matrix_set_flags(LED_FLAG_CAPS);
+                } else {
+                    /* There is nothing else keeping RGB enabled. Reset flags and turn if off. */
+                    rgb_matrix_set_flags(LED_FLAG_ALL);
+                    rgb_matrix_disable_noeeprom();
+                }
+            }
+        }
+    }
+    #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
+    if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
+        rgb_matrix_set_color_all(0x0, 0x0, 0x0);
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        set_rgb_caps_leds();
+    }
+}
+
+#if RGB_CONFIRMATION_BLINKING_TIME > 0
+static void start_effects() {
+    effect_started_time = sync_timer_read();
+    if (!rgb_matrix_is_enabled()) {
+        /* Turn it ON, signal the cause (EFFECTS) */
+        rgb_matrix_set_flags(LED_FLAG_EFFECTS);
+        rgb_matrix_enable_noeeprom();
+    } else if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
+        /* It's already ON, promote the cause from CAPS to EFFECTS */
+        rgb_matrix_set_flags(LED_FLAG_EFFECTS);
+    }
+}
+#endif // RGB_CONFIRMATION_BLINKING_TIME > 0
+
+// RGB led number layout, function of the key
+
+//  67, led 01   0, ESC    6, F1      12, F2      18, F3   23, F4   28, F5      34, F6   39, F7   44, F8      50, F9   56, F10   61, F11    66, F12    69, Prt       Rotary(Mute)   68, led 12
+//  70, led 02   1, ~      7, 1       13, 2       19, 3    24, 4    29, 5       35, 6    40, 7    45, 8       51, 9    57, 0     62, -_     78, (=+)   85, BackSpc   72, Home       71, led 13
+//  73, led 03   2, Tab    8, Q       14, W       20. E    25, R    30, T       36, Y    41, U    46, I       52, O    58, P     63, [{     89, ]}     93, \|        75, PgUp       74, led 14
+//  76, led 04   3, Caps   9, A       15, S       21, D    26, F    31, G       37, H    42, J    47, K       53, L    59, ;:    64, '"                96, Enter     86, PgDn       77, led 15
+//  80, led 05   4, Sh_L   10, Z      16, X       22, C    27, V    32, B       38, N    43, M    48, ,<      54, .<   60, /?               90, Sh_R   94, Up        82, End        81, led 16
+//  83, led 06   5, Ct_L   11,Win_L   17, Alt_L                     33, SPACE                     49, Alt_R   55, FN             65, Ct_R   95, Left   97, Down      79, Right      84, led 17
+//  87, led 07                                                                                                                                                                      88, led 18
+//  91, led 08                                                                                                                                                                      92, led 19
+
+static void set_rgb_caps_leds() {
+    rgb_matrix_set_color(67, 0xFF, 0x0, 0x0); // Left side LED 1
+    rgb_matrix_set_color(68, 0xFF, 0x0, 0x0); // Right side LED 1
+    rgb_matrix_set_color(70, 0xFF, 0x0, 0x0); // Left side LED 2
+    rgb_matrix_set_color(71, 0xFF, 0x0, 0x0); // Right side LED 2
+    rgb_matrix_set_color(73, 0xFF, 0x0, 0x0); // Left side LED 3
+    rgb_matrix_set_color(74, 0xFF, 0x0, 0x0); // Right side LED 3
+    rgb_matrix_set_color(76, 0xFF, 0x0, 0x0); // Left side LED 4
+    rgb_matrix_set_color(77, 0xFF, 0x0, 0x0); // Right side LED 4
+    rgb_matrix_set_color(80, 0xFF, 0x0, 0x0); // Left side LED 5
+    rgb_matrix_set_color(81, 0xFF, 0x0, 0x0); // Right side LED 5
+    rgb_matrix_set_color(83, 0xFF, 0x0, 0x0); // Left side LED 6
+    rgb_matrix_set_color(84, 0xFF, 0x0, 0x0); // Right side LED 6
+    rgb_matrix_set_color(87, 0xFF, 0x0, 0x0); // Left side LED 7
+    rgb_matrix_set_color(88, 0xFF, 0x0, 0x0); // Right side LED 7
+    rgb_matrix_set_color(91, 0xFF, 0x0, 0x0); // Left side LED 8
+    rgb_matrix_set_color(92, 0xFF, 0x0, 0x0); // Right side LED 8
+    rgb_matrix_set_color(3, 0xFF, 0x0, 0x0); // CAPS LED
+}
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/gmmk/pro/ansi/keymaps/hachetman/readme.md b/keyboards/gmmk/pro/ansi/keymaps/hachetman/readme.md
new file mode 100644
index 0000000000..bc8c580dbb
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/hachetman/readme.md
@@ -0,0 +1,26 @@
+# hachetmans's GMMK Pro layout
+
+This is pretty much the stock layout with a few things moved around.
+It basically reflects my needs for both Delete and Insert being readily available for coding, as well as a full Home/PgUp/PgDwn/End column.
+
+The differences are as follows:
+
+- Disabled Mouse Keys (to fix issues with KVM switches and also because they're not used here anyway)
+- Short DEBOUNCE time (5 ms)
+- Per-key debounce algorithm (sym_defer_pk)
+- RGB turns off after 20 minutes of inactivity
+- RGB turns off when USB is suspended
+- Layer 0:
+  - Print Screen (default) -> Delete
+  - Delete (default) -> Home
+- Layer 1 (accessed by pressing Fn):
+  - Fn + Delete -> Insert
+  - Fn + Home -> Print Screen
+- override CTRL + UP -> PGUP
+- override CTRL + DOWN -> PGDN
+
+This keymap also includes CAPS LOCK ON indicator.\
+All left and right side LEDs, and the Caps key LED will turn solid red while CAPS LOCK is ON.
+
+No other changes have been made. \
+The other keys on each layer have been kept intact.
diff --git a/keyboards/gmmk/pro/ansi/keymaps/hachetman/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/hachetman/rules.mk
new file mode 100644
index 0000000000..9995f3f4d2
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/hachetman/rules.mk
@@ -0,0 +1,5 @@
+# Enable additional features.
+
+DEBOUNCE_TYPE = sym_defer_pk
+MOUSEKEY_ENABLE = no
+KEY_OVERRIDE_ENABLE = yes

From a6a7b1ce8f4589a1740bf4b9e628bdb4b3d0e18b Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Mon, 31 Jan 2022 02:47:26 +0800
Subject: [PATCH 430/867] [Keyboard] move @ibnuda 's keebs into /ibnuda
 (#16108)

---
 keyboards/{ => ibnuda}/alicia_cook/alicia_cook.c              | 0
 keyboards/{ => ibnuda}/alicia_cook/alicia_cook.h              | 0
 keyboards/{ => ibnuda}/alicia_cook/config.h                   | 0
 keyboards/{ => ibnuda}/alicia_cook/info.json                  | 0
 keyboards/{ => ibnuda}/alicia_cook/keymaps/default/keymap.c   | 0
 keyboards/{ => ibnuda}/alicia_cook/keymaps/default/readme.md  | 0
 keyboards/{ => ibnuda}/alicia_cook/keymaps/rick/config.h      | 0
 keyboards/{ => ibnuda}/alicia_cook/keymaps/rick/keymap.c      | 0
 keyboards/{ => ibnuda}/alicia_cook/keymaps/rick/readme.md     | 0
 keyboards/{ => ibnuda}/alicia_cook/keymaps/rick/rules.mk      | 0
 keyboards/{ => ibnuda}/alicia_cook/readme.md                  | 4 ++--
 keyboards/{ => ibnuda}/alicia_cook/rules.mk                   | 0
 keyboards/{ => ibnuda}/gurindam/config.h                      | 0
 keyboards/{ => ibnuda}/gurindam/gurindam.c                    | 0
 keyboards/{ => ibnuda}/gurindam/gurindam.h                    | 0
 keyboards/{ => ibnuda}/gurindam/info.json                     | 0
 keyboards/{ => ibnuda}/gurindam/keymaps/default/keymap.c      | 0
 keyboards/{ => ibnuda}/gurindam/keymaps/default/readme.md     | 0
 keyboards/{ => ibnuda}/gurindam/keymaps/via/keymap.c          | 0
 keyboards/{ => ibnuda}/gurindam/keymaps/via/rules.mk          | 0
 keyboards/{ => ibnuda}/gurindam/readme.md                     | 2 +-
 keyboards/{ => ibnuda}/gurindam/rules.mk                      | 0
 keyboards/{ => ibnuda}/squiggle/config.h                      | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/default/config.h      | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/default/keymap.c      | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/default/readme.md     | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/default/rules.mk      | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/default38/config.h    | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/default38/keymap.c    | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/default38/readme.md   | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/default38/rules.mk    | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/defaultfull/config.h  | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/defaultfull/keymap.c  | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/defaultfull/readme.md | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/defaultfull/rules.mk  | 0
 .../{ => ibnuda}/squiggle/keymaps/defaultminidox/config.h     | 0
 .../{ => ibnuda}/squiggle/keymaps/defaultminidox/keymap.c     | 0
 .../{ => ibnuda}/squiggle/keymaps/defaultminidox/readme.md    | 0
 .../{ => ibnuda}/squiggle/keymaps/defaultminidox/rules.mk     | 0
 .../{ => ibnuda}/squiggle/keymaps/rick-complicated/config.h   | 0
 .../{ => ibnuda}/squiggle/keymaps/rick-complicated/keymap.c   | 0
 .../{ => ibnuda}/squiggle/keymaps/rick-complicated/readme.md  | 0
 .../{ => ibnuda}/squiggle/keymaps/rick-complicated/rules.mk   | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/rick/config.h         | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/rick/keymap.c         | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/rick/readme.md        | 0
 keyboards/{ => ibnuda}/squiggle/keymaps/rick/rules.mk         | 0
 keyboards/{ => ibnuda}/squiggle/readme.md                     | 2 +-
 keyboards/{ => ibnuda}/squiggle/rev1/.noci                    | 0
 keyboards/{ => ibnuda}/squiggle/rev1/config.h                 | 0
 keyboards/{ => ibnuda}/squiggle/rev1/info.json                | 0
 keyboards/{ => ibnuda}/squiggle/rev1/rev1.c                   | 0
 keyboards/{ => ibnuda}/squiggle/rev1/rev1.h                   | 0
 keyboards/{ => ibnuda}/squiggle/rev1/rules.mk                 | 0
 keyboards/ibnuda/squiggle/rules.mk                            | 1 +
 keyboards/{ => ibnuda}/squiggle/squiggle.c                    | 0
 keyboards/{ => ibnuda}/squiggle/squiggle.h                    | 2 +-
 keyboards/squiggle/rules.mk                                   | 1 -
 58 files changed, 6 insertions(+), 6 deletions(-)
 rename keyboards/{ => ibnuda}/alicia_cook/alicia_cook.c (100%)
 rename keyboards/{ => ibnuda}/alicia_cook/alicia_cook.h (100%)
 rename keyboards/{ => ibnuda}/alicia_cook/config.h (100%)
 rename keyboards/{ => ibnuda}/alicia_cook/info.json (100%)
 rename keyboards/{ => ibnuda}/alicia_cook/keymaps/default/keymap.c (100%)
 rename keyboards/{ => ibnuda}/alicia_cook/keymaps/default/readme.md (100%)
 rename keyboards/{ => ibnuda}/alicia_cook/keymaps/rick/config.h (100%)
 rename keyboards/{ => ibnuda}/alicia_cook/keymaps/rick/keymap.c (100%)
 rename keyboards/{ => ibnuda}/alicia_cook/keymaps/rick/readme.md (100%)
 rename keyboards/{ => ibnuda}/alicia_cook/keymaps/rick/rules.mk (100%)
 rename keyboards/{ => ibnuda}/alicia_cook/readme.md (92%)
 rename keyboards/{ => ibnuda}/alicia_cook/rules.mk (100%)
 rename keyboards/{ => ibnuda}/gurindam/config.h (100%)
 rename keyboards/{ => ibnuda}/gurindam/gurindam.c (100%)
 rename keyboards/{ => ibnuda}/gurindam/gurindam.h (100%)
 rename keyboards/{ => ibnuda}/gurindam/info.json (100%)
 rename keyboards/{ => ibnuda}/gurindam/keymaps/default/keymap.c (100%)
 rename keyboards/{ => ibnuda}/gurindam/keymaps/default/readme.md (100%)
 rename keyboards/{ => ibnuda}/gurindam/keymaps/via/keymap.c (100%)
 rename keyboards/{ => ibnuda}/gurindam/keymaps/via/rules.mk (100%)
 rename keyboards/{ => ibnuda}/gurindam/readme.md (96%)
 rename keyboards/{ => ibnuda}/gurindam/rules.mk (100%)
 rename keyboards/{ => ibnuda}/squiggle/config.h (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/default/config.h (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/default/keymap.c (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/default/readme.md (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/default/rules.mk (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/default38/config.h (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/default38/keymap.c (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/default38/readme.md (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/default38/rules.mk (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/defaultfull/config.h (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/defaultfull/keymap.c (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/defaultfull/readme.md (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/defaultfull/rules.mk (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/defaultminidox/config.h (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/defaultminidox/keymap.c (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/defaultminidox/readme.md (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/defaultminidox/rules.mk (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/rick-complicated/config.h (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/rick-complicated/keymap.c (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/rick-complicated/readme.md (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/rick-complicated/rules.mk (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/rick/config.h (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/rick/keymap.c (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/rick/readme.md (100%)
 rename keyboards/{ => ibnuda}/squiggle/keymaps/rick/rules.mk (100%)
 rename keyboards/{ => ibnuda}/squiggle/readme.md (95%)
 rename keyboards/{ => ibnuda}/squiggle/rev1/.noci (100%)
 rename keyboards/{ => ibnuda}/squiggle/rev1/config.h (100%)
 rename keyboards/{ => ibnuda}/squiggle/rev1/info.json (100%)
 rename keyboards/{ => ibnuda}/squiggle/rev1/rev1.c (100%)
 rename keyboards/{ => ibnuda}/squiggle/rev1/rev1.h (100%)
 rename keyboards/{ => ibnuda}/squiggle/rev1/rules.mk (100%)
 create mode 100644 keyboards/ibnuda/squiggle/rules.mk
 rename keyboards/{ => ibnuda}/squiggle/squiggle.c (100%)
 rename keyboards/{ => ibnuda}/squiggle/squiggle.h (95%)
 delete mode 100644 keyboards/squiggle/rules.mk

diff --git a/keyboards/alicia_cook/alicia_cook.c b/keyboards/ibnuda/alicia_cook/alicia_cook.c
similarity index 100%
rename from keyboards/alicia_cook/alicia_cook.c
rename to keyboards/ibnuda/alicia_cook/alicia_cook.c
diff --git a/keyboards/alicia_cook/alicia_cook.h b/keyboards/ibnuda/alicia_cook/alicia_cook.h
similarity index 100%
rename from keyboards/alicia_cook/alicia_cook.h
rename to keyboards/ibnuda/alicia_cook/alicia_cook.h
diff --git a/keyboards/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/config.h
similarity index 100%
rename from keyboards/alicia_cook/config.h
rename to keyboards/ibnuda/alicia_cook/config.h
diff --git a/keyboards/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json
similarity index 100%
rename from keyboards/alicia_cook/info.json
rename to keyboards/ibnuda/alicia_cook/info.json
diff --git a/keyboards/alicia_cook/keymaps/default/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/alicia_cook/keymaps/default/keymap.c
rename to keyboards/ibnuda/alicia_cook/keymaps/default/keymap.c
diff --git a/keyboards/alicia_cook/keymaps/default/readme.md b/keyboards/ibnuda/alicia_cook/keymaps/default/readme.md
similarity index 100%
rename from keyboards/alicia_cook/keymaps/default/readme.md
rename to keyboards/ibnuda/alicia_cook/keymaps/default/readme.md
diff --git a/keyboards/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
similarity index 100%
rename from keyboards/alicia_cook/keymaps/rick/config.h
rename to keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
diff --git a/keyboards/alicia_cook/keymaps/rick/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
similarity index 100%
rename from keyboards/alicia_cook/keymaps/rick/keymap.c
rename to keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
diff --git a/keyboards/alicia_cook/keymaps/rick/readme.md b/keyboards/ibnuda/alicia_cook/keymaps/rick/readme.md
similarity index 100%
rename from keyboards/alicia_cook/keymaps/rick/readme.md
rename to keyboards/ibnuda/alicia_cook/keymaps/rick/readme.md
diff --git a/keyboards/alicia_cook/keymaps/rick/rules.mk b/keyboards/ibnuda/alicia_cook/keymaps/rick/rules.mk
similarity index 100%
rename from keyboards/alicia_cook/keymaps/rick/rules.mk
rename to keyboards/ibnuda/alicia_cook/keymaps/rick/rules.mk
diff --git a/keyboards/alicia_cook/readme.md b/keyboards/ibnuda/alicia_cook/readme.md
similarity index 92%
rename from keyboards/alicia_cook/readme.md
rename to keyboards/ibnuda/alicia_cook/readme.md
index 4e37a366e7..f4475cd22e 100644
--- a/keyboards/alicia_cook/readme.md
+++ b/keyboards/ibnuda/alicia_cook/readme.md
@@ -10,11 +10,11 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make alicia_cook:default
+    make ibnuda/alicia_cook:default
 
 Flashing example for this keyboard:
 
-    make alicia_cook:default:flash
+    make ibnuda/alicia_cook:default:flash
 
 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).
 
diff --git a/keyboards/alicia_cook/rules.mk b/keyboards/ibnuda/alicia_cook/rules.mk
similarity index 100%
rename from keyboards/alicia_cook/rules.mk
rename to keyboards/ibnuda/alicia_cook/rules.mk
diff --git a/keyboards/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h
similarity index 100%
rename from keyboards/gurindam/config.h
rename to keyboards/ibnuda/gurindam/config.h
diff --git a/keyboards/gurindam/gurindam.c b/keyboards/ibnuda/gurindam/gurindam.c
similarity index 100%
rename from keyboards/gurindam/gurindam.c
rename to keyboards/ibnuda/gurindam/gurindam.c
diff --git a/keyboards/gurindam/gurindam.h b/keyboards/ibnuda/gurindam/gurindam.h
similarity index 100%
rename from keyboards/gurindam/gurindam.h
rename to keyboards/ibnuda/gurindam/gurindam.h
diff --git a/keyboards/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json
similarity index 100%
rename from keyboards/gurindam/info.json
rename to keyboards/ibnuda/gurindam/info.json
diff --git a/keyboards/gurindam/keymaps/default/keymap.c b/keyboards/ibnuda/gurindam/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/gurindam/keymaps/default/keymap.c
rename to keyboards/ibnuda/gurindam/keymaps/default/keymap.c
diff --git a/keyboards/gurindam/keymaps/default/readme.md b/keyboards/ibnuda/gurindam/keymaps/default/readme.md
similarity index 100%
rename from keyboards/gurindam/keymaps/default/readme.md
rename to keyboards/ibnuda/gurindam/keymaps/default/readme.md
diff --git a/keyboards/gurindam/keymaps/via/keymap.c b/keyboards/ibnuda/gurindam/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/gurindam/keymaps/via/keymap.c
rename to keyboards/ibnuda/gurindam/keymaps/via/keymap.c
diff --git a/keyboards/gurindam/keymaps/via/rules.mk b/keyboards/ibnuda/gurindam/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/gurindam/keymaps/via/rules.mk
rename to keyboards/ibnuda/gurindam/keymaps/via/rules.mk
diff --git a/keyboards/gurindam/readme.md b/keyboards/ibnuda/gurindam/readme.md
similarity index 96%
rename from keyboards/gurindam/readme.md
rename to keyboards/ibnuda/gurindam/readme.md
index 0f6ae158b0..072084f4f0 100644
--- a/keyboards/gurindam/readme.md
+++ b/keyboards/ibnuda/gurindam/readme.md
@@ -10,7 +10,7 @@ A keyboard inspired by Arisu which in turn by Lyn's EM7 and TGR Alice.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make gurindam:default
+    make ibnuda/gurindam: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).
 
diff --git a/keyboards/gurindam/rules.mk b/keyboards/ibnuda/gurindam/rules.mk
similarity index 100%
rename from keyboards/gurindam/rules.mk
rename to keyboards/ibnuda/gurindam/rules.mk
diff --git a/keyboards/squiggle/config.h b/keyboards/ibnuda/squiggle/config.h
similarity index 100%
rename from keyboards/squiggle/config.h
rename to keyboards/ibnuda/squiggle/config.h
diff --git a/keyboards/squiggle/keymaps/default/config.h b/keyboards/ibnuda/squiggle/keymaps/default/config.h
similarity index 100%
rename from keyboards/squiggle/keymaps/default/config.h
rename to keyboards/ibnuda/squiggle/keymaps/default/config.h
diff --git a/keyboards/squiggle/keymaps/default/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/squiggle/keymaps/default/keymap.c
rename to keyboards/ibnuda/squiggle/keymaps/default/keymap.c
diff --git a/keyboards/squiggle/keymaps/default/readme.md b/keyboards/ibnuda/squiggle/keymaps/default/readme.md
similarity index 100%
rename from keyboards/squiggle/keymaps/default/readme.md
rename to keyboards/ibnuda/squiggle/keymaps/default/readme.md
diff --git a/keyboards/squiggle/keymaps/default/rules.mk b/keyboards/ibnuda/squiggle/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/squiggle/keymaps/default/rules.mk
rename to keyboards/ibnuda/squiggle/keymaps/default/rules.mk
diff --git a/keyboards/squiggle/keymaps/default38/config.h b/keyboards/ibnuda/squiggle/keymaps/default38/config.h
similarity index 100%
rename from keyboards/squiggle/keymaps/default38/config.h
rename to keyboards/ibnuda/squiggle/keymaps/default38/config.h
diff --git a/keyboards/squiggle/keymaps/default38/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
similarity index 100%
rename from keyboards/squiggle/keymaps/default38/keymap.c
rename to keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
diff --git a/keyboards/squiggle/keymaps/default38/readme.md b/keyboards/ibnuda/squiggle/keymaps/default38/readme.md
similarity index 100%
rename from keyboards/squiggle/keymaps/default38/readme.md
rename to keyboards/ibnuda/squiggle/keymaps/default38/readme.md
diff --git a/keyboards/squiggle/keymaps/default38/rules.mk b/keyboards/ibnuda/squiggle/keymaps/default38/rules.mk
similarity index 100%
rename from keyboards/squiggle/keymaps/default38/rules.mk
rename to keyboards/ibnuda/squiggle/keymaps/default38/rules.mk
diff --git a/keyboards/squiggle/keymaps/defaultfull/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultfull/config.h
rename to keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
diff --git a/keyboards/squiggle/keymaps/defaultfull/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultfull/keymap.c
rename to keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
diff --git a/keyboards/squiggle/keymaps/defaultfull/readme.md b/keyboards/ibnuda/squiggle/keymaps/defaultfull/readme.md
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultfull/readme.md
rename to keyboards/ibnuda/squiggle/keymaps/defaultfull/readme.md
diff --git a/keyboards/squiggle/keymaps/defaultfull/rules.mk b/keyboards/ibnuda/squiggle/keymaps/defaultfull/rules.mk
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultfull/rules.mk
rename to keyboards/ibnuda/squiggle/keymaps/defaultfull/rules.mk
diff --git a/keyboards/squiggle/keymaps/defaultminidox/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultminidox/config.h
rename to keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
diff --git a/keyboards/squiggle/keymaps/defaultminidox/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultminidox/keymap.c
rename to keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
diff --git a/keyboards/squiggle/keymaps/defaultminidox/readme.md b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/readme.md
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultminidox/readme.md
rename to keyboards/ibnuda/squiggle/keymaps/defaultminidox/readme.md
diff --git a/keyboards/squiggle/keymaps/defaultminidox/rules.mk b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/rules.mk
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultminidox/rules.mk
rename to keyboards/ibnuda/squiggle/keymaps/defaultminidox/rules.mk
diff --git a/keyboards/squiggle/keymaps/rick-complicated/config.h b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
similarity index 100%
rename from keyboards/squiggle/keymaps/rick-complicated/config.h
rename to keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
diff --git a/keyboards/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
similarity index 100%
rename from keyboards/squiggle/keymaps/rick-complicated/keymap.c
rename to keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
diff --git a/keyboards/squiggle/keymaps/rick-complicated/readme.md b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/readme.md
similarity index 100%
rename from keyboards/squiggle/keymaps/rick-complicated/readme.md
rename to keyboards/ibnuda/squiggle/keymaps/rick-complicated/readme.md
diff --git a/keyboards/squiggle/keymaps/rick-complicated/rules.mk b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/rules.mk
similarity index 100%
rename from keyboards/squiggle/keymaps/rick-complicated/rules.mk
rename to keyboards/ibnuda/squiggle/keymaps/rick-complicated/rules.mk
diff --git a/keyboards/squiggle/keymaps/rick/config.h b/keyboards/ibnuda/squiggle/keymaps/rick/config.h
similarity index 100%
rename from keyboards/squiggle/keymaps/rick/config.h
rename to keyboards/ibnuda/squiggle/keymaps/rick/config.h
diff --git a/keyboards/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
similarity index 100%
rename from keyboards/squiggle/keymaps/rick/keymap.c
rename to keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
diff --git a/keyboards/squiggle/keymaps/rick/readme.md b/keyboards/ibnuda/squiggle/keymaps/rick/readme.md
similarity index 100%
rename from keyboards/squiggle/keymaps/rick/readme.md
rename to keyboards/ibnuda/squiggle/keymaps/rick/readme.md
diff --git a/keyboards/squiggle/keymaps/rick/rules.mk b/keyboards/ibnuda/squiggle/keymaps/rick/rules.mk
similarity index 100%
rename from keyboards/squiggle/keymaps/rick/rules.mk
rename to keyboards/ibnuda/squiggle/keymaps/rick/rules.mk
diff --git a/keyboards/squiggle/readme.md b/keyboards/ibnuda/squiggle/readme.md
similarity index 95%
rename from keyboards/squiggle/readme.md
rename to keyboards/ibnuda/squiggle/readme.md
index 8d7b58125e..95204ade57 100644
--- a/keyboards/squiggle/readme.md
+++ b/keyboards/ibnuda/squiggle/readme.md
@@ -15,7 +15,7 @@ It's a keyboard family which has the following requirements:
 
 Make example for this keyboard (after setting up your build environment):
 
-    make squiggle:default
+    make ibnuda/squiggle: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).
 
diff --git a/keyboards/squiggle/rev1/.noci b/keyboards/ibnuda/squiggle/rev1/.noci
similarity index 100%
rename from keyboards/squiggle/rev1/.noci
rename to keyboards/ibnuda/squiggle/rev1/.noci
diff --git a/keyboards/squiggle/rev1/config.h b/keyboards/ibnuda/squiggle/rev1/config.h
similarity index 100%
rename from keyboards/squiggle/rev1/config.h
rename to keyboards/ibnuda/squiggle/rev1/config.h
diff --git a/keyboards/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json
similarity index 100%
rename from keyboards/squiggle/rev1/info.json
rename to keyboards/ibnuda/squiggle/rev1/info.json
diff --git a/keyboards/squiggle/rev1/rev1.c b/keyboards/ibnuda/squiggle/rev1/rev1.c
similarity index 100%
rename from keyboards/squiggle/rev1/rev1.c
rename to keyboards/ibnuda/squiggle/rev1/rev1.c
diff --git a/keyboards/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h
similarity index 100%
rename from keyboards/squiggle/rev1/rev1.h
rename to keyboards/ibnuda/squiggle/rev1/rev1.h
diff --git a/keyboards/squiggle/rev1/rules.mk b/keyboards/ibnuda/squiggle/rev1/rules.mk
similarity index 100%
rename from keyboards/squiggle/rev1/rules.mk
rename to keyboards/ibnuda/squiggle/rev1/rules.mk
diff --git a/keyboards/ibnuda/squiggle/rules.mk b/keyboards/ibnuda/squiggle/rules.mk
new file mode 100644
index 0000000000..0214333999
--- /dev/null
+++ b/keyboards/ibnuda/squiggle/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = ibnuda/squiggle/rev1
diff --git a/keyboards/squiggle/squiggle.c b/keyboards/ibnuda/squiggle/squiggle.c
similarity index 100%
rename from keyboards/squiggle/squiggle.c
rename to keyboards/ibnuda/squiggle/squiggle.c
diff --git a/keyboards/squiggle/squiggle.h b/keyboards/ibnuda/squiggle/squiggle.h
similarity index 95%
rename from keyboards/squiggle/squiggle.h
rename to keyboards/ibnuda/squiggle/squiggle.h
index 1f3e48552f..4ed95e707c 100644
--- a/keyboards/squiggle/squiggle.h
+++ b/keyboards/ibnuda/squiggle/squiggle.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#ifdef KEYBOARD_squiggle_rev1
+#ifdef KEYBOARD_ibnuda_squiggle_rev1
     #include "rev1.h"
 #endif
 
diff --git a/keyboards/squiggle/rules.mk b/keyboards/squiggle/rules.mk
deleted file mode 100644
index 4f44ddbb73..0000000000
--- a/keyboards/squiggle/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = squiggle/rev1

From a78b80966b2077deb9d2a730ea599c5bdea2535e Mon Sep 17 00:00:00 2001
From: peott-fr <70998091+peott-fr@users.noreply.github.com>
Date: Sun, 30 Jan 2022 10:52:36 -0800
Subject: [PATCH 431/867] [Keymap] Adding Sunsetter keymap (#16126)

---
 .../sunsetter/keymaps/peott-fr/keymap.c       | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c

diff --git a/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c b/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
new file mode 100644
index 0000000000..4e0ca86c60
--- /dev/null
+++ b/keyboards/charue/sunsetter/keymaps/peott-fr/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2022 Pierre Ott
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+        [0] = LAYOUT_all(
+        KC_F1, KC_F2, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_DEL, KC_PSCR, 
+        KC_F3, KC_F4, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
+        KC_F5, KC_F6, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_ENT, KC_NO, KC_PGDN, 
+        KC_F7, KC_F8, KC_LSPO, KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, LT(2,KC_HOME), 
+        KC_F9, KC_F10, LCTL_T(KC_MPRV), LGUI_T(KC_MPLY), LALT_T(KC_MNXT), LT(1,KC_SPC), KC_APP, KC_BSPC, KC_RALT, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT
+        ),
+        [1] = LAYOUT_all(
+        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, TG(3), KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_LCTL, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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_LSFT, KC_LSFT, KC_CALC, KC_MYCM, KC_TRNS, KC_ENT, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, 
+        KC_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS
+        ),
+        [2] = LAYOUT_all(
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, 
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
+        KC_NO, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, 
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+        ),
+        [3] = LAYOUT_all(
+        KC_NO, KC_NO, KC_NO, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_NO, 
+        KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_INS, KC_HOME, KC_PGUP, KC_NO, KC_NO, 
+        KC_NO, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PCMM, KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL, KC_END, KC_PGDN, KC_NO, KC_NO, KC_NO, KC_NO, 
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 
+        KC_NO, KC_NO, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_PENT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+        )
+};
\ No newline at end of file

From cffc3fcce532a02fae8a128e1d5ffeaf6df79520 Mon Sep 17 00:00:00 2001
From: mmccoyd <mmccoyd@users.noreply.github.com>
Date: Sun, 30 Jan 2022 10:53:01 -0800
Subject: [PATCH 432/867] [Keyboard] Re-org Hillside folders and fix default
 keymap (#16128)

Co-authored-by: mmccoyd <mmccoyd@cs.berkley.edu>
---
 keyboards/handwired/hillside/0_1/info.json    |  96 +++++++++++++++++
 .../hillside/0_1/keymaps/default/keymap.json  | 101 +++++++++++++++++
 .../{ => 0_1}/keymaps/default/readme.md       |  66 ++++++------
 .../hillside/{ => 0_1}/keymaps/json2hill.py   |   0
 .../hillside/0_1/keymaps/via/keymap.json      |  61 +++++++++++
 keyboards/handwired/hillside/0_1/readme.md    |  29 +++++
 keyboards/handwired/hillside/info.json        |  93 +---------------
 .../hillside/keymaps/default/keymap.json      | 102 ------------------
 .../hillside/keymaps/via/keymap.json          | 101 -----------------
 keyboards/handwired/hillside/readme.md        |  26 +----
 10 files changed, 323 insertions(+), 352 deletions(-)
 create mode 100644 keyboards/handwired/hillside/0_1/keymaps/default/keymap.json
 rename keyboards/handwired/hillside/{ => 0_1}/keymaps/default/readme.md (79%)
 rename keyboards/handwired/hillside/{ => 0_1}/keymaps/json2hill.py (100%)
 create mode 100644 keyboards/handwired/hillside/0_1/keymaps/via/keymap.json
 create mode 100644 keyboards/handwired/hillside/0_1/readme.md
 delete mode 100644 keyboards/handwired/hillside/keymaps/default/keymap.json
 delete mode 100644 keyboards/handwired/hillside/keymaps/via/keymap.json

diff --git a/keyboards/handwired/hillside/0_1/info.json b/keyboards/handwired/hillside/0_1/info.json
index 4505bf3e35..8c00f70366 100644
--- a/keyboards/handwired/hillside/0_1/info.json
+++ b/keyboards/handwired/hillside/0_1/info.json
@@ -1,4 +1,14 @@
 {
+    "manufacturer": "mmccoyd",
+    "maintainer": "mmccoyd",
+
+    "keyboard_name": "Hillside",
+    "url": "http://github.com/mmccoyd/hillside/",
+
+    "tags": ["split", "column stagger", "choc v1", "choc spaced" ],
+
+    "processor": "atmega32u4",
+
     "matrix_pins": {
         "rows": ["D7", "E6", "B4", "B5"],
         "cols": ["F6", "F7", "B1", "B3", "B2", "B6"]
@@ -9,5 +19,91 @@
       "vid": "0xFEED",
       "pid": "0x67C0",
       "device_ver": "0x0001"
+    },
+
+    "features": {
+        "encoder": true,
+        "extrakey": true,
+        "rgblight": true
+    },
+    "split": {
+        "soft_serial_pin": "D2",
+        "main": "left"
+    },
+
+    "rgblight": {
+        "led_count": 5,
+        "pin": "D3",
+        "split": true,
+        "hue_steps": 8,
+        "saturation_steps": 8,
+        "brightness_steps": 8
+    },
+
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+
+                {"label": "Tab", "x": 0, "y": 0.93},
+                {"label": "Q", "x": 1, "y": 0.93},
+                {"label": "W", "x": 2, "y": 0.31},
+                {"label": "E", "x": 3, "y": 0},
+                {"label": "R", "x": 4, "y": 0.28},
+                {"label": "T", "x": 5, "y": 0.42},
+
+                {"label": "Y", "x": 9.5, "y": 0.42},
+                {"label": "U", "x": 10.5, "y": 0.28},
+                {"label": "I", "x": 11.5, "y": 0},
+                {"label": "O", "x": 12.5, "y": 0.31},
+                {"label": "P", "x": 13.5, "y": 0.93},
+                {"label": "Backspace", "x": 14.5, "y": 0.93},
+
+
+                {"label": "Ctrl", "x": 0, "y": 1.93},
+                {"label": "A", "x": 1, "y": 1.93},
+                {"label": "S", "x": 2, "y": 1.31},
+                {"label": "D", "x": 3, "y": 1},
+                {"label": "F", "x": 4, "y": 1.28},
+                {"label": "G", "x": 5, "y": 1.42},
+
+                {"label": "H", "x": 9.5, "y": 1.42},
+                {"label": "J", "x": 10.5, "y": 1.28},
+                {"label": "K", "x": 11.5, "y": 1},
+                {"label": "L", "x": 12.5, "y": 1.31},
+                {"label": ";", "x": 13.5, "y": 1.93},
+                {"label": "'", "x": 14.5, "y": 1.93},
+
+
+                {"label": "Shift", "x": 0, "y": 2.93},
+                {"label": "Z", "x": 1, "y": 2.93},
+                {"label": "X", "x": 2, "y": 2.31},
+                {"label": "C", "x": 3, "y": 2},
+                {"label": "V", "x": 4, "y": 2.28},
+                {"label": "B", "x": 5, "y": 2.42},
+                {"label": "`", "x": 6, "y": 2.78},
+
+                {"label": "Esc", "x": 8.5, "y": 2.78},
+                {"label": "N", "x": 9.5, "y": 2.42},
+                {"label": "M", "x": 10.5, "y": 2.28},
+                {"label": ",", "x": 11.5, "y": 2},
+                {"label": ".", "x": 12.5, "y": 2.31},
+                {"label": "/", "x": 13.5, "y": 2.93},
+                {"label": "Shift", "x": 14.5, "y": 2.93},
+
+
+                {"label": "Enter", "x": 2, "y": 3.31},
+                {"label": "Gui", "x": 3.5, "y": 3.28},
+                {"label": "Alt", "x": 4.5, "y": 3.42},
+                {"label": "Num", "x": 5.5, "y": 3.78},
+                {"label": "Nav", "x": 6.5, "y": 4.14},
+
+
+                {"label": "Sym", "x": 8, "y": 4.14},
+                {"label": "Space", "x": 9, "y": 3.78},
+                {"label": "Alt", "x": 10, "y": 3.42},
+                {"label": "Gui", "x": 11, "y": 3.28},
+                {"label": "App", "x": 12.5, "y": 3.31}
+            ]
+        }
     }
 }
diff --git a/keyboards/handwired/hillside/0_1/keymaps/default/keymap.json b/keyboards/handwired/hillside/0_1/keymaps/default/keymap.json
new file mode 100644
index 0000000000..c5837a16fb
--- /dev/null
+++ b/keyboards/handwired/hillside/0_1/keymaps/default/keymap.json
@@ -0,0 +1,101 @@
+{    "version": 1,
+    "notes": "",
+    "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
+    "keyboard": "handwired/hillside/0_1",
+    "keymap": "default",
+    "layout": "LAYOUT",
+    "layers": [
+        ["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_CAPS", "KC_A"         , "KC_S"         , "KC_D"      , "KC_F"         , "KC_G",
+         "KC_H"   , "KC_J"         , "KC_K"         , "KC_L"      , "KC_SCLN"      , "KC_ENT",
+
+         "KC_LSFT", "KC_Z"         , "KC_X"         , "KC_C"      , "KC_V"         , "KC_B"      , "KC_GRV",
+         "KC_ESC" , "KC_N"         , "KC_M"         , "KC_COMM"   , "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
+
+         "KC_LCTL", "KC_LGUI"      , "KC_LALT"      , "MO(5)"     , "MO(3)",
+         "MO(4)"  , "KC_SPC"       , "KC_LALT"      , "KC_RGUI"   , "KC_QUOT"
+
+        ],
+        ["KC_TAB" , "KC_QUOT"      , "KC_COMM"      , "KC_DOT"    , "KC_P"         , "KC_Y",
+         "KC_F"   , "KC_G"         , "KC_C"         , "KC_R"      , "KC_L"         , "KC_BSPC",
+
+         "KC_CAPS", "KC_A"         , "KC_O"         , "KC_E"      , "KC_U"         , "KC_I",
+         "KC_D"   , "KC_H"         , "KC_T"         , "KC_N"      , "KC_S"         , "KC_ENT",
+
+         "KC_LSFT", "KC_SCLN"      , "KC_Q"         , "KC_J"      , "KC_K"         , "KC_X"      , "KC_GRV",
+         "KC_ESC" , "KC_B"         , "KC_M"         , "KC_W"      , "KC_V"         , "KC_Z"      , "KC_RSFT",
+
+         "KC_LCTL", "KC_LGUI"      , "KC_LALT"      , "MO(5)"     , "MO(3)",
+         "MO(4)"  , "KC_SPC"       , "KC_LALT"      , "KC_RGUI"   , "KC_SLSH"
+
+        ],
+        ["KC_TAB" , "KC_Q"         , "KC_W"         , "KC_F"      , "KC_P"         , "KC_B",
+         "KC_J"   , "KC_L"         , "KC_U"         , "KC_Y"      , "KC_SCLN"      , "KC_BSPC",
+
+         "KC_CAPS", "KC_A"         , "KC_R"         , "KC_S"      , "KC_T"         , "KC_G",
+         "KC_M"   , "KC_N"         , "KC_E"         , "KC_I"      , "KC_O"         , "KC_ENT",
+
+         "KC_LSFT", "KC_Z"         , "KC_X"         , "KC_C"      , "KC_D"         , "KC_V"      , "KC_GRV",
+         "KC_ESC" , "KC_K"         , "KC_H"         , "KC_COMM"   , "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
+
+         "KC_LCTL", "KC_LGUI"      , "KC_LALT"      , "MO(5)"     , "MO(3)",
+         "MO(4)"  , "KC_SPC"       , "KC_LALT"      , "KC_RGUI"   , "KC_QUOT"
+
+        ],
+        ["KC_NO"  , "KC_INS"       , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_VOLU",
+         "KC_PGUP", "KC_HOME"      , "KC_NO"        , "KC_END"    , "KC_NO"        , "KC_DEL",
+
+         "KC_NO"  , "KC_LGUI"      , "KC_LALT"      , "KC_LCTL"   , "KC_LSFT"      , "KC_VOLD",
+         "KC_PGDN", "KC_LEFT"      , "KC_UP"        , "KC_RGHT"   , "KC_NO"        , "KC_TRNS",
+
+         "KC_LSFT", "LCTL(KC_Z)"   , "LCTL(KC_X)"   , "LCTL(KC_C)", "LCTL(KC_V)"   , "LCTL(KC_Y)", "KC_MUTE",
+         "KC_ESC" , "OSM(MOD_RALT)", "LCTL(KC_LEFT)", "KC_DOWN"   , "LCTL(KC_RGHT)", "KC_APP"    , "KC_TRNS",
+
+         "KC_TRNS", "KC_TRNS"      , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS",
+         "MO(6)"  , "KC_BSPC"      , "KC_TRNS"      , "KC_TRNS"   , "KC_RCTL"
+
+        ],
+        ["KC_F11" , "KC_EXLM"      , "KC_AT"        , "KC_HASH"   , "KC_DLR"       , "KC_PERC",
+         "KC_CIRC", "KC_AMPR"      , "KC_ASTR"      , "KC_LPRN"   , "KC_RPRN"      , "KC_TRNS",
+
+         "KC_F12" , "KC_F1"        , "KC_F2"        , "KC_F3"     , "KC_F4"        , "KC_F5",
+         "KC_PIPE", "KC_LSFT"      , "KC_LCTL"      , "KC_LALT"   , "KC_LGUI"      , "KC_TRNS",
+
+         "KC_LSFT", "KC_F6"        , "KC_F7"        , "KC_F8"     , "KC_F9"        , "KC_F10"    , "KC_PSCR",
+         "KC_ESC" , "KC_BSLS"      , "KC_LBRC"      , "KC_RBRC"   , "KC_LCBR"      , "KC_RCBR"   , "KC_TRNS",
+
+         "KC_TRNS", "KC_TRNS"      , "KC_TRNS"      , "KC_TRNS"   , "MO(6)",
+         "KC_TRNS", "KC_TRNS"      , "KC_TRNS"      , "KC_TRNS"   , "KC_RCTL"
+
+        ],
+        ["KC_TAB" , "KC_MINS"      , "KC_PLUS"      , "KC_EQL"    , "KC_SLSH"      , "KC_ASTR",
+         "KC_COMM", "KC_7"         , "KC_8"         , "KC_9"      , "KC_NO"        , "KC_TRNS",
+
+         "KC_NO"  , "KC_LGUI"      , "KC_LALT"      , "KC_LCTL"   , "KC_LSFT"      , "KC_NO",
+         "KC_0"   , "KC_1"         , "KC_2"         , "KC_3"      , "KC_UNDS"      , "KC_TRNS",
+
+         "KC_TRNS", "KC_NO"        , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO",
+         "KC_NO"  , "KC_DOT"       , "KC_4"         , "KC_5"      , "KC_6"         , "KC_NO"     , "KC_TRNS",
+
+         "KC_TRNS", "KC_TRNS"      , "KC_TRNS"      , "KC_TRNS"   , "KC_NO",
+         "KC_NO"  , "KC_BSPC"      , "KC_TRNS"      , "KC_TRNS"   , "KC_RCTL"
+
+        ],
+        ["KC_NO"  , "DF(0)"        , "DF(1)"        , "DF(2)"     , "AG_SWAP"      , "AG_NORM",
+         "KC_NO"  , "KC_NO"        , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO",
+
+         "KC_NO"  , "KC_NO"        , "KC_NO"        , "KC_NO"     , "CL_SWAP"      , "CL_NORM",
+         "RGB_MOD", "RGB_VAI"      , "RGB_HUI"      , "RGB_SAI"   , "KC_NO"        , "KC_NO",
+
+         "RESET"  , "KC_NO"        , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO",
+         "RGB_TOG", "RGB_RMOD"     , "RGB_VAD"      , "RGB_HUD"   , "RGB_SAD"      , "KC_NO"     , "KC_NO",
+
+         "KC_NO"  , "KC_NO"        , "KC_NO"        , "KC_NO"     , "KC_TRNS",
+         "KC_TRNS", "KC_NO"        , "KC_NO"        , "KC_NO"     , "KC_NO"
+
+        ]
+    ],
+    "author": "@mmccoyd"
+}
diff --git a/keyboards/handwired/hillside/keymaps/default/readme.md b/keyboards/handwired/hillside/0_1/keymaps/default/readme.md
similarity index 79%
rename from keyboards/handwired/hillside/keymaps/default/readme.md
rename to keyboards/handwired/hillside/0_1/keymaps/default/readme.md
index a982c0c380..ae4a5c5648 100644
--- a/keyboards/handwired/hillside/keymaps/default/readme.md
+++ b/keyboards/handwired/hillside/0_1/keymaps/default/readme.md
@@ -27,60 +27,56 @@ We've deliberately omitted some features:
 
 ```
 | TAB   |  Q  |  W  |  E  |  R  |  T  |---------------------------|  Y  |  U  |  I  |  O  |  P  | BKSPC |
-| CTRL  |  A  |  S  |  D  |  F  |  G  |---------------------------|  H  |  J  |  K  |  L  |  ;  |   '   |
+| CAPS  |  A  |  S  |  D  |  F  |  G  |---------------------------|  H  |  J  |  K  |  L  |  ;  | ENTER |
 | SHIFT |  Z  |  X  |  C  |  V  |  B  |  ~  |---------------| ESC |  N  |  M  |  ,  |  .  |  /  | SHIFT |
---------------|ENTER|-----| GUI | ALT | Num | Nav |---| Sym |SPACE| ALT | GUI |-----| APP |--------------
+--------------|CTRL |-----| GUI | ALT | Num | Nav |---| Sym |SPACE| ALT | GUI |-----|  '  |--------------
 ```
 
-The base layer can be either of QWERTY, Colemak-DH or Dvorak,
-  with identical non-alpha and non-symbol keys.
-QWERTY is the default.
+The base layer provides a very standard key layout:
 
-A standard keyboard layout is used for:
-
-- Tab, backspace and shift keys in the outer columns.
-- Alt/option and GUI/command keys on both thumbs, with the location swappable for windows or mac.
+- Return, Tab, backspace and shift keys in the outer columns.
+- Alt/option and win/command keys on both thumbs, with the location swappable for windows or mac.
 - A space key on the right thumb.
 
 The differences from a standard layout are:
 
 - There are three additional "shift" keys
   to access the navigation/editing, symbol/function, and number layers.
-- Enter is on the left thumb or ring finger.
-  This location allowed preserving the more common right-hand keys.
-  Feel free to swap it with the quote key or have it share the right shift key
-    as a mod-tap key.
-- Control is in the caps lock spot.
 - Esc and `~ are above the thumbs.
-- The rarer AltGr key is in a layer.
+- The Menu and AltGr keys are on a layer.
+
+The default layout is QWERTY with alternatives of Dvorak and Colemak-DH
+and the alt/option and win/command key locations are swappable for windows or mac.
 
 <details>
 <summary>Details of Dvorak and Colemak-DH</summary>
-In the Dvorak layout, the outer home row key is the "/?" symbols
+The Dvorak and Colemak-DH base layers
+  have identical non-alpha and non-symbol keys as the QWERTY base layer.
+In the Dvorak layout, the symbol key in the bottom row is the "/?" symbols
   so that the same 12 symbols are taken care of on the base layer.
 
 ```
 Dvorak
 | TAB   |  '  |  ,  |  .  |  P  |  Y  |---------------------------|  F  |  G  |  C  |  R  |  L  | BKSPC |
-| CTRL  |  A  |  O  |  E  |  U  |  I  |---------------------------|  D  |  H  |  T  |  N  |  S  |  /    |
+| CAPS  |  A  |  O  |  E  |  U  |  I  |---------------------------|  D  |  H  |  T  |  N  |  S  | ENTER |
 | SHIFT |  ;  |  Q  |  J  |  K  |  X  |  ~  |---------------| ESC |  B  |  M  |  W  |  V  |  Z  | SHIFT |
---------------|ENTER|-----| GUI | ALT | Num | Nav |---| Sym |SPACE| ALT | GUI |-----| APP |--------------
+--------------|CTRL |-----| GUI | ALT | Num | Nav |---| Sym |SPACE| ALT | GUI |-----|  /  |--------------
 
 Colemak-DH
 | TAB   |  Q  |  W  |  F  |  P  |  B  |---------------------------|  J  |  L  |  U  |  Y  |  ;  | BKSPC |
-| CTRL  |  A  |  R  |  S  |  T  |  G  |---------------------------|  M  |  N  |  E  |  I  |  O  |   '   |
+| CAPS  |  A  |  R  |  S  |  T  |  G  |---------------------------|  M  |  N  |  E  |  I  |  O  | ENTER |
 | SHIFT |  Z  |  X  |  C  |  D  |  V  |  ~  |---------------| ESC |  K  |  H  |  ,  |  .  |  /  | SHIFT |
---------------|ENTER|-----| GUI | ALT | Num | Nav |---| Sym |SPACE| ALT | GUI |-----| APP |--------------
+--------------|CTRL |-----| GUI | ALT | Num | Nav |---| Sym |SPACE| ALT | GUI |-----|  '  |--------------
 ```
 </details>
 
 ## Navigation, Editing and Media Layer
 
 ```
-| CAPS  | INS |     |     |     |VOL+ |---------------------------|PG_UP|HOME |     |  END|     | DEL   |
-| CTRL  | GUI | ALT |CTRL |SHIFT|VOL- |---------------------------|PG_DN|LEFT | UP  |RIGHT|     | CTRL  |
-| SHIFT |UNDO | CUT |COPY |PASTE|REDO |MUTE |---------------| ESC |     |WORDL|DOWN |WORDR|RALT | SHIFT |
---------------|ENTER|-----| GUI | ALT | Num | *** |---| Adj |BSPC | ALT | GUI |-----| APP |--------------
+|       | INS |     |     |     |VOL+ |---------------------------|PG_UP|HOME |     |  END|     | DEL   |
+|       | GUI | ALT |CTRL |SHIFT|VOL- |---------------------------|PG_DN|LEFT | UP  |RIGHT|     | ENTER |
+| SHIFT |UNDO | CUT |COPY |PASTE|REDO |MUTE |---------------| ESC |RALT |WORDL|DOWN |WORDR|MENU | SHIFT |
+--------------|CTRL |-----| GUI | ALT | Num | *** |---| Adj |BSPC | ALT | GUI |-----|CTRL |--------------
 ```
 Holding down the Nav key accesses a navigation and editing layer:
 
@@ -96,33 +92,33 @@ Holding down the Nav key accesses a navigation and editing layer:
 - The base layer modifiers and escape are in the same spots as on the base layer,
   and a right-hand control key is added.
 - Media volume and play keys are on the left, accessible with one hand.
-- AltGr and caps lock fill out the layer.
+- Menu and AltGr keys fill out the layer.
 - A few keys do nothing and are available for more user-specific needs.
 
 ## Symbol and Function Layer
 
 ```
-| F12   |  !  |  @  |  #  |  $  |  %  |---------------------------|  ^  |  &  |  *  |  (  |  )  | BSPC  |
-| CTRL  | F1  | F2  | F3  | F4  | F5  |---------------------------|  |  |SHIFT|CTRL | ALT | GUI | CTRL  |
-| SHIFT | F6  | F7  | F8  | F9  | F10 | F11 |---------------| ESC |  \  |  [  |  ]  |  {  |  }  | SHIFT |
---------------|ENTER|-----| GUI | ALT | Num | Adj |---| *** |SPACE| ALT | GUI |-----| APP |--------------
+| F11   |  !  |  @  |  #  |  $  |  %  |---------------------------|  ^  |  &  |  *  |  (  |  )  | BSPC  |
+| F12   | F1  | F2  | F3  | F4  | F5  |---------------------------|  |  |SHIFT|CTRL | ALT | GUI | ENTER |
+| SHIFT | F6  | F7  | F8  | F9  | F10 |PRTSC|---------------| ESC |  \  |  [  |  ]  |  {  |  }  | SHIFT |
+--------------|CTRL |-----| GUI | ALT | Num | Adj |---| *** |SPACE| ALT | GUI |-----|CTRL |--------------
 ```
 Holding down the Sym key accesses a layer of symbol and function keys:
 
 - The symbols usually found on the number keys are in the top row.
   If desired, you can use these positions for other things,
   as the symbols are also accessible from the number pad layer with the shift key.
-- The remaining symbols appear on the right.
+- Several more symbols appear on the right.
 - The function keys are on the left, beginning with two rows of five.
 - A row of modifiers in the home row allows the comfortable creation of any modifier and function key combination.  
 - The base layer modifier and escape keys are still available, as is a right-hand control key.
 
 ##  Number Pad and Algebraic Layer
 ```
-|       |  -  |  +  |  =  |  /  |  *  |---------------------------|  .  |  7  |  8  |  9  |     | BSPC  |
-| CTRL  | GUI | ALT |CTRL |SHIFT|     |---------------------------|  0  |  1  |  2  |  3  |  _  | CTRL  |
+| TAB   |  -  |  +  |  =  |  /  |  *  |---------------------------|  .  |  7  |  8  |  9  |     | BSPC  |
+|       | GUI | ALT |CTRL |SHIFT|     |---------------------------|  0  |  1  |  2  |  3  |  _  | ENTER |
 | SHIFT |     |     |     |     |     |     |---------------| ESC |  ,  |  4  |  5  |  6  |     | SHIFT |
---------------|ENTER|-----| GUI | ALT | *** |     |---|     |BSPC | ALT | GUI |-----| APP |--------------
+--------------|CTRL |-----| GUI | ALT | *** |     |---|     |BSPC | ALT | GUI |-----|CTRL |--------------
 ```
 Holding down the Num key accesses a number pad and arithmetic symbols:
 
@@ -136,7 +132,7 @@ Holding down the Num key accesses a number pad and arithmetic symbols:
 ## Adjust Layer
 ```
 |       |QWERT|DVORK|COLMK|AG_SWAP|AG_NORM|-----------------------|     |     |     |     |     |       |
-|       |     |     |     |     |     |---------------------------|MOD+ |BRI+ |HUE+ |SAT+ |     |       |
+|       |     |     |     |CTR_S|CTR_N|---------------------------|MOD+ |BRI+ |HUE+ |SAT+ |     |       |
 | RESET |     |     |     |     |     |     |--------------|RGBTOG|MOD- |BRI- |HUE- |SAT- |     |       |
 --------------|     |-----|     |     |     | *** |---| *** |     |     |     |-----|     |--------------
 ```
@@ -204,7 +200,7 @@ Or, you can use the graphical configurator to edit the keymap. To do that:
 - Save the keymap using the green down arrow button.
 - Copy those changes back into your QMK repository and reformat for easy reading using the format script:
 ```
-./keyboards/handwired/hillside/keymaps/json2hill.py --input <Your download directory>/default.json > ./keyboards/handwired/hillside/keymaps/default/keymap.json
+./keyboards/handwired/hillside/0_1/keymaps/json2hill.py --input <Your download directory>/default.json > ./keyboards/handwired/hillside/0_1/keymaps/default/keymap.json
 ```
    You may need to make that script executable with ```chmod +x```. After your keymap is safely copied and formated, you may want to remove the keymap from your download directory so later downloads will automatically receive the same file name.
 
diff --git a/keyboards/handwired/hillside/keymaps/json2hill.py b/keyboards/handwired/hillside/0_1/keymaps/json2hill.py
similarity index 100%
rename from keyboards/handwired/hillside/keymaps/json2hill.py
rename to keyboards/handwired/hillside/0_1/keymaps/json2hill.py
diff --git a/keyboards/handwired/hillside/0_1/keymaps/via/keymap.json b/keyboards/handwired/hillside/0_1/keymaps/via/keymap.json
new file mode 100644
index 0000000000..a015f0241c
--- /dev/null
+++ b/keyboards/handwired/hillside/0_1/keymaps/via/keymap.json
@@ -0,0 +1,61 @@
+{    "version": 1,
+    "notes": "",
+    "keyboard": "handwired/hillside/0_1",
+    "keymap": "via",
+    "layout": "LAYOUT",
+    "layers": [
+        ["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_CAPS"     , "KC_A"   , "KC_S"   , "KC_D"   , "KC_F"   , "KC_G",
+         "KC_H"        , "KC_J"   , "KC_K"   , "KC_L"   , "KC_SCLN", "KC_ENT",
+
+         "KC_LSFT"     , "KC_Z"   , "KC_X"   , "KC_C"   , "KC_V"   , "KC_B"   , "KC_GRV",
+         "KC_ESC"      , "KC_N"   , "KC_M"   , "KC_COMM", "KC_DOT" , "KC_SLSH", "KC_RSFT",
+
+         "KC_LCTL"     , "KC_LGUI", "KC_LALT", "MO(3)"  , "MO(1)",
+         "MO(2)"       , "KC_SPC" , "KC_LALT", "KC_RGUI", "KC_QUOT"
+
+        ],
+        ["KC_NO"       , "KC_INS" , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_VOLU",
+         "KC_PGUP"     , "KC_HOME", "KC_NO"  , "KC_END" , "KC_NO"  , "KC_DEL",
+
+         "KC_NO"       , "KC_LGUI", "KC_LALT", "KC_LCTL", "KC_LSFT", "KC_VOLD",
+         "KC_PGDN"     , "KC_LEFT", "KC_UP"  , "KC_RGHT", "KC_NO"  , "KC_TRNS",
+
+         "KC_LSFT"     , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_MUTE",
+         "KC_ESC"      , "KC_CAPS", "KC_NO"  , "KC_DOWN", "KC_NO"  , "KC_APP" , "KC_TRNS",
+
+         "KC_TRNS"     , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+         "KC_TRNS"     , "KC_BSPC", "KC_TRNS", "KC_TRNS", "KC_RCTL"
+
+        ],
+        ["KC_F11"      , "KC_EXLM", "KC_AT"  , "KC_HASH", "KC_DLR" , "KC_PERC",
+         "KC_CIRC"     , "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "KC_TRNS",
+
+         "KC_F12"      , "KC_F1"  , "KC_F2"  , "KC_F3"  , "KC_F4"  , "KC_F5",
+         "KC_PIPE"     , "KC_LSFT", "KC_LCTL", "KC_LALT", "KC_LGUI", "KC_TRNS",
+
+         "KC_LSFT"     , "KC_F6"  , "KC_F7"  , "KC_F8"  , "KC_F9"  , "KC_F10" , "KC_PSCR",
+         "KC_ESC"      , "KC_BSLS", "KC_LBRC", "KC_RBRC", "KC_LCBR", "KC_RCBR", "KC_TRNS",
+
+         "KC_TRNS"     , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+         "KC_TRNS"     , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_RCTL"
+
+        ],
+        ["KC_TAB"      , "KC_MINS", "KC_PLUS", "KC_EQL" , "KC_SLSH", "KC_ASTR",
+         "KC_COMM"     , "KC_7"   , "KC_8"   , "KC_9"   , "KC_NO"  , "KC_TRNS",
+
+         "ANY(RGB_TOG)", "KC_LGUI", "KC_LALT", "KC_LCTL", "KC_LSFT", "KC_NO",
+         "KC_0"        , "KC_1"   , "KC_2"   , "KC_3"   , "KC_UNDS", "KC_TRNS",
+
+         "KC_TRNS"     , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_NO"  , "KC_NO",
+         "KC_NO"       , "KC_DOT" , "KC_4"   , "KC_5"   , "KC_6"   , "KC_NO"  , "KC_TRNS",
+
+         "KC_TRNS"     , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_NO",
+         "KC_NO"       , "KC_BSPC", "KC_TRNS", "KC_TRNS", "KC_RCTL"
+
+        ]
+    ],
+    "author": "@mmccoyd"
+}
diff --git a/keyboards/handwired/hillside/0_1/readme.md b/keyboards/handwired/hillside/0_1/readme.md
new file mode 100644
index 0000000000..f1ff0f8506
--- /dev/null
+++ b/keyboards/handwired/hillside/0_1/readme.md
@@ -0,0 +1,29 @@
+# Hillside
+
+![hillside](https://imgur.com/XW0rX13.png)
+
+[Hillside](https://github.com/mmccoyd/hillside)
+ is a split ergonomic keyboard
+ with 3x6+4+2 choc-spaced keys with aggressive column stagger,
+ a longer thumb arc and a breakoff outer-pinky column.
+
+* Keyboard Maintainer: [Michael McCoyd](https://github.com/mmccoyd)
+* Hardware Supported: ProMicro/Elite-C and compatible
+* Hardware Availability: https://github.com/mmccoyd/hillside
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/hillside/0_1:default
+
+Flashing example for this keyboard:
+
+    make handwired/hillside/0_1:default:flash
+
+## Bootloader
+
+Enter the bootloader by either:
+
+* **Physical reset button**: Briefly press the button on the front of the PCB.
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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).
diff --git a/keyboards/handwired/hillside/info.json b/keyboards/handwired/hillside/info.json
index 7a29df1c64..781b43c0ff 100644
--- a/keyboards/handwired/hillside/info.json
+++ b/keyboards/handwired/hillside/info.json
@@ -2,96 +2,5 @@
     "manufacturer": "mmccoyd",
     "maintainer": "mmccoyd",
 
-    "keyboard_name": "Hillside",
-    "url": "http://github.com/mmccoyd/hillside/",
-
-    "tags": ["split", "column stagger", "choc v1", "choc spaced" ],
-
-    "processor": "atmega32u4",
-
-    "features": {
-        "encoder": true,
-        "extrakey": true,
-        "rgblight": true
-    },
-    "split": {
-        "soft_serial_pin": "D2",
-        "main": "left"
-    },
-
-    "rgblight": {
-        "led_count": 5,
-        "pin": "D3",
-        "split": true,
-        "hue_steps": 8,
-        "saturation_steps": 8,
-        "brightness_steps": 8
-    },
-
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-		
-                {"label": "Tab", "x": 0, "y": 0.93},
-                {"label": "Q", "x": 1, "y": 0.93},
-                {"label": "W", "x": 2, "y": 0.31},
-                {"label": "E", "x": 3, "y": 0},
-                {"label": "R", "x": 4, "y": 0.28},
-                {"label": "T", "x": 5, "y": 0.42},
-
-                {"label": "Y", "x": 9.5, "y": 0.42},
-                {"label": "U", "x": 10.5, "y": 0.28},
-                {"label": "I", "x": 11.5, "y": 0},
-                {"label": "O", "x": 12.5, "y": 0.31},
-                {"label": "P", "x": 13.5, "y": 0.93},
-                {"label": "Backspace", "x": 14.5, "y": 0.93},
-
-
-                {"label": "Ctrl", "x": 0, "y": 1.93},
-                {"label": "A", "x": 1, "y": 1.93},
-                {"label": "S", "x": 2, "y": 1.31},
-                {"label": "D", "x": 3, "y": 1},
-                {"label": "F", "x": 4, "y": 1.28},
-                {"label": "G", "x": 5, "y": 1.42},
-
-                {"label": "H", "x": 9.5, "y": 1.42},
-                {"label": "J", "x": 10.5, "y": 1.28},
-                {"label": "K", "x": 11.5, "y": 1},
-                {"label": "L", "x": 12.5, "y": 1.31},
-                {"label": ";", "x": 13.5, "y": 1.93},
-                {"label": "'", "x": 14.5, "y": 1.93},
-
-
-                {"label": "Shift", "x": 0, "y": 2.93},
-                {"label": "Z", "x": 1, "y": 2.93},
-                {"label": "X", "x": 2, "y": 2.31},
-                {"label": "C", "x": 3, "y": 2},
-                {"label": "V", "x": 4, "y": 2.28},
-                {"label": "B", "x": 5, "y": 2.42},
-                {"label": "`", "x": 6, "y": 2.78},
-
-                {"label": "Esc", "x": 8.5, "y": 2.78},
-                {"label": "N", "x": 9.5, "y": 2.42},
-                {"label": "M", "x": 10.5, "y": 2.28},
-                {"label": ",", "x": 11.5, "y": 2},
-                {"label": ".", "x": 12.5, "y": 2.31},
-                {"label": "/", "x": 13.5, "y": 2.93},
-                {"label": "Shift", "x": 14.5, "y": 2.93},
-
-
-                {"label": "Enter", "x": 2, "y": 3.31},
-                {"label": "Gui", "x": 3.5, "y": 3.28},
-                {"label": "Alt", "x": 4.5, "y": 3.42},
-                {"label": "Num", "x": 5.5, "y": 3.78},
-                {"label": "Nav", "x": 6.5, "y": 4.14},
-
-
-                {"label": "Sym", "x": 8, "y": 4.14},
-                {"label": "Space", "x": 9, "y": 3.78},
-                {"label": "Alt", "x": 10, "y": 3.42},
-                {"label": "Gui", "x": 11, "y": 3.28},
-                {"label": "App", "x": 12.5, "y": 3.31}
-            ]
-        }
-    }
+    "url": "http://github.com/mmccoyd/hillside/"
 }
diff --git a/keyboards/handwired/hillside/keymaps/default/keymap.json b/keyboards/handwired/hillside/keymaps/default/keymap.json
deleted file mode 100644
index f5871b073f..0000000000
--- a/keyboards/handwired/hillside/keymaps/default/keymap.json
+++ /dev/null
@@ -1,102 +0,0 @@
-{
-  "version": 1,
-  "notes": "",
-  "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
-  "keyboard": "handwired/hillside/0_1",
-  "author": "@mmccoyd",
-  "keymap": "default",
-  "layout": "LAYOUT",
-  "layers": [
-        ["KC_TAB" , "KC_Q"      , "KC_W"         , "KC_E"      , "KC_R"         , "KC_T",
-         "KC_Y"   , "KC_U"      , "KC_I"         , "KC_O"      , "KC_P"         , "KC_BSPC",
-
-         "KC_LCTL", "KC_A"      , "KC_S"         , "KC_D"      , "KC_F"         , "KC_G",
-         "KC_H"   , "KC_J"      , "KC_K"         , "KC_L"      , "KC_SCLN"      , "KC_QUOT",
-
-         "KC_LSFT", "KC_Z"      , "KC_X"         , "KC_C"      , "KC_V"         , "KC_B"      , "KC_GRV",
-         "KC_ESC" , "KC_N"      , "KC_M"         , "KC_COMM"   , "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
-
-         "KC_ENT" , "KC_LGUI"   , "KC_LALT"      , "MO(5)"     , "MO(3)",
-         "MO(4)"  , "KC_SPC"    , "KC_LALT"      , "KC_RGUI"   , "KC_APP"
-
-        ],
-        ["KC_TAB" , "KC_QUOT"   , "KC_COMM"      , "KC_DOT"    , "KC_P"         , "KC_Y",
-         "KC_F"   , "KC_G"      , "KC_C"         , "KC_R"      , "KC_L"         , "KC_BSPC",
-
-         "KC_LCTL", "KC_A"      , "KC_O"         , "KC_E"      , "KC_U"         , "KC_I",
-         "KC_D"   , "KC_H"      , "KC_T"         , "KC_N"      , "KC_S"         , "KC_SLSH",
-
-         "KC_LSFT", "KC_SCLN"   , "KC_Q"         , "KC_J"      , "KC_K"         , "KC_X"      , "KC_GRV",
-         "KC_ESC" , "KC_B"      , "KC_M"         , "KC_W"      , "KC_V"         , "KC_Z"      , "KC_RSFT",
-
-         "KC_ENT" , "KC_LGUI"   , "KC_LALT"      , "MO(5)"     , "MO(3)",
-         "MO(4)"  , "KC_SPC"    , "KC_LALT"      , "KC_RGUI"   , "KC_APP"
-
-        ],
-        ["KC_TAB" , "KC_Q"      , "KC_W"         , "KC_F"      , "KC_P"         , "KC_B",
-         "KC_J"   , "KC_L"      , "KC_U"         , "KC_Y"      , "KC_SCLN"      , "KC_BSPC",
-
-         "KC_LCTL", "KC_A"      , "KC_R"         , "KC_S"      , "KC_T"         , "KC_G",
-         "KC_M"   , "KC_N"      , "KC_E"         , "KC_I"      , "KC_O"         , "KC_QUOT",
-
-         "KC_LSFT", "KC_Z"      , "KC_X"         , "KC_C"      , "KC_D"         , "KC_V"      , "KC_GRV",
-         "KC_ESC" , "KC_K"      , "KC_H"         , "KC_COMM"   , "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
-
-         "KC_ENT" , "KC_LGUI"   , "KC_LALT"      , "MO(5)"     , "MO(3)",
-         "MO(4)"  , "KC_SPC"    , "KC_LALT"      , "KC_RGUI"   , "KC_APP"
-
-        ],
-        ["KC_CAPS", "KC_INS"    , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_VOLU",
-         "KC_PGUP", "KC_HOME"   , "KC_NO"        , "KC_END"    , "KC_NO"        , "KC_DEL",
-
-         "KC_LCTL", "KC_LGUI"   , "KC_LALT"      , "KC_LCTL"   , "KC_LSFT"      , "KC_VOLD",
-         "KC_PGDN", "KC_LEFT"   , "KC_UP"        , "KC_RGHT"   , "KC_NO"        , "KC_RCTL",
-
-         "KC_LSFT", "LCTL(KC_Z)", "LCTL(KC_X)"   , "LCTL(KC_C)", "LCTL(KC_V)"   , "LCTL(KC_Y)", "KC_MUTE",
-         "KC_ESC" , "KC_NO"     , "LCTL(KC_LEFT)", "KC_DOWN"   , "LCTL(KC_RGHT)", "KC_RALT"   , "KC_RSFT",
-
-         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS",
-         "MO(6)"  , "KC_BSPC"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS"
-
-        ],
-        ["KC_F12" , "KC_EXLM"   , "KC_AT"        , "KC_HASH"   , "KC_DLR"       , "KC_PERC",
-         "KC_CIRC", "KC_AMPR"   , "KC_ASTR"      , "KC_LPRN"   , "KC_RPRN"      , "KC_BSPC",
-
-         "KC_LCTL", "KC_F1"     , "KC_F2"        , "KC_F3"     , "KC_F4"        , "KC_F5",
-         "KC_PIPE", "KC_LSFT"   , "KC_LCTL"      , "KC_LALT"   , "KC_LGUI"      , "KC_RCTL",
-
-         "KC_LSFT", "KC_F6"     , "KC_F7"        , "KC_F8"     , "KC_F9"        , "KC_F10"    , "KC_F11",
-         "KC_ESC" , "KC_BSLS"   , "KC_LBRC"      , "KC_RBRC"   , "KC_LCBR"      , "KC_RCBR"   , "KC_RSFT",
-
-         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "MO(6)",
-         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS"
-
-        ],
-        ["KC_NO"  , "KC_MINS"   , "KC_PLUS"      , "KC_EQL"    , "KC_SLSH"      , "KC_ASTR",
-         "KC_COMM", "KC_7"      , "KC_8"         , "KC_9"      , "KC_NO"        , "KC_TRNS",
-
-         "KC_TRNS", "KC_LGUI"   , "KC_LALT"      , "KC_LCTL"   , "KC_LSFT"      , "KC_NO",
-         "KC_0"   , "KC_1"      , "KC_2"         , "KC_3"      , "KC_UNDS"      , "KC_RCTL",
-
-         "KC_TRNS", "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO",
-         "KC_NO"  , "KC_DOT"    , "KC_4"         , "KC_5"      , "KC_6"         , "KC_NO"     , "KC_TRNS",
-
-         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "KC_NO",
-         "KC_NO"  , "KC_BSPC"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS"
-
-        ],
-        ["KC_NO"  , "DF(0)"     , "DF(1)"        , "DF(2)"     , "AG_SWAP"      , "AG_NORM",
-         "KC_NO"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO",
-
-         "KC_NO"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO",
-         "RGB_MOD", "RGB_VAI"   , "RGB_HUI"      , "RGB_SAI"   , "KC_NO"        , "KC_NO",
-
-         "RESET"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO",
-         "RGB_TOG", "RGB_RMOD"  , "RGB_VAD"      , "RGB_HUD"   , "RGB_SAD"      , "KC_NO"     , "KC_NO",
-
-         "KC_NO"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_TRNS",
-         "KC_TRNS", "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"
-
-        ]
-  ]
-}
diff --git a/keyboards/handwired/hillside/keymaps/via/keymap.json b/keyboards/handwired/hillside/keymaps/via/keymap.json
deleted file mode 100644
index 8b4810c309..0000000000
--- a/keyboards/handwired/hillside/keymaps/via/keymap.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  "version": 1,
-  "notes": "",
-  "keyboard": "handwired/hillside/0_1",
-  "author": "@mmccoyd",
-  "keymap": "via",
-  "layout": "LAYOUT",
-  "layers": [
-        ["KC_TAB" , "KC_Q"      , "KC_W"         , "KC_E"      , "KC_R"         , "KC_T",
-         "KC_Y"   , "KC_U"      , "KC_I"         , "KC_O"      , "KC_P"         , "KC_BSPC",
-
-         "KC_LCTL", "KC_A"      , "KC_S"         , "KC_D"      , "KC_F"         , "KC_G",
-         "KC_H"   , "KC_J"      , "KC_K"         , "KC_L"      , "KC_SCLN"      , "KC_QUOT",
-
-         "KC_LSFT", "KC_Z"      , "KC_X"         , "KC_C"      , "KC_V"         , "KC_B"      , "KC_GRV",
-         "KC_ESC" , "KC_N"      , "KC_M"         , "KC_COMM"   , "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
-
-         "KC_ENT" , "KC_LGUI"   , "KC_LALT"      , "MO(5)"     , "MO(3)",
-         "MO(4)"  , "KC_SPC"    , "KC_LALT"      , "KC_RGUI"   , "KC_APP"
-
-        ],
-        ["KC_TAB" , "KC_QUOT"   , "KC_COMM"      , "KC_DOT"    , "KC_P"         , "KC_Y",
-         "KC_F"   , "KC_G"      , "KC_C"         , "KC_R"      , "KC_L"         , "KC_BSPC",
-
-         "KC_LCTL", "KC_A"      , "KC_O"         , "KC_E"      , "KC_U"         , "KC_I",
-         "KC_D"   , "KC_H"      , "KC_T"         , "KC_N"      , "KC_S"         , "KC_SLSH",
-
-         "KC_LSFT", "KC_SCLN"   , "KC_Q"         , "KC_J"      , "KC_K"         , "KC_X"      , "KC_GRV",
-         "KC_ESC" , "KC_B"      , "KC_M"         , "KC_W"      , "KC_V"         , "KC_Z"      , "KC_RSFT",
-
-         "KC_ENT" , "KC_LGUI"   , "KC_LALT"      , "MO(5)"     , "MO(3)",
-         "MO(4)"  , "KC_SPC"    , "KC_LALT"      , "KC_RGUI"   , "KC_APP"
-
-        ],
-        ["KC_TAB" , "KC_Q"      , "KC_W"         , "KC_F"      , "KC_P"         , "KC_B",
-         "KC_J"   , "KC_L"      , "KC_U"         , "KC_Y"      , "KC_SCLN"      , "KC_BSPC",
-
-         "KC_LCTL", "KC_A"      , "KC_R"         , "KC_S"      , "KC_T"         , "KC_G",
-         "KC_M"   , "KC_N"      , "KC_E"         , "KC_I"      , "KC_O"         , "KC_QUOT",
-
-         "KC_LSFT", "KC_Z"      , "KC_X"         , "KC_C"      , "KC_D"         , "KC_V"      , "KC_GRV",
-         "KC_ESC" , "KC_K"      , "KC_H"         , "KC_COMM"   , "KC_DOT"       , "KC_SLSH"   , "KC_RSFT",
-
-         "KC_ENT" , "KC_LGUI"   , "KC_LALT"      , "MO(5)"     , "MO(3)",
-         "MO(4)"  , "KC_SPC"    , "KC_LALT"      , "KC_RGUI"   , "KC_APP"
-
-        ],
-        ["KC_CAPS", "KC_INS"    , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_VOLU",
-         "KC_PGUP", "KC_HOME"   , "KC_NO"        , "KC_END"    , "KC_NO"        , "KC_DEL",
-
-         "KC_LCTL", "KC_LGUI"   , "KC_LALT"      , "KC_LCTL"   , "KC_LSFT"      , "KC_VOLD",
-         "KC_PGDN", "KC_LEFT"   , "KC_UP"        , "KC_RGHT"   , "KC_NO"        , "KC_RCTL",
-
-         "KC_LSFT", "LCTL(KC_Z)", "LCTL(KC_X)"   , "LCTL(KC_C)", "LCTL(KC_V)"   , "LCTL(KC_Y)", "KC_MUTE",
-         "KC_ESC" , "KC_NO"     , "LCTL(KC_LEFT)", "KC_DOWN"   , "LCTL(KC_RGHT)", "KC_RALT"   , "KC_RSFT",
-
-         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS",
-         "MO(6)"  , "KC_BSPC"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS"
-
-        ],
-        ["KC_F12" , "KC_EXLM"   , "KC_AT"        , "KC_HASH"   , "KC_DLR"       , "KC_PERC",
-         "KC_CIRC", "KC_AMPR"   , "KC_ASTR"      , "KC_LPRN"   , "KC_RPRN"      , "KC_BSPC",
-
-         "KC_LCTL", "KC_F1"     , "KC_F2"        , "KC_F3"     , "KC_F4"        , "KC_F5",
-         "KC_PIPE", "KC_LSFT"   , "KC_LCTL"      , "KC_LALT"   , "KC_LGUI"      , "KC_RCTL",
-
-         "KC_LSFT", "KC_F6"     , "KC_F7"        , "KC_F8"     , "KC_F9"        , "KC_F10"    , "KC_F11",
-         "KC_ESC" , "KC_BSLS"   , "KC_LBRC"      , "KC_RBRC"   , "KC_LCBR"      , "KC_RCBR"   , "KC_RSFT",
-
-         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "MO(6)",
-         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS"
-
-        ],
-        ["KC_NO"  , "KC_MINS"   , "KC_PLUS"      , "KC_EQL"    , "KC_SLSH"      , "KC_ASTR",
-         "KC_COMM", "KC_7"      , "KC_8"         , "KC_9"      , "KC_NO"        , "KC_TRNS",
-
-         "KC_TRNS", "KC_LGUI"   , "KC_LALT"      , "KC_LCTL"   , "KC_LSFT"      , "KC_NO",
-         "KC_0"   , "KC_1"      , "KC_2"         , "KC_3"      , "KC_UNDS"      , "KC_RCTL",
-
-         "KC_TRNS", "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO",
-         "KC_NO"  , "KC_DOT"    , "KC_4"         , "KC_5"      , "KC_6"         , "KC_NO"     , "KC_TRNS",
-
-         "KC_TRNS", "KC_TRNS"   , "KC_TRNS"      , "KC_TRNS"   , "KC_NO",
-         "KC_NO"  , "KC_BSPC"   , "KC_TRNS"      , "KC_TRNS"   , "KC_TRNS"
-
-        ],
-        ["KC_NO"  , "DF(0)"     , "DF(1)"        , "DF(2)"     , "AG_SWAP"      , "AG_NORM",
-         "KC_NO"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO",
-
-         "KC_NO"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO",
-         "RGB_MOD", "RGB_VAI"   , "RGB_HUI"      , "RGB_SAI"   , "KC_NO"        , "KC_NO",
-
-         "RESET"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO",
-         "RGB_TOG", "RGB_RMOD"  , "RGB_VAD"      , "RGB_HUD"   , "RGB_SAD"      , "KC_NO"     , "KC_NO",
-
-         "KC_NO"  , "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_TRNS",
-         "KC_TRNS", "KC_NO"     , "KC_NO"        , "KC_NO"     , "KC_NO"
-
-        ]
-  ]
-}
diff --git a/keyboards/handwired/hillside/readme.md b/keyboards/handwired/hillside/readme.md
index f1ff0f8506..cffb3875aa 100644
--- a/keyboards/handwired/hillside/readme.md
+++ b/keyboards/handwired/hillside/readme.md
@@ -2,28 +2,10 @@
 
 ![hillside](https://imgur.com/XW0rX13.png)
 
-[Hillside](https://github.com/mmccoyd/hillside)
- is a split ergonomic keyboard
- with 3x6+4+2 choc-spaced keys with aggressive column stagger,
- a longer thumb arc and a breakoff outer-pinky column.
+Hillside is a small family of split ergonomic keyboards, currently of one.
+Inside this directory is support for each model.
 
 * Keyboard Maintainer: [Michael McCoyd](https://github.com/mmccoyd)
-* Hardware Supported: ProMicro/Elite-C and compatible
+* Hardware Supported:
+    * [Hillside 0_1](https://github.com/qmk/qmk_firmware/blob/master/keyboards/handwired/hillside/0_1): ProMicro/Elite-C and compatible
 * Hardware Availability: https://github.com/mmccoyd/hillside
-
-Make example for this keyboard (after setting up your build environment):
-
-    make handwired/hillside/0_1:default
-
-Flashing example for this keyboard:
-
-    make handwired/hillside/0_1:default:flash
-
-## Bootloader
-
-Enter the bootloader by either:
-
-* **Physical reset button**: Briefly press the button on the front of the PCB.
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
-
-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).

From cad8866db1fce8c6e5d2beca779e779abb1d7369 Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Mon, 31 Jan 2022 05:56:54 +1100
Subject: [PATCH 433/867] Add support for Q-series on the ckled2001 LED driver
 (#16051)

---
 drivers/led/ckled2001.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/led/ckled2001.c b/drivers/led/ckled2001.c
index 990e50cb60..8d71805a24 100644
--- a/drivers/led/ckled2001.c
+++ b/drivers/led/ckled2001.c
@@ -125,7 +125,16 @@ void CKLED2001_init(uint8_t addr) {
     // Set CURRENT PAGE (Page 4)
     CKLED2001_write_register(addr, CONFIGURE_CMD_PAGE, CURRENT_TUNE_PAGE);
     for (int i = 0; i < LED_CURRENT_TUNE_LENGTH; i++) {
-        CKLED2001_write_register(addr, i, 0xFF);
+        switch (i) {
+            case 2:
+            case 5:
+            case 8:
+            case 11:
+                CKLED2001_write_register(addr, i, 0xA0);
+                break;
+            default:
+                CKLED2001_write_register(addr, i, 0xFF);
+        }
     }
 
     // Enable LEDs ON/OFF

From 566f6e7b76448fa0a367ce573b2ff90abd3541a5 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Mon, 31 Jan 2022 02:58:40 +0800
Subject: [PATCH 434/867] [Keyboard] move @matthewdias 's keebs into
 matthewdias/ (#15991)

---
 data/mappings/keyboard_aliases.json                  | 12 ++++++++++++
 keyboards/{ => matthewdias}/m3n3van/config.h         |  0
 keyboards/{ => matthewdias}/m3n3van/info.json        |  0
 .../m3n3van/keymaps/default/keymap.json              |  0
 .../m3n3van/keymaps/matthewdias/keymap.c             |  0
 .../{ => matthewdias}/m3n3van/keymaps/via/keymap.c   |  0
 .../{ => matthewdias}/m3n3van/keymaps/via/rules.mk   |  0
 keyboards/{ => matthewdias}/m3n3van/m3n3van.c        |  0
 keyboards/{ => matthewdias}/m3n3van/m3n3van.h        |  0
 keyboards/{ => matthewdias}/m3n3van/readme.md        |  4 ++--
 keyboards/{ => matthewdias}/m3n3van/rules.mk         |  0
 keyboards/{ => matthewdias}/minim/config.h           |  0
 keyboards/{ => matthewdias}/minim/info.json          |  0
 .../minim/keymaps/default/keymap.json                |  0
 keyboards/{ => matthewdias}/minim/minim.c            |  0
 keyboards/{ => matthewdias}/minim/minim.h            |  0
 keyboards/{ => matthewdias}/minim/readme.md          |  4 ++--
 keyboards/{ => matthewdias}/minim/rules.mk           |  0
 keyboards/{ => matthewdias}/model_v/config.h         |  0
 keyboards/{ => matthewdias}/model_v/info.json        |  0
 .../model_v/keymaps/default/keymap.c                 |  0
 .../{ => matthewdias}/model_v/keymaps/via/keymap.c   |  0
 .../{ => matthewdias}/model_v/keymaps/via/rules.mk   |  0
 keyboards/{ => matthewdias}/model_v/model_v.c        |  0
 keyboards/{ => matthewdias}/model_v/model_v.h        |  0
 keyboards/{ => matthewdias}/model_v/readme.md        |  4 ++--
 keyboards/{ => matthewdias}/model_v/rules.mk         |  0
 keyboards/{ => matthewdias}/txuu/config.h            |  0
 keyboards/{ => matthewdias}/txuu/info.json           |  0
 .../{ => matthewdias}/txuu/keymaps/default/keymap.c  |  0
 .../{ => matthewdias}/txuu/keymaps/via/keymap.c      |  0
 .../{ => matthewdias}/txuu/keymaps/via/rules.mk      |  0
 keyboards/{ => matthewdias}/txuu/readme.md           |  4 ++--
 keyboards/{ => matthewdias}/txuu/rules.mk            |  0
 keyboards/{ => matthewdias}/txuu/txuu.c              |  0
 keyboards/{ => matthewdias}/txuu/txuu.h              |  0
 36 files changed, 20 insertions(+), 8 deletions(-)
 rename keyboards/{ => matthewdias}/m3n3van/config.h (100%)
 rename keyboards/{ => matthewdias}/m3n3van/info.json (100%)
 rename keyboards/{ => matthewdias}/m3n3van/keymaps/default/keymap.json (100%)
 rename keyboards/{ => matthewdias}/m3n3van/keymaps/matthewdias/keymap.c (100%)
 rename keyboards/{ => matthewdias}/m3n3van/keymaps/via/keymap.c (100%)
 rename keyboards/{ => matthewdias}/m3n3van/keymaps/via/rules.mk (100%)
 rename keyboards/{ => matthewdias}/m3n3van/m3n3van.c (100%)
 rename keyboards/{ => matthewdias}/m3n3van/m3n3van.h (100%)
 rename keyboards/{ => matthewdias}/m3n3van/readme.md (92%)
 rename keyboards/{ => matthewdias}/m3n3van/rules.mk (100%)
 rename keyboards/{ => matthewdias}/minim/config.h (100%)
 rename keyboards/{ => matthewdias}/minim/info.json (100%)
 rename keyboards/{ => matthewdias}/minim/keymaps/default/keymap.json (100%)
 rename keyboards/{ => matthewdias}/minim/minim.c (100%)
 rename keyboards/{ => matthewdias}/minim/minim.h (100%)
 rename keyboards/{ => matthewdias}/minim/readme.md (91%)
 rename keyboards/{ => matthewdias}/minim/rules.mk (100%)
 rename keyboards/{ => matthewdias}/model_v/config.h (100%)
 rename keyboards/{ => matthewdias}/model_v/info.json (100%)
 rename keyboards/{ => matthewdias}/model_v/keymaps/default/keymap.c (100%)
 rename keyboards/{ => matthewdias}/model_v/keymaps/via/keymap.c (100%)
 rename keyboards/{ => matthewdias}/model_v/keymaps/via/rules.mk (100%)
 rename keyboards/{ => matthewdias}/model_v/model_v.c (100%)
 rename keyboards/{ => matthewdias}/model_v/model_v.h (100%)
 rename keyboards/{ => matthewdias}/model_v/readme.md (90%)
 rename keyboards/{ => matthewdias}/model_v/rules.mk (100%)
 rename keyboards/{ => matthewdias}/txuu/config.h (100%)
 rename keyboards/{ => matthewdias}/txuu/info.json (100%)
 rename keyboards/{ => matthewdias}/txuu/keymaps/default/keymap.c (100%)
 rename keyboards/{ => matthewdias}/txuu/keymaps/via/keymap.c (100%)
 rename keyboards/{ => matthewdias}/txuu/keymaps/via/rules.mk (100%)
 rename keyboards/{ => matthewdias}/txuu/readme.md (90%)
 rename keyboards/{ => matthewdias}/txuu/rules.mk (100%)
 rename keyboards/{ => matthewdias}/txuu/txuu.c (100%)
 rename keyboards/{ => matthewdias}/txuu/txuu.h (100%)

diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index c8c39b246c..5d9bf9f439 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -263,6 +263,9 @@
     'lfkeyboards/smk65': {
           target: 'lfkeyboards/smk65/revb'
     },
+    m3v3van: {
+          target: 'matthewdias/m3n3van'
+    },
     'maartenwut/atom47/rev2': {
           target: 'evyd13/atom47/rev2'
     },
@@ -356,9 +359,15 @@
     'mechlovin/hannah65': {
           target: 'mechlovin/hannah65/rev1'
     },
+    minim: {
+          target: 'matthewdias/minim'
+    },
     model01: {
           target: 'keyboardio/model01'
     },
+    model_v: {
+          target: 'matthewdias/model_v'
+    },
     m0lly: {
           target: 'tkc/m0lly'
     },
@@ -501,6 +510,9 @@
     'tokyo60': {
           target: 'tokyokeyboard/tokyo60'
     },
+    'txuu': {
+          target: 'matthewdias/txuu'
+    },
     underscore33: {
           target: 'underscore33/rev1'
     },
diff --git a/keyboards/m3n3van/config.h b/keyboards/matthewdias/m3n3van/config.h
similarity index 100%
rename from keyboards/m3n3van/config.h
rename to keyboards/matthewdias/m3n3van/config.h
diff --git a/keyboards/m3n3van/info.json b/keyboards/matthewdias/m3n3van/info.json
similarity index 100%
rename from keyboards/m3n3van/info.json
rename to keyboards/matthewdias/m3n3van/info.json
diff --git a/keyboards/m3n3van/keymaps/default/keymap.json b/keyboards/matthewdias/m3n3van/keymaps/default/keymap.json
similarity index 100%
rename from keyboards/m3n3van/keymaps/default/keymap.json
rename to keyboards/matthewdias/m3n3van/keymaps/default/keymap.json
diff --git a/keyboards/m3n3van/keymaps/matthewdias/keymap.c b/keyboards/matthewdias/m3n3van/keymaps/matthewdias/keymap.c
similarity index 100%
rename from keyboards/m3n3van/keymaps/matthewdias/keymap.c
rename to keyboards/matthewdias/m3n3van/keymaps/matthewdias/keymap.c
diff --git a/keyboards/m3n3van/keymaps/via/keymap.c b/keyboards/matthewdias/m3n3van/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/m3n3van/keymaps/via/keymap.c
rename to keyboards/matthewdias/m3n3van/keymaps/via/keymap.c
diff --git a/keyboards/m3n3van/keymaps/via/rules.mk b/keyboards/matthewdias/m3n3van/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/m3n3van/keymaps/via/rules.mk
rename to keyboards/matthewdias/m3n3van/keymaps/via/rules.mk
diff --git a/keyboards/m3n3van/m3n3van.c b/keyboards/matthewdias/m3n3van/m3n3van.c
similarity index 100%
rename from keyboards/m3n3van/m3n3van.c
rename to keyboards/matthewdias/m3n3van/m3n3van.c
diff --git a/keyboards/m3n3van/m3n3van.h b/keyboards/matthewdias/m3n3van/m3n3van.h
similarity index 100%
rename from keyboards/m3n3van/m3n3van.h
rename to keyboards/matthewdias/m3n3van/m3n3van.h
diff --git a/keyboards/m3n3van/readme.md b/keyboards/matthewdias/m3n3van/readme.md
similarity index 92%
rename from keyboards/m3n3van/readme.md
rename to keyboards/matthewdias/m3n3van/readme.md
index 66f9d08042..4a426cc224 100644
--- a/keyboards/m3n3van/readme.md
+++ b/keyboards/matthewdias/m3n3van/readme.md
@@ -12,10 +12,10 @@ To reset the keyboard into bootloader mode, press the reset switch on the unders
 
 Make example for this keyboard (after setting up your build environment):
 
-    make m3n3van:default
+    make matthewdias/m3n3van:default
 
 Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):
 
-    make m3n3van:default:flash
+    make matthewdias/m3n3van:default:flash
 
 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).
diff --git a/keyboards/m3n3van/rules.mk b/keyboards/matthewdias/m3n3van/rules.mk
similarity index 100%
rename from keyboards/m3n3van/rules.mk
rename to keyboards/matthewdias/m3n3van/rules.mk
diff --git a/keyboards/minim/config.h b/keyboards/matthewdias/minim/config.h
similarity index 100%
rename from keyboards/minim/config.h
rename to keyboards/matthewdias/minim/config.h
diff --git a/keyboards/minim/info.json b/keyboards/matthewdias/minim/info.json
similarity index 100%
rename from keyboards/minim/info.json
rename to keyboards/matthewdias/minim/info.json
diff --git a/keyboards/minim/keymaps/default/keymap.json b/keyboards/matthewdias/minim/keymaps/default/keymap.json
similarity index 100%
rename from keyboards/minim/keymaps/default/keymap.json
rename to keyboards/matthewdias/minim/keymaps/default/keymap.json
diff --git a/keyboards/minim/minim.c b/keyboards/matthewdias/minim/minim.c
similarity index 100%
rename from keyboards/minim/minim.c
rename to keyboards/matthewdias/minim/minim.c
diff --git a/keyboards/minim/minim.h b/keyboards/matthewdias/minim/minim.h
similarity index 100%
rename from keyboards/minim/minim.h
rename to keyboards/matthewdias/minim/minim.h
diff --git a/keyboards/minim/readme.md b/keyboards/matthewdias/minim/readme.md
similarity index 91%
rename from keyboards/minim/readme.md
rename to keyboards/matthewdias/minim/readme.md
index 95820c4db9..e94e928ce5 100644
--- a/keyboards/minim/readme.md
+++ b/keyboards/matthewdias/minim/readme.md
@@ -12,10 +12,10 @@ To reset the keyboard into bootloader mode, press the reset switch on the unders
 
 Make example for this keyboard (after setting up your build environment):
 
-    make minim:default
+    make matthewdias/minim:default
 
 Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):
 
-    make minim:default:flash
+    make matthewdias/minim:default:flash
 
 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).
diff --git a/keyboards/minim/rules.mk b/keyboards/matthewdias/minim/rules.mk
similarity index 100%
rename from keyboards/minim/rules.mk
rename to keyboards/matthewdias/minim/rules.mk
diff --git a/keyboards/model_v/config.h b/keyboards/matthewdias/model_v/config.h
similarity index 100%
rename from keyboards/model_v/config.h
rename to keyboards/matthewdias/model_v/config.h
diff --git a/keyboards/model_v/info.json b/keyboards/matthewdias/model_v/info.json
similarity index 100%
rename from keyboards/model_v/info.json
rename to keyboards/matthewdias/model_v/info.json
diff --git a/keyboards/model_v/keymaps/default/keymap.c b/keyboards/matthewdias/model_v/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/model_v/keymaps/default/keymap.c
rename to keyboards/matthewdias/model_v/keymaps/default/keymap.c
diff --git a/keyboards/model_v/keymaps/via/keymap.c b/keyboards/matthewdias/model_v/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/model_v/keymaps/via/keymap.c
rename to keyboards/matthewdias/model_v/keymaps/via/keymap.c
diff --git a/keyboards/model_v/keymaps/via/rules.mk b/keyboards/matthewdias/model_v/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/model_v/keymaps/via/rules.mk
rename to keyboards/matthewdias/model_v/keymaps/via/rules.mk
diff --git a/keyboards/model_v/model_v.c b/keyboards/matthewdias/model_v/model_v.c
similarity index 100%
rename from keyboards/model_v/model_v.c
rename to keyboards/matthewdias/model_v/model_v.c
diff --git a/keyboards/model_v/model_v.h b/keyboards/matthewdias/model_v/model_v.h
similarity index 100%
rename from keyboards/model_v/model_v.h
rename to keyboards/matthewdias/model_v/model_v.h
diff --git a/keyboards/model_v/readme.md b/keyboards/matthewdias/model_v/readme.md
similarity index 90%
rename from keyboards/model_v/readme.md
rename to keyboards/matthewdias/model_v/readme.md
index 17d12d8108..e73c131e29 100644
--- a/keyboards/model_v/readme.md
+++ b/keyboards/matthewdias/model_v/readme.md
@@ -11,10 +11,10 @@ To reset the keyboard into bootloader mode, press the reset switch on the unders
 
 Make example for this keyboard (after setting up your build environment):
 
-    make model_v:default
+    make matthewdias/model_v:default
 
 Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):
 
-    make model_v:default:flash
+    make matthewdias/model_v:default:flash
 
 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).
diff --git a/keyboards/model_v/rules.mk b/keyboards/matthewdias/model_v/rules.mk
similarity index 100%
rename from keyboards/model_v/rules.mk
rename to keyboards/matthewdias/model_v/rules.mk
diff --git a/keyboards/txuu/config.h b/keyboards/matthewdias/txuu/config.h
similarity index 100%
rename from keyboards/txuu/config.h
rename to keyboards/matthewdias/txuu/config.h
diff --git a/keyboards/txuu/info.json b/keyboards/matthewdias/txuu/info.json
similarity index 100%
rename from keyboards/txuu/info.json
rename to keyboards/matthewdias/txuu/info.json
diff --git a/keyboards/txuu/keymaps/default/keymap.c b/keyboards/matthewdias/txuu/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/txuu/keymaps/default/keymap.c
rename to keyboards/matthewdias/txuu/keymaps/default/keymap.c
diff --git a/keyboards/txuu/keymaps/via/keymap.c b/keyboards/matthewdias/txuu/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/txuu/keymaps/via/keymap.c
rename to keyboards/matthewdias/txuu/keymaps/via/keymap.c
diff --git a/keyboards/txuu/keymaps/via/rules.mk b/keyboards/matthewdias/txuu/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/txuu/keymaps/via/rules.mk
rename to keyboards/matthewdias/txuu/keymaps/via/rules.mk
diff --git a/keyboards/txuu/readme.md b/keyboards/matthewdias/txuu/readme.md
similarity index 90%
rename from keyboards/txuu/readme.md
rename to keyboards/matthewdias/txuu/readme.md
index 1800d8a8ca..017cd23bb1 100644
--- a/keyboards/txuu/readme.md
+++ b/keyboards/matthewdias/txuu/readme.md
@@ -9,10 +9,10 @@ To reset the keyboard into bootloader mode, press the reset switch on the unders
 
 Make example for this keyboard (after setting up your build environment):
 
-    make txuu:default
+    make matthewdias/txuu:default
 
 Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):
 
-    make txuu:default:flash
+    make matthewdias/txuu:default:flash
 
 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).
diff --git a/keyboards/txuu/rules.mk b/keyboards/matthewdias/txuu/rules.mk
similarity index 100%
rename from keyboards/txuu/rules.mk
rename to keyboards/matthewdias/txuu/rules.mk
diff --git a/keyboards/txuu/txuu.c b/keyboards/matthewdias/txuu/txuu.c
similarity index 100%
rename from keyboards/txuu/txuu.c
rename to keyboards/matthewdias/txuu/txuu.c
diff --git a/keyboards/txuu/txuu.h b/keyboards/matthewdias/txuu/txuu.h
similarity index 100%
rename from keyboards/txuu/txuu.h
rename to keyboards/matthewdias/txuu/txuu.h

From 5576f641ceed94083e3ad5f947ccf058f6103234 Mon Sep 17 00:00:00 2001
From: Wolf Van Herreweghe <wolfvanh@gmail.com>
Date: Sun, 30 Jan 2022 19:58:58 +0100
Subject: [PATCH 435/867] [Keyboard] Add base FAve 84H firmware (#15967)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
---
 keyboards/linworks/fave84h/config.h           | 115 ++++++++++++++++++
 keyboards/linworks/fave84h/fave84h.c          |  50 ++++++++
 keyboards/linworks/fave84h/fave84h.h          |  34 ++++++
 keyboards/linworks/fave84h/info.json          |  10 ++
 .../linworks/fave84h/keymaps/default/keymap.c |  50 ++++++++
 .../linworks/fave84h/keymaps/via/keymap.c     |  68 +++++++++++
 .../linworks/fave84h/keymaps/via/rules.mk     |   1 +
 keyboards/linworks/fave84h/readme.md          |  23 ++++
 keyboards/linworks/fave84h/rules.mk           |  23 ++++
 9 files changed, 374 insertions(+)
 create mode 100644 keyboards/linworks/fave84h/config.h
 create mode 100644 keyboards/linworks/fave84h/fave84h.c
 create mode 100644 keyboards/linworks/fave84h/fave84h.h
 create mode 100644 keyboards/linworks/fave84h/info.json
 create mode 100644 keyboards/linworks/fave84h/keymaps/default/keymap.c
 create mode 100644 keyboards/linworks/fave84h/keymaps/via/keymap.c
 create mode 100644 keyboards/linworks/fave84h/keymaps/via/rules.mk
 create mode 100644 keyboards/linworks/fave84h/readme.md
 create mode 100644 keyboards/linworks/fave84h/rules.mk

diff --git a/keyboards/linworks/fave84h/config.h b/keyboards/linworks/fave84h/config.h
new file mode 100644
index 0000000000..4127c211fd
--- /dev/null
+++ b/keyboards/linworks/fave84h/config.h
@@ -0,0 +1,115 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+
+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    0x4C58 // LX
+#define PRODUCT_ID   0x0004 // FAve 84H
+#define DEVICE_VER   0x0001 // Version 1
+#define MANUFACTURER    Lx3
+#define PRODUCT         FAve 84H
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/*
+ * 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)
+ *
+*/
+
+// Checked with Eagle Schematic
+#define MATRIX_ROW_PINS { B1, B2, B3, D3, D1, D0  }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, B0, B7, E6}
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+//Led configuration
+#define RGBLIGHT_ANIMATIONS
+#define RGB_DI_PIN D2
+
+#define DRIVER_LED_TOTAL 126
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 140
+
+#define RGB_MATRIX_KEYPRESSES
+//#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#ifdef RGB_MATRIX_FRAMEBUFFER_EFFECTS
+    #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#endif
+#ifdef RGB_MATRIX_KEYPRESSES
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+    #define ENABLE_RGB_MATRIX_SPLASH
+    #define ENABLE_RGB_MATRIX_MULTISPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
+
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/linworks/fave84h/fave84h.c b/keyboards/linworks/fave84h/fave84h.c
new file mode 100644
index 0000000000..745e8633f7
--- /dev/null
+++ b/keyboards/linworks/fave84h/fave84h.c
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+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 "fave84h.h"
+
+#ifdef RGB_MATRIX_ENABLE
+    led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        { 47, NO_LED, 48,     49,     50, 51,     52,     53,     54,     55, 56,     57,     58,     59,     60,     61,     62 },
+        { 46,     45, 44,     43,     42, 41,     40,     39,     38,     37, 36,     35,     34,     33,     32,     31,     30 },
+        { 13,     14, 15,     16,     17, 18,     19,     20,     21,     22, 23,     24,     25,     26,     27,     28,     29 },
+        { 12,     11, 10,      9,      8,  7,      6,      5,      4,      3,  2,      1, NO_LED,      0, NO_LED, NO_LED, NO_LED },
+        { 73,     74, 75,     76,     77, 78,     79,     80,     81,     82, 83, NO_LED,     84, NO_LED, NO_LED,     85, NO_LED },
+        { 72,     71, 70, NO_LED, NO_LED, 69, NO_LED, NO_LED, NO_LED, NO_LED, 68, NO_LED,     67,     66,     65,     64,     63 },
+    }, {
+        // LED Index to Physical Position
+        {0, 0}, {28, 0}, {42, 0}, {57, 0}, {71, 0}, {92, 0}, {106, 0}, {120, 0}, {134, 0}, {156, 0}, 
+        {170, 0}, {184, 0}, {198, 0}, {216, 0}, {230, 0}, {244, 0}, {0, 15}, {14, 15}, {28, 15}, {42, 15}, 
+        {57, 15}, {71, 15}, {85, 15}, {99, 15}, {113, 15}, {127, 15}, {141, 15}, {156, 15}, {170, 15}, {191, 17}, 
+        {216, 15}, {230, 15}, {244, 15}, {4, 27}, {21, 27}, {35, 27}, {50, 27}, {64, 27}, {78, 27}, {92, 27}, 
+        {106, 27}, {120, 27}, {134, 27}, {149, 27}, {163, 27}, {177, 27}, {194, 27}, {216, 27}, {230, 27}, {244, 27}, 
+        {10, 40}, {25, 40}, {39, 40}, {53, 40}, {67, 40}, {81, 40}, {95, 40}, {110, 40}, {124, 40}, {138, 40}, 
+        {152, 40}, {166, 40}, {189, 40}, {9, 52}, {32, 52}, {46, 52}, {60, 52}, {74, 52}, {88, 52}, {103, 52}, 
+        {117, 52}, {131, 52}, {145, 52}, {159, 52}, {186, 52}, {230, 52}, {4, 64}, {21, 64}, {39, 64}, {99, 64}, 
+        {159, 64}, {177, 64}, {194, 64}, {216, 64}, {230, 64}, {244, 64}
+    }, {
+        // LED Index to Flag
+        1,    4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4,    1, 1, 1, 
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1, 1, 
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1, 1, 
+        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,          1,
+        1, 1, 1,       4,             1,    1, 1,    1, 1, 1,
+
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+    }
+};
+#endif
\ No newline at end of file
diff --git a/keyboards/linworks/fave84h/fave84h.h b/keyboards/linworks/fave84h/fave84h.h
new file mode 100644
index 0000000000..39f85c159c
--- /dev/null
+++ b/keyboards/linworks/fave84h/fave84h.h
@@ -0,0 +1,34 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+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"
+
+/* FAve 84H Keymap Definitions */
+#define LAYOUT( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,  K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2E, K2F, K2G, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                 \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,            K4F,      \
+    K50, K51, K52,           K55,                     K5A,      K5C, K5D,  K5E, K5F, K5G  \
+) { \
+    { K00, KC_NO, K02, K03,   K04,   K05, K06,   K07,   K08,   K09,   K0A, K0B,   K0C, K0D,   K0E,   K0F,   K0G   }, \
+    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19,   K1A, K1B,   K1C, K1D,   K1E,   K1F,   K1G   }, \
+    { K20, K21,   K22, K23,   K24,   K25, K26,   K27,   K28,   K29,   K2A, K2B,   K2C, K2D,   K2E,   K2F,   K2G   }, \
+    { K30, K31,   K32, K33,   K34,   K35, K36,   K37,   K38,   K39,   K3A, K3B,   K3C, K3D,   KC_NO, KC_NO, KC_NO }, \
+    { K40, K41,   K42, K43,   K44,   K45, K46,   K47,   K48,   K49,   K4A, KC_NO, K4C, KC_NO, KC_NO, K4F,   KC_NO }, \
+    { K50, K51,   K52, KC_NO, KC_NO, K55, KC_NO, KC_NO, KC_NO, KC_NO, K5A, KC_NO, K5C, K5D,   K5E,   K5F,   K5G   }  \
+}
diff --git a/keyboards/linworks/fave84h/info.json b/keyboards/linworks/fave84h/info.json
new file mode 100644
index 0000000000..939b99c480
--- /dev/null
+++ b/keyboards/linworks/fave84h/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Lx3 Fave 84H",
+    "url": "",
+    "maintainer": "ToastyStoemp",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Delete", "x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Win", "x":1.5, "y":5.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.5}, {"x":4, "y":5.25, "w":7}, {"label":"Alt", "x":11, "y":5.25, "w":1.5}, {"label":"Fn", "x":12.5, "y":5.25}, {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+        }
+    }
+}
diff --git a/keyboards/linworks/fave84h/keymaps/default/keymap.c b/keyboards/linworks/fave84h/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7c90788546
--- /dev/null
+++ b/keyboards/linworks/fave84h/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+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 layers {
+    _LAYER0,
+    _LAYER1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,  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(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,        
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_AUDIO_VOL_UP,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    )
+    
+    };
+};
+
+void rgb_matrix_indicators_user(void) {
+    led_t host_leds = host_keyboard_led_state();
+    if (host_leds.caps_lock) {
+        rgb_matrix_set_color(12, 254, 189, 41); // set caps lock led color first number is index, R G B
+    }
+}
\ No newline at end of file
diff --git a/keyboards/linworks/fave84h/keymaps/via/keymap.c b/keyboards/linworks/fave84h/keymaps/via/keymap.c
new file mode 100644
index 0000000000..3000a76245
--- /dev/null
+++ b/keyboards/linworks/fave84h/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+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 layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,  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(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,        
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_AUDIO_VOL_UP,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    ),
+
+    [_LAYER2] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER3] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+void rgb_matrix_indicators_user(void) {
+    led_t host_leds = host_keyboard_led_state();
+    if (host_leds.caps_lock) {
+        rgb_matrix_set_color(12, 254, 189, 41); // set caps lock led color first number is index, R G B
+    }
+}
\ No newline at end of file
diff --git a/keyboards/linworks/fave84h/keymaps/via/rules.mk b/keyboards/linworks/fave84h/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/linworks/fave84h/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/linworks/fave84h/readme.md b/keyboards/linworks/fave84h/readme.md
new file mode 100644
index 0000000000..f2090dee53
--- /dev/null
+++ b/keyboards/linworks/fave84h/readme.md
@@ -0,0 +1,23 @@
+# FAve 84H
+
+The following is the QMK Firmware for the FAve 84H Hotswap PCB.
+
+The PCB features:
+* QMK & VIA compatibility
+* Hotswap
+* Per Key and Underglow RGB
+
+---
+
+* Keyboard Maintainer: [ToastyStoemp](https://github.com/ToastyStoemp)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make linworks/fave84h: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).
+
+## Bootloader Enter the bootloader in 3 ways: 
+* **Bootmagic reset**: Hold down the key ESC key and plug in the keyboard (Top Left most switch)
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the B key on layer 1 which is mapped to `RESET`
diff --git a/keyboards/linworks/fave84h/rules.mk b/keyboards/linworks/fave84h/rules.mk
new file mode 100644
index 0000000000..c3ddbe4252
--- /dev/null
+++ b/keyboards/linworks/fave84h/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812

From 02000201629932d87281738b0c4127379d6835ff Mon Sep 17 00:00:00 2001
From: Wolf Van Herreweghe <wolfvanh@gmail.com>
Date: Sun, 30 Jan 2022 19:59:24 +0100
Subject: [PATCH 436/867] [Keyboard] Small fixes to the Keybee65 (#15966)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
---
 keyboards/keybee/keybee65/config.h                 | 3 +++
 keyboards/keybee/keybee65/keymaps/default/keymap.c | 2 +-
 keyboards/keybee/keybee65/keymaps/via/keymap.c     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/keyboards/keybee/keybee65/config.h b/keyboards/keybee/keybee65/config.h
index 25c7b50837..a6666b5d23 100644
--- a/keyboards/keybee/keybee65/config.h
+++ b/keyboards/keybee/keybee65/config.h
@@ -56,6 +56,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN B0
 // The number of LEDs connected
 #define DRIVER_LED_TOTAL 80
+// Limit the Brithness of the LEDs
+#define RGBLIGHT_LIMIT_VAL 96
+#define RGB_VAL_STEP 12
 
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/keybee/keybee65/keymaps/default/keymap.c b/keyboards/keybee/keybee65/keymaps/default/keymap.c
index 13d1ba1f9d..a1df29ef92 100644
--- a/keyboards/keybee/keybee65/keymaps/default/keymap.c
+++ b/keyboards/keybee/keybee65/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 <me@homedrop.org>
+Copyright 2020 <contact@vwolf.be>
 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
diff --git a/keyboards/keybee/keybee65/keymaps/via/keymap.c b/keyboards/keybee/keybee65/keymaps/via/keymap.c
index 811e13ef55..12faf6f196 100644
--- a/keyboards/keybee/keybee65/keymaps/via/keymap.c
+++ b/keyboards/keybee/keybee65/keymaps/via/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2020 <me@homedrop.org>
+Copyright 2020 <contact@vwolf.be>
 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

From b20bbc715216246ac7a93176eac2c5b428b272bf Mon Sep 17 00:00:00 2001
From: Gigahawk <jasperchan515@gmail.com>
Date: Sun, 30 Jan 2022 11:00:22 -0800
Subject: [PATCH 437/867] [Keymap]: Create Gigahawk GMMK Pro keymap (#15934)

---
 .../gmmk/pro/ansi/keymaps/gigahawk/config.h   |  6 ++
 .../gmmk/pro/ansi/keymaps/gigahawk/keymap.c   | 74 +++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/gigahawk/config.h
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/gigahawk/keymap.c

diff --git a/keyboards/gmmk/pro/ansi/keymaps/gigahawk/config.h b/keyboards/gmmk/pro/ansi/keymaps/gigahawk/config.h
new file mode 100644
index 0000000000..9ba8a7b1b7
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/gigahawk/config.h
@@ -0,0 +1,6 @@
+// Copyright 2021 Jasper Chan (@Gigahawk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_STARTUP_SPD 0
diff --git a/keyboards/gmmk/pro/ansi/keymaps/gigahawk/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/gigahawk/keymap.c
new file mode 100644
index 0000000000..8eedeb6e00
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/gigahawk/keymap.c
@@ -0,0 +1,74 @@
+// Copyright 2021 Jasper Chan (@Gigahawk)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE,
+    _GAME,
+    _TRAN,
+};
+
+#define _BASE_COLOR_RGB 156, 123, 85
+#define _GAME_COLOR_RGB 147, 21, 21
+#define _TRAN_COLOR_RGB 45, 89, 24
+#define _CAPS_COLOR_RGB 146, 140, 16
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_BASE] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_ENT,           KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(2),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_GAME] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    ),
+
+    [_TRAN] = LAYOUT(
+        KC_CAPS, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_INS,           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        TG(1),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            KC_MPLY,                            _______, _______, _______, KC_MPRV, _______, KC_MNXT
+    ),
+
+};
+// clang-format on
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+    return true;
+}
+
+void rgb_matrix_indicators_user(void) {
+    if (IS_LAYER_ON(_TRAN)) {
+        rgb_matrix_set_color_all(_TRAN_COLOR_RGB);
+    } else if (IS_LAYER_ON(_GAME)) {
+        rgb_matrix_set_color_all(_GAME_COLOR_RGB);
+    } else if (IS_LAYER_ON(_BASE)) {
+        rgb_matrix_set_color_all(_BASE_COLOR_RGB);
+    }
+
+    if (host_keyboard_led_state().caps_lock) {
+        for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+            if (HAS_ANY_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
+                rgb_matrix_set_color(i, _CAPS_COLOR_RGB);
+            }
+        }
+    }
+}

From 03b1d9ef1f7f472f83c929c15044e71453823737 Mon Sep 17 00:00:00 2001
From: Sergey Vlasov <sigprof@gmail.com>
Date: Sun, 30 Jan 2022 22:06:19 +0300
Subject: [PATCH 438/867] Add a warning about USBtinyISP limitations to the ISP
 flashing guide (#15898)

---
 docs/isp_flashing_guide.md | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/docs/isp_flashing_guide.md b/docs/isp_flashing_guide.md
index 384aaf7229..febb34c574 100644
--- a/docs/isp_flashing_guide.md
+++ b/docs/isp_flashing_guide.md
@@ -57,13 +57,33 @@ To use a Teensy 2.0 as an ISP flashing tool, you will first need to load a [spec
 
 !> Note that the `B0` pin on the Teensy should be wired to the `RESET` pin on the keyboard's controller. ***DO NOT*** connect the `RESET` pin on the Teensy to the `RESET` on the keyboard.
 
-### SparkFun PocketAVR / USBtinyISP / USBasp
+### SparkFun PocketAVR / USBtinyISP
 
 [SparkFun PocketAVR](https://www.sparkfun.com/products/9825)  
 [Adafruit USBtinyISP](https://www.adafruit.com/product/46)  
+
+!> SparkFun PocketAVR and USBtinyISP **DO NOT support** AVR chips with more than 64 KiB of flash (e.g., the AT90USB128 series). This limitation is mentioned on the [shop page for SparkFun PocketAVR](https://www.sparkfun.com/products/9825) and in the [FAQ for USBtinyISP](https://learn.adafruit.com/usbtinyisp/f-a-q#faq-2270879). If you try to use one of these programmers with AT90USB128 chips, you will get verification errors from `avrdude`, and the bootloader won't be flashed properly (e.g., see the [issue #3286](https://github.com/qmk/qmk_firmware/issues/3286)).
+
+**AVRDUDE Programmer**: `usbtiny`  
+**AVRDUDE Port**: `usb`
+
+#### Wiring
+
+|ISP      |Keyboard|
+|---------|--------|
+|`VCC`    |`VCC`   |
+|`GND`    |`GND`   |
+|`RST`    |`RESET` |
+|`SCLK`   |`SCLK`  |
+|`MOSI`   |`MOSI`  |
+|`MISO`   |`MISO`  |
+
+
+### USBasp
+
 [Thomas Fischl's USBasp](https://www.fischl.de/usbasp/)
 
-**AVRDUDE Programmer**: `usbtiny` / `usbasp`  
+**AVRDUDE Programmer**: `usbasp`  
 **AVRDUDE Port**: `usb`
 
 #### Wiring

From b0da2302137aa180af4e7464a70aa4b63ae919fe Mon Sep 17 00:00:00 2001
From: Alin Marin Elena <alin@elena.space>
Date: Sun, 30 Jan 2022 19:13:08 +0000
Subject: [PATCH 439/867] [Keyboard] add mlego/m65 oled revision (#15833)

---
 keyboards/mlego/m65/keymaps/default/keymap.c |   8 +-
 keyboards/mlego/m65/keymaps/dk/keymap.c      |   8 +-
 keyboards/mlego/m65/keymaps/uk/config.h      |   9 +-
 keyboards/mlego/m65/keymaps/uk/keymap.c      | 371 +++++++++++++++----
 keyboards/mlego/m65/keymaps/via/keymap.c     |  71 +++-
 keyboards/mlego/m65/lib/glcdfont.c           | 231 ++++++++++++
 keyboards/mlego/m65/m65.h                    |  13 +-
 keyboards/mlego/m65/readme.md                |  45 ++-
 keyboards/mlego/m65/rev4/config.h            |  67 ++++
 keyboards/mlego/m65/rev4/halconf.h           |  32 ++
 keyboards/mlego/m65/rev4/mcuconf.h           |  33 ++
 keyboards/mlego/m65/rev4/rules.mk            |  22 ++
 12 files changed, 811 insertions(+), 99 deletions(-)
 create mode 100644 keyboards/mlego/m65/lib/glcdfont.c
 create mode 100644 keyboards/mlego/m65/rev4/config.h
 create mode 100644 keyboards/mlego/m65/rev4/halconf.h
 create mode 100644 keyboards/mlego/m65/rev4/mcuconf.h
 create mode 100644 keyboards/mlego/m65/rev4/rules.mk

diff --git a/keyboards/mlego/m65/keymaps/default/keymap.c b/keyboards/mlego/m65/keymaps/default/keymap.c
index 75ad22f398..96a1ced900 100644
--- a/keyboards/mlego/m65/keymaps/default/keymap.c
+++ b/keyboards/mlego/m65/keymaps/default/keymap.c
@@ -59,8 +59,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
 
   [_ADJ] = LAYOUT_ortho_5x13(
-      RGB_MOD, RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_SW,
-      RGB_HUI, RGB_HUD , RGB_M_P , _______, RESET  , RGB_M_T, _______, _______, _______, _______, _______, _______ , RGB_M_SN,
+      RGB_MOD, RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_T , RGB_M_SW,
+      RGB_HUI, RGB_HUD , RGB_M_P , _______, RESET  , _______, _______, _______, _______, _______, _______, _______ , RGB_M_SN,
       RGB_SAI, RGB_SAD , RGB_M_B , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_K ,
       RGB_VAI, RGB_VAD , RGB_M_R , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_X ,
       RGB_TOG, _______ , _______ , _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_TW, RGB_M_G),
@@ -69,8 +69,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // clang-format on
 
 // let us assume we start with both layers off
-bool toggle_lwr = false;
-bool toggle_rse = false;
+static bool toggle_lwr = false;
+static bool toggle_rse = false;
 
 bool led_update_user(led_t led_state) {
     // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
diff --git a/keyboards/mlego/m65/keymaps/dk/keymap.c b/keyboards/mlego/m65/keymaps/dk/keymap.c
index a4cb66bb91..5461a354ba 100644
--- a/keyboards/mlego/m65/keymaps/dk/keymap.c
+++ b/keyboards/mlego/m65/keymaps/dk/keymap.c
@@ -60,8 +60,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
 
     [_ADJ] = LAYOUT_ortho_5x13(
-      RGB_MOD,RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_SW ,
-      RGB_HUI, RGB_HUD, RGB_M_P , _______, RESET  , RGB_M_T, _______, _______, _______, _______, _______, _______, RGB_M_SN ,
+      RGB_MOD,RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_T, RGB_M_SW ,
+      RGB_HUI, RGB_HUD, RGB_M_P , _______, RESET  , _______, _______, _______, _______, _______, _______, _______, RGB_M_SN ,
       RGB_SAI, RGB_SAD, RGB_M_B , _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_K ,
       RGB_VAI, RGB_VAD, RGB_M_R , _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_X ,
       RGB_TOG, _______, _______ , _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_TW, RGB_M_G),
@@ -70,8 +70,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // clang-format on
 
 // let us assume we start with both layers off
-bool toggle_lwr = false;
-bool toggle_rse = false;
+static bool toggle_lwr = false;
+static bool toggle_rse = false;
 
 bool led_update_user(led_t led_state) {
     // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
diff --git a/keyboards/mlego/m65/keymaps/uk/config.h b/keyboards/mlego/m65/keymaps/uk/config.h
index 9d446777c0..7b5ced9ccb 100644
--- a/keyboards/mlego/m65/keymaps/uk/config.h
+++ b/keyboards/mlego/m65/keymaps/uk/config.h
@@ -18,5 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define TAPPING_TOGGLE 2
-//#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WINC
+
 #define UNICODE_SELECTED_MODES UC_LNX
+//#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WINC
+
+#ifdef WPM_ENABLE
+#define WPM_SAMPLE_SECONDS 10
+#define WPM_SAMPLE_PERIODS 100
+#define WPM_ALLOW_COUNT_REGRESSION
+#endif
diff --git a/keyboards/mlego/m65/keymaps/uk/keymap.c b/keyboards/mlego/m65/keymaps/uk/keymap.c
index 528105fc73..b140ca08c6 100644
--- a/keyboards/mlego/m65/keymaps/uk/keymap.c
+++ b/keyboards/mlego/m65/keymaps/uk/keymap.c
@@ -31,6 +31,17 @@ enum layer_names {
 
 #endif
 
+#ifdef OLED_ENABLE
+static uint32_t oled_logo_timer = 0;
+static bool clear_logo = true;
+static const char PROGMEM m65_logo[] = {
+    0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5,
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+    0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+    0};
+#endif
+
 #ifdef RGBLIGHT_ENABLE
 
 const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
@@ -42,73 +53,134 @@ const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(m
 #endif
 
 const uint32_t PROGMEM unicode_map[] = {
-    [la] = 0x03B1,  // å
-    [lA] = 0x0391,  // Å
-    [lb] = 0x03B2,  // β
-    [lB] = 0x0392,  // Β
-    [lc] = 0x03C7,  //
-    [lC] = 0x0307,  //
-    [ld] = 0x03B4,   [lD] = 0x2202, [le] = 0x03B5, [lE] = 0x2107,
-    [lf]  = 0x03C6,   //
-    [lF]  = 0x03C8,   //
-    [lg]  = 0x03B3,   //
-    [lG]  = 0x0393,   //
-    [lh]  = 0x210F,   //
-    [lH]  = 0x1D4D7,  //
-    [li]  = 0x222B,   //
-    [lI]  = 0x222E,   //
-    [lj]  = 0x2208,   //
-    [lJ]  = 0x2209,   //
-    [lk]  = 0x03F0,   //
-    [lK]  = 0x2206,   //
-    [ll]  = 0x03BB,   //
-    [lL]  = 0x039B,   //
-    [lm]  = 0x03BC,   //
-    [lM]  = 0x2218,   //
-    [ln]  = 0x03B7,   //
-    [lN]  = 0x222A,   //
-    [lo]  = 0x221E,   //
-    [lO]  = 0x2297,   //
-    [lp]  = 0x03C0,   //
-    [lP]  = 0x220F,   //
-    [lq]  = 0x03C3,   //
-    [lQ]  = 0x03D5,   //
-    [lr]  = 0x03C1,   //
-    [lR]  = 0x2207,   //
-    [ls]  = 0x2211,   //
-    [lS]  = 0x2A0B,   //
-    [lt]  = 0x03D1,   //
-    [lT]  = 0x03B8,   //
-    [lu]  = 0x03C4,   //
-    [lU]  = 0x2102,   //
-    [lv]  = 0x03BD,   //
-    [lV]  = 0x039D,   //
-    [lw]  = 0x03C9,   //
-    [lW]  = 0x03A9,   //
-    [lx]  = 0x03BE,   //
-    [lX]  = 0x039E,   //
-    [ly]  = 0x211d,
-    [lY]  = 0x2124,   //
-    [lz]  = 0x03B6,   //
-    [lZ]  = 0x2221,   //
-    [lZ]  = 0x2221,   //
-    [lc1] = 0x224A,   //
-    [lC1] = 0x2248,   //
-    [lp1] = 0x00B1,   //
-    [lP1] = 0x2213,   //
-    [lq1] = 0x00D7,   //
-    [lQ1] = 0x22C5,   //
-    [ll1] = 0x1D53C,  //
-    [lL1] = 0x212b,   //
-    [lk1] = 0x221D,   //
-    [lK1] = 0x2112,   //
-    [rc]  = 0x00E7,   // ç
-    [rC]  = 0x00C7,   // Ç
+    [la]  = 0x03B1 , // α
+    [lA]  = 0x0391 , // Α
+    [lb]  = 0x03B2 , // β
+    [lB]  = 0x0392 , // Β
+    [lc]  = 0x03C7 , // χ
+    [lC]  = 0x0307 , //
+    [ld]  = 0x03B4 , // δ
+    [lD]  = 0x2202 , // ∂
+    [le]  = 0x03B5 , // ε
+    [lE]  = 0x2107 , // ℇ
+    [lf]  = 0x03C6 , // φ
+    [lF]  = 0x03C8 , // ψ
+    [lg]  = 0x03B3 , // γ
+    [lG]  = 0x0393 , // Γ
+    [lh]  = 0x210F , // ℏ
+    [lH]  = 0x1D4D7, // 𝓗
+    [li]  = 0x222B , // ∫
+    [lI]  = 0x222E , // ∮
+    [lj]  = 0x2208 , // ∈
+    [lJ]  = 0x2209 , // ∉
+    [lk]  = 0x03F0 , // ϰ
+    [lK]  = 0x2206 , // ∆
+    [ll]  = 0x03BB , // λ
+    [lL]  = 0x039B , // Λ
+    [lm]  = 0x03BC , // μ
+    [lM]  = 0x2218 , // ∘
+    [ln]  = 0x03B7 , // η
+    [lN]  = 0x222A , // ∪
+    [lo]  = 0x221E , // ∞
+    [lO]  = 0x2297 , // ⊗
+    [lp]  = 0x03C0 , // π
+    [lP]  = 0x220F , // ∏
+    [lq]  = 0x03C3 , // σ
+    [lQ]  = 0x03D5 , // ϕ
+    [lr]  = 0x03C1 , // ρ
+    [lR]  = 0x2207 , // ∇
+    [ls]  = 0x2211 , // ∑
+    [lS]  = 0x2A0B , // ⨋
+    [lt]  = 0x03D1 , // ϑ
+    [lT]  = 0x03B8 , // θ
+    [lu]  = 0x03C4 , // τ
+    [lU]  = 0x2102 , // ℂ
+    [lv]  = 0x03BD , // χ
+    [lV]  = 0x039D , // Ν
+    [lw]  = 0x03C9 , // ω
+    [lW]  = 0x03A9 , // Ω
+    [lx]  = 0x03BE , // ξ
+    [lX]  = 0x039E , // Ξ
+    [ly]  = 0x211d , // ℝ
+    [lY]  = 0x2124 , // ℤ
+    [lz]  = 0x03B6 , // ζ
+    [lZ]  = 0x2221 , // ∡
+    [lc1] = 0x224A , // ≊
+    [lC1] = 0x2248 , // ≈
+    [lp1] = 0x00B1 , // ±
+    [lP1] = 0x2213 , // ∓
+    [lq1] = 0x00D7 , // ×
+    [lQ1] = 0x22C5 , // ⋅
+    [ll1] = 0x1D53C, // 𝔼
+    [lL1] = 0x212b , // Å
+    [lk1] = 0x221D , // ∝
+    [lK1] = 0x2112 , // ℒ
+    [ra]  = 0x0103 , // ă
+    [rA]  = 0x0102 , // Ă
+    [ra1] = 0x00E2 , // â
+    [rA1] = 0x00C2 , // Â
+    [rc]  = 0x00E7 , // ç
+    [rC]  = 0x00C7 , // Ç
+    [ri]  = 0x00EE , // î
+    [rI]  = 0x00CE , // Î
+    [rs]  = 0x0219 , // ș
+    [rS]  = 0x0218 , // Ș
+    [rt]  = 0x021B , // ț
+    [rT]  = 0x021A , // Ț
 };
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ ⎋ │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ ⌫ │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ↹ │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ # │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │ ⏎ │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ⇧(│ \ │ z │ x │ c │ v │ b │ n │ m │ , │ , │ ↑ │ / │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ⎈ │mnu│lwr│⎇  │rse│   │   │   │⎇  │ ⇧)│ ← │ ↓ │ → │
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+shifted symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ ← │ ! │ " │ £ │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │   │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ~ │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ @ │ ⏎ │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ⇧(│ | │ Z │ X │ C │ V │ B │ N │ M │ < │ > │   │ / │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │   │   │   │   │   │   │   │   │ ⇧)│   │   │   │
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+altgr symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ ← │ ¹ │ ² │ ³ │ € │ ½ │ ¾ │ { │ [ │ ] │ } │ \ │   │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │ @ │ ſ │ e │ ¶ │ ŧ │ ← │ ↓ │ → │ ø │ þ │ ä │ ã │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ~ │ æ │ ß │ ð │ đ │ ŋ │ ħ │ ả │ ĸ │ ł │ á │ â │ent│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ± │ | │ « │ » │ ¢ │ „ │ “ │ ” │ µ │ ─ │ · │   │ ạ̣̣ │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │   │   │   │   │   │   │   │   │ ° │   │   │   │
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+altgr shift symbols
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │ ¡ │ ⅛ │ £ │ ¼ │ ⅜ │ ⅝ │ ⅞ │ ™ │ ± │ ° │ ¿ │   │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │ Ω │ § │ E │ ® │ Ŧ │ ¥ │ ↑ │ ı │ Ø │ Þ │ å │ ā │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │ Æ │ ẞ │ Ð │ ª │ Ŋ │ Ħ │ a │ & │ Ł │ ˝a│ ǎ │ent│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ± │ ¦ │ ‹ │ › │ © │ ‚ │ ‘ │ ’ │ º │ × │ ÷ │   │ ȧ │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │   │   │   │   │   │   │   │   │ ° │   │   │   │
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+ *
+*/
   [_QW] = LAYOUT_ortho_5x13(
        KC_ESC, UK_1   , UK_2    , UK_3   , UK_4    , UK_5  , UK_6  , UK_7  , UK_8   , UK_9   , UK_0   , UK_MINS, KC_BSPC ,
        KC_TAB, UK_Q   , UK_W    , UK_E   , UK_R    , UK_T  , UK_Y  , UK_U  , UK_I   , UK_O   , UK_P   , UK_LBRC, UK_RBRC ,
@@ -116,24 +188,91 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LSPO, UK_BSLS, UK_Z    , UK_X   , UK_C    , UK_V  , UK_B  , UK_N  , UK_M   , UK_COMM, UK_DOT , KC_UP  , UK_SLSH ,
       KC_LCTL, KC_LGUI, TT(_LWR), KC_LALT, TT(_RSE), KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RSPC, KC_LEFT, KC_DOWN, KC_RGHT),
 
-  [_LWR] = LAYOUT_ortho_5x13(
-     KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , UK_EQL  ,
-     KC_BTN3, XP(lq  , lQ)    , XP(lw  , lW)    , XP(le  , lE)    , XP(lr  , lR)    , XP(lt  , lT)    , XP(ly  , lY)     , XP(lu, lU)  , XP(li, lI)   , XP(lo, lO)   , XP(lp , lP)    , _______, _______,
-     KC_BTN2, XP(la  , lA)    , XP(ls  , lS)    , XP(ld  , lD)    , XP(lf  , lF)    , XP(lg  , lG)    , XP(lh  , lH)     , XP(lj, lJ)  , XP(lk, lK)   , XP(ll, lL)   , XP(ll1, lL1)   , XP(lk1 , lK1)   , _______,
-     _______, KC_BTN1, XP(lz  , lZ)    , XP(lx  , lX)    , XP(lc  , lC)    , XP(lv  , lV)    , XP(lb  , lB)    , XP(ln   , lN)  , XP(lm, lM)  , XP(lc1, lC1) , XP(lp1, lP1)  , KC_MS_U, XP(lq1 , lQ1)   ,
-     _______, KC_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R),
-
+/*
+lower layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ ` │MUT│Vup│Vdn│prv│ply│nxt│EXT│SLP│WAK│PSC│ ⌫ │ = │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │ σ │ ω │ ε │ ρ │ ϑ │ ℝ │ τ │ ∫ │ ∞ │ π │ [ │ ] │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │ α │ ∑ │ δ │ φ │ γ │ ℏ │ ∈ │ ϰ │ λ │ 𝔼 │ ∝ │ ⏎ │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ⇧(│   │ ζ │ ξ │ χ │ ν │ β │ η │ μ │ ≊ │ ± │   │ × │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ⎈ │   │lwr│⎇  │rse│   │   │   │⎇  │ ⇧)│   │   │   │
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+lower layer shifted
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ ¬ │   │   │   │   │   │   │   │   │   │   │ ⌫ │ = │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │MB3│ ϕ │ Ω │ ℇ │ ∇ │ θ │ ℤ │ ℂ │ ∮ │ ⊗ │ ∏ │ { │ } │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │MB2│ Α │ ⨋ │ ∂ │ ψ │ Γ │ 𝓗 │ ∉ │ ∆ │ Λ │ Å │ ℒ │ ⏎ │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ⇧(│MB1│ ∡ │ Ξ │ ̇  │ Ν │ Β │ ∪ │ ∘ │ ≈ │ ∓ │MSU│ ⋅ │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ⎈ │MB4│lwr│⎇  │rse│   │   │   │⎇  │ ⇧)│MSL│MSD│MSR│
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+MB - mouse buttons
+MS - mouse directions
+*/
+ [_LWR] = LAYOUT_ortho_5x13(
+     KC_GRV ,  KC_MUTE,  KC_VOLU,  KC_VOLD,  KC_MPRV,  KC_MPLY,  KC_MNXT,  G(KC_P),  KC_SLEP,    KC_WAKE,    KC_PSCR,      KC_DEL,      UK_EQL,
+     KC_BTN3,XP(lq,lQ),XP(lw,lW),XP(le,lE),XP(lr,lR),XP(lt,lT),XP(ly,lY),XP(lu,lU),XP(li,lI),  XP(lo,lO),  XP(lp,lP),     _______,     _______,
+     KC_BTN2,XP(la,lA),XP(ls,lS),XP(ld,lD),XP(lf,lF),XP(lg,lG),XP(lh,lH),XP(lj,lJ),XP(lk,lK),  XP(ll,lL),XP(ll1,lL1), XP(lk1,lK1),     _______,
+     _______,  KC_BTN1,XP(lz,lZ),XP(lx,lX),XP(lc,lC),XP(lv,lV),XP(lb,lB),XP(ln,lN),XP(lm,lM),XP(lc1,lC1),XP(lp1,lP1),     KC_MS_U, XP(lq1,lQ1),
+     _______,  KC_BTN4,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    KC_MS_L,     KC_MS_D,    KC_MS_R),
 
+/*
+raise layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ ⎋ │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │ â │   │   │   │ ț │   │   │ î │   │   │   │   │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │ ⇪ │ ă │ ș │   │   │   │   │   │   │   │   │   │   │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │   │   │   │ ç │   │   │   │   │   │   │MWU│   │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │   │   │   │   │   │   │   │   │   │MWL│MWD│MWR│
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+MW - mouse wheel
+raise layer shifted
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │ Â │   │   │   │ Ț │   │   │ Î │   │   │   │   │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │ Ă │ Ș │   │   │   │   │   │   │   │   │   │   │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │   │   │   │ Ç │   │   │   │   │   │   │   │   │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+*/
   [_RSE] = LAYOUT_ortho_5x13(
-      KC_ESC , KC_F1  , KC_F2  , KC_F3  ,  KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12  ,
-      _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
-      KC_CAPS, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
-      _______, _______, _______, _______,XP(rc,rC), _______, _______, _______, _______, _______, _______, KC_WH_U, _______ ,
-      _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
-
+      KC_ESC ,    KC_F1  ,   KC_F2  , KC_F3  ,  KC_F4  ,  KC_F5  , KC_F6  , KC_F7  ,  KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12  ,
+      _______,XP(ra1,rA1),   _______, _______,  _______,XP(rt,rT), _______, _______,XP(ri,rI), _______, _______, _______, _______ ,
+      KC_CAPS,  XP(ra,rA), XP(rs,rS), _______,  _______,  _______, _______, _______,  _______, _______, _______, _______, _______ ,
+      _______,    _______,   _______, _______,XP(rc,rC),  _______, _______, _______,  _______, _______, _______, KC_WH_U, _______ ,
+      _______,    _______,   _______, _______,  _______,  _______, _______, _______,  _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
+/*
+adj layer
+ * ┌───┬────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬────┬────┐
+ * │MOD│RMOD│   │   │   │   │   │   │   │   │   │M_T │M_SW│
+ * ├───┼────┼───┼───┼───┼───┼───┼───┼───┼───┼───┼────┼────┤
+ * │HUI│HUD │M_P│   │rst│   │   │   │   │   │   │    │M_SN│
+ * ├───┼────┼───┼───┼───┼───┼───┼───┼───┼───┼───┼────┼────┤
+ * │SAI│SAD │M_B│   │   │   │   │   │   │   │   │    │M_K │
+ * ├───┼────┼───┼───┼───┼───┼───┼───┼───┼───┼───┼────┼────┤
+ * │VAI│VAD │M_R│   │   │   │   │   │   │   │   │    │M_X │
+ * ├───┼────┼───┼───┼───┼───┼───┼───┼───┼───┼───┼────┼────┤
+ * │TOG│    │   │   │   │   │   │   │   │   │   │M_TW│M_G │
+ * └───┴────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴────┴────┘
+*/
   [_ADJ] = LAYOUT_ortho_5x13(
-      RGB_MOD, RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_SW,
-      RGB_HUI, RGB_HUD , RGB_M_P , _______, RESET  , RGB_M_T, _______, _______, _______, _______, _______, _______ , RGB_M_SN,
+      RGB_MOD, RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_T , RGB_M_SW,
+      RGB_HUI, RGB_HUD , RGB_M_P , _______, RESET  , _______, _______, _______, _______, _______, _______, _______ , RGB_M_SN,
       RGB_SAI, RGB_SAD , RGB_M_B , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_K ,
       RGB_VAI, RGB_VAD , RGB_M_R , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_X ,
       RGB_TOG, _______ , _______ , _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_TW, RGB_M_G),
@@ -141,8 +280,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // clang-format on
 
 // let us assume we start with both layers off
-bool toggle_lwr = false;
-bool toggle_rse = false;
+static bool toggle_lwr = false;
+static bool toggle_rse = false;
 
 bool led_update_user(led_t led_state) {
     // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
@@ -206,6 +345,10 @@ layer_state_t default_layer_state_set_user(layer_state_t state) {
 void keyboard_post_init_user(void) {
     // Enable the LED layers
     rgblight_layers = my_rgb_layers;
+#ifdef OLED_ENABLE
+    oled_logo_timer = timer_read32();
+#endif
+
 #ifdef CONSOLE_ENABLE
 
     debug_enable   = true;
@@ -249,3 +392,71 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     return true;
 }
 #endif
+
+#ifdef OLED_ENABLE
+
+static void render_logo(void) {
+    oled_write_P(m65_logo, false);
+}
+
+void user_oled_magic(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case _QW:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        case _LWR:
+            oled_write_P(PSTR("Lower\n"), false);
+            break;
+        case _RSE:
+            oled_write_P(PSTR("Raise\n"), false);
+            break;
+        case _ADJ:
+            oled_write_P(PSTR("ADJ\n"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("Lower ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("Raise ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CapsLock ") : PSTR("    "), false);
+#ifdef WPM_ENABLE
+    oled_write_P(PSTR("\nwpm: "), false);
+    uint8_t wpm = get_current_wpm();
+    oled_write_P(wpm != 0 ? get_u8_str(wpm,' ') : PSTR("   "), false);
+#endif
+}
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+
+void clear_screen(void) {
+    if (clear_logo){
+      for (uint8_t i = 0; i < OLED_DISPLAY_HEIGHT; ++i) {
+        for (uint8_t j = 0; j < OLED_DISPLAY_WIDTH; ++j) {
+          oled_write_raw_byte(0x0, i*OLED_DISPLAY_WIDTH + j);
+        }
+      }
+      clear_logo = false;
+    }
+}
+
+#    define SHOW_LOGO 5000
+bool oled_task_user(void) {
+    if ((timer_elapsed32(oled_logo_timer) < SHOW_LOGO)){
+        render_logo();
+    }else{
+      clear_screen();
+      user_oled_magic();
+    }
+    return false;
+}
+
+#endif
diff --git a/keyboards/mlego/m65/keymaps/via/keymap.c b/keyboards/mlego/m65/keymaps/via/keymap.c
index f6bb77bcd4..1422eed34e 100644
--- a/keyboards/mlego/m65/keymaps/via/keymap.c
+++ b/keyboards/mlego/m65/keymaps/via/keymap.c
@@ -59,17 +59,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
 
   [_ADJ] = LAYOUT_ortho_5x13(
-      _______, _______, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
-      _______, _______, _______ , _______, RESET  , _______, _______, _______, _______, _______, _______, _______, _______ ,
-      _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
-      _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
-      _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+      RGB_MOD, RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_T , RGB_M_SW,
+      RGB_HUI, RGB_HUD , RGB_M_P , _______, RESET  , _______, _______, _______, _______, _______, _______, _______ , RGB_M_SN,
+      RGB_SAI, RGB_SAD , RGB_M_B , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_K ,
+      RGB_VAI, RGB_VAD , RGB_M_R , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_X ,
+      RGB_TOG, _______ , _______ , _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_TW, RGB_M_G),
 };
 // clang-format on
 
 // let us assume we start with both layers off
-bool toggle_lwr = false;
-bool toggle_rse = false;
+static bool toggle_lwr = false;
+static bool toggle_rse = false;
 
 bool led_update_user(led_t led_state) {
     // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
@@ -166,3 +166,60 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     return true;
 }
 #endif
+
+#ifdef OLED_ENABLE
+
+static void render_logo(void) {
+    static const char PROGMEM m65_logo[] = {
+// 'slon', 128x32px
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xc0, 0xa0, 0xa0,
+0xa0, 0xd0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0c, 0xc3, 0x3c, 0x0f, 0x05, 0x14, 0x14,
+0x04, 0xfc, 0x9f, 0x88, 0x80, 0x81, 0xe7, 0xfc, 0x03, 0x03, 0x07, 0x05, 0x06, 0x06, 0x08, 0x0c,
+0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x04, 0x10, 0x18, 0x30, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0xde, 0xc1, 0xf0, 0x89, 0x0b, 0x18, 0x08, 0x04, 0x04,
+0x01, 0x1a, 0x0f, 0x00, 0x00, 0x80, 0xc0, 0x20, 0x20, 0x20, 0x60, 0x40, 0x40, 0x42, 0x40, 0x40,
+0x40, 0x40, 0x40, 0xe0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x08, 0x13, 0x7c, 0xe0, 0xc0, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x05,
+0x05, 0x05, 0x07, 0x05, 0x07, 0x07, 0x07, 0x07, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01,
+0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x07,
+0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+0x04, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+      0x00
+    };
+
+      oled_write_raw_P(m65_logo, sizeof(m65_logo));
+
+}
+
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return rotation;
+}
+
+bool oled_task_user(void) {
+    //user_oled_magic();
+    render_logo();
+    return false;
+}
+
+#endif
diff --git a/keyboards/mlego/m65/lib/glcdfont.c b/keyboards/mlego/m65/lib/glcdfont.c
new file mode 100644
index 0000000000..4b354756b6
--- /dev/null
+++ b/keyboards/mlego/m65/lib/glcdfont.c
@@ -0,0 +1,231 @@
+// Copyright 2022 @filterpaper
+// SPDX-License-Identifier: GPL-2.0+
+
+#include "progmem.h"
+
+static const unsigned char PROGMEM font[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
+    0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
+    0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
+    0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
+    0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
+    0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
+    0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
+    0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
+    0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
+    0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
+    0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
+    0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
+    0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
+    0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
+    0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
+    0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
+    0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
+    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+    0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
+    0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
+    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
+    0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
+    0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
+    0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
+    0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
+    0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
+    0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
+    0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
+    0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
+    0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
+    0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
+    0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
+    0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
+    0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
+    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+    0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+    0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
+    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+    0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
+    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+    0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
+    0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
+    0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
+    0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
+    0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
+    0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
+    0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
+    0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
+    0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
+    0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
+    0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+    0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
+    0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
+    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+    0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
+    0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
+    0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
+    0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
+    0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
+    0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
+    0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
+    0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
+    0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
+    0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
+    0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
+    0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
+    0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
+    0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
+    0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
+    0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
+    0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
+    0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
+    0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
+    0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
+    0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
+    0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
+    0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
+    0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
+    0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
+    0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
+    0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
+    0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
+    0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
+    0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
+    0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+    0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
+    0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
+    0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
+    0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
+    0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
+    0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
+    0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
+    0x38, 0x44, 0x44, 0x28, 0x7F, 0x00,
+    0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
+    0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
+    0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
+    0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
+    0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
+    0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
+    0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
+    0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
+    0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
+    0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
+    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+    0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
+    0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
+    0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
+    0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
+    0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
+    0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
+    0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
+    0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
+    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+    0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
+    0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
+    0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
+    0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+    0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
+    0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
+    0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xE0, 0x18, 0x02,
+    0x00, 0x3C, 0x1E, 0x06, 0x0E, 0x0A,
+    0x1A, 0x0E, 0x26, 0xFF, 0xBF, 0x0D,
+    0x00, 0x80, 0x80, 0x81, 0xFF, 0xFE,
+    0xF8, 0x01, 0x01, 0x03, 0x03, 0x03,
+    0x03, 0x05, 0x05, 0x02, 0x02, 0x0A,
+    0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
+    0x0C, 0x04, 0x10, 0x18, 0x20, 0xC0,
+    0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xD0, 0x58, 0x78,
+    0x68, 0x2C, 0x24, 0x34, 0xF4, 0xF4,
+    0x3C, 0x3C, 0xFC, 0xF8, 0xF8, 0x70,
+    0xF0, 0xE0, 0xE0, 0xC0, 0xC0, 0x80,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xC0, 0x7C, 0x07, 0x80, 0xE0,
+    0x60, 0x64, 0xE2, 0x60, 0x10, 0x10,
+    0x20, 0x22, 0x12, 0x17, 0x3F, 0x0B,
+    0x01, 0x01, 0x01, 0x01, 0x01, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x21,
+    0x6F, 0xFC, 0xE0, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x40,
+    0x60, 0x60, 0x70, 0x70, 0xF0, 0xF0,
+    0xD0, 0xD0, 0xD0, 0xD0, 0x50, 0x50,
+    0x50, 0x70, 0x78, 0x78, 0x78, 0x7C,
+    0x7F, 0x7D, 0x7C, 0x5E, 0x4F, 0x44,
+    0x40, 0x40, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x38, 0x30, 0x30, 0x30, 0x30,
+    0x30, 0x30, 0x58, 0x46, 0x47, 0x41,
+    0x41, 0x01, 0x01, 0x03, 0x03, 0x42,
+    0x42, 0x42, 0x46, 0x46, 0x46, 0x46,
+    0x42, 0x43, 0x43, 0x73, 0x77, 0x72,
+    0x70, 0x60, 0x60, 0x60, 0x60, 0x60,
+    0x60, 0x61, 0x67, 0x6F, 0x7E, 0x78,
+    0x78, 0x70, 0x70, 0x70, 0x70, 0x70,
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x60,
+    0x40, 0x40, 0x40, 0x48, 0x58, 0x58,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
diff --git a/keyboards/mlego/m65/m65.h b/keyboards/mlego/m65/m65.h
index a93a80be74..f5ffd519fa 100644
--- a/keyboards/mlego/m65/m65.h
+++ b/keyboards/mlego/m65/m65.h
@@ -96,8 +96,18 @@ enum unicode_names {
     lL1,
     lk1,
     lK1,
+    ra,
+    rA,
+    ra1,
+    rA1,
     rc,
     rC,
+    ri,
+    rI,
+    rs,
+    rS,
+    rt,
+    rT,
 };
 
 static inline void led_lwr(const bool on) {
@@ -113,7 +123,7 @@ static inline void led_rse(const bool on) {
 }
 static inline void led_caps(const bool on) {
 #ifdef LED_CAPS_LOCK_PIN
-    if ((DEVICE_VER == 0x0001) || (DEVICE_VER == 0x0003)) {
+    if ((DEVICE_VER == 0x0001) || (DEVICE_VER == 0x0003) || (DEVICE_VER == 0x0004)) {
         writePin(LED_CAPS_LOCK_PIN, !on);
     }
     if (DEVICE_VER == 0x0002) {
@@ -121,4 +131,3 @@ static inline void led_caps(const bool on) {
     }
 #endif
 }
-
diff --git a/keyboards/mlego/m65/readme.md b/keyboards/mlego/m65/readme.md
index 2526aed31e..8076697a2b 100644
--- a/keyboards/mlego/m65/readme.md
+++ b/keyboards/mlego/m65/readme.md
@@ -6,7 +6,7 @@ A  (13x5) ortholinear keyboard that can be hand wired or using a pcb.
 
 * Keyboard Maintainer: [Alin Elena](https://github.com/alinelena) ([@drFaustroll on GitLab](https://gitlab.com/drFaustroll))
 * Hardware Supported: custom pcb [see](https://gitlab.com/m-lego/m65) STM/APM32F103C8T6, aka Black Pill (rev1),
-  GD32F303CCT6 from we act aka Blue Pill Plus (rev2), STM32F401 from we act (rev3)
+  GD32F303CCT6 from we act aka Blue Pill Plus (rev2), STM32F401 from we act (rev3,rev4) STM32F411 can also be used just ask
 * Hardware Availability: [custom how to](https://alin.elena.space/blog/keeblego/)
 
 
@@ -42,6 +42,17 @@ Flashing example for this keyboard:
 
 To enter flashing mode, on microcontroller keep pressed BOOT0 and then NRST, release NRST and then after 0.5s or so  release BOOT0.
 
+For rev4
+
+    make mlego/m65/rev4:default
+
+Flashing example for this keyboard:
+
+    make mlego/m65/rev4:default:flash
+
+To enter flashing mode, press in the same time, LWR+RSE+r, alternatively on microcontroller keep pressed BOOT0 and then NRST, release NRST and then after 0.5s or so  release BOOT0.
+
+
 
 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).
 
@@ -127,3 +138,35 @@ the pinout is the same for stm32f411
 | SCROLL_LOCK | B13 |
 | RBG_DI      | B15 |
 
+## Pins and leds rev4 stm32f401
+
+the pinout is the same for stm32f411
+
+| Rows  | C0    | C1    | C2    | C3    | C4    | C5    | C6    | C7    | C8    | C9    | C10   | C11   | C12   | Pins  |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| R0    | Esc   | 1     | 2     | 3     | 4     | 5     | 6     | 7     | 8     | 9     | 0     | -     | Bksp  | B10   |
+| R1    | Tab   | q     | w     | e     | r     | t     | y     | u     | i     | o     | p     | [     | ]     | A5    |
+| R2    | #     | a     | s     | d     | f     | g     | h     | j     | k     | l     | ;     | '     | Enter | A6    |
+| R3    | Shift | \     | z     | x     | c     | v     | b     | n     | m     | ,     | .     | Up    | /     | A7    |
+| R4    | Ctrl  | Menu  | Lower | Alt   | Raise | Space | Space | Space | AltGr | Shift | Left  | Down  | Right | B0    |
+|       | B14   | A8    | A10   | A15   | B3    | B4    | B5    | B7    | A1    | A2    | A3    | A4    | B1    |       |
+
+### Encoders
+
+  - Pad_A: A0
+  - Pad_B: B6
+
+### Oled
+
+  - SDA: B9
+  - SCL: B8
+
+### LEDS
+
+| Leds        | Pin |
+| ----------- | --- |
+| NUM_LOCK    | B12 |
+| CAPS_LOCK   | C13 |
+| SCROLL_LOCK | B13 |
+| RBG_DI      | B15 |
+
diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h
new file mode 100644
index 0000000000..ee47061a91
--- /dev/null
+++ b/keyboards/mlego/m65/rev4/config.h
@@ -0,0 +1,67 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define DEVICE_VER 0x0004
+#define PRODUCT_ID 0x6060
+
+#define LED_NUM_LOCK_PIN B12
+#define LED_SCROLL_LOCK_PIN B13
+#define LED_CAPS_LOCK_PIN C13
+
+//                          0   1   2   3   4
+#define MATRIX_ROW_PINS \
+    { B10, A5, A6, A7, B0 }
+//                         0    1   2   3   4   5   6   7   8    9  10  11   12
+#define MATRIX_COL_PINS \
+    { B14, A8, A10, A15, B3, B4, B5, B7, A1, A2, A3, A4, B1 }
+
+#define ENCODERS_PAD_A \
+    { A0 }
+#define ENCODERS_PAD_B \
+    { B6 }
+
+#define RGB_DI_PIN B15
+
+#define UNUSED_PINS
+#define RGBLIGHT_LAYERS
+
+#define ENCODER_RESOLUTION 4
+
+#undef RGBLED_NUM
+#define RGBLED_NUM 20
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+
+#ifdef OLED_ENABLE
+#    define OLED_DISPLAY_128X32
+#define I2C1_SCL_PIN        B9
+#define I2C1_SDA_PIN        B8
+#define OLED_BRIGHTNESS 128
+#define OLED_FONT_H "keyboards/mlego/m65/lib/glcdfont.c"
+#endif
diff --git a/keyboards/mlego/m65/rev4/halconf.h b/keyboards/mlego/m65/rev4/halconf.h
new file mode 100644
index 0000000000..c1a060ad71
--- /dev/null
+++ b/keyboards/mlego/m65/rev4/halconf.h
@@ -0,0 +1,32 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SERIAL TRUE
+
+#define SERIAL_USB_BUFFERS_SIZE 256
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/mlego/m65/rev4/mcuconf.h b/keyboards/mlego/m65/rev4/mcuconf.h
new file mode 100644
index 0000000000..ba1cd32fd3
--- /dev/null
+++ b/keyboards/mlego/m65/rev4/mcuconf.h
@@ -0,0 +1,33 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/mlego/m65/rev4/rules.mk b/keyboards/mlego/m65/rev4/rules.mk
new file mode 100644
index 0000000000..9e1e0ab23b
--- /dev/null
+++ b/keyboards/mlego/m65/rev4/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes          # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
+ENCODER_ENABLE = yes       # Enable encoder
+OLED_ENABLE = yes          # Enable OLED
+OLED_DRIVER = SSD1306      # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
+WPM_ENABLE = yes           # Enable WPM Counter 

From 51e99b562d410e8be7075cac6e5bee6a4b9d99bf Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Mon, 31 Jan 2022 03:17:04 +0800
Subject: [PATCH 440/867] [Keyboard] move @monksoffunk 's boards into 25keys/
 (#15789)

---
 keyboards/{ => 25keys}/aleth42/info.json                    | 0
 keyboards/{ => 25keys}/aleth42/keymaps/default/keymap.c     | 0
 keyboards/{ => 25keys}/aleth42/keymaps/default/readme.md    | 0
 keyboards/{ => 25keys}/aleth42/keymaps/via/config.h         | 0
 keyboards/{ => 25keys}/aleth42/keymaps/via/keymap.c         | 0
 keyboards/{ => 25keys}/aleth42/keymaps/via/readme.md        | 0
 keyboards/{ => 25keys}/aleth42/keymaps/via/rules.mk         | 0
 keyboards/{aleth42/rev1 => 25keys/aleth42}/readme.md        | 2 +-
 keyboards/{ => 25keys}/aleth42/rev0/config.h                | 0
 keyboards/{ => 25keys}/aleth42/rev0/readme.md               | 0
 keyboards/{ => 25keys}/aleth42/rev0/rev0.c                  | 0
 keyboards/{ => 25keys}/aleth42/rev0/rev0.h                  | 0
 keyboards/{ => 25keys}/aleth42/rev0/rules.mk                | 0
 keyboards/{ => 25keys}/aleth42/rev1/config.h                | 0
 keyboards/{aleth42 => 25keys/aleth42/rev1}/readme.md        | 0
 keyboards/{ => 25keys}/aleth42/rev1/rev1.c                  | 0
 keyboards/{ => 25keys}/aleth42/rev1/rev1.h                  | 0
 keyboards/{ => 25keys}/aleth42/rev1/rules.mk                | 0
 keyboards/{ => 25keys}/aleth42/rules.mk                     | 0
 keyboards/{ => 25keys}/cassette42/cassette42.c              | 0
 keyboards/{ => 25keys}/cassette42/cassette42.h              | 0
 keyboards/{ => 25keys}/cassette42/common/glcdfont.c         | 0
 keyboards/{ => 25keys}/cassette42/common/oled_helper.c      | 0
 keyboards/{ => 25keys}/cassette42/common/oled_helper.h      | 0
 keyboards/{ => 25keys}/cassette42/config.h                  | 2 +-
 keyboards/{ => 25keys}/cassette42/info.json                 | 0
 keyboards/{ => 25keys}/cassette42/keymaps/default/keymap.c  | 0
 keyboards/{ => 25keys}/cassette42/keymaps/default/readme.md | 0
 keyboards/{ => 25keys}/cassette42/readme.md                 | 2 +-
 keyboards/{ => 25keys}/cassette42/rules.mk                  | 0
 keyboards/{ => 25keys}/zinc/.noci                           | 0
 keyboards/{ => 25keys}/zinc/config.h                        | 0
 keyboards/{ => 25keys}/zinc/info.json                       | 0
 keyboards/{ => 25keys}/zinc/keymaps/default/config.h        | 0
 keyboards/{ => 25keys}/zinc/keymaps/default/keymap.c        | 0
 keyboards/{ => 25keys}/zinc/keymaps/default/readme_en.md    | 0
 keyboards/{ => 25keys}/zinc/keymaps/default/readme_jp.md    | 0
 keyboards/{ => 25keys}/zinc/keymaps/default/rules.mk        | 0
 keyboards/{ => 25keys}/zinc/keymaps/ginjake/config.h        | 0
 keyboards/{ => 25keys}/zinc/keymaps/ginjake/keymap.c        | 0
 keyboards/{ => 25keys}/zinc/keymaps/ginjake/readme_jp.md    | 0
 keyboards/{ => 25keys}/zinc/keymaps/ginjake/rules.mk        | 0
 keyboards/{ => 25keys}/zinc/keymaps/monks/config.h          | 0
 keyboards/{ => 25keys}/zinc/keymaps/monks/keymap.c          | 0
 keyboards/{ => 25keys}/zinc/keymaps/monks/readme_jp.md      | 0
 keyboards/{ => 25keys}/zinc/keymaps/monks/rules.mk          | 0
 keyboards/{ => 25keys}/zinc/keymaps/toshi0383/config.h      | 0
 keyboards/{ => 25keys}/zinc/keymaps/toshi0383/keymap.c      | 0
 keyboards/{ => 25keys}/zinc/keymaps/toshi0383/rules.mk      | 0
 keyboards/{ => 25keys}/zinc/keymaps/via/config.h            | 0
 keyboards/{ => 25keys}/zinc/keymaps/via/keymap.c            | 0
 keyboards/{ => 25keys}/zinc/keymaps/via/readme_en.md        | 0
 keyboards/{ => 25keys}/zinc/keymaps/via/readme_jp.md        | 0
 keyboards/{ => 25keys}/zinc/keymaps/via/rules.mk            | 0
 keyboards/{ => 25keys}/zinc/readme.md                       | 2 +-
 keyboards/{ => 25keys}/zinc/rev1/.noci                      | 0
 keyboards/{ => 25keys}/zinc/rev1/config.h                   | 0
 keyboards/{ => 25keys}/zinc/rev1/info.json                  | 0
 keyboards/{ => 25keys}/zinc/rev1/post_config.h              | 0
 keyboards/{ => 25keys}/zinc/rev1/rev1.c                     | 0
 keyboards/{ => 25keys}/zinc/rev1/rev1.h                     | 0
 keyboards/{ => 25keys}/zinc/rev1/rules.mk                   | 0
 keyboards/{ => 25keys}/zinc/reva/.noci                      | 0
 keyboards/{ => 25keys}/zinc/reva/config.h                   | 0
 keyboards/{ => 25keys}/zinc/reva/info.json                  | 0
 keyboards/{ => 25keys}/zinc/reva/post_config.h              | 0
 keyboards/{ => 25keys}/zinc/reva/reva.c                     | 0
 keyboards/{ => 25keys}/zinc/reva/reva.h                     | 0
 keyboards/{ => 25keys}/zinc/reva/rules.mk                   | 0
 keyboards/{ => 25keys}/zinc/rules.mk                        | 2 +-
 keyboards/{ => 25keys}/zinc/zinc.c                          | 0
 keyboards/{ => 25keys}/zinc/zinc.h                          | 4 ++--
 72 files changed, 7 insertions(+), 7 deletions(-)
 rename keyboards/{ => 25keys}/aleth42/info.json (100%)
 rename keyboards/{ => 25keys}/aleth42/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 25keys}/aleth42/keymaps/default/readme.md (100%)
 rename keyboards/{ => 25keys}/aleth42/keymaps/via/config.h (100%)
 rename keyboards/{ => 25keys}/aleth42/keymaps/via/keymap.c (100%)
 rename keyboards/{ => 25keys}/aleth42/keymaps/via/readme.md (100%)
 rename keyboards/{ => 25keys}/aleth42/keymaps/via/rules.mk (100%)
 rename keyboards/{aleth42/rev1 => 25keys/aleth42}/readme.md (95%)
 rename keyboards/{ => 25keys}/aleth42/rev0/config.h (100%)
 rename keyboards/{ => 25keys}/aleth42/rev0/readme.md (100%)
 rename keyboards/{ => 25keys}/aleth42/rev0/rev0.c (100%)
 rename keyboards/{ => 25keys}/aleth42/rev0/rev0.h (100%)
 rename keyboards/{ => 25keys}/aleth42/rev0/rules.mk (100%)
 rename keyboards/{ => 25keys}/aleth42/rev1/config.h (100%)
 rename keyboards/{aleth42 => 25keys/aleth42/rev1}/readme.md (100%)
 rename keyboards/{ => 25keys}/aleth42/rev1/rev1.c (100%)
 rename keyboards/{ => 25keys}/aleth42/rev1/rev1.h (100%)
 rename keyboards/{ => 25keys}/aleth42/rev1/rules.mk (100%)
 rename keyboards/{ => 25keys}/aleth42/rules.mk (100%)
 rename keyboards/{ => 25keys}/cassette42/cassette42.c (100%)
 rename keyboards/{ => 25keys}/cassette42/cassette42.h (100%)
 rename keyboards/{ => 25keys}/cassette42/common/glcdfont.c (100%)
 rename keyboards/{ => 25keys}/cassette42/common/oled_helper.c (100%)
 rename keyboards/{ => 25keys}/cassette42/common/oled_helper.h (100%)
 rename keyboards/{ => 25keys}/cassette42/config.h (95%)
 rename keyboards/{ => 25keys}/cassette42/info.json (100%)
 rename keyboards/{ => 25keys}/cassette42/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 25keys}/cassette42/keymaps/default/readme.md (100%)
 rename keyboards/{ => 25keys}/cassette42/readme.md (95%)
 rename keyboards/{ => 25keys}/cassette42/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/.noci (100%)
 rename keyboards/{ => 25keys}/zinc/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/info.json (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/default/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/default/readme_en.md (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/default/readme_jp.md (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/default/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/ginjake/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/ginjake/keymap.c (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/ginjake/readme_jp.md (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/ginjake/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/monks/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/monks/keymap.c (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/monks/readme_jp.md (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/monks/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/toshi0383/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/toshi0383/keymap.c (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/toshi0383/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/via/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/via/keymap.c (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/via/readme_en.md (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/via/readme_jp.md (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/via/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/readme.md (95%)
 rename keyboards/{ => 25keys}/zinc/rev1/.noci (100%)
 rename keyboards/{ => 25keys}/zinc/rev1/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/rev1/info.json (100%)
 rename keyboards/{ => 25keys}/zinc/rev1/post_config.h (100%)
 rename keyboards/{ => 25keys}/zinc/rev1/rev1.c (100%)
 rename keyboards/{ => 25keys}/zinc/rev1/rev1.h (100%)
 rename keyboards/{ => 25keys}/zinc/rev1/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/reva/.noci (100%)
 rename keyboards/{ => 25keys}/zinc/reva/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/reva/info.json (100%)
 rename keyboards/{ => 25keys}/zinc/reva/post_config.h (100%)
 rename keyboards/{ => 25keys}/zinc/reva/reva.c (100%)
 rename keyboards/{ => 25keys}/zinc/reva/reva.h (100%)
 rename keyboards/{ => 25keys}/zinc/reva/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/rules.mk (95%)
 rename keyboards/{ => 25keys}/zinc/zinc.c (100%)
 rename keyboards/{ => 25keys}/zinc/zinc.h (58%)

diff --git a/keyboards/aleth42/info.json b/keyboards/25keys/aleth42/info.json
similarity index 100%
rename from keyboards/aleth42/info.json
rename to keyboards/25keys/aleth42/info.json
diff --git a/keyboards/aleth42/keymaps/default/keymap.c b/keyboards/25keys/aleth42/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/aleth42/keymaps/default/keymap.c
rename to keyboards/25keys/aleth42/keymaps/default/keymap.c
diff --git a/keyboards/aleth42/keymaps/default/readme.md b/keyboards/25keys/aleth42/keymaps/default/readme.md
similarity index 100%
rename from keyboards/aleth42/keymaps/default/readme.md
rename to keyboards/25keys/aleth42/keymaps/default/readme.md
diff --git a/keyboards/aleth42/keymaps/via/config.h b/keyboards/25keys/aleth42/keymaps/via/config.h
similarity index 100%
rename from keyboards/aleth42/keymaps/via/config.h
rename to keyboards/25keys/aleth42/keymaps/via/config.h
diff --git a/keyboards/aleth42/keymaps/via/keymap.c b/keyboards/25keys/aleth42/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/aleth42/keymaps/via/keymap.c
rename to keyboards/25keys/aleth42/keymaps/via/keymap.c
diff --git a/keyboards/aleth42/keymaps/via/readme.md b/keyboards/25keys/aleth42/keymaps/via/readme.md
similarity index 100%
rename from keyboards/aleth42/keymaps/via/readme.md
rename to keyboards/25keys/aleth42/keymaps/via/readme.md
diff --git a/keyboards/aleth42/keymaps/via/rules.mk b/keyboards/25keys/aleth42/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/aleth42/keymaps/via/rules.mk
rename to keyboards/25keys/aleth42/keymaps/via/rules.mk
diff --git a/keyboards/aleth42/rev1/readme.md b/keyboards/25keys/aleth42/readme.md
similarity index 95%
rename from keyboards/aleth42/rev1/readme.md
rename to keyboards/25keys/aleth42/readme.md
index 3da1231d60..acf9c38e2e 100644
--- a/keyboards/aleth42/rev1/readme.md
+++ b/keyboards/25keys/aleth42/readme.md
@@ -10,6 +10,6 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make aleth42:default
+    make 25keys/aleth42/rev1: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).
diff --git a/keyboards/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
similarity index 100%
rename from keyboards/aleth42/rev0/config.h
rename to keyboards/25keys/aleth42/rev0/config.h
diff --git a/keyboards/aleth42/rev0/readme.md b/keyboards/25keys/aleth42/rev0/readme.md
similarity index 100%
rename from keyboards/aleth42/rev0/readme.md
rename to keyboards/25keys/aleth42/rev0/readme.md
diff --git a/keyboards/aleth42/rev0/rev0.c b/keyboards/25keys/aleth42/rev0/rev0.c
similarity index 100%
rename from keyboards/aleth42/rev0/rev0.c
rename to keyboards/25keys/aleth42/rev0/rev0.c
diff --git a/keyboards/aleth42/rev0/rev0.h b/keyboards/25keys/aleth42/rev0/rev0.h
similarity index 100%
rename from keyboards/aleth42/rev0/rev0.h
rename to keyboards/25keys/aleth42/rev0/rev0.h
diff --git a/keyboards/aleth42/rev0/rules.mk b/keyboards/25keys/aleth42/rev0/rules.mk
similarity index 100%
rename from keyboards/aleth42/rev0/rules.mk
rename to keyboards/25keys/aleth42/rev0/rules.mk
diff --git a/keyboards/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
similarity index 100%
rename from keyboards/aleth42/rev1/config.h
rename to keyboards/25keys/aleth42/rev1/config.h
diff --git a/keyboards/aleth42/readme.md b/keyboards/25keys/aleth42/rev1/readme.md
similarity index 100%
rename from keyboards/aleth42/readme.md
rename to keyboards/25keys/aleth42/rev1/readme.md
diff --git a/keyboards/aleth42/rev1/rev1.c b/keyboards/25keys/aleth42/rev1/rev1.c
similarity index 100%
rename from keyboards/aleth42/rev1/rev1.c
rename to keyboards/25keys/aleth42/rev1/rev1.c
diff --git a/keyboards/aleth42/rev1/rev1.h b/keyboards/25keys/aleth42/rev1/rev1.h
similarity index 100%
rename from keyboards/aleth42/rev1/rev1.h
rename to keyboards/25keys/aleth42/rev1/rev1.h
diff --git a/keyboards/aleth42/rev1/rules.mk b/keyboards/25keys/aleth42/rev1/rules.mk
similarity index 100%
rename from keyboards/aleth42/rev1/rules.mk
rename to keyboards/25keys/aleth42/rev1/rules.mk
diff --git a/keyboards/aleth42/rules.mk b/keyboards/25keys/aleth42/rules.mk
similarity index 100%
rename from keyboards/aleth42/rules.mk
rename to keyboards/25keys/aleth42/rules.mk
diff --git a/keyboards/cassette42/cassette42.c b/keyboards/25keys/cassette42/cassette42.c
similarity index 100%
rename from keyboards/cassette42/cassette42.c
rename to keyboards/25keys/cassette42/cassette42.c
diff --git a/keyboards/cassette42/cassette42.h b/keyboards/25keys/cassette42/cassette42.h
similarity index 100%
rename from keyboards/cassette42/cassette42.h
rename to keyboards/25keys/cassette42/cassette42.h
diff --git a/keyboards/cassette42/common/glcdfont.c b/keyboards/25keys/cassette42/common/glcdfont.c
similarity index 100%
rename from keyboards/cassette42/common/glcdfont.c
rename to keyboards/25keys/cassette42/common/glcdfont.c
diff --git a/keyboards/cassette42/common/oled_helper.c b/keyboards/25keys/cassette42/common/oled_helper.c
similarity index 100%
rename from keyboards/cassette42/common/oled_helper.c
rename to keyboards/25keys/cassette42/common/oled_helper.c
diff --git a/keyboards/cassette42/common/oled_helper.h b/keyboards/25keys/cassette42/common/oled_helper.h
similarity index 100%
rename from keyboards/cassette42/common/oled_helper.h
rename to keyboards/25keys/cassette42/common/oled_helper.h
diff --git a/keyboards/cassette42/config.h b/keyboards/25keys/cassette42/config.h
similarity index 95%
rename from keyboards/cassette42/config.h
rename to keyboards/25keys/cassette42/config.h
index 1729c31fbd..cac03f6346 100644
--- a/keyboards/cassette42/config.h
+++ b/keyboards/25keys/cassette42/config.h
@@ -49,4 +49,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_ANIMATIONS
 #endif
 
-#define OLED_FONT_H "keyboards/cassette42/common/glcdfont.c"
+#define OLED_FONT_H "keyboards/25keys/cassette42/common/glcdfont.c"
diff --git a/keyboards/cassette42/info.json b/keyboards/25keys/cassette42/info.json
similarity index 100%
rename from keyboards/cassette42/info.json
rename to keyboards/25keys/cassette42/info.json
diff --git a/keyboards/cassette42/keymaps/default/keymap.c b/keyboards/25keys/cassette42/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/cassette42/keymaps/default/keymap.c
rename to keyboards/25keys/cassette42/keymaps/default/keymap.c
diff --git a/keyboards/cassette42/keymaps/default/readme.md b/keyboards/25keys/cassette42/keymaps/default/readme.md
similarity index 100%
rename from keyboards/cassette42/keymaps/default/readme.md
rename to keyboards/25keys/cassette42/keymaps/default/readme.md
diff --git a/keyboards/cassette42/readme.md b/keyboards/25keys/cassette42/readme.md
similarity index 95%
rename from keyboards/cassette42/readme.md
rename to keyboards/25keys/cassette42/readme.md
index 2ba9a661bb..cb6b2cc5b7 100644
--- a/keyboards/cassette42/readme.md
+++ b/keyboards/25keys/cassette42/readme.md
@@ -10,6 +10,6 @@ An audio control pad with 4 switches and 2 rotary encoders.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make cassette42:default
+    make 25keys/cassette42: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).
diff --git a/keyboards/cassette42/rules.mk b/keyboards/25keys/cassette42/rules.mk
similarity index 100%
rename from keyboards/cassette42/rules.mk
rename to keyboards/25keys/cassette42/rules.mk
diff --git a/keyboards/zinc/.noci b/keyboards/25keys/zinc/.noci
similarity index 100%
rename from keyboards/zinc/.noci
rename to keyboards/25keys/zinc/.noci
diff --git a/keyboards/zinc/config.h b/keyboards/25keys/zinc/config.h
similarity index 100%
rename from keyboards/zinc/config.h
rename to keyboards/25keys/zinc/config.h
diff --git a/keyboards/zinc/info.json b/keyboards/25keys/zinc/info.json
similarity index 100%
rename from keyboards/zinc/info.json
rename to keyboards/25keys/zinc/info.json
diff --git a/keyboards/zinc/keymaps/default/config.h b/keyboards/25keys/zinc/keymaps/default/config.h
similarity index 100%
rename from keyboards/zinc/keymaps/default/config.h
rename to keyboards/25keys/zinc/keymaps/default/config.h
diff --git a/keyboards/zinc/keymaps/default/keymap.c b/keyboards/25keys/zinc/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/zinc/keymaps/default/keymap.c
rename to keyboards/25keys/zinc/keymaps/default/keymap.c
diff --git a/keyboards/zinc/keymaps/default/readme_en.md b/keyboards/25keys/zinc/keymaps/default/readme_en.md
similarity index 100%
rename from keyboards/zinc/keymaps/default/readme_en.md
rename to keyboards/25keys/zinc/keymaps/default/readme_en.md
diff --git a/keyboards/zinc/keymaps/default/readme_jp.md b/keyboards/25keys/zinc/keymaps/default/readme_jp.md
similarity index 100%
rename from keyboards/zinc/keymaps/default/readme_jp.md
rename to keyboards/25keys/zinc/keymaps/default/readme_jp.md
diff --git a/keyboards/zinc/keymaps/default/rules.mk b/keyboards/25keys/zinc/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/zinc/keymaps/default/rules.mk
rename to keyboards/25keys/zinc/keymaps/default/rules.mk
diff --git a/keyboards/zinc/keymaps/ginjake/config.h b/keyboards/25keys/zinc/keymaps/ginjake/config.h
similarity index 100%
rename from keyboards/zinc/keymaps/ginjake/config.h
rename to keyboards/25keys/zinc/keymaps/ginjake/config.h
diff --git a/keyboards/zinc/keymaps/ginjake/keymap.c b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
similarity index 100%
rename from keyboards/zinc/keymaps/ginjake/keymap.c
rename to keyboards/25keys/zinc/keymaps/ginjake/keymap.c
diff --git a/keyboards/zinc/keymaps/ginjake/readme_jp.md b/keyboards/25keys/zinc/keymaps/ginjake/readme_jp.md
similarity index 100%
rename from keyboards/zinc/keymaps/ginjake/readme_jp.md
rename to keyboards/25keys/zinc/keymaps/ginjake/readme_jp.md
diff --git a/keyboards/zinc/keymaps/ginjake/rules.mk b/keyboards/25keys/zinc/keymaps/ginjake/rules.mk
similarity index 100%
rename from keyboards/zinc/keymaps/ginjake/rules.mk
rename to keyboards/25keys/zinc/keymaps/ginjake/rules.mk
diff --git a/keyboards/zinc/keymaps/monks/config.h b/keyboards/25keys/zinc/keymaps/monks/config.h
similarity index 100%
rename from keyboards/zinc/keymaps/monks/config.h
rename to keyboards/25keys/zinc/keymaps/monks/config.h
diff --git a/keyboards/zinc/keymaps/monks/keymap.c b/keyboards/25keys/zinc/keymaps/monks/keymap.c
similarity index 100%
rename from keyboards/zinc/keymaps/monks/keymap.c
rename to keyboards/25keys/zinc/keymaps/monks/keymap.c
diff --git a/keyboards/zinc/keymaps/monks/readme_jp.md b/keyboards/25keys/zinc/keymaps/monks/readme_jp.md
similarity index 100%
rename from keyboards/zinc/keymaps/monks/readme_jp.md
rename to keyboards/25keys/zinc/keymaps/monks/readme_jp.md
diff --git a/keyboards/zinc/keymaps/monks/rules.mk b/keyboards/25keys/zinc/keymaps/monks/rules.mk
similarity index 100%
rename from keyboards/zinc/keymaps/monks/rules.mk
rename to keyboards/25keys/zinc/keymaps/monks/rules.mk
diff --git a/keyboards/zinc/keymaps/toshi0383/config.h b/keyboards/25keys/zinc/keymaps/toshi0383/config.h
similarity index 100%
rename from keyboards/zinc/keymaps/toshi0383/config.h
rename to keyboards/25keys/zinc/keymaps/toshi0383/config.h
diff --git a/keyboards/zinc/keymaps/toshi0383/keymap.c b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
similarity index 100%
rename from keyboards/zinc/keymaps/toshi0383/keymap.c
rename to keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
diff --git a/keyboards/zinc/keymaps/toshi0383/rules.mk b/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk
similarity index 100%
rename from keyboards/zinc/keymaps/toshi0383/rules.mk
rename to keyboards/25keys/zinc/keymaps/toshi0383/rules.mk
diff --git a/keyboards/zinc/keymaps/via/config.h b/keyboards/25keys/zinc/keymaps/via/config.h
similarity index 100%
rename from keyboards/zinc/keymaps/via/config.h
rename to keyboards/25keys/zinc/keymaps/via/config.h
diff --git a/keyboards/zinc/keymaps/via/keymap.c b/keyboards/25keys/zinc/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/zinc/keymaps/via/keymap.c
rename to keyboards/25keys/zinc/keymaps/via/keymap.c
diff --git a/keyboards/zinc/keymaps/via/readme_en.md b/keyboards/25keys/zinc/keymaps/via/readme_en.md
similarity index 100%
rename from keyboards/zinc/keymaps/via/readme_en.md
rename to keyboards/25keys/zinc/keymaps/via/readme_en.md
diff --git a/keyboards/zinc/keymaps/via/readme_jp.md b/keyboards/25keys/zinc/keymaps/via/readme_jp.md
similarity index 100%
rename from keyboards/zinc/keymaps/via/readme_jp.md
rename to keyboards/25keys/zinc/keymaps/via/readme_jp.md
diff --git a/keyboards/zinc/keymaps/via/rules.mk b/keyboards/25keys/zinc/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/zinc/keymaps/via/rules.mk
rename to keyboards/25keys/zinc/keymaps/via/rules.mk
diff --git a/keyboards/zinc/readme.md b/keyboards/25keys/zinc/readme.md
similarity index 95%
rename from keyboards/zinc/readme.md
rename to keyboards/25keys/zinc/readme.md
index 0e8d6cd65d..61172f1635 100644
--- a/keyboards/zinc/readme.md
+++ b/keyboards/25keys/zinc/readme.md
@@ -11,7 +11,7 @@ Zinc
 
 Make example for this keyboard (after setting up your build environment):
 
-    make zinc:default
+    make 25keys/zinc/rev1: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).
diff --git a/keyboards/zinc/rev1/.noci b/keyboards/25keys/zinc/rev1/.noci
similarity index 100%
rename from keyboards/zinc/rev1/.noci
rename to keyboards/25keys/zinc/rev1/.noci
diff --git a/keyboards/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
similarity index 100%
rename from keyboards/zinc/rev1/config.h
rename to keyboards/25keys/zinc/rev1/config.h
diff --git a/keyboards/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json
similarity index 100%
rename from keyboards/zinc/rev1/info.json
rename to keyboards/25keys/zinc/rev1/info.json
diff --git a/keyboards/zinc/rev1/post_config.h b/keyboards/25keys/zinc/rev1/post_config.h
similarity index 100%
rename from keyboards/zinc/rev1/post_config.h
rename to keyboards/25keys/zinc/rev1/post_config.h
diff --git a/keyboards/zinc/rev1/rev1.c b/keyboards/25keys/zinc/rev1/rev1.c
similarity index 100%
rename from keyboards/zinc/rev1/rev1.c
rename to keyboards/25keys/zinc/rev1/rev1.c
diff --git a/keyboards/zinc/rev1/rev1.h b/keyboards/25keys/zinc/rev1/rev1.h
similarity index 100%
rename from keyboards/zinc/rev1/rev1.h
rename to keyboards/25keys/zinc/rev1/rev1.h
diff --git a/keyboards/zinc/rev1/rules.mk b/keyboards/25keys/zinc/rev1/rules.mk
similarity index 100%
rename from keyboards/zinc/rev1/rules.mk
rename to keyboards/25keys/zinc/rev1/rules.mk
diff --git a/keyboards/zinc/reva/.noci b/keyboards/25keys/zinc/reva/.noci
similarity index 100%
rename from keyboards/zinc/reva/.noci
rename to keyboards/25keys/zinc/reva/.noci
diff --git a/keyboards/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
similarity index 100%
rename from keyboards/zinc/reva/config.h
rename to keyboards/25keys/zinc/reva/config.h
diff --git a/keyboards/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json
similarity index 100%
rename from keyboards/zinc/reva/info.json
rename to keyboards/25keys/zinc/reva/info.json
diff --git a/keyboards/zinc/reva/post_config.h b/keyboards/25keys/zinc/reva/post_config.h
similarity index 100%
rename from keyboards/zinc/reva/post_config.h
rename to keyboards/25keys/zinc/reva/post_config.h
diff --git a/keyboards/zinc/reva/reva.c b/keyboards/25keys/zinc/reva/reva.c
similarity index 100%
rename from keyboards/zinc/reva/reva.c
rename to keyboards/25keys/zinc/reva/reva.c
diff --git a/keyboards/zinc/reva/reva.h b/keyboards/25keys/zinc/reva/reva.h
similarity index 100%
rename from keyboards/zinc/reva/reva.h
rename to keyboards/25keys/zinc/reva/reva.h
diff --git a/keyboards/zinc/reva/rules.mk b/keyboards/25keys/zinc/reva/rules.mk
similarity index 100%
rename from keyboards/zinc/reva/rules.mk
rename to keyboards/25keys/zinc/reva/rules.mk
diff --git a/keyboards/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk
similarity index 95%
rename from keyboards/zinc/rules.mk
rename to keyboards/25keys/zinc/rules.mk
index c83741f40c..2fd608c56c 100644
--- a/keyboards/zinc/rules.mk
+++ b/keyboards/25keys/zinc/rules.mk
@@ -19,7 +19,7 @@ RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.  Do not enable this w
 RGB_MATRIX_ENABLE = no
 RGB_MATRIX_DRIVER = WS2812
 
-DEFAULT_FOLDER = zinc/rev1
+DEFAULT_FOLDER = 25keys/zinc/rev1
 
 #SRC += i2c.c
 SRC += serial.c
diff --git a/keyboards/zinc/zinc.c b/keyboards/25keys/zinc/zinc.c
similarity index 100%
rename from keyboards/zinc/zinc.c
rename to keyboards/25keys/zinc/zinc.c
diff --git a/keyboards/zinc/zinc.h b/keyboards/25keys/zinc/zinc.h
similarity index 58%
rename from keyboards/zinc/zinc.h
rename to keyboards/25keys/zinc/zinc.h
index dedc9253b0..8a80538e4c 100644
--- a/keyboards/zinc/zinc.h
+++ b/keyboards/25keys/zinc/zinc.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#ifdef KEYBOARD_zinc_reva
+#ifdef KEYBOARD_25keys_zinc_reva
     #include "reva.h"
 #endif
-#ifdef KEYBOARD_zinc_rev1
+#ifdef KEYBOARD_25keys_zinc_rev1
     #include "rev1.h"
 #endif
 

From 07bb65384cf96be88feb2916604cb4a89cd0ad33 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Mon, 31 Jan 2022 03:22:12 +0800
Subject: [PATCH 441/867] [Keyboard] move @kkatano 's keyboards to kkatano user
 folder (#15684)

---
 data/mappings/keyboard_aliases.json                       | 8 +++++++-
 keyboards/{ => kkatano}/bakeneko60/bakeneko60.c           | 0
 keyboards/{ => kkatano}/bakeneko60/bakeneko60.h           | 0
 keyboards/{ => kkatano}/bakeneko60/config.h               | 0
 keyboards/{ => kkatano}/bakeneko60/info.json              | 0
 .../{ => kkatano}/bakeneko60/keymaps/default/keymap.c     | 0
 .../{ => kkatano}/bakeneko60/keymaps/default/readme.md    | 0
 keyboards/{ => kkatano}/bakeneko60/keymaps/via/keymap.c   | 0
 keyboards/{ => kkatano}/bakeneko60/keymaps/via/rules.mk   | 0
 keyboards/{ => kkatano}/bakeneko60/readme.md              | 4 ++--
 keyboards/{ => kkatano}/bakeneko60/rules.mk               | 0
 keyboards/{ => kkatano}/bakeneko65/rev2/config.h          | 0
 keyboards/{ => kkatano}/bakeneko65/rev2/info.json         | 0
 .../bakeneko65/rev2/keymaps/default/keymap.c              | 0
 .../bakeneko65/rev2/keymaps/default/readme.md             | 0
 .../{ => kkatano}/bakeneko65/rev2/keymaps/via/keymap.c    | 0
 .../{ => kkatano}/bakeneko65/rev2/keymaps/via/rules.mk    | 0
 keyboards/{ => kkatano}/bakeneko65/rev2/readme.md         | 4 ++--
 keyboards/{ => kkatano}/bakeneko65/rev2/rev2.c            | 0
 keyboards/{ => kkatano}/bakeneko65/rev2/rev2.h            | 0
 keyboards/{ => kkatano}/bakeneko65/rev2/rules.mk          | 0
 keyboards/{ => kkatano}/bakeneko65/rev3/config.h          | 0
 keyboards/{ => kkatano}/bakeneko65/rev3/info.json         | 0
 .../bakeneko65/rev3/keymaps/default/keymap.c              | 0
 .../bakeneko65/rev3/keymaps/default/readme.md             | 0
 .../{ => kkatano}/bakeneko65/rev3/keymaps/via/keymap.c    | 0
 .../{ => kkatano}/bakeneko65/rev3/keymaps/via/rules.mk    | 0
 keyboards/{ => kkatano}/bakeneko65/rev3/readme.md         | 4 ++--
 keyboards/{ => kkatano}/bakeneko65/rev3/rev3.c            | 0
 keyboards/{ => kkatano}/bakeneko65/rev3/rev3.h            | 0
 keyboards/{ => kkatano}/bakeneko65/rev3/rules.mk          | 0
 keyboards/{ => kkatano}/bakeneko80/bakeneko80.c           | 0
 keyboards/{ => kkatano}/bakeneko80/bakeneko80.h           | 0
 keyboards/{ => kkatano}/bakeneko80/config.h               | 0
 keyboards/{ => kkatano}/bakeneko80/info.json              | 0
 .../{ => kkatano}/bakeneko80/keymaps/default/keymap.c     | 0
 .../{ => kkatano}/bakeneko80/keymaps/default/readme.md    | 0
 keyboards/{ => kkatano}/bakeneko80/readme.md              | 2 +-
 keyboards/{ => kkatano}/bakeneko80/rules.mk               | 0
 keyboards/{ => kkatano}/wallaby/config.h                  | 0
 keyboards/{ => kkatano}/wallaby/info.json                 | 0
 keyboards/{ => kkatano}/wallaby/keymaps/default/keymap.c  | 0
 keyboards/{ => kkatano}/wallaby/keymaps/default/readme.md | 0
 keyboards/{ => kkatano}/wallaby/readme.md                 | 2 +-
 keyboards/{ => kkatano}/wallaby/rules.mk                  | 0
 keyboards/{ => kkatano}/wallaby/wallaby.c                 | 0
 keyboards/{ => kkatano}/wallaby/wallaby.h                 | 0
 keyboards/{ => kkatano}/yurei/config.h                    | 0
 keyboards/{ => kkatano}/yurei/info.json                   | 0
 keyboards/{ => kkatano}/yurei/keymaps/default/keymap.c    | 0
 keyboards/{ => kkatano}/yurei/keymaps/default/readme.md   | 0
 keyboards/{ => kkatano}/yurei/readme.md                   | 2 +-
 keyboards/{ => kkatano}/yurei/rules.mk                    | 0
 keyboards/{ => kkatano}/yurei/yurei.c                     | 0
 keyboards/{ => kkatano}/yurei/yurei.h                     | 0
 55 files changed, 16 insertions(+), 10 deletions(-)
 rename keyboards/{ => kkatano}/bakeneko60/bakeneko60.c (100%)
 rename keyboards/{ => kkatano}/bakeneko60/bakeneko60.h (100%)
 rename keyboards/{ => kkatano}/bakeneko60/config.h (100%)
 rename keyboards/{ => kkatano}/bakeneko60/info.json (100%)
 rename keyboards/{ => kkatano}/bakeneko60/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kkatano}/bakeneko60/keymaps/default/readme.md (100%)
 rename keyboards/{ => kkatano}/bakeneko60/keymaps/via/keymap.c (100%)
 rename keyboards/{ => kkatano}/bakeneko60/keymaps/via/rules.mk (100%)
 rename keyboards/{ => kkatano}/bakeneko60/readme.md (88%)
 rename keyboards/{ => kkatano}/bakeneko60/rules.mk (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev2/config.h (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev2/info.json (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev2/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev2/keymaps/default/readme.md (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev2/keymaps/via/keymap.c (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev2/keymaps/via/rules.mk (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev2/readme.md (87%)
 rename keyboards/{ => kkatano}/bakeneko65/rev2/rev2.c (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev2/rev2.h (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev2/rules.mk (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev3/config.h (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev3/info.json (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev3/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev3/keymaps/default/readme.md (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev3/keymaps/via/keymap.c (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev3/keymaps/via/rules.mk (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev3/readme.md (87%)
 rename keyboards/{ => kkatano}/bakeneko65/rev3/rev3.c (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev3/rev3.h (100%)
 rename keyboards/{ => kkatano}/bakeneko65/rev3/rules.mk (100%)
 rename keyboards/{ => kkatano}/bakeneko80/bakeneko80.c (100%)
 rename keyboards/{ => kkatano}/bakeneko80/bakeneko80.h (100%)
 rename keyboards/{ => kkatano}/bakeneko80/config.h (100%)
 rename keyboards/{ => kkatano}/bakeneko80/info.json (100%)
 rename keyboards/{ => kkatano}/bakeneko80/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kkatano}/bakeneko80/keymaps/default/readme.md (100%)
 rename keyboards/{ => kkatano}/bakeneko80/readme.md (94%)
 rename keyboards/{ => kkatano}/bakeneko80/rules.mk (100%)
 rename keyboards/{ => kkatano}/wallaby/config.h (100%)
 rename keyboards/{ => kkatano}/wallaby/info.json (100%)
 rename keyboards/{ => kkatano}/wallaby/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kkatano}/wallaby/keymaps/default/readme.md (100%)
 rename keyboards/{ => kkatano}/wallaby/readme.md (94%)
 rename keyboards/{ => kkatano}/wallaby/rules.mk (100%)
 rename keyboards/{ => kkatano}/wallaby/wallaby.c (100%)
 rename keyboards/{ => kkatano}/wallaby/wallaby.h (100%)
 rename keyboards/{ => kkatano}/yurei/config.h (100%)
 rename keyboards/{ => kkatano}/yurei/info.json (100%)
 rename keyboards/{ => kkatano}/yurei/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kkatano}/yurei/keymaps/default/readme.md (100%)
 rename keyboards/{ => kkatano}/yurei/readme.md (95%)
 rename keyboards/{ => kkatano}/yurei/rules.mk (100%)
 rename keyboards/{ => kkatano}/yurei/yurei.c (100%)
 rename keyboards/{ => kkatano}/yurei/yurei.h (100%)

diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index 5d9bf9f439..430229ecff 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -41,8 +41,14 @@
     'atom47/rev3': {
           target: 'maartenwut/atom47/rev3'
     },
+    bakeneko60: {
+          target: 'kkatano/bakeneko60'
+    },
     bakeneko65: {
-          target: 'bakeneko65/rev2'
+          target: 'kkatano/bakeneko65/rev2'
+    },
+    bakeneko80: {
+          target: 'kkatano/bakeneko80'
     },
     bear_face: {
           target: 'bear_face/v1'
diff --git a/keyboards/bakeneko60/bakeneko60.c b/keyboards/kkatano/bakeneko60/bakeneko60.c
similarity index 100%
rename from keyboards/bakeneko60/bakeneko60.c
rename to keyboards/kkatano/bakeneko60/bakeneko60.c
diff --git a/keyboards/bakeneko60/bakeneko60.h b/keyboards/kkatano/bakeneko60/bakeneko60.h
similarity index 100%
rename from keyboards/bakeneko60/bakeneko60.h
rename to keyboards/kkatano/bakeneko60/bakeneko60.h
diff --git a/keyboards/bakeneko60/config.h b/keyboards/kkatano/bakeneko60/config.h
similarity index 100%
rename from keyboards/bakeneko60/config.h
rename to keyboards/kkatano/bakeneko60/config.h
diff --git a/keyboards/bakeneko60/info.json b/keyboards/kkatano/bakeneko60/info.json
similarity index 100%
rename from keyboards/bakeneko60/info.json
rename to keyboards/kkatano/bakeneko60/info.json
diff --git a/keyboards/bakeneko60/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bakeneko60/keymaps/default/keymap.c
rename to keyboards/kkatano/bakeneko60/keymaps/default/keymap.c
diff --git a/keyboards/bakeneko60/keymaps/default/readme.md b/keyboards/kkatano/bakeneko60/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bakeneko60/keymaps/default/readme.md
rename to keyboards/kkatano/bakeneko60/keymaps/default/readme.md
diff --git a/keyboards/bakeneko60/keymaps/via/keymap.c b/keyboards/kkatano/bakeneko60/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bakeneko60/keymaps/via/keymap.c
rename to keyboards/kkatano/bakeneko60/keymaps/via/keymap.c
diff --git a/keyboards/bakeneko60/keymaps/via/rules.mk b/keyboards/kkatano/bakeneko60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bakeneko60/keymaps/via/rules.mk
rename to keyboards/kkatano/bakeneko60/keymaps/via/rules.mk
diff --git a/keyboards/bakeneko60/readme.md b/keyboards/kkatano/bakeneko60/readme.md
similarity index 88%
rename from keyboards/bakeneko60/readme.md
rename to keyboards/kkatano/bakeneko60/readme.md
index 18b9d3c4d2..0e1c293f90 100644
--- a/keyboards/bakeneko60/readme.md
+++ b/keyboards/kkatano/bakeneko60/readme.md
@@ -8,10 +8,10 @@ A simple 60% keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bakeneko60:default
+    make kkatano/bakeneko60:default
 
 Flashing example for this keyboard:
 
-    make bakeneko60:default:flash
+    make kkatano/bakeneko60:default:flash
 
 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).
diff --git a/keyboards/bakeneko60/rules.mk b/keyboards/kkatano/bakeneko60/rules.mk
similarity index 100%
rename from keyboards/bakeneko60/rules.mk
rename to keyboards/kkatano/bakeneko60/rules.mk
diff --git a/keyboards/bakeneko65/rev2/config.h b/keyboards/kkatano/bakeneko65/rev2/config.h
similarity index 100%
rename from keyboards/bakeneko65/rev2/config.h
rename to keyboards/kkatano/bakeneko65/rev2/config.h
diff --git a/keyboards/bakeneko65/rev2/info.json b/keyboards/kkatano/bakeneko65/rev2/info.json
similarity index 100%
rename from keyboards/bakeneko65/rev2/info.json
rename to keyboards/kkatano/bakeneko65/rev2/info.json
diff --git a/keyboards/bakeneko65/rev2/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko65/rev2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bakeneko65/rev2/keymaps/default/keymap.c
rename to keyboards/kkatano/bakeneko65/rev2/keymaps/default/keymap.c
diff --git a/keyboards/bakeneko65/rev2/keymaps/default/readme.md b/keyboards/kkatano/bakeneko65/rev2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bakeneko65/rev2/keymaps/default/readme.md
rename to keyboards/kkatano/bakeneko65/rev2/keymaps/default/readme.md
diff --git a/keyboards/bakeneko65/rev2/keymaps/via/keymap.c b/keyboards/kkatano/bakeneko65/rev2/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bakeneko65/rev2/keymaps/via/keymap.c
rename to keyboards/kkatano/bakeneko65/rev2/keymaps/via/keymap.c
diff --git a/keyboards/bakeneko65/rev2/keymaps/via/rules.mk b/keyboards/kkatano/bakeneko65/rev2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bakeneko65/rev2/keymaps/via/rules.mk
rename to keyboards/kkatano/bakeneko65/rev2/keymaps/via/rules.mk
diff --git a/keyboards/bakeneko65/rev2/readme.md b/keyboards/kkatano/bakeneko65/rev2/readme.md
similarity index 87%
rename from keyboards/bakeneko65/rev2/readme.md
rename to keyboards/kkatano/bakeneko65/rev2/readme.md
index 8d2fa6bc58..a12eded0db 100644
--- a/keyboards/bakeneko65/rev2/readme.md
+++ b/keyboards/kkatano/bakeneko65/rev2/readme.md
@@ -8,10 +8,10 @@ A simple 65% keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bakeneko65/rev2:default
+    make kkatano/bakeneko65/rev2:default
 
 Flashing example for this keyboard:
 
-    make bakeneko65/rev2:default:flash
+    make kkatano/bakeneko65/rev2:default:flash
 
 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).
diff --git a/keyboards/bakeneko65/rev2/rev2.c b/keyboards/kkatano/bakeneko65/rev2/rev2.c
similarity index 100%
rename from keyboards/bakeneko65/rev2/rev2.c
rename to keyboards/kkatano/bakeneko65/rev2/rev2.c
diff --git a/keyboards/bakeneko65/rev2/rev2.h b/keyboards/kkatano/bakeneko65/rev2/rev2.h
similarity index 100%
rename from keyboards/bakeneko65/rev2/rev2.h
rename to keyboards/kkatano/bakeneko65/rev2/rev2.h
diff --git a/keyboards/bakeneko65/rev2/rules.mk b/keyboards/kkatano/bakeneko65/rev2/rules.mk
similarity index 100%
rename from keyboards/bakeneko65/rev2/rules.mk
rename to keyboards/kkatano/bakeneko65/rev2/rules.mk
diff --git a/keyboards/bakeneko65/rev3/config.h b/keyboards/kkatano/bakeneko65/rev3/config.h
similarity index 100%
rename from keyboards/bakeneko65/rev3/config.h
rename to keyboards/kkatano/bakeneko65/rev3/config.h
diff --git a/keyboards/bakeneko65/rev3/info.json b/keyboards/kkatano/bakeneko65/rev3/info.json
similarity index 100%
rename from keyboards/bakeneko65/rev3/info.json
rename to keyboards/kkatano/bakeneko65/rev3/info.json
diff --git a/keyboards/bakeneko65/rev3/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bakeneko65/rev3/keymaps/default/keymap.c
rename to keyboards/kkatano/bakeneko65/rev3/keymaps/default/keymap.c
diff --git a/keyboards/bakeneko65/rev3/keymaps/default/readme.md b/keyboards/kkatano/bakeneko65/rev3/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bakeneko65/rev3/keymaps/default/readme.md
rename to keyboards/kkatano/bakeneko65/rev3/keymaps/default/readme.md
diff --git a/keyboards/bakeneko65/rev3/keymaps/via/keymap.c b/keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/bakeneko65/rev3/keymaps/via/keymap.c
rename to keyboards/kkatano/bakeneko65/rev3/keymaps/via/keymap.c
diff --git a/keyboards/bakeneko65/rev3/keymaps/via/rules.mk b/keyboards/kkatano/bakeneko65/rev3/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/bakeneko65/rev3/keymaps/via/rules.mk
rename to keyboards/kkatano/bakeneko65/rev3/keymaps/via/rules.mk
diff --git a/keyboards/bakeneko65/rev3/readme.md b/keyboards/kkatano/bakeneko65/rev3/readme.md
similarity index 87%
rename from keyboards/bakeneko65/rev3/readme.md
rename to keyboards/kkatano/bakeneko65/rev3/readme.md
index e147b11e6f..18cd577328 100644
--- a/keyboards/bakeneko65/rev3/readme.md
+++ b/keyboards/kkatano/bakeneko65/rev3/readme.md
@@ -8,10 +8,10 @@ A simple 65% keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bakeneko65/rev3:default
+    make kkatano/bakeneko65/rev3:default
 
 Flashing example for this keyboard:
 
-    make bakeneko65/rev3:default:flash
+    make kkatano/bakeneko65/rev3:default:flash
 
 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).
diff --git a/keyboards/bakeneko65/rev3/rev3.c b/keyboards/kkatano/bakeneko65/rev3/rev3.c
similarity index 100%
rename from keyboards/bakeneko65/rev3/rev3.c
rename to keyboards/kkatano/bakeneko65/rev3/rev3.c
diff --git a/keyboards/bakeneko65/rev3/rev3.h b/keyboards/kkatano/bakeneko65/rev3/rev3.h
similarity index 100%
rename from keyboards/bakeneko65/rev3/rev3.h
rename to keyboards/kkatano/bakeneko65/rev3/rev3.h
diff --git a/keyboards/bakeneko65/rev3/rules.mk b/keyboards/kkatano/bakeneko65/rev3/rules.mk
similarity index 100%
rename from keyboards/bakeneko65/rev3/rules.mk
rename to keyboards/kkatano/bakeneko65/rev3/rules.mk
diff --git a/keyboards/bakeneko80/bakeneko80.c b/keyboards/kkatano/bakeneko80/bakeneko80.c
similarity index 100%
rename from keyboards/bakeneko80/bakeneko80.c
rename to keyboards/kkatano/bakeneko80/bakeneko80.c
diff --git a/keyboards/bakeneko80/bakeneko80.h b/keyboards/kkatano/bakeneko80/bakeneko80.h
similarity index 100%
rename from keyboards/bakeneko80/bakeneko80.h
rename to keyboards/kkatano/bakeneko80/bakeneko80.h
diff --git a/keyboards/bakeneko80/config.h b/keyboards/kkatano/bakeneko80/config.h
similarity index 100%
rename from keyboards/bakeneko80/config.h
rename to keyboards/kkatano/bakeneko80/config.h
diff --git a/keyboards/bakeneko80/info.json b/keyboards/kkatano/bakeneko80/info.json
similarity index 100%
rename from keyboards/bakeneko80/info.json
rename to keyboards/kkatano/bakeneko80/info.json
diff --git a/keyboards/bakeneko80/keymaps/default/keymap.c b/keyboards/kkatano/bakeneko80/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bakeneko80/keymaps/default/keymap.c
rename to keyboards/kkatano/bakeneko80/keymaps/default/keymap.c
diff --git a/keyboards/bakeneko80/keymaps/default/readme.md b/keyboards/kkatano/bakeneko80/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bakeneko80/keymaps/default/readme.md
rename to keyboards/kkatano/bakeneko80/keymaps/default/readme.md
diff --git a/keyboards/bakeneko80/readme.md b/keyboards/kkatano/bakeneko80/readme.md
similarity index 94%
rename from keyboards/bakeneko80/readme.md
rename to keyboards/kkatano/bakeneko80/readme.md
index 30f1b3e608..cc04ab447b 100644
--- a/keyboards/bakeneko80/readme.md
+++ b/keyboards/kkatano/bakeneko80/readme.md
@@ -8,6 +8,6 @@ Open source tenkeyless keyboard for DIYers
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bakeneko80:default
+    make kkatano/bakeneko80: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).
diff --git a/keyboards/bakeneko80/rules.mk b/keyboards/kkatano/bakeneko80/rules.mk
similarity index 100%
rename from keyboards/bakeneko80/rules.mk
rename to keyboards/kkatano/bakeneko80/rules.mk
diff --git a/keyboards/wallaby/config.h b/keyboards/kkatano/wallaby/config.h
similarity index 100%
rename from keyboards/wallaby/config.h
rename to keyboards/kkatano/wallaby/config.h
diff --git a/keyboards/wallaby/info.json b/keyboards/kkatano/wallaby/info.json
similarity index 100%
rename from keyboards/wallaby/info.json
rename to keyboards/kkatano/wallaby/info.json
diff --git a/keyboards/wallaby/keymaps/default/keymap.c b/keyboards/kkatano/wallaby/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/wallaby/keymaps/default/keymap.c
rename to keyboards/kkatano/wallaby/keymaps/default/keymap.c
diff --git a/keyboards/wallaby/keymaps/default/readme.md b/keyboards/kkatano/wallaby/keymaps/default/readme.md
similarity index 100%
rename from keyboards/wallaby/keymaps/default/readme.md
rename to keyboards/kkatano/wallaby/keymaps/default/readme.md
diff --git a/keyboards/wallaby/readme.md b/keyboards/kkatano/wallaby/readme.md
similarity index 94%
rename from keyboards/wallaby/readme.md
rename to keyboards/kkatano/wallaby/readme.md
index 89c9f9c567..6be5a059fd 100644
--- a/keyboards/wallaby/readme.md
+++ b/keyboards/kkatano/wallaby/readme.md
@@ -8,6 +8,6 @@ A Tenkeyless PCB for YMDK aluminium case compatible with Filco
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wallaby:default
+    make kkatano/wallaby: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).
diff --git a/keyboards/wallaby/rules.mk b/keyboards/kkatano/wallaby/rules.mk
similarity index 100%
rename from keyboards/wallaby/rules.mk
rename to keyboards/kkatano/wallaby/rules.mk
diff --git a/keyboards/wallaby/wallaby.c b/keyboards/kkatano/wallaby/wallaby.c
similarity index 100%
rename from keyboards/wallaby/wallaby.c
rename to keyboards/kkatano/wallaby/wallaby.c
diff --git a/keyboards/wallaby/wallaby.h b/keyboards/kkatano/wallaby/wallaby.h
similarity index 100%
rename from keyboards/wallaby/wallaby.h
rename to keyboards/kkatano/wallaby/wallaby.h
diff --git a/keyboards/yurei/config.h b/keyboards/kkatano/yurei/config.h
similarity index 100%
rename from keyboards/yurei/config.h
rename to keyboards/kkatano/yurei/config.h
diff --git a/keyboards/yurei/info.json b/keyboards/kkatano/yurei/info.json
similarity index 100%
rename from keyboards/yurei/info.json
rename to keyboards/kkatano/yurei/info.json
diff --git a/keyboards/yurei/keymaps/default/keymap.c b/keyboards/kkatano/yurei/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/yurei/keymaps/default/keymap.c
rename to keyboards/kkatano/yurei/keymaps/default/keymap.c
diff --git a/keyboards/yurei/keymaps/default/readme.md b/keyboards/kkatano/yurei/keymaps/default/readme.md
similarity index 100%
rename from keyboards/yurei/keymaps/default/readme.md
rename to keyboards/kkatano/yurei/keymaps/default/readme.md
diff --git a/keyboards/yurei/readme.md b/keyboards/kkatano/yurei/readme.md
similarity index 95%
rename from keyboards/yurei/readme.md
rename to keyboards/kkatano/yurei/readme.md
index fc5b3eb5c0..69bd3a7cbe 100644
--- a/keyboards/yurei/readme.md
+++ b/keyboards/kkatano/yurei/readme.md
@@ -8,6 +8,6 @@ A Tenkeyless PCB inspired by Phantom, for customizing Filco Majestouch 2.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make yurei:default
+    make kkatano/yurei: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).
diff --git a/keyboards/yurei/rules.mk b/keyboards/kkatano/yurei/rules.mk
similarity index 100%
rename from keyboards/yurei/rules.mk
rename to keyboards/kkatano/yurei/rules.mk
diff --git a/keyboards/yurei/yurei.c b/keyboards/kkatano/yurei/yurei.c
similarity index 100%
rename from keyboards/yurei/yurei.c
rename to keyboards/kkatano/yurei/yurei.c
diff --git a/keyboards/yurei/yurei.h b/keyboards/kkatano/yurei/yurei.h
similarity index 100%
rename from keyboards/yurei/yurei.h
rename to keyboards/kkatano/yurei/yurei.h

From a1b39e6db231923935055846384eb2e78e538268 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Mon, 31 Jan 2022 03:28:04 +0800
Subject: [PATCH 442/867] [Keyboard] move That-Canadian 's boards into
 /maple_computing (#16050)

---
 keyboards/{ => maple_computing}/6ball/6ball.c                 | 0
 keyboards/{ => maple_computing}/6ball/6ball.h                 | 0
 keyboards/{ => maple_computing}/6ball/config.h                | 0
 keyboards/{ => maple_computing}/6ball/info.json               | 0
 .../{ => maple_computing}/6ball/keymaps/default/keymap.c      | 0
 keyboards/{ => maple_computing}/6ball/readme.md               | 2 +-
 keyboards/{ => maple_computing}/6ball/rules.mk                | 0
 keyboards/{ => maple_computing}/c39/c39.c                     | 0
 keyboards/{ => maple_computing}/c39/c39.h                     | 0
 keyboards/{ => maple_computing}/c39/config.h                  | 0
 keyboards/{ => maple_computing}/c39/info.json                 | 0
 keyboards/{ => maple_computing}/c39/keymaps/default/keymap.c  | 0
 keyboards/{ => maple_computing}/c39/keymaps/default/readme.md | 0
 keyboards/{ => maple_computing}/c39/keymaps/drashna/config.h  | 0
 keyboards/{ => maple_computing}/c39/keymaps/drashna/keymap.c  | 0
 keyboards/{ => maple_computing}/c39/keymaps/drashna/readme.md | 0
 keyboards/{ => maple_computing}/c39/keymaps/drashna/rules.mk  | 0
 .../{ => maple_computing}/c39/keymaps/kuchosauronad0/config.h | 0
 .../{ => maple_computing}/c39/keymaps/kuchosauronad0/keymap.c | 0
 .../c39/keymaps/kuchosauronad0/readme.md                      | 0
 .../{ => maple_computing}/c39/keymaps/kuchosauronad0/rules.mk | 0
 keyboards/{ => maple_computing}/c39/readme.md                 | 2 +-
 keyboards/{ => maple_computing}/c39/rules.mk                  | 0
 keyboards/{ => maple_computing}/christmas_tree/.noci          | 0
 keyboards/{ => maple_computing}/christmas_tree/V2017/V2017.c  | 0
 keyboards/{ => maple_computing}/christmas_tree/V2017/V2017.h  | 0
 keyboards/{ => maple_computing}/christmas_tree/V2017/config.h | 0
 keyboards/{ => maple_computing}/christmas_tree/V2017/rules.mk | 0
 .../{ => maple_computing}/christmas_tree/christmas_tree.c     | 0
 .../{ => maple_computing}/christmas_tree/christmas_tree.h     | 0
 keyboards/{ => maple_computing}/christmas_tree/config.h       | 0
 keyboards/{ => maple_computing}/christmas_tree/info.json      | 0
 .../christmas_tree/keymaps/default/keymap.c                   | 0
 .../christmas_tree/keymaps/default/readme.md                  | 0
 keyboards/{ => maple_computing}/christmas_tree/readme.md      | 4 ++--
 keyboards/{ => maple_computing}/christmas_tree/rules.mk       | 2 +-
 keyboards/{ => maple_computing}/ivy/.noci                     | 0
 keyboards/{ => maple_computing}/ivy/config.h                  | 0
 keyboards/{ => maple_computing}/ivy/ivy.c                     | 0
 keyboards/{ => maple_computing}/ivy/ivy.h                     | 2 +-
 keyboards/{ => maple_computing}/ivy/keymaps/default/keymap.c  | 0
 keyboards/{ => maple_computing}/ivy/readme.md                 | 4 ++--
 keyboards/{ => maple_computing}/ivy/rev1/config.h             | 0
 keyboards/{ => maple_computing}/ivy/rev1/info.json            | 0
 keyboards/{ => maple_computing}/ivy/rev1/rev1.c               | 0
 keyboards/{ => maple_computing}/ivy/rev1/rev1.h               | 0
 keyboards/{ => maple_computing}/ivy/rev1/rules.mk             | 0
 keyboards/{ => maple_computing}/ivy/rules.mk                  | 0
 keyboards/{ => maple_computing}/jnao/config.h                 | 0
 keyboards/{ => maple_computing}/jnao/info.json                | 0
 keyboards/{ => maple_computing}/jnao/jnao.c                   | 0
 keyboards/{ => maple_computing}/jnao/jnao.h                   | 0
 keyboards/{ => maple_computing}/jnao/keymaps/default/keymap.c | 0
 .../{ => maple_computing}/jnao/keymaps/default_4x12/keymap.c  | 0
 keyboards/{ => maple_computing}/jnao/keymaps/via/keymap.c     | 0
 keyboards/{ => maple_computing}/jnao/keymaps/via/rules.mk     | 0
 keyboards/{ => maple_computing}/jnao/readme.md                | 2 +-
 keyboards/{ => maple_computing}/jnao/rules.mk                 | 0
 keyboards/{ => maple_computing}/launchpad/.noci               | 0
 keyboards/{ => maple_computing}/launchpad/config.h            | 0
 .../launchpad/keymaps/brandonschlack/config.h                 | 0
 .../launchpad/keymaps/brandonschlack/keymap.c                 | 0
 .../launchpad/keymaps/brandonschlack/readme.md                | 0
 .../launchpad/keymaps/brandonschlack/rules.mk                 | 0
 .../{ => maple_computing}/launchpad/keymaps/default/keymap.c  | 0
 .../launchpad/keymaps/default_rgb/config.h                    | 0
 .../launchpad/keymaps/default_rgb/keymap.c                    | 0
 .../launchpad/keymaps/default_rgb/readme.md                   | 0
 .../launchpad/keymaps/default_rgb/rules.mk                    | 0
 .../{ => maple_computing}/launchpad/keymaps/drashna/config.h  | 0
 .../{ => maple_computing}/launchpad/keymaps/drashna/keymap.c  | 0
 .../{ => maple_computing}/launchpad/keymaps/drashna/rules.mk  | 0
 .../{ => maple_computing}/launchpad/keymaps/via/keymap.c      | 0
 .../{ => maple_computing}/launchpad/keymaps/via/rules.mk      | 0
 keyboards/{ => maple_computing}/launchpad/launchpad.c         | 0
 keyboards/{ => maple_computing}/launchpad/launchpad.h         | 2 +-
 keyboards/{ => maple_computing}/launchpad/readme.md           | 4 ++--
 keyboards/{ => maple_computing}/launchpad/rev1/config.h       | 0
 keyboards/{ => maple_computing}/launchpad/rev1/info.json      | 0
 keyboards/{ => maple_computing}/launchpad/rev1/rev1.c         | 0
 keyboards/{ => maple_computing}/launchpad/rev1/rev1.h         | 0
 keyboards/{ => maple_computing}/launchpad/rev1/rules.mk       | 0
 keyboards/{ => maple_computing}/launchpad/rules.mk            | 2 +-
 keyboards/{ => maple_computing}/lets_split_eh/.noci           | 0
 keyboards/{ => maple_computing}/lets_split_eh/config.h        | 0
 keyboards/{ => maple_computing}/lets_split_eh/eh/config.h     | 0
 keyboards/{ => maple_computing}/lets_split_eh/eh/eh.c         | 0
 keyboards/{ => maple_computing}/lets_split_eh/eh/eh.h         | 0
 keyboards/{ => maple_computing}/lets_split_eh/eh/info.json    | 0
 keyboards/{ => maple_computing}/lets_split_eh/eh/rules.mk     | 0
 .../lets_split_eh/keymaps/bbaserdem/README.md                 | 0
 .../lets_split_eh/keymaps/bbaserdem/config.h                  | 0
 .../lets_split_eh/keymaps/bbaserdem/keymap.c                  | 0
 .../lets_split_eh/keymaps/bbaserdem/rules.mk                  | 0
 .../lets_split_eh/keymaps/default/keymap.c                    | 0
 .../lets_split_eh/keymaps/doxish_dvorak/config.h              | 0
 .../lets_split_eh/keymaps/doxish_dvorak/keymap.c              | 0
 .../lets_split_eh/keymaps/doxish_dvorak/rules.mk              | 0
 .../lets_split_eh/keymaps/mikethetiger/config.h               | 0
 .../lets_split_eh/keymaps/mikethetiger/keymap.c               | 0
 .../lets_split_eh/keymaps/mikethetiger/rules.mk               | 0
 .../{ => maple_computing}/lets_split_eh/keymaps/msiu/config.h | 0
 .../{ => maple_computing}/lets_split_eh/keymaps/msiu/keymap.c | 0
 .../lets_split_eh/keymaps/resfury/config.h                    | 0
 .../lets_split_eh/keymaps/resfury/keymap.c                    | 0
 .../lets_split_eh/keymaps/resfury/readme.md                   | 0
 .../lets_split_eh/keymaps/resfury/rules.mk                    | 0
 .../lets_split_eh/keymaps/romus/README.md                     | 0
 .../lets_split_eh/keymaps/romus/keymap.c                      | 0
 .../lets_split_eh/keymaps/romus/rules.mk                      | 0
 .../lets_split_eh/keymaps/that_canadian/config.h              | 0
 .../lets_split_eh/keymaps/that_canadian/keymap.c              | 0
 .../lets_split_eh/keymaps/that_canadian/rules.mk              | 0
 keyboards/{ => maple_computing}/lets_split_eh/lets_split_eh.c | 0
 keyboards/{ => maple_computing}/lets_split_eh/lets_split_eh.h | 2 +-
 keyboards/{ => maple_computing}/lets_split_eh/readme.md       | 4 ++--
 keyboards/{ => maple_computing}/lets_split_eh/rules.mk        | 2 +-
 keyboards/{ => maple_computing}/minidox/.noci                 | 0
 keyboards/{ => maple_computing}/minidox/config.h              | 0
 .../{ => maple_computing}/minidox/keymaps/alairock/config.h   | 0
 .../{ => maple_computing}/minidox/keymaps/alairock/keymap.c   | 0
 .../{ => maple_computing}/minidox/keymaps/alairock/rules.mk   | 0
 keyboards/{ => maple_computing}/minidox/keymaps/bepo/config.h | 0
 keyboards/{ => maple_computing}/minidox/keymaps/bepo/keymap.c | 0
 .../{ => maple_computing}/minidox/keymaps/bepo/readme.md      | 0
 .../{ => maple_computing}/minidox/keymaps/default/keymap.c    | 0
 .../minidox/keymaps/dustypomerleau/README.md                  | 0
 .../minidox/keymaps/dustypomerleau/config.h                   | 0
 .../minidox/keymaps/dustypomerleau/keymap.c                   | 0
 .../minidox/keymaps/dustypomerleau/rules.mk                   | 0
 .../{ => maple_computing}/minidox/keymaps/haegin/keymap.c     | 0
 .../{ => maple_computing}/minidox/keymaps/khitsule/config.h   | 0
 .../{ => maple_computing}/minidox/keymaps/khitsule/keymap.c   | 0
 .../{ => maple_computing}/minidox/keymaps/khitsule/readme.md  | 0
 .../{ => maple_computing}/minidox/keymaps/norman/config.h     | 0
 .../{ => maple_computing}/minidox/keymaps/norman/keymap.c     | 0
 .../{ => maple_computing}/minidox/keymaps/norman/readme.md    | 0
 .../minidox/keymaps/rsthd_combos/config.h                     | 0
 .../minidox/keymaps/rsthd_combos/keymap.c                     | 0
 .../minidox/keymaps/rsthd_combos/readme.md                    | 0
 .../minidox/keymaps/rsthd_combos/rules.mk                     | 0
 .../minidox/keymaps/that_canadian/config.h                    | 0
 .../minidox/keymaps/that_canadian/keymap.c                    | 0
 .../minidox/keymaps/that_canadian/rules.mk                    | 0
 .../{ => maple_computing}/minidox/keymaps/tomb0y/README.md    | 0
 .../{ => maple_computing}/minidox/keymaps/tomb0y/keymap.c     | 0
 .../{ => maple_computing}/minidox/keymaps/tw1t611/keymap.c    | 0
 .../{ => maple_computing}/minidox/keymaps/tw1t611/readme.md   | 0
 .../{ => maple_computing}/minidox/keymaps/tw1t611/rules.mk    | 0
 .../{ => maple_computing}/minidox/keymaps/xyverz/config.h     | 0
 .../{ => maple_computing}/minidox/keymaps/xyverz/keymap.c     | 0
 .../{ => maple_computing}/minidox/keymaps/xyverz/rules.mk     | 0
 keyboards/{ => maple_computing}/minidox/minidox.c             | 0
 keyboards/{ => maple_computing}/minidox/minidox.h             | 2 +-
 keyboards/{ => maple_computing}/minidox/readme.md             | 4 ++--
 keyboards/{ => maple_computing}/minidox/rev1/config.h         | 0
 keyboards/{ => maple_computing}/minidox/rev1/info.json        | 0
 keyboards/{ => maple_computing}/minidox/rev1/rev1.c           | 0
 keyboards/{ => maple_computing}/minidox/rev1/rev1.h           | 0
 keyboards/{ => maple_computing}/minidox/rev1/rules.mk         | 0
 keyboards/{ => maple_computing}/minidox/rules.mk              | 2 +-
 keyboards/{ => maple_computing}/the_ruler/config.h            | 0
 keyboards/{ => maple_computing}/the_ruler/info.json           | 0
 .../{ => maple_computing}/the_ruler/keymaps/default/keymap.c  | 0
 .../{ => maple_computing}/the_ruler/keymaps/default/readme.md | 0
 keyboards/{ => maple_computing}/the_ruler/readme.md           | 2 +-
 keyboards/{ => maple_computing}/the_ruler/rules.mk            | 0
 keyboards/{ => maple_computing}/the_ruler/the_ruler.c         | 0
 keyboards/{ => maple_computing}/the_ruler/the_ruler.h         | 0
 169 files changed, 22 insertions(+), 22 deletions(-)
 rename keyboards/{ => maple_computing}/6ball/6ball.c (100%)
 rename keyboards/{ => maple_computing}/6ball/6ball.h (100%)
 rename keyboards/{ => maple_computing}/6ball/config.h (100%)
 rename keyboards/{ => maple_computing}/6ball/info.json (100%)
 rename keyboards/{ => maple_computing}/6ball/keymaps/default/keymap.c (100%)
 rename keyboards/{ => maple_computing}/6ball/readme.md (91%)
 rename keyboards/{ => maple_computing}/6ball/rules.mk (100%)
 rename keyboards/{ => maple_computing}/c39/c39.c (100%)
 rename keyboards/{ => maple_computing}/c39/c39.h (100%)
 rename keyboards/{ => maple_computing}/c39/config.h (100%)
 rename keyboards/{ => maple_computing}/c39/info.json (100%)
 rename keyboards/{ => maple_computing}/c39/keymaps/default/keymap.c (100%)
 rename keyboards/{ => maple_computing}/c39/keymaps/default/readme.md (100%)
 rename keyboards/{ => maple_computing}/c39/keymaps/drashna/config.h (100%)
 rename keyboards/{ => maple_computing}/c39/keymaps/drashna/keymap.c (100%)
 rename keyboards/{ => maple_computing}/c39/keymaps/drashna/readme.md (100%)
 rename keyboards/{ => maple_computing}/c39/keymaps/drashna/rules.mk (100%)
 rename keyboards/{ => maple_computing}/c39/keymaps/kuchosauronad0/config.h (100%)
 rename keyboards/{ => maple_computing}/c39/keymaps/kuchosauronad0/keymap.c (100%)
 rename keyboards/{ => maple_computing}/c39/keymaps/kuchosauronad0/readme.md (100%)
 rename keyboards/{ => maple_computing}/c39/keymaps/kuchosauronad0/rules.mk (100%)
 rename keyboards/{ => maple_computing}/c39/readme.md (93%)
 rename keyboards/{ => maple_computing}/c39/rules.mk (100%)
 rename keyboards/{ => maple_computing}/christmas_tree/.noci (100%)
 rename keyboards/{ => maple_computing}/christmas_tree/V2017/V2017.c (100%)
 rename keyboards/{ => maple_computing}/christmas_tree/V2017/V2017.h (100%)
 rename keyboards/{ => maple_computing}/christmas_tree/V2017/config.h (100%)
 rename keyboards/{ => maple_computing}/christmas_tree/V2017/rules.mk (100%)
 rename keyboards/{ => maple_computing}/christmas_tree/christmas_tree.c (100%)
 rename keyboards/{ => maple_computing}/christmas_tree/christmas_tree.h (100%)
 rename keyboards/{ => maple_computing}/christmas_tree/config.h (100%)
 rename keyboards/{ => maple_computing}/christmas_tree/info.json (100%)
 rename keyboards/{ => maple_computing}/christmas_tree/keymaps/default/keymap.c (100%)
 rename keyboards/{ => maple_computing}/christmas_tree/keymaps/default/readme.md (100%)
 rename keyboards/{ => maple_computing}/christmas_tree/readme.md (80%)
 rename keyboards/{ => maple_computing}/christmas_tree/rules.mk (92%)
 rename keyboards/{ => maple_computing}/ivy/.noci (100%)
 rename keyboards/{ => maple_computing}/ivy/config.h (100%)
 rename keyboards/{ => maple_computing}/ivy/ivy.c (100%)
 rename keyboards/{ => maple_computing}/ivy/ivy.h (61%)
 rename keyboards/{ => maple_computing}/ivy/keymaps/default/keymap.c (100%)
 rename keyboards/{ => maple_computing}/ivy/readme.md (82%)
 rename keyboards/{ => maple_computing}/ivy/rev1/config.h (100%)
 rename keyboards/{ => maple_computing}/ivy/rev1/info.json (100%)
 rename keyboards/{ => maple_computing}/ivy/rev1/rev1.c (100%)
 rename keyboards/{ => maple_computing}/ivy/rev1/rev1.h (100%)
 rename keyboards/{ => maple_computing}/ivy/rev1/rules.mk (100%)
 rename keyboards/{ => maple_computing}/ivy/rules.mk (100%)
 rename keyboards/{ => maple_computing}/jnao/config.h (100%)
 rename keyboards/{ => maple_computing}/jnao/info.json (100%)
 rename keyboards/{ => maple_computing}/jnao/jnao.c (100%)
 rename keyboards/{ => maple_computing}/jnao/jnao.h (100%)
 rename keyboards/{ => maple_computing}/jnao/keymaps/default/keymap.c (100%)
 rename keyboards/{ => maple_computing}/jnao/keymaps/default_4x12/keymap.c (100%)
 rename keyboards/{ => maple_computing}/jnao/keymaps/via/keymap.c (100%)
 rename keyboards/{ => maple_computing}/jnao/keymaps/via/rules.mk (100%)
 rename keyboards/{ => maple_computing}/jnao/readme.md (94%)
 rename keyboards/{ => maple_computing}/jnao/rules.mk (100%)
 rename keyboards/{ => maple_computing}/launchpad/.noci (100%)
 rename keyboards/{ => maple_computing}/launchpad/config.h (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/brandonschlack/config.h (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/brandonschlack/keymap.c (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/brandonschlack/readme.md (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/brandonschlack/rules.mk (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/default/keymap.c (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/default_rgb/config.h (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/default_rgb/keymap.c (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/default_rgb/readme.md (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/default_rgb/rules.mk (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/drashna/config.h (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/drashna/keymap.c (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/drashna/rules.mk (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/via/keymap.c (100%)
 rename keyboards/{ => maple_computing}/launchpad/keymaps/via/rules.mk (100%)
 rename keyboards/{ => maple_computing}/launchpad/launchpad.c (100%)
 rename keyboards/{ => maple_computing}/launchpad/launchpad.h (55%)
 rename keyboards/{ => maple_computing}/launchpad/readme.md (94%)
 rename keyboards/{ => maple_computing}/launchpad/rev1/config.h (100%)
 rename keyboards/{ => maple_computing}/launchpad/rev1/info.json (100%)
 rename keyboards/{ => maple_computing}/launchpad/rev1/rev1.c (100%)
 rename keyboards/{ => maple_computing}/launchpad/rev1/rev1.h (100%)
 rename keyboards/{ => maple_computing}/launchpad/rev1/rules.mk (100%)
 rename keyboards/{ => maple_computing}/launchpad/rules.mk (92%)
 rename keyboards/{ => maple_computing}/lets_split_eh/.noci (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/config.h (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/eh/config.h (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/eh/eh.c (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/eh/eh.h (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/eh/info.json (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/eh/rules.mk (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/bbaserdem/README.md (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/bbaserdem/config.h (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/bbaserdem/keymap.c (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/bbaserdem/rules.mk (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/default/keymap.c (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/doxish_dvorak/config.h (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/doxish_dvorak/keymap.c (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/doxish_dvorak/rules.mk (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/mikethetiger/config.h (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/mikethetiger/keymap.c (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/mikethetiger/rules.mk (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/msiu/config.h (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/msiu/keymap.c (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/resfury/config.h (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/resfury/keymap.c (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/resfury/readme.md (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/resfury/rules.mk (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/romus/README.md (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/romus/keymap.c (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/romus/rules.mk (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/that_canadian/config.h (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/that_canadian/keymap.c (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/keymaps/that_canadian/rules.mk (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/lets_split_eh.c (100%)
 rename keyboards/{ => maple_computing}/lets_split_eh/lets_split_eh.h (56%)
 rename keyboards/{ => maple_computing}/lets_split_eh/readme.md (85%)
 rename keyboards/{ => maple_computing}/lets_split_eh/rules.mk (92%)
 rename keyboards/{ => maple_computing}/minidox/.noci (100%)
 rename keyboards/{ => maple_computing}/minidox/config.h (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/alairock/config.h (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/alairock/keymap.c (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/alairock/rules.mk (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/bepo/config.h (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/bepo/keymap.c (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/bepo/readme.md (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/default/keymap.c (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/dustypomerleau/README.md (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/dustypomerleau/config.h (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/dustypomerleau/keymap.c (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/dustypomerleau/rules.mk (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/haegin/keymap.c (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/khitsule/config.h (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/khitsule/keymap.c (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/khitsule/readme.md (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/norman/config.h (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/norman/keymap.c (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/norman/readme.md (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/rsthd_combos/config.h (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/rsthd_combos/keymap.c (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/rsthd_combos/readme.md (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/rsthd_combos/rules.mk (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/that_canadian/config.h (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/that_canadian/keymap.c (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/that_canadian/rules.mk (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/tomb0y/README.md (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/tomb0y/keymap.c (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/tw1t611/keymap.c (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/tw1t611/readme.md (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/tw1t611/rules.mk (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/xyverz/config.h (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/xyverz/keymap.c (100%)
 rename keyboards/{ => maple_computing}/minidox/keymaps/xyverz/rules.mk (100%)
 rename keyboards/{ => maple_computing}/minidox/minidox.c (100%)
 rename keyboards/{ => maple_computing}/minidox/minidox.h (59%)
 rename keyboards/{ => maple_computing}/minidox/readme.md (92%)
 rename keyboards/{ => maple_computing}/minidox/rev1/config.h (100%)
 rename keyboards/{ => maple_computing}/minidox/rev1/info.json (100%)
 rename keyboards/{ => maple_computing}/minidox/rev1/rev1.c (100%)
 rename keyboards/{ => maple_computing}/minidox/rev1/rev1.h (100%)
 rename keyboards/{ => maple_computing}/minidox/rev1/rules.mk (100%)
 rename keyboards/{ => maple_computing}/minidox/rules.mk (93%)
 rename keyboards/{ => maple_computing}/the_ruler/config.h (100%)
 rename keyboards/{ => maple_computing}/the_ruler/info.json (100%)
 rename keyboards/{ => maple_computing}/the_ruler/keymaps/default/keymap.c (100%)
 rename keyboards/{ => maple_computing}/the_ruler/keymaps/default/readme.md (100%)
 rename keyboards/{ => maple_computing}/the_ruler/readme.md (93%)
 rename keyboards/{ => maple_computing}/the_ruler/rules.mk (100%)
 rename keyboards/{ => maple_computing}/the_ruler/the_ruler.c (100%)
 rename keyboards/{ => maple_computing}/the_ruler/the_ruler.h (100%)

diff --git a/keyboards/6ball/6ball.c b/keyboards/maple_computing/6ball/6ball.c
similarity index 100%
rename from keyboards/6ball/6ball.c
rename to keyboards/maple_computing/6ball/6ball.c
diff --git a/keyboards/6ball/6ball.h b/keyboards/maple_computing/6ball/6ball.h
similarity index 100%
rename from keyboards/6ball/6ball.h
rename to keyboards/maple_computing/6ball/6ball.h
diff --git a/keyboards/6ball/config.h b/keyboards/maple_computing/6ball/config.h
similarity index 100%
rename from keyboards/6ball/config.h
rename to keyboards/maple_computing/6ball/config.h
diff --git a/keyboards/6ball/info.json b/keyboards/maple_computing/6ball/info.json
similarity index 100%
rename from keyboards/6ball/info.json
rename to keyboards/maple_computing/6ball/info.json
diff --git a/keyboards/6ball/keymaps/default/keymap.c b/keyboards/maple_computing/6ball/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/6ball/keymaps/default/keymap.c
rename to keyboards/maple_computing/6ball/keymaps/default/keymap.c
diff --git a/keyboards/6ball/readme.md b/keyboards/maple_computing/6ball/readme.md
similarity index 91%
rename from keyboards/6ball/readme.md
rename to keyboards/maple_computing/6ball/readme.md
index c9548453a9..0b91c8aa28 100644
--- a/keyboards/6ball/readme.md
+++ b/keyboards/maple_computing/6ball/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: ThatCanadian
 
 Make example for this keyboard (after setting up your build environment):
 
-    make 6ball:default
+    make maple_computing/6ball:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/6ball/rules.mk b/keyboards/maple_computing/6ball/rules.mk
similarity index 100%
rename from keyboards/6ball/rules.mk
rename to keyboards/maple_computing/6ball/rules.mk
diff --git a/keyboards/c39/c39.c b/keyboards/maple_computing/c39/c39.c
similarity index 100%
rename from keyboards/c39/c39.c
rename to keyboards/maple_computing/c39/c39.c
diff --git a/keyboards/c39/c39.h b/keyboards/maple_computing/c39/c39.h
similarity index 100%
rename from keyboards/c39/c39.h
rename to keyboards/maple_computing/c39/c39.h
diff --git a/keyboards/c39/config.h b/keyboards/maple_computing/c39/config.h
similarity index 100%
rename from keyboards/c39/config.h
rename to keyboards/maple_computing/c39/config.h
diff --git a/keyboards/c39/info.json b/keyboards/maple_computing/c39/info.json
similarity index 100%
rename from keyboards/c39/info.json
rename to keyboards/maple_computing/c39/info.json
diff --git a/keyboards/c39/keymaps/default/keymap.c b/keyboards/maple_computing/c39/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/c39/keymaps/default/keymap.c
rename to keyboards/maple_computing/c39/keymaps/default/keymap.c
diff --git a/keyboards/c39/keymaps/default/readme.md b/keyboards/maple_computing/c39/keymaps/default/readme.md
similarity index 100%
rename from keyboards/c39/keymaps/default/readme.md
rename to keyboards/maple_computing/c39/keymaps/default/readme.md
diff --git a/keyboards/c39/keymaps/drashna/config.h b/keyboards/maple_computing/c39/keymaps/drashna/config.h
similarity index 100%
rename from keyboards/c39/keymaps/drashna/config.h
rename to keyboards/maple_computing/c39/keymaps/drashna/config.h
diff --git a/keyboards/c39/keymaps/drashna/keymap.c b/keyboards/maple_computing/c39/keymaps/drashna/keymap.c
similarity index 100%
rename from keyboards/c39/keymaps/drashna/keymap.c
rename to keyboards/maple_computing/c39/keymaps/drashna/keymap.c
diff --git a/keyboards/c39/keymaps/drashna/readme.md b/keyboards/maple_computing/c39/keymaps/drashna/readme.md
similarity index 100%
rename from keyboards/c39/keymaps/drashna/readme.md
rename to keyboards/maple_computing/c39/keymaps/drashna/readme.md
diff --git a/keyboards/c39/keymaps/drashna/rules.mk b/keyboards/maple_computing/c39/keymaps/drashna/rules.mk
similarity index 100%
rename from keyboards/c39/keymaps/drashna/rules.mk
rename to keyboards/maple_computing/c39/keymaps/drashna/rules.mk
diff --git a/keyboards/c39/keymaps/kuchosauronad0/config.h b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
similarity index 100%
rename from keyboards/c39/keymaps/kuchosauronad0/config.h
rename to keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
diff --git a/keyboards/c39/keymaps/kuchosauronad0/keymap.c b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
similarity index 100%
rename from keyboards/c39/keymaps/kuchosauronad0/keymap.c
rename to keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
diff --git a/keyboards/c39/keymaps/kuchosauronad0/readme.md b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/readme.md
similarity index 100%
rename from keyboards/c39/keymaps/kuchosauronad0/readme.md
rename to keyboards/maple_computing/c39/keymaps/kuchosauronad0/readme.md
diff --git a/keyboards/c39/keymaps/kuchosauronad0/rules.mk b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/rules.mk
similarity index 100%
rename from keyboards/c39/keymaps/kuchosauronad0/rules.mk
rename to keyboards/maple_computing/c39/keymaps/kuchosauronad0/rules.mk
diff --git a/keyboards/c39/readme.md b/keyboards/maple_computing/c39/readme.md
similarity index 93%
rename from keyboards/c39/readme.md
rename to keyboards/maple_computing/c39/readme.md
index 0454f1c12b..c74294e300 100755
--- a/keyboards/c39/readme.md
+++ b/keyboards/maple_computing/c39/readme.md
@@ -11,6 +11,6 @@ Hardware Availability: [SpaceCat.design](https://spacecat.design)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make c39:default
+    make maple_computing/c39: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).
diff --git a/keyboards/c39/rules.mk b/keyboards/maple_computing/c39/rules.mk
similarity index 100%
rename from keyboards/c39/rules.mk
rename to keyboards/maple_computing/c39/rules.mk
diff --git a/keyboards/christmas_tree/.noci b/keyboards/maple_computing/christmas_tree/.noci
similarity index 100%
rename from keyboards/christmas_tree/.noci
rename to keyboards/maple_computing/christmas_tree/.noci
diff --git a/keyboards/christmas_tree/V2017/V2017.c b/keyboards/maple_computing/christmas_tree/V2017/V2017.c
similarity index 100%
rename from keyboards/christmas_tree/V2017/V2017.c
rename to keyboards/maple_computing/christmas_tree/V2017/V2017.c
diff --git a/keyboards/christmas_tree/V2017/V2017.h b/keyboards/maple_computing/christmas_tree/V2017/V2017.h
similarity index 100%
rename from keyboards/christmas_tree/V2017/V2017.h
rename to keyboards/maple_computing/christmas_tree/V2017/V2017.h
diff --git a/keyboards/christmas_tree/V2017/config.h b/keyboards/maple_computing/christmas_tree/V2017/config.h
similarity index 100%
rename from keyboards/christmas_tree/V2017/config.h
rename to keyboards/maple_computing/christmas_tree/V2017/config.h
diff --git a/keyboards/christmas_tree/V2017/rules.mk b/keyboards/maple_computing/christmas_tree/V2017/rules.mk
similarity index 100%
rename from keyboards/christmas_tree/V2017/rules.mk
rename to keyboards/maple_computing/christmas_tree/V2017/rules.mk
diff --git a/keyboards/christmas_tree/christmas_tree.c b/keyboards/maple_computing/christmas_tree/christmas_tree.c
similarity index 100%
rename from keyboards/christmas_tree/christmas_tree.c
rename to keyboards/maple_computing/christmas_tree/christmas_tree.c
diff --git a/keyboards/christmas_tree/christmas_tree.h b/keyboards/maple_computing/christmas_tree/christmas_tree.h
similarity index 100%
rename from keyboards/christmas_tree/christmas_tree.h
rename to keyboards/maple_computing/christmas_tree/christmas_tree.h
diff --git a/keyboards/christmas_tree/config.h b/keyboards/maple_computing/christmas_tree/config.h
similarity index 100%
rename from keyboards/christmas_tree/config.h
rename to keyboards/maple_computing/christmas_tree/config.h
diff --git a/keyboards/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json
similarity index 100%
rename from keyboards/christmas_tree/info.json
rename to keyboards/maple_computing/christmas_tree/info.json
diff --git a/keyboards/christmas_tree/keymaps/default/keymap.c b/keyboards/maple_computing/christmas_tree/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/christmas_tree/keymaps/default/keymap.c
rename to keyboards/maple_computing/christmas_tree/keymaps/default/keymap.c
diff --git a/keyboards/christmas_tree/keymaps/default/readme.md b/keyboards/maple_computing/christmas_tree/keymaps/default/readme.md
similarity index 100%
rename from keyboards/christmas_tree/keymaps/default/readme.md
rename to keyboards/maple_computing/christmas_tree/keymaps/default/readme.md
diff --git a/keyboards/christmas_tree/readme.md b/keyboards/maple_computing/christmas_tree/readme.md
similarity index 80%
rename from keyboards/christmas_tree/readme.md
rename to keyboards/maple_computing/christmas_tree/readme.md
index b3337dd5ba..3ba255a18c 100644
--- a/keyboards/christmas_tree/readme.md
+++ b/keyboards/maple_computing/christmas_tree/readme.md
@@ -9,6 +9,6 @@ Keyboard Maintainer: [That-Canadian](https://github.com/That-Canadian)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make christmas_tree/V2017:default
+    make maple_computing/christmas_tree/V2017:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
\ No newline at end of file
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/christmas_tree/rules.mk b/keyboards/maple_computing/christmas_tree/rules.mk
similarity index 92%
rename from keyboards/christmas_tree/rules.mk
rename to keyboards/maple_computing/christmas_tree/rules.mk
index dada70c309..45ac883163 100644
--- a/keyboards/christmas_tree/rules.mk
+++ b/keyboards/maple_computing/christmas_tree/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
-DEFAULT_FOLDER = christmas_tree/V2017
+DEFAULT_FOLDER = maple_computing/christmas_tree/V2017
diff --git a/keyboards/ivy/.noci b/keyboards/maple_computing/ivy/.noci
similarity index 100%
rename from keyboards/ivy/.noci
rename to keyboards/maple_computing/ivy/.noci
diff --git a/keyboards/ivy/config.h b/keyboards/maple_computing/ivy/config.h
similarity index 100%
rename from keyboards/ivy/config.h
rename to keyboards/maple_computing/ivy/config.h
diff --git a/keyboards/ivy/ivy.c b/keyboards/maple_computing/ivy/ivy.c
similarity index 100%
rename from keyboards/ivy/ivy.c
rename to keyboards/maple_computing/ivy/ivy.c
diff --git a/keyboards/ivy/ivy.h b/keyboards/maple_computing/ivy/ivy.h
similarity index 61%
rename from keyboards/ivy/ivy.h
rename to keyboards/maple_computing/ivy/ivy.h
index 2cba5f4956..645c5e0ef7 100644
--- a/keyboards/ivy/ivy.h
+++ b/keyboards/maple_computing/ivy/ivy.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef KEYBOARD_ivy_rev1
+#ifdef KEYBOARD_maple_computing_ivy_rev1
     #include "rev1.h"
 #endif
 
diff --git a/keyboards/ivy/keymaps/default/keymap.c b/keyboards/maple_computing/ivy/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ivy/keymaps/default/keymap.c
rename to keyboards/maple_computing/ivy/keymaps/default/keymap.c
diff --git a/keyboards/ivy/readme.md b/keyboards/maple_computing/ivy/readme.md
similarity index 82%
rename from keyboards/ivy/readme.md
rename to keyboards/maple_computing/ivy/readme.md
index f70630b52b..a3bc043b77 100644
--- a/keyboards/ivy/readme.md
+++ b/keyboards/maple_computing/ivy/readme.md
@@ -5,11 +5,11 @@ IVY
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ivy/rev1:default
+    make maple_computing/ivy/rev1:default
     
 Install examples:
 
-    make ivy/rev1:default:dfu
+    make maple_computing/ivy/rev1:default:dfu
 
 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).
diff --git a/keyboards/ivy/rev1/config.h b/keyboards/maple_computing/ivy/rev1/config.h
similarity index 100%
rename from keyboards/ivy/rev1/config.h
rename to keyboards/maple_computing/ivy/rev1/config.h
diff --git a/keyboards/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json
similarity index 100%
rename from keyboards/ivy/rev1/info.json
rename to keyboards/maple_computing/ivy/rev1/info.json
diff --git a/keyboards/ivy/rev1/rev1.c b/keyboards/maple_computing/ivy/rev1/rev1.c
similarity index 100%
rename from keyboards/ivy/rev1/rev1.c
rename to keyboards/maple_computing/ivy/rev1/rev1.c
diff --git a/keyboards/ivy/rev1/rev1.h b/keyboards/maple_computing/ivy/rev1/rev1.h
similarity index 100%
rename from keyboards/ivy/rev1/rev1.h
rename to keyboards/maple_computing/ivy/rev1/rev1.h
diff --git a/keyboards/ivy/rev1/rules.mk b/keyboards/maple_computing/ivy/rev1/rules.mk
similarity index 100%
rename from keyboards/ivy/rev1/rules.mk
rename to keyboards/maple_computing/ivy/rev1/rules.mk
diff --git a/keyboards/ivy/rules.mk b/keyboards/maple_computing/ivy/rules.mk
similarity index 100%
rename from keyboards/ivy/rules.mk
rename to keyboards/maple_computing/ivy/rules.mk
diff --git a/keyboards/jnao/config.h b/keyboards/maple_computing/jnao/config.h
similarity index 100%
rename from keyboards/jnao/config.h
rename to keyboards/maple_computing/jnao/config.h
diff --git a/keyboards/jnao/info.json b/keyboards/maple_computing/jnao/info.json
similarity index 100%
rename from keyboards/jnao/info.json
rename to keyboards/maple_computing/jnao/info.json
diff --git a/keyboards/jnao/jnao.c b/keyboards/maple_computing/jnao/jnao.c
similarity index 100%
rename from keyboards/jnao/jnao.c
rename to keyboards/maple_computing/jnao/jnao.c
diff --git a/keyboards/jnao/jnao.h b/keyboards/maple_computing/jnao/jnao.h
similarity index 100%
rename from keyboards/jnao/jnao.h
rename to keyboards/maple_computing/jnao/jnao.h
diff --git a/keyboards/jnao/keymaps/default/keymap.c b/keyboards/maple_computing/jnao/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/jnao/keymaps/default/keymap.c
rename to keyboards/maple_computing/jnao/keymaps/default/keymap.c
diff --git a/keyboards/jnao/keymaps/default_4x12/keymap.c b/keyboards/maple_computing/jnao/keymaps/default_4x12/keymap.c
similarity index 100%
rename from keyboards/jnao/keymaps/default_4x12/keymap.c
rename to keyboards/maple_computing/jnao/keymaps/default_4x12/keymap.c
diff --git a/keyboards/jnao/keymaps/via/keymap.c b/keyboards/maple_computing/jnao/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/jnao/keymaps/via/keymap.c
rename to keyboards/maple_computing/jnao/keymaps/via/keymap.c
diff --git a/keyboards/jnao/keymaps/via/rules.mk b/keyboards/maple_computing/jnao/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/jnao/keymaps/via/rules.mk
rename to keyboards/maple_computing/jnao/keymaps/via/rules.mk
diff --git a/keyboards/jnao/readme.md b/keyboards/maple_computing/jnao/readme.md
similarity index 94%
rename from keyboards/jnao/readme.md
rename to keyboards/maple_computing/jnao/readme.md
index 08cf10acaa..dd7b280a08 100644
--- a/keyboards/jnao/readme.md
+++ b/keyboards/maple_computing/jnao/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: [SpaceCat](https://spacecat.design) and [Keebio](https://
 
 Make example for this keyboard (after setting up your build environment):
 
-    make jnao:default
+    make maple_computing/jnao: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).
diff --git a/keyboards/jnao/rules.mk b/keyboards/maple_computing/jnao/rules.mk
similarity index 100%
rename from keyboards/jnao/rules.mk
rename to keyboards/maple_computing/jnao/rules.mk
diff --git a/keyboards/launchpad/.noci b/keyboards/maple_computing/launchpad/.noci
similarity index 100%
rename from keyboards/launchpad/.noci
rename to keyboards/maple_computing/launchpad/.noci
diff --git a/keyboards/launchpad/config.h b/keyboards/maple_computing/launchpad/config.h
similarity index 100%
rename from keyboards/launchpad/config.h
rename to keyboards/maple_computing/launchpad/config.h
diff --git a/keyboards/launchpad/keymaps/brandonschlack/config.h b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h
similarity index 100%
rename from keyboards/launchpad/keymaps/brandonschlack/config.h
rename to keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h
diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c
similarity index 100%
rename from keyboards/launchpad/keymaps/brandonschlack/keymap.c
rename to keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c
diff --git a/keyboards/launchpad/keymaps/brandonschlack/readme.md b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/readme.md
similarity index 100%
rename from keyboards/launchpad/keymaps/brandonschlack/readme.md
rename to keyboards/maple_computing/launchpad/keymaps/brandonschlack/readme.md
diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/rules.mk
similarity index 100%
rename from keyboards/launchpad/keymaps/brandonschlack/rules.mk
rename to keyboards/maple_computing/launchpad/keymaps/brandonschlack/rules.mk
diff --git a/keyboards/launchpad/keymaps/default/keymap.c b/keyboards/maple_computing/launchpad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/launchpad/keymaps/default/keymap.c
rename to keyboards/maple_computing/launchpad/keymaps/default/keymap.c
diff --git a/keyboards/launchpad/keymaps/default_rgb/config.h b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
similarity index 100%
rename from keyboards/launchpad/keymaps/default_rgb/config.h
rename to keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
diff --git a/keyboards/launchpad/keymaps/default_rgb/keymap.c b/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c
similarity index 100%
rename from keyboards/launchpad/keymaps/default_rgb/keymap.c
rename to keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c
diff --git a/keyboards/launchpad/keymaps/default_rgb/readme.md b/keyboards/maple_computing/launchpad/keymaps/default_rgb/readme.md
similarity index 100%
rename from keyboards/launchpad/keymaps/default_rgb/readme.md
rename to keyboards/maple_computing/launchpad/keymaps/default_rgb/readme.md
diff --git a/keyboards/launchpad/keymaps/default_rgb/rules.mk b/keyboards/maple_computing/launchpad/keymaps/default_rgb/rules.mk
similarity index 100%
rename from keyboards/launchpad/keymaps/default_rgb/rules.mk
rename to keyboards/maple_computing/launchpad/keymaps/default_rgb/rules.mk
diff --git a/keyboards/launchpad/keymaps/drashna/config.h b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
similarity index 100%
rename from keyboards/launchpad/keymaps/drashna/config.h
rename to keyboards/maple_computing/launchpad/keymaps/drashna/config.h
diff --git a/keyboards/launchpad/keymaps/drashna/keymap.c b/keyboards/maple_computing/launchpad/keymaps/drashna/keymap.c
similarity index 100%
rename from keyboards/launchpad/keymaps/drashna/keymap.c
rename to keyboards/maple_computing/launchpad/keymaps/drashna/keymap.c
diff --git a/keyboards/launchpad/keymaps/drashna/rules.mk b/keyboards/maple_computing/launchpad/keymaps/drashna/rules.mk
similarity index 100%
rename from keyboards/launchpad/keymaps/drashna/rules.mk
rename to keyboards/maple_computing/launchpad/keymaps/drashna/rules.mk
diff --git a/keyboards/launchpad/keymaps/via/keymap.c b/keyboards/maple_computing/launchpad/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/launchpad/keymaps/via/keymap.c
rename to keyboards/maple_computing/launchpad/keymaps/via/keymap.c
diff --git a/keyboards/launchpad/keymaps/via/rules.mk b/keyboards/maple_computing/launchpad/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/launchpad/keymaps/via/rules.mk
rename to keyboards/maple_computing/launchpad/keymaps/via/rules.mk
diff --git a/keyboards/launchpad/launchpad.c b/keyboards/maple_computing/launchpad/launchpad.c
similarity index 100%
rename from keyboards/launchpad/launchpad.c
rename to keyboards/maple_computing/launchpad/launchpad.c
diff --git a/keyboards/launchpad/launchpad.h b/keyboards/maple_computing/launchpad/launchpad.h
similarity index 55%
rename from keyboards/launchpad/launchpad.h
rename to keyboards/maple_computing/launchpad/launchpad.h
index 59cf64afec..f2a1b40588 100644
--- a/keyboards/launchpad/launchpad.h
+++ b/keyboards/maple_computing/launchpad/launchpad.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(KEYBOARD_launchpad_rev1)
+#if defined(KEYBOARD_maple_computing_launchpad_rev1)
 #    include "rev1.h"
 #endif
 
diff --git a/keyboards/launchpad/readme.md b/keyboards/maple_computing/launchpad/readme.md
similarity index 94%
rename from keyboards/launchpad/readme.md
rename to keyboards/maple_computing/launchpad/readme.md
index 8128121946..1dc7a9b4cf 100644
--- a/keyboards/launchpad/readme.md
+++ b/keyboards/maple_computing/launchpad/readme.md
@@ -21,7 +21,7 @@ A fantastic project for beginners to learn to solder, veteran's of the hobby who
 
 Make example for this keyboard (after setting up your build environment):
 
-    make launchpad/rev1:default
+    make maple_computing/launchpad/rev1:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
@@ -29,4 +29,4 @@ See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools)
 
 Due to PCB tolerance issues outside of our control, the snap-apart legs included on the PCB may need extra padding to prevent a small amount of wobbling once placed properly. We have included small, clear, and semi-permanent "glue dots" in each order (PCB Only -and- Full Kit) to help with this. You may also use plastic wrap, tape, Elmer's glue, hot glue, rubber cement, etc. We advise against using anything more "permanent" in case you wish to make changes to your Launch Pad in the future. It is also best to attach legs after all of your soldering and building is finished, to get the most accurate feel for your Launch Pad.
 
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
\ No newline at end of file
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/keyboards/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h
similarity index 100%
rename from keyboards/launchpad/rev1/config.h
rename to keyboards/maple_computing/launchpad/rev1/config.h
diff --git a/keyboards/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json
similarity index 100%
rename from keyboards/launchpad/rev1/info.json
rename to keyboards/maple_computing/launchpad/rev1/info.json
diff --git a/keyboards/launchpad/rev1/rev1.c b/keyboards/maple_computing/launchpad/rev1/rev1.c
similarity index 100%
rename from keyboards/launchpad/rev1/rev1.c
rename to keyboards/maple_computing/launchpad/rev1/rev1.c
diff --git a/keyboards/launchpad/rev1/rev1.h b/keyboards/maple_computing/launchpad/rev1/rev1.h
similarity index 100%
rename from keyboards/launchpad/rev1/rev1.h
rename to keyboards/maple_computing/launchpad/rev1/rev1.h
diff --git a/keyboards/launchpad/rev1/rules.mk b/keyboards/maple_computing/launchpad/rev1/rules.mk
similarity index 100%
rename from keyboards/launchpad/rev1/rules.mk
rename to keyboards/maple_computing/launchpad/rev1/rules.mk
diff --git a/keyboards/launchpad/rules.mk b/keyboards/maple_computing/launchpad/rules.mk
similarity index 92%
rename from keyboards/launchpad/rules.mk
rename to keyboards/maple_computing/launchpad/rules.mk
index 3bfec56432..67e76c6244 100644
--- a/keyboards/launchpad/rules.mk
+++ b/keyboards/maple_computing/launchpad/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
-DEFAULT_FOLDER = launchpad/rev1
+DEFAULT_FOLDER = maple_computing/launchpad/rev1
diff --git a/keyboards/lets_split_eh/.noci b/keyboards/maple_computing/lets_split_eh/.noci
similarity index 100%
rename from keyboards/lets_split_eh/.noci
rename to keyboards/maple_computing/lets_split_eh/.noci
diff --git a/keyboards/lets_split_eh/config.h b/keyboards/maple_computing/lets_split_eh/config.h
similarity index 100%
rename from keyboards/lets_split_eh/config.h
rename to keyboards/maple_computing/lets_split_eh/config.h
diff --git a/keyboards/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h
similarity index 100%
rename from keyboards/lets_split_eh/eh/config.h
rename to keyboards/maple_computing/lets_split_eh/eh/config.h
diff --git a/keyboards/lets_split_eh/eh/eh.c b/keyboards/maple_computing/lets_split_eh/eh/eh.c
similarity index 100%
rename from keyboards/lets_split_eh/eh/eh.c
rename to keyboards/maple_computing/lets_split_eh/eh/eh.c
diff --git a/keyboards/lets_split_eh/eh/eh.h b/keyboards/maple_computing/lets_split_eh/eh/eh.h
similarity index 100%
rename from keyboards/lets_split_eh/eh/eh.h
rename to keyboards/maple_computing/lets_split_eh/eh/eh.h
diff --git a/keyboards/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json
similarity index 100%
rename from keyboards/lets_split_eh/eh/info.json
rename to keyboards/maple_computing/lets_split_eh/eh/info.json
diff --git a/keyboards/lets_split_eh/eh/rules.mk b/keyboards/maple_computing/lets_split_eh/eh/rules.mk
similarity index 100%
rename from keyboards/lets_split_eh/eh/rules.mk
rename to keyboards/maple_computing/lets_split_eh/eh/rules.mk
diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/README.md b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/README.md
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/bbaserdem/README.md
rename to keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/README.md
diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/config.h
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/bbaserdem/config.h
rename to keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/config.h
diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/keymap.c
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/bbaserdem/keymap.c
rename to keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/rules.mk
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk
rename to keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/rules.mk
diff --git a/keyboards/lets_split_eh/keymaps/default/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/default/keymap.c
rename to keyboards/maple_computing/lets_split_eh/keymaps/default/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/doxish_dvorak/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/config.h
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/doxish_dvorak/config.h
rename to keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/config.h
diff --git a/keyboards/lets_split_eh/keymaps/doxish_dvorak/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/doxish_dvorak/keymap.c
rename to keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/doxish_dvorak/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/doxish_dvorak/rules.mk
rename to keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk
diff --git a/keyboards/lets_split_eh/keymaps/mikethetiger/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/config.h
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/mikethetiger/config.h
rename to keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/config.h
diff --git a/keyboards/lets_split_eh/keymaps/mikethetiger/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/keymap.c
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/mikethetiger/keymap.c
rename to keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/mikethetiger/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/mikethetiger/rules.mk
rename to keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk
diff --git a/keyboards/lets_split_eh/keymaps/msiu/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/msiu/config.h
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/msiu/config.h
rename to keyboards/maple_computing/lets_split_eh/keymaps/msiu/config.h
diff --git a/keyboards/lets_split_eh/keymaps/msiu/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/msiu/keymap.c
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/msiu/keymap.c
rename to keyboards/maple_computing/lets_split_eh/keymaps/msiu/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/resfury/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/config.h
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/resfury/config.h
rename to keyboards/maple_computing/lets_split_eh/keymaps/resfury/config.h
diff --git a/keyboards/lets_split_eh/keymaps/resfury/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/resfury/keymap.c
rename to keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/resfury/readme.md b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/readme.md
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/resfury/readme.md
rename to keyboards/maple_computing/lets_split_eh/keymaps/resfury/readme.md
diff --git a/keyboards/lets_split_eh/keymaps/resfury/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/rules.mk
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/resfury/rules.mk
rename to keyboards/maple_computing/lets_split_eh/keymaps/resfury/rules.mk
diff --git a/keyboards/lets_split_eh/keymaps/romus/README.md b/keyboards/maple_computing/lets_split_eh/keymaps/romus/README.md
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/romus/README.md
rename to keyboards/maple_computing/lets_split_eh/keymaps/romus/README.md
diff --git a/keyboards/lets_split_eh/keymaps/romus/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/romus/keymap.c
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/romus/keymap.c
rename to keyboards/maple_computing/lets_split_eh/keymaps/romus/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/romus/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/romus/rules.mk
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/romus/rules.mk
rename to keyboards/maple_computing/lets_split_eh/keymaps/romus/rules.mk
diff --git a/keyboards/lets_split_eh/keymaps/that_canadian/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/config.h
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/that_canadian/config.h
rename to keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/config.h
diff --git a/keyboards/lets_split_eh/keymaps/that_canadian/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/keymap.c
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/that_canadian/keymap.c
rename to keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/that_canadian/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk
similarity index 100%
rename from keyboards/lets_split_eh/keymaps/that_canadian/rules.mk
rename to keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk
diff --git a/keyboards/lets_split_eh/lets_split_eh.c b/keyboards/maple_computing/lets_split_eh/lets_split_eh.c
similarity index 100%
rename from keyboards/lets_split_eh/lets_split_eh.c
rename to keyboards/maple_computing/lets_split_eh/lets_split_eh.c
diff --git a/keyboards/lets_split_eh/lets_split_eh.h b/keyboards/maple_computing/lets_split_eh/lets_split_eh.h
similarity index 56%
rename from keyboards/lets_split_eh/lets_split_eh.h
rename to keyboards/maple_computing/lets_split_eh/lets_split_eh.h
index aa1f213b20..aae072e0b6 100644
--- a/keyboards/lets_split_eh/lets_split_eh.h
+++ b/keyboards/maple_computing/lets_split_eh/lets_split_eh.h
@@ -2,6 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_lets_split_eh_eh
+#ifdef KEYBOARD_maple_computing_lets_split_eh_eh
     #include "eh.h"
 #endif
diff --git a/keyboards/lets_split_eh/readme.md b/keyboards/maple_computing/lets_split_eh/readme.md
similarity index 85%
rename from keyboards/lets_split_eh/readme.md
rename to keyboards/maple_computing/lets_split_eh/readme.md
index 180cb33d73..90ae5393d1 100644
--- a/keyboards/lets_split_eh/readme.md
+++ b/keyboards/maple_computing/lets_split_eh/readme.md
@@ -8,6 +8,6 @@ Keyboard Maintainer: [Christopher Poole (That-Canadian)](https://github.com/That
 
 Make example for this keyboard (after setting up your build environment):
 
-    make lets_split_eh/eh:default
+    make maple_computing/lets_split_eh/eh:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
\ No newline at end of file
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/lets_split_eh/rules.mk b/keyboards/maple_computing/lets_split_eh/rules.mk
similarity index 92%
rename from keyboards/lets_split_eh/rules.mk
rename to keyboards/maple_computing/lets_split_eh/rules.mk
index 9662dfc60e..325d4e278c 100644
--- a/keyboards/lets_split_eh/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/rules.mk
@@ -21,4 +21,4 @@ SPLIT_KEYBOARD = yes
 
 LAYOUTS = ortho_4x12
 
-DEFAULT_FOLDER = lets_split_eh/eh
+DEFAULT_FOLDER = maple_computing/lets_split_eh/eh
diff --git a/keyboards/minidox/.noci b/keyboards/maple_computing/minidox/.noci
similarity index 100%
rename from keyboards/minidox/.noci
rename to keyboards/maple_computing/minidox/.noci
diff --git a/keyboards/minidox/config.h b/keyboards/maple_computing/minidox/config.h
similarity index 100%
rename from keyboards/minidox/config.h
rename to keyboards/maple_computing/minidox/config.h
diff --git a/keyboards/minidox/keymaps/alairock/config.h b/keyboards/maple_computing/minidox/keymaps/alairock/config.h
similarity index 100%
rename from keyboards/minidox/keymaps/alairock/config.h
rename to keyboards/maple_computing/minidox/keymaps/alairock/config.h
diff --git a/keyboards/minidox/keymaps/alairock/keymap.c b/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
similarity index 100%
rename from keyboards/minidox/keymaps/alairock/keymap.c
rename to keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
diff --git a/keyboards/minidox/keymaps/alairock/rules.mk b/keyboards/maple_computing/minidox/keymaps/alairock/rules.mk
similarity index 100%
rename from keyboards/minidox/keymaps/alairock/rules.mk
rename to keyboards/maple_computing/minidox/keymaps/alairock/rules.mk
diff --git a/keyboards/minidox/keymaps/bepo/config.h b/keyboards/maple_computing/minidox/keymaps/bepo/config.h
similarity index 100%
rename from keyboards/minidox/keymaps/bepo/config.h
rename to keyboards/maple_computing/minidox/keymaps/bepo/config.h
diff --git a/keyboards/minidox/keymaps/bepo/keymap.c b/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
similarity index 100%
rename from keyboards/minidox/keymaps/bepo/keymap.c
rename to keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
diff --git a/keyboards/minidox/keymaps/bepo/readme.md b/keyboards/maple_computing/minidox/keymaps/bepo/readme.md
similarity index 100%
rename from keyboards/minidox/keymaps/bepo/readme.md
rename to keyboards/maple_computing/minidox/keymaps/bepo/readme.md
diff --git a/keyboards/minidox/keymaps/default/keymap.c b/keyboards/maple_computing/minidox/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/minidox/keymaps/default/keymap.c
rename to keyboards/maple_computing/minidox/keymaps/default/keymap.c
diff --git a/keyboards/minidox/keymaps/dustypomerleau/README.md b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/README.md
similarity index 100%
rename from keyboards/minidox/keymaps/dustypomerleau/README.md
rename to keyboards/maple_computing/minidox/keymaps/dustypomerleau/README.md
diff --git a/keyboards/minidox/keymaps/dustypomerleau/config.h b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
similarity index 100%
rename from keyboards/minidox/keymaps/dustypomerleau/config.h
rename to keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
diff --git a/keyboards/minidox/keymaps/dustypomerleau/keymap.c b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
similarity index 100%
rename from keyboards/minidox/keymaps/dustypomerleau/keymap.c
rename to keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
diff --git a/keyboards/minidox/keymaps/dustypomerleau/rules.mk b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/rules.mk
similarity index 100%
rename from keyboards/minidox/keymaps/dustypomerleau/rules.mk
rename to keyboards/maple_computing/minidox/keymaps/dustypomerleau/rules.mk
diff --git a/keyboards/minidox/keymaps/haegin/keymap.c b/keyboards/maple_computing/minidox/keymaps/haegin/keymap.c
similarity index 100%
rename from keyboards/minidox/keymaps/haegin/keymap.c
rename to keyboards/maple_computing/minidox/keymaps/haegin/keymap.c
diff --git a/keyboards/minidox/keymaps/khitsule/config.h b/keyboards/maple_computing/minidox/keymaps/khitsule/config.h
similarity index 100%
rename from keyboards/minidox/keymaps/khitsule/config.h
rename to keyboards/maple_computing/minidox/keymaps/khitsule/config.h
diff --git a/keyboards/minidox/keymaps/khitsule/keymap.c b/keyboards/maple_computing/minidox/keymaps/khitsule/keymap.c
similarity index 100%
rename from keyboards/minidox/keymaps/khitsule/keymap.c
rename to keyboards/maple_computing/minidox/keymaps/khitsule/keymap.c
diff --git a/keyboards/minidox/keymaps/khitsule/readme.md b/keyboards/maple_computing/minidox/keymaps/khitsule/readme.md
similarity index 100%
rename from keyboards/minidox/keymaps/khitsule/readme.md
rename to keyboards/maple_computing/minidox/keymaps/khitsule/readme.md
diff --git a/keyboards/minidox/keymaps/norman/config.h b/keyboards/maple_computing/minidox/keymaps/norman/config.h
similarity index 100%
rename from keyboards/minidox/keymaps/norman/config.h
rename to keyboards/maple_computing/minidox/keymaps/norman/config.h
diff --git a/keyboards/minidox/keymaps/norman/keymap.c b/keyboards/maple_computing/minidox/keymaps/norman/keymap.c
similarity index 100%
rename from keyboards/minidox/keymaps/norman/keymap.c
rename to keyboards/maple_computing/minidox/keymaps/norman/keymap.c
diff --git a/keyboards/minidox/keymaps/norman/readme.md b/keyboards/maple_computing/minidox/keymaps/norman/readme.md
similarity index 100%
rename from keyboards/minidox/keymaps/norman/readme.md
rename to keyboards/maple_computing/minidox/keymaps/norman/readme.md
diff --git a/keyboards/minidox/keymaps/rsthd_combos/config.h b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
similarity index 100%
rename from keyboards/minidox/keymaps/rsthd_combos/config.h
rename to keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
diff --git a/keyboards/minidox/keymaps/rsthd_combos/keymap.c b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
similarity index 100%
rename from keyboards/minidox/keymaps/rsthd_combos/keymap.c
rename to keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
diff --git a/keyboards/minidox/keymaps/rsthd_combos/readme.md b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/readme.md
similarity index 100%
rename from keyboards/minidox/keymaps/rsthd_combos/readme.md
rename to keyboards/maple_computing/minidox/keymaps/rsthd_combos/readme.md
diff --git a/keyboards/minidox/keymaps/rsthd_combos/rules.mk b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/rules.mk
similarity index 100%
rename from keyboards/minidox/keymaps/rsthd_combos/rules.mk
rename to keyboards/maple_computing/minidox/keymaps/rsthd_combos/rules.mk
diff --git a/keyboards/minidox/keymaps/that_canadian/config.h b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
similarity index 100%
rename from keyboards/minidox/keymaps/that_canadian/config.h
rename to keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
diff --git a/keyboards/minidox/keymaps/that_canadian/keymap.c b/keyboards/maple_computing/minidox/keymaps/that_canadian/keymap.c
similarity index 100%
rename from keyboards/minidox/keymaps/that_canadian/keymap.c
rename to keyboards/maple_computing/minidox/keymaps/that_canadian/keymap.c
diff --git a/keyboards/minidox/keymaps/that_canadian/rules.mk b/keyboards/maple_computing/minidox/keymaps/that_canadian/rules.mk
similarity index 100%
rename from keyboards/minidox/keymaps/that_canadian/rules.mk
rename to keyboards/maple_computing/minidox/keymaps/that_canadian/rules.mk
diff --git a/keyboards/minidox/keymaps/tomb0y/README.md b/keyboards/maple_computing/minidox/keymaps/tomb0y/README.md
similarity index 100%
rename from keyboards/minidox/keymaps/tomb0y/README.md
rename to keyboards/maple_computing/minidox/keymaps/tomb0y/README.md
diff --git a/keyboards/minidox/keymaps/tomb0y/keymap.c b/keyboards/maple_computing/minidox/keymaps/tomb0y/keymap.c
similarity index 100%
rename from keyboards/minidox/keymaps/tomb0y/keymap.c
rename to keyboards/maple_computing/minidox/keymaps/tomb0y/keymap.c
diff --git a/keyboards/minidox/keymaps/tw1t611/keymap.c b/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
similarity index 100%
rename from keyboards/minidox/keymaps/tw1t611/keymap.c
rename to keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
diff --git a/keyboards/minidox/keymaps/tw1t611/readme.md b/keyboards/maple_computing/minidox/keymaps/tw1t611/readme.md
similarity index 100%
rename from keyboards/minidox/keymaps/tw1t611/readme.md
rename to keyboards/maple_computing/minidox/keymaps/tw1t611/readme.md
diff --git a/keyboards/minidox/keymaps/tw1t611/rules.mk b/keyboards/maple_computing/minidox/keymaps/tw1t611/rules.mk
similarity index 100%
rename from keyboards/minidox/keymaps/tw1t611/rules.mk
rename to keyboards/maple_computing/minidox/keymaps/tw1t611/rules.mk
diff --git a/keyboards/minidox/keymaps/xyverz/config.h b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
similarity index 100%
rename from keyboards/minidox/keymaps/xyverz/config.h
rename to keyboards/maple_computing/minidox/keymaps/xyverz/config.h
diff --git a/keyboards/minidox/keymaps/xyverz/keymap.c b/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
similarity index 100%
rename from keyboards/minidox/keymaps/xyverz/keymap.c
rename to keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
diff --git a/keyboards/minidox/keymaps/xyverz/rules.mk b/keyboards/maple_computing/minidox/keymaps/xyverz/rules.mk
similarity index 100%
rename from keyboards/minidox/keymaps/xyverz/rules.mk
rename to keyboards/maple_computing/minidox/keymaps/xyverz/rules.mk
diff --git a/keyboards/minidox/minidox.c b/keyboards/maple_computing/minidox/minidox.c
similarity index 100%
rename from keyboards/minidox/minidox.c
rename to keyboards/maple_computing/minidox/minidox.c
diff --git a/keyboards/minidox/minidox.h b/keyboards/maple_computing/minidox/minidox.h
similarity index 59%
rename from keyboards/minidox/minidox.h
rename to keyboards/maple_computing/minidox/minidox.h
index 5d5ca9f501..bae36b5560 100644
--- a/keyboards/minidox/minidox.h
+++ b/keyboards/maple_computing/minidox/minidox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef KEYBOARD_minidox_rev1
+#ifdef KEYBOARD_maple_computing_minidox_rev1
     #include "rev1.h"
 #endif
 
diff --git a/keyboards/minidox/readme.md b/keyboards/maple_computing/minidox/readme.md
similarity index 92%
rename from keyboards/minidox/readme.md
rename to keyboards/maple_computing/minidox/readme.md
index ec52e1f757..934985348c 100644
--- a/keyboards/minidox/readme.md
+++ b/keyboards/maple_computing/minidox/readme.md
@@ -9,11 +9,11 @@ A compact version of the ErgoDox
 
 Make example for this keyboard (after setting up your build environment):
 
-    make minidox/rev1:default
+    make maple_computing/minidox/rev1:default
 
 Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):
 
-    make minidox/rev1:default:flash
+    make maple_computing/minidox/rev1:default:flash
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/minidox/rev1/config.h b/keyboards/maple_computing/minidox/rev1/config.h
similarity index 100%
rename from keyboards/minidox/rev1/config.h
rename to keyboards/maple_computing/minidox/rev1/config.h
diff --git a/keyboards/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json
similarity index 100%
rename from keyboards/minidox/rev1/info.json
rename to keyboards/maple_computing/minidox/rev1/info.json
diff --git a/keyboards/minidox/rev1/rev1.c b/keyboards/maple_computing/minidox/rev1/rev1.c
similarity index 100%
rename from keyboards/minidox/rev1/rev1.c
rename to keyboards/maple_computing/minidox/rev1/rev1.c
diff --git a/keyboards/minidox/rev1/rev1.h b/keyboards/maple_computing/minidox/rev1/rev1.h
similarity index 100%
rename from keyboards/minidox/rev1/rev1.h
rename to keyboards/maple_computing/minidox/rev1/rev1.h
diff --git a/keyboards/minidox/rev1/rules.mk b/keyboards/maple_computing/minidox/rev1/rules.mk
similarity index 100%
rename from keyboards/minidox/rev1/rules.mk
rename to keyboards/maple_computing/minidox/rev1/rules.mk
diff --git a/keyboards/minidox/rules.mk b/keyboards/maple_computing/minidox/rules.mk
similarity index 93%
rename from keyboards/minidox/rules.mk
rename to keyboards/maple_computing/minidox/rules.mk
index 69d7bcced4..175ed0f6be 100644
--- a/keyboards/minidox/rules.mk
+++ b/keyboards/maple_computing/minidox/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = minidox/rev1
+DEFAULT_FOLDER = maple_computing/minidox/rev1
diff --git a/keyboards/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h
similarity index 100%
rename from keyboards/the_ruler/config.h
rename to keyboards/maple_computing/the_ruler/config.h
diff --git a/keyboards/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json
similarity index 100%
rename from keyboards/the_ruler/info.json
rename to keyboards/maple_computing/the_ruler/info.json
diff --git a/keyboards/the_ruler/keymaps/default/keymap.c b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/the_ruler/keymaps/default/keymap.c
rename to keyboards/maple_computing/the_ruler/keymaps/default/keymap.c
diff --git a/keyboards/the_ruler/keymaps/default/readme.md b/keyboards/maple_computing/the_ruler/keymaps/default/readme.md
similarity index 100%
rename from keyboards/the_ruler/keymaps/default/readme.md
rename to keyboards/maple_computing/the_ruler/keymaps/default/readme.md
diff --git a/keyboards/the_ruler/readme.md b/keyboards/maple_computing/the_ruler/readme.md
similarity index 93%
rename from keyboards/the_ruler/readme.md
rename to keyboards/maple_computing/the_ruler/readme.md
index 13ea61c9a7..ff958db029 100644
--- a/keyboards/the_ruler/readme.md
+++ b/keyboards/maple_computing/the_ruler/readme.md
@@ -8,6 +8,6 @@ Hardware Availability: [Bishop Keyboards](https://bishopkeyboards.com/product/pc
 
 Make example for this keyboard (after setting up your build environment):
 
-    make the_ruler:default
+    make maple_computing/the_ruler: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).
diff --git a/keyboards/the_ruler/rules.mk b/keyboards/maple_computing/the_ruler/rules.mk
similarity index 100%
rename from keyboards/the_ruler/rules.mk
rename to keyboards/maple_computing/the_ruler/rules.mk
diff --git a/keyboards/the_ruler/the_ruler.c b/keyboards/maple_computing/the_ruler/the_ruler.c
similarity index 100%
rename from keyboards/the_ruler/the_ruler.c
rename to keyboards/maple_computing/the_ruler/the_ruler.c
diff --git a/keyboards/the_ruler/the_ruler.h b/keyboards/maple_computing/the_ruler/the_ruler.h
similarity index 100%
rename from keyboards/the_ruler/the_ruler.h
rename to keyboards/maple_computing/the_ruler/the_ruler.h

From 3555ee0555c8a9ff8aea2a101ae02a72b0e76076 Mon Sep 17 00:00:00 2001
From: Wolf Van Herreweghe <wolfvanh@gmail.com>
Date: Sun, 30 Jan 2022 20:28:53 +0100
Subject: [PATCH 443/867] [Keyboard] Add the FAve 87H (#15965)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
---
 keyboards/linworks/fave87h/config.h           | 103 ++++++++++++++++++
 keyboards/linworks/fave87h/fave87h.c          |  51 +++++++++
 keyboards/linworks/fave87h/fave87h.h          |  34 ++++++
 keyboards/linworks/fave87h/info.json          |  10 ++
 .../linworks/fave87h/keymaps/default/keymap.c |  49 +++++++++
 .../linworks/fave87h/keymaps/via/keymap.c     |  68 ++++++++++++
 .../linworks/fave87h/keymaps/via/rules.mk     |   1 +
 keyboards/linworks/fave87h/readme.md          |  22 ++++
 keyboards/linworks/fave87h/rules.mk           |  23 ++++
 9 files changed, 361 insertions(+)
 create mode 100644 keyboards/linworks/fave87h/config.h
 create mode 100644 keyboards/linworks/fave87h/fave87h.c
 create mode 100644 keyboards/linworks/fave87h/fave87h.h
 create mode 100644 keyboards/linworks/fave87h/info.json
 create mode 100644 keyboards/linworks/fave87h/keymaps/default/keymap.c
 create mode 100644 keyboards/linworks/fave87h/keymaps/via/keymap.c
 create mode 100644 keyboards/linworks/fave87h/keymaps/via/rules.mk
 create mode 100644 keyboards/linworks/fave87h/readme.md
 create mode 100644 keyboards/linworks/fave87h/rules.mk

diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
new file mode 100644
index 0000000000..64f6fc4cba
--- /dev/null
+++ b/keyboards/linworks/fave87h/config.h
@@ -0,0 +1,103 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+
+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    0x4C58 //"LX"
+#define PRODUCT_ID   0x0003 // FAve 87H
+#define DEVICE_VER   0x0001 // Version 1
+#define MANUFACTURER    Lx3
+#define PRODUCT         FAve 87H
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+// Checked with Eagle Schematic
+#define MATRIX_ROW_PINS { B1, B2, B3, D3, D1, D0  }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, B0, B7, E6}
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+//Led configuration
+#define RGB_DI_PIN D2
+
+#define DRIVER_LED_TOTAL 127
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 140
+
+#define RGB_MATRIX_KEYPRESSES
+//#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#ifdef RGB_MATRIX_FRAMEBUFFER_EFFECTS
+    #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+    #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#endif
+#ifdef RGB_MATRIX_KEYPRESSES
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+    #define ENABLE_RGB_MATRIX_SPLASH
+    #define ENABLE_RGB_MATRIX_MULTISPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
+
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/linworks/fave87h/fave87h.c b/keyboards/linworks/fave87h/fave87h.c
new file mode 100644
index 0000000000..3bf2739f0b
--- /dev/null
+++ b/keyboards/linworks/fave87h/fave87h.c
@@ -0,0 +1,51 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+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 "fave87h.h"
+
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        { 47, NO_LED, 48,     49,     50, 51,     52,     53,     54, 55, 56,     57,     58,     59,     60,     61,     62 },
+        { 46,     45, 44,     43,     42, 41,     40,     39,     38, 37, 36,     35,     34,     33,     32,     31,     30 },
+        { 13,     14, 15,     16,     17, 18,     19,     20,     21, 22, 23,     24,     25,     26,     27,     28,     29 },
+        { 12,     11, 10,      9,      8,  7,      6,      5,      4,  3,  2,      1, NO_LED,      0, NO_LED, NO_LED, NO_LED },
+        { 74,     75, 76,     77,     78, 79,     80,     81,     82, 83, 84, NO_LED,     85, NO_LED, NO_LED,     86, NO_LED },
+        { 73,     72, 71, NO_LED, NO_LED, 70, NO_LED, NO_LED, NO_LED, 69, 68, NO_LED,     67,     66,     65,     64,     63 },
+    }, {
+        // LED Index to Physical Position
+        {190, 40},  {167, 40},  {153, 40},  {139, 40},  {125, 40},  {111, 40},  {97, 40},   {83, 40},   {69, 40},   {55, 40}, 
+        {40, 40},   {26, 40},   {0, 41},    {5, 27},    {23, 27},   {37, 27},   {51, 27},   {65, 27},   {79, 27},   {93, 27}, 
+        {107, 27},  {121, 27},  {135, 27},  {149, 27},  {163, 27},  {177, 27},  {195, 27},  {216, 27},  {230, 27},  {244, 27}, 
+        {244, 15},  {230, 15},  {216, 15},  {191, 17},  {170, 15},  {156, 15},  {142, 15},  {128, 15},  {114, 15},  {100, 15}, 
+        {86, 15},   {72, 15},   {58, 15},   {44, 15},   {30, 15},   {16, 15},   {2, 15},    {2, 0},     {30, 0},    {44, 0}, 
+        {58, 0},    {72, 0},    {93, 0},    {107, 0},   {121, 0},   {135, 0},   {156, 0},   {170, 0},   {184, 0},   {198, 0}, 
+        {216, 0},   {230, 0},   {244, 0},   {244, 64},  {230, 64},  {216, 64},  {197, 64},  {179, 64},  {162, 64},  {144, 64}, 
+        {91, 64},   {39, 64},   {21, 64},   {4, 64},    {11, 52},   {33, 52},   {47, 52},   {62, 52},   {76, 52},   {90, 52}, 
+        {104, 52},  {118, 52},  {132, 52},  {146, 52},  {160, 52},  {186, 52},  {230, 52}
+    }, {
+        // LED Index to Flag
+        1,    4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 1, 1, 1, 
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 
+        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,       4,
+        1, 1, 1,       4,          1, 1,    1, 1, 1, 1, 1,
+
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+    }
+};
+#endif
diff --git a/keyboards/linworks/fave87h/fave87h.h b/keyboards/linworks/fave87h/fave87h.h
new file mode 100644
index 0000000000..748dae3ebc
--- /dev/null
+++ b/keyboards/linworks/fave87h/fave87h.h
@@ -0,0 +1,34 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+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"
+
+/* FAve 87H Keymap Definitions */
+#define LAYOUT( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,  K0E, K0F, K0G, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,  K1E, K1F, K1G, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,  K2E, K2F, K2G, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                 \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A,      K4C,            K4F,      \
+    K50, K51, K52,           K55,                K59, K5A,      K5C, K5D,  K5E, K5F, K5G  \
+) { \
+    { K00, KC_NO, K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C, K0D,   K0E,   K0F,   K0G   }, \
+    { K10, K11,   K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C, K1D,   K1E,   K1F,   K1G   }, \
+    { K20, K21,   K22, K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   K2C, K2D,   K2E,   K2F,   K2G   }, \
+    { K30, K31,   K32, K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, K3B,   K3C, K3D,   KC_NO, KC_NO, KC_NO }, \
+    { K40, K41,   K42, K43,   K44,   K45, K46,   K47,   K48,   K49, K4A, KC_NO, K4C, KC_NO, KC_NO, K4F,   KC_NO }, \
+    { K50, K51,   K52, KC_NO, KC_NO, K55, KC_NO, KC_NO, KC_NO, K59, K5A, KC_NO, K5C, K5D,   K5E,   K5F,   K5G   }  \
+}
diff --git a/keyboards/linworks/fave87h/info.json b/keyboards/linworks/fave87h/info.json
new file mode 100644
index 0000000000..ac82fa4d8a
--- /dev/null
+++ b/keyboards/linworks/fave87h/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Lx3 FAve 87H",
+    "url": "",
+    "maintainer": "ToastyStoemp",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Delete", "x":14, "y":1.25}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Fn", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}]
+        }
+    }
+}
diff --git a/keyboards/linworks/fave87h/keymaps/default/keymap.c b/keyboards/linworks/fave87h/keymaps/default/keymap.c
new file mode 100644
index 0000000000..661c48f452
--- /dev/null
+++ b/keyboards/linworks/fave87h/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+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 layers {
+    _LAYER0,
+    _LAYER1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,  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, KC_RGUI,          MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,        
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_AUDIO_VOL_UP,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    )
+    };
+};
+
+void rgb_matrix_indicators_user(void) {
+    led_t host_leds = host_keyboard_led_state();
+    if (host_leds.caps_lock) {
+        rgb_matrix_set_color(12, 254, 189, 41); // set caps lock led color first number is index, R G B
+    }
+}
\ No newline at end of file
diff --git a/keyboards/linworks/fave87h/keymaps/via/keymap.c b/keyboards/linworks/fave87h/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a64a67df47
--- /dev/null
+++ b/keyboards/linworks/fave87h/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+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 layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2, KC_F3, KC_F4,  KC_F5, KC_F6, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,  KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_DEL,  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, KC_RGUI,          MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST,        
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_AUDIO_VOL_UP,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    ),
+
+    [_LAYER2] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER3] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,        
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+void rgb_matrix_indicators_user(void) {
+    led_t host_leds = host_keyboard_led_state();
+    if (host_leds.caps_lock) {
+        rgb_matrix_set_color(12, 254, 189, 41); // set caps lock led color first number is index, R G B
+    }
+}
\ No newline at end of file
diff --git a/keyboards/linworks/fave87h/keymaps/via/rules.mk b/keyboards/linworks/fave87h/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/linworks/fave87h/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/linworks/fave87h/readme.md b/keyboards/linworks/fave87h/readme.md
new file mode 100644
index 0000000000..cd256bcee5
--- /dev/null
+++ b/keyboards/linworks/fave87h/readme.md
@@ -0,0 +1,22 @@
+# FAve 87H
+
+The following is the QMK Firmware for the FAve 87H Hotswap PCB.
+
+The PCB features:
+* QMK & VIA compatibility
+* Hotswap
+
+---
+
+* Keyboard Maintainer: [ToastyStoemp](https://github.com/ToastyStoemp)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make linworks/fave87h: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).
+
+## Bootloader Enter the bootloader in 3 ways: 
+* **Bootmagic reset**: Hold down the key ESC key and plug in the keyboard (Top Left most switch)
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the B key on layer 1 which is mapped to `RESET`
diff --git a/keyboards/linworks/fave87h/rules.mk b/keyboards/linworks/fave87h/rules.mk
new file mode 100644
index 0000000000..01b02d60ca
--- /dev/null
+++ b/keyboards/linworks/fave87h/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
\ No newline at end of file

From 941b1d35b8e40a9c93301a1131ef3f3336fee0b5 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 30 Jan 2022 13:20:33 -0800
Subject: [PATCH 444/867] [Keymap] Add oled improvements and cnano keymap for
 drashna (#16133)

---
 .../charybdis/3x5/keymaps/drashna/chconf.h    |  38 ++
 .../charybdis/3x5/keymaps/drashna/config.h    | 109 +++++
 .../charybdis/3x5/keymaps/drashna/halconf.h   |  26 ++
 .../charybdis/3x5/keymaps/drashna/keymap.c    | 100 +++++
 .../charybdis/3x5/keymaps/drashna/mcuconf.h   |  55 +++
 .../charybdis/3x5/keymaps/drashna/rules.mk    |  22 +
 .../5x6_right/keymaps/drashna/config.h        |   4 +-
 .../5x6_right/keymaps/drashna/keymap.c        |  52 ++-
 .../splitkb/kyria/keymaps/drashna/config.h    |  13 +-
 .../splitkb/kyria/keymaps/drashna/keymap.c    |  27 +-
 .../splitkb/kyria/keymaps/drashna/rules.mk    |   2 +
 users/drashna/callbacks.c                     |   7 -
 users/drashna/config.h                        |   5 +-
 users/drashna/keyrecords/process_records.c    |   5 +-
 users/drashna/keyrecords/unicode.c            |   7 +-
 users/drashna/oled/oled_stuff.c               | 410 +++++++++++++-----
 users/drashna/oled/oled_stuff.h               |  24 +-
 users/drashna/pointing/pointing.c             |  20 +-
 users/drashna/rgb/rgb_stuff.c                 |  46 +-
 users/drashna/rules.mk                        |   1 +
 users/drashna/split/transport_sync.c          |  11 +-
 users/drashna/split/transport_sync.h          |   2 +-
 22 files changed, 797 insertions(+), 189 deletions(-)
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/drashna/chconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
 create mode 100644 keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk

diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/chconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/chconf.h
new file mode 100644
index 0000000000..8b55eaeef0
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/chconf.h
@@ -0,0 +1,38 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
+
+#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
+
+#define CH_CFG_FACTORY_SEMAPHORES TRUE
+
+#define CH_CFG_FACTORY_MAILBOXES TRUE
+
+#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
+
+#define CH_CFG_FACTORY_PIPES TRUE
+
+#include_next <chconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
new file mode 100644
index 0000000000..4633db2fc6
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/config.h
@@ -0,0 +1,109 @@
+/*
+
+Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#undef PRODUCT
+#define PRODUCT Charybdis Nano (Blackpill)
+
+#undef MATRIX_ROW_PINS
+#define MATRIX_ROW_PINS \
+    { B12, B13, B14, B15 }
+#undef MATRIX_COL_PINS
+#define MATRIX_COL_PINS \
+    { A15, B3, B4, B5, B6 }
+
+
+#undef MATRIX_ROW_PINS_RIGHT
+#define MATRIX_ROW_PINS_RIGHT \
+    { B12, B13, B14, B15 }
+#undef MATRIX_COL_PINS_RIGHT
+#define MATRIX_COL_PINS_RIGHT \
+    { A15, B3, B4, B5, B6 }
+
+#define USB_VBUS_PIN        B10
+#define SPLIT_HAND_PIN      C14  // high = left, low = right
+
+// WS2812 RGB LED strip input and number of LEDs
+#undef RGB_DI_PIN
+#define RGB_DI_PIN          A1
+#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+#define WS2812_PWM_DRIVER   PWMD2  // default: PWMD2
+#define WS2812_PWM_CHANNEL  2      // default: 2
+#define WS2812_PWM_PAL_MODE 1      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
+#define WS2812_EXTERNAL_PULLUP
+//#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
+#define WS2812_DMA_STREAM   STM32_DMA1_STREAM7  // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_DMA_CHANNEL  3                   // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_TARGET_PERIOD 800000
+
+#define DEBUG_LED_PIN     C13
+
+/* Audio config */
+#define AUDIO_PIN          B1
+#define AUDIO_PWM_DRIVER   PWMD3
+#define AUDIO_PWM_CHANNEL  4
+#define AUDIO_PWM_PAL_MODE 2
+#define AUDIO_STATE_TIMER  GPTD4
+
+/* serial.c configuration for split keyboard */
+#undef SOFT_SERIAL_PIN
+#define SERIAL_USART_FULL_DUPLEX  // Enable full duplex operation mode.
+#define SERIAL_USART_TX_PIN      A2
+#define SERIAL_USART_RX_PIN      A3
+#define SERIAL_USART_DRIVER      SD2
+#define SERIAL_USART_TX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+#define SERIAL_USART_RX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+#define SERIAL_USART_TIMEOUT     100  // USART driver timeout. default 100
+// #define SERIAL_USART_PIN_SWAP // swap RX and TX pins on master
+// To use the highest possible baudrate (3.75Mbit/s) uncomment the following
+// line, this can result in dropped communications so lower the speed if there
+// are many timeouts.
+// #define SERIAL_USART_SPEED (STM32_PCLK2 >> 4)
+
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* spi config for eeprom and pmw3360 sensor */
+#define SPI_DRIVER                           SPID1
+#define SPI_SCK_PIN                          A5
+#define SPI_SCK_PAL_MODE                     5
+#define SPI_MOSI_PIN                         A7
+#define SPI_MOSI_PAL_MODE                    5
+#define SPI_MISO_PIN                         A6
+#define SPI_MISO_PAL_MODE                    5
+
+/* eeprom config */
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
+#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR    64
+// #define EXTERNAL_EEPROM_BYTE_COUNT           8196
+// #define EXTERNAL_EEPROM_PAGE_SIZE            32
+// #define EXTERNAL_EEPROM_ADDRESS_SIZE         2
+
+/* pmw3360 config  */
+#undef PMW3360_CS_PIN
+#define PMW3360_CS_PIN                       B0
+#define PMW3360_SPI_MODE                     3
+#define PMW3360_SPI_DIVISOR                  64
+
+
+#        define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200
+#        define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 400
+#        define CHARYBDIS_MINIMUM_SNIPING_DPI 200
+#        define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
new file mode 100644
index 0000000000..39644726c3
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/halconf.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_PWM     TRUE
+#define HAL_USE_SERIAL  TRUE
+#define HAL_USE_I2C     TRUE
+#define HAL_USE_SPI     TRUE
+#define SPI_USE_WAIT    TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+#define HAL_USE_GPT     TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
new file mode 100644
index 0000000000..aba169dbb5
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2021 Drashna Jael're @drashna
+ *
+ * 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 "drashna.h"
+
+#define LAYOUT_charybdis_3x5_wrapper(...) LAYOUT_charybdis_3x5(__VA_ARGS__)
+#define LAYOUT_charybdis_3x5_base( \
+    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
+    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
+    ) \
+    LAYOUT_charybdis_3x5 ( \
+       K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A, \
+       ALT_T(K11), K12,  K13,     K14,     GUI_T(K15),  LGUI_T(K16),    K17,     K18,     K19, LALT_T(K1A), \
+       CTL_T(K21), K22,  K23,     K24,     K25,                K26,     K27,     K28,     K29, RCTL_T(K2A), \
+                LSFT_T(KC_GRV), KC_SPC,  BK_LWER,              DL_RAIS, RSFT_T(KC_ENT) \
+    )
+#define LAYOUT_charybdis_3x5_base_wrapper(...)       LAYOUT_charybdis_3x5_base(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_DEFAULT_LAYER_1] = LAYOUT_charybdis_3x5_base_wrapper(
+        _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
+        _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
+        _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
+    ),
+
+    [_DEFAULT_LAYER_2] = LAYOUT_charybdis_3x5_base_wrapper(
+        ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
+        ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
+        ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
+    ),
+    [_DEFAULT_LAYER_3] = LAYOUT_charybdis_3x5_base_wrapper(
+        _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
+        _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
+        _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
+    ),
+
+    [_DEFAULT_LAYER_4] = LAYOUT_charybdis_3x5_base_wrapper(
+        _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
+        _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
+        _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
+    ),
+
+    [_MOUSE] = LAYOUT_charybdis_3x5(
+        _______, _______, _______, S_D_MOD, DPI_MOD,    KC_WH_U, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,    KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6,
+        _______, _______, _______, S_D_RMOD,DPI_RMOD,   KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______,
+                          _______, SNIPING, _______,    _______, _______
+    ),
+    [_LOWER] = LAYOUT_charybdis_3x5_wrapper(
+        _________________LOWER_L1__________________,    _________________LOWER_R1__________________,
+        _________________LOWER_L2__________________,    _________________LOWER_R2__________________,
+        _________________LOWER_L3__________________,    _________________LOWER_R3__________________,
+                          _______, _______, _______,    _______, AUTO_CTN
+    ),
+    [_RAISE] = LAYOUT_charybdis_3x5_wrapper(
+        _________________RAISE_L1__________________,    _________________RAISE_R1__________________,
+        _________________RAISE_L2__________________,    _________________RAISE_R2__________________,
+        _________________RAISE_L3__________________,    _________________RAISE_R3__________________,
+                          REBOOT,  KEYLOCK, _______,    _______, _______
+    ),
+    [_ADJUST] = LAYOUT_charybdis_3x5_wrapper(
+        _________________ADJUST_L1_________________,    _________________ADJUST_R1_________________,
+        _________________ADJUST_L2_________________,    _________________ADJUST_R2_________________,
+        _________________ADJUST_L3_________________,    _________________ADJUST_R3_________________,
+                          EEP_RST, KC_NUKE, _______,    _______, RESET
+    ),
+};
+
+void matrix_init_keyemap(void) { setPinInputHigh(A0); }
+
+void matrix_scan_keymap(void) {
+    if (!readPin(A0)) {
+        reset_keyboard();
+    }
+}
+
+#ifdef USB_VBUS_PIN
+bool usb_vbus_state(void) {
+    setPinInputLow(USB_VBUS_PIN);
+    wait_us(5);
+    return readPin(USB_VBUS_PIN);
+}
+#endif
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
new file mode 100644
index 0000000000..d868eae48e
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
@@ -0,0 +1,55 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_I2C_I2C1_RX_DMA_STREAM
+#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
+#undef STM32_I2C_I2C1_TX_DMA_STREAM
+#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1           TRUE
+
+#undef STM32_SPI_SPI1_RX_DMA_STREAM
+#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
+#undef STM32_SPI_SPI1_TX_DMA_STREAM
+#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
+
+#undef STM32_SERIAL_USE_USART2
+#define STM32_SERIAL_USE_USART2 TRUE
+
+#undef STM32_UART_USART2_RX_DMA_STREAM
+#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
+#undef STM32_UART_USART2_TX_DMA_STREAM
+#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
+
+#undef STM32_GPT_USE_TIM4
+#define STM32_GPT_USE_TIM4 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
new file mode 100644
index 0000000000..d23bf99aac
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+KEYBOARD_SHARED_EP = yes
+MOUSE_SHARED_EP = yes
+
+EEPROM_DRIVER = spi
+WS2812_DRIVER = pwm
+SERIAL_DRIVER = usart
+AUDIO_DRIVER = pwm_hardware
+
+AUDIO_SUPPORTED = yes
+AUDIO_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+NKRO_ENABLE = yes
+CONSOLE_ENABLE = yes
+
+AUTOCORRECTION_ENABLE = yes
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
index 0b33138ec0..c3a30d2bc8 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
@@ -16,9 +16,7 @@
 
 #pragma once
 
-#define TRACKBALL_DPI_OPTIONS { 1200, 1800, 2600, 3400 }
-
-#define DEBOUNCE 60
+#define DEBOUNCE 45
 #define ENCODER_DEFAULT_POS 0x3
 
 #ifdef OLED_DRIVER_SH1107
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
index b5310b37dd..fa1e8897ee 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -60,9 +60,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_MOUSE] = LAYOUT_5x6_right(
-        _______, _______, _______, _______, _______, _______,                     DPI_CONFIG, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                        KC_WH_U, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                        KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, _______,
+        _______, _______, _______, _______, _______, _______,                        KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, DPI_CONFIG,
         _______, _______, _______, _______, _______, _______,                        KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
                           _______, _______,                                                            _______, _______,
                                             _______, _______,                                 KC_BTN3,
@@ -70,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                      _______, _______,      _______, _______
     ),
     [_GAMEPAD] = LAYOUT_5x6_right(
-        KC_ESC,  KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,                        DPI_CONFIG, _______, _______, _______, _______, _______,
+        KC_ESC,  KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,                           _______, _______, _______, _______, _______, _______,
         KC_F1,   KC_K,    KC_Q,    KC_W,    KC_E,    KC_R,                           _______, _______, _______, _______, _______, _______,
         KC_TAB,  KC_G,    KC_A,    KC_S,    KC_D,    KC_F,                           _______, _______, _______, _______, _______, _______,
         KC_LCTL, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_H,                           _______, _______, _______, _______, _______, _______,
@@ -145,7 +145,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [_MEDIA]           = { { _______, _______ }, { _______, _______ } },
     [_RAISE]           = { { _______, _______ }, { KC_PGDN, KC_PGUP } },
     [_LOWER]           = { { RGB_MOD, RGB_RMOD}, { RGB_HUD, RGB_HUI } },
-    [_ADJUST]          = { { CK_DOWN, CK_UP   }, { _______, _F______ } },
+    [_ADJUST]          = { { CK_DOWN, CK_UP   }, { _______, _______ } },
 };
 // clang-format on
 #else
@@ -165,5 +165,49 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 #endif
 
 #ifdef OLED_ENABLE
+extern uint16_t typing_mode;
+
 oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_180; }
+
+void oled_render_large_display(void) {
+    if (is_keyboard_left()) {
+        render_wpm_graph(54, 64);
+    } else {
+        oled_advance_page(true);
+        oled_advance_page(true);
+
+        static const char PROGMEM logo[] = {
+            0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
+            0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
+            0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
+        };
+        oled_write_P(logo, false);
+
+        oled_set_cursor(1, 14);
+        oled_write_ln_P(PSTR("Unicode:"), false);
+        switch (typing_mode) {
+            case KC_WIDE:
+                oled_write_P(PSTR("        Wide"), false);
+                break;
+            case KC_SCRIPT:
+                oled_write_P(PSTR("      Script"), false);
+                break;
+            case KC_BLOCKS:
+                oled_write_P(PSTR("      Blocks"), false);
+                break;
+            case KC_REGIONAL:
+                oled_write_P(PSTR("    Regional"), false);
+                break;
+            case KC_AUSSIE:
+                oled_write_P(PSTR("      Aussie"), false);
+                break;
+            case KC_ZALGO:
+                oled_write_P(PSTR("       Zalgo"), false);
+                break;
+            default:
+                oled_write_P(PSTR("      Normal"), false);
+                break;
+        }
+    }
+}
 #endif
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/config.h b/keyboards/splitkb/kyria/keymaps/drashna/config.h
index 8239e28cdc..89a162a9b1 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/config.h
+++ b/keyboards/splitkb/kyria/keymaps/drashna/config.h
@@ -19,17 +19,21 @@
 #define EE_HANDS
 
 #ifdef OLED_ENABLE
-#    define OLED_DISPLAY_128X64
+#    ifdef OLED_DRIVER_SH1107
+#        undef OLED_DISPLAY_128X64
+#        define OLED_DISPLAY_128X128
+#    endif
 #endif
 
 #ifdef RGBLIGHT_ENABLE
 #    define RGBLIGHT_SLEEP
-#    define RGBLIGHT_LIMIT_VAL 200
+#    undef RGBLIGHT_LIMIT_VAL
+#    define RGBLIGHT_LIMIT_VAL 120
 #    define RGBLIGHT_HUE_STEP  8
 #    define RGBLIGHT_SAT_STEP  8
 #    define RGBLIGHT_VAL_STEP  8
 #    define RGBLIGHT_SPLIT
-// #    define RGBLIGHT_LAYERS
+#    define RGBLIGHT_LAYERS
 #endif
 
 #define KEYLOGGER_LENGTH            10
@@ -41,3 +45,6 @@
 #define BOOTMAGIC_LITE_COLUMN       7
 #define BOOTMAGIC_LITE_ROW_RIGHT    4
 #define BOOTMAGIC_LITE_COLUMN_RIGHT 7
+
+#define I2C1_CLOCK_SPEED 400000
+#define I2C1_DUTY_CYCLE  FAST_DUTY_CYCLE_2
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
index 1346616b20..41ef4b2705 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
+++ b/keyboards/splitkb/kyria/keymaps/drashna/keymap.c
@@ -121,7 +121,32 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 // clang-format on
 
 #ifdef OLED_ENABLE
-oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_180; }
+oled_rotation_t oled_init_keymap(oled_rotation_t rotation) {
+#ifdef OLED_DRIVER_SH1107
+    return OLED_ROTATION_0;
+#else
+    return OLED_ROTATION_180;
+#endif
+}
+
+void oled_render_large_display(void) {
+    if (is_keyboard_left()) {
+        render_wpm_graph(54, 64);
+    } else {
+        static const char PROGMEM kyria_logo[] = {
+            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
+            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
+            0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
+        };
+        // clang-format on
+        oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
+    }
+}
 #endif
 
 #ifdef ENCODER_ENABLE
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
index 3cdfe1becd..ddba0780a2 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
@@ -20,8 +20,10 @@ ifeq ($(strip $(KEYBOARD)), splitkb/kyria/rev1/proton_c)
     CTPC                   = yes
     AUTOCORRECTION_ENABLE  = yes
     CAPS_WORD_ENABLE       = yes
+    DEBUG_MATRIX_SCAN_RATE_ENABLE = api
 else
     LTO_ENABLE             = yes
     BOOTLOADER             = qmk-hid
     BOOTLOADER_SIZE        = 512
+    CUSTOM_UNICODE_ENABLE  = no
 endif
diff --git a/users/drashna/callbacks.c b/users/drashna/callbacks.c
index ffc777692e..f01aab433e 100644
--- a/users/drashna/callbacks.c
+++ b/users/drashna/callbacks.c
@@ -105,16 +105,9 @@ void                       matrix_scan_user(void) {
     run_diablo_macro_check();
 #endif  // TAP_DANCE_ENABLE
 
-#if defined(RGBLIGHT_ENABLE)
-    matrix_scan_rgb_light();
-#endif  // RGBLIGHT_ENABLE
 #if defined(RGB_MATRIX_ENABLE)
     matrix_scan_rgb_matrix();
 #endif
-#if defined(POINTING_DEVICE_ENABLE)
-    matrix_scan_pointing();
-#endif
-
     matrix_scan_secret();
 
     matrix_scan_keymap();
diff --git a/users/drashna/config.h b/users/drashna/config.h
index a6b4beb741..f55ed36bc2 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -279,7 +279,7 @@
 #    define OLED_DISPLAY_WIDTH 128
 #    define OLED_DISPLAY_HEIGHT 128
 #    define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH)
-#    define OLED_BLOCK_TYPE uint16_t
+#    define OLED_BLOCK_TYPE uint32_t
 #    define OLED_SOURCE_MAP \
         { 0, 8, 16, 24, 32, 40, 48, 56 }
 #    define OLED_TARGET_MAP \
@@ -288,4 +288,7 @@
 #    define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)
 #    define OLED_COM_PINS COM_PINS_ALT
 #    define OLED_IC OLED_IC_SH1107
+#    ifndef OLED_BRIGHTNESS
+#        define OLED_BRIGHTNESS 50
+#    endif
 #endif
diff --git a/users/drashna/keyrecords/process_records.c b/users/drashna/keyrecords/process_records.c
index 012a57f7e4..160a880215 100644
--- a/users/drashna/keyrecords/process_records.c
+++ b/users/drashna/keyrecords/process_records.c
@@ -10,7 +10,7 @@
 #    include "autocorrection/autocorrection.h"
 #endif
 #ifdef __AVR__
-#include <avr/wdt.h>
+#    include <avr/wdt.h>
 #endif
 
 uint16_t copy_paste_timer;
@@ -36,7 +36,7 @@ __attribute__((weak)) bool process_record_secrets(uint16_t keycode, keyrecord_t
  * @return true Continue processing keycode and send to host
  * @return false Stop process keycode and do not send to host
  */
-bool                       process_record_user(uint16_t keycode, keyrecord_t *record) {
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     // If console is enabled, it will print the matrix position and status of each key pressed
 #ifdef KEYLOGGER_ENABLE
     uprintf("KL: kc: 0x%04X, col: %2u, row: %2u, pressed: %b, time: %5u, int: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
@@ -234,7 +234,6 @@ bool                       process_record_user(uint16_t keycode, keyrecord_t *re
                 software_reset();
             }
             return false;
-
     }
     return true;
 }
diff --git a/users/drashna/keyrecords/unicode.c b/users/drashna/keyrecords/unicode.c
index db2058e5d1..5acd51da9b 100644
--- a/users/drashna/keyrecords/unicode.c
+++ b/users/drashna/keyrecords/unicode.c
@@ -181,7 +181,6 @@ bool process_record_aussie(uint16_t keycode, keyrecord_t *record) {
 bool process_record_zalgo(uint16_t keycode, keyrecord_t *record) {
     if ((KC_A <= keycode) && (keycode <= KC_0)) {
         if (record->event.pressed) {
-
             tap_code16_nomods(keycode);
 
             int number = (rand() % (8 + 1 - 2)) + 2;
@@ -285,13 +284,11 @@ bool process_record_unicode(uint16_t keycode, keyrecord_t *record) {
     } else if (typing_mode == KC_ZALGO) {
         return process_record_zalgo(keycode, record);
     }
-    return process_unicode_common(keycode, record);
+    return true;
 }
 
 /**
  * @brief Initialize the default unicode mode on firmware startu
  *
  */
-void matrix_init_unicode(void) {
-    unicode_input_mode_init();
-}
+void matrix_init_unicode(void) { unicode_input_mode_init(); }
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index eeca010de0..c850c5336f 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -1,4 +1,5 @@
 /* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2021 John Ezra - wpm graph
  *
  * 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
@@ -15,17 +16,17 @@
  */
 
 #include "drashna.h"
-#ifdef CUSTOM_UNICODE_ENABLE
+#ifdef UNICODE_COMMON_ENABLE
 #    include "process_unicode_common.h"
 #endif
 #include <string.h>
 
 extern bool host_driver_disabled;
 
-uint32_t                  oled_timer                            = 0;
-char                      keylog_str[OLED_KEYLOGGER_LENGTH]     = {0};
-static uint16_t           log_timer                             = 0;
-static const char PROGMEM display_border[3]                     = {0x0, 0xFF, 0x0};
+uint32_t                  oled_timer                        = 0;
+char                      keylog_str[OLED_KEYLOGGER_LENGTH] = {0};
+static uint16_t           log_timer                         = 0;
+static const char PROGMEM display_border[3]                 = {0x0, 0xFF, 0x0};
 
 deferred_token kittoken;
 
@@ -112,7 +113,7 @@ void update_log(void) {
  */
 void render_keylogger_status(void) {
 #ifdef OLED_DISPLAY_VERBOSE
-    oled_set_cursor(1, 7);
+    oled_set_cursor(1, 6);
 #endif
     oled_write_P(PSTR(OLED_RENDER_KEYLOGGER), false);
     oled_write(keylog_str, false);
@@ -127,7 +128,7 @@ void render_keylogger_status(void) {
  */
 void render_default_layer_state(void) {
 #ifdef OLED_DISPLAY_VERBOSE
-    oled_set_cursor(5, 2);
+    oled_set_cursor(1, 1);
 #endif
     oled_write_P(PSTR(OLED_RENDER_LAYOUT_NAME), false);
     switch (get_highest_layer(default_layer_state)) {
@@ -155,111 +156,166 @@ void render_default_layer_state(void) {
  */
 void render_layer_state(void) {
 #ifdef OLED_DISPLAY_VERBOSE
-    static const char PROGMEM tri_layer_image[4][3][18] = {
+    // clang-format off
+    static const char PROGMEM tri_layer_image[][3][24] = {
+        // base
         {
             {
-                0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-                0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-                0x20, 0x20, 0x40, 0x40, 0x80, 0x80
+                0x00, 0x00, 0x00, 0x80, 0x80, 0x40,
+                0x40, 0x20, 0x20, 0x10, 0x10, 0x08,
+                0x08, 0x10, 0x10, 0x20, 0x20, 0x40,
+                0x40, 0x80, 0x80, 0x00, 0x00, 0x00
             },
             {
-                0x88, 0x88, 0x5D, 0x5D, 0x3E, 0x3E,
-                0x7C, 0x7C, 0xF8, 0xF8, 0x7C, 0x7C,
-                0x3E, 0x3E, 0x5D, 0x5D, 0x88, 0x88
+                0x00, 0x00, 0x00, 0x88, 0x88, 0x5D,
+                0x5D, 0x3E, 0x3E, 0x7C, 0x7C, 0xF8,
+                0xF8, 0x7C, 0x7C, 0x3E, 0x3E, 0x5D,
+                0x5D, 0x88, 0x88, 0x00, 0x00, 0x00
             },
             {
-                0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-                0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-                0x02, 0x02, 0x01, 0x01, 0x00, 0x00
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+                0x01, 0x02, 0x02, 0x04, 0x04, 0x08,
+                0x08, 0x04, 0x04, 0x02, 0x02, 0x01,
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00
             }
         },
+        // raise
         {
             {
-                0x80, 0x80, 0xC0, 0xC0, 0xE0, 0xE0,
-                0xF0, 0xF0, 0xF8, 0xF8, 0xF0, 0xF0,
-                0xE0, 0xE0, 0xC0, 0xC0, 0x80, 0x80
+                0x00, 0x00, 0x00, 0x80, 0x80, 0xC0,
+                0xC0, 0xE0, 0xE0, 0xF0, 0xF0, 0xF8,
+                0xF8, 0xF0, 0xF0, 0xE0, 0xE0, 0xC0,
+                0xC0, 0x80, 0x80, 0x00, 0x00, 0x00
             },
             {
-                0x88, 0x88, 0x55, 0x55, 0x23, 0x23,
-                0x47, 0x47, 0x8F, 0x8F, 0x47, 0x47,
-                0x23, 0x23, 0x55, 0x55, 0x88, 0x88
+                0x00, 0x00, 0x00, 0x88, 0x88, 0x55,
+                0x55, 0x23, 0x23, 0x47, 0x47, 0x8F,
+                0x8F, 0x47, 0x47, 0x23, 0x23, 0x55,
+                0x55, 0x88, 0x88, 0x00, 0x00, 0x00
             },
             {
-                0x00, 0x00, 0x01, 0x01, 0x02, 0x02,
-                0x04, 0x04, 0x08, 0x08, 0x04, 0x04,
-                0x02, 0x02, 0x01, 0x01, 0x00, 0x00
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+                0x01, 0x02, 0x02, 0x04, 0x04, 0x08,
+                0x08, 0x04, 0x04, 0x02, 0x02, 0x01,
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00
             }
         },
+        // lower
         {
             {
-                0x80, 0x80, 0x40, 0x40, 0x20, 0x20,
-                0x10, 0x10, 0x08, 0x08, 0x10, 0x10,
-                0x20, 0x20, 0x40, 0x40, 0x80, 0x80
+                0x00, 0x00, 0x00, 0x80, 0x80, 0x40,
+                0x40, 0x20, 0x20, 0x10, 0x10, 0x08,
+                0x08, 0x10, 0x10, 0x20, 0x20, 0x40,
+                0x40, 0x80, 0x80, 0x00, 0x00, 0x00
             },
             {
-                0x88, 0x88, 0xD5, 0xD5, 0xE2, 0xE2,
-                0xC4, 0xC4, 0x88, 0x88, 0xC4, 0xC4,
-                0xE2, 0xE2, 0xD5, 0xD5, 0x88, 0x88
+                0x00, 0x00, 0x00, 0x88, 0x88, 0xD5,
+                0xD5, 0xE2, 0xE2, 0xC4, 0xC4, 0x88,
+                0x88, 0xC4, 0xC4, 0xE2, 0xE2, 0xD5,
+                0xD5, 0x88, 0x88, 0x00, 0x00, 0x00
             },
             {
-                0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
-                0x07, 0x07, 0x0F, 0x0F, 0x07, 0x07,
-                0x03, 0x03, 0x01, 0x01, 0x00, 0x00
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+                0x01, 0x03, 0x03, 0x07, 0x07, 0x0F,
+                0x0F, 0x07, 0x07, 0x03, 0x03, 0x01,
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00
             }
         },
+        // adjust
         {
             {
-                0x80, 0x80, 0x40, 0xC0, 0x60, 0xA0,
-                0x50, 0xB0, 0x58, 0xA8, 0x50, 0xB0,
-                0x60, 0xA0, 0x40, 0xC0, 0x80, 0x80
+                0x00, 0x00, 0x00, 0x80, 0x80, 0x40,
+                0xC0, 0x60, 0xA0, 0x50, 0xB0, 0x58,
+                0xA8, 0x50, 0xB0, 0x60, 0xA0, 0x40,
+                0xC0, 0x80, 0x80, 0x00, 0x00, 0x00
             },
             {
-                0x88, 0x88, 0x5D, 0xD5, 0x6B, 0xB6,
-                0x6D, 0xD6, 0xAD, 0xDA, 0x6D, 0xD6,
-                0x6B, 0xB6, 0x5D, 0xD5, 0x88, 0x88
+                0x00, 0x00, 0x00, 0x88, 0x88, 0x5D,
+                0xD5, 0x6B, 0xB6, 0x6D, 0xD6, 0xAD,
+                0xDA, 0x6D, 0xD6, 0x6B, 0xB6, 0x5D,
+                0xD5, 0x88, 0x88, 0x00, 0x00, 0x00
             },
             {
-                0x00, 0x00, 0x01, 0x01, 0x03, 0x02,
-                0x05, 0x06, 0x0D, 0x0A, 0x05, 0x06,
-                0x03, 0x02, 0x01, 0x01, 0x00, 0x00
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+                0x01, 0x03, 0x02, 0x05, 0x06, 0x0D,
+                0x0A, 0x05, 0x06, 0x03, 0x02, 0x01,
+                0x01, 0x00, 0x00, 0x00, 0x00, 0x00
             }
+        },
+        // blank
+        {
+            { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 },
+            { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 },
+            { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0 }
+        },
+        // better gamepad
+        {
+            {   0,  0,  0,192,224,224,112,240,240,240,240,144,144,240,240,240,240,112,224,224,192,  0,  0,  0 },
+            { 128,248,255,255,255,254,252,230,195,195,230,255,255,254,247,227,246,253,254,255,255,255,248,128 },
+            {   7, 15, 15, 15,  7,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  7, 15, 15, 15,  7 }
+
+        },
+        // mouse
+        {
+            { 0,  0,  0,  0,  0,  0,  0,  0,192, 32, 32, 32,160, 32, 32, 32,192,  0,  0,  0,  0,  0,  0,  0 },
+            { 0,  0,  0,  0,  0,  0,  0,240, 15,  0,  0,  0,  3,  0,  0,  0, 15,240,  0,  0,  0,  0,  0,  0 },
+            { 0,  0,  0,  0,  0,  0,  0,  3,  6,  4,  4,  4,  4,  4,  4,  4,  6,  3,  0,  0,  0,  0,  0,  0 }
         }
     };
 
-    uint8_t layer_is = 0;
+
+    // clang-format on
+    uint8_t layer_is[4] = { 0, 4, 4, 4};
     if (layer_state_is(_ADJUST)) {
-        layer_is = 3;
+        layer_is[0] = 3;
     } else if (layer_state_is(_RAISE)) {
-        layer_is = 1;
+        layer_is[0] = 1;
     } else if (layer_state_is(_LOWER)) {
-        layer_is = 2;
+        layer_is[0] = 2;
     }
 
+    if (layer_state_is(_MOUSE)) {
+        layer_is[1] = 6;
+    }
+    if (layer_state_is(_GAMEPAD)) {
+        layer_is[2] = 5;
+    }
+
+
     oled_set_cursor(1, 2);
-    oled_write_raw_P(tri_layer_image[layer_is][0], sizeof(tri_layer_image[0][0]));
-    oled_set_cursor(5, 3);
+    oled_write_raw_P(tri_layer_image[layer_is[0]][0], sizeof(tri_layer_image[0][0]));
+    oled_set_cursor(5, 2);
+    oled_write_raw_P(tri_layer_image[layer_is[1]][0], sizeof(tri_layer_image[0][0]));
+    oled_set_cursor(9, 2);
+    oled_write_raw_P(tri_layer_image[layer_is[2]][0], sizeof(tri_layer_image[0][0]));
+    oled_set_cursor(14, 2);
     oled_write_P(PSTR("Diablo2"), layer_state_is(_DIABLOII));
-    oled_write_P(PSTR(" "), false);
-    oled_write_P(PSTR("Diablo3"), layer_state_is(_DIABLO));
     oled_advance_page(true);
 
     oled_set_cursor(1, 3);
-    oled_write_raw_P(tri_layer_image[layer_is][1], sizeof(tri_layer_image[0][0]));
-    oled_set_cursor(5, 4);
-    oled_write_P(PSTR("GamePad"), layer_state_is(_GAMEPAD));
-    oled_write_P(PSTR(" "), false);
-    oled_write_P(PSTR("Mouse"), layer_state_is(_MOUSE));
+    oled_write_raw_P(tri_layer_image[layer_is[0]][1], sizeof(tri_layer_image[0][0]));
+    oled_set_cursor(5, 3);
+    oled_write_raw_P(tri_layer_image[layer_is[1]][1], sizeof(tri_layer_image[0][0]));
+    oled_set_cursor(9, 3);
+    oled_write_raw_P(tri_layer_image[layer_is[2]][1], sizeof(tri_layer_image[0][0]));
+    oled_set_cursor(14, 3);
+    oled_write_P(PSTR("Diablo3"), layer_state_is(_DIABLO));
     oled_advance_page(true);
 
     oled_set_cursor(1, 4);
-    oled_write_raw_P(tri_layer_image[layer_is][2], sizeof(tri_layer_image[0][0]));
-
+    oled_write_raw_P(tri_layer_image[layer_is[0]][2], sizeof(tri_layer_image[0][0]));
+    oled_set_cursor(5, 4);
+    oled_write_raw_P(tri_layer_image[layer_is[1]][2], sizeof(tri_layer_image[0][0]));
+    oled_set_cursor(9, 4);
+    oled_write_raw_P(tri_layer_image[layer_is[2]][2], sizeof(tri_layer_image[0][0]));
+    oled_set_cursor(14, 4);
+    oled_write_P(PSTR("Media"), layer_state_is(_MEDIA));
 #else
     oled_write_P(PSTR(OLED_RENDER_LAYER_NAME), false);
     oled_write_P(PSTR(OLED_RENDER_LAYER_LOWER), layer_state_is(_LOWER));
     oled_write_P(PSTR(OLED_RENDER_LAYER_RAISE), layer_state_is(_RAISE));
-    oled_advance_page(true);
 #endif
+    oled_advance_page(true);
 }
 
 /**
@@ -288,9 +344,14 @@ void render_keylock_status(uint8_t led_usb_state) {
  * @brief Renders the matrix scan rate to the host system
  *
  */
-void render_matrix_scan_rate(void) {
+void render_matrix_scan_rate(uint8_t padding) {
 #ifdef DEBUG_MATRIX_SCAN_RATE
     oled_write_P(PSTR("MS:"), false);
+    if (padding) {
+        for (uint8_t n = padding; n > 0; n--) {
+            oled_write_P(PSTR(" "), false);
+        }
+    }
     oled_write(get_u16_str(get_matrix_scan_rate(), ' '), false);
 #endif
 }
@@ -337,7 +398,7 @@ void render_bootmagic_status(void) {
 
     bool is_bootmagic_on;
 #ifdef OLED_DISPLAY_VERBOSE
-    oled_set_cursor(7, 4);
+    oled_set_cursor(7, 3);
     is_bootmagic_on = !keymap_config.swap_lctl_lgui;
 #else
     is_bootmagic_on = keymap_config.swap_lctl_lgui;
@@ -366,11 +427,12 @@ void render_bootmagic_status(void) {
     oled_write_P(PSTR(" "), false);
 #ifdef AUTOCORRECTION_ENABLE
     oled_write_P(PSTR("CRCT"), userspace_config.autocorrection);
+    oled_write_P(PSTR(" "), false);
 #else
     oled_write_P(PSTR(OLED_RENDER_BOOTMAGIC_NOGUI), keymap_config.no_gui);
 #endif
 #ifdef OLED_DISPLAY_VERBOSE
-    oled_set_cursor(7, 5);
+    oled_set_cursor(7, 4);
     if (keymap_config.swap_lctl_lgui) {
         oled_write_P(logo[1][1], is_bootmagic_on);
     } else {
@@ -382,6 +444,7 @@ void render_bootmagic_status(void) {
 #ifdef SWAP_HANDS_ENABLE
     oled_write_P(PSTR(" "), false);
     oled_write_P(PSTR(OLED_RENDER_BOOTMAGIC_SWAP), swap_hands);
+    oled_write_P(PSTR(" "), false);
 #endif
 }
 
@@ -402,7 +465,7 @@ void render_user_status(void) {
 #    endif
 #endif
 #if defined(OLED_DISPLAY_VERBOSE)
-    oled_set_cursor(1, 6);
+    oled_set_cursor(1, 5);
 #endif
     oled_write_P(PSTR(OLED_RENDER_USER_NAME), false);
 #if !defined(OLED_DISPLAY_VERBOSE)
@@ -434,9 +497,9 @@ void render_user_status(void) {
     oled_write_P(rgb_layer_status[userspace_config.rgb_layer_change], false);
     static const char PROGMEM cat_mode[2][3] = {{0xF8, 0xF9, 0}, {0xF6, 0xF7, 0}};
     oled_write_P(cat_mode[0], host_driver_disabled);
-#if defined(CUSTOM_UNICODE_ENABLE)
-    static const char PROGMEM uc_mod_status[5][3] = {{0xEA, 0xEB, 0}, {0xEC, 0xED, 0}};
-    oled_write_P(uc_mod_status[get_unicode_input_mode() == UC_MAC], false);
+#if defined(UNICODE_COMMON_ENABLE)
+    static const char PROGMEM uc_mod_status[5][3] = {{0xEC, 0xED, 0},  {0x20, 0x20, 0},  {0x20, 0x20, 0}, {0x20, 0x20, 0}, {0xEA, 0xEB, 0}};
+    oled_write_P(uc_mod_status[get_unicode_input_mode()], false);
 #endif
     if (userspace_config.nuke_switch) {
 #if !defined(OLED_DISPLAY_VERBOSE)
@@ -466,9 +529,69 @@ void render_wpm(uint8_t padding) {
 #endif
 }
 
-#if defined(KEYBOARD_handwired_tractyl_manuform) || defined(KEYBOARD_bastardkb_charybdis)
-extern kb_config_data_t kb_config;
-void                    render_pointing_dpi_status(uint8_t padding) {
+//=============  USER CONFIG PARAMS  ===============
+// wpm graph originally designed by john-ezra
+
+// for 128x128:
+// max_lines_graph          = 54;
+// vertical_offset          = 64;
+// for 128x64:
+// max_lines_graph          = 64;
+// vertical_offset          = 0;
+
+void render_wpm_graph(uint8_t max_lines_graph, uint8_t vertical_offset) {
+    static uint16_t timer   = 0;
+    static uint8_t  x       = OLED_DISPLAY_HEIGHT - 1;
+    uint8_t         currwpm = get_current_wpm();
+    float           max_wpm = OLED_WPM_GRAPH_MAX_WPM;
+
+    if (timer_elapsed(timer) > OLED_WPM_GRAPH_REFRESH_INTERVAL) {                                  // check if it's been long enough before refreshing graph
+        x = (max_lines_graph - 1) - ((currwpm / max_wpm) * (max_lines_graph - 1));  // main calculation to plot graph line
+        for (uint8_t i = 0; i <= OLED_WPM_GRAPH_GRAPH_LINE_THICKNESS - 1; i++) {                   // first draw actual value line
+            oled_write_pixel(3, x + i + vertical_offset, true);
+        }
+#    ifdef OLED_WPM_GRAPH_VERTICAL_LINE
+        static uint8_t vert_count = 0;
+        if (vert_count == OLED_WPM_GRAPH_VERTCAL_LINE_INTERVAL) {
+            vert_count = 0;
+            while (x <= (max_lines_graph - 1)) {
+                oled_write_pixel(3, x + vertical_offset, true);
+                x++;
+            }
+        } else {
+            for (uint8_t i = (max_lines_graph - 1); i > x; i--) {
+                if (i % OLED_WPM_GRAPH_AREA_FILL_INTERVAL == 0) {
+                    oled_write_pixel(3, i + vertical_offset, true);
+                }
+            }
+            vert_count++;
+        }
+#    else
+        for (int i = (max_lines_graph - 1); i > x; i--) {
+            if (i % OLED_WPM_GRAPH_AREA_FILL_INTERVAL == 0) {
+                oled_write_pixel(3, i + vertical_offset, true);
+            }
+        }
+#    endif
+        oled_pan(false);  // then move the entire graph one pixel to the right
+        static const char PROGMEM display_border[3] = {0x0, 0xFF, 0x0};
+        for (uint8_t i = 0; i < 7; i++) {
+            oled_set_cursor(0, i + 8);
+            oled_write_raw_P(display_border, sizeof(display_border));
+            oled_set_cursor(21, i + 8);
+            oled_write_raw_P(display_border, sizeof(display_border));
+        }
+        static const char PROGMEM footer_image[] = {0, 3, 4, 8, 16, 32, 64, 128, 128, 128, 128, 128, 128, 128, 192, 224, 240, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 240, 224, 192, 128, 128, 128, 128, 128, 128, 128, 64, 32, 16, 8, 4, 3, 0};
+        oled_set_cursor(0, 15);
+
+        oled_write_raw_P(footer_image, sizeof(footer_image));
+
+        timer = timer_read();  // refresh the timer for the next iteration
+    }
+}
+
+#if defined(POINTING_DEVICE_ENABLE)
+void render_pointing_dpi_status(uint16_t cpi, uint8_t padding) {
     oled_write_P(PSTR("CPI:"), false);
     if (padding) {
         for (uint8_t n = padding - 1; n > 0; n--) {
@@ -476,17 +599,15 @@ void                    render_pointing_dpi_status(uint8_t padding) {
         }
     }
 
-    oled_write(get_u16_str(kb_config.device_cpi, ' '), false);
+    oled_write(get_u16_str(cpi, ' '), false);
 }
 #endif
 
 __attribute__((weak)) void oled_driver_render_logo_right(void) {
 #if defined(OLED_DISPLAY_VERBOSE)
-    oled_set_cursor(0, 2);
-    render_default_layer_state();
-#else
-    render_default_layer_state();
+    oled_set_cursor(0, 1);
 #endif
+    render_default_layer_state();
 }
 
 // WPM-responsive animation stuff here
@@ -511,8 +632,8 @@ __attribute__((weak)) void oled_driver_render_logo_right(void) {
 #    error frame size too large
 #endif
 
-static uint8_t  animation_frame     = 0;
-static uint8_t  animation_type      = 0;
+static uint8_t animation_frame = 0;
+static uint8_t animation_type  = 0;
 
 void render_kitty(void) {
     // Images credit j-inc(/James Incandenza) and pixelbenny.
@@ -771,28 +892,28 @@ void render_kitty(void) {
     // clang-format on
 
     for (uint8_t i = 0; i < 4; i++) {
-        oled_set_cursor(1, i + 2);
+        oled_set_cursor(1, i + 1);
         oled_write_raw_P(animation[animation_type][animation_frame][i], OLED_ANIM_SIZE);
     }
 }
 
 uint32_t kitty_animation_phases(uint32_t triger_time, void *cb_arg) {
-    uint32_t anim_frame_duration = 500;
-    // can't change animation frame duration here, otherwise, it gets stuck.
-    // weirdly, it seems to work fine if it's in keymap.c but not here.
-    // Should move this block to the deferred execution?
+    static uint32_t anim_frame_duration = 500;
 #ifdef POINTING_DEVICE_ENABLE
     if (tap_toggling) {
-        animation_frame = (animation_frame + 1) % OLED_RTOGI_FRAMES;
-        animation_type = 3;
+        animation_frame     = (animation_frame + 1) % OLED_RTOGI_FRAMES;
+        animation_type      = 3;
         anim_frame_duration = 300;
     } else
 #endif
     {
+#ifdef WPM_ENABLE
         if (get_current_wpm() <= OLED_SLEEP_SPEED) {
+#endif
             animation_frame     = (animation_frame + 1) % OLED_SLEEP_FRAMES;
             animation_type      = 0;
             anim_frame_duration = 500;
+#ifdef WPM_ENABLE
         } else if (get_current_wpm() > OLED_WAKE_SPEED) {
             animation_frame     = (animation_frame + 1) % OLED_WAKE_FRAMES;
             animation_type      = 1;
@@ -802,13 +923,14 @@ uint32_t kitty_animation_phases(uint32_t triger_time, void *cb_arg) {
             animation_type      = 2;
             anim_frame_duration = 500;
         }
+#endif
     }
     return anim_frame_duration;
 }
 
 void oled_driver_render_logo_left(void) {
 #if defined(OLED_DISPLAY_VERBOSE)
-    oled_set_cursor(0, 2);
+    oled_set_cursor(0, 1);
     render_kitty();
 
 #    if defined(KEYBOARD_handwired_tractyl_manuform)
@@ -817,39 +939,82 @@ void oled_driver_render_logo_left(void) {
 #    elif defined(KEYBOARD_bastardkb_charybdis)
     oled_set_cursor(6, 0);
     oled_write_P(PSTR("Charybdis"), true);
+#    elif defined(KEYBOARD_splitkb_kyria)
+    oled_set_cursor(7, 0);
+    oled_write_P(PSTR("SplitKB"), true);
 #    else
     oled_set_cursor(8, 0);
     oled_write_P(PSTR("Left"), true);
 #    endif
-    oled_set_cursor(7, 2);
-#    if defined(DEBUG_MATRIX_SCAN_RATE)
-    render_matrix_scan_rate();
-#    elif defined(WPM_ENABLE)
+    oled_set_cursor(7, 1);
+#    if defined(WPM_ENABLE)
     render_wpm(1);
+#    elif defined(DEBUG_MATRIX_SCAN_RATE)
+    render_matrix_scan_rate(2);
 #    endif
-    oled_set_cursor(7, 3);
-#    if defined(KEYBOARD_handwired_tractyl_manuform)
-    render_pointing_dpi_status(0);
-#    elif defined(KEYBOARD_bastardkb_charybdis)
-    render_pointing_dpi_status(1);
+    oled_set_cursor(7, 2);
+#    if defined(KEYBOARD_bastardkb_charybdis)
+    render_pointing_dpi_status(charybdis_get_pointer_sniping_enabled() ? charybdis_get_pointer_sniping_dpi() : charybdis_get_pointer_default_dpi(), 1);
+
+// credit and thanks to jaspertandy on discord for these images
+    static const char PROGMEM mouse_logo[3][2][16] = {
+        // mouse icon
+        {
+            {   0,   0,   0, 252,   2,   2,   2,  58,   2,   2,   2, 252,   0,   0,   0,   0 },
+            {   0,   0,  63,  96,  64,  64,  64,  64,  64,  64,  64,  96,  63,   0,   0,   0 }
+        },
+        // crosshair icon
+        {
+            { 128, 240, 136, 228, 146, 138, 202, 127, 202, 138, 146, 228, 136, 240, 128,   0 },
+            {   0,   7,   8,  19,  36,  40,  41, 127,  41,  40,  36,  19,   8,   7,   0,   0 }
+        },
+        // dragscroll icon
+        {
+            {   0,   0, 112, 136, 156,   2,  15,   1,  15,   2, 140,  68,  56,   0,   0,   0 },
+            {   0,   0,   2,   6,  15,  28,  60, 124,  60,  28,  15,   6,   2,   0,   0,   0 }
+        }
+    };
+
+
+    uint8_t image_index = 0;
+#        ifdef OLED_DISPLAY_TEST
+    image_index = animation_frame;
+#        else
+    if (charybdis_get_pointer_sniping_enabled()) {
+        image_index = 1;
+    } else if (charybdis_get_pointer_dragscroll_enabled()) {
+        image_index = 2;
+    }
+#        endif
+
+    oled_set_cursor(17, 1);
+    oled_write_raw_P(mouse_logo[image_index][0], 16);
+    oled_set_cursor(17, 2);
+    oled_write_raw_P(mouse_logo[image_index][1], 16);
+#    elif defined(WPM_ENABLE) && defined(DEBUG_MATRIX_SCAN_RATE)
+    render_matrix_scan_rate(2);
 #    endif
-    oled_set_cursor(0, 6);
+
+    oled_set_cursor(0, 5);
 #else
     render_default_layer_state();
 #endif
 }
 
-void render_status_secondary(void) {
-#    if defined(KEYBOARD_handwired_tractyl_manuform)
+void render_status_right(void) {
+#if defined(KEYBOARD_handwired_tractyl_manuform)
     oled_set_cursor(7, 0);
     oled_write_P(PSTR("Manuform"), true);
-#    elif defined(KEYBOARD_bastardkb_charybdis)
+#elif defined(KEYBOARD_bastardkb_charybdis)
     oled_set_cursor(6, 0);
     oled_write_P(PSTR("Charybdis"), true);
-#    else
+#elif defined(KEYBOARD_splitkb_kyria)
+    oled_set_cursor(8, 0);
+    oled_write_P(PSTR("Kyria"), true);
+#else
     oled_set_cursor(8, 0);
     oled_write_P(PSTR("Right"), true);
-#    endif
+#endif
     oled_driver_render_logo_right();
     /* Show Keyboard Layout  */
     render_layer_state();
@@ -860,16 +1025,18 @@ void render_status_secondary(void) {
     render_keylock_status(host_keyboard_leds());
 }
 
-void render_status_main(void) {
+void render_status_left(void) {
     oled_driver_render_logo_left();
 
     /* Show Keyboard Layout  */
     render_bootmagic_status();
     render_user_status();
 
-    // render_keylogger_status();
+    render_keylogger_status();
 }
 
+__attribute__((weak)) void oled_render_large_display(void) {}
+
 __attribute__((weak)) oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return rotation; }
 
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
@@ -884,12 +1051,14 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
     return oled_init_keymap(rotation);
 }
 
+__attribute__((weak)) bool oled_task_keymap(void) { return true; }
+
 bool oled_task_user(void) {
     update_log();
 
     if (is_keyboard_master()) {
 #ifndef OLED_DISPLAY_TEST
-        if (timer_elapsed32(oled_timer) > 30000) {
+        if (timer_elapsed32(oled_timer) > 60000) {
             oled_off();
             return false;
         } else
@@ -898,14 +1067,23 @@ bool oled_task_user(void) {
             oled_on();
         }
     }
+
+    if (!oled_task_keymap()) {
+        return false;
+    }
+
+#if defined(OLED_DISPLAY_128X128)
+    oled_set_cursor(0, 7);
+    oled_render_large_display();
+#endif
+
 #if defined(OLED_DISPLAY_VERBOSE)
-     static const char PROGMEM header_image[] = {
-         0,192, 32, 16,  8,  4,  2,  1,  1,  1,  1,  1,  1,  1,  1,  3,  7, 15, 31, 63,127,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,127, 63, 31, 15,  7,  3,  1,  1,  1,  1,  1,  1,  1,  1,  2,  4,  8, 16, 32,192,  0,
-         0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  7, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  7,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,  0
-     };
-     static const char PROGMEM footer_image[] = {
-         0,  3,  4,  8, 16, 32, 64,128,128,128,128,128,128,128,192,224,240,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,248,240,224,192,128,128,128,128,128,128,128, 64, 32, 16,  8,  4,  3,  0
-     };
+    static const char PROGMEM header_image[] = {
+        0, 192, 32, 16, 8, 4, 2, 1, 1, 1, 1, 1, 1, 1, 1, 3, 7, 15, 31, 63, 127, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 127, 63, 31, 15, 7, 3, 1, 1, 1, 1, 1, 1, 1, 1, 2, 4, 8, 16, 32, 192, 0,
+        //         0,255,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  3,  7, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  7,  3,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,  0
+    };
+    static const char PROGMEM footer_image[] = {0, 3, 4, 8, 16, 32, 64, 128, 128, 128, 128, 128, 128, 128, 192, 224, 240, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 248, 240, 224, 192, 128, 128, 128, 128, 128, 128, 128, 64, 32, 16, 8, 4, 3, 0};
+    oled_set_cursor(0, 0);
     oled_write_raw_P(header_image, sizeof(header_image));
     oled_set_cursor(0, 1);
 #endif
@@ -913,16 +1091,10 @@ bool oled_task_user(void) {
 #ifndef OLED_DISPLAY_TEST
     if (is_keyboard_left()) {
 #endif
-        render_status_main();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+        render_status_left();
 #ifndef OLED_DISPLAY_TEST
     } else {
-        render_status_secondary();
-    }
-#endif
-
-#if defined(OLED_DISPLAY_128X128)
-    if (is_keyboard_left()) {
-        render_keylogger_status();
+        render_status_right();
     }
 #endif
 
@@ -933,7 +1105,7 @@ bool oled_task_user(void) {
 #    else
     num_of_rows = 7;
 #    endif
-    for (uint8_t i= 1; i < num_of_rows; i++) {
+    for (uint8_t i = 1; i < num_of_rows; i++) {
         oled_set_cursor(0, i);
         oled_write_raw_P(display_border, sizeof(display_border));
         oled_set_cursor(21, i);
diff --git a/users/drashna/oled/oled_stuff.h b/users/drashna/oled/oled_stuff.h
index 985153c2ff..7245f6131c 100644
--- a/users/drashna/oled/oled_stuff.h
+++ b/users/drashna/oled/oled_stuff.h
@@ -28,15 +28,17 @@ void            render_keylogger_status(void);
 void            render_default_layer_state(void);
 void            render_layer_state(void);
 void            render_keylock_status(uint8_t led_usb_state);
-void            render_matrix_scan_rate(void);
+void            render_matrix_scan_rate(uint8_t padding);
 void            render_mod_status(uint8_t modifiers);
 void            render_bootmagic_status(void);
 void            render_user_status(void);
 void            oled_driver_render_logo(void);
 void            render_wpm(uint8_t padding);
-void            render_pointing_dpi_status(uint8_t padding);
+void            render_pointing_dpi_status(uint16_t cpi, uint8_t padding);
 void            oled_driver_render_logo_left(void);
 void            oled_driver_render_logo_right(void);
+void            oled_render_large_display(void);
+void render_wpm_graph(uint8_t max_lines_graph, uint8_t vertical_offset);
 
 #if defined(OLED_DISPLAY_128X128) || defined(OLED_DISPLAY_128X64)
 #    define OLED_DISPLAY_VERBOSE
@@ -47,7 +49,7 @@ void            oled_driver_render_logo_right(void);
 #    endif
 #    define OLED_RENDER_LAYOUT_NAME       "Layout: "
 #    define OLED_RENDER_LAYOUT_QWERTY     "Qwerty"
-#    define OLED_RENDER_LAYOUT_COLEMAK_DH "ColemkDH"
+#    define OLED_RENDER_LAYOUT_COLEMAK_DH "Colemak DH"
 #    define OLED_RENDER_LAYOUT_COLEMAK    "Colemak"
 #    define OLED_RENDER_LAYOUT_DVORAK     "Dvorak"
 #    define OLED_RENDER_LAYOUT_WORKMAN    "Workman"
@@ -139,3 +141,19 @@ void            oled_driver_render_logo_right(void);
 
 
 extern char                      keylog_str[OLED_KEYLOGGER_LENGTH];
+
+#ifndef OLED_WPM_GRAPH_MAX_WPM
+#    define OLED_WPM_GRAPH_MAX_WPM 120
+#endif
+#ifndef OLED_WPM_GRAPH_REFRESH_INTERVAL
+#    define OLED_WPM_GRAPH_REFRESH_INTERVAL 300
+#endif
+#ifndef OLED_WPM_GRAPH_AREA_FILL_INTERVAL
+#    define OLED_WPM_GRAPH_AREA_FILL_INTERVAL 3
+#endif
+#ifndef OLED_WPM_GRAPH_VERTCAL_LINE_INTERVAL
+#    define OLED_WPM_GRAPH_VERTCAL_LINE_INTERVAL 3
+#endif
+#ifndef OLED_WPM_GRAPH_GRAPH_LINE_THICKNESS
+#    define OLED_WPM_GRAPH_GRAPH_LINE_THICKNESS 2
+#endif
diff --git a/users/drashna/pointing/pointing.c b/users/drashna/pointing/pointing.c
index 0116ce0900..0dcfe73f34 100644
--- a/users/drashna/pointing/pointing.c
+++ b/users/drashna/pointing/pointing.c
@@ -42,19 +42,15 @@ report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
                 layer_on(_MOUSE);
             }
         }
-    }
-    return pointing_device_task_keymap(mouse_report);
-}
-
-void matrix_scan_pointing(void) {
-    if (timer_elapsed(mouse_timer) > 650 && layer_state_is(_MOUSE) && !mouse_keycode_tracker && !tap_toggling) {
+    } else if (timer_elapsed(mouse_timer) > 650 && layer_state_is(_MOUSE) && !mouse_keycode_tracker && !tap_toggling) {
         layer_off(_MOUSE);
-    }
-    if (tap_toggling) {
+    } else if (tap_toggling) {
         if (!layer_state_is(_MOUSE)) {
             layer_on(_MOUSE);
         }
     }
+
+    return pointing_device_task_keymap(mouse_report);
 }
 
 bool process_record_pointing(uint16_t keycode, keyrecord_t* record) {
@@ -86,7 +82,7 @@ bool process_record_pointing(uint16_t keycode, keyrecord_t* record) {
         case MO(_MOUSE):
 #if defined(KEYBOARD_ploopy) || defined(KEYBOARD_handwired_tractyl_manuform)
         case DPI_CONFIG:
-#elif defined(KEYBOARD_bastardkb_charybdis)
+#elif defined(KEYBOARD_bastardkb_charybdis) && !defined(NO_CHARYBDIS_KEYCODES)
         case SAFE_RANGE ... (CHARYBDIS_SAFE_RANGE-1):
 #endif
         case KC_MS_UP ... KC_MS_WH_RIGHT:
@@ -98,6 +94,12 @@ bool process_record_pointing(uint16_t keycode, keyrecord_t* record) {
             record->event.pressed ? mouse_keycode_tracker++ : mouse_keycode_tracker--;
             mouse_timer = timer_read();
             break;
+        case QK_ONE_SHOT_MOD ... QK_ONE_SHOT_MOD_MAX:
+            break;
+        case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+            if (record->event.pressed || !record->tap.count) {
+                break;
+            }
         default:
             if (IS_NOEVENT(record->event)) break;
             if ((keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) && (((keycode >> 0x8) & 0xF) == _MOUSE)) {
diff --git a/users/drashna/rgb/rgb_stuff.c b/users/drashna/rgb/rgb_stuff.c
index e0422334aa..09071f7151 100644
--- a/users/drashna/rgb/rgb_stuff.c
+++ b/users/drashna/rgb/rgb_stuff.c
@@ -23,9 +23,29 @@ static bool     is_enabled;
 static bool     is_rgblight_startup;
 static HSV      old_hsv;
 static uint8_t  old_mode;
-static uint16_t rgblight_startup_loop_timer;
+deferred_token rgb_startup_token;
 #    endif
 
+uint32_t rgb_startup_animation(uint32_t triger_time, void *cb_arg) {
+    if (is_rgblight_startup && is_keyboard_master()) {
+        static uint8_t counter = 0;
+        counter++;
+        rgblight_sethsv_noeeprom((counter + old_hsv.h) % 255, 255, 255);
+        if (counter >= 255) {
+            is_rgblight_startup = false;
+            if (userspace_config.rgb_layer_change) {
+                layer_state_set_rgb_light(layer_state);
+            } else {
+                rgblight_set_hsv_and_mode(old_hsv.h, old_hsv.s, old_hsv.v, old_mode);
+            }
+            if (!is_enabled) {
+                rgblight_disable_noeeprom();
+            }
+        }
+    }
+    return is_rgblight_startup ? 10 : 0;
+}
+
 void keyboard_post_init_rgb_light(void) {
 #    if defined(RGBLIGHT_STARTUP_ANIMATION)
     is_enabled = rgblight_is_enabled();
@@ -40,30 +60,8 @@ void keyboard_post_init_rgb_light(void) {
     if (userspace_config.rgb_layer_change) {
         layer_state_set_rgb_light(layer_state);
     }
-}
+    rgb_startup_token = defer_exec(300, rgb_startup_animation, NULL);
 
-void matrix_scan_rgb_light(void) {
-#    if defined(RGBLIGHT_STARTUP_ANIMATION)
-    if (is_rgblight_startup && is_keyboard_master()) {
-        if (sync_timer_elapsed(rgblight_startup_loop_timer) > 10) {
-            static uint8_t counter;
-            counter++;
-            rgblight_sethsv_noeeprom((counter + old_hsv.h) % 255, 255, 255);
-            rgblight_startup_loop_timer = sync_timer_read();
-            if (counter == 255) {
-                is_rgblight_startup = false;
-                if (userspace_config.rgb_layer_change) {
-                    layer_state_set_rgb_light(layer_state);
-                } else {
-                    rgblight_set_hsv_and_mode(old_hsv.h, old_hsv.s, old_hsv.v, old_mode);
-                }
-                if (!is_enabled) {
-                    rgblight_disable_noeeprom();
-                }
-            }
-        }
-    }
-#    endif
 }
 
 layer_state_t layer_state_set_rgb_light(layer_state_t state) {
diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk
index 553cc2cbc7..4bc71b6939 100644
--- a/users/drashna/rules.mk
+++ b/users/drashna/rules.mk
@@ -58,6 +58,7 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
         endif
         ifeq ($(strip $(RGBLIGHT_STARTUP_ANIMATION)), yes)
             OPT_DEFS += -DRGBLIGHT_STARTUP_ANIMATION
+            DEFERRED_EXEC_ENABLE = yes
         endif
     endif
 endif
diff --git a/users/drashna/split/transport_sync.c b/users/drashna/split/transport_sync.c
index 2509e448cb..4c113ec257 100644
--- a/users/drashna/split/transport_sync.c
+++ b/users/drashna/split/transport_sync.c
@@ -8,7 +8,7 @@
 #    include <avr/wdt.h>
 #endif
 
-#ifdef CUSTOM_UNICODE_ENABLE
+#ifdef UNICODE_COMMON_ENABLE
 #    include "process_unicode_common.h"
 extern unicode_config_t unicode_config;
 #endif
@@ -58,7 +58,7 @@ void watchdog_handler(uint8_t in_buflen, const void* in_data, uint8_t out_buflen
 #endif
 
 #ifdef OLED_ENABLE
-#include "oled/oled_stuff.h"
+#    include "oled/oled_stuff.h"
 void keylogger_string_sync(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
     if (initiator2target_buffer_size == OLED_KEYLOGGER_LENGTH) {
         memcpy(&keylog_str, initiator2target_buffer, initiator2target_buffer_size);
@@ -95,7 +95,7 @@ void user_transport_update(void) {
 #if defined(POINTING_DEVICE_ENABLE) && defined(KEYBOARD_handwired_tractyl_manuform)
         user_state.tap_toggling = tap_toggling;
 #endif
-#ifdef UNICODE_ENABLE
+#ifdef UNICODE_COMMON_ENABLE
         user_state.unicode_mode = unicode_config.input_mode;
 #endif
 #ifdef SWAP_HANDS_ENABLE
@@ -108,7 +108,7 @@ void user_transport_update(void) {
         keymap_config.raw    = transport_keymap_config;
         userspace_config.raw = transport_userspace_config;
         user_state.raw       = transport_user_state;
-#ifdef UNICODE_ENABLE
+#ifdef UNICODE_COMMON_ENABLE
         unicode_config.input_mode = user_state.unicode_mode;
 #endif
 #if defined(POINTING_DEVICE_ENABLE) && defined(KEYBOARD_handwired_tractyl_manuform)
@@ -128,7 +128,7 @@ void user_transport_sync(void) {
         static uint32_t last_config = 0, last_sync[4], last_user_state = 0;
         bool            needs_sync = false;
 #ifdef OLED_ENABLE
-        static char     keylog_temp[OLED_KEYLOGGER_LENGTH] = { 0 };
+        static char keylog_temp[OLED_KEYLOGGER_LENGTH] = {0};
 #endif
 
         // Check if the state values are different
@@ -228,7 +228,6 @@ void user_transport_sync(void) {
         }
     }
 #endif
-
 }
 
 void housekeeping_task_user(void) {
diff --git a/users/drashna/split/transport_sync.h b/users/drashna/split/transport_sync.h
index 884586dfdd..f38fdcf1ef 100644
--- a/users/drashna/split/transport_sync.h
+++ b/users/drashna/split/transport_sync.h
@@ -15,7 +15,7 @@ typedef union {
         bool audio_enable         :1;
         bool audio_clicky_enable  :1;
         bool tap_toggling         :1;
-        bool unicode_mode         :1;
+        uint8_t unicode_mode      :3;
         bool swap_hands           :1;
         bool host_driver_disabled :1;
     };

From d1cf218b9dad0d35413349e7b78ff21612958579 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 30 Jan 2022 13:29:43 -0800
Subject: [PATCH 445/867] [Keyboard] Overhaul Tractyl Manuform (#16134)

---
 .../tractyl_manuform/5x6_right/config.h       |   1 -
 .../tractyl_manuform/5x6_right/f411/config.h  |   3 +-
 .../5x6_right/keymaps/drashna/keymap.c        |   4 +-
 keyboards/handwired/tractyl_manuform/config.h |   2 -
 .../tractyl_manuform/tractyl_manuform.c       | 451 +++++++++++++-----
 .../tractyl_manuform/tractyl_manuform.h       | 118 ++++-
 users/drashna/oled/oled_stuff.c               |   2 +-
 users/drashna/pointing/pointing.c             |   4 +-
 8 files changed, 433 insertions(+), 152 deletions(-)

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
index 59cd098fdb..b4f09e5e87 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
@@ -50,5 +50,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-#define POINTING_DEVICE_TASK_THROTTLE
 #define POINTING_DEVICE_RIGHT
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 6ae51ca6f0..87c3239057 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -79,7 +79,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define I2C1_SDA_PIN      B9
 #define I2C1_SCL_PAL_MODE 4
 #define I2C1_SDA_PAL_MODE 4
-// #define I2C1_CLOCK_SPEED  400000
+#define I2C1_CLOCK_SPEED  400000
+#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
 
 /* encoder config */
 #define ENCODERS_PAD_A \
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
index fa1e8897ee..570760cf66 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -61,8 +61,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_MOUSE] = LAYOUT_5x6_right(
         _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                        KC_WH_U, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                        KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, DPI_CONFIG,
+        _______, _______, _______, _______, _______, _______,                        KC_WH_U, DPI_MOD, DPI_RMOD,S_D_MOD, S_D_RMOD,DRGSCRL,
+        _______, _______, _______, _______, _______, _______,                        KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
         _______, _______, _______, _______, _______, _______,                        KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
                           _______, _______,                                                            _______, _______,
                                             _______, _______,                                 KC_BTN3,
diff --git a/keyboards/handwired/tractyl_manuform/config.h b/keyboards/handwired/tractyl_manuform/config.h
index 15c8102b8f..f9160ea148 100644
--- a/keyboards/handwired/tractyl_manuform/config.h
+++ b/keyboards/handwired/tractyl_manuform/config.h
@@ -24,8 +24,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID               0x44DD
 #define MANUFACTURER            Drashna
 
-#define USB_POLLING_INTERVAL_MS 1
-
 /* disable debug print */
 // #define NO_DEBUG
 
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
index 5bdc57ca09..033146134d 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
@@ -18,114 +18,368 @@
 #include "transactions.h"
 #include <string.h>
 
-#ifndef TRACKBALL_DPI_OPTIONS
-#    define TRACKBALL_DPI_OPTIONS \
-        { 1200, 1600, 2400 }
-#    ifndef TRACKBALL_DPI_DEFAULT
-#        define TRACKBALL_DPI_DEFAULT 1
-#    endif
-#endif
-#ifndef TRACKBALL_DPI_DEFAULT
-#    define TRACKBALL_DPI_DEFAULT 0
-#endif
+#ifdef CONSOLE_ENABLE
+#    include "print.h"
+#endif  // CONSOLE_ENABLE
 
-keyboard_config_t keyboard_config;
-kb_config_data_t  kb_config_data;
-uint16_t          dpi_array[] = TRACKBALL_DPI_OPTIONS;
-#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
+#ifdef POINTING_DEVICE_ENABLE
+#    ifndef CHARYBDIS_MINIMUM_DEFAULT_DPI
+#        define CHARYBDIS_MINIMUM_DEFAULT_DPI 400
+#    endif  // CHARYBDIS_MINIMUM_DEFAULT_DPI
+
+#    ifndef CHARYBDIS_DEFAULT_DPI_CONFIG_STEP
+#        define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 200
+#    endif  // CHARYBDIS_DEFAULT_DPI_CONFIG_STEP
+
+#    ifndef CHARYBDIS_MINIMUM_SNIPING_DPI
+#        define CHARYBDIS_MINIMUM_SNIPING_DPI 200
+#    endif  // CHARYBDIS_MINIMUM_SNIPER_MODE_DPI
+
+#    ifndef CHARYBDIS_SNIPING_DPI_CONFIG_STEP
+#        define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
+#    endif  // CHARYBDIS_SNIPING_DPI_CONFIG_STEP
+
+// Fixed DPI for drag-scroll.
+#    ifndef CHARYBDIS_DRAGSCROLL_DPI
+#        define CHARYBDIS_DRAGSCROLL_DPI 100
+#    endif  // CHARYBDIS_DRAGSCROLL_DPI
+
+#    ifndef CHARYBDIS_DRAGSCROLL_BUFFER_SIZE
+#        define CHARYBDIS_DRAGSCROLL_BUFFER_SIZE 6
+#    endif  // !CHARYBDIS_DRAGSCROLL_BUFFER_SIZE
+
+#    ifndef CHARYBDIS_POINTER_ACCELERATION_FACTOR
+#        define CHARYBDIS_POINTER_ACCELERATION_FACTOR 24
+#    endif  // !CHARYBDIS_POINTER_ACCELERATION_FACTOR
+
+typedef union {
+    uint8_t raw;
+    struct {
+        uint8_t pointer_default_dpi : 4;  // 16 steps available.
+        uint8_t pointer_sniping_dpi : 2;  // 4 steps available.
+        bool    is_dragscroll_enabled : 1;
+        bool    is_sniping_enabled : 1;
+    } __attribute__((packed));
+} charybdis_config_t;
+
+static charybdis_config_t g_charybdis_config = {0};
+
+/**
+ * \brief Set the value of `config` from EEPROM.
+ *
+ * Note that `is_dragscroll_enabled` and `is_sniping_enabled` are purposefully
+ * ignored since we do not want to persist this state to memory.  In practice,
+ * this state is always written to maximize write-performances.  Therefore, we
+ * explicitly set them to `false` in this function.
+ */
+static void read_charybdis_config_from_eeprom(charybdis_config_t* config) {
+    config->raw                   = eeconfig_read_kb() & 0xff;
+    config->is_dragscroll_enabled = false;
+    config->is_sniping_enabled    = false;
+}
+
+/**
+ * \brief Save the value of `config` to eeprom.
+ *
+ * Note that all values are written verbatim, including whether drag-scroll
+ * and/or sniper mode are enabled.  `read_charybdis_config_from_eeprom(…)`
+ * resets these 2 values to `false` since it does not make sense to persist
+ * these across reboots of the board.
+ */
+static void write_charybdis_config_to_eeprom(charybdis_config_t* config) { eeconfig_update_kb(config->raw); }
+
+/** \brief Return the current value of the pointer's default DPI. */
+static uint16_t get_pointer_default_dpi(charybdis_config_t* config) { return (uint16_t)config->pointer_default_dpi * CHARYBDIS_DEFAULT_DPI_CONFIG_STEP + CHARYBDIS_MINIMUM_DEFAULT_DPI; }
+
+/** \brief Return the current value of the pointer's sniper-mode DPI. */
+static uint16_t get_pointer_sniping_dpi(charybdis_config_t* config) { return (uint16_t)config->pointer_sniping_dpi * CHARYBDIS_SNIPING_DPI_CONFIG_STEP + CHARYBDIS_MINIMUM_SNIPING_DPI; }
+
+/** \brief Set the appropriate DPI for the input config. */
+static void maybe_update_pointing_device_cpi(charybdis_config_t* config) {
+    if (config->is_dragscroll_enabled) {
+        pointing_device_set_cpi(CHARYBDIS_DRAGSCROLL_DPI);
+    } else if (config->is_sniping_enabled) {
+        pointing_device_set_cpi(get_pointer_sniping_dpi(config));
+    } else {
+        pointing_device_set_cpi(get_pointer_default_dpi(config));
+    }
+}
+
+/**
+ * \brief Update the pointer's default DPI to the next or previous step.
+ *
+ * Increases the DPI value if `forward` is `true`, decreases it otherwise.
+ * The increment/decrement steps are equal to CHARYBDIS_DEFAULT_DPI_CONFIG_STEP.
+ */
+static void step_pointer_default_dpi(charybdis_config_t* config, bool forward) {
+    config->pointer_default_dpi += forward ? 1 : -1;
+    maybe_update_pointing_device_cpi(config);
+}
+
+/**
+ * \brief Update the pointer's sniper-mode DPI to the next or previous step.
+ *
+ * Increases the DPI value if `forward` is `true`, decreases it otherwise.
+ * The increment/decrement steps are equal to CHARYBDIS_SNIPING_DPI_CONFIG_STEP.
+ */
+static void step_pointer_sniping_dpi(charybdis_config_t* config, bool forward) {
+    config->pointer_sniping_dpi += forward ? 1 : -1;
+    maybe_update_pointing_device_cpi(config);
+}
+
+uint16_t charybdis_get_pointer_default_dpi(void) { return get_pointer_default_dpi(&g_charybdis_config); }
+
+uint16_t charybdis_get_pointer_sniping_dpi(void) { return get_pointer_sniping_dpi(&g_charybdis_config); }
+
+void charybdis_cycle_pointer_default_dpi_noeeprom(bool forward) { step_pointer_default_dpi(&g_charybdis_config, forward); }
+
+void charybdis_cycle_pointer_default_dpi(bool forward) {
+    step_pointer_default_dpi(&g_charybdis_config, forward);
+    write_charybdis_config_to_eeprom(&g_charybdis_config);
+}
+
+void charybdis_cycle_pointer_sniping_dpi_noeeprom(bool forward) { step_pointer_sniping_dpi(&g_charybdis_config, forward); }
+
+void charybdis_cycle_pointer_sniping_dpi(bool forward) {
+    step_pointer_sniping_dpi(&g_charybdis_config, forward);
+    write_charybdis_config_to_eeprom(&g_charybdis_config);
+}
+
+bool charybdis_get_pointer_sniping_enabled(void) { return g_charybdis_config.is_sniping_enabled; }
+
+void charybdis_set_pointer_sniping_enabled(bool enable) {
+    g_charybdis_config.is_sniping_enabled = enable;
+    maybe_update_pointing_device_cpi(&g_charybdis_config);
+}
+
+bool charybdis_get_pointer_dragscroll_enabled(void) { return g_charybdis_config.is_dragscroll_enabled; }
+
+void charybdis_set_pointer_dragscroll_enabled(bool enable) {
+    g_charybdis_config.is_dragscroll_enabled = enable;
+    maybe_update_pointing_device_cpi(&g_charybdis_config);
+}
+
+void pointing_device_init_kb(void) { maybe_update_pointing_device_cpi(&g_charybdis_config); }
+
+#    ifndef CONSTRAIN_HID
+#        define CONSTRAIN_HID(value) ((value) < -127 ? -127 : ((value) > 127 ? 127 : (value)))
+#    endif  // !CONSTRAIN_HID
+
+/**
+ * \brief Add optional acceleration effect.
+ *
+ * If `CHARYBDIS_ENABLE_POINTER_ACCELERATION` is defined, add a simple and naive
+ * acceleration effect to the provided value.  Return the value unchanged
+ * otherwise.
+ */
+#    ifndef DISPLACEMENT_WITH_ACCELERATION
+#        ifdef CHARYBDIS_POINTER_ACCELERATION_ENABLE
+#            define DISPLACEMENT_WITH_ACCELERATION(d) (CONSTRAIN_HID(d > 0 ? d * d / CHARYBDIS_POINTER_ACCELERATION_FACTOR + d : -d * d / CHARYBDIS_POINTER_ACCELERATION_FACTOR + d))
+#        else  // !CHARYBDIS_POINTER_ACCELERATION_ENABLE
+#            define DISPLACEMENT_WITH_ACCELERATION(d) (d)
+#        endif  // CHARYBDIS_POINTER_ACCELERATION_ENABLE
+#    endif      // !DISPLACEMENT_WITH_ACCELERATION
+
+/**
+ * \brief Augment the pointing device behavior.
+ *
+ * Implement the Charybdis-specific features for pointing devices:
+ *   - Drag-scroll
+ *   - Sniping
+ *   - Acceleration
+ */
+static void pointing_device_task_charybdis(report_mouse_t* mouse_report) {
+    static int16_t scroll_buffer_x = 0;
+    static int16_t scroll_buffer_y = 0;
+    if (g_charybdis_config.is_dragscroll_enabled) {
+#    ifdef CHARYBDIS_DRAGSCROLL_REVERSE_X
+        scroll_buffer_x -= mouse_report->x;
+#    else
+        scroll_buffer_x += mouse_report->x;
+#    endif  // CHARYBDIS_DRAGSCROLL_REVERSE_X
+#    ifdef CHARYBDIS_DRAGSCROLL_REVERSE_Y
+        scroll_buffer_y -= mouse_report->y;
+#    else
+        scroll_buffer_y += mouse_report->y;
+#    endif  // CHARYBDIS_DRAGSCROLL_REVERSE_Y
+        mouse_report->x = 0;
+        mouse_report->y = 0;
+        if (abs(scroll_buffer_x) > CHARYBDIS_DRAGSCROLL_BUFFER_SIZE) {
+            mouse_report->h = scroll_buffer_x > 0 ? 1 : -1;
+            scroll_buffer_x = 0;
+        }
+        if (abs(scroll_buffer_y) > CHARYBDIS_DRAGSCROLL_BUFFER_SIZE) {
+            mouse_report->v = scroll_buffer_y > 0 ? 1 : -1;
+            scroll_buffer_y = 0;
+        }
+    } else if (!g_charybdis_config.is_sniping_enabled) {
+        mouse_report->x = DISPLACEMENT_WITH_ACCELERATION(mouse_report->x);
+        mouse_report->y = DISPLACEMENT_WITH_ACCELERATION(mouse_report->y);
+    }
+}
+
+report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
+    pointing_device_task_charybdis(&mouse_report);
+    mouse_report = pointing_device_task_user(mouse_report);
+
+    return mouse_report;
+}
+
+#    if defined(POINTING_DEVICE_ENABLE) && !defined(NO_CHARYBDIS_KEYCODES)
+/** \brief Whether SHIFT mod is enabled. */
+static bool has_shift_mod(void) {
+#        ifdef NO_ACTION_ONESHOT
+    return mod_config(get_mods()) & MOD_MASK_SHIFT;
+#        else
+    return mod_config(get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT;
+#        endif  // NO_ACTION_ONESHOT
+}
+#    endif  // POINTING_DEVICE_ENABLE && !NO_CHARYBDIS_KEYCODES
+
+/**
+ * \brief Outputs the Charybdis configuration to console.
+ *
+ * Prints the in-memory configuration structure to console, for debugging.
+ * Includes:
+ *   - raw value
+ *   - drag-scroll: on/off
+ *   - sniping: on/off
+ *   - default DPI: internal table index/actual DPI
+ *   - sniping DPI: internal table index/actual DPI
+ */
+static void debug_charybdis_config_to_console(charybdis_config_t* config) {
+#    ifdef CONSOLE_ENABLE
+    dprintf("(charybdis) process_record_kb: config = {\n"
+            "\traw = 0x%04X,\n"
+            "\t{\n"
+            "\t\tis_dragscroll_enabled=%b\n"
+            "\t\tis_sniping_enabled=%b\n"
+            "\t\tdefault_dpi=0x%02X (%ld)\n"
+            "\t\tsniping_dpi=0x%01X (%ld)\n"
+            "\t}\n"
+            "}\n",
+            config->raw, config->is_dragscroll_enabled, config->is_sniping_enabled, config->pointer_default_dpi, get_pointer_default_dpi(config), config->pointer_sniping_dpi, get_pointer_sniping_dpi(config));
+#    endif  // CONSOLE_ENABLE
+}
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
     if (!process_record_user(keycode, record)) {
+        debug_charybdis_config_to_console(&g_charybdis_config);
         return false;
     }
-
-#ifdef POINTING_DEVICE_ENABLE
-    if (keycode == DPI_CONFIG && record->event.pressed) {
-        if ((get_mods() | get_oneshot_mods()) & MOD_MASK_SHIFT) {
-            keyboard_config.dpi_config = (keyboard_config.dpi_config - 1) % DPI_OPTION_SIZE;
-        } else {
-            keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE;
-        }
-        eeconfig_update_kb(keyboard_config.raw);
-        kb_config_data.device_cpi = dpi_array[keyboard_config.dpi_config];
-        pointing_device_set_cpi(kb_config_data.device_cpi);
+#    ifndef NO_CHARYBDIS_KEYCODES
+    switch (keycode) {
+        case POINTER_DEFAULT_DPI_FORWARD:
+            if (record->event.pressed) {
+                // Step backward if shifted, forward otherwise.
+                charybdis_cycle_pointer_default_dpi(/* forward= */ !has_shift_mod());
+            }
+            break;
+        case POINTER_DEFAULT_DPI_REVERSE:
+            if (record->event.pressed) {
+                // Step forward if shifted, backward otherwise.
+                charybdis_cycle_pointer_default_dpi(/* forward= */ has_shift_mod());
+            }
+            break;
+        case POINTER_SNIPING_DPI_FORWARD:
+            if (record->event.pressed) {
+                // Step backward if shifted, forward otherwise.
+                charybdis_cycle_pointer_sniping_dpi(/* forward= */ !has_shift_mod());
+            }
+            break;
+        case POINTER_SNIPING_DPI_REVERSE:
+            if (record->event.pressed) {
+                // Step forward if shifted, backward otherwise.
+                charybdis_cycle_pointer_sniping_dpi(/* forward= */ has_shift_mod());
+            }
+            break;
+        case SNIPING_MODE:
+            charybdis_set_pointer_sniping_enabled(record->event.pressed);
+            break;
+        case SNIPING_MODE_TOGGLE:
+            if (record->event.pressed) {
+                charybdis_set_pointer_sniping_enabled(!charybdis_get_pointer_sniping_enabled());
+            }
+            break;
+        case DRAGSCROLL_MODE:
+            charybdis_set_pointer_dragscroll_enabled(record->event.pressed);
+            break;
+        case DRAGSCROLL_MODE_TOGGLE:
+            if (record->event.pressed) {
+                charybdis_set_pointer_dragscroll_enabled(!charybdis_get_pointer_dragscroll_enabled());
+            }
+            break;
     }
-#endif
-
-/* If Mousekeys is disabled, then use handle the mouse button
- * keycodes.  This makes things simpler, and allows usage of
- * the keycodes in a consistent manner.  But only do this if
- * Mousekeys is not enable, so it's not handled twice.
- */
-#ifndef MOUSEKEY_ENABLE
+#    endif  // !NO_CHARYBDIS_KEYCODES
+#    ifndef MOUSEKEY_ENABLE
+    // Simulate mouse keys if full support is not enabled (reduces firmware size
+    // while maintaining support for mouse keys).
     if (IS_MOUSEKEY_BUTTON(keycode)) {
-        report_mouse_t currentReport = pointing_device_get_report();
-        currentReport.buttons        = pointing_device_handle_buttons(currentReport.buttons, record->event.pressed, keycode - KC_MS_BTN1);
-        pointing_device_set_report(currentReport);
+        report_mouse_t mouse_report = pointing_device_get_report();
+        mouse_report.buttons        = pointing_device_handle_buttons(mouse_report.buttons, record->event.pressed, keycode - KC_MS_BTN1);
+        pointing_device_set_report(mouse_report);
         pointing_device_send();
     }
-#endif
-
+#    endif  // !MOUSEKEY_ENABLE
+    debug_charybdis_config_to_console(&g_charybdis_config);
     return true;
 }
-__attribute__((weak)) void keyboard_pre_init_sub(void) {}
-void                       keyboard_pre_init_kb(void) {
-    // debug_enable  = true;
-    // debug_matrix  = true;
-    // debug_mouse   = true;
-    // debug_encoder = true;
 
-    // This is the debug LED.
-#if defined(DEBUG_LED_PIN)
-    setPinOutput(DEBUG_LED_PIN);
-    writePin(DEBUG_LED_PIN, !debug_enable);
-#endif
+void eeconfig_init_kb(void) {
+    g_charybdis_config.raw = 0;
+    write_charybdis_config_to_eeprom(&g_charybdis_config);
+    maybe_update_pointing_device_cpi(&g_charybdis_config);
+    eeconfig_init_user();
+}
 
-    memset(&kb_config_data, 0, sizeof(kb_config_data));
+void matrix_power_up(void) { pointing_device_task(); }
 
-    keyboard_pre_init_sub();
-    keyboard_pre_init_user();
+void charybdis_config_sync_handler(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
+    if (initiator2target_buffer_size == sizeof(g_charybdis_config)) {
+        memcpy(&g_charybdis_config, initiator2target_buffer, sizeof(g_charybdis_config));
+    }
 }
 
 void keyboard_post_init_kb(void) {
-    transaction_register_rpc(RPC_ID_KB_CONFIG_SYNC, kb_config_sync_handler);
+    transaction_register_rpc(RPC_ID_KB_CONFIG_SYNC, charybdis_config_sync_handler);
 
     keyboard_post_init_user();
 }
 
-#ifdef POINTING_DEVICE_ENABLE
-void pointing_device_init_kb(void) {
-    kb_config_data.device_cpi = dpi_array[keyboard_config.dpi_config];
-    pointing_device_set_cpi(kb_config_data.device_cpi);
-    pointing_device_init_user();
-}
-
-report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
+void housekeeping_task_kb(void) {
     if (is_keyboard_master()) {
-        mouse_report = pointing_device_task_user(mouse_report);
-    }
-    return mouse_report;
-}
-#endif
+        // Keep track of the last state, so that we can tell if we need to propagate to slave
+        static charybdis_config_t last_charybdis_config = {0};
+        static uint32_t           last_sync             = 0;
+        bool                      needs_sync            = false;
 
-void eeconfig_init_kb(void) {
-    keyboard_config.dpi_config = TRACKBALL_DPI_DEFAULT;
-#ifdef POINTING_DEVICE_ENABLE
-    kb_config_data.device_cpi = dpi_array[keyboard_config.dpi_config];
-    pointing_device_set_cpi(kb_config_data.device_cpi);
-#endif
-    eeconfig_update_kb(keyboard_config.raw);
-    eeconfig_init_user();
+        // Check if the state values are different
+        if (memcmp(&g_charybdis_config, &last_charybdis_config, sizeof(g_charybdis_config))) {
+            needs_sync = true;
+            memcpy(&last_charybdis_config, &g_charybdis_config, sizeof(g_charybdis_config));
+        }
+        // Send to slave every 500ms regardless of state change
+        if (timer_elapsed32(last_sync) > 500) {
+            needs_sync = true;
+        }
+
+        // Perform the sync if requested
+        if (needs_sync) {
+            if (transaction_rpc_send(RPC_ID_KB_CONFIG_SYNC, sizeof(g_charybdis_config), &g_charybdis_config)) {
+                last_sync = timer_read32();
+            }
+        }
+    }
+    // no need for user function, is called already
 }
 
+#endif  // POINTING_DEVICE_ENABLE
+
 __attribute__((weak)) void matrix_init_sub_kb(void) {}
 void                       matrix_init_kb(void) {
-    // is safe to just read DPI setting since matrix init
-    // comes before pointing device init.
-    keyboard_config.raw = eeconfig_read_kb();
-    if (keyboard_config.dpi_config > DPI_OPTION_SIZE) {
-        eeconfig_init_kb();
-    }
+#ifdef POINTING_DEVICE_ENABLE
+    read_charybdis_config_from_eeprom(&g_charybdis_config);
+#endif  // POINTING_DEVICE_ENABLE
     matrix_init_sub_kb();
     matrix_init_user();
 }
@@ -135,40 +389,3 @@ void                       matrix_scan_kb(void) {
     matrix_scan_sub_kb();
     matrix_scan_user();
 }
-
-void housekeeping_task_kb(void) {
-    if (is_keyboard_master()) {
-        // Keep track of the last state, so that we can tell if we need to propagate to slave
-        static kb_config_data_t last_kb_config;
-        static uint32_t         last_sync  = 0;
-        bool                    needs_sync = false;
-
-        // Check if the state values are different
-        if (memcmp(&kb_config_data, &last_kb_config, sizeof(kb_config_data))) {
-            needs_sync = true;
-            memcpy(&last_kb_config, &kb_config_data, sizeof(kb_config_data));
-        }
-        // Send to slave every 500ms regardless of state change
-        if (timer_elapsed32(last_sync) > 500) {
-            needs_sync = true;
-        }
-
-        // Perform the sync if requested
-        if (needs_sync) {
-            if (transaction_rpc_send(RPC_ID_KB_CONFIG_SYNC, sizeof(kb_config_data), &kb_config_data)) {
-                last_sync = timer_read32();
-            }
-        }
-    }
-    // no need for user function, is called already
-}
-
-void kb_config_sync_handler(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
-    if (initiator2target_buffer_size == sizeof(kb_config_data)) {
-        memcpy(&kb_config_data, initiator2target_buffer, sizeof(kb_config_data));
-    }
-}
-
-#ifdef POINTING_DEVICE_ENABLE
-void matrix_power_up(void) { pointing_device_task(); }
-#endif
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
index 3f8aca4551..197aee985e 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #include "quantum.h"
-#include "pointing_device.h"
 
 #if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right)
 #    include "5x6_right.h"
@@ -25,33 +24,100 @@
 #    include "4x6_right.h"
 #endif
 
-typedef union {
-    uint32_t raw;
-    struct {
-        uint8_t dpi_config;
-    };
-} keyboard_config_t;
-
-typedef union {
-    uint32_t raw;
-    struct {
-        uint16_t device_cpi;
-    };
-} kb_config_data_t;
-
-extern keyboard_config_t keyboard_config;
-extern kb_config_data_t kb_config_data;
-
-enum ploopy_keycodes {
-    DPI_CONFIG = SAFE_RANGE,
+#ifdef POINTING_DEVICE_ENABLE
+#    ifndef NO_CHARYBDIS_KEYCODES
+enum charybdis_keycodes {
+#        ifdef VIA_ENABLE
+    POINTER_DEFAULT_DPI_FORWARD = USER00,
+#        else
+    POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE,
+#        endif  // VIA_ENABLE
+    POINTER_DEFAULT_DPI_REVERSE,
+    POINTER_SNIPING_DPI_FORWARD,
+    POINTER_SNIPING_DPI_REVERSE,
+    SNIPING_MODE,
+    SNIPING_MODE_TOGGLE,
+    DRAGSCROLL_MODE,
+    DRAGSCROLL_MODE_TOGGLE,
     KEYMAP_SAFE_RANGE,
 };
+#        define CHARYBDIS_SAFE_RANGE KEYMAP_SAFE_RANGE
+#        define DPI_MOD POINTER_DEFAULT_DPI_FORWARD
+#        define DPI_RMOD POINTER_DEFAULT_DPI_REVERSE
+#        define S_D_MOD POINTER_SNIPING_DPI_FORWARD
+#        define S_D_RMOD POINTER_SNIPING_DPI_REVERSE
+#        define SNIPING SNIPING_MODE
+#        define SNP_TOG SNIPING_MODE_TOGGLE
+#        define DRGSCRL DRAGSCROLL_MODE
+#        define DRG_TOG DRAGSCROLL_MODE_TOGGLE
+#    endif  // !NO_CHARYBDIS_KEYCODES
+
+/** \brief Return the current DPI value for the pointer's default mode. */
+uint16_t charybdis_get_pointer_default_dpi(void);
+
+/**
+ * \brief Update the pointer's default DPI to the next or previous step.
+ *
+ * Increases the DPI value if `forward` is `true`, decreases it otherwise.
+ * The increment/decrement steps are equal to CHARYBDIS_DEFAULT_DPI_CONFIG_STEP.
+ *
+ * The new value is persisted in EEPROM.
+ */
+void charybdis_cycle_pointer_default_dpi(bool forward);
+
+/**
+ * \brief Same as `charybdis_cycle_pointer_default_dpi`, but do not write to
+ * EEPROM.
+ *
+ * This means that reseting the board will revert the value to the last
+ * persisted one.
+ */
+void charybdis_cycle_pointer_default_dpi_noeeprom(bool forward);
+
+/** \brief Return the current DPI value for the pointer's sniper-mode. */
+uint16_t charybdis_get_pointer_sniping_dpi(void);
+
+/**
+ * \brief Update the pointer's sniper-mode DPI to the next or previous step.
+ *
+ * Increases the DPI value if `forward` is `true`, decreases it otherwise.
+ * The increment/decrement steps are equal to CHARYBDIS_SNIPING_DPI_CONFIG_STEP.
+ *
+ * The new value is persisted in EEPROM.
+ */
+void charybdis_cycle_pointer_sniping_dpi(bool forward);
+
+/**
+ * \brief Same as `charybdis_cycle_pointer_sniping_dpi`, but do not write to
+ * EEPROM.
+ *
+ * This means that reseting the board will revert the value to the last
+ * persisted one.
+ */
+void charybdis_cycle_pointer_sniping_dpi_noeeprom(bool forward);
+
+/** \brief Whether sniper-mode is enabled. */
+bool charybdis_get_pointer_sniping_enabled(void);
+
+/**
+ * \brief Enable/disable sniper mode.
+ *
+ * When sniper mode is enabled the dpi is reduced to slow down the pointer for
+ * more accurate movements.
+ */
+void charybdis_set_pointer_sniping_enabled(bool enable);
+
+/** \brief Whether drag-scroll is enabled. */
+bool charybdis_get_pointer_dragscroll_enabled(void);
+
+/**
+ * \brief Enable/disable drag-scroll mode.
+ *
+ * When drag-scroll mode is enabled, horizontal and vertical pointer movements
+ * are translated into horizontal and vertical scroll movements.
+ */
+void charybdis_set_pointer_dragscroll_enabled(bool enable);
+#endif  // POINTING_DEVICE_ENABLE
 
 void matrix_init_sub_kb(void);
 void matrix_scan_sub_kb(void);
-
-void keyboard_pre_init_sync(void);
-void keyboard_post_init_sync(void);
-void housekeeping_task_sync(void);
-
-void kb_config_sync_handler(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer);
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index c850c5336f..752829e0fa 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -953,7 +953,7 @@ void oled_driver_render_logo_left(void) {
     render_matrix_scan_rate(2);
 #    endif
     oled_set_cursor(7, 2);
-#    if defined(KEYBOARD_bastardkb_charybdis)
+#    if defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)
     render_pointing_dpi_status(charybdis_get_pointer_sniping_enabled() ? charybdis_get_pointer_sniping_dpi() : charybdis_get_pointer_default_dpi(), 1);
 
 // credit and thanks to jaspertandy on discord for these images
diff --git a/users/drashna/pointing/pointing.c b/users/drashna/pointing/pointing.c
index 0dcfe73f34..d0a83e2c26 100644
--- a/users/drashna/pointing/pointing.c
+++ b/users/drashna/pointing/pointing.c
@@ -80,9 +80,9 @@ bool process_record_pointing(uint16_t keycode, keyrecord_t* record) {
             }
             break;
         case MO(_MOUSE):
-#if defined(KEYBOARD_ploopy) || defined(KEYBOARD_handwired_tractyl_manuform)
+#if defined(KEYBOARD_ploopy)
         case DPI_CONFIG:
-#elif defined(KEYBOARD_bastardkb_charybdis) && !defined(NO_CHARYBDIS_KEYCODES)
+#elif (defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)) && !defined(NO_CHARYBDIS_KEYCODES)
         case SAFE_RANGE ... (CHARYBDIS_SAFE_RANGE-1):
 #endif
         case KC_MS_UP ... KC_MS_WH_RIGHT:

From 9af9af73f434bba966cbd15fc8a65c7297e90f6a Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 31 Jan 2022 08:48:05 +1100
Subject: [PATCH 446/867] Fix up default folder locations. (#16135)

---
 keyboards/25keys/aleth42/rules.mk      | 2 +-
 keyboards/maple_computing/ivy/rules.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/25keys/aleth42/rules.mk b/keyboards/25keys/aleth42/rules.mk
index 8d130979b8..8034ad5440 100644
--- a/keyboards/25keys/aleth42/rules.mk
+++ b/keyboards/25keys/aleth42/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = aleth42/rev1
+DEFAULT_FOLDER = 25keys/aleth42/rev1
diff --git a/keyboards/maple_computing/ivy/rules.mk b/keyboards/maple_computing/ivy/rules.mk
index 66812904cd..c076565dfc 100644
--- a/keyboards/maple_computing/ivy/rules.mk
+++ b/keyboards/maple_computing/ivy/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
-DEFAULT_FOLDER = ivy/rev1
+DEFAULT_FOLDER = maple_computing/ivy/rev1

From bdca5132a47795b53a180e33d90200f6ac0f8b28 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 31 Jan 2022 10:07:40 +1100
Subject: [PATCH 447/867] Fave84H/87H: Fix stray closing brace in default
 keymap (#16136)

---
 keyboards/linworks/fave84h/keymaps/default/keymap.c | 4 +---
 keyboards/linworks/fave87h/keymaps/default/keymap.c | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/keyboards/linworks/fave84h/keymaps/default/keymap.c b/keyboards/linworks/fave84h/keymaps/default/keymap.c
index 7c90788546..5b65733221 100644
--- a/keyboards/linworks/fave84h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave84h/keymaps/default/keymap.c
@@ -38,8 +38,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_AUDIO_VOL_UP,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     )
-    
-    };
 };
 
 void rgb_matrix_indicators_user(void) {
@@ -47,4 +45,4 @@ void rgb_matrix_indicators_user(void) {
     if (host_leds.caps_lock) {
         rgb_matrix_set_color(12, 254, 189, 41); // set caps lock led color first number is index, R G B
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/linworks/fave87h/keymaps/default/keymap.c b/keyboards/linworks/fave87h/keymaps/default/keymap.c
index 661c48f452..0f93bc13f0 100644
--- a/keyboards/linworks/fave87h/keymaps/default/keymap.c
+++ b/keyboards/linworks/fave87h/keymaps/default/keymap.c
@@ -38,7 +38,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_AUDIO_VOL_UP,
         KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,    KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
     )
-    };
 };
 
 void rgb_matrix_indicators_user(void) {
@@ -46,4 +45,4 @@ void rgb_matrix_indicators_user(void) {
     if (host_leds.caps_lock) {
         rgb_matrix_set_color(12, 254, 189, 41); // set caps lock led color first number is index, R G B
     }
-}
\ No newline at end of file
+}

From c6a613ef7c7135ad6c9e6d4f78beeb29b21f4d42 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 30 Jan 2022 15:09:46 -0800
Subject: [PATCH 448/867] gergoplex: add QMK Configurator data (#16138)

---
 keyboards/gboards/gergoplex/info.json | 50 +++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 keyboards/gboards/gergoplex/info.json

diff --git a/keyboards/gboards/gergoplex/info.json b/keyboards/gboards/gergoplex/info.json
new file mode 100644
index 0000000000..5aa696d5de
--- /dev/null
+++ b/keyboards/gboards/gergoplex/info.json
@@ -0,0 +1,50 @@
+{
+    "keyboard_name": "GergoPlex",
+    "url": "",
+    "maintainer": "germ",
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0.25},
+                {"label":"L01", "x":1, "y":0.125},
+                {"label":"L02", "x":2, "y":0},
+                {"label":"L03", "x":3, "y":0.125},
+                {"label":"L04", "x":4, "y":0.375},
+                {"label":"R00", "x":8, "y":0.375},
+                {"label":"R01", "x":9, "y":0.125},
+                {"label":"R02", "x":10, "y":0},
+                {"label":"R03", "x":11, "y":0.125},
+                {"label":"R04", "x":12, "y":0.25},
+
+                {"label":"L10", "x":0, "y":1.25},
+                {"label":"L11", "x":1, "y":1.125},
+                {"label":"L12", "x":2, "y":1},
+                {"label":"L13", "x":3, "y":1.125},
+                {"label":"L14", "x":4, "y":1.375},
+                {"label":"R10", "x":8, "y":1.375},
+                {"label":"R11", "x":9, "y":1.125},
+                {"label":"R12", "x":10, "y":1},
+                {"label":"R13", "x":11, "y":1.125},
+                {"label":"R14", "x":12, "y":1.25},
+
+                {"label":"L20", "x":0, "y":2.25},
+                {"label":"L21", "x":1, "y":2.125},
+                {"label":"L22", "x":2, "y":2},
+                {"label":"L23", "x":3, "y":2.125},
+                {"label":"L24", "x":4, "y":2.375},
+                {"label":"R20", "x":8, "y":2.375},
+                {"label":"R21", "x":9, "y":2.125},
+                {"label":"R22", "x":10, "y":2},
+                {"label":"R23", "x":11, "y":2.125},
+                {"label":"R24", "x":12, "y":2.25},
+
+                {"label":"L30", "x":2, "y":3.5},
+                {"label":"L31", "x":3.25, "y":3.625, "w":1.5},
+                {"label":"L32", "x":5, "y":3.125, "h":2},
+                {"label":"R30", "x":7, "y":3.125, "h":2},
+                {"label":"R31", "x":8.25, "y":3.625, "w":1.5},
+                {"label":"R32", "x":10, "y":3.5}
+            ]
+        }
+    }
+}

From 2e13f7d9f00df0b7b08d890cb71568698014f77e Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 30 Jan 2022 15:10:42 -0800
Subject: [PATCH 449/867] Mechlovin Olly BB Touch-Up (#16137)

* fix keymap alignment

Both the `default` and `via` keymaps had misalignments on the top 3 layers, which was misleading as to which keycode was on which switch on those layers.

* fix layout macro reference in info.json

* friendly-format info.json, phase 1

Adds line breaks between keyboard rows.

* correct info.json key sequence

* bb.h: use XXX for KC_NO

* bb.h: add matrix diagram

* add LAYOUT_ansi_split_bs

Includes reference keymap.

* add LAYOUT_iso_split_bs

Includes reference keymap.

* info.json: remove meta key
---
 keyboards/mechlovin/olly/bb/bb.h              |  67 +++++-
 keyboards/mechlovin/olly/bb/info.json         | 208 +++++++++++++++++-
 .../olly/bb/keymaps/default/keymap.c          |  32 +--
 .../bb/keymaps/default_ansi_split_bs/keymap.c |  52 +++++
 .../keymaps/default_ansi_split_bs/readme.md   |   1 +
 .../bb/keymaps/default_iso_split_bs/keymap.c  |  52 +++++
 .../bb/keymaps/default_iso_split_bs/readme.md |   1 +
 .../mechlovin/olly/bb/keymaps/via/keymap.c    |  32 +--
 8 files changed, 401 insertions(+), 44 deletions(-)
 create mode 100644 keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/keymap.c
 create mode 100644 keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/readme.md
 create mode 100644 keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/keymap.c
 create mode 100644 keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/readme.md

diff --git a/keyboards/mechlovin/olly/bb/bb.h b/keyboards/mechlovin/olly/bb/bb.h
index 91a8f23896..7980a1c4ef 100644
--- a/keyboards/mechlovin/olly/bb/bb.h
+++ b/keyboards/mechlovin/olly/bb/bb.h
@@ -18,6 +18,35 @@
 
 #include "quantum.h"
 
+#define XXX KC_NO
+
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐      ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D ││0E ││0F │0G │0H │0I │      │0D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤      └─┬─────┤                ┌───┐
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2E   ││1E ││1F │1G │1H │1I │        │     │                │   │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘├───┼───┼───┼───┤     ┌──┴┐2D  │ ISO Enter      │2I │ 2u Plus
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │     │2F │2G │2H │2I │     │2C │    │                │   │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ├───┼───┼───┼───┤   ┌─┴───┴────┤                ├───┤
+ * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │┌───┐│3F │3G │3H │3I │   │3C        │ 2.75u RShift   │   │
+ * └────────┘   ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬──┴─┬────┼───┘│3E │└───┼───┼───┼───┤   └──────────┘                │4I │ 2u Enter
+ *              │40   │41 │43   │46                      │4A  │4B  │4C  │┌───┼───┼───┐│4G │4H │4I │                               │   │
+ *              └─────┴───┴─────┴────────────────────────┴────┴────┴────┘│4D │4E │4F │└───┴───┴───┘                               └───┘
+ *                                                                       └───┴───┴───┘┌───────┐
+ *              ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐             │4G     │ 2u 0
+ *              │40  │41  │43  │46                      │4A   │4B   │4C │             └───────┘
+ *              └────┴────┴────┴────────────────────────┴─────┴─────┴───┘
+ *              ┌────┬────┬────┬────────────────────────┬─────┬───┬─────┐
+ *              │40  │41  │43  │46                      │4A   │4B │4C   │
+ *              └────┴────┴────┴────────────────────────┴─────┴───┴─────┘
+ *              ┌────┬────┬────┬────────────────────────┬─────┬────┬────┐
+ *              │40  │41  │43  │46                      │4A   │4B  │4C  │
+ *              └────┴────┴────┴────────────────────────┴─────┴────┴────┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬─────┐
+ *              │40   │41 │43   │46                         │4B   │4C   │
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴─────┘
+ */
+
 #define LAYOUT_all( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E,     K0F, K0G, K0H, K0I, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2E,      K1E,     K1F, K1G, K1H, K1I, \
@@ -25,9 +54,37 @@
     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E,     K3F, K3G, K3H, K3I, \
     K40, K41, K43,                K46,                K4A, K4B, K4C,      K4D, K4E, K4F,     K4G, K4H, K4I  \
 ) { \
-    { K00, K01, K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
-    { K10, K11, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
-    { K20, K21, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I }, \
-    { K30, K31, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I }, \
-    { K40, K41, KC_NO, K43, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \
+}
+
+#define LAYOUT_ansi_split_bs( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E,     K0F, K0G, K0H, K0I, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2E,      K1E,     K1F, K1G, K1H, K1I, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,               K2F, K2G, K2H, K2I, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E,     K3F, K3G, K3H, K3I, \
+    K40, K41, K43,                K46,                K4A, K4B, K4C,      K4D, K4E, K4F,     K4G, K4H, K4I  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E, K2F, K2G, K2H, K2I }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \
+}
+
+#define LAYOUT_iso_split_bs( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, K0E,     K0F, K0G, K0H, K0I, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,           K1E,     K1F, K1G, K1H, K1I, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,               K2F, K2G, K2H, K2I, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E,     K3F, K3G, K3H, K3I, \
+    K40, K41, K43,                K46,                K4A, K4B, K4C,      K4D, K4E, K4F,     K4G, K4H, K4I  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F, K2G, K2H, K2I }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I }, \
+    { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I }, \
 }
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/info.json
index 90e07662fd..fbc9bae3eb 100644
--- a/keyboards/mechlovin/olly/bb/info.json
+++ b/keyboards/mechlovin/olly/bb/info.json
@@ -3,7 +3,7 @@
     "url": "",
     "maintainer": "Mechlovin' Studio",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
                 { "label": "K00 (B0,B5)", "x": 0, "y": 0 },
                 { "label": "K01 (B0,B6)", "x": 1, "y": 0 },
@@ -25,6 +25,7 @@
                 { "label": "K0G (B0,D5)", "x": 17.5, "y": 0 },
                 { "label": "K0H (B0,D6)", "x": 18.5, "y": 0 },
                 { "label": "K0I (B0,D7)", "x": 19.5, "y": 0 },
+
                 { "label": "K10 (B1,B5)", "x": 0, "y": 1, "w": 1.5 },
                 { "label": "K11 (B1,B6)", "x": 1.5, "y": 1 },
                 { "label": "K12 (B1,B7)", "x": 2.5, "y": 1 },
@@ -44,6 +45,7 @@
                 { "label": "K1G (B1,D5)", "x": 17.5, "y": 1 },
                 { "label": "K1H (B1,D6)", "x": 18.5, "y": 1 },
                 { "label": "K1I (B1,D7)", "x": 19.5, "y": 1 },
+
                 { "label": "K20 (B2,B5)", "x": 0, "y": 2, "w": 1.75 },
                 { "label": "K21 (B2,B6)", "x": 1.75, "y": 2 },
                 { "label": "K22 (B2,B7)", "x": 2.75, "y": 2 },
@@ -62,6 +64,7 @@
                 { "label": "K2G (B2,D5)", "x": 17.5, "y": 2 },
                 { "label": "K2H (B2,D6)", "x": 18.5, "y": 2 },
                 { "label": "K2I (B2,D7)", "x": 19.5, "y": 2 },
+
                 { "label": "K30 (B3,B5)", "x": 0, "y": 3, "w": 1.25 },
                 { "label": "K31 (B3,B6)", "x": 1.25, "y": 3 },
                 { "label": "K32 (B3,B7)", "x": 2.25, "y": 3 },
@@ -76,11 +79,12 @@
                 { "label": "K3B (B3,D0)", "x": 11.25, "y": 3 },
                 { "label": "K3C (B3,D1)", "x": 12.25, "y": 3, "w": 1.75 },
                 { "label": "K3D (B3,D2)", "x": 14, "y": 3 },
+                { "label": "K3E (B3,D3)", "x": 15.25, "y": 3.25 },
                 { "label": "K3F (B3,D4)", "x": 16.5, "y": 3 },
                 { "label": "K3G (B3,D5)", "x": 17.5, "y": 3 },
                 { "label": "K3H (B3,D6)", "x": 18.5, "y": 3 },
                 { "label": "K3I (B3,D7)", "x": 19.5, "y": 3 },
-                { "label": "K3E (B3,D3)", "x": 15.25, "y": 3.25 },
+
                 { "label": "K40 (B4,B5)", "x": 0, "y": 4, "w": 1.5 },
                 { "label": "K41 (B4,B6)", "x": 1.5, "y": 4 },
                 { "label": "K43 (B4,C0)", "x": 2.5, "y": 4, "w": 1.5 },
@@ -88,14 +92,204 @@
                 { "label": "K4A (B4,C7)", "x": 10.25, "y": 4, "w": 1.25 },
                 { "label": "K4B (B4,D0)", "x": 11.5, "y": 4, "w": 1.25 },
                 { "label": "K4C (B4,D1)", "x": 12.75, "y": 4, "w": 1.25 },
-                { "label": "K4G (B4,D5)", "x": 17.5, "y": 4 },
-                { "label": "K4H (B4,D6)", "x": 18.5, "y": 4 },
-                { "label": "K4I (B4,D7)", "x": 19.5, "y": 4 },
                 { "label": "K4D (B4,D2)", "x": 14.25, "y": 4.25 },
                 { "label": "K4E (B4,D3)", "x": 15.25, "y": 4.25 },
-                { "label": "K4F (B4,D4)", "x": 16.25, "y": 4.25 }
+                { "label": "K4F (B4,D4)", "x": 16.25, "y": 4.25 },
+                { "label": "K4G (B4,D5)", "x": 17.5, "y": 4 },
+                { "label": "K4H (B4,D6)", "x": 18.5, "y": 4 },
+                { "label": "K4I (B4,D7)", "x": 19.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "1!", "x": 1, "y": 0 },
+                { "label": "2@", "x": 2, "y": 0 },
+                { "label": "3#", "x": 3, "y": 0 },
+                { "label": "4$", "x": 4, "y": 0 },
+                { "label": "5%", "x": 5, "y": 0 },
+                { "label": "6^", "x": 6, "y": 0 },
+                { "label": "7*", "x": 7, "y": 0 },
+                { "label": "8*", "x": 8, "y": 0 },
+                { "label": "9(", "x": 9, "y": 0 },
+                { "label": "0)", "x": 10, "y": 0 },
+                { "label": "-_", "x": 11, "y": 0 },
+                { "label": "=+", "x": 12, "y": 0 },
+                { "label": "Backspace", "x": 13, "y": 0 },
+                { "label": "Backspace", "x": 14, "y": 0 },
+                { "label": "Insert", "x": 15.25, "y": 0 },
+                { "label": "Num Lock", "x": 16.5, "y": 0 },
+                { "label": "/", "x": 17.5, "y": 0 },
+                { "label": "*", "x": 18.5, "y": 0 },
+                { "label": "Pause", "x": 19.5, "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": "7", "x": 16.5, "y": 1 },
+                { "label": "8", "x": 17.5, "y": 1 },
+                { "label": "9", "x": 18.5, "y": 1 },
+                { "label": "-", "x": 19.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": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
+                { "label": "4", "x": 16.5, "y": 2 },
+                { "label": "5", "x": 17.5, "y": 2 },
+                { "label": "6", "x": 18.5, "y": 2 },
+                { "label": "+", "x": 19.5, "y": 2 },
+
+                { "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": 1.75 },
+                { "label": "Fn", "x": 14, "y": 3 },
+                { "label": "\u2191", "x": 15.25, "y": 3.25 },
+                { "label": "1", "x": 16.5, "y": 3 },
+                { "label": "2", "x": 17.5, "y": 3 },
+                { "label": "3", "x": 18.5, "y": 3 },
+                { "label": "Enter", "x": 19.5, "y": 3 },
+
+                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 },
+                { "label": "GUI", "x": 1.5, "y": 4 },
+                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 },
+                { "label": "Space", "x": 4, "y": 4, "w": 6.25 },
+                { "label": "Alt", "x": 10.25, "y": 4, "w": 1.25 },
+                { "label": "GUI", "x": 11.5, "y": 4, "w": 1.25 },
+                { "label": "Ctrl", "x": 12.75, "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 },
+                { "label": "0", "x": 17.5, "y": 4 },
+                { "label": ".", "x": 18.5, "y": 4 },
+                { "label": "Enter", "x": 19.5, "y": 4 }
+            ]
+        },
+        "LAYOUT_iso_split_bs": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "1!", "x": 1, "y": 0 },
+                { "label": "2\"", "x": 2, "y": 0 },
+                { "label": "3\u00a3", "x": 3, "y": 0 },
+                { "label": "4$", "x": 4, "y": 0 },
+                { "label": "5%", "x": 5, "y": 0 },
+                { "label": "6^", "x": 6, "y": 0 },
+                { "label": "7*", "x": 7, "y": 0 },
+                { "label": "8*", "x": 8, "y": 0 },
+                { "label": "9(", "x": 9, "y": 0 },
+                { "label": "0)", "x": 10, "y": 0 },
+                { "label": "-_", "x": 11, "y": 0 },
+                { "label": "=+", "x": 12, "y": 0 },
+                { "label": "Backspace", "x": 13, "y": 0 },
+                { "label": "Backspace", "x": 14, "y": 0 },
+                { "label": "Insert", "x": 15.25, "y": 0 },
+                { "label": "Num Lock", "x": 16.5, "y": 0 },
+                { "label": "/", "x": 17.5, "y": 0 },
+                { "label": "*", "x": 18.5, "y": 0 },
+                { "label": "Pause", "x": 19.5, "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": "Delete", "x": 15.25, "y": 1 },
+                { "label": "7", "x": 16.5, "y": 1 },
+                { "label": "8", "x": 17.5, "y": 1 },
+                { "label": "9", "x": 18.5, "y": 1 },
+                { "label": "-", "x": 19.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": "4", "x": 16.5, "y": 2 },
+                { "label": "5", "x": 17.5, "y": 2 },
+                { "label": "6", "x": 18.5, "y": 2 },
+                { "label": "+", "x": 19.5, "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": 1.75 },
+                { "label": "Fn", "x": 14, "y": 3 },
+                { "label": "\u2191", "x": 15.25, "y": 3.25 },
+                { "label": "1", "x": 16.5, "y": 3 },
+                { "label": "2", "x": 17.5, "y": 3 },
+                { "label": "3", "x": 18.5, "y": 3 },
+                { "label": "Enter", "x": 19.5, "y": 3 },
+
+                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 },
+                { "label": "GUI", "x": 1.5, "y": 4 },
+                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 },
+                { "label": "Space", "x": 4, "y": 4, "w": 6.25 },
+                { "label": "Alt", "x": 10.25, "y": 4, "w": 1.25 },
+                { "label": "GUI", "x": 11.5, "y": 4, "w": 1.25 },
+                { "label": "Ctrl", "x": 12.75, "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 },
+                { "label": "0", "x": 17.5, "y": 4 },
+                { "label": ".", "x": 18.5, "y": 4 },
+                { "label": "Enter", "x": 19.5, "y": 4 }
             ]
         }
     }
-    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
 }
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c
index c7c0da223e..d1bcb7cb29 100644
--- a/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/olly/bb/keymaps/default/keymap.c
@@ -24,25 +24,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT,          KC_P0,   KC_PDOT, KC_PENT
     ),
     [1] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [2] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [3] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-};
\ No newline at end of file
+};
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/keymap.c
new file mode 100644
index 0000000000..652cf85c98
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2021 mechlovin, QMK (James Young @noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_ansi_split_bs(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+        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_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT,          KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [1] = LAYOUT_ansi_split_bs(
+        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_PSCR, KC_SLCK, KC_PAUS,          _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                            _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______,          KC_HOME, KC_PGDN, KC_END,           _______, _______, _______
+    ),
+
+    [2] = LAYOUT_ansi_split_bs(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                            _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______,          _______, _______, _______
+    ),
+
+    [3] = LAYOUT_ansi_split_bs(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                            _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______,          _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/readme.md b/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/readme.md
new file mode 100644
index 0000000000..95cffc54a0
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/keymaps/default_ansi_split_bs/readme.md
@@ -0,0 +1 @@
+# The default_ansi_split_bs keymap for Olly BB
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/keymap.c
new file mode 100644
index 0000000000..e0abc90c4e
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2021 mechlovin, QMK (James Young @noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_iso_split_bs(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_INS,           KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+        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_DEL,           KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                             KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT,          KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [1] = LAYOUT_iso_split_bs(
+        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_PSCR, KC_SLCK,                   _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUS, _______,                            _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______,          KC_HOME, KC_PGDN, KC_END,           _______, _______, _______
+    ),
+
+    [2] = LAYOUT_iso_split_bs(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______,          _______, _______, _______
+    ),
+
+    [3] = LAYOUT_iso_split_bs(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______,          _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/readme.md b/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/readme.md
new file mode 100644
index 0000000000..7ad1086f94
--- /dev/null
+++ b/keyboards/mechlovin/olly/bb/keymaps/default_iso_split_bs/readme.md
@@ -0,0 +1 @@
+# The default_iso_split_bs keymap for Olly BB
diff --git a/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c b/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c
index c7c0da223e..d1bcb7cb29 100644
--- a/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/olly/bb/keymaps/via/keymap.c
@@ -24,25 +24,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT,          KC_P0,   KC_PDOT, KC_PENT
     ),
     [1] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [2] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
     ),
     [3] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-};
\ No newline at end of file
+};

From 4277dc3ac9a56884e4fd4069c30c225fc8da92d2 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 30 Jan 2022 17:26:27 -0800
Subject: [PATCH 450/867] wilba.tech WT60-H3 Layout Macro Refactor (#16140)

* move ISO Enter argument to home row

Moves the ISO Enter key's argument to the home row to conform to QMK's standard for traditionally-staggered boards.

* update info.json data
---
 keyboards/wilba_tech/wt60_h3/info.json        | 74 ++++++++++++++++++-
 .../wt60_h3/keymaps/default/keymap.c          | 12 +--
 keyboards/wilba_tech/wt60_h3/wt60_h3.h        |  6 +-
 3 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/keyboards/wilba_tech/wt60_h3/info.json b/keyboards/wilba_tech/wt60_h3/info.json
index ce15146843..2a255f6017 100644
--- a/keyboards/wilba_tech/wt60_h3/info.json
+++ b/keyboards/wilba_tech/wt60_h3/info.json
@@ -2,9 +2,79 @@
     "keyboard_name": "wilba.tech WT60-H3", 
     "url": "https://wilba.tech", 
     "maintainer": "Wilba", 
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_60_iso_tsangan_split_rshift"
+    },
     "layouts": {
-        "LAYOUT_all": {
-            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
+        "LAYOUT_60_iso_tsangan_split_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+
+                {"x":0, "y":4, "w":1.5},
+                {"x":1.5, "y":4},
+                {"x":2.5, "y":4, "w":1.5},
+                {"x":4, "y":4, "w":7},
+                {"x":11, "y":4, "w":1.5},
+                {"x":12.5, "y":4},
+                {"x":13.5, "y":4, "w":1.5}
+            ]
         }
     }
 }
diff --git a/keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c
index 3e8edca10f..a4f24c12e9 100644
--- a/keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c
@@ -21,32 +21,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	// Default layer
 	[0] = LAYOUT_all(
 		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,
-		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,
+		KC_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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
 		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
 		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL),
 
 	// Fn1 Layer
 	[1] = LAYOUT_all(
 		KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS,
+		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
 
 	// Fn2 Layer
 	[2] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS),
 
 	// Fn3 Layer
 	[3] = LAYOUT_all(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS),
 };
diff --git a/keyboards/wilba_tech/wt60_h3/wt60_h3.h b/keyboards/wilba_tech/wt60_h3/wt60_h3.h
index a8edb59c66..84ca69ffc2 100644
--- a/keyboards/wilba_tech/wt60_h3/wt60_h3.h
+++ b/keyboards/wilba_tech/wt60_h3/wt60_h3.h
@@ -20,10 +20,10 @@
 
 #define ____ KC_NO
 
-#define LAYOUT_all( \
+#define LAYOUT_60_iso_tsangan_split_rshift( \
     K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K113, \
     K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
     K400, K401, K402,                   K406,                         K411, K412, K413  \
 ) { \

From 7512e58cfee443da78ee3a0fa4c333080ef1a6f9 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 31 Jan 2022 03:16:04 -0800
Subject: [PATCH 451/867] KapCave Arya: Fix QMK Configurator Implementation
 (#16145)

* move layout macro alias to info.json

* info.json: fix layout macro reference

* info.json: fix layout data

Original layout data was generated with rotation, which breaks the rendering.

* info.json: remove layout macro alias

It's not used anywhere, so no need to keep it.

* rules.mk: enable Community Layout support
---
 keyboards/kapcave/arya/arya.h    |   5 --
 keyboards/kapcave/arya/info.json | 140 ++++++++++++++++---------------
 keyboards/kapcave/arya/rules.mk  |   2 +
 3 files changed, 74 insertions(+), 73 deletions(-)

diff --git a/keyboards/kapcave/arya/arya.h b/keyboards/kapcave/arya/arya.h
index ea1d1916c3..38e4afaf05 100644
--- a/keyboards/kapcave/arya/arya.h
+++ b/keyboards/kapcave/arya/arya.h
@@ -36,8 +36,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   { KC_NO  , K71  , K72  , K73  , K74  , K75  , K76  , K77 }, \
   { K80  , K81  , K82  , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}  \
 }
-
-
-
-
-#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/keyboards/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json
index fb220aa070..72ee2e1d74 100644
--- a/keyboards/kapcave/arya/info.json
+++ b/keyboards/kapcave/arya/info.json
@@ -3,75 +3,79 @@
     "url": "https://kapcave.com/products/arya", 
     "maintainer": "nachie", 
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_alice_split_bs": {
             "layout": [
-                {"label":"Esc", "x":2.75, "y":5.9},
-                {"label":"\u00ac", "x":4, "y":6.0},
-                {"label":"!", "x":5, "y":6.0},
-                {"label":"\"", "x":6, "y":6.0},
-                {"label":"_", "x":15.25, "y":6.0},
-                {"label":"+", "x":16.25, "y":6.0},
-                {"label":"", "x":17.25, "y":6.0},
-                {"label":"", "x":18.25, "y":6.0},
-                {"label":"Pg Up", "x":2.5, "y":6.9},
-                {"label":"Tab", "x":3.75, "y":7.0, "w":1.5},
-                {"label":"Q", "x":5.25, "y":7.0},
-                {"label":"P", "x":15, "y":7.0},
-                {"label":"{", "x":16, "y":7.0},
-                {"label":"}", "x":17, "y":7.0},
-                {"label":"|", "x":18, "y":7.0, "w":1.5},
-                {"label":"Pg Dn", "x":2.25, "y":7.9},
-                {"label":"Caps Lock", "x":3.5, "y":8.0, "w":1.75},
-                {"label":"A", "x":5.25, "y":8.0},
-                {"label":":", "x":15.5, "y":8.0},
-                {"label":"\"", "x":16.5, "y":8.0},
-                {"label":"Enter", "x":17.5, "y":8.0, "w":2.25},
-                {"label":"Shift", "x":3.25, "y":9.0, "w":2.25},
-                {"label":"Z", "x":5.5, "y":9.0},
-                {"label":">", "x":15.25, "y":9.0},
-                {"label":"?", "x":16.25, "y":9.0},
-                {"label":"Shift", "x":17.25, "y":9.0, "w":1.75},
-                {"label":"Fn", "x":19, "y":9.0},
-                {"label":"Ctrl", "x":3.25, "y":10.0, "w":1.5},
-                {"label":"Ctrl", "x":18.25, "y":10.0, "w":1.5},
-                {"label":"\u00a3", "x":8.25, "y":4.5},
-                {"label":"$", "x":9.25, "y":4.5},
-                {"label":"%", "x":10.25, "y":4.5},
-                {"label":"^", "x":11.25, "y":4.5},
-                {"label":"W", "x":7.75, "y":5.5},
-                {"label":"E", "x":8.75, "y":5.5},
-                {"label":"R", "x":9.75, "y":5.5},
-                {"label":"T", "x":10.75, "y":5.5},
-                {"label":"S", "x":8, "y":6.5},
-                {"label":"D", "x":9, "y":6.5},
-                {"label":"F", "x":10, "y":6.5},
-                {"label":"G", "x":11, "y":6.5},
-                {"label":"X", "x":8.5, "y":7.5},
-                {"label":"C", "x":9.5, "y":7.5},
-                {"label":"V", "x":10.5, "y":7.5},
-                {"label":"B", "x":11.5, "y":7.5},
-                {"label":"Alt", "x":8.25, "y":8.5, "w":1.5},
-                {"label":"", "x":9.75, "y":8.5, "w":2},
-                {"label":"Fn", "x":11.75, "y":8.5, "w":1.25},
-                {"label":"&", "x":9.5, "y":9.0},
-                {"label":"*", "x":10.5, "y":9.0},
-                {"label":"(", "x":11.5, "y":9.0},
-                {"label":")", "x":12.5, "y":9.0},
-                {"label":"Y", "x":9, "y":10.0},
-                {"label":"U", "x":10, "y":10.0},
-                {"label":"I", "x":11, "y":10.0},
-                {"label":"O", "x":12, "y":10.0},
-                {"label":"H", "x":9.25, "y":11.0},
-                {"label":"J", "x":10.25, "y":11.0},
-                {"label":"K", "x":11.25, "y":11.0},
-                {"label":"L", "x":12.25, "y":11.0},
-                {"label":"Fn", "x":8.75, "y":12.0},
-                {"label":"N", "x":9.75, "y":12.0},
-                {"label":"M", "x":10.75, "y":12.0},
-                {"label":"<", "x":11.75, "y":12.0},
-                {"label":"Shift", "x":8.75, "y":13.0, "w":2.75},
-                {"label":"Alt", "x":11.5, "y":13.0, "w":1.5}
+                {"x":0.4, "y":0},
+                {"x":1.55, "y":0.1},
+                {"x":2.55, "y":0.1},
+                {"x":3.55, "y":0},
+                {"x":4.55, "y":0.1},
+                {"x":5.55, "y":0.1},
+                {"x":6.55, "y":0.1},
+                {"x":7.55, "y":0.1},
+                {"x":9.75, "y":0.1},
+                {"x":10.75, "y":0.1},
+                {"x":11.75, "y":0.1},
+                {"x":12.75, "y":0.1},
+                {"x":13.75, "y":0},
+                {"x":14.75, "y":0.1},
+                {"x":15.75, "y":0.1},
+                {"x":16.75, "y":0.1},
+
+                {"x":0.2, "y":1.0},
+                {"x":1.35, "y":1.1, "w":1.5},
+                {"x":2.85, "y":1.1},
+                {"x":3.85, "y":1.1},
+                {"x":4.85, "y":1.1},
+                {"x":5.85, "y":1.1},
+                {"x":6.85, "y":1.1},
+                {"x":9.45, "y":1.1},
+                {"x":10.45, "y":1.1},
+                {"x":11.45, "y":1.1},
+                {"x":12.45, "y":1.1},
+                {"x":13.45, "y":1.1},
+                {"x":14.45, "y":1.1},
+                {"x":15.45, "y":1.1},
+                {"x":16.45, "y":1.1, "w":1.5},
+
+                {"x":0, "y":2.0},
+                {"x":1.15, "y":2.1, "w":1.75},
+                {"x":2.9, "y":2.1},
+                {"x":3.9, "y":2.1},
+                {"x":4.9, "y":2.1},
+                {"x":5.9, "y":2.1},
+                {"x":6.9, "y":2.1},
+                {"x":9.9, "y":2.1},
+                {"x":10.9, "y":2.1},
+                {"x":11.9, "y":2.1},
+                {"x":12.9, "y":2.1},
+                {"x":13.9, "y":2.1},
+                {"x":14.9, "y":2.1},
+                {"x":15.9, "y":2.1, "w":2.25},
+
+                {"x":0.95, "y":3.1, "w":2.25},
+                {"x":3.2, "y":3.1},
+                {"x":4.2, "y":3.1},
+                {"x":5.2, "y":3.1},
+                {"x":6.2, "y":3.1},
+                {"x":7.2, "y":3.1},
+                {"x":9.6, "y":3.1},
+                {"x":10.6, "y":3.1},
+                {"x":11.6, "y":3.1},
+                {"x":12.6, "y":3.1},
+                {"x":13.6, "y":3.1},
+                {"x":14.6, "y":3.1},
+                {"x":15.6, "y":3.1, "w":1.75},
+                {"x":17.35, "y":3.1},
+
+                {"x":0.95, "y":4.1, "w":1.5},
+                {"x":3.85, "y":4.1, "w":1.5},
+                {"x":5.35, "y":4.1, "w":2},
+                {"x":7.35, "y":4.1, "w":1.25},
+                {"x":9.6, "y":4.1, "w":2.75},
+                {"x":12.35, "y":4.1, "w":1.5},
+                {"x":16.65, "y":4.1, "w":1.5}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/kapcave/arya/rules.mk b/keyboards/kapcave/arya/rules.mk
index 09800a48f2..5ceb651b1c 100644
--- a/keyboards/kapcave/arya/rules.mk
+++ b/keyboards/kapcave/arya/rules.mk
@@ -20,3 +20,5 @@ ENCODER_ENABLE = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+LAYOUTS = alice_split_bs

From 37093eb9298f130193bfc6bfa024a7553a3ec596 Mon Sep 17 00:00:00 2001
From: Laneware <68452738+Laneware@users.noreply.github.com>
Date: Tue, 1 Feb 2022 05:31:32 +1000
Subject: [PATCH 452/867] [Keyboard] Add LW67 keyboard (#16141)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/lw67/config.h                       |  53 +++++++
 keyboards/lw67/info.json                      |  22 +++
 keyboards/lw67/keymaps/ansi/keymap.c          |  41 ++++++
 .../keymaps/ansi_split_backspace/keymap.c     |  41 ++++++
 keyboards/lw67/keymaps/iso/keymap.c           |  41 ++++++
 .../lw67/keymaps/iso_split_backspace/keymap.c |  41 ++++++
 keyboards/lw67/keymaps/via/keymap.c           |  47 ++++++
 keyboards/lw67/keymaps/via/rules.mk           |   1 +
 keyboards/lw67/lw67.c                         |  30 ++++
 keyboards/lw67/lw67.h                         | 135 ++++++++++++++++++
 keyboards/lw67/readme.md                      |  22 +++
 keyboards/lw67/rules.mk                       |  19 +++
 12 files changed, 493 insertions(+)
 create mode 100644 keyboards/lw67/config.h
 create mode 100644 keyboards/lw67/info.json
 create mode 100644 keyboards/lw67/keymaps/ansi/keymap.c
 create mode 100644 keyboards/lw67/keymaps/ansi_split_backspace/keymap.c
 create mode 100644 keyboards/lw67/keymaps/iso/keymap.c
 create mode 100644 keyboards/lw67/keymaps/iso_split_backspace/keymap.c
 create mode 100644 keyboards/lw67/keymaps/via/keymap.c
 create mode 100644 keyboards/lw67/keymaps/via/rules.mk
 create mode 100644 keyboards/lw67/lw67.c
 create mode 100644 keyboards/lw67/lw67.h
 create mode 100644 keyboards/lw67/readme.md
 create mode 100644 keyboards/lw67/rules.mk

diff --git a/keyboards/lw67/config.h b/keyboards/lw67/config.h
new file mode 100644
index 0000000000..3561f4a2ad
--- /dev/null
+++ b/keyboards/lw67/config.h
@@ -0,0 +1,53 @@
+/* Copyright 2021 Laneware Peripherals 
+  * 
+  * 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       0x4C50
+#define PRODUCT_ID      0x9998
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Laneware Peripherals
+#define PRODUCT         LW-67
+
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { E6, B7, D0, D1, D2 }
+#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, B0, B1 }
+#define UNUSED_PINS
+
+/*ENCODER*/
+#define ENCODERS_PAD_A { F0 }
+#define ENCODERS_PAD_B { F1 }
+#define ENCODER_RESOLUTION 4
+
+/* 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
diff --git a/keyboards/lw67/info.json b/keyboards/lw67/info.json
new file mode 100644
index 0000000000..6bccc7bce3
--- /dev/null
+++ b/keyboards/lw67/info.json
@@ -0,0 +1,22 @@
+{
+    "keyboard_name": "LW67", 
+    "url": "", 
+    "maintainer": "qmk", 
+    "layouts":{
+      "LAYOUT_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":"Mute", "x":16, "y":0.5}, {"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":"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":2}, {"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":"PgDn", "x":16.5, "y":3}, {"label":"\u2191", "x":15.25, "y":3.25}, {"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":"Alt", "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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
+        }, 
+
+      "LAYOUT_ansi_splitbs": {
+         "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":"~", "x":13, "y":0}, {"label":"Backspace", "x":14, "y":0}, {"label":"Mute", "x":16, "y":0.5}, {"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":"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "y":2}, {"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":"PgDn", "x":16.5, "y":3}, {"label":"\u2191", "x":15.25, "y":3.25}, {"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":"Alt", "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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
+        },
+
+      "LAYOUT_iso": {
+         "layout": [{"label":"Esc", "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":"Mute", "x":16, "y":0.5}, {"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":"Delete", "x":15.5, "y":2}, {"label":"PgUp", "x":16.5, "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":"PgDn", "x":16.5, "y":3}, {"label":"\u2191", "x":15.25, "y":3.25}, {"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":"\u2190", "x":14.25, "y":4.25}, {"label":"\u2193", "x":15.25, "y":4.25}, {"label":"\u2192", "x":16.25, "y":4.25}]
+        },
+
+     "LAYOUT_iso_splitbs": {
+          "layout": [{"label":"Esc", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"\"", "x":2, "y":1.5}, {"label":"\u00a3", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"\u00ac", "x":13, "y":1.5}, {"label":"Backspace", "x":14, "y":1.5}, {"label":"Mute", "x":16, "y":2}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"@", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Delete", "x":15.5, "y":3.5}, {"label":"PgUp", "x":16.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"PgDn", "x":16.5, "y":4.5}, {"label":"\u2191", "x":15.25, "y":4.75}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"AltGr", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"\u2190", "x":14.25, "y":5.75}, {"label":"\u2193", "x":15.25, "y":5.75}, {"label":"\u2192", "x":16.25, "y":5.75}]
+        }
+    }
+}
diff --git a/keyboards/lw67/keymaps/ansi/keymap.c b/keyboards/lw67/keymaps/ansi/keymap.c
new file mode 100644
index 0000000000..ba0fa41b87
--- /dev/null
+++ b/keyboards/lw67/keymaps/ansi/keymap.c
@@ -0,0 +1,41 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_ansi(
+		KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_MPLY, 
+		KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
+		KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN, KC_QUOT, KC_ENT,  KC_DEL,   KC_PGUP, 
+		KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_ansi(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_ansi(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), };
+
diff --git a/keyboards/lw67/keymaps/ansi_split_backspace/keymap.c b/keyboards/lw67/keymaps/ansi_split_backspace/keymap.c
new file mode 100644
index 0000000000..25c72a9cbc
--- /dev/null
+++ b/keyboards/lw67/keymaps/ansi_split_backspace/keymap.c
@@ -0,0 +1,41 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_ansi_splitbs(
+		KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_GRAVE,  KC_BSPC, KC_MPLY, 
+		KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,     KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
+		KC_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN, KC_QUOT, KC_ENT,  KC_DEL,   KC_PGUP, 
+		KC_LSFT, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_ansi_splitbs(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_ansi_splitbs(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), };
+
diff --git a/keyboards/lw67/keymaps/iso/keymap.c b/keyboards/lw67/keymaps/iso/keymap.c
new file mode 100644
index 0000000000..1f8b6aad69
--- /dev/null
+++ b/keyboards/lw67/keymaps/iso/keymap.c
@@ -0,0 +1,41 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_iso(
+		KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_MPLY, 
+		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_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_DEL,   KC_PGUP, 
+		KC_LSFT, KC_NUBS, KC_Z,    KC_X,   KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_iso(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_iso(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), };
+
diff --git a/keyboards/lw67/keymaps/iso_split_backspace/keymap.c b/keyboards/lw67/keymaps/iso_split_backspace/keymap.c
new file mode 100644
index 0000000000..c2a9e2c5b3
--- /dev/null
+++ b/keyboards/lw67/keymaps/iso_split_backspace/keymap.c
@@ -0,0 +1,41 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_iso_splitbs(
+		KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_GRAVE,  KC_BSPC, KC_MPLY, 
+		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_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_DEL,   KC_PGUP, 
+		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_iso_splitbs(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_iso_splitbs(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), };
+
diff --git a/keyboards/lw67/keymaps/via/keymap.c b/keyboards/lw67/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6f1bc704b6
--- /dev/null
+++ b/keyboards/lw67/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_iso_splitbs(
+		KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,    KC_MINS, KC_EQL,  KC_GRAVE,  KC_BSPC, KC_MPLY, 
+		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_CAPS, KC_A,    KC_S,    KC_D,   KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,     KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_DEL,   KC_PGUP, 
+		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT_iso_splitbs(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_iso_splitbs(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[3] = LAYOUT_iso_splitbs(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), };
diff --git a/keyboards/lw67/keymaps/via/rules.mk b/keyboards/lw67/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/lw67/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/lw67/lw67.c b/keyboards/lw67/lw67.c
new file mode 100644
index 0000000000..87eaa1671e
--- /dev/null
+++ b/keyboards/lw67/lw67.c
@@ -0,0 +1,30 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * 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 "lw67.h"
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) return false;
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } 
+        return false; 
+}
+
diff --git a/keyboards/lw67/lw67.h b/keyboards/lw67/lw67.h
new file mode 100644
index 0000000000..554109eed9
--- /dev/null
+++ b/keyboards/lw67/lw67.h
@@ -0,0 +1,135 @@
+ /* Copyright 2021 Laneware Peripherals
+  * 
+  * 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"
+
+/* LAYOUT_ANSI
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │000│001│002│003│004│005│006│007│008│009│010│011│012│  013  │   ┌───┐
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤   │015│
+ * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│ 113 │   └───┘
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌───┬───┐
+ * │ 200  │201│202│203│204│205│206│207│208│209│210│211│  213   │ │214│215│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ └───┼───┤
+ * │   300  │302│303│304│305│306│307│308│309│310│311│    312   │┌───┐│314│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘│313│└───┘
+ * │ 400│ 401│ 402│          403           │ 404│ 405│ 406│ ┌───┼───┼───┐
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┘ │407│408│409│
+ *                                                          └───┴───┴───┘
+ */
+
+#define LAYOUT_ansi( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,             \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, K215, \
+	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, KC_NO }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214,  K215 }, \
+	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  KC_NO }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
+}
+
+/* LAYOUT_ANSISPLITBS
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │000│001│002│003│004│005│006│007│008│009│010│011│012│013│014│   ┌───┐
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   │015│
+ * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│ 113 │   └───┘
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌───┬───┐
+ * │ 200  │201│202│203│204│205│206│207│208│209│210│211│  213   │ │214│215│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ └───┼───┤
+ * │   300  │302│303│304│305│306│307│308│309│310│311│    312   │┌───┐│314│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘│313│└───┘
+ * │ 400│ 401│ 402│          403           │ 404│ 405│ 406│ ┌───┼───┼───┐
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┘ │407│408│409│
+ *                                                          └───┴───┴───┘
+ */
+
+#define LAYOUT_ansi_splitbs( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,             \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, K215, \
+	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015  }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, KC_NO }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214,  K215  }, \
+	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  KC_NO }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
+}
+
+/* LAYOUT_ISO
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │000│001│002│003│004│005│006│007│008│009│010│011│012│  013  │   ┌───┐
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤   │015│
+ * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│     │   └───┘
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ 213│ ┌───┬───┐
+ * │ 200  │201│202│203│204│205│206│207│208│209│210│211│212│    │ │214│215│
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ └───┼───┤
+ * │ 300│301│302│303│304│305│306│307│308│309│310│311│    312   │┌───┐│314│
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘│313│└───┘
+ * │ 400│ 401│ 402│          403           │ 404│ 405│ 406│ ┌───┼───┼───┐
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┘ │407│408│409│
+ *                                                          └───┴───┴───┘
+ */
+
+#define LAYOUT_iso( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,                   \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       \
+    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO,  K015 }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, KC_NO, KC_NO }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215  }, \
+    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  KC_NO }, \
+    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
+}
+
+/* LAYOUT_ISOSPLITBS
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │000│001│002│003│004│005│006│007│008│009│010│011│012│013│014│   ┌───┐
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   │015│
+ * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│     │   └───┘
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ 213│ ┌───┬───┐
+ * │ 200  │201│202│203│204│205│206│207│208│209│210│211│212│    │ │214│215│
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤ └───┼───┤
+ * │ 300│301│302│303│304│305│306│307│308│309│310│311│    312   │┌───┐│314│
+ * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┘│313│└───┘
+ * │ 400│ 401│ 402│          403           │ 404│ 405│ 406│ ┌───┼───┼───┐
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┘ │407│408│409│
+ *                                                          └───┴───┴───┘
+ */
+
+#define LAYOUT_iso_splitbs( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,                   \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       \
+    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015  }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, KC_NO, KC_NO }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215  }, \
+    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  KC_NO }, \
+    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
+}
\ No newline at end of file
diff --git a/keyboards/lw67/readme.md b/keyboards/lw67/readme.md
new file mode 100644
index 0000000000..dacd09b5e0
--- /dev/null
+++ b/keyboards/lw67/readme.md
@@ -0,0 +1,22 @@
+# LW-67
+
+![LW67](https://i.imgur.com/mcM1TTi.jpg)
+
+A 65% Keyboard with a LHS rotary encoder, made and sold by Laneware Peripherals.
+
+* Keyboard Maintainer: [Laneware Peripherals](https://github.com/laneware)
+* Hardware Supported: Macro-1
+* Hardware Availability: [Laneware Peripherals](https://lanewareperipherals.com/), 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make lw67: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the encoder and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
diff --git a/keyboards/lw67/rules.mk b/keyboards/lw67/rules.mk
new file mode 100644
index 0000000000..5f58c5684b
--- /dev/null
+++ b/keyboards/lw67/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes

From 59ebe28cd5e50ffda700f127060f936c2d60ed0a Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 31 Jan 2022 11:34:34 -0800
Subject: [PATCH 453/867] KeebsForAll FreebirdTKL Layout Macro Refactor
 (#16146)

---
 .../keebsforall/freebirdtkl/freebirdtkl.h     |  76 ++--
 keyboards/keebsforall/freebirdtkl/info.json   | 398 +++++++++++++++++-
 .../freebirdtkl/keymaps/default/keymap.c      |  14 +-
 .../freebirdtkl/keymaps/via/keymap.c          |  56 +--
 .../freebirdtkl/keymaps/wkl/keymap.c          |  14 +-
 5 files changed, 486 insertions(+), 72 deletions(-)

diff --git a/keyboards/keebsforall/freebirdtkl/freebirdtkl.h b/keyboards/keebsforall/freebirdtkl/freebirdtkl.h
index d091109d05..0064172732 100644
--- a/keyboards/keebsforall/freebirdtkl/freebirdtkl.h
+++ b/keyboards/keebsforall/freebirdtkl/freebirdtkl.h
@@ -20,31 +20,27 @@
 
 #define kxx KC_NO
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+/*
+ * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+ * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0a │0b │0c ││0d │ │0e │0f │0g │
+ * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐   ┌───────┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │3d │ │1e │1f │1g │   │1d     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤   └───────┘
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d   │ │2e │2f │2g │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐       ┌──────────┐
+ * │40      │41 │42 │43 │44 │45 │46 │47 │48 │49 │4a │4b    │4d │     │4f │       │4b        │ 2.75u RShift
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐   └──────────┘
+ * │50  │52  │53  │55                      │58  │59  │5a  │5b  │ │5e │5f │5g │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ * │50   │52 │53   │55                         │59   │5a │5b   │ Tsangan/WKL
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
  */
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,       k0e, k0f, k0g, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d,  k1e, k1f, k1g, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,       k2e, k2f, k2g, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,                           \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,            k4f,      \
-    k50,      k52, k53,      k55,           k58, k59, k5a, k5b,                 k5e, k5f, k5g  \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, kxx, kxx, kxx },  \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, kxx, k4d, kxx, k4f, kxx },  \
-    { k50, kxx, k52, k53, kxx, k55, kxx, kxx, k58, k59, k5a, k5b, kxx, kxx, k5e, k5f, k5g }  \
-}
 
-#define LAYOUT_ansi( \
+#define LAYOUT_tkl_f13_ansi( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
@@ -60,7 +56,39 @@
     { k50, kxx, k52, k53, kxx, k55, kxx, kxx, k58, k59, k5a, k5b, kxx, kxx, k5e, k5f, k5g }  \
 }
 
-#define LAYOUT_tsangan( \
+#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,        k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d,   k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,        k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                       \
+    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d,             k4f,      \
+    k50, k52, k53,                k55,                k58, k59, k5a, k5b,        k5e, k5f, k5g  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, kxx, kxx, kxx }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, kxx, k4d, kxx, k4f, kxx }, \
+    { k50, kxx, k52, k53, kxx, k55, kxx, kxx, k58, k59, k5a, k5b, kxx, kxx, k5e, k5f, k5g }  \
+}
+
+#define LAYOUT_tkl_f13_ansi_tsangan( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,   k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,   k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,   k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,                  \
+    k40,      k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a,      k4b,        k4f,      \
+    k50, k52, k53,                k55,                     k59, k5a, k5b,   k5e, k5f, k5g  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, kxx, kxx, kxx, kxx }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, kxx, kxx, kxx, k4f, kxx }, \
+    { k50, kxx, k52, k53, kxx, k55, kxx, kxx, kxx, k59, k5a, k5b, kxx, kxx, k5e, k5f, k5g }  \
+}
+
+#define LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f, k0g, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k3d, k1e, k1f, k1g, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
diff --git a/keyboards/keebsforall/freebirdtkl/info.json b/keyboards/keebsforall/freebirdtkl/info.json
index aedf8777af..0c21d22393 100644
--- a/keyboards/keebsforall/freebirdtkl/info.json
+++ b/keyboards/keebsforall/freebirdtkl/info.json
@@ -2,15 +2,401 @@
     "keyboard_name": "FreebirdTKL",
     "url": "https://keebsforall.com",
     "maintainer": "KnoblesseOblige",
+    "layout_aliases": {
+        "LAYOUT_ansi": "LAYOUT_tkl_f13_ansi",
+        "LAYOUT_tsangan": "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift",
+        "LAYOUT_all": "LAYOUT_tkl_f13_ansi_split_bs_rshift"
+    },
     "layouts": {
-        "LAYOUT_ansi": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25, "w":2}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"2,13", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,1", "x":2.25, "y":4.25}, {"label":"4,2", "x":3.25, "y":4.25}, {"label":"4,3", "x":4.25, "y":4.25}, {"label":"4,4", "x":5.25, "y":4.25}, {"label":"4,5", "x":6.25, "y":4.25}, {"label":"4,6", "x":7.25, "y":4.25}, {"label":"4,7", "x":8.25, "y":4.25}, {"label":"4,8", "x":9.25, "y":4.25}, {"label":"4,9", "x":10.25, "y":4.25}, {"label":"4,10", "x":11.25, "y":4.25}, {"label":"4,11", "x":12.25, "y":4.25, "w":2.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,2", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,3", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,5", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,8", "x":10, "y":5.25, "w":1.25}, {"label":"5,9", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,10", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,11", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1.25, "y":0},
+                {"label":"0,2", "x":2.25, "y":0},
+                {"label":"0,3", "x":3.25, "y":0},
+                {"label":"0,4", "x":4.25, "y":0},
+                {"label":"0,5", "x":5.5, "y":0},
+                {"label":"0,6", "x":6.5, "y":0},
+                {"label":"0,7", "x":7.5, "y":0},
+                {"label":"0,8", "x":8.5, "y":0},
+                {"label":"0,9", "x":9.75, "y":0},
+                {"label":"0,10", "x":10.75, "y":0},
+                {"label":"0,11", "x":11.75, "y":0},
+                {"label":"0,12", "x":12.75, "y":0},
+                {"label":"0,13", "x":14, "y":0},
+                {"label":"0,14", "x":15.25, "y":0},
+                {"label":"0,15", "x":16.25, "y":0},
+                {"label":"0,16", "x":17.25, "y":0},
+
+                {"label":"1,0", "x":0, "y":1.25},
+                {"label":"1,1", "x":1, "y":1.25},
+                {"label":"1,2", "x":2, "y":1.25},
+                {"label":"1,3", "x":3, "y":1.25},
+                {"label":"1,4", "x":4, "y":1.25},
+                {"label":"1,5", "x":5, "y":1.25},
+                {"label":"1,6", "x":6, "y":1.25},
+                {"label":"1,7", "x":7, "y":1.25},
+                {"label":"1,8", "x":8, "y":1.25},
+                {"label":"1,9", "x":9, "y":1.25},
+                {"label":"1,10", "x":10, "y":1.25},
+                {"label":"1,11", "x":11, "y":1.25},
+                {"label":"1,12", "x":12, "y":1.25},
+                {"label":"1,13", "x":13, "y":1.25, "w":2},
+                {"label":"1,14", "x":15.25, "y":1.25},
+                {"label":"1,15", "x":16.25, "y":1.25},
+                {"label":"1,16", "x":17.25, "y":1.25},
+
+                {"label":"2,0", "x":0, "y":2.25, "w":1.5},
+                {"label":"2,1", "x":1.5, "y":2.25},
+                {"label":"2,2", "x":2.5, "y":2.25},
+                {"label":"2,3", "x":3.5, "y":2.25},
+                {"label":"2,4", "x":4.5, "y":2.25},
+                {"label":"2,5", "x":5.5, "y":2.25},
+                {"label":"2,6", "x":6.5, "y":2.25},
+                {"label":"2,7", "x":7.5, "y":2.25},
+                {"label":"2,8", "x":8.5, "y":2.25},
+                {"label":"2,9", "x":9.5, "y":2.25},
+                {"label":"2,10", "x":10.5, "y":2.25},
+                {"label":"2,11", "x":11.5, "y":2.25},
+                {"label":"2,12", "x":12.5, "y":2.25},
+                {"label":"2,13", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"2,14", "x":15.25, "y":2.25},
+                {"label":"2,15", "x":16.25, "y":2.25},
+                {"label":"2,16", "x":17.25, "y":2.25},
+
+                {"label":"3,0", "x":0, "y":3.25, "w":1.75},
+                {"label":"3,1", "x":1.75, "y":3.25},
+                {"label":"3,2", "x":2.75, "y":3.25},
+                {"label":"3,3", "x":3.75, "y":3.25},
+                {"label":"3,4", "x":4.75, "y":3.25},
+                {"label":"3,5", "x":5.75, "y":3.25},
+                {"label":"3,6", "x":6.75, "y":3.25},
+                {"label":"3,7", "x":7.75, "y":3.25},
+                {"label":"3,8", "x":8.75, "y":3.25},
+                {"label":"3,9", "x":9.75, "y":3.25},
+                {"label":"3,10", "x":10.75, "y":3.25},
+                {"label":"3,11", "x":11.75, "y":3.25},
+                {"label":"3,12", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"4,0", "x":0, "y":4.25, "w":2.25},
+                {"label":"4,1", "x":2.25, "y":4.25},
+                {"label":"4,2", "x":3.25, "y":4.25},
+                {"label":"4,3", "x":4.25, "y":4.25},
+                {"label":"4,4", "x":5.25, "y":4.25},
+                {"label":"4,5", "x":6.25, "y":4.25},
+                {"label":"4,6", "x":7.25, "y":4.25},
+                {"label":"4,7", "x":8.25, "y":4.25},
+                {"label":"4,8", "x":9.25, "y":4.25},
+                {"label":"4,9", "x":10.25, "y":4.25},
+                {"label":"4,10", "x":11.25, "y":4.25},
+                {"label":"4,11", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"4,15", "x":16.25, "y":4.25},
+
+                {"label":"5,0", "x":0, "y":5.25, "w":1.25},
+                {"label":"5,2", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"5,3", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"5,5", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"5,8", "x":10, "y":5.25, "w":1.25},
+                {"label":"5,9", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"5,10", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"5,11", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"5,14", "x":15.25, "y":5.25},
+                {"label":"5,15", "x":16.25, "y":5.25},
+                {"label":"5,16", "x":17.25, "y":5.25}
+            ]
         },
-        "LAYOUT_tsangan": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"3,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"2,13", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,1", "x":2.25, "y":4.25}, {"label":"4,2", "x":3.25, "y":4.25}, {"label":"4,3", "x":4.25, "y":4.25}, {"label":"4,4", "x":5.25, "y":4.25}, {"label":"4,5", "x":6.25, "y":4.25}, {"label":"4,6", "x":7.25, "y":4.25}, {"label":"4,7", "x":8.25, "y":4.25}, {"label":"4,8", "x":9.25, "y":4.25}, {"label":"4,9", "x":10.25, "y":4.25}, {"label":"4,10", "x":11.25, "y":4.25}, {"label":"4,11", "x":12.25, "y":4.25, "w":1.75}, {"label":"4,13", "x":14, "y":4.25}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.5}, {"label":"5,2", "x":1.5, "y":5.25}, {"label":"5,3", "x":2.5, "y":5.25, "w":1.5}, {"label":"5,5", "x":4, "y":5.25, "w":7}, {"label":"5,9", "x":11, "y":5.25, "w":1.5}, {"label":"5,10", "x":12.5, "y":5.25}, {"label":"5,11", "x":13.5, "y":5.25, "w":1.5}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1.25, "y":0},
+                {"label":"0,2", "x":2.25, "y":0},
+                {"label":"0,3", "x":3.25, "y":0},
+                {"label":"0,4", "x":4.25, "y":0},
+                {"label":"0,5", "x":5.5, "y":0},
+                {"label":"0,6", "x":6.5, "y":0},
+                {"label":"0,7", "x":7.5, "y":0},
+                {"label":"0,8", "x":8.5, "y":0},
+                {"label":"0,9", "x":9.75, "y":0},
+                {"label":"0,10", "x":10.75, "y":0},
+                {"label":"0,11", "x":11.75, "y":0},
+                {"label":"0,12", "x":12.75, "y":0},
+                {"label":"0,13", "x":14, "y":0},
+                {"label":"0,14", "x":15.25, "y":0},
+                {"label":"0,15", "x":16.25, "y":0},
+                {"label":"0,16", "x":17.25, "y":0},
+
+                {"label":"1,0", "x":0, "y":1.25},
+                {"label":"1,1", "x":1, "y":1.25},
+                {"label":"1,2", "x":2, "y":1.25},
+                {"label":"1,3", "x":3, "y":1.25},
+                {"label":"1,4", "x":4, "y":1.25},
+                {"label":"1,5", "x":5, "y":1.25},
+                {"label":"1,6", "x":6, "y":1.25},
+                {"label":"1,7", "x":7, "y":1.25},
+                {"label":"1,8", "x":8, "y":1.25},
+                {"label":"1,9", "x":9, "y":1.25},
+                {"label":"1,10", "x":10, "y":1.25},
+                {"label":"1,11", "x":11, "y":1.25},
+                {"label":"1,12", "x":12, "y":1.25},
+                {"label":"1,13", "x":13, "y":1.25},
+                {"label":"3,13", "x":14, "y":1.25},
+                {"label":"1,14", "x":15.25, "y":1.25},
+                {"label":"1,15", "x":16.25, "y":1.25},
+                {"label":"1,16", "x":17.25, "y":1.25},
+
+                {"label":"2,0", "x":0, "y":2.25, "w":1.5},
+                {"label":"2,1", "x":1.5, "y":2.25},
+                {"label":"2,2", "x":2.5, "y":2.25},
+                {"label":"2,3", "x":3.5, "y":2.25},
+                {"label":"2,4", "x":4.5, "y":2.25},
+                {"label":"2,5", "x":5.5, "y":2.25},
+                {"label":"2,6", "x":6.5, "y":2.25},
+                {"label":"2,7", "x":7.5, "y":2.25},
+                {"label":"2,8", "x":8.5, "y":2.25},
+                {"label":"2,9", "x":9.5, "y":2.25},
+                {"label":"2,10", "x":10.5, "y":2.25},
+                {"label":"2,11", "x":11.5, "y":2.25},
+                {"label":"2,12", "x":12.5, "y":2.25},
+                {"label":"2,13", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"2,14", "x":15.25, "y":2.25},
+                {"label":"2,15", "x":16.25, "y":2.25},
+                {"label":"2,16", "x":17.25, "y":2.25},
+
+                {"label":"3,0", "x":0, "y":3.25, "w":1.75},
+                {"label":"3,1", "x":1.75, "y":3.25},
+                {"label":"3,2", "x":2.75, "y":3.25},
+                {"label":"3,3", "x":3.75, "y":3.25},
+                {"label":"3,4", "x":4.75, "y":3.25},
+                {"label":"3,5", "x":5.75, "y":3.25},
+                {"label":"3,6", "x":6.75, "y":3.25},
+                {"label":"3,7", "x":7.75, "y":3.25},
+                {"label":"3,8", "x":8.75, "y":3.25},
+                {"label":"3,9", "x":9.75, "y":3.25},
+                {"label":"3,10", "x":10.75, "y":3.25},
+                {"label":"3,11", "x":11.75, "y":3.25},
+                {"label":"3,12", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"4,0", "x":0, "y":4.25, "w":2.25},
+                {"label":"4,1", "x":2.25, "y":4.25},
+                {"label":"4,2", "x":3.25, "y":4.25},
+                {"label":"4,3", "x":4.25, "y":4.25},
+                {"label":"4,4", "x":5.25, "y":4.25},
+                {"label":"4,5", "x":6.25, "y":4.25},
+                {"label":"4,6", "x":7.25, "y":4.25},
+                {"label":"4,7", "x":8.25, "y":4.25},
+                {"label":"4,8", "x":9.25, "y":4.25},
+                {"label":"4,9", "x":10.25, "y":4.25},
+                {"label":"4,10", "x":11.25, "y":4.25},
+                {"label":"4,11", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"4,13", "x":14, "y":4.25},
+                {"label":"4,15", "x":16.25, "y":4.25},
+
+                {"label":"5,0", "x":0, "y":5.25, "w":1.25},
+                {"label":"5,2", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"5,3", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"5,5", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"5,8", "x":10, "y":5.25, "w":1.25},
+                {"label":"5,9", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"5,10", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"5,11", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"5,14", "x":15.25, "y":5.25},
+                {"label":"5,15", "x":16.25, "y":5.25},
+                {"label":"5,16", "x":17.25, "y":5.25}
+            ]
         },
-        "LAYOUT_all": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"3,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"2,13", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,1", "x":2.25, "y":4.25}, {"label":"4,2", "x":3.25, "y":4.25}, {"label":"4,3", "x":4.25, "y":4.25}, {"label":"4,4", "x":5.25, "y":4.25}, {"label":"4,5", "x":6.25, "y":4.25}, {"label":"4,6", "x":7.25, "y":4.25}, {"label":"4,7", "x":8.25, "y":4.25}, {"label":"4,8", "x":9.25, "y":4.25}, {"label":"4,9", "x":10.25, "y":4.25}, {"label":"4,10", "x":11.25, "y":4.25}, {"label":"4,11", "x":12.25, "y":4.25, "w":1.75}, {"label":"4,13", "x":14, "y":4.25}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,2", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,3", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,5", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,8", "x":10, "y":5.25, "w":1.25}, {"label":"5,9", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,10", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,11", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        "LAYOUT_tkl_f13_ansi_tsangan": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1.25, "y":0},
+                {"label":"0,2", "x":2.25, "y":0},
+                {"label":"0,3", "x":3.25, "y":0},
+                {"label":"0,4", "x":4.25, "y":0},
+                {"label":"0,5", "x":5.5, "y":0},
+                {"label":"0,6", "x":6.5, "y":0},
+                {"label":"0,7", "x":7.5, "y":0},
+                {"label":"0,8", "x":8.5, "y":0},
+                {"label":"0,9", "x":9.75, "y":0},
+                {"label":"0,10", "x":10.75, "y":0},
+                {"label":"0,11", "x":11.75, "y":0},
+                {"label":"0,12", "x":12.75, "y":0},
+                {"label":"0,13", "x":14, "y":0},
+                {"label":"0,14", "x":15.25, "y":0},
+                {"label":"0,15", "x":16.25, "y":0},
+                {"label":"0,16", "x":17.25, "y":0},
+
+                {"label":"1,0", "x":0, "y":1.25},
+                {"label":"1,1", "x":1, "y":1.25},
+                {"label":"1,2", "x":2, "y":1.25},
+                {"label":"1,3", "x":3, "y":1.25},
+                {"label":"1,4", "x":4, "y":1.25},
+                {"label":"1,5", "x":5, "y":1.25},
+                {"label":"1,6", "x":6, "y":1.25},
+                {"label":"1,7", "x":7, "y":1.25},
+                {"label":"1,8", "x":8, "y":1.25},
+                {"label":"1,9", "x":9, "y":1.25},
+                {"label":"1,10", "x":10, "y":1.25},
+                {"label":"1,11", "x":11, "y":1.25},
+                {"label":"1,12", "x":12, "y":1.25},
+                {"label":"1,13", "x":13, "y":1.25, "w":2},
+                {"label":"1,14", "x":15.25, "y":1.25},
+                {"label":"1,15", "x":16.25, "y":1.25},
+                {"label":"1,16", "x":17.25, "y":1.25},
+
+                {"label":"2,0", "x":0, "y":2.25, "w":1.5},
+                {"label":"2,1", "x":1.5, "y":2.25},
+                {"label":"2,2", "x":2.5, "y":2.25},
+                {"label":"2,3", "x":3.5, "y":2.25},
+                {"label":"2,4", "x":4.5, "y":2.25},
+                {"label":"2,5", "x":5.5, "y":2.25},
+                {"label":"2,6", "x":6.5, "y":2.25},
+                {"label":"2,7", "x":7.5, "y":2.25},
+                {"label":"2,8", "x":8.5, "y":2.25},
+                {"label":"2,9", "x":9.5, "y":2.25},
+                {"label":"2,10", "x":10.5, "y":2.25},
+                {"label":"2,11", "x":11.5, "y":2.25},
+                {"label":"2,12", "x":12.5, "y":2.25},
+                {"label":"2,13", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"2,14", "x":15.25, "y":2.25},
+                {"label":"2,15", "x":16.25, "y":2.25},
+                {"label":"2,16", "x":17.25, "y":2.25},
+
+                {"label":"3,0", "x":0, "y":3.25, "w":1.75},
+                {"label":"3,1", "x":1.75, "y":3.25},
+                {"label":"3,2", "x":2.75, "y":3.25},
+                {"label":"3,3", "x":3.75, "y":3.25},
+                {"label":"3,4", "x":4.75, "y":3.25},
+                {"label":"3,5", "x":5.75, "y":3.25},
+                {"label":"3,6", "x":6.75, "y":3.25},
+                {"label":"3,7", "x":7.75, "y":3.25},
+                {"label":"3,8", "x":8.75, "y":3.25},
+                {"label":"3,9", "x":9.75, "y":3.25},
+                {"label":"3,10", "x":10.75, "y":3.25},
+                {"label":"3,11", "x":11.75, "y":3.25},
+                {"label":"3,12", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"4,0", "x":0, "y":4.25, "w":2.25},
+                {"label":"4,1", "x":2.25, "y":4.25},
+                {"label":"4,2", "x":3.25, "y":4.25},
+                {"label":"4,3", "x":4.25, "y":4.25},
+                {"label":"4,4", "x":5.25, "y":4.25},
+                {"label":"4,5", "x":6.25, "y":4.25},
+                {"label":"4,6", "x":7.25, "y":4.25},
+                {"label":"4,7", "x":8.25, "y":4.25},
+                {"label":"4,8", "x":9.25, "y":4.25},
+                {"label":"4,9", "x":10.25, "y":4.25},
+                {"label":"4,10", "x":11.25, "y":4.25},
+                {"label":"4,11", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"4,15", "x":16.25, "y":4.25},
+
+                {"label":"5,0", "x":0, "y":5.25, "w":1.5},
+                {"label":"5,2", "x":1.5, "y":5.25},
+                {"label":"5,3", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"5,5", "x":4, "y":5.25, "w":7},
+                {"label":"5,9", "x":11, "y":5.25, "w":1.5},
+                {"label":"5,10", "x":12.5, "y":5.25},
+                {"label":"5,11", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"5,14", "x":15.25, "y":5.25},
+                {"label":"5,15", "x":16.25, "y":5.25},
+                {"label":"5,16", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1.25, "y":0},
+                {"label":"0,2", "x":2.25, "y":0},
+                {"label":"0,3", "x":3.25, "y":0},
+                {"label":"0,4", "x":4.25, "y":0},
+                {"label":"0,5", "x":5.5, "y":0},
+                {"label":"0,6", "x":6.5, "y":0},
+                {"label":"0,7", "x":7.5, "y":0},
+                {"label":"0,8", "x":8.5, "y":0},
+                {"label":"0,9", "x":9.75, "y":0},
+                {"label":"0,10", "x":10.75, "y":0},
+                {"label":"0,11", "x":11.75, "y":0},
+                {"label":"0,12", "x":12.75, "y":0},
+                {"label":"0,13", "x":14, "y":0},
+                {"label":"0,14", "x":15.25, "y":0},
+                {"label":"0,15", "x":16.25, "y":0},
+                {"label":"0,16", "x":17.25, "y":0},
+
+                {"label":"1,0", "x":0, "y":1.25},
+                {"label":"1,1", "x":1, "y":1.25},
+                {"label":"1,2", "x":2, "y":1.25},
+                {"label":"1,3", "x":3, "y":1.25},
+                {"label":"1,4", "x":4, "y":1.25},
+                {"label":"1,5", "x":5, "y":1.25},
+                {"label":"1,6", "x":6, "y":1.25},
+                {"label":"1,7", "x":7, "y":1.25},
+                {"label":"1,8", "x":8, "y":1.25},
+                {"label":"1,9", "x":9, "y":1.25},
+                {"label":"1,10", "x":10, "y":1.25},
+                {"label":"1,11", "x":11, "y":1.25},
+                {"label":"1,12", "x":12, "y":1.25},
+                {"label":"1,13", "x":13, "y":1.25},
+                {"label":"3,13", "x":14, "y":1.25},
+                {"label":"1,14", "x":15.25, "y":1.25},
+                {"label":"1,15", "x":16.25, "y":1.25},
+                {"label":"1,16", "x":17.25, "y":1.25},
+
+                {"label":"2,0", "x":0, "y":2.25, "w":1.5},
+                {"label":"2,1", "x":1.5, "y":2.25},
+                {"label":"2,2", "x":2.5, "y":2.25},
+                {"label":"2,3", "x":3.5, "y":2.25},
+                {"label":"2,4", "x":4.5, "y":2.25},
+                {"label":"2,5", "x":5.5, "y":2.25},
+                {"label":"2,6", "x":6.5, "y":2.25},
+                {"label":"2,7", "x":7.5, "y":2.25},
+                {"label":"2,8", "x":8.5, "y":2.25},
+                {"label":"2,9", "x":9.5, "y":2.25},
+                {"label":"2,10", "x":10.5, "y":2.25},
+                {"label":"2,11", "x":11.5, "y":2.25},
+                {"label":"2,12", "x":12.5, "y":2.25},
+                {"label":"2,13", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"2,14", "x":15.25, "y":2.25},
+                {"label":"2,15", "x":16.25, "y":2.25},
+                {"label":"2,16", "x":17.25, "y":2.25},
+
+                {"label":"3,0", "x":0, "y":3.25, "w":1.75},
+                {"label":"3,1", "x":1.75, "y":3.25},
+                {"label":"3,2", "x":2.75, "y":3.25},
+                {"label":"3,3", "x":3.75, "y":3.25},
+                {"label":"3,4", "x":4.75, "y":3.25},
+                {"label":"3,5", "x":5.75, "y":3.25},
+                {"label":"3,6", "x":6.75, "y":3.25},
+                {"label":"3,7", "x":7.75, "y":3.25},
+                {"label":"3,8", "x":8.75, "y":3.25},
+                {"label":"3,9", "x":9.75, "y":3.25},
+                {"label":"3,10", "x":10.75, "y":3.25},
+                {"label":"3,11", "x":11.75, "y":3.25},
+                {"label":"3,12", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"4,0", "x":0, "y":4.25, "w":2.25},
+                {"label":"4,1", "x":2.25, "y":4.25},
+                {"label":"4,2", "x":3.25, "y":4.25},
+                {"label":"4,3", "x":4.25, "y":4.25},
+                {"label":"4,4", "x":5.25, "y":4.25},
+                {"label":"4,5", "x":6.25, "y":4.25},
+                {"label":"4,6", "x":7.25, "y":4.25},
+                {"label":"4,7", "x":8.25, "y":4.25},
+                {"label":"4,8", "x":9.25, "y":4.25},
+                {"label":"4,9", "x":10.25, "y":4.25},
+                {"label":"4,10", "x":11.25, "y":4.25},
+                {"label":"4,11", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"4,13", "x":14, "y":4.25},
+                {"label":"4,15", "x":16.25, "y":4.25},
+
+                {"label":"5,0", "x":0, "y":5.25, "w":1.5},
+                {"label":"5,2", "x":1.5, "y":5.25},
+                {"label":"5,3", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"5,5", "x":4, "y":5.25, "w":7},
+                {"label":"5,9", "x":11, "y":5.25, "w":1.5},
+                {"label":"5,10", "x":12.5, "y":5.25},
+                {"label":"5,11", "x":13.5, "y":5.25, "w":1.5},
+                {"label":"5,14", "x":15.25, "y":5.25},
+                {"label":"5,15", "x":16.25, "y":5.25},
+                {"label":"5,16", "x":17.25, "y":5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/keebsforall/freebirdtkl/keymaps/default/keymap.c b/keyboards/keebsforall/freebirdtkl/keymaps/default/keymap.c
index dbeb08e123..16c3b4cdc9 100644
--- a/keyboards/keebsforall/freebirdtkl/keymaps/default/keymap.c
+++ b/keyboards/keebsforall/freebirdtkl/keymaps/default/keymap.c
@@ -17,12 +17,12 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_ansi(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_F13,     KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,   KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_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,  KC_MENU,    KC_RGUI,    KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT
+    [0] = LAYOUT_tkl_f13_ansi(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,     KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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, KC_MENU, KC_RGUI, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
diff --git a/keyboards/keebsforall/freebirdtkl/keymaps/via/keymap.c b/keyboards/keebsforall/freebirdtkl/keymaps/via/keymap.c
index 6cae507d56..e96540e3ef 100644
--- a/keyboards/keebsforall/freebirdtkl/keymaps/via/keymap.c
+++ b/keyboards/keebsforall/freebirdtkl/keymaps/via/keymap.c
@@ -17,36 +17,36 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_all(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_F13,             KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_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_TRNS,                              KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_MENU, KC_RALT,  KC_RGUI,    KC_RCTL,               KC_LEFT, KC_DOWN, KC_RGHT
+    [0] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_TRNS,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_MENU, KC_RALT, KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    [1] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
     ),
-    [2] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    [2] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
     ),
-    [3] = LAYOUT_all(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    [3] = LAYOUT_tkl_f13_ansi_split_bs_rshift(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,             _______, _______, _______
     )
 };
diff --git a/keyboards/keebsforall/freebirdtkl/keymaps/wkl/keymap.c b/keyboards/keebsforall/freebirdtkl/keymaps/wkl/keymap.c
index 884c8c47b8..90f343f8d7 100644
--- a/keyboards/keebsforall/freebirdtkl/keymaps/wkl/keymap.c
+++ b/keyboards/keebsforall/freebirdtkl/keymaps/wkl/keymap.c
@@ -17,12 +17,12 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT_tsangan(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,    KC_F10,     KC_F11,     KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC, KC_BSPC,  KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,           KC_DEL,  KC_END,  KC_PGDN,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_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_TRNS,                    KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI,    KC_RCTL,           KC_LEFT, KC_DOWN, KC_RGHT
+    [0] = LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,              KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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_TRNS,                      KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     )
 };

From 1111ff604d1b006ffd29a0c52d7f717b7879cd00 Mon Sep 17 00:00:00 2001
From: xerootg <xerootg@users.noreply.github.com>
Date: Mon, 31 Jan 2022 12:40:13 -0700
Subject: [PATCH 454/867] [Keyboard] Add the proton c as a controller for the
 redox (#16106)

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: xerootg <xerootg@github.com>
---
 keyboards/redox/readme.md                | 33 +++++++++---
 keyboards/redox/rev1/proton_c/config.h   | 66 ++++++++++++++++++++++++
 keyboards/redox/rev1/proton_c/halconf.h  |  8 +++
 keyboards/redox/rev1/proton_c/mcuconf.h  |  9 ++++
 keyboards/redox/rev1/proton_c/proton_c.c |  4 ++
 keyboards/redox/rev1/proton_c/proton_c.h |  6 +++
 keyboards/redox/rev1/proton_c/rules.mk   |  7 +++
 keyboards/redox/rev1/rev1.h              |  7 ++-
 8 files changed, 131 insertions(+), 9 deletions(-)
 create mode 100644 keyboards/redox/rev1/proton_c/config.h
 create mode 100644 keyboards/redox/rev1/proton_c/halconf.h
 create mode 100644 keyboards/redox/rev1/proton_c/mcuconf.h
 create mode 100644 keyboards/redox/rev1/proton_c/proton_c.c
 create mode 100644 keyboards/redox/rev1/proton_c/proton_c.h
 create mode 100644 keyboards/redox/rev1/proton_c/rules.mk

diff --git a/keyboards/redox/readme.md b/keyboards/redox/readme.md
index d237caf013..27333b518c 100644
--- a/keyboards/redox/readme.md
+++ b/keyboards/redox/readme.md
@@ -11,19 +11,38 @@
 **Redox**: the **R**educed **E**rgo**dox** project. More information and building instruction [here](https://github.com/mattdibi/redox-keyboard).
 
 - Keyboard Maintainer: [Mattia Dal Ben](https://github.com/mattdibi)  
-- Hardware Supported: Redox PCB rev1.0 w/ Pro Micro  
+- Hardware Supported: Redox PCB rev1.0 w/ Pro Micro or Proton C
 - Hardware Availability: [Falbatech](https://falba.tech/product-category/keyboard-parts/redox-parts/)
 
-Make example for this keyboard (after setting up your build environment):
+Make example for this keyboard (after setting up [qmk](https://docs.qmk.fm/#/getting_started_build_tools)):
 
+To build the Pro Micro firmware, first set your config:
 ```sh
-make redox/rev1:default
+qmk config user.keyboard=redox/rev1
+```
+or if your using the Proton C:
+```sh
+qmk config user.keyboard=redox/rev1/proton_c
 ```
 
-Example of flashing this keyboard:
-
+Don't forget to set a layout. There's many to choose from in the keymaps folder.
 ```sh
-make redox/rev1:default:avrdude
+qmk config user.keymap=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).
+Now you can build your firmware!
+```sh
+qmk compile
+```
+
+Flashing is also straightforward. Run:
+```sh
+qmk flash
+```
+Enter the bootloader when prompted by doing one of the following:
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if you have a layout that has one.
+
+The WS2812 driver is *untested* on the Proton C, but if you choose to use this feature, you will need to source 5v from the Proton's VUSB pin and not use the PCB's dedicated pin which will be 3v3 *and* follow the [documentation](https://docs.qmk.fm/#/ws2812_driver) to enable the correct driver settings.
+
+Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h
new file mode 100644
index 0000000000..4ec4a975a4
--- /dev/null
+++ b/keyboards/redox/rev1/proton_c/config.h
@@ -0,0 +1,66 @@
+// Copyright 2022 xerootg
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#undef DEVICE_VER
+#define DEVICE_VER      0x0101 // added 1 for the rev1 + proton c
+
+// wiring of each half
+#undef MATRIX_ROW_PINS
+#define MATRIX_ROW_PINS { B5, B3, B2, B1, B0 }
+#undef MATRIX_COL_PINS
+#define MATRIX_COL_PINS { A1, A0, B8, B13, B14, B15, B9 }
+
+// //we are using hardware serial, so lets undef the softserial used otherwise
+
+/* serial.c configuration for split keyboard */
+#define SERIAL_USART_FULL_DUPLEX   // Enable full duplex operation mode.
+/* 
+   Because the rev1 config defines SOFT_SERIAL_PIN, we need to undef it, redefine it, and also assign 
+   it to avoid a redefine error.
+ */
+#undef SOFT_SERIAL_PIN
+#define SOFT_SERIAL_PIN B6     // USART TX pin
+
+#define SERIAL_USART_RX_PIN B7     // USART RX pin
+#define SERIAL_USART_TX_PIN SOFT_SERIAL_PIN     // USART TX pin
+
+#define SERIAL_USART_PIN_SWAP    // Swap TX and RX pins if keyboard is master halve.
+                                   // Check if this feature is necessary with your keyboard design and available on the mcu.
+#define SELECT_SOFT_SERIAL_SPEED 1 // or 0, 2, 3, 4, 5
+                                   //  0: 460800 baud
+                                   //  1: 230400 baud (default)
+                                   //  2: 115200 baud
+                                   //  3: 57600 baud
+                                   //  4: 38400 baud
+                                   //  5: 19200 baud
+#define SERIAL_USART_DRIVER SD1    // USART driver of TX and RX pin. default: SD1
+#define SERIAL_USART_TX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+#define SERIAL_USART_RX_PAL_MODE 7 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+#define SERIAL_USART_TIMEOUT 20    // USART driver timeout. default 20
+
+/* ws2812 RGB LED */
+#undef RGB_DI_PIN
+#define RGB_DI_PIN A9
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+// #define NO_DEBUG
+
+/* disable print */
+// #define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/keyboards/redox/rev1/proton_c/halconf.h b/keyboards/redox/rev1/proton_c/halconf.h
new file mode 100644
index 0000000000..0a2498a62f
--- /dev/null
+++ b/keyboards/redox/rev1/proton_c/halconf.h
@@ -0,0 +1,8 @@
+// Copyright 2022 xerootg
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define HAL_USE_SERIAL TRUE
+
+#include_next <halconf.h>
\ No newline at end of file
diff --git a/keyboards/redox/rev1/proton_c/mcuconf.h b/keyboards/redox/rev1/proton_c/mcuconf.h
new file mode 100644
index 0000000000..ba87dec13d
--- /dev/null
+++ b/keyboards/redox/rev1/proton_c/mcuconf.h
@@ -0,0 +1,9 @@
+// Copyright 2022 xerootg
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/redox/rev1/proton_c/proton_c.c b/keyboards/redox/rev1/proton_c/proton_c.c
new file mode 100644
index 0000000000..796e2c8c3d
--- /dev/null
+++ b/keyboards/redox/rev1/proton_c/proton_c.c
@@ -0,0 +1,4 @@
+// Copyright 2022 xerootg
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "proton_c.h"
diff --git a/keyboards/redox/rev1/proton_c/proton_c.h b/keyboards/redox/rev1/proton_c/proton_c.h
new file mode 100644
index 0000000000..d8813d9c4d
--- /dev/null
+++ b/keyboards/redox/rev1/proton_c/proton_c.h
@@ -0,0 +1,6 @@
+// Copyright 2022 xerootg
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "rev1.h"
diff --git a/keyboards/redox/rev1/proton_c/rules.mk b/keyboards/redox/rev1/proton_c/rules.mk
new file mode 100644
index 0000000000..829c8365ef
--- /dev/null
+++ b/keyboards/redox/rev1/proton_c/rules.mk
@@ -0,0 +1,7 @@
+# Proton C
+MCU = STM32F303
+BOARD = QMK_PROTON_C
+BOOTLOADER = stm32-dfu
+
+# specific to using the serial serial driver
+SERIAL_DRIVER = usart
diff --git a/keyboards/redox/rev1/rev1.h b/keyboards/redox/rev1/rev1.h
index 1bc1531eed..5a24122048 100644
--- a/keyboards/redox/rev1/rev1.h
+++ b/keyboards/redox/rev1/rev1.h
@@ -1,10 +1,13 @@
 #pragma once
 
-#include "../redox.h"
+#include "redox.h"
+
+#if defined(KEYBOARD_redox_rev1_proton_c)
+#    include "proton_c.h"
+#endif
 
 #include "quantum.h"
 
-
 #ifdef USE_I2C
 #include <stddef.h>
 #ifdef __AVR__

From 2e052b87c45ce068cafd78d44f709f7a036d6ccb Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 03:42:53 +0800
Subject: [PATCH 455/867] [Keyboard] move unikeyboard boards to /unikeyboard
 (#16081)

---
 keyboards/{ => unikeyboard}/diverge3/config.h               | 0
 keyboards/{ => unikeyboard}/diverge3/diverge3.c             | 0
 keyboards/{ => unikeyboard}/diverge3/diverge3.h             | 0
 keyboards/{ => unikeyboard}/diverge3/info.json              | 0
 .../{ => unikeyboard}/diverge3/keymaps/default/config.h     | 0
 .../{ => unikeyboard}/diverge3/keymaps/default/keymap.c     | 0
 .../{ => unikeyboard}/diverge3/keymaps/default/readme.md    | 0
 .../{ => unikeyboard}/diverge3/keymaps/default/rules.mk     | 0
 .../{ => unikeyboard}/diverge3/keymaps/iso_uk/config.h      | 0
 .../{ => unikeyboard}/diverge3/keymaps/iso_uk/keymap.c      | 0
 .../{ => unikeyboard}/diverge3/keymaps/iso_uk/readme.md     | 0
 .../{ => unikeyboard}/diverge3/keymaps/iso_uk/rules.mk      | 0
 .../{ => unikeyboard}/diverge3/keymaps/workman/config.h     | 0
 .../{ => unikeyboard}/diverge3/keymaps/workman/keymap.c     | 0
 .../{ => unikeyboard}/diverge3/keymaps/workman/readme.md    | 0
 .../{ => unikeyboard}/diverge3/keymaps/workman/rules.mk     | 0
 keyboards/{ => unikeyboard}/diverge3/readme.md              | 6 +++---
 keyboards/{ => unikeyboard}/diverge3/rules.mk               | 0
 keyboards/{ => unikeyboard}/divergetm2/config.h             | 0
 keyboards/{ => unikeyboard}/divergetm2/divergetm2.c         | 0
 keyboards/{ => unikeyboard}/divergetm2/divergetm2.h         | 0
 keyboards/{ => unikeyboard}/divergetm2/info.json            | 0
 .../{ => unikeyboard}/divergetm2/keymaps/default/config.h   | 0
 .../{ => unikeyboard}/divergetm2/keymaps/default/keymap.c   | 0
 .../{ => unikeyboard}/divergetm2/keymaps/default/readme.md  | 0
 .../divergetm2/keymaps/xtonhasvim/config.h                  | 0
 .../divergetm2/keymaps/xtonhasvim/keymap.c                  | 0
 .../divergetm2/keymaps/xtonhasvim/readme.md                 | 0
 .../divergetm2/keymaps/xtonhasvim/rules.mk                  | 0
 keyboards/{ => unikeyboard}/divergetm2/readme.md            | 2 +-
 keyboards/{ => unikeyboard}/divergetm2/rules.mk             | 0
 keyboards/{ => unikeyboard}/felix/config.h                  | 0
 keyboards/{ => unikeyboard}/felix/felix.c                   | 0
 keyboards/{ => unikeyboard}/felix/felix.h                   | 0
 keyboards/{ => unikeyboard}/felix/info.json                 | 0
 keyboards/{ => unikeyboard}/felix/keymaps/default/keymap.c  | 0
 keyboards/{ => unikeyboard}/felix/readme.md                 | 2 +-
 keyboards/{ => unikeyboard}/felix/rules.mk                  | 0
 38 files changed, 5 insertions(+), 5 deletions(-)
 rename keyboards/{ => unikeyboard}/diverge3/config.h (100%)
 rename keyboards/{ => unikeyboard}/diverge3/diverge3.c (100%)
 rename keyboards/{ => unikeyboard}/diverge3/diverge3.h (100%)
 rename keyboards/{ => unikeyboard}/diverge3/info.json (100%)
 rename keyboards/{ => unikeyboard}/diverge3/keymaps/default/config.h (100%)
 rename keyboards/{ => unikeyboard}/diverge3/keymaps/default/keymap.c (100%)
 rename keyboards/{ => unikeyboard}/diverge3/keymaps/default/readme.md (100%)
 rename keyboards/{ => unikeyboard}/diverge3/keymaps/default/rules.mk (100%)
 rename keyboards/{ => unikeyboard}/diverge3/keymaps/iso_uk/config.h (100%)
 rename keyboards/{ => unikeyboard}/diverge3/keymaps/iso_uk/keymap.c (100%)
 rename keyboards/{ => unikeyboard}/diverge3/keymaps/iso_uk/readme.md (100%)
 rename keyboards/{ => unikeyboard}/diverge3/keymaps/iso_uk/rules.mk (100%)
 rename keyboards/{ => unikeyboard}/diverge3/keymaps/workman/config.h (100%)
 rename keyboards/{ => unikeyboard}/diverge3/keymaps/workman/keymap.c (100%)
 rename keyboards/{ => unikeyboard}/diverge3/keymaps/workman/readme.md (100%)
 rename keyboards/{ => unikeyboard}/diverge3/keymaps/workman/rules.mk (100%)
 rename keyboards/{ => unikeyboard}/diverge3/readme.md (90%)
 rename keyboards/{ => unikeyboard}/diverge3/rules.mk (100%)
 rename keyboards/{ => unikeyboard}/divergetm2/config.h (100%)
 rename keyboards/{ => unikeyboard}/divergetm2/divergetm2.c (100%)
 rename keyboards/{ => unikeyboard}/divergetm2/divergetm2.h (100%)
 rename keyboards/{ => unikeyboard}/divergetm2/info.json (100%)
 rename keyboards/{ => unikeyboard}/divergetm2/keymaps/default/config.h (100%)
 rename keyboards/{ => unikeyboard}/divergetm2/keymaps/default/keymap.c (100%)
 rename keyboards/{ => unikeyboard}/divergetm2/keymaps/default/readme.md (100%)
 rename keyboards/{ => unikeyboard}/divergetm2/keymaps/xtonhasvim/config.h (100%)
 rename keyboards/{ => unikeyboard}/divergetm2/keymaps/xtonhasvim/keymap.c (100%)
 rename keyboards/{ => unikeyboard}/divergetm2/keymaps/xtonhasvim/readme.md (100%)
 rename keyboards/{ => unikeyboard}/divergetm2/keymaps/xtonhasvim/rules.mk (100%)
 rename keyboards/{ => unikeyboard}/divergetm2/readme.md (96%)
 rename keyboards/{ => unikeyboard}/divergetm2/rules.mk (100%)
 rename keyboards/{ => unikeyboard}/felix/config.h (100%)
 rename keyboards/{ => unikeyboard}/felix/felix.c (100%)
 rename keyboards/{ => unikeyboard}/felix/felix.h (100%)
 rename keyboards/{ => unikeyboard}/felix/info.json (100%)
 rename keyboards/{ => unikeyboard}/felix/keymaps/default/keymap.c (100%)
 rename keyboards/{ => unikeyboard}/felix/readme.md (94%)
 rename keyboards/{ => unikeyboard}/felix/rules.mk (100%)

diff --git a/keyboards/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h
similarity index 100%
rename from keyboards/diverge3/config.h
rename to keyboards/unikeyboard/diverge3/config.h
diff --git a/keyboards/diverge3/diverge3.c b/keyboards/unikeyboard/diverge3/diverge3.c
similarity index 100%
rename from keyboards/diverge3/diverge3.c
rename to keyboards/unikeyboard/diverge3/diverge3.c
diff --git a/keyboards/diverge3/diverge3.h b/keyboards/unikeyboard/diverge3/diverge3.h
similarity index 100%
rename from keyboards/diverge3/diverge3.h
rename to keyboards/unikeyboard/diverge3/diverge3.h
diff --git a/keyboards/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json
similarity index 100%
rename from keyboards/diverge3/info.json
rename to keyboards/unikeyboard/diverge3/info.json
diff --git a/keyboards/diverge3/keymaps/default/config.h b/keyboards/unikeyboard/diverge3/keymaps/default/config.h
similarity index 100%
rename from keyboards/diverge3/keymaps/default/config.h
rename to keyboards/unikeyboard/diverge3/keymaps/default/config.h
diff --git a/keyboards/diverge3/keymaps/default/keymap.c b/keyboards/unikeyboard/diverge3/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/diverge3/keymaps/default/keymap.c
rename to keyboards/unikeyboard/diverge3/keymaps/default/keymap.c
diff --git a/keyboards/diverge3/keymaps/default/readme.md b/keyboards/unikeyboard/diverge3/keymaps/default/readme.md
similarity index 100%
rename from keyboards/diverge3/keymaps/default/readme.md
rename to keyboards/unikeyboard/diverge3/keymaps/default/readme.md
diff --git a/keyboards/diverge3/keymaps/default/rules.mk b/keyboards/unikeyboard/diverge3/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/diverge3/keymaps/default/rules.mk
rename to keyboards/unikeyboard/diverge3/keymaps/default/rules.mk
diff --git a/keyboards/diverge3/keymaps/iso_uk/config.h b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/config.h
similarity index 100%
rename from keyboards/diverge3/keymaps/iso_uk/config.h
rename to keyboards/unikeyboard/diverge3/keymaps/iso_uk/config.h
diff --git a/keyboards/diverge3/keymaps/iso_uk/keymap.c b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
similarity index 100%
rename from keyboards/diverge3/keymaps/iso_uk/keymap.c
rename to keyboards/unikeyboard/diverge3/keymaps/iso_uk/keymap.c
diff --git a/keyboards/diverge3/keymaps/iso_uk/readme.md b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/readme.md
similarity index 100%
rename from keyboards/diverge3/keymaps/iso_uk/readme.md
rename to keyboards/unikeyboard/diverge3/keymaps/iso_uk/readme.md
diff --git a/keyboards/diverge3/keymaps/iso_uk/rules.mk b/keyboards/unikeyboard/diverge3/keymaps/iso_uk/rules.mk
similarity index 100%
rename from keyboards/diverge3/keymaps/iso_uk/rules.mk
rename to keyboards/unikeyboard/diverge3/keymaps/iso_uk/rules.mk
diff --git a/keyboards/diverge3/keymaps/workman/config.h b/keyboards/unikeyboard/diverge3/keymaps/workman/config.h
similarity index 100%
rename from keyboards/diverge3/keymaps/workman/config.h
rename to keyboards/unikeyboard/diverge3/keymaps/workman/config.h
diff --git a/keyboards/diverge3/keymaps/workman/keymap.c b/keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
similarity index 100%
rename from keyboards/diverge3/keymaps/workman/keymap.c
rename to keyboards/unikeyboard/diverge3/keymaps/workman/keymap.c
diff --git a/keyboards/diverge3/keymaps/workman/readme.md b/keyboards/unikeyboard/diverge3/keymaps/workman/readme.md
similarity index 100%
rename from keyboards/diverge3/keymaps/workman/readme.md
rename to keyboards/unikeyboard/diverge3/keymaps/workman/readme.md
diff --git a/keyboards/diverge3/keymaps/workman/rules.mk b/keyboards/unikeyboard/diverge3/keymaps/workman/rules.mk
similarity index 100%
rename from keyboards/diverge3/keymaps/workman/rules.mk
rename to keyboards/unikeyboard/diverge3/keymaps/workman/rules.mk
diff --git a/keyboards/diverge3/readme.md b/keyboards/unikeyboard/diverge3/readme.md
similarity index 90%
rename from keyboards/diverge3/readme.md
rename to keyboards/unikeyboard/diverge3/readme.md
index 45ddaa64cf..6e4cf3d781 100644
--- a/keyboards/diverge3/readme.md
+++ b/keyboards/unikeyboard/diverge3/readme.md
@@ -8,13 +8,13 @@ Hardware Availability: [Diverge 3](https://unikeyboard.io/product/diverge/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make diverge3:default
+    make unikeyboard/diverge3:default
 
 Or for the [Workman](https://github.com/ojbucao/workman) layout:
 
-    make diverge3:workman
+    make unikeyboard/diverge3:workman
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
 # Reflashing Animus
-Reflashing the stock firmware is pretty easy. Just follow the same steps in the [original guide](https://imgur.com/a/8UapN). You will have to manually reset the Pro Micro (by shorting the GND and RST pins) during the upload step. Then reapply your keymap through Arbites.
\ No newline at end of file
+Reflashing the stock firmware is pretty easy. Just follow the same steps in the [original guide](https://imgur.com/a/8UapN). You will have to manually reset the Pro Micro (by shorting the GND and RST pins) during the upload step. Then reapply your keymap through Arbites.
diff --git a/keyboards/diverge3/rules.mk b/keyboards/unikeyboard/diverge3/rules.mk
similarity index 100%
rename from keyboards/diverge3/rules.mk
rename to keyboards/unikeyboard/diverge3/rules.mk
diff --git a/keyboards/divergetm2/config.h b/keyboards/unikeyboard/divergetm2/config.h
similarity index 100%
rename from keyboards/divergetm2/config.h
rename to keyboards/unikeyboard/divergetm2/config.h
diff --git a/keyboards/divergetm2/divergetm2.c b/keyboards/unikeyboard/divergetm2/divergetm2.c
similarity index 100%
rename from keyboards/divergetm2/divergetm2.c
rename to keyboards/unikeyboard/divergetm2/divergetm2.c
diff --git a/keyboards/divergetm2/divergetm2.h b/keyboards/unikeyboard/divergetm2/divergetm2.h
similarity index 100%
rename from keyboards/divergetm2/divergetm2.h
rename to keyboards/unikeyboard/divergetm2/divergetm2.h
diff --git a/keyboards/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json
similarity index 100%
rename from keyboards/divergetm2/info.json
rename to keyboards/unikeyboard/divergetm2/info.json
diff --git a/keyboards/divergetm2/keymaps/default/config.h b/keyboards/unikeyboard/divergetm2/keymaps/default/config.h
similarity index 100%
rename from keyboards/divergetm2/keymaps/default/config.h
rename to keyboards/unikeyboard/divergetm2/keymaps/default/config.h
diff --git a/keyboards/divergetm2/keymaps/default/keymap.c b/keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/divergetm2/keymaps/default/keymap.c
rename to keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c
diff --git a/keyboards/divergetm2/keymaps/default/readme.md b/keyboards/unikeyboard/divergetm2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/divergetm2/keymaps/default/readme.md
rename to keyboards/unikeyboard/divergetm2/keymaps/default/readme.md
diff --git a/keyboards/divergetm2/keymaps/xtonhasvim/config.h b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/config.h
similarity index 100%
rename from keyboards/divergetm2/keymaps/xtonhasvim/config.h
rename to keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/config.h
diff --git a/keyboards/divergetm2/keymaps/xtonhasvim/keymap.c b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/keymap.c
similarity index 100%
rename from keyboards/divergetm2/keymaps/xtonhasvim/keymap.c
rename to keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/keymap.c
diff --git a/keyboards/divergetm2/keymaps/xtonhasvim/readme.md b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/readme.md
similarity index 100%
rename from keyboards/divergetm2/keymaps/xtonhasvim/readme.md
rename to keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/readme.md
diff --git a/keyboards/divergetm2/keymaps/xtonhasvim/rules.mk b/keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/rules.mk
similarity index 100%
rename from keyboards/divergetm2/keymaps/xtonhasvim/rules.mk
rename to keyboards/unikeyboard/divergetm2/keymaps/xtonhasvim/rules.mk
diff --git a/keyboards/divergetm2/readme.md b/keyboards/unikeyboard/divergetm2/readme.md
similarity index 96%
rename from keyboards/divergetm2/readme.md
rename to keyboards/unikeyboard/divergetm2/readme.md
index 893b82cb5c..5bff74389f 100644
--- a/keyboards/divergetm2/readme.md
+++ b/keyboards/unikeyboard/divergetm2/readme.md
@@ -8,7 +8,7 @@ Hardware Availability: [Diverge TM2](https://unikeyboard.io/product/diverge-tm/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make divergetm2:default
+    make unikeyboard/divergetm2: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).
 
diff --git a/keyboards/divergetm2/rules.mk b/keyboards/unikeyboard/divergetm2/rules.mk
similarity index 100%
rename from keyboards/divergetm2/rules.mk
rename to keyboards/unikeyboard/divergetm2/rules.mk
diff --git a/keyboards/felix/config.h b/keyboards/unikeyboard/felix/config.h
similarity index 100%
rename from keyboards/felix/config.h
rename to keyboards/unikeyboard/felix/config.h
diff --git a/keyboards/felix/felix.c b/keyboards/unikeyboard/felix/felix.c
similarity index 100%
rename from keyboards/felix/felix.c
rename to keyboards/unikeyboard/felix/felix.c
diff --git a/keyboards/felix/felix.h b/keyboards/unikeyboard/felix/felix.h
similarity index 100%
rename from keyboards/felix/felix.h
rename to keyboards/unikeyboard/felix/felix.h
diff --git a/keyboards/felix/info.json b/keyboards/unikeyboard/felix/info.json
similarity index 100%
rename from keyboards/felix/info.json
rename to keyboards/unikeyboard/felix/info.json
diff --git a/keyboards/felix/keymaps/default/keymap.c b/keyboards/unikeyboard/felix/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/felix/keymaps/default/keymap.c
rename to keyboards/unikeyboard/felix/keymaps/default/keymap.c
diff --git a/keyboards/felix/readme.md b/keyboards/unikeyboard/felix/readme.md
similarity index 94%
rename from keyboards/felix/readme.md
rename to keyboards/unikeyboard/felix/readme.md
index 0a3fe10a6e..2ea41d382f 100644
--- a/keyboards/felix/readme.md
+++ b/keyboards/unikeyboard/felix/readme.md
@@ -8,6 +8,6 @@ Hardware Availability: [Unikeyboard](https://unikeyboard.io/product/felix/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make felix:default
+    make unikeyboard/felix: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).
diff --git a/keyboards/felix/rules.mk b/keyboards/unikeyboard/felix/rules.mk
similarity index 100%
rename from keyboards/felix/rules.mk
rename to keyboards/unikeyboard/felix/rules.mk

From 2427678f7d4f04df10392e07d6c42578775ec15f Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 03:44:45 +0800
Subject: [PATCH 456/867] [Keyboard] move @Biacco42 's keebs into /biacco42
 (#16080)

---
 keyboards/{ => biacco42}/ergo42/.noci                           | 0
 keyboards/{ => biacco42}/ergo42/config.h                        | 0
 keyboards/{ => biacco42}/ergo42/ergo42.c                        | 0
 keyboards/{ => biacco42}/ergo42/ergo42.h                        | 2 +-
 keyboards/{ => biacco42}/ergo42/info.json                       | 0
 keyboards/{ => biacco42}/ergo42/keymaps/biacco-biacco/config.h  | 0
 keyboards/{ => biacco42}/ergo42/keymaps/biacco-biacco/keymap.c  | 0
 keyboards/{ => biacco42}/ergo42/keymaps/biacco-macOS/config.h   | 0
 keyboards/{ => biacco42}/ergo42/keymaps/biacco-macOS/keymap.c   | 0
 .../{ => biacco42}/ergo42/keymaps/biacco-underglow/config.h     | 0
 .../{ => biacco42}/ergo42/keymaps/biacco-underglow/keymap.c     | 0
 .../{ => biacco42}/ergo42/keymaps/biacco-underglow/rules.mk     | 0
 keyboards/{ => biacco42}/ergo42/keymaps/biacco-winjp/config.h   | 0
 keyboards/{ => biacco42}/ergo42/keymaps/biacco-winjp/keymap.c   | 0
 keyboards/{ => biacco42}/ergo42/keymaps/biacco/config.h         | 0
 keyboards/{ => biacco42}/ergo42/keymaps/biacco/keymap.c         | 0
 .../{ => biacco42}/ergo42/keymaps/default-illustrator/config.h  | 0
 .../{ => biacco42}/ergo42/keymaps/default-illustrator/keymap.c  | 0
 .../{ => biacco42}/ergo42/keymaps/default-underglow/config.h    | 0
 .../{ => biacco42}/ergo42/keymaps/default-underglow/keymap.c    | 0
 .../{ => biacco42}/ergo42/keymaps/default-underglow/rules.mk    | 0
 keyboards/{ => biacco42}/ergo42/keymaps/default/config.h        | 0
 keyboards/{ => biacco42}/ergo42/keymaps/default/keymap.c        | 0
 keyboards/{ => biacco42}/ergo42/keymaps/hdbx/config.h           | 0
 keyboards/{ => biacco42}/ergo42/keymaps/hdbx/keymap.c           | 0
 keyboards/{ => biacco42}/ergo42/keymaps/hdbx/readme.md          | 0
 keyboards/{ => biacco42}/ergo42/keymaps/ichi-t/config.h         | 0
 keyboards/{ => biacco42}/ergo42/keymaps/ichi-t/keymap.c         | 0
 keyboards/{ => biacco42}/ergo42/keymaps/koba/config.h           | 0
 keyboards/{ => biacco42}/ergo42/keymaps/koba/keymap.c           | 0
 keyboards/{ => biacco42}/ergo42/keymaps/koba/readme.md          | 0
 keyboards/{ => biacco42}/ergo42/keymaps/koba/readme_ja.md       | 0
 keyboards/{ => biacco42}/ergo42/keymaps/shinze/config.h         | 0
 keyboards/{ => biacco42}/ergo42/keymaps/shinze/keymap.c         | 0
 keyboards/{ => biacco42}/ergo42/keymaps/yshrsmz/config.h        | 0
 keyboards/{ => biacco42}/ergo42/keymaps/yshrsmz/keymap.c        | 0
 keyboards/{ => biacco42}/ergo42/keymaps/yshrsmz/rules.mk        | 0
 keyboards/{ => biacco42}/ergo42/readme.md                       | 2 +-
 keyboards/{ => biacco42}/ergo42/rev1/config.h                   | 0
 keyboards/{ => biacco42}/ergo42/rev1/rev1.c                     | 0
 keyboards/{ => biacco42}/ergo42/rev1/rev1.h                     | 0
 keyboards/{ => biacco42}/ergo42/rev1/rules.mk                   | 0
 keyboards/{ => biacco42}/ergo42/rules.mk                        | 2 +-
 keyboards/{ => biacco42}/meishi/config.h                        | 0
 keyboards/{ => biacco42}/meishi/info.json                       | 0
 keyboards/{ => biacco42}/meishi/keymaps/default/keymap.c        | 0
 keyboards/{ => biacco42}/meishi/keymaps/default/readme.md       | 0
 keyboards/{ => biacco42}/meishi/meishi.c                        | 0
 keyboards/{ => biacco42}/meishi/meishi.h                        | 0
 keyboards/{ => biacco42}/meishi/readme.md                       | 2 +-
 keyboards/{ => biacco42}/meishi/rules.mk                        | 0
 keyboards/{ => biacco42}/meishi2/config.h                       | 0
 keyboards/{ => biacco42}/meishi2/info.json                      | 0
 keyboards/{ => biacco42}/meishi2/keymaps/default/keymap.c       | 0
 keyboards/{ => biacco42}/meishi2/keymaps/default/readme.md      | 0
 keyboards/{ => biacco42}/meishi2/keymaps/led_status/keymap.c    | 0
 keyboards/{ => biacco42}/meishi2/keymaps/led_status/readme.md   | 0
 keyboards/{ => biacco42}/meishi2/keymaps/moc/config.h           | 0
 keyboards/{ => biacco42}/meishi2/keymaps/moc/keymap.c           | 0
 keyboards/{ => biacco42}/meishi2/keymaps/moc/readme.md          | 0
 keyboards/{ => biacco42}/meishi2/keymaps/via/keymap.c           | 0
 keyboards/{ => biacco42}/meishi2/keymaps/via/rules.mk           | 0
 keyboards/{ => biacco42}/meishi2/meishi2.c                      | 0
 keyboards/{ => biacco42}/meishi2/meishi2.h                      | 0
 keyboards/{ => biacco42}/meishi2/readme.md                      | 2 +-
 keyboards/{ => biacco42}/meishi2/rules.mk                       | 0
 66 files changed, 5 insertions(+), 5 deletions(-)
 rename keyboards/{ => biacco42}/ergo42/.noci (100%)
 rename keyboards/{ => biacco42}/ergo42/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/ergo42.c (100%)
 rename keyboards/{ => biacco42}/ergo42/ergo42.h (63%)
 rename keyboards/{ => biacco42}/ergo42/info.json (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/biacco-biacco/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/biacco-biacco/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/biacco-macOS/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/biacco-macOS/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/biacco-underglow/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/biacco-underglow/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/biacco-underglow/rules.mk (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/biacco-winjp/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/biacco-winjp/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/biacco/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/biacco/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/default-illustrator/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/default-illustrator/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/default-underglow/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/default-underglow/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/default-underglow/rules.mk (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/default/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/default/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/hdbx/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/hdbx/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/hdbx/readme.md (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/ichi-t/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/ichi-t/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/koba/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/koba/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/koba/readme.md (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/koba/readme_ja.md (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/shinze/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/shinze/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/yshrsmz/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/yshrsmz/keymap.c (100%)
 rename keyboards/{ => biacco42}/ergo42/keymaps/yshrsmz/rules.mk (100%)
 rename keyboards/{ => biacco42}/ergo42/readme.md (95%)
 rename keyboards/{ => biacco42}/ergo42/rev1/config.h (100%)
 rename keyboards/{ => biacco42}/ergo42/rev1/rev1.c (100%)
 rename keyboards/{ => biacco42}/ergo42/rev1/rev1.h (100%)
 rename keyboards/{ => biacco42}/ergo42/rev1/rules.mk (100%)
 rename keyboards/{ => biacco42}/ergo42/rules.mk (94%)
 rename keyboards/{ => biacco42}/meishi/config.h (100%)
 rename keyboards/{ => biacco42}/meishi/info.json (100%)
 rename keyboards/{ => biacco42}/meishi/keymaps/default/keymap.c (100%)
 rename keyboards/{ => biacco42}/meishi/keymaps/default/readme.md (100%)
 rename keyboards/{ => biacco42}/meishi/meishi.c (100%)
 rename keyboards/{ => biacco42}/meishi/meishi.h (100%)
 rename keyboards/{ => biacco42}/meishi/readme.md (94%)
 rename keyboards/{ => biacco42}/meishi/rules.mk (100%)
 rename keyboards/{ => biacco42}/meishi2/config.h (100%)
 rename keyboards/{ => biacco42}/meishi2/info.json (100%)
 rename keyboards/{ => biacco42}/meishi2/keymaps/default/keymap.c (100%)
 rename keyboards/{ => biacco42}/meishi2/keymaps/default/readme.md (100%)
 rename keyboards/{ => biacco42}/meishi2/keymaps/led_status/keymap.c (100%)
 rename keyboards/{ => biacco42}/meishi2/keymaps/led_status/readme.md (100%)
 rename keyboards/{ => biacco42}/meishi2/keymaps/moc/config.h (100%)
 rename keyboards/{ => biacco42}/meishi2/keymaps/moc/keymap.c (100%)
 rename keyboards/{ => biacco42}/meishi2/keymaps/moc/readme.md (100%)
 rename keyboards/{ => biacco42}/meishi2/keymaps/via/keymap.c (100%)
 rename keyboards/{ => biacco42}/meishi2/keymaps/via/rules.mk (100%)
 rename keyboards/{ => biacco42}/meishi2/meishi2.c (100%)
 rename keyboards/{ => biacco42}/meishi2/meishi2.h (100%)
 rename keyboards/{ => biacco42}/meishi2/readme.md (95%)
 rename keyboards/{ => biacco42}/meishi2/rules.mk (100%)

diff --git a/keyboards/ergo42/.noci b/keyboards/biacco42/ergo42/.noci
similarity index 100%
rename from keyboards/ergo42/.noci
rename to keyboards/biacco42/ergo42/.noci
diff --git a/keyboards/ergo42/config.h b/keyboards/biacco42/ergo42/config.h
similarity index 100%
rename from keyboards/ergo42/config.h
rename to keyboards/biacco42/ergo42/config.h
diff --git a/keyboards/ergo42/ergo42.c b/keyboards/biacco42/ergo42/ergo42.c
similarity index 100%
rename from keyboards/ergo42/ergo42.c
rename to keyboards/biacco42/ergo42/ergo42.c
diff --git a/keyboards/ergo42/ergo42.h b/keyboards/biacco42/ergo42/ergo42.h
similarity index 63%
rename from keyboards/ergo42/ergo42.h
rename to keyboards/biacco42/ergo42/ergo42.h
index 656b211308..265e605e6c 100644
--- a/keyboards/ergo42/ergo42.h
+++ b/keyboards/biacco42/ergo42/ergo42.h
@@ -2,6 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_ergo42_rev1
+#ifdef KEYBOARD_biacco42_ergo42_rev1
     #include "rev1.h"
 #endif
diff --git a/keyboards/ergo42/info.json b/keyboards/biacco42/ergo42/info.json
similarity index 100%
rename from keyboards/ergo42/info.json
rename to keyboards/biacco42/ergo42/info.json
diff --git a/keyboards/ergo42/keymaps/biacco-biacco/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-biacco/config.h
rename to keyboards/biacco42/ergo42/keymaps/biacco-biacco/config.h
diff --git a/keyboards/ergo42/keymaps/biacco-biacco/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-biacco/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
diff --git a/keyboards/ergo42/keymaps/biacco-macOS/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-macOS/config.h
rename to keyboards/biacco42/ergo42/keymaps/biacco-macOS/config.h
diff --git a/keyboards/ergo42/keymaps/biacco-macOS/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-macOS/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
diff --git a/keyboards/ergo42/keymaps/biacco-underglow/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-underglow/config.h
rename to keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h
diff --git a/keyboards/ergo42/keymaps/biacco-underglow/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-underglow/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
diff --git a/keyboards/ergo42/keymaps/biacco-underglow/rules.mk b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/rules.mk
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-underglow/rules.mk
rename to keyboards/biacco42/ergo42/keymaps/biacco-underglow/rules.mk
diff --git a/keyboards/ergo42/keymaps/biacco-winjp/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-winjp/config.h
rename to keyboards/biacco42/ergo42/keymaps/biacco-winjp/config.h
diff --git a/keyboards/ergo42/keymaps/biacco-winjp/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-winjp/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
diff --git a/keyboards/ergo42/keymaps/biacco/config.h b/keyboards/biacco42/ergo42/keymaps/biacco/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco/config.h
rename to keyboards/biacco42/ergo42/keymaps/biacco/config.h
diff --git a/keyboards/ergo42/keymaps/biacco/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
diff --git a/keyboards/ergo42/keymaps/default-illustrator/config.h b/keyboards/biacco42/ergo42/keymaps/default-illustrator/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/default-illustrator/config.h
rename to keyboards/biacco42/ergo42/keymaps/default-illustrator/config.h
diff --git a/keyboards/ergo42/keymaps/default-illustrator/keymap.c b/keyboards/biacco42/ergo42/keymaps/default-illustrator/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/default-illustrator/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/default-illustrator/keymap.c
diff --git a/keyboards/ergo42/keymaps/default-underglow/config.h b/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/default-underglow/config.h
rename to keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
diff --git a/keyboards/ergo42/keymaps/default-underglow/keymap.c b/keyboards/biacco42/ergo42/keymaps/default-underglow/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/default-underglow/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/default-underglow/keymap.c
diff --git a/keyboards/ergo42/keymaps/default-underglow/rules.mk b/keyboards/biacco42/ergo42/keymaps/default-underglow/rules.mk
similarity index 100%
rename from keyboards/ergo42/keymaps/default-underglow/rules.mk
rename to keyboards/biacco42/ergo42/keymaps/default-underglow/rules.mk
diff --git a/keyboards/ergo42/keymaps/default/config.h b/keyboards/biacco42/ergo42/keymaps/default/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/default/config.h
rename to keyboards/biacco42/ergo42/keymaps/default/config.h
diff --git a/keyboards/ergo42/keymaps/default/keymap.c b/keyboards/biacco42/ergo42/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/default/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/default/keymap.c
diff --git a/keyboards/ergo42/keymaps/hdbx/config.h b/keyboards/biacco42/ergo42/keymaps/hdbx/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/hdbx/config.h
rename to keyboards/biacco42/ergo42/keymaps/hdbx/config.h
diff --git a/keyboards/ergo42/keymaps/hdbx/keymap.c b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/hdbx/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
diff --git a/keyboards/ergo42/keymaps/hdbx/readme.md b/keyboards/biacco42/ergo42/keymaps/hdbx/readme.md
similarity index 100%
rename from keyboards/ergo42/keymaps/hdbx/readme.md
rename to keyboards/biacco42/ergo42/keymaps/hdbx/readme.md
diff --git a/keyboards/ergo42/keymaps/ichi-t/config.h b/keyboards/biacco42/ergo42/keymaps/ichi-t/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/ichi-t/config.h
rename to keyboards/biacco42/ergo42/keymaps/ichi-t/config.h
diff --git a/keyboards/ergo42/keymaps/ichi-t/keymap.c b/keyboards/biacco42/ergo42/keymaps/ichi-t/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/ichi-t/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/ichi-t/keymap.c
diff --git a/keyboards/ergo42/keymaps/koba/config.h b/keyboards/biacco42/ergo42/keymaps/koba/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/koba/config.h
rename to keyboards/biacco42/ergo42/keymaps/koba/config.h
diff --git a/keyboards/ergo42/keymaps/koba/keymap.c b/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/koba/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/koba/keymap.c
diff --git a/keyboards/ergo42/keymaps/koba/readme.md b/keyboards/biacco42/ergo42/keymaps/koba/readme.md
similarity index 100%
rename from keyboards/ergo42/keymaps/koba/readme.md
rename to keyboards/biacco42/ergo42/keymaps/koba/readme.md
diff --git a/keyboards/ergo42/keymaps/koba/readme_ja.md b/keyboards/biacco42/ergo42/keymaps/koba/readme_ja.md
similarity index 100%
rename from keyboards/ergo42/keymaps/koba/readme_ja.md
rename to keyboards/biacco42/ergo42/keymaps/koba/readme_ja.md
diff --git a/keyboards/ergo42/keymaps/shinze/config.h b/keyboards/biacco42/ergo42/keymaps/shinze/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/shinze/config.h
rename to keyboards/biacco42/ergo42/keymaps/shinze/config.h
diff --git a/keyboards/ergo42/keymaps/shinze/keymap.c b/keyboards/biacco42/ergo42/keymaps/shinze/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/shinze/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/shinze/keymap.c
diff --git a/keyboards/ergo42/keymaps/yshrsmz/config.h b/keyboards/biacco42/ergo42/keymaps/yshrsmz/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/yshrsmz/config.h
rename to keyboards/biacco42/ergo42/keymaps/yshrsmz/config.h
diff --git a/keyboards/ergo42/keymaps/yshrsmz/keymap.c b/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/yshrsmz/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
diff --git a/keyboards/ergo42/keymaps/yshrsmz/rules.mk b/keyboards/biacco42/ergo42/keymaps/yshrsmz/rules.mk
similarity index 100%
rename from keyboards/ergo42/keymaps/yshrsmz/rules.mk
rename to keyboards/biacco42/ergo42/keymaps/yshrsmz/rules.mk
diff --git a/keyboards/ergo42/readme.md b/keyboards/biacco42/ergo42/readme.md
similarity index 95%
rename from keyboards/ergo42/readme.md
rename to keyboards/biacco42/ergo42/readme.md
index c43b47382b..778c64a99f 100644
--- a/keyboards/ergo42/readme.md
+++ b/keyboards/biacco42/ergo42/readme.md
@@ -11,6 +11,6 @@ A split 7x4 ortholinear keyboard. [Hardware project repo](https://github.com/Bia
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ergo42/rev1:default:flash
+    make biacco42/ergo42/rev1:default:flash
 
 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).
diff --git a/keyboards/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h
similarity index 100%
rename from keyboards/ergo42/rev1/config.h
rename to keyboards/biacco42/ergo42/rev1/config.h
diff --git a/keyboards/ergo42/rev1/rev1.c b/keyboards/biacco42/ergo42/rev1/rev1.c
similarity index 100%
rename from keyboards/ergo42/rev1/rev1.c
rename to keyboards/biacco42/ergo42/rev1/rev1.c
diff --git a/keyboards/ergo42/rev1/rev1.h b/keyboards/biacco42/ergo42/rev1/rev1.h
similarity index 100%
rename from keyboards/ergo42/rev1/rev1.h
rename to keyboards/biacco42/ergo42/rev1/rev1.h
diff --git a/keyboards/ergo42/rev1/rules.mk b/keyboards/biacco42/ergo42/rev1/rules.mk
similarity index 100%
rename from keyboards/ergo42/rev1/rules.mk
rename to keyboards/biacco42/ergo42/rev1/rules.mk
diff --git a/keyboards/ergo42/rules.mk b/keyboards/biacco42/ergo42/rules.mk
similarity index 94%
rename from keyboards/ergo42/rules.mk
rename to keyboards/biacco42/ergo42/rules.mk
index 2225bdcb59..9420c9b4eb 100644
--- a/keyboards/ergo42/rules.mk
+++ b/keyboards/biacco42/ergo42/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = ergo42/rev1
+DEFAULT_FOLDER = biacco42/ergo42/rev1
diff --git a/keyboards/meishi/config.h b/keyboards/biacco42/meishi/config.h
similarity index 100%
rename from keyboards/meishi/config.h
rename to keyboards/biacco42/meishi/config.h
diff --git a/keyboards/meishi/info.json b/keyboards/biacco42/meishi/info.json
similarity index 100%
rename from keyboards/meishi/info.json
rename to keyboards/biacco42/meishi/info.json
diff --git a/keyboards/meishi/keymaps/default/keymap.c b/keyboards/biacco42/meishi/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/meishi/keymaps/default/keymap.c
rename to keyboards/biacco42/meishi/keymaps/default/keymap.c
diff --git a/keyboards/meishi/keymaps/default/readme.md b/keyboards/biacco42/meishi/keymaps/default/readme.md
similarity index 100%
rename from keyboards/meishi/keymaps/default/readme.md
rename to keyboards/biacco42/meishi/keymaps/default/readme.md
diff --git a/keyboards/meishi/meishi.c b/keyboards/biacco42/meishi/meishi.c
similarity index 100%
rename from keyboards/meishi/meishi.c
rename to keyboards/biacco42/meishi/meishi.c
diff --git a/keyboards/meishi/meishi.h b/keyboards/biacco42/meishi/meishi.h
similarity index 100%
rename from keyboards/meishi/meishi.h
rename to keyboards/biacco42/meishi/meishi.h
diff --git a/keyboards/meishi/readme.md b/keyboards/biacco42/meishi/readme.md
similarity index 94%
rename from keyboards/meishi/readme.md
rename to keyboards/biacco42/meishi/readme.md
index 99421ed8d3..4648c14b4d 100644
--- a/keyboards/meishi/readme.md
+++ b/keyboards/biacco42/meishi/readme.md
@@ -13,7 +13,7 @@ Hardware Availability: [Tanoshi life - Booth](https://biacco42.booth.pm/)
 Make example for this keyboard (after setting up your build environment):
 
 ```
-$ make meishi:default:avrdude
+$ make biacco42/meishi:default:avrdude
 ```
 
 See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
diff --git a/keyboards/meishi/rules.mk b/keyboards/biacco42/meishi/rules.mk
similarity index 100%
rename from keyboards/meishi/rules.mk
rename to keyboards/biacco42/meishi/rules.mk
diff --git a/keyboards/meishi2/config.h b/keyboards/biacco42/meishi2/config.h
similarity index 100%
rename from keyboards/meishi2/config.h
rename to keyboards/biacco42/meishi2/config.h
diff --git a/keyboards/meishi2/info.json b/keyboards/biacco42/meishi2/info.json
similarity index 100%
rename from keyboards/meishi2/info.json
rename to keyboards/biacco42/meishi2/info.json
diff --git a/keyboards/meishi2/keymaps/default/keymap.c b/keyboards/biacco42/meishi2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/meishi2/keymaps/default/keymap.c
rename to keyboards/biacco42/meishi2/keymaps/default/keymap.c
diff --git a/keyboards/meishi2/keymaps/default/readme.md b/keyboards/biacco42/meishi2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/meishi2/keymaps/default/readme.md
rename to keyboards/biacco42/meishi2/keymaps/default/readme.md
diff --git a/keyboards/meishi2/keymaps/led_status/keymap.c b/keyboards/biacco42/meishi2/keymaps/led_status/keymap.c
similarity index 100%
rename from keyboards/meishi2/keymaps/led_status/keymap.c
rename to keyboards/biacco42/meishi2/keymaps/led_status/keymap.c
diff --git a/keyboards/meishi2/keymaps/led_status/readme.md b/keyboards/biacco42/meishi2/keymaps/led_status/readme.md
similarity index 100%
rename from keyboards/meishi2/keymaps/led_status/readme.md
rename to keyboards/biacco42/meishi2/keymaps/led_status/readme.md
diff --git a/keyboards/meishi2/keymaps/moc/config.h b/keyboards/biacco42/meishi2/keymaps/moc/config.h
similarity index 100%
rename from keyboards/meishi2/keymaps/moc/config.h
rename to keyboards/biacco42/meishi2/keymaps/moc/config.h
diff --git a/keyboards/meishi2/keymaps/moc/keymap.c b/keyboards/biacco42/meishi2/keymaps/moc/keymap.c
similarity index 100%
rename from keyboards/meishi2/keymaps/moc/keymap.c
rename to keyboards/biacco42/meishi2/keymaps/moc/keymap.c
diff --git a/keyboards/meishi2/keymaps/moc/readme.md b/keyboards/biacco42/meishi2/keymaps/moc/readme.md
similarity index 100%
rename from keyboards/meishi2/keymaps/moc/readme.md
rename to keyboards/biacco42/meishi2/keymaps/moc/readme.md
diff --git a/keyboards/meishi2/keymaps/via/keymap.c b/keyboards/biacco42/meishi2/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/meishi2/keymaps/via/keymap.c
rename to keyboards/biacco42/meishi2/keymaps/via/keymap.c
diff --git a/keyboards/meishi2/keymaps/via/rules.mk b/keyboards/biacco42/meishi2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/meishi2/keymaps/via/rules.mk
rename to keyboards/biacco42/meishi2/keymaps/via/rules.mk
diff --git a/keyboards/meishi2/meishi2.c b/keyboards/biacco42/meishi2/meishi2.c
similarity index 100%
rename from keyboards/meishi2/meishi2.c
rename to keyboards/biacco42/meishi2/meishi2.c
diff --git a/keyboards/meishi2/meishi2.h b/keyboards/biacco42/meishi2/meishi2.h
similarity index 100%
rename from keyboards/meishi2/meishi2.h
rename to keyboards/biacco42/meishi2/meishi2.h
diff --git a/keyboards/meishi2/readme.md b/keyboards/biacco42/meishi2/readme.md
similarity index 95%
rename from keyboards/meishi2/readme.md
rename to keyboards/biacco42/meishi2/readme.md
index d80ec44184..97c5465f86 100644
--- a/keyboards/meishi2/readme.md
+++ b/keyboards/biacco42/meishi2/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [links to where you can find this hardware](https://githu
 
 Make example for this keyboard (after setting up your build environment):
 
-    make meishi2:default
+    make biacco42/meishi2: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).
diff --git a/keyboards/meishi2/rules.mk b/keyboards/biacco42/meishi2/rules.mk
similarity index 100%
rename from keyboards/meishi2/rules.mk
rename to keyboards/biacco42/meishi2/rules.mk

From 6cb0e8924ba258e112174b1dac36c88d16fbc560 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 03:46:08 +0800
Subject: [PATCH 457/867] [Keyboard] move @yynmt 's boards into /yynmt (#16075)

---
 keyboards/{ => yynmt}/dozen0/config.h                      | 0
 keyboards/{ => yynmt}/dozen0/dozen0.c                      | 0
 keyboards/{ => yynmt}/dozen0/dozen0.h                      | 0
 keyboards/{ => yynmt}/dozen0/info.json                     | 0
 keyboards/{ => yynmt}/dozen0/keymaps/default/keymap.c      | 0
 keyboards/{ => yynmt}/dozen0/keymaps/default/readme.md     | 0
 keyboards/{ => yynmt}/dozen0/keymaps/f12/keymap.c          | 0
 keyboards/{ => yynmt}/dozen0/keymaps/via/keymap.c          | 0
 keyboards/{ => yynmt}/dozen0/keymaps/via/rules.mk          | 0
 keyboards/{ => yynmt}/dozen0/readme.md                     | 2 +-
 keyboards/{ => yynmt}/dozen0/rules.mk                      | 0
 keyboards/{ => yynmt}/kagamidget/config.h                  | 0
 keyboards/{ => yynmt}/kagamidget/info.json                 | 0
 keyboards/{ => yynmt}/kagamidget/kagamidget.c              | 0
 keyboards/{ => yynmt}/kagamidget/kagamidget.h              | 0
 keyboards/{ => yynmt}/kagamidget/keymaps/default/keymap.c  | 0
 keyboards/{ => yynmt}/kagamidget/keymaps/default/readme.md | 0
 keyboards/{ => yynmt}/kagamidget/readme.md                 | 2 +-
 keyboards/{ => yynmt}/kagamidget/rules.mk                  | 0
 19 files changed, 2 insertions(+), 2 deletions(-)
 rename keyboards/{ => yynmt}/dozen0/config.h (100%)
 rename keyboards/{ => yynmt}/dozen0/dozen0.c (100%)
 rename keyboards/{ => yynmt}/dozen0/dozen0.h (100%)
 rename keyboards/{ => yynmt}/dozen0/info.json (100%)
 rename keyboards/{ => yynmt}/dozen0/keymaps/default/keymap.c (100%)
 rename keyboards/{ => yynmt}/dozen0/keymaps/default/readme.md (100%)
 rename keyboards/{ => yynmt}/dozen0/keymaps/f12/keymap.c (100%)
 rename keyboards/{ => yynmt}/dozen0/keymaps/via/keymap.c (100%)
 rename keyboards/{ => yynmt}/dozen0/keymaps/via/rules.mk (100%)
 rename keyboards/{ => yynmt}/dozen0/readme.md (95%)
 rename keyboards/{ => yynmt}/dozen0/rules.mk (100%)
 rename keyboards/{ => yynmt}/kagamidget/config.h (100%)
 rename keyboards/{ => yynmt}/kagamidget/info.json (100%)
 rename keyboards/{ => yynmt}/kagamidget/kagamidget.c (100%)
 rename keyboards/{ => yynmt}/kagamidget/kagamidget.h (100%)
 rename keyboards/{ => yynmt}/kagamidget/keymaps/default/keymap.c (100%)
 rename keyboards/{ => yynmt}/kagamidget/keymaps/default/readme.md (100%)
 rename keyboards/{ => yynmt}/kagamidget/readme.md (94%)
 rename keyboards/{ => yynmt}/kagamidget/rules.mk (100%)

diff --git a/keyboards/dozen0/config.h b/keyboards/yynmt/dozen0/config.h
similarity index 100%
rename from keyboards/dozen0/config.h
rename to keyboards/yynmt/dozen0/config.h
diff --git a/keyboards/dozen0/dozen0.c b/keyboards/yynmt/dozen0/dozen0.c
similarity index 100%
rename from keyboards/dozen0/dozen0.c
rename to keyboards/yynmt/dozen0/dozen0.c
diff --git a/keyboards/dozen0/dozen0.h b/keyboards/yynmt/dozen0/dozen0.h
similarity index 100%
rename from keyboards/dozen0/dozen0.h
rename to keyboards/yynmt/dozen0/dozen0.h
diff --git a/keyboards/dozen0/info.json b/keyboards/yynmt/dozen0/info.json
similarity index 100%
rename from keyboards/dozen0/info.json
rename to keyboards/yynmt/dozen0/info.json
diff --git a/keyboards/dozen0/keymaps/default/keymap.c b/keyboards/yynmt/dozen0/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/dozen0/keymaps/default/keymap.c
rename to keyboards/yynmt/dozen0/keymaps/default/keymap.c
diff --git a/keyboards/dozen0/keymaps/default/readme.md b/keyboards/yynmt/dozen0/keymaps/default/readme.md
similarity index 100%
rename from keyboards/dozen0/keymaps/default/readme.md
rename to keyboards/yynmt/dozen0/keymaps/default/readme.md
diff --git a/keyboards/dozen0/keymaps/f12/keymap.c b/keyboards/yynmt/dozen0/keymaps/f12/keymap.c
similarity index 100%
rename from keyboards/dozen0/keymaps/f12/keymap.c
rename to keyboards/yynmt/dozen0/keymaps/f12/keymap.c
diff --git a/keyboards/dozen0/keymaps/via/keymap.c b/keyboards/yynmt/dozen0/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/dozen0/keymaps/via/keymap.c
rename to keyboards/yynmt/dozen0/keymaps/via/keymap.c
diff --git a/keyboards/dozen0/keymaps/via/rules.mk b/keyboards/yynmt/dozen0/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/dozen0/keymaps/via/rules.mk
rename to keyboards/yynmt/dozen0/keymaps/via/rules.mk
diff --git a/keyboards/dozen0/readme.md b/keyboards/yynmt/dozen0/readme.md
similarity index 95%
rename from keyboards/dozen0/readme.md
rename to keyboards/yynmt/dozen0/readme.md
index 7ef1192461..c215e96e4c 100644
--- a/keyboards/dozen0/readme.md
+++ b/keyboards/yynmt/dozen0/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: links to where you can find this hardware
 
 Make example for this keyboard (after setting up your build environment):
 
-    make dozen0:default
+    make yynmt/dozen0: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).
diff --git a/keyboards/dozen0/rules.mk b/keyboards/yynmt/dozen0/rules.mk
similarity index 100%
rename from keyboards/dozen0/rules.mk
rename to keyboards/yynmt/dozen0/rules.mk
diff --git a/keyboards/kagamidget/config.h b/keyboards/yynmt/kagamidget/config.h
similarity index 100%
rename from keyboards/kagamidget/config.h
rename to keyboards/yynmt/kagamidget/config.h
diff --git a/keyboards/kagamidget/info.json b/keyboards/yynmt/kagamidget/info.json
similarity index 100%
rename from keyboards/kagamidget/info.json
rename to keyboards/yynmt/kagamidget/info.json
diff --git a/keyboards/kagamidget/kagamidget.c b/keyboards/yynmt/kagamidget/kagamidget.c
similarity index 100%
rename from keyboards/kagamidget/kagamidget.c
rename to keyboards/yynmt/kagamidget/kagamidget.c
diff --git a/keyboards/kagamidget/kagamidget.h b/keyboards/yynmt/kagamidget/kagamidget.h
similarity index 100%
rename from keyboards/kagamidget/kagamidget.h
rename to keyboards/yynmt/kagamidget/kagamidget.h
diff --git a/keyboards/kagamidget/keymaps/default/keymap.c b/keyboards/yynmt/kagamidget/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kagamidget/keymaps/default/keymap.c
rename to keyboards/yynmt/kagamidget/keymaps/default/keymap.c
diff --git a/keyboards/kagamidget/keymaps/default/readme.md b/keyboards/yynmt/kagamidget/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kagamidget/keymaps/default/readme.md
rename to keyboards/yynmt/kagamidget/keymaps/default/readme.md
diff --git a/keyboards/kagamidget/readme.md b/keyboards/yynmt/kagamidget/readme.md
similarity index 94%
rename from keyboards/kagamidget/readme.md
rename to keyboards/yynmt/kagamidget/readme.md
index af38fdd858..78ec4f3c7b 100644
--- a/keyboards/kagamidget/readme.md
+++ b/keyboards/yynmt/kagamidget/readme.md
@@ -9,6 +9,6 @@ Hardware Supported:  KagaMidget PCBs, ProMicro supported
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kagamidget:default
+    make yynmt/kagamidget: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).
diff --git a/keyboards/kagamidget/rules.mk b/keyboards/yynmt/kagamidget/rules.mk
similarity index 100%
rename from keyboards/kagamidget/rules.mk
rename to keyboards/yynmt/kagamidget/rules.mk

From 3fefaf7f6b99aafe691a9024db4780684a588e4a Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 03:47:38 +0800
Subject: [PATCH 458/867] [Keyboard] move @GlenPickle 's chimera* boards into a
 folder (#16072)

---
 keyboards/{ => glenpickle}/chimera_ergo/chimera_ergo.c          | 0
 keyboards/{ => glenpickle}/chimera_ergo/chimera_ergo.h          | 0
 keyboards/{ => glenpickle}/chimera_ergo/config.h                | 0
 keyboards/{ => glenpickle}/chimera_ergo/info.json               | 0
 .../{ => glenpickle}/chimera_ergo/keymaps/default/keymap.c      | 0
 keyboards/{ => glenpickle}/chimera_ergo/matrix.c                | 0
 keyboards/{ => glenpickle}/chimera_ergo/readme.md               | 2 +-
 keyboards/{ => glenpickle}/chimera_ergo/rules.mk                | 0
 keyboards/{ => glenpickle}/chimera_ls/chimera_ls.c              | 0
 keyboards/{ => glenpickle}/chimera_ls/chimera_ls.h              | 0
 keyboards/{ => glenpickle}/chimera_ls/config.h                  | 0
 keyboards/{ => glenpickle}/chimera_ls/info.json                 | 0
 keyboards/{ => glenpickle}/chimera_ls/keymaps/default/keymap.c  | 0
 keyboards/{ => glenpickle}/chimera_ls/matrix.c                  | 0
 keyboards/{ => glenpickle}/chimera_ls/readme.md                 | 2 +-
 keyboards/{ => glenpickle}/chimera_ls/rules.mk                  | 0
 keyboards/{ => glenpickle}/chimera_ortho/chimera_ortho.c        | 0
 keyboards/{ => glenpickle}/chimera_ortho/chimera_ortho.h        | 0
 keyboards/{ => glenpickle}/chimera_ortho/config.h               | 0
 keyboards/{ => glenpickle}/chimera_ortho/info.json              | 0
 .../{ => glenpickle}/chimera_ortho/keymaps/default/config.h     | 0
 .../{ => glenpickle}/chimera_ortho/keymaps/default/keymap.c     | 0
 keyboards/{ => glenpickle}/chimera_ortho/matrix.c               | 0
 keyboards/{ => glenpickle}/chimera_ortho/readme.md              | 2 +-
 keyboards/{ => glenpickle}/chimera_ortho/rules.mk               | 0
 .../{ => glenpickle}/chimera_ortho_plus/chimera_ortho_plus.c    | 0
 .../{ => glenpickle}/chimera_ortho_plus/chimera_ortho_plus.h    | 0
 keyboards/{ => glenpickle}/chimera_ortho_plus/config.h          | 0
 keyboards/{ => glenpickle}/chimera_ortho_plus/info.json         | 0
 .../chimera_ortho_plus/keymaps/default/config.h                 | 0
 .../chimera_ortho_plus/keymaps/default/keymap.c                 | 0
 keyboards/{ => glenpickle}/chimera_ortho_plus/matrix.c          | 0
 keyboards/{ => glenpickle}/chimera_ortho_plus/readme.md         | 2 +-
 keyboards/{ => glenpickle}/chimera_ortho_plus/rules.mk          | 0
 34 files changed, 4 insertions(+), 4 deletions(-)
 rename keyboards/{ => glenpickle}/chimera_ergo/chimera_ergo.c (100%)
 rename keyboards/{ => glenpickle}/chimera_ergo/chimera_ergo.h (100%)
 rename keyboards/{ => glenpickle}/chimera_ergo/config.h (100%)
 rename keyboards/{ => glenpickle}/chimera_ergo/info.json (100%)
 rename keyboards/{ => glenpickle}/chimera_ergo/keymaps/default/keymap.c (100%)
 rename keyboards/{ => glenpickle}/chimera_ergo/matrix.c (100%)
 rename keyboards/{ => glenpickle}/chimera_ergo/readme.md (93%)
 rename keyboards/{ => glenpickle}/chimera_ergo/rules.mk (100%)
 rename keyboards/{ => glenpickle}/chimera_ls/chimera_ls.c (100%)
 rename keyboards/{ => glenpickle}/chimera_ls/chimera_ls.h (100%)
 rename keyboards/{ => glenpickle}/chimera_ls/config.h (100%)
 rename keyboards/{ => glenpickle}/chimera_ls/info.json (100%)
 rename keyboards/{ => glenpickle}/chimera_ls/keymaps/default/keymap.c (100%)
 rename keyboards/{ => glenpickle}/chimera_ls/matrix.c (100%)
 rename keyboards/{ => glenpickle}/chimera_ls/readme.md (94%)
 rename keyboards/{ => glenpickle}/chimera_ls/rules.mk (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho/chimera_ortho.c (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho/chimera_ortho.h (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho/config.h (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho/info.json (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho/keymaps/default/config.h (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho/keymaps/default/keymap.c (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho/matrix.c (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho/readme.md (93%)
 rename keyboards/{ => glenpickle}/chimera_ortho/rules.mk (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho_plus/chimera_ortho_plus.c (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho_plus/chimera_ortho_plus.h (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho_plus/config.h (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho_plus/info.json (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho_plus/keymaps/default/config.h (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho_plus/keymaps/default/keymap.c (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho_plus/matrix.c (100%)
 rename keyboards/{ => glenpickle}/chimera_ortho_plus/readme.md (93%)
 rename keyboards/{ => glenpickle}/chimera_ortho_plus/rules.mk (100%)

diff --git a/keyboards/chimera_ergo/chimera_ergo.c b/keyboards/glenpickle/chimera_ergo/chimera_ergo.c
similarity index 100%
rename from keyboards/chimera_ergo/chimera_ergo.c
rename to keyboards/glenpickle/chimera_ergo/chimera_ergo.c
diff --git a/keyboards/chimera_ergo/chimera_ergo.h b/keyboards/glenpickle/chimera_ergo/chimera_ergo.h
similarity index 100%
rename from keyboards/chimera_ergo/chimera_ergo.h
rename to keyboards/glenpickle/chimera_ergo/chimera_ergo.h
diff --git a/keyboards/chimera_ergo/config.h b/keyboards/glenpickle/chimera_ergo/config.h
similarity index 100%
rename from keyboards/chimera_ergo/config.h
rename to keyboards/glenpickle/chimera_ergo/config.h
diff --git a/keyboards/chimera_ergo/info.json b/keyboards/glenpickle/chimera_ergo/info.json
similarity index 100%
rename from keyboards/chimera_ergo/info.json
rename to keyboards/glenpickle/chimera_ergo/info.json
diff --git a/keyboards/chimera_ergo/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ergo/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/chimera_ergo/keymaps/default/keymap.c
rename to keyboards/glenpickle/chimera_ergo/keymaps/default/keymap.c
diff --git a/keyboards/chimera_ergo/matrix.c b/keyboards/glenpickle/chimera_ergo/matrix.c
similarity index 100%
rename from keyboards/chimera_ergo/matrix.c
rename to keyboards/glenpickle/chimera_ergo/matrix.c
diff --git a/keyboards/chimera_ergo/readme.md b/keyboards/glenpickle/chimera_ergo/readme.md
similarity index 93%
rename from keyboards/chimera_ergo/readme.md
rename to keyboards/glenpickle/chimera_ergo/readme.md
index 2b5d2d65c0..4ccd039ee0 100644
--- a/keyboards/chimera_ergo/readme.md
+++ b/keyboards/glenpickle/chimera_ergo/readme.md
@@ -10,7 +10,7 @@ Hardware Availability: [Gerbers](https://github.com/GlenPickle/Chimera/tree/mast
 
 Make example for this keyboard (after setting up your build environment):
 
-    make chimera_ergo:default
+    make glenpickle/chimera_ergo:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/chimera_ergo/rules.mk b/keyboards/glenpickle/chimera_ergo/rules.mk
similarity index 100%
rename from keyboards/chimera_ergo/rules.mk
rename to keyboards/glenpickle/chimera_ergo/rules.mk
diff --git a/keyboards/chimera_ls/chimera_ls.c b/keyboards/glenpickle/chimera_ls/chimera_ls.c
similarity index 100%
rename from keyboards/chimera_ls/chimera_ls.c
rename to keyboards/glenpickle/chimera_ls/chimera_ls.c
diff --git a/keyboards/chimera_ls/chimera_ls.h b/keyboards/glenpickle/chimera_ls/chimera_ls.h
similarity index 100%
rename from keyboards/chimera_ls/chimera_ls.h
rename to keyboards/glenpickle/chimera_ls/chimera_ls.h
diff --git a/keyboards/chimera_ls/config.h b/keyboards/glenpickle/chimera_ls/config.h
similarity index 100%
rename from keyboards/chimera_ls/config.h
rename to keyboards/glenpickle/chimera_ls/config.h
diff --git a/keyboards/chimera_ls/info.json b/keyboards/glenpickle/chimera_ls/info.json
similarity index 100%
rename from keyboards/chimera_ls/info.json
rename to keyboards/glenpickle/chimera_ls/info.json
diff --git a/keyboards/chimera_ls/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/chimera_ls/keymaps/default/keymap.c
rename to keyboards/glenpickle/chimera_ls/keymaps/default/keymap.c
diff --git a/keyboards/chimera_ls/matrix.c b/keyboards/glenpickle/chimera_ls/matrix.c
similarity index 100%
rename from keyboards/chimera_ls/matrix.c
rename to keyboards/glenpickle/chimera_ls/matrix.c
diff --git a/keyboards/chimera_ls/readme.md b/keyboards/glenpickle/chimera_ls/readme.md
similarity index 94%
rename from keyboards/chimera_ls/readme.md
rename to keyboards/glenpickle/chimera_ls/readme.md
index 0170dd8a8f..bb882b66a8 100644
--- a/keyboards/chimera_ls/readme.md
+++ b/keyboards/glenpickle/chimera_ls/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [Gerbers](https://github.com/GlenPickle/Chimera/tree/mast
 
 Make example for this keyboard (after setting up your build environment):
 
-    make chimera_ls:default
+    make glenpickle/chimera_ls: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).
diff --git a/keyboards/chimera_ls/rules.mk b/keyboards/glenpickle/chimera_ls/rules.mk
similarity index 100%
rename from keyboards/chimera_ls/rules.mk
rename to keyboards/glenpickle/chimera_ls/rules.mk
diff --git a/keyboards/chimera_ortho/chimera_ortho.c b/keyboards/glenpickle/chimera_ortho/chimera_ortho.c
similarity index 100%
rename from keyboards/chimera_ortho/chimera_ortho.c
rename to keyboards/glenpickle/chimera_ortho/chimera_ortho.c
diff --git a/keyboards/chimera_ortho/chimera_ortho.h b/keyboards/glenpickle/chimera_ortho/chimera_ortho.h
similarity index 100%
rename from keyboards/chimera_ortho/chimera_ortho.h
rename to keyboards/glenpickle/chimera_ortho/chimera_ortho.h
diff --git a/keyboards/chimera_ortho/config.h b/keyboards/glenpickle/chimera_ortho/config.h
similarity index 100%
rename from keyboards/chimera_ortho/config.h
rename to keyboards/glenpickle/chimera_ortho/config.h
diff --git a/keyboards/chimera_ortho/info.json b/keyboards/glenpickle/chimera_ortho/info.json
similarity index 100%
rename from keyboards/chimera_ortho/info.json
rename to keyboards/glenpickle/chimera_ortho/info.json
diff --git a/keyboards/chimera_ortho/keymaps/default/config.h b/keyboards/glenpickle/chimera_ortho/keymaps/default/config.h
similarity index 100%
rename from keyboards/chimera_ortho/keymaps/default/config.h
rename to keyboards/glenpickle/chimera_ortho/keymaps/default/config.h
diff --git a/keyboards/chimera_ortho/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/chimera_ortho/keymaps/default/keymap.c
rename to keyboards/glenpickle/chimera_ortho/keymaps/default/keymap.c
diff --git a/keyboards/chimera_ortho/matrix.c b/keyboards/glenpickle/chimera_ortho/matrix.c
similarity index 100%
rename from keyboards/chimera_ortho/matrix.c
rename to keyboards/glenpickle/chimera_ortho/matrix.c
diff --git a/keyboards/chimera_ortho/readme.md b/keyboards/glenpickle/chimera_ortho/readme.md
similarity index 93%
rename from keyboards/chimera_ortho/readme.md
rename to keyboards/glenpickle/chimera_ortho/readme.md
index 644300f986..bff001d3c9 100644
--- a/keyboards/chimera_ortho/readme.md
+++ b/keyboards/glenpickle/chimera_ortho/readme.md
@@ -13,7 +13,7 @@ Hardware Availability: [Gerbers](https://github.com/GlenPickle/Chimera/tree/mast
 
 Make example for this keyboard (after setting up your build environment):
 
-    make chimera_ortho:default
+    make glenpickle/chimera_ortho:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/chimera_ortho/rules.mk b/keyboards/glenpickle/chimera_ortho/rules.mk
similarity index 100%
rename from keyboards/chimera_ortho/rules.mk
rename to keyboards/glenpickle/chimera_ortho/rules.mk
diff --git a/keyboards/chimera_ortho_plus/chimera_ortho_plus.c b/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.c
similarity index 100%
rename from keyboards/chimera_ortho_plus/chimera_ortho_plus.c
rename to keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.c
diff --git a/keyboards/chimera_ortho_plus/chimera_ortho_plus.h b/keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.h
similarity index 100%
rename from keyboards/chimera_ortho_plus/chimera_ortho_plus.h
rename to keyboards/glenpickle/chimera_ortho_plus/chimera_ortho_plus.h
diff --git a/keyboards/chimera_ortho_plus/config.h b/keyboards/glenpickle/chimera_ortho_plus/config.h
similarity index 100%
rename from keyboards/chimera_ortho_plus/config.h
rename to keyboards/glenpickle/chimera_ortho_plus/config.h
diff --git a/keyboards/chimera_ortho_plus/info.json b/keyboards/glenpickle/chimera_ortho_plus/info.json
similarity index 100%
rename from keyboards/chimera_ortho_plus/info.json
rename to keyboards/glenpickle/chimera_ortho_plus/info.json
diff --git a/keyboards/chimera_ortho_plus/keymaps/default/config.h b/keyboards/glenpickle/chimera_ortho_plus/keymaps/default/config.h
similarity index 100%
rename from keyboards/chimera_ortho_plus/keymaps/default/config.h
rename to keyboards/glenpickle/chimera_ortho_plus/keymaps/default/config.h
diff --git a/keyboards/chimera_ortho_plus/keymaps/default/keymap.c b/keyboards/glenpickle/chimera_ortho_plus/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/chimera_ortho_plus/keymaps/default/keymap.c
rename to keyboards/glenpickle/chimera_ortho_plus/keymaps/default/keymap.c
diff --git a/keyboards/chimera_ortho_plus/matrix.c b/keyboards/glenpickle/chimera_ortho_plus/matrix.c
similarity index 100%
rename from keyboards/chimera_ortho_plus/matrix.c
rename to keyboards/glenpickle/chimera_ortho_plus/matrix.c
diff --git a/keyboards/chimera_ortho_plus/readme.md b/keyboards/glenpickle/chimera_ortho_plus/readme.md
similarity index 93%
rename from keyboards/chimera_ortho_plus/readme.md
rename to keyboards/glenpickle/chimera_ortho_plus/readme.md
index ad4cb9d392..259e982832 100644
--- a/keyboards/chimera_ortho_plus/readme.md
+++ b/keyboards/glenpickle/chimera_ortho_plus/readme.md
@@ -10,6 +10,6 @@ A split wireless 50% ortholinear keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make chimera_ortho_plus:default
+    make glenpickle/chimera_ortho_plus: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).
diff --git a/keyboards/chimera_ortho_plus/rules.mk b/keyboards/glenpickle/chimera_ortho_plus/rules.mk
similarity index 100%
rename from keyboards/chimera_ortho_plus/rules.mk
rename to keyboards/glenpickle/chimera_ortho_plus/rules.mk

From ae705e3e55ec38767a3e80da645983154a73cbfc Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 03:48:51 +0800
Subject: [PATCH 459/867] [Keyboard] move @ka2hiro 's boards into /kagizaraya
 (#16070)

---
 keyboards/{ => kagizaraya}/chidori/.noci                        | 0
 keyboards/{ => kagizaraya}/chidori/board.c                      | 0
 keyboards/{ => kagizaraya}/chidori/board.h                      | 0
 keyboards/{ => kagizaraya}/chidori/chidori.c                    | 0
 keyboards/{ => kagizaraya}/chidori/chidori.h                    | 0
 keyboards/{ => kagizaraya}/chidori/config.h                     | 0
 keyboards/{ => kagizaraya}/chidori/info.json                    | 0
 keyboards/{ => kagizaraya}/chidori/keymaps/default/config.h     | 0
 keyboards/{ => kagizaraya}/chidori/keymaps/default/keymap.c     | 0
 keyboards/{ => kagizaraya}/chidori/keymaps/default/readme.md    | 0
 keyboards/{ => kagizaraya}/chidori/keymaps/extended/config.h    | 0
 keyboards/{ => kagizaraya}/chidori/keymaps/extended/keymap.c    | 0
 keyboards/{ => kagizaraya}/chidori/keymaps/extended/readme.md   | 0
 keyboards/{ => kagizaraya}/chidori/keymaps/oled_sample/keymap.c | 0
 .../{ => kagizaraya}/chidori/keymaps/oled_sample/readme.md      | 0
 keyboards/{ => kagizaraya}/chidori/keymaps/oled_sample/rules.mk | 0
 keyboards/{ => kagizaraya}/chidori/matrix.c                     | 0
 keyboards/{ => kagizaraya}/chidori/readme.md                    | 2 +-
 keyboards/{ => kagizaraya}/chidori/rules.mk                     | 0
 keyboards/{ => kagizaraya}/halberd/config.h                     | 0
 keyboards/{ => kagizaraya}/halberd/halberd.c                    | 0
 keyboards/{ => kagizaraya}/halberd/halberd.h                    | 0
 keyboards/{ => kagizaraya}/halberd/info.json                    | 0
 keyboards/{ => kagizaraya}/halberd/keymaps/default/keymap.c     | 0
 keyboards/{ => kagizaraya}/halberd/keymaps/default/readme.md    | 0
 .../{ => kagizaraya}/halberd/keymaps/right_modifiers/keymap.c   | 0
 .../{ => kagizaraya}/halberd/keymaps/right_modifiers/readme.md  | 0
 keyboards/{ => kagizaraya}/halberd/readme.md                    | 2 +-
 keyboards/{ => kagizaraya}/halberd/rules.mk                     | 0
 keyboards/{ => kagizaraya}/scythe/config.h                      | 0
 keyboards/{ => kagizaraya}/scythe/info.json                     | 0
 keyboards/{ => kagizaraya}/scythe/keymaps/default/keymap.c      | 0
 keyboards/{ => kagizaraya}/scythe/keymaps/default/readme.md     | 0
 keyboards/{ => kagizaraya}/scythe/keymaps/forties/keymap.c      | 0
 keyboards/{ => kagizaraya}/scythe/keymaps/forties/readme.md     | 0
 keyboards/{ => kagizaraya}/scythe/readme.md                     | 2 +-
 keyboards/{ => kagizaraya}/scythe/rules.mk                      | 0
 keyboards/{ => kagizaraya}/scythe/scythe.c                      | 0
 keyboards/{ => kagizaraya}/scythe/scythe.h                      | 0
 39 files changed, 3 insertions(+), 3 deletions(-)
 rename keyboards/{ => kagizaraya}/chidori/.noci (100%)
 rename keyboards/{ => kagizaraya}/chidori/board.c (100%)
 rename keyboards/{ => kagizaraya}/chidori/board.h (100%)
 rename keyboards/{ => kagizaraya}/chidori/chidori.c (100%)
 rename keyboards/{ => kagizaraya}/chidori/chidori.h (100%)
 rename keyboards/{ => kagizaraya}/chidori/config.h (100%)
 rename keyboards/{ => kagizaraya}/chidori/info.json (100%)
 rename keyboards/{ => kagizaraya}/chidori/keymaps/default/config.h (100%)
 rename keyboards/{ => kagizaraya}/chidori/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kagizaraya}/chidori/keymaps/default/readme.md (100%)
 rename keyboards/{ => kagizaraya}/chidori/keymaps/extended/config.h (100%)
 rename keyboards/{ => kagizaraya}/chidori/keymaps/extended/keymap.c (100%)
 rename keyboards/{ => kagizaraya}/chidori/keymaps/extended/readme.md (100%)
 rename keyboards/{ => kagizaraya}/chidori/keymaps/oled_sample/keymap.c (100%)
 rename keyboards/{ => kagizaraya}/chidori/keymaps/oled_sample/readme.md (100%)
 rename keyboards/{ => kagizaraya}/chidori/keymaps/oled_sample/rules.mk (100%)
 rename keyboards/{ => kagizaraya}/chidori/matrix.c (100%)
 rename keyboards/{ => kagizaraya}/chidori/readme.md (94%)
 rename keyboards/{ => kagizaraya}/chidori/rules.mk (100%)
 rename keyboards/{ => kagizaraya}/halberd/config.h (100%)
 rename keyboards/{ => kagizaraya}/halberd/halberd.c (100%)
 rename keyboards/{ => kagizaraya}/halberd/halberd.h (100%)
 rename keyboards/{ => kagizaraya}/halberd/info.json (100%)
 rename keyboards/{ => kagizaraya}/halberd/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kagizaraya}/halberd/keymaps/default/readme.md (100%)
 rename keyboards/{ => kagizaraya}/halberd/keymaps/right_modifiers/keymap.c (100%)
 rename keyboards/{ => kagizaraya}/halberd/keymaps/right_modifiers/readme.md (100%)
 rename keyboards/{ => kagizaraya}/halberd/readme.md (94%)
 rename keyboards/{ => kagizaraya}/halberd/rules.mk (100%)
 rename keyboards/{ => kagizaraya}/scythe/config.h (100%)
 rename keyboards/{ => kagizaraya}/scythe/info.json (100%)
 rename keyboards/{ => kagizaraya}/scythe/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kagizaraya}/scythe/keymaps/default/readme.md (100%)
 rename keyboards/{ => kagizaraya}/scythe/keymaps/forties/keymap.c (100%)
 rename keyboards/{ => kagizaraya}/scythe/keymaps/forties/readme.md (100%)
 rename keyboards/{ => kagizaraya}/scythe/readme.md (94%)
 rename keyboards/{ => kagizaraya}/scythe/rules.mk (100%)
 rename keyboards/{ => kagizaraya}/scythe/scythe.c (100%)
 rename keyboards/{ => kagizaraya}/scythe/scythe.h (100%)

diff --git a/keyboards/chidori/.noci b/keyboards/kagizaraya/chidori/.noci
similarity index 100%
rename from keyboards/chidori/.noci
rename to keyboards/kagizaraya/chidori/.noci
diff --git a/keyboards/chidori/board.c b/keyboards/kagizaraya/chidori/board.c
similarity index 100%
rename from keyboards/chidori/board.c
rename to keyboards/kagizaraya/chidori/board.c
diff --git a/keyboards/chidori/board.h b/keyboards/kagizaraya/chidori/board.h
similarity index 100%
rename from keyboards/chidori/board.h
rename to keyboards/kagizaraya/chidori/board.h
diff --git a/keyboards/chidori/chidori.c b/keyboards/kagizaraya/chidori/chidori.c
similarity index 100%
rename from keyboards/chidori/chidori.c
rename to keyboards/kagizaraya/chidori/chidori.c
diff --git a/keyboards/chidori/chidori.h b/keyboards/kagizaraya/chidori/chidori.h
similarity index 100%
rename from keyboards/chidori/chidori.h
rename to keyboards/kagizaraya/chidori/chidori.h
diff --git a/keyboards/chidori/config.h b/keyboards/kagizaraya/chidori/config.h
similarity index 100%
rename from keyboards/chidori/config.h
rename to keyboards/kagizaraya/chidori/config.h
diff --git a/keyboards/chidori/info.json b/keyboards/kagizaraya/chidori/info.json
similarity index 100%
rename from keyboards/chidori/info.json
rename to keyboards/kagizaraya/chidori/info.json
diff --git a/keyboards/chidori/keymaps/default/config.h b/keyboards/kagizaraya/chidori/keymaps/default/config.h
similarity index 100%
rename from keyboards/chidori/keymaps/default/config.h
rename to keyboards/kagizaraya/chidori/keymaps/default/config.h
diff --git a/keyboards/chidori/keymaps/default/keymap.c b/keyboards/kagizaraya/chidori/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/chidori/keymaps/default/keymap.c
rename to keyboards/kagizaraya/chidori/keymaps/default/keymap.c
diff --git a/keyboards/chidori/keymaps/default/readme.md b/keyboards/kagizaraya/chidori/keymaps/default/readme.md
similarity index 100%
rename from keyboards/chidori/keymaps/default/readme.md
rename to keyboards/kagizaraya/chidori/keymaps/default/readme.md
diff --git a/keyboards/chidori/keymaps/extended/config.h b/keyboards/kagizaraya/chidori/keymaps/extended/config.h
similarity index 100%
rename from keyboards/chidori/keymaps/extended/config.h
rename to keyboards/kagizaraya/chidori/keymaps/extended/config.h
diff --git a/keyboards/chidori/keymaps/extended/keymap.c b/keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
similarity index 100%
rename from keyboards/chidori/keymaps/extended/keymap.c
rename to keyboards/kagizaraya/chidori/keymaps/extended/keymap.c
diff --git a/keyboards/chidori/keymaps/extended/readme.md b/keyboards/kagizaraya/chidori/keymaps/extended/readme.md
similarity index 100%
rename from keyboards/chidori/keymaps/extended/readme.md
rename to keyboards/kagizaraya/chidori/keymaps/extended/readme.md
diff --git a/keyboards/chidori/keymaps/oled_sample/keymap.c b/keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c
similarity index 100%
rename from keyboards/chidori/keymaps/oled_sample/keymap.c
rename to keyboards/kagizaraya/chidori/keymaps/oled_sample/keymap.c
diff --git a/keyboards/chidori/keymaps/oled_sample/readme.md b/keyboards/kagizaraya/chidori/keymaps/oled_sample/readme.md
similarity index 100%
rename from keyboards/chidori/keymaps/oled_sample/readme.md
rename to keyboards/kagizaraya/chidori/keymaps/oled_sample/readme.md
diff --git a/keyboards/chidori/keymaps/oled_sample/rules.mk b/keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk
similarity index 100%
rename from keyboards/chidori/keymaps/oled_sample/rules.mk
rename to keyboards/kagizaraya/chidori/keymaps/oled_sample/rules.mk
diff --git a/keyboards/chidori/matrix.c b/keyboards/kagizaraya/chidori/matrix.c
similarity index 100%
rename from keyboards/chidori/matrix.c
rename to keyboards/kagizaraya/chidori/matrix.c
diff --git a/keyboards/chidori/readme.md b/keyboards/kagizaraya/chidori/readme.md
similarity index 94%
rename from keyboards/chidori/readme.md
rename to keyboards/kagizaraya/chidori/readme.md
index d02b50a758..b776583491 100644
--- a/keyboards/chidori/readme.md
+++ b/keyboards/kagizaraya/chidori/readme.md
@@ -10,6 +10,6 @@ Yet another split keyboard made with only through-hole components.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make chidori:default:usbasp
+    make kagizaraya/chidori:default:usbasp
 
 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).
diff --git a/keyboards/chidori/rules.mk b/keyboards/kagizaraya/chidori/rules.mk
similarity index 100%
rename from keyboards/chidori/rules.mk
rename to keyboards/kagizaraya/chidori/rules.mk
diff --git a/keyboards/halberd/config.h b/keyboards/kagizaraya/halberd/config.h
similarity index 100%
rename from keyboards/halberd/config.h
rename to keyboards/kagizaraya/halberd/config.h
diff --git a/keyboards/halberd/halberd.c b/keyboards/kagizaraya/halberd/halberd.c
similarity index 100%
rename from keyboards/halberd/halberd.c
rename to keyboards/kagizaraya/halberd/halberd.c
diff --git a/keyboards/halberd/halberd.h b/keyboards/kagizaraya/halberd/halberd.h
similarity index 100%
rename from keyboards/halberd/halberd.h
rename to keyboards/kagizaraya/halberd/halberd.h
diff --git a/keyboards/halberd/info.json b/keyboards/kagizaraya/halberd/info.json
similarity index 100%
rename from keyboards/halberd/info.json
rename to keyboards/kagizaraya/halberd/info.json
diff --git a/keyboards/halberd/keymaps/default/keymap.c b/keyboards/kagizaraya/halberd/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/halberd/keymaps/default/keymap.c
rename to keyboards/kagizaraya/halberd/keymaps/default/keymap.c
diff --git a/keyboards/halberd/keymaps/default/readme.md b/keyboards/kagizaraya/halberd/keymaps/default/readme.md
similarity index 100%
rename from keyboards/halberd/keymaps/default/readme.md
rename to keyboards/kagizaraya/halberd/keymaps/default/readme.md
diff --git a/keyboards/halberd/keymaps/right_modifiers/keymap.c b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
similarity index 100%
rename from keyboards/halberd/keymaps/right_modifiers/keymap.c
rename to keyboards/kagizaraya/halberd/keymaps/right_modifiers/keymap.c
diff --git a/keyboards/halberd/keymaps/right_modifiers/readme.md b/keyboards/kagizaraya/halberd/keymaps/right_modifiers/readme.md
similarity index 100%
rename from keyboards/halberd/keymaps/right_modifiers/readme.md
rename to keyboards/kagizaraya/halberd/keymaps/right_modifiers/readme.md
diff --git a/keyboards/halberd/readme.md b/keyboards/kagizaraya/halberd/readme.md
similarity index 94%
rename from keyboards/halberd/readme.md
rename to keyboards/kagizaraya/halberd/readme.md
index 7fa0388fda..51c1736996 100644
--- a/keyboards/halberd/readme.md
+++ b/keyboards/kagizaraya/halberd/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [@kagizaraya](https://twitter.com/kagizaraya)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make halberd:default:dfu
+    make kagizaraya/halberd:default:dfu
 
 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).
diff --git a/keyboards/halberd/rules.mk b/keyboards/kagizaraya/halberd/rules.mk
similarity index 100%
rename from keyboards/halberd/rules.mk
rename to keyboards/kagizaraya/halberd/rules.mk
diff --git a/keyboards/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
similarity index 100%
rename from keyboards/scythe/config.h
rename to keyboards/kagizaraya/scythe/config.h
diff --git a/keyboards/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
similarity index 100%
rename from keyboards/scythe/info.json
rename to keyboards/kagizaraya/scythe/info.json
diff --git a/keyboards/scythe/keymaps/default/keymap.c b/keyboards/kagizaraya/scythe/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/scythe/keymaps/default/keymap.c
rename to keyboards/kagizaraya/scythe/keymaps/default/keymap.c
diff --git a/keyboards/scythe/keymaps/default/readme.md b/keyboards/kagizaraya/scythe/keymaps/default/readme.md
similarity index 100%
rename from keyboards/scythe/keymaps/default/readme.md
rename to keyboards/kagizaraya/scythe/keymaps/default/readme.md
diff --git a/keyboards/scythe/keymaps/forties/keymap.c b/keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
similarity index 100%
rename from keyboards/scythe/keymaps/forties/keymap.c
rename to keyboards/kagizaraya/scythe/keymaps/forties/keymap.c
diff --git a/keyboards/scythe/keymaps/forties/readme.md b/keyboards/kagizaraya/scythe/keymaps/forties/readme.md
similarity index 100%
rename from keyboards/scythe/keymaps/forties/readme.md
rename to keyboards/kagizaraya/scythe/keymaps/forties/readme.md
diff --git a/keyboards/scythe/readme.md b/keyboards/kagizaraya/scythe/readme.md
similarity index 94%
rename from keyboards/scythe/readme.md
rename to keyboards/kagizaraya/scythe/readme.md
index fed4a77e2f..d87b1f82bf 100644
--- a/keyboards/scythe/readme.md
+++ b/keyboards/kagizaraya/scythe/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [@kagizaraya](https://twitter.com/kagizaraya)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make scythe:default:dfu
+    make kagizaraya/scythe:default:dfu
 
 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).
diff --git a/keyboards/scythe/rules.mk b/keyboards/kagizaraya/scythe/rules.mk
similarity index 100%
rename from keyboards/scythe/rules.mk
rename to keyboards/kagizaraya/scythe/rules.mk
diff --git a/keyboards/scythe/scythe.c b/keyboards/kagizaraya/scythe/scythe.c
similarity index 100%
rename from keyboards/scythe/scythe.c
rename to keyboards/kagizaraya/scythe/scythe.c
diff --git a/keyboards/scythe/scythe.h b/keyboards/kagizaraya/scythe/scythe.h
similarity index 100%
rename from keyboards/scythe/scythe.h
rename to keyboards/kagizaraya/scythe/scythe.h

From 84b7fc364d8c3a18a109d84837f1399f6f2f8143 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 03:52:01 +0800
Subject: [PATCH 460/867] [Keyboard] move @takai 's keyboards into
 /recompile_keys (#16053)

---
 keyboards/choco60/rules.mk                                    | 1 -
 keyboards/nomu30/rules.mk                                     | 1 -
 keyboards/{ => recompile_keys}/choco60/choco60.c              | 0
 keyboards/{ => recompile_keys}/choco60/choco60.h              | 0
 keyboards/{ => recompile_keys}/choco60/config.h               | 0
 keyboards/{ => recompile_keys}/choco60/info.json              | 0
 .../{ => recompile_keys}/choco60/keymaps/default/keymap.c     | 0
 .../{ => recompile_keys}/choco60/keymaps/default/readme.md    | 0
 keyboards/{ => recompile_keys}/choco60/keymaps/via/keymap.c   | 0
 keyboards/{ => recompile_keys}/choco60/keymaps/via/rules.mk   | 0
 keyboards/{ => recompile_keys}/choco60/readme.md              | 4 ++--
 keyboards/{ => recompile_keys}/choco60/rev1/.noci             | 0
 keyboards/{ => recompile_keys}/choco60/rev1/config.h          | 0
 keyboards/{ => recompile_keys}/choco60/rev1/readme.md         | 0
 keyboards/{ => recompile_keys}/choco60/rev1/rev1.c            | 0
 keyboards/{ => recompile_keys}/choco60/rev1/rev1.h            | 0
 keyboards/{ => recompile_keys}/choco60/rev1/rules.mk          | 0
 keyboards/{ => recompile_keys}/choco60/rev2/config.h          | 0
 keyboards/{ => recompile_keys}/choco60/rev2/readme.md         | 0
 keyboards/{ => recompile_keys}/choco60/rev2/rev2.c            | 0
 keyboards/{ => recompile_keys}/choco60/rev2/rev2.h            | 0
 keyboards/{ => recompile_keys}/choco60/rev2/rules.mk          | 0
 keyboards/recompile_keys/choco60/rules.mk                     | 1 +
 keyboards/{ => recompile_keys}/cocoa40/.noci                  | 0
 keyboards/{ => recompile_keys}/cocoa40/cocoa40.c              | 0
 keyboards/{ => recompile_keys}/cocoa40/cocoa40.h              | 0
 keyboards/{ => recompile_keys}/cocoa40/config.h               | 0
 keyboards/{ => recompile_keys}/cocoa40/info.json              | 0
 .../{ => recompile_keys}/cocoa40/keymaps/default/keymap.c     | 0
 .../{ => recompile_keys}/cocoa40/keymaps/default/readme.md    | 0
 keyboards/{ => recompile_keys}/cocoa40/readme.md              | 2 +-
 keyboards/{ => recompile_keys}/cocoa40/rules.mk               | 0
 keyboards/{ => recompile_keys}/mio/config.h                   | 0
 keyboards/{ => recompile_keys}/mio/info.json                  | 0
 keyboards/{ => recompile_keys}/mio/keymaps/default/keymap.c   | 0
 keyboards/{ => recompile_keys}/mio/keymaps/default/readme.md  | 0
 keyboards/{ => recompile_keys}/mio/keymaps/via/keymap.c       | 0
 keyboards/{ => recompile_keys}/mio/keymaps/via/rules.mk       | 0
 keyboards/{ => recompile_keys}/mio/mio.c                      | 0
 keyboards/{ => recompile_keys}/mio/mio.h                      | 0
 keyboards/{ => recompile_keys}/mio/readme.md                  | 4 ++--
 keyboards/{ => recompile_keys}/mio/rules.mk                   | 0
 keyboards/{ => recompile_keys}/nomu30/.noci                   | 0
 keyboards/{ => recompile_keys}/nomu30/config.h                | 0
 keyboards/{ => recompile_keys}/nomu30/info.json               | 0
 .../{ => recompile_keys}/nomu30/keymaps/center_sprit/config.h | 0
 .../{ => recompile_keys}/nomu30/keymaps/center_sprit/keymap.c | 0
 .../nomu30/keymaps/center_sprit/readme.md                     | 0
 .../{ => recompile_keys}/nomu30/keymaps/center_sprit/rules.mk | 0
 .../{ => recompile_keys}/nomu30/keymaps/default/config.h      | 0
 .../{ => recompile_keys}/nomu30/keymaps/default/keymap.c      | 0
 .../{ => recompile_keys}/nomu30/keymaps/default/readme.md     | 0
 .../{ => recompile_keys}/nomu30/keymaps/like_jis/config.h     | 0
 .../{ => recompile_keys}/nomu30/keymaps/like_jis/keymap.c     | 0
 .../{ => recompile_keys}/nomu30/keymaps/like_jis/readme.md    | 0
 .../{ => recompile_keys}/nomu30/keymaps/like_jis/rules.mk     | 0
 keyboards/{ => recompile_keys}/nomu30/keymaps/via/keymap.c    | 0
 keyboards/{ => recompile_keys}/nomu30/keymaps/via/rules.mk    | 0
 keyboards/{ => recompile_keys}/nomu30/nomu30.c                | 0
 keyboards/{ => recompile_keys}/nomu30/nomu30.h                | 4 ++--
 keyboards/{ => recompile_keys}/nomu30/readme.md               | 2 +-
 keyboards/{ => recompile_keys}/nomu30/rev1/.noci              | 0
 keyboards/{ => recompile_keys}/nomu30/rev1/config.h           | 0
 keyboards/{ => recompile_keys}/nomu30/rev1/rev1.c             | 0
 keyboards/{ => recompile_keys}/nomu30/rev1/rev1.h             | 0
 keyboards/{ => recompile_keys}/nomu30/rev1/rules.mk           | 0
 keyboards/{ => recompile_keys}/nomu30/rev2/.noci              | 0
 keyboards/{ => recompile_keys}/nomu30/rev2/config.h           | 0
 keyboards/{ => recompile_keys}/nomu30/rev2/rev2.c             | 0
 keyboards/{ => recompile_keys}/nomu30/rev2/rev2.h             | 0
 keyboards/{ => recompile_keys}/nomu30/rev2/rules.mk           | 0
 keyboards/recompile_keys/nomu30/rules.mk                      | 1 +
 72 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 keyboards/choco60/rules.mk
 delete mode 100644 keyboards/nomu30/rules.mk
 rename keyboards/{ => recompile_keys}/choco60/choco60.c (100%)
 rename keyboards/{ => recompile_keys}/choco60/choco60.h (100%)
 rename keyboards/{ => recompile_keys}/choco60/config.h (100%)
 rename keyboards/{ => recompile_keys}/choco60/info.json (100%)
 rename keyboards/{ => recompile_keys}/choco60/keymaps/default/keymap.c (100%)
 rename keyboards/{ => recompile_keys}/choco60/keymaps/default/readme.md (100%)
 rename keyboards/{ => recompile_keys}/choco60/keymaps/via/keymap.c (100%)
 rename keyboards/{ => recompile_keys}/choco60/keymaps/via/rules.mk (100%)
 rename keyboards/{ => recompile_keys}/choco60/readme.md (88%)
 rename keyboards/{ => recompile_keys}/choco60/rev1/.noci (100%)
 rename keyboards/{ => recompile_keys}/choco60/rev1/config.h (100%)
 rename keyboards/{ => recompile_keys}/choco60/rev1/readme.md (100%)
 rename keyboards/{ => recompile_keys}/choco60/rev1/rev1.c (100%)
 rename keyboards/{ => recompile_keys}/choco60/rev1/rev1.h (100%)
 rename keyboards/{ => recompile_keys}/choco60/rev1/rules.mk (100%)
 rename keyboards/{ => recompile_keys}/choco60/rev2/config.h (100%)
 rename keyboards/{ => recompile_keys}/choco60/rev2/readme.md (100%)
 rename keyboards/{ => recompile_keys}/choco60/rev2/rev2.c (100%)
 rename keyboards/{ => recompile_keys}/choco60/rev2/rev2.h (100%)
 rename keyboards/{ => recompile_keys}/choco60/rev2/rules.mk (100%)
 create mode 100644 keyboards/recompile_keys/choco60/rules.mk
 rename keyboards/{ => recompile_keys}/cocoa40/.noci (100%)
 rename keyboards/{ => recompile_keys}/cocoa40/cocoa40.c (100%)
 rename keyboards/{ => recompile_keys}/cocoa40/cocoa40.h (100%)
 rename keyboards/{ => recompile_keys}/cocoa40/config.h (100%)
 rename keyboards/{ => recompile_keys}/cocoa40/info.json (100%)
 rename keyboards/{ => recompile_keys}/cocoa40/keymaps/default/keymap.c (100%)
 rename keyboards/{ => recompile_keys}/cocoa40/keymaps/default/readme.md (100%)
 rename keyboards/{ => recompile_keys}/cocoa40/readme.md (94%)
 rename keyboards/{ => recompile_keys}/cocoa40/rules.mk (100%)
 rename keyboards/{ => recompile_keys}/mio/config.h (100%)
 rename keyboards/{ => recompile_keys}/mio/info.json (100%)
 rename keyboards/{ => recompile_keys}/mio/keymaps/default/keymap.c (100%)
 rename keyboards/{ => recompile_keys}/mio/keymaps/default/readme.md (100%)
 rename keyboards/{ => recompile_keys}/mio/keymaps/via/keymap.c (100%)
 rename keyboards/{ => recompile_keys}/mio/keymaps/via/rules.mk (100%)
 rename keyboards/{ => recompile_keys}/mio/mio.c (100%)
 rename keyboards/{ => recompile_keys}/mio/mio.h (100%)
 rename keyboards/{ => recompile_keys}/mio/readme.md (91%)
 rename keyboards/{ => recompile_keys}/mio/rules.mk (100%)
 rename keyboards/{ => recompile_keys}/nomu30/.noci (100%)
 rename keyboards/{ => recompile_keys}/nomu30/config.h (100%)
 rename keyboards/{ => recompile_keys}/nomu30/info.json (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/center_sprit/config.h (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/center_sprit/keymap.c (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/center_sprit/readme.md (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/center_sprit/rules.mk (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/default/config.h (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/default/keymap.c (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/default/readme.md (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/like_jis/config.h (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/like_jis/keymap.c (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/like_jis/readme.md (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/like_jis/rules.mk (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/via/keymap.c (100%)
 rename keyboards/{ => recompile_keys}/nomu30/keymaps/via/rules.mk (100%)
 rename keyboards/{ => recompile_keys}/nomu30/nomu30.c (100%)
 rename keyboards/{ => recompile_keys}/nomu30/nomu30.h (93%)
 rename keyboards/{ => recompile_keys}/nomu30/readme.md (94%)
 rename keyboards/{ => recompile_keys}/nomu30/rev1/.noci (100%)
 rename keyboards/{ => recompile_keys}/nomu30/rev1/config.h (100%)
 rename keyboards/{ => recompile_keys}/nomu30/rev1/rev1.c (100%)
 rename keyboards/{ => recompile_keys}/nomu30/rev1/rev1.h (100%)
 rename keyboards/{ => recompile_keys}/nomu30/rev1/rules.mk (100%)
 rename keyboards/{ => recompile_keys}/nomu30/rev2/.noci (100%)
 rename keyboards/{ => recompile_keys}/nomu30/rev2/config.h (100%)
 rename keyboards/{ => recompile_keys}/nomu30/rev2/rev2.c (100%)
 rename keyboards/{ => recompile_keys}/nomu30/rev2/rev2.h (100%)
 rename keyboards/{ => recompile_keys}/nomu30/rev2/rules.mk (100%)
 create mode 100644 keyboards/recompile_keys/nomu30/rules.mk

diff --git a/keyboards/choco60/rules.mk b/keyboards/choco60/rules.mk
deleted file mode 100644
index 8f712e359b..0000000000
--- a/keyboards/choco60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = choco60/rev1
diff --git a/keyboards/nomu30/rules.mk b/keyboards/nomu30/rules.mk
deleted file mode 100644
index 8a73959407..0000000000
--- a/keyboards/nomu30/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = nomu30/rev1
diff --git a/keyboards/choco60/choco60.c b/keyboards/recompile_keys/choco60/choco60.c
similarity index 100%
rename from keyboards/choco60/choco60.c
rename to keyboards/recompile_keys/choco60/choco60.c
diff --git a/keyboards/choco60/choco60.h b/keyboards/recompile_keys/choco60/choco60.h
similarity index 100%
rename from keyboards/choco60/choco60.h
rename to keyboards/recompile_keys/choco60/choco60.h
diff --git a/keyboards/choco60/config.h b/keyboards/recompile_keys/choco60/config.h
similarity index 100%
rename from keyboards/choco60/config.h
rename to keyboards/recompile_keys/choco60/config.h
diff --git a/keyboards/choco60/info.json b/keyboards/recompile_keys/choco60/info.json
similarity index 100%
rename from keyboards/choco60/info.json
rename to keyboards/recompile_keys/choco60/info.json
diff --git a/keyboards/choco60/keymaps/default/keymap.c b/keyboards/recompile_keys/choco60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/choco60/keymaps/default/keymap.c
rename to keyboards/recompile_keys/choco60/keymaps/default/keymap.c
diff --git a/keyboards/choco60/keymaps/default/readme.md b/keyboards/recompile_keys/choco60/keymaps/default/readme.md
similarity index 100%
rename from keyboards/choco60/keymaps/default/readme.md
rename to keyboards/recompile_keys/choco60/keymaps/default/readme.md
diff --git a/keyboards/choco60/keymaps/via/keymap.c b/keyboards/recompile_keys/choco60/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/choco60/keymaps/via/keymap.c
rename to keyboards/recompile_keys/choco60/keymaps/via/keymap.c
diff --git a/keyboards/choco60/keymaps/via/rules.mk b/keyboards/recompile_keys/choco60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/choco60/keymaps/via/rules.mk
rename to keyboards/recompile_keys/choco60/keymaps/via/rules.mk
diff --git a/keyboards/choco60/readme.md b/keyboards/recompile_keys/choco60/readme.md
similarity index 88%
rename from keyboards/choco60/readme.md
rename to keyboards/recompile_keys/choco60/readme.md
index 0290f95d28..187c3c8942 100644
--- a/keyboards/choco60/readme.md
+++ b/keyboards/recompile_keys/choco60/readme.md
@@ -11,7 +11,7 @@ A 60% split keyboard for programmers.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make choco60/rev1:default
-    make choco60/rev2:default
+    make recompile_keys/choco60/rev1:default
+    make recompile_keys/choco60/rev2: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).
diff --git a/keyboards/choco60/rev1/.noci b/keyboards/recompile_keys/choco60/rev1/.noci
similarity index 100%
rename from keyboards/choco60/rev1/.noci
rename to keyboards/recompile_keys/choco60/rev1/.noci
diff --git a/keyboards/choco60/rev1/config.h b/keyboards/recompile_keys/choco60/rev1/config.h
similarity index 100%
rename from keyboards/choco60/rev1/config.h
rename to keyboards/recompile_keys/choco60/rev1/config.h
diff --git a/keyboards/choco60/rev1/readme.md b/keyboards/recompile_keys/choco60/rev1/readme.md
similarity index 100%
rename from keyboards/choco60/rev1/readme.md
rename to keyboards/recompile_keys/choco60/rev1/readme.md
diff --git a/keyboards/choco60/rev1/rev1.c b/keyboards/recompile_keys/choco60/rev1/rev1.c
similarity index 100%
rename from keyboards/choco60/rev1/rev1.c
rename to keyboards/recompile_keys/choco60/rev1/rev1.c
diff --git a/keyboards/choco60/rev1/rev1.h b/keyboards/recompile_keys/choco60/rev1/rev1.h
similarity index 100%
rename from keyboards/choco60/rev1/rev1.h
rename to keyboards/recompile_keys/choco60/rev1/rev1.h
diff --git a/keyboards/choco60/rev1/rules.mk b/keyboards/recompile_keys/choco60/rev1/rules.mk
similarity index 100%
rename from keyboards/choco60/rev1/rules.mk
rename to keyboards/recompile_keys/choco60/rev1/rules.mk
diff --git a/keyboards/choco60/rev2/config.h b/keyboards/recompile_keys/choco60/rev2/config.h
similarity index 100%
rename from keyboards/choco60/rev2/config.h
rename to keyboards/recompile_keys/choco60/rev2/config.h
diff --git a/keyboards/choco60/rev2/readme.md b/keyboards/recompile_keys/choco60/rev2/readme.md
similarity index 100%
rename from keyboards/choco60/rev2/readme.md
rename to keyboards/recompile_keys/choco60/rev2/readme.md
diff --git a/keyboards/choco60/rev2/rev2.c b/keyboards/recompile_keys/choco60/rev2/rev2.c
similarity index 100%
rename from keyboards/choco60/rev2/rev2.c
rename to keyboards/recompile_keys/choco60/rev2/rev2.c
diff --git a/keyboards/choco60/rev2/rev2.h b/keyboards/recompile_keys/choco60/rev2/rev2.h
similarity index 100%
rename from keyboards/choco60/rev2/rev2.h
rename to keyboards/recompile_keys/choco60/rev2/rev2.h
diff --git a/keyboards/choco60/rev2/rules.mk b/keyboards/recompile_keys/choco60/rev2/rules.mk
similarity index 100%
rename from keyboards/choco60/rev2/rules.mk
rename to keyboards/recompile_keys/choco60/rev2/rules.mk
diff --git a/keyboards/recompile_keys/choco60/rules.mk b/keyboards/recompile_keys/choco60/rules.mk
new file mode 100644
index 0000000000..6abfd34d47
--- /dev/null
+++ b/keyboards/recompile_keys/choco60/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = recompile_keys/choco60/rev1
diff --git a/keyboards/cocoa40/.noci b/keyboards/recompile_keys/cocoa40/.noci
similarity index 100%
rename from keyboards/cocoa40/.noci
rename to keyboards/recompile_keys/cocoa40/.noci
diff --git a/keyboards/cocoa40/cocoa40.c b/keyboards/recompile_keys/cocoa40/cocoa40.c
similarity index 100%
rename from keyboards/cocoa40/cocoa40.c
rename to keyboards/recompile_keys/cocoa40/cocoa40.c
diff --git a/keyboards/cocoa40/cocoa40.h b/keyboards/recompile_keys/cocoa40/cocoa40.h
similarity index 100%
rename from keyboards/cocoa40/cocoa40.h
rename to keyboards/recompile_keys/cocoa40/cocoa40.h
diff --git a/keyboards/cocoa40/config.h b/keyboards/recompile_keys/cocoa40/config.h
similarity index 100%
rename from keyboards/cocoa40/config.h
rename to keyboards/recompile_keys/cocoa40/config.h
diff --git a/keyboards/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/info.json
similarity index 100%
rename from keyboards/cocoa40/info.json
rename to keyboards/recompile_keys/cocoa40/info.json
diff --git a/keyboards/cocoa40/keymaps/default/keymap.c b/keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/cocoa40/keymaps/default/keymap.c
rename to keyboards/recompile_keys/cocoa40/keymaps/default/keymap.c
diff --git a/keyboards/cocoa40/keymaps/default/readme.md b/keyboards/recompile_keys/cocoa40/keymaps/default/readme.md
similarity index 100%
rename from keyboards/cocoa40/keymaps/default/readme.md
rename to keyboards/recompile_keys/cocoa40/keymaps/default/readme.md
diff --git a/keyboards/cocoa40/readme.md b/keyboards/recompile_keys/cocoa40/readme.md
similarity index 94%
rename from keyboards/cocoa40/readme.md
rename to keyboards/recompile_keys/cocoa40/readme.md
index e05caaba9c..2690628940 100644
--- a/keyboards/cocoa40/readme.md
+++ b/keyboards/recompile_keys/cocoa40/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: https://keys.recompile.net/projects/cocoa40/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make cocoa40:default
+    make recompile_keys/cocoa40: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).
diff --git a/keyboards/cocoa40/rules.mk b/keyboards/recompile_keys/cocoa40/rules.mk
similarity index 100%
rename from keyboards/cocoa40/rules.mk
rename to keyboards/recompile_keys/cocoa40/rules.mk
diff --git a/keyboards/mio/config.h b/keyboards/recompile_keys/mio/config.h
similarity index 100%
rename from keyboards/mio/config.h
rename to keyboards/recompile_keys/mio/config.h
diff --git a/keyboards/mio/info.json b/keyboards/recompile_keys/mio/info.json
similarity index 100%
rename from keyboards/mio/info.json
rename to keyboards/recompile_keys/mio/info.json
diff --git a/keyboards/mio/keymaps/default/keymap.c b/keyboards/recompile_keys/mio/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mio/keymaps/default/keymap.c
rename to keyboards/recompile_keys/mio/keymaps/default/keymap.c
diff --git a/keyboards/mio/keymaps/default/readme.md b/keyboards/recompile_keys/mio/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mio/keymaps/default/readme.md
rename to keyboards/recompile_keys/mio/keymaps/default/readme.md
diff --git a/keyboards/mio/keymaps/via/keymap.c b/keyboards/recompile_keys/mio/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mio/keymaps/via/keymap.c
rename to keyboards/recompile_keys/mio/keymaps/via/keymap.c
diff --git a/keyboards/mio/keymaps/via/rules.mk b/keyboards/recompile_keys/mio/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mio/keymaps/via/rules.mk
rename to keyboards/recompile_keys/mio/keymaps/via/rules.mk
diff --git a/keyboards/mio/mio.c b/keyboards/recompile_keys/mio/mio.c
similarity index 100%
rename from keyboards/mio/mio.c
rename to keyboards/recompile_keys/mio/mio.c
diff --git a/keyboards/mio/mio.h b/keyboards/recompile_keys/mio/mio.h
similarity index 100%
rename from keyboards/mio/mio.h
rename to keyboards/recompile_keys/mio/mio.h
diff --git a/keyboards/mio/readme.md b/keyboards/recompile_keys/mio/readme.md
similarity index 91%
rename from keyboards/mio/readme.md
rename to keyboards/recompile_keys/mio/readme.md
index 6ae4fd049f..2703c39e69 100644
--- a/keyboards/mio/readme.md
+++ b/keyboards/recompile_keys/mio/readme.md
@@ -10,11 +10,11 @@ High-end custom gaming keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mio:default
+    make recompile_keys/mio:default
 
 Flashing example for this keyboard:
 
-    make mio:default:flash
+    make recompile_keys/mio:default:flash
 
 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).
 
diff --git a/keyboards/mio/rules.mk b/keyboards/recompile_keys/mio/rules.mk
similarity index 100%
rename from keyboards/mio/rules.mk
rename to keyboards/recompile_keys/mio/rules.mk
diff --git a/keyboards/nomu30/.noci b/keyboards/recompile_keys/nomu30/.noci
similarity index 100%
rename from keyboards/nomu30/.noci
rename to keyboards/recompile_keys/nomu30/.noci
diff --git a/keyboards/nomu30/config.h b/keyboards/recompile_keys/nomu30/config.h
similarity index 100%
rename from keyboards/nomu30/config.h
rename to keyboards/recompile_keys/nomu30/config.h
diff --git a/keyboards/nomu30/info.json b/keyboards/recompile_keys/nomu30/info.json
similarity index 100%
rename from keyboards/nomu30/info.json
rename to keyboards/recompile_keys/nomu30/info.json
diff --git a/keyboards/nomu30/keymaps/center_sprit/config.h b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
similarity index 100%
rename from keyboards/nomu30/keymaps/center_sprit/config.h
rename to keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
diff --git a/keyboards/nomu30/keymaps/center_sprit/keymap.c b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c
similarity index 100%
rename from keyboards/nomu30/keymaps/center_sprit/keymap.c
rename to keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c
diff --git a/keyboards/nomu30/keymaps/center_sprit/readme.md b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md
similarity index 100%
rename from keyboards/nomu30/keymaps/center_sprit/readme.md
rename to keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md
diff --git a/keyboards/nomu30/keymaps/center_sprit/rules.mk b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/rules.mk
similarity index 100%
rename from keyboards/nomu30/keymaps/center_sprit/rules.mk
rename to keyboards/recompile_keys/nomu30/keymaps/center_sprit/rules.mk
diff --git a/keyboards/nomu30/keymaps/default/config.h b/keyboards/recompile_keys/nomu30/keymaps/default/config.h
similarity index 100%
rename from keyboards/nomu30/keymaps/default/config.h
rename to keyboards/recompile_keys/nomu30/keymaps/default/config.h
diff --git a/keyboards/nomu30/keymaps/default/keymap.c b/keyboards/recompile_keys/nomu30/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nomu30/keymaps/default/keymap.c
rename to keyboards/recompile_keys/nomu30/keymaps/default/keymap.c
diff --git a/keyboards/nomu30/keymaps/default/readme.md b/keyboards/recompile_keys/nomu30/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nomu30/keymaps/default/readme.md
rename to keyboards/recompile_keys/nomu30/keymaps/default/readme.md
diff --git a/keyboards/nomu30/keymaps/like_jis/config.h b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
similarity index 100%
rename from keyboards/nomu30/keymaps/like_jis/config.h
rename to keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
diff --git a/keyboards/nomu30/keymaps/like_jis/keymap.c b/keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c
similarity index 100%
rename from keyboards/nomu30/keymaps/like_jis/keymap.c
rename to keyboards/recompile_keys/nomu30/keymaps/like_jis/keymap.c
diff --git a/keyboards/nomu30/keymaps/like_jis/readme.md b/keyboards/recompile_keys/nomu30/keymaps/like_jis/readme.md
similarity index 100%
rename from keyboards/nomu30/keymaps/like_jis/readme.md
rename to keyboards/recompile_keys/nomu30/keymaps/like_jis/readme.md
diff --git a/keyboards/nomu30/keymaps/like_jis/rules.mk b/keyboards/recompile_keys/nomu30/keymaps/like_jis/rules.mk
similarity index 100%
rename from keyboards/nomu30/keymaps/like_jis/rules.mk
rename to keyboards/recompile_keys/nomu30/keymaps/like_jis/rules.mk
diff --git a/keyboards/nomu30/keymaps/via/keymap.c b/keyboards/recompile_keys/nomu30/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nomu30/keymaps/via/keymap.c
rename to keyboards/recompile_keys/nomu30/keymaps/via/keymap.c
diff --git a/keyboards/nomu30/keymaps/via/rules.mk b/keyboards/recompile_keys/nomu30/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nomu30/keymaps/via/rules.mk
rename to keyboards/recompile_keys/nomu30/keymaps/via/rules.mk
diff --git a/keyboards/nomu30/nomu30.c b/keyboards/recompile_keys/nomu30/nomu30.c
similarity index 100%
rename from keyboards/nomu30/nomu30.c
rename to keyboards/recompile_keys/nomu30/nomu30.c
diff --git a/keyboards/nomu30/nomu30.h b/keyboards/recompile_keys/nomu30/nomu30.h
similarity index 93%
rename from keyboards/nomu30/nomu30.h
rename to keyboards/recompile_keys/nomu30/nomu30.h
index cf724ac6e4..964eb2a65f 100644
--- a/keyboards/nomu30/nomu30.h
+++ b/keyboards/recompile_keys/nomu30/nomu30.h
@@ -16,9 +16,9 @@
 #pragma once
 
 #include "quantum.h"
-#ifdef KEYBOARD_nomu30_rev1
+#ifdef KEYBOARD_recompile_keys_nomu30_rev1
     #include "rev1.h"
-#elif KEYBOARD_nomu30_rev2
+#elif KEYBOARD_recompile_keys_nomu30_rev2
     #include "rev2.h"
 #endif
 
diff --git a/keyboards/nomu30/readme.md b/keyboards/recompile_keys/nomu30/readme.md
similarity index 94%
rename from keyboards/nomu30/readme.md
rename to keyboards/recompile_keys/nomu30/readme.md
index 95577164a1..e0551d0002 100644
--- a/keyboards/nomu30/readme.md
+++ b/keyboards/recompile_keys/nomu30/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: https://keys.recompile.net/projects/nomu30/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nomu30:default
+    make recompile_keys/nomu30: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).
diff --git a/keyboards/nomu30/rev1/.noci b/keyboards/recompile_keys/nomu30/rev1/.noci
similarity index 100%
rename from keyboards/nomu30/rev1/.noci
rename to keyboards/recompile_keys/nomu30/rev1/.noci
diff --git a/keyboards/nomu30/rev1/config.h b/keyboards/recompile_keys/nomu30/rev1/config.h
similarity index 100%
rename from keyboards/nomu30/rev1/config.h
rename to keyboards/recompile_keys/nomu30/rev1/config.h
diff --git a/keyboards/nomu30/rev1/rev1.c b/keyboards/recompile_keys/nomu30/rev1/rev1.c
similarity index 100%
rename from keyboards/nomu30/rev1/rev1.c
rename to keyboards/recompile_keys/nomu30/rev1/rev1.c
diff --git a/keyboards/nomu30/rev1/rev1.h b/keyboards/recompile_keys/nomu30/rev1/rev1.h
similarity index 100%
rename from keyboards/nomu30/rev1/rev1.h
rename to keyboards/recompile_keys/nomu30/rev1/rev1.h
diff --git a/keyboards/nomu30/rev1/rules.mk b/keyboards/recompile_keys/nomu30/rev1/rules.mk
similarity index 100%
rename from keyboards/nomu30/rev1/rules.mk
rename to keyboards/recompile_keys/nomu30/rev1/rules.mk
diff --git a/keyboards/nomu30/rev2/.noci b/keyboards/recompile_keys/nomu30/rev2/.noci
similarity index 100%
rename from keyboards/nomu30/rev2/.noci
rename to keyboards/recompile_keys/nomu30/rev2/.noci
diff --git a/keyboards/nomu30/rev2/config.h b/keyboards/recompile_keys/nomu30/rev2/config.h
similarity index 100%
rename from keyboards/nomu30/rev2/config.h
rename to keyboards/recompile_keys/nomu30/rev2/config.h
diff --git a/keyboards/nomu30/rev2/rev2.c b/keyboards/recompile_keys/nomu30/rev2/rev2.c
similarity index 100%
rename from keyboards/nomu30/rev2/rev2.c
rename to keyboards/recompile_keys/nomu30/rev2/rev2.c
diff --git a/keyboards/nomu30/rev2/rev2.h b/keyboards/recompile_keys/nomu30/rev2/rev2.h
similarity index 100%
rename from keyboards/nomu30/rev2/rev2.h
rename to keyboards/recompile_keys/nomu30/rev2/rev2.h
diff --git a/keyboards/nomu30/rev2/rules.mk b/keyboards/recompile_keys/nomu30/rev2/rules.mk
similarity index 100%
rename from keyboards/nomu30/rev2/rules.mk
rename to keyboards/recompile_keys/nomu30/rev2/rules.mk
diff --git a/keyboards/recompile_keys/nomu30/rules.mk b/keyboards/recompile_keys/nomu30/rules.mk
new file mode 100644
index 0000000000..431b619249
--- /dev/null
+++ b/keyboards/recompile_keys/nomu30/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = recompile_keys/nomu30/rev1

From 59f37bb710cd588aa8bd4835d1d8732bedd0f3b2 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 1 Feb 2022 08:31:15 +1100
Subject: [PATCH 461/867] Fix build failure for LW67, rename ansi keymap to
 default (#16154)

* Fix build failure for LW67, rename ansi keymap to default

* Fix keycode typos as well
---
 .../lw67/keymaps/ansi_split_backspace/keymap.c     |  2 +-
 keyboards/lw67/keymaps/{ansi => default}/keymap.c  |  2 +-
 keyboards/lw67/keymaps/iso/keymap.c                |  2 +-
 .../lw67/keymaps/iso_split_backspace/keymap.c      |  2 +-
 keyboards/lw67/keymaps/via/keymap.c                |  6 +++---
 keyboards/lw67/lw67.h                              | 14 +++++---------
 6 files changed, 12 insertions(+), 16 deletions(-)
 rename keyboards/lw67/keymaps/{ansi => default}/keymap.c (97%)

diff --git a/keyboards/lw67/keymaps/ansi_split_backspace/keymap.c b/keyboards/lw67/keymaps/ansi_split_backspace/keymap.c
index 25c72a9cbc..4d89777d88 100644
--- a/keyboards/lw67/keymaps/ansi_split_backspace/keymap.c
+++ b/keyboards/lw67/keymaps/ansi_split_backspace/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_ansi_splitbs(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
diff --git a/keyboards/lw67/keymaps/ansi/keymap.c b/keyboards/lw67/keymaps/default/keymap.c
similarity index 97%
rename from keyboards/lw67/keymaps/ansi/keymap.c
rename to keyboards/lw67/keymaps/default/keymap.c
index ba0fa41b87..2ab17a3590 100644
--- a/keyboards/lw67/keymaps/ansi/keymap.c
+++ b/keyboards/lw67/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_ansi(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
diff --git a/keyboards/lw67/keymaps/iso/keymap.c b/keyboards/lw67/keymaps/iso/keymap.c
index 1f8b6aad69..6e05f9b8bd 100644
--- a/keyboards/lw67/keymaps/iso/keymap.c
+++ b/keyboards/lw67/keymaps/iso/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_iso(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
diff --git a/keyboards/lw67/keymaps/iso_split_backspace/keymap.c b/keyboards/lw67/keymaps/iso_split_backspace/keymap.c
index c2a9e2c5b3..a1349af56b 100644
--- a/keyboards/lw67/keymaps/iso_split_backspace/keymap.c
+++ b/keyboards/lw67/keymaps/iso_split_backspace/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_iso_splitbs(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
diff --git a/keyboards/lw67/keymaps/via/keymap.c b/keyboards/lw67/keymaps/via/keymap.c
index 6f1bc704b6..a8f4b42084 100644
--- a/keyboards/lw67/keymaps/via/keymap.c
+++ b/keyboards/lw67/keymaps/via/keymap.c
@@ -28,20 +28,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[1] = LAYOUT_iso_splitbs(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 	[2] = LAYOUT_iso_splitbs(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 	[3] = LAYOUT_iso_splitbs(
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), };
diff --git a/keyboards/lw67/lw67.h b/keyboards/lw67/lw67.h
index 554109eed9..fba187d078 100644
--- a/keyboards/lw67/lw67.h
+++ b/keyboards/lw67/lw67.h
@@ -18,8 +18,7 @@
 
 #include "quantum.h"
 
-/* LAYOUT_ANSI
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
  * │000│001│002│003│004│005│006│007│008│009│010│011│012│  013  │   ┌───┐
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤   │015│
  * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│ 113 │   └───┘
@@ -47,8 +46,7 @@
 	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
 }
 
-/* LAYOUT_ANSISPLITBS
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
  * │000│001│002│003│004│005│006│007│008│009│010│011│012│013│014│   ┌───┐
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   │015│
  * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│ 113 │   └───┘
@@ -76,8 +74,7 @@
 	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
 }
 
-/* LAYOUT_ISO
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
  * │000│001│002│003│004│005│006│007│008│009│010│011│012│  013  │   ┌───┐
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤   │015│
  * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│     │   └───┘
@@ -105,8 +102,7 @@
     { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
 }
 
-/* LAYOUT_ISOSPLITBS
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
  * │000│001│002│003│004│005│006│007│008│009│010│011│012│013│014│   ┌───┐
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   │015│
  * │ 100 │101│102│103│104│105│106│107│108│109│110│111│112│     │   └───┘
@@ -132,4 +128,4 @@
     { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215  }, \
     { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314,  KC_NO }, \
     { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
-}
\ No newline at end of file
+}

From a33dcb5a9a948d871cdceb219dba92f0512ff817 Mon Sep 17 00:00:00 2001
From: XScorpion2 <rcalt2vt@gmail.com>
Date: Mon, 31 Jan 2022 18:10:46 -0600
Subject: [PATCH 462/867] Small fix for Sol 3 brightness limits (#16157)

---
 keyboards/rgbkb/sol3/config.h    | 18 +++++++++---------
 keyboards/rgbkb/sol3/rev1/rev1.c |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index a333ef788a..8d87e5b2fa 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -88,6 +88,11 @@
 #define RGB_DI_PIN B5
 #define RGBLED_NUM 156
 #define RGBLED_SPLIT { 78, 78 }
+#define RGBLIGHT_LIMIT_VAL 255
+
+// RGB Lighting Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgblight?id=effect-and-animation-toggles
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -102,11 +107,11 @@
 #define DRIVER_LED_TOTAL RGBLED_NUM
 #define RGB_MATRIX_SPLIT RGBLED_SPLIT
 #define RGB_MATRIX_CENTER { 81, 28 }
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
 #define RGB_MATRIX_LED_FLUSH_LIMIT 33
 #define RGB_MATRIX_LED_PROCESS_LIMIT 10
-#define RGB_MATRIX_KEYPRESSES
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
+
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
@@ -140,9 +145,11 @@
 #define ENABLE_RGB_MATRIX_PIXEL_FLOW
 #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
 // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define RGB_MATRIX_KEYPRESSES
 #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
 #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
@@ -156,13 +163,6 @@
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-#if RGB_UNLIMITED_POWER
-  #define RGBLIGHT_LIMIT_VAL 255
-#else
-  #define RGBLIGHT_LIMIT_VAL 127
-#endif
-#define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
-
 #define WS2812_PWM_DRIVER PWMD3
 #define WS2812_PWM_CHANNEL 2
 #define WS2812_PWM_PAL_MODE 2
diff --git a/keyboards/rgbkb/sol3/rev1/rev1.c b/keyboards/rgbkb/sol3/rev1/rev1.c
index 32b278f3d8..5dc156c94d 100644
--- a/keyboards/rgbkb/sol3/rev1/rev1.c
+++ b/keyboards/rgbkb/sol3/rev1/rev1.c
@@ -39,7 +39,7 @@ const encodermap_t touch_encoder_map[NUMBER_OF_TOUCH_ENCODERS][TOUCH_ENCODER_OPT
     { { 7, 7 }, { 6, 7 }, { 8, 7 }, { 11, 6 }, { 11, 7 }, }  // Touch Encoder 1 matrix entries
 };
 
-static bool limit_lightning = false;
+static bool limit_lightning = true;
 
 RGB rgb_matrix_hsv_to_rgb(HSV hsv) {
     if (limit_lightning) hsv.v /= 2;

From f404ec329f62ef3978f78b516563619120557c8b Mon Sep 17 00:00:00 2001
From: takishim <96878459+takishim@users.noreply.github.com>
Date: Tue, 1 Feb 2022 09:28:48 +0900
Subject: [PATCH 463/867] Fixed a bug in pin assignment. (#16158)

Added original copyright notice.
Assign the tilde key to layer 1.

Co-authored-by: takishim <tadashi@kishimo.to>
---
 keyboards/mikeneko65/rev3/config.h                 |  3 ++-
 keyboards/mikeneko65/rev3/keymaps/default/keymap.c | 11 ++++++-----
 keyboards/mikeneko65/rev3/keymaps/via/keymap.c     | 11 ++++++-----
 keyboards/mikeneko65/rev3/rev3.c                   |  3 ++-
 keyboards/mikeneko65/rev3/rev3.h                   |  3 ++-
 keyboards/mikeneko65/rev4/config.h                 |  5 +++--
 keyboards/mikeneko65/rev4/keymaps/default/keymap.c |  5 +++--
 keyboards/mikeneko65/rev4/keymaps/via/keymap.c     |  5 +++--
 keyboards/mikeneko65/rev4/rev4.c                   |  3 ++-
 keyboards/mikeneko65/rev4/rev4.h                   |  3 ++-
 10 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/keyboards/mikeneko65/rev3/config.h b/keyboards/mikeneko65/rev3/config.h
index 9fffb77c63..dad2532012 100644
--- a/keyboards/mikeneko65/rev3/config.h
+++ b/keyboards/mikeneko65/rev3/config.h
@@ -1,4 +1,5 @@
-/* Copyright 2022 takishim
+/* Copyright 2020 kkatano
+   Copyright 2022 takishim
 
 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
diff --git a/keyboards/mikeneko65/rev3/keymaps/default/keymap.c b/keyboards/mikeneko65/rev3/keymaps/default/keymap.c
index c40d48f2fe..69844b8c30 100644
--- a/keyboards/mikeneko65/rev3/keymaps/default/keymap.c
+++ b/keyboards/mikeneko65/rev3/keymaps/default/keymap.c
@@ -1,4 +1,5 @@
-/* Copyright 2022 takishim
+/* Copyright 2020 kkatano
+ * Copyright 2022 takishim
  *
  * 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
@@ -22,10 +23,10 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BASE] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_HOME, 
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSPC, KC_END,  
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  KC_PGUP, 
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN, 
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSPC, KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FN] = LAYOUT_all(
diff --git a/keyboards/mikeneko65/rev3/keymaps/via/keymap.c b/keyboards/mikeneko65/rev3/keymaps/via/keymap.c
index 6c909b0c97..2a456503ea 100644
--- a/keyboards/mikeneko65/rev3/keymaps/via/keymap.c
+++ b/keyboards/mikeneko65/rev3/keymaps/via/keymap.c
@@ -1,4 +1,5 @@
-/* Copyright 2022 takishim
+/* Copyright 2020 kkatano
+ * Copyright 2022 takishim
  *
  * 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
@@ -24,10 +25,10 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_L0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_HOME, 
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSPC, KC_END,  
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  KC_PGUP, 
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN, 
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSPC, KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_L1] = LAYOUT_all(
diff --git a/keyboards/mikeneko65/rev3/rev3.c b/keyboards/mikeneko65/rev3/rev3.c
index 8186588033..6da33ff78f 100644
--- a/keyboards/mikeneko65/rev3/rev3.c
+++ b/keyboards/mikeneko65/rev3/rev3.c
@@ -1,4 +1,5 @@
-/* Copyright 2022 takishim
+/* Copyright 2020 kkatano
+ * Copyright 2022 takishim
  *
  * 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
diff --git a/keyboards/mikeneko65/rev3/rev3.h b/keyboards/mikeneko65/rev3/rev3.h
index f6c3792bd3..cb490224fb 100644
--- a/keyboards/mikeneko65/rev3/rev3.h
+++ b/keyboards/mikeneko65/rev3/rev3.h
@@ -1,4 +1,5 @@
-/* Copyright 2022 takishim
+/* Copyright 2020 kkatano
+ * Copyright 2022 takishim
  *
  * 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
diff --git a/keyboards/mikeneko65/rev4/config.h b/keyboards/mikeneko65/rev4/config.h
index 30ad8e9fa8..2e7efaf8db 100644
--- a/keyboards/mikeneko65/rev4/config.h
+++ b/keyboards/mikeneko65/rev4/config.h
@@ -1,4 +1,5 @@
-/* Copyright 2022 takishim
+/* Copyright 2020 kkatano
+   Copyright 2022 takishim
 
 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
@@ -40,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 #define MATRIX_ROW_PINS { D0, D2, D5, C6, C7 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, E6, B0, B7, D4, D6, D7, B4, B5, B6 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, E6, B0, B7, D4, D6, D7, B6, B5, B4 }
 #define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
diff --git a/keyboards/mikeneko65/rev4/keymaps/default/keymap.c b/keyboards/mikeneko65/rev4/keymaps/default/keymap.c
index 4cbdd7a773..108ba0beb0 100644
--- a/keyboards/mikeneko65/rev4/keymaps/default/keymap.c
+++ b/keyboards/mikeneko65/rev4/keymaps/default/keymap.c
@@ -1,4 +1,5 @@
-/* Copyright 2022 takishim
+/* Copyright 2020 kkatano
+ * Copyright 2022 takishim
  *
  * 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
@@ -29,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FN] = LAYOUT_all(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/mikeneko65/rev4/keymaps/via/keymap.c b/keyboards/mikeneko65/rev4/keymaps/via/keymap.c
index 518cc8d5cf..2b9d125809 100644
--- a/keyboards/mikeneko65/rev4/keymaps/via/keymap.c
+++ b/keyboards/mikeneko65/rev4/keymaps/via/keymap.c
@@ -1,4 +1,5 @@
-/* Copyright 2022 takishim
+/* Copyright 2020 kkatano
+ * Copyright 2022 takishim
  *
  * 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
@@ -31,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_L1] = LAYOUT_all(
-        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/mikeneko65/rev4/rev4.c b/keyboards/mikeneko65/rev4/rev4.c
index bf16b41c8e..35d8509a09 100644
--- a/keyboards/mikeneko65/rev4/rev4.c
+++ b/keyboards/mikeneko65/rev4/rev4.c
@@ -1,4 +1,5 @@
-/* Copyright 2022 takishim
+/* Copyright 2020 kkatano
+ * Copyright 2022 takishim
  *
  * 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
diff --git a/keyboards/mikeneko65/rev4/rev4.h b/keyboards/mikeneko65/rev4/rev4.h
index 5a3e124c54..5f4a913fc9 100644
--- a/keyboards/mikeneko65/rev4/rev4.h
+++ b/keyboards/mikeneko65/rev4/rev4.h
@@ -1,4 +1,5 @@
-/* Copyright 2022 takishim
+/* Copyright 2020 kkatano
+ * Copyright 2022 takishim
  *
  * 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

From a2ef11bb006cfa0f185866f3f8d211131ca00af1 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 1 Feb 2022 10:05:09 +0800
Subject: [PATCH 464/867] [Docs] Add reference to data sync options for RGB
 (#16144)

---
 docs/feature_rgb_matrix.md | 2 ++
 docs/feature_rgblight.md   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 676588b750..3384aa7180 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -849,6 +849,8 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 }
 ```
 
+!> RGB indicators on split keyboards will require state information synced to the slave half (e.g. `#define SPLIT_LAYER_STATE_ENABLE`). See [data sync options](feature_split_keyboard.md#data-sync-options) for more details.
+
 #### Indicators without RGB Matrix Effect
 
 If you want to just use RGB indicators without RGB matrix effect, it is not possible to disable the latter because toggling RGB off will disable everything. You can workaround it with solid effect and colors off using this init function:
diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index e293b580d0..7fafaff47e 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -323,6 +323,8 @@ void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
 ```
 would turn the layer 0 (or 1) on and off again three times when `DEBUG` is pressed.
 
+!> Lighting layers on split keyboards will require layer state synced to the slave half (e.g. `#define SPLIT_LAYER_STATE_ENABLE`). See [data sync options](feature_split_keyboard.md#data-sync-options) for more details.
+
 ### Overriding RGB Lighting on/off status
 
 Normally lighting layers are not shown when RGB Lighting is disabled (e.g. with `RGB_TOG` keycode). If you would like lighting layers to work even when the RGB Lighting is otherwise off, add `#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF` to your `config.h`.

From b56707a5177489b01ad0b79b4ef0be80c8573d23 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 1 Feb 2022 10:07:33 +0800
Subject: [PATCH 465/867] [Keyboard] Simplify handedness for cradio (#16147)

---
 keyboards/cradio/config.h  |  3 ---
 keyboards/cradio/readme.md | 33 ++-------------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/keyboards/cradio/config.h b/keyboards/cradio/config.h
index 37c329a244..aba6050af1 100644
--- a/keyboards/cradio/config.h
+++ b/keyboards/cradio/config.h
@@ -67,9 +67,6 @@
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D2
 
-/* Split handedness */
-#define EE_HANDS
-
 /* Top left key on left half */
 #define BOOTMAGIC_LITE_ROW    0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/cradio/readme.md b/keyboards/cradio/readme.md
index c6013006d4..7f3cef0969 100644
--- a/keyboards/cradio/readme.md
+++ b/keyboards/cradio/readme.md
@@ -20,40 +20,11 @@ Make example for this keyboard (after setting up your build environment):
 
 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).
 
-## Setting Handedness
-
-Firmware uses [handedness by EEPROM](https://docs.qmk.fm/#/feature_split_keyboard?id=handedness-by-eeprom) as default and it must be *configured once* on each side. The make commands are:
-
-    make cradio:default:dfu-split-left
-    make cradio:default:dfu-split-right
-
-[QMK Toolbox](http://qmk.fm/toolbox) can also be used to set EEPROM handedness. Place the controller in bootloader mode and select menu option Tools -> EEPROM -> Set Left/Right Hand
-
 ## Bootloader
 
 Enter the bootloader in 3 ways:
 
-* **Bootmagic reset**: Hold down the top left key on the left half (or the top right right key on the right half) and plug in the controller on that side.
-* **Physical reset button**: Briefly press the reset button soldered on the PCB.
 * **Keycode in layout**: Press the key mapped to `RESET` if it is configured.
-
-## Swapped Pins
-
-If you have one of the PCB variant with swapped letters `Q` and `B` / `P` and `N`, add the following code to your keymap's `config.h` to swap pins `E6` and `D7` in the firmware:
-```c
-#undef DIRECT_PINS
-#define DIRECT_PINS { \
-    { D7, F7, F6, F5, F4 }, \
-    { B1, B3, B2, B6, D3 }, \
-    { D1, D0, D4, C6, E6 }, \
-    { B4, B5, NO_PIN, NO_PIN, NO_PIN } \
-}
-#undef DIRECT_PINS_RIGHT
-#define DIRECT_PINS_RIGHT { \
-    { F4, F5, F6, F7, D7 }, \
-    { D3, B6, B2, B3, B1 }, \
-    { E6, C6, D4, D0, D1 }, \
-    { B5, B4, NO_PIN, NO_PIN, NO_PIN } \
-}
-```
+* **Physical reset button**: Briefly press the reset button soldered on the PCB.
+* **Bootmagic reset**: Hold down the top left key on the left half (or the top right key on the right half) and plug in the controller on that side.
 

From 68473e66b6f9154c3f525e0928f1d22e7fb96963 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 1 Feb 2022 10:07:57 +0800
Subject: [PATCH 466/867] [Keyboard] Typo correction in ferris sweep readme
 (#16148)

---
 keyboards/ferris/sweep/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/ferris/sweep/readme.md b/keyboards/ferris/sweep/readme.md
index b6ee790943..332ab2c790 100644
--- a/keyboards/ferris/sweep/readme.md
+++ b/keyboards/ferris/sweep/readme.md
@@ -35,7 +35,7 @@ For Elite-C or compatible controllers using `DFU` bootloader, add the line `BOOT
 
 Enter the bootloader in 3 ways:
 
-* **Bootmagic reset**: Hold down the top left key on the left half (or the top right right key on the right half) and plug in the controller on that side.
+* **Bootmagic reset**: Hold down the top left key on the left half (or the top right key on the right half) and plug in the controller on that side.
 * **Physical reset button**: Briefly press the reset button soldered on the PCB.
 * **Keycode in layout**: Press the key mapped to `RESET` if it is configured.
 

From 602472dbfa2cdd4ae723f8789f4c2155a9b66800 Mon Sep 17 00:00:00 2001
From: Ben Allen <25768863+BenResTech@users.noreply.github.com>
Date: Tue, 1 Feb 2022 02:08:27 +0000
Subject: [PATCH 467/867] [Keyboard] ReadMe corrections for crkbd (#16149)

---
 keyboards/crkbd/readme.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/crkbd/readme.md b/keyboards/crkbd/readme.md
index 64b51f54f0..6c0e859663 100644
--- a/keyboards/crkbd/readme.md
+++ b/keyboards/crkbd/readme.md
@@ -27,7 +27,7 @@ The Corne PCBs have a reset button next to the TRRS jack to enter in to the boot
 Additionally, if you hold down the "Q" or "P" buttons when plugging in that half of the keyboard (per the default QWERTY layout), this will jump to the bootloader and reset the EEPROM (persistent storage).  This would normally be the very top corner-most position, but due to the breakaway column, it's left at Q and P for compatibility. 
 
 ## RGB Matrix 
-The Corne Keyboard also supports using the RGB Matrix feature, in place of RGB Light.  This provids a better experience when using the keyboard, as it supports a number of per key effects properly.  If you're not using the in switch LEDs, then you may want to pass on doing this. 
+The Corne Keyboard also supports using the RGB Matrix feature, in place of RGB Light.  This provides a better experience when using the keyboard, as it supports a number of per key effects properly.  If you're not using the in switch LEDs, then you may want to pass on doing this. 
 
 In your keymap's `rules.mk` file, add the following: 
 
@@ -54,8 +54,8 @@ And in your `config.h` file, add the following:
 #    define RGB_MATRIX_VAL_STEP 8
 #    define RGB_MATRIX_SPD_STEP 10
 
-/* Disable the animations you don't want/need.  You will need to disable a good number of these    *
- * because they take up a lot of space.  Disable until you can successfully compile your firmware. */
+/* Enable the animations you want/need.  You may need to enable only a small number of these because       *
+ * they take up a lot of space.  Enable and confirm that you can still successfully compile your firmware. */
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects

From 7b35dda31e767031e1b4f032f3a229e29867f71a Mon Sep 17 00:00:00 2001
From: "WiZ.GG" <39291381+wizard-gg@users.noreply.github.com>
Date: Tue, 1 Feb 2022 05:41:03 +0330
Subject: [PATCH 468/867] [Keyboard] R2 version of jadookb/jkb65 (#16129)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/jadookb/jkb65/config.h              |  4 ++-
 .../jadookb/jkb65/keymaps/default/keymap.c    | 16 +----------
 keyboards/jadookb/jkb65/keymaps/via/rules.mk  |  1 +
 keyboards/jadookb/jkb65/r2/config.h           | 27 +++++++++++++++++++
 keyboards/jadookb/jkb65/r2/readme.md          | 23 ++++++++++++++++
 5 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 keyboards/jadookb/jkb65/r2/config.h
 create mode 100644 keyboards/jadookb/jkb65/r2/readme.md

diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h
index a7710a0e03..ec79d26205 100644
--- a/keyboards/jadookb/jkb65/config.h
+++ b/keyboards/jadookb/jkb65/config.h
@@ -42,7 +42,9 @@
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_TIMEOUT 90000
-
+#define RGB_MATRIX_LED_PROCESS_LIMIT 4
+#define RGB_MATRIX_LED_FLUSH_LIMIT 26
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 
 #define DEBOUNCE 5
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/jadookb/jkb65/keymaps/default/keymap.c b/keyboards/jadookb/jkb65/keymaps/default/keymap.c
index b7b81a1500..f03211d220 100644
--- a/keyboards/jadookb/jkb65/keymaps/default/keymap.c
+++ b/keyboards/jadookb/jkb65/keymaps/default/keymap.c
@@ -33,19 +33,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,       _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,             _______,
         _______,            _______,   _______,  _______, _______,  _______, _______, _______, _______, _______,  _______,  _______, RGB_VAI,        _______,
         MAGIC_UNNO_GUI,MAGIC_NO_GUI,   _______,                      RGB_TOG,                              _______,   MO(2),   RGB_SPD,   RGB_VAD,    RGB_SPI
-    ),
-	[2] = LAYOUT_67_ansi(
-        RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
-    ),
-	[3] = LAYOUT_67_ansi(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______,
-        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,
-        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
-        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,    _______
-    ),
+    )
 };
diff --git a/keyboards/jadookb/jkb65/keymaps/via/rules.mk b/keyboards/jadookb/jkb65/keymaps/via/rules.mk
index 1e5b99807c..43061db1dd 100644
--- a/keyboards/jadookb/jkb65/keymaps/via/rules.mk
+++ b/keyboards/jadookb/jkb65/keymaps/via/rules.mk
@@ -1 +1,2 @@
 VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/jadookb/jkb65/r2/config.h b/keyboards/jadookb/jkb65/r2/config.h
new file mode 100644
index 0000000000..a0039001a8
--- /dev/null
+++ b/keyboards/jadookb/jkb65/r2/config.h
@@ -0,0 +1,27 @@
+ /* Copyright 2022 Wizad-GG
+  *
+  * 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
+
+#undef DEVICE_VER
+#define DEVICE_VER   0x0002
+
+#undef PRODUCT
+#define PRODUCT      JKB65 RGB R2
+
+
+#undef MATRIX_COL_PINS
+#define MATRIX_COL_PINS { F6,B0,F1,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,D0 }
\ No newline at end of file
diff --git a/keyboards/jadookb/jkb65/r2/readme.md b/keyboards/jadookb/jkb65/r2/readme.md
new file mode 100644
index 0000000000..9833769fb3
--- /dev/null
+++ b/keyboards/jadookb/jkb65/r2/readme.md
@@ -0,0 +1,23 @@
+# JKB65 RGB R2
+
+![JKB65RGB R2](https://i.imgur.com/VgtMLuih.jpg)
+
+R2 version of JKB65 
+
+* Keyboard Maintainer: [Wizard-GG](https://github.com/wizard-gg)
+* Hardware Supported: JKB65 RGB R2
+* Hardware Availability: [Jadoo Keyboard](https://jadookb.com/jkb65)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jadookb/jkb65/r2:default
+
+Flashing example for this keyboard:
+
+    make jadookb/jkb65/r2:default:flash
+
+To reset the board into bootloader mode, do the following step:
+
+* Hold the **Esc** key while connecting the USB cable
+
+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).

From 8515d12e2088fb8a3284a3ae239cc4fc945643e7 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 10:11:18 +0800
Subject: [PATCH 469/867] [Keyboard] move @omkbd 's boards to /omkbd (#16116)

---
 keyboards/{ => omkbd}/ergodash/.noci          |  0
 keyboards/{ => omkbd}/ergodash/config.h       |  0
 keyboards/{ => omkbd}/ergodash/ergodash.c     |  0
 keyboards/{ => omkbd}/ergodash/ergodash.h     |  4 +-
 keyboards/{ => omkbd}/ergodash/mini/.noci     |  0
 keyboards/{ => omkbd}/ergodash/mini/config.h  |  0
 keyboards/{ => omkbd}/ergodash/mini/info.json |  0
 .../ergodash/mini/keymaps/default/config.h    |  0
 .../ergodash/mini/keymaps/default/keymap.c    |  0
 .../ergodash/mini/keymaps/default/rules.mk    |  0
 .../mini/keymaps/toyoshimahidenori/config.h   |  0
 .../mini/keymaps/toyoshimahidenori/keymap.c   |  0
 .../mini/keymaps/toyoshimahidenori/readme.md  |  0
 .../mini/keymaps/toyoshimahidenori/rules.mk   |  0
 .../mini/keymaps/yoshimaru46/config.h         |  0
 .../mini/keymaps/yoshimaru46/keymap.c         |  0
 .../mini/keymaps/yoshimaru46/readme.md        |  0
 .../mini/keymaps/yoshimaru46/rules.mk         |  0
 keyboards/{ => omkbd}/ergodash/mini/mini.c    |  0
 keyboards/{ => omkbd}/ergodash/mini/mini.h    |  0
 keyboards/{ => omkbd}/ergodash/mini/readme.md |  2 +-
 keyboards/{ => omkbd}/ergodash/mini/rules.mk  |  0
 keyboards/{ => omkbd}/ergodash/readme.md      |  4 +-
 keyboards/{ => omkbd}/ergodash/rev1/.noci     |  0
 keyboards/{ => omkbd}/ergodash/rev1/config.h  |  0
 keyboards/{ => omkbd}/ergodash/rev1/info.json |  0
 .../ergodash/rev1/keymaps/333fred/config.h    |  0
 .../ergodash/rev1/keymaps/333fred/keymap.c    |  0
 .../ergodash/rev1/keymaps/333fred/rules.mk    |  0
 .../ergodash/rev1/keymaps/default/config.h    |  0
 .../ergodash/rev1/keymaps/default/keymap.c    |  0
 .../ergodash/rev1/keymaps/default/rules.mk    |  0
 .../rev1/keymaps/greenshadowmaker/config.h    |  0
 .../keyboard-layout-editor.json               |  0
 .../rev1/keymaps/greenshadowmaker/keymap.c    |  0
 .../rev1/keymaps/greenshadowmaker/rules.mk    |  0
 .../rev1/keymaps/ifohancroft/config.h         |  0
 .../rev1/keymaps/ifohancroft/keymap.c         |  0
 .../rev1/keymaps/ifohancroft/readme.md        |  0
 .../rev1/keymaps/ifohancroft/rules.mk         |  0
 .../ergodash/rev1/keymaps/m47ch4n/config.h    |  0
 .../ergodash/rev1/keymaps/m47ch4n/keymap.c    |  0
 .../rev1/keymaps/m47ch4n/m47ch4ns_keymap.json |  0
 .../ergodash/rev1/keymaps/m47ch4n/readme.md   |  0
 .../ergodash/rev1/keymaps/m47ch4n/rules.mk    |  0
 .../rev1/keymaps/nopunin10did/config.h        |  0
 .../rev1/keymaps/nopunin10did/keymap.c        |  0
 .../rev1/keymaps/nopunin10did/layers.json     |  0
 .../rev1/keymaps/nopunin10did/readme.md       |  0
 .../rev1/keymaps/nopunin10did/rules.mk        |  0
 .../rev1/keymaps/shadowprogr/config.h         |  0
 .../rev1/keymaps/shadowprogr/keymap.c         |  0
 .../rev1/keymaps/shadowprogr/readme.md        |  0
 .../rev1/keymaps/shadowprogr/rules.mk         |  0
 .../ergodash/rev1/keymaps/tw1t611/config.h    |  0
 .../ergodash/rev1/keymaps/tw1t611/keymap.c    |  0
 .../ergodash/rev1/keymaps/tw1t611/readme.md   |  0
 .../ergodash/rev1/keymaps/tw1t611/rules.mk    |  0
 .../keymaps/yet-another-developer/config.h    |  0
 .../keymaps/yet-another-developer/keymap.c    |  0
 .../keymaps/yet-another-developer/rules.mk    |  0
 keyboards/{ => omkbd}/ergodash/rev1/rev1.c    |  0
 keyboards/{ => omkbd}/ergodash/rev1/rev1.h    |  0
 keyboards/{ => omkbd}/ergodash/rev1/rules.mk  |  0
 keyboards/{ => omkbd}/ergodash/rules.mk       |  2 +-
 keyboards/{ => omkbd}/runner3680/3x6/.noci    |  0
 keyboards/{ => omkbd}/runner3680/3x6/3x6.c    |  0
 keyboards/{ => omkbd}/runner3680/3x6/3x6.h    |  0
 keyboards/{ => omkbd}/runner3680/3x6/config.h |  0
 .../{ => omkbd}/runner3680/3x6/info.json      |  0
 .../runner3680/3x6/keymaps/default/config.h   |  0
 .../runner3680/3x6/keymaps/default/keymap.c   |  0
 keyboards/{ => omkbd}/runner3680/3x6/rules.mk |  0
 keyboards/{ => omkbd}/runner3680/3x7/.noci    |  0
 keyboards/{ => omkbd}/runner3680/3x7/3x7.c    |  0
 keyboards/{ => omkbd}/runner3680/3x7/3x7.h    |  0
 keyboards/{ => omkbd}/runner3680/3x7/config.h |  0
 .../{ => omkbd}/runner3680/3x7/info.json      |  0
 .../runner3680/3x7/keymaps/default/config.h   |  0
 .../runner3680/3x7/keymaps/default/keymap.c   |  0
 keyboards/{ => omkbd}/runner3680/3x7/rules.mk |  0
 keyboards/{ => omkbd}/runner3680/3x8/.noci    |  0
 keyboards/{ => omkbd}/runner3680/3x8/3x8.c    |  0
 keyboards/{ => omkbd}/runner3680/3x8/3x8.h    |  0
 keyboards/{ => omkbd}/runner3680/3x8/config.h |  0
 .../{ => omkbd}/runner3680/3x8/info.json      |  0
 .../runner3680/3x8/keymaps/default/config.h   |  0
 .../runner3680/3x8/keymaps/default/keymap.c   |  0
 keyboards/{ => omkbd}/runner3680/3x8/rules.mk |  0
 keyboards/{ => omkbd}/runner3680/4x6/.noci    |  0
 keyboards/{ => omkbd}/runner3680/4x6/4x6.c    |  0
 keyboards/{ => omkbd}/runner3680/4x6/4x6.h    |  0
 keyboards/{ => omkbd}/runner3680/4x6/config.h |  0
 .../{ => omkbd}/runner3680/4x6/info.json      |  0
 .../runner3680/4x6/keymaps/default/config.h   |  0
 .../runner3680/4x6/keymaps/default/keymap.c   |  0
 keyboards/{ => omkbd}/runner3680/4x6/rules.mk |  0
 keyboards/{ => omkbd}/runner3680/4x7/.noci    |  0
 keyboards/{ => omkbd}/runner3680/4x7/4x7.c    |  0
 keyboards/{ => omkbd}/runner3680/4x7/4x7.h    |  0
 keyboards/{ => omkbd}/runner3680/4x7/config.h |  0
 .../{ => omkbd}/runner3680/4x7/info.json      |  0
 .../runner3680/4x7/keymaps/default/config.h   |  0
 .../runner3680/4x7/keymaps/default/keymap.c   |  0
 keyboards/{ => omkbd}/runner3680/4x7/rules.mk |  0
 keyboards/{ => omkbd}/runner3680/4x8/.noci    |  0
 keyboards/{ => omkbd}/runner3680/4x8/4x8.c    |  0
 keyboards/{ => omkbd}/runner3680/4x8/4x8.h    |  0
 keyboards/{ => omkbd}/runner3680/4x8/config.h |  0
 .../{ => omkbd}/runner3680/4x8/info.json      |  0
 .../runner3680/4x8/keymaps/default/config.h   |  0
 .../runner3680/4x8/keymaps/default/keymap.c   |  0
 keyboards/{ => omkbd}/runner3680/4x8/rules.mk |  0
 keyboards/{ => omkbd}/runner3680/5x6/.noci    |  0
 keyboards/{ => omkbd}/runner3680/5x6/5x6.c    |  0
 keyboards/{ => omkbd}/runner3680/5x6/5x6.h    |  0
 keyboards/{ => omkbd}/runner3680/5x6/config.h |  0
 .../{ => omkbd}/runner3680/5x6/info.json      |  0
 .../runner3680/5x6/keymaps/default/config.h   |  0
 .../runner3680/5x6/keymaps/default/keymap.c   |  0
 keyboards/{ => omkbd}/runner3680/5x6/rules.mk |  0
 .../{ => omkbd}/runner3680/5x6_5x8/.noci      |  0
 .../{ => omkbd}/runner3680/5x6_5x8/5x6_5x8.c  |  0
 .../{ => omkbd}/runner3680/5x6_5x8/5x6_5x8.h  |  0
 .../{ => omkbd}/runner3680/5x6_5x8/config.h   |  0
 .../{ => omkbd}/runner3680/5x6_5x8/info.json  |  0
 .../5x6_5x8/keymaps/default/config.h          |  0
 .../5x6_5x8/keymaps/default/keymap.c          |  0
 .../5x6_5x8/keymaps/derekhsu/config.h         |  0
 .../5x6_5x8/keymaps/derekhsu/keymap.c         |  0
 .../5x6_5x8/keymaps/derekhsu/rules.mk         |  0
 .../runner3680/5x6_5x8/keymaps/jis/config.h   |  0
 .../runner3680/5x6_5x8/keymaps/jis/keymap.c   |  0
 .../runner3680/5x6_5x8/keymaps/via/config.h   |  0
 .../runner3680/5x6_5x8/keymaps/via/keymap.c   |  0
 .../runner3680/5x6_5x8/keymaps/via/rules.mk   |  0
 .../{ => omkbd}/runner3680/5x6_5x8/rules.mk   |  0
 keyboards/{ => omkbd}/runner3680/5x7/.noci    |  0
 keyboards/{ => omkbd}/runner3680/5x7/5x7.c    |  0
 keyboards/{ => omkbd}/runner3680/5x7/5x7.h    |  0
 keyboards/{ => omkbd}/runner3680/5x7/config.h |  0
 .../{ => omkbd}/runner3680/5x7/info.json      |  0
 .../runner3680/5x7/keymaps/default/config.h   |  0
 .../runner3680/5x7/keymaps/default/keymap.c   |  0
 keyboards/{ => omkbd}/runner3680/5x7/rules.mk |  0
 keyboards/{ => omkbd}/runner3680/5x8/.noci    |  0
 keyboards/{ => omkbd}/runner3680/5x8/5x8.c    |  0
 keyboards/{ => omkbd}/runner3680/5x8/5x8.h    |  0
 keyboards/{ => omkbd}/runner3680/5x8/config.h |  0
 .../{ => omkbd}/runner3680/5x8/info.json      |  0
 .../runner3680/5x8/keymaps/JIS/config.h       |  0
 .../runner3680/5x8/keymaps/JIS/keymap.c       |  0
 .../runner3680/5x8/keymaps/default/config.h   |  0
 .../runner3680/5x8/keymaps/default/keymap.c   |  0
 keyboards/{ => omkbd}/runner3680/5x8/rules.mk |  0
 keyboards/{ => omkbd}/runner3680/config.h     |  0
 keyboards/{ => omkbd}/runner3680/readme.md    |  2 +-
 keyboards/{ => omkbd}/runner3680/rules.mk     |  2 +-
 keyboards/{ => omkbd}/runner3680/runner3680.c |  0
 keyboards/omkbd/runner3680/runner3680.h       | 43 +++++++++++++++++++
 keyboards/runner3680/runner3680.h             | 43 -------------------
 161 files changed, 51 insertions(+), 51 deletions(-)
 rename keyboards/{ => omkbd}/ergodash/.noci (100%)
 rename keyboards/{ => omkbd}/ergodash/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/ergodash.c (100%)
 rename keyboards/{ => omkbd}/ergodash/ergodash.h (64%)
 rename keyboards/{ => omkbd}/ergodash/mini/.noci (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/info.json (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/keymaps/default/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/keymaps/default/keymap.c (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/keymaps/default/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/keymaps/toyoshimahidenori/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/keymaps/toyoshimahidenori/keymap.c (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/keymaps/toyoshimahidenori/readme.md (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/keymaps/toyoshimahidenori/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/keymaps/yoshimaru46/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/keymaps/yoshimaru46/keymap.c (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/keymaps/yoshimaru46/readme.md (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/keymaps/yoshimaru46/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/mini.c (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/mini.h (100%)
 rename keyboards/{ => omkbd}/ergodash/mini/readme.md (95%)
 rename keyboards/{ => omkbd}/ergodash/mini/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/readme.md (93%)
 rename keyboards/{ => omkbd}/ergodash/rev1/.noci (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/info.json (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/333fred/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/333fred/keymap.c (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/333fred/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/default/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/default/keymap.c (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/default/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/greenshadowmaker/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/greenshadowmaker/keymap.c (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/greenshadowmaker/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/ifohancroft/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/ifohancroft/keymap.c (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/ifohancroft/readme.md (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/ifohancroft/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/m47ch4n/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/m47ch4n/keymap.c (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/m47ch4n/readme.md (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/m47ch4n/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/nopunin10did/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/nopunin10did/keymap.c (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/nopunin10did/layers.json (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/nopunin10did/readme.md (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/nopunin10did/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/shadowprogr/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/shadowprogr/keymap.c (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/shadowprogr/readme.md (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/shadowprogr/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/tw1t611/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/tw1t611/keymap.c (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/tw1t611/readme.md (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/tw1t611/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/yet-another-developer/config.h (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/yet-another-developer/keymap.c (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/keymaps/yet-another-developer/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/rev1.c (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/rev1.h (100%)
 rename keyboards/{ => omkbd}/ergodash/rev1/rules.mk (100%)
 rename keyboards/{ => omkbd}/ergodash/rules.mk (94%)
 rename keyboards/{ => omkbd}/runner3680/3x6/.noci (100%)
 rename keyboards/{ => omkbd}/runner3680/3x6/3x6.c (100%)
 rename keyboards/{ => omkbd}/runner3680/3x6/3x6.h (100%)
 rename keyboards/{ => omkbd}/runner3680/3x6/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/3x6/info.json (100%)
 rename keyboards/{ => omkbd}/runner3680/3x6/keymaps/default/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/3x6/keymaps/default/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/3x6/rules.mk (100%)
 rename keyboards/{ => omkbd}/runner3680/3x7/.noci (100%)
 rename keyboards/{ => omkbd}/runner3680/3x7/3x7.c (100%)
 rename keyboards/{ => omkbd}/runner3680/3x7/3x7.h (100%)
 rename keyboards/{ => omkbd}/runner3680/3x7/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/3x7/info.json (100%)
 rename keyboards/{ => omkbd}/runner3680/3x7/keymaps/default/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/3x7/keymaps/default/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/3x7/rules.mk (100%)
 rename keyboards/{ => omkbd}/runner3680/3x8/.noci (100%)
 rename keyboards/{ => omkbd}/runner3680/3x8/3x8.c (100%)
 rename keyboards/{ => omkbd}/runner3680/3x8/3x8.h (100%)
 rename keyboards/{ => omkbd}/runner3680/3x8/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/3x8/info.json (100%)
 rename keyboards/{ => omkbd}/runner3680/3x8/keymaps/default/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/3x8/keymaps/default/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/3x8/rules.mk (100%)
 rename keyboards/{ => omkbd}/runner3680/4x6/.noci (100%)
 rename keyboards/{ => omkbd}/runner3680/4x6/4x6.c (100%)
 rename keyboards/{ => omkbd}/runner3680/4x6/4x6.h (100%)
 rename keyboards/{ => omkbd}/runner3680/4x6/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/4x6/info.json (100%)
 rename keyboards/{ => omkbd}/runner3680/4x6/keymaps/default/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/4x6/keymaps/default/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/4x6/rules.mk (100%)
 rename keyboards/{ => omkbd}/runner3680/4x7/.noci (100%)
 rename keyboards/{ => omkbd}/runner3680/4x7/4x7.c (100%)
 rename keyboards/{ => omkbd}/runner3680/4x7/4x7.h (100%)
 rename keyboards/{ => omkbd}/runner3680/4x7/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/4x7/info.json (100%)
 rename keyboards/{ => omkbd}/runner3680/4x7/keymaps/default/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/4x7/keymaps/default/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/4x7/rules.mk (100%)
 rename keyboards/{ => omkbd}/runner3680/4x8/.noci (100%)
 rename keyboards/{ => omkbd}/runner3680/4x8/4x8.c (100%)
 rename keyboards/{ => omkbd}/runner3680/4x8/4x8.h (100%)
 rename keyboards/{ => omkbd}/runner3680/4x8/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/4x8/info.json (100%)
 rename keyboards/{ => omkbd}/runner3680/4x8/keymaps/default/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/4x8/keymaps/default/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/4x8/rules.mk (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6/.noci (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6/5x6.c (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6/5x6.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6/info.json (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6/keymaps/default/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6/keymaps/default/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6/rules.mk (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/.noci (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/5x6_5x8.c (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/5x6_5x8.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/info.json (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/keymaps/default/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/keymaps/default/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/keymaps/derekhsu/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/keymaps/jis/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/keymaps/jis/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/keymaps/via/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/keymaps/via/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/keymaps/via/rules.mk (100%)
 rename keyboards/{ => omkbd}/runner3680/5x6_5x8/rules.mk (100%)
 rename keyboards/{ => omkbd}/runner3680/5x7/.noci (100%)
 rename keyboards/{ => omkbd}/runner3680/5x7/5x7.c (100%)
 rename keyboards/{ => omkbd}/runner3680/5x7/5x7.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x7/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x7/info.json (100%)
 rename keyboards/{ => omkbd}/runner3680/5x7/keymaps/default/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x7/keymaps/default/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/5x7/rules.mk (100%)
 rename keyboards/{ => omkbd}/runner3680/5x8/.noci (100%)
 rename keyboards/{ => omkbd}/runner3680/5x8/5x8.c (100%)
 rename keyboards/{ => omkbd}/runner3680/5x8/5x8.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x8/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x8/info.json (100%)
 rename keyboards/{ => omkbd}/runner3680/5x8/keymaps/JIS/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x8/keymaps/JIS/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/5x8/keymaps/default/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/5x8/keymaps/default/keymap.c (100%)
 rename keyboards/{ => omkbd}/runner3680/5x8/rules.mk (100%)
 rename keyboards/{ => omkbd}/runner3680/config.h (100%)
 rename keyboards/{ => omkbd}/runner3680/readme.md (95%)
 rename keyboards/{ => omkbd}/runner3680/rules.mk (94%)
 rename keyboards/{ => omkbd}/runner3680/runner3680.c (100%)
 create mode 100644 keyboards/omkbd/runner3680/runner3680.h
 delete mode 100644 keyboards/runner3680/runner3680.h

diff --git a/keyboards/ergodash/.noci b/keyboards/omkbd/ergodash/.noci
similarity index 100%
rename from keyboards/ergodash/.noci
rename to keyboards/omkbd/ergodash/.noci
diff --git a/keyboards/ergodash/config.h b/keyboards/omkbd/ergodash/config.h
similarity index 100%
rename from keyboards/ergodash/config.h
rename to keyboards/omkbd/ergodash/config.h
diff --git a/keyboards/ergodash/ergodash.c b/keyboards/omkbd/ergodash/ergodash.c
similarity index 100%
rename from keyboards/ergodash/ergodash.c
rename to keyboards/omkbd/ergodash/ergodash.c
diff --git a/keyboards/ergodash/ergodash.h b/keyboards/omkbd/ergodash/ergodash.h
similarity index 64%
rename from keyboards/ergodash/ergodash.h
rename to keyboards/omkbd/ergodash/ergodash.h
index 5fba70e75d..8c8bd3cdc3 100644
--- a/keyboards/ergodash/ergodash.h
+++ b/keyboards/omkbd/ergodash/ergodash.h
@@ -2,10 +2,10 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_ergodash_rev1
+#ifdef KEYBOARD_omkbd_ergodash_rev1
     #include "rev1.h"
 #endif // #ifdef KEYBOARD_ergodash_rev1
 
-#ifdef KEYBOARD_ergodash_mini
+#ifdef KEYBOARD_omkbd_ergodash_mini
     #include "mini.h"
 #endif
diff --git a/keyboards/ergodash/mini/.noci b/keyboards/omkbd/ergodash/mini/.noci
similarity index 100%
rename from keyboards/ergodash/mini/.noci
rename to keyboards/omkbd/ergodash/mini/.noci
diff --git a/keyboards/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h
similarity index 100%
rename from keyboards/ergodash/mini/config.h
rename to keyboards/omkbd/ergodash/mini/config.h
diff --git a/keyboards/ergodash/mini/info.json b/keyboards/omkbd/ergodash/mini/info.json
similarity index 100%
rename from keyboards/ergodash/mini/info.json
rename to keyboards/omkbd/ergodash/mini/info.json
diff --git a/keyboards/ergodash/mini/keymaps/default/config.h b/keyboards/omkbd/ergodash/mini/keymaps/default/config.h
similarity index 100%
rename from keyboards/ergodash/mini/keymaps/default/config.h
rename to keyboards/omkbd/ergodash/mini/keymaps/default/config.h
diff --git a/keyboards/ergodash/mini/keymaps/default/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergodash/mini/keymaps/default/keymap.c
rename to keyboards/omkbd/ergodash/mini/keymaps/default/keymap.c
diff --git a/keyboards/ergodash/mini/keymaps/default/rules.mk b/keyboards/omkbd/ergodash/mini/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/ergodash/mini/keymaps/default/rules.mk
rename to keyboards/omkbd/ergodash/mini/keymaps/default/rules.mk
diff --git a/keyboards/ergodash/mini/keymaps/toyoshimahidenori/config.h b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/config.h
similarity index 100%
rename from keyboards/ergodash/mini/keymaps/toyoshimahidenori/config.h
rename to keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/config.h
diff --git a/keyboards/ergodash/mini/keymaps/toyoshimahidenori/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
similarity index 100%
rename from keyboards/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
rename to keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/keymap.c
diff --git a/keyboards/ergodash/mini/keymaps/toyoshimahidenori/readme.md b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/readme.md
similarity index 100%
rename from keyboards/ergodash/mini/keymaps/toyoshimahidenori/readme.md
rename to keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/readme.md
diff --git a/keyboards/ergodash/mini/keymaps/toyoshimahidenori/rules.mk b/keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/rules.mk
similarity index 100%
rename from keyboards/ergodash/mini/keymaps/toyoshimahidenori/rules.mk
rename to keyboards/omkbd/ergodash/mini/keymaps/toyoshimahidenori/rules.mk
diff --git a/keyboards/ergodash/mini/keymaps/yoshimaru46/config.h b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/config.h
similarity index 100%
rename from keyboards/ergodash/mini/keymaps/yoshimaru46/config.h
rename to keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/config.h
diff --git a/keyboards/ergodash/mini/keymaps/yoshimaru46/keymap.c b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c
similarity index 100%
rename from keyboards/ergodash/mini/keymaps/yoshimaru46/keymap.c
rename to keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/keymap.c
diff --git a/keyboards/ergodash/mini/keymaps/yoshimaru46/readme.md b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/readme.md
similarity index 100%
rename from keyboards/ergodash/mini/keymaps/yoshimaru46/readme.md
rename to keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/readme.md
diff --git a/keyboards/ergodash/mini/keymaps/yoshimaru46/rules.mk b/keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/rules.mk
similarity index 100%
rename from keyboards/ergodash/mini/keymaps/yoshimaru46/rules.mk
rename to keyboards/omkbd/ergodash/mini/keymaps/yoshimaru46/rules.mk
diff --git a/keyboards/ergodash/mini/mini.c b/keyboards/omkbd/ergodash/mini/mini.c
similarity index 100%
rename from keyboards/ergodash/mini/mini.c
rename to keyboards/omkbd/ergodash/mini/mini.c
diff --git a/keyboards/ergodash/mini/mini.h b/keyboards/omkbd/ergodash/mini/mini.h
similarity index 100%
rename from keyboards/ergodash/mini/mini.h
rename to keyboards/omkbd/ergodash/mini/mini.h
diff --git a/keyboards/ergodash/mini/readme.md b/keyboards/omkbd/ergodash/mini/readme.md
similarity index 95%
rename from keyboards/ergodash/mini/readme.md
rename to keyboards/omkbd/ergodash/mini/readme.md
index f830f3f1d9..273935f3e3 100644
--- a/keyboards/ergodash/mini/readme.md
+++ b/keyboards/omkbd/ergodash/mini/readme.md
@@ -9,7 +9,7 @@ Hardware Availability: Order your own [yourself](https://github.com/omkbd/ErgoDa
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ergodash/mini:default
+    make omkbd/ergodash/mini:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/ergodash/mini/rules.mk b/keyboards/omkbd/ergodash/mini/rules.mk
similarity index 100%
rename from keyboards/ergodash/mini/rules.mk
rename to keyboards/omkbd/ergodash/mini/rules.mk
diff --git a/keyboards/ergodash/readme.md b/keyboards/omkbd/ergodash/readme.md
similarity index 93%
rename from keyboards/ergodash/readme.md
rename to keyboards/omkbd/ergodash/readme.md
index 27672c3ecf..4260397a99 100644
--- a/keyboards/ergodash/readme.md
+++ b/keyboards/omkbd/ergodash/readme.md
@@ -9,12 +9,12 @@ Hardware Availability: Order your own [yourself](https://github.com/omkbd/ErgoDa
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ergodash/rev1:default
+    make omkbd/ergodash/rev1:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
 Install Example: (for pro micro)
-    `make ergodash/rev1:default:avrdude`
+    `make omkbd/ergodash/rev1:default:avrdude`
 
 Note:  
   "rev1" is for PCB ver 1.0,1.1,1.2  
diff --git a/keyboards/ergodash/rev1/.noci b/keyboards/omkbd/ergodash/rev1/.noci
similarity index 100%
rename from keyboards/ergodash/rev1/.noci
rename to keyboards/omkbd/ergodash/rev1/.noci
diff --git a/keyboards/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h
similarity index 100%
rename from keyboards/ergodash/rev1/config.h
rename to keyboards/omkbd/ergodash/rev1/config.h
diff --git a/keyboards/ergodash/rev1/info.json b/keyboards/omkbd/ergodash/rev1/info.json
similarity index 100%
rename from keyboards/ergodash/rev1/info.json
rename to keyboards/omkbd/ergodash/rev1/info.json
diff --git a/keyboards/ergodash/rev1/keymaps/333fred/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/333fred/config.h
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/333fred/config.h
rename to keyboards/omkbd/ergodash/rev1/keymaps/333fred/config.h
diff --git a/keyboards/ergodash/rev1/keymaps/333fred/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/333fred/keymap.c
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/333fred/keymap.c
rename to keyboards/omkbd/ergodash/rev1/keymaps/333fred/keymap.c
diff --git a/keyboards/ergodash/rev1/keymaps/333fred/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/333fred/rules.mk
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/333fred/rules.mk
rename to keyboards/omkbd/ergodash/rev1/keymaps/333fred/rules.mk
diff --git a/keyboards/ergodash/rev1/keymaps/default/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/default/config.h
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/default/config.h
rename to keyboards/omkbd/ergodash/rev1/keymaps/default/config.h
diff --git a/keyboards/ergodash/rev1/keymaps/default/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/default/keymap.c
rename to keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c
diff --git a/keyboards/ergodash/rev1/keymaps/default/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/default/rules.mk
rename to keyboards/omkbd/ergodash/rev1/keymaps/default/rules.mk
diff --git a/keyboards/ergodash/rev1/keymaps/greenshadowmaker/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/config.h
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/greenshadowmaker/config.h
rename to keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/config.h
diff --git a/keyboards/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json
rename to keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keyboard-layout-editor.json
diff --git a/keyboards/ergodash/rev1/keymaps/greenshadowmaker/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
rename to keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/keymap.c
diff --git a/keyboards/ergodash/rev1/keymaps/greenshadowmaker/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/rules.mk
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/greenshadowmaker/rules.mk
rename to keyboards/omkbd/ergodash/rev1/keymaps/greenshadowmaker/rules.mk
diff --git a/keyboards/ergodash/rev1/keymaps/ifohancroft/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/config.h
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/ifohancroft/config.h
rename to keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/config.h
diff --git a/keyboards/ergodash/rev1/keymaps/ifohancroft/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/keymap.c
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/ifohancroft/keymap.c
rename to keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/keymap.c
diff --git a/keyboards/ergodash/rev1/keymaps/ifohancroft/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/readme.md
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/ifohancroft/readme.md
rename to keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/readme.md
diff --git a/keyboards/ergodash/rev1/keymaps/ifohancroft/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/rules.mk
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/ifohancroft/rules.mk
rename to keyboards/omkbd/ergodash/rev1/keymaps/ifohancroft/rules.mk
diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/config.h
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/m47ch4n/config.h
rename to keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/config.h
diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/m47ch4n/keymap.c
rename to keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/keymap.c
diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json
rename to keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/m47ch4ns_keymap.json
diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/readme.md
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/m47ch4n/readme.md
rename to keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/readme.md
diff --git a/keyboards/ergodash/rev1/keymaps/m47ch4n/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/rules.mk
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/m47ch4n/rules.mk
rename to keyboards/omkbd/ergodash/rev1/keymaps/m47ch4n/rules.mk
diff --git a/keyboards/ergodash/rev1/keymaps/nopunin10did/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/config.h
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/nopunin10did/config.h
rename to keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/config.h
diff --git a/keyboards/ergodash/rev1/keymaps/nopunin10did/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/keymap.c
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/nopunin10did/keymap.c
rename to keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/keymap.c
diff --git a/keyboards/ergodash/rev1/keymaps/nopunin10did/layers.json b/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/layers.json
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/nopunin10did/layers.json
rename to keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/layers.json
diff --git a/keyboards/ergodash/rev1/keymaps/nopunin10did/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/readme.md
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/nopunin10did/readme.md
rename to keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/readme.md
diff --git a/keyboards/ergodash/rev1/keymaps/nopunin10did/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/rules.mk
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/nopunin10did/rules.mk
rename to keyboards/omkbd/ergodash/rev1/keymaps/nopunin10did/rules.mk
diff --git a/keyboards/ergodash/rev1/keymaps/shadowprogr/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/config.h
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/shadowprogr/config.h
rename to keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/config.h
diff --git a/keyboards/ergodash/rev1/keymaps/shadowprogr/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/shadowprogr/keymap.c
rename to keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/keymap.c
diff --git a/keyboards/ergodash/rev1/keymaps/shadowprogr/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/readme.md
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/shadowprogr/readme.md
rename to keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/readme.md
diff --git a/keyboards/ergodash/rev1/keymaps/shadowprogr/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/rules.mk
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/shadowprogr/rules.mk
rename to keyboards/omkbd/ergodash/rev1/keymaps/shadowprogr/rules.mk
diff --git a/keyboards/ergodash/rev1/keymaps/tw1t611/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/config.h
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/tw1t611/config.h
rename to keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/config.h
diff --git a/keyboards/ergodash/rev1/keymaps/tw1t611/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/keymap.c
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/tw1t611/keymap.c
rename to keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/keymap.c
diff --git a/keyboards/ergodash/rev1/keymaps/tw1t611/readme.md b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/readme.md
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/tw1t611/readme.md
rename to keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/readme.md
diff --git a/keyboards/ergodash/rev1/keymaps/tw1t611/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/rules.mk
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/tw1t611/rules.mk
rename to keyboards/omkbd/ergodash/rev1/keymaps/tw1t611/rules.mk
diff --git a/keyboards/ergodash/rev1/keymaps/yet-another-developer/config.h b/keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/config.h
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/yet-another-developer/config.h
rename to keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/config.h
diff --git a/keyboards/ergodash/rev1/keymaps/yet-another-developer/keymap.c b/keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/keymap.c
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/yet-another-developer/keymap.c
rename to keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/keymap.c
diff --git a/keyboards/ergodash/rev1/keymaps/yet-another-developer/rules.mk b/keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/rules.mk
similarity index 100%
rename from keyboards/ergodash/rev1/keymaps/yet-another-developer/rules.mk
rename to keyboards/omkbd/ergodash/rev1/keymaps/yet-another-developer/rules.mk
diff --git a/keyboards/ergodash/rev1/rev1.c b/keyboards/omkbd/ergodash/rev1/rev1.c
similarity index 100%
rename from keyboards/ergodash/rev1/rev1.c
rename to keyboards/omkbd/ergodash/rev1/rev1.c
diff --git a/keyboards/ergodash/rev1/rev1.h b/keyboards/omkbd/ergodash/rev1/rev1.h
similarity index 100%
rename from keyboards/ergodash/rev1/rev1.h
rename to keyboards/omkbd/ergodash/rev1/rev1.h
diff --git a/keyboards/ergodash/rev1/rules.mk b/keyboards/omkbd/ergodash/rev1/rules.mk
similarity index 100%
rename from keyboards/ergodash/rev1/rules.mk
rename to keyboards/omkbd/ergodash/rev1/rules.mk
diff --git a/keyboards/ergodash/rules.mk b/keyboards/omkbd/ergodash/rules.mk
similarity index 94%
rename from keyboards/ergodash/rules.mk
rename to keyboards/omkbd/ergodash/rules.mk
index de097dfbb3..5c44a74433 100644
--- a/keyboards/ergodash/rules.mk
+++ b/keyboards/omkbd/ergodash/rules.mk
@@ -19,4 +19,4 @@ RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
 
 SPLIT_KEYBOARD = yes       # Enables split keyboard support
 
-DEFAULT_FOLDER = ergodash/rev1
+DEFAULT_FOLDER = omkbd/ergodash/rev1
diff --git a/keyboards/runner3680/3x6/.noci b/keyboards/omkbd/runner3680/3x6/.noci
similarity index 100%
rename from keyboards/runner3680/3x6/.noci
rename to keyboards/omkbd/runner3680/3x6/.noci
diff --git a/keyboards/runner3680/3x6/3x6.c b/keyboards/omkbd/runner3680/3x6/3x6.c
similarity index 100%
rename from keyboards/runner3680/3x6/3x6.c
rename to keyboards/omkbd/runner3680/3x6/3x6.c
diff --git a/keyboards/runner3680/3x6/3x6.h b/keyboards/omkbd/runner3680/3x6/3x6.h
similarity index 100%
rename from keyboards/runner3680/3x6/3x6.h
rename to keyboards/omkbd/runner3680/3x6/3x6.h
diff --git a/keyboards/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h
similarity index 100%
rename from keyboards/runner3680/3x6/config.h
rename to keyboards/omkbd/runner3680/3x6/config.h
diff --git a/keyboards/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json
similarity index 100%
rename from keyboards/runner3680/3x6/info.json
rename to keyboards/omkbd/runner3680/3x6/info.json
diff --git a/keyboards/runner3680/3x6/keymaps/default/config.h b/keyboards/omkbd/runner3680/3x6/keymaps/default/config.h
similarity index 100%
rename from keyboards/runner3680/3x6/keymaps/default/config.h
rename to keyboards/omkbd/runner3680/3x6/keymaps/default/config.h
diff --git a/keyboards/runner3680/3x6/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/3x6/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/runner3680/3x6/keymaps/default/keymap.c
rename to keyboards/omkbd/runner3680/3x6/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/3x6/rules.mk b/keyboards/omkbd/runner3680/3x6/rules.mk
similarity index 100%
rename from keyboards/runner3680/3x6/rules.mk
rename to keyboards/omkbd/runner3680/3x6/rules.mk
diff --git a/keyboards/runner3680/3x7/.noci b/keyboards/omkbd/runner3680/3x7/.noci
similarity index 100%
rename from keyboards/runner3680/3x7/.noci
rename to keyboards/omkbd/runner3680/3x7/.noci
diff --git a/keyboards/runner3680/3x7/3x7.c b/keyboards/omkbd/runner3680/3x7/3x7.c
similarity index 100%
rename from keyboards/runner3680/3x7/3x7.c
rename to keyboards/omkbd/runner3680/3x7/3x7.c
diff --git a/keyboards/runner3680/3x7/3x7.h b/keyboards/omkbd/runner3680/3x7/3x7.h
similarity index 100%
rename from keyboards/runner3680/3x7/3x7.h
rename to keyboards/omkbd/runner3680/3x7/3x7.h
diff --git a/keyboards/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h
similarity index 100%
rename from keyboards/runner3680/3x7/config.h
rename to keyboards/omkbd/runner3680/3x7/config.h
diff --git a/keyboards/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json
similarity index 100%
rename from keyboards/runner3680/3x7/info.json
rename to keyboards/omkbd/runner3680/3x7/info.json
diff --git a/keyboards/runner3680/3x7/keymaps/default/config.h b/keyboards/omkbd/runner3680/3x7/keymaps/default/config.h
similarity index 100%
rename from keyboards/runner3680/3x7/keymaps/default/config.h
rename to keyboards/omkbd/runner3680/3x7/keymaps/default/config.h
diff --git a/keyboards/runner3680/3x7/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/3x7/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/runner3680/3x7/keymaps/default/keymap.c
rename to keyboards/omkbd/runner3680/3x7/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/3x7/rules.mk b/keyboards/omkbd/runner3680/3x7/rules.mk
similarity index 100%
rename from keyboards/runner3680/3x7/rules.mk
rename to keyboards/omkbd/runner3680/3x7/rules.mk
diff --git a/keyboards/runner3680/3x8/.noci b/keyboards/omkbd/runner3680/3x8/.noci
similarity index 100%
rename from keyboards/runner3680/3x8/.noci
rename to keyboards/omkbd/runner3680/3x8/.noci
diff --git a/keyboards/runner3680/3x8/3x8.c b/keyboards/omkbd/runner3680/3x8/3x8.c
similarity index 100%
rename from keyboards/runner3680/3x8/3x8.c
rename to keyboards/omkbd/runner3680/3x8/3x8.c
diff --git a/keyboards/runner3680/3x8/3x8.h b/keyboards/omkbd/runner3680/3x8/3x8.h
similarity index 100%
rename from keyboards/runner3680/3x8/3x8.h
rename to keyboards/omkbd/runner3680/3x8/3x8.h
diff --git a/keyboards/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h
similarity index 100%
rename from keyboards/runner3680/3x8/config.h
rename to keyboards/omkbd/runner3680/3x8/config.h
diff --git a/keyboards/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json
similarity index 100%
rename from keyboards/runner3680/3x8/info.json
rename to keyboards/omkbd/runner3680/3x8/info.json
diff --git a/keyboards/runner3680/3x8/keymaps/default/config.h b/keyboards/omkbd/runner3680/3x8/keymaps/default/config.h
similarity index 100%
rename from keyboards/runner3680/3x8/keymaps/default/config.h
rename to keyboards/omkbd/runner3680/3x8/keymaps/default/config.h
diff --git a/keyboards/runner3680/3x8/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/3x8/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/runner3680/3x8/keymaps/default/keymap.c
rename to keyboards/omkbd/runner3680/3x8/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/3x8/rules.mk b/keyboards/omkbd/runner3680/3x8/rules.mk
similarity index 100%
rename from keyboards/runner3680/3x8/rules.mk
rename to keyboards/omkbd/runner3680/3x8/rules.mk
diff --git a/keyboards/runner3680/4x6/.noci b/keyboards/omkbd/runner3680/4x6/.noci
similarity index 100%
rename from keyboards/runner3680/4x6/.noci
rename to keyboards/omkbd/runner3680/4x6/.noci
diff --git a/keyboards/runner3680/4x6/4x6.c b/keyboards/omkbd/runner3680/4x6/4x6.c
similarity index 100%
rename from keyboards/runner3680/4x6/4x6.c
rename to keyboards/omkbd/runner3680/4x6/4x6.c
diff --git a/keyboards/runner3680/4x6/4x6.h b/keyboards/omkbd/runner3680/4x6/4x6.h
similarity index 100%
rename from keyboards/runner3680/4x6/4x6.h
rename to keyboards/omkbd/runner3680/4x6/4x6.h
diff --git a/keyboards/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h
similarity index 100%
rename from keyboards/runner3680/4x6/config.h
rename to keyboards/omkbd/runner3680/4x6/config.h
diff --git a/keyboards/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json
similarity index 100%
rename from keyboards/runner3680/4x6/info.json
rename to keyboards/omkbd/runner3680/4x6/info.json
diff --git a/keyboards/runner3680/4x6/keymaps/default/config.h b/keyboards/omkbd/runner3680/4x6/keymaps/default/config.h
similarity index 100%
rename from keyboards/runner3680/4x6/keymaps/default/config.h
rename to keyboards/omkbd/runner3680/4x6/keymaps/default/config.h
diff --git a/keyboards/runner3680/4x6/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/4x6/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/runner3680/4x6/keymaps/default/keymap.c
rename to keyboards/omkbd/runner3680/4x6/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/4x6/rules.mk b/keyboards/omkbd/runner3680/4x6/rules.mk
similarity index 100%
rename from keyboards/runner3680/4x6/rules.mk
rename to keyboards/omkbd/runner3680/4x6/rules.mk
diff --git a/keyboards/runner3680/4x7/.noci b/keyboards/omkbd/runner3680/4x7/.noci
similarity index 100%
rename from keyboards/runner3680/4x7/.noci
rename to keyboards/omkbd/runner3680/4x7/.noci
diff --git a/keyboards/runner3680/4x7/4x7.c b/keyboards/omkbd/runner3680/4x7/4x7.c
similarity index 100%
rename from keyboards/runner3680/4x7/4x7.c
rename to keyboards/omkbd/runner3680/4x7/4x7.c
diff --git a/keyboards/runner3680/4x7/4x7.h b/keyboards/omkbd/runner3680/4x7/4x7.h
similarity index 100%
rename from keyboards/runner3680/4x7/4x7.h
rename to keyboards/omkbd/runner3680/4x7/4x7.h
diff --git a/keyboards/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h
similarity index 100%
rename from keyboards/runner3680/4x7/config.h
rename to keyboards/omkbd/runner3680/4x7/config.h
diff --git a/keyboards/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json
similarity index 100%
rename from keyboards/runner3680/4x7/info.json
rename to keyboards/omkbd/runner3680/4x7/info.json
diff --git a/keyboards/runner3680/4x7/keymaps/default/config.h b/keyboards/omkbd/runner3680/4x7/keymaps/default/config.h
similarity index 100%
rename from keyboards/runner3680/4x7/keymaps/default/config.h
rename to keyboards/omkbd/runner3680/4x7/keymaps/default/config.h
diff --git a/keyboards/runner3680/4x7/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/4x7/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/runner3680/4x7/keymaps/default/keymap.c
rename to keyboards/omkbd/runner3680/4x7/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/4x7/rules.mk b/keyboards/omkbd/runner3680/4x7/rules.mk
similarity index 100%
rename from keyboards/runner3680/4x7/rules.mk
rename to keyboards/omkbd/runner3680/4x7/rules.mk
diff --git a/keyboards/runner3680/4x8/.noci b/keyboards/omkbd/runner3680/4x8/.noci
similarity index 100%
rename from keyboards/runner3680/4x8/.noci
rename to keyboards/omkbd/runner3680/4x8/.noci
diff --git a/keyboards/runner3680/4x8/4x8.c b/keyboards/omkbd/runner3680/4x8/4x8.c
similarity index 100%
rename from keyboards/runner3680/4x8/4x8.c
rename to keyboards/omkbd/runner3680/4x8/4x8.c
diff --git a/keyboards/runner3680/4x8/4x8.h b/keyboards/omkbd/runner3680/4x8/4x8.h
similarity index 100%
rename from keyboards/runner3680/4x8/4x8.h
rename to keyboards/omkbd/runner3680/4x8/4x8.h
diff --git a/keyboards/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h
similarity index 100%
rename from keyboards/runner3680/4x8/config.h
rename to keyboards/omkbd/runner3680/4x8/config.h
diff --git a/keyboards/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json
similarity index 100%
rename from keyboards/runner3680/4x8/info.json
rename to keyboards/omkbd/runner3680/4x8/info.json
diff --git a/keyboards/runner3680/4x8/keymaps/default/config.h b/keyboards/omkbd/runner3680/4x8/keymaps/default/config.h
similarity index 100%
rename from keyboards/runner3680/4x8/keymaps/default/config.h
rename to keyboards/omkbd/runner3680/4x8/keymaps/default/config.h
diff --git a/keyboards/runner3680/4x8/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/4x8/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/runner3680/4x8/keymaps/default/keymap.c
rename to keyboards/omkbd/runner3680/4x8/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/4x8/rules.mk b/keyboards/omkbd/runner3680/4x8/rules.mk
similarity index 100%
rename from keyboards/runner3680/4x8/rules.mk
rename to keyboards/omkbd/runner3680/4x8/rules.mk
diff --git a/keyboards/runner3680/5x6/.noci b/keyboards/omkbd/runner3680/5x6/.noci
similarity index 100%
rename from keyboards/runner3680/5x6/.noci
rename to keyboards/omkbd/runner3680/5x6/.noci
diff --git a/keyboards/runner3680/5x6/5x6.c b/keyboards/omkbd/runner3680/5x6/5x6.c
similarity index 100%
rename from keyboards/runner3680/5x6/5x6.c
rename to keyboards/omkbd/runner3680/5x6/5x6.c
diff --git a/keyboards/runner3680/5x6/5x6.h b/keyboards/omkbd/runner3680/5x6/5x6.h
similarity index 100%
rename from keyboards/runner3680/5x6/5x6.h
rename to keyboards/omkbd/runner3680/5x6/5x6.h
diff --git a/keyboards/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h
similarity index 100%
rename from keyboards/runner3680/5x6/config.h
rename to keyboards/omkbd/runner3680/5x6/config.h
diff --git a/keyboards/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json
similarity index 100%
rename from keyboards/runner3680/5x6/info.json
rename to keyboards/omkbd/runner3680/5x6/info.json
diff --git a/keyboards/runner3680/5x6/keymaps/default/config.h b/keyboards/omkbd/runner3680/5x6/keymaps/default/config.h
similarity index 100%
rename from keyboards/runner3680/5x6/keymaps/default/config.h
rename to keyboards/omkbd/runner3680/5x6/keymaps/default/config.h
diff --git a/keyboards/runner3680/5x6/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/5x6/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/runner3680/5x6/keymaps/default/keymap.c
rename to keyboards/omkbd/runner3680/5x6/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/5x6/rules.mk b/keyboards/omkbd/runner3680/5x6/rules.mk
similarity index 100%
rename from keyboards/runner3680/5x6/rules.mk
rename to keyboards/omkbd/runner3680/5x6/rules.mk
diff --git a/keyboards/runner3680/5x6_5x8/.noci b/keyboards/omkbd/runner3680/5x6_5x8/.noci
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/.noci
rename to keyboards/omkbd/runner3680/5x6_5x8/.noci
diff --git a/keyboards/runner3680/5x6_5x8/5x6_5x8.c b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/5x6_5x8.c
rename to keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c
diff --git a/keyboards/runner3680/5x6_5x8/5x6_5x8.h b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/5x6_5x8.h
rename to keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h
diff --git a/keyboards/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/config.h
rename to keyboards/omkbd/runner3680/5x6_5x8/config.h
diff --git a/keyboards/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/info.json
rename to keyboards/omkbd/runner3680/5x6_5x8/info.json
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/default/config.h b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/default/config.h
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/keymaps/default/config.h
rename to keyboards/omkbd/runner3680/5x6_5x8/keymaps/default/config.h
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/keymaps/default/keymap.c
rename to keyboards/omkbd/runner3680/5x6_5x8/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/derekhsu/config.h b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/config.h
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/keymaps/derekhsu/config.h
rename to keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/config.h
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
rename to keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/keymap.c
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk
rename to keyboards/omkbd/runner3680/5x6_5x8/keymaps/derekhsu/rules.mk
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/jis/config.h b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/config.h
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/keymaps/jis/config.h
rename to keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/config.h
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/jis/keymap.c b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/keymap.c
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/keymaps/jis/keymap.c
rename to keyboards/omkbd/runner3680/5x6_5x8/keymaps/jis/keymap.c
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/via/config.h b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/via/config.h
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/keymaps/via/config.h
rename to keyboards/omkbd/runner3680/5x6_5x8/keymaps/via/config.h
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/via/keymap.c b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/keymaps/via/keymap.c
rename to keyboards/omkbd/runner3680/5x6_5x8/keymaps/via/keymap.c
diff --git a/keyboards/runner3680/5x6_5x8/keymaps/via/rules.mk b/keyboards/omkbd/runner3680/5x6_5x8/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/keymaps/via/rules.mk
rename to keyboards/omkbd/runner3680/5x6_5x8/keymaps/via/rules.mk
diff --git a/keyboards/runner3680/5x6_5x8/rules.mk b/keyboards/omkbd/runner3680/5x6_5x8/rules.mk
similarity index 100%
rename from keyboards/runner3680/5x6_5x8/rules.mk
rename to keyboards/omkbd/runner3680/5x6_5x8/rules.mk
diff --git a/keyboards/runner3680/5x7/.noci b/keyboards/omkbd/runner3680/5x7/.noci
similarity index 100%
rename from keyboards/runner3680/5x7/.noci
rename to keyboards/omkbd/runner3680/5x7/.noci
diff --git a/keyboards/runner3680/5x7/5x7.c b/keyboards/omkbd/runner3680/5x7/5x7.c
similarity index 100%
rename from keyboards/runner3680/5x7/5x7.c
rename to keyboards/omkbd/runner3680/5x7/5x7.c
diff --git a/keyboards/runner3680/5x7/5x7.h b/keyboards/omkbd/runner3680/5x7/5x7.h
similarity index 100%
rename from keyboards/runner3680/5x7/5x7.h
rename to keyboards/omkbd/runner3680/5x7/5x7.h
diff --git a/keyboards/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h
similarity index 100%
rename from keyboards/runner3680/5x7/config.h
rename to keyboards/omkbd/runner3680/5x7/config.h
diff --git a/keyboards/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json
similarity index 100%
rename from keyboards/runner3680/5x7/info.json
rename to keyboards/omkbd/runner3680/5x7/info.json
diff --git a/keyboards/runner3680/5x7/keymaps/default/config.h b/keyboards/omkbd/runner3680/5x7/keymaps/default/config.h
similarity index 100%
rename from keyboards/runner3680/5x7/keymaps/default/config.h
rename to keyboards/omkbd/runner3680/5x7/keymaps/default/config.h
diff --git a/keyboards/runner3680/5x7/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/5x7/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/runner3680/5x7/keymaps/default/keymap.c
rename to keyboards/omkbd/runner3680/5x7/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/5x7/rules.mk b/keyboards/omkbd/runner3680/5x7/rules.mk
similarity index 100%
rename from keyboards/runner3680/5x7/rules.mk
rename to keyboards/omkbd/runner3680/5x7/rules.mk
diff --git a/keyboards/runner3680/5x8/.noci b/keyboards/omkbd/runner3680/5x8/.noci
similarity index 100%
rename from keyboards/runner3680/5x8/.noci
rename to keyboards/omkbd/runner3680/5x8/.noci
diff --git a/keyboards/runner3680/5x8/5x8.c b/keyboards/omkbd/runner3680/5x8/5x8.c
similarity index 100%
rename from keyboards/runner3680/5x8/5x8.c
rename to keyboards/omkbd/runner3680/5x8/5x8.c
diff --git a/keyboards/runner3680/5x8/5x8.h b/keyboards/omkbd/runner3680/5x8/5x8.h
similarity index 100%
rename from keyboards/runner3680/5x8/5x8.h
rename to keyboards/omkbd/runner3680/5x8/5x8.h
diff --git a/keyboards/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h
similarity index 100%
rename from keyboards/runner3680/5x8/config.h
rename to keyboards/omkbd/runner3680/5x8/config.h
diff --git a/keyboards/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json
similarity index 100%
rename from keyboards/runner3680/5x8/info.json
rename to keyboards/omkbd/runner3680/5x8/info.json
diff --git a/keyboards/runner3680/5x8/keymaps/JIS/config.h b/keyboards/omkbd/runner3680/5x8/keymaps/JIS/config.h
similarity index 100%
rename from keyboards/runner3680/5x8/keymaps/JIS/config.h
rename to keyboards/omkbd/runner3680/5x8/keymaps/JIS/config.h
diff --git a/keyboards/runner3680/5x8/keymaps/JIS/keymap.c b/keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c
similarity index 100%
rename from keyboards/runner3680/5x8/keymaps/JIS/keymap.c
rename to keyboards/omkbd/runner3680/5x8/keymaps/JIS/keymap.c
diff --git a/keyboards/runner3680/5x8/keymaps/default/config.h b/keyboards/omkbd/runner3680/5x8/keymaps/default/config.h
similarity index 100%
rename from keyboards/runner3680/5x8/keymaps/default/config.h
rename to keyboards/omkbd/runner3680/5x8/keymaps/default/config.h
diff --git a/keyboards/runner3680/5x8/keymaps/default/keymap.c b/keyboards/omkbd/runner3680/5x8/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/runner3680/5x8/keymaps/default/keymap.c
rename to keyboards/omkbd/runner3680/5x8/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/5x8/rules.mk b/keyboards/omkbd/runner3680/5x8/rules.mk
similarity index 100%
rename from keyboards/runner3680/5x8/rules.mk
rename to keyboards/omkbd/runner3680/5x8/rules.mk
diff --git a/keyboards/runner3680/config.h b/keyboards/omkbd/runner3680/config.h
similarity index 100%
rename from keyboards/runner3680/config.h
rename to keyboards/omkbd/runner3680/config.h
diff --git a/keyboards/runner3680/readme.md b/keyboards/omkbd/runner3680/readme.md
similarity index 95%
rename from keyboards/runner3680/readme.md
rename to keyboards/omkbd/runner3680/readme.md
index b32ead412b..9dd15495a9 100644
--- a/keyboards/runner3680/readme.md
+++ b/keyboards/omkbd/runner3680/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: Order your own [yourself](https://github.com/omkbd/Runner
 
 Make example for this keyboard (after setting up your build environment):
 
-    make runner3680/5x8:default
+    make omkbd/runner3680/5x8: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).
diff --git a/keyboards/runner3680/rules.mk b/keyboards/omkbd/runner3680/rules.mk
similarity index 94%
rename from keyboards/runner3680/rules.mk
rename to keyboards/omkbd/runner3680/rules.mk
index 2d0ea406eb..1be171295d 100644
--- a/keyboards/runner3680/rules.mk
+++ b/keyboards/omkbd/runner3680/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes       # Enables split keyboard support
 
-DEFAULT_FOLDER = runner3680/5x8
+DEFAULT_FOLDER = omkbd/runner3680/5x8
diff --git a/keyboards/runner3680/runner3680.c b/keyboards/omkbd/runner3680/runner3680.c
similarity index 100%
rename from keyboards/runner3680/runner3680.c
rename to keyboards/omkbd/runner3680/runner3680.c
diff --git a/keyboards/omkbd/runner3680/runner3680.h b/keyboards/omkbd/runner3680/runner3680.h
new file mode 100644
index 0000000000..59afecfcfa
--- /dev/null
+++ b/keyboards/omkbd/runner3680/runner3680.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "quantum.h"
+
+#ifdef KEYBOARD_omkbd_runner3680_5x8
+  #include "5x8.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_5x7
+  #include "5x7.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_5x6
+  #include "5x6.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_5x6_5x8
+  #include "5x6_5x8.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_4x8
+  #include "4x8.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_4x7
+  #include "4x7.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_4x6
+  #include "4x6.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_3x8
+  #include "3x8.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_3x7
+  #include "3x7.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_3x6
+  #include "3x6.h"
+#endif
diff --git a/keyboards/runner3680/runner3680.h b/keyboards/runner3680/runner3680.h
deleted file mode 100644
index 39a498e90a..0000000000
--- a/keyboards/runner3680/runner3680.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_runner3680_5x8
-  #include "5x8.h"
-#endif
-
-#ifdef KEYBOARD_runner3680_5x7
-  #include "5x7.h"
-#endif
-
-#ifdef KEYBOARD_runner3680_5x6
-  #include "5x6.h"
-#endif
-
-#ifdef KEYBOARD_runner3680_5x6_5x8
-  #include "5x6_5x8.h"
-#endif
-
-#ifdef KEYBOARD_runner3680_4x8
-  #include "4x8.h"
-#endif
-
-#ifdef KEYBOARD_runner3680_4x7
-  #include "4x7.h"
-#endif
-
-#ifdef KEYBOARD_runner3680_4x6
-  #include "4x6.h"
-#endif
-
-#ifdef KEYBOARD_runner3680_3x8
-  #include "3x8.h"
-#endif
-
-#ifdef KEYBOARD_runner3680_3x7
-  #include "3x7.h"
-#endif
-
-#ifdef KEYBOARD_runner3680_3x6
-  #include "3x6.h"
-#endif

From 1477440ba0e57347a4b8be0f137f7ced373b3325 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 10:12:39 +0800
Subject: [PATCH 470/867] [Keyboard] move niu_mini to /kbdfans (#16112)

---
 keyboards/{ => kbdfans}/niu_mini/config.h                     | 0
 keyboards/{ => kbdfans}/niu_mini/info.json                    | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/abhixec/keymap.c     | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/abhixec/readme.md    | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/abhixec/rules.mk     | 0
 .../{ => kbdfans}/niu_mini/keymaps/codecoffeecode/keymap.c    | 0
 .../{ => kbdfans}/niu_mini/keymaps/codecoffeecode/readme.md   | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/default/keymap.c     | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/default/readme.md    | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/dyesub/keymap.c      | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/dyesub/readme.md     | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/dyesub/rules.mk      | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/edvard/keymap.c      | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/edvard/readme.md     | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/framtava/config.h    | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/framtava/keymap.c    | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/framtava/readme.md   | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/framtava/rules.mk    | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/mason/keymap.c       | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/nosarthur/README.md  | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/nosarthur/keymap.c   | 0
 .../niu_mini/keymaps/nosarthur/keymap_colemak_dh.json         | 0
 .../niu_mini/keymaps/nosarthur/keymap_qwerty.json             | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/nosarthur/rules.mk   | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/planck/config.h      | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/planck/keymap.c      | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/planck/readme.md     | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/planck/rules.mk      | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/tobias/config.h      | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/tobias/keymap.c      | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/tobias/readme.md     | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/tobias/rules.mk      | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/tucznak/config.h     | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/tucznak/keymap.c     | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/tucznak/readme.md    | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/tucznak/rules.mk     | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/via/keymap.c         | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/via/rules.mk         | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/xtonhasvim/config.h  | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/xtonhasvim/keymap.c  | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/xtonhasvim/readme.md | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/xtonhasvim/rules.mk  | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/yttyx/README.md      | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/yttyx/config.h       | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/yttyx/keymap.c       | 0
 keyboards/{ => kbdfans}/niu_mini/keymaps/yttyx/rules.mk       | 0
 keyboards/{ => kbdfans}/niu_mini/niu_mini.c                   | 0
 keyboards/{ => kbdfans}/niu_mini/niu_mini.h                   | 0
 keyboards/{ => kbdfans}/niu_mini/readme.md                    | 4 ++--
 keyboards/{ => kbdfans}/niu_mini/rules.mk                     | 0
 50 files changed, 2 insertions(+), 2 deletions(-)
 rename keyboards/{ => kbdfans}/niu_mini/config.h (100%)
 rename keyboards/{ => kbdfans}/niu_mini/info.json (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/abhixec/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/abhixec/readme.md (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/abhixec/rules.mk (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/codecoffeecode/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/codecoffeecode/readme.md (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/default/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/default/readme.md (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/dyesub/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/dyesub/readme.md (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/dyesub/rules.mk (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/edvard/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/edvard/readme.md (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/framtava/config.h (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/framtava/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/framtava/readme.md (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/framtava/rules.mk (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/mason/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/nosarthur/README.md (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/nosarthur/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/nosarthur/keymap_colemak_dh.json (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/nosarthur/keymap_qwerty.json (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/nosarthur/rules.mk (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/planck/config.h (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/planck/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/planck/readme.md (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/planck/rules.mk (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/tobias/config.h (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/tobias/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/tobias/readme.md (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/tobias/rules.mk (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/tucznak/config.h (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/tucznak/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/tucznak/readme.md (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/tucznak/rules.mk (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/via/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/via/rules.mk (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/xtonhasvim/config.h (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/xtonhasvim/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/xtonhasvim/readme.md (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/xtonhasvim/rules.mk (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/yttyx/README.md (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/yttyx/config.h (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/yttyx/keymap.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/keymaps/yttyx/rules.mk (100%)
 rename keyboards/{ => kbdfans}/niu_mini/niu_mini.c (100%)
 rename keyboards/{ => kbdfans}/niu_mini/niu_mini.h (100%)
 rename keyboards/{ => kbdfans}/niu_mini/readme.md (91%)
 rename keyboards/{ => kbdfans}/niu_mini/rules.mk (100%)

diff --git a/keyboards/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h
similarity index 100%
rename from keyboards/niu_mini/config.h
rename to keyboards/kbdfans/niu_mini/config.h
diff --git a/keyboards/niu_mini/info.json b/keyboards/kbdfans/niu_mini/info.json
similarity index 100%
rename from keyboards/niu_mini/info.json
rename to keyboards/kbdfans/niu_mini/info.json
diff --git a/keyboards/niu_mini/keymaps/abhixec/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/abhixec/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/abhixec/keymap.c
diff --git a/keyboards/niu_mini/keymaps/abhixec/readme.md b/keyboards/kbdfans/niu_mini/keymaps/abhixec/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/abhixec/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/abhixec/readme.md
diff --git a/keyboards/niu_mini/keymaps/abhixec/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/abhixec/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/abhixec/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/abhixec/rules.mk
diff --git a/keyboards/niu_mini/keymaps/codecoffeecode/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/codecoffeecode/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/keymap.c
diff --git a/keyboards/niu_mini/keymaps/codecoffeecode/readme.md b/keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/codecoffeecode/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/codecoffeecode/readme.md
diff --git a/keyboards/niu_mini/keymaps/default/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/default/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/default/keymap.c
diff --git a/keyboards/niu_mini/keymaps/default/readme.md b/keyboards/kbdfans/niu_mini/keymaps/default/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/default/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/default/readme.md
diff --git a/keyboards/niu_mini/keymaps/dyesub/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/dyesub/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/dyesub/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/dyesub/keymap.c
diff --git a/keyboards/niu_mini/keymaps/dyesub/readme.md b/keyboards/kbdfans/niu_mini/keymaps/dyesub/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/dyesub/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/dyesub/readme.md
diff --git a/keyboards/niu_mini/keymaps/dyesub/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/dyesub/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/dyesub/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/dyesub/rules.mk
diff --git a/keyboards/niu_mini/keymaps/edvard/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/edvard/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/edvard/keymap.c
diff --git a/keyboards/niu_mini/keymaps/edvard/readme.md b/keyboards/kbdfans/niu_mini/keymaps/edvard/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/edvard/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/edvard/readme.md
diff --git a/keyboards/niu_mini/keymaps/framtava/config.h b/keyboards/kbdfans/niu_mini/keymaps/framtava/config.h
similarity index 100%
rename from keyboards/niu_mini/keymaps/framtava/config.h
rename to keyboards/kbdfans/niu_mini/keymaps/framtava/config.h
diff --git a/keyboards/niu_mini/keymaps/framtava/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/framtava/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/framtava/keymap.c
diff --git a/keyboards/niu_mini/keymaps/framtava/readme.md b/keyboards/kbdfans/niu_mini/keymaps/framtava/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/framtava/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/framtava/readme.md
diff --git a/keyboards/niu_mini/keymaps/framtava/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/framtava/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/framtava/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/framtava/rules.mk
diff --git a/keyboards/niu_mini/keymaps/mason/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/mason/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/mason/keymap.c
diff --git a/keyboards/niu_mini/keymaps/nosarthur/README.md b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/README.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/nosarthur/README.md
rename to keyboards/kbdfans/niu_mini/keymaps/nosarthur/README.md
diff --git a/keyboards/niu_mini/keymaps/nosarthur/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/nosarthur/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap.c
diff --git a/keyboards/niu_mini/keymaps/nosarthur/keymap_colemak_dh.json b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_colemak_dh.json
similarity index 100%
rename from keyboards/niu_mini/keymaps/nosarthur/keymap_colemak_dh.json
rename to keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_colemak_dh.json
diff --git a/keyboards/niu_mini/keymaps/nosarthur/keymap_qwerty.json b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_qwerty.json
similarity index 100%
rename from keyboards/niu_mini/keymaps/nosarthur/keymap_qwerty.json
rename to keyboards/kbdfans/niu_mini/keymaps/nosarthur/keymap_qwerty.json
diff --git a/keyboards/niu_mini/keymaps/nosarthur/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/nosarthur/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/nosarthur/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/nosarthur/rules.mk
diff --git a/keyboards/niu_mini/keymaps/planck/config.h b/keyboards/kbdfans/niu_mini/keymaps/planck/config.h
similarity index 100%
rename from keyboards/niu_mini/keymaps/planck/config.h
rename to keyboards/kbdfans/niu_mini/keymaps/planck/config.h
diff --git a/keyboards/niu_mini/keymaps/planck/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/planck/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/planck/keymap.c
diff --git a/keyboards/niu_mini/keymaps/planck/readme.md b/keyboards/kbdfans/niu_mini/keymaps/planck/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/planck/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/planck/readme.md
diff --git a/keyboards/niu_mini/keymaps/planck/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/planck/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/planck/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/planck/rules.mk
diff --git a/keyboards/niu_mini/keymaps/tobias/config.h b/keyboards/kbdfans/niu_mini/keymaps/tobias/config.h
similarity index 100%
rename from keyboards/niu_mini/keymaps/tobias/config.h
rename to keyboards/kbdfans/niu_mini/keymaps/tobias/config.h
diff --git a/keyboards/niu_mini/keymaps/tobias/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/tobias/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/tobias/keymap.c
diff --git a/keyboards/niu_mini/keymaps/tobias/readme.md b/keyboards/kbdfans/niu_mini/keymaps/tobias/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/tobias/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/tobias/readme.md
diff --git a/keyboards/niu_mini/keymaps/tobias/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/tobias/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/tobias/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/tobias/rules.mk
diff --git a/keyboards/niu_mini/keymaps/tucznak/config.h b/keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
similarity index 100%
rename from keyboards/niu_mini/keymaps/tucznak/config.h
rename to keyboards/kbdfans/niu_mini/keymaps/tucznak/config.h
diff --git a/keyboards/niu_mini/keymaps/tucznak/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/tucznak/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/tucznak/keymap.c
diff --git a/keyboards/niu_mini/keymaps/tucznak/readme.md b/keyboards/kbdfans/niu_mini/keymaps/tucznak/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/tucznak/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/tucznak/readme.md
diff --git a/keyboards/niu_mini/keymaps/tucznak/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/tucznak/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/tucznak/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/tucznak/rules.mk
diff --git a/keyboards/niu_mini/keymaps/via/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/via/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/via/keymap.c
diff --git a/keyboards/niu_mini/keymaps/via/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/via/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/via/rules.mk
diff --git a/keyboards/niu_mini/keymaps/xtonhasvim/config.h b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/config.h
similarity index 100%
rename from keyboards/niu_mini/keymaps/xtonhasvim/config.h
rename to keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/config.h
diff --git a/keyboards/niu_mini/keymaps/xtonhasvim/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/xtonhasvim/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/keymap.c
diff --git a/keyboards/niu_mini/keymaps/xtonhasvim/readme.md b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/readme.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/xtonhasvim/readme.md
rename to keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/readme.md
diff --git a/keyboards/niu_mini/keymaps/xtonhasvim/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/xtonhasvim/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/xtonhasvim/rules.mk
diff --git a/keyboards/niu_mini/keymaps/yttyx/README.md b/keyboards/kbdfans/niu_mini/keymaps/yttyx/README.md
similarity index 100%
rename from keyboards/niu_mini/keymaps/yttyx/README.md
rename to keyboards/kbdfans/niu_mini/keymaps/yttyx/README.md
diff --git a/keyboards/niu_mini/keymaps/yttyx/config.h b/keyboards/kbdfans/niu_mini/keymaps/yttyx/config.h
similarity index 100%
rename from keyboards/niu_mini/keymaps/yttyx/config.h
rename to keyboards/kbdfans/niu_mini/keymaps/yttyx/config.h
diff --git a/keyboards/niu_mini/keymaps/yttyx/keymap.c b/keyboards/kbdfans/niu_mini/keymaps/yttyx/keymap.c
similarity index 100%
rename from keyboards/niu_mini/keymaps/yttyx/keymap.c
rename to keyboards/kbdfans/niu_mini/keymaps/yttyx/keymap.c
diff --git a/keyboards/niu_mini/keymaps/yttyx/rules.mk b/keyboards/kbdfans/niu_mini/keymaps/yttyx/rules.mk
similarity index 100%
rename from keyboards/niu_mini/keymaps/yttyx/rules.mk
rename to keyboards/kbdfans/niu_mini/keymaps/yttyx/rules.mk
diff --git a/keyboards/niu_mini/niu_mini.c b/keyboards/kbdfans/niu_mini/niu_mini.c
similarity index 100%
rename from keyboards/niu_mini/niu_mini.c
rename to keyboards/kbdfans/niu_mini/niu_mini.c
diff --git a/keyboards/niu_mini/niu_mini.h b/keyboards/kbdfans/niu_mini/niu_mini.h
similarity index 100%
rename from keyboards/niu_mini/niu_mini.h
rename to keyboards/kbdfans/niu_mini/niu_mini.h
diff --git a/keyboards/niu_mini/readme.md b/keyboards/kbdfans/niu_mini/readme.md
similarity index 91%
rename from keyboards/niu_mini/readme.md
rename to keyboards/kbdfans/niu_mini/readme.md
index f4863d8549..1a91ece94b 100644
--- a/keyboards/niu_mini/readme.md
+++ b/keyboards/kbdfans/niu_mini/readme.md
@@ -10,10 +10,10 @@ Hardware Availability: [KBDFans](https://kbdfans.myshopify.com/products/niu-mini
 
 Make example for this keyboard (after setting up your build environment):
 
-    make niu_mini:default
+    make kbdfans/niu_mini:default
 
 Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):
 
-    make niu_mini:default:flash
+    make kbdfans/niu_mini:default:flash
 
 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).
diff --git a/keyboards/niu_mini/rules.mk b/keyboards/kbdfans/niu_mini/rules.mk
similarity index 100%
rename from keyboards/niu_mini/rules.mk
rename to keyboards/kbdfans/niu_mini/rules.mk

From b8deac707e7ed8f278a53dfba93dae0730ea4b77 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 10:12:57 +0800
Subject: [PATCH 471/867] [Keyboard] move @tominabox1 's keebs into /tominabox1
 (#16109)

---
 keyboards/{ => tominabox1}/adalyn/adalyn.c                    | 0
 keyboards/{ => tominabox1}/adalyn/adalyn.h                    | 0
 keyboards/{ => tominabox1}/adalyn/config.h                    | 0
 keyboards/{ => tominabox1}/adalyn/info.json                   | 0
 keyboards/{ => tominabox1}/adalyn/keymaps/default/config.h    | 0
 keyboards/{ => tominabox1}/adalyn/keymaps/default/keymap.c    | 0
 keyboards/{ => tominabox1}/adalyn/keymaps/default/readme.md   | 0
 keyboards/{ => tominabox1}/adalyn/keymaps/default/rules.mk    | 0
 keyboards/{ => tominabox1}/adalyn/readme.md                   | 4 ++--
 keyboards/{ => tominabox1}/adalyn/rules.mk                    | 0
 keyboards/{ => tominabox1}/le_chiffre/config.h                | 0
 keyboards/{ => tominabox1}/le_chiffre/info.json               | 0
 .../{ => tominabox1}/le_chiffre/keymaps/default/config.h      | 0
 .../{ => tominabox1}/le_chiffre/keymaps/default/keymap.c      | 0
 .../{ => tominabox1}/le_chiffre/keymaps/default/readme.md     | 0
 .../{ => tominabox1}/le_chiffre/keymaps/default/rules.mk      | 0
 keyboards/{ => tominabox1}/le_chiffre/keymaps/via/keymap.c    | 0
 keyboards/{ => tominabox1}/le_chiffre/keymaps/via/rules.mk    | 0
 keyboards/{ => tominabox1}/le_chiffre/le_chiffre.c            | 0
 keyboards/{ => tominabox1}/le_chiffre/le_chiffre.h            | 0
 keyboards/{ => tominabox1}/le_chiffre/readme.md               | 2 +-
 keyboards/{ => tominabox1}/le_chiffre/rules.mk                | 0
 keyboards/{ => tominabox1}/qaz/config.h                       | 0
 keyboards/{ => tominabox1}/qaz/info.json                      | 0
 keyboards/{ => tominabox1}/qaz/keymaps/default/config.h       | 0
 keyboards/{ => tominabox1}/qaz/keymaps/default/keymap.c       | 0
 keyboards/{ => tominabox1}/qaz/keymaps/default/readme.md      | 0
 keyboards/{ => tominabox1}/qaz/keymaps/default/rules.mk       | 0
 .../{ => tominabox1}/qaz/keymaps/default_big_space/config.h   | 0
 .../{ => tominabox1}/qaz/keymaps/default_big_space/keymap.c   | 0
 .../{ => tominabox1}/qaz/keymaps/default_big_space/readme.md  | 0
 .../{ => tominabox1}/qaz/keymaps/default_big_space/rules.mk   | 0
 keyboards/{ => tominabox1}/qaz/keymaps/via/keymap.c           | 0
 keyboards/{ => tominabox1}/qaz/keymaps/via/rules.mk           | 0
 keyboards/{ => tominabox1}/qaz/qaz.c                          | 0
 keyboards/{ => tominabox1}/qaz/qaz.h                          | 0
 keyboards/{ => tominabox1}/qaz/readme.md                      | 2 +-
 keyboards/{ => tominabox1}/qaz/rules.mk                       | 0
 keyboards/{ => tominabox1}/underscore33/.noci                 | 0
 keyboards/{ => tominabox1}/underscore33/readme.md             | 4 ++--
 keyboards/{ => tominabox1}/underscore33/rev1/.noci            | 0
 keyboards/{ => tominabox1}/underscore33/rev1/config.h         | 0
 keyboards/{ => tominabox1}/underscore33/rev1/info.json        | 0
 .../underscore33/rev1/keymaps/default/config.h                | 0
 .../underscore33/rev1/keymaps/default/keymap.c                | 0
 .../underscore33/rev1/keymaps/default/readme.md               | 0
 .../underscore33/rev1/keymaps/default/rules.mk                | 0
 .../underscore33/rev1/keymaps/default_big_space/config.h      | 0
 .../underscore33/rev1/keymaps/default_big_space/keymap.c      | 0
 .../underscore33/rev1/keymaps/default_big_space/readme.md     | 0
 .../underscore33/rev1/keymaps/default_big_space/rules.mk      | 0
 .../{ => tominabox1}/underscore33/rev1/keymaps/via/keymap.c   | 0
 .../{ => tominabox1}/underscore33/rev1/keymaps/via/readme.md  | 0
 .../{ => tominabox1}/underscore33/rev1/keymaps/via/rules.mk   | 0
 keyboards/{ => tominabox1}/underscore33/rev1/rev1.c           | 0
 keyboards/{ => tominabox1}/underscore33/rev1/rev1.h           | 0
 keyboards/{ => tominabox1}/underscore33/rev1/rules.mk         | 0
 keyboards/{ => tominabox1}/underscore33/rev2/config.h         | 0
 keyboards/{ => tominabox1}/underscore33/rev2/info.json        | 0
 .../underscore33/rev2/keymaps/default/config.h                | 0
 .../underscore33/rev2/keymaps/default/keymap.c                | 0
 .../underscore33/rev2/keymaps/default/readme.md               | 0
 .../underscore33/rev2/keymaps/default/rules.mk                | 0
 .../underscore33/rev2/keymaps/default_big_space/config.h      | 0
 .../underscore33/rev2/keymaps/default_big_space/keymap.c      | 0
 .../underscore33/rev2/keymaps/default_big_space/readme.md     | 0
 .../underscore33/rev2/keymaps/default_big_space/rules.mk      | 0
 .../{ => tominabox1}/underscore33/rev2/keymaps/via/keymap.c   | 0
 .../{ => tominabox1}/underscore33/rev2/keymaps/via/readme.md  | 0
 .../{ => tominabox1}/underscore33/rev2/keymaps/via/rules.mk   | 0
 keyboards/{ => tominabox1}/underscore33/rev2/rev2.c           | 0
 keyboards/{ => tominabox1}/underscore33/rev2/rev2.h           | 0
 keyboards/{ => tominabox1}/underscore33/rev2/rules.mk         | 0
 keyboards/tominabox1/underscore33/rules.mk                    | 1 +
 keyboards/underscore33/rules.mk                               | 1 -
 75 files changed, 7 insertions(+), 7 deletions(-)
 rename keyboards/{ => tominabox1}/adalyn/adalyn.c (100%)
 rename keyboards/{ => tominabox1}/adalyn/adalyn.h (100%)
 rename keyboards/{ => tominabox1}/adalyn/config.h (100%)
 rename keyboards/{ => tominabox1}/adalyn/info.json (100%)
 rename keyboards/{ => tominabox1}/adalyn/keymaps/default/config.h (100%)
 rename keyboards/{ => tominabox1}/adalyn/keymaps/default/keymap.c (100%)
 rename keyboards/{ => tominabox1}/adalyn/keymaps/default/readme.md (100%)
 rename keyboards/{ => tominabox1}/adalyn/keymaps/default/rules.mk (100%)
 rename keyboards/{ => tominabox1}/adalyn/readme.md (93%)
 rename keyboards/{ => tominabox1}/adalyn/rules.mk (100%)
 rename keyboards/{ => tominabox1}/le_chiffre/config.h (100%)
 rename keyboards/{ => tominabox1}/le_chiffre/info.json (100%)
 rename keyboards/{ => tominabox1}/le_chiffre/keymaps/default/config.h (100%)
 rename keyboards/{ => tominabox1}/le_chiffre/keymaps/default/keymap.c (100%)
 rename keyboards/{ => tominabox1}/le_chiffre/keymaps/default/readme.md (100%)
 rename keyboards/{ => tominabox1}/le_chiffre/keymaps/default/rules.mk (100%)
 rename keyboards/{ => tominabox1}/le_chiffre/keymaps/via/keymap.c (100%)
 rename keyboards/{ => tominabox1}/le_chiffre/keymaps/via/rules.mk (100%)
 rename keyboards/{ => tominabox1}/le_chiffre/le_chiffre.c (100%)
 rename keyboards/{ => tominabox1}/le_chiffre/le_chiffre.h (100%)
 rename keyboards/{ => tominabox1}/le_chiffre/readme.md (96%)
 rename keyboards/{ => tominabox1}/le_chiffre/rules.mk (100%)
 rename keyboards/{ => tominabox1}/qaz/config.h (100%)
 rename keyboards/{ => tominabox1}/qaz/info.json (100%)
 rename keyboards/{ => tominabox1}/qaz/keymaps/default/config.h (100%)
 rename keyboards/{ => tominabox1}/qaz/keymaps/default/keymap.c (100%)
 rename keyboards/{ => tominabox1}/qaz/keymaps/default/readme.md (100%)
 rename keyboards/{ => tominabox1}/qaz/keymaps/default/rules.mk (100%)
 rename keyboards/{ => tominabox1}/qaz/keymaps/default_big_space/config.h (100%)
 rename keyboards/{ => tominabox1}/qaz/keymaps/default_big_space/keymap.c (100%)
 rename keyboards/{ => tominabox1}/qaz/keymaps/default_big_space/readme.md (100%)
 rename keyboards/{ => tominabox1}/qaz/keymaps/default_big_space/rules.mk (100%)
 rename keyboards/{ => tominabox1}/qaz/keymaps/via/keymap.c (100%)
 rename keyboards/{ => tominabox1}/qaz/keymaps/via/rules.mk (100%)
 rename keyboards/{ => tominabox1}/qaz/qaz.c (100%)
 rename keyboards/{ => tominabox1}/qaz/qaz.h (100%)
 rename keyboards/{ => tominabox1}/qaz/readme.md (95%)
 rename keyboards/{ => tominabox1}/qaz/rules.mk (100%)
 rename keyboards/{ => tominabox1}/underscore33/.noci (100%)
 rename keyboards/{ => tominabox1}/underscore33/readme.md (91%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/.noci (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/config.h (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/info.json (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/keymaps/default/config.h (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/keymaps/default/keymap.c (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/keymaps/default/readme.md (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/keymaps/default/rules.mk (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/keymaps/default_big_space/config.h (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/keymaps/default_big_space/keymap.c (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/keymaps/default_big_space/readme.md (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/keymaps/default_big_space/rules.mk (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/keymaps/via/keymap.c (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/keymaps/via/readme.md (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/keymaps/via/rules.mk (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/rev1.c (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/rev1.h (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev1/rules.mk (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/config.h (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/info.json (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/keymaps/default/config.h (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/keymaps/default/keymap.c (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/keymaps/default/readme.md (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/keymaps/default/rules.mk (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/keymaps/default_big_space/config.h (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/keymaps/default_big_space/keymap.c (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/keymaps/default_big_space/readme.md (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/keymaps/default_big_space/rules.mk (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/keymaps/via/keymap.c (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/keymaps/via/readme.md (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/keymaps/via/rules.mk (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/rev2.c (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/rev2.h (100%)
 rename keyboards/{ => tominabox1}/underscore33/rev2/rules.mk (100%)
 create mode 100644 keyboards/tominabox1/underscore33/rules.mk
 delete mode 100644 keyboards/underscore33/rules.mk

diff --git a/keyboards/adalyn/adalyn.c b/keyboards/tominabox1/adalyn/adalyn.c
similarity index 100%
rename from keyboards/adalyn/adalyn.c
rename to keyboards/tominabox1/adalyn/adalyn.c
diff --git a/keyboards/adalyn/adalyn.h b/keyboards/tominabox1/adalyn/adalyn.h
similarity index 100%
rename from keyboards/adalyn/adalyn.h
rename to keyboards/tominabox1/adalyn/adalyn.h
diff --git a/keyboards/adalyn/config.h b/keyboards/tominabox1/adalyn/config.h
similarity index 100%
rename from keyboards/adalyn/config.h
rename to keyboards/tominabox1/adalyn/config.h
diff --git a/keyboards/adalyn/info.json b/keyboards/tominabox1/adalyn/info.json
similarity index 100%
rename from keyboards/adalyn/info.json
rename to keyboards/tominabox1/adalyn/info.json
diff --git a/keyboards/adalyn/keymaps/default/config.h b/keyboards/tominabox1/adalyn/keymaps/default/config.h
similarity index 100%
rename from keyboards/adalyn/keymaps/default/config.h
rename to keyboards/tominabox1/adalyn/keymaps/default/config.h
diff --git a/keyboards/adalyn/keymaps/default/keymap.c b/keyboards/tominabox1/adalyn/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/adalyn/keymaps/default/keymap.c
rename to keyboards/tominabox1/adalyn/keymaps/default/keymap.c
diff --git a/keyboards/adalyn/keymaps/default/readme.md b/keyboards/tominabox1/adalyn/keymaps/default/readme.md
similarity index 100%
rename from keyboards/adalyn/keymaps/default/readme.md
rename to keyboards/tominabox1/adalyn/keymaps/default/readme.md
diff --git a/keyboards/adalyn/keymaps/default/rules.mk b/keyboards/tominabox1/adalyn/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/adalyn/keymaps/default/rules.mk
rename to keyboards/tominabox1/adalyn/keymaps/default/rules.mk
diff --git a/keyboards/adalyn/readme.md b/keyboards/tominabox1/adalyn/readme.md
similarity index 93%
rename from keyboards/adalyn/readme.md
rename to keyboards/tominabox1/adalyn/readme.md
index ee24bead61..d6292b5cad 100644
--- a/keyboards/adalyn/readme.md
+++ b/keyboards/tominabox1/adalyn/readme.md
@@ -8,9 +8,9 @@
 * Hardware Availability: Open source on @tominabox1 GitHub
 
 Make example for this keyboard (after setting up your build environment):
-    make adalyn:default
+    make tominabox1/adalyn:default
 Flashing example for this keyboard:
-    make adalyn:default:flash
+    make tominabox1/adalyn:default:flash
 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).
 ## Bootloader
 Enter the bootloader in 3 ways:
diff --git a/keyboards/adalyn/rules.mk b/keyboards/tominabox1/adalyn/rules.mk
similarity index 100%
rename from keyboards/adalyn/rules.mk
rename to keyboards/tominabox1/adalyn/rules.mk
diff --git a/keyboards/le_chiffre/config.h b/keyboards/tominabox1/le_chiffre/config.h
similarity index 100%
rename from keyboards/le_chiffre/config.h
rename to keyboards/tominabox1/le_chiffre/config.h
diff --git a/keyboards/le_chiffre/info.json b/keyboards/tominabox1/le_chiffre/info.json
similarity index 100%
rename from keyboards/le_chiffre/info.json
rename to keyboards/tominabox1/le_chiffre/info.json
diff --git a/keyboards/le_chiffre/keymaps/default/config.h b/keyboards/tominabox1/le_chiffre/keymaps/default/config.h
similarity index 100%
rename from keyboards/le_chiffre/keymaps/default/config.h
rename to keyboards/tominabox1/le_chiffre/keymaps/default/config.h
diff --git a/keyboards/le_chiffre/keymaps/default/keymap.c b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/le_chiffre/keymaps/default/keymap.c
rename to keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
diff --git a/keyboards/le_chiffre/keymaps/default/readme.md b/keyboards/tominabox1/le_chiffre/keymaps/default/readme.md
similarity index 100%
rename from keyboards/le_chiffre/keymaps/default/readme.md
rename to keyboards/tominabox1/le_chiffre/keymaps/default/readme.md
diff --git a/keyboards/le_chiffre/keymaps/default/rules.mk b/keyboards/tominabox1/le_chiffre/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/le_chiffre/keymaps/default/rules.mk
rename to keyboards/tominabox1/le_chiffre/keymaps/default/rules.mk
diff --git a/keyboards/le_chiffre/keymaps/via/keymap.c b/keyboards/tominabox1/le_chiffre/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/le_chiffre/keymaps/via/keymap.c
rename to keyboards/tominabox1/le_chiffre/keymaps/via/keymap.c
diff --git a/keyboards/le_chiffre/keymaps/via/rules.mk b/keyboards/tominabox1/le_chiffre/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/le_chiffre/keymaps/via/rules.mk
rename to keyboards/tominabox1/le_chiffre/keymaps/via/rules.mk
diff --git a/keyboards/le_chiffre/le_chiffre.c b/keyboards/tominabox1/le_chiffre/le_chiffre.c
similarity index 100%
rename from keyboards/le_chiffre/le_chiffre.c
rename to keyboards/tominabox1/le_chiffre/le_chiffre.c
diff --git a/keyboards/le_chiffre/le_chiffre.h b/keyboards/tominabox1/le_chiffre/le_chiffre.h
similarity index 100%
rename from keyboards/le_chiffre/le_chiffre.h
rename to keyboards/tominabox1/le_chiffre/le_chiffre.h
diff --git a/keyboards/le_chiffre/readme.md b/keyboards/tominabox1/le_chiffre/readme.md
similarity index 96%
rename from keyboards/le_chiffre/readme.md
rename to keyboards/tominabox1/le_chiffre/readme.md
index ead6d88b3e..ea18546c61 100644
--- a/keyboards/le_chiffre/readme.md
+++ b/keyboards/tominabox1/le_chiffre/readme.md
@@ -10,6 +10,6 @@ Le Chiffre (ironically, "the number" in French is a 30% keyboard designed by tom
 
 Make example for this keyboard (after setting up your build environment):
 
-    make le_chiffre:default
+    make tominabox1/le_chiffre: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).
diff --git a/keyboards/le_chiffre/rules.mk b/keyboards/tominabox1/le_chiffre/rules.mk
similarity index 100%
rename from keyboards/le_chiffre/rules.mk
rename to keyboards/tominabox1/le_chiffre/rules.mk
diff --git a/keyboards/qaz/config.h b/keyboards/tominabox1/qaz/config.h
similarity index 100%
rename from keyboards/qaz/config.h
rename to keyboards/tominabox1/qaz/config.h
diff --git a/keyboards/qaz/info.json b/keyboards/tominabox1/qaz/info.json
similarity index 100%
rename from keyboards/qaz/info.json
rename to keyboards/tominabox1/qaz/info.json
diff --git a/keyboards/qaz/keymaps/default/config.h b/keyboards/tominabox1/qaz/keymaps/default/config.h
similarity index 100%
rename from keyboards/qaz/keymaps/default/config.h
rename to keyboards/tominabox1/qaz/keymaps/default/config.h
diff --git a/keyboards/qaz/keymaps/default/keymap.c b/keyboards/tominabox1/qaz/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/qaz/keymaps/default/keymap.c
rename to keyboards/tominabox1/qaz/keymaps/default/keymap.c
diff --git a/keyboards/qaz/keymaps/default/readme.md b/keyboards/tominabox1/qaz/keymaps/default/readme.md
similarity index 100%
rename from keyboards/qaz/keymaps/default/readme.md
rename to keyboards/tominabox1/qaz/keymaps/default/readme.md
diff --git a/keyboards/qaz/keymaps/default/rules.mk b/keyboards/tominabox1/qaz/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/qaz/keymaps/default/rules.mk
rename to keyboards/tominabox1/qaz/keymaps/default/rules.mk
diff --git a/keyboards/qaz/keymaps/default_big_space/config.h b/keyboards/tominabox1/qaz/keymaps/default_big_space/config.h
similarity index 100%
rename from keyboards/qaz/keymaps/default_big_space/config.h
rename to keyboards/tominabox1/qaz/keymaps/default_big_space/config.h
diff --git a/keyboards/qaz/keymaps/default_big_space/keymap.c b/keyboards/tominabox1/qaz/keymaps/default_big_space/keymap.c
similarity index 100%
rename from keyboards/qaz/keymaps/default_big_space/keymap.c
rename to keyboards/tominabox1/qaz/keymaps/default_big_space/keymap.c
diff --git a/keyboards/qaz/keymaps/default_big_space/readme.md b/keyboards/tominabox1/qaz/keymaps/default_big_space/readme.md
similarity index 100%
rename from keyboards/qaz/keymaps/default_big_space/readme.md
rename to keyboards/tominabox1/qaz/keymaps/default_big_space/readme.md
diff --git a/keyboards/qaz/keymaps/default_big_space/rules.mk b/keyboards/tominabox1/qaz/keymaps/default_big_space/rules.mk
similarity index 100%
rename from keyboards/qaz/keymaps/default_big_space/rules.mk
rename to keyboards/tominabox1/qaz/keymaps/default_big_space/rules.mk
diff --git a/keyboards/qaz/keymaps/via/keymap.c b/keyboards/tominabox1/qaz/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/qaz/keymaps/via/keymap.c
rename to keyboards/tominabox1/qaz/keymaps/via/keymap.c
diff --git a/keyboards/qaz/keymaps/via/rules.mk b/keyboards/tominabox1/qaz/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/qaz/keymaps/via/rules.mk
rename to keyboards/tominabox1/qaz/keymaps/via/rules.mk
diff --git a/keyboards/qaz/qaz.c b/keyboards/tominabox1/qaz/qaz.c
similarity index 100%
rename from keyboards/qaz/qaz.c
rename to keyboards/tominabox1/qaz/qaz.c
diff --git a/keyboards/qaz/qaz.h b/keyboards/tominabox1/qaz/qaz.h
similarity index 100%
rename from keyboards/qaz/qaz.h
rename to keyboards/tominabox1/qaz/qaz.h
diff --git a/keyboards/qaz/readme.md b/keyboards/tominabox1/qaz/readme.md
similarity index 95%
rename from keyboards/qaz/readme.md
rename to keyboards/tominabox1/qaz/readme.md
index 2f1e7fcc9a..13940e7c25 100644
--- a/keyboards/qaz/readme.md
+++ b/keyboards/tominabox1/qaz/readme.md
@@ -10,6 +10,6 @@ Throw it in your fanny pack and hop on your fixed gear and away you go. QAZ is c
 
 Make example for this keyboard (after setting up your build environment):
 
-    qmk compile -kb qaz -km default
+    qmk compile -kb tominabox1/qaz -km 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).
diff --git a/keyboards/qaz/rules.mk b/keyboards/tominabox1/qaz/rules.mk
similarity index 100%
rename from keyboards/qaz/rules.mk
rename to keyboards/tominabox1/qaz/rules.mk
diff --git a/keyboards/underscore33/.noci b/keyboards/tominabox1/underscore33/.noci
similarity index 100%
rename from keyboards/underscore33/.noci
rename to keyboards/tominabox1/underscore33/.noci
diff --git a/keyboards/underscore33/readme.md b/keyboards/tominabox1/underscore33/readme.md
similarity index 91%
rename from keyboards/underscore33/readme.md
rename to keyboards/tominabox1/underscore33/readme.md
index 7cc2f9f411..273786dce0 100644
--- a/keyboards/underscore33/readme.md
+++ b/keyboards/tominabox1/underscore33/readme.md
@@ -10,10 +10,10 @@ A little bitty 30% (10x4) ortholinear keyboard designed by tominabox1.  The R1 v
 
 Make example for this keyboard (after setting up your build environment):
 
-    make underscore33/rev2:default
+    make tominabox1/underscore33/rev2:default
 
 Flashing example for this keyboard:
 
-    make underscore33/rev2:default:flash
+    make tominabox1/underscore33/rev2:default:flash
 
 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).
diff --git a/keyboards/underscore33/rev1/.noci b/keyboards/tominabox1/underscore33/rev1/.noci
similarity index 100%
rename from keyboards/underscore33/rev1/.noci
rename to keyboards/tominabox1/underscore33/rev1/.noci
diff --git a/keyboards/underscore33/rev1/config.h b/keyboards/tominabox1/underscore33/rev1/config.h
similarity index 100%
rename from keyboards/underscore33/rev1/config.h
rename to keyboards/tominabox1/underscore33/rev1/config.h
diff --git a/keyboards/underscore33/rev1/info.json b/keyboards/tominabox1/underscore33/rev1/info.json
similarity index 100%
rename from keyboards/underscore33/rev1/info.json
rename to keyboards/tominabox1/underscore33/rev1/info.json
diff --git a/keyboards/underscore33/rev1/keymaps/default/config.h b/keyboards/tominabox1/underscore33/rev1/keymaps/default/config.h
similarity index 100%
rename from keyboards/underscore33/rev1/keymaps/default/config.h
rename to keyboards/tominabox1/underscore33/rev1/keymaps/default/config.h
diff --git a/keyboards/underscore33/rev1/keymaps/default/keymap.c b/keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/underscore33/rev1/keymaps/default/keymap.c
rename to keyboards/tominabox1/underscore33/rev1/keymaps/default/keymap.c
diff --git a/keyboards/underscore33/rev1/keymaps/default/readme.md b/keyboards/tominabox1/underscore33/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/underscore33/rev1/keymaps/default/readme.md
rename to keyboards/tominabox1/underscore33/rev1/keymaps/default/readme.md
diff --git a/keyboards/underscore33/rev1/keymaps/default/rules.mk b/keyboards/tominabox1/underscore33/rev1/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/underscore33/rev1/keymaps/default/rules.mk
rename to keyboards/tominabox1/underscore33/rev1/keymaps/default/rules.mk
diff --git a/keyboards/underscore33/rev1/keymaps/default_big_space/config.h b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/config.h
similarity index 100%
rename from keyboards/underscore33/rev1/keymaps/default_big_space/config.h
rename to keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/config.h
diff --git a/keyboards/underscore33/rev1/keymaps/default_big_space/keymap.c b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c
similarity index 100%
rename from keyboards/underscore33/rev1/keymaps/default_big_space/keymap.c
rename to keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/keymap.c
diff --git a/keyboards/underscore33/rev1/keymaps/default_big_space/readme.md b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/readme.md
similarity index 100%
rename from keyboards/underscore33/rev1/keymaps/default_big_space/readme.md
rename to keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/readme.md
diff --git a/keyboards/underscore33/rev1/keymaps/default_big_space/rules.mk b/keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/rules.mk
similarity index 100%
rename from keyboards/underscore33/rev1/keymaps/default_big_space/rules.mk
rename to keyboards/tominabox1/underscore33/rev1/keymaps/default_big_space/rules.mk
diff --git a/keyboards/underscore33/rev1/keymaps/via/keymap.c b/keyboards/tominabox1/underscore33/rev1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/underscore33/rev1/keymaps/via/keymap.c
rename to keyboards/tominabox1/underscore33/rev1/keymaps/via/keymap.c
diff --git a/keyboards/underscore33/rev1/keymaps/via/readme.md b/keyboards/tominabox1/underscore33/rev1/keymaps/via/readme.md
similarity index 100%
rename from keyboards/underscore33/rev1/keymaps/via/readme.md
rename to keyboards/tominabox1/underscore33/rev1/keymaps/via/readme.md
diff --git a/keyboards/underscore33/rev1/keymaps/via/rules.mk b/keyboards/tominabox1/underscore33/rev1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/underscore33/rev1/keymaps/via/rules.mk
rename to keyboards/tominabox1/underscore33/rev1/keymaps/via/rules.mk
diff --git a/keyboards/underscore33/rev1/rev1.c b/keyboards/tominabox1/underscore33/rev1/rev1.c
similarity index 100%
rename from keyboards/underscore33/rev1/rev1.c
rename to keyboards/tominabox1/underscore33/rev1/rev1.c
diff --git a/keyboards/underscore33/rev1/rev1.h b/keyboards/tominabox1/underscore33/rev1/rev1.h
similarity index 100%
rename from keyboards/underscore33/rev1/rev1.h
rename to keyboards/tominabox1/underscore33/rev1/rev1.h
diff --git a/keyboards/underscore33/rev1/rules.mk b/keyboards/tominabox1/underscore33/rev1/rules.mk
similarity index 100%
rename from keyboards/underscore33/rev1/rules.mk
rename to keyboards/tominabox1/underscore33/rev1/rules.mk
diff --git a/keyboards/underscore33/rev2/config.h b/keyboards/tominabox1/underscore33/rev2/config.h
similarity index 100%
rename from keyboards/underscore33/rev2/config.h
rename to keyboards/tominabox1/underscore33/rev2/config.h
diff --git a/keyboards/underscore33/rev2/info.json b/keyboards/tominabox1/underscore33/rev2/info.json
similarity index 100%
rename from keyboards/underscore33/rev2/info.json
rename to keyboards/tominabox1/underscore33/rev2/info.json
diff --git a/keyboards/underscore33/rev2/keymaps/default/config.h b/keyboards/tominabox1/underscore33/rev2/keymaps/default/config.h
similarity index 100%
rename from keyboards/underscore33/rev2/keymaps/default/config.h
rename to keyboards/tominabox1/underscore33/rev2/keymaps/default/config.h
diff --git a/keyboards/underscore33/rev2/keymaps/default/keymap.c b/keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/underscore33/rev2/keymaps/default/keymap.c
rename to keyboards/tominabox1/underscore33/rev2/keymaps/default/keymap.c
diff --git a/keyboards/underscore33/rev2/keymaps/default/readme.md b/keyboards/tominabox1/underscore33/rev2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/underscore33/rev2/keymaps/default/readme.md
rename to keyboards/tominabox1/underscore33/rev2/keymaps/default/readme.md
diff --git a/keyboards/underscore33/rev2/keymaps/default/rules.mk b/keyboards/tominabox1/underscore33/rev2/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/underscore33/rev2/keymaps/default/rules.mk
rename to keyboards/tominabox1/underscore33/rev2/keymaps/default/rules.mk
diff --git a/keyboards/underscore33/rev2/keymaps/default_big_space/config.h b/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/config.h
similarity index 100%
rename from keyboards/underscore33/rev2/keymaps/default_big_space/config.h
rename to keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/config.h
diff --git a/keyboards/underscore33/rev2/keymaps/default_big_space/keymap.c b/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/keymap.c
similarity index 100%
rename from keyboards/underscore33/rev2/keymaps/default_big_space/keymap.c
rename to keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/keymap.c
diff --git a/keyboards/underscore33/rev2/keymaps/default_big_space/readme.md b/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/readme.md
similarity index 100%
rename from keyboards/underscore33/rev2/keymaps/default_big_space/readme.md
rename to keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/readme.md
diff --git a/keyboards/underscore33/rev2/keymaps/default_big_space/rules.mk b/keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/rules.mk
similarity index 100%
rename from keyboards/underscore33/rev2/keymaps/default_big_space/rules.mk
rename to keyboards/tominabox1/underscore33/rev2/keymaps/default_big_space/rules.mk
diff --git a/keyboards/underscore33/rev2/keymaps/via/keymap.c b/keyboards/tominabox1/underscore33/rev2/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/underscore33/rev2/keymaps/via/keymap.c
rename to keyboards/tominabox1/underscore33/rev2/keymaps/via/keymap.c
diff --git a/keyboards/underscore33/rev2/keymaps/via/readme.md b/keyboards/tominabox1/underscore33/rev2/keymaps/via/readme.md
similarity index 100%
rename from keyboards/underscore33/rev2/keymaps/via/readme.md
rename to keyboards/tominabox1/underscore33/rev2/keymaps/via/readme.md
diff --git a/keyboards/underscore33/rev2/keymaps/via/rules.mk b/keyboards/tominabox1/underscore33/rev2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/underscore33/rev2/keymaps/via/rules.mk
rename to keyboards/tominabox1/underscore33/rev2/keymaps/via/rules.mk
diff --git a/keyboards/underscore33/rev2/rev2.c b/keyboards/tominabox1/underscore33/rev2/rev2.c
similarity index 100%
rename from keyboards/underscore33/rev2/rev2.c
rename to keyboards/tominabox1/underscore33/rev2/rev2.c
diff --git a/keyboards/underscore33/rev2/rev2.h b/keyboards/tominabox1/underscore33/rev2/rev2.h
similarity index 100%
rename from keyboards/underscore33/rev2/rev2.h
rename to keyboards/tominabox1/underscore33/rev2/rev2.h
diff --git a/keyboards/underscore33/rev2/rules.mk b/keyboards/tominabox1/underscore33/rev2/rules.mk
similarity index 100%
rename from keyboards/underscore33/rev2/rules.mk
rename to keyboards/tominabox1/underscore33/rev2/rules.mk
diff --git a/keyboards/tominabox1/underscore33/rules.mk b/keyboards/tominabox1/underscore33/rules.mk
new file mode 100644
index 0000000000..b5e13fd420
--- /dev/null
+++ b/keyboards/tominabox1/underscore33/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = tominabox1/underscore33/rev1
diff --git a/keyboards/underscore33/rules.mk b/keyboards/underscore33/rules.mk
deleted file mode 100644
index b86f18e114..0000000000
--- a/keyboards/underscore33/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = underscore33/rev1

From d9238b7baf3e99087f3e7455214776b28edf31bd Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 10:13:13 +0800
Subject: [PATCH 472/867] [Keyboard] fix missed .noci in reviung move (#16107)

---
 keyboards/{ => reviung}/reviung33/.noci | 0
 keyboards/{ => reviung}/reviung61/.noci | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename keyboards/{ => reviung}/reviung33/.noci (100%)
 rename keyboards/{ => reviung}/reviung61/.noci (100%)

diff --git a/keyboards/reviung33/.noci b/keyboards/reviung/reviung33/.noci
similarity index 100%
rename from keyboards/reviung33/.noci
rename to keyboards/reviung/reviung33/.noci
diff --git a/keyboards/reviung61/.noci b/keyboards/reviung/reviung61/.noci
similarity index 100%
rename from keyboards/reviung61/.noci
rename to keyboards/reviung/reviung61/.noci

From a2cfa23baf5dd43c5649b58fabb4fae95b9ee086 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 10:13:33 +0800
Subject: [PATCH 473/867] [Keyboard] move @vuhopkep 's keebs into /hnahkb
 (#16102)

---
 keyboards/{ => hnahkb}/freyr/config.h                   | 0
 keyboards/{ => hnahkb}/freyr/freyr.c                    | 0
 keyboards/{ => hnahkb}/freyr/freyr.h                    | 0
 keyboards/{ => hnahkb}/freyr/info.json                  | 0
 keyboards/{ => hnahkb}/freyr/keymaps/default/keymap.c   | 0
 keyboards/{ => hnahkb}/freyr/keymaps/default/readme.md  | 0
 keyboards/{ => hnahkb}/freyr/readme.md                  | 4 ++--
 keyboards/{ => hnahkb}/freyr/rules.mk                   | 0
 keyboards/{ => hnahkb}/stella/config.h                  | 0
 keyboards/{ => hnahkb}/stella/info.json                 | 0
 keyboards/{ => hnahkb}/stella/keymaps/default/keymap.c  | 0
 keyboards/{ => hnahkb}/stella/keymaps/default/readme.md | 0
 keyboards/{ => hnahkb}/stella/readme.md                 | 4 ++--
 keyboards/{ => hnahkb}/stella/rules.mk                  | 0
 keyboards/{ => hnahkb}/stella/stella.c                  | 0
 keyboards/{ => hnahkb}/stella/stella.h                  | 0
 keyboards/{ => hnahkb}/vn66/config.h                    | 0
 keyboards/{ => hnahkb}/vn66/info.json                   | 0
 keyboards/{ => hnahkb}/vn66/keymaps/default/keymap.c    | 0
 keyboards/{ => hnahkb}/vn66/keymaps/default/readme.md   | 0
 keyboards/{ => hnahkb}/vn66/readme.md                   | 4 ++--
 keyboards/{ => hnahkb}/vn66/rules.mk                    | 0
 keyboards/{ => hnahkb}/vn66/vn66.c                      | 0
 keyboards/{ => hnahkb}/vn66/vn66.h                      | 0
 24 files changed, 6 insertions(+), 6 deletions(-)
 rename keyboards/{ => hnahkb}/freyr/config.h (100%)
 rename keyboards/{ => hnahkb}/freyr/freyr.c (100%)
 rename keyboards/{ => hnahkb}/freyr/freyr.h (100%)
 rename keyboards/{ => hnahkb}/freyr/info.json (100%)
 rename keyboards/{ => hnahkb}/freyr/keymaps/default/keymap.c (100%)
 rename keyboards/{ => hnahkb}/freyr/keymaps/default/readme.md (100%)
 rename keyboards/{ => hnahkb}/freyr/readme.md (91%)
 rename keyboards/{ => hnahkb}/freyr/rules.mk (100%)
 rename keyboards/{ => hnahkb}/stella/config.h (100%)
 rename keyboards/{ => hnahkb}/stella/info.json (100%)
 rename keyboards/{ => hnahkb}/stella/keymaps/default/keymap.c (100%)
 rename keyboards/{ => hnahkb}/stella/keymaps/default/readme.md (100%)
 rename keyboards/{ => hnahkb}/stella/readme.md (91%)
 rename keyboards/{ => hnahkb}/stella/rules.mk (100%)
 rename keyboards/{ => hnahkb}/stella/stella.c (100%)
 rename keyboards/{ => hnahkb}/stella/stella.h (100%)
 rename keyboards/{ => hnahkb}/vn66/config.h (100%)
 rename keyboards/{ => hnahkb}/vn66/info.json (100%)
 rename keyboards/{ => hnahkb}/vn66/keymaps/default/keymap.c (100%)
 rename keyboards/{ => hnahkb}/vn66/keymaps/default/readme.md (100%)
 rename keyboards/{ => hnahkb}/vn66/readme.md (90%)
 rename keyboards/{ => hnahkb}/vn66/rules.mk (100%)
 rename keyboards/{ => hnahkb}/vn66/vn66.c (100%)
 rename keyboards/{ => hnahkb}/vn66/vn66.h (100%)

diff --git a/keyboards/freyr/config.h b/keyboards/hnahkb/freyr/config.h
similarity index 100%
rename from keyboards/freyr/config.h
rename to keyboards/hnahkb/freyr/config.h
diff --git a/keyboards/freyr/freyr.c b/keyboards/hnahkb/freyr/freyr.c
similarity index 100%
rename from keyboards/freyr/freyr.c
rename to keyboards/hnahkb/freyr/freyr.c
diff --git a/keyboards/freyr/freyr.h b/keyboards/hnahkb/freyr/freyr.h
similarity index 100%
rename from keyboards/freyr/freyr.h
rename to keyboards/hnahkb/freyr/freyr.h
diff --git a/keyboards/freyr/info.json b/keyboards/hnahkb/freyr/info.json
similarity index 100%
rename from keyboards/freyr/info.json
rename to keyboards/hnahkb/freyr/info.json
diff --git a/keyboards/freyr/keymaps/default/keymap.c b/keyboards/hnahkb/freyr/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/freyr/keymaps/default/keymap.c
rename to keyboards/hnahkb/freyr/keymaps/default/keymap.c
diff --git a/keyboards/freyr/keymaps/default/readme.md b/keyboards/hnahkb/freyr/keymaps/default/readme.md
similarity index 100%
rename from keyboards/freyr/keymaps/default/readme.md
rename to keyboards/hnahkb/freyr/keymaps/default/readme.md
diff --git a/keyboards/freyr/readme.md b/keyboards/hnahkb/freyr/readme.md
similarity index 91%
rename from keyboards/freyr/readme.md
rename to keyboards/hnahkb/freyr/readme.md
index 20fa484e8c..93df05b475 100644
--- a/keyboards/freyr/readme.md
+++ b/keyboards/hnahkb/freyr/readme.md
@@ -11,10 +11,10 @@ Freyr is a tenkeyless keyboard, support ansi and iso layout.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make freyr:default
+    make hnahkb/freyr:default
 
 Flashing example for this keyboard:
 
-    make freyr:default:flash
+    make hnahkb/freyr:default:flash
 
 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).
diff --git a/keyboards/freyr/rules.mk b/keyboards/hnahkb/freyr/rules.mk
similarity index 100%
rename from keyboards/freyr/rules.mk
rename to keyboards/hnahkb/freyr/rules.mk
diff --git a/keyboards/stella/config.h b/keyboards/hnahkb/stella/config.h
similarity index 100%
rename from keyboards/stella/config.h
rename to keyboards/hnahkb/stella/config.h
diff --git a/keyboards/stella/info.json b/keyboards/hnahkb/stella/info.json
similarity index 100%
rename from keyboards/stella/info.json
rename to keyboards/hnahkb/stella/info.json
diff --git a/keyboards/stella/keymaps/default/keymap.c b/keyboards/hnahkb/stella/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/stella/keymaps/default/keymap.c
rename to keyboards/hnahkb/stella/keymaps/default/keymap.c
diff --git a/keyboards/stella/keymaps/default/readme.md b/keyboards/hnahkb/stella/keymaps/default/readme.md
similarity index 100%
rename from keyboards/stella/keymaps/default/readme.md
rename to keyboards/hnahkb/stella/keymaps/default/readme.md
diff --git a/keyboards/stella/readme.md b/keyboards/hnahkb/stella/readme.md
similarity index 91%
rename from keyboards/stella/readme.md
rename to keyboards/hnahkb/stella/readme.md
index f5820dcf9b..32481d9d09 100644
--- a/keyboards/stella/readme.md
+++ b/keyboards/hnahkb/stella/readme.md
@@ -10,10 +10,10 @@ A custom keyboard design for VGS community
 
 Make example for this keyboard (after setting up your build environment):
 
-    make stella:default
+    make hnahkb/stella:default
 
 Flashing example for this keyboard:
 
-    make stella:default:flash
+    make hnahkb/stella:default:flash
 
 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).
diff --git a/keyboards/stella/rules.mk b/keyboards/hnahkb/stella/rules.mk
similarity index 100%
rename from keyboards/stella/rules.mk
rename to keyboards/hnahkb/stella/rules.mk
diff --git a/keyboards/stella/stella.c b/keyboards/hnahkb/stella/stella.c
similarity index 100%
rename from keyboards/stella/stella.c
rename to keyboards/hnahkb/stella/stella.c
diff --git a/keyboards/stella/stella.h b/keyboards/hnahkb/stella/stella.h
similarity index 100%
rename from keyboards/stella/stella.h
rename to keyboards/hnahkb/stella/stella.h
diff --git a/keyboards/vn66/config.h b/keyboards/hnahkb/vn66/config.h
similarity index 100%
rename from keyboards/vn66/config.h
rename to keyboards/hnahkb/vn66/config.h
diff --git a/keyboards/vn66/info.json b/keyboards/hnahkb/vn66/info.json
similarity index 100%
rename from keyboards/vn66/info.json
rename to keyboards/hnahkb/vn66/info.json
diff --git a/keyboards/vn66/keymaps/default/keymap.c b/keyboards/hnahkb/vn66/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/vn66/keymaps/default/keymap.c
rename to keyboards/hnahkb/vn66/keymaps/default/keymap.c
diff --git a/keyboards/vn66/keymaps/default/readme.md b/keyboards/hnahkb/vn66/keymaps/default/readme.md
similarity index 100%
rename from keyboards/vn66/keymaps/default/readme.md
rename to keyboards/hnahkb/vn66/keymaps/default/readme.md
diff --git a/keyboards/vn66/readme.md b/keyboards/hnahkb/vn66/readme.md
similarity index 90%
rename from keyboards/vn66/readme.md
rename to keyboards/hnahkb/vn66/readme.md
index 9b043cb081..f917da5ea5 100644
--- a/keyboards/vn66/readme.md
+++ b/keyboards/hnahkb/vn66/readme.md
@@ -10,10 +10,10 @@ A compact 60% keyboard for VNMK
 
 Make example for this keyboard (after setting up your build environment):
 
-    make vn66:default
+    make hnahkb/vn66:default
 
 Flashing example for this keyboard:
 
-    make vn66:default:flash
+    make hnahkb/vn66:default:flash
 
 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).
diff --git a/keyboards/vn66/rules.mk b/keyboards/hnahkb/vn66/rules.mk
similarity index 100%
rename from keyboards/vn66/rules.mk
rename to keyboards/hnahkb/vn66/rules.mk
diff --git a/keyboards/vn66/vn66.c b/keyboards/hnahkb/vn66/vn66.c
similarity index 100%
rename from keyboards/vn66/vn66.c
rename to keyboards/hnahkb/vn66/vn66.c
diff --git a/keyboards/vn66/vn66.h b/keyboards/hnahkb/vn66/vn66.h
similarity index 100%
rename from keyboards/vn66/vn66.h
rename to keyboards/hnahkb/vn66/vn66.h

From f2c9fa81dead728a29d5a0b107658677687f837a Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Mon, 31 Jan 2022 18:58:29 -0800
Subject: [PATCH 474/867] [Keyboard] enable rgb modes for jkb65 (#16159)

---
 keyboards/jadookb/jkb65/config.h | 49 ++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h
index ec79d26205..d397f1962b 100644
--- a/keyboards/jadookb/jkb65/config.h
+++ b/keyboards/jadookb/jkb65/config.h
@@ -46,6 +46,55 @@
 #define RGB_MATRIX_LED_FLUSH_LIMIT 26
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
 
+ // RGB Matrix Animation modes. Explicitly enabled
+ // For full list of effects, see:
+ // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+ // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+ // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
 #define DEBOUNCE 5
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE

From 984481ff8e17173a0faaa12c524d0b502fb438cb Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 12:36:16 +0800
Subject: [PATCH 475/867] [Keyboard] move @drhigsby 's boards into /drhigsby
 (#16041)

---
 keyboards/{ => drhigsby}/bkf/bkf.c                        | 0
 keyboards/{ => drhigsby}/bkf/bkf.h                        | 0
 keyboards/{ => drhigsby}/bkf/config.h                     | 0
 keyboards/{ => drhigsby}/bkf/info.json                    | 0
 keyboards/{ => drhigsby}/bkf/keymaps/default/keymap.c     | 0
 keyboards/{ => drhigsby}/bkf/keymaps/default/readme.md    | 0
 keyboards/{ => drhigsby}/bkf/readme.md                    | 4 ++--
 keyboards/{ => drhigsby}/bkf/rules.mk                     | 0
 keyboards/{ => drhigsby}/dubba175/config.h                | 0
 keyboards/{ => drhigsby}/dubba175/dubba175.c              | 0
 keyboards/{ => drhigsby}/dubba175/dubba175.h              | 0
 keyboards/{ => drhigsby}/dubba175/info.json               | 0
 .../{ => drhigsby}/dubba175/keymaps/default/config.h      | 0
 .../{ => drhigsby}/dubba175/keymaps/default/keymap.c      | 0
 .../{ => drhigsby}/dubba175/keymaps/default/readme.md     | 0
 .../{ => drhigsby}/dubba175/keymaps/default/rules.mk      | 0
 keyboards/{ => drhigsby}/dubba175/readme.md               | 2 +-
 keyboards/{ => drhigsby}/dubba175/rules.mk                | 0
 keyboards/{ => drhigsby}/ogurec/config.h                  | 0
 keyboards/{ => drhigsby}/ogurec/info.json                 | 0
 keyboards/{ => drhigsby}/ogurec/keymaps/dack/config.h     | 0
 keyboards/{ => drhigsby}/ogurec/keymaps/dack/keymap.c     | 0
 keyboards/{ => drhigsby}/ogurec/keymaps/dack/readme.md    | 0
 keyboards/{ => drhigsby}/ogurec/keymaps/default/config.h  | 0
 keyboards/{ => drhigsby}/ogurec/keymaps/default/keymap.c  | 0
 keyboards/{ => drhigsby}/ogurec/keymaps/default/readme.md | 0
 keyboards/{ => drhigsby}/ogurec/keymaps/default/rules.mk  | 0
 keyboards/{ => drhigsby}/ogurec/left_pm/left_pm.h         | 0
 keyboards/{ => drhigsby}/ogurec/left_pm/readme.md         | 0
 keyboards/{ => drhigsby}/ogurec/left_pm/rules.mk          | 0
 keyboards/{ => drhigsby}/ogurec/ogurec.c                  | 0
 keyboards/{ => drhigsby}/ogurec/ogurec.h                  | 4 ++--
 keyboards/{ => drhigsby}/ogurec/readme.md                 | 8 ++++----
 keyboards/{ => drhigsby}/ogurec/right_pm/readme.md        | 0
 keyboards/{ => drhigsby}/ogurec/right_pm/right_pm.h       | 0
 keyboards/{ => drhigsby}/ogurec/right_pm/rules.mk         | 0
 keyboards/{ => drhigsby}/ogurec/rules.mk                  | 2 +-
 keyboards/{ => drhigsby}/packrat/config.h                 | 0
 keyboards/{ => drhigsby}/packrat/info.json                | 0
 keyboards/{ => drhigsby}/packrat/keymaps/3uc/config.h     | 0
 keyboards/{ => drhigsby}/packrat/keymaps/3uc/keymap.c     | 0
 keyboards/{ => drhigsby}/packrat/keymaps/3uc/readme.md    | 0
 keyboards/{ => drhigsby}/packrat/keymaps/3uc/rules.mk     | 0
 keyboards/{ => drhigsby}/packrat/keymaps/default/config.h | 0
 keyboards/{ => drhigsby}/packrat/keymaps/default/keymap.c | 0
 .../{ => drhigsby}/packrat/keymaps/default/readme.md      | 0
 keyboards/{ => drhigsby}/packrat/keymaps/default/rules.mk | 0
 keyboards/{ => drhigsby}/packrat/packrat.c                | 0
 keyboards/{ => drhigsby}/packrat/packrat.h                | 0
 keyboards/{ => drhigsby}/packrat/readme.md                | 2 +-
 keyboards/{ => drhigsby}/packrat/rules.mk                 | 0
 51 files changed, 11 insertions(+), 11 deletions(-)
 rename keyboards/{ => drhigsby}/bkf/bkf.c (100%)
 rename keyboards/{ => drhigsby}/bkf/bkf.h (100%)
 rename keyboards/{ => drhigsby}/bkf/config.h (100%)
 rename keyboards/{ => drhigsby}/bkf/info.json (100%)
 rename keyboards/{ => drhigsby}/bkf/keymaps/default/keymap.c (100%)
 rename keyboards/{ => drhigsby}/bkf/keymaps/default/readme.md (100%)
 rename keyboards/{ => drhigsby}/bkf/readme.md (94%)
 rename keyboards/{ => drhigsby}/bkf/rules.mk (100%)
 rename keyboards/{ => drhigsby}/dubba175/config.h (100%)
 rename keyboards/{ => drhigsby}/dubba175/dubba175.c (100%)
 rename keyboards/{ => drhigsby}/dubba175/dubba175.h (100%)
 rename keyboards/{ => drhigsby}/dubba175/info.json (100%)
 rename keyboards/{ => drhigsby}/dubba175/keymaps/default/config.h (100%)
 rename keyboards/{ => drhigsby}/dubba175/keymaps/default/keymap.c (100%)
 rename keyboards/{ => drhigsby}/dubba175/keymaps/default/readme.md (100%)
 rename keyboards/{ => drhigsby}/dubba175/keymaps/default/rules.mk (100%)
 rename keyboards/{ => drhigsby}/dubba175/readme.md (95%)
 rename keyboards/{ => drhigsby}/dubba175/rules.mk (100%)
 rename keyboards/{ => drhigsby}/ogurec/config.h (100%)
 rename keyboards/{ => drhigsby}/ogurec/info.json (100%)
 rename keyboards/{ => drhigsby}/ogurec/keymaps/dack/config.h (100%)
 rename keyboards/{ => drhigsby}/ogurec/keymaps/dack/keymap.c (100%)
 rename keyboards/{ => drhigsby}/ogurec/keymaps/dack/readme.md (100%)
 rename keyboards/{ => drhigsby}/ogurec/keymaps/default/config.h (100%)
 rename keyboards/{ => drhigsby}/ogurec/keymaps/default/keymap.c (100%)
 rename keyboards/{ => drhigsby}/ogurec/keymaps/default/readme.md (100%)
 rename keyboards/{ => drhigsby}/ogurec/keymaps/default/rules.mk (100%)
 rename keyboards/{ => drhigsby}/ogurec/left_pm/left_pm.h (100%)
 rename keyboards/{ => drhigsby}/ogurec/left_pm/readme.md (100%)
 rename keyboards/{ => drhigsby}/ogurec/left_pm/rules.mk (100%)
 rename keyboards/{ => drhigsby}/ogurec/ogurec.c (100%)
 rename keyboards/{ => drhigsby}/ogurec/ogurec.h (89%)
 rename keyboards/{ => drhigsby}/ogurec/readme.md (87%)
 rename keyboards/{ => drhigsby}/ogurec/right_pm/readme.md (100%)
 rename keyboards/{ => drhigsby}/ogurec/right_pm/right_pm.h (100%)
 rename keyboards/{ => drhigsby}/ogurec/right_pm/rules.mk (100%)
 rename keyboards/{ => drhigsby}/ogurec/rules.mk (93%)
 rename keyboards/{ => drhigsby}/packrat/config.h (100%)
 rename keyboards/{ => drhigsby}/packrat/info.json (100%)
 rename keyboards/{ => drhigsby}/packrat/keymaps/3uc/config.h (100%)
 rename keyboards/{ => drhigsby}/packrat/keymaps/3uc/keymap.c (100%)
 rename keyboards/{ => drhigsby}/packrat/keymaps/3uc/readme.md (100%)
 rename keyboards/{ => drhigsby}/packrat/keymaps/3uc/rules.mk (100%)
 rename keyboards/{ => drhigsby}/packrat/keymaps/default/config.h (100%)
 rename keyboards/{ => drhigsby}/packrat/keymaps/default/keymap.c (100%)
 rename keyboards/{ => drhigsby}/packrat/keymaps/default/readme.md (100%)
 rename keyboards/{ => drhigsby}/packrat/keymaps/default/rules.mk (100%)
 rename keyboards/{ => drhigsby}/packrat/packrat.c (100%)
 rename keyboards/{ => drhigsby}/packrat/packrat.h (100%)
 rename keyboards/{ => drhigsby}/packrat/readme.md (97%)
 rename keyboards/{ => drhigsby}/packrat/rules.mk (100%)

diff --git a/keyboards/bkf/bkf.c b/keyboards/drhigsby/bkf/bkf.c
similarity index 100%
rename from keyboards/bkf/bkf.c
rename to keyboards/drhigsby/bkf/bkf.c
diff --git a/keyboards/bkf/bkf.h b/keyboards/drhigsby/bkf/bkf.h
similarity index 100%
rename from keyboards/bkf/bkf.h
rename to keyboards/drhigsby/bkf/bkf.h
diff --git a/keyboards/bkf/config.h b/keyboards/drhigsby/bkf/config.h
similarity index 100%
rename from keyboards/bkf/config.h
rename to keyboards/drhigsby/bkf/config.h
diff --git a/keyboards/bkf/info.json b/keyboards/drhigsby/bkf/info.json
similarity index 100%
rename from keyboards/bkf/info.json
rename to keyboards/drhigsby/bkf/info.json
diff --git a/keyboards/bkf/keymaps/default/keymap.c b/keyboards/drhigsby/bkf/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bkf/keymaps/default/keymap.c
rename to keyboards/drhigsby/bkf/keymaps/default/keymap.c
diff --git a/keyboards/bkf/keymaps/default/readme.md b/keyboards/drhigsby/bkf/keymaps/default/readme.md
similarity index 100%
rename from keyboards/bkf/keymaps/default/readme.md
rename to keyboards/drhigsby/bkf/keymaps/default/readme.md
diff --git a/keyboards/bkf/readme.md b/keyboards/drhigsby/bkf/readme.md
similarity index 94%
rename from keyboards/bkf/readme.md
rename to keyboards/drhigsby/bkf/readme.md
index d55f9637ee..18742920a4 100644
--- a/keyboards/bkf/readme.md
+++ b/keyboards/drhigsby/bkf/readme.md
@@ -10,12 +10,12 @@ BKF, Base Kit Forty, is a 40% style keyboard that is fully compatbile with a sta
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bkf:default
+    make drhigsby/bkf:default
 
 To place this keyboard into bootloader mode, press the reset button on the PCB or short the RST and GND pins on the pro micro. 
 
 Flashing example for this keyboard:
 
-    make bkf:default:flash
+    make drhigsby/bkf:default:flash
 
 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).
diff --git a/keyboards/bkf/rules.mk b/keyboards/drhigsby/bkf/rules.mk
similarity index 100%
rename from keyboards/bkf/rules.mk
rename to keyboards/drhigsby/bkf/rules.mk
diff --git a/keyboards/dubba175/config.h b/keyboards/drhigsby/dubba175/config.h
similarity index 100%
rename from keyboards/dubba175/config.h
rename to keyboards/drhigsby/dubba175/config.h
diff --git a/keyboards/dubba175/dubba175.c b/keyboards/drhigsby/dubba175/dubba175.c
similarity index 100%
rename from keyboards/dubba175/dubba175.c
rename to keyboards/drhigsby/dubba175/dubba175.c
diff --git a/keyboards/dubba175/dubba175.h b/keyboards/drhigsby/dubba175/dubba175.h
similarity index 100%
rename from keyboards/dubba175/dubba175.h
rename to keyboards/drhigsby/dubba175/dubba175.h
diff --git a/keyboards/dubba175/info.json b/keyboards/drhigsby/dubba175/info.json
similarity index 100%
rename from keyboards/dubba175/info.json
rename to keyboards/drhigsby/dubba175/info.json
diff --git a/keyboards/dubba175/keymaps/default/config.h b/keyboards/drhigsby/dubba175/keymaps/default/config.h
similarity index 100%
rename from keyboards/dubba175/keymaps/default/config.h
rename to keyboards/drhigsby/dubba175/keymaps/default/config.h
diff --git a/keyboards/dubba175/keymaps/default/keymap.c b/keyboards/drhigsby/dubba175/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/dubba175/keymaps/default/keymap.c
rename to keyboards/drhigsby/dubba175/keymaps/default/keymap.c
diff --git a/keyboards/dubba175/keymaps/default/readme.md b/keyboards/drhigsby/dubba175/keymaps/default/readme.md
similarity index 100%
rename from keyboards/dubba175/keymaps/default/readme.md
rename to keyboards/drhigsby/dubba175/keymaps/default/readme.md
diff --git a/keyboards/dubba175/keymaps/default/rules.mk b/keyboards/drhigsby/dubba175/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/dubba175/keymaps/default/rules.mk
rename to keyboards/drhigsby/dubba175/keymaps/default/rules.mk
diff --git a/keyboards/dubba175/readme.md b/keyboards/drhigsby/dubba175/readme.md
similarity index 95%
rename from keyboards/dubba175/readme.md
rename to keyboards/drhigsby/dubba175/readme.md
index f8f1459236..a07da251ab 100644
--- a/keyboards/dubba175/readme.md
+++ b/keyboards/drhigsby/dubba175/readme.md
@@ -10,6 +10,6 @@ Dubba175 is a 10u wide ortholinear keyboard featuring 2x 1.75u spacebars as the
 
 Make example for this keyboard (after setting up your build environment):
 
-    make dubba175:default
+    make drhigsby/dubba175: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).
diff --git a/keyboards/dubba175/rules.mk b/keyboards/drhigsby/dubba175/rules.mk
similarity index 100%
rename from keyboards/dubba175/rules.mk
rename to keyboards/drhigsby/dubba175/rules.mk
diff --git a/keyboards/ogurec/config.h b/keyboards/drhigsby/ogurec/config.h
similarity index 100%
rename from keyboards/ogurec/config.h
rename to keyboards/drhigsby/ogurec/config.h
diff --git a/keyboards/ogurec/info.json b/keyboards/drhigsby/ogurec/info.json
similarity index 100%
rename from keyboards/ogurec/info.json
rename to keyboards/drhigsby/ogurec/info.json
diff --git a/keyboards/ogurec/keymaps/dack/config.h b/keyboards/drhigsby/ogurec/keymaps/dack/config.h
similarity index 100%
rename from keyboards/ogurec/keymaps/dack/config.h
rename to keyboards/drhigsby/ogurec/keymaps/dack/config.h
diff --git a/keyboards/ogurec/keymaps/dack/keymap.c b/keyboards/drhigsby/ogurec/keymaps/dack/keymap.c
similarity index 100%
rename from keyboards/ogurec/keymaps/dack/keymap.c
rename to keyboards/drhigsby/ogurec/keymaps/dack/keymap.c
diff --git a/keyboards/ogurec/keymaps/dack/readme.md b/keyboards/drhigsby/ogurec/keymaps/dack/readme.md
similarity index 100%
rename from keyboards/ogurec/keymaps/dack/readme.md
rename to keyboards/drhigsby/ogurec/keymaps/dack/readme.md
diff --git a/keyboards/ogurec/keymaps/default/config.h b/keyboards/drhigsby/ogurec/keymaps/default/config.h
similarity index 100%
rename from keyboards/ogurec/keymaps/default/config.h
rename to keyboards/drhigsby/ogurec/keymaps/default/config.h
diff --git a/keyboards/ogurec/keymaps/default/keymap.c b/keyboards/drhigsby/ogurec/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ogurec/keymaps/default/keymap.c
rename to keyboards/drhigsby/ogurec/keymaps/default/keymap.c
diff --git a/keyboards/ogurec/keymaps/default/readme.md b/keyboards/drhigsby/ogurec/keymaps/default/readme.md
similarity index 100%
rename from keyboards/ogurec/keymaps/default/readme.md
rename to keyboards/drhigsby/ogurec/keymaps/default/readme.md
diff --git a/keyboards/ogurec/keymaps/default/rules.mk b/keyboards/drhigsby/ogurec/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/ogurec/keymaps/default/rules.mk
rename to keyboards/drhigsby/ogurec/keymaps/default/rules.mk
diff --git a/keyboards/ogurec/left_pm/left_pm.h b/keyboards/drhigsby/ogurec/left_pm/left_pm.h
similarity index 100%
rename from keyboards/ogurec/left_pm/left_pm.h
rename to keyboards/drhigsby/ogurec/left_pm/left_pm.h
diff --git a/keyboards/ogurec/left_pm/readme.md b/keyboards/drhigsby/ogurec/left_pm/readme.md
similarity index 100%
rename from keyboards/ogurec/left_pm/readme.md
rename to keyboards/drhigsby/ogurec/left_pm/readme.md
diff --git a/keyboards/ogurec/left_pm/rules.mk b/keyboards/drhigsby/ogurec/left_pm/rules.mk
similarity index 100%
rename from keyboards/ogurec/left_pm/rules.mk
rename to keyboards/drhigsby/ogurec/left_pm/rules.mk
diff --git a/keyboards/ogurec/ogurec.c b/keyboards/drhigsby/ogurec/ogurec.c
similarity index 100%
rename from keyboards/ogurec/ogurec.c
rename to keyboards/drhigsby/ogurec/ogurec.c
diff --git a/keyboards/ogurec/ogurec.h b/keyboards/drhigsby/ogurec/ogurec.h
similarity index 89%
rename from keyboards/ogurec/ogurec.h
rename to keyboards/drhigsby/ogurec/ogurec.h
index 53956aa586..154d5d6cfe 100644
--- a/keyboards/ogurec/ogurec.h
+++ b/keyboards/drhigsby/ogurec/ogurec.h
@@ -17,8 +17,8 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_ogurec_left_pm)
+#if defined(KEYBOARD_drhigsby_ogurec_left_pm)
 #    include "left_pm.h"
-#elif defined(KEYBOARD_ogurec_right_pm)
+#elif defined(KEYBOARD_drhigsby_ogurec_right_pm)
 #    include "right_pm.h"
 #endif
diff --git a/keyboards/ogurec/readme.md b/keyboards/drhigsby/ogurec/readme.md
similarity index 87%
rename from keyboards/ogurec/readme.md
rename to keyboards/drhigsby/ogurec/readme.md
index 3e0ae153fa..909db6787e 100644
--- a/keyboards/ogurec/readme.md
+++ b/keyboards/drhigsby/ogurec/readme.md
@@ -14,14 +14,14 @@ When flashing ogurec with the PM soldered onto the right side, follow the second
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ogurec:default
-    make ogurec/right_pm:default
+    make drhigsby/ogurec:default
+    make drhigsby/ogurec/right_pm:default
 
 To place the keyboard into bootloader mode, solder a reset switch onto the PCB and press it OR short the GND and RST pins on the pro micro. 
 
 Flashing example for this keyboard:
 
-    make ogurec:default:flash
-    make ogurec/right_pm:default:flash
+    make drhigsby/ogurec:default:flash
+    make drhigsby/ogurec/right_pm:default:flash
 
 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).
diff --git a/keyboards/ogurec/right_pm/readme.md b/keyboards/drhigsby/ogurec/right_pm/readme.md
similarity index 100%
rename from keyboards/ogurec/right_pm/readme.md
rename to keyboards/drhigsby/ogurec/right_pm/readme.md
diff --git a/keyboards/ogurec/right_pm/right_pm.h b/keyboards/drhigsby/ogurec/right_pm/right_pm.h
similarity index 100%
rename from keyboards/ogurec/right_pm/right_pm.h
rename to keyboards/drhigsby/ogurec/right_pm/right_pm.h
diff --git a/keyboards/ogurec/right_pm/rules.mk b/keyboards/drhigsby/ogurec/right_pm/rules.mk
similarity index 100%
rename from keyboards/ogurec/right_pm/rules.mk
rename to keyboards/drhigsby/ogurec/right_pm/rules.mk
diff --git a/keyboards/ogurec/rules.mk b/keyboards/drhigsby/ogurec/rules.mk
similarity index 93%
rename from keyboards/ogurec/rules.mk
rename to keyboards/drhigsby/ogurec/rules.mk
index cf372ceb7e..11587edf86 100644
--- a/keyboards/ogurec/rules.mk
+++ b/keyboards/drhigsby/ogurec/rules.mk
@@ -16,4 +16,4 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-DEFAULT_FOLDER = ogurec/left_pm
+DEFAULT_FOLDER = drhigsby/ogurec/left_pm
diff --git a/keyboards/packrat/config.h b/keyboards/drhigsby/packrat/config.h
similarity index 100%
rename from keyboards/packrat/config.h
rename to keyboards/drhigsby/packrat/config.h
diff --git a/keyboards/packrat/info.json b/keyboards/drhigsby/packrat/info.json
similarity index 100%
rename from keyboards/packrat/info.json
rename to keyboards/drhigsby/packrat/info.json
diff --git a/keyboards/packrat/keymaps/3uc/config.h b/keyboards/drhigsby/packrat/keymaps/3uc/config.h
similarity index 100%
rename from keyboards/packrat/keymaps/3uc/config.h
rename to keyboards/drhigsby/packrat/keymaps/3uc/config.h
diff --git a/keyboards/packrat/keymaps/3uc/keymap.c b/keyboards/drhigsby/packrat/keymaps/3uc/keymap.c
similarity index 100%
rename from keyboards/packrat/keymaps/3uc/keymap.c
rename to keyboards/drhigsby/packrat/keymaps/3uc/keymap.c
diff --git a/keyboards/packrat/keymaps/3uc/readme.md b/keyboards/drhigsby/packrat/keymaps/3uc/readme.md
similarity index 100%
rename from keyboards/packrat/keymaps/3uc/readme.md
rename to keyboards/drhigsby/packrat/keymaps/3uc/readme.md
diff --git a/keyboards/packrat/keymaps/3uc/rules.mk b/keyboards/drhigsby/packrat/keymaps/3uc/rules.mk
similarity index 100%
rename from keyboards/packrat/keymaps/3uc/rules.mk
rename to keyboards/drhigsby/packrat/keymaps/3uc/rules.mk
diff --git a/keyboards/packrat/keymaps/default/config.h b/keyboards/drhigsby/packrat/keymaps/default/config.h
similarity index 100%
rename from keyboards/packrat/keymaps/default/config.h
rename to keyboards/drhigsby/packrat/keymaps/default/config.h
diff --git a/keyboards/packrat/keymaps/default/keymap.c b/keyboards/drhigsby/packrat/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/packrat/keymaps/default/keymap.c
rename to keyboards/drhigsby/packrat/keymaps/default/keymap.c
diff --git a/keyboards/packrat/keymaps/default/readme.md b/keyboards/drhigsby/packrat/keymaps/default/readme.md
similarity index 100%
rename from keyboards/packrat/keymaps/default/readme.md
rename to keyboards/drhigsby/packrat/keymaps/default/readme.md
diff --git a/keyboards/packrat/keymaps/default/rules.mk b/keyboards/drhigsby/packrat/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/packrat/keymaps/default/rules.mk
rename to keyboards/drhigsby/packrat/keymaps/default/rules.mk
diff --git a/keyboards/packrat/packrat.c b/keyboards/drhigsby/packrat/packrat.c
similarity index 100%
rename from keyboards/packrat/packrat.c
rename to keyboards/drhigsby/packrat/packrat.c
diff --git a/keyboards/packrat/packrat.h b/keyboards/drhigsby/packrat/packrat.h
similarity index 100%
rename from keyboards/packrat/packrat.h
rename to keyboards/drhigsby/packrat/packrat.h
diff --git a/keyboards/packrat/readme.md b/keyboards/drhigsby/packrat/readme.md
similarity index 97%
rename from keyboards/packrat/readme.md
rename to keyboards/drhigsby/packrat/readme.md
index a53377f870..98b12543dc 100644
--- a/keyboards/packrat/readme.md
+++ b/keyboards/drhigsby/packrat/readme.md
@@ -12,7 +12,7 @@ Packrat is an 11u wide ortholinear keyboard featuring multiple bottom row option
 
 Make example for this keyboard (after setting up your build environment):
 
-    make packrat:default
+    make drhigsby/packrat: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).
 
diff --git a/keyboards/packrat/rules.mk b/keyboards/drhigsby/packrat/rules.mk
similarity index 100%
rename from keyboards/packrat/rules.mk
rename to keyboards/drhigsby/packrat/rules.mk

From da5cb5fd6f91c2f7aebbcebbf211252c51d9b4a5 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 12:44:28 +0800
Subject: [PATCH 476/867] [Keyboard] move woodkeys.click keyboards to /woodkeys
 (#16113)

---
 keyboards/{ => woodkeys}/bigseries/1key/.noci                 | 0
 keyboards/{ => woodkeys}/bigseries/1key/1key.c                | 0
 keyboards/{ => woodkeys}/bigseries/1key/1key.h                | 0
 keyboards/{ => woodkeys}/bigseries/1key/config.h              | 0
 keyboards/{ => woodkeys}/bigseries/1key/info.json             | 0
 .../{ => woodkeys}/bigseries/1key/keymaps/8ball/keymap.c      | 0
 .../bigseries/1key/keymaps/ctrl-alt-del/keymap.c              | 0
 .../{ => woodkeys}/bigseries/1key/keymaps/default/keymap.c    | 0
 .../bigseries/1key/keymaps/dudeofawesome/README.md            | 0
 .../bigseries/1key/keymaps/dudeofawesome/config.h             | 0
 .../bigseries/1key/keymaps/dudeofawesome/keymap.c             | 0
 .../bigseries/1key/keymaps/dudeofawesome/rules.mk             | 0
 .../{ => woodkeys}/bigseries/1key/keymaps/leddance/config.h   | 0
 .../{ => woodkeys}/bigseries/1key/keymaps/leddance/keymap.c   | 0
 .../{ => woodkeys}/bigseries/1key/keymaps/leddance/rules.mk   | 0
 keyboards/{ => woodkeys}/bigseries/1key/keymaps/lock/keymap.c | 0
 .../{ => woodkeys}/bigseries/1key/keymaps/tester/keymap.c     | 0
 keyboards/{ => woodkeys}/bigseries/1key/readme.md             | 2 +-
 keyboards/{ => woodkeys}/bigseries/1key/rules.mk              | 0
 keyboards/{ => woodkeys}/bigseries/2key/.noci                 | 0
 keyboards/{ => woodkeys}/bigseries/2key/2key.c                | 0
 keyboards/{ => woodkeys}/bigseries/2key/2key.h                | 0
 keyboards/{ => woodkeys}/bigseries/2key/config.h              | 0
 keyboards/{ => woodkeys}/bigseries/2key/info.json             | 0
 .../{ => woodkeys}/bigseries/2key/keymaps/default/keymap.c    | 0
 keyboards/{ => woodkeys}/bigseries/2key/keymaps/lock/keymap.c | 0
 .../{ => woodkeys}/bigseries/2key/keymaps/tester/keymap.c     | 0
 keyboards/{ => woodkeys}/bigseries/2key/readme.md             | 2 +-
 keyboards/{ => woodkeys}/bigseries/2key/rules.mk              | 0
 keyboards/{ => woodkeys}/bigseries/3key/.noci                 | 0
 keyboards/{ => woodkeys}/bigseries/3key/3key.c                | 0
 keyboards/{ => woodkeys}/bigseries/3key/3key.h                | 0
 keyboards/{ => woodkeys}/bigseries/3key/config.h              | 0
 keyboards/{ => woodkeys}/bigseries/3key/info.json             | 0
 .../bigseries/3key/keymaps/ctrl-alt-del/keymap.c              | 0
 .../{ => woodkeys}/bigseries/3key/keymaps/default/keymap.c    | 0
 .../{ => woodkeys}/bigseries/3key/keymaps/tester/keymap.c     | 0
 keyboards/{ => woodkeys}/bigseries/3key/readme.md             | 2 +-
 keyboards/{ => woodkeys}/bigseries/3key/rules.mk              | 0
 keyboards/{ => woodkeys}/bigseries/4key/4key.c                | 0
 keyboards/{ => woodkeys}/bigseries/4key/4key.h                | 0
 keyboards/{ => woodkeys}/bigseries/4key/config.h              | 0
 keyboards/{ => woodkeys}/bigseries/4key/info.json             | 0
 .../{ => woodkeys}/bigseries/4key/keymaps/default/keymap.c    | 0
 .../{ => woodkeys}/bigseries/4key/keymaps/tester/keymap.c     | 0
 keyboards/{ => woodkeys}/bigseries/4key/readme.md             | 2 +-
 keyboards/{ => woodkeys}/bigseries/4key/rules.mk              | 0
 keyboards/{ => woodkeys}/bigseries/readme.md                  | 4 ++--
 keyboards/{ => woodkeys}/meira/TWIlib.c                       | 0
 keyboards/{ => woodkeys}/meira/TWIlib.h                       | 0
 keyboards/{ => woodkeys}/meira/config.h                       | 0
 keyboards/{ => woodkeys}/meira/featherble/config.h            | 0
 keyboards/{ => woodkeys}/meira/featherble/featherble.c        | 0
 keyboards/{ => woodkeys}/meira/featherble/featherble.h        | 0
 keyboards/{ => woodkeys}/meira/featherble/rules.mk            | 0
 keyboards/{ => woodkeys}/meira/info.json                      | 0
 keyboards/{ => woodkeys}/meira/issi.c                         | 0
 keyboards/{ => woodkeys}/meira/issi.h                         | 0
 keyboards/{ => woodkeys}/meira/keymaps/cole/config.h          | 0
 keyboards/{ => woodkeys}/meira/keymaps/cole/keymap.c          | 0
 keyboards/{ => woodkeys}/meira/keymaps/cole/readme.md         | 0
 keyboards/{ => woodkeys}/meira/keymaps/cole/rules.mk          | 0
 keyboards/{ => woodkeys}/meira/keymaps/default/config.h       | 0
 keyboards/{ => woodkeys}/meira/keymaps/default/keymap.c       | 0
 keyboards/{ => woodkeys}/meira/keymaps/default/readme.md      | 0
 keyboards/{ => woodkeys}/meira/keymaps/grahampheath/config.h  | 0
 keyboards/{ => woodkeys}/meira/keymaps/grahampheath/keymap.c  | 0
 keyboards/{ => woodkeys}/meira/keymaps/grahampheath/readme.md | 0
 keyboards/{ => woodkeys}/meira/keymaps/grahampheath/rules.mk  | 0
 keyboards/{ => woodkeys}/meira/keymaps/takmiya/config.h       | 0
 keyboards/{ => woodkeys}/meira/keymaps/takmiya/keymap.c       | 0
 keyboards/{ => woodkeys}/meira/keymaps/takmiya/readme.md      | 0
 keyboards/{ => woodkeys}/meira/lighting.c                     | 0
 keyboards/{ => woodkeys}/meira/lighting.h                     | 0
 keyboards/{ => woodkeys}/meira/matrix.c                       | 0
 keyboards/{ => woodkeys}/meira/meira.c                        | 0
 keyboards/{ => woodkeys}/meira/meira.h                        | 0
 keyboards/{ => woodkeys}/meira/promicro/config.h              | 0
 keyboards/{ => woodkeys}/meira/promicro/promicro.c            | 0
 keyboards/{ => woodkeys}/meira/promicro/promicro.h            | 0
 keyboards/{ => woodkeys}/meira/promicro/rules.mk              | 0
 keyboards/{ => woodkeys}/meira/readme.md                      | 4 ++--
 keyboards/{ => woodkeys}/meira/rules.mk                       | 2 +-
 keyboards/{ => woodkeys}/scarletbandana/config.h              | 0
 keyboards/{ => woodkeys}/scarletbandana/info.json             | 0
 .../{ => woodkeys}/scarletbandana/keymaps/default/keymap.c    | 0
 .../{ => woodkeys}/scarletbandana/keymaps/default/readme.md   | 0
 keyboards/{ => woodkeys}/scarletbandana/readme.md             | 2 +-
 keyboards/{ => woodkeys}/scarletbandana/rules.mk              | 0
 keyboards/{ => woodkeys}/scarletbandana/scarletbandana.c      | 0
 keyboards/{ => woodkeys}/scarletbandana/scarletbandana.h      | 0
 91 files changed, 10 insertions(+), 10 deletions(-)
 rename keyboards/{ => woodkeys}/bigseries/1key/.noci (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/1key.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/1key.h (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/config.h (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/info.json (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/keymaps/8ball/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/keymaps/ctrl-alt-del/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/keymaps/default/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/keymaps/dudeofawesome/README.md (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/keymaps/dudeofawesome/config.h (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/keymaps/dudeofawesome/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/keymaps/dudeofawesome/rules.mk (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/keymaps/leddance/config.h (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/keymaps/leddance/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/keymaps/leddance/rules.mk (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/keymaps/lock/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/keymaps/tester/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/1key/readme.md (95%)
 rename keyboards/{ => woodkeys}/bigseries/1key/rules.mk (100%)
 rename keyboards/{ => woodkeys}/bigseries/2key/.noci (100%)
 rename keyboards/{ => woodkeys}/bigseries/2key/2key.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/2key/2key.h (100%)
 rename keyboards/{ => woodkeys}/bigseries/2key/config.h (100%)
 rename keyboards/{ => woodkeys}/bigseries/2key/info.json (100%)
 rename keyboards/{ => woodkeys}/bigseries/2key/keymaps/default/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/2key/keymaps/lock/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/2key/keymaps/tester/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/2key/readme.md (95%)
 rename keyboards/{ => woodkeys}/bigseries/2key/rules.mk (100%)
 rename keyboards/{ => woodkeys}/bigseries/3key/.noci (100%)
 rename keyboards/{ => woodkeys}/bigseries/3key/3key.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/3key/3key.h (100%)
 rename keyboards/{ => woodkeys}/bigseries/3key/config.h (100%)
 rename keyboards/{ => woodkeys}/bigseries/3key/info.json (100%)
 rename keyboards/{ => woodkeys}/bigseries/3key/keymaps/ctrl-alt-del/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/3key/keymaps/default/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/3key/keymaps/tester/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/3key/readme.md (95%)
 rename keyboards/{ => woodkeys}/bigseries/3key/rules.mk (100%)
 rename keyboards/{ => woodkeys}/bigseries/4key/4key.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/4key/4key.h (100%)
 rename keyboards/{ => woodkeys}/bigseries/4key/config.h (100%)
 rename keyboards/{ => woodkeys}/bigseries/4key/info.json (100%)
 rename keyboards/{ => woodkeys}/bigseries/4key/keymaps/default/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/4key/keymaps/tester/keymap.c (100%)
 rename keyboards/{ => woodkeys}/bigseries/4key/readme.md (95%)
 rename keyboards/{ => woodkeys}/bigseries/4key/rules.mk (100%)
 rename keyboards/{ => woodkeys}/bigseries/readme.md (91%)
 rename keyboards/{ => woodkeys}/meira/TWIlib.c (100%)
 rename keyboards/{ => woodkeys}/meira/TWIlib.h (100%)
 rename keyboards/{ => woodkeys}/meira/config.h (100%)
 rename keyboards/{ => woodkeys}/meira/featherble/config.h (100%)
 rename keyboards/{ => woodkeys}/meira/featherble/featherble.c (100%)
 rename keyboards/{ => woodkeys}/meira/featherble/featherble.h (100%)
 rename keyboards/{ => woodkeys}/meira/featherble/rules.mk (100%)
 rename keyboards/{ => woodkeys}/meira/info.json (100%)
 rename keyboards/{ => woodkeys}/meira/issi.c (100%)
 rename keyboards/{ => woodkeys}/meira/issi.h (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/cole/config.h (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/cole/keymap.c (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/cole/readme.md (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/cole/rules.mk (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/default/config.h (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/default/keymap.c (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/default/readme.md (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/grahampheath/config.h (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/grahampheath/keymap.c (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/grahampheath/readme.md (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/grahampheath/rules.mk (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/takmiya/config.h (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/takmiya/keymap.c (100%)
 rename keyboards/{ => woodkeys}/meira/keymaps/takmiya/readme.md (100%)
 rename keyboards/{ => woodkeys}/meira/lighting.c (100%)
 rename keyboards/{ => woodkeys}/meira/lighting.h (100%)
 rename keyboards/{ => woodkeys}/meira/matrix.c (100%)
 rename keyboards/{ => woodkeys}/meira/meira.c (100%)
 rename keyboards/{ => woodkeys}/meira/meira.h (100%)
 rename keyboards/{ => woodkeys}/meira/promicro/config.h (100%)
 rename keyboards/{ => woodkeys}/meira/promicro/promicro.c (100%)
 rename keyboards/{ => woodkeys}/meira/promicro/promicro.h (100%)
 rename keyboards/{ => woodkeys}/meira/promicro/rules.mk (100%)
 rename keyboards/{ => woodkeys}/meira/readme.md (91%)
 rename keyboards/{ => woodkeys}/meira/rules.mk (96%)
 rename keyboards/{ => woodkeys}/scarletbandana/config.h (100%)
 rename keyboards/{ => woodkeys}/scarletbandana/info.json (100%)
 rename keyboards/{ => woodkeys}/scarletbandana/keymaps/default/keymap.c (100%)
 rename keyboards/{ => woodkeys}/scarletbandana/keymaps/default/readme.md (100%)
 rename keyboards/{ => woodkeys}/scarletbandana/readme.md (93%)
 rename keyboards/{ => woodkeys}/scarletbandana/rules.mk (100%)
 rename keyboards/{ => woodkeys}/scarletbandana/scarletbandana.c (100%)
 rename keyboards/{ => woodkeys}/scarletbandana/scarletbandana.h (100%)

diff --git a/keyboards/bigseries/1key/.noci b/keyboards/woodkeys/bigseries/1key/.noci
similarity index 100%
rename from keyboards/bigseries/1key/.noci
rename to keyboards/woodkeys/bigseries/1key/.noci
diff --git a/keyboards/bigseries/1key/1key.c b/keyboards/woodkeys/bigseries/1key/1key.c
similarity index 100%
rename from keyboards/bigseries/1key/1key.c
rename to keyboards/woodkeys/bigseries/1key/1key.c
diff --git a/keyboards/bigseries/1key/1key.h b/keyboards/woodkeys/bigseries/1key/1key.h
similarity index 100%
rename from keyboards/bigseries/1key/1key.h
rename to keyboards/woodkeys/bigseries/1key/1key.h
diff --git a/keyboards/bigseries/1key/config.h b/keyboards/woodkeys/bigseries/1key/config.h
similarity index 100%
rename from keyboards/bigseries/1key/config.h
rename to keyboards/woodkeys/bigseries/1key/config.h
diff --git a/keyboards/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json
similarity index 100%
rename from keyboards/bigseries/1key/info.json
rename to keyboards/woodkeys/bigseries/1key/info.json
diff --git a/keyboards/bigseries/1key/keymaps/8ball/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c
similarity index 100%
rename from keyboards/bigseries/1key/keymaps/8ball/keymap.c
rename to keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/ctrl-alt-del/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/ctrl-alt-del/keymap.c
similarity index 100%
rename from keyboards/bigseries/1key/keymaps/ctrl-alt-del/keymap.c
rename to keyboards/woodkeys/bigseries/1key/keymaps/ctrl-alt-del/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/default/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bigseries/1key/keymaps/default/keymap.c
rename to keyboards/woodkeys/bigseries/1key/keymaps/default/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/dudeofawesome/README.md b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/README.md
similarity index 100%
rename from keyboards/bigseries/1key/keymaps/dudeofawesome/README.md
rename to keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/README.md
diff --git a/keyboards/bigseries/1key/keymaps/dudeofawesome/config.h b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/config.h
similarity index 100%
rename from keyboards/bigseries/1key/keymaps/dudeofawesome/config.h
rename to keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/config.h
diff --git a/keyboards/bigseries/1key/keymaps/dudeofawesome/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/keymap.c
similarity index 100%
rename from keyboards/bigseries/1key/keymaps/dudeofawesome/keymap.c
rename to keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/dudeofawesome/rules.mk b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/rules.mk
similarity index 100%
rename from keyboards/bigseries/1key/keymaps/dudeofawesome/rules.mk
rename to keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/rules.mk
diff --git a/keyboards/bigseries/1key/keymaps/leddance/config.h b/keyboards/woodkeys/bigseries/1key/keymaps/leddance/config.h
similarity index 100%
rename from keyboards/bigseries/1key/keymaps/leddance/config.h
rename to keyboards/woodkeys/bigseries/1key/keymaps/leddance/config.h
diff --git a/keyboards/bigseries/1key/keymaps/leddance/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/leddance/keymap.c
similarity index 100%
rename from keyboards/bigseries/1key/keymaps/leddance/keymap.c
rename to keyboards/woodkeys/bigseries/1key/keymaps/leddance/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/leddance/rules.mk b/keyboards/woodkeys/bigseries/1key/keymaps/leddance/rules.mk
similarity index 100%
rename from keyboards/bigseries/1key/keymaps/leddance/rules.mk
rename to keyboards/woodkeys/bigseries/1key/keymaps/leddance/rules.mk
diff --git a/keyboards/bigseries/1key/keymaps/lock/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/lock/keymap.c
similarity index 100%
rename from keyboards/bigseries/1key/keymaps/lock/keymap.c
rename to keyboards/woodkeys/bigseries/1key/keymaps/lock/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/tester/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/tester/keymap.c
similarity index 100%
rename from keyboards/bigseries/1key/keymaps/tester/keymap.c
rename to keyboards/woodkeys/bigseries/1key/keymaps/tester/keymap.c
diff --git a/keyboards/bigseries/1key/readme.md b/keyboards/woodkeys/bigseries/1key/readme.md
similarity index 95%
rename from keyboards/bigseries/1key/readme.md
rename to keyboards/woodkeys/bigseries/1key/readme.md
index ad3ee28b14..3d019c65d3 100644
--- a/keyboards/bigseries/1key/readme.md
+++ b/keyboards/woodkeys/bigseries/1key/readme.md
@@ -10,6 +10,6 @@ Hardware Availability:  [Woodkeys.click](https://woodkeys.click), [NovelKeys](ht
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bigseries/1key:default
+    make woodkeys/bigseries/1key:default
 
 See [build environment setup](https://docs.qmk.fm/install-build-tools) then the [make instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/bigseries/1key/rules.mk b/keyboards/woodkeys/bigseries/1key/rules.mk
similarity index 100%
rename from keyboards/bigseries/1key/rules.mk
rename to keyboards/woodkeys/bigseries/1key/rules.mk
diff --git a/keyboards/bigseries/2key/.noci b/keyboards/woodkeys/bigseries/2key/.noci
similarity index 100%
rename from keyboards/bigseries/2key/.noci
rename to keyboards/woodkeys/bigseries/2key/.noci
diff --git a/keyboards/bigseries/2key/2key.c b/keyboards/woodkeys/bigseries/2key/2key.c
similarity index 100%
rename from keyboards/bigseries/2key/2key.c
rename to keyboards/woodkeys/bigseries/2key/2key.c
diff --git a/keyboards/bigseries/2key/2key.h b/keyboards/woodkeys/bigseries/2key/2key.h
similarity index 100%
rename from keyboards/bigseries/2key/2key.h
rename to keyboards/woodkeys/bigseries/2key/2key.h
diff --git a/keyboards/bigseries/2key/config.h b/keyboards/woodkeys/bigseries/2key/config.h
similarity index 100%
rename from keyboards/bigseries/2key/config.h
rename to keyboards/woodkeys/bigseries/2key/config.h
diff --git a/keyboards/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json
similarity index 100%
rename from keyboards/bigseries/2key/info.json
rename to keyboards/woodkeys/bigseries/2key/info.json
diff --git a/keyboards/bigseries/2key/keymaps/default/keymap.c b/keyboards/woodkeys/bigseries/2key/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bigseries/2key/keymaps/default/keymap.c
rename to keyboards/woodkeys/bigseries/2key/keymaps/default/keymap.c
diff --git a/keyboards/bigseries/2key/keymaps/lock/keymap.c b/keyboards/woodkeys/bigseries/2key/keymaps/lock/keymap.c
similarity index 100%
rename from keyboards/bigseries/2key/keymaps/lock/keymap.c
rename to keyboards/woodkeys/bigseries/2key/keymaps/lock/keymap.c
diff --git a/keyboards/bigseries/2key/keymaps/tester/keymap.c b/keyboards/woodkeys/bigseries/2key/keymaps/tester/keymap.c
similarity index 100%
rename from keyboards/bigseries/2key/keymaps/tester/keymap.c
rename to keyboards/woodkeys/bigseries/2key/keymaps/tester/keymap.c
diff --git a/keyboards/bigseries/2key/readme.md b/keyboards/woodkeys/bigseries/2key/readme.md
similarity index 95%
rename from keyboards/bigseries/2key/readme.md
rename to keyboards/woodkeys/bigseries/2key/readme.md
index e882433017..f6bcc5efbb 100644
--- a/keyboards/bigseries/2key/readme.md
+++ b/keyboards/woodkeys/bigseries/2key/readme.md
@@ -10,6 +10,6 @@ Hardware Availability:  [Woodkeys.click](https://woodkeys.click), [NovelKeys](ht
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bigseries/2key:default
+    make woodkeys/bigseries/2key:default
 
 See [build environment setup](https://docs.qmk.fm/install-build-tools) then the [make instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/bigseries/2key/rules.mk b/keyboards/woodkeys/bigseries/2key/rules.mk
similarity index 100%
rename from keyboards/bigseries/2key/rules.mk
rename to keyboards/woodkeys/bigseries/2key/rules.mk
diff --git a/keyboards/bigseries/3key/.noci b/keyboards/woodkeys/bigseries/3key/.noci
similarity index 100%
rename from keyboards/bigseries/3key/.noci
rename to keyboards/woodkeys/bigseries/3key/.noci
diff --git a/keyboards/bigseries/3key/3key.c b/keyboards/woodkeys/bigseries/3key/3key.c
similarity index 100%
rename from keyboards/bigseries/3key/3key.c
rename to keyboards/woodkeys/bigseries/3key/3key.c
diff --git a/keyboards/bigseries/3key/3key.h b/keyboards/woodkeys/bigseries/3key/3key.h
similarity index 100%
rename from keyboards/bigseries/3key/3key.h
rename to keyboards/woodkeys/bigseries/3key/3key.h
diff --git a/keyboards/bigseries/3key/config.h b/keyboards/woodkeys/bigseries/3key/config.h
similarity index 100%
rename from keyboards/bigseries/3key/config.h
rename to keyboards/woodkeys/bigseries/3key/config.h
diff --git a/keyboards/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json
similarity index 100%
rename from keyboards/bigseries/3key/info.json
rename to keyboards/woodkeys/bigseries/3key/info.json
diff --git a/keyboards/bigseries/3key/keymaps/ctrl-alt-del/keymap.c b/keyboards/woodkeys/bigseries/3key/keymaps/ctrl-alt-del/keymap.c
similarity index 100%
rename from keyboards/bigseries/3key/keymaps/ctrl-alt-del/keymap.c
rename to keyboards/woodkeys/bigseries/3key/keymaps/ctrl-alt-del/keymap.c
diff --git a/keyboards/bigseries/3key/keymaps/default/keymap.c b/keyboards/woodkeys/bigseries/3key/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bigseries/3key/keymaps/default/keymap.c
rename to keyboards/woodkeys/bigseries/3key/keymaps/default/keymap.c
diff --git a/keyboards/bigseries/3key/keymaps/tester/keymap.c b/keyboards/woodkeys/bigseries/3key/keymaps/tester/keymap.c
similarity index 100%
rename from keyboards/bigseries/3key/keymaps/tester/keymap.c
rename to keyboards/woodkeys/bigseries/3key/keymaps/tester/keymap.c
diff --git a/keyboards/bigseries/3key/readme.md b/keyboards/woodkeys/bigseries/3key/readme.md
similarity index 95%
rename from keyboards/bigseries/3key/readme.md
rename to keyboards/woodkeys/bigseries/3key/readme.md
index d32ec486a0..c8d0275b87 100644
--- a/keyboards/bigseries/3key/readme.md
+++ b/keyboards/woodkeys/bigseries/3key/readme.md
@@ -10,6 +10,6 @@ Hardware Availability:  [Woodkeys.click](https://woodkeys.click), [NovelKeys](ht
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bigseries/3key:default
+    make woodkeys/bigseries/3key:default
 
 See [build environment setup](https://docs.qmk.fm/install-build-tools) then the [make instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/bigseries/3key/rules.mk b/keyboards/woodkeys/bigseries/3key/rules.mk
similarity index 100%
rename from keyboards/bigseries/3key/rules.mk
rename to keyboards/woodkeys/bigseries/3key/rules.mk
diff --git a/keyboards/bigseries/4key/4key.c b/keyboards/woodkeys/bigseries/4key/4key.c
similarity index 100%
rename from keyboards/bigseries/4key/4key.c
rename to keyboards/woodkeys/bigseries/4key/4key.c
diff --git a/keyboards/bigseries/4key/4key.h b/keyboards/woodkeys/bigseries/4key/4key.h
similarity index 100%
rename from keyboards/bigseries/4key/4key.h
rename to keyboards/woodkeys/bigseries/4key/4key.h
diff --git a/keyboards/bigseries/4key/config.h b/keyboards/woodkeys/bigseries/4key/config.h
similarity index 100%
rename from keyboards/bigseries/4key/config.h
rename to keyboards/woodkeys/bigseries/4key/config.h
diff --git a/keyboards/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json
similarity index 100%
rename from keyboards/bigseries/4key/info.json
rename to keyboards/woodkeys/bigseries/4key/info.json
diff --git a/keyboards/bigseries/4key/keymaps/default/keymap.c b/keyboards/woodkeys/bigseries/4key/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/bigseries/4key/keymaps/default/keymap.c
rename to keyboards/woodkeys/bigseries/4key/keymaps/default/keymap.c
diff --git a/keyboards/bigseries/4key/keymaps/tester/keymap.c b/keyboards/woodkeys/bigseries/4key/keymaps/tester/keymap.c
similarity index 100%
rename from keyboards/bigseries/4key/keymaps/tester/keymap.c
rename to keyboards/woodkeys/bigseries/4key/keymaps/tester/keymap.c
diff --git a/keyboards/bigseries/4key/readme.md b/keyboards/woodkeys/bigseries/4key/readme.md
similarity index 95%
rename from keyboards/bigseries/4key/readme.md
rename to keyboards/woodkeys/bigseries/4key/readme.md
index ec40e83f2c..2ac56a25c7 100644
--- a/keyboards/bigseries/4key/readme.md
+++ b/keyboards/woodkeys/bigseries/4key/readme.md
@@ -10,6 +10,6 @@ Hardware Availability:  [Woodkeys.click](https://woodkeys.click), [NovelKeys](ht
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bigseries/4key:default
+    make woodkeys/bigseries/4key:default
 
 See [build environment setup](https://docs.qmk.fm/install-build-tools) then the [make instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/bigseries/4key/rules.mk b/keyboards/woodkeys/bigseries/4key/rules.mk
similarity index 100%
rename from keyboards/bigseries/4key/rules.mk
rename to keyboards/woodkeys/bigseries/4key/rules.mk
diff --git a/keyboards/bigseries/readme.md b/keyboards/woodkeys/bigseries/readme.md
similarity index 91%
rename from keyboards/bigseries/readme.md
rename to keyboards/woodkeys/bigseries/readme.md
index 0b40667353..5f7a123508 100644
--- a/keyboards/bigseries/readme.md
+++ b/keyboards/woodkeys/bigseries/readme.md
@@ -10,7 +10,7 @@ Hardware Availability:  [Woodkeys.click](https://woodkeys.click), [NovelKeys](ht
 
 Make example for these keyboards (after setting up your build environment):
 
-    make bigseries/1key:default
-    make bigseries/3key:ctrl-alt-del
+    make woodkeys/bigseries/1key:default
+    make woodkeys/bigseries/3key:ctrl-alt-del
 
 See [build environment setup](https://docs.qmk.fm/install-build-tools) then the [make instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/meira/TWIlib.c b/keyboards/woodkeys/meira/TWIlib.c
similarity index 100%
rename from keyboards/meira/TWIlib.c
rename to keyboards/woodkeys/meira/TWIlib.c
diff --git a/keyboards/meira/TWIlib.h b/keyboards/woodkeys/meira/TWIlib.h
similarity index 100%
rename from keyboards/meira/TWIlib.h
rename to keyboards/woodkeys/meira/TWIlib.h
diff --git a/keyboards/meira/config.h b/keyboards/woodkeys/meira/config.h
similarity index 100%
rename from keyboards/meira/config.h
rename to keyboards/woodkeys/meira/config.h
diff --git a/keyboards/meira/featherble/config.h b/keyboards/woodkeys/meira/featherble/config.h
similarity index 100%
rename from keyboards/meira/featherble/config.h
rename to keyboards/woodkeys/meira/featherble/config.h
diff --git a/keyboards/meira/featherble/featherble.c b/keyboards/woodkeys/meira/featherble/featherble.c
similarity index 100%
rename from keyboards/meira/featherble/featherble.c
rename to keyboards/woodkeys/meira/featherble/featherble.c
diff --git a/keyboards/meira/featherble/featherble.h b/keyboards/woodkeys/meira/featherble/featherble.h
similarity index 100%
rename from keyboards/meira/featherble/featherble.h
rename to keyboards/woodkeys/meira/featherble/featherble.h
diff --git a/keyboards/meira/featherble/rules.mk b/keyboards/woodkeys/meira/featherble/rules.mk
similarity index 100%
rename from keyboards/meira/featherble/rules.mk
rename to keyboards/woodkeys/meira/featherble/rules.mk
diff --git a/keyboards/meira/info.json b/keyboards/woodkeys/meira/info.json
similarity index 100%
rename from keyboards/meira/info.json
rename to keyboards/woodkeys/meira/info.json
diff --git a/keyboards/meira/issi.c b/keyboards/woodkeys/meira/issi.c
similarity index 100%
rename from keyboards/meira/issi.c
rename to keyboards/woodkeys/meira/issi.c
diff --git a/keyboards/meira/issi.h b/keyboards/woodkeys/meira/issi.h
similarity index 100%
rename from keyboards/meira/issi.h
rename to keyboards/woodkeys/meira/issi.h
diff --git a/keyboards/meira/keymaps/cole/config.h b/keyboards/woodkeys/meira/keymaps/cole/config.h
similarity index 100%
rename from keyboards/meira/keymaps/cole/config.h
rename to keyboards/woodkeys/meira/keymaps/cole/config.h
diff --git a/keyboards/meira/keymaps/cole/keymap.c b/keyboards/woodkeys/meira/keymaps/cole/keymap.c
similarity index 100%
rename from keyboards/meira/keymaps/cole/keymap.c
rename to keyboards/woodkeys/meira/keymaps/cole/keymap.c
diff --git a/keyboards/meira/keymaps/cole/readme.md b/keyboards/woodkeys/meira/keymaps/cole/readme.md
similarity index 100%
rename from keyboards/meira/keymaps/cole/readme.md
rename to keyboards/woodkeys/meira/keymaps/cole/readme.md
diff --git a/keyboards/meira/keymaps/cole/rules.mk b/keyboards/woodkeys/meira/keymaps/cole/rules.mk
similarity index 100%
rename from keyboards/meira/keymaps/cole/rules.mk
rename to keyboards/woodkeys/meira/keymaps/cole/rules.mk
diff --git a/keyboards/meira/keymaps/default/config.h b/keyboards/woodkeys/meira/keymaps/default/config.h
similarity index 100%
rename from keyboards/meira/keymaps/default/config.h
rename to keyboards/woodkeys/meira/keymaps/default/config.h
diff --git a/keyboards/meira/keymaps/default/keymap.c b/keyboards/woodkeys/meira/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/meira/keymaps/default/keymap.c
rename to keyboards/woodkeys/meira/keymaps/default/keymap.c
diff --git a/keyboards/meira/keymaps/default/readme.md b/keyboards/woodkeys/meira/keymaps/default/readme.md
similarity index 100%
rename from keyboards/meira/keymaps/default/readme.md
rename to keyboards/woodkeys/meira/keymaps/default/readme.md
diff --git a/keyboards/meira/keymaps/grahampheath/config.h b/keyboards/woodkeys/meira/keymaps/grahampheath/config.h
similarity index 100%
rename from keyboards/meira/keymaps/grahampheath/config.h
rename to keyboards/woodkeys/meira/keymaps/grahampheath/config.h
diff --git a/keyboards/meira/keymaps/grahampheath/keymap.c b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
similarity index 100%
rename from keyboards/meira/keymaps/grahampheath/keymap.c
rename to keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
diff --git a/keyboards/meira/keymaps/grahampheath/readme.md b/keyboards/woodkeys/meira/keymaps/grahampheath/readme.md
similarity index 100%
rename from keyboards/meira/keymaps/grahampheath/readme.md
rename to keyboards/woodkeys/meira/keymaps/grahampheath/readme.md
diff --git a/keyboards/meira/keymaps/grahampheath/rules.mk b/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk
similarity index 100%
rename from keyboards/meira/keymaps/grahampheath/rules.mk
rename to keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk
diff --git a/keyboards/meira/keymaps/takmiya/config.h b/keyboards/woodkeys/meira/keymaps/takmiya/config.h
similarity index 100%
rename from keyboards/meira/keymaps/takmiya/config.h
rename to keyboards/woodkeys/meira/keymaps/takmiya/config.h
diff --git a/keyboards/meira/keymaps/takmiya/keymap.c b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
similarity index 100%
rename from keyboards/meira/keymaps/takmiya/keymap.c
rename to keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
diff --git a/keyboards/meira/keymaps/takmiya/readme.md b/keyboards/woodkeys/meira/keymaps/takmiya/readme.md
similarity index 100%
rename from keyboards/meira/keymaps/takmiya/readme.md
rename to keyboards/woodkeys/meira/keymaps/takmiya/readme.md
diff --git a/keyboards/meira/lighting.c b/keyboards/woodkeys/meira/lighting.c
similarity index 100%
rename from keyboards/meira/lighting.c
rename to keyboards/woodkeys/meira/lighting.c
diff --git a/keyboards/meira/lighting.h b/keyboards/woodkeys/meira/lighting.h
similarity index 100%
rename from keyboards/meira/lighting.h
rename to keyboards/woodkeys/meira/lighting.h
diff --git a/keyboards/meira/matrix.c b/keyboards/woodkeys/meira/matrix.c
similarity index 100%
rename from keyboards/meira/matrix.c
rename to keyboards/woodkeys/meira/matrix.c
diff --git a/keyboards/meira/meira.c b/keyboards/woodkeys/meira/meira.c
similarity index 100%
rename from keyboards/meira/meira.c
rename to keyboards/woodkeys/meira/meira.c
diff --git a/keyboards/meira/meira.h b/keyboards/woodkeys/meira/meira.h
similarity index 100%
rename from keyboards/meira/meira.h
rename to keyboards/woodkeys/meira/meira.h
diff --git a/keyboards/meira/promicro/config.h b/keyboards/woodkeys/meira/promicro/config.h
similarity index 100%
rename from keyboards/meira/promicro/config.h
rename to keyboards/woodkeys/meira/promicro/config.h
diff --git a/keyboards/meira/promicro/promicro.c b/keyboards/woodkeys/meira/promicro/promicro.c
similarity index 100%
rename from keyboards/meira/promicro/promicro.c
rename to keyboards/woodkeys/meira/promicro/promicro.c
diff --git a/keyboards/meira/promicro/promicro.h b/keyboards/woodkeys/meira/promicro/promicro.h
similarity index 100%
rename from keyboards/meira/promicro/promicro.h
rename to keyboards/woodkeys/meira/promicro/promicro.h
diff --git a/keyboards/meira/promicro/rules.mk b/keyboards/woodkeys/meira/promicro/rules.mk
similarity index 100%
rename from keyboards/meira/promicro/rules.mk
rename to keyboards/woodkeys/meira/promicro/rules.mk
diff --git a/keyboards/meira/readme.md b/keyboards/woodkeys/meira/readme.md
similarity index 91%
rename from keyboards/meira/readme.md
rename to keyboards/woodkeys/meira/readme.md
index 716eb7445d..f0fb02b69e 100644
--- a/keyboards/meira/readme.md
+++ b/keyboards/woodkeys/meira/readme.md
@@ -12,8 +12,8 @@ Two controllers are supported: the Pro Micro, and the Adafruit Feather BLE 32u4.
 
 Make examples for this keyboard (after setting up your build environment):
 
-    make meira/featherble:default  # for Feather BLE 32u4 controllers
-    make meira/promicro:default    # for Pro Micro controllers
+    make woodkeys/meira/featherble:default  # for Feather BLE 32u4 controllers
+    make woodkeys/meira/promicro:default    # for Pro Micro controllers
 
 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).
 
diff --git a/keyboards/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk
similarity index 96%
rename from keyboards/meira/rules.mk
rename to keyboards/woodkeys/meira/rules.mk
index cdd0acb824..6b5025500c 100644
--- a/keyboards/meira/rules.mk
+++ b/keyboards/woodkeys/meira/rules.mk
@@ -30,5 +30,5 @@ CUSTOM_MATRIX = yes
 #endif
 SRC += matrix.c TWIlib.c issi.c lighting.c
 
-DEFAULT_FOLDER = meira/promicro
+DEFAULT_FOLDER = woodkeys/meira/promicro
 LAYOUTS = ortho_4x12
diff --git a/keyboards/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h
similarity index 100%
rename from keyboards/scarletbandana/config.h
rename to keyboards/woodkeys/scarletbandana/config.h
diff --git a/keyboards/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/info.json
similarity index 100%
rename from keyboards/scarletbandana/info.json
rename to keyboards/woodkeys/scarletbandana/info.json
diff --git a/keyboards/scarletbandana/keymaps/default/keymap.c b/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/scarletbandana/keymaps/default/keymap.c
rename to keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c
diff --git a/keyboards/scarletbandana/keymaps/default/readme.md b/keyboards/woodkeys/scarletbandana/keymaps/default/readme.md
similarity index 100%
rename from keyboards/scarletbandana/keymaps/default/readme.md
rename to keyboards/woodkeys/scarletbandana/keymaps/default/readme.md
diff --git a/keyboards/scarletbandana/readme.md b/keyboards/woodkeys/scarletbandana/readme.md
similarity index 93%
rename from keyboards/scarletbandana/readme.md
rename to keyboards/woodkeys/scarletbandana/readme.md
index 83281bae36..4505fd0573 100644
--- a/keyboards/scarletbandana/readme.md
+++ b/keyboards/woodkeys/scarletbandana/readme.md
@@ -6,6 +6,6 @@ Hardware Availability: [WoodKeys.click](https://woodkeys.click/product/scarlet-b
 
 Make example for this keyboard (after setting up your build environment):
 
-    make scarletbandana:default
+    make woodkeys/scarletbandana: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).
diff --git a/keyboards/scarletbandana/rules.mk b/keyboards/woodkeys/scarletbandana/rules.mk
similarity index 100%
rename from keyboards/scarletbandana/rules.mk
rename to keyboards/woodkeys/scarletbandana/rules.mk
diff --git a/keyboards/scarletbandana/scarletbandana.c b/keyboards/woodkeys/scarletbandana/scarletbandana.c
similarity index 100%
rename from keyboards/scarletbandana/scarletbandana.c
rename to keyboards/woodkeys/scarletbandana/scarletbandana.c
diff --git a/keyboards/scarletbandana/scarletbandana.h b/keyboards/woodkeys/scarletbandana/scarletbandana.h
similarity index 100%
rename from keyboards/scarletbandana/scarletbandana.h
rename to keyboards/woodkeys/scarletbandana/scarletbandana.h

From e22efc037a7e4da17f1051d5053768e40683da68 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 2 Feb 2022 15:04:37 +1100
Subject: [PATCH 477/867] Don't make EEPROM size assumptions with dynamic
 keymaps. (#16054)

* Don't make EEPROM size assumptions with dynamic keymaps.

* Add support for checking against emulated flash, error out if someone attempts to build a board without specifying EEPROM size.

* Reorder defines so that MCU is considered last.

* Refactor EEPROM definitions for simplicity.

* Fix max sizing of kabedon/kabedon980.

* Fix max sizing of mechlovin/olly/jf.

* Fix unit tests.

* Review comments, add messages with values during build failures.
---
 common_features.mk                            |  9 ++-
 keyboards/kabedon/kabedon980/config.h         | 10 +--
 .../kabedon/kabedon980/keymaps/via/keymap.c   | 20 ++----
 .../mechlovin/olly/jf/keymaps/via/config.h    |  4 +-
 .../mechlovin/olly/jf/keymaps/via/keymap.c    | 25 -------
 .../arm_atsam/{eeprom.c => eeprom_samd.c}     |  6 +-
 platforms/arm_atsam/eeprom_samd.h             |  8 +++
 platforms/chibios/eeprom_stm32.c              | 66 +------------------
 platforms/chibios/eeprom_stm32_defs.h         | 62 +++++++++++++++++
 platforms/chibios/eeprom_teensy.c             | 15 +----
 platforms/chibios/eeprom_teensy.h             | 22 +++++++
 platforms/eeprom.h                            | 49 ++++++++++++++
 platforms/test/eeprom.c                       |  4 +-
 platforms/test/eeprom_stm32_tests.cpp         |  3 -
 platforms/test/eeprom_stm32_tests.h           |  8 +++
 platforms/test/rules.mk                       |  2 +-
 quantum/dynamic_keymap.c                      | 25 ++++---
 17 files changed, 185 insertions(+), 153 deletions(-)
 rename platforms/arm_atsam/{eeprom.c => eeprom_samd.c} (96%)
 create mode 100755 platforms/arm_atsam/eeprom_samd.h
 create mode 100755 platforms/chibios/eeprom_teensy.h
 create mode 100644 platforms/test/eeprom_stm32_tests.h

diff --git a/common_features.mk b/common_features.mk
index d3da487e69..5c5e6a9a25 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -186,20 +186,21 @@ else
     else ifeq ($(PLATFORM),CHIBIOS)
       ifneq ($(filter STM32F3xx_% STM32F1xx_% %_STM32F401xC %_STM32F401xE %_STM32F405xG %_STM32F411xE %_STM32F072xB %_STM32F042x6 %_GD32VF103xB %_GD32VF103x8, $(MCU_SERIES)_$(MCU_LDSCRIPT)),)
         # Emulated EEPROM
-        OPT_DEFS += -DEEPROM_DRIVER
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_FLASH_EMULATED
         COMMON_VPATH += $(DRIVER_PATH)/eeprom
         SRC += eeprom_driver.c
         SRC += $(PLATFORM_COMMON_DIR)/eeprom_stm32.c
         SRC += $(PLATFORM_COMMON_DIR)/flash_stm32.c
       else ifneq ($(filter $(MCU_SERIES),STM32L0xx STM32L1xx),)
         # True EEPROM on STM32L0xx, L1xx
-        OPT_DEFS += -DEEPROM_DRIVER
+        OPT_DEFS += -DEEPROM_DRIVER -DEEPROM_STM32_L0_L1
         COMMON_VPATH += $(DRIVER_PATH)/eeprom
         COMMON_VPATH += $(PLATFORM_PATH)/$(PLATFORM_KEY)/$(DRIVER_DIR)/eeprom
         SRC += eeprom_driver.c
         SRC += eeprom_stm32_L0_L1.c
       else ifneq ($(filter $(MCU_SERIES),KL2x K20x),)
         # Teensy EEPROM implementations
+        OPT_DEFS += -DEEPROM_TEENSY
         SRC += eeprom_teensy.c
       else
         # Fall back to transient, i.e. non-persistent
@@ -209,9 +210,11 @@ else
       endif
     else ifeq ($(PLATFORM),ARM_ATSAM)
       # arm_atsam EEPROM
-      SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
+      OPT_DEFS += -DEEPROM_SAMD
+      SRC += $(PLATFORM_COMMON_DIR)/eeprom_samd.c
     else ifeq ($(PLATFORM),TEST)
       # Test harness "EEPROM"
+      OPT_DEFS += -DEEPROM_TEST_HARNESS
       SRC += $(PLATFORM_COMMON_DIR)/eeprom.c
     endif
   endif
diff --git a/keyboards/kabedon/kabedon980/config.h b/keyboards/kabedon/kabedon980/config.h
index 5dc70dfebf..db93dfcf85 100644
--- a/keyboards/kabedon/kabedon980/config.h
+++ b/keyboards/kabedon/kabedon980/config.h
@@ -32,21 +32,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 13
 
 /* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS {D0,D2,F7,B1,B0,D6,C7,D7,B5,B2} 
-#define MATRIX_COL_PINS {F5,F4,F6,C6,B6,B4,D3,D1,D4,F1,B3,D5,F0}  
+#define MATRIX_ROW_PINS {D0,D2,F7,B1,B0,D6,C7,D7,B5,B2}
+#define MATRIX_COL_PINS {F5,F4,F6,C6,B6,B4,D3,D1,D4,F1,B3,D5,F0}
 #define UNUSED_PINS
-#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-#define RGB_DI_PIN B7  
+#define RGB_DI_PIN B7
 #ifdef RGB_DI_PIN
   #define RGBLED_NUM 20
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-  #define RGBLIGHT_ANIMATIONS 
+  #define RGBLIGHT_ANIMATIONS
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/kabedon/kabedon980/keymaps/via/keymap.c b/keyboards/kabedon/kabedon980/keymaps/via/keymap.c
index 44574452bf..76eaa3968a 100644
--- a/keyboards/kabedon/kabedon980/keymaps/via/keymap.c
+++ b/keyboards/kabedon/kabedon980/keymaps/via/keymap.c
@@ -6,32 +6,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_ESC,           KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,    KC_F8,   KC_F9,    KC_F10,   KC_F11,   KC_F12,      KC_DEL,  KC_HOME, KC_PGUP, KC_PGDN,
     KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,     KC_9,    KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,     KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
     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_P7,   KC_P8,   KC_P9,   KC_PPLS,
-    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_P4,   KC_P5,   KC_P6,    
+    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_P4,   KC_P5,   KC_P6,
     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_P1,   KC_P2,   KC_P3,   KC_PENT,
     KC_LCTL, KC_LGUI, KC_LALT,                 KC_SPC,                           KC_RALT, MO(1),    KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_P0,       KC_PDOT  ),
-    
+
   [1] = LAYOUT(
     RGB_MOD,          RGB_TOG, RGB_SAI, RGB_SAD, RGB_HUI, RGB_HUD, RGB_SPI, RGB_SPD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,      KC_TRNS ),
-    
+
   [2] = LAYOUT(
-    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,      KC_TRNS ),
-    
-  [3] = LAYOUT(
-    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,      KC_TRNS )
 };
 
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/config.h b/keyboards/mechlovin/olly/jf/keymaps/via/config.h
index f330025a00..82c2e51eb9 100644
--- a/keyboards/mechlovin/olly/jf/keymaps/via/config.h
+++ b/keyboards/mechlovin/olly/jf/keymaps/via/config.h
@@ -17,6 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 1607
-#define DYNAMIC_KEYMAP_LAYER_COUNT 6
-
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c b/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
index c90eeb1830..18ac685abc 100644
--- a/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
@@ -40,29 +40,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [3] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [4] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-    [5] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-
 };
\ No newline at end of file
diff --git a/platforms/arm_atsam/eeprom.c b/platforms/arm_atsam/eeprom_samd.c
similarity index 96%
rename from platforms/arm_atsam/eeprom.c
rename to platforms/arm_atsam/eeprom_samd.c
index ff1a692623..beaffeec30 100644
--- a/platforms/arm_atsam/eeprom.c
+++ b/platforms/arm_atsam/eeprom_samd.c
@@ -18,11 +18,7 @@
 #include "samd51j18a.h"
 #include "core_cm4.h"
 #include "component/nvmctrl.h"
-
-#ifndef EEPROM_SIZE
-#    include "eeconfig.h"
-#    define EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4)  // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
-#endif
+#include "eeprom_samd.h"
 
 #ifndef MAX
 #    define MAX(X, Y) ((X) > (Y) ? (X) : (Y))
diff --git a/platforms/arm_atsam/eeprom_samd.h b/platforms/arm_atsam/eeprom_samd.h
new file mode 100755
index 0000000000..7dbff9bfa1
--- /dev/null
+++ b/platforms/arm_atsam/eeprom_samd.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifndef EEPROM_SIZE
+#    include "eeconfig.h"
+#    define EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4)  // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
+#endif
diff --git a/platforms/chibios/eeprom_stm32.c b/platforms/chibios/eeprom_stm32.c
index acc6a48516..8bf0b19c3d 100644
--- a/platforms/chibios/eeprom_stm32.c
+++ b/platforms/chibios/eeprom_stm32.c
@@ -133,10 +133,6 @@
  */
 
 #include "eeprom_stm32_defs.h"
-#if !defined(FEE_PAGE_SIZE) || !defined(FEE_PAGE_COUNT) || !defined(FEE_MCU_FLASH_SIZE) || !defined(FEE_PAGE_BASE_ADDRESS)
-#    error "not implemented."
-#endif
-
 /* These bits are used for optimizing encoding of bytes, 0 and 1 */
 #define FEE_WORD_ENCODING 0x8000
 #define FEE_VALUE_NEXT 0x6000
@@ -144,69 +140,11 @@
 #define FEE_VALUE_ENCODED 0x2000
 #define FEE_BYTE_RANGE 0x80
 
-/* Addressable range 16KByte: 0 <-> (0x1FFF << 1) */
-#define FEE_ADDRESS_MAX_SIZE 0x4000
-
 /* Flash word value after erase */
 #define FEE_EMPTY_WORD ((uint16_t)0xFFFF)
 
-/* Size of combined compacted eeprom and write log pages */
-#define FEE_DENSITY_MAX_SIZE (FEE_PAGE_COUNT * FEE_PAGE_SIZE)
-
-#ifndef FEE_MCU_FLASH_SIZE_IGNORE_CHECK /* *TODO: Get rid of this check */
-#    if FEE_DENSITY_MAX_SIZE > (FEE_MCU_FLASH_SIZE * 1024)
-#        pragma message STR(FEE_DENSITY_MAX_SIZE) " > " STR(FEE_MCU_FLASH_SIZE * 1024)
-#        error emulated eeprom: FEE_DENSITY_MAX_SIZE is greater than available flash size
-#    endif
-#endif
-
-/* Size of emulated eeprom */
-#ifdef FEE_DENSITY_BYTES
-#    if (FEE_DENSITY_BYTES > FEE_DENSITY_MAX_SIZE)
-#        pragma message STR(FEE_DENSITY_BYTES) " > " STR(FEE_DENSITY_MAX_SIZE)
-#        error emulated eeprom: FEE_DENSITY_BYTES exceeds FEE_DENSITY_MAX_SIZE
-#    endif
-#    if (FEE_DENSITY_BYTES == FEE_DENSITY_MAX_SIZE)
-#        pragma message STR(FEE_DENSITY_BYTES) " == " STR(FEE_DENSITY_MAX_SIZE)
-#        warning emulated eeprom: FEE_DENSITY_BYTES leaves no room for a write log.  This will greatly increase the flash wear rate!
-#    endif
-#    if FEE_DENSITY_BYTES > FEE_ADDRESS_MAX_SIZE
-#        pragma message STR(FEE_DENSITY_BYTES) " > " STR(FEE_ADDRESS_MAX_SIZE)
-#        error emulated eeprom: FEE_DENSITY_BYTES is greater than FEE_ADDRESS_MAX_SIZE allows
-#    endif
-#    if ((FEE_DENSITY_BYTES) % 2) == 1
-#        error emulated eeprom: FEE_DENSITY_BYTES must be even
-#    endif
-#else
-/* Default to half of allocated space used for emulated eeprom, half for write log */
-#    define FEE_DENSITY_BYTES (FEE_PAGE_COUNT * FEE_PAGE_SIZE / 2)
-#endif
-
-/* Size of write log */
-#ifdef FEE_WRITE_LOG_BYTES
-#    if ((FEE_DENSITY_BYTES + FEE_WRITE_LOG_BYTES) > FEE_DENSITY_MAX_SIZE)
-#        pragma message STR(FEE_DENSITY_BYTES) " + " STR(FEE_WRITE_LOG_BYTES) " > " STR(FEE_DENSITY_MAX_SIZE)
-#        error emulated eeprom: FEE_WRITE_LOG_BYTES exceeds remaining FEE_DENSITY_MAX_SIZE
-#    endif
-#    if ((FEE_WRITE_LOG_BYTES) % 2) == 1
-#        error emulated eeprom: FEE_WRITE_LOG_BYTES must be even
-#    endif
-#else
-/* Default to use all remaining space */
-#    define FEE_WRITE_LOG_BYTES (FEE_PAGE_COUNT * FEE_PAGE_SIZE - FEE_DENSITY_BYTES)
-#endif
-
-/* Start of the emulated eeprom compacted flash area */
-#define FEE_COMPACTED_BASE_ADDRESS FEE_PAGE_BASE_ADDRESS
-/* End of the emulated eeprom compacted flash area */
-#define FEE_COMPACTED_LAST_ADDRESS (FEE_COMPACTED_BASE_ADDRESS + FEE_DENSITY_BYTES)
-/* Start of the emulated eeprom write log */
-#define FEE_WRITE_LOG_BASE_ADDRESS FEE_COMPACTED_LAST_ADDRESS
-/* End of the emulated eeprom write log */
-#define FEE_WRITE_LOG_LAST_ADDRESS (FEE_WRITE_LOG_BASE_ADDRESS + FEE_WRITE_LOG_BYTES)
-
-#if defined(DYNAMIC_KEYMAP_EEPROM_MAX_ADDR) && (DYNAMIC_KEYMAP_EEPROM_MAX_ADDR >= FEE_DENSITY_BYTES)
-#    error emulated eeprom: DYNAMIC_KEYMAP_EEPROM_MAX_ADDR is greater than the FEE_DENSITY_BYTES available
+#if !defined(FEE_PAGE_SIZE) || !defined(FEE_PAGE_COUNT) || !defined(FEE_MCU_FLASH_SIZE) || !defined(FEE_PAGE_BASE_ADDRESS)
+#    error "not implemented."
 #endif
 
 /* In-memory contents of emulated eeprom for faster access */
diff --git a/platforms/chibios/eeprom_stm32_defs.h b/platforms/chibios/eeprom_stm32_defs.h
index 66904f247f..581434eb5e 100644
--- a/platforms/chibios/eeprom_stm32_defs.h
+++ b/platforms/chibios/eeprom_stm32_defs.h
@@ -72,3 +72,65 @@
 #        define FEE_PAGE_BASE_ADDRESS ((uintptr_t)(FEE_FLASH_BASE) + FEE_MCU_FLASH_SIZE * 1024 - (FEE_PAGE_COUNT * FEE_PAGE_SIZE))
 #    endif
 #endif
+
+/* Addressable range 16KByte: 0 <-> (0x1FFF << 1) */
+#define FEE_ADDRESS_MAX_SIZE 0x4000
+
+/* Size of combined compacted eeprom and write log pages */
+#define FEE_DENSITY_MAX_SIZE (FEE_PAGE_COUNT * FEE_PAGE_SIZE)
+
+#ifndef FEE_MCU_FLASH_SIZE_IGNORE_CHECK /* *TODO: Get rid of this check */
+#    if FEE_DENSITY_MAX_SIZE > (FEE_MCU_FLASH_SIZE * 1024)
+#        pragma message STR(FEE_DENSITY_MAX_SIZE) " > " STR(FEE_MCU_FLASH_SIZE * 1024)
+#        error emulated eeprom: FEE_DENSITY_MAX_SIZE is greater than available flash size
+#    endif
+#endif
+
+/* Size of emulated eeprom */
+#ifdef FEE_DENSITY_BYTES
+#    if (FEE_DENSITY_BYTES > FEE_DENSITY_MAX_SIZE)
+#        pragma message STR(FEE_DENSITY_BYTES) " > " STR(FEE_DENSITY_MAX_SIZE)
+#        error emulated eeprom: FEE_DENSITY_BYTES exceeds FEE_DENSITY_MAX_SIZE
+#    endif
+#    if (FEE_DENSITY_BYTES == FEE_DENSITY_MAX_SIZE)
+#        pragma message STR(FEE_DENSITY_BYTES) " == " STR(FEE_DENSITY_MAX_SIZE)
+#        warning emulated eeprom: FEE_DENSITY_BYTES leaves no room for a write log.  This will greatly increase the flash wear rate!
+#    endif
+#    if FEE_DENSITY_BYTES > FEE_ADDRESS_MAX_SIZE
+#        pragma message STR(FEE_DENSITY_BYTES) " > " STR(FEE_ADDRESS_MAX_SIZE)
+#        error emulated eeprom: FEE_DENSITY_BYTES is greater than FEE_ADDRESS_MAX_SIZE allows
+#    endif
+#    if ((FEE_DENSITY_BYTES) % 2) == 1
+#        error emulated eeprom: FEE_DENSITY_BYTES must be even
+#    endif
+#else
+/* Default to half of allocated space used for emulated eeprom, half for write log */
+#    define FEE_DENSITY_BYTES (FEE_PAGE_COUNT * FEE_PAGE_SIZE / 2)
+#endif
+
+/* Size of write log */
+#ifdef FEE_WRITE_LOG_BYTES
+#    if ((FEE_DENSITY_BYTES + FEE_WRITE_LOG_BYTES) > FEE_DENSITY_MAX_SIZE)
+#        pragma message STR(FEE_DENSITY_BYTES) " + " STR(FEE_WRITE_LOG_BYTES) " > " STR(FEE_DENSITY_MAX_SIZE)
+#        error emulated eeprom: FEE_WRITE_LOG_BYTES exceeds remaining FEE_DENSITY_MAX_SIZE
+#    endif
+#    if ((FEE_WRITE_LOG_BYTES) % 2) == 1
+#        error emulated eeprom: FEE_WRITE_LOG_BYTES must be even
+#    endif
+#else
+/* Default to use all remaining space */
+#    define FEE_WRITE_LOG_BYTES (FEE_PAGE_COUNT * FEE_PAGE_SIZE - FEE_DENSITY_BYTES)
+#endif
+
+/* Start of the emulated eeprom compacted flash area */
+#define FEE_COMPACTED_BASE_ADDRESS FEE_PAGE_BASE_ADDRESS
+/* End of the emulated eeprom compacted flash area */
+#define FEE_COMPACTED_LAST_ADDRESS (FEE_COMPACTED_BASE_ADDRESS + FEE_DENSITY_BYTES)
+/* Start of the emulated eeprom write log */
+#define FEE_WRITE_LOG_BASE_ADDRESS FEE_COMPACTED_LAST_ADDRESS
+/* End of the emulated eeprom write log */
+#define FEE_WRITE_LOG_LAST_ADDRESS (FEE_WRITE_LOG_BASE_ADDRESS + FEE_WRITE_LOG_BYTES)
+
+#if defined(DYNAMIC_KEYMAP_EEPROM_MAX_ADDR) && (DYNAMIC_KEYMAP_EEPROM_MAX_ADDR >= FEE_DENSITY_BYTES)
+#    error emulated eeprom: DYNAMIC_KEYMAP_EEPROM_MAX_ADDR is greater than the FEE_DENSITY_BYTES available
+#endif
diff --git a/platforms/chibios/eeprom_teensy.c b/platforms/chibios/eeprom_teensy.c
index 2093f9b4b2..575f51526e 100644
--- a/platforms/chibios/eeprom_teensy.c
+++ b/platforms/chibios/eeprom_teensy.c
@@ -1,6 +1,7 @@
 #include <ch.h>
 #include <hal.h>
 
+#include "eeprom_teensy.h"
 #include "eeconfig.h"
 
 /*************************************/
@@ -42,18 +43,6 @@
 #if defined(K20x) /* chip selection */
 /* Teensy 3.0, 3.1, 3.2; mchck; infinity keyboard */
 
-// The EEPROM is really RAM with a hardware-based backup system to
-// flash memory.  Selecting a smaller size EEPROM allows more wear
-// leveling, for higher write endurance.  If you edit this file,
-// set this to the smallest size your application can use.  Also,
-// due to Freescale's implementation, writing 16 or 32 bit words
-// (aligned to 2 or 4 byte boundaries) has twice the endurance
-// compared to writing 8 bit bytes.
-//
-#    ifndef EEPROM_SIZE
-#        define EEPROM_SIZE 32
-#    endif
-
 /*
     ^^^ Here be dragons:
         NXP AppNote AN4282 section 3.1 states that partitioning must only be done once.
@@ -350,8 +339,6 @@ void do_flash_cmd(volatile uint8_t *fstat)
 extern uint32_t __eeprom_workarea_start__;
 extern uint32_t __eeprom_workarea_end__;
 
-#    define EEPROM_SIZE 128
-
 static uint32_t flashend = 0;
 
 void eeprom_initialize(void) {
diff --git a/platforms/chibios/eeprom_teensy.h b/platforms/chibios/eeprom_teensy.h
new file mode 100755
index 0000000000..ead5998b29
--- /dev/null
+++ b/platforms/chibios/eeprom_teensy.h
@@ -0,0 +1,22 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#if defined(K20x)
+/* Teensy 3.0, 3.1, 3.2; mchck; infinity keyboard */
+// The EEPROM is really RAM with a hardware-based backup system to
+// flash memory.  Selecting a smaller size EEPROM allows more wear
+// leveling, for higher write endurance.  If you edit this file,
+// set this to the smallest size your application can use.  Also,
+// due to Freescale's implementation, writing 16 or 32 bit words
+// (aligned to 2 or 4 byte boundaries) has twice the endurance
+// compared to writing 8 bit bytes.
+//
+#    ifndef EEPROM_SIZE
+#        define EEPROM_SIZE 32
+#    endif
+#elif defined(KL2x) /* Teensy LC (emulated) */
+#    define EEPROM_SIZE 128
+#else
+#    error Unsupported Teensy EEPROM.
+#endif
diff --git a/platforms/eeprom.h b/platforms/eeprom.h
index f5b3f0ad53..091e6e4400 100644
--- a/platforms/eeprom.h
+++ b/platforms/eeprom.h
@@ -1,3 +1,5 @@
+// Copyright 2018-2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
 #if defined(__AVR__) && !defined(EEPROM_DRIVER)
@@ -19,3 +21,50 @@ void     eeprom_update_word(uint16_t *__p, uint16_t __value);
 void     eeprom_update_dword(uint32_t *__p, uint32_t __value);
 void     eeprom_update_block(const void *__src, void *__dst, size_t __n);
 #endif
+
+#if defined(EEPROM_CUSTOM)
+#    ifndef EEPROM_SIZE
+#        error EEPROM_SIZE has not been defined for custom driver.
+#    endif
+#    define TOTAL_EEPROM_BYTE_COUNT (EEPROM_SIZE)
+#elif defined(EEPROM_TRANSIENT)
+#    include "eeprom_transient.h"
+#    define TOTAL_EEPROM_BYTE_COUNT (TRANSIENT_EEPROM_SIZE)
+#elif defined(EEPROM_I2C)
+#    include "eeprom_i2c.h"
+#    define TOTAL_EEPROM_BYTE_COUNT (EXTERNAL_EEPROM_BYTE_COUNT)
+#elif defined(EEPROM_SPI)
+#    include "eeprom_spi.h"
+#    define TOTAL_EEPROM_BYTE_COUNT (EXTERNAL_EEPROM_BYTE_COUNT)
+#elif defined(EEPROM_STM32_L0_L1)
+#    include "eeprom_stm32_L0_L1.h"
+#    define TOTAL_EEPROM_BYTE_COUNT (STM32_ONBOARD_EEPROM_SIZE)
+#elif defined(EEPROM_TEENSY)
+#    include "eeprom_teensy.h"
+#    define TOTAL_EEPROM_BYTE_COUNT (EEPROM_SIZE)
+#elif defined(EEPROM_STM32_FLASH_EMULATED)
+#    include "eeprom_stm32_defs.h"
+#    define TOTAL_EEPROM_BYTE_COUNT (FEE_DENSITY_BYTES)
+#elif defined(EEPROM_SAMD)
+#    include "eeprom_samd.h"
+#    define TOTAL_EEPROM_BYTE_COUNT (EEPROM_SIZE)
+#elif defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_AT90USB162__) || defined(__AVR_ATtiny85__)
+#    define TOTAL_EEPROM_BYTE_COUNT 512
+#elif defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega328P__) || defined(__AVR_ATmega32A__)
+#    define TOTAL_EEPROM_BYTE_COUNT 1024
+#elif defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__)
+#    define TOTAL_EEPROM_BYTE_COUNT 2048
+#elif defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)
+#    define TOTAL_EEPROM_BYTE_COUNT 4096
+#elif defined(EEPROM_TEST_HARNESS)
+#    ifndef FLASH_STM32_MOCKED
+// Normal tests
+#        define TOTAL_EEPROM_BYTE_COUNT 32
+#    else
+// Flash wear-leveling testing
+#        include "eeprom_stm32_tests.h"
+#        define TOTAL_EEPROM_BYTE_COUNT (EEPROM_SIZE)
+#    endif
+#else
+#    error Unknown EEPROM driver.
+#endif
diff --git a/platforms/test/eeprom.c b/platforms/test/eeprom.c
index 5c8e69dae3..e292faa644 100644
--- a/platforms/test/eeprom.c
+++ b/platforms/test/eeprom.c
@@ -16,9 +16,7 @@
 
 #include "eeprom.h"
 
-#define EEPROM_SIZE 32
-
-static uint8_t buffer[EEPROM_SIZE];
+static uint8_t buffer[TOTAL_EEPROM_BYTE_COUNT];
 
 uint8_t eeprom_read_byte(const uint8_t *addr) {
     uintptr_t offset = (uintptr_t)addr;
diff --git a/platforms/test/eeprom_stm32_tests.cpp b/platforms/test/eeprom_stm32_tests.cpp
index 5bc8d87900..57f31d634f 100644
--- a/platforms/test/eeprom_stm32_tests.cpp
+++ b/platforms/test/eeprom_stm32_tests.cpp
@@ -17,8 +17,6 @@
 #include "gtest/gtest.h"
 
 extern "C" {
-#include "flash_stm32.h"
-#include "eeprom_stm32.h"
 #include "eeprom.h"
 }
 
@@ -46,7 +44,6 @@ extern "C" {
  *
  */
 
-#define EEPROM_SIZE (FEE_PAGE_SIZE * FEE_PAGE_COUNT / 2)
 #define LOG_SIZE EEPROM_SIZE
 #define LOG_BASE (MOCK_FLASH_SIZE - LOG_SIZE)
 #define EEPROM_BASE (LOG_BASE - EEPROM_SIZE)
diff --git a/platforms/test/eeprom_stm32_tests.h b/platforms/test/eeprom_stm32_tests.h
new file mode 100644
index 0000000000..35ed885e52
--- /dev/null
+++ b/platforms/test/eeprom_stm32_tests.h
@@ -0,0 +1,8 @@
+// Copyright 2018-2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "flash_stm32.h"
+#include "eeprom_stm32.h"
+
+#define EEPROM_SIZE (FEE_PAGE_SIZE * FEE_PAGE_COUNT / 2)
diff --git a/platforms/test/rules.mk b/platforms/test/rules.mk
index 66b853d8ee..55512c7392 100644
--- a/platforms/test/rules.mk
+++ b/platforms/test/rules.mk
@@ -1,4 +1,4 @@
-eeprom_stm32_DEFS  := -DFLASH_STM32_MOCKED -DNO_PRINT -DFEE_FLASH_BASE=FlashBuf
+eeprom_stm32_DEFS  := -DEEPROM_TEST_HARNESS -DFLASH_STM32_MOCKED -DNO_PRINT -DFEE_FLASH_BASE=FlashBuf
 eeprom_stm32_tiny_DEFS := $(eeprom_stm32_DEFS) \
 	-DFEE_MCU_FLASH_SIZE=1 \
 	-DMOCK_FLASH_SIZE=1024 \
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index 19a6bea59a..8f1f39bc0f 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -29,24 +29,22 @@
 #    define DYNAMIC_KEYMAP_MACRO_COUNT 16
 #endif
 
-// This is the default EEPROM max address to use for dynamic keymaps.
-// The default is the ATmega32u4 EEPROM max address.
-// Explicitly override it if the keyboard uses a microcontroller with
-// more EEPROM *and* it makes sense to increase it.
+#ifndef TOTAL_EEPROM_BYTE_COUNT
+#    error Unknown total EEPROM size. Cannot derive maximum for dynamic keymaps.
+#endif
+
 #ifndef DYNAMIC_KEYMAP_EEPROM_MAX_ADDR
-#    if defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__)
-#        define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
-#    elif defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)
-#        define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095
-#    elif defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_AT90USB162__) || defined(__AVR_ATtiny85__)
-#        define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 511
-#    else
-#        define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 1023
-#    endif
+#    define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR (TOTAL_EEPROM_BYTE_COUNT - 1)
+#endif
+
+#if DYNAMIC_KEYMAP_EEPROM_MAX_ADDR > (TOTAL_EEPROM_BYTE_COUNT - 1)
+#    pragma message STR(DYNAMIC_KEYMAP_EEPROM_MAX_ADDR) " > " STR((TOTAL_EEPROM_BYTE_COUNT - 1))
+#    error DYNAMIC_KEYMAP_EEPROM_MAX_ADDR is configured to use more space than what is available for the selected EEPROM driver
 #endif
 
 // Due to usage of uint16_t check for max 65535
 #if DYNAMIC_KEYMAP_EEPROM_MAX_ADDR > 65535
+#    pragma message STR(DYNAMIC_KEYMAP_EEPROM_MAX_ADDR) " > 65535"
 #    error DYNAMIC_KEYMAP_EEPROM_MAX_ADDR must be less than 65536
 #endif
 
@@ -71,6 +69,7 @@
 // or DYNAMIC_KEYMAP_EEPROM_MAX_ADDR to increase it, *only if* the microcontroller has
 // more than the default.
 #if DYNAMIC_KEYMAP_EEPROM_MAX_ADDR - DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR < 100
+#    pragma message STR(DYNAMIC_KEYMAP_EEPROM_MAX_ADDR - DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR) " < 100"
 #    error Dynamic keymaps are configured to use more EEPROM than is available.
 #endif
 

From 6e2b03cf6901a6bbd146c074e8e9d9160358c6d9 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 2 Feb 2022 15:30:22 +1100
Subject: [PATCH 478/867] Fixup multibuild filegen (#16166)

* Add env variable support to multibuild.

* Generate version.h in build-specific location.
---
 build_keyboard.mk                | 7 ++++++-
 lib/python/qmk/cli/multibuild.py | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build_keyboard.mk b/build_keyboard.mk
index e8c3bfe5fa..a5e20853b3 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -44,7 +44,6 @@ endif
 ifdef SKIP_GIT
 VERSION_H_FLAGS := --skip-git
 endif
-$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o quantum/version.h)
 
 # Determine which subfolders exist.
 KEYBOARD_FOLDER_PATH_1 := $(KEYBOARD)
@@ -166,6 +165,11 @@ generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c
 
 endif
 
+generated-files: $(KEYMAP_OUTPUT)/src/version.h
+$(KEYMAP_OUTPUT)/src/version.h:
+	[ -d $(KEYMAP_OUTPUT)/src ] || mkdir -p $(KEYMAP_OUTPUT)/src
+	$(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(KEYMAP_OUTPUT)/src/version.h
+
 ifeq ($(strip $(CTPC)), yes)
   CONVERT_TO_PROTON_C=yes
 endif
@@ -393,6 +397,7 @@ VPATH += $(KEYMAP_PATH)
 VPATH += $(USER_PATH)
 VPATH += $(KEYBOARD_PATHS)
 VPATH += $(COMMON_VPATH)
+VPATH += $(KEYMAP_OUTPUT)/src
 
 include common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
diff --git a/lib/python/qmk/cli/multibuild.py b/lib/python/qmk/cli/multibuild.py
index 85ed0fa1e9..ad059edff3 100755
--- a/lib/python/qmk/cli/multibuild.py
+++ b/lib/python/qmk/cli/multibuild.py
@@ -32,6 +32,7 @@ def _is_split(keyboard_name):
 @cli.argument('-c', '--clean', arg_only=True, action='store_true', help="Remove object files before compiling.")
 @cli.argument('-f', '--filter', arg_only=True, action='append', default=[], help="Filter the list of keyboards based on the supplied value in rules.mk. Supported format is 'SPLIT_KEYBOARD=yes'. May be passed multiple times.")
 @cli.argument('-km', '--keymap', type=str, default='default', help="The keymap name to build. Default is 'default'.")
+@cli.argument('-e', '--env', arg_only=True, action='append', default=[], help="Set a variable to be passed to make. May be passed multiple times.")
 @cli.subcommand('Compile QMK Firmware for all keyboards.', hidden=False if cli.config.user.developer else True)
 def multibuild(cli):
     """Compile QMK Firmware against all keyboards.
@@ -68,7 +69,7 @@ def multibuild(cli):
 all: {keyboard_safe}_binary
 {keyboard_safe}_binary:
 	@rm -f "{QMK_FIRMWARE}/.build/failed.log.{keyboard_safe}" || true
-	+@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{cli.args.keymap}" REQUIRE_PLATFORM_KEY= COLOR=true SILENT=false \\
+	+@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{cli.args.keymap}" REQUIRE_PLATFORM_KEY= COLOR=true SILENT=false {' '.join(cli.args.env)} \\
 		>>"{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" 2>&1 \\
 		|| cp "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" "{QMK_FIRMWARE}/.build/failed.log.{os.getpid()}.{keyboard_safe}"
 	@{{ grep '\[ERRORS\]' "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" >/dev/null 2>&1 && printf "Build %-64s \e[1;31m[ERRORS]\e[0m\\n" "{keyboard_name}:{cli.args.keymap}" ; }} \\

From 16ad8c0159383b0ecee7c97119e3d61f1038f56a Mon Sep 17 00:00:00 2001
From: Adrian Fleiszer <39962275+adrian-fleiszer@users.noreply.github.com>
Date: Wed, 2 Feb 2022 05:31:05 +0100
Subject: [PATCH 479/867] [Keyboard] Add YMDK sp64 VIA support (#16152)

---
 keyboards/ymdk/sp64/keymaps/via/keymap.c | 78 ++++++++++++++++++++++++
 keyboards/ymdk/sp64/keymaps/via/rules.mk |  2 +
 2 files changed, 80 insertions(+)
 create mode 100644 keyboards/ymdk/sp64/keymaps/via/keymap.c
 create mode 100644 keyboards/ymdk/sp64/keymaps/via/rules.mk

diff --git a/keyboards/ymdk/sp64/keymaps/via/keymap.c b/keyboards/ymdk/sp64/keymaps/via/keymap.c
new file mode 100644
index 0000000000..14a0e5f1f8
--- /dev/null
+++ b/keyboards/ymdk/sp64/keymaps/via/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2021 Adrian Fleiszer (@adrian-fleiszer)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
+ * │ Esc │  1  │  2  │  3  │  4  │  5  │  6  │    │  7  │  8  │  9  │  0  │  -  │  =  │ BkSp     │
+ * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
+ * │ Tab    │  Q  │  W  │  E  │  R  │  T  │    │  Y  │  U  │  I  │  O  │  P  │  [  │  ]  │ \     │
+ * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
+ * │ Caps    │  A  │  S  │  D  │  F  │  G  │    │  H  │  J  │  K  │  L  │  ;  │  '  │ Enter      │
+ * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
+ * │ LShift   │  Z  │  X  │  C  │  V  │  B  │    │  N  │  M  │  <  │  >  │  ?  │ Sft │ Up  │ Del │
+ * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
+ * │ Ctrl │ Win │ Alt  │             │ Fn  │    │               │ Alt   │ Win  │ Lft │ Dwn │ Rgt │
+ * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
+ */
+[0] = LAYOUT(
+  KC_ESC,  KC_1,    KC_2,    KC_3,     KC_4,    KC_5,     KC_6,               KC_7, KC_8,    KC_9,    KC_0,      KC_MINUS,    KC_EQUAL,    KC_BSPACE,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,               KC_Y,     KC_U, KC_I,    KC_O,    KC_P,      KC_LBRACKET, KC_RBRACKET, KC_BSLS,
+  KC_CAPS, KC_A,    KC_S,    KC_D,     KC_F,    KC_G,               KC_H,     KC_J, KC_K,    KC_L,    KC_SCOLON, KC_QUOTE,                 KC_ENTER,
+  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_DEL,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE,          MO(1),            KC_SPACE,         KC_RALT, KC_RGUI,            KC_LEFT,     KC_DOWN,     KC_RIGHT
+  ),
+/* Function
+ *
+ * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐    ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐
+ * │  `  │ F1  │  F2 │ F3  │ F4  │ F5  │ F6  │    │ F7  │ F8  │ F9  │ F10 │ F11 │ F12 │          │
+ * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤
+ * │        │     │     │     │     │     │    │     │     │     │     │     │     │     │       │
+ * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤
+ * │         │     │     │     │     │     │    │     │     │     │     │     │     │            │
+ * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐   └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤
+ * │          │     │     │     │     │     │    │     │     │     │     │     │     │     │     │
+ * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘   ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤
+ * │      │     │      │             │     │    │               │       │      │     │     │     │
+ * └------┴-----┴------┴-------------┴-----┘    └---------------┴-------┴------┴-----┴-----┴-----┘
+ */
+[1] = LAYOUT(
+  KC_GRAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,         KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+  _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______,          _______,
+  _______, _______, _______, _______, _______, _______,        _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______,          _______,        _______,          _______, _______,          _______, _______, _______
+  ),
+[2] = LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,          _______,
+  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______,          _______,         _______,          _______, _______,          _______, _______, _______
+  ),
+[3] = LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______,          _______,
+  _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______,          _______,         _______,          _______, _______,          _______, _______, _______
+  ),
+};
+
diff --git a/keyboards/ymdk/sp64/keymaps/via/rules.mk b/keyboards/ymdk/sp64/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/ymdk/sp64/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

From c9f88d7c67e00b3689fd4afd7630bc7fcd5b7ed4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 2 Feb 2022 15:31:42 +1100
Subject: [PATCH 480/867] `qmk doctor`: display qmk_firmware version tag
 (#16155)

---
 lib/python/qmk/cli/doctor/main.py | 7 ++++++-
 lib/python/qmk/commands.py        | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/python/qmk/cli/doctor/main.py b/lib/python/qmk/cli/doctor/main.py
index ed20f46d3f..2e5e221e8f 100755
--- a/lib/python/qmk/cli/doctor/main.py
+++ b/lib/python/qmk/cli/doctor/main.py
@@ -11,7 +11,7 @@ from milc.questions import yesno
 from qmk import submodules
 from qmk.constants import QMK_FIRMWARE, QMK_FIRMWARE_UPSTREAM
 from .check import CheckStatus, check_binaries, check_binary_versions, check_submodules
-from qmk.commands import git_check_repo, git_get_branch, git_is_dirty, git_get_remotes, git_check_deviation, in_virtualenv
+from qmk.commands import git_check_repo, git_get_branch, git_get_tag, git_is_dirty, git_get_remotes, git_check_deviation, in_virtualenv
 
 
 def os_tests():
@@ -47,6 +47,11 @@ def git_tests():
         git_branch = git_get_branch()
         if git_branch:
             cli.log.info('Git branch: %s', git_branch)
+
+            repo_version = git_get_tag()
+            if repo_version:
+                cli.log.info('Repo version: %s', repo_version)
+
             git_dirty = git_is_dirty()
             if git_dirty:
                 cli.log.warning('{fg_yellow}Git has unstashed/uncommitted changes.')
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 5a01943773..90a68ca3cd 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -295,6 +295,14 @@ def git_get_branch():
         return git_branch.stdout.strip()
 
 
+def git_get_tag():
+    """Returns the current tag for a repo, or None.
+    """
+    git_tag = cli.run(['git', 'describe', '--abbrev=0', '--tags'])
+    if git_tag.returncode == 0:
+        return git_tag.stdout.strip()
+
+
 def git_is_dirty():
     """Returns 1 if repo is dirty, or 0 if clean
     """

From 50f55c61fd1a8ed2e05356945b6751866a15ade1 Mon Sep 17 00:00:00 2001
From: joedinkle <brandon.bonton@gmail.com>
Date: Tue, 1 Feb 2022 20:32:27 -0800
Subject: [PATCH 481/867] [Keyboard] Added keymaps for SPRH and update encoder
 (#16098)

---
 keyboards/eyeohdesigns/sprh/info.json         | 167 +++---------------
 .../eyeohdesigns/sprh/keymaps/acs/keymap.c    |  38 ++++
 .../eyeohdesigns/sprh/keymaps/ad5/keymap.c    |  38 ++++
 .../eyeohdesigns/sprh/keymaps/ads/keymap.c    |  38 ++++
 .../eyeohdesigns/sprh/keymaps/bc5/keymap.c    |  38 ++++
 .../eyeohdesigns/sprh/keymaps/bcs/keymap.c    |  38 ++++
 .../eyeohdesigns/sprh/keymaps/bd5/keymap.c    |  38 ++++
 .../sprh/keymaps/{split => bds}/keymap.c      |  25 +--
 .../sprh/keymaps/default/keymap.c             |  23 +--
 keyboards/eyeohdesigns/sprh/sprh.c            |  16 +-
 keyboards/eyeohdesigns/sprh/sprh.h            | 100 ++++++++++-
 11 files changed, 373 insertions(+), 186 deletions(-)
 create mode 100644 keyboards/eyeohdesigns/sprh/keymaps/acs/keymap.c
 create mode 100644 keyboards/eyeohdesigns/sprh/keymaps/ad5/keymap.c
 create mode 100644 keyboards/eyeohdesigns/sprh/keymaps/ads/keymap.c
 create mode 100644 keyboards/eyeohdesigns/sprh/keymaps/bc5/keymap.c
 create mode 100644 keyboards/eyeohdesigns/sprh/keymaps/bcs/keymap.c
 create mode 100644 keyboards/eyeohdesigns/sprh/keymaps/bd5/keymap.c
 rename keyboards/eyeohdesigns/sprh/keymaps/{split => bds}/keymap.c (70%)

diff --git a/keyboards/eyeohdesigns/sprh/info.json b/keyboards/eyeohdesigns/sprh/info.json
index 7c99615965..976e64755e 100644
--- a/keyboards/eyeohdesigns/sprh/info.json
+++ b/keyboards/eyeohdesigns/sprh/info.json
@@ -1,148 +1,31 @@
 {
-    "keyboard_name": "sprh",
-    "maintainer": "eye oh designs",
-    "url": "",
+    "keyboard_name": "sprh", 
+    "url": "https://github.com/joedinkle/eyeohdesigns/tree/main/keyboards/sprh", 
+    "maintainer": "eye oh designs", 
     "layouts": {
         "LAYOUT_default": {
-            "layout": [
-                { "label": "Encd", "x": 0.5, "y": 0 },
-                { "label": "Esc", "x": 1.5, "y": 0 },
-                { "label": "1", "x": 2.5, "y": 0 },
-                { "label": "2", "x": 3.5, "y": 0 },
-                { "label": "3", "x": 4.5, "y": 0 },
-                { "label": "4", "x": 5.5, "y": 0 },
-                { "label": "5", "x": 6.5, "y": 0 },
-                { "label": "6", "x": 7.5, "y": 0 },
-                { "label": "7", "x": 8.5, "y": 0 },
-                { "label": "8", "x": 9.5, "y": 0 },
-                { "label": "9", "x": 10.5, "y": 0 },
-                { "label": "0", "x": 11.5, "y": 0 },
-                { "label": "_", "x": 12.5, "y": 0 },
-                { "label": "+", "x": 13.5, "y": 0 },
-                { "label": "Backspace", "w": 2, "x": 14.5, "y": 0 },
-                { "label": "Tab", "w": 1.5, "x": 1, "y": 1 },
-                { "label": "Q", "x": 2.5, "y": 1 },
-                { "label": "W", "x": 3.5, "y": 1 },
-                { "label": "E", "x": 4.5, "y": 1 },
-                { "label": "R", "x": 5.5, "y": 1 },
-                { "label": "T", "x": 6.5, "y": 1 },
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "\\", "w": 1.5, "x": 14.5, "y": 1 },
-                { "label": "Caps Lock", "w": 1.75, "x": 0.75, "y": 2 },
-                { "label": "A", "x": 2.5, "y": 2 },
-                { "label": "S", "x": 3.5, "y": 2 },
-                { "label": "D", "x": 4.5, "y": 2 },
-                { "label": "F", "x": 5.5, "y": 2 },
-                { "label": "G", "x": 6.5, "y": 2 },
-                { "label": "H", "x": 7.5, "y": 2 },
-                { "label": "J", "x": 8.5, "y": 2 },
-                { "label": "K", "x": 9.5, "y": 2 },
-                { "label": "L", "x": 10.5, "y": 2 },
-                { "label": ";", "x": 11.5, "y": 2 },
-                { "label": "'", "x": 12.5, "y": 2 },
-                { "label": "Enter", "w": 2.25, "x": 13.5, "y": 2 },
-                { "label": "Shift", "w": 2.25, "x": 0.25, "y": 3 },
-                { "label": "Z", "x": 2.5, "y": 3 },
-                { "label": "X", "x": 3.5, "y": 3 },
-                { "label": "C", "x": 4.5, "y": 3 },
-                { "label": "V", "x": 5.5, "y": 3 },
-                { "label": "B", "x": 6.5, "y": 3 },
-                { "label": "N", "x": 7.5, "y": 3 },
-                { "label": "M", "x": 8.5, "y": 3 },
-                { "label": ",", "x": 9.5, "y": 3 },
-                { "label": ".", "x": 10.5, "y": 3 },
-                { "label": "/", "x": 11.5, "y": 3 },
-                { "label": "Shift", "w": 2.75, "x": 12.5, "y": 3 },
-                { "label": "\u2191", "x": 15.25, "y": 3 },
-                { "label": "Super", "w": 1.25, "x": 0, "y": 4 },
-                { "label": "Ctrl", "w": 1.25, "x": 1.25, "y": 4 },
-                { "label": "Alt", "w": 1.25, "x": 3.37, "y": 4 },
-                { "w": 6.25, "x": 4.62, "y": 4 },
-                { "label": "Alt", "w": 1.25, "x": 10.87, "y": 4 },
-                { "label": "Function", "w": 1.25, "x": 12.12, "y": 4 },
-                { "label": "\u2190", "x": 14.25, "y": 4 },
-                { "label": "\u2193", "x": 15.25, "y": 4 },
-                { "label": "\u2192", "x": 16.25, "y": 4 }
-            ]
+            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
         },
-        "LAYOUT_split": {
-            "layout": [
-                { "label": "Encd", "x": 0.5, "y": 0 },
-                { "label": "Esc", "x": 1.5, "y": 0 },
-                { "label": "1", "x": 2.5, "y": 0 },
-                { "label": "2", "x": 3.5, "y": 0 },
-                { "label": "3", "x": 4.5, "y": 0 },
-                { "label": "4", "x": 5.5, "y": 0 },
-                { "label": "5", "x": 6.5, "y": 0 },
-                { "label": "6", "x": 7.5, "y": 0 },
-                { "label": "7", "x": 8.5, "y": 0 },
-                { "label": "8", "x": 9.5, "y": 0 },
-                { "label": "9", "x": 10.5, "y": 0 },
-                { "label": "0", "x": 11.5, "y": 0 },
-                { "label": "_", "x": 12.5, "y": 0 },
-                { "label": "+", "x": 13.5, "y": 0 },
-                { "label": "\u2190", "x": 14.5, "y": 0 },
-                { "label": "Del", "x": 15.5, "y": 0 },
-                { "label": "Tab", "w": 1.5, "x": 1, "y": 1 },
-                { "label": "Q", "x": 2.5, "y": 1 },
-                { "label": "W", "x": 3.5, "y": 1 },
-                { "label": "E", "x": 4.5, "y": 1 },
-                { "label": "R", "x": 5.5, "y": 1 },
-                { "label": "T", "x": 6.5, "y": 1 },
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "\\", "w": 1.5, "x": 14.5, "y": 1 },
-                { "label": "Caps Lock", "w": 1.75, "x": 0.75, "y": 2 },
-                { "label": "A", "x": 2.5, "y": 2 },
-                { "label": "S", "x": 3.5, "y": 2 },
-                { "label": "D", "x": 4.5, "y": 2 },
-                { "label": "F", "x": 5.5, "y": 2 },
-                { "label": "G", "x": 6.5, "y": 2 },
-                { "label": "H", "x": 7.5, "y": 2 },
-                { "label": "J", "x": 8.5, "y": 2 },
-                { "label": "K", "x": 9.5, "y": 2 },
-                { "label": "L", "x": 10.5, "y": 2 },
-                { "label": ";", "x": 11.5, "y": 2 },
-                { "label": "'", "x": 12.5, "y": 2 },
-                { "label": "Enter", "w": 2.25, "x": 13.5, "y": 2 },
-                { "label": "CapsLock", "x": 0.25, "y": 3 },
-                { "label": "Shift", "w": 1.25, "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.5, "y": 3 },
-                { "label": "X", "x": 3.5, "y": 3 },
-                { "label": "C", "x": 4.5, "y": 3 },
-                { "label": "V", "x": 5.5, "y": 3 },
-                { "label": "B", "x": 6.5, "y": 3 },
-                { "label": "N", "x": 7.5, "y": 3 },
-                { "label": "M", "x": 8.5, "y": 3 },
-                { "label": ",", "x": 9.5, "y": 3 },
-                { "label": ".", "x": 10.5, "y": 3 },
-                { "label": "/", "x": 11.5, "y": 3 },
-                { "label": "Shift", "w": 1.75, "x": 12.5, "y": 3 },
-                { "label": "Fn", "x": 14.25, "y": 3 },
-                { "label": "\u2191", "x": 15.25, "y": 3 },
-                { "label": "Super", "w": 1.25, "x": 0, "y": 4 },
-                { "label": "Ctrl", "w": 1.25, "x": 1.25, "y": 4 },
-                { "label": "Alt", "w": 1.25, "x": 3.37, "y": 4 },
-                { "w": 2.75, "x": 4.62, "y": 4 },
-                { "w": 2.25, "x": 7.37, "y": 4 },
-                { "w": 1.25, "x": 9.62, "y": 4 },
-                { "label": "Alt", "w": 1.25, "x": 10.87, "y": 4 },
-                { "label": "Function", "w": 1.25, "x": 12.12, "y": 4 },
-                { "label": "\u2190", "x": 14.25, "y": 4 },
-                { "label": "\u2193", "x": 15.25, "y": 4 },
-                { "label": "\u2192", "x": 16.25, "y": 4 }
-            ]
+        "LAYOUT_acs": {
+            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+        },
+        "LAYOUT_ad5": {
+            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+        },
+        "LAYOUT_ads": {
+            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+        },
+        "LAYOUT_bc5": {
+            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+        },
+        "LAYOUT_bcs": {
+            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+        },
+        "LAYOUT_bd5": {
+            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+        },
+        "LAYOUT_bds": {
+            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/acs/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/acs/keymap.c
new file mode 100644
index 0000000000..06f9af8811
--- /dev/null
+++ b/keyboards/eyeohdesigns/sprh/keymaps/acs/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2019 IOD
+ *
+ * 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 custom_layers {
+    _QWERTY,
+    _FUNCTN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_acs(/* Base */
+        KC_MUTE, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+               KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+             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_LGUI,  KC_LCTL,     KC_LALT,  MO(_FUNCTN),                 KC_SPC,                KC_RALT, KC_RCTL, MO(_FUNCTN),        KC_LEFT, KC_DOWN, KC_RIGHT
+         ),
+
+    [_FUNCTN] = LAYOUT_acs(/* Base */
+        RESET, KC_GRAVE,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,  KC_F12,   KC_DEL,
+               KC_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
+             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
+           _______,         _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,        KC_PGUP,
+       _______,    _______,     _______,   _______,   _______,                     _______,                   _______,  _______,         KC_HOME, KC_PGDN, KC_END
+         )
+};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/ad5/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/ad5/keymap.c
new file mode 100644
index 0000000000..0ceebfd3ce
--- /dev/null
+++ b/keyboards/eyeohdesigns/sprh/keymaps/ad5/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2019 IOD
+ *
+ * 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 custom_layers {
+    _QWERTY,
+    _FUNCTN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_ad5(/* Base */
+        KC_MUTE, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+               KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+             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_RGUI, KC_UP,
+       KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPACE,                      MO(_FUNCTN),  KC_RALT,         KC_LEFT, KC_DOWN, KC_RIGHT
+         ),
+
+    [_FUNCTN] = LAYOUT_ad5(/* Base */
+        RESET, KC_GRAVE,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,  KC_F12,   KC_DEL,
+               KC_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
+             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
+        _______, _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
+       KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPC,                      MO(_FUNCTN),  KC_RALT,         KC_HOME, KC_PGDN, KC_END
+         )
+};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/ads/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/ads/keymap.c
new file mode 100644
index 0000000000..614236bddc
--- /dev/null
+++ b/keyboards/eyeohdesigns/sprh/keymaps/ads/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2019 IOD
+ *
+ * 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 custom_layers {
+    _QWERTY,
+    _FUNCTN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_ads(/* Base */
+        KC_MUTE, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
+               KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+             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_RGUI, KC_UP,
+       KC_LGUI,  KC_LCTL,     KC_LALT,  MO(_FUNCTN),                 KC_SPC,                KC_RALT, KC_RCTL, MO(_FUNCTN),        KC_LEFT, KC_DOWN, KC_RIGHT
+         ),
+
+    [_FUNCTN] = LAYOUT_ads(/* Base */
+        RESET, KC_GRAVE,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,  KC_F12,   KC_DEL,
+               KC_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
+             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
+        _______,          _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
+       _______,    _______,     _______,   _______,   _______,                     _______,                   _______,  _______,         KC_HOME, KC_PGDN, KC_END
+         )
+};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/bc5/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/bc5/keymap.c
new file mode 100644
index 0000000000..0de227f085
--- /dev/null
+++ b/keyboards/eyeohdesigns/sprh/keymaps/bc5/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2022 EOD
+ *
+ * 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 custom_layers {
+    _QWERTY,
+    _FUNCTN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_bc5(/* Base */
+        KC_MUTE, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, KC_DEL,  KC_MINS, KC_EQL,
+               KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+             KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,       KC_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_SPACE,                      MO(_FUNCTN),  KC_RALT,         KC_LEFT, KC_DOWN, KC_RIGHT
+         ),
+
+    [_FUNCTN] = LAYOUT_bc5(/* Base */
+        RESET, KC_GRAVE,  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_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
+             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
+           KC_LSFT,       _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,             KC_PGUP,
+           KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPC,                      MO(_FUNCTN),  KC_RALT,         KC_HOME, KC_PGDN, KC_END
+         )
+};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/bcs/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/bcs/keymap.c
new file mode 100644
index 0000000000..bfb3bc5938
--- /dev/null
+++ b/keyboards/eyeohdesigns/sprh/keymaps/bcs/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2022 EOD
+ *
+ * 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 custom_layers {
+    _QWERTY,
+    _FUNCTN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_bcs(/* Base */
+        KC_MUTE, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, KC_DEL,  KC_MINS, KC_EQL,
+               KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+             KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,       KC_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_LGUI,  KC_LCTL,     KC_LALT,  MO(_FUNCTN),                 KC_SPC,                KC_RALT, KC_RCTL, MO(_FUNCTN),        KC_LEFT, KC_DOWN, KC_RIGHT
+         ),
+
+    [_FUNCTN] = LAYOUT_bcs(/* Base */
+        RESET, KC_GRAVE,  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_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
+             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
+           KC_LSFT,       _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,             KC_PGUP,
+           _______,    _______,     _______,   _______,   _______,                     _______,                   _______,  _______,         KC_HOME, KC_PGDN, KC_END
+         )
+};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/bd5/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/bd5/keymap.c
new file mode 100644
index 0000000000..022b62e932
--- /dev/null
+++ b/keyboards/eyeohdesigns/sprh/keymaps/bd5/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2019 IOD
+ *
+ * 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 custom_layers {
+    _QWERTY,
+    _FUNCTN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_bd5(/* Base */
+        KC_MUTE, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, KC_DEL,  KC_MINS, KC_EQL, 
+               KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+             KC_CAPS,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,       KC_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_RGUI, KC_UP,
+       KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPACE,                      MO(_FUNCTN),  KC_RALT,         KC_LEFT, KC_DOWN, KC_RIGHT
+         ),
+
+    [_FUNCTN] = LAYOUT_bd5(/* Base */
+        RESET, KC_GRAVE,  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_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
+             KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
+        _______,          _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
+       KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPC,                      MO(_FUNCTN),  KC_RALT,         KC_HOME, KC_PGDN, KC_END
+         )
+};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/split/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/bds/keymap.c
similarity index 70%
rename from keyboards/eyeohdesigns/sprh/keymaps/split/keymap.c
rename to keyboards/eyeohdesigns/sprh/keymaps/bds/keymap.c
index 3ed21b6e4d..7755bab5a8 100644
--- a/keyboards/eyeohdesigns/sprh/keymaps/split/keymap.c
+++ b/keyboards/eyeohdesigns/sprh/keymaps/bds/keymap.c
@@ -20,30 +20,19 @@ enum custom_layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_split(/* Base */
+    [_QWERTY] = LAYOUT_bds(/* Base */
         KC_MUTE, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, KC_DEL,  KC_MINS, KC_EQL, 
                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_LCTL,     KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,       KC_ENT,
-        KC_CAPS, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT, MO(_FUNCTN), KC_UP,
-       KC_LCTL,  KC_LGUI,     KC_LALT,  KC_ESC,   MO(_FUNCTN),                 KC_SPC,                   KC_RALT, KC_RCTL,        KC_LEFT, KC_DOWN, KC_RIGHT
+             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_RGUI, KC_UP,
+       KC_LGUI,  KC_LCTL,     KC_LALT,  MO(_FUNCTN),                 KC_SPC,                KC_RALT, KC_RCTL, MO(_FUNCTN),        KC_LEFT, KC_DOWN, KC_RIGHT
          ),
 
-    [_FUNCTN] = LAYOUT_split(/* Base */
+    [_FUNCTN] = LAYOUT_bds(/* Base */
         RESET, KC_GRAVE,  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_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
              KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
-        _______,   _______, _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
+        _______,          _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______, _______,     KC_PGUP,
        _______,    _______,     _______,   _______,   _______,                     _______,                   _______,  _______,         KC_HOME, KC_PGDN, KC_END
          )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    }  else{
-      tap_code(KC_VOLD);
-    }
-  }
-  return true;
-}
+};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/keymaps/default/keymap.c b/keyboards/eyeohdesigns/sprh/keymaps/default/keymap.c
index c66fb90c29..b0f7be00ac 100644
--- a/keyboards/eyeohdesigns/sprh/keymaps/default/keymap.c
+++ b/keyboards/eyeohdesigns/sprh/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 IOD
+/* Copyright 2022 EOD
  *
  * 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
@@ -20,30 +20,19 @@ enum custom_layers {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_QWERTY] = LAYOUT_default(/* Base */
+    [_QWERTY] = LAYOUT_ac5(/* Base */
         KC_MUTE, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSPC,
                KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
              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_SPACE,                      MO(_FUNCTN),  KC_RALT,         KC_LEFT, KC_DOWN, KC_RIGHT
+           KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPACE,                      MO(_FUNCTN),  KC_RCTL,         KC_LEFT, KC_DOWN, KC_RIGHT
          ),
 
-    [_FUNCTN] = LAYOUT_default(/* Base */
+    [_FUNCTN] = LAYOUT_ac5(/* Base */
         RESET, KC_GRAVE,  KC_F1,    KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_F11,  KC_F12,   KC_DEL,
                KC_TAB,    _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,   KC_LBRC, KC_RBRC, KC_BSLS,
              KC_CAPS,     _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,       KC_ENT,
            KC_LSFT,       _______,   _______, _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,             KC_PGUP,
-           KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPC,                      MO(_FUNCTN),  KC_RALT,         KC_HOME, KC_PGDN, KC_END
+           KC_LCTL,  KC_LGUI,     KC_LALT,                            KC_SPC,                      MO(_FUNCTN),  KC_RCTL,         KC_HOME, KC_PGDN, KC_END
          )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    if (clockwise) {
-      tap_code(KC_VOLU);
-    }  else{
-      tap_code(KC_VOLD);
-    }
-  }
-  return true;
-}
+};
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/sprh.c b/keyboards/eyeohdesigns/sprh/sprh.c
index bc7ad7b9ba..903e0c68e2 100644
--- a/keyboards/eyeohdesigns/sprh/sprh.c
+++ b/keyboards/eyeohdesigns/sprh/sprh.c
@@ -13,4 +13,18 @@
  * 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 "sprh.h"
\ No newline at end of file
+#include "sprh.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/eyeohdesigns/sprh/sprh.h b/keyboards/eyeohdesigns/sprh/sprh.h
index 772a40a977..5a367131c5 100644
--- a/keyboards/eyeohdesigns/sprh/sprh.h
+++ b/keyboards/eyeohdesigns/sprh/sprh.h
@@ -25,31 +25,115 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT_default( \
+#define LAYOUT_ac5( \
         k43, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,\
         k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,\
         k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,\
         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,\
-        k40, k41, k42, k46, k48, k49, k4b, k4c, k4d\
+        k40, k41, k42, k45, k48, k49, k4b, k4c, k4d\
 ) \
 { \
     {k00,   k01, k02, k03, k04,   k05,   k06, k07,   k08, k09, k0a,   k0b, k0c, k0d},\
     {k10,   k11, k12, k13, k14,   k15,   k16, k17,   k18, k19, k1a,   k1b, k1c, k1d},\
     {k20,   k21, k22, k23, k24,   k25,   k26, k27,   k28, k29, k2a,   k2b, k2c, KC_NO},\
     {KC_NO, k31, k32, k33, k34,   k35,   k36, k37,   k38, k39, k3a,   k3b, k3c, k3d},\
-    {k40,   k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
+    {k40,   k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
 }
-#define LAYOUT_split( \
+#define LAYOUT_acs( \
+        k43, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,\
+        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,\
+        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,\
+        k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,\
+        k40, k41, k42, k44, k45, k46, k48, k49, k4b, k4c, k4d\
+) \
+{ \
+    {k00,   k01, k02, k03, k04,   k05,   k06, k07,   k08, k09, k0a,   k0b, k0c, k0d},\
+    {k10,   k11, k12, k13, k14,   k15,   k16, k17,   k18, k19, k1a,   k1b, k1c, k1d},\
+    {k20,   k21, k22, k23, k24,   k25,   k26, k27,   k28, k29, k2a,   k2b, k2c, KC_NO},\
+    {KC_NO, k31, k32, k33, k34,   k35,   k36, k37,   k38, k39, k3a,   k3b, k3c, k3d},\
+    {k40,   k41, k42, k43, k44,   k45,   k46, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
+}
+#define LAYOUT_ad5( \
+        k43, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,\
+        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,\
+        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,\
+        k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4a, k3d,\
+        k40, k41, k42, k45, k48, k49, k4b, k4c, k4d\
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a,   k0b, k0c, k0d},\
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,   k1b, k1c, k1d},\
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a,   k2b, k2c, KC_NO},\
+    {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a,   k3b, k3c, k3d},\
+    {k40,   k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, k4a, k4b, k4c, k4d},\
+}
+#define LAYOUT_ads( \
+        k43, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,\
+        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,\
+        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,\
+        k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4a, k3d,\
+        k40, k41, k42, k44, k45, k46, k48, k49, k4b, k4c, k4d\
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a,   k0b, k0c, k0d},\
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,   k1b, k1c, k1d},\
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a,   k2b, k2c, KC_NO},\
+    {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a,   k3b, k3c, k3d},\
+    {k40, k41, k42, k43, k44, k45, k46, KC_NO, k48, k49, k4a, k4b, k4c, k4d},\
+}
+#define LAYOUT_bc5( \
         k43, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d,\
         k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,\
         k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,\
-        k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k49, k3d,\
-        k40, k41, k42, k44, k45, k46, k47, k48, k4b, k4c, k4d\
+        k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,\
+        k40, k41, k42, k45, k48, k49, k4b, k4c, k4d\
+) \
+{ \
+    {k00,   k01, k02, k03, k04,   k05,   k06, k07,   k08, k09, k0a,   k0b, k0c, k0d},\
+    {k10,   k11, k12, k13, k14,   k15,   k16, k17,   k18, k19, k1a,   k1b, k1c, k1d},\
+    {k20,   k21, k22, k23, k24,   k25,   k26, k27,   k28, k29, k2a,   k2b, k2c, k2d},\
+    {KC_NO, k31, k32, k33, k34,   k35,   k36, k37,   k38, k39, k3a,   k3b, k3c, k3d},\
+    {k40,   k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
+}
+#define LAYOUT_bcs( \
+        k43, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d,\
+        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,\
+        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,\
+        k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,\
+        k40, k41, k42, k44, k45, k46, k48, k49, k4b, k4c, k4d\
+) \
+{ \
+    {k00,   k01, k02, k03, k04,   k05,   k06, k07,   k08, k09, k0a,   k0b, k0c, k0d},\
+    {k10,   k11, k12, k13, k14,   k15,   k16, k17,   k18, k19, k1a,   k1b, k1c, k1d},\
+    {k20,   k21, k22, k23, k24,   k25,   k26, k27,   k28, k29, k2a,   k2b, k2c, k2d},\
+    {KC_NO, k31, k32, k33, k34,   k35,   k36, k37,   k38, k39, k3a,   k3b, k3c, k3d},\
+    {k40,   k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, KC_NO, k4b, k4c, k4d},\
+}
+#define LAYOUT_bd5( \
+        k43, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d,\
+        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,\
+        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,\
+        k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4a, k3d,\
+        k40, k41, k42, k45, k48, k49, k4b, k4c, k4d\
 ) \
 { \
     {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a,   k0b, k0c, k0d},\
     {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,   k1b, k1c, k1d},\
     {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a,   k2b, k2c, k2d},\
-    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a,   k3b, k3c, k3d},\
-    {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, KC_NO, k4b, k4c, k4d},\
+    {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a,   k3b, k3c, k3d},\
+    {k40, k41, k42, k43, KC_NO, k45, KC_NO, KC_NO, k48, k49, k4a, k4b, k4c, k4d},\
+}
+#define LAYOUT_bds( \
+        k43, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d,\
+        k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,\
+        k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,\
+        k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4a, k3d,\
+        k40, k41, k42, k44, k45, k46, k48, k49, k4b, k4c, k4d\
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a,   k0b, k0c, k0d},\
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,   k1b, k1c, k1d},\
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a,   k2b, k2c, k2d},\
+    {KC_NO, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a,   k3b, k3c, k3d},\
+    {k40, k41, k42, k43, k44, k45, k46, KC_NO, k48, k49, k4a, k4b, k4c, k4d},\
 }

From d6d48aa2aa201fc91f2d37477fa977046b21b595 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 2 Feb 2022 15:36:37 +1100
Subject: [PATCH 482/867] Remove old .gitignore entry. Add more macOS junk
 exclusions. (#16167)

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 768f40b191..8d065cc1c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.swp
 *~
 .DS_Store
+._*
 
 # Build artifacts
 .clang_complete
@@ -19,7 +20,6 @@
 # QMK-specific
 api_data/v1
 doxygen/
-quantum/version.h
 *.bin
 *.eep
 *.hex

From d4dc743a85641dd74c708aa12fb78b91035cc802 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Tue, 1 Feb 2022 20:44:42 -0800
Subject: [PATCH 483/867] Fix issues with Python Tests (#16162)

* Reformat python due to yapf changes

* Fix pytest keymap list test

* revert formatting

* Use contra, because, well

https://www.reddit.com/r/MechanicalKeyboards/comments/8riofq/did_i_kill_my_contra/
---
 lib/python/qmk/tests/test_cli_commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index 2973f81702..54b143c64f 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -113,7 +113,7 @@ def test_list_keymaps_community():
 
 
 def test_list_keymaps_kb_only():
-    result = check_subcommand('list-keymaps', '-kb', 'niu_mini')
+    result = check_subcommand('list-keymaps', '-kb', 'contra')
     check_returncode(result)
     assert 'default' and 'via' in result.stdout
 

From 70c5915da8cc496dc5d7c6deb27f780a39863008 Mon Sep 17 00:00:00 2001
From: Andre Brait <andrebrait@gmail.com>
Date: Wed, 2 Feb 2022 06:04:50 +0100
Subject: [PATCH 484/867] [Keymap] Add MacOS layer (#16151)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../gmmk/pro/ansi/keymaps/andrebrait/keymap.c | 154 ++++++++++++------
 .../pro/ansi/keymaps/andrebrait/readme.md     |   2 +
 .../gmmk/pro/ansi/keymaps/andrebrait/rules.mk |   2 +
 3 files changed, 106 insertions(+), 52 deletions(-)

diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c
index 74a45b7036..e521425f26 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c
+++ b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c
@@ -1,5 +1,5 @@
 /* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
-   Copyright 2021 Andre Brait <andrebrait@gmail.com>
+   Copyright 2022 Andre Brait <andrebrait@gmail.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,11 +17,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 
-#ifdef RGB_MATRIX_ENABLE
-    #ifndef RGB_CONFIRMATION_BLINKING_TIME
-        #define RGB_CONFIRMATION_BLINKING_TIME 2000 // 2 seconds
-    #endif
-#endif // RGB_MATRIX_ENABLE
+enum layers {
+    WIN_BASE = 0,
+    WIN_FN,
+    MAC_BASE,
+    MAC_FN
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = SAFE_RANGE,
+    KC_LAUNCHPAD
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+#define TO_WINB TO(WIN_BASE)
+#define TO_MACB TO(MAC_BASE)
+#define MO_WINF MO(WIN_FN)
+#define MO_MACF MO(MAC_FN)
 
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -45,25 +60,45 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
     // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
     // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
-    [0] = LAYOUT(
-        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_MUTE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
-        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_PGDN,
-        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    //
+    // RGB and function keys are inspired by the Keychron Q1 layouts instead of using the default keys.
+    //
+    // KC_PAUS/KC_BRMU and KC_SCRL/KC_BRMD are aliases for the same keys, but their names reflect better the function in each layout.
+    [WIN_BASE] = LAYOUT(
+        KC_ESC,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_MUTE,
+        KC_GRV,  KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
+        KC_TAB,  KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_PGDN,
+        KC_LSFT,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI,  KC_LALT,                            KC_SPC,                             KC_RALT, MO_WINF, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    [1] = LAYOUT(
-        _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_INS,           _______,
-        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PSCR,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
-        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
-        _______,          _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
-        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+    [WIN_FN] = LAYOUT(
+        _______, KC_BRID,  KC_BRIU, KC_TASK, KC_FLXP, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, KC_INS,           XXXXXXX,
+        XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_PSCR,
+        RGB_TOG, RGB_MOD,  RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,            KC_PAUS,
+        TO_MACB, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          KC_SCRL,
+        _______,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
+        _______, _______,  _______,                            XXXXXXX,                            _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX
     ),
 
+    [MAC_BASE] = LAYOUT(
+        KC_ESC,  KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_MUTE,
+        KC_GRV,  KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
+        KC_TAB,  KC_Q,     KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_PGDN,
+        KC_LSFT,           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LALT,  KC_LGUI,                            KC_SPC,                             KC_RALT, MO_MACF, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
+    [MAC_FN] = LAYOUT(
+        _______, KC_BRID,  KC_BRIU, KC_MCTL, KC_LPAD, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, KC_INS,           XXXXXXX,
+        XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          KC_PSCR,
+        RGB_TOG, RGB_MOD,  RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,            KC_BRMU,
+        TO_WINB, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,          KC_BRMD,
+        _______,           XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
+        _______, _______,  _______,                            XXXXXXX,                            _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX
+    )
 };
 // clang-format on
 
@@ -80,13 +115,14 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 
 #ifdef RGB_MATRIX_ENABLE
 
+#define RGB_CONFIRMATION_BLINKING_TIME 2000 // 2 seconds
+
 /* Renaming those to make the purpose on this keymap clearer */
 #define LED_FLAG_CAPS LED_FLAG_NONE
 #define LED_FLAG_EFFECTS LED_FLAG_INDICATOR
 
 static void set_rgb_caps_leds(void);
 
-#if RGB_CONFIRMATION_BLINKING_TIME > 0
 static uint16_t effect_started_time = 0;
 static uint8_t r_effect = 0x0, g_effect = 0x0, b_effect = 0x0;
 static void start_effects(void);
@@ -100,7 +136,31 @@ static void start_effects(void);
 #endif
 #define effect_red() r_effect = 0xFF, g_effect = 0x0, b_effect = 0x0
 #define effect_green() r_effect = 0x0, g_effect = 0xFF, b_effect = 0x0
-#endif // RGB_CONFIRMATION_BLINKING_TIME > 0
+#define effect_blue() r_effect = 0x0, g_effect = 0x0, b_effect = 0xFF
+#define effect_white() r_effect = 0xFF, g_effect = 0xFF, b_effect = 0xFF
+
+static uint8_t previous_effect_layer = 255;
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    uint8_t current_layer = get_highest_layer(state);
+    switch (current_layer) {
+        case WIN_BASE:
+            if (previous_effect_layer != current_layer) {
+                previous_effect_layer = current_layer;
+                effect_blue();
+                start_effects();
+            }
+            break;
+        case MAC_BASE:
+            if (previous_effect_layer != current_layer) {
+                previous_effect_layer = current_layer;
+                effect_white();
+                start_effects();
+            }
+            break;
+    }
+    return state;
+}
 
 bool led_update_user(led_t led_state) {
     if (led_state.caps_lock) {
@@ -117,10 +177,26 @@ bool led_update_user(led_t led_state) {
     return true;
 }
 
+#endif // RGB_MATRIX_ENABLE
+
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+    #ifdef RGB_MATRIX_ENABLE
     #ifdef NKRO_ENABLE
-    #if RGB_CONFIRMATION_BLINKING_TIME > 0
         case NK_TOGG:
             if (record->event.pressed) {
                 if (keymap_config.nkro) {
@@ -133,25 +209,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 start_effects();
             }
             break;
-        case NK_ON:
-            if (record->event.pressed) {
-                if (!keymap_config.nkro) {
-                    /* Turning NKRO ON */
-                    effect_green();
-                    start_effects();
-                }
-            }
-            break;
-        case NK_OFF:
-            if (record->event.pressed) {
-                if (keymap_config.nkro) {
-                    /* Turning NKRO OFF */
-                    effect_red();
-                    start_effects();
-                }
-            }
-            break;
-    #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
     #endif // NKRO_ENABLE
         case RGB_MOD:
         case RGB_RMOD:
@@ -166,7 +223,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             if (record->event.pressed) {
                 if (rgb_matrix_get_flags() != LED_FLAG_ALL) {
                     /* Ignore changes to RGB settings while only it's supposed to be OFF */
-                    return false;
+                    return false;  // Skip all further processing of this key
                 }
             }
             break;
@@ -174,9 +231,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             if (record->event.pressed) {
                 if (rgb_matrix_is_enabled()) {
                     switch (rgb_matrix_get_flags()) {
-                        #if RGB_CONFIRMATION_BLINKING_TIME > 0
                         case LED_FLAG_EFFECTS:
-                        #endif
                         case LED_FLAG_CAPS:
                             /* Turned ON because of EFFECTS or CAPS, is actually OFF */
                             /* Change to LED_FLAG_ALL to signal it's really ON */
@@ -186,14 +241,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                             break;
                         case LED_FLAG_ALL:
                             /* Is actually ON */
-                            #if RGB_CONFIRMATION_BLINKING_TIME > 0
                             if (effect_started_time > 0) {
                                 /* Signal EFFECTS */
                                 rgb_matrix_set_flags(LED_FLAG_EFFECTS);
                                 /* Will be re-enabled by the processing of the toggle */
                                 rgb_matrix_disable_noeeprom();
                             } else
-                            #endif
                             if (host_keyboard_led_state().caps_lock) {
                                 /* Signal CAPS */
                                 rgb_matrix_set_flags(LED_FLAG_CAPS);
@@ -205,13 +258,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                 }
             }
             break;
+    #endif // RGB_MATRIX_ENABLE
     }
     return true;
 }
 
-
+#ifdef RGB_MATRIX_ENABLE
 void rgb_matrix_indicators_user() {
-    #if RGB_CONFIRMATION_BLINKING_TIME > 0
     if (effect_started_time > 0) {
         /* Render blinking EFFECTS */
         const uint16_t deltaTime = sync_timer_elapsed(effect_started_time);
@@ -241,7 +294,6 @@ void rgb_matrix_indicators_user() {
             }
         }
     }
-    #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
     if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
         rgb_matrix_set_color_all(0x0, 0x0, 0x0);
     }
@@ -250,7 +302,6 @@ void rgb_matrix_indicators_user() {
     }
 }
 
-#if RGB_CONFIRMATION_BLINKING_TIME > 0
 static void start_effects() {
     effect_started_time = sync_timer_read();
     if (!rgb_matrix_is_enabled()) {
@@ -262,7 +313,6 @@ static void start_effects() {
         rgb_matrix_set_flags(LED_FLAG_EFFECTS);
     }
 }
-#endif // RGB_CONFIRMATION_BLINKING_TIME > 0
 
 // RGB led number layout, function of the key
 
diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md
index 5cb49bd836..99d0a36721 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md
+++ b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md
@@ -5,6 +5,8 @@ It basically reflects my needs for both Delete and Insert being readily availabl
 
 The differences are as follows:
 
+- Dedicated MacOS and Windows/Linux layers
+  - Switching between them by pressing Fn + CAPS LOCK
 - Disabled Mouse Keys (to fix issues with KVM switches and also because they're not used here anyway)
 - Short DEBOUNCE time (5 ms)
 - Per-key debounce algorithm (sym_defer_pk)
diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk
index 6024d42f1d..057e9a9541 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk
+++ b/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk
@@ -1,4 +1,6 @@
 # Enable additional features.
 
 DEBOUNCE_TYPE = sym_defer_pk
+
+# Disabling MouseKey because it breaks my KVM switch
 MOUSEKEY_ENABLE = no

From bf2b3f7907efa9a9fb5ede9b8ae659eb2ec8fbe2 Mon Sep 17 00:00:00 2001
From: Ivan Gromov <38141348+key10iq@users.noreply.github.com>
Date: Wed, 2 Feb 2022 09:05:23 +0400
Subject: [PATCH 485/867] [Keyboard] Add keyten kt60-M  (#16150)

---
 keyboards/keyten/kt60_m/config.h              | 51 ++++++++++++
 keyboards/keyten/kt60_m/info.json             | 78 +++++++++++++++++++
 .../keyten/kt60_m/keymaps/default/keymap.c    | 39 ++++++++++
 .../keyten/kt60_m/keymaps/default/readme.md   |  1 +
 keyboards/keyten/kt60_m/keymaps/via/keymap.c  | 48 ++++++++++++
 keyboards/keyten/kt60_m/keymaps/via/readme.md |  1 +
 keyboards/keyten/kt60_m/keymaps/via/rules.mk  |  1 +
 keyboards/keyten/kt60_m/kt60_m.c              | 18 +++++
 keyboards/keyten/kt60_m/kt60_m.h              | 48 ++++++++++++
 keyboards/keyten/kt60_m/readme.md             | 27 +++++++
 keyboards/keyten/kt60_m/rules.mk              | 19 +++++
 11 files changed, 331 insertions(+)
 create mode 100644 keyboards/keyten/kt60_m/config.h
 create mode 100644 keyboards/keyten/kt60_m/info.json
 create mode 100644 keyboards/keyten/kt60_m/keymaps/default/keymap.c
 create mode 100644 keyboards/keyten/kt60_m/keymaps/default/readme.md
 create mode 100644 keyboards/keyten/kt60_m/keymaps/via/keymap.c
 create mode 100644 keyboards/keyten/kt60_m/keymaps/via/readme.md
 create mode 100644 keyboards/keyten/kt60_m/keymaps/via/rules.mk
 create mode 100644 keyboards/keyten/kt60_m/kt60_m.c
 create mode 100644 keyboards/keyten/kt60_m/kt60_m.h
 create mode 100644 keyboards/keyten/kt60_m/readme.md
 create mode 100644 keyboards/keyten/kt60_m/rules.mk

diff --git a/keyboards/keyten/kt60_m/config.h b/keyboards/keyten/kt60_m/config.h
new file mode 100644
index 0000000000..74378e7d23
--- /dev/null
+++ b/keyboards/keyten/kt60_m/config.h
@@ -0,0 +1,51 @@
+/*
+Copyright 2022 Ivan Gromov (@key10iq)
+
+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       0xEB69
+#define PRODUCT_ID      0x6001
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    keyten
+#define PRODUCT         kt60-M
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * 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 { C7, C6, B6, F7, F6 }
+#define MATRIX_COL_PINS { B7, F0, F1, F4, F5, D1, D2, D3, D5, D4, D6, D7, B4, B5 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
\ No newline at end of file
diff --git a/keyboards/keyten/kt60_m/info.json b/keyboards/keyten/kt60_m/info.json
new file mode 100644
index 0000000000..9f40a13b29
--- /dev/null
+++ b/keyboards/keyten/kt60_m/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "kt60-M",
+    "url": "",
+    "maintainer": "keyten",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.5},
+                {"x": 1.5, "y": 4},
+                {"x": 2.5, "y": 4, "w": 1.5},
+                {"x": 4, "y": 4, "w": 7},
+                {"x": 11, "y": 4, "w": 1.5},
+                {"x": 12.5, "y": 4},
+                {"x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+		
+    }
+}
diff --git a/keyboards/keyten/kt60_m/keymaps/default/keymap.c b/keyboards/keyten/kt60_m/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f4343b2410
--- /dev/null
+++ b/keyboards/keyten/kt60_m/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * 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 layer_names {
+    _MAIN,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[_MAIN] = LAYOUT(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, 
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC, 
+		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(1), 
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_RGUI, KC_RCTL),
+
+	[_FN] = LAYOUT(
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+		_______, _______, _______,                            _______,                            _______,          _______, _______)
+};
diff --git a/keyboards/keyten/kt60_m/keymaps/default/readme.md b/keyboards/keyten/kt60_m/keymaps/default/readme.md
new file mode 100644
index 0000000000..821228e1c7
--- /dev/null
+++ b/keyboards/keyten/kt60_m/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for kt60-M
diff --git a/keyboards/keyten/kt60_m/keymaps/via/keymap.c b/keyboards/keyten/kt60_m/keymaps/via/keymap.c
new file mode 100644
index 0000000000..4e483027b2
--- /dev/null
+++ b/keyboards/keyten/kt60_m/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, 
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC, 
+		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(1), 
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_RGUI, KC_RCTL),
+
+	[1] = LAYOUT(
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+		_______, _______, _______,                            _______,                            _______,          _______, _______),
+		
+	[2] = LAYOUT(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+		_______, _______, _______,                            _______,                            _______,          _______, _______),
+		
+	[3] = LAYOUT(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+		_______, _______, _______,                            _______,                            _______,          _______, _______)	
+};
diff --git a/keyboards/keyten/kt60_m/keymaps/via/readme.md b/keyboards/keyten/kt60_m/keymaps/via/readme.md
new file mode 100644
index 0000000000..4d8109bbde
--- /dev/null
+++ b/keyboards/keyten/kt60_m/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for kt60-M
diff --git a/keyboards/keyten/kt60_m/keymaps/via/rules.mk b/keyboards/keyten/kt60_m/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/keyten/kt60_m/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/keyten/kt60_m/kt60_m.c b/keyboards/keyten/kt60_m/kt60_m.c
new file mode 100644
index 0000000000..63a7f8d6b6
--- /dev/null
+++ b/keyboards/keyten/kt60_m/kt60_m.c
@@ -0,0 +1,18 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * 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 "kt60_m.h"
\ No newline at end of file
diff --git a/keyboards/keyten/kt60_m/kt60_m.h b/keyboards/keyten/kt60_m/kt60_m.h
new file mode 100644
index 0000000000..7006099251
--- /dev/null
+++ b/keyboards/keyten/kt60_m/kt60_m.h
@@ -0,0 +1,48 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/* LAYOUT
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3c    │3d │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+ * │40   │41 │42   │46                         │4a   │4c │4d   │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+#define LAYOUT( \
+	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a,      k3c, k3d, \
+	k40, k41, k42,                k46,                k4a,      k4c, k4d  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d },  \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d },  \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d },  \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, XXX, k3c, k3d },  \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, XXX, k4c, k4d }   \
+}
diff --git a/keyboards/keyten/kt60_m/readme.md b/keyboards/keyten/kt60_m/readme.md
new file mode 100644
index 0000000000..32ca32c4b5
--- /dev/null
+++ b/keyboards/keyten/kt60_m/readme.md
@@ -0,0 +1,27 @@
+# keyten kt60-M
+
+60% MX PCB with a minimum number of required layouts.
+
+![kt60-M image](https://i.imgur.com/ZAdGKmQl.jpg)
+
+* Keyboard Maintainer: [keyten](https://github.com/key10iq)
+* Hardware Supported: keyten kt60-M
+* Hardware Availability: [GB](https://www.reddit.com/r/mechmarket/comments/s4jvsc/gb_kt60m_60_universal_pcb_with_a_minimum_number)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keyten/kt60_m:default
+	
+Flashing example for this keyboard:
+
+	make keyten/kt60_m:default:flash
+
+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).
+
+## Bootloader 
+
+Enter the bootloader in 3 ways:
+
+* Bootmagic reset: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* Keycode in layout: Press the key mapped to RESET if it is available
+* Physical reset button: Press the button on the back of the PCB
diff --git a/keyboards/keyten/kt60_m/rules.mk b/keyboards/keyten/kt60_m/rules.mk
new file mode 100644
index 0000000000..6983d5c803
--- /dev/null
+++ b/keyboards/keyten/kt60_m/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes

From 1bdc1c23c706bc65f62d4377abdcf000d2485de3 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 2 Feb 2022 16:21:07 +1100
Subject: [PATCH 486/867] Fixup builds so that teensy EEPROM knows which MCU
 it's targeting. (#16168)

---
 platforms/chibios/eeprom_teensy.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platforms/chibios/eeprom_teensy.h b/platforms/chibios/eeprom_teensy.h
index ead5998b29..9a14a1fa79 100755
--- a/platforms/chibios/eeprom_teensy.h
+++ b/platforms/chibios/eeprom_teensy.h
@@ -2,6 +2,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
+#include <ch.h>
+#include <hal.h>
+
 #if defined(K20x)
 /* Teensy 3.0, 3.1, 3.2; mchck; infinity keyboard */
 // The EEPROM is really RAM with a hardware-based backup system to

From 96dbbc04393f454d2fb30f43c8d2386d081eb6c8 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Tue, 1 Feb 2022 21:25:32 -0800
Subject: [PATCH 487/867] Format code according to conventions (#16169)

---
 keyboards/keyten/kt60_m/kt60_m.c | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/keyboards/keyten/kt60_m/kt60_m.c b/keyboards/keyten/kt60_m/kt60_m.c
index 63a7f8d6b6..7d4f7614c8 100644
--- a/keyboards/keyten/kt60_m/kt60_m.c
+++ b/keyboards/keyten/kt60_m/kt60_m.c
@@ -1,18 +1,18 @@
- /* Copyright 2022 Ivan Gromov (@key10iq)
-  * 
-  * 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/>. 
-  */ 
-
-
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * 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 "kt60_m.h"
\ No newline at end of file

From 3897eaac30843656f504531c3d84a70217bf96ac Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 3 Feb 2022 03:19:08 +1100
Subject: [PATCH 488/867] Fixup line endings for kt60-M.

---
 keyboards/keyten/kt60_m/kt60_m.c | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/keyboards/keyten/kt60_m/kt60_m.c b/keyboards/keyten/kt60_m/kt60_m.c
index 63a7f8d6b6..7d4f7614c8 100644
--- a/keyboards/keyten/kt60_m/kt60_m.c
+++ b/keyboards/keyten/kt60_m/kt60_m.c
@@ -1,18 +1,18 @@
- /* Copyright 2022 Ivan Gromov (@key10iq)
-  * 
-  * 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/>. 
-  */ 
-
-
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * 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 "kt60_m.h"
\ No newline at end of file

From 27e390777b2834e18018150b3720880aa4801b5e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 3 Feb 2022 08:08:48 +1100
Subject: [PATCH 489/867] Fix a couple of mismatched info.json layout names
 (#16164)

* Fix a couple of mismatched info.json layout names

* Fix layouts

* Clean up layouts
---
 keyboards/cannonkeys/hoodrowg/info.json       | 104 +++++++++-
 keyboards/mtbkeys/mtb60/hotswap/info.json     | 128 ++++++------
 keyboards/mtbkeys/mtb60/solder/info.json      | 138 ++++++------
 keyboards/studiokestra/galatea/rev1/info.json | 196 ++++++++++--------
 keyboards/studiokestra/galatea/rev2/info.json | 196 ++++++++++--------
 5 files changed, 449 insertions(+), 313 deletions(-)

diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json
index 6b43a4b072..63c53ac5b3 100644
--- a/keyboards/cannonkeys/hoodrowg/info.json
+++ b/keyboards/cannonkeys/hoodrowg/info.json
@@ -3,8 +3,108 @@
     "url": "https://cannonkeys.com",
     "maintainer": "awkannan",
     "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Win", "x":1.5, "y":5.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Ctrl", "x":11, "y":5.5, "w":1.5}, {"label":"Win", "x":12.5, "y":5.5}, {"label":"Alt", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
+        "LAYOUT_all": {
+            "layout": [
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.5},
+                {"x": 1, "y": 1.5},
+                {"x": 2, "y": 1.5},
+                {"x": 3, "y": 1.5},
+                {"x": 4, "y": 1.5},
+                {"x": 5, "y": 1.5},
+                {"x": 6, "y": 1.5},
+                {"x": 7, "y": 1.5},
+                {"x": 8, "y": 1.5},
+                {"x": 9, "y": 1.5},
+                {"x": 10, "y": 1.5},
+                {"x": 11, "y": 1.5},
+                {"x": 12, "y": 1.5},
+                {"x": 13, "y": 1.5, "w": 2},
+
+                {"x": 15.25, "y": 1.5},
+                {"x": 16.25, "y": 1.5},
+                {"x": 17.25, "y": 1.5},
+
+                {"x": 0, "y": 2.5, "w": 1.5},
+                {"x": 1.5, "y": 2.5},
+                {"x": 2.5, "y": 2.5},
+                {"x": 3.5, "y": 2.5},
+                {"x": 4.5, "y": 2.5},
+                {"x": 5.5, "y": 2.5},
+                {"x": 6.5, "y": 2.5},
+                {"x": 7.5, "y": 2.5},
+                {"x": 8.5, "y": 2.5},
+                {"x": 9.5, "y": 2.5},
+                {"x": 10.5, "y": 2.5},
+                {"x": 11.5, "y": 2.5},
+                {"x": 12.5, "y": 2.5},
+                {"x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"x": 15.25, "y": 2.5},
+                {"x": 16.25, "y": 2.5},
+                {"x": 17.25, "y": 2.5},
+
+                {"x": 0, "y": 3.5, "w": 1.75},
+                {"x": 1.75, "y": 3.5},
+                {"x": 2.75, "y": 3.5},
+                {"x": 3.75, "y": 3.5},
+                {"x": 4.75, "y": 3.5},
+                {"x": 5.75, "y": 3.5},
+                {"x": 6.75, "y": 3.5},
+                {"x": 7.75, "y": 3.5},
+                {"x": 8.75, "y": 3.5},
+                {"x": 9.75, "y": 3.5},
+                {"x": 10.75, "y": 3.5},
+                {"x": 11.75, "y": 3.5},
+                {"x": 12.75, "y": 3.5},
+                {"x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"x": 0, "y": 4.5, "w": 1.25},
+                {"x": 1.25, "y": 4.5},
+                {"x": 2.25, "y": 4.5},
+                {"x": 3.25, "y": 4.5},
+                {"x": 4.25, "y": 4.5},
+                {"x": 5.25, "y": 4.5},
+                {"x": 6.25, "y": 4.5},
+                {"x": 7.25, "y": 4.5},
+                {"x": 8.25, "y": 4.5},
+                {"x": 9.25, "y": 4.5},
+                {"x": 10.25, "y": 4.5},
+                {"x": 11.25, "y": 4.5},
+                {"x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"x": 16.25, "y": 4.5},
+
+                {"x": 0, "y": 5.5, "w": 1.5},
+                {"x": 1.5, "y": 5.5},
+                {"x": 2.5, "y": 5.5, "w": 1.5},
+                {"x": 4, "y": 5.5, "w": 7},
+                {"x": 11, "y": 5.5, "w": 1.5},
+                {"x": 12.5, "y": 5.5},
+                {"x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"x": 15.25, "y": 5.5},
+                {"x": 16.25, "y": 5.5},
+                {"x": 17.25, "y": 5.5}
+            ]
         }
     }
 }
diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json
index 5718d70507..5e66ec5a94 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/info.json
+++ b/keyboards/mtbkeys/mtb60/hotswap/info.json
@@ -3,69 +3,73 @@
     "url": "mtbkeys.com",
     "maintainer": "MTBKeys",
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "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": "Back Space", "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": "|"  , "x": 13.5, "y": 1, "w": 1.5},
-                {"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": "Left 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": "Right Shift", "x": 12.25, "y": 3, "w": 2.75},
-                {"label": "Left Ctrl" , "x":  0   , "y": 4, "w": 1.25},
-                {"label": "GUI"       , "x":  1.25, "y": 4, "w": 1.25},
-                {"label": "Left Alt"  , "x":  2.5 , "y": 4, "w": 1.25},
-                {"label": "Space"     , "x":  3.75, "y": 4, "w": 6.25},
-                {"label": "Right Ctrl", "x": 10   , "y": 4, "w": 1.25},
-                {"label": "GUI"       , "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "MO(1)"     , "x": 12.5 , "y": 4, "w": 1.25},
-                {"label": "Right Ctrl", "x": 13.75, "y": 4, "w": 1.25}
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json
index e60d3eee2f..7d49be306d 100644
--- a/keyboards/mtbkeys/mtb60/solder/info.json
+++ b/keyboards/mtbkeys/mtb60/solder/info.json
@@ -3,72 +3,80 @@
     "url": "mtbkeys.com",
     "maintainer": "MTBKeys",
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "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": "Back Space", "x": 13, "y": 0},
-                {"label": "Delete"    , "x": 14, "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": "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": "Left 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": "Right Shift", "x": 12.25, "y": 3, "w": 2.75},
-                {"label": "Left Ctrl" , "x":  0   , "y": 4, "w": 1.25},
-                {"label": "GUI"       , "x":  1.25, "y": 4, "w": 1.25},
-                {"label": "Left Alt"  , "x":  2.5 , "y": 4, "w": 1.25},
-                {"label": "Space"     , "x":  3.75, "y": 4, "w": 2.25},
-                {"label": "Space"     , "x":  6   , "y": 4, "w": 1.25},
-                {"label": "Space"     , "x":  7.25, "y": 4, "w": 2.75},
-                {"label": "Right Ctrl", "x": 10   , "y": 4, "w": 1.25},
-                {"label": "GUI"       , "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "MO(1)"     , "x": 12.5 , "y": 4, "w": 1.25},
-                {"label": "Right Ctrl", "x": 13.75, "y": 4, "w": 1.25}
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+                {"x": 12, "y": 3},
+                {"x": 13, "y": 3},
+                {"x": 14, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 2.25},
+                {"x": 6, "y": 4, "w": 1.25},
+                {"x": 7.25, "y": 4, "w": 2.75},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4}
             ]
         }
     }
diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json
index 46e07d7a43..046ba89dc8 100644
--- a/keyboards/studiokestra/galatea/rev1/info.json
+++ b/keyboards/studiokestra/galatea/rev1/info.json
@@ -3,99 +3,111 @@
     "url": "https://studiokestra.ca/galatea",
     "maintainer": "Studio Kestra",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":1.25, "y":0}, 
-                {"label":"F2", "x":2.25, "y":0}, 
-                {"label":"F3", "x":3.25, "y":0}, 
-                {"label":"F4", "x":4.25, "y":0}, 
-                {"label":"F5", "x":5.5, "y":0}, 
-                {"label":"F6", "x":6.5, "y":0}, 
-                {"label":"F7", "x":7.5, "y":0}, 
-                {"label":"F8", "x":8.5, "y":0}, 
-                {"label":"F9", "x":9.75, "y":0}, 
-                {"label":"F10", "x":10.75, "y":0}, 
-                {"label":"F11", "x":11.75, "y":0}, 
-                {"label":"F12", "x":12.75, "y":0}, 
-                {"label":"F13", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                {"label":"~", "x":0, "y":1.25}, 
-                {"label":"!", "x":1, "y":1.25}, 
-                {"label":"@", "x":2, "y":1.25}, 
-                {"label":"#", "x":3, "y":1.25}, 
-                {"label":"$", "x":4, "y":1.25}, 
-                {"label":"%", "x":5, "y":1.25}, 
-                {"label":"^", "x":6, "y":1.25}, 
-                {"label":"&", "x":7, "y":1.25}, 
-                {"label":"*", "x":8, "y":1.25}, 
-                {"label":"(", "x":9, "y":1.25}, 
-                {"label":")", "x":10, "y":1.25}, 
-                {"label":"_", "x":11, "y":1.25}, 
-                {"label":"+", "x":12, "y":1.25}, 
-                {"label":"|", "x":13, "y":1.25}, 
-                {"label":"Delete", "x":14, "y":1.25}, 
-                {"label":"Insert", "x":15.25, "y":1.25}, 
-                {"label":"Home", "x":16.25, "y":1.25}, 
-                {"label":"PgUp", "x":17.25, "y":1.25}, 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.25}, 
-                {"label":"W", "x":2.5, "y":2.25}, 
-                {"label":"E", "x":3.5, "y":2.25}, 
-                {"label":"R", "x":4.5, "y":2.25}, 
-                {"label":"T", "x":5.5, "y":2.25}, 
-                {"label":"Y", "x":6.5, "y":2.25}, 
-                {"label":"U", "x":7.5, "y":2.25}, 
-                {"label":"I", "x":8.5, "y":2.25}, 
-                {"label":"O", "x":9.5, "y":2.25}, 
-                {"label":"P", "x":10.5, "y":2.25}, 
-                {"label":"{", "x":11.5, "y":2.25}, 
-                {"label":"}", "x":12.5, "y":2.25}, 
-                {"label":"Backspace", "x":13.5, "y":2.25, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.25}, 
-                {"label":"End", "x":16.25, "y":2.25}, 
-                {"label":"PgDn", "x":17.25, "y":2.25}, 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.25}, 
-                {"label":"S", "x":2.75, "y":3.25}, 
-                {"label":"D", "x":3.75, "y":3.25}, 
-                {"label":"F", "x":4.75, "y":3.25}, 
-                {"label":"G", "x":5.75, "y":3.25}, 
-                {"label":"H", "x":6.75, "y":3.25}, 
-                {"label":"J", "x":7.75, "y":3.25}, 
-                {"label":"K", "x":8.75, "y":3.25}, 
-                {"label":"L", "x":9.75, "y":3.25}, 
-                {"label":":", "x":10.75, "y":3.25}, 
-                {"label":"\"", "x":11.75, "y":3.25}, 
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25}, 
-                {"label":"|", "x":1.25, "y":4.25}, 
-                {"label":"Z", "x":2.25, "y":4.25}, 
-                {"label":"X", "x":3.25, "y":4.25}, 
-                {"label":"C", "x":4.25, "y":4.25}, 
-                {"label":"V", "x":5.25, "y":4.25}, 
-                {"label":"B", "x":6.25, "y":4.25}, 
-                {"label":"N", "x":7.25, "y":4.25}, 
-                {"label":"M", "x":8.25, "y":4.25}, 
-                {"label":"<", "x":9.25, "y":4.25}, 
-                {"label":">", "x":10.25, "y":4.25}, 
-                {"label":"?", "x":11.25, "y":4.25}, 
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, 
-                {"label":"\u2191", "x":16.25, "y":4.25}, 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, 
-                {"x":3.75, "y":5.25, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
-                {"label":"\u2190", "x":15.25, "y":5.25}, 
-                {"label":"\u2193", "x":16.25, "y":5.25}, 
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"x": 0, "y": 0},
+
+                {"x": 1.25, "y": 0},
+                {"x": 2.25, "y": 0},
+                {"x": 3.25, "y": 0},
+                {"x": 4.25, "y": 0},
+                {"x": 5.5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.75, "y": 0},
+                {"x": 10.75, "y": 0},
+                {"x": 11.75, "y": 0},
+                {"x": 12.75, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25},
+                {"x": 14, "y": 1.25},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"x": 0, "y": 4.25, "w": 1.25},
+                {"x": 1.25, "y": 4.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 1.75},
+                {"x": 14, "y": 4.25},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json
index 46e07d7a43..046ba89dc8 100644
--- a/keyboards/studiokestra/galatea/rev2/info.json
+++ b/keyboards/studiokestra/galatea/rev2/info.json
@@ -3,99 +3,111 @@
     "url": "https://studiokestra.ca/galatea",
     "maintainer": "Studio Kestra",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0}, 
-                {"label":"F1", "x":1.25, "y":0}, 
-                {"label":"F2", "x":2.25, "y":0}, 
-                {"label":"F3", "x":3.25, "y":0}, 
-                {"label":"F4", "x":4.25, "y":0}, 
-                {"label":"F5", "x":5.5, "y":0}, 
-                {"label":"F6", "x":6.5, "y":0}, 
-                {"label":"F7", "x":7.5, "y":0}, 
-                {"label":"F8", "x":8.5, "y":0}, 
-                {"label":"F9", "x":9.75, "y":0}, 
-                {"label":"F10", "x":10.75, "y":0}, 
-                {"label":"F11", "x":11.75, "y":0}, 
-                {"label":"F12", "x":12.75, "y":0}, 
-                {"label":"F13", "x":14, "y":0}, 
-                {"label":"PrtSc", "x":15.25, "y":0}, 
-                {"label":"Scroll Lock", "x":16.25, "y":0}, 
-                {"label":"Pause", "x":17.25, "y":0}, 
-                {"label":"~", "x":0, "y":1.25}, 
-                {"label":"!", "x":1, "y":1.25}, 
-                {"label":"@", "x":2, "y":1.25}, 
-                {"label":"#", "x":3, "y":1.25}, 
-                {"label":"$", "x":4, "y":1.25}, 
-                {"label":"%", "x":5, "y":1.25}, 
-                {"label":"^", "x":6, "y":1.25}, 
-                {"label":"&", "x":7, "y":1.25}, 
-                {"label":"*", "x":8, "y":1.25}, 
-                {"label":"(", "x":9, "y":1.25}, 
-                {"label":")", "x":10, "y":1.25}, 
-                {"label":"_", "x":11, "y":1.25}, 
-                {"label":"+", "x":12, "y":1.25}, 
-                {"label":"|", "x":13, "y":1.25}, 
-                {"label":"Delete", "x":14, "y":1.25}, 
-                {"label":"Insert", "x":15.25, "y":1.25}, 
-                {"label":"Home", "x":16.25, "y":1.25}, 
-                {"label":"PgUp", "x":17.25, "y":1.25}, 
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-                {"label":"Q", "x":1.5, "y":2.25}, 
-                {"label":"W", "x":2.5, "y":2.25}, 
-                {"label":"E", "x":3.5, "y":2.25}, 
-                {"label":"R", "x":4.5, "y":2.25}, 
-                {"label":"T", "x":5.5, "y":2.25}, 
-                {"label":"Y", "x":6.5, "y":2.25}, 
-                {"label":"U", "x":7.5, "y":2.25}, 
-                {"label":"I", "x":8.5, "y":2.25}, 
-                {"label":"O", "x":9.5, "y":2.25}, 
-                {"label":"P", "x":10.5, "y":2.25}, 
-                {"label":"{", "x":11.5, "y":2.25}, 
-                {"label":"}", "x":12.5, "y":2.25}, 
-                {"label":"Backspace", "x":13.5, "y":2.25, "w":1.5}, 
-                {"label":"Delete", "x":15.25, "y":2.25}, 
-                {"label":"End", "x":16.25, "y":2.25}, 
-                {"label":"PgDn", "x":17.25, "y":2.25}, 
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, 
-                {"label":"A", "x":1.75, "y":3.25}, 
-                {"label":"S", "x":2.75, "y":3.25}, 
-                {"label":"D", "x":3.75, "y":3.25}, 
-                {"label":"F", "x":4.75, "y":3.25}, 
-                {"label":"G", "x":5.75, "y":3.25}, 
-                {"label":"H", "x":6.75, "y":3.25}, 
-                {"label":"J", "x":7.75, "y":3.25}, 
-                {"label":"K", "x":8.75, "y":3.25}, 
-                {"label":"L", "x":9.75, "y":3.25}, 
-                {"label":":", "x":10.75, "y":3.25}, 
-                {"label":"\"", "x":11.75, "y":3.25}, 
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, 
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25}, 
-                {"label":"|", "x":1.25, "y":4.25}, 
-                {"label":"Z", "x":2.25, "y":4.25}, 
-                {"label":"X", "x":3.25, "y":4.25}, 
-                {"label":"C", "x":4.25, "y":4.25}, 
-                {"label":"V", "x":5.25, "y":4.25}, 
-                {"label":"B", "x":6.25, "y":4.25}, 
-                {"label":"N", "x":7.25, "y":4.25}, 
-                {"label":"M", "x":8.25, "y":4.25}, 
-                {"label":"<", "x":9.25, "y":4.25}, 
-                {"label":">", "x":10.25, "y":4.25}, 
-                {"label":"?", "x":11.25, "y":4.25}, 
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, 
-                {"label":"\u2191", "x":16.25, "y":4.25}, 
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, 
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, 
-                {"x":3.75, "y":5.25, "w":6.25}, 
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25}, 
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, 
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, 
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, 
-                {"label":"\u2190", "x":15.25, "y":5.25}, 
-                {"label":"\u2193", "x":16.25, "y":5.25}, 
-                {"label":"\u2192", "x":17.25, "y":5.25}
+                {"x": 0, "y": 0},
+
+                {"x": 1.25, "y": 0},
+                {"x": 2.25, "y": 0},
+                {"x": 3.25, "y": 0},
+                {"x": 4.25, "y": 0},
+                {"x": 5.5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.75, "y": 0},
+                {"x": 10.75, "y": 0},
+                {"x": 11.75, "y": 0},
+                {"x": 12.75, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25},
+                {"x": 14, "y": 1.25},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"x": 0, "y": 4.25, "w": 1.25},
+                {"x": 1.25, "y": 4.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 1.75},
+                {"x": 14, "y": 4.25},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
             ]
         }
     }
-}
\ No newline at end of file
+}

From 0be2eaf1745e42fc5ebf19656cef40708ca19b3c Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 3 Feb 2022 19:22:49 +1100
Subject: [PATCH 490/867] Create a build error if no bootloader is specified.
 (#16181)

* Create a build error if no bootloader is specified.

* Update builddefs/bootloader.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 builddefs/bootloader.mk                            | 11 ++++++++++-
 platforms/avr/bootloaders/{none.c => custom.c}     |  0
 platforms/chibios/bootloaders/{none.c => custom.c} |  2 --
 3 files changed, 10 insertions(+), 3 deletions(-)
 rename platforms/avr/bootloaders/{none.c => custom.c} (100%)
 rename platforms/chibios/bootloaders/{none.c => custom.c} (88%)

diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk
index 470febc346..56ef7ff5d8 100644
--- a/builddefs/bootloader.mk
+++ b/builddefs/bootloader.mk
@@ -38,9 +38,18 @@
 # RISC-V:
 #     gd32v-dfu    GD32V USB DFU in ROM
 #
+# If you need to provide your own implementation, you can set inside `rules.mk`
+# `BOOTLOADER = custom` -- you'll need to provide your own implementations. See
+# the respective file under `platforms/<PLATFORM>/bootloaders/custom.c` to see
+# which functions may be overridden.
+#
 # BOOTLOADER_SIZE can still be defined manually, but it's recommended
 # you add any possible configuration to this list
 
+ifeq ($(strip $(BOOTLOADER)), custom)
+    OPT_DEFS += -DBOOTLOADER_CUSTOM
+    BOOTLOADER_TYPE = custom
+endif
 ifeq ($(strip $(BOOTLOADER)), atmel-dfu)
     OPT_DEFS += -DBOOTLOADER_ATMEL_DFU
     OPT_DEFS += -DBOOTLOADER_DFU
@@ -195,5 +204,5 @@ ifeq ($(strip $(BOOTLOADER)), md-boot)
 endif
 
 ifeq ($(strip $(BOOTLOADER_TYPE)),)
-    BOOTLOADER_TYPE = none
+    $(error No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file)
 endif
diff --git a/platforms/avr/bootloaders/none.c b/platforms/avr/bootloaders/custom.c
similarity index 100%
rename from platforms/avr/bootloaders/none.c
rename to platforms/avr/bootloaders/custom.c
diff --git a/platforms/chibios/bootloaders/none.c b/platforms/chibios/bootloaders/custom.c
similarity index 88%
rename from platforms/chibios/bootloaders/none.c
rename to platforms/chibios/bootloaders/custom.c
index 8379d35abf..bba9fc4637 100644
--- a/platforms/chibios/bootloaders/none.c
+++ b/platforms/chibios/bootloaders/custom.c
@@ -16,8 +16,6 @@
 
 #include "bootloader.h"
 
-#pragma message "Unknown bootloader set, you may not be able to enter bootloader using software reset"
-
 __attribute__((weak)) void bootloader_jump(void) {}
 
 __attribute__((weak)) void enter_bootloader_mode_if_requested(void) {}

From 333dd5d48c5bb4b80a0a17876bca5eda087ed10b Mon Sep 17 00:00:00 2001
From: Richard <rich@brickbots.com>
Date: Thu, 3 Feb 2022 02:18:26 -0800
Subject: [PATCH 491/867] Fix axis inversion (#16179)

---
 keyboards/handwired/aball/config.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/handwired/aball/config.h b/keyboards/handwired/aball/config.h
index 12f13fb4a8..33a6cd2a97 100644
--- a/keyboards/handwired/aball/config.h
+++ b/keyboards/handwired/aball/config.h
@@ -33,3 +33,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIRECT_PINS {{NO_PIN}}
 
 #define ADNS9800_CS_PIN F7
+#define POINTING_DEVICE_INVERT_X

From db43e450771f4eefe27821a88cc86df46c1006c1 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Fri, 4 Feb 2022 07:36:02 +1100
Subject: [PATCH 492/867] Ensure `version.h` is recreated each build. (#16188)

---
 build_keyboard.mk                        | 11 +++++------
 lib/python/qmk/cli/generate/version_h.py |  3 +++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build_keyboard.mk b/build_keyboard.mk
index a5e20853b3..80c295d9be 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -45,6 +45,9 @@ ifdef SKIP_GIT
 VERSION_H_FLAGS := --skip-git
 endif
 
+# Generate the board's version.h file.
+$(shell $(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(KEYMAP_OUTPUT)/src/version.h)
+
 # Determine which subfolders exist.
 KEYBOARD_FOLDER_PATH_1 := $(KEYBOARD)
 KEYBOARD_FOLDER_PATH_2 := $(patsubst %/,%,$(dir $(KEYBOARD_FOLDER_PATH_1)))
@@ -165,13 +168,8 @@ generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c
 
 endif
 
-generated-files: $(KEYMAP_OUTPUT)/src/version.h
-$(KEYMAP_OUTPUT)/src/version.h:
-	[ -d $(KEYMAP_OUTPUT)/src ] || mkdir -p $(KEYMAP_OUTPUT)/src
-	$(QMK_BIN) generate-version-h $(VERSION_H_FLAGS) -q -o $(KEYMAP_OUTPUT)/src/version.h
-
 ifeq ($(strip $(CTPC)), yes)
-  CONVERT_TO_PROTON_C=yes
+    CONVERT_TO_PROTON_C=yes
 endif
 
 ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
@@ -397,6 +395,7 @@ VPATH += $(KEYMAP_PATH)
 VPATH += $(USER_PATH)
 VPATH += $(KEYBOARD_PATHS)
 VPATH += $(COMMON_VPATH)
+VPATH += $(KEYBOARD_OUTPUT)/src
 VPATH += $(KEYMAP_OUTPUT)/src
 
 include common_features.mk
diff --git a/lib/python/qmk/cli/generate/version_h.py b/lib/python/qmk/cli/generate/version_h.py
index b8e52588c4..69341e36f0 100644
--- a/lib/python/qmk/cli/generate/version_h.py
+++ b/lib/python/qmk/cli/generate/version_h.py
@@ -20,6 +20,9 @@ def generate_version_h(cli):
     version_h = create_version_h(cli.args.skip_git, cli.args.skip_all)
 
     if cli.args.output:
+        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
+        if cli.args.output.exists():
+            cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
         cli.args.output.write_text(version_h)
 
         if not cli.args.quiet:

From 3403f5813cc1daa29a2da0690341152abae3aa86 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Fri, 4 Feb 2022 14:44:51 +1100
Subject: [PATCH 493/867] Point out that deferred execution needs to be enabled
 in rules.mk (#16196)

---
 docs/custom_quantum_functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/custom_quantum_functions.md b/docs/custom_quantum_functions.md
index dd1654bd29..f9a6e1bcc8 100644
--- a/docs/custom_quantum_functions.md
+++ b/docs/custom_quantum_functions.md
@@ -408,7 +408,7 @@ The `val` is the value of the data that you want to write to EEPROM.  And the `e
 
 ### Deferred Execution :id=deferred-execution
 
-QMK has the ability to execute a callback after a specified period of time, rather than having to manually manage timers.
+QMK has the ability to execute a callback after a specified period of time, rather than having to manually manage timers. To enable this functionality, set `DEFERRED_EXEC_ENABLE = yes` in rules.mk.
 
 #### Deferred executor callbacks
 

From 1cb423c424363f758d0f988b3c7e7a4e16ced74b Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 3 Feb 2022 20:32:20 -0800
Subject: [PATCH 494/867] Mokey xox70hot: rename LAYOUT to
 LAYOUT_tkl_nofrow_ansi_tsangan (#16193)

---
 keyboards/mokey/xox70hot/info.json                | 15 +++++++++------
 keyboards/mokey/xox70hot/keymaps/default/keymap.c |  4 ++--
 keyboards/mokey/xox70hot/keymaps/via/keymap.c     |  8 ++++----
 keyboards/mokey/xox70hot/xox70hot.h               |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/keyboards/mokey/xox70hot/info.json b/keyboards/mokey/xox70hot/info.json
index 08bcc556c2..a1fc86924f 100644
--- a/keyboards/mokey/xox70hot/info.json
+++ b/keyboards/mokey/xox70hot/info.json
@@ -1,9 +1,12 @@
 {
     "keyboard_name": "xox70hot",
     "url": "",
-    "maintainer": "Mokey",
+    "maintainer": "rhmokey",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_tkl_nofrow_ansi_tsangan"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_tkl_nofrow_ansi_tsangan": {
             "layout": [
                 {"label":"k00", "x":0, "y":0},
                 {"label":"k01", "x":1, "y":0},
@@ -22,7 +25,7 @@
                 {"label":"k0f", "x":15.25, "y":0},
                 {"label":"k0g", "x":16.25, "y":0},
                 {"label":"k0h", "x":17.25, "y":0},
-                
+
                 {"label":"k10", "x":0, "y":1, "w":1.5},
                 {"label":"k12", "x":1.5, "y":1},
                 {"label":"k13", "x":2.5, "y":1},
@@ -40,7 +43,7 @@
                 {"label":"k1f", "x":15.25, "y":1},
                 {"label":"k1g", "x":16.25, "y":1},
                 {"label":"k1h", "x":17.25, "y":1},
-                
+
                 {"label":"k20", "x":0, "y":2, "w":1.75},
                 {"label":"k22", "x":1.75, "y":2},
                 {"label":"k23", "x":2.75, "y":2},
@@ -54,7 +57,7 @@
                 {"label":"k2b", "x":10.75, "y":2},
                 {"label":"k2c", "x":11.75, "y":2},
                 {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-                
+
                 {"label":"k30", "x":0, "y":3, "w":2.25},
                 {"label":"k32", "x":2.25, "y":3},
                 {"label":"k33", "x":3.25, "y":3},
@@ -82,4 +85,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/mokey/xox70hot/keymaps/default/keymap.c b/keyboards/mokey/xox70hot/keymaps/default/keymap.c
index 574639fee9..e7955ce89b 100644
--- a/keyboards/mokey/xox70hot/keymaps/default/keymap.c
+++ b/keyboards/mokey/xox70hot/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT(
+    LAYOUT_tkl_nofrow_ansi_tsangan(
         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_INSERT, KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DELETE, KC_END,  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,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_GRV,  KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    LAYOUT(
+    LAYOUT_tkl_nofrow_ansi_tsangan(
         _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/mokey/xox70hot/keymaps/via/keymap.c b/keyboards/mokey/xox70hot/keymaps/via/keymap.c
index 4af0d343a8..53f66e5214 100644
--- a/keyboards/mokey/xox70hot/keymaps/via/keymap.c
+++ b/keyboards/mokey/xox70hot/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    LAYOUT(
+    LAYOUT_tkl_nofrow_ansi_tsangan(
         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_INSERT, KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,   KC_DELETE, KC_END,  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,
@@ -25,21 +25,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_GRV,  KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-    LAYOUT(
+    LAYOUT_tkl_nofrow_ansi_tsangan(
         _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
         _______, _______, _______,                   _______,                            _______, _______, _______,                     _______, _______, _______
     ),
-    LAYOUT(
+    LAYOUT_tkl_nofrow_ansi_tsangan(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
         _______, _______, _______,                   _______,                            _______, _______, _______,                     _______, _______, _______
     ),
-    LAYOUT(
+    LAYOUT_tkl_nofrow_ansi_tsangan(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
diff --git a/keyboards/mokey/xox70hot/xox70hot.h b/keyboards/mokey/xox70hot/xox70hot.h
index e4ed4bff5c..5e6f9665c8 100644
--- a/keyboards/mokey/xox70hot/xox70hot.h
+++ b/keyboards/mokey/xox70hot/xox70hot.h
@@ -20,7 +20,7 @@
 
 #define xxx KC_NO
 
-#define LAYOUT(\
+#define LAYOUT_tkl_nofrow_ansi_tsangan(\
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, k0h, \
     k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \
     k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \

From 405c04e0d2966eaa3ad7d96f53863ed7d9618bc4 Mon Sep 17 00:00:00 2001
From: Salicylic-acid3 <46864619+Salicylic-acid3@users.noreply.github.com>
Date: Sat, 5 Feb 2022 00:59:38 +0900
Subject: [PATCH 495/867] [Keyboard] Add Keyboards GL516s (#14950)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/gl516/a52gl/a52gl.c                 |  18 ++
 keyboards/gl516/a52gl/a52gl.h                 |  37 ++++
 keyboards/gl516/a52gl/config.h                |  44 +++++
 keyboards/gl516/a52gl/info.json               |  63 +++++++
 .../gl516/a52gl/keymaps/default/keymap.c      |  52 ++++++
 .../gl516/a52gl/keymaps/salicylic/config.h    |  22 +++
 .../gl516/a52gl/keymaps/salicylic/keymap.c    |  65 +++++++
 keyboards/gl516/a52gl/keymaps/via/keymap.c    |  65 +++++++
 keyboards/gl516/a52gl/keymaps/via/rules.mk    |   1 +
 keyboards/gl516/a52gl/matrix.c                | 158 ++++++++++++++++++
 keyboards/gl516/a52gl/readme.md               |  26 +++
 keyboards/gl516/a52gl/rules.mk                |  22 +++
 keyboards/gl516/j73gl/config.h                |  63 +++++++
 keyboards/gl516/j73gl/info.json               |  84 ++++++++++
 keyboards/gl516/j73gl/j73gl.c                 |  55 ++++++
 keyboards/gl516/j73gl/j73gl.h                 |  40 +++++
 .../gl516/j73gl/keymaps/default/keymap.c      |  57 +++++++
 keyboards/gl516/j73gl/keymaps/via/keymap.c    |  74 ++++++++
 keyboards/gl516/j73gl/keymaps/via/rules.mk    |   1 +
 .../j73gl/keymaps/via_rgb_matrix/config.h     |  43 +++++
 .../j73gl/keymaps/via_rgb_matrix/keymap.c     |  74 ++++++++
 .../j73gl/keymaps/via_rgb_matrix/rules.mk     |   7 +
 keyboards/gl516/j73gl/matrix.c                | 158 ++++++++++++++++++
 keyboards/gl516/j73gl/readme.md               |  27 +++
 keyboards/gl516/j73gl/rules.mk                |  22 +++
 keyboards/gl516/n51gl/config.h                |  67 ++++++++
 keyboards/gl516/n51gl/info.json               |  63 +++++++
 .../gl516/n51gl/keymaps/default/keymap.c      |  60 +++++++
 .../gl516/n51gl/keymaps/salicylic/config.h    |  22 +++
 .../gl516/n51gl/keymaps/salicylic/keymap.c    | 117 +++++++++++++
 keyboards/gl516/n51gl/keymaps/via/config.h    |  22 +++
 keyboards/gl516/n51gl/keymaps/via/keymap.c    | 102 +++++++++++
 keyboards/gl516/n51gl/keymaps/via/rules.mk    |   1 +
 keyboards/gl516/n51gl/matrix.c                | 158 ++++++++++++++++++
 keyboards/gl516/n51gl/n51gl.c                 |  18 ++
 keyboards/gl516/n51gl/n51gl.h                 |  54 ++++++
 keyboards/gl516/n51gl/readme.md               |  27 +++
 keyboards/gl516/n51gl/rules.mk                |  22 +++
 38 files changed, 2011 insertions(+)
 create mode 100644 keyboards/gl516/a52gl/a52gl.c
 create mode 100644 keyboards/gl516/a52gl/a52gl.h
 create mode 100644 keyboards/gl516/a52gl/config.h
 create mode 100644 keyboards/gl516/a52gl/info.json
 create mode 100644 keyboards/gl516/a52gl/keymaps/default/keymap.c
 create mode 100644 keyboards/gl516/a52gl/keymaps/salicylic/config.h
 create mode 100644 keyboards/gl516/a52gl/keymaps/salicylic/keymap.c
 create mode 100644 keyboards/gl516/a52gl/keymaps/via/keymap.c
 create mode 100644 keyboards/gl516/a52gl/keymaps/via/rules.mk
 create mode 100644 keyboards/gl516/a52gl/matrix.c
 create mode 100644 keyboards/gl516/a52gl/readme.md
 create mode 100644 keyboards/gl516/a52gl/rules.mk
 create mode 100644 keyboards/gl516/j73gl/config.h
 create mode 100644 keyboards/gl516/j73gl/info.json
 create mode 100644 keyboards/gl516/j73gl/j73gl.c
 create mode 100644 keyboards/gl516/j73gl/j73gl.h
 create mode 100644 keyboards/gl516/j73gl/keymaps/default/keymap.c
 create mode 100644 keyboards/gl516/j73gl/keymaps/via/keymap.c
 create mode 100644 keyboards/gl516/j73gl/keymaps/via/rules.mk
 create mode 100644 keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
 create mode 100644 keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c
 create mode 100644 keyboards/gl516/j73gl/keymaps/via_rgb_matrix/rules.mk
 create mode 100644 keyboards/gl516/j73gl/matrix.c
 create mode 100644 keyboards/gl516/j73gl/readme.md
 create mode 100644 keyboards/gl516/j73gl/rules.mk
 create mode 100644 keyboards/gl516/n51gl/config.h
 create mode 100644 keyboards/gl516/n51gl/info.json
 create mode 100644 keyboards/gl516/n51gl/keymaps/default/keymap.c
 create mode 100644 keyboards/gl516/n51gl/keymaps/salicylic/config.h
 create mode 100644 keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
 create mode 100644 keyboards/gl516/n51gl/keymaps/via/config.h
 create mode 100644 keyboards/gl516/n51gl/keymaps/via/keymap.c
 create mode 100644 keyboards/gl516/n51gl/keymaps/via/rules.mk
 create mode 100644 keyboards/gl516/n51gl/matrix.c
 create mode 100644 keyboards/gl516/n51gl/n51gl.c
 create mode 100644 keyboards/gl516/n51gl/n51gl.h
 create mode 100644 keyboards/gl516/n51gl/readme.md
 create mode 100644 keyboards/gl516/n51gl/rules.mk

diff --git a/keyboards/gl516/a52gl/a52gl.c b/keyboards/gl516/a52gl/a52gl.c
new file mode 100644
index 0000000000..67c27d2d7d
--- /dev/null
+++ b/keyboards/gl516/a52gl/a52gl.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "a52gl.h"
diff --git a/keyboards/gl516/a52gl/a52gl.h b/keyboards/gl516/a52gl/a52gl.h
new file mode 100644
index 0000000000..6ff00c541f
--- /dev/null
+++ b/keyboards/gl516/a52gl/a52gl.h
@@ -0,0 +1,37 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05,    L06, R00, R01, R02, R03, R04, R05, R06, \
+    L10, L11, L12, L13, L14, L15,    L16, R10, R11, R12, R13, R14, R15,      \
+    L20, L21, L22, L23, L24, L25,    L26, R20, R21, R22, R23, R24, R25, R26, \
+    L30, L31, L32,   L34,    L35,      L36,    R31,      R33, R34, R35, R36  \
+  ) \
+  { \
+    {   L00,   L01,   L02,   L03,   L04,   L05,   L06 }, \
+    {   L10,   L11,   L12,   L13,   L14,   L15,   L16 }, \
+    {   L20,   L21,   L22,   L23,   L24,   L25,   L26 }, \
+    {   L30,   L31,   L32, KC_NO,   L34,   L35,   L36 }, \
+    {   R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \
+    {   R10,   R11,   R12,   R13,   R14,   R15, KC_NO }, \
+    {   R20,   R21,   R22,   R23,   R24,   R25,   R26 }, \
+    { KC_NO,   R31, KC_NO,   R33,   R34,   R35,   R36 }  \
+  }
diff --git a/keyboards/gl516/a52gl/config.h b/keyboards/gl516/a52gl/config.h
new file mode 100644
index 0000000000..c9f54e0928
--- /dev/null
+++ b/keyboards/gl516/a52gl/config.h
@@ -0,0 +1,44 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xE8D1
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Salicylic_Acid
+#define PRODUCT         a52gl
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 7
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
+#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
diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json
new file mode 100644
index 0000000000..406c7096ae
--- /dev/null
+++ b/keyboards/gl516/a52gl/info.json
@@ -0,0 +1,63 @@
+{
+    "keyboard_name": "a52gl", 
+    "url": "https://salicylic-acid3.hatenablog.com/", 
+    "maintainer": "Salicylic_acid3", 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2.25, "y":0},
+                {"label":"0,3", "x":3.25, "y":0},
+                {"label":"0,4", "x":4.25, "y":0},
+                {"label":"0,5", "x":5.25, "y":0},
+                {"label":"0,6", "x":7.75, "y":0},
+                {"label":"4,0", "x":8.75, "y":0},
+                {"label":"4,1", "x":9.75, "y":0},
+                {"label":"4,2", "x":10.75, "y":0},
+                {"label":"4,3", "x":12, "y":0},
+                {"label":"4,4", "x":13, "y":0},
+                {"label":"4,5", "x":14, "y":0},
+                {"label":"4,6", "x":15, "y":0, "w":1.5},
+                {"label":"1,0", "x":0, "y":1, "w":1.25},
+                {"label":"1,1", "x":1.25, "y":1},
+                {"label":"1,2", "x":2.52, "y":1},
+                {"label":"1,3", "x":3.52, "y":1},
+                {"label":"1,4", "x":4.52, "y":1},
+                {"label":"1,5", "x":5.52, "y":1},
+                {"label":"1,6", "x":8, "y":1},
+                {"label":"5,0", "x":9, "y":1},
+                {"label":"5,1", "x":10, "y":1},
+                {"label":"5,2", "x":11, "y":1},
+                {"label":"5,3", "x":12.25, "y":1},
+                {"label":"5,4", "x":13.25, "y":1},
+                {"label":"5,5", "x":14.25, "y":1, "w":2.25},
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":3.05, "y":2},
+                {"label":"2,3", "x":4.05, "y":2},
+                {"label":"2,4", "x":5.05, "y":2},
+                {"label":"2,5", "x":6.05, "y":2},
+                {"label":"2,6", "x":7.5, "y":2},
+                {"label":"6,0", "x":8.5, "y":2},
+                {"label":"6,1", "x":9.5, "y":2},
+                {"label":"6,2", "x":10.5, "y":2},
+                {"label":"6,3", "x":12, "y":2},
+                {"label":"6,4", "x":13, "y":2},
+                {"label":"6,6", "x":15.5, "y":2},
+                {"label":"6,5", "x":14.25, "y":2.25},
+                {"label":"3,0", "x":0, "y":3, "w":1.25},
+                {"label":"3,1", "x":1.25, "y":3, "w":1.25},
+                {"label":"3,2", "x":3.05, "y":3},
+                {"label":"3,4", "x":4.05, "y":3, "w":2},
+                {"label":"3,5", "x":6.05, "y":3},
+                {"label":"3,6", "x":7.5, "y":3, "w":2.25},
+                {"label":"7,1", "x":9.75, "y":3, "w":1.25},
+                {"label":"7,3", "x":12.0, "y":3},
+                {"label":"7,4", "x":13.25, "y":3.25},
+                {"label":"7,5", "x":14.25, "y":3.25},
+                {"label":"7,6", "x":15.25, "y":3.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/a52gl/keymaps/default/keymap.c b/keyboards/gl516/a52gl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..adcf71879d
--- /dev/null
+++ b/keyboards/gl516/a52gl/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#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.
+enum layer_number {
+  _QWERTY = 0,
+  _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+       KC_ESC,    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_BSPC,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+LT(_FN,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_B,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC,      KC_SPC,         KC_SPC,       KC_LALT,KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------|   |--------------------------------------------------------------'
+  ),
+  [_FN] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______, _______, 
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______,     _______,      _______,         _______,      _______, _______, _______, _______, _______
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+  )
+};
+
diff --git a/keyboards/gl516/a52gl/keymaps/salicylic/config.h b/keyboards/gl516/a52gl/keymaps/salicylic/config.h
new file mode 100644
index 0000000000..fd96baa819
--- /dev/null
+++ b/keyboards/gl516/a52gl/keymaps/salicylic/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Salicylic_acid3
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Select hand configuration */
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 180
diff --git a/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c b/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c
new file mode 100644
index 0000000000..4607d1dc50
--- /dev/null
+++ b/keyboards/gl516/a52gl/keymaps/salicylic/keymap.c
@@ -0,0 +1,65 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "keymap_jp.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.
+enum layer_number {
+  _QWERTY = 0,
+  _LOWER,
+  _RAISE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+       KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, JP_LBRC, JP_RBRC, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_B,KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+  JP_ZKHK,KC_LALT,LGUI_T(JP_MHEN),LT(_LOWER,KC_ENT),KC_BSPC,LT(_RAISE,KC_SPC),ALT_T(JP_HENK),KC_APP,KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------|   |--------------------------------------------------------------'
+  ),
+  [_LOWER] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+       KC_ESC, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,        KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH, XXXXXXX, KC_DEL,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      JP_QUOT, JP_HASH,  JP_DQT, JP_LPRN, JP_RPRN,   JP_AT,     XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL, _______, 
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE,KC_LSFT,KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, JP_MHEN,   MO(_LOWER),     _______,       MO(_RAISE),      JP_DOT, _______, _______, _______, _______
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+  ),
+  [_RAISE] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP,LALT(KC_PSCR),KC_PSCR, KC_DEL,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+LCTL_T(KC_F11),  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, _______, 
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+SFT_T(KC_F12),   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,KC_LSFT,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX, KC_PGDN, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, JP_MHEN,     _______,       KC_DEL,         _______,      JP_HENK, _______, _______, _______, _______
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+  )
+};
+
diff --git a/keyboards/gl516/a52gl/keymaps/via/keymap.c b/keyboards/gl516/a52gl/keymaps/via/keymap.c
new file mode 100644
index 0000000000..77386f8a25
--- /dev/null
+++ b/keyboards/gl516/a52gl/keymaps/via/keymap.c
@@ -0,0 +1,65 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+       KC_ESC,    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_BSPC,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+LT(1,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_B,KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC,      KC_SPC,         KC_SPC,       KC_LALT,KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------|   |--------------------------------------------------------------'
+  ),
+  [1] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,       KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______, _______, 
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______,     _______,      _______,         _______,      _______, _______, _______, _______, _______
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+  ),
+  [2] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, 
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______,     _______,      _______,         _______,      _______, _______, _______, _______, _______
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+  ),
+  [3] = LAYOUT(
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, _______, 
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______,     _______,      _______,         _______,      _______, _______, _______, _______, _______
+  //,-----------------------------------------------------|   |--------------------------------------------------------------.
+  )
+};
diff --git a/keyboards/gl516/a52gl/keymaps/via/rules.mk b/keyboards/gl516/a52gl/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/gl516/a52gl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gl516/a52gl/matrix.c b/keyboards/gl516/a52gl/matrix.c
new file mode 100644
index 0000000000..1a97fdfd61
--- /dev/null
+++ b/keyboards/gl516/a52gl/matrix.c
@@ -0,0 +1,158 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+
+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 "matrix.h"
+#include "quantum.h"
+
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+static void select_row(uint8_t row)
+{
+    setPinOutput(row_pins[row]);
+    writePinLow(row_pins[row]);
+}
+
+static void unselect_row(uint8_t row)
+{
+    setPinInputHigh(row_pins[row]);
+}
+
+static void unselect_rows(void)
+{
+    for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static void select_col(uint8_t col)
+{
+    setPinOutput(col_pins[col]);
+    writePinLow(col_pins[col]);
+}
+
+static void unselect_col(uint8_t col)
+{
+    setPinInputHigh(col_pins[col]);
+}
+
+static void unselect_cols(void)
+{
+    for(uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
+}
+
+static void init_pins(void) {
+  unselect_rows();
+  unselect_cols();
+  for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+    setPinInputHigh(col_pins[x]);
+  }
+  for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+    setPinInputHigh(row_pins[x]);
+  }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
+{
+    // Store last value of row prior to reading
+    matrix_row_t last_row_value = current_matrix[current_row];
+
+    // Clear data in matrix row
+    current_matrix[current_row] = 0;
+
+    // Select row and wait for row selecton to stabilize
+    select_row(current_row);
+    matrix_io_delay();
+
+    // For each col...
+    for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+
+        // Select the col pin to read (active low)
+        uint8_t pin_state = readPin(col_pins[col_index]);
+
+        // Populate the matrix row with the state of the col pin
+        current_matrix[current_row] |=  pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+    }
+
+    // Unselect row
+    unselect_row(current_row);
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
+{
+    bool matrix_changed = false;
+
+    // Select col and wait for col selecton to stabilize
+    select_col(current_col);
+    matrix_io_delay();
+
+    // For each row...
+    for(uint8_t row_index = 0; row_index < MATRIX_ROWS/2; row_index++)
+    {
+        uint8_t tmp = row_index + MATRIX_ROWS/2;
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[tmp];
+
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0)
+        {
+            // Pin LO, set col bit
+            current_matrix[tmp] |= (MATRIX_ROW_SHIFTER << current_col);
+        }
+        else
+        {
+            // Pin HI, clear col bit
+            current_matrix[tmp] &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[tmp]) && !(matrix_changed))
+        {
+            matrix_changed = true;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+
+    return matrix_changed;
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[])
+{
+  bool changed = false;
+
+  // Set row, read cols
+  for (uint8_t current_row = 0; current_row < MATRIX_ROWS / 2; current_row++) {
+    changed |= read_cols_on_row(current_matrix, current_row);
+  }
+  //else
+  // Set col, read rows
+  for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+    changed |= read_rows_on_col(current_matrix, current_col);
+  }
+  
+  return changed;
+}
diff --git a/keyboards/gl516/a52gl/readme.md b/keyboards/gl516/a52gl/readme.md
new file mode 100644
index 0000000000..cfc7277eef
--- /dev/null
+++ b/keyboards/gl516/a52gl/readme.md
@@ -0,0 +1,26 @@
+# a52gl
+
+![a52gl](https://cdn-ak.f.st-hatena.com/images/fotolife/S/Salicylic_acid3/20210911/20210911005227.jpg)
+
+This is 52 keys Alice style keyboard.
+Use the GL516 case.
+
+* Keyboard Maintainer: [Salicylic_acid3](https://github.com/Salicylic-acid3)
+* Hardware Supported: a52gl PCB, Pro Micro
+* Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/GL516_Exemple), [yushakobo Shop](https://shop.yushakobo.jp/products/3342)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gl516/a52gl:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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).
+
+[Build guide](https://salicylic-acid3.hatenablog.com/entry/a52gl-j73gl-build-guide)
diff --git a/keyboards/gl516/a52gl/rules.mk b/keyboards/gl516/a52gl/rules.mk
new file mode 100644
index 0000000000..37fe9349c6
--- /dev/null
+++ b/keyboards/gl516/a52gl/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/gl516/j73gl/config.h b/keyboards/gl516/j73gl/config.h
new file mode 100644
index 0000000000..50d745ebb1
--- /dev/null
+++ b/keyboards/gl516/j73gl/config.h
@@ -0,0 +1,63 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xE8D0
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Salicylic_Acid
+#define PRODUCT         j73gl
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, E6 }
+#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 D3
+
+#ifndef RGBLED_NUM
+  #define RGBLED_NUM 73
+#endif
+
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json
new file mode 100644
index 0000000000..fc79f923a5
--- /dev/null
+++ b/keyboards/gl516/j73gl/info.json
@@ -0,0 +1,84 @@
+{
+    "keyboard_name": "j73gl", 
+    "url": "https://salicylic-acid3.hatenablog.com/", 
+    "maintainer": "Salicylic_acid3", 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1, "y":0},
+                {"label":"0,2", "x":2, "y":0},
+                {"label":"0,3", "x":3, "y":0},
+                {"label":"0,4", "x":4, "y":0},
+                {"label":"0,5", "x":5, "y":0},
+                {"label":"0,6", "x":6, "y":0},
+                {"label":"5,0", "x":7, "y":0},
+                {"label":"5,1", "x":8, "y":0},
+                {"label":"5,2", "x":9, "y":0},
+                {"label":"5,3", "x":10, "y":0},
+                {"label":"5,4", "x":11, "y":0},
+                {"label":"5,5", "x":12, "y":0},
+                {"label":"5,6", "x":13, "y":0},
+                {"label":"6,6", "x":14, "y":0},
+                {"label":"5,7", "x":15, "y":0},
+                {"label":"1,0", "x":0, "y":1, "w":1.5},
+                {"label":"1,1", "x":1.5, "y":1},
+                {"label":"1,2", "x":2.5, "y":1},
+                {"label":"1,3", "x":3.5, "y":1},
+                {"label":"1,4", "x":4.5, "y":1},
+                {"label":"1,5", "x":5.5, "y":1},
+                {"label":"1,6", "x":6.5, "y":1},
+                {"label":"6,0", "x":7.5, "y":1},
+                {"label":"6,1", "x":8.5, "y":1},
+                {"label":"6,2", "x":9.5, "y":1},
+                {"label":"6,3", "x":10.5, "y":1},
+                {"label":"6,4", "x":11.5, "y":1},
+                {"label":"6,5", "x":12.5, "y":1},
+                {"label":"7,6", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"6,7", "x":15, "y":1},
+                {"label":"2,0", "x":0, "y":2, "w":1.75},
+                {"label":"2,1", "x":1.75, "y":2},
+                {"label":"2,2", "x":2.75, "y":2},
+                {"label":"2,3", "x":3.75, "y":2},
+                {"label":"2,4", "x":4.75, "y":2},
+                {"label":"2,5", "x":5.75, "y":2},
+                {"label":"2,6", "x":6.75, "y":2},
+                {"label":"7,0", "x":7.75, "y":2},
+                {"label":"7,1", "x":8.75, "y":2},
+                {"label":"7,2", "x":9.75, "y":2},
+                {"label":"7,3", "x":10.75, "y":2},
+                {"label":"7,4", "x":11.75, "y":2},
+                {"label":"7,5", "x":12.75, "y":2},
+                {"label":"7,7", "x":15, "y":2},
+                {"label":"3,0", "x":0, "y":3, "w":2.25},
+                {"label":"3,1", "x":2.25, "y":3},
+                {"label":"3,2", "x":3.25, "y":3},
+                {"label":"3,3", "x":4.25, "y":3},
+                {"label":"3,4", "x":5.25, "y":3},
+                {"label":"3,5", "x":6.25, "y":3},
+                {"label":"3,6", "x":7.25, "y":3},
+                {"label":"8,0", "x":8.25, "y":3},
+                {"label":"8,1", "x":9.25, "y":3},
+                {"label":"8,2", "x":10.25, "y":3},
+                {"label":"8,3", "x":11.25, "y":3},
+                {"label":"8,5", "x":12.25, "y":3, "w":1.75},
+                {"label":"8,6", "x":14, "y":3},
+                {"label":"8,7", "x":15, "y":3},
+                {"label":"4,0", "x":0, "y":4, "w":1.25},
+                {"label":"4,1", "x":1.25, "y":4},
+                {"label":"4,2", "x":2.25, "y":4, "w":1.25},
+                {"label":"4,3", "x":3.5, "y":4},
+                {"label":"4,4", "x":4.5, "y":4, "w":1.25},
+                {"label":"4,5", "x":5.75, "y":4},
+                {"label":"4,6", "x":6.75, "y":4},
+                {"label":"9,0", "x":7.75, "y":4, "w":1.25},
+                {"label":"9,1", "x":9, "y":4},
+                {"label":"9,2", "x":10, "y":4, "w":1.25},
+                {"label":"9,3", "x":11.25, "y":4, "w":1.25},
+                {"label":"9,5", "x":13, "y":4},
+                {"label":"9,6", "x":14, "y":4},
+                {"label":"9,7", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/j73gl/j73gl.c b/keyboards/gl516/j73gl/j73gl.c
new file mode 100644
index 0000000000..483b005844
--- /dev/null
+++ b/keyboards/gl516/j73gl/j73gl.c
@@ -0,0 +1,55 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "j73gl.h"
+
+#ifdef RGB_MATRIX_ENABLE
+    led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+        { 67,66,60,59,50,49,40,39 },
+        {  68,65,61,58,51,46,48,41 },
+        {   69,64,62,57,52,45,47,42 },
+        {     70,63,56,53,46,43,36,33 },
+        {  71, 72, 55, 54, 45,44,35,34 },
+        { 30,29,20,19,10, 9, 8, 0 },
+        {  38,31,28,21,18,11,   1 },
+        {   37,32,27,22,17,12,7,2 },
+        {     26,23,16,  13,  6,3 },
+        {      25, 24, 15, 14,5,4 }
+    }, {
+    // LED Index to Physical Position
+        { 224,   0 }, { 224,  16 }, { 224,  32 }, { 224,  48 }, { 224,  64 },{ 209,  64 }, { 209,  48 }, { 206,  24 }, { 209,   0 }, { 194,   0 },
+        { 179,   0 }, { 188,  16 }, { 191,  32 }, { 189,  48 }, { 194,  64 },{ 171,  64 }, { 169,  48 }, { 176,  32 }, { 173,  16 }, { 165,   0 },
+        { 150,   0 }, { 156,  16 }, { 161,  32 }, { 154,  48 }, { 152,  64 },{ 135,  64 }, { 139,  48 }, { 146,  32 }, { 143,  16 }, { 135,   0 },
+        { 120,   0 }, { 128,  16 }, { 131,  32 }, { 124,  48 }, { 118,  64 },{ 101,  64 }, { 109,  48 }, { 116,  32 }, { 113,  16 }, { 105,   0 },
+        {  90,   0 }, {  98,  16 }, { 101,  32 }, {  94,  48 }, {  86,  64 },{  69,  64 }, {  79,  48 }, {  86,  32 }, {  83,  16 }, {  75,   0 },
+        {  60,   0 }, {  68,  16 }, {  71,  32 }, {  64,  48 }, {  53,  64 },{  36,  64 }, {  49,  48 }, {  56,  32 }, {  53,  16 }, {  45,   0 },
+        {  30,   0 }, {  38,  16 }, {  41,  32 }, {  34,  48 }, {  26,  32 },{  23,  16 }, {  15,  48 }, {   0,   0 }, {  11,  16 }, {  13,  32 },
+        {  17,  48 }, {  2,   64 }, {  19,  64 }
+    }, {
+    // LED Index to Flag
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4
+} };
+#endif
+
diff --git a/keyboards/gl516/j73gl/j73gl.h b/keyboards/gl516/j73gl/j73gl.h
new file mode 100644
index 0000000000..ad4821461a
--- /dev/null
+++ b/keyboards/gl516/j73gl/j73gl.h
@@ -0,0 +1,40 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R16, R07, \
+    L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15,           R17, \
+    L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25,    R26,   R27, \
+    L30,      L31, L32, L33, L34, L35, L36, R30, R31, R32, R33,      R35, R36, R37, \
+    L40,  L41,  L42, L43,  L44, L45,  L46, R40, R41, R42,  R43,      R45, R46, R47  \
+  ) \
+  { \
+    { L00,   L01,   L02,   L03,   L04,   L05,   L06, KC_NO }, \
+    { L10,   L11,   L12,   L13,   L14,   L15,   L16, KC_NO }, \
+    { L20,   L21,   L22,   L23,   L24,   L25,   L26, KC_NO }, \
+    { L30,   L31,   L32,   L33,   L34,   L35,   L36, KC_NO }, \
+    { L40,   L41,   L42,   L43,   L44,   L45,   L46, KC_NO }, \
+    { R00,   R01,   R02,   R03,   R04,   R05,   R06,   R07 }, \
+    { R10,   R11,   R12,   R13,   R14,   R15,   R16,   R17 }, \
+    { R20,   R21,   R22,   R23,   R24,   R25,   R26,   R27 }, \
+    { R30,   R31,   R32,   R33, KC_NO,   R35,   R36,   R37 }, \
+    { R40,   R41,   R42,   R43, KC_NO,   R45,   R46,   R47 }  \
+  }
diff --git a/keyboards/gl516/j73gl/keymaps/default/keymap.c b/keyboards/gl516/j73gl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..846df7d2b7
--- /dev/null
+++ b/keyboards/gl516/j73gl/keymaps/default/keymap.c
@@ -0,0 +1,57 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "keymap_jp.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.
+enum layer_number {
+  _QWERTY = 0,
+  _FN,
+};
+
+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, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC, KC_HOME,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,           KC_END,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+LT(_FN,JP_ZKHK),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, JP_SCLN, JP_COLN, JP_RBRC,  KC_ENT, KC_PGUP,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  RSFT_T(JP_BSLS),   KC_UP, KC_PGDN,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,          KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [_FN] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______,  KC_DEL, KC_PSCR,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_INS,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  )
+};
+
diff --git a/keyboards/gl516/j73gl/keymaps/via/keymap.c b/keyboards/gl516/j73gl/keymaps/via/keymap.c
new file mode 100644
index 0000000000..3e8fba928d
--- /dev/null
+++ b/keyboards/gl516/j73gl/keymaps/via/keymap.c
@@ -0,0 +1,74 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "keymap_jp.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC, KC_HOME,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,           KC_END,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+LT(1,JP_ZKHK),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, JP_SCLN, JP_COLN, JP_RBRC,  KC_ENT, KC_PGUP,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  RSFT_T(JP_BSLS),   KC_UP, KC_PGDN,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,          KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [1] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______,  KC_DEL, KC_PSCR,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_INS,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [2] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [3] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  )
+};
diff --git a/keyboards/gl516/j73gl/keymaps/via/rules.mk b/keyboards/gl516/j73gl/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/gl516/j73gl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
new file mode 100644
index 0000000000..d2e1d20893
--- /dev/null
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
@@ -0,0 +1,43 @@
+/* Copyright 2018 Salicylic_acid3
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Select hand configuration */
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 180
+
+#ifdef RGBLED_NUM
+  #undef RGBLED_NUM
+#endif
+
+#define DRIVER_LED_TOTAL 73
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
+// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+// #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
+// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #   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 150  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+#    define RGB_MATRIX_HUE_STEP 8
+#    define RGB_MATRIX_SAT_STEP 8
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+#    define RGB_MATRIX_VAL_STEP 5
+#    define RGB_MATRIX_SPD_STEP 10
+#endif
diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c
new file mode 100644
index 0000000000..3e8fba928d
--- /dev/null
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/keymap.c
@@ -0,0 +1,74 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "keymap_jp.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC, KC_HOME,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,           KC_END,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+LT(1,JP_ZKHK),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, JP_SCLN, JP_COLN, JP_RBRC,  KC_ENT, KC_PGUP,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  RSFT_T(JP_BSLS),   KC_UP, KC_PGDN,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     KC_LCTL, KC_LGUI, KC_LALT, JP_MHEN,  KC_SPC,  KC_SPC,  KC_SPC,  KC_SPC, JP_HENK, JP_KANA,  KC_APP,          KC_LEFT, KC_DOWN, KC_RGHT
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [1] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______,  KC_DEL, KC_PSCR,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           KC_INS,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [2] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  ),
+  [3] = LAYOUT(
+  //,-----------------------------------------------------+--------------------------------------------------------------------------------.
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______ 
+  //|-----------------------------------------------------+--------------------------------------------------------------------------------'
+  )
+};
diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/rules.mk b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/rules.mk
new file mode 100644
index 0000000000..294015d80b
--- /dev/null
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/rules.mk
@@ -0,0 +1,7 @@
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+SPACE_CADET_ENABLE = no
+MAGIC_ENABLE = no
diff --git a/keyboards/gl516/j73gl/matrix.c b/keyboards/gl516/j73gl/matrix.c
new file mode 100644
index 0000000000..1a97fdfd61
--- /dev/null
+++ b/keyboards/gl516/j73gl/matrix.c
@@ -0,0 +1,158 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+
+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 "matrix.h"
+#include "quantum.h"
+
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+static void select_row(uint8_t row)
+{
+    setPinOutput(row_pins[row]);
+    writePinLow(row_pins[row]);
+}
+
+static void unselect_row(uint8_t row)
+{
+    setPinInputHigh(row_pins[row]);
+}
+
+static void unselect_rows(void)
+{
+    for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static void select_col(uint8_t col)
+{
+    setPinOutput(col_pins[col]);
+    writePinLow(col_pins[col]);
+}
+
+static void unselect_col(uint8_t col)
+{
+    setPinInputHigh(col_pins[col]);
+}
+
+static void unselect_cols(void)
+{
+    for(uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
+}
+
+static void init_pins(void) {
+  unselect_rows();
+  unselect_cols();
+  for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+    setPinInputHigh(col_pins[x]);
+  }
+  for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+    setPinInputHigh(row_pins[x]);
+  }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
+{
+    // Store last value of row prior to reading
+    matrix_row_t last_row_value = current_matrix[current_row];
+
+    // Clear data in matrix row
+    current_matrix[current_row] = 0;
+
+    // Select row and wait for row selecton to stabilize
+    select_row(current_row);
+    matrix_io_delay();
+
+    // For each col...
+    for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+
+        // Select the col pin to read (active low)
+        uint8_t pin_state = readPin(col_pins[col_index]);
+
+        // Populate the matrix row with the state of the col pin
+        current_matrix[current_row] |=  pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+    }
+
+    // Unselect row
+    unselect_row(current_row);
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
+{
+    bool matrix_changed = false;
+
+    // Select col and wait for col selecton to stabilize
+    select_col(current_col);
+    matrix_io_delay();
+
+    // For each row...
+    for(uint8_t row_index = 0; row_index < MATRIX_ROWS/2; row_index++)
+    {
+        uint8_t tmp = row_index + MATRIX_ROWS/2;
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[tmp];
+
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0)
+        {
+            // Pin LO, set col bit
+            current_matrix[tmp] |= (MATRIX_ROW_SHIFTER << current_col);
+        }
+        else
+        {
+            // Pin HI, clear col bit
+            current_matrix[tmp] &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[tmp]) && !(matrix_changed))
+        {
+            matrix_changed = true;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+
+    return matrix_changed;
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[])
+{
+  bool changed = false;
+
+  // Set row, read cols
+  for (uint8_t current_row = 0; current_row < MATRIX_ROWS / 2; current_row++) {
+    changed |= read_cols_on_row(current_matrix, current_row);
+  }
+  //else
+  // Set col, read rows
+  for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+    changed |= read_rows_on_col(current_matrix, current_col);
+  }
+  
+  return changed;
+}
diff --git a/keyboards/gl516/j73gl/readme.md b/keyboards/gl516/j73gl/readme.md
new file mode 100644
index 0000000000..b6f1ebdc24
--- /dev/null
+++ b/keyboards/gl516/j73gl/readme.md
@@ -0,0 +1,27 @@
+# j73gl
+
+![j73gl](https://cdn-ak.f.st-hatena.com/images/fotolife/S/Salicylic_acid3/20210911/20210911015520.png)
+
+This is 73 keys Japanese style keyboard.
+Use the GL516 case.
+
+* Keyboard Maintainer: [Salicylic_acid3](https://github.com/Salicylic-acid3)
+* Hardware Supported: j73gl PCB, Pro Micro
+* Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/GL516_Exemple), [yushakobo Shop](https://shop.yushakobo.jp/products/3342)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gl516/j73gl:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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).
+
+[Build guide](https://salicylic-acid3.hatenablog.com/entry/a52gl-j73gl-build-guide)
+
diff --git a/keyboards/gl516/j73gl/rules.mk b/keyboards/gl516/j73gl/rules.mk
new file mode 100644
index 0000000000..a7521a0e40
--- /dev/null
+++ b/keyboards/gl516/j73gl/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
\ No newline at end of file
diff --git a/keyboards/gl516/n51gl/config.h b/keyboards/gl516/n51gl/config.h
new file mode 100644
index 0000000000..ea50fcfa1a
--- /dev/null
+++ b/keyboards/gl516/n51gl/config.h
@@ -0,0 +1,67 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xE8CF
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Salicylic_Acid
+#define PRODUCT         n51gl
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 7
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
+#define UNUSED_PINS
+
+#define ENCODERS_PAD_A { D7 }
+#define ENCODERS_PAD_B { E6 }
+#define ENCODER_RESOLUTION 3
+
+/* 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 D3
+
+#ifndef RGBLED_NUM
+  #define RGBLED_NUM 15
+#endif
+
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
new file mode 100644
index 0000000000..eb8d639825
--- /dev/null
+++ b/keyboards/gl516/n51gl/info.json
@@ -0,0 +1,63 @@
+{
+    "keyboard_name": "n51gl", 
+    "url": "https://salicylic-acid3.hatenablog.com/", 
+    "maintainer": "Salicylic_acid3", 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"0,0", "x":0, "y":0},
+                {"label":"0,1", "x":1.25, "y":0},
+                {"label":"4,0", "x":8.25, "y":0},
+                {"label":"4,1", "x":9.25, "y":0},
+                {"label":"4,2", "x":10.25, "y":0},
+                {"label":"4,3", "x":11.25, "y":0},
+                {"label":"4,4", "x":12.25, "y":0},
+                {"label":"4,5", "x":13.25, "y":0},
+                {"label":"4,6", "x":14.25, "y":0},
+                {"label":"1,1", "x":0.25, "y":1, "w":1.75},
+                {"label":"1,2", "x":2, "y":1},
+                {"label":"5,0", "x":8.5, "y":1},
+                {"label":"5,1", "x":9.5, "y":1},
+                {"label":"5,2", "x":10.5, "y":1},
+                {"label":"5,3", "x":11.5, "y":1},
+                {"label":"5,4", "x":12.5, "y":1},
+                {"label":"5,5", "x":13.5, "y":1},
+                {"label":"5,6", "x":14.5, "y":1},
+                {"label":"2,1", "x":0, "y":2, "w":1.75},
+                {"label":"2,2", "x":1.75, "y":2},
+                {"label":"2,0", "x":7.25, "y":2},
+                {"label":"6,0", "x":8.75, "y":2},
+                {"label":"6,1", "x":9.75, "y":2},
+                {"label":"6,2", "x":10.75, "y":2},
+                {"label":"6,3", "x":11.75, "y":2},
+                {"label":"6,4", "x":12.75, "y":2},
+                {"label":"6,5", "x":13.75, "y":2},
+                {"label":"6,6", "x":14.75, "y":2},
+                {"label":"3,1", "x":0.25, "y":3, "w":1.25},
+                {"label":"3,2", "x":1.5, "y":3, "w":1.25},
+                {"label":"7,0", "x":8.5, "y":3},
+                {"label":"7,1", "x":9.5, "y":3, "w":1.25},
+                {"label":"7,2", "x":10.75, "y":3},
+                {"label":"7,4", "x":12.75, "y":3},
+                {"label":"7,5", "x":13.75, "y":3},
+                {"label":"7,6", "x":14.75, "y":3},
+                {"label":"0,2", "x":-0.75, "y":4},
+                {"label":"0,3", "x":0.25, "y":4},
+                {"label":"0,4", "x":1.25, "y":4},
+                {"label":"0,5", "x":2.25, "y":4},
+                {"label":"0,6", "x":3.25, "y":4},
+                {"label":"1,3", "x":0, "y":5},
+                {"label":"1,4", "x":1, "y":5},
+                {"label":"1,5", "x":2, "y":5},
+                {"label":"1,6", "x":3, "y":5},
+                {"label":"2,3", "x":-0.25, "y":6},
+                {"label":"2,4", "x":0.75, "y":6},
+                {"label":"2,5", "x":1.75, "y":6},
+                {"label":"2,6", "x":2.75, "y":6},
+                {"label":"3,4", "x":0.75, "y":7},
+                {"label":"3,5", "x":1.75, "y":7, "w":1.25},
+                {"label":"3,6", "x":3, "y":7}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gl516/n51gl/keymaps/default/keymap.c b/keyboards/gl516/n51gl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..469626d851
--- /dev/null
+++ b/keyboards/gl516/n51gl/keymaps/default/keymap.c
@@ -0,0 +1,60 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#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.
+enum layer_number {
+  _QWERTY = 0,
+  _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+       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_LBRC, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+       LT(_FN,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_MUTE,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+              KC_LCTL, KC_LGUI,          KC_LALT,  KC_SPC,  KC_SPC,           KC_SPC,  KC_SPC, KC_LALT,          KC_LEFT, KC_DOWN, KC_RGHT
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+  [_FN] = LAYOUT(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+      _______,   RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,            KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______, _______, 
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______,         _______, _______, _______,          _______, _______, _______,          _______, _______, _______
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code16(KC_VOLD);
+    } else {
+        tap_code16(KC_VOLU);
+    }
+    return true;
+}
diff --git a/keyboards/gl516/n51gl/keymaps/salicylic/config.h b/keyboards/gl516/n51gl/keymaps/salicylic/config.h
new file mode 100644
index 0000000000..fd96baa819
--- /dev/null
+++ b/keyboards/gl516/n51gl/keymaps/salicylic/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Salicylic_acid3
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Select hand configuration */
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 180
diff --git a/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
new file mode 100644
index 0000000000..819ac94e37
--- /dev/null
+++ b/keyboards/gl516/n51gl/keymaps/salicylic/keymap.c
@@ -0,0 +1,117 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+#include "keymap_jp.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.
+enum layer_number {
+  _QWERTY = 0,
+  _LOWER,
+  _RAISE,
+  _ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+       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_LBRC, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+              KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_VOLU,    KC_H,    KC_J,    KC_K,    KC_L, JP_MINS, JP_BSLS,  KC_ENT,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B, KC_MUTE,    KC_N,    KC_M, KC_COMM,  KC_DOT, JP_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+         JP_ZKHK, KC_LALT,LGUI_T(JP_MHEN),LT(_LOWER,KC_ENT),KC_BSPC, KC_VOLD, KC_DEL,LT(_RAISE,KC_SPC),ALT_T(JP_HENK),KC_LEFT, KC_DOWN, KC_RGHT
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+  [_LOWER] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+      _______, _______, JP_EXLM, JP_QUES, JP_LBRC, JP_RBRC, JP_TILD,             KC_6,    KC_7,    KC_8,    KC_9, JP_ASTR, JP_SLSH, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               JP_QUOT, JP_HASH,  JP_DQT, JP_LPRN, JP_RPRN,   JP_AT, KC_WH_U, XXXXXXX,    KC_4,    KC_5,    KC_6, JP_MINS,  JP_EQL, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               JP_CIRC, JP_PERC, JP_AMPR, JP_SCLN, JP_COLN, JP_PIPE, KC_BTN3,    KC_0,    KC_1,    KC_2,    KC_3, JP_PLUS, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______,       JP_MHEN, MO(_LOWER), _______, KC_WH_D, _______, MO(_RAISE), JP_DOT,        _______, _______, _______
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+
+  [_RAISE] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+      _______, _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP,LALT(KC_PSCR),KC_PSCR,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+        LCTL_T(KC_F11),   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_WH_L, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               KC_LSFT,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGDN, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______,          _______, _______, _______, KC_WH_R, _______, _______, JP_HENK,          _______, _______, _______
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+
+  [_ADJUST] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+        RESET,  KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LALT(KC_PSCR),KC_PSCR,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+              KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_MOD, RGB_TOG, RGB_MOD, RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+         SFT_T(KC_F12), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_TOG, RGB_VAD, RGB_VAI, RGB_HUD, RGB_HUI, XXXXXXX, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______,          _______, _______, _______,RGB_RMOD, _______, _______, _______,          _______, _______, _______
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  )
+};
+
+//A description for expressing the layer position in LED mode.
+layer_state_t layer_state_set_user(layer_state_t state) {
+  state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
+#ifdef RGBLIGHT_ENABLE
+    switch (get_highest_layer(state)) {
+    case _LOWER:
+      rgblight_sethsv_at(HSV_BLUE, 0);
+      break;
+    case _RAISE:
+      rgblight_sethsv_at(HSV_RED, 0);
+      break;
+    case _ADJUST:
+      rgblight_sethsv_at(HSV_PURPLE, 0);
+      break;
+    default: //  for any other layers, or the default layer
+      rgblight_sethsv_at( 0, 0, 0, 0);
+      break;
+    }
+    rgblight_set_effect_range( 1, 14);
+#endif
+return state;
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    keypos_t key;
+    if (clockwise) {
+        key.row = 3;
+        key.col = 0;
+    } else {
+        key.row = 1;
+        key.col = 0;
+    }
+    action_exec((keyevent_t){.key = key, .pressed = true, .time = (timer_read() | 1)});
+    action_exec((keyevent_t){.key = key, .pressed = false, .time = (timer_read() | 1)});
+    return true;
+}
diff --git a/keyboards/gl516/n51gl/keymaps/via/config.h b/keyboards/gl516/n51gl/keymaps/via/config.h
new file mode 100644
index 0000000000..fd96baa819
--- /dev/null
+++ b/keyboards/gl516/n51gl/keymaps/via/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Salicylic_acid3
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Select hand configuration */
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 180
diff --git a/keyboards/gl516/n51gl/keymaps/via/keymap.c b/keyboards/gl516/n51gl/keymaps/via/keymap.c
new file mode 100644
index 0000000000..3ad85edcba
--- /dev/null
+++ b/keyboards/gl516/n51gl/keymaps/via/keymap.c
@@ -0,0 +1,102 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+       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_LBRC, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+         LT(1,KC_CAPS),    KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_VOLU,    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_MUTE,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,   KC_UP, KC_RSFT,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+              KC_LCTL, KC_LGUI,          KC_LALT,  KC_SPC,  KC_SPC, KC_VOLD,  KC_SPC,  KC_SPC, KC_LALT,          KC_LEFT, KC_DOWN, KC_RGHT
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+  [1] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+      _______,   RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,            KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5, _______,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______, _______, 
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               _______, _______,          _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+  [2] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  ),
+  [3] = LAYOUT_rotary_layer(
+  //,--------------------------------------------------------------|        |--------------------------------------------------------------.
+      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+               XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX
+  //|--------------------------------------------------------------|        |--------------------------------------------------------------'
+  )
+};
+
+//A description for expressing the layer position in LED mode.
+layer_state_t layer_state_set_user(layer_state_t state) {
+  state = update_tri_layer_state(state, 2, 1, 3);
+#ifdef RGBLIGHT_ENABLE
+    switch (get_highest_layer(state)) {
+    case 1:
+      rgblight_sethsv_at(HSV_BLUE, 0);
+      break;
+    case 2:
+      rgblight_sethsv_at(HSV_RED, 0);
+      break;
+    case 3:
+      rgblight_sethsv_at(HSV_PURPLE, 0);
+      break;
+    default: //  for any other layers, or the default layer
+      rgblight_sethsv_at( 0, 0, 0, 0);
+      break;
+    }
+    rgblight_set_effect_range( 1, 14);
+#endif
+return state;
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    keypos_t key;
+    if (clockwise) {
+        key.row = 3;
+        key.col = 0;
+    } else {
+        key.row = 1;
+        key.col = 0;
+    }
+    action_exec((keyevent_t){.key = key, .pressed = true, .time = (timer_read() | 1)});
+    action_exec((keyevent_t){.key = key, .pressed = false, .time = (timer_read() | 1)});
+    return true;
+}
diff --git a/keyboards/gl516/n51gl/keymaps/via/rules.mk b/keyboards/gl516/n51gl/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/gl516/n51gl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gl516/n51gl/matrix.c b/keyboards/gl516/n51gl/matrix.c
new file mode 100644
index 0000000000..1a97fdfd61
--- /dev/null
+++ b/keyboards/gl516/n51gl/matrix.c
@@ -0,0 +1,158 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+
+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 "matrix.h"
+#include "quantum.h"
+
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+static void select_row(uint8_t row)
+{
+    setPinOutput(row_pins[row]);
+    writePinLow(row_pins[row]);
+}
+
+static void unselect_row(uint8_t row)
+{
+    setPinInputHigh(row_pins[row]);
+}
+
+static void unselect_rows(void)
+{
+    for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static void select_col(uint8_t col)
+{
+    setPinOutput(col_pins[col]);
+    writePinLow(col_pins[col]);
+}
+
+static void unselect_col(uint8_t col)
+{
+    setPinInputHigh(col_pins[col]);
+}
+
+static void unselect_cols(void)
+{
+    for(uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
+}
+
+static void init_pins(void) {
+  unselect_rows();
+  unselect_cols();
+  for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+    setPinInputHigh(col_pins[x]);
+  }
+  for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+    setPinInputHigh(row_pins[x]);
+  }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
+{
+    // Store last value of row prior to reading
+    matrix_row_t last_row_value = current_matrix[current_row];
+
+    // Clear data in matrix row
+    current_matrix[current_row] = 0;
+
+    // Select row and wait for row selecton to stabilize
+    select_row(current_row);
+    matrix_io_delay();
+
+    // For each col...
+    for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+
+        // Select the col pin to read (active low)
+        uint8_t pin_state = readPin(col_pins[col_index]);
+
+        // Populate the matrix row with the state of the col pin
+        current_matrix[current_row] |=  pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+    }
+
+    // Unselect row
+    unselect_row(current_row);
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
+{
+    bool matrix_changed = false;
+
+    // Select col and wait for col selecton to stabilize
+    select_col(current_col);
+    matrix_io_delay();
+
+    // For each row...
+    for(uint8_t row_index = 0; row_index < MATRIX_ROWS/2; row_index++)
+    {
+        uint8_t tmp = row_index + MATRIX_ROWS/2;
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[tmp];
+
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0)
+        {
+            // Pin LO, set col bit
+            current_matrix[tmp] |= (MATRIX_ROW_SHIFTER << current_col);
+        }
+        else
+        {
+            // Pin HI, clear col bit
+            current_matrix[tmp] &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[tmp]) && !(matrix_changed))
+        {
+            matrix_changed = true;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+
+    return matrix_changed;
+}
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[])
+{
+  bool changed = false;
+
+  // Set row, read cols
+  for (uint8_t current_row = 0; current_row < MATRIX_ROWS / 2; current_row++) {
+    changed |= read_cols_on_row(current_matrix, current_row);
+  }
+  //else
+  // Set col, read rows
+  for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+    changed |= read_rows_on_col(current_matrix, current_col);
+  }
+  
+  return changed;
+}
diff --git a/keyboards/gl516/n51gl/n51gl.c b/keyboards/gl516/n51gl/n51gl.c
new file mode 100644
index 0000000000..f13d0cd78e
--- /dev/null
+++ b/keyboards/gl516/n51gl/n51gl.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "n51gl.h"
diff --git a/keyboards/gl516/n51gl/n51gl.h b/keyboards/gl516/n51gl/n51gl.h
new file mode 100644
index 0000000000..6429b78fd0
--- /dev/null
+++ b/keyboards/gl516/n51gl/n51gl.h
@@ -0,0 +1,54 @@
+/*
+Copyright 2021 Salicylic_Acid
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05, L06,      R00, R01, R02, R03, R04, R05, R06, \
+         L11, L12, L13, L14, L15, L16,      R10, R11, R12, R13, R14, R15, R16, \
+         L21, L22, L23, L24, L25, L26, L20, R20, R21, R22, R23, R24, R25, R26, \
+         L31, L32,      L34, L35, L36,      R30, R31, R32,      R34, R35, R36  \
+  ) \
+  { \
+    {   L00,   L01,   L02,   L03,   L04,   L05,   L06 }, \
+    { KC_NO,   L11,   L12,   L13,   L14,   L15,   L16 }, \
+    {   L20,   L21,   L22,   L23,   L24,   L25,   L26 }, \
+    { KC_NO,   L31,   L32, KC_NO,   L34,   L35,   L36 }, \
+    {   R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \
+    {   R10,   R11,   R12,   R13,   R14,   R15,   R16 }, \
+    {   R20,   R21,   R22,   R23,   R24,   R25,   R26 }, \
+    {   R30,   R31,   R32, KC_NO,   R34,   R35,   R36 }  \
+  }
+
+#define LAYOUT_rotary_layer( \
+    L00, L01, L02, L03, L04, L05, L06,      R00, R01, R02, R03, R04, R05, R06, \
+         L11, L12, L13, L14, L15, L16, L10, R10, R11, R12, R13, R14, R15, R16, \
+         L21, L22, L23, L24, L25, L26, L20, R20, R21, R22, R23, R24, R25, R26, \
+         L31, L32,      L34, L35, L36, L30, R30, R31, R32,      R34, R35, R36  \
+  ) \
+  { \
+    {   L00,   L01,   L02,   L03,   L04,   L05,   L06 }, \
+    {   L10,   L11,   L12,   L13,   L14,   L15,   L16 }, \
+    {   L20,   L21,   L22,   L23,   L24,   L25,   L26 }, \
+    {   L30,   L31,   L32, KC_NO,   L34,   L35,   L36 }, \
+    {   R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \
+    {   R10,   R11,   R12,   R13,   R14,   R15,   R16 }, \
+    {   R20,   R21,   R22,   R23,   R24,   R25,   R26 }, \
+    {   R30,   R31,   R32, KC_NO,   R34,   R35,   R36 }  \
+  }
diff --git a/keyboards/gl516/n51gl/readme.md b/keyboards/gl516/n51gl/readme.md
new file mode 100644
index 0000000000..916b8ff671
--- /dev/null
+++ b/keyboards/gl516/n51gl/readme.md
@@ -0,0 +1,27 @@
+# n51gl
+
+![n51gl](https://cdn-ak.f.st-hatena.com/images/fotolife/S/Salicylic_acid3/20210911/20210911015705.png)
+
+This is 51 keys Custom keyboard.
+Use the GL516 case.
+
+* Keyboard Maintainer: [Salicylic_acid3](https://github.com/Salicylic-acid3)
+* Hardware Supported: nknl7 PCB, Pro Micro
+* Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/GL516_Exemple)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gl516/n51gl:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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).
+
+[Build guide](https://salicylic-acid3.hatenablog.com/entry/a52gl-j73gl-build-guide)
+
diff --git a/keyboards/gl516/n51gl/rules.mk b/keyboards/gl516/n51gl/rules.mk
new file mode 100644
index 0000000000..6279bfb0e0
--- /dev/null
+++ b/keyboards/gl516/n51gl/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
\ No newline at end of file

From 98916fd8629f0e8ac5bd3aef73dc59082be42d24 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 4 Feb 2022 09:46:21 -0800
Subject: [PATCH 496/867] MTBKeys MTB60 Hotswap Layout Macro Refactor (#16194)

---
 keyboards/mtbkeys/mtb60/hotswap/hotswap.h     |  38 ++++--
 keyboards/mtbkeys/mtb60/hotswap/info.json     | 129 +++++++++---------
 .../mtb60/hotswap/keymaps/default/keymap.c    |   4 +-
 keyboards/mtbkeys/mtb60/hotswap/rules.mk      |   2 +
 4 files changed, 97 insertions(+), 76 deletions(-)

diff --git a/keyboards/mtbkeys/mtb60/hotswap/hotswap.h b/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
index 7dae44b5da..e1e607e4c9 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
+++ b/keyboards/mtbkeys/mtb60/hotswap/hotswap.h
@@ -18,16 +18,32 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
-    k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0,      ke0, \
-         k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, ke1, \
-    k02,      k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2,      \
-    k03,      k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3,      kd3,      \
-    k04, k14, k24,                k64,                ka4, kb4,      kd4, ke4  \
+#define ___ KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │11   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d        │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │40  │41  │42  │46                      │4a  │4b  │4d  │4e  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+
+#define LAYOUT_60_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
+         k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,      \
+    k40, k41, k42,                k46,                k4a, k4b,      k4d, k4e  \
 ) { \
-    { k00,   k10,   k20, k30,   k40,   k50,   k60, k70,   k80,   k90,   ka0, kb0, kc0,   KC_NO, ke0   }, \
-    { KC_NO, k11,   k21, k31,   k41,   k51,   k61, k71,   k81,   k91,   ka1, kb1, kc1,   kd1,   ke1   }, \
-    { k02,   KC_NO, k22, k32,   k42,   k52,   k62, k72,   k82,   k92,   ka2, kb2, kc2,   kd2,   KC_NO }, \
-    { k03,   KC_NO, k23, k33,   k43,   k53,   k63, k73,   k83,   k93,   ka3, kb3, KC_NO, kd3,   KC_NO }, \
-    { k04,   k14,   k24, KC_NO, KC_NO, KC_NO, k64, KC_NO, KC_NO, KC_NO, ka4, kb4, kd4,   KC_NO, ke4   }  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, ___, k0e }, \
+    { ___, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
+    { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, ___ }, \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, k3d, ___ }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, k4b, k4d, ___, k4e }  \
 }
diff --git a/keyboards/mtbkeys/mtb60/hotswap/info.json b/keyboards/mtbkeys/mtb60/hotswap/info.json
index 5e66ec5a94..9e4ae0be29 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/info.json
+++ b/keyboards/mtbkeys/mtb60/hotswap/info.json
@@ -1,75 +1,78 @@
 {
     "keyboard_name": "MTB60",
     "url": "mtbkeys.com",
-    "maintainer": "MTBKeys",
+    "maintainer": "kgieselman",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60_ansi"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_60_ansi": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0, "w": 2},
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Back Space", "x":13, "y":0, "w":2},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"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},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"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},
 
-                {"x": 0, "y": 3, "w": 2.25},
-                {"x": 2.25, "y": 3},
-                {"x": 3.25, "y": 3},
-                {"x": 4.25, "y": 3},
-                {"x": 5.25, "y": 3},
-                {"x": 6.25, "y": 3},
-                {"x": 7.25, "y": 3},
-                {"x": 8.25, "y": 3},
-                {"x": 9.25, "y": 3},
-                {"x": 10.25, "y": 3},
-                {"x": 11.25, "y": 3},
-                {"x": 12.25, "y": 3, "w": 2.75},
+                {"label":"Left 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":"Right Shift", "x":12.25, "y":3, "w":2.75},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 6.25},
-                {"x": 10, "y": 4, "w": 1.25},
-                {"x": 11.25, "y": 4, "w": 1.25},
-                {"x": 12.5, "y": 4, "w": 1.25},
-                {"x": 13.75, "y": 4, "w": 1.25}
+                {"label":"Left Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Left Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Right Ctrl", "x":10, "y":4, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":4, "w":1.25},
+                {"label":"MO(1)", "x":12.5, "y":4, "w":1.25},
+                {"label":"Right Ctrl", "x":13.75, "y":4, "w":1.25}
             ]
         }
     }
diff --git a/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c b/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c
index 648c8201f5..58dcf77414 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c
+++ b/keyboards/mtbkeys/mtb60/hotswap/keymaps/default/keymap.c
@@ -22,14 +22,14 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_60_ansi(
         KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         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_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, MO(_FN), KC_RCTL
     ),
-    [_FN] = LAYOUT(
+    [_FN] = LAYOUT_60_ansi(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   KC_DEL,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,  KC_RIGHT, _______, _______,          _______,
diff --git a/keyboards/mtbkeys/mtb60/hotswap/rules.mk b/keyboards/mtbkeys/mtb60/hotswap/rules.mk
index 3ff392a61f..0d092c2ef8 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/rules.mk
+++ b/keyboards/mtbkeys/mtb60/hotswap/rules.mk
@@ -16,3 +16,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 60_ansi

From 8927d5660650878804cf3c7d1a6dee7f3acf5ecf Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 4 Feb 2022 17:55:58 +0000
Subject: [PATCH 497/867] Update outputselect to use platform connected state
 API (#16185)

---
 drivers/bluetooth/outputselect.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/bluetooth/outputselect.c b/drivers/bluetooth/outputselect.c
index cdd2e64cfd..44bc4a9aa3 100644
--- a/drivers/bluetooth/outputselect.c
+++ b/drivers/bluetooth/outputselect.c
@@ -13,10 +13,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "outputselect.h"
-
-#if defined(PROTOCOL_LUFA)
-#    include "lufa.h"
-#endif
+#include "usb_util.h"
 
 #ifdef BLUETOOTH_BLUEFRUIT_LE
 #    include "bluefruit_le.h"
@@ -39,18 +36,12 @@ void set_output(uint8_t output) {
  */
 __attribute__((weak)) void set_output_user(uint8_t output) {}
 
-static bool is_usb_configured(void) {
-#if defined(PROTOCOL_LUFA)
-    return USB_DeviceState == DEVICE_STATE_Configured;
-#endif
-}
-
 /** \brief Auto Detect Output
  *
  * FIXME: Needs doc
  */
 uint8_t auto_detect_output(void) {
-    if (is_usb_configured()) {
+    if (usb_connected_state()) {
         return OUTPUT_USB;
     }
 

From 580ef6d88f22478112417c4ab3c1ee50211167d2 Mon Sep 17 00:00:00 2001
From: Sergey Vlasov <sigprof@gmail.com>
Date: Fri, 4 Feb 2022 21:08:50 +0300
Subject: [PATCH 498/867] ChibiOS timer fixes (#16017)

* chibios/timer: Move the 16-bit timer handling into a separate function

Extract the code which effectively makes a 32-bit tick counter from a
possibly 16-bit ChibiOS system timer into a separate function.  Does
not really change the behavior of the timer API, but makes the actions
done in `timer_clear()` and `timer_read32()` more obvious.

* chibios/timer: Rename some variable to better reflect their role

* chibios/timer: Fix 32-bit tick counter overflow handling

The QMK timer API implementation for ChibiOS used a 32-bit tick counter
(obtained from the ChibiOS system timer) and then converted the value to
milliseconds to produce the timer value for QMK.  However, the frequency
of the ChibiOS timer is above 1000 Hz in most cases (values of 10000 Hz
or even 100000 Hz are typically used), and therefore the 32-bit tick
counter was overflowing and wrapping around much earlier than expected
(after about 5 days for 10000 Hz, or about 12 hours for 100000 Hz).
When this wraparound happened, the QMK timer value was jumping back to
zero, which broke various code dealing with timers (e.g., deferred
executors).

Just making the tick counter 64-bit to avoid the overflow is not a good
solution, because the ChibiOS code which performs the conversion from
ticks to milliseconds may encounter overflows when handling a 64-bit
value.  Adjusting just the value converted to milliseconds to account
for lost 2**32 ticks is also not possible, because 2**32 ticks may not
correspond to an integer number of milliseconds.  Therefore the tick
counter overflow is handled as follows:

  - A reasonably large number of ticks (the highest multiple of the
    ChibiOS timer frequency that fits into uint32_t) is subtracted from
    the tick counter, so that its value is again brought below 2**32.
    The subtracted value is chosen so that it would correspond to an
    integer number of seconds, therefore it could be converted to
    milliseconds without any loss of precision.

  - The equivalent number of milliseconds is then added to the converted
    QMK timer value, so that the QMK timer continues to count
    milliseconds as it was before the tick counter overflow.

* chibios/timer: Add a virtual timer to make 16-bit timer updates more reliable

The code which extends the 16-bit ChibiOS system timer to a 32-bit tick
counter requires that it is called at least once for every overflow of
the system timer (otherwise the tick counter can skip one or more
overflow periods).  Normally this requirement is satisfied just from
various parts of QMK code reading the current timer value; however, in
some rare circumstances the QMK code may be blocked waiting for some
event, and when this situation is combined with having a rather high
timer frequency, this may result in improper timekeeping.

Enhance the timer reliability by adding a ChibiOS virtual timer which
invokes a callback every half of the timer overflow period.  The virtual
timer callback can be invoked even when the normal QMK code is blocked;
the only requirement is that the timer interrupts are enabled, and the
ChibiOS kernel is not locked for an excessive time (but the timer update
will eventually work correctly if the virtual timer handling is not
delayed by more than a half of the timer overflow period).

Keeping a virtual timer always active also works around a ChibiOS bug
that can manifest with a 16-bit system timer and a relatively high timer
frequency: when all active virtual timers have delays longer than the
timer overflow period, the handling of virtual timers stops completely.
In QMK this bug can result in a `wait_ms()` call with a delay larger
than the timer overflow period just hanging indefinitely.  However, when
the timer update code adds a virtual timer with a shorter delay, all
other virtual timers are also handled properly.
---
 platforms/chibios/timer.c | 102 +++++++++++++++++++++++++++++---------
 1 file changed, 78 insertions(+), 24 deletions(-)

diff --git a/platforms/chibios/timer.c b/platforms/chibios/timer.c
index 9f664e1f79..74fdd7a6fc 100644
--- a/platforms/chibios/timer.c
+++ b/platforms/chibios/timer.c
@@ -2,44 +2,98 @@
 
 #include "timer.h"
 
-static uint32_t reset_point = 0;
+static uint32_t ticks_offset = 0;
+static uint32_t last_ticks   = 0;
+static uint32_t ms_offset    = 0;
 #if CH_CFG_ST_RESOLUTION < 32
 static uint32_t last_systime = 0;
 static uint32_t overflow     = 0;
 #endif
 
-void timer_init(void) { timer_clear(); }
+// Get the current system time in ticks as a 32-bit number.
+// This function must be called from within a system lock zone (so that it can safely use and update the static data).
+static inline uint32_t get_system_time_ticks(void) {
+    uint32_t systime = (uint32_t)chVTGetSystemTimeX();
+
+#if CH_CFG_ST_RESOLUTION < 32
+    // If the real system timer resolution is less than 32 bits, provide the missing bits by checking for the counter
+    // overflow.  For this to work, this function must be called at least once for every overflow of the system timer.
+    // In the 16-bit case, the corresponding times are:
+    //    - CH_CFG_ST_FREQUENCY = 100000, overflow will occur every ~0.65 seconds
+    //    - CH_CFG_ST_FREQUENCY = 10000, overflow will occur every ~6.5 seconds
+    //    - CH_CFG_ST_FREQUENCY = 1000, overflow will occur every ~65 seconds
+    if (systime < last_systime) {
+        overflow += ((uint32_t)1) << CH_CFG_ST_RESOLUTION;
+    }
+    last_systime = systime;
+    systime += overflow;
+#endif
+
+    return systime;
+}
+
+#if CH_CFG_ST_RESOLUTION < 32
+static virtual_timer_t update_timer;
+
+// Update the system tick counter every half of the timer overflow period; this should keep the tick counter correct
+// even if something blocks timer interrupts for 1/2 of the timer overflow period.
+#    define UPDATE_INTERVAL (((sysinterval_t)1) << (CH_CFG_ST_RESOLUTION - 1))
+
+// VT callback function to keep the overflow bits of the system tick counter updated.
+static void update_fn(void *arg) {
+    (void)arg;
+    chSysLockFromISR();
+    get_system_time_ticks();
+    chVTSetI(&update_timer, UPDATE_INTERVAL, update_fn, NULL);
+    chSysUnlockFromISR();
+}
+#endif
+
+// The highest multiple of CH_CFG_ST_FREQUENCY that fits into uint32_t.  This number of ticks will necessarily
+// correspond to some integer number of seconds.
+#define OVERFLOW_ADJUST_TICKS ((uint32_t)((UINT32_MAX / CH_CFG_ST_FREQUENCY) * CH_CFG_ST_FREQUENCY))
+
+// The time in milliseconds which corresponds to OVERFLOW_ADJUST_TICKS ticks (this is a precise conversion, because
+// OVERFLOW_ADJUST_TICKS corresponds to an integer number of seconds).
+#define OVERFLOW_ADJUST_MS (TIME_I2MS(OVERFLOW_ADJUST_TICKS))
+
+void timer_init(void) {
+    timer_clear();
+#if CH_CFG_ST_RESOLUTION < 32
+    chVTObjectInit(&update_timer);
+    chVTSet(&update_timer, UPDATE_INTERVAL, update_fn, NULL);
+#endif
+}
 
 void timer_clear(void) {
-    reset_point = (uint32_t)chVTGetSystemTime();
-#if CH_CFG_ST_RESOLUTION < 32
-    last_systime = reset_point;
-    overflow     = 0;
-#endif
+    chSysLock();
+    ticks_offset = get_system_time_ticks();
+    last_ticks   = 0;
+    ms_offset    = 0;
+    chSysUnlock();
 }
 
 uint16_t timer_read(void) { return (uint16_t)timer_read32(); }
 
 uint32_t timer_read32(void) {
-    uint32_t systime = (uint32_t)chVTGetSystemTime();
-
-#if CH_CFG_ST_RESOLUTION < 32
-    // If/when we need to support 64-bit chips, this may need to be modified to match the native bit-ness of the MCU.
-    // At this point, the only SysTick resolution allowed other than 32 is 16 bit.
-    // In the 16-bit case, at:
-    //    - CH_CFG_ST_FREQUENCY = 100000, overflow will occur every ~0.65 seconds
-    //    - CH_CFG_ST_FREQUENCY = 10000, overflow will occur every ~6.5 seconds
-    //    - CH_CFG_ST_FREQUENCY = 1000, overflow will occur every ~65 seconds
-    // With this implementation, as long as we ensure a timer read happens at least once during the overflow period, timing should be accurate.
-    if (systime < last_systime) {
-        overflow += ((uint32_t)1) << CH_CFG_ST_RESOLUTION;
+    chSysLock();
+    uint32_t ticks = get_system_time_ticks() - ticks_offset;
+    if (ticks < last_ticks) {
+        // The 32-bit tick counter overflowed and wrapped around.  We cannot just extend the counter to 64 bits here,
+        // because TIME_I2MS() may encounter overflows when handling a 64-bit argument; therefore the solution here is
+        // to subtract a reasonably large number of ticks from the tick counter to bring its value below the 32-bit
+        // limit again, and then add the equivalent number of milliseconds to the converted value.  (Adjusting just the
+        // converted value to account for 2**32 ticks is not possible in general, because 2**32 ticks may not correspond
+        // to an integer number of milliseconds).
+        ticks -= OVERFLOW_ADJUST_TICKS;
+        ticks_offset += OVERFLOW_ADJUST_TICKS;
+        ms_offset += OVERFLOW_ADJUST_MS;
     }
+    last_ticks              = ticks;
+    uint32_t ms_offset_copy = ms_offset;  // read while still holding the lock to ensure a consistent value
+    chSysUnlock();
 
-    last_systime = systime;
-    return (uint32_t)TIME_I2MS(systime - reset_point + overflow);
-#else
-    return (uint32_t)TIME_I2MS(systime - reset_point);
-#endif
+    return (uint32_t)TIME_I2MS(ticks) + ms_offset_copy;
 }
 
 uint16_t timer_elapsed(uint16_t last) { return TIMER_DIFF_16(timer_read(), last); }

From 135c93599036bbe646a69b568eef9219823a4be9 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 4 Feb 2022 18:10:00 +0000
Subject: [PATCH 499/867] Initial migration of suspend callbacks (#16067)

* Initial migration of suspend logic

* Add header
---
 platforms/arm_atsam/suspend.c | 36 ---------------------------
 platforms/avr/suspend.c       | 42 ++++++++++---------------------
 platforms/chibios/suspend.c   | 28 ---------------------
 platforms/common.mk           |  1 +
 platforms/suspend.c           | 47 +++++++++++++++++++++++++++++++++++
 quantum/quantum.c             | 23 -----------------
 6 files changed, 61 insertions(+), 116 deletions(-)
 create mode 100644 platforms/suspend.c

diff --git a/platforms/arm_atsam/suspend.c b/platforms/arm_atsam/suspend.c
index 73bebc4308..de2285bc5f 100644
--- a/platforms/arm_atsam/suspend.c
+++ b/platforms/arm_atsam/suspend.c
@@ -3,18 +3,6 @@
 #include "md_rgb_matrix.h"
 #include "suspend.h"
 
-/** \brief Run user level Power down
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_power_down_user(void) {}
-
-/** \brief Run keyboard level Power down
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); }
-
 /** \brief Suspend power down
  *
  * FIXME: needs doc
@@ -27,30 +15,6 @@ void suspend_power_down(void) {
     suspend_power_down_kb();
 }
 
-__attribute__((weak)) void matrix_power_up(void) {}
-__attribute__((weak)) void matrix_power_down(void) {}
-bool                       suspend_wakeup_condition(void) {
-    matrix_power_up();
-    matrix_scan();
-    matrix_power_down();
-    for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
-        if (matrix_get_row(r)) return true;
-    }
-    return false;
-}
-
-/** \brief run user level code immediately after wakeup
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_wakeup_init_user(void) {}
-
-/** \brief run keyboard level code immediately after wakeup
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); }
-
 /** \brief run immediately after wakeup
  *
  * FIXME: needs doc
diff --git a/platforms/avr/suspend.c b/platforms/avr/suspend.c
index 7b164a34b1..b615979439 100644
--- a/platforms/avr/suspend.c
+++ b/platforms/avr/suspend.c
@@ -2,12 +2,9 @@
 #include <avr/sleep.h>
 #include <avr/wdt.h>
 #include <avr/interrupt.h>
-#include "matrix.h"
-#include "action.h"
 #include "suspend.h"
+#include "action.h"
 #include "timer.h"
-#include "led.h"
-#include "host.h"
 
 #ifdef PROTOCOL_LUFA
 #    include "lufa.h"
@@ -78,6 +75,18 @@ static void power_down(uint8_t wdto) {
     // Disable watchdog after sleep
     wdt_disable();
 }
+
+/* watchdog timeout */
+ISR(WDT_vect) {
+    // compensate timer for sleep
+    switch (wdt_timeout) {
+        case WDTO_15MS:
+            timer_count += 15 + 2;  // WDTO_15MS + 2(from observation)
+            break;
+        default:;
+    }
+}
+
 #endif
 
 /** \brief Suspend power down
@@ -102,18 +111,6 @@ void suspend_power_down(void) {
 #endif
 }
 
-__attribute__((weak)) void matrix_power_up(void) {}
-__attribute__((weak)) void matrix_power_down(void) {}
-bool                       suspend_wakeup_condition(void) {
-    matrix_power_up();
-    matrix_scan();
-    matrix_power_down();
-    for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
-        if (matrix_get_row(r)) return true;
-    }
-    return false;
-}
-
 /** \brief run immediately after wakeup
  *
  * FIXME: needs doc
@@ -124,16 +121,3 @@ void suspend_wakeup_init(void) {
 
     suspend_wakeup_init_quantum();
 }
-
-#if !defined(NO_SUSPEND_POWER_DOWN) && defined(WDT_vect)
-/* watchdog timeout */
-ISR(WDT_vect) {
-    // compensate timer for sleep
-    switch (wdt_timeout) {
-        case WDTO_15MS:
-            timer_count += 15 + 2;  // WDTO_15MS + 2(from observation)
-            break;
-        default:;
-    }
-}
-#endif
diff --git a/platforms/chibios/suspend.c b/platforms/chibios/suspend.c
index d10ddf4501..ce03433e3a 100644
--- a/platforms/chibios/suspend.c
+++ b/platforms/chibios/suspend.c
@@ -25,34 +25,6 @@ void suspend_power_down(void) {
     wait_ms(17);
 }
 
-/** \brief suspend wakeup condition
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void matrix_power_up(void) {}
-__attribute__((weak)) void matrix_power_down(void) {}
-bool                       suspend_wakeup_condition(void) {
-    matrix_power_up();
-    matrix_scan();
-    matrix_power_down();
-    for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
-        if (matrix_get_row(r)) return true;
-    }
-    return false;
-}
-
-/** \brief run user level code immediately after wakeup
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_wakeup_init_user(void) {}
-
-/** \brief run keyboard level code immediately after wakeup
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); }
-
 /** \brief suspend wakeup condition
  *
  * run immediately after wakeup
diff --git a/platforms/common.mk b/platforms/common.mk
index 12ab45f823..2a1fc8d377 100644
--- a/platforms/common.mk
+++ b/platforms/common.mk
@@ -1,6 +1,7 @@
 PLATFORM_COMMON_DIR = $(PLATFORM_PATH)/$(PLATFORM_KEY)
 
 TMK_COMMON_SRC +=	\
+	$(PLATFORM_PATH)/suspend.c \
 	$(PLATFORM_COMMON_DIR)/platform.c \
 	$(PLATFORM_COMMON_DIR)/suspend.c \
 	$(PLATFORM_COMMON_DIR)/timer.c \
diff --git a/platforms/suspend.c b/platforms/suspend.c
new file mode 100644
index 0000000000..cd773764fa
--- /dev/null
+++ b/platforms/suspend.c
@@ -0,0 +1,47 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "suspend.h"
+#include "matrix.h"
+
+// TODO: Move to more correct location
+__attribute__((weak)) void matrix_power_up(void) {}
+__attribute__((weak)) void matrix_power_down(void) {}
+
+/** \brief Run user level Power down
+ *
+ * FIXME: needs doc
+ */
+__attribute__((weak)) void suspend_power_down_user(void) {}
+
+/** \brief Run keyboard level Power down
+ *
+ * FIXME: needs doc
+ */
+__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); }
+
+/** \brief run user level code immediately after wakeup
+ *
+ * FIXME: needs doc
+ */
+__attribute__((weak)) void suspend_wakeup_init_user(void) {}
+
+/** \brief run keyboard level code immediately after wakeup
+ *
+ * FIXME: needs doc
+ */
+__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); }
+
+/** \brief suspend wakeup condition
+ *
+ * FIXME: needs doc
+ */
+bool suspend_wakeup_condition(void) {
+    matrix_power_up();
+    matrix_scan();
+    matrix_power_down();
+    for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
+        if (matrix_get_row(r)) return true;
+    }
+    return false;
+}
diff --git a/quantum/quantum.c b/quantum/quantum.c
index ca3e4027dc..fb6220efa2 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -381,17 +381,6 @@ __attribute__((weak)) void startup_user() {}
 
 __attribute__((weak)) void shutdown_user() {}
 
-/** \brief Run keyboard level Power down
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_power_down_user(void) {}
-/** \brief Run keyboard level Power down
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); }
-
 void suspend_power_down_quantum(void) {
 #ifndef NO_SUSPEND_POWER_DOWN
 // Turn off backlight
@@ -439,18 +428,6 @@ void suspend_power_down_quantum(void) {
 #endif
 }
 
-/** \brief run user level code immediately after wakeup
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_wakeup_init_user(void) {}
-
-/** \brief run keyboard level code immediately after wakeup
- *
- * FIXME: needs doc
- */
-__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); }
-
 __attribute__((weak)) void suspend_wakeup_init_quantum(void) {
 // Turn on backlight
 #ifdef BACKLIGHT_ENABLE

From e8fa329073d8752cad9b11b90287fd20f130ac6f Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Sat, 5 Feb 2022 02:55:51 +0800
Subject: [PATCH 500/867] [Core] Add Pixel Flow RGB matrix effect (#15829)

* Initial PIXEL FLOW matrix effect commit

* Commit suggested use of rgb_matrix_check_finished_leds

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Code change support for split RGB

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
---
 docs/feature_rgb_matrix.md                    |  2 +
 docs/squeezing_avr.md                         |  1 +
 .../rgb_matrix/animations/pixel_flow_anim.h   | 51 +++++++++++++++++++
 .../animations/rgb_matrix_effects.inc         |  1 +
 4 files changed, 55 insertions(+)
 create mode 100644 quantum/rgb_matrix/animations/pixel_flow_anim.h

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 3384aa7180..0e2e68233f 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -455,6 +455,7 @@ enum rgb_matrix_effects {
     RGB_MATRIX_HUE_PENDULUM,        // Hue shifts up a slight ammount in a wave to the right, then back to the left
     RGB_MATRIX_HUE_WAVE,            // Hue shifts up a slight ammount and then back down in a wave to the right
     RGB_MATRIX_PIXEL_FRACTAL,       // Single hue fractal filled keys pulsing horizontally out to edges
+    RGB_MATRIX_PIXEL_FLOW,          // Pulsing RGB flow along LED wiring with random hues
     RGB_MATRIX_PIXEL_RAIN,          // Randomly light keys with random hues
 #if define(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
     RGB_MATRIX_TYPING_HEATMAP,      // How hot is your WPM!
@@ -510,6 +511,7 @@ You can enable a single effect by defining `ENABLE_[EFFECT_NAME]` in your `confi
 |`#define ENABLE_RGB_MATRIX_HUE_PENDULUM`              |Enables `RGB_MATRIX_HUE_PENDULUM`             |
 |`#define ENABLE_RGB_MATRIX_HUE_WAVE`                  |Enables `RGB_MATRIX_HUE_WAVE `                |
 |`#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL`             |Enables `RGB_MATRIX_PIXEL_FRACTAL`            |
+|`#define ENABLE_RGB_MATRIX_PIXEL_FLOW`                |Enables `RGB_MATRIX_PIXEL_FLOW`               |
 |`#define ENABLE_RGB_MATRIX_PIXEL_RAIN`                |Enables `RGB_MATRIX_PIXEL_RAIN`               |
 
 ?> These modes don't require any additional defines.
diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md
index e4d8d7c146..4a147e0c66 100644
--- a/docs/squeezing_avr.md
+++ b/docs/squeezing_avr.md
@@ -147,6 +147,7 @@ For RGB Matrix, these need to be explicitly enabled as well. To disable any that
 #undef ENABLE_RGB_MATRIX_HUE_PENDULUM
 #undef ENABLE_RGB_MATRIX_HUE_WAVE
 #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#undef ENABLE_RGB_MATRIX_PIXEL_FLOW
 #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/quantum/rgb_matrix/animations/pixel_flow_anim.h b/quantum/rgb_matrix/animations/pixel_flow_anim.h
new file mode 100644
index 0000000000..0e81cd0111
--- /dev/null
+++ b/quantum/rgb_matrix/animations/pixel_flow_anim.h
@@ -0,0 +1,51 @@
+// Copyright 2022 @filterpaper
+// SPDX-License-Identifier: GPL-2.0+
+
+#ifdef ENABLE_RGB_MATRIX_PIXEL_FLOW
+RGB_MATRIX_EFFECT(PIXEL_FLOW)
+#    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+static bool PIXEL_FLOW(effect_params_t* params) {
+    // LED state array
+    static RGB led[DRIVER_LED_TOTAL];
+
+    static uint32_t wait_timer = 0;
+    if (wait_timer > g_rgb_timer) {
+        return false;
+    }
+
+    inline uint32_t interval(void) {
+        return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
+    }
+
+    if (params->init) {
+        // Clear LEDs and fill the state array
+        rgb_matrix_set_color_all(0, 0, 0);
+        for (uint8_t j = 0; j < DRIVER_LED_TOTAL; ++j) {
+            led[j] = (random8() & 2) ? (RGB){0,0,0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
+        }
+    }
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    // Light LEDs based on state array
+    for (uint8_t i = led_min; i < led_max; ++i) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        rgb_matrix_set_color(i, led[i].r, led[i].g, led[i].b);
+    }
+
+    if (!rgb_matrix_check_finished_leds(led_max)) {
+        // Shift LED state forward
+        for (uint8_t j = 0; j < led_max-1; ++j) {
+            led[j] = led[j+1];
+        }
+        // Fill last LED
+        led[led_max-1] = (random8() & 2) ? (RGB){0,0,0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
+        // Set pulse timer
+        wait_timer = g_rgb_timer + interval();
+    }
+
+    return rgb_matrix_check_finished_leds(led_max);
+}
+
+#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif      // ENABLE_RGB_MATRIX_PIXEL_FLOW
diff --git a/quantum/rgb_matrix/animations/rgb_matrix_effects.inc b/quantum/rgb_matrix/animations/rgb_matrix_effects.inc
index 27ce347235..ac7bac428d 100644
--- a/quantum/rgb_matrix/animations/rgb_matrix_effects.inc
+++ b/quantum/rgb_matrix/animations/rgb_matrix_effects.inc
@@ -27,6 +27,7 @@
 #include "hue_pendulum_anim.h"
 #include "hue_wave_anim.h"
 #include "pixel_rain_anim.h"
+#include "pixel_flow_anim.h"
 #include "pixel_fractal_anim.h"
 #include "typing_heatmap_anim.h"
 #include "digital_rain_anim.h"

From 1fffcbc29840c7d11c8fb44b382e068c40936f19 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 5 Feb 2022 05:57:21 +1100
Subject: [PATCH 501/867] Revert "[Core] Add Pixel Flow RGB matrix effect
 (#15829)" (#16209)

This reverts commit e8fa329073d8752cad9b11b90287fd20f130ac6f.
---
 docs/feature_rgb_matrix.md                    |  2 -
 docs/squeezing_avr.md                         |  1 -
 .../rgb_matrix/animations/pixel_flow_anim.h   | 51 -------------------
 .../animations/rgb_matrix_effects.inc         |  1 -
 4 files changed, 55 deletions(-)
 delete mode 100644 quantum/rgb_matrix/animations/pixel_flow_anim.h

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 0e2e68233f..3384aa7180 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -455,7 +455,6 @@ enum rgb_matrix_effects {
     RGB_MATRIX_HUE_PENDULUM,        // Hue shifts up a slight ammount in a wave to the right, then back to the left
     RGB_MATRIX_HUE_WAVE,            // Hue shifts up a slight ammount and then back down in a wave to the right
     RGB_MATRIX_PIXEL_FRACTAL,       // Single hue fractal filled keys pulsing horizontally out to edges
-    RGB_MATRIX_PIXEL_FLOW,          // Pulsing RGB flow along LED wiring with random hues
     RGB_MATRIX_PIXEL_RAIN,          // Randomly light keys with random hues
 #if define(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
     RGB_MATRIX_TYPING_HEATMAP,      // How hot is your WPM!
@@ -511,7 +510,6 @@ You can enable a single effect by defining `ENABLE_[EFFECT_NAME]` in your `confi
 |`#define ENABLE_RGB_MATRIX_HUE_PENDULUM`              |Enables `RGB_MATRIX_HUE_PENDULUM`             |
 |`#define ENABLE_RGB_MATRIX_HUE_WAVE`                  |Enables `RGB_MATRIX_HUE_WAVE `                |
 |`#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL`             |Enables `RGB_MATRIX_PIXEL_FRACTAL`            |
-|`#define ENABLE_RGB_MATRIX_PIXEL_FLOW`                |Enables `RGB_MATRIX_PIXEL_FLOW`               |
 |`#define ENABLE_RGB_MATRIX_PIXEL_RAIN`                |Enables `RGB_MATRIX_PIXEL_RAIN`               |
 
 ?> These modes don't require any additional defines.
diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md
index 4a147e0c66..e4d8d7c146 100644
--- a/docs/squeezing_avr.md
+++ b/docs/squeezing_avr.md
@@ -147,7 +147,6 @@ For RGB Matrix, these need to be explicitly enabled as well. To disable any that
 #undef ENABLE_RGB_MATRIX_HUE_PENDULUM
 #undef ENABLE_RGB_MATRIX_HUE_WAVE
 #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#undef ENABLE_RGB_MATRIX_PIXEL_FLOW
 #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/quantum/rgb_matrix/animations/pixel_flow_anim.h b/quantum/rgb_matrix/animations/pixel_flow_anim.h
deleted file mode 100644
index 0e81cd0111..0000000000
--- a/quantum/rgb_matrix/animations/pixel_flow_anim.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2022 @filterpaper
-// SPDX-License-Identifier: GPL-2.0+
-
-#ifdef ENABLE_RGB_MATRIX_PIXEL_FLOW
-RGB_MATRIX_EFFECT(PIXEL_FLOW)
-#    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-
-static bool PIXEL_FLOW(effect_params_t* params) {
-    // LED state array
-    static RGB led[DRIVER_LED_TOTAL];
-
-    static uint32_t wait_timer = 0;
-    if (wait_timer > g_rgb_timer) {
-        return false;
-    }
-
-    inline uint32_t interval(void) {
-        return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
-    }
-
-    if (params->init) {
-        // Clear LEDs and fill the state array
-        rgb_matrix_set_color_all(0, 0, 0);
-        for (uint8_t j = 0; j < DRIVER_LED_TOTAL; ++j) {
-            led[j] = (random8() & 2) ? (RGB){0,0,0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
-        }
-    }
-
-    RGB_MATRIX_USE_LIMITS(led_min, led_max);
-    // Light LEDs based on state array
-    for (uint8_t i = led_min; i < led_max; ++i) {
-        RGB_MATRIX_TEST_LED_FLAGS();
-        rgb_matrix_set_color(i, led[i].r, led[i].g, led[i].b);
-    }
-
-    if (!rgb_matrix_check_finished_leds(led_max)) {
-        // Shift LED state forward
-        for (uint8_t j = 0; j < led_max-1; ++j) {
-            led[j] = led[j+1];
-        }
-        // Fill last LED
-        led[led_max-1] = (random8() & 2) ? (RGB){0,0,0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
-        // Set pulse timer
-        wait_timer = g_rgb_timer + interval();
-    }
-
-    return rgb_matrix_check_finished_leds(led_max);
-}
-
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_PIXEL_FLOW
diff --git a/quantum/rgb_matrix/animations/rgb_matrix_effects.inc b/quantum/rgb_matrix/animations/rgb_matrix_effects.inc
index ac7bac428d..27ce347235 100644
--- a/quantum/rgb_matrix/animations/rgb_matrix_effects.inc
+++ b/quantum/rgb_matrix/animations/rgb_matrix_effects.inc
@@ -27,7 +27,6 @@
 #include "hue_pendulum_anim.h"
 #include "hue_wave_anim.h"
 #include "pixel_rain_anim.h"
-#include "pixel_flow_anim.h"
 #include "pixel_fractal_anim.h"
 #include "typing_heatmap_anim.h"
 #include "digital_rain_anim.h"

From 6a35788b636ba226edc2b41f5db29ceafd531b5b Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Sat, 5 Feb 2022 02:55:51 +0800
Subject: [PATCH 502/867] [Core] Add Pixel Flow RGB matrix effect (#15829)

* Initial PIXEL FLOW matrix effect commit

* Commit suggested use of rgb_matrix_check_finished_leds

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Code change support for split RGB

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
---
 docs/feature_rgb_matrix.md                    |  2 +
 docs/squeezing_avr.md                         |  1 +
 .../rgb_matrix/animations/pixel_flow_anim.h   | 51 +++++++++++++++++++
 .../animations/rgb_matrix_effects.inc         |  1 +
 4 files changed, 55 insertions(+)
 create mode 100644 quantum/rgb_matrix/animations/pixel_flow_anim.h

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 3384aa7180..0e2e68233f 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -455,6 +455,7 @@ enum rgb_matrix_effects {
     RGB_MATRIX_HUE_PENDULUM,        // Hue shifts up a slight ammount in a wave to the right, then back to the left
     RGB_MATRIX_HUE_WAVE,            // Hue shifts up a slight ammount and then back down in a wave to the right
     RGB_MATRIX_PIXEL_FRACTAL,       // Single hue fractal filled keys pulsing horizontally out to edges
+    RGB_MATRIX_PIXEL_FLOW,          // Pulsing RGB flow along LED wiring with random hues
     RGB_MATRIX_PIXEL_RAIN,          // Randomly light keys with random hues
 #if define(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
     RGB_MATRIX_TYPING_HEATMAP,      // How hot is your WPM!
@@ -510,6 +511,7 @@ You can enable a single effect by defining `ENABLE_[EFFECT_NAME]` in your `confi
 |`#define ENABLE_RGB_MATRIX_HUE_PENDULUM`              |Enables `RGB_MATRIX_HUE_PENDULUM`             |
 |`#define ENABLE_RGB_MATRIX_HUE_WAVE`                  |Enables `RGB_MATRIX_HUE_WAVE `                |
 |`#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL`             |Enables `RGB_MATRIX_PIXEL_FRACTAL`            |
+|`#define ENABLE_RGB_MATRIX_PIXEL_FLOW`                |Enables `RGB_MATRIX_PIXEL_FLOW`               |
 |`#define ENABLE_RGB_MATRIX_PIXEL_RAIN`                |Enables `RGB_MATRIX_PIXEL_RAIN`               |
 
 ?> These modes don't require any additional defines.
diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md
index e4d8d7c146..4a147e0c66 100644
--- a/docs/squeezing_avr.md
+++ b/docs/squeezing_avr.md
@@ -147,6 +147,7 @@ For RGB Matrix, these need to be explicitly enabled as well. To disable any that
 #undef ENABLE_RGB_MATRIX_HUE_PENDULUM
 #undef ENABLE_RGB_MATRIX_HUE_WAVE
 #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#undef ENABLE_RGB_MATRIX_PIXEL_FLOW
 #undef ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
diff --git a/quantum/rgb_matrix/animations/pixel_flow_anim.h b/quantum/rgb_matrix/animations/pixel_flow_anim.h
new file mode 100644
index 0000000000..0e81cd0111
--- /dev/null
+++ b/quantum/rgb_matrix/animations/pixel_flow_anim.h
@@ -0,0 +1,51 @@
+// Copyright 2022 @filterpaper
+// SPDX-License-Identifier: GPL-2.0+
+
+#ifdef ENABLE_RGB_MATRIX_PIXEL_FLOW
+RGB_MATRIX_EFFECT(PIXEL_FLOW)
+#    ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+static bool PIXEL_FLOW(effect_params_t* params) {
+    // LED state array
+    static RGB led[DRIVER_LED_TOTAL];
+
+    static uint32_t wait_timer = 0;
+    if (wait_timer > g_rgb_timer) {
+        return false;
+    }
+
+    inline uint32_t interval(void) {
+        return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
+    }
+
+    if (params->init) {
+        // Clear LEDs and fill the state array
+        rgb_matrix_set_color_all(0, 0, 0);
+        for (uint8_t j = 0; j < DRIVER_LED_TOTAL; ++j) {
+            led[j] = (random8() & 2) ? (RGB){0,0,0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
+        }
+    }
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    // Light LEDs based on state array
+    for (uint8_t i = led_min; i < led_max; ++i) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        rgb_matrix_set_color(i, led[i].r, led[i].g, led[i].b);
+    }
+
+    if (!rgb_matrix_check_finished_leds(led_max)) {
+        // Shift LED state forward
+        for (uint8_t j = 0; j < led_max-1; ++j) {
+            led[j] = led[j+1];
+        }
+        // Fill last LED
+        led[led_max-1] = (random8() & 2) ? (RGB){0,0,0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
+        // Set pulse timer
+        wait_timer = g_rgb_timer + interval();
+    }
+
+    return rgb_matrix_check_finished_leds(led_max);
+}
+
+#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif      // ENABLE_RGB_MATRIX_PIXEL_FLOW
diff --git a/quantum/rgb_matrix/animations/rgb_matrix_effects.inc b/quantum/rgb_matrix/animations/rgb_matrix_effects.inc
index 27ce347235..ac7bac428d 100644
--- a/quantum/rgb_matrix/animations/rgb_matrix_effects.inc
+++ b/quantum/rgb_matrix/animations/rgb_matrix_effects.inc
@@ -27,6 +27,7 @@
 #include "hue_pendulum_anim.h"
 #include "hue_wave_anim.h"
 #include "pixel_rain_anim.h"
+#include "pixel_flow_anim.h"
 #include "pixel_fractal_anim.h"
 #include "typing_heatmap_anim.h"
 #include "digital_rain_anim.h"

From b4ceefde37bd0c5c003e04ab780bb826df93fb7a Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Fri, 4 Feb 2022 11:23:30 -0800
Subject: [PATCH 503/867] Format code according to conventions (#16211)

---
 quantum/rgb_matrix/animations/pixel_flow_anim.h | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/quantum/rgb_matrix/animations/pixel_flow_anim.h b/quantum/rgb_matrix/animations/pixel_flow_anim.h
index 0e81cd0111..312c87628c 100644
--- a/quantum/rgb_matrix/animations/pixel_flow_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_flow_anim.h
@@ -14,15 +14,13 @@ static bool PIXEL_FLOW(effect_params_t* params) {
         return false;
     }
 
-    inline uint32_t interval(void) {
-        return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
-    }
+    inline uint32_t interval(void) { return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16); }
 
     if (params->init) {
         // Clear LEDs and fill the state array
         rgb_matrix_set_color_all(0, 0, 0);
         for (uint8_t j = 0; j < DRIVER_LED_TOTAL; ++j) {
-            led[j] = (random8() & 2) ? (RGB){0,0,0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
+            led[j] = (random8() & 2) ? (RGB){0, 0, 0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
         }
     }
 
@@ -35,11 +33,11 @@ static bool PIXEL_FLOW(effect_params_t* params) {
 
     if (!rgb_matrix_check_finished_leds(led_max)) {
         // Shift LED state forward
-        for (uint8_t j = 0; j < led_max-1; ++j) {
-            led[j] = led[j+1];
+        for (uint8_t j = 0; j < led_max - 1; ++j) {
+            led[j] = led[j + 1];
         }
         // Fill last LED
-        led[led_max-1] = (random8() & 2) ? (RGB){0,0,0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
+        led[led_max - 1] = (random8() & 2) ? (RGB){0, 0, 0} : hsv_to_rgb((HSV){random8(), qadd8(random8() >> 1, 127), rgb_matrix_config.hsv.v});
         // Set pulse timer
         wait_timer = g_rgb_timer + interval();
     }

From 0a40916845af3702135f78a1d2826577d01a33e6 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 4 Feb 2022 11:35:29 -0800
Subject: [PATCH 504/867] MechanicKeys Mini Ashen 40: refactor LAYOUT macro
 (#16192)

* info.json: apply friendly formatting

* move Backspace argument/keycode to top row

* info.json: correct maintainer field
---
 keyboards/mechanickeys/miniashen40/info.json  | 73 +++++++++++++++----
 .../miniashen40/keymaps/default/keymap.c      | 50 ++++++-------
 .../miniashen40/keymaps/via/keymap.c          | 24 +++---
 .../mechanickeys/miniashen40/miniashen40.h    | 53 ++++++++------
 4 files changed, 126 insertions(+), 74 deletions(-)

diff --git a/keyboards/mechanickeys/miniashen40/info.json b/keyboards/mechanickeys/miniashen40/info.json
index 6a6b1e951a..bf46a8bdcd 100644
--- a/keyboards/mechanickeys/miniashen40/info.json
+++ b/keyboards/mechanickeys/miniashen40/info.json
@@ -1,15 +1,62 @@
 {
-  "keyboard_name": "Mini Ashen 40",
-  "url": "",
-  "maintainer": "qmk",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [
-        {"label": "Tab", "x": 0, "y": 0}, {"label": "Q", "x": 1, "y": 0}, {"label": "W", "x": 2, "y": 0}, {"label": "E", "x": 3, "y": 0}, {"label": "R", "x": 4, "y": 0}, {"label": "T", "x": 5, "y": 0}, {"label": "Y", "x": 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": "Del", "x": 11, "y": 0}, {"label": "M1", "x": 12.25, "y": 0}, {"label": "M2", "x": 13.25, "y": 0},
-        {"label": "Ctrl", "x": 0, "y": 1, "w":1.25}, {"label": "A", "x": 1.25, "y": 1}, {"label": "S", "x": 2.25, "y": 1}, {"label": "D", "x": 3.25, "y": 1}, {"label": "F", "x": 4.25, "y": 1}, {"label": "G", "x": 5.25, "y": 1}, {"label": "H", "x": 6.25, "y": 1}, {"label": "J", "x": 7.25, "y": 1}, {"label": "K", "x": 8.25, "y": 1}, {"label": "L", "x": 9.25, "y": 1}, {"label": "Enter", "x": 10.25, "y": 1, "w":1.75}, {"label": "M3", "x": 12.25, "y": 1}, {"label": "M4", "x": 13.25, "y": 1},
-        {"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": "Fn", "x": 10.75, "y": 2, "w":1.25}, {"label": "Up", "x": 12.25, "y": 2.25},
-        {"label": "Alt", "x": 1, "y": 3}, {"label": "OS", "x": 2, "y": 3, "w": 1.5}, {"label": "", "x": 3.5, "y": 3, "w": 2.75}, {"label": "", "x": 6.25, "y": 3, "w": 2.25}, {"label": "Os", "x": 8.5, "y": 3, "w": 1.5}, {"label": "Alt", "x": 10, "y": 3}, {"label": "Left", "x": 11.25, "y": 3.25}, {"label": "Down", "x": 12.25, "y": 3.25}, {"label": "Right", "x": 13.25, "y": 3.25}
-      ]
+    "keyboard_name": "Mini Ashen 40",
+    "url": "",
+    "maintainer": "jfescobar18",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Tab", "x":0, "y":0},
+                {"label":"Q", "x":1, "y":0},
+                {"label":"W", "x":2, "y":0},
+                {"label":"E", "x":3, "y":0},
+                {"label":"R", "x":4, "y":0},
+                {"label":"T", "x":5, "y":0},
+                {"label":"Y", "x":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":"Del", "x":11, "y":0},
+                {"label":"M1", "x":12.25, "y":0},
+                {"label":"M2", "x":13.25, "y":0},
+
+                {"label":"Ctrl", "x":0, "y":1, "w":1.25},
+                {"label":"A", "x":1.25, "y":1},
+                {"label":"S", "x":2.25, "y":1},
+                {"label":"D", "x":3.25, "y":1},
+                {"label":"F", "x":4.25, "y":1},
+                {"label":"G", "x":5.25, "y":1},
+                {"label":"H", "x":6.25, "y":1},
+                {"label":"J", "x":7.25, "y":1},
+                {"label":"K", "x":8.25, "y":1},
+                {"label":"L", "x":9.25, "y":1},
+                {"label":"Enter", "x":10.25, "y":1, "w":1.75},
+                {"label":"M3", "x":12.25, "y":1},
+                {"label":"M4", "x":13.25, "y":1},
+
+                {"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":"Fn", "x":10.75, "y":2, "w":1.25},
+                {"label":"Up", "x":12.25, "y":2.25},
+
+                {"label":"Alt", "x":1, "y":3},
+                {"label":"OS", "x":2, "y":3, "w":1.5},
+                {"label":"", "x":3.5, "y":3, "w":2.75},
+                {"label":"", "x":6.25, "y":3, "w":2.25},
+                {"label":"Os", "x":8.5, "y":3, "w":1.5},
+                {"label":"Alt", "x":10, "y":3},
+                {"label":"Left", "x":11.25, "y":3.25},
+                {"label":"Down", "x":12.25, "y":3.25},
+                {"label":"Right", "x":13.25, "y":3.25}
+            ]
+        }
     }
-  }
-}
\ No newline at end of file
+}
diff --git a/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c b/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c
index b49b5882fa..4f4b79e45e 100644
--- a/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c
+++ b/keyboards/mechanickeys/miniashen40/keymaps/default/keymap.c
@@ -1,47 +1,47 @@
 /* Copyright 2021 jfescobar18
-  * 
-  * 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/>. 
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT( /* 0: qwerty */ 
-    KC_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,             KC_MPRV,  KC_MNXT,
+  [0] = LAYOUT( /* 0: qwerty */
+    KC_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_MPRV,  KC_MNXT,
     CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,           KC_MUTE,  KC_MPLY,
-    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MO(1),            KC_UP,   KC_BSPC,
+    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MO(1),            KC_UP,
                    KC_LALT, KC_LGUI,          KC_SPC,                             KC_SPC,  KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [1] = LAYOUT( /* 1: Symbols */ 
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,          KC_TRNS, KC_TRNS,
+  [1] = LAYOUT( /* 1: Symbols */
+    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_TRNS, KC_TRNS,
     MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, 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_SLSH, KC_TRNS,          KC_TRNS, KC_EQL,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS,          KC_TRNS,
              KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [2] = LAYOUT( /* 2: Fn */ 
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,           KC_TRNS, KC_TRNS,
+  [2] = LAYOUT( /* 2: Fn */
+    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_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_F12,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
              KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [3] = LAYOUT( /*3: Empty */ 
-    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+  [3] = LAYOUT( /*3: Empty */
+    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
              KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 };
diff --git a/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c b/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c
index 0aa9476b4e..bb7721561d 100644
--- a/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c
+++ b/keyboards/mechanickeys/miniashen40/keymaps/via/keymap.c
@@ -17,31 +17,31 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT( /* 0: qwerty */ 
-    KC_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,             KC_MPRV,  KC_MNXT,
+  [0] = LAYOUT( /* 0: qwerty */
+    KC_GESC,       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_MPRV,  KC_MNXT,
     CTL_T(KC_TAB), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,           KC_MUTE,  KC_MPLY,
-    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MO(1),            KC_UP,   KC_BSPC,
+    KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  MO(1),            KC_UP,
                    KC_LALT, KC_LGUI,          KC_SPC,                             KC_SPC,  KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [1] = LAYOUT( /* 1: Symbols */ 
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,          KC_TRNS, KC_TRNS,
+  [1] = LAYOUT( /* 1: Symbols */
+    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_TRNS, KC_TRNS,
     MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, 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_SLSH, KC_TRNS,          KC_TRNS, KC_EQL,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLSH, KC_TRNS,          KC_TRNS,
              KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [2] = LAYOUT( /* 2: Fn */ 
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,           KC_TRNS, KC_TRNS,
+  [2] = LAYOUT( /* 2: Fn */
+    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_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_F12,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
              KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 
-  [3] = LAYOUT( /*3: Empty */ 
-    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+  [3] = LAYOUT( /*3: Empty */
+    RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
              KC_TRNS, KC_TRNS,          KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
   ),
 };
diff --git a/keyboards/mechanickeys/miniashen40/miniashen40.h b/keyboards/mechanickeys/miniashen40/miniashen40.h
index 4430396b41..5d6e639b20 100644
--- a/keyboards/mechanickeys/miniashen40/miniashen40.h
+++ b/keyboards/mechanickeys/miniashen40/miniashen40.h
@@ -1,17 +1,17 @@
 /* Copyright 2021 jfescobar18
-  * 
-  * 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/>. 
+  *
+  * 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
@@ -20,19 +20,24 @@
 
 #define XXX KC_NO
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │2C ││0B │0C │
+ * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤├───┼───┤
+ * │10  │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A    ││1B │1C │
+ * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤└───┴───┘
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A  │┌───┐
+ * └───┬──┴┬──┴──┬┴───┴───┴─┬─┴───┴──┬┴───┴┬──┴┬───┘│2B │
+ *     │30 │31   │33        │36      │38   │39 │┌───┼───┼───┐
+ *     └───┴─────┴──────────┴────────┴─────┴───┘│3A │3B │3C │
+ *                                              └───┴───┴───┘
  */
+
 #define LAYOUT( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
-  K30, K31,      K33,           K36,      K38, K39, K3A, K3B, K3C  \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K2C,   K0B, K0C, \
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,        K1B, K1C, \
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A,        K2B,      \
+  K30, K31,      K33,           K36,      K38, K39,        K3A, K3B, K3C  \
 ) \
 { \
   { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \

From 9fe0842b6d415b4d6e8b73fbfc23f418551d2498 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 4 Feb 2022 12:34:16 -0800
Subject: [PATCH 505/867] Meow65: rename LAYOUT to LAYOUT_65_ansi_blocker
 (#16214)

---
 keyboards/meow65/info.json                | 143 ++++++++++++----------
 keyboards/meow65/keymaps/default/keymap.c |   4 +-
 keyboards/meow65/keymaps/via/keymap.c     |   8 +-
 keyboards/meow65/meow65.h                 |   2 +-
 keyboards/meow65/rules.mk                 |   2 +
 5 files changed, 84 insertions(+), 75 deletions(-)

diff --git a/keyboards/meow65/info.json b/keyboards/meow65/info.json
index 90153257a6..7221a518bd 100644
--- a/keyboards/meow65/info.json
+++ b/keyboards/meow65/info.json
@@ -2,76 +2,83 @@
     "keyboard_name": "meow65",
     "url": "https://github.com/mrninhvn/meow65-pcb",
     "maintainer": "mrninhvn",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_ansi_blocker"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_ansi_blocker": {
             "layout": [
-                { "label": "K00 (C6,F5)", "x": 0, "y": 0 },
-                { "label": "K01 (C6,F6)", "x": 1, "y": 0 },
-                { "label": "K02 (C6,B0)", "x": 2, "y": 0 },
-                { "label": "K03 (C6,F4)", "x": 3, "y": 0 },
-                { "label": "K04 (C6,F1)", "x": 4, "y": 0 },
-                { "label": "K05 (C6,D0)", "x": 5, "y": 0 },
-                { "label": "K06 (C6,D1)", "x": 6, "y": 0 },
-                { "label": "K07 (C6,D2)", "x": 7, "y": 0 },
-                { "label": "K08 (C6,D3)", "x": 8, "y": 0 },
-                { "label": "K09 (C6,D5)", "x": 9, "y": 0 },
-                { "label": "K0A (C6,D4)", "x": 10, "y": 0 },
-                { "label": "K0B (C6,D6)", "x": 11, "y": 0 },
-                { "label": "K0C (C6,D7)", "x": 12, "y": 0 },
-                { "label": "K0D (C6,B4)", "x": 13, "y": 0, "w": 2 },
-                { "label": "K0E (C6,C7)", "x": 15, "y": 0 },
-                { "label": "K10 (B6,F5)", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "K11 (B6,F6)", "x": 1.5, "y": 1 },
-                { "label": "K12 (B6,B0)", "x": 2.5, "y": 1 },
-                { "label": "K13 (B6,F4)", "x": 3.5, "y": 1 },
-                { "label": "K14 (B6,F1)", "x": 4.5, "y": 1 },
-                { "label": "K15 (B6,D0)", "x": 5.5, "y": 1 },
-                { "label": "K16 (B6,D1)", "x": 6.5, "y": 1 },
-                { "label": "K17 (B6,D2)", "x": 7.5, "y": 1 },
-                { "label": "K18 (B6,D3)", "x": 8.5, "y": 1 },
-                { "label": "K19 (B6,D5)", "x": 9.5, "y": 1 },
-                { "label": "K1A (B6,D4)", "x": 10.5, "y": 1 },
-                { "label": "K1B (B6,D6)", "x": 11.5, "y": 1 },
-                { "label": "K1C (B6,D7)", "x": 12.5, "y": 1 },
-                { "label": "K1D (B6,B4)", "x": 13.5, "y": 1, "w": 1.5 },
-                { "label": "K1E (B6,C7)", "x": 15, "y": 1 },
-                { "label": "K20 (B5,F5)", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "K21 (B5,F6)", "x": 1.75, "y": 2 },
-                { "label": "K22 (B5,B0)", "x": 2.75, "y": 2 },
-                { "label": "K23 (B5,F4)", "x": 3.75, "y": 2 },
-                { "label": "K24 (B5,F1)", "x": 4.75, "y": 2 },
-                { "label": "K25 (B5,D0)", "x": 5.75, "y": 2 },
-                { "label": "K26 (B5,D1)", "x": 6.75, "y": 2 },
-                { "label": "K27 (B5,D2)", "x": 7.75, "y": 2 },
-                { "label": "K28 (B5,D3)", "x": 8.75, "y": 2 },
-                { "label": "K29 (B5,D5)", "x": 9.75, "y": 2 },
-                { "label": "K2A (B5,D4)", "x": 10.75, "y": 2 },
-                { "label": "K2B (B5,D6)", "x": 11.75, "y": 2 },
-                { "label": "K2D (B5,B4)", "x": 12.75, "y": 2, "w": 2.25 },
-                { "label": "K2E (B5,C7)", "x": 15, "y": 2 },
-                { "label": "K30 (B7,F5)", "x": 0, "y": 3, "w": 2.25 },
-                { "label": "K31 (B7,F6)", "x": 2.25, "y": 3 },
-                { "label": "K32 (B7,B0)", "x": 3.25, "y": 3 },
-                { "label": "K33 (B7,F4)", "x": 4.25, "y": 3 },
-                { "label": "K34 (B7,F1)", "x": 5.25, "y": 3 },
-                { "label": "K35 (B7,D0)", "x": 6.25, "y": 3 },
-                { "label": "K36 (B7,D1)", "x": 7.25, "y": 3 },
-                { "label": "K37 (B7,D2)", "x": 8.25, "y": 3 },
-                { "label": "K38 (B7,D3)", "x": 9.25, "y": 3 },
-                { "label": "K39 (B7,D5)", "x": 10.25, "y": 3 },
-                { "label": "K3A (B7,D4)", "x": 11.25, "y": 3 },
-                { "label": "K3C (B7,D7)", "x": 12.25, "y": 3, "w": 1.75 },
-                { "label": "K3D (B7,B4)", "x": 14, "y": 3 },
-                { "label": "K3E (B7,C7)", "x": 15, "y": 3 },
-                { "label": "K40 (F7,F5)", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "K41 (F7,F6)", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "K42 (F7,B0)", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "K45 (F7,D0)", "x": 3.75, "y": 4, "w": 6.25 },
-                { "label": "K49 (F7,D5)", "x": 10, "y": 4, "w": 1.25 },
-                { "label": "K4A (F7,D4)", "x": 11.25, "y": 4, "w": 1.25 },
-                { "label": "K4C (F7,D7)", "x": 13, "y": 4 },
-                { "label": "K4D (F7,B4)", "x": 14, "y": 4 },
-                { "label": "K4E (F7,C7)", "x": 15, "y": 4 }
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "1!", "x": 1, "y": 0 },
+                { "label": "2@", "x": 2, "y": 0 },
+                { "label": "3#", "x": 3, "y": 0 },
+                { "label": "4$", "x": 4, "y": 0 },
+                { "label": "5%", "x": 5, "y": 0 },
+                { "label": "6^", "x": 6, "y": 0 },
+                { "label": "7&", "x": 7, "y": 0 },
+                { "label": "8*", "x": 8, "y": 0 },
+                { "label": "9(", "x": 9, "y": 0 },
+                { "label": "0)", "x": 10, "y": 0 },
+                { "label": "-_", "x": 11, "y": 0 },
+                { "label": "=+", "x": 12, "y": 0 },
+                { "label": "Backspace", "x": 13, "y": 0, "w": 2 },
+                { "label": "Home", "x": 15, "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": "PageUp", "x": 15, "y": 1 },
+
+                { "label": "Caps", "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": "Page Down", "x": 15, "y": 2 },
+
+                { "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": 1.75 },
+                { "label": "\u2191", "x": 14, "y": 3 },
+                { "label": "End", "x": 15, "y": 3 },
+
+                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
+                { "label": "GUI", "x": 1.25, "y": 4, "w": 1.25 },
+                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
+                { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 },
+                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
+                { "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
+                { "label": "\u2190", "x": 13, "y": 4 },
+                { "label": "\u2193", "x": 14, "y": 4 },
+                { "label": "\u2192", "x": 15, "y": 4 }
             ]
         }
     }
diff --git a/keyboards/meow65/keymaps/default/keymap.c b/keyboards/meow65/keymaps/default/keymap.c
index b93abee723..3a5c4b76a8 100644
--- a/keyboards/meow65/keymaps/default/keymap.c
+++ b/keyboards/meow65/keymaps/default/keymap.c
@@ -23,14 +23,14 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_65_ansi_blocker(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, 
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
         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_PGDN, 
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,  
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(_FN),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [_FN] = LAYOUT(
+    [_FN] = LAYOUT_65_ansi_blocker(
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
diff --git a/keyboards/meow65/keymaps/via/keymap.c b/keyboards/meow65/keymaps/via/keymap.c
index b765673ca1..ef7dd62071 100644
--- a/keyboards/meow65/keymaps/via/keymap.c
+++ b/keyboards/meow65/keymaps/via/keymap.c
@@ -23,28 +23,28 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_L0] = LAYOUT(
+    [_L0] = LAYOUT_65_ansi_blocker(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, 
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
         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_PGDN, 
         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,  
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(_L1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [_L1] = LAYOUT(
+    [_L1] = LAYOUT_65_ansi_blocker(
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
-    [_L2] = LAYOUT(
+    [_L2] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
-    [_L3] = LAYOUT(
+    [_L3] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
diff --git a/keyboards/meow65/meow65.h b/keyboards/meow65/meow65.h
index 2e25bd9758..2643158342 100644
--- a/keyboards/meow65/meow65.h
+++ b/keyboards/meow65/meow65.h
@@ -26,7 +26,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT( \
+#define LAYOUT_65_ansi_blocker( \
     k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
     k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, \
     k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k213, k214, \
diff --git a/keyboards/meow65/rules.mk b/keyboards/meow65/rules.mk
index 476cf49f27..22b16cb763 100644
--- a/keyboards/meow65/rules.mk
+++ b/keyboards/meow65/rules.mk
@@ -16,3 +16,5 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 65_ansi_blocker

From ca46abdc38e1b47d8efafdca9d91ed71f9b86948 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 4 Feb 2022 12:34:34 -0800
Subject: [PATCH 506/867] FJLabs 7V Hotswap: refactor LAYOUT_75_all macro
 (#16213)

---
 keyboards/fjlabs/7vhotswap/7vhotswap.h        | 12 ++--
 keyboards/fjlabs/7vhotswap/info.json          | 56 +++++++++----------
 .../fjlabs/7vhotswap/keymaps/default/keymap.c | 22 ++++----
 .../fjlabs/7vhotswap/keymaps/via/keymap.c     | 44 +++++++--------
 keyboards/fjlabs/7vhotswap/readme.md          |  3 +-
 5 files changed, 69 insertions(+), 68 deletions(-)

diff --git a/keyboards/fjlabs/7vhotswap/7vhotswap.h b/keyboards/fjlabs/7vhotswap/7vhotswap.h
index f0f710dac5..741f7d53af 100644
--- a/keyboards/fjlabs/7vhotswap/7vhotswap.h
+++ b/keyboards/fjlabs/7vhotswap/7vhotswap.h
@@ -18,12 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* === All used matrix spots populated === */
 #define LAYOUT_75_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,       \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,  \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,  \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,  \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,       \
-    K50, K51, K52,           K55,                K59, K5A,      K5C, K5D, K5E  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,           \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           K3E, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,           \
+    K50, K51, K52,           K55,                K59, K5A,      K5C, K5D, K5E       \
 ) { \
     { K00, K01, K02, K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D, KC_NO },  \
     { K10, K11, K12, K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D, K1E   },  \
diff --git a/keyboards/fjlabs/7vhotswap/info.json b/keyboards/fjlabs/7vhotswap/info.json
index a4955756e9..07404031e3 100644
--- a/keyboards/fjlabs/7vhotswap/info.json
+++ b/keyboards/fjlabs/7vhotswap/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "7V Hotswap PCBs",
     "url": "http://www.fjlaboratories.com/",
-    "maintainer": "FJLabs",
+    "maintainer": "mrnoisytiger",
     "layouts": {
         "LAYOUT_75_all": {
             "layout": [
@@ -20,19 +20,19 @@
                 {"label":"F12", "x":12.75, "y":0},
                 {"label":"Print Screen", "x":14, "y":0},
 
-                {"label":"~", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
                 {"label":"Back Space", "x":13, "y":1.25},
                 {"label":"Back Space", "x":14, "y":1.25},
                 {"label":"Delete", "x":15.25, "y":1.25},
@@ -48,9 +48,9 @@
                 {"label":"I", "x":8.5, "y":2.25},
                 {"label":"O", "x":9.5, "y":2.25},
                 {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
                 {"label":"Page Up", "x":15.25, "y":2.25},
 
                 {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
@@ -63,8 +63,8 @@
                 {"label":"J", "x":7.75, "y":3.25},
                 {"label":"K", "x":8.75, "y":3.25},
                 {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"SQ", "x":11.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
                 {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
                 {"label":"Page Down", "x":15.25, "y":3.25},
 
@@ -76,21 +76,21 @@
                 {"label":"B", "x":6.25, "y":4.25},
                 {"label":"N", "x":7.25, "y":4.25},
                 {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
                 {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
                 {"label":"\u2191", "x":14.25, "y":4.5},
 
                 {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
                 {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
                 {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"MO(1)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"\u2190", "x":12.75, "y":5.5},
-                {"label":"\u2193", "x":13.75, "y":5.5},
-                {"label":"\u2192", "x":14.75, "y":5.5}
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.5},
+                {"label":"MO(1)", "x":11.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":13.25, "y":5.5},
+                {"label":"\u2193", "x":14.25, "y":5.5},
+                {"label":"\u2192", "x":15.25, "y":5.5}
             ]
         }
     }
diff --git a/keyboards/fjlabs/7vhotswap/keymaps/default/keymap.c b/keyboards/fjlabs/7vhotswap/keymaps/default/keymap.c
index 5484ab9f8c..86b34a0446 100644
--- a/keyboards/fjlabs/7vhotswap/keymaps/default/keymap.c
+++ b/keyboards/fjlabs/7vhotswap/keymaps/default/keymap.c
@@ -22,20 +22,20 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_75_all(
-        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
-        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_BSPC, KC_PGDN,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER1] = LAYOUT_75_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/fjlabs/7vhotswap/keymaps/via/keymap.c b/keyboards/fjlabs/7vhotswap/keymaps/via/keymap.c
index e6c2397a16..67838a1a84 100644
--- a/keyboards/fjlabs/7vhotswap/keymaps/via/keymap.c
+++ b/keyboards/fjlabs/7vhotswap/keymaps/via/keymap.c
@@ -24,38 +24,38 @@ enum layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_LAYER0] = LAYOUT_75_all(
-        KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR,
-        KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 
-        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
-        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_BSPC, KC_PGDN,
-        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
-        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     [_LAYER1] = LAYOUT_75_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
     [_LAYER2] = LAYOUT_75_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
     [_LAYER3] = LAYOUT_75_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,             KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     )
-};
\ No newline at end of file
+};
diff --git a/keyboards/fjlabs/7vhotswap/readme.md b/keyboards/fjlabs/7vhotswap/readme.md
index 41f0014105..0f6f847285 100644
--- a/keyboards/fjlabs/7vhotswap/readme.md
+++ b/keyboards/fjlabs/7vhotswap/readme.md
@@ -1,7 +1,8 @@
 # 7V Hotswap PCB by FJLaboratories
 
 The following is the QMK Firmware for the 7V Hotswap PCB by [FJLaboratories](https://www.fjlaboratories.com/).
-* Keyboard Maintainer: FJLaboratories
+
+* Keyboard Maintainer: [FJLaboratories](https://github.com/mrnoisytiger)
 * Hardware Supported: 7V Hotswap
 
 Make example for this keyboard (after setting up your build environment):

From 7540a803411ed21a194f49d3ca59db670a6c082e Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 4 Feb 2022 12:35:17 -0800
Subject: [PATCH 507/867] MTBKeys MTB60 Solder Layout Macro Refactor (#16195)

---
 keyboards/mtbkeys/mtb60/solder/info.json      | 141 +++++++++---------
 .../mtb60/solder/keymaps/default/keymap.c     |   4 +-
 keyboards/mtbkeys/mtb60/solder/solder.h       |  38 +++--
 3 files changed, 101 insertions(+), 82 deletions(-)

diff --git a/keyboards/mtbkeys/mtb60/solder/info.json b/keyboards/mtbkeys/mtb60/solder/info.json
index 7d49be306d..c2e49e8f77 100644
--- a/keyboards/mtbkeys/mtb60/solder/info.json
+++ b/keyboards/mtbkeys/mtb60/solder/info.json
@@ -2,81 +2,84 @@
     "keyboard_name": "MTB60",
     "url": "mtbkeys.com",
     "maintainer": "MTBKeys",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-                {"x": 6, "y": 0},
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-                {"x": 13, "y": 0},
-                {"x": 14, "y": 0},
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Back Space", "x":13, "y":0},
+                {"label":"Delete", "x":14, "y":0},
 
-                {"x": 0, "y": 1, "w": 1.5},
-                {"x": 1.5, "y": 1},
-                {"x": 2.5, "y": 1},
-                {"x": 3.5, "y": 1},
-                {"x": 4.5, "y": 1},
-                {"x": 5.5, "y": 1},
-                {"x": 6.5, "y": 1},
-                {"x": 7.5, "y": 1},
-                {"x": 8.5, "y": 1},
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1},
-                {"x": 13.5, "y": 1, "w": 1.5},
+                {"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},
 
-                {"x": 0, "y": 2, "w": 1.75},
-                {"x": 1.75, "y": 2},
-                {"x": 2.75, "y": 2},
-                {"x": 3.75, "y": 2},
-                {"x": 4.75, "y": 2},
-                {"x": 5.75, "y": 2},
-                {"x": 6.75, "y": 2},
-                {"x": 7.75, "y": 2},
-                {"x": 8.75, "y": 2},
-                {"x": 9.75, "y": 2},
-                {"x": 10.75, "y": 2},
-                {"x": 11.75, "y": 2},
-                {"x": 12.75, "y": 2, "w": 2.25},
+                {"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},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-                {"x": 13, "y": 3},
-                {"x": 14, "y": 3},
+                {"label":"Left Shift", "x":0, "y":3},
+                {"label":"\\|", "x":1, "y":3},
+                {"label":"Z", "x":2, "y":3},
+                {"label":"X", "x":3, "y":3},
+                {"label":"C", "x":4, "y":3},
+                {"label":"V", "x":5, "y":3},
+                {"label":"B", "x":6, "y":3},
+                {"label":"N", "x":7, "y":3},
+                {"label":"M", "x":8, "y":3},
+                {"label":",<", "x":9, "y":3},
+                {"label":".>", "x":10, "y":3},
+                {"label":"/?", "x":11, "y":3},
+                {"label":"Right Shift", "x":12, "y":3},
+                {"label":"\u2191", "x":13, "y":3},
+                {"label":"End", "x":14, "y":3},
 
-                {"x": 0, "y": 4, "w": 1.25},
-                {"x": 1.25, "y": 4, "w": 1.25},
-                {"x": 2.5, "y": 4, "w": 1.25},
-                {"x": 3.75, "y": 4, "w": 2.25},
-                {"x": 6, "y": 4, "w": 1.25},
-                {"x": 7.25, "y": 4, "w": 2.75},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4},
-                {"x": 13, "y": 4},
-                {"x": 14, "y": 4}
+                {"label":"Left Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Left Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Space", "x":7.25, "y":4, "w":2.75},
+                {"label":"Right Alt", "x":10, "y":4},
+                {"label":"GUI", "x":11, "y":4},
+                {"label":"\u2190", "x":12, "y":4},
+                {"label":"\u2193", "x":13, "y":4},
+                {"label":"\u2192", "x":14, "y":4}
             ]
         }
     }
diff --git a/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c b/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c
index 6ed34b6432..a6ce02443a 100644
--- a/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c
+++ b/keyboards/mtbkeys/mtb60/solder/keymaps/default/keymap.c
@@ -23,14 +23,14 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT(
+    [_BASE] = LAYOUT_all(
         KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
         KC_LSFT, 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_RSFT, KC_RSFT,
         KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI, MO(_FN), KC_RGUI, KC_RCTL
     ),
-    [_FN] = LAYOUT(
+    [_FN] = LAYOUT_all(
         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, _______, _______,
         _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,  KC_RIGHT, _______, _______,          _______,
diff --git a/keyboards/mtbkeys/mtb60/solder/solder.h b/keyboards/mtbkeys/mtb60/solder/solder.h
index 31756e7af7..6beed5154e 100644
--- a/keyboards/mtbkeys/mtb60/solder/solder.h
+++ b/keyboards/mtbkeys/mtb60/solder/solder.h
@@ -18,16 +18,32 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
-    k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, kd0, ke0, \
-         k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, ke1, \
-    k02,      k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2,      \
-    k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kc3, kd3, ke3, \
-    k04, k14,      k34, k44,      k64,      k84,      ka4, kb4, kc4, kd4, ke4  \
+#define ___ KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │11   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │
+ * ├───┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤
+ * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │
+ * ├───┴┬──┴─┬─┴──┬┴───┴───┼───┴┬──┴───┴───┼───┼───┼───┼───┼───┤
+ * │40  │41  │42  │44      │46  │48        │4a │4b │4c │4d │4e │
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+ */
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+         k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k40, k41,      k43, k44,      k46,      k48,      k4a, k4b, k4c, k4d, k4e  \
 ) { \
-    { k00,   k10,   k20,   k30, k40, k50,   k60, k70,   k80, k90,   ka0, kb0, kc0, kd0, ke0   }, \
-    { KC_NO, k11,   k21,   k31, k41, k51,   k61, k71,   k81, k91,   ka1, kb1, kc1, kd1, ke1   }, \
-    { k02,   KC_NO, k22,   k32, k42, k52,   k62, k72,   k82, k92,   ka2, kb2, kc2, kd2, KC_NO }, \
-    { k03,   k13,   k23,   k33, k43, k53,   k63, k73,   k83, k93,   ka3, kb3, kc3, kd3, ke3   }, \
-    { k04,   k14,   KC_NO, k34, k44, KC_NO, k64, KC_NO, k84, KC_NO, ka4, kb4, kc4, kd4, ke4   }  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
+    { ___, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
+    { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, ___ }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
+    { k40, k41, ___, k43, k44, ___, k46, ___, k48, ___, k4a, k4b, k4c, k4d, k4e }  \
 }

From 8fd8b2dc92a01b86a8e9ff3c37baeba760312140 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 5 Feb 2022 07:36:57 +1100
Subject: [PATCH 508/867] Skip categorisation of PR if it's only for code
 formatting. (#16215)

---
 lib/python/qmk/cli/generate/develop_pr_list.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/python/qmk/cli/generate/develop_pr_list.py b/lib/python/qmk/cli/generate/develop_pr_list.py
index fab0262773..09236a7c42 100755
--- a/lib/python/qmk/cli/generate/develop_pr_list.py
+++ b/lib/python/qmk/cli/generate/develop_pr_list.py
@@ -12,6 +12,14 @@ fix_expr = re.compile(r'fix', flags=re.IGNORECASE)
 clean1_expr = re.compile(r'\[(develop|keyboard|keymap|core|cli|bug|docs|feature)\]', flags=re.IGNORECASE)
 clean2_expr = re.compile(r'^(develop|keyboard|keymap|core|cli|bug|docs|feature):', flags=re.IGNORECASE)
 
+ignored_titles = ["Format code according to conventions"]
+
+
+def _is_ignored(title):
+    for ignore in ignored_titles:
+        if ignore in title:
+            return
+
 
 def _get_pr_info(cache, gh, pr_num):
     pull = cache.get(f'pull:{pr_num}')
@@ -81,7 +89,9 @@ def generate_develop_pr_list(cli):
             else:
                 normal_collection.append(info)
 
-        if "dependencies" in commit_info['pr_labels']:
+        if _is_ignored(commit_info['title']):
+            return
+        elif "dependencies" in commit_info['pr_labels']:
             fix_or_normal(commit_info, pr_list_bugs, pr_list_dependencies)
         elif "core" in commit_info['pr_labels']:
             fix_or_normal(commit_info, pr_list_bugs, pr_list_core)

From f52cc210b88936b666ed649eb243de1e0f64d88e Mon Sep 17 00:00:00 2001
From: IskandarMa <epiciskandar@gmail.com>
Date: Sat, 5 Feb 2022 05:15:21 +0800
Subject: [PATCH 509/867] [Docs] feature_macro.md: minor formatting fix
 (#16205)

---
 docs/feature_macros.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/feature_macros.md b/docs/feature_macros.md
index 810028cf70..78bc4ba0a5 100644
--- a/docs/feature_macros.md
+++ b/docs/feature_macros.md
@@ -40,7 +40,7 @@ You can define up to 32 macros in a `keymap.json` file, as used by [Configurator
 
 ### Selecting Your Host Keyboard Layout
 
-If you type in a language other than English, or use a non-QWERTY layout like Colemak, Dvorak, or Workman, you may have set your computer's input language to match this layout. This presents a challenge when creating macros- you may need to type different keys to get the same letters! To address this you can add the `host_language` key to your keymap.json, like so:
+If you type in a language other than English, or use a non-QWERTY layout like Colemak, Dvorak, or Workman, you may have set your computer's input language to match this layout. This presents a challenge when creating macros - you may need to type different keys to get the same letters! To address this you can add the `host_language` key to your `keymap.json`, like so:
 
 ```json
 {
@@ -75,7 +75,7 @@ The current list of available languages is:
 
 ### Macro Basics
 
-Each macro is an array consisting of strings and objects (dictionaries.) Strings are typed to your computer while objects allow you to control how your macro is typed out.
+Each macro is an array consisting of strings and objects (dictionaries). Strings are typed to your computer while objects allow you to control how your macro is typed out.
 
 #### Object Format
 

From 13821fdbd7809ee311b38d3a593165c275b44879 Mon Sep 17 00:00:00 2001
From: TerryMathews <terry@terrymathews.net>
Date: Fri, 4 Feb 2022 16:18:42 -0500
Subject: [PATCH 510/867] [Keyboard] TKC Portico75 (#15114)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jael're <drashna@live.com>
---
 keyboards/tkc/portico75/config.h              | 179 ++++++++++++++++
 keyboards/tkc/portico75/info.json             |  10 +
 .../tkc/portico75/keymaps/default/keymap.c    |  31 +++
 keyboards/tkc/portico75/keymaps/via/keymap.c  | 109 ++++++++++
 keyboards/tkc/portico75/keymaps/via/rules.mk  |  11 +
 keyboards/tkc/portico75/portico75.c           | 188 +++++++++++++++++
 keyboards/tkc/portico75/portico75.h           |  60 ++++++
 keyboards/tkc/portico75/readme.md             |  21 ++
 keyboards/tkc/portico75/rules.mk              |  22 ++
 keyboards/wilba_tech/wt_rgb_backlight.c       | 193 +++++++++++++++++-
 10 files changed, 822 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/tkc/portico75/config.h
 create mode 100644 keyboards/tkc/portico75/info.json
 create mode 100644 keyboards/tkc/portico75/keymaps/default/keymap.c
 create mode 100644 keyboards/tkc/portico75/keymaps/via/keymap.c
 create mode 100644 keyboards/tkc/portico75/keymaps/via/rules.mk
 create mode 100644 keyboards/tkc/portico75/portico75.c
 create mode 100644 keyboards/tkc/portico75/portico75.h
 create mode 100644 keyboards/tkc/portico75/readme.md
 create mode 100644 keyboards/tkc/portico75/rules.mk

diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h
new file mode 100644
index 0000000000..48be10a427
--- /dev/null
+++ b/keyboards/tkc/portico75/config.h
@@ -0,0 +1,179 @@
+/*
+Copyright 2021 Terry Mathews
+
+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       0x544B // TK
+#define PRODUCT_ID      0x0011
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    TKC
+#define PRODUCT         Portico75
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS \
+    { B0, E6, F0, F1, D3, D2 }
+#define MATRIX_COL_PINS \
+    { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, B3, B7 }
+
+/*Rotary Encoder Pins*/
+#define ENCODERS_PAD_A \
+    { B1 }
+#define ENCODERS_PAD_B \
+    { B2 }
+
+/*Sets the number of pulses per increment*/
+#define ENCODER_RESOLUTION 2
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_LED_PROCESS_LIMIT 4
+#    define RGB_MATRIX_LED_FLUSH_LIMIT 26
+#    define DEBOUNCE 3
+#    define RGB_DISABLE_AFTER_TIMEOUT 0     // number of ticks to wait until disabling effects
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
+#    define RGB_MATRIX_KEYPRESSES
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+// #    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+// #    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+// #    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+// #    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+// #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+// #    define ENABLE_RGB_MATRIX_SPLASH
+// #    define ENABLE_RGB_MATRIX_MULTISPLASH
+// #    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+#    define DRIVER_ADDR_1 0b0110000
+#    define DRIVER_COUNT 1
+#    define DRIVER_1_LED_TOTAL 98
+#    define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#    define DRIVER_INDICATOR_LED_TOTAL 0
+#else
+// WT_RGB IS31FL3741 driver code
+#    define DRIVER_COUNT 1
+#    define DRIVER_LED_TOTAL 98
+
+#    define RGB_BACKLIGHT_ENABLED 1
+
+// This conditionally compiles the backlight code for Portico75 specifics
+#    define RGB_BACKLIGHT_PORTICO75
+
+// disable backlight when USB suspended (PC sleep/hibernate/shutdown)
+#    define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 1
+
+// disable backlight after timeout in minutes, 0 = no timeout
+#    define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 0
+
+// the default brightness
+#    define RGB_BACKLIGHT_BRIGHTNESS 255
+
+// the default effect (RGB test)
+#    define RGB_BACKLIGHT_EFFECT 255
+
+// the default effect speed (0-3)
+#    define RGB_BACKLIGHT_EFFECT_SPEED 0
+
+// the default color1 and color2
+#    define RGB_BACKLIGHT_COLOR_1 \
+        { .h = 0, .s = 255 }
+#    define RGB_BACKLIGHT_COLOR_2 \
+        { .h = 127, .s = 255 }
+
+#    define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0
+#    define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
+#    define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 0
+#    define RGB_BACKLIGHT_USE_7U_SPACEBAR 0
+#    define RGB_BACKLIGHT_USE_ISO_ENTER 0
+#    define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
+#    define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR \
+        { .color = {.h = 0, .s = 0}, .index = 255 }
+#    define RGB_BACKLIGHT_LAYER_1_INDICATOR \
+        { .color = {.h = 0, .s = 0}, .index = 255 }
+#    define RGB_BACKLIGHT_LAYER_2_INDICATOR \
+        { .color = {.h = 0, .s = 0}, .index = 255 }
+#    define RGB_BACKLIGHT_LAYER_3_INDICATOR \
+        { .color = {.h = 0, .s = 0}, .index = 255 }
+
+// These define which keys in the matrix are alphas/mods
+// Used for backlight effects so colors are different for
+// alphas vs. mods
+// Each value is for a row, bit 0 is column 0
+// Alpha=0 Mod=1
+#    define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0110000000000001
+#    define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0110000000000001
+#    define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0111000000000001
+#    define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0111100000000001
+#    define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b1111111111111111
+
+// Backlight config starts after VIA's EEPROM usage,
+// dynamic keymaps start after this.
+#    define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
+
+// VIA lighting is handled by the keyboard-level code
+#    define VIA_CUSTOM_LIGHTING_ENABLE
+#endif
diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json
new file mode 100644
index 0000000000..5aaf21ffcc
--- /dev/null
+++ b/keyboards/tkc/portico75/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "TKC Portico75", 
+    "url": "", 
+    "maintainer": "TerryMathews",
+    "layouts": {
+        "LAYOUT_75_ansi": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Del", "x":14, "y":0}, {"label":"Mute", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Home", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"PgUp", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"<i class='kb kb-Arrows-Up'></i>", "x":14.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Fn", "x":10, "y":5.25, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, {"label":"<i class='kb kb-Arrows-Left'></i>", "x":13.25, "y":5.5}, {"label":"<i class='kb kb-Arrows-Down'></i>", "x":14.25, "y":5.5}, {"label":"<i class='kb kb-Arrows-Right'></i>", "x":15.25, "y":5.5}]
+        }
+    }
+}
diff --git a/keyboards/tkc/portico75/keymaps/default/keymap.c b/keyboards/tkc/portico75/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9577164891
--- /dev/null
+++ b/keyboards/tkc/portico75/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/*
+Copyright 2021 Terry Mathews
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_75_ansi(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PSCR, KC_MUTE,
+        KC_GRV,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_HOME,
+        KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,  KC_ENT,
+        KC_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(1), KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/keyboards/tkc/portico75/keymaps/via/keymap.c b/keyboards/tkc/portico75/keymaps/via/keymap.c
new file mode 100644
index 0000000000..cee94c4a1d
--- /dev/null
+++ b/keyboards/tkc/portico75/keymaps/via/keymap.c
@@ -0,0 +1,109 @@
+/*
+Copyright 2021 Terry Mathews
+
+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
+
+#define ENCODERS 1
+
+#define ENCODERS_CW_KEY { { 14, 3 }  }
+#define ENCODERS_CCW_KEY  { { 14, 4 } }
+
+static uint8_t  encoder_state[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[ENCODERS]   = ENCODERS_CCW_KEY;
+
+//  WT RGB-specific keys:
+//  EF_INC, EF_DEC,   // next/previous backlight effect
+//  H1_INC, H1_DEC,   // Color 1 hue increase/decrease
+//  S1_INC, S1_DEC,   // Color 1 saturation increase/decrease
+//  H2_INC, H2_DEC,   // Color 2 hue increase/decrease
+//  S2_INC, S2_DEC,   // Color 2 saturation increase/decrease
+//  BR_INC, BR_DEC,   // backlight brightness increase/decrease
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_75_via(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_PSCR, KC_MUTE,
+        KC_GRV,     KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_MINS,  KC_EQL, KC_BSPC, KC_HOME,
+        KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+        KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,  KC_ENT,          KC_VOLD,
+        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_VOLU,
+        KC_LCTL, KC_LGUI, KC_LALT,                    KC_SPC,                            KC_RALT,   MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+#ifdef RGB_BACKLIGHT_PORTICO75
+    [1] = LAYOUT_75_via(
+        _______,  EF_INC,  EF_DEC,  H1_INC,  H1_DEC,  S1_INC,  S1_DEC,  H2_INC,  H2_DEC,  S2_INC,  S2_DEC,  BR_INC,  BR_DEC, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                   _______,                            _______,   MO(1), _______, _______, _______
+    ),
+#else
+    [1] = LAYOUT_75_via(
+        _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                   _______,                            _______,   MO(1), _______, _______, _______
+    ),
+#endif
+    [2] = LAYOUT_75_via(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_75_via(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______
+    )
+};
+
+void encoder_action_unregister(void) {
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index]) {
+            keyevent_t encoder_event = (keyevent_t) {
+                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
+                .pressed = false,
+                .time = (timer_read() | 1)
+            };
+            encoder_state[index] = 0;
+            action_exec(encoder_event);
+        }
+    }
+}
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+    keyevent_t encoder_event = (keyevent_t){.key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, .time = (timer_read() | 1)};
+    encoder_state[index]     = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+}
+
+void matrix_scan_user(void) { encoder_action_unregister(); }
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    return false;
+};
diff --git a/keyboards/tkc/portico75/keymaps/via/rules.mk b/keyboards/tkc/portico75/keymaps/via/rules.mk
new file mode 100644
index 0000000000..9680dd9373
--- /dev/null
+++ b/keyboards/tkc/portico75/keymaps/via/rules.mk
@@ -0,0 +1,11 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+RGB_MATRIX_ENABLE = no         # Use RGB matrix
+
+# project specific files
+SRC += keyboards/wilba_tech/wt_main.c \
+       keyboards/wilba_tech/wt_rgb_backlight.c \
+       quantum/color.c \
+       drivers/led/issi/is31fl3741.c
+
+QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/tkc/portico75/portico75.c b/keyboards/tkc/portico75/portico75.c
new file mode 100644
index 0000000000..812345b384
--- /dev/null
+++ b/keyboards/tkc/portico75/portico75.c
@@ -0,0 +1,188 @@
+/*
+Copyright 2021 Terry Mathews
+
+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 "portico75.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+    {0, CS18_SW1, CS17_SW1, CS16_SW1},
+    {0, CS18_SW2, CS17_SW2, CS16_SW2},
+    {0, CS18_SW3, CS17_SW3, CS16_SW3},
+    {0, CS18_SW4, CS17_SW4, CS16_SW4},
+    {0, CS18_SW5, CS17_SW5, CS16_SW5},
+    {0, CS18_SW6, CS17_SW6, CS16_SW6},
+    {0, CS18_SW7, CS17_SW7, CS16_SW7},
+    {0, CS18_SW8, CS17_SW8, CS16_SW8},
+    {0, CS18_SW9, CS17_SW9, CS16_SW9},
+
+    {0, CS21_SW1, CS20_SW1, CS19_SW1},
+    {0, CS21_SW2, CS20_SW2, CS19_SW2},
+    {0, CS21_SW3, CS20_SW3, CS19_SW3},
+    {0, CS21_SW4, CS20_SW4, CS19_SW4},
+    {0, CS21_SW5, CS20_SW5, CS19_SW5},
+    {0, CS21_SW6, CS20_SW6, CS19_SW6}, //Encoder, NO_LED
+
+    {0, CS15_SW1, CS14_SW1, CS13_SW1},
+    {0, CS15_SW2, CS14_SW2, CS13_SW2},
+    {0, CS15_SW3, CS14_SW3, CS13_SW3},
+    {0, CS15_SW4, CS14_SW4, CS13_SW4},
+    {0, CS15_SW5, CS14_SW5, CS13_SW5},
+    {0, CS15_SW6, CS14_SW6, CS13_SW6},
+    {0, CS15_SW7, CS14_SW7, CS13_SW7},
+    {0, CS15_SW8, CS14_SW8, CS13_SW8},
+    {0, CS15_SW9, CS14_SW9, CS13_SW9},
+
+    {0, CS24_SW1, CS23_SW1, CS22_SW1},
+    {0, CS24_SW2, CS23_SW2, CS22_SW2},
+    {0, CS24_SW3, CS23_SW3, CS22_SW3},
+    {0, CS24_SW4, CS23_SW4, CS22_SW4},
+    {0, CS24_SW5, CS23_SW5, CS22_SW5},
+    {0, CS24_SW6, CS23_SW6, CS22_SW6},
+
+    {0, CS12_SW1, CS11_SW1, CS10_SW1},
+    {0, CS12_SW2, CS11_SW2, CS10_SW2},
+    {0, CS12_SW3, CS11_SW3, CS10_SW3},
+    {0, CS12_SW4, CS11_SW4, CS10_SW4},
+    {0, CS12_SW5, CS11_SW5, CS10_SW5},
+    {0, CS12_SW6, CS11_SW6, CS10_SW6},
+    {0, CS12_SW7, CS11_SW7, CS10_SW7},
+    {0, CS12_SW8, CS11_SW8, CS10_SW8},
+    {0, CS12_SW9, CS11_SW9, CS10_SW9},
+
+    {0, CS27_SW1, CS26_SW1, CS25_SW1},
+    {0, CS27_SW2, CS26_SW2, CS25_SW2},
+    {0, CS27_SW3, CS26_SW3, CS25_SW3},
+    {0, CS27_SW4, CS26_SW4, CS25_SW4},
+    {0, CS27_SW5, CS26_SW5, CS25_SW5},
+    {0, CS27_SW6, CS26_SW6, CS25_SW6},
+
+    {0, CS9_SW1, CS8_SW1, CS7_SW1},
+    {0, CS9_SW2, CS8_SW2, CS7_SW2},
+    {0, CS9_SW3, CS8_SW3, CS7_SW3},
+    {0, CS9_SW4, CS8_SW4, CS7_SW4},
+    {0, CS9_SW5, CS8_SW5, CS7_SW5},
+    {0, CS9_SW6, CS8_SW6, CS7_SW6},
+    {0, CS9_SW7, CS8_SW7, CS7_SW7},
+    {0, CS9_SW8, CS8_SW8, CS7_SW8},
+    {0, CS9_SW9, CS8_SW9, CS7_SW9},
+
+    {0, CS30_SW1, CS29_SW1, CS28_SW1},
+    {0, CS30_SW2, CS29_SW2, CS28_SW2},
+    {0, CS30_SW3, CS29_SW3, CS28_SW3},
+    {0, CS30_SW4, CS29_SW4, CS28_SW4},
+
+    {0, CS6_SW1, CS5_SW1, CS4_SW1},
+    {0, CS6_SW2, CS5_SW2, CS4_SW2},
+    {0, CS6_SW3, CS5_SW3, CS4_SW3},
+    {0, CS6_SW4, CS5_SW4, CS4_SW4},
+    {0, CS6_SW5, CS5_SW5, CS4_SW5},
+    {0, CS6_SW6, CS5_SW6, CS4_SW6},
+    {0, CS6_SW7, CS5_SW7, CS4_SW7},
+    {0, CS6_SW8, CS5_SW8, CS4_SW8},
+    {0, CS6_SW9, CS5_SW9, CS4_SW9},
+
+    {0, CS33_SW1, CS32_SW1, CS31_SW1},
+    {0, CS33_SW2, CS32_SW2, CS31_SW2},
+    {0, CS33_SW3, CS32_SW3, CS31_SW3},
+    {0, CS33_SW4, CS32_SW4, CS31_SW4},
+
+    {0, CS3_SW1, CS2_SW1, CS1_SW1},
+    {0, CS3_SW2, CS2_SW2, CS1_SW2},
+    {0, CS3_SW3, CS2_SW3, CS1_SW3},
+    {0, CS3_SW6, CS2_SW6, CS1_SW6},
+    {0, CS3_SW8, CS2_SW8, CS1_SW8},
+    {0, CS3_SW9, CS2_SW9, CS1_SW9},
+
+    {0, CS36_SW1, CS35_SW1, CS34_SW1},
+    {0, CS36_SW2, CS35_SW2, CS34_SW2},
+    {0, CS36_SW3, CS35_SW3, CS34_SW3},
+
+/*UNDERGLOW*/
+    {0, CS39_SW1, CS38_SW1, CS37_SW1},
+    {0, CS39_SW2, CS38_SW2, CS37_SW2},
+    {0, CS39_SW3, CS38_SW3, CS37_SW3},
+    {0, CS39_SW4, CS38_SW4, CS37_SW4},
+    {0, CS39_SW5, CS38_SW5, CS37_SW5},
+    {0, CS39_SW6, CS38_SW6, CS37_SW6},
+    {0, CS39_SW7, CS38_SW7, CS37_SW7},
+    {0, CS39_SW8, CS38_SW8, CS37_SW8},
+    {0, CS39_SW9, CS38_SW9, CS37_SW9},
+
+    {0, CS36_SW4, CS35_SW4, CS34_SW4},
+    {0, CS36_SW5, CS35_SW5, CS34_SW5},
+    {0, CS36_SW6, CS35_SW6, CS34_SW6},
+    {0, CS36_SW7, CS35_SW7, CS34_SW7},
+    {0, CS36_SW8, CS35_SW8, CS34_SW8},
+    {0, CS36_SW9, CS35_SW9, CS34_SW9},
+
+    {0, CS33_SW5, CS32_SW5, CS31_SW5},
+    {0, CS33_SW6, CS32_SW6, CS31_SW6},
+    {0, CS33_SW7, CS32_SW7, CS31_SW7},
+
+};
+led_config_t g_led_config = { {
+    {   0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14},
+    {  15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29},
+    {  30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44},
+    {  45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, NO_LED, NO_LED},
+    {  58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, NO_LED, NO_LED},
+    {  71, 72, 73, NO_LED, NO_LED, 74, NO_LED, NO_LED, NO_LED, 75, 76, 77, 78, 79, NO_LED},
+}, {
+    {0,0},{18,0},{33,0},{48,0},{62,0},{81,0},{96,0},{110,0},{125,0},{143,0},{158,0},{173,0},{187,0},{205,0},{224,0},
+    {0,15},{15,15},{29,15},{44,15},{59,15},{74,15},{88,15},{103,15},{118,15},{132,15},{147,15},{162,15},{176,15},{198,15},{224,15},
+    {4,26},{22,26},{37,26},{51,26},{66,26},{81,26},{96,26},{110,26},{125,26},{140,26},{154,26},{169,26},{183,26},{202,26},{224,26},
+    {5,38},{25,38},{40,38},{54,38},{69,38},{84,38},{98,38},{113,38},{128,38},{143,38},{157,38},{172,38},{197,38},
+    {9,49},{33,49},{48,49},{62,49},{77,49},{92,49},{107,49},{121,49},{136,49},{151,49},{165,49},{186,49},{209,52},
+    {2,61},{20,61},{39,61},{94,61},{151,61},{173,61},{195,64},{209,64},{224,64},
+    {2,0},{46,0},{90,0},{134,0},{178,0},{222,0},{224,2},{224,32},{224,62},{2,64},{46,64},{90,64},{134,64},{178,64},{222,64},{0,2},{0,32},{0,62},
+}, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+} };
+
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void)
+{
+    if (host_keyboard_led_state().caps_lock)
+    {
+        rgb_matrix_set_color(45, 0xFF, 0xFF, 0xFF);
+    }
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/tkc/portico75/portico75.h b/keyboards/tkc/portico75/portico75.h
new file mode 100644
index 0000000000..019fb07f75
--- /dev/null
+++ b/keyboards/tkc/portico75/portico75.h
@@ -0,0 +1,60 @@
+/*
+Copyright 2021 Terry Mathews
+
+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"
+
+#ifdef RGB_BACKLIGHT_PORTICO75
+#include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h"
+#include "via.h"
+#endif
+
+#define XXX KC_NO
+
+#define LAYOUT_75_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,           \
+    K50, K51, K52,           K55,                K59, K5A, K5B, K5C, K5D       \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, XXX }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, XXX }, \
+    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, K5A, K5B, K5C, K5D, XXX }  \
+}
+
+#define LAYOUT_75_via( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, \
+    K50, K51, K52,           K55,                K59, K5A, K5B, K5C, K5D       \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, XXX, K4E }, \
+    { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, K5A, K5B, K5C, K5D, XXX }  \
+}
diff --git a/keyboards/tkc/portico75/readme.md b/keyboards/tkc/portico75/readme.md
new file mode 100644
index 0000000000..3bb5ad319f
--- /dev/null
+++ b/keyboards/tkc/portico75/readme.md
@@ -0,0 +1,21 @@
+# TKC Portico75
+
+![TKC Portico75](https://i.imgur.com/Bkd0kYS.jpg)
+
+A 75% keyboard kit with per-key and underglow RGB lighting and an encoder knob.
+
+* Keyboard Maintainer: [TerryMathews](https://github.com/TerryMathews)
+* Hardware Supported: TKC Portico75 (ATmega32U4)
+* Hardware Availability: TBA
+
+Reset board into bootloader by holding down Esc key while plugging in USB-C cable.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make tkc/portico75:default
+
+Flashing example for this keyboard:
+
+    make tkc/portico75:default:flash
+
+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).
diff --git a/keyboards/tkc/portico75/rules.mk b/keyboards/tkc/portico75/rules.mk
new file mode 100644
index 0000000000..e8a74c9026
--- /dev/null
+++ b/keyboards/tkc/portico75/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes         # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes          # Mouse keys
+EXTRAKEY_ENABLE = yes          # Audio control and System control
+CONSOLE_ENABLE = no            # Console for debug
+COMMAND_ENABLE = yes           # Commands for debug and configuration
+NKRO_ENABLE = yes              # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
+AUDIO_ENABLE = no              # Audio output
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
+CIE1931_CURVE = yes
+ENCODER_ENABLE = yes
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index cc34a90c75..a696fe7ed4 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -31,6 +31,7 @@
     defined(RGB_BACKLIGHT_U80_A) || \
     defined(RGB_BACKLIGHT_DAWN60) || \
     defined(RGB_BACKLIGHT_PORTICO) || \
+	defined(RGB_BACKLIGHT_PORTICO75) || \
     defined(RGB_BACKLIGHT_WT60_B) || \
     defined(RGB_BACKLIGHT_WT60_BX) || \
     defined(RGB_BACKLIGHT_WT60_C) || \
@@ -89,6 +90,9 @@ LED_TYPE g_ws2812_leds[WS2812_LED_TOTAL];
 #elif defined(RGB_BACKLIGHT_NK87)
 #include "drivers/led/issi/is31fl3733.h"
 #define BACKLIGHT_LED_COUNT 128
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+#include "drivers/led/issi/is31fl3741.h"
+#define BACKLIGHT_LED_COUNT 98
 #else
 #include "drivers/led/issi/is31fl3731.h"
 #if defined(RGB_BACKLIGHT_U80_A)
@@ -701,6 +705,135 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
     { 1, C9_16, C7_15, C6_15 },
     { 1, C8_16, C7_16, C6_16 }
 };
+
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+#define ISSI_ADDR_1 0x30
+#define ISSI_ADDR_2
+
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |   R location
+ *   |   |      G location
+ *   |   |      |      B location
+ *   |   |      |      | */
+    {0, CS18_SW1, CS17_SW1, CS16_SW1},
+    {0, CS18_SW2, CS17_SW2, CS16_SW2},
+    {0, CS18_SW3, CS17_SW3, CS16_SW3},
+    {0, CS18_SW4, CS17_SW4, CS16_SW4},
+    {0, CS18_SW5, CS17_SW5, CS16_SW5},
+    {0, CS18_SW6, CS17_SW6, CS16_SW6},
+    {0, CS18_SW7, CS17_SW7, CS16_SW7},
+    {0, CS18_SW8, CS17_SW8, CS16_SW8},
+    {0, CS18_SW9, CS17_SW9, CS16_SW9},
+
+    {0, CS21_SW1, CS20_SW1, CS19_SW1},
+    {0, CS21_SW2, CS20_SW2, CS19_SW2},
+    {0, CS21_SW3, CS20_SW3, CS19_SW3},
+    {0, CS21_SW4, CS20_SW4, CS19_SW4},
+    {0, CS21_SW5, CS20_SW5, CS19_SW5},
+    {0, CS21_SW6, CS20_SW6, CS19_SW6}, //Encoder, NO_LED
+
+    {0, CS15_SW1, CS14_SW1, CS13_SW1},
+    {0, CS15_SW2, CS14_SW2, CS13_SW2},
+    {0, CS15_SW3, CS14_SW3, CS13_SW3},
+    {0, CS15_SW4, CS14_SW4, CS13_SW4},
+    {0, CS15_SW5, CS14_SW5, CS13_SW5},
+    {0, CS15_SW6, CS14_SW6, CS13_SW6},
+    {0, CS15_SW7, CS14_SW7, CS13_SW7},
+    {0, CS15_SW8, CS14_SW8, CS13_SW8},
+    {0, CS15_SW9, CS14_SW9, CS13_SW9},
+
+    {0, CS24_SW1, CS23_SW1, CS22_SW1},
+    {0, CS24_SW2, CS23_SW2, CS22_SW2},
+    {0, CS24_SW3, CS23_SW3, CS22_SW3},
+    {0, CS24_SW4, CS23_SW4, CS22_SW4},
+    {0, CS24_SW5, CS23_SW5, CS22_SW5},
+    {0, CS24_SW6, CS23_SW6, CS22_SW6},
+
+    {0, CS12_SW1, CS11_SW1, CS10_SW1},
+    {0, CS12_SW2, CS11_SW2, CS10_SW2},
+    {0, CS12_SW3, CS11_SW3, CS10_SW3},
+    {0, CS12_SW4, CS11_SW4, CS10_SW4},
+    {0, CS12_SW5, CS11_SW5, CS10_SW5},
+    {0, CS12_SW6, CS11_SW6, CS10_SW6},
+    {0, CS12_SW7, CS11_SW7, CS10_SW7},
+    {0, CS12_SW8, CS11_SW8, CS10_SW8},
+    {0, CS12_SW9, CS11_SW9, CS10_SW9},
+
+    {0, CS27_SW1, CS26_SW1, CS25_SW1},
+    {0, CS27_SW2, CS26_SW2, CS25_SW2},
+    {0, CS27_SW3, CS26_SW3, CS25_SW3},
+    {0, CS27_SW4, CS26_SW4, CS25_SW4},
+    {0, CS27_SW5, CS26_SW5, CS25_SW5},
+    {0, CS27_SW6, CS26_SW6, CS25_SW6},
+
+    {0, CS9_SW1, CS8_SW1, CS7_SW1},
+    {0, CS9_SW2, CS8_SW2, CS7_SW2},
+    {0, CS9_SW3, CS8_SW3, CS7_SW3},
+    {0, CS9_SW4, CS8_SW4, CS7_SW4},
+    {0, CS9_SW5, CS8_SW5, CS7_SW5},
+    {0, CS9_SW6, CS8_SW6, CS7_SW6},
+    {0, CS9_SW7, CS8_SW7, CS7_SW7},
+    {0, CS9_SW8, CS8_SW8, CS7_SW8},
+    {0, CS9_SW9, CS8_SW9, CS7_SW9},
+
+    {0, CS30_SW1, CS29_SW1, CS28_SW1},
+    {0, CS30_SW2, CS29_SW2, CS28_SW2},
+    {0, CS30_SW3, CS29_SW3, CS28_SW3},
+    {0, CS30_SW4, CS29_SW4, CS28_SW4},
+
+    {0, CS6_SW1, CS5_SW1, CS4_SW1},
+    {0, CS6_SW2, CS5_SW2, CS4_SW2},
+    {0, CS6_SW3, CS5_SW3, CS4_SW3},
+    {0, CS6_SW4, CS5_SW4, CS4_SW4},
+    {0, CS6_SW5, CS5_SW5, CS4_SW5},
+    {0, CS6_SW6, CS5_SW6, CS4_SW6},
+    {0, CS6_SW7, CS5_SW7, CS4_SW7},
+    {0, CS6_SW8, CS5_SW8, CS4_SW8},
+    {0, CS6_SW9, CS5_SW9, CS4_SW9},
+
+    {0, CS33_SW1, CS32_SW1, CS31_SW1},
+    {0, CS33_SW2, CS32_SW2, CS31_SW2},
+    {0, CS33_SW3, CS32_SW3, CS31_SW3},
+    {0, CS33_SW4, CS32_SW4, CS31_SW4},
+
+    {0, CS3_SW1, CS2_SW1, CS1_SW1},
+    {0, CS3_SW2, CS2_SW2, CS1_SW2},
+    {0, CS3_SW3, CS2_SW3, CS1_SW3},
+    {0, CS3_SW6, CS2_SW6, CS1_SW6},
+    {0, CS3_SW8, CS2_SW8, CS1_SW8},
+    {0, CS3_SW9, CS2_SW9, CS1_SW9},
+
+    {0, CS36_SW1, CS35_SW1, CS34_SW1},
+    {0, CS36_SW2, CS35_SW2, CS34_SW2},
+    {0, CS36_SW3, CS35_SW3, CS34_SW3},
+
+/*UNDERGLOW*/
+    {0, CS39_SW1, CS38_SW1, CS37_SW1},
+    {0, CS39_SW2, CS38_SW2, CS37_SW2},
+    {0, CS39_SW3, CS38_SW3, CS37_SW3},
+    {0, CS39_SW4, CS38_SW4, CS37_SW4},
+    {0, CS39_SW5, CS38_SW5, CS37_SW5},
+    {0, CS39_SW6, CS38_SW6, CS37_SW6},
+    {0, CS39_SW7, CS38_SW7, CS37_SW7},
+    {0, CS39_SW8, CS38_SW8, CS37_SW8},
+    {0, CS39_SW9, CS38_SW9, CS37_SW9},
+
+    {0, CS36_SW4, CS35_SW4, CS34_SW4},
+    {0, CS36_SW5, CS35_SW5, CS34_SW5},
+    {0, CS36_SW6, CS35_SW6, CS34_SW6},
+    {0, CS36_SW7, CS35_SW7, CS34_SW7},
+    {0, CS36_SW8, CS35_SW8, CS34_SW8},
+    {0, CS36_SW9, CS35_SW9, CS34_SW9},
+
+    {0, CS33_SW5, CS32_SW5, CS31_SW5},
+    {0, CS33_SW6, CS32_SW6, CS31_SW6},
+    {0, CS33_SW7, CS32_SW7, CS31_SW7}
+};
+
 #elif defined(RGB_BACKLIGHT_M6_B)
     // Driver has fixed mapping of index to the red, green and blue LEDs
 #elif defined(RGB_BACKLIGHT_M10_C)
@@ -865,7 +998,7 @@ const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
     {112,64}, {100,48}, {84,48}, {68,48}, {52,48}, {36,48}, {64,60}, {44,60}, {24,64},
     {108,32}, {92,32}, {76,32}, {60,32}, {44,32}, {28,32}, {255,255}, {10,48}, {4,64},
     // LD0..LD1762
-	
+
     {124,32}, {140,32}, {156,32}, {172,32}, {188,32}, {214,32}, {180,48}, {202,48}, {224,48},
     {116,48}, {132,48}, {148,48}, {164,48}, {255,255}, {160,60}, {180,64}, {208,64}, {255,255}
 };
@@ -1260,6 +1393,25 @@ const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
     { 121, 215 },               { 119, 164 }, { 117, 134 }, { 114, 104 }, { 109,  76 }, {  98,  50 }, {  71,  34 }, {  37,  41 }, {  22,  65 }, {  15,  93 }, {  11, 122 }, {   8, 162 }, {   7, 205 }, {   6, 233 },
     { 116, 236 }, { 113, 199 }, { 110, 164 },                                           {  82,  74 },                                           {  27, 106 }, {  20, 138 }, {  15, 183 }, {  13, 212 }, {  11, 240 }
 };
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
+    {   0,   0 }, {  18,   0 }, {  33,   0 }, {  48,   0 }, {  62,   0 }, {  81,   0 }, {  96,   0 }, { 110,   0 }, { 125,   0 }, { 143,   0 }, { 158,   0 }, { 173,   0 }, { 187,   0 }, { 205,   0 }, { 224,   0 },
+    {   0,  15 }, {  15,  15 }, {  29,  15 }, {  44,  15 }, {  59,  15 }, {  74,  15 }, {  88,  15 }, { 103,  15 }, { 118,  15 }, { 132,  15 }, { 147,  15 }, { 162,  15 }, { 176,  15 }, { 198,  15 }, { 224,  15 },
+    {   4,  26 }, {  22,  26 }, {  37,  26 }, {  51,  26 }, {  66,  26 }, {  81,  26 }, {  96,  26 }, { 110,  26 }, { 125,  26 }, { 140,  26 }, { 154,  26 }, { 169,  26 }, { 183,  26 }, { 202,  26 }, { 224,  26 },
+    {   5,  38 }, {  25,  38 }, {  40,  38 }, {  54,  38 }, {  69,  38 }, {  84,  38 }, {  98,  38 }, { 113,  38 }, { 128,  38 }, { 143,  38 }, { 157,  38 }, { 172,  38 }, { 197,  38 },
+    {   9,  49 }, {  33,  49 }, {  48,  49 }, {  62,  49 }, {  77,  49 }, {  92,  49 }, { 107,  49 }, { 121,  49 }, { 136,  49 }, { 151,  49 }, { 165,  49 }, { 186,  49 }, { 209,  49 },
+    {   2,  61 }, {  20,  61 }, {  39,  61 }, {  94,  61 }, { 151,  61 }, { 173,  61 }, { 195,  64 }, { 209,  64 }, { 224,  64 },
+	{   2,   0 }, {  46,   0 }, {  90,   0 }, { 134,   0 }, { 178,   0 }, { 222,   0 }, { 224,   2 }, { 224,  32 }, { 224,  62 }, {   2,  64 }, {  46,  64 }, {  90,  64 }, { 134,  64 }, { 178,  64 }, { 222,  64 }, {   0,   2 }, {   0,  32 }, {   0,  62 }
+};
+const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
+    { 138, 240 }, { 140, 205 }, { 143, 176 }, { 146, 147 }, { 150, 122 }, { 159,  92 }, { 172,  74 }, { 188,  66 }, { 206,  71 }, { 222,  92 }, { 229, 115 }, { 234, 142 }, { 238, 168 }, { 241, 203 }, { 243, 240 },
+    { 133, 233 }, { 134, 203 }, { 135, 175 }, { 137, 144 }, { 140, 115 }, { 144,  86 }, { 152,  61 }, { 171,  40 }, { 204,  37 }, { 226,  54 }, { 236,  80 }, { 241, 109 }, { 244, 136 }, { 246, 181 }, { 248, 233 },
+    { 129, 223 }, { 130, 186 }, { 130, 155 }, { 131, 126 }, { 132,  96 }, { 135,  65 }, { 142,  35 }, { 177,  13 }, { 237,  30 }, { 245,  59 }, { 248,  87 }, { 250, 118 }, { 251, 147 }, { 251, 186 }, { 252, 231 },
+    { 125, 221 }, { 124, 180 }, { 124, 149 }, { 123, 120 }, { 121,  89 }, { 118,  59 }, { 111,  31 }, {  57,  13 }, {  15,  35 }, {   8,  65 }, {   5,  94 }, {   4, 124 }, {   3, 176 },
+    { 120, 215 }, { 118, 166 }, { 117, 136 }, { 114, 109 }, { 109,  80 }, {  99,  54 }, {  75,  37 }, {  44,  40 }, {  25,  61 }, {  17,  88 }, {  13, 115 }, {   9, 156 }, {   7, 203 },
+    { 117, 234 }, { 115, 199 }, { 112, 162 }, {  86,  70 }, {  26, 100 }, {  18, 139 }, {  15, 183 }, {  13, 210 }, {  11, 240 },
+    { 138, 236 }, { 145, 151 }, { 166,  80 }, { 215,  80 }, { 236, 151 }, { 243, 236 }, { 243, 239 }, {   0, 231 }, {  11, 239 }, { 116, 236 }, { 109, 151 }, { 88,  80 }, {  39,  80 }, {  18, 151 }, {  11, 236 }, { 138, 239 }, { 127, 231 }, { 116, 239 }
+};
 #elif defined(RGB_BACKLIGHT_M50_A)
 const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
     // LA0..LA17
@@ -1303,7 +1455,7 @@ void map_led_to_point( uint8_t index, Point *point )
     point->y = pgm_read_byte(addr+1);
 
 #if defined(RGB_BACKLIGHT_M6_B) || defined(RGB_BACKLIGHT_M10_C) || defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_PORTICO) || \
-    defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NEBULA12) || defined(RGB_BACKLIGHT_KW_MEGA)
+    defined(RGB_BACKLIGHT_PORTICO75) || defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NEBULA12) || defined(RGB_BACKLIGHT_KW_MEGA)
     return;
 #endif
 
@@ -1586,6 +1738,15 @@ const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     { 44,    255, 45,     46,     47,     48, 49,     50,     51,     52, 53, 54, 55,     56, 57 },
     { 58,     59, 60,    255,    255,    255, 61,    255,    255,    255, 62, 63, 64,     65, 66 }
 };
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
+    {   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14 },
+    {  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29 },
+    {  30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44 },
+    {  45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57, 255, 255 },
+    {  58,  59,  60,  61,  62,  63,  64,  65,  66,  67,  68,  69,  70, 255, 255 },
+    {  71,  72,  73, 255, 255,  74, 255, 255, 255,  75,  76,  77,  78,  79, 255 }
+};
 #elif defined(RGB_BACKLIGHT_M50_A)
 // LA15, LA14, LA13, LA12, LA11, LA10,  LA9,  LB1,  LB2,  LB3,  LB4,  LB5,  LB6
 // LA16,  LA6,  LA5,  LA4,  LA3,  LA2,  LA1,  LB9, LB10, LB11, LB12, LB13, LB14
@@ -1612,6 +1773,9 @@ void backlight_update_pwm_buffers(void)
 {
 #if defined(RGB_BACKLIGHT_M6_B)
     IS31FL3218_update_pwm_buffers();
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+	IS31FL3741_update_pwm_buffers( ISSI_ADDR_1, 0 );
+    IS31FL3741_update_led_control_registers( ISSI_ADDR_1, 0 );
 #elif defined(RGB_BACKLIGHT_M10_C)
     IS31FL3731_update_pwm_buffers( ISSI_ADDR_1, 0 );
     IS31FL3731_update_led_control_registers( ISSI_ADDR_1, 0 );
@@ -1660,6 +1824,8 @@ void backlight_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
     IS31FL3733_set_color( index, red, green, blue );
 #elif defined (RGB_BACKLIGHT_PORTICO)
     IS31FL3731_set_color( index, red, green, blue );
+#elif defined (RGB_BACKLIGHT_PORTICO75)
+    IS31FL3741_set_color( index, red, green, blue );
 #elif defined(RGB_BACKLIGHT_NK87)
     // This is done to avoid indicator LEDs being set
     if (( index != 63+64-1 ) && ( index != 48+64-1 )) {
@@ -1693,6 +1859,11 @@ void backlight_set_color_all( uint8_t red, uint8_t green, uint8_t blue )
     for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
         IS31FL3731_set_color(i, red, green, blue);
     }
+#elif defined (RGB_BACKLIGHT_PORTICO75)
+    // This is done to avoid indicator LEDs being set
+    for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
+        IS31FL3741_set_color(i, red, green, blue);
+    }
 #elif defined(RGB_BACKLIGHT_NK87)
     // This is done to avoid indicator LEDs being set
     for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
@@ -1933,6 +2104,15 @@ void backlight_effect_alphas_mods(void)
                 {
                     is_alpha = ( column < 16 ) && (( g_config.alphas_mods[row-1] & (1<<column) ) == 0);
                 }
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+                if ( row == 0 )
+                {
+                    is_alpha = ( ( 0b11100000111100001 & (1<<column) ) == 0);
+                }
+                else
+                {
+                    is_alpha = ( column < 16 ) && (( g_config.alphas_mods[row-1] & (1<<column) ) == 0);
+                }
 #else
                 is_alpha = ( g_config.alphas_mods[row] & (1<<column) ) == 0;
 #endif
@@ -2824,6 +3004,15 @@ void backlight_init_drivers(void)
     // This actually updates the LED drivers
     IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
     IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 );
+#elif defined(RGB_BACKLIGHT_PORTICO75)
+    IS31FL3741_init( ISSI_ADDR_1 );
+	bool enabled = true;
+    for ( int index = 0; index < DRIVER_LED_TOTAL; index++ )
+    {
+        IS31FL3741_set_led_control_register( index, enabled, enabled, enabled );
+    }
+    // This actually updates the LED drivers
+    IS31FL3741_update_led_control_registers( ISSI_ADDR_1, 0 );
 #elif defined(RGB_BACKLIGHT_KW_MEGA)
     IS31FL3733_init( ISSI_ADDR_1, 0 );
     IS31FL3733_init( ISSI_ADDR_2, 0 );

From c067d374d7ff0a30b6b729657a1a83cca9e1e42a Mon Sep 17 00:00:00 2001
From: Ian McLinden <ianmclinden@users.noreply.github.com>
Date: Fri, 4 Feb 2022 15:19:12 -0600
Subject: [PATCH 511/867] [Keyboard] Add VIA keymap to AMAG23 (#16206)

---
 keyboards/amag23/keymaps/via/keymap.c | 53 +++++++++++++++++++++++++++
 keyboards/amag23/keymaps/via/rules.mk |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 keyboards/amag23/keymaps/via/keymap.c
 create mode 100644 keyboards/amag23/keymaps/via/rules.mk

diff --git a/keyboards/amag23/keymaps/via/keymap.c b/keyboards/amag23/keymaps/via/keymap.c
new file mode 100644
index 0000000000..aa248a039c
--- /dev/null
+++ b/keyboards/amag23/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2022
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    BASE,
+    FN1,
+    FN2,
+    FN3
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [BASE] = LAYOUT_all(
+      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
+      MO(FN1), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+      KC_LSFT, KC_Z,    KC_X,    KC_C,             KC_SPC
+  ),
+  [FN1] = LAYOUT_all(
+      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
+      _______, RGB_TOG, RGB_VAI, RGB_MOD, RGB_HUI, _______,
+      _______, _______, RGB_VAD, RGB_RMOD,RGB_HUD, _______,
+      _______, _______, _______, _______,          _______
+  ),
+  [FN2] = LAYOUT_all(
+      _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______,          _______
+  ),
+  [FN3] = LAYOUT_all(
+      _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______,          _______
+  ),
+};
+// clang-format on
diff --git a/keyboards/amag23/keymaps/via/rules.mk b/keyboards/amag23/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/amag23/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

From 16d53fa1c7880823788acfc578fb1cb93c0ec477 Mon Sep 17 00:00:00 2001
From: jack <59737601+waffle87@users.noreply.github.com>
Date: Fri, 4 Feb 2022 14:19:46 -0700
Subject: [PATCH 512/867] [Keymap] Fix OLED font path in default Rhymestone
 keymap (#16197)

---
 keyboards/marksard/rhymestone/keymaps/default/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/marksard/rhymestone/keymaps/default/config.h b/keyboards/marksard/rhymestone/keymaps/default/config.h
index 95f2d039b2..224ec53519 100644
--- a/keyboards/marksard/rhymestone/keymaps/default/config.h
+++ b/keyboards/marksard/rhymestone/keymaps/default/config.h
@@ -24,4 +24,4 @@
 // If you plug in the USB on the right side, please enable MASTER_RIGHT
 // #define MASTER_RIGHT
 
-#define OLED_FONT_H "keyboards/rhymestone/common/glcdfont.c"
+#define OLED_FONT_H "keyboards/marksard/rhymestone/common/glcdfont.c"

From 8d5375d08b2666367ea6b1c782f757a544d79942 Mon Sep 17 00:00:00 2001
From: Xelus22 <17491233+Xelus22@users.noreply.github.com>
Date: Sat, 5 Feb 2022 08:22:53 +1100
Subject: [PATCH 513/867] [Bug] fix Pachi RGB Rev2 RGB positioning (#16182)

---
 keyboards/xelus/pachi/rgb/rev2/config.h | 4 ++--
 keyboards/xelus/pachi/rgb/rev2/rev2.c   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h
index b803b2fd2c..a9240da6bb 100644
--- a/keyboards/xelus/pachi/rgb/rev2/config.h
+++ b/keyboards/xelus/pachi/rgb/rev2/config.h
@@ -98,8 +98,8 @@
 #define ENABLE_RGB_MATRIX_HUE_BREATHING
 #define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
 
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
diff --git a/keyboards/xelus/pachi/rgb/rev2/rev2.c b/keyboards/xelus/pachi/rgb/rev2/rev2.c
index b8a7bc2730..f8ca9ec53e 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rev2.c
+++ b/keyboards/xelus/pachi/rgb/rev2/rev2.c
@@ -162,7 +162,7 @@ led_config_t g_led_config = { {
     { NO_LED  , -1+39+3 , -1+65+3 , -1+91+3 , -1+00+1 , -1+26+1 , -1+52+1 , -1+78+1 , NO_LED   },
     { -1+00+4 , -1+26+4 , -1+52+4 , -1+78+4 , -1+104+4, -1+13+2 , -1+39+2 , -1+65+2 , -1+91+2  },
     { -1+13+4 , -1+39+4 , -1+65+4 , -1+91+4 , -1+00+2 , -1+26+2 , -1+52+2 , -1+78+2 , NO_LED   },
-    { -1+00+6 , -1+26+6 , -1+52+6 , -1+78+6 , -1+104+6, -1+13+5 , -1+39+5 , -1+65+5 , -1+91+6  },
+    { -1+00+6 , -1+26+6 , -1+52+6 , -1+78+6 , -1+104+6, -1+13+5 , -1+39+5 , -1+65+5 , -1+91+5  },
     { -1+13+6 , -1+39+6 , -1+65+6 , -1+91+6 , -1+00+5 , -1+26+5 , -1+52+5 , -1+78+5 , NO_LED   },
     { -1+00+8 , -1+26+8 , -1+52+8 , -1+78+8 , -1+104+8, -1+13+7 , NO_LED  , NO_LED  , NO_LED   },
     { -1+13+8 , -1+39+8 , -1+65+8 , -1+91+8 , -1+00+7 , -1+26+7 , -1+52+7 , NO_LED  , NO_LED   },

From f1cd2a5a89454ee11f71bd4c71807e7bb041b202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
Date: Fri, 4 Feb 2022 23:25:57 +0100
Subject: [PATCH 514/867] ChibiOS: add support for HID Programmable Buttons
 (#15787)

* ChibiOS: add support for HID Programmable Buttons

Fixes #15596

* Enable SHARED_ENDPOINT when PROGRAMMABLE_BUTTON is enabled

The Programmable Button driver expects the shared EP to be enabled.
So enforce this invariant.
---
 tmk_core/protocol.mk                 |  5 +++++
 tmk_core/protocol/chibios/chibios.c  |  3 ++-
 tmk_core/protocol/chibios/usb_main.c | 29 ++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
index 31a6de76f1..19fd7d2425 100644
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@@ -28,6 +28,11 @@ ifeq ($(strip $(EXTRAKEY_ENABLE)), yes)
     SHARED_EP_ENABLE = yes
 endif
 
+ifeq ($(strip $(PROGRAMMABLE_BUTTON_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DPROGRAMMABLE_BUTTON_ENABLE
+    SHARED_EP_ENABLE = yes
+endif
+
 ifeq ($(strip $(RAW_ENABLE)), yes)
     TMK_COMMON_DEFS += -DRAW_ENABLE
 endif
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index 41752b2130..b6cff05e9f 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -60,10 +60,11 @@ void    send_keyboard(report_keyboard_t *report);
 void    send_mouse(report_mouse_t *report);
 void    send_system(uint16_t data);
 void    send_consumer(uint16_t data);
+void    send_programmable_button(uint32_t data);
 void    send_digitizer(report_digitizer_t *report);
 
 /* host struct */
-host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer};
+host_driver_t chibios_driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer, send_programmable_button};
 
 #ifdef VIRTSER_ENABLE
 void virtser_task(void);
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 541c44b574..30bfac9f3e 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -975,6 +975,35 @@ void send_consumer(uint16_t data) {
 #endif
 }
 
+void send_programmable_button(uint32_t data) {
+#ifdef PROGRAMMABLE_BUTTON_ENABLE
+    osalSysLock();
+    if (usbGetDriverStateI(&USB_DRIVER) != USB_ACTIVE) {
+        osalSysUnlock();
+        return;
+    }
+
+    if (usbGetTransmitStatusI(&USB_DRIVER, SHARED_IN_EPNUM)) {
+        /* Need to either suspend, or loop and call unlock/lock during
+         * every iteration - otherwise the system will remain locked,
+         * no interrupts served, so USB not going through as well.
+         * Note: for suspend, need USB_USE_WAIT == TRUE in halconf.h */
+        if (osalThreadSuspendTimeoutS(&(&USB_DRIVER)->epc[SHARED_IN_EPNUM]->in_state->thread, TIME_MS2I(10)) == MSG_TIMEOUT) {
+            osalSysUnlock();
+            return;
+        }
+    }
+    static report_programmable_button_t report = {
+        .report_id = REPORT_ID_PROGRAMMABLE_BUTTON,
+    };
+
+    report.usage = data;
+
+    usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)&report, sizeof(report));
+    osalSysUnlock();
+#endif
+}
+
 void send_digitizer(report_digitizer_t *report) {
 #ifdef DIGITIZER_ENABLE
 #    ifdef DIGITIZER_SHARED_EP

From f8376d2a3722731bf37ae6f945bc37dd82b68667 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 4 Feb 2022 15:08:23 -0800
Subject: [PATCH 515/867] Bathroom Epiphanies Ghost Squid: add QMK Configurator
 data (#16212)

---
 keyboards/bpiphany/ghost_squid/info.json | 121 +++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 keyboards/bpiphany/ghost_squid/info.json

diff --git a/keyboards/bpiphany/ghost_squid/info.json b/keyboards/bpiphany/ghost_squid/info.json
new file mode 100644
index 0000000000..698e3c21de
--- /dev/null
+++ b/keyboards/bpiphany/ghost_squid/info.json
@@ -0,0 +1,121 @@
+{
+    "keyboard_name": "Bathroom Epiphanies Ghost Squid",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"Print Screen,", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Ins", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+                {"label":"Num Lock", "x":18.5, "y":1.25},
+                {"label":"/", "x":19.5, "y":1.25},
+                {"label":"*", "x":20.5, "y":1.25},
+                {"label":"-", "x":21.5, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page DownDN", "x":17.25, "y":2.25},
+                {"label":"7", "x":18.5, "y":2.25},
+                {"label":"8", "x":19.5, "y":2.25},
+                {"label":"9", "x":20.5, "y":2.25},
+                {"label":"+", "x":21.5, "y":2.25, "h": 2},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label":"4", "x":18.5, "y":3.25},
+                {"label":"5", "x":19.5, "y":3.25},
+                {"label":"6", "x":20.5, "y":3.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+                {"label":"1", "x":18.5, "y":4.25},
+                {"label":"2", "x":19.5, "y":4.25},
+                {"label":"3", "x":20.5, "y":4.25},
+                {"label":"Enter", "x":21.5, "y":4.25, "h":2},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Fn", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25},
+                {"label":"0", "x":18.5, "y":5.25, "w":2},
+                {"label":".", "x":20.5, "y":5.25}
+            ]
+        }
+    }
+}

From e987ce16525137efb50ce02a6552384851b49f88 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 5 Feb 2022 12:32:31 +1100
Subject: [PATCH 516/867] Standardise error output. (#16220)

---
 build_keyboard.mk       |  2 +-
 build_layout.mk         |  2 +-
 builddefs/bootloader.mk |  2 +-
 builddefs/message.mk    |  5 +++++
 common_features.mk      | 28 ++++++++++++++--------------
 5 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/build_keyboard.mk b/build_keyboard.mk
index 80c295d9be..f727760465 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -140,7 +140,7 @@ ifeq ("$(wildcard $(KEYMAP_PATH))", "")
         # If we haven't found a keymap yet fall back to community layouts
         include build_layout.mk
     else
-        $(error Could not find keymap)
+        $(call CATASTROPHIC_ERROR,Invalid keymap,Could not find keymap)
         # this state should never be reached
     endif
 endif
diff --git a/build_layout.mk b/build_layout.mk
index b4b00793ea..6166bd847c 100644
--- a/build_layout.mk
+++ b/build_layout.mk
@@ -25,7 +25,7 @@ ifneq ($(FORCE_LAYOUT),)
         $(info Forcing layout: $(FORCE_LAYOUT))
         LAYOUTS := $(FORCE_LAYOUT)
     else
-        $(error Forced layout does not exist)
+        $(call CATASTROPHIC_ERROR,Invalid layout,Forced layout does not exist)
     endif
 endif
 
diff --git a/builddefs/bootloader.mk b/builddefs/bootloader.mk
index 56ef7ff5d8..226213297e 100644
--- a/builddefs/bootloader.mk
+++ b/builddefs/bootloader.mk
@@ -204,5 +204,5 @@ ifeq ($(strip $(BOOTLOADER)), md-boot)
 endif
 
 ifeq ($(strip $(BOOTLOADER_TYPE)),)
-    $(error No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file)
+    $(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,No bootloader specified. Please set an appropriate 'BOOTLOADER' in your keyboard's 'rules.mk' file.)
 endif
diff --git a/builddefs/message.mk b/builddefs/message.mk
index 1187491452..d441f560be 100644
--- a/builddefs/message.mk
+++ b/builddefs/message.mk
@@ -101,3 +101,8 @@ MSG_FLASH_ARCH = $(WARN_COLOR)WARNING:$(NO_COLOR) This board's architecture is n
 MSG_BOOTLOADER_NOT_FOUND = $(ERROR_COLOR)ERROR:$(NO_COLOR) $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying again in 5s (Ctrl+C to cancel)\n
 BOOTLOADER_RETRY_TIME ?= 0.5
 MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY = $(MSG_BOOTLOADER_NOT_FOUND_BASE) Trying again every $(BOOTLOADER_RETRY_TIME)s (Ctrl+C to cancel)
+
+define CATASTROPHIC_ERROR
+    $(shell printf "\n * %-99s $(ERROR_STRING)\n" "$2" >&2)
+    $(error $1)
+endef
\ No newline at end of file
diff --git a/common_features.mk b/common_features.mk
index 5c5e6a9a25..7b1ee2e742 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -112,7 +112,7 @@ VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_p
 POINTING_DEVICE_DRIVER ?= custom
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     ifeq ($(filter $(POINTING_DEVICE_DRIVER),$(VALID_POINTING_DEVICE_DRIVER_TYPES)),)
-        $(error POINTING_DEVICE_DRIVER="$(POINTING_DEVICE_DRIVER)" is not a valid pointing device type)
+        $(call CATASTROPHIC_ERROR,Invalid POINTING_DEVICE_DRIVER,POINTING_DEVICE_DRIVER="$(POINTING_DEVICE_DRIVER)" is not a valid pointing device type)
     else
         OPT_DEFS += -DPOINTING_DEVICE_ENABLE
         MOUSE_ENABLE := yes
@@ -153,7 +153,7 @@ endif
 VALID_EEPROM_DRIVER_TYPES := vendor custom transient i2c spi
 EEPROM_DRIVER ?= vendor
 ifeq ($(filter $(EEPROM_DRIVER),$(VALID_EEPROM_DRIVER_TYPES)),)
-  $(error EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
+  $(call CATASTROPHIC_ERROR,Invalid EEPROM_DRIVER,EEPROM_DRIVER="$(EEPROM_DRIVER)" is not a valid EEPROM driver)
 else
   OPT_DEFS += -DEEPROM_ENABLE
   ifeq ($(strip $(EEPROM_DRIVER)), custom)
@@ -231,7 +231,7 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
     RGBLIGHT_DRIVER ?= WS2812
 
     ifeq ($(filter $(RGBLIGHT_DRIVER),$(VALID_RGBLIGHT_TYPES)),)
-        $(error RGBLIGHT_DRIVER="$(RGBLIGHT_DRIVER)" is not a valid RGB type)
+        $(call CATASTROPHIC_ERROR,Invalid RGBLIGHT_DRIVER,RGBLIGHT_DRIVER="$(RGBLIGHT_DRIVER)" is not a valid RGB type)
     else
         COMMON_VPATH += $(QUANTUM_DIR)/rgblight
         POST_CONFIG_H += $(QUANTUM_DIR)/rgblight/rgblight_post_config.h
@@ -261,7 +261,7 @@ VALID_LED_MATRIX_TYPES := IS31FL3731 custom
 
 ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
     ifeq ($(filter $(LED_MATRIX_DRIVER),$(VALID_LED_MATRIX_TYPES)),)
-        $(error "$(LED_MATRIX_DRIVER)" is not a valid matrix type)
+        $(call CATASTROPHIC_ERROR,Invalid LED_MATRIX_DRIVER,LED_MATRIX_DRIVER="$(LED_MATRIX_DRIVER)" is not a valid matrix type)
     endif
     OPT_DEFS += -DLED_MATRIX_ENABLE
 ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162))
@@ -290,7 +290,7 @@ VALID_RGB_MATRIX_TYPES := AW20216 IS31FL3731 IS31FL3733 IS31FL3737 IS31FL3741 CK
 
 ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
     ifeq ($(filter $(RGB_MATRIX_DRIVER),$(VALID_RGB_MATRIX_TYPES)),)
-        $(error "$(RGB_MATRIX_DRIVER)" is not a valid matrix type)
+        $(call CATASTROPHIC_ERROR,Invalid RGB_MATRIX_DRIVER,RGB_MATRIX_DRIVER="$(RGB_MATRIX_DRIVER)" is not a valid matrix type)
     endif
     OPT_DEFS += -DRGB_MATRIX_ENABLE
 ifneq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162))
@@ -404,7 +404,7 @@ else
 endif
 ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
     ifeq ($(filter $(BACKLIGHT_DRIVER),$(VALID_BACKLIGHT_TYPES)),)
-        $(error BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)
+        $(call CATASTROPHIC_ERROR,Invalid BACKLIGHT_DRIVER,BACKLIGHT_DRIVER="$(BACKLIGHT_DRIVER)" is not a valid backlight type)
     endif
 
     COMMON_VPATH += $(QUANTUM_DIR)/backlight
@@ -429,7 +429,7 @@ VALID_WS2812_DRIVER_TYPES := bitbang pwm spi i2c
 WS2812_DRIVER ?= bitbang
 ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes)
     ifeq ($(filter $(WS2812_DRIVER),$(VALID_WS2812_DRIVER_TYPES)),)
-        $(error WS2812_DRIVER="$(WS2812_DRIVER)" is not a valid WS2812 driver)
+        $(call CATASTROPHIC_ERROR,Invalid WS2812_DRIVER,WS2812_DRIVER="$(WS2812_DRIVER)" is not a valid WS2812 driver)
     endif
 
     OPT_DEFS += -DWS2812_DRIVER_$(strip $(shell echo $(WS2812_DRIVER) | tr '[:lower:]' '[:upper:]'))
@@ -484,7 +484,7 @@ VALID_MAGIC_TYPES := yes
 BOOTMAGIC_ENABLE ?= no
 ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)
   ifeq ($(filter $(BOOTMAGIC_ENABLE),$(VALID_MAGIC_TYPES)),)
-    $(error BOOTMAGIC_ENABLE="$(BOOTMAGIC_ENABLE)" is not a valid type of magic)
+    $(call CATASTROPHIC_ERROR,Invalid BOOTMAGIC_ENABLE,BOOTMAGIC_ENABLE="$(BOOTMAGIC_ENABLE)" is not a valid type of magic)
   endif
   ifneq ($(strip $(BOOTMAGIC_ENABLE)), no)
       OPT_DEFS += -DBOOTMAGIC_LITE
@@ -500,7 +500,7 @@ CUSTOM_MATRIX ?= no
 
 ifneq ($(strip $(CUSTOM_MATRIX)), yes)
     ifeq ($(filter $(CUSTOM_MATRIX),$(VALID_CUSTOM_MATRIX_TYPES)),)
-        $(error CUSTOM_MATRIX="$(CUSTOM_MATRIX)" is not a valid custom matrix type)
+        $(call CATASTROPHIC_ERROR,Invalid CUSTOM_MATRIX,CUSTOM_MATRIX="$(CUSTOM_MATRIX)" is not a valid custom matrix type)
     endif
 
     # Include common stuff for all non custom matrix users
@@ -583,7 +583,7 @@ VALID_OLED_DRIVER_TYPES := SSD1306 custom
 OLED_DRIVER ?= SSD1306
 ifeq ($(strip $(OLED_ENABLE)), yes)
     ifeq ($(filter $(OLED_DRIVER),$(VALID_OLED_DRIVER_TYPES)),)
-        $(error OLED_DRIVER="$(OLED_DRIVER)" is not a valid OLED driver)
+        $(call CATASTROPHIC_ERROR,Invalid OLED_DRIVER,OLED_DRIVER="$(OLED_DRIVER)" is not a valid OLED driver)
     else
         OPT_DEFS += -DOLED_ENABLE
         COMMON_VPATH += $(DRIVER_PATH)/oled
@@ -680,7 +680,7 @@ VALID_JOYSTICK_TYPES := analog digital
 JOYSTICK_DRIVER ?= analog
 ifeq ($(strip $(JOYSTICK_ENABLE)), yes)
     ifeq ($(filter $(JOYSTICK_DRIVER),$(VALID_JOYSTICK_TYPES)),)
-        $(error "$(JOYSTICK_DRIVER)" is not a valid joystick driver)
+        $(call CATASTROPHIC_ERROR,Invalid JOYSTICK_DRIVER,JOYSTICK_DRIVER="$(JOYSTICK_DRIVER)" is not a valid joystick driver)
     endif
     OPT_DEFS += -DJOYSTICK_ENABLE
     SRC += $(QUANTUM_DIR)/process_keycode/process_joystick.c
@@ -700,7 +700,7 @@ VALID_USBPD_DRIVER_TYPES = custom vendor
 USBPD_DRIVER ?= vendor
 ifeq ($(strip $(USBPD_ENABLE)), yes)
     ifeq ($(filter $(strip $(USBPD_DRIVER)),$(VALID_USBPD_DRIVER_TYPES)),)
-        $(error USBPD_DRIVER="$(USBPD_DRIVER)" is not a valid USBPD driver)
+        $(call CATASTROPHIC_ERROR,Invalid USBPD_DRIVER,USBPD_DRIVER="$(USBPD_DRIVER)" is not a valid USBPD driver)
     else
         OPT_DEFS += -DUSBPD_ENABLE
         ifeq ($(strip $(USBPD_DRIVER)), vendor)
@@ -710,7 +710,7 @@ ifeq ($(strip $(USBPD_ENABLE)), yes)
                 OPT_DEFS += -DUSBPD_STM32G4
                 SRC += usbpd_stm32g4.c
             else
-                $(error There is no vendor-provided USBPD driver available)
+                $(call CATASTROPHIC_ERROR,Invalid USBPD_DRIVER,There is no vendor-provided USBPD driver available)
             endif
         else ifeq ($(strip $(USBPD_DRIVER)), custom)
             OPT_DEFS += -DUSBPD_CUSTOM
@@ -723,7 +723,7 @@ BLUETOOTH_ENABLE ?= no
 VALID_BLUETOOTH_DRIVER_TYPES := BluefruitLE RN42 custom
 ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
     ifeq ($(filter $(strip $(BLUETOOTH_DRIVER)),$(VALID_BLUETOOTH_DRIVER_TYPES)),)
-        $(error "$(BLUETOOTH_DRIVER)" is not a valid Bluetooth driver type)
+        $(call CATASTROPHIC_ERROR,Invalid BLUETOOTH_DRIVER,BLUETOOTH_DRIVER="$(BLUETOOTH_DRIVER)" is not a valid Bluetooth driver type)
     endif
     OPT_DEFS += -DBLUETOOTH_ENABLE
     NO_USB_STARTUP_CHECK := yes

From 904d5f14f5bb257960c0ca13aac605b029bbb18f Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 4 Feb 2022 17:50:27 -0800
Subject: [PATCH 517/867] Studio Kestra Galatea: add  (#16218)

---
 keyboards/studiokestra/galatea/rev1/info.json | 197 +++++++++++++++++-
 keyboards/studiokestra/galatea/rev1/rev1.h    | 117 ++++++++---
 keyboards/studiokestra/galatea/rev2/info.json | 197 +++++++++++++++++-
 keyboards/studiokestra/galatea/rev2/rev2.h    | 117 ++++++++---
 4 files changed, 576 insertions(+), 52 deletions(-)

diff --git a/keyboards/studiokestra/galatea/rev1/info.json b/keyboards/studiokestra/galatea/rev1/info.json
index 046ba89dc8..e3f31198fe 100644
--- a/keyboards/studiokestra/galatea/rev1/info.json
+++ b/keyboards/studiokestra/galatea/rev1/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Galatea",
     "url": "https://studiokestra.ca/galatea",
-    "maintainer": "Studio Kestra",
+    "maintainer": "studiokestra",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -108,6 +108,201 @@
                 {"x": 16.25, "y": 5.25},
                 {"x": 17.25, "y": 5.25}
             ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2\"", "x":2, "y":1.25},
+                {"label":"3\u00a3", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'@", "x":11.75, "y":3.25},
+                {"label":"#~", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/studiokestra/galatea/rev1/rev1.h b/keyboards/studiokestra/galatea/rev1/rev1.h
index d393711292..55aed02db8 100644
--- a/keyboards/studiokestra/galatea/rev1/rev1.h
+++ b/keyboards/studiokestra/galatea/rev1/rev1.h
@@ -18,32 +18,99 @@
 
 #include "quantum.h"
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+#define ___ KC_NO
+
+/*
+ *              ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ *              │00 │   │01 │02 │12 │03 │ │13 │04 │14 │05 │ │15 │06 │16 │07 │ │17 │08 │18 │ Standard
+ *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ *              ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+ *              │00 ││10 │01 │02 │12 ││03 │13 │04 │14 ││05 │15 │06 │16 ││07 │ │17 │08 │18 │ F13
+ *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐      ┌───────┐
+ *              │20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │27 │ │37 │28 │38 │      │36     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
+ *              │40   │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │47   │ │57 │48 │58 │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴┐47  │ ISO Enter
+ *  LShift      │60    │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66      │                   │66 │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐       ┌─┴───┴────┤
+ * │80      │   │80  │90 │81 │91 │82 │92 │83 │93 │84 │94 │85 │95 │86    │87 │     │88 │       │86        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐   └──────────┘
+ *              │A0  │B0  │A1  │A3                      │A5  │B5  │A6  │A7  │ │B7 │A8 │B8 │
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │A0   │B0 │A1   │A3                         │B5   │A6 │A7   │ Tsangan/WKL
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ *              ┌────┬────┬───────────────────────────────────────┬────┬────┐
+ *              │A0  │B0  │A3                                     │A6  │A7  │ WK 10u Space
+ *              └────┴────┴───────────────────────────────────────┴────┴────┘
+ *              ┌─────┐   ┌───────────────────────────────────────┐   ┌─────┐
+ *              │A0   │   │A3                                     │   │A7   │ WKL 10u Space
+ *              └─────┘   └───────────────────────────────────────┘   └─────┘
  */
+
 #define LAYOUT_all(\
-    k0000, k0100,        k0001, k0002, k0102, k0003, k0103, k0004, k0104, k0005, k0105, k0006, k0106, k0007,    k0107, k0008, k0108, \
-    k0200, k0300, k0201, k0301, k0202, k0302, k0203, k0303, k0204, k0304, k0205, k0305, k0206, k0306, k0207,    k0307, k0208, k0308, \
-    k0400, k0500, k0401, k0501, k0402, k0502, k0403, k0503, k0404, k0504, k0405, k0505, k0406,        k0407,    k0507, k0408, k0508, \
-    k0600, k0700, k0601, k0701, k0602, k0702, k0603, k0703, k0604, k0704, k0605, k0705, k0606,                                       \
-    k0800, k0900, k0801, k0901, k0802, k0902, k0803, k0903, k0804, k0904, k0805, k0905, k0806,        k0807,           k0808,        \
-    k1000, k1100, k1001,                      k1003,                      k1005, k1105, k1006,        k1007,    k1107, k1008, k1108  \
+    k00, k10,      k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,   k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,      k47,   k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66,                            \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,      k87,        k88,      \
+    kA0, kB0, kA1,                kA3,                     kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
 ) { \
-    { k0000,  k0001,  k0002,  k0003,  k0004,  k0005,  k0006,  k0007,  k0008 }, \
-    { k0100,  KC_NO,  k0102,  k0103,  k0104,  k0105,  k0106,  k0107,  k0108 }, \
-    { k0200,  k0201,  k0202,  k0203,  k0204,  k0205,  k0206,  k0207,  k0208 }, \
-    { k0300,  k0301,  k0302,  k0303,  k0304,  k0305,  k0306,  k0307,  k0308 }, \
-    { k0400,  k0401,  k0402,  k0403,  k0404,  k0405,  k0406,  k0407,  k0408 }, \
-    { k0500,  k0501,  k0502,  k0503,  k0504,  k0505,  KC_NO,  k0507,  k0508 }, \
-    { k0600,  k0601,  k0602,  k0603,  k0604,  k0605,  k0606,  KC_NO,  KC_NO }, \
-    { k0700,  k0701,  k0702,  k0703,  k0704,  k0705,  KC_NO,  KC_NO,  KC_NO }, \
-    { k0800,  k0801,  k0802,  k0803,  k0804,  k0805,  k0806,  k0807,  k0808 }, \
-    { k0900,  k0901,  k0902,  k0903,  k0904,  k0905,  KC_NO,  KC_NO,  KC_NO }, \
-    { k1000,  k1001,  KC_NO,  k1003,  KC_NO,  k1005,  k1006,  k1007,  k1008 }, \
-    { k1100,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  k1105,  KC_NO,  k1107,  k1108 } \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, ___, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, ___, ___ }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
+    { k90, k91, k92, k93, k94, k95, ___, ___, ___ }, \
+    { kA0, kA1, ___, kA3, ___, kA5, kA6, kA7, kA8 }, \
+    { kB0, ___, ___, ___, ___, kB5, ___, kB7, kB8 }  \
+}
+
+#define LAYOUT_tkl_f13_ansi(\
+    k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,   k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47,   k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75,      k66,                  \
+    k80,      k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86,        k88,      \
+    kA0, kB0, kA1,                kA3,                kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, ___, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, ___, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, ___, ___ }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, ___, k88 }, \
+    { ___, k91, k92, k93, k94, k95, ___, ___, ___ }, \
+    { kA0, kA1, ___, kA3, ___, kA5, kA6, kA7, kA8 }, \
+    { kB0, ___, ___, ___, ___, kB5, ___, kB7, kB8 }  \
+}
+
+#define LAYOUT_tkl_f13_iso(\
+    k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,   k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,        k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k47, k66,                  \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86,        k88,      \
+    kA0, kB0, kA1,                kA3,                kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, ___, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, ___, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, ___, ___ }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, ___, k88 }, \
+    { k90, k91, k92, k93, k94, k95, ___, ___, ___ }, \
+    { kA0, kA1, ___, kA3, ___, kA5, kA6, kA7, kA8 }, \
+    { kB0, ___, ___, ___, ___, kB5, ___, kB7, kB8 }  \
 }
diff --git a/keyboards/studiokestra/galatea/rev2/info.json b/keyboards/studiokestra/galatea/rev2/info.json
index 046ba89dc8..e3f31198fe 100644
--- a/keyboards/studiokestra/galatea/rev2/info.json
+++ b/keyboards/studiokestra/galatea/rev2/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Galatea",
     "url": "https://studiokestra.ca/galatea",
-    "maintainer": "Studio Kestra",
+    "maintainer": "studiokestra",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
@@ -108,6 +108,201 @@
                 {"x": 16.25, "y": 5.25},
                 {"x": 17.25, "y": 5.25}
             ]
+        },
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2@", "x":2, "y":1.25},
+                {"label":"3#", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"\\|", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'\"", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_tkl_f13_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"F13", "x":14, "y":0},
+                {"label":"Print Screen", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+
+                {"label":"`~", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2\"", "x":2, "y":1.25},
+                {"label":"3\u00a3", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":7, "y":1.25},
+                {"label":"8*", "x":8, "y":1.25},
+                {"label":"9(", "x":9, "y":1.25},
+                {"label":"0)", "x":10, "y":1.25},
+                {"label":"-_", "x":11, "y":1.25},
+                {"label":"=+", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.25},
+                {"label":"Home", "x":16.25, "y":1.25},
+                {"label":"Page Up", "x":17.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[{", "x":11.5, "y":2.25},
+                {"label":"]}", "x":12.5, "y":2.25},
+                {"label":"Delete", "x":15.25, "y":2.25},
+                {"label":"End", "x":16.25, "y":2.25},
+                {"label":"Page Down", "x":17.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";:", "x":10.75, "y":3.25},
+                {"label":"'@", "x":11.75, "y":3.25},
+                {"label":"#~", "x":12.75, "y":3.25},
+                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",<", "x":9.25, "y":4.25},
+                {"label":".>", "x":10.25, "y":4.25},
+                {"label":"/?", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
+                {"label":"\u2191", "x":16.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
+                {"label":"GUI", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"\u2190", "x":15.25, "y":5.25},
+                {"label":"\u2193", "x":16.25, "y":5.25},
+                {"label":"\u2192", "x":17.25, "y":5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/studiokestra/galatea/rev2/rev2.h b/keyboards/studiokestra/galatea/rev2/rev2.h
index d393711292..55aed02db8 100644
--- a/keyboards/studiokestra/galatea/rev2/rev2.h
+++ b/keyboards/studiokestra/galatea/rev2/rev2.h
@@ -18,32 +18,99 @@
 
 #include "quantum.h"
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+#define ___ KC_NO
+
+/*
+ *              ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ *              │00 │   │01 │02 │12 │03 │ │13 │04 │14 │05 │ │15 │06 │16 │07 │ │17 │08 │18 │ Standard
+ *              └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ *              ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┐
+ *              │00 ││10 │01 │02 │12 ││03 │13 │04 │14 ││05 │15 │06 │16 ││07 │ │17 │08 │18 │ F13
+ *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐      ┌───────┐
+ *              │20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │27 │ │37 │28 │38 │      │36     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤      └─┬─────┤
+ *              │40   │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │47   │ │57 │48 │58 │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘     ┌──┴┐47  │ ISO Enter
+ *  LShift      │60    │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66      │                   │66 │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐       ┌─┴───┴────┤
+ * │80      │   │80  │90 │81 │91 │82 │92 │83 │93 │84 │94 │85 │95 │86    │87 │     │88 │       │86        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐   └──────────┘
+ *              │A0  │B0  │A1  │A3                      │A5  │B5  │A6  │A7  │ │B7 │A8 │B8 │
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │A0   │B0 │A1   │A3                         │B5   │A6 │A7   │ Tsangan/WKL
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ *              ┌────┬────┬───────────────────────────────────────┬────┬────┐
+ *              │A0  │B0  │A3                                     │A6  │A7  │ WK 10u Space
+ *              └────┴────┴───────────────────────────────────────┴────┴────┘
+ *              ┌─────┐   ┌───────────────────────────────────────┐   ┌─────┐
+ *              │A0   │   │A3                                     │   │A7   │ WKL 10u Space
+ *              └─────┘   └───────────────────────────────────────┘   └─────┘
  */
+
 #define LAYOUT_all(\
-    k0000, k0100,        k0001, k0002, k0102, k0003, k0103, k0004, k0104, k0005, k0105, k0006, k0106, k0007,    k0107, k0008, k0108, \
-    k0200, k0300, k0201, k0301, k0202, k0302, k0203, k0303, k0204, k0304, k0205, k0305, k0206, k0306, k0207,    k0307, k0208, k0308, \
-    k0400, k0500, k0401, k0501, k0402, k0502, k0403, k0503, k0404, k0504, k0405, k0505, k0406,        k0407,    k0507, k0408, k0508, \
-    k0600, k0700, k0601, k0701, k0602, k0702, k0603, k0703, k0604, k0704, k0605, k0705, k0606,                                       \
-    k0800, k0900, k0801, k0901, k0802, k0902, k0803, k0903, k0804, k0904, k0805, k0905, k0806,        k0807,           k0808,        \
-    k1000, k1100, k1001,                      k1003,                      k1005, k1105, k1006,        k1007,    k1107, k1008, k1108  \
+    k00, k10,      k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,   k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,      k47,   k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66,                            \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,      k87,        k88,      \
+    kA0, kB0, kA1,                kA3,                     kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
 ) { \
-    { k0000,  k0001,  k0002,  k0003,  k0004,  k0005,  k0006,  k0007,  k0008 }, \
-    { k0100,  KC_NO,  k0102,  k0103,  k0104,  k0105,  k0106,  k0107,  k0108 }, \
-    { k0200,  k0201,  k0202,  k0203,  k0204,  k0205,  k0206,  k0207,  k0208 }, \
-    { k0300,  k0301,  k0302,  k0303,  k0304,  k0305,  k0306,  k0307,  k0308 }, \
-    { k0400,  k0401,  k0402,  k0403,  k0404,  k0405,  k0406,  k0407,  k0408 }, \
-    { k0500,  k0501,  k0502,  k0503,  k0504,  k0505,  KC_NO,  k0507,  k0508 }, \
-    { k0600,  k0601,  k0602,  k0603,  k0604,  k0605,  k0606,  KC_NO,  KC_NO }, \
-    { k0700,  k0701,  k0702,  k0703,  k0704,  k0705,  KC_NO,  KC_NO,  KC_NO }, \
-    { k0800,  k0801,  k0802,  k0803,  k0804,  k0805,  k0806,  k0807,  k0808 }, \
-    { k0900,  k0901,  k0902,  k0903,  k0904,  k0905,  KC_NO,  KC_NO,  KC_NO }, \
-    { k1000,  k1001,  KC_NO,  k1003,  KC_NO,  k1005,  k1006,  k1007,  k1008 }, \
-    { k1100,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  k1105,  KC_NO,  k1107,  k1108 } \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, ___, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, ___, ___ }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
+    { k90, k91, k92, k93, k94, k95, ___, ___, ___ }, \
+    { kA0, kA1, ___, kA3, ___, kA5, kA6, kA7, kA8 }, \
+    { kB0, ___, ___, ___, ___, kB5, ___, kB7, kB8 }  \
+}
+
+#define LAYOUT_tkl_f13_ansi(\
+    k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,   k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47,   k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75,      k66,                  \
+    k80,      k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86,        k88,      \
+    kA0, kB0, kA1,                kA3,                kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, ___, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, ___, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, ___, ___ }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, ___, k88 }, \
+    { ___, k91, k92, k93, k94, k95, ___, ___, ___ }, \
+    { kA0, kA1, ___, kA3, ___, kA5, kA6, kA7, kA8 }, \
+    { kB0, ___, ___, ___, ___, kB5, ___, kB7, kB8 }  \
+}
+
+#define LAYOUT_tkl_f13_iso(\
+    k00, k10, k01, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07,   k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,   k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,        k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k47, k66,                  \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86,        k88,      \
+    kA0, kB0, kA1,                kA3,                kA5, kB5, kA6, kA7,   kB7, kA8, kB8  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, ___, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, ___, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, ___, ___ }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, ___, k88 }, \
+    { k90, k91, k92, k93, k94, k95, ___, ___, ___ }, \
+    { kA0, kA1, ___, kA3, ___, kA5, kA6, kA7, kA8 }, \
+    { kB0, ___, ___, ___, ___, kB5, ___, kB7, kB8 }  \
 }

From d31dd6d2a0b226193439696a8483edfaacf00450 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 5 Feb 2022 12:51:23 +1100
Subject: [PATCH 518/867] Followup to #16220, more test error output. (#16221)

---
 platforms/avr/platform.mk     | 2 +-
 platforms/chibios/platform.mk | 2 +-
 testlist.mk                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platforms/avr/platform.mk b/platforms/avr/platform.mk
index b45108736f..4d9cafaeef 100644
--- a/platforms/avr/platform.mk
+++ b/platforms/avr/platform.mk
@@ -159,7 +159,7 @@ endif
 
 bootloader:
 ifeq ($(strip $(QMK_BOOTLOADER_TYPE)),)
-	$(error Please set BOOTLOADER to "qmk-dfu" or "qmk-hid" first!)
+	$(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,Please set BOOTLOADER to "qmk-dfu" or "qmk-hid" first!)
 else
 	make -C lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/ clean
 	$(QMK_BIN) generate-dfu-header --quiet --keyboard $(KEYBOARD) --output lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/Keyboard.h
diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk
index 45e3377882..6fd1fd83f5 100644
--- a/platforms/chibios/platform.mk
+++ b/platforms/chibios/platform.mk
@@ -344,7 +344,7 @@ ifeq ($(strip $(MCU)), risc-v)
             ifneq ($(shell which riscv64-unknown-elf-gcc 2>/dev/null),)
                 TOOLCHAIN = riscv64-unknown-elf-
             else
-                $(error "No RISC-V toolchain found. Can't find riscv32-unknown-elf-gcc or riscv64-unknown-elf-gcc found in your systems PATH variable. Please install a valid toolchain and make it accessible!")
+                $(call CATASTROPHIC_ERROR,Missing toolchain,No RISC-V toolchain found. Can't find riscv32-unknown-elf-gcc or riscv64-unknown-elf-gcc found in your systems PATH variable. Please install a valid toolchain and make it accessible!)
             endif
         endif
     endif
diff --git a/testlist.mk b/testlist.mk
index 904485c15c..86da5668ac 100644
--- a/testlist.mk
+++ b/testlist.mk
@@ -8,7 +8,7 @@ include $(PLATFORM_PATH)/test/testlist.mk
 define VALIDATE_TEST_LIST
     ifneq ($1,)
         ifeq ($$(findstring -,$1),-)
-            $$(error Test names can't contain '-', but '$1' does)
+            $$(call CATASTROPHIC_ERROR,Invalid test name,Test names can't contain '-', but '$1' does.)
         else
             $$(eval $$(call VALIDATE_TEST_LIST,$$(firstword $2),$$(wordlist 2,9999,$2)))
         endif

From 1febea8d4b18f87844618492d43aefc5c22c8174 Mon Sep 17 00:00:00 2001
From: Lalit Maganti <lalitmaganti@gmail.com>
Date: Sat, 5 Feb 2022 01:59:08 +0000
Subject: [PATCH 519/867] [Keymap] add LalitMaganti GMMK Pro Keymap (#16203)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 .../pro/ansi/keymaps/lalitmaganti/config.h    | 19 ++++
 .../pro/ansi/keymaps/lalitmaganti/keymap.c    | 91 +++++++++++++++++++
 .../pro/ansi/keymaps/lalitmaganti/rules.mk    |  1 +
 3 files changed, 111 insertions(+)
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/config.h
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/keymap.c
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/rules.mk

diff --git a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/config.h b/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/config.h
new file mode 100644
index 0000000000..74c018f7f1
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 Lalit Maganti
+
+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 RGB_DISABLE_WHEN_USB_SUSPENDED
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/keymap.c
new file mode 100644
index 0000000000..7bedf05987
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/keymap.c
@@ -0,0 +1,91 @@
+/* Copyright 2021 Lalit Maganti
+
+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
+
+#ifdef PROGRAMMABLE_BUTTON_ENABLE
+#define L1_NUM1 PROGRAMMABLE_BUTTON_1
+#define L1_NUM2 PROGRAMMABLE_BUTTON_2
+#define L1_NUM3 PROGRAMMABLE_BUTTON_3
+#define L1_NUM4 PROGRAMMABLE_BUTTON_4
+#define L1_NUM5 PROGRAMMABLE_BUTTON_5
+#define L1_NUM6 PROGRAMMABLE_BUTTON_6
+#define L1_NUM7 PROGRAMMABLE_BUTTON_7
+#define L1_NUM8 PROGRAMMABLE_BUTTON_8
+#define L1_NUM9 PROGRAMMABLE_BUTTON_9
+#else
+#define L1_NUM1 _______
+#define L1_NUM2 _______
+#define L1_NUM3 _______
+#define L1_NUM4 _______
+#define L1_NUM5 _______
+#define L1_NUM6 _______
+#define L1_NUM7 _______
+#define L1_NUM8 _______
+#define L1_NUM9 _______
+#endif
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,           KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_END,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        _______, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24, RGB_TOG,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    ),
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+      tap_code_delay(KC_VOLU, 10);
+    } else {
+      tap_code_delay(KC_VOLD, 10);
+    }
+    return false;
+}
+
+
+#ifdef RGB_MATRIX_ENABLE
+
+static void set_rgb_side_leds(void);
+
+static void set_rgb_side_leds() {
+    rgb_matrix_set_color(67, RGB_WHITE); // Left side LED 1
+    rgb_matrix_set_color(68, RGB_WHITE); // Right side LED 1
+    rgb_matrix_set_color(91, RGB_WHITE); // Left side LED 8
+    rgb_matrix_set_color(92, RGB_WHITE); // Right side LED 8
+}
+
+void rgb_matrix_indicators_user() {
+    rgb_matrix_set_color_all(0x0, 0x0, 0x0);
+    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+        rgb_matrix_set_color(3, RGB_WHITE); // CAPS
+    }
+    set_rgb_side_leds();
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/rules.mk
new file mode 100644
index 0000000000..0a5b666e85
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/rules.mk
@@ -0,0 +1 @@
+MOUSEKEY_ENABLE = no

From 719881c2ee2b61b15ed02d82c2870f7ae93e70e5 Mon Sep 17 00:00:00 2001
From: Kyrre Havik <Kyrremann@gmail.com>
Date: Sat, 5 Feb 2022 04:06:49 +0100
Subject: [PATCH 520/867] [Keyboard] Add Xenon keyboard (#15915)

Co-authored-by: Sam Mohr <smores56@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/xenon/config.h                 | 65 ++++++++++++++++
 keyboards/xenon/info.json                | 70 +++++++++++++++++
 keyboards/xenon/keymaps/default/keymap.c | 64 ++++++++++++++++
 keyboards/xenon/readme.md                | 30 ++++++++
 keyboards/xenon/rules.mk                 | 21 +++++
 keyboards/xenon/xenon.c                  | 97 ++++++++++++++++++++++++
 keyboards/xenon/xenon.h                  | 40 ++++++++++
 7 files changed, 387 insertions(+)
 create mode 100644 keyboards/xenon/config.h
 create mode 100644 keyboards/xenon/info.json
 create mode 100644 keyboards/xenon/keymaps/default/keymap.c
 create mode 100644 keyboards/xenon/readme.md
 create mode 100644 keyboards/xenon/rules.mk
 create mode 100644 keyboards/xenon/xenon.c
 create mode 100644 keyboards/xenon/xenon.h

diff --git a/keyboards/xenon/config.h b/keyboards/xenon/config.h
new file mode 100644
index 0000000000..b14861140c
--- /dev/null
+++ b/keyboards/xenon/config.h
@@ -0,0 +1,65 @@
+/*
+Copyright 2020 Kyrre Havik Eriksen
+
+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      0x3404
+#define DEVICE_VER      0x0001
+#define PRODUCT         Xenon
+
+/* key matrix size */
+/* Rows are doubled up */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+// wiring
+#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
+#define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 }
+
+#define ENCODERS_PAD_A { B6 }
+#define ENCODERS_PAD_B { B5 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D2
+
+/* 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 OLED_ENABLE
+  #define OLED_DISPLAY_128X32
+#endif
+
+// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
+// #define SPLIT_USB_DETECT
+// #define NO_USB_STARTUP_CHECK
diff --git a/keyboards/xenon/info.json b/keyboards/xenon/info.json
new file mode 100644
index 0000000000..e0b5e95264
--- /dev/null
+++ b/keyboards/xenon/info.json
@@ -0,0 +1,70 @@
+{
+  "keyboard_name": "Xenon",
+  "url": "https://github.com/narinari/xenon-keyboard",
+  "maintainer": "Kyrremann",
+  "manufacturer": "narinari",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"x":3, "y":0},
+        {"x":11, "y":0},
+        {"x":2, "y":0.25},
+        {"x":4, "y":0.25},
+        {"x":10, "y":0.25},
+        {"x":12, "y":0.25},
+        {"x":5, "y":0.5},
+        {"x":9, "y":0.5},
+        {"x":0, "y":0.75},
+        {"x":1, "y":0.75},
+        {"x":13, "y":0.75},
+        {"x":14, "y":0.75},
+
+        {"x":3, "y":1},
+        {"x":11, "y":1},
+        {"x":2, "y":1.25},
+        {"x":4, "y":1.25},
+        {"x":10, "y":1.25},
+        {"x":12, "y":1.25},
+        {"x":5, "y":1.5},
+        {"x":9, "y":1.5},
+        {"x":0, "y":1.75},
+        {"x":1, "y":1.75},
+        {"x":13, "y":1.75},
+        {"x":14, "y":1.75},
+
+        {"x":3, "y":2},
+        {"x":11, "y":2},
+        {"x":2, "y":2.25},
+        {"x":4, "y":2.25},
+        {"x":10, "y":2.25},
+        {"x":12, "y":2.25},
+        {"x":5, "y":2.5},
+        {"x":9, "y":2.5},
+        {"x":0, "y":2.75},
+        {"x":1, "y":2.75},
+        {"x":13, "y":2.75},
+        {"x":14, "y":2.75},
+
+        {"x":3, "y":3},
+        {"x":11, "y":3},
+        {"x":2, "y":3.25},
+        {"x":4, "y":3.25},
+        {"x":10, "y":3.25},
+        {"x":12, "y":3.25},
+        {"x":5, "y":3.5},
+        {"x":6, "y":3.5},
+        {"x":8, "y":3.5},
+        {"x":9, "y":3.5},
+
+        {"x":3, "y":4},
+        {"x":11, "y":4},
+        {"x":4, "y":4.25},
+        {"x":10, "y":4.25},
+        {"x":5, "y":4.5},
+        {"x":6, "y":4.5},
+        {"x":8, "y":4.5},
+        {"x":9, "y":4.5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/xenon/keymaps/default/keymap.c b/keyboards/xenon/keymaps/default/keymap.c
new file mode 100644
index 0000000000..97d1016647
--- /dev/null
+++ b/keyboards/xenon/keymaps/default/keymap.c
@@ -0,0 +1,64 @@
+/* Copyright 2020 Kyrre Havik Eriksen
+ *
+ * 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 layers {
+    _QWERTY = 0,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+
+#define M_LWR MO(_LOWER)
+#define M_RSE MO(_RAISE)
+#define L(kc) (LSFT(kc))
+#define R(kc) (RALT(kc))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT(
+      KC_TAB,    KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
+      KC_LCTL,   KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                          KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,   KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,                          KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
+                         KC_MUTE, KC_RALT, KC_LALT, KC_LGUI, KC_SPC,      KC_ENT,  M_LWR,   KC_BSPC, M_RSE,   KC_MPLY,
+                                  KC_DEL , KC_PGDN, KC_PGUP, KC_ESC,      KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+    [_LOWER] = LAYOUT(
+      KC_BSLS,   KC_1,   KC_2,    KC_3,    KC_4,   KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+      KC_TRNS,   L(KC_1),L(KC_2), L(KC_3), L(KC_4),L(KC_5),                      L(KC_6), L(KC_7), L(KC_8), L(KC_9), L(KC_0), L(KC_MINS),
+      KC_TRNS,   KC_GRV, KC_TRNS, L(KC_EQL),L(KC_RBRC),L(KC_BSLS),              KC_BSLS, KC_RBRC, KC_EQL,  KC_VOLD, KC_VOLU, KC_TRNS,
+                         KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,       KC_ENT, KC_SPC,  KC_TRNS,  KC_TRNS, KC_RALT,
+                                  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,       KC_ENT, KC_SPC,  KC_TAB,  KC_BSPC
+    ),
+    [_RAISE] = LAYOUT(
+      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_LCTL,   KC_A,   KC_S,    KC_D,   KC_F,   KC_G,                         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,   KC_Z,   KC_X,    KC_C,   KC_V,   KC_B,                         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, RSFT_T(KC_ENT),
+                         KC_LGUI, KC_DEL, KC_ENT, KC_SPC, KC_ESC,       KC_ENT, KC_SPC,  KC_TAB,  KC_BSPC, KC_RALT,
+                                  KC_DEL, KC_ENT, KC_SPC, KC_ESC,       KC_ENT, KC_SPC,  KC_TAB,  KC_BSPC
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  // If console is enabled, it will print the matrix position and status of each key pressed
+#ifdef CONSOLE_ENABLE
+  uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
+#endif 
+  return true;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/keyboards/xenon/readme.md b/keyboards/xenon/readme.md
new file mode 100644
index 0000000000..d3b4464710
--- /dev/null
+++ b/keyboards/xenon/readme.md
@@ -0,0 +1,30 @@
+# Xenon
+
+![Xenon](https://i.imgur.com/QYMDzGFh.jpg)
+
+Xenon is 60% columnar staggered keyboard.
+
+* Cherry MX and Kailh low profile key switch support
+* OLED display
+* Full color LED
+* Prototype board area (behind the promicro)
+
+* Keyboard Maintainer: [Narinari](https://github.com/narinari)
+* Keymap Maintainer: [Kyrremann](https://github.com/Kyrremann)
+* Keyboard files can be found here: https://github.com/narinari/xenon-keyboard
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xenon:default
+
+Example of flashing this keyboard:
+
+    make xenon:default:flash
+
+How to enter bootloader (DFU):
+
+Press the reset button next to the TRRS port on the side you are trying to flash (USB must be connected to the Pro Micro that you are flashing).
+
+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
+the [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). 
diff --git a/keyboards/xenon/rules.mk b/keyboards/xenon/rules.mk
new file mode 100644
index 0000000000..aeaa1fd104
--- /dev/null
+++ b/keyboards/xenon/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # 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 = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
+OLED_ENABLE = yes
+ENCODER_ENABLE = yes
diff --git a/keyboards/xenon/xenon.c b/keyboards/xenon/xenon.c
new file mode 100644
index 0000000000..9ca5720776
--- /dev/null
+++ b/keyboards/xenon/xenon.c
@@ -0,0 +1,97 @@
+/* Copyright 2020 Kyrre Havik Eriksen
+ *
+ * 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 "xenon.h"
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+  if (!is_keyboard_master()) {
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  }
+
+  return OLED_ROTATION_270;
+}
+
+static void render_named_logo(void) {
+  static const char PROGMEM raw_logo[] = {
+    12, 60,252,252,252,236,236,140, 12, 28,248,192,  0,192,248,252,252,252,108, 12, 12,140,236, 60, 12,  0,  0,  0,248,252,252,252,236,204,204,204,204,204,204,204,204,204,204,204,204,140, 12,252,248,  0,  0,  0,252,252,252,252,236,236,236,204, 12, 60,240,192,  0,  0,  0,252,252,252,236,236, 12, 12, 12,252,248,  0,  0,192,224, 96, 48, 24, 24,140,140,132,196,196,196,196,132,140,140, 12, 24, 48, 48, 96,192,128,  0,  0,252,252,252,236,236,236,236,140, 28,120,224,128,  0,  0,252,252,252,252,236,236, 12, 12, 12,252,
+    0,  0,  0,  3, 15,255,255,255,254,248,192,195,223,255,255, 63, 15,  1,224,248, 30,  7,  1,  0,  0,  0,  0,  0,255,255,255,255,255,255,  0,  0,  1, 63, 63, 51, 51, 51, 51, 51, 51, 51,243,  3,  1,  0,  0,  0,255,255,255,255,255,  1, 15,127,255,252,240,195, 15, 60,240,255,255,255,255,255,  0,  0,  0,255,255,254,255,255,255,127, 14,  2,195,247, 63, 31, 15, 15, 15, 15, 31, 63,255,255,254,252,248,224,  1,  3, 30,252,255,255,255,255,255,  3, 31,255,254,248,225,135, 30,120,255,255,255,255,255,255,  0,  0,  0,255, 
+    0,  0,128,240,252,255,255,255, 63,  7,  1,227,127,255,255,255,248,224,  1,  7, 62,240,192,  0,  0,  0,  0,  0,255,255,255,255,255,255,  1,  3,  7,255,255,207,207,207,207,207,206,204,207,192,128,  0,  0,  0,255,255,255,255,255,  0,  0,  0,255,255, 15,127,255,252,240,227,143,127,255,255,  0,  0,  0,255,255, 63,255,255,255,254,240,192,131,135, 12, 24, 48, 48, 48, 48, 24, 28, 15,159,255, 63, 31,  7,128,192,120, 31,255,255,255,255,255,  0,  0,  0,255,255, 31,127,255,252,241,199, 31,127,255,255,  0,  0,  0,255,
+    48, 62, 63, 63, 63, 63, 63, 56, 48, 60, 31,  3,  0,  3, 31, 63, 63, 63, 63, 60, 60, 56, 59, 63, 56,  0,  0,  0, 31, 63, 63, 63, 63, 63, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 56, 63, 31,  0,  0,  0, 63, 63, 63, 63, 63, 60, 56, 48, 63, 63,  0,  0,  0,  3, 31, 63, 63, 62, 61, 63, 60, 56, 48, 63, 31,  0,  0,  1,  7,  7, 15, 31, 31, 63, 63, 63, 62, 62, 62, 62, 63, 63, 63, 31, 31, 15, 14,  6,  3,  1,  0,  0, 63, 63, 63, 63, 63, 60, 56, 56, 63, 31,  0,  0,  1,  7, 31, 63, 63, 60, 63, 63, 60, 56, 48, 63
+  };
+  oled_write_raw_P(raw_logo, sizeof(raw_logo));
+}
+
+static void render_status(void) {
+  oled_write_P(PSTR("\n\n\n-----\nXENON\n-----\n\n"), false);
+
+  // Host Keyboard Layer Status
+  switch (get_highest_layer(layer_state)) {
+  case 0:
+    oled_write_P(PSTR("Base \n"), false);
+    break;
+  case 1:
+    oled_write_P(PSTR("Lower\n"), false);
+    break;
+  case 2:
+    oled_write_P(PSTR("Raise\n"), false);
+    break;
+  default:
+    oled_write_P(PSTR("Undef\n"), false);
+  }
+  oled_write_P(PSTR("Layer\n"), false);
+}
+
+bool oled_task_kb(void) {
+	if (!oled_task_user()) {
+		return false;
+	}
+
+  if (is_keyboard_master()) {
+    render_status(); // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+  } else {
+    render_named_logo();
+  }
+
+  return true;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+	if (!encoder_update_user(index, clockwise)) {
+		return false;
+	}
+
+	if (index == 0) {
+		// Volume control
+		if (clockwise) {
+			tap_code(KC_VOLD);
+		} else {
+			tap_code(KC_VOLU);
+		}
+	}
+	else if (index == 1) {
+		// Page up/Page down
+		if (clockwise) {
+			tap_code(KC_PGDN);
+		} else {
+			tap_code(KC_PGUP);
+		}
+	}
+	
+  return true;
+}
+#endif
diff --git a/keyboards/xenon/xenon.h b/keyboards/xenon/xenon.h
new file mode 100644
index 0000000000..030d9bcb8c
--- /dev/null
+++ b/keyboards/xenon/xenon.h
@@ -0,0 +1,40 @@
+/* Copyright 2020 Kyrre Havik Eriksen
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05,              R06, R07, R08, R09, R10, R11, \
+    L12, L13, L14, L15, L16, L17,              R18, R19, R20, R21, R22, R23, \
+    L24, L25, L26, L27, L28, L29,              R30, R31, R32, R33, R34, R35, \
+              L36, L37, L38, L39, L40,    R41, R42, R43, R44, R45,	     \
+                   L46, L47, L48, L49,    R50, R51, R52, R53		     \
+) \
+{ \
+    { XXX, L05, L04, L03, L02, L01, L00 }, \
+    { XXX, L17, L16, L15, L14, L13, L12 }, \
+    { XXX, L29, L28, L27, L26, L25, L24 }, \
+    { L40, L39, L38, L37, L36, XXX, XXX }, \
+    { L49, L48, L47, L46, XXX, XXX, XXX }, \
+    { XXX, R06, R07, R08, R09, R10, R11 }, \
+    { XXX, R18, R19, R20, R21, R22, R23 }, \
+    { XXX, R30, R31, R32, R33, R34, R35 }, \
+    { R41, R42, R43, R44, R45, XXX, XXX }, \
+    { R50, R51, R52, R53, XXX, XXX, XXX }  \
+}

From eb8ace0855b36be04d2fc348a9afde7f74d64d1a Mon Sep 17 00:00:00 2001
From: Adam Lickel <adam@lickel.com>
Date: Fri, 4 Feb 2022 19:08:48 -0800
Subject: [PATCH 521/867] RGB Matrix: Reload from EEPROM (#15923)

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
---
 docs/feature_rgb_matrix.md      |  1 +
 quantum/rgb_matrix/rgb_matrix.c | 10 ++++++++++
 quantum/rgb_matrix/rgb_matrix.h |  3 +++
 3 files changed, 14 insertions(+)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 0e2e68233f..53729ccc29 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -709,6 +709,7 @@ Where `28` is an unused index from `eeconfig.h`.
 |`rgb_matrix_decrease_speed_noeeprom()`      |Decrease the speed of the animations (not written to EEPROM) |
 |`rgb_matrix_set_speed(speed)`               |Set the speed of the animations to the given value where `speed` is between 0 and 255 |
 |`rgb_matrix_set_speed_noeeprom(speed)`      |Set the speed of the animations to the given value where `speed` is between 0 and 255 (not written to EEPROM) |
+|`rgb_matrix_reload_from_eeprom()`           |Reload the effect configuration (enabled, mode and color) from EEPROM |
 
 ### Change Color :id=change-color
 |Function                                    |Description  |
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index 51e9554e2d..5a4556f097 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -164,6 +164,16 @@ void eeconfig_debug_rgb_matrix(void) {
     dprintf("rgb_matrix_config.flags = %d\n", rgb_matrix_config.flags);
 }
 
+void rgb_matrix_reload_from_eeprom(void) {
+    rgb_matrix_disable_noeeprom();
+    /* Reset back to what we have in eeprom */
+    eeconfig_init_rgb_matrix();
+    eeconfig_debug_rgb_matrix();  // display current eeprom values
+    if (rgb_matrix_config.enable) {
+        rgb_matrix_mode_noeeprom(rgb_matrix_config.mode);
+    }
+}
+
 __attribute__((weak)) uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) { return 0; }
 
 uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i) {
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index a804d99abc..3cd77857be 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -136,6 +136,8 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
 
 void rgb_matrix_init(void);
 
+void rgb_matrix_reload_from_eeprom(void);
+
 void        rgb_matrix_set_suspend_state(bool state);
 bool        rgb_matrix_get_suspend_state(void);
 void        rgb_matrix_toggle(void);
@@ -182,6 +184,7 @@ void        rgb_matrix_set_flags(led_flags_t flags);
 
 #ifndef RGBLIGHT_ENABLE
 #    define eeconfig_update_rgblight_current eeconfig_update_rgb_matrix
+#    define rgblight_reload_from_eeprom rgb_matrix_reload_from_eeprom
 #    define rgblight_toggle rgb_matrix_toggle
 #    define rgblight_toggle_noeeprom rgb_matrix_toggle_noeeprom
 #    define rgblight_enable rgb_matrix_enable

From e16dd1bcc0cc17b9c99996e2830dda194899a204 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Sat, 5 Feb 2022 03:23:27 +0000
Subject: [PATCH 522/867] add version.h to gitignore (#16222)

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 8d065cc1c3..e3a02fe8f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 # QMK-specific
 api_data/v1
 doxygen/
+quantum/version.h
 *.bin
 *.eep
 *.hex

From f4f3bf81c79516b3ad1a0e8c05ef8986f8b546eb Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 5 Feb 2022 16:55:24 +1100
Subject: [PATCH 523/867] Add missing `BOOTLOADER` for a handful of boards
 (#16225)

---
 keyboards/ez_maker/directpins/teensy_32/info.json | 1 +
 keyboards/ez_maker/directpins/teensy_lc/info.json | 1 +
 keyboards/handwired/twadlee/tp69/rules.mk         | 3 +++
 keyboards/keychron/q2/rev_0110/rules.mk           | 3 +++
 keyboards/keychron/q2/rev_0111/rules.mk           | 3 +++
 keyboards/keychron/q2/rev_0112/rules.mk           | 3 +++
 keyboards/keychron/q2/rev_0113/rules.mk           | 3 +++
 7 files changed, 17 insertions(+)

diff --git a/keyboards/ez_maker/directpins/teensy_32/info.json b/keyboards/ez_maker/directpins/teensy_32/info.json
index 5cebcae152..0a6ac5c374 100644
--- a/keyboards/ez_maker/directpins/teensy_32/info.json
+++ b/keyboards/ez_maker/directpins/teensy_32/info.json
@@ -4,6 +4,7 @@
     "maintainer": "skullydazed",
     "debounce": 5,
     "processor": "MK20DX256",
+    "bootloader": "halfkay",
     "features": {
         "bootmagic": true,
         "extrakey": true,
diff --git a/keyboards/ez_maker/directpins/teensy_lc/info.json b/keyboards/ez_maker/directpins/teensy_lc/info.json
index 856a462bb7..1e88239d41 100644
--- a/keyboards/ez_maker/directpins/teensy_lc/info.json
+++ b/keyboards/ez_maker/directpins/teensy_lc/info.json
@@ -4,6 +4,7 @@
     "maintainer": "skullydazed",
     "debounce": 5,
     "processor": "MKL26Z64",
+    "bootloader": "halfkay",
     "features": {
         "bootmagic": true,
         "extrakey": true,
diff --git a/keyboards/handwired/twadlee/tp69/rules.mk b/keyboards/handwired/twadlee/tp69/rules.mk
index 216e797c4b..a1c290cf15 100644
--- a/keyboards/handwired/twadlee/tp69/rules.mk
+++ b/keyboards/handwired/twadlee/tp69/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = MKL26Z64
 
+# Bootloader selection
+BOOTLOADER = halfkay
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keychron/q2/rev_0110/rules.mk b/keyboards/keychron/q2/rev_0110/rules.mk
index 957680ab11..30394028b3 100644
--- a/keyboards/keychron/q2/rev_0110/rules.mk
+++ b/keyboards/keychron/q2/rev_0110/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = STM32L433
 
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keychron/q2/rev_0111/rules.mk b/keyboards/keychron/q2/rev_0111/rules.mk
index 3b931ef9fe..a295f48e10 100644
--- a/keyboards/keychron/q2/rev_0111/rules.mk
+++ b/keyboards/keychron/q2/rev_0111/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = STM32L433
 
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keychron/q2/rev_0112/rules.mk b/keyboards/keychron/q2/rev_0112/rules.mk
index 957680ab11..30394028b3 100644
--- a/keyboards/keychron/q2/rev_0112/rules.mk
+++ b/keyboards/keychron/q2/rev_0112/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = STM32L433
 
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/keychron/q2/rev_0113/rules.mk b/keyboards/keychron/q2/rev_0113/rules.mk
index 3b931ef9fe..a295f48e10 100644
--- a/keyboards/keychron/q2/rev_0113/rules.mk
+++ b/keyboards/keychron/q2/rev_0113/rules.mk
@@ -1,6 +1,9 @@
 # MCU name
 MCU = STM32L433
 
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Build Options
 #   change yes to no to disable
 #

From 3facf053248329fd4417de67f37486529c4a8af3 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 5 Feb 2022 22:43:22 +1100
Subject: [PATCH 524/867] Add `custom` to list of valid bootloader types in
 info.json (#16228)

---
 data/schemas/keyboard.jsonschema | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 132484b708..e61bc48bd0 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -57,7 +57,7 @@
         },
         "bootloader": {
             "type": "string",
-            "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "micronucleus", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2"],
+            "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "custom", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "micronucleus", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2"],
         },
         "bootloader_instructions": {
             "type": "string",

From 10fda3ec8e4ee0a74bb4e8c0f41e554fb7344e78 Mon Sep 17 00:00:00 2001
From: IskandarMa <epiciskandar@gmail.com>
Date: Sat, 5 Feb 2022 19:44:48 +0800
Subject: [PATCH 525/867] [Docs] feature: mouse keys, fix misused wording
 (#16226)

---
 docs/feature_mouse_keys.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_mouse_keys.md b/docs/feature_mouse_keys.md
index 8e2a3a4cd1..30f563a95d 100644
--- a/docs/feature_mouse_keys.md
+++ b/docs/feature_mouse_keys.md
@@ -164,7 +164,7 @@ small and detailed movements of the cursor.
 * **KC_ACL2:** This acceleration sets your cursor to the maximum (computer defined) speed. This is
 useful for moving the cursor large distances without much accuracy.
 
-To use constant speed mode, you must at least define `MK_COMBINED` in your keymap’s `config.h` file:
+To use combined speed mode, you must at least define `MK_COMBINED` in your keymap’s `config.h` file:
 
 ```c
 #define MK_COMBINED

From df371257552d9b8a9e290d8ddd120ea96f3dd9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Szczepaniak?= <m.szczepaniak.000@gmail.com>
Date: Sat, 5 Feb 2022 15:27:41 +0100
Subject: [PATCH 526/867] Add macroboard(5x6 OLKB blackpill) keyboard (#16219)

* Add macroboard keyboard

* Fix issues requested in pull request

* Removed halconf/mcuconf and moved to handwired directory

* Added description, enabled bootmagic, disabled console

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/macroboard/chconf.h       |  39 +++++
 keyboards/handwired/macroboard/config.h       | 141 ++++++++++++++++++
 keyboards/handwired/macroboard/info.json      |  41 +++++
 .../macroboard/keymaps/default/keymap.c       |  27 ++++
 .../macroboard/keymaps/default/readme.md      |   1 +
 keyboards/handwired/macroboard/macroboard.c   |  17 +++
 keyboards/handwired/macroboard/macroboard.h   |  41 +++++
 keyboards/handwired/macroboard/readme.md      |  27 ++++
 keyboards/handwired/macroboard/rules.mk       |  19 +++
 9 files changed, 353 insertions(+)
 create mode 100644 keyboards/handwired/macroboard/chconf.h
 create mode 100644 keyboards/handwired/macroboard/config.h
 create mode 100644 keyboards/handwired/macroboard/info.json
 create mode 100644 keyboards/handwired/macroboard/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/macroboard/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/macroboard/macroboard.c
 create mode 100644 keyboards/handwired/macroboard/macroboard.h
 create mode 100644 keyboards/handwired/macroboard/readme.md
 create mode 100644 keyboards/handwired/macroboard/rules.mk

diff --git a/keyboards/handwired/macroboard/chconf.h b/keyboards/handwired/macroboard/chconf.h
new file mode 100644
index 0000000000..de4ab83ec3
--- /dev/null
+++ b/keyboards/handwired/macroboard/chconf.h
@@ -0,0 +1,39 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f401/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
+
+#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
+
+#define CH_CFG_FACTORY_SEMAPHORES TRUE
+
+#define CH_CFG_FACTORY_MAILBOXES TRUE
+
+#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
+
+#define CH_CFG_FACTORY_PIPES TRUE
+
+#include_next <chconf.h>
+
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
new file mode 100644
index 0000000000..92b633d75c
--- /dev/null
+++ b/keyboards/handwired/macroboard/config.h
@@ -0,0 +1,141 @@
+/*
+Copyright 2021 Michał Szczepaniak
+
+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   0x6465
+#define DEVICE_VER   0x0001
+#define MANUFACTURER QMK
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 6
+
+/*
+ * 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 { A15, B3, B4, B5, B7 }
+#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10 }
+#define UNUSED_PINS
+
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+// #define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN B9
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 24
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#    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
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/macroboard/info.json b/keyboards/handwired/macroboard/info.json
new file mode 100644
index 0000000000..2aa44eb803
--- /dev/null
+++ b/keyboards/handwired/macroboard/info.json
@@ -0,0 +1,41 @@
+{
+    "keyboard_name": "macroboard",
+    "url": "",
+    "maintainer": "Michał Szczepaniak",
+    "layouts": {
+        "LAYOUT_ortho_5x6": {
+            "layout": [
+                {"label": "k00", "x": 0, "y": 0},
+                {"label": "k01", "x": 1, "y": 0},
+                {"label": "k02", "x": 2, "y": 0},
+                {"label": "k03", "x": 3, "y": 0},
+                {"label": "k04", "x": 4, "y": 0},
+                {"label": "k05", "x": 5, "y": 0},
+                {"label": "k10", "x": 0, "y": 1},
+                {"label": "k11", "x": 1, "y": 1},
+                {"label": "k12", "x": 2, "y": 1},
+                {"label": "k13", "x": 3, "y": 1},
+                {"label": "k14", "x": 4, "y": 1},
+                {"label": "k15", "x": 5, "y": 1},
+                {"label": "k20", "x": 0, "y": 2},
+                {"label": "k21", "x": 1, "y": 2},
+                {"label": "k22", "x": 2, "y": 2},
+                {"label": "k23", "x": 3, "y": 2},
+                {"label": "k24", "x": 4, "y": 2},
+                {"label": "k25", "x": 5, "y": 2},
+                {"label": "k30", "x": 0, "y": 3},
+                {"label": "k31", "x": 1, "y": 3},
+                {"label": "k32", "x": 2, "y": 3},
+                {"label": "k33", "x": 3, "y": 3},
+                {"label": "k34", "x": 4, "y": 3},
+                {"label": "k35", "x": 5, "y": 3},
+                {"label": "k40", "x": 0, "y": 4},
+                {"label": "k41", "x": 1, "y": 4},
+                {"label": "k42", "x": 2, "y": 4},
+                {"label": "k43", "x": 3, "y": 4},
+                {"label": "k44", "x": 4, "y": 4},
+                {"label": "k45", "x": 5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/macroboard/keymaps/default/keymap.c b/keyboards/handwired/macroboard/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ec587ee25d
--- /dev/null
+++ b/keyboards/handwired/macroboard/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2021 Michał Szczepaniak
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_5x6(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
+        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
+        KC_LCTL, KC_LGUI, RGB_TOG, KC_LALT, RESET,   KC_SPC
+    )
+};
+
diff --git a/keyboards/handwired/macroboard/keymaps/default/readme.md b/keyboards/handwired/macroboard/keymaps/default/readme.md
new file mode 100644
index 0000000000..39fa5888ed
--- /dev/null
+++ b/keyboards/handwired/macroboard/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for macroboard
diff --git a/keyboards/handwired/macroboard/macroboard.c b/keyboards/handwired/macroboard/macroboard.c
new file mode 100644
index 0000000000..f9d41ff162
--- /dev/null
+++ b/keyboards/handwired/macroboard/macroboard.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Michał Szczepaniak
+ *
+ * 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 "macroboard.h"
diff --git a/keyboards/handwired/macroboard/macroboard.h b/keyboards/handwired/macroboard/macroboard.h
new file mode 100644
index 0000000000..9909e63afc
--- /dev/null
+++ b/keyboards/handwired/macroboard/macroboard.h
@@ -0,0 +1,41 @@
+/* Copyright 2021 Michał Szczepaniak
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_ortho_5x6( \
+    k00, k01, k02, k03, k04, k05, \
+    k10, k11, k12, k13, k14, k15, \
+    k20, k21, k22, k23, k24, k25, \
+    k30, k31, k32, k33, k34, k35, \
+    k40, k41, k42, k43, k44, k45 \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k40, k41, k42, k43, k44, k45 } \
+}
diff --git a/keyboards/handwired/macroboard/readme.md b/keyboards/handwired/macroboard/readme.md
new file mode 100644
index 0000000000..ee2351f99f
--- /dev/null
+++ b/keyboards/handwired/macroboard/readme.md
@@ -0,0 +1,27 @@
+# macroboard
+
+![macroboard](https://i.imgur.com/AY5Y1Ez.png)
+
+3D printable half preonic (5x6 OLKB) with purpose of being macroboard or if you want to have different switches for gaming while having normal full keyboard for typing.
+
+* Keyboard Maintainer: [Michał Szczepaniak](https://github.com/Michal-Szczepaniak)
+* Hardware Supported: Blackpill
+* Hardware Availability: [OpenSCAD files](https://github.com/Michal-Szczepaniak/macroboard-openscad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/macroboard:default
+
+Flashing example for this keyboard:
+
+    make handwired/macroboard:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available, by default 5th column, 5th row
diff --git a/keyboards/handwired/macroboard/rules.mk b/keyboards/handwired/macroboard/rules.mk
new file mode 100644
index 0000000000..2c38ac2807
--- /dev/null
+++ b/keyboards/handwired/macroboard/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+KEYBOARD_SHARED_EP = yes

From b1debfb12f76759e96619c98116c9c59617c727a Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Sat, 5 Feb 2022 14:29:15 +0000
Subject: [PATCH 527/867] Remove default pointing device driver. (#16190)

* remove custom as default

* add missing pointing_device_driver to rules.mk

* Update docs
---
 common_features.mk                                     |  1 -
 docs/feature_pointing_device.md                        | 10 ++++++++--
 keyboards/3w6/rev2/keymaps/default_pimoroni/rules.mk   |  1 +
 .../crkbd/keymaps/vlukash_trackpad_right/rules.mk      |  1 +
 keyboards/dichotomy/rules.mk                           |  1 +
 keyboards/gergo/keymaps/abstractkb/rules.mk            |  1 +
 keyboards/gergo/keymaps/default/rules.mk               |  1 +
 keyboards/gergo/keymaps/germ/rules.mk                  |  1 +
 keyboards/gergo/keymaps/gotham/rules.mk                |  1 +
 keyboards/gergo/keymaps/oled/rules.mk                  |  1 +
 keyboards/honeycomb/rules.mk                           |  1 +
 keyboards/molecule/rules.mk                            |  1 +
 keyboards/splitkb/kyria/keymaps/gotham/rules.mk        |  1 +
 13 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/common_features.mk b/common_features.mk
index 7b1ee2e742..07e26a9446 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -109,7 +109,6 @@ ifeq ($(strip $(MOUSEKEY_ENABLE)), yes)
 endif
 
 VALID_POINTING_DEVICE_DRIVER_TYPES := adns5050 adns9800 analog_joystick cirque_pinnacle_i2c cirque_pinnacle_spi pmw3360 pmw3389 pimoroni_trackball custom
-POINTING_DEVICE_DRIVER ?= custom
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     ifeq ($(filter $(POINTING_DEVICE_DRIVER),$(VALID_POINTING_DEVICE_DRIVER_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid POINTING_DEVICE_DRIVER,POINTING_DEVICE_DRIVER="$(POINTING_DEVICE_DRIVER)" is not a valid pointing device type)
diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 1972406ff7..4b39599f8a 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -2,7 +2,7 @@
 
 Pointing Device is a generic name for a feature intended to be generic: moving the system pointer around.  There are certainly other options for it - like mousekeys - but this aims to be easily modifiable and hardware driven.  You can implement custom keys to control functionality, or you can gather information from other peripherals and insert it directly here - let QMK handle the processing for you.
 
-To enable Pointing Device, uncomment the following line in your rules.mk:
+To enable Pointing Device, add the following line in your rules.mk and specify one of the driver options below.
 
 ```make
 POINTING_DEVICE_ENABLE = yes
@@ -181,7 +181,13 @@ The CPI range is 50-16000, in increments of 50. Defaults to 2000 CPI.
 
 ### Custom Driver
 
-If you have a sensor type that isn't supported here, you can manually implement it, by adding these functions (with the correct implementation for your device):
+If you have a sensor type that isn't supported above, a custom option is available by adding the following to your `rules.mk`
+
+```make
+POINTING_DEVICE_DRIVER = custom
+```
+
+Using the custom driver will require implementing the following functions:
 
 ```c
 void           pointing_device_driver_init(void) {}
diff --git a/keyboards/3w6/rev2/keymaps/default_pimoroni/rules.mk b/keyboards/3w6/rev2/keymaps/default_pimoroni/rules.mk
index 231a883719..5b5f23fbce 100644
--- a/keyboards/3w6/rev2/keymaps/default_pimoroni/rules.mk
+++ b/keyboards/3w6/rev2/keymaps/default_pimoroni/rules.mk
@@ -1,3 +1,4 @@
 POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = custom
 SRC += pimoroni_trackball.c
 MOUSEKEY_ENABLE = no
diff --git a/keyboards/crkbd/keymaps/vlukash_trackpad_right/rules.mk b/keyboards/crkbd/keymaps/vlukash_trackpad_right/rules.mk
index bd53c19211..92ded45e93 100644
--- a/keyboards/crkbd/keymaps/vlukash_trackpad_right/rules.mk
+++ b/keyboards/crkbd/keymaps/vlukash_trackpad_right/rules.mk
@@ -1,5 +1,6 @@
 # Build Options
 POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully.
+POINTING_DEVICE_DRIVER = custom
 MOUSEKEY_ENABLE = yes        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes        # Audio control and System control(+450)
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
diff --git a/keyboards/dichotomy/rules.mk b/keyboards/dichotomy/rules.mk
index a6029e3dbf..420e409e43 100755
--- a/keyboards/dichotomy/rules.mk
+++ b/keyboards/dichotomy/rules.mk
@@ -10,6 +10,7 @@ BOOTLOADER = caterina
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 #MOUSEKEY_ENABLE = yes	# Mouse keys
 POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully.
+POINTING_DEVICE_DRIVER = custom
 EXTRAKEY_ENABLE = yes	# Audio control and System control
 CONSOLE_ENABLE = yes	# Console for debug
 COMMAND_ENABLE = yes   # Commands for debug and configuration
diff --git a/keyboards/gergo/keymaps/abstractkb/rules.mk b/keyboards/gergo/keymaps/abstractkb/rules.mk
index b87e599734..4b4e56c4a0 100644
--- a/keyboards/gergo/keymaps/abstractkb/rules.mk
+++ b/keyboards/gergo/keymaps/abstractkb/rules.mk
@@ -27,6 +27,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
 endif
 ifeq ($(strip $(BALLER)), yes)
 	POINTING_DEVICE_ENABLE	= yes
+    POINTING_DEVICE_DRIVER = custom
     OPT_DEFS += -DBALLER
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
diff --git a/keyboards/gergo/keymaps/default/rules.mk b/keyboards/gergo/keymaps/default/rules.mk
index 351c525583..bc2b3cf43b 100644
--- a/keyboards/gergo/keymaps/default/rules.mk
+++ b/keyboards/gergo/keymaps/default/rules.mk
@@ -27,6 +27,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
 endif
 ifeq ($(strip $(BALLER)), yes)
 	POINTING_DEVICE_ENABLE	= yes
+    POINTING_DEVICE_DRIVER = custom
     OPT_DEFS += -DBALLER
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
diff --git a/keyboards/gergo/keymaps/germ/rules.mk b/keyboards/gergo/keymaps/germ/rules.mk
index badfe7bb99..0fd941bb53 100644
--- a/keyboards/gergo/keymaps/germ/rules.mk
+++ b/keyboards/gergo/keymaps/germ/rules.mk
@@ -28,6 +28,7 @@ endif
 ifeq ($(strip $(BALLER)), yes)
     OPT_DEFS += -DBALLER
 	POINTING_DEVICE_ENABLE = yes
+    POINTING_DEVICE_DRIVER = custom
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
     OPT_DEFS += -DDEBUG_BALLER
diff --git a/keyboards/gergo/keymaps/gotham/rules.mk b/keyboards/gergo/keymaps/gotham/rules.mk
index 351c525583..bc2b3cf43b 100644
--- a/keyboards/gergo/keymaps/gotham/rules.mk
+++ b/keyboards/gergo/keymaps/gotham/rules.mk
@@ -27,6 +27,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
 endif
 ifeq ($(strip $(BALLER)), yes)
 	POINTING_DEVICE_ENABLE	= yes
+    POINTING_DEVICE_DRIVER = custom
     OPT_DEFS += -DBALLER
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
diff --git a/keyboards/gergo/keymaps/oled/rules.mk b/keyboards/gergo/keymaps/oled/rules.mk
index 6318088988..7880416719 100644
--- a/keyboards/gergo/keymaps/oled/rules.mk
+++ b/keyboards/gergo/keymaps/oled/rules.mk
@@ -29,6 +29,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
 endif
 ifeq ($(strip $(BALLER)), yes)
 	POINTING_DEVICE_ENABLE	= yes
+    POINTING_DEVICE_DRIVER = custom
     OPT_DEFS += -DBALLER
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
diff --git a/keyboards/honeycomb/rules.mk b/keyboards/honeycomb/rules.mk
index a6029e3dbf..420e409e43 100755
--- a/keyboards/honeycomb/rules.mk
+++ b/keyboards/honeycomb/rules.mk
@@ -10,6 +10,7 @@ BOOTLOADER = caterina
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 #MOUSEKEY_ENABLE = yes	# Mouse keys
 POINTING_DEVICE_ENABLE = yes # Generic Pointer, not as big as mouse keys hopefully.
+POINTING_DEVICE_DRIVER = custom
 EXTRAKEY_ENABLE = yes	# Audio control and System control
 CONSOLE_ENABLE = yes	# Console for debug
 COMMAND_ENABLE = yes   # Commands for debug and configuration
diff --git a/keyboards/molecule/rules.mk b/keyboards/molecule/rules.mk
index c4e48dfa15..8573995efb 100755
--- a/keyboards/molecule/rules.mk
+++ b/keyboards/molecule/rules.mk
@@ -19,5 +19,6 @@ AUDIO_ENABLE = no           # Audio output
 
 # Add trackball support
 POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = custom
 SRC += adns.c
 QUANTUM_LIB_SRC += spi_master.c
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/rules.mk b/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
index 81b7123ba5..be3789ce9b 100644
--- a/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/gotham/rules.mk
@@ -16,6 +16,7 @@ endif
 
 ifeq ($(strip $(THUMBSTICK_ENABLE)), yes)
     POINTING_DEVICE_ENABLE = yes
+    POINTING_DEVICE_DRIVER = custom
     OPT_DEFS += -DTHUMBSTICK_ENABLE
 	SRC += analog.c
 	SRC += thumbstick.c

From ee67cdfeec17d80a90e5f47e80995a5bc27a1147 Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Sun, 6 Feb 2022 00:01:58 +0700
Subject: [PATCH 528/867] [Keyboard] Add Paws 60 keyboard (#16204)

---
 keyboards/horrortroll/paws60/config.h         |  49 +++
 keyboards/horrortroll/paws60/info.json        | 285 ++++++++++++++++++
 .../paws60/keymaps/default/keymap.c           |  87 ++++++
 .../paws60/keymaps/default/readme.md          |   3 +
 .../horrortroll/paws60/keymaps/via/config.h   |  19 ++
 .../horrortroll/paws60/keymaps/via/keymap.c   |  87 ++++++
 .../horrortroll/paws60/keymaps/via/readme.md  |   3 +
 .../horrortroll/paws60/keymaps/via/rules.mk   |   1 +
 keyboards/horrortroll/paws60/paws60.c         |  17 ++
 keyboards/horrortroll/paws60/paws60.h         | 129 ++++++++
 keyboards/horrortroll/paws60/readme.md        |  27 ++
 keyboards/horrortroll/paws60/rules.mk         |  20 ++
 12 files changed, 727 insertions(+)
 create mode 100644 keyboards/horrortroll/paws60/config.h
 create mode 100644 keyboards/horrortroll/paws60/info.json
 create mode 100644 keyboards/horrortroll/paws60/keymaps/default/keymap.c
 create mode 100644 keyboards/horrortroll/paws60/keymaps/default/readme.md
 create mode 100644 keyboards/horrortroll/paws60/keymaps/via/config.h
 create mode 100644 keyboards/horrortroll/paws60/keymaps/via/keymap.c
 create mode 100644 keyboards/horrortroll/paws60/keymaps/via/readme.md
 create mode 100644 keyboards/horrortroll/paws60/keymaps/via/rules.mk
 create mode 100644 keyboards/horrortroll/paws60/paws60.c
 create mode 100644 keyboards/horrortroll/paws60/paws60.h
 create mode 100644 keyboards/horrortroll/paws60/readme.md
 create mode 100644 keyboards/horrortroll/paws60/rules.mk

diff --git a/keyboards/horrortroll/paws60/config.h b/keyboards/horrortroll/paws60/config.h
new file mode 100644
index 0000000000..d502ee985c
--- /dev/null
+++ b/keyboards/horrortroll/paws60/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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       0x7516
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    HorrorTroll
+#define PRODUCT         Paws 60
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
+#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
+
+#define BOOTMAGIC_LITE_ROW 3
+#define BOOTMAGIC_LITE_COLUMN 6
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Forcing to use NKRO instead 6KRO */
+#define FORCE_NKRO
+
+/* Larger keys per scan */
+#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/horrortroll/paws60/info.json b/keyboards/horrortroll/paws60/info.json
new file mode 100644
index 0000000000..1008bf29e2
--- /dev/null
+++ b/keyboards/horrortroll/paws60/info.json
@@ -0,0 +1,285 @@
+{
+    "keyboard_name": "Paws 60",
+    "url": "https://github.com/HorrorTroll/KeebProj/tree/default/paws60/pcb/Hotswap",
+    "maintainer": "HorrorTroll",
+    "layouts": {
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"`~", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "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":"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":1.75},
+                {"label":"Shift", "x":14, "y":3},
+
+                {"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},
+                {"label":"Space", "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":"Win", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        }
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "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":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"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":"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},
+                {"label":"Space", "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":"Win", "x":12.5, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+            ]
+        }
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "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":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"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":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Fn", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        }
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"`~", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "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":"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":1.75},
+                {"label":"Shift", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Fn", "x":11, "y":4, "w":1.5},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/horrortroll/paws60/keymaps/default/keymap.c b/keyboards/horrortroll/paws60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..33319041d5
--- /dev/null
+++ b/keyboards/horrortroll/paws60/keymaps/default/keymap.c
@@ -0,0 +1,87 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ` │Bks│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │RSt│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ GUI│RCrl│
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ ~ │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │RSt│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+       │    │    │    │                        │    │    │    │    │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+    /*  Row:    0        1        2        3     4     5     6       7     8     9        10       11       12       13       14     */
+    [_BASE] = LAYOUT_60_ansi_split_bs_rshift(
+                KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+                KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+                KC_CAPS, KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H,   KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_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_RSFT,
+                KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                      KC_RALT, MO(_FN), KC_RGUI, KC_RCTL
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│   │Del│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+       │Reset│   │ ↑ │   │   │   │   │   │Ins│   │PSc│   │   │     │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │      │ ← │ ↓ │ → │   │   │   │   │   │   │   │   │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+       │        │   │   │Cal│   │   │   │Mut│VoD│VoU│   │      │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+       │    │    │    │                        │    │ Fn │    │    │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+    /*  Row:    0        1        2        3         4        5        6        7        8        9        10       11       12       13       14    */
+    [_FN]   = LAYOUT_60_ansi_split_bs_rshift(
+                KC_GRV,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
+                RESET,   _______, KC_UP,   _______,  _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, _______,
+                _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______,          _______, _______,  KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+                _______, _______, _______,                             _______,                            _______, _______, _______, _______
+            ),
+};
diff --git a/keyboards/horrortroll/paws60/keymaps/default/readme.md b/keyboards/horrortroll/paws60/keymaps/default/readme.md
new file mode 100644
index 0000000000..f450e1a224
--- /dev/null
+++ b/keyboards/horrortroll/paws60/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# Default Layout
+
+Keymap is default 61 qwerty, 60% layout with split backspace & split right shift
diff --git a/keyboards/horrortroll/paws60/keymaps/via/config.h b/keyboards/horrortroll/paws60/keymaps/via/config.h
new file mode 100644
index 0000000000..4a9ae9bdc2
--- /dev/null
+++ b/keyboards/horrortroll/paws60/keymaps/via/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/keyboards/horrortroll/paws60/keymaps/via/keymap.c b/keyboards/horrortroll/paws60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..33319041d5
--- /dev/null
+++ b/keyboards/horrortroll/paws60/keymaps/via/keymap.c
@@ -0,0 +1,87 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_names {
+    _BASE,
+    _FN,
+};
+
+// enum layer_keycodes { };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ` │Bks│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │RSt│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ GUI│RCrl│
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │   │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │ ~ │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSft │RSt│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+       │    │    │    │                        │    │    │    │    │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+    /*  Row:    0        1        2        3     4     5     6       7     8     9        10       11       12       13       14     */
+    [_BASE] = LAYOUT_60_ansi_split_bs_rshift(
+                KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,
+                KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+                KC_CAPS, KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H,   KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_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_RSFT,
+                KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                      KC_RALT, MO(_FN), KC_RGUI, KC_RCTL
+            ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+       │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│   │Del│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+       │Reset│   │ ↑ │   │   │   │   │   │Ins│   │PSc│   │   │     │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+       │      │ ← │ ↓ │ → │   │   │   │   │   │   │   │   │        │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+       │        │   │   │Cal│   │   │   │Mut│VoD│VoU│   │      │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+       │    │    │    │                        │    │ Fn │    │    │
+       └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+    /*  Row:    0        1        2        3         4        5        6        7        8        9        10       11       12       13       14    */
+    [_FN]   = LAYOUT_60_ansi_split_bs_rshift(
+                KC_GRV,  KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,
+                RESET,   _______, KC_UP,   _______,  _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, _______, _______, _______,
+                _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                _______,          _______, _______,  KC_CALC, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+                _______, _______, _______,                             _______,                            _______, _______, _______, _______
+            ),
+};
diff --git a/keyboards/horrortroll/paws60/keymaps/via/readme.md b/keyboards/horrortroll/paws60/keymaps/via/readme.md
new file mode 100644
index 0000000000..13fa492ddf
--- /dev/null
+++ b/keyboards/horrortroll/paws60/keymaps/via/readme.md
@@ -0,0 +1,3 @@
+# Default Layout with VIA
+
+Keymap is default 61 qwerty, 60% layout with split backspace & split right shift
diff --git a/keyboards/horrortroll/paws60/keymaps/via/rules.mk b/keyboards/horrortroll/paws60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/horrortroll/paws60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/horrortroll/paws60/paws60.c b/keyboards/horrortroll/paws60/paws60.c
new file mode 100644
index 0000000000..8734d75070
--- /dev/null
+++ b/keyboards/horrortroll/paws60/paws60.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 "paws60.h"
diff --git a/keyboards/horrortroll/paws60/paws60.h b/keyboards/horrortroll/paws60/paws60.h
new file mode 100644
index 0000000000..3c79345d7c
--- /dev/null
+++ b/keyboards/horrortroll/paws60/paws60.h
@@ -0,0 +1,129 @@
+/* Copyright 2022 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │40  │41  │42  │46                      │4A  │4B  │4C  │4D  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+
+#define LAYOUT_60_ansi_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,  \
+     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D,   \
+      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K2D,     \
+       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,    K3D, \
+    K40,  K41,  K42,                K46,                K4A,  K4B,  K4C,  K4D   \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX }  \
+}
+
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D        │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │40  │41  │42  │46                      │4A  │4B  │4C  │4D  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+
+#define LAYOUT_60_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,    \
+     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D,   \
+      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K2D,     \
+       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,       \
+    K40,  K41,  K42,                K46,                K4A,  K4B,  K4C,  K4D   \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX }  \
+}
+
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D        │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤
+ * │40   │41 │42   │46                         │4B   │4C │4D   │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
+#define LAYOUT_60_ansi_tsangan( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0E,    \
+     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D,   \
+      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K2D,     \
+       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,       \
+    K40,   K41, K42,                K46,                      K4B,   K4C, K4D   \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, XXX }  \
+}
+
+/* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+ * │40   │41 │42   │46                         │4B   │4C │4D   │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
+#define LAYOUT_60_tsangan_hhkb( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,  \
+     K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D,   \
+      K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K2D,     \
+       K30,   K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,    K3C,    K3D, \
+    K40,   K41, K42,                K46,                      K4B,   K4C, K4D   \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, XXX }  \
+}
diff --git a/keyboards/horrortroll/paws60/readme.md b/keyboards/horrortroll/paws60/readme.md
new file mode 100644
index 0000000000..62783d3b5e
--- /dev/null
+++ b/keyboards/horrortroll/paws60/readme.md
@@ -0,0 +1,27 @@
+# Paws 60
+
+A PCB that has been inspired by Bakeneko 60 from kkatano [GitHub](https://github.com/kkatano/bakeneko-60)
+
+But more changes has been added: Hotswap socket, ...
+
+* Keyboard Maintainer: [HorrorTroll](https://github.com/HorrorTroll)
+* Hardware Supported: Atmega32u4
+* Hardware Availability: [Open source on GitHub](https://github.com/HorrorTroll/KeebProj/tree/default/paws60/pcb/Hotswap)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make horrortroll/paws60:default
+
+Flashing example for this keyboard:
+
+    make horrortroll/paws60:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (3,6) in the matrix (B key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to RESET if it is available
diff --git a/keyboards/horrortroll/paws60/rules.mk b/keyboards/horrortroll/paws60/rules.mk
new file mode 100644
index 0000000000..daf1d593f1
--- /dev/null
+++ b/keyboards/horrortroll/paws60/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 60_ansi_split_bs_rshift 60_ansi 60_ansi_tsangan 60_tsangan_hhkb

From afb198f49dd729bb0ac5429a9b372a5cc575fc13 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 5 Feb 2022 20:07:39 -0800
Subject: [PATCH 529/867] Cutie Club x Keebcats Dougal: add LAYOUT_65_ansi and
 LAYOUT_65_iso (#16239)

---
 keyboards/cutie_club/keebcats/dougal/dougal.h |  75 +++++++--
 .../cutie_club/keebcats/dougal/info.json      | 153 ++++++++++++++++++
 .../dougal/keymaps/default_65_ansi/keymap.c   |  36 +++++
 .../dougal/keymaps/default_65_iso/keymap.c    |  36 +++++
 4 files changed, 290 insertions(+), 10 deletions(-)
 create mode 100644 keyboards/cutie_club/keebcats/dougal/keymaps/default_65_ansi/keymap.c
 create mode 100644 keyboards/cutie_club/keebcats/dougal/keymaps/default_65_iso/keymap.c

diff --git a/keyboards/cutie_club/keebcats/dougal/dougal.h b/keyboards/cutie_club/keebcats/dougal/dougal.h
index cd0fa1d2cd..e035177dcd 100644
--- a/keyboards/cutie_club/keebcats/dougal/dougal.h
+++ b/keyboards/cutie_club/keebcats/dougal/dougal.h
@@ -18,17 +18,72 @@
 
 #include "quantum.h"
 
+#define ___ KC_NO
+
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐      ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │      │0E     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤      └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1F │        │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤     ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2F │     │2C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   ┌─┴───┴────┤
+ * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3F │   │3C        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤   └──────────┘
+ *              │40  │41  │42  │44      │46  │48        │49 │4A │4B │4C │4D │4F │
+ *              └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┴───┘
+ *              ┌────┬────┬────┬────────────────────────┬───┬───┬───┐
+ *              │40  │41  │42  │46                      │49 │4A │4B │ Standard
+ *              └────┴────┴────┴────────────────────────┴───┴───┴───┘
+ *              ┌─────┬─────┬───────────────────────────┬─────┬─────┐
+ *              │40   │41   │46                         │49   │4A   │ WKL
+ *              └─────┴─────┴───────────────────────────┴─────┴─────┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ *              │40   │41 │42   │46                         │4A   │ Tsangan
+ *              └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
 #define LAYOUT_all( \
-    k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15, \
-    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13,         k01_15, \
-    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13,         k02_15, \
-    k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12,         k03_13, k03_15, \
-    k04_00, k04_01, k04_02,         k04_04,         k04_06,         k04_08, k04_09, k04_10, k04_11,         k04_12, k04_13, k04_15  \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2F, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,      k3D, k3F, \
+    k40, k41, k42,      k44,      k46,      k48, k49, k4A, k4B,      k4C, k4D, k4F  \
 ) \
 { \
-    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15 }, \
-    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, KC_NO,  k01_15 }, \
-    { k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, KC_NO,  k02_15 }, \
-    { k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, k03_13, KC_NO,  k03_15 }, \
-    { k04_00, k04_01, k04_02, KC_NO,  k04_04, KC_NO,  k04_06, KC_NO,  k04_08, k04_09, k04_10, k04_11, k04_12, k04_13, KC_NO,  k04_15 }  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
+    { k40, k41, k42, ___, k44, ___, k46, ___, k48, k49, k4A, k4B, k4C, k4D, ___, k4F }  \
+}
+
+#define LAYOUT_65_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, k2F, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
+    k40, k41, k42,                k46,           k49, k4A, k4B, k4C, k4D, k4F  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, ___, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, k2D, ___, k2F }, \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, ___, k4F }  \
+}
+
+#define LAYOUT_65_iso( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \
+    k40, k41, k42,                k46,           k49, k4A, k4B, k4C, k4D, k4F  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, ___, ___, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, ___, k2F }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, ___, k3F }, \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4A, k4B, k4C, k4D, ___, k4F }  \
 }
diff --git a/keyboards/cutie_club/keebcats/dougal/info.json b/keyboards/cutie_club/keebcats/dougal/info.json
index 70c804e20d..f637be7a1a 100644
--- a/keyboards/cutie_club/keebcats/dougal/info.json
+++ b/keyboards/cutie_club/keebcats/dougal/info.json
@@ -79,6 +79,159 @@
                 { "x": 14, "y": 4 },
                 { "x": 15, "y": 4 }
             ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/cutie_club/keebcats/dougal/keymaps/default_65_ansi/keymap.c b/keyboards/cutie_club/keebcats/dougal/keymaps/default_65_ansi/keymap.c
new file mode 100644
index 0000000000..3de782f742
--- /dev/null
+++ b/keyboards/cutie_club/keebcats/dougal/keymaps/default_65_ansi/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 Cutie Club
+ *           2022 QMK / James Young (@noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_65_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        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_HOME,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/keyboards/cutie_club/keebcats/dougal/keymaps/default_65_iso/keymap.c b/keyboards/cutie_club/keebcats/dougal/keymaps/default_65_iso/keymap.c
new file mode 100644
index 0000000000..3154d3ea83
--- /dev/null
+++ b/keyboards/cutie_club/keebcats/dougal/keymaps/default_65_iso/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2021 Cutie Club
+ *           2022 QMK / James Young (@noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT_65_iso(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        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_HOME,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_iso(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_HOME,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PGUP,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+};

From ac6283e8361d20bf915e11aa8a490f32e980c0fb Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 5 Feb 2022 20:53:07 -0800
Subject: [PATCH 530/867] KBDfans KBD19x: add LAYOUT_iso (#16240)

---
 keyboards/kbdfans/kbd19x/info.json            | 125 +++++++++++++++++-
 keyboards/kbdfans/kbd19x/kbd19x.h             |  66 +++++----
 .../kbd19x/keymaps/default_iso/keymap.c       |  36 +++++
 keyboards/kbdfans/kbd19x/readme.md            |  15 ++-
 4 files changed, 207 insertions(+), 35 deletions(-)
 create mode 100644 keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c

diff --git a/keyboards/kbdfans/kbd19x/info.json b/keyboards/kbdfans/kbd19x/info.json
index b271d7e537..68832438d0 100644
--- a/keyboards/kbdfans/kbd19x/info.json
+++ b/keyboards/kbdfans/kbd19x/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "KBD19x",
     "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd19x",
-    "maintainer": "qmk",
+    "maintainer": "jshuf, mechmerlin",
     "layouts": {
         "LAYOUT_ansi": {
             "layout": [
@@ -23,6 +23,7 @@
                 {"label":"Pause", "x":16.5, "y":0},
                 {"label":"Insert", "x":17.5, "y":0},
                 {"label":"Home", "x":18.5, "y":0},
+
                 {"label":"`~", "x":0, "y":1.5},
                 {"label":"1!", "x":1, "y":1.5},
                 {"label":"2@", "x":2, "y":1.5},
@@ -41,6 +42,7 @@
                 {"label":"/", "x":16.5, "y":1.5},
                 {"label":"*", "x":17.5, "y":1.5},
                 {"label":"-", "x":18.5, "y":1.5},
+
                 {"label":"Tab", "x":0, "y":2.5, "w":1.5},
                 {"label":"Q", "x":1.5, "y":2.5},
                 {"label":"W", "x":2.5, "y":2.5},
@@ -59,6 +61,7 @@
                 {"label":"8", "x":16.5, "y":2.5},
                 {"label":"9", "x":17.5, "y":2.5},
                 {"label":"+", "x":18.5, "y":2.5, "h":2},
+
                 {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
                 {"label":"A", "x":1.75, "y":3.5},
                 {"label":"S", "x":2.75, "y":3.5},
@@ -75,6 +78,7 @@
                 {"label":"4", "x":15.5, "y":3.5},
                 {"label":"5", "x":16.5, "y":3.5},
                 {"label":"6", "x":17.5, "y":3.5},
+
                 {"label":"Shift", "x":0, "y":4.5, "w":2.25},
                 {"label":"Z", "x":2.25, "y":4.5},
                 {"label":"X", "x":3.25, "y":4.5},
@@ -92,6 +96,7 @@
                 {"label":"2", "x":16.5, "y":4.5},
                 {"label":"3", "x":17.5, "y":4.5},
                 {"label":"Enter", "x":18.5, "y":4.5, "h":2},
+
                 {"label":"Control", "x":0, "y":5.5, "w":1.25},
                 {"label":"GUI", "x":1.25, "y":5.5},
                 {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
@@ -100,8 +105,117 @@
                 {"label":"Fn", "x":10.75, "y":5.5},
                 {"label":"Control", "x":11.75, "y":5.5, "w":1.25},
                 {"label":"Left", "x":13.25, "y":5.75},
-                {"label":"Right", "x":14.25, "y":5.75},
-                {"label":"Down", "x":15.25, "y":5.75},
+                {"label":"Down", "x":14.25, "y":5.75},
+                {"label":"Right", "x":15.25, "y":5.75},
+                {"label":"0", "x":16.5, "y":5.5},
+                {"label":".", "x":17.5, "y":5.5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Extra Esc", "x":14, "y":0},
+                {"label":"PrtSc", "x":15.5, "y":0},
+                {"label":"Pause", "x":16.5, "y":0},
+                {"label":"Insert", "x":17.5, "y":0},
+                {"label":"Home", "x":18.5, "y":0},
+
+                {"label":"`\u00ac", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2\"", "x":2, "y":1.5},
+                {"label":"3\u00a3", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "x":10, "y":1.5},
+                {"label":"-_", "x":11, "y":1.5},
+                {"label":"=+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Num Lock", "x":15.5, "y":1.5},
+                {"label":"/", "x":16.5, "y":1.5},
+                {"label":"*", "x":17.5, "y":1.5},
+                {"label":"-", "x":18.5, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[{", "x":11.5, "y":2.5},
+                {"label":"]}", "x":12.5, "y":2.5},
+                {"label":"7", "x":15.5, "y":2.5},
+                {"label":"8", "x":16.5, "y":2.5},
+                {"label":"9", "x":17.5, "y":2.5},
+                {"label":"+", "x":18.5, "y":2.5, "h":2},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";:", "x":10.75, "y":3.5},
+                {"label":"'@", "x":11.75, "y":3.5},
+                {"label":"#~", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"label":"4", "x":15.5, "y":3.5},
+                {"label":"5", "x":16.5, "y":3.5},
+                {"label":"6", "x":17.5, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.5},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",<", "x":9.25, "y":4.5},
+                {"label":".>", "x":10.25, "y":4.5},
+                {"label":"/?", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"Up", "x":14.25, "y":4.75},
+                {"label":"1", "x":15.5, "y":4.5},
+                {"label":"2", "x":16.5, "y":4.5},
+                {"label":"3", "x":17.5, "y":4.5},
+                {"label":"Enter", "x":18.5, "y":4.5, "h":2},
+
+                {"label":"Control", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5},
+                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
+                {"label":"Space", "x":3.5, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":9.75, "y":5.5},
+                {"label":"Fn", "x":10.75, "y":5.5},
+                {"label":"Control", "x":11.75, "y":5.5, "w":1.25},
+                {"label":"Left", "x":13.25, "y":5.75},
+                {"label":"Down", "x":14.25, "y":5.75},
+                {"label":"Right", "x":15.25, "y":5.75},
                 {"label":"0", "x":16.5, "y":5.5},
                 {"label":".", "x":17.5, "y":5.5}
             ]
@@ -126,6 +240,7 @@
                 {"label":"Pause", "x":16.5, "y":0},
                 {"label":"Insert", "x":17.5, "y":0},
                 {"label":"Home", "x":18.5, "y":0},
+
                 {"label":"`~", "x":0, "y":1.5},
                 {"label":"1!", "x":1, "y":1.5},
                 {"label":"2@", "x":2, "y":1.5},
@@ -145,6 +260,7 @@
                 {"label":"/", "x":16.5, "y":1.5},
                 {"label":"*", "x":17.5, "y":1.5},
                 {"label":"-", "x":18.5, "y":1.5},
+
                 {"label":"Tab", "x":0, "y":2.5, "w":1.5},
                 {"label":"Q", "x":1.5, "y":2.5},
                 {"label":"W", "x":2.5, "y":2.5},
@@ -163,6 +279,7 @@
                 {"label":"8", "x":16.5, "y":2.5},
                 {"label":"9", "x":17.5, "y":2.5},
                 {"label":"Split + (Top)", "x":18.5, "y":2.5},
+
                 {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
                 {"label":"A", "x":1.75, "y":3.5},
                 {"label":"S", "x":2.75, "y":3.5},
@@ -180,6 +297,7 @@
                 {"label":"5", "x":16.5, "y":3.5},
                 {"label":"6", "x":17.5, "y":3.5},
                 {"label":"Split + (Bottom)", "x":18.5, "y":3.5},
+
                 {"label":"Shift", "x":0, "y":4.5, "w":1.25},
                 {"label":"ISO Backslash", "x":1.25, "y":4.5},
                 {"label":"Z", "x":2.25, "y":4.5},
@@ -198,6 +316,7 @@
                 {"label":"2", "x":16.5, "y":4.5},
                 {"label":"3", "x":17.5, "y":4.5},
                 {"label":"Split Enter (Top)", "x":18.5, "y":4.5},
+
                 {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
                 {"label":"GUI", "x":1.25, "y":5.5},
                 {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
diff --git a/keyboards/kbdfans/kbd19x/kbd19x.h b/keyboards/kbdfans/kbd19x/kbd19x.h
index 41c27230f2..d3766eadba 100644
--- a/keyboards/kbdfans/kbd19x/kbd19x.h
+++ b/keyboards/kbdfans/kbd19x/kbd19x.h
@@ -32,37 +32,26 @@ inline void kbd19x_nmlk_led_off(void)   { writePinLow(LED_NUM_LOCK_PIN); }
 // readability
 #define XXX KC_NO
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+/*
+ *              ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┬───┬───┬───┐
+ *              │00 ││01 │02 │03 │04 ││60 │61 │62 │63 ││05 │06 │07 │08 ││72 │ │09 │0A │0B │0C │
+ *              └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┴───┴───┴───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐    ┌───────┐
+ *              │10 │11 │12 │13 │14 │64 │65 │66 │67 │15 │16 │17 │18 │70 │71 │ │19 │1A │1B │1C │    │71     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┼───┤    └─┬─────┤                ┌───┐
+ *              │20   │21 │22 │23 │24 │68 │69 │6a │6b │25 │26 │27 │28 │73   │ │29 │2A │2B │2C │      │     │                │   │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┼───┤   ┌──┴┐38  │ ISO Enter      │2C │ 2u Plus
+ *  LShift      │30    │31 │32 │33 │34 │6c │75 │76 │77 │35 │36 │37 │38      │ │39 │3A │3B │3C │   │73 │    │                │   │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┼───┼───┼───┤   └───┴────┘                ├───┤
+ * │40      │   │40  │41 │42 │43 │44 │78 │79 │7a │7b │45 │46 │47 │48    │┌───┐│49 │4A │4B │4C │                             │   │
+ * └────────┘   ├────┼───┼───┴┬──┴───┴───┴───┴───┴───┴─┬─┴─┬─┴─┬─┴──┬───┘│74 │└───┼───┼───┼───┤                             │4C │ 2u Enter
+ *              │50  │51 │52  │59                      │55 │56 │57  │┌───┼───┼───┐│5A │5B │5C │                             │   │
+ *              └────┴───┴────┴────────────────────────┴───┴───┴────┘│58 │53 │54 │└───┴───┴───┘                             └───┘
+ *              ┌─────┬─────┬───────────────────────────┬─────┬─────┐└───┴───┴───┘
+ *              │50   │52   │59                         │55   │57   │ WKL
+ *              └─────┴─────┴───────────────────────────┴─────┴─────┘
  */
 
-// 2u backspace: XXX, k71
-// split backspace: k70, k71
-
-// 2u numpad +: k2c, XXX
-// split numpad +: k2c, k3c
-
-// 2u numpad enter: k4c, XXX
-// split numpad enter: k4c, k5c
-
-// 2.25u lshift: k40, XXX
-// split (1.25u, 1u) lshift: k40, k41
-
-// ANSI enter or ISO enter: k38
-// Key next to ISO enter: k72
-// backslash or NUHS: k73
-
-// left winkey: k50, k51, k52
-// left WKL: k50, XXX, k52
-
-// right winkey: k55, k56, k57
-// right WKL: k55, XXX, k57
-
 #define LAYOUT_all( \
   k00,  k01, k02, k03, k04,  k60, k61, k62, k63,  k05, k06, k07, k08,   k72,  k09, k0a, k0b, k0c, \
   k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18, k70, k71,  k19, k1a, k1b, k1c, \
@@ -100,3 +89,22 @@ inline void kbd19x_nmlk_led_off(void)   { writePinLow(LED_NUM_LOCK_PIN); }
   {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\
   {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\
 }
+
+#define LAYOUT_iso( \
+  k00,  k01, k02, k03, k04,  k60, k61, k62, k63,  k05, k06, k07, k08, k72,     k09, k0a, k0b, k0c, \
+  k10, k11, k12, k13, k14, k64, k65, k66, k67, k15, k16, k17, k18,    k71,     k19, k1a, k1b, k1c, \
+  k20,  k21, k22, k23, k24, k68, k69, k6a, k6b, k25, k26, k27, k28,            k29, k2a, k2b, k2c, \
+  k30,    k31, k32, k33, k34, k6c, k75, k76, k77, k35, k36, k37, k73, k38,     k39, k3a, k3b,      \
+  k40, k41, k42, k43, k44, k78, k79, k7a, k7b, k45, k46, k47,    k48,   k74,   k49, k4a, k4b, k4c, \
+  k50, k51, k52,                k59,            k55, k56, k57,     k58, k53, k54,   k5a, k5b       \
+)\
+{\
+  {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c},\
+  {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c},\
+  {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c},\
+  {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX},\
+  {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c},\
+  {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, XXX},\
+  {k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6a, k6b, k6c},\
+  {XXX, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a, k7b, XXX},\
+}
diff --git a/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c b/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..4382cafcb6
--- /dev/null
+++ b/keyboards/kbdfans/kbd19x/keymaps/default_iso/keymap.c
@@ -0,0 +1,36 @@
+/*
+Copyright 2018 Jeff Shufelt <jshuf@puppyfish.com> @jshuf
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_iso( /* Base */
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  BL_STEP,          KC_PSCR, KC_SLCK, KC_PAUS, KC_PGDN,
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_P4,   KC_P5,   KC_P6,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,     KC_UP,        KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,      KC_P0,   KC_PDOT
+  ),
+  [1] = LAYOUT_iso( /* Func */
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  RGB_TOG,         _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  RESET,           _______, _______, _______, _______,
+    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,                   _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______,
+    _______, _______, _______,                            _______,                   _______, _______, _______,     _______, _______, _______,      _______, _______
+  ),
+};
diff --git a/keyboards/kbdfans/kbd19x/readme.md b/keyboards/kbdfans/kbd19x/readme.md
index da37474adc..910b2f1b89 100644
--- a/keyboards/kbdfans/kbd19x/readme.md
+++ b/keyboards/kbdfans/kbd19x/readme.md
@@ -8,14 +8,23 @@
 
 The KBD19x is a compact-1800 keyboard kit produced by KBDfans, offering a number of layout options.
 
-**Reset Sequence:** Using this firmware sets `BOOTLOADER_ENABLE` to `lite`. While plugging in, hold the top left key, commonly programmed as `Esc` to put your board into bootloader mode. 
-
 * Keyboard Maintainer: [jshuf](https://github.com/jshuf), [MechMerlin](https://github.com/mechmerlin)
 * Hardware Supported: KBD19x PCB
-* Hardware Availability: [KBDfans](https://kbdfans.cn)
+* Hardware Availability: [~~KBDfans~~](https://kbdfans.com/collections/95-kbd19x/products/kbdfans-kbd19x-pcb), [~~AliExpress~~](https://www.aliexpress.com/item/32835566884.html) (no longer available)
 
 Make example for this keyboard (after setting up your build environment):
 
     make kbdfans/kbd19x:default
 
+Flashing example for this keyboard:
+
+    make kbdfans/kbd19x:default:flash
+
+## Bootloader
+
+To reset the board into bootloader mode, do one of the following:
+
+* **Bootmagic reset**: Hold the `Esc` key while connecting the USB cable (also erases persistent settings)
+* **Keycode in keymap**: Press the key mapped to `RESET` if it is available (`Fn`+`Backspace` by 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).

From 317252612fb68ec160fd5829500cce77d9d7fa58 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 5 Feb 2022 20:53:51 -0800
Subject: [PATCH 531/867] Noxary Valhalla: refactor LAYOUT_all, add QMK
 Configurator data (#16241)

---
 keyboards/noxary/valhalla/info.json           | 88 +++++++++++++++++++
 .../noxary/valhalla/keymaps/default/keymap.c  | 48 +++++-----
 .../noxary/valhalla/keymaps/via/keymap.c      | 48 +++++-----
 keyboards/noxary/valhalla/valhalla.h          |  4 +-
 4 files changed, 138 insertions(+), 50 deletions(-)
 create mode 100644 keyboards/noxary/valhalla/info.json

diff --git a/keyboards/noxary/valhalla/info.json b/keyboards/noxary/valhalla/info.json
new file mode 100644
index 0000000000..01d31bce6b
--- /dev/null
+++ b/keyboards/noxary/valhalla/info.json
@@ -0,0 +1,88 @@
+{
+    "keyboard_name": "Valhalla",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"`~", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":9, "y":0},
+                {"label":"8*", "x":10, "y":0},
+                {"label":"9(", "x":11, "y":0},
+                {"label":"0)", "x":12, "y":0},
+                {"label":"-_", "x":13, "y":0},
+                {"label":"=+", "x":14, "y":0},
+                {"label":"Backspace", "x":15, "y":0},
+                {"label":"Backspace", "x":16, "y":0},
+                {"label":"Delete", "x":17, "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":8.5, "y":1},
+                {"label":"U", "x":9.5, "y":1},
+                {"label":"I", "x":10.5, "y":1},
+                {"label":"O", "x":11.5, "y":1},
+                {"label":"P", "x":12.5, "y":1},
+                {"label":"[{", "x":13.5, "y":1},
+                {"label":"]}", "x":14.5, "y":1},
+                {"label":"\\|", "x":15.5, "y":1, "w":1.5},
+                {"label":"Page Up", "x":17, "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":8.75, "y":2},
+                {"label":"J", "x":9.75, "y":2},
+                {"label":"K", "x":10.75, "y":2},
+                {"label":"L", "x":11.75, "y":2},
+                {"label":";:", "x":12.75, "y":2},
+                {"label":"'\"", "x":13.75, "y":2},
+                {"label":"Enter", "x":14.75, "y":2, "w":2.25},
+                {"label":"Page Down", "x":17, "y":2},
+
+                {"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":"B", "x":8.25, "y":3},
+                {"label":"N", "x":9.25, "y":3},
+                {"label":"M", "x":10.25, "y":3},
+                {"label":",<", "x":11.25, "y":3},
+                {"label":".>", "x":12.25, "y":3},
+                {"label":"/?", "x":13.25, "y":3},
+                {"label":"Shift", "x":14.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":16, "y":3},
+                {"label":"Fn", "x":17, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":1.75},
+                {"label":"Space", "x":5.75, "y":4},
+                {"label":"Space", "x":8, "y":4},
+                {"label":"Space", "x":9, "y":4, "w":1.25},
+                {"label":"Alt", "x":10.25, "y":4, "w":1.5},
+                {"label":"GUI", "x":11.75, "y":4},
+                {"label":"Ctrl", "x":12.75, "y":4, "w":1.5},
+                {"label":"\u2190", "x":15, "y":4},
+                {"label":"\u2193", "x":16, "y":4},
+                {"label":"\u2192", "x":17, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/noxary/valhalla/keymaps/default/keymap.c b/keyboards/noxary/valhalla/keymaps/default/keymap.c
index 95c9120066..fb9aab0968 100755
--- a/keyboards/noxary/valhalla/keymaps/default/keymap.c
+++ b/keyboards/noxary/valhalla/keymaps/default/keymap.c
@@ -17,32 +17,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [0] = LAYOUT_all(
-        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_BSPC,
+    [0] = LAYOUT_all(
+        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_BSPC, KC_DEL ,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-        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_PGDN, KC_DEL ,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_PGDN,
         KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP,   MO(1)  ,
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
-),
-   [1] = LAYOUT_all(
-	RESET  , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-),
+    ),
+    [1] = LAYOUT_all(
+        RESET  , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
     [2] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-),
-   [3] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-)
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    )
 };
diff --git a/keyboards/noxary/valhalla/keymaps/via/keymap.c b/keyboards/noxary/valhalla/keymaps/via/keymap.c
index 95c9120066..fb9aab0968 100755
--- a/keyboards/noxary/valhalla/keymaps/via/keymap.c
+++ b/keyboards/noxary/valhalla/keymaps/via/keymap.c
@@ -17,32 +17,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [0] = LAYOUT_all(
-        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_BSPC,
+    [0] = LAYOUT_all(
+        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_BSPC, KC_DEL ,
         KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-        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_PGDN, KC_DEL ,
+        KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,          KC_ENT , KC_PGDN,
         KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP,   MO(1)  ,
         KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
-),
-   [1] = LAYOUT_all(
-	RESET  , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-),
+    ),
+    [1] = LAYOUT_all(
+        RESET  , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
     [2] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-),
-   [3] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-)
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    )
 };
diff --git a/keyboards/noxary/valhalla/valhalla.h b/keyboards/noxary/valhalla/valhalla.h
index 5369d9d355..cd6f8e36d0 100644
--- a/keyboards/noxary/valhalla/valhalla.h
+++ b/keyboards/noxary/valhalla/valhalla.h
@@ -22,9 +22,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ___ KC_NO
 
 #define LAYOUT_all( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2E, \
 	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2D, \
 	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
 	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49,           K4C, K4D, K4E  \
 ) { \

From 88a22268eb3f932b485f524dadc52c93163ae839 Mon Sep 17 00:00:00 2001
From: Boris Churzin <essl.main@gmail.com>
Date: Sun, 6 Feb 2022 06:58:15 +0200
Subject: [PATCH 532/867] [Keyboard] oryx rules.mk rgblight (#16229)

Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
---
 keyboards/planck/keymaps/oryx/keymap.c | 2 +-
 keyboards/planck/keymaps/oryx/rules.mk | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/keyboards/planck/keymaps/oryx/keymap.c b/keyboards/planck/keymaps/oryx/keymap.c
index e84b9913a8..0368c98420 100644
--- a/keyboards/planck/keymaps/oryx/keymap.c
+++ b/keyboards/planck/keymaps/oryx/keymap.c
@@ -91,7 +91,7 @@ void set_layer_color(int layer) {
 }
 
 void rgb_matrix_indicators_user(void) {
-    if (g_suspend_state || keyboard_config.disable_layer_led) {
+    if (keyboard_config.disable_layer_led) {
         return;
     }
     switch (biton32(layer_state)) {
diff --git a/keyboards/planck/keymaps/oryx/rules.mk b/keyboards/planck/keymaps/oryx/rules.mk
index 1e29b5f218..5f561b32e1 100644
--- a/keyboards/planck/keymaps/oryx/rules.mk
+++ b/keyboards/planck/keymaps/oryx/rules.mk
@@ -3,5 +3,7 @@
 CONSOLE_ENABLE = no
 COMMAND_ENABLE = no
 MOUSEKEY_ENABLE = no
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = yes
 WEBUSB_ENABLE = yes
 ORYX_ENABLE = yes

From 38e085df87820941bcfcdce3b3bc16e46855f557 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Sun, 6 Feb 2022 13:16:21 +0800
Subject: [PATCH 533/867] move input club keyboards into vendor folder (#15788)

---
 keyboards/{ => input_club}/ergodox_infinity/MEMO.txt |  0
 keyboards/{ => input_club}/ergodox_infinity/chconf.h |  0
 keyboards/{ => input_club}/ergodox_infinity/config.h |  0
 .../ergodox_infinity/ergodox_infinity.c              |  0
 .../ergodox_infinity/ergodox_infinity.h              |  0
 .../{ => input_club}/ergodox_infinity/halconf.h      |  0
 .../{ => input_club}/ergodox_infinity/info.json      |  0
 .../ergodox_infinity/keymaps/default/keymap.c        |  0
 .../ergodox_infinity/keymaps/dudeofawesome/README.md |  0
 .../ergodox_infinity/keymaps/dudeofawesome/config.h  |  0
 .../ergodox_infinity/keymaps/dudeofawesome/keymap.c  |  0
 .../ergodox_infinity/keymaps/dudeofawesome/layers.h  |  0
 .../ergodox_infinity/keymaps/gordon/config.h         |  0
 .../ergodox_infinity/keymaps/gordon/keymap.c         |  0
 .../ergodox_infinity/keymaps/gordon/rules.mk         |  0
 .../ergodox_infinity/keymaps/halfkeyboard/config.h   |  0
 .../ergodox_infinity/keymaps/halfkeyboard/keymap.c   |  0
 .../ergodox_infinity/keymaps/halfkeyboard/rules.mk   |  0
 .../ergodox_infinity/keymaps/input_club/README.md    |  0
 .../ergodox_infinity/keymaps/input_club/keymap.c     |  0
 .../ergodox_infinity/keymaps/narze/config.h          |  0
 .../ergodox_infinity/keymaps/narze/default.png.md    |  0
 .../keymaps/narze/default_highres.png.md             |  0
 .../ergodox_infinity/keymaps/narze/keymap.c          |  0
 .../ergodox_infinity/keymaps/narze/readme.md         |  0
 .../ergodox_infinity/keymaps/narze/rules.mk          |  0
 .../ergodox_infinity/keymaps/narze/visualizer.c      |  0
 .../ergodox_infinity/keymaps/nordic_ergo/keymap.c    |  0
 .../ergodox_infinity/keymaps/nordic_ergo/readme.md   |  0
 .../ergodox_infinity/keymaps/not-quite-neo/keymap.c  |  0
 .../ergodox_infinity/keymaps/not-quite-neo/readme.md |  0
 .../ergodox_infinity/keymaps/not-quite-neo/rules.mk  |  0
 .../ergodox_infinity/keymaps/rask/README.md          |  0
 .../ergodox_infinity/keymaps/rask/keymap.c           |  0
 .../ergodox_infinity/keymaps/rjhilgefort/keymap.c    |  0
 .../ergodox_infinity/keymaps/rjhilgefort/readme.md   |  0
 .../keymaps/trulyergonomic/README.md                 |  0
 .../ergodox_infinity/keymaps/trulyergonomic/keymap.c |  0
 .../{ => input_club}/ergodox_infinity/mcuconf.h      |  0
 .../{ => input_club}/ergodox_infinity/readme.md      | 12 ++++++------
 keyboards/{ => input_club}/ergodox_infinity/rules.mk |  0
 keyboards/{ => input_club}/infinity60/chconf.h       |  0
 keyboards/{ => input_club}/infinity60/config.h       |  0
 keyboards/{ => input_club}/infinity60/halconf.h      |  0
 keyboards/{ => input_club}/infinity60/infinity60.c   |  0
 keyboards/{ => input_club}/infinity60/infinity60.h   |  0
 keyboards/{ => input_club}/infinity60/info.json      |  0
 .../infinity60/keymaps/default/keymap.c              |  0
 .../infinity60/keymaps/depariel/keymap.c             |  0
 .../infinity60/keymaps/hasu/keymap.c                 |  0
 .../infinity60/keymaps/jpetermans/config.h           |  0
 .../infinity60/keymaps/jpetermans/keymap.c           |  0
 .../infinity60/keymaps/jpetermans/readme.md          |  0
 keyboards/{ => input_club}/infinity60/led.c          |  0
 keyboards/{ => input_club}/infinity60/led/config.h   |  0
 keyboards/{ => input_club}/infinity60/led/readme.md  |  0
 keyboards/{ => input_club}/infinity60/led/rules.mk   |  0
 .../{ => input_club}/infinity60/led_controller.c     |  0
 .../{ => input_club}/infinity60/led_controller.h     |  0
 keyboards/{ => input_club}/infinity60/mcuconf.h      |  0
 keyboards/{ => input_club}/infinity60/readme.md      |  4 ++--
 keyboards/{ => input_club}/infinity60/rev1/config.h  |  0
 keyboards/{ => input_club}/infinity60/rev1/readme.md |  0
 keyboards/{ => input_club}/infinity60/rev1/rules.mk  |  0
 keyboards/{ => input_club}/infinity60/rules.mk       |  2 +-
 keyboards/{ => input_club}/k_type/chconf.h           |  0
 keyboards/{ => input_club}/k_type/config.h           |  0
 keyboards/{ => input_club}/k_type/halconf.h          |  0
 keyboards/{ => input_club}/k_type/i2c_master.c       |  0
 keyboards/{ => input_club}/k_type/i2c_master.h       |  0
 keyboards/{ => input_club}/k_type/info.json          |  0
 keyboards/{ => input_club}/k_type/is31fl3733-dual.c  |  0
 keyboards/{ => input_club}/k_type/is31fl3733-dual.h  |  0
 keyboards/{ => input_club}/k_type/k_type-rgbdriver.c |  0
 keyboards/{ => input_club}/k_type/k_type.c           |  0
 keyboards/{ => input_club}/k_type/k_type.h           |  0
 .../k_type/keymaps/andrew-fahmy/config.h             |  0
 .../k_type/keymaps/andrew-fahmy/keymap.c             |  0
 .../k_type/keymaps/andrew-fahmy/rules.mk             |  0
 .../{ => input_club}/k_type/keymaps/belak/keymap.c   |  0
 .../{ => input_club}/k_type/keymaps/default/keymap.c |  0
 .../{ => input_club}/k_type/keymaps/default/rules.mk |  0
 keyboards/{ => input_club}/k_type/mcuconf.h          |  0
 keyboards/{ => input_club}/k_type/readme.md          |  4 ++--
 keyboards/{ => input_club}/k_type/rules.mk           |  0
 .../{ => input_club}/whitefox/board_is31fl3731c.h    |  0
 keyboards/{ => input_club}/whitefox/chconf.h         |  0
 keyboards/{ => input_club}/whitefox/config.h         |  0
 keyboards/{ => input_club}/whitefox/halconf.h        |  0
 keyboards/{ => input_club}/whitefox/info.json        |  0
 .../whitefox/keymaps/billypython/config.h            |  0
 .../whitefox/keymaps/billypython/keymap.c            |  0
 .../whitefox/keymaps/billypython/rules.mk            |  0
 .../whitefox/keymaps/default/keymap.c                |  0
 .../whitefox/keymaps/dhertz/keymap.c                 |  0
 .../whitefox/keymaps/dudeofawesome/keymap.c          |  0
 .../whitefox/keymaps/dudeofawesome/readme.md         |  0
 .../whitefox/keymaps/jetpacktuxedo/keymap.c          |  0
 .../whitefox/keymaps/jetpacktuxedo/readme.md         |  0
 .../whitefox/keymaps/jetpacktuxedo/rules.mk          |  0
 .../whitefox/keymaps/kim-kim/keymap.c                |  0
 .../whitefox/keymaps/konstantin/config.h             |  0
 .../whitefox/keymaps/konstantin/keymap.c             |  0
 .../whitefox/keymaps/konstantin/rules.mk             |  0
 .../whitefox/keymaps/matt3o/keymap.c                 |  0
 .../whitefox/keymaps/mattrighetti/keymap.c           |  0
 .../whitefox/keymaps/mattrighetti/rules.mk           |  0
 keyboards/{ => input_club}/whitefox/mcuconf.h        |  0
 keyboards/{ => input_club}/whitefox/readme.md        |  4 ++--
 keyboards/{ => input_club}/whitefox/rules.mk         |  0
 keyboards/{ => input_club}/whitefox/whitefox.c       |  0
 keyboards/{ => input_club}/whitefox/whitefox.h       |  0
 112 files changed, 13 insertions(+), 13 deletions(-)
 rename keyboards/{ => input_club}/ergodox_infinity/MEMO.txt (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/chconf.h (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/config.h (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/ergodox_infinity.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/ergodox_infinity.h (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/halconf.h (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/info.json (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/default/keymap.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/dudeofawesome/README.md (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/dudeofawesome/config.h (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/dudeofawesome/keymap.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/dudeofawesome/layers.h (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/gordon/config.h (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/gordon/keymap.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/gordon/rules.mk (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/halfkeyboard/config.h (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/halfkeyboard/keymap.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/halfkeyboard/rules.mk (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/input_club/README.md (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/input_club/keymap.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/narze/config.h (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/narze/default.png.md (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/narze/default_highres.png.md (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/narze/keymap.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/narze/readme.md (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/narze/rules.mk (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/narze/visualizer.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/nordic_ergo/keymap.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/nordic_ergo/readme.md (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/not-quite-neo/keymap.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/not-quite-neo/readme.md (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/not-quite-neo/rules.mk (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/rask/README.md (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/rask/keymap.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/rjhilgefort/keymap.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/rjhilgefort/readme.md (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/trulyergonomic/README.md (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/keymaps/trulyergonomic/keymap.c (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/mcuconf.h (100%)
 rename keyboards/{ => input_club}/ergodox_infinity/readme.md (83%)
 rename keyboards/{ => input_club}/ergodox_infinity/rules.mk (100%)
 rename keyboards/{ => input_club}/infinity60/chconf.h (100%)
 rename keyboards/{ => input_club}/infinity60/config.h (100%)
 rename keyboards/{ => input_club}/infinity60/halconf.h (100%)
 rename keyboards/{ => input_club}/infinity60/infinity60.c (100%)
 rename keyboards/{ => input_club}/infinity60/infinity60.h (100%)
 rename keyboards/{ => input_club}/infinity60/info.json (100%)
 rename keyboards/{ => input_club}/infinity60/keymaps/default/keymap.c (100%)
 rename keyboards/{ => input_club}/infinity60/keymaps/depariel/keymap.c (100%)
 rename keyboards/{ => input_club}/infinity60/keymaps/hasu/keymap.c (100%)
 rename keyboards/{ => input_club}/infinity60/keymaps/jpetermans/config.h (100%)
 rename keyboards/{ => input_club}/infinity60/keymaps/jpetermans/keymap.c (100%)
 rename keyboards/{ => input_club}/infinity60/keymaps/jpetermans/readme.md (100%)
 rename keyboards/{ => input_club}/infinity60/led.c (100%)
 rename keyboards/{ => input_club}/infinity60/led/config.h (100%)
 rename keyboards/{ => input_club}/infinity60/led/readme.md (100%)
 rename keyboards/{ => input_club}/infinity60/led/rules.mk (100%)
 rename keyboards/{ => input_club}/infinity60/led_controller.c (100%)
 rename keyboards/{ => input_club}/infinity60/led_controller.h (100%)
 rename keyboards/{ => input_club}/infinity60/mcuconf.h (100%)
 rename keyboards/{ => input_club}/infinity60/readme.md (86%)
 rename keyboards/{ => input_club}/infinity60/rev1/config.h (100%)
 rename keyboards/{ => input_club}/infinity60/rev1/readme.md (100%)
 rename keyboards/{ => input_club}/infinity60/rev1/rules.mk (100%)
 rename keyboards/{ => input_club}/infinity60/rules.mk (95%)
 rename keyboards/{ => input_club}/k_type/chconf.h (100%)
 rename keyboards/{ => input_club}/k_type/config.h (100%)
 rename keyboards/{ => input_club}/k_type/halconf.h (100%)
 rename keyboards/{ => input_club}/k_type/i2c_master.c (100%)
 rename keyboards/{ => input_club}/k_type/i2c_master.h (100%)
 rename keyboards/{ => input_club}/k_type/info.json (100%)
 rename keyboards/{ => input_club}/k_type/is31fl3733-dual.c (100%)
 rename keyboards/{ => input_club}/k_type/is31fl3733-dual.h (100%)
 rename keyboards/{ => input_club}/k_type/k_type-rgbdriver.c (100%)
 rename keyboards/{ => input_club}/k_type/k_type.c (100%)
 rename keyboards/{ => input_club}/k_type/k_type.h (100%)
 rename keyboards/{ => input_club}/k_type/keymaps/andrew-fahmy/config.h (100%)
 rename keyboards/{ => input_club}/k_type/keymaps/andrew-fahmy/keymap.c (100%)
 rename keyboards/{ => input_club}/k_type/keymaps/andrew-fahmy/rules.mk (100%)
 rename keyboards/{ => input_club}/k_type/keymaps/belak/keymap.c (100%)
 rename keyboards/{ => input_club}/k_type/keymaps/default/keymap.c (100%)
 rename keyboards/{ => input_club}/k_type/keymaps/default/rules.mk (100%)
 rename keyboards/{ => input_club}/k_type/mcuconf.h (100%)
 rename keyboards/{ => input_club}/k_type/readme.md (90%)
 rename keyboards/{ => input_club}/k_type/rules.mk (100%)
 rename keyboards/{ => input_club}/whitefox/board_is31fl3731c.h (100%)
 rename keyboards/{ => input_club}/whitefox/chconf.h (100%)
 rename keyboards/{ => input_club}/whitefox/config.h (100%)
 rename keyboards/{ => input_club}/whitefox/halconf.h (100%)
 rename keyboards/{ => input_club}/whitefox/info.json (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/billypython/config.h (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/billypython/keymap.c (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/billypython/rules.mk (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/default/keymap.c (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/dhertz/keymap.c (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/dudeofawesome/keymap.c (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/dudeofawesome/readme.md (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/jetpacktuxedo/keymap.c (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/jetpacktuxedo/readme.md (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/jetpacktuxedo/rules.mk (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/kim-kim/keymap.c (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/konstantin/config.h (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/konstantin/keymap.c (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/konstantin/rules.mk (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/matt3o/keymap.c (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/mattrighetti/keymap.c (100%)
 rename keyboards/{ => input_club}/whitefox/keymaps/mattrighetti/rules.mk (100%)
 rename keyboards/{ => input_club}/whitefox/mcuconf.h (100%)
 rename keyboards/{ => input_club}/whitefox/readme.md (87%)
 rename keyboards/{ => input_club}/whitefox/rules.mk (100%)
 rename keyboards/{ => input_club}/whitefox/whitefox.c (100%)
 rename keyboards/{ => input_club}/whitefox/whitefox.h (100%)

diff --git a/keyboards/ergodox_infinity/MEMO.txt b/keyboards/input_club/ergodox_infinity/MEMO.txt
similarity index 100%
rename from keyboards/ergodox_infinity/MEMO.txt
rename to keyboards/input_club/ergodox_infinity/MEMO.txt
diff --git a/keyboards/ergodox_infinity/chconf.h b/keyboards/input_club/ergodox_infinity/chconf.h
similarity index 100%
rename from keyboards/ergodox_infinity/chconf.h
rename to keyboards/input_club/ergodox_infinity/chconf.h
diff --git a/keyboards/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
similarity index 100%
rename from keyboards/ergodox_infinity/config.h
rename to keyboards/input_club/ergodox_infinity/config.h
diff --git a/keyboards/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
similarity index 100%
rename from keyboards/ergodox_infinity/ergodox_infinity.c
rename to keyboards/input_club/ergodox_infinity/ergodox_infinity.c
diff --git a/keyboards/ergodox_infinity/ergodox_infinity.h b/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
similarity index 100%
rename from keyboards/ergodox_infinity/ergodox_infinity.h
rename to keyboards/input_club/ergodox_infinity/ergodox_infinity.h
diff --git a/keyboards/ergodox_infinity/halconf.h b/keyboards/input_club/ergodox_infinity/halconf.h
similarity index 100%
rename from keyboards/ergodox_infinity/halconf.h
rename to keyboards/input_club/ergodox_infinity/halconf.h
diff --git a/keyboards/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
similarity index 100%
rename from keyboards/ergodox_infinity/info.json
rename to keyboards/input_club/ergodox_infinity/info.json
diff --git a/keyboards/ergodox_infinity/keymaps/default/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/default/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/README.md b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/README.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/dudeofawesome/README.md
rename to keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/README.md
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/config.h b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/config.h
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/dudeofawesome/config.h
rename to keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/config.h
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/dudeofawesome/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/layers.h b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/layers.h
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/dudeofawesome/layers.h
rename to keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/layers.h
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/config.h b/keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/gordon/config.h
rename to keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/gordon/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/gordon/rules.mk
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/gordon/rules.mk
rename to keyboards/input_club/ergodox_infinity/keymaps/gordon/rules.mk
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/config.h b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/config.h
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/halfkeyboard/config.h
rename to keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/config.h
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/rules.mk
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/halfkeyboard/rules.mk
rename to keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/rules.mk
diff --git a/keyboards/ergodox_infinity/keymaps/input_club/README.md b/keyboards/input_club/ergodox_infinity/keymaps/input_club/README.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/input_club/README.md
rename to keyboards/input_club/ergodox_infinity/keymaps/input_club/README.md
diff --git a/keyboards/ergodox_infinity/keymaps/input_club/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/input_club/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/narze/config.h b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/config.h
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/config.h
diff --git a/keyboards/ergodox_infinity/keymaps/narze/default.png.md b/keyboards/input_club/ergodox_infinity/keymaps/narze/default.png.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/default.png.md
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/default.png.md
diff --git a/keyboards/ergodox_infinity/keymaps/narze/default_highres.png.md b/keyboards/input_club/ergodox_infinity/keymaps/narze/default_highres.png.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/default_highres.png.md
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/default_highres.png.md
diff --git a/keyboards/ergodox_infinity/keymaps/narze/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/narze/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/narze/readme.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/readme.md
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/readme.md
diff --git a/keyboards/ergodox_infinity/keymaps/narze/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/narze/rules.mk
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/rules.mk
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/rules.mk
diff --git a/keyboards/ergodox_infinity/keymaps/narze/visualizer.c b/keyboards/input_club/ergodox_infinity/keymaps/narze/visualizer.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/narze/visualizer.c
rename to keyboards/input_club/ergodox_infinity/keymaps/narze/visualizer.c
diff --git a/keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/nordic_ergo/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/readme.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/nordic_ergo/readme.md
rename to keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/readme.md
diff --git a/keyboards/ergodox_infinity/keymaps/not-quite-neo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/not-quite-neo/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/not-quite-neo/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/readme.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/not-quite-neo/readme.md
rename to keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/readme.md
diff --git a/keyboards/ergodox_infinity/keymaps/not-quite-neo/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/rules.mk
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/not-quite-neo/rules.mk
rename to keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/rules.mk
diff --git a/keyboards/ergodox_infinity/keymaps/rask/README.md b/keyboards/input_club/ergodox_infinity/keymaps/rask/README.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/rask/README.md
rename to keyboards/input_club/ergodox_infinity/keymaps/rask/README.md
diff --git a/keyboards/ergodox_infinity/keymaps/rask/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/rask/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/rjhilgefort/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/rjhilgefort/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/rjhilgefort/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/readme.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/rjhilgefort/readme.md
rename to keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/readme.md
diff --git a/keyboards/ergodox_infinity/keymaps/trulyergonomic/README.md b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/README.md
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/trulyergonomic/README.md
rename to keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/README.md
diff --git a/keyboards/ergodox_infinity/keymaps/trulyergonomic/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
similarity index 100%
rename from keyboards/ergodox_infinity/keymaps/trulyergonomic/keymap.c
rename to keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
diff --git a/keyboards/ergodox_infinity/mcuconf.h b/keyboards/input_club/ergodox_infinity/mcuconf.h
similarity index 100%
rename from keyboards/ergodox_infinity/mcuconf.h
rename to keyboards/input_club/ergodox_infinity/mcuconf.h
diff --git a/keyboards/ergodox_infinity/readme.md b/keyboards/input_club/ergodox_infinity/readme.md
similarity index 83%
rename from keyboards/ergodox_infinity/readme.md
rename to keyboards/input_club/ergodox_infinity/readme.md
index c51bdd7c82..1f8b643340 100644
--- a/keyboards/ergodox_infinity/readme.md
+++ b/keyboards/input_club/ergodox_infinity/readme.md
@@ -5,19 +5,19 @@ for the left and right halves seperately.  To flash them:
 
   - Make sure you are in the top-level qmk_firmware directory
 
-  - Build the firmware with `make ergodox_infinity:keymapname`
+  - Build the firmware with `make input_club/ergodox_infinity:keymapname`
 
   - Plug in the left hand keyboard only.
 
   - Press the program button (back of keyboard, above thumb pad).
 
-  - Install the firmware with `sudo make ergodox_infinity:keymapname:dfu-util`
+  - Install the firmware with `sudo make input_club/ergodox_infinity:keymapname:dfu-util`
 
   - Plug in the right hand keyboard only.
 
   - Press the program button (back of keyboard, above thumb pad).
 
-  - Install the firmware with `sudo make ergodox_infinity:keymapname:dfu-util`
+  - Install the firmware with `sudo make input_club/ergodox_infinity:keymapname:dfu-util`
 
 More information on the Infinity firmware is available in the [TMK/chibios for
 Input Club Infinity Ergodox](https://github.com/fredizzimo/infinity_ergodox/blob/master/README.md)
@@ -43,7 +43,7 @@ They only need to be done once, unless you reset the EEPROM later.
 
   - Plug in the left keyboard half to the computer, and press its program button.
 
-  - Flash the left half with `make ergodox_infinity:default:dfu-util-split-left`
+  - Flash the left half with `make input_club/ergodox_infinity:default:dfu-util-split-left`
     (If you need to use a different method to flash your keyboard, still run this command,
     and abort it with Ctrl+C when the flashing attempts starts to print errors,
     then flash the built firmware).
@@ -53,13 +53,13 @@ They only need to be done once, unless you reset the EEPROM later.
 
   - Plug in the right keyboard half to the computer, and press its program button.
 
-  - Flash the right half with `make ergodox_infinity:default:dfu-util-split-right`
+  - Flash the right half with `make input_club/ergodox_infinity:default:dfu-util-split-right`
 
   - On the right half, press the top vertical 1.5U key (second from the top in the leftmost column) once,
     then the 1U key at the bottom in the opposite corner (bottom right corner).
 
   - Add `#define EE_HANDS` to the config.h file of your keymap, and build your firmware using
-    `make ergodox_infinity:keymapname`.
+    `make input_club/ergodox_infinity:keymapname`.
 
   - After this, you can flash both halves with the same firmware, _without_ risking a mirrored keyboard when connected the wrong way.
     If you reset your EEPROM later, you'll have to follow these steps again, though.
diff --git a/keyboards/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk
similarity index 100%
rename from keyboards/ergodox_infinity/rules.mk
rename to keyboards/input_club/ergodox_infinity/rules.mk
diff --git a/keyboards/infinity60/chconf.h b/keyboards/input_club/infinity60/chconf.h
similarity index 100%
rename from keyboards/infinity60/chconf.h
rename to keyboards/input_club/infinity60/chconf.h
diff --git a/keyboards/infinity60/config.h b/keyboards/input_club/infinity60/config.h
similarity index 100%
rename from keyboards/infinity60/config.h
rename to keyboards/input_club/infinity60/config.h
diff --git a/keyboards/infinity60/halconf.h b/keyboards/input_club/infinity60/halconf.h
similarity index 100%
rename from keyboards/infinity60/halconf.h
rename to keyboards/input_club/infinity60/halconf.h
diff --git a/keyboards/infinity60/infinity60.c b/keyboards/input_club/infinity60/infinity60.c
similarity index 100%
rename from keyboards/infinity60/infinity60.c
rename to keyboards/input_club/infinity60/infinity60.c
diff --git a/keyboards/infinity60/infinity60.h b/keyboards/input_club/infinity60/infinity60.h
similarity index 100%
rename from keyboards/infinity60/infinity60.h
rename to keyboards/input_club/infinity60/infinity60.h
diff --git a/keyboards/infinity60/info.json b/keyboards/input_club/infinity60/info.json
similarity index 100%
rename from keyboards/infinity60/info.json
rename to keyboards/input_club/infinity60/info.json
diff --git a/keyboards/infinity60/keymaps/default/keymap.c b/keyboards/input_club/infinity60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/infinity60/keymaps/default/keymap.c
rename to keyboards/input_club/infinity60/keymaps/default/keymap.c
diff --git a/keyboards/infinity60/keymaps/depariel/keymap.c b/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
similarity index 100%
rename from keyboards/infinity60/keymaps/depariel/keymap.c
rename to keyboards/input_club/infinity60/keymaps/depariel/keymap.c
diff --git a/keyboards/infinity60/keymaps/hasu/keymap.c b/keyboards/input_club/infinity60/keymaps/hasu/keymap.c
similarity index 100%
rename from keyboards/infinity60/keymaps/hasu/keymap.c
rename to keyboards/input_club/infinity60/keymaps/hasu/keymap.c
diff --git a/keyboards/infinity60/keymaps/jpetermans/config.h b/keyboards/input_club/infinity60/keymaps/jpetermans/config.h
similarity index 100%
rename from keyboards/infinity60/keymaps/jpetermans/config.h
rename to keyboards/input_club/infinity60/keymaps/jpetermans/config.h
diff --git a/keyboards/infinity60/keymaps/jpetermans/keymap.c b/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c
similarity index 100%
rename from keyboards/infinity60/keymaps/jpetermans/keymap.c
rename to keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c
diff --git a/keyboards/infinity60/keymaps/jpetermans/readme.md b/keyboards/input_club/infinity60/keymaps/jpetermans/readme.md
similarity index 100%
rename from keyboards/infinity60/keymaps/jpetermans/readme.md
rename to keyboards/input_club/infinity60/keymaps/jpetermans/readme.md
diff --git a/keyboards/infinity60/led.c b/keyboards/input_club/infinity60/led.c
similarity index 100%
rename from keyboards/infinity60/led.c
rename to keyboards/input_club/infinity60/led.c
diff --git a/keyboards/infinity60/led/config.h b/keyboards/input_club/infinity60/led/config.h
similarity index 100%
rename from keyboards/infinity60/led/config.h
rename to keyboards/input_club/infinity60/led/config.h
diff --git a/keyboards/infinity60/led/readme.md b/keyboards/input_club/infinity60/led/readme.md
similarity index 100%
rename from keyboards/infinity60/led/readme.md
rename to keyboards/input_club/infinity60/led/readme.md
diff --git a/keyboards/infinity60/led/rules.mk b/keyboards/input_club/infinity60/led/rules.mk
similarity index 100%
rename from keyboards/infinity60/led/rules.mk
rename to keyboards/input_club/infinity60/led/rules.mk
diff --git a/keyboards/infinity60/led_controller.c b/keyboards/input_club/infinity60/led_controller.c
similarity index 100%
rename from keyboards/infinity60/led_controller.c
rename to keyboards/input_club/infinity60/led_controller.c
diff --git a/keyboards/infinity60/led_controller.h b/keyboards/input_club/infinity60/led_controller.h
similarity index 100%
rename from keyboards/infinity60/led_controller.h
rename to keyboards/input_club/infinity60/led_controller.h
diff --git a/keyboards/infinity60/mcuconf.h b/keyboards/input_club/infinity60/mcuconf.h
similarity index 100%
rename from keyboards/infinity60/mcuconf.h
rename to keyboards/input_club/infinity60/mcuconf.h
diff --git a/keyboards/infinity60/readme.md b/keyboards/input_club/infinity60/readme.md
similarity index 86%
rename from keyboards/infinity60/readme.md
rename to keyboards/input_club/infinity60/readme.md
index d99d1df080..e8ee6a9dad 100644
--- a/keyboards/infinity60/readme.md
+++ b/keyboards/input_club/infinity60/readme.md
@@ -8,10 +8,10 @@ A compact community driven keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make infinity60:default
+    make input_club/infinity60/rev1:default
 
 Flashing example for this keyboard:
 
-    make infinity60:default:flash
+    make input_club/infinity60/rev1:default:flash
 
 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).
diff --git a/keyboards/infinity60/rev1/config.h b/keyboards/input_club/infinity60/rev1/config.h
similarity index 100%
rename from keyboards/infinity60/rev1/config.h
rename to keyboards/input_club/infinity60/rev1/config.h
diff --git a/keyboards/infinity60/rev1/readme.md b/keyboards/input_club/infinity60/rev1/readme.md
similarity index 100%
rename from keyboards/infinity60/rev1/readme.md
rename to keyboards/input_club/infinity60/rev1/readme.md
diff --git a/keyboards/infinity60/rev1/rules.mk b/keyboards/input_club/infinity60/rev1/rules.mk
similarity index 100%
rename from keyboards/infinity60/rev1/rules.mk
rename to keyboards/input_club/infinity60/rev1/rules.mk
diff --git a/keyboards/infinity60/rules.mk b/keyboards/input_club/infinity60/rules.mk
similarity index 95%
rename from keyboards/infinity60/rules.mk
rename to keyboards/input_club/infinity60/rules.mk
index a3e05edde1..7e21a06a9b 100644
--- a/keyboards/infinity60/rules.mk
+++ b/keyboards/input_club/infinity60/rules.mk
@@ -26,7 +26,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-DEFAULT_FOLDER = infinity60/led
+DEFAULT_FOLDER = input_club/infinity60/led
 
 LAYOUTS = 60_ansi_split_bs_rshift
 
diff --git a/keyboards/k_type/chconf.h b/keyboards/input_club/k_type/chconf.h
similarity index 100%
rename from keyboards/k_type/chconf.h
rename to keyboards/input_club/k_type/chconf.h
diff --git a/keyboards/k_type/config.h b/keyboards/input_club/k_type/config.h
similarity index 100%
rename from keyboards/k_type/config.h
rename to keyboards/input_club/k_type/config.h
diff --git a/keyboards/k_type/halconf.h b/keyboards/input_club/k_type/halconf.h
similarity index 100%
rename from keyboards/k_type/halconf.h
rename to keyboards/input_club/k_type/halconf.h
diff --git a/keyboards/k_type/i2c_master.c b/keyboards/input_club/k_type/i2c_master.c
similarity index 100%
rename from keyboards/k_type/i2c_master.c
rename to keyboards/input_club/k_type/i2c_master.c
diff --git a/keyboards/k_type/i2c_master.h b/keyboards/input_club/k_type/i2c_master.h
similarity index 100%
rename from keyboards/k_type/i2c_master.h
rename to keyboards/input_club/k_type/i2c_master.h
diff --git a/keyboards/k_type/info.json b/keyboards/input_club/k_type/info.json
similarity index 100%
rename from keyboards/k_type/info.json
rename to keyboards/input_club/k_type/info.json
diff --git a/keyboards/k_type/is31fl3733-dual.c b/keyboards/input_club/k_type/is31fl3733-dual.c
similarity index 100%
rename from keyboards/k_type/is31fl3733-dual.c
rename to keyboards/input_club/k_type/is31fl3733-dual.c
diff --git a/keyboards/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h
similarity index 100%
rename from keyboards/k_type/is31fl3733-dual.h
rename to keyboards/input_club/k_type/is31fl3733-dual.h
diff --git a/keyboards/k_type/k_type-rgbdriver.c b/keyboards/input_club/k_type/k_type-rgbdriver.c
similarity index 100%
rename from keyboards/k_type/k_type-rgbdriver.c
rename to keyboards/input_club/k_type/k_type-rgbdriver.c
diff --git a/keyboards/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c
similarity index 100%
rename from keyboards/k_type/k_type.c
rename to keyboards/input_club/k_type/k_type.c
diff --git a/keyboards/k_type/k_type.h b/keyboards/input_club/k_type/k_type.h
similarity index 100%
rename from keyboards/k_type/k_type.h
rename to keyboards/input_club/k_type/k_type.h
diff --git a/keyboards/k_type/keymaps/andrew-fahmy/config.h b/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
similarity index 100%
rename from keyboards/k_type/keymaps/andrew-fahmy/config.h
rename to keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
diff --git a/keyboards/k_type/keymaps/andrew-fahmy/keymap.c b/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
similarity index 100%
rename from keyboards/k_type/keymaps/andrew-fahmy/keymap.c
rename to keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
diff --git a/keyboards/k_type/keymaps/andrew-fahmy/rules.mk b/keyboards/input_club/k_type/keymaps/andrew-fahmy/rules.mk
similarity index 100%
rename from keyboards/k_type/keymaps/andrew-fahmy/rules.mk
rename to keyboards/input_club/k_type/keymaps/andrew-fahmy/rules.mk
diff --git a/keyboards/k_type/keymaps/belak/keymap.c b/keyboards/input_club/k_type/keymaps/belak/keymap.c
similarity index 100%
rename from keyboards/k_type/keymaps/belak/keymap.c
rename to keyboards/input_club/k_type/keymaps/belak/keymap.c
diff --git a/keyboards/k_type/keymaps/default/keymap.c b/keyboards/input_club/k_type/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/k_type/keymaps/default/keymap.c
rename to keyboards/input_club/k_type/keymaps/default/keymap.c
diff --git a/keyboards/k_type/keymaps/default/rules.mk b/keyboards/input_club/k_type/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/k_type/keymaps/default/rules.mk
rename to keyboards/input_club/k_type/keymaps/default/rules.mk
diff --git a/keyboards/k_type/mcuconf.h b/keyboards/input_club/k_type/mcuconf.h
similarity index 100%
rename from keyboards/k_type/mcuconf.h
rename to keyboards/input_club/k_type/mcuconf.h
diff --git a/keyboards/k_type/readme.md b/keyboards/input_club/k_type/readme.md
similarity index 90%
rename from keyboards/k_type/readme.md
rename to keyboards/input_club/k_type/readme.md
index 11123c357c..a69ca38d4d 100644
--- a/keyboards/k_type/readme.md
+++ b/keyboards/input_club/k_type/readme.md
@@ -8,10 +8,10 @@ Firmware for custom keyboard PCB with TKL Key Layout
 
 Make example for this keyboard (after setting up your build environment):
 
-    make k_type:default
+    make input_club/k_type:default
 
 Flashing example for this keyboard:
 
-    make k_type:default:flash
+    make input_club/k_type:default:flash
 
 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).
diff --git a/keyboards/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk
similarity index 100%
rename from keyboards/k_type/rules.mk
rename to keyboards/input_club/k_type/rules.mk
diff --git a/keyboards/whitefox/board_is31fl3731c.h b/keyboards/input_club/whitefox/board_is31fl3731c.h
similarity index 100%
rename from keyboards/whitefox/board_is31fl3731c.h
rename to keyboards/input_club/whitefox/board_is31fl3731c.h
diff --git a/keyboards/whitefox/chconf.h b/keyboards/input_club/whitefox/chconf.h
similarity index 100%
rename from keyboards/whitefox/chconf.h
rename to keyboards/input_club/whitefox/chconf.h
diff --git a/keyboards/whitefox/config.h b/keyboards/input_club/whitefox/config.h
similarity index 100%
rename from keyboards/whitefox/config.h
rename to keyboards/input_club/whitefox/config.h
diff --git a/keyboards/whitefox/halconf.h b/keyboards/input_club/whitefox/halconf.h
similarity index 100%
rename from keyboards/whitefox/halconf.h
rename to keyboards/input_club/whitefox/halconf.h
diff --git a/keyboards/whitefox/info.json b/keyboards/input_club/whitefox/info.json
similarity index 100%
rename from keyboards/whitefox/info.json
rename to keyboards/input_club/whitefox/info.json
diff --git a/keyboards/whitefox/keymaps/billypython/config.h b/keyboards/input_club/whitefox/keymaps/billypython/config.h
similarity index 100%
rename from keyboards/whitefox/keymaps/billypython/config.h
rename to keyboards/input_club/whitefox/keymaps/billypython/config.h
diff --git a/keyboards/whitefox/keymaps/billypython/keymap.c b/keyboards/input_club/whitefox/keymaps/billypython/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/billypython/keymap.c
rename to keyboards/input_club/whitefox/keymaps/billypython/keymap.c
diff --git a/keyboards/whitefox/keymaps/billypython/rules.mk b/keyboards/input_club/whitefox/keymaps/billypython/rules.mk
similarity index 100%
rename from keyboards/whitefox/keymaps/billypython/rules.mk
rename to keyboards/input_club/whitefox/keymaps/billypython/rules.mk
diff --git a/keyboards/whitefox/keymaps/default/keymap.c b/keyboards/input_club/whitefox/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/default/keymap.c
rename to keyboards/input_club/whitefox/keymaps/default/keymap.c
diff --git a/keyboards/whitefox/keymaps/dhertz/keymap.c b/keyboards/input_club/whitefox/keymaps/dhertz/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/dhertz/keymap.c
rename to keyboards/input_club/whitefox/keymaps/dhertz/keymap.c
diff --git a/keyboards/whitefox/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/whitefox/keymaps/dudeofawesome/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/dudeofawesome/keymap.c
rename to keyboards/input_club/whitefox/keymaps/dudeofawesome/keymap.c
diff --git a/keyboards/whitefox/keymaps/dudeofawesome/readme.md b/keyboards/input_club/whitefox/keymaps/dudeofawesome/readme.md
similarity index 100%
rename from keyboards/whitefox/keymaps/dudeofawesome/readme.md
rename to keyboards/input_club/whitefox/keymaps/dudeofawesome/readme.md
diff --git a/keyboards/whitefox/keymaps/jetpacktuxedo/keymap.c b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/jetpacktuxedo/keymap.c
rename to keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
diff --git a/keyboards/whitefox/keymaps/jetpacktuxedo/readme.md b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/readme.md
similarity index 100%
rename from keyboards/whitefox/keymaps/jetpacktuxedo/readme.md
rename to keyboards/input_club/whitefox/keymaps/jetpacktuxedo/readme.md
diff --git a/keyboards/whitefox/keymaps/jetpacktuxedo/rules.mk b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/rules.mk
similarity index 100%
rename from keyboards/whitefox/keymaps/jetpacktuxedo/rules.mk
rename to keyboards/input_club/whitefox/keymaps/jetpacktuxedo/rules.mk
diff --git a/keyboards/whitefox/keymaps/kim-kim/keymap.c b/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/kim-kim/keymap.c
rename to keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
diff --git a/keyboards/whitefox/keymaps/konstantin/config.h b/keyboards/input_club/whitefox/keymaps/konstantin/config.h
similarity index 100%
rename from keyboards/whitefox/keymaps/konstantin/config.h
rename to keyboards/input_club/whitefox/keymaps/konstantin/config.h
diff --git a/keyboards/whitefox/keymaps/konstantin/keymap.c b/keyboards/input_club/whitefox/keymaps/konstantin/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/konstantin/keymap.c
rename to keyboards/input_club/whitefox/keymaps/konstantin/keymap.c
diff --git a/keyboards/whitefox/keymaps/konstantin/rules.mk b/keyboards/input_club/whitefox/keymaps/konstantin/rules.mk
similarity index 100%
rename from keyboards/whitefox/keymaps/konstantin/rules.mk
rename to keyboards/input_club/whitefox/keymaps/konstantin/rules.mk
diff --git a/keyboards/whitefox/keymaps/matt3o/keymap.c b/keyboards/input_club/whitefox/keymaps/matt3o/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/matt3o/keymap.c
rename to keyboards/input_club/whitefox/keymaps/matt3o/keymap.c
diff --git a/keyboards/whitefox/keymaps/mattrighetti/keymap.c b/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
similarity index 100%
rename from keyboards/whitefox/keymaps/mattrighetti/keymap.c
rename to keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
diff --git a/keyboards/whitefox/keymaps/mattrighetti/rules.mk b/keyboards/input_club/whitefox/keymaps/mattrighetti/rules.mk
similarity index 100%
rename from keyboards/whitefox/keymaps/mattrighetti/rules.mk
rename to keyboards/input_club/whitefox/keymaps/mattrighetti/rules.mk
diff --git a/keyboards/whitefox/mcuconf.h b/keyboards/input_club/whitefox/mcuconf.h
similarity index 100%
rename from keyboards/whitefox/mcuconf.h
rename to keyboards/input_club/whitefox/mcuconf.h
diff --git a/keyboards/whitefox/readme.md b/keyboards/input_club/whitefox/readme.md
similarity index 87%
rename from keyboards/whitefox/readme.md
rename to keyboards/input_club/whitefox/readme.md
index a170723e22..d6676f6ce7 100644
--- a/keyboards/whitefox/readme.md
+++ b/keyboards/input_club/whitefox/readme.md
@@ -8,10 +8,10 @@ A compact 65% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make whitefox:default
+    make input_club/whitefox:default
 
 Flashing example for this keyboard:
 
-    make whitefox:default:flash
+    make input_club/whitefox:default:flash
 
 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).
diff --git a/keyboards/whitefox/rules.mk b/keyboards/input_club/whitefox/rules.mk
similarity index 100%
rename from keyboards/whitefox/rules.mk
rename to keyboards/input_club/whitefox/rules.mk
diff --git a/keyboards/whitefox/whitefox.c b/keyboards/input_club/whitefox/whitefox.c
similarity index 100%
rename from keyboards/whitefox/whitefox.c
rename to keyboards/input_club/whitefox/whitefox.c
diff --git a/keyboards/whitefox/whitefox.h b/keyboards/input_club/whitefox/whitefox.h
similarity index 100%
rename from keyboards/whitefox/whitefox.h
rename to keyboards/input_club/whitefox/whitefox.h

From 7a0b07f84b4afe95342aa1d311055961bd217b29 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Sun, 6 Feb 2022 13:16:36 +0800
Subject: [PATCH 534/867] [Docs] RGB documentation formatting corrections
 (#15826)

---
 docs/feature_rgb_matrix.md | 8 +++++---
 docs/feature_rgblight.md   | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 3384aa7180..536609b39a 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -418,6 +418,8 @@ All RGB keycodes are currently shared with the RGBLIGHT system:
 `RGB_MODE_PLAIN`, `RGB_MODE_BREATHE`, `RGB_MODE_RAINBOW`, and `RGB_MODE_SWIRL` are the only ones that are mapped properly. The rest don't have a direct equivalent, and are not mapped.
 
 ?> `RGB_*` keycodes cannot be used with functions like `tap_code16(RGB_HUD)` as they're not USB HID keycodes. If you wish to replicate similar behaviour in custom code within your firmware (e.g. inside `encoder_update_user()` or `process_record_user()`), the equivalent [RGB functions](#functions-idfunctions) should be used instead.
+
+
 !> By default, if you have both the [RGB Light](feature_rgblight.md) and the RGB Matrix feature enabled, these keycodes will work for both features, at the same time. You can disable the keycode functionality by defining the `*_DISABLE_KEYCODES` option for the specific feature.
 
 ## RGB Matrix Effects :id=rgb-matrix-effects
@@ -555,9 +557,7 @@ In order to change the delay of temperature decrease define
 
 ## Custom RGB Matrix Effects :id=custom-rgb-matrix-effects
 
-By setting `RGB_MATRIX_CUSTOM_USER = yes` in `rules.mk`, new effects can be defined directly from your keymap or userspace, without having to edit any QMK core files.
-
-To declare new effects, create a `rgb_matrix_user.inc` file in the user keymap directory or userspace folder.
+By setting `RGB_MATRIX_CUSTOM_USER = yes` in `rules.mk`, new effects can be defined directly from your keymap or userspace, without having to edit any QMK core files. To declare new effects, create a `rgb_matrix_user.inc` file in the user keymap directory or userspace folder.
 
 ?> Hardware maintainers who want to limit custom effects to a specific keyboard can create a `rgb_matrix_kb.inc` file in the root of the keyboard directory, and add `RGB_MATRIX_CUSTOM_KB = yes` to the keyboard level `rules.mk`.
 
@@ -810,6 +810,8 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 }
 ```
 
+?> Split keyboards will require layer state data syncing with `#define SPLIT_LAYER_STATE_ENABLE`. See [Data Sync Options](feature_split_keyboard?id=data-sync-options) for more details.
+
 #### Examples :id=indicator-examples
 
 This example sets the modifiers to be a specific color based on the layer state.  You can use a switch case here, instead, if you would like.  This uses HSV and then converts to RGB, because this allows the brightness to be limited (important when using the WS2812 driver).
diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index 7fafaff47e..194daee294 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -76,9 +76,10 @@ Changing the **Value** sets the overall brightness.<br>
 |`RGB_MODE_RGBTEST` |`RGB_M_T` |Red, Green, Blue test animation mode                                |
 |`RGB_MODE_TWINKLE` |`RGB_M_TW`|Twinkle animation mode                                              |
 
-!> By default, if you have both the RGB Light and the [RGB Matrix](feature_rgb_matrix.md) feature enabled, these keycodes will work for both features, at the same time. You can disable the keycode functionality by defining the `*_DISABLE_KEYCODES` option for the specific feature.
+?> `RGB_*` keycodes cannot be used with functions like `tap_code16(RGB_HUI)` as they're not USB HID keycodes. If you wish to replicate similar behaviour in custom code within your firmware (e.g. inside `encoder_update_user()` or `process_record_user()`), the equivalent [RGB functions](#functions) should be used instead.
 
-?> `RGB_*` keycodes cannot be used with functions like `tap_code16(RGB_HUI)` as they're not USB HID keycodes. If you wish to replicate similar behaviour in custom code within your firmware (e.g. inside `encoder_update_user()` or `process_record_user()`), the equivalent [RGB functions](#functions-idfunctions) should be used instead.
+
+!> By default, if you have both the RGB Light and the [RGB Matrix](feature_rgb_matrix.md) feature enabled, these keycodes will work for both features, at the same time. You can disable the keycode functionality by defining the `*_DISABLE_KEYCODES` option for the specific feature.
 
 ## Configuration
 
@@ -203,7 +204,7 @@ const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 170, 127, 85, 64};
 
 ## Lighting Layers
 
-?> **Note:** Lighting Layers is an RGB Light feature, it will not work for RGB Matrix. See [RGB Matrix Indicators](feature_rgb_matrix.md?indicators) for details on how to do so.
+?> **Note:** Lighting Layers is an RGB Light feature, it will not work for RGB Matrix. See [RGB Matrix Indicators](feature_rgb_matrix.md#indicators) for details on how to do so.
 
 By including `#define RGBLIGHT_LAYERS` in your `config.h` file you can enable lighting layers. These make
 it easy to use your underglow LEDs as status indicators to show which keyboard layer is currently active, or the state of caps lock, all without disrupting any animations. [Here's a video](https://youtu.be/uLGE1epbmdY) showing an example of what you can do.

From de1417b66075464e3f4152988e4b11544d6ac0eb Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Sun, 6 Feb 2022 13:16:47 +0800
Subject: [PATCH 535/867] move @qpocket 's keyboards to qpocket/ (#15827)

---
 keyboards/{ => qpockets}/eggman/config.h                      | 0
 keyboards/{ => qpockets}/eggman/eggman.c                      | 0
 keyboards/{ => qpockets}/eggman/eggman.h                      | 0
 keyboards/{ => qpockets}/eggman/info.json                     | 0
 keyboards/{ => qpockets}/eggman/keymaps/default/config.h      | 0
 keyboards/{ => qpockets}/eggman/keymaps/default/keymap.c      | 0
 keyboards/{ => qpockets}/eggman/keymaps/default/rules.mk      | 0
 keyboards/{ => qpockets}/eggman/readme.md                     | 4 ++--
 keyboards/{ => qpockets}/eggman/rules.mk                      | 0
 keyboards/{ => qpockets}/space_space/readme.md                | 4 ++--
 keyboards/{ => qpockets}/space_space/rev1/config.h            | 0
 keyboards/{ => qpockets}/space_space/rev1/info.json           | 0
 .../space_space/rev1/keymaps/big_space/config.h               | 0
 .../space_space/rev1/keymaps/big_space/keymap.c               | 0
 .../space_space/rev1/keymaps/big_space/rules.mk               | 0
 .../{ => qpockets}/space_space/rev1/keymaps/default/config.h  | 0
 .../{ => qpockets}/space_space/rev1/keymaps/default/keymap.c  | 0
 .../{ => qpockets}/space_space/rev1/keymaps/default/rules.mk  | 0
 keyboards/{ => qpockets}/space_space/rev1/keymaps/readme.md   | 0
 keyboards/{ => qpockets}/space_space/rev1/readme.md           | 0
 keyboards/{ => qpockets}/space_space/rev1/rev1.c              | 0
 keyboards/{ => qpockets}/space_space/rev1/rev1.h              | 0
 keyboards/{ => qpockets}/space_space/rev1/rules.mk            | 0
 keyboards/{ => qpockets}/space_space/rev2/config.h            | 0
 keyboards/{ => qpockets}/space_space/rev2/info.json           | 0
 .../space_space/rev2/keymaps/big_space/config.h               | 0
 .../space_space/rev2/keymaps/big_space/keymap.c               | 0
 .../space_space/rev2/keymaps/big_space/rules.mk               | 0
 .../{ => qpockets}/space_space/rev2/keymaps/default/config.h  | 0
 .../{ => qpockets}/space_space/rev2/keymaps/default/keymap.c  | 0
 .../{ => qpockets}/space_space/rev2/keymaps/default/rules.mk  | 0
 .../{ => qpockets}/space_space/rev2/keymaps/qpockets/config.h | 0
 .../{ => qpockets}/space_space/rev2/keymaps/qpockets/keymap.c | 0
 .../{ => qpockets}/space_space/rev2/keymaps/qpockets/rules.mk | 0
 keyboards/{ => qpockets}/space_space/rev2/readme.md           | 0
 keyboards/{ => qpockets}/space_space/rev2/rev2.c              | 0
 keyboards/{ => qpockets}/space_space/rev2/rev2.h              | 0
 keyboards/{ => qpockets}/space_space/rev2/rules.mk            | 0
 keyboards/qpockets/space_space/rules.mk                       | 1 +
 keyboards/{ => qpockets}/wanten/config.h                      | 0
 keyboards/{ => qpockets}/wanten/info.json                     | 0
 keyboards/{ => qpockets}/wanten/keymaps/2u_bars/config.h      | 0
 keyboards/{ => qpockets}/wanten/keymaps/2u_bars/keymap.c      | 0
 keyboards/{ => qpockets}/wanten/keymaps/2u_bars/rules.mk      | 0
 keyboards/{ => qpockets}/wanten/keymaps/625_bar/config.h      | 0
 keyboards/{ => qpockets}/wanten/keymaps/625_bar/keymap.c      | 0
 keyboards/{ => qpockets}/wanten/keymaps/625_bar/rules.mk      | 0
 keyboards/{ => qpockets}/wanten/keymaps/default/config.h      | 0
 keyboards/{ => qpockets}/wanten/keymaps/default/keymap.c      | 0
 keyboards/{ => qpockets}/wanten/keymaps/default/readme.md     | 0
 keyboards/{ => qpockets}/wanten/keymaps/default/rules.mk      | 0
 keyboards/{ => qpockets}/wanten/readme.md                     | 4 ++--
 keyboards/{ => qpockets}/wanten/rules.mk                      | 0
 keyboards/{ => qpockets}/wanten/wanten.c                      | 0
 keyboards/{ => qpockets}/wanten/wanten.h                      | 0
 keyboards/space_space/rules.mk                                | 1 -
 56 files changed, 7 insertions(+), 7 deletions(-)
 rename keyboards/{ => qpockets}/eggman/config.h (100%)
 rename keyboards/{ => qpockets}/eggman/eggman.c (100%)
 rename keyboards/{ => qpockets}/eggman/eggman.h (100%)
 rename keyboards/{ => qpockets}/eggman/info.json (100%)
 rename keyboards/{ => qpockets}/eggman/keymaps/default/config.h (100%)
 rename keyboards/{ => qpockets}/eggman/keymaps/default/keymap.c (100%)
 rename keyboards/{ => qpockets}/eggman/keymaps/default/rules.mk (100%)
 rename keyboards/{ => qpockets}/eggman/readme.md (88%)
 rename keyboards/{ => qpockets}/eggman/rules.mk (100%)
 rename keyboards/{ => qpockets}/space_space/readme.md (88%)
 rename keyboards/{ => qpockets}/space_space/rev1/config.h (100%)
 rename keyboards/{ => qpockets}/space_space/rev1/info.json (100%)
 rename keyboards/{ => qpockets}/space_space/rev1/keymaps/big_space/config.h (100%)
 rename keyboards/{ => qpockets}/space_space/rev1/keymaps/big_space/keymap.c (100%)
 rename keyboards/{ => qpockets}/space_space/rev1/keymaps/big_space/rules.mk (100%)
 rename keyboards/{ => qpockets}/space_space/rev1/keymaps/default/config.h (100%)
 rename keyboards/{ => qpockets}/space_space/rev1/keymaps/default/keymap.c (100%)
 rename keyboards/{ => qpockets}/space_space/rev1/keymaps/default/rules.mk (100%)
 rename keyboards/{ => qpockets}/space_space/rev1/keymaps/readme.md (100%)
 rename keyboards/{ => qpockets}/space_space/rev1/readme.md (100%)
 rename keyboards/{ => qpockets}/space_space/rev1/rev1.c (100%)
 rename keyboards/{ => qpockets}/space_space/rev1/rev1.h (100%)
 rename keyboards/{ => qpockets}/space_space/rev1/rules.mk (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/config.h (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/info.json (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/keymaps/big_space/config.h (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/keymaps/big_space/keymap.c (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/keymaps/big_space/rules.mk (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/keymaps/default/config.h (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/keymaps/default/keymap.c (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/keymaps/default/rules.mk (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/keymaps/qpockets/config.h (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/keymaps/qpockets/keymap.c (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/keymaps/qpockets/rules.mk (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/readme.md (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/rev2.c (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/rev2.h (100%)
 rename keyboards/{ => qpockets}/space_space/rev2/rules.mk (100%)
 create mode 100644 keyboards/qpockets/space_space/rules.mk
 rename keyboards/{ => qpockets}/wanten/config.h (100%)
 rename keyboards/{ => qpockets}/wanten/info.json (100%)
 rename keyboards/{ => qpockets}/wanten/keymaps/2u_bars/config.h (100%)
 rename keyboards/{ => qpockets}/wanten/keymaps/2u_bars/keymap.c (100%)
 rename keyboards/{ => qpockets}/wanten/keymaps/2u_bars/rules.mk (100%)
 rename keyboards/{ => qpockets}/wanten/keymaps/625_bar/config.h (100%)
 rename keyboards/{ => qpockets}/wanten/keymaps/625_bar/keymap.c (100%)
 rename keyboards/{ => qpockets}/wanten/keymaps/625_bar/rules.mk (100%)
 rename keyboards/{ => qpockets}/wanten/keymaps/default/config.h (100%)
 rename keyboards/{ => qpockets}/wanten/keymaps/default/keymap.c (100%)
 rename keyboards/{ => qpockets}/wanten/keymaps/default/readme.md (100%)
 rename keyboards/{ => qpockets}/wanten/keymaps/default/rules.mk (100%)
 rename keyboards/{ => qpockets}/wanten/readme.md (93%)
 rename keyboards/{ => qpockets}/wanten/rules.mk (100%)
 rename keyboards/{ => qpockets}/wanten/wanten.c (100%)
 rename keyboards/{ => qpockets}/wanten/wanten.h (100%)
 delete mode 100644 keyboards/space_space/rules.mk

diff --git a/keyboards/eggman/config.h b/keyboards/qpockets/eggman/config.h
similarity index 100%
rename from keyboards/eggman/config.h
rename to keyboards/qpockets/eggman/config.h
diff --git a/keyboards/eggman/eggman.c b/keyboards/qpockets/eggman/eggman.c
similarity index 100%
rename from keyboards/eggman/eggman.c
rename to keyboards/qpockets/eggman/eggman.c
diff --git a/keyboards/eggman/eggman.h b/keyboards/qpockets/eggman/eggman.h
similarity index 100%
rename from keyboards/eggman/eggman.h
rename to keyboards/qpockets/eggman/eggman.h
diff --git a/keyboards/eggman/info.json b/keyboards/qpockets/eggman/info.json
similarity index 100%
rename from keyboards/eggman/info.json
rename to keyboards/qpockets/eggman/info.json
diff --git a/keyboards/eggman/keymaps/default/config.h b/keyboards/qpockets/eggman/keymaps/default/config.h
similarity index 100%
rename from keyboards/eggman/keymaps/default/config.h
rename to keyboards/qpockets/eggman/keymaps/default/config.h
diff --git a/keyboards/eggman/keymaps/default/keymap.c b/keyboards/qpockets/eggman/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/eggman/keymaps/default/keymap.c
rename to keyboards/qpockets/eggman/keymaps/default/keymap.c
diff --git a/keyboards/eggman/keymaps/default/rules.mk b/keyboards/qpockets/eggman/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/eggman/keymaps/default/rules.mk
rename to keyboards/qpockets/eggman/keymaps/default/rules.mk
diff --git a/keyboards/eggman/readme.md b/keyboards/qpockets/eggman/readme.md
similarity index 88%
rename from keyboards/eggman/readme.md
rename to keyboards/qpockets/eggman/readme.md
index 156b4086fa..e0066fbe1f 100644
--- a/keyboards/eggman/readme.md
+++ b/keyboards/qpockets/eggman/readme.md
@@ -9,10 +9,10 @@ i am he and you are me
 
 Make example for this keyboard (after setting up your build environment):
 
-    make eggman:default
+    make qpockets/eggman:default
 
 Flashing example for this keyboard:
 
-    make eggman:default:flash
+    make qpockets/eggman:default:flash
 
 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).
diff --git a/keyboards/eggman/rules.mk b/keyboards/qpockets/eggman/rules.mk
similarity index 100%
rename from keyboards/eggman/rules.mk
rename to keyboards/qpockets/eggman/rules.mk
diff --git a/keyboards/space_space/readme.md b/keyboards/qpockets/space_space/readme.md
similarity index 88%
rename from keyboards/space_space/readme.md
rename to keyboards/qpockets/space_space/readme.md
index 08fa640f22..c84a583267 100644
--- a/keyboards/space_space/readme.md
+++ b/keyboards/qpockets/space_space/readme.md
@@ -9,10 +9,10 @@ Give your space some space
 
 Make example for this keyboard (after setting up your build environment):
 
-    make space_space/rev2:default
+    make qpockets/space_space/rev2:default
 
 Flashing example for this keyboard:
 
-    make space_space/rev2:default:flash
+    make qpockets/space_space/rev2:default:flash
 
 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).
diff --git a/keyboards/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h
similarity index 100%
rename from keyboards/space_space/rev1/config.h
rename to keyboards/qpockets/space_space/rev1/config.h
diff --git a/keyboards/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json
similarity index 100%
rename from keyboards/space_space/rev1/info.json
rename to keyboards/qpockets/space_space/rev1/info.json
diff --git a/keyboards/space_space/rev1/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/big_space/config.h
rename to keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
diff --git a/keyboards/space_space/rev1/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/big_space/keymap.c
rename to keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
diff --git a/keyboards/space_space/rev1/keymaps/big_space/rules.mk b/keyboards/qpockets/space_space/rev1/keymaps/big_space/rules.mk
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/big_space/rules.mk
rename to keyboards/qpockets/space_space/rev1/keymaps/big_space/rules.mk
diff --git a/keyboards/space_space/rev1/keymaps/default/config.h b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/default/config.h
rename to keyboards/qpockets/space_space/rev1/keymaps/default/config.h
diff --git a/keyboards/space_space/rev1/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/default/keymap.c
rename to keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c
diff --git a/keyboards/space_space/rev1/keymaps/default/rules.mk b/keyboards/qpockets/space_space/rev1/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/default/rules.mk
rename to keyboards/qpockets/space_space/rev1/keymaps/default/rules.mk
diff --git a/keyboards/space_space/rev1/keymaps/readme.md b/keyboards/qpockets/space_space/rev1/keymaps/readme.md
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/readme.md
rename to keyboards/qpockets/space_space/rev1/keymaps/readme.md
diff --git a/keyboards/space_space/rev1/readme.md b/keyboards/qpockets/space_space/rev1/readme.md
similarity index 100%
rename from keyboards/space_space/rev1/readme.md
rename to keyboards/qpockets/space_space/rev1/readme.md
diff --git a/keyboards/space_space/rev1/rev1.c b/keyboards/qpockets/space_space/rev1/rev1.c
similarity index 100%
rename from keyboards/space_space/rev1/rev1.c
rename to keyboards/qpockets/space_space/rev1/rev1.c
diff --git a/keyboards/space_space/rev1/rev1.h b/keyboards/qpockets/space_space/rev1/rev1.h
similarity index 100%
rename from keyboards/space_space/rev1/rev1.h
rename to keyboards/qpockets/space_space/rev1/rev1.h
diff --git a/keyboards/space_space/rev1/rules.mk b/keyboards/qpockets/space_space/rev1/rules.mk
similarity index 100%
rename from keyboards/space_space/rev1/rules.mk
rename to keyboards/qpockets/space_space/rev1/rules.mk
diff --git a/keyboards/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
similarity index 100%
rename from keyboards/space_space/rev2/config.h
rename to keyboards/qpockets/space_space/rev2/config.h
diff --git a/keyboards/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
similarity index 100%
rename from keyboards/space_space/rev2/info.json
rename to keyboards/qpockets/space_space/rev2/info.json
diff --git a/keyboards/space_space/rev2/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/big_space/config.h
rename to keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
diff --git a/keyboards/space_space/rev2/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/big_space/keymap.c
rename to keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c
diff --git a/keyboards/space_space/rev2/keymaps/big_space/rules.mk b/keyboards/qpockets/space_space/rev2/keymaps/big_space/rules.mk
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/big_space/rules.mk
rename to keyboards/qpockets/space_space/rev2/keymaps/big_space/rules.mk
diff --git a/keyboards/space_space/rev2/keymaps/default/config.h b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/default/config.h
rename to keyboards/qpockets/space_space/rev2/keymaps/default/config.h
diff --git a/keyboards/space_space/rev2/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/default/keymap.c
rename to keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c
diff --git a/keyboards/space_space/rev2/keymaps/default/rules.mk b/keyboards/qpockets/space_space/rev2/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/default/rules.mk
rename to keyboards/qpockets/space_space/rev2/keymaps/default/rules.mk
diff --git a/keyboards/space_space/rev2/keymaps/qpockets/config.h b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/qpockets/config.h
rename to keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
diff --git a/keyboards/space_space/rev2/keymaps/qpockets/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/qpockets/keymap.c
rename to keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c
diff --git a/keyboards/space_space/rev2/keymaps/qpockets/rules.mk b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/rules.mk
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/qpockets/rules.mk
rename to keyboards/qpockets/space_space/rev2/keymaps/qpockets/rules.mk
diff --git a/keyboards/space_space/rev2/readme.md b/keyboards/qpockets/space_space/rev2/readme.md
similarity index 100%
rename from keyboards/space_space/rev2/readme.md
rename to keyboards/qpockets/space_space/rev2/readme.md
diff --git a/keyboards/space_space/rev2/rev2.c b/keyboards/qpockets/space_space/rev2/rev2.c
similarity index 100%
rename from keyboards/space_space/rev2/rev2.c
rename to keyboards/qpockets/space_space/rev2/rev2.c
diff --git a/keyboards/space_space/rev2/rev2.h b/keyboards/qpockets/space_space/rev2/rev2.h
similarity index 100%
rename from keyboards/space_space/rev2/rev2.h
rename to keyboards/qpockets/space_space/rev2/rev2.h
diff --git a/keyboards/space_space/rev2/rules.mk b/keyboards/qpockets/space_space/rev2/rules.mk
similarity index 100%
rename from keyboards/space_space/rev2/rules.mk
rename to keyboards/qpockets/space_space/rev2/rules.mk
diff --git a/keyboards/qpockets/space_space/rules.mk b/keyboards/qpockets/space_space/rules.mk
new file mode 100644
index 0000000000..0ffe2efbf2
--- /dev/null
+++ b/keyboards/qpockets/space_space/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = qpockets/space_space/rev2
diff --git a/keyboards/wanten/config.h b/keyboards/qpockets/wanten/config.h
similarity index 100%
rename from keyboards/wanten/config.h
rename to keyboards/qpockets/wanten/config.h
diff --git a/keyboards/wanten/info.json b/keyboards/qpockets/wanten/info.json
similarity index 100%
rename from keyboards/wanten/info.json
rename to keyboards/qpockets/wanten/info.json
diff --git a/keyboards/wanten/keymaps/2u_bars/config.h b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h
similarity index 100%
rename from keyboards/wanten/keymaps/2u_bars/config.h
rename to keyboards/qpockets/wanten/keymaps/2u_bars/config.h
diff --git a/keyboards/wanten/keymaps/2u_bars/keymap.c b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
similarity index 100%
rename from keyboards/wanten/keymaps/2u_bars/keymap.c
rename to keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
diff --git a/keyboards/wanten/keymaps/2u_bars/rules.mk b/keyboards/qpockets/wanten/keymaps/2u_bars/rules.mk
similarity index 100%
rename from keyboards/wanten/keymaps/2u_bars/rules.mk
rename to keyboards/qpockets/wanten/keymaps/2u_bars/rules.mk
diff --git a/keyboards/wanten/keymaps/625_bar/config.h b/keyboards/qpockets/wanten/keymaps/625_bar/config.h
similarity index 100%
rename from keyboards/wanten/keymaps/625_bar/config.h
rename to keyboards/qpockets/wanten/keymaps/625_bar/config.h
diff --git a/keyboards/wanten/keymaps/625_bar/keymap.c b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
similarity index 100%
rename from keyboards/wanten/keymaps/625_bar/keymap.c
rename to keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
diff --git a/keyboards/wanten/keymaps/625_bar/rules.mk b/keyboards/qpockets/wanten/keymaps/625_bar/rules.mk
similarity index 100%
rename from keyboards/wanten/keymaps/625_bar/rules.mk
rename to keyboards/qpockets/wanten/keymaps/625_bar/rules.mk
diff --git a/keyboards/wanten/keymaps/default/config.h b/keyboards/qpockets/wanten/keymaps/default/config.h
similarity index 100%
rename from keyboards/wanten/keymaps/default/config.h
rename to keyboards/qpockets/wanten/keymaps/default/config.h
diff --git a/keyboards/wanten/keymaps/default/keymap.c b/keyboards/qpockets/wanten/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/wanten/keymaps/default/keymap.c
rename to keyboards/qpockets/wanten/keymaps/default/keymap.c
diff --git a/keyboards/wanten/keymaps/default/readme.md b/keyboards/qpockets/wanten/keymaps/default/readme.md
similarity index 100%
rename from keyboards/wanten/keymaps/default/readme.md
rename to keyboards/qpockets/wanten/keymaps/default/readme.md
diff --git a/keyboards/wanten/keymaps/default/rules.mk b/keyboards/qpockets/wanten/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/wanten/keymaps/default/rules.mk
rename to keyboards/qpockets/wanten/keymaps/default/rules.mk
diff --git a/keyboards/wanten/readme.md b/keyboards/qpockets/wanten/readme.md
similarity index 93%
rename from keyboards/wanten/readme.md
rename to keyboards/qpockets/wanten/readme.md
index 90dd1ae132..243e949f34 100644
--- a/keyboards/wanten/readme.md
+++ b/keyboards/qpockets/wanten/readme.md
@@ -10,11 +10,11 @@ an ortho drop in PCB for Van cases
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wanten:default
+    make qpockets/wanten:default
 
 Flashing example for this keyboard:
 
-    make wanten:default:flash
+    make qpockets/wanten:default:flash
 
 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).
 
diff --git a/keyboards/wanten/rules.mk b/keyboards/qpockets/wanten/rules.mk
similarity index 100%
rename from keyboards/wanten/rules.mk
rename to keyboards/qpockets/wanten/rules.mk
diff --git a/keyboards/wanten/wanten.c b/keyboards/qpockets/wanten/wanten.c
similarity index 100%
rename from keyboards/wanten/wanten.c
rename to keyboards/qpockets/wanten/wanten.c
diff --git a/keyboards/wanten/wanten.h b/keyboards/qpockets/wanten/wanten.h
similarity index 100%
rename from keyboards/wanten/wanten.h
rename to keyboards/qpockets/wanten/wanten.h
diff --git a/keyboards/space_space/rules.mk b/keyboards/space_space/rules.mk
deleted file mode 100644
index 2ca04be440..0000000000
--- a/keyboards/space_space/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = space_space/rev2

From 095f0bfe020cfc9eac399df2c100f11ca2bb8635 Mon Sep 17 00:00:00 2001
From: yiancar <yiangosyiangou@cytanet.com.cy>
Date: Sun, 6 Feb 2022 05:18:10 +0000
Subject: [PATCH 536/867] [Keyboard] Mnk75 (#15879)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: yiancar <yiancar@gmail.com>
---
 keyboards/mnk75/config.h                  | 76 +++++++++++++++++++++++
 keyboards/mnk75/info.json                 | 10 +++
 keyboards/mnk75/keymaps/default/keymap.c  | 27 ++++++++
 keyboards/mnk75/keymaps/default/readme.md |  1 +
 keyboards/mnk75/keymaps/via/keymap.c      | 54 ++++++++++++++++
 keyboards/mnk75/keymaps/via/readme.md     |  1 +
 keyboards/mnk75/keymaps/via/rules.mk      |  1 +
 keyboards/mnk75/mnk75.c                   | 16 +++++
 keyboards/mnk75/mnk75.h                   | 36 +++++++++++
 keyboards/mnk75/readme.md                 | 32 ++++++++++
 keyboards/mnk75/rules.mk                  | 26 ++++++++
 11 files changed, 280 insertions(+)
 create mode 100755 keyboards/mnk75/config.h
 create mode 100755 keyboards/mnk75/info.json
 create mode 100644 keyboards/mnk75/keymaps/default/keymap.c
 create mode 100755 keyboards/mnk75/keymaps/default/readme.md
 create mode 100644 keyboards/mnk75/keymaps/via/keymap.c
 create mode 100755 keyboards/mnk75/keymaps/via/readme.md
 create mode 100755 keyboards/mnk75/keymaps/via/rules.mk
 create mode 100755 keyboards/mnk75/mnk75.c
 create mode 100644 keyboards/mnk75/mnk75.h
 create mode 100755 keyboards/mnk75/readme.md
 create mode 100755 keyboards/mnk75/rules.mk

diff --git a/keyboards/mnk75/config.h b/keyboards/mnk75/config.h
new file mode 100755
index 0000000000..a0aec085d3
--- /dev/null
+++ b/keyboards/mnk75/config.h
@@ -0,0 +1,76 @@
+/*
+Copyright 2021 Yiancar-Designs
+
+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       0x8968
+#define PRODUCT_ID      0x4D37
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Yiancar-Designs
+#define PRODUCT         MNK75
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS { A2, A14, A15, B3, B4, B5 }
+#define MATRIX_COL_PINS { A1, B9, A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Ensure we jump to bootloader if the RESET keycode was pressed */
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mnk75/info.json b/keyboards/mnk75/info.json
new file mode 100755
index 0000000000..65b2100da5
--- /dev/null
+++ b/keyboards/mnk75/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "MNK75",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":14, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":15, "y":3.5}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":15, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":2.75}, {"x":6.5, "y":5.5, "w":1.25}, {"x":7.75, "y":5.5, "w":2.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":13, "y":5.5}, {"x":14, "y":5.5}, {"x":15, "y":5.5}]
+            }
+        }
+}
diff --git a/keyboards/mnk75/keymaps/default/keymap.c b/keyboards/mnk75/keymaps/default/keymap.c
new file mode 100644
index 0000000000..acabed3ae8
--- /dev/null
+++ b/keyboards/mnk75/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2021 Yiancar-Designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,
+
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+    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_PGDN,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_APP,           KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/keyboards/mnk75/keymaps/default/readme.md b/keyboards/mnk75/keymaps/default/readme.md
new file mode 100755
index 0000000000..934ada1fef
--- /dev/null
+++ b/keyboards/mnk75/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for MNK75.
diff --git a/keyboards/mnk75/keymaps/via/keymap.c b/keyboards/mnk75/keymaps/via/keymap.c
new file mode 100644
index 0000000000..5ef3086971
--- /dev/null
+++ b/keyboards/mnk75/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2021 Yiancar-Designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,
+
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+    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_PGDN,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_RALT, KC_APP,           KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_all(  /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_all( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_all( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/mnk75/keymaps/via/readme.md b/keyboards/mnk75/keymaps/via/readme.md
new file mode 100755
index 0000000000..3cac4633fe
--- /dev/null
+++ b/keyboards/mnk75/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default keymap for MNK75. VIA support enabled.
diff --git a/keyboards/mnk75/keymaps/via/rules.mk b/keyboards/mnk75/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mnk75/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mnk75/mnk75.c b/keyboards/mnk75/mnk75.c
new file mode 100755
index 0000000000..357bb07823
--- /dev/null
+++ b/keyboards/mnk75/mnk75.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Yiancar-Designs
+ *
+ * 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 "mnk75.h"
diff --git a/keyboards/mnk75/mnk75.h b/keyboards/mnk75/mnk75.h
new file mode 100644
index 0000000000..ad1c1119ae
--- /dev/null
+++ b/keyboards/mnk75/mnk75.h
@@ -0,0 +1,36 @@
+/* Copyright 2021 Yiancar-Designs
+ *
+ * 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 XXX KC_NO
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,           \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,      K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      K3E, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4D, K4E, \
+    K50, K51, K52,      K54,      K56,      K58,      K5A, K5B,      K5C, K5D, K5E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \
+    { K50, K51, K52, XXX, K54, XXX, K56, XXX, K58, XXX, K5A, K5B, K5C, K5D, K5E }  \
+}
diff --git a/keyboards/mnk75/readme.md b/keyboards/mnk75/readme.md
new file mode 100755
index 0000000000..631ca246e7
--- /dev/null
+++ b/keyboards/mnk75/readme.md
@@ -0,0 +1,32 @@
+# MNK75
+
+This is a 75% layout PCB. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A 75% keyboard with STM32F072CB
+* Hardware Availability: https://monokei.co/ 
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mnk75: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).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or CLI (`make mnk75:<keymap>:flash`)
diff --git a/keyboards/mnk75/rules.mk b/keyboards/mnk75/rules.mk
new file mode 100755
index 0000000000..16600f5b66
--- /dev/null
+++ b/keyboards/mnk75/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
+# Do not put the microcontroller into power saving mode
+# when we get USB suspend event. We want it to keep updating
+# backlight effects.
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From ea116b785bc85d7d7a6248589bbef731539f762c Mon Sep 17 00:00:00 2001
From: 4pplet <mail@4pplet.com>
Date: Sun, 6 Feb 2022 16:54:56 +0100
Subject: [PATCH 537/867] [Keyboard] Waffling60 Revision C (#16191)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
---
 keyboards/4pplet/waffling60/rev_c/config.h  | 64 +++++++++++++++++++++
 keyboards/4pplet/waffling60/rev_c/readme.md | 20 +++++++
 keyboards/4pplet/waffling60/rev_c/rev_c.c   | 31 ++++++++++
 keyboards/4pplet/waffling60/rev_c/rev_c.h   | 38 ++++++++++++
 keyboards/4pplet/waffling60/rev_c/rules.mk  | 18 ++++++
 5 files changed, 171 insertions(+)
 create mode 100644 keyboards/4pplet/waffling60/rev_c/config.h
 create mode 100644 keyboards/4pplet/waffling60/rev_c/readme.md
 create mode 100644 keyboards/4pplet/waffling60/rev_c/rev_c.c
 create mode 100644 keyboards/4pplet/waffling60/rev_c/rev_c.h
 create mode 100644 keyboards/4pplet/waffling60/rev_c/rules.mk

diff --git a/keyboards/4pplet/waffling60/rev_c/config.h b/keyboards/4pplet/waffling60/rev_c/config.h
new file mode 100644
index 0000000000..e1862f4c0e
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/config.h
@@ -0,0 +1,64 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4444
+#define PRODUCT_ID      0x0008
+#define DEVICE_VER      0x0003
+#define MANUFACTURER    4pplet
+#define PRODUCT         waffling60 Rev C
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5}
+#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4}
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define QMK_ESC_OUTPUT C2 // usually COL
+#define QMK_ESC_INPUT C4 // usually ROW
+
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 1
+#define BACKLIGHT_LEVELS 5
+
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/4pplet/waffling60/rev_c/readme.md b/keyboards/4pplet/waffling60/rev_c/readme.md
new file mode 100644
index 0000000000..3b6b9c94f2
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/readme.md
@@ -0,0 +1,20 @@
+# waffling60
+
+A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support.
+
+More info: https://geekhack.org/index.php?topic=103531.0
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/waffling60/rev_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).
+
+How to enter bootloader (DFU):
+* Tap the physical reset button or short the reset-header (labled RESET) on tha back of the PCB for keyboard to enter DFU. When in DFU, it's ready to flash the firmware.
+
+Alternative option if the firmware is already pre-flashed:
+* Unplug your keyboard, hold down the Spacebar and B at the same time, plug in your keyboard and wait a second before releasing the keys. The keyboard will enter DFU and is ready to flash the firmware.
diff --git a/keyboards/4pplet/waffling60/rev_c/rev_c.c b/keyboards/4pplet/waffling60/rev_c/rev_c.c
new file mode 100644
index 0000000000..f00cce06dc
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/rev_c.c
@@ -0,0 +1,31 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "rev_c.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (CAPS_LOCK_ENABLE && res) {
+        if (led_state.caps_lock){
+            rgblight_enable();
+            rgblight_mode(1);
+            rgblight_sethsv_noeeprom(CAPS_LOCK_COLOR);
+        } else {
+            rgblight_disable_noeeprom();
+        }
+    }
+    return res;
+}
diff --git a/keyboards/4pplet/waffling60/rev_c/rev_c.h b/keyboards/4pplet/waffling60/rev_c/rev_c.h
new file mode 100644
index 0000000000..3df9419eb9
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/rev_c.h
@@ -0,0 +1,38 @@
+/*
+Copyright 2022 Stefan Sundin "4pplet" <mail@4pplet.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+// defines to set RGB-led behaviour. Off by default
+#define CAPS_LOCK_ENABLE false
+#define CAPS_LOCK_COLOR HSV_ORANGE
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42, k44, k46, k48, k4a, k4b, k4c, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
+    {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d}, \
+}
diff --git a/keyboards/4pplet/waffling60/rev_c/rules.mk b/keyboards/4pplet/waffling60/rev_c/rules.mk
new file mode 100644
index 0000000000..88173a40c2
--- /dev/null
+++ b/keyboards/4pplet/waffling60/rev_c/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 4c9c7b9963ac0b7ee0c2285166678eac7f0b3c14 Mon Sep 17 00:00:00 2001
From: evanmcook <42785294+evanmcook@users.noreply.github.com>
Date: Sun, 6 Feb 2022 10:56:36 -0500
Subject: [PATCH 538/867] [Keyboard] added evancook.audio tenpad macropad
 (#16189)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/evancookaudio/tenpad/config.h       | 44 +++++++++++++++++++
 keyboards/evancookaudio/tenpad/info.json      | 24 ++++++++++
 .../tenpad/keymaps/default/keymap.c           | 33 ++++++++++++++
 keyboards/evancookaudio/tenpad/readme.md      | 17 +++++++
 keyboards/evancookaudio/tenpad/rules.mk       | 18 ++++++++
 keyboards/evancookaudio/tenpad/tenpad.c       | 17 +++++++
 keyboards/evancookaudio/tenpad/tenpad.h       | 26 +++++++++++
 7 files changed, 179 insertions(+)
 create mode 100644 keyboards/evancookaudio/tenpad/config.h
 create mode 100644 keyboards/evancookaudio/tenpad/info.json
 create mode 100644 keyboards/evancookaudio/tenpad/keymaps/default/keymap.c
 create mode 100644 keyboards/evancookaudio/tenpad/readme.md
 create mode 100644 keyboards/evancookaudio/tenpad/rules.mk
 create mode 100644 keyboards/evancookaudio/tenpad/tenpad.c
 create mode 100644 keyboards/evancookaudio/tenpad/tenpad.h

diff --git a/keyboards/evancookaudio/tenpad/config.h b/keyboards/evancookaudio/tenpad/config.h
new file mode 100644
index 0000000000..c9d7d05251
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/config.h
@@ -0,0 +1,44 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * 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       0x636F
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0000
+#define MANUFACTURER    evancook.audio
+#define PRODUCT         tenpad
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 5
+
+/* key matrix pins */
+
+#define MATRIX_ROW_PINS {D0, D1}
+#define MATRIX_COL_PINS {F4, F5, F6, F7, B1}
+
+#define UNUSED_PINS {B3, B2, B6, B7, D5, C7, F1, F0, B4, E6, D7, C6, D4 }
+
diff --git a/keyboards/evancookaudio/tenpad/info.json b/keyboards/evancookaudio/tenpad/info.json
new file mode 100644
index 0000000000..52c62775dc
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/info.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "evancook.audio tenpad",
+    "url": "https://evancook.audio/",
+    "maintainer": "evanmcook",
+    "layouts": {
+
+	"LAYOUT_ortho_2x5": {
+        "layout": [
+            { "label": "K01", "x": 0, "y": 0 },
+            { "label": "K02", "x": 1, "y": 0 },
+            { "label": "K03", "x": 2, "y": 0 },
+            { "label": "K04", "x": 3, "y": 0 },
+            { "label": "K05", "x": 4, "y": 0 },
+
+            { "label": "K06", "x": 0, "y": 1 },
+            { "label": "K07", "x": 1, "y": 1 },
+            { "label": "K08", "x": 2, "y": 1 },
+            { "label": "K09", "x": 3, "y": 1 },
+            { "label": "K10", "x": 4, "y": 1 }
+  
+            ]
+	    }   
+    }
+}
diff --git a/keyboards/evancookaudio/tenpad/keymaps/default/keymap.c b/keyboards/evancookaudio/tenpad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2238a238d3
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* LAYER 0
+ * ,---------------------------------------.
+ * |   Q   |   W   |   E   |   R   |   T   |
+ * |-------+-------+-------|-------|-------|
+ * |   A   |   S   |   D   |   F   |   G   |
+ * ,---------------------------------------.
+ * 
+ * 
+ */
+[0] = LAYOUT_ortho_2x5(
+  KC_Q,       KC_W,      KC_E,      KC_R,      KC_T,
+  KC_A,       KC_S,      KC_D,      KC_F,      KC_G
+)
+};
diff --git a/keyboards/evancookaudio/tenpad/readme.md b/keyboards/evancookaudio/tenpad/readme.md
new file mode 100644
index 0000000000..0bcb7a7bce
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/readme.md
@@ -0,0 +1,17 @@
+# tenpad macropad
+
+A 2x5 macropad designed by Evan Cook, with the design goal of being compact in the Z axis
+[Default Layout](https://raw.githubusercontent.com/evanmcook/tenpad/main/keyboard-layout.jpg)
+
+* Keyboard Maintainer: [Evan Cook](https://github.com/evanmcook/)
+* Hardware Supported: tenpad Macropad PCB
+* Hardware Availability: [tenpad Github](https://github.com/evanmcook/tenpad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make evancookaudio/tenpad: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).
+
+## Enter the bootloader: 
+* **Physical reset button**: Briefly short the pair of pins marked "reset" on the top right corner of the bottom PCB of the keyboard.
\ No newline at end of file
diff --git a/keyboards/evancookaudio/tenpad/rules.mk b/keyboards/evancookaudio/tenpad/rules.mk
new file mode 100644
index 0000000000..6cf6d9358b
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/evancookaudio/tenpad/tenpad.c b/keyboards/evancookaudio/tenpad/tenpad.c
new file mode 100644
index 0000000000..abd852baf2
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/tenpad.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * 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 "tenpad.h"
diff --git a/keyboards/evancookaudio/tenpad/tenpad.h b/keyboards/evancookaudio/tenpad/tenpad.h
new file mode 100644
index 0000000000..c9d6fa62c9
--- /dev/null
+++ b/keyboards/evancookaudio/tenpad/tenpad.h
@@ -0,0 +1,26 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * 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_ortho_2x5(\
+    k00, k01, k02, k03, k04, \
+    k05, k06, k07, k08, k09 \
+    ) { \
+        {k00, k01, k02, k03, k04},\
+        {k05, k06, k07, k08, k09},\
+    }

From 4fb6eb72531bf8026751d7db292eeae9466e7710 Mon Sep 17 00:00:00 2001
From: Elliot Powell <32494740+e11i0t23@users.noreply.github.com>
Date: Sun, 6 Feb 2022 15:57:16 +0000
Subject: [PATCH 539/867] [Keyboard] Add Support for KeebsForAll Freebird
 Numpads (#16046)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../keebsforall/freebirdnp/lite/config.h      |  55 ++++
 .../keebsforall/freebirdnp/lite/info.json     | 204 +++++++++++++++
 .../freebirdnp/lite/keymaps/default/keymap.c  |  32 +++
 .../freebirdnp/lite/keymaps/via/keymap.c      |  46 ++++
 .../freebirdnp/lite/keymaps/via/rules.mk      |   1 +
 keyboards/keebsforall/freebirdnp/lite/lite.c  |  16 ++
 keyboards/keebsforall/freebirdnp/lite/lite.h  |  48 ++++
 .../keebsforall/freebirdnp/lite/readme.md     |  19 ++
 .../keebsforall/freebirdnp/lite/rules.mk      |  20 ++
 keyboards/keebsforall/freebirdnp/pro/config.h |  58 +++++
 .../keebsforall/freebirdnp/pro/info.json      | 244 ++++++++++++++++++
 .../freebirdnp/pro/keymaps/default/keymap.c   |  45 ++++
 .../freebirdnp/pro/keymaps/via/keymap.c       |  51 ++++
 .../freebirdnp/pro/keymaps/via/rules.mk       |   1 +
 keyboards/keebsforall/freebirdnp/pro/pro.c    |  28 ++
 keyboards/keebsforall/freebirdnp/pro/pro.h    |  52 ++++
 .../keebsforall/freebirdnp/pro/readme.md      |  21 ++
 keyboards/keebsforall/freebirdnp/pro/rules.mk |  21 ++
 18 files changed, 962 insertions(+)
 create mode 100644 keyboards/keebsforall/freebirdnp/lite/config.h
 create mode 100644 keyboards/keebsforall/freebirdnp/lite/info.json
 create mode 100644 keyboards/keebsforall/freebirdnp/lite/keymaps/default/keymap.c
 create mode 100644 keyboards/keebsforall/freebirdnp/lite/keymaps/via/keymap.c
 create mode 100755 keyboards/keebsforall/freebirdnp/lite/keymaps/via/rules.mk
 create mode 100644 keyboards/keebsforall/freebirdnp/lite/lite.c
 create mode 100644 keyboards/keebsforall/freebirdnp/lite/lite.h
 create mode 100644 keyboards/keebsforall/freebirdnp/lite/readme.md
 create mode 100644 keyboards/keebsforall/freebirdnp/lite/rules.mk
 create mode 100644 keyboards/keebsforall/freebirdnp/pro/config.h
 create mode 100644 keyboards/keebsforall/freebirdnp/pro/info.json
 create mode 100644 keyboards/keebsforall/freebirdnp/pro/keymaps/default/keymap.c
 create mode 100644 keyboards/keebsforall/freebirdnp/pro/keymaps/via/keymap.c
 create mode 100755 keyboards/keebsforall/freebirdnp/pro/keymaps/via/rules.mk
 create mode 100644 keyboards/keebsforall/freebirdnp/pro/pro.c
 create mode 100644 keyboards/keebsforall/freebirdnp/pro/pro.h
 create mode 100644 keyboards/keebsforall/freebirdnp/pro/readme.md
 create mode 100644 keyboards/keebsforall/freebirdnp/pro/rules.mk

diff --git a/keyboards/keebsforall/freebirdnp/lite/config.h b/keyboards/keebsforall/freebirdnp/lite/config.h
new file mode 100644
index 0000000000..317132eff3
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/config.h
@@ -0,0 +1,55 @@
+/*
+Copyright 2021 ELliot Powell
+
+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       0x6B66
+#define PRODUCT_ID      0x1013
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    KeebsForAll
+#define PRODUCT         Freebird Numpad Lite
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 4
+
+/*
+ * 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, B6, B5, B4, B3 }
+#define MATRIX_COL_PINS { C7, B2, B1, B0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+
+/* 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
diff --git a/keyboards/keebsforall/freebirdnp/lite/info.json b/keyboards/keebsforall/freebirdnp/lite/info.json
new file mode 100644
index 0000000000..1553264e08
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/info.json
@@ -0,0 +1,204 @@
+{
+    "keyboard_name": "FreebirdNP Lite",
+    "url": "https://keebsforall.com/products/fb-numpad-lite",
+    "maintainer": "e11i0t23",
+    "manufacturer": "KeebsForAll",
+    "layouts": {
+        "LAYOUT_numpad_5x4": {
+            "layout": [
+                {
+                    "label": "Num Lock",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "/",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "*",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "-",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "7",
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "label": "8",
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "label": "9",
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "label": "4",
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "label": "5",
+                    "x": 1,
+                    "y": 2
+                },
+                {
+                    "label": "6",
+                    "x": 2,
+                    "y": 2
+                },
+                {
+                    "label": "+",
+                    "x": 3,
+                    "y": 1,
+                    "h": 2
+                },
+                {
+                    "label": "1",
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "label": "2",
+                    "x": 1,
+                    "y": 3
+                },
+                {
+                    "label": "3",
+                    "x": 2,
+                    "y": 3
+                },
+                {
+                    "label": "0",
+                    "x": 0,
+                    "y": 4,
+                    "w": 2
+                },
+                {
+                    "label": ".",
+                    "x": 2,
+                    "y": 4
+                },
+                {
+                    "label": "Enter",
+                    "x": 3,
+                    "y": 3,
+                    "h": 2
+                }
+            ]
+        },
+        "LAYOUT_ortho_5x4": {
+            "layout": [
+                {
+                    "label": "Num Lock",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "/",
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "label": "*",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "-",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "7",
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "label": "8",
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "label": "9",
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "label": "+",
+                    "x": 3,
+                    "y": 1
+                },
+                {
+                    "label": "4",
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "label": "5",
+                    "x": 1,
+                    "y": 2
+                },
+                {
+                    "label": "6",
+                    "x": 2,
+                    "y": 2
+                },
+                {
+                    "label": "+",
+                    "x": 3,
+                    "y": 2
+                },
+                {
+                    "label": "1",
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "label": "2",
+                    "x": 1,
+                    "y": 3
+                },
+                {
+                    "label": "3",
+                    "x": 2,
+                    "y": 3
+                },
+                {
+                    "label": "Enter",
+                    "x": 3,
+                    "y": 3
+                },
+                {
+                    "label": "0",
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "label": "00",
+                    "x": 1,
+                    "y": 4
+                },
+                {
+                    "label": ".",
+                    "x": 2,
+                    "y": 4
+                },
+                {
+                    "label": "Enter",
+                    "x": 3,
+                    "y": 4
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebsforall/freebirdnp/lite/keymaps/default/keymap.c b/keyboards/keebsforall/freebirdnp/lite/keymaps/default/keymap.c
new file mode 100644
index 0000000000..3d7f4026f8
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_numpad_5x4(
+    TG(1),   KC_PSLS, KC_PAST, KC_PMNS,
+    KC_P7,   KC_P8,   KC_P9,
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,   KC_P2,   KC_P3,
+    KC_P0,            KC_PDOT, KC_PENT ),
+
+[1] = LAYOUT_numpad_5x4(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_HOME, KC_UP,   KC_PGUP,
+    KC_LEFT, KC_NO,   KC_RGHT, KC_TRNS,
+    KC_END,  KC_DOWN, KC_PGDN,
+    KC_INS,           KC_DEL,  KC_TRNS),
+};
diff --git a/keyboards/keebsforall/freebirdnp/lite/keymaps/via/keymap.c b/keyboards/keebsforall/freebirdnp/lite/keymaps/via/keymap.c
new file mode 100644
index 0000000000..712b01dcfa
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_ortho_5x4( /* Base */
+    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_P0,   KC_P0,   KC_PDOT, KC_PENT),
+
+[1] = LAYOUT_ortho_5x4( /* Empty for Dynamic keymap */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_ortho_5x4( /* Empty for Dynamic keymap */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_ortho_5x4( /* Empty for Dynamic keymap */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/keyboards/keebsforall/freebirdnp/lite/keymaps/via/rules.mk b/keyboards/keebsforall/freebirdnp/lite/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keebsforall/freebirdnp/lite/lite.c b/keyboards/keebsforall/freebirdnp/lite/lite.c
new file mode 100644
index 0000000000..4d424c17da
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/lite.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * 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 "lite.h"
diff --git a/keyboards/keebsforall/freebirdnp/lite/lite.h b/keyboards/keebsforall/freebirdnp/lite/lite.h
new file mode 100644
index 0000000000..7f8cbdeeb0
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/lite.h
@@ -0,0 +1,48 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_numpad_5x4( \
+    K00, K01, K02, K03,  \
+    K10, K11, K12,       \
+    K20, K21, K22, K13,  \
+    K30, K31, K32,       \
+    K40,      K42, K33   \
+) { \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, XXX }, \
+    { K30, K31, K32, K33 }, \
+    { K40, XXX, K42, XXX }  \
+}
+
+#define LAYOUT_ortho_5x4( \
+    K00, K01, K02, K03, \
+    K10, K11, K12, K13, \
+    K20, K21, K22, K23, \
+    K30, K31, K32, K33, \
+    K40, K41, K42, K43  \
+) { \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, K23 }, \
+    { K30, K31, K32, K33 }, \
+    { K40, K41, K42, K43 }  \
+}
diff --git a/keyboards/keebsforall/freebirdnp/lite/readme.md b/keyboards/keebsforall/freebirdnp/lite/readme.md
new file mode 100644
index 0000000000..e0d0dda059
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/readme.md
@@ -0,0 +1,19 @@
+# Freebird Numpad Lite
+
+A basic numpad build to support the freebird range of products by keebsforall
+
+* Keyboard Maintainer: [e11i0t23](https://github.com/e11i0t23)
+* Hardware Supported:  FreebirdNP Lite
+* Hardware Availability: [KeebsForAll](https://keebsforall.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keebsforall/freebirdnp/lite:default
+    
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB 
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/keebsforall/freebirdnp/lite/rules.mk b/keyboards/keebsforall/freebirdnp/lite/rules.mk
new file mode 100644
index 0000000000..9f2621eeb3
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/lite/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = numpad_5x4 ortho_5x4
diff --git a/keyboards/keebsforall/freebirdnp/pro/config.h b/keyboards/keebsforall/freebirdnp/pro/config.h
new file mode 100644
index 0000000000..53ced8ac03
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/config.h
@@ -0,0 +1,58 @@
+/*
+Copyright 2021 Elliot Powell
+
+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       0x6B66
+#define PRODUCT_ID      0x1014
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    KeebsForAll
+#define PRODUCT         Freebird Numpad
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 4
+
+#define ENCODERS_PAD_A { D4 }
+#define ENCODERS_PAD_B { D5 }
+
+/*
+ * 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 { D3, B7, B6, B5, B4, B3 }
+#define MATRIX_COL_PINS { C7, B2, B1, B0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+
+/* 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
diff --git a/keyboards/keebsforall/freebirdnp/pro/info.json b/keyboards/keebsforall/freebirdnp/pro/info.json
new file mode 100644
index 0000000000..5aa40c4a6d
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/info.json
@@ -0,0 +1,244 @@
+{
+    "keyboard_name": "FreebirdNP Pro",
+    "url": "https://keebsforall.com/products/fb-numpad-pro",
+    "maintainer": "e11i0t23",
+    "manufacturer": "KeebsForAll",
+    "layouts": {
+        "LAYOUT_numpad_6x4": {
+            "layout": [
+                {
+                    "label": "F1",
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "label": "F2",
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "label": "F3",
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "label": "MUTE",
+                    "x": 3,
+                    "y": 1
+                },
+                {
+                    "label": "Num Lock",
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "label": "/",
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "label": "*",
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "label": "-",
+                    "x": 3,
+                    "y": 1
+                },
+                {
+                    "label": "7",
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "label": "8",
+                    "x": 1,
+                    "y": 2
+                },
+                {
+                    "label": "9",
+                    "x": 2,
+                    "y": 2
+                },
+                {
+                    "label": "4",
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "label": "5",
+                    "x": 1,
+                    "y": 3
+                },
+                {
+                    "label": "6",
+                    "x": 2,
+                    "y": 3
+                },
+                {
+                    "label": "+",
+                    "x": 3,
+                    "y": 2,
+                    "h": 2
+                },
+                {
+                    "label": "1",
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "label": "2",
+                    "x": 1,
+                    "y": 4
+                },
+                {
+                    "label": "3",
+                    "x": 2,
+                    "y": 4
+                },
+                {
+                    "label": "0",
+                    "x": 0,
+                    "y": 5,
+                    "w": 2
+                },
+                {
+                    "label": ".",
+                    "x": 2,
+                    "y": 5
+                },
+                {
+                    "label": "Enter",
+                    "x": 3,
+                    "y": 4,
+                    "h": 2
+                }
+            ]
+        },
+        "LAYOUT_ortho_6x4": {
+            "layout": [
+                {
+                    "label": "F1",
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "label": "F2",
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "label": "F3",
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "label": "MUTE",
+                    "x": 3,
+                    "y": 1
+                },
+                {
+                    "label": "Num Lock",
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "label": "/",
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "label": "*",
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "label": "-",
+                    "x": 3,
+                    "y": 1
+                },
+                {
+                    "label": "7",
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "label": "8",
+                    "x": 1,
+                    "y": 2
+                },
+                {
+                    "label": "9",
+                    "x": 2,
+                    "y": 2
+                },
+                {
+                    "label": "+",
+                    "x": 3,
+                    "y": 2
+                },
+                {
+                    "label": "4",
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "label": "5",
+                    "x": 1,
+                    "y": 3
+                },
+                {
+                    "label": "6",
+                    "x": 2,
+                    "y": 3
+                },
+                {
+                    "label": "+",
+                    "x": 3,
+                    "y": 3
+                },
+                {
+                    "label": "1",
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "label": "2",
+                    "x": 1,
+                    "y": 4
+                },
+                {
+                    "label": "3",
+                    "x": 2,
+                    "y": 4
+                },
+                {
+                    "label": "Enter",
+                    "x": 3,
+                    "y": 4
+                },
+                {
+                    "label": "0",
+                    "x": 0,
+                    "y": 5
+                },
+                {
+                    "label": "00",
+                    "x": 1,
+                    "y": 5
+                },
+                {
+                    "label": ".",
+                    "x": 2,
+                    "y": 5
+                },
+                {
+                    "label": "Enter",
+                    "x": 3,
+                    "y": 5
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebsforall/freebirdnp/pro/keymaps/default/keymap.c b/keyboards/keebsforall/freebirdnp/pro/keymaps/default/keymap.c
new file mode 100644
index 0000000000..db6b1faf53
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_numpad_6x4(
+    KC_F1,   KC_F2,   KC_F3,   KC_MUTE,
+    TG(1),   KC_PSLS, KC_PAST, KC_PMNS,
+    KC_P7,   KC_P8,   KC_P9,
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,   KC_P2,   KC_P3,
+    KC_P0,            KC_PDOT, KC_PENT ),
+
+[1] = LAYOUT_numpad_6x4(
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_HOME, KC_UP,   KC_PGUP,
+    KC_LEFT, KC_NO,   KC_RGHT, KC_TRNS,
+    KC_END,  KC_DOWN, KC_PGDN,
+    KC_INS,           KC_DEL,  KC_TRNS),
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebsforall/freebirdnp/pro/keymaps/via/keymap.c b/keyboards/keebsforall/freebirdnp/pro/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e08edb6182
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_ortho_6x4( /* Base */
+    KC_F1,   KC_F2,   KC_F3,   KC_MUTE,
+    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_P0,   KC_P0,   KC_PDOT, KC_PENT),
+
+[1] = LAYOUT_ortho_6x4( /* Empty for Dynamic keymap */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_ortho_6x4( /* Empty for Dynamic keymap */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_ortho_6x4( /* Empty for Dynamic keymap */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
+
diff --git a/keyboards/keebsforall/freebirdnp/pro/keymaps/via/rules.mk b/keyboards/keebsforall/freebirdnp/pro/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keebsforall/freebirdnp/pro/pro.c b/keyboards/keebsforall/freebirdnp/pro/pro.c
new file mode 100644
index 0000000000..dcc72d39b4
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/pro.c
@@ -0,0 +1,28 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * 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 "pro.h"
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebsforall/freebirdnp/pro/pro.h b/keyboards/keebsforall/freebirdnp/pro/pro.h
new file mode 100644
index 0000000000..41b241bee1
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/pro.h
@@ -0,0 +1,52 @@
+/* Copyright 2021 Elliot Powell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_numpad_6x4( \
+    KF0, KF1, KF2, KF3,  \
+    K00, K01, K02, K03,  \
+    K10, K11, K12,       \
+    K20, K21, K22, K13,  \
+    K30, K31, K32,       \
+    K40,      K42, K33   \
+) { \
+    { KF0, KF1, KF2, KF3 }, \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, XXX }, \
+    { K30, K31, K32, K33 }, \
+    { K40, XXX, K42, XXX }  \
+}
+
+#define LAYOUT_ortho_6x4( \
+    KF0, KF1, KF2, KF3,  \
+    K00, K01, K02, K03, \
+    K10, K11, K12, K13, \
+    K20, K21, K22, K23, \
+    K30, K31, K32, K33, \
+    K40, K41, K42, K43  \
+) { \
+    { KF0, KF1, KF2, KF3 }, \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, K23 }, \
+    { K30, K31, K32, K33 }, \
+    { K40, K41, K42, K43 }  \
+}
diff --git a/keyboards/keebsforall/freebirdnp/pro/readme.md b/keyboards/keebsforall/freebirdnp/pro/readme.md
new file mode 100644
index 0000000000..3b06a72d11
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/readme.md
@@ -0,0 +1,21 @@
+# Freebird Numpad Pro
+
+A basic numpad build to support the freebird range of products by keebsforall
+
+Pro Model features an Frow and Encoder
+
+* Keyboard Maintainer: [e11i0t23](https://github.com/e11i0t23)
+* Hardware Supported:  FreebirdNP Pro
+* Hardware Availability: [KeebsForAll](https://keebsforall.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keebsforall/freebirdnp/pro:default
+    
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB 
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/keebsforall/freebirdnp/pro/rules.mk b/keyboards/keebsforall/freebirdnp/pro/rules.mk
new file mode 100644
index 0000000000..fae02c7844
--- /dev/null
+++ b/keyboards/keebsforall/freebirdnp/pro/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+
+LAYOUTS = numpad_6x4 ortho_6x4

From 5a0e129f1160ee439f6be4504fb935204ae86436 Mon Sep 17 00:00:00 2001
From: Desprez Jean-Marc <jm.desprez@gmail.com>
Date: Sun, 6 Feb 2022 17:55:16 +0100
Subject: [PATCH 540/867] [Bug] Fix layer_state restoration at end of dynamic
 macro feature (#16230)

---
 quantum/process_keycode/process_dynamic_macro.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/quantum/process_keycode/process_dynamic_macro.c b/quantum/process_keycode/process_dynamic_macro.c
index 18c8d7ca2e..0feb634014 100644
--- a/quantum/process_keycode/process_dynamic_macro.c
+++ b/quantum/process_keycode/process_dynamic_macro.c
@@ -82,7 +82,7 @@ void dynamic_macro_play(keyrecord_t *macro_buffer, keyrecord_t *macro_end, int8_
 
     clear_keyboard();
 
-    layer_state = saved_layer_state;
+    layer_state_set(saved_layer_state);
 
     dynamic_macro_play_user(direction);
 }

From 4974b50a7f654786b2d977a4227532793bffc179 Mon Sep 17 00:00:00 2001
From: fOmey <pauly.galea@gmail.com>
Date: Mon, 7 Feb 2022 03:55:35 +1100
Subject: [PATCH 541/867] RGB matrix backlight mapping and fixes (#16231)

---
 keyboards/atlantis/ak81_ve/ak81_ve.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.c b/keyboards/atlantis/ak81_ve/ak81_ve.c
index b8ef4ee225..fcf279ed46 100644
--- a/keyboards/atlantis/ak81_ve/ak81_ve.c
+++ b/keyboards/atlantis/ak81_ve/ak81_ve.c
@@ -20,11 +20,11 @@
 led_config_t g_led_config = { {
   // Key Matrix to LED Index
   { 12, 11, 10, 9,      8,      7,      6,  5,      4,      NO_LED, 3,  2,  1,      0 },            // 13 keys
-  { 27, 26, 25, 24,     23,     22,     21, 20,     19,     18,     17, 16, 15,     14, 13 },       // 15 keys
-  { 42, 41, 40, 39,     38,     37,     36, 35,     34,     33,     32, 31, 30,     29, 28 },       // 15 keys
-  { 56, 55, 54, 53,     52,     51,     50, 49,     48,     47,     46, 45, 44,     43, NO_LED },   // 14 keys
-  { 70, 69, 68, 67,     66,     65,     64, 63,     62,     61,     60, 59, NO_LED, 58, 57 },       // 14 keys
-  { 79, 78, 77, NO_LED, NO_LED, NO_LED, 76, NO_LED, NO_LED, NO_LED, 75, 74, 73,     72, 71 }        // 9 keys
+  { 27, 26, 25, 24,     23,     22,     21, 20,     19,     18,     17, 16, 15,     14,     13 },   // 15 keys
+  { 42, 41, 40, 39,     38,     37,     36, 35,     34,     33,     32, 31, 30,     29,     28 },   // 15 keys
+  { 56, 55, 54, 53,     52,     51,     50, 49,     48,     47,     46, 45, 44,     NO_LED, 43 },   // 14 keys
+  { 70, 69, 68, 67,     66,     65,     64, 63,     62,     61,     60, 59, NO_LED, 58,     57 },   // 14 keys
+  { 79, 78, 77, NO_LED, NO_LED, NO_LED, 76, NO_LED, NO_LED, NO_LED, 75, 74, 73,     72,     71 }    // 9 keys
 }, { 
   // LED Index to Physical Positon
   { 240,  0 }, { 224,  0 }, { 208,  0 }, { 192, 0 },   { 176, 0 },  { 160, 0 },  { 144, 0 },  { 128, 0 },  { 112, 0 },  { 96, 0 },  { 80, 0 },  { 64, 0 },             { 32, 0 },
@@ -32,7 +32,8 @@ led_config_t g_led_config = { {
   { 240, 26 }, { 224, 26 }, { 208, 26 }, { 192 , 26 }, { 176, 26 }, { 160, 26 }, { 144, 26 }, { 128, 26 }, { 112, 26 }, { 96, 26 }, { 80, 26 }, { 64, 26}, { 48, 26 }, { 32, 26 }, { 16, 26 },
   { 240, 39 },       { 216, 39 },        { 192 , 39 }, { 176, 39 }, { 160, 39 }, { 144, 39 }, { 128, 39 }, { 112, 39 }, { 96, 39 }, { 80, 39 }, { 64, 39}, { 48, 39 }, { 32, 39 }, { 16, 39 },
   { 240, 52 }, { 224, 52 }, { 208, 52 }, { 192 , 52 }, { 176, 52 }, { 160, 52 }, { 144, 52 }, { 128, 52 }, { 112, 52 }, { 96, 52 }, { 80, 52 }, { 64, 52}, { 48, 52 },       { 24, 52 },
-  { 240, 64 }, { 224, 64 }, { 208, 64 }, { 192, 64 },  { 176, 64 },                                        { 112, 64 },                                    { 48, 64 }, { 32, 64 }, { 16, 64 }
+  { 240, 64 }, { 224, 64 }, { 208, 64 }, { 192, 64 },  { 176, 64 },                                        { 112, 64 },                                    { 48, 64 }, { 32, 64 }, { 16, 64 },
+  { 0, 26 }, { 0, 46 }, { 0, 64 }, { 48, 64 }, { 72, 64 }, { 104, 64 }, { 136, 64 }, { 168, 64 }, { 208, 64 }, { 232, 58 }, { 232, 45 }, { 232, 32 }, { 232, 20 }, { 232, 7 }, { 176, 0 }, { 112, 0 }
 }, {
   // LED Index to Flag
   4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 

From 8da9588bfb6b3ce89c4624ad61d2de7b73274c22 Mon Sep 17 00:00:00 2001
From: "Anton K. (ai Doge)" <abca2004@gmail.com>
Date: Sun, 6 Feb 2022 11:57:58 -0500
Subject: [PATCH 542/867] [Keyboard] via support for eternal_keypad (#16242)

---
 keyboards/eternal_keypad/keymaps/via/keymap.c | 107 ++++++++++++++++++
 keyboards/eternal_keypad/keymaps/via/rules.mk |   2 +
 2 files changed, 109 insertions(+)
 create mode 100644 keyboards/eternal_keypad/keymaps/via/keymap.c
 create mode 100644 keyboards/eternal_keypad/keymaps/via/rules.mk

diff --git a/keyboards/eternal_keypad/keymaps/via/keymap.c b/keyboards/eternal_keypad/keymaps/via/keymap.c
new file mode 100644
index 0000000000..725cc12240
--- /dev/null
+++ b/keyboards/eternal_keypad/keymaps/via/keymap.c
@@ -0,0 +1,107 @@
+/* Copyright 2021 duckyb
+ *
+ * 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 layer_names {
+    _BASE = 0,
+    _ARROW,
+    _FN,
+    _ADJUST
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Base Layer
+   * ,-------------------------------------.
+   * |     |  Esc  |  1|  2|  3|  4|  5|  6|
+	 * |		 |-------+---+---+---+---+---+---|
+   * |     |  Tab  |  Q|  W|  E|  R|  T|  7|
+	 * |----||-------+---+---+---+---+---+---|
+   * | F13|| LCtrl |  A|  S|  D|  F|  G|  8|
+	 * |----||-------+---+---+---+---+---+---|
+   * | F14|| Shif  |  Z|  X|  C|  V|  B|  9|
+   * |----||-------------------------------|
+   * | F15|| AltTab| _FN |Alt|  Space  |  0|
+   * `----'`-------------------------------'
+   */
+    [_BASE] = LAYOUT(
+		        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, 
+		        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_7, 
+		KC_F13, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_8, 
+		KC_F14, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_9, 
+		KC_F15, KC_ENT, OSL(_FN), KC_LALT, KC_SPC, LT(_ARROW, KC_0)
+    ),
+  /* Arrows Layer
+   * ,-----------------------------------------.
+   * |     |       |    |    |     |   |   |   |
+	 * |		 |-------+----+----+-----+---+---+---|
+   * |     |       |    |  UP|     |   |   |   |
+	 * |----||-------+----+----+-----+---+---+---|
+   * |    ||       |LEFT|DOWN|RIGHT|   |   |   |
+	 * |----||-------+----+----+-----+---+---+---|
+   * |    ||       |    |    |     |   |   |   |
+   * |----||-----------------------------------|
+   * | RST||       |       |     |         |   |
+   * `----'`-----------------------------------'
+   */
+    [_ARROW] = LAYOUT(
+		         _______, _______, _______, _______, _______, _______, _______,
+		         _______, _______, KC_UP, _______, _______, _______, _______, 
+		_______, _______, KC_LEFT,KC_DOWN, KC_RIGHT, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, MO(_ADJUST), _______, _______, _______
+    ),
+  /* Function Layer
+   * ,-------------------------------------.
+   * |     |       | F1| F2| F3| F4| F5| F6|
+	 * |		 |-------+---+---+---+---+---+---|
+   * |     |       |  P|  O|  I|  U|  Y| F7|
+	 * |----||-------+---+---+---+---+---+---|
+   * |    ||  Bspc |  ;|  L|  K|  J|  H| F8|
+	 * |----||-------+---+---+---+---+---+---|
+   * |    ||       |Gui|  M|  N|F12|F11| F9|
+   * |----||-------------------------------|
+   * |    ||       |     |   |         |F10|
+   * `----'`-------------------------------'
+   */
+    [_FN] = LAYOUT(
+		         _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,
+		         _______, KC_P, KC_O, KC_I, KC_U, KC_Y, KC_F7, 
+		_______, KC_BSPC, KC_SCLN, KC_L, KC_K, KC_J, KC_H, KC_F8, 
+		_______, _______, KC_LGUI, KC_M, KC_N, KC_F12, KC_F11, KC_F9, 
+		_______, _______, _______, _______, _______, KC_F10
+    ),
+
+  /* Adjust Layer
+   * ,-----------------------------------------.
+   * |     |       |    |    |     |   |   |   |
+	 * |		 |-------+----+----+-----+---+---+---|
+   * |     |       |    |    |     |   |   |   |
+	 * |----||-------+----+----+-----+---+---+---|
+   * |    ||       |    |    |     |   |   |   |
+	 * |----||-------+----+----+-----+---+---+---|
+   * |    ||       |    |    |     |   |   |   |
+   * |----||-----------------------------------|
+   * | RST||       |       |     |         |   |
+   * `----'`-----------------------------------'
+   */
+    [_ADJUST] = LAYOUT(
+		         _______, _______, _______, _______, _______, _______, _______,
+		         _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, 
+		RESET,   _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/eternal_keypad/keymaps/via/rules.mk b/keyboards/eternal_keypad/keymaps/via/rules.mk
new file mode 100644
index 0000000000..ca9fed0e6b
--- /dev/null
+++ b/keyboards/eternal_keypad/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes

From e036c19d063c543090d01ea841ac343a48276f6d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 7 Feb 2022 04:02:45 +1100
Subject: [PATCH 543/867] Add SN74x138 demultiplexer driver (#16217)

---
 drivers/gpio/sn74x138.c          |  65 +++++++
 drivers/gpio/sn74x138.h          |  48 +++++
 keyboards/evyd13/wasdat/config.h |  10 +-
 keyboards/evyd13/wasdat/matrix.c | 299 +++++--------------------------
 keyboards/evyd13/wasdat/rules.mk |   3 +-
 5 files changed, 162 insertions(+), 263 deletions(-)
 create mode 100644 drivers/gpio/sn74x138.c
 create mode 100644 drivers/gpio/sn74x138.h

diff --git a/drivers/gpio/sn74x138.c b/drivers/gpio/sn74x138.c
new file mode 100644
index 0000000000..222e5db56c
--- /dev/null
+++ b/drivers/gpio/sn74x138.c
@@ -0,0 +1,65 @@
+/* Copyright 2022
+ *
+ * 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 "sn74x138.h"
+#include "gpio.h"
+
+#define ADDRESS_PIN_COUNT 3
+
+#ifndef SN74X138_ADDRESS_PINS
+#    error sn74x138: no address pins defined!
+#endif
+
+static const pin_t address_pins[ADDRESS_PIN_COUNT] = SN74X138_ADDRESS_PINS;
+
+void sn74x138_init(void) {
+    for (int i = 0; i < ADDRESS_PIN_COUNT; i++) {
+        setPinOutput(address_pins[i]);
+        writePinLow(address_pins[i]);
+    }
+
+#if defined(SN74X138_E1_PIN)
+    setPinOutput(SN74X138_E1_PIN);
+    writePinHigh(SN74X138_E1_PIN);
+#endif
+
+#if defined(SN74X138_E2_PIN)
+    setPinOutput(SN74X138_E2_PIN);
+    writePinHigh(SN74X138_E2_PIN);
+#endif
+#if defined(SN74X138_E3_PIN)
+    setPinOutput(SN74X138_E3_PIN);
+    writePinLow(SN74X138_E3_PIN);
+#endif
+}
+
+void sn74x138_set_enabled(bool enabled) {
+#if defined(SN74X138_E1_PIN)
+    writePin(SN74X138_E1_PIN, !enabled);
+#endif
+#if defined(SN74X138_E2_PIN)
+    writePin(SN74X138_E2_PIN, !enabled);
+#endif
+#if defined(SN74X138_E3_PIN)
+    writePin(SN74X138_E3_PIN, enabled);
+#endif
+}
+
+void sn74x138_set_addr(uint8_t address) {
+    for (int i = 0; i < ADDRESS_PIN_COUNT; i++) {
+        writePin(address_pins[i], address & (1 << i));
+    }
+}
diff --git a/drivers/gpio/sn74x138.h b/drivers/gpio/sn74x138.h
new file mode 100644
index 0000000000..d4d0b6574d
--- /dev/null
+++ b/drivers/gpio/sn74x138.h
@@ -0,0 +1,48 @@
+/* Copyright 2022
+ *
+ * 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 <stdint.h>
+#include <stdbool.h>
+
+/**
+ * Driver for 74x138 3-to-8 decoder/demultiplexer with inverting outputs
+ * https://assets.nexperia.com/documents/data-sheet/74HC_HCT138.pdf
+ */
+
+/**
+ * Initialize the address and output enable pins.
+ */
+void sn74x138_init(void);
+
+/**
+ * Set the enabled state.
+ *
+ * When enabled is true, pulls the E1 and E2 pins low, and the E3 pin high.
+ *
+ * \param enabled The enable state to set.
+ */
+void sn74x138_set_enabled(bool enabled);
+
+/**
+ * Set the output pin address.
+ * 
+ * The selected output pin will be pulled low, while the remaining output pins will be high.
+ *
+ * \param address The address to set, from 0 to 7.
+ */
+void sn74x138_set_addr(uint8_t address);
diff --git a/keyboards/evyd13/wasdat/config.h b/keyboards/evyd13/wasdat/config.h
index 36bbd30821..38f9fe4bda 100644
--- a/keyboards/evyd13/wasdat/config.h
+++ b/keyboards/evyd13/wasdat/config.h
@@ -41,22 +41,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
 */
 #define MATRIX_ROW_PINS { D6, D4, F6, F7, F4, F5, F0, F1 }
-#define MATRIX_COL_PINS { }
+#define MATRIX_COL_PINS { C7, B6, C6, B4, B5, D7, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, D3, B7, B3 } // Columns 6-12 controlled by demux
 #define UNUSED_PINS
 
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
+#define SN74X138_ADDRESS_PINS { D2, D1, D0 }
 
 // For QMK DFU
 #define QMK_ESC_OUTPUT D6
 #define QMK_ESC_INPUT D7
 #define QMK_LED B0
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
-
 #define LED_NUM_LOCK_PIN B2
 #define LED_CAPS_LOCK_PIN B0
 #define LED_SCROLL_LOCK_PIN B1
diff --git a/keyboards/evyd13/wasdat/matrix.c b/keyboards/evyd13/wasdat/matrix.c
index 6dd79b5330..c97dd84694 100644
--- a/keyboards/evyd13/wasdat/matrix.c
+++ b/keyboards/evyd13/wasdat/matrix.c
@@ -14,268 +14,66 @@ 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 <stdint.h>
 #include <stdbool.h>
-#include "wait.h"
-#include "util.h"
 #include "matrix.h"
-#include "debounce.h"
 #include "quantum.h"
+#include "sn74x138.h"
 
-#ifdef DIRECT_PINS
-static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
-#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
 static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-//static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-#endif
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 
-// matrix code
-
-#ifdef DIRECT_PINS
-
-static void init_pins(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
-        for (int col = 0; col < MATRIX_COLS; col++) {
-            pin_t pin = direct_pins[row][col];
-            if (pin != NO_PIN) {
-                setPinInputHigh(pin);
-            }
-        }
-    }
-}
-
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
-    matrix_row_t last_row_value = current_matrix[current_row];
-    current_matrix[current_row] = 0;
-
-    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
-        pin_t pin = direct_pins[current_row][col_index];
-        if (pin != NO_PIN) {
-            current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
-        }
-    }
-
-    return (last_row_value != current_matrix[current_row]);
-}
-
-#elif (DIODE_DIRECTION == COL2ROW)
-
-static void select_row(uint8_t row) {
-    setPinOutput(row_pins[row]);
-    writePinLow(row_pins[row]);
-}
-
-static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
-
-static void unselect_rows(void) {
-    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
-        setPinInputHigh(row_pins[x]);
-    }
-}
-
-static void init_pins(void) {
-    unselect_rows();
-    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-        setPinInputHigh(col_pins[x]);
-    }
-}
-
-static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
-    // Store last value of row prior to reading
-    matrix_row_t last_row_value = current_matrix[current_row];
-
-    // Clear data in matrix row
-    current_matrix[current_row] = 0;
-
-    // Select row and wait for row selecton to stabilize
-    select_row(current_row);
-    wait_us(30);
-
-    // For each col...
-    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
-
-        // Select the col pin to read (active low)
-        uint8_t pin_state = readPin(col_pins[col_index]);
-
-        // Populate the matrix row with the state of the col pin
-        current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
-    }
-
-    // Unselect row
-    unselect_row(current_row);
-
-    return (last_row_value != current_matrix[current_row]);
-}
-
-#elif (DIODE_DIRECTION == ROW2COL)
-
-/* Cols 0 - 15
- * col 0: C7
- * col 1:  B6
+/* col 0: C7
+ * col 1: B6
  * col 2: C6
- * col 3:  B4
- * col 4:  B5
- * col 5:   D7
- * These columns use a 74HC237D 3 to 8 bit demultiplexer.
- *                A0   A1   A2
- * col / pin:    PD2  PD1  PD0
- * 6:             1    1    1
- * 7:             0    1    1
- * 8:             1    0    1
- * 9:             0    0    1
- * 10:            1    1    0
- * 11:            0    1    0
- * 12:            1    0    0
- * col 13:  D3
- * col 14:  B7
- * col 15:  B3
+ * col 3: B4
+ * col 4: B5
+ * col 5: D7
+ *
+ * These columns use a 74HC138 3 to 8 bit demultiplexer.
+ *                A2   A1   A0
+ * col / pin:    PD0  PD1  PD2
+ * 6:              1    1    1
+ * 7:              1    1    0
+ * 8:              1    0    1
+ * 9:              1    0    0
+ * 10:             0    1    1
+ * 11:             0    1    0
+ * 12:             0    0    1
+ *
+ * col 13: D3
+ * col 14: B7
+ * col 15: B3
  */
 static void select_col(uint8_t col) {
-    switch (col) {
-        case 0:
-            writePinLow(C7);
-            break;
-        case 1:
-            writePinLow(B6);
-            break;
-        case 2:
-            writePinLow(C6);
-            break;
-        case 3:
-            writePinLow(B4);
-            break;
-        case 4:
-            writePinLow(B5);
-            break;
-        case 5:
-            writePinLow(D7);
-            break;
-        case 6:
-            writePinHigh(D0);
-            writePinHigh(D1);
-            writePinHigh(D2);
-            break;
-        case 7:
-            writePinHigh(D0);
-            writePinHigh(D1);
-            break;
-        case 8:
-            writePinHigh(D0);
-            writePinHigh(D2);
-            break;
-        case 9:
-            writePinHigh(D0);
-            break;
-        case 10:
-            writePinHigh(D1);
-            writePinHigh(D2);
-            break;
-        case 11:
-            writePinHigh(D1);
-            break;
-        case 12:
-            writePinHigh(D2);
-            break;
-        case 13:
-            writePinLow(D3);
-            break;
-        case 14:
-            writePinLow(B7);
-            break;
-        case 15:
-            writePinLow(B3);
-            break;
+    if (col_pins[col] != NO_PIN) {
+        writePinLow(col_pins[col]);
+    } else {
+        sn74x138_set_addr(13 - col);
     }
 }
 
 static void unselect_col(uint8_t col) {
-    switch (col) {
-        case 0:
-            writePinHigh(C7);
-            break;
-        case 1:
-            writePinHigh(B6);
-            break;
-        case 2:
-            writePinHigh(C6);
-            break;
-        case 3:
-            writePinHigh(B4);
-            break;
-        case 4:
-            writePinHigh(B5);
-            break;
-        case 5:
-            writePinHigh(D7);
-            break;
-        case 6:
-            writePinLow(D0);
-            writePinLow(D1);
-            writePinLow(D2);
-            break;
-        case 7:
-            writePinLow(D0);
-            writePinLow(D1);
-            break;
-        case 8:
-            writePinLow(D0);
-            writePinLow(D2);
-            break;
-        case 9:
-            writePinLow(D0);
-            break;
-        case 10:
-            writePinLow(D1);
-            writePinLow(D2);
-            break;
-        case 11:
-            writePinLow(D1);
-            break;
-        case 12:
-            writePinLow(D2);
-            break;
-        case 13:
-            writePinHigh(D3);
-            break;
-        case 14:
-            writePinHigh(B7);
-            break;
-        case 15:
-            writePinHigh(B3);
-            break;
+    if (col_pins[col] != NO_PIN) {
+        setPinOutput(col_pins[col]);
+        writePinHigh(col_pins[col]);
+    } else {
+        sn74x138_set_addr(0);
     }
 }
 
 static void unselect_cols(void) {
-    //Native
-    setPinOutput(D3);
-    setPinOutput(D7);
-    writePinHigh(D3);
-    writePinHigh(D7);
+    // Native
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        if (col_pins[x] != NO_PIN) {
+            setPinOutput(col_pins[x]);
+            writePinHigh(col_pins[x]);
+        }
+    }
 
-    setPinOutput(C6);
-    setPinOutput(C7);
-    writePinHigh(C6);
-    writePinHigh(C7);
-
-    setPinOutput(B3);
-    setPinOutput(B4);
-    setPinOutput(B5);
-    setPinOutput(B6);
-    setPinOutput(B7);
-    writePinHigh(B3);
-    writePinHigh(B4);
-    writePinHigh(B5);
-    writePinHigh(B6);
-    writePinHigh(B7);
-
-    //Demultiplexer
-    setPinOutput(D0);
-    setPinOutput(D1);
-    setPinOutput(D2);
-    writePinLow(D0);
-    writePinLow(D1);
-    writePinLow(D2);
+    // Demultiplexer
+    sn74x138_set_addr(0);
 }
 
 static void init_pins(void) {
@@ -288,9 +86,9 @@ static void init_pins(void) {
 static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
     bool matrix_changed = false;
 
-    // Select col and wait for col selecton to stabilize
+    // Select col and wait for col selection to stabilize
     select_col(current_col);
-    wait_us(30);
+    matrix_io_delay();
 
     // For each row...
     for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
@@ -318,27 +116,20 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
     return matrix_changed;
 }
 
-#endif
-
 void matrix_init_custom(void) {
     // initialize key pins
     init_pins();
+    // initialize demultiplexer
+    sn74x138_init();
 }
 
 bool matrix_scan_custom(matrix_row_t current_matrix[]) {
     bool changed = false;
 
-#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
-    // Set row, read cols
-    for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
-        changed |= read_cols_on_row(current_matrix, current_row);
-    }
-#elif (DIODE_DIRECTION == ROW2COL)
     // Set col, read rows
     for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
         changed |= read_rows_on_col(current_matrix, current_col);
     }
-#endif
 
     return changed;
 }
diff --git a/keyboards/evyd13/wasdat/rules.mk b/keyboards/evyd13/wasdat/rules.mk
index d9f65747fb..bb4261a4fe 100644
--- a/keyboards/evyd13/wasdat/rules.mk
+++ b/keyboards/evyd13/wasdat/rules.mk
@@ -18,6 +18,7 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 CUSTOM_MATRIX = lite
-SRC += matrix.c
+VPATH += drivers/gpio
+SRC += matrix.c sn74x138.c
 
 LAYOUTS = fullsize_ansi fullsize_iso tkl_ansi tkl_iso

From 0452ad94791c99572c88af3cd5489ef3c0f9970f Mon Sep 17 00:00:00 2001
From: MasterSpoon <84671859+MasterSpoon@users.noreply.github.com>
Date: Mon, 7 Feb 2022 03:04:43 +1000
Subject: [PATCH 544/867] Add RGB matrix & LED Matrix support for IS31FL3742A,
 IS31FL3743A, IS31FL3745, IS31FL3746A (#14989)

Co-authored-by: Xelus22 <17491233+Xelus22@users.noreply.github.com>
---
 common_features.mk                      |  61 ++++-
 docs/feature_led_matrix.md              | 103 ++++++++
 docs/feature_rgb_matrix.md              | 109 ++++++++
 drivers/led/issi/is31fl3742.h           | 299 ++++++++++++++++++++++
 drivers/led/issi/is31fl3743.h           | 327 ++++++++++++++++++++++++
 drivers/led/issi/is31fl3745.h           | 270 +++++++++++++++++++
 drivers/led/issi/is31fl3746.h           | 198 ++++++++++++++
 drivers/led/issi/is31flcommon.c         | 230 +++++++++++++++++
 drivers/led/issi/is31flcommon.h         |  78 ++++++
 quantum/led_matrix/led_matrix.h         |   2 +
 quantum/led_matrix/led_matrix_drivers.c |  52 +++-
 quantum/rgb_matrix/rgb_matrix.h         |   2 +
 quantum/rgb_matrix/rgb_matrix_drivers.c |  52 +++-
 13 files changed, 1779 insertions(+), 4 deletions(-)
 create mode 100644 drivers/led/issi/is31fl3742.h
 create mode 100644 drivers/led/issi/is31fl3743.h
 create mode 100644 drivers/led/issi/is31fl3745.h
 create mode 100644 drivers/led/issi/is31fl3746.h
 create mode 100644 drivers/led/issi/is31flcommon.c
 create mode 100644 drivers/led/issi/is31flcommon.h

diff --git a/common_features.mk b/common_features.mk
index 07e26a9446..7ff19e8084 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -255,7 +255,7 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
 endif
 
 LED_MATRIX_ENABLE ?= no
-VALID_LED_MATRIX_TYPES := IS31FL3731 custom
+VALID_LED_MATRIX_TYPES := IS31FL3731 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A custom
 # TODO: IS31FL3733 IS31FL3737 IS31FL3741
 
 ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
@@ -282,11 +282,40 @@ endif
         SRC += is31fl3731-simple.c
         QUANTUM_LIB_SRC += i2c_master.c
     endif
+
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3742A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3742A -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3743A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3743A -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3745)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3745 -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
+	ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3746A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3746A -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
 endif
 
 RGB_MATRIX_ENABLE ?= no
-VALID_RGB_MATRIX_TYPES := AW20216 IS31FL3731 IS31FL3733 IS31FL3737 IS31FL3741 CKLED2001 WS2812 custom
 
+VALID_RGB_MATRIX_TYPES := AW20216 IS31FL3731 IS31FL3733 IS31FL3737 IS31FL3741 IS31FL3742A IS31FL3743A IS31FL3745 IS31FL3746A CKLED2001 WS2812 custom
 ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
     ifeq ($(filter $(RGB_MATRIX_DRIVER),$(VALID_RGB_MATRIX_TYPES)),)
         $(call CATASTROPHIC_ERROR,Invalid RGB_MATRIX_DRIVER,RGB_MATRIX_DRIVER="$(RGB_MATRIX_DRIVER)" is not a valid matrix type)
@@ -341,6 +370,34 @@ endif
         QUANTUM_LIB_SRC += i2c_master.c
     endif
 
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3742A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3742A -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3743A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3743A -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3745)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3745 -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
+	ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3746A)
+        OPT_DEFS += -DIS31FLCOMMON -DIS31FL3746A -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/led/issi
+        SRC += is31flcommon.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
+
     ifeq ($(strip $(RGB_MATRIX_DRIVER)), CKLED2001)
         OPT_DEFS += -DCKLED2001 -DSTM32_I2C -DHAL_USE_I2C=TRUE
         COMMON_VPATH += $(DRIVER_PATH)/led
diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md
index 37f38cc6ed..37c74843aa 100644
--- a/docs/feature_led_matrix.md
+++ b/docs/feature_led_matrix.md
@@ -67,6 +67,109 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 
 Where `Cx_y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3731.pdf) and the header file `drivers/led/issi/is31fl3731-simple.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` ).
 
+---
+### IS31FLCOMMON :id=is31flcommon
+
+There is basic support for addressable LED matrix lighting with a selection of I2C ISSI Lumissil LED controllers through a shared common driver. To enable it, add this to your `rules.mk`:
+
+```makefile
+LED_MATRIX_ENABLE = yes
+LED_MATRIX_DRIVER = <driver name>
+```
+
+Where `<driver name>` is the applicable LED driver chip as below
+
+| Driver Name | Data Sheet | Capability |
+|-------------|------------|------------|
+| `IS31FL3742A` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3742A_DS.pdf) | 180 LED, 30x6 Matrix |
+| `ISSIFL3743A` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3743A_DS.pdf) | 198 LED, 18x11 Matrix |
+| `IS31FL3745` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3745_DS.pdf) | 144 LED, 18x8 Matrix |
+| `IS31FL3746A` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3746A_DS.pdf) | 72 LED, 18x4 Matrix |
+
+You can use between 1 and 4 IC's. Do not specify `DRIVER_ADDR_<N>` define for IC's if not present on your keyboard. The `DRIVER_ADDR_1` default assumes that all Address pins on the controller have been connected to GND. Drivers that have SYNC functionality have the default settings to disable if 1 driver. If more than 1 drivers then `DRIVER_ADDR_1` will be set to Master and the remaiing ones set to Slave.
+
+Configure the hardware via your `config.h`:
+
+| Variable | Description | Default |
+|----------|-------------|---------|
+| `ISSI_TIMEOUT` | (Optional) How long to wait for i2c messages, in milliseconds | 100 |
+| `ISSI_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 |
+| `DRIVER_COUNT` | (Required) How many LED driver IC's are present | |
+| `DRIVER_LED_TOTAL` | (Required) How many LED lights are present across all drivers | |
+| `DRIVER_ADDR_1` | (Optional) Address for the first LED driver | |
+| `DRIVER_ADDR_<N>` | (Required) Address for the additional LED drivers | |
+| `ISSI_SSR_<N>` | (Optional) Configuration for the Spread Spectrum Register | |
+| `ISSI_CONFIGURATION` | (Optional) Configuration for the Configuration Register | |
+| `ISSI_GLOBALCURRENT` | (Optional) Configuration for the Global Current Register | 0xFF |
+| `ISSI_PULLDOWNUP` | (Optional) Configuration for the Pull Up & Pull Down Register | |
+| `ISSI_TEMP` | (Optional) Configuration for the Tempature Register | |
+| `ISSI_PWM_ENABLE` | (Optional) Configuration for the PWM Enable Register | |
+| `ISSI_PWM_SET` | (Optional) Configuration for the PWM Setting Register | |
+| `ISSI_SCAL_LED ` | (Optional) Configuration for the LEDs Scaling Registers | 0xFF |
+| `ISSI_MANUAL_SCALING` | (Optional) If you wish to configure the Scaling Registers manually | |
+
+
+Defaults
+
+| Variable | IS31FL3742A | IS31FL3743A | IS31FL3745 | IS31FL3746 |
+|----------|-------------|-------------|------------|------------|
+| `DRIVER_ADDR_1` | 0b0110000 | 0b0100000 | 0b0100000 | 0b1100000 |
+| `ISSI_SSR_1` | 0x00 | 0x00 / 0x60 | 0x00 / 0xC0 | 0x00 |
+| `ISSI_SSR_<2-4>` | 0x00 | 0x40 | 0x80 | 0x00 |
+| `ISSI_CONFIGURATION` | 0x31 | 0x01 | 0x31 | 0x01 |
+| `ISSI_PULLDOWNUP` | 0x55 | 0x33 | 0x33 | 0x33 |
+| `ISSI_TEMP` | N/A | 0x00 | 0x00 | 0x00 |
+| `ISSI_PWM_ENABLE` | N/A | N/A | N/A | 0x00 |
+| `ISSI_PWM_SET` | 0x00 | N/A | N/A | 0x00 |
+
+Here is an example using 2 drivers.
+
+```c
+#define DRIVER_ADDR_2 0b0100001
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 66
+#define DRIVER_2_LED_TOTAL 42
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+```
+!> Note the parentheses, this is so when `DRIVER_LED_TOTAL` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
+
+Currently only 4 drivers are supported, but it would be trivial to support for more. Note that using a combination of different drivers is not supported. All drivers must be of the same model.
+
+Define these arrays listing all the LEDs in your `<keyboard>.c`:
+
+```c
+const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *    driver
+ *    |  LED address
+ *    |  | */
+    { 0, CS1_SW1 },
+    { 0, CS2_SW1 },
+    // ...
+}
+```
+
+Where `CSx_SWx` is the location of the LED in the matrix defined by the datasheet. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` for now).
+
+`ISSI_MANUAL_SCALING` is used to override the Scaling for individual LED's. By default they will be set as per `ISSI_SCAL_LED`. In `config.h` set how many LED's you want to manually set scaling for.
+Eg `#define ISSI_MANUAL_SCALING 3`
+
+Then Define the array listing all the LEDs you want to override in your `<keyboard>.c`:
+
+```c
+const is31_led __flash g_is31_scaling[ISSI_MANUAL_SCALING] = {
+ *   LED Index
+ *   |  Scaling
+ *   |  | */
+    {5, 120},
+    {9, 120},
+    ....
+}
+```
+
+Where LED Index is the position of the LED in the `g_is31_leds` array. The `scaling` value between 0 and 255 to be written to the Scaling Register.
+
 ---
 
 ## Common Configuration :id=common-configuration
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 831df3d442..a021779d43 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -232,6 +232,115 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
 
 Where `X_Y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3737.pdf) and the header file `drivers/led/issi/is31fl3737.h`. The `driver` is the index of the driver you defined in your `config.h` (Only `0`, `1` for now).
 
+---
+### IS31FLCOMMON :id=is31flcommon
+
+There is basic support for addressable RGB matrix lighting with a selection of I2C ISSI Lumissil RGB controllers through a shared common driver. To enable it, add this to your `rules.mk`:
+
+```makefile
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = <driver name>
+```
+
+Where `<driver name>` is the applicable LED driver chip as below
+
+| Driver Name | Data Sheet | Capability |
+|-------------|------------|------------|
+| `IS31FL3742A` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3742A_DS.pdf) | 60 RGB, 30x6 Matrix |
+| `ISSIFL3743A` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3743A_DS.pdf) | 66 RGB, 18x11 Matrix |
+| `IS31FL3745` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3745_DS.pdf) | 48 RGB, 18x8 Matrix |
+| `IS31FL3746A` | [datasheet](https://www.lumissil.com/assets/pdf/core/IS31FL3746A_DS.pdf) | 24 RGB, 18x4 Matrix |
+
+You can use between 1 and 4 IC's. Do not specify `DRIVER_ADDR_<N>` define for IC's if not present on your keyboard. The `DRIVER_ADDR_1` default assumes that all Address pins on the controller have been connected to GND. Drivers that have SYNC functionality have the default settings to disable if 1 driver. If more than 1 drivers then `DRIVER_ADDR_1` will be set to Master and the remaining ones set to Slave.
+
+Configure the hardware via your `config.h`:
+
+| Variable | Description | Default |
+|----------|-------------|---------|
+| `ISSI_TIMEOUT` | (Optional) How long to wait for i2c messages, in milliseconds | 100 |
+| `ISSI_PERSISTENCE` | (Optional) Retry failed messages this many times | 0 |
+| `DRIVER_COUNT` | (Required) How many RGB driver IC's are present | |
+| `DRIVER_LED_TOTAL` | (Required) How many RGB lights are present across all drivers | |
+| `DRIVER_ADDR_1` | (Optional) Address for the first RGB driver | |
+| `DRIVER_ADDR_<N>` | (Required) Address for the additional RGB drivers | |
+| `ISSI_SSR_<N>` | (Optional) Configuration for the Spread Spectrum Register | |
+| `ISSI_CONFIGURATION` | (Optional) Configuration for the Configuration Register | |
+| `ISSI_GLOBALCURRENT` | (Optional) Configuration for the Global Current Register | 0xFF |
+| `ISSI_PULLDOWNUP` | (Optional) Configuration for the Pull Up & Pull Down Register | |
+| `ISSI_TEMP` | (Optional) Configuration for the Tempature Register | |
+| `ISSI_PWM_ENABLE` | (Optional) Configuration for the PWM Enable Register | |
+| `ISSI_PWM_SET` | (Optional) Configuration for the PWM Setting Register | |
+| `ISSI_SCAL_RED` | (Optional) Configuration for the RED LEDs in Scaling Registers | 0xFF |
+| `ISSI_SCAL_BLUE` | (Optional) Configuration for the BLUE LEDs in Scaling Registers | 0xFF |
+| `ISSI_SCAL_GREEN` | (Optional) Configuration for the GREEN LEDs in Scaling Registers | 0xFF |
+| `ISSI_MANUAL_SCALING` | (Optional) If you wish to configure the Scaling Registers manually | |
+
+
+Defaults
+
+| Variable | IS31FL3742A | IS31FL3743A | IS31FL3745 | IS31FL3746 |
+|----------|-------------|-------------|------------|------------|
+| `DRIVER_ADDR_1` | 0b0110000 | 0b0100000 | 0b0100000 | 0b1100000 |
+| `ISSI_SSR_1` | 0x00 | 0x00 / 0x60 | 0x00 / 0xC0 | 0x00 |
+| `ISSI_SSR_<2-4>` | 0x00 | 0x40 | 0x80 | 0x00 |
+| `ISSI_CONFIGURATION` | 0x31 | 0x01 | 0x31 | 0x01 |
+| `ISSI_PULLDOWNUP` | 0x55 | 0x33 | 0x33 | 0x33 |
+| `ISSI_TEMP` | N/A | 0x00 | 0x00 | 0x00 |
+| `ISSI_PWM_ENABLE` | N/A | N/A | N/A | 0x00 |
+| `ISSI_PWM_SET` | 0x00 | N/A | N/A | 0x00 |
+
+Here is an example using 2 drivers.
+
+```c
+#define DRIVER_ADDR_2 0b0100001
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 66
+#define DRIVER_2_LED_TOTAL 42
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+```
+
+!> Note the parentheses, this is so when `DRIVER_LED_TOTAL` is used in code and expanded, the values are added together before any additional math is applied to them. As an example, `rand() % (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)` will give very different results than `rand() % DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL`.
+
+Currently only 4 drivers are supported, but it would be trivial to support for more. Note that using a combination of different drivers is not supported. All drivers must be of the same model.
+
+Define these arrays listing all the LEDs in your `<keyboard>.c`:
+
+```c
+const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |        G location
+ *   |  |        |        B location
+ *   |  |        |        | */
+    {0, CS1_SW1, CS2_SW1, CS3_SW1},
+    ....
+}
+```
+
+Where `CSx_SWx` is the location of the LED in the matrix defined by the datasheet. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` for now).
+
+`ISSI_MANUAL_SCALING` is used to override the Scaling for individual LED's. By default they will be set as per `ISSI_SCAL_<colour>`. In `config.h` set how many LED's you want to manually set scaling for.
+Eg `#define ISSI_MANUAL_SCALING 3`
+
+Then Define the array listing all the LEDs you want to override in your `<keyboard>.c`:
+
+```c
+const is31_led __flash g_is31_scaling[ISSI_MANUAL_SCALING] = {
+ *   LED Index
+ *   |  R scaling
+ *   |  |    G scaling
+ *   |  |    |    B scaling
+ *   |  |    |    | */
+    {5, 120, 155, 167},
+    {9, 120, 155, 167},
+    ....
+}
+```
+
+Where LED Index is the position of the LED in the `g_is31_leds` array. The `scaling` value between 0 and 255 to be written to the Scaling Register.
+
 ---
 
 ### WS2812 :id=ws2812
diff --git a/drivers/led/issi/is31fl3742.h b/drivers/led/issi/is31fl3742.h
new file mode 100644
index 0000000000..c96f12d0f1
--- /dev/null
+++ b/drivers/led/issi/is31fl3742.h
@@ -0,0 +1,299 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ * Copyright 2021 MasterSpoon
+ *
+ * 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
+
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 00 <-> GND
+// 01 <-> SCL
+// 10 <-> SDA
+// 11 <-> VCC
+// ADDR represents A1:A0 of the 7-bit address.
+// The result is: 0b01100(ADDR)
+#ifndef DRIVER_ADDR_1
+#    define DRIVER_ADDR_1 0b0110000
+#endif
+
+// Command Registers
+#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
+#define ISSI_COMMANDREGISTER 0xFD
+#define ISSI_IDREGISTER 0xFC
+#define ISSI_REGISTER_UNLOCK 0xC5
+
+// Response Registers
+#define ISSI_PAGE_PWM 0x00
+#define ISSI_PAGE_SCALING 0x02
+#define ISSI_PAGE_FUNCTION 0x04
+
+// Registers under Function Register
+#define ISSI_REG_CONFIGURATION 0x00
+#define ISSI_REG_GLOBALCURRENT 0x01
+#define ISSI_REG_PULLDOWNUP 0x02
+#define ISSI_REG_SSR 0x41
+#define ISSI_REG_RESET 0x3F
+#define ISSI_REG_PWM_SET 0x36
+
+// Set defaults for Function Registers
+#ifndef ISSI_CONFIGURATION
+#    define ISSI_CONFIGURATION 0x31
+#endif
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+#ifndef ISSI_PULLDOWNUP
+#    define ISSI_PULLDOWNUP 0x55
+#endif
+#ifndef ISSI_PWM_SET
+#    define ISSI_PWM_SET 0x00
+#endif
+
+// Set defaults for Spread Spectrum Register
+#ifndef ISSI_SSR_1
+#    define ISSI_SSR_1 0x00
+#endif
+#ifndef ISSI_SSR_2
+#    define ISSI_SSR_2 0x00
+#endif
+#ifndef ISSI_SSR_3
+#    define ISSI_SSR_3 0x00
+#endif
+#ifndef ISSI_SSR_4
+#    define ISSI_SSR_4 0x00
+#endif
+
+// Set defaults for Scaling registers
+#ifndef ISSI_SCAL_RED
+#    define ISSI_SCAL_RED 0xFF
+#endif
+#ifndef ISSI_SCAL_BLUE
+#    define ISSI_SCAL_BLUE 0xFF
+#endif
+#ifndef ISSI_SCAL_GREEN
+#    define ISSI_SCAL_GREEN 0xFF
+#endif
+#define ISSI_SCAL_RED_OFF 0x00
+#define ISSI_SCAL_GREEN_OFF 0x00
+#define ISSI_SCAL_BLUE_OFF 0x00
+
+#ifndef ISSI_SCAL_LED
+#    define ISSI_SCAL_LED 0xFF
+#endif
+#define ISSI_SCAL_LED_OFF 0x00
+
+// Set buffer sizes
+#define ISSI_MAX_LEDS 180
+#define ISSI_SCALING_SIZE 180
+#define ISSI_PWM_TRF_SIZE 18
+#define ISSI_SCALING_TRF_SIZE 18
+
+// Location of 1st bit for PWM and Scaling registers
+#define ISSI_PWM_REG_1ST 0x00
+#define ISSI_SCL_REG_1ST 0x00
+
+// Map CS SW locations to order in PWM / Scaling buffers
+// This matches the ORDER in the Datasheet Register not the POSITION
+// It will always count from 0x00 to (ISSI_MAX_LEDS - 1)
+#define CS1_SW1 0x00
+#define CS2_SW1 0x01
+#define CS3_SW1 0x02
+#define CS4_SW1 0x03
+#define CS5_SW1 0x04
+#define CS6_SW1 0x05
+#define CS7_SW1 0x06
+#define CS8_SW1 0x07
+#define CS9_SW1 0x08
+#define CS10_SW1 0x09
+#define CS11_SW1 0x0A
+#define CS12_SW1 0x0B
+#define CS13_SW1 0x0C
+#define CS14_SW1 0x0D
+#define CS15_SW1 0x0E
+#define CS16_SW1 0x0F
+#define CS17_SW1 0x10
+#define CS18_SW1 0x11
+#define CS19_SW1 0x12
+#define CS20_SW1 0x13
+#define CS21_SW1 0x14
+#define CS22_SW1 0x15
+#define CS23_SW1 0x16
+#define CS24_SW1 0x17
+#define CS25_SW1 0x18
+#define CS26_SW1 0x19
+#define CS27_SW1 0x1A
+#define CS28_SW1 0x1B
+#define CS29_SW1 0x1C
+#define CS30_SW1 0x1D
+
+#define CS1_SW2 0x1E
+#define CS2_SW2 0x1F
+#define CS3_SW2 0x20
+#define CS4_SW2 0x21
+#define CS5_SW2 0x22
+#define CS6_SW2 0x23
+#define CS7_SW2 0x24
+#define CS8_SW2 0x25
+#define CS9_SW2 0x26
+#define CS10_SW2 0x27
+#define CS11_SW2 0x28
+#define CS12_SW2 0x29
+#define CS13_SW2 0x2A
+#define CS14_SW2 0x2B
+#define CS15_SW2 0x2C
+#define CS16_SW2 0x2D
+#define CS17_SW2 0x2E
+#define CS18_SW2 0x2F
+#define CS19_SW2 0x30
+#define CS20_SW2 0x31
+#define CS21_SW2 0x32
+#define CS22_SW2 0x33
+#define CS23_SW2 0x34
+#define CS24_SW2 0x35
+#define CS25_SW2 0x36
+#define CS26_SW2 0x37
+#define CS27_SW2 0x38
+#define CS28_SW2 0x39
+#define CS29_SW2 0x3A
+#define CS30_SW2 0x3B
+
+#define CS1_SW3 0x3C
+#define CS2_SW3 0x3D
+#define CS3_SW3 0x3E
+#define CS4_SW3 0x3F
+#define CS5_SW3 0x40
+#define CS6_SW3 0x41
+#define CS7_SW3 0x42
+#define CS8_SW3 0x43
+#define CS9_SW3 0x44
+#define CS10_SW3 0x45
+#define CS11_SW3 0x46
+#define CS12_SW3 0x47
+#define CS13_SW3 0x48
+#define CS14_SW3 0x49
+#define CS15_SW3 0x4A
+#define CS16_SW3 0x4B
+#define CS17_SW3 0x4C
+#define CS18_SW3 0x4D
+#define CS19_SW3 0x4E
+#define CS20_SW3 0x4F
+#define CS21_SW3 0x50
+#define CS22_SW3 0x51
+#define CS23_SW3 0x52
+#define CS24_SW3 0x53
+#define CS25_SW3 0x54
+#define CS26_SW3 0x55
+#define CS27_SW3 0x56
+#define CS28_SW3 0x57
+#define CS29_SW3 0x58
+#define CS30_SW3 0x59
+
+#define CS1_SW4 0x5A
+#define CS2_SW4 0x5B
+#define CS3_SW4 0x5C
+#define CS4_SW4 0x5D
+#define CS5_SW4 0x5E
+#define CS6_SW4 0x5F
+#define CS7_SW4 0x60
+#define CS8_SW4 0x61
+#define CS9_SW4 0x62
+#define CS10_SW4 0x63
+#define CS11_SW4 0x64
+#define CS12_SW4 0x65
+#define CS13_SW4 0x66
+#define CS14_SW4 0x67
+#define CS15_SW4 0x68
+#define CS16_SW4 0x69
+#define CS17_SW4 0x6A
+#define CS18_SW4 0x6B
+#define CS19_SW4 0x6C
+#define CS20_SW4 0x6D
+#define CS21_SW4 0x6E
+#define CS22_SW4 0x6F
+#define CS23_SW4 0x70
+#define CS24_SW4 0x71
+#define CS25_SW4 0x72
+#define CS26_SW4 0x73
+#define CS27_SW4 0x74
+#define CS28_SW4 0x75
+#define CS29_SW4 0x76
+#define CS30_SW4 0x77
+
+#define CS1_SW5 0x78
+#define CS2_SW5 0x79
+#define CS3_SW5 0x7A
+#define CS4_SW5 0x7B
+#define CS5_SW5 0x7C
+#define CS6_SW5 0x7D
+#define CS7_SW5 0x7E
+#define CS8_SW5 0x7F
+#define CS9_SW5 0x80
+#define CS10_SW5 0x81
+#define CS11_SW5 0x82
+#define CS12_SW5 0x83
+#define CS13_SW5 0x84
+#define CS14_SW5 0x85
+#define CS15_SW5 0x86
+#define CS16_SW5 0x87
+#define CS17_SW5 0x88
+#define CS18_SW5 0x89
+#define CS19_SW5 0x8A
+#define CS20_SW5 0x8B
+#define CS21_SW5 0x8C
+#define CS22_SW5 0x8D
+#define CS23_SW5 0x8E
+#define CS24_SW5 0x8F
+#define CS25_SW5 0x90
+#define CS26_SW5 0x91
+#define CS27_SW5 0x92
+#define CS28_SW5 0x93
+#define CS29_SW5 0x94
+#define CS30_SW5 0x95
+
+#define CS1_SW6 0x96
+#define CS2_SW6 0x97
+#define CS3_SW6 0x98
+#define CS4_SW6 0x99
+#define CS5_SW6 0x9A
+#define CS6_SW6 0x9B
+#define CS7_SW6 0x9C
+#define CS8_SW6 0x9D
+#define CS9_SW6 0x9E
+#define CS10_SW6 0x9F
+#define CS11_SW6 0xA0
+#define CS12_SW6 0xA1
+#define CS13_SW6 0xA2
+#define CS14_SW6 0xA3
+#define CS15_SW6 0xA4
+#define CS16_SW6 0xA5
+#define CS17_SW6 0xA6
+#define CS18_SW6 0xA7
+#define CS19_SW6 0xA8
+#define CS20_SW6 0xA9
+#define CS21_SW6 0xAA
+#define CS22_SW6 0xAB
+#define CS23_SW6 0xAC
+#define CS24_SW6 0xAD
+#define CS25_SW6 0xAE
+#define CS26_SW6 0xAF
+#define CS27_SW6 0xB0
+#define CS28_SW6 0xB1
+#define CS29_SW6 0xB2
+#define CS30_SW6 0xB3
diff --git a/drivers/led/issi/is31fl3743.h b/drivers/led/issi/is31fl3743.h
new file mode 100644
index 0000000000..d8fcd79096
--- /dev/null
+++ b/drivers/led/issi/is31fl3743.h
@@ -0,0 +1,327 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ * Copyright 2021 MasterSpoon
+ *
+ * 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
+
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 00 <-> GND
+// 01 <-> SCL
+// 10 <-> SDA
+// 11 <-> VCC
+// ADDR1 represents A1:A0 of the 7-bit address.
+// ADDR2 represents A3:A2 of the 7-bit address.
+// The result is: 0b010(ADDR2)(ADDR1)
+#ifndef DRIVER_ADDR_1
+#    define DRIVER_ADDR_1 0b0100000
+#endif
+
+// Set defaults for Spread Spectrum Register
+#ifndef ISSI_SSR_1
+#    if DRIVER_COUNT == 1
+#        define ISSI_SSR_1 0x00
+#    else
+#        define ISSI_SSR_1 0xC0
+#    endif
+#endif
+#ifndef ISSI_SSR_2
+#    define ISSI_SSR_2 0x80
+#endif
+#ifndef ISSI_SSR_3
+#    define ISSI_SSR_3 0x80
+#endif
+#ifndef ISSI_SSR_4
+#    define ISSI_SSR_4 0x80
+#endif
+
+// Command Registers
+#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
+#define ISSI_COMMANDREGISTER 0xFD
+#define ISSI_IDREGISTER 0xFC
+#define ISSI_REGISTER_UNLOCK 0xC5
+
+// Response Registers
+#define ISSI_PAGE_PWM 0x00
+#define ISSI_PAGE_SCALING 0x01
+#define ISSI_PAGE_FUNCTION 0x02
+
+// Registers under Function Register
+#define ISSI_REG_CONFIGURATION 0x00
+#define ISSI_REG_GLOBALCURRENT 0x01
+#define ISSI_REG_PULLDOWNUP 0x02
+#define ISSI_REG_TEMP 0x24
+#define ISSI_REG_SSR 0x25
+#define ISSI_REG_RESET 0x2F
+
+// Set defaults for Function Registers
+#ifndef ISSI_CONFIGURATION
+#    define ISSI_CONFIGURATION 0x01
+#endif
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+#ifndef ISSI_PULLDOWNUP
+#    define ISSI_PULLDOWNUP 0x33
+#endif
+#ifndef ISSI_TEMP
+#    define ISSI_TEMP 0x00
+#endif
+
+// Set defaults for Scaling registers
+#ifndef ISSI_SCAL_RED
+#    define ISSI_SCAL_RED 0xFF
+#endif
+#ifndef ISSI_SCAL_BLUE
+#    define ISSI_SCAL_BLUE 0xFF
+#endif
+#ifndef ISSI_SCAL_GREEN
+#    define ISSI_SCAL_GREEN 0xFF
+#endif
+#define ISSI_SCAL_RED_OFF 0x00
+#define ISSI_SCAL_GREEN_OFF 0x00
+#define ISSI_SCAL_BLUE_OFF 0x00
+
+#ifndef ISSI_SCAL_LED
+#    define ISSI_SCAL_LED 0xFF
+#endif
+#define ISSI_SCAL_LED_OFF 0x00
+
+// Set buffer sizes
+#define ISSI_MAX_LEDS 198
+#define ISSI_SCALING_SIZE 198
+#define ISSI_PWM_TRF_SIZE 18
+#define ISSI_SCALING_TRF_SIZE 18
+
+// Location of 1st bit for PWM and Scaling registers
+#define ISSI_PWM_REG_1ST 0x01
+#define ISSI_SCL_REG_1ST 0x01
+
+// Map CS SW locations to order in PWM / Scaling buffers
+// This matches the ORDER in the Datasheet Register not the POSITION
+// It will always count from 0x00 to (ISSI_MAX_LEDS - 1)
+#define CS1_SW1 0x00
+#define CS2_SW1 0x01
+#define CS3_SW1 0x02
+#define CS4_SW1 0x03
+#define CS5_SW1 0x04
+#define CS6_SW1 0x05
+#define CS7_SW1 0x06
+#define CS8_SW1 0x07
+#define CS9_SW1 0x08
+#define CS10_SW1 0x09
+#define CS11_SW1 0x0A
+#define CS12_SW1 0x0B
+#define CS13_SW1 0x0C
+#define CS14_SW1 0x0D
+#define CS15_SW1 0x0E
+#define CS16_SW1 0x0F
+#define CS17_SW1 0x10
+#define CS18_SW1 0x11
+
+#define CS1_SW2 0x12
+#define CS2_SW2 0x13
+#define CS3_SW2 0x14
+#define CS4_SW2 0x15
+#define CS5_SW2 0x16
+#define CS6_SW2 0x17
+#define CS7_SW2 0x18
+#define CS8_SW2 0x19
+#define CS9_SW2 0x1A
+#define CS10_SW2 0x1B
+#define CS11_SW2 0x1C
+#define CS12_SW2 0x1D
+#define CS13_SW2 0x1E
+#define CS14_SW2 0x1F
+#define CS15_SW2 0x20
+#define CS16_SW2 0x21
+#define CS17_SW2 0x22
+#define CS18_SW2 0x23
+
+#define CS1_SW3 0x24
+#define CS2_SW3 0x25
+#define CS3_SW3 0x26
+#define CS4_SW3 0x27
+#define CS5_SW3 0x28
+#define CS6_SW3 0x29
+#define CS7_SW3 0x2A
+#define CS8_SW3 0x2B
+#define CS9_SW3 0x2C
+#define CS10_SW3 0x2D
+#define CS11_SW3 0x2E
+#define CS12_SW3 0x2F
+#define CS13_SW3 0x30
+#define CS14_SW3 0x31
+#define CS15_SW3 0x32
+#define CS16_SW3 0x33
+#define CS17_SW3 0x34
+#define CS18_SW3 0x35
+
+#define CS1_SW4 0x36
+#define CS2_SW4 0x37
+#define CS3_SW4 0x38
+#define CS4_SW4 0x39
+#define CS5_SW4 0x3A
+#define CS6_SW4 0x3B
+#define CS7_SW4 0x3C
+#define CS8_SW4 0x3D
+#define CS9_SW4 0x3E
+#define CS10_SW4 0x3F
+#define CS11_SW4 0x40
+#define CS12_SW4 0x41
+#define CS13_SW4 0x42
+#define CS14_SW4 0x43
+#define CS15_SW4 0x44
+#define CS16_SW4 0x45
+#define CS17_SW4 0x46
+#define CS18_SW4 0x47
+
+#define CS1_SW5 0x48
+#define CS2_SW5 0x49
+#define CS3_SW5 0x4A
+#define CS4_SW5 0x4B
+#define CS5_SW5 0x4C
+#define CS6_SW5 0x4D
+#define CS7_SW5 0x4E
+#define CS8_SW5 0x4F
+#define CS9_SW5 0x50
+#define CS10_SW5 0x51
+#define CS11_SW5 0x52
+#define CS12_SW5 0x53
+#define CS13_SW5 0x54
+#define CS14_SW5 0x55
+#define CS15_SW5 0x56
+#define CS16_SW5 0x57
+#define CS17_SW5 0x58
+#define CS18_SW5 0x59
+
+#define CS1_SW6 0x5A
+#define CS2_SW6 0x5B
+#define CS3_SW6 0x5C
+#define CS4_SW6 0x5D
+#define CS5_SW6 0x5E
+#define CS6_SW6 0x5F
+#define CS7_SW6 0x60
+#define CS8_SW6 0x61
+#define CS9_SW6 0x62
+#define CS10_SW6 0x63
+#define CS11_SW6 0x64
+#define CS12_SW6 0x65
+#define CS13_SW6 0x66
+#define CS14_SW6 0x67
+#define CS15_SW6 0x68
+#define CS16_SW6 0x69
+#define CS17_SW6 0x6A
+#define CS18_SW6 0x6B
+
+#define CS1_SW7 0x6C
+#define CS2_SW7 0x6D
+#define CS3_SW7 0x6E
+#define CS4_SW7 0x6F
+#define CS5_SW7 0x70
+#define CS6_SW7 0x71
+#define CS7_SW7 0x72
+#define CS8_SW7 0x73
+#define CS9_SW7 0x74
+#define CS10_SW7 0x75
+#define CS11_SW7 0x76
+#define CS12_SW7 0x77
+#define CS13_SW7 0x78
+#define CS14_SW7 0x79
+#define CS15_SW7 0x7A
+#define CS16_SW7 0x7B
+#define CS17_SW7 0x7C
+#define CS18_SW7 0x7D
+
+#define CS1_SW8 0x7E
+#define CS2_SW8 0x7F
+#define CS3_SW8 0x80
+#define CS4_SW8 0x81
+#define CS5_SW8 0x82
+#define CS6_SW8 0x83
+#define CS7_SW8 0x84
+#define CS8_SW8 0x85
+#define CS9_SW8 0x86
+#define CS10_SW8 0x87
+#define CS11_SW8 0x88
+#define CS12_SW8 0x89
+#define CS13_SW8 0x8A
+#define CS14_SW8 0x8B
+#define CS15_SW8 0x8C
+#define CS16_SW8 0x8D
+#define CS17_SW8 0x8E
+#define CS18_SW8 0x8F
+
+#define CS1_SW9 0x90
+#define CS2_SW9 0x91
+#define CS3_SW9 0x92
+#define CS4_SW9 0x93
+#define CS5_SW9 0x94
+#define CS6_SW9 0x95
+#define CS7_SW9 0x96
+#define CS8_SW9 0x97
+#define CS9_SW9 0x98
+#define CS10_SW9 0x99
+#define CS11_SW9 0x9A
+#define CS12_SW9 0x9B
+#define CS13_SW9 0x9C
+#define CS14_SW9 0x9D
+#define CS15_SW9 0x9E
+#define CS16_SW9 0x9F
+#define CS17_SW9 0xA0
+#define CS18_SW9 0xA1
+
+#define CS1_SW10 0xA2
+#define CS2_SW10 0xA3
+#define CS3_SW10 0xA4
+#define CS4_SW10 0xA5
+#define CS5_SW10 0xA6
+#define CS6_SW10 0xA7
+#define CS7_SW10 0xA8
+#define CS8_SW10 0xA9
+#define CS9_SW10 0xAA
+#define CS10_SW10 0xAB
+#define CS11_SW10 0xAC
+#define CS12_SW10 0xAD
+#define CS13_SW10 0xAE
+#define CS14_SW10 0xAF
+#define CS15_SW10 0xB0
+#define CS16_SW10 0xB1
+#define CS17_SW10 0xB2
+#define CS18_SW10 0xB3
+
+#define CS1_SW11 0xB4
+#define CS2_SW11 0xB5
+#define CS3_SW11 0xB6
+#define CS4_SW11 0xB7
+#define CS5_SW11 0xB8
+#define CS6_SW11 0xB9
+#define CS7_SW11 0xBA
+#define CS8_SW11 0xBB
+#define CS9_SW11 0xBC
+#define CS10_SW11 0xBD
+#define CS11_SW11 0xBE
+#define CS12_SW11 0xBF
+#define CS13_SW11 0xC0
+#define CS14_SW11 0xC1
+#define CS15_SW11 0xC2
+#define CS16_SW11 0xC3
+#define CS17_SW11 0xC4
+#define CS18_SW11 0xC5
diff --git a/drivers/led/issi/is31fl3745.h b/drivers/led/issi/is31fl3745.h
new file mode 100644
index 0000000000..ca5dd4a986
--- /dev/null
+++ b/drivers/led/issi/is31fl3745.h
@@ -0,0 +1,270 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ * Copyright 2021 MasterSpoon
+ *
+ * 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
+
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 00 <-> GND
+// 01 <-> SCL
+// 10 <-> SDA
+// 11 <-> VCC
+// ADDR1 represents A1:A0 of the 7-bit address.
+// ADDR2 represents A3:A2 of the 7-bit address.
+// The result is: 0b010(ADDR2)(ADDR1)
+#ifndef DRIVER_ADDR_1
+#    define DRIVER_ADDR_1 0b0100000
+#endif
+
+// Set defaults for Spread Spectrum Register
+#ifndef ISSI_SSR_1
+#    if DRIVER_COUNT == 1
+#        define ISSI_SSR_1 0x00
+#    else
+#        define ISSI_SSR_1 0xC0
+#    endif
+#endif
+#ifndef ISSI_SSR_2
+#    define ISSI_SSR_2 0x80
+#endif
+#ifndef ISSI_SSR_3
+#    define ISSI_SSR_3 0x80
+#endif
+#ifndef ISSI_SSR_4
+#    define ISSI_SSR_4 0x80
+#endif
+
+// Command Registers
+#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
+#define ISSI_COMMANDREGISTER 0xFD
+#define ISSI_IDREGISTER 0xFC
+#define ISSI_REGISTER_UNLOCK 0xC5
+
+// Response Registers
+#define ISSI_PAGE_PWM 0x00
+#define ISSI_PAGE_SCALING 0x01
+#define ISSI_PAGE_FUNCTION 0x02
+
+// Registers under Function Register
+#define ISSI_REG_CONFIGURATION 0x00
+#define ISSI_REG_GLOBALCURRENT 0x01
+#define ISSI_REG_PULLDOWNUP 0x02
+#define ISSI_REG_TEMP 0x24
+#define ISSI_REG_SSR 0x25
+#define ISSI_REG_RESET 0x2F
+
+// Set defaults for Function Registers
+#ifndef ISSI_CONFIGURATION
+#    define ISSI_CONFIGURATION 0x31
+#endif
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+#ifndef ISSI_PULLDOWNUP
+#    define ISSI_PULLDOWNUP 0x33
+#endif
+#ifndef ISSI_TEMP
+#    define ISSI_TEMP 0x00
+#endif
+
+// Set defaults for Scaling registers
+#ifndef ISSI_SCAL_RED
+#    define ISSI_SCAL_RED 0xFF
+#endif
+#ifndef ISSI_SCAL_BLUE
+#    define ISSI_SCAL_BLUE 0xFF
+#endif
+#ifndef ISSI_SCAL_GREEN
+#    define ISSI_SCAL_GREEN 0xFF
+#endif
+#define ISSI_SCAL_RED_OFF 0x00
+#define ISSI_SCAL_GREEN_OFF 0x00
+#define ISSI_SCAL_BLUE_OFF 0x00
+
+#ifndef ISSI_SCAL_LED
+#    define ISSI_SCAL_LED 0xFF
+#endif
+#define ISSI_SCAL_LED_OFF 0x00
+
+// Set buffer sizes
+#define ISSI_MAX_LEDS 144
+#define ISSI_SCALING_SIZE 144
+#define ISSI_PWM_TRF_SIZE 18
+#define ISSI_SCALING_TRF_SIZE 18
+
+// Location of 1st bit for PWM and Scaling registers
+#define ISSI_PWM_REG_1ST 0x01
+#define ISSI_SCL_REG_1ST 0x01
+
+// Map CS SW locations to order in PWM / Scaling buffers
+// This matches the ORDER in the Datasheet Register not the POSITION
+// It will always count from 0x00 to (ISSI_MAX_LEDS - 1)
+#define CS1_SW1 0x00
+#define CS2_SW1 0x01
+#define CS3_SW1 0x02
+#define CS4_SW1 0x03
+#define CS5_SW1 0x04
+#define CS6_SW1 0x05
+#define CS7_SW1 0x06
+#define CS8_SW1 0x07
+#define CS9_SW1 0x08
+#define CS10_SW1 0x09
+#define CS11_SW1 0x0A
+#define CS12_SW1 0x0B
+#define CS13_SW1 0x0C
+#define CS14_SW1 0x0D
+#define CS15_SW1 0x0E
+#define CS16_SW1 0x0F
+#define CS17_SW1 0x10
+#define CS18_SW1 0x11
+
+#define CS1_SW2 0x12
+#define CS2_SW2 0x13
+#define CS3_SW2 0x14
+#define CS4_SW2 0x15
+#define CS5_SW2 0x16
+#define CS6_SW2 0x17
+#define CS7_SW2 0x18
+#define CS8_SW2 0x19
+#define CS9_SW2 0x1A
+#define CS10_SW2 0x1B
+#define CS11_SW2 0x1C
+#define CS12_SW2 0x1D
+#define CS13_SW2 0x1E
+#define CS14_SW2 0x1F
+#define CS15_SW2 0x20
+#define CS16_SW2 0x21
+#define CS17_SW2 0x22
+#define CS18_SW2 0x23
+
+#define CS1_SW3 0x24
+#define CS2_SW3 0x25
+#define CS3_SW3 0x26
+#define CS4_SW3 0x27
+#define CS5_SW3 0x28
+#define CS6_SW3 0x29
+#define CS7_SW3 0x2A
+#define CS8_SW3 0x2B
+#define CS9_SW3 0x2C
+#define CS10_SW3 0x2D
+#define CS11_SW3 0x2E
+#define CS12_SW3 0x2F
+#define CS13_SW3 0x30
+#define CS14_SW3 0x31
+#define CS15_SW3 0x32
+#define CS16_SW3 0x33
+#define CS17_SW3 0x34
+#define CS18_SW3 0x35
+
+#define CS1_SW4 0x36
+#define CS2_SW4 0x37
+#define CS3_SW4 0x38
+#define CS4_SW4 0x39
+#define CS5_SW4 0x3A
+#define CS6_SW4 0x3B
+#define CS7_SW4 0x3C
+#define CS8_SW4 0x3D
+#define CS9_SW4 0x3E
+#define CS10_SW4 0x3F
+#define CS11_SW4 0x40
+#define CS12_SW4 0x41
+#define CS13_SW4 0x42
+#define CS14_SW4 0x43
+#define CS15_SW4 0x44
+#define CS16_SW4 0x45
+#define CS17_SW4 0x46
+#define CS18_SW4 0x47
+
+#define CS1_SW5 0x48
+#define CS2_SW5 0x49
+#define CS3_SW5 0x4A
+#define CS4_SW5 0x4B
+#define CS5_SW5 0x4C
+#define CS6_SW5 0x4D
+#define CS7_SW5 0x4E
+#define CS8_SW5 0x4F
+#define CS9_SW5 0x50
+#define CS10_SW5 0x51
+#define CS11_SW5 0x52
+#define CS12_SW5 0x53
+#define CS13_SW5 0x54
+#define CS14_SW5 0x55
+#define CS15_SW5 0x56
+#define CS16_SW5 0x57
+#define CS17_SW5 0x58
+#define CS18_SW5 0x59
+
+#define CS1_SW6 0x5A
+#define CS2_SW6 0x5B
+#define CS3_SW6 0x5C
+#define CS4_SW6 0x5D
+#define CS5_SW6 0x5E
+#define CS6_SW6 0x5F
+#define CS7_SW6 0x60
+#define CS8_SW6 0x61
+#define CS9_SW6 0x62
+#define CS10_SW6 0x63
+#define CS11_SW6 0x64
+#define CS12_SW6 0x65
+#define CS13_SW6 0x66
+#define CS14_SW6 0x67
+#define CS15_SW6 0x68
+#define CS16_SW6 0x69
+#define CS17_SW6 0x6A
+#define CS18_SW6 0x6B
+
+#define CS1_SW7 0x6C
+#define CS2_SW7 0x6D
+#define CS3_SW7 0x6E
+#define CS4_SW7 0x6F
+#define CS5_SW7 0x70
+#define CS6_SW7 0x71
+#define CS7_SW7 0x72
+#define CS8_SW7 0x73
+#define CS9_SW7 0x74
+#define CS10_SW7 0x75
+#define CS11_SW7 0x76
+#define CS12_SW7 0x77
+#define CS13_SW7 0x78
+#define CS14_SW7 0x79
+#define CS15_SW7 0x7A
+#define CS16_SW7 0x7B
+#define CS17_SW7 0x7C
+#define CS18_SW7 0x7D
+
+#define CS1_SW8 0x7E
+#define CS2_SW8 0x7F
+#define CS3_SW8 0x80
+#define CS4_SW8 0x81
+#define CS5_SW8 0x82
+#define CS6_SW8 0x83
+#define CS7_SW8 0x84
+#define CS8_SW8 0x85
+#define CS9_SW8 0x86
+#define CS10_SW8 0x87
+#define CS11_SW8 0x88
+#define CS12_SW8 0x89
+#define CS13_SW8 0x8A
+#define CS14_SW8 0x8B
+#define CS15_SW8 0x8C
+#define CS16_SW8 0x8D
+#define CS17_SW8 0x8E
+#define CS18_SW8 0x8F
diff --git a/drivers/led/issi/is31fl3746.h b/drivers/led/issi/is31fl3746.h
new file mode 100644
index 0000000000..f89f281533
--- /dev/null
+++ b/drivers/led/issi/is31fl3746.h
@@ -0,0 +1,198 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ * Copyright 2021 MasterSpoon
+ *
+ * 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
+
+// This is a 7-bit address, that gets left-shifted and bit 0
+// set to 0 for write, 1 for read (as per I2C protocol)
+// The address will vary depending on your wiring:
+// 00 <-> GND
+// 01 <-> SCL
+// 10 <-> SDA
+// 11 <-> VCC
+// ADDR1 represents A1:A0 of the 7-bit address.
+// ADDR2 represents A3:A2 of the 7-bit address.
+// The result is: 0b110(ADDR2)(ADDR1)
+#ifndef DRIVER_ADDR_1
+#    define DRIVER_ADDR_1 0b1100000
+#endif
+
+// Set defaults for Spread Spectrum Register
+#ifndef ISSI_SSR_1
+#    define ISSI_SSR_1 0x00
+#endif
+#ifndef ISSI_SSR_2
+#    define ISSI_SSR_2 0x00
+#endif
+#ifndef ISSI_SSR_3
+#    define ISSI_SSR_3 0x00
+#endif
+#ifndef ISSI_SSR_4
+#    define ISSI_SSR_4 0x00
+#endif
+
+// Command Registers
+#define ISSI_COMMANDREGISTER_WRITELOCK 0xFE
+#define ISSI_COMMANDREGISTER 0xFD
+#define ISSI_IDREGISTER 0xFC
+#define ISSI_REGISTER_UNLOCK 0xC5
+
+// Response Registers
+#define ISSI_PAGE_PWM 0x00
+#define ISSI_PAGE_SCALING 0x01
+#define ISSI_PAGE_FUNCTION 0x01
+
+// Registers under Function Register
+#define ISSI_REG_CONFIGURATION 0x50
+#define ISSI_REG_GLOBALCURRENT 0x51
+#define ISSI_REG_PULLDOWNUP 0x52
+#define ISSI_REG_TEMP 0x5F
+#define ISSI_REG_SSR 0x60
+#define ISSI_REG_RESET 0x8F
+#define ISSI_REG_PWM_ENABLE 0xE0
+#define ISSI_REG_PWM_SET 0xE2
+
+// Set defaults for Function Registers
+#ifndef ISSI_CONFIGURATION
+#    define ISSI_CONFIGURATION 0x01
+#endif
+#ifndef ISSI_GLOBALCURRENT
+#    define ISSI_GLOBALCURRENT 0xFF
+#endif
+#ifndef ISSI_PULLDOWNUP
+#    define ISSI_PULLDOWNUP 0x33
+#endif
+#ifndef ISSI_TEMP
+#    define ISSI_TEMP 0x00
+#endif
+#ifndef ISSI_PWM_ENABLE
+#    define ISSI_PWM_ENABLE 0x00
+#endif
+#ifndef ISSI_PWM_SET
+#    define ISSI_PWM_SET 0x00
+#endif
+
+// Set defaults for Scaling registers
+#ifndef ISSI_SCAL_RED
+#    define ISSI_SCAL_RED 0xFF
+#endif
+#ifndef ISSI_SCAL_BLUE
+#    define ISSI_SCAL_BLUE 0xFF
+#endif
+#ifndef ISSI_SCAL_GREEN
+#    define ISSI_SCAL_GREEN 0xFF
+#endif
+#define ISSI_SCAL_RED_OFF 0x00
+#define ISSI_SCAL_GREEN_OFF 0x00
+#define ISSI_SCAL_BLUE_OFF 0x00
+
+#ifndef ISSI_SCAL_LED
+#    define ISSI_SCAL_LED 0xFF
+#endif
+#define ISSI_SCAL_LED_OFF 0x00
+
+// Set buffer sizes
+#define ISSI_MAX_LEDS 72
+#define ISSI_SCALING_SIZE 72
+#define ISSI_PWM_TRF_SIZE 18
+#define ISSI_SCALING_TRF_SIZE 18
+
+// Location of 1st bit for PWM and Scaling registers
+#define ISSI_PWM_REG_1ST 0x01
+#define ISSI_SCL_REG_1ST 0x01
+
+// Map CS SW locations to order in PWM / Scaling buffers
+// This matches the ORDER in the Datasheet Register not the POSITION
+// It will always count from 0x00 to (ISSI_MAX_LEDS - 1)
+#define CS1_SW1 0x00
+#define CS2_SW1 0x01
+#define CS3_SW1 0x02
+#define CS4_SW1 0x03
+#define CS5_SW1 0x04
+#define CS6_SW1 0x05
+#define CS7_SW1 0x06
+#define CS8_SW1 0x07
+#define CS9_SW1 0x08
+#define CS10_SW1 0x09
+#define CS11_SW1 0x0A
+#define CS12_SW1 0x0B
+#define CS13_SW1 0x0C
+#define CS14_SW1 0x0D
+#define CS15_SW1 0x0E
+#define CS16_SW1 0x0F
+#define CS17_SW1 0x10
+#define CS18_SW1 0x11
+
+#define CS1_SW2 0x12
+#define CS2_SW2 0x13
+#define CS3_SW2 0x14
+#define CS4_SW2 0x15
+#define CS5_SW2 0x16
+#define CS6_SW2 0x17
+#define CS7_SW2 0x18
+#define CS8_SW2 0x19
+#define CS9_SW2 0x1A
+#define CS10_SW2 0x1B
+#define CS11_SW2 0x1C
+#define CS12_SW2 0x1D
+#define CS13_SW2 0x1E
+#define CS14_SW2 0x1F
+#define CS15_SW2 0x20
+#define CS16_SW2 0x21
+#define CS17_SW2 0x22
+#define CS18_SW2 0x23
+
+#define CS1_SW3 0x24
+#define CS2_SW3 0x25
+#define CS3_SW3 0x26
+#define CS4_SW3 0x27
+#define CS5_SW3 0x28
+#define CS6_SW3 0x29
+#define CS7_SW3 0x2A
+#define CS8_SW3 0x2B
+#define CS9_SW3 0x2C
+#define CS10_SW3 0x2D
+#define CS11_SW3 0x2E
+#define CS12_SW3 0x2F
+#define CS13_SW3 0x30
+#define CS14_SW3 0x31
+#define CS15_SW3 0x32
+#define CS16_SW3 0x33
+#define CS17_SW3 0x34
+#define CS18_SW3 0x35
+
+#define CS1_SW4 0x36
+#define CS2_SW4 0x37
+#define CS3_SW4 0x38
+#define CS4_SW4 0x39
+#define CS5_SW4 0x3A
+#define CS6_SW4 0x3B
+#define CS7_SW4 0x3C
+#define CS8_SW4 0x3D
+#define CS9_SW4 0x3E
+#define CS10_SW4 0x3F
+#define CS11_SW4 0x40
+#define CS12_SW4 0x41
+#define CS13_SW4 0x42
+#define CS14_SW4 0x43
+#define CS15_SW4 0x44
+#define CS16_SW4 0x45
+#define CS17_SW4 0x46
+#define CS18_SW4 0x47
diff --git a/drivers/led/issi/is31flcommon.c b/drivers/led/issi/is31flcommon.c
new file mode 100644
index 0000000000..9f4b2123ff
--- /dev/null
+++ b/drivers/led/issi/is31flcommon.c
@@ -0,0 +1,230 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ * Copyright 2021 MasterSpoon
+ *
+ * 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 "is31flcommon.h"
+#include "i2c_master.h"
+#include "wait.h"
+#include <string.h>
+
+// Set defaults for Timeout and Persistence
+#ifndef ISSI_TIMEOUT
+#    define ISSI_TIMEOUT 100
+#endif
+#ifndef ISSI_PERSISTENCE
+#    define ISSI_PERSISTENCE 0
+#endif
+
+// Transfer buffer for TWITransmitData()
+uint8_t g_twi_transfer_buffer[20];
+
+// These buffers match the PWM & scaling registers.
+// Storing them like this is optimal for I2C transfers to the registers.
+uint8_t g_pwm_buffer[DRIVER_COUNT][ISSI_MAX_LEDS];
+bool    g_pwm_buffer_update_required[DRIVER_COUNT] = {false};
+
+uint8_t g_scaling_buffer[DRIVER_COUNT][ISSI_SCALING_SIZE];
+bool    g_scaling_buffer_update_required[DRIVER_COUNT] = {false};
+
+// For writing of single register entry
+void IS31FL_write_single_register(uint8_t addr, uint8_t reg, uint8_t data) {
+    // Set register address and register data ready to write
+    g_twi_transfer_buffer[0] = reg;
+    g_twi_transfer_buffer[1] = data;
+
+#if ISSI_PERSISTENCE > 0
+    for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT) == 0) break;
+    }
+#else
+    i2c_transmit(addr << 1, g_twi_transfer_buffer, 2, ISSI_TIMEOUT);
+#endif
+}
+
+// For writing of mulitple register entries to make use of address auto increment
+// Once the controller has been called and we have written the first bit of data
+// the controller will move to the next register meaning we can write sequential blocks.
+bool IS31FL_write_multi_registers(uint8_t addr, uint8_t *source_buffer, uint8_t buffer_size, uint8_t transfer_size, uint8_t start_reg_addr) {
+    // Split the buffer into chunks to transfer
+    for (int i = 0; i < buffer_size; i += transfer_size) {
+        // Set the first entry of transfer buffer to the first register we want to write
+        g_twi_transfer_buffer[0] = i + start_reg_addr;
+        // Copy the section of our source buffer into the transfer buffer after first register address
+        memcpy(g_twi_transfer_buffer + 1, source_buffer + i, transfer_size);
+
+#if ISSI_PERSISTENCE > 0
+        for (uint8_t i = 0; i < ISSI_PERSISTENCE; i++) {
+            if (i2c_transmit(addr << 1, g_twi_transfer_buffer, transfer_size + 1, ISSI_TIMEOUT) != 0) {
+                return false;
+            }
+        }
+#else
+        if (i2c_transmit(addr << 1, g_twi_transfer_buffer, transfer_size + 1, ISSI_TIMEOUT) != 0) {
+            return false;
+        }
+#endif
+    }
+    return true;
+}
+
+void IS31FL_unlock_register(uint8_t addr, uint8_t page) {
+    // unlock the command register and select Page to write
+    IS31FL_write_single_register(addr, ISSI_COMMANDREGISTER_WRITELOCK, ISSI_REGISTER_UNLOCK);
+    IS31FL_write_single_register(addr, ISSI_COMMANDREGISTER, page);
+}
+
+void IS31FL_common_init(uint8_t addr, uint8_t ssr) {
+    // Setup phase, need to take out of software shutdown and configure
+    // ISSI_SSR_x is passed to allow Master / Slave setting where applicable
+
+    // Unlock the command register & select Function Register
+    IS31FL_unlock_register(addr, ISSI_PAGE_FUNCTION);
+    // Set Configuration Register to remove Software shutdown
+    IS31FL_write_single_register(addr, ISSI_REG_CONFIGURATION, ISSI_CONFIGURATION);
+    // Set Golbal Current Control Register
+    IS31FL_write_single_register(addr, ISSI_REG_GLOBALCURRENT, ISSI_GLOBALCURRENT);
+    // Set Pull up & Down for SWx CSy
+    IS31FL_write_single_register(addr, ISSI_REG_PULLDOWNUP, ISSI_PULLDOWNUP);
+// Set Tempature Status
+#ifdef ISSI_REG_TEMP
+    IS31FL_write_single_register(addr, ISSI_REG_TEMP, ISSI_TEMP);
+#endif
+    // Set Spread Spectrum Register, passed through as sets SYNC function
+    IS31FL_write_single_register(addr, ISSI_REG_SSR, ssr);
+// Set PWM Frequency Enable Register if applicable
+#ifdef ISSI_REG_PWM_ENABLE
+    IS31FL_write_single_register(addr, ISSI_REG_PWM_ENABLE, ISSI_PWM_ENABLE);
+#endif
+// Set PWM Frequency Register if applicable
+#ifdef ISSI_REG_PWM_SET
+    IS31FL_write_single_register(addr, ISSI_REG_PWM_SET, ISSI_PWM_SET);
+#endif
+
+    // Wait 10ms to ensure the device has woken up.
+    wait_ms(10);
+}
+
+void IS31FL_common_update_pwm_register(uint8_t addr, uint8_t index) {
+    if (g_pwm_buffer_update_required[index]) {
+        // Queue up the correct page
+        IS31FL_unlock_register(addr, ISSI_PAGE_PWM);
+        // Hand off the update to IS31FL_write_multi_registers
+        IS31FL_write_multi_registers(addr, g_pwm_buffer[index], ISSI_MAX_LEDS, ISSI_PWM_TRF_SIZE, ISSI_PWM_REG_1ST);
+        // Update flags that pwm_buffer has been updated
+        g_pwm_buffer_update_required[index] = false;
+    }
+}
+
+#ifdef ISSI_MANUAL_SCALING
+void IS31FL_set_manual_scaling_buffer(void) {
+    for (int i = 0; i < ISSI_MANUAL_SCALING; i++) {
+        is31_led scale = g_is31_scaling[i];
+        if (scale.driver >= 0 && scale.driver < DRIVER_LED_TOTAL) {
+            is31_led led = g_is31_leds[scale.driver];
+
+#    ifdef RGB_MATRIX_ENABLE
+            g_scaling_buffer[led.driver][led.r] = scale.r;
+            g_scaling_buffer[led.driver][led.g] = scale.g;
+            g_scaling_buffer[led.driver][led.b] = scale.b;
+#    elif defined(LED_MATRIX_ENABLE)
+            g_scaling_buffer[led.driver][led.v] = scale.v;
+#    endif
+            g_scaling_buffer_update_required[led.driver] = true;
+        }
+    }
+}
+#endif
+
+void IS31FL_common_update_scaling_register(uint8_t addr, uint8_t index) {
+    if (g_scaling_buffer_update_required[index]) {
+        // Queue up the correct page
+        IS31FL_unlock_register(addr, ISSI_PAGE_SCALING);
+        // Hand off the update to IS31FL_write_multi_registers
+        IS31FL_write_multi_registers(addr, g_scaling_buffer[index], ISSI_SCALING_SIZE, ISSI_SCALING_TRF_SIZE, ISSI_SCL_REG_1ST);
+        // Update flags that scaling_buffer has been updated
+        g_scaling_buffer_update_required[index] = false;
+    }
+}
+
+#ifdef RGB_MATRIX_ENABLE
+// Colour is set by adjusting PWM register
+void IS31FL_RGB_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+        is31_led led = g_is31_leds[index];
+
+        g_pwm_buffer[led.driver][led.r]          = red;
+        g_pwm_buffer[led.driver][led.g]          = green;
+        g_pwm_buffer[led.driver][led.b]          = blue;
+        g_pwm_buffer_update_required[led.driver] = true;
+    }
+}
+
+void IS31FL_RGB_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
+    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+        IS31FL_RGB_set_color(i, red, green, blue);
+    }
+}
+
+// Setup Scaling register that decides the peak current of each LED
+void IS31FL_RGB_set_scaling_buffer(uint8_t index, bool red, bool green, bool blue) {
+    is31_led led = g_is31_leds[index];
+    if (red) {
+        g_scaling_buffer[led.driver][led.r] = ISSI_SCAL_RED;
+    } else {
+        g_scaling_buffer[led.driver][led.r] = ISSI_SCAL_RED_OFF;
+    }
+    if (green) {
+        g_scaling_buffer[led.driver][led.g] = ISSI_SCAL_GREEN;
+    } else {
+        g_scaling_buffer[led.driver][led.g] = ISSI_SCAL_GREEN_OFF;
+    }
+    if (blue) {
+        g_scaling_buffer[led.driver][led.b] = ISSI_SCAL_BLUE;
+    } else {
+        g_scaling_buffer[led.driver][led.b] = ISSI_SCAL_BLUE_OFF;
+    }
+    g_scaling_buffer_update_required[led.driver] = true;
+}
+
+#elif defined(LED_MATRIX_ENABLE)
+// LED Matrix Specific scripts
+void IS31FL_simple_set_scaling_buffer(uint8_t index, bool value) {
+    is31_led led = g_is31_leds[index];
+    if (value) {
+        g_scaling_buffer[led.driver][led.v] = ISSI_SCAL_LED;
+    } else {
+        g_scaling_buffer[led.driver][led.v] = ISSI_SCAL_LED_OFF;
+    }
+    g_scaling_buffer_update_required[led.driver] = true;
+}
+
+void IS31FL_simple_set_brightness(int index, uint8_t value) {
+    if (index >= 0 && index < DRIVER_LED_TOTAL) {
+        is31_led led = g_is31_leds[index];
+        g_pwm_buffer[led.driver][led.v] = value;
+        g_pwm_buffer_update_required[led.driver] = true;
+    }
+}
+
+void IS31FL_simple_set_brigntness_all(uint8_t value) {
+    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+        IS31FL_simple_set_brightness(i, value);
+    }
+}
+#endif
diff --git a/drivers/led/issi/is31flcommon.h b/drivers/led/issi/is31flcommon.h
new file mode 100644
index 0000000000..77e9665e32
--- /dev/null
+++ b/drivers/led/issi/is31flcommon.h
@@ -0,0 +1,78 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2018 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2020 MelGeek
+ * Copyright 2021 MasterSpoon
+ *
+ * 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 <stdint.h>
+#include <stdbool.h>
+#include "progmem.h"
+
+// Which variant header file to use
+#ifdef IS31FL3742A
+#    include "is31fl3742.h"
+#elif defined(IS31FL3743A)
+#    include "is31fl3743.h"
+#elif defined(IS31FL3745)
+#    include "is31fl3745.h"
+#elif defined(IS31FL3746A)
+#    include "is31fl3746.h"
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+typedef struct is31_led {
+    uint8_t driver;
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+} __attribute__((packed)) is31_led;
+
+#elif defined(LED_MATRIX_ENABLE)
+typedef struct is31_led {
+    uint8_t driver;
+    uint8_t v;
+} __attribute__((packed)) is31_led;
+#endif
+
+#ifdef ISSI_MANUAL_SCALING
+extern const is31_led __flash g_is31_scaling[];
+void                          IS31FL_set_manual_scaling_buffer(void);
+#endif
+
+extern const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL];
+
+void IS31FL_write_single_register(uint8_t addr, uint8_t reg, uint8_t data);
+bool IS31FL_write_multi_registers(uint8_t addr, uint8_t *source_buffer, uint8_t buffer_size, uint8_t transfer_size, uint8_t start_reg_addr);
+void IS31FL_unlock_register(uint8_t addr, uint8_t page);
+void IS31FL_common_init(uint8_t addr, uint8_t ssr);
+
+void IS31FL_common_update_pwm_register(uint8_t addr, uint8_t index);
+void IS31FL_common_update_scaling_register(uint8_t addr, uint8_t index);
+
+#ifdef RGB_MATRIX_ENABLE
+// RGB Matrix Specific scripts
+void IS31FL_RGB_set_color(int index, uint8_t red, uint8_t green, uint8_t blue);
+void IS31FL_RGB_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+void IS31FL_RGB_set_scaling_buffer(uint8_t index, bool red, bool green, bool blue);
+#elif defined(LED_MATRIX_ENABLE)
+// LED Matrix Specific scripts
+void IS31FL_simple_set_scaling_buffer(uint8_t index, bool value);
+void IS31FL_simple_set_brightness(int index, uint8_t value);
+void IS31FL_simple_set_brigntness_all(uint8_t value);
+#endif
diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h
index cb7526d6e0..d21f36e295 100644
--- a/quantum/led_matrix/led_matrix.h
+++ b/quantum/led_matrix/led_matrix.h
@@ -27,6 +27,8 @@
 
 #ifdef IS31FL3731
 #    include "is31fl3731-simple.h"
+#elif defined(IS31FLCOMMON)
+#    include "is31flcommon.h"
 #endif
 #ifdef IS31FL3733
 #    include "is31fl3733-simple.h"
diff --git a/quantum/led_matrix/led_matrix_drivers.c b/quantum/led_matrix/led_matrix_drivers.c
index 2157619a0b..847ca1c310 100644
--- a/quantum/led_matrix/led_matrix_drivers.c
+++ b/quantum/led_matrix/led_matrix_drivers.c
@@ -25,7 +25,7 @@
  * in their own files.
  */
 
-#if defined(IS31FL3731) || defined(IS31FL3733)
+#if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FLCOMMON)
 #    include "i2c_master.h"
 
 static void init(void) {
@@ -66,6 +66,18 @@ static void init(void) {
 #                endif
 #            endif
 #        endif
+
+#    elif defined(IS31FLCOMMON)
+    IS31FL_common_init(DRIVER_ADDR_1, ISSI_SSR_1);
+#        if defined(LED_DRIVER_ADDR_2)
+    IS31FL_common_init(DRIVER_ADDR_2, ISSI_SSR_2);
+#            if defined(LED_DRIVER_ADDR_3)
+    IS31FL_common_init(DRIVER_ADDR_3, ISSI_SSR_3);
+#                if defined(LED_DRIVER_ADDR_4)
+    IS31FL_common_init(DRIVER_ADDR_4, ISSI_SSR_4);
+#                endif
+#            endif
+#        endif
 #    endif
 
     for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
@@ -73,6 +85,8 @@ static void init(void) {
         IS31FL3731_set_led_control_register(index, true);
 #    elif defined(IS31FL3733)
         IS31FL3733_set_led_control_register(index, true);
+#    elif defined(IS31FLCOMMON)
+        IS31FL_simple_set_scaling_buffer(index, true);
 #    endif
     }
 
@@ -100,6 +114,21 @@ static void init(void) {
 #                endif
 #            endif
 #        endif
+
+#    elif defined(IS31FLCOMMON)
+#        ifdef ISSI_MANUAL_SCALING
+    IS31FL_set_manual_scaling_buffer();
+#        endif
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_1, 0);
+#        if defined(LED_DRIVER_ADDR_2)
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_2, 1);
+#            if defined(LED_DRIVER_ADDR_3)
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_3, 2);
+#                if defined(LED_DRIVER_ADDR_4)
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_4, 3);
+#                endif
+#            endif
+#        endif
 #    endif
 }
 
@@ -144,5 +173,26 @@ const led_matrix_driver_t led_matrix_driver = {
     .set_value = IS31FL3733_set_value,
     .set_value_all = IS31FL3733_set_value_all,
 };
+
+#    elif defined(IS31FLCOMMON)
+static void flush(void) {
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_1, 0);
+#        if defined(LED_DRIVER_ADDR_2)
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_2, 1);
+#            if defined(LED_DRIVER_ADDR_3)
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_3, 2);
+#                if defined(LED_DRIVER_ADDR_4)
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_4, 3);
+#                endif
+#            endif
+#        endif
+}
+
+const led_matrix_driver_t led_matrix_driver = {
+    .init = init,
+    .flush = flush,
+    .set_value = IS31FL_simple_set_brightness,
+    .set_value_all = IS31FL_simple_set_brigntness_all,
+};
 #    endif
 #endif
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index 3cd77857be..359d507a4d 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -32,6 +32,8 @@
 #    include "is31fl3737.h"
 #elif defined(IS31FL3741)
 #    include "is31fl3741.h"
+#elif defined(IS31FLCOMMON)
+#    include "is31flcommon.h"
 #elif defined(CKLED2001)
 #    include "ckled2001.h"
 #elif defined(AW20216)
diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index 130ca47a63..bdd512d1c2 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -23,7 +23,7 @@
  * be here if shared between boards.
  */
 
-#if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FL3737) || defined(IS31FL3741) || defined(CKLED2001)
+#if defined(IS31FL3731) || defined(IS31FL3733) || defined(IS31FL3737) || defined(IS31FL3741) || defined(IS31FLCOMMON) || defined(CKLED2001)
 #    include "i2c_master.h"
 
 // TODO: Remove this at some later date
@@ -81,6 +81,18 @@ static void init(void) {
 #    elif defined(IS31FL3741)
     IS31FL3741_init(DRIVER_ADDR_1);
 
+#    elif defined(IS31FLCOMMON)
+    IS31FL_common_init(DRIVER_ADDR_1, ISSI_SSR_1);
+#        if defined(DRIVER_ADDR_2)
+    IS31FL_common_init(DRIVER_ADDR_2, ISSI_SSR_2);
+#            if defined(DRIVER_ADDR_3)
+    IS31FL_common_init(DRIVER_ADDR_3, ISSI_SSR_3);
+#                if defined(DRIVER_ADDR_4)
+    IS31FL_common_init(DRIVER_ADDR_4, ISSI_SSR_4);
+#                endif
+#            endif
+#        endif
+
 #    elif defined(CKLED2001)
     CKLED2001_init(DRIVER_ADDR_1);
 #        if defined(DRIVER_ADDR_2)
@@ -106,6 +118,8 @@ static void init(void) {
         IS31FL3737_set_led_control_register(index, enabled, enabled, enabled);
 #    elif defined(IS31FL3741)
         IS31FL3741_set_led_control_register(index, enabled, enabled, enabled);
+#    elif defined(IS31FLCOMMON)
+        IS31FL_RGB_set_scaling_buffer(index, enabled, enabled, enabled);
 #    elif defined(CKLED2001)
         CKLED2001_set_led_control_register(index, enabled, enabled, enabled);
 #    endif
@@ -145,6 +159,21 @@ static void init(void) {
 #    elif defined(IS31FL3741)
     IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
 
+#    elif defined(IS31FLCOMMON)
+#        ifdef ISSI_MANUAL_SCALING
+    IS31FL_set_manual_scaling_buffer();
+#        endif
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_1, 0);
+#        if defined(DRIVER_ADDR_2)
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_2, 1);
+#            if defined(DRIVER_ADDR_3)
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_3, 2);
+#                if defined(DRIVER_ADDR_4)
+    IS31FL_common_update_scaling_register(DRIVER_ADDR_4, 3);
+#                endif
+#            endif
+#        endif
+
 #    elif defined(CKLED2001)
     CKLED2001_update_led_control_registers(DRIVER_ADDR_1, 0);
 #        if defined(DRIVER_ADDR_2)
@@ -231,6 +260,27 @@ const rgb_matrix_driver_t rgb_matrix_driver = {
     .set_color_all = IS31FL3741_set_color_all,
 };
 
+#    elif defined(IS31FLCOMMON)
+static void flush(void) {
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_1, 0);
+#        if defined(DRIVER_ADDR_2)
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_2, 1);
+#            if defined(DRIVER_ADDR_3)
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_3, 2);
+#                if defined(DRIVER_ADDR_4)
+    IS31FL_common_update_pwm_register(DRIVER_ADDR_4, 3);
+#                endif
+#            endif
+#        endif
+}
+
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init = init,
+    .flush = flush,
+    .set_color = IS31FL_RGB_set_color,
+    .set_color_all = IS31FL_RGB_set_color_all,
+};
+
 #    elif defined(CKLED2001)
 static void flush(void) {
     CKLED2001_update_pwm_buffers(DRIVER_ADDR_1, 0);

From b7f415d0472fcb767c92673a2f628bfaf7f77e54 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Sun, 6 Feb 2022 09:08:13 -0800
Subject: [PATCH 545/867] Format code according to conventions (#16249)

---
 drivers/gpio/sn74x138.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpio/sn74x138.h b/drivers/gpio/sn74x138.h
index d4d0b6574d..6f1f20e618 100644
--- a/drivers/gpio/sn74x138.h
+++ b/drivers/gpio/sn74x138.h
@@ -40,7 +40,7 @@ void sn74x138_set_enabled(bool enabled);
 
 /**
  * Set the output pin address.
- * 
+ *
  * The selected output pin will be pulled low, while the remaining output pins will be high.
  *
  * \param address The address to set, from 0 to 7.

From 14f886d03bead5022d1a3ebcc72c75ae1f2b622e Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Sun, 6 Feb 2022 18:36:44 +0100
Subject: [PATCH 546/867] [Docs] Address some typos (also in moonlander
 matrix.c) (#16248)

* [Docs] Fix repeated words

* [Keyboard] Fix moonlander output

The left/right orientation differs from Ergodox EZ.
---
 docs/api_docs.md                 | 4 ++--
 docs/cli_commands.md             | 2 +-
 docs/feature_tap_dance.md        | 2 +-
 docs/hardware_avr.md             | 2 +-
 docs/ja/cli_commands.md          | 2 +-
 docs/keycodes_us_ansi_shifted.md | 2 +-
 docs/mod_tap.md                  | 2 +-
 docs/other_eclipse.md            | 2 +-
 docs/other_vscode.md             | 2 +-
 docs/zh-cn/cli_commands.md       | 2 +-
 keyboards/moonlander/matrix.c    | 4 ++--
 keyboards/moonlander/readme.md   | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/api_docs.md b/docs/api_docs.md
index 5032dbc87e..eefb61a54d 100644
--- a/docs/api_docs.md
+++ b/docs/api_docs.md
@@ -62,7 +62,7 @@ This shows us that the job has made it through the queue and is currently runnin
 
 Once your compile job has finished you'll check the `result` key. The value of this key is a hash containing several key bits of information:
 
-* `firmware_binary_url`: A list of URLs for the the flashable firmware
-* `firmware_keymap_url`: A list of URLs for the the `keymap.c`
+* `firmware_binary_url`: A list of URLs for the flashable firmware
+* `firmware_keymap_url`: A list of URLs for the `keymap.c`
 * `firmware_source_url`: A list of URLs for the full firmware source code
 * `output`: The stdout and stderr for this compile job. Errors will be found here.
diff --git a/docs/cli_commands.md b/docs/cli_commands.md
index 01241b00d8..dfbd4c6a28 100644
--- a/docs/cli_commands.md
+++ b/docs/cli_commands.md
@@ -54,7 +54,7 @@ or in keymap directory
 ```
 $ cd ~/qmk_firmware/keyboards/gh60/satan/keymaps/colemak
 $ qmk compile
-Ψ Compiling keymap with make make gh60/satan:colemak
+Ψ Compiling keymap with make gh60/satan:colemak
 ...
 ```
 
diff --git a/docs/feature_tap_dance.md b/docs/feature_tap_dance.md
index 6edce651cd..c055a9989a 100644
--- a/docs/feature_tap_dance.md
+++ b/docs/feature_tap_dance.md
@@ -243,7 +243,7 @@ Now, at the bottom of your `keymap.c` file, you'll need to add the following:
  *
  * How to figure out tap dance state: interrupted and pressed.
  *
- * Interrupted: If the state of a dance dance is "interrupted", that means that another key has been hit
+ * Interrupted: If the state of a dance is "interrupted", that means that another key has been hit
  *  under the tapping term. This is typically indicitive that you are trying to "tap" the key.
  *
  * Pressed: Whether or not the key is still being pressed. If this value is true, that means the tapping term
diff --git a/docs/hardware_avr.md b/docs/hardware_avr.md
index 3d58cdc055..69aca2cf34 100644
--- a/docs/hardware_avr.md
+++ b/docs/hardware_avr.md
@@ -1,6 +1,6 @@
 # Keyboards with AVR Processors
 
-This page describes the support for for AVR processors in QMK. AVR processors include the atmega32u4, atmega32u2, at90usb1286, and other processors from Atmel Corporation. AVR processors are 8-bit MCUs that are designed to be easy to work with. The most common AVR processors in keyboards have on-board USB and plenty of GPIO for supporting large keyboard matrices. They are the most popular MCU for use in keyboards today.
+This page describes the support for AVR processors in QMK. AVR processors include the atmega32u4, atmega32u2, at90usb1286, and other processors from Atmel Corporation. AVR processors are 8-bit MCUs that are designed to be easy to work with. The most common AVR processors in keyboards have on-board USB and plenty of GPIO for supporting large keyboard matrices. They are the most popular MCU for use in keyboards today.
 
 If you have not yet you should read the [Keyboard Guidelines](hardware_keyboard_guidelines.md) to get a sense of how keyboards fit into QMK.
 
diff --git a/docs/ja/cli_commands.md b/docs/ja/cli_commands.md
index 35937dbbcb..8a661d56ee 100644
--- a/docs/ja/cli_commands.md
+++ b/docs/ja/cli_commands.md
@@ -59,7 +59,7 @@ $ qmk compile -km 66_iso
 ```
 $ cd ~/qmk_firmware/keyboards/gh60/satan/keymaps/colemak
 $ qmk compile
-Ψ Compiling keymap with make make gh60/satan:colemak
+Ψ Compiling keymap with make gh60/satan:colemak
 ...
 ```
 
diff --git a/docs/keycodes_us_ansi_shifted.md b/docs/keycodes_us_ansi_shifted.md
index 85dd61759f..e9749b7b17 100644
--- a/docs/keycodes_us_ansi_shifted.md
+++ b/docs/keycodes_us_ansi_shifted.md
@@ -8,7 +8,7 @@ Unfortunately, these keycodes cannot be used in Mod-Taps or Layer-Taps, since an
 
 Additionally, you may run into issues when using Remote Desktop Connection on Windows. Because these codes send shift very fast, Remote Desktop may miss the codes.
 
-To fix this, open Remote Desktop Connection, click on "Show Options", open the the "Local Resources" tab. In the keyboard section, change the drop down to "On this Computer". This will fix the issue, and allow the characters to work correctly.
+To fix this, open Remote Desktop Connection, click on "Show Options", open the "Local Resources" tab. In the keyboard section, change the drop down to "On this Computer". This will fix the issue, and allow the characters to work correctly.
 
 ## Keycodes
 
diff --git a/docs/mod_tap.md b/docs/mod_tap.md
index dc11b0dea9..ca3a2752c7 100644
--- a/docs/mod_tap.md
+++ b/docs/mod_tap.md
@@ -58,7 +58,7 @@ Currently, the `kc` argument of `MT()` is limited to the [Basic Keycode set](key
 Expanding this would be complicated, at best. Moving to a 32-bit keycode would solve a lot of this, but would double the amount of space that the keymap matrix uses. And it could potentially cause issues, too. If you need to apply modifiers to your tapped keycode, [Tap Dance](feature_tap_dance.md#example-5-using-tap-dance-for-advanced-mod-tap-and-layer-tap-keys) can be used to accomplish this.
 
 You may also run into issues when using Remote Desktop Connection on Windows. Because these keycodes send key events faster than a human, Remote Desktop could miss them.
-To fix this, open Remote Desktop Connection, click on "Show Options", open the the "Local Resources" tab, and in the keyboard section, change the drop down to "On this Computer". This will fix the issue, and allow the characters to work correctly.
+To fix this, open Remote Desktop Connection, click on "Show Options", open the "Local Resources" tab, and in the keyboard section, change the drop down to "On this Computer". This will fix the issue, and allow the characters to work correctly.
 It can also be mitigated by increasing [`TAP_CODE_DELAY`](config_options.md#behaviors-that-can-be-configured).
 
 ## Intercepting Mod-Taps
diff --git a/docs/other_eclipse.md b/docs/other_eclipse.md
index 58ab7e295d..de8cdf9b8c 100644
--- a/docs/other_eclipse.md
+++ b/docs/other_eclipse.md
@@ -74,7 +74,7 @@ Once both plugins are installed, restart Eclipse as prompted.
 
 ## Build Your Keyboard
 
-We will now change the default make target of the the project from `all` to the
+We will now change the default make target of the project from `all` to the
 specific keyboard and keymap combination we are working on,
 e.g. `kinesis/kint36:stapelberg`. This way, project-wide actions like cleaning
 and building the project will complete quickly, instead of taking a long time or
diff --git a/docs/other_vscode.md b/docs/other_vscode.md
index 6af0a6f7b4..aac46c1829 100644
--- a/docs/other_vscode.md
+++ b/docs/other_vscode.md
@@ -15,7 +15,7 @@ The purpose of this page is to document how to set up VS Code for developing QMK
 This guide covers how to configure everything needed on Windows and Ubuntu 18.04
 
 # Set up VS Code
-Before starting, you will want to make sure that you have all of the build tools set up, and QMK Firmware cloned. Head to the the [Newbs Getting Started Guide](newbs_getting_started.md) to get things set up, if you haven't already.
+Before starting, you will want to make sure that you have all of the build tools set up, and QMK Firmware cloned. Head to the [Newbs Getting Started Guide](newbs_getting_started.md) to get things set up, if you haven't already.
 
 ## Windows
 
diff --git a/docs/zh-cn/cli_commands.md b/docs/zh-cn/cli_commands.md
index 08d1cc7e79..ed36ed975b 100644
--- a/docs/zh-cn/cli_commands.md
+++ b/docs/zh-cn/cli_commands.md
@@ -59,7 +59,7 @@ $ qmk compile -km 66_iso
 ```
 $ cd ~/qmk_firmware/keyboards/gh60/satan/keymaps/colemak
 $ qmk compile
-Ψ Compiling keymap with make make gh60/satan:colemak
+Ψ Compiling keymap with make gh60/satan:colemak
 ...
 ```
 
diff --git a/keyboards/moonlander/matrix.c b/keyboards/moonlander/matrix.c
index 782f131a50..b6bac9515e 100644
--- a/keyboards/moonlander/matrix.c
+++ b/keyboards/moonlander/matrix.c
@@ -102,9 +102,9 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
             print("trying to reset mcp23018\n");
             mcp23018_init();
             if (!mcp23018_initd) {
-                print("left side not responding\n");
+                print("right side not responding\n");
             } else {
-                print("left side attached\n");
+                print("right side attached\n");
 #ifdef RGB_MATRIX_ENABLE
                 rgb_matrix_init();
 #endif
diff --git a/keyboards/moonlander/readme.md b/keyboards/moonlander/readme.md
index 0ad2e4775c..bf80f05569 100644
--- a/keyboards/moonlander/readme.md
+++ b/keyboards/moonlander/readme.md
@@ -31,7 +31,7 @@ By default, the Indicator LEDs are used to indicate the layer state for the keyb
 
 ### Oryx Configuration
 
-To enable the features from Oryx (ZSA's Configurator), either compile the the `default` keymap, or add `#define ORYX_CONFIGURATOR` to your `config.h` file.  
+To enable the features from Oryx (ZSA's Configurator), either compile the `default` keymap, or add `#define ORYX_CONFIGURATOR` to your `config.h` file.
 
 This enables the front Indicator LEDs, and the `TOGGLE_LAYER_COLOR` keycode.  The `TOGGLE_LAYER_COLOR` keycode toggles the customized LED map configured on Oryx. 
 

From 87199eb2f50522b7b91352e4b1c76d6db3f14af3 Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Mon, 7 Feb 2022 02:37:59 +0900
Subject: [PATCH 547/867] add 'info_config.h' into
 docs/hardware_keyboard_guidelines.md (#16247)

Added info_config.h added in #10817 to the include order description of config.h.
---
 docs/data_driven_config.md           | 2 +-
 docs/hardware_keyboard_guidelines.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/data_driven_config.md b/docs/data_driven_config.md
index c2ad4fed8f..38fb5dbf14 100644
--- a/docs/data_driven_config.md
+++ b/docs/data_driven_config.md
@@ -74,7 +74,7 @@ Whenever QMK generates a complete `info.json` it extracts information from `conf
 
 If you are not sure how to edit this file or are not comfortable with Python [open an issue](https://github.com/qmk/qmk_firmware/issues/new?assignees=&labels=cli%2C+python&template=other_issues.md&title=) or [join #cli on Discord](https://discord.gg/heQPAgy) and someone can help you with this part.
 
-### Add code to generate it
+### Add code to generate it :id=add-code-to-generate-it
 
 The final piece of the puzzle is providing your new option to the build system. This is done by generating two files:
 
diff --git a/docs/hardware_keyboard_guidelines.md b/docs/hardware_keyboard_guidelines.md
index be55356b17..6df86fb0fb 100644
--- a/docs/hardware_keyboard_guidelines.md
+++ b/docs/hardware_keyboard_guidelines.md
@@ -87,6 +87,7 @@ The `config.h` files can also be placed in sub-folders, and the order in which t
     * `keyboards/top_folder/sub_1/sub_2/config.h`
       * `keyboards/top_folder/sub_1/sub_2/sub_3/config.h`
         * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/config.h`
+          * [`.build/objs_<keyboard>/src/info_config.h`](data_driven_config.md#add-code-to-generate-it) see [Data Driven Configuration](data_driven_config.md)
           * `users/a_user_folder/config.h`
           * `keyboards/top_folder/keymaps/a_keymap/config.h`
         * `keyboards/top_folder/sub_1/sub_2/sub_3/sub_4/post_config.h`

From e7a9e92a04c8279878756829a8a12401ba78abee Mon Sep 17 00:00:00 2001
From: SneakboxKB <67670271+SneakboxKB@users.noreply.github.com>
Date: Sun, 6 Feb 2022 11:50:09 -0600
Subject: [PATCH 548/867] [Keyboard] Add aliceclonergb (#14285)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: SneakboxKB <64090325+mujimanic@users.noreply.github.com>
---
 .../sneakbox/aliceclonergb/aliceclonergb.c    | 32 ++++++++
 .../sneakbox/aliceclonergb/aliceclonergb.h    | 60 +++++++++++++++
 keyboards/sneakbox/aliceclonergb/config.h     | 73 +++++++++++++++++++
 keyboards/sneakbox/aliceclonergb/info.json    | 25 +++++++
 .../aliceclonergb/keymaps/default/keymap.c    | 39 ++++++++++
 .../aliceclonergb/keymaps/via/keymap.c        | 54 ++++++++++++++
 .../aliceclonergb/keymaps/via/rules.mk        |  1 +
 keyboards/sneakbox/aliceclonergb/readme.md    | 23 ++++++
 keyboards/sneakbox/aliceclonergb/rules.mk     | 21 ++++++
 9 files changed, 328 insertions(+)
 create mode 100644 keyboards/sneakbox/aliceclonergb/aliceclonergb.c
 create mode 100644 keyboards/sneakbox/aliceclonergb/aliceclonergb.h
 create mode 100644 keyboards/sneakbox/aliceclonergb/config.h
 create mode 100644 keyboards/sneakbox/aliceclonergb/info.json
 create mode 100644 keyboards/sneakbox/aliceclonergb/keymaps/default/keymap.c
 create mode 100644 keyboards/sneakbox/aliceclonergb/keymaps/via/keymap.c
 create mode 100644 keyboards/sneakbox/aliceclonergb/keymaps/via/rules.mk
 create mode 100644 keyboards/sneakbox/aliceclonergb/readme.md
 create mode 100644 keyboards/sneakbox/aliceclonergb/rules.mk

diff --git a/keyboards/sneakbox/aliceclonergb/aliceclonergb.c b/keyboards/sneakbox/aliceclonergb/aliceclonergb.c
new file mode 100644
index 0000000000..e2136312d3
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/aliceclonergb.c
@@ -0,0 +1,32 @@
+/*
+Copyright 2021 Bryan Ong
+
+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 "aliceclonergb.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index,clockwise)) { return false; }
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_DOWN);
+        } else {
+            tap_code(KC_UP);
+        }
+    } 
+    return true;
+}
+#endif
diff --git a/keyboards/sneakbox/aliceclonergb/aliceclonergb.h b/keyboards/sneakbox/aliceclonergb/aliceclonergb.h
new file mode 100644
index 0000000000..a946202ba4
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/aliceclonergb.h
@@ -0,0 +1,60 @@
+/*
+Copyright 2021 Bryan Ong
+
+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 LAYOUT_alice_split_bs
+
+#define LAYOUT_alice_split_bs( \
+	K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015, K016, K017, \
+	K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
+	K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
+	        K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
+	        K081,                   K083, K085, K086,       K091, K093,                               K097  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO }, \
+	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017 }, \
+	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO }, \
+	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
+	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO }, \
+	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  KC_NO }, \
+	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO }, \
+	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
+	{ KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  KC_NO }, \
+	{ KC_NO, K091,  KC_NO, K093,  KC_NO, KC_NO, KC_NO, K097 }  \
+}
+
+#define LAYOUT_alice( \
+    K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015,       K016, \
+    K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
+    K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
+            K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
+            K081,                   K083, K085, K086,       K091, K093,                               K097  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO }, \
+    { K010,  K011,  K012,  K013,  K014,  K015,  K016,  KC_NO }, \
+    { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO }, \
+    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
+    { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO }, \
+    { K050,  K051,  K052,  K053,  K054,  K055,  K056,  KC_NO }, \
+    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO }, \
+    { K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
+    { KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  KC_NO }, \
+    { KC_NO, K091,  KC_NO, K093,  KC_NO, KC_NO, KC_NO, K097 }  \
+}
diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h
new file mode 100644
index 0000000000..6e30dbca96
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/config.h
@@ -0,0 +1,73 @@
+/*
+Copyright 2021 Bryan Ong
+
+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       0x5342
+#define PRODUCT_ID      0x0006
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Sneakbox
+#define PRODUCT         AliceClone RGB
+
+/*Bootmagic boot button, set to topmost, leftmost key */
+#define BOOTMAGIC_LITE_ROW	2
+#define BOOTMAGIC_LITE_COLUMN	0
+
+/* encoder */
+/* #define NUMBER_OF_ENCODERS 1 */
+#define ENCODERS_PAD_A { D3 }
+#define ENCODERS_PAD_B { D2 }
+#define ENCODER_RESOLUTION 1
+
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, F7, B7 }
+#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define LED_NUM_LOCK_PIN  D4
+#define LED_CAPS_LOCK_PIN D6
+#define LED_SCROLL_LOCK_PIN D7
+
+#define RGB_DI_PIN D5
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 16
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json
new file mode 100644
index 0000000000..9fbee0c692
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/info.json
@@ -0,0 +1,25 @@
+{
+  "keyboard_name": "Alice Clone",
+  "url": "https://sneakbox.design",
+  "maintainer": "mujimanic",
+  "layouts": {
+      "LAYOUT_alice_split_bs": {
+          "layout": [
+              {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0},
+              {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
+              {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25},
+              {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
+              {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
+			]
+      },
+      "LAYOUT_alice": {
+          "layout": [
+              {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0, "w":2},
+              {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
+              {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25},
+              {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
+              {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
+            ]
+      }
+  }
+}
diff --git a/keyboards/sneakbox/aliceclonergb/keymaps/default/keymap.c b/keyboards/sneakbox/aliceclonergb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9dd7ee5eae
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2021 Bryan Ong
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_alice_split_bs(
+        KC_ESC,    KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,        KC_8,    KC_9,    KC_0,    KC_MINS,    KC_EQL,    KC_BSPC,    KC_BSPC,
+        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_PGDN,   KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                          KC_H,    KC_J,    KC_K,    KC_L,       KC_SCLN,   KC_QUOT,    KC_ENT,
+                   KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                          KC_B,    KC_N,    KC_M,    KC_COMM,    KC_DOT,    KC_SLSH,    KC_RSFT,    KC_LGUI,
+                   KC_LCTL,                     KC_LALT, KC_SPC, LT(_FN, KC_SPC),                KC_SPC, KC_RALT,                                              KC_RCTL),
+    [_FN] = LAYOUT_alice_split_bs(
+        KC_TRNS,   KC_TRNS,   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_TRNS,    KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   RGB_RMOD,   RGB_MOD,    RGB_TOG,
+        RESET,     KC_TRNS,   KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    RGB_VAD,   RGB_VAI,    KC_TRNS,
+                   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    RGB_SAD,   RGB_SAI,    KC_TRNS,    RGB_HUI,
+                   KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS,                                             KC_TRNS),
+};
diff --git a/keyboards/sneakbox/aliceclonergb/keymaps/via/keymap.c b/keyboards/sneakbox/aliceclonergb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0f1e600bd1
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/*
+Copyright 2021 Bryan Ong
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN,
+    _L3,
+    _L4
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_BASE] = LAYOUT_alice_split_bs(
+        KC_ESC,    KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,        KC_8,    KC_9,    KC_0,    KC_MINS,    KC_EQL,    KC_BSPC,    KC_BSPC,
+        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_PGDN,   KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                          KC_H,    KC_J,    KC_K,    KC_L,       KC_SCLN,   KC_QUOT,    KC_ENT,
+                   KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                          KC_B,    KC_N,    KC_M,    KC_COMM,    KC_DOT,    KC_SLSH,    KC_RSFT,    KC_LGUI,
+                   KC_LCTL,                     KC_LALT, KC_SPC, LT(_FN, KC_SPC),                KC_SPC, KC_RALT,                                              KC_RCTL),
+    [_FN] = LAYOUT_alice_split_bs(
+        KC_TRNS,   KC_TRNS,   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_TRNS,    KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   RGB_RMOD,   RGB_MOD,    RGB_TOG,
+        RESET,     KC_TRNS,   KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    RGB_VAD,   RGB_VAI,    KC_TRNS,
+                   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    RGB_SAD,   RGB_SAI,    KC_TRNS,    RGB_HUI,
+                   KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS,                                             KC_TRNS),
+    [_L3] = LAYOUT_alice_split_bs(
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,
+                   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+                   KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS,                                             KC_TRNS),
+    [_L4] = LAYOUT_alice_split_bs(
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+        KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,
+                   KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+                   KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS,                                             KC_TRNS),
+};
diff --git a/keyboards/sneakbox/aliceclonergb/keymaps/via/rules.mk b/keyboards/sneakbox/aliceclonergb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/sneakbox/aliceclonergb/readme.md b/keyboards/sneakbox/aliceclonergb/readme.md
new file mode 100644
index 0000000000..dc4291bcdf
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/readme.md
@@ -0,0 +1,23 @@
+# Sneakbox Alice Clone RGB PCB
+
+![Sneakbox Alice Clone RGB PCB](https://i.imgur.com/pMZNqLXl.jpg)
+
+An Alice-compatible PCB with hotswap with pushbutton rotary encoder socket placed at the top left key position. This PCB is the successor to the v3 AliceClone PCB and features RGB underglow lighting along with revised hardware components.
+
+* Keyboard Maintainer: [mujimanic](https://github.com/mujimanic)
+* Hardware Supported: Any Alice-layout case.
+* Hardware Availability: [sneakbox.design](https://sneakbox.design/products/sneakbox-alice-hotswap-pcbs)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sneakbox/aliceclonergb: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key in the nevigation cluster (Escape key) and plug in the keyboard
+* **Physical reset button**: Briefly press the small metal button on the back of the PCB
+* **Keycode in layout**: Press and hold the key next to the right split spacebar (to the right of the spacebar) and then press the End key (located on the bottom of the four-key navigation cluster)
diff --git a/keyboards/sneakbox/aliceclonergb/rules.mk b/keyboards/sneakbox/aliceclonergb/rules.mk
new file mode 100644
index 0000000000..6d57d29a86
--- /dev/null
+++ b/keyboards/sneakbox/aliceclonergb/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+
+LAYOUTS = alice alice_split_bs

From 2a42a80c209b95c951539e5b022c80d8fa30e977 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 6 Feb 2022 21:01:18 +0000
Subject: [PATCH 549/867] Fix wheatfield/split75 iso info.json (#16250)

---
 keyboards/wheatfield/split75/info.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/keyboards/wheatfield/split75/info.json b/keyboards/wheatfield/split75/info.json
index 72c118d4b1..1d0609a378 100644
--- a/keyboards/wheatfield/split75/info.json
+++ b/keyboards/wheatfield/split75/info.json
@@ -5,6 +5,9 @@
     "layouts": {
         "LAYOUT": {
             "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"|", "x":16.75, "y":2, "w":1.5}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3, "w":2.25}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":2.25}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}]
+        },
+        "LAYOUT_iso": {
+            "layout": [{"label":"ESC", "x":2.25, "y":0}, {"label":"F1", "x":3.25, "y":0}, {"label":"F2", "x":4.25, "y":0}, {"label":"F3", "x":5.25, "y":0}, {"label":"F4", "x":6.25, "y":0}, {"label":"F5", "x":7.25, "y":0}, {"label":"F6", "x":8.25, "y":0}, {"label":"F7", "x":10.25, "y":0}, {"label":"F8", "x":11.25, "y":0}, {"label":"F9", "x":12.25, "y":0}, {"label":"F10", "x":13.25, "y":0}, {"label":"F11", "x":14.25, "y":0}, {"label":"F12", "x":15.25, "y":0}, {"label":"Prt", "x":16.25, "y":0}, {"label":"Ins", "x":17.25, "y":0}, {"label":"Del", "x":18.25, "y":0}, {"label":"8", "x":0, "y":1}, {"label":"9", "x":1, "y":1}, {"label":"~", "x":2.25, "y":1}, {"label":"!", "x":3.25, "y":1}, {"label":"@", "x":4.25, "y":1}, {"label":"#", "x":5.25, "y":1}, {"label":"$", "x":6.25, "y":1}, {"label":"%", "x":7.25, "y":1}, {"label":"^", "x":8.25, "y":1}, {"label":"&", "x":10.25, "y":1}, {"label":"*", "x":11.25, "y":1}, {"label":"(", "x":12.25, "y":1}, {"label":")", "x":13.25, "y":1}, {"label":"_", "x":14.25, "y":1}, {"label":"+", "x":15.25, "y":1}, {"label":"Backspace", "x":16.25, "y":1, "w":2}, {"label":"Home", "x":18.25, "y":1}, {"label":"6", "x":0, "y":2}, {"label":"7", "x":1, "y":2}, {"label":"Tab", "x":2.25, "y":2, "w":1.5}, {"label":"Q", "x":3.75, "y":2}, {"label":"W", "x":4.75, "y":2}, {"label":"E", "x":5.75, "y":2}, {"label":"R", "x":6.75, "y":2}, {"label":"T", "x":7.75, "y":2}, {"label":"Y", "x":9.75, "y":2}, {"label":"U", "x":10.75, "y":2}, {"label":"I", "x":11.75, "y":2}, {"label":"O", "x":12.75, "y":2}, {"label":"P", "x":13.75, "y":2}, {"label":"{", "x":14.75, "y":2}, {"label":"}", "x":15.75, "y":2}, {"label":"PgUp", "x":18.25, "y":2}, {"label":"4", "x":0, "y":3}, {"label":"5", "x":1, "y":3}, {"label":"Caps Lock", "x":2.25, "y":3, "w":1.75}, {"label":"A", "x":4, "y":3}, {"label":"S", "x":5, "y":3}, {"label":"D", "x":6, "y":3}, {"label":"F", "x":7, "y":3}, {"label":"G", "x":8, "y":3}, {"label":"H", "x":10, "y":3}, {"label":"J", "x":11, "y":3}, {"label":"K", "x":12, "y":3}, {"label":"L", "x":13, "y":3}, {"label":":", "x":14, "y":3}, {"label":"\"", "x":15, "y":3},  {"label":"'", "x":16, "y":3}, {"label":"Enter", "x":17, "y":2, "w":1.25, "h":2}, {"label":"PgDn", "x":18.25, "y":3}, {"label":"2", "x":0, "y":4}, {"label":"3", "x":1, "y":4}, {"label":"Shift", "x":2.25, "y":4, "w":1.25}, {"label":"|", "x":3.5, "y":4, "w":1}, {"label":"Z", "x":4.5, "y":4}, {"label":"X", "x":5.5, "y":4}, {"label":"C", "x":6.5, "y":4}, {"label":"V", "x":7.5, "y":4}, {"label":"B", "x":8.5, "y":4}, {"label":"N", "x":10.5, "y":4}, {"label":"M", "x":11.5, "y":4}, {"label":"<", "x":12.5, "y":4}, {"label":">", "x":13.5, "y":4}, {"label":"?", "x":14.5, "y":4}, {"label":"Shift", "x":15.5, "y":4, "w":1.75}, {"label":"\u2191", "x":17.25, "y":4}, {"label":"End", "x":18.25, "y":4}, {"label":"0", "x":0, "y":5}, {"label":"1", "x":1, "y":5}, {"label":"Ctrl", "x":2.25, "y":5, "w":1.25}, {"label":"Win", "x":3.5, "y":5, "w":1.25}, {"label":"Alt", "x":4.75, "y":5, "w":1.25}, {"x":6, "y":5, "w":2}, {"x":8, "y":5}, {"x":10, "y":5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5, "w":1.25}, {"label":"Fn", "x":14, "y":5}, {"label":"Ctrl", "x":15, "y":5, "w":1.25}, {"label":"\u2190", "x":16.25, "y":5}, {"label":"\u2193", "x":17.25, "y":5}, {"label":"\u2192", "x":18.25, "y":5}]
         }
     }
 }

From 9124f5dc2d2f17eb327924d38add7f194dd4d54a Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 6 Feb 2022 14:01:04 -0800
Subject: [PATCH 550/867] Add layout change callbacks to VIA (#16087)

* Add layout change callbacks to VIA

* Update worklouder example
---
 keyboards/work_louder/work_board/work_board.c | 14 +++++++-------
 quantum/via.c                                 |  4 ++++
 quantum/via.h                                 |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/keyboards/work_louder/work_board/work_board.c b/keyboards/work_louder/work_board/work_board.c
index 7a8edc1a9e..d25ea0cdba 100644
--- a/keyboards/work_louder/work_board/work_board.c
+++ b/keyboards/work_louder/work_board/work_board.c
@@ -100,15 +100,15 @@ led_config_t g_led_config = { {
 } };
 // clang-format on
 
+#    ifdef VIA_ENABLE
+bool via_layout_2u = false;
+
+void via_set_layout_options_kb(uint32_t value) { via_layout_2u = (bool)value; }
+#    endif  // VIA_ENABLE
+
 __attribute__((weak)) void rgb_matrix_indicators_user(void) {
 #    ifdef VIA_ENABLE
-    static bool     layout_2u = false;
-    static uint16_t timer = 0;
-    if (timer_elapsed(timer) > 500) {
-        timer     = timer_read();
-        layout_2u = (bool)via_get_layout_options();
-    }
-    if (layout_2u) {
+    if (via_layout_2u) {
         rgb_matrix_set_color(5, 0, 0, 0);
         rgb_matrix_set_color(7, 0, 0, 0);
     } else {
diff --git a/quantum/via.c b/quantum/via.c
index 7c8aa753e7..a3bd82d9b3 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -96,6 +96,7 @@ void via_init(void) {
     // Let keyboard level test EEPROM valid state,
     // but not set it valid, it is done here.
     via_init_kb();
+    via_set_layout_options_kb(via_get_layout_options());
 
     // If the EEPROM has the magic, the data is good.
     // OK to load from EEPROM.
@@ -131,7 +132,10 @@ uint32_t via_get_layout_options(void) {
     return value;
 }
 
+__attribute__((weak)) void via_set_layout_options_kb(uint32_t value) {}
+
 void via_set_layout_options(uint32_t value) {
+    via_set_layout_options_kb(value);
     // Start at the least significant byte
     void *target = (void *)(VIA_EEPROM_LAYOUT_OPTIONS_ADDR + VIA_EEPROM_LAYOUT_OPTIONS_SIZE - 1);
     for (uint8_t i = 0; i < VIA_EEPROM_LAYOUT_OPTIONS_SIZE; i++) {
diff --git a/quantum/via.h b/quantum/via.h
index 3db318a454..5d16917dfa 100644
--- a/quantum/via.h
+++ b/quantum/via.h
@@ -159,6 +159,7 @@ void via_init(void);
 // Used by VIA to store and retrieve the layout options.
 uint32_t via_get_layout_options(void);
 void     via_set_layout_options(uint32_t value);
+void     via_set_layout_options_kb(uint32_t value);
 
 // Called by QMK core to process VIA-specific keycodes.
 bool process_record_via(uint16_t keycode, keyrecord_t *record);

From 842d20267cf78ddfba433e4c8064a40dc84d456c Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 6 Feb 2022 22:59:03 +0000
Subject: [PATCH 551/867] Remove half implemented micronucleus bootloader
 support (#16252)

---
 data/schemas/keyboard.jsonschema | 2 +-
 keyboards/xiudi/xd002/rules.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index e61bc48bd0..fc0844a086 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -57,7 +57,7 @@
         },
         "bootloader": {
             "type": "string",
-            "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "custom", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "micronucleus", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2"],
+            "enum": ["atmel-dfu", "bootloadhid", "bootloadHID", "custom", "caterina", "halfkay", "kiibohd", "lufa-dfu", "lufa-ms", "md-boot", "qmk-dfu", "qmk-hid", "stm32-dfu", "stm32duino", "gd32v-dfu", "wb32-dfu", "unknown", "usbasploader", "USBasp", "tinyuf2"],
         },
         "bootloader_instructions": {
             "type": "string",
diff --git a/keyboards/xiudi/xd002/rules.mk b/keyboards/xiudi/xd002/rules.mk
index 77dd994783..70c620c8f0 100644
--- a/keyboards/xiudi/xd002/rules.mk
+++ b/keyboards/xiudi/xd002/rules.mk
@@ -2,7 +2,7 @@
 MCU = attiny85
 
 # Bootloader selection
-BOOTLOADER = micronucleus
+BOOTLOADER = custom
 OPT_DEFS += -DBOOTLOADER_SIZE=1862
 PROGRAM_CMD = micronucleus --run $(BUILD_DIR)/$(TARGET).hex
 

From 53a73066828bb528610e8d02bd4a6f008c9c33d7 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 6 Feb 2022 23:58:05 +0000
Subject: [PATCH 552/867] Reduce firmware size for dztech/dz60rgb_wkl/v2_1:via
 (#16254)

---
 keyboards/dztech/dz60rgb_wkl/v2_1/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
index bfa9d8d955..960285b976 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
@@ -86,7 +86,7 @@
 #    define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #    define ENABLE_RGB_MATRIX_HUE_WAVE
 #    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// #    define ENABLE_RGB_MATRIX_PIXEL_FLOW
 #    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
 #    define ENABLE_RGB_MATRIX_TYPING_HEATMAP

From a86d6fffc950242f412e05a6a0aed8beede01ba4 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 7 Feb 2022 14:09:21 +1100
Subject: [PATCH 553/867] Fixup bootloaders. (#16256)

---
 keyboards/ducky/one2mini/1861st/1861st.c | 8 ++++++++
 keyboards/ducky/one2mini/1861st/rules.mk | 3 +++
 keyboards/ergodox_stm32/ergodox_stm32.c  | 5 +++++
 keyboards/ergodox_stm32/rules.mk         | 3 +++
 keyboards/jm60/jm60.c                    | 5 +++++
 keyboards/jm60/rules.mk                  | 3 +++
 keyboards/matrix/abelx/abelx.c           | 5 +++++
 keyboards/matrix/abelx/rules.mk          | 3 +++
 keyboards/matrix/m12og/rev1/rev1.c       | 5 +++++
 keyboards/matrix/m12og/rev1/rules.mk     | 3 +++
 keyboards/matrix/m20add/m20add.c         | 5 +++++
 keyboards/matrix/m20add/rules.mk         | 3 +++
 keyboards/matrix/noah/noah.c             | 5 +++++
 keyboards/matrix/noah/rules.mk           | 3 +++
 keyboards/wolfmarkclub/wm1/rules.mk      | 3 +++
 keyboards/wolfmarkclub/wm1/wm1.c         | 5 +++++
 keyboards/xiaomi/mk02/rules.mk           | 3 +++
 17 files changed, 70 insertions(+)
 create mode 100644 keyboards/ducky/one2mini/1861st/1861st.c

diff --git a/keyboards/ducky/one2mini/1861st/1861st.c b/keyboards/ducky/one2mini/1861st/1861st.c
new file mode 100644
index 0000000000..1c164ea70d
--- /dev/null
+++ b/keyboards/ducky/one2mini/1861st/1861st.c
@@ -0,0 +1,8 @@
+// Copyright 2022 Nick Brassel (@tzarc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "1861st.h"
+
+void bootloader_jump(void) {
+    // TODO: Work out how to jump to LDROM, for now just reset the board.
+    NVIC_SystemReset();
+}
diff --git a/keyboards/ducky/one2mini/1861st/rules.mk b/keyboards/ducky/one2mini/1861st/rules.mk
index 277108c8ac..a5b4708b26 100644
--- a/keyboards/ducky/one2mini/1861st/rules.mk
+++ b/keyboards/ducky/one2mini/1861st/rules.mk
@@ -1,6 +1,9 @@
 MCU_FAMILY = NUMICRO
 MCU_SERIES = NUC123
 
+# Bootloader selection
+BOOTLOADER = custom
+
 # linker script to use
 MCU_LDSCRIPT = NUC123xD4xx0
 
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.c b/keyboards/ergodox_stm32/ergodox_stm32.c
index 846c29d7a4..8419b40f41 100644
--- a/keyboards/ergodox_stm32/ergodox_stm32.c
+++ b/keyboards/ergodox_stm32/ergodox_stm32.c
@@ -16,6 +16,11 @@ void board_init(void) {
     AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_JTAGDISABLE;
 }
 
+void bootloader_jump(void) {
+    // This board doesn't use the "standard" stm32duino bootloader, and is resident in memory at the base location. All we can do here is reset.
+    NVIC_SystemReset();
+}
+
 void matrix_init_kb(void)
 {
     // Init LED Ports
diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk
index 3f7197cbf6..e730df82aa 100644
--- a/keyboards/ergodox_stm32/rules.mk
+++ b/keyboards/ergodox_stm32/rules.mk
@@ -3,6 +3,9 @@ MCU = STM32F103
 MCU_LDSCRIPT = stm32f103_bootloader
 BOARD = ST_NUCLEO64_F103RB
 
+# Bootloader selection
+BOOTLOADER = custom
+
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = no	# Mouse keys
 EXTRAKEY_ENABLE = yes	# Audio control and System control
diff --git a/keyboards/jm60/jm60.c b/keyboards/jm60/jm60.c
index f7b434f30e..823892dce9 100644
--- a/keyboards/jm60/jm60.c
+++ b/keyboards/jm60/jm60.c
@@ -20,3 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 void board_init(void) {
 	AFIO->MAPR |= AFIO_MAPR_SWJ_CFG_JTAGDISABLE;
 }
+
+void bootloader_jump(void) {
+    // This board doesn't use the "standard" stm32duino bootloader. There's no information on how to jump to the custom bootloader, so all we can do here is reset.
+    NVIC_SystemReset();
+}
diff --git a/keyboards/jm60/rules.mk b/keyboards/jm60/rules.mk
index 6cb13d932d..c6de64a130 100644
--- a/keyboards/jm60/rules.mk
+++ b/keyboards/jm60/rules.mk
@@ -4,6 +4,9 @@ MCU = STM32F103
 MCU_LDSCRIPT = jm60_bootloader
 BOARD = ST_NUCLEO64_F103RB
 
+# Bootloader selection
+BOOTLOADER = custom
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/matrix/abelx/abelx.c b/keyboards/matrix/abelx/abelx.c
index 77e749ee40..9585948e0c 100644
--- a/keyboards/matrix/abelx/abelx.c
+++ b/keyboards/matrix/abelx/abelx.c
@@ -97,3 +97,8 @@ void shutdown_user(void)
     // set the magic number for resetting to the bootloader
     *(uint32_t *)(&(RTCD1.rtc->BKP0R)) = REBOOT_MAGIC;
 }
+
+void bootloader_jump(void) {
+    shutdown_user();
+    NVIC_SystemReset();
+}
diff --git a/keyboards/matrix/abelx/rules.mk b/keyboards/matrix/abelx/rules.mk
index d4a065662b..7a5d01e5cb 100644
--- a/keyboards/matrix/abelx/rules.mk
+++ b/keyboards/matrix/abelx/rules.mk
@@ -25,6 +25,9 @@ ARMV = 7
 
 USE_FPU = yes
 
+# Bootloader selection
+BOOTLOADER = custom
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/matrix/m12og/rev1/rev1.c b/keyboards/matrix/m12og/rev1/rev1.c
index e3277bee27..53183c7d2d 100644
--- a/keyboards/matrix/m12og/rev1/rev1.c
+++ b/keyboards/matrix/m12og/rev1/rev1.c
@@ -20,6 +20,11 @@ void board_init(void) {
     writePinLow(A8);
 }
 
+void bootloader_jump(void) {
+    // This board doesn't use the standard DFU bootloader, and no information is available regarding how to enter bootloader mode. All we can do here is reset.
+    NVIC_SystemReset();
+}
+
 void keyboard_post_init_kb(void) {
     rgblight_enable_noeeprom();
     rgblight_sethsv_noeeprom(5, 255, 255);
diff --git a/keyboards/matrix/m12og/rev1/rules.mk b/keyboards/matrix/m12og/rev1/rules.mk
index 0e0584b8c9..d9733e8c5e 100644
--- a/keyboards/matrix/m12og/rev1/rules.mk
+++ b/keyboards/matrix/m12og/rev1/rules.mk
@@ -5,6 +5,9 @@ MCU_LDSCRIPT = m12og_v1
 
 BOARD = m12og_v1
 
+# Bootloader selection
+BOOTLOADER = custom
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/matrix/m20add/m20add.c b/keyboards/matrix/m20add/m20add.c
index 4d328d6c54..cdcafb9779 100644
--- a/keyboards/matrix/m20add/m20add.c
+++ b/keyboards/matrix/m20add/m20add.c
@@ -59,3 +59,8 @@ void shutdown_user(void)
     // set the magic number for resetting to the bootloader
     *(uint32_t *)(&(RTCD1.rtc->BKP0R)) = REBOOT_MAGIC;
 }
+
+void bootloader_jump(void) {
+    shutdown_user();
+    NVIC_SystemReset();
+}
diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk
index 1ecbd9d308..86bd6b9371 100644
--- a/keyboards/matrix/m20add/rules.mk
+++ b/keyboards/matrix/m20add/rules.mk
@@ -10,6 +10,9 @@ MCU_LDSCRIPT = m20add_boot
 #  or <this_dir>/boards
 BOARD = ST_NUCLEO64_F411RE
 
+# Bootloader selection
+BOOTLOADER = custom
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/matrix/noah/noah.c b/keyboards/matrix/noah/noah.c
index 2143dee3be..89c25707af 100644
--- a/keyboards/matrix/noah/noah.c
+++ b/keyboards/matrix/noah/noah.c
@@ -4,6 +4,11 @@
 
 #include "noah.h"
 
+void bootloader_jump(void) {
+    // This board doesn't use the standard DFU bootloader, and no information is available regarding how to enter bootloader mode. All we can do here is reset.
+    NVIC_SystemReset();
+}
+
 #ifdef RGBLIGHT_ENABLE
 #include <string.h>
 #include "rgblight.h"
diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk
index b9f642e8cd..7971d628d6 100644
--- a/keyboards/matrix/noah/rules.mk
+++ b/keyboards/matrix/noah/rules.mk
@@ -10,6 +10,9 @@ MCU_LDSCRIPT = noah_boot
 #  or <this_dir>/boards
 BOARD = ST_NUCLEO64_F411RE
 
+# Bootloader selection
+BOOTLOADER = custom
+
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/wolfmarkclub/wm1/rules.mk b/keyboards/wolfmarkclub/wm1/rules.mk
index 2782d497ce..a712747048 100644
--- a/keyboards/wolfmarkclub/wm1/rules.mk
+++ b/keyboards/wolfmarkclub/wm1/rules.mk
@@ -5,6 +5,9 @@ MCU = STM32F103
 MCU_LDSCRIPT = wm1_f103
 BOARD = STM32_F103_STM32DUINO
 
+# Bootloader selection
+BOOTLOADER = custom
+
 PROGRAM_CMD = echo 'CLI flashing not supported' >&2
 
 # Build Options
diff --git a/keyboards/wolfmarkclub/wm1/wm1.c b/keyboards/wolfmarkclub/wm1/wm1.c
index d199546f89..0ad1ade4cc 100644
--- a/keyboards/wolfmarkclub/wm1/wm1.c
+++ b/keyboards/wolfmarkclub/wm1/wm1.c
@@ -1,5 +1,10 @@
 #include "wm1.h"
 
+void bootloader_jump(void) {
+    // This board doesn't use the "standard" stm32duino bootloader, and no information is available regarding how to enter bootloader mode. All we can do here is reset.
+    NVIC_SystemReset();
+}
+
 void matrix_init_kb(void) {
   setPinOutput(B1); // Top Indicator LED
   setPinOutput(B0); // Middle Indicator LED
diff --git a/keyboards/xiaomi/mk02/rules.mk b/keyboards/xiaomi/mk02/rules.mk
index 9d6d62c394..c20d67dd89 100644
--- a/keyboards/xiaomi/mk02/rules.mk
+++ b/keyboards/xiaomi/mk02/rules.mk
@@ -3,6 +3,9 @@ MCU = STM32F072
 BOARD = ST_STM32F072B_DISCOVERY
 MCU_LDSCRIPT = STM32F072_0x2000_bootloader
 
+# Bootloader selection
+BOOTLOADER = custom
+
 DFU_ARGS = -d 0483:df11 -a 0 -s 0x08002000:leave
 DFU_SUFFIX_ARGS = -v 0483 -p DF11
 

From 3ca19fa9339e9a65ba9eb8d02f8a851ff5d0a20a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jimmy=20Sj=C3=B6lund?= <jimmy@sjolund.se>
Date: Mon, 7 Feb 2022 18:24:20 +0000
Subject: [PATCH 554/867] [Keymap] Updated Planck layout - jimmysjolund
 (#16245)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../planck/keymaps/jimmysjolund/keymap.c      | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/keyboards/planck/keymaps/jimmysjolund/keymap.c b/keyboards/planck/keymaps/jimmysjolund/keymap.c
index 6b89b99540..aaf8600faf 100644
--- a/keyboards/planck/keymaps/jimmysjolund/keymap.c
+++ b/keyboards/planck/keymaps/jimmysjolund/keymap.c
@@ -53,23 +53,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Brite| Ctrl | Alt  | GUI  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
  * `-----------------------------------------------------------------------------------'
  */
-/* Qwerty - jimmysjolund 2021-09-22
+/* Qwerty - jimmysjolund 2022-02-06
  * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * | `    |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |Raise |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
+ * |Lower |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Shift |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  | Ctrl | GUI  | Alt  |Lower |Raise |Enter |Space |AltGr | Down |  Up  |Enter |
+ * | Esc  | Tab  | GUI  |Shift | Bksp | Ctrl |Enter |Space |AltGr | Alt  | Down |  Up  |
  * `-----------------------------------------------------------------------------------'
  */
 
 [_QWERTY] = LAYOUT_planck_grid(
-    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_DEL, KC_LCTL, KC_LGUI, KC_LALT, LOWER,   RAISE,  KC_ENT,  KC_SPC,   KC_ALGR, KC_DOWN, KC_UP,   KC_ENT
+    KC_GRV,  KC_Q,    KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,    KC_U,    KC_I,     KC_O,     KC_P,     KC_DEL,
+    RAISE,   KC_A,    KC_S,     KC_D,     KC_F,     KC_G,     KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+    LOWER,   KC_Z,    KC_X,     KC_C,     KC_V,     KC_B,     KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
+    KC_ESC,  KC_TAB,  KC_LGUI,  KC_LSFT,  KC_BSPC,  KC_LCTL,  KC_ENT,  KC_SPC,  KC_ALGR,  KC_LALT,  KC_DOWN,  KC_UP
 ),
 
 /* Colemak Original
@@ -85,20 +85,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 /* Colemak jimmysjolund
  * ,-----------------------------------------------------------------------------------.
- * | Esc  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
+ * |  `   |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
  * |------+------+------+------+------+-------------+------+------+------+------+------|
- * | Tab  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * |Raise |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
  * |------+------+------+------+------+------|------+------+------+------+------+------|
- * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
+ * |Lower |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Shift |
  * |------+------+------+------+------+------+------+------+------+------+------+------|
- * | Del  | Ctrl | GUI  | Alt  |Lower |Raise |Enter |Space |AltGr | Down |  Up  |Enter |
+ * | Esc  | Tab  | GUI  |Shift | Bksp | Ctrl |Enter |Space |AltGr | Alt  | Down |  Up  |
  * `-----------------------------------------------------------------------------------'
  */
 [_COLEMAK] = LAYOUT_planck_grid(
-    KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-    KC_TAB,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_DEL, KC_LCTL, KC_LGUI, KC_LALT, LOWER,   RAISE,   KC_ENT,  KC_SPC,  KC_ALGR, KC_DOWN,  KC_UP,   KC_ENT
+    KC_GRV, KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
+    RAISE,  KC_A,   KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    LOWER,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+    KC_ESC, KC_TAB, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_ENT,  KC_SPC,  KC_ALGR, KC_LALT, KC_DOWN, KC_UP
 ),
 
 /* Dvorak

From 67d10cbc7e074d441103363658845f4430c51fdd Mon Sep 17 00:00:00 2001
From: Duccio <ducciobreschi@gmail.com>
Date: Mon, 7 Feb 2022 20:28:20 +0100
Subject: [PATCH 555/867] [Keyboard] [eternal_keypad] Update product_id and add
 keymap (#16253)

---
 keyboards/eternal_keypad/config.h             |  2 +-
 .../eternal_keypad/keymaps/kyek/config.h      | 21 +++++
 .../eternal_keypad/keymaps/kyek/keymap.c      | 86 +++++++++++++++++++
 .../eternal_keypad/keymaps/kyek/readme.md     |  1 +
 4 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/eternal_keypad/keymaps/kyek/config.h
 create mode 100644 keyboards/eternal_keypad/keymaps/kyek/keymap.c
 create mode 100644 keyboards/eternal_keypad/keymaps/kyek/readme.md

diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index 5f2c60d6a1..fbcdb45021 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/keyboards/eternal_keypad/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID    0xFEED
-#define PRODUCT_ID   0x0000
+#define PRODUCT_ID   0xDB00
 #define DEVICE_VER   0x0001
 #define MANUFACTURER duckyb
 #define PRODUCT      eternal_keypad
diff --git a/keyboards/eternal_keypad/keymaps/kyek/config.h b/keyboards/eternal_keypad/keymaps/kyek/config.h
new file mode 100644
index 0000000000..226b16e546
--- /dev/null
+++ b/keyboards/eternal_keypad/keymaps/kyek/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2021 duckyb
+ *
+ * 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 ONESHOT_TIMEOUT 2000
+#define FORCE_NKRO
+#define USB_POLLING_INTERVAL_MS 1
+#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/eternal_keypad/keymaps/kyek/keymap.c b/keyboards/eternal_keypad/keymaps/kyek/keymap.c
new file mode 100644
index 0000000000..592e73bc74
--- /dev/null
+++ b/keyboards/eternal_keypad/keymaps/kyek/keymap.c
@@ -0,0 +1,86 @@
+/* Copyright 2021 duckyb
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _ARROW,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Base Layer
+   * ,-------------------------------------.
+   * |     |  Esc  |  1|  2|  3|  4|  5|  6|
+	 * |		 |-------+---+---+---+---+---+---|
+   * |     |  Tab  |  Q|  W|  E|  R|  T|  7|
+	 * |----||-------+---+---+---+---+---+---|
+   * | F13|| Enter |  A|  S|  D|  F|  G|  8|
+	 * |----||-------+---+---+---+---+---+---|
+   * | F14|| Shift |  Z|  X|  C|  V|  B|  9|
+   * |----||-------------------------------|
+   * | F15|| LCtrl | _FN |Alt|  Space  |  0|
+   * `----'`-------------------------------'
+   */
+    [_BASE] = LAYOUT(
+		        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, 
+		        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_7, 
+		KC_F13, KC_ENT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_8, 
+		KC_F14, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_9, 
+		KC_LGUI, KC_LCTL, OSL(_FN), KC_LALT, KC_SPC, LT(_ARROW, KC_0)
+    ),
+  /* Arrows Layer
+   * ,-----------------------------------------.
+   * |     |       |    |    |     |   |   |   |
+	 * |		 |-------+----+----+-----+---+---+---|
+   * |     |       |    |  UP|     |   |   |   |
+	 * |----||-------+----+----+-----+---+---+---|
+   * |    ||       |LEFT|DOWN|RIGHT|   |   |   |
+	 * |----||-------+----+----+-----+---+---+---|
+   * |    ||       |    |    |     |   |   |   |
+   * |----||-----------------------------------|
+   * | RST||       |       |     |         |   |
+   * `----'`-----------------------------------'
+   */
+    [_ARROW] = LAYOUT(
+		         _______, _______, _______, _______, _______, _______, _______,
+		         _______, _______, KC_UP, _______, _______, _______, _______, 
+		_______, KC_DEL , KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, 
+		RESET,   _______, _______, _______, _______, _______
+    ),
+  /* Function Layer
+   * ,-------------------------------------.
+   * |     |       | F1| F2| F3| F4| F5| F6|
+	 * |		 |-------+---+---+---+---+---+---|
+   * |     |       |  P|  O|  I|  U|  Y| F7|
+	 * |----||-------+---+---+---+---+---+---|
+   * |    ||  Bspc |  ;|  L|  K|  J|  H| F8|
+	 * |----||-------+---+---+---+---+---+---|
+   * |    ||       |Gui|  M|  N|F12|F11| F9|
+   * |----||-------------------------------|
+   * |    ||       |     |   |         |F10|
+   * `----'`-------------------------------'
+   */
+    [_FN] = LAYOUT(
+		         _______, KC_F1  , KC_F2  , KC_F3  , KC_F4 , KC_F5 , KC_F6,
+		         _______, KC_P   , KC_O   , KC_I   , KC_U  , KC_Y  , KC_F7, 
+		_______, KC_BSPC, KC_SCLN, KC_L   , KC_K   , KC_J  , KC_H  , KC_F8, 
+		_______, _______, _______, KC_M   , KC_N   , KC_F12, KC_F11, KC_F9, 
+		_______, _______, _______, _______, _______, KC_F10
+    )
+};
diff --git a/keyboards/eternal_keypad/keymaps/kyek/readme.md b/keyboards/eternal_keypad/keymaps/kyek/readme.md
new file mode 100644
index 0000000000..d4c6162b0f
--- /dev/null
+++ b/keyboards/eternal_keypad/keymaps/kyek/readme.md
@@ -0,0 +1 @@
+# Kyek's personal keymap for eternal_keypad

From 837205b08faeb5ec4b8bb5a3a380b6459cdef834 Mon Sep 17 00:00:00 2001
From: Alin Marin Elena <alin@elena.space>
Date: Mon, 7 Feb 2022 21:31:51 +0000
Subject: [PATCH 556/867] [Keyboard] M60 split 5x12 lego pcb (#14383)

* add m60 lego case in split, with stm32f401 and 411

* Update keyboards/mlego/m60_split/m60_split.h

* Update keyboards/mlego/m60_split/rev1/config.h

* Update keyboards/mlego/m60_split/rev2/config.h

* address the moving of enum in keymaps
---
 keyboards/mlego/m60_split/config.h            |  37 ++++
 keyboards/mlego/m60_split/info.json           |  11 +
 .../mlego/m60_split/keymaps/default/config.h  |  21 ++
 .../mlego/m60_split/keymaps/default/keymap.c  | 193 ++++++++++++++++++
 .../mlego/m60_split/keymaps/via/config.h      |  20 ++
 .../mlego/m60_split/keymaps/via/keymap.c      | 185 +++++++++++++++++
 .../mlego/m60_split/keymaps/via/rules.mk      |   1 +
 keyboards/mlego/m60_split/m60_split.c         |  17 ++
 keyboards/mlego/m60_split/m60_split.h         |  57 ++++++
 keyboards/mlego/m60_split/readme.md           |  67 ++++++
 keyboards/mlego/m60_split/rev1/config.h       |  86 ++++++++
 keyboards/mlego/m60_split/rev1/halconf.h      |  30 +++
 keyboards/mlego/m60_split/rev1/mcuconf.h      |  30 +++
 keyboards/mlego/m60_split/rev1/rules.mk       |  24 +++
 keyboards/mlego/m60_split/rev2/config.h       |  82 ++++++++
 keyboards/mlego/m60_split/rev2/halconf.h      |  30 +++
 keyboards/mlego/m60_split/rev2/mcuconf.h      |  30 +++
 keyboards/mlego/m60_split/rev2/rules.mk       |  23 +++
 18 files changed, 944 insertions(+)
 create mode 100644 keyboards/mlego/m60_split/config.h
 create mode 100644 keyboards/mlego/m60_split/info.json
 create mode 100644 keyboards/mlego/m60_split/keymaps/default/config.h
 create mode 100644 keyboards/mlego/m60_split/keymaps/default/keymap.c
 create mode 100644 keyboards/mlego/m60_split/keymaps/via/config.h
 create mode 100644 keyboards/mlego/m60_split/keymaps/via/keymap.c
 create mode 100644 keyboards/mlego/m60_split/keymaps/via/rules.mk
 create mode 100644 keyboards/mlego/m60_split/m60_split.c
 create mode 100644 keyboards/mlego/m60_split/m60_split.h
 create mode 100644 keyboards/mlego/m60_split/readme.md
 create mode 100644 keyboards/mlego/m60_split/rev1/config.h
 create mode 100644 keyboards/mlego/m60_split/rev1/halconf.h
 create mode 100644 keyboards/mlego/m60_split/rev1/mcuconf.h
 create mode 100644 keyboards/mlego/m60_split/rev1/rules.mk
 create mode 100644 keyboards/mlego/m60_split/rev2/config.h
 create mode 100644 keyboards/mlego/m60_split/rev2/halconf.h
 create mode 100644 keyboards/mlego/m60_split/rev2/mcuconf.h
 create mode 100644 keyboards/mlego/m60_split/rev2/rules.mk

diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h
new file mode 100644
index 0000000000..6750d4d40b
--- /dev/null
+++ b/keyboards/mlego/m60_split/config.h
@@ -0,0 +1,37 @@
+/* Copyright 2021-2022 alin m elena <alinm.elena@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xBABA
+#define MANUFACTURER alin elena
+#define PRODUCT m60_split
+
+#define MATRIX_ROWS 10  // Rows are doubled-up
+#define MATRIX_COLS 6
+
+#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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/mlego/m60_split/info.json b/keyboards/mlego/m60_split/info.json
new file mode 100644
index 0000000000..ad1f8f4bc9
--- /dev/null
+++ b/keyboards/mlego/m60_split/info.json
@@ -0,0 +1,11 @@
+{
+    "keyboard_name": "mlego/m60_split",
+    "keyboard_folder": "mlego/m60_split",
+    "url": "https://gitlab.com/m-lego/m65",
+    "maintainer": "alin elena",
+    "layouts": {
+        "LAYOUT_ortho_5x12": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/mlego/m60_split/keymaps/default/config.h b/keyboards/mlego/m60_split/keymaps/default/config.h
new file mode 100644
index 0000000000..b1aed18a18
--- /dev/null
+++ b/keyboards/mlego/m60_split/keymaps/default/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
+#define UNICODE_SELECTED_MODES UC_LNX, UC_MAC, UC_WINC
diff --git a/keyboards/mlego/m60_split/keymaps/default/keymap.c b/keyboards/mlego/m60_split/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5e3912b0bd
--- /dev/null
+++ b/keyboards/mlego/m60_split/keymaps/default/keymap.c
@@ -0,0 +1,193 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
+#define LOWER TT(_LWR)
+#define RAISE TT(_RSE)
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+#endif
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_QW] = LAYOUT_ortho_5x12(
+
+    KC_GRV , KC_1   , KC_2   , KC_3  , KC_4 , KC_5  , KC_6  , KC_7 , KC_8   , KC_9   , KC_0   , KC_BSPC,
+    KC_ESC , KC_Q   , KC_W   , KC_E  , KC_R , KC_T  , KC_Y  , KC_U , KC_I   , KC_O   , KC_P   , KC_DEL ,
+    KC_TAB , KC_A   , KC_S   , KC_D  , KC_F , KC_G  , KC_H  , KC_J , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z   , KC_X   , KC_C  , KC_V , KC_B  , KC_N  , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_ENT ,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_APP, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT
+
+    ),
+
+[_LWR] = LAYOUT_ortho_5x12(
+
+    KC_TILD, KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC, KC_CIRC, KC_AMPR   , KC_ASTR   , KC_LPRN, KC_RPRN, KC_DEL ,
+    KC_DEL , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_UNDS   , KC_PLUS   , KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , S(KC_NUHS), S(KC_NUBS), _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______   , KC_MNXT   , KC_VOLD, KC_VOLU, KC_MPLY,
+    _______, _______, _______, _______, _______, _______, _______, _______   , _______   , _______, _______, _______
+
+ ),
+
+[_RSE] = LAYOUT_ortho_5x12(
+
+    KC_GRV , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_DEL ,
+    KC_DEL , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_NUHS, KC_NUBS, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+
+    ),
+
+[_ADJ] =  LAYOUT_ortho_5x12(
+
+    _______, RESET  , _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_M_G, RESET  , _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI , _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD , _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______ , _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______ , _______, _______, _______
+
+    )
+
+};
+// clang-format on
+
+// let us assume we start with both layers off
+bool toggle_lwr = false;
+bool toggle_rse = false;
+
+bool led_update_user(led_t led_state) {
+    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
+    return false;
+}
+
+void matrix_scan_user(void) {
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+}
+
+void matrix_slave_scan_user(void) {
+    matrix_scan_user();
+    if (IS_LAYER_ON(_LWR)) {
+        led_lwr(layer_state_is(_LWR));
+    }
+    if (IS_LAYER_ON(_RSE)) {
+        led_rse(layer_state_is(_RSE));
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        case (TT(_LWR)):
+            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
+                toggle_lwr = !layer_state_is(_LWR);
+            }
+            return true;
+            break;
+        case (TT(_RSE)):
+            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                toggle_rse = !layer_state_is(_RSE);
+            }
+            return true;
+            break;
+        default:
+            return true;
+    }
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+#endif
+    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0 || (index == 1)) { /* First encoder on each side*/
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
diff --git a/keyboards/mlego/m60_split/keymaps/via/config.h b/keyboards/mlego/m60_split/keymaps/via/config.h
new file mode 100644
index 0000000000..637c0a8faf
--- /dev/null
+++ b/keyboards/mlego/m60_split/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/mlego/m60_split/keymaps/via/keymap.c b/keyboards/mlego/m60_split/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ccb0104748
--- /dev/null
+++ b/keyboards/mlego/m60_split/keymaps/via/keymap.c
@@ -0,0 +1,185 @@
+/*
+Copyright 2021-2022 Alin M Elena <alinm.elena@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
+#define LOWER TT(_LWR)
+#define RAISE TT(_RSE)
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+#endif
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_QW] = LAYOUT_ortho_5x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_APP,  LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+[_LWR] = LAYOUT_ortho_5x12(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+[_RSE] = LAYOUT_ortho_5x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+[_ADJ] =  LAYOUT_ortho_5x12(
+    _______, RESET,   _______, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_M_G, RESET,   _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+)
+
+};
+// clang-format on
+
+// let us assume we start with both layers off
+bool toggle_lwr = false;
+bool toggle_rse = false;
+
+bool led_update_user(led_t led_state) {
+    // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
+    return false;
+}
+
+void matrix_scan_user(void) {
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+}
+
+void matrix_slave_scan_user(void) {
+    matrix_scan_user();
+    if (IS_LAYER_ON(_LWR)) {
+        led_lwr(layer_state_is(_LWR));
+    }
+    if (IS_LAYER_ON(_RSE)) {
+        led_rse(layer_state_is(_RSE));
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+        case (TT(_LWR)):
+            if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
+                toggle_lwr = !layer_state_is(_LWR);
+            }
+            return true;
+            break;
+        case (TT(_RSE)):
+            if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
+                toggle_rse = !layer_state_is(_RSE);
+            }
+            return true;
+            break;
+        default:
+            return true;
+    }
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#ifdef RGBLIGHT_ENABLE
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+#endif
+    return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    return state;
+}
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+static inline void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0 || (index == 1)) { /* First encoder on each side*/
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    my_encoders(index, clockwise);
+    return true;
+}
+#endif
diff --git a/keyboards/mlego/m60_split/keymaps/via/rules.mk b/keyboards/mlego/m60_split/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/mlego/m60_split/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/mlego/m60_split/m60_split.c b/keyboards/mlego/m60_split/m60_split.c
new file mode 100644
index 0000000000..49fa10457a
--- /dev/null
+++ b/keyboards/mlego/m60_split/m60_split.c
@@ -0,0 +1,17 @@
+/* Copyright 2021-2022 alin elena <alin@elena.space>
+ *
+ * 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 "m60_split.h"
+
diff --git a/keyboards/mlego/m60_split/m60_split.h b/keyboards/mlego/m60_split/m60_split.h
new file mode 100644
index 0000000000..11cbd5be60
--- /dev/null
+++ b/keyboards/mlego/m60_split/m60_split.h
@@ -0,0 +1,57 @@
+/* Copyright 2021-2022 alin elena <alin@elena.space>
+ *
+ * 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_ortho_5x12( \
+    L00, L01, L02, L03, L04, L05,   R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,   R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,   R20, R21, R22, R23, R24, R25, \
+    L30, L31, L32, L33, L34, L35,   R30, R31, R32, R33, R34, R35, \
+    L40, L41, L42, L43, L44, L45,   R40, R41, R42, R43, R44, R45  \
+) { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, L31, L32, L33, L34, L35 }, \
+    { L40, L41, L42, L43, L44, L45 }, \
+    { R05, R04, R03, R02, R01, R00 }, \
+    { R15, R14, R13, R12, R11, R10 }, \
+    { R25, R24, R23, R22, R21, R20 }, \
+    { R35, R34, R33, R32, R31, R30 }, \
+    { R45, R44, R43, R42, R41, R40 }  \
+}
+
+
+static inline void led_lwr(const bool on) {
+#ifdef LED_NUM_LOCK_PIN
+    writePin(LED_NUM_LOCK_PIN, on);
+#endif
+}
+
+static inline void led_rse(const bool on) {
+#ifdef LED_SCROLL_LOCK_PIN
+    writePin(LED_SCROLL_LOCK_PIN, on);
+#endif
+}
+
+static inline void led_caps(const bool on) {
+#ifdef LED_CAPS_LOCK_PIN
+    writePin(LED_CAPS_LOCK_PIN, !on);
+#endif
+}
+
diff --git a/keyboards/mlego/m60_split/readme.md b/keyboards/mlego/m60_split/readme.md
new file mode 100644
index 0000000000..cb0214876f
--- /dev/null
+++ b/keyboards/mlego/m60_split/readme.md
@@ -0,0 +1,67 @@
+# M60 split
+
+![M60](https://i.imgur.com/3QfVLFRh.jpg)
+
+A  (12x5) ortholinear split keyboard that can be hand wired or using a pcb.
+
+* Keyboard Maintainer: [Alin Elena](https://github.com/alinelena) ([@drFaustroll on GitLab](https://gitlab.com/drFaustroll))
+* Hardware Supported: custom pcb [see](https://gitlab.com/m-lego/m60_split) STM32F401 from we act (rev1)
+* Hardware Availability: [custom how to](https://gitlab.com/m-lego/m60_split)
+
+
+Make example for this keyboard (after setting up your uild environment):
+
+    make mlego/m60_split/rev1:default
+
+Flashing example for this keyboard:
+
+    make mlego/m60_split/rev1:default
+
+To enter flashing mode, press Lower+Raise+1 or Lower+Raise+0 also on microcontroller keep pressed BOOT0 and then NRST, release NRST and then after 0.5s or so  release BOOT0.
+
+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).
+
+## pins and leds rev1 and rev2
+
+### left
+
+| Rows  | C0    | C1    | C2    | C3    | C4    | C5    | Pins  |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| R0    |  `    | 1     | 2     | 3     | 4     | 5     |   B0  |
+| R1    | Tab   | q     | w     | e     | r     | t     |   A6  |
+| R2    | Esc   | a     | s     | d     | f     | g     |   A7  |
+| R3    | Shift | z     | x     | c     | v     | b     |   B1  |
+| R4    | Ctrl  | Menu  | Alt   | Fn    | Lower | Space |   A5  |
+| Pins  | B14   | A10   | A15   | B3    | B4    | B5    |       |
+
+### right
+
+| Rows  | C6    | C7    | C8    | C9    | C10   | C11   | Pins  |
+| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
+| R0    | 6     | 7     | 8     | 9     | 0     | BSpace|   B1  |
+| R1    | y     | u     | i     | o     | p     | Del   |   A4  |
+| R2    | h     | j     | k     | l     | ;     | '     |   A5  |
+| R3    | n     | m     | ,     | .     | /     | Enter |   A6  |
+| R4    | Space | Raise | Left  | Down  | Up    | Right |   A7  |
+| Pins  | B5    | A7    | A1    | A2    | A3    |  B0   |       |
+
+### Encoders:
+
+  - Pad_A: A0
+  - Pad_B: B8
+
+### Leds
+
+| Leds        | Pin |
+| ----------- | --- |
+| NUM_LOCK    | B12 |
+| CAPS_LOCK   | C13 |
+| SCROLL_LOCK | B13 |
+| RBG_DI      | B15 |
+
+### split pins
+
+|                     | Pin  |
+| ------------------- | ---- |
+| SPLIT_HAND_PIN      |  B9  |
+| SERIAL_USART_TX_PIN |  B6  |
diff --git a/keyboards/mlego/m60_split/rev1/config.h b/keyboards/mlego/m60_split/rev1/config.h
new file mode 100644
index 0000000000..6b7923ac12
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev1/config.h
@@ -0,0 +1,86 @@
+/* Copyright 2021-2022 alin m elena <alinm.elena@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID 0x0001
+#define DEVICE_VER 0x0001
+
+#define MATRIX_ROW_PINS \
+    { B0, A6, A7, B1, A5 }
+#define MATRIX_COL_PINS \
+    { B14, A10, A15, B3, B4, B5 }
+
+#define MATRIX_ROW_PINS_RIGHT \
+    { B1, A4, A5, A6, A7 }
+
+#define MATRIX_COL_PINS_RIGHT \
+    { B0, A3, A2, A1, B7, B5 }  // cols are from right to left to match the layout
+
+#define ENCODERS_PAD_A \
+    { A0 }
+#define ENCODERS_PAD_B \
+    { B8 }
+#define ENCODER_RESOLUTIONS \
+    { 4 }
+
+#define LED_NUM_LOCK_PIN B12
+#define LED_SCROLL_LOCK_PIN B13
+#define LED_CAPS_LOCK_PIN C13
+
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
+
+#define RGB_DI_PIN B15
+
+#define SPLIT_HAND_PIN B9
+#define SERIAL_USART_TX_PIN B6
+#define RGBLIGHT_SPLIT
+#define RGBLIGHT_LAYERS
+
+#define UNUSED_PINS
+#define SERIAL_USART_SPEED 921600
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define MATRIX_IO_DELAY 5
+
+#define RGBLIGHT_LIMIT_VAL 128
+#define RGBLIGHT_DEFAULT_HUE 213
+
+#define RGBLED_NUM 16
+#define RGBLED_SPLIT \
+    { 8, 8 }
+
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+#define BOOTMAGIC_LITE_ROW_RIGHT 5
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
diff --git a/keyboards/mlego/m60_split/rev1/halconf.h b/keyboards/mlego/m60_split/rev1/halconf.h
new file mode 100644
index 0000000000..89815e23b7
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev1/halconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SERIAL TRUE
+
+#define SERIAL_USB_BUFFERS_SIZE 256
+
+#include_next <halconf.h>
diff --git a/keyboards/mlego/m60_split/rev1/mcuconf.h b/keyboards/mlego/m60_split/rev1/mcuconf.h
new file mode 100644
index 0000000000..4d90ec07ea
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev1/mcuconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/mlego/m60_split/rev1/rules.mk b/keyboards/mlego/m60_split/rev1/rules.mk
new file mode 100644
index 0000000000..9e2c8d6570
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev1/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
+SERIAL_DRIVER = usart
+ENCODER_ENABLE = yes        # Enable encoder
+
+LAYOUTS = ortho_5x12
+
diff --git a/keyboards/mlego/m60_split/rev2/config.h b/keyboards/mlego/m60_split/rev2/config.h
new file mode 100644
index 0000000000..1e45e86d06
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev2/config.h
@@ -0,0 +1,82 @@
+/* Copyright 2021-2022 alin m elena <alinm.elena@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID 0x0001
+#define DEVICE_VER 0x0001
+
+#define MATRIX_ROW_PINS \
+    { B0, A6, A7, B1, A5 }
+#define MATRIX_COL_PINS \
+    { B14, A10, A15, B3, B4, B5 }
+
+#define MATRIX_ROW_PINS_RIGHT \
+    { B1, A4, A5, A6, A7 }
+
+#define MATRIX_COL_PINS_RIGHT \
+    { B0, A3, A2, A1, B7, B5 }  // cols are from right to left to match the layout
+
+#define ENCODERS_PAD_A \
+    { A0 }
+#define ENCODERS_PAD_B \
+    { B8 }
+#define ENCODER_RESOLUTIONS \
+    { 4 }
+
+#define LED_NUM_LOCK_PIN B12
+#define LED_SCROLL_LOCK_PIN B13
+#define LED_CAPS_LOCK_PIN C13
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
+
+#define RGB_DI_PIN B15
+
+#define SPLIT_HAND_PIN B9
+#define SERIAL_USART_TX_PIN B6
+#define RGBLIGHT_SPLIT
+
+#define UNUSED_PINS
+#define SERIAL_USART_SPEED 921600
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define MATRIX_IO_DELAY 5
+
+#define RGBLIGHT_LAYERS
+
+#define RGBLED_NUM 16
+#define RGBLED_SPLIT \
+    { 8, 8 }
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+#define BOOTMAGIC_LITE_ROW_RIGHT 5
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
diff --git a/keyboards/mlego/m60_split/rev2/halconf.h b/keyboards/mlego/m60_split/rev2/halconf.h
new file mode 100644
index 0000000000..89815e23b7
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev2/halconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_PWM TRUE
+
+#define HAL_USE_SERIAL TRUE
+
+#define SERIAL_USB_BUFFERS_SIZE 256
+
+#include_next <halconf.h>
diff --git a/keyboards/mlego/m60_split/rev2/mcuconf.h b/keyboards/mlego/m60_split/rev2/mcuconf.h
new file mode 100644
index 0000000000..4d90ec07ea
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev2/mcuconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/zvecr/zv48/f401/mcuconf.h -r platforms/chibios/BLACKPILL_STM32_F401/configs/mcuconf.h`
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
diff --git a/keyboards/mlego/m60_split/rev2/rules.mk b/keyboards/mlego/m60_split/rev2/rules.mk
new file mode 100644
index 0000000000..cb8f4bd951
--- /dev/null
+++ b/keyboards/mlego/m60_split/rev2/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
+SERIAL_DRIVER = usart
+ENCODER_ENABLE = yes        # Enable encoder
+
+LAYOUTS = ortho_5x12

From 7c5d4484f69d9bcb24a16affbe16273fca552a4d Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 7 Feb 2022 19:44:19 -0800
Subject: [PATCH 557/867] Wings42: add QMK Configurator data (#16267)

* add info.json for wings42/rev1

* add info.json for wings42/rev1_extkeys

* add info.json for wings42/rev2
---
 keyboards/wings42/rev1/info.json         | 56 ++++++++++++++++++++++
 keyboards/wings42/rev1_extkeys/info.json | 60 ++++++++++++++++++++++++
 keyboards/wings42/rev2/info.json         | 60 ++++++++++++++++++++++++
 3 files changed, 176 insertions(+)
 create mode 100644 keyboards/wings42/rev1/info.json
 create mode 100644 keyboards/wings42/rev1_extkeys/info.json
 create mode 100644 keyboards/wings42/rev2/info.json

diff --git a/keyboards/wings42/rev1/info.json b/keyboards/wings42/rev1/info.json
new file mode 100644
index 0000000000..863bb3d34e
--- /dev/null
+++ b/keyboards/wings42/rev1/info.json
@@ -0,0 +1,56 @@
+{
+    "keyboard_name": "wings42 rev1",
+    "url": "",
+    "maintainer": "yfuku",
+    "layouts": {
+        "LAYOUT_split_3x6_3": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0.875},
+                {"label":"L01", "x":1, "y":0.625},
+                {"label":"L02", "x":2, "y":0.375},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0},
+                {"label":"L05", "x":5, "y":0.125},
+                {"label":"R00", "x":9, "y":0.125},
+                {"label":"R01", "x":10, "y":0},
+                {"label":"R02", "x":11, "y":0},
+                {"label":"R03", "x":12, "y":0.375},
+                {"label":"R04", "x":13, "y":0.625},
+                {"label":"R05", "x":14, "y":0.875},
+
+                {"label":"L10", "x":0, "y":1.875},
+                {"label":"L11", "x":1, "y":1.625},
+                {"label":"L12", "x":2, "y":1.375},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1},
+                {"label":"L15", "x":5, "y":1.125},
+                {"label":"R10", "x":9, "y":1.125},
+                {"label":"R11", "x":10, "y":1},
+                {"label":"R12", "x":11, "y":1},
+                {"label":"R13", "x":12, "y":1.375},
+                {"label":"R14", "x":13, "y":1.625},
+                {"label":"R15", "x":14, "y":1.875},
+
+                {"label":"L20", "x":0, "y":2.875},
+                {"label":"L21", "x":1, "y":2.625},
+                {"label":"L22", "x":2, "y":2.375},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2},
+                {"label":"L25", "x":5, "y":2.125},
+                {"label":"R20", "x":9, "y":2.125},
+                {"label":"R21", "x":10, "y":2},
+                {"label":"R22", "x":11, "y":2},
+                {"label":"R23", "x":12, "y":2.375},
+                {"label":"R24", "x":13, "y":2.625},
+                {"label":"R25", "x":14, "y":2.875},
+
+                {"label":"L30", "x":4, "y":3},
+                {"label":"L31", "x":5, "y":3.125},
+                {"label":"L32", "x":6, "y":3.375},
+                {"label":"R30", "x":8, "y":3.375},
+                {"label":"R31", "x":9, "y":3.125},
+                {"label":"R32", "x":10, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wings42/rev1_extkeys/info.json b/keyboards/wings42/rev1_extkeys/info.json
new file mode 100644
index 0000000000..b9a793f112
--- /dev/null
+++ b/keyboards/wings42/rev1_extkeys/info.json
@@ -0,0 +1,60 @@
+{
+    "keyboard_name": "wings42 rev1_extkeys",
+    "url": "",
+    "maintainer": "yfuku",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0.875},
+                {"label":"L01", "x":1, "y":0.625},
+                {"label":"L02", "x":2, "y":0.375},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0},
+                {"label":"L05", "x":5, "y":0.125},
+                {"label":"R00", "x":9, "y":0.125},
+                {"label":"R01", "x":10, "y":0},
+                {"label":"R02", "x":11, "y":0},
+                {"label":"R03", "x":12, "y":0.375},
+                {"label":"R04", "x":13, "y":0.625},
+                {"label":"R05", "x":14, "y":0.875},
+
+                {"label":"L10", "x":0, "y":1.875},
+                {"label":"L11", "x":1, "y":1.625},
+                {"label":"L12", "x":2, "y":1.375},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1},
+                {"label":"L15", "x":5, "y":1.125},
+                {"label":"E01", "x":6, "y":1.625},
+                {"label":"E03", "x":8, "y":1.625},
+                {"label":"R10", "x":9, "y":1.125},
+                {"label":"R11", "x":10, "y":1},
+                {"label":"R12", "x":11, "y":1},
+                {"label":"R13", "x":12, "y":1.375},
+                {"label":"R14", "x":13, "y":1.625},
+                {"label":"R15", "x":14, "y":1.875},
+
+                {"label":"L20", "x":0, "y":2.875},
+                {"label":"L21", "x":1, "y":2.625},
+                {"label":"L22", "x":2, "y":2.375},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2},
+                {"label":"L25", "x":5, "y":2.125},
+                {"label":"E02", "x":6, "y":2.625},
+                {"label":"E04", "x":8, "y":2.625},
+                {"label":"R20", "x":9, "y":2.125},
+                {"label":"R21", "x":10, "y":2},
+                {"label":"R22", "x":11, "y":2},
+                {"label":"R23", "x":12, "y":2.375},
+                {"label":"R24", "x":13, "y":2.625},
+                {"label":"R25", "x":14, "y":2.875},
+
+                {"label":"L30", "x":4, "y":3},
+                {"label":"L31", "x":5, "y":3.125},
+                {"label":"L32", "x":6, "y":3.375},
+                {"label":"R30", "x":8, "y":3.375},
+                {"label":"R31", "x":9, "y":3.125},
+                {"label":"R32", "x":10, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/wings42/rev2/info.json b/keyboards/wings42/rev2/info.json
new file mode 100644
index 0000000000..4e78697627
--- /dev/null
+++ b/keyboards/wings42/rev2/info.json
@@ -0,0 +1,60 @@
+{
+    "keyboard_name": "wings42 rev2",
+    "url": "",
+    "maintainer": "yfuku",
+    "layouts": {
+        "LAYOUT_split_3x6_3_2": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0.875},
+                {"label":"L01", "x":1, "y":0.625},
+                {"label":"L02", "x":2, "y":0.375},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0},
+                {"label":"L05", "x":5, "y":0.125},
+                {"label":"R00", "x":9, "y":0.125},
+                {"label":"R01", "x":10, "y":0},
+                {"label":"R02", "x":11, "y":0},
+                {"label":"R03", "x":12, "y":0.375},
+                {"label":"R04", "x":13, "y":0.625},
+                {"label":"R05", "x":14, "y":0.875},
+
+                {"label":"L10", "x":0, "y":1.875},
+                {"label":"L11", "x":1, "y":1.625},
+                {"label":"L12", "x":2, "y":1.375},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1},
+                {"label":"L15", "x":5, "y":1.125},
+                {"label":"L31", "x":6, "y":1.625},
+                {"label":"R33", "x":8, "y":1.625},
+                {"label":"R10", "x":9, "y":1.125},
+                {"label":"R11", "x":10, "y":1},
+                {"label":"R12", "x":11, "y":1},
+                {"label":"R13", "x":12, "y":1.375},
+                {"label":"R14", "x":13, "y":1.625},
+                {"label":"R15", "x":14, "y":1.875},
+
+                {"label":"L20", "x":0, "y":2.875},
+                {"label":"L21", "x":1, "y":2.625},
+                {"label":"L22", "x":2, "y":2.375},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2},
+                {"label":"L25", "x":5, "y":2.125},
+                {"label":"L32", "x":6, "y":2.625},
+                {"label":"R34", "x":8, "y":2.625},
+                {"label":"R20", "x":9, "y":2.125},
+                {"label":"R21", "x":10, "y":2},
+                {"label":"R22", "x":11, "y":2},
+                {"label":"R23", "x":12, "y":2.375},
+                {"label":"R24", "x":13, "y":2.625},
+                {"label":"R25", "x":14, "y":2.875},
+
+                {"label":"L33", "x":4, "y":3},
+                {"label":"L34", "x":5, "y":3.125},
+                {"label":"L35", "x":6, "y":3.375},
+                {"label":"R30", "x":8, "y":3.375},
+                {"label":"R31", "x":9, "y":3.125},
+                {"label":"R32", "x":10, "y":3}
+            ]
+        }
+    }
+}

From f3aa5db4147f9a5e80a81e76b74280aa1087a281 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 7 Feb 2022 19:45:44 -0800
Subject: [PATCH 558/867] Boardsource The Mark 65 Touch-Up and Layout Additions
 (#16270)

* the_mark.h: use ____ for KC_NO

* the_mark.h: number matrix positions electrically

`K300` and `K301` has misleading identifiers - `K300` was on column 1 and `K301` on column 0.

* the_mark.h: use QMK 3-character notation

* the_mark.h: add matrix diagram

* refactor reference keymaps

- convert tabs to spaces
- use four-space indent
- grid align keycodes
- remove extra line breaks
- add layer indexes to `via` keymap

* info.json: apply friendly formatting

* add LAYOUT_ansi_split_bs_space

Includes reference keymap.

* add LAYOUT_iso_split_bs_space

Includes reference keymap.

* info.json: edit maintainer value

There is a Boardsource GitHub account, but knowing the user who maintains it is helpful.
---
 keyboards/boardsource/the_mark/info.json      | 588 +++++++++++-------
 .../the_mark/keymaps/default/keymap.c         |  30 +-
 .../the_mark/keymaps/default_ansi/keymap.c    |  30 +-
 .../default_ansi_split_bs_space/keymap.c      |  41 ++
 .../the_mark/keymaps/default_iso/keymap.c     |  30 +-
 .../default_iso_split_bs_space/keymap.c       |  41 ++
 .../boardsource/the_mark/keymaps/via/keymap.c |  58 +-
 keyboards/boardsource/the_mark/the_mark.h     | 112 ++--
 8 files changed, 598 insertions(+), 332 deletions(-)
 create mode 100644 keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c
 create mode 100644 keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c

diff --git a/keyboards/boardsource/the_mark/info.json b/keyboards/boardsource/the_mark/info.json
index 07e3a34e54..792585d12a 100644
--- a/keyboards/boardsource/the_mark/info.json
+++ b/keyboards/boardsource/the_mark/info.json
@@ -1,229 +1,393 @@
 {
     "keyboard_name": "The Mark: 65",
     "url": "",
-    "maintainer": "Boardsource",
+    "maintainer": "daysgobye, Boardsource",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1 },
-                { "x": 1, "y": 0, "w": 1 },
-                { "x": 2, "y": 0, "w": 1 },
-                { "x": 3, "y": 0, "w": 1 },
-                { "x": 4, "y": 0, "w": 1 },
-                { "x": 5, "y": 0, "w": 1 },
-                { "x": 6, "y": 0, "w": 1 },
-                { "x": 7, "y": 0, "w": 1 },
-                { "x": 8, "y": 0, "w": 1 },
-                { "x": 9, "y": 0, "w": 1 },
-                { "x": 10, "y": 0, "w": 1 },
-                { "x": 11, "y": 0, "w": 1 },
-                { "x": 12, "y": 0, "w": 1 },
-                { "x": 13, "y": 0, "w": 1 },
-                { "x": 14, "y": 0, "w": 1 },
-                { "x": 15.25, "y": 0, "w": 1 },
-                { "x": 0, "y": 1, "w": 1.5 },
-                { "x": 1.5, "y": 1, "w": 1 },
-                { "x": 2.5, "y": 1, "w": 1 },
-                { "x": 3.5, "y": 1, "w": 1 },
-                { "x": 4.5, "y": 1, "w": 1 },
-                { "x": 5.5, "y": 1, "w": 1 },
-                { "x": 6.5, "y": 1, "w": 1 },
-                { "x": 7.5, "y": 1, "w": 1 },
-                { "x": 8.5, "y": 1, "w": 1 },
-                { "x": 9.5, "y": 1, "w": 1 },
-                { "x": 10.5, "y": 1, "w": 1 },
-                { "x": 11.5, "y": 1, "w": 1 },
-                { "x": 12.5, "y": 1, "w": 1 },
-                { "x": 13.5, "y": 1, "w": 1.5 },
-                { "x": 15.25, "y": 1, "w": 1 },
-                { "x": 0, "y": 2, "w": 1.75 },
-                { "x": 1.75, "y": 2, "w": 1 },
-                { "x": 2.75, "y": 2, "w": 1 },
-                { "x": 3.75, "y": 2, "w": 1 },
-                { "x": 4.75, "y": 2, "w": 1 },
-                { "x": 5.75, "y": 2, "w": 1 },
-                { "x": 6.75, "y": 2, "w": 1 },
-                { "x": 7.75, "y": 2, "w": 1 },
-                { "x": 8.75, "y": 2, "w": 1 },
-                { "x": 9.75, "y": 2, "w": 1 },
-                { "x": 10.75, "y": 2, "w": 1 },
-                { "x": 11.75, "y": 2, "w": 1 },
-                { "x": 12.75, "y": 2, "w": 2.25 },
-                { "x": 15.25, "y": 2, "w": 1 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3, "w": 1 },
-                { "x": 2.25, "y": 3, "w": 1 },
-                { "x": 3.25, "y": 3, "w": 1 },
-                { "x": 4.25, "y": 3, "w": 1 },
-                { "x": 5.25, "y": 3, "w": 1 },
-                { "x": 6.25, "y": 3, "w": 1 },
-                { "x": 7.25, "y": 3, "w": 1 },
-                { "x": 8.25, "y": 3, "w": 1 },
-                { "x": 9.25, "y": 3, "w": 1 },
-                { "x": 10.25, "y": 3, "w": 1 },
-                { "x": 11.25, "y": 3, "w": 1 },
-                { "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14.25, "y": 3.25, "w": 1 },
-                { "x": 0, "y": 4, "w": 1.25 },
-                { "x": 1.25, "y": 4, "w": 1.25 },
-                { "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 2.25 },
-                { "x": 6, "y": 4, "w": 1.25 },
-                { "x": 7.25, "y": 4, "w": 2.75 },
-                { "x": 10, "y": 4, "w": 1 },
-                { "x": 11, "y": 4, "w": 1 },
-                { "x": 12, "y": 4, "w": 1 },
-                { "x": 13.25, "y": 4.25, "w": 1 },
-                { "x": 14.25, "y": 4.25, "w": 1 },
-                { "x": 15.25, "y": 4.25, "w": 1 }
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0},
+                {"label":"Toggle RGB", "x":15.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":"RGB Mode +", "x":15.25, "y":1},
+
+                {"label":"Ctrl", "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":"Fn", "x":15.25, "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":1.75},
+                {"label":"\u2191", "x":14.25, "y":3.25},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Space", "x":7.25, "y":4, "w":2.75},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Ctrl", "x":11, "y":4},
+                {"label":"`~", "x":12, "y":4},
+                {"label":"\u2190", "x":13.25, "y":4.25},
+                {"label":"\u2193", "x":14.25, "y":4.25},
+                {"label":"\u2192", "x":15.25, "y":4.25}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1 },
-                { "x": 1, "y": 0, "w": 1 },
-                { "x": 2, "y": 0, "w": 1 },
-                { "x": 3, "y": 0, "w": 1 },
-                { "x": 4, "y": 0, "w": 1 },
-                { "x": 5, "y": 0, "w": 1 },
-                { "x": 6, "y": 0, "w": 1 },
-                { "x": 7, "y": 0, "w": 1 },
-                { "x": 8, "y": 0, "w": 1 },
-                { "x": 9, "y": 0, "w": 1 },
-                { "x": 10, "y": 0, "w": 1 },
-                { "x": 11, "y": 0, "w": 1 },
-                { "x": 12, "y": 0, "w": 1 },
-                { "x": 13, "y": 0, "w": 2 },
-                { "x": 15.25, "y": 0, "w": 1 },
-                { "x": 0, "y": 1, "w": 1.5 },
-                { "x": 1.5, "y": 1, "w": 1 },
-                { "x": 2.5, "y": 1, "w": 1 },
-                { "x": 3.5, "y": 1, "w": 1 },
-                { "x": 4.5, "y": 1, "w": 1 },
-                { "x": 5.5, "y": 1, "w": 1 },
-                { "x": 6.5, "y": 1, "w": 1 },
-                { "x": 7.5, "y": 1, "w": 1 },
-                { "x": 8.5, "y": 1, "w": 1 },
-                { "x": 9.5, "y": 1, "w": 1 },
-                { "x": 10.5, "y": 1, "w": 1 },
-                { "x": 11.5, "y": 1, "w": 1 },
-                { "x": 12.5, "y": 1, "w": 1 },
-                { "x": 13.5, "y": 1, "w": 1.5 },
-                { "x": 15.25, "y": 1, "w": 1 },
-                { "x": 0, "y": 2, "w": 1.75 },
-                { "x": 1.75, "y": 2, "w": 1 },
-                { "x": 2.75, "y": 2, "w": 1 },
-                { "x": 3.75, "y": 2, "w": 1 },
-                { "x": 4.75, "y": 2, "w": 1 },
-                { "x": 5.75, "y": 2, "w": 1 },
-                { "x": 6.75, "y": 2, "w": 1 },
-                { "x": 7.75, "y": 2, "w": 1 },
-                { "x": 8.75, "y": 2, "w": 1 },
-                { "x": 9.75, "y": 2, "w": 1 },
-                { "x": 10.75, "y": 2, "w": 1 },
-                { "x": 11.75, "y": 2, "w": 1 },
-                { "x": 12.75, "y": 2, "w": 2.25 },
-                { "x": 15.25, "y": 2, "w": 1 },
-                { "x": 0, "y": 3, "w": 2.25 },
-                { "x": 2.25, "y": 3, "w": 1 },
-                { "x": 3.25, "y": 3, "w": 1 },
-                { "x": 4.25, "y": 3, "w": 1 },
-                { "x": 5.25, "y": 3, "w": 1 },
-                { "x": 6.25, "y": 3, "w": 1 },
-                { "x": 7.25, "y": 3, "w": 1 },
-                { "x": 8.25, "y": 3, "w": 1 },
-                { "x": 9.25, "y": 3, "w": 1 },
-                { "x": 10.25, "y": 3, "w": 1 },
-                { "x": 11.25, "y": 3, "w": 1 },
-                { "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14.25, "y": 3.25, "w": 1 },
-                { "x": 0, "y": 4, "w": 1.25 },
-                { "x": 1.25, "y": 4, "w": 1.25 },
-                { "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "x": 10, "y": 4, "w": 1 },
-                { "x": 11, "y": 4, "w": 1 },
-                { "x": 12, "y": 4, "w": 1 },
-                { "x": 13.25, "y": 4.25, "w": 1 },
-                { "x": 14.25, "y": 4.25, "w": 1 },
-                { "x": 15.25, "y": 4.25, "w": 1 }
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Toggle RGB", "x":15.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":"RGB Mode +", "x":15.25, "y":1},
+
+                {"label":"Ctrl", "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":"Fn", "x":15.25, "y":2},
+
+                {"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":1.75},
+                {"label":"\u2191", "x":14.25, "y":3.25},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Ctrl", "x":11, "y":4},
+                {"label":"`~", "x":12, "y":4},
+                {"label":"\u2190", "x":13.25, "y":4.25},
+                {"label":"\u2193", "x":14.25, "y":4.25},
+                {"label":"\u2192", "x":15.25, "y":4.25}
+            ]
+        },
+        "LAYOUT_ansi_split_bs_space": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0},
+                {"label":"Toggle RGB", "x":15.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":"RGB Mode +", "x":15.25, "y":1},
+
+                {"label":"Ctrl", "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":"Fn", "x":15.25, "y":2},
+
+                {"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":1.75},
+                {"label":"\u2191", "x":14.25, "y":3.25},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Space", "x":7.25, "y":4, "w":2.75},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Ctrl", "x":11, "y":4},
+                {"label":"`~", "x":12, "y":4},
+                {"label":"\u2190", "x":13.25, "y":4.25},
+                {"label":"\u2193", "x":14.25, "y":4.25},
+                {"label":"\u2192", "x":15.25, "y":4.25}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                { "x": 0, "y": 0, "w": 1 },
-                { "x": 1, "y": 0, "w": 1 },
-                { "x": 2, "y": 0, "w": 1 },
-                { "x": 3, "y": 0, "w": 1 },
-                { "x": 4, "y": 0, "w": 1 },
-                { "x": 5, "y": 0, "w": 1 },
-                { "x": 6, "y": 0, "w": 1 },
-                { "x": 7, "y": 0, "w": 1 },
-                { "x": 8, "y": 0, "w": 1 },
-                { "x": 9, "y": 0, "w": 1 },
-                { "x": 10, "y": 0, "w": 1 },
-                { "x": 11, "y": 0, "w": 1 },
-                { "x": 12, "y": 0, "w": 1 },
-                { "x": 13, "y": 0, "w": 2 },
-                { "x": 15.25, "y": 0, "w": 1 },
-                { "x": 0, "y": 1, "w": 1.5 },
-                { "x": 1.5, "y": 1, "w": 1 },
-                { "x": 2.5, "y": 1, "w": 1 },
-                { "x": 3.5, "y": 1, "w": 1 },
-                { "x": 4.5, "y": 1, "w": 1 },
-                { "x": 5.5, "y": 1, "w": 1 },
-                { "x": 6.5, "y": 1, "w": 1 },
-                { "x": 7.5, "y": 1, "w": 1 },
-                { "x": 8.5, "y": 1, "w": 1 },
-                { "x": 9.5, "y": 1, "w": 1 },
-                { "x": 10.5, "y": 1, "w": 1 },
-                { "x": 11.5, "y": 1, "w": 1 },
-                { "x": 12.5, "y": 1, "w": 1 },
-                { "x": 15.25, "y": 1, "w": 1 },
-                { "x": 0, "y": 2, "w": 1.75 },
-                { "x": 1.75, "y": 2, "w": 1 },
-                { "x": 2.75, "y": 2, "w": 1 },
-                { "x": 3.75, "y": 2, "w": 1 },
-                { "x": 4.75, "y": 2, "w": 1 },
-                { "x": 5.75, "y": 2, "w": 1 },
-                { "x": 6.75, "y": 2, "w": 1 },
-                { "x": 7.75, "y": 2, "w": 1 },
-                { "x": 8.75, "y": 2, "w": 1 },
-                { "x": 9.75, "y": 2, "w": 1 },
-                { "x": 10.75, "y": 2, "w": 1 },
-                { "x": 11.75, "y": 2, "w": 1 },
-                { "x": 12.75, "y": 2, "w": 1 },
-                {
-                    "x": 13.75,
-                    "y": 1,
-                    "w": 1.25,
-                    "h": 2
-                },
-                { "x": 15.25, "y": 2, "w": 1 },
-                { "x": 0, "y": 3, "w": 1.25 },
-                { "x": 1.25, "y": 3, "w": 1 },
-                { "x": 2.25, "y": 3, "w": 1 },
-                { "x": 3.25, "y": 3, "w": 1 },
-                { "x": 4.25, "y": 3, "w": 1 },
-                { "x": 5.25, "y": 3, "w": 1 },
-                { "x": 6.25, "y": 3, "w": 1 },
-                { "x": 7.25, "y": 3, "w": 1 },
-                { "x": 8.25, "y": 3, "w": 1 },
-                { "x": 9.25, "y": 3, "w": 1 },
-                { "x": 10.25, "y": 3, "w": 1 },
-                { "x": 11.25, "y": 3, "w": 1 },
-                { "x": 12.25, "y": 3, "w": 1.75 },
-                { "x": 14.25, "y": 3.25, "w": 1 },
-                { "x": 0, "y": 4, "w": 1.25 },
-                { "x": 1.25, "y": 4, "w": 1.25 },
-                { "x": 2.5, "y": 4, "w": 1.25 },
-                { "x": 3.75, "y": 4, "w": 6.25 },
-                { "x": 10, "y": 4, "w": 1 },
-                { "x": 11, "y": 4, "w": 1 },
-                { "x": 12, "y": 4, "w": 1 },
-                { "x": 13.25, "y": 4.25, "w": 1 },
-                { "x": 14.25, "y": 4.25, "w": 1 },
-                { "x": 15.25, "y": 4.25, "w": 1 }
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Toggle RGB", "x":15.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":"RGB Mode +", "x":15.25, "y":1},
+
+                {"label":"Ctrl", "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":"Fn", "x":15.25, "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":1.75},
+                {"label":"\u2191", "x":14.25, "y":3.25},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Ctrl", "x":11, "y":4},
+                {"label":"`\u00ac", "x":12, "y":4},
+                {"label":"\u2190", "x":13.25, "y":4.25},
+                {"label":"\u2193", "x":14.25, "y":4.25},
+                {"label":"\u2192", "x":15.25, "y":4.25}
+            ]
+        },
+        "LAYOUT_iso_split_bs_space": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3\u00a3", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0},
+                {"label":"Toggle RGB", "x":15.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":"RGB Mode +", "x":15.25, "y":1},
+
+                {"label":"Ctrl", "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":"Fn", "x":15.25, "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":1.75},
+                {"label":"\u2191", "x":14.25, "y":3.25},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Space", "x":7.25, "y":4, "w":2.75},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Ctrl", "x":11, "y":4},
+                {"label":"`\u00ac", "x":12, "y":4},
+                {"label":"\u2190", "x":13.25, "y":4.25},
+                {"label":"\u2193", "x":14.25, "y":4.25},
+                {"label":"\u2192", "x":15.25, "y":4.25}
             ]
         }
     }
diff --git a/keyboards/boardsource/the_mark/keymaps/default/keymap.c b/keyboards/boardsource/the_mark/keymaps/default/keymap.c
index ead93baf55..148795b0c3 100644
--- a/keyboards/boardsource/the_mark/keymaps/default/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/default/keymap.c
@@ -21,24 +21,20 @@ enum layer_names {
     _FN
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, RGB_TOG, 
-		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, RGB_MOD, 
-		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  MO(_FN), 
-		KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   
-		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
-	),
-[_FN] = LAYOUT_all(
-  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_HOME,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_VOLD,    KC_VOLU,    KC_MUTE,    KC_END,
-  RESET,                  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
-  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
-)
-
-
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, RGB_TOG,
+        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, RGB_MOD,
+        KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  MO(_FN),
+        KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_all(
+        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_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+    )
 };
-
diff --git a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c
index 250ecf7669..4174e03603 100644
--- a/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/default_ansi/keymap.c
@@ -21,24 +21,20 @@ enum layer_names {
     _FN
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_ansi(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          RGB_TOG, 
-		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, RGB_MOD, 
-		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           MO(_FN), 
-		         KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
-	),
-[_FN] = LAYOUT_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_HOME,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_VOLD,  KC_VOLU,  _______,        KC_END,
-  RESET,                  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,  KC_MUTE,                  _______,
-              _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,            _______,    
-  _______,    _______,    _______,                                        _______,                                        _______,    _______,    _______,  _______,  _______,    _______
-)
-
-
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          RGB_TOG,
+        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, RGB_MOD,
+        KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           MO(_FN),
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_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_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, _______, KC_END,
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    )
 };
-
diff --git a/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c
new file mode 100644
index 0000000000..d59378c78f
--- /dev/null
+++ b/keyboards/boardsource/the_mark/keymaps/default_ansi_split_bs_space/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2020 Boardsource
+ *           2022 QMK / James Young (@noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_ansi_split_bs_space(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, RGB_TOG,
+        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, RGB_MOD,
+        KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           MO(_FN),
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_ansi_split_bs_space(
+        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_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, _______, KC_END,
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c
index 6aeace190a..347bc19a35 100644
--- a/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/default_iso/keymap.c
@@ -21,24 +21,20 @@ enum layer_names {
     _FN
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_iso(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          RGB_TOG, 
-		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,          RGB_MOD, 
-		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  MO(_FN), 
-		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   
-		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
-	),
-[_FN] = LAYOUT_iso(
-  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_HOME,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,  KC_VOLD,  KC_VOLU,                  KC_END,
-  RESET,                  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,KC_MUTE,     _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,             _______,    
-  _______,    _______,    _______,                                        _______,                                        _______,    _______,    _______,    _______,  _______,    _______
-)
-
-
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          RGB_TOG,
+        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,          RGB_MOD,
+        KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  MO(_FN),
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_iso(
+        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_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU,          KC_END,
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+    )
 };
-
diff --git a/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c b/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c
new file mode 100644
index 0000000000..617ee540d1
--- /dev/null
+++ b/keyboards/boardsource/the_mark/keymaps/default_iso_split_bs_space/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2020 Boardsource
+ *           2022 QMK / James Young (@noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_iso_split_bs_space(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, RGB_TOG,
+        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,          RGB_MOD,
+        KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  MO(_FN),
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_iso_split_bs_space(
+        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_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU,          KC_END,
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/boardsource/the_mark/keymaps/via/keymap.c b/keyboards/boardsource/the_mark/keymaps/via/keymap.c
index 2b0477f39f..1d2a97b756 100644
--- a/keyboards/boardsource/the_mark/keymaps/via/keymap.c
+++ b/keyboards/boardsource/the_mark/keymaps/via/keymap.c
@@ -15,40 +15,34 @@
  */
 #include QMK_KEYBOARD_H
 
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    LAYOUT_all(
-		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, RGB_TOG, 
-		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_PGDN, 
-		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP, 
-		KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   
+    [0] = LAYOUT_all(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, RGB_TOG,
+		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_PGDN,
+		KC_LCTL,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+		KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,
 		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           KC_LALT, KC_LCTL, KC_GRV,  KC_LEFT, KC_DOWN, KC_RGHT
 	),
-LAYOUT_all(
-  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_HOME,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    KC_MPLY,    KC_VOLD,    KC_VOLU,    KC_MUTE,    KC_END,
-  RESET,                  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
-  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
-),
-LAYOUT_all(
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
-  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
-),
-LAYOUT_all(
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,
-  _______,                _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    _______,
-  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,                _______,    
-  _______,    _______,    _______,                _______,                _______,                _______,                _______,    _______,    _______,    _______,    _______,    _______
-)
-
-
-
+    [1] = LAYOUT_all(
+        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_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,          _______,          _______,          _______,          _______, _______, _______, _______, _______, _______
+    ),
 };
-
diff --git a/keyboards/boardsource/the_mark/the_mark.h b/keyboards/boardsource/the_mark/the_mark.h
index 9d527f9467..163d5c256c 100644
--- a/keyboards/boardsource/the_mark/the_mark.h
+++ b/keyboards/boardsource/the_mark/the_mark.h
@@ -18,54 +18,92 @@
 
 #include "quantum.h"
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
+#define ___ KC_NO
+
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐    ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E ││0F │    │0D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤    └─┬─────┤
+ *              │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   ││1F │      │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤   ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      ││2F │   │1E │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘└───┘   └───┴────┘
+ * │31      │   │31  │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │┌───┐
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┘│3E │
+ *              │40  │41  │43  │44      │46  │48        │4A │4B │4C │┌───┼───┼───┐
+ *              └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┘│4D │4E │4F │
+ *                                                                   └───┴───┴───┘
+ *                             ┌────────────────────────┬─────┬─────┐
+ *                 6.25u Space │46                      │4A   │4B   │ RWKL
+ *                             └────────────────────────┴─────┴─────┘
  */
+
 #define LAYOUT_all( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314,       \
-	K400, K401,       K403, K404,       K406,       K408,       K410, K411, K412, K413, K414, K415  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2D, K2F, \
+    K31, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,      \
+    K40, K41,      K43, K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F  \
 ) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-	{ K301,  K300,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  KC_NO}, \
-	{ K400,  K401,  KC_NO, K403,  K404,  KC_NO, K406,  KC_NO, K408,  KC_NO, K410,  K411,  K412,  K413,  K414,  K415 }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
+    { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F }  \
 }
 
 #define LAYOUT_ansi( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, \
-	K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314,       \
-	K400, K401,       K403,             K406,                   K410, K411, K412, K413, K414, K415  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2D, K2F, \
+    K31,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,      \
+    K40, K41,      K43,           K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
 ) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-	{ KC_NO, K300,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  KC_NO}, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  K414,  K415 }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
+    { ___, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
+    { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, K4F }  \
 }
 
+#define LAYOUT_ansi_split_bs_space( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2D, K2F, \
+    K31,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,      \
+    K40, K41,      K43, K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
+    { ___, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
+    { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F }  \
+}
 
 #define LAYOUT_iso( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
-	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
-	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K114, K213, K215, \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314,       \
-	K400, K401,       K403,             K406,                   K410, K411, K412, K413, K414, K415  \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
+    K31, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,      \
+    K40, K41,      K43,           K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
 ) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  KC_NO, K015 }, \
-	{ K100,  KC_NO, K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
-	{ K200,  KC_NO, K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215 }, \
-	{ K301,  K300,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  KC_NO}, \
-	{ K400,  K401,  KC_NO, K403,  KC_NO, KC_NO, K406,  KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413,  K414,  K415 }  \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
+    { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E, K4F }  \
 }
 
+#define LAYOUT_iso_split_bs_space( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1E, K2D, K2F, \
+    K31, K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,      \
+    K40, K41,      K43, K44,      K46,      K48,      K4A, K4B, K4C, K4D, K4E, K4F  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
+    { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, ___ }, \
+    { K40, K41, ___, K43, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D, K4E, K4F }  \
+}

From e26778ceb572f3aa6cff7cc08479663899c32a92 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 7 Feb 2022 20:12:59 -0800
Subject: [PATCH 559/867] LFKeyboards Mini1800: refactor into revisions
 (#16260)

* fork Mini1800 into reva and revc versions

* update info.json

- apply friendly formatting
- update maintainer value

* update keymap rules.mk formatting

- align inline comments
- convert tabs to spaces

* align keymap rules.mk files to QMK template

* move common keymap rules.mk settings to revision level

* info.json: correct key sequence

* align revision rules.mk files to QMK template

* clean up revision rules.mk files

* add readme files for each revision

* correct USB Product string

* remove post_rules.mk files

The internal settings were commented out, so the files actually don't do anything.

* edit Bootloader instructions on main readme

* move non-assignment rules to post_rules.mk

* add inline comments for NKRO_ENABLE per fauxpark
---
 keyboards/lfkeyboards/mini1800/config.h       |  2 +-
 keyboards/lfkeyboards/mini1800/info.json      | 91 ++++++++++++++++++-
 .../mini1800/keymaps/ca178858/rules.mk        | 44 ---------
 .../mini1800/keymaps/default/rules.mk         | 40 --------
 keyboards/lfkeyboards/mini1800/post_rules.mk  |  9 --
 keyboards/lfkeyboards/mini1800/readme.md      | 28 ++++--
 .../lfkeyboards/mini1800/reva/post_rules.mk   |  7 ++
 keyboards/lfkeyboards/mini1800/reva/readme.md | 22 +++++
 keyboards/lfkeyboards/mini1800/reva/rules.mk  | 29 ++++++
 .../lfkeyboards/mini1800/revc/post_rules.mk   |  7 ++
 keyboards/lfkeyboards/mini1800/revc/readme.md | 24 +++++
 keyboards/lfkeyboards/mini1800/revc/rules.mk  | 29 ++++++
 keyboards/lfkeyboards/mini1800/rules.mk       | 19 ----
 13 files changed, 229 insertions(+), 122 deletions(-)
 delete mode 100644 keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk
 delete mode 100644 keyboards/lfkeyboards/mini1800/post_rules.mk
 create mode 100644 keyboards/lfkeyboards/mini1800/reva/post_rules.mk
 create mode 100644 keyboards/lfkeyboards/mini1800/reva/readme.md
 create mode 100644 keyboards/lfkeyboards/mini1800/reva/rules.mk
 create mode 100644 keyboards/lfkeyboards/mini1800/revc/post_rules.mk
 create mode 100644 keyboards/lfkeyboards/mini1800/revc/readme.md
 create mode 100644 keyboards/lfkeyboards/mini1800/revc/rules.mk
 delete mode 100644 keyboards/lfkeyboards/mini1800/rules.mk

diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h
index 1504a95cb4..7c81c9f98c 100644
--- a/keyboards/lfkeyboards/mini1800/config.h
+++ b/keyboards/lfkeyboards/mini1800/config.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    LFKeyboards
-#define PRODUCT         LFK87
+#define PRODUCT         Mini1800
 
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/lfkeyboards/mini1800/info.json b/keyboards/lfkeyboards/mini1800/info.json
index 5d2662b877..0625ee43d4 100644
--- a/keyboards/lfkeyboards/mini1800/info.json
+++ b/keyboards/lfkeyboards/mini1800/info.json
@@ -1,10 +1,97 @@
 {
     "keyboard_name": "Mini1800",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "lfkeyboards",
     "layouts": {
         "LAYOUT": {
-            "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":"Back Space", "x":13, "y":0, "w":2}, {"label":"Num Lock", "x":15.5, "y":0}, {"label":"/", "x":16.5, "y":0}, {"label":"*", "x":17.5, "y":0}, {"label":"-", "x":18.5, "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":"7", "x":15.5, "y":1}, {"label":"8", "x":16.5, "y":1}, {"label":"9", "x":17.5, "y":1}, {"label":"+", "x":18.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.25}, {"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":"4", "x":15.5, "y":2}, {"label":"5", "x":16.5, "y":2}, {"label":"6", "x":17.5, "y":2}, {"label":"+", "x":18.5, "y":2}, {"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":1.75}, {"label":"1", "x":15.5, "y":3}, {"label":"2", "x":16.5, "y":3}, {"label":"3", "x":17.5, "y":3}, {"label":"Enter", "x":18.5, "y":3, "h":2}, {"label":"\u2191", "x":14.25, "y":3.25}, {"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":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"0", "x":16.5, "y":4}, {"label":".", "x":17.5, "y":4}, {"label":"\u2190", "x":13.25, "y":4.25}, {"label":"\u2193", "x":14.25, "y":4.25}, {"label":"\u2192", "x":15.25, "y":4.25}]
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "x":10, "y":0},
+                {"label":"-_", "x":11, "y":0},
+                {"label":"=+", "x":12, "y":0},
+                {"label":"Back Space", "x":13, "y":0, "w":2},
+                {"label":"Num Lock", "x":15.5, "y":0},
+                {"label":"/", "x":16.5, "y":0},
+                {"label":"*", "x":17.5, "y":0},
+                {"label":"-", "x":18.5, "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":"7", "x":15.5, "y":1},
+                {"label":"8", "x":16.5, "y":1},
+                {"label":"9", "x":17.5, "y":1},
+                {"label":"+", "x":18.5, "y":1},
+
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.25},
+                {"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":"4", "x":15.5, "y":2},
+                {"label":"5", "x":16.5, "y":2},
+                {"label":"6", "x":17.5, "y":2},
+                {"label":"+", "x":18.5, "y":2},
+
+                {"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":1.75},
+                {"label":"\u2191", "x":14.25, "y":3.25},
+                {"label":"1", "x":15.5, "y":3},
+                {"label":"2", "x":16.5, "y":3},
+                {"label":"3", "x":17.5, "y":3},
+                {"label":"Enter", "x":18.5, "y":3, "h":2},
+
+                {"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},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Fn", "x":11, "y":4},
+                {"label":"Ctrl", "x":12, "y":4},
+                {"label":"\u2190", "x":13.25, "y":4.25},
+                {"label":"\u2193", "x":14.25, "y":4.25},
+                {"label":"\u2192", "x":15.25, "y":4.25},
+                {"label":"0", "x":16.5, "y":4},
+                {"label":".", "x":17.5, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk
index 60cf911c00..e5ddcae8d9 100644
--- a/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk
+++ b/keyboards/lfkeyboards/mini1800/keymaps/ca178858/rules.mk
@@ -1,45 +1 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no            # 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
-NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = yes           # Enable keyboard backlight functionality
-MIDI_ENABLE = no                # MIDI controls
-AUDIO_ENABLE = yes              # Audio output on port C6
-UNICODE_ENABLE = no             # Unicode
-BLUETOOTH_ENABLE = no           # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes           # Enable RGB underlight
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
-SLEEP_LED_ENABLE = yes
 TAP_DANCE_ENABLE = yes
-
-ISSI_ENABLE = yes			# If the I2C pullup resistors aren't install this must be disabled
-WATCHDOG_ENABLE = yes		# Resets keyboard if matrix_scan isn't run every 250ms
-
-
-
-ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
-endif
-
-ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
-endif
-
-
-# # Set the LFK78 hardware version. This is defined in rules.mk, but can be overidden here if desired
-# #
-# # RevB - first public release, uses atmega32u4, has audio, ISSI matrix split between RGB and backlight
-# # RevC/D - at90usb1286, no audio, ISSI device 0 is backlight, 4 is RGB
-# #
-# # Set to B, C or D
-# LFK_REV = D
-
-# ifeq ($(LFK_REV), B)
-# 	MCU = atmega32u4
-# else
-# 	MCU = at90usb1286
-# endif
-# OPT_DEFS += -DLFK_REV_$(LFK_REV)
-# OPT_DEFS += -DUSB_PRODUCT=\"LFK_Rev$(LFK_REV)\"
diff --git a/keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk b/keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk
deleted file mode 100644
index 4b9182a0a2..0000000000
--- a/keyboards/lfkeyboards/mini1800/keymaps/default/rules.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no            # Mouse keys
-EXTRAKEY_ENABLE = yes           # Audio control and System control
-CONSOLE_ENABLE = no             # Console for debug
-COMMAND_ENABLE = no             # Commands for debug and configuration
-NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = yes           # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes              # Audio output
-RGBLIGHT_ENABLE = yes           # Enable RGB underlight
-RGBLIGHT_CUSTOM_DRIVER = yes    # RGB code is implemented in lefkeyboards, not WS2812
-SLEEP_LED_ENABLE = yes
-
-ISSI_ENABLE = yes			# If the I2C pullup resistors aren't install this must be disabled
-WATCHDOG_ENABLE = yes		# Resets keyboard if matrix_scan isn't run every 250ms
-
-
-ifeq ($(strip $(ISSI_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DISSI_ENABLE
-endif
-
-ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
-endif
-
-
-# # Set the LFK78 hardware version. This is defined in rules.mk, but can be overidden here if desired
-# #
-# # RevB - first public release, uses atmega32u4, has audio, ISSI matrix split between RGB and backlight
-# # RevC/D - at90usb1286, no audio, ISSI device 0 is backlight, 4 is RGB
-# #
-# # Set to B, C or D
-# LFK_REV = D
-
-# ifeq ($(LFK_REV), B)
-# 	MCU = atmega32u4
-# else
-# 	MCU = at90usb1286
-# endif
-# OPT_DEFS += -DLFK_REV_$(LFK_REV)
-# OPT_DEFS += -DUSB_PRODUCT=\"LFK_Rev$(LFK_REV)\"
diff --git a/keyboards/lfkeyboards/mini1800/post_rules.mk b/keyboards/lfkeyboards/mini1800/post_rules.mk
deleted file mode 100644
index f04e10e4a3..0000000000
--- a/keyboards/lfkeyboards/mini1800/post_rules.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-ifeq ($(LFK_REV), A)
-    MCU = at90usb1286
-else
-    MCU = at90usb646
-endif
-
-ifeq ($(strip $(ISSI_ENABLE)), yes)
-    # TMK_COMMON_DEFS += -DISSI_ENABLE
-endif
diff --git a/keyboards/lfkeyboards/mini1800/readme.md b/keyboards/lfkeyboards/mini1800/readme.md
index e2839275cc..4e35ac537e 100644
--- a/keyboards/lfkeyboards/mini1800/readme.md
+++ b/keyboards/lfkeyboards/mini1800/readme.md
@@ -1,12 +1,26 @@
-Mini1800
-===
+# Mini1800
 
-Keyboard Maintainer: [LFKeyboards](https://github.com/lfkeyboards)  
-Hardware Supported: Mini1800  
-Hardware Availability: [LFKeyboards.com](https://www.lfkeyboards.com/)
+* Keyboard Maintainer: [LFKeyboards](https://github.com/lfkeyboards)
+* Hardware Supported:
+  * [Mini1800 RevA](reva/) - Green PCB with AT90USB1286
+  * [Mini1800 RevC](revc/) - Black PCB with AT90USB646; first public release
+* Hardware Availability: [LFKeyboards.com](https://www.lfkeyboards.com/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make lfkeyboards/mini1800:default
+    make lfkeyboards/mini1800/reva:default
+    make lfkeyboards/mini1800/revc:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. 
+Flashing example for this keyboard:
+
+    make lfkeyboards/mini1800/reva:default:flash
+    make lfkeyboards/mini1800/revc:default:flash
+
+## Bootloader
+
+To reset the board into bootloader mode, do one of the following:
+
+* **Physical reset button**: Briefly press the button on the bottom of the PCB (between Q and W keys)
+* **Keycode in keymap**: Press the key mapped to `RESET` if it is available (`Fn`+`Right Shift`, then tap `Enter` by 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).
diff --git a/keyboards/lfkeyboards/mini1800/reva/post_rules.mk b/keyboards/lfkeyboards/mini1800/reva/post_rules.mk
new file mode 100644
index 0000000000..ad997587b2
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/reva/post_rules.mk
@@ -0,0 +1,7 @@
+ifeq ($(strip $(ISSI_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DISSI_ENABLE
+endif
+
+ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
+endif
diff --git a/keyboards/lfkeyboards/mini1800/reva/readme.md b/keyboards/lfkeyboards/mini1800/reva/readme.md
new file mode 100644
index 0000000000..8460bb5326
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/reva/readme.md
@@ -0,0 +1,22 @@
+# Mini1800 RevA
+
+* Keyboard Maintainer: [LFKeyboards](https://github.com/lfkeyboards)
+* Hardware Supported: Mini1800 RevA (Green PCB with AT90USB1286)
+* Hardware Availability: [LFKeyboards.com](https://www.lfkeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make lfkeyboards/mini1800/reva:default
+
+Flashing example for this keyboard:
+
+    make lfkeyboards/mini1800/reva:default:flash
+
+## Bootloader
+
+To reset the board into bootloader mode, do one of the following:
+
+* **Physical reset button**: Briefly press the button on the bottom of the PCB (between Q and W keys)
+* **Keycode in keymap**: Press the key mapped to `RESET` if it is available (`Fn`+`Right Shift`, then tap `Enter` by 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).
diff --git a/keyboards/lfkeyboards/mini1800/reva/rules.mk b/keyboards/lfkeyboards/mini1800/reva/rules.mk
new file mode 100644
index 0000000000..1f67c5f199
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/reva/rules.mk
@@ -0,0 +1,29 @@
+# MCU name
+MCU = at90usb1286
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = yes          # Audio output
+
+# RGB code is implemented in lfkeyboards, not WS2812
+RGBLIGHT_CUSTOM_DRIVER = yes
+BACKLIGHT_DRIVER = custom
+SLEEP_LED_ENABLE = yes
+
+ISSI_ENABLE = yes           # If the I2C pullup resistors aren't install this must be disabled
+WATCHDOG_ENABLE = yes       # Resets keyboard if matrix_scan isn't run every 250ms
+
+# Extra source files for IS3731 lighting
+SRC = TWIlib.c issi.c lighting.c
diff --git a/keyboards/lfkeyboards/mini1800/revc/post_rules.mk b/keyboards/lfkeyboards/mini1800/revc/post_rules.mk
new file mode 100644
index 0000000000..ad997587b2
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/revc/post_rules.mk
@@ -0,0 +1,7 @@
+ifeq ($(strip $(ISSI_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DISSI_ENABLE
+endif
+
+ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
+    TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
+endif
diff --git a/keyboards/lfkeyboards/mini1800/revc/readme.md b/keyboards/lfkeyboards/mini1800/revc/readme.md
new file mode 100644
index 0000000000..5d442cb6d9
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/revc/readme.md
@@ -0,0 +1,24 @@
+# Mini1800 RevC
+
+The first public release of the Mini1800.
+
+* Keyboard Maintainer: [LFKeyboards](https://github.com/lfkeyboards)
+* Hardware Supported: Mini1800 RevC (Black PCB with AT90USB646)
+* Hardware Availability: [LFKeyboards.com](https://www.lfkeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make lfkeyboards/mini1800/revc:default
+
+Flashing example for this keyboard:
+
+    make lfkeyboards/mini1800/revc:default:flash
+
+## Bootloader
+
+To reset the board into bootloader mode, do one of the following:
+
+* **Physical reset button**: Briefly press the button on the bottom of the PCB (between Q and W keys)
+* **Keycode in keymap**: Press the key mapped to `RESET` if it is available (`Fn`+`Right Shift`, then tap `Enter` by 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).
diff --git a/keyboards/lfkeyboards/mini1800/revc/rules.mk b/keyboards/lfkeyboards/mini1800/revc/rules.mk
new file mode 100644
index 0000000000..0ea69b6d6f
--- /dev/null
+++ b/keyboards/lfkeyboards/mini1800/revc/rules.mk
@@ -0,0 +1,29 @@
+# MCU name
+MCU = at90usb646
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = yes          # Audio output
+
+# RGB code is implemented in lfkeyboards, not WS2812
+RGBLIGHT_CUSTOM_DRIVER = yes
+BACKLIGHT_DRIVER = custom
+SLEEP_LED_ENABLE = yes
+
+ISSI_ENABLE = yes           # If the I2C pullup resistors aren't install this must be disabled
+WATCHDOG_ENABLE = yes       # Resets keyboard if matrix_scan isn't run every 250ms
+
+# Extra source files for IS3731 lighting
+SRC = TWIlib.c issi.c lighting.c
diff --git a/keyboards/lfkeyboards/mini1800/rules.mk b/keyboards/lfkeyboards/mini1800/rules.mk
deleted file mode 100644
index c9a9b01054..0000000000
--- a/keyboards/lfkeyboards/mini1800/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Set the LFK87 hardware version.
-#
-# RevA - Green PCB. at90usb1286 Only 3 exist
-# RevB - We don't talk about RevB
-# RevC - Black PCB. at90usb646 First public release
-#
-# Set to A or C
-LFK_REV = C
-
-BOOTLOADER = atmel-dfu
-OPT_DEFS += -DLFK_TKL_REV_$(LFK_REV)
-
-# Extra source files for IS3731 lighting
-SRC = TWIlib.c issi.c lighting.c
-
-# Build Options
-#   change yes to no to disable
-#
-BACKLIGHT_DRIVER = custom

From a239051c4a4779767059140892144dedea09aaf2 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 9 Feb 2022 03:25:55 +1100
Subject: [PATCH 560/867] Misc size regression script improvements. (#16268)

* Misc size regression script improvements.

- Sets environment variable SIZE_REGRESSION_EXECUTING during execution
  so hook scripts like `post-checkout` may skip processing.
- Forces checkout of the target branch, including removal of all
  temporary object files in the process.
- Prints out a warning on exit stating that the git repository is in an
  indeterminate state, and the user needs to swap back to whatever
  intended branch they were working with originally.

* Remove `git clean`
---
 util/size_regression.sh | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/util/size_regression.sh b/util/size_regression.sh
index 988d1d9b5b..d474d8d0d5 100755
--- a/util/size_regression.sh
+++ b/util/size_regression.sh
@@ -11,6 +11,8 @@ dest_ref="develop"
 ignore_ref="master"
 unset skip_zero
 
+export SIZE_REGRESSION_EXECUTING=1
+
 function usage() {
     echo "Usage: $(basename "$0") [-h] [-j <jobs>] [-s <source>] [-d <dest>] [-n] planck/rev6:default"
     echo "    -h           : Shows this usage page."
@@ -23,9 +25,24 @@ function usage() {
 }
 
 if [[ ${#} -eq 0 ]]; then
-   usage
+    usage
+    exit 0
 fi
 
+unset cleanup_completed
+_internal_cleanup() {
+    if [[ -z "${cleanup_completed:-}" ]] ; then
+        echo
+        echo
+        echo 'Your git repository is in an indeterminate state!' >&2
+        echo 'Make sure you swap to your intended branch.' >&2
+        echo
+        unset SIZE_REGRESSION_EXECUTING
+    fi
+    cleanup_completed=1
+}
+trap _internal_cleanup EXIT HUP INT
+
 while getopts "hj:s:d:i:n" opt "$@" ; do
     case "$opt" in
         h) usage; exit 0;;
@@ -49,7 +66,8 @@ function build_executor() {
         revision=$(echo $line | cut -d' ' -f1)
 
         make distclean >/dev/null 2>&1
-        git checkout $revision >/dev/null 2>&1 || { echo "Failed to check out revision ${revision}" >&2 ; exit 1 ; }
+
+        git checkout -f $revision >/dev/null 2>&1 || { echo "Failed to check out revision ${revision}" >&2 ; exit 1 ; }
         make -j${job_count} $keyboard_target >/dev/null 2>&1 || true
         file_size=$(arm-none-eabi-size .build/*.elf 2>/dev/null | awk '/elf/ {print $1}' 2>/dev/null || true)
 

From 2e279f1b889a59156f30524cc83358f64ee53287 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 8 Feb 2022 19:03:30 +0000
Subject: [PATCH 561/867] Initial pass at data driven new-keyboard subcommand
 (#12795)

* Initial pass at a data driven keyboard subcommand

* format

* lint

* Handle bootloader now its mandatory
---
 data/templates/avr/config.h                   | 134 --------
 data/templates/avr/rules.mk                   |  18 --
 data/templates/base/%(KEYBOARD)s.c            |   4 -
 data/templates/base/%(KEYBOARD)s.h            |  22 --
 data/templates/base/info.json                 |  17 -
 data/templates/base/keymaps/default/keymap.c  |  22 --
 data/templates/base/keymaps/default/readme.md |   1 -
 data/templates/keyboard/info.json             |  24 ++
 data/templates/{avr => keyboard}/readme.md    |  10 +-
 data/templates/keyboard/rules.mk              |   1 +
 data/templates/ps2avrgb/config.h              | 124 -------
 data/templates/ps2avrgb/readme.md             |  28 --
 data/templates/ps2avrgb/rules.mk              |  17 -
 docs/cli_commands.md                          |   2 +-
 lib/python/qmk/cli/new/keyboard.py            | 303 ++++++++++++------
 lib/python/qmk/path.py                        |   2 +-
 util/new_keyboard.sh                          | 181 -----------
 util/new_keymap.sh                            |  40 ---
 18 files changed, 242 insertions(+), 708 deletions(-)
 delete mode 100644 data/templates/avr/config.h
 delete mode 100644 data/templates/avr/rules.mk
 delete mode 100644 data/templates/base/%(KEYBOARD)s.c
 delete mode 100644 data/templates/base/%(KEYBOARD)s.h
 delete mode 100644 data/templates/base/info.json
 delete mode 100644 data/templates/base/keymaps/default/keymap.c
 delete mode 100644 data/templates/base/keymaps/default/readme.md
 create mode 100644 data/templates/keyboard/info.json
 rename data/templates/{avr => keyboard}/readme.md (82%)
 create mode 100644 data/templates/keyboard/rules.mk
 delete mode 100644 data/templates/ps2avrgb/config.h
 delete mode 100644 data/templates/ps2avrgb/readme.md
 delete mode 100644 data/templates/ps2avrgb/rules.mk
 delete mode 100755 util/new_keyboard.sh
 delete mode 100755 util/new_keymap.sh

diff --git a/data/templates/avr/config.h b/data/templates/avr/config.h
deleted file mode 100644
index 97f7bb6fad..0000000000
--- a/data/templates/avr/config.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright %(YEAR)s %(YOUR_NAME)s (@%(USER_NAME)s)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0xFEED
-#define PRODUCT_ID   0x0000
-#define DEVICE_VER   0x0001
-#define MANUFACTURER %(USER_NAME)s
-#define PRODUCT      %(KEYBOARD)s
-
-/* key matrix size */
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-
-/*
- * 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 { D0, D5 }
-#define MATRIX_COL_PINS { F1, F0, B0 }
-#define UNUSED_PINS
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
-
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
-
-//#define BACKLIGHT_PIN B7
-//#define BACKLIGHT_LEVELS 3
-//#define BACKLIGHT_BREATHING
-
-//#define RGB_DI_PIN E2
-//#ifdef RGB_DI_PIN
-//#    define RGBLED_NUM 16
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose 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
-/*== customize breathing effect ==*/
-/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-/*==== use exp() and sin() ====*/
-//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-//#endif
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* 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
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-//#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/data/templates/avr/rules.mk b/data/templates/avr/rules.mk
deleted file mode 100644
index 1275531ef6..0000000000
--- a/data/templates/avr/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-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
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
diff --git a/data/templates/base/%(KEYBOARD)s.c b/data/templates/base/%(KEYBOARD)s.c
deleted file mode 100644
index 0c509aff65..0000000000
--- a/data/templates/base/%(KEYBOARD)s.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright %(YEAR)s %(YOUR_NAME)s (@%(USER_NAME)s)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "%(KEYBOARD)s.h"
diff --git a/data/templates/base/%(KEYBOARD)s.h b/data/templates/base/%(KEYBOARD)s.h
deleted file mode 100644
index 3e8ca3912d..0000000000
--- a/data/templates/base/%(KEYBOARD)s.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright %(YEAR)s %(YOUR_NAME)s (@%(USER_NAME)s)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-    k00, k01, k02, \
-      k10,  k12    \
-) { \
-    { k00, k01,   k02 }, \
-    { k10, KC_NO, k12 }  \
-}
diff --git a/data/templates/base/info.json b/data/templates/base/info.json
deleted file mode 100644
index a50ccba7bf..0000000000
--- a/data/templates/base/info.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "keyboard_name": "%(KEYBOARD)s",
-    "url": "",
-    "maintainer": "%(USER_NAME)s",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label": "k00", "x": 0, "y": 0},
-                {"label": "k01", "x": 1, "y": 0},
-                {"label": "k02", "x": 2, "y": 0},
-
-                {"label": "k10", "x": 0, "y": 1, "w": 1.5},
-                {"label": "k12", "x": 1.5, "y": 1, "w": 1.5}
-            ]
-        }
-    }
-}
diff --git a/data/templates/base/keymaps/default/keymap.c b/data/templates/base/keymaps/default/keymap.c
deleted file mode 100644
index 3fec3d5120..0000000000
--- a/data/templates/base/keymaps/default/keymap.c
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright %(YEAR)s %(YOUR_NAME)s (@%(USER_NAME)s)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include QMK_KEYBOARD_H
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _FN
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT(
-        KC_A,    KC_1,    MO(_FN),
-            KC_TAB,   KC_SPC
-    ),
-    [_FN] = LAYOUT(
-        _______, _______,  _______,
-            RESET,    XXXXXXX
-    )
-};
diff --git a/data/templates/base/keymaps/default/readme.md b/data/templates/base/keymaps/default/readme.md
deleted file mode 100644
index 63a0643275..0000000000
--- a/data/templates/base/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for %(KEYBOARD)s
diff --git a/data/templates/keyboard/info.json b/data/templates/keyboard/info.json
new file mode 100644
index 0000000000..92718faf3a
--- /dev/null
+++ b/data/templates/keyboard/info.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "%KEYBOARD%",
+    "maintainer": "%USER_NAME%",
+    "processor": "%MCU%",
+    "bootloader": "%BOOTLOADER%",
+    "diode_direction": "COL2ROW",
+    "matrix_pins": {
+        "cols": ["C2"],
+        "rows": ["D1"]
+    },
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_ver": "0x0001"
+    },
+    "features": {
+        "bootmagic_lite": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    }
+}
\ No newline at end of file
diff --git a/data/templates/avr/readme.md b/data/templates/keyboard/readme.md
similarity index 82%
rename from data/templates/avr/readme.md
rename to data/templates/keyboard/readme.md
index 207850e065..ca703c53f0 100644
--- a/data/templates/avr/readme.md
+++ b/data/templates/keyboard/readme.md
@@ -1,20 +1,20 @@
-# %(KEYBOARD)s
+# %KEYBOARD%
 
-![%(KEYBOARD)s](imgur.com image replace me!)
+![%KEYBOARD%](imgur.com image replace me!)
 
 *A short description of the keyboard/project*
 
-* Keyboard Maintainer: [%(YOUR_NAME)s](https://github.com/%(USER_NAME)s)
+* Keyboard Maintainer: [%REAL_NAME%](https://github.com/%USER_NAME%)
 * Hardware Supported: *The PCBs, controllers supported*
 * Hardware Availability: *Links to where you can find this hardware*
 
 Make example for this keyboard (after setting up your build environment):
 
-    make %(KEYBOARD)s:default
+    make %KEYBOARD%:default
 
 Flashing example for this keyboard:
 
-    make %(KEYBOARD)s:default:flash
+    make %KEYBOARD%:default:flash
 
 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).
 
diff --git a/data/templates/keyboard/rules.mk b/data/templates/keyboard/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/data/templates/keyboard/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/data/templates/ps2avrgb/config.h b/data/templates/ps2avrgb/config.h
deleted file mode 100644
index ef29da0de0..0000000000
--- a/data/templates/ps2avrgb/config.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright %(YEAR)s %(YOUR_NAME)s (@%(USER_NAME)s)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0xFEED
-#define PRODUCT_ID   0x0000
-#define DEVICE_VER   0x0001
-#define MANUFACTURER %(USER_NAME)s
-#define PRODUCT      %(KEYBOARD)s
-
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 15
-
-/*
- * 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 { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7 }
-#define UNUSED_PINS
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-//#define LED_NUM_LOCK_PIN D0
-//#define LED_CAPS_LOCK_PIN D1
-//#define LED_SCROLL_LOCK_PIN D6
-
-#define BACKLIGHT_PIN D4
-//#define BACKLIGHT_LEVELS 3
-//#define BACKLIGHT_BREATHING
-
-#define RGBLED_NUM 16
-//#define RGBLIGHT_HUE_STEP 8
-//#define RGBLIGHT_SAT_STEP 8
-//#define RGBLIGHT_VAL_STEP 8
-//#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#define RGBLIGHT_ANIMATIONS
-/*== or choose 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
-/*== customize breathing effect ==*/
-/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//#define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-/*==== use exp() and sin() ====*/
-//#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//#define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* 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
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-/* Bootmagic Lite key configuration */
-//#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/data/templates/ps2avrgb/readme.md b/data/templates/ps2avrgb/readme.md
deleted file mode 100644
index a2ac4495b6..0000000000
--- a/data/templates/ps2avrgb/readme.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# %(KEYBOARD)s
-
-![%(KEYBOARD)s](imgur.com image replace me!)
-
-*A short description of the keyboard/project*
-
-* Keyboard Maintainer: [%(YOUR_NAME)s](https://github.com/yourusername)
-* Hardware Supported: *The PCBs, controllers supported*
-* Hardware Availability: *Links to where you can find this hardware*
-
-Make example for this keyboard (after setting up your build environment):
-
-    make %(KEYBOARD)s:default
-
-Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
-
-    make %(KEYBOARD)s:default:flash
-
-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).
-
-## Bootloader
-
-Enter the bootloader in 3 ways:
-
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
-* **BootloadHID reset**: Hold down the key connected to the `A0` and `B0` pins on the MCU if it is known (often top left or bottom left) and plug in the keyboard
-* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/data/templates/ps2avrgb/rules.mk b/data/templates/ps2avrgb/rules.mk
deleted file mode 100644
index 1bbfa8fa0e..0000000000
--- a/data/templates/ps2avrgb/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# MCU name
-MCU = atmega32a
-
-# Bootloader selection
-BOOTLOADER = bootloadhid
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-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
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-WS2812_DRIVER = i2c
diff --git a/docs/cli_commands.md b/docs/cli_commands.md
index dfbd4c6a28..93af906b8a 100644
--- a/docs/cli_commands.md
+++ b/docs/cli_commands.md
@@ -310,7 +310,7 @@ Any arguments that are not provided will prompt for input. If `-u` is not passed
 **Usage**:
 
 ```
-qmk new-keyboard [-kb KEYBOARD] [-t {avr,ps2avrgb}] -u USERNAME
+qmk new-keyboard [-kb KEYBOARD] [-t {atmega32u4,STM32F303,etc}] [-l {60_ansi,75_iso,etc}] -u USERNAME
 ```
 
 ## `qmk new-keymap`
diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py
index 4093b8c90d..59e781a932 100644
--- a/lib/python/qmk/cli/new/keyboard.py
+++ b/lib/python/qmk/cli/new/keyboard.py
@@ -1,15 +1,82 @@
 """This script automates the creation of new keyboard directories using a starter template.
 """
+import re
+import json
+import shutil
 from datetime import date
 from pathlib import Path
-import re
+from dotty_dict import dotty
 
-from qmk.commands import git_get_username
-import qmk.path
 from milc import cli
 from milc.questions import choice, question
 
-KEYBOARD_TYPES = ['avr', 'ps2avrgb']
+from qmk.commands import git_get_username
+from qmk.json_schema import load_jsonschema
+from qmk.path import keyboard
+from qmk.json_encoders import InfoJSONEncoder
+from qmk.json_schema import deep_update
+
+COMMUNITY = Path('layouts/default/')
+TEMPLATE = Path('data/templates/keyboard/')
+
+MCU2BOOTLOADER = {
+    "MKL26Z64": "halfkay",
+    "MK20DX128": "halfkay",
+    "MK20DX256": "halfkay",
+    "MK66FX1M0": "halfkay",
+    "STM32F042": "stm32-dfu",
+    "STM32F072": "stm32-dfu",
+    "STM32F103": "stm32duino",
+    "STM32F303": "stm32-dfu",
+    "STM32F401": "stm32-dfu",
+    "STM32F405": "stm32-dfu",
+    "STM32F407": "stm32-dfu",
+    "STM32F411": "stm32-dfu",
+    "STM32F446": "stm32-dfu",
+    "STM32G431": "stm32-dfu",
+    "STM32G474": "stm32-dfu",
+    "STM32L412": "stm32-dfu",
+    "STM32L422": "stm32-dfu",
+    "STM32L432": "stm32-dfu",
+    "STM32L433": "stm32-dfu",
+    "STM32L442": "stm32-dfu",
+    "STM32L443": "stm32-dfu",
+    "GD32VF103": "gd32v-dfu",
+    "WB32F3G71": "wb32-dfu",
+    "atmega16u2": "atmel-dfu",
+    "atmega32u2": "atmel-dfu",
+    "atmega16u4": "atmel-dfu",
+    "atmega32u4": "atmel-dfu",
+    "at90usb162": "atmel-dfu",
+    "at90usb646": "atmel-dfu",
+    "at90usb647": "atmel-dfu",
+    "at90usb1286": "atmel-dfu",
+    "at90usb1287": "atmel-dfu",
+    "atmega32a": "bootloadhid",
+    "atmega328p": "usbasploader",
+    "atmega328": "usbasploader",
+}
+
+# defaults
+schema = dotty(load_jsonschema('keyboard'))
+mcu_types = sorted(schema["properties.processor.enum"], key=str.casefold)
+available_layouts = sorted([x.name for x in COMMUNITY.iterdir() if x.is_dir()])
+
+
+def mcu_type(mcu):
+    """Callable for argparse validation.
+    """
+    if mcu not in mcu_types:
+        raise ValueError
+    return mcu
+
+
+def layout_type(layout):
+    """Callable for argparse validation.
+    """
+    if layout not in available_layouts:
+        raise ValueError
+    return layout
 
 
 def keyboard_name(name):
@@ -27,8 +94,111 @@ def validate_keyboard_name(name):
     return bool(regex.match(name))
 
 
+def select_default_bootloader(mcu):
+    """Provide sane defaults for bootloader
+    """
+    return MCU2BOOTLOADER.get(mcu, "custom")
+
+
+def replace_placeholders(src, dest, tokens):
+    """Replaces the given placeholders in each template file.
+    """
+    content = src.read_text()
+    for key, value in tokens.items():
+        content = content.replace(f'%{key}%', value)
+
+    dest.write_text(content)
+
+
+def augment_community_info(src, dest):
+    """Splice in any additional data into info.json
+    """
+    info = json.loads(src.read_text())
+    template = json.loads(dest.read_text())
+
+    # merge community with template
+    deep_update(info, template)
+
+    # avoid assumptions on macro name by using the first available
+    first_layout = next(iter(info["layouts"].values()))["layout"]
+
+    # guess at width and height now its optional
+    width, height = (0, 0)
+    for item in first_layout:
+        width = max(width, int(item["x"]) + 1)
+        height = max(height, int(item["y"]) + 1)
+
+    info["matrix_pins"] = {
+        "cols": ["C2"] * width,
+        "rows": ["D1"] * height,
+    }
+
+    # assume a 1:1 mapping on matrix to electrical
+    for item in first_layout:
+        item["matrix"] = [int(item["y"]), int(item["x"])]
+
+    # finally write out the updated info.json
+    dest.write_text(json.dumps(info, cls=InfoJSONEncoder))
+
+
+def prompt_keyboard():
+    prompt = """{fg_yellow}Name Your Keyboard Project{style_reset_all}
+
+For more infomation, see:
+https://docs.qmk.fm/#/hardware_keyboard_guidelines?id=naming-your-keyboardproject
+
+keyboard Name? """
+
+    return question(prompt, validate=lambda x: not keyboard(x).exists())
+
+
+def prompt_user():
+    prompt = """{fg_yellow}Attribution{style_reset_all}
+
+Used for maintainer, copyright, etc
+
+Your GitHub Username? """
+    return question(prompt, default=git_get_username())
+
+
+def prompt_name(def_name):
+    prompt = """{fg_yellow}More Attribution{style_reset_all}
+
+Used for maintainer, copyright, etc
+
+Your Real Name? """
+    return question(prompt, default=def_name)
+
+
+def prompt_layout():
+    prompt = """{fg_yellow}Pick Base Layout{style_reset_all}
+
+As a starting point, one of the common layouts can be used to bootstrap the process
+
+Default Layout? """
+    # avoid overwhelming user - remove some?
+    filtered_layouts = [x for x in available_layouts if not any(xs in x for xs in ['_split', '_blocker', '_tsangan', '_f13'])]
+    filtered_layouts.append("none of the above")
+
+    return choice(prompt, filtered_layouts, default=len(filtered_layouts) - 1)
+
+
+def prompt_mcu():
+    prompt = """{fg_yellow}What Powers Your Project{style_reset_all}
+
+For more infomation, see:
+https://docs.qmk.fm/#/compatible_microcontrollers
+
+MCU? """
+    # remove any options strictly used for compatibility
+    filtered_mcu = [x for x in mcu_types if not any(xs in x for xs in ['cortex', 'unknown'])]
+
+    return choice(prompt, filtered_mcu, default=filtered_mcu.index("atmega32u4"))
+
+
 @cli.argument('-kb', '--keyboard', help='Specify the name for the new keyboard directory', arg_only=True, type=keyboard_name)
-@cli.argument('-t', '--type', help='Specify the keyboard type', arg_only=True, choices=KEYBOARD_TYPES)
+@cli.argument('-l', '--layout', help='Community layout to bootstrap with', arg_only=True, type=layout_type)
+@cli.argument('-t', '--type', help='Specify the keyboard MCU type', arg_only=True, type=mcu_type)
 @cli.argument('-u', '--username', help='Specify your username (default from Git config)', arg_only=True)
 @cli.argument('-n', '--realname', help='Specify your real name if you want to use that. Defaults to username', arg_only=True)
 @cli.subcommand('Creates a new keyboard directory')
@@ -38,102 +208,49 @@ def new_keyboard(cli):
     cli.log.info('{style_bright}Generating a new QMK keyboard directory{style_normal}')
     cli.echo('')
 
-    # Get keyboard name
-    new_keyboard_name = None
-    while not new_keyboard_name:
-        new_keyboard_name = cli.args.keyboard if cli.args.keyboard else question('Keyboard Name:')
-        if not validate_keyboard_name(new_keyboard_name):
-            cli.log.error('Keyboard names must contain only {fg_cyan}lowercase a-z{fg_reset}, {fg_cyan}0-9{fg_reset}, and {fg_cyan}_{fg_reset}! Please choose a different name.')
+    kb_name = cli.args.keyboard if cli.args.keyboard else prompt_keyboard()
+    user_name = cli.args.username if cli.args.username else prompt_user()
+    real_name = cli.args.realname or cli.args.username if cli.args.realname or cli.args.username else prompt_name(user_name)
+    default_layout = cli.args.layout if cli.args.layout else prompt_layout()
+    mcu = cli.args.type if cli.args.type else prompt_mcu()
+    bootloader = select_default_bootloader(mcu)
 
-            # Exit if passed by arg
-            if cli.args.keyboard:
-                return False
+    if not validate_keyboard_name(kb_name):
+        cli.log.error('Keyboard names must contain only {fg_cyan}lowercase a-z{fg_reset}, {fg_cyan}0-9{fg_reset}, and {fg_cyan}_{fg_reset}! Please choose a different name.')
+        return 1
 
-            new_keyboard_name = None
-            continue
+    if keyboard(kb_name).exists():
+        cli.log.error(f'Keyboard {{fg_cyan}}{kb_name}{{fg_reset}} already exists! Please choose a different name.')
+        return 1
 
-        keyboard_path = qmk.path.keyboard(new_keyboard_name)
-        if keyboard_path.exists():
-            cli.log.error(f'Keyboard {{fg_cyan}}{new_keyboard_name}{{fg_reset}} already exists! Please choose a different name.')
+    tokens = {'YEAR': str(date.today().year), 'KEYBOARD': kb_name, 'USER_NAME': user_name, 'REAL_NAME': real_name, 'LAYOUT': default_layout, 'MCU': mcu, 'BOOTLOADER': bootloader}
 
-            # Exit if passed by arg
-            if cli.args.keyboard:
-                return False
+    if cli.config.general.verbose:
+        cli.log.info("Creating keyboard with:")
+        for key, value in tokens.items():
+            cli.echo(f"    {key.ljust(10)}:   {value}")
 
-            new_keyboard_name = None
+    # TODO: detach community layout and rename to just "LAYOUT"
+    if default_layout == 'none of the above':
+        default_layout = "ortho_4x4"
 
-    # Get keyboard type
-    keyboard_type = cli.args.type if cli.args.type else choice('Keyboard Type:', KEYBOARD_TYPES, default=0)
+    # begin with making the deepest folder in the tree
+    keymaps_path = keyboard(kb_name) / 'keymaps/'
+    keymaps_path.mkdir(parents=True)
 
-    # Get username
-    user_name = None
-    while not user_name:
-        user_name = question('Your GitHub User Name:', default=find_user_name())
+    # copy in keymap.c or keymap.json
+    community_keymap = Path(COMMUNITY / f'{default_layout}/default_{default_layout}/')
+    shutil.copytree(community_keymap, keymaps_path / 'default')
 
-        if not user_name:
-            cli.log.error('You didn\'t provide a username, and we couldn\'t find one set in your QMK or Git configs. Please try again.')
+    # process template files
+    for file in list(TEMPLATE.iterdir()):
+        replace_placeholders(file, keyboard(kb_name) / file.name, tokens)
 
-            # Exit if passed by arg
-            if cli.args.username:
-                return False
+    # merge in infos
+    community_info = Path(COMMUNITY / f'{default_layout}/info.json')
+    augment_community_info(community_info, keyboard(kb_name) / community_info.name)
 
-    real_name = None
-    while not real_name:
-        real_name = question('Your real name:', default=user_name)
-
-    keyboard_basename = keyboard_path.name
-    replacements = {
-        "YEAR": str(date.today().year),
-        "KEYBOARD": keyboard_basename,
-        "USER_NAME": user_name,
-        "YOUR_NAME": real_name,
-    }
-
-    template_dir = Path('data/templates')
-    template_tree(template_dir / 'base', keyboard_path, replacements)
-    template_tree(template_dir / keyboard_type, keyboard_path, replacements)
-
-    cli.echo('')
-    cli.log.info(f'{{fg_green}}Created a new keyboard called {{fg_cyan}}{new_keyboard_name}{{fg_green}}.{{fg_reset}}')
-    cli.log.info(f'To start working on things, `cd` into {{fg_cyan}}{keyboard_path}{{fg_reset}},')
+    cli.log.info(f'{{fg_green}}Created a new keyboard called {{fg_cyan}}{kb_name}{{fg_green}}.{{fg_reset}}')
+    cli.log.info(f'To start working on things, `cd` into {{fg_cyan}}keyboards/{kb_name}{{fg_reset}},')
     cli.log.info('or open the directory in your preferred text editor.')
-
-
-def find_user_name():
-    if cli.args.username:
-        return cli.args.username
-    elif cli.config.user.name:
-        return cli.config.user.name
-    else:
-        return git_get_username()
-
-
-def template_tree(src: Path, dst: Path, replacements: dict):
-    """Recursively copy template and replace placeholders
-
-    Args:
-        src (Path)
-            The source folder to copy from
-        dst (Path)
-            The destination folder to copy to
-        replacements (dict)
-            a dictionary with "key":"value" pairs to replace.
-
-    Raises:
-        FileExistsError
-            When trying to overwrite existing files
-    """
-
-    dst.mkdir(parents=True, exist_ok=True)
-
-    for child in src.iterdir():
-        if child.is_dir():
-            template_tree(child, dst / child.name, replacements=replacements)
-
-        if child.is_file():
-            file_name = dst / (child.name % replacements)
-
-            with file_name.open(mode='x') as dst_f:
-                with child.open() as src_f:
-                    template = src_f.read()
-                    dst_f.write(template % replacements)
+    cli.log.info(f"And build with {{fg_yellow}}qmk compile -kb {kb_name} -km default{{fg_reset}}.")
diff --git a/lib/python/qmk/path.py b/lib/python/qmk/path.py
index 72bae59273..dfb8371f84 100644
--- a/lib/python/qmk/path.py
+++ b/lib/python/qmk/path.py
@@ -46,7 +46,7 @@ def keymap(keyboard_name):
     """
     keyboard_folder = keyboard(keyboard_name)
 
-    for i in range(MAX_KEYBOARD_SUBFOLDERS):
+    for _ in range(MAX_KEYBOARD_SUBFOLDERS):
         if (keyboard_folder / 'keymaps').exists():
             return (keyboard_folder / 'keymaps').resolve()
 
diff --git a/util/new_keyboard.sh b/util/new_keyboard.sh
deleted file mode 100755
index 62e8cb9e13..0000000000
--- a/util/new_keyboard.sh
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/usr/bin/env bash
-
-# This script generates a new keyboard directory under keyboards/,
-# and copies the template files from data/templates/ into it.
-
-# Print an error message with the word "ERROR" in red.
-echo_error() {
-    echo -e "[\033[0;91mERROR\033[m]: $1"
-}
-
-# Print a message in bold.
-echo_bold() {
-    echo -e "\033[1m$1\033[m"
-}
-
-# Prompt the user for information, showing the default value in brackets.
-prompt() {
-    local message="$1"
-    local default="$2"
-
-    [ -n "$default" ] && message+=" [$default]"
-    message+=": "
-
-    read -rp "$message" prompt_return
-    [ -z "$prompt_return" ] && prompt_return="$default"
-}
-
-# Grab a username from Git config.
-set_git_username() {
-    git_username="$(git config --get user.name)"
-}
-
-# Copy the template files to the new keyboard directory.
-copy_templates() {
-    mkdir -p "$keyboard_dir"
-
-    echo -n "Copying base template files..."
-    cp -r "data/templates/base/." "${keyboard_dir}"
-    echo " done"
-
-    echo -n "Copying $keyboard_type template files..."
-    cp -r "data/templates/${keyboard_type}/." "${keyboard_dir}"
-    echo " done"
-
-    echo -n "Renaming keyboard files..."
-    mv "${keyboard_dir}/keyboard.c" "${keyboard_dir}/${keyboard_base_name}.c"
-    mv "${keyboard_dir}/keyboard.h" "${keyboard_dir}/${keyboard_base_name}.h"
-    echo " done"
-}
-
-# Set the inplace editing parameter for sed.
-# macOS/BSD sed expects a file extension immediately following -i.
-set_sed_i() {
-    sed_i=(-i)
-
-    case $(uname -a) in
-        *Darwin*) sed_i=(-i "")
-    esac
-}
-
-# Replace a token with a value in the given list of files.
-replace_placeholders() {
-    local replace_token="$1"
-    local replace_value="$2"
-    shift 2
-    local replace_filenames=("$@")
-
-    echo -n "Replacing $replace_token with $replace_value..."
-    for replace_filename in "${replace_filenames[@]}"; do
-        sed "${sed_i[@]}" -e "s/${replace_token}/${replace_value}/g" "$replace_filename"
-    done
-    echo " done"
-}
-
-# Replace %YEAR% with the current year.
-replace_year_placeholders() {
-    local replace_year_filenames=(
-        "${keyboard_dir}/config.h"
-        "${keyboard_dir}/${keyboard_base_name}.c"
-        "${keyboard_dir}/${keyboard_base_name}.h"
-        "${keyboard_dir}/keymaps/default/keymap.c"
-    )
-    replace_placeholders "%YEAR%" "$(date +%Y)" "${replace_year_filenames[@]}"
-}
-
-# Replace %KEYBOARD% with the keyboard name.
-replace_keyboard_placeholders() {
-    local replace_keyboard_filenames=(
-        "${keyboard_dir}/config.h"
-        "${keyboard_dir}/info.json"
-        "${keyboard_dir}/readme.md"
-        "${keyboard_dir}/${keyboard_base_name}.c"
-        "${keyboard_dir}/keymaps/default/readme.md"
-    )
-    replace_placeholders "%KEYBOARD%" "$keyboard_base_name" "${replace_keyboard_filenames[@]}"
-}
-
-# Replace %YOUR_NAME% with the username.
-replace_name_placeholders() {
-    local replace_name_filenames=(
-        "${keyboard_dir}/config.h"
-        "${keyboard_dir}/info.json"
-        "${keyboard_dir}/readme.md"
-        "${keyboard_dir}/${keyboard_base_name}.c"
-        "${keyboard_dir}/${keyboard_base_name}.h"
-        "${keyboard_dir}/keymaps/default/keymap.c"
-    )
-    replace_placeholders "%YOUR_NAME%" "$username" "${replace_name_filenames[@]}"
-}
-
-# Check if an array contains an element.
-array_contains() {
-    local e match="$1"
-    shift
-    for e; do
-        [[ "$e" == "$match" ]] && return 0;
-    done
-
-    return 1
-}
-
-# If we've been started from util/, we want to be in qmk_firmware/
-[[ "$PWD" == *util ]] && cd ..
-
-# The root qmk_firmware/ directory should have a subdirectory called quantum/
-if [ ! -d "quantum" ]; then
-    echo_error "Could not detect the QMK firmware directory!"
-    echo_error "Are you sure you're in the right place?"
-    exit 1
-fi
-
-echo_bold "########################################"
-echo_bold "#                NOTICE                #"
-echo_bold "#   This script has been deprecated.   #"
-echo_bold "# Please use qmk new-keyboard instead. #"
-echo_bold "########################################"
-echo
-echo_bold "Generating a new QMK keyboard directory"
-echo
-
-# Keyboard name is required, so keep prompting until we get one
-while [ -z "$keyboard_name" ]; do
-    prompt "Keyboard Name" ""
-    keyboard_name=$prompt_return
-    keyboard_base_name=$(basename $keyboard_name)
-done
-
-keyboard_dir="keyboards/$keyboard_name"
-
-if [ -d "$keyboard_dir" ]; then
-    echo_error "Keyboard $keyboard_name already exists!"
-    exit 1
-fi
-
-KEYBOARD_TYPES=("avr" "ps2avrgb")
-
-prompt "Keyboard Type" "avr"
-keyboard_type=$prompt_return
-
-if ! array_contains "$keyboard_type" "${KEYBOARD_TYPES[@]}"; then
-    echo_error "Keyboard type must be one of: ${KEYBOARD_TYPES[*]}"
-    exit 1
-fi
-
-set_git_username
-prompt "Your Name" "$git_username"
-username=$prompt_return
-
-echo
-
-copy_templates
-set_sed_i
-replace_year_placeholders
-replace_keyboard_placeholders
-[ -n "$username" ] && replace_name_placeholders
-
-echo
-echo_bold "Created a new keyboard called $keyboard_name."
-echo
-echo_bold "To start working on things, cd into keyboards/$keyboard_name,"
-echo_bold "or open the directory in your favourite text editor."
diff --git a/util/new_keymap.sh b/util/new_keymap.sh
deleted file mode 100755
index c483314fdb..0000000000
--- a/util/new_keymap.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-# Script to make a new keymap for a keyboard of your choosing
-# This script automates the copying of the default keymap into
-# your own keymap
-
-KB_PATH=$(echo "$1" | tr 'A-Z' 'a-z')
-USERNAME=$(echo "$2" | tr 'A-Z' 'a-z')
-
-if [ -z "$KB_PATH" ]; then
-    printf "Usage:   %s <keyboard_path> <username>\n" "$0"
-    printf "Example: %s 1upkeyboards/1up60hse yourname\n" "$0"
-    exit 1
-fi
-
-if [ -z "$USERNAME" ]; then
-    printf "Usage:   %s <keyboard_path> <username>\n" "$0"
-    printf "Example: %s 1upkeyboards/1up60hse yourname\n" "$0"
-    exit 1
-fi
-
-cd "$(dirname "$0")/.."
-
-if [ ! -d "keyboards/$KB_PATH" ]; then
-	printf "Error! keyboards/%s does not exist!\n" "$KB_PATH"
-	exit 1
-fi
-
-if [ -d "keyboards/$KB_PATH/keymaps/$USERNAME" ]; then
-	printf "Error! keyboards/%s/keymaps/%s already exists!\n" "$KB_PATH" "$USERNAME"
-	exit 1
-fi
-
-# Recursively copy the chosen keyboard's default keymap
-cp -r keyboards/"$KB_PATH"/keymaps/default keyboards/"$KB_PATH"/keymaps/"$USERNAME"
-
-printf "%s keymap directory created in: qmk_firmware/keyboards/%s/keymaps/\n\n" "$USERNAME" "$KB_PATH"
-
-printf "Compile a firmware file with your new keymap by typing: \n"
-printf "   make %s:%s\n" "$KB_PATH" "$USERNAME"
-printf "from the qmk_firmware directory\n"

From 74e8a71768c5b6ce04e45b4418784c70d6ca3386 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 9 Feb 2022 00:07:42 +0000
Subject: [PATCH 562/867] Move driver to core (#15944)

---
 .../viktus/sp111 => drivers/gpio}/mcp23018.c  | 24 ++-----
 drivers/gpio/mcp23018.h                       | 65 +++++++++++++++++++
 keyboards/viktus/sp111/mcp23018.h             | 34 ----------
 keyboards/viktus/sp111/rules.mk               |  1 +
 4 files changed, 72 insertions(+), 52 deletions(-)
 rename {keyboards/viktus/sp111 => drivers/gpio}/mcp23018.c (74%)
 create mode 100644 drivers/gpio/mcp23018.h
 delete mode 100644 keyboards/viktus/sp111/mcp23018.h

diff --git a/keyboards/viktus/sp111/mcp23018.c b/drivers/gpio/mcp23018.c
similarity index 74%
rename from keyboards/viktus/sp111/mcp23018.c
rename to drivers/gpio/mcp23018.c
index f1d8e568d2..dc8ab03c50 100644
--- a/keyboards/viktus/sp111/mcp23018.c
+++ b/drivers/gpio/mcp23018.c
@@ -1,18 +1,6 @@
-/* Copyright 2020 zvecr<git@zvecr.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2022 zvecr<git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "mcp23018.h"
 #include "i2c_master.h"
 #include "wait.h"
@@ -40,7 +28,7 @@ void mcp23018_init(uint8_t addr) {
     }
 }
 
-bool mcp23018_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) {
+bool mcp23018_set_config(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf) {
     uint8_t addr         = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmdDirection = port ? CMD_IODIRB : CMD_IODIRA;
     uint8_t cmdPullup    = port ? CMD_GPPUB : CMD_GPPUA;
@@ -60,7 +48,7 @@ bool mcp23018_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) {
     return true;
 }
 
-bool mcp23018_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf) {
+bool mcp23018_set_output(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = port ? CMD_GPIOB : CMD_GPIOA;
 
@@ -86,7 +74,7 @@ bool mcp23018_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB) {
     return true;
 }
 
-bool mcp23018_readPins(uint8_t slave_addr, uint8_t port, uint8_t* out) {
+bool mcp23018_readPins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* out) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = port ? CMD_GPIOB : CMD_GPIOA;
 
diff --git a/drivers/gpio/mcp23018.h b/drivers/gpio/mcp23018.h
new file mode 100644
index 0000000000..e7c2730dd1
--- /dev/null
+++ b/drivers/gpio/mcp23018.h
@@ -0,0 +1,65 @@
+// Copyright 2022 zvecr<git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+/**
+ * Port ID
+ */
+typedef enum {
+    mcp23018_PORTA,
+    mcp23018_PORTB,
+} mcp23018_port_t;
+
+/**
+ * Helpers for set_config
+ */
+enum {
+    ALL_OUTPUT = 0,
+    ALL_INPUT  = 0xFF,
+};
+
+/**
+ * Helpers for set_output
+ */
+enum {
+    ALL_LOW  = 0,
+    ALL_HIGH = 0xFF,
+};
+
+/**
+ * Init expander and any other dependent drivers
+ */
+void mcp23018_init(uint8_t slave_addr);
+
+/**
+ * Configure input/output to a given port
+ */
+bool mcp23018_set_config(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf);
+
+/**
+ * Write high/low to a given port
+ */
+bool mcp23018_set_output(uint8_t slave_addr, mcp23018_port_t port, uint8_t conf);
+
+/**
+ * Write high/low to both ports sequentially
+ *
+ *  - slightly faster than multiple set_output
+ */
+bool mcp23018_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB);
+
+/**
+ * Read state of a given port
+ */
+bool mcp23018_readPins(uint8_t slave_addr, mcp23018_port_t port, uint8_t* ret);
+
+/**
+ * Read state of both ports sequentially
+ *
+ *  - slightly faster than multiple readPins
+ */
+bool mcp23018_readPins_all(uint8_t slave_addr, uint16_t* ret);
diff --git a/keyboards/viktus/sp111/mcp23018.h b/keyboards/viktus/sp111/mcp23018.h
deleted file mode 100644
index dc2251b72f..0000000000
--- a/keyboards/viktus/sp111/mcp23018.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 zvecr<git@zvecr.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#define mcp23018_PORTA 0
-#define mcp23018_PORTB 1
-
-#define ALL_OUTPUT 0
-#define ALL_INPUT 0xFF
-#define ALL_LOW 0
-#define ALL_HIGH 0xFF
-
-void mcp23018_init(uint8_t addr);
-bool mcp23018_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf);
-bool mcp23018_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf);
-bool mcp23018_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB);
-bool mcp23018_readPins(uint8_t slave_addraddr, uint8_t port, uint8_t* ret);
-bool mcp23018_readPins_all(uint8_t slave_addr, uint16_t* ret);
diff --git a/keyboards/viktus/sp111/rules.mk b/keyboards/viktus/sp111/rules.mk
index b779ef4cb2..fab90d4a88 100644
--- a/keyboards/viktus/sp111/rules.mk
+++ b/keyboards/viktus/sp111/rules.mk
@@ -22,5 +22,6 @@ LTO_ENABLE = yes            # Smaller (and slightly faster) firmware
 # custom matrix setup
 CUSTOM_MATRIX = lite
 
+VPATH += drivers/gpio
 SRC += mcp23018.c matrix.c
 QUANTUM_LIB_SRC += i2c_master.c

From efdaa7f97205f8964c076677519d1848c5ac4b41 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Wed, 9 Feb 2022 15:50:13 +1100
Subject: [PATCH 563/867] Add support for driving unselected row/col. (#16278)

---
 docs/config_options.md         |   2 +
 keyboards/keychron/q2/config.h |   2 +
 keyboards/keychron/q2/matrix.c | 139 ---------------------------------
 quantum/matrix.c               |  15 ++++
 4 files changed, 19 insertions(+), 139 deletions(-)
 delete mode 100644 keyboards/keychron/q2/matrix.c

diff --git a/docs/config_options.md b/docs/config_options.md
index b661b55ee0..15ad945b22 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -61,6 +61,8 @@ This is a C header file that is one of the first things included, and will persi
   * pins unused by the keyboard for reference
 * `#define MATRIX_HAS_GHOST`
   * define is matrix has ghost (unlikely)
+* `#define MATRIX_UNSELECT_DRIVE_HIGH`
+  * On un-select of matrix pins, rather than setting pins to input-high, sets them to output-high.
 * `#define DIODE_DIRECTION COL2ROW`
   * COL2ROW or ROW2COL - how your matrix is configured. COL2ROW means the black mark on your diode is facing to the rows, and between the switch and the rows.
 * `#define DIRECT_PINS { { F1, F0, B0, C7 }, { F4, F5, F6, F7 } }`
diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h
index 8252b83df8..d019bcee15 100644
--- a/keyboards/keychron/q2/config.h
+++ b/keyboards/keychron/q2/config.h
@@ -29,6 +29,8 @@
 #define MATRIX_ROW_PINS { B4, B3, A15, A14, A13 }
 #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 }
 
+#define MATRIX_UNSELECT_DRIVE_HIGH
+
 /* DIP switch */
 #define DIP_SWITCH_MATRIX_GRID  { {4, 4} }
 
diff --git a/keyboards/keychron/q2/matrix.c b/keyboards/keychron/q2/matrix.c
deleted file mode 100644
index 1e493d33e2..0000000000
--- a/keyboards/keychron/q2/matrix.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include "util.h"
-#include "matrix.h"
-#include "debounce.h"
-#include "quantum.h"
-
-#ifdef MATRIX_ROW_PINS
-static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-#endif  // MATRIX_ROW_PINS
-#ifdef MATRIX_COL_PINS
-static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-#endif  // MATRIX_COL_PINS
-
-#define ROWS_PER_HAND (MATRIX_ROWS)
-
-/* matrix state(1:on, 0:off) */
-extern matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
-
-static inline void setPinOutput_writeLow(pin_t pin) {
-    ATOMIC_BLOCK_FORCEON {
-        setPinOutput(pin);
-        writePinLow(pin);
-    }
-}
-
-static inline void setPinOutput_writeHigh(pin_t pin) {
-    ATOMIC_BLOCK_FORCEON {
-        setPinOutput(pin);
-        writePinHigh(pin);
-    }
-}
-
-static inline void setPinInputHigh_atomic(pin_t pin) {
-    ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
-}
-
-static inline uint8_t readMatrixPin(pin_t pin) {
-    if (pin != NO_PIN) {
-        return readPin(pin);
-    } else {
-        return 1;
-    }
-}
-
-static bool select_col(uint8_t col) {
-    pin_t pin = col_pins[col];
-    if (pin != NO_PIN) {
-        setPinOutput_writeLow(pin);
-        return true;
-    }
-    return false;
-}
-
-static void unselect_col(uint8_t col) {
-    pin_t pin = col_pins[col];
-    if (pin != NO_PIN) {
-        setPinOutput_writeHigh(pin);
-    }
-}
-
-static void unselect_cols(void) {
-    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-        unselect_col(x);
-    }
-}
-
-void matrix_init_pins(void) {
-    unselect_cols();
-    for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
-        if (row_pins[x] != NO_PIN) {
-            setPinInputHigh_atomic(row_pins[x]);
-        }
-    }
-}
-
-void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
-    bool key_pressed = false;
-
-    // Select col
-    if (!select_col(current_col)) {  // select col
-        return;                      // skip NO_PIN col
-    }
-    matrix_output_select_delay();
-
-    // For each row...
-    for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
-        // Check row pin state
-        if (readMatrixPin(row_pins[row_index]) == 0) {
-            // Pin LO, set col bit
-            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
-            key_pressed = true;
-        } else {
-            // Pin HI, clear col bit
-            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
-        }
-    }
-
-    // Unselect col
-    unselect_col(current_col);
-    matrix_output_unselect_delay(current_col, key_pressed);  // wait for all Row signals to go HIGH
-}
-
-void matrix_init_custom(void) {
-    // initialize key pins
-    matrix_init_pins();
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
-
-    // Set col, read rows
-    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
-        matrix_read_rows_on_col(curr_matrix, current_col);
-    }
-
-    bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
-    if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
-
-    return (uint8_t)changed;
-}
diff --git a/quantum/matrix.c b/quantum/matrix.c
index 483d518ecc..8596c2eabd 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -82,6 +82,13 @@ static inline void setPinOutput_writeLow(pin_t pin) {
     }
 }
 
+static inline void setPinOutput_writeHigh(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinHigh(pin);
+    }
+}
+
 static inline void setPinInputHigh_atomic(pin_t pin) {
     ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
 }
@@ -141,7 +148,11 @@ static bool select_row(uint8_t row) {
 static void unselect_row(uint8_t row) {
     pin_t pin = row_pins[row];
     if (pin != NO_PIN) {
+#            ifdef MATRIX_UNSELECT_DRIVE_HIGH
+        setPinOutput_writeHigh(pin);
+#            else
         setPinInputHigh_atomic(pin);
+#            endif
     }
 }
 
@@ -200,7 +211,11 @@ static bool select_col(uint8_t col) {
 static void unselect_col(uint8_t col) {
     pin_t pin = col_pins[col];
     if (pin != NO_PIN) {
+#            ifdef MATRIX_UNSELECT_DRIVE_HIGH
+        setPinOutput_writeHigh(pin);
+#            else
         setPinInputHigh_atomic(pin);
+#            endif
     }
 }
 

From 04020da48cef186cd58f7782a090116f90ca2008 Mon Sep 17 00:00:00 2001
From: IskandarMa <epiciskandar@gmail.com>
Date: Wed, 9 Feb 2022 13:12:39 +0800
Subject: [PATCH 564/867] [Docs] pr checklist: update doc hyperlinks to
 relative ones and use IDs (#16263)

---
 docs/pr_checklist.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index 1bd6200b82..e4564746b4 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -8,7 +8,7 @@ If there are any inconsistencies with these recommendations, you're best off [cr
 
 - PR should be submitted using a non-`master` branch on the source repository
     - this does not mean you target a different branch for your PR, rather that you're not working out of your own master branch
-    - if submitter _does_ use their own `master` branch, they'll be given a link to the ["how to git"](https://docs.qmk.fm/#/newbs_git_using_your_master_branch) page after merging -- (end of this document will contain the contents of the message)
+    - if submitter _does_ use their own `master` branch, they'll be given a link to the ["how to git"](newbs_git_using_your_master_branch.md) page after merging -- (end of this document will contain the contents of the message)
 - newly-added directories and filenames must be lowercase
     - this rule may be relaxed if upstream sources originally had uppercase characters (e.g. LUFA, ChibiOS, or imported files from other repositories etc.)
     - if there is valid justification (i.e. consistency with existing core files etc.) this can be relaxed
@@ -76,9 +76,9 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
 - `<keyboard>.c`
     - empty `xxxx_xxxx_kb()` or other weak-defined default implemented functions removed
     - commented-out functions removed too
-    - `matrix_init_board()` etc. migrated to `keyboard_pre_init_kb()`, see: [keyboard_pre_init*](https://docs.qmk.fm/#/custom_quantum_functions?id=keyboard_pre_init_-function-documentation)
-    - prefer `CUSTOM_MATRIX = lite` if custom matrix used, allows for standard debounce, see [custom matrix 'lite'](https://docs.qmk.fm/#/custom_matrix?id=lite)
-    - prefer LED indicator [Configuration Options](https://docs.qmk.fm/#/feature_led_indicators?id=configuration-options) to custom `led_update_*()` implementations where possible
+    - `matrix_init_board()` etc. migrated to `keyboard_pre_init_kb()`, see: [keyboard_pre_init*](custom_quantum_functions.md?id=keyboard_pre_init_-function-documentation)
+    - prefer `CUSTOM_MATRIX = lite` if custom matrix used, allows for standard debounce, see [custom matrix 'lite'](custom_matrix.md?id=lite)
+    - prefer LED indicator [Configuration Options](feature_led_indicators.md?id=configuration-options) to custom `led_update_*()` implementations where possible
 - `<keyboard>.h`
     - `#include "quantum.h"` appears at the top
     - `LAYOUT` macros should use standard definitions if applicable
@@ -111,13 +111,13 @@ Also, specific to ChibiOS:
         - example: For an STM32L082KZ, given the similarity to an STM32L073RZ, you can use `BOARD = ST_NUCLEO64_L073RZ` in rules.mk
     - QMK is migrating to not having custom board definitions if at all possible, due to the ongoing maintenance burden when upgrading ChibiOS
 - New board definitions must not be embedded in a keyboard PR
-    - See _Core PRs_ below for the procedure for adding a new board to QMK
+    - See [Core PRs](#core-pr) below for the procedure for adding a new board to QMK
 - if a board definition is unavoidable, `board.c` must have a standard `__early_init()` (as per normal ChibiOS board defs) and an empty `boardInit()`:
-    - see Arm/ChibiOS [early initialization](https://docs.qmk.fm/#/platformdev_chibios_earlyinit?id=board-init)
+    - see Arm/ChibiOS [early initialization](platformdev_chibios_earlyinit.md?id=board-init)
     - `__early_init()` should be replaced by either `early_hardware_init_pre()` or `early_hardware_init_post()` as appropriate
     - `boardInit()` should be migrated to `board_init()`
 
-## Core PRs
+## Core PRs :id=core-pr
 
 - must now target `develop` branch, which will subsequently be merged back to `master` on the breaking changes timeline
 - any new boards adding support for new hardware now requires a corresponding test board under `keyboards/handwired/onekey`

From 71a48a01023449f9559f41d751fbedbdadfb1c46 Mon Sep 17 00:00:00 2001
From: Alexander <7888825+keyzog@users.noreply.github.com>
Date: Wed, 9 Feb 2022 08:19:54 +0300
Subject: [PATCH 565/867] [Keyboard] Add Kapl (#16255)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/kapl/config.h                 |  5 ++
 keyboards/kapl/info.json                | 85 +++++++++++++++++++++++++
 keyboards/kapl/kapl.c                   |  3 +
 keyboards/kapl/kapl.h                   |  8 +++
 keyboards/kapl/keymaps/default/config.h | 45 +++++++++++++
 keyboards/kapl/keymaps/default/keymap.c | 49 ++++++++++++++
 keyboards/kapl/keymaps/via/config.h     | 45 +++++++++++++
 keyboards/kapl/keymaps/via/keymap.c     | 64 +++++++++++++++++++
 keyboards/kapl/keymaps/via/rules.mk     |  1 +
 keyboards/kapl/readme.md                | 27 ++++++++
 keyboards/kapl/rev1/config.h            | 55 ++++++++++++++++
 keyboards/kapl/rev1/rev1.c              | 55 ++++++++++++++++
 keyboards/kapl/rev1/rev1.h              | 34 ++++++++++
 keyboards/kapl/rev1/rules.mk            |  5 ++
 keyboards/kapl/rules.mk                 | 21 ++++++
 15 files changed, 502 insertions(+)
 create mode 100644 keyboards/kapl/config.h
 create mode 100644 keyboards/kapl/info.json
 create mode 100644 keyboards/kapl/kapl.c
 create mode 100644 keyboards/kapl/kapl.h
 create mode 100644 keyboards/kapl/keymaps/default/config.h
 create mode 100644 keyboards/kapl/keymaps/default/keymap.c
 create mode 100644 keyboards/kapl/keymaps/via/config.h
 create mode 100644 keyboards/kapl/keymaps/via/keymap.c
 create mode 100644 keyboards/kapl/keymaps/via/rules.mk
 create mode 100644 keyboards/kapl/readme.md
 create mode 100644 keyboards/kapl/rev1/config.h
 create mode 100644 keyboards/kapl/rev1/rev1.c
 create mode 100644 keyboards/kapl/rev1/rev1.h
 create mode 100644 keyboards/kapl/rev1/rules.mk
 create mode 100644 keyboards/kapl/rules.mk

diff --git a/keyboards/kapl/config.h b/keyboards/kapl/config.h
new file mode 100644
index 0000000000..ba249d4667
--- /dev/null
+++ b/keyboards/kapl/config.h
@@ -0,0 +1,5 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "config_common.h"
diff --git a/keyboards/kapl/info.json b/keyboards/kapl/info.json
new file mode 100644
index 0000000000..67e5470288
--- /dev/null
+++ b/keyboards/kapl/info.json
@@ -0,0 +1,85 @@
+{
+  "keyboard_name": "Kapl",
+  "url": "https://github.com/keyzog/kapl",
+  "maintainer": "keyzog",
+  "layouts": {
+      "LAYOUT": {
+          "layout": [
+              {"label":"L00", "x":0, "y":0.38},
+              {"label":"L01", "x":1, "y":0.38},
+              {"label":"L02", "x":2, "y":0.13},
+              {"label":"L03", "x":3, "y":0},
+              {"label":"L04", "x":4, "y":0.13},
+              {"label":"L05", "x":5, "y":0.25},
+              {"label":"L06", "x":6, "y":0.35},
+              {"label":"R00", "x":8.67, "y":0.35},
+              {"label":"R01", "x":9.67, "y":0.25},
+              {"label":"R02", "x":10.67, "y":0.13},
+              {"label":"R03", "x":11.67, "y":0},
+              {"label":"R04", "x":12.67, "y":0.13},
+              {"label":"R05", "x":13.67, "y":0.38},
+              {"label":"R06", "x":14.67, "y":0.38},
+
+              {"label":"L10", "x":0, "y":1.38},
+              {"label":"L11", "x":1, "y":1.38},
+              {"label":"L12", "x":2, "y":1.13},
+              {"label":"L13", "x":3, "y":1},
+              {"label":"L14", "x":4, "y":1.13},
+              {"label":"L15", "x":5, "y":1.25},
+              {"label":"L16", "x":6, "y":1.35},
+              {"label":"R10", "x":8.67, "y":1.35},
+              {"label":"R11", "x":9.67, "y":1.25},
+              {"label":"R12", "x":10.67, "y":1.13},
+              {"label":"R13", "x":11.67, "y":1},
+              {"label":"R14", "x":12.67, "y":1.13},
+              {"label":"R15", "x":13.67, "y":1.38},
+              {"label":"R16", "x":14.67, "y":1.38},
+
+              {"label":"L20", "x":0, "y":2.38},
+              {"label":"L21", "x":1, "y":2.38},
+              {"label":"L22", "x":2, "y":2.13},
+              {"label":"L23", "x":3, "y":2.0},
+              {"label":"L24", "x":4, "y":2.13},
+              {"label":"L25", "x":5, "y":2.25},
+              {"label":"L26", "x":6, "y":2.35},
+              {"label":"R20", "x":8.67, "y":2.35},
+              {"label":"R21", "x":9.67, "y":2.25},
+              {"label":"R22", "x":10.67, "y":2.13},
+              {"label":"R23", "x":11.67, "y":2.0},
+              {"label":"R24", "x":12.67, "y":2.13},
+              {"label":"R25", "x":13.67, "y":2.38},
+              {"label":"R26", "x":14.67, "y":2.38},
+
+              {"label":"L30", "x":0, "y":3.38},
+              {"label":"L31", "x":1, "y":3.38},
+              {"label":"L32", "x":2, "y":3.13},
+              {"label":"L33", "x":3, "y":3.0},
+              {"label":"L34", "x":4, "y":3.13},
+              {"label":"L35", "x":5, "y":3.25},
+              {"label":"L36", "x":6, "y":3.35},
+              {"label":"R30", "x":8.67, "y":3.35},
+              {"label":"R31", "x":9.67, "y":3.25},
+              {"label":"R32", "x":10.67, "y":3.13},
+              {"label":"R33", "x":11.67, "y":3.0},
+              {"label":"R34", "x":12.67, "y":3.13},
+              {"label":"R35", "x":13.67, "y":3.38},
+              {"label":"R36", "x":14.67, "y":3.38},
+
+              {"label":"L40", "x":0, "y":4.38},
+              {"label":"L41", "x":1, "y":4.38},
+              {"label":"L42", "x":2, "y":4.13},
+              {"label":"L43", "x":3, "y":4.0},
+              {"label":"L44", "x":4, "y":4.13},
+              {"label":"L45", "x":5.35, "y":4.92},
+              {"label":"L46", "x":6.35, "y":4.45, "h":1.5},
+              {"label":"R40", "x":8.02, "y":4.45, "h":1.5},
+              {"label":"R41", "x":9.02, "y":4.92},
+              {"label":"R42", "x":10.67, "y":4.13},
+              {"label":"R43", "x":11.67, "y":4.0},
+              {"label":"R44", "x":12.67, "y":4.13},
+              {"label":"R45", "x":13.67, "y":4.38},
+              {"label":"R46", "x":14.67, "y":4.38}
+          ]
+      }
+  }
+}
diff --git a/keyboards/kapl/kapl.c b/keyboards/kapl/kapl.c
new file mode 100644
index 0000000000..165900e142
--- /dev/null
+++ b/keyboards/kapl/kapl.c
@@ -0,0 +1,3 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "kapl.h"
diff --git a/keyboards/kapl/kapl.h b/keyboards/kapl/kapl.h
new file mode 100644
index 0000000000..019e3267d4
--- /dev/null
+++ b/keyboards/kapl/kapl.h
@@ -0,0 +1,8 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+#include "quantum.h"
+
+#ifdef KEYBOARD_kapl_rev1
+#   include "rev1.h"
+#endif
diff --git a/keyboards/kapl/keymaps/default/config.h b/keyboards/kapl/keymaps/default/config.h
new file mode 100644
index 0000000000..788c3b41bb
--- /dev/null
+++ b/keyboards/kapl/keymaps/default/config.h
@@ -0,0 +1,45 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifdef RGBLIGHT_ENABLE
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 16
+#define RGBLIGHT_VAL_STEP 16
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_MATRIX_HUE_STEP 8
+#define RGB_MATRIX_SAT_STEP 16
+#define RGB_MATRIX_VAL_STEP 16
+#define RGB_MATRIX_SPD_STEP 10
+// EFFECTS
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+// KEYPRESSES EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/kapl/keymaps/default/keymap.c b/keyboards/kapl/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5e2bea1f47
--- /dev/null
+++ b/keyboards/kapl/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+#define SPC_FN  LT(1,KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PGUP,             KC_HOME, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_PGDN,             KC_END,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_GRV,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LBRC,             KC_RBRC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EXLM,             KC_QUES, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL, KC_LGUI, KC_LALT, MO(2),   SPC_FN,    KC_BSPC, KC_DEL,          KC_ENT,  KC_SPC,    MO(1),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [1] = LAYOUT( // "FN" Funcional
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,             KC_PSCR, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,             KC_TRNS, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_F12,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_HASH, KC_DLR,  KC_LBRC, KC_RBRC, KC_GRV,  KC_TRNS,             KC_TRNS, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_F13,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_PERC, KC_CIRC, KC_LPRN, KC_RPRN, KC_TILD, KC_TRNS,             KC_TRNS, KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_F14,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_NO,     KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS,   KC_NO,   KC_P0,   KC_PDOT, KC_PENT, KC_F15
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [2] = LAYOUT( // "CNT" Control
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,               KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RESET,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   RGB_SAI, RGB_SPI, RGB_VAI, RGB_HUI, RGB_MOD, KC_NO,               KC_NO,   KC_VOLU, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   RGB_SAD, RGB_SPD, RGB_VAD, RGB_HUD, RGB_RMOD, KC_NO,              KC_NO,   KC_VOLD, KC_MPLY, KC_MNXT, KC_MPRV, KC_NO,   KC_NO,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_TOG, RGB_M_P, KC_NO,               KC_NO,   KC_MUTE, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,           KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+  )
+};
diff --git a/keyboards/kapl/keymaps/via/config.h b/keyboards/kapl/keymaps/via/config.h
new file mode 100644
index 0000000000..788c3b41bb
--- /dev/null
+++ b/keyboards/kapl/keymaps/via/config.h
@@ -0,0 +1,45 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifdef RGBLIGHT_ENABLE
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 16
+#define RGBLIGHT_VAL_STEP 16
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_MATRIX_HUE_STEP 8
+#define RGB_MATRIX_SAT_STEP 16
+#define RGB_MATRIX_VAL_STEP 16
+#define RGB_MATRIX_SPD_STEP 10
+// EFFECTS
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+// KEYPRESSES EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/kapl/keymaps/via/keymap.c b/keyboards/kapl/keymaps/via/keymap.c
new file mode 100644
index 0000000000..002cc1ef3a
--- /dev/null
+++ b/keyboards/kapl/keymaps/via/keymap.c
@@ -0,0 +1,64 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+#define ____    KC_TRNS
+#define SPC_FN  LT(1,KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PGUP,             KC_HOME, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_PGDN,             KC_END,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_EQL,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_GRV,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LBRC,             KC_RBRC, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_EXLM,             KC_QUES, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     KC_LCTL, KC_LGUI, KC_LALT, MO(2),   SPC_FN,    KC_BSPC, KC_DEL,          KC_ENT,  KC_SPC,    MO(1),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [1] = LAYOUT( // "FN" Funcional
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_TRNS,             KC_PSCR, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR, KC_PIPE, KC_TRNS,             KC_TRNS, KC_PSLS, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_F12,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_HASH, KC_DLR,  KC_LBRC, KC_RBRC, KC_GRV,  KC_TRNS,             KC_TRNS, KC_PAST, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_F13,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_PERC, KC_CIRC, KC_LPRN, KC_RPRN, KC_TILD, KC_TRNS,             KC_TRNS, KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_PENT, KC_F14,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_NO,     KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS,   KC_NO,   KC_P0,   KC_PDOT, KC_PENT, KC_F15
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [2] = LAYOUT( // "CNT" Control
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,               KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RESET,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   RGB_SAI, RGB_SPI, RGB_VAI, RGB_HUI, RGB_MOD, KC_NO,               KC_NO,   KC_VOLU, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   RGB_SAD, RGB_SPD, RGB_VAD, RGB_HUD, RGB_RMOD,KC_NO,               KC_NO,   KC_VOLD, KC_MPLY, KC_MNXT, KC_MPRV, KC_NO,   KC_NO,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_TOG, RGB_M_P, KC_NO,               KC_NO,   KC_MUTE, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,           KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+  ),
+
+  [3] = LAYOUT(
+  //┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐           ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+     ____,    ____,    ____,    ____,    ____,    ____,    ____,                ____,    ____,    ____,    ____,    ____,    ____,    ____,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     ____,    ____,    ____,    ____,    ____,    ____,    ____,                ____,    ____,    ____,    ____,    ____,    ____,    ____,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     ____,    ____,    ____,    ____,    ____,    ____,    ____,                ____,    ____,    ____,    ____,    ____,    ____,    ____,
+  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤           ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+     ____,    ____,    ____,    ____,    ____,    ____,    ____,                ____,    ____,    ____,    ____,    ____,    ____,    ____,
+  //├────────┼────────┼────────┼────────┼────────┼─┬──────┴─┬──────┴─┐       ┌─┴──────┬─┴──────┬─┼────────┼────────┼────────┼────────┼────────┤
+     ____,    ____,    ____,    ____,    ____,      ____,    ____,            ____,    ____,      ____,    ____,    ____,    ____,    ____
+  //└────────┴────────┴────────┴────────┴────────┘ └────────┴────────┘       └────────┴────────┘ └────────┴────────┴────────┴────────┴────────┘
+   )
+};
diff --git a/keyboards/kapl/keymaps/via/rules.mk b/keyboards/kapl/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/kapl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kapl/readme.md b/keyboards/kapl/readme.md
new file mode 100644
index 0000000000..c42a5d8947
--- /dev/null
+++ b/keyboards/kapl/readme.md
@@ -0,0 +1,27 @@
+# Kapl Keyboard
+
+![Kapl Keyboard](https://i.imgur.com/XH8APgi.jpg)
+![Kapl PCB](https://i.imgur.com/uir2nQq.jpg)
+
+The Kapl is a split ergonomic keyboard with 70 keys (7x5).
+
+* Keyboard Maintainer: [keyzog](https://github.com/keyzog)
+* Hardware Supported: Kapl PCB / Pro Micro
+* Hardware Availability:  Order PCBs with gerber files from the [repository](https://github.com/keyzog/kapl/tree/main/gerbers)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kapl/rev1:default
+
+Flashing example for this keyboard:
+
+    make kapl/rev1:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the reset button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
new file mode 100644
index 0000000000..12007a3a13
--- /dev/null
+++ b/keyboards/kapl/rev1/config.h
@@ -0,0 +1,55 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4C41 // "LA" Lozyuk Alexander
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    keyzog
+#define PRODUCT         Kapl Keyboard
+
+/* key matrix size */
+/* Rows are doubled up */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+// wiring of each half
+#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+
+/* Serial settings */
+#define USE_SERIAL
+
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D2
+
+/* Select hand configuration */
+#define MASTER_LEFT
+
+#define RGB_DI_PIN D4
+#define RGBLED_NUM 88
+#define RGBLED_SPLIT { 44, 44 }
+#define RGBLIGHT_SPLIT
+#define RGBLIGHT_LIMIT_VAL 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+
+#define DRIVER_LED_TOTAL 88
+#define RGB_MATRIX_SPLIT { 44, 44 }
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
+#define SPLIT_TRANSPORT_MIRROR
+
+/* 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 SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
diff --git a/keyboards/kapl/rev1/rev1.c b/keyboards/kapl/rev1/rev1.c
new file mode 100644
index 0000000000..b51021307e
--- /dev/null
+++ b/keyboards/kapl/rev1/rev1.c
@@ -0,0 +1,55 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "kapl.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Left Hand
+    // { 8,  7,  6,  5,  4,  3,  2,  1,  0 }, // underglow
+    {  9, 10, 11, 12, 13, 14, 15 },
+    { 22, 21, 20, 19, 18, 17, 16 },
+    { 23, 24, 25, 26, 27, 28, 29 },
+    { 36, 35, 34, 33, 32, 31, 30 },
+    { 37, 38, 39, 40, 41, 42, 43 },
+
+    // Right Hand
+    // { 44,  45,  46,  47,  48,  49,  50,  51,  52 }, // underglow
+    { 53, 54, 55, 56, 57, 58, 59 },
+    { 66, 65, 64, 63, 62, 61, 60 },
+    { 67, 68, 69, 70, 71, 72, 73 },
+    { 80, 79, 78, 77, 76, 75, 74 },
+    { 81, 82, 83, 84, 85, 86, 87 }
+}, {
+    // Left Hand
+    {96, 57},  {112, 44}, {112, 19}, {80, 19}, {48, 19}, {16, 19}, {16, 57}, {48, 57}, {80, 57}, // underglow
+    {0, 0},    {17, 0},   {34, 0},   {52, 0},  {69, 0},  {86, 0},  {103, 0},
+    {103, 16}, {86, 16},  {69, 16},  {52, 16}, {34, 16}, {17, 16}, {0, 16},
+    {0, 32},   {17, 32},  {34, 32},  {52, 32}, {69, 32}, {86, 32}, {103, 32},
+    {103, 48}, {86, 48},  {69, 48},  {52, 48}, {34, 48}, {17, 48}, {0, 48},
+    {0, 64},   {17, 64},  {34, 64},  {52, 64}, {69, 64}, {86, 64}, {103, 64},
+
+    // Right Hand
+    {144, 57}, {128, 44}, {128, 19}, {160, 19}, {192, 19}, {224, 19}, {224, 57}, {192, 57}, {160, 57}, // underglow
+    {224, 0},  {207, 0},  {190, 0},  {172, 0},  {155, 0},  {138, 0},  {121, 0},
+    {121, 16}, {138, 16}, {155, 16}, {172, 16}, {190, 16}, {207, 16}, {224, 16},
+    {224, 32}, {207, 32}, {190, 32}, {172, 32}, {155, 32}, {138, 32}, {121, 32},
+    {121, 48}, {138, 48}, {155, 48}, {172, 48}, {190, 48}, {207, 48}, {224, 48},
+    {224, 64}, {207, 64}, {190, 64}, {172, 64}, {155, 64}, {138, 64}, {121, 64}
+}, {
+    // Left Hand
+    2, 2, 2, 2, 2, 2, 2, 2, 2, // underglow
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 1, 1, 1, 1,
+
+    // Right Hand
+    2, 2, 2, 2, 2, 2, 2, 2, 2, // underglow
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 1, 1, 1, 1
+} };
+#endif
diff --git a/keyboards/kapl/rev1/rev1.h b/keyboards/kapl/rev1/rev1.h
new file mode 100644
index 0000000000..68649a7991
--- /dev/null
+++ b/keyboards/kapl/rev1/rev1.h
@@ -0,0 +1,34 @@
+// Copyright 2022 Alexander Lozyuk (@keyzog)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "kapl.h"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT( \
+  L00, L01, L02, L03, L04, L05, L06,        R00, R01, R02, R03, R04, R05, R06, \
+  L10, L11, L12, L13, L14, L15, L16,        R10, R11, R12, R13, R14, R15, R16, \
+  L20, L21, L22, L23, L24, L25, L26,        R20, R21, R22, R23, R24, R25, R26, \
+  L30, L31, L32, L33, L34, L35, L36,        R30, R31, R32, R33, R34, R35, R36, \
+  L40, L41, L42, L43, L44,   L45, L46,    R40, R41,   R42, R43, R44, R45, R46  \
+) \
+{ \
+    { L00, L01, L02, L03, L04, L05, L06 }, \
+    { L10, L11, L12, L13, L14, L15, L16 }, \
+    { L20, L21, L22, L23, L24, L25, L26 }, \
+    { L30, L31, L32, L33, L34, L35, L36 }, \
+    { L40, L41, L42, L43, L44, L45, L46 }, \
+    { R06, R05, R04, R03, R02, R01, R00 }, \
+    { R16, R15, R14, R13, R12, R11, R10 }, \
+    { R26, R25, R24, R23, R22, R21, R20 }, \
+    { R36, R35, R34, R33, R32, R31, R30 }, \
+    { R46, R45, R44, R43, R42, R41, R40 }  \
+}
diff --git a/keyboards/kapl/rev1/rules.mk b/keyboards/kapl/rev1/rules.mk
new file mode 100644
index 0000000000..e3a4137694
--- /dev/null
+++ b/keyboards/kapl/rev1/rules.mk
@@ -0,0 +1,5 @@
+# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+LTO_ENABLE = yes
diff --git a/keyboards/kapl/rules.mk b/keyboards/kapl/rules.mk
new file mode 100644
index 0000000000..19a0cb5fa4
--- /dev/null
+++ b/keyboards/kapl/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
+SPLIT_KEYBOARD = yes       # Split common
+
+DEFAULT_FOLDER = kapl/rev1

From 11e50f5ff1041abf36d17042bc282589c4a73bbf Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Wed, 9 Feb 2022 00:23:25 -0500
Subject: [PATCH 566/867] [Keyboard] Add explicit RGB Matrix defines for Iris
 Rev. 6 (#16275)

---
 keyboards/keebio/iris/rev6/config.h | 39 ++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index e821012a7d..386416f113 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -81,11 +81,48 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
 // RGB Matrix
 #    ifdef RGB_MATRIX_ENABLE
+#        define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#        define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#        define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#        define ENABLE_RGB_MATRIX_BREATHING
+#        define ENABLE_RGB_MATRIX_BAND_SAT
+#        define ENABLE_RGB_MATRIX_BAND_VAL
+#        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#        define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#        define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#        define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#        define ENABLE_RGB_MATRIX_CYCLE_ALL
+#        define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#        define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#        define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#        define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#        define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#        define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#        define ENABLE_RGB_MATRIX_DUAL_BEACON
+#        define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#        define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#        define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#        define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#        define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#        define ENABLE_RGB_MATRIX_SPLASH
+#        define ENABLE_RGB_MATRIX_MULTISPLASH
+#        define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#        define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
 #        define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
 #        define DRIVER_LED_TOTAL RGBLED_NUM
 #        define RGB_MATRIX_SPLIT { 34, 34 }
 #        define RGB_DISABLE_WHEN_USB_SUSPENDED
-//#        define RGB_MATRIX_KEYPRESSES
+#        define RGB_MATRIX_KEYPRESSES
 #    endif
 #endif

From bf4ce4169617140b31d781aa556c84477efea635 Mon Sep 17 00:00:00 2001
From: Vino Rodrigues <366673+vinorodrigues@users.noreply.github.com>
Date: Wed, 9 Feb 2022 16:42:01 +1100
Subject: [PATCH 567/867] [Keyboard] refine LED Matrix LED positions on KBD67
 Lite (#15769)

---
 keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c | 56 ++++++++++++++++++-------
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index 85806aff51..306c22615f 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -93,35 +93,63 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, CS39_SW7, CS38_SW7, CS37_SW7}
 
 };
+
+#define __ NO_LED
+#define CAPS_LOCK_LED_INDEX 30
+
 led_config_t g_led_config = { {
     // Key Matrix to LED Index
     {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14 },
     {  15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
-    {  30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, 43 },
-    {  44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, 57 },
-    {  58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 }
+    {  30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, __, 42, 43 },
+    {  44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, __, 56, 57 },
+    {  58, 59, 60, __, __, 61, __, __, 62, __, 63, 64, __, 65, 66 }
 }, {
     // LED Index to Physical Position
-    {6,10},{20,10},{34,10},{48,10},{62,10},{76,10},{90,10},{104,10},{118,10},{132,10},{146,10},{160,10},{174,10}, {196,10},{217,10},
-	{9,23}, {27,23},{41,23},{55,23},{69,23},{83,23},{97,23},{111,23},{125,23},{139,23},{153,23},{167,23},{181,23}, {199,23},{217,23},
-	{11,36},{30,36},{44,36},{58,36},{72,36},{86,36},{101,36},{115,36},{129,36},{143,36},{157,36},{171,36}, {194,36},{217,36},
-	{15,49}, {38,49},{52,49},{66,49},{80,49},{94,49},{108,49},{122,49},{136,49},{150,49},{164,49}, {184,49},{203,49},{217,49},
-    {8,62},{25,62},{43,62}, {95,62}, {149,62},{166,62}, {189,62},{203,62},{217,62}
-
+    // based on: https://gist.github.com/vinorodrigues/07fd735683856b2a06c7c52b9b3878cb
+    {0, 0},  {15, 0},  {30, 0},  {45, 0},  {60, 0},  {75, 0},  {90, 0},   {105, 0},  {119, 0},  {134, 0},  {149, 0},  {164, 0},  {179, 0},  {202, 0},  {224, 0},
+    {4, 16}, {22, 16}, {37, 16}, {52, 16}, {67, 16}, {82, 16}, {97, 16},  {112, 16}, {127, 16}, {142, 16}, {157, 16}, {172, 16}, {187, 16}, {205, 16}, {224, 16},
+    {6, 32}, {26, 32}, {41, 32}, {56, 32}, {71, 32}, {86, 32}, {101, 32}, {116, 32}, {131, 32}, {146, 32}, {161, 32}, {175, 32},            {200, 32}, {224, 32},
+    {9, 48}, {34, 48}, {49, 48}, {63, 48}, {78, 48}, {93, 48}, {108, 48}, {123, 48}, {138, 48}, {153, 48}, {168, 48}, {189, 48},            {209, 48}, {224, 48},
+    {2, 64}, {21, 64}, {39, 64},                     {95, 64},                       {151, 64},            {170, 64}, {194, 64},            {209, 64}, {224, 64}
 }, {
     // LED Index to Flag
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
     1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 1, 1, 4, 1, 1, 1, 1, 1
+    9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 1,  // caps lock is also an indicator so mask is `0x01 | 0x08`
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 1,
+    1, 1, 1,       4,       1,    1, 1,    1, 1
 } };
 
+#endif
+
+#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
+
+#ifdef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define CAPS_LOCK_MAX_BRIGHTNESS RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#else
+    #define CAPS_LOCK_MAX_BRIGHTNESS 0xFF
+#endif
+
+#ifdef RGB_MATRIX_VAL_STEP
+    #define CAPS_LOCK_VAL_STEP RGB_MATRIX_VAL_STEP
+#else
+    #define CAPS_LOCK_VAL_STEP 8
+#endif
 
 __attribute__ ((weak))
 void rgb_matrix_indicators_user(void) {
-    if (host_keyboard_led_state().caps_lock)     {
-        rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
+    if (host_keyboard_led_state().caps_lock) {
+        uint8_t b = rgb_matrix_get_val();
+        if (b < CAPS_LOCK_VAL_STEP) {
+            b = CAPS_LOCK_VAL_STEP;
+        } else if (b < (CAPS_LOCK_MAX_BRIGHTNESS - CAPS_LOCK_VAL_STEP)) {
+            b += CAPS_LOCK_VAL_STEP;  // one step more than current brightness
+        } else {
+            b = CAPS_LOCK_MAX_BRIGHTNESS;
+        }
+        rgb_matrix_set_color(CAPS_LOCK_LED_INDEX, b, b, b);  // white, with the adjusted brightness
     }
 }
+
 #endif

From a75fb03f39821ada7ba74e12af68128f365c59ea Mon Sep 17 00:00:00 2001
From: bomb <84309788+mj-bomb@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:49:40 +0800
Subject: [PATCH 568/867] [Keyboard] MelGeek Mach80 rev2 (#15610)

---
 keyboards/melgeek/mach80/rev2/config.h |  42 ++++++
 keyboards/melgeek/mach80/rev2/rev2.c   | 191 +++++++++++++++++++++++++
 keyboards/melgeek/mach80/rev2/rules.mk |  23 +++
 3 files changed, 256 insertions(+)
 create mode 100755 keyboards/melgeek/mach80/rev2/config.h
 create mode 100755 keyboards/melgeek/mach80/rev2/rev2.c
 create mode 100755 keyboards/melgeek/mach80/rev2/rules.mk

diff --git a/keyboards/melgeek/mach80/rev2/config.h b/keyboards/melgeek/mach80/rev2/config.h
new file mode 100755
index 0000000000..3ac1b87ab5
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev2/config.h
@@ -0,0 +1,42 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+
+#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, E6 }
+#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, D3 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+#define DRIVER_LED_TOTAL 94
+#define DRIVER_INDICATOR_LED_TOTAL 3
+
+
+#define RGB_MATRIX_CENTER { 108, 30 }
+
diff --git a/keyboards/melgeek/mach80/rev2/rev2.c b/keyboards/melgeek/mach80/rev2/rev2.c
new file mode 100755
index 0000000000..09250b1565
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev2/rev2.c
@@ -0,0 +1,191 @@
+/* Copyright 2020 MelGeek <melgeek001365@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "mach80.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+    {0, CS9_SW1,  CS8_SW1,  CS7_SW1},  /* RGB1 */
+    {0, CS9_SW2,  CS8_SW2,  CS7_SW2},  /* RGB2 */
+    {0, CS9_SW3,  CS8_SW3,  CS7_SW3},  /* RGB3 */
+    {0, CS9_SW4,  CS8_SW4,  CS7_SW4},  /* RGB4 */
+    {0, CS9_SW5,  CS8_SW5,  CS7_SW5},  /* RGB5 */
+    {0, CS9_SW6,  CS8_SW6,  CS7_SW6},  /* RGB6 */
+    {0, CS9_SW7,  CS8_SW7,  CS7_SW7},  /* RGB7 */
+    {0, CS9_SW8,  CS8_SW8,  CS7_SW8},  /* RGB8 */
+    {0, CS9_SW9,  CS8_SW9,  CS7_SW9},  /* RGB9 */
+    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
+    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
+    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
+    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
+    {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
+    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB67 */
+    {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB68 */
+    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
+	{0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
+    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
+	{0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
+	{0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
+    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
+    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
+    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
+    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
+    {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB69 */
+    {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB70 */
+    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
+    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
+    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB71 */
+    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB72 */
+    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
+    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */
+    {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
+    {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB73 */
+    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
+    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
+    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
+    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
+    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
+    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
+    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
+    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
+    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
+    {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB74 */
+	{0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB75 */
+    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB76 */
+    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB77 */
+    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB78 */
+    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB79 */
+    {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB80 */
+    {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB83 */
+    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
+    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
+	{0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
+    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
+    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
+    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
+    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
+    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
+    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
+    {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB81 */
+    {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB82 */
+    {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB89 */
+    {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB90 */
+    {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB91 */
+    {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB92 */
+    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
+    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
+    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
+    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
+    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
+    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
+    {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
+    {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
+    {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
+    {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB84 */
+    {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
+    {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB88 */
+    {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB86 */
+    {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB87 */
+    {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB98 */
+    {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB99 */
+    {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB100 */
+    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
+    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
+    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
+    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
+    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
+    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
+    {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
+    {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
+    {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
+    {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB101 */
+};
+led_config_t g_led_config = {
+	{
+		/* C0       C1       C2       C3       C4       C5       C6       C7       C8       C9       C10       C11       C12       C13       C14       C15 */
+		{  0,  NO_LED,       1,       2,       3,       4,       5,       6,       7,       8,        9,       10,       11,       12,       13,       14 }, /* R0 */
+		{ 16,      17,      18,      19,      20,      21,      22,      23,      24,      25,       26,       27,       28,       30,       32,       33 }, /* R1 */
+		{ 35,      36,      37,      38,      39,      40,      41,      42,      43,      44,       45,       46,       47,       48,       49,       50 }, /* R2 */
+		{ 52,      53,      54,      55,      56,      57,      58,      59,      60,      61,       62,       63,       65,       15,       34,       51 }, /* R3 */
+		{ 68,      70,      71,      72,      73,      74,      75,      76,      77,      78,       79,       81,   NO_LED,   NO_LED,       83,   NO_LED }, /* R4 */
+		{ 84,  NO_LED,      85,  NO_LED,  NO_LED,      87,  NO_LED,  NO_LED,  NO_LED,      89,   NO_LED,   NO_LED,       90,       91,       92,       93 }  /* R5 */
+    }, {
+        {0, 0},   {12, 0},   {24, 0},  {36, 0},  {48, 0},  {60, 0},  {72, 0},  {84, 0},  {96, 0},  {108, 0},  {120, 0},  {132, 0},  {144, 0},  {156, 0},  {168, 0},  {180, 0},                                   //16
+		{0, 12},  {12, 12},  {24, 12}, {36, 12}, {48, 12}, {60, 12}, {72, 12}, {84, 12}, {96, 12}, {108, 12}, {120, 12}, {132, 12}, {144, 12}, {156, 12}, {168, 12}, {180, 12}, {192, 12}, {204, 12}, {216, 12}, //19
+		{0, 24},  {12, 24},  {24, 24}, {36, 24}, {48, 24}, {60, 24}, {72, 24}, {84, 24}, {96, 24}, {108, 24}, {120, 24}, {132, 24}, {144, 24}, {156, 24}, {168, 24}, {180, 24}, {192, 24},                       //17
+		{0, 36},  {12, 36},  {24, 36}, {36, 36}, {48, 36}, {60, 36}, {72, 36}, {84, 36}, {96, 36}, {108, 36}, {120, 36}, {132, 36}, {144, 36}, {156, 36}, {168, 36},                                             //15
+		{0, 48},  {12, 48},  {24, 48}, {36, 48}, {48, 48}, {60, 48}, {72, 48}, {84, 48}, {96, 48}, {108, 48}, {120, 48}, {132, 48}, {144, 48}, {156, 48}, {168, 48}, {180, 48}, {192, 48},                       //17
+		{0, 60},  {12, 60},  {24, 60}, {36, 60}, {48, 60}, {60, 60}, {72, 60}, {84, 60}, {96, 60}, {108, 60}
+		//10
+	}, {          
+	       4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,         4,         4,         4,       
+		   4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,         4,         4,         4,         4,         4,         4,
+		   4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,         4,         4,         4,         4,
+		   4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,         4,         4,         
+		   4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         4,         4,         4,         4,         4,         4,         4,
+		   4,         4,         4,        4,        4,        4,        4,         4,         4,         4,         
+	}
+};
+
+const is31_led g_is31_indicator_leds[3] = {
+    {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB107 */
+    {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB108 */
+    {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB109 */
+};
+
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+        if (led_state.caps_lock) {
+            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0xff);
+        } else {
+            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[2], 0x00, 0x00, 0x00);
+        }
+
+        if (led_state.num_lock) {
+            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0xff, 0x00, 0x00);
+        } else {
+            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[1], 0x00, 0x00, 0x00);
+        }
+
+        if (led_state.scroll_lock) {
+            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0xff, 0x00);
+        } else {
+            IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
+        }
+    }
+    return true;
+}
+
+void matrix_init_kb(void) {
+    for (int i = 0; i < DRIVER_INDICATOR_LED_TOTAL; ++i) {
+        is31_led led = g_is31_indicator_leds[i];
+        IS31FL3741_set_scaling_registers(&led, 0xFF, 0xFF, 0xFF);
+    }
+
+    IS31FL3741_update_led_control_registers(DRIVER_ADDR_1, 0);
+
+    matrix_init_user();
+}
+
+
+void keyboard_pre_init_kb(void) {
+    setPinOutput(B7);
+    writePinHigh(B7);
+    keyboard_pre_init_user();
+}
+#endif
diff --git a/keyboards/melgeek/mach80/rev2/rules.mk b/keyboards/melgeek/mach80/rev2/rules.mk
new file mode 100755
index 0000000000..56ba67e632
--- /dev/null
+++ b/keyboards/melgeek/mach80/rev2/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
+
+LTO_ENABLE = yes
+
+LAYOUTS = tkl_ansi

From b114b273737291ffec5a042ce58bf6d738e967d7 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Wed, 9 Feb 2022 13:49:53 +0800
Subject: [PATCH 569/867] [Keyboard] Idobao ID80 V3 (#15912)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/idobao/id80/v3/config.h             | 135 ++++++++++++++++++
 keyboards/idobao/id80/v3/info.json            |  96 +++++++++++++
 .../idobao/id80/v3/keymaps/default/keymap.c   |  36 +++++
 .../idobao/id80/v3/keymaps/default/readme.md  |   1 +
 keyboards/idobao/id80/v3/keymaps/via/keymap.c |  52 +++++++
 keyboards/idobao/id80/v3/keymaps/via/rules.mk |   2 +
 keyboards/idobao/id80/v3/readme.md            |  27 ++++
 keyboards/idobao/id80/v3/rules.mk             |  22 +++
 keyboards/idobao/id80/v3/v3.c                 |  62 ++++++++
 keyboards/idobao/id80/v3/v3.h                 |  37 +++++
 10 files changed, 470 insertions(+)
 create mode 100644 keyboards/idobao/id80/v3/config.h
 create mode 100644 keyboards/idobao/id80/v3/info.json
 create mode 100644 keyboards/idobao/id80/v3/keymaps/default/keymap.c
 create mode 100644 keyboards/idobao/id80/v3/keymaps/default/readme.md
 create mode 100644 keyboards/idobao/id80/v3/keymaps/via/keymap.c
 create mode 100644 keyboards/idobao/id80/v3/keymaps/via/rules.mk
 create mode 100644 keyboards/idobao/id80/v3/readme.md
 create mode 100644 keyboards/idobao/id80/v3/rules.mk
 create mode 100644 keyboards/idobao/id80/v3/v3.c
 create mode 100644 keyboards/idobao/id80/v3/v3.h

diff --git a/keyboards/idobao/id80/v3/config.h b/keyboards/idobao/id80/v3/config.h
new file mode 100644
index 0000000000..06ca74a0e9
--- /dev/null
+++ b/keyboards/idobao/id80/v3/config.h
@@ -0,0 +1,135 @@
+/*
+Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
+Copyright 2022 peepeetee
+
+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       0x6964 /* "id" */
+#define PRODUCT_ID      0x0080
+#define DEVICE_VER      0x0003
+#define MANUFACTURER    IDOBAO
+#define PRODUCT         ID80 v3
+
+
+/* key matrix size */
+#define MATRIX_ROWS 9
+#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)
+ *
+ * The matrix description in the vendor-supplied JSON file for kbfirmware.com
+ * had 9 columns:
+ *     { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+ * and 12 rows:
+ *     { B7, B3, B2, B1, B0, E6, F0, F1, F4, F5, F6, F7 }
+ * However, the row 6 was completely empty, and the pin F0 was not actually
+ * routed anywhere on the PCB, therefore this row was removed to save some
+ * resources (the EEPROM space for dynamic keymaps is especially scarce).
+ *
+ * After doing the above change, the matrix was transposed (rows and columns
+ * were swapped), because a matrix with the COL2ROW layout can be scanned much
+ * more efficiently than a matrix with the ROW2COL layout (depending on various
+ * optimizations, the difference in scan rate can be over 2 times).  Because of
+ * this, the "columns" in the matrix layout now mostly correspond to physical
+ * rows, and the "rows" have mostly vertical physical orientation.
+ */
+#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+#define MATRIX_COL_PINS { B7, B3, B2, B1, B0, E6, F1, F4, F5, F6, F7 }
+
+#define DIODE_DIRECTION COL2ROW
+
+
+#define RGB_DI_PIN B6
+#    define DRIVER_LED_TOTAL 96 /* 16 Bottom 80 top*/
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 96 /* 16 Bottom 80 top*/
+#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#endif
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define RGB_MATRIX_KEYPRESSES
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
+
+/* Bootmagic Lite key configuration: use the Esc key */
+#define BOOTMAGIC_LITE_ROW      0
+#define BOOTMAGIC_LITE_COLUMN   5
+
+#define ENCODERS_PAD_A { C7 }
+#define ENCODERS_PAD_B { C6 }
+
+
+
+
diff --git a/keyboards/idobao/id80/v3/info.json b/keyboards/idobao/id80/v3/info.json
new file mode 100644
index 0000000000..0dc8efaf02
--- /dev/null
+++ b/keyboards/idobao/id80/v3/info.json
@@ -0,0 +1,96 @@
+{
+    "keyboard_name": "ID80 v3",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.25, "y":0},
+                {"label":"F2", "x":2.25, "y":0},
+                {"label":"F3", "x":3.25, "y":0},
+                {"label":"F4", "x":4.25, "y":0},
+                {"label":"F5", "x":5.5, "y":0},
+                {"label":"F6", "x":6.5, "y":0},
+                {"label":"F7", "x":7.5, "y":0},
+                {"label":"F8", "x":8.5, "y":0},
+                {"label":"F9", "x":9.75, "y":0},
+                {"label":"F10", "x":10.75, "y":0},
+                {"label":"F11", "x":11.75, "y":0},
+                {"label":"F12", "x":12.75, "y":0},
+                {"label":"Fn", "x":14, "y":0},
+                {"label":"Insert", "x":15.25, "y":0},
+
+                {"label":"`", "x":0, "y":1.25},
+                {"label":"1", "x":1, "y":1.25},
+                {"label":"2", "x":2, "y":1.25},
+                {"label":"3", "x":3, "y":1.25},
+                {"label":"4", "x":4, "y":1.25},
+                {"label":"5", "x":5, "y":1.25},
+                {"label":"6", "x":6, "y":1.25},
+                {"label":"7", "x":7, "y":1.25},
+                {"label":"8", "x":8, "y":1.25},
+                {"label":"9", "x":9, "y":1.25},
+                {"label":"0", "x":10, "y":1.25},
+                {"label":"-", "x":11, "y":1.25},
+                {"label":"=", "x":12, "y":1.25},
+                {"label":"Backspace", "x":13, "y":1.25, "w":2},
+                {"label":"Home", "x":15.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":6.5, "y":2.25},
+                {"label":"U", "x":7.5, "y":2.25},
+                {"label":"I", "x":8.5, "y":2.25},
+                {"label":"O", "x":9.5, "y":2.25},
+                {"label":"P", "x":10.5, "y":2.25},
+                {"label":"[", "x":11.5, "y":2.25},
+                {"label":"]", "x":12.5, "y":2.25},
+                {"label":"\\", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":6.75, "y":3.25},
+                {"label":"J", "x":7.75, "y":3.25},
+                {"label":"K", "x":8.75, "y":3.25},
+                {"label":"L", "x":9.75, "y":3.25},
+                {"label":";", "x":10.75, "y":3.25},
+                {"label":"'", "x":11.75, "y":3.25},
+                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"N", "x":7.25, "y":4.25},
+                {"label":"M", "x":8.25, "y":4.25},
+                {"label":",", "x":9.25, "y":4.25},
+                {"label":".", "x":10.25, "y":4.25},
+                {"label":"/", "x":11.25, "y":4.25},
+                {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"\u2191", "x":14.25, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.25, "w":1.5},
+                {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":13.25, "y":5.5},
+                {"label":"\u2193", "x":14.25, "y":5.5},
+                {"label":"\u2192", "x":15.25, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id80/v3/keymaps/default/keymap.c b/keyboards/idobao/id80/v3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..697c4b9189
--- /dev/null
+++ b/keyboards/idobao/id80/v3/keymaps/default/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     KC_INS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_HOME,
+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_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,     KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        RESET,     _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
+        _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, BL_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
+        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
+    ),
+};
+
diff --git a/keyboards/idobao/id80/v3/keymaps/default/readme.md b/keyboards/idobao/id80/v3/keymaps/default/readme.md
new file mode 100644
index 0000000000..8ae9f656cd
--- /dev/null
+++ b/keyboards/idobao/id80/v3/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for id80
diff --git a/keyboards/idobao/id80/v3/keymaps/via/keymap.c b/keyboards/idobao/id80/v3/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1f37572503
--- /dev/null
+++ b/keyboards/idobao/id80/v3/keymaps/via/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,     KC_F5,   KC_F6,   KC_F7,   KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,     MO(1),     KC_INS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_HOME,
+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_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,     KC_RCTL,        KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        RESET,     _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   KC_MUTE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
+        _______,     RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,        _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, BL_DEC,  BL_TOGG, BL_INC,  NK_TOGG, _______, _______, _______, _______, _______,          BL_INC,
+        _______,   _______,   _______,                      _______,                              _______,     _______,        BL_TOGG, BL_DEC,  BL_STEP
+    ),
+    [2] = LAYOUT(
+        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,   _______,   _______,                      _______,                              _______,     _______,        _______, _______, _______
+    ),
+    [3] = LAYOUT(
+        _______,   _______, _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______,    _______,   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,   _______,   _______,                      _______,                              _______,     _______,        _______, _______, _______
+    ),
+};
+
diff --git a/keyboards/idobao/id80/v3/keymaps/via/rules.mk b/keyboards/idobao/id80/v3/keymaps/via/rules.mk
new file mode 100644
index 0000000000..ca9fed0e6b
--- /dev/null
+++ b/keyboards/idobao/id80/v3/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/idobao/id80/v3/readme.md b/keyboards/idobao/id80/v3/readme.md
new file mode 100644
index 0000000000..dc6c67b4f4
--- /dev/null
+++ b/keyboards/idobao/id80/v3/readme.md
@@ -0,0 +1,27 @@
+# ID80v3
+
+![ID80v3](https://i.imgur.com/PGvZfQj.jpg)
+
+A 75% hotswap in-switch RGB keyboard with an encoder.
+
+* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
+* Hardware Supported: ID80v3
+* Hardware Availability: Not avaliable yet
+
+Make example for this keyboard (after setting up your build environment):
+
+    make idobao/id80/v3:default
+
+Flashing example for this keyboard:
+
+    make idobao/id80/v3:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/idobao/id80/v3/rules.mk b/keyboards/idobao/id80/v3/rules.mk
new file mode 100644
index 0000000000..49781db616
--- /dev/null
+++ b/keyboards/idobao/id80/v3/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/idobao/id80/v3/v3.c b/keyboards/idobao/id80/v3/v3.c
new file mode 100644
index 0000000000..cd05a26a49
--- /dev/null
+++ b/keyboards/idobao/id80/v3/v3.c
@@ -0,0 +1,62 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// Copyright 2022 Xelus22
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "v3.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    { 8,   9,      34,   35,   64,   65,   NO_LED,   NO_LED, NO_LED, NO_LED,   NO_LED },
+    { 7,   NO_LED, 33,   36,   63,   66,   NO_LED,   NO_LED, NO_LED, NO_LED,   NO_LED },
+    { 6,   10,     32,   37,   62,   67,   NO_LED,   NO_LED, 49,     50,       79 },
+    { 0,   11,     31,   38,   61,   68,   21,       NO_LED, 48,     NO_LED,   77 },
+    { 1,   12,     30,   39,   60,   69,   20,       22,     47,     52,   76 },
+    { 2,   13,     29,   40,   59,   70,   19,       23,     46,     53,   75 },
+    { 5,   14,     28,   41,   58,   71,   NO_LED,   NO_LED, NO_LED, 51,   78 },
+    { 3,   15,     27,   42,   57,   72,   18,       24,     45,     54,   74 },
+    { 4,   16,     26,   43,   56,   73,   17,       25,     44,     55,   NO_LED },
+}, {
+    // LED Index to Physical Position
+{224, 64}, {209, 64}, {195, 64}, {173, 61}, {151, 61}, {94 , 61}, {39 , 61}, {20 , 61}, {2  , 61}, {9  , 50}, {33 , 50},
+{48 , 50}, {62 , 50}, {77 , 50}, {92 , 50}, {106, 50}, {121, 50}, {136, 50}, {151, 50}, {165, 50}, {185, 50}, {209, 53},
+{196, 39}, {173, 39}, {158, 39}, {143, 39}, {129, 39}, {114, 39}, {99 , 39}, {84 , 39}, {70 , 39}, {55 , 39}, {40 , 39},
+{26 , 39}, {6  , 39}, {4  , 28}, {22 , 28}, {37 , 28}, {51 , 28}, {66 , 28}, {81 , 28}, {95 , 28}, {110, 28}, {125, 28},
+{140, 28}, {154, 28}, {169, 28}, {184, 28}, {202, 28}, {224, 28}, {224, 17}, {198, 17}, {176, 17}, {162, 17}, {147, 17},
+{132, 17}, {118, 17}, {103, 17}, {88 , 17}, {73 , 17}, {59 , 17}, {44 , 17}, {29 , 17}, {15 , 17}, {0  , 17}, {0  ,  0},
+{18 ,  0}, {33 ,  0}, {48 ,  0}, {62 ,  0}, {81 ,  0}, {95 ,  0}, {110,  0}, {125,  0}, {143,  0}, {158,  0}, {173,  0},
+{187,  0}, {206,  0}, {224,  0},
+
+{ 207,  13},
+{ 207,  32},
+{ 207,  51},{ 174,  51},{ 141,  51},{ 108,  51},{ 73,  51},{ 40,  51},{  13,  51 },
+{ 13,  32},
+{ 13,  13},{ 40,  13},{ 73,  13},{ 108,  13},{ 141,  13},{ 174,  13},
+
+}, {
+    // LED Index to Flag
+1,1,1,1,1,4,1,1,1,
+1,4,4,4,4,4,4,4,4,4,4,1,1,
+1,4,4,4,4,4,4,4,4,4,4,4,1,
+1,4,4,4,4,4,4,4,4,4,4,4,4,4,1,
+1,1,4,4,4,4,4,4,4,4,4,4,4,4,4,
+1,4,4,4,4,1,1,1,1,4,4,4,4,1,1,
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+
+} };
+
+#endif
diff --git a/keyboards/idobao/id80/v3/v3.h b/keyboards/idobao/id80/v3/v3.h
new file mode 100644
index 0000000000..94626fe4f6
--- /dev/null
+++ b/keyboards/idobao/id80/v3/v3.h
@@ -0,0 +1,37 @@
+/* Copyright 2020 Sergey Vlasov <sigprof@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    K50,  K51, K52, K53, K54,  K55, K56, K57, K58,  KA7, KA5, KA4, KA3,   KA6,  KA2,  \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K98, K97, K95, K94, K96,       K92,  \
+    K30,   K31, K32, K33, K34, K35, K36, K37, K38, K88, K87, K85, K84, K83,     K82,  \
+    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K78, K77, K75, K74,               \
+    K10,       K12, K13, K14, K15, K16, K17, K18, K68, K67, K65, K64,      K63,       \
+    K00,  K01,  K02,              K06,                K08,   K07,     K05, K04, K03   \
+) { \
+    { K00,   K10,   K20,   K30,   K40,   K50,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { K01,   KC_NO, K21,   K31,   K41,   K51,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { K02,   K12,   K22,   K32,   K42,   K52,   KC_NO, KC_NO, K82,   K92,   KA2   }, \
+    { K03,   K13,   K23,   K33,   K43,   K53,   K63,   KC_NO, K83,   KC_NO, KA3   }, \
+    { K04,   K14,   K24,   K34,   K44,   K54,   K64,   K74,   K84,   K94,   KA4   }, \
+    { K05,   K15,   K25,   K35,   K45,   K55,   K65,   K75,   K85,   K95,   KA5   }, \
+    { K06,   K16,   K26,   K36,   K46,   K56,   KC_NO, KC_NO, KC_NO, K96,   KA6   }, \
+    { K07,   K17,   K27,   K37,   K47,   K57,   K67,   K77,   K87,   K97,   KA7   }, \
+    { K08,   K18,   K28,   K38,   K48,   K58,   K68,   K78,   K88,   K98,   KC_NO }, \
+}

From c212b65e48bc203a05cd627ba0830b9be0b3d90a Mon Sep 17 00:00:00 2001
From: MechMerlin <30334081+mechmerlin@users.noreply.github.com>
Date: Tue, 8 Feb 2022 21:51:20 -0800
Subject: [PATCH 570/867] New Keyboard: 1upkeyboards super16v2 (#16198)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/1upkeyboards/super16v2/config.h     | 151 ++++++++++++++++++
 keyboards/1upkeyboards/super16v2/info.json    |  10 ++
 .../super16v2/keymaps/default/keymap.c        |  34 ++++
 .../super16v2/keymaps/default/readme.md       |   1 +
 .../super16v2/keymaps/via/keymap.c            |  48 ++++++
 .../super16v2/keymaps/via/readme.md           |   1 +
 .../super16v2/keymaps/via/rules.mk            |   2 +
 keyboards/1upkeyboards/super16v2/readme.md    |  25 +++
 keyboards/1upkeyboards/super16v2/rules.mk     |  18 +++
 keyboards/1upkeyboards/super16v2/super16v2.c  |  17 ++
 keyboards/1upkeyboards/super16v2/super16v2.h  |  39 +++++
 11 files changed, 346 insertions(+)
 create mode 100644 keyboards/1upkeyboards/super16v2/config.h
 create mode 100644 keyboards/1upkeyboards/super16v2/info.json
 create mode 100644 keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c
 create mode 100644 keyboards/1upkeyboards/super16v2/keymaps/default/readme.md
 create mode 100644 keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c
 create mode 100644 keyboards/1upkeyboards/super16v2/keymaps/via/readme.md
 create mode 100644 keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk
 create mode 100644 keyboards/1upkeyboards/super16v2/readme.md
 create mode 100644 keyboards/1upkeyboards/super16v2/rules.mk
 create mode 100644 keyboards/1upkeyboards/super16v2/super16v2.c
 create mode 100644 keyboards/1upkeyboards/super16v2/super16v2.h

diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
new file mode 100644
index 0000000000..4fd4238780
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -0,0 +1,151 @@
+/* Copyright 2022 MechMerlin
+ *
+ * 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    0x6F75 // OU
+#define PRODUCT_ID   0x5517
+#define DEVICE_VER   0x0001
+#define MANUFACTURER 1upkeyboards
+#define PRODUCT      super16v2
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 4
+
+/*
+ * 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)
+ *
+ */
+
+//                         0   1   2   3
+#define MATRIX_ROW_PINS { D1, D2, D3, D4 }
+#define MATRIX_COL_PINS { D5, D6, C2, D0 }
+
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN B5
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 20
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#    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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json
new file mode 100644
index 0000000000..2a384f775d
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "super16v2",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+      "LAYOUT_ortho_4x4": {
+        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
+      }
+    }
+  }
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..dc58023a37
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2022 MechMerlin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_4x4( /* Base */
+    KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
+    KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+    KC_P1,    KC_P2,    KC_P3,    KC_PSLS,
+    MO(1),    KC_P0,    KC_PDOT,  KC_PENT
+  ),
+
+  [1] = LAYOUT_ortho_4x4( /* Fn Layer */
+    RGB_TOG,   RGB_HUI,    RGB_SAI,    RGB_VAI,
+    RGB_MOD,   RGB_HUD,    RGB_SAD,    RGB_VAD,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    RESET
+  ),
+};
+
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md
new file mode 100644
index 0000000000..e229fcba74
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Super 16 V2
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..7e8f41b909
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2022 MechMerlin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_ortho_4x4( /* Base */
+    KC_P7,    KC_P8,    KC_P9,    KC_PMNS,
+    KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+    KC_P1,    KC_P2,    KC_P3,    KC_PSLS,
+    MO(1),    KC_P0,    KC_PDOT,  KC_PENT
+  ),
+
+  [1] = LAYOUT_ortho_4x4( /* Fn Layer */
+    RGB_TOG,   RGB_HUI,    RGB_SAI,    RGB_VAI,
+    RGB_MOD,   RGB_HUD,    RGB_SAD,    RGB_VAD,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS,   KC_TRNS,    KC_TRNS,    RESET
+  ),
+
+  [2] = LAYOUT_ortho_4x4( 
+    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
+  ),
+
+  [3] = LAYOUT_ortho_4x4( 
+    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
+  ),
+};
+
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md
new file mode 100644
index 0000000000..e229fcba74
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default keymap for Super 16 V2
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk b/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/1upkeyboards/super16v2/readme.md b/keyboards/1upkeyboards/super16v2/readme.md
new file mode 100644
index 0000000000..b2c0ca747b
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/readme.md
@@ -0,0 +1,25 @@
+# Super 16 V2
+
+A 4x4 macropad with RGB inswitch lighting and underglow. 
+
+* Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
+* Hardware Supported: 1upkeyboards Super 16 V2
+* Hardware Availability: [1upkeyboards](https://1upkeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 1upkeyboards/super16v2:default
+
+Flashing example for this keyboard:
+
+    make 1upkeyboards/super16v2:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk
new file mode 100644
index 0000000000..d31d53cead
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/1upkeyboards/super16v2/super16v2.c b/keyboards/1upkeyboards/super16v2/super16v2.c
new file mode 100644
index 0000000000..fc73f700c4
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/super16v2.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 MechMerlin
+ *
+ * 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 "super16v2.h"
diff --git a/keyboards/1upkeyboards/super16v2/super16v2.h b/keyboards/1upkeyboards/super16v2/super16v2.h
new file mode 100644
index 0000000000..58fd26ed8a
--- /dev/null
+++ b/keyboards/1upkeyboards/super16v2/super16v2.h
@@ -0,0 +1,39 @@
+/* Copyright 2022 MechMerlin
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#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 }  \
+}

From c49438feec9fb6be368d6377ca05d0c86d310d4f Mon Sep 17 00:00:00 2001
From: Brandon Claveria <48102030+swiftrax@users.noreply.github.com>
Date: Tue, 8 Feb 2022 21:51:51 -0800
Subject: [PATCH 571/867] [Keyboard] Digicarp65 (#15926)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: swiftrax <swiftrax@github.com>
---
 .../handwired/swiftrax/digicarp65/config.h    |  47 +++
 .../swiftrax/digicarp65/digicarp65.c          |  31 ++
 .../swiftrax/digicarp65/digicarp65.h          |  78 +++++
 .../handwired/swiftrax/digicarp65/info.json   | 315 ++++++++++++++++++
 .../digicarp65/keymaps/default/keymap.c       |  42 +++
 .../swiftrax/digicarp65/keymaps/via/keymap.c  |  50 +++
 .../swiftrax/digicarp65/keymaps/via/rules.mk  |   1 +
 .../handwired/swiftrax/digicarp65/readme.md   |  21 ++
 .../handwired/swiftrax/digicarp65/rules.mk    |  21 ++
 9 files changed, 606 insertions(+)
 create mode 100644 keyboards/handwired/swiftrax/digicarp65/config.h
 create mode 100644 keyboards/handwired/swiftrax/digicarp65/digicarp65.c
 create mode 100644 keyboards/handwired/swiftrax/digicarp65/digicarp65.h
 create mode 100644 keyboards/handwired/swiftrax/digicarp65/info.json
 create mode 100644 keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/swiftrax/digicarp65/keymaps/via/rules.mk
 create mode 100644 keyboards/handwired/swiftrax/digicarp65/readme.md
 create mode 100644 keyboards/handwired/swiftrax/digicarp65/rules.mk

diff --git a/keyboards/handwired/swiftrax/digicarp65/config.h b/keyboards/handwired/swiftrax/digicarp65/config.h
new file mode 100644
index 0000000000..1f11e310d1
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/config.h
@@ -0,0 +1,47 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xE7F1
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Swiftrax
+#define PRODUCT         DigiCarp65
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS { B2, B1, F4, F1, F0 }
+#define MATRIX_COL_PINS { F5, C6, F6, F7, C7, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define ENCODERS_PAD_A { B3 }
+#define ENCODERS_PAD_B { B7 }
diff --git a/keyboards/handwired/swiftrax/digicarp65/digicarp65.c b/keyboards/handwired/swiftrax/digicarp65/digicarp65.c
new file mode 100644
index 0000000000..99823a756c
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/digicarp65.c
@@ -0,0 +1,31 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "digicarp65.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/handwired/swiftrax/digicarp65/digicarp65.h b/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
new file mode 100644
index 0000000000..2797d771d0
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
@@ -0,0 +1,78 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "quantum.h"
+
+
+ #define LAYOUT_65_ansi( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
+     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+ ) \
+ { \
+  { K00,   K01, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A, K0B,   K0C, KC_NO, K0E, K0F }, \
+  { K10, KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B,   K1C,   K1D, K1E, K1F }, \
+  { K20, KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B,   K2C,   K2D,KC_NO,K2F }, \
+  { K30, KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A, K3B, KC_NO,   K3D, K3E, K3F }, \
+  { K40,   K41, K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO, KC_NO,   K4A, K4B,   K4C,   K4D, K4E, K4F }, \
+ }
+
+ #define LAYOUT_65_iso( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+ ) \
+ { \
+     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   KC_NO,   K0E, K0F }, \
+     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,     K1D,   K2D, K1F }, \
+     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C,   KC_NO,   K2E, K2F }, \
+     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,     K3D,   K3E, K3F }, \
+     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,     K4D,   K4E, K4F }, \
+ }
+ #define LAYOUT_65_ansi_split_bs( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+ ) \
+ { \
+     { K00, K01,   K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
+     { K10, KC_NO, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
+     { K20, KC_NO, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
+     { K30, KC_NO, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
+     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C, K4D,   K4E, K4F }, \
+ }
+#define LAYOUT_65_iso_split_bs( \
+     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
+     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
+ ) \
+ { \
+     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   K0D,   K0E, K0F }, \
+     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,   K1D,   K2D, K1F }, \
+     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C, KC_NO,   K2E, K2F }, \
+     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,   K3D,   K3E, K3F }, \
+     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,   K4D,   K4E, K4F }, \
+ }
diff --git a/keyboards/handwired/swiftrax/digicarp65/info.json b/keyboards/handwired/swiftrax/digicarp65/info.json
new file mode 100644
index 0000000000..a5fe908e5d
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/info.json
@@ -0,0 +1,315 @@
+{
+    "keyboard_name": "digicarp65",
+    "url": "https://github.com/swiftrax",
+    "maintainer": "swiftrax",
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0, "w":2},
+                {"label": "r1_15", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "r3_14", "x": 15, "y": 2},
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
+                {"label": "r4_02", "x": 2.25, "y": 3},
+                {"label": "r4_03", "x": 3.25, "y": 3},
+                {"label": "r4_04", "x": 4.25, "y": 3},
+                {"label": "r4_05", "x": 5.25, "y": 3},
+                {"label": "r4_06", "x": 6.25, "y": 3},
+                {"label": "r4_07", "x": 7.25, "y": 3},
+                {"label": "r4_08", "x": 8.25, "y": 3},
+                {"label": "r4_09", "x": 9.25, "y": 3},
+                {"label": "r4_10", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0, "w":2},
+                {"label": "r1_15", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2},
+                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
+                {"label": "r3_15", "x": 15, "y": 2},
+
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
+                {"label": "r4_02", "x": 1.25, "y": 3},
+                {"label": "r4_03", "x": 2.25, "y": 3},
+                {"label": "r4_04", "x": 3.25, "y": 3},
+                {"label": "r4_05", "x": 4.25, "y": 3},
+                {"label": "r4_06", "x": 5.25, "y": 3},
+                {"label": "r4_07", "x": 6.25, "y": 3},
+                {"label": "r4_08", "x": 7.25, "y": 3},
+                {"label": "r4_09", "x": 8.25, "y": 3},
+                {"label": "r4_10", "x": 9.25, "y": 3},
+                {"label": "r4_11", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_split_bs": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0},
+                {"label": "r1_15", "x": 14, "y": 0},
+                {"label": "r1_16", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "r3_14", "x": 15, "y": 2},
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
+                {"label": "r4_02", "x": 2.25, "y": 3},
+                {"label": "r4_03", "x": 3.25, "y": 3},
+                {"label": "r4_04", "x": 4.25, "y": 3},
+                {"label": "r4_05", "x": 5.25, "y": 3},
+                {"label": "r4_06", "x": 6.25, "y": 3},
+                {"label": "r4_07", "x": 7.25, "y": 3},
+                {"label": "r4_08", "x": 8.25, "y": 3},
+                {"label": "r4_09", "x": 9.25, "y": 3},
+                {"label": "r4_10", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_iso_split_bs": {
+            "layout": [
+                {"label": "r1_01", "x": 0, "y": 0},
+                {"label": "r1_02", "x": 1, "y": 0},
+                {"label": "r1_03", "x": 2, "y": 0},
+                {"label": "r1_04", "x": 3, "y": 0},
+                {"label": "r1_05", "x": 4, "y": 0},
+                {"label": "r1_06", "x": 5, "y": 0},
+                {"label": "r1_07", "x": 6, "y": 0},
+                {"label": "r1_08", "x": 7, "y": 0},
+                {"label": "r1_09", "x": 8, "y": 0},
+                {"label": "r1_10", "x": 9, "y": 0},
+                {"label": "r1_11", "x": 10, "y": 0},
+                {"label": "r1_12", "x": 11, "y": 0},
+                {"label": "r1_13", "x": 12, "y": 0},
+                {"label": "r1_14", "x": 13, "y": 0},
+                {"label": "r1_15", "x": 14, "y": 0},
+                {"label": "r1_16", "x": 15, "y": 0},
+
+                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
+                {"label": "r2_02", "x": 1.5, "y": 1},
+                {"label": "r2_03", "x": 2.5, "y": 1},
+                {"label": "r2_04", "x": 3.5, "y": 1},
+                {"label": "r2_05", "x": 4.5, "y": 1},
+                {"label": "r2_06", "x": 5.5, "y": 1},
+                {"label": "r2_07", "x": 6.5, "y": 1},
+                {"label": "r2_08", "x": 7.5, "y": 1},
+                {"label": "r2_09", "x": 8.5, "y": 1},
+                {"label": "r2_10", "x": 9.5, "y": 1},
+                {"label": "r2_11", "x": 10.5, "y": 1},
+                {"label": "r2_12", "x": 11.5, "y": 1},
+                {"label": "r2_13", "x": 12.5, "y": 1},
+                {"label": "r2_14", "x": 13.5, "y": 1},
+                {"label": "r2_15", "x": 15, "y": 1},
+
+                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
+                {"label": "r3_02", "x": 1.75, "y": 2},
+                {"label": "r3_03", "x": 2.75, "y": 2},
+                {"label": "r3_04", "x": 3.75, "y": 2},
+                {"label": "r3_05", "x": 4.75, "y": 2},
+                {"label": "r3_06", "x": 5.75, "y": 2},
+                {"label": "r3_07", "x": 6.75, "y": 2},
+                {"label": "r3_08", "x": 7.75, "y": 2},
+                {"label": "r3_09", "x": 8.75, "y": 2},
+                {"label": "r3_10", "x": 9.75, "y": 2},
+                {"label": "r3_11", "x": 10.75, "y": 2},
+                {"label": "r3_12", "x": 11.75, "y": 2},
+                {"label": "r3_13", "x": 12.75, "y": 2},
+                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
+                {"label": "r3_15", "x": 15, "y": 2},
+
+
+                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
+                {"label": "r4_02", "x": 1.25, "y": 3},
+                {"label": "r4_03", "x": 2.25, "y": 3},
+                {"label": "r4_04", "x": 3.25, "y": 3},
+                {"label": "r4_05", "x": 4.25, "y": 3},
+                {"label": "r4_06", "x": 5.25, "y": 3},
+                {"label": "r4_07", "x": 6.25, "y": 3},
+                {"label": "r4_08", "x": 7.25, "y": 3},
+                {"label": "r4_09", "x": 8.25, "y": 3},
+                {"label": "r4_10", "x": 9.25, "y": 3},
+                {"label": "r4_11", "x": 10.25, "y": 3},
+                {"label": "r4_11", "x": 11.25, "y": 3},
+                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
+                {"label": "r4_13", "x": 14, "y": 3},
+                {"label": "r4_14", "x": 15, "y": 3},
+
+                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
+                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
+                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "r4_07", "x": 13, "y": 4},
+                {"label": "r4_08", "x": 14, "y": 4},
+                {"label": "r4_09", "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5de5c63144
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI,   MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        RESET,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
+    ),
+    [2] = LAYOUT_65_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d3bffe8c4c
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/*
+Copyright 2022 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RGUI,   MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        RESET,   KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
+    ),
+    [2] = LAYOUT_65_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_65_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_PGUP, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
+
diff --git a/keyboards/handwired/swiftrax/digicarp65/keymaps/via/rules.mk b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/digicarp65/readme.md b/keyboards/handwired/swiftrax/digicarp65/readme.md
new file mode 100644
index 0000000000..619ec519f0
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/readme.md
@@ -0,0 +1,21 @@
+# DigiCarp65
+
+A 65% keyboard
+
+* Keyboard Maintainer: Swiftrax
+* Hardware Supported: DigiCarp65
+* Hardware Availability: https://github.com/swiftrax
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/swiftrax/digicarp65: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key)and plug in the keyboard
+* **Physical reset button**: Briefly short the pad on the back of the PCB labeled RESET
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/swiftrax/digicarp65/rules.mk b/keyboards/handwired/swiftrax/digicarp65/rules.mk
new file mode 100644
index 0000000000..7a15812bc8
--- /dev/null
+++ b/keyboards/handwired/swiftrax/digicarp65/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Rotary Encoder
+
+LAYOUTS = 65_ansi 65_ansi_split_bs 65_iso 65_iso_split_bs

From d1e5221bf806e96e1174ee2b318ef4126e24d2d4 Mon Sep 17 00:00:00 2001
From: jack <59737601+waffle87@users.noreply.github.com>
Date: Wed, 9 Feb 2022 00:01:58 -0700
Subject: [PATCH 572/867] Fix idobao/id80/v3 compilation errors (#16280)

* fix

* another redefintion
---
 keyboards/idobao/id80/v3/config.h | 10 +++-------
 keyboards/idobao/id80/v3/rules.mk |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/keyboards/idobao/id80/v3/config.h b/keyboards/idobao/id80/v3/config.h
index 06ca74a0e9..4b2fb8d056 100644
--- a/keyboards/idobao/id80/v3/config.h
+++ b/keyboards/idobao/id80/v3/config.h
@@ -62,14 +62,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIODE_DIRECTION COL2ROW
 
-
+#undef RGB_DI_PIN
 #define RGB_DI_PIN B6
-#    define DRIVER_LED_TOTAL 96 /* 16 Bottom 80 top*/
-#ifdef RGB_DI_PIN
-#    define RGBLED_NUM 96 /* 16 Bottom 80 top*/
-#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-#endif
 #ifdef RGB_MATRIX_ENABLE
+#    define DRIVER_LED_TOTAL 96 /* 16 Bottom 80 top*/
 #    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
@@ -108,7 +104,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
 #    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+// enabled only if RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
 #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
 #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
 #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
diff --git a/keyboards/idobao/id80/v3/rules.mk b/keyboards/idobao/id80/v3/rules.mk
index 49781db616..6805b8f0f9 100644
--- a/keyboards/idobao/id80/v3/rules.mk
+++ b/keyboards/idobao/id80/v3/rules.mk
@@ -17,6 +17,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
+LTO_ENABLE = yes
 
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812

From de4f2bf1ff6ed410b93b20246169d0aec0ea16ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arda=20K=C4=B1l=C4=B1=C3=A7da=C4=9F=C4=B1?=
 <ardakilicdagi@gmail.com>
Date: Wed, 9 Feb 2022 22:47:53 +0300
Subject: [PATCH 573/867] Further update to #13745 on Crkbd keymap (#16284)

* Further update to #13745

Hello,

This is further update to #13745 , somehow my commit did not get merged

https://github.com/qmk/qmk_firmware/pull/13745#discussion_r802603490

* Update config.h
---
 keyboards/crkbd/keymaps/ardakilic/config.h | 5 ++++-
 keyboards/crkbd/keymaps/ardakilic/keymap.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/keyboards/crkbd/keymaps/ardakilic/config.h b/keyboards/crkbd/keymaps/ardakilic/config.h
index 78602b22ab..7a3bb76b38 100644
--- a/keyboards/crkbd/keymaps/ardakilic/config.h
+++ b/keyboards/crkbd/keymaps/ardakilic/config.h
@@ -24,6 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Select hand configuration */
 
 #define MASTER_LEFT
+
+#define SPLIT_WPM_ENABLE
+
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
@@ -54,4 +57,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define NO_ACTION_ONESHOT
 // Size optimisations END
-*/
\ No newline at end of file
+*/
diff --git a/keyboards/crkbd/keymaps/ardakilic/keymap.c b/keyboards/crkbd/keymaps/ardakilic/keymap.c
index 758cdbab60..a611c59223 100644
--- a/keyboards/crkbd/keymaps/ardakilic/keymap.c
+++ b/keyboards/crkbd/keymaps/ardakilic/keymap.c
@@ -249,7 +249,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 
-#ifdef OLED_DRIVER_ENABLE
+#ifdef OLED_ENABLE
 // #include <stdio.h>
 
 // bongo cat

From 1f67de2001965a11925b530eedbe60f0191fdced Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 9 Feb 2022 19:55:39 +0000
Subject: [PATCH 574/867] Align existing pca9555 driver to better match
 mcp23018 API (#16277)

---
 drivers/gpio/pca9555.c                     | 61 +++++++++-------
 drivers/gpio/pca9555.h                     | 81 +++++++++++++++-------
 keyboards/moon/matrix.c                    |  8 ++-
 keyboards/switchplate/southpaw_65/matrix.c | 11 +--
 keyboards/xiudi/xd84/matrix.c              |  3 +-
 keyboards/xiudi/xd96/matrix.c              | 11 +--
 6 files changed, 113 insertions(+), 62 deletions(-)

diff --git a/drivers/gpio/pca9555.c b/drivers/gpio/pca9555.c
index 02b5abbdde..adcd040083 100644
--- a/drivers/gpio/pca9555.c
+++ b/drivers/gpio/pca9555.c
@@ -1,18 +1,6 @@
-/* Copyright 2019
- *
- * 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/>.
- */
+// Copyright 2020 zvecr<git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include "i2c_master.h"
 #include "pca9555.h"
 
@@ -45,39 +33,59 @@ void pca9555_init(uint8_t slave_addr) {
     // i2c_stop();
 }
 
-void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) {
+bool pca9555_set_config(uint8_t slave_addr, pca9555_port_t port, uint8_t conf) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = port ? CMD_CONFIG_1 : CMD_CONFIG_0;
 
     i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9555_set_config::FAILED\n");
+        return false;
     }
+
+    return true;
 }
 
-void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf) {
+bool pca9555_set_output(uint8_t slave_addr, pca9555_port_t port, uint8_t conf) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = port ? CMD_OUTPUT_1 : CMD_OUTPUT_0;
 
     i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9555_set_output::FAILED\n");
+        return false;
     }
+
+    return true;
 }
 
-uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port) {
+bool pca9555_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB) {
+    uint8_t addr    = SLAVE_TO_ADDR(slave_addr);
+    uint8_t conf[2] = {confA, confB};
+
+    i2c_status_t ret = i2c_writeReg(addr, CMD_OUTPUT_0, &conf[0], sizeof(conf), TIMEOUT);
+    if (ret != I2C_STATUS_SUCCESS) {
+        dprintf("pca9555_set_output::FAILED::%u\n", ret);
+        return false;
+    }
+
+    return true;
+}
+
+bool pca9555_readPins(uint8_t slave_addr, pca9555_port_t port, uint8_t* out) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
     uint8_t cmd  = port ? CMD_INPUT_1 : CMD_INPUT_0;
 
-    uint8_t      data = 0;
-    i2c_status_t ret  = i2c_readReg(addr, cmd, &data, sizeof(data), TIMEOUT);
+    i2c_status_t ret = i2c_readReg(addr, cmd, out, sizeof(uint8_t), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
         print("pca9555_readPins::FAILED\n");
+        return false;
     }
-    return data;
+
+    return true;
 }
 
-uint16_t pca9555_readAllPins(uint8_t slave_addr) {
+bool pca9555_readPins_all(uint8_t slave_addr, uint16_t* out) {
     uint8_t addr = SLAVE_TO_ADDR(slave_addr);
 
     typedef union {
@@ -85,11 +93,14 @@ uint16_t pca9555_readAllPins(uint8_t slave_addr) {
         uint16_t u16;
     } data16;
 
-    data16 data;
+    data16 data = {.u16 = 0};
 
     i2c_status_t ret = i2c_readReg(addr, CMD_INPUT_0, &data.u8[0], sizeof(data), TIMEOUT);
     if (ret != I2C_STATUS_SUCCESS) {
-        print("pca9555_readAllPins::FAILED\n");
+        print("pca9555_readPins_all::FAILED\n");
+        return false;
     }
-    return data.u16;
+
+    *out = data.u16;
+    return true;
 }
diff --git a/drivers/gpio/pca9555.h b/drivers/gpio/pca9555.h
index 3341ec3eb5..6362ab68ae 100644
--- a/drivers/gpio/pca9555.h
+++ b/drivers/gpio/pca9555.h
@@ -1,20 +1,11 @@
-/* Copyright 2019
- *
- * 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/>.
- */
+// Copyright 2020 zvecr<git@zvecr.com>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
+#include <stdint.h>
+#include <stdbool.h>
+
 /*
             PCA9555
          ,----------.
@@ -38,20 +29,60 @@
          `----------'
 */
 
-#define PCA9555_PORT0 0
-#define PCA9555_PORT1 1
+/**
+ * Port ID
+ */
+typedef enum {
+    PCA9555_PORT0,
+    PCA9555_PORT1,
+} pca9555_port_t;
 
-#define ALL_OUTPUT 0
-#define ALL_INPUT 0xFF
-#define ALL_LOW 0
-#define ALL_HIGH 0xFF
+/**
+ * Helpers for set_config
+ */
+enum {
+    ALL_OUTPUT = 0,
+    ALL_INPUT  = 0xFF,
+};
 
+/**
+ * Helpers for set_output
+ */
+enum {
+    ALL_LOW  = 0,
+    ALL_HIGH = 0xFF,
+};
+
+/**
+ * Init expander and any other dependent drivers
+ */
 void pca9555_init(uint8_t slave_addr);
 
-void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf);
+/**
+ * Configure input/output to a given port
+ */
+bool pca9555_set_config(uint8_t slave_addr, pca9555_port_t port, uint8_t conf);
 
-void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf);
+/**
+ * Write high/low to a given port
+ */
+bool pca9555_set_output(uint8_t slave_addr, pca9555_port_t port, uint8_t conf);
 
-uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port);
+/**
+ * Write high/low to both ports sequentially
+ *
+ *  - slightly faster than multiple set_output
+ */
+bool pca9555_set_output_all(uint8_t slave_addr, uint8_t confA, uint8_t confB);
 
-uint16_t pca9555_readAllPins(uint8_t slave_addr);
+/**
+ * Read state of a given port
+ */
+bool pca9555_readPins(uint8_t slave_addr, pca9555_port_t port, uint8_t* ret);
+
+/**
+ * Read state of both ports sequentially
+ *
+ *  - slightly faster than multiple readPins
+ */
+bool pca9555_readPins_all(uint8_t slave_addr, uint16_t* ret);
diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c
index 24b4d49560..0615b60ad3 100644
--- a/keyboards/moon/matrix.c
+++ b/keyboards/moon/matrix.c
@@ -158,10 +158,12 @@ static void select_row(uint8_t row) {
 }
 
 static uint16_t read_cols(void) {
-  uint16_t state_1 = pca9555_readPins(IC2, PCA9555_PORT0);
-  uint16_t state_2 = pca9555_readPins(IC2, PCA9555_PORT1);
+  uint8_t state_1 = 0;
+  uint8_t state_2 = 0;
+  pca9555_readPins(IC2, PCA9555_PORT0, &state_1);
+  pca9555_readPins(IC2, PCA9555_PORT1, &state_2);
 
-  uint16_t state = ((state_1 & PORT0_COLS_MASK) << 3) | ((state_2 & PORT1_COLS_MASK));
+  uint16_t state = (((uint16_t)state_1 & PORT0_COLS_MASK) << 3) | (((uint16_t)state_2 & PORT1_COLS_MASK));
 
   // A low pin indicates an active column
   return (~state) & COLS_MASK;
diff --git a/keyboards/switchplate/southpaw_65/matrix.c b/keyboards/switchplate/southpaw_65/matrix.c
index e701d274f0..5895750f89 100644
--- a/keyboards/switchplate/southpaw_65/matrix.c
+++ b/keyboards/switchplate/southpaw_65/matrix.c
@@ -51,11 +51,14 @@ static void select_row(uint8_t row) {
 
 static uint32_t read_cols(void) {
     //Read column inputs. Pins 13-31 are used. Split across both ICs but they are sequential
-    uint32_t state_1 = pca9555_readPins(IC1, PCA9555_PORT1);
-    uint32_t state_2 = pca9555_readPins(IC2, PCA9555_PORT0);
-    uint32_t state_3 = pca9555_readPins(IC2, PCA9555_PORT1);
+    uint8_t state_1 = 0;
+    uint8_t state_2 = 0;
+    uint8_t state_3 = 0;
+    pca9555_readPins(IC2, PCA9555_PORT0, &state_1);
+    pca9555_readPins(IC2, PCA9555_PORT1, &state_2);
+    pca9555_readPins(IC1, PCA9555_PORT1, &state_3);
 
-    uint32_t state = (((state_3 & 0b01111111) << 12) | (state_2 << 4) | ((state_1 & 0b11110000) >> 4));
+    uint32_t state = ((((uint32_t)state_3 & 0b01111111) << 12) | ((uint32_t)state_2 << 4) | (((uint32_t)state_1 & 0b11110000) >> 4));
     return ~state;
 }
 
diff --git a/keyboards/xiudi/xd84/matrix.c b/keyboards/xiudi/xd84/matrix.c
index 92b8ff8546..04128561ee 100644
--- a/keyboards/xiudi/xd84/matrix.c
+++ b/keyboards/xiudi/xd84/matrix.c
@@ -53,7 +53,8 @@ static void select_row(uint8_t row) {
 static uint16_t read_cols(void) {
     // uint16_t state_1 = pca9555_readPins(IC2, PCA9555_PORT0);
     // uint16_t state_2 = pca9555_readPins(IC2, PCA9555_PORT1);
-    uint16_t state = pca9555_readAllPins(IC2);
+    uint16_t state = 0;
+    pca9555_readPins_all(IC2, &state);
 
     // For the XD84 all cols are on the same IC and mapped sequentially
     // while this technically gives 16 column reads,
diff --git a/keyboards/xiudi/xd96/matrix.c b/keyboards/xiudi/xd96/matrix.c
index 8cecc79c26..beef7fae12 100644
--- a/keyboards/xiudi/xd96/matrix.c
+++ b/keyboards/xiudi/xd96/matrix.c
@@ -50,13 +50,16 @@ static void select_row(uint8_t row) {
 }
 
 static uint32_t read_cols(void) {
-  uint32_t state_1 = pca9555_readPins(IC2, PCA9555_PORT0);
-  uint32_t state_2 = pca9555_readPins(IC2, PCA9555_PORT1);
-  uint32_t state_3 = pca9555_readPins(IC1, PCA9555_PORT1);
+  uint8_t state_1 = 0;
+  uint8_t state_2 = 0;
+  uint8_t state_3 = 0;
+  pca9555_readPins(IC2, PCA9555_PORT0, &state_1);
+  pca9555_readPins(IC2, PCA9555_PORT1, &state_2);
+  pca9555_readPins(IC1, PCA9555_PORT1, &state_3);
 
   // For the XD96 the pins are mapped to port expanders as follows:
   //   all 8 pins port 0 IC2, first 6 pins port 1 IC2, first 4 pins port 1 IC1
-  uint32_t state = (((state_3 & 0b00001111) << 14) | ((state_2 & 0b00111111) << 8) | state_1);
+  uint32_t state = ((((uint32_t)state_3 & 0b00001111) << 14) | (((uint32_t)state_2 & 0b00111111) << 8) | (uint32_t)state_1);
   return (~state) & 0b111111111111111111;
 }
 

From c2c2f30f9f479f280b283919013a1b95b408a9b8 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 10 Feb 2022 07:02:53 +1100
Subject: [PATCH 575/867] Remove parent-relative paths from keyboards. (#16282)

* Remove parent-relative paths from keyboards.

* Update keyboards/capsunlocked/cu75/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/capsunlocked/cu75/rules.mk               |  4 +++-
 keyboards/ergodox_ez/keymaps/default_glow/rules.mk |  2 +-
 keyboards/hhkb/ansi/post_rules.mk                  | 12 ++++++------
 keyboards/hhkb/jp/post_rules.mk                    | 12 ++++++------
 keyboards/rgbkb/mun/rules.mk                       |  8 ++++----
 keyboards/rgbkb/sol3/rules.mk                      |  8 ++++----
 6 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/keyboards/capsunlocked/cu75/rules.mk b/keyboards/capsunlocked/cu75/rules.mk
index 6274267ab1..d3979a9149 100644
--- a/keyboards/capsunlocked/cu75/rules.mk
+++ b/keyboards/capsunlocked/cu75/rules.mk
@@ -9,4 +9,6 @@ BOOTLOADER = atmel-dfu
 #
 BACKLIGHT_DRIVER = custom
 
-SRC = ../lfkeyboards/TWIlib.c ../lfkeyboards/issi.c ../lfkeyboards/lighting.c
+# TODO: These boards need to be converted to RGB Matrix
+VPATH += keyboards/lfkeyboards
+SRC = TWIlib.c issi.c lighting.c
diff --git a/keyboards/ergodox_ez/keymaps/default_glow/rules.mk b/keyboards/ergodox_ez/keymaps/default_glow/rules.mk
index 360c3c51b8..20bac4ab9d 100644
--- a/keyboards/ergodox_ez/keymaps/default_glow/rules.mk
+++ b/keyboards/ergodox_ez/keymaps/default_glow/rules.mk
@@ -1,4 +1,4 @@
 RGBLIGHT_ENABLE = no
 RGB_MATRIX_ENABLE = yes # enable later
 
-SRC += ../default/keymap.c
+SRC += keymaps/default/keymap.c
diff --git a/keyboards/hhkb/ansi/post_rules.mk b/keyboards/hhkb/ansi/post_rules.mk
index bc6ad5cd4c..eb9a8f0adb 100644
--- a/keyboards/hhkb/ansi/post_rules.mk
+++ b/keyboards/hhkb/ansi/post_rules.mk
@@ -4,14 +4,14 @@ OPT_DEFS += -DHHKB_RN42_ENABLE
 
 # Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT
 # HHKB Alt controller.
-RN42_DIR = ../rn42
+RN42_DIR = keyboards/hhkb/rn42
 
 SRC +=  serial_uart.c \
-	../rn42/suart.S \
-	../rn42/rn42.c \
-	../rn42/rn42_task.c \
-	../rn42/battery.c \
-	../rn42/main.c
+	suart.S \
+	rn42.c \
+	rn42_task.c \
+	battery.c \
+	main.c
 
 VPATH += $(RN42_DIR)
 
diff --git a/keyboards/hhkb/jp/post_rules.mk b/keyboards/hhkb/jp/post_rules.mk
index bc6ad5cd4c..eb9a8f0adb 100644
--- a/keyboards/hhkb/jp/post_rules.mk
+++ b/keyboards/hhkb/jp/post_rules.mk
@@ -4,14 +4,14 @@ OPT_DEFS += -DHHKB_RN42_ENABLE
 
 # Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT
 # HHKB Alt controller.
-RN42_DIR = ../rn42
+RN42_DIR = keyboards/hhkb/rn42
 
 SRC +=  serial_uart.c \
-	../rn42/suart.S \
-	../rn42/rn42.c \
-	../rn42/rn42_task.c \
-	../rn42/battery.c \
-	../rn42/main.c
+	suart.S \
+	rn42.c \
+	rn42_task.c \
+	battery.c \
+	main.c
 
 VPATH += $(RN42_DIR)
 
diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk
index d2ad9cdcc2..a682f3aa04 100644
--- a/keyboards/rgbkb/mun/rules.mk
+++ b/keyboards/rgbkb/mun/rules.mk
@@ -5,8 +5,9 @@ MCU = STM32F303
 BOOTLOADER = stm32-dfu
 
 # Touch encoder needs
-SRC += ../common/touch_encoder.c
-SRC += ../common/common_oled.c
+VPATH += keyboards/rgbkb/common
+SRC += touch_encoder.c
+SRC += common_oled.c
 QUANTUM_LIB_SRC += i2c_master.c
 
 # Build Options
@@ -35,8 +36,7 @@ SERIAL_DRIVER = usart
 LTO_ENABLE = yes
 OPT = 3
 
-OPT_DEFS += -DOLED_FONT_H=\"../common/glcdfont.c\"
-OPT_DEFS += -Ikeyboards/rgbkb/common
+OPT_DEFS += -DOLED_FONT_H=\"keyboards/rgbkb/common/glcdfont.c\"
 
 # matrix optimisations
 SRC += matrix.c
diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk
index 8389a7a9c4..e30330d333 100644
--- a/keyboards/rgbkb/sol3/rules.mk
+++ b/keyboards/rgbkb/sol3/rules.mk
@@ -5,8 +5,9 @@ MCU = STM32F303
 BOOTLOADER = stm32-dfu
 
 # Touch encoder needs
-SRC += ../common/touch_encoder.c
-SRC += ../common/common_oled.c
+VPATH += keyboards/rgbkb/common
+SRC += touch_encoder.c
+SRC += common_oled.c
 QUANTUM_LIB_SRC += i2c_master.c
 
 # Build Options
@@ -39,8 +40,7 @@ SERIAL_DRIVER = usart
 LTO_ENABLE = yes
 OPT = 3
 
-OPT_DEFS += -DOLED_FONT_H=\"../common/glcdfont.c\"
-OPT_DEFS += -Ikeyboards/rgbkb/common
+OPT_DEFS += -DOLED_FONT_H=\"keyboards/rgbkb/common/glcdfont.c\"
 
 # TODO: Implement fast matrix scanning
 # matrix optimisations

From 9aed06ba4773b6d32bbdf32a3f30e7bceb7af73a Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Thu, 10 Feb 2022 05:08:20 +0800
Subject: [PATCH 576/867] move @npspears 's boards into /checkerboards (#16100)

---
 keyboards/{ => checkerboards}/plexus75/config.h                 | 0
 keyboards/{ => checkerboards}/plexus75/info.json                | 0
 keyboards/{ => checkerboards}/plexus75/keymaps/default/config.h | 0
 keyboards/{ => checkerboards}/plexus75/keymaps/default/keymap.c | 0
 .../{ => checkerboards}/plexus75/keymaps/default/readme.md      | 0
 .../{ => checkerboards}/plexus75/keymaps/default_3u/keymap.c    | 0
 .../{ => checkerboards}/plexus75/keymaps/default_3u/readme.md   | 0
 .../{ => checkerboards}/plexus75/keymaps/default_7u/keymap.c    | 0
 .../{ => checkerboards}/plexus75/keymaps/default_7u/readme.md   | 0
 keyboards/{ => checkerboards}/plexus75/keymaps/via/keymap.c     | 0
 keyboards/{ => checkerboards}/plexus75/keymaps/via/rules.mk     | 0
 keyboards/{ => checkerboards}/plexus75/plexus75.h               | 0
 keyboards/{ => checkerboards}/plexus75/readme.md                | 2 +-
 keyboards/{ => checkerboards}/plexus75/rules.mk                 | 0
 keyboards/{ => checkerboards}/pursuit40/config.h                | 0
 keyboards/{ => checkerboards}/pursuit40/info.json               | 0
 .../{ => checkerboards}/pursuit40/keymaps/default/config.h      | 0
 .../{ => checkerboards}/pursuit40/keymaps/default/keymap.c      | 0
 .../{ => checkerboards}/pursuit40/keymaps/default/readme.md     | 0
 keyboards/{ => checkerboards}/pursuit40/keymaps/via/keymap.c    | 0
 keyboards/{ => checkerboards}/pursuit40/keymaps/via/rules.mk    | 0
 keyboards/{ => checkerboards}/pursuit40/pursuit40.c             | 0
 keyboards/{ => checkerboards}/pursuit40/pursuit40.h             | 0
 keyboards/{ => checkerboards}/pursuit40/readme.md               | 2 +-
 keyboards/{ => checkerboards}/pursuit40/rules.mk                | 0
 keyboards/{ => checkerboards}/quark/config.h                    | 0
 keyboards/{ => checkerboards}/quark/info.json                   | 0
 keyboards/{ => checkerboards}/quark/keymaps/ajp10304/keymap.c   | 0
 keyboards/{ => checkerboards}/quark/keymaps/ajp10304/readme.md  | 0
 keyboards/{ => checkerboards}/quark/keymaps/ajp10304/rules.mk   | 0
 keyboards/{ => checkerboards}/quark/keymaps/default/config.h    | 0
 keyboards/{ => checkerboards}/quark/keymaps/default/keymap.c    | 0
 keyboards/{ => checkerboards}/quark/keymaps/default/readme.md   | 0
 .../{ => checkerboards}/quark/keymaps/default_4x12/config.h     | 0
 .../{ => checkerboards}/quark/keymaps/default_4x12/keymap.c     | 0
 .../quark/keymaps/default_4x12_2x225u/config.h                  | 0
 .../quark/keymaps/default_4x12_2x225u/keymap.c                  | 0
 .../quark/keymaps/default_4x12_2x3u/config.h                    | 0
 .../quark/keymaps/default_4x12_2x3u/keymap.c                    | 0
 .../quark/keymaps/default_5x12_2x3u/config.h                    | 0
 .../quark/keymaps/default_5x12_2x3u/keymap.c                    | 0
 .../{ => checkerboards}/quark/keymaps/default_mit/config.h      | 0
 .../{ => checkerboards}/quark/keymaps/default_mit/keymap.c      | 0
 keyboards/{ => checkerboards}/quark/keymaps/pezhore/config.h    | 0
 keyboards/{ => checkerboards}/quark/keymaps/pezhore/keymap.c    | 0
 keyboards/{ => checkerboards}/quark/keymaps/via/keymap.c        | 0
 keyboards/{ => checkerboards}/quark/keymaps/via/rules.mk        | 0
 keyboards/{ => checkerboards}/quark/quark.c                     | 0
 keyboards/{ => checkerboards}/quark/quark.h                     | 0
 keyboards/{ => checkerboards}/quark/readme.md                   | 2 +-
 keyboards/{ => checkerboards}/quark/rules.mk                    | 0
 51 files changed, 3 insertions(+), 3 deletions(-)
 rename keyboards/{ => checkerboards}/plexus75/config.h (100%)
 rename keyboards/{ => checkerboards}/plexus75/info.json (100%)
 rename keyboards/{ => checkerboards}/plexus75/keymaps/default/config.h (100%)
 rename keyboards/{ => checkerboards}/plexus75/keymaps/default/keymap.c (100%)
 rename keyboards/{ => checkerboards}/plexus75/keymaps/default/readme.md (100%)
 rename keyboards/{ => checkerboards}/plexus75/keymaps/default_3u/keymap.c (100%)
 rename keyboards/{ => checkerboards}/plexus75/keymaps/default_3u/readme.md (100%)
 rename keyboards/{ => checkerboards}/plexus75/keymaps/default_7u/keymap.c (100%)
 rename keyboards/{ => checkerboards}/plexus75/keymaps/default_7u/readme.md (100%)
 rename keyboards/{ => checkerboards}/plexus75/keymaps/via/keymap.c (100%)
 rename keyboards/{ => checkerboards}/plexus75/keymaps/via/rules.mk (100%)
 rename keyboards/{ => checkerboards}/plexus75/plexus75.h (100%)
 rename keyboards/{ => checkerboards}/plexus75/readme.md (94%)
 rename keyboards/{ => checkerboards}/plexus75/rules.mk (100%)
 rename keyboards/{ => checkerboards}/pursuit40/config.h (100%)
 rename keyboards/{ => checkerboards}/pursuit40/info.json (100%)
 rename keyboards/{ => checkerboards}/pursuit40/keymaps/default/config.h (100%)
 rename keyboards/{ => checkerboards}/pursuit40/keymaps/default/keymap.c (100%)
 rename keyboards/{ => checkerboards}/pursuit40/keymaps/default/readme.md (100%)
 rename keyboards/{ => checkerboards}/pursuit40/keymaps/via/keymap.c (100%)
 rename keyboards/{ => checkerboards}/pursuit40/keymaps/via/rules.mk (100%)
 rename keyboards/{ => checkerboards}/pursuit40/pursuit40.c (100%)
 rename keyboards/{ => checkerboards}/pursuit40/pursuit40.h (100%)
 rename keyboards/{ => checkerboards}/pursuit40/readme.md (94%)
 rename keyboards/{ => checkerboards}/pursuit40/rules.mk (100%)
 rename keyboards/{ => checkerboards}/quark/config.h (100%)
 rename keyboards/{ => checkerboards}/quark/info.json (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/ajp10304/keymap.c (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/ajp10304/readme.md (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/ajp10304/rules.mk (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default/config.h (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default/keymap.c (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default/readme.md (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default_4x12/config.h (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default_4x12/keymap.c (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default_4x12_2x225u/config.h (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default_4x12_2x225u/keymap.c (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default_4x12_2x3u/config.h (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default_4x12_2x3u/keymap.c (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default_5x12_2x3u/config.h (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default_5x12_2x3u/keymap.c (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default_mit/config.h (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/default_mit/keymap.c (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/pezhore/config.h (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/pezhore/keymap.c (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/via/keymap.c (100%)
 rename keyboards/{ => checkerboards}/quark/keymaps/via/rules.mk (100%)
 rename keyboards/{ => checkerboards}/quark/quark.c (100%)
 rename keyboards/{ => checkerboards}/quark/quark.h (100%)
 rename keyboards/{ => checkerboards}/quark/readme.md (95%)
 rename keyboards/{ => checkerboards}/quark/rules.mk (100%)

diff --git a/keyboards/plexus75/config.h b/keyboards/checkerboards/plexus75/config.h
similarity index 100%
rename from keyboards/plexus75/config.h
rename to keyboards/checkerboards/plexus75/config.h
diff --git a/keyboards/plexus75/info.json b/keyboards/checkerboards/plexus75/info.json
similarity index 100%
rename from keyboards/plexus75/info.json
rename to keyboards/checkerboards/plexus75/info.json
diff --git a/keyboards/plexus75/keymaps/default/config.h b/keyboards/checkerboards/plexus75/keymaps/default/config.h
similarity index 100%
rename from keyboards/plexus75/keymaps/default/config.h
rename to keyboards/checkerboards/plexus75/keymaps/default/config.h
diff --git a/keyboards/plexus75/keymaps/default/keymap.c b/keyboards/checkerboards/plexus75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/plexus75/keymaps/default/keymap.c
rename to keyboards/checkerboards/plexus75/keymaps/default/keymap.c
diff --git a/keyboards/plexus75/keymaps/default/readme.md b/keyboards/checkerboards/plexus75/keymaps/default/readme.md
similarity index 100%
rename from keyboards/plexus75/keymaps/default/readme.md
rename to keyboards/checkerboards/plexus75/keymaps/default/readme.md
diff --git a/keyboards/plexus75/keymaps/default_3u/keymap.c b/keyboards/checkerboards/plexus75/keymaps/default_3u/keymap.c
similarity index 100%
rename from keyboards/plexus75/keymaps/default_3u/keymap.c
rename to keyboards/checkerboards/plexus75/keymaps/default_3u/keymap.c
diff --git a/keyboards/plexus75/keymaps/default_3u/readme.md b/keyboards/checkerboards/plexus75/keymaps/default_3u/readme.md
similarity index 100%
rename from keyboards/plexus75/keymaps/default_3u/readme.md
rename to keyboards/checkerboards/plexus75/keymaps/default_3u/readme.md
diff --git a/keyboards/plexus75/keymaps/default_7u/keymap.c b/keyboards/checkerboards/plexus75/keymaps/default_7u/keymap.c
similarity index 100%
rename from keyboards/plexus75/keymaps/default_7u/keymap.c
rename to keyboards/checkerboards/plexus75/keymaps/default_7u/keymap.c
diff --git a/keyboards/plexus75/keymaps/default_7u/readme.md b/keyboards/checkerboards/plexus75/keymaps/default_7u/readme.md
similarity index 100%
rename from keyboards/plexus75/keymaps/default_7u/readme.md
rename to keyboards/checkerboards/plexus75/keymaps/default_7u/readme.md
diff --git a/keyboards/plexus75/keymaps/via/keymap.c b/keyboards/checkerboards/plexus75/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/plexus75/keymaps/via/keymap.c
rename to keyboards/checkerboards/plexus75/keymaps/via/keymap.c
diff --git a/keyboards/plexus75/keymaps/via/rules.mk b/keyboards/checkerboards/plexus75/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/plexus75/keymaps/via/rules.mk
rename to keyboards/checkerboards/plexus75/keymaps/via/rules.mk
diff --git a/keyboards/plexus75/plexus75.h b/keyboards/checkerboards/plexus75/plexus75.h
similarity index 100%
rename from keyboards/plexus75/plexus75.h
rename to keyboards/checkerboards/plexus75/plexus75.h
diff --git a/keyboards/plexus75/readme.md b/keyboards/checkerboards/plexus75/readme.md
similarity index 94%
rename from keyboards/plexus75/readme.md
rename to keyboards/checkerboards/plexus75/readme.md
index 4cc2ff2b09..5d63086bab 100644
--- a/keyboards/plexus75/readme.md
+++ b/keyboards/checkerboards/plexus75/readme.md
@@ -10,6 +10,6 @@ The Plexus75 is a 60% ortholinear keyboard based on the XD75 but instead of an a
 
 Make example for this keyboard (after setting up your build environment):
 
-    make plexus75:default
+    make checkerboards/plexus75: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).
diff --git a/keyboards/plexus75/rules.mk b/keyboards/checkerboards/plexus75/rules.mk
similarity index 100%
rename from keyboards/plexus75/rules.mk
rename to keyboards/checkerboards/plexus75/rules.mk
diff --git a/keyboards/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h
similarity index 100%
rename from keyboards/pursuit40/config.h
rename to keyboards/checkerboards/pursuit40/config.h
diff --git a/keyboards/pursuit40/info.json b/keyboards/checkerboards/pursuit40/info.json
similarity index 100%
rename from keyboards/pursuit40/info.json
rename to keyboards/checkerboards/pursuit40/info.json
diff --git a/keyboards/pursuit40/keymaps/default/config.h b/keyboards/checkerboards/pursuit40/keymaps/default/config.h
similarity index 100%
rename from keyboards/pursuit40/keymaps/default/config.h
rename to keyboards/checkerboards/pursuit40/keymaps/default/config.h
diff --git a/keyboards/pursuit40/keymaps/default/keymap.c b/keyboards/checkerboards/pursuit40/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pursuit40/keymaps/default/keymap.c
rename to keyboards/checkerboards/pursuit40/keymaps/default/keymap.c
diff --git a/keyboards/pursuit40/keymaps/default/readme.md b/keyboards/checkerboards/pursuit40/keymaps/default/readme.md
similarity index 100%
rename from keyboards/pursuit40/keymaps/default/readme.md
rename to keyboards/checkerboards/pursuit40/keymaps/default/readme.md
diff --git a/keyboards/pursuit40/keymaps/via/keymap.c b/keyboards/checkerboards/pursuit40/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/pursuit40/keymaps/via/keymap.c
rename to keyboards/checkerboards/pursuit40/keymaps/via/keymap.c
diff --git a/keyboards/pursuit40/keymaps/via/rules.mk b/keyboards/checkerboards/pursuit40/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/pursuit40/keymaps/via/rules.mk
rename to keyboards/checkerboards/pursuit40/keymaps/via/rules.mk
diff --git a/keyboards/pursuit40/pursuit40.c b/keyboards/checkerboards/pursuit40/pursuit40.c
similarity index 100%
rename from keyboards/pursuit40/pursuit40.c
rename to keyboards/checkerboards/pursuit40/pursuit40.c
diff --git a/keyboards/pursuit40/pursuit40.h b/keyboards/checkerboards/pursuit40/pursuit40.h
similarity index 100%
rename from keyboards/pursuit40/pursuit40.h
rename to keyboards/checkerboards/pursuit40/pursuit40.h
diff --git a/keyboards/pursuit40/readme.md b/keyboards/checkerboards/pursuit40/readme.md
similarity index 94%
rename from keyboards/pursuit40/readme.md
rename to keyboards/checkerboards/pursuit40/readme.md
index 86cd043f38..b2193fec91 100644
--- a/keyboards/pursuit40/readme.md
+++ b/keyboards/checkerboards/pursuit40/readme.md
@@ -10,6 +10,6 @@ The Pursuit40 PCB is a modified layout Panc40 by Alex Panc. It's similar to trad
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pursuit40:default
+    make checkerboards/pursuit40: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).
diff --git a/keyboards/pursuit40/rules.mk b/keyboards/checkerboards/pursuit40/rules.mk
similarity index 100%
rename from keyboards/pursuit40/rules.mk
rename to keyboards/checkerboards/pursuit40/rules.mk
diff --git a/keyboards/quark/config.h b/keyboards/checkerboards/quark/config.h
similarity index 100%
rename from keyboards/quark/config.h
rename to keyboards/checkerboards/quark/config.h
diff --git a/keyboards/quark/info.json b/keyboards/checkerboards/quark/info.json
similarity index 100%
rename from keyboards/quark/info.json
rename to keyboards/checkerboards/quark/info.json
diff --git a/keyboards/quark/keymaps/ajp10304/keymap.c b/keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/ajp10304/keymap.c
rename to keyboards/checkerboards/quark/keymaps/ajp10304/keymap.c
diff --git a/keyboards/quark/keymaps/ajp10304/readme.md b/keyboards/checkerboards/quark/keymaps/ajp10304/readme.md
similarity index 100%
rename from keyboards/quark/keymaps/ajp10304/readme.md
rename to keyboards/checkerboards/quark/keymaps/ajp10304/readme.md
diff --git a/keyboards/quark/keymaps/ajp10304/rules.mk b/keyboards/checkerboards/quark/keymaps/ajp10304/rules.mk
similarity index 100%
rename from keyboards/quark/keymaps/ajp10304/rules.mk
rename to keyboards/checkerboards/quark/keymaps/ajp10304/rules.mk
diff --git a/keyboards/quark/keymaps/default/config.h b/keyboards/checkerboards/quark/keymaps/default/config.h
similarity index 100%
rename from keyboards/quark/keymaps/default/config.h
rename to keyboards/checkerboards/quark/keymaps/default/config.h
diff --git a/keyboards/quark/keymaps/default/keymap.c b/keyboards/checkerboards/quark/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/default/keymap.c
rename to keyboards/checkerboards/quark/keymaps/default/keymap.c
diff --git a/keyboards/quark/keymaps/default/readme.md b/keyboards/checkerboards/quark/keymaps/default/readme.md
similarity index 100%
rename from keyboards/quark/keymaps/default/readme.md
rename to keyboards/checkerboards/quark/keymaps/default/readme.md
diff --git a/keyboards/quark/keymaps/default_4x12/config.h b/keyboards/checkerboards/quark/keymaps/default_4x12/config.h
similarity index 100%
rename from keyboards/quark/keymaps/default_4x12/config.h
rename to keyboards/checkerboards/quark/keymaps/default_4x12/config.h
diff --git a/keyboards/quark/keymaps/default_4x12/keymap.c b/keyboards/checkerboards/quark/keymaps/default_4x12/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/default_4x12/keymap.c
rename to keyboards/checkerboards/quark/keymaps/default_4x12/keymap.c
diff --git a/keyboards/quark/keymaps/default_4x12_2x225u/config.h b/keyboards/checkerboards/quark/keymaps/default_4x12_2x225u/config.h
similarity index 100%
rename from keyboards/quark/keymaps/default_4x12_2x225u/config.h
rename to keyboards/checkerboards/quark/keymaps/default_4x12_2x225u/config.h
diff --git a/keyboards/quark/keymaps/default_4x12_2x225u/keymap.c b/keyboards/checkerboards/quark/keymaps/default_4x12_2x225u/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/default_4x12_2x225u/keymap.c
rename to keyboards/checkerboards/quark/keymaps/default_4x12_2x225u/keymap.c
diff --git a/keyboards/quark/keymaps/default_4x12_2x3u/config.h b/keyboards/checkerboards/quark/keymaps/default_4x12_2x3u/config.h
similarity index 100%
rename from keyboards/quark/keymaps/default_4x12_2x3u/config.h
rename to keyboards/checkerboards/quark/keymaps/default_4x12_2x3u/config.h
diff --git a/keyboards/quark/keymaps/default_4x12_2x3u/keymap.c b/keyboards/checkerboards/quark/keymaps/default_4x12_2x3u/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/default_4x12_2x3u/keymap.c
rename to keyboards/checkerboards/quark/keymaps/default_4x12_2x3u/keymap.c
diff --git a/keyboards/quark/keymaps/default_5x12_2x3u/config.h b/keyboards/checkerboards/quark/keymaps/default_5x12_2x3u/config.h
similarity index 100%
rename from keyboards/quark/keymaps/default_5x12_2x3u/config.h
rename to keyboards/checkerboards/quark/keymaps/default_5x12_2x3u/config.h
diff --git a/keyboards/quark/keymaps/default_5x12_2x3u/keymap.c b/keyboards/checkerboards/quark/keymaps/default_5x12_2x3u/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/default_5x12_2x3u/keymap.c
rename to keyboards/checkerboards/quark/keymaps/default_5x12_2x3u/keymap.c
diff --git a/keyboards/quark/keymaps/default_mit/config.h b/keyboards/checkerboards/quark/keymaps/default_mit/config.h
similarity index 100%
rename from keyboards/quark/keymaps/default_mit/config.h
rename to keyboards/checkerboards/quark/keymaps/default_mit/config.h
diff --git a/keyboards/quark/keymaps/default_mit/keymap.c b/keyboards/checkerboards/quark/keymaps/default_mit/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/default_mit/keymap.c
rename to keyboards/checkerboards/quark/keymaps/default_mit/keymap.c
diff --git a/keyboards/quark/keymaps/pezhore/config.h b/keyboards/checkerboards/quark/keymaps/pezhore/config.h
similarity index 100%
rename from keyboards/quark/keymaps/pezhore/config.h
rename to keyboards/checkerboards/quark/keymaps/pezhore/config.h
diff --git a/keyboards/quark/keymaps/pezhore/keymap.c b/keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/pezhore/keymap.c
rename to keyboards/checkerboards/quark/keymaps/pezhore/keymap.c
diff --git a/keyboards/quark/keymaps/via/keymap.c b/keyboards/checkerboards/quark/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/quark/keymaps/via/keymap.c
rename to keyboards/checkerboards/quark/keymaps/via/keymap.c
diff --git a/keyboards/quark/keymaps/via/rules.mk b/keyboards/checkerboards/quark/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/quark/keymaps/via/rules.mk
rename to keyboards/checkerboards/quark/keymaps/via/rules.mk
diff --git a/keyboards/quark/quark.c b/keyboards/checkerboards/quark/quark.c
similarity index 100%
rename from keyboards/quark/quark.c
rename to keyboards/checkerboards/quark/quark.c
diff --git a/keyboards/quark/quark.h b/keyboards/checkerboards/quark/quark.h
similarity index 100%
rename from keyboards/quark/quark.h
rename to keyboards/checkerboards/quark/quark.h
diff --git a/keyboards/quark/readme.md b/keyboards/checkerboards/quark/readme.md
similarity index 95%
rename from keyboards/quark/readme.md
rename to keyboards/checkerboards/quark/readme.md
index 88b742f821..743252758a 100644
--- a/keyboards/quark/readme.md
+++ b/keyboards/checkerboards/quark/readme.md
@@ -10,6 +10,6 @@ The Quark PCB is a modified layout for the Planck by OLKB. It's similar to a Pla
 
 Make example for this keyboard (after setting up your build environment):
 
-    make quark:default
+    make checkerboards/quark: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).
diff --git a/keyboards/quark/rules.mk b/keyboards/checkerboards/quark/rules.mk
similarity index 100%
rename from keyboards/quark/rules.mk
rename to keyboards/checkerboards/quark/rules.mk

From a9250ad8a123f566de1a5a97de51f8ae13b33ce1 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Thu, 10 Feb 2022 05:14:33 +0800
Subject: [PATCH 577/867] move @7-rate 's keebs to /rate (#16099)

---
 keyboards/pistachio/rules.mk                                | 1 -
 keyboards/{ => rate}/pistachio/config.h                     | 0
 keyboards/{ => rate}/pistachio/info.json                    | 0
 keyboards/{ => rate}/pistachio/keymaps/default/keymap.c     | 0
 keyboards/{ => rate}/pistachio/keymaps/rate/keymap.c        | 0
 keyboards/{ => rate}/pistachio/keymaps/via/keymap.c         | 0
 keyboards/{ => rate}/pistachio/keymaps/via/rules.mk         | 0
 keyboards/{ => rate}/pistachio/pistachio.c                  | 0
 keyboards/{ => rate}/pistachio/pistachio.h                  | 4 ++--
 keyboards/{ => rate}/pistachio/readme.md                    | 6 +++---
 keyboards/{ => rate}/pistachio/rev1/config.h                | 0
 keyboards/{ => rate}/pistachio/rev1/readme.md               | 0
 keyboards/{ => rate}/pistachio/rev1/rev1.c                  | 0
 keyboards/{ => rate}/pistachio/rev1/rev1.h                  | 0
 keyboards/{ => rate}/pistachio/rev1/rules.mk                | 0
 keyboards/{ => rate}/pistachio/rev2/config.h                | 0
 keyboards/{ => rate}/pistachio/rev2/readme.md               | 0
 keyboards/{ => rate}/pistachio/rev2/rev2.c                  | 0
 keyboards/{ => rate}/pistachio/rev2/rev2.h                  | 0
 keyboards/{ => rate}/pistachio/rev2/rules.mk                | 0
 keyboards/rate/pistachio/rules.mk                           | 1 +
 keyboards/{ => rate}/pistachio_mp/config.h                  | 0
 keyboards/{ => rate}/pistachio_mp/info.json                 | 0
 keyboards/{ => rate}/pistachio_mp/keymaps/default/keymap.c  | 0
 keyboards/{ => rate}/pistachio_mp/keymaps/default/readme.md | 0
 keyboards/{ => rate}/pistachio_mp/keymaps/via/keymap.c      | 0
 keyboards/{ => rate}/pistachio_mp/keymaps/via/readme.md     | 0
 keyboards/{ => rate}/pistachio_mp/keymaps/via/rules.mk      | 0
 keyboards/{ => rate}/pistachio_mp/pistachio_mp.c            | 0
 keyboards/{ => rate}/pistachio_mp/pistachio_mp.h            | 0
 keyboards/{ => rate}/pistachio_mp/readme.md                 | 6 +++---
 keyboards/{ => rate}/pistachio_mp/rules.mk                  | 0
 keyboards/{ => rate}/pistachio_pro/config.h                 | 2 +-
 keyboards/{ => rate}/pistachio_pro/info.json                | 0
 keyboards/{ => rate}/pistachio_pro/keymaps/default/keymap.c | 0
 .../{ => rate}/pistachio_pro/keymaps/default/readme.md      | 0
 keyboards/{ => rate}/pistachio_pro/keymaps/rate/keymap.c    | 0
 keyboards/{ => rate}/pistachio_pro/keymaps/rate/readme.md   | 0
 keyboards/{ => rate}/pistachio_pro/keymaps/via/keymap.c     | 0
 keyboards/{ => rate}/pistachio_pro/keymaps/via/readme.md    | 0
 keyboards/{ => rate}/pistachio_pro/keymaps/via/rules.mk     | 0
 keyboards/{ => rate}/pistachio_pro/lib/bme280.c             | 0
 keyboards/{ => rate}/pistachio_pro/lib/bme280.h             | 0
 keyboards/{ => rate}/pistachio_pro/lib/glcdfont.c           | 0
 keyboards/{ => rate}/pistachio_pro/matrix.c                 | 0
 keyboards/{ => rate}/pistachio_pro/pistachio_pro.c          | 0
 keyboards/{ => rate}/pistachio_pro/pistachio_pro.h          | 0
 keyboards/{ => rate}/pistachio_pro/readme.md                | 4 ++--
 keyboards/{ => rate}/pistachio_pro/rules.mk                 | 0
 49 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 keyboards/pistachio/rules.mk
 rename keyboards/{ => rate}/pistachio/config.h (100%)
 rename keyboards/{ => rate}/pistachio/info.json (100%)
 rename keyboards/{ => rate}/pistachio/keymaps/default/keymap.c (100%)
 rename keyboards/{ => rate}/pistachio/keymaps/rate/keymap.c (100%)
 rename keyboards/{ => rate}/pistachio/keymaps/via/keymap.c (100%)
 rename keyboards/{ => rate}/pistachio/keymaps/via/rules.mk (100%)
 rename keyboards/{ => rate}/pistachio/pistachio.c (100%)
 rename keyboards/{ => rate}/pistachio/pistachio.h (89%)
 rename keyboards/{ => rate}/pistachio/readme.md (85%)
 rename keyboards/{ => rate}/pistachio/rev1/config.h (100%)
 rename keyboards/{ => rate}/pistachio/rev1/readme.md (100%)
 rename keyboards/{ => rate}/pistachio/rev1/rev1.c (100%)
 rename keyboards/{ => rate}/pistachio/rev1/rev1.h (100%)
 rename keyboards/{ => rate}/pistachio/rev1/rules.mk (100%)
 rename keyboards/{ => rate}/pistachio/rev2/config.h (100%)
 rename keyboards/{ => rate}/pistachio/rev2/readme.md (100%)
 rename keyboards/{ => rate}/pistachio/rev2/rev2.c (100%)
 rename keyboards/{ => rate}/pistachio/rev2/rev2.h (100%)
 rename keyboards/{ => rate}/pistachio/rev2/rules.mk (100%)
 create mode 100644 keyboards/rate/pistachio/rules.mk
 rename keyboards/{ => rate}/pistachio_mp/config.h (100%)
 rename keyboards/{ => rate}/pistachio_mp/info.json (100%)
 rename keyboards/{ => rate}/pistachio_mp/keymaps/default/keymap.c (100%)
 rename keyboards/{ => rate}/pistachio_mp/keymaps/default/readme.md (100%)
 rename keyboards/{ => rate}/pistachio_mp/keymaps/via/keymap.c (100%)
 rename keyboards/{ => rate}/pistachio_mp/keymaps/via/readme.md (100%)
 rename keyboards/{ => rate}/pistachio_mp/keymaps/via/rules.mk (100%)
 rename keyboards/{ => rate}/pistachio_mp/pistachio_mp.c (100%)
 rename keyboards/{ => rate}/pistachio_mp/pistachio_mp.h (100%)
 rename keyboards/{ => rate}/pistachio_mp/readme.md (92%)
 rename keyboards/{ => rate}/pistachio_mp/rules.mk (100%)
 rename keyboards/{ => rate}/pistachio_pro/config.h (97%)
 rename keyboards/{ => rate}/pistachio_pro/info.json (100%)
 rename keyboards/{ => rate}/pistachio_pro/keymaps/default/keymap.c (100%)
 rename keyboards/{ => rate}/pistachio_pro/keymaps/default/readme.md (100%)
 rename keyboards/{ => rate}/pistachio_pro/keymaps/rate/keymap.c (100%)
 rename keyboards/{ => rate}/pistachio_pro/keymaps/rate/readme.md (100%)
 rename keyboards/{ => rate}/pistachio_pro/keymaps/via/keymap.c (100%)
 rename keyboards/{ => rate}/pistachio_pro/keymaps/via/readme.md (100%)
 rename keyboards/{ => rate}/pistachio_pro/keymaps/via/rules.mk (100%)
 rename keyboards/{ => rate}/pistachio_pro/lib/bme280.c (100%)
 rename keyboards/{ => rate}/pistachio_pro/lib/bme280.h (100%)
 rename keyboards/{ => rate}/pistachio_pro/lib/glcdfont.c (100%)
 rename keyboards/{ => rate}/pistachio_pro/matrix.c (100%)
 rename keyboards/{ => rate}/pistachio_pro/pistachio_pro.c (100%)
 rename keyboards/{ => rate}/pistachio_pro/pistachio_pro.h (100%)
 rename keyboards/{ => rate}/pistachio_pro/readme.md (91%)
 rename keyboards/{ => rate}/pistachio_pro/rules.mk (100%)

diff --git a/keyboards/pistachio/rules.mk b/keyboards/pistachio/rules.mk
deleted file mode 100644
index 93ae534be9..0000000000
--- a/keyboards/pistachio/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = pistachio/rev2
\ No newline at end of file
diff --git a/keyboards/pistachio/config.h b/keyboards/rate/pistachio/config.h
similarity index 100%
rename from keyboards/pistachio/config.h
rename to keyboards/rate/pistachio/config.h
diff --git a/keyboards/pistachio/info.json b/keyboards/rate/pistachio/info.json
similarity index 100%
rename from keyboards/pistachio/info.json
rename to keyboards/rate/pistachio/info.json
diff --git a/keyboards/pistachio/keymaps/default/keymap.c b/keyboards/rate/pistachio/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pistachio/keymaps/default/keymap.c
rename to keyboards/rate/pistachio/keymaps/default/keymap.c
diff --git a/keyboards/pistachio/keymaps/rate/keymap.c b/keyboards/rate/pistachio/keymaps/rate/keymap.c
similarity index 100%
rename from keyboards/pistachio/keymaps/rate/keymap.c
rename to keyboards/rate/pistachio/keymaps/rate/keymap.c
diff --git a/keyboards/pistachio/keymaps/via/keymap.c b/keyboards/rate/pistachio/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/pistachio/keymaps/via/keymap.c
rename to keyboards/rate/pistachio/keymaps/via/keymap.c
diff --git a/keyboards/pistachio/keymaps/via/rules.mk b/keyboards/rate/pistachio/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/pistachio/keymaps/via/rules.mk
rename to keyboards/rate/pistachio/keymaps/via/rules.mk
diff --git a/keyboards/pistachio/pistachio.c b/keyboards/rate/pistachio/pistachio.c
similarity index 100%
rename from keyboards/pistachio/pistachio.c
rename to keyboards/rate/pistachio/pistachio.c
diff --git a/keyboards/pistachio/pistachio.h b/keyboards/rate/pistachio/pistachio.h
similarity index 89%
rename from keyboards/pistachio/pistachio.h
rename to keyboards/rate/pistachio/pistachio.h
index 8cbb967f49..7bf2c59ad6 100644
--- a/keyboards/pistachio/pistachio.h
+++ b/keyboards/rate/pistachio/pistachio.h
@@ -18,8 +18,8 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_pistachio_rev1)
+#if defined(KEYBOARD_rate_pistachio_rev1)
 #    include "rev1.h"
-#elif defined(KEYBOARD_pistachio_rev2)
+#elif defined(KEYBOARD_rate_pistachio_rev2)
 #    include "rev2.h"
 #endif
diff --git a/keyboards/pistachio/readme.md b/keyboards/rate/pistachio/readme.md
similarity index 85%
rename from keyboards/pistachio/readme.md
rename to keyboards/rate/pistachio/readme.md
index 8ff5933f4f..dc989bbe6c 100644
--- a/keyboards/pistachio/readme.md
+++ b/keyboards/rate/pistachio/readme.md
@@ -10,9 +10,9 @@ This is a 92-key split keyboard with JIS layout and spare keys.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pistachio/rev1:default
-    make pistachio/rev2:default
+    make rate/pistachio/rev1:default
+    make rate/pistachio/rev2: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).
 
-[Build guide](https://ratelog.net/pistachio-build-guide/)
\ No newline at end of file
+[Build guide](https://ratelog.net/pistachio-build-guide/)
diff --git a/keyboards/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h
similarity index 100%
rename from keyboards/pistachio/rev1/config.h
rename to keyboards/rate/pistachio/rev1/config.h
diff --git a/keyboards/pistachio/rev1/readme.md b/keyboards/rate/pistachio/rev1/readme.md
similarity index 100%
rename from keyboards/pistachio/rev1/readme.md
rename to keyboards/rate/pistachio/rev1/readme.md
diff --git a/keyboards/pistachio/rev1/rev1.c b/keyboards/rate/pistachio/rev1/rev1.c
similarity index 100%
rename from keyboards/pistachio/rev1/rev1.c
rename to keyboards/rate/pistachio/rev1/rev1.c
diff --git a/keyboards/pistachio/rev1/rev1.h b/keyboards/rate/pistachio/rev1/rev1.h
similarity index 100%
rename from keyboards/pistachio/rev1/rev1.h
rename to keyboards/rate/pistachio/rev1/rev1.h
diff --git a/keyboards/pistachio/rev1/rules.mk b/keyboards/rate/pistachio/rev1/rules.mk
similarity index 100%
rename from keyboards/pistachio/rev1/rules.mk
rename to keyboards/rate/pistachio/rev1/rules.mk
diff --git a/keyboards/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h
similarity index 100%
rename from keyboards/pistachio/rev2/config.h
rename to keyboards/rate/pistachio/rev2/config.h
diff --git a/keyboards/pistachio/rev2/readme.md b/keyboards/rate/pistachio/rev2/readme.md
similarity index 100%
rename from keyboards/pistachio/rev2/readme.md
rename to keyboards/rate/pistachio/rev2/readme.md
diff --git a/keyboards/pistachio/rev2/rev2.c b/keyboards/rate/pistachio/rev2/rev2.c
similarity index 100%
rename from keyboards/pistachio/rev2/rev2.c
rename to keyboards/rate/pistachio/rev2/rev2.c
diff --git a/keyboards/pistachio/rev2/rev2.h b/keyboards/rate/pistachio/rev2/rev2.h
similarity index 100%
rename from keyboards/pistachio/rev2/rev2.h
rename to keyboards/rate/pistachio/rev2/rev2.h
diff --git a/keyboards/pistachio/rev2/rules.mk b/keyboards/rate/pistachio/rev2/rules.mk
similarity index 100%
rename from keyboards/pistachio/rev2/rules.mk
rename to keyboards/rate/pistachio/rev2/rules.mk
diff --git a/keyboards/rate/pistachio/rules.mk b/keyboards/rate/pistachio/rules.mk
new file mode 100644
index 0000000000..a5f4485316
--- /dev/null
+++ b/keyboards/rate/pistachio/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = rate/pistachio/rev2
diff --git a/keyboards/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h
similarity index 100%
rename from keyboards/pistachio_mp/config.h
rename to keyboards/rate/pistachio_mp/config.h
diff --git a/keyboards/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json
similarity index 100%
rename from keyboards/pistachio_mp/info.json
rename to keyboards/rate/pistachio_mp/info.json
diff --git a/keyboards/pistachio_mp/keymaps/default/keymap.c b/keyboards/rate/pistachio_mp/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pistachio_mp/keymaps/default/keymap.c
rename to keyboards/rate/pistachio_mp/keymaps/default/keymap.c
diff --git a/keyboards/pistachio_mp/keymaps/default/readme.md b/keyboards/rate/pistachio_mp/keymaps/default/readme.md
similarity index 100%
rename from keyboards/pistachio_mp/keymaps/default/readme.md
rename to keyboards/rate/pistachio_mp/keymaps/default/readme.md
diff --git a/keyboards/pistachio_mp/keymaps/via/keymap.c b/keyboards/rate/pistachio_mp/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/pistachio_mp/keymaps/via/keymap.c
rename to keyboards/rate/pistachio_mp/keymaps/via/keymap.c
diff --git a/keyboards/pistachio_mp/keymaps/via/readme.md b/keyboards/rate/pistachio_mp/keymaps/via/readme.md
similarity index 100%
rename from keyboards/pistachio_mp/keymaps/via/readme.md
rename to keyboards/rate/pistachio_mp/keymaps/via/readme.md
diff --git a/keyboards/pistachio_mp/keymaps/via/rules.mk b/keyboards/rate/pistachio_mp/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/pistachio_mp/keymaps/via/rules.mk
rename to keyboards/rate/pistachio_mp/keymaps/via/rules.mk
diff --git a/keyboards/pistachio_mp/pistachio_mp.c b/keyboards/rate/pistachio_mp/pistachio_mp.c
similarity index 100%
rename from keyboards/pistachio_mp/pistachio_mp.c
rename to keyboards/rate/pistachio_mp/pistachio_mp.c
diff --git a/keyboards/pistachio_mp/pistachio_mp.h b/keyboards/rate/pistachio_mp/pistachio_mp.h
similarity index 100%
rename from keyboards/pistachio_mp/pistachio_mp.h
rename to keyboards/rate/pistachio_mp/pistachio_mp.h
diff --git a/keyboards/pistachio_mp/readme.md b/keyboards/rate/pistachio_mp/readme.md
similarity index 92%
rename from keyboards/pistachio_mp/readme.md
rename to keyboards/rate/pistachio_mp/readme.md
index 0e5b030a6e..b8ea088a4a 100644
--- a/keyboards/pistachio_mp/readme.md
+++ b/keyboards/rate/pistachio_mp/readme.md
@@ -10,12 +10,12 @@ This is a numeric keypad with a rotary encoder that uses a stainless steel plate
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pistachio_mp:default
+    make rate/pistachio_mp:default
 
 Flashing example for this keyboard:
 
-    make pistachio_mp:default:flash
+    make rate/pistachio_mp:default:flash
 
 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).
 
-[Build guide](https://ratelog.net/pistachiomacropad-build-guide/)
\ No newline at end of file
+[Build guide](https://ratelog.net/pistachiomacropad-build-guide/)
diff --git a/keyboards/pistachio_mp/rules.mk b/keyboards/rate/pistachio_mp/rules.mk
similarity index 100%
rename from keyboards/pistachio_mp/rules.mk
rename to keyboards/rate/pistachio_mp/rules.mk
diff --git a/keyboards/pistachio_pro/config.h b/keyboards/rate/pistachio_pro/config.h
similarity index 97%
rename from keyboards/pistachio_pro/config.h
rename to keyboards/rate/pistachio_pro/config.h
index c3cb584962..f268967f6e 100644
--- a/keyboards/pistachio_pro/config.h
+++ b/keyboards/rate/pistachio_pro/config.h
@@ -96,7 +96,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* OLED */
 #define OLED_DISPLAY_128X64
-#define OLED_FONT_H "keyboards/pistachio_pro/lib/glcdfont.c"
+#define OLED_FONT_H "keyboards/rate/pistachio_pro/lib/glcdfont.c"
 
 #define OLED_FONT_WIDTH 6
 #define OLED_FONT_HEIGHT 6
diff --git a/keyboards/pistachio_pro/info.json b/keyboards/rate/pistachio_pro/info.json
similarity index 100%
rename from keyboards/pistachio_pro/info.json
rename to keyboards/rate/pistachio_pro/info.json
diff --git a/keyboards/pistachio_pro/keymaps/default/keymap.c b/keyboards/rate/pistachio_pro/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/default/keymap.c
rename to keyboards/rate/pistachio_pro/keymaps/default/keymap.c
diff --git a/keyboards/pistachio_pro/keymaps/default/readme.md b/keyboards/rate/pistachio_pro/keymaps/default/readme.md
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/default/readme.md
rename to keyboards/rate/pistachio_pro/keymaps/default/readme.md
diff --git a/keyboards/pistachio_pro/keymaps/rate/keymap.c b/keyboards/rate/pistachio_pro/keymaps/rate/keymap.c
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/rate/keymap.c
rename to keyboards/rate/pistachio_pro/keymaps/rate/keymap.c
diff --git a/keyboards/pistachio_pro/keymaps/rate/readme.md b/keyboards/rate/pistachio_pro/keymaps/rate/readme.md
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/rate/readme.md
rename to keyboards/rate/pistachio_pro/keymaps/rate/readme.md
diff --git a/keyboards/pistachio_pro/keymaps/via/keymap.c b/keyboards/rate/pistachio_pro/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/via/keymap.c
rename to keyboards/rate/pistachio_pro/keymaps/via/keymap.c
diff --git a/keyboards/pistachio_pro/keymaps/via/readme.md b/keyboards/rate/pistachio_pro/keymaps/via/readme.md
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/via/readme.md
rename to keyboards/rate/pistachio_pro/keymaps/via/readme.md
diff --git a/keyboards/pistachio_pro/keymaps/via/rules.mk b/keyboards/rate/pistachio_pro/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/pistachio_pro/keymaps/via/rules.mk
rename to keyboards/rate/pistachio_pro/keymaps/via/rules.mk
diff --git a/keyboards/pistachio_pro/lib/bme280.c b/keyboards/rate/pistachio_pro/lib/bme280.c
similarity index 100%
rename from keyboards/pistachio_pro/lib/bme280.c
rename to keyboards/rate/pistachio_pro/lib/bme280.c
diff --git a/keyboards/pistachio_pro/lib/bme280.h b/keyboards/rate/pistachio_pro/lib/bme280.h
similarity index 100%
rename from keyboards/pistachio_pro/lib/bme280.h
rename to keyboards/rate/pistachio_pro/lib/bme280.h
diff --git a/keyboards/pistachio_pro/lib/glcdfont.c b/keyboards/rate/pistachio_pro/lib/glcdfont.c
similarity index 100%
rename from keyboards/pistachio_pro/lib/glcdfont.c
rename to keyboards/rate/pistachio_pro/lib/glcdfont.c
diff --git a/keyboards/pistachio_pro/matrix.c b/keyboards/rate/pistachio_pro/matrix.c
similarity index 100%
rename from keyboards/pistachio_pro/matrix.c
rename to keyboards/rate/pistachio_pro/matrix.c
diff --git a/keyboards/pistachio_pro/pistachio_pro.c b/keyboards/rate/pistachio_pro/pistachio_pro.c
similarity index 100%
rename from keyboards/pistachio_pro/pistachio_pro.c
rename to keyboards/rate/pistachio_pro/pistachio_pro.c
diff --git a/keyboards/pistachio_pro/pistachio_pro.h b/keyboards/rate/pistachio_pro/pistachio_pro.h
similarity index 100%
rename from keyboards/pistachio_pro/pistachio_pro.h
rename to keyboards/rate/pistachio_pro/pistachio_pro.h
diff --git a/keyboards/pistachio_pro/readme.md b/keyboards/rate/pistachio_pro/readme.md
similarity index 91%
rename from keyboards/pistachio_pro/readme.md
rename to keyboards/rate/pistachio_pro/readme.md
index b224c874e6..752f98b73b 100644
--- a/keyboards/pistachio_pro/readme.md
+++ b/keyboards/rate/pistachio_pro/readme.md
@@ -10,11 +10,11 @@ This is a JIS layout TKL keyboard with 89 keys, encoder and OLED.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pistachio_pro:default
+    make rate/pistachio_pro:default
 
 Flashing example for this keyboard:
 
-    make pistachio_pro:default:flash
+    make rate/pistachio_pro:default:flash
 
 To reset the keyboard into bootloader mode, press the reset switch on the underside.
 
diff --git a/keyboards/pistachio_pro/rules.mk b/keyboards/rate/pistachio_pro/rules.mk
similarity index 100%
rename from keyboards/pistachio_pro/rules.mk
rename to keyboards/rate/pistachio_pro/rules.mk

From cd673ccebacb2c0550cce32a824c32ce92c8b97f Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Thu, 10 Feb 2022 05:19:28 +0800
Subject: [PATCH 578/867] move spaceholdings boards into /spaceholdings
 (#16096)

---
 keyboards/{ => spaceholdings}/nebula12/chconf.h                 | 0
 keyboards/{ => spaceholdings}/nebula12/config.h                 | 0
 keyboards/{ => spaceholdings}/nebula12/halconf.h                | 0
 keyboards/{ => spaceholdings}/nebula12/info.json                | 0
 keyboards/{ => spaceholdings}/nebula12/keymaps/default/keymap.c | 0
 .../{ => spaceholdings}/nebula12/keymaps/default/readme.md      | 0
 keyboards/{ => spaceholdings}/nebula12/keymaps/via/keymap.c     | 0
 keyboards/{ => spaceholdings}/nebula12/keymaps/via/readme.md    | 0
 keyboards/{ => spaceholdings}/nebula12/keymaps/via/rules.mk     | 0
 keyboards/{ => spaceholdings}/nebula12/mcuconf.h                | 0
 keyboards/{ => spaceholdings}/nebula12/nebula12.c               | 0
 keyboards/{ => spaceholdings}/nebula12/nebula12.h               | 0
 keyboards/{ => spaceholdings}/nebula12/readme.md                | 2 +-
 keyboards/{ => spaceholdings}/nebula12/rules.mk                 | 0
 keyboards/{ => spaceholdings}/nebula68/config.h                 | 0
 keyboards/{ => spaceholdings}/nebula68/halconf.h                | 0
 keyboards/{ => spaceholdings}/nebula68/info.json                | 0
 keyboards/{ => spaceholdings}/nebula68/keymaps/default/keymap.c | 0
 .../{ => spaceholdings}/nebula68/keymaps/default/readme.md      | 0
 keyboards/{ => spaceholdings}/nebula68/keymaps/via/keymap.c     | 0
 keyboards/{ => spaceholdings}/nebula68/keymaps/via/readme.md    | 0
 keyboards/{ => spaceholdings}/nebula68/keymaps/via/rules.mk     | 0
 keyboards/{ => spaceholdings}/nebula68/mcuconf.h                | 0
 keyboards/{ => spaceholdings}/nebula68/nebula68.c               | 0
 keyboards/{ => spaceholdings}/nebula68/nebula68.h               | 0
 keyboards/{ => spaceholdings}/nebula68/readme.md                | 2 +-
 keyboards/{ => spaceholdings}/nebula68/rules.mk                 | 0
 keyboards/{ => spaceholdings}/nebula68b/config.h                | 0
 keyboards/{ => spaceholdings}/nebula68b/info.json               | 0
 .../{ => spaceholdings}/nebula68b/keymaps/default/keymap.c      | 0
 .../{ => spaceholdings}/nebula68b/keymaps/default/readme.md     | 0
 keyboards/{ => spaceholdings}/nebula68b/keymaps/via/keymap.c    | 0
 keyboards/{ => spaceholdings}/nebula68b/keymaps/via/readme.md   | 0
 keyboards/{ => spaceholdings}/nebula68b/keymaps/via/rules.mk    | 0
 keyboards/{ => spaceholdings}/nebula68b/nebula68b.c             | 0
 keyboards/{ => spaceholdings}/nebula68b/nebula68b.h             | 0
 keyboards/{ => spaceholdings}/nebula68b/readme.md               | 2 +-
 keyboards/{ => spaceholdings}/nebula68b/rules.mk                | 0
 38 files changed, 3 insertions(+), 3 deletions(-)
 rename keyboards/{ => spaceholdings}/nebula12/chconf.h (100%)
 rename keyboards/{ => spaceholdings}/nebula12/config.h (100%)
 rename keyboards/{ => spaceholdings}/nebula12/halconf.h (100%)
 rename keyboards/{ => spaceholdings}/nebula12/info.json (100%)
 rename keyboards/{ => spaceholdings}/nebula12/keymaps/default/keymap.c (100%)
 rename keyboards/{ => spaceholdings}/nebula12/keymaps/default/readme.md (100%)
 rename keyboards/{ => spaceholdings}/nebula12/keymaps/via/keymap.c (100%)
 rename keyboards/{ => spaceholdings}/nebula12/keymaps/via/readme.md (100%)
 rename keyboards/{ => spaceholdings}/nebula12/keymaps/via/rules.mk (100%)
 rename keyboards/{ => spaceholdings}/nebula12/mcuconf.h (100%)
 rename keyboards/{ => spaceholdings}/nebula12/nebula12.c (100%)
 rename keyboards/{ => spaceholdings}/nebula12/nebula12.h (100%)
 rename keyboards/{ => spaceholdings}/nebula12/readme.md (96%)
 rename keyboards/{ => spaceholdings}/nebula12/rules.mk (100%)
 rename keyboards/{ => spaceholdings}/nebula68/config.h (100%)
 rename keyboards/{ => spaceholdings}/nebula68/halconf.h (100%)
 rename keyboards/{ => spaceholdings}/nebula68/info.json (100%)
 rename keyboards/{ => spaceholdings}/nebula68/keymaps/default/keymap.c (100%)
 rename keyboards/{ => spaceholdings}/nebula68/keymaps/default/readme.md (100%)
 rename keyboards/{ => spaceholdings}/nebula68/keymaps/via/keymap.c (100%)
 rename keyboards/{ => spaceholdings}/nebula68/keymaps/via/readme.md (100%)
 rename keyboards/{ => spaceholdings}/nebula68/keymaps/via/rules.mk (100%)
 rename keyboards/{ => spaceholdings}/nebula68/mcuconf.h (100%)
 rename keyboards/{ => spaceholdings}/nebula68/nebula68.c (100%)
 rename keyboards/{ => spaceholdings}/nebula68/nebula68.h (100%)
 rename keyboards/{ => spaceholdings}/nebula68/readme.md (96%)
 rename keyboards/{ => spaceholdings}/nebula68/rules.mk (100%)
 rename keyboards/{ => spaceholdings}/nebula68b/config.h (100%)
 rename keyboards/{ => spaceholdings}/nebula68b/info.json (100%)
 rename keyboards/{ => spaceholdings}/nebula68b/keymaps/default/keymap.c (100%)
 rename keyboards/{ => spaceholdings}/nebula68b/keymaps/default/readme.md (100%)
 rename keyboards/{ => spaceholdings}/nebula68b/keymaps/via/keymap.c (100%)
 rename keyboards/{ => spaceholdings}/nebula68b/keymaps/via/readme.md (100%)
 rename keyboards/{ => spaceholdings}/nebula68b/keymaps/via/rules.mk (100%)
 rename keyboards/{ => spaceholdings}/nebula68b/nebula68b.c (100%)
 rename keyboards/{ => spaceholdings}/nebula68b/nebula68b.h (100%)
 rename keyboards/{ => spaceholdings}/nebula68b/readme.md (96%)
 rename keyboards/{ => spaceholdings}/nebula68b/rules.mk (100%)

diff --git a/keyboards/nebula12/chconf.h b/keyboards/spaceholdings/nebula12/chconf.h
similarity index 100%
rename from keyboards/nebula12/chconf.h
rename to keyboards/spaceholdings/nebula12/chconf.h
diff --git a/keyboards/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h
similarity index 100%
rename from keyboards/nebula12/config.h
rename to keyboards/spaceholdings/nebula12/config.h
diff --git a/keyboards/nebula12/halconf.h b/keyboards/spaceholdings/nebula12/halconf.h
similarity index 100%
rename from keyboards/nebula12/halconf.h
rename to keyboards/spaceholdings/nebula12/halconf.h
diff --git a/keyboards/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json
similarity index 100%
rename from keyboards/nebula12/info.json
rename to keyboards/spaceholdings/nebula12/info.json
diff --git a/keyboards/nebula12/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula12/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nebula12/keymaps/default/keymap.c
rename to keyboards/spaceholdings/nebula12/keymaps/default/keymap.c
diff --git a/keyboards/nebula12/keymaps/default/readme.md b/keyboards/spaceholdings/nebula12/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nebula12/keymaps/default/readme.md
rename to keyboards/spaceholdings/nebula12/keymaps/default/readme.md
diff --git a/keyboards/nebula12/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula12/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nebula12/keymaps/via/keymap.c
rename to keyboards/spaceholdings/nebula12/keymaps/via/keymap.c
diff --git a/keyboards/nebula12/keymaps/via/readme.md b/keyboards/spaceholdings/nebula12/keymaps/via/readme.md
similarity index 100%
rename from keyboards/nebula12/keymaps/via/readme.md
rename to keyboards/spaceholdings/nebula12/keymaps/via/readme.md
diff --git a/keyboards/nebula12/keymaps/via/rules.mk b/keyboards/spaceholdings/nebula12/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nebula12/keymaps/via/rules.mk
rename to keyboards/spaceholdings/nebula12/keymaps/via/rules.mk
diff --git a/keyboards/nebula12/mcuconf.h b/keyboards/spaceholdings/nebula12/mcuconf.h
similarity index 100%
rename from keyboards/nebula12/mcuconf.h
rename to keyboards/spaceholdings/nebula12/mcuconf.h
diff --git a/keyboards/nebula12/nebula12.c b/keyboards/spaceholdings/nebula12/nebula12.c
similarity index 100%
rename from keyboards/nebula12/nebula12.c
rename to keyboards/spaceholdings/nebula12/nebula12.c
diff --git a/keyboards/nebula12/nebula12.h b/keyboards/spaceholdings/nebula12/nebula12.h
similarity index 100%
rename from keyboards/nebula12/nebula12.h
rename to keyboards/spaceholdings/nebula12/nebula12.h
diff --git a/keyboards/nebula12/readme.md b/keyboards/spaceholdings/nebula12/readme.md
similarity index 96%
rename from keyboards/nebula12/readme.md
rename to keyboards/spaceholdings/nebula12/readme.md
index 3a68d0a97d..0fc5be178f 100755
--- a/keyboards/nebula12/readme.md
+++ b/keyboards/spaceholdings/nebula12/readme.md
@@ -12,7 +12,7 @@ This is a standard fixed layout 12 key PCB. It supports VIA, full per-key RGB an
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nebula12:via
+    make spaceholdings/nebula12:via
 
 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).
 
diff --git a/keyboards/nebula12/rules.mk b/keyboards/spaceholdings/nebula12/rules.mk
similarity index 100%
rename from keyboards/nebula12/rules.mk
rename to keyboards/spaceholdings/nebula12/rules.mk
diff --git a/keyboards/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h
similarity index 100%
rename from keyboards/nebula68/config.h
rename to keyboards/spaceholdings/nebula68/config.h
diff --git a/keyboards/nebula68/halconf.h b/keyboards/spaceholdings/nebula68/halconf.h
similarity index 100%
rename from keyboards/nebula68/halconf.h
rename to keyboards/spaceholdings/nebula68/halconf.h
diff --git a/keyboards/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json
similarity index 100%
rename from keyboards/nebula68/info.json
rename to keyboards/spaceholdings/nebula68/info.json
diff --git a/keyboards/nebula68/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula68/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nebula68/keymaps/default/keymap.c
rename to keyboards/spaceholdings/nebula68/keymaps/default/keymap.c
diff --git a/keyboards/nebula68/keymaps/default/readme.md b/keyboards/spaceholdings/nebula68/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nebula68/keymaps/default/readme.md
rename to keyboards/spaceholdings/nebula68/keymaps/default/readme.md
diff --git a/keyboards/nebula68/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nebula68/keymaps/via/keymap.c
rename to keyboards/spaceholdings/nebula68/keymaps/via/keymap.c
diff --git a/keyboards/nebula68/keymaps/via/readme.md b/keyboards/spaceholdings/nebula68/keymaps/via/readme.md
similarity index 100%
rename from keyboards/nebula68/keymaps/via/readme.md
rename to keyboards/spaceholdings/nebula68/keymaps/via/readme.md
diff --git a/keyboards/nebula68/keymaps/via/rules.mk b/keyboards/spaceholdings/nebula68/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nebula68/keymaps/via/rules.mk
rename to keyboards/spaceholdings/nebula68/keymaps/via/rules.mk
diff --git a/keyboards/nebula68/mcuconf.h b/keyboards/spaceholdings/nebula68/mcuconf.h
similarity index 100%
rename from keyboards/nebula68/mcuconf.h
rename to keyboards/spaceholdings/nebula68/mcuconf.h
diff --git a/keyboards/nebula68/nebula68.c b/keyboards/spaceholdings/nebula68/nebula68.c
similarity index 100%
rename from keyboards/nebula68/nebula68.c
rename to keyboards/spaceholdings/nebula68/nebula68.c
diff --git a/keyboards/nebula68/nebula68.h b/keyboards/spaceholdings/nebula68/nebula68.h
similarity index 100%
rename from keyboards/nebula68/nebula68.h
rename to keyboards/spaceholdings/nebula68/nebula68.h
diff --git a/keyboards/nebula68/readme.md b/keyboards/spaceholdings/nebula68/readme.md
similarity index 96%
rename from keyboards/nebula68/readme.md
rename to keyboards/spaceholdings/nebula68/readme.md
index b990ed20dc..528d397529 100755
--- a/keyboards/nebula68/readme.md
+++ b/keyboards/spaceholdings/nebula68/readme.md
@@ -12,7 +12,7 @@ This is a standard fixed layout 68% PCB. It supports VIA, full per-key RGB and u
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nebula68:via
+    make spaceholdings/nebula68:via
 
 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).
 
diff --git a/keyboards/nebula68/rules.mk b/keyboards/spaceholdings/nebula68/rules.mk
similarity index 100%
rename from keyboards/nebula68/rules.mk
rename to keyboards/spaceholdings/nebula68/rules.mk
diff --git a/keyboards/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h
similarity index 100%
rename from keyboards/nebula68b/config.h
rename to keyboards/spaceholdings/nebula68b/config.h
diff --git a/keyboards/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json
similarity index 100%
rename from keyboards/nebula68b/info.json
rename to keyboards/spaceholdings/nebula68b/info.json
diff --git a/keyboards/nebula68b/keymaps/default/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nebula68b/keymaps/default/keymap.c
rename to keyboards/spaceholdings/nebula68b/keymaps/default/keymap.c
diff --git a/keyboards/nebula68b/keymaps/default/readme.md b/keyboards/spaceholdings/nebula68b/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nebula68b/keymaps/default/readme.md
rename to keyboards/spaceholdings/nebula68b/keymaps/default/readme.md
diff --git a/keyboards/nebula68b/keymaps/via/keymap.c b/keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nebula68b/keymaps/via/keymap.c
rename to keyboards/spaceholdings/nebula68b/keymaps/via/keymap.c
diff --git a/keyboards/nebula68b/keymaps/via/readme.md b/keyboards/spaceholdings/nebula68b/keymaps/via/readme.md
similarity index 100%
rename from keyboards/nebula68b/keymaps/via/readme.md
rename to keyboards/spaceholdings/nebula68b/keymaps/via/readme.md
diff --git a/keyboards/nebula68b/keymaps/via/rules.mk b/keyboards/spaceholdings/nebula68b/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nebula68b/keymaps/via/rules.mk
rename to keyboards/spaceholdings/nebula68b/keymaps/via/rules.mk
diff --git a/keyboards/nebula68b/nebula68b.c b/keyboards/spaceholdings/nebula68b/nebula68b.c
similarity index 100%
rename from keyboards/nebula68b/nebula68b.c
rename to keyboards/spaceholdings/nebula68b/nebula68b.c
diff --git a/keyboards/nebula68b/nebula68b.h b/keyboards/spaceholdings/nebula68b/nebula68b.h
similarity index 100%
rename from keyboards/nebula68b/nebula68b.h
rename to keyboards/spaceholdings/nebula68b/nebula68b.h
diff --git a/keyboards/nebula68b/readme.md b/keyboards/spaceholdings/nebula68b/readme.md
similarity index 96%
rename from keyboards/nebula68b/readme.md
rename to keyboards/spaceholdings/nebula68b/readme.md
index c0834e463a..624d9aced0 100755
--- a/keyboards/nebula68b/readme.md
+++ b/keyboards/spaceholdings/nebula68b/readme.md
@@ -12,7 +12,7 @@ This is a standard fixed layout 68% PCB. It supports VIA, full per-key RGB and u
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nebula68b:via
+    make spaceholdings/nebula68b:via
 
 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).
 
diff --git a/keyboards/nebula68b/rules.mk b/keyboards/spaceholdings/nebula68b/rules.mk
similarity index 100%
rename from keyboards/nebula68b/rules.mk
rename to keyboards/spaceholdings/nebula68b/rules.mk

From 8e34b64a9931a9155095ff988eeaafd5094ecaa4 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Thu, 10 Feb 2022 05:29:59 +0800
Subject: [PATCH 579/867] move hid_liber to /bpiphany (#16091)

---
 keyboards/{ => bpiphany}/hid_liber/config.h                   | 0
 keyboards/{ => bpiphany}/hid_liber/hid_liber.c                | 0
 keyboards/{ => bpiphany}/hid_liber/hid_liber.h                | 0
 keyboards/{ => bpiphany}/hid_liber/info.json                  | 0
 keyboards/{ => bpiphany}/hid_liber/keymaps/bakageta/config.h  | 0
 keyboards/{ => bpiphany}/hid_liber/keymaps/bakageta/keymap.c  | 0
 keyboards/{ => bpiphany}/hid_liber/keymaps/bakageta/readme.md | 0
 keyboards/{ => bpiphany}/hid_liber/keymaps/bakageta/rules.mk  | 0
 keyboards/{ => bpiphany}/hid_liber/keymaps/default/keymap.c   | 0
 keyboards/{ => bpiphany}/hid_liber/keymaps/default/readme.md  | 0
 keyboards/{ => bpiphany}/hid_liber/matrix.c                   | 0
 keyboards/{ => bpiphany}/hid_liber/readme.md                  | 2 +-
 keyboards/{ => bpiphany}/hid_liber/rules.mk                   | 0
 13 files changed, 1 insertion(+), 1 deletion(-)
 rename keyboards/{ => bpiphany}/hid_liber/config.h (100%)
 rename keyboards/{ => bpiphany}/hid_liber/hid_liber.c (100%)
 rename keyboards/{ => bpiphany}/hid_liber/hid_liber.h (100%)
 rename keyboards/{ => bpiphany}/hid_liber/info.json (100%)
 rename keyboards/{ => bpiphany}/hid_liber/keymaps/bakageta/config.h (100%)
 rename keyboards/{ => bpiphany}/hid_liber/keymaps/bakageta/keymap.c (100%)
 rename keyboards/{ => bpiphany}/hid_liber/keymaps/bakageta/readme.md (100%)
 rename keyboards/{ => bpiphany}/hid_liber/keymaps/bakageta/rules.mk (100%)
 rename keyboards/{ => bpiphany}/hid_liber/keymaps/default/keymap.c (100%)
 rename keyboards/{ => bpiphany}/hid_liber/keymaps/default/readme.md (100%)
 rename keyboards/{ => bpiphany}/hid_liber/matrix.c (100%)
 rename keyboards/{ => bpiphany}/hid_liber/readme.md (96%)
 rename keyboards/{ => bpiphany}/hid_liber/rules.mk (100%)

diff --git a/keyboards/hid_liber/config.h b/keyboards/bpiphany/hid_liber/config.h
similarity index 100%
rename from keyboards/hid_liber/config.h
rename to keyboards/bpiphany/hid_liber/config.h
diff --git a/keyboards/hid_liber/hid_liber.c b/keyboards/bpiphany/hid_liber/hid_liber.c
similarity index 100%
rename from keyboards/hid_liber/hid_liber.c
rename to keyboards/bpiphany/hid_liber/hid_liber.c
diff --git a/keyboards/hid_liber/hid_liber.h b/keyboards/bpiphany/hid_liber/hid_liber.h
similarity index 100%
rename from keyboards/hid_liber/hid_liber.h
rename to keyboards/bpiphany/hid_liber/hid_liber.h
diff --git a/keyboards/hid_liber/info.json b/keyboards/bpiphany/hid_liber/info.json
similarity index 100%
rename from keyboards/hid_liber/info.json
rename to keyboards/bpiphany/hid_liber/info.json
diff --git a/keyboards/hid_liber/keymaps/bakageta/config.h b/keyboards/bpiphany/hid_liber/keymaps/bakageta/config.h
similarity index 100%
rename from keyboards/hid_liber/keymaps/bakageta/config.h
rename to keyboards/bpiphany/hid_liber/keymaps/bakageta/config.h
diff --git a/keyboards/hid_liber/keymaps/bakageta/keymap.c b/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c
similarity index 100%
rename from keyboards/hid_liber/keymaps/bakageta/keymap.c
rename to keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c
diff --git a/keyboards/hid_liber/keymaps/bakageta/readme.md b/keyboards/bpiphany/hid_liber/keymaps/bakageta/readme.md
similarity index 100%
rename from keyboards/hid_liber/keymaps/bakageta/readme.md
rename to keyboards/bpiphany/hid_liber/keymaps/bakageta/readme.md
diff --git a/keyboards/hid_liber/keymaps/bakageta/rules.mk b/keyboards/bpiphany/hid_liber/keymaps/bakageta/rules.mk
similarity index 100%
rename from keyboards/hid_liber/keymaps/bakageta/rules.mk
rename to keyboards/bpiphany/hid_liber/keymaps/bakageta/rules.mk
diff --git a/keyboards/hid_liber/keymaps/default/keymap.c b/keyboards/bpiphany/hid_liber/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/hid_liber/keymaps/default/keymap.c
rename to keyboards/bpiphany/hid_liber/keymaps/default/keymap.c
diff --git a/keyboards/hid_liber/keymaps/default/readme.md b/keyboards/bpiphany/hid_liber/keymaps/default/readme.md
similarity index 100%
rename from keyboards/hid_liber/keymaps/default/readme.md
rename to keyboards/bpiphany/hid_liber/keymaps/default/readme.md
diff --git a/keyboards/hid_liber/matrix.c b/keyboards/bpiphany/hid_liber/matrix.c
similarity index 100%
rename from keyboards/hid_liber/matrix.c
rename to keyboards/bpiphany/hid_liber/matrix.c
diff --git a/keyboards/hid_liber/readme.md b/keyboards/bpiphany/hid_liber/readme.md
similarity index 96%
rename from keyboards/hid_liber/readme.md
rename to keyboards/bpiphany/hid_liber/readme.md
index d70ace123d..3f653cc040 100755
--- a/keyboards/hid_liber/readme.md
+++ b/keyboards/bpiphany/hid_liber/readme.md
@@ -12,6 +12,6 @@ DIY daughterboard for Filco Majestouch TKL developed by Geekhack and Deskthority
 
 Make example for this keyboard (after setting up your build environment):
 
-    make hid_liber:default
+    make bpiphany/hid_liber: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).
diff --git a/keyboards/hid_liber/rules.mk b/keyboards/bpiphany/hid_liber/rules.mk
similarity index 100%
rename from keyboards/hid_liber/rules.mk
rename to keyboards/bpiphany/hid_liber/rules.mk

From 250fd721ace2a979261f8f1b97a487ed8016ee75 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Thu, 10 Feb 2022 05:33:40 +0800
Subject: [PATCH 580/867] move four_banger to bpiphany (#16082)

---
 keyboards/{ => bpiphany}/four_banger/config.h                 | 0
 keyboards/{ => bpiphany}/four_banger/four_banger.c            | 0
 keyboards/{ => bpiphany}/four_banger/four_banger.h            | 0
 keyboards/{ => bpiphany}/four_banger/info.json                | 0
 keyboards/{ => bpiphany}/four_banger/keymaps/default/keymap.c | 0
 keyboards/{ => bpiphany}/four_banger/readme.md                | 4 ++--
 keyboards/{ => bpiphany}/four_banger/rules.mk                 | 0
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename keyboards/{ => bpiphany}/four_banger/config.h (100%)
 rename keyboards/{ => bpiphany}/four_banger/four_banger.c (100%)
 rename keyboards/{ => bpiphany}/four_banger/four_banger.h (100%)
 rename keyboards/{ => bpiphany}/four_banger/info.json (100%)
 rename keyboards/{ => bpiphany}/four_banger/keymaps/default/keymap.c (100%)
 rename keyboards/{ => bpiphany}/four_banger/readme.md (82%)
 rename keyboards/{ => bpiphany}/four_banger/rules.mk (100%)

diff --git a/keyboards/four_banger/config.h b/keyboards/bpiphany/four_banger/config.h
similarity index 100%
rename from keyboards/four_banger/config.h
rename to keyboards/bpiphany/four_banger/config.h
diff --git a/keyboards/four_banger/four_banger.c b/keyboards/bpiphany/four_banger/four_banger.c
similarity index 100%
rename from keyboards/four_banger/four_banger.c
rename to keyboards/bpiphany/four_banger/four_banger.c
diff --git a/keyboards/four_banger/four_banger.h b/keyboards/bpiphany/four_banger/four_banger.h
similarity index 100%
rename from keyboards/four_banger/four_banger.h
rename to keyboards/bpiphany/four_banger/four_banger.h
diff --git a/keyboards/four_banger/info.json b/keyboards/bpiphany/four_banger/info.json
similarity index 100%
rename from keyboards/four_banger/info.json
rename to keyboards/bpiphany/four_banger/info.json
diff --git a/keyboards/four_banger/keymaps/default/keymap.c b/keyboards/bpiphany/four_banger/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/four_banger/keymaps/default/keymap.c
rename to keyboards/bpiphany/four_banger/keymaps/default/keymap.c
diff --git a/keyboards/four_banger/readme.md b/keyboards/bpiphany/four_banger/readme.md
similarity index 82%
rename from keyboards/four_banger/readme.md
rename to keyboards/bpiphany/four_banger/readme.md
index 913ca6ee85..d508447b56 100644
--- a/keyboards/four_banger/readme.md
+++ b/keyboards/bpiphany/four_banger/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: [1up Keyboards](https://1upkeyboards.com/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make four_banger:default
+    make bpiphany/four_banger:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
\ No newline at end of file
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/four_banger/rules.mk b/keyboards/bpiphany/four_banger/rules.mk
similarity index 100%
rename from keyboards/four_banger/rules.mk
rename to keyboards/bpiphany/four_banger/rules.mk

From ae6f471f1c02cbd107549cfdfa84bb490571c321 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Thu, 10 Feb 2022 08:50:55 +1100
Subject: [PATCH 581/867] Modify the output of the size checks. (#16290)

---
 tmk_core/rules.mk | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 6767a8e4af..b303a87919 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -234,6 +234,7 @@ endif
 
 # Define programs and commands.
 SHELL = sh
+SED = sed
 REMOVE = rm -f
 REMOVEDIR = rmdir
 COPY = cp
@@ -292,17 +293,15 @@ sym: $(BUILD_DIR)/$(TARGET).sym
 LIBNAME=lib$(TARGET).a
 lib: $(LIBNAME)
 
-# Display size of file.
-HEXSIZE = $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex
-#ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf
-ELFSIZE = $(SIZE) $(BUILD_DIR)/$(TARGET).elf
+# Display size of file, modifying the output so people don't mistakenly grab the hex output
+BINARY_SIZE = $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex | $(SED) -e 's/\.build\/.*$$/$(TARGET).$(FIRMWARE_FORMAT)/g'
 
 sizebefore:
-	@if test -f $(BUILD_DIR)/$(TARGET).hex; then $(SECHO) $(MSG_SIZE_BEFORE); $(SILENT) || $(HEXSIZE); \
+	@if test -f $(BUILD_DIR)/$(TARGET).hex; then $(SECHO) $(MSG_SIZE_BEFORE); $(SILENT) || $(BINARY_SIZE); \
 	2>/dev/null; $(SECHO); fi
 
 sizeafter: $(BUILD_DIR)/$(TARGET).hex
-	@if test -f $(BUILD_DIR)/$(TARGET).hex; then $(SECHO); $(SECHO) $(MSG_SIZE_AFTER); $(SILENT) || $(HEXSIZE); \
+	@if test -f $(BUILD_DIR)/$(TARGET).hex; then $(SECHO); $(SECHO) $(MSG_SIZE_AFTER); $(SILENT) || $(BINARY_SIZE); \
 	2>/dev/null; $(SECHO); fi
 
 # Display compiler version information.
@@ -479,7 +478,7 @@ ifeq ($(findstring avr-gcc,$(CC)),avr-gcc)
 SIZE_MARGIN = 1024
 
 check-size:
-	$(eval MAX_SIZE=$(shell n=`$(CC) -E -mmcu=$(MCU) -D__ASSEMBLER__ $(CFLAGS) $(OPT_DEFS) platforms/avr/bootloader_size.c 2> /dev/null | sed -ne 's/\r//;/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'` && echo $$(($$n)) || echo 0))
+	$(eval MAX_SIZE=$(shell n=`$(CC) -E -mmcu=$(MCU) -D__ASSEMBLER__ $(CFLAGS) $(OPT_DEFS) platforms/avr/bootloader_size.c 2> /dev/null | $(SED) -ne 's/\r//;/^#/n;/^AVR_SIZE:/,$${s/^AVR_SIZE: //;p;}'` && echo $$(($$n)) || echo 0))
 	$(eval CURRENT_SIZE=$(shell if [ -f $(BUILD_DIR)/$(TARGET).hex ]; then $(SIZE) --target=$(FORMAT) $(BUILD_DIR)/$(TARGET).hex | $(AWK) 'NR==2 {print $$4}'; else printf 0; fi))
 	$(eval FREE_SIZE=$(shell expr $(MAX_SIZE) - $(CURRENT_SIZE)))
 	$(eval OVER_SIZE=$(shell expr $(CURRENT_SIZE) - $(MAX_SIZE)))

From 9d74c952152a4689e48c37f82a211c96a951c983 Mon Sep 17 00:00:00 2001
From: Aric Crosson Bouwers <48956351+ariccb@users.noreply.github.com>
Date: Wed, 9 Feb 2022 18:03:43 -0700
Subject: [PATCH 582/867] [Keymap] submitting ariccb planck keymap (#16177)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../keymaps/ariccb/.vscode/settings.json      |   5 +
 keyboards/planck/keymaps/ariccb/config.h      |  56 ++
 .../keymaps/ariccb/features/caps_word.c       | 122 ++++
 .../keymaps/ariccb/features/caps_word.h       | 101 +++
 .../keymaps/ariccb/features/select_word.c     | 110 +++
 .../keymaps/ariccb/features/select_word.h     |  37 +
 keyboards/planck/keymaps/ariccb/keymap.c      | 664 ++++++++++++++++++
 keyboards/planck/keymaps/ariccb/readme.md     |  78 ++
 keyboards/planck/keymaps/ariccb/rules.mk      |  10 +
 9 files changed, 1183 insertions(+)
 create mode 100644 keyboards/planck/keymaps/ariccb/.vscode/settings.json
 create mode 100644 keyboards/planck/keymaps/ariccb/config.h
 create mode 100644 keyboards/planck/keymaps/ariccb/features/caps_word.c
 create mode 100644 keyboards/planck/keymaps/ariccb/features/caps_word.h
 create mode 100644 keyboards/planck/keymaps/ariccb/features/select_word.c
 create mode 100644 keyboards/planck/keymaps/ariccb/features/select_word.h
 create mode 100644 keyboards/planck/keymaps/ariccb/keymap.c
 create mode 100644 keyboards/planck/keymaps/ariccb/readme.md
 create mode 100644 keyboards/planck/keymaps/ariccb/rules.mk

diff --git a/keyboards/planck/keymaps/ariccb/.vscode/settings.json b/keyboards/planck/keymaps/ariccb/.vscode/settings.json
new file mode 100644
index 0000000000..31e9436a77
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "select_word.h": "c"
+    }
+}
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ariccb/config.h b/keyboards/planck/keymaps/ariccb/config.h
new file mode 100644
index 0000000000..322aa9277f
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/config.h
@@ -0,0 +1,56 @@
+/* Copyright 2015-2021 Jack Humbert
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef AUDIO_ENABLE
+#    define STARTUP_SONG SONG(PLANCK_SOUND)
+// #define STARTUP_SONG SONG(NO_SOUND)
+
+#    define DEFAULT_LAYER_SONGS \
+        { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
+#endif
+/*
+ * MIDI options
+ */
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+#define MIDI_BASIC
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+#define TAPPING_TERM 150
+#define IGNORE_MOD_TAP_INTERRUPT
+// #define IGNORE_MOD_TAP_INTERRUPT
+// #define HOLD_ON_OTHER_KEY_PRESS
+
+#define COMBO_TERM 20
+
+
+
+#define MOUSEKEY_INTERVAL 16        //Time between cursor movements in milliseconds.
+                                    //If the refresh rate of your display is 60Hz, you could set it to 16 (1/60). As this raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED
+#define MOUSEKEY_MAX_SPEED 8        //Maximum cursor speed at which acceleration stops
+#define MOUSEKEY_TIME_TO_MAX 50     //Time until maximum scroll speed is reached
+#define MOUSEKEY_DELAY 100          //Delay between pressing a movement key and cursor movement
+#define MOUSEKEY_MOVE_DELTA 8       //Step size
diff --git a/keyboards/planck/keymaps/ariccb/features/caps_word.c b/keyboards/planck/keymaps/ariccb/features/caps_word.c
new file mode 100644
index 0000000000..c37e65d28a
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/features/caps_word.c
@@ -0,0 +1,122 @@
+// Copyright 2021-2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+// For full documentation, see
+// https://getreuer.info/posts/keyboards/caps-word
+
+#include "caps_word.h"
+
+static bool caps_word_active = false;
+
+bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
+#ifndef NO_ACTION_ONESHOT
+  const uint8_t mods = get_mods() | get_oneshot_mods();
+#else
+  const uint8_t mods = get_mods();
+#endif  // NO_ACTION_ONESHOT
+
+  if (!caps_word_active) {
+    // Pressing both shift keys at the same time enables caps word.
+    if ((mods & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
+      caps_word_set(true);  // Activate Caps Word.
+      return false;
+    }
+    return true;
+  }
+
+  if (!record->event.pressed) { return true; }
+
+  if (!(mods & ~MOD_MASK_SHIFT)) {
+    switch (keycode) {
+      // Ignore MO, TO, TG, TT, and OSL layer switch keys.
+      case QK_MOMENTARY ... QK_MOMENTARY + 255:
+      case QK_TO ... QK_TO + 255:
+      case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER + 255:
+      case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE + 255:
+      case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER + 255:
+        return true;
+
+#ifndef NO_ACTION_TAPPING
+      case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+        if (record->tap.count == 0) {
+          // Deactivate if a mod becomes active through holding a mod-tap key.
+          caps_word_set(false);
+          return true;
+        }
+        keycode &= 0xff;
+        break;
+
+#ifndef NO_ACTION_LAYER
+      case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
+#endif  // NO_ACTION_LAYER
+        if (record->tap.count == 0) { return true; }
+        keycode &= 0xff;
+        break;
+#endif  // NO_ACTION_TAPPING
+
+#ifdef SWAP_HANDS_ENABLE
+      case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
+        if (keycode > 0x56F0 || record->tap.count == 0) { return true; }
+        keycode &= 0xff;
+        break;
+#endif  // SWAP_HANDS_ENABLE
+    }
+
+    if (caps_word_press_user(keycode)) {
+      return true;
+    }
+  }
+
+  caps_word_set(false);  // Deactivate Caps Word.
+  return true;
+}
+
+void caps_word_set(bool active) {
+  if (active != caps_word_active) {
+    if (active) {
+      clear_mods();
+#ifndef NO_ACTION_ONESHOT
+      clear_oneshot_mods();
+#endif  // NO_ACTION_ONESHOT
+    }
+
+    caps_word_active = active;
+    caps_word_set_user(active);
+  }
+}
+
+bool caps_word_get(void) { return caps_word_active; }
+
+__attribute__((weak)) void caps_word_set_user(bool active) {}
+
+__attribute__((weak)) bool caps_word_press_user(uint16_t keycode) {
+  switch (keycode) {
+    // Keycodes that continue Caps Word, with shift applied.
+    case KC_A ... KC_Z:
+      add_weak_mods(MOD_BIT(KC_LSFT));  // Apply shift to the next key.
+      return true;
+
+    // Keycodes that continue Caps Word, without shifting.
+    case KC_1 ... KC_0:
+    case KC_P1 ... KC_P0:
+    case KC_BSPC:
+    case KC_MINS:
+    case KC_UNDS:
+      return true;
+
+    default:
+      return false;  // Deactivate Caps Word.
+  }
+}
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ariccb/features/caps_word.h b/keyboards/planck/keymaps/ariccb/features/caps_word.h
new file mode 100644
index 0000000000..523c815157
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/features/caps_word.h
@@ -0,0 +1,101 @@
+// Copyright 2021-2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+// Caps Word, activated by pressing both shift keys at the same time.
+//
+// This library implements "Caps Word", which is like conventional Caps Lock,
+// but automatically disables itself at the end of the word. This is useful for
+// typing all-caps identifiers like `MOD_MASK_ALT`.
+//
+// Caps Word is activated by pressing the left and right shift keys at the same
+// time. This way you don't need a dedicated key for using Caps Word. I've
+// tested that this works as expected with one-shot mods and Space Cadet Shift.
+// If your shift keys are mod-taps, activate Caps Word by holding both shift
+// mod-tap keys until the tapping term, release them, then begin typing.
+//
+// For full documentation, see
+// https://getreuer.info/posts/keyboards/caps-word
+
+#pragma once
+
+#include QMK_KEYBOARD_H
+
+// Call this function from `process_record_user()` to implement Caps Word.
+bool process_caps_word(uint16_t keycode, keyrecord_t* record);
+
+// Activates or deactivates Caps Word. For instance activate Caps Word with a
+// combo by defining a `COMBO_ACTION` that calls `caps_word_set(true)`:
+//
+// void process_combo_event(uint16_t combo_index, bool pressed) {
+//   switch(combo_index) {
+//     case CAPS_COMBO:
+//       if (pressed) {
+//         caps_word_set(true);  // Activate Caps Word.
+//       }
+//       break;
+//
+//     // Other combos...
+//   }
+// }
+void caps_word_set(bool active);
+
+// Returns whether Caps Word is currently active.
+bool caps_word_get(void);
+
+// An optional callback that gets called when Caps Word turns on or off. This is
+// useful to represent the current Caps Word state, e.g. by setting an LED or
+// playing a sound. In your keymap, define
+//
+//   void caps_word_set_user(bool active) {
+//     if (active) {
+//       // Do something when Caps Word activates.
+//     } else {
+//       // Do something when Caps Word deactivates.
+//     }
+//   }
+void caps_word_set_user(bool active);
+
+// An optional callback which is called on every key press while Caps Word is
+// active. When the key should be shifted (that is, a letter key), the callback
+// should call `add_weak_mods(MOD_BIT(KC_LSFT))` to shift the key. The callback
+// also determines whether the key should continue Caps Word. Returning true
+// continues the current "word", while returning false is "word breaking" and
+// deactivates Caps Word. The default callback is
+//
+//   bool caps_word_press_user(uint16_t keycode) {
+//     switch (keycode) {
+//       // Keycodes that continue Caps Word, with shift applied.
+//       case KC_A ... KC_Z:
+//         add_weak_mods(MOD_BIT(KC_LSFT));  // Apply shift to the next key.
+//         return true;
+//
+//       // Keycodes that continue Caps Word, without shifting.
+//       case KC_1 ... KC_0:
+//       case KC_BSPC:
+//       case KC_MINS:
+//       case KC_UNDS:
+//         return true;
+//
+//       default:
+//         return false;  // Deactivate Caps Word.
+//     }
+//   }
+//
+// To customize, copy the above function into your keymap and add/remove
+// keycodes to the above cases.
+//
+// NOTE: Outside of this callback, you can use `caps_word_set(false)` to
+// deactivate Caps Word.
+bool caps_word_press_user(uint16_t keycode);
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ariccb/features/select_word.c b/keyboards/planck/keymaps/ariccb/features/select_word.c
new file mode 100644
index 0000000000..c0ffe0a90d
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/features/select_word.c
@@ -0,0 +1,110 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+// For full documentation, see
+// https://getreuer.info/posts/keyboards/select-word
+
+#include "select_word.h"
+
+// Mac users, uncomment this line:
+// #define MAC_HOTKEYS
+
+enum { STATE_NONE, STATE_SELECTED, STATE_WORD, STATE_FIRST_LINE, STATE_LINE };
+
+bool process_select_word(uint16_t keycode, keyrecord_t* record,
+                         uint16_t sel_keycode) {
+  static uint8_t state = STATE_NONE;
+
+  if (keycode == KC_LSFT || keycode == KC_RSFT) { return true; }
+
+  if (keycode == sel_keycode && record->event.pressed) {  // On key press.
+    const uint8_t mods = get_mods();
+#ifndef NO_ACTION_ONESHOT
+    const uint8_t all_mods = mods | get_oneshot_mods();
+#else
+    const uint8_t all_mods = mods;
+#endif  // NO_ACTION_ONESHOT
+    if ((all_mods & MOD_MASK_SHIFT) == 0) {  // Select word.
+#ifdef MAC_HOTKEYS
+      register_code(KC_LALT);
+#else
+      register_code(KC_LCTL);
+#endif  // MAC_HOTKEYS
+      if (state == STATE_NONE) {
+        tap_code(KC_RGHT);
+        tap_code(KC_LEFT);
+      }
+      register_code(KC_LSFT);
+      register_code(KC_RGHT);
+      state = STATE_WORD;
+    } else {  // Select line.
+      if (state == STATE_NONE) {
+        clear_mods();
+#ifndef NO_ACTION_ONESHOT
+        clear_oneshot_mods();
+#endif  // NO_ACTION_ONESHOT
+#ifdef MAC_HOTKEYS
+        register_code16(LCTL(KC_A));
+        tap_code16(LSFT(KC_E));
+        unregister_code16(LCTL(KC_A));
+#else
+        tap_code(KC_HOME);
+        tap_code16(LSFT(KC_END));
+#endif  // MAC_HOTKEYS
+        set_mods(mods);
+        state = STATE_FIRST_LINE;
+      } else {
+        register_code(KC_DOWN);
+        state = STATE_LINE;
+      }
+    }
+    return false;
+  }
+
+  // `sel_keycode` was released, or another key was pressed.
+  switch (state) {
+    case STATE_WORD:
+      unregister_code(KC_RGHT);
+      unregister_code(KC_LSFT);
+#ifdef MAC_HOTKEYS
+      unregister_code(KC_LALT);
+#else
+      unregister_code(KC_LCTL);
+#endif  // MAC_HOTKEYS
+      state = STATE_SELECTED;
+      break;
+
+    case STATE_FIRST_LINE:
+      state = STATE_SELECTED;
+      break;
+
+    case STATE_LINE:
+      unregister_code(KC_DOWN);
+      state = STATE_SELECTED;
+      break;
+
+    case STATE_SELECTED:
+      if (keycode == KC_ESC) {
+        tap_code(KC_RGHT);
+        state = STATE_NONE;
+        return false;
+      }
+      // Fallthrough.
+    default:
+      state = STATE_NONE;
+  }
+
+  return true;
+}
diff --git a/keyboards/planck/keymaps/ariccb/features/select_word.h b/keyboards/planck/keymaps/ariccb/features/select_word.h
new file mode 100644
index 0000000000..f762ba1179
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/features/select_word.h
@@ -0,0 +1,37 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+// Select word/line button.
+//
+// Implements a button that selects the current word, assuming conventional text
+// editor hotkeys. Pressing it again extends the selection to the following
+// word. The effect is similar to word selection (W) in the Kakoune editor.
+//
+// Pressing the button with shift selects the current line, and pressing the
+// button again extends the selection to the following line.
+//
+// Note for Mac users: Windows/Linux editing hotkeys are assumed by default.
+// Uncomment the `#define MAC_HOTKEYS` line in select_word.c for Mac hotkeys.
+// The Mac implementation is untested, let me know if it has problems.
+//
+// For full documentation, see
+// https://getreuer.info/posts/keyboards/select-word
+
+#pragma once
+
+#include QMK_KEYBOARD_H
+
+bool process_select_word(uint16_t keycode, keyrecord_t* record,
+                         uint16_t sel_keycode);
diff --git a/keyboards/planck/keymaps/ariccb/keymap.c b/keyboards/planck/keymaps/ariccb/keymap.c
new file mode 100644
index 0000000000..c0b4e490fa
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/keymap.c
@@ -0,0 +1,664 @@
+ /* Copyright 2021 Aric Crosson Bouwers
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+
+#include QMK_KEYBOARD_H
+#include "muse.h"
+#include "features/select_word.h"
+#include "features/caps_word.h"
+
+// using the Word Selection QMK Macro by Pascal Getreuer, found here: https://getreuer.info/posts/keyboards/select-word/index.html
+// THANKS Pascal for such amazing functionality!!
+
+// 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 _QWERTY 0
+#define _COLEMAK_VCP 1
+#define _LOWER 2
+#define _RAISE 3
+#define _NUMPAD 4
+#define _FN 5
+#define _ADJUST 6
+#define _GAMING 7
+
+#define MICMUTE LALT(KC_M)
+#define DESKTR LGUI(LCTL(KC_RGHT))  // move one virtual desktop to the right
+#define DESKTL LGUI(LCTL(KC_LEFT))  // move one virtual desktop to the left
+#define MTLCTL_F9 MT(MOD_LCTL, KC_F9)
+#define MTLSFT_F10 MT(MOD_LSFT, KC_F10)
+#define MTLALT_F11 MT(MOD_LALT, KC_F11)
+#define MTLGUI_Z MT(MOD_LGUI, KC_Z)
+#define MTLALT_PL MT(MOD_LALT, KC_MPLY)
+#define MTLALT_NXT MT(MOD_LALT, KC_MNXT)
+#define MTENTER MT(MOD_LCTL, KC_ENT)
+#define MTRSFTBSLS MT(MOD_RSFT, KC_BSLS)
+#define MTRCTLQUO MT(MOD_RCTL, KC_QUOT)
+#define MTTAB MT(MOD_LCTL | MOD_LGUI | MOD_LALT, KC_TAB)
+#define LTESC LT(_FN, KC_ESC)
+#define MTPLAY MT(MOD_RALT, KC_MPLY)
+#define KC_COPY LCTL(KC_C)
+#define KC_CUT LCTL(KC_X)
+#define KC_PASTE LCTL(KC_V)
+#define KC_WINPASTE LGUI(KC_V)
+#define KC_PTXT LCTL(LSFT(KC_V))
+#define KC_UNDO LCTL(KC_Z)
+#define KC_REDO LCTL(KC_Y)
+
+enum planck_keycodes {
+  QWERTY = SAFE_RANGE,
+  COLEMAK_VCP,
+  LOWER,
+  RAISE,
+  FN,
+  ADJUST,
+  NUMPAD,
+  GAMING,
+  EXT_NUM,
+  EXT_GAMING,
+  SELWORD,
+  BRACES,
+  BRACES2,
+  ARROW,
+  ALT_TAB
+};
+
+// Define a type for as many tap dance states as you need
+typedef enum {
+    TD_NONE,
+    TD_UNKNOWN,
+    TD_SINGLE_TAP,
+    TD_SINGLE_HOLD,
+    TD_DOUBLE_TAP
+} td_state_t;
+
+typedef struct {
+    bool is_press_action;
+    td_state_t state;
+} td_tap_t;
+
+ // Our custom tap dance keys; add any other tap dance keys to this enum
+enum {
+    UNDS_LOWER,
+    PLAY_RAISE
+};
+
+// Declare the functions to be used with your tap dance key(s)
+// Function associated with all tap dances
+td_state_t cur_dance(qk_tap_dance_state_t *state);
+
+// Functions associated with individual tap dances
+void usl_finished(qk_tap_dance_state_t *state, void *user_data);
+void usl_reset(qk_tap_dance_state_t *state, void *user_data);
+
+/* ----------------------------------------------------------------------------------------------------------------------------- */
+
+// This is a completely modified layout that stikes a balance between muscle memory for keys, where I was coming from a standard
+// Qwerty keyboard, and efficiency gained by using layers. I've switched tab and esc because it's more natural to me this way, and
+// added layer switch on hold functionality for each key. Enter has moved to the key beside LOWER, to allow usage while still having
+// the right hand on the mouse.
+
+// Lower incorporates a numpad on the right side, and all of the symbols included on the left. There is logic for the symbols needed for
+// calculators and math are located around the numpad, and coding symbols are placed in easy to remember spots.
+
+// CAPS has moved to the Fn layer, and a few additional shortcut modifiers like CTRL_ALT_UP and DOWN for adding additional cursors in VSCode.
+// Play/Pause has a prime spot on the base layer, and the Fn version skips to next track
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* MIT Layout (QWERTY)
+ *
+ * ,------------------------------------------------------------------------.
+ * |FN,Esc|  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  |Bsp  |
+ * |------------------------------------------------------------------------|
+  |CSW,Tab|  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |Ctl,'|
+ * |------------------------------------------------------------------------|
+ * |Shift |Win,z|  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |Sft,\|
+ * |------------------------------------------------------------------------|
+ * |      |     |     |Ctl,Ent|LOWER|  Space  |RAISE|Alt,Play|  |     |     |
+ * `------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_planck_grid( /* QWERTY */
+    LTESC,   KC_Q,     KC_W,     KC_E,    KC_R,           KC_T,   KC_Y,   KC_U,   KC_I,      KC_O,   KC_P,    KC_BSPC,
+    MTTAB,   KC_A,     KC_S,     KC_D,    KC_F,           KC_G,   KC_H,   KC_J,   KC_K,      KC_L,   KC_SCLN, MTRCTLQUO,
+    KC_LSFT, MTLGUI_Z, KC_X,     KC_C,    KC_V,           KC_B,   KC_N,   KC_M,   KC_COMM,   KC_DOT, KC_SLSH, MTRSFTBSLS,
+    KC_NO,   KC_NO,    KC_NO,    MTENTER, TD(UNDS_LOWER), KC_SPC, KC_SPC, MO(3),  MTLALT_PL, KC_NO,  KC_NO,   KC_NO
+ ),
+
+ /* MIT Layout (COLEMAK_VCP)
+ *
+ * ,------------------------------------------------------------------------.
+ * |FN,ESC|  q  |  w  |  f  |  d  |  b  |  j  |  l  |  u  |  y  |  ;  | Bsp |
+ * |------------------------------------------------------------------------|
+  |CSW,Tab|  a  |  r  |  s  |  t  |  g  |  m  |  n  |  e  |  i  |  o  |Ctl,'|
+ * |------------------------------------------------------------------------|
+ * |Shift |Win,z|  x  |  v  |  c  |  p  |  k  |  h  |  ,  |  .  |  /  |Sft,\|
+ * |------------------------------------------------------------------------|
+ * |      |     |   |Ctl,Ent|LWR,_|   Space   |RAISE|Alt,Play|  |     |     |
+ * `------------------------------------------------------------------------'
+ */
+[_COLEMAK_VCP] = LAYOUT_planck_grid( /* COLEMAK_VCP */
+    LTESC,   KC_Q,     KC_W,     KC_F,    KC_D,           KC_B,   KC_J,   KC_L,   KC_U,      KC_Y,   KC_SCLN, KC_BSPC,
+    MTTAB,   KC_A,     KC_R,     KC_S,    KC_T,           KC_G,   KC_M,   KC_N,   KC_E,      KC_I,   KC_O,    MTRCTLQUO,
+    KC_LSFT, MTLGUI_Z, KC_X,     KC_V,    KC_C,           KC_P,   KC_K,   KC_H,   KC_COMM,   KC_DOT, KC_SLSH, MTRSFTBSLS,
+    KC_NO,   KC_NO,    KC_NO,    MTENTER, TD(UNDS_LOWER), KC_SPC, KC_SPC, MO(3),  MTLALT_PL, KC_NO,  KC_NO,   KC_NO
+ ),
+
+/* MIT Layout (RAISE)
+ *
+ * ,----------------------------------------------------------------------------.
+ * |  ~  |  !  |     |     |      |      |      |  Cut  | Undo| Redo|P2TXT| Bsp |
+ * |----------------------------------------------------------------------------|
+ * |     |Menu |     |     |      |      |ARROW |SELWORD|Copy|Paste|WinPst|  "  |
+ * |----------------------------------------------------------------------------|
+ * |     |Vol+ |Vol- | Mute|      |      |Braces|Braces2|  <  |  >  |  ?  |  !  |
+ * |----------------------------------------------------------------------------|
+ * |     |     |     |     |Adjust|             |       |     |     |     |     |
+ * `----------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_planck_grid( /* RAISE */
+  KC_TILD, KC_EXLM, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CUT,  KC_UNDO, KC_REDO,  KC_PTXT,     KC_BSPC,
+  KC_TRNS, KC_APP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ARROW,   SELWORD, KC_COPY, KC_PASTE, KC_WINPASTE, KC_DQUO,
+  KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, BRACES,  BRACES2, KC_LABK, KC_RABK,  KC_QUES,     KC_EXLM,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(6),   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_NO,       KC_NO
+),
+
+/* MIT Layout (LOWER)
+ * XZ
+ * ,-----------------------------------------------------------------------.
+ * |  `  |  !  |  #  |  $  |  <  |  >  |  :  |  7  |  8  |  9  |  =  | Bsp |
+ * |-----------------------------------------------------------------------|
+ * |  '  |  _  |  ^  |  %  |  (  |  )  |  M  |  4  |  5  |  6  |  -  |  +  |
+ * |-----------------------------------------------------------------------|
+ * |Shift|  |  |  &  |  "  |  {  |  }  |  @  |  1  |  2  |  3  |  /  |  *  |
+ * |-----------------------------------------------------------------------|
+ * |     |     |     |     |     |         |MO(6),0|  .  |     |     |     |
+ * `-----------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_planck_grid( /* LOWER */
+  KC_GRV,  KC_EXLM, KC_HASH, KC_DLR,  KC_LABK, KC_RABK, KC_COLN, KC_P7, KC_P8,   KC_P9,  KC_EQL,  KC_BSPC,
+  KC_QUOT, KC_UNDS, KC_CIRC, KC_PERC, KC_LPRN, KC_RPRN, KC_M,    KC_P4, KC_P5,   KC_P6,  KC_PMNS, KC_PPLS,
+  KC_TRNS, KC_PIPE, KC_AMPR, KC_DQUO, KC_LCBR, KC_RCBR, KC_AT,   KC_P1, KC_P2,   KC_P3,  KC_PSLS, KC_PAST,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P0, KC_PDOT, KC_NO,  KC_NO,   KC_NO
+),
+
+/* MIT Layout (GAMING)
+ *.
+ * ,-----------------------------------------------------------------------.
+ * |ESC,`|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |EXIT GAMING|
+ * |-----------------------------------------------------------------------|
+ * | TAB |  Q  |  W  |  E  |  R  |  T  |  I  |  4  |  5  |  6  |  -  |  +  |
+ * |-----------------------------------------------------------------------|
+ * |Shift|  A  |  S  |  D  |  F  |  G  |  K  |  1  |  2  |  3  |  /  |  *  |
+ * |-----------------------------------------------------------------------|
+ * |     |     |     |  Ctl | Alt |   SPACE   |  0  |  .  |     |     |    |
+ * `-----------------------------------------------------------------------'
+ */
+[_GAMING] = LAYOUT_planck_grid( /* GAMING */
+  KC_GESC, KC_1,  KC_2,  KC_3,    KC_4,    KC_5,   KC_6,   KC_7,  KC_P8,   KC_9,  KC_0,    EXT_GAMING,
+  KC_TAB,  KC_Q,  KC_W,  KC_E,    KC_R,    KC_T,   KC_I,   KC_P4, KC_P5,   KC_P6, KC_PMNS, KC_PPLS,
+  KC_LSFT, KC_A,  KC_S,  KC_D,    KC_F,    KC_G,   KC_K,   KC_P1, KC_P2,   KC_P3, KC_PSLS, KC_PAST,
+  KC_NO,   KC_NO, KC_NO, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_P0, KC_PDOT, KC_NO, KC_NO,   KC_NO
+),
+
+/* MIT Layout (FN)
+ *
+ * ,----------------------------------------------------------------------------.
+ * | |Ctl,F9 |Sft,F10|Alt,F11| F12 |MyComp|Calc  |home |  up  | end |PrtScr| Del |
+ * |-----------------------------------------------------------------------------|
+ * |    | F5 |   F6  |   F7  | F8  |DeskL |DeskR |left | down |right|ScrLck| CAPS|
+ * |-----------------------------------------------------------------------------|
+ * |    | F1 |   F2  |   F3  | F4  |ALT_TAB|MicM |pgup |LCA_dn| pgdn|Pse/Brk| Ins|
+ * |-----------------------------------------------------------------------------|
+ * |    |    |       |       |     |             |     |Alt,MNext|  |      |     |
+ * `-----------------------------------------------------------------------------'
+ */
+[_FN] = LAYOUT_planck_grid( /* FUNCTION */
+  KC_TRNS, MTLCTL_F9, MTLSFT_F10, MTLALT_F11, KC_F12,  KC_MYCM, KC_CALC, KC_HOME, KC_UP,        KC_END,  KC_PSCR,   KC_DEL,
+  KC_TRNS, KC_F5,     KC_F6,      KC_F7,      KC_F8,   DESKTL,  DESKTR,  KC_LEFT, KC_DOWN,      KC_RGHT, KC_SLCK,   KC_CAPS,
+  KC_TRNS, KC_F1,     KC_F2,      KC_F3,      KC_F4,   ALT_TAB, MICMUTE, KC_PGUP, LCA(KC_DOWN), KC_PGDN, KC_PAUSE, KC_INS,
+  KC_NO,   KC_NO,     KC_NO,      KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MTLALT_NXT,   KC_NO,   KC_NO,    KC_NO
+),
+
+/* MIT Layout (ADJUST)
+ *
+ * ,-----------------------------------------------------------------------------.
+ * |RGBtog|Ms3 | Ms2 |MsUp | Ms1  |  Hue+|  Hue- | Sat+| Sat- |Brt+ |Brt- | RESET|
+ * |-----------------------------------------------------------------------------|
+ * |RGBMod| MWL | MsL |MDn  |MsR  |GAMING|       |AU_ON|AU_OFF|MU_ON|MU_OF| DEBUG|
+ * |-----------------------------------------------------------------------------|
+ * |     |MWLft|MWUp |NWDn |NWRght|QWERTY|CMK_VCP|MI_ON|MI_OF |     |     |MU_Mod|
+ * |-----------------------------------------------------------------------------|
+ * |     |     |     |SLEEP|      |              |     |      |     |     |      |
+ * `-----------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_planck_grid( /* ADJUST LAYER */
+  RGB_TOG, KC_BTN3, KC_BTN2, KC_MS_U, KC_BTN1, RGB_HUI, RGB_HUD,     RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RESET,
+  RGB_MOD, KC_NO,   KC_MS_L, KC_MS_D, KC_MS_R, GAMING,  KC_NO,       AU_ON,   AU_OFF,  MU_ON,   MU_OFF,  DEBUG,
+  KC_TRNS, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, QWERTY,  COLEMAK_VCP, MI_ON,   MI_OFF,  KC_TRNS, KC_TRNS, MU_MOD,
+  KC_NO,   KC_NO,   KC_NO,   KC_SLEP, KC_TRNS, KC_TRNS, KC_TRNS,     KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_NO
+)
+};
+
+#ifdef AUDIO_ENABLE
+float layerswitch_song[][2] = SONG(PLANCK_SOUND);
+float tone_startup[][2]     = SONG(STARTUP_SOUND);
+float tone_qwerty[][2]      = SONG(QWERTY_SOUND);
+float tone_COLEMAK_VCP[][2] = SONG(COLEMAK_SOUND);
+float music_scale[][2]      = SONG(MUSIC_SCALE_SOUND);
+float tone_goodbye[][2]     = SONG(GOODBYE_SOUND);
+
+#endif
+
+bool is_alt_tab_active = false;
+layer_state_t layer_state_set_user(layer_state_t state) {
+
+	static bool is_this_layer_on = false;
+	if (layer_state_cmp(state, 4) != is_this_layer_on) {
+		is_this_layer_on = layer_state_cmp(state, 4);
+		if (is_this_layer_on) {
+			PLAY_SONG(layerswitch_song);
+		}
+		else {
+			stop_all_notes();
+		}
+	}
+  if (is_alt_tab_active) {
+        unregister_code(KC_LALT);
+        is_alt_tab_active = false;
+    }
+    return state;
+
+	switch (get_highest_layer(state)) {
+		case _ADJUST:
+			rgblight_setrgb (0xFF,  0x00, 0x00);
+			break;
+		case _LOWER:
+			rgblight_setrgb (0x00,  0x00, 0xFF);
+			break;
+    case _NUMPAD:
+			rgblight_setrgb (0x00,  0x00, 0xFF);
+			break;
+		case _RAISE:
+			rgblight_setrgb (0x7A,  0x00, 0xFF);
+			break;
+		case _FN:
+			rgblight_setrgb (0x00,  0xFF, 0x00);
+			break;
+		default: //  for any other layers, or the default layer
+			rgblight_setrgb (0xFF,  0xFF, 0xFF);
+			break;
+		}
+	  return state;
+}
+
+// void dance_media (qk_tap_dance_state_t *state, void *user_data)
+//     if (state->count == 1) {
+//         tap_code(KC_MPLY);
+//     } else if (state->count == 2) {
+//         tap_code (KC_MNXT);
+//     } else if (state->count == 3) {
+//         tap_code(KC_MPRV);
+//     } else {
+//         reset_tap_dance (state);
+//     }
+// }
+
+// qk_tap_dance_action_t tap_dance_actions[] = {
+//  [0] = ACTION_TAP_DANCE_FN (dance_media),
+// };
+
+// Determine the current tap dance state
+td_state_t cur_dance(qk_tap_dance_state_t *state) {
+    if (state->interrupted) return TD_SINGLE_HOLD;
+    if (state->count == 1) {
+        if (!state->pressed) return TD_SINGLE_TAP;
+        else return TD_SINGLE_HOLD;
+    } else if (state->count == 2) return TD_DOUBLE_TAP;
+    else return TD_UNKNOWN;
+}
+
+// Initialize tap structure associated with example tap dance key
+static td_tap_t usl_tap_state = {
+    .is_press_action = true,
+    .state = TD_NONE
+};
+
+// Functions that control what our tap dance key does
+void usl_finished(qk_tap_dance_state_t *state, void *user_data) {
+    usl_tap_state.state = cur_dance(state);
+    switch (usl_tap_state.state) {
+        case TD_SINGLE_TAP:
+            tap_code16(KC_UNDS);
+            break;
+        case TD_SINGLE_HOLD:
+            layer_on(_LOWER);
+            // update_tri_layer(_LOWER, _RAISE, _ADJUST);
+            break;
+        case TD_DOUBLE_TAP:
+            // Check to see if the layer is already set
+            if (layer_state_is(_LOWER)) {
+                // If already set, then switch it off
+                layer_off(_LOWER);
+                #ifdef AUDIO_ENABLE
+                  PLAY_SONG(tone_goodbye);
+                #endif
+            } else {
+                // If not already set, then switch the layer on
+                layer_on(_LOWER);
+                #ifdef AUDIO_ENABLE
+                  PLAY_SONG(layerswitch_song);
+                #endif
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+void usl_reset(qk_tap_dance_state_t *state, void *user_data) {
+    // If the key was held down and now is released then switch off the layer
+    if (usl_tap_state.state == TD_SINGLE_HOLD) {
+        layer_off(_LOWER);
+        // update_tri_layer(_LOWER, _RAISE, _ADJUST);
+    }
+    usl_tap_state.state = TD_NONE;
+}
+
+// Associate our tap dance key with its functionality
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [UNDS_LOWER] = ACTION_TAP_DANCE_FN_ADVANCED_TIME(NULL, usl_finished, usl_reset, 175)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (!process_select_word(keycode, record, SELWORD)) { return false; }
+  if (!process_caps_word(keycode, record)) { return false; }
+
+  const uint8_t mods = get_mods();
+  const uint8_t oneshot_mods = get_oneshot_mods();
+
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+      break;
+    case KC_CAPS:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(tone_qwerty);
+        #endif
+        register_code(KC_CAPS);
+      }
+      return false;
+      break;
+    case GAMING:
+      if (record->event.pressed) {
+        layer_off(_RAISE);
+        layer_off(_LOWER);
+        layer_off(_ADJUST);
+        layer_on(_GAMING);
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(layerswitch_song);
+        #endif
+      }
+      return false;
+      break;
+    case EXT_GAMING:
+      if (record->event.pressed) {
+        layer_off(_GAMING);
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(tone_goodbye);
+        #endif
+      }
+      return false;
+      break;
+    case COLEMAK_VCP:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_COLEMAK_VCP);
+      }
+      return false;
+      break;
+    case BRACES:  // Types (), or {}, and puts cursor between braces.
+      if (record->event.pressed) {
+        clear_mods();  // Temporarily disable mods.
+        clear_oneshot_mods();
+        if ((mods | oneshot_mods) & MOD_MASK_SHIFT) {
+          SEND_STRING("{}");
+        } else {
+          SEND_STRING("<>");
+        }
+        tap_code(KC_LEFT);  // Move cursor between braces.
+        set_mods(mods);  // Restore mods.
+      }
+      return false;
+    case BRACES2:  // Types [], or <>, and puts cursor between braces.
+      if (record->event.pressed) {
+        clear_mods();  // Temporarily disable mods.
+        clear_oneshot_mods();
+        if ((mods | oneshot_mods) & MOD_MASK_SHIFT) {
+          SEND_STRING("()");
+        } else {
+          SEND_STRING("[]");
+        }
+        tap_code(KC_LEFT);  // Move cursor between braces.
+        set_mods(mods);  // Restore mods.
+      }
+      return false;
+    case ARROW:  // Arrow macro, types -> or =>.
+      if (record->event.pressed) {
+        if ((mods | oneshot_mods) & MOD_MASK_SHIFT) {  // Is shift held?
+          del_mods(MOD_MASK_SHIFT);  // Temporarily delete shift.
+          del_oneshot_mods(MOD_MASK_SHIFT);
+          SEND_STRING("->");
+          set_mods(mods);            // Restore mods.
+        } else {
+          SEND_STRING("=>");
+        }
+      }
+      return false;
+    case ALT_TAB: // super alt tab macro
+      if (record->event.pressed) {
+          if (!is_alt_tab_active) {
+              is_alt_tab_active = true;
+              register_code(KC_LALT);
+          }
+          register_code(KC_TAB);
+      } else {
+          unregister_code(KC_TAB);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
+
+enum combo_events {
+  EM_EMAIL,
+  EM_WORK_EMAIL,
+  HTML_P,
+  HTML_TITLE,
+  HTML_DIV,
+  HTML_HTML,
+  HTML_HEAD,
+  HTML_BODY,
+  HTML_FOOTER,
+  HTML_A_HREF,
+  HTML_IMG,
+  CSS_STYLE,
+  HTML_GENERIC_TAG,
+  CTLRGHT,
+  CTLLEFT,
+  COMBO_LENGTH
+};
+uint16_t COMBO_LEN = COMBO_LENGTH; // remove the COMBO_COUNT define and use this instead!
+
+const uint16_t PROGMEM email_combo[] = {KC_E, KC_M, COMBO_END};
+const uint16_t PROGMEM email_work_combo[] = {KC_E, KC_K, COMBO_END};
+const uint16_t PROGMEM html_p_combo[] = {KC_P, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_title_combo[] = {KC_T, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_div_combo[] = {KC_D, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_html_combo[] = {KC_Q, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_head_combo[] = {KC_W, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_body_combo[] = {KC_R, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_footer_combo[] = {KC_X, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_a_href_combo[] = {KC_A, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_img_combo[] = {KC_F, KC_DOT, COMBO_END};
+const uint16_t PROGMEM css_style_combo[] = {KC_S, KC_DOT, COMBO_END};
+const uint16_t PROGMEM html_generic_tag_combo[] = {KC_G, KC_DOT, COMBO_END};
+const uint16_t PROGMEM ctrrght_combo[] = {KC_RGHT, KC_DOWN, COMBO_END};
+const uint16_t PROGMEM ctrleft_combo[] = {KC_LEFT, KC_DOWN, COMBO_END};
+// const uint8_t combo_mods = get_mods();
+// const uint8_t combo_oneshot_mods = get_oneshot_mods();
+
+combo_t key_combos[] = {
+  [EM_EMAIL] = COMBO_ACTION(email_combo),
+  [EM_WORK_EMAIL] = COMBO_ACTION(email_work_combo),
+  [HTML_P] = COMBO_ACTION(html_p_combo),
+  [HTML_TITLE] = COMBO_ACTION(html_title_combo),
+  [HTML_DIV] = COMBO_ACTION(html_div_combo),
+  [HTML_HTML] = COMBO_ACTION(html_html_combo),
+  [HTML_HEAD] = COMBO_ACTION(html_head_combo),
+  [HTML_BODY] = COMBO_ACTION(html_body_combo),
+  [HTML_FOOTER] = COMBO_ACTION(html_footer_combo),
+  [HTML_A_HREF] = COMBO_ACTION(html_a_href_combo),
+  [HTML_IMG] = COMBO_ACTION(html_img_combo),
+  [CSS_STYLE] = COMBO_ACTION(css_style_combo),
+  [HTML_GENERIC_TAG] = COMBO_ACTION(html_generic_tag_combo),
+  [CTLRGHT] = COMBO_ACTION(ctrrght_combo),
+  [CTLLEFT] = COMBO_ACTION(ctrleft_combo),
+};
+/* COMBO_ACTION(x) is same as COMBO(x, KC_NO) */
+
+void process_combo_event(uint16_t combo_index, bool pressed) {
+  switch(combo_index) {
+    case EM_EMAIL:
+      if (pressed) {
+        SEND_STRING("aricbouwers@outlook.com");
+      }
+      break;
+    case EM_WORK_EMAIL:
+      if (pressed) {
+        SEND_STRING("acrossonbouwers@rjc.ca");
+      }
+      break;
+    case HTML_DIV:
+      if (pressed) {
+        SEND_STRING("<div></div>");
+        for (int i = 0; i < 6; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_P:
+      if (pressed) {
+        SEND_STRING("<p></p>");
+        for (int i = 0; i < 4; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_TITLE:
+      if (pressed) {
+        SEND_STRING("<title></title>");
+        for (int i = 0; i < 8; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+      case CSS_STYLE:
+      if (pressed) {
+        SEND_STRING("<style></style>");
+         for (int i = 0; i < 8; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_HTML:
+      if (pressed) {
+        SEND_STRING("<html lang=\"en\"></html>");
+        for (int i = 0; i < 7; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_HEAD:
+      if (pressed) {
+        SEND_STRING("<head></head>");
+        for (int i = 0; i < 7; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_BODY:
+      if (pressed) {
+        SEND_STRING("<body></body>");
+        for (int i = 0; i < 7; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_FOOTER:
+      if (pressed) {
+        SEND_STRING("<footer></footer>");
+        for (int i = 0; i < 9; i++) {
+          tap_code16(KC_LEFT);
+        }
+      }
+      break;
+    case HTML_A_HREF:
+      if (pressed) {
+        SEND_STRING("<a href=\"link_goes_here\">name_of_link_goes_here</a>");
+        tap_code16(KC_HOME);
+        for (int i = 0; i < 10; i++) {
+          tap_code16(KC_RGHT);
+        }
+      }
+      break;
+    case HTML_IMG:
+      if (pressed) {
+        SEND_STRING("<img src=\"image_source_or_link_goes_here\" alt=\"name_if_cant_load\" width=\"num_pixels\" height=\"num_pixels\">");
+        tap_code16(KC_HOME);
+        for (int i = 0; i < 11; i++) {
+          tap_code16(KC_RGHT);
+        }
+      }
+      break;
+    case HTML_GENERIC_TAG:
+      if (pressed) {
+        SEND_STRING("<TAG></TAG>");
+        tap_code16(KC_ESC);
+        for (int i = 0; i < 9; i++) {
+          tap_code16(KC_LEFT);
+        }
+        tap_code16(LCTL(KC_D));
+        tap_code16(LCTL(KC_D));
+        tap_code16(KC_BSPC);
+      }
+      break;
+    case CTLLEFT:
+      if (pressed) {
+        tap_code16(C(KC_LEFT));
+      }
+      break;
+    case CTLRGHT:
+      if (pressed) {
+        tap_code16(C(KC_RGHT));
+      }
+      break;
+  }
+}
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ariccb/readme.md b/keyboards/planck/keymaps/ariccb/readme.md
new file mode 100644
index 0000000000..500373ea1a
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/readme.md
@@ -0,0 +1,78 @@
+```
+QWERTY LAYER
+ * ,------------------------------------------------------------------------.
+ * |FN,Esc|  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  |Bsp  |
+ * |------------------------------------------------------------------------|
+  |CSW,Tab|  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |Ctl,'|
+ * |------------------------------------------------------------------------|
+ * |Shift |Win,z|  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |Sft,\|
+ * |------------------------------------------------------------------------|
+ * |      |     |     |Ctl,Ent|LOWER|  Space  |RAISE|Alt,Play|  |     |     |
+ * `------------------------------------------------------------------------'
+
+COLEMAK_VCP(default) LAYER
+ * ,------------------------------------------------------------------------.
+ * |FN,ESC|  q  |  w  |  f  |  d  |  b  |  j  |  l  |  u  |  y  |  ;  | Bsp |
+ * |------------------------------------------------------------------------|
+  |CSW,Tab|  a  |  r  |  s  |  t  |  g  |  m  |  n  |  e  |  i  |  o  |Ctl,'|
+ * |------------------------------------------------------------------------|
+ * |Shift |Win,z|  x  |  v  |  c  |  p  |  k  |  h  |  ,  |  .  |  /  |Sft,\|
+ * |------------------------------------------------------------------------|
+ * |      |     |   |Ctl,Ent|LWR,_|   Space   |RAISE|Alt,Play|  |     |     |
+ * `------------------------------------------------------------------------'
+
+LOWER LAYER
+ * ,-----------------------------------------------------------------------.
+ * |  `  |  !  |  #  |  $  |  <  |  >  |  :  |  7  |  8  |  9  |  =  | Bsp |
+ * |-----------------------------------------------------------------------|
+ * |  '  |  _  |  ^  |  %  |  (  |  )  |  M  |  4  |  5  |  6  |  -  |  +  |
+ * |-----------------------------------------------------------------------|
+ * |Shift|  |  |  &  |  "  |  {  |  }  |  @  |  1  |  2  |  3  |  /  |  *  |
+ * |-----------------------------------------------------------------------|
+ * |     |     |     |     |     |         |MO(6),0|  .  |     |     |     |
+ * `-----------------------------------------------------------------------'
+
+ RAISED LAYER
+ * ,-----------------------------------------------------------------------------.
+ * |  ~  |  !  |     |     |      |      |       |  Cut  | Undo| Redo|P2TXT| Bsp |
+ * |-----------------------------------------------------------------------------|
+ * |     |Menu |     |     |      |      | ARROW |SELWORD|Copy|Paste|WinPst|  "  |
+ * |-----------------------------------------------------------------------------|
+ * |     |Vol+ |Vol- | Mute|      |      | Braces|Braces2|  <  |  >  |  ?  |  !  |
+ * |-----------------------------------------------------------------------------|
+ * |     |     |     |     |Adjust|              |       |     |     |     |     |
+ * `-----------------------------------------------------------------------------'
+
+ FN LAYER
+ * ,----------------------------------------------------------------------------.
+ * | |Ctl,F9 |Sft,F10|Alt,F11| F12 |MyComp|Calc  |home |  up  | end |PrtScr| Del |
+ * |-----------------------------------------------------------------------------|
+ * |    | F5 |   F6  |   F7  | F8  |DeskL |DeskR |left | down |right|ScrLck| CAPS|
+ * |-----------------------------------------------------------------------------|
+ * |    | F1 |   F2  |   F3  | F4  |ALT_TAB| MicM|pgup |LCA_dn| pgdn|Pse/Brk| Ins|
+ * |-----------------------------------------------------------------------------|
+ * |    |    |       |       |     |             |     |Alt,MNext|  |      |     |
+ * `-----------------------------------------------------------------------------'
+
+GAMING LAYER
+ * ,-----------------------------------------------------------------------.
+ * |ESC,`|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |EXIT GAMING|
+ * |-----------------------------------------------------------------------|
+ * | TAB |  Q  |  W  |  E  |  R  |  T  |  I  |  4  |  5  |  6  |  -  |  +  |
+ * |-----------------------------------------------------------------------|
+ * |Shift|  A  |  S  |  D  |  F  |  G  |  K  |  1  |  2  |  3  |  /  |  *  |
+ * |-----------------------------------------------------------------------|
+ * |     |     |     |  Ctl | Alt |   SPACE   |  0  |  .  |     |     |    |
+ * `-----------------------------------------------------------------------'
+
+ ADJUST LAYER
+ * ,-----------------------------------------------------------------------------.
+ * |RGBtog|Ms3 | Ms2 |MsUp | Ms1  |  Hue+|  Hue- | Sat+| Sat- |Brt+ |Brt- | RESET|
+ * |-----------------------------------------------------------------------------|
+ * |RGBMod| MWL | MsL |MDn  |MsR  |GAMING|       |AU_ON|AU_OFF|MU_ON|MU_OF| DEBUG|
+ * |-----------------------------------------------------------------------------|
+ * |     |MWLft|MWUp |NWDn |NWRght|QWERTY|CMK_VCP|MI_ON|MI_OF |     |     |MU_Mod|
+ * |-----------------------------------------------------------------------------|
+ * |     |     |     |SLEEP|      |              |     |      |     |     |      |
+ * `-----------------------------------------------------------------------------'
+ ```
\ No newline at end of file
diff --git a/keyboards/planck/keymaps/ariccb/rules.mk b/keyboards/planck/keymaps/ariccb/rules.mk
new file mode 100644
index 0000000000..cc92ab40f3
--- /dev/null
+++ b/keyboards/planck/keymaps/ariccb/rules.mk
@@ -0,0 +1,10 @@
+BOOTMAGIC_ENABLE = no
+CONSOLE_ENABLE = no
+BACKLIGHT_ENABLE = yes
+MIDI_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+DIP_SWITCH_ENABLE = no
+COMBO_ENABLE = yes
+
+SRC += features/select_word.c
+SRC += features/caps_word.c

From ae041078e813c5ffac82b697f6303b391c075166 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 9 Feb 2022 17:14:32 -0800
Subject: [PATCH 583/867] CMM.Studio Fuji65: Configurator Data Patch (#16293)

* info.json: correct layout data

* info.json: correct maintainer field
---
 keyboards/cmm_studio/fuji65/info.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json
index 9311f25453..6f54b2d84b 100644
--- a/keyboards/cmm_studio/fuji65/info.json
+++ b/keyboards/cmm_studio/fuji65/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "cmm.studio fuji65",
     "url": "",
-    "maintainer": "qmk",
+    "maintainer": "CMMS-Freather",
     "layouts": {
         "LAYOUT": {
             "layout": [
@@ -20,7 +20,7 @@
                 { "label": "K0C (B5,D2)", "x": 12, "y": 0 },
                 { "label": "K0D (B5,D1)", "x": 13, "y": 0 },
                 { "label": "K0E (B5,D0)", "x": 14, "y": 0 },
-                { "label": "K10 (B4,F7)", "x": 0, "y": 1 },
+                { "label": "K10 (B4,F7)", "x": 0, "y": 1.5 },
                 { "label": "K11 (B4,F6)", "x": 1.5, "y": 1 },
                 { "label": "K12 (B4,F5)", "x": 2.5, "y": 1 },
                 { "label": "K13 (B4,F4)", "x": 3.5, "y": 1 },

From 628166a3a965eb6d721287b884d582dffda100f0 Mon Sep 17 00:00:00 2001
From: Sergi Meseguer <zigotica@gmail.com>
Date: Thu, 10 Feb 2022 02:21:12 +0100
Subject: [PATCH 584/867] [Keymap] zigotica layout tweaks (#16291)

---
 users/zigotica/rows.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/users/zigotica/rows.h b/users/zigotica/rows.h
index ef9487ace8..18f08ccb0b 100644
--- a/users/zigotica/rows.h
+++ b/users/zigotica/rows.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *   ,---------------------------------------.         ,---------------------------------------.
  *   |       |       |       |       |       |         |       |       |       |       |       |
- *   |  ` ~  |   W   |   D   |   P   |   F   |         |   K   |   Y   |   U   |   Q   |  ' "  |
+ *   |  ` ~  |   W   |   D   |   P   |   F   |         |   Q   |   L   |   U   |   Y   |  ' "  |
  *   |       |       |       |       |       |         |       |       |       |       |       |
  *   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------|
  *   |       |       |       |       |       |         |       |       |       |       |       |
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *   |  alt  | ctrl  | shft  | meta  |       |         |       |  meta |  shft | ctrl  |  alt  |
  *   |-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------|
  *   |       |       |       |       |       |         |       |       |       |       |       |
- *   |   B   |   X   |   C   |   V   |  [ {  |         |  , <  |   L   |   Z   |   J   |   . > |
+ *   |   B   |   X   |   C   |   V   |  [ {  |         |  , <  |   K   |   Z   |   J   |   . > |
  *   |       |       |       |       | TD ]} |         |  TD ; |       |       |       |  TD : |
  *   `-------+-------+-------+-------+-------|         |-------+-------+-------+-------+-------.
  *                           |       |       |         |       |       |
@@ -45,9 +45,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define _STENAI_L3      KC_B,             KC_X,            KC_C,          KC_V,             ZK_BRC
 #define _STENAI_LT      LT(_NUM, KC_TAB), LT(_NAV, KC_SPC)
 
-#define _STENAI_R1      KC_K,             KC_Y,            KC_U,          KC_Q,             KC_QUOT
+#define _STENAI_R1      KC_Q,             KC_L,            KC_U,          KC_Y,             KC_QUOT
 #define _STENAI_R2      KC_M,             RGUI_T(KC_N),    RSFT_T(KC_A),  RCTL_T(KC_I),     RALT_T(KC_O)
-#define _STENAI_R3      ZK_SEMI,          KC_L,            KC_Z,          KC_J,             ZK_COLON
+#define _STENAI_R3      ZK_SEMI,          KC_K,            KC_Z,          KC_J,             ZK_COLON
 #define _STENAI_RT      LT(_SYM, KC_E),   LT(_FN, KC_ENT)
 
 

From 5475553dd80152a08cfc7f07ccaf3cbd6a4cbed5 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 9 Feb 2022 17:31:07 -0800
Subject: [PATCH 585/867] Demiurge: correct Configurator Layout data (#16294)

* info.json: apply friendly formatting

* info.json: correct layout data
---
 keyboards/demiurge/info.json | 87 +++++++++++++++++++++++++++++++++---
 1 file changed, 82 insertions(+), 5 deletions(-)

diff --git a/keyboards/demiurge/info.json b/keyboards/demiurge/info.json
index 639f37a888..427d7ce278 100644
--- a/keyboards/demiurge/info.json
+++ b/keyboards/demiurge/info.json
@@ -1,10 +1,87 @@
 {
-    "keyboard_name": "Demiurge", 
-    "url": "", 
-    "maintainer": "ojthetiny", 
+    "keyboard_name": "Demiurge",
+    "url": "",
+    "maintainer": "ojthetiny",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"!", "x":3.5, "y":0}, {"label":"@", "x":4.5, "y":0}, {"label":"#", "x":5.5, "y":0}, {"label":"$", "x":6.5, "y":0}, {"label":"%", "x":7.5, "y":0}, {"label":"^", "x":8.5, "y":0}, {"label":"&", "x":9.5, "y":0}, {"label":"*", "x":10.5, "y":0}, {"label":"(", "x":11.5, "y":0}, {"label":")", "x":12.5, "y":0}, {"label":"_", "x":13.5, "y":0}, {"label":"+", "x":14.5, "y":0}, {"label":"|", "x":15.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0, "w":2}, {"label":"Del", "x":16.5, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"Backspace", "x":16, "y":1, "w":1.5}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":9.25, "y":2}, {"label":"J", "x":10.25, "y":2}, {"label":"K", "x":11.25, "y":2}, {"label":"L", "x":12.25, "y":2}, {"label":":", "x":13.25, "y":2}, {"label":"\"", "x":14.25, "y":2}, {"label":"Enter", "x":15.25, "y":2, "w":2.25}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.5, "y":3, "w":2.25}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":9.75, "y":3}, {"label":"M", "x":10.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":">", "x":12.75, "y":3}, {"label":"?", "x":13.75, "y":3}, {"label":"Shift", "x":14.75, "y":3, "w":1.75}, {"label":"Shift", "x":14.75, "y":3, "w":2.75}, {"label":"Fn", "x":16.5, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.5, "y":4, "w":1.5}, {"label":"Alt", "x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":7}, {"label":"Alt", "x":13.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":16, "y":4, "w":1.5}]
+            "layout": [
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"Esc", "x":2.5, "y":0},
+                {"label":"1!", "x":3.5, "y":0},
+                {"label":"2@", "x":4.5, "y":0},
+                {"label":"3#", "x":5.5, "y":0},
+                {"label":"4$", "x":6.5, "y":0},
+                {"label":"5%", "x":7.5, "y":0},
+                {"label":"6^", "x":8.5, "y":0},
+                {"label":"7&", "x":9.5, "y":0},
+                {"label":"8*", "x":10.5, "y":0},
+                {"label":"9(", "x":11.5, "y":0},
+                {"label":"0)", "x":12.5, "y":0},
+                {"label":"-_", "x":13.5, "y":0},
+                {"label":"=+", "x":14.5, "y":0},
+                {"label":"Backspace", "x":15.5, "y":0},
+                {"label":"Del", "x":16.5, "y":0},
+
+                {"label":"F3", "x":0, "y":1},
+                {"label":"F4", "x":1, "y":1},
+                {"label":"Tab", "x":2.5, "y":1, "w":1.5},
+                {"label":"Q", "x":4, "y":1},
+                {"label":"W", "x":5, "y":1},
+                {"label":"E", "x":6, "y":1},
+                {"label":"R", "x":7, "y":1},
+                {"label":"T", "x":8, "y":1},
+                {"label":"Y", "x":9, "y":1},
+                {"label":"U", "x":10, "y":1},
+                {"label":"I", "x":11, "y":1},
+                {"label":"O", "x":12, "y":1},
+                {"label":"P", "x":13, "y":1},
+                {"label":"[{", "x":14, "y":1},
+                {"label":"]}", "x":15, "y":1},
+                {"label":"\\|", "x":16, "y":1, "w":1.5},
+
+                {"label":"F5", "x":0, "y":2},
+                {"label":"F6", "x":1, "y":2},
+                {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75},
+                {"label":"A", "x":4.25, "y":2},
+                {"label":"S", "x":5.25, "y":2},
+                {"label":"D", "x":6.25, "y":2},
+                {"label":"F", "x":7.25, "y":2},
+                {"label":"G", "x":8.25, "y":2},
+                {"label":"H", "x":9.25, "y":2},
+                {"label":"J", "x":10.25, "y":2},
+                {"label":"K", "x":11.25, "y":2},
+                {"label":"L", "x":12.25, "y":2},
+                {"label":";:", "x":13.25, "y":2},
+                {"label":"'\"", "x":14.25, "y":2},
+                {"label":"Enter", "x":15.25, "y":2, "w":2.25},
+
+                {"label":"F7", "x":0, "y":3},
+                {"label":"F8", "x":1, "y":3},
+                {"label":"Shift", "x":2.5, "y":3, "w":2.25},
+                {"label":"Z", "x":4.75, "y":3},
+                {"label":"X", "x":5.75, "y":3},
+                {"label":"C", "x":6.75, "y":3},
+                {"label":"V", "x":7.75, "y":3},
+                {"label":"B", "x":8.75, "y":3},
+                {"label":"N", "x":9.75, "y":3},
+                {"label":"M", "x":10.75, "y":3},
+                {"label":",<", "x":11.75, "y":3},
+                {"label":".>", "x":12.75, "y":3},
+                {"label":"/?", "x":13.75, "y":3},
+                {"label":"Shift", "x":14.75, "y":3, "w":1.75},
+                {"label":"Fn", "x":16.5, "y":3},
+
+                {"label":"F9", "x":0, "y":4},
+                {"label":"F10", "x":1, "y":4},
+                {"label":"Ctrl", "x":2.5, "y":4, "w":1.5},
+                {"label":"GUI", "x":4, "y":4},
+                {"label":"Alt", "x":5, "y":4, "w":1.5},
+                {"label":"Space", "x":6.5, "y":4, "w":7},
+                {"label":"Alt", "x":13.5, "y":4, "w":1.5},
+                {"label":"GUI", "x":15, "y":4},
+                {"label":"Ctrl", "x":16, "y":4, "w":1.5}
+            ]
         }
     }
-}
\ No newline at end of file
+}

From 66f61ae4cbfca25ed22a8d332c9fb20f1e3e0bfb Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 9 Feb 2022 19:29:25 -0800
Subject: [PATCH 586/867] CMM.Studio Fuji65: correct layout data for real this
 time (#16295)

Because I apparently can't tell the difference between coordinates and dimensions.
---
 keyboards/cmm_studio/fuji65/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json
index 6f54b2d84b..4d5080a831 100644
--- a/keyboards/cmm_studio/fuji65/info.json
+++ b/keyboards/cmm_studio/fuji65/info.json
@@ -20,7 +20,7 @@
                 { "label": "K0C (B5,D2)", "x": 12, "y": 0 },
                 { "label": "K0D (B5,D1)", "x": 13, "y": 0 },
                 { "label": "K0E (B5,D0)", "x": 14, "y": 0 },
-                { "label": "K10 (B4,F7)", "x": 0, "y": 1.5 },
+                { "label": "K10 (B4,F7)", "x": 0, "y": 1, "w": 1.5 },
                 { "label": "K11 (B4,F6)", "x": 1.5, "y": 1 },
                 { "label": "K12 (B4,F5)", "x": 2.5, "y": 1 },
                 { "label": "K13 (B4,F4)", "x": 3.5, "y": 1 },

From c092d716c50153a1b430e4096ef9fc9a7d35c545 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 9 Feb 2022 21:22:47 -0800
Subject: [PATCH 587/867] gl516/j73gl: fix Configurator key sequence (#16298)

---
 keyboards/gl516/j73gl/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json
index fc79f923a5..32b771c983 100644
--- a/keyboards/gl516/j73gl/info.json
+++ b/keyboards/gl516/j73gl/info.json
@@ -34,7 +34,6 @@
                 {"label":"6,3", "x":10.5, "y":1},
                 {"label":"6,4", "x":11.5, "y":1},
                 {"label":"6,5", "x":12.5, "y":1},
-                {"label":"7,6", "x":13.75, "y":1, "w":1.25, "h":2},
                 {"label":"6,7", "x":15, "y":1},
                 {"label":"2,0", "x":0, "y":2, "w":1.75},
                 {"label":"2,1", "x":1.75, "y":2},
@@ -49,6 +48,7 @@
                 {"label":"7,3", "x":10.75, "y":2},
                 {"label":"7,4", "x":11.75, "y":2},
                 {"label":"7,5", "x":12.75, "y":2},
+                {"label":"7,6", "x":13.75, "y":1, "w":1.25, "h":2},
                 {"label":"7,7", "x":15, "y":2},
                 {"label":"3,0", "x":0, "y":3, "w":2.25},
                 {"label":"3,1", "x":2.25, "y":3},

From cb9142224b4c5c6bee782cad92f0689d845214f6 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Wed, 9 Feb 2022 21:24:10 -0800
Subject: [PATCH 588/867] Eye Oh Designs SPRH: fix Configurator data (#16296)

---
 keyboards/eyeohdesigns/sprh/info.json | 594 +++++++++++++++++++++++++-
 1 file changed, 581 insertions(+), 13 deletions(-)

diff --git a/keyboards/eyeohdesigns/sprh/info.json b/keyboards/eyeohdesigns/sprh/info.json
index 976e64755e..7e79dd821e 100644
--- a/keyboards/eyeohdesigns/sprh/info.json
+++ b/keyboards/eyeohdesigns/sprh/info.json
@@ -1,31 +1,599 @@
 {
-    "keyboard_name": "sprh", 
-    "url": "https://github.com/joedinkle/eyeohdesigns/tree/main/keyboards/sprh", 
-    "maintainer": "eye oh designs", 
+    "keyboard_name": "sprh",
+    "url": "https://github.com/joedinkle/eyeohdesigns/tree/main/keyboards/sprh",
+    "maintainer": "joedinkle",
     "layouts": {
-        "LAYOUT_default": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+        "LAYOUT_ac5": {
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"Backspace", "x":14.5, "y":0, "w":2},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":2.75},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":6.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_acs": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"Backspace", "x":14.5, "y":0, "w":2},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":2.75},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":2.75},
+                {"x":7.37, "y":4, "w":2.25},
+                {"x":9.62, "y":4, "w":1.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_ad5": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"Backspace", "x":14.5, "y":0, "w":2},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":1.75},
+                {"label":"Fn", "x":14.25, "y":3},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":6.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_ads": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"Backspace", "x":14.5, "y":0, "w":2},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":1.75},
+                {"label":"Fn", "x":14.25, "y":3},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":2.75},
+                {"x":7.37, "y":4, "w":2.25},
+                {"x":9.62, "y":4, "w":1.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_bc5": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"\u2190", "x":14.5, "y":0},
+                {"label":"Del", "x":15.5, "y":0},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":2.75},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":6.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_bcs": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.75}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"\u2190", "x":14.5, "y":0},
+                {"label":"Del", "x":15.5, "y":0},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":2.75},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":2.75},
+                {"x":7.37, "y":4, "w":2.25},
+                {"x":9.62, "y":4, "w":1.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_bd5": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":6.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"\u2190", "x":14.5, "y":0},
+                {"label":"Del", "x":15.5, "y":0},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":1.75},
+                {"label":"Fn", "x":14.25, "y":3},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":6.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         },
         "LAYOUT_bds": {
-            "layout": [{"label":"Mute", "x":0.5, "y":0}, {"label":"Esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"\u2190", "x":14.5, "y":0}, {"label":"Del", "x":15.5, "y":0}, {"label":"Tab", "x":1, "y":1, "w":1.5}, {"label":"Q", "x":2.5, "y":1}, {"label":"W", "x":3.5, "y":1}, {"label":"E", "x":4.5, "y":1}, {"label":"R", "x":5.5, "y":1}, {"label":"T", "x":6.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"[", "x":12.5, "y":1}, {"label":"]", "x":13.5, "y":1}, {"label":"\\", "x":14.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"H", "x":7.5, "y":2}, {"label":"J", "x":8.5, "y":2}, {"label":"K", "x":9.5, "y":2}, {"label":"L", "x":10.5, "y":2}, {"label":";", "x":11.5, "y":2}, {"label":"'", "x":12.5, "y":2}, {"label":"Enter", "x":13.5, "y":2, "w":2.25}, {"label":"Shift", "x":0.25, "y":3, "w":2.25}, {"label":"Z", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}, {"label":",", "x":9.5, "y":3}, {"label":".", "x":10.5, "y":3}, {"label":"/", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":1.75}, {"label":"Fn", "x":14.25, "y":3}, {"label":"\u2191", "x":15.25, "y":3}, {"label":"Super", "x":0, "y":4, "w":1.25}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.37, "y":4, "w":1.25}, {"x":4.62, "y":4, "w":2.75}, {"x":7.37, "y":4, "w":2.25}, {"x":9.62, "y":4, "w":1.25}, {"label":"Alt", "x":10.87, "y":4, "w":1.25}, {"label":"Function", "x":12.12, "y":4, "w":1.25}, {"label":"\u2190", "x":14.25, "y":4}, {"label":"\u2193", "x":15.25, "y":4}, {"label":"\u2192", "x":16.25, "y":4}]
+            "layout": [
+                {"label":"Mute", "x":0.5, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"\u2190", "x":14.5, "y":0},
+                {"label":"Del", "x":15.5, "y":0},
+
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"[", "x":12.5, "y":1},
+                {"label":"]", "x":13.5, "y":1},
+                {"label":"\\", "x":14.5, "y":1, "w":1.5},
+
+                {"label":"Caps Lock", "x":0.75, "y":2, "w":1.75},
+                {"label":"A", "x":2.5, "y":2},
+                {"label":"S", "x":3.5, "y":2},
+                {"label":"D", "x":4.5, "y":2},
+                {"label":"F", "x":5.5, "y":2},
+                {"label":"G", "x":6.5, "y":2},
+                {"label":"H", "x":7.5, "y":2},
+                {"label":"J", "x":8.5, "y":2},
+                {"label":"K", "x":9.5, "y":2},
+                {"label":"L", "x":10.5, "y":2},
+                {"label":";", "x":11.5, "y":2},
+                {"label":"'", "x":12.5, "y":2},
+                {"label":"Enter", "x":13.5, "y":2, "w":2.25},
+
+                {"label":"Shift", "x":0.25, "y":3, "w":2.25},
+                {"label":"Z", "x":2.5, "y":3},
+                {"label":"X", "x":3.5, "y":3},
+                {"label":"C", "x":4.5, "y":3},
+                {"label":"V", "x":5.5, "y":3},
+                {"label":"B", "x":6.5, "y":3},
+                {"label":"N", "x":7.5, "y":3},
+                {"label":"M", "x":8.5, "y":3},
+                {"label":",", "x":9.5, "y":3},
+                {"label":".", "x":10.5, "y":3},
+                {"label":"/", "x":11.5, "y":3},
+                {"label":"Shift", "x":12.5, "y":3, "w":1.75},
+                {"label":"Fn", "x":14.25, "y":3},
+                {"label":"\u2191", "x":15.25, "y":3},
+
+                {"label":"Super", "x":0, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.37, "y":4, "w":1.25},
+                {"x":4.62, "y":4, "w":2.75},
+                {"x":7.37, "y":4, "w":2.25},
+                {"x":9.62, "y":4, "w":1.25},
+                {"label":"Alt", "x":10.87, "y":4, "w":1.25},
+                {"label":"Function", "x":12.12, "y":4, "w":1.25},
+                {"label":"\u2190", "x":14.25, "y":4},
+                {"label":"\u2193", "x":15.25, "y":4},
+                {"label":"\u2192", "x":16.25, "y":4}
+            ]
         }
     }
-}
\ No newline at end of file
+}

From 3e5cb1da0fc14e50283b113c521502178159c4d9 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Thu, 10 Feb 2022 15:12:42 +0800
Subject: [PATCH 589/867] Improve description of LED state data sync option
 (#16302)

---
 docs/feature_led_indicators.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_led_indicators.md b/docs/feature_led_indicators.md
index 59a9f7accc..95d1cd4752 100644
--- a/docs/feature_led_indicators.md
+++ b/docs/feature_led_indicators.md
@@ -1,6 +1,6 @@
 # LED Indicators
 
-?> This feature requires additional configuration to work on both halves of a split keyboard see [Data sync options](feature_split_keyboard.md#data-sync-options)
+?> LED indicators on split keyboards will require state information synced to the slave half (e.g. `#define SPLIT_LED_STATE_ENABLE`). See [data sync options](feature_split_keyboard.md#data-sync-options) for more details.
 
 QMK provides methods to read 5 of the LEDs defined in the HID spec:
 

From 3e52e60595d2dde35d0322cf4bdf7e1705b7afb5 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 10 Feb 2022 18:20:37 +1100
Subject: [PATCH 590/867] Fix slashes in build_full_test.mk (#16300)

---
 build_full_test.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_full_test.mk b/build_full_test.mk
index 4cd1ac61b5..4e4b4e4bfd 100644
--- a/build_full_test.mk
+++ b/build_full_test.mk
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 $(TEST)_INC := \
-	tests\test_common\common_config.h
+	tests/test_common/common_config.h
 
 $(TEST)_SRC := \
 	$(TMK_COMMON_SRC) \
@@ -33,4 +33,4 @@ $(TEST)_DEFS := $(TMK_COMMON_DEFS) $(OPT_DEFS)
 
 $(TEST)_CONFIG := $(TEST_PATH)/config.h
 
-VPATH += $(TOP_DIR)/tests/test_common
\ No newline at end of file
+VPATH += $(TOP_DIR)/tests/test_common

From f66293903783a4a20e7af30b3664f2a7d04eb3c2 Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Fri, 11 Feb 2022 00:16:01 +0800
Subject: [PATCH 591/867] Sentence structure update (#16306)

---
 docs/feature_encoders.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_encoders.md b/docs/feature_encoders.md
index 37d5a75311..6a1a3750a6 100644
--- a/docs/feature_encoders.md
+++ b/docs/feature_encoders.md
@@ -85,7 +85,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 }
 ```
 
-!> If you return `true`, this will allow the keyboard level code to run, as well.  Returning `false` will override the keyboard level code.  Depending on how the keyboard level function is set up. 
+!> If you return `true`, it will allow the keyboard level code to run as well. Returning `false` will override the keyboard level code, depending on how the keyboard function is set up. 
 
 Layer conditions can also be used with the callback function like the following:
 

From da4eda8930aed4b151e4f49eb6ece805cf01075a Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 10 Feb 2022 08:17:12 -0800
Subject: [PATCH 592/867] info.json: fix key sequence (#16297)

---
 keyboards/gl516/a52gl/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json
index 406c7096ae..b2332c0eda 100644
--- a/keyboards/gl516/a52gl/info.json
+++ b/keyboards/gl516/a52gl/info.json
@@ -44,8 +44,8 @@
                 {"label":"6,2", "x":10.5, "y":2},
                 {"label":"6,3", "x":12, "y":2},
                 {"label":"6,4", "x":13, "y":2},
-                {"label":"6,6", "x":15.5, "y":2},
                 {"label":"6,5", "x":14.25, "y":2.25},
+                {"label":"6,6", "x":15.5, "y":2},
                 {"label":"3,0", "x":0, "y":3, "w":1.25},
                 {"label":"3,1", "x":1.25, "y":3, "w":1.25},
                 {"label":"3,2", "x":3.05, "y":3},

From 21522e09641f88e8754e292705320d53ee3b8fc8 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 10 Feb 2022 08:17:47 -0800
Subject: [PATCH 593/867] info.json: fix QMK Configurator rendering (#16299)

---
 keyboards/gl516/n51gl/info.json | 107 ++++++++++++++++----------------
 1 file changed, 55 insertions(+), 52 deletions(-)

diff --git a/keyboards/gl516/n51gl/info.json b/keyboards/gl516/n51gl/info.json
index eb8d639825..6c94d32e30 100644
--- a/keyboards/gl516/n51gl/info.json
+++ b/keyboards/gl516/n51gl/info.json
@@ -5,58 +5,61 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"0,0", "x":0, "y":0},
-                {"label":"0,1", "x":1.25, "y":0},
-                {"label":"4,0", "x":8.25, "y":0},
-                {"label":"4,1", "x":9.25, "y":0},
-                {"label":"4,2", "x":10.25, "y":0},
-                {"label":"4,3", "x":11.25, "y":0},
-                {"label":"4,4", "x":12.25, "y":0},
-                {"label":"4,5", "x":13.25, "y":0},
-                {"label":"4,6", "x":14.25, "y":0},
-                {"label":"1,1", "x":0.25, "y":1, "w":1.75},
-                {"label":"1,2", "x":2, "y":1},
-                {"label":"5,0", "x":8.5, "y":1},
-                {"label":"5,1", "x":9.5, "y":1},
-                {"label":"5,2", "x":10.5, "y":1},
-                {"label":"5,3", "x":11.5, "y":1},
-                {"label":"5,4", "x":12.5, "y":1},
-                {"label":"5,5", "x":13.5, "y":1},
-                {"label":"5,6", "x":14.5, "y":1},
-                {"label":"2,1", "x":0, "y":2, "w":1.75},
-                {"label":"2,2", "x":1.75, "y":2},
-                {"label":"2,0", "x":7.25, "y":2},
-                {"label":"6,0", "x":8.75, "y":2},
-                {"label":"6,1", "x":9.75, "y":2},
-                {"label":"6,2", "x":10.75, "y":2},
-                {"label":"6,3", "x":11.75, "y":2},
-                {"label":"6,4", "x":12.75, "y":2},
-                {"label":"6,5", "x":13.75, "y":2},
-                {"label":"6,6", "x":14.75, "y":2},
-                {"label":"3,1", "x":0.25, "y":3, "w":1.25},
-                {"label":"3,2", "x":1.5, "y":3, "w":1.25},
-                {"label":"7,0", "x":8.5, "y":3},
-                {"label":"7,1", "x":9.5, "y":3, "w":1.25},
-                {"label":"7,2", "x":10.75, "y":3},
-                {"label":"7,4", "x":12.75, "y":3},
-                {"label":"7,5", "x":13.75, "y":3},
-                {"label":"7,6", "x":14.75, "y":3},
-                {"label":"0,2", "x":-0.75, "y":4},
-                {"label":"0,3", "x":0.25, "y":4},
-                {"label":"0,4", "x":1.25, "y":4},
-                {"label":"0,5", "x":2.25, "y":4},
-                {"label":"0,6", "x":3.25, "y":4},
-                {"label":"1,3", "x":0, "y":5},
-                {"label":"1,4", "x":1, "y":5},
-                {"label":"1,5", "x":2, "y":5},
-                {"label":"1,6", "x":3, "y":5},
-                {"label":"2,3", "x":-0.25, "y":6},
-                {"label":"2,4", "x":0.75, "y":6},
-                {"label":"2,5", "x":1.75, "y":6},
-                {"label":"2,6", "x":2.75, "y":6},
-                {"label":"3,4", "x":0.75, "y":7},
-                {"label":"3,5", "x":1.75, "y":7, "w":1.25},
-                {"label":"3,6", "x":3, "y":7}
+                {"label":"L00", "x":0.25, "y":0},
+                {"label":"L01", "x":1.25, "y":0},
+                {"label":"L02", "x":2.25, "y":0},
+                {"label":"L03", "x":3.25, "y":0},
+                {"label":"L04", "x":4.25, "y":0},
+                {"label":"L05", "x":5.25, "y":0},
+                {"label":"L06", "x":6.25, "y":0},
+                {"label":"R00", "x":9.25, "y":0},
+                {"label":"R01", "x":10.25, "y":0},
+                {"label":"R02", "x":11.25, "y":0},
+                {"label":"R03", "x":12.25, "y":0},
+                {"label":"R04", "x":13.25, "y":0},
+                {"label":"R05", "x":14.25, "y":0},
+                {"label":"R06", "x":15.25, "y":0},
+
+                {"label":"L11", "x":0.25, "y":1, "w":1.75},
+                {"label":"L12", "x":2, "y":1},
+                {"label":"L13", "x":3.25, "y":1},
+                {"label":"L14", "x":4.25, "y":1},
+                {"label":"L15", "x":5.25, "y":1},
+                {"label":"L16", "x":6.25, "y":1},
+                {"label":"R10", "x":9.25, "y":1},
+                {"label":"R11", "x":10.25, "y":1},
+                {"label":"R12", "x":11.25, "y":1},
+                {"label":"R13", "x":12.25, "y":1},
+                {"label":"R14", "x":13.5, "y":1},
+                {"label":"R15", "x":14.5, "y":1},
+                {"label":"R16", "x":15.5, "y":1},
+
+                {"label":"L21", "x":0, "y":2, "w":1.75},
+                {"label":"L22", "x":1.75, "y":2},
+                {"label":"L23", "x":3.25, "y":2},
+                {"label":"L24", "x":4.25, "y":2},
+                {"label":"L25", "x":5.25, "y":2},
+                {"label":"L26", "x":6.25, "y":2},
+                {"label":"L20", "x":7.75, "y":2},
+                {"label":"R20", "x":9.25, "y":2},
+                {"label":"R21", "x":10.25, "y":2},
+                {"label":"R22", "x":11.25, "y":2},
+                {"label":"R23", "x":12.25, "y":2},
+                {"label":"R24", "x":13.75, "y":2},
+                {"label":"R25", "x":14.75, "y":2},
+                {"label":"R26", "x":15.75, "y":2},
+
+                {"label":"L31", "x":0.25, "y":3, "w":1.25},
+                {"label":"L32", "x":1.5, "y":3, "w":1.25},
+                {"label":"L34", "x":4.125, "y":3, "w":1.25},
+                {"label":"L35", "x":5.375, "y":3, "w":1.25},
+                {"label":"L36", "x":6.625, "y":3},
+                {"label":"R30", "x":8.875, "y":3},
+                {"label":"R31", "x":9.875, "y":3, "w":1.25},
+                {"label":"R32", "x":11.125, "y":3, "w":1.25},
+                {"label":"R34", "x":13.75, "y":3},
+                {"label":"R35", "x":14.75, "y":3},
+                {"label":"R36", "x":15.75, "y":3}
             ]
         }
     }

From c9e19fe6fc56e4377f43d8f56fc49797b5f4b127 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 10 Feb 2022 08:19:27 -0800
Subject: [PATCH 594/867] KeebsForAll Freebird Numpad Pro: fix Configurator key
 positioning (#16303)

* info.json: apply friendly formatting

* info.json: fix key positioning

Fixes the second row being rendered on top of the first row.
---
 .../keebsforall/freebirdnp/pro/info.json      | 283 ++++--------------
 1 file changed, 55 insertions(+), 228 deletions(-)

diff --git a/keyboards/keebsforall/freebirdnp/pro/info.json b/keyboards/keebsforall/freebirdnp/pro/info.json
index 5aa40c4a6d..ed2a6e0b41 100644
--- a/keyboards/keebsforall/freebirdnp/pro/info.json
+++ b/keyboards/keebsforall/freebirdnp/pro/info.json
@@ -6,238 +6,65 @@
     "layouts": {
         "LAYOUT_numpad_6x4": {
             "layout": [
-                {
-                    "label": "F1",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "F2",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "label": "F3",
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "label": "MUTE",
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "label": "Num Lock",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "/",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "label": "*",
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "label": "-",
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "label": "7",
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "8",
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "label": "9",
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "label": "4",
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "5",
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "label": "6",
-                    "x": 2,
-                    "y": 3
-                },
-                {
-                    "label": "+",
-                    "x": 3,
-                    "y": 2,
-                    "h": 2
-                },
-                {
-                    "label": "1",
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "2",
-                    "x": 1,
-                    "y": 4
-                },
-                {
-                    "label": "3",
-                    "x": 2,
-                    "y": 4
-                },
-                {
-                    "label": "0",
-                    "x": 0,
-                    "y": 5,
-                    "w": 2
-                },
-                {
-                    "label": ".",
-                    "x": 2,
-                    "y": 5
-                },
-                {
-                    "label": "Enter",
-                    "x": 3,
-                    "y": 4,
-                    "h": 2
-                }
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"F3", "x":2, "y":0},
+                {"label":"MUTE", "x":3, "y":0},
+
+                {"label":"Num Lock", "x":0, "y":1},
+                {"label":"/", "x":1, "y":1},
+                {"label":"*", "x":2, "y":1},
+                {"label":"-", "x":3, "y":1},
+
+                {"label":"7", "x":0, "y":2},
+                {"label":"8", "x":1, "y":2},
+                {"label":"9", "x":2, "y":2},
+
+                {"label":"4", "x":0, "y":3},
+                {"label":"5", "x":1, "y":3},
+                {"label":"6", "x":2, "y":3},
+                {"label":"+", "x":3, "y":2, "h":2},
+
+                {"label":"1", "x":0, "y":4},
+                {"label":"2", "x":1, "y":4},
+                {"label":"3", "x":2, "y":4},
+
+                {"label":"0", "x":0, "y":5, "w":2},
+                {"label":".", "x":2, "y":5},
+                {"label":"Enter", "x":3, "y":4, "h":2}
             ]
         },
         "LAYOUT_ortho_6x4": {
             "layout": [
-                {
-                    "label": "F1",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "F2",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "label": "F3",
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "label": "MUTE",
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "label": "Num Lock",
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "/",
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "label": "*",
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "label": "-",
-                    "x": 3,
-                    "y": 1
-                },
-                {
-                    "label": "7",
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "8",
-                    "x": 1,
-                    "y": 2
-                },
-                {
-                    "label": "9",
-                    "x": 2,
-                    "y": 2
-                },
-                {
-                    "label": "+",
-                    "x": 3,
-                    "y": 2
-                },
-                {
-                    "label": "4",
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "5",
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "label": "6",
-                    "x": 2,
-                    "y": 3
-                },
-                {
-                    "label": "+",
-                    "x": 3,
-                    "y": 3
-                },
-                {
-                    "label": "1",
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "2",
-                    "x": 1,
-                    "y": 4
-                },
-                {
-                    "label": "3",
-                    "x": 2,
-                    "y": 4
-                },
-                {
-                    "label": "Enter",
-                    "x": 3,
-                    "y": 4
-                },
-                {
-                    "label": "0",
-                    "x": 0,
-                    "y": 5
-                },
-                {
-                    "label": "00",
-                    "x": 1,
-                    "y": 5
-                },
-                {
-                    "label": ".",
-                    "x": 2,
-                    "y": 5
-                },
-                {
-                    "label": "Enter",
-                    "x": 3,
-                    "y": 5
-                }
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"F3", "x":2, "y":0},
+                {"label":"MUTE", "x":3, "y":0},
+
+                {"label":"Num Lock", "x":0, "y":1},
+                {"label":"/", "x":1, "y":1},
+                {"label":"*", "x":2, "y":1},
+                {"label":"-", "x":3, "y":1},
+
+                {"label":"7", "x":0, "y":2},
+                {"label":"8", "x":1, "y":2},
+                {"label":"9", "x":2, "y":2},
+                {"label":"+", "x":3, "y":2},
+
+                {"label":"4", "x":0, "y":3},
+                {"label":"5", "x":1, "y":3},
+                {"label":"6", "x":2, "y":3},
+                {"label":"+", "x":3, "y":3},
+
+                {"label":"1", "x":0, "y":4},
+                {"label":"2", "x":1, "y":4},
+                {"label":"3", "x":2, "y":4},
+                {"label":"Enter", "x":3, "y":4},
+
+                {"label":"0", "x":0, "y":5},
+                {"label":"00", "x":1, "y":5},
+                {"label":".", "x":2, "y":5},
+                {"label":"Enter", "x":3, "y":5}
             ]
         }
     }

From d25bce24cd37e214c10595031d8da5385d0dc899 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 10 Feb 2022 08:21:38 -0800
Subject: [PATCH 595/867] Keyprez Unicorn: fix QMK Configurator key sequence
 (#16305)

* info.json: apply friendly formatting

* info.json: fix key sequence
---
 keyboards/keyprez/unicorn/info.json | 83 ++++++++++++++++++++++++++++-
 1 file changed, 82 insertions(+), 1 deletion(-)

diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/info.json
index 6fb2ea74eb..ff14396f2a 100644
--- a/keyboards/keyprez/unicorn/info.json
+++ b/keyboards/keyprez/unicorn/info.json
@@ -4,7 +4,88 @@
     "maintainer": "Keyprez",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"|", "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":8, "y":0}, {"label":"*", "x":9, "y":0}, {"label":"(", "x":10, "y":0}, {"label":")", "x":11, "y":0}, {"label":"_", "x":12, "y":0}, {"label":"+", "x":13, "y":0}, {"label":"Backspace", "x":14, "y":0, "w":2}, {"label":"Home", "x":16, "y":0}, {"label":"Rotary", "x":17, "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":7.5, "y":1}, {"label":"u", "x":8.5, "y":1}, {"label":"i", "x":9.5, "y":1}, {"label":"o", "x":10.5, "y":1}, {"label":"p", "x":11.5, "y":1}, {"label":"\u00e5", "x":12.5, "y":1}, {"label":"^", "x":13.5, "y":1}, {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2}, {"label":"End", "x":16, "y":1}, {"label":"Delete", "x":17, "y":1}, {"label":"Esc", "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":7.75, "y":2}, {"label":"j", "x":8.75, "y":2}, {"label":"k", "x":9.75, "y":2}, {"label":"l", "x":10.75, "y":2}, {"label":"\u00f8", "x":11.75, "y":2}, {"label":"\u00e6", "x":12.75, "y":2}, {"label":"'", "x":13.75, "y":2}, {"label":"PgUp", "x":16, "y":2}, {"label":"Insert", "x":17, "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":8.25, "y":3}, {"label":"m", "x":9.25, "y":3}, {"label":",", "x":10.25, "y":3}, {"label":".", "x":11.25, "y":3}, {"label":"-", "x":12.25, "y":3}, {"label":"Shift", "x":13.25, "y":3, "w":1.75}, {"label":"\u2191", "x":15, "y":3}, {"label":"PgDn", "x":16, "y":3}, {"label":"Copy", "x":17, "y":3}, {"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}, {"label":"space", "x":3.75, "y":4, "w":2.25}, {"label":"space", "x":6, "y":4, "w":1.25}, {"label":"space", "x":8.25, "y":4, "w":2.75}, {"label":"AltGr", "x":11, "y":4}, {"label":"Mod", "x":12, "y":4}, {"label":"Ctrl", "x":13, "y":4}, {"label":"\u2190", "x":14, "y":4}, {"label":"\u2193", "x":15, "y":4}, {"label":"\u2192", "x":16, "y":4}, {"label":"Paste", "x":17, "y":4}]
+            "layout": [
+                {"label":"|\u00a7", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2\"", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4\u00a4", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6&", "x":6, "y":0},
+                {"label":"7/", "x":8, "y":0},
+                {"label":"8(", "x":9, "y":0},
+                {"label":"9)", "x":10, "y":0},
+                {"label":"0=", "x":11, "y":0},
+                {"label":"+?", "x":12, "y":0},
+                {"label":"\\`", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0, "w":2},
+                {"label":"Home", "x":16, "y":0},
+                {"label":"Rotary", "x":17, "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":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"\u00c5", "x":12.5, "y":1},
+                {"label":"\u00a8\u005e", "x":13.5, "y":1},
+                {"label":"End", "x":16, "y":1},
+                {"label":"Delete", "x":17, "y":1},
+
+                {"label":"Esc", "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":7.75, "y":2},
+                {"label":"J", "x":8.75, "y":2},
+                {"label":"K", "x":9.75, "y":2},
+                {"label":"L", "x":10.75, "y":2},
+                {"label":"\u00d8", "x":11.75, "y":2},
+                {"label":"\u00c6", "x":12.75, "y":2},
+                {"label":"'*", "x":13.75, "y":2},
+                {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2},
+                {"label":"PgUp", "x":16, "y":2},
+                {"label":"Insert", "x":17, "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":8.25, "y":3},
+                {"label":"M", "x":9.25, "y":3},
+                {"label":",;", "x":10.25, "y":3},
+                {"label":".:", "x":11.25, "y":3},
+                {"label":"-_", "x":12.25, "y":3},
+                {"label":"Shift", "x":13.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":15, "y":3},
+                {"label":"PgDn", "x":16, "y":3},
+                {"label":"Copy", "x":17, "y":3},
+
+                {"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},
+                {"label":"Space", "x":3.75, "y":4, "w":2.25},
+                {"label":"Space", "x":6, "y":4, "w":1.25},
+                {"label":"Space", "x":8.25, "y":4, "w":2.75},
+                {"label":"AltGr", "x":11, "y":4},
+                {"label":"Mod", "x":12, "y":4},
+                {"label":"Ctrl", "x":13, "y":4},
+                {"label":"\u2190", "x":14, "y":4},
+                {"label":"\u2193", "x":15, "y":4},
+                {"label":"\u2192", "x":16, "y":4},
+                {"label":"Paste", "x":17, "y":4}
+            ]
         }
     }
 }

From 195242dc37f4a1429ee62b6ccd854c3720a3118f Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 10 Feb 2022 08:22:42 -0800
Subject: [PATCH 596/867] keyten kt60-M: rename LAYOUT to
 LAYOUT_60_tsangan_hhkb (#16307)

* rename LAYOUT to LAYOUT_60_tsangan_hhkb

* info.json: correct maintainer value

Field is meant to reference the maintainer's GitHub username.

* rules.mk: enable Community Layout support
---
 keyboards/keyten/kt60_m/info.json                | 7 +++++--
 keyboards/keyten/kt60_m/keymaps/default/keymap.c | 4 ++--
 keyboards/keyten/kt60_m/keymaps/via/keymap.c     | 8 ++++----
 keyboards/keyten/kt60_m/kt60_m.h                 | 4 ++--
 keyboards/keyten/kt60_m/rules.mk                 | 2 ++
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/keyboards/keyten/kt60_m/info.json b/keyboards/keyten/kt60_m/info.json
index 9f40a13b29..7aa30e6251 100644
--- a/keyboards/keyten/kt60_m/info.json
+++ b/keyboards/keyten/kt60_m/info.json
@@ -1,9 +1,12 @@
 {
     "keyboard_name": "kt60-M",
     "url": "",
-    "maintainer": "keyten",
+    "maintainer": "key10iq",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60_tsangan_hhkb"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_60_tsangan_hhkb": {
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},
diff --git a/keyboards/keyten/kt60_m/keymaps/default/keymap.c b/keyboards/keyten/kt60_m/keymaps/default/keymap.c
index f4343b2410..594dceb624 100644
--- a/keyboards/keyten/kt60_m/keymaps/default/keymap.c
+++ b/keyboards/keyten/kt60_m/keymaps/default/keymap.c
@@ -23,14 +23,14 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[_MAIN] = LAYOUT(
+	[_MAIN] = LAYOUT_60_tsangan_hhkb(
 		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, 
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC, 
 		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(1), 
 		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_RGUI, KC_RCTL),
 
-	[_FN] = LAYOUT(
+	[_FN] = LAYOUT_60_tsangan_hhkb(
 		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keyten/kt60_m/keymaps/via/keymap.c b/keyboards/keyten/kt60_m/keymaps/via/keymap.c
index 4e483027b2..3a9335f1d0 100644
--- a/keyboards/keyten/kt60_m/keymaps/via/keymap.c
+++ b/keyboards/keyten/kt60_m/keymaps/via/keymap.c
@@ -18,28 +18,28 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[0] = LAYOUT_60_tsangan_hhkb(
 		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, 
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
 		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC, 
 		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, MO(1), 
 		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_RGUI, KC_RCTL),
 
-	[1] = LAYOUT(
+	[1] = LAYOUT_60_tsangan_hhkb(
 		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
 		_______, _______, _______,                            _______,                            _______,          _______, _______),
 		
-	[2] = LAYOUT(
+	[2] = LAYOUT_60_tsangan_hhkb(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
 		_______, _______, _______,                            _______,                            _______,          _______, _______),
 		
-	[3] = LAYOUT(
+	[3] = LAYOUT_60_tsangan_hhkb(
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/keyten/kt60_m/kt60_m.h b/keyboards/keyten/kt60_m/kt60_m.h
index 7006099251..1298537543 100644
--- a/keyboards/keyten/kt60_m/kt60_m.h
+++ b/keyboards/keyten/kt60_m/kt60_m.h
@@ -20,7 +20,7 @@
 
 #define XXX KC_NO
 
-/* LAYOUT
+/* LAYOUT_60_tsangan_hhkb
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
  * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
@@ -33,7 +33,7 @@
  * │40   │41 │42   │46                         │4a   │4c │4d   │
  * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
  */
-#define LAYOUT( \
+#define LAYOUT_60_tsangan_hhkb( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
diff --git a/keyboards/keyten/kt60_m/rules.mk b/keyboards/keyten/kt60_m/rules.mk
index 6983d5c803..c9cf2aa9b0 100644
--- a/keyboards/keyten/kt60_m/rules.mk
+++ b/keyboards/keyten/kt60_m/rules.mk
@@ -17,3 +17,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes
+
+LAYOUTS = 60_tsangan_hhkb

From f7e7671f691cfd42f322198f04690727f6493d73 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 10 Feb 2022 17:45:51 +0000
Subject: [PATCH 597/867] Migrate more makefile utilities to builddefs
 sub-directory (#16002)

---
 Makefile                                           | 6 +++---
 build_full_test.mk => builddefs/build_full_test.mk | 0
 build_json.mk => builddefs/build_json.mk           | 0
 build_keyboard.mk => builddefs/build_keyboard.mk   | 8 ++++----
 build_layout.mk => builddefs/build_layout.mk       | 0
 build_test.mk => builddefs/build_test.mk           | 6 +++---
 common_features.mk => builddefs/common_features.mk | 0
 tmk_core/rules.mk => builddefs/common_rules.mk     | 0
 testlist.mk => builddefs/testlist.mk               | 0
 lib/python/qmk/cli/multibuild.py                   | 2 +-
 lib/python/qmk/commands.py                         | 2 +-
 paths.mk                                           | 4 +++-
 12 files changed, 15 insertions(+), 13 deletions(-)
 rename build_full_test.mk => builddefs/build_full_test.mk (100%)
 rename build_json.mk => builddefs/build_json.mk (100%)
 rename build_keyboard.mk => builddefs/build_keyboard.mk (98%)
 rename build_layout.mk => builddefs/build_layout.mk (100%)
 rename build_test.mk => builddefs/build_test.mk (93%)
 rename common_features.mk => builddefs/common_features.mk (100%)
 rename tmk_core/rules.mk => builddefs/common_rules.mk (100%)
 rename testlist.mk => builddefs/testlist.mk (100%)

diff --git a/Makefile b/Makefile
index 22c79880a3..4c2e6a04dc 100644
--- a/Makefile
+++ b/Makefile
@@ -275,7 +275,7 @@ define PARSE_KEYMAP
     # Specify the variables that we are passing forward to submake
     MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY) QMK_BIN=$$(QMK_BIN)
     # And the first part of the make command
-    MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET)
+    MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f $(BUILDDEFS_PATH)/build_keyboard.mk $$(MAKE_TARGET)
     # The message to display
     MAKE_MSG := $$(MSG_MAKE_KB)
     # We run the command differently, depending on if we want more output or not
@@ -317,7 +317,7 @@ define BUILD_TEST
     TEST_NAME := $$(notdir $$(TEST_PATH))
     MAKE_TARGET := $2
     COMMAND := $1
-    MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_test.mk $$(MAKE_TARGET)
+    MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f $(BUILDDEFS_PATH)/build_test.mk $$(MAKE_TARGET)
     MAKE_VARS := TEST=$$(TEST_NAME) TEST_PATH=$$(TEST_PATH) FULL_TESTS="$$(FULL_TESTS)"
     MAKE_MSG := $$(MSG_MAKE_TEST)
     $$(eval $$(call BUILD))
@@ -339,7 +339,7 @@ define PARSE_TEST
     TESTS :=
     TEST_NAME := $$(firstword $$(subst :, ,$$(RULE)))
     TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME):,,$$(RULE)))
-    include $(ROOT_DIR)/testlist.mk
+    include $(BUILDDEFS_PATH)/testlist.mk
     ifeq ($$(TEST_NAME),all)
         MATCHED_TESTS := $$(TEST_LIST)
     else
diff --git a/build_full_test.mk b/builddefs/build_full_test.mk
similarity index 100%
rename from build_full_test.mk
rename to builddefs/build_full_test.mk
diff --git a/build_json.mk b/builddefs/build_json.mk
similarity index 100%
rename from build_json.mk
rename to builddefs/build_json.mk
diff --git a/build_keyboard.mk b/builddefs/build_keyboard.mk
similarity index 98%
rename from build_keyboard.mk
rename to builddefs/build_keyboard.mk
index f727760465..d5efcb4193 100644
--- a/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -111,7 +111,7 @@ INFO_RULES_MK = $(shell $(QMK_BIN) generate-rules-mk --quiet --escape --keyboard
 include $(INFO_RULES_MK)
 
 # Check for keymap.json first, so we can regenerate keymap.c
-include build_json.mk
+include $(BUILDDEFS_PATH)/build_json.mk
 
 # Pull in keymap level rules.mk
 ifeq ("$(wildcard $(KEYMAP_PATH))", "")
@@ -138,7 +138,7 @@ ifeq ("$(wildcard $(KEYMAP_PATH))", "")
         KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
     else ifneq ($(LAYOUTS),)
         # If we haven't found a keymap yet fall back to community layouts
-        include build_layout.mk
+        include $(BUILDDEFS_PATH)/build_layout.mk
     else
         $(call CATASTROPHIC_ERROR,Invalid keymap,Could not find keymap)
         # this state should never be reached
@@ -398,7 +398,7 @@ VPATH += $(COMMON_VPATH)
 VPATH += $(KEYBOARD_OUTPUT)/src
 VPATH += $(KEYMAP_OUTPUT)/src
 
-include common_features.mk
+include $(BUILDDEFS_PATH)/common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
 include $(TMK_PATH)/protocol.mk
 include $(PLATFORM_PATH)/common.mk
@@ -460,7 +460,7 @@ check-md5: build
 objs-size: build
 
 include $(BUILDDEFS_PATH)/show_options.mk
-include $(TMK_PATH)/rules.mk
+include $(BUILDDEFS_PATH)/common_rules.mk
 
 # Ensure we have generated files available for each of the objects
 define GEN_FILES
diff --git a/build_layout.mk b/builddefs/build_layout.mk
similarity index 100%
rename from build_layout.mk
rename to builddefs/build_layout.mk
diff --git a/build_test.mk b/builddefs/build_test.mk
similarity index 93%
rename from build_test.mk
rename to builddefs/build_test.mk
index ec6699b4ea..7226004aab 100644
--- a/build_test.mk
+++ b/builddefs/build_test.mk
@@ -54,7 +54,7 @@ include tests/test_common/build.mk
 include $(TEST_PATH)/test.mk
 endif
 
-include common_features.mk
+include $(BUILDDEFS_PATH)/common_features.mk
 include $(BUILDDEFS_PATH)/generic_features.mk
 include $(PLATFORM_PATH)/common.mk
 include $(TMK_PATH)/protocol.mk
@@ -63,7 +63,7 @@ include $(QUANTUM_PATH)/encoder/tests/rules.mk
 include $(QUANTUM_PATH)/sequencer/tests/rules.mk
 include $(PLATFORM_PATH)/test/rules.mk
 ifneq ($(filter $(FULL_TESTS),$(TEST)),)
-include build_full_test.mk
+include $(BUILDDEFS_PATH)/build_full_test.mk
 endif
 
 $(TEST)_SRC += \
@@ -77,7 +77,7 @@ $(TEST_OBJ)/$(TEST)_DEFS := $($(TEST)_DEFS)
 $(TEST_OBJ)/$(TEST)_CONFIG := $($(TEST)_CONFIG)
 
 include $(PLATFORM_PATH)/$(PLATFORM_KEY)/platform.mk
-include $(TMK_PATH)/rules.mk
+include $(BUILDDEFS_PATH)/common_rules.mk
 
 
 $(shell mkdir -p $(BUILD_DIR)/test 2>/dev/null)
diff --git a/common_features.mk b/builddefs/common_features.mk
similarity index 100%
rename from common_features.mk
rename to builddefs/common_features.mk
diff --git a/tmk_core/rules.mk b/builddefs/common_rules.mk
similarity index 100%
rename from tmk_core/rules.mk
rename to builddefs/common_rules.mk
diff --git a/testlist.mk b/builddefs/testlist.mk
similarity index 100%
rename from testlist.mk
rename to builddefs/testlist.mk
diff --git a/lib/python/qmk/cli/multibuild.py b/lib/python/qmk/cli/multibuild.py
index ad059edff3..dff8c88422 100755
--- a/lib/python/qmk/cli/multibuild.py
+++ b/lib/python/qmk/cli/multibuild.py
@@ -69,7 +69,7 @@ def multibuild(cli):
 all: {keyboard_safe}_binary
 {keyboard_safe}_binary:
 	@rm -f "{QMK_FIRMWARE}/.build/failed.log.{keyboard_safe}" || true
-	+@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{cli.args.keymap}" REQUIRE_PLATFORM_KEY= COLOR=true SILENT=false {' '.join(cli.args.env)} \\
+	+@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/builddefs/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{cli.args.keymap}" REQUIRE_PLATFORM_KEY= COLOR=true SILENT=false {' '.join(cli.args.env)} \\
 		>>"{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" 2>&1 \\
 		|| cp "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" "{QMK_FIRMWARE}/.build/failed.log.{os.getpid()}.{keyboard_safe}"
 	@{{ grep '\[ERRORS\]' "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" >/dev/null 2>&1 && printf "Build %-64s \e[1;31m[ERRORS]\e[0m\\n" "{keyboard_name}:{cli.args.keymap}" ; }} \\
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 90a68ca3cd..275cd72e5c 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -213,7 +213,7 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va
         '-r',
         '-R',
         '-f',
-        'build_keyboard.mk',
+        'builddefs/build_keyboard.mk',
     ])
 
     if bootloader:
diff --git a/paths.mk b/paths.mk
index 5a39d00ecd..85ccfa0796 100644
--- a/paths.mk
+++ b/paths.mk
@@ -2,7 +2,9 @@
 TOP_DIR = .
 TMK_DIR = tmk_core
 TMK_PATH = $(TMK_DIR)
-LIB_PATH = lib
+
+LIB_DIR = lib
+LIB_PATH = $(LIB_DIR)
 
 QUANTUM_DIR = quantum
 QUANTUM_PATH = $(QUANTUM_DIR)

From e04f6c5d38d503140de3632e8850159e0ef362a6 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 10 Feb 2022 17:52:39 +0000
Subject: [PATCH 598/867] Remove manual enable of LTO within user keymaps
 (#15378)

---
 keyboards/contra/keymaps/maxr1998/rules.mk                     | 2 +-
 keyboards/crkbd/keymaps/snowe/rules.mk                         | 2 +-
 keyboards/dztech/dz60rgb/keymaps/matthewrobo/rules.mk          | 2 +-
 keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk               | 2 +-
 .../handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk     | 2 +-
 keyboards/keebio/iris/keymaps/333fred/rules.mk                 | 3 +--
 keyboards/lily58/keymaps/druotoni/rules.mk                     | 1 -
 keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk              | 2 +-
 keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk           | 2 +-
 keyboards/woodkeys/meira/keymaps/cole/rules.mk                 | 2 +-
 keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk         | 2 +-
 keyboards/yoichiro/lunakey_mini/keymaps/via/rules.mk           | 2 +-
 12 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/keyboards/contra/keymaps/maxr1998/rules.mk b/keyboards/contra/keymaps/maxr1998/rules.mk
index e1ba074290..8607ce19ef 100644
--- a/keyboards/contra/keymaps/maxr1998/rules.mk
+++ b/keyboards/contra/keymaps/maxr1998/rules.mk
@@ -1,7 +1,7 @@
 RGBLIGHT_ENABLE = yes
 KEY_LOCK_ENABLE = yes
 
-EXTRAFLAGS      += -flto
+LTO_ENABLE      = yes
 UNICODE_ENABLE  = no
 MOUSEKEY_ENABLE = no
 
diff --git a/keyboards/crkbd/keymaps/snowe/rules.mk b/keyboards/crkbd/keymaps/snowe/rules.mk
index ce3b5928fa..96ae4bbf95 100644
--- a/keyboards/crkbd/keymaps/snowe/rules.mk
+++ b/keyboards/crkbd/keymaps/snowe/rules.mk
@@ -21,6 +21,6 @@ OCEAN_DREAM_ENABLE = yes
 LUNA_ENABLE = no # disabled so travis build succeeds
 
 # if firmware size over limit, try this option
-CFLAGS += -flto
+LTO_ENABLE = yes
 
 WPM_ENABLE = yes
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/rules.mk b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/rules.mk
index 15b8ec1baf..e2618e5290 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/rules.mk
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/rules.mk
@@ -2,6 +2,6 @@ NKRO_ENABLE = yes                 # USB Nkey Rollover
 AUTO_SHIFT_ENABLE = yes      # Auto Shift
 # VELOCIKEY_ENABLE = yes
 
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
 
 # SRC += dz60rgb.c
diff --git a/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk b/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk
index 24a765ab9a..2f8ab8ecc3 100644
--- a/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk
+++ b/keyboards/dztech/dz65rgb/keymaps/drootz/rules.mk
@@ -2,7 +2,7 @@ DYNAMIC_MACRO_ENABLE = yes
 LEADER_ENABLE = yes
 
 # Firmware size Optimizations
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
 MOUSEKEY_ENABLE = no
 NKRO_ENABLE = no
 SPACE_CADET_ENABLE = no
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk
index 6d2e27cb41..5ad63b02b7 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/rules.mk
@@ -1,3 +1,3 @@
 KEY_LOCK_ENABLE = yes
 CONSOLE_ENABLE = no
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
diff --git a/keyboards/keebio/iris/keymaps/333fred/rules.mk b/keyboards/keebio/iris/keymaps/333fred/rules.mk
index 995272e2f2..5ad63b02b7 100644
--- a/keyboards/keebio/iris/keymaps/333fred/rules.mk
+++ b/keyboards/keebio/iris/keymaps/333fred/rules.mk
@@ -1,4 +1,3 @@
 KEY_LOCK_ENABLE = yes
 CONSOLE_ENABLE = no
-EXTRAFLAGS += -flto
-
+LTO_ENABLE = yes
diff --git a/keyboards/lily58/keymaps/druotoni/rules.mk b/keyboards/lily58/keymaps/druotoni/rules.mk
index c07761108e..b3182cb46a 100644
--- a/keyboards/lily58/keymaps/druotoni/rules.mk
+++ b/keyboards/lily58/keymaps/druotoni/rules.mk
@@ -9,7 +9,6 @@ BOOTLOADER = atmel-dfu
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-# EXTRAFLAGS += -flto
 LTO_ENABLE = yes
 SPACE_CADET_ENABLE = no
 GRAVE_ESC_ENABLE = no
diff --git a/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
index f858bbe3da..a5b4454073 100644
--- a/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
+++ b/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk
@@ -1,4 +1,4 @@
 RGBLIGHT_ENABLE = yes
 KEY_LOCK_ENABLE = yes
 CONSOLE_ENABLE = no
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
diff --git a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
index d484c47366..c5cc34d898 100644
--- a/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
+++ b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk
@@ -41,4 +41,4 @@ ifeq ($(strip $(RGBLIGHT_SPLIT_ENABLE)), yes)
 endif
 
 # Link time optimization, should save on firmware size
-EXTRAFLAGS += -flto
+LTO_ENABLE = yes
diff --git a/keyboards/woodkeys/meira/keymaps/cole/rules.mk b/keyboards/woodkeys/meira/keymaps/cole/rules.mk
index 8f8d53e57a..eed6b9c119 100644
--- a/keyboards/woodkeys/meira/keymaps/cole/rules.mk
+++ b/keyboards/woodkeys/meira/keymaps/cole/rules.mk
@@ -1,2 +1,2 @@
 AUDIO_ENABLE = yes           # Audio output on port C6
-EXTRAFLAGS+=-flto # -4-7k
\ No newline at end of file
+LTO_ENABLE = yes # -4-7k
diff --git a/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk b/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk
index b3b1980eb1..1c61fe1c12 100644
--- a/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk
+++ b/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk
@@ -1,5 +1,5 @@
 AUDIO_ENABLE = yes           # Audio output on port C6
-EXTRAFLAGS+=-flto # -4-7k
+LTO_ENABLE = yes # -4-7k
 MOUSEKEY_ENABLE = no       # Mouse keys(-47kb)
 ISSI_ENABLE = no
 BACKLIGHT_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/yoichiro/lunakey_mini/keymaps/via/rules.mk b/keyboards/yoichiro/lunakey_mini/keymaps/via/rules.mk
index 8b55a3b731..989d0d173c 100644
--- a/keyboards/yoichiro/lunakey_mini/keymaps/via/rules.mk
+++ b/keyboards/yoichiro/lunakey_mini/keymaps/via/rules.mk
@@ -2,4 +2,4 @@ RGBLIGHT_ENABLE = yes        # Enable keyboard RGB Underglow
 AUDIO_ENABLE = no            # Enable Audio output
 OLED_ENABLE = no      # Enable OLED Display
 VIA_ENABLE = yes             # Enable VIA support
-LTO_ENABLE = yes             # CFLAGS=flto
+LTO_ENABLE = yes             # Reduce firmware size

From bc5d46aaadfdef5683d95e924e49ea6bc562c9f3 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 10 Feb 2022 13:02:23 -0800
Subject: [PATCH 599/867] Mode 75H Touch-UP (#16310)

* m75h.h: correct matrix position identifier

`K5C` is actually on row 4, so it should be `K4C`.

* m75h.h: add matrix diagram

* add QMK Configurator data

* polish whitespace

- convert tabs to spaces
- update indent to four spaces
- remove trailing whitespace
---
 keyboards/mode/m75h/info.json                | 97 ++++++++++++++++++++
 keyboards/mode/m75h/keymaps/default/keymap.c | 24 ++---
 keyboards/mode/m75h/keymaps/via/keymap.c     | 24 ++---
 keyboards/mode/m75h/m75h.h                   | 46 +++++++---
 4 files changed, 154 insertions(+), 37 deletions(-)
 create mode 100644 keyboards/mode/m75h/info.json

diff --git a/keyboards/mode/m75h/info.json b/keyboards/mode/m75h/info.json
new file mode 100644
index 0000000000..91584e8863
--- /dev/null
+++ b/keyboards/mode/m75h/info.json
@@ -0,0 +1,97 @@
+{
+    "keyboard_name": "Mode 75H",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "x":10, "y":1.5},
+                {"label":"-_", "x":11, "y":1.5},
+                {"label":"=+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Home", "x":15, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[{", "x":11.5, "y":2.5},
+                {"label":"]}", "x":12.5, "y":2.5},
+                {"label":"\\|", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"Page Up", "x":15, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";:", "x":10.75, "y":3.5},
+                {"label":"'\"", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"Page Down", "x":15, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",<", "x":9.25, "y":4.5},
+                {"label":".>", "x":10.25, "y":4.5},
+                {"label":"/?", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"\u2191", "x":14, "y":4.5},
+                {"label":"End", "x":15, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"\u2190", "x":13, "y":5.5},
+                {"label":"\u2193", "x":14, "y":5.5},
+                {"label":"\u2192", "x":15, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mode/m75h/keymaps/default/keymap.c b/keyboards/mode/m75h/keymaps/default/keymap.c
index 1c90f89fb7..1ad0eaba9d 100755
--- a/keyboards/mode/m75h/keymaps/default/keymap.c
+++ b/keyboards/mode/m75h/keymaps/default/keymap.c
@@ -19,35 +19,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
-        KC_ESC  , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6,  KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12,           KC_DEL , 
+        KC_ESC  , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6,  KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12,           KC_DEL ,
         KC_TILD , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6,   KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,          KC_HOME,
         KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y,   KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
         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_PGDN,
         KC_LSFT ,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B,   KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
-        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT 
-	),
+        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
     [1] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_MUTE,
         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_VOLU,
-        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_VOLD, 
-        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_MPLY, 
+        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_VOLD,
+        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_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        ),
+    ),
     [2] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        ),
+    ),
     [3] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        )
+    )
 };
diff --git a/keyboards/mode/m75h/keymaps/via/keymap.c b/keyboards/mode/m75h/keymaps/via/keymap.c
index 1c90f89fb7..1ad0eaba9d 100755
--- a/keyboards/mode/m75h/keymaps/via/keymap.c
+++ b/keyboards/mode/m75h/keymaps/via/keymap.c
@@ -19,35 +19,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT_all(
-        KC_ESC  , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6,  KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12,           KC_DEL , 
+        KC_ESC  , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6,  KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12,           KC_DEL ,
         KC_TILD , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6,   KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,          KC_HOME,
         KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y,   KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
         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_PGDN,
         KC_LSFT ,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B,   KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
-        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT 
-	),
+        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
     [1] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_MUTE,
         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_VOLU,
-        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_VOLD, 
-        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_MPLY, 
+        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_VOLD,
+        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_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        ),
+    ),
     [2] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        ),
+    ),
     [3] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, 
-        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        )
+    )
 };
diff --git a/keyboards/mode/m75h/m75h.h b/keyboards/mode/m75h/m75h.h
index a7c48853d8..da01f25818 100644
--- a/keyboards/mode/m75h/m75h.h
+++ b/keyboards/mode/m75h/m75h.h
@@ -21,19 +21,39 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ___ KC_NO
 
+/*
+ * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐
+ * │00 │ │01 │02 │03 │04 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0F │
+ * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D     │1F │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E   │2F │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3E      │3F │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │40      │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4E │4F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │50  │51  │52  │66                      │6A  │6B  │ │6D │6E │6F │
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ * │50   │51 │52   │66                         │6B   │ Tsangan
+ * └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
 #define LAYOUT_all( \
-	K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
-	K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C,      K4E, K4F, \
-	K50, K51, K52,                K66,                K6A, K6B,      K6D, K6E, K6F  \
+    K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
+    K50, K51, K52,                K66,                K6A, K6B,      K6D, K6E, K6F  \
 ) { \
-	{ K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, ___, K3E, K3F }, \
-	{ K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C, ___, K4E, K4F }, \
-	{ K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-        { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, K6A, K6B, ___, K6D, K6E, K6F }  \
+    { K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, ___, K3E, K3F }, \
+    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E, K4F }, \
+    { K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, K6A, K6B, ___, K6D, K6E, K6F }  \
 }

From 7c57c88c86f62de5284f0bf0d616efb286e2f3e9 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Fri, 11 Feb 2022 05:19:33 +0800
Subject: [PATCH 600/867] move ID87 to IDOBAO vendor folder (#15667)

* move ID87 to IDOBAO vendor folder

* move to v1 to acommondate for v2
---
 keyboards/{id87 => idobao/id87/v1}/config.h                  | 0
 keyboards/{id87 => idobao/id87/v1}/info.json                 | 0
 keyboards/{id87 => idobao/id87/v1}/keymaps/default/keymap.c  | 0
 keyboards/{id87 => idobao/id87/v1}/keymaps/default/readme.md | 0
 keyboards/{id87 => idobao/id87/v1}/keymaps/via/keymap.c      | 0
 keyboards/{id87 => idobao/id87/v1}/keymaps/via/rules.mk      | 0
 keyboards/{id87 => idobao/id87/v1}/readme.md                 | 4 ++--
 keyboards/{id87 => idobao/id87/v1}/rules.mk                  | 0
 keyboards/{id87/id87.c => idobao/id87/v1/v1.c}               | 2 +-
 keyboards/{id87/id87.h => idobao/id87/v1/v1.h}               | 0
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename keyboards/{id87 => idobao/id87/v1}/config.h (100%)
 rename keyboards/{id87 => idobao/id87/v1}/info.json (100%)
 rename keyboards/{id87 => idobao/id87/v1}/keymaps/default/keymap.c (100%)
 rename keyboards/{id87 => idobao/id87/v1}/keymaps/default/readme.md (100%)
 rename keyboards/{id87 => idobao/id87/v1}/keymaps/via/keymap.c (100%)
 rename keyboards/{id87 => idobao/id87/v1}/keymaps/via/rules.mk (100%)
 rename keyboards/{id87 => idobao/id87/v1}/readme.md (91%)
 rename keyboards/{id87 => idobao/id87/v1}/rules.mk (100%)
 rename keyboards/{id87/id87.c => idobao/id87/v1/v1.c} (97%)
 rename keyboards/{id87/id87.h => idobao/id87/v1/v1.h} (100%)

diff --git a/keyboards/id87/config.h b/keyboards/idobao/id87/v1/config.h
similarity index 100%
rename from keyboards/id87/config.h
rename to keyboards/idobao/id87/v1/config.h
diff --git a/keyboards/id87/info.json b/keyboards/idobao/id87/v1/info.json
similarity index 100%
rename from keyboards/id87/info.json
rename to keyboards/idobao/id87/v1/info.json
diff --git a/keyboards/id87/keymaps/default/keymap.c b/keyboards/idobao/id87/v1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/id87/keymaps/default/keymap.c
rename to keyboards/idobao/id87/v1/keymaps/default/keymap.c
diff --git a/keyboards/id87/keymaps/default/readme.md b/keyboards/idobao/id87/v1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/id87/keymaps/default/readme.md
rename to keyboards/idobao/id87/v1/keymaps/default/readme.md
diff --git a/keyboards/id87/keymaps/via/keymap.c b/keyboards/idobao/id87/v1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/id87/keymaps/via/keymap.c
rename to keyboards/idobao/id87/v1/keymaps/via/keymap.c
diff --git a/keyboards/id87/keymaps/via/rules.mk b/keyboards/idobao/id87/v1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/id87/keymaps/via/rules.mk
rename to keyboards/idobao/id87/v1/keymaps/via/rules.mk
diff --git a/keyboards/id87/readme.md b/keyboards/idobao/id87/v1/readme.md
similarity index 91%
rename from keyboards/id87/readme.md
rename to keyboards/idobao/id87/v1/readme.md
index ee3604f849..59814f81f7 100644
--- a/keyboards/id87/readme.md
+++ b/keyboards/idobao/id87/v1/readme.md
@@ -10,10 +10,10 @@ A TKL hotswap board from IDOBAO.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make id87:default
+    make idobao/id87/v1:default
 
 Flashing example for this keyboard:
 
-    make id87:default:flash
+    make idobao/id87/v1:default:flash
 
 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).
diff --git a/keyboards/id87/rules.mk b/keyboards/idobao/id87/v1/rules.mk
similarity index 100%
rename from keyboards/id87/rules.mk
rename to keyboards/idobao/id87/v1/rules.mk
diff --git a/keyboards/id87/id87.c b/keyboards/idobao/id87/v1/v1.c
similarity index 97%
rename from keyboards/id87/id87.c
rename to keyboards/idobao/id87/v1/v1.c
index 145edc1639..59dc3daab4 100644
--- a/keyboards/id87/id87.c
+++ b/keyboards/idobao/id87/v1/v1.c
@@ -12,4 +12,4 @@ 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 "id87.h"
+#include "v1.h"
diff --git a/keyboards/id87/id87.h b/keyboards/idobao/id87/v1/v1.h
similarity index 100%
rename from keyboards/id87/id87.h
rename to keyboards/idobao/id87/v1/v1.h

From 27ec6674304412fb6f5499dbf0874dcf7b5524c6 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Fri, 11 Feb 2022 05:46:03 +0800
Subject: [PATCH 601/867] move id80 and id75 to v1 to accommodate for id75 v2
 and id80 v3 (#15992)

* move id80 to a v1 to acommondate for v2 and a future v3

* move id75 to v1

* fix manufacturer and product fields, enable backlight

* move user keymap

* Fix DEFAULT_FOLDER

* Update build command

Co-authored-by: zvecr <git@zvecr.com>
---
 keyboards/idobao/id75/{ => v1}/config.h                     | 4 ++--
 keyboards/idobao/id75/{ => v1}/info.json                    | 0
 keyboards/idobao/id75/{ => v1}/readme.md                    | 2 +-
 keyboards/idobao/id75/{ => v1}/rules.mk                     | 6 +++---
 keyboards/idobao/id75/{id75.c => v1/v1.c}                   | 2 +-
 keyboards/idobao/id75/{id75.h => v1/v1.h}                   | 0
 keyboards/idobao/id80/{ => v1}/ansi/config.h                | 0
 .../idobao/id80/{ => v1}/ansi/keymaps/default/keymap.c      | 0
 .../idobao/id80/{ => v1}/ansi/keymaps/default/readme.md     | 0
 keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/config.h    | 0
 keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/keymap.c    | 0
 keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/readme.md   | 0
 keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/rules.mk    | 0
 keyboards/idobao/id80/{ => v1/ansi}/keymaps/rverst/keymap.c | 0
 .../idobao/id80/{ => v1/ansi}/keymaps/rverst/readme.md      | 0
 .../idobao/id80/{ => v1/ansi}/keymaps/rverst/rverst.json    | 0
 keyboards/idobao/id80/{ => v1}/ansi/keymaps/via/keymap.c    | 0
 keyboards/idobao/id80/{ => v1}/ansi/keymaps/via/rules.mk    | 0
 keyboards/idobao/id80/{ => v1}/ansi/readme.md               | 0
 keyboards/idobao/id80/{ => v1}/ansi/rules.mk                | 0
 keyboards/idobao/id80/{ => v1}/config.h                     | 0
 keyboards/idobao/id80/{ => v1}/info.json                    | 0
 keyboards/idobao/id80/{ => v1}/iso/config.h                 | 0
 keyboards/idobao/id80/{ => v1}/iso/keymaps/default/keymap.c | 0
 .../idobao/id80/{ => v1}/iso/keymaps/default/readme.md      | 0
 keyboards/idobao/id80/{ => v1}/iso/keymaps/via/keymap.c     | 0
 keyboards/idobao/id80/{ => v1}/iso/keymaps/via/rules.mk     | 0
 keyboards/idobao/id80/{ => v1}/iso/readme.md                | 0
 keyboards/idobao/id80/{ => v1}/iso/rules.mk                 | 0
 keyboards/idobao/id80/{ => v1}/readme.md                    | 4 ++--
 keyboards/idobao/id80/{ => v1}/rules.mk                     | 2 +-
 keyboards/idobao/id80/{id80.c => v1/v1.c}                   | 2 +-
 keyboards/idobao/id80/{id80.h => v1/v1.h}                   | 0
 33 files changed, 11 insertions(+), 11 deletions(-)
 rename keyboards/idobao/id75/{ => v1}/config.h (98%)
 rename keyboards/idobao/id75/{ => v1}/info.json (100%)
 rename keyboards/idobao/id75/{ => v1}/readme.md (96%)
 rename keyboards/idobao/id75/{ => v1}/rules.mk (72%)
 rename keyboards/idobao/id75/{id75.c => v1/v1.c} (97%)
 rename keyboards/idobao/id75/{id75.h => v1/v1.h} (100%)
 rename keyboards/idobao/id80/{ => v1}/ansi/config.h (100%)
 rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/default/keymap.c (100%)
 rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/default/readme.md (100%)
 rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/config.h (100%)
 rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/keymap.c (100%)
 rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/readme.md (100%)
 rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/msf/rules.mk (100%)
 rename keyboards/idobao/id80/{ => v1/ansi}/keymaps/rverst/keymap.c (100%)
 rename keyboards/idobao/id80/{ => v1/ansi}/keymaps/rverst/readme.md (100%)
 rename keyboards/idobao/id80/{ => v1/ansi}/keymaps/rverst/rverst.json (100%)
 rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/via/keymap.c (100%)
 rename keyboards/idobao/id80/{ => v1}/ansi/keymaps/via/rules.mk (100%)
 rename keyboards/idobao/id80/{ => v1}/ansi/readme.md (100%)
 rename keyboards/idobao/id80/{ => v1}/ansi/rules.mk (100%)
 rename keyboards/idobao/id80/{ => v1}/config.h (100%)
 rename keyboards/idobao/id80/{ => v1}/info.json (100%)
 rename keyboards/idobao/id80/{ => v1}/iso/config.h (100%)
 rename keyboards/idobao/id80/{ => v1}/iso/keymaps/default/keymap.c (100%)
 rename keyboards/idobao/id80/{ => v1}/iso/keymaps/default/readme.md (100%)
 rename keyboards/idobao/id80/{ => v1}/iso/keymaps/via/keymap.c (100%)
 rename keyboards/idobao/id80/{ => v1}/iso/keymaps/via/rules.mk (100%)
 rename keyboards/idobao/id80/{ => v1}/iso/readme.md (100%)
 rename keyboards/idobao/id80/{ => v1}/iso/rules.mk (100%)
 rename keyboards/idobao/id80/{ => v1}/readme.md (93%)
 rename keyboards/idobao/id80/{ => v1}/rules.mk (95%)
 rename keyboards/idobao/id80/{id80.c => v1/v1.c} (97%)
 rename keyboards/idobao/id80/{id80.h => v1/v1.h} (100%)

diff --git a/keyboards/idobao/id75/config.h b/keyboards/idobao/id75/v1/config.h
similarity index 98%
rename from keyboards/idobao/id75/config.h
rename to keyboards/idobao/id75/v1/config.h
index ffe0bb7011..caaf7f75dc 100644
--- a/keyboards/idobao/id75/config.h
+++ b/keyboards/idobao/id75/v1/config.h
@@ -23,8 +23,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID       0x6964 // ID
 #define PRODUCT_ID      0x0075
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Generic
-#define PRODUCT         Idobo
+#define MANUFACTURER    IDOBAO
+#define PRODUCT         ID75
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/idobao/id75/info.json b/keyboards/idobao/id75/v1/info.json
similarity index 100%
rename from keyboards/idobao/id75/info.json
rename to keyboards/idobao/id75/v1/info.json
diff --git a/keyboards/idobao/id75/readme.md b/keyboards/idobao/id75/v1/readme.md
similarity index 96%
rename from keyboards/idobao/id75/readme.md
rename to keyboards/idobao/id75/v1/readme.md
index 9f0f87360c..545f3121f7 100644
--- a/keyboards/idobao/id75/readme.md
+++ b/keyboards/idobao/id75/v1/readme.md
@@ -14,6 +14,6 @@ Hardware Availability:
 
 Make example for this keyboard (after setting up your build environment):
 
-    make idobao/id75:default
+    make idobao/id75/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).
diff --git a/keyboards/idobao/id75/rules.mk b/keyboards/idobao/id75/v1/rules.mk
similarity index 72%
rename from keyboards/idobao/id75/rules.mk
rename to keyboards/idobao/id75/v1/rules.mk
index 721b7f5606..0ce4fe96d9 100644
--- a/keyboards/idobao/id75/rules.mk
+++ b/keyboards/idobao/id75/v1/rules.mk
@@ -11,10 +11,10 @@ BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 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
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 LTO_ENABLE = yes            # Use link time optimization
 
diff --git a/keyboards/idobao/id75/id75.c b/keyboards/idobao/id75/v1/v1.c
similarity index 97%
rename from keyboards/idobao/id75/id75.c
rename to keyboards/idobao/id75/v1/v1.c
index 0a0e08cc32..992a292616 100644
--- a/keyboards/idobao/id75/id75.c
+++ b/keyboards/idobao/id75/v1/v1.c
@@ -13,4 +13,4 @@
  * 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 "id75.h"
+#include "v1.h"
diff --git a/keyboards/idobao/id75/id75.h b/keyboards/idobao/id75/v1/v1.h
similarity index 100%
rename from keyboards/idobao/id75/id75.h
rename to keyboards/idobao/id75/v1/v1.h
diff --git a/keyboards/idobao/id80/ansi/config.h b/keyboards/idobao/id80/v1/ansi/config.h
similarity index 100%
rename from keyboards/idobao/id80/ansi/config.h
rename to keyboards/idobao/id80/v1/ansi/config.h
diff --git a/keyboards/idobao/id80/ansi/keymaps/default/keymap.c b/keyboards/idobao/id80/v1/ansi/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/default/keymap.c
rename to keyboards/idobao/id80/v1/ansi/keymaps/default/keymap.c
diff --git a/keyboards/idobao/id80/ansi/keymaps/default/readme.md b/keyboards/idobao/id80/v1/ansi/keymaps/default/readme.md
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/default/readme.md
rename to keyboards/idobao/id80/v1/ansi/keymaps/default/readme.md
diff --git a/keyboards/idobao/id80/ansi/keymaps/msf/config.h b/keyboards/idobao/id80/v1/ansi/keymaps/msf/config.h
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/msf/config.h
rename to keyboards/idobao/id80/v1/ansi/keymaps/msf/config.h
diff --git a/keyboards/idobao/id80/ansi/keymaps/msf/keymap.c b/keyboards/idobao/id80/v1/ansi/keymaps/msf/keymap.c
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/msf/keymap.c
rename to keyboards/idobao/id80/v1/ansi/keymaps/msf/keymap.c
diff --git a/keyboards/idobao/id80/ansi/keymaps/msf/readme.md b/keyboards/idobao/id80/v1/ansi/keymaps/msf/readme.md
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/msf/readme.md
rename to keyboards/idobao/id80/v1/ansi/keymaps/msf/readme.md
diff --git a/keyboards/idobao/id80/ansi/keymaps/msf/rules.mk b/keyboards/idobao/id80/v1/ansi/keymaps/msf/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/msf/rules.mk
rename to keyboards/idobao/id80/v1/ansi/keymaps/msf/rules.mk
diff --git a/keyboards/idobao/id80/keymaps/rverst/keymap.c b/keyboards/idobao/id80/v1/ansi/keymaps/rverst/keymap.c
similarity index 100%
rename from keyboards/idobao/id80/keymaps/rverst/keymap.c
rename to keyboards/idobao/id80/v1/ansi/keymaps/rverst/keymap.c
diff --git a/keyboards/idobao/id80/keymaps/rverst/readme.md b/keyboards/idobao/id80/v1/ansi/keymaps/rverst/readme.md
similarity index 100%
rename from keyboards/idobao/id80/keymaps/rverst/readme.md
rename to keyboards/idobao/id80/v1/ansi/keymaps/rverst/readme.md
diff --git a/keyboards/idobao/id80/keymaps/rverst/rverst.json b/keyboards/idobao/id80/v1/ansi/keymaps/rverst/rverst.json
similarity index 100%
rename from keyboards/idobao/id80/keymaps/rverst/rverst.json
rename to keyboards/idobao/id80/v1/ansi/keymaps/rverst/rverst.json
diff --git a/keyboards/idobao/id80/ansi/keymaps/via/keymap.c b/keyboards/idobao/id80/v1/ansi/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/via/keymap.c
rename to keyboards/idobao/id80/v1/ansi/keymaps/via/keymap.c
diff --git a/keyboards/idobao/id80/ansi/keymaps/via/rules.mk b/keyboards/idobao/id80/v1/ansi/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/ansi/keymaps/via/rules.mk
rename to keyboards/idobao/id80/v1/ansi/keymaps/via/rules.mk
diff --git a/keyboards/idobao/id80/ansi/readme.md b/keyboards/idobao/id80/v1/ansi/readme.md
similarity index 100%
rename from keyboards/idobao/id80/ansi/readme.md
rename to keyboards/idobao/id80/v1/ansi/readme.md
diff --git a/keyboards/idobao/id80/ansi/rules.mk b/keyboards/idobao/id80/v1/ansi/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/ansi/rules.mk
rename to keyboards/idobao/id80/v1/ansi/rules.mk
diff --git a/keyboards/idobao/id80/config.h b/keyboards/idobao/id80/v1/config.h
similarity index 100%
rename from keyboards/idobao/id80/config.h
rename to keyboards/idobao/id80/v1/config.h
diff --git a/keyboards/idobao/id80/info.json b/keyboards/idobao/id80/v1/info.json
similarity index 100%
rename from keyboards/idobao/id80/info.json
rename to keyboards/idobao/id80/v1/info.json
diff --git a/keyboards/idobao/id80/iso/config.h b/keyboards/idobao/id80/v1/iso/config.h
similarity index 100%
rename from keyboards/idobao/id80/iso/config.h
rename to keyboards/idobao/id80/v1/iso/config.h
diff --git a/keyboards/idobao/id80/iso/keymaps/default/keymap.c b/keyboards/idobao/id80/v1/iso/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/idobao/id80/iso/keymaps/default/keymap.c
rename to keyboards/idobao/id80/v1/iso/keymaps/default/keymap.c
diff --git a/keyboards/idobao/id80/iso/keymaps/default/readme.md b/keyboards/idobao/id80/v1/iso/keymaps/default/readme.md
similarity index 100%
rename from keyboards/idobao/id80/iso/keymaps/default/readme.md
rename to keyboards/idobao/id80/v1/iso/keymaps/default/readme.md
diff --git a/keyboards/idobao/id80/iso/keymaps/via/keymap.c b/keyboards/idobao/id80/v1/iso/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/idobao/id80/iso/keymaps/via/keymap.c
rename to keyboards/idobao/id80/v1/iso/keymaps/via/keymap.c
diff --git a/keyboards/idobao/id80/iso/keymaps/via/rules.mk b/keyboards/idobao/id80/v1/iso/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/iso/keymaps/via/rules.mk
rename to keyboards/idobao/id80/v1/iso/keymaps/via/rules.mk
diff --git a/keyboards/idobao/id80/iso/readme.md b/keyboards/idobao/id80/v1/iso/readme.md
similarity index 100%
rename from keyboards/idobao/id80/iso/readme.md
rename to keyboards/idobao/id80/v1/iso/readme.md
diff --git a/keyboards/idobao/id80/iso/rules.mk b/keyboards/idobao/id80/v1/iso/rules.mk
similarity index 100%
rename from keyboards/idobao/id80/iso/rules.mk
rename to keyboards/idobao/id80/v1/iso/rules.mk
diff --git a/keyboards/idobao/id80/readme.md b/keyboards/idobao/id80/v1/readme.md
similarity index 93%
rename from keyboards/idobao/id80/readme.md
rename to keyboards/idobao/id80/v1/readme.md
index bcc4a25d7d..8a26378b3b 100644
--- a/keyboards/idobao/id80/readme.md
+++ b/keyboards/idobao/id80/v1/readme.md
@@ -12,7 +12,7 @@ A 75% hotswap keyboard from IDOBAO.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make idobao/id80/ansi:default
+    make idobao/id80/v1/ansi:default
     
 ## ISO support:
 
@@ -22,6 +22,6 @@ Make example for this keyboard (after setting up your build environment):
 
 Make example for this keyboard (after setting up your build environment):
 
-    make idobao/id80/iso:default
+    make idobao/id80/v1/iso: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).
diff --git a/keyboards/idobao/id80/rules.mk b/keyboards/idobao/id80/v1/rules.mk
similarity index 95%
rename from keyboards/idobao/id80/rules.mk
rename to keyboards/idobao/id80/v1/rules.mk
index f988be4e29..0baebd07fc 100644
--- a/keyboards/idobao/id80/rules.mk
+++ b/keyboards/idobao/id80/v1/rules.mk
@@ -1,5 +1,5 @@
 # Defalt to the ansi version
-DEFAULT_FOLDER = idobao/id80/ansi
+DEFAULT_FOLDER = idobao/id80/v1/ansi
 
 # MCU name
 MCU = atmega32u4
diff --git a/keyboards/idobao/id80/id80.c b/keyboards/idobao/id80/v1/v1.c
similarity index 97%
rename from keyboards/idobao/id80/id80.c
rename to keyboards/idobao/id80/v1/v1.c
index 4a06660de9..7147b6163e 100644
--- a/keyboards/idobao/id80/id80.c
+++ b/keyboards/idobao/id80/v1/v1.c
@@ -13,4 +13,4 @@
  * 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 "id80.h"
+#include "v1.h"
diff --git a/keyboards/idobao/id80/id80.h b/keyboards/idobao/id80/v1/v1.h
similarity index 100%
rename from keyboards/idobao/id80/id80.h
rename to keyboards/idobao/id80/v1/v1.h

From 9e4942bec83e43da3d0624597bcf4ee5d855aa07 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Fri, 11 Feb 2022 07:20:11 +0800
Subject: [PATCH 602/867] [Keyboard] move latincompass's boards to
 /latincompass (#16039)

---
 keyboards/{ => latincompass}/latin17rgb/config.h              | 0
 keyboards/{ => latincompass}/latin17rgb/info.json             | 0
 .../{ => latincompass}/latin17rgb/keymaps/default/keymap.c    | 0
 keyboards/{ => latincompass}/latin17rgb/keymaps/via/keymap.c  | 0
 keyboards/{ => latincompass}/latin17rgb/keymaps/via/rules.mk  | 0
 keyboards/{ => latincompass}/latin17rgb/latin17rgb.c          | 0
 keyboards/{ => latincompass}/latin17rgb/latin17rgb.h          | 0
 keyboards/{ => latincompass}/latin17rgb/readme.md             | 4 ++--
 keyboards/{ => latincompass}/latin17rgb/rules.mk              | 0
 keyboards/{ => latincompass}/latin47ble/config.h              | 0
 keyboards/{ => latincompass}/latin47ble/info.json             | 0
 .../{ => latincompass}/latin47ble/keymaps/default/keymap.c    | 0
 keyboards/{ => latincompass}/latin47ble/keymaps/via/keymap.c  | 0
 keyboards/{ => latincompass}/latin47ble/keymaps/via/rules.mk  | 0
 keyboards/{ => latincompass}/latin47ble/latin47ble.c          | 0
 keyboards/{ => latincompass}/latin47ble/latin47ble.h          | 0
 keyboards/{ => latincompass}/latin47ble/readme.md             | 2 +-
 keyboards/{ => latincompass}/latin47ble/rules.mk              | 0
 keyboards/{ => latincompass}/latin60rgb/config.h              | 0
 keyboards/{ => latincompass}/latin60rgb/info.json             | 0
 .../{ => latincompass}/latin60rgb/keymaps/default/keymap.c    | 0
 keyboards/{ => latincompass}/latin60rgb/keymaps/via/keymap.c  | 0
 keyboards/{ => latincompass}/latin60rgb/keymaps/via/rules.mk  | 0
 keyboards/{ => latincompass}/latin60rgb/latin60rgb.c          | 0
 keyboards/{ => latincompass}/latin60rgb/latin60rgb.h          | 0
 keyboards/{ => latincompass}/latin60rgb/readme.md             | 2 +-
 keyboards/{ => latincompass}/latin60rgb/rules.mk              | 0
 keyboards/{ => latincompass}/latin64ble/config.h              | 0
 keyboards/{ => latincompass}/latin64ble/info.json             | 0
 .../{ => latincompass}/latin64ble/keymaps/default/keymap.c    | 0
 keyboards/{ => latincompass}/latin64ble/keymaps/via/keymap.c  | 0
 keyboards/{ => latincompass}/latin64ble/keymaps/via/rules.mk  | 0
 keyboards/{ => latincompass}/latin64ble/latin64ble.c          | 0
 keyboards/{ => latincompass}/latin64ble/latin64ble.h          | 0
 keyboards/{ => latincompass}/latin64ble/readme.md             | 2 +-
 keyboards/{ => latincompass}/latin64ble/rules.mk              | 0
 keyboards/{ => latincompass}/latin6rgb/config.h               | 0
 keyboards/{ => latincompass}/latin6rgb/info.json              | 0
 .../{ => latincompass}/latin6rgb/keymaps/default/keymap.c     | 0
 keyboards/{ => latincompass}/latin6rgb/keymaps/via/keymap.c   | 0
 keyboards/{ => latincompass}/latin6rgb/keymaps/via/rules.mk   | 0
 keyboards/{ => latincompass}/latin6rgb/latin6rgb.c            | 0
 keyboards/{ => latincompass}/latin6rgb/latin6rgb.h            | 0
 keyboards/{ => latincompass}/latin6rgb/readme.md              | 2 +-
 keyboards/{ => latincompass}/latin6rgb/rules.mk               | 0
 keyboards/{ => latincompass}/latinpad/config.h                | 0
 keyboards/{ => latincompass}/latinpad/info.json               | 0
 .../{ => latincompass}/latinpad/keymaps/default/keymap.c      | 0
 keyboards/{ => latincompass}/latinpad/keymaps/via/keymap.c    | 0
 keyboards/{ => latincompass}/latinpad/keymaps/via/rules.mk    | 0
 keyboards/{ => latincompass}/latinpad/latinpad.c              | 0
 keyboards/{ => latincompass}/latinpad/latinpad.h              | 0
 keyboards/{ => latincompass}/latinpad/lib/glcdfont.c          | 0
 keyboards/{ => latincompass}/latinpad/readme.md               | 2 +-
 keyboards/{ => latincompass}/latinpad/rules.mk                | 0
 keyboards/{ => latincompass}/latinpadble/config.h             | 0
 keyboards/{ => latincompass}/latinpadble/info.json            | 0
 .../{ => latincompass}/latinpadble/keymaps/default/keymap.c   | 0
 keyboards/{ => latincompass}/latinpadble/keymaps/via/keymap.c | 0
 keyboards/{ => latincompass}/latinpadble/keymaps/via/rules.mk | 0
 keyboards/{ => latincompass}/latinpadble/latinpadble.c        | 0
 keyboards/{ => latincompass}/latinpadble/latinpadble.h        | 0
 keyboards/{ => latincompass}/latinpadble/lib/glcdfont.c       | 0
 keyboards/{ => latincompass}/latinpadble/readme.md            | 2 +-
 keyboards/{ => latincompass}/latinpadble/rules.mk             | 0
 65 files changed, 8 insertions(+), 8 deletions(-)
 rename keyboards/{ => latincompass}/latin17rgb/config.h (100%)
 rename keyboards/{ => latincompass}/latin17rgb/info.json (100%)
 rename keyboards/{ => latincompass}/latin17rgb/keymaps/default/keymap.c (100%)
 rename keyboards/{ => latincompass}/latin17rgb/keymaps/via/keymap.c (100%)
 rename keyboards/{ => latincompass}/latin17rgb/keymaps/via/rules.mk (100%)
 rename keyboards/{ => latincompass}/latin17rgb/latin17rgb.c (100%)
 rename keyboards/{ => latincompass}/latin17rgb/latin17rgb.h (100%)
 rename keyboards/{ => latincompass}/latin17rgb/readme.md (89%)
 rename keyboards/{ => latincompass}/latin17rgb/rules.mk (100%)
 rename keyboards/{ => latincompass}/latin47ble/config.h (100%)
 rename keyboards/{ => latincompass}/latin47ble/info.json (100%)
 rename keyboards/{ => latincompass}/latin47ble/keymaps/default/keymap.c (100%)
 rename keyboards/{ => latincompass}/latin47ble/keymaps/via/keymap.c (100%)
 rename keyboards/{ => latincompass}/latin47ble/keymaps/via/rules.mk (100%)
 rename keyboards/{ => latincompass}/latin47ble/latin47ble.c (100%)
 rename keyboards/{ => latincompass}/latin47ble/latin47ble.h (100%)
 rename keyboards/{ => latincompass}/latin47ble/readme.md (93%)
 rename keyboards/{ => latincompass}/latin47ble/rules.mk (100%)
 rename keyboards/{ => latincompass}/latin60rgb/config.h (100%)
 rename keyboards/{ => latincompass}/latin60rgb/info.json (100%)
 rename keyboards/{ => latincompass}/latin60rgb/keymaps/default/keymap.c (100%)
 rename keyboards/{ => latincompass}/latin60rgb/keymaps/via/keymap.c (100%)
 rename keyboards/{ => latincompass}/latin60rgb/keymaps/via/rules.mk (100%)
 rename keyboards/{ => latincompass}/latin60rgb/latin60rgb.c (100%)
 rename keyboards/{ => latincompass}/latin60rgb/latin60rgb.h (100%)
 rename keyboards/{ => latincompass}/latin60rgb/readme.md (94%)
 rename keyboards/{ => latincompass}/latin60rgb/rules.mk (100%)
 rename keyboards/{ => latincompass}/latin64ble/config.h (100%)
 rename keyboards/{ => latincompass}/latin64ble/info.json (100%)
 rename keyboards/{ => latincompass}/latin64ble/keymaps/default/keymap.c (100%)
 rename keyboards/{ => latincompass}/latin64ble/keymaps/via/keymap.c (100%)
 rename keyboards/{ => latincompass}/latin64ble/keymaps/via/rules.mk (100%)
 rename keyboards/{ => latincompass}/latin64ble/latin64ble.c (100%)
 rename keyboards/{ => latincompass}/latin64ble/latin64ble.h (100%)
 rename keyboards/{ => latincompass}/latin64ble/readme.md (93%)
 rename keyboards/{ => latincompass}/latin64ble/rules.mk (100%)
 rename keyboards/{ => latincompass}/latin6rgb/config.h (100%)
 rename keyboards/{ => latincompass}/latin6rgb/info.json (100%)
 rename keyboards/{ => latincompass}/latin6rgb/keymaps/default/keymap.c (100%)
 rename keyboards/{ => latincompass}/latin6rgb/keymaps/via/keymap.c (100%)
 rename keyboards/{ => latincompass}/latin6rgb/keymaps/via/rules.mk (100%)
 rename keyboards/{ => latincompass}/latin6rgb/latin6rgb.c (100%)
 rename keyboards/{ => latincompass}/latin6rgb/latin6rgb.h (100%)
 rename keyboards/{ => latincompass}/latin6rgb/readme.md (93%)
 rename keyboards/{ => latincompass}/latin6rgb/rules.mk (100%)
 rename keyboards/{ => latincompass}/latinpad/config.h (100%)
 rename keyboards/{ => latincompass}/latinpad/info.json (100%)
 rename keyboards/{ => latincompass}/latinpad/keymaps/default/keymap.c (100%)
 rename keyboards/{ => latincompass}/latinpad/keymaps/via/keymap.c (100%)
 rename keyboards/{ => latincompass}/latinpad/keymaps/via/rules.mk (100%)
 rename keyboards/{ => latincompass}/latinpad/latinpad.c (100%)
 rename keyboards/{ => latincompass}/latinpad/latinpad.h (100%)
 rename keyboards/{ => latincompass}/latinpad/lib/glcdfont.c (100%)
 rename keyboards/{ => latincompass}/latinpad/readme.md (94%)
 rename keyboards/{ => latincompass}/latinpad/rules.mk (100%)
 rename keyboards/{ => latincompass}/latinpadble/config.h (100%)
 rename keyboards/{ => latincompass}/latinpadble/info.json (100%)
 rename keyboards/{ => latincompass}/latinpadble/keymaps/default/keymap.c (100%)
 rename keyboards/{ => latincompass}/latinpadble/keymaps/via/keymap.c (100%)
 rename keyboards/{ => latincompass}/latinpadble/keymaps/via/rules.mk (100%)
 rename keyboards/{ => latincompass}/latinpadble/latinpadble.c (100%)
 rename keyboards/{ => latincompass}/latinpadble/latinpadble.h (100%)
 rename keyboards/{ => latincompass}/latinpadble/lib/glcdfont.c (100%)
 rename keyboards/{ => latincompass}/latinpadble/readme.md (94%)
 rename keyboards/{ => latincompass}/latinpadble/rules.mk (100%)

diff --git a/keyboards/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
similarity index 100%
rename from keyboards/latin17rgb/config.h
rename to keyboards/latincompass/latin17rgb/config.h
diff --git a/keyboards/latin17rgb/info.json b/keyboards/latincompass/latin17rgb/info.json
similarity index 100%
rename from keyboards/latin17rgb/info.json
rename to keyboards/latincompass/latin17rgb/info.json
diff --git a/keyboards/latin17rgb/keymaps/default/keymap.c b/keyboards/latincompass/latin17rgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latin17rgb/keymaps/default/keymap.c
rename to keyboards/latincompass/latin17rgb/keymaps/default/keymap.c
diff --git a/keyboards/latin17rgb/keymaps/via/keymap.c b/keyboards/latincompass/latin17rgb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latin17rgb/keymaps/via/keymap.c
rename to keyboards/latincompass/latin17rgb/keymaps/via/keymap.c
diff --git a/keyboards/latin17rgb/keymaps/via/rules.mk b/keyboards/latincompass/latin17rgb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latin17rgb/keymaps/via/rules.mk
rename to keyboards/latincompass/latin17rgb/keymaps/via/rules.mk
diff --git a/keyboards/latin17rgb/latin17rgb.c b/keyboards/latincompass/latin17rgb/latin17rgb.c
similarity index 100%
rename from keyboards/latin17rgb/latin17rgb.c
rename to keyboards/latincompass/latin17rgb/latin17rgb.c
diff --git a/keyboards/latin17rgb/latin17rgb.h b/keyboards/latincompass/latin17rgb/latin17rgb.h
similarity index 100%
rename from keyboards/latin17rgb/latin17rgb.h
rename to keyboards/latincompass/latin17rgb/latin17rgb.h
diff --git a/keyboards/latin17rgb/readme.md b/keyboards/latincompass/latin17rgb/readme.md
similarity index 89%
rename from keyboards/latin17rgb/readme.md
rename to keyboards/latincompass/latin17rgb/readme.md
index 775055f27a..aa7095b5d6 100644
--- a/keyboards/latin17rgb/readme.md
+++ b/keyboards/latincompass/latin17rgb/readme.md
@@ -9,11 +9,11 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latin17rgb:default
+    make latincompass/latin17rgb:default
 
 Flashing example for this keyboard:
 
-    make latin17rgb:default:flash
+    make latincompass/latin17rgb:default:flash
 
 To reset the board into bootloader mode, hold the key at the top left of the keyboard while connecting the USB cable (also erases persistent settings).
 
diff --git a/keyboards/latin17rgb/rules.mk b/keyboards/latincompass/latin17rgb/rules.mk
similarity index 100%
rename from keyboards/latin17rgb/rules.mk
rename to keyboards/latincompass/latin17rgb/rules.mk
diff --git a/keyboards/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h
similarity index 100%
rename from keyboards/latin47ble/config.h
rename to keyboards/latincompass/latin47ble/config.h
diff --git a/keyboards/latin47ble/info.json b/keyboards/latincompass/latin47ble/info.json
similarity index 100%
rename from keyboards/latin47ble/info.json
rename to keyboards/latincompass/latin47ble/info.json
diff --git a/keyboards/latin47ble/keymaps/default/keymap.c b/keyboards/latincompass/latin47ble/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latin47ble/keymaps/default/keymap.c
rename to keyboards/latincompass/latin47ble/keymaps/default/keymap.c
diff --git a/keyboards/latin47ble/keymaps/via/keymap.c b/keyboards/latincompass/latin47ble/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latin47ble/keymaps/via/keymap.c
rename to keyboards/latincompass/latin47ble/keymaps/via/keymap.c
diff --git a/keyboards/latin47ble/keymaps/via/rules.mk b/keyboards/latincompass/latin47ble/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latin47ble/keymaps/via/rules.mk
rename to keyboards/latincompass/latin47ble/keymaps/via/rules.mk
diff --git a/keyboards/latin47ble/latin47ble.c b/keyboards/latincompass/latin47ble/latin47ble.c
similarity index 100%
rename from keyboards/latin47ble/latin47ble.c
rename to keyboards/latincompass/latin47ble/latin47ble.c
diff --git a/keyboards/latin47ble/latin47ble.h b/keyboards/latincompass/latin47ble/latin47ble.h
similarity index 100%
rename from keyboards/latin47ble/latin47ble.h
rename to keyboards/latincompass/latin47ble/latin47ble.h
diff --git a/keyboards/latin47ble/readme.md b/keyboards/latincompass/latin47ble/readme.md
similarity index 93%
rename from keyboards/latin47ble/readme.md
rename to keyboards/latincompass/latin47ble/readme.md
index cc8e9e6a34..f03a15d826 100644
--- a/keyboards/latin47ble/readme.md
+++ b/keyboards/latincompass/latin47ble/readme.md
@@ -9,6 +9,6 @@ macro 47 ble 4.0 RGB keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latin47ble:default
+    make latincompass/latin47ble: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).
diff --git a/keyboards/latin47ble/rules.mk b/keyboards/latincompass/latin47ble/rules.mk
similarity index 100%
rename from keyboards/latin47ble/rules.mk
rename to keyboards/latincompass/latin47ble/rules.mk
diff --git a/keyboards/latin60rgb/config.h b/keyboards/latincompass/latin60rgb/config.h
similarity index 100%
rename from keyboards/latin60rgb/config.h
rename to keyboards/latincompass/latin60rgb/config.h
diff --git a/keyboards/latin60rgb/info.json b/keyboards/latincompass/latin60rgb/info.json
similarity index 100%
rename from keyboards/latin60rgb/info.json
rename to keyboards/latincompass/latin60rgb/info.json
diff --git a/keyboards/latin60rgb/keymaps/default/keymap.c b/keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latin60rgb/keymaps/default/keymap.c
rename to keyboards/latincompass/latin60rgb/keymaps/default/keymap.c
diff --git a/keyboards/latin60rgb/keymaps/via/keymap.c b/keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latin60rgb/keymaps/via/keymap.c
rename to keyboards/latincompass/latin60rgb/keymaps/via/keymap.c
diff --git a/keyboards/latin60rgb/keymaps/via/rules.mk b/keyboards/latincompass/latin60rgb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latin60rgb/keymaps/via/rules.mk
rename to keyboards/latincompass/latin60rgb/keymaps/via/rules.mk
diff --git a/keyboards/latin60rgb/latin60rgb.c b/keyboards/latincompass/latin60rgb/latin60rgb.c
similarity index 100%
rename from keyboards/latin60rgb/latin60rgb.c
rename to keyboards/latincompass/latin60rgb/latin60rgb.c
diff --git a/keyboards/latin60rgb/latin60rgb.h b/keyboards/latincompass/latin60rgb/latin60rgb.h
similarity index 100%
rename from keyboards/latin60rgb/latin60rgb.h
rename to keyboards/latincompass/latin60rgb/latin60rgb.h
diff --git a/keyboards/latin60rgb/readme.md b/keyboards/latincompass/latin60rgb/readme.md
similarity index 94%
rename from keyboards/latin60rgb/readme.md
rename to keyboards/latincompass/latin60rgb/readme.md
index 3b5715c2da..ae855bc8c1 100644
--- a/keyboards/latin60rgb/readme.md
+++ b/keyboards/latincompass/latin60rgb/readme.md
@@ -9,6 +9,6 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latin60rgb:default
+    make latincompass/latin60rgb: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).
diff --git a/keyboards/latin60rgb/rules.mk b/keyboards/latincompass/latin60rgb/rules.mk
similarity index 100%
rename from keyboards/latin60rgb/rules.mk
rename to keyboards/latincompass/latin60rgb/rules.mk
diff --git a/keyboards/latin64ble/config.h b/keyboards/latincompass/latin64ble/config.h
similarity index 100%
rename from keyboards/latin64ble/config.h
rename to keyboards/latincompass/latin64ble/config.h
diff --git a/keyboards/latin64ble/info.json b/keyboards/latincompass/latin64ble/info.json
similarity index 100%
rename from keyboards/latin64ble/info.json
rename to keyboards/latincompass/latin64ble/info.json
diff --git a/keyboards/latin64ble/keymaps/default/keymap.c b/keyboards/latincompass/latin64ble/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latin64ble/keymaps/default/keymap.c
rename to keyboards/latincompass/latin64ble/keymaps/default/keymap.c
diff --git a/keyboards/latin64ble/keymaps/via/keymap.c b/keyboards/latincompass/latin64ble/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latin64ble/keymaps/via/keymap.c
rename to keyboards/latincompass/latin64ble/keymaps/via/keymap.c
diff --git a/keyboards/latin64ble/keymaps/via/rules.mk b/keyboards/latincompass/latin64ble/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latin64ble/keymaps/via/rules.mk
rename to keyboards/latincompass/latin64ble/keymaps/via/rules.mk
diff --git a/keyboards/latin64ble/latin64ble.c b/keyboards/latincompass/latin64ble/latin64ble.c
similarity index 100%
rename from keyboards/latin64ble/latin64ble.c
rename to keyboards/latincompass/latin64ble/latin64ble.c
diff --git a/keyboards/latin64ble/latin64ble.h b/keyboards/latincompass/latin64ble/latin64ble.h
similarity index 100%
rename from keyboards/latin64ble/latin64ble.h
rename to keyboards/latincompass/latin64ble/latin64ble.h
diff --git a/keyboards/latin64ble/readme.md b/keyboards/latincompass/latin64ble/readme.md
similarity index 93%
rename from keyboards/latin64ble/readme.md
rename to keyboards/latincompass/latin64ble/readme.md
index 98f5e50a69..d8ee92d16d 100644
--- a/keyboards/latin64ble/readme.md
+++ b/keyboards/latincompass/latin64ble/readme.md
@@ -9,6 +9,6 @@ macro 64 ble 4.0 RGB keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latin64ble:default
+    make latincompass/latin64ble: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).
diff --git a/keyboards/latin64ble/rules.mk b/keyboards/latincompass/latin64ble/rules.mk
similarity index 100%
rename from keyboards/latin64ble/rules.mk
rename to keyboards/latincompass/latin64ble/rules.mk
diff --git a/keyboards/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
similarity index 100%
rename from keyboards/latin6rgb/config.h
rename to keyboards/latincompass/latin6rgb/config.h
diff --git a/keyboards/latin6rgb/info.json b/keyboards/latincompass/latin6rgb/info.json
similarity index 100%
rename from keyboards/latin6rgb/info.json
rename to keyboards/latincompass/latin6rgb/info.json
diff --git a/keyboards/latin6rgb/keymaps/default/keymap.c b/keyboards/latincompass/latin6rgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latin6rgb/keymaps/default/keymap.c
rename to keyboards/latincompass/latin6rgb/keymaps/default/keymap.c
diff --git a/keyboards/latin6rgb/keymaps/via/keymap.c b/keyboards/latincompass/latin6rgb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latin6rgb/keymaps/via/keymap.c
rename to keyboards/latincompass/latin6rgb/keymaps/via/keymap.c
diff --git a/keyboards/latin6rgb/keymaps/via/rules.mk b/keyboards/latincompass/latin6rgb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latin6rgb/keymaps/via/rules.mk
rename to keyboards/latincompass/latin6rgb/keymaps/via/rules.mk
diff --git a/keyboards/latin6rgb/latin6rgb.c b/keyboards/latincompass/latin6rgb/latin6rgb.c
similarity index 100%
rename from keyboards/latin6rgb/latin6rgb.c
rename to keyboards/latincompass/latin6rgb/latin6rgb.c
diff --git a/keyboards/latin6rgb/latin6rgb.h b/keyboards/latincompass/latin6rgb/latin6rgb.h
similarity index 100%
rename from keyboards/latin6rgb/latin6rgb.h
rename to keyboards/latincompass/latin6rgb/latin6rgb.h
diff --git a/keyboards/latin6rgb/readme.md b/keyboards/latincompass/latin6rgb/readme.md
similarity index 93%
rename from keyboards/latin6rgb/readme.md
rename to keyboards/latincompass/latin6rgb/readme.md
index 5338f1625c..24d340a510 100644
--- a/keyboards/latin6rgb/readme.md
+++ b/keyboards/latincompass/latin6rgb/readme.md
@@ -9,6 +9,6 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latin6rgb:default
+    make latincompass/latin6rgb: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).
diff --git a/keyboards/latin6rgb/rules.mk b/keyboards/latincompass/latin6rgb/rules.mk
similarity index 100%
rename from keyboards/latin6rgb/rules.mk
rename to keyboards/latincompass/latin6rgb/rules.mk
diff --git a/keyboards/latinpad/config.h b/keyboards/latincompass/latinpad/config.h
similarity index 100%
rename from keyboards/latinpad/config.h
rename to keyboards/latincompass/latinpad/config.h
diff --git a/keyboards/latinpad/info.json b/keyboards/latincompass/latinpad/info.json
similarity index 100%
rename from keyboards/latinpad/info.json
rename to keyboards/latincompass/latinpad/info.json
diff --git a/keyboards/latinpad/keymaps/default/keymap.c b/keyboards/latincompass/latinpad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latinpad/keymaps/default/keymap.c
rename to keyboards/latincompass/latinpad/keymaps/default/keymap.c
diff --git a/keyboards/latinpad/keymaps/via/keymap.c b/keyboards/latincompass/latinpad/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latinpad/keymaps/via/keymap.c
rename to keyboards/latincompass/latinpad/keymaps/via/keymap.c
diff --git a/keyboards/latinpad/keymaps/via/rules.mk b/keyboards/latincompass/latinpad/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latinpad/keymaps/via/rules.mk
rename to keyboards/latincompass/latinpad/keymaps/via/rules.mk
diff --git a/keyboards/latinpad/latinpad.c b/keyboards/latincompass/latinpad/latinpad.c
similarity index 100%
rename from keyboards/latinpad/latinpad.c
rename to keyboards/latincompass/latinpad/latinpad.c
diff --git a/keyboards/latinpad/latinpad.h b/keyboards/latincompass/latinpad/latinpad.h
similarity index 100%
rename from keyboards/latinpad/latinpad.h
rename to keyboards/latincompass/latinpad/latinpad.h
diff --git a/keyboards/latinpad/lib/glcdfont.c b/keyboards/latincompass/latinpad/lib/glcdfont.c
similarity index 100%
rename from keyboards/latinpad/lib/glcdfont.c
rename to keyboards/latincompass/latinpad/lib/glcdfont.c
diff --git a/keyboards/latinpad/readme.md b/keyboards/latincompass/latinpad/readme.md
similarity index 94%
rename from keyboards/latinpad/readme.md
rename to keyboards/latincompass/latinpad/readme.md
index 620bf64301..6fcd0f3a01 100644
--- a/keyboards/latinpad/readme.md
+++ b/keyboards/latincompass/latinpad/readme.md
@@ -9,6 +9,6 @@ macro 2 rotary encoder pad
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latinpad:default
+    make latincompass/latinpad: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).
diff --git a/keyboards/latinpad/rules.mk b/keyboards/latincompass/latinpad/rules.mk
similarity index 100%
rename from keyboards/latinpad/rules.mk
rename to keyboards/latincompass/latinpad/rules.mk
diff --git a/keyboards/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h
similarity index 100%
rename from keyboards/latinpadble/config.h
rename to keyboards/latincompass/latinpadble/config.h
diff --git a/keyboards/latinpadble/info.json b/keyboards/latincompass/latinpadble/info.json
similarity index 100%
rename from keyboards/latinpadble/info.json
rename to keyboards/latincompass/latinpadble/info.json
diff --git a/keyboards/latinpadble/keymaps/default/keymap.c b/keyboards/latincompass/latinpadble/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/latinpadble/keymaps/default/keymap.c
rename to keyboards/latincompass/latinpadble/keymaps/default/keymap.c
diff --git a/keyboards/latinpadble/keymaps/via/keymap.c b/keyboards/latincompass/latinpadble/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/latinpadble/keymaps/via/keymap.c
rename to keyboards/latincompass/latinpadble/keymaps/via/keymap.c
diff --git a/keyboards/latinpadble/keymaps/via/rules.mk b/keyboards/latincompass/latinpadble/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/latinpadble/keymaps/via/rules.mk
rename to keyboards/latincompass/latinpadble/keymaps/via/rules.mk
diff --git a/keyboards/latinpadble/latinpadble.c b/keyboards/latincompass/latinpadble/latinpadble.c
similarity index 100%
rename from keyboards/latinpadble/latinpadble.c
rename to keyboards/latincompass/latinpadble/latinpadble.c
diff --git a/keyboards/latinpadble/latinpadble.h b/keyboards/latincompass/latinpadble/latinpadble.h
similarity index 100%
rename from keyboards/latinpadble/latinpadble.h
rename to keyboards/latincompass/latinpadble/latinpadble.h
diff --git a/keyboards/latinpadble/lib/glcdfont.c b/keyboards/latincompass/latinpadble/lib/glcdfont.c
similarity index 100%
rename from keyboards/latinpadble/lib/glcdfont.c
rename to keyboards/latincompass/latinpadble/lib/glcdfont.c
diff --git a/keyboards/latinpadble/readme.md b/keyboards/latincompass/latinpadble/readme.md
similarity index 94%
rename from keyboards/latinpadble/readme.md
rename to keyboards/latincompass/latinpadble/readme.md
index 324a28febf..2e1e6dbb8c 100644
--- a/keyboards/latinpadble/readme.md
+++ b/keyboards/latincompass/latinpadble/readme.md
@@ -9,6 +9,6 @@ Panasonic rotary encoder BLE pad
 
 Make example for this keyboard (after setting up your build environment):
 
-    make latinpadble:default
+    make latincompass/latinpadble: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).
diff --git a/keyboards/latinpadble/rules.mk b/keyboards/latincompass/latinpadble/rules.mk
similarity index 100%
rename from keyboards/latinpadble/rules.mk
rename to keyboards/latincompass/latinpadble/rules.mk

From 63c310f6fd205e6332d69a718b2a295ee7792675 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 11 Feb 2022 11:19:18 +1100
Subject: [PATCH 603/867] Add 65_iso_split_bs default layout (#16283)

---
 .../default_65_iso_split_bs/keymap.c          | 24 ++++++
 layouts/default/65_iso_split_bs/info.json     | 85 +++++++++++++++++++
 layouts/default/65_iso_split_bs/layout.json   |  5 ++
 layouts/default/65_iso_split_bs/readme.md     |  3 +
 layouts/default/readme.md                     | 15 ++++
 5 files changed, 132 insertions(+)
 create mode 100644 layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c
 create mode 100644 layouts/default/65_iso_split_bs/info.json
 create mode 100644 layouts/default/65_iso_split_bs/layout.json
 create mode 100644 layouts/default/65_iso_split_bs/readme.md

diff --git a/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c b/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c
new file mode 100644
index 0000000000..6fa642b43d
--- /dev/null
+++ b/layouts/default/65_iso_split_bs/default_65_iso_split_bs/keymap.c
@@ -0,0 +1,24 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = |Bsp|Bsp|Hom│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │PgU│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PgD│
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+     * │Ctrl│GUI │Alt │                        │Alt│GUI│Ctl│ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_65_iso(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,  KC_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/layouts/default/65_iso_split_bs/info.json b/layouts/default/65_iso_split_bs/info.json
new file mode 100644
index 0000000000..5cd5861b35
--- /dev/null
+++ b/layouts/default/65_iso_split_bs/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "65% ISO layout with split Backspace",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_65_iso_split_bs": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/layouts/default/65_iso_split_bs/layout.json b/layouts/default/65_iso_split_bs/layout.json
new file mode 100644
index 0000000000..cf13c3a100
--- /dev/null
+++ b/layouts/default/65_iso_split_bs/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","","","",""],
+[{w:1.5},"","","","","","","","","","","","","",{x:0.25,w:1.25,h:2,w2:1.5,h2:1,x2:-0.25},"",""],
+[{w:1.75},"","","","","","","","","","","","","",{x:1.25},""],
+[{w:1.25},"","","","","","","","","","","","",{w:1.75},"","",""],
+[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","",""]
diff --git a/layouts/default/65_iso_split_bs/readme.md b/layouts/default/65_iso_split_bs/readme.md
new file mode 100644
index 0000000000..b80f03e68a
--- /dev/null
+++ b/layouts/default/65_iso_split_bs/readme.md
@@ -0,0 +1,3 @@
+# 65_iso_split_bs
+
+    LAYOUT_65_iso_split_bs
diff --git a/layouts/default/readme.md b/layouts/default/readme.md
index 1601b95c0f..648afcd70b 100644
--- a/layouts/default/readme.md
+++ b/layouts/default/readme.md
@@ -321,6 +321,21 @@ LAYOUT_65_iso_blocker_split_bs
 └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
 ```
 
+```
+LAYOUT_65_iso_split_bs
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
+│      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+│        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+│    │    │    │                        │   │   │   │   │   │   │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+```
+
 ```
 LAYOUT_66_ansi
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐

From 2bc4a216dfbb83a6d2b57da397d370210087cff5 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 11 Feb 2022 13:31:19 +1100
Subject: [PATCH 604/867] maxr1998/pulse4k: Move Combo code to keymap level
 (#16301)

* maxr1998/pulse4k: Move Combo code to keymap level

* Reorder code
---
 .../maxr1998/pulse4k/keymaps/default/keymap.c | 40 +++++++++++++++++++
 .../maxr1998/pulse4k/keymaps/default/rules.mk |  1 +
 .../pulse4k/keymaps/maxr1998/keymap.c         | 40 +++++++++++++++++++
 .../pulse4k/keymaps/maxr1998/rules.mk         |  1 +
 keyboards/maxr1998/pulse4k/pulse4k.c          | 36 ++---------------
 keyboards/maxr1998/pulse4k/rules.mk           |  1 -
 6 files changed, 85 insertions(+), 34 deletions(-)
 create mode 100644 keyboards/maxr1998/pulse4k/keymaps/default/rules.mk
 create mode 100644 keyboards/maxr1998/pulse4k/keymaps/maxr1998/rules.mk

diff --git a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
index 1ed4b5f1af..243a96ba74 100644
--- a/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
+++ b/keyboards/maxr1998/pulse4k/keymaps/default/keymap.c
@@ -21,6 +21,10 @@ enum layers {
     DEFAULT
 };
 
+enum combo_events {
+    LED_ADJUST
+};
+
 const uint16_t PROGMEM led_adjust_combo[] = {KC_LEFT, KC_RGHT, COMBO_END};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -29,3 +33,39 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
+
+combo_t key_combos[COMBO_COUNT] = {
+    [LED_ADJUST] = COMBO_ACTION(led_adjust_combo)
+};
+
+bool led_adjust_active = false;
+
+void process_combo_event(uint16_t combo_index, bool pressed) {
+    if (combo_index == LED_ADJUST) {
+        led_adjust_active = pressed;
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (led_adjust_active) {
+            if (clockwise) {
+                rgblight_increase_val();
+            } else {
+                rgblight_decrease_val();
+            }
+            return false;
+        }
+    } else if (index == 1) {
+        if (led_adjust_active) {
+            if (clockwise) {
+                rgblight_increase_hue();
+            } else {
+                rgblight_decrease_hue();
+            }
+            return false;
+        }
+    }
+
+    return true;
+}
diff --git a/keyboards/maxr1998/pulse4k/keymaps/default/rules.mk b/keyboards/maxr1998/pulse4k/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/maxr1998/pulse4k/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c
index 9eec3f0ae7..2aad1fa346 100644
--- a/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c
+++ b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/keymap.c
@@ -21,6 +21,10 @@ enum layers {
     DEFAULT
 };
 
+enum combo_events {
+    LED_ADJUST
+};
+
 const uint16_t PROGMEM led_adjust_combo[] = {KC_F22, KC_F24, COMBO_END};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -30,6 +34,42 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     )
 };
 
+combo_t key_combos[COMBO_COUNT] = {
+    [LED_ADJUST] = COMBO_ACTION(led_adjust_combo)
+};
+
+bool led_adjust_active = false;
+
+void process_combo_event(uint16_t combo_index, bool pressed) {
+    if (combo_index == LED_ADJUST) {
+        led_adjust_active = pressed;
+    }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (led_adjust_active) {
+            if (clockwise) {
+                rgblight_increase_val();
+            } else {
+                rgblight_decrease_val();
+            }
+            return false;
+        }
+    } else if (index == 1) {
+        if (led_adjust_active) {
+            if (clockwise) {
+                rgblight_increase_hue();
+            } else {
+                rgblight_decrease_hue();
+            }
+            return false;
+        }
+    }
+
+    return true;
+}
+
 void encoder_one_update(bool clockwise) {
     tap_code(!clockwise ? KC_F18 : KC_F19);
 }
diff --git a/keyboards/maxr1998/pulse4k/keymaps/maxr1998/rules.mk b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/maxr1998/pulse4k/keymaps/maxr1998/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/maxr1998/pulse4k/pulse4k.c b/keyboards/maxr1998/pulse4k/pulse4k.c
index 21bbe5d68e..f31eb6db37 100644
--- a/keyboards/maxr1998/pulse4k/pulse4k.c
+++ b/keyboards/maxr1998/pulse4k/pulse4k.c
@@ -16,44 +16,14 @@
  */
 
 #include "pulse4k.h"
-#include "rgblight.h"
-
-enum combo_events {
-    LED_ADJUST
-};
-
-extern const uint16_t PROGMEM led_adjust_combo[3];
-
-combo_t key_combos[COMBO_COUNT] = {
-    [LED_ADJUST] = COMBO_ACTION(led_adjust_combo)
-};
-
-bool led_adjust_active = false;
-
-void process_combo_event(uint16_t combo_index, bool pressed) {
-    if (combo_index == LED_ADJUST) {
-        led_adjust_active = pressed;
-    }
-}
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) return false;
+
     if (index == 0) {
-        if (led_adjust_active) {
-            if (clockwise) {
-                rgblight_increase_val();
-            } else {
-                rgblight_decrease_val();
-            }
-        } else encoder_one_update(clockwise);
+        encoder_one_update(clockwise);
     } else if (index == 1) {
-        if (led_adjust_active) {
-            if (clockwise) {
-                rgblight_increase_hue();
-            } else {
-                rgblight_decrease_hue();
-            }
-        } else encoder_two_update(clockwise);
+        encoder_two_update(clockwise);
     }
     return true;
 }
diff --git a/keyboards/maxr1998/pulse4k/rules.mk b/keyboards/maxr1998/pulse4k/rules.mk
index 3cfa6867a8..5533ac6f35 100644
--- a/keyboards/maxr1998/pulse4k/rules.mk
+++ b/keyboards/maxr1998/pulse4k/rules.mk
@@ -13,7 +13,6 @@ ENCODER_ENABLE = yes       # Rotary encoders
 EXTRAKEY_ENABLE = yes      # Audio control and System control
 CONSOLE_ENABLE = yes       # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
-COMBO_ENABLE = yes         # Key combo feature
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no          # Audio output

From 89fc2f166fd43808a00769aba68ce64890e31570 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 11 Feb 2022 14:37:41 +1100
Subject: [PATCH 605/867] mechlovin/kay60: fix mismatched layout name (#16314)

---
 keyboards/mechlovin/kay60/info.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/info.json
index 513dcef12f..adcbc594d4 100644
--- a/keyboards/mechlovin/kay60/info.json
+++ b/keyboards/mechlovin/kay60/info.json
@@ -74,7 +74,7 @@
                 {"x": 13.75, "y": 4, "w": 1.25}
             ]
         },
-        "LAYOUT_ansi": {
+        "LAYOUT_60_ansi": {
             "layout": [
                 {"x": 0, "y": 0},
                 {"x": 1, "y": 0},

From 793f54f6ca5e844319f7e082b84fb4ca375bd9de Mon Sep 17 00:00:00 2001
From: Idan Kamara <i@idank.me>
Date: Fri, 11 Feb 2022 11:36:26 +0200
Subject: [PATCH 606/867] ps2/avr: use the correct file name (#16316)

This was missed in https://github.com/qmk/qmk_firmware/pull/14895.

Thanks to fauxpark for spotting this.
---
 builddefs/common_features.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index 7ff19e8084..db9b580286 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -707,7 +707,7 @@ endif
 ifeq ($(strip $(PS2_USE_BUSYWAIT)), yes)
     PS2_ENABLE := yes
     SRC += ps2_busywait.c
-    SRC += ps2_io_avr.c
+    SRC += ps2_io.c
     OPT_DEFS += -DPS2_USE_BUSYWAIT
 endif
 

From 5f10387c41b63f022dc4169a29b3b4fa0e9721a9 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 11 Feb 2022 23:37:36 +1100
Subject: [PATCH 607/867] handwired/promethium: fix missing include (#16317)

---
 keyboards/handwired/promethium/promethium.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/handwired/promethium/promethium.h b/keyboards/handwired/promethium/promethium.h
index c4c90176b5..e40d67e9fd 100644
--- a/keyboards/handwired/promethium/promethium.h
+++ b/keyboards/handwired/promethium/promethium.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <stdint.h>
+#include "quantum.h"
 
 void battery_poll(uint8_t level);
 void led_set_kb(uint8_t usb_led);

From 39bec3bfa5ff63ee99f0fd15293967fd8655a154 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 11 Feb 2022 19:01:16 +0000
Subject: [PATCH 608/867] Various fixes for matrix _RIGHT handling (#16292)

* Various fixes for matrix _RIGHT handling

* clang
---
 quantum/matrix.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/quantum/matrix.c b/quantum/matrix.c
index 244c4d08b0..0b16184e12 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -47,13 +47,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #ifdef DIRECT_PINS
-static SPLIT_MUTABLE pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
+static SPLIT_MUTABLE pin_t direct_pins[ROWS_PER_HAND][MATRIX_COLS] = DIRECT_PINS;
 #elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
 #    ifdef MATRIX_ROW_PINS
-static SPLIT_MUTABLE_ROW pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static SPLIT_MUTABLE_ROW pin_t row_pins[ROWS_PER_HAND] = MATRIX_ROW_PINS;
 #    endif  // MATRIX_ROW_PINS
 #    ifdef MATRIX_COL_PINS
-static SPLIT_MUTABLE_COL pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+static SPLIT_MUTABLE_COL pin_t col_pins[MATRIX_COLS]   = MATRIX_COL_PINS;
 #    endif  // MATRIX_COL_PINS
 #endif
 
@@ -102,7 +102,7 @@ static inline uint8_t readMatrixPin(pin_t pin) {
 #ifdef DIRECT_PINS
 
 __attribute__((weak)) void matrix_init_pins(void) {
-    for (int row = 0; row < MATRIX_ROWS; row++) {
+    for (int row = 0; row < ROWS_PER_HAND; row++) {
         for (int col = 0; col < MATRIX_COLS; col++) {
             pin_t pin = direct_pins[row][col];
             if (pin != NO_PIN) {
@@ -270,16 +270,16 @@ void matrix_init(void) {
     // Set pinout for right half if pinout for that half is defined
     if (!isLeftHand) {
 #    ifdef DIRECT_PINS_RIGHT
-        const pin_t direct_pins_right[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS_RIGHT;
-        for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        const pin_t direct_pins_right[ROWS_PER_HAND][MATRIX_COLS] = DIRECT_PINS_RIGHT;
+        for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
             for (uint8_t j = 0; j < MATRIX_COLS; j++) {
                 direct_pins[i][j] = direct_pins_right[i][j];
             }
         }
 #    endif
 #    ifdef MATRIX_ROW_PINS_RIGHT
-        const pin_t row_pins_right[MATRIX_ROWS] = MATRIX_ROW_PINS_RIGHT;
-        for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        const pin_t row_pins_right[ROWS_PER_HAND] = MATRIX_ROW_PINS_RIGHT;
+        for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
             row_pins[i] = row_pins_right[i];
         }
 #    endif

From 7148a69d5ea7d75119c81cf9b7c579f3136c4fd3 Mon Sep 17 00:00:00 2001
From: precondition <57645186+precondition@users.noreply.github.com>
Date: Fri, 11 Feb 2022 20:53:26 +0100
Subject: [PATCH 609/867] Pass in the keyrecord_t of the dual-role/tapping key
 when calling per-key tap hold functions (#15938)

* Replace keyp by &tapping_key in the record arg of per-key tap hold funcs

* Replace NULL by &(keyrecord_t){} in 2nd arg of get_tapping_term
---
 quantum/action_tapping.c                    | 18 +++++++++---------
 quantum/pointing_device_drivers.c           |  2 +-
 quantum/process_keycode/process_tap_dance.c |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/quantum/action_tapping.c b/quantum/action_tapping.c
index d2c93f85e3..4ba38bee8d 100644
--- a/quantum/action_tapping.c
+++ b/quantum/action_tapping.c
@@ -124,7 +124,7 @@ bool process_tapping(keyrecord_t *keyp) {
 #    if defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)
             || (
 #        ifdef RETRO_TAPPING_PER_KEY
-                get_retro_tapping(tapping_keycode, keyp) &&
+                get_retro_tapping(tapping_keycode, &tapping_key) &&
 #        endif
                 (RETRO_SHIFT + 0) != 0 && TIMER_DIFF_16(event.time, tapping_key.event.time) < (RETRO_SHIFT + 0)
             )
@@ -158,7 +158,7 @@ bool process_tapping(keyrecord_t *keyp) {
                         (
                             (
 #        ifdef TAPPING_TERM_PER_KEY
-                                get_tapping_term(tapping_keycode, keyp)
+                                get_tapping_term(tapping_keycode, &tapping_key)
 #        else
                                 g_tapping_term
 #        endif
@@ -166,7 +166,7 @@ bool process_tapping(keyrecord_t *keyp) {
                             )
 
 #        ifdef PERMISSIVE_HOLD_PER_KEY
-                            || get_permissive_hold(tapping_keycode, keyp)
+                            || get_permissive_hold(tapping_keycode, &tapping_key)
 #        elif defined(PERMISSIVE_HOLD)
                             || true
 #        endif
@@ -177,7 +177,7 @@ bool process_tapping(keyrecord_t *keyp) {
 #        if defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)
                     || (
 #            ifdef RETRO_TAPPING_PER_KEY
-                        get_retro_tapping(tapping_keycode, keyp) &&
+                        get_retro_tapping(tapping_keycode, &tapping_key) &&
 #            endif
                         (
                             // Rolled over the two keys.
@@ -188,7 +188,7 @@ bool process_tapping(keyrecord_t *keyp) {
                                     || (
                                         IS_LT(tapping_keycode)
 #                ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-                                        && get_hold_on_other_key_press(tapping_keycode, keyp)
+                                        && get_hold_on_other_key_press(tapping_keycode, &tapping_key)
 #                endif
                                     )
 #            endif
@@ -196,7 +196,7 @@ bool process_tapping(keyrecord_t *keyp) {
                                     || (
                                         IS_MT(tapping_keycode)
 #                ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY
-                                        && !get_ignore_mod_tap_interrupt(tapping_keycode, keyp)
+                                        && !get_ignore_mod_tap_interrupt(tapping_keycode, &tapping_key)
 #                endif
                                     )
 #            endif
@@ -252,7 +252,7 @@ bool process_tapping(keyrecord_t *keyp) {
                         tapping_key.tap.interrupted = true;
 #    if defined(HOLD_ON_OTHER_KEY_PRESS) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
 #        if defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
-                        if (get_hold_on_other_key_press(tapping_keycode, keyp))
+                        if (get_hold_on_other_key_press(tapping_keycode, &tapping_key))
 #        endif
                         {
                             debug("Tapping: End. No tap. Interfered by pressed key\n");
@@ -360,7 +360,7 @@ bool process_tapping(keyrecord_t *keyp) {
 #    if defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)
             || (
 #        ifdef RETRO_TAPPING_PER_KEY
-                get_retro_tapping(tapping_keycode, keyp) &&
+                get_retro_tapping(tapping_keycode, &tapping_key) &&
 #        endif
                 (RETRO_SHIFT + 0) != 0 && TIMER_DIFF_16(event.time, tapping_key.event.time) < (RETRO_SHIFT + 0)
             )
@@ -373,7 +373,7 @@ bool process_tapping(keyrecord_t *keyp) {
 #    if !defined(TAPPING_FORCE_HOLD) || defined(TAPPING_FORCE_HOLD_PER_KEY)
                     if (
 #        ifdef TAPPING_FORCE_HOLD_PER_KEY
-                        !get_tapping_force_hold(tapping_keycode, keyp) &&
+                        !get_tapping_force_hold(tapping_keycode, &tapping_key) &&
 #        endif
                         !tapping_key.tap.interrupted && tapping_key.tap.count > 0) {
                         // sequential tap.
diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device_drivers.c
index 4333bbb095..7702958f88 100644
--- a/quantum/pointing_device_drivers.c
+++ b/quantum/pointing_device_drivers.c
@@ -101,7 +101,7 @@ const pointing_device_driver_t pointing_device_driver = {
 #        ifdef TAPPING_TERM_PER_KEY
 #            include "action.h"
 #            include "action_tapping.h"
-#            define CIRQUE_PINNACLE_TAPPING_TERM get_tapping_term(KC_BTN1, NULL)
+#            define CIRQUE_PINNACLE_TAPPING_TERM get_tapping_term(KC_BTN1, &(keyrecord_t){})
 #        else
 #            ifdef TAPPING_TERM
 #                define CIRQUE_PINNACLE_TAPPING_TERM TAPPING_TERM
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c
index c707fdea30..035c9c265d 100644
--- a/quantum/process_keycode/process_tap_dance.c
+++ b/quantum/process_keycode/process_tap_dance.c
@@ -173,7 +173,7 @@ void tap_dance_task() {
             tap_user_defined = action->custom_tapping_term;
         } else {
 #ifdef TAPPING_TERM_PER_KEY
-            tap_user_defined = get_tapping_term(action->state.keycode, NULL);
+            tap_user_defined = get_tapping_term(action->state.keycode, &(keyrecord_t){});
 #else
             tap_user_defined = TAPPING_TERM;
 #endif

From 00cc64638c7ffa90b1acc10c420daaa3795a87ba Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Fri, 11 Feb 2022 20:13:22 +0000
Subject: [PATCH 610/867] Fix right side ws2812 leds having two indices
 (#15985)

* Fix right side leds having two indices

* remove redundant left check
---
 quantum/rgb_matrix/rgb_matrix_drivers.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/quantum/rgb_matrix/rgb_matrix_drivers.c b/quantum/rgb_matrix/rgb_matrix_drivers.c
index bdd512d1c2..27fa7369bf 100644
--- a/quantum/rgb_matrix/rgb_matrix_drivers.c
+++ b/quantum/rgb_matrix/rgb_matrix_drivers.c
@@ -349,10 +349,15 @@ static void flush(void) {
 static inline void setled(int i, uint8_t r, uint8_t g, uint8_t b) {
 #    if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
     const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;
-    if (!is_keyboard_left() && (i >= k_rgb_matrix_split[0])) {
-        i -= k_rgb_matrix_split[0];
-    } else if (is_keyboard_left() && (i >= k_rgb_matrix_split[0]))
+    if (!is_keyboard_left()) {
+        if (i >= k_rgb_matrix_split[0]) {
+            i -= k_rgb_matrix_split[0];
+        } else {
+            return;
+        }
+    } else if (i >= k_rgb_matrix_split[0]) {
         return;
+    }
 #    endif
 
     rgb_matrix_ws2812_array[i].r = r;

From 71c0b97bced7722abaa0adefd57066cc065538b5 Mon Sep 17 00:00:00 2001
From: Joy Lee <chang.li@westberrytech.com>
Date: Sat, 12 Feb 2022 04:26:16 +0800
Subject: [PATCH 611/867] Added external spi flash driver. (#15419)

---
 builddefs/common_features.mk |  15 ++
 docs/flash_driver.md         |  24 +++
 drivers/flash/flash_spi.c    | 372 +++++++++++++++++++++++++++++++++++
 drivers/flash/flash_spi.h    | 136 +++++++++++++
 4 files changed, 547 insertions(+)
 create mode 100644 docs/flash_driver.md
 create mode 100644 drivers/flash/flash_spi.c
 create mode 100644 drivers/flash/flash_spi.h

diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index db9b580286..08d186d656 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -219,6 +219,21 @@ else
   endif
 endif
 
+VALID_FLASH_DRIVER_TYPES := spi
+FLASH_DRIVER ?= no
+ifneq ($(strip $(FLASH_DRIVER)), no)
+    ifeq ($(filter $(FLASH_DRIVER),$(VALID_FLASH_DRIVER_TYPES)),)
+        $(error FLASH_DRIVER="$(FLASH_DRIVER)" is not a valid FLASH driver)
+    else
+        OPT_DEFS += -DFLASH_ENABLE
+        ifeq ($(strip $(FLASH_DRIVER)), spi)
+            OPT_DEFS += -DFLASH_DRIVER -DFLASH_SPI
+            COMMON_VPATH += $(DRIVER_PATH)/flash
+            SRC += flash_spi.c
+        endif
+    endif
+endif
+
 RGBLIGHT_ENABLE ?= no
 VALID_RGBLIGHT_TYPES := WS2812 APA102 custom
 
diff --git a/docs/flash_driver.md b/docs/flash_driver.md
new file mode 100644
index 0000000000..fa7fed5171
--- /dev/null
+++ b/docs/flash_driver.md
@@ -0,0 +1,24 @@
+# FLASH Driver Configuration :id=flash-driver-configuration
+
+The FLASH driver can be swapped out depending on the needs of the keyboard, or whether extra hardware is present.
+
+Driver                             | Description
+-----------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+`FLASH_DRIVER = spi`               | Supports writing to almost all NOR Flash chips. See the driver section below.
+
+
+## SPI FLASH Driver Configuration :id=spi-flash-driver-configuration
+
+Currently QMK supports almost all NOR Flash chips over SPI. As such, requires a working spi_master driver configuration. You can override the driver configuration via your config.h:
+
+`config.h` override                            | Description                                                                          | Default Value
+-----------------------------------------------|--------------------------------------------------------------------------------------|-----------------
+`#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN`  | SPI Slave select pin in order to inform that the FLASH is currently being addressed  | _none_
+`#define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR`     | Clock divisor used to divide the peripheral clock to derive the SPI frequency        | `8`
+`#define EXTERNAL_FLASH_PAGE_SIZE`             | The Page size of the FLASH in bytes, as specified in the datasheet                   | `256`
+`#define EXTERNAL_FLASH_SECTOR_SIZE`           | The sector size of the FLASH in bytes, as specified in the datasheet                 | `(4 * 1024)`
+`#define EXTERNAL_FLASH_BLOCK_SIZE`            | The block size of the FLASH in bytes, as specified in the datasheet                  | `(64 * 1024)`
+`#define EXTERNAL_FLASH_SIZE`                  | The total size of the FLASH in bytes, as specified in the datasheet                  | `(512 * 1024)`
+`#define EXTERNAL_FLASH_ADDRESS_SIZE`          | The Flash address size in bytes, as specified in datasheet                           | `3`
+
+!> All the above default configurations are based on MX25L4006E NOR Flash.
diff --git a/drivers/flash/flash_spi.c b/drivers/flash/flash_spi.c
new file mode 100644
index 0000000000..2fa8891e38
--- /dev/null
+++ b/drivers/flash/flash_spi.c
@@ -0,0 +1,372 @@
+/*
+Copyright (C) 2021 Westberry Technology (ChangZhou) Corp., Ltd
+
+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 <string.h>
+
+#include "util.h"
+#include "wait.h"
+#include "debug.h"
+#include "timer.h"
+#include "flash_spi.h"
+#include "spi_master.h"
+
+/*
+    The time-out time of spi flash transmission.
+*/
+#ifndef EXTERNAL_FLASH_SPI_TIMEOUT
+#    define EXTERNAL_FLASH_SPI_TIMEOUT 1000
+#endif
+
+/* ID comands */
+#define FLASH_CMD_RDID 0x9F /* RDID (Read Identification) */
+#define FLASH_CMD_RES 0xAB  /* RES (Read Electronic ID) */
+#define FLASH_CMD_REMS 0x90 /* REMS (Read Electronic & Device ID) */
+
+/* register comands */
+#define FLASH_CMD_WRSR 0x01 /* WRSR (Write Status register) */
+#define FLASH_CMD_RDSR 0x05 /* RDSR (Read Status register) */
+
+/* READ comands */
+#define FLASH_CMD_READ 0x03     /* READ (1 x I/O) */
+#define FLASH_CMD_FASTREAD 0x0B /* FAST READ (Fast read data) */
+#define FLASH_CMD_DREAD 0x3B    /* DREAD (1In/2 Out fast read) */
+
+/* Program comands */
+#define FLASH_CMD_WREN 0x06 /* WREN (Write Enable) */
+#define FLASH_CMD_WRDI 0x04 /* WRDI (Write Disable) */
+#define FLASH_CMD_PP 0x02   /* PP (page program) */
+
+/* Erase comands */
+#define FLASH_CMD_SE 0x20 /* SE (Sector Erase) */
+#define FLASH_CMD_BE 0xD8 /* BE (Block Erase) */
+#define FLASH_CMD_CE 0x60 /* CE (Chip Erase) hex code: 60 or C7 */
+
+/* Mode setting comands */
+#define FLASH_CMD_DP 0xB9  /* DP (Deep Power Down) */
+#define FLASH_CMD_RDP 0xAB /* RDP (Release form Deep Power Down) */
+
+/* Status register */
+#define FLASH_FLAG_WIP 0x01 /* Write in progress bit */
+#define FLASH_FLAG_WEL 0x02 /* Write enable latch bit */
+
+// #define DEBUG_FLASH_SPI_OUTPUT
+
+static bool spi_flash_start(void) { return spi_start(EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN, EXTERNAL_FLASH_SPI_LSBFIRST, EXTERNAL_FLASH_SPI_MODE, EXTERNAL_FLASH_SPI_CLOCK_DIVISOR); }
+
+static flash_status_t spi_flash_wait_while_busy(void) {
+    uint32_t       deadline = timer_read32() + EXTERNAL_FLASH_SPI_TIMEOUT;
+    flash_status_t response = FLASH_STATUS_SUCCESS;
+    uint8_t        retval;
+
+    do {
+        bool res = spi_flash_start();
+        if (!res) {
+            dprint("Failed to start SPI! [spi flash wait while busy]\n");
+            return FLASH_STATUS_ERROR;
+        }
+
+        spi_write(FLASH_CMD_RDSR);
+
+        retval = (uint8_t)spi_read();
+
+        spi_stop();
+
+        if (timer_read32() >= deadline) {
+            response = FLASH_STATUS_TIMEOUT;
+            break;
+        }
+    } while (retval & FLASH_FLAG_WIP);
+
+    return response;
+}
+
+static flash_status_t spi_flash_write_enable(void) {
+    bool res = spi_flash_start();
+    if (!res) {
+        dprint("Failed to start SPI! [spi flash write enable]\n");
+        return FLASH_STATUS_ERROR;
+    }
+
+    spi_write(FLASH_CMD_WREN);
+
+    spi_stop();
+
+    return FLASH_STATUS_SUCCESS;
+}
+
+static flash_status_t spi_flash_write_disable(void) {
+    bool res = spi_flash_start();
+    if (!res) {
+        dprint("Failed to start SPI! [spi flash write disable]\n");
+        return FLASH_STATUS_ERROR;
+    }
+
+    spi_write(FLASH_CMD_WRDI);
+
+    spi_stop();
+
+    return FLASH_STATUS_SUCCESS;
+}
+
+/* This function is used for read transfer, write transfer and erase transfer. */
+static flash_status_t spi_flash_transaction(uint8_t cmd, uint32_t addr, uint8_t *data, size_t len) {
+    flash_status_t response = FLASH_STATUS_SUCCESS;
+    uint8_t        buffer[EXTERNAL_FLASH_ADDRESS_SIZE + 1];
+
+    buffer[0] = cmd;
+    for (int i = 0; i < EXTERNAL_FLASH_ADDRESS_SIZE; ++i) {
+        buffer[EXTERNAL_FLASH_ADDRESS_SIZE - i] = addr & 0xFF;
+        addr >>= 8;
+    }
+
+    bool res = spi_flash_start();
+    if (!res) {
+        dprint("Failed to start SPI! [spi flash transmit]\n");
+        return FLASH_STATUS_ERROR;
+    }
+
+    response = spi_transmit(buffer, sizeof(buffer));
+
+    if ((!response) && (data != NULL)) {
+        switch (cmd) {
+            case FLASH_CMD_READ:
+                response = spi_receive(data, len);
+                break;
+            case FLASH_CMD_PP:
+                response = spi_transmit(data, len);
+                break;
+            default:
+                response = FLASH_STATUS_ERROR;
+                break;
+        }
+    }
+
+    spi_stop();
+
+    return response;
+}
+
+void flash_init(void) { spi_init(); }
+
+flash_status_t flash_erase_chip(void) {
+    flash_status_t response = FLASH_STATUS_SUCCESS;
+
+    /* Wait for the write-in-progress bit to be cleared. */
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash erase chip]\n");
+        return response;
+    }
+
+    /* Enable writes. */
+    response = spi_flash_write_enable();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to write-enable! [spi flash erase chip]\n");
+        return response;
+    }
+
+    /* Erase Chip. */
+    bool res = spi_flash_start();
+    if (!res) {
+        dprint("Failed to start SPI! [spi flash erase chip]\n");
+        return FLASH_STATUS_ERROR;
+    }
+    spi_write(FLASH_CMD_CE);
+    spi_stop();
+
+    /* Wait for the write-in-progress bit to be cleared.*/
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash erase chip]\n");
+        return response;
+    }
+
+    return response;
+}
+
+flash_status_t flash_erase_sector(uint32_t addr) {
+    flash_status_t response = FLASH_STATUS_SUCCESS;
+
+    /* Check that the address exceeds the limit. */
+    if ((addr + (EXTERNAL_FLASH_SECTOR_SIZE)) >= (EXTERNAL_FLASH_SIZE) || ((addr % (EXTERNAL_FLASH_SECTOR_SIZE)) != 0)) {
+        dprintf("Flash erase sector address over limit! [addr:0x%x]\n", (uint32_t)addr);
+        return FLASH_STATUS_ERROR;
+    }
+
+    /* Wait for the write-in-progress bit to be cleared. */
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash erase sector]\n");
+        return response;
+    }
+
+    /* Enable writes. */
+    response = spi_flash_write_enable();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to write-enable! [spi flash erase sector]\n");
+        return response;
+    }
+
+    /* Erase Sector. */
+    response = spi_flash_transaction(FLASH_CMD_SE, addr, NULL, 0);
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to erase sector! [spi flash erase sector]\n");
+        return response;
+    }
+
+    /* Wait for the write-in-progress bit to be cleared.*/
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash erase sector]\n");
+        return response;
+    }
+
+    return response;
+}
+
+flash_status_t flash_erase_block(uint32_t addr) {
+    flash_status_t response = FLASH_STATUS_SUCCESS;
+
+    /* Check that the address exceeds the limit. */
+    if ((addr + (EXTERNAL_FLASH_BLOCK_SIZE)) >= (EXTERNAL_FLASH_SIZE) || ((addr % (EXTERNAL_FLASH_BLOCK_SIZE)) != 0)) {
+        dprintf("Flash erase block address over limit! [addr:0x%x]\n", (uint32_t)addr);
+        return FLASH_STATUS_ERROR;
+    }
+
+    /* Wait for the write-in-progress bit to be cleared. */
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash erase block]\n");
+        return response;
+    }
+
+    /* Enable writes. */
+    response = spi_flash_write_enable();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to write-enable! [spi flash erase block]\n");
+        return response;
+    }
+
+    /* Erase Block. */
+    response = spi_flash_transaction(FLASH_CMD_BE, addr, NULL, 0);
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to erase block! [spi flash erase block]\n");
+        return response;
+    }
+
+    /* Wait for the write-in-progress bit to be cleared.*/
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash erase block]\n");
+        return response;
+    }
+
+    return response;
+}
+
+flash_status_t flash_read_block(uint32_t addr, void *buf, size_t len) {
+    flash_status_t response = FLASH_STATUS_SUCCESS;
+    uint8_t *      read_buf = (uint8_t *)buf;
+
+    /* Wait for the write-in-progress bit to be cleared. */
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash read block]\n");
+        memset(read_buf, 0, len);
+        return response;
+    }
+
+    /* Perform read. */
+    response = spi_flash_transaction(FLASH_CMD_READ, addr, read_buf, len);
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to read block! [spi flash read block]\n");
+        memset(read_buf, 0, len);
+        return response;
+    }
+
+#if defined(CONSOLE_ENABLE) && defined(DEBUG_FLASH_SPI_OUTPUT)
+    dprintf("[SPI FLASH R] 0x%08lX: ", addr);
+    for (size_t i = 0; i < len; ++i) {
+        dprintf(" %02X", (int)(((uint8_t *)read_buf)[i]));
+    }
+    dprintf("\n");
+#endif  // DEBUG_FLASH_SPI_OUTPUT
+
+    return response;
+}
+
+flash_status_t flash_write_block(uint32_t addr, const void *buf, size_t len) {
+    flash_status_t response  = FLASH_STATUS_SUCCESS;
+    uint8_t *      write_buf = (uint8_t *)buf;
+
+    while (len > 0) {
+        uint32_t page_offset  = addr % EXTERNAL_FLASH_PAGE_SIZE;
+        size_t   write_length = EXTERNAL_FLASH_PAGE_SIZE - page_offset;
+        if (write_length > len) {
+            write_length = len;
+        }
+
+        /* Wait for the write-in-progress bit to be cleared. */
+        response = spi_flash_wait_while_busy();
+        if (response != FLASH_STATUS_SUCCESS) {
+            dprint("Failed to check WIP flag! [spi flash write block]\n");
+            return response;
+        }
+
+        /* Enable writes. */
+        response = spi_flash_write_enable();
+        if (response != FLASH_STATUS_SUCCESS) {
+            dprint("Failed to write-enable! [spi flash write block]\n");
+            return response;
+        }
+
+#if defined(CONSOLE_ENABLE) && defined(DEBUG_FLASH_SPI_OUTPUT)
+        dprintf("[SPI FLASH W] 0x%08lX: ", addr);
+        for (size_t i = 0; i < write_length; i++) {
+            dprintf(" %02X", (int)(uint8_t)(write_buf[i]));
+        }
+        dprintf("\n");
+#endif  // DEBUG_FLASH_SPI_OUTPUT
+
+        /* Perform the write. */
+        response = spi_flash_transaction(FLASH_CMD_PP, addr, write_buf, write_length);
+        if (response != FLASH_STATUS_SUCCESS) {
+            dprint("Failed to write block! [spi flash write block]\n");
+            return response;
+        }
+
+        write_buf += write_length;
+        addr += write_length;
+        len -= write_length;
+    }
+
+    /* Wait for the write-in-progress bit to be cleared. */
+    response = spi_flash_wait_while_busy();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to check WIP flag! [spi flash write block]\n");
+        return response;
+    }
+
+    /* Disable writes. */
+    response = spi_flash_write_disable();
+    if (response != FLASH_STATUS_SUCCESS) {
+        dprint("Failed to write-disable! [spi flash write block]\n");
+        return response;
+    }
+
+    return response;
+}
diff --git a/drivers/flash/flash_spi.h b/drivers/flash/flash_spi.h
new file mode 100644
index 0000000000..abe95e955e
--- /dev/null
+++ b/drivers/flash/flash_spi.h
@@ -0,0 +1,136 @@
+/*
+Copyright (C) 2021 Westberry Technology (ChangZhou) Corp., Ltd
+
+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
+
+/* All the following default configurations are based on MX25L4006E Nor FLASH. */
+
+/*
+    The slave select pin of the FLASH.
+    This needs to be a normal GPIO pin_t value, such as B14.
+*/
+#ifndef EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN
+#    error "No chip select pin defined -- missing EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN"
+#endif
+
+/*
+    The clock divisor for SPI to ensure that the MCU is within the
+    specifications of the FLASH chip. Generally this will be PCLK divided by
+    the intended divisor -- check your clock settings and the datasheet of
+    your FLASH.
+*/
+#ifndef EXTERNAL_FLASH_SPI_CLOCK_DIVISOR
+#    ifdef __AVR__
+#        define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR 4
+#    else
+#        define EXTERNAL_FLASH_SPI_CLOCK_DIVISOR 8
+#    endif
+#endif
+
+/*
+    The SPI mode to communicate with the FLASH.
+*/
+#ifndef EXTERNAL_FLASH_SPI_MODE
+#    define EXTERNAL_FLASH_SPI_MODE 0
+#endif
+
+/*
+    Whether or not the SPI communication between the MCU and FLASH should be
+    LSB-first.
+*/
+#ifndef EXTERNAL_FLASH_SPI_LSBFIRST
+#    define EXTERNAL_FLASH_SPI_LSBFIRST false
+#endif
+
+/*
+    The Flash address size in bytes, as specified in datasheet.
+*/
+#ifndef EXTERNAL_FLASH_ADDRESS_SIZE
+#    define EXTERNAL_FLASH_ADDRESS_SIZE 3
+#endif
+
+/*
+    The page size of the FLASH in bytes, as specified in the datasheet.
+*/
+#ifndef EXTERNAL_FLASH_PAGE_SIZE
+#    define EXTERNAL_FLASH_PAGE_SIZE 256
+#endif
+
+/*
+    The sector size of the FLASH in bytes, as specified in the datasheet.
+*/
+#ifndef EXTERNAL_FLASH_SECTOR_SIZE
+#    define EXTERNAL_FLASH_SECTOR_SIZE (4 * 1024)
+#endif
+
+/*
+    The block size of the FLASH in bytes, as specified in the datasheet.
+*/
+#ifndef EXTERNAL_FLASH_BLOCK_SIZE
+#    define EXTERNAL_FLASH_BLOCK_SIZE (64 * 1024)
+#endif
+
+/*
+    The total size of the FLASH in bytes, as specified in the datasheet.
+*/
+#ifndef EXTERNAL_FLASH_SIZE
+#    define EXTERNAL_FLASH_SIZE (512 * 1024)
+#endif
+
+/*
+    The block count of the FLASH, calculated by total FLASH size and block size.
+*/
+#define EXTERNAL_FLASH_BLOCK_COUNT ((EXTERNAL_FLASH_SIZE) / (EXTERNAL_FLASH_BLOCK_SIZE))
+
+/*
+    The sector count of the FLASH, calculated by total FLASH size and sector size.
+*/
+#define EXTERNAL_FLASH_SECTOR_COUNT ((EXTERNAL_FLASH_SIZE) / (EXTERNAL_FLASH_SECTOR_SIZE))
+
+/*
+    The page count of the FLASH, calculated by total FLASH size and page size.
+*/
+#define EXTERNAL_FLASH_PAGE_COUNT ((EXTERNAL_FLASH_SIZE) / (EXTERNAL_FLASH_PAGE_SIZE))
+
+typedef int16_t flash_status_t;
+
+#define FLASH_STATUS_SUCCESS (0)
+#define FLASH_STATUS_ERROR (-1)
+#define FLASH_STATUS_TIMEOUT (-2)
+#define FLASH_STATUS_BAD_ADDRESS (-3)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+void flash_init(void);
+
+flash_status_t flash_erase_chip(void);
+
+flash_status_t flash_erase_block(uint32_t addr);
+
+flash_status_t flash_erase_sector(uint32_t addr);
+
+flash_status_t flash_read_block(uint32_t addr, void *buf, size_t len);
+
+flash_status_t flash_write_block(uint32_t addr, const void *buf, size_t len);
+
+#ifdef __cplusplus
+}
+#endif

From bd35fa7de1323d572d530cfa4dbe9cf68cf1480b Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Sat, 12 Feb 2022 05:51:20 +0800
Subject: [PATCH 612/867] move @takashiski 's keebs into /takashiski (#16089)

---
 keyboards/{ => takashiski}/hecomi/alpha/config.h                | 0
 keyboards/{ => takashiski}/hecomi/alpha/info.json               | 0
 keyboards/{ => takashiski}/hecomi/alpha/readme.md               | 0
 keyboards/{ => takashiski}/hecomi/alpha/rules.mk                | 0
 keyboards/{ => takashiski}/hecomi/hecomi.c                      | 0
 keyboards/{ => takashiski}/hecomi/hecomi.h                      | 0
 keyboards/{ => takashiski}/hecomi/keymaps/default/keymap.c      | 0
 keyboards/{ => takashiski}/hecomi/keymaps/default/readme.md     | 0
 keyboards/{ => takashiski}/hecomi/keymaps/kakunpc/config.h      | 0
 keyboards/{ => takashiski}/hecomi/keymaps/kakunpc/keymap.c      | 0
 keyboards/{ => takashiski}/hecomi/keymaps/kakunpc/readme.md     | 0
 keyboards/{ => takashiski}/hecomi/readme.md                     | 2 +-
 keyboards/{ => takashiski}/hecomi/rules.mk                      | 2 +-
 keyboards/{ => takashiski}/namecard2x4/.noci                    | 0
 keyboards/{ => takashiski}/namecard2x4/info.json                | 0
 .../{ => takashiski}/namecard2x4/keymaps/brainfuck/config.h     | 0
 .../{ => takashiski}/namecard2x4/keymaps/brainfuck/keymap.c     | 0
 .../{ => takashiski}/namecard2x4/keymaps/brainfuck/readme.md    | 0
 keyboards/{ => takashiski}/namecard2x4/keymaps/default/keymap.c | 0
 .../{ => takashiski}/namecard2x4/keymaps/default/readme.md      | 0
 keyboards/{ => takashiski}/namecard2x4/namecard2x4.c            | 0
 keyboards/{ => takashiski}/namecard2x4/namecard2x4.h            | 0
 keyboards/{ => takashiski}/namecard2x4/readme.md                | 2 +-
 keyboards/{ => takashiski}/namecard2x4/rev1/.noci               | 0
 keyboards/{ => takashiski}/namecard2x4/rev1/config.h            | 0
 keyboards/{ => takashiski}/namecard2x4/rev1/rules.mk            | 0
 keyboards/{ => takashiski}/namecard2x4/rev2/config.h            | 0
 keyboards/{ => takashiski}/namecard2x4/rev2/rules.mk            | 0
 keyboards/{ => takashiski}/namecard2x4/rules.mk                 | 2 +-
 keyboards/{ => takashiski}/otaku_split/rev0/.noci               | 0
 keyboards/{ => takashiski}/otaku_split/rev0/config.h            | 0
 keyboards/{ => takashiski}/otaku_split/rev0/info.json           | 0
 .../{ => takashiski}/otaku_split/rev0/keymaps/default/keymap.c  | 0
 .../{ => takashiski}/otaku_split/rev0/keymaps/default/readme.md | 0
 .../{ => takashiski}/otaku_split/rev0/keymaps/sample/keymap.c   | 0
 .../{ => takashiski}/otaku_split/rev0/keymaps/sample/readme.md  | 0
 keyboards/{ => takashiski}/otaku_split/rev0/readme.md           | 2 +-
 keyboards/{ => takashiski}/otaku_split/rev0/rev0.c              | 0
 keyboards/{ => takashiski}/otaku_split/rev0/rev0.h              | 0
 keyboards/{ => takashiski}/otaku_split/rev0/rules.mk            | 0
 keyboards/{ => takashiski}/otaku_split/rev1/config.h            | 0
 keyboards/{ => takashiski}/otaku_split/rev1/info.json           | 0
 .../{ => takashiski}/otaku_split/rev1/keymaps/default/keymap.c  | 0
 .../{ => takashiski}/otaku_split/rev1/keymaps/default/readme.md | 0
 .../{ => takashiski}/otaku_split/rev1/keymaps/sample/keymap.c   | 0
 .../{ => takashiski}/otaku_split/rev1/keymaps/sample/readme.md  | 0
 keyboards/{ => takashiski}/otaku_split/rev1/readme.md           | 2 +-
 keyboards/{ => takashiski}/otaku_split/rev1/rev1.c              | 0
 keyboards/{ => takashiski}/otaku_split/rev1/rev1.h              | 0
 keyboards/{ => takashiski}/otaku_split/rev1/rules.mk            | 0
 50 files changed, 6 insertions(+), 6 deletions(-)
 rename keyboards/{ => takashiski}/hecomi/alpha/config.h (100%)
 rename keyboards/{ => takashiski}/hecomi/alpha/info.json (100%)
 rename keyboards/{ => takashiski}/hecomi/alpha/readme.md (100%)
 rename keyboards/{ => takashiski}/hecomi/alpha/rules.mk (100%)
 rename keyboards/{ => takashiski}/hecomi/hecomi.c (100%)
 rename keyboards/{ => takashiski}/hecomi/hecomi.h (100%)
 rename keyboards/{ => takashiski}/hecomi/keymaps/default/keymap.c (100%)
 rename keyboards/{ => takashiski}/hecomi/keymaps/default/readme.md (100%)
 rename keyboards/{ => takashiski}/hecomi/keymaps/kakunpc/config.h (100%)
 rename keyboards/{ => takashiski}/hecomi/keymaps/kakunpc/keymap.c (100%)
 rename keyboards/{ => takashiski}/hecomi/keymaps/kakunpc/readme.md (100%)
 rename keyboards/{ => takashiski}/hecomi/readme.md (94%)
 rename keyboards/{ => takashiski}/hecomi/rules.mk (94%)
 rename keyboards/{ => takashiski}/namecard2x4/.noci (100%)
 rename keyboards/{ => takashiski}/namecard2x4/info.json (100%)
 rename keyboards/{ => takashiski}/namecard2x4/keymaps/brainfuck/config.h (100%)
 rename keyboards/{ => takashiski}/namecard2x4/keymaps/brainfuck/keymap.c (100%)
 rename keyboards/{ => takashiski}/namecard2x4/keymaps/brainfuck/readme.md (100%)
 rename keyboards/{ => takashiski}/namecard2x4/keymaps/default/keymap.c (100%)
 rename keyboards/{ => takashiski}/namecard2x4/keymaps/default/readme.md (100%)
 rename keyboards/{ => takashiski}/namecard2x4/namecard2x4.c (100%)
 rename keyboards/{ => takashiski}/namecard2x4/namecard2x4.h (100%)
 rename keyboards/{ => takashiski}/namecard2x4/readme.md (95%)
 rename keyboards/{ => takashiski}/namecard2x4/rev1/.noci (100%)
 rename keyboards/{ => takashiski}/namecard2x4/rev1/config.h (100%)
 rename keyboards/{ => takashiski}/namecard2x4/rev1/rules.mk (100%)
 rename keyboards/{ => takashiski}/namecard2x4/rev2/config.h (100%)
 rename keyboards/{ => takashiski}/namecard2x4/rev2/rules.mk (100%)
 rename keyboards/{ => takashiski}/namecard2x4/rules.mk (93%)
 rename keyboards/{ => takashiski}/otaku_split/rev0/.noci (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev0/config.h (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev0/info.json (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev0/keymaps/default/keymap.c (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev0/keymaps/default/readme.md (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev0/keymaps/sample/keymap.c (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev0/keymaps/sample/readme.md (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev0/readme.md (94%)
 rename keyboards/{ => takashiski}/otaku_split/rev0/rev0.c (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev0/rev0.h (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev0/rules.mk (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev1/config.h (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev1/info.json (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev1/keymaps/default/keymap.c (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev1/keymaps/default/readme.md (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev1/keymaps/sample/keymap.c (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev1/keymaps/sample/readme.md (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev1/readme.md (95%)
 rename keyboards/{ => takashiski}/otaku_split/rev1/rev1.c (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev1/rev1.h (100%)
 rename keyboards/{ => takashiski}/otaku_split/rev1/rules.mk (100%)

diff --git a/keyboards/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
similarity index 100%
rename from keyboards/hecomi/alpha/config.h
rename to keyboards/takashiski/hecomi/alpha/config.h
diff --git a/keyboards/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json
similarity index 100%
rename from keyboards/hecomi/alpha/info.json
rename to keyboards/takashiski/hecomi/alpha/info.json
diff --git a/keyboards/hecomi/alpha/readme.md b/keyboards/takashiski/hecomi/alpha/readme.md
similarity index 100%
rename from keyboards/hecomi/alpha/readme.md
rename to keyboards/takashiski/hecomi/alpha/readme.md
diff --git a/keyboards/hecomi/alpha/rules.mk b/keyboards/takashiski/hecomi/alpha/rules.mk
similarity index 100%
rename from keyboards/hecomi/alpha/rules.mk
rename to keyboards/takashiski/hecomi/alpha/rules.mk
diff --git a/keyboards/hecomi/hecomi.c b/keyboards/takashiski/hecomi/hecomi.c
similarity index 100%
rename from keyboards/hecomi/hecomi.c
rename to keyboards/takashiski/hecomi/hecomi.c
diff --git a/keyboards/hecomi/hecomi.h b/keyboards/takashiski/hecomi/hecomi.h
similarity index 100%
rename from keyboards/hecomi/hecomi.h
rename to keyboards/takashiski/hecomi/hecomi.h
diff --git a/keyboards/hecomi/keymaps/default/keymap.c b/keyboards/takashiski/hecomi/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/hecomi/keymaps/default/keymap.c
rename to keyboards/takashiski/hecomi/keymaps/default/keymap.c
diff --git a/keyboards/hecomi/keymaps/default/readme.md b/keyboards/takashiski/hecomi/keymaps/default/readme.md
similarity index 100%
rename from keyboards/hecomi/keymaps/default/readme.md
rename to keyboards/takashiski/hecomi/keymaps/default/readme.md
diff --git a/keyboards/hecomi/keymaps/kakunpc/config.h b/keyboards/takashiski/hecomi/keymaps/kakunpc/config.h
similarity index 100%
rename from keyboards/hecomi/keymaps/kakunpc/config.h
rename to keyboards/takashiski/hecomi/keymaps/kakunpc/config.h
diff --git a/keyboards/hecomi/keymaps/kakunpc/keymap.c b/keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
similarity index 100%
rename from keyboards/hecomi/keymaps/kakunpc/keymap.c
rename to keyboards/takashiski/hecomi/keymaps/kakunpc/keymap.c
diff --git a/keyboards/hecomi/keymaps/kakunpc/readme.md b/keyboards/takashiski/hecomi/keymaps/kakunpc/readme.md
similarity index 100%
rename from keyboards/hecomi/keymaps/kakunpc/readme.md
rename to keyboards/takashiski/hecomi/keymaps/kakunpc/readme.md
diff --git a/keyboards/hecomi/readme.md b/keyboards/takashiski/hecomi/readme.md
similarity index 94%
rename from keyboards/hecomi/readme.md
rename to keyboards/takashiski/hecomi/readme.md
index 79a80f35e5..3d061659d5 100644
--- a/keyboards/hecomi/readme.md
+++ b/keyboards/takashiski/hecomi/readme.md
@@ -12,6 +12,6 @@ Hardware Availability: booth(@skyhigh_works)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make hecomi/alpha:default
+    make takashiski/hecomi/alpha: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).
diff --git a/keyboards/hecomi/rules.mk b/keyboards/takashiski/hecomi/rules.mk
similarity index 94%
rename from keyboards/hecomi/rules.mk
rename to keyboards/takashiski/hecomi/rules.mk
index b570db0d06..c46100f19e 100644
--- a/keyboards/hecomi/rules.mk
+++ b/keyboards/takashiski/hecomi/rules.mk
@@ -18,4 +18,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = hecomi/alpha
+DEFAULT_FOLDER = takashiski/hecomi/alpha
diff --git a/keyboards/namecard2x4/.noci b/keyboards/takashiski/namecard2x4/.noci
similarity index 100%
rename from keyboards/namecard2x4/.noci
rename to keyboards/takashiski/namecard2x4/.noci
diff --git a/keyboards/namecard2x4/info.json b/keyboards/takashiski/namecard2x4/info.json
similarity index 100%
rename from keyboards/namecard2x4/info.json
rename to keyboards/takashiski/namecard2x4/info.json
diff --git a/keyboards/namecard2x4/keymaps/brainfuck/config.h b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/config.h
similarity index 100%
rename from keyboards/namecard2x4/keymaps/brainfuck/config.h
rename to keyboards/takashiski/namecard2x4/keymaps/brainfuck/config.h
diff --git a/keyboards/namecard2x4/keymaps/brainfuck/keymap.c b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c
similarity index 100%
rename from keyboards/namecard2x4/keymaps/brainfuck/keymap.c
rename to keyboards/takashiski/namecard2x4/keymaps/brainfuck/keymap.c
diff --git a/keyboards/namecard2x4/keymaps/brainfuck/readme.md b/keyboards/takashiski/namecard2x4/keymaps/brainfuck/readme.md
similarity index 100%
rename from keyboards/namecard2x4/keymaps/brainfuck/readme.md
rename to keyboards/takashiski/namecard2x4/keymaps/brainfuck/readme.md
diff --git a/keyboards/namecard2x4/keymaps/default/keymap.c b/keyboards/takashiski/namecard2x4/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/namecard2x4/keymaps/default/keymap.c
rename to keyboards/takashiski/namecard2x4/keymaps/default/keymap.c
diff --git a/keyboards/namecard2x4/keymaps/default/readme.md b/keyboards/takashiski/namecard2x4/keymaps/default/readme.md
similarity index 100%
rename from keyboards/namecard2x4/keymaps/default/readme.md
rename to keyboards/takashiski/namecard2x4/keymaps/default/readme.md
diff --git a/keyboards/namecard2x4/namecard2x4.c b/keyboards/takashiski/namecard2x4/namecard2x4.c
similarity index 100%
rename from keyboards/namecard2x4/namecard2x4.c
rename to keyboards/takashiski/namecard2x4/namecard2x4.c
diff --git a/keyboards/namecard2x4/namecard2x4.h b/keyboards/takashiski/namecard2x4/namecard2x4.h
similarity index 100%
rename from keyboards/namecard2x4/namecard2x4.h
rename to keyboards/takashiski/namecard2x4/namecard2x4.h
diff --git a/keyboards/namecard2x4/readme.md b/keyboards/takashiski/namecard2x4/readme.md
similarity index 95%
rename from keyboards/namecard2x4/readme.md
rename to keyboards/takashiski/namecard2x4/readme.md
index ec98bc6736..165940bceb 100644
--- a/keyboards/namecard2x4/readme.md
+++ b/keyboards/takashiski/namecard2x4/readme.md
@@ -18,7 +18,7 @@ Keyboard Maintainer: [takashiski](https://github.com/takashiski)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make namecard2x4:default
+    make takashiski/namecard2x4: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).
 
diff --git a/keyboards/namecard2x4/rev1/.noci b/keyboards/takashiski/namecard2x4/rev1/.noci
similarity index 100%
rename from keyboards/namecard2x4/rev1/.noci
rename to keyboards/takashiski/namecard2x4/rev1/.noci
diff --git a/keyboards/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h
similarity index 100%
rename from keyboards/namecard2x4/rev1/config.h
rename to keyboards/takashiski/namecard2x4/rev1/config.h
diff --git a/keyboards/namecard2x4/rev1/rules.mk b/keyboards/takashiski/namecard2x4/rev1/rules.mk
similarity index 100%
rename from keyboards/namecard2x4/rev1/rules.mk
rename to keyboards/takashiski/namecard2x4/rev1/rules.mk
diff --git a/keyboards/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h
similarity index 100%
rename from keyboards/namecard2x4/rev2/config.h
rename to keyboards/takashiski/namecard2x4/rev2/config.h
diff --git a/keyboards/namecard2x4/rev2/rules.mk b/keyboards/takashiski/namecard2x4/rev2/rules.mk
similarity index 100%
rename from keyboards/namecard2x4/rev2/rules.mk
rename to keyboards/takashiski/namecard2x4/rev2/rules.mk
diff --git a/keyboards/namecard2x4/rules.mk b/keyboards/takashiski/namecard2x4/rules.mk
similarity index 93%
rename from keyboards/namecard2x4/rules.mk
rename to keyboards/takashiski/namecard2x4/rules.mk
index b1f04b15ec..e0f4e62f04 100644
--- a/keyboards/namecard2x4/rules.mk
+++ b/keyboards/takashiski/namecard2x4/rules.mk
@@ -18,4 +18,4 @@ AUDIO_ENABLE = no           # Audio output
 
 #RGBLIGHT_ENABLE = yes # uncomment if you want addressable led strips
 
-DEFAULT_FOLDER = namecard2x4/rev2
+DEFAULT_FOLDER = takashiski/namecard2x4/rev2
diff --git a/keyboards/otaku_split/rev0/.noci b/keyboards/takashiski/otaku_split/rev0/.noci
similarity index 100%
rename from keyboards/otaku_split/rev0/.noci
rename to keyboards/takashiski/otaku_split/rev0/.noci
diff --git a/keyboards/otaku_split/rev0/config.h b/keyboards/takashiski/otaku_split/rev0/config.h
similarity index 100%
rename from keyboards/otaku_split/rev0/config.h
rename to keyboards/takashiski/otaku_split/rev0/config.h
diff --git a/keyboards/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json
similarity index 100%
rename from keyboards/otaku_split/rev0/info.json
rename to keyboards/takashiski/otaku_split/rev0/info.json
diff --git a/keyboards/otaku_split/rev0/keymaps/default/keymap.c b/keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/otaku_split/rev0/keymaps/default/keymap.c
rename to keyboards/takashiski/otaku_split/rev0/keymaps/default/keymap.c
diff --git a/keyboards/otaku_split/rev0/keymaps/default/readme.md b/keyboards/takashiski/otaku_split/rev0/keymaps/default/readme.md
similarity index 100%
rename from keyboards/otaku_split/rev0/keymaps/default/readme.md
rename to keyboards/takashiski/otaku_split/rev0/keymaps/default/readme.md
diff --git a/keyboards/otaku_split/rev0/keymaps/sample/keymap.c b/keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c
similarity index 100%
rename from keyboards/otaku_split/rev0/keymaps/sample/keymap.c
rename to keyboards/takashiski/otaku_split/rev0/keymaps/sample/keymap.c
diff --git a/keyboards/otaku_split/rev0/keymaps/sample/readme.md b/keyboards/takashiski/otaku_split/rev0/keymaps/sample/readme.md
similarity index 100%
rename from keyboards/otaku_split/rev0/keymaps/sample/readme.md
rename to keyboards/takashiski/otaku_split/rev0/keymaps/sample/readme.md
diff --git a/keyboards/otaku_split/rev0/readme.md b/keyboards/takashiski/otaku_split/rev0/readme.md
similarity index 94%
rename from keyboards/otaku_split/rev0/readme.md
rename to keyboards/takashiski/otaku_split/rev0/readme.md
index 9103843d5d..53efbd85f8 100644
--- a/keyboards/otaku_split/rev0/readme.md
+++ b/keyboards/takashiski/otaku_split/rev0/readme.md
@@ -11,6 +11,6 @@ Hardware Availability: https://skyhigh-works.booth.pm/items/1365150
 
 Make example for this keyboard (after setting up your build environment):
 
-    make otaku_split/rev0:default
+    make takashiski/otaku_split/rev0: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).
diff --git a/keyboards/otaku_split/rev0/rev0.c b/keyboards/takashiski/otaku_split/rev0/rev0.c
similarity index 100%
rename from keyboards/otaku_split/rev0/rev0.c
rename to keyboards/takashiski/otaku_split/rev0/rev0.c
diff --git a/keyboards/otaku_split/rev0/rev0.h b/keyboards/takashiski/otaku_split/rev0/rev0.h
similarity index 100%
rename from keyboards/otaku_split/rev0/rev0.h
rename to keyboards/takashiski/otaku_split/rev0/rev0.h
diff --git a/keyboards/otaku_split/rev0/rules.mk b/keyboards/takashiski/otaku_split/rev0/rules.mk
similarity index 100%
rename from keyboards/otaku_split/rev0/rules.mk
rename to keyboards/takashiski/otaku_split/rev0/rules.mk
diff --git a/keyboards/otaku_split/rev1/config.h b/keyboards/takashiski/otaku_split/rev1/config.h
similarity index 100%
rename from keyboards/otaku_split/rev1/config.h
rename to keyboards/takashiski/otaku_split/rev1/config.h
diff --git a/keyboards/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json
similarity index 100%
rename from keyboards/otaku_split/rev1/info.json
rename to keyboards/takashiski/otaku_split/rev1/info.json
diff --git a/keyboards/otaku_split/rev1/keymaps/default/keymap.c b/keyboards/takashiski/otaku_split/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/otaku_split/rev1/keymaps/default/keymap.c
rename to keyboards/takashiski/otaku_split/rev1/keymaps/default/keymap.c
diff --git a/keyboards/otaku_split/rev1/keymaps/default/readme.md b/keyboards/takashiski/otaku_split/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/otaku_split/rev1/keymaps/default/readme.md
rename to keyboards/takashiski/otaku_split/rev1/keymaps/default/readme.md
diff --git a/keyboards/otaku_split/rev1/keymaps/sample/keymap.c b/keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c
similarity index 100%
rename from keyboards/otaku_split/rev1/keymaps/sample/keymap.c
rename to keyboards/takashiski/otaku_split/rev1/keymaps/sample/keymap.c
diff --git a/keyboards/otaku_split/rev1/keymaps/sample/readme.md b/keyboards/takashiski/otaku_split/rev1/keymaps/sample/readme.md
similarity index 100%
rename from keyboards/otaku_split/rev1/keymaps/sample/readme.md
rename to keyboards/takashiski/otaku_split/rev1/keymaps/sample/readme.md
diff --git a/keyboards/otaku_split/rev1/readme.md b/keyboards/takashiski/otaku_split/rev1/readme.md
similarity index 95%
rename from keyboards/otaku_split/rev1/readme.md
rename to keyboards/takashiski/otaku_split/rev1/readme.md
index 592c82641e..1c1ff5656a 100644
--- a/keyboards/otaku_split/rev1/readme.md
+++ b/keyboards/takashiski/otaku_split/rev1/readme.md
@@ -14,6 +14,6 @@ Hardware Availability: https://skyhigh-works.booth.pm/items/1398595
 
 Make example for this keyboard (after setting up your build environment):
 
-    make otaku_split/rev1:default
+    make takashiski/otaku_split/rev1: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).
diff --git a/keyboards/otaku_split/rev1/rev1.c b/keyboards/takashiski/otaku_split/rev1/rev1.c
similarity index 100%
rename from keyboards/otaku_split/rev1/rev1.c
rename to keyboards/takashiski/otaku_split/rev1/rev1.c
diff --git a/keyboards/otaku_split/rev1/rev1.h b/keyboards/takashiski/otaku_split/rev1/rev1.h
similarity index 100%
rename from keyboards/otaku_split/rev1/rev1.h
rename to keyboards/takashiski/otaku_split/rev1/rev1.h
diff --git a/keyboards/otaku_split/rev1/rules.mk b/keyboards/takashiski/otaku_split/rev1/rules.mk
similarity index 100%
rename from keyboards/otaku_split/rev1/rules.mk
rename to keyboards/takashiski/otaku_split/rev1/rules.mk

From 8957e928a2231b97b815accdd73e9362501b01f0 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Sat, 12 Feb 2022 06:41:10 +0800
Subject: [PATCH 613/867] move mechkeys keyboards into the mechkeys/ vendor
 folder (#15760)

* move mechkeys keyboards to mechkeys/

* fix compilation

* fix default folder
---
 keyboards/{ => mechkeys}/acr60/acr60.c                        | 0
 keyboards/{ => mechkeys}/acr60/acr60.h                        | 0
 keyboards/{ => mechkeys}/acr60/config.h                       | 0
 keyboards/{ => mechkeys}/acr60/info.json                      | 0
 keyboards/{ => mechkeys}/acr60/keymaps/default/keymap.c       | 0
 keyboards/{ => mechkeys}/acr60/keymaps/mitch/keymap.c         | 0
 keyboards/{ => mechkeys}/acr60/readme.md                      | 4 ++--
 keyboards/{ => mechkeys}/acr60/rules.mk                       | 0
 keyboards/{ => mechkeys}/alu84/alu84.c                        | 0
 keyboards/{ => mechkeys}/alu84/alu84.h                        | 0
 keyboards/{ => mechkeys}/alu84/config.h                       | 0
 keyboards/{ => mechkeys}/alu84/info.json                      | 0
 keyboards/{ => mechkeys}/alu84/keymaps/default/keymap.c       | 0
 keyboards/{ => mechkeys}/alu84/keymaps/turbomech/config.h     | 0
 keyboards/{ => mechkeys}/alu84/keymaps/turbomech/keymap.c     | 0
 keyboards/{ => mechkeys}/alu84/keymaps/turbomech/readme.md    | 0
 keyboards/{ => mechkeys}/alu84/keymaps/turbomech/rules.mk     | 0
 keyboards/{ => mechkeys}/alu84/readme.md                      | 4 ++--
 keyboards/{ => mechkeys}/alu84/rules.mk                       | 0
 keyboards/{ => mechkeys}/espectro/config.h                    | 0
 keyboards/{ => mechkeys}/espectro/espectro.c                  | 0
 keyboards/{ => mechkeys}/espectro/espectro.h                  | 0
 keyboards/{ => mechkeys}/espectro/info.json                   | 0
 keyboards/{ => mechkeys}/espectro/keymaps/default/keymap.c    | 0
 keyboards/{ => mechkeys}/espectro/keymaps/iso/keymap.c        | 0
 keyboards/{ => mechkeys}/espectro/keymaps/mac/config.h        | 0
 keyboards/{ => mechkeys}/espectro/keymaps/mac/keymap.c        | 0
 keyboards/{ => mechkeys}/espectro/keymaps/mac/readme.md       | 0
 keyboards/{ => mechkeys}/espectro/keymaps/mapdev/keymap.c     | 0
 .../{ => mechkeys}/espectro/keymaps/mikethetiger/keymap.c     | 0
 keyboards/{ => mechkeys}/espectro/readme.md                   | 2 +-
 keyboards/{ => mechkeys}/espectro/rules.mk                    | 0
 keyboards/{ => mechkeys}/mechmini/mechmini.c                  | 0
 keyboards/{ => mechkeys}/mechmini/mechmini.h                  | 4 ++--
 keyboards/{ => mechkeys}/mechmini/readme.md                   | 2 +-
 keyboards/mechkeys/mechmini/rules.mk                          | 1 +
 keyboards/{ => mechkeys}/mechmini/v1/.noci                    | 0
 keyboards/{ => mechkeys}/mechmini/v1/config.h                 | 0
 keyboards/{ => mechkeys}/mechmini/v1/info.json                | 0
 keyboards/{ => mechkeys}/mechmini/v1/keymaps/default/keymap.c | 0
 keyboards/{ => mechkeys}/mechmini/v1/keymaps/pitty/keymap.c   | 0
 keyboards/{ => mechkeys}/mechmini/v1/readme.md                | 4 ++--
 keyboards/{ => mechkeys}/mechmini/v1/rules.mk                 | 0
 keyboards/{ => mechkeys}/mechmini/v1/v1.c                     | 0
 keyboards/{ => mechkeys}/mechmini/v1/v1.h                     | 2 +-
 keyboards/{ => mechkeys}/mechmini/v2/config.h                 | 0
 keyboards/{ => mechkeys}/mechmini/v2/info.json                | 0
 .../mechmini/v2/keymaps/2u_space_ortho/keymap.c               | 0
 .../{ => mechkeys}/mechmini/v2/keymaps/625_space/keymap.c     | 0
 keyboards/{ => mechkeys}/mechmini/v2/keymaps/arkag/config.h   | 0
 keyboards/{ => mechkeys}/mechmini/v2/keymaps/arkag/keymap.c   | 0
 keyboards/{ => mechkeys}/mechmini/v2/keymaps/arkag/rules.mk   | 0
 keyboards/{ => mechkeys}/mechmini/v2/keymaps/default/keymap.c | 0
 .../{ => mechkeys}/mechmini/v2/keymaps/default/readme.md      | 0
 .../mechmini/v2/keymaps/lbibass_625_space/config.h            | 0
 .../mechmini/v2/keymaps/lbibass_625_space/keymap.c            | 0
 .../mechmini/v2/keymaps/lbibass_625_space/readme.md           | 0
 .../mechmini/v2/keymaps/lbibass_625_space/rules.mk            | 0
 .../mechmini/v2/keymaps/lbibass_split_space/config.h          | 0
 .../mechmini/v2/keymaps/lbibass_split_space/keymap.c          | 0
 .../mechmini/v2/keymaps/lbibass_split_space/readme.md         | 0
 .../mechmini/v2/keymaps/lbibass_split_space/rules.mk          | 0
 keyboards/{ => mechkeys}/mechmini/v2/keymaps/ortho/keymap.c   | 0
 .../mechmini/v2/keymaps/spacebarracecar/config.h              | 0
 .../mechmini/v2/keymaps/spacebarracecar/keymap.c              | 0
 .../mechmini/v2/keymaps/spacebarracecar/readme.md             | 0
 .../mechmini/v2/keymaps/spacebarracecar/rules.mk              | 0
 .../{ => mechkeys}/mechmini/v2/keymaps/split_space/keymap.c   | 0
 .../{ => mechkeys}/mechmini/v2/keymaps/split_space/readme.md  | 0
 keyboards/{ => mechkeys}/mechmini/v2/keymaps/via/keymap.c     | 0
 keyboards/{ => mechkeys}/mechmini/v2/keymaps/via/rules.mk     | 0
 .../{ => mechkeys}/mechmini/v2/keymaps/wsturgiss/config.h     | 0
 .../{ => mechkeys}/mechmini/v2/keymaps/wsturgiss/keymap.c     | 0
 .../{ => mechkeys}/mechmini/v2/keymaps/wsturgiss/rules.mk     | 0
 keyboards/{ => mechkeys}/mechmini/v2/readme.md                | 2 +-
 keyboards/{ => mechkeys}/mechmini/v2/rules.mk                 | 0
 keyboards/{ => mechkeys}/mechmini/v2/v2.c                     | 0
 keyboards/{ => mechkeys}/mechmini/v2/v2.h                     | 0
 keyboards/mechmini/rules.mk                                   | 1 -
 79 files changed, 13 insertions(+), 13 deletions(-)
 rename keyboards/{ => mechkeys}/acr60/acr60.c (100%)
 rename keyboards/{ => mechkeys}/acr60/acr60.h (100%)
 rename keyboards/{ => mechkeys}/acr60/config.h (100%)
 rename keyboards/{ => mechkeys}/acr60/info.json (100%)
 rename keyboards/{ => mechkeys}/acr60/keymaps/default/keymap.c (100%)
 rename keyboards/{ => mechkeys}/acr60/keymaps/mitch/keymap.c (100%)
 rename keyboards/{ => mechkeys}/acr60/readme.md (93%)
 rename keyboards/{ => mechkeys}/acr60/rules.mk (100%)
 rename keyboards/{ => mechkeys}/alu84/alu84.c (100%)
 rename keyboards/{ => mechkeys}/alu84/alu84.h (100%)
 rename keyboards/{ => mechkeys}/alu84/config.h (100%)
 rename keyboards/{ => mechkeys}/alu84/info.json (100%)
 rename keyboards/{ => mechkeys}/alu84/keymaps/default/keymap.c (100%)
 rename keyboards/{ => mechkeys}/alu84/keymaps/turbomech/config.h (100%)
 rename keyboards/{ => mechkeys}/alu84/keymaps/turbomech/keymap.c (100%)
 rename keyboards/{ => mechkeys}/alu84/keymaps/turbomech/readme.md (100%)
 rename keyboards/{ => mechkeys}/alu84/keymaps/turbomech/rules.mk (100%)
 rename keyboards/{ => mechkeys}/alu84/readme.md (91%)
 rename keyboards/{ => mechkeys}/alu84/rules.mk (100%)
 rename keyboards/{ => mechkeys}/espectro/config.h (100%)
 rename keyboards/{ => mechkeys}/espectro/espectro.c (100%)
 rename keyboards/{ => mechkeys}/espectro/espectro.h (100%)
 rename keyboards/{ => mechkeys}/espectro/info.json (100%)
 rename keyboards/{ => mechkeys}/espectro/keymaps/default/keymap.c (100%)
 rename keyboards/{ => mechkeys}/espectro/keymaps/iso/keymap.c (100%)
 rename keyboards/{ => mechkeys}/espectro/keymaps/mac/config.h (100%)
 rename keyboards/{ => mechkeys}/espectro/keymaps/mac/keymap.c (100%)
 rename keyboards/{ => mechkeys}/espectro/keymaps/mac/readme.md (100%)
 rename keyboards/{ => mechkeys}/espectro/keymaps/mapdev/keymap.c (100%)
 rename keyboards/{ => mechkeys}/espectro/keymaps/mikethetiger/keymap.c (100%)
 rename keyboards/{ => mechkeys}/espectro/readme.md (95%)
 rename keyboards/{ => mechkeys}/espectro/rules.mk (100%)
 rename keyboards/{ => mechkeys}/mechmini/mechmini.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/mechmini.h (90%)
 rename keyboards/{ => mechkeys}/mechmini/readme.md (97%)
 create mode 100644 keyboards/mechkeys/mechmini/rules.mk
 rename keyboards/{ => mechkeys}/mechmini/v1/.noci (100%)
 rename keyboards/{ => mechkeys}/mechmini/v1/config.h (100%)
 rename keyboards/{ => mechkeys}/mechmini/v1/info.json (100%)
 rename keyboards/{ => mechkeys}/mechmini/v1/keymaps/default/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v1/keymaps/pitty/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v1/readme.md (92%)
 rename keyboards/{ => mechkeys}/mechmini/v1/rules.mk (100%)
 rename keyboards/{ => mechkeys}/mechmini/v1/v1.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v1/v1.h (98%)
 rename keyboards/{ => mechkeys}/mechmini/v2/config.h (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/info.json (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/2u_space_ortho/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/625_space/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/arkag/config.h (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/arkag/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/arkag/rules.mk (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/default/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/default/readme.md (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/lbibass_625_space/config.h (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/lbibass_625_space/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/lbibass_625_space/readme.md (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/lbibass_625_space/rules.mk (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/lbibass_split_space/config.h (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/lbibass_split_space/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/lbibass_split_space/readme.md (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/lbibass_split_space/rules.mk (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/ortho/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/spacebarracecar/config.h (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/spacebarracecar/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/spacebarracecar/readme.md (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/spacebarracecar/rules.mk (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/split_space/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/split_space/readme.md (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/via/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/via/rules.mk (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/wsturgiss/config.h (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/wsturgiss/keymap.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/keymaps/wsturgiss/rules.mk (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/readme.md (95%)
 rename keyboards/{ => mechkeys}/mechmini/v2/rules.mk (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/v2.c (100%)
 rename keyboards/{ => mechkeys}/mechmini/v2/v2.h (100%)
 delete mode 100644 keyboards/mechmini/rules.mk

diff --git a/keyboards/acr60/acr60.c b/keyboards/mechkeys/acr60/acr60.c
similarity index 100%
rename from keyboards/acr60/acr60.c
rename to keyboards/mechkeys/acr60/acr60.c
diff --git a/keyboards/acr60/acr60.h b/keyboards/mechkeys/acr60/acr60.h
similarity index 100%
rename from keyboards/acr60/acr60.h
rename to keyboards/mechkeys/acr60/acr60.h
diff --git a/keyboards/acr60/config.h b/keyboards/mechkeys/acr60/config.h
similarity index 100%
rename from keyboards/acr60/config.h
rename to keyboards/mechkeys/acr60/config.h
diff --git a/keyboards/acr60/info.json b/keyboards/mechkeys/acr60/info.json
similarity index 100%
rename from keyboards/acr60/info.json
rename to keyboards/mechkeys/acr60/info.json
diff --git a/keyboards/acr60/keymaps/default/keymap.c b/keyboards/mechkeys/acr60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/acr60/keymaps/default/keymap.c
rename to keyboards/mechkeys/acr60/keymaps/default/keymap.c
diff --git a/keyboards/acr60/keymaps/mitch/keymap.c b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
similarity index 100%
rename from keyboards/acr60/keymaps/mitch/keymap.c
rename to keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
diff --git a/keyboards/acr60/readme.md b/keyboards/mechkeys/acr60/readme.md
similarity index 93%
rename from keyboards/acr60/readme.md
rename to keyboards/mechkeys/acr60/readme.md
index 70b617dfda..4d8bffa364 100644
--- a/keyboards/acr60/readme.md
+++ b/keyboards/mechkeys/acr60/readme.md
@@ -10,11 +10,11 @@ A customizable 60% keyboard made and sold by mechkeys.ca [More info on MECHKEYS]
 
 Make example for this keyboard (after setting up your build environment):
 
-    make acr60:default
+    make mechkeys/acr60:default
 
 Flashing example for this keyboard:
 
-    make acr60:default:flash
+    make mechkeys/acr60:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 
diff --git a/keyboards/acr60/rules.mk b/keyboards/mechkeys/acr60/rules.mk
similarity index 100%
rename from keyboards/acr60/rules.mk
rename to keyboards/mechkeys/acr60/rules.mk
diff --git a/keyboards/alu84/alu84.c b/keyboards/mechkeys/alu84/alu84.c
similarity index 100%
rename from keyboards/alu84/alu84.c
rename to keyboards/mechkeys/alu84/alu84.c
diff --git a/keyboards/alu84/alu84.h b/keyboards/mechkeys/alu84/alu84.h
similarity index 100%
rename from keyboards/alu84/alu84.h
rename to keyboards/mechkeys/alu84/alu84.h
diff --git a/keyboards/alu84/config.h b/keyboards/mechkeys/alu84/config.h
similarity index 100%
rename from keyboards/alu84/config.h
rename to keyboards/mechkeys/alu84/config.h
diff --git a/keyboards/alu84/info.json b/keyboards/mechkeys/alu84/info.json
similarity index 100%
rename from keyboards/alu84/info.json
rename to keyboards/mechkeys/alu84/info.json
diff --git a/keyboards/alu84/keymaps/default/keymap.c b/keyboards/mechkeys/alu84/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/alu84/keymaps/default/keymap.c
rename to keyboards/mechkeys/alu84/keymaps/default/keymap.c
diff --git a/keyboards/alu84/keymaps/turbomech/config.h b/keyboards/mechkeys/alu84/keymaps/turbomech/config.h
similarity index 100%
rename from keyboards/alu84/keymaps/turbomech/config.h
rename to keyboards/mechkeys/alu84/keymaps/turbomech/config.h
diff --git a/keyboards/alu84/keymaps/turbomech/keymap.c b/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
similarity index 100%
rename from keyboards/alu84/keymaps/turbomech/keymap.c
rename to keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
diff --git a/keyboards/alu84/keymaps/turbomech/readme.md b/keyboards/mechkeys/alu84/keymaps/turbomech/readme.md
similarity index 100%
rename from keyboards/alu84/keymaps/turbomech/readme.md
rename to keyboards/mechkeys/alu84/keymaps/turbomech/readme.md
diff --git a/keyboards/alu84/keymaps/turbomech/rules.mk b/keyboards/mechkeys/alu84/keymaps/turbomech/rules.mk
similarity index 100%
rename from keyboards/alu84/keymaps/turbomech/rules.mk
rename to keyboards/mechkeys/alu84/keymaps/turbomech/rules.mk
diff --git a/keyboards/alu84/readme.md b/keyboards/mechkeys/alu84/readme.md
similarity index 91%
rename from keyboards/alu84/readme.md
rename to keyboards/mechkeys/alu84/readme.md
index 12da1d8a8f..ca2afbe970 100644
--- a/keyboards/alu84/readme.md
+++ b/keyboards/mechkeys/alu84/readme.md
@@ -10,11 +10,11 @@ A 75% keyboard made and sold by MECHKEYS.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make alu84:default
+    make mechkeys/alu84:default
 
 Flashing example for this keyboard:
 
-    make alu84:default:flash
+    make mechkeys/alu84:default:flash
 
 To reset the board into bootloader mode, hold Space+B while plugging the cable in.
 
diff --git a/keyboards/alu84/rules.mk b/keyboards/mechkeys/alu84/rules.mk
similarity index 100%
rename from keyboards/alu84/rules.mk
rename to keyboards/mechkeys/alu84/rules.mk
diff --git a/keyboards/espectro/config.h b/keyboards/mechkeys/espectro/config.h
similarity index 100%
rename from keyboards/espectro/config.h
rename to keyboards/mechkeys/espectro/config.h
diff --git a/keyboards/espectro/espectro.c b/keyboards/mechkeys/espectro/espectro.c
similarity index 100%
rename from keyboards/espectro/espectro.c
rename to keyboards/mechkeys/espectro/espectro.c
diff --git a/keyboards/espectro/espectro.h b/keyboards/mechkeys/espectro/espectro.h
similarity index 100%
rename from keyboards/espectro/espectro.h
rename to keyboards/mechkeys/espectro/espectro.h
diff --git a/keyboards/espectro/info.json b/keyboards/mechkeys/espectro/info.json
similarity index 100%
rename from keyboards/espectro/info.json
rename to keyboards/mechkeys/espectro/info.json
diff --git a/keyboards/espectro/keymaps/default/keymap.c b/keyboards/mechkeys/espectro/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/default/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/default/keymap.c
diff --git a/keyboards/espectro/keymaps/iso/keymap.c b/keyboards/mechkeys/espectro/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/iso/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/iso/keymap.c
diff --git a/keyboards/espectro/keymaps/mac/config.h b/keyboards/mechkeys/espectro/keymaps/mac/config.h
similarity index 100%
rename from keyboards/espectro/keymaps/mac/config.h
rename to keyboards/mechkeys/espectro/keymaps/mac/config.h
diff --git a/keyboards/espectro/keymaps/mac/keymap.c b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/mac/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/mac/keymap.c
diff --git a/keyboards/espectro/keymaps/mac/readme.md b/keyboards/mechkeys/espectro/keymaps/mac/readme.md
similarity index 100%
rename from keyboards/espectro/keymaps/mac/readme.md
rename to keyboards/mechkeys/espectro/keymaps/mac/readme.md
diff --git a/keyboards/espectro/keymaps/mapdev/keymap.c b/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/mapdev/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
diff --git a/keyboards/espectro/keymaps/mikethetiger/keymap.c b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/mikethetiger/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
diff --git a/keyboards/espectro/readme.md b/keyboards/mechkeys/espectro/readme.md
similarity index 95%
rename from keyboards/espectro/readme.md
rename to keyboards/mechkeys/espectro/readme.md
index c4c0edc7f7..fca7ad7308 100644
--- a/keyboards/espectro/readme.md
+++ b/keyboards/mechkeys/espectro/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [MECHKEYS](https://mechkeys.ca)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make espectro:default
+    make mechkeys/espectro: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).
diff --git a/keyboards/espectro/rules.mk b/keyboards/mechkeys/espectro/rules.mk
similarity index 100%
rename from keyboards/espectro/rules.mk
rename to keyboards/mechkeys/espectro/rules.mk
diff --git a/keyboards/mechmini/mechmini.c b/keyboards/mechkeys/mechmini/mechmini.c
similarity index 100%
rename from keyboards/mechmini/mechmini.c
rename to keyboards/mechkeys/mechmini/mechmini.c
diff --git a/keyboards/mechmini/mechmini.h b/keyboards/mechkeys/mechmini/mechmini.h
similarity index 90%
rename from keyboards/mechmini/mechmini.h
rename to keyboards/mechkeys/mechmini/mechmini.h
index cbd405285f..9420b3e161 100644
--- a/keyboards/mechmini/mechmini.h
+++ b/keyboards/mechkeys/mechmini/mechmini.h
@@ -18,8 +18,8 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_mechmini_v1)
+#if defined(KEYBOARD_mechkeys_mechmini_v1)
 #    include "v1.h"
-#elif defined(KEYBOARD_mechmini_v2)
+#elif defined(KEYBOARD_mechkeys_mechmini_v2)
 #    include "v2.h"
 #endif
diff --git a/keyboards/mechmini/readme.md b/keyboards/mechkeys/mechmini/readme.md
similarity index 97%
rename from keyboards/mechmini/readme.md
rename to keyboards/mechkeys/mechmini/readme.md
index fc43eb1248..f9c0264273 100644
--- a/keyboards/mechmini/readme.md
+++ b/keyboards/mechkeys/mechmini/readme.md
@@ -17,7 +17,7 @@ Hardware Availability: [MECHKEYS](https://mechkeys.ca/collections/keyboards/prod
 
 Make example for this keyboard (after setting up your build environment), this will make the Mechmini 2.0 default keymap (split space) - please see v1 readme for v1 make instructions:
 
-    make mechmini:default
+    make mechkeys/mechmini:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/mechkeys/mechmini/rules.mk b/keyboards/mechkeys/mechmini/rules.mk
new file mode 100644
index 0000000000..9d63d875eb
--- /dev/null
+++ b/keyboards/mechkeys/mechmini/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechkeys/mechmini/v2
diff --git a/keyboards/mechmini/v1/.noci b/keyboards/mechkeys/mechmini/v1/.noci
similarity index 100%
rename from keyboards/mechmini/v1/.noci
rename to keyboards/mechkeys/mechmini/v1/.noci
diff --git a/keyboards/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h
similarity index 100%
rename from keyboards/mechmini/v1/config.h
rename to keyboards/mechkeys/mechmini/v1/config.h
diff --git a/keyboards/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json
similarity index 100%
rename from keyboards/mechmini/v1/info.json
rename to keyboards/mechkeys/mechmini/v1/info.json
diff --git a/keyboards/mechmini/v1/keymaps/default/keymap.c b/keyboards/mechkeys/mechmini/v1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mechmini/v1/keymaps/default/keymap.c
rename to keyboards/mechkeys/mechmini/v1/keymaps/default/keymap.c
diff --git a/keyboards/mechmini/v1/keymaps/pitty/keymap.c b/keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c
similarity index 100%
rename from keyboards/mechmini/v1/keymaps/pitty/keymap.c
rename to keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c
diff --git a/keyboards/mechmini/v1/readme.md b/keyboards/mechkeys/mechmini/v1/readme.md
similarity index 92%
rename from keyboards/mechmini/v1/readme.md
rename to keyboards/mechkeys/mechmini/v1/readme.md
index 902948c24d..d6b88d9c04 100644
--- a/keyboards/mechmini/v1/readme.md
+++ b/keyboards/mechkeys/mechmini/v1/readme.md
@@ -8,11 +8,11 @@ A 40% ortholinear/staggered keyboard, that was originally bootmapper and can be
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mechmini/v1:default
+    make mechkeys/mechmini/v1:default
 
 Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
 
-    make mechmini/v1:default:flash
+    make mechkeys/mechmini/v1:default:flash
 
 **Reset Key**: Hold down the key commonly programmed as *L_Ctrl* while plugging in the keyboard.
 
diff --git a/keyboards/mechmini/v1/rules.mk b/keyboards/mechkeys/mechmini/v1/rules.mk
similarity index 100%
rename from keyboards/mechmini/v1/rules.mk
rename to keyboards/mechkeys/mechmini/v1/rules.mk
diff --git a/keyboards/mechmini/v1/v1.c b/keyboards/mechkeys/mechmini/v1/v1.c
similarity index 100%
rename from keyboards/mechmini/v1/v1.c
rename to keyboards/mechkeys/mechmini/v1/v1.c
diff --git a/keyboards/mechmini/v1/v1.h b/keyboards/mechkeys/mechmini/v1/v1.h
similarity index 98%
rename from keyboards/mechmini/v1/v1.h
rename to keyboards/mechkeys/mechmini/v1/v1.h
index 526f12e410..07d1e683f7 100644
--- a/keyboards/mechmini/v1/v1.h
+++ b/keyboards/mechkeys/mechmini/v1/v1.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "mechmini.h"
+#include "../mechmini.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h
similarity index 100%
rename from keyboards/mechmini/v2/config.h
rename to keyboards/mechkeys/mechmini/v2/config.h
diff --git a/keyboards/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json
similarity index 100%
rename from keyboards/mechmini/v2/info.json
rename to keyboards/mechkeys/mechmini/v2/info.json
diff --git a/keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/625_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/625_space/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/arkag/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/arkag/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/arkag/config.h
diff --git a/keyboards/mechmini/v2/keymaps/arkag/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/arkag/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/arkag/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/arkag/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/arkag/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/default/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/default/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/default/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/default/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/default/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_625_space/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/config.h
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_625_space/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_625_space/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_split_space/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/config.h
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_split_space/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_split_space/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/ortho/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/ortho/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/spacebarracecar/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/config.h
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/spacebarracecar/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/spacebarracecar/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/spacebarracecar/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/split_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/split_space/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/split_space/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/split_space/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/split_space/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/via/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/via/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/via/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/via/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/via/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/wsturgiss/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/wsturgiss/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/config.h
diff --git a/keyboards/mechmini/v2/keymaps/wsturgiss/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/wsturgiss/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/rules.mk
diff --git a/keyboards/mechmini/v2/readme.md b/keyboards/mechkeys/mechmini/v2/readme.md
similarity index 95%
rename from keyboards/mechmini/v2/readme.md
rename to keyboards/mechkeys/mechmini/v2/readme.md
index fdc9fef9bf..8724f16a0f 100644
--- a/keyboards/mechmini/v2/readme.md
+++ b/keyboards/mechkeys/mechmini/v2/readme.md
@@ -13,7 +13,7 @@ Hardware Availability: [MECHKEYS Mechmini 2.0](https://mechkeys.ca/collections/k
 
 Make example for this keyboard (after setting up your build environment), this will make the Mechmini 2.0 default keymap (split space):
 
-    make mechmini/v2:default
+    make mechkeys/mechmini/v2:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/mechmini/v2/rules.mk b/keyboards/mechkeys/mechmini/v2/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/rules.mk
rename to keyboards/mechkeys/mechmini/v2/rules.mk
diff --git a/keyboards/mechmini/v2/v2.c b/keyboards/mechkeys/mechmini/v2/v2.c
similarity index 100%
rename from keyboards/mechmini/v2/v2.c
rename to keyboards/mechkeys/mechmini/v2/v2.c
diff --git a/keyboards/mechmini/v2/v2.h b/keyboards/mechkeys/mechmini/v2/v2.h
similarity index 100%
rename from keyboards/mechmini/v2/v2.h
rename to keyboards/mechkeys/mechmini/v2/v2.h
diff --git a/keyboards/mechmini/rules.mk b/keyboards/mechmini/rules.mk
deleted file mode 100644
index 71dae51277..0000000000
--- a/keyboards/mechmini/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechmini/v2

From 8b48bab54f7af72a2c073961b4faf2e7495e239c Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 12 Feb 2022 01:10:48 +0000
Subject: [PATCH 614/867] Add wren configurator data (#16321)

---
 keyboards/wren/info.json | 105 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 keyboards/wren/info.json

diff --git a/keyboards/wren/info.json b/keyboards/wren/info.json
new file mode 100644
index 0000000000..ef11ffea27
--- /dev/null
+++ b/keyboards/wren/info.json
@@ -0,0 +1,105 @@
+{
+    "keyboard_name": "wren",
+    "maintainer": "vinorodrigues",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"L00","x":0, "y":0.5},
+                {"label":"L01","x":1, "y":0.5},
+                {"label":"L02","x":2, "y":0.5},
+                {"label":"L03","x":3, "y":0.5},
+                {"label":"L04","x":4.5, "y":0.5},
+                {"label":"L05","x":5.5, "y":0.5},
+                {"label":"L06","x":6.5, "y":0.25},
+                {"label":"L07","x":7.5, "y":0},
+                {"label":"L08","x":8.5, "y":0.25},
+                {"label":"L09","x":9.5, "y":0.5},
+                {"label":"R00","x":14, "y":0.5},
+                {"label":"R01","x":15, "y":0.25},
+                {"label":"R02","x":16, "y":0},
+                {"label":"R03","x":17, "y":0.25},
+                {"label":"R04","x":18, "y":0.5},
+                {"label":"R05","x":19, "y":0.5},
+                {"label":"R06","x":20.5, "y":0.5},
+                {"label":"R07","x":21.5, "y":0.5},
+                {"label":"R08","x":22.5, "y":0.5},
+                {"label":"R09","x":23.5, "y":0.5},
+
+                {"label":"L10","x":0, "y":1.5},
+                {"label":"L11","x":1, "y":1.5},
+                {"label":"L12","x":2, "y":1.5},
+                {"label":"L13","x":3, "y":1.5},
+                {"label":"L14","x":4.5, "y":1.5},
+                {"label":"L15","x":5.5, "y":1.5},
+                {"label":"L16","x":6.5, "y":1.25},
+                {"label":"L17","x":7.5, "y":1},
+                {"label":"L18","x":8.5, "y":1.25},
+                {"label":"L19","x":9.5, "y":1.5},
+                {"label":"R10","x":16, "y":1},
+                {"label":"R11","x":15, "y":1.25},
+                {"label":"R12","x":17, "y":1.25},
+                {"label":"R13","x":14, "y":1.5},
+                {"label":"R14","x":18, "y":1.5},
+                {"label":"R15","x":19, "y":1.5},
+                {"label":"R16","x":20.5, "y":1.5},
+                {"label":"R17","x":21.5, "y":1.5},
+                {"label":"R18","x":22.5, "y":1.5},
+                {"label":"R19","x":23.5, "y":1.5},
+                
+                {"label":"L20","x":0, "y":2.5},
+                {"label":"L21","x":1, "y":2.5},
+                {"label":"L22","x":2, "y":2.5},
+                {"label":"L23","x":3, "y":2.5},
+                {"label":"L24","x":4.5, "y":2.5},
+                {"label":"L25","x":5.5, "y":2.5},
+                {"label":"L26","x":6.5, "y":2.25},
+                {"label":"L27","x":7.5, "y":2},
+                {"label":"L28","x":8.5, "y":2.25},
+                {"label":"L29","x":9.5, "y":2.5},
+                {"label":"R20","x":14, "y":2.5},
+                {"label":"R21","x":15, "y":2.25},
+                {"label":"R22","x":16, "y":2},
+                {"label":"R23","x":17, "y":2.25},
+                {"label":"R24","x":18, "y":2.5},
+                {"label":"R25","x":19, "y":2.5},
+                {"label":"R26","x":20.5, "y":2.5},
+                {"label":"R27","x":21.5, "y":2.5},
+                {"label":"R28","x":22.5, "y":2.5},
+                {"label":"R29","x":23.5, "y":2.5},
+
+                {"label":"L30","x":0, "y":3.5},
+                {"label":"L31","x":1, "y":3.5},
+                {"label":"L32","x":2, "y":3.5},
+                {"label":"L33","x":3, "y":3.5},
+                {"label":"L34","x":4.5, "y":3.5},
+                {"label":"L35","x":5.5, "y":3.5},
+                {"label":"L36","x":6.5, "y":3.25},
+                {"label":"L37","x":7.5, "y":3},
+                {"label":"L38","x":8.5, "y":3.25},
+                {"label":"L39","x":9.5, "y":3.5},
+                {"label":"R30","x":14, "y":3.5},
+                {"label":"R31","x":15, "y":3.25},
+                {"label":"R32","x":16, "y":3},
+                {"label":"R33","x":17, "y":3.25},
+                {"label":"R34","x":18, "y":3.5},
+                {"label":"R35","x":19, "y":3.5},
+                {"label":"R36","x":20.5, "y":3.5},
+                {"label":"R37","x":21.5, "y":3.5},
+                {"label":"R38","x":22.5, "y":3.5},
+                {"label":"R39","x":23.5, "y":3.5},
+
+
+                {"label":"LT0","x":6, "y":4.5},
+                {"label":"LT1","x":7, "y":4.5},
+                {"label":"LT2","x":8, "y":4.5},
+                {"label":"LT3","x":9, "y":4.75},
+                {"label":"LT4","x":10.75, "y":4, "h":2},
+                {"label":"RT0","x":12.75, "y":4, "h":2},
+                {"label":"RT1","x":14.5, "y":4.75},
+                {"label":"RT2","x":15.5, "y":4.5},
+                {"label":"RT3","x":16.5, "y":4.5},
+                {"label":"RT4","x":17.5, "y":4.5}
+            ]
+        }
+    }
+}
\ No newline at end of file

From c72120baab093a4cfdd9192e8bde0c64ee4172ae Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Sat, 12 Feb 2022 09:13:48 +0800
Subject: [PATCH 615/867] move @satt99 's comet46 to satt/ (#16059)

---
 keyboards/{ => satt}/comet46/comet46.c                        | 0
 keyboards/{ => satt}/comet46/comet46.h                        | 0
 keyboards/{ => satt}/comet46/config.h                         | 0
 keyboards/{ => satt}/comet46/i2c.c                            | 0
 keyboards/{ => satt}/comet46/i2c.h                            | 0
 keyboards/{ => satt}/comet46/info.json                        | 0
 keyboards/{ => satt}/comet46/keymaps/default-rgbled/keymap.c  | 0
 keyboards/{ => satt}/comet46/keymaps/default-rgbled/readme.md | 0
 keyboards/{ => satt}/comet46/keymaps/default/config.h         | 0
 keyboards/{ => satt}/comet46/keymaps/default/keymap.c         | 0
 keyboards/{ => satt}/comet46/keymaps/default/readme.md        | 0
 keyboards/{ => satt}/comet46/keymaps/default/rules.mk         | 0
 keyboards/{ => satt}/comet46/keymaps/satt/action_pseudo_lut.c | 0
 keyboards/{ => satt}/comet46/keymaps/satt/action_pseudo_lut.h | 0
 keyboards/{ => satt}/comet46/keymaps/satt/config.h            | 0
 keyboards/{ => satt}/comet46/keymaps/satt/keymap.c            | 0
 keyboards/{ => satt}/comet46/keymaps/satt/keymap_jis2us.h     | 0
 keyboards/{ => satt}/comet46/keymaps/satt/readme.md           | 0
 keyboards/{ => satt}/comet46/keymaps/satt/rules.mk            | 0
 keyboards/{ => satt}/comet46/lib/glcdfont.c                   | 0
 keyboards/{ => satt}/comet46/lib/host_led_state_reader.c      | 0
 keyboards/{ => satt}/comet46/lib/keylogger.c                  | 0
 keyboards/{ => satt}/comet46/lib/modifier_state_reader.c      | 0
 keyboards/{ => satt}/comet46/matrix.c                         | 0
 keyboards/{ => satt}/comet46/readme.md                        | 2 +-
 keyboards/{ => satt}/comet46/rules.mk                         | 0
 keyboards/{ => satt}/comet46/ssd1306.c                        | 0
 keyboards/{ => satt}/comet46/ssd1306.h                        | 0
 28 files changed, 1 insertion(+), 1 deletion(-)
 rename keyboards/{ => satt}/comet46/comet46.c (100%)
 rename keyboards/{ => satt}/comet46/comet46.h (100%)
 rename keyboards/{ => satt}/comet46/config.h (100%)
 rename keyboards/{ => satt}/comet46/i2c.c (100%)
 rename keyboards/{ => satt}/comet46/i2c.h (100%)
 rename keyboards/{ => satt}/comet46/info.json (100%)
 rename keyboards/{ => satt}/comet46/keymaps/default-rgbled/keymap.c (100%)
 rename keyboards/{ => satt}/comet46/keymaps/default-rgbled/readme.md (100%)
 rename keyboards/{ => satt}/comet46/keymaps/default/config.h (100%)
 rename keyboards/{ => satt}/comet46/keymaps/default/keymap.c (100%)
 rename keyboards/{ => satt}/comet46/keymaps/default/readme.md (100%)
 rename keyboards/{ => satt}/comet46/keymaps/default/rules.mk (100%)
 rename keyboards/{ => satt}/comet46/keymaps/satt/action_pseudo_lut.c (100%)
 rename keyboards/{ => satt}/comet46/keymaps/satt/action_pseudo_lut.h (100%)
 rename keyboards/{ => satt}/comet46/keymaps/satt/config.h (100%)
 rename keyboards/{ => satt}/comet46/keymaps/satt/keymap.c (100%)
 rename keyboards/{ => satt}/comet46/keymaps/satt/keymap_jis2us.h (100%)
 rename keyboards/{ => satt}/comet46/keymaps/satt/readme.md (100%)
 rename keyboards/{ => satt}/comet46/keymaps/satt/rules.mk (100%)
 rename keyboards/{ => satt}/comet46/lib/glcdfont.c (100%)
 rename keyboards/{ => satt}/comet46/lib/host_led_state_reader.c (100%)
 rename keyboards/{ => satt}/comet46/lib/keylogger.c (100%)
 rename keyboards/{ => satt}/comet46/lib/modifier_state_reader.c (100%)
 rename keyboards/{ => satt}/comet46/matrix.c (100%)
 rename keyboards/{ => satt}/comet46/readme.md (96%)
 rename keyboards/{ => satt}/comet46/rules.mk (100%)
 rename keyboards/{ => satt}/comet46/ssd1306.c (100%)
 rename keyboards/{ => satt}/comet46/ssd1306.h (100%)

diff --git a/keyboards/comet46/comet46.c b/keyboards/satt/comet46/comet46.c
similarity index 100%
rename from keyboards/comet46/comet46.c
rename to keyboards/satt/comet46/comet46.c
diff --git a/keyboards/comet46/comet46.h b/keyboards/satt/comet46/comet46.h
similarity index 100%
rename from keyboards/comet46/comet46.h
rename to keyboards/satt/comet46/comet46.h
diff --git a/keyboards/comet46/config.h b/keyboards/satt/comet46/config.h
similarity index 100%
rename from keyboards/comet46/config.h
rename to keyboards/satt/comet46/config.h
diff --git a/keyboards/comet46/i2c.c b/keyboards/satt/comet46/i2c.c
similarity index 100%
rename from keyboards/comet46/i2c.c
rename to keyboards/satt/comet46/i2c.c
diff --git a/keyboards/comet46/i2c.h b/keyboards/satt/comet46/i2c.h
similarity index 100%
rename from keyboards/comet46/i2c.h
rename to keyboards/satt/comet46/i2c.h
diff --git a/keyboards/comet46/info.json b/keyboards/satt/comet46/info.json
similarity index 100%
rename from keyboards/comet46/info.json
rename to keyboards/satt/comet46/info.json
diff --git a/keyboards/comet46/keymaps/default-rgbled/keymap.c b/keyboards/satt/comet46/keymaps/default-rgbled/keymap.c
similarity index 100%
rename from keyboards/comet46/keymaps/default-rgbled/keymap.c
rename to keyboards/satt/comet46/keymaps/default-rgbled/keymap.c
diff --git a/keyboards/comet46/keymaps/default-rgbled/readme.md b/keyboards/satt/comet46/keymaps/default-rgbled/readme.md
similarity index 100%
rename from keyboards/comet46/keymaps/default-rgbled/readme.md
rename to keyboards/satt/comet46/keymaps/default-rgbled/readme.md
diff --git a/keyboards/comet46/keymaps/default/config.h b/keyboards/satt/comet46/keymaps/default/config.h
similarity index 100%
rename from keyboards/comet46/keymaps/default/config.h
rename to keyboards/satt/comet46/keymaps/default/config.h
diff --git a/keyboards/comet46/keymaps/default/keymap.c b/keyboards/satt/comet46/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/comet46/keymaps/default/keymap.c
rename to keyboards/satt/comet46/keymaps/default/keymap.c
diff --git a/keyboards/comet46/keymaps/default/readme.md b/keyboards/satt/comet46/keymaps/default/readme.md
similarity index 100%
rename from keyboards/comet46/keymaps/default/readme.md
rename to keyboards/satt/comet46/keymaps/default/readme.md
diff --git a/keyboards/comet46/keymaps/default/rules.mk b/keyboards/satt/comet46/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/comet46/keymaps/default/rules.mk
rename to keyboards/satt/comet46/keymaps/default/rules.mk
diff --git a/keyboards/comet46/keymaps/satt/action_pseudo_lut.c b/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
similarity index 100%
rename from keyboards/comet46/keymaps/satt/action_pseudo_lut.c
rename to keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.c
diff --git a/keyboards/comet46/keymaps/satt/action_pseudo_lut.h b/keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.h
similarity index 100%
rename from keyboards/comet46/keymaps/satt/action_pseudo_lut.h
rename to keyboards/satt/comet46/keymaps/satt/action_pseudo_lut.h
diff --git a/keyboards/comet46/keymaps/satt/config.h b/keyboards/satt/comet46/keymaps/satt/config.h
similarity index 100%
rename from keyboards/comet46/keymaps/satt/config.h
rename to keyboards/satt/comet46/keymaps/satt/config.h
diff --git a/keyboards/comet46/keymaps/satt/keymap.c b/keyboards/satt/comet46/keymaps/satt/keymap.c
similarity index 100%
rename from keyboards/comet46/keymaps/satt/keymap.c
rename to keyboards/satt/comet46/keymaps/satt/keymap.c
diff --git a/keyboards/comet46/keymaps/satt/keymap_jis2us.h b/keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
similarity index 100%
rename from keyboards/comet46/keymaps/satt/keymap_jis2us.h
rename to keyboards/satt/comet46/keymaps/satt/keymap_jis2us.h
diff --git a/keyboards/comet46/keymaps/satt/readme.md b/keyboards/satt/comet46/keymaps/satt/readme.md
similarity index 100%
rename from keyboards/comet46/keymaps/satt/readme.md
rename to keyboards/satt/comet46/keymaps/satt/readme.md
diff --git a/keyboards/comet46/keymaps/satt/rules.mk b/keyboards/satt/comet46/keymaps/satt/rules.mk
similarity index 100%
rename from keyboards/comet46/keymaps/satt/rules.mk
rename to keyboards/satt/comet46/keymaps/satt/rules.mk
diff --git a/keyboards/comet46/lib/glcdfont.c b/keyboards/satt/comet46/lib/glcdfont.c
similarity index 100%
rename from keyboards/comet46/lib/glcdfont.c
rename to keyboards/satt/comet46/lib/glcdfont.c
diff --git a/keyboards/comet46/lib/host_led_state_reader.c b/keyboards/satt/comet46/lib/host_led_state_reader.c
similarity index 100%
rename from keyboards/comet46/lib/host_led_state_reader.c
rename to keyboards/satt/comet46/lib/host_led_state_reader.c
diff --git a/keyboards/comet46/lib/keylogger.c b/keyboards/satt/comet46/lib/keylogger.c
similarity index 100%
rename from keyboards/comet46/lib/keylogger.c
rename to keyboards/satt/comet46/lib/keylogger.c
diff --git a/keyboards/comet46/lib/modifier_state_reader.c b/keyboards/satt/comet46/lib/modifier_state_reader.c
similarity index 100%
rename from keyboards/comet46/lib/modifier_state_reader.c
rename to keyboards/satt/comet46/lib/modifier_state_reader.c
diff --git a/keyboards/comet46/matrix.c b/keyboards/satt/comet46/matrix.c
similarity index 100%
rename from keyboards/comet46/matrix.c
rename to keyboards/satt/comet46/matrix.c
diff --git a/keyboards/comet46/readme.md b/keyboards/satt/comet46/readme.md
similarity index 96%
rename from keyboards/comet46/readme.md
rename to keyboards/satt/comet46/readme.md
index 3db64d291b..60cb432a48 100644
--- a/keyboards/comet46/readme.md
+++ b/keyboards/satt/comet46/readme.md
@@ -11,7 +11,7 @@ Firmware for nordic MCUs: [SRC and precompiled](https://github.com/satt99/comet4
 
 Make example for this keyboard (after setting up your build environment):
 
-    make comet46:default
+    make satt/comet46:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/comet46/rules.mk b/keyboards/satt/comet46/rules.mk
similarity index 100%
rename from keyboards/comet46/rules.mk
rename to keyboards/satt/comet46/rules.mk
diff --git a/keyboards/comet46/ssd1306.c b/keyboards/satt/comet46/ssd1306.c
similarity index 100%
rename from keyboards/comet46/ssd1306.c
rename to keyboards/satt/comet46/ssd1306.c
diff --git a/keyboards/comet46/ssd1306.h b/keyboards/satt/comet46/ssd1306.h
similarity index 100%
rename from keyboards/comet46/ssd1306.h
rename to keyboards/satt/comet46/ssd1306.h

From 0f926a8ae895580612313c866575969759a88db8 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Sat, 12 Feb 2022 09:14:07 +0800
Subject: [PATCH 616/867] move montex to IDOBAO vendor folder (#15668)

* move montex to IDOBAO vendor folder

* move montex to montex/v1
---
 keyboards/{montex => idobao/montex/v1}/config.h                 | 0
 keyboards/{montex => idobao/montex/v1}/info.json                | 0
 keyboards/{montex => idobao/montex/v1}/keymaps/default/keymap.c | 0
 keyboards/{montex => idobao/montex/v1}/keymaps/via/keymap.c     | 0
 keyboards/{montex => idobao/montex/v1}/keymaps/via/rules.mk     | 0
 keyboards/{montex => idobao/montex/v1}/readme.md                | 2 +-
 keyboards/{montex => idobao/montex/v1}/rules.mk                 | 0
 keyboards/{montex/montex.c => idobao/montex/v1/v1.c}            | 2 +-
 keyboards/{montex/montex.h => idobao/montex/v1/v1.h}            | 0
 9 files changed, 2 insertions(+), 2 deletions(-)
 rename keyboards/{montex => idobao/montex/v1}/config.h (100%)
 rename keyboards/{montex => idobao/montex/v1}/info.json (100%)
 rename keyboards/{montex => idobao/montex/v1}/keymaps/default/keymap.c (100%)
 rename keyboards/{montex => idobao/montex/v1}/keymaps/via/keymap.c (100%)
 rename keyboards/{montex => idobao/montex/v1}/keymaps/via/rules.mk (100%)
 rename keyboards/{montex => idobao/montex/v1}/readme.md (97%)
 rename keyboards/{montex => idobao/montex/v1}/rules.mk (100%)
 rename keyboards/{montex/montex.c => idobao/montex/v1/v1.c} (97%)
 rename keyboards/{montex/montex.h => idobao/montex/v1/v1.h} (100%)

diff --git a/keyboards/montex/config.h b/keyboards/idobao/montex/v1/config.h
similarity index 100%
rename from keyboards/montex/config.h
rename to keyboards/idobao/montex/v1/config.h
diff --git a/keyboards/montex/info.json b/keyboards/idobao/montex/v1/info.json
similarity index 100%
rename from keyboards/montex/info.json
rename to keyboards/idobao/montex/v1/info.json
diff --git a/keyboards/montex/keymaps/default/keymap.c b/keyboards/idobao/montex/v1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/montex/keymaps/default/keymap.c
rename to keyboards/idobao/montex/v1/keymaps/default/keymap.c
diff --git a/keyboards/montex/keymaps/via/keymap.c b/keyboards/idobao/montex/v1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/montex/keymaps/via/keymap.c
rename to keyboards/idobao/montex/v1/keymaps/via/keymap.c
diff --git a/keyboards/montex/keymaps/via/rules.mk b/keyboards/idobao/montex/v1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/montex/keymaps/via/rules.mk
rename to keyboards/idobao/montex/v1/keymaps/via/rules.mk
diff --git a/keyboards/montex/readme.md b/keyboards/idobao/montex/v1/readme.md
similarity index 97%
rename from keyboards/montex/readme.md
rename to keyboards/idobao/montex/v1/readme.md
index 8c4a7226ce..e9d84fa674 100644
--- a/keyboards/montex/readme.md
+++ b/keyboards/idobao/montex/v1/readme.md
@@ -16,6 +16,6 @@ Then press the button labeled SW2 located between the 2 upper LEDs.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make montex:default
+    make idobao/montex/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).
diff --git a/keyboards/montex/rules.mk b/keyboards/idobao/montex/v1/rules.mk
similarity index 100%
rename from keyboards/montex/rules.mk
rename to keyboards/idobao/montex/v1/rules.mk
diff --git a/keyboards/montex/montex.c b/keyboards/idobao/montex/v1/v1.c
similarity index 97%
rename from keyboards/montex/montex.c
rename to keyboards/idobao/montex/v1/v1.c
index 4d3ecb1860..e927383097 100644
--- a/keyboards/montex/montex.c
+++ b/keyboards/idobao/montex/v1/v1.c
@@ -14,4 +14,4 @@
 * along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.
 */
 
-#include "montex.h"
+#include "v1.h"
diff --git a/keyboards/montex/montex.h b/keyboards/idobao/montex/v1/v1.h
similarity index 100%
rename from keyboards/montex/montex.h
rename to keyboards/idobao/montex/v1/v1.h

From 40529e89de5a49b6d7978aedef9dd425d24f746d Mon Sep 17 00:00:00 2001
From: uqs <uqs@FreeBSD.org>
Date: Sat, 12 Feb 2022 04:22:47 +0100
Subject: [PATCH 617/867] [Keymap] Add uqs' keymaps for various boards and
 ploopy mouse (#16265)

---
 .../dactyl_manuform/5x6/keymaps/uqs/config.h  |  11 +
 .../dactyl_manuform/5x6/keymaps/uqs/keymap.c  | 170 +++++
 .../dactyl_manuform/5x6/keymaps/uqs/rules.mk  |   1 +
 keyboards/ploopyco/mouse/keymaps/uqs/keymap.c |  36 ++
 keyboards/ploopyco/mouse/keymaps/uqs/rules.mk |   1 +
 keyboards/preonic/keymaps/uqs/keymap.c        | 117 ++++
 keyboards/preonic/keymaps/uqs/rules.mk        |  14 +
 keyboards/splitkb/kyria/keymaps/uqs/config.h  |  13 +
 keyboards/splitkb/kyria/keymaps/uqs/keymap.c  | 158 +++++
 keyboards/splitkb/kyria/keymaps/uqs/rules.mk  |   1 +
 users/uqs/config.h                            |  40 ++
 users/uqs/rules.mk                            |  24 +
 users/uqs/uqs.c                               | 584 ++++++++++++++++++
 users/uqs/uqs.h                               |  77 +++
 14 files changed, 1247 insertions(+)
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/rules.mk
 create mode 100644 keyboards/ploopyco/mouse/keymaps/uqs/keymap.c
 create mode 100644 keyboards/ploopyco/mouse/keymaps/uqs/rules.mk
 create mode 100644 keyboards/preonic/keymaps/uqs/keymap.c
 create mode 100644 keyboards/preonic/keymaps/uqs/rules.mk
 create mode 100644 keyboards/splitkb/kyria/keymaps/uqs/config.h
 create mode 100644 keyboards/splitkb/kyria/keymaps/uqs/keymap.c
 create mode 100644 keyboards/splitkb/kyria/keymaps/uqs/rules.mk
 create mode 100644 users/uqs/config.h
 create mode 100644 users/uqs/rules.mk
 create mode 100644 users/uqs/uqs.c
 create mode 100644 users/uqs/uqs.h

diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
new file mode 100644
index 0000000000..4eca68c542
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
@@ -0,0 +1,11 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define USE_SERIAL
+
+#define RGBLED_NUM 12
+#define RGBLED_SPLIT {6,6}
+#define RGBLIGHT_LIMIT_VAL 127
+
+#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
new file mode 100644
index 0000000000..211cd91e12
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
@@ -0,0 +1,170 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4 cc=5,15,25,35,45,55,65:
+
+#include "uqs.h"
+
+/*
+ * My custom layout macro that allows for easy diff(1) operations between
+ * various keyboards. It probably doesn't make sense to you.
+ */
+#define LAYOUT_uqs(               \
+    L00, L01, L02, L03, L04, L05, \
+    L10, L11, L12, L13, L14, L15, \
+    L20, L21, L22, L23, L24, L25, \
+    L30, L31, L32, L33, L34, L35, \
+              L42, L43,           \
+         L44, L45, L54,           \
+         L55, L52, L53,           \
+    R00, R01, R02, R03, R04, R05, \
+    R10, R11, R12, R13, R14, R15, \
+    R20, R21, R22, R23, R24, R25, \
+    R30, R31, R32, R33, R34, R35, \
+              R42, R43,           \
+         R51, R40, R41,           \
+         R50, R52, R53            \
+)                                 \
+LAYOUT_5x6(                       \
+  L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+  L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+  L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+  L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+            L42, L43,                                              R42, R43,           \
+                      L44, L45,                          R40, R41,                     \
+                                L54, L55,      R50, R51,                               \
+                                L52, L53,      R52, R53                                \
+)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [L_QWER] = LAYOUT_uqs(
+     KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
+     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
+     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
+     KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
+                         KC_LBRC,  KC_RBRC,
+     /*thumb*/ LT_EXTD_ESC, KC_SPC, LT_MOUSE_ALT_SHIFT_INS,
+      /*aux*/  KC_LEAD,  OSM_GUI,  KC_LALT,
+     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINUS,
+     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
+     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_GRV),
+                         KC_MINS,  KC_EQL,
+     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
+      /*aux*/  KC_RALT,  KC_APP,   KC_LEAD
+  ),
+
+  [L_WASD] = LAYOUT_uqs(
+     KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
+     KC_T,     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,
+     KC_G,     KC_LSFT,  KC_A,     KC_S,     KC_D,     KC_F,
+     KC_B,     KC_GRV,   KC_Z,     KC_X,     KC_C,     KC_V,
+                         KC_LBRC,  KC_RBRC,
+     /*thumb*/ KC_LCTL,  KC_SPC,   KC_R,
+      /*aux*/  A(KC_M),  KC_LGUI,  KC_LALT,
+     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_BSPC,
+     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
+     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_GRV),
+                         KC_MINS,  KC_EQL,
+     /*thumb*/ DF(L_COLM), KC_ENT, KC_BSPC,
+      /*aux*/  KC_F5,    KC_RALT,  KC_APP
+  ),
+
+  [L_COLM] = LAYOUT_uqs(
+     KC_NO,    KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_NO,
+     KC_BTN2,  KC_Q,     KC_W,     KC_F,     KC_P,     KC_B,
+     KC_BTN1,  KC_G_A,   KC_A_R,   KC_S_S,   KC_C_T,   KC_G,
+     KC_BTN3,  KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,
+                         MS_WHUP,  MS_WHDN,
+     /*thumb*/ LT_EXTD_ESC, SFT_T(KC_SPC), LT(L_MOUSE, KC_TAB),
+      /*aux*/  KC_LEAD,  OSM_GUI,  KC_LALT,
+     KC_NO,    KC_BTN1,  KC_BTN2,  KC_BTN3,  KC_NO,    KC_NO,
+     KC_J,     KC_L,     KC_U,     KC_Y,     KC_QUOT,  KC_NO,
+     KC_M,     KC_C_N,   KC_S_E,   KC_A_I,   KC_G_O,   KC_NO,
+     KC_K,     KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_NO,
+                         KC_NO,    KC_NO,
+     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
+      /*aux*/  KC_LEAD,  KC_RALT,  KC_APP
+  ),
+
+  // Updated with inspiration from https://forum.colemak.com/topic/2014-extend-extra-extreme/
+  // I like the AltGr trick from https://stevep99.github.io/seniply/ and should probably incorporate some stuff from it.
+  [L_EXTD] = LAYOUT_uqs(
+     _______,  _______,  _______,  _______,  _______,  _______,
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
+     _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
+                         _______,  _______,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ can't be used */
+     _______,  _______,  _______,  _______,  _______,  _______,
+     KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_INS,   KC_NO,
+     KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_DEL,   KC_NO,
+     WIN_LEFT, WIN_DN,   WIN_UP,   WIN_RGHT, KC_PSTE,  KC_NO,  // KC_PSTE works in XTerm to emulate middle-click
+                         _______,  _______,
+     /*thumb*/ _______,  _______,  KC_BSPC,
+      /*aux*/  _______,  _______,  _______
+               /* ^^^^ use these */
+  ),
+
+  // TODO: maybe swap # with ;, that way I can roll :w or :wq which I need
+  // often ... probably better to add a combo?
+  [L_NUM] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,
+     _______,  KC_SCLN,  KC_COLN,  KC_LCBR,  KC_LPRN,  KC_LBRC,
+     _______,  KC_CIRC,  KC_AMPR,  KC_RCBR,  KC_RPRN,  KC_RBRC,
+                         KC_GRV,   KC_TILDE,
+     /*thumb*/ KC_ESC,   KC_SPC,   KC_0,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ use these */
+     KC_NUMLOCK,KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     KC_EQUAL, KC_7,     KC_8,     KC_9,     KC_KP_PLUS,_______,
+     KC_KP_ASTERISK,KC_4,KC_5,     KC_6,     MINS_UNDSCR,_______,
+     KC_COMM,  KC_1,     KC_2,     KC_3,     KC_KP_SLASH,KC_KP_ENTER,  // Enter here, because thumb is occupied
+                         KC_0,     KC_KP_DOT,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_FUNC] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     _______,  KC_NO,    KC_MUTE,  KC_VOLD,  KC_VOLU,  DF(L_WASD),
+     _______,  KC_LGUI,  KC_LALT,  KC_LSFT,  KC_LCTL,  DF(L_QWER),
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    DF(L_COLM),
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ use these */
+     KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
+     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_MOUSE] = LAYOUT_uqs(
+     _______,  _______,  _______,  _______,  _______,  _______,
+     _______,  KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_VOLU,
+     _______,  KC_NO,    KC_ACL0,  KC_ACL1,  KC_ACL2,  KC_VOLD,
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_MUTE,
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ can't be used */
+     _______,  _______,  _______,  _______,  _______,  _______,
+     _______,  _______,  KC_MS_UP, MS_WHUP,  _______,  _______,
+     MS_WHLEFT,KC_MS_L,  KC_MS_D,  KC_MS_R,  MS_WHRGHT,_______,
+     _______,  MS_WHDN,  KC_BTN3,  KC_BTN4,  KC_BTN5,  _______,
+                         KC_NO,    KC_NO,
+     /*thumb*/ KC_NO,    KC_BTN1,  KC_BTN2,
+      /*aux*/  _______,  _______,  _______
+               /* use these ^^^^ */
+  ),
+};
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/rules.mk
new file mode 100644
index 0000000000..2cd3745fa1
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/rules.mk
@@ -0,0 +1 @@
+#VIA_ENABLE = yes  # doesn't fit with 7 layers :/
diff --git a/keyboards/ploopyco/mouse/keymaps/uqs/keymap.c b/keyboards/ploopyco/mouse/keymaps/uqs/keymap.c
new file mode 100644
index 0000000000..564dad13df
--- /dev/null
+++ b/keyboards/ploopyco/mouse/keymaps/uqs/keymap.c
@@ -0,0 +1,36 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4:
+
+#include QMK_KEYBOARD_H
+
+enum custom_keycodes {
+    DBL_CLK_NO = SAFE_RANGE,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        // This works fine in xev(1) or a browser, but not in the game where I
+        // would want it. Maybe need to increase the delay? Also needs to be
+        // rewritten to use Deferred Execution.
+        case DBL_CLK_NO:
+            if (record->event.pressed) {
+                tap_code(KC_BTN2);
+                wait_ms(150);
+                tap_code(KC_BTN2);
+                wait_ms(300);
+                tap_code(KC_N);
+            }
+            return false;
+    }
+    return true;
+}
+
+
+// Layout is:
+// left-most, M1, M3, M2, right-most, fwd, back (on side), tiny middle one
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(KC_E, KC_BTN1, KC_BTN3, KC_BTN2, KC_LSFT, KC_BTN4, KC_BTN5, DF(1)),  // shooters
+    [1] = LAYOUT(KC_1, KC_BTN1, KC_Y, KC_BTN2, DBL_CLK_NO, KC_N, KC_Y, DF(0)),        // stardew valley, sword on 1
+};
diff --git a/keyboards/ploopyco/mouse/keymaps/uqs/rules.mk b/keyboards/ploopyco/mouse/keymaps/uqs/rules.mk
new file mode 100644
index 0000000000..59222a688a
--- /dev/null
+++ b/keyboards/ploopyco/mouse/keymaps/uqs/rules.mk
@@ -0,0 +1 @@
+#VIA_ENABLE = yes
diff --git a/keyboards/preonic/keymaps/uqs/keymap.c b/keyboards/preonic/keymaps/uqs/keymap.c
new file mode 100644
index 0000000000..ec22890388
--- /dev/null
+++ b/keyboards/preonic/keymaps/uqs/keymap.c
@@ -0,0 +1,117 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4 cc=5,15,25,35,45,55,65:
+
+#include "uqs.h"
+
+/*
+ * My custom layout macro that allows for easy diff(1) operations between
+ * various keyboards. It probably doesn't make sense to you.
+ */
+#define LAYOUT_uqs(               \
+    k00, k01, k02, k03, k04, k05, \
+    k10, k11, k12, k13, k14, k15, \
+    k20, k21, k22, k23, k24, k25, \
+    k30, k31, k32, k33, k34, k35, \
+         k43, k44,                \
+    k40, k41, k42,                \
+    k06, k07, k08, k09, k0a, k0b, \
+    k16, k17, k18, k19, k1a, k1b, \
+    k26, k27, k28, k29, k2a, k2b, \
+    k36, k37, k38, k39, k3a, k3b, \
+              k46, k48,           \
+                   k49, k4a, k4b  \
+)                                 \
+LAYOUT_preonic_2x2u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    k40, k41, k42, k43, k44,      k46,      k48, k49, k4a, k4b \
+)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [L_QWER] = LAYOUT_uqs(
+     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
+     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
+     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
+     KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
+
+     /*thumb*/ LT_EXTD_ESC, KC_SPC,
+      /*aux*/  KC_NO,    KC_LGUI,  KC_LALT,
+     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINUS,
+     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
+     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
+     /*thumb*/ KC_ENT,   LT_NUM_BSPC,
+      /*aux*/  MO(L_FUNC), KC_NO,  KC_NO
+  ),
+  [L_EXTD] = LAYOUT_uqs(
+     KC_F11,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
+     _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
+     /*thumb*/ _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ can't be used */
+     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F12,
+     KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_INS,   KC_NO,
+     KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_DEL,   KC_NO,
+     WIN_LEFT, WIN_DN,   WIN_UP,   WIN_RGHT, KC_PSTE,  KC_NO,
+     /*thumb*/ _______,  KC_BSPC,
+      /*aux*/  _______,  _______,  KC_ENTER
+               /* ^^^^ use these */
+  ),
+
+  [L_NUM] = LAYOUT_uqs(
+     KC_F11,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,
+     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,
+     _______,  KC_SCLN,  KC_COLN,  KC_LCBR,  KC_LPRN,  KC_LBRC,
+     _______,  KC_CIRC,  KC_AMPR,  KC_RCBR,  KC_RPRN,  KC_RBRC,
+     /*thumb*/ KC_ESC,   _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ use these */
+     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F12,
+     KC_EQUAL, KC_7,     KC_8,     KC_9,     KC_KP_PLUS,_______,
+     KC_KP_ASTERISK,KC_4,KC_5,     KC_6,     MINS_UNDSCR,_______,
+     KC_COMM,  KC_1,     KC_2,     KC_3,     KC_KP_SLASH,KC_KP_ENTER,  // Enter here, because thumb is occupied
+     /*thumb*/ _______,  _______,
+      /*aux*/  KC_0,     KC_KP_DOT, _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_FUNC] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     _______,  KC_NO,    KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_NO,
+     _______,  KC_LGUI,  KC_LALT,  KC_LSFT,  KC_LCTL,  KC_NO,
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ use these */
+     KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
+     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
+     /*thumb*/ _______,  _______,
+      /*aux*/  _______,  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_MOUSE] = LAYOUT_uqs(
+     KC_NO,    _______,  _______,  _______,  _______,  _______,
+     KC_NO,    KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_VOLU,
+     KC_NO,    KC_NO,    KC_ACL0,  KC_ACL1,  KC_ACL2,  KC_VOLD,
+     KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_MUTE,
+     /*thumb*/ _______,  _______,
+      /*aux*/  _______,  _______,  _______,
+               /* ^^^^ can't be used */
+     _______,  _______,  _______,  _______,  _______,  _______,
+     _______,  _______,  KC_MS_UP, MS_WHUP,  _______,  _______,
+     MS_WHLEFT,KC_MS_L,  KC_MS_D,  KC_MS_R,  MS_WHRGHT,_______,
+     _______,  MS_WHDN,  KC_BTN3,  KC_BTN4,  KC_BTN5,  _______,
+     /*thumb*/ KC_BTN1,  KC_BTN2,
+      /*aux*/  KC_NO,    KC_NO,    KC_NO
+               /* use these ^^^^ */
+  ),
+};
diff --git a/keyboards/preonic/keymaps/uqs/rules.mk b/keyboards/preonic/keymaps/uqs/rules.mk
new file mode 100644
index 0000000000..ca99fa107c
--- /dev/null
+++ b/keyboards/preonic/keymaps/uqs/rules.mk
@@ -0,0 +1,14 @@
+LTO_ENABLE=no
+AUDIO_ENABLE=no
+ENCODER_ENABLE=no
+
+# Broken with gcc >6, see https://github.com/qmk/qmk_firmware/issues/6753
+# (yes, different option, but I suspect the code has moved around)
+# This produces working firmware on Arch Linux with GCC 11, but is still broken
+# on Debian with 8.3.1
+RGBLIGHT_ENABLE=no
+RGB_MATRIX_ENABLE=no
+
+# not required, but helps on debian where there is a soft/hard float confusion.
+# but see above, gcc 8.3.1 still fucks up the firmware.
+USE_FPU=no
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/config.h b/keyboards/splitkb/kyria/keymaps/uqs/config.h
new file mode 100644
index 0000000000..ae34b0e04d
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/uqs/config.h
@@ -0,0 +1,13 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifdef RGBLIGHT_ENABLE
+  //#define RGBLIGHT_ANIMATIONS
+  #define RGBLIGHT_HUE_STEP 8
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 150
+#endif
+
+#define EE_HANDS
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/keymap.c b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
new file mode 100644
index 0000000000..53b6ee77b1
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/uqs/keymap.c
@@ -0,0 +1,158 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4 cc=5,15,25,35,45,55,65:
+
+#include "uqs.h"
+
+/*
+ * My custom layout macro that allows for easy diff(1) operations between
+ * various keyboards. It probably doesn't make sense to you.
+ */
+#define LAYOUT_uqs(               \
+    L00, L01, L02, L03, L04, L05, \
+    L12, L13, L14, L15, L16, L17, \
+    L24, L25, L26, L27, L28, L29, \
+              L40, L41,           \
+         L42, L43, L44,           \
+         L30, L31,                \
+    R06, R07, R08, R09, R10, R11, \
+    R18, R19, R20, R21, R22, R23, \
+    R34, R35, R36, R37, R38, R39, \
+              R48, R49,           \
+         R45, R46, R47,           \
+         R32, R33                 \
+)                                 \
+LAYOUT_stack(                     \
+    L00, L01, L02, L03, L04, L05,                   \
+    L12, L13, L14, L15, L16, L17,                   \
+    L24, L25, L26, L27, L28, L29, L30, L31,         \
+                   L40, L41, L42, L43, L44,         \
+                                                    \
+                  R06, R07, R08, R09, R10, R11,     \
+                  R18, R19, R20, R21, R22, R23,     \
+        R32, R33, R34, R35, R36, R37, R38, R39,     \
+        R45, R46, R47, R48, R49                     \
+)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [L_QWER] = LAYOUT_uqs(
+     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
+     KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
+     KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
+                         KC_LBRC,  KC_RBRC,
+     /*thumb*/ LT_EXTD_ESC, KC_SPC, LT_MOUSE_ALT_SHIFT_INS,
+      /*aux*/  OSM_GUI,  KC_LALT,
+     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
+     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_GRV),
+                         KC_MINS,  KC_EQL,
+     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
+      /*aux*/  KC_RALT,  KC_APP
+  ),
+
+  [L_WASD] = LAYOUT_uqs(
+     KC_T,     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,
+     KC_G,     KC_LSFT,  KC_A,     KC_S,     KC_D,     KC_F,
+     KC_B,     KC_GRV,   KC_Z,     KC_X,     KC_C,     KC_V,
+                         KC_LBRC,  KC_RBRC,
+     /*thumb*/ KC_LCTL,  KC_SPC,   KC_R,
+      /*aux*/  OSM_GUI,  KC_LALT,
+     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
+     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_GRV),
+                         KC_MINS,  KC_EQL,
+     /*thumb*/ DF(L_COLM), KC_ENT, KC_BSPC,
+      /*aux*/  KC_RALT,  KC_APP
+  ),
+
+  [L_COLM] = LAYOUT_uqs(
+     KC_BTN2,  KC_Q,     KC_W,     KC_F,     KC_P,     KC_B,
+     KC_BTN1,  KC_G_A,   KC_A_R,   KC_S_S,   KC_C_T,   KC_G,
+     KC_BTN3,  KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,
+                         MS_WHUP,  MS_WHDN,
+     /*thumb*/ LT_EXTD_ESC, SFT_T(KC_SPC), LT(L_MOUSE, KC_TAB),
+      /*aux*/  OSM_GUI,  KC_LALT,
+     KC_J,     KC_L,     KC_U,     KC_Y,     KC_QUOT,  KC_NO,
+     KC_M,     KC_C_N,   KC_S_E,   KC_A_I,   KC_G_O,   KC_NO,
+     KC_K,     KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_NO,
+                         KC_NO,    KC_NO,
+     /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
+      /*aux*/  KC_RALT,  KC_APP
+  ),
+
+  // Updated with inspiration from https://forum.colemak.com/topic/2014-extend-extra-extreme/
+  // I like the AltGr trick from https://stevep99.github.io/seniply/ and should probably incorporate some stuff from it.
+  [L_EXTD] = LAYOUT_uqs(
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
+     _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
+                         _______,  _______,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,
+               /* ^^^^ can't be used */
+     KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_INS,   KC_NO,
+     KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_DEL,   KC_NO,
+     WIN_LEFT, WIN_DN,   WIN_UP,   WIN_RGHT, KC_PSTE,  KC_NO,  // KC_PSTE works in XTerm to emulate middle-click
+                         _______,  _______,
+     /*thumb*/ _______,  _______,  KC_BSPC,
+      /*aux*/  _______,  _______
+               /* ^^^^ use these */
+  ),
+
+  // TODO: maybe swap # with ;, that way I can roll :w or :wq which I need
+  // often ... probably better to add a combo?
+  [L_NUM] = LAYOUT_uqs(
+     _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,
+     _______,  KC_SCLN,  KC_COLN,  KC_LCBR,  KC_LPRN,  KC_LBRC,
+     _______,  KC_CIRC,  KC_AMPR,  KC_RCBR,  KC_RPRN,  KC_RBRC,
+                         KC_GRV,   KC_TILDE,
+     /*thumb*/ KC_ESC,   KC_SPC,   KC_0,
+      /*aux*/  _______,_______,
+               /* ^^^^ use these */
+
+     KC_EQUAL, KC_7,     KC_8,     KC_9,     KC_KP_PLUS,_______,
+     KC_KP_ASTERISK,KC_4,KC_5,     KC_6,     MINS_UNDSCR,_______,
+     KC_COMM,  KC_1,     KC_2,     KC_3,     KC_KP_SLASH,KC_KP_ENTER,  // Enter here, because thumb is occupied
+                         KC_0,     KC_KP_DOT,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_FUNC] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_MUTE,  KC_VOLD,  KC_VOLU,  DF(L_WASD),
+     _______,  KC_LGUI,  KC_LALT,  KC_LSFT,  KC_LCTL,  DF(L_QWER),
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    DF(L_COLM),
+                         KC_NO,    KC_NO,
+     /*thumb*/ KC_NO,    KC_NO,    KC_NO,
+      /*aux*/  _______,  _______,
+               /* ^^^^ use these */
+
+     KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
+     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______
+               /* ^^^^ can't be used */
+  ),
+
+  [L_MOUSE] = LAYOUT_uqs(
+     _______,  KC_NO,    KC_BTN2,  KC_BTN3,  KC_BTN1,  KC_VOLU,
+     _______,  KC_NO,    KC_ACL0,  KC_ACL1,  KC_ACL2,  KC_VOLD,
+     _______,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_MUTE,
+                         KC_NO,    KC_NO,
+     /*thumb*/ _______,  _______,  _______,
+      /*aux*/  _______,  _______,
+               /* ^^^^ can't be used */
+
+     _______,  _______,  KC_MS_UP, MS_WHUP,  _______,  _______,
+     MS_WHLEFT,KC_MS_L,  KC_MS_D,  KC_MS_R,  MS_WHRGHT,_______,
+     _______,  MS_WHDN,  KC_BTN3,  KC_BTN4,  KC_BTN5,  _______,
+                         KC_NO,    KC_NO,
+     /*thumb*/ KC_NO,    KC_BTN1,  KC_BTN2,
+      /*aux*/  _______,  _______
+               /* use these ^^^^ */
+  ),
+};
diff --git a/keyboards/splitkb/kyria/keymaps/uqs/rules.mk b/keyboards/splitkb/kyria/keymaps/uqs/rules.mk
new file mode 100644
index 0000000000..517f469b6d
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/uqs/rules.mk
@@ -0,0 +1 @@
+OLED_ENABLE = no
diff --git a/users/uqs/config.h b/users/uqs/config.h
new file mode 100644
index 0000000000..b8a140fe87
--- /dev/null
+++ b/users/uqs/config.h
@@ -0,0 +1,40 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#ifdef RGBLIGHT_ENABLE
+#    define RGBLIGHT_SLEEP
+//#    define RGBLIGHT_ANIMATIONS      // disabled to save space
+#    define RGBLIGHT_LAYERS
+#    define RGBLIGHT_MAX_LAYERS 8      // default is 16
+#    define RGBLIGHT_DISABLE_KEYCODES  // RGB_foo keys no longer work, saves 600 bytes
+#    define RGBLIGHT_DEFAULT_HUE 15
+#endif
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6  // default is 4 for VIA builds
+
+#define TAPPING_TOGGLE 2  // number of taps for a toggle-on-tap
+#define TAPPING_TERM 170  // ms to trigger tap
+// https://precondition.github.io/home-row-mods
+#define TAPPING_FORCE_HOLD  // make tap-then-hold _not_ do key auto repeat
+#define IGNORE_MOD_TAP_INTERRUPT
+#define PERMISSIVE_HOLD  // I don't think this works for me, hence I rolled my own implementation.
+
+#define LEADER_TIMEOUT 400
+#define LEADER_PER_KEY_TIMING
+
+#define UNICODE_SELECTED_MODES UC_LNX
+
+// make KC_ACL0 et al work when held.
+#define MK_COMBINED
+#define MOUSEKEY_WHEEL_INTERVAL 40  // default is 50, lower means more scroll events, 40 works ok.
+
+// From https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
+#define USB_POLLING_INTERVAL_MS 1
+
+#ifdef KEYBOARD_preonic_rev3
+// Some games seem to not register Esc otherwise when tapped, maybe try with this delay?
+#    define TAP_CODE_DELAY 30
+#else
+#    define TAP_CODE_DELAY 10
+#endif
diff --git a/users/uqs/rules.mk b/users/uqs/rules.mk
new file mode 100644
index 0000000000..6050362952
--- /dev/null
+++ b/users/uqs/rules.mk
@@ -0,0 +1,24 @@
+# don't include for keyboards/ploopyco/mouse/keymaps/uqs
+ifeq ($(filter $(strip $(KEYBOARD)),ploopyco/mouse),)
+    SRC += uqs.c
+
+    RGBLIGHT_ENABLE ?= yes      # Enable keyboard RGB underglow
+    LTO_ENABLE ?= yes  # disables the legacy TMK Macros and Functions features
+
+    UCIS_ENABLE = yes
+    LEADER_ENABLE = yes
+    COMBO_ENABLE = yes
+    MOUSEKEY_ENABLE = yes
+
+    # Disable all the unused stuff.
+    SPACE_CADET_ENABLE = no
+    COMMAND_ENABLE = no
+    MAGIC_ENABLE = no
+endif
+
+# From https://michael.stapelberg.ch/posts/2021-05-08-keyboard-input-latency-qmk-kinesis/
+# adds about 900 bytes! Don't use it on puny AVR though.
+# ifeq (,$(filter $(MCU), atmega16u2 atmega32u2 at90usb162)) # doesn't work MCU not set yet
+ifneq (,$(filter $(KEYBOARD),ploopyco/mouse preonic/rev3))
+    DEBOUNCE_TYPE = asym_eager_defer_pk
+endif
diff --git a/users/uqs/uqs.c b/users/uqs/uqs.c
new file mode 100644
index 0000000000..72284143c6
--- /dev/null
+++ b/users/uqs/uqs.c
@@ -0,0 +1,584 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4:
+
+#include "uqs.h"
+
+// LOG:
+// late Jan 2020, got Ohkeycaps Dactyl Manuform 5x6
+// https://play.typeracer.com shows about 75-80wpm (en) or ~400cpm (de) on my classic keeb.
+// Never did proper touch typing, basically didn't use ring finger much, mostly index/middle and pinky (only to hold down modifiers, really).
+// Feb 2020, switching to Colemak DH after 30 years of Qwerty, uh oh...
+// mid Feb, 20wpm/87% on monkeytype.com (no punct, numbers)
+// early March, 28wpm/90% on MT (plus punct./numbers from here on); 25wpm on typeracer
+// early April, 35wpm/92% on MT; 41wpm on typeracer
+// early May, 45wpm/96% on MT; 46wpm on typeracer; my qwerty is deteriorating, I need to look at the keys more and more o_O
+// early June, 49wpm/95% on MT (sigh ...); 50wpm on typeracer;
+// early July, 50wpm/96% on MT (...); 52wpm/96% on typeracer;
+// early August, 55wpm/96% on MT; 55wpm/98% on typeracer;
+// early September, 57wpm/97% on MT; 58wpm/97% on typeracer;
+// early October, 59wpm/96% on MT; 61wpm/97% on typeracer;
+// November, 56wpm/97% on MT; 62wpm/98% on typeracer;
+// December, 62wpm/96% on MT; 66wpm/98% on typeracer;
+// January, 61wpm/97% on MT; 65wpm/98% on typeracer;
+// February, 64wpm/97% on MT; 67wpm/98% on typeracer; my qwerty on the laptop is still fine, but I miss my shortcuts badly.
+//
+// So that's one year on Colemak. Was it worth the switch? Probably not, though
+// I also had to first learn proper technique, but that was actually swift, as
+// the keyboard nicely forces that on you. I really like home row mods though,
+// they are so comfy. Need to rethink my combos some more, still.
+
+
+#ifdef RGBLIGHT_LAYERS
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(L_QWER, layer_state_cmp(state, L_QWER));
+    rgblight_set_layer_state(L_WASD, layer_state_cmp(state, L_WASD));
+    rgblight_set_layer_state(L_COLM, layer_state_cmp(state, L_COLM));
+    return state;
+}
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#if 0
+    // defining layer L_FUNC when both keys are pressed
+    state = update_tri_layer_state(state, L_EXTD, L_NUM, L_FUNC);
+#endif
+#ifdef RGBLIGHT_LAYERS
+    rgblight_set_layer_state(L_EXTD, layer_state_cmp(state, L_EXTD));
+    rgblight_set_layer_state(L_NUM, layer_state_cmp(state, L_NUM));
+    rgblight_set_layer_state(L_FUNC, layer_state_cmp(state, L_FUNC));
+    rgblight_set_layer_state(L_MOUSE, layer_state_cmp(state, L_MOUSE));
+#else
+#endif
+    return state;
+}
+
+#ifdef RGBLIGHT_LAYERS
+// NOTE: at most 2 elements, last one needs to be RGBLIGHT_END_SEGMENTS
+typedef rgblight_segment_t rgblight_layer_t[3];
+
+const rgblight_layer_t PROGMEM my_rgb_segments[] = {
+    [L_QWER] = {{0, RGBLED_NUM, HSV_WHITE},  RGBLIGHT_END_SEGMENTS},
+    [L_WASD] = {{0, RGBLED_NUM/2, HSV_RED}, {RGBLED_NUM/2, RGBLED_NUM/2, HSV_OFF}, RGBLIGHT_END_SEGMENTS},
+    [L_COLM] = {{0, RGBLED_NUM, HSV_GREEN},  RGBLIGHT_END_SEGMENTS},
+    [L_EXTD] = {{0, RGBLED_NUM, HSV_BLUE},   RGBLIGHT_END_SEGMENTS},
+    [L_NUM] =  {{0, RGBLED_NUM, HSV_ORANGE}, RGBLIGHT_END_SEGMENTS},
+    [L_FUNC] = {{0, RGBLED_NUM, HSV_YELLOW}, RGBLIGHT_END_SEGMENTS},
+    [L_MOUSE]= {{0, RGBLED_NUM, HSV_PURPLE}, RGBLIGHT_END_SEGMENTS},
+};
+
+// This array needs pointers, :/
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = {
+    my_rgb_segments[L_QWER],
+    my_rgb_segments[L_WASD],
+    my_rgb_segments[L_COLM],
+    my_rgb_segments[L_EXTD],
+    my_rgb_segments[L_NUM],
+    my_rgb_segments[L_FUNC],
+    my_rgb_segments[L_MOUSE],
+};
+
+_Static_assert(sizeof(my_rgb_layers) / sizeof(my_rgb_layers[0]) ==
+        sizeof(my_rgb_segments) / sizeof(my_rgb_segments[0]),
+        "Number of rgb_segment definitions does not match up!");
+#endif
+
+#ifdef COMBO_ENABLE
+enum combo_events {
+  C_AUML,
+  C_OUML,
+  C_UUML,
+  C_SZ,
+  C_CBR,
+  C_PRN,
+  C_BRC,
+};
+
+// Maybe use this?
+// #define COMBO_ONLY_FROM_LAYER L_COLM
+
+// The official way has way too much duplication and intermediate names for my taste...
+const uint16_t PROGMEM my_action_combos[][3] = {
+    [C_AUML] = {KC_G_A, KC_W, COMBO_END},
+    [C_OUML] = {KC_G_O, KC_Y, COMBO_END},
+    [C_UUML] = {KC_C_N, KC_U, COMBO_END},
+    [C_SZ]   = {KC_S_S, KC_Z, COMBO_END},
+    [C_CBR]  = {KC_COLN, KC_LCBR, COMBO_END},
+    [C_PRN]  = {KC_LCBR, KC_LPRN, COMBO_END},
+    [C_BRC]  = {KC_LPRN, KC_LBRC, COMBO_END},
+};
+const uint16_t PROGMEM my_combos[][4] = {
+    {KC_LPRN, KC_F, KC_P, COMBO_END},
+    {KC_RPRN, KC_C, KC_D, COMBO_END},
+    {KC_LCBR, KC_W, KC_F, COMBO_END},
+    {KC_RCBR, KC_X, KC_C, COMBO_END},
+    {KC_TAB,  KC_G_A, KC_A_R, COMBO_END},
+    {KC_BSLS, KC_B, KC_J, COMBO_END},  // remove this?
+    {KC_BSLS, KC_F, KC_U, COMBO_END},
+    {LSFT(KC_BSLS), KC_P, KC_L, COMBO_END},
+    {KC_MINUS, KC_C_T, KC_C_N, COMBO_END},
+    {LSFT(KC_MINUS), KC_D, KC_H, COMBO_END},
+    {KC_GRV,  KC_Q, KC_W, COMBO_END},  // remove this?
+    {KC_GRV,  KC_C, KC_COMM, COMBO_END},
+    {LSFT(KC_GRV), KC_G, KC_M, COMBO_END},
+    {KC_BTN3, KC_BTN1, KC_BTN2, COMBO_END},
+    {KC_BTN1, KC_BTN2, KC_BTN3, COMBO_END},
+};
+
+const uint16_t COMBO_LEN = sizeof(my_action_combos) / sizeof(my_action_combos[0]) + sizeof(my_combos) / sizeof(my_combos[0]);
+
+#define MY_ACTION_COMBO(ck) \
+    [ck] = { .keys = &(my_action_combos[ck][0]) }
+#define MY_COMBO(ck) \
+    { .keys = &(my_combos[ck][1]), .keycode = my_combos[ck][0] }
+
+// NOTE: while my_combos can live in PROGMEM, the key_combos data also
+// contains state that is tweaked at runtime, so we need to indirect. Ugh.
+#define COMBO_STATICALLY
+#ifdef COMBO_STATICALLY
+// TODO: fill this at runtime with a loop?
+combo_t key_combos[] = {
+  MY_ACTION_COMBO(0),
+  MY_ACTION_COMBO(1),
+  MY_ACTION_COMBO(2),
+  MY_ACTION_COMBO(3),
+  MY_ACTION_COMBO(4),
+  MY_ACTION_COMBO(5),
+  MY_ACTION_COMBO(6),
+  MY_COMBO(0),
+  MY_COMBO(1),
+  MY_COMBO(2),
+  MY_COMBO(3),
+  MY_COMBO(4),
+  MY_COMBO(5),
+  MY_COMBO(6),
+  MY_COMBO(7),
+  MY_COMBO(8),
+  MY_COMBO(9),
+  MY_COMBO(10),
+  MY_COMBO(11),
+  MY_COMBO(12),
+  MY_COMBO(13),
+  MY_COMBO(14),
+};
+
+_Static_assert(sizeof(key_combos) / sizeof(key_combos[0]) ==
+        (sizeof(my_action_combos) / sizeof(my_action_combos[0]) + sizeof(my_combos) / sizeof(my_combos[0])),
+        "Number of combo definitions does not match up!");
+#else
+combo_t key_combos[sizeof(my_action_combos) / sizeof(my_action_combos[0]) + sizeof(my_combos) / sizeof(my_combos[0])];
+#endif
+
+void process_combo_event(uint16_t combo_index, bool pressed) {
+    switch (combo_index) {
+        case C_AUML:
+            if (pressed) {
+                tap_code16(KC_RALT);
+                tap_code16(LSFT(KC_QUOT));
+                tap_code16(KC_A);
+            }
+            break;
+        case C_OUML:
+            if (pressed) {
+                tap_code16(KC_RALT);
+                tap_code16(LSFT(KC_QUOT));
+                tap_code16(KC_O);
+            }
+            break;
+        case C_UUML:
+            if (pressed) {
+                tap_code16(KC_RALT);
+                tap_code16(LSFT(KC_QUOT));
+                tap_code16(KC_U);
+            }
+            break;
+        case C_SZ:
+            if (pressed) {
+                tap_code16(KC_RALT);
+                tap_code16(KC_S);
+                tap_code16(KC_S);
+            }
+            break;
+        case C_CBR:
+            if (pressed) {
+                tap_code16(KC_LCBR);
+                tap_code16(KC_RCBR);
+                tap_code16(KC_LEFT);
+            }
+            break;
+        case C_PRN:
+            if (pressed) {
+                tap_code16(KC_LPRN);
+                tap_code16(KC_RPRN);
+                tap_code16(KC_LEFT);
+            }
+            break;
+        case C_BRC:
+            if (pressed) {
+                tap_code16(KC_LBRC);
+                tap_code16(KC_RBRC);
+                tap_code16(KC_LEFT);
+            }
+            break;
+    }
+}
+#endif
+
+void keyboard_post_init_user(void) {
+#ifndef KEYBOARD_preonic_rev3
+    default_layer_set(1ul << L_COLM);
+#endif
+#ifdef RGBLIGHT_LAYERS
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+    rgblight_set_layer_state(0, true);
+#endif
+#if defined(COMBO_ENABLE) && !defined(COMBO_STATICALLY)
+    uint8_t i = 0;
+    for (; i < sizeof(my_action_combos) / sizeof(my_action_combos[0]); i++) {
+        key_combos[i].keys = &(my_action_combos[i][0]);
+    }
+    for (uint8_t j = 0; j < sizeof(my_combos) / sizeof(my_combos[0]); j++, i++) {
+        key_combos[i].keycode = my_combos[j][0];
+        key_combos[i].keys = &(my_combos[j][1]);
+    }
+#endif
+}
+
+uint16_t key_timer;
+bool delkey_registered;
+bool num_layer_was_used;
+bool extd_layer_was_used;
+// These keep state about the long-press-means-umlaut keys.
+bool auml_pressed;
+bool ouml_pressed;
+bool uuml_pressed;
+
+void maybe_send_umlaut(uint16_t keycode, bool *is_pressed) {
+    // Some other key did _not_ already re-arm this key, so now we need to do
+    // that ourselves.
+    if (*is_pressed) {
+        *is_pressed = false;
+        // If released within the timer, then just KC_A, KC_O, KC_U
+        if (timer_elapsed(key_timer) < TAPPING_TERM) {
+            tap_code16(keycode);
+        } else {
+            tap_code16(KC_RALT);
+            tap_code16(LSFT(KC_QUOT));
+            tap_code16(keycode);
+        }
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    // TODO: why not use key_timer here? is it dynamic or not?
+    static uint16_t extd_layer_timer;
+    if (layer_state_is(L_EXTD) && record->event.pressed) {
+        extd_layer_was_used = true;
+    }
+    if (layer_state_is(L_NUM) && record->event.pressed) {
+        num_layer_was_used = true;
+    }
+
+    // An umlaut key was pressed previously (but will only emit the key on
+    // release), but we've pressed a different key now, so fire the regular key,
+    // re-arm it and continue with whatever actual key was pressed just now.
+    if (record->event.pressed) {
+        if (auml_pressed) {
+            tap_code16(KC_A);
+            auml_pressed = false;
+        }
+        if (ouml_pressed) {
+            tap_code16(KC_O);
+            ouml_pressed = false;
+        }
+        if (uuml_pressed) {
+            tap_code16(KC_U);
+            uuml_pressed = false;
+        }
+    }
+
+    switch (keycode) {
+        // From https://github.com/qmk/qmk_firmware/issues/6053
+    case LT_EXTD_ESC:
+        if (record->event.pressed) {
+            extd_layer_was_used = false;
+            extd_layer_timer = timer_read();
+            layer_on(L_EXTD);
+        } else {
+            layer_off(L_EXTD);
+            unregister_mods(MOD_BIT(KC_LALT));   // undo what ALT_TAB might've set
+            // NOTE: need to track whether we made use of the extd layer and
+            // that all happened within the tapping term. Otherwise we'd emit
+            // that layer key code _plus_ an extra Esc.
+            if (timer_elapsed(extd_layer_timer) < TAPPING_TERM && !extd_layer_was_used) {
+                tap_code(KC_ESC);
+            }
+        }
+        return true;
+    case LT_NUM_BSPC:
+        if (record->event.pressed){
+            num_layer_was_used = false;
+            extd_layer_timer = timer_read();
+            layer_on(L_NUM);
+        } else {
+            layer_off(L_NUM);
+            // NOTE: Custom LT method so that any press of a key on that layer will prevent the backspace.
+            if (timer_elapsed(extd_layer_timer) < TAPPING_TERM && !num_layer_was_used) {
+                tap_code(KC_BSPC);
+            }
+        }
+        return true;
+    case LT_MOUSE_ALT_SHIFT_INS:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            layer_on(L_MOUSE);
+        } else {
+            layer_off(L_MOUSE);
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                tap_code16(LALT(LSFT(KC_INS)));
+            }
+        }
+        return true;
+    case LT_FUNC_SHIFT_INS:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            layer_on(L_FUNC);
+        } else {
+            layer_off(L_FUNC);
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                tap_code16(LSFT(KC_INS));
+            }
+        }
+        return true;
+#if 1
+        /* Looks like PERMISSIVE_HOLD on LT and OSM doesn't work properly. This
+         * is probaby https://github.com/qmk/qmk_firmware/issues/8971
+         */
+    case OSM_GUI:
+        /* OSM(MOD_LGUI) is delaying the event, but I need immediate triggering
+         * of the modifier to move windows around with the mouse. If only
+         * tapped, however, have it be a win OSM */
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            register_mods(MOD_BIT(KC_LGUI));
+        } else {
+            unregister_mods(MOD_BIT(KC_LGUI));
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                add_oneshot_mods(MOD_BIT(KC_LGUI));
+            } else {
+                del_oneshot_mods(MOD_BIT(KC_LGUI));
+            }
+        }
+        return true;
+        // Why do I have to roll my own? It seems the original ones work on
+        // keyrelease, at which time I might have let go of the layer tap
+        // already, so I cannot roll them fast...
+    case OSM_SFT:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            register_mods(MOD_BIT(KC_LSFT));
+        } else {
+            unregister_mods(MOD_BIT(KC_LSFT));
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                add_oneshot_mods(MOD_BIT(KC_LSFT));
+            } /*else {
+                del_oneshot_mods(MOD_BIT(KC_LSFT));
+            }*/
+        }
+        return true;
+    case OSM_CTL:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            register_mods(MOD_BIT(KC_LCTL));
+        } else {
+            unregister_mods(MOD_BIT(KC_LCTL));
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                add_oneshot_mods(MOD_BIT(KC_LCTL));
+            } /*else {
+                del_oneshot_mods(MOD_BIT(KC_LCTL));
+            }*/
+        }
+        return true;
+    case OSM_ALT:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            register_mods(MOD_BIT(KC_LALT));
+        } else {
+            unregister_mods(MOD_BIT(KC_LALT));
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                add_oneshot_mods(MOD_BIT(KC_LALT));
+            } /*else {
+                del_oneshot_mods(MOD_BIT(KC_LALT));
+            }*/
+        }
+        return true;
+#else
+#define OSM_ALT OSM(MOD_LALT)
+#define OSM_CTL OSM(MOD_LCTL)
+#define OSM_GUI OSM(MOD_LGUI)
+#define OSM_SFT OSM(MOD_LSFT)
+#endif
+    // Obsoleted by using combos for umlauts now.
+    case KC_A_AE:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            auml_pressed = true;
+        } else {
+            maybe_send_umlaut(KC_A, &auml_pressed);
+        }
+        break;
+    case KC_O_OE:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            ouml_pressed = true;
+        } else {
+            maybe_send_umlaut(KC_O, &ouml_pressed);
+        }
+        break;
+    case KC_U_UE:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            uuml_pressed = true;
+        } else {
+            maybe_send_umlaut(KC_U, &uuml_pressed);
+        }
+        break;
+    case MINS_UNDSCR:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+        } else {
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                // Can't send KC_KP_MINUS, it doesn't compose to, say →
+                tap_code16(KC_MINUS);
+            } else {
+                tap_code16(KC_UNDERSCORE);
+            }
+        }
+        break;
+    case ALT_TAB:
+        if (record->event.pressed) {
+            register_mods(MOD_BIT(KC_LALT));
+            tap_code16(KC_TAB);
+        }
+        break;
+    case INS_HARD:
+        // Do Alt-Shift-Ins first to have xdotool copy from SELECTION to CLIPBOARD, then Shift-Ins to paste.
+        if (record->event.pressed) {
+            tap_code16(LSFT(LALT(KC_INS)));
+        } else {
+            tap_code16(LSFT(KC_INS));
+        }
+        break;
+    case SHIFT_INS:
+        if (record->event.pressed) {
+            // when keycode is pressed
+            key_timer = timer_read();
+            // Shift when held ...
+            register_mods(MOD_BIT(KC_RSFT));
+        } else {
+            // If released within the timer, then Shift+Ins
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                tap_code16(KC_INS);
+            }
+            unregister_mods(MOD_BIT(KC_RSFT));
+        }
+        break;
+    case ALT_SHIFT_INS:
+        if (record->event.pressed) {
+            key_timer = timer_read();
+            // Shift when held ...
+            register_mods(MOD_BIT(KC_LSFT));
+        } else {
+            // If released within the timer, then Shift+Alt+Ins
+            if (timer_elapsed(key_timer) < TAPPING_TERM) {
+                register_mods(MOD_BIT(KC_LALT));
+                tap_code16(KC_INS);
+            }
+            // Note: this makes xev(1) see KeyPress for Meta_L but KeyRelease for Alt_L
+            unregister_mods(MOD_BIT(KC_LSFT) | MOD_BIT(KC_LALT));
+        }
+        break;
+/*
+ * Obsoleted by making tmux understand Ctrl-(Shift)-Tab natively.
+    case TM_NEXT:
+        if (record->event.pressed) SEND_STRING(SS_LCTRL("a") "n");
+        break;
+    case TM_PREV:
+        if (record->event.pressed) SEND_STRING(SS_LCTRL("a") "p");
+        break;
+*/
+        // TODO: use key overrides to turn, e.g. Win+Ctrl-Tab into VIM_NEXT.
+        // Not sure why Ctrl-Pgup works in vim, but not in vim-inside-tmux.
+    case VIM_NEXT:
+        if (record->event.pressed) SEND_STRING(SS_TAP(X_ESC) SS_TAP(X_G) SS_TAP(X_T));
+        break;
+    case VIM_PREV:
+        if (record->event.pressed) SEND_STRING(SS_TAP(X_ESC) SS_TAP(X_G) SS_LSFT("t"));
+        break;
+    case WIN_LEFT:
+        if (record->event.pressed) SEND_STRING(SS_LCTRL("w") SS_TAP(X_H));
+        break;
+    case WIN_DN:
+        if (record->event.pressed) SEND_STRING(SS_LCTRL("w") SS_TAP(X_J));
+        break;
+    case WIN_UP:
+        if (record->event.pressed) SEND_STRING(SS_LCTRL("w") SS_TAP(X_K));
+        break;
+    case WIN_RGHT:
+        if (record->event.pressed) SEND_STRING(SS_LCTRL("w") SS_TAP(X_L));
+        break;
+    }
+
+    return true;
+}
+
+#ifdef LEADER_ENABLE
+LEADER_EXTERNS();
+
+void matrix_scan_user(void) {
+  LEADER_DICTIONARY() {
+    leading = false;
+    leader_end();
+
+#ifdef UCIS_ENABLE
+    SEQ_ONE_KEY(KC_U) {
+      qk_ucis_start();
+    }
+#endif
+    SEQ_ONE_KEY(KC_H) {
+      send_unicode_string("ᕕ( ᐛ )ᕗ");  // happy
+    }
+    SEQ_ONE_KEY(KC_D) {
+      send_unicode_string("ಠ_ಠ");  // disapproval
+    }
+    SEQ_ONE_KEY(KC_L) {
+      send_unicode_string("( ͡° ͜ʖ ͡°)");  // lenny
+    }
+    SEQ_ONE_KEY(KC_S) {
+      send_unicode_string("¯\\_(ツ)_/¯");  // shrug
+    }
+    // tableflip (LEADER - TF)
+    SEQ_TWO_KEYS(KC_T, KC_F) {
+      //set_unicode_input_mode(UC_LNX);
+      //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
+      send_unicode_string("(╯°□°）╯︵ ┻━┻");
+    }
+    // untableflip
+    SEQ_THREE_KEYS(KC_U, KC_T, KC_F) {
+      //set_unicode_input_mode(UC_LNX);
+      //send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
+      send_unicode_string("┬─┬ノ( º _ ºノ)");
+    }
+  }
+}
+#endif
+
+#ifdef UCIS_ENABLE
+// 3 codepoints at most, otherwise increase UCIS_MAX_CODE_POINTS
+const qk_ucis_symbol_t ucis_symbol_table[] = UCIS_TABLE(
+    UCIS_SYM("poop", 0x1F4A9),                // 💩
+    UCIS_SYM("rofl", 0x1F923),                // 🤣
+    UCIS_SYM("look", 0x0CA0, 0x005F, 0x0CA0)  // ಠ_ಠ
+);
+#endif
diff --git a/users/uqs/uqs.h b/users/uqs/uqs.h
new file mode 100644
index 0000000000..f8b30caf79
--- /dev/null
+++ b/users/uqs/uqs.h
@@ -0,0 +1,77 @@
+// Copyright 2022 Ulrich Spörlein (@uqs)
+// SPDX-License-Identifier: GPL-2.0-or-later
+// vi:et sw=4:
+#pragma once
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    L_QWER = 0,
+    L_WASD,  // wasd gaming
+    L_COLM,  // Colemak DHm
+    L_EXTD,
+    L_NUM,
+    L_FUNC,
+    L_MOUSE,
+    L_LAST, // unused
+};
+
+#ifdef VIA_ENABLE
+_Static_assert(DYNAMIC_KEYMAP_LAYER_COUNT >= L_LAST, "VIA enabled, but not enough DYNAMIC_KEYMAP_LAYER_COUNT for all layers");
+#endif
+
+#define KC_CTAB LCTL(KC_TAB)
+#define KC_SCTAB LCTL(LSFT(KC_TAB))
+
+// Custom single-key codes, see uqs.c for the combos.
+enum custom_keycodes {
+    SHIFT_INS = SAFE_RANGE,
+    ALT_SHIFT_INS,
+    INS_HARD,
+    KC_A_AE,
+    KC_O_OE,
+    KC_U_UE,
+    MINS_UNDSCR,  // obsoleted by combos, remove this!
+    TM_NEXT,
+    TM_PREV,
+    VIM_NEXT,
+    VIM_PREV,
+    WIN_LEFT,
+    WIN_RGHT,
+    WIN_UP,
+    WIN_DN,
+    LT_EXTD_ESC,
+    LT_NUM_BSPC,
+    LT_MOUSE_ALT_SHIFT_INS,
+    LT_FUNC_SHIFT_INS,
+    OSM_GUI,
+    OSM_SFT,
+    OSM_CTL,
+    OSM_ALT,
+    ALT_TAB,
+};
+
+#ifndef LEADER_ENABLE
+#define KC_LEAD KC_NO
+#endif
+
+// Shorter names
+#define MS_WHDN KC_MS_WH_DOWN
+#define MS_WHUP KC_MS_WH_UP
+#define MS_WHLEFT KC_MS_WH_LEFT
+#define MS_WHRGHT KC_MS_WH_RIGHT
+
+// GASC/◆⎇⇧⎈ home row mod, read all about it here:
+// https://precondition.github.io/home-row-mods
+// Left-hand home row mods
+#define KC_G_A LGUI_T(KC_A)
+#define KC_A_R LALT_T(KC_R)
+#define KC_S_S LSFT_T(KC_S)
+#define KC_C_T LCTL_T(KC_T)
+
+// Right-hand home row mods
+#define KC_C_N RCTL_T(KC_N)
+#define KC_S_E RSFT_T(KC_E)
+#define KC_A_I LALT_T(KC_I)  // RALT is special, it's AltGr and my compose key under Win (layout UScmpse) and *nix (setxkbmap -option compose:ralt)
+#define KC_G_O RGUI_T(KC_O)
+

From 17c0ca6fa4f7b6f65b4442c2f5bc32fee914b376 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Sat, 12 Feb 2022 11:54:48 +0800
Subject: [PATCH 618/867] [Keyboard] move g heavy industry boards into /gboards
 (#16040)

Co-authored-by: zvecr <git@zvecr.com>
---
 keyboards/{ => gboards}/butterstick/butterstick.c           | 0
 keyboards/{ => gboards}/butterstick/butterstick.h           | 0
 keyboards/{ => gboards}/butterstick/config.h                | 0
 keyboards/{ => gboards}/butterstick/info.json               | 0
 .../{ => gboards}/butterstick/keymaps/default/keymap.c      | 0
 .../{ => gboards}/butterstick/keymaps/dennytom/README.md    | 0
 .../{ => gboards}/butterstick/keymaps/dennytom/keymap.c     | 0
 .../butterstick/keymaps/dennytom/keymap_def.json            | 0
 .../{ => gboards}/butterstick/keymaps/dennytom/rules.mk     | 0
 keyboards/{ => gboards}/butterstick/readme.md               | 2 +-
 keyboards/{ => gboards}/butterstick/rules.mk                | 0
 keyboards/{ => gboards}/butterstick/sten.c                  | 0
 keyboards/{ => gboards}/butterstick/sten.h                  | 0
 keyboards/{ => gboards}/ergotaco/config.h                   | 0
 keyboards/{ => gboards}/ergotaco/ergotaco.c                 | 0
 keyboards/{ => gboards}/ergotaco/ergotaco.h                 | 0
 keyboards/{ => gboards}/ergotaco/info.json                  | 0
 keyboards/{ => gboards}/ergotaco/keymaps/default/keymap.c   | 0
 keyboards/{ => gboards}/ergotaco/keymaps/default/readme.md  | 2 +-
 keyboards/{ => gboards}/ergotaco/keymaps/default/rules.mk   | 0
 keyboards/{ => gboards}/ergotaco/matrix.c                   | 0
 keyboards/{ => gboards}/ergotaco/post_rules.mk              | 0
 keyboards/{ => gboards}/ergotaco/readme.md                  | 4 ++--
 keyboards/{ => gboards}/ergotaco/rules.mk                   | 0
 keyboards/{ => gboards}/georgi/config.h                     | 0
 keyboards/{ => gboards}/georgi/georgi.c                     | 0
 keyboards/{ => gboards}/georgi/georgi.h                     | 0
 keyboards/{ => gboards}/georgi/info.json                    | 0
 keyboards/{ => gboards}/georgi/keymaps/colemak-dh/keymap.c  | 0
 keyboards/{ => gboards}/georgi/keymaps/colemak-dh/readme.md | 0
 keyboards/{ => gboards}/georgi/keymaps/colemak-dh/rules.mk  | 0
 .../{ => gboards}/georgi/keymaps/default-flipped/keymap.c   | 0
 .../{ => gboards}/georgi/keymaps/default-flipped/readme.md  | 0
 .../{ => gboards}/georgi/keymaps/default-flipped/rules.mk   | 0
 keyboards/{ => gboards}/georgi/keymaps/default/keymap.c     | 0
 keyboards/{ => gboards}/georgi/keymaps/default/readme.md    | 0
 keyboards/{ => gboards}/georgi/keymaps/default/rules.mk     | 0
 keyboards/{ => gboards}/georgi/keymaps/dennytom/README.md   | 0
 keyboards/{ => gboards}/georgi/keymaps/dennytom/keymap.c    | 0
 .../{ => gboards}/georgi/keymaps/dennytom/keymap_def.json   | 0
 keyboards/{ => gboards}/georgi/keymaps/dennytom/rules.mk    | 0
 keyboards/{ => gboards}/georgi/keymaps/minimal/keymap.c     | 0
 keyboards/{ => gboards}/georgi/keymaps/minimal/readme.md    | 0
 keyboards/{ => gboards}/georgi/keymaps/minimal/rules.mk     | 0
 keyboards/{ => gboards}/georgi/keymaps/norman/keymap.c      | 0
 keyboards/{ => gboards}/georgi/keymaps/norman/readme.md     | 0
 keyboards/{ => gboards}/georgi/keymaps/norman/rules.mk      | 0
 keyboards/{ => gboards}/georgi/matrix.c                     | 0
 keyboards/{ => gboards}/georgi/readme.md                    | 6 +++---
 keyboards/{ => gboards}/georgi/rules.mk                     | 0
 keyboards/{ => gboards}/georgi/sten.c                       | 0
 keyboards/{ => gboards}/georgi/sten.h                       | 0
 keyboards/{ => gboards}/gergo/config.h                      | 0
 keyboards/{ => gboards}/gergo/gergo.c                       | 0
 keyboards/{ => gboards}/gergo/gergo.h                       | 0
 keyboards/{ => gboards}/gergo/info.json                     | 0
 keyboards/{ => gboards}/gergo/keymaps/abstractkb/config.h   | 0
 keyboards/{ => gboards}/gergo/keymaps/abstractkb/keymap.c   | 0
 keyboards/{ => gboards}/gergo/keymaps/abstractkb/readme.md  | 2 +-
 keyboards/{ => gboards}/gergo/keymaps/abstractkb/rules.mk   | 0
 keyboards/{ => gboards}/gergo/keymaps/colemak/keymap.c      | 0
 keyboards/{ => gboards}/gergo/keymaps/colemak/readme.md     | 2 +-
 keyboards/{ => gboards}/gergo/keymaps/colemak/rules.mk      | 0
 keyboards/{ => gboards}/gergo/keymaps/default/config.h      | 0
 keyboards/{ => gboards}/gergo/keymaps/default/keymap.c      | 0
 keyboards/{ => gboards}/gergo/keymaps/default/readme.md     | 2 +-
 keyboards/{ => gboards}/gergo/keymaps/default/rules.mk      | 0
 keyboards/{ => gboards}/gergo/keymaps/drashna/keymap.c      | 0
 keyboards/{ => gboards}/gergo/keymaps/drashna/rules.mk      | 0
 keyboards/{ => gboards}/gergo/keymaps/germ/config.h         | 0
 keyboards/{ => gboards}/gergo/keymaps/germ/keymap.c         | 0
 keyboards/{ => gboards}/gergo/keymaps/germ/readme.md        | 2 +-
 keyboards/{ => gboards}/gergo/keymaps/germ/rules.mk         | 0
 keyboards/{ => gboards}/gergo/keymaps/gotham/config.h       | 0
 keyboards/{ => gboards}/gergo/keymaps/gotham/keymap.c       | 0
 keyboards/{ => gboards}/gergo/keymaps/gotham/readme.md      | 0
 keyboards/{ => gboards}/gergo/keymaps/gotham/rules.mk       | 0
 .../gergo/keymaps/manna-harbour_miryoku/config.h            | 0
 .../gergo/keymaps/manna-harbour_miryoku/keymap.c            | 0
 keyboards/gboards/gergo/keymaps/oled/config.h               | 4 ++++
 keyboards/{ => gboards}/gergo/keymaps/oled/glcdfont.c       | 0
 keyboards/{ => gboards}/gergo/keymaps/oled/keymap.c         | 0
 keyboards/{ => gboards}/gergo/keymaps/oled/readme.md        | 2 +-
 keyboards/{ => gboards}/gergo/keymaps/oled/rules.mk         | 0
 keyboards/{ => gboards}/gergo/matrix.c                      | 0
 keyboards/{ => gboards}/gergo/readme.md                     | 6 +++---
 keyboards/{ => gboards}/gergo/rules.mk                      | 0
 keyboards/gboards/readme.md                                 | 6 +++---
 keyboards/gergo/keymaps/oled/config.h                       | 4 ----
 89 files changed, 22 insertions(+), 22 deletions(-)
 rename keyboards/{ => gboards}/butterstick/butterstick.c (100%)
 rename keyboards/{ => gboards}/butterstick/butterstick.h (100%)
 rename keyboards/{ => gboards}/butterstick/config.h (100%)
 rename keyboards/{ => gboards}/butterstick/info.json (100%)
 rename keyboards/{ => gboards}/butterstick/keymaps/default/keymap.c (100%)
 rename keyboards/{ => gboards}/butterstick/keymaps/dennytom/README.md (100%)
 rename keyboards/{ => gboards}/butterstick/keymaps/dennytom/keymap.c (100%)
 rename keyboards/{ => gboards}/butterstick/keymaps/dennytom/keymap_def.json (100%)
 rename keyboards/{ => gboards}/butterstick/keymaps/dennytom/rules.mk (100%)
 rename keyboards/{ => gboards}/butterstick/readme.md (95%)
 rename keyboards/{ => gboards}/butterstick/rules.mk (100%)
 rename keyboards/{ => gboards}/butterstick/sten.c (100%)
 rename keyboards/{ => gboards}/butterstick/sten.h (100%)
 rename keyboards/{ => gboards}/ergotaco/config.h (100%)
 rename keyboards/{ => gboards}/ergotaco/ergotaco.c (100%)
 rename keyboards/{ => gboards}/ergotaco/ergotaco.h (100%)
 rename keyboards/{ => gboards}/ergotaco/info.json (100%)
 rename keyboards/{ => gboards}/ergotaco/keymaps/default/keymap.c (100%)
 rename keyboards/{ => gboards}/ergotaco/keymaps/default/readme.md (79%)
 rename keyboards/{ => gboards}/ergotaco/keymaps/default/rules.mk (100%)
 rename keyboards/{ => gboards}/ergotaco/matrix.c (100%)
 rename keyboards/{ => gboards}/ergotaco/post_rules.mk (100%)
 rename keyboards/{ => gboards}/ergotaco/readme.md (91%)
 rename keyboards/{ => gboards}/ergotaco/rules.mk (100%)
 rename keyboards/{ => gboards}/georgi/config.h (100%)
 rename keyboards/{ => gboards}/georgi/georgi.c (100%)
 rename keyboards/{ => gboards}/georgi/georgi.h (100%)
 rename keyboards/{ => gboards}/georgi/info.json (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/colemak-dh/keymap.c (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/colemak-dh/readme.md (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/colemak-dh/rules.mk (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/default-flipped/keymap.c (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/default-flipped/readme.md (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/default-flipped/rules.mk (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/default/keymap.c (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/default/readme.md (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/default/rules.mk (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/dennytom/README.md (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/dennytom/keymap.c (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/dennytom/keymap_def.json (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/dennytom/rules.mk (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/minimal/keymap.c (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/minimal/readme.md (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/minimal/rules.mk (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/norman/keymap.c (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/norman/readme.md (100%)
 rename keyboards/{ => gboards}/georgi/keymaps/norman/rules.mk (100%)
 rename keyboards/{ => gboards}/georgi/matrix.c (100%)
 rename keyboards/{ => gboards}/georgi/readme.md (80%)
 rename keyboards/{ => gboards}/georgi/rules.mk (100%)
 rename keyboards/{ => gboards}/georgi/sten.c (100%)
 rename keyboards/{ => gboards}/georgi/sten.h (100%)
 rename keyboards/{ => gboards}/gergo/config.h (100%)
 rename keyboards/{ => gboards}/gergo/gergo.c (100%)
 rename keyboards/{ => gboards}/gergo/gergo.h (100%)
 rename keyboards/{ => gboards}/gergo/info.json (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/abstractkb/config.h (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/abstractkb/keymap.c (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/abstractkb/readme.md (88%)
 rename keyboards/{ => gboards}/gergo/keymaps/abstractkb/rules.mk (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/colemak/keymap.c (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/colemak/readme.md (92%)
 rename keyboards/{ => gboards}/gergo/keymaps/colemak/rules.mk (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/default/config.h (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/default/keymap.c (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/default/readme.md (90%)
 rename keyboards/{ => gboards}/gergo/keymaps/default/rules.mk (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/drashna/keymap.c (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/drashna/rules.mk (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/germ/config.h (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/germ/keymap.c (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/germ/readme.md (90%)
 rename keyboards/{ => gboards}/gergo/keymaps/germ/rules.mk (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/gotham/config.h (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/gotham/keymap.c (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/gotham/readme.md (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/gotham/rules.mk (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/manna-harbour_miryoku/config.h (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/manna-harbour_miryoku/keymap.c (100%)
 create mode 100644 keyboards/gboards/gergo/keymaps/oled/config.h
 rename keyboards/{ => gboards}/gergo/keymaps/oled/glcdfont.c (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/oled/keymap.c (100%)
 rename keyboards/{ => gboards}/gergo/keymaps/oled/readme.md (90%)
 rename keyboards/{ => gboards}/gergo/keymaps/oled/rules.mk (100%)
 rename keyboards/{ => gboards}/gergo/matrix.c (100%)
 rename keyboards/{ => gboards}/gergo/readme.md (77%)
 rename keyboards/{ => gboards}/gergo/rules.mk (100%)
 delete mode 100644 keyboards/gergo/keymaps/oled/config.h

diff --git a/keyboards/butterstick/butterstick.c b/keyboards/gboards/butterstick/butterstick.c
similarity index 100%
rename from keyboards/butterstick/butterstick.c
rename to keyboards/gboards/butterstick/butterstick.c
diff --git a/keyboards/butterstick/butterstick.h b/keyboards/gboards/butterstick/butterstick.h
similarity index 100%
rename from keyboards/butterstick/butterstick.h
rename to keyboards/gboards/butterstick/butterstick.h
diff --git a/keyboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h
similarity index 100%
rename from keyboards/butterstick/config.h
rename to keyboards/gboards/butterstick/config.h
diff --git a/keyboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json
similarity index 100%
rename from keyboards/butterstick/info.json
rename to keyboards/gboards/butterstick/info.json
diff --git a/keyboards/butterstick/keymaps/default/keymap.c b/keyboards/gboards/butterstick/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/butterstick/keymaps/default/keymap.c
rename to keyboards/gboards/butterstick/keymaps/default/keymap.c
diff --git a/keyboards/butterstick/keymaps/dennytom/README.md b/keyboards/gboards/butterstick/keymaps/dennytom/README.md
similarity index 100%
rename from keyboards/butterstick/keymaps/dennytom/README.md
rename to keyboards/gboards/butterstick/keymaps/dennytom/README.md
diff --git a/keyboards/butterstick/keymaps/dennytom/keymap.c b/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
similarity index 100%
rename from keyboards/butterstick/keymaps/dennytom/keymap.c
rename to keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
diff --git a/keyboards/butterstick/keymaps/dennytom/keymap_def.json b/keyboards/gboards/butterstick/keymaps/dennytom/keymap_def.json
similarity index 100%
rename from keyboards/butterstick/keymaps/dennytom/keymap_def.json
rename to keyboards/gboards/butterstick/keymaps/dennytom/keymap_def.json
diff --git a/keyboards/butterstick/keymaps/dennytom/rules.mk b/keyboards/gboards/butterstick/keymaps/dennytom/rules.mk
similarity index 100%
rename from keyboards/butterstick/keymaps/dennytom/rules.mk
rename to keyboards/gboards/butterstick/keymaps/dennytom/rules.mk
diff --git a/keyboards/butterstick/readme.md b/keyboards/gboards/butterstick/readme.md
similarity index 95%
rename from keyboards/butterstick/readme.md
rename to keyboards/gboards/butterstick/readme.md
index 8bae8ba5a0..37e9375d88 100644
--- a/keyboards/butterstick/readme.md
+++ b/keyboards/gboards/butterstick/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: [g Heavy Industries](https://www.gboards.ca/product/butte
 
 Make example for this keyboard (after setting up your build environment):
 
-    make butterstick:default
+    make gboards/butterstick: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).
diff --git a/keyboards/butterstick/rules.mk b/keyboards/gboards/butterstick/rules.mk
similarity index 100%
rename from keyboards/butterstick/rules.mk
rename to keyboards/gboards/butterstick/rules.mk
diff --git a/keyboards/butterstick/sten.c b/keyboards/gboards/butterstick/sten.c
similarity index 100%
rename from keyboards/butterstick/sten.c
rename to keyboards/gboards/butterstick/sten.c
diff --git a/keyboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h
similarity index 100%
rename from keyboards/butterstick/sten.h
rename to keyboards/gboards/butterstick/sten.h
diff --git a/keyboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
similarity index 100%
rename from keyboards/ergotaco/config.h
rename to keyboards/gboards/ergotaco/config.h
diff --git a/keyboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c
similarity index 100%
rename from keyboards/ergotaco/ergotaco.c
rename to keyboards/gboards/ergotaco/ergotaco.c
diff --git a/keyboards/ergotaco/ergotaco.h b/keyboards/gboards/ergotaco/ergotaco.h
similarity index 100%
rename from keyboards/ergotaco/ergotaco.h
rename to keyboards/gboards/ergotaco/ergotaco.h
diff --git a/keyboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
similarity index 100%
rename from keyboards/ergotaco/info.json
rename to keyboards/gboards/ergotaco/info.json
diff --git a/keyboards/ergotaco/keymaps/default/keymap.c b/keyboards/gboards/ergotaco/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergotaco/keymaps/default/keymap.c
rename to keyboards/gboards/ergotaco/keymaps/default/keymap.c
diff --git a/keyboards/ergotaco/keymaps/default/readme.md b/keyboards/gboards/ergotaco/keymaps/default/readme.md
similarity index 79%
rename from keyboards/ergotaco/keymaps/default/readme.md
rename to keyboards/gboards/ergotaco/keymaps/default/readme.md
index 653f3774ea..d9c7c1601f 100644
--- a/keyboards/ergotaco/keymaps/default/readme.md
+++ b/keyboards/gboards/ergotaco/keymaps/default/readme.md
@@ -1,6 +1,6 @@
 This is the default keymap for the ErgoTaco, Make it your own!
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/ergotaco/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/ergotaco/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/ergotaco/keymaps/default/rules.mk b/keyboards/gboards/ergotaco/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/ergotaco/keymaps/default/rules.mk
rename to keyboards/gboards/ergotaco/keymaps/default/rules.mk
diff --git a/keyboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
similarity index 100%
rename from keyboards/ergotaco/matrix.c
rename to keyboards/gboards/ergotaco/matrix.c
diff --git a/keyboards/ergotaco/post_rules.mk b/keyboards/gboards/ergotaco/post_rules.mk
similarity index 100%
rename from keyboards/ergotaco/post_rules.mk
rename to keyboards/gboards/ergotaco/post_rules.mk
diff --git a/keyboards/ergotaco/readme.md b/keyboards/gboards/ergotaco/readme.md
similarity index 91%
rename from keyboards/ergotaco/readme.md
rename to keyboards/gboards/ergotaco/readme.md
index 40077e2a8d..dc9db3bb64 100644
--- a/keyboards/ergotaco/readme.md
+++ b/keyboards/gboards/ergotaco/readme.md
@@ -11,13 +11,13 @@ Hardware Availability: [gboards.ca](http://gboards.ca)
 ## Firmware building
 Clone the QMK Repo and install dfu-programmer, flash with:
 
-    make ergotaco:default:dfu
+    make gboards/ergotaco:default:dfu
 
 And reset your keyboard!
 
 To just test if your build system is sane, try compiling the default keymap using:
    
-    make ergotaco:default
+    make gboards/ergotaco: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).
 
diff --git a/keyboards/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk
similarity index 100%
rename from keyboards/ergotaco/rules.mk
rename to keyboards/gboards/ergotaco/rules.mk
diff --git a/keyboards/georgi/config.h b/keyboards/gboards/georgi/config.h
similarity index 100%
rename from keyboards/georgi/config.h
rename to keyboards/gboards/georgi/config.h
diff --git a/keyboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c
similarity index 100%
rename from keyboards/georgi/georgi.c
rename to keyboards/gboards/georgi/georgi.c
diff --git a/keyboards/georgi/georgi.h b/keyboards/gboards/georgi/georgi.h
similarity index 100%
rename from keyboards/georgi/georgi.h
rename to keyboards/gboards/georgi/georgi.h
diff --git a/keyboards/georgi/info.json b/keyboards/gboards/georgi/info.json
similarity index 100%
rename from keyboards/georgi/info.json
rename to keyboards/gboards/georgi/info.json
diff --git a/keyboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/colemak-dh/keymap.c
rename to keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
diff --git a/keyboards/georgi/keymaps/colemak-dh/readme.md b/keyboards/gboards/georgi/keymaps/colemak-dh/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/colemak-dh/readme.md
rename to keyboards/gboards/georgi/keymaps/colemak-dh/readme.md
diff --git a/keyboards/georgi/keymaps/colemak-dh/rules.mk b/keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/colemak-dh/rules.mk
rename to keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk
diff --git a/keyboards/georgi/keymaps/default-flipped/keymap.c b/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/default-flipped/keymap.c
rename to keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
diff --git a/keyboards/georgi/keymaps/default-flipped/readme.md b/keyboards/gboards/georgi/keymaps/default-flipped/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/default-flipped/readme.md
rename to keyboards/gboards/georgi/keymaps/default-flipped/readme.md
diff --git a/keyboards/georgi/keymaps/default-flipped/rules.mk b/keyboards/gboards/georgi/keymaps/default-flipped/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/default-flipped/rules.mk
rename to keyboards/gboards/georgi/keymaps/default-flipped/rules.mk
diff --git a/keyboards/georgi/keymaps/default/keymap.c b/keyboards/gboards/georgi/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/default/keymap.c
rename to keyboards/gboards/georgi/keymaps/default/keymap.c
diff --git a/keyboards/georgi/keymaps/default/readme.md b/keyboards/gboards/georgi/keymaps/default/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/default/readme.md
rename to keyboards/gboards/georgi/keymaps/default/readme.md
diff --git a/keyboards/georgi/keymaps/default/rules.mk b/keyboards/gboards/georgi/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/default/rules.mk
rename to keyboards/gboards/georgi/keymaps/default/rules.mk
diff --git a/keyboards/georgi/keymaps/dennytom/README.md b/keyboards/gboards/georgi/keymaps/dennytom/README.md
similarity index 100%
rename from keyboards/georgi/keymaps/dennytom/README.md
rename to keyboards/gboards/georgi/keymaps/dennytom/README.md
diff --git a/keyboards/georgi/keymaps/dennytom/keymap.c b/keyboards/gboards/georgi/keymaps/dennytom/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/dennytom/keymap.c
rename to keyboards/gboards/georgi/keymaps/dennytom/keymap.c
diff --git a/keyboards/georgi/keymaps/dennytom/keymap_def.json b/keyboards/gboards/georgi/keymaps/dennytom/keymap_def.json
similarity index 100%
rename from keyboards/georgi/keymaps/dennytom/keymap_def.json
rename to keyboards/gboards/georgi/keymaps/dennytom/keymap_def.json
diff --git a/keyboards/georgi/keymaps/dennytom/rules.mk b/keyboards/gboards/georgi/keymaps/dennytom/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/dennytom/rules.mk
rename to keyboards/gboards/georgi/keymaps/dennytom/rules.mk
diff --git a/keyboards/georgi/keymaps/minimal/keymap.c b/keyboards/gboards/georgi/keymaps/minimal/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/minimal/keymap.c
rename to keyboards/gboards/georgi/keymaps/minimal/keymap.c
diff --git a/keyboards/georgi/keymaps/minimal/readme.md b/keyboards/gboards/georgi/keymaps/minimal/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/minimal/readme.md
rename to keyboards/gboards/georgi/keymaps/minimal/readme.md
diff --git a/keyboards/georgi/keymaps/minimal/rules.mk b/keyboards/gboards/georgi/keymaps/minimal/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/minimal/rules.mk
rename to keyboards/gboards/georgi/keymaps/minimal/rules.mk
diff --git a/keyboards/georgi/keymaps/norman/keymap.c b/keyboards/gboards/georgi/keymaps/norman/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/norman/keymap.c
rename to keyboards/gboards/georgi/keymaps/norman/keymap.c
diff --git a/keyboards/georgi/keymaps/norman/readme.md b/keyboards/gboards/georgi/keymaps/norman/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/norman/readme.md
rename to keyboards/gboards/georgi/keymaps/norman/readme.md
diff --git a/keyboards/georgi/keymaps/norman/rules.mk b/keyboards/gboards/georgi/keymaps/norman/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/norman/rules.mk
rename to keyboards/gboards/georgi/keymaps/norman/rules.mk
diff --git a/keyboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c
similarity index 100%
rename from keyboards/georgi/matrix.c
rename to keyboards/gboards/georgi/matrix.c
diff --git a/keyboards/georgi/readme.md b/keyboards/gboards/georgi/readme.md
similarity index 80%
rename from keyboards/georgi/readme.md
rename to keyboards/gboards/georgi/readme.md
index 247219b934..2ba259ab7e 100644
--- a/keyboards/georgi/readme.md
+++ b/keyboards/gboards/georgi/readme.md
@@ -13,13 +13,13 @@ Hardware Availability: [gboards.ca](http://gboards.ca)
 ## Firmware building
 After cloning the QMK repo and installing dfu-programmer build and flash with. Be sure to reset your keyboard!
 
-    make georgi:default:dfu
+    make gboards/georgi:default:dfu
 
 To just test your build with the default keymap
    
-    make georgi:default
+    make gboards/georgi:default
 
-Build options can be enabled/disabled in keyboards/georgi/keymaps/default/rules.mk . Copy the default directory and make any changes to your layout, if you think they're worth sharing submit a PR!
+Build options can be enabled/disabled in keyboards/gboards/georgi/keymaps/default/rules.mk . Copy the default directory and make any changes to your layout, if you think they're worth sharing submit a PR!
 
 ## Documentation
 Is hosted over on [docs.gboards.ca](http://docs.gboards.ca/). Please take a look at the docs for customizing your firmware!
diff --git a/keyboards/georgi/rules.mk b/keyboards/gboards/georgi/rules.mk
similarity index 100%
rename from keyboards/georgi/rules.mk
rename to keyboards/gboards/georgi/rules.mk
diff --git a/keyboards/georgi/sten.c b/keyboards/gboards/georgi/sten.c
similarity index 100%
rename from keyboards/georgi/sten.c
rename to keyboards/gboards/georgi/sten.c
diff --git a/keyboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h
similarity index 100%
rename from keyboards/georgi/sten.h
rename to keyboards/gboards/georgi/sten.h
diff --git a/keyboards/gergo/config.h b/keyboards/gboards/gergo/config.h
similarity index 100%
rename from keyboards/gergo/config.h
rename to keyboards/gboards/gergo/config.h
diff --git a/keyboards/gergo/gergo.c b/keyboards/gboards/gergo/gergo.c
similarity index 100%
rename from keyboards/gergo/gergo.c
rename to keyboards/gboards/gergo/gergo.c
diff --git a/keyboards/gergo/gergo.h b/keyboards/gboards/gergo/gergo.h
similarity index 100%
rename from keyboards/gergo/gergo.h
rename to keyboards/gboards/gergo/gergo.h
diff --git a/keyboards/gergo/info.json b/keyboards/gboards/gergo/info.json
similarity index 100%
rename from keyboards/gergo/info.json
rename to keyboards/gboards/gergo/info.json
diff --git a/keyboards/gergo/keymaps/abstractkb/config.h b/keyboards/gboards/gergo/keymaps/abstractkb/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/abstractkb/config.h
rename to keyboards/gboards/gergo/keymaps/abstractkb/config.h
diff --git a/keyboards/gergo/keymaps/abstractkb/keymap.c b/keyboards/gboards/gergo/keymaps/abstractkb/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/abstractkb/keymap.c
rename to keyboards/gboards/gergo/keymaps/abstractkb/keymap.c
diff --git a/keyboards/gergo/keymaps/abstractkb/readme.md b/keyboards/gboards/gergo/keymaps/abstractkb/readme.md
similarity index 88%
rename from keyboards/gergo/keymaps/abstractkb/readme.md
rename to keyboards/gboards/gergo/keymaps/abstractkb/readme.md
index 0b07136e89..863b21e8e2 100644
--- a/keyboards/gergo/keymaps/abstractkb/readme.md
+++ b/keyboards/gboards/gergo/keymaps/abstractkb/readme.md
@@ -5,6 +5,6 @@
 This is my personal modification to the stock gergo keymap.
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/abstractkb/rules.mk b/keyboards/gboards/gergo/keymaps/abstractkb/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/abstractkb/rules.mk
rename to keyboards/gboards/gergo/keymaps/abstractkb/rules.mk
diff --git a/keyboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/colemak/keymap.c
rename to keyboards/gboards/gergo/keymaps/colemak/keymap.c
diff --git a/keyboards/gergo/keymaps/colemak/readme.md b/keyboards/gboards/gergo/keymaps/colemak/readme.md
similarity index 92%
rename from keyboards/gergo/keymaps/colemak/readme.md
rename to keyboards/gboards/gergo/keymaps/colemak/readme.md
index 1c1cc7bdea..5cfe3b8306 100644
--- a/keyboards/gergo/keymaps/colemak/readme.md
+++ b/keyboards/gboards/gergo/keymaps/colemak/readme.md
@@ -11,6 +11,6 @@ You can view this layout over at
 [keyboad-layout-editor.com](http://www.keyboard-layout-editor.com/#/gists/f04d6a3b0cd3db91407c51f7ba36aeb3).
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/colemak/rules.mk b/keyboards/gboards/gergo/keymaps/colemak/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/colemak/rules.mk
rename to keyboards/gboards/gergo/keymaps/colemak/rules.mk
diff --git a/keyboards/gergo/keymaps/default/config.h b/keyboards/gboards/gergo/keymaps/default/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/default/config.h
rename to keyboards/gboards/gergo/keymaps/default/config.h
diff --git a/keyboards/gergo/keymaps/default/keymap.c b/keyboards/gboards/gergo/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/default/keymap.c
rename to keyboards/gboards/gergo/keymaps/default/keymap.c
diff --git a/keyboards/gergo/keymaps/default/readme.md b/keyboards/gboards/gergo/keymaps/default/readme.md
similarity index 90%
rename from keyboards/gergo/keymaps/default/readme.md
rename to keyboards/gboards/gergo/keymaps/default/readme.md
index 471a20fbdf..8e49b2f5b0 100644
--- a/keyboards/gergo/keymaps/default/readme.md
+++ b/keyboards/gboards/gergo/keymaps/default/readme.md
@@ -5,6 +5,6 @@
 This is the default keymap for Gergo, it's based heavily off of the naps62 ErgoDox layout and is aimed at a programmer friendly keymap.
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/default/rules.mk b/keyboards/gboards/gergo/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/default/rules.mk
rename to keyboards/gboards/gergo/keymaps/default/rules.mk
diff --git a/keyboards/gergo/keymaps/drashna/keymap.c b/keyboards/gboards/gergo/keymaps/drashna/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/drashna/keymap.c
rename to keyboards/gboards/gergo/keymaps/drashna/keymap.c
diff --git a/keyboards/gergo/keymaps/drashna/rules.mk b/keyboards/gboards/gergo/keymaps/drashna/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/drashna/rules.mk
rename to keyboards/gboards/gergo/keymaps/drashna/rules.mk
diff --git a/keyboards/gergo/keymaps/germ/config.h b/keyboards/gboards/gergo/keymaps/germ/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/germ/config.h
rename to keyboards/gboards/gergo/keymaps/germ/config.h
diff --git a/keyboards/gergo/keymaps/germ/keymap.c b/keyboards/gboards/gergo/keymaps/germ/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/germ/keymap.c
rename to keyboards/gboards/gergo/keymaps/germ/keymap.c
diff --git a/keyboards/gergo/keymaps/germ/readme.md b/keyboards/gboards/gergo/keymaps/germ/readme.md
similarity index 90%
rename from keyboards/gergo/keymaps/germ/readme.md
rename to keyboards/gboards/gergo/keymaps/germ/readme.md
index 471a20fbdf..8e49b2f5b0 100644
--- a/keyboards/gergo/keymaps/germ/readme.md
+++ b/keyboards/gboards/gergo/keymaps/germ/readme.md
@@ -5,6 +5,6 @@
 This is the default keymap for Gergo, it's based heavily off of the naps62 ErgoDox layout and is aimed at a programmer friendly keymap.
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/germ/rules.mk b/keyboards/gboards/gergo/keymaps/germ/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/germ/rules.mk
rename to keyboards/gboards/gergo/keymaps/germ/rules.mk
diff --git a/keyboards/gergo/keymaps/gotham/config.h b/keyboards/gboards/gergo/keymaps/gotham/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/gotham/config.h
rename to keyboards/gboards/gergo/keymaps/gotham/config.h
diff --git a/keyboards/gergo/keymaps/gotham/keymap.c b/keyboards/gboards/gergo/keymaps/gotham/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/gotham/keymap.c
rename to keyboards/gboards/gergo/keymaps/gotham/keymap.c
diff --git a/keyboards/gergo/keymaps/gotham/readme.md b/keyboards/gboards/gergo/keymaps/gotham/readme.md
similarity index 100%
rename from keyboards/gergo/keymaps/gotham/readme.md
rename to keyboards/gboards/gergo/keymaps/gotham/readme.md
diff --git a/keyboards/gergo/keymaps/gotham/rules.mk b/keyboards/gboards/gergo/keymaps/gotham/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/gotham/rules.mk
rename to keyboards/gboards/gergo/keymaps/gotham/rules.mk
diff --git a/keyboards/gergo/keymaps/manna-harbour_miryoku/config.h b/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/manna-harbour_miryoku/config.h
rename to keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/config.h
diff --git a/keyboards/gergo/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
rename to keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
diff --git a/keyboards/gboards/gergo/keymaps/oled/config.h b/keyboards/gboards/gergo/keymaps/oled/config.h
new file mode 100644
index 0000000000..af960a1eed
--- /dev/null
+++ b/keyboards/gboards/gergo/keymaps/oled/config.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#define IGNORE_MOD_TAP_INTERRUPT
+#define OLED_FONT_H "keyboards/gboards/gergo/keymaps/oled/glcdfont.c"
diff --git a/keyboards/gergo/keymaps/oled/glcdfont.c b/keyboards/gboards/gergo/keymaps/oled/glcdfont.c
similarity index 100%
rename from keyboards/gergo/keymaps/oled/glcdfont.c
rename to keyboards/gboards/gergo/keymaps/oled/glcdfont.c
diff --git a/keyboards/gergo/keymaps/oled/keymap.c b/keyboards/gboards/gergo/keymaps/oled/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/oled/keymap.c
rename to keyboards/gboards/gergo/keymaps/oled/keymap.c
diff --git a/keyboards/gergo/keymaps/oled/readme.md b/keyboards/gboards/gergo/keymaps/oled/readme.md
similarity index 90%
rename from keyboards/gergo/keymaps/oled/readme.md
rename to keyboards/gboards/gergo/keymaps/oled/readme.md
index 471a20fbdf..8e49b2f5b0 100644
--- a/keyboards/gergo/keymaps/oled/readme.md
+++ b/keyboards/gboards/gergo/keymaps/oled/readme.md
@@ -5,6 +5,6 @@
 This is the default keymap for Gergo, it's based heavily off of the naps62 ErgoDox layout and is aimed at a programmer friendly keymap.
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/oled/rules.mk b/keyboards/gboards/gergo/keymaps/oled/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/oled/rules.mk
rename to keyboards/gboards/gergo/keymaps/oled/rules.mk
diff --git a/keyboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c
similarity index 100%
rename from keyboards/gergo/matrix.c
rename to keyboards/gboards/gergo/matrix.c
diff --git a/keyboards/gergo/readme.md b/keyboards/gboards/gergo/readme.md
similarity index 77%
rename from keyboards/gergo/readme.md
rename to keyboards/gboards/gergo/readme.md
index 3436090b27..b2558e6715 100644
--- a/keyboards/gergo/readme.md
+++ b/keyboards/gboards/gergo/readme.md
@@ -13,13 +13,13 @@ Hardware Availability: [gboards.ca](http://gboards.ca)
 ## Firmware building
 After cloning the QMK repo and installing dfu-programmer build and flash with. Be sure to reset your keyboard!
 
-    make gergo:germ:dfu
+    make gboards/gergo:germ:dfu
 
 To just test your build with the default keymap
    
-    make gergo:germ
+    make gboards/gergo:germ
 
-Gadgets and options can be enabled/disabled in keyboards/gergo/keymaps/default/rules.mk . Copy the default directory and make any changes to your layout, if you think they're worth sharing submit a PR!
+Gadgets and options can be enabled/disabled in keyboards/gboards/gergo/keymaps/default/rules.mk . Copy the default directory and make any changes to your layout, if you think they're worth sharing submit a PR!
 
 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).
 
diff --git a/keyboards/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk
similarity index 100%
rename from keyboards/gergo/rules.mk
rename to keyboards/gboards/gergo/rules.mk
diff --git a/keyboards/gboards/readme.md b/keyboards/gboards/readme.md
index 743bacbcc1..384b568d89 100644
--- a/keyboards/gboards/readme.md
+++ b/keyboards/gboards/readme.md
@@ -22,11 +22,11 @@ multi-chords! You can browse the available combo lists in combos/
 
 ## Engine
 This is the onboard chording engine for all sorts of fun shenanigans. Be aware that this currently is a bit of a QMK 
-replacement focused on pure chording. Take a look at the configuration in keyboards/ginny for ideas, all these dicts
+replacement focused on pure chording. Take a look at the configuration in keyboards/gboards/ginny for ideas, all these dicts
 are stored over in dicts/
 
 ## Installation
-You will need to add the following bits to your rules.mk, refer to keyboards/ginny for a working example
+You will need to add the following bits to your rules.mk, refer to keyboards/gboards/ginny for a working example
 `VPATH               +=  keyboards/gboards/`
 
 And if you're using the chording engine, this as well.
@@ -35,5 +35,5 @@ And if you're using the chording engine, this as well.
 For combos, add `#include "g/keymap_combos.h"` to keymap.c to compile your combos.def into your keymap
 
 For the chording engine, add `#include "g/keymap_engine.h"` to keymap.c compile your dicts.def into your keymap. If you
-don't have a config_engine.h file for your keyboard, you will need to create it. (Once again, look at keyboards/ginny/
+don't have a config_engine.h file for your keyboard, you will need to create it. (Once again, look at keyboards/gboards/ginny/
 for a example of how to do this.
diff --git a/keyboards/gergo/keymaps/oled/config.h b/keyboards/gergo/keymaps/oled/config.h
deleted file mode 100644
index b186080681..0000000000
--- a/keyboards/gergo/keymaps/oled/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define IGNORE_MOD_TAP_INTERRUPT
-#define OLED_FONT_H "keyboards/gergo/keymaps/oled/glcdfont.c"

From e596ece87aac51f053f1f26f5f5bff964d7c351a Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 12 Feb 2022 15:00:34 +1100
Subject: [PATCH 619/867] Clang-format tweaks (#15906)

---
 .clang-format | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.clang-format b/.clang-format
index b4f7967831..ce145e299c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -5,6 +5,9 @@ AlignConsecutiveAssignments: 'true'
 AlignConsecutiveDeclarations: 'true'
 AlignOperands: 'true'
 AllowAllParametersOfDeclarationOnNextLine: 'false'
+AllowShortCaseLabelsOnASingleLine: 'false'
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortLoopsOnASingleLine: 'false'
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: 'false'
@@ -20,6 +23,7 @@ SortIncludes: 'false'
 SpaceBeforeAssignmentOperators: 'true'
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: 'false'
+SpacesBeforeTrailingComments: 1
 TabWidth: '4'
 UseTab: Never
 

From 19c57a2a6a7aa73dca7e06acdfe93508288ddfb0 Mon Sep 17 00:00:00 2001
From: cole smith <38364556+daysgobye@users.noreply.github.com>
Date: Fri, 11 Feb 2022 21:02:30 -0700
Subject: [PATCH 620/867] [Keyboard] Lulu keyboard by boardsource (#15951)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/boardsource/lulu/config.h           |  47 +++
 keyboards/boardsource/lulu/info.json          |  16 +
 .../boardsource/lulu/keymaps/default/keymap.c | 129 ++++++++
 .../boardsource/lulu/keymaps/via/keymap.c     | 105 +++++++
 .../boardsource/lulu/keymaps/via/rules.mk     |   1 +
 keyboards/boardsource/lulu/lulu.c             | 280 ++++++++++++++++++
 keyboards/boardsource/lulu/lulu.h             |  29 ++
 keyboards/boardsource/lulu/readme.md          |  24 ++
 keyboards/boardsource/lulu/rules.mk           |  26 ++
 9 files changed, 657 insertions(+)
 create mode 100644 keyboards/boardsource/lulu/config.h
 create mode 100644 keyboards/boardsource/lulu/info.json
 create mode 100644 keyboards/boardsource/lulu/keymaps/default/keymap.c
 create mode 100644 keyboards/boardsource/lulu/keymaps/via/keymap.c
 create mode 100644 keyboards/boardsource/lulu/keymaps/via/rules.mk
 create mode 100644 keyboards/boardsource/lulu/lulu.c
 create mode 100644 keyboards/boardsource/lulu/lulu.h
 create mode 100644 keyboards/boardsource/lulu/readme.md
 create mode 100644 keyboards/boardsource/lulu/rules.mk

diff --git a/keyboards/boardsource/lulu/config.h b/keyboards/boardsource/lulu/config.h
new file mode 100644
index 0000000000..8cd240179e
--- /dev/null
+++ b/keyboards/boardsource/lulu/config.h
@@ -0,0 +1,47 @@
+// Copyright 2022 Cole Smith <cole@boadsource.xyz>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define VENDOR_ID       0x4273
+#define PRODUCT_ID      0x7685
+#define DEVICE_VER      0x0000
+#define MANUFACTURER    Boardsource
+#define PRODUCT         lulu
+
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+#define MATRIX_ROW_PINS {C6, D7, E6, B4, B5}
+
+// wiring of each half
+#define MATRIX_COL_PINS {F6, F7, B1, B3, B2, B6}
+#define USE_SERIAL
+#define SOFT_SERIAL_PIN D2
+#define SPLIT_USB_DETECT
+#define RGB_DI_PIN D3
+
+#define ENCODERS_PAD_A { F0 }
+#define ENCODERS_PAD_B { F1 }
+#define ENCODERS_PAD_A_RIGHT { F0 }
+#define ENCODERS_PAD_B_RIGHT { F1 }
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+#define DIODE_DIRECTION COL2ROW
+#ifdef RGB_MATRIX_ENABLE
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+    #define RGBLED_NUM 70  // Number of LEDs
+    #define DRIVER_LED_TOTAL RGBLED_NUM
+    #define RGB_MATRIX_SPLIT { 35, 35 }
+    #define SPLIT_TRANSPORT_MIRROR
+    #define RGBLIGHT_LIMIT_VAL 150
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_BREATHING
+    #define ENABLE_RGB_MATRIX_BAND_SAT
+    #define ENABLE_RGB_MATRIX_BAND_VAL
+#endif
+
diff --git a/keyboards/boardsource/lulu/info.json b/keyboards/boardsource/lulu/info.json
new file mode 100644
index 0000000000..156a7cea98
--- /dev/null
+++ b/keyboards/boardsource/lulu/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Lulu",
+    "url": "https://boardsource.xyz/store/61d0b772319a1f3cc53ba2fb",
+    "maintainer": "boardsource",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5},
+                {"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5},
+                {"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5},
+                {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5},
+                {"x":2.5, "y":4.125}, {"x":3.5, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12, "y":4.15}, {"x":13, "y":4.15}
+            ]
+        }
+    }
+}
diff --git a/keyboards/boardsource/lulu/keymaps/default/keymap.c b/keyboards/boardsource/lulu/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8624b51b6a
--- /dev/null
+++ b/keyboards/boardsource/lulu/keymaps/default/keymap.c
@@ -0,0 +1,129 @@
+// Copyright 2022 Cole Smith <cole@boadsource.xyz>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _QWERTY,
+    _RAISE,
+    _LOWER,
+    _ADJUST
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ 
+/* QWERTY
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |LCTRL |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+ [_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_GRV,
+  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
+  KC_LCTL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
+                          KC_LALT,    KC_LGUI, LOWER, KC_SPC,  KC_ENT,   RAISE,   KC_BSPC, KC_RGUI
+),
+/* LOWER
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   `  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   -  |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |   _  |   +  |   {  |   }  |   |  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+[_LOWER] = LAYOUT(
+  _______, _______, _______, _______, _______, _______,                   _______, _______, _______,_______, _______, _______,
+  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_GRV, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
+  _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+                             _______, _______, _______, _______, _______,  _______, _______, _______
+),
+/* RAISE
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |MOD   | MODR |  S+  |  S-  |  B+  |  B-  |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |-------.    ,-------|      | Left | Down |  Up  |Right |      |
+ * |------+------+------+------+------+------|RGB_TOG|    |    ]  |------+------+------+------+------+------|
+ * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |   \  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+[_RAISE] = LAYOUT(
+  RGB_MOD, RGB_RMOD,RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,                     _______, _______, _______, _______, _______, _______,
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                       XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
+  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   RGB_TOG, _______,  KC_PLUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+                             _______, _______, _______,  _______, _______,  _______, _______, _______
+),
+/* ADJUST
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------.    ,-------|      |      |RGB ON| HUE+ | SAT+ | VAL+ |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |      | MODE | HUE- | SAT- | VAL- |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+  [_ADJUST] = LAYOUT(
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                             _______, _______, _______, _______, _______,  _______, _______, _______
+  )
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+   return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        // Volume control
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        // Page up/Page down
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
+#endif
diff --git a/keyboards/boardsource/lulu/keymaps/via/keymap.c b/keyboards/boardsource/lulu/keymaps/via/keymap.c
new file mode 100644
index 0000000000..912ea38559
--- /dev/null
+++ b/keyboards/boardsource/lulu/keymaps/via/keymap.c
@@ -0,0 +1,105 @@
+// Copyright 2022 Cole Smith <cole@boadsource.xyz>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _QWERTY,
+    _RAISE,
+    _LOWER,
+    _ADJUST
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ 
+/* QWERTY
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  `   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |LCTRL |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+ [_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_GRV,
+  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
+  KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
+                          KC_LALT,    KC_LGUI, LOWER, KC_SPC,  KC_ENT,   RAISE,   KC_BSPC, KC_RGUI
+),
+/* LOWER
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   `  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   -  |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |   _  |   +  |   {  |   }  |   |  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+[_LOWER] = LAYOUT(
+  _______, _______, _______, _______, _______, _______,                   _______, _______, _______,_______, _______, _______,
+  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_GRV, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TILD,
+  _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+                             _______, _______, _______, _______, _______,  _______, _______, _______
+),
+/* RAISE
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |MOD   | MODR |  S+  |  S-  |  B+  |  B-  |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |-------.    ,-------|      | Left | Down |  Up  |Right |      |
+ * |------+------+------+------+------+------|RGB_TOG|    |    ]  |------+------+------+------+------+------|
+ * |  F7  |  F8  |  F9  | F10  | F11  | F12  |-------|    |-------|   +  |   -  |   =  |   [  |   ]  |   \  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+[_RAISE] = LAYOUT(
+  RGB_MOD, RGB_RMOD,RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,                     _______, _______, _______, _______, _______, _______,
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______,
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                       XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
+  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   RGB_TOG, _______,  KC_PLUS, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+                             _______, _______, _______,  _______, _______,  _______, _______, _______
+),
+/* ADJUST
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------.    ,-------|      |      |RGB ON| HUE+ | SAT+ | VAL+ |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |      | MODE | HUE- | SAT- | VAL- |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | LAlt | LGUI |LOWER | /Space  /       \Enter \  |RAISE |BackSP| RGUI |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+  [_ADJUST] = LAYOUT(
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                             _______, _______, _______, _______, _______,  _______, _______, _______
+  )
+};
+
diff --git a/keyboards/boardsource/lulu/keymaps/via/rules.mk b/keyboards/boardsource/lulu/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/boardsource/lulu/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/boardsource/lulu/lulu.c b/keyboards/boardsource/lulu/lulu.c
new file mode 100644
index 0000000000..390815795a
--- /dev/null
+++ b/keyboards/boardsource/lulu/lulu.c
@@ -0,0 +1,280 @@
+// Copyright 2022 Cole Smith <cole@boadsource.xyz>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "lulu.h"
+#ifdef RGB_MATRIX_ENABLE
+
+led_config_t g_led_config = { {
+    {12,11,10,9 ,8 ,7 },
+    {18,17,16,15,14,13},
+    {24,23,22,21,20,19},
+    {30,29,28,27,26,25},
+    {NO_LED,35,34,33,32,31},
+    {42,43,44,45,46,47},
+    {48,49,50,51,52,53},
+    {54,55,56,57,58,59},
+    {60,61,62,63,64,65},
+    {NO_LED,66,67,68,69,70}
+},{
+
+  {86,55},{51,55},{17,40},{17,10},{51,10},{86,10},
+  {0,0}, {17,0}, {34,0}, {51,0}, {68,0}, {86,0},
+  {0,16},{17,16},{34,16},{51,16},{68,16},{86,16},
+  {0,32},{17,32},{34,32},{51,32},{68,32},{86,32},
+  {0,48},{17,48},{34,48},{51,48},{68,48},{86,48},{103,48},
+                 {34,64},{51,64},{68,64},{86,64},
+
+
+  {137,55},{172,55},{206,40},{206,10},{172,10},{137,10},
+  {137,0}, {155,0}, {172,0}, {189,0}, {206,0}, {224,0},
+  {137,16},{155,16},{172,16},{189,16},{206,16},{224,16},
+  {137,32},{155,32},{172,32},{189,32},{206,32},{224,32},
+  {137,48},{155,48},{172,48},{189,48},{155,48},{137,48},{120,48},
+                    {172,64},{189,64},{155,64},{137,64}
+},{2,2,2,2,2,2,
+   4,4,4,4,4,1,
+   1,4,4,4,4,4,
+   4,4,4,4,4,1,
+   1,4,4,4,4,4,
+   1,4,1,1,1,
+   2,2,2,2,2,2,
+   4,4,4,4,4,1,
+   1,4,4,4,4,4,
+   4,4,4,4,4,1,
+   1,4,4,4,4,4,
+   1,4,1,1,1
+}};
+
+#endif
+
+
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+  if (!is_keyboard_master()) {
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  }
+  return rotation;
+}
+
+void render_layer1_logo(void){
+        static const char PROGMEM layer_logo[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
+0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 
+0xfc, 0x0e, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
+0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
+0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
+0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
+0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+    oled_write_raw_P(layer_logo, sizeof(layer_logo));
+}
+void render_layer2_logo(void){
+        static const char PROGMEM layer_logo[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
+0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
+0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 
+0x3f, 0x70, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
+0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
+0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
+0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
+0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
+0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+    oled_write_raw_P(layer_logo, sizeof(layer_logo));
+}
+void render_layer3_logo(void){
+        static const char PROGMEM layer_logo[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
+0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
+0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
+0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 
+0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0x70, 0x38, 0x1f, 0x07, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
+0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
+0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
+0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+    oled_write_raw_P(layer_logo, sizeof(layer_logo));
+}
+void render_layer4_logo(void){
+        static const char PROGMEM layer_logo[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0x80, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 
+0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc8, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x0f, 0x0f, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 
+0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x07, 0x0e, 0xfc, 0xf0, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 
+0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0x60, 
+0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x01, 0x03, 0x07, 
+0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 
+0x00, 0x01, 0x03, 0x07, 0x06, 0x0c, 0x0c, 0x0c, 0x0c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+    oled_write_raw_P(layer_logo, sizeof(layer_logo));
+}
+
+void render_logo(void) {
+    static const char PROGMEM logo[] = {
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0x60, 0x60, 0x60, 
+0x60, 0x60, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
+0x00, 0xe0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xfc, 0x1e, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x80, 0xc0, 
+0x80, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0e, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 
+0xe0, 0xc0, 0x80, 0x80, 0xc0, 0xc0, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
+0x00, 0x1f, 0xff, 0xff, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0xe0, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0x78, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x01, 
+0x01, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0x78, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 
+0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+    oled_write_raw_P(logo, sizeof(logo));
+}
+enum Layers{
+    _QWERTY,
+    _RAISE,
+    _LOWER,
+    _ADJUST
+};
+
+void process_layer_state(void) {
+    switch (get_highest_layer(layer_state)) {
+        case _QWERTY:
+            render_layer1_logo();
+            break;
+        case _LOWER:
+            render_layer2_logo();
+            break;
+        case _RAISE:
+            render_layer3_logo();
+            break;
+        case _ADJUST:
+            render_layer4_logo();
+            break;
+    }
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+    if (is_keyboard_master()) {
+        process_layer_state();
+    } else {
+        render_logo();
+    }
+    return false;
+}
+#endif
+
diff --git a/keyboards/boardsource/lulu/lulu.h b/keyboards/boardsource/lulu/lulu.h
new file mode 100644
index 0000000000..bda65f63e0
--- /dev/null
+++ b/keyboards/boardsource/lulu/lulu.h
@@ -0,0 +1,29 @@
+// Copyright 2022 Cole Smith <cole@boadsource.xyz>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+#include "split_util.h"
+#define has_usb() is_keyboard_master()
+#define is_master is_keyboard_master()
+#define LAYOUT( \
+	L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05,  \
+	L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
+	L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25,  \
+	L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \
+	               L41, L42, L43, L44, R41, R42, R43, R44  \
+	) \
+	{ \
+		{ L00, L01, L02, L03, L04, L05 }, \
+		{ L10, L11, L12, L13, L14, L15 }, \
+		{ L20, L21, L22, L23, L24, L25 }, \
+		{ L30, L31, L32, L33, L34, L35 }, \
+		{ KC_NO, L41, L42, L43, L44, L45 }, \
+		{ R05, R04, R03, R02, R01, R00 }, \
+		{ R15, R14, R13, R12, R11, R10 }, \
+		{ R25, R24, R23, R22, R21, R20 }, \
+		{ R35, R34, R33, R32, R31, R30 }, \
+		{ KC_NO, R44, R43, R42, R41, R40 } \
+	}
+
diff --git a/keyboards/boardsource/lulu/readme.md b/keyboards/boardsource/lulu/readme.md
new file mode 100644
index 0000000000..e7c530161b
--- /dev/null
+++ b/keyboards/boardsource/lulu/readme.md
@@ -0,0 +1,24 @@
+# Lulu
+
+![boardsource Lulu](https://i.imgur.com/tjvUoXTh.png)
+
+The lulu is what the ergo community has needed for a long time, a high-end aesthetic split ergo 60%. With this project we not only tried to create a beautiful product but we also wanted to unify the some what split 60% community. With hotswap, per key rgb & underglow, swappable encoder and adjustable tenting with out giving up anything.
+
+
+* Keyboard Maintainer: [Boardsource](https://github.com/daysgobye) 
+* Hardware Supported: lulu v1
+* Hardware Availability: this keyboard is available from the [Boardsource store](https://boardsource.xyz/store/61d0b772319a1f3cc53ba2fb)
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make boardsource/lulu:default
+
+Flashing example for this keyboard:
+
+    make boardsource/lulu:default:flash
+
+Reset keyboard by holding down top left key while you plug in the usb cable. Or by pushing the reset switch on the pcb.
+
+
+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).
diff --git a/keyboards/boardsource/lulu/rules.mk b/keyboards/boardsource/lulu/rules.mk
new file mode 100644
index 0000000000..06d206cb55
--- /dev/null
+++ b/keyboards/boardsource/lulu/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+RGB_MATRIX_SUPPORTED = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+LTO_ENABLE = yes
+ENCODER_ENABLE = yes  

From 773205cd1f9760ec9c68764ae9d9ba42d26c3016 Mon Sep 17 00:00:00 2001
From: Max Rumpf <max.rumpf1998@gmail.com>
Date: Sat, 12 Feb 2022 08:01:25 +0100
Subject: [PATCH 621/867] [Keyboard] Convert Maxr1998/Phoebe to use info.json
 where possible (#16309)

---
 keyboards/maxr1998/phoebe/config.h  |  42 ---
 keyboards/maxr1998/phoebe/info.json | 414 +++++++++++++++++++++++-----
 keyboards/maxr1998/phoebe/rules.mk  |  20 --
 3 files changed, 348 insertions(+), 128 deletions(-)

diff --git a/keyboards/maxr1998/phoebe/config.h b/keyboards/maxr1998/phoebe/config.h
index b52221dc03..cce72108c5 100644
--- a/keyboards/maxr1998/phoebe/config.h
+++ b/keyboards/maxr1998/phoebe/config.h
@@ -23,57 +23,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Maxr1998
 #define PRODUCT         Phoebe
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 12
-
-/* Planck PCB default pin-out */
-#define MATRIX_ROW_PINS { B7, B3, B2, B1, D6 }
-#define MATRIX_COL_PINS { D7, B4, B5, B6, C6, C7, B0, F1, F4, F5, F6, F7 }
-#define UNUSED_PINS
-
-/* 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
 
-/* RGB LED Setup */
-#define RGB_DI_PIN          F0 // pin the DI on the WS2812B is hooked-up to
-#define RGBLED_NUM          8  // number of LEDs
-
 /* Selectively enable animation effects */
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
 #define RGBLIGHT_EFFECT_SNAKE
 #define RGBLIGHT_EFFECT_CHRISTMAS
 #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1
-
-/* Leader key setup */
-#define LEADER_PER_KEY_TIMING
-#define LEADER_TIMEOUT 250
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/maxr1998/phoebe/info.json b/keyboards/maxr1998/phoebe/info.json
index 5892684245..1b22277d8a 100644
--- a/keyboards/maxr1998/phoebe/info.json
+++ b/keyboards/maxr1998/phoebe/info.json
@@ -1,69 +1,351 @@
 {
-  "keyboard_name": "Phoebe",
-  "url": "https://github.com/Maxr1998/Phoebe_Keyboard",
-  "maintainer": "Maxr1998",
-  "layouts": {
-    "LAYOUT": {
-      "layout": [ 
-        { "w": 1, "x": 0, "y": 0 }, 
-        { "w": 1, "x": 1, "y": 0 }, 
-        { "w": 1, "x": 2, "y": 0 }, 
-        { "w": 1, "x": 3, "y": 0 }, 
-        { "w": 1, "x": 4, "y": 0 }, 
-        { "w": 1, "x": 5, "y": 0 }, 
-        { "w": 1, "x": 6, "y": 0 }, 
-        { "w": 1, "x": 7, "y": 0 }, 
-        { "w": 1, "x": 8, "y": 0 }, 
-        { "w": 1, "x": 9, "y": 0 }, 
-        { "w": 1, "x": 10, "y": 0 }, 
-        { "w": 1, "x": 11, "y": 0 }, 
-        { "w": 1, "x": 0, "y": 1 }, 
-        { "w": 1, "x": 1, "y": 1 }, 
-        { "w": 1, "x": 2, "y": 1 }, 
-        { "w": 1, "x": 3, "y": 1 }, 
-        { "w": 1, "x": 4, "y": 1 }, 
-        { "w": 1, "x": 5, "y": 1 }, 
-        { "w": 1, "x": 6, "y": 1 }, 
-        { "w": 1, "x": 7, "y": 1 }, 
-        { "w": 1, "x": 8, "y": 1 }, 
-        { "w": 1, "x": 9, "y": 1 }, 
-        { "w": 1, "x": 10, "y": 1 }, 
-        { "w": 1, "x": 11, "y": 1 }, 
-        { "w": 1, "x": 0, "y": 2 }, 
-        { "w": 1, "x": 1, "y": 2 }, 
-        { "w": 1, "x": 2, "y": 2 }, 
-        { "w": 1, "x": 3, "y": 2 }, 
-        { "w": 1, "x": 4, "y": 2 }, 
-        { "w": 1, "x": 5, "y": 2 }, 
-        { "w": 1, "x": 6, "y": 2 }, 
-        { "w": 1, "x": 7, "y": 2 }, 
-        { "w": 1, "x": 8, "y": 2 }, 
-        { "w": 1, "x": 9, "y": 2 }, 
-        { "w": 1, "x": 10, "y": 2 }, 
-        { "w": 1, "x": 11, "y": 2 }, 
-        { "w": 1, "x": 0, "y": 3 }, 
-        { "w": 1, "x": 1, "y": 3 }, 
-        { "w": 1, "x": 2, "y": 3 }, 
-        { "w": 1, "x": 3, "y": 3 }, 
-        { "w": 1, "x": 4, "y": 3 }, 
-        { "w": 1, "x": 5, "y": 3 }, 
-        { "w": 1, "x": 6, "y": 3 }, 
-        { "w": 1, "x": 7, "y": 3 }, 
-        { "w": 1, "x": 8, "y": 3 }, 
-        { "w": 1, "x": 9, "y": 3 }, 
-        { "w": 1, "x": 10, "y": 3 }, 
-        { "w": 1, "x": 11, "y": 3 }, 
-        { "w": 1, "x": 0, "y": 4 }, 
-        { "w": 1, "x": 1, "y": 4 }, 
-        { "w": 1, "x": 2, "y": 4 }, 
-        { "w": 1, "x": 3, "y": 4 }, 
-        { "w": 1, "x": 4, "y": 4 }, 
-        { "w": 2, "x": 5, "y": 4 }, 
-        { "w": 1, "x": 7, "y": 4 }, 
-        { "w": 1, "x": 8, "y": 4 }, 
-        { "w": 1, "x": 9, "y": 4 }, 
-        { "w": 1, "x": 10, "y": 4 }, 
-        { "w": 1, "x": 11, "y": 4 } ]
+    "keyboard_name": "Phoebe",
+    "maintainer": "Maxr1998",
+    "manufacturer": "Maxr1998",
+    "url": "https://github.com/Maxr1998/Phoebe_Keyboard",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "bootloader_instructions": "Tap reset button on the back.",
+    "diode_direction": "COL2ROW",
+    "debounce": 5,
+    "features": {
+        "bootmagic": true,
+        "nkro": true,
+        "backlight": false,
+        "rgblight": true,
+        "key_lock": true,
+        "leader": true
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "w": 1,
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 7,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 8,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 9,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 10,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "w": 1,
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 3,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 4,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 5,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 6,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 7,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 8,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 9,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 10,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 11,
+                    "y": 1
+                },
+                {
+                    "w": 1,
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 1,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 2,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 3,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 4,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 5,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 6,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 7,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 8,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 9,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 10,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 11,
+                    "y": 2
+                },
+                {
+                    "w": 1,
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 1,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 2,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 3,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 4,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 5,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 6,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 7,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 8,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 9,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 10,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 11,
+                    "y": 3
+                },
+                {
+                    "w": 1,
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 1,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 2,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 3,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 4,
+                    "y": 4
+                },
+                {
+                    "w": 2,
+                    "x": 5,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 7,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 8,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 9,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 10,
+                    "y": 4
+                },
+                {
+                    "w": 1,
+                    "x": 11,
+                    "y": 4
+                }
+            ]
+        }
+    },
+    "leader_key": {
+        "timing": true,
+        "timeout": 250
+    },
+    "matrix_pins": {
+        "cols": [
+            "D7",
+            "B4",
+            "B5",
+            "B6",
+            "C6",
+            "C7",
+            "B0",
+            "F1",
+            "F4",
+            "F5",
+            "F6",
+            "F7"
+        ],
+        "rows": [
+            "B7",
+            "B3",
+            "B2",
+            "B1",
+            "D6"
+        ]
+    },
+    "rgblight": {
+        "led_count": 8,
+        "pin": "F0"
     }
-  }
 }
diff --git a/keyboards/maxr1998/phoebe/rules.mk b/keyboards/maxr1998/phoebe/rules.mk
index 75dbae8434..e69de29bb2 100644
--- a/keyboards/maxr1998/phoebe/rules.mk
+++ b/keyboards/maxr1998/phoebe/rules.mk
@@ -1,20 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-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
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no          # Audio output
-RGBLIGHT_ENABLE = yes      # Enable WS2812 RGB underlight.
-KEY_LOCK_ENABLE = yes
-LEADER_ENABLE = yes        # Enable leader key

From afcdd7079c774dec2aa4b7f2d08adf8b7310919b Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sat, 12 Feb 2022 09:16:35 -0800
Subject: [PATCH 622/867] Update keyboard mapping for all moved boards this
 cycle (#16312)

---
 data/mappings/keyboard_aliases.json | 610 ++++++++++++++++++++++++++++
 1 file changed, 610 insertions(+)

diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json
index 430229ecff..343812718e 100644
--- a/data/mappings/keyboard_aliases.json
+++ b/data/mappings/keyboard_aliases.json
@@ -584,5 +584,615 @@
     },
     zeal65: {
           target: 'wilba_tech/zeal65'
+    },
+    # Moved during 2022 Q1 cycle
+    6ball: {
+        target: 'maple_computing/6ball'
+    },
+    7skb: {
+        target: 'salicylic_acid3/7skb'
+    },
+    7splus: {
+        target: 'salicylic_acid3/7splus'
+    },
+    acr60: {
+        target: 'mechkeys/acr60'
+    },
+    adalyn: {
+        target: 'tominabox1/adalyn'
+    },
+    ajisai74: {
+        target: 'salicylic_acid3/ajisai74'
+    },
+    aleth42: {
+        target: '25keys/aleth42'
+    },
+    alicia_cook: {
+        target: 'ibnuda/alicia_cook'
+    },
+    allison: {
+        target: 'prototypist/allison'
+    },
+    allison_numpad: {
+        target: 'prototypist/allison_numpad'
+    },
+    alu84: {
+        target: 'mechkeys/alu84'
+    },
+    angel17: {
+        target: 'kakunpc/angel17'
+    },
+    angel64/alpha: {
+        target: 'kakunpc/angel64/alpha'
+    },
+    angel64/rev1: {
+        target: 'kakunpc/angel64/rev1'
+    },
+    arch_36: {
+        target: 'obosob/arch_36'
+    },
+    bakeneko60: {
+        target: 'kkatano/bakeneko60'
+    },
+    bakeneko65/rev2: {
+        target: 'kkatano/bakeneko65/rev2'
+    },
+    bakeneko65/rev3: {
+        target: 'kkatano/bakeneko65/rev3'
+    },
+    bakeneko80: {
+        target: 'kkatano/bakeneko80'
+    },
+    barleycorn: {
+        target: 'yiancardesigns/barleycorn'
+    },
+    bat43/rev1: {
+        target: 'dailycraft/bat43/rev1'
+    },
+    bat43/rev2: {
+        target: 'dailycraft/bat43/rev2'
+    },
+    bigseries/1key: {
+        target: 'woodkeys/bigseries/1key'
+    },
+    bigseries/2key: {
+        target: 'woodkeys/bigseries/2key'
+    },
+    bigseries/3key: {
+        target: 'woodkeys/bigseries/3key'
+    },
+    bigseries/4key: {
+        target: 'woodkeys/bigseries/4key'
+    },
+    bkf: {
+        target: 'drhigsby/bkf'
+    },
+    business_card/alpha: {
+        target: 'kakunpc/business_card/alpha'
+    },
+    business_card/beta: {
+        target: 'kakunpc/business_card/beta'
+    },
+    butterstick: {
+        target: 'gboards/butterstick'
+    },
+    c39: {
+        target: 'maple_computing/c39'
+    },
+    cassette42: {
+        target: '25keys/cassette42'
+    },
+    chidori: {
+        target: 'kagizaraya/chidori'
+    },
+    chili: {
+        target: 'ydkb/chili'
+    },
+    chimera_ergo: {
+        target: 'glenpickle/chimera_ergo'
+    },
+    chimera_ls: {
+        target: 'glenpickle/chimera_ls'
+    },
+    chimera_ortho: {
+        target: 'glenpickle/chimera_ortho'
+    },
+    chimera_ortho_plus: {
+        target: 'glenpickle/chimera_ortho_plus'
+    },
+    choc_taro: {
+        target: 'kakunpc/choc_taro'
+    },
+    choco60: {
+        target: 'recompile_keys/choco60'
+    },
+    christmas_tree: {
+        target: 'maple_computing/christmas_tree'
+    },
+    claw44/rev1: {
+        target: 'dailycraft/claw44/rev1'
+    },
+    cocoa40: {
+        target: 'recompile_keys/cocoa40'
+    },
+    comet46: {
+        target: 'satt/comet46'
+    },
+    cu24: {
+        target: 'capsunlocked/cu24'
+    },
+    cu75: {
+        target: 'capsunlocked/cu75'
+    },
+    cu80: {
+        target: 'capsunlocked/cu80/v1'
+    },
+    delilah: {
+        target: 'rainkeebs/delilah'
+    },
+    diverge3: {
+        target: 'unikeyboard/diverge3'
+    },
+    divergetm2: {
+        target: 'unikeyboard/divergetm2'
+    },
+    dozen0: {
+        target: 'yynmt/dozen0'
+    },
+    dubba175: {
+        target: 'drhigsby/dubba175'
+    },
+    eggman: {
+        target: 'qpockets/eggman'
+    },
+    ergo42: {
+        target: 'biacco42/ergo42'
+    },
+    ergoarrows: {
+        target: 'salicylic_acid3/ergoarrows'
+    },
+    ergodash/mini: {
+        target: 'omkbd/ergodash/mini'
+    },
+    ergodash/rev1: {
+        target: 'omkbd/ergodash/rev1'
+    },
+    ergodox_infinity: {
+        target: 'input_club/ergodox_infinity'
+    },
+    ergotaco: {
+        target: 'gboards/ergotaco'
+    },
+    espectro: {
+        target: 'mechkeys/espectro'
+    },
+    felix: {
+        target: 'unikeyboard/felix'
+    },
+    four_banger: {
+        target: 'bpiphany/four_banger'
+    },
+    freyr: {
+        target: 'hnahkb/freyr'
+    },
+    geminate60: {
+        target: 'weirdo/geminate60'
+    },
+    georgi: {
+        target: 'gboards/georgi'
+    },
+    gergo: {
+        target: 'gboards/gergo'
+    },
+    getta25: {
+        target: 'salicylic_acid3/getta25'
+    },
+    gingham: {
+        target: 'yiancardesigns/gingham'
+    },
+    gurindam: {
+        target: 'ibnuda/gurindam'
+    },
+    halberd: {
+        target: 'kagizaraya/halberd'
+    },
+    hecomi/alpha: {
+        target: 'takashiski/hecomi/alpha'
+    },
+    hid_liber: {
+        target: 'bpiphany/hid_liber'
+    },
+    id67/default_rgb: {
+        target: 'idobao/id67/default_rgb'
+    },
+    id67/rgb: {
+        target: 'idobao/id67/rgb'
+    },
+    id80: {
+        target: 'idobao/id80/v1'
+    },
+    id87: {
+        target: 'idobao/id87/v1'
+    },
+    idobo: {
+        target: 'idobao/id75/v1'
+    },
+    infinity60: {
+        target: 'input_club/infinity60'
+    },
+    ivy/rev1: {
+        target: 'maple_computing/ivy/rev1'
+    },
+    jisplit89: {
+        target: 'salicylic_acid3/jisplit89'
+    },
+    jnao: {
+        target: 'maple_computing/jnao'
+    },
+    just60: {
+        target: 'ydkb/just60'
+    },
+    k_type: {
+        target: 'input_club/k_type'
+    },
+    kagamidget: {
+        target: 'yynmt/kagamidget'
+    },
+    kelowna/rgb64: {
+        target: 'weirdo/kelowna/rgb64'
+    },
+    kprepublic/bm65hsrgb_iso: {
+        target: 'kprepublic/bm65hsrgb_iso/rev1'
+    },
+    kprepublic/bm68hsrgb: {
+        target: 'kprepublic/bm68hsrgb/rev1'
+    },
+    latin17rgb: {
+        target: 'latincompass/latin17rgb'
+    },
+    latin47ble: {
+        target: 'latincompass/latin47ble'
+    },
+    latin60rgb: {
+        target: 'latincompass/latin60rgb'
+    },
+    latin64ble: {
+        target: 'latincompass/latin64ble'
+    },
+    latin6rgb: {
+        target: 'latincompass/latin6rgb'
+    },
+    latinpad: {
+        target: 'latincompass/latinpad'
+    },
+    latinpadble: {
+        target: 'latincompass/latinpadble'
+    },
+    launchpad/rev1: {
+        target: 'maple_computing/launchpad/rev1'
+    },
+    lck75: {
+        target: 'lyso1/lck75'
+    },
+    le_chiffre: {
+        target: 'tominabox1/le_chiffre'
+    },
+    lefishe: {
+        target: 'lyso1/lefishe'
+    },
+    lets_split_eh/eh: {
+        target: 'maple_computing/lets_split_eh/eh'
+    },
+    ls_60: {
+        target: 'weirdo/ls_60'
+    },
+    m3n3van: {
+        target: 'matthewdias/m3n3van'
+    },
+    mechmini/v1: {
+        target: 'mechkeys/mechmini/v1'
+    },
+    mechmini/v2: {
+        target: 'mechkeys/mechmini/v2'
+    },
+    meira: {
+        target: 'woodkeys/meira'
+    },
+    meishi: {
+        target: 'biacco42/meishi'
+    },
+    meishi2: {
+        target: 'biacco42/meishi2'
+    },
+    minidox/rev1: {
+        target: 'maple_computing/minidox/rev1'
+    },
+    minim: {
+        target: 'matthewdias/minim'
+    },
+    mio: {
+        target: 'recompile_keys/mio'
+    },
+    model_v: {
+        target: 'matthewdias/model_v'
+    },
+    montex: {
+        target: 'idobao/montex/v1'
+    },
+    nafuda: {
+        target: 'salicylic_acid3/nafuda'
+    },
+    naiping/np64: {
+        target: 'weirdo/naiping/np64'
+    },
+    naiping/nphhkb: {
+        target: 'weirdo/naiping/nphhkb'
+    },
+    naiping/npminila: {
+        target: 'weirdo/naiping/npminila'
+    },
+    naked48: {
+        target: 'salicylic_acid3/naked48'
+    },
+    naked60: {
+        target: 'salicylic_acid3/naked60'
+    },
+    naked64: {
+        target: 'salicylic_acid3/naked64'
+    },
+    namecard2x4: {
+        target: 'takashiski/namecard2x4'
+    },
+    nebula12: {
+        target: 'spaceholdings/nebula12'
+    },
+    nebula68: {
+        target: 'spaceholdings/nebula68'
+    },
+    nebula68b: {
+        target: 'spaceholdings/nebula68b'
+    },
+    niu_mini: {
+        target: 'kbdfans/niu_mini'
+    },
+    nk1: {
+        target: 'novelkeys/nk1'
+    },
+    nk65: {
+        target: 'novelkeys/nk65'
+    },
+    nk87: {
+        target: 'novelkeys/nk87'
+    },
+    nknl7en: {
+        target: 'salicylic_acid3/nknl7en'
+    },
+    nknl7jp: {
+        target: 'salicylic_acid3/nknl7jp'
+    },
+    nomu30: {
+        target: 'recompile_keys/nomu30'
+    },
+    novelpad: {
+        target: 'novelkeys/novelpad'
+    },
+    ogurec: {
+        target: 'drhigsby/ogurec'
+    },
+    otaku_split/rev0: {
+        target: 'takashiski/otaku_split/rev0'
+    },
+    otaku_split/rev1: {
+        target: 'takashiski/otaku_split/rev1'
+    },
+    owl8: {
+        target: 'dailycraft/owl8'
+    },
+    packrat: {
+        target: 'drhigsby/packrat'
+    },
+    pistachio: {
+        target: 'rate/pistachio'
+    },
+    pistachio_mp: {
+        target: 'rate/pistachio_mp'
+    },
+    pistachio_pro: {
+        target: 'rate/pistachio_pro'
+    },
+    plexus75: {
+        target: 'checkerboards/plexus75'
+    },
+    pursuit40: {
+        target: 'checkerboards/pursuit40'
+    },
+    qaz: {
+        target: 'tominabox1/qaz'
+    },
+    quark: {
+        target: 'checkerboards/quark'
+    },
+    rabbit_capture_plan: {
+        target: 'kakunpc/rabbit_capture_plan'
+    },
+    rainkeeb: {
+        target: 'rainkeebs/rainkeeb'
+    },
+    reviung33: {
+        target: 'reviung/reviung33'
+    },
+    reviung34: {
+        target: 'reviung/reviung34'
+    },
+    reviung39: {
+        target: 'reviung/reviung39'
+    },
+    reviung41: {
+        target: 'reviung/reviung41'
+    },
+    reviung5: {
+        target: 'reviung/reviung5'
+    },
+    reviung53: {
+        target: 'reviung/reviung53'
+    },
+    reviung61: {
+        target: 'reviung/reviung61'
+    },
+    runner3680/3x6: {
+        target: 'omkbd/runner3680/3x6'
+    },
+    runner3680/3x7: {
+        target: 'omkbd/runner3680/3x7'
+    },
+    runner3680/3x8: {
+        target: 'omkbd/runner3680/3x8'
+    },
+    runner3680/4x6: {
+        target: 'omkbd/runner3680/4x6'
+    },
+    runner3680/4x7: {
+        target: 'omkbd/runner3680/4x7'
+    },
+    runner3680/4x8: {
+        target: 'omkbd/runner3680/4x8'
+    },
+    runner3680/5x6: {
+        target: 'omkbd/runner3680/5x6'
+    },
+    runner3680/5x6_5x8: {
+        target: 'omkbd/runner3680/5x6_5x8'
+    },
+    runner3680/5x7: {
+        target: 'omkbd/runner3680/5x7'
+    },
+    runner3680/5x8: {
+        target: 'omkbd/runner3680/5x8'
+    },
+    scarletbandana: {
+        target: 'woodkeys/scarletbandana'
+    },
+    scythe: {
+        target: 'kagizaraya/scythe'
+    },
+    seigaiha: {
+        target: 'yiancardesigns/seigaiha'
+    },
+    setta21: {
+        target: 'salicylic_acid3/setta21'
+    },
+    space_space/rev1: {
+        target: 'qpockets/space_space/rev1'
+    },
+    space_space/rev2: {
+        target: 'qpockets/space_space/rev2'
+    },
+    spiderisland/winry25tc: {
+        target: 'winry/winry25tc'
+    },
+    splitreus62: {
+        target: 'nacly/splitreus62'
+    },
+    squiggle/rev1: {
+        target: 'ibnuda/squiggle/rev1'
+    },
+    standaside: {
+        target: 'edi/standaside'
+    },
+    steal_this_keyboard: {
+        target: 'obosob/steal_this_keyboard'
+    },
+    stella: {
+        target: 'hnahkb/stella'
+    },
+    suihankey/alpha: {
+        target: 'kakunpc/suihankey/alpha'
+    },
+    suihankey/rev1: {
+        target: 'kakunpc/suihankey/rev1'
+    },
+    suihankey/split: {
+        target: 'kakunpc/suihankey/split'
+    },
+    the_ruler: {
+        target: 'maple_computing/the_ruler'
+    },
+    thedogkeyboard: {
+        target: 'kakunpc/thedogkeyboard'
+    },
+    tiger910: {
+        target: 'weirdo/tiger910'
+    },
+    treadstone32: {
+        target: 'marksard/treadstone32'
+    },
+    treadstone48/rev1: {
+        target: 'marksard/treadstone48/rev1'
+    },
+    treadstone48/rev2: {
+        target: 'marksard/treadstone48/rev2'
+    },
+    txuu: {
+        target: 'matthewdias/txuu'
+    },
+    ua62: {
+        target: 'nacly/ua62'
+    },
+    underscore33/rev1: {
+        target: 'tominabox1/underscore33/rev1'
+    },
+    underscore33/rev2: {
+        target: 'tominabox1/underscore33/rev2'
+    },
+    vn66: {
+        target: 'hnahkb/vn66'
+    },
+    wallaby: {
+        target: 'kkatano/wallaby'
+    },
+    wanten: {
+        target: 'qpockets/wanten'
+    },
+    whitefox: {
+        target: 'input_club/whitefox'
+    },
+    wings42/rev1: {
+        target: 'dailycraft/wings42/rev1'
+    },
+    wings42/rev1_extkeys: {
+        target: 'dailycraft/wings42/rev1_extkeys'
+    },
+    wings42/rev2: {
+        target: 'dailycraft/wings42/rev2'
+    },
+    yasui: {
+        target: 'rainkeebs/yasui'
+    },
+    yd60mq: {
+        target: 'ymdk/yd60mq'
+    },
+    yd68: {
+        target: 'ydkb/yd68'
+    },
+    ymd75: {
+        target: 'ymdk/ymd75'
+    },
+    ymd96: {
+        target: 'ymdk/ymd96'
+    },
+    ymdk_np21: {
+        target: 'ymdk/np21'
+    },
+    yurei: {
+        target: 'kkatano/yurei'
+    },
+    zinc: {
+        target: '25keys/zinc'
+    },
+    zinc/rev1: {
+        target: '25keys/zinc/rev1'
+    },
+    zinc/reva: {
+        target: '25keys/zinc/reva'
     }
 }

From 63646e8906e062d1c1de3925cba70c4e3426a855 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Sat, 12 Feb 2022 10:29:31 -0800
Subject: [PATCH 623/867] Format code according to conventions (#16322)

---
 drivers/bluetooth/bluefruit_le.cpp            |  26 +-
 drivers/bluetooth/outputselect.c              |   2 +-
 drivers/bluetooth/rn42.c                      |   8 +-
 drivers/eeprom/eeprom_driver.c                |  12 +-
 drivers/eeprom/eeprom_i2c.c                   |   6 +-
 drivers/eeprom/eeprom_spi.c                   |  12 +-
 drivers/eeprom/eeprom_transient.c             |   8 +-
 drivers/eeprom/eeprom_transient.h             |   2 +-
 drivers/flash/flash_spi.c                     |  12 +-
 drivers/gpio/mcp23018.c                       |   6 +-
 drivers/haptic/DRV2605L.c                     |   6 +-
 drivers/haptic/solenoid.c                     |  20 +-
 drivers/lcd/st7565.c                          |  25 +-
 drivers/lcd/st7565.h                          |   8 +-
 drivers/led/apa102.c                          |  10 +-
 drivers/led/aw20216.c                         |  14 +-
 drivers/led/issi/is31fl3731-simple.c          |   6 +-
 drivers/led/issi/is31fl3731.c                 |   6 +-
 drivers/led/issi/is31fl3733-simple.c          |  20 +-
 drivers/led/issi/is31fl3733-simple.h          |  14 +-
 drivers/led/issi/is31fl3733.c                 |  20 +-
 drivers/led/issi/is31fl3733.h                 |  14 +-
 drivers/led/issi/is31fl3736.c                 |  18 +-
 drivers/led/issi/is31fl3736.h                 |  16 +-
 drivers/led/issi/is31fl3737.c                 |  18 +-
 drivers/led/issi/is31fl3737.h                 |  16 +-
 drivers/led/issi/is31fl3741.c                 |  18 +-
 drivers/led/issi/is31fl3741.h                 |  16 +-
 drivers/oled/oled_driver.h                    |  22 +-
 drivers/oled/ssd1306_sh1106.c                 |  49 +-
 drivers/ps2/ps2_busywait.c                    |   6 +-
 drivers/ps2/ps2_interrupt.c                   |  16 +-
 drivers/ps2/ps2_mouse.c                       |  28 +-
 drivers/sensors/adns5050.c                    |  10 +-
 drivers/sensors/adns9800.c                    |   4 +-
 drivers/sensors/analog_joystick.c             |   2 +-
 drivers/sensors/cirque_pinnacle.c             |  38 +-
 drivers/sensors/cirque_pinnacle.h             |   8 +-
 drivers/sensors/cirque_pinnacle_i2c.c         |   4 +-
 drivers/sensors/cirque_pinnacle_spi.c         |  10 +-
 drivers/sensors/pimoroni_trackball.c          |   4 +-
 drivers/sensors/pmw3360.c                     |  14 +-
 drivers/sensors/pmw3360.h                     |   8 +-
 drivers/sensors/pmw3389.c                     |  14 +-
 drivers/sensors/pmw3389.h                     |   8 +-
 drivers/usb2422.c                             |  14 +-
 drivers/ws2812.h                              |   8 +-
 platforms/arm_atsam/bootloaders/md_boot.c     |  22 +-
 platforms/arm_atsam/eeprom_samd.c             |   4 +-
 platforms/arm_atsam/eeprom_samd.h             |   2 +-
 platforms/arm_atsam/suspend.c                 |   2 +-
 platforms/arm_atsam/timer.c                   |  32 +-
 platforms/avr/bootloaders/dfu.c               |   4 +-
 platforms/avr/bootloaders/halfkay.c           |  10 +-
 platforms/avr/drivers/analog.c                |   8 +-
 platforms/avr/drivers/analog.h                |  18 +-
 platforms/avr/drivers/audio_pwm_hardware.c    |   8 +-
 platforms/avr/drivers/glcdfont.c              |  18 +-
 platforms/avr/drivers/hd44780.c               |  22 +-
 platforms/avr/drivers/i2c_master.c            |   6 +-
 platforms/avr/drivers/i2c_slave.c             |  12 +-
 platforms/avr/drivers/i2c_slave.h             |   6 +-
 platforms/avr/drivers/ps2/ps2_io.c            |   8 +-
 platforms/avr/drivers/ps2/ps2_usart.c         |   8 +-
 platforms/avr/drivers/serial.c                | 116 +--
 platforms/avr/drivers/spi_master.c            |   2 +-
 platforms/avr/drivers/ssd1306.c               |  22 +-
 platforms/avr/drivers/uart.c                  |   4 +-
 platforms/avr/drivers/ws2812.c                |  14 +-
 platforms/avr/drivers/ws2812_i2c.c            |   4 +-
 platforms/avr/pin_defs.h                      |   2 +-
 platforms/avr/printf.c                        |   4 +-
 platforms/avr/sleep_led.c                     |   2 +-
 platforms/avr/suspend.c                       |   2 +-
 platforms/avr/timer.c                         |  24 +-
 platforms/chibios/bootloaders/stm32_dfu.c     |   2 +-
 platforms/chibios/bootloaders/stm32duino.c    |   4 +-
 platforms/chibios/chibios_config.h            |   4 +-
 platforms/chibios/drivers/analog.c            |   6 +-
 platforms/chibios/drivers/analog.h            |   4 +-
 .../chibios/drivers/audio_dac_additive.c      |  26 +-
 platforms/chibios/drivers/audio_dac_basic.c   |  16 +-
 .../chibios/drivers/audio_pwm_hardware.c      |  18 +-
 .../chibios/drivers/audio_pwm_software.c      |  18 +-
 .../drivers/eeprom/eeprom_stm32_L0_L1.h       |   2 +-
 platforms/chibios/drivers/i2c_master.c        |   4 +-
 platforms/chibios/drivers/serial.c            |  36 +-
 platforms/chibios/drivers/serial_usart.c      |   2 +-
 platforms/chibios/drivers/serial_usart.h      |   6 +-
 platforms/chibios/drivers/spi_master.c        |   2 +-
 platforms/chibios/drivers/uart.c              |  16 +-
 platforms/chibios/drivers/usbpd_stm32g4.c     |   4 +-
 platforms/chibios/drivers/ws2812.c            |  10 +-
 platforms/chibios/drivers/ws2812_pwm.c        |  30 +-
 platforms/chibios/drivers/ws2812_spi.c        |  40 +-
 platforms/chibios/eeprom_stm32.c              |   8 +-
 platforms/chibios/eeprom_stm32_defs.h         |  26 +-
 platforms/chibios/eeprom_teensy.c             |  34 +-
 platforms/chibios/gd32v_compatibility.h       |   4 +-
 platforms/chibios/sleep_led.c                 |  36 +-
 platforms/chibios/syscall-fallbacks.c         |   8 +-
 platforms/chibios/timer.c                     |  14 +-
 platforms/suspend.c                           |   8 +-
 platforms/test/eeprom.c                       |   4 +-
 platforms/test/eeprom_stm32_tests.cpp         |  54 +-
 platforms/test/flash_stm32_mock.c             |  12 +-
 platforms/test/timer.c                        |  36 +-
 platforms/timer.h                             |  16 +-
 quantum/action.c                              |  50 +-
 quantum/action_layer.c                        |  88 ++-
 quantum/action_tapping.c                      |  16 +-
 quantum/action_util.c                         | 132 +++-
 quantum/action_util.h                         |  12 +-
 quantum/audio/audio.c                         |  78 +-
 quantum/audio/audio.h                         |   6 +-
 quantum/audio/song_list.h                     |   2 +-
 quantum/audio/voices.c                        |  48 +-
 quantum/audio/voices.h                        |   2 +-
 quantum/backlight/backlight.c                 |  54 +-
 quantum/backlight/backlight.h                 |   2 +-
 quantum/backlight/backlight_avr.c             |  50 +-
 quantum/backlight/backlight_chibios.c         |  16 +-
 quantum/backlight/backlight_driver_common.c   |   8 +-
 quantum/backlight/backlight_software.c        |  12 +-
 quantum/backlight/backlight_timer.c           |  32 +-
 quantum/bitwise.c                             |   9 +-
 quantum/bootmagic/bootmagic_lite.c            |   8 +-
 quantum/color.c                               |   4 +-
 quantum/command.c                             |   2 +-
 quantum/debounce/sym_defer_g.c                |   2 +-
 quantum/debounce/sym_defer_pr.c               |   4 +-
 quantum/debounce/sym_eager_pk.c               |   2 +-
 .../debounce/tests/debounce_test_common.cpp   |   4 +-
 quantum/deferred_exec.c                       |  16 +-
 quantum/digitizer.c                           |   8 +-
 quantum/dip_switch.c                          |  16 +-
 quantum/dynamic_keymap.c                      |  20 +-
 quantum/eeconfig.c                            |  70 +-
 quantum/eeconfig.h                            |  52 +-
 quantum/encoder.c                             |  14 +-
 quantum/encoder/tests/mock.c                  |   4 +-
 quantum/encoder/tests/mock_split.c            |   4 +-
 quantum/haptic.c                              |   4 +-
 quantum/keyboard.c                            |  58 +-
 quantum/keyboard.h                            |  36 +-
 quantum/keycode.h                             |  26 +-
 quantum/keymap_common.c                       |   2 +-
 quantum/keymap_extras/keymap_nordic.h         |   2 +-
 quantum/keymap_extras/keymap_steno.h          |   2 +-
 quantum/led.c                                 |  12 +-
 .../led_matrix/animations/alpha_mods_anim.h   |   4 +-
 quantum/led_matrix/animations/band_anim.h     |   8 +-
 .../animations/band_pinwheel_anim.h           |  12 +-
 .../led_matrix/animations/band_spiral_anim.h  |  12 +-
 .../led_matrix/animations/breathing_anim.h    |   4 +-
 .../animations/cycle_left_right_anim.h        |  12 +-
 .../led_matrix/animations/cycle_out_in_anim.h |  12 +-
 .../animations/cycle_up_down_anim.h           |  12 +-
 .../led_matrix/animations/dual_beacon_anim.h  |  12 +-
 .../runners/effect_runner_reactive.h          |   2 +-
 .../runners/effect_runner_reactive_splash.h   |   2 +-
 quantum/led_matrix/animations/solid_anim.h    |   2 +-
 .../animations/solid_reactive_cross.h         |  14 +-
 .../animations/solid_reactive_nexus.h         |  14 +-
 .../animations/solid_reactive_simple_anim.h   |  14 +-
 .../animations/solid_reactive_wide.h          |  14 +-
 .../led_matrix/animations/solid_splash_anim.h |  14 +-
 .../animations/wave_left_right_anim.h         |  12 +-
 .../led_matrix/animations/wave_up_down_anim.h |  12 +-
 quantum/led_matrix/led_matrix.c               | 179 +++--
 quantum/led_matrix/led_matrix_types.h         |   6 +-
 quantum/logging/debug.c                       |  10 +-
 quantum/logging/print.c                       |  12 +-
 quantum/logging/print.h                       |   2 +-
 quantum/logging/sendchar.c                    |   4 +-
 quantum/main.c                                |   4 +-
 quantum/matrix.c                              |  28 +-
 quantum/matrix_common.c                       |  44 +-
 quantum/mousekey.c                            |   4 +-
 quantum/pointing_device.c                     |  40 +-
 quantum/pointing_device.h                     |   4 +-
 quantum/pointing_device_drivers.c             |  24 +-
 quantum/process_keycode/process_audio.c       |  12 +-
 quantum/process_keycode/process_auto_shift.c  |  36 +-
 quantum/process_keycode/process_clicky.c      |  32 +-
 quantum/process_keycode/process_combo.c       |  40 +-
 .../process_keycode/process_dynamic_macro.c   |  16 +-
 quantum/process_keycode/process_joystick.c    |   4 +-
 .../process_keycode/process_key_override.c    |  24 +-
 quantum/process_keycode/process_leader.c      |   4 +-
 quantum/process_keycode/process_magic.c       |   8 +-
 quantum/process_keycode/process_midi.c        |  26 +-
 quantum/process_keycode/process_midi.h        |   4 +-
 quantum/process_keycode/process_music.c       |  26 +-
 quantum/process_keycode/process_music.h       |   8 +-
 quantum/process_keycode/process_printer.c     |   7 +-
 quantum/process_keycode/process_printer_bb.c  |  23 +-
 quantum/process_keycode/process_steno.c       |  24 +-
 quantum/process_keycode/process_tap_dance.c   |   4 +-
 quantum/process_keycode/process_terminal.c    |  34 +-
 quantum/process_keycode/process_ucis.c        |   2 +-
 .../process_keycode/process_unicode_common.c  |  24 +-
 .../process_keycode/process_unicode_common.h  |  12 +-
 quantum/programmable_button.c                 |  28 +-
 quantum/quantum.c                             |  39 +-
 quantum/quantum_keycodes.h                    | 698 +++++++++---------
 .../rgb_matrix/animations/alpha_mods_anim.h   |   4 +-
 .../rgb_matrix/animations/breathing_anim.h    |   4 +-
 .../animations/colorband_pinwheel_sat_anim.h  |   8 +-
 .../animations/colorband_pinwheel_val_anim.h  |   8 +-
 .../animations/colorband_sat_anim.h           |   8 +-
 .../animations/colorband_spiral_sat_anim.h    |   8 +-
 .../animations/colorband_spiral_val_anim.h    |   8 +-
 .../animations/colorband_val_anim.h           |   8 +-
 .../rgb_matrix/animations/cycle_all_anim.h    |   8 +-
 .../animations/cycle_left_right_anim.h        |   8 +-
 .../rgb_matrix/animations/cycle_out_in_anim.h |   8 +-
 .../animations/cycle_out_in_dual_anim.h       |   8 +-
 .../animations/cycle_pinwheel_anim.h          |   8 +-
 .../rgb_matrix/animations/cycle_spiral_anim.h |   8 +-
 .../animations/cycle_up_down_anim.h           |   8 +-
 .../rgb_matrix/animations/digital_rain_anim.h |   4 +-
 .../rgb_matrix/animations/dual_beacon_anim.h  |   8 +-
 .../animations/gradient_left_right_anim.h     |   4 +-
 .../animations/gradient_up_down_anim.h        |   4 +-
 .../animations/hue_breathing_anim.h           |   4 +-
 .../rgb_matrix/animations/hue_pendulum_anim.h |   8 +-
 quantum/rgb_matrix/animations/hue_wave_anim.h |   8 +-
 .../animations/jellybean_raindrops_anim.h     |   4 +-
 .../rgb_matrix/animations/pixel_flow_anim.h   |   8 +-
 .../animations/pixel_fractal_anim.h           |  12 +-
 .../rgb_matrix/animations/pixel_rain_anim.h   |   8 +-
 .../animations/rainbow_beacon_anim.h          |   8 +-
 .../animations/rainbow_moving_chevron_anim.h  |   8 +-
 .../animations/rainbow_pinwheels_anim.h       |   8 +-
 .../rgb_matrix/animations/raindrops_anim.h    |   4 +-
 .../runners/effect_runner_reactive.h          |   2 +-
 .../runners/effect_runner_reactive_splash.h   |   2 +-
 .../rgb_matrix/animations/solid_color_anim.h  |   2 +-
 .../animations/solid_reactive_anim.h          |  10 +-
 .../animations/solid_reactive_cross.h         |  14 +-
 .../animations/solid_reactive_nexus.h         |  14 +-
 .../animations/solid_reactive_simple_anim.h   |  10 +-
 .../animations/solid_reactive_wide.h          |  14 +-
 .../rgb_matrix/animations/solid_splash_anim.h |  14 +-
 quantum/rgb_matrix/animations/splash_anim.h   |  14 +-
 .../animations/typing_heatmap_anim.h          |   4 +-
 quantum/rgb_matrix/rgb_matrix.c               | 249 +++++--
 quantum/rgb_matrix/rgb_matrix_types.h         |   6 +-
 quantum/rgblight/rgblight.c                   | 226 ++++--
 quantum/rgblight/rgblight.h                   |  10 +-
 quantum/ring_buffer.h                         |   8 +-
 quantum/send_string.c                         |  22 +-
 quantum/sequencer/sequencer.c                 |  62 +-
 quantum/sequencer/sequencer.h                 |   8 +-
 quantum/sequencer/tests/midi_mock.c           |  12 +-
 quantum/sequencer/tests/sequencer_tests.cpp   |   4 +-
 quantum/split_common/post_config.h            |   2 +-
 quantum/split_common/split_util.c             |  20 +-
 quantum/split_common/transaction_id_define.h  |  36 +-
 quantum/split_common/transactions.c           |  94 +--
 quantum/split_common/transport.c              |  30 +-
 quantum/split_common/transport.h              |  60 +-
 quantum/sync_timer.c                          |   4 +-
 quantum/velocikey.c                           |   8 +-
 quantum/via.c                                 |  18 +-
 quantum/via.h                                 |   6 +-
 quantum/wpm.c                                 |  22 +-
 tests/test_common/keyboard_report_util.cpp    |  14 +-
 tests/test_common/matrix.c                    |  16 +-
 tests/test_common/test_driver.cpp             |  20 +-
 tests/test_common/test_fixture.cpp            |   4 +-
 tests/test_common/test_logger.cpp             |   8 +-
 tmk_core/protocol/arm_atsam/adc.c             |  26 +-
 tmk_core/protocol/arm_atsam/adc.h             |   2 +-
 .../protocol/arm_atsam/arm_atsam_protocol.h   |   4 +-
 tmk_core/protocol/arm_atsam/clks.c            |  42 +-
 tmk_core/protocol/arm_atsam/clks.h            |  24 +-
 tmk_core/protocol/arm_atsam/d51_util.c        |  34 +-
 tmk_core/protocol/arm_atsam/d51_util.h        |   4 +-
 tmk_core/protocol/arm_atsam/i2c_master.c      | 132 ++--
 tmk_core/protocol/arm_atsam/i2c_master.h      |   4 +-
 tmk_core/protocol/arm_atsam/issi3733_driver.h | 192 ++---
 tmk_core/protocol/arm_atsam/main_arm_atsam.c  | 113 +--
 tmk_core/protocol/arm_atsam/main_arm_atsam.h  |   2 +-
 tmk_core/protocol/arm_atsam/md_rgb_matrix.c   |  82 +-
 tmk_core/protocol/arm_atsam/md_rgb_matrix.h   | 142 ++--
 .../arm_atsam/md_rgb_matrix_programs.c        |   4 +-
 tmk_core/protocol/arm_atsam/shift_register.c  |  12 +-
 tmk_core/protocol/arm_atsam/spi_master.c      |  22 +-
 tmk_core/protocol/arm_atsam/usb/compiler.h    | 116 +--
 tmk_core/protocol/arm_atsam/usb/conf_usb.h    |   4 +-
 tmk_core/protocol/arm_atsam/usb/main_usb.c    |  48 +-
 .../protocol/arm_atsam/usb/status_codes.h     |  28 +-
 tmk_core/protocol/arm_atsam/usb/udc.c         |  66 +-
 tmk_core/protocol/arm_atsam/usb/udc.h         |  18 +-
 tmk_core/protocol/arm_atsam/usb/udc_desc.h    |   2 +-
 tmk_core/protocol/arm_atsam/usb/udd.h         |   2 +-
 tmk_core/protocol/arm_atsam/usb/udi.h         |   2 +-
 tmk_core/protocol/arm_atsam/usb/udi_cdc.c     | 158 ++--
 tmk_core/protocol/arm_atsam/usb/udi_cdc.h     |   6 +-
 .../protocol/arm_atsam/usb/udi_cdc_conf.h     |   8 +-
 .../protocol/arm_atsam/usb/udi_device_conf.h  |  20 +-
 .../arm_atsam/usb/udi_device_epsize.h         |   2 +-
 tmk_core/protocol/arm_atsam/usb/udi_hid.c     |   2 +-
 tmk_core/protocol/arm_atsam/usb/udi_hid.h     |   2 +-
 tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c | 146 ++--
 tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h |  12 +-
 .../protocol/arm_atsam/usb/udi_hid_kbd_conf.h |   2 +-
 .../protocol/arm_atsam/usb/udi_hid_kbd_desc.c |   6 +-
 tmk_core/protocol/arm_atsam/usb/ui.c          |   2 +-
 tmk_core/protocol/arm_atsam/usb/ui.h          |   2 +-
 tmk_core/protocol/arm_atsam/usb/usb.c         |  28 +-
 tmk_core/protocol/arm_atsam/usb/usb.h         |  32 +-
 tmk_core/protocol/arm_atsam/usb/usb_atmel.h   |   4 +-
 .../protocol/arm_atsam/usb/usb_device_udd.c   |  38 +-
 tmk_core/protocol/arm_atsam/usb/usb_hub.c     |  76 +-
 tmk_core/protocol/arm_atsam/usb/usb_hub.h     |   2 +-
 tmk_core/protocol/arm_atsam/usb/usb_main.h    |  12 +-
 .../protocol/arm_atsam/usb/usb_protocol.h     |  76 +-
 .../protocol/arm_atsam/usb/usb_protocol_cdc.h |  74 +-
 .../protocol/arm_atsam/usb/usb_protocol_hid.h | 102 +--
 tmk_core/protocol/arm_atsam/usb/usb_util.c    |  22 +-
 tmk_core/protocol/arm_atsam/usb/usb_util.h    |   2 +-
 tmk_core/protocol/chibios/chibios.c           |   8 +-
 tmk_core/protocol/chibios/usb_driver.c        |  32 +-
 tmk_core/protocol/chibios/usb_main.c          |  24 +-
 tmk_core/protocol/chibios/usb_util.c          |   8 +-
 tmk_core/protocol/host.c                      |  28 +-
 tmk_core/protocol/lufa/lufa.c                 |  53 +-
 tmk_core/protocol/lufa/usb_util.c             |   8 +-
 tmk_core/protocol/midi/bytequeue/bytequeue.c  |   4 +-
 .../midi/bytequeue/interrupt_setting.c        |   8 +-
 tmk_core/protocol/midi/midi.c                 | 130 +++-
 tmk_core/protocol/midi/midi.h                 |   6 +-
 tmk_core/protocol/midi/midi_device.c          |  11 +-
 tmk_core/protocol/midi/qmk_midi.c             |   2 +-
 tmk_core/protocol/midi/sysex_tools.c          |   2 +-
 tmk_core/protocol/usb_descriptor.h            |   2 +-
 tmk_core/protocol/usb_device_state.c          |   4 +-
 tmk_core/protocol/usb_device_state.h          |   8 +-
 tmk_core/protocol/usb_util.c                  |   4 +-
 tmk_core/protocol/vusb/protocol.c             |   4 +-
 tmk_core/protocol/vusb/usb_util.c             |   4 +-
 tmk_core/protocol/vusb/vusb.c                 | 356 ++++-----
 345 files changed, 4916 insertions(+), 3229 deletions(-)
 mode change 100755 => 100644 platforms/arm_atsam/eeprom_samd.h

diff --git a/drivers/bluetooth/bluefruit_le.cpp b/drivers/bluetooth/bluefruit_le.cpp
index 86581a1a48..19310767cf 100644
--- a/drivers/bluetooth/bluefruit_le.cpp
+++ b/drivers/bluetooth/bluefruit_le.cpp
@@ -29,7 +29,7 @@
 #endif
 
 #ifndef BLUEFRUIT_LE_SCK_DIVISOR
-#    define BLUEFRUIT_LE_SCK_DIVISOR 2  // 4MHz SCK/8MHz CPU, calculated for Feather 32U4 BLE
+#    define BLUEFRUIT_LE_SCK_DIVISOR 2 // 4MHz SCK/8MHz CPU, calculated for Feather 32U4 BLE
 #endif
 
 #define SAMPLE_BATTERY
@@ -77,10 +77,10 @@ struct sdep_msg {
 // information here.
 
 enum queue_type {
-    QTKeyReport,  // 1-byte modifier + 6-byte key report
-    QTConsumer,   // 16-bit key code
+    QTKeyReport, // 1-byte modifier + 6-byte key report
+    QTConsumer,  // 16-bit key code
 #ifdef MOUSE_ENABLE
-    QTMouseMove,  // 4-byte mouse report
+    QTMouseMove, // 4-byte mouse report
 #endif
 };
 
@@ -115,8 +115,8 @@ enum sdep_type {
     SdepResponse      = 0x20,
     SdepAlert         = 0x40,
     SdepError         = 0x80,
-    SdepSlaveNotReady = 0xFE,  // Try again later
-    SdepSlaveOverflow = 0xFF,  // You read more data than is available
+    SdepSlaveNotReady = 0xFE, // Try again later
+    SdepSlaveOverflow = 0xFF, // You read more data than is available
 };
 
 enum ble_cmd {
@@ -306,13 +306,15 @@ static bool ble_init(void) {
     wait_ms(10);
     writePinHigh(BLUEFRUIT_LE_RST_PIN);
 
-    wait_ms(1000);  // Give it a second to initialize
+    wait_ms(1000); // Give it a second to initialize
 
     state.initialized = true;
     return state.initialized;
 }
 
-static inline uint8_t min(uint8_t a, uint8_t b) { return a < b ? a : b; }
+static inline uint8_t min(uint8_t a, uint8_t b) {
+    return a < b ? a : b;
+}
 
 static bool read_response(char *resp, uint16_t resplen, bool verbose) {
     char *dest = resp;
@@ -424,7 +426,9 @@ bool at_command_P(const char *cmd, char *resp, uint16_t resplen, bool verbose) {
     return at_command(cmdbuf, resp, resplen, verbose);
 }
 
-bool bluefruit_le_is_connected(void) { return state.is_connected; }
+bool bluefruit_le_is_connected(void) {
+    return state.is_connected;
+}
 
 bool bluefruit_le_enable_keyboard(void) {
     char resbuf[128];
@@ -671,7 +675,9 @@ void bluefruit_le_send_mouse_move(int8_t x, int8_t y, int8_t scroll, int8_t pan,
 }
 #endif
 
-uint32_t bluefruit_le_read_battery_voltage(void) { return state.vbat; }
+uint32_t bluefruit_le_read_battery_voltage(void) {
+    return state.vbat;
+}
 
 bool bluefruit_le_set_mode_leds(bool on) {
     if (!state.configured) {
diff --git a/drivers/bluetooth/outputselect.c b/drivers/bluetooth/outputselect.c
index 44bc4a9aa3..b986ba274e 100644
--- a/drivers/bluetooth/outputselect.c
+++ b/drivers/bluetooth/outputselect.c
@@ -52,7 +52,7 @@ uint8_t auto_detect_output(void) {
 #endif
 
 #ifdef BLUETOOTH_ENABLE
-    return OUTPUT_BLUETOOTH;  // should check if BT is connected here
+    return OUTPUT_BLUETOOTH; // should check if BT is connected here
 #endif
 
     return OUTPUT_NONE;
diff --git a/drivers/bluetooth/rn42.c b/drivers/bluetooth/rn42.c
index 2ef40bb7e0..5d497cda20 100644
--- a/drivers/bluetooth/rn42.c
+++ b/drivers/bluetooth/rn42.c
@@ -61,7 +61,9 @@ static inline uint16_t rn42_consumer_usage_to_bitmap(uint16_t usage) {
     }
 }
 
-void rn42_init(void) { uart_init(RN42_BAUD_RATE); }
+void rn42_init(void) {
+    uart_init(RN42_BAUD_RATE);
+}
 
 void rn42_send_keyboard(report_keyboard_t *report) {
     uart_write(0xFD);
@@ -81,8 +83,8 @@ void rn42_send_mouse(report_mouse_t *report) {
     uart_write(report->buttons);
     uart_write(report->x);
     uart_write(report->y);
-    uart_write(report->v);  // should try sending the wheel v here
-    uart_write(report->h);  // should try sending the wheel h here
+    uart_write(report->v); // should try sending the wheel v here
+    uart_write(report->h); // should try sending the wheel h here
     uart_write(0x00);
 }
 
diff --git a/drivers/eeprom/eeprom_driver.c b/drivers/eeprom/eeprom_driver.c
index 6ce47faf7d..885cf21981 100644
--- a/drivers/eeprom/eeprom_driver.c
+++ b/drivers/eeprom/eeprom_driver.c
@@ -37,11 +37,17 @@ uint32_t eeprom_read_dword(const uint32_t *addr) {
     return ret;
 }
 
-void eeprom_write_byte(uint8_t *addr, uint8_t value) { eeprom_write_block(&value, addr, 1); }
+void eeprom_write_byte(uint8_t *addr, uint8_t value) {
+    eeprom_write_block(&value, addr, 1);
+}
 
-void eeprom_write_word(uint16_t *addr, uint16_t value) { eeprom_write_block(&value, addr, 2); }
+void eeprom_write_word(uint16_t *addr, uint16_t value) {
+    eeprom_write_block(&value, addr, 2);
+}
 
-void eeprom_write_dword(uint32_t *addr, uint32_t value) { eeprom_write_block(&value, addr, 4); }
+void eeprom_write_dword(uint32_t *addr, uint32_t value) {
+    eeprom_write_block(&value, addr, 4);
+}
 
 void eeprom_update_block(const void *buf, void *addr, size_t len) {
     uint8_t read_buf[len];
diff --git a/drivers/eeprom/eeprom_i2c.c b/drivers/eeprom/eeprom_i2c.c
index 8e80ff544f..a74a010415 100644
--- a/drivers/eeprom/eeprom_i2c.c
+++ b/drivers/eeprom/eeprom_i2c.c
@@ -43,7 +43,7 @@
 #if defined(CONSOLE_ENABLE) && defined(DEBUG_EEPROM_OUTPUT)
 #    include "timer.h"
 #    include "debug.h"
-#endif  // DEBUG_EEPROM_OUTPUT
+#endif // DEBUG_EEPROM_OUTPUT
 
 static inline void fill_target_address(uint8_t *buffer, const void *addr) {
     uintptr_t p = (uintptr_t)addr;
@@ -91,7 +91,7 @@ void eeprom_read_block(void *buf, const void *addr, size_t len) {
         dprintf(" %02X", (int)(((uint8_t *)buf)[i]));
     }
     dprintf("\n");
-#endif  // DEBUG_EEPROM_OUTPUT
+#endif // DEBUG_EEPROM_OUTPUT
 }
 
 void eeprom_write_block(const void *buf, void *addr, size_t len) {
@@ -122,7 +122,7 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
             dprintf(" %02X", (int)(read_buf[i]));
         }
         dprintf("\n");
-#endif  // DEBUG_EEPROM_OUTPUT
+#endif // DEBUG_EEPROM_OUTPUT
 
         i2c_transmit(EXTERNAL_EEPROM_I2C_ADDRESS((uintptr_t)addr), complete_packet, EXTERNAL_EEPROM_ADDRESS_SIZE + write_length, 100);
         wait_ms(EXTERNAL_EEPROM_WRITE_TIME);
diff --git a/drivers/eeprom/eeprom_spi.c b/drivers/eeprom/eeprom_spi.c
index e273090854..25955498c4 100644
--- a/drivers/eeprom/eeprom_spi.c
+++ b/drivers/eeprom/eeprom_spi.c
@@ -52,7 +52,9 @@
 #    define EXTERNAL_EEPROM_SPI_TIMEOUT 100
 #endif
 
-static bool spi_eeprom_start(void) { return spi_start(EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN, EXTERNAL_EEPROM_SPI_LSBFIRST, EXTERNAL_EEPROM_SPI_MODE, EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR); }
+static bool spi_eeprom_start(void) {
+    return spi_start(EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN, EXTERNAL_EEPROM_SPI_LSBFIRST, EXTERNAL_EEPROM_SPI_MODE, EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR);
+}
 
 static spi_status_t spi_eeprom_wait_while_busy(int timeout) {
     uint32_t     deadline = timer_read32() + timeout;
@@ -80,7 +82,9 @@ static void spi_eeprom_transmit_address(uintptr_t addr) {
 
 //----------------------------------------------------------------------------------------------------------------------
 
-void eeprom_driver_init(void) { spi_init(); }
+void eeprom_driver_init(void) {
+    spi_init();
+}
 
 void eeprom_driver_erase(void) {
 #if defined(CONSOLE_ENABLE) && defined(DEBUG_EEPROM_OUTPUT)
@@ -135,7 +139,7 @@ void eeprom_read_block(void *buf, const void *addr, size_t len) {
         dprintf(" %02X", (int)(((uint8_t *)buf)[i]));
     }
     dprintf("\n");
-#endif  // DEBUG_EEPROM_OUTPUT
+#endif // DEBUG_EEPROM_OUTPUT
 
     spi_stop();
 }
@@ -192,7 +196,7 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
             dprintf(" %02X", (int)(uint8_t)(read_buf[i]));
         }
         dprintf("\n");
-#endif  // DEBUG_EEPROM_OUTPUT
+#endif // DEBUG_EEPROM_OUTPUT
 
         spi_write(CMD_WRITE);
         spi_eeprom_transmit_address(target_addr);
diff --git a/drivers/eeprom/eeprom_transient.c b/drivers/eeprom/eeprom_transient.c
index b4c78c6f40..9dc4289c27 100644
--- a/drivers/eeprom/eeprom_transient.c
+++ b/drivers/eeprom/eeprom_transient.c
@@ -30,9 +30,13 @@ size_t clamp_length(intptr_t offset, size_t len) {
     return len;
 }
 
-void eeprom_driver_init(void) { eeprom_driver_erase(); }
+void eeprom_driver_init(void) {
+    eeprom_driver_erase();
+}
 
-void eeprom_driver_erase(void) { memset(transientBuffer, 0x00, TRANSIENT_EEPROM_SIZE); }
+void eeprom_driver_erase(void) {
+    memset(transientBuffer, 0x00, TRANSIENT_EEPROM_SIZE);
+}
 
 void eeprom_read_block(void *buf, const void *addr, size_t len) {
     intptr_t offset = (intptr_t)addr;
diff --git a/drivers/eeprom/eeprom_transient.h b/drivers/eeprom/eeprom_transient.h
index d06189b246..687b8619fe 100644
--- a/drivers/eeprom/eeprom_transient.h
+++ b/drivers/eeprom/eeprom_transient.h
@@ -21,5 +21,5 @@
 */
 #ifndef TRANSIENT_EEPROM_SIZE
 #    include "eeconfig.h"
-#    define TRANSIENT_EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4)  // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
+#    define TRANSIENT_EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4) // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
 #endif
diff --git a/drivers/flash/flash_spi.c b/drivers/flash/flash_spi.c
index 2fa8891e38..f4cbf65159 100644
--- a/drivers/flash/flash_spi.c
+++ b/drivers/flash/flash_spi.c
@@ -65,7 +65,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // #define DEBUG_FLASH_SPI_OUTPUT
 
-static bool spi_flash_start(void) { return spi_start(EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN, EXTERNAL_FLASH_SPI_LSBFIRST, EXTERNAL_FLASH_SPI_MODE, EXTERNAL_FLASH_SPI_CLOCK_DIVISOR); }
+static bool spi_flash_start(void) {
+    return spi_start(EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN, EXTERNAL_FLASH_SPI_LSBFIRST, EXTERNAL_FLASH_SPI_MODE, EXTERNAL_FLASH_SPI_CLOCK_DIVISOR);
+}
 
 static flash_status_t spi_flash_wait_while_busy(void) {
     uint32_t       deadline = timer_read32() + EXTERNAL_FLASH_SPI_TIMEOUT;
@@ -160,7 +162,9 @@ static flash_status_t spi_flash_transaction(uint8_t cmd, uint32_t addr, uint8_t
     return response;
 }
 
-void flash_init(void) { spi_init(); }
+void flash_init(void) {
+    spi_init();
+}
 
 flash_status_t flash_erase_chip(void) {
     flash_status_t response = FLASH_STATUS_SUCCESS;
@@ -304,7 +308,7 @@ flash_status_t flash_read_block(uint32_t addr, void *buf, size_t len) {
         dprintf(" %02X", (int)(((uint8_t *)read_buf)[i]));
     }
     dprintf("\n");
-#endif  // DEBUG_FLASH_SPI_OUTPUT
+#endif // DEBUG_FLASH_SPI_OUTPUT
 
     return response;
 }
@@ -340,7 +344,7 @@ flash_status_t flash_write_block(uint32_t addr, const void *buf, size_t len) {
             dprintf(" %02X", (int)(uint8_t)(write_buf[i]));
         }
         dprintf("\n");
-#endif  // DEBUG_FLASH_SPI_OUTPUT
+#endif // DEBUG_FLASH_SPI_OUTPUT
 
         /* Perform the write. */
         response = spi_flash_transaction(FLASH_CMD_PP, addr, write_buf, write_length);
diff --git a/drivers/gpio/mcp23018.c b/drivers/gpio/mcp23018.c
index dc8ab03c50..41cbfe087e 100644
--- a/drivers/gpio/mcp23018.c
+++ b/drivers/gpio/mcp23018.c
@@ -10,11 +10,11 @@
 #define TIMEOUT 100
 
 enum {
-    CMD_IODIRA = 0x00,  // i/o direction register
+    CMD_IODIRA = 0x00, // i/o direction register
     CMD_IODIRB = 0x01,
-    CMD_GPPUA  = 0x0C,  // GPIO pull-up resistor register
+    CMD_GPPUA  = 0x0C, // GPIO pull-up resistor register
     CMD_GPPUB  = 0x0D,
-    CMD_GPIOA  = 0x12,  // general purpose i/o port register (write modifies OLAT)
+    CMD_GPIOA  = 0x12, // general purpose i/o port register (write modifies OLAT)
     CMD_GPIOB  = 0x13,
 };
 
diff --git a/drivers/haptic/DRV2605L.c b/drivers/haptic/DRV2605L.c
index 5de2b354c9..5a1d2ca0af 100644
--- a/drivers/haptic/DRV2605L.c
+++ b/drivers/haptic/DRV2605L.c
@@ -106,12 +106,14 @@ void DRV_init(void) {
 
 void DRV_rtp_init(void) {
     DRV_write(DRV_GO, 0x00);
-    DRV_write(DRV_RTP_INPUT, 20);  // 20 is the lowest value I've found where haptics can still be felt.
+    DRV_write(DRV_RTP_INPUT, 20); // 20 is the lowest value I've found where haptics can still be felt.
     DRV_write(DRV_MODE, 0x05);
     DRV_write(DRV_GO, 0x01);
 }
 
-void DRV_amplitude(uint8_t amplitude) { DRV_write(DRV_RTP_INPUT, amplitude); }
+void DRV_amplitude(uint8_t amplitude) {
+    DRV_write(DRV_RTP_INPUT, amplitude);
+}
 
 void DRV_pulse(uint8_t sequence) {
     DRV_write(DRV_GO, 0x00);
diff --git a/drivers/haptic/solenoid.c b/drivers/haptic/solenoid.c
index 7a09940f78..14d868bffe 100644
--- a/drivers/haptic/solenoid.c
+++ b/drivers/haptic/solenoid.c
@@ -28,13 +28,21 @@ uint8_t  solenoid_dwell   = SOLENOID_DEFAULT_DWELL;
 
 extern haptic_config_t haptic_config;
 
-void solenoid_buzz_on(void) { haptic_set_buzz(1); }
+void solenoid_buzz_on(void) {
+    haptic_set_buzz(1);
+}
 
-void solenoid_buzz_off(void) { haptic_set_buzz(0); }
+void solenoid_buzz_off(void) {
+    haptic_set_buzz(0);
+}
 
-void solenoid_set_buzz(int buzz) { haptic_set_buzz(buzz); }
+void solenoid_set_buzz(int buzz) {
+    haptic_set_buzz(buzz);
+}
 
-void solenoid_set_dwell(uint8_t dwell) { solenoid_dwell = dwell; }
+void solenoid_set_dwell(uint8_t dwell) {
+    solenoid_dwell = dwell;
+}
 
 void solenoid_stop(void) {
     SOLENOID_PIN_WRITE_INACTIVE();
@@ -89,4 +97,6 @@ void solenoid_setup(void) {
     }
 }
 
-void solenoid_shutdown(void) { SOLENOID_PIN_WRITE_INACTIVE(); }
+void solenoid_shutdown(void) {
+    SOLENOID_PIN_WRITE_INACTIVE();
+}
diff --git a/drivers/lcd/st7565.c b/drivers/lcd/st7565.c
index 49b13c00f1..47ee02804b 100644
--- a/drivers/lcd/st7565.c
+++ b/drivers/lcd/st7565.c
@@ -39,7 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Addressing Setting Commands
 #define PAM_SETCOLUMN_LSB 0x00
 #define PAM_SETCOLUMN_MSB 0x10
-#define PAM_PAGE_ADDR 0xB0  // 0xb0 -- 0xb7
+#define PAM_PAGE_ADDR 0xB0 // 0xb0 -- 0xb7
 
 // Hardware Configuration Commands
 #define DISPLAY_START_LINE 0x40
@@ -138,7 +138,9 @@ bool st7565_init(display_rotation_t rotation) {
     return true;
 }
 
-__attribute__((weak)) display_rotation_t st7565_init_user(display_rotation_t rotation) { return rotation; }
+__attribute__((weak)) display_rotation_t st7565_init_user(display_rotation_t rotation) {
+    return rotation;
+}
 
 void st7565_clear(void) {
     memset(st7565_buffer, 0, sizeof(st7565_buffer));
@@ -212,7 +214,8 @@ void st7565_advance_page(bool clearPageRemainder) {
         remaining = remaining / ST7565_FONT_WIDTH;
 
         // Write empty character until next line
-        while (remaining--) st7565_write_char(' ', false);
+        while (remaining--)
+            st7565_write_char(' ', false);
     } else {
         // Next page index out of bounds?
         if (index + remaining >= ST7565_MATRIX_SIZE) {
@@ -263,7 +266,7 @@ void st7565_write_char(const char data, bool invert) {
     _Static_assert(sizeof(font) >= ((ST7565_FONT_END + 1 - ST7565_FONT_START) * ST7565_FONT_WIDTH), "ST7565_FONT_END references outside array");
 
     // set the reder buffer data
-    uint8_t cast_data = (uint8_t)data;  // font based on unsigned type for index
+    uint8_t cast_data = (uint8_t)data; // font based on unsigned type for index
     if (cast_data < ST7565_FONT_START || cast_data > ST7565_FONT_END) {
         memset(st7565_cursor, 0x00, ST7565_FONT_WIDTH);
     } else {
@@ -389,7 +392,7 @@ void st7565_write_raw_P(const char *data, uint16_t size) {
         st7565_dirty |= ((ST7565_BLOCK_TYPE)1 << (i / ST7565_BLOCK_SIZE));
     }
 }
-#endif  // defined(__AVR__)
+#endif // defined(__AVR__)
 
 bool st7565_on(void) {
     if (!st7565_initialized) {
@@ -429,7 +432,9 @@ bool st7565_off(void) {
 
 __attribute__((weak)) void st7565_off_user(void) {}
 
-bool st7565_is_on(void) { return st7565_active; }
+bool st7565_is_on(void) {
+    return st7565_active;
+}
 
 bool st7565_invert(bool invert) {
     if (!st7565_initialized) {
@@ -445,9 +450,13 @@ bool st7565_invert(bool invert) {
     return st7565_inverted;
 }
 
-uint8_t st7565_max_chars(void) { return ST7565_DISPLAY_WIDTH / ST7565_FONT_WIDTH; }
+uint8_t st7565_max_chars(void) {
+    return ST7565_DISPLAY_WIDTH / ST7565_FONT_WIDTH;
+}
 
-uint8_t st7565_max_lines(void) { return ST7565_DISPLAY_HEIGHT / ST7565_FONT_HEIGHT; }
+uint8_t st7565_max_lines(void) {
+    return ST7565_DISPLAY_HEIGHT / ST7565_FONT_HEIGHT;
+}
 
 void st7565_task(void) {
     if (!st7565_initialized) {
diff --git a/drivers/lcd/st7565.h b/drivers/lcd/st7565.h
index d453dbe6da..0e42c8765b 100644
--- a/drivers/lcd/st7565.h
+++ b/drivers/lcd/st7565.h
@@ -29,16 +29,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define ST7565_DISPLAY_HEIGHT 32
 #endif
 #ifndef ST7565_MATRIX_SIZE
-#    define ST7565_MATRIX_SIZE (ST7565_DISPLAY_HEIGHT / 8 * ST7565_DISPLAY_WIDTH)  // 1024 (compile time mathed)
+#    define ST7565_MATRIX_SIZE (ST7565_DISPLAY_HEIGHT / 8 * ST7565_DISPLAY_WIDTH) // 1024 (compile time mathed)
 #endif
 #ifndef ST7565_BLOCK_TYPE
 #    define ST7565_BLOCK_TYPE uint16_t
 #endif
 #ifndef ST7565_BLOCK_COUNT
-#    define ST7565_BLOCK_COUNT (sizeof(ST7565_BLOCK_TYPE) * 8)  // 32 (compile time mathed)
+#    define ST7565_BLOCK_COUNT (sizeof(ST7565_BLOCK_TYPE) * 8) // 32 (compile time mathed)
 #endif
 #ifndef ST7565_BLOCK_SIZE
-#    define ST7565_BLOCK_SIZE (ST7565_MATRIX_SIZE / ST7565_BLOCK_COUNT)  // 32 (compile time mathed)
+#    define ST7565_BLOCK_SIZE (ST7565_MATRIX_SIZE / ST7565_BLOCK_COUNT) // 32 (compile time mathed)
 #endif
 
 // the column address corresponding to the first column in the display hardware
@@ -174,7 +174,7 @@ void st7565_write_raw_P(const char *data, uint16_t size);
 #    define st7565_write_P(data, invert) st7565_write(data, invert)
 #    define st7565_write_ln_P(data, invert) st7565_write_ln(data, invert)
 #    define st7565_write_raw_P(data, size) st7565_write_raw(data, size)
-#endif  // defined(__AVR__)
+#endif // defined(__AVR__)
 
 // Can be used to manually turn on the screen if it is off
 // Returns true if the screen was on or turns on
diff --git a/drivers/led/apa102.c b/drivers/led/apa102.c
index 00e7eb4505..f291948975 100644
--- a/drivers/led/apa102.c
+++ b/drivers/led/apa102.c
@@ -20,15 +20,15 @@
 
 #ifndef APA102_NOPS
 #    if defined(__AVR__)
-#        define APA102_NOPS 0  // AVR at 16 MHz already spends 62.5 ns per clock, so no extra delay is needed
+#        define APA102_NOPS 0 // AVR at 16 MHz already spends 62.5 ns per clock, so no extra delay is needed
 #    elif defined(PROTOCOL_CHIBIOS)
 
 #        include "hal.h"
 #        if defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX) || defined(GD32VF103)
-#            define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4)))  // This calculates how many loops of 4 nops to run to delay 100 ns
+#            define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4))) // This calculates how many loops of 4 nops to run to delay 100 ns
 #        else
 #            error("APA102_NOPS configuration required")
-#            define APA102_NOPS 0  // this just pleases the compile so the above error is easier to spot
+#            define APA102_NOPS 0 // this just pleases the compile so the above error is easier to spot
 #        endif
 #    endif
 #endif
@@ -72,7 +72,9 @@ void apa102_setleds(LED_TYPE *start_led, uint16_t num_leds) {
 }
 
 // Overwrite the default rgblight_call_driver to use apa102 driver
-void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) { apa102_setleds(start_led, num_leds); }
+void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) {
+    apa102_setleds(start_led, num_leds);
+}
 
 void static apa102_init(void) {
     setPinOutput(RGB_DI_PIN);
diff --git a/drivers/led/aw20216.c b/drivers/led/aw20216.c
index 2c7ff8f088..59389cdcd6 100644
--- a/drivers/led/aw20216.c
+++ b/drivers/led/aw20216.c
@@ -23,17 +23,17 @@
  */
 #define AWINIC_ID 0b1010 << 4
 
-#define AW_PAGE_FUNCTION 0x00 << 1    // PG0, Function registers
-#define AW_PAGE_PWM 0x01 << 1         // PG1, LED PWM control
-#define AW_PAGE_SCALING 0x02 << 1     // PG2, LED current scaling control
-#define AW_PAGE_PATCHOICE 0x03 << 1   // PG3, Pattern choice?
-#define AW_PAGE_PWMSCALING 0x04 << 1  // PG4, LED PWM + Scaling control?
+#define AW_PAGE_FUNCTION 0x00 << 1   // PG0, Function registers
+#define AW_PAGE_PWM 0x01 << 1        // PG1, LED PWM control
+#define AW_PAGE_SCALING 0x02 << 1    // PG2, LED current scaling control
+#define AW_PAGE_PATCHOICE 0x03 << 1  // PG3, Pattern choice?
+#define AW_PAGE_PWMSCALING 0x04 << 1 // PG4, LED PWM + Scaling control?
 
 #define AW_WRITE 0
 #define AW_READ 1
 
-#define AW_REG_CONFIGURATION 0x00  // PG0
-#define AW_REG_GLOBALCURRENT 0x01  // PG0
+#define AW_REG_CONFIGURATION 0x00 // PG0
+#define AW_REG_GLOBALCURRENT 0x01 // PG0
 
 // Default value of AW_REG_CONFIGURATION
 // D7:D4 = 1011, SWSEL (SW1~SW12 active)
diff --git a/drivers/led/issi/is31fl3731-simple.c b/drivers/led/issi/is31fl3731-simple.c
index f51e2e38af..3abe9ea337 100644
--- a/drivers/led/issi/is31fl3731-simple.c
+++ b/drivers/led/issi/is31fl3731-simple.c
@@ -42,13 +42,13 @@
 #define ISSI_REG_PICTUREFRAME 0x01
 
 // Not defined in the datasheet -- See AN for IC
-#define ISSI_REG_GHOST_IMAGE_PREVENTION 0xC2  // Set bit 4 to enable de-ghosting
+#define ISSI_REG_GHOST_IMAGE_PREVENTION 0xC2 // Set bit 4 to enable de-ghosting
 
 #define ISSI_REG_SHUTDOWN 0x0A
 #define ISSI_REG_AUDIOSYNC 0x06
 
 #define ISSI_COMMANDREGISTER 0xFD
-#define ISSI_BANK_FUNCTIONREG 0x0B  // helpfully called 'page nine'
+#define ISSI_BANK_FUNCTIONREG 0x0B // helpfully called 'page nine'
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
@@ -148,7 +148,7 @@ void IS31FL3731_init(uint8_t addr) {
 
     // enable software shutdown
     IS31FL3731_write_register(addr, ISSI_REG_SHUTDOWN, 0x00);
-#ifdef ISSI_3731_DEGHOST  // set to enable de-ghosting of the array
+#ifdef ISSI_3731_DEGHOST // set to enable de-ghosting of the array
     IS31FL3731_write_register(addr, ISSI_REG_GHOST_IMAGE_PREVENTION, 0x10);
 #endif
 
diff --git a/drivers/led/issi/is31fl3731.c b/drivers/led/issi/is31fl3731.c
index e6190a6b90..9c6c29f081 100644
--- a/drivers/led/issi/is31fl3731.c
+++ b/drivers/led/issi/is31fl3731.c
@@ -41,13 +41,13 @@
 #define ISSI_REG_PICTUREFRAME 0x01
 
 // Not defined in the datasheet -- See AN for IC
-#define ISSI_REG_GHOST_IMAGE_PREVENTION 0xC2  // Set bit 4 to enable de-ghosting
+#define ISSI_REG_GHOST_IMAGE_PREVENTION 0xC2 // Set bit 4 to enable de-ghosting
 
 #define ISSI_REG_SHUTDOWN 0x0A
 #define ISSI_REG_AUDIOSYNC 0x06
 
 #define ISSI_COMMANDREGISTER 0xFD
-#define ISSI_BANK_FUNCTIONREG 0x0B  // helpfully called 'page nine'
+#define ISSI_BANK_FUNCTIONREG 0x0B // helpfully called 'page nine'
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
@@ -136,7 +136,7 @@ void IS31FL3731_init(uint8_t addr) {
 
     // enable software shutdown
     IS31FL3731_write_register(addr, ISSI_REG_SHUTDOWN, 0x00);
-#ifdef ISSI_3731_DEGHOST  // set to enable de-ghosting of the array
+#ifdef ISSI_3731_DEGHOST // set to enable de-ghosting of the array
     IS31FL3731_write_register(addr, ISSI_REG_GHOST_IMAGE_PREVENTION, 0x10);
 #endif
 
diff --git a/drivers/led/issi/is31fl3733-simple.c b/drivers/led/issi/is31fl3733-simple.c
index 777895bf89..af006f756d 100644
--- a/drivers/led/issi/is31fl3733-simple.c
+++ b/drivers/led/issi/is31fl3733-simple.c
@@ -39,16 +39,16 @@
 #define ISSI_INTERRUPTMASKREGISTER 0xF0
 #define ISSI_INTERRUPTSTATUSREGISTER 0xF1
 
-#define ISSI_PAGE_LEDCONTROL 0x00  // PG0
-#define ISSI_PAGE_PWM 0x01         // PG1
-#define ISSI_PAGE_AUTOBREATH 0x02  // PG2
-#define ISSI_PAGE_FUNCTION 0x03    // PG3
+#define ISSI_PAGE_LEDCONTROL 0x00 // PG0
+#define ISSI_PAGE_PWM 0x01        // PG1
+#define ISSI_PAGE_AUTOBREATH 0x02 // PG2
+#define ISSI_PAGE_FUNCTION 0x03   // PG3
 
-#define ISSI_REG_CONFIGURATION 0x00  // PG3
-#define ISSI_REG_GLOBALCURRENT 0x01  // PG3
-#define ISSI_REG_RESET 0x11          // PG3
-#define ISSI_REG_SWPULLUP 0x0F       // PG3
-#define ISSI_REG_CSPULLUP 0x10       // PG3
+#define ISSI_REG_CONFIGURATION 0x00 // PG3
+#define ISSI_REG_GLOBALCURRENT 0x01 // PG3
+#define ISSI_REG_RESET 0x11         // PG3
+#define ISSI_REG_SWPULLUP 0x0F      // PG3
+#define ISSI_REG_CSPULLUP 0x10      // PG3
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
@@ -59,7 +59,7 @@
 #endif
 
 #ifndef ISSI_PWM_FREQUENCY
-#    define ISSI_PWM_FREQUENCY 0b000  // PFS - IS31FL3733B only
+#    define ISSI_PWM_FREQUENCY 0b000 // PFS - IS31FL3733B only
 #endif
 
 #ifndef ISSI_SWPULLUP
diff --git a/drivers/led/issi/is31fl3733-simple.h b/drivers/led/issi/is31fl3733-simple.h
index f071db5e40..f5253e3101 100644
--- a/drivers/led/issi/is31fl3733-simple.h
+++ b/drivers/led/issi/is31fl3733-simple.h
@@ -47,13 +47,13 @@ void IS31FL3733_set_led_control_register(uint8_t index, bool value);
 void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index);
 void IS31FL3733_update_led_control_registers(uint8_t addr, uint8_t index);
 
-#define PUR_0R 0x00    // No PUR resistor
-#define PUR_05KR 0x02  // 0.5k Ohm resistor in t_NOL
-#define PUR_3KR 0x03   // 3.0k Ohm resistor on all the time
-#define PUR_4KR 0x04   // 4.0k Ohm resistor on all the time
-#define PUR_8KR 0x05   // 8.0k Ohm resistor on all the time
-#define PUR_16KR 0x06  // 16k Ohm resistor on all the time
-#define PUR_32KR 0x07  // 32k Ohm resistor in t_NOL
+#define PUR_0R 0x00   // No PUR resistor
+#define PUR_05KR 0x02 // 0.5k Ohm resistor in t_NOL
+#define PUR_3KR 0x03  // 3.0k Ohm resistor on all the time
+#define PUR_4KR 0x04  // 4.0k Ohm resistor on all the time
+#define PUR_8KR 0x05  // 8.0k Ohm resistor on all the time
+#define PUR_16KR 0x06 // 16k Ohm resistor on all the time
+#define PUR_32KR 0x07 // 32k Ohm resistor in t_NOL
 
 #define A_1 0x00
 #define A_2 0x01
diff --git a/drivers/led/issi/is31fl3733.c b/drivers/led/issi/is31fl3733.c
index 696491d070..a2fdaa90fa 100644
--- a/drivers/led/issi/is31fl3733.c
+++ b/drivers/led/issi/is31fl3733.c
@@ -38,16 +38,16 @@
 #define ISSI_INTERRUPTMASKREGISTER 0xF0
 #define ISSI_INTERRUPTSTATUSREGISTER 0xF1
 
-#define ISSI_PAGE_LEDCONTROL 0x00  // PG0
-#define ISSI_PAGE_PWM 0x01         // PG1
-#define ISSI_PAGE_AUTOBREATH 0x02  // PG2
-#define ISSI_PAGE_FUNCTION 0x03    // PG3
+#define ISSI_PAGE_LEDCONTROL 0x00 // PG0
+#define ISSI_PAGE_PWM 0x01        // PG1
+#define ISSI_PAGE_AUTOBREATH 0x02 // PG2
+#define ISSI_PAGE_FUNCTION 0x03   // PG3
 
-#define ISSI_REG_CONFIGURATION 0x00  // PG3
-#define ISSI_REG_GLOBALCURRENT 0x01  // PG3
-#define ISSI_REG_RESET 0x11          // PG3
-#define ISSI_REG_SWPULLUP 0x0F       // PG3
-#define ISSI_REG_CSPULLUP 0x10       // PG3
+#define ISSI_REG_CONFIGURATION 0x00 // PG3
+#define ISSI_REG_GLOBALCURRENT 0x01 // PG3
+#define ISSI_REG_RESET 0x11         // PG3
+#define ISSI_REG_SWPULLUP 0x0F      // PG3
+#define ISSI_REG_CSPULLUP 0x10      // PG3
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
@@ -58,7 +58,7 @@
 #endif
 
 #ifndef ISSI_PWM_FREQUENCY
-#    define ISSI_PWM_FREQUENCY 0b000  // PFS - IS31FL3733B only
+#    define ISSI_PWM_FREQUENCY 0b000 // PFS - IS31FL3733B only
 #endif
 
 #ifndef ISSI_SWPULLUP
diff --git a/drivers/led/issi/is31fl3733.h b/drivers/led/issi/is31fl3733.h
index c5d62fed85..7653dd17c0 100644
--- a/drivers/led/issi/is31fl3733.h
+++ b/drivers/led/issi/is31fl3733.h
@@ -48,13 +48,13 @@ void IS31FL3733_set_led_control_register(uint8_t index, bool red, bool green, bo
 void IS31FL3733_update_pwm_buffers(uint8_t addr, uint8_t index);
 void IS31FL3733_update_led_control_registers(uint8_t addr, uint8_t index);
 
-#define PUR_0R 0x00    // No PUR resistor
-#define PUR_05KR 0x02  // 0.5k Ohm resistor in t_NOL
-#define PUR_3KR 0x03   // 3.0k Ohm resistor on all the time
-#define PUR_4KR 0x04   // 4.0k Ohm resistor on all the time
-#define PUR_8KR 0x05   // 8.0k Ohm resistor on all the time
-#define PUR_16KR 0x06  // 16k Ohm resistor on all the time
-#define PUR_32KR 0x07  // 32k Ohm resistor in t_NOL
+#define PUR_0R 0x00   // No PUR resistor
+#define PUR_05KR 0x02 // 0.5k Ohm resistor in t_NOL
+#define PUR_3KR 0x03  // 3.0k Ohm resistor on all the time
+#define PUR_4KR 0x04  // 4.0k Ohm resistor on all the time
+#define PUR_8KR 0x05  // 8.0k Ohm resistor on all the time
+#define PUR_16KR 0x06 // 16k Ohm resistor on all the time
+#define PUR_32KR 0x07 // 32k Ohm resistor in t_NOL
 
 #define A_1 0x00
 #define A_2 0x01
diff --git a/drivers/led/issi/is31fl3736.c b/drivers/led/issi/is31fl3736.c
index c9a871118d..7752a3f6cb 100644
--- a/drivers/led/issi/is31fl3736.c
+++ b/drivers/led/issi/is31fl3736.c
@@ -36,16 +36,16 @@
 #define ISSI_INTERRUPTMASKREGISTER 0xF0
 #define ISSI_INTERRUPTSTATUSREGISTER 0xF1
 
-#define ISSI_PAGE_LEDCONTROL 0x00  // PG0
-#define ISSI_PAGE_PWM 0x01         // PG1
-#define ISSI_PAGE_AUTOBREATH 0x02  // PG2
-#define ISSI_PAGE_FUNCTION 0x03    // PG3
+#define ISSI_PAGE_LEDCONTROL 0x00 // PG0
+#define ISSI_PAGE_PWM 0x01        // PG1
+#define ISSI_PAGE_AUTOBREATH 0x02 // PG2
+#define ISSI_PAGE_FUNCTION 0x03   // PG3
 
-#define ISSI_REG_CONFIGURATION 0x00  // PG3
-#define ISSI_REG_GLOBALCURRENT 0x01  // PG3
-#define ISSI_REG_RESET 0x11          // PG3
-#define ISSI_REG_SWPULLUP 0x0F       // PG3
-#define ISSI_REG_CSPULLUP 0x10       // PG3
+#define ISSI_REG_CONFIGURATION 0x00 // PG3
+#define ISSI_REG_GLOBALCURRENT 0x01 // PG3
+#define ISSI_REG_RESET 0x11         // PG3
+#define ISSI_REG_SWPULLUP 0x0F      // PG3
+#define ISSI_REG_CSPULLUP 0x10      // PG3
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
diff --git a/drivers/led/issi/is31fl3736.h b/drivers/led/issi/is31fl3736.h
index 9fbe1cc577..f126034615 100644
--- a/drivers/led/issi/is31fl3736.h
+++ b/drivers/led/issi/is31fl3736.h
@@ -61,14 +61,14 @@ void IS31FL3736_mono_set_led_control_register(uint8_t index, bool enabled);
 void IS31FL3736_update_pwm_buffers(uint8_t addr1, uint8_t addr2);
 void IS31FL3736_update_led_control_registers(uint8_t addr1, uint8_t addr2);
 
-#define PUR_0R 0x00    // No PUR resistor
-#define PUR_05KR 0x01  // 0.5k Ohm resistor
-#define PUR_1KR 0x02   // 1.0k Ohm resistor
-#define PUR_2KR 0x03   // 2.0k Ohm resistor
-#define PUR_4KR 0x04   // 4.0k Ohm resistor
-#define PUR_8KR 0x05   // 8.0k Ohm resistor
-#define PUR_16KR 0x06  // 16k Ohm resistor
-#define PUR_32KR 0x07  // 32k Ohm resistor
+#define PUR_0R 0x00   // No PUR resistor
+#define PUR_05KR 0x01 // 0.5k Ohm resistor
+#define PUR_1KR 0x02  // 1.0k Ohm resistor
+#define PUR_2KR 0x03  // 2.0k Ohm resistor
+#define PUR_4KR 0x04  // 4.0k Ohm resistor
+#define PUR_8KR 0x05  // 8.0k Ohm resistor
+#define PUR_16KR 0x06 // 16k Ohm resistor
+#define PUR_32KR 0x07 // 32k Ohm resistor
 
 #define A_1 0x00
 #define A_2 0x02
diff --git a/drivers/led/issi/is31fl3737.c b/drivers/led/issi/is31fl3737.c
index 0722e18869..9f2a13de45 100644
--- a/drivers/led/issi/is31fl3737.c
+++ b/drivers/led/issi/is31fl3737.c
@@ -38,16 +38,16 @@
 #define ISSI_INTERRUPTMASKREGISTER 0xF0
 #define ISSI_INTERRUPTSTATUSREGISTER 0xF1
 
-#define ISSI_PAGE_LEDCONTROL 0x00  // PG0
-#define ISSI_PAGE_PWM 0x01         // PG1
-#define ISSI_PAGE_AUTOBREATH 0x02  // PG2
-#define ISSI_PAGE_FUNCTION 0x03    // PG3
+#define ISSI_PAGE_LEDCONTROL 0x00 // PG0
+#define ISSI_PAGE_PWM 0x01        // PG1
+#define ISSI_PAGE_AUTOBREATH 0x02 // PG2
+#define ISSI_PAGE_FUNCTION 0x03   // PG3
 
-#define ISSI_REG_CONFIGURATION 0x00  // PG3
-#define ISSI_REG_GLOBALCURRENT 0x01  // PG3
-#define ISSI_REG_RESET 0x11          // PG3
-#define ISSI_REG_SWPULLUP 0x0F       // PG3
-#define ISSI_REG_CSPULLUP 0x10       // PG3
+#define ISSI_REG_CONFIGURATION 0x00 // PG3
+#define ISSI_REG_GLOBALCURRENT 0x01 // PG3
+#define ISSI_REG_RESET 0x11         // PG3
+#define ISSI_REG_SWPULLUP 0x0F      // PG3
+#define ISSI_REG_CSPULLUP 0x10      // PG3
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
diff --git a/drivers/led/issi/is31fl3737.h b/drivers/led/issi/is31fl3737.h
index 31b1a22267..ddb70a9df5 100644
--- a/drivers/led/issi/is31fl3737.h
+++ b/drivers/led/issi/is31fl3737.h
@@ -48,14 +48,14 @@ void IS31FL3737_set_led_control_register(uint8_t index, bool red, bool green, bo
 void IS31FL3737_update_pwm_buffers(uint8_t addr1, uint8_t addr2);
 void IS31FL3737_update_led_control_registers(uint8_t addr1, uint8_t addr2);
 
-#define PUR_0R 0x00    // No PUR resistor
-#define PUR_05KR 0x01  // 0.5k Ohm resistor in t_NOL
-#define PUR_1KR 0x02   // 1.0k Ohm resistor in t_NOL
-#define PUR_2KR 0x03   // 2.0k Ohm resistor in t_NOL
-#define PUR_4KR 0x04   // 4.0k Ohm resistor in t_NOL
-#define PUR_8KR 0x05   // 8.0k Ohm resistor in t_NOL
-#define PUR_16KR 0x06  // 16k Ohm resistor in t_NOL
-#define PUR_32KR 0x07  // 32k Ohm resistor in t_NOL
+#define PUR_0R 0x00   // No PUR resistor
+#define PUR_05KR 0x01 // 0.5k Ohm resistor in t_NOL
+#define PUR_1KR 0x02  // 1.0k Ohm resistor in t_NOL
+#define PUR_2KR 0x03  // 2.0k Ohm resistor in t_NOL
+#define PUR_4KR 0x04  // 4.0k Ohm resistor in t_NOL
+#define PUR_8KR 0x05  // 8.0k Ohm resistor in t_NOL
+#define PUR_16KR 0x06 // 16k Ohm resistor in t_NOL
+#define PUR_32KR 0x07 // 32k Ohm resistor in t_NOL
 
 #define A_1 0x00
 #define A_2 0x01
diff --git a/drivers/led/issi/is31fl3741.c b/drivers/led/issi/is31fl3741.c
index 8d347a5e60..393b0179b5 100644
--- a/drivers/led/issi/is31fl3741.c
+++ b/drivers/led/issi/is31fl3741.c
@@ -42,16 +42,16 @@
 #define ISSI_INTERRUPTSTATUSREGISTER 0xF1
 #define ISSI_IDREGISTER 0xFC
 
-#define ISSI_PAGE_PWM0 0x00       // PG0
-#define ISSI_PAGE_PWM1 0x01       // PG1
-#define ISSI_PAGE_SCALING_0 0x02  // PG2
-#define ISSI_PAGE_SCALING_1 0x03  // PG3
-#define ISSI_PAGE_FUNCTION 0x04   // PG4
+#define ISSI_PAGE_PWM0 0x00      // PG0
+#define ISSI_PAGE_PWM1 0x01      // PG1
+#define ISSI_PAGE_SCALING_0 0x02 // PG2
+#define ISSI_PAGE_SCALING_1 0x03 // PG3
+#define ISSI_PAGE_FUNCTION 0x04  // PG4
 
-#define ISSI_REG_CONFIGURATION 0x00  // PG4
-#define ISSI_REG_GLOBALCURRENT 0x01  // PG4
-#define ISSI_REG_PULLDOWNUP 0x02     // PG4
-#define ISSI_REG_RESET 0x3F          // PG4
+#define ISSI_REG_CONFIGURATION 0x00 // PG4
+#define ISSI_REG_GLOBALCURRENT 0x01 // PG4
+#define ISSI_REG_PULLDOWNUP 0x02    // PG4
+#define ISSI_REG_RESET 0x3F         // PG4
 
 #ifndef ISSI_TIMEOUT
 #    define ISSI_TIMEOUT 100
diff --git a/drivers/led/issi/is31fl3741.h b/drivers/led/issi/is31fl3741.h
index 8154f8be70..3bdb23bd2d 100644
--- a/drivers/led/issi/is31fl3741.h
+++ b/drivers/led/issi/is31fl3741.h
@@ -51,14 +51,14 @@ void IS31FL3741_set_scaling_registers(const is31_led *pled, uint8_t red, uint8_t
 
 void IS31FL3741_set_pwm_buffer(const is31_led *pled, uint8_t red, uint8_t green, uint8_t blue);
 
-#define PUR_0R 0x00    // No PUR resistor
-#define PUR_05KR 0x01  // 0.5k Ohm resistor
-#define PUR_1KR 0x02   // 1.0k Ohm resistor
-#define PUR_2KR 0x03   // 2.0k Ohm resistor
-#define PUR_4KR 0x04   // 4.0k Ohm resistor
-#define PUR_8KR 0x05   // 8.0k Ohm resistor
-#define PUR_16KR 0x06  // 16k Ohm resistor
-#define PUR_32KR 0x07  // 32k Ohm resistor
+#define PUR_0R 0x00   // No PUR resistor
+#define PUR_05KR 0x01 // 0.5k Ohm resistor
+#define PUR_1KR 0x02  // 1.0k Ohm resistor
+#define PUR_2KR 0x03  // 2.0k Ohm resistor
+#define PUR_4KR 0x04  // 4.0k Ohm resistor
+#define PUR_8KR 0x05  // 8.0k Ohm resistor
+#define PUR_16KR 0x06 // 16k Ohm resistor
+#define PUR_32KR 0x07 // 32k Ohm resistor
 
 #define CS1_SW1 0x00
 #define CS2_SW1 0x01
diff --git a/drivers/oled/oled_driver.h b/drivers/oled/oled_driver.h
index 3b56d370dc..918b837f07 100644
--- a/drivers/oled/oled_driver.h
+++ b/drivers/oled/oled_driver.h
@@ -34,16 +34,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define OLED_DISPLAY_HEIGHT 64
 #    endif
 #    ifndef OLED_MATRIX_SIZE
-#        define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH)  // 1024 (compile time mathed)
+#        define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH) // 1024 (compile time mathed)
 #    endif
 #    ifndef OLED_BLOCK_TYPE
 #        define OLED_BLOCK_TYPE uint16_t
 #    endif
 #    ifndef OLED_BLOCK_COUNT
-#        define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8)  // 32 (compile time mathed)
+#        define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8) // 32 (compile time mathed)
 #    endif
 #    ifndef OLED_BLOCK_SIZE
-#        define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)  // 32 (compile time mathed)
+#        define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT) // 32 (compile time mathed)
 #    endif
 #    ifndef OLED_COM_PINS
 #        define OLED_COM_PINS COM_PINS_ALT
@@ -68,7 +68,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // If OLED_BLOCK_TYPE is uint8_t, these tables would look like:
 // #define OLED_SOURCE_MAP { 0, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 88, 96, 104, 112, 120 }
 // #define OLED_TARGET_MAP { 56, 120, 48, 112, 40, 104, 32, 96, 24, 88, 16, 80, 8, 72, 0, 64 }
-#else  // defined(OLED_DISPLAY_128X64)
+#else // defined(OLED_DISPLAY_128X64)
 // Default 128x32
 #    ifndef OLED_DISPLAY_WIDTH
 #        define OLED_DISPLAY_WIDTH 128
@@ -77,16 +77,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define OLED_DISPLAY_HEIGHT 32
 #    endif
 #    ifndef OLED_MATRIX_SIZE
-#        define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH)  // 512 (compile time mathed)
+#        define OLED_MATRIX_SIZE (OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH) // 512 (compile time mathed)
 #    endif
 #    ifndef OLED_BLOCK_TYPE
-#        define OLED_BLOCK_TYPE uint16_t  // Type to use for segmenting the oled display for smart rendering, use unsigned types only
+#        define OLED_BLOCK_TYPE uint16_t // Type to use for segmenting the oled display for smart rendering, use unsigned types only
 #    endif
 #    ifndef OLED_BLOCK_COUNT
-#        define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8)  // 16 (compile time mathed)
+#        define OLED_BLOCK_COUNT (sizeof(OLED_BLOCK_TYPE) * 8) // 16 (compile time mathed)
 #    endif
 #    ifndef OLED_BLOCK_SIZE
-#        define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)  // 32 (compile time mathed)
+#        define OLED_BLOCK_SIZE (OLED_MATRIX_SIZE / OLED_BLOCK_COUNT) // 32 (compile time mathed)
 #    endif
 #    ifndef OLED_COM_PINS
 #        define OLED_COM_PINS COM_PINS_SEQ
@@ -105,7 +105,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // If OLED_BLOCK_TYPE is uint8_t, these tables would look like:
 // #define OLED_SOURCE_MAP { 0, 8, 16, 24, 32, 40, 48, 56 }
 // #define OLED_TARGET_MAP { 48, 32, 16, 0, 56, 40, 24, 8 }
-#endif  // defined(OLED_DISPLAY_CUSTOM)
+#endif // defined(OLED_DISPLAY_CUSTOM)
 
 #if !defined(OLED_IC)
 #    define OLED_IC OLED_IC_SSD1306
@@ -180,7 +180,7 @@ typedef enum {
     OLED_ROTATION_0   = 0,
     OLED_ROTATION_90  = 1,
     OLED_ROTATION_180 = 2,
-    OLED_ROTATION_270 = 3,  // OLED_ROTATION_90 | OLED_ROTATION_180
+    OLED_ROTATION_270 = 3, // OLED_ROTATION_90 | OLED_ROTATION_180
 } oled_rotation_t;
 
 // Initialize the oled display, rotating the rendered output based on the define passed in.
@@ -262,7 +262,7 @@ void oled_write_raw_P(const char *data, uint16_t size);
 #    define oled_write_P(data, invert) oled_write(data, invert)
 #    define oled_write_ln_P(data, invert) oled_write(data, invert)
 #    define oled_write_raw_P(data, size) oled_write_raw(data, size)
-#endif  // defined(__AVR__)
+#endif // defined(__AVR__)
 
 // Can be used to manually turn on the screen if it is off
 // Returns true if the screen was on or turns on
diff --git a/drivers/oled/ssd1306_sh1106.c b/drivers/oled/ssd1306_sh1106.c
index d9bd3c14bd..30cfeb5648 100644
--- a/drivers/oled/ssd1306_sh1106.c
+++ b/drivers/oled/ssd1306_sh1106.c
@@ -53,7 +53,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PAGE_ADDR 0x22
 #define PAM_SETCOLUMN_LSB 0x00
 #define PAM_SETCOLUMN_MSB 0x10
-#define PAM_PAGE_ADDR 0xB0  // 0xb0 -- 0xb7
+#define PAM_PAGE_ADDR 0xB0 // 0xb0 -- 0xb7
 
 // Hardware Configuration Commands
 #define DISPLAY_START_LINE 0x40
@@ -97,9 +97,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define I2C_DATA 0x40
 #if defined(__AVR__)
 #    define I2C_TRANSMIT_P(data) i2c_transmit_P((OLED_DISPLAY_ADDRESS << 1), &data[0], sizeof(data), OLED_I2C_TIMEOUT)
-#else  // defined(__AVR__)
+#else // defined(__AVR__)
 #    define I2C_TRANSMIT_P(data) i2c_transmit((OLED_DISPLAY_ADDRESS << 1), &data[0], sizeof(data), OLED_I2C_TIMEOUT)
-#endif  // defined(__AVR__)
+#endif // defined(__AVR__)
 #define I2C_TRANSMIT(data) i2c_transmit((OLED_DISPLAY_ADDRESS << 1), &data[0], sizeof(data), OLED_I2C_TIMEOUT)
 #define I2C_WRITE_REG(mode, data, size) i2c_writeReg((OLED_DISPLAY_ADDRESS << 1), mode, data, size, OLED_I2C_TIMEOUT)
 
@@ -119,7 +119,7 @@ bool            oled_inverted       = false;
 uint8_t         oled_brightness     = OLED_BRIGHTNESS;
 oled_rotation_t oled_rotation       = 0;
 uint8_t         oled_rotation_width = 0;
-uint8_t         oled_scroll_speed   = 0;  // this holds the speed after being remapped to ssd1306 internal values
+uint8_t         oled_scroll_speed   = 0; // this holds the speed after being remapped to ssd1306 internal values
 uint8_t         oled_scroll_start   = 0;
 uint8_t         oled_scroll_end     = 7;
 #if OLED_TIMEOUT > 0
@@ -190,7 +190,7 @@ bool oled_init(oled_rotation_t rotation) {
 #if (OLED_IC != OLED_IC_SH1106)
         // MEMORY_MODE is unsupported on SH1106 (Page Addressing only)
         MEMORY_MODE,
-        0x00,  // Horizontal addressing mode
+        0x00, // Horizontal addressing mode
 #endif
     };
     if (I2C_TRANSMIT_P(display_setup1) != I2C_STATUS_SUCCESS) {
@@ -232,8 +232,12 @@ bool oled_init(oled_rotation_t rotation) {
     return true;
 }
 
-__attribute__((weak)) oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return rotation; }
-__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { return rotation; }
+__attribute__((weak)) oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return rotation;
+}
+__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return rotation;
+}
 
 void oled_clear(void) {
     memset(oled_buffer, 0, sizeof(oled_buffer));
@@ -306,9 +310,9 @@ void oled_render(void) {
     // Set column & page position
     static uint8_t display_start[] = {I2C_CMD, COLUMN_ADDR, 0, OLED_DISPLAY_WIDTH - 1, PAGE_ADDR, 0, OLED_DISPLAY_HEIGHT / 8 - 1};
     if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
-        calc_bounds(update_start, &display_start[1]);  // Offset from I2C_CMD byte at the start
+        calc_bounds(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start
     } else {
-        calc_bounds_90(update_start, &display_start[1]);  // Offset from I2C_CMD byte at the start
+        calc_bounds_90(update_start, &display_start[1]); // Offset from I2C_CMD byte at the start
     }
 
     // Send column & page position
@@ -368,7 +372,8 @@ void oled_advance_page(bool clearPageRemainder) {
         remaining = remaining / OLED_FONT_WIDTH;
 
         // Write empty character until next line
-        while (remaining--) oled_write_char(' ', false);
+        while (remaining--)
+            oled_write_char(' ', false);
     } else {
         // Next page index out of bounds?
         if (index + remaining >= OLED_MATRIX_SIZE) {
@@ -419,7 +424,7 @@ void oled_write_char(const char data, bool invert) {
     _Static_assert(sizeof(font) >= ((OLED_FONT_END + 1 - OLED_FONT_START) * OLED_FONT_WIDTH), "OLED_FONT_END references outside array");
 
     // set the reder buffer data
-    uint8_t cast_data = (uint8_t)data;  // font based on unsigned type for index
+    uint8_t cast_data = (uint8_t)data; // font based on unsigned type for index
     if (cast_data < OLED_FONT_START || cast_data > OLED_FONT_END) {
         memset(oled_cursor, 0x00, OLED_FONT_WIDTH);
     } else {
@@ -545,7 +550,7 @@ void oled_write_raw_P(const char *data, uint16_t size) {
         oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE));
     }
 }
-#endif  // defined(__AVR__)
+#endif // defined(__AVR__)
 
 bool oled_on(void) {
     if (!oled_initialized) {
@@ -595,7 +600,9 @@ bool oled_off(void) {
     return !oled_active;
 }
 
-bool is_oled_on(void) { return oled_active; }
+bool is_oled_on(void) {
+    return oled_active;
+}
 
 uint8_t oled_set_brightness(uint8_t level) {
     if (!oled_initialized) {
@@ -613,7 +620,9 @@ uint8_t oled_set_brightness(uint8_t level) {
     return oled_brightness;
 }
 
-uint8_t oled_get_brightness(void) { return oled_brightness; }
+uint8_t oled_get_brightness(void) {
+    return oled_brightness;
+}
 
 // Set the specific 8 lines rows of the screen to scroll.
 // 0 is the default for start, and 7 for end, which is the entire
@@ -693,7 +702,9 @@ bool oled_scroll_off(void) {
     return !oled_scrolling;
 }
 
-bool is_oled_scrolling(void) { return oled_scrolling; }
+bool is_oled_scrolling(void) {
+    return oled_scrolling;
+}
 
 bool oled_invert(bool invert) {
     if (!oled_initialized) {
@@ -777,5 +788,9 @@ void oled_task(void) {
 #endif
 }
 
-__attribute__((weak)) bool oled_task_kb(void) { return oled_task_user(); }
-__attribute__((weak)) bool oled_task_user(void) { return true; }
+__attribute__((weak)) bool oled_task_kb(void) {
+    return oled_task_user();
+}
+__attribute__((weak)) bool oled_task_user(void) {
+    return true;
+}
diff --git a/drivers/ps2/ps2_busywait.c b/drivers/ps2/ps2_busywait.c
index 983194eea8..c5a0183bb7 100644
--- a/drivers/ps2/ps2_busywait.c
+++ b/drivers/ps2/ps2_busywait.c
@@ -71,12 +71,12 @@ uint8_t ps2_host_send(uint8_t data) {
 
     /* terminate a transmission if we have */
     inhibit();
-    wait_us(100);  // 100us [4]p.13, [5]p.50
+    wait_us(100); // 100us [4]p.13, [5]p.50
 
     /* 'Request to Send' and Start bit */
     data_lo();
     clock_hi();
-    WAIT(clock_lo, 10000, 10);  // 10ms [5]p.50
+    WAIT(clock_lo, 10000, 10); // 10ms [5]p.50
 
     /* Data bit */
     for (uint8_t i = 0; i < 8; i++) {
@@ -143,7 +143,7 @@ uint8_t ps2_host_recv(void) {
     idle();
 
     /* start bit [1] */
-    WAIT(clock_lo, 100, 1);  // TODO: this is enough?
+    WAIT(clock_lo, 100, 1); // TODO: this is enough?
     WAIT(data_lo, 1, 2);
     WAIT(clock_hi, 50, 3);
 
diff --git a/drivers/ps2/ps2_interrupt.c b/drivers/ps2/ps2_interrupt.c
index 70debd02f7..c49b4f8b75 100644
--- a/drivers/ps2/ps2_interrupt.c
+++ b/drivers/ps2/ps2_interrupt.c
@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #if defined(__AVR__)
 #    include <avr/interrupt.h>
-#elif defined(PROTOCOL_CHIBIOS)  // TODO: or STM32 ?
+#elif defined(PROTOCOL_CHIBIOS) // TODO: or STM32 ?
 // chibiOS headers
 #    include "ch.h"
 #    include "hal.h"
@@ -71,7 +71,9 @@ static inline void    pbuf_clear(void);
 
 #if defined(PROTOCOL_CHIBIOS)
 void ps2_interrupt_service_routine(void);
-void palCallback(void *arg) { ps2_interrupt_service_routine(); }
+void palCallback(void *arg) {
+    ps2_interrupt_service_routine();
+}
 
 #    define PS2_INT_INIT()                                 \
         { palSetLineMode(PS2_CLOCK_PIN, PAL_MODE_INPUT); } \
@@ -85,7 +87,7 @@ void palCallback(void *arg) { ps2_interrupt_service_routine(); }
 #    define PS2_INT_OFF()                       \
         { palDisableLineEvent(PS2_CLOCK_PIN); } \
         while (0)
-#endif  // PROTOCOL_CHIBIOS
+#endif // PROTOCOL_CHIBIOS
 
 void ps2_host_init(void) {
     idle();
@@ -103,12 +105,12 @@ uint8_t ps2_host_send(uint8_t data) {
 
     /* terminate a transmission if we have */
     inhibit();
-    wait_us(100);  // 100us [4]p.13, [5]p.50
+    wait_us(100); // 100us [4]p.13, [5]p.50
 
     /* 'Request to Send' and Start bit */
     data_lo();
     clock_hi();
-    WAIT(clock_lo, 10000, 10);  // 10ms [5]p.50
+    WAIT(clock_lo, 10000, 10); // 10ms [5]p.50
 
     /* Data bit[2-9] */
     for (uint8_t i = 0; i < 8; i++) {
@@ -244,7 +246,9 @@ RETURN:
 }
 
 #if defined(__AVR__)
-ISR(PS2_INT_VECT) { ps2_interrupt_service_routine(); }
+ISR(PS2_INT_VECT) {
+    ps2_interrupt_service_routine();
+}
 #endif
 
 /* send LED state to keyboard */
diff --git a/drivers/ps2/ps2_mouse.c b/drivers/ps2/ps2_mouse.c
index 8a6668b410..ccb0a929ae 100644
--- a/drivers/ps2/ps2_mouse.c
+++ b/drivers/ps2/ps2_mouse.c
@@ -42,7 +42,7 @@ static inline void ps2_mouse_scroll_button_task(report_mouse_t *mouse_report);
 void ps2_mouse_init(void) {
     ps2_host_init();
 
-    wait_ms(PS2_MOUSE_INIT_DELAY);  // wait for powering up
+    wait_ms(PS2_MOUSE_INIT_DELAY); // wait for powering up
 
     PS2_MOUSE_SEND(PS2_MOUSE_RESET, "ps2_mouse_init: sending reset");
 
@@ -113,9 +113,13 @@ void ps2_mouse_task(void) {
     ps2_mouse_clear_report(&mouse_report);
 }
 
-void ps2_mouse_disable_data_reporting(void) { PS2_MOUSE_SEND(PS2_MOUSE_DISABLE_DATA_REPORTING, "ps2 mouse disable data reporting"); }
+void ps2_mouse_disable_data_reporting(void) {
+    PS2_MOUSE_SEND(PS2_MOUSE_DISABLE_DATA_REPORTING, "ps2 mouse disable data reporting");
+}
 
-void ps2_mouse_enable_data_reporting(void) { PS2_MOUSE_SEND(PS2_MOUSE_ENABLE_DATA_REPORTING, "ps2 mouse enable data reporting"); }
+void ps2_mouse_enable_data_reporting(void) {
+    PS2_MOUSE_SEND(PS2_MOUSE_ENABLE_DATA_REPORTING, "ps2 mouse enable data reporting");
+}
 
 void ps2_mouse_set_remote_mode(void) {
     PS2_MOUSE_SEND_SAFE(PS2_MOUSE_SET_REMOTE_MODE, "ps2 mouse set remote mode");
@@ -127,13 +131,21 @@ void ps2_mouse_set_stream_mode(void) {
     ps2_mouse_mode = PS2_MOUSE_STREAM_MODE;
 }
 
-void ps2_mouse_set_scaling_2_1(void) { PS2_MOUSE_SEND_SAFE(PS2_MOUSE_SET_SCALING_2_1, "ps2 mouse set scaling 2:1"); }
+void ps2_mouse_set_scaling_2_1(void) {
+    PS2_MOUSE_SEND_SAFE(PS2_MOUSE_SET_SCALING_2_1, "ps2 mouse set scaling 2:1");
+}
 
-void ps2_mouse_set_scaling_1_1(void) { PS2_MOUSE_SEND_SAFE(PS2_MOUSE_SET_SCALING_1_1, "ps2 mouse set scaling 1:1"); }
+void ps2_mouse_set_scaling_1_1(void) {
+    PS2_MOUSE_SEND_SAFE(PS2_MOUSE_SET_SCALING_1_1, "ps2 mouse set scaling 1:1");
+}
 
-void ps2_mouse_set_resolution(ps2_mouse_resolution_t resolution) { PS2_MOUSE_SET_SAFE(PS2_MOUSE_SET_RESOLUTION, resolution, "ps2 mouse set resolution"); }
+void ps2_mouse_set_resolution(ps2_mouse_resolution_t resolution) {
+    PS2_MOUSE_SET_SAFE(PS2_MOUSE_SET_RESOLUTION, resolution, "ps2 mouse set resolution");
+}
 
-void ps2_mouse_set_sample_rate(ps2_mouse_sample_rate_t sample_rate) { PS2_MOUSE_SET_SAFE(PS2_MOUSE_SET_SAMPLE_RATE, sample_rate, "ps2 mouse set sample rate"); }
+void ps2_mouse_set_sample_rate(ps2_mouse_sample_rate_t sample_rate) {
+    PS2_MOUSE_SET_SAFE(PS2_MOUSE_SET_SAMPLE_RATE, sample_rate, "ps2 mouse set sample rate");
+}
 
 /* ============================= HELPERS ============================ */
 
@@ -165,7 +177,7 @@ static inline void ps2_mouse_convert_report_to_hid(report_mouse_t *mouse_report)
 #ifdef PS2_MOUSE_INVERT_X
     mouse_report->x = -mouse_report->x;
 #endif
-#ifndef PS2_MOUSE_INVERT_Y  // NOTE if not!
+#ifndef PS2_MOUSE_INVERT_Y // NOTE if not!
     // invert coordinate of y to conform to USB HID mouse
     mouse_report->y = -mouse_report->y;
 #endif
diff --git a/drivers/sensors/adns5050.c b/drivers/sensors/adns5050.c
index c23d24d5af..b76268fba2 100644
--- a/drivers/sensors/adns5050.c
+++ b/drivers/sensors/adns5050.c
@@ -74,9 +74,13 @@ void adns5050_sync(void) {
     writePinHigh(ADNS5050_CS_PIN);
 }
 
-void adns5050_cs_select(void) { writePinLow(ADNS5050_CS_PIN); }
+void adns5050_cs_select(void) {
+    writePinLow(ADNS5050_CS_PIN);
+}
 
-void adns5050_cs_deselect(void) { writePinHigh(ADNS5050_CS_PIN); }
+void adns5050_cs_deselect(void) {
+    writePinHigh(ADNS5050_CS_PIN);
+}
 
 uint8_t adns5050_serial_read(void) {
     setPinInput(ADNS5050_SDIO_PIN);
@@ -190,7 +194,7 @@ int8_t convert_twoscomp(uint8_t data) {
 
 // Don't forget to use the definitions for CPI in the header file.
 void adns5050_set_cpi(uint16_t cpi) {
-    uint8_t cpival = constrain((cpi / 125), 0x1, 0xD);  // limits to 0--119
+    uint8_t cpival = constrain((cpi / 125), 0x1, 0xD); // limits to 0--119
 
     adns5050_write_reg(REG_MOUSE_CONTROL2, 0b10000 | cpival);
 }
diff --git a/drivers/sensors/adns9800.c b/drivers/sensors/adns9800.c
index d167841968..3633f23e52 100644
--- a/drivers/sensors/adns9800.c
+++ b/drivers/sensors/adns9800.c
@@ -77,7 +77,9 @@
 #define MSB1              0x80
 // clang-format on
 
-void adns9800_spi_start(void) { spi_start(ADNS9800_CS_PIN, false, ADNS9800_SPI_MODE, ADNS9800_SPI_DIVISOR); }
+void adns9800_spi_start(void) {
+    spi_start(ADNS9800_CS_PIN, false, ADNS9800_SPI_MODE, ADNS9800_SPI_DIVISOR);
+}
 
 void adns9800_write(uint8_t reg_addr, uint8_t data) {
     adns9800_spi_start();
diff --git a/drivers/sensors/analog_joystick.c b/drivers/sensors/analog_joystick.c
index 1666bed047..95f8cff23a 100644
--- a/drivers/sensors/analog_joystick.c
+++ b/drivers/sensors/analog_joystick.c
@@ -24,7 +24,7 @@ uint16_t minAxisValue = ANALOG_JOYSTICK_AXIS_MIN;
 uint16_t maxAxisValue = ANALOG_JOYSTICK_AXIS_MAX;
 
 uint8_t maxCursorSpeed = ANALOG_JOYSTICK_SPEED_MAX;
-uint8_t speedRegulator = ANALOG_JOYSTICK_SPEED_REGULATOR;  // Lower Values Create Faster Movement
+uint8_t speedRegulator = ANALOG_JOYSTICK_SPEED_REGULATOR; // Lower Values Create Faster Movement
 
 int16_t xOrigin, yOrigin;
 
diff --git a/drivers/sensors/cirque_pinnacle.c b/drivers/sensors/cirque_pinnacle.c
index b807c4f076..2db7f916fe 100644
--- a/drivers/sensors/cirque_pinnacle.c
+++ b/drivers/sensors/cirque_pinnacle.c
@@ -54,7 +54,9 @@ void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count);
 void RAP_Write(uint8_t address, uint8_t data);
 
 #ifdef CONSOLE_ENABLE
-void print_byte(uint8_t byte) { xprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0')); }
+void print_byte(uint8_t byte) {
+    xprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0'));
+}
 #endif
 
 /*  Logical Scaling Functions */
@@ -73,8 +75,12 @@ void ClipCoordinates(pinnacle_data_t* coordinates) {
     }
 }
 
-uint16_t cirque_pinnacle_get_scale(void) { return scale_data; }
-void     cirque_pinnacle_set_scale(uint16_t scale) { scale_data = scale; }
+uint16_t cirque_pinnacle_get_scale(void) {
+    return scale_data;
+}
+void cirque_pinnacle_set_scale(uint16_t scale) {
+    scale_data = scale;
+}
 
 // Scales data to desired X & Y resolution
 void cirque_pinnacle_scale_data(pinnacle_data_t* coordinates, uint16_t xResolution, uint16_t yResolution) {
@@ -105,13 +111,13 @@ void cirque_pinnacle_clear_flags() {
 void cirque_pinnacle_enable_feed(bool feedEnable) {
     uint8_t temp;
 
-    RAP_ReadBytes(FEEDCONFIG_1, &temp, 1);  // Store contents of FeedConfig1 register
+    RAP_ReadBytes(FEEDCONFIG_1, &temp, 1); // Store contents of FeedConfig1 register
 
     if (feedEnable) {
-        temp |= 0x01;  // Set Feed Enable bit
+        temp |= 0x01; // Set Feed Enable bit
         RAP_Write(0x04, temp);
     } else {
-        temp &= ~0x01;  // Clear Feed Enable bit
+        temp &= ~0x01; // Clear Feed Enable bit
         RAP_Write(0x04, temp);
     }
 }
@@ -122,13 +128,13 @@ void cirque_pinnacle_enable_feed(bool feedEnable) {
 void ERA_ReadBytes(uint16_t address, uint8_t* data, uint16_t count) {
     uint8_t ERAControlValue = 0xFF;
 
-    cirque_pinnacle_enable_feed(false);  // Disable feed
+    cirque_pinnacle_enable_feed(false); // Disable feed
 
-    RAP_Write(ERA_HIGH_BYTE, (uint8_t)(address >> 8));     // Send upper byte of ERA address
-    RAP_Write(ERA_LOW_BYTE, (uint8_t)(address & 0x00FF));  // Send lower byte of ERA address
+    RAP_Write(ERA_HIGH_BYTE, (uint8_t)(address >> 8));    // Send upper byte of ERA address
+    RAP_Write(ERA_LOW_BYTE, (uint8_t)(address & 0x00FF)); // Send lower byte of ERA address
 
     for (uint16_t i = 0; i < count; i++) {
-        RAP_Write(ERA_CONTROL, 0x05);  // Signal ERA-read (auto-increment) to Pinnacle
+        RAP_Write(ERA_CONTROL, 0x05); // Signal ERA-read (auto-increment) to Pinnacle
 
         // Wait for status register 0x1E to clear
         do {
@@ -145,14 +151,14 @@ void ERA_ReadBytes(uint16_t address, uint8_t* data, uint16_t count) {
 void ERA_WriteByte(uint16_t address, uint8_t data) {
     uint8_t ERAControlValue = 0xFF;
 
-    cirque_pinnacle_enable_feed(false);  // Disable feed
+    cirque_pinnacle_enable_feed(false); // Disable feed
 
-    RAP_Write(ERA_VALUE, data);  // Send data byte to be written
+    RAP_Write(ERA_VALUE, data); // Send data byte to be written
 
-    RAP_Write(ERA_HIGH_BYTE, (uint8_t)(address >> 8));     // Upper byte of ERA address
-    RAP_Write(ERA_LOW_BYTE, (uint8_t)(address & 0x00FF));  // Lower byte of ERA address
+    RAP_Write(ERA_HIGH_BYTE, (uint8_t)(address >> 8));    // Upper byte of ERA address
+    RAP_Write(ERA_LOW_BYTE, (uint8_t)(address & 0x00FF)); // Lower byte of ERA address
 
-    RAP_Write(ERA_CONTROL, 0x02);  // Signal an ERA-write to Pinnacle
+    RAP_Write(ERA_CONTROL, 0x02); // Signal an ERA-write to Pinnacle
 
     // Wait for status register 0x1E to clear
     do {
@@ -166,7 +172,7 @@ void cirque_pinnacle_set_adc_attenuation(uint8_t adcGain) {
     uint8_t temp = 0x00;
 
     ERA_ReadBytes(0x0187, &temp, 1);
-    temp &= 0x3F;  // clear top two bits
+    temp &= 0x3F; // clear top two bits
     temp |= adcGain;
     ERA_WriteByte(0x0187, temp);
     ERA_ReadBytes(0x0187, &temp, 1);
diff --git a/drivers/sensors/cirque_pinnacle.h b/drivers/sensors/cirque_pinnacle.h
index db891122a6..c8cb360e03 100644
--- a/drivers/sensors/cirque_pinnacle.h
+++ b/drivers/sensors/cirque_pinnacle.h
@@ -26,16 +26,16 @@ void            cirque_pinnacle_set_scale(uint16_t scale);
 
 // Coordinate scaling values
 #ifndef CIRQUE_PINNACLE_X_LOWER
-#    define CIRQUE_PINNACLE_X_LOWER 127  // min "reachable" X value
+#    define CIRQUE_PINNACLE_X_LOWER 127 // min "reachable" X value
 #endif
 #ifndef CIRQUE_PINNACLE_X_UPPER
-#    define CIRQUE_PINNACLE_X_UPPER 1919  // max "reachable" X value
+#    define CIRQUE_PINNACLE_X_UPPER 1919 // max "reachable" X value
 #endif
 #ifndef CIRQUE_PINNACLE_Y_LOWER
-#    define CIRQUE_PINNACLE_Y_LOWER 63  // min "reachable" Y value
+#    define CIRQUE_PINNACLE_Y_LOWER 63 // min "reachable" Y value
 #endif
 #ifndef CIRQUE_PINNACLE_Y_UPPER
-#    define CIRQUE_PINNACLE_Y_UPPER 1471  // max "reachable" Y value
+#    define CIRQUE_PINNACLE_Y_UPPER 1471 // max "reachable" Y value
 #endif
 #ifndef CIRQUE_PINNACLE_X_RANGE
 #    define CIRQUE_PINNACLE_X_RANGE (CIRQUE_PINNACLE_X_UPPER - CIRQUE_PINNACLE_X_LOWER)
diff --git a/drivers/sensors/cirque_pinnacle_i2c.c b/drivers/sensors/cirque_pinnacle_i2c.c
index 81dd982b0c..8a38f1dcea 100644
--- a/drivers/sensors/cirque_pinnacle_i2c.c
+++ b/drivers/sensors/cirque_pinnacle_i2c.c
@@ -14,7 +14,7 @@ extern bool touchpad_init;
 /*  RAP Functions */
 // Reads <count> Pinnacle registers starting at <address>
 void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
-    uint8_t cmdByte = READ_MASK | address;  // Form the READ command byte
+    uint8_t cmdByte = READ_MASK | address; // Form the READ command byte
     if (touchpad_init) {
         i2c_writeReg(CIRQUE_PINNACLE_ADDR << 1, cmdByte, NULL, 0, CIRQUE_PINNACLE_TIMEOUT);
         if (i2c_readReg(CIRQUE_PINNACLE_ADDR << 1, cmdByte, data, count, CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
@@ -29,7 +29,7 @@ void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
 
 // Writes single-byte <data> to <address>
 void RAP_Write(uint8_t address, uint8_t data) {
-    uint8_t cmdByte = WRITE_MASK | address;  // Form the WRITE command byte
+    uint8_t cmdByte = WRITE_MASK | address; // Form the WRITE command byte
 
     if (touchpad_init) {
         if (i2c_writeReg(CIRQUE_PINNACLE_ADDR << 1, cmdByte, &data, sizeof(data), CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
diff --git a/drivers/sensors/cirque_pinnacle_spi.c b/drivers/sensors/cirque_pinnacle_spi.c
index ed40abd9fa..e00e73eb8c 100644
--- a/drivers/sensors/cirque_pinnacle_spi.c
+++ b/drivers/sensors/cirque_pinnacle_spi.c
@@ -13,14 +13,14 @@ extern bool touchpad_init;
 /*  RAP Functions */
 // Reads <count> Pinnacle registers starting at <address>
 void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
-    uint8_t cmdByte = READ_MASK | address;  // Form the READ command byte
+    uint8_t cmdByte = READ_MASK | address; // Form the READ command byte
     if (touchpad_init) {
         if (spi_start(CIRQUE_PINNACLE_SPI_CS_PIN, CIRQUE_PINNACLE_SPI_LSBFIRST, CIRQUE_PINNACLE_SPI_MODE, CIRQUE_PINNACLE_SPI_DIVISOR)) {
             spi_write(cmdByte);
-            spi_read();  // filler
-            spi_read();  // filler
+            spi_read(); // filler
+            spi_read(); // filler
             for (uint8_t i = 0; i < count; i++) {
-                data[i] = spi_read();  // each sepsequent read gets another register's contents
+                data[i] = spi_read(); // each sepsequent read gets another register's contents
             }
         } else {
 #ifdef CONSOLE_ENABLE
@@ -34,7 +34,7 @@ void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
 
 // Writes single-byte <data> to <address>
 void RAP_Write(uint8_t address, uint8_t data) {
-    uint8_t cmdByte = WRITE_MASK | address;  // Form the WRITE command byte
+    uint8_t cmdByte = WRITE_MASK | address; // Form the WRITE command byte
 
     if (touchpad_init) {
         if (spi_start(CIRQUE_PINNACLE_SPI_CS_PIN, CIRQUE_PINNACLE_SPI_LSBFIRST, CIRQUE_PINNACLE_SPI_MODE, CIRQUE_PINNACLE_SPI_DIVISOR)) {
diff --git a/drivers/sensors/pimoroni_trackball.c b/drivers/sensors/pimoroni_trackball.c
index 2867e763bc..333e017a06 100644
--- a/drivers/sensors/pimoroni_trackball.c
+++ b/drivers/sensors/pimoroni_trackball.c
@@ -33,7 +33,9 @@
 
 static uint16_t precision = 128;
 
-uint16_t pimoroni_trackball_get_cpi(void) { return (precision * 125); }
+uint16_t pimoroni_trackball_get_cpi(void) {
+    return (precision * 125);
+}
 /**
  * @brief Sets the scaling value for pimoroni trackball
  *
diff --git a/drivers/sensors/pmw3360.c b/drivers/sensors/pmw3360.c
index 8d1b08e22b..8c977be1c8 100644
--- a/drivers/sensors/pmw3360.c
+++ b/drivers/sensors/pmw3360.c
@@ -86,7 +86,9 @@
 bool _inBurst = false;
 
 #ifdef CONSOLE_ENABLE
-void print_byte(uint8_t byte) { dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0')); }
+void print_byte(uint8_t byte) {
+    dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0'));
+}
 #endif
 #define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
 
@@ -144,7 +146,7 @@ bool pmw3360_init(void) {
     pmw3360_spi_start();
     spi_stop();
 
-    pmw3360_write(REG_Shutdown, 0xb6);  // Shutdown first
+    pmw3360_write(REG_Shutdown, 0xb6); // Shutdown first
     wait_ms(300);
 
     pmw3360_spi_start();
@@ -222,7 +224,7 @@ bool pmw3360_check_signature(void) {
     uint8_t pid      = pmw3360_read(REG_Product_ID);
     uint8_t iv_pid   = pmw3360_read(REG_Inverse_Product_ID);
     uint8_t SROM_ver = pmw3360_read(REG_SROM_ID);
-    return (pid == firmware_signature[0] && iv_pid == firmware_signature[1] && SROM_ver == firmware_signature[2]);  // signature for SROM 0x04
+    return (pid == firmware_signature[0] && iv_pid == firmware_signature[1] && SROM_ver == firmware_signature[2]); // signature for SROM 0x04
 }
 
 uint16_t pmw3360_get_cpi(void) {
@@ -248,17 +250,17 @@ report_pmw3360_t pmw3360_read_burst(void) {
 
     pmw3360_spi_start();
     spi_write(REG_Motion_Burst);
-    wait_us(35);  // waits for tSRAD_MOTBR
+    wait_us(35); // waits for tSRAD_MOTBR
 
     report.motion = spi_read();
-    spi_read();  // skip Observation
+    spi_read(); // skip Observation
     // delta registers
     report.dx  = spi_read();
     report.mdx = spi_read();
     report.dy  = spi_read();
     report.mdy = spi_read();
 
-    if (report.motion & 0b111) {  // panic recovery, sometimes burst mode works weird.
+    if (report.motion & 0b111) { // panic recovery, sometimes burst mode works weird.
         _inBurst = false;
     }
 
diff --git a/drivers/sensors/pmw3360.h b/drivers/sensors/pmw3360.h
index 4e17aa0c46..eec7295871 100644
--- a/drivers/sensors/pmw3360.h
+++ b/drivers/sensors/pmw3360.h
@@ -58,11 +58,11 @@
 
 typedef struct {
     int8_t  motion;
-    bool    isMotion;     // True if a motion is detected.
-    bool    isOnSurface;  // True when a chip is on a surface
-    int16_t dx;           // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
+    bool    isMotion;    // True if a motion is detected.
+    bool    isOnSurface; // True when a chip is on a surface
+    int16_t dx;          // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
     int8_t  mdx;
-    int16_t dy;  // displacement on y directions.
+    int16_t dy; // displacement on y directions.
     int8_t  mdy;
 } report_pmw3360_t;
 
diff --git a/drivers/sensors/pmw3389.c b/drivers/sensors/pmw3389.c
index 963925bd38..828dafa134 100644
--- a/drivers/sensors/pmw3389.c
+++ b/drivers/sensors/pmw3389.c
@@ -90,7 +90,9 @@
 bool _inBurst = false;
 
 #ifdef CONSOLE_ENABLE
-void print_byte(uint8_t byte) { dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0')); }
+void print_byte(uint8_t byte) {
+    dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0'));
+}
 #endif
 #define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
 
@@ -148,7 +150,7 @@ bool pmw3389_init(void) {
     pmw3389_spi_start();
     spi_stop();
 
-    pmw3389_write(REG_Shutdown, 0xb6);  // Shutdown first
+    pmw3389_write(REG_Shutdown, 0xb6); // Shutdown first
     wait_ms(300);
 
     pmw3389_spi_start();
@@ -226,7 +228,7 @@ bool pmw3389_check_signature(void) {
     uint8_t pid      = pmw3389_read(REG_Product_ID);
     uint8_t iv_pid   = pmw3389_read(REG_Inverse_Product_ID);
     uint8_t SROM_ver = pmw3389_read(REG_SROM_ID);
-    return (pid == firmware_signature[0] && iv_pid == firmware_signature[1] && SROM_ver == firmware_signature[2]);  // signature for SROM 0x04
+    return (pid == firmware_signature[0] && iv_pid == firmware_signature[1] && SROM_ver == firmware_signature[2]); // signature for SROM 0x04
 }
 
 uint16_t pmw3389_get_cpi(void) {
@@ -254,17 +256,17 @@ report_pmw3389_t pmw3389_read_burst(void) {
 
     pmw3389_spi_start();
     spi_write(REG_Motion_Burst);
-    wait_us(35);  // waits for tSRAD_MOTBR
+    wait_us(35); // waits for tSRAD_MOTBR
 
     report.motion = spi_read();
-    spi_read();  // skip Observation
+    spi_read(); // skip Observation
     // delta registers
     report.dx  = spi_read();
     report.mdx = spi_read();
     report.dy  = spi_read();
     report.mdy = spi_read();
 
-    if (report.motion & 0b111) {  // panic recovery, sometimes burst mode works weird.
+    if (report.motion & 0b111) { // panic recovery, sometimes burst mode works weird.
         _inBurst = false;
     }
 
diff --git a/drivers/sensors/pmw3389.h b/drivers/sensors/pmw3389.h
index a7c95e6076..db4a763fe3 100644
--- a/drivers/sensors/pmw3389.h
+++ b/drivers/sensors/pmw3389.h
@@ -59,11 +59,11 @@
 
 typedef struct {
     int8_t  motion;
-    bool    isMotion;     // True if a motion is detected.
-    bool    isOnSurface;  // True when a chip is on a surface
-    int16_t dx;           // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
+    bool    isMotion;    // True if a motion is detected.
+    bool    isOnSurface; // True when a chip is on a surface
+    int16_t dx;          // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
     int8_t  mdx;
-    int16_t dy;  // displacement on y directions.
+    int16_t dy; // displacement on y directions.
     int8_t  mdy;
 } report_pmw3389_t;
 
diff --git a/drivers/usb2422.c b/drivers/usb2422.c
index 62b919093b..8ee54b24ee 100644
--- a/drivers/usb2422.c
+++ b/drivers/usb2422.c
@@ -352,7 +352,7 @@ void USB2422_init() {
     setPinInput(USB2422_ACTIVE_PIN);
 #endif
 
-    i2c_init();  // IC2 clk must be high at USB2422 reset release time to signal SMB configuration
+    i2c_init(); // IC2 clk must be high at USB2422 reset release time to signal SMB configuration
 }
 
 void USB2422_configure() {
@@ -363,14 +363,14 @@ void USB2422_configure() {
     // configure Usb2422 registers
     config.VID.reg               = USB2422_VENDOR_ID;
     config.PID.reg               = USB2422_PRODUCT_ID;
-    config.DID.reg               = USB2422_DEVICE_VER;  // BCD format, eg 01.01
-    config.CFG1.bit.SELF_BUS_PWR = 1;                   // self powered for now
-    config.CFG1.bit.HS_DISABLE   = 1;                   // full or high speed
+    config.DID.reg               = USB2422_DEVICE_VER; // BCD format, eg 01.01
+    config.CFG1.bit.SELF_BUS_PWR = 1;                  // self powered for now
+    config.CFG1.bit.HS_DISABLE   = 1;                  // full or high speed
     // config.CFG2.bit.COMPOUND = 0; // compound device
-    config.CFG3.bit.STRING_EN = 1;  // strings enabled
+    config.CFG3.bit.STRING_EN = 1; // strings enabled
     // config.NRD.bit.PORT2_NR = 0; // MCU is non-removable
-    config.MAXPB.reg = 20;  // 0mA
-    config.HCMCB.reg = 20;  // 0mA
+    config.MAXPB.reg = 20; // 0mA
+    config.HCMCB.reg = 20; // 0mA
     config.MFRSL.reg = sizeof(USB2422_MANUFACTURER);
     config.PRDSL.reg = sizeof(USB2422_PRODUCT);
     config.SERSL.reg = sizeof(SERNAME);
diff --git a/drivers/ws2812.h b/drivers/ws2812.h
index 945b3d0728..5985b5340c 100644
--- a/drivers/ws2812.h
+++ b/drivers/ws2812.h
@@ -33,19 +33,19 @@
 #endif
 
 #ifndef WS2812_T1H
-#    define WS2812_T1H 900  // Width of a 1 bit in ns
+#    define WS2812_T1H 900 // Width of a 1 bit in ns
 #endif
 
 #ifndef WS2812_T1L
-#    define WS2812_T1L (WS2812_TIMING - WS2812_T1H)  // Width of a 1 bit in ns
+#    define WS2812_T1L (WS2812_TIMING - WS2812_T1H) // Width of a 1 bit in ns
 #endif
 
 #ifndef WS2812_T0H
-#    define WS2812_T0H 350  // Width of a 0 bit in ns
+#    define WS2812_T0H 350 // Width of a 0 bit in ns
 #endif
 
 #ifndef WS2812_T0L
-#    define WS2812_T0L (WS2812_TIMING - WS2812_T0H)  // Width of a 0 bit in ns
+#    define WS2812_T0L (WS2812_TIMING - WS2812_T0H) // Width of a 0 bit in ns
 #endif
 
 /*
diff --git a/platforms/arm_atsam/bootloaders/md_boot.c b/platforms/arm_atsam/bootloaders/md_boot.c
index 9cf16f3597..32cf850448 100644
--- a/platforms/arm_atsam/bootloaders/md_boot.c
+++ b/platforms/arm_atsam/bootloaders/md_boot.c
@@ -26,20 +26,20 @@ extern uint32_t _eram;
 // CTRL keyboards released with bootloader version below must use RAM method. Otherwise use WDT method.
 void bootloader_jump(void) {
 #ifdef KEYBOARD_massdrop_ctrl
-    uint8_t  ver_ram_method[] = "v2.18Jun 22 2018 17:28:08";  // The version to match (NULL terminated by compiler)
-    uint8_t *ver_check        = ver_ram_method;               // Pointer to version match string for traversal
-    uint8_t *ver_rom          = (uint8_t *)0x21A0;            // Pointer to address in ROM where this specific bootloader version would exist
+    uint8_t  ver_ram_method[] = "v2.18Jun 22 2018 17:28:08"; // The version to match (NULL terminated by compiler)
+    uint8_t *ver_check        = ver_ram_method;              // Pointer to version match string for traversal
+    uint8_t *ver_rom          = (uint8_t *)0x21A0;           // Pointer to address in ROM where this specific bootloader version would exist
 
-    while (*ver_check && *ver_rom == *ver_check) {  // While there are check version characters to match and bootloader's version matches check's version
-        ver_check++;                                // Move check version pointer to next character
-        ver_rom++;                                  // Move ROM version pointer to next character
+    while (*ver_check && *ver_rom == *ver_check) { // While there are check version characters to match and bootloader's version matches check's version
+        ver_check++;                               // Move check version pointer to next character
+        ver_rom++;                                 // Move ROM version pointer to next character
     }
 
-    if (!*ver_check) {                   // If check version pointer is NULL, all characters have matched
-        *MAGIC_ADDR = BOOTLOADER_MAGIC;  // Set magic number into RAM
-        NVIC_SystemReset();              // Perform system reset
+    if (!*ver_check) {                  // If check version pointer is NULL, all characters have matched
+        *MAGIC_ADDR = BOOTLOADER_MAGIC; // Set magic number into RAM
+        NVIC_SystemReset();             // Perform system reset
         while (1)
-            ;  // Won't get here
+            ; // Won't get here
     }
 #endif
 
@@ -61,5 +61,5 @@ void bootloader_jump(void) {
     while (!WDT->CTRLA.bit.ENABLE)
         ;
     while (1)
-        ;  // Wait on timeout
+        ; // Wait on timeout
 }
diff --git a/platforms/arm_atsam/eeprom_samd.c b/platforms/arm_atsam/eeprom_samd.c
index beaffeec30..1c1e031e5d 100644
--- a/platforms/arm_atsam/eeprom_samd.c
+++ b/platforms/arm_atsam/eeprom_samd.c
@@ -155,7 +155,9 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
     }
 }
 
-void eeprom_update_byte(uint8_t *addr, uint8_t value) { eeprom_write_byte(addr, value); }
+void eeprom_update_byte(uint8_t *addr, uint8_t value) {
+    eeprom_write_byte(addr, value);
+}
 
 void eeprom_update_word(uint16_t *addr, uint16_t value) {
     uint8_t *p = (uint8_t *)addr;
diff --git a/platforms/arm_atsam/eeprom_samd.h b/platforms/arm_atsam/eeprom_samd.h
old mode 100755
new mode 100644
index 7dbff9bfa1..878e72865c
--- a/platforms/arm_atsam/eeprom_samd.h
+++ b/platforms/arm_atsam/eeprom_samd.h
@@ -4,5 +4,5 @@
 
 #ifndef EEPROM_SIZE
 #    include "eeconfig.h"
-#    define EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4)  // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
+#    define EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4) // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO
 #endif
diff --git a/platforms/arm_atsam/suspend.c b/platforms/arm_atsam/suspend.c
index de2285bc5f..242e9c91a2 100644
--- a/platforms/arm_atsam/suspend.c
+++ b/platforms/arm_atsam/suspend.c
@@ -9,7 +9,7 @@
  */
 void suspend_power_down(void) {
 #ifdef RGB_MATRIX_ENABLE
-    I2C3733_Control_Set(0);  // Disable LED driver
+    I2C3733_Control_Set(0); // Disable LED driver
 #endif
 
     suspend_power_down_kb();
diff --git a/platforms/arm_atsam/timer.c b/platforms/arm_atsam/timer.c
index b835dd5e75..cf01e3625e 100644
--- a/platforms/arm_atsam/timer.c
+++ b/platforms/arm_atsam/timer.c
@@ -2,18 +2,34 @@
 #include "timer.h"
 #include "tmk_core/protocol/arm_atsam/clks.h"
 
-void set_time(uint64_t tset) { ms_clk = tset; }
+void set_time(uint64_t tset) {
+    ms_clk = tset;
+}
 
-void timer_init(void) { timer_clear(); }
+void timer_init(void) {
+    timer_clear();
+}
 
-uint16_t timer_read(void) { return (uint16_t)ms_clk; }
+uint16_t timer_read(void) {
+    return (uint16_t)ms_clk;
+}
 
-uint32_t timer_read32(void) { return (uint32_t)ms_clk; }
+uint32_t timer_read32(void) {
+    return (uint32_t)ms_clk;
+}
 
-uint64_t timer_read64(void) { return ms_clk; }
+uint64_t timer_read64(void) {
+    return ms_clk;
+}
 
-uint16_t timer_elapsed(uint16_t tlast) { return TIMER_DIFF_16(timer_read(), tlast); }
+uint16_t timer_elapsed(uint16_t tlast) {
+    return TIMER_DIFF_16(timer_read(), tlast);
+}
 
-uint32_t timer_elapsed32(uint32_t tlast) { return TIMER_DIFF_32(timer_read32(), tlast); }
+uint32_t timer_elapsed32(uint32_t tlast) {
+    return TIMER_DIFF_32(timer_read32(), tlast);
+}
 
-void timer_clear(void) { set_time(0); }
+void timer_clear(void) {
+    set_time(0);
+}
diff --git a/platforms/avr/bootloaders/dfu.c b/platforms/avr/bootloaders/dfu.c
index cb42821a93..06b2c8963a 100644
--- a/platforms/avr/bootloaders/dfu.c
+++ b/platforms/avr/bootloaders/dfu.c
@@ -30,9 +30,9 @@ uint32_t reset_key __attribute__((section(".noinit,\"aw\",@nobits;")));
 
 __attribute__((weak)) void bootloader_jump(void) {
     UDCON  = 1;
-    USBCON = (1 << FRZCLK);  // disable USB
+    USBCON = (1 << FRZCLK); // disable USB
     UCSR1B = 0;
-    _delay_ms(5);  // 5 seems to work fine
+    _delay_ms(5); // 5 seems to work fine
 
     // watchdog reset
     reset_key = BOOTLOADER_RESET_KEY;
diff --git a/platforms/avr/bootloaders/halfkay.c b/platforms/avr/bootloaders/halfkay.c
index 6ce2e19114..651696f988 100644
--- a/platforms/avr/bootloaders/halfkay.c
+++ b/platforms/avr/bootloaders/halfkay.c
@@ -27,11 +27,11 @@ __attribute__((weak)) void bootloader_jump(void) {
     // disable all peripherals
     // a shutdown call might make sense here
     UDCON  = 1;
-    USBCON = (1 << FRZCLK);  // disable USB
+    USBCON = (1 << FRZCLK); // disable USB
     UCSR1B = 0;
     _delay_ms(5);
 
-#if defined(__AVR_AT90USB162__)  // Teensy 1.0
+#if defined(__AVR_AT90USB162__) // Teensy 1.0
     EIMSK  = 0;
     PCICR  = 0;
     SPCR   = 0;
@@ -47,7 +47,7 @@ __attribute__((weak)) void bootloader_jump(void) {
     PORTC  = 0;
     PORTD  = 0;
     asm volatile("jmp 0x3E00");
-#elif defined(__AVR_ATmega32U4__)   // Teensy 2.0
+#elif defined(__AVR_ATmega32U4__)  // Teensy 2.0
     EIMSK  = 0;
     PCICR  = 0;
     SPCR   = 0;
@@ -72,7 +72,7 @@ __attribute__((weak)) void bootloader_jump(void) {
     PORTE  = 0;
     PORTF  = 0;
     asm volatile("jmp 0x7E00");
-#elif defined(__AVR_AT90USB646__)   // Teensy++ 1.0
+#elif defined(__AVR_AT90USB646__)  // Teensy++ 1.0
     EIMSK  = 0;
     PCICR  = 0;
     SPCR   = 0;
@@ -98,7 +98,7 @@ __attribute__((weak)) void bootloader_jump(void) {
     PORTE  = 0;
     PORTF  = 0;
     asm volatile("jmp 0xFC00");
-#elif defined(__AVR_AT90USB1286__)  // Teensy++ 2.0
+#elif defined(__AVR_AT90USB1286__) // Teensy++ 2.0
     EIMSK  = 0;
     PCICR  = 0;
     SPCR   = 0;
diff --git a/platforms/avr/drivers/analog.c b/platforms/avr/drivers/analog.c
index 628835ccef..ed4d563609 100644
--- a/platforms/avr/drivers/analog.c
+++ b/platforms/avr/drivers/analog.c
@@ -21,9 +21,13 @@
 
 static uint8_t aref = ADC_REF_POWER;
 
-void analogReference(uint8_t mode) { aref = mode & (_BV(REFS1) | _BV(REFS0)); }
+void analogReference(uint8_t mode) {
+    aref = mode & (_BV(REFS1) | _BV(REFS0));
+}
 
-int16_t analogReadPin(pin_t pin) { return adc_read(pinToMux(pin)); }
+int16_t analogReadPin(pin_t pin) {
+    return adc_read(pinToMux(pin));
+}
 
 uint8_t pinToMux(pin_t pin) {
     switch (pin) {
diff --git a/platforms/avr/drivers/analog.h b/platforms/avr/drivers/analog.h
index fa2fb0d89b..fb13e106ff 100644
--- a/platforms/avr/drivers/analog.h
+++ b/platforms/avr/drivers/analog.h
@@ -32,21 +32,21 @@ int16_t adc_read(uint8_t mux);
 }
 #endif
 
-#define ADC_REF_EXTERNAL 0                          // AREF, Internal Vref turned off
-#define ADC_REF_POWER _BV(REFS0)                    // AVCC with external capacitor on AREF pin
-#define ADC_REF_INTERNAL (_BV(REFS1) | _BV(REFS0))  // Internal 2.56V Voltage Reference with external capacitor on AREF pin (1.1V for 328P)
+#define ADC_REF_EXTERNAL 0                         // AREF, Internal Vref turned off
+#define ADC_REF_POWER _BV(REFS0)                   // AVCC with external capacitor on AREF pin
+#define ADC_REF_INTERNAL (_BV(REFS1) | _BV(REFS0)) // Internal 2.56V Voltage Reference with external capacitor on AREF pin (1.1V for 328P)
 
 // These prescaler values are for high speed mode, ADHSM = 1
 #if F_CPU == 16000000L || F_CPU == 12000000L
-#    define ADC_PRESCALER (_BV(ADPS2) | _BV(ADPS1))  // /64
+#    define ADC_PRESCALER (_BV(ADPS2) | _BV(ADPS1)) // /64
 #elif F_CPU == 8000000L
-#    define ADC_PRESCALER (_BV(ADPS2) | _BV(ADPS0))  // /32
+#    define ADC_PRESCALER (_BV(ADPS2) | _BV(ADPS0)) // /32
 #elif F_CPU == 4000000L
-#    define ADC_PRESCALER (_BV(ADPS2))  // /16
+#    define ADC_PRESCALER (_BV(ADPS2)) // /16
 #elif F_CPU == 2000000L
-#    define ADC_PRESCALER (_BV(ADPS1) | _BV(ADPS0))  // /8
+#    define ADC_PRESCALER (_BV(ADPS1) | _BV(ADPS0)) // /8
 #elif F_CPU == 1000000L
-#    define ADC_PRESCALER _BV(ADPS1)  // /4
+#    define ADC_PRESCALER _BV(ADPS1) // /4
 #else
-#    define ADC_PRESCALER _BV(ADPS0)  // /2
+#    define ADC_PRESCALER _BV(ADPS0) // /2
 #endif
diff --git a/platforms/avr/drivers/audio_pwm_hardware.c b/platforms/avr/drivers/audio_pwm_hardware.c
index df03a4558c..78776ee48a 100644
--- a/platforms/avr/drivers/audio_pwm_hardware.c
+++ b/platforms/avr/drivers/audio_pwm_hardware.c
@@ -152,7 +152,7 @@ extern uint8_t note_timbre;
 #ifdef AUDIO1_PIN_SET
 static float channel_1_frequency = 0.0f;
 void         channel_1_set_frequency(float freq) {
-    if (freq == 0.0f)  // a pause/rest is a valid "note" with freq=0
+    if (freq == 0.0f) // a pause/rest is a valid "note" with freq=0
     {
         // disable the output, but keep the pwm-ISR going (with the previous
         // frequency) so the audio-state keeps getting updated
@@ -160,7 +160,7 @@ void         channel_1_set_frequency(float freq) {
         AUDIO1_TCCRxA &= ~(_BV(AUDIO1_COMxy1) | _BV(AUDIO1_COMxy0));
         return;
     } else {
-        AUDIO1_TCCRxA |= _BV(AUDIO1_COMxy1);  // enable output, PWM mode
+        AUDIO1_TCCRxA |= _BV(AUDIO1_COMxy1); // enable output, PWM mode
     }
 
     channel_1_frequency = freq;
@@ -202,7 +202,9 @@ void         channel_2_set_frequency(float freq) {
     AUDIO2_OCRxy = (uint16_t)((((float)F_CPU) / (freq * CPU_PRESCALER)) * note_timbre / 100);
 }
 
-float channel_2_get_frequency(void) { return channel_2_frequency; }
+float channel_2_get_frequency(void) {
+    return channel_2_frequency;
+}
 
 void channel_2_start(void) {
     AUDIO2_TIMSKx |= _BV(AUDIO2_OCIExy);
diff --git a/platforms/avr/drivers/glcdfont.c b/platforms/avr/drivers/glcdfont.c
index 5e763b054f..57a21965de 100644
--- a/platforms/avr/drivers/glcdfont.c
+++ b/platforms/avr/drivers/glcdfont.c
@@ -10,14 +10,14 @@ static const unsigned char font[] PROGMEM = {
     0x30, 0x38, 0x3E, 0x38, 0x30, 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x07, 0x00, 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x23, 0x13, 0x08, 0x64, 0x62, 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, 0x41, 0x22, 0x1C, 0x00, 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, 0x80, 0x70, 0x30, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x60, 0x60, 0x00, 0x20, 0x10, 0x08, 0x04, 0x02, 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, 0x42, 0x7F, 0x40, 0x00, 0x72, 0x49, 0x49, 0x49, 0x46, 0x21, 0x41, 0x49, 0x4D, 0x33, 0x18, 0x14, 0x12, 0x7F, 0x10, 0x27, 0x45, 0x45, 0x45, 0x39, 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x41, 0x21, 0x11, 0x09, 0x07, 0x36, 0x49, 0x49, 0x49, 0x36, 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x40, 0x34, 0x00, 0x00,
     0x00, 0x08, 0x14, 0x22, 0x41, 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, 0x41, 0x22, 0x14, 0x08, 0x02, 0x01, 0x59, 0x09, 0x06, 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x7F, 0x49, 0x49, 0x49, 0x36, 0x3E, 0x41, 0x41, 0x41, 0x22, 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x7F, 0x49, 0x49, 0x49, 0x41, 0x7F, 0x09, 0x09, 0x09, 0x01, 0x3E, 0x41, 0x41, 0x51, 0x73, 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, 0x41, 0x7F, 0x41, 0x00, 0x20, 0x40, 0x41, 0x3F, 0x01, 0x7F, 0x08, 0x14, 0x22, 0x41, 0x7F, 0x40, 0x40, 0x40, 0x40, 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x7F, 0x09, 0x09, 0x09, 0x06, 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x7F, 0x09, 0x19, 0x29, 0x46, 0x26, 0x49, 0x49, 0x49, 0x32, 0x03, 0x01, 0x7F, 0x01, 0x03, 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x63, 0x14, 0x08, 0x14, 0x63, 0x03, 0x04, 0x78, 0x04, 0x03,
     0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, 0x7F, 0x41, 0x41, 0x41, 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, 0x41, 0x41, 0x41, 0x7F, 0x04, 0x02, 0x01, 0x02, 0x04, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x03, 0x07, 0x08, 0x00, 0x20, 0x54, 0x54, 0x78, 0x40, 0x7F, 0x28, 0x44, 0x44, 0x38, 0x38, 0x44, 0x44, 0x44, 0x28, 0x38, 0x44, 0x44, 0x28, 0x7F, 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, 0x08, 0x7E, 0x09, 0x02, 0x18, 0xA4, 0xA4, 0x9C, 0x78, 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, 0x44, 0x7D, 0x40, 0x00, 0x20, 0x40, 0x40, 0x3D, 0x00, 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, 0x41, 0x7F, 0x40, 0x00, 0x7C, 0x04, 0x78, 0x04, 0x78, 0x7C, 0x08, 0x04, 0x04, 0x78, 0x38, 0x44, 0x44, 0x44, 0x38, 0xFC, 0x18, 0x24, 0x24, 0x18, 0x18, 0x24, 0x24, 0x18, 0xFC, 0x7C, 0x08, 0x04, 0x04, 0x08, 0x48, 0x54, 0x54, 0x54, 0x24, 0x04, 0x04, 0x3F, 0x44, 0x24, 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x3C, 0x40, 0x30, 0x40, 0x3C,
-    0x44, 0x28, 0x10, 0x28, 0x44, 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x41, 0x36, 0x08, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x1E, 0xA1, 0xA1, 0x61, 0x12, 0x3A, 0x40, 0x40, 0x20, 0x7A, 0x38, 0x54, 0x54, 0x55, 0x59, 0x21, 0x55, 0x55, 0x79, 0x41, 0x22, 0x54, 0x54, 0x78, 0x42,                                                                                                                                                                                                                                                                                                              // a-umlaut
-    0x21, 0x55, 0x54, 0x78, 0x40, 0x20, 0x54, 0x55, 0x79, 0x40, 0x0C, 0x1E, 0x52, 0x72, 0x12, 0x39, 0x55, 0x55, 0x55, 0x59, 0x39, 0x54, 0x54, 0x54, 0x59, 0x39, 0x55, 0x54, 0x54, 0x58, 0x00, 0x00, 0x45, 0x7C, 0x41, 0x00, 0x02, 0x45, 0x7D, 0x42, 0x00, 0x01, 0x45, 0x7C, 0x40, 0x7D, 0x12, 0x11, 0x12, 0x7D,                                                                                                                                                                                                                                                                                                                                                                                                        // A-umlaut
-    0xF0, 0x28, 0x25, 0x28, 0xF0, 0x7C, 0x54, 0x55, 0x45, 0x00, 0x20, 0x54, 0x54, 0x7C, 0x54, 0x7C, 0x0A, 0x09, 0x7F, 0x49, 0x32, 0x49, 0x49, 0x49, 0x32, 0x3A, 0x44, 0x44, 0x44, 0x3A,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                // o-umlaut
-    0x32, 0x4A, 0x48, 0x48, 0x30, 0x3A, 0x41, 0x41, 0x21, 0x7A, 0x3A, 0x42, 0x40, 0x20, 0x78, 0x00, 0x9D, 0xA0, 0xA0, 0x7D, 0x3D, 0x42, 0x42, 0x42, 0x3D,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              // O-umlaut
-    0x3D, 0x40, 0x40, 0x40, 0x3D, 0x3C, 0x24, 0xFF, 0x24, 0x24, 0x48, 0x7E, 0x49, 0x43, 0x66, 0x2B, 0x2F, 0xFC, 0x2F, 0x2B, 0xFF, 0x09, 0x29, 0xF6, 0x20, 0xC0, 0x88, 0x7E, 0x09, 0x03, 0x20, 0x54, 0x54, 0x79, 0x41, 0x00, 0x00, 0x44, 0x7D, 0x41, 0x30, 0x48, 0x48, 0x4A, 0x32, 0x38, 0x40, 0x40, 0x22, 0x7A, 0x00, 0x7A, 0x0A, 0x0A, 0x72, 0x7D, 0x0D, 0x19, 0x31, 0x7D, 0x26, 0x29, 0x29, 0x2F, 0x28, 0x26, 0x29, 0x29, 0x29, 0x26, 0x30, 0x48, 0x4D, 0x40, 0x20, 0x38, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x38, 0x2F, 0x10, 0xC8, 0xAC, 0xBA, 0x2F, 0x10, 0x28, 0x34, 0xFA, 0x00, 0x00, 0x7B, 0x00, 0x00, 0x08, 0x14, 0x2A, 0x14, 0x22, 0x22, 0x14, 0x2A, 0x14, 0x08, 0x55, 0x00, 0x55, 0x00, 0x55,  // #176 (25% block) missing in old code
-    0xAA, 0x55, 0xAA, 0x55, 0xAA,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      // 50% block
-    0xFF, 0x55, 0xFF, 0x55, 0xFF,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      // 75% block
+    0x44, 0x28, 0x10, 0x28, 0x44, 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, 0x41, 0x36, 0x08, 0x00, 0x02, 0x01, 0x02, 0x04, 0x02, 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x1E, 0xA1, 0xA1, 0x61, 0x12, 0x3A, 0x40, 0x40, 0x20, 0x7A, 0x38, 0x54, 0x54, 0x55, 0x59, 0x21, 0x55, 0x55, 0x79, 0x41, 0x22, 0x54, 0x54, 0x78, 0x42,                                                                                                                                                                                                                                                                                                             // a-umlaut
+    0x21, 0x55, 0x54, 0x78, 0x40, 0x20, 0x54, 0x55, 0x79, 0x40, 0x0C, 0x1E, 0x52, 0x72, 0x12, 0x39, 0x55, 0x55, 0x55, 0x59, 0x39, 0x54, 0x54, 0x54, 0x59, 0x39, 0x55, 0x54, 0x54, 0x58, 0x00, 0x00, 0x45, 0x7C, 0x41, 0x00, 0x02, 0x45, 0x7D, 0x42, 0x00, 0x01, 0x45, 0x7C, 0x40, 0x7D, 0x12, 0x11, 0x12, 0x7D,                                                                                                                                                                                                                                                                                                                                                                                                       // A-umlaut
+    0xF0, 0x28, 0x25, 0x28, 0xF0, 0x7C, 0x54, 0x55, 0x45, 0x00, 0x20, 0x54, 0x54, 0x7C, 0x54, 0x7C, 0x0A, 0x09, 0x7F, 0x49, 0x32, 0x49, 0x49, 0x49, 0x32, 0x3A, 0x44, 0x44, 0x44, 0x3A,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               // o-umlaut
+    0x32, 0x4A, 0x48, 0x48, 0x30, 0x3A, 0x41, 0x41, 0x21, 0x7A, 0x3A, 0x42, 0x40, 0x20, 0x78, 0x00, 0x9D, 0xA0, 0xA0, 0x7D, 0x3D, 0x42, 0x42, 0x42, 0x3D,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             // O-umlaut
+    0x3D, 0x40, 0x40, 0x40, 0x3D, 0x3C, 0x24, 0xFF, 0x24, 0x24, 0x48, 0x7E, 0x49, 0x43, 0x66, 0x2B, 0x2F, 0xFC, 0x2F, 0x2B, 0xFF, 0x09, 0x29, 0xF6, 0x20, 0xC0, 0x88, 0x7E, 0x09, 0x03, 0x20, 0x54, 0x54, 0x79, 0x41, 0x00, 0x00, 0x44, 0x7D, 0x41, 0x30, 0x48, 0x48, 0x4A, 0x32, 0x38, 0x40, 0x40, 0x22, 0x7A, 0x00, 0x7A, 0x0A, 0x0A, 0x72, 0x7D, 0x0D, 0x19, 0x31, 0x7D, 0x26, 0x29, 0x29, 0x2F, 0x28, 0x26, 0x29, 0x29, 0x29, 0x26, 0x30, 0x48, 0x4D, 0x40, 0x20, 0x38, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x38, 0x2F, 0x10, 0xC8, 0xAC, 0xBA, 0x2F, 0x10, 0x28, 0x34, 0xFA, 0x00, 0x00, 0x7B, 0x00, 0x00, 0x08, 0x14, 0x2A, 0x14, 0x22, 0x22, 0x14, 0x2A, 0x14, 0x08, 0x55, 0x00, 0x55, 0x00, 0x55, // #176 (25% block) missing in old code
+    0xAA, 0x55, 0xAA, 0x55, 0xAA,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     // 50% block
+    0xFF, 0x55, 0xFF, 0x55, 0xFF,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     // 75% block
     0x00, 0x00, 0x00, 0xFF, 0x00, 0x10, 0x10, 0x10, 0xFF, 0x00, 0x14, 0x14, 0x14, 0xFF, 0x00, 0x10, 0x10, 0xFF, 0x00, 0xFF, 0x10, 0x10, 0xF0, 0x10, 0xF0, 0x14, 0x14, 0x14, 0xFC, 0x00, 0x14, 0x14, 0xF7, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x14, 0x14, 0xF4, 0x04, 0xFC, 0x14, 0x14, 0x17, 0x10, 0x1F, 0x10, 0x10, 0x1F, 0x10, 0x1F, 0x14, 0x14, 0x14, 0x1F, 0x00, 0x10, 0x10, 0x10, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x10, 0x10, 0x10, 0x10, 0x1F, 0x10, 0x10, 0x10, 0x10, 0xF0, 0x10, 0x00, 0x00, 0x00, 0xFF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xFF, 0x10, 0x00, 0x00, 0x00, 0xFF, 0x14, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x00, 0x1F, 0x10, 0x17, 0x00, 0x00, 0xFC, 0x04, 0xF4, 0x14, 0x14, 0x17, 0x10, 0x17, 0x14, 0x14, 0xF4, 0x04, 0xF4, 0x00, 0x00, 0xFF, 0x00, 0xF7, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0xF7, 0x00, 0xF7, 0x14, 0x14, 0x14, 0x17, 0x14, 0x10, 0x10, 0x1F, 0x10, 0x1F,
-    0x14, 0x14, 0x14, 0xF4, 0x14, 0x10, 0x10, 0xF0, 0x10, 0xF0, 0x00, 0x00, 0x1F, 0x10, 0x1F, 0x00, 0x00, 0x00, 0x1F, 0x14, 0x00, 0x00, 0x00, 0xFC, 0x14, 0x00, 0x00, 0xF0, 0x10, 0xF0, 0x10, 0x10, 0xFF, 0x10, 0xFF, 0x14, 0x14, 0x14, 0xFF, 0x14, 0x10, 0x10, 0x10, 0x1F, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x38, 0x44, 0x44, 0x38, 0x44, 0xFC, 0x4A, 0x4A, 0x4A, 0x34,                                                                                                                                                                                                                                                                                                                                                                                                       // sharp-s or beta
-    0x7E, 0x02, 0x02, 0x06, 0x06, 0x02, 0x7E, 0x02, 0x7E, 0x02, 0x63, 0x55, 0x49, 0x41, 0x63, 0x38, 0x44, 0x44, 0x3C, 0x04, 0x40, 0x7E, 0x20, 0x1E, 0x20, 0x06, 0x02, 0x7E, 0x02, 0x02, 0x99, 0xA5, 0xE7, 0xA5, 0x99, 0x1C, 0x2A, 0x49, 0x2A, 0x1C, 0x4C, 0x72, 0x01, 0x72, 0x4C, 0x30, 0x4A, 0x4D, 0x4D, 0x30, 0x30, 0x48, 0x78, 0x48, 0x30, 0xBC, 0x62, 0x5A, 0x46, 0x3D, 0x3E, 0x49, 0x49, 0x49, 0x00, 0x7E, 0x01, 0x01, 0x01, 0x7E, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x44, 0x44, 0x5F, 0x44, 0x44, 0x40, 0x51, 0x4A, 0x44, 0x40, 0x40, 0x44, 0x4A, 0x51, 0x40, 0x00, 0x00, 0xFF, 0x01, 0x03, 0xE0, 0x80, 0xFF, 0x00, 0x00, 0x08, 0x08, 0x6B, 0x6B, 0x08, 0x36, 0x12, 0x36, 0x24, 0x36, 0x06, 0x0F, 0x09, 0x0F, 0x06, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x30, 0x40, 0xFF, 0x01, 0x01, 0x00, 0x1F, 0x01, 0x01, 0x1E, 0x00, 0x19, 0x1D, 0x17, 0x12, 0x00, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00  // #255 NBSP
+    0x14, 0x14, 0x14, 0xF4, 0x14, 0x10, 0x10, 0xF0, 0x10, 0xF0, 0x00, 0x00, 0x1F, 0x10, 0x1F, 0x00, 0x00, 0x00, 0x1F, 0x14, 0x00, 0x00, 0x00, 0xFC, 0x14, 0x00, 0x00, 0xF0, 0x10, 0xF0, 0x10, 0x10, 0xFF, 0x10, 0xFF, 0x14, 0x14, 0x14, 0xFF, 0x14, 0x10, 0x10, 0x10, 0x1F, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x38, 0x44, 0x44, 0x38, 0x44, 0xFC, 0x4A, 0x4A, 0x4A, 0x34,                                                                                                                                                                                                                                                                                                                                                                                                      // sharp-s or beta
+    0x7E, 0x02, 0x02, 0x06, 0x06, 0x02, 0x7E, 0x02, 0x7E, 0x02, 0x63, 0x55, 0x49, 0x41, 0x63, 0x38, 0x44, 0x44, 0x3C, 0x04, 0x40, 0x7E, 0x20, 0x1E, 0x20, 0x06, 0x02, 0x7E, 0x02, 0x02, 0x99, 0xA5, 0xE7, 0xA5, 0x99, 0x1C, 0x2A, 0x49, 0x2A, 0x1C, 0x4C, 0x72, 0x01, 0x72, 0x4C, 0x30, 0x4A, 0x4D, 0x4D, 0x30, 0x30, 0x48, 0x78, 0x48, 0x30, 0xBC, 0x62, 0x5A, 0x46, 0x3D, 0x3E, 0x49, 0x49, 0x49, 0x00, 0x7E, 0x01, 0x01, 0x01, 0x7E, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x44, 0x44, 0x5F, 0x44, 0x44, 0x40, 0x51, 0x4A, 0x44, 0x40, 0x40, 0x44, 0x4A, 0x51, 0x40, 0x00, 0x00, 0xFF, 0x01, 0x03, 0xE0, 0x80, 0xFF, 0x00, 0x00, 0x08, 0x08, 0x6B, 0x6B, 0x08, 0x36, 0x12, 0x36, 0x24, 0x36, 0x06, 0x0F, 0x09, 0x0F, 0x06, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x30, 0x40, 0xFF, 0x01, 0x01, 0x00, 0x1F, 0x01, 0x01, 0x1E, 0x00, 0x19, 0x1D, 0x17, 0x12, 0x00, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00 // #255 NBSP
 };
diff --git a/platforms/avr/drivers/hd44780.c b/platforms/avr/drivers/hd44780.c
index f71069dece..f15d7d0da8 100644
--- a/platforms/avr/drivers/hd44780.c
+++ b/platforms/avr/drivers/hd44780.c
@@ -262,7 +262,7 @@ static uint8_t lcd_waitbusy(void)
     delay(LCD_DELAY_BUSY_FLAG);
 
     /* now read the address counter */
-    return (lcd_read(0));  // return address counter
+    return (lcd_read(0)); // return address counter
 
 } /* lcd_waitbusy */
 
@@ -362,17 +362,23 @@ void lcd_gotoxy(uint8_t x, uint8_t y) {
 
 /*************************************************************************
 *************************************************************************/
-int lcd_getxy(void) { return lcd_waitbusy(); }
+int lcd_getxy(void) {
+    return lcd_waitbusy();
+}
 
 /*************************************************************************
 Clear display and set cursor to home position
 *************************************************************************/
-void lcd_clrscr(void) { lcd_command(1 << LCD_CLR); }
+void lcd_clrscr(void) {
+    lcd_command(1 << LCD_CLR);
+}
 
 /*************************************************************************
 Set cursor to home position
 *************************************************************************/
-void lcd_home(void) { lcd_command(1 << LCD_HOME); }
+void lcd_home(void) {
+    lcd_command(1 << LCD_HOME);
+}
 
 /*************************************************************************
 Display character at current cursor position
@@ -382,7 +388,7 @@ Returns:  none
 void lcd_putc(char c) {
     uint8_t pos;
 
-    pos = lcd_waitbusy();  // read busy-flag and address counter
+    pos = lcd_waitbusy(); // read busy-flag and address counter
     if (c == '\n') {
         lcd_newline(pos);
     } else {
@@ -483,8 +489,8 @@ void lcd_init(uint8_t dispAttr) {
     delay(LCD_DELAY_BOOTUP); /* wait 16ms or more after power-on       */
 
     /* initial write to lcd is 8bit */
-    LCD_DATA1_PORT |= _BV(LCD_DATA1_PIN);  // LCD_FUNCTION>>4;
-    LCD_DATA0_PORT |= _BV(LCD_DATA0_PIN);  // LCD_FUNCTION_8BIT>>4;
+    LCD_DATA1_PORT |= _BV(LCD_DATA1_PIN); // LCD_FUNCTION>>4;
+    LCD_DATA0_PORT |= _BV(LCD_DATA0_PIN); // LCD_FUNCTION_8BIT>>4;
     lcd_e_toggle();
     delay(LCD_DELAY_INIT); /* delay, busy flag can't be checked here */
 
@@ -497,7 +503,7 @@ void lcd_init(uint8_t dispAttr) {
     delay(LCD_DELAY_INIT_REP); /* delay, busy flag can't be checked here */
 
     /* now configure for 4bit mode */
-    LCD_DATA0_PORT &= ~_BV(LCD_DATA0_PIN);  // LCD_FUNCTION_4BIT_1LINE>>4
+    LCD_DATA0_PORT &= ~_BV(LCD_DATA0_PIN); // LCD_FUNCTION_4BIT_1LINE>>4
     lcd_e_toggle();
     delay(LCD_DELAY_INIT_4BIT); /* some displays need this additional delay */
 
diff --git a/platforms/avr/drivers/i2c_master.c b/platforms/avr/drivers/i2c_master.c
index d4024378ca..c1a7b5f72d 100644
--- a/platforms/avr/drivers/i2c_master.c
+++ b/platforms/avr/drivers/i2c_master.c
@@ -25,12 +25,12 @@
 #include "wait.h"
 
 #ifndef F_SCL
-#    define F_SCL 400000UL  // SCL frequency
+#    define F_SCL 400000UL // SCL frequency
 #endif
 
 #ifndef I2C_START_RETRY_COUNT
 #    define I2C_START_RETRY_COUNT 20
-#endif  // I2C_START_RETRY_COUNT
+#endif // I2C_START_RETRY_COUNT
 
 #define I2C_ACTION_READ 0x01
 #define I2C_ACTION_WRITE 0x00
@@ -98,7 +98,7 @@ static i2c_status_t i2c_start_impl(uint8_t address, uint16_t timeout) {
 i2c_status_t i2c_start(uint8_t address, uint16_t timeout) {
     // Retry i2c_start_impl a bunch times in case the remote side has interrupts disabled.
     uint16_t     timeout_timer = timer_read();
-    uint16_t     time_slice    = MAX(1, (timeout == (I2C_TIMEOUT_INFINITE)) ? 5 : (timeout / (I2C_START_RETRY_COUNT)));  // if it's infinite, wait 1ms between attempts, otherwise split up the entire timeout into the number of retries
+    uint16_t     time_slice    = MAX(1, (timeout == (I2C_TIMEOUT_INFINITE)) ? 5 : (timeout / (I2C_START_RETRY_COUNT))); // if it's infinite, wait 1ms between attempts, otherwise split up the entire timeout into the number of retries
     i2c_status_t status;
     do {
         status = i2c_start_impl(address, time_slice);
diff --git a/platforms/avr/drivers/i2c_slave.c b/platforms/avr/drivers/i2c_slave.c
index 2907f164c0..660d271be2 100644
--- a/platforms/avr/drivers/i2c_slave.c
+++ b/platforms/avr/drivers/i2c_slave.c
@@ -29,7 +29,7 @@
 #    include "transactions.h"
 
 static volatile bool is_callback_executor = false;
-#endif  // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
+#endif // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
 
 volatile uint8_t i2c_slave_reg[I2C_SLAVE_REG_COUNT];
 
@@ -57,7 +57,7 @@ ISR(TWI_vect) {
             slave_has_register_set = false;
 #if defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
             is_callback_executor = false;
-#endif  // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
+#endif // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
             break;
 
         case TW_SR_DATA_ACK:
@@ -66,16 +66,16 @@ ISR(TWI_vect) {
             if (!slave_has_register_set) {
                 buffer_address = TWDR;
 
-                if (buffer_address >= I2C_SLAVE_REG_COUNT) {  // address out of bounds dont ack
+                if (buffer_address >= I2C_SLAVE_REG_COUNT) { // address out of bounds dont ack
                     ack            = 0;
                     buffer_address = 0;
                 }
-                slave_has_register_set = true;  // address has been received now fill in buffer
+                slave_has_register_set = true; // address has been received now fill in buffer
 
 #if defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
                 // Work out if we're attempting to execute a callback
                 is_callback_executor = buffer_address == split_transaction_table[I2C_EXECUTE_CALLBACK].initiator2target_offset;
-#endif  // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
+#endif // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
             } else {
                 i2c_slave_reg[buffer_address] = TWDR;
                 buffer_address++;
@@ -88,7 +88,7 @@ ISR(TWI_vect) {
                         trans->slave_callback(trans->initiator2target_buffer_size, split_trans_initiator2target_buffer(trans), trans->target2initiator_buffer_size, split_trans_target2initiator_buffer(trans));
                     }
                 }
-#endif  // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
+#endif // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
             }
             break;
 
diff --git a/platforms/avr/drivers/i2c_slave.h b/platforms/avr/drivers/i2c_slave.h
index a8647c9da3..178b6a29df 100644
--- a/platforms/avr/drivers/i2c_slave.h
+++ b/platforms/avr/drivers/i2c_slave.h
@@ -27,11 +27,11 @@
 #    if defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
 #        include "transport.h"
 #        define I2C_SLAVE_REG_COUNT sizeof(split_shared_memory_t)
-#    else  // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
+#    else // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
 #        define I2C_SLAVE_REG_COUNT 30
-#    endif  // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
+#    endif // defined(USE_I2C) && defined(SPLIT_COMMON_TRANSACTIONS)
 
-#endif  // I2C_SLAVE_REG_COUNT
+#endif // I2C_SLAVE_REG_COUNT
 
 _Static_assert(I2C_SLAVE_REG_COUNT < 256, "I2C target registers must be single byte");
 
diff --git a/platforms/avr/drivers/ps2/ps2_io.c b/platforms/avr/drivers/ps2/ps2_io.c
index 7c826fbf1a..b75a1ab0be 100644
--- a/platforms/avr/drivers/ps2/ps2_io.c
+++ b/platforms/avr/drivers/ps2/ps2_io.c
@@ -23,7 +23,9 @@ void clock_lo(void) {
     setPinOutput(PS2_CLOCK_PIN);
 }
 
-void clock_hi(void) { setPinInputHigh(PS2_CLOCK_PIN); }
+void clock_hi(void) {
+    setPinInputHigh(PS2_CLOCK_PIN);
+}
 
 bool clock_in(void) {
     setPinInputHigh(PS2_CLOCK_PIN);
@@ -42,7 +44,9 @@ void data_lo(void) {
     setPinOutput(PS2_DATA_PIN);
 }
 
-void data_hi(void) { setPinInputHigh(PS2_DATA_PIN); }
+void data_hi(void) {
+    setPinInputHigh(PS2_DATA_PIN);
+}
 
 bool data_in(void) {
     setPinInputHigh(PS2_DATA_PIN);
diff --git a/platforms/avr/drivers/ps2/ps2_usart.c b/platforms/avr/drivers/ps2/ps2_usart.c
index 151cfcd68f..39ec930d4a 100644
--- a/platforms/avr/drivers/ps2/ps2_usart.c
+++ b/platforms/avr/drivers/ps2/ps2_usart.c
@@ -76,7 +76,7 @@ static inline bool    pbuf_has_data(void);
 static inline void    pbuf_clear(void);
 
 void ps2_host_init(void) {
-    idle();  // without this many USART errors occur when cable is disconnected
+    idle(); // without this many USART errors occur when cable is disconnected
     PS2_USART_INIT();
     PS2_USART_RX_INT_ON();
     // POR(150-2000ms) plus BAT(300-500ms) may take 2.5sec([3]p.20)
@@ -91,12 +91,12 @@ uint8_t ps2_host_send(uint8_t data) {
 
     /* terminate a transmission if we have */
     inhibit();
-    _delay_us(100);  // [4]p.13
+    _delay_us(100); // [4]p.13
 
     /* 'Request to Send' and Start bit */
     data_lo();
     clock_hi();
-    WAIT(clock_lo, 10000, 10);  // 10ms [5]p.50
+    WAIT(clock_lo, 10000, 10); // 10ms [5]p.50
 
     /* Data bit[2-9] */
     for (uint8_t i = 0; i < 8; i++) {
@@ -165,7 +165,7 @@ uint8_t ps2_host_recv(void) {
 
 ISR(PS2_USART_RX_VECT) {
     // TODO: request RESEND when error occurs?
-    uint8_t error = PS2_USART_ERROR;  // USART error should be read before data
+    uint8_t error = PS2_USART_ERROR; // USART error should be read before data
     uint8_t data  = PS2_USART_RX_DATA;
     if (!error) {
         pbuf_enqueue(data);
diff --git a/platforms/avr/drivers/serial.c b/platforms/avr/drivers/serial.c
index 62908e5875..6a36aa5f7f 100644
--- a/platforms/avr/drivers/serial.c
+++ b/platforms/avr/drivers/serial.c
@@ -156,59 +156,59 @@
 
 #        if SELECT_SOFT_SERIAL_SPEED == 0
 // Very High speed
-#            define SERIAL_DELAY 4  // micro sec
+#            define SERIAL_DELAY 4 // micro sec
 #            if __GNUC__ < 6
-#                define READ_WRITE_START_ADJUST 33  // cycles
-#                define READ_WRITE_WIDTH_ADJUST 3   // cycles
+#                define READ_WRITE_START_ADJUST 33 // cycles
+#                define READ_WRITE_WIDTH_ADJUST 3  // cycles
 #            else
-#                define READ_WRITE_START_ADJUST 34  // cycles
-#                define READ_WRITE_WIDTH_ADJUST 7   // cycles
+#                define READ_WRITE_START_ADJUST 34 // cycles
+#                define READ_WRITE_WIDTH_ADJUST 7  // cycles
 #            endif
 #        elif SELECT_SOFT_SERIAL_SPEED == 1
 // High speed
-#            define SERIAL_DELAY 6  // micro sec
+#            define SERIAL_DELAY 6 // micro sec
 #            if __GNUC__ < 6
-#                define READ_WRITE_START_ADJUST 30  // cycles
-#                define READ_WRITE_WIDTH_ADJUST 3   // cycles
+#                define READ_WRITE_START_ADJUST 30 // cycles
+#                define READ_WRITE_WIDTH_ADJUST 3  // cycles
 #            else
-#                define READ_WRITE_START_ADJUST 33  // cycles
-#                define READ_WRITE_WIDTH_ADJUST 7   // cycles
+#                define READ_WRITE_START_ADJUST 33 // cycles
+#                define READ_WRITE_WIDTH_ADJUST 7  // cycles
 #            endif
 #        elif SELECT_SOFT_SERIAL_SPEED == 2
 // Middle speed
-#            define SERIAL_DELAY 12             // micro sec
-#            define READ_WRITE_START_ADJUST 30  // cycles
+#            define SERIAL_DELAY 12            // micro sec
+#            define READ_WRITE_START_ADJUST 30 // cycles
 #            if __GNUC__ < 6
-#                define READ_WRITE_WIDTH_ADJUST 3  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 3 // cycles
 #            else
-#                define READ_WRITE_WIDTH_ADJUST 7  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 7 // cycles
 #            endif
 #        elif SELECT_SOFT_SERIAL_SPEED == 3
 // Low speed
-#            define SERIAL_DELAY 24             // micro sec
-#            define READ_WRITE_START_ADJUST 30  // cycles
+#            define SERIAL_DELAY 24            // micro sec
+#            define READ_WRITE_START_ADJUST 30 // cycles
 #            if __GNUC__ < 6
-#                define READ_WRITE_WIDTH_ADJUST 3  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 3 // cycles
 #            else
-#                define READ_WRITE_WIDTH_ADJUST 7  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 7 // cycles
 #            endif
 #        elif SELECT_SOFT_SERIAL_SPEED == 4
 // Very Low speed
-#            define SERIAL_DELAY 36             // micro sec
-#            define READ_WRITE_START_ADJUST 30  // cycles
+#            define SERIAL_DELAY 36            // micro sec
+#            define READ_WRITE_START_ADJUST 30 // cycles
 #            if __GNUC__ < 6
-#                define READ_WRITE_WIDTH_ADJUST 3  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 3 // cycles
 #            else
-#                define READ_WRITE_WIDTH_ADJUST 7  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 7 // cycles
 #            endif
 #        elif SELECT_SOFT_SERIAL_SPEED == 5
 // Ultra Low speed
-#            define SERIAL_DELAY 48             // micro sec
-#            define READ_WRITE_START_ADJUST 30  // cycles
+#            define SERIAL_DELAY 48            // micro sec
+#            define READ_WRITE_START_ADJUST 30 // cycles
 #            if __GNUC__ < 6
-#                define READ_WRITE_WIDTH_ADJUST 3  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 3 // cycles
 #            else
-#                define READ_WRITE_WIDTH_ADJUST 7  // cycles
+#                define READ_WRITE_WIDTH_ADJUST 7 // cycles
 #            endif
 #        else
 #            error invalid SELECT_SOFT_SERIAL_SPEED value
@@ -223,29 +223,45 @@
 #    define SLAVE_INT_ACK_WIDTH 4
 
 inline static void serial_delay(void) ALWAYS_INLINE;
-inline static void serial_delay(void) { _delay_us(SERIAL_DELAY); }
+inline static void serial_delay(void) {
+    _delay_us(SERIAL_DELAY);
+}
 
 inline static void serial_delay_half1(void) ALWAYS_INLINE;
-inline static void serial_delay_half1(void) { _delay_us(SERIAL_DELAY_HALF1); }
+inline static void serial_delay_half1(void) {
+    _delay_us(SERIAL_DELAY_HALF1);
+}
 
 inline static void serial_delay_half2(void) ALWAYS_INLINE;
-inline static void serial_delay_half2(void) { _delay_us(SERIAL_DELAY_HALF2); }
+inline static void serial_delay_half2(void) {
+    _delay_us(SERIAL_DELAY_HALF2);
+}
 
 inline static void serial_output(void) ALWAYS_INLINE;
-inline static void serial_output(void) { setPinOutput(SOFT_SERIAL_PIN); }
+inline static void serial_output(void) {
+    setPinOutput(SOFT_SERIAL_PIN);
+}
 
 // make the serial pin an input with pull-up resistor
 inline static void serial_input_with_pullup(void) ALWAYS_INLINE;
-inline static void serial_input_with_pullup(void) { setPinInputHigh(SOFT_SERIAL_PIN); }
+inline static void serial_input_with_pullup(void) {
+    setPinInputHigh(SOFT_SERIAL_PIN);
+}
 
 inline static uint8_t serial_read_pin(void) ALWAYS_INLINE;
-inline static uint8_t serial_read_pin(void) { return !!readPin(SOFT_SERIAL_PIN); }
+inline static uint8_t serial_read_pin(void) {
+    return !!readPin(SOFT_SERIAL_PIN);
+}
 
 inline static void serial_low(void) ALWAYS_INLINE;
-inline static void serial_low(void) { writePinLow(SOFT_SERIAL_PIN); }
+inline static void serial_low(void) {
+    writePinLow(SOFT_SERIAL_PIN);
+}
 
 inline static void serial_high(void) ALWAYS_INLINE;
-inline static void serial_high(void) { writePinHigh(SOFT_SERIAL_PIN); }
+inline static void serial_high(void) {
+    writePinHigh(SOFT_SERIAL_PIN);
+}
 
 void soft_serial_initiator_init(void) {
     serial_output();
@@ -286,7 +302,7 @@ static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) {
 
     _delay_sub_us(READ_WRITE_START_ADJUST);
     for (i = 0, byte = 0, p = PARITY; i < bit; i++) {
-        serial_delay_half1();  // read the middle of pulses
+        serial_delay_half1(); // read the middle of pulses
         if (serial_read_pin()) {
             byte = (byte << 1) | 1;
             p ^= 1;
@@ -298,7 +314,7 @@ static uint8_t serial_read_chunk(uint8_t *pterrcount, uint8_t bit) {
         serial_delay_half2();
     }
     /* recive parity bit */
-    serial_delay_half1();  // read the middle of pulses
+    serial_delay_half1(); // read the middle of pulses
     pb = serial_read_pin();
     _delay_sub_us(READ_WRITE_WIDTH_ADJUST);
     serial_delay_half2();
@@ -330,7 +346,7 @@ void serial_write_chunk(uint8_t data, uint8_t bit) {
     }
     serial_delay();
 
-    serial_low();  // sync_send() / senc_recv() need raise edge
+    serial_low(); // sync_send() / senc_recv() need raise edge
 }
 
 static void serial_send_packet(uint8_t *buffer, uint8_t size) NO_INLINE;
@@ -356,19 +372,19 @@ static uint8_t serial_recive_packet(uint8_t *buffer, uint8_t size) {
 }
 
 inline static void change_sender2reciver(void) {
-    sync_send();                 // 0
-    serial_delay_half1();        // 1
-    serial_low();                // 2
-    serial_input_with_pullup();  // 2
-    serial_delay_half1();        // 3
+    sync_send();                // 0
+    serial_delay_half1();       // 1
+    serial_low();               // 2
+    serial_input_with_pullup(); // 2
+    serial_delay_half1();       // 3
 }
 
 inline static void change_reciver2sender(void) {
-    sync_recv();           // 0
-    serial_delay();        // 1
-    serial_low();          // 3
-    serial_output();       // 3
-    serial_delay_half1();  // 4
+    sync_recv();          // 0
+    serial_delay();       // 1
+    serial_low();         // 3
+    serial_output();      // 3
+    serial_delay_half1(); // 4
 }
 
 static inline uint8_t nibble_bits_count(uint8_t bits) {
@@ -391,11 +407,11 @@ ISR(SERIAL_PIN_INTERRUPT) {
     }
     serial_delay_half1();
 
-    serial_high();  // response step1 low->high
+    serial_high(); // response step1 low->high
     serial_output();
     _delay_sub_us(SLAVE_INT_ACK_WIDTH_UNIT * SLAVE_INT_ACK_WIDTH);
     split_transaction_desc_t *trans = &split_transaction_table[tid];
-    serial_low();  // response step2 ack high->low
+    serial_low(); // response step2 ack high->low
 
     // If the transaction has a callback, we can execute it now
     if (trans->slave_callback) {
@@ -412,7 +428,7 @@ ISR(SERIAL_PIN_INTERRUPT) {
         serial_recive_packet((uint8_t *)split_trans_initiator2target_buffer(trans), trans->initiator2target_buffer_size);
     }
 
-    sync_recv();  // weit initiator output to high
+    sync_recv(); // weit initiator output to high
 }
 
 /////////
diff --git a/platforms/avr/drivers/spi_master.c b/platforms/avr/drivers/spi_master.c
index 4e8fd3bcdf..ae9df03c02 100644
--- a/platforms/avr/drivers/spi_master.c
+++ b/platforms/avr/drivers/spi_master.c
@@ -125,7 +125,7 @@ spi_status_t spi_write(uint8_t data) {
 }
 
 spi_status_t spi_read() {
-    SPDR = 0x00;  // Dummy
+    SPDR = 0x00; // Dummy
 
     uint16_t timeout_timer = timer_read();
     while (!(SPSR & _BV(SPIF))) {
diff --git a/platforms/avr/drivers/ssd1306.c b/platforms/avr/drivers/ssd1306.c
index 1a09a2bcb7..7afbc09f00 100644
--- a/platforms/avr/drivers/ssd1306.c
+++ b/platforms/avr/drivers/ssd1306.c
@@ -161,7 +161,7 @@ bool iota_gfx_init(void) {
     send_cmd1(DeActivateScroll);
     send_cmd1(DisplayOn);
 
-    send_cmd2(SetContrast, 0);  // Dim
+    send_cmd2(SetContrast, 0); // Dim
 
     clear_display();
 
@@ -226,7 +226,9 @@ void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c) {
     matrix_write_char_inner(matrix, c);
 }
 
-void iota_gfx_write_char(uint8_t c) { matrix_write_char(&display, c); }
+void iota_gfx_write_char(uint8_t c) {
+    matrix_write_char(&display, c);
+}
 
 void matrix_write(struct CharacterMatrix *matrix, const char *data) {
     const char *end = data + strlen(data);
@@ -236,7 +238,9 @@ void matrix_write(struct CharacterMatrix *matrix, const char *data) {
     }
 }
 
-void iota_gfx_write(const char *data) { matrix_write(&display, data); }
+void iota_gfx_write(const char *data) {
+    matrix_write(&display, data);
+}
 
 void matrix_write_P(struct CharacterMatrix *matrix, const char *data) {
     while (true) {
@@ -249,7 +253,9 @@ void matrix_write_P(struct CharacterMatrix *matrix, const char *data) {
     }
 }
 
-void iota_gfx_write_P(const char *data) { matrix_write_P(&display, data); }
+void iota_gfx_write_P(const char *data) {
+    matrix_write_P(&display, data);
+}
 
 void matrix_clear(struct CharacterMatrix *matrix) {
     memset(matrix->display, ' ', sizeof(matrix->display));
@@ -257,7 +263,9 @@ void matrix_clear(struct CharacterMatrix *matrix) {
     matrix->dirty  = true;
 }
 
-void iota_gfx_clear_screen(void) { matrix_clear(&display); }
+void iota_gfx_clear_screen(void) {
+    matrix_clear(&display);
+}
 
 void matrix_render(struct CharacterMatrix *matrix) {
     last_flush = timer_read();
@@ -301,7 +309,9 @@ done:
 #    endif
 }
 
-void iota_gfx_flush(void) { matrix_render(&display); }
+void iota_gfx_flush(void) {
+    matrix_render(&display);
+}
 
 __attribute__((weak)) void iota_gfx_task_user(void) {}
 
diff --git a/platforms/avr/drivers/uart.c b/platforms/avr/drivers/uart.c
index 01cf6b1fb8..fd5caf9a78 100644
--- a/platforms/avr/drivers/uart.c
+++ b/platforms/avr/drivers/uart.c
@@ -108,7 +108,7 @@ void uart_write(uint8_t data) {
     // return immediately to avoid deadlock when interrupt is disabled(called from ISR)
     if (tx_buffer_tail == i && (SREG & (1 << SREG_I)) == 0) return;
     while (tx_buffer_tail == i)
-        ;  // wait until space in buffer
+        ; // wait until space in buffer
     // cli();
     tx_buffer[i]   = data;
     tx_buffer_head = i;
@@ -121,7 +121,7 @@ uint8_t uart_read(void) {
     uint8_t data, i;
 
     while (rx_buffer_head == rx_buffer_tail)
-        ;  // wait for character
+        ; // wait for character
     i = rx_buffer_tail + 1;
     if (i >= RX_BUFFER_SIZE) i = 0;
     data           = rx_buffer[i];
diff --git a/platforms/avr/drivers/ws2812.c b/platforms/avr/drivers/ws2812.c
index 9150b3c520..c461ab3ba7 100644
--- a/platforms/avr/drivers/ws2812.c
+++ b/platforms/avr/drivers/ws2812.c
@@ -110,7 +110,7 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t
 
         asm volatile("       ldi   %0,8  \n\t"
                      "loop%=:            \n\t"
-                     "       out   %2,%3 \n\t"  //  '1' [01] '0' [01] - re
+                     "       out   %2,%3 \n\t" //  '1' [01] '0' [01] - re
 #if (w1_nops & 1)
                      w_nop1
 #endif
@@ -126,9 +126,9 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t
 #if (w1_nops & 16)
                                      w_nop16
 #endif
-                     "       sbrs  %1,7  \n\t"  //  '1' [03] '0' [02]
-                     "       out   %2,%4 \n\t"  //  '1' [--] '0' [03] - fe-low
-                     "       lsl   %1    \n\t"  //  '1' [04] '0' [04]
+                     "       sbrs  %1,7  \n\t" //  '1' [03] '0' [02]
+                     "       out   %2,%4 \n\t" //  '1' [--] '0' [03] - fe-low
+                     "       lsl   %1    \n\t" //  '1' [04] '0' [04]
 #if (w2_nops & 1)
                      w_nop1
 #endif
@@ -144,7 +144,7 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t
 #if (w2_nops & 16)
                                      w_nop16
 #endif
-                     "       out   %2,%4 \n\t"  //  '1' [+1] '0' [+1] - fe-high
+                     "       out   %2,%4 \n\t" //  '1' [+1] '0' [+1] - fe-high
 #if (w3_nops & 1)
                      w_nop1
 #endif
@@ -161,8 +161,8 @@ static inline void ws2812_sendarray_mask(uint8_t *data, uint16_t datlen, uint8_t
                                      w_nop16
 #endif
 
-                     "       dec   %0    \n\t"  //  '1' [+2] '0' [+2]
-                     "       brne  loop%=\n\t"  //  '1' [+3] '0' [+4]
+                     "       dec   %0    \n\t" //  '1' [+2] '0' [+2]
+                     "       brne  loop%=\n\t" //  '1' [+3] '0' [+4]
                      : "=&d"(ctr)
                      : "r"(curbyte), "I"(_SFR_IO_ADDR(PORTx_ADDRESS(RGB_DI_PIN))), "r"(maskhi), "r"(masklo));
     }
diff --git a/platforms/avr/drivers/ws2812_i2c.c b/platforms/avr/drivers/ws2812_i2c.c
index 1c332e24b6..709f382254 100644
--- a/platforms/avr/drivers/ws2812_i2c.c
+++ b/platforms/avr/drivers/ws2812_i2c.c
@@ -13,7 +13,9 @@
 #    define WS2812_TIMEOUT 100
 #endif
 
-void ws2812_init(void) { i2c_init(); }
+void ws2812_init(void) {
+    i2c_init();
+}
 
 // Setleds for standard RGB
 void ws2812_setleds(LED_TYPE *ledarray, uint16_t leds) {
diff --git a/platforms/avr/pin_defs.h b/platforms/avr/pin_defs.h
index 23d948041d..3889704a87 100644
--- a/platforms/avr/pin_defs.h
+++ b/platforms/avr/pin_defs.h
@@ -17,7 +17,7 @@
 
 #include <avr/io.h>
 
-#define PORT_SHIFTER 4  // this may be 4 for all AVR chips
+#define PORT_SHIFTER 4 // this may be 4 for all AVR chips
 
 // If you want to add more to this list, reference the PINx definitions in these header
 // files: https://github.com/vancegroup-mirrors/avr-libc/tree/master/avr-libc/include/avr
diff --git a/platforms/avr/printf.c b/platforms/avr/printf.c
index 9ad7a38693..062f70fa0b 100644
--- a/platforms/avr/printf.c
+++ b/platforms/avr/printf.c
@@ -17,4 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "xprintf.h"
 #include "sendchar.h"
 
-void print_set_sendchar(sendchar_func_t func) { xdev_out(func); }
+void print_set_sendchar(sendchar_func_t func) {
+    xdev_out(func);
+}
diff --git a/platforms/avr/sleep_led.c b/platforms/avr/sleep_led.c
index 9a3b52abe5..b05431633b 100644
--- a/platforms/avr/sleep_led.c
+++ b/platforms/avr/sleep_led.c
@@ -12,7 +12,7 @@
 #if SLEEP_LED_TIMER == 1
 #    define TCCRxB TCCR1B
 #    define TIMERx_COMPA_vect TIMER1_COMPA_vect
-#    if defined(__AVR_ATmega32A__)  // This MCU has only one TIMSK register
+#    if defined(__AVR_ATmega32A__) // This MCU has only one TIMSK register
 #        define TIMSKx TIMSK
 #    else
 #        define TIMSKx TIMSK1
diff --git a/platforms/avr/suspend.c b/platforms/avr/suspend.c
index b615979439..1a7cd3b4ab 100644
--- a/platforms/avr/suspend.c
+++ b/platforms/avr/suspend.c
@@ -81,7 +81,7 @@ ISR(WDT_vect) {
     // compensate timer for sleep
     switch (wdt_timeout) {
         case WDTO_15MS:
-            timer_count += 15 + 2;  // WDTO_15MS + 2(from observation)
+            timer_count += 15 + 2; // WDTO_15MS + 2(from observation)
             break;
         default:;
     }
diff --git a/platforms/avr/timer.c b/platforms/avr/timer.c
index c2e6c6e081..9fb671ae8d 100644
--- a/platforms/avr/timer.c
+++ b/platforms/avr/timer.c
@@ -73,7 +73,9 @@ void timer_init(void) {
  * FIXME: needs doc
  */
 inline void timer_clear(void) {
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { timer_count = 0; }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        timer_count = 0;
+    }
 }
 
 /** \brief timer read
@@ -83,7 +85,9 @@ inline void timer_clear(void) {
 inline uint16_t timer_read(void) {
     uint32_t t;
 
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { t = timer_count; }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        t = timer_count;
+    }
 
     return (t & 0xFFFF);
 }
@@ -95,7 +99,9 @@ inline uint16_t timer_read(void) {
 inline uint32_t timer_read32(void) {
     uint32_t t;
 
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { t = timer_count; }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        t = timer_count;
+    }
 
     return t;
 }
@@ -107,7 +113,9 @@ inline uint32_t timer_read32(void) {
 inline uint16_t timer_elapsed(uint16_t last) {
     uint32_t t;
 
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { t = timer_count; }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        t = timer_count;
+    }
 
     return TIMER_DIFF_16((t & 0xFFFF), last);
 }
@@ -119,7 +127,9 @@ inline uint16_t timer_elapsed(uint16_t last) {
 inline uint32_t timer_elapsed32(uint32_t last) {
     uint32_t t;
 
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { t = timer_count; }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        t = timer_count;
+    }
 
     return TIMER_DIFF_32(t, last);
 }
@@ -130,4 +140,6 @@ inline uint32_t timer_elapsed32(uint32_t last) {
 #else
 #    define TIMER_INTERRUPT_VECTOR TIMER0_COMP_vect
 #endif
-ISR(TIMER_INTERRUPT_VECTOR, ISR_NOBLOCK) { timer_count++; }
+ISR(TIMER_INTERRUPT_VECTOR, ISR_NOBLOCK) {
+    timer_count++;
+}
diff --git a/platforms/chibios/bootloaders/stm32_dfu.c b/platforms/chibios/bootloaders/stm32_dfu.c
index 0a113570f7..0e74111367 100644
--- a/platforms/chibios/bootloaders/stm32_dfu.c
+++ b/platforms/chibios/bootloaders/stm32_dfu.c
@@ -72,7 +72,7 @@ void enter_bootloader_mode_if_requested(void) {}
 #    define MAGIC_ADDR (unsigned long *)(SYMVAL(__ram0_end__) - 4)
 
 __attribute__((weak)) void bootloader_jump(void) {
-    *MAGIC_ADDR = BOOTLOADER_MAGIC;  // set magic flag => reset handler will jump into boot loader
+    *MAGIC_ADDR = BOOTLOADER_MAGIC; // set magic flag => reset handler will jump into boot loader
     NVIC_SystemReset();
 }
 
diff --git a/platforms/chibios/bootloaders/stm32duino.c b/platforms/chibios/bootloaders/stm32duino.c
index dd1d551fa9..53d3ba0adb 100644
--- a/platforms/chibios/bootloaders/stm32duino.c
+++ b/platforms/chibios/bootloaders/stm32duino.c
@@ -18,4 +18,6 @@
 
 #include <ch.h>
 
-__attribute__((weak)) void bootloader_jump(void) { NVIC_SystemReset(); }
+__attribute__((weak)) void bootloader_jump(void) {
+    NVIC_SystemReset();
+}
diff --git a/platforms/chibios/chibios_config.h b/platforms/chibios/chibios_config.h
index 4e35736606..67d7541ba2 100644
--- a/platforms/chibios/chibios_config.h
+++ b/platforms/chibios/chibios_config.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #ifndef USB_VBUS_PIN
-#    define SPLIT_USB_DETECT  // Force this on when dedicated pin is not used
+#    define SPLIT_USB_DETECT // Force this on when dedicated pin is not used
 #endif
 
 // STM32 compatibility
@@ -76,7 +76,7 @@
 
 #    if defined(K20x) || defined(KL2x)
 #        define USE_I2CV1
-#        define USE_I2CV1_CONTRIB  // for some reason a bunch of ChibiOS-Contrib boards only have clock_speed
+#        define USE_I2CV1_CONTRIB // for some reason a bunch of ChibiOS-Contrib boards only have clock_speed
 #        define USE_GPIOV1
 #    endif
 #endif
diff --git a/platforms/chibios/drivers/analog.c b/platforms/chibios/drivers/analog.c
index eb437665f1..48a59fd290 100644
--- a/platforms/chibios/drivers/analog.c
+++ b/platforms/chibios/drivers/analog.c
@@ -101,9 +101,9 @@
 
 // Options are 12, 10, 8, and 6 bit.
 #ifndef ADC_RESOLUTION
-#    ifdef ADC_CFGR_RES_10BITS  // ADCv3, ADCv4
+#    ifdef ADC_CFGR_RES_10BITS // ADCv3, ADCv4
 #        define ADC_RESOLUTION ADC_CFGR_RES_10BITS
-#    else  // ADCv1, ADCv5, or the bodge for ADCv2 above
+#    else // ADCv1, ADCv5, or the bodge for ADCv2 above
 #        define ADC_RESOLUTION ADC_CFGR1_RES_10BIT
 #    endif
 #endif
@@ -123,7 +123,7 @@ static ADCConversionGroup adcConversionGroup = {
     .smpr  = ADC_SAMPLING_RATE,
 #elif defined(USE_ADCV2)
 #    if !defined(STM32F1XX) && !defined(GD32VF103)
-    .cr2   = ADC_CR2_SWSTART,  // F103 seem very unhappy with, F401 seems very unhappy without...
+    .cr2   = ADC_CR2_SWSTART, // F103 seem very unhappy with, F401 seems very unhappy without...
 #    endif
     .smpr2 = ADC_SMPR2_SMP_AN0(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN1(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN2(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN3(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN4(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN5(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN6(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN7(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN8(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN9(ADC_SAMPLING_RATE),
     .smpr1 = ADC_SMPR1_SMP_AN10(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN11(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN12(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN13(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN14(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN15(ADC_SAMPLING_RATE),
diff --git a/platforms/chibios/drivers/analog.h b/platforms/chibios/drivers/analog.h
index e61c394265..8a821719e3 100644
--- a/platforms/chibios/drivers/analog.h
+++ b/platforms/chibios/drivers/analog.h
@@ -28,7 +28,9 @@ typedef struct {
     uint8_t  adc;
 } adc_mux;
 #define TO_MUX(i, a) \
-    (adc_mux) { i, a }
+    (adc_mux) {      \
+        i, a         \
+    }
 
 int16_t analogReadPin(pin_t pin);
 int16_t analogReadPinAdc(pin_t pin, uint8_t adc);
diff --git a/platforms/chibios/drivers/audio_dac_additive.c b/platforms/chibios/drivers/audio_dac_additive.c
index db304adb87..db07c4b393 100644
--- a/platforms/chibios/drivers/audio_dac_additive.c
+++ b/platforms/chibios/drivers/audio_dac_additive.c
@@ -52,19 +52,19 @@ static const dacsample_t dac_buffer_sine[AUDIO_DAC_BUFFER_SIZE] = {
     // 256 values, max 4095
     0x0,   0x1,   0x2,   0x6,   0xa,   0xf,   0x16,  0x1e,  0x27,  0x32,  0x3d,  0x4a,  0x58,  0x67,  0x78,  0x89,  0x9c,  0xb0,  0xc5,  0xdb,  0xf2,  0x10a, 0x123, 0x13e, 0x159, 0x175, 0x193, 0x1b1, 0x1d1, 0x1f1, 0x212, 0x235, 0x258, 0x27c, 0x2a0, 0x2c6, 0x2ed, 0x314, 0x33c, 0x365, 0x38e, 0x3b8, 0x3e3, 0x40e, 0x43a, 0x467, 0x494, 0x4c2, 0x4f0, 0x51f, 0x54e, 0x57d, 0x5ad, 0x5dd, 0x60e, 0x63f, 0x670, 0x6a1, 0x6d3, 0x705, 0x737, 0x769, 0x79b, 0x7cd, 0x800, 0x832, 0x864, 0x896, 0x8c8, 0x8fa, 0x92c, 0x95e, 0x98f, 0x9c0, 0x9f1, 0xa22, 0xa52, 0xa82, 0xab1, 0xae0, 0xb0f, 0xb3d, 0xb6b, 0xb98, 0xbc5, 0xbf1, 0xc1c, 0xc47, 0xc71, 0xc9a, 0xcc3, 0xceb, 0xd12, 0xd39, 0xd5f, 0xd83, 0xda7, 0xdca, 0xded, 0xe0e, 0xe2e, 0xe4e, 0xe6c, 0xe8a, 0xea6, 0xec1, 0xedc, 0xef5, 0xf0d, 0xf24, 0xf3a, 0xf4f, 0xf63, 0xf76, 0xf87, 0xf98, 0xfa7, 0xfb5, 0xfc2, 0xfcd, 0xfd8, 0xfe1, 0xfe9, 0xff0, 0xff5, 0xff9, 0xffd, 0xffe,
     0xfff, 0xffe, 0xffd, 0xff9, 0xff5, 0xff0, 0xfe9, 0xfe1, 0xfd8, 0xfcd, 0xfc2, 0xfb5, 0xfa7, 0xf98, 0xf87, 0xf76, 0xf63, 0xf4f, 0xf3a, 0xf24, 0xf0d, 0xef5, 0xedc, 0xec1, 0xea6, 0xe8a, 0xe6c, 0xe4e, 0xe2e, 0xe0e, 0xded, 0xdca, 0xda7, 0xd83, 0xd5f, 0xd39, 0xd12, 0xceb, 0xcc3, 0xc9a, 0xc71, 0xc47, 0xc1c, 0xbf1, 0xbc5, 0xb98, 0xb6b, 0xb3d, 0xb0f, 0xae0, 0xab1, 0xa82, 0xa52, 0xa22, 0x9f1, 0x9c0, 0x98f, 0x95e, 0x92c, 0x8fa, 0x8c8, 0x896, 0x864, 0x832, 0x800, 0x7cd, 0x79b, 0x769, 0x737, 0x705, 0x6d3, 0x6a1, 0x670, 0x63f, 0x60e, 0x5dd, 0x5ad, 0x57d, 0x54e, 0x51f, 0x4f0, 0x4c2, 0x494, 0x467, 0x43a, 0x40e, 0x3e3, 0x3b8, 0x38e, 0x365, 0x33c, 0x314, 0x2ed, 0x2c6, 0x2a0, 0x27c, 0x258, 0x235, 0x212, 0x1f1, 0x1d1, 0x1b1, 0x193, 0x175, 0x159, 0x13e, 0x123, 0x10a, 0xf2,  0xdb,  0xc5,  0xb0,  0x9c,  0x89,  0x78,  0x67,  0x58,  0x4a,  0x3d,  0x32,  0x27,  0x1e,  0x16,  0xf,   0xa,   0x6,   0x2,   0x1};
-#endif  // AUDIO_DAC_SAMPLE_WAVEFORM_SINE
+#endif // AUDIO_DAC_SAMPLE_WAVEFORM_SINE
 #ifdef AUDIO_DAC_SAMPLE_WAVEFORM_TRIANGLE
 static const dacsample_t dac_buffer_triangle[AUDIO_DAC_BUFFER_SIZE] = {
     // 256 values, max 4095
     0x0,   0x20,  0x40,  0x60,  0x80,  0xa0,  0xc0,  0xe0,  0x100, 0x120, 0x140, 0x160, 0x180, 0x1a0, 0x1c0, 0x1e0, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0x300, 0x320, 0x340, 0x360, 0x380, 0x3a0, 0x3c0, 0x3e0, 0x400, 0x420, 0x440, 0x460, 0x480, 0x4a0, 0x4c0, 0x4e0, 0x500, 0x520, 0x540, 0x560, 0x580, 0x5a0, 0x5c0, 0x5e0, 0x600, 0x620, 0x640, 0x660, 0x680, 0x6a0, 0x6c0, 0x6e0, 0x700, 0x720, 0x740, 0x760, 0x780, 0x7a0, 0x7c0, 0x7e0, 0x800, 0x81f, 0x83f, 0x85f, 0x87f, 0x89f, 0x8bf, 0x8df, 0x8ff, 0x91f, 0x93f, 0x95f, 0x97f, 0x99f, 0x9bf, 0x9df, 0x9ff, 0xa1f, 0xa3f, 0xa5f, 0xa7f, 0xa9f, 0xabf, 0xadf, 0xaff, 0xb1f, 0xb3f, 0xb5f, 0xb7f, 0xb9f, 0xbbf, 0xbdf, 0xbff, 0xc1f, 0xc3f, 0xc5f, 0xc7f, 0xc9f, 0xcbf, 0xcdf, 0xcff, 0xd1f, 0xd3f, 0xd5f, 0xd7f, 0xd9f, 0xdbf, 0xddf, 0xdff, 0xe1f, 0xe3f, 0xe5f, 0xe7f, 0xe9f, 0xebf, 0xedf, 0xeff, 0xf1f, 0xf3f, 0xf5f, 0xf7f, 0xf9f, 0xfbf, 0xfdf,
     0xfff, 0xfdf, 0xfbf, 0xf9f, 0xf7f, 0xf5f, 0xf3f, 0xf1f, 0xeff, 0xedf, 0xebf, 0xe9f, 0xe7f, 0xe5f, 0xe3f, 0xe1f, 0xdff, 0xddf, 0xdbf, 0xd9f, 0xd7f, 0xd5f, 0xd3f, 0xd1f, 0xcff, 0xcdf, 0xcbf, 0xc9f, 0xc7f, 0xc5f, 0xc3f, 0xc1f, 0xbff, 0xbdf, 0xbbf, 0xb9f, 0xb7f, 0xb5f, 0xb3f, 0xb1f, 0xaff, 0xadf, 0xabf, 0xa9f, 0xa7f, 0xa5f, 0xa3f, 0xa1f, 0x9ff, 0x9df, 0x9bf, 0x99f, 0x97f, 0x95f, 0x93f, 0x91f, 0x8ff, 0x8df, 0x8bf, 0x89f, 0x87f, 0x85f, 0x83f, 0x81f, 0x800, 0x7e0, 0x7c0, 0x7a0, 0x780, 0x760, 0x740, 0x720, 0x700, 0x6e0, 0x6c0, 0x6a0, 0x680, 0x660, 0x640, 0x620, 0x600, 0x5e0, 0x5c0, 0x5a0, 0x580, 0x560, 0x540, 0x520, 0x500, 0x4e0, 0x4c0, 0x4a0, 0x480, 0x460, 0x440, 0x420, 0x400, 0x3e0, 0x3c0, 0x3a0, 0x380, 0x360, 0x340, 0x320, 0x300, 0x2e0, 0x2c0, 0x2a0, 0x280, 0x260, 0x240, 0x220, 0x200, 0x1e0, 0x1c0, 0x1a0, 0x180, 0x160, 0x140, 0x120, 0x100, 0xe0,  0xc0,  0xa0,  0x80,  0x60,  0x40,  0x20};
-#endif  // AUDIO_DAC_SAMPLE_WAVEFORM_TRIANGLE
+#endif // AUDIO_DAC_SAMPLE_WAVEFORM_TRIANGLE
 #ifdef AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE
 static const dacsample_t dac_buffer_square[AUDIO_DAC_BUFFER_SIZE] = {
-    [0 ... AUDIO_DAC_BUFFER_SIZE / 2 - 1]                     = 0,                     // first and
-    [AUDIO_DAC_BUFFER_SIZE / 2 ... AUDIO_DAC_BUFFER_SIZE - 1] = AUDIO_DAC_SAMPLE_MAX,  // second half
+    [0 ... AUDIO_DAC_BUFFER_SIZE / 2 - 1]                     = 0,                    // first and
+    [AUDIO_DAC_BUFFER_SIZE / 2 ... AUDIO_DAC_BUFFER_SIZE - 1] = AUDIO_DAC_SAMPLE_MAX, // second half
 };
-#endif  // AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE
+#endif // AUDIO_DAC_SAMPLE_WAVEFORM_SQUARE
 /*
 // four steps: 0, 1/3, 2/3 and 1
 static const dacsample_t dac_buffer_staircase[AUDIO_DAC_BUFFER_SIZE] = {
@@ -77,7 +77,7 @@ static const dacsample_t dac_buffer_staircase[AUDIO_DAC_BUFFER_SIZE] = {
 #ifdef AUDIO_DAC_SAMPLE_WAVEFORM_TRAPEZOID
 static const dacsample_t dac_buffer_trapezoid[AUDIO_DAC_BUFFER_SIZE] = {0x0,   0x1f,  0x7f,  0xdf,  0x13f, 0x19f, 0x1ff, 0x25f, 0x2bf, 0x31f, 0x37f, 0x3df, 0x43f, 0x49f, 0x4ff, 0x55f, 0x5bf, 0x61f, 0x67f, 0x6df, 0x73f, 0x79f, 0x7ff, 0x85f, 0x8bf, 0x91f, 0x97f, 0x9df, 0xa3f, 0xa9f, 0xaff, 0xb5f, 0xbbf, 0xc1f, 0xc7f, 0xcdf, 0xd3f, 0xd9f, 0xdff, 0xe5f, 0xebf, 0xf1f, 0xf7f, 0xfdf, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
                                                                         0xfff, 0xfdf, 0xf7f, 0xf1f, 0xebf, 0xe5f, 0xdff, 0xd9f, 0xd3f, 0xcdf, 0xc7f, 0xc1f, 0xbbf, 0xb5f, 0xaff, 0xa9f, 0xa3f, 0x9df, 0x97f, 0x91f, 0x8bf, 0x85f, 0x7ff, 0x79f, 0x73f, 0x6df, 0x67f, 0x61f, 0x5bf, 0x55f, 0x4ff, 0x49f, 0x43f, 0x3df, 0x37f, 0x31f, 0x2bf, 0x25f, 0x1ff, 0x19f, 0x13f, 0xdf,  0x7f,  0x1f,  0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0,   0x0};
-#endif  // AUDIO_DAC_SAMPLE_WAVEFORM_TRAPEZOID
+#endif // AUDIO_DAC_SAMPLE_WAVEFORM_TRAPEZOID
 
 static dacsample_t dac_buffer_empty[AUDIO_DAC_BUFFER_SIZE] = {AUDIO_DAC_OFF_VALUE};
 
@@ -98,7 +98,7 @@ typedef enum {
     OUTPUT_REACHED_ZERO_BEFORE_OFF,
     OUTPUT_OFF,
     OUTPUT_OFF_1,
-    OUTPUT_OFF_2,  // trailing off: giving the DAC two more conversion cycles until the AUDIO_DAC_OFF_VALUE reaches the output, then turn the timer off, which leaves the output at that level
+    OUTPUT_OFF_2, // trailing off: giving the DAC two more conversion cycles until the AUDIO_DAC_OFF_VALUE reaches the output, then turn the timer off, which leaves the output at that level
     number_of_output_states
 } output_states_t;
 output_states_t state = OUTPUT_OFF_2;
@@ -171,7 +171,7 @@ static void dac_end(DACDriver *dacp) {
 
     // work on the other half of the buffer
     if (dacIsBufferComplete(dacp)) {
-        sample_p += AUDIO_DAC_BUFFER_SIZE / 2;  // 'half_index'
+        sample_p += AUDIO_DAC_BUFFER_SIZE / 2; // 'half_index'
     }
 
     for (uint8_t s = 0; s < AUDIO_DAC_BUFFER_SIZE / 2; s++) {
@@ -196,8 +196,8 @@ static void dac_end(DACDriver *dacp) {
          *   *       *
          * =====*=*================================================= 0x0
          */
-        if (((sample_p[s] + (AUDIO_DAC_SAMPLE_MAX / 100)) > AUDIO_DAC_OFF_VALUE) &&  // value approaches from below
-            (sample_p[s] < (AUDIO_DAC_OFF_VALUE + (AUDIO_DAC_SAMPLE_MAX / 100)))     // or above
+        if (((sample_p[s] + (AUDIO_DAC_SAMPLE_MAX / 100)) > AUDIO_DAC_OFF_VALUE) && // value approaches from below
+            (sample_p[s] < (AUDIO_DAC_OFF_VALUE + (AUDIO_DAC_SAMPLE_MAX / 100)))    // or above
         ) {
             if ((OUTPUT_SHOULD_START == state) && (active_tones_snapshot_length > 0)) {
                 state = OUTPUT_RUN_NORMALLY;
@@ -220,7 +220,7 @@ static void dac_end(DACDriver *dacp) {
             // -> saves cpu cycles (?)
             for (uint8_t i = 0; i < active_tones; i++) {
                 float freq = audio_get_processed_frequency(i);
-                if (freq > 0) {  // disregard 'rest' notes, with valid frequency 0.0f; which would only lower the resulting waveform volume during the additive synthesis step
+                if (freq > 0) { // disregard 'rest' notes, with valid frequency 0.0f; which would only lower the resulting waveform volume during the additive synthesis step
                     active_tones_snapshot[active_tones_snapshot_length++] = freq;
                 }
             }
@@ -321,7 +321,9 @@ void audio_driver_initialize() {
     gptStart(&GPTD6, &gpt6cfg1);
 }
 
-void audio_driver_stop(void) { state = OUTPUT_SHOULD_STOP; }
+void audio_driver_stop(void) {
+    state = OUTPUT_SHOULD_STOP;
+}
 
 void audio_driver_start(void) {
     gptStartContinuous(&GPTD6, 2U);
diff --git a/platforms/chibios/drivers/audio_dac_basic.c b/platforms/chibios/drivers/audio_dac_basic.c
index fac6513506..64439a1e3c 100644
--- a/platforms/chibios/drivers/audio_dac_basic.c
+++ b/platforms/chibios/drivers/audio_dac_basic.c
@@ -115,13 +115,15 @@ void         channel_1_set_frequency(float freq) {
     channel_1_frequency = freq;
 
     channel_1_stop();
-    if (freq <= 0.0)  // a pause/rest has freq=0
+    if (freq <= 0.0) // a pause/rest has freq=0
         return;
 
     gpt6cfg1.frequency = 2 * freq * AUDIO_DAC_BUFFER_SIZE;
     channel_1_start();
 }
-float channel_1_get_frequency(void) { return channel_1_frequency; }
+float channel_1_get_frequency(void) {
+    return channel_1_frequency;
+}
 
 void channel_2_start(void) {
     gptStart(&GPTD7, &gpt7cfg1);
@@ -140,13 +142,15 @@ void         channel_2_set_frequency(float freq) {
     channel_2_frequency = freq;
 
     channel_2_stop();
-    if (freq <= 0.0)  // a pause/rest has freq=0
+    if (freq <= 0.0) // a pause/rest has freq=0
         return;
 
     gpt7cfg1.frequency = 2 * freq * AUDIO_DAC_BUFFER_SIZE;
     channel_2_start();
 }
-float channel_2_get_frequency(void) { return channel_2_frequency; }
+float channel_2_get_frequency(void) {
+    return channel_2_frequency;
+}
 
 static void gpt_audio_state_cb(GPTDriver *gptp) {
     if (audio_update_state()) {
@@ -155,8 +159,8 @@ static void gpt_audio_state_cb(GPTDriver *gptp) {
         channel_1_set_frequency(audio_get_processed_frequency(0));
         channel_2_set_frequency(audio_get_processed_frequency(0));
 
-#else  // two separate audio outputs/speakers
-       // primary speaker on A4, optional secondary on A5
+#else // two separate audio outputs/speakers
+      // primary speaker on A4, optional secondary on A5
         if (AUDIO_PIN == A4) {
             channel_1_set_frequency(audio_get_processed_frequency(0));
             if (AUDIO_PIN_ALT == A5) {
diff --git a/platforms/chibios/drivers/audio_pwm_hardware.c b/platforms/chibios/drivers/audio_pwm_hardware.c
index cd40019ee7..710f397609 100644
--- a/platforms/chibios/drivers/audio_pwm_hardware.c
+++ b/platforms/chibios/drivers/audio_pwm_hardware.c
@@ -72,7 +72,7 @@ static float channel_1_frequency = 0.0f;
 void         channel_1_set_frequency(float freq) {
     channel_1_frequency = freq;
 
-    if (freq <= 0.0)  // a pause/rest has freq=0
+    if (freq <= 0.0) // a pause/rest has freq=0
         return;
 
     pwmcnt_t period = (pwmCFG.frequency / freq);
@@ -82,14 +82,18 @@ void         channel_1_set_frequency(float freq) {
                      PWM_PERCENTAGE_TO_WIDTH(&AUDIO_PWM_DRIVER, (100 - note_timbre) * 100));
 }
 
-float channel_1_get_frequency(void) { return channel_1_frequency; }
+float channel_1_get_frequency(void) {
+    return channel_1_frequency;
+}
 
 void channel_1_start(void) {
     pwmStop(&AUDIO_PWM_DRIVER);
     pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG);
 }
 
-void channel_1_stop(void) { pwmStop(&AUDIO_PWM_DRIVER); }
+void channel_1_stop(void) {
+    pwmStop(&AUDIO_PWM_DRIVER);
+}
 
 static void gpt_callback(GPTDriver *gptp);
 GPTConfig   gptCFG = {
@@ -108,9 +112,9 @@ void audio_driver_initialize(void) {
     pwmStart(&AUDIO_PWM_DRIVER, &pwmCFG);
 
     // connect the AUDIO_PIN to the PWM hardware
-#if defined(USE_GPIOV1)  // STM32F103C8
+#if defined(USE_GPIOV1) // STM32F103C8
     palSetLineMode(AUDIO_PIN, PAL_MODE_ALTERNATE_PUSHPULL);
-#else  // GPIOv2 (or GPIOv3 for f4xx, which is the same/compatible at this command)
+#else // GPIOv2 (or GPIOv3 for f4xx, which is the same/compatible at this command)
     palSetLineMode(AUDIO_PIN, PAL_MODE_ALTERNATE(AUDIO_PWM_PAL_MODE));
 #endif
 
@@ -135,10 +139,10 @@ void audio_driver_stop(void) {
  * and updates the pwm to output that frequency
  */
 static void gpt_callback(GPTDriver *gptp) {
-    float freq;  // TODO: freq_alt
+    float freq; // TODO: freq_alt
 
     if (audio_update_state()) {
-        freq = audio_get_processed_frequency(0);  // freq_alt would be index=1
+        freq = audio_get_processed_frequency(0); // freq_alt would be index=1
         channel_1_set_frequency(freq);
     }
 }
diff --git a/platforms/chibios/drivers/audio_pwm_software.c b/platforms/chibios/drivers/audio_pwm_software.c
index 15c3e98b6a..e01f86ea52 100644
--- a/platforms/chibios/drivers/audio_pwm_software.c
+++ b/platforms/chibios/drivers/audio_pwm_software.c
@@ -57,7 +57,7 @@ static float channel_1_frequency = 0.0f;
 void         channel_1_set_frequency(float freq) {
     channel_1_frequency = freq;
 
-    if (freq <= 0.0)  // a pause/rest has freq=0
+    if (freq <= 0.0) // a pause/rest has freq=0
         return;
 
     pwmcnt_t period = (pwmCFG.frequency / freq);
@@ -68,7 +68,9 @@ void         channel_1_set_frequency(float freq) {
                      PWM_PERCENTAGE_TO_WIDTH(&AUDIO_PWM_DRIVER, (100 - note_timbre) * 100));
 }
 
-float channel_1_get_frequency(void) { return channel_1_frequency; }
+float channel_1_get_frequency(void) {
+    return channel_1_frequency;
+}
 
 void channel_1_start(void) {
     pwmStop(&AUDIO_PWM_DRIVER);
@@ -81,10 +83,10 @@ void channel_1_start(void) {
 void channel_1_stop(void) {
     pwmStop(&AUDIO_PWM_DRIVER);
 
-    palClearLine(AUDIO_PIN);  // leave the line low, after last note was played
+    palClearLine(AUDIO_PIN); // leave the line low, after last note was played
 
 #if defined(AUDIO_PIN_ALT) && defined(AUDIO_PIN_ALT_AS_NEGATIVE)
-    palClearLine(AUDIO_PIN_ALT);  // leave the line low, after last note was played
+    palClearLine(AUDIO_PIN_ALT); // leave the line low, after last note was played
 #endif
 }
 
@@ -100,7 +102,7 @@ static void pwm_audio_period_callback(PWMDriver *pwmp) {
 static void pwm_audio_channel_interrupt_callback(PWMDriver *pwmp) {
     (void)pwmp;
     if (channel_1_frequency > 0) {
-        palSetLine(AUDIO_PIN);  // generate a PWM signal on any pin, not necessarily the one connected to the timer
+        palSetLine(AUDIO_PIN); // generate a PWM signal on any pin, not necessarily the one connected to the timer
 #if defined(AUDIO_PIN_ALT) && defined(AUDIO_PIN_ALT_AS_NEGATIVE)
         palClearLine(AUDIO_PIN_ALT);
 #endif
@@ -131,7 +133,7 @@ void audio_driver_initialize(void) {
     palClearLine(AUDIO_PIN_ALT);
 #endif
 
-    pwmEnablePeriodicNotification(&AUDIO_PWM_DRIVER);  // enable pwm callbacks
+    pwmEnablePeriodicNotification(&AUDIO_PWM_DRIVER); // enable pwm callbacks
     pwmEnableChannelNotification(&AUDIO_PWM_DRIVER, AUDIO_PWM_CHANNEL - 1);
 
     gptStart(&AUDIO_STATE_TIMER, &gptCFG);
@@ -155,10 +157,10 @@ void audio_driver_stop(void) {
  * and updates the pwm to output that frequency
  */
 static void gpt_callback(GPTDriver *gptp) {
-    float freq;  // TODO: freq_alt
+    float freq; // TODO: freq_alt
 
     if (audio_update_state()) {
-        freq = audio_get_processed_frequency(0);  // freq_alt would be index=1
+        freq = audio_get_processed_frequency(0); // freq_alt would be index=1
         channel_1_set_frequency(freq);
     }
 }
diff --git a/platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h b/platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h
index a35defca8b..616d7ccbee 100644
--- a/platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h
+++ b/platforms/chibios/drivers/eeprom/eeprom_stm32_L0_L1.h
@@ -24,7 +24,7 @@
 #        define STM32_ONBOARD_EEPROM_SIZE 1024
 #    else
 #        include "eeconfig.h"
-#        define STM32_ONBOARD_EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4)  // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO and EEPROM page sizing
+#        define STM32_ONBOARD_EEPROM_SIZE (((EECONFIG_SIZE + 3) / 4) * 4) // based off eeconfig's current usage, aligned to 4-byte sizes, to deal with LTO and EEPROM page sizing
 #    endif
 #endif
 
diff --git a/platforms/chibios/drivers/i2c_master.c b/platforms/chibios/drivers/i2c_master.c
index 4a5d4760d0..d10bdbabc1 100644
--- a/platforms/chibios/drivers/i2c_master.c
+++ b/platforms/chibios/drivers/i2c_master.c
@@ -203,4 +203,6 @@ i2c_status_t i2c_readReg16(uint8_t devaddr, uint16_t regaddr, uint8_t* data, uin
     return chibios_to_qmk(&status);
 }
 
-void i2c_stop(void) { i2cStop(&I2C_DRIVER); }
+void i2c_stop(void) {
+    i2cStop(&I2C_DRIVER);
+}
diff --git a/platforms/chibios/drivers/serial.c b/platforms/chibios/drivers/serial.c
index 17d0b32be8..6db5d85250 100644
--- a/platforms/chibios/drivers/serial.c
+++ b/platforms/chibios/drivers/serial.c
@@ -50,14 +50,30 @@
 #    error invalid SELECT_SOFT_SERIAL_SPEED value
 #endif
 
-inline static void serial_delay(void) { wait_us(SERIAL_DELAY); }
-inline static void serial_delay_half(void) { wait_us(SERIAL_DELAY / 2); }
-inline static void serial_delay_blip(void) { wait_us(1); }
-inline static void serial_output(void) { setPinOutput(SOFT_SERIAL_PIN); }
-inline static void serial_input(void) { setPinInputHigh(SOFT_SERIAL_PIN); }
-inline static bool serial_read_pin(void) { return !!readPin(SOFT_SERIAL_PIN); }
-inline static void serial_low(void) { writePinLow(SOFT_SERIAL_PIN); }
-inline static void serial_high(void) { writePinHigh(SOFT_SERIAL_PIN); }
+inline static void serial_delay(void) {
+    wait_us(SERIAL_DELAY);
+}
+inline static void serial_delay_half(void) {
+    wait_us(SERIAL_DELAY / 2);
+}
+inline static void serial_delay_blip(void) {
+    wait_us(1);
+}
+inline static void serial_output(void) {
+    setPinOutput(SOFT_SERIAL_PIN);
+}
+inline static void serial_input(void) {
+    setPinInputHigh(SOFT_SERIAL_PIN);
+}
+inline static bool serial_read_pin(void) {
+    return !!readPin(SOFT_SERIAL_PIN);
+}
+inline static void serial_low(void) {
+    writePinLow(SOFT_SERIAL_PIN);
+}
+inline static void serial_high(void) {
+    writePinHigh(SOFT_SERIAL_PIN);
+}
 
 void interrupt_handler(void *arg);
 
@@ -226,7 +242,7 @@ bool soft_serial_transaction(int sstd_index) {
 
     uint8_t checksum = 0;
     // send data to the slave
-    serial_write_byte(sstd_index);  // first chunk is transaction id
+    serial_write_byte(sstd_index); // first chunk is transaction id
     sync_recv();
 
     for (int i = 0; i < trans->initiator2target_buffer_size; ++i) {
@@ -238,7 +254,7 @@ bool soft_serial_transaction(int sstd_index) {
     sync_recv();
 
     serial_delay();
-    serial_delay();  // read mid pulses
+    serial_delay(); // read mid pulses
 
     // receive data from the slave
     uint8_t checksum_computed = 0;
diff --git a/platforms/chibios/drivers/serial_usart.c b/platforms/chibios/drivers/serial_usart.c
index 42c476a374..85c64214d1 100644
--- a/platforms/chibios/drivers/serial_usart.c
+++ b/platforms/chibios/drivers/serial_usart.c
@@ -238,7 +238,7 @@ void soft_serial_initiator_init(void) {
     usart_master_init(&serial_driver);
 
 #if defined(MCU_STM32) && defined(SERIAL_USART_PIN_SWAP)
-    serial_config.cr2 |= USART_CR2_SWAP;  // master has swapped TX/RX pins
+    serial_config.cr2 |= USART_CR2_SWAP; // master has swapped TX/RX pins
 #endif
 
     sdStart(serial_driver, &serial_config);
diff --git a/platforms/chibios/drivers/serial_usart.h b/platforms/chibios/drivers/serial_usart.h
index 7b135b31e0..81fe9e0113 100644
--- a/platforms/chibios/drivers/serial_usart.h
+++ b/platforms/chibios/drivers/serial_usart.h
@@ -50,15 +50,15 @@
 #endif
 
 #if !defined(USART_CR1_M0)
-#    define USART_CR1_M0 USART_CR1_M  // some platforms (f1xx) dont have this so
+#    define USART_CR1_M0 USART_CR1_M // some platforms (f1xx) dont have this so
 #endif
 
 #if !defined(SERIAL_USART_CR1)
-#    define SERIAL_USART_CR1 (USART_CR1_PCE | USART_CR1_PS | USART_CR1_M0)  // parity enable, odd parity, 9 bit length
+#    define SERIAL_USART_CR1 (USART_CR1_PCE | USART_CR1_PS | USART_CR1_M0) // parity enable, odd parity, 9 bit length
 #endif
 
 #if !defined(SERIAL_USART_CR2)
-#    define SERIAL_USART_CR2 (USART_CR2_STOP_1)  // 2 stop bits
+#    define SERIAL_USART_CR2 (USART_CR2_STOP_1) // 2 stop bits
 #endif
 
 #if !defined(SERIAL_USART_CR3)
diff --git a/platforms/chibios/drivers/spi_master.c b/platforms/chibios/drivers/spi_master.c
index dde0bb0597..998bace550 100644
--- a/platforms/chibios/drivers/spi_master.c
+++ b/platforms/chibios/drivers/spi_master.c
@@ -115,7 +115,7 @@ bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
 
 #elif defined(HT32)
     spiConfig.cr0 = SPI_CR0_SELOEN;
-    spiConfig.cr1 = SPI_CR1_MODE | 8;  // 8 bits and in master mode
+    spiConfig.cr1 = SPI_CR1_MODE | 8; // 8 bits and in master mode
 
     if (lsbFirst) {
         spiConfig.cr1 |= SPI_CR1_FIRSTBIT;
diff --git a/platforms/chibios/drivers/uart.c b/platforms/chibios/drivers/uart.c
index d2ea5d6415..dbe991efa3 100644
--- a/platforms/chibios/drivers/uart.c
+++ b/platforms/chibios/drivers/uart.c
@@ -43,7 +43,9 @@ void uart_init(uint32_t baud) {
     }
 }
 
-void uart_write(uint8_t data) { sdPut(&SERIAL_DRIVER, c); }
+void uart_write(uint8_t data) {
+    sdPut(&SERIAL_DRIVER, c);
+}
 
 uint8_t uart_read(void) {
     msg_t res = sdGet(&SERIAL_DRIVER);
@@ -51,8 +53,14 @@ uint8_t uart_read(void) {
     return (uint8_t)res;
 }
 
-void uart_transmit(const uint8_t *data, uint16_t length) { sdWrite(&SERIAL_DRIVER, data, length); }
+void uart_transmit(const uint8_t *data, uint16_t length) {
+    sdWrite(&SERIAL_DRIVER, data, length);
+}
 
-void uart_receive(uint8_t *data, uint16_t length) { sdRead(&SERIAL_DRIVER, data, length); }
+void uart_receive(uint8_t *data, uint16_t length) {
+    sdRead(&SERIAL_DRIVER, data, length);
+}
 
-bool uart_available(void) { return !sdGetWouldBlock(&SERIAL_DRIVER); }
+bool uart_available(void) {
+    return !sdGetWouldBlock(&SERIAL_DRIVER);
+}
diff --git a/platforms/chibios/drivers/usbpd_stm32g4.c b/platforms/chibios/drivers/usbpd_stm32g4.c
index f16ca8aeae..0096f22f07 100644
--- a/platforms/chibios/drivers/usbpd_stm32g4.c
+++ b/platforms/chibios/drivers/usbpd_stm32g4.c
@@ -18,7 +18,7 @@
 
 #ifndef USBPD_UCPD1_CFG1
 #    define USBPD_UCPD1_CFG1 (UCPD_CFG1_PSC_UCPDCLK_0 | UCPD_CFG1_TRANSWIN_3 | UCPD_CFG1_IFRGAP_4 | UCPD_CFG1_HBITCLKDIV_4)
-#endif  // USBPD_UCPD1_CFG1
+#endif // USBPD_UCPD1_CFG1
 
 // Initialises the USBPD subsystem
 __attribute__((weak)) void usbpd_init(void) {
@@ -64,7 +64,7 @@ __attribute__((weak)) usbpd_allowance_t usbpd_get_allowance(void) {
         switch (vstate_max) {
             case 0:
             case 1:
-                return USBPD_500MA;  // Note that this is 500mA (i.e. max USB 2.0), not 900mA, as we're not using USB 3.1 as a sink device.
+                return USBPD_500MA; // Note that this is 500mA (i.e. max USB 2.0), not 900mA, as we're not using USB 3.1 as a sink device.
             case 2:
                 return USBPD_1500MA;
             case 3:
diff --git a/platforms/chibios/drivers/ws2812.c b/platforms/chibios/drivers/ws2812.c
index 7e870661de..1b3bb59842 100644
--- a/platforms/chibios/drivers/ws2812.c
+++ b/platforms/chibios/drivers/ws2812.c
@@ -10,7 +10,7 @@
 #        define NOP_FUDGE 0.4
 #    else
 #        error("NOP_FUDGE configuration required")
-#        define NOP_FUDGE 1  // this just pleases the compile so the above error is easier to spot
+#        define NOP_FUDGE 1 // this just pleases the compile so the above error is easier to spot
 #    endif
 #endif
 
@@ -25,12 +25,12 @@
 // The reset gap can be 6000 ns, but depending on the LED strip it may have to be increased
 // to values like 600000 ns. If it is too small, the pixels will show nothing most of the time.
 #ifndef WS2812_RES
-#    define WS2812_RES (1000 * WS2812_TRST_US)  // Width of the low gap between bits to cause a frame to latch
+#    define WS2812_RES (1000 * WS2812_TRST_US) // Width of the low gap between bits to cause a frame to latch
 #endif
 
 #define NUMBER_NOPS 6
 #define CYCLES_PER_SEC (CPU_CLOCK / NUMBER_NOPS * NOP_FUDGE)
-#define NS_PER_SEC (1000000000L)  // Note that this has to be SIGNED since we want to be able to check for negative values of derivatives
+#define NS_PER_SEC (1000000000L) // Note that this has to be SIGNED since we want to be able to check for negative values of derivatives
 #define NS_PER_CYCLE (NS_PER_SEC / CYCLES_PER_SEC)
 #define NS_TO_CYCLES(n) ((n) / NS_PER_CYCLE)
 
@@ -67,7 +67,9 @@ void sendByte(uint8_t byte) {
     }
 }
 
-void ws2812_init(void) { palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE); }
+void ws2812_init(void) {
+    palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE);
+}
 
 // Setleds for standard RGB
 void ws2812_setleds(LED_TYPE *ledarray, uint16_t leds) {
diff --git a/platforms/chibios/drivers/ws2812_pwm.c b/platforms/chibios/drivers/ws2812_pwm.c
index 19ea3cfe8a..57187676d7 100644
--- a/platforms/chibios/drivers/ws2812_pwm.c
+++ b/platforms/chibios/drivers/ws2812_pwm.c
@@ -11,19 +11,19 @@
 #endif
 
 #ifndef WS2812_PWM_DRIVER
-#    define WS2812_PWM_DRIVER PWMD2  // TIMx
+#    define WS2812_PWM_DRIVER PWMD2 // TIMx
 #endif
 #ifndef WS2812_PWM_CHANNEL
-#    define WS2812_PWM_CHANNEL 2  // Channel
+#    define WS2812_PWM_CHANNEL 2 // Channel
 #endif
 #ifndef WS2812_PWM_PAL_MODE
-#    define WS2812_PWM_PAL_MODE 2  // DI Pin's alternate function value
+#    define WS2812_PWM_PAL_MODE 2 // DI Pin's alternate function value
 #endif
 #ifndef WS2812_DMA_STREAM
-#    define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA Stream for TIMx_UP
+#    define WS2812_DMA_STREAM STM32_DMA1_STREAM2 // DMA Stream for TIMx_UP
 #endif
 #ifndef WS2812_DMA_CHANNEL
-#    define WS2812_DMA_CHANNEL 2  // DMA Channel for TIMx_UP
+#    define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP
 #endif
 #if (STM32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_DMAMUX_ID)
 #    error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM?_UP"
@@ -56,7 +56,7 @@
 
 #ifndef WS2812_PWM_TARGET_PERIOD
 //#    define WS2812_PWM_TARGET_PERIOD 800000 // Original code is 800k...?
-#    define WS2812_PWM_TARGET_PERIOD 80000  // TODO: work out why 10x less on f303/f4x1
+#    define WS2812_PWM_TARGET_PERIOD 80000 // TODO: work out why 10x less on f303/f4x1
 #endif
 
 /* --- PRIVATE CONSTANTS ---------------------------------------------------- */
@@ -259,8 +259,10 @@ write/read to/from the other buffer).
 void ws2812_init(void) {
     // Initialize led frame buffer
     uint32_t i;
-    for (i = 0; i < WS2812_COLOR_BIT_N; i++) ws2812_frame_buffer[i] = WS2812_DUTYCYCLE_0;      // All color bits are zero duty cycle
-    for (i = 0; i < WS2812_RESET_BIT_N; i++) ws2812_frame_buffer[i + WS2812_COLOR_BIT_N] = 0;  // All reset bits are zero
+    for (i = 0; i < WS2812_COLOR_BIT_N; i++)
+        ws2812_frame_buffer[i] = WS2812_DUTYCYCLE_0; // All color bits are zero duty cycle
+    for (i = 0; i < WS2812_RESET_BIT_N; i++)
+        ws2812_frame_buffer[i + WS2812_COLOR_BIT_N] = 0; // All reset bits are zero
 
     palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE);
 
@@ -268,22 +270,22 @@ void ws2812_init(void) {
     //#pragma GCC diagnostic ignored "-Woverride-init"  // Turn off override-init warning for this struct. We use the overriding ability to set a "default" channel config
     static const PWMConfig ws2812_pwm_config = {
         .frequency = WS2812_PWM_FREQUENCY,
-        .period    = WS2812_PWM_PERIOD,  // Mit dieser Periode wird UDE-Event erzeugt und ein neuer Wert (Länge WS2812_BIT_N) vom DMA ins CCR geschrieben
+        .period    = WS2812_PWM_PERIOD, // Mit dieser Periode wird UDE-Event erzeugt und ein neuer Wert (Länge WS2812_BIT_N) vom DMA ins CCR geschrieben
         .callback  = NULL,
         .channels =
             {
-                [0 ... 3]                = {.mode = PWM_OUTPUT_DISABLED, .callback = NULL},     // Channels default to disabled
-                [WS2812_PWM_CHANNEL - 1] = {.mode = WS2812_PWM_OUTPUT_MODE, .callback = NULL},  // Turn on the channel we care about
+                [0 ... 3]                = {.mode = PWM_OUTPUT_DISABLED, .callback = NULL},    // Channels default to disabled
+                [WS2812_PWM_CHANNEL - 1] = {.mode = WS2812_PWM_OUTPUT_MODE, .callback = NULL}, // Turn on the channel we care about
             },
         .cr2  = 0,
-        .dier = TIM_DIER_UDE,  // DMA on update event for next period
+        .dier = TIM_DIER_UDE, // DMA on update event for next period
     };
     //#pragma GCC diagnostic pop  // Restore command-line warning options
 
     // Configure DMA
     // dmaInit(); // Joe added this
     dmaStreamAlloc(WS2812_DMA_STREAM - STM32_DMA_STREAM(0), 10, NULL, NULL);
-    dmaStreamSetPeripheral(WS2812_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1]));  // Ziel ist der An-Zeit im Cap-Comp-Register
+    dmaStreamSetPeripheral(WS2812_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1])); // Ziel ist der An-Zeit im Cap-Comp-Register
     dmaStreamSetMemory0(WS2812_DMA_STREAM, ws2812_frame_buffer);
     dmaStreamSetTransactionSize(WS2812_DMA_STREAM, WS2812_BIT_N);
     dmaStreamSetMode(WS2812_DMA_STREAM, STM32_DMA_CR_CHSEL(WS2812_DMA_CHANNEL) | STM32_DMA_CR_DIR_M2P | STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_WORD | STM32_DMA_CR_MINC | STM32_DMA_CR_CIRC | STM32_DMA_CR_PL(3));
@@ -302,7 +304,7 @@ void ws2812_init(void) {
     // ChibiOS driver code, so we don't have to do anything special to the timer. If we did, we'd have to start the timer,
     // disable counting, enable the channel, and then make whatever configuration changes we need.
     pwmStart(&WS2812_PWM_DRIVER, &ws2812_pwm_config);
-    pwmEnableChannel(&WS2812_PWM_DRIVER, WS2812_PWM_CHANNEL - 1, 0);  // Initial period is 0; output will be low until first duty cycle is DMA'd in
+    pwmEnableChannel(&WS2812_PWM_DRIVER, WS2812_PWM_CHANNEL - 1, 0); // Initial period is 0; output will be low until first duty cycle is DMA'd in
 }
 
 void ws2812_write_led(uint16_t led_number, uint8_t r, uint8_t g, uint8_t b) {
diff --git a/platforms/chibios/drivers/ws2812_spi.c b/platforms/chibios/drivers/ws2812_spi.c
index ba471e0b8e..76191db165 100644
--- a/platforms/chibios/drivers/ws2812_spi.c
+++ b/platforms/chibios/drivers/ws2812_spi.c
@@ -42,7 +42,7 @@
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_0)
 #elif WS2812_SPI_DIVISOR == 8
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1)
-#elif WS2812_SPI_DIVISOR == 16  // same as default
+#elif WS2812_SPI_DIVISOR == 16 // same as default
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1 | SPI_CR1_BR_0)
 #elif WS2812_SPI_DIVISOR == 32
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_2)
@@ -53,14 +53,14 @@
 #elif WS2812_SPI_DIVISOR == 256
 #    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_2 | SPI_CR1_BR_1 | SPI_CR1_BR_0)
 #else
-#    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1 | SPI_CR1_BR_0)  // default
+#    define WS2812_SPI_DIVISOR_CR1_BR_X (SPI_CR1_BR_1 | SPI_CR1_BR_0) // default
 #endif
 
 // Use SPI circular buffer
 #ifdef WS2812_SPI_USE_CIRCULAR_BUFFER
-#    define WS2812_SPI_BUFFER_MODE 1  // circular buffer
+#    define WS2812_SPI_BUFFER_MODE 1 // circular buffer
 #else
-#    define WS2812_SPI_BUFFER_MODE 0  // normal buffer
+#    define WS2812_SPI_BUFFER_MODE 0 // normal buffer
 #endif
 
 #if defined(USE_GPIOV1)
@@ -104,20 +104,30 @@ static void set_led_color_rgb(LED_TYPE color, int pos) {
     uint8_t* tx_start = &txbuf[PREAMBLE_SIZE];
 
 #if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.g, j);
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.r, j);
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.b, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.g, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.r, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.b, j);
 #elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.r, j);
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.g, j);
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.b, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.r, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.g, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.b, j);
 #elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_BGR)
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.b, j);
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.g, j);
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.r, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.b, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.g, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.r, j);
 #endif
 #ifdef RGBW
-    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 4 + j] = get_protocol_eq(color.w, j);
+    for (int j = 0; j < 4; j++)
+        tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 4 + j] = get_protocol_eq(color.w, j);
 #endif
 }
 
@@ -126,7 +136,7 @@ void ws2812_init(void) {
 
 #ifdef WS2812_SPI_SCK_PIN
     palSetLineMode(WS2812_SPI_SCK_PIN, WS2812_SCK_OUTPUT_MODE);
-#endif  // WS2812_SPI_SCK_PIN
+#endif // WS2812_SPI_SCK_PIN
 
     // TODO: more dynamic baudrate
     static const SPIConfig spicfg = {WS2812_SPI_BUFFER_MODE, NULL, PAL_PORT(RGB_DI_PIN), PAL_PAD(RGB_DI_PIN), WS2812_SPI_DIVISOR_CR1_BR_X};
diff --git a/platforms/chibios/eeprom_stm32.c b/platforms/chibios/eeprom_stm32.c
index 8bf0b19c3d..a15bfe09ed 100644
--- a/platforms/chibios/eeprom_stm32.c
+++ b/platforms/chibios/eeprom_stm32.c
@@ -560,9 +560,13 @@ uint16_t EEPROM_ReadDataWord(uint16_t Address) {
 /*****************************************************************************
  *  Bind to eeprom_driver.c
  *******************************************************************************/
-void eeprom_driver_init(void) { EEPROM_Init(); }
+void eeprom_driver_init(void) {
+    EEPROM_Init();
+}
 
-void eeprom_driver_erase(void) { EEPROM_Erase(); }
+void eeprom_driver_erase(void) {
+    EEPROM_Erase();
+}
 
 void eeprom_read_block(void *buf, const void *addr, size_t len) {
     const uint8_t *src  = (const uint8_t *)addr;
diff --git a/platforms/chibios/eeprom_stm32_defs.h b/platforms/chibios/eeprom_stm32_defs.h
index 581434eb5e..a6ceb41355 100644
--- a/platforms/chibios/eeprom_stm32_defs.h
+++ b/platforms/chibios/eeprom_stm32_defs.h
@@ -20,41 +20,41 @@
 #if !defined(FEE_PAGE_SIZE) || !defined(FEE_PAGE_COUNT)
 #    if defined(STM32F103xB) || defined(STM32F042x6) || defined(GD32VF103C8) || defined(GD32VF103CB)
 #        ifndef FEE_PAGE_SIZE
-#            define FEE_PAGE_SIZE 0x400  // Page size = 1KByte
+#            define FEE_PAGE_SIZE 0x400 // Page size = 1KByte
 #        endif
 #        ifndef FEE_PAGE_COUNT
-#            define FEE_PAGE_COUNT 2  // How many pages are used
+#            define FEE_PAGE_COUNT 2 // How many pages are used
 #        endif
 #    elif defined(STM32F103xE) || defined(STM32F303xC) || defined(STM32F072xB) || defined(STM32F070xB)
 #        ifndef FEE_PAGE_SIZE
-#            define FEE_PAGE_SIZE 0x800  // Page size = 2KByte
+#            define FEE_PAGE_SIZE 0x800 // Page size = 2KByte
 #        endif
 #        ifndef FEE_PAGE_COUNT
-#            define FEE_PAGE_COUNT 4  // How many pages are used
+#            define FEE_PAGE_COUNT 4 // How many pages are used
 #        endif
 #    elif defined(STM32F401xC) || defined(STM32F401xE) || defined(STM32F405xG) || defined(STM32F411xE)
 #        ifndef FEE_PAGE_SIZE
-#            define FEE_PAGE_SIZE 0x4000  // Page size = 16KByte
+#            define FEE_PAGE_SIZE 0x4000 // Page size = 16KByte
 #        endif
 #        ifndef FEE_PAGE_COUNT
-#            define FEE_PAGE_COUNT 1  // How many pages are used
+#            define FEE_PAGE_COUNT 1 // How many pages are used
 #        endif
 #    endif
 #endif
 
 #if !defined(FEE_MCU_FLASH_SIZE)
 #    if defined(STM32F042x6)
-#        define FEE_MCU_FLASH_SIZE 32  // Size in Kb
+#        define FEE_MCU_FLASH_SIZE 32 // Size in Kb
 #    elif defined(GD32VF103C8)
-#        define FEE_MCU_FLASH_SIZE 64  // Size in Kb
+#        define FEE_MCU_FLASH_SIZE 64 // Size in Kb
 #    elif defined(STM32F103xB) || defined(STM32F072xB) || defined(STM32F070xB) || defined(GD32VF103CB)
-#        define FEE_MCU_FLASH_SIZE 128  // Size in Kb
+#        define FEE_MCU_FLASH_SIZE 128 // Size in Kb
 #    elif defined(STM32F303xC) || defined(STM32F401xC)
-#        define FEE_MCU_FLASH_SIZE 256  // Size in Kb
+#        define FEE_MCU_FLASH_SIZE 256 // Size in Kb
 #    elif defined(STM32F103xE) || defined(STM32F401xE) || defined(STM32F411xE)
-#        define FEE_MCU_FLASH_SIZE 512  // Size in Kb
+#        define FEE_MCU_FLASH_SIZE 512 // Size in Kb
 #    elif defined(STM32F405xG)
-#        define FEE_MCU_FLASH_SIZE 1024  // Size in Kb
+#        define FEE_MCU_FLASH_SIZE 1024 // Size in Kb
 #    endif
 #endif
 
@@ -62,7 +62,7 @@
 #if !defined(FEE_PAGE_BASE_ADDRESS)
 #    if defined(STM32F401xC) || defined(STM32F401xE) || defined(STM32F405xG) || defined(STM32F411xE)
 #        ifndef FEE_PAGE_BASE_ADDRESS
-#            define FEE_PAGE_BASE_ADDRESS 0x08004000  // bodge to force 2nd 16k page
+#            define FEE_PAGE_BASE_ADDRESS 0x08004000 // bodge to force 2nd 16k page
 #        endif
 #    else
 #        ifndef FEE_FLASH_BASE
diff --git a/platforms/chibios/eeprom_teensy.c b/platforms/chibios/eeprom_teensy.c
index 575f51526e..c8777febde 100644
--- a/platforms/chibios/eeprom_teensy.c
+++ b/platforms/chibios/eeprom_teensy.c
@@ -60,19 +60,19 @@
 
 // Minimum EEPROM Endurance
 // ------------------------
-#    if (EEPROM_SIZE == 2048)  // 35000 writes/byte or 70000 writes/word
+#    if (EEPROM_SIZE == 2048) // 35000 writes/byte or 70000 writes/word
 #        define EEESIZE 0x33
-#    elif (EEPROM_SIZE == 1024)  // 75000 writes/byte or 150000 writes/word
+#    elif (EEPROM_SIZE == 1024) // 75000 writes/byte or 150000 writes/word
 #        define EEESIZE 0x34
-#    elif (EEPROM_SIZE == 512)  // 155000 writes/byte or 310000 writes/word
+#    elif (EEPROM_SIZE == 512) // 155000 writes/byte or 310000 writes/word
 #        define EEESIZE 0x35
-#    elif (EEPROM_SIZE == 256)  // 315000 writes/byte or 630000 writes/word
+#    elif (EEPROM_SIZE == 256) // 315000 writes/byte or 630000 writes/word
 #        define EEESIZE 0x36
-#    elif (EEPROM_SIZE == 128)  // 635000 writes/byte or 1270000 writes/word
+#    elif (EEPROM_SIZE == 128) // 635000 writes/byte or 1270000 writes/word
 #        define EEESIZE 0x37
-#    elif (EEPROM_SIZE == 64)  // 1275000 writes/byte or 2550000 writes/word
+#    elif (EEPROM_SIZE == 64) // 1275000 writes/byte or 2550000 writes/word
 #        define EEESIZE 0x38
-#    elif (EEPROM_SIZE == 32)  // 2555000 writes/byte or 5110000 writes/word
+#    elif (EEPROM_SIZE == 32) // 2555000 writes/byte or 5110000 writes/word
 #        define EEESIZE 0x39
 #    endif
 
@@ -88,9 +88,9 @@ void eeprom_initialize(void) {
     if (FTFL->FCNFG & FTFL_FCNFG_RAMRDY) {
         // FlexRAM is configured as traditional RAM
         // We need to reconfigure for EEPROM usage
-        FTFL->FCCOB0 = 0x80;     // PGMPART = Program Partition Command
-        FTFL->FCCOB4 = EEESIZE;  // EEPROM Size
-        FTFL->FCCOB5 = 0x03;     // 0K for Dataflash, 32K for EEPROM backup
+        FTFL->FCCOB0 = 0x80;    // PGMPART = Program Partition Command
+        FTFL->FCCOB4 = EEESIZE; // EEPROM Size
+        FTFL->FCCOB5 = 0x03;    // 0K for Dataflash, 32K for EEPROM backup
         __disable_irq();
         // do_flash_cmd() must execute from RAM.  Luckily the C syntax is simple...
         (*((void (*)(volatile uint8_t *))((uint32_t)do_flash_cmd | 1)))(&(FTFL->FSTAT));
@@ -98,7 +98,7 @@ void eeprom_initialize(void) {
         status = FTFL->FSTAT;
         if (status & (FTFL_FSTAT_RDCOLERR | FTFL_FSTAT_ACCERR | FTFL_FSTAT_FPVIOL)) {
             FTFL->FSTAT = (status & (FTFL_FSTAT_RDCOLERR | FTFL_FSTAT_ACCERR | FTFL_FSTAT_FPVIOL));
-            return;  // error
+            return; // error
         }
     }
     // wait for eeprom to become ready (is this really necessary?)
@@ -162,7 +162,9 @@ void eeprom_read_block(void *buf, const void *addr, uint32_t len) {
  *
  * FIXME: needs doc
  */
-int eeprom_is_ready(void) { return (FTFL->FCNFG & FTFL_FCNFG_EEERDY) ? 1 : 0; }
+int eeprom_is_ready(void) {
+    return (FTFL->FCNFG & FTFL_FCNFG_EEERDY) ? 1 : 0;
+}
 
 /** \brief flexram wait
  *
@@ -486,7 +488,9 @@ void eeprom_read_block(void *buf, const void *addr, uint32_t len) {
     }
 }
 
-int eeprom_is_ready(void) { return 1; }
+int eeprom_is_ready(void) {
+    return 1;
+}
 
 void eeprom_write_word(uint16_t *addr, uint16_t value) {
     uint8_t *p = (uint8_t *)addr;
@@ -515,7 +519,9 @@ void eeprom_write_block(const void *buf, void *addr, uint32_t len) {
 #endif /* chip selection */
 // The update functions just calls write for now, but could probably be optimized
 
-void eeprom_update_byte(uint8_t *addr, uint8_t value) { eeprom_write_byte(addr, value); }
+void eeprom_update_byte(uint8_t *addr, uint8_t value) {
+    eeprom_write_byte(addr, value);
+}
 
 void eeprom_update_word(uint16_t *addr, uint16_t value) {
     uint8_t *p = (uint8_t *)addr;
diff --git a/platforms/chibios/gd32v_compatibility.h b/platforms/chibios/gd32v_compatibility.h
index f4dcfd8c55..a3148fb6d2 100644
--- a/platforms/chibios/gd32v_compatibility.h
+++ b/platforms/chibios/gd32v_compatibility.h
@@ -97,10 +97,10 @@
 /* Serial USART redefines. */
 #if HAL_USE_SERIAL
 #    if !defined(SERIAL_USART_CR1)
-#        define SERIAL_USART_CR1 (USART_CTL0_PCEN | USART_CTL0_PM | USART_CTL0_WL)  // parity enable, odd parity, 9 bit length
+#        define SERIAL_USART_CR1 (USART_CTL0_PCEN | USART_CTL0_PM | USART_CTL0_WL) // parity enable, odd parity, 9 bit length
 #    endif
 #    if !defined(SERIAL_USART_CR2)
-#        define SERIAL_USART_CR2 (USART_CTL1_STB_1)  // 2 stop bits
+#        define SERIAL_USART_CR2 (USART_CTL1_STB_1) // 2 stop bits
 #    endif
 #    if !defined(SERIAL_USART_CR3)
 #        define SERIAL_USART_CR3 0x0
diff --git a/platforms/chibios/sleep_led.c b/platforms/chibios/sleep_led.c
index 477056a454..a777d60468 100644
--- a/platforms/chibios/sleep_led.c
+++ b/platforms/chibios/sleep_led.c
@@ -93,7 +93,7 @@ void sleep_led_init(void) {
     /* Reset LPTMR settings */
     LPTMR0->CSR = 0;
     /* Set the compare value */
-    LPTMR0->CMR = 0;  // trigger on counter value (i.e. every time)
+    LPTMR0->CMR = 0; // trigger on counter value (i.e. every time)
 
 /* Set up clock source and prescaler */
 /* Software PWM
@@ -118,11 +118,11 @@ void sleep_led_init(void) {
 /* === OPTION 2 === */
 #    if 1
     //  nMHz IRC (n=4 on KL25Z, KL26Z and K20x; n=2 or 8 on KL27Z)
-    MCG->C2 |= MCG_C2_IRCS;  // fast (4MHz) internal ref clock
-#        if defined(KL27)    // divide the 8MHz IRC by 2, to have the same MCGIRCLK speed as others
+    MCG->C2 |= MCG_C2_IRCS; // fast (4MHz) internal ref clock
+#        if defined(KL27)   // divide the 8MHz IRC by 2, to have the same MCGIRCLK speed as others
     MCG->MC |= MCG_MC_LIRC_DIV2_DIV2;
-#        endif                  /* KL27 */
-    MCG->C1 |= MCG_C1_IRCLKEN;  // enable internal ref clock
+#        endif                 /* KL27 */
+    MCG->C1 |= MCG_C1_IRCLKEN; // enable internal ref clock
     //  to work in stop mode, also MCG_C1_IREFSTEN
     //  Divide 4MHz by 2^N (N=6) => 62500 irqs/sec =>
     //  => approx F=61, R=256, duration = 4
@@ -140,7 +140,7 @@ void sleep_led_init(void) {
     /* === END OPTIONS === */
 
     /* Interrupt on TCF set (compare flag) */
-    nvicEnableVector(LPTMR0_IRQn, 2);  // vector, priority
+    nvicEnableVector(LPTMR0_IRQn, 2); // vector, priority
     LPTMR0->CSR |= LPTMRx_CSR_TIE;
 }
 
@@ -169,21 +169,33 @@ static void gptTimerCallback(GPTDriver *gptp) {
 static const GPTConfig gptcfg = {1000000, gptTimerCallback, 0, 0};
 
 /* Initialise the timer */
-void sleep_led_init(void) { gptStart(&SLEEP_LED_GPT_DRIVER, &gptcfg); }
+void sleep_led_init(void) {
+    gptStart(&SLEEP_LED_GPT_DRIVER, &gptcfg);
+}
 
-void sleep_led_enable(void) { gptStartContinuous(&SLEEP_LED_GPT_DRIVER, gptcfg.frequency / 0xFFFF); }
+void sleep_led_enable(void) {
+    gptStartContinuous(&SLEEP_LED_GPT_DRIVER, gptcfg.frequency / 0xFFFF);
+}
 
-void sleep_led_disable(void) { gptStopTimer(&SLEEP_LED_GPT_DRIVER); }
+void sleep_led_disable(void) {
+    gptStopTimer(&SLEEP_LED_GPT_DRIVER);
+}
 
-void sleep_led_toggle(void) { (SLEEP_LED_GPT_DRIVER.state == GPT_READY) ? sleep_led_enable() : sleep_led_disable(); }
+void sleep_led_toggle(void) {
+    (SLEEP_LED_GPT_DRIVER.state == GPT_READY) ? sleep_led_enable() : sleep_led_disable();
+}
 
 #else /* platform selection: not on familiar chips */
 
 void sleep_led_init(void) {}
 
-void sleep_led_enable(void) { led_set(1 << USB_LED_CAPS_LOCK); }
+void sleep_led_enable(void) {
+    led_set(1 << USB_LED_CAPS_LOCK);
+}
 
-void sleep_led_disable(void) { led_set(0); }
+void sleep_led_disable(void) {
+    led_set(0);
+}
 
 void sleep_led_toggle(void) {
     // not implemented
diff --git a/platforms/chibios/syscall-fallbacks.c b/platforms/chibios/syscall-fallbacks.c
index 7150a46326..86f7907bfc 100644
--- a/platforms/chibios/syscall-fallbacks.c
+++ b/platforms/chibios/syscall-fallbacks.c
@@ -87,9 +87,13 @@ __attribute__((weak, used)) int _kill(int pid, int sig) {
     return -1;
 }
 
-__attribute__((weak, used)) pid_t _getpid(void) { return 1; }
+__attribute__((weak, used)) pid_t _getpid(void) {
+    return 1;
+}
 
-__attribute__((weak, used)) void _fini(void) { return; }
+__attribute__((weak, used)) void _fini(void) {
+    return;
+}
 
 __attribute__((weak, used, noreturn)) void _exit(int i) {
     while (1)
diff --git a/platforms/chibios/timer.c b/platforms/chibios/timer.c
index 74fdd7a6fc..e3bdfdcc37 100644
--- a/platforms/chibios/timer.c
+++ b/platforms/chibios/timer.c
@@ -73,7 +73,9 @@ void timer_clear(void) {
     chSysUnlock();
 }
 
-uint16_t timer_read(void) { return (uint16_t)timer_read32(); }
+uint16_t timer_read(void) {
+    return (uint16_t)timer_read32();
+}
 
 uint32_t timer_read32(void) {
     chSysLock();
@@ -90,12 +92,16 @@ uint32_t timer_read32(void) {
         ms_offset += OVERFLOW_ADJUST_MS;
     }
     last_ticks              = ticks;
-    uint32_t ms_offset_copy = ms_offset;  // read while still holding the lock to ensure a consistent value
+    uint32_t ms_offset_copy = ms_offset; // read while still holding the lock to ensure a consistent value
     chSysUnlock();
 
     return (uint32_t)TIME_I2MS(ticks) + ms_offset_copy;
 }
 
-uint16_t timer_elapsed(uint16_t last) { return TIMER_DIFF_16(timer_read(), last); }
+uint16_t timer_elapsed(uint16_t last) {
+    return TIMER_DIFF_16(timer_read(), last);
+}
 
-uint32_t timer_elapsed32(uint32_t last) { return TIMER_DIFF_32(timer_read32(), last); }
+uint32_t timer_elapsed32(uint32_t last) {
+    return TIMER_DIFF_32(timer_read32(), last);
+}
diff --git a/platforms/suspend.c b/platforms/suspend.c
index cd773764fa..fea23cbd02 100644
--- a/platforms/suspend.c
+++ b/platforms/suspend.c
@@ -18,7 +18,9 @@ __attribute__((weak)) void suspend_power_down_user(void) {}
  *
  * FIXME: needs doc
  */
-__attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); }
+__attribute__((weak)) void suspend_power_down_kb(void) {
+    suspend_power_down_user();
+}
 
 /** \brief run user level code immediately after wakeup
  *
@@ -30,7 +32,9 @@ __attribute__((weak)) void suspend_wakeup_init_user(void) {}
  *
  * FIXME: needs doc
  */
-__attribute__((weak)) void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); }
+__attribute__((weak)) void suspend_wakeup_init_kb(void) {
+    suspend_wakeup_init_user();
+}
 
 /** \brief suspend wakeup condition
  *
diff --git a/platforms/test/eeprom.c b/platforms/test/eeprom.c
index e292faa644..d501745e55 100644
--- a/platforms/test/eeprom.c
+++ b/platforms/test/eeprom.c
@@ -68,7 +68,9 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
     }
 }
 
-void eeprom_update_byte(uint8_t *addr, uint8_t value) { eeprom_write_byte(addr, value); }
+void eeprom_update_byte(uint8_t *addr, uint8_t value) {
+    eeprom_write_byte(addr, value);
+}
 
 void eeprom_update_word(uint16_t *addr, uint16_t value) {
     uint8_t *p = (uint8_t *)addr;
diff --git a/platforms/test/eeprom_stm32_tests.cpp b/platforms/test/eeprom_stm32_tests.cpp
index 57f31d634f..d2c41fb77d 100644
--- a/platforms/test/eeprom_stm32_tests.cpp
+++ b/platforms/test/eeprom_stm32_tests.cpp
@@ -60,7 +60,9 @@ class EepromStm32Test : public testing::Test {
     ~EepromStm32Test() {}
 
    protected:
-    void SetUp() override { EEPROM_Erase(); }
+    void SetUp() override {
+        EEPROM_Erase();
+    }
 
     void TearDown() override {
 #ifdef EEPROM_DEBUG
@@ -83,7 +85,7 @@ TEST_F(EepromStm32Test, TestReadGarbage) {
         garbage += i;
         FlashBuf[i] = garbage;
     }
-    EEPROM_Init();  // Just verify we don't crash
+    EEPROM_Init(); // Just verify we don't crash
 }
 
 TEST_F(EepromStm32Test, TestWriteBadAddress) {
@@ -206,11 +208,11 @@ TEST_F(EepromStm32Test, TestReadWord) {
 
 TEST_F(EepromStm32Test, TestWriteWord) {
     /* Direct compacted-area: Address < 0x80 */
-    EEPROM_WriteDataWord(0, 0xdead);  // Aligned
-    EEPROM_WriteDataWord(3, 0xbeef);  // Unaligned
+    EEPROM_WriteDataWord(0, 0xdead); // Aligned
+    EEPROM_WriteDataWord(3, 0xbeef); // Unaligned
     /* Direct compacted-area: Address >= 0x80 */
-    EEPROM_WriteDataWord(200, 0xabcd);  // Aligned
-    EEPROM_WriteDataWord(203, 0x9876);  // Unaligned
+    EEPROM_WriteDataWord(200, 0xabcd); // Aligned
+    EEPROM_WriteDataWord(203, 0x9876); // Unaligned
     EEPROM_WriteDataWord(EEPROM_SIZE - 4, 0x1234);
     EEPROM_WriteDataWord(EEPROM_SIZE - 2, 0x5678);
     /* Write Log word zero-encoded */
@@ -218,10 +220,10 @@ TEST_F(EepromStm32Test, TestWriteWord) {
     /* Write Log word one-encoded */
     EEPROM_WriteDataWord(EEPROM_SIZE - 2, 1);
     /* Write Log word value aligned */
-    EEPROM_WriteDataWord(200, 0x4321);  // Aligned
+    EEPROM_WriteDataWord(200, 0x4321); // Aligned
     /* Write Log word value unaligned */
-    EEPROM_WriteDataByte(202, 0x3c);    // Set neighboring byte
-    EEPROM_WriteDataWord(203, 0xcdef);  // Unaligned
+    EEPROM_WriteDataByte(202, 0x3c);   // Set neighboring byte
+    EEPROM_WriteDataWord(203, 0xcdef); // Unaligned
     /* Check values */
     /* Direct compacted-area */
     EXPECT_EQ(*(uint16_t*)&FlashBuf[EEPROM_BASE], (uint16_t)~0xdead);
@@ -249,11 +251,11 @@ TEST_F(EepromStm32Test, TestWriteWord) {
 
 TEST_F(EepromStm32Test, TestWordRoundTrip) {
     /* Direct compacted-area: Address < 0x80 */
-    EEPROM_WriteDataWord(0, 0xdead);  // Aligned
-    EEPROM_WriteDataWord(3, 0xbeef);  // Unaligned
+    EEPROM_WriteDataWord(0, 0xdead); // Aligned
+    EEPROM_WriteDataWord(3, 0xbeef); // Unaligned
     /* Direct compacted-area: Address >= 0x80 */
-    EEPROM_WriteDataWord(200, 0xabcd);  // Aligned
-    EEPROM_WriteDataWord(203, 0x9876);  // Unaligned
+    EEPROM_WriteDataWord(200, 0xabcd); // Aligned
+    EEPROM_WriteDataWord(203, 0x9876); // Unaligned
     EEPROM_WriteDataWord(EEPROM_SIZE - 4, 0x1234);
     EEPROM_WriteDataWord(EEPROM_SIZE - 2, 0x5678);
     /* Check values */
@@ -270,10 +272,10 @@ TEST_F(EepromStm32Test, TestWordRoundTrip) {
     /* Write Log word one-encoded */
     EEPROM_WriteDataWord(EEPROM_SIZE - 2, 1);
     /* Write Log word value aligned */
-    EEPROM_WriteDataWord(200, 0x4321);  // Aligned
+    EEPROM_WriteDataWord(200, 0x4321); // Aligned
     /* Write Log word value unaligned */
-    EEPROM_WriteDataByte(202, 0x3c);    // Set neighboring byte
-    EEPROM_WriteDataWord(203, 0xcdef);  // Unaligned
+    EEPROM_WriteDataByte(202, 0x3c);   // Set neighboring byte
+    EEPROM_WriteDataWord(203, 0xcdef); // Unaligned
     /* Check values */
     EEPROM_Init();
     EXPECT_EQ(EEPROM_ReadDataWord(200), 0x4321);
@@ -324,34 +326,34 @@ TEST_F(EepromStm32Test, TestByteWordBoundary) {
 
 TEST_F(EepromStm32Test, TestDWordRoundTrip) {
     /* Direct compacted-area: Address < 0x80 */
-    eeprom_write_dword((uint32_t*)0, 0xdeadbeef);  // Aligned
-    eeprom_write_dword((uint32_t*)9, 0x12345678);  // Unaligned
+    eeprom_write_dword((uint32_t*)0, 0xdeadbeef); // Aligned
+    eeprom_write_dword((uint32_t*)9, 0x12345678); // Unaligned
     /* Direct compacted-area: Address >= 0x80 */
     eeprom_write_dword((uint32_t*)200, 0xfacef00d);
-    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 4), 0xba5eba11);  // Aligned
-    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 9), 0xcafed00d);  // Unaligned
+    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 4), 0xba5eba11); // Aligned
+    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 9), 0xcafed00d); // Unaligned
     /* Check direct values */
     EEPROM_Init();
     EXPECT_EQ(eeprom_read_dword((uint32_t*)0), 0xdeadbeef);
     EXPECT_EQ(eeprom_read_dword((uint32_t*)9), 0x12345678);
     EXPECT_EQ(eeprom_read_dword((uint32_t*)200), 0xfacef00d);
-    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 4)), 0xba5eba11);  // Aligned
-    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 9)), 0xcafed00d);  // Unaligned
+    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 4)), 0xba5eba11); // Aligned
+    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 9)), 0xcafed00d); // Unaligned
     /* Write Log byte encoded */
     eeprom_write_dword((uint32_t*)0, 0xdecafbad);
     eeprom_write_dword((uint32_t*)9, 0x87654321);
     /* Write Log word encoded */
     eeprom_write_dword((uint32_t*)200, 1);
     /* Write Log word value aligned */
-    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 4), 0xdeadc0de);  // Aligned
-    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 9), 0x6789abcd);  // Unaligned
+    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 4), 0xdeadc0de); // Aligned
+    eeprom_write_dword((uint32_t*)(EEPROM_SIZE - 9), 0x6789abcd); // Unaligned
     /* Check log values */
     EEPROM_Init();
     EXPECT_EQ(eeprom_read_dword((uint32_t*)0), 0xdecafbad);
     EXPECT_EQ(eeprom_read_dword((uint32_t*)9), 0x87654321);
     EXPECT_EQ(eeprom_read_dword((uint32_t*)200), 1);
-    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 4)), 0xdeadc0de);  // Aligned
-    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 9)), 0x6789abcd);  // Unaligned
+    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 4)), 0xdeadc0de); // Aligned
+    EXPECT_EQ(eeprom_read_dword((uint32_t*)(EEPROM_SIZE - 9)), 0x6789abcd); // Unaligned
 }
 
 TEST_F(EepromStm32Test, TestBlockRoundTrip) {
diff --git a/platforms/test/flash_stm32_mock.c b/platforms/test/flash_stm32_mock.c
index 222a004bc7..b6ab170f95 100644
--- a/platforms/test/flash_stm32_mock.c
+++ b/platforms/test/flash_stm32_mock.c
@@ -44,6 +44,12 @@ FLASH_Status FLASH_ProgramHalfWord(uint32_t Address, uint16_t Data) {
     }
 }
 
-FLASH_Status FLASH_WaitForLastOperation(uint32_t Timeout) { return FLASH_COMPLETE; }
-void         FLASH_Unlock(void) { flash_locked = false; }
-void         FLASH_Lock(void) { flash_locked = true; }
+FLASH_Status FLASH_WaitForLastOperation(uint32_t Timeout) {
+    return FLASH_COMPLETE;
+}
+void FLASH_Unlock(void) {
+    flash_locked = false;
+}
+void FLASH_Lock(void) {
+    flash_locked = true;
+}
diff --git a/platforms/test/timer.c b/platforms/test/timer.c
index 61c3a00201..e0acd1b16d 100644
--- a/platforms/test/timer.c
+++ b/platforms/test/timer.c
@@ -18,16 +18,34 @@
 
 static uint32_t current_time = 0;
 
-void timer_init(void) { current_time = 0; }
+void timer_init(void) {
+    current_time = 0;
+}
 
-void timer_clear(void) { current_time = 0; }
+void timer_clear(void) {
+    current_time = 0;
+}
 
-uint16_t timer_read(void) { return current_time & 0xFFFF; }
-uint32_t timer_read32(void) { return current_time; }
-uint16_t timer_elapsed(uint16_t last) { return TIMER_DIFF_16(timer_read(), last); }
-uint32_t timer_elapsed32(uint32_t last) { return TIMER_DIFF_32(timer_read32(), last); }
+uint16_t timer_read(void) {
+    return current_time & 0xFFFF;
+}
+uint32_t timer_read32(void) {
+    return current_time;
+}
+uint16_t timer_elapsed(uint16_t last) {
+    return TIMER_DIFF_16(timer_read(), last);
+}
+uint32_t timer_elapsed32(uint32_t last) {
+    return TIMER_DIFF_32(timer_read32(), last);
+}
 
-void set_time(uint32_t t) { current_time = t; }
-void advance_time(uint32_t ms) { current_time += ms; }
+void set_time(uint32_t t) {
+    current_time = t;
+}
+void advance_time(uint32_t ms) {
+    current_time += ms;
+}
 
-void wait_ms(uint32_t ms) { advance_time(ms); }
+void wait_ms(uint32_t ms) {
+    advance_time(ms);
+}
diff --git a/platforms/timer.h b/platforms/timer.h
index 02e39e79e7..d55f40f0b0 100644
--- a/platforms/timer.h
+++ b/platforms/timer.h
@@ -52,14 +52,22 @@ uint32_t timer_elapsed32(uint32_t last);
 #    define TIMER_DIFF_FAST(a, b) TIMER_DIFF_16(a, b)
 #    define timer_expired_fast(current, future) timer_expired(current, future)
 typedef uint16_t fast_timer_t;
-fast_timer_t inline timer_read_fast(void) { return timer_read(); }
-fast_timer_t inline timer_elapsed_fast(fast_timer_t last) { return timer_elapsed(last); }
+fast_timer_t inline timer_read_fast(void) {
+    return timer_read();
+}
+fast_timer_t inline timer_elapsed_fast(fast_timer_t last) {
+    return timer_elapsed(last);
+}
 #else
 #    define TIMER_DIFF_FAST(a, b) TIMER_DIFF_32(a, b)
 #    define timer_expired_fast(current, future) timer_expired32(current, future)
 typedef uint32_t fast_timer_t;
-fast_timer_t inline timer_read_fast(void) { return timer_read32(); }
-fast_timer_t inline timer_elapsed_fast(fast_timer_t last) { return timer_elapsed32(last); }
+fast_timer_t inline timer_read_fast(void) {
+    return timer_read32();
+}
+fast_timer_t inline timer_elapsed_fast(fast_timer_t last) {
+    return timer_elapsed32(last);
+}
 #endif
 
 #ifdef __cplusplus
diff --git a/quantum/action.c b/quantum/action.c
index d932c01688..2bb1c34985 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -53,14 +53,20 @@ int retro_tapping_counter = 0;
 #endif
 
 #ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY
-__attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { return false; }
+__attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
+    return false;
+}
 #endif
 
 #ifdef RETRO_TAPPING_PER_KEY
-__attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) { return false; }
+__attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) {
+    return false;
+}
 #endif
 
-__attribute__((weak)) bool pre_process_record_quantum(keyrecord_t *record) { return true; }
+__attribute__((weak)) bool pre_process_record_quantum(keyrecord_t *record) {
+    return true;
+}
 
 /** \brief Called to execute an action.
  *
@@ -163,10 +169,14 @@ void process_record_nocache(keyrecord_t *record) {
     disable_action_cache = false;
 }
 #else
-void process_record_nocache(keyrecord_t *record) { process_record(record); }
+void process_record_nocache(keyrecord_t *record) {
+    process_record(record);
+}
 #endif
 
-__attribute__((weak)) bool process_record_quantum(keyrecord_t *record) { return true; }
+__attribute__((weak)) bool process_record_quantum(keyrecord_t *record) {
+    return true;
+}
 
 __attribute__((weak)) void post_process_record_quantum(keyrecord_t *record) {}
 
@@ -688,7 +698,7 @@ void process_action(keyrecord_t *record, action_t action) {
                     /* tap key */
                     if (tap_count > 0) {
                         if (swap_held) {
-                            swap_hands = !swap_hands;  // undo hold set up in _tap_hint
+                            swap_hands = !swap_hands; // undo hold set up in _tap_hint
                             swap_held  = false;
                         }
                         if (event.pressed) {
@@ -696,11 +706,11 @@ void process_action(keyrecord_t *record, action_t action) {
                         } else {
                             wait_ms(TAP_CODE_DELAY);
                             unregister_code(action.swap.code);
-                            *record = (keyrecord_t){};  // hack: reset tap mode
+                            *record = (keyrecord_t){}; // hack: reset tap mode
                         }
                     } else {
                         if (swap_held && !event.pressed) {
-                            swap_hands = !swap_hands;  // undo hold set up in _tap_hint
+                            swap_hands = !swap_hands; // undo hold set up in _tap_hint
                             swap_held  = false;
                         }
                     }
@@ -862,9 +872,13 @@ __attribute__((weak)) void register_code(uint8_t code) {
         }
 #ifdef EXTRAKEY_ENABLE
     else if
-        IS_SYSTEM(code) { host_system_send(KEYCODE2SYSTEM(code)); }
+        IS_SYSTEM(code) {
+            host_system_send(KEYCODE2SYSTEM(code));
+        }
     else if
-        IS_CONSUMER(code) { host_consumer_send(KEYCODE2CONSUMER(code)); }
+        IS_CONSUMER(code) {
+            host_consumer_send(KEYCODE2CONSUMER(code));
+        }
 #endif
 #ifdef MOUSEKEY_ENABLE
     else if
@@ -927,9 +941,13 @@ __attribute__((weak)) void unregister_code(uint8_t code) {
             send_keyboard_report();
         }
     else if
-        IS_SYSTEM(code) { host_system_send(0); }
+        IS_SYSTEM(code) {
+            host_system_send(0);
+        }
     else if
-        IS_CONSUMER(code) { host_consumer_send(0); }
+        IS_CONSUMER(code) {
+            host_consumer_send(0);
+        }
 #ifdef MOUSEKEY_ENABLE
     else if
         IS_MOUSEKEY(code) {
@@ -956,7 +974,9 @@ __attribute__((weak)) void tap_code_delay(uint8_t code, uint16_t delay) {
  *
  * \param code The basic keycode to tap. If `code` is `KC_CAPS_LOCK`, the delay will be `TAP_HOLD_CAPS_DELAY`, otherwise `TAP_CODE_DELAY`, if defined.
  */
-__attribute__((weak)) void tap_code(uint8_t code) { tap_code_delay(code, code == KC_CAPS_LOCK ? TAP_HOLD_CAPS_DELAY : TAP_CODE_DELAY); }
+__attribute__((weak)) void tap_code(uint8_t code) {
+    tap_code_delay(code, code == KC_CAPS_LOCK ? TAP_HOLD_CAPS_DELAY : TAP_CODE_DELAY);
+}
 
 /** \brief Adds the given physically pressed modifiers and sends a keyboard report immediately.
  *
@@ -1100,7 +1120,9 @@ bool is_tap_action(action_t action) {
  *
  * FIXME: Needs documentation.
  */
-void debug_event(keyevent_t event) { dprintf("%04X%c(%u)", (event.key.row << 8 | event.key.col), (event.pressed ? 'd' : 'u'), event.time); }
+void debug_event(keyevent_t event) {
+    dprintf("%04X%c(%u)", (event.key.row << 8 | event.key.col), (event.pressed ? 'd' : 'u'), event.time);
+}
 /** \brief Debug print (FIXME: Needs better description)
  *
  * FIXME: Needs documentation.
diff --git a/quantum/action_layer.c b/quantum/action_layer.c
index ed1a4bd20d..e20eedee40 100644
--- a/quantum/action_layer.c
+++ b/quantum/action_layer.c
@@ -18,13 +18,17 @@ layer_state_t default_layer_state = 0;
  *
  * Run user code on default layer state change
  */
-__attribute__((weak)) layer_state_t default_layer_state_set_user(layer_state_t state) { return state; }
+__attribute__((weak)) layer_state_t default_layer_state_set_user(layer_state_t state) {
+    return state;
+}
 
 /** \brief Default Layer State Set At Keyboard Level
  *
  *  Run keyboard code on default layer state change
  */
-__attribute__((weak)) layer_state_t default_layer_state_set_kb(layer_state_t state) { return default_layer_state_set_user(state); }
+__attribute__((weak)) layer_state_t default_layer_state_set_kb(layer_state_t state) {
+    return default_layer_state_set_user(state);
+}
 
 /** \brief Default Layer State Set
  *
@@ -39,9 +43,9 @@ static void default_layer_state_set(layer_state_t state) {
     default_layer_debug();
     debug("\n");
 #ifdef STRICT_LAYER_RELEASE
-    clear_keyboard_but_mods();  // To avoid stuck keys
+    clear_keyboard_but_mods(); // To avoid stuck keys
 #else
-    clear_keyboard_but_mods_and_keys();  // Don't reset held keys
+    clear_keyboard_but_mods_and_keys(); // Don't reset held keys
 #endif
 }
 
@@ -49,30 +53,40 @@ static void default_layer_state_set(layer_state_t state) {
  *
  * Print out the hex value of the 32-bit default layer state, as well as the value of the highest bit.
  */
-void default_layer_debug(void) { dprintf("%08lX(%u)", default_layer_state, get_highest_layer(default_layer_state)); }
+void default_layer_debug(void) {
+    dprintf("%08lX(%u)", default_layer_state, get_highest_layer(default_layer_state));
+}
 
 /** \brief Default Layer Set
  *
  * Sets the default layer state.
  */
-void default_layer_set(layer_state_t state) { default_layer_state_set(state); }
+void default_layer_set(layer_state_t state) {
+    default_layer_state_set(state);
+}
 
 #ifndef NO_ACTION_LAYER
 /** \brief Default Layer Or
  *
  * Turns on the default layer based on matching bits between specifed layer and existing layer state
  */
-void default_layer_or(layer_state_t state) { default_layer_state_set(default_layer_state | state); }
+void default_layer_or(layer_state_t state) {
+    default_layer_state_set(default_layer_state | state);
+}
 /** \brief Default Layer And
  *
  * Turns on default layer based on matching enabled bits between specifed layer and existing layer state
  */
-void default_layer_and(layer_state_t state) { default_layer_state_set(default_layer_state & state); }
+void default_layer_and(layer_state_t state) {
+    default_layer_state_set(default_layer_state & state);
+}
 /** \brief Default Layer Xor
  *
  * Turns on default layer based on non-matching bits between specifed layer and existing layer state
  */
-void default_layer_xor(layer_state_t state) { default_layer_state_set(default_layer_state ^ state); }
+void default_layer_xor(layer_state_t state) {
+    default_layer_state_set(default_layer_state ^ state);
+}
 #endif
 
 #ifndef NO_ACTION_LAYER
@@ -84,13 +98,17 @@ layer_state_t layer_state = 0;
  *
  * Runs user code on layer state change
  */
-__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) { return state; }
+__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
+    return state;
+}
 
 /** \brief Layer state set keyboard
  *
  * Runs keyboard code on layer state change
  */
-__attribute__((weak)) layer_state_t layer_state_set_kb(layer_state_t state) { return layer_state_set_user(state); }
+__attribute__((weak)) layer_state_t layer_state_set_kb(layer_state_t state) {
+    return layer_state_set_user(state);
+}
 
 /** \brief Layer state set
  *
@@ -105,9 +123,9 @@ void layer_state_set(layer_state_t state) {
     layer_debug();
     dprintln();
 #    ifdef STRICT_LAYER_RELEASE
-    clear_keyboard_but_mods();  // To avoid stuck keys
+    clear_keyboard_but_mods(); // To avoid stuck keys
 #    else
-    clear_keyboard_but_mods_and_keys();  // Don't reset held keys
+    clear_keyboard_but_mods_and_keys(); // Don't reset held keys
 #    endif
 }
 
@@ -115,13 +133,17 @@ void layer_state_set(layer_state_t state) {
  *
  * Turn off all layers
  */
-void layer_clear(void) { layer_state_set(0); }
+void layer_clear(void) {
+    layer_state_set(0);
+}
 
 /** \brief Layer state is
  *
  * Return whether the given state is on (it might still be shadowed by a higher state, though)
  */
-bool layer_state_is(uint8_t layer) { return layer_state_cmp(layer_state, layer); }
+bool layer_state_is(uint8_t layer) {
+    return layer_state_cmp(layer_state, layer);
+}
 
 /** \brief Layer state compare
  *
@@ -138,47 +160,63 @@ bool layer_state_cmp(layer_state_t cmp_layer_state, uint8_t layer) {
  *
  * Turns on the given layer and turn off all other layers
  */
-void layer_move(uint8_t layer) { layer_state_set((layer_state_t)1 << layer); }
+void layer_move(uint8_t layer) {
+    layer_state_set((layer_state_t)1 << layer);
+}
 
 /** \brief Layer on
  *
  * Turns on given layer
  */
-void layer_on(uint8_t layer) { layer_state_set(layer_state | ((layer_state_t)1 << layer)); }
+void layer_on(uint8_t layer) {
+    layer_state_set(layer_state | ((layer_state_t)1 << layer));
+}
 
 /** \brief Layer off
  *
  * Turns off given layer
  */
-void layer_off(uint8_t layer) { layer_state_set(layer_state & ~((layer_state_t)1 << layer)); }
+void layer_off(uint8_t layer) {
+    layer_state_set(layer_state & ~((layer_state_t)1 << layer));
+}
 
 /** \brief Layer invert
  *
  * Toggle the given layer (set it if it's unset, or unset it if it's set)
  */
-void layer_invert(uint8_t layer) { layer_state_set(layer_state ^ ((layer_state_t)1 << layer)); }
+void layer_invert(uint8_t layer) {
+    layer_state_set(layer_state ^ ((layer_state_t)1 << layer));
+}
 
 /** \brief Layer or
  *
  * Turns on layers based on matching bits between specifed layer and existing layer state
  */
-void layer_or(layer_state_t state) { layer_state_set(layer_state | state); }
+void layer_or(layer_state_t state) {
+    layer_state_set(layer_state | state);
+}
 /** \brief Layer and
  *
  * Turns on layers based on matching enabled bits between specifed layer and existing layer state
  */
-void layer_and(layer_state_t state) { layer_state_set(layer_state & state); }
+void layer_and(layer_state_t state) {
+    layer_state_set(layer_state & state);
+}
 /** \brief Layer xor
  *
  * Turns on layers based on non-matching bits between specifed layer and existing layer state
  */
-void layer_xor(layer_state_t state) { layer_state_set(layer_state ^ state); }
+void layer_xor(layer_state_t state) {
+    layer_state_set(layer_state ^ state);
+}
 
 /** \brief Layer debug printing
  *
  * Print out the hex value of the 32-bit layer state, as well as the value of the highest bit.
  */
-void layer_debug(void) { dprintf("%08lX(%u)", layer_state, get_highest_layer(layer_state)); }
+void layer_debug(void) {
+    dprintf("%08lX(%u)", layer_state, get_highest_layer(layer_state));
+}
 #endif
 
 #if !defined(NO_ACTION_LAYER) && !defined(STRICT_LAYER_RELEASE)
@@ -276,4 +314,6 @@ uint8_t layer_switch_get_layer(keypos_t key) {
  *
  * Gets action code based on key position
  */
-action_t layer_switch_get_action(keypos_t key) { return action_for_key(layer_switch_get_layer(key), key); }
+action_t layer_switch_get_action(keypos_t key) {
+    return action_for_key(layer_switch_get_layer(key), key);
+}
diff --git a/quantum/action_tapping.c b/quantum/action_tapping.c
index 4ba38bee8d..6f8b4f8c56 100644
--- a/quantum/action_tapping.c
+++ b/quantum/action_tapping.c
@@ -26,7 +26,9 @@
 
 uint16_t g_tapping_term = TAPPING_TERM;
 
-__attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { return g_tapping_term; }
+__attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
+    return g_tapping_term;
+}
 
 #    ifdef TAPPING_TERM_PER_KEY
 #        define WITHIN_TAPPING_TERM(e) (TIMER_DIFF_16(e.time, tapping_key.event.time) < get_tapping_term(get_record_keycode(&tapping_key, false), &tapping_key))
@@ -35,15 +37,21 @@ __attribute__((weak)) uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *r
 #    endif
 
 #    ifdef TAPPING_FORCE_HOLD_PER_KEY
-__attribute__((weak)) bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) { return false; }
+__attribute__((weak)) bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
+    return false;
+}
 #    endif
 
 #    ifdef PERMISSIVE_HOLD_PER_KEY
-__attribute__((weak)) bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) { return false; }
+__attribute__((weak)) bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
+    return false;
+}
 #    endif
 
 #    ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-__attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { return false; }
+__attribute__((weak)) bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
+    return false;
+}
 #    endif
 
 #    if defined(AUTO_SHIFT_ENABLE) && defined(RETRO_SHIFT)
diff --git a/quantum/action_util.c b/quantum/action_util.c
index 9eb2a6d30d..64a1b6b30d 100644
--- a/quantum/action_util.c
+++ b/quantum/action_util.c
@@ -43,8 +43,10 @@ extern inline void clear_keys(void);
 #ifndef NO_ACTION_ONESHOT
 static uint8_t oneshot_mods        = 0;
 static uint8_t oneshot_locked_mods = 0;
-uint8_t        get_oneshot_locked_mods(void) { return oneshot_locked_mods; }
-void           set_oneshot_locked_mods(uint8_t mods) {
+uint8_t        get_oneshot_locked_mods(void) {
+    return oneshot_locked_mods;
+}
+void set_oneshot_locked_mods(uint8_t mods) {
     if (mods != oneshot_locked_mods) {
         oneshot_locked_mods = mods;
         oneshot_locked_mods_changed_kb(oneshot_locked_mods);
@@ -58,9 +60,13 @@ void clear_oneshot_locked_mods(void) {
 }
 #    if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
 static uint16_t oneshot_time = 0;
-bool            has_oneshot_mods_timed_out(void) { return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT; }
+bool            has_oneshot_mods_timed_out(void) {
+    return TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT;
+}
 #    else
-bool has_oneshot_mods_timed_out(void) { return false; }
+bool has_oneshot_mods_timed_out(void) {
+    return false;
+}
 #    endif
 #endif
 
@@ -74,24 +80,32 @@ bool has_oneshot_mods_timed_out(void) { return false; }
  */
 static int8_t oneshot_layer_data = 0;
 
-inline uint8_t get_oneshot_layer(void) { return oneshot_layer_data >> 3; }
-inline uint8_t get_oneshot_layer_state(void) { return oneshot_layer_data & 0b111; }
+inline uint8_t get_oneshot_layer(void) {
+    return oneshot_layer_data >> 3;
+}
+inline uint8_t get_oneshot_layer_state(void) {
+    return oneshot_layer_data & 0b111;
+}
 
 #    ifdef SWAP_HANDS_ENABLE
 enum {
     SHO_OFF,
-    SHO_ACTIVE,   // Swap hands button was pressed, and we didn't send any swapped keys yet
-    SHO_PRESSED,  // Swap hands button is currently pressed
-    SHO_USED,     // Swap hands button is still pressed, and we already sent swapped keys
+    SHO_ACTIVE,  // Swap hands button was pressed, and we didn't send any swapped keys yet
+    SHO_PRESSED, // Swap hands button is currently pressed
+    SHO_USED,    // Swap hands button is still pressed, and we already sent swapped keys
 } swap_hands_oneshot = SHO_OFF;
 #    endif
 
 #    if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
 static uint16_t oneshot_layer_time = 0;
-inline bool     has_oneshot_layer_timed_out() { return TIMER_DIFF_16(timer_read(), oneshot_layer_time) >= ONESHOT_TIMEOUT && !(get_oneshot_layer_state() & ONESHOT_TOGGLED); }
+inline bool     has_oneshot_layer_timed_out() {
+    return TIMER_DIFF_16(timer_read(), oneshot_layer_time) >= ONESHOT_TIMEOUT && !(get_oneshot_layer_state() & ONESHOT_TOGGLED);
+}
 #        ifdef SWAP_HANDS_ENABLE
 static uint16_t oneshot_swaphands_time = 0;
-inline bool     has_oneshot_swaphands_timed_out() { return TIMER_DIFF_16(timer_read(), oneshot_swaphands_time) >= ONESHOT_TIMEOUT && (swap_hands_oneshot == SHO_ACTIVE); }
+inline bool     has_oneshot_swaphands_timed_out() {
+    return TIMER_DIFF_16(timer_read(), oneshot_swaphands_time) >= ONESHOT_TIMEOUT && (swap_hands_oneshot == SHO_ACTIVE);
+}
 #        endif
 #    endif
 
@@ -179,7 +193,9 @@ void clear_oneshot_layer_state(oneshot_fullfillment_t state) {
  *
  * FIXME: needs doc
  */
-bool is_oneshot_layer_active(void) { return get_oneshot_layer_state(); }
+bool is_oneshot_layer_active(void) {
+    return get_oneshot_layer_state();
+}
 
 /** \brief set oneshot
  *
@@ -198,21 +214,29 @@ void oneshot_set(bool active) {
  *
  * FIXME: needs doc
  */
-void oneshot_toggle(void) { oneshot_set(!keymap_config.oneshot_disable); }
+void oneshot_toggle(void) {
+    oneshot_set(!keymap_config.oneshot_disable);
+}
 
 /** \brief enable oneshot
  *
  * FIXME: needs doc
  */
-void oneshot_enable(void) { oneshot_set(true); }
+void oneshot_enable(void) {
+    oneshot_set(true);
+}
 
 /** \brief disable oneshot
  *
  * FIXME: needs doc
  */
-void oneshot_disable(void) { oneshot_set(false); }
+void oneshot_disable(void) {
+    oneshot_set(false);
+}
 
-bool is_oneshot_enabled(void) { return keymap_config.oneshot_disable; }
+bool is_oneshot_enabled(void) {
+    return keymap_config.oneshot_disable;
+}
 
 #endif
 
@@ -259,68 +283,96 @@ void send_keyboard_report(void) {
  *
  * FIXME: needs doc
  */
-uint8_t get_mods(void) { return real_mods; }
+uint8_t get_mods(void) {
+    return real_mods;
+}
 /** \brief add mods
  *
  * FIXME: needs doc
  */
-void add_mods(uint8_t mods) { real_mods |= mods; }
+void add_mods(uint8_t mods) {
+    real_mods |= mods;
+}
 /** \brief del mods
  *
  * FIXME: needs doc
  */
-void del_mods(uint8_t mods) { real_mods &= ~mods; }
+void del_mods(uint8_t mods) {
+    real_mods &= ~mods;
+}
 /** \brief set mods
  *
  * FIXME: needs doc
  */
-void set_mods(uint8_t mods) { real_mods = mods; }
+void set_mods(uint8_t mods) {
+    real_mods = mods;
+}
 /** \brief clear mods
  *
  * FIXME: needs doc
  */
-void clear_mods(void) { real_mods = 0; }
+void clear_mods(void) {
+    real_mods = 0;
+}
 
 /** \brief get weak mods
  *
  * FIXME: needs doc
  */
-uint8_t get_weak_mods(void) { return weak_mods; }
+uint8_t get_weak_mods(void) {
+    return weak_mods;
+}
 /** \brief add weak mods
  *
  * FIXME: needs doc
  */
-void add_weak_mods(uint8_t mods) { weak_mods |= mods; }
+void add_weak_mods(uint8_t mods) {
+    weak_mods |= mods;
+}
 /** \brief del weak mods
  *
  * FIXME: needs doc
  */
-void del_weak_mods(uint8_t mods) { weak_mods &= ~mods; }
+void del_weak_mods(uint8_t mods) {
+    weak_mods &= ~mods;
+}
 /** \brief set weak mods
  *
  * FIXME: needs doc
  */
-void set_weak_mods(uint8_t mods) { weak_mods = mods; }
+void set_weak_mods(uint8_t mods) {
+    weak_mods = mods;
+}
 /** \brief clear weak mods
  *
  * FIXME: needs doc
  */
-void clear_weak_mods(void) { weak_mods = 0; }
+void clear_weak_mods(void) {
+    weak_mods = 0;
+}
 
 #ifdef KEY_OVERRIDE_ENABLE
 /** \brief set weak mods used by key overrides. DO not call this manually
  */
-void set_weak_override_mods(uint8_t mods) { weak_override_mods = mods; }
+void set_weak_override_mods(uint8_t mods) {
+    weak_override_mods = mods;
+}
 /** \brief clear weak mods used by key overrides. DO not call this manually
  */
-void clear_weak_override_mods(void) { weak_override_mods = 0; }
+void clear_weak_override_mods(void) {
+    weak_override_mods = 0;
+}
 
 /** \brief set suppressed mods used by key overrides. DO not call this manually
  */
-void set_suppressed_override_mods(uint8_t mods) { suppressed_mods = mods; }
+void set_suppressed_override_mods(uint8_t mods) {
+    suppressed_mods = mods;
+}
 /** \brief clear suppressed mods used by key overrides. DO not call this manually
  */
-void clear_suppressed_override_mods(void) { suppressed_mods = 0; }
+void clear_suppressed_override_mods(void) {
+    suppressed_mods = 0;
+}
 #endif
 
 #ifndef NO_ACTION_ONESHOT
@@ -328,7 +380,9 @@ void clear_suppressed_override_mods(void) { suppressed_mods = 0; }
  *
  * FIXME: needs doc
  */
-uint8_t get_oneshot_mods(void) { return oneshot_mods; }
+uint8_t get_oneshot_mods(void) {
+    return oneshot_mods;
+}
 
 void add_oneshot_mods(uint8_t mods) {
     if ((oneshot_mods & mods) != mods) {
@@ -391,7 +445,9 @@ __attribute__((weak)) void oneshot_locked_mods_changed_user(uint8_t mods) {}
  *
  * \param mods Contains the active modifiers active after the change.
  */
-__attribute__((weak)) void oneshot_locked_mods_changed_kb(uint8_t mods) { oneshot_locked_mods_changed_user(mods); }
+__attribute__((weak)) void oneshot_locked_mods_changed_kb(uint8_t mods) {
+    oneshot_locked_mods_changed_user(mods);
+}
 
 /** \brief Called when the one shot modifiers have been changed.
  *
@@ -403,7 +459,9 @@ __attribute__((weak)) void oneshot_mods_changed_user(uint8_t mods) {}
  *
  * \param mods Contains the active modifiers active after the change.
  */
-__attribute__((weak)) void oneshot_mods_changed_kb(uint8_t mods) { oneshot_mods_changed_user(mods); }
+__attribute__((weak)) void oneshot_mods_changed_kb(uint8_t mods) {
+    oneshot_mods_changed_user(mods);
+}
 
 /** \brief Called when the one shot layers have been changed.
  *
@@ -415,10 +473,14 @@ __attribute__((weak)) void oneshot_layer_changed_user(uint8_t layer) {}
  *
  * \param layer Contains the layer that is toggled on, or zero when toggled off.
  */
-__attribute__((weak)) void oneshot_layer_changed_kb(uint8_t layer) { oneshot_layer_changed_user(layer); }
+__attribute__((weak)) void oneshot_layer_changed_kb(uint8_t layer) {
+    oneshot_layer_changed_user(layer);
+}
 
 /** \brief inspect keyboard state
  *
  * FIXME: needs doc
  */
-uint8_t has_anymod(void) { return bitpop(real_mods); }
+uint8_t has_anymod(void) {
+    return bitpop(real_mods);
+}
diff --git a/quantum/action_util.h b/quantum/action_util.h
index bfd0a6cf95..6f1f09c4bd 100644
--- a/quantum/action_util.h
+++ b/quantum/action_util.h
@@ -29,11 +29,17 @@ extern report_keyboard_t *keyboard_report;
 void send_keyboard_report(void);
 
 /* key */
-inline void add_key(uint8_t key) { add_key_to_report(keyboard_report, key); }
+inline void add_key(uint8_t key) {
+    add_key_to_report(keyboard_report, key);
+}
 
-inline void del_key(uint8_t key) { del_key_from_report(keyboard_report, key); }
+inline void del_key(uint8_t key) {
+    del_key_from_report(keyboard_report, key);
+}
 
-inline void clear_keys(void) { clear_keys_from_report(keyboard_report); }
+inline void clear_keys(void) {
+    clear_keys_from_report(keyboard_report);
+}
 
 /* modifier */
 uint8_t get_mods(void);
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index b3d6389dd5..c6523b908c 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -64,21 +64,21 @@
 #ifndef AUDIO_TONE_STACKSIZE
 #    define AUDIO_TONE_STACKSIZE 8
 #endif
-uint8_t        active_tones = 0;             // number of tones pushed onto the stack by audio_play_tone - might be more than the hardware is able to reproduce at any single time
-musical_tone_t tones[AUDIO_TONE_STACKSIZE];  // stack of currently active tones
+uint8_t        active_tones = 0;            // number of tones pushed onto the stack by audio_play_tone - might be more than the hardware is able to reproduce at any single time
+musical_tone_t tones[AUDIO_TONE_STACKSIZE]; // stack of currently active tones
 
-bool playing_melody = false;  // playing a SONG?
-bool playing_note   = false;  // or (possibly multiple simultaneous) tones
-bool state_changed  = false;  // global flag, which is set if anything changes with the active_tones
+bool playing_melody = false; // playing a SONG?
+bool playing_note   = false; // or (possibly multiple simultaneous) tones
+bool state_changed  = false; // global flag, which is set if anything changes with the active_tones
 
 // melody/SONG related state variables
-float (*notes_pointer)[][2];                            // SONG, an array of MUSICAL_NOTEs
-uint16_t notes_count;                                   // length of the notes_pointer array
-bool     notes_repeat;                                  // PLAY_SONG or PLAY_LOOP?
-uint16_t melody_current_note_duration = 0;              // duration of the currently playing note from the active melody, in ms
-uint8_t  note_tempo                   = TEMPO_DEFAULT;  // beats-per-minute
-uint16_t current_note                 = 0;              // index into the array at notes_pointer
-bool     note_resting                 = false;          // if a short pause was introduced between two notes with the same frequency while playing a melody
+float (*notes_pointer)[][2];                           // SONG, an array of MUSICAL_NOTEs
+uint16_t notes_count;                                  // length of the notes_pointer array
+bool     notes_repeat;                                 // PLAY_SONG or PLAY_LOOP?
+uint16_t melody_current_note_duration = 0;             // duration of the currently playing note from the active melody, in ms
+uint8_t  note_tempo                   = TEMPO_DEFAULT; // beats-per-minute
+uint16_t current_note                 = 0;             // index into the array at notes_pointer
+bool     note_resting                 = false;         // if a short pause was introduced between two notes with the same frequency while playing a melody
 uint16_t last_timestamp               = 0;
 
 #ifdef AUDIO_ENABLE_TONE_MULTIPLEXING
@@ -86,7 +86,7 @@ uint16_t last_timestamp               = 0;
 #        define AUDIO_MAX_SIMULTANEOUS_TONES 3
 #    endif
 uint16_t tone_multiplexing_rate        = AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT;
-uint8_t  tone_multiplexing_index_shift = 0;  // offset used on active-tone array access
+uint8_t  tone_multiplexing_index_shift = 0; // offset used on active-tone array access
 #endif
 
 // provided and used by voices.c
@@ -123,12 +123,12 @@ void audio_init() {
         eeconfig_init();
     }
     audio_config.raw = eeconfig_read_audio();
-#else  // EEPROM settings
+#else // EEPROM settings
     audio_config.enable        = true;
 #    ifdef AUDIO_CLICKY_ON
     audio_config.clicky_enable = true;
 #    endif
-#endif  // EEPROM settings
+#endif // EEPROM settings
 
     for (uint8_t i = 0; i < AUDIO_TONE_STACKSIZE; i++) {
         tones[i] = (musical_tone_t){.time_started = 0, .pitch = -1.0f, .duration = 0};
@@ -181,7 +181,9 @@ void audio_off(void) {
     eeconfig_update_audio(audio_config.raw);
 }
 
-bool audio_is_on(void) { return (audio_config.enable != 0); }
+bool audio_is_on(void) {
+    return (audio_config.enable != 0);
+}
 
 void audio_stop_all() {
     if (audio_driver_stopped) {
@@ -268,7 +270,7 @@ void audio_play_note(float pitch, uint16_t duration) {
                 tones[j]     = tones[j + 1];
                 tones[j + 1] = (musical_tone_t){.time_started = timer_read(), .pitch = pitch, .duration = duration};
             }
-            return;  // since this frequency played already, the hardware was already started
+            return; // since this frequency played already, the hardware was already started
         }
     }
 
@@ -286,7 +288,7 @@ void audio_play_note(float pitch, uint16_t duration) {
     tones[active_tones - 1] = (musical_tone_t){.time_started = timer_read(), .pitch = pitch, .duration = duration};
 
     // TODO: needs to be handled per note/tone -> use its timestamp instead?
-    voices_timer = timer_read();  // reset to zero, for the effects added by voices.c
+    voices_timer = timer_read(); // reset to zero, for the effects added by voices.c
 
     if (audio_driver_stopped) {
         audio_driver_start();
@@ -294,7 +296,9 @@ void audio_play_note(float pitch, uint16_t duration) {
     }
 }
 
-void audio_play_tone(float pitch) { audio_play_note(pitch, 0xffff); }
+void audio_play_tone(float pitch) {
+    audio_play_note(pitch, 0xffff);
+}
 
 void audio_play_melody(float (*np)[][2], uint16_t n_count, bool n_repeat) {
     if (!audio_config.enable) {
@@ -316,7 +320,7 @@ void audio_play_melody(float (*np)[][2], uint16_t n_count, bool n_repeat) {
     notes_count   = n_count;
     notes_repeat  = n_repeat;
 
-    current_note = 0;  // note in the melody-array/list at note_pointer
+    current_note = 0; // note in the melody-array/list at note_pointer
 
     // start first note manually, which also starts the audio_driver
     // all following/remaining notes are played by 'audio_update_state'
@@ -347,11 +351,17 @@ void  audio_play_click(uint16_t delay, float pitch, uint16_t duration) {
     }
 }
 
-bool audio_is_playing_note(void) { return playing_note; }
+bool audio_is_playing_note(void) {
+    return playing_note;
+}
 
-bool audio_is_playing_melody(void) { return playing_melody; }
+bool audio_is_playing_melody(void) {
+    return playing_melody;
+}
 
-uint8_t audio_get_number_of_active_tones(void) { return active_tones; }
+uint8_t audio_get_number_of_active_tones(void) {
+    return active_tones;
+}
 
 float audio_get_frequency(uint8_t tone_index) {
     if (tone_index >= active_tones) {
@@ -370,7 +380,7 @@ float audio_get_processed_frequency(uint8_t tone_index) {
 
 #ifdef AUDIO_ENABLE_TONE_MULTIPLEXING
     index = index - tone_multiplexing_index_shift;
-    if (index < 0)  // wrap around
+    if (index < 0) // wrap around
         index += active_tones;
 #endif
 
@@ -396,7 +406,7 @@ bool audio_update_state(void) {
             last_timestamp         = current_time;
             uint16_t previous_note = current_note;
             current_note++;
-            voices_timer = timer_read();  // reset to zero, for the effects added by voices.c
+            voices_timer = timer_read(); // reset to zero, for the effects added by voices.c
 
             if (current_note >= notes_count) {
                 if (notes_repeat) {
@@ -466,11 +476,11 @@ bool audio_update_state(void) {
 
         // housekeeping: stop notes that have no playtime left
         for (int i = 0; i < active_tones; i++) {
-            if ((tones[i].duration != 0xffff)  // indefinitely playing notes, started by 'audio_play_tone'
-                && (tones[i].duration != 0)    // 'uninitialized'
+            if ((tones[i].duration != 0xffff) // indefinitely playing notes, started by 'audio_play_tone'
+                && (tones[i].duration != 0)   // 'uninitialized'
             ) {
                 if (timer_elapsed(tones[i].time_started) >= tones[i].duration) {
-                    audio_stop_tone(tones[i].pitch);  // also sets 'state_changed=true'
+                    audio_stop_tone(tones[i].pitch); // also sets 'state_changed=true'
                 }
             }
         }
@@ -487,9 +497,15 @@ bool audio_update_state(void) {
 
 // Tone-multiplexing functions
 #ifdef AUDIO_ENABLE_TONE_MULTIPLEXING
-void audio_set_tone_multiplexing_rate(uint16_t rate) { tone_multiplexing_rate = rate; }
-void audio_enable_tone_multiplexing(void) { tone_multiplexing_rate = AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT; }
-void audio_disable_tone_multiplexing(void) { tone_multiplexing_rate = 0; }
+void audio_set_tone_multiplexing_rate(uint16_t rate) {
+    tone_multiplexing_rate = rate;
+}
+void audio_enable_tone_multiplexing(void) {
+    tone_multiplexing_rate = AUDIO_TONE_MULTIPLEXING_RATE_DEFAULT;
+}
+void audio_disable_tone_multiplexing(void) {
+    tone_multiplexing_rate = 0;
+}
 void audio_increase_tone_multiplexing_rate(uint16_t change) {
     if ((0xffff - change) > tone_multiplexing_rate) {
         tone_multiplexing_rate += change;
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index 290d461f5a..fe23cf3ed1 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -54,9 +54,9 @@ typedef union {
  * "A musical tone is characterized by its duration, pitch, intensity (or loudness), and timbre (or quality)"
  */
 typedef struct {
-    uint16_t time_started;  // timestamp the tone/note was started, system time runs with 1ms resolution -> 16bit timer overflows every ~64 seconds, long enough under normal circumstances; but might be too soon for long-duration notes when the note_tempo is set to a very low value
-    float    pitch;         // aka frequency, in Hz
-    uint16_t duration;      // in ms, converted from the musical_notes.h unit which has 64parts to a beat, factoring in the current tempo in beats-per-minute
+    uint16_t time_started; // timestamp the tone/note was started, system time runs with 1ms resolution -> 16bit timer overflows every ~64 seconds, long enough under normal circumstances; but might be too soon for long-duration notes when the note_tempo is set to a very low value
+    float    pitch;        // aka frequency, in Hz
+    uint16_t duration;     // in ms, converted from the musical_notes.h unit which has 64parts to a beat, factoring in the current tempo in beats-per-minute
     // float intensity;    // aka volume [0,1] TODO: not used at the moment; pwm drivers can't handle it
     // uint8_t timbre;     // range: [0,100] TODO: this currently kept track of globally, should we do this per tone instead?
 } musical_tone_t;
diff --git a/quantum/audio/song_list.h b/quantum/audio/song_list.h
index 8e80a016aa..3e425abb47 100644
--- a/quantum/audio/song_list.h
+++ b/quantum/audio/song_list.h
@@ -22,7 +22,7 @@
 
 #if __has_include("user_song_list.h")
 #    include "user_song_list.h"
-#endif  // if file exists
+#endif // if file exists
 
 #define NO_SOUND
 
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c
index 8988d827e9..1c08a3af36 100644
--- a/quantum/audio/voices.c
+++ b/quantum/audio/voices.c
@@ -32,11 +32,17 @@ voice_type voice = AUDIO_VOICE_DEFAULT;
 voice_type voice = default_voice;
 #endif
 
-void set_voice(voice_type v) { voice = v; }
+void set_voice(voice_type v) {
+    voice = v;
+}
 
-void voice_iterate() { voice = (voice + 1) % number_of_voices; }
+void voice_iterate() {
+    voice = (voice + 1) % number_of_voices;
+}
 
-void voice_deiterate() { voice = (voice - 1 + number_of_voices) % number_of_voices; }
+void voice_deiterate() {
+    voice = (voice - 1 + number_of_voices) % number_of_voices;
+}
 
 #ifdef AUDIO_VOICES
 float mod(float a, int b) {
@@ -67,8 +73,8 @@ float voice_envelope(float frequency) {
     // envelope_index ranges from 0 to 0xFFFF, which is preserved at 880.0 Hz
 //    __attribute__((unused)) uint16_t compensated_index = (uint16_t)((float)envelope_index * (880.0 / frequency));
 #ifdef AUDIO_VOICES
-    uint16_t envelope_index    = timer_elapsed(voices_timer);  // TODO: multiply in some factor?
-    uint16_t compensated_index = envelope_index / 100;         // TODO: correct factor would be?
+    uint16_t envelope_index    = timer_elapsed(voices_timer); // TODO: multiply in some factor?
+    uint16_t compensated_index = envelope_index / 100;        // TODO: correct factor would be?
 #endif
 
     switch (voice) {
@@ -303,7 +309,7 @@ float voice_envelope(float frequency) {
             //         note_timbre = TIMBRE_25;
             //     break;
 
-#endif  // AUDIO_VOICES
+#endif // AUDIO_VOICES
 
         default:
             break;
@@ -318,19 +324,31 @@ float voice_envelope(float frequency) {
         // TODO: where to keep track of the start-frequency?
         // frequency = voice_add_glissando(??, frequency);
     }
-#endif  // AUDIO_VOICES
+#endif // AUDIO_VOICES
 
     return frequency;
 }
 
 // Vibrato functions
 
-void voice_set_vibrato_rate(float rate) { vibrato_rate = rate; }
-void voice_increase_vibrato_rate(float change) { vibrato_rate *= change; }
-void voice_decrease_vibrato_rate(float change) { vibrato_rate /= change; }
-void voice_set_vibrato_strength(float strength) { vibrato_strength = strength; }
-void voice_increase_vibrato_strength(float change) { vibrato_strength *= change; }
-void voice_decrease_vibrato_strength(float change) { vibrato_strength /= change; }
+void voice_set_vibrato_rate(float rate) {
+    vibrato_rate = rate;
+}
+void voice_increase_vibrato_rate(float change) {
+    vibrato_rate *= change;
+}
+void voice_decrease_vibrato_rate(float change) {
+    vibrato_rate /= change;
+}
+void voice_set_vibrato_strength(float strength) {
+    vibrato_strength = strength;
+}
+void voice_increase_vibrato_strength(float change) {
+    vibrato_strength *= change;
+}
+void voice_decrease_vibrato_strength(float change) {
+    vibrato_strength /= change;
+}
 
 // Timbre functions
 
@@ -339,4 +357,6 @@ void voice_set_timbre(uint8_t timbre) {
         note_timbre = timbre;
     }
 }
-uint8_t voice_get_timbre(void) { return note_timbre; }
+uint8_t voice_get_timbre(void) {
+    return note_timbre;
+}
diff --git a/quantum/audio/voices.h b/quantum/audio/voices.h
index 1f402e7e12..fcab9db556 100644
--- a/quantum/audio/voices.h
+++ b/quantum/audio/voices.h
@@ -40,7 +40,7 @@ typedef enum {
 // duty_third_down,
 // duty_fifth_third_down,
 #endif
-    number_of_voices  // important that this is last
+    number_of_voices // important that this is last
 } voice_type;
 
 void set_voice(voice_type v);
diff --git a/quantum/backlight/backlight.c b/quantum/backlight/backlight.c
index dfb98419e6..52ec086bb0 100644
--- a/quantum/backlight/backlight.c
+++ b/quantum/backlight/backlight.c
@@ -95,10 +95,10 @@ void backlight_toggle(void) {
  * FIXME: needs doc
  */
 void backlight_enable(void) {
-    if (backlight_config.enable) return;  // do nothing if backlight is already on
+    if (backlight_config.enable) return; // do nothing if backlight is already on
 
     backlight_config.enable = true;
-    if (backlight_config.raw == 1)  // enabled but level == 0
+    if (backlight_config.raw == 1) // enabled but level == 0
         backlight_config.level = 1;
     eeconfig_update_backlight(backlight_config.raw);
     dprintf("backlight enable\n");
@@ -110,7 +110,7 @@ void backlight_enable(void) {
  * FIXME: needs doc
  */
 void backlight_disable(void) {
-    if (!backlight_config.enable) return;  // do nothing if backlight is already off
+    if (!backlight_config.enable) return; // do nothing if backlight is already off
 
     backlight_config.enable = false;
     eeconfig_update_backlight(backlight_config.raw);
@@ -122,7 +122,9 @@ void backlight_disable(void) {
  *
  * FIXME: needs doc
  */
-bool is_backlight_enabled(void) { return backlight_config.enable; }
+bool is_backlight_enabled(void) {
+    return backlight_config.enable;
+}
 
 /** \brief Backlight step through levels
  *
@@ -158,11 +160,17 @@ void backlight_level(uint8_t level) {
     eeconfig_update_backlight(backlight_config.raw);
 }
 
-uint8_t eeconfig_read_backlight(void) { return eeprom_read_byte(EECONFIG_BACKLIGHT); }
+uint8_t eeconfig_read_backlight(void) {
+    return eeprom_read_byte(EECONFIG_BACKLIGHT);
+}
 
-void eeconfig_update_backlight(uint8_t val) { eeprom_update_byte(EECONFIG_BACKLIGHT, val); }
+void eeconfig_update_backlight(uint8_t val) {
+    eeprom_update_byte(EECONFIG_BACKLIGHT, val);
+}
 
-void eeconfig_update_backlight_current(void) { eeconfig_update_backlight(backlight_config.raw); }
+void eeconfig_update_backlight_current(void) {
+    eeconfig_update_backlight(backlight_config.raw);
+}
 
 void eeconfig_update_backlight_default(void) {
     backlight_config.enable = 1;
@@ -179,7 +187,9 @@ void eeconfig_update_backlight_default(void) {
  *
  * FIXME: needs doc
  */
-uint8_t get_backlight_level(void) { return backlight_config.level; }
+uint8_t get_backlight_level(void) {
+    return backlight_config.level;
+}
 
 #ifdef BACKLIGHT_BREATHING
 /** \brief Backlight breathing toggle
@@ -200,7 +210,7 @@ void backlight_toggle_breathing(void) {
  * FIXME: needs doc
  */
 void backlight_enable_breathing(void) {
-    if (backlight_config.breathing) return;  // do nothing if breathing is already on
+    if (backlight_config.breathing) return; // do nothing if breathing is already on
 
     backlight_config.breathing = true;
     eeconfig_update_backlight(backlight_config.raw);
@@ -213,7 +223,7 @@ void backlight_enable_breathing(void) {
  * FIXME: needs doc
  */
 void backlight_disable_breathing(void) {
-    if (!backlight_config.breathing) return;  // do nothing if breathing is already off
+    if (!backlight_config.breathing) return; // do nothing if breathing is already off
 
     backlight_config.breathing = false;
     eeconfig_update_backlight(backlight_config.raw);
@@ -225,18 +235,30 @@ void backlight_disable_breathing(void) {
  *
  * FIXME: needs doc
  */
-bool is_backlight_breathing(void) { return backlight_config.breathing; }
+bool is_backlight_breathing(void) {
+    return backlight_config.breathing;
+}
 
 // following are marked as weak purely for backwards compatibility
-__attribute__((weak)) void breathing_period_set(uint8_t value) { breathing_period = value ? value : 1; }
+__attribute__((weak)) void breathing_period_set(uint8_t value) {
+    breathing_period = value ? value : 1;
+}
 
-__attribute__((weak)) uint8_t get_breathing_period(void) { return breathing_period; }
+__attribute__((weak)) uint8_t get_breathing_period(void) {
+    return breathing_period;
+}
 
-__attribute__((weak)) void breathing_period_default(void) { breathing_period_set(BREATHING_PERIOD); }
+__attribute__((weak)) void breathing_period_default(void) {
+    breathing_period_set(BREATHING_PERIOD);
+}
 
-__attribute__((weak)) void breathing_period_inc(void) { breathing_period_set(breathing_period + 1); }
+__attribute__((weak)) void breathing_period_inc(void) {
+    breathing_period_set(breathing_period + 1);
+}
 
-__attribute__((weak)) void breathing_period_dec(void) { breathing_period_set(breathing_period - 1); }
+__attribute__((weak)) void breathing_period_dec(void) {
+    breathing_period_set(breathing_period - 1);
+}
 
 __attribute__((weak)) void breathing_toggle(void) {
     if (is_breathing())
diff --git a/quantum/backlight/backlight.h b/quantum/backlight/backlight.h
index c30c70fd62..ff9c8de420 100644
--- a/quantum/backlight/backlight.h
+++ b/quantum/backlight/backlight.h
@@ -39,7 +39,7 @@ typedef union {
     struct {
         bool    enable : 1;
         bool    breathing : 1;
-        uint8_t reserved : 1;  // Reserved for possible future backlight modes
+        uint8_t reserved : 1; // Reserved for possible future backlight modes
         uint8_t level : 5;
     };
 } backlight_config_t;
diff --git a/quantum/backlight/backlight_avr.c b/quantum/backlight/backlight_avr.c
index 9c972ae02e..f3a0252270 100644
--- a/quantum/backlight/backlight_avr.c
+++ b/quantum/backlight/backlight_avr.c
@@ -136,7 +136,7 @@
 #    define TCCRxB TCCR1B
 #    define TIMERx_COMPA_vect TIMER1_COMPA_vect
 #    define TIMERx_OVF_vect TIMER1_OVF_vect
-#    if defined(__AVR_ATmega32A__)  // This MCU has only one TIMSK register
+#    if defined(__AVR_ATmega32A__) // This MCU has only one TIMSK register
 #        define TIMSKx TIMSK
 #    else
 #        define TIMSKx TIMSK1
@@ -166,7 +166,7 @@ error("Please set 'BACKLIGHT_DRIVER = custom' within rules.mk")
 error("Please set 'BACKLIGHT_DRIVER = software' within rules.mk")
 #endif
 
-#ifndef BACKLIGHT_PWM_TIMER  // pwm through software
+#ifndef BACKLIGHT_PWM_TIMER // pwm through software
 
 static inline void enable_pwm(void) {
 #    if BACKLIGHT_ON_STATE == 1
@@ -203,7 +203,9 @@ static inline void disable_pwm(void) {
 // or F_CPU/BACKLIGHT_CUSTOM_RESOLUTION if used.
 
 // Triggered when the counter reaches the OCRx value
-ISR(TIMERx_COMPA_vect) { backlight_pins_off(); }
+ISR(TIMERx_COMPA_vect) {
+    backlight_pins_off();
+}
 
 // Triggered when the counter reaches the TOP value
 // this one triggers at F_CPU/ICRx = 16MHz/65536 =~ 244 Hz
@@ -232,15 +234,15 @@ ISR(TIMERx_OVF_vect) {
 
 // See http://jared.geek.nz/2013/feb/linear-led-pwm
 static uint16_t cie_lightness(uint16_t v) {
-    if (v <= (uint32_t)ICRx / 12)  // If the value is less than or equal to ~8% of max
+    if (v <= (uint32_t)ICRx / 12) // If the value is less than or equal to ~8% of max
     {
-        return v / 9;  // Same as dividing by 900%
+        return v / 9; // Same as dividing by 900%
     } else {
         // In the next two lines values are bit-shifted. This is to avoid loosing decimals in integer math.
-        uint32_t y   = (((uint32_t)v + (uint32_t)ICRx / 6) << 5) / ((uint32_t)ICRx / 6 + ICRx);  // If above 8%, add ~16% of max, and normalize with (max + ~16% max)
-        uint32_t out = (y * y * y * ICRx) >> 15;                                                 // Cube it and undo the bit-shifting. (which is now three times as much due to the cubing)
+        uint32_t y   = (((uint32_t)v + (uint32_t)ICRx / 6) << 5) / ((uint32_t)ICRx / 6 + ICRx); // If above 8%, add ~16% of max, and normalize with (max + ~16% max)
+        uint32_t out = (y * y * y * ICRx) >> 15;                                                // Cube it and undo the bit-shifting. (which is now three times as much due to the cubing)
 
-        if (out > ICRx)  // Avoid overflows
+        if (out > ICRx) // Avoid overflows
         {
             out = ICRx;
         }
@@ -249,10 +251,14 @@ static uint16_t cie_lightness(uint16_t v) {
 }
 
 // rescale the supplied backlight value to be in terms of the value limit	// range for val is [0..ICRx]. PWM pin is high while the timer count is below val.
-static uint32_t rescale_limit_val(uint32_t val) { return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256; }
+static uint32_t rescale_limit_val(uint32_t val) {
+    return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256;
+}
 
 // range for val is [0..ICRx]. PWM pin is high while the timer count is below val.
-static inline void set_pwm(uint16_t val) { OCRxx = val; }
+static inline void set_pwm(uint16_t val) {
+    OCRxx = val;
+}
 
 void backlight_set(uint8_t level) {
     if (level > BACKLIGHT_LEVELS) level = BACKLIGHT_LEVELS;
@@ -303,7 +309,9 @@ static uint16_t breathing_freq_scale_factor = 2;
 #    ifdef BACKLIGHT_PWM_TIMER
 static bool breathing = false;
 
-bool is_breathing(void) { return breathing; }
+bool is_breathing(void) {
+    return breathing;
+}
 
 #        define breathing_interrupt_enable() \
             do {                             \
@@ -315,7 +323,9 @@ bool is_breathing(void) { return breathing; }
             } while (0)
 #    else
 
-bool is_breathing(void) { return !!(TIMSKx & _BV(TOIEx)); }
+bool is_breathing(void) {
+    return !!(TIMSKx & _BV(TOIEx));
+}
 
 #        define breathing_interrupt_enable() \
             do {                             \
@@ -370,7 +380,9 @@ void breathing_self_disable(void) {
 static const uint8_t breathing_table[BREATHING_STEPS] PROGMEM = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 17, 20, 24, 28, 32, 36, 41, 46, 51, 57, 63, 70, 76, 83, 91, 98, 106, 113, 121, 129, 138, 146, 154, 162, 170, 178, 185, 193, 200, 207, 213, 220, 225, 231, 235, 240, 244, 247, 250, 252, 253, 254, 255, 254, 253, 252, 250, 247, 244, 240, 235, 231, 225, 220, 213, 207, 200, 193, 185, 178, 170, 162, 154, 146, 138, 129, 121, 113, 106, 98, 91, 83, 76, 70, 63, 57, 51, 46, 41, 36, 32, 28, 24, 20, 17, 15, 12, 10, 8, 6, 5, 4, 3, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 // Use this before the cie_lightness function.
-static inline uint16_t scale_backlight(uint16_t v) { return v / BACKLIGHT_LEVELS * get_backlight_level(); }
+static inline uint16_t scale_backlight(uint16_t v) {
+    return v / BACKLIGHT_LEVELS * get_backlight_level();
+}
 
 #    ifdef BACKLIGHT_PWM_TIMER
 void breathing_task(void)
@@ -403,7 +415,7 @@ ISR(TIMERx_OVF_vect)
     set_pwm(cie_lightness(rescale_limit_val(scale_backlight((uint16_t)pgm_read_byte(&breathing_table[index]) * ICRx / 255))));
 }
 
-#endif  // BACKLIGHT_BREATHING
+#endif // BACKLIGHT_BREATHING
 
 void backlight_init_ports(void) {
     // Setup backlight pin as output and output to on state.
@@ -415,10 +427,10 @@ void backlight_init_ports(void) {
 
 #ifdef BACKLIGHT_PWM_TIMER
     // TimerX setup, Fast PWM mode count to TOP set in ICRx
-    TCCRxA = _BV(WGM11);  // = 0b00000010;
+    TCCRxA = _BV(WGM11); // = 0b00000010;
     // clock select clk/1
-    TCCRxB = _BV(WGM13) | _BV(WGM12) | _BV(CS10);  // = 0b00011001;
-#else                                              // hardware PWM
+    TCCRxB = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
+#else                                             // hardware PWM
     // Pin PB7 = OCR1C (Timer 1, Channel C)
     // Compare Output Mode = Clear on compare match, Channel C = COM1C1=1 COM1C0=0
     // (i.e. start high, go low when counter matches.)
@@ -430,8 +442,8 @@ void backlight_init_ports(void) {
     "In fast PWM mode, the compare units allow generation of PWM waveforms on the OCnx pins. Setting the COMnx1:0 bits to two will produce a non-inverted PWM [..]."
     "In fast PWM mode the counter is incremented until the counter value matches either one of the fixed values 0x00FF, 0x01FF, or 0x03FF (WGMn3:0 = 5, 6, or 7), the value in ICRn (WGMn3:0 = 14), or the value in OCRnA (WGMn3:0 = 15)."
     */
-    TCCRxA = _BV(COMxx1) | _BV(WGM11);             // = 0b00001010;
-    TCCRxB = _BV(WGM13) | _BV(WGM12) | _BV(CS10);  // = 0b00011001;
+    TCCRxA = _BV(COMxx1) | _BV(WGM11);            // = 0b00001010;
+    TCCRxB = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
 #endif
 
 #ifdef BACKLIGHT_CUSTOM_RESOLUTION
diff --git a/quantum/backlight/backlight_chibios.c b/quantum/backlight/backlight_chibios.c
index 7c6edd10d6..e8f9e70f78 100644
--- a/quantum/backlight/backlight_chibios.c
+++ b/quantum/backlight/backlight_chibios.c
@@ -53,14 +53,14 @@ static PWMConfig pwmCFG = {0xFFFF, /* PWM clock frequency  */
 
 // See http://jared.geek.nz/2013/feb/linear-led-pwm
 static uint16_t cie_lightness(uint16_t v) {
-    if (v <= 5243)     // if below 8% of max
-        return v / 9;  // same as dividing by 900%
+    if (v <= 5243)    // if below 8% of max
+        return v / 9; // same as dividing by 900%
     else {
-        uint32_t y = (((uint32_t)v + 10486) << 8) / (10486 + 0xFFFFUL);  // add 16% of max and compare
+        uint32_t y = (((uint32_t)v + 10486) << 8) / (10486 + 0xFFFFUL); // add 16% of max and compare
         // to get a useful result with integer division, we shift left in the expression above
         // and revert what we've done again after squaring.
         y = y * y * y >> 8;
-        if (y > 0xFFFFUL)  // prevent overflow
+        if (y > 0xFFFFUL) // prevent overflow
             return 0xFFFFU;
         else
             return (uint16_t)y;
@@ -117,7 +117,9 @@ static const uint8_t breathing_table[BREATHING_STEPS] = {0, 0, 0, 0, 0, 0, 0, 0,
 
 void breathing_callback(PWMDriver *pwmp);
 
-bool is_breathing(void) { return pwmCFG.callback != NULL; }
+bool is_breathing(void) {
+    return pwmCFG.callback != NULL;
+}
 
 void breathing_enable(void) {
     pwmCFG.callback = breathing_callback;
@@ -133,7 +135,9 @@ void breathing_disable(void) {
 }
 
 // Use this before the cie_lightness function.
-static inline uint16_t scale_backlight(uint16_t v) { return v / BACKLIGHT_LEVELS * get_backlight_level(); }
+static inline uint16_t scale_backlight(uint16_t v) {
+    return v / BACKLIGHT_LEVELS * get_backlight_level();
+}
 
 void breathing_callback(PWMDriver *pwmp) {
     uint8_t  breathing_period = get_breathing_period();
diff --git a/quantum/backlight/backlight_driver_common.c b/quantum/backlight/backlight_driver_common.c
index 270a43c67e..e4c2e90b5f 100644
--- a/quantum/backlight/backlight_driver_common.c
+++ b/quantum/backlight/backlight_driver_common.c
@@ -44,6 +44,10 @@ void backlight_pins_init(void) {
     FOR_EACH_LED(setPinOutput(backlight_pin); backlight_off(backlight_pin);)
 }
 
-void backlight_pins_on(void) { FOR_EACH_LED(backlight_on(backlight_pin);) }
+void backlight_pins_on(void) {
+    FOR_EACH_LED(backlight_on(backlight_pin);)
+}
 
-void backlight_pins_off(void) { FOR_EACH_LED(backlight_off(backlight_pin);) }
+void backlight_pins_off(void) {
+    FOR_EACH_LED(backlight_off(backlight_pin);)
+}
diff --git a/quantum/backlight/backlight_software.c b/quantum/backlight/backlight_software.c
index 709304f559..3d412cab52 100644
--- a/quantum/backlight/backlight_software.c
+++ b/quantum/backlight/backlight_software.c
@@ -30,11 +30,17 @@ static const uint16_t backlight_duty_table[] = {
 
 // clang-format on
 
-static uint8_t scale_backlight(uint8_t v) { return v * (backlight_duty_table_size - 1) / BACKLIGHT_LEVELS; }
+static uint8_t scale_backlight(uint8_t v) {
+    return v * (backlight_duty_table_size - 1) / BACKLIGHT_LEVELS;
+}
 
-void backlight_init_ports(void) { backlight_pins_init(); }
+void backlight_init_ports(void) {
+    backlight_pins_init();
+}
 
-void backlight_set(uint8_t level) { s_duty_pattern = backlight_duty_table[scale_backlight(level)]; }
+void backlight_set(uint8_t level) {
+    s_duty_pattern = backlight_duty_table[scale_backlight(level)];
+}
 
 void backlight_task(void) {
     static uint8_t backlight_tick = 0;
diff --git a/quantum/backlight/backlight_timer.c b/quantum/backlight/backlight_timer.c
index c32c35c154..82fb6a6a83 100644
--- a/quantum/backlight/backlight_timer.c
+++ b/quantum/backlight/backlight_timer.c
@@ -14,14 +14,14 @@ static uint16_t backlight_timer_get_duty(void);
 
 // See http://jared.geek.nz/2013/feb/linear-led-pwm
 static uint16_t cie_lightness(uint16_t v) {
-    if (v <= 5243)     // if below 8% of max
-        return v / 9;  // same as dividing by 900%
+    if (v <= 5243)    // if below 8% of max
+        return v / 9; // same as dividing by 900%
     else {
-        uint32_t y = (((uint32_t)v + 10486) << 8) / (10486 + 0xFFFFUL);  // add 16% of max and compare
+        uint32_t y = (((uint32_t)v + 10486) << 8) / (10486 + 0xFFFFUL); // add 16% of max and compare
         // to get a useful result with integer division, we shift left in the expression above
         // and revert what we've done again after squaring.
         y = y * y * y >> 8;
-        if (y > 0xFFFFUL)  // prevent overflow
+        if (y > 0xFFFFUL) // prevent overflow
             return 0xFFFFU;
         else
             return (uint16_t)y;
@@ -61,7 +61,9 @@ static void backlight_timer_top(void) {
     }
 }
 
-static void backlight_timer_cmp(void) { backlight_pins_off(); }
+static void backlight_timer_cmp(void) {
+    backlight_pins_off();
+}
 
 void backlight_task(void) {}
 
@@ -77,7 +79,9 @@ static uint16_t breathing_counter = 0;
 static const uint8_t breathing_table[BREATHING_STEPS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 17, 20, 24, 28, 32, 36, 41, 46, 51, 57, 63, 70, 76, 83, 91, 98, 106, 113, 121, 129, 138, 146, 154, 162, 170, 178, 185, 193, 200, 207, 213, 220, 225, 231, 235, 240, 244, 247, 250, 252, 253, 254, 255, 254, 253, 252, 250, 247, 244, 240, 235, 231, 225, 220, 213, 207, 200, 193, 185, 178, 170, 162, 154, 146, 138, 129, 121, 113, 106, 98, 91, 83, 76, 70, 63, 57, 51, 46, 41, 36, 32, 28, 24, 20, 17, 15, 12, 10, 8, 6, 5, 4, 3, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 // Use this before the cie_lightness function.
-static inline uint16_t scale_backlight(uint16_t v) { return v / BACKLIGHT_LEVELS * get_backlight_level(); }
+static inline uint16_t scale_backlight(uint16_t v) {
+    return v / BACKLIGHT_LEVELS * get_backlight_level();
+}
 
 void breathing_task(void) {
     uint8_t  breathing_period = get_breathing_period();
@@ -91,13 +95,17 @@ void breathing_task(void) {
     backlight_timer_set_duty(cie_lightness(scale_backlight((uint16_t)breathing_table[index] * 256)));
 }
 
-bool is_breathing(void) { return breathing; }
+bool is_breathing(void) {
+    return breathing;
+}
 
 void breathing_enable(void) {
     breathing_counter = 0;
     breathing         = true;
 }
-void breathing_disable(void) { breathing = false; }
+void breathing_disable(void) {
+    breathing = false;
+}
 
 void breathing_pulse(void) {
     backlight_set(is_backlight_enabled() ? 0 : BACKLIGHT_LEVELS);
@@ -140,8 +148,12 @@ static void timerCallback(void) {
     }
 }
 
-static void     backlight_timer_set_duty(uint16_t duty) { s_duty = duty; }
-static uint16_t backlight_timer_get_duty(void) { return s_duty; }
+static void backlight_timer_set_duty(uint16_t duty) {
+    s_duty = duty;
+}
+static uint16_t backlight_timer_get_duty(void) {
+    return s_duty;
+}
 
 // ChibiOS - Map GPT timer onto Software PWM
 static void gptTimerCallback(GPTDriver *gptp) {
diff --git a/quantum/bitwise.c b/quantum/bitwise.c
index 861cca0054..1868e14932 100644
--- a/quantum/bitwise.c
+++ b/quantum/bitwise.c
@@ -20,7 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // bit population - return number of on-bit
 __attribute__((noinline)) uint8_t bitpop(uint8_t bits) {
     uint8_t c;
-    for (c = 0; bits; c++) bits &= bits - 1;
+    for (c = 0; bits; c++)
+        bits &= bits - 1;
     return c;
     /*
         const uint8_t bit_count[] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 };
@@ -30,13 +31,15 @@ __attribute__((noinline)) uint8_t bitpop(uint8_t bits) {
 
 uint8_t bitpop16(uint16_t bits) {
     uint8_t c;
-    for (c = 0; bits; c++) bits &= bits - 1;
+    for (c = 0; bits; c++)
+        bits &= bits - 1;
     return c;
 }
 
 uint8_t bitpop32(uint32_t bits) {
     uint8_t c;
-    for (c = 0; bits; c++) bits &= bits - 1;
+    for (c = 0; bits; c++)
+        bits &= bits - 1;
     return c;
 }
 
diff --git a/quantum/bootmagic/bootmagic_lite.c b/quantum/bootmagic/bootmagic_lite.c
index 54bbf5a2ee..f63c71fc6b 100644
--- a/quantum/bootmagic/bootmagic_lite.c
+++ b/quantum/bootmagic/bootmagic_lite.c
@@ -19,7 +19,9 @@
  *
  * ...just incase someone wants to only change the eeprom behaviour
  */
-__attribute__((weak)) void bootmagic_lite_reset_eeprom(void) { eeconfig_disable(); }
+__attribute__((weak)) void bootmagic_lite_reset_eeprom(void) {
+    eeconfig_disable();
+}
 
 /** \brief The lite version of TMK's bootmagic based on Wilba.
  *
@@ -57,4 +59,6 @@ __attribute__((weak)) void bootmagic_lite(void) {
     }
 }
 
-void bootmagic(void) { bootmagic_lite(); }
+void bootmagic(void) {
+    bootmagic_lite();
+}
diff --git a/quantum/color.c b/quantum/color.c
index 1c5128e4a2..c80078dbf2 100644
--- a/quantum/color.c
+++ b/quantum/color.c
@@ -104,7 +104,9 @@ RGB hsv_to_rgb(HSV hsv) {
 #endif
 }
 
-RGB hsv_to_rgb_nocie(HSV hsv) { return hsv_to_rgb_impl(hsv, false); }
+RGB hsv_to_rgb_nocie(HSV hsv) {
+    return hsv_to_rgb_impl(hsv, false);
+}
 
 #ifdef RGBW
 #    ifndef MIN
diff --git a/quantum/command.c b/quantum/command.c
index 6d56a25ea1..f90d73207c 100644
--- a/quantum/command.c
+++ b/quantum/command.c
@@ -446,7 +446,7 @@ static bool command_common(uint8_t code) {
 
         // NKRO toggle
         case MAGIC_KC(MAGIC_KEY_NKRO):
-            clear_keyboard();  // clear to prevent stuck keys
+            clear_keyboard(); // clear to prevent stuck keys
             keymap_config.nkro = !keymap_config.nkro;
             if (keymap_config.nkro) {
                 print("NKRO: on\n");
diff --git a/quantum/debounce/sym_defer_g.c b/quantum/debounce/sym_defer_g.c
index 8cac1c37f9..47450992a4 100644
--- a/quantum/debounce/sym_defer_g.c
+++ b/quantum/debounce/sym_defer_g.c
@@ -45,6 +45,6 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
 }
 
 void debounce_free(void) {}
-#else  // no debouncing.
+#else // no debouncing.
 #    include "none.c"
 #endif
diff --git a/quantum/debounce/sym_defer_pr.c b/quantum/debounce/sym_defer_pr.c
index 8b33acc6a2..ce24f0922f 100644
--- a/quantum/debounce/sym_defer_pr.c
+++ b/quantum/debounce/sym_defer_pr.c
@@ -69,4 +69,6 @@ void debounce(matrix_row_t raw[], matrix_row_t cooked[], uint8_t num_rows, bool
     }
 }
 
-bool debounce_active(void) { return true; }
+bool debounce_active(void) {
+    return true;
+}
diff --git a/quantum/debounce/sym_eager_pk.c b/quantum/debounce/sym_eager_pk.c
index deec463649..fe3e88bb06 100644
--- a/quantum/debounce/sym_eager_pk.c
+++ b/quantum/debounce/sym_eager_pk.c
@@ -131,7 +131,7 @@ static void transfer_matrix_values(matrix_row_t raw[], matrix_row_t cooked[], ui
                 if (*debounce_pointer == DEBOUNCE_ELAPSED) {
                     *debounce_pointer    = DEBOUNCE;
                     counters_need_update = true;
-                    existing_row ^= col_mask;  // flip the bit.
+                    existing_row ^= col_mask; // flip the bit.
                 }
             }
             debounce_pointer++;
diff --git a/quantum/debounce/tests/debounce_test_common.cpp b/quantum/debounce/tests/debounce_test_common.cpp
index f9414e571d..0d5a7bb766 100644
--- a/quantum/debounce/tests/debounce_test_common.cpp
+++ b/quantum/debounce/tests/debounce_test_common.cpp
@@ -31,7 +31,9 @@ void set_time(uint32_t t);
 void advance_time(uint32_t ms);
 }
 
-void DebounceTest::addEvents(std::initializer_list<DebounceTestEvent> events) { events_.insert(events_.end(), events.begin(), events.end()); }
+void DebounceTest::addEvents(std::initializer_list<DebounceTestEvent> events) {
+    events_.insert(events_.end(), events.begin(), events.end());
+}
 
 void DebounceTest::runEvents() {
     /* Run the test multiple times, from 1kHz to 10kHz scan rate */
diff --git a/quantum/deferred_exec.c b/quantum/deferred_exec.c
index a64b451df2..a0046a9648 100644
--- a/quantum/deferred_exec.c
+++ b/quantum/deferred_exec.c
@@ -157,7 +157,15 @@ void deferred_exec_advanced_task(deferred_executor_t *table, size_t table_count,
 static uint32_t            last_deferred_exec_check                = 0;
 static deferred_executor_t basic_executors[MAX_DEFERRED_EXECUTORS] = {0};
 
-deferred_token defer_exec(uint32_t delay_ms, deferred_exec_callback callback, void *cb_arg) { return defer_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, delay_ms, callback, cb_arg); }
-bool           extend_deferred_exec(deferred_token token, uint32_t delay_ms) { return extend_deferred_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, token, delay_ms); }
-bool           cancel_deferred_exec(deferred_token token) { return cancel_deferred_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, token); }
-void           deferred_exec_task(void) { deferred_exec_advanced_task(basic_executors, MAX_DEFERRED_EXECUTORS, &last_deferred_exec_check); }
+deferred_token defer_exec(uint32_t delay_ms, deferred_exec_callback callback, void *cb_arg) {
+    return defer_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, delay_ms, callback, cb_arg);
+}
+bool extend_deferred_exec(deferred_token token, uint32_t delay_ms) {
+    return extend_deferred_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, token, delay_ms);
+}
+bool cancel_deferred_exec(deferred_token token) {
+    return cancel_deferred_exec_advanced(basic_executors, MAX_DEFERRED_EXECUTORS, token);
+}
+void deferred_exec_task(void) {
+    deferred_exec_advanced_task(basic_executors, MAX_DEFERRED_EXECUTORS, &last_deferred_exec_check);
+}
diff --git a/quantum/digitizer.c b/quantum/digitizer.c
index e299867429..7925129d0c 100644
--- a/quantum/digitizer.c
+++ b/quantum/digitizer.c
@@ -24,9 +24,13 @@ __attribute__((weak)) void digitizer_send(void) {
     }
 }
 
-__attribute__((weak)) void digitizer_task(void) { digitizer_send(); }
+__attribute__((weak)) void digitizer_task(void) {
+    digitizer_send();
+}
 
-digitizer_t digitizer_get_report(void) { return digitizerReport; }
+digitizer_t digitizer_get_report(void) {
+    return digitizerReport;
+}
 
 void digitizer_set_report(digitizer_t newDigitizerReport) {
     digitizerReport = newDigitizerReport;
diff --git a/quantum/dip_switch.c b/quantum/dip_switch.c
index 133ec85027..eee29aaf91 100644
--- a/quantum/dip_switch.c
+++ b/quantum/dip_switch.c
@@ -52,13 +52,21 @@ static uint16_t       scan_count;
 static bool dip_switch_state[NUMBER_OF_DIP_SWITCHES]      = {0};
 static bool last_dip_switch_state[NUMBER_OF_DIP_SWITCHES] = {0};
 
-__attribute__((weak)) bool dip_switch_update_user(uint8_t index, bool active) { return true; }
+__attribute__((weak)) bool dip_switch_update_user(uint8_t index, bool active) {
+    return true;
+}
 
-__attribute__((weak)) bool dip_switch_update_kb(uint8_t index, bool active) { return dip_switch_update_user(index, active); }
+__attribute__((weak)) bool dip_switch_update_kb(uint8_t index, bool active) {
+    return dip_switch_update_user(index, active);
+}
 
-__attribute__((weak)) bool dip_switch_update_mask_user(uint32_t state) { return true; }
+__attribute__((weak)) bool dip_switch_update_mask_user(uint32_t state) {
+    return true;
+}
 
-__attribute__((weak)) bool dip_switch_update_mask_kb(uint32_t state) { return dip_switch_update_mask_user(state); }
+__attribute__((weak)) bool dip_switch_update_mask_kb(uint32_t state) {
+    return dip_switch_update_mask_user(state);
+}
 
 void dip_switch_init(void) {
 #ifdef DIP_SWITCH_PINS
diff --git a/quantum/dynamic_keymap.c b/quantum/dynamic_keymap.c
index 8f1f39bc0f..f070375ff3 100644
--- a/quantum/dynamic_keymap.c
+++ b/quantum/dynamic_keymap.c
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "keymap.h"  // to get keymaps[][][]
+#include "keymap.h" // to get keymaps[][][]
 #include "eeprom.h"
-#include "progmem.h"  // to read default from flash
-#include "quantum.h"  // for send_string()
+#include "progmem.h" // to read default from flash
+#include "quantum.h" // for send_string()
 #include "dynamic_keymap.h"
-#include "via.h"  // for default VIA_EEPROM_ADDR_END
+#include "via.h" // for default VIA_EEPROM_ADDR_END
 
 #ifndef DYNAMIC_KEYMAP_LAYER_COUNT
 #    define DYNAMIC_KEYMAP_LAYER_COUNT 4
@@ -79,7 +79,9 @@
 #    define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE (DYNAMIC_KEYMAP_EEPROM_MAX_ADDR - DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR + 1)
 #endif
 
-uint8_t dynamic_keymap_get_layer_count(void) { return DYNAMIC_KEYMAP_LAYER_COUNT; }
+uint8_t dynamic_keymap_get_layer_count(void) {
+    return DYNAMIC_KEYMAP_LAYER_COUNT;
+}
 
 void *dynamic_keymap_key_to_eeprom_address(uint8_t layer, uint8_t row, uint8_t column) {
     // TODO: optimize this with some left shifts
@@ -151,9 +153,13 @@ uint16_t keymap_key_to_keycode(uint8_t layer, keypos_t key) {
     }
 }
 
-uint8_t dynamic_keymap_macro_get_count(void) { return DYNAMIC_KEYMAP_MACRO_COUNT; }
+uint8_t dynamic_keymap_macro_get_count(void) {
+    return DYNAMIC_KEYMAP_MACRO_COUNT;
+}
 
-uint16_t dynamic_keymap_macro_get_buffer_size(void) { return DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE; }
+uint16_t dynamic_keymap_macro_get_buffer_size(void) {
+    return DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE;
+}
 
 void dynamic_keymap_macro_get_buffer(uint16_t offset, uint16_t size, uint8_t *data) {
     void *   source = (void *)(DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR + offset);
diff --git a/quantum/eeconfig.c b/quantum/eeconfig.c
index 4c2ad2490c..14cd5887f4 100644
--- a/quantum/eeconfig.c
+++ b/quantum/eeconfig.c
@@ -49,7 +49,7 @@ void eeconfig_init_quantum(void) {
     eeprom_update_byte(EECONFIG_KEYMAP_UPPER_BYTE, 0);
     eeprom_update_byte(EECONFIG_MOUSEKEY_ACCEL, 0);
     eeprom_update_byte(EECONFIG_BACKLIGHT, 0);
-    eeprom_update_byte(EECONFIG_AUDIO, 0xFF);  // On by default
+    eeprom_update_byte(EECONFIG_AUDIO, 0xFF); // On by default
     eeprom_update_dword(EECONFIG_RGBLIGHT, 0);
     eeprom_update_byte(EECONFIG_STENOMODE, 0);
     eeprom_update_dword(EECONFIG_HAPTIC, 0);
@@ -90,13 +90,17 @@ void eeconfig_init_quantum(void) {
  *
  * FIXME: needs doc
  */
-void eeconfig_init(void) { eeconfig_init_quantum(); }
+void eeconfig_init(void) {
+    eeconfig_init_quantum();
+}
 
 /** \brief eeconfig enable
  *
  * FIXME: needs doc
  */
-void eeconfig_enable(void) { eeprom_update_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER); }
+void eeconfig_enable(void) {
+    eeprom_update_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER);
+}
 
 /** \brief eeconfig disable
  *
@@ -141,29 +145,39 @@ bool eeconfig_is_disabled(void) {
  *
  * FIXME: needs doc
  */
-uint8_t eeconfig_read_debug(void) { return eeprom_read_byte(EECONFIG_DEBUG); }
+uint8_t eeconfig_read_debug(void) {
+    return eeprom_read_byte(EECONFIG_DEBUG);
+}
 /** \brief eeconfig update debug
  *
  * FIXME: needs doc
  */
-void eeconfig_update_debug(uint8_t val) { eeprom_update_byte(EECONFIG_DEBUG, val); }
+void eeconfig_update_debug(uint8_t val) {
+    eeprom_update_byte(EECONFIG_DEBUG, val);
+}
 
 /** \brief eeconfig read default layer
  *
  * FIXME: needs doc
  */
-uint8_t eeconfig_read_default_layer(void) { return eeprom_read_byte(EECONFIG_DEFAULT_LAYER); }
+uint8_t eeconfig_read_default_layer(void) {
+    return eeprom_read_byte(EECONFIG_DEFAULT_LAYER);
+}
 /** \brief eeconfig update default layer
  *
  * FIXME: needs doc
  */
-void eeconfig_update_default_layer(uint8_t val) { eeprom_update_byte(EECONFIG_DEFAULT_LAYER, val); }
+void eeconfig_update_default_layer(uint8_t val) {
+    eeprom_update_byte(EECONFIG_DEFAULT_LAYER, val);
+}
 
 /** \brief eeconfig read keymap
  *
  * FIXME: needs doc
  */
-uint16_t eeconfig_read_keymap(void) { return (eeprom_read_byte(EECONFIG_KEYMAP_LOWER_BYTE) | (eeprom_read_byte(EECONFIG_KEYMAP_UPPER_BYTE) << 8)); }
+uint16_t eeconfig_read_keymap(void) {
+    return (eeprom_read_byte(EECONFIG_KEYMAP_LOWER_BYTE) | (eeprom_read_byte(EECONFIG_KEYMAP_UPPER_BYTE) << 8));
+}
 /** \brief eeconfig update keymap
  *
  * FIXME: needs doc
@@ -177,53 +191,73 @@ void eeconfig_update_keymap(uint16_t val) {
  *
  * FIXME: needs doc
  */
-uint8_t eeconfig_read_audio(void) { return eeprom_read_byte(EECONFIG_AUDIO); }
+uint8_t eeconfig_read_audio(void) {
+    return eeprom_read_byte(EECONFIG_AUDIO);
+}
 /** \brief eeconfig update audio
  *
  * FIXME: needs doc
  */
-void eeconfig_update_audio(uint8_t val) { eeprom_update_byte(EECONFIG_AUDIO, val); }
+void eeconfig_update_audio(uint8_t val) {
+    eeprom_update_byte(EECONFIG_AUDIO, val);
+}
 
 /** \brief eeconfig read kb
  *
  * FIXME: needs doc
  */
-uint32_t eeconfig_read_kb(void) { return eeprom_read_dword(EECONFIG_KEYBOARD); }
+uint32_t eeconfig_read_kb(void) {
+    return eeprom_read_dword(EECONFIG_KEYBOARD);
+}
 /** \brief eeconfig update kb
  *
  * FIXME: needs doc
  */
-void eeconfig_update_kb(uint32_t val) { eeprom_update_dword(EECONFIG_KEYBOARD, val); }
+void eeconfig_update_kb(uint32_t val) {
+    eeprom_update_dword(EECONFIG_KEYBOARD, val);
+}
 
 /** \brief eeconfig read user
  *
  * FIXME: needs doc
  */
-uint32_t eeconfig_read_user(void) { return eeprom_read_dword(EECONFIG_USER); }
+uint32_t eeconfig_read_user(void) {
+    return eeprom_read_dword(EECONFIG_USER);
+}
 /** \brief eeconfig update user
  *
  * FIXME: needs doc
  */
-void eeconfig_update_user(uint32_t val) { eeprom_update_dword(EECONFIG_USER, val); }
+void eeconfig_update_user(uint32_t val) {
+    eeprom_update_dword(EECONFIG_USER, val);
+}
 
 /** \brief eeconfig read haptic
  *
  * FIXME: needs doc
  */
-uint32_t eeconfig_read_haptic(void) { return eeprom_read_dword(EECONFIG_HAPTIC); }
+uint32_t eeconfig_read_haptic(void) {
+    return eeprom_read_dword(EECONFIG_HAPTIC);
+}
 /** \brief eeconfig update haptic
  *
  * FIXME: needs doc
  */
-void eeconfig_update_haptic(uint32_t val) { eeprom_update_dword(EECONFIG_HAPTIC, val); }
+void eeconfig_update_haptic(uint32_t val) {
+    eeprom_update_dword(EECONFIG_HAPTIC, val);
+}
 
 /** \brief eeconfig read split handedness
  *
  * FIXME: needs doc
  */
-bool eeconfig_read_handedness(void) { return !!eeprom_read_byte(EECONFIG_HANDEDNESS); }
+bool eeconfig_read_handedness(void) {
+    return !!eeprom_read_byte(EECONFIG_HANDEDNESS);
+}
 /** \brief eeconfig update split handedness
  *
  * FIXME: needs doc
  */
-void eeconfig_update_handedness(bool val) { eeprom_update_byte(EECONFIG_HANDEDNESS, !!val); }
+void eeconfig_update_handedness(bool val) {
+    eeprom_update_byte(EECONFIG_HANDEDNESS, !!val);
+}
diff --git a/quantum/eeconfig.h b/quantum/eeconfig.h
index 22d874273c..f3cd1867ab 100644
--- a/quantum/eeconfig.h
+++ b/quantum/eeconfig.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdbool.h>
 
 #ifndef EECONFIG_MAGIC_NUMBER
-#    define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEE9  // When changing, decrement this value to avoid future re-init issues
+#    define EECONFIG_MAGIC_NUMBER (uint16_t)0xFEE9 // When changing, decrement this value to avoid future re-init issues
 #endif
 #define EECONFIG_MAGIC_NUMBER_OFF (uint16_t)0xFFFF
 
@@ -112,28 +112,30 @@ void     eeconfig_update_haptic(uint32_t val);
 bool eeconfig_read_handedness(void);
 void eeconfig_update_handedness(bool val);
 
-#define EECONFIG_DEBOUNCE_HELPER(name, offset, config)                     \
-    static uint8_t dirty_##name = false;                                   \
-                                                                           \
-    static inline void eeconfig_init_##name(void) {                        \
-        eeprom_read_block(&config, offset, sizeof(config));                \
-        dirty_##name = false;                                              \
-    }                                                                      \
-    static inline void eeconfig_flush_##name(bool force) {                 \
-        if (force || dirty_##name) {                                       \
-            eeprom_update_block(&config, offset, sizeof(config));          \
-            dirty_##name = false;                                          \
-        }                                                                  \
-    }                                                                      \
-    static inline void eeconfig_flush_##name##_task(uint16_t timeout) {    \
-        static uint16_t flush_timer = 0;                                   \
-        if (timer_elapsed(flush_timer) > timeout) {                        \
-            eeconfig_flush_##name(false);                                  \
-            flush_timer = timer_read();                                    \
-        }                                                                  \
-    }                                                                      \
-    static inline void eeconfig_flag_##name(bool v) { dirty_##name |= v; } \
-    static inline void eeconfig_write_##name(typeof(config) conf) {        \
-        memcpy(&config, &conf, sizeof(config));                            \
-        eeconfig_flag_##name(true);                                        \
+#define EECONFIG_DEBOUNCE_HELPER(name, offset, config)                  \
+    static uint8_t dirty_##name = false;                                \
+                                                                        \
+    static inline void eeconfig_init_##name(void) {                     \
+        eeprom_read_block(&config, offset, sizeof(config));             \
+        dirty_##name = false;                                           \
+    }                                                                   \
+    static inline void eeconfig_flush_##name(bool force) {              \
+        if (force || dirty_##name) {                                    \
+            eeprom_update_block(&config, offset, sizeof(config));       \
+            dirty_##name = false;                                       \
+        }                                                               \
+    }                                                                   \
+    static inline void eeconfig_flush_##name##_task(uint16_t timeout) { \
+        static uint16_t flush_timer = 0;                                \
+        if (timer_elapsed(flush_timer) > timeout) {                     \
+            eeconfig_flush_##name(false);                               \
+            flush_timer = timer_read();                                 \
+        }                                                               \
+    }                                                                   \
+    static inline void eeconfig_flag_##name(bool v) {                   \
+        dirty_##name |= v;                                              \
+    }                                                                   \
+    static inline void eeconfig_write_##name(typeof(config) conf) {     \
+        memcpy(&config, &conf, sizeof(config));                         \
+        eeconfig_flag_##name(true);                                     \
     }
diff --git a/quantum/encoder.c b/quantum/encoder.c
index 8fb87281c2..59133f872a 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -59,9 +59,13 @@ static uint8_t thisHand, thatHand;
 static uint8_t encoder_value[NUMBER_OF_ENCODERS] = {0};
 #endif
 
-__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) { return true; }
+__attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) {
+    return true;
+}
 
-__attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) { return encoder_update_user(index, clockwise); }
+__attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) {
+    return encoder_update_user(index, clockwise);
+}
 
 void encoder_init(void) {
 #if defined(SPLIT_KEYBOARD) && defined(ENCODERS_PAD_A_RIGHT) && defined(ENCODERS_PAD_B_RIGHT)
@@ -113,7 +117,7 @@ static bool encoder_update(uint8_t index, uint8_t state) {
         changed = true;
         encoder_update_kb(index, ENCODER_COUNTER_CLOCKWISE);
     }
-    if (encoder_pulses[i] <= -resolution) {  // direction is arbitrary here, but this clockwise
+    if (encoder_pulses[i] <= -resolution) { // direction is arbitrary here, but this clockwise
         encoder_value[index]--;
         changed = true;
         encoder_update_kb(index, ENCODER_CLOCKWISE);
@@ -140,7 +144,9 @@ bool encoder_read(void) {
 #ifdef SPLIT_KEYBOARD
 void last_encoder_activity_trigger(void);
 
-void encoder_state_raw(uint8_t* slave_state) { memcpy(slave_state, &encoder_value[thisHand], sizeof(uint8_t) * NUMBER_OF_ENCODERS); }
+void encoder_state_raw(uint8_t* slave_state) {
+    memcpy(slave_state, &encoder_value[thisHand], sizeof(uint8_t) * NUMBER_OF_ENCODERS);
+}
 
 void encoder_update_raw(uint8_t* slave_state) {
     bool changed = false;
diff --git a/quantum/encoder/tests/mock.c b/quantum/encoder/tests/mock.c
index d0506a938f..10a00cb8f2 100644
--- a/quantum/encoder/tests/mock.c
+++ b/quantum/encoder/tests/mock.c
@@ -26,7 +26,9 @@ uint8_t mockSetPinInputHigh(pin_t pin) {
     return 0;
 }
 
-bool mockReadPin(pin_t pin) { return pins[pin]; }
+bool mockReadPin(pin_t pin) {
+    return pins[pin];
+}
 
 bool setPin(pin_t pin, bool val) {
     pins[pin] = val;
diff --git a/quantum/encoder/tests/mock_split.c b/quantum/encoder/tests/mock_split.c
index 68bf3af599..dd3c26d958 100644
--- a/quantum/encoder/tests/mock_split.c
+++ b/quantum/encoder/tests/mock_split.c
@@ -26,7 +26,9 @@ uint8_t mockSetPinInputHigh(pin_t pin) {
     return 0;
 }
 
-bool mockReadPin(pin_t pin) { return pins[pin]; }
+bool mockReadPin(pin_t pin) {
+    return pins[pin];
+}
 
 bool setPin(pin_t pin, bool val) {
     pins[pin] = val;
diff --git a/quantum/haptic.c b/quantum/haptic.c
index f915acf946..31d1114806 100644
--- a/quantum/haptic.c
+++ b/quantum/haptic.c
@@ -247,7 +247,9 @@ void haptic_set_dwell(uint8_t dwell) {
     xprintf("haptic_config.dwell = %u\n", haptic_config.dwell);
 }
 
-uint8_t haptic_get_enable(void) { return haptic_config.enable; }
+uint8_t haptic_get_enable(void) {
+    return haptic_config.enable;
+}
 
 uint8_t haptic_get_mode(void) {
     if (!haptic_config.enable) {
diff --git a/quantum/keyboard.c b/quantum/keyboard.c
index 6bb2800910..ba5609f0aa 100644
--- a/quantum/keyboard.c
+++ b/quantum/keyboard.c
@@ -110,18 +110,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 static uint32_t last_input_modification_time = 0;
-uint32_t        last_input_activity_time(void) { return last_input_modification_time; }
-uint32_t        last_input_activity_elapsed(void) { return timer_elapsed32(last_input_modification_time); }
+uint32_t        last_input_activity_time(void) {
+    return last_input_modification_time;
+}
+uint32_t last_input_activity_elapsed(void) {
+    return timer_elapsed32(last_input_modification_time);
+}
 
 static uint32_t last_matrix_modification_time = 0;
-uint32_t        last_matrix_activity_time(void) { return last_matrix_modification_time; }
-uint32_t        last_matrix_activity_elapsed(void) { return timer_elapsed32(last_matrix_modification_time); }
-void            last_matrix_activity_trigger(void) { last_matrix_modification_time = last_input_modification_time = timer_read32(); }
+uint32_t        last_matrix_activity_time(void) {
+    return last_matrix_modification_time;
+}
+uint32_t last_matrix_activity_elapsed(void) {
+    return timer_elapsed32(last_matrix_modification_time);
+}
+void last_matrix_activity_trigger(void) {
+    last_matrix_modification_time = last_input_modification_time = timer_read32();
+}
 
 static uint32_t last_encoder_modification_time = 0;
-uint32_t        last_encoder_activity_time(void) { return last_encoder_modification_time; }
-uint32_t        last_encoder_activity_elapsed(void) { return timer_elapsed32(last_encoder_modification_time); }
-void            last_encoder_activity_trigger(void) { last_encoder_modification_time = last_input_modification_time = timer_read32(); }
+uint32_t        last_encoder_activity_time(void) {
+    return last_encoder_modification_time;
+}
+uint32_t last_encoder_activity_elapsed(void) {
+    return timer_elapsed32(last_encoder_modification_time);
+}
+void last_encoder_activity_trigger(void) {
+    last_encoder_modification_time = last_input_modification_time = timer_read32();
+}
 
 // Only enable this if console is enabled to print to
 #if defined(DEBUG_MATRIX_SCAN_RATE)
@@ -143,7 +159,9 @@ void matrix_scan_perf_task(void) {
     }
 }
 
-uint32_t get_matrix_scan_rate(void) { return last_matrix_scan_count; }
+uint32_t get_matrix_scan_rate(void) {
+    return last_matrix_scan_count;
+}
 #else
 #    define matrix_scan_perf_task()
 #endif
@@ -163,7 +181,7 @@ static matrix_row_t   get_real_keys(uint8_t row, matrix_row_t rowdata) {
 }
 
 static inline bool popcount_more_than_one(matrix_row_t rowdata) {
-    rowdata &= rowdata - 1;  // if there are less than two bits (keys) set, rowdata will become zero
+    rowdata &= rowdata - 1; // if there are less than two bits (keys) set, rowdata will become zero
     return rowdata;
 }
 
@@ -220,7 +238,9 @@ __attribute__((weak)) void keyboard_pre_init_user(void) {}
  *
  * FIXME: needs doc
  */
-__attribute__((weak)) void keyboard_pre_init_kb(void) { keyboard_pre_init_user(); }
+__attribute__((weak)) void keyboard_pre_init_kb(void) {
+    keyboard_pre_init_user();
+}
 
 /** \brief keyboard_post_init_user
  *
@@ -234,7 +254,9 @@ __attribute__((weak)) void keyboard_post_init_user() {}
  * FIXME: needs doc
  */
 
-__attribute__((weak)) void keyboard_post_init_kb(void) { keyboard_post_init_user(); }
+__attribute__((weak)) void keyboard_post_init_kb(void) {
+    keyboard_post_init_user();
+}
 
 /** \brief keyboard_setup
  *
@@ -258,13 +280,17 @@ void keyboard_setup(void) {
  *
  * FIXME: needs doc
  */
-__attribute__((weak)) bool is_keyboard_master(void) { return true; }
+__attribute__((weak)) bool is_keyboard_master(void) {
+    return true;
+}
 
 /** \brief is_keyboard_left
  *
  * FIXME: needs doc
  */
-__attribute__((weak)) bool is_keyboard_left(void) { return true; }
+__attribute__((weak)) bool is_keyboard_left(void) {
+    return true;
+}
 
 #endif
 
@@ -273,7 +299,9 @@ __attribute__((weak)) bool is_keyboard_left(void) { return true; }
  * Override this function if you have a condition where keypresses processing should change:
  *   - splits where the slave side needs to process for rgb/oled functionality
  */
-__attribute__((weak)) bool should_process_keypress(void) { return is_keyboard_master(); }
+__attribute__((weak)) bool should_process_keypress(void) {
+    return is_keyboard_master();
+}
 
 /** \brief housekeeping_task_kb
  *
diff --git a/quantum/keyboard.h b/quantum/keyboard.h
index 9b0fb3cef8..e122b38264 100644
--- a/quantum/keyboard.h
+++ b/quantum/keyboard.h
@@ -44,13 +44,21 @@ typedef struct {
  * 1) (time == 0) to handle (keyevent_t){} as empty event
  * 2) Matrix(255, 255) to make TICK event available
  */
-static inline bool IS_NOEVENT(keyevent_t event) { return event.time == 0 || (event.key.row == 255 && event.key.col == 255); }
-static inline bool IS_PRESSED(keyevent_t event) { return (!IS_NOEVENT(event) && event.pressed); }
-static inline bool IS_RELEASED(keyevent_t event) { return (!IS_NOEVENT(event) && !event.pressed); }
+static inline bool IS_NOEVENT(keyevent_t event) {
+    return event.time == 0 || (event.key.row == 255 && event.key.col == 255);
+}
+static inline bool IS_PRESSED(keyevent_t event) {
+    return (!IS_NOEVENT(event) && event.pressed);
+}
+static inline bool IS_RELEASED(keyevent_t event) {
+    return (!IS_NOEVENT(event) && !event.pressed);
+}
 
 /* Tick event */
-#define TICK \
-    (keyevent_t) { .key = (keypos_t){.row = 255, .col = 255}, .pressed = false, .time = (timer_read() | 1) }
+#define TICK                                                                                    \
+    (keyevent_t) {                                                                              \
+        .key = (keypos_t){.row = 255, .col = 255}, .pressed = false, .time = (timer_read() | 1) \
+    }
 
 /* it runs once at early stage of startup before keyboard_init. */
 void keyboard_setup(void);
@@ -68,18 +76,18 @@ void keyboard_pre_init_user(void);
 void keyboard_post_init_kb(void);
 void keyboard_post_init_user(void);
 
-void housekeeping_task(void);       // To be executed by the main loop in each backend TMK protocol
-void housekeeping_task_kb(void);    // To be overridden by keyboard-level code
-void housekeeping_task_user(void);  // To be overridden by user/keymap-level code
+void housekeeping_task(void);      // To be executed by the main loop in each backend TMK protocol
+void housekeeping_task_kb(void);   // To be overridden by keyboard-level code
+void housekeeping_task_user(void); // To be overridden by user/keymap-level code
 
-uint32_t last_input_activity_time(void);     // Timestamp of the last matrix or encoder activity
-uint32_t last_input_activity_elapsed(void);  // Number of milliseconds since the last matrix or encoder activity
+uint32_t last_input_activity_time(void);    // Timestamp of the last matrix or encoder activity
+uint32_t last_input_activity_elapsed(void); // Number of milliseconds since the last matrix or encoder activity
 
-uint32_t last_matrix_activity_time(void);     // Timestamp of the last matrix activity
-uint32_t last_matrix_activity_elapsed(void);  // Number of milliseconds since the last matrix activity
+uint32_t last_matrix_activity_time(void);    // Timestamp of the last matrix activity
+uint32_t last_matrix_activity_elapsed(void); // Number of milliseconds since the last matrix activity
 
-uint32_t last_encoder_activity_time(void);     // Timestamp of the last encoder activity
-uint32_t last_encoder_activity_elapsed(void);  // Number of milliseconds since the last encoder activity
+uint32_t last_encoder_activity_time(void);    // Timestamp of the last encoder activity
+uint32_t last_encoder_activity_elapsed(void); // Number of milliseconds since the last encoder activity
 
 uint32_t get_matrix_scan_rate(void);
 
diff --git a/quantum/keycode.h b/quantum/keycode.h
index a932550635..3c80a386d1 100644
--- a/quantum/keycode.h
+++ b/quantum/keycode.h
@@ -251,7 +251,7 @@ enum hid_keyboard_keypad_usage {
     KC_J,
     KC_K,
     KC_L,
-    KC_M,  // 0x10
+    KC_M, // 0x10
     KC_N,
     KC_O,
     KC_P,
@@ -267,7 +267,7 @@ enum hid_keyboard_keypad_usage {
     KC_Z,
     KC_1,
     KC_2,
-    KC_3,  // 0x20
+    KC_3, // 0x20
     KC_4,
     KC_5,
     KC_6,
@@ -283,7 +283,7 @@ enum hid_keyboard_keypad_usage {
     KC_MINUS,
     KC_EQUAL,
     KC_LEFT_BRACKET,
-    KC_RIGHT_BRACKET,  // 0x30
+    KC_RIGHT_BRACKET, // 0x30
     KC_BACKSLASH,
     KC_NONUS_HASH,
     KC_SEMICOLON,
@@ -299,7 +299,7 @@ enum hid_keyboard_keypad_usage {
     KC_F4,
     KC_F5,
     KC_F6,
-    KC_F7,  // 0x40
+    KC_F7, // 0x40
     KC_F8,
     KC_F9,
     KC_F10,
@@ -315,7 +315,7 @@ enum hid_keyboard_keypad_usage {
     KC_END,
     KC_PAGE_DOWN,
     KC_RIGHT,
-    KC_LEFT,  // 0x50
+    KC_LEFT, // 0x50
     KC_DOWN,
     KC_UP,
     KC_NUM_LOCK,
@@ -331,7 +331,7 @@ enum hid_keyboard_keypad_usage {
     KC_KP_5,
     KC_KP_6,
     KC_KP_7,
-    KC_KP_8,  // 0x60
+    KC_KP_8, // 0x60
     KC_KP_9,
     KC_KP_0,
     KC_KP_DOT,
@@ -347,7 +347,7 @@ enum hid_keyboard_keypad_usage {
     KC_F18,
     KC_F19,
     KC_F20,
-    KC_F21,  // 0x70
+    KC_F21, // 0x70
     KC_F22,
     KC_F23,
     KC_F24,
@@ -363,7 +363,7 @@ enum hid_keyboard_keypad_usage {
     KC_PASTE,
     KC_FIND,
     KC_KB_MUTE,
-    KC_KB_VOLUME_UP,  // 0x80
+    KC_KB_VOLUME_UP, // 0x80
     KC_KB_VOLUME_DOWN,
     KC_LOCKING_CAPS_LOCK,
     KC_LOCKING_NUM_LOCK,
@@ -379,7 +379,7 @@ enum hid_keyboard_keypad_usage {
     KC_INTERNATIONAL_7,
     KC_INTERNATIONAL_8,
     KC_INTERNATIONAL_9,
-    KC_LANGUAGE_1,  // 0x90
+    KC_LANGUAGE_1, // 0x90
     KC_LANGUAGE_2,
     KC_LANGUAGE_3,
     KC_LANGUAGE_4,
@@ -395,7 +395,7 @@ enum hid_keyboard_keypad_usage {
     KC_PRIOR,
     KC_RETURN,
     KC_SEPARATOR,
-    KC_OUT,  // 0xA0
+    KC_OUT, // 0xA0
     KC_OPER,
     KC_CLEAR_AGAIN,
     KC_CRSEL,
@@ -488,7 +488,7 @@ enum internal_special_keycodes {
     KC_MEDIA_STOP,
     KC_MEDIA_PLAY_PAUSE,
     KC_MEDIA_SELECT,
-    KC_MEDIA_EJECT,  // 0xB0
+    KC_MEDIA_EJECT, // 0xB0
     KC_MAIL,
     KC_CALCULATOR,
     KC_MY_COMPUTER,
@@ -514,7 +514,7 @@ enum mouse_keys {
 #endif
     KC_MS_DOWN,
     KC_MS_LEFT,
-    KC_MS_RIGHT,  // 0xF0
+    KC_MS_RIGHT, // 0xF0
     KC_MS_BTN1,
     KC_MS_BTN2,
     KC_MS_BTN3,
@@ -539,7 +539,7 @@ enum mouse_keys {
     /* Acceleration */
     KC_MS_ACCEL0,
     KC_MS_ACCEL1,
-    KC_MS_ACCEL2  // 0xFF
+    KC_MS_ACCEL2 // 0xFF
 };
 
 #include "keycode_legacy.h"
diff --git a/quantum/keymap_common.c b/quantum/keymap_common.c
index cd67f71a8f..a91b2a0b36 100644
--- a/quantum/keymap_common.c
+++ b/quantum/keymap_common.c
@@ -77,7 +77,7 @@ action_t action_for_keycode(uint16_t keycode) {
         case QK_MODS ... QK_MODS_MAX:;
             // Has a modifier
             // Split it up
-            action.code = ACTION_MODS_KEY(keycode >> 8, keycode & 0xFF);  // adds modifier to key
+            action.code = ACTION_MODS_KEY(keycode >> 8, keycode & 0xFF); // adds modifier to key
             break;
 #ifndef NO_ACTION_LAYER
         case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
diff --git a/quantum/keymap_extras/keymap_nordic.h b/quantum/keymap_extras/keymap_nordic.h
index 76d2f4f6b0..55a58a25b0 100644
--- a/quantum/keymap_extras/keymap_nordic.h
+++ b/quantum/keymap_extras/keymap_nordic.h
@@ -24,7 +24,7 @@
 #define NO_ACUT KC_EQL
 
 #define NO_AM KC_LBRC
-#define NO_QUOT KC_RBRC  // this is the "umlaut" char on Nordic keyboards, Apple layout
+#define NO_QUOT KC_RBRC // this is the "umlaut" char on Nordic keyboards, Apple layout
 #define NO_AE KC_SCLN
 #define NO_OSLH KC_QUOT
 #define NO_APOS KC_NUHS
diff --git a/quantum/keymap_extras/keymap_steno.h b/quantum/keymap_extras/keymap_steno.h
index 310aa07409..e888ccd643 100644
--- a/quantum/keymap_extras/keymap_steno.h
+++ b/quantum/keymap_extras/keymap_steno.h
@@ -70,7 +70,7 @@ enum steno_keycodes {
     STN_NB,
     STN_NC,
     STN_ZR,
-    STN__MAX = STN_ZR,  // must be less than QK_STENO_BOLT
+    STN__MAX = STN_ZR, // must be less than QK_STENO_BOLT
 };
 
 #ifdef STENO_COMBINEDMAP
diff --git a/quantum/led.c b/quantum/led.c
index 7b3f877208..c5ddbc22c5 100644
--- a/quantum/led.c
+++ b/quantum/led.c
@@ -64,13 +64,17 @@ __attribute__((weak)) void led_set_user(uint8_t usb_led) {}
  *
  * \deprecated Use led_update_kb() instead.
  */
-__attribute__((weak)) void led_set_kb(uint8_t usb_led) { led_set_user(usb_led); }
+__attribute__((weak)) void led_set_kb(uint8_t usb_led) {
+    led_set_user(usb_led);
+}
 
 /** \brief Lock LED update callback - keymap/user level
  *
  * \return True if led_update_kb() should run its own code, false otherwise.
  */
-__attribute__((weak)) bool led_update_user(led_t led_state) { return true; }
+__attribute__((weak)) bool led_update_user(led_t led_state) {
+    return true;
+}
 
 /** \brief Lock LED update callback - keyboard level
  *
@@ -156,7 +160,9 @@ void led_suspend(void) {
 
 /** \brief Trigger behaviour on transition from suspend
  */
-void led_wakeup(void) { led_set(host_keyboard_leds()); }
+void led_wakeup(void) {
+    led_set(host_keyboard_leds());
+}
 
 /** \brief set host led state
  *
diff --git a/quantum/led_matrix/animations/alpha_mods_anim.h b/quantum/led_matrix/animations/alpha_mods_anim.h
index 4d017894a1..01acb3f933 100644
--- a/quantum/led_matrix/animations/alpha_mods_anim.h
+++ b/quantum/led_matrix/animations/alpha_mods_anim.h
@@ -20,5 +20,5 @@ bool ALPHAS_MODS(effect_params_t* params) {
     return led_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_ALPHAS_MODS
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_ALPHAS_MODS
diff --git a/quantum/led_matrix/animations/band_anim.h b/quantum/led_matrix/animations/band_anim.h
index 293be4f67a..d9491849ea 100644
--- a/quantum/led_matrix/animations/band_anim.h
+++ b/quantum/led_matrix/animations/band_anim.h
@@ -7,7 +7,9 @@ static uint8_t BAND_math(uint8_t val, uint8_t i, uint8_t time) {
     return scale8(v < 0 ? 0 : v, val);
 }
 
-bool BAND(effect_params_t* params) { return effect_runner_i(params, &BAND_math); }
+bool BAND(effect_params_t* params) {
+    return effect_runner_i(params, &BAND_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_BAND
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_BAND
diff --git a/quantum/led_matrix/animations/band_pinwheel_anim.h b/quantum/led_matrix/animations/band_pinwheel_anim.h
index f47a3869ce..482d183eb6 100644
--- a/quantum/led_matrix/animations/band_pinwheel_anim.h
+++ b/quantum/led_matrix/animations/band_pinwheel_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(BAND_PINWHEEL)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t BAND_PINWHEEL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t time) { return scale8(val - time - atan2_8(dy, dx) * 3, val); }
+static uint8_t BAND_PINWHEEL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t time) {
+    return scale8(val - time - atan2_8(dy, dx) * 3, val);
+}
 
-bool BAND_PINWHEEL(effect_params_t* params) { return effect_runner_dx_dy(params, &BAND_PINWHEEL_math); }
+bool BAND_PINWHEEL(effect_params_t* params) {
+    return effect_runner_dx_dy(params, &BAND_PINWHEEL_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_BAND_PINWHEEL
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_BAND_PINWHEEL
diff --git a/quantum/led_matrix/animations/band_spiral_anim.h b/quantum/led_matrix/animations/band_spiral_anim.h
index a4bd382181..ef93d19270 100644
--- a/quantum/led_matrix/animations/band_spiral_anim.h
+++ b/quantum/led_matrix/animations/band_spiral_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(BAND_SPIRAL)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t BAND_SPIRAL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) { return scale8(val + dist - time - atan2_8(dy, dx), val); }
+static uint8_t BAND_SPIRAL_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) {
+    return scale8(val + dist - time - atan2_8(dy, dx), val);
+}
 
-bool BAND_SPIRAL(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_math); }
+bool BAND_SPIRAL(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_BAND_SPIRAL
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_BAND_SPIRAL
diff --git a/quantum/led_matrix/animations/breathing_anim.h b/quantum/led_matrix/animations/breathing_anim.h
index 899925f516..0bd4cb0cc3 100644
--- a/quantum/led_matrix/animations/breathing_anim.h
+++ b/quantum/led_matrix/animations/breathing_anim.h
@@ -15,5 +15,5 @@ bool BREATHING(effect_params_t* params) {
     return led_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_BREATHING
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_BREATHING
diff --git a/quantum/led_matrix/animations/cycle_left_right_anim.h b/quantum/led_matrix/animations/cycle_left_right_anim.h
index 1a8999b831..0a339e6d62 100644
--- a/quantum/led_matrix/animations/cycle_left_right_anim.h
+++ b/quantum/led_matrix/animations/cycle_left_right_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(CYCLE_LEFT_RIGHT)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t CYCLE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(g_led_config.point[i].x - time, val); }
+static uint8_t CYCLE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) {
+    return scale8(g_led_config.point[i].x - time, val);
+}
 
-bool CYCLE_LEFT_RIGHT(effect_params_t* params) { return effect_runner_i(params, &CYCLE_LEFT_RIGHT_math); }
+bool CYCLE_LEFT_RIGHT(effect_params_t* params) {
+    return effect_runner_i(params, &CYCLE_LEFT_RIGHT_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_CYCLE_LEFT_RIGHT
diff --git a/quantum/led_matrix/animations/cycle_out_in_anim.h b/quantum/led_matrix/animations/cycle_out_in_anim.h
index 77d3a14b6f..8311d97fe8 100644
--- a/quantum/led_matrix/animations/cycle_out_in_anim.h
+++ b/quantum/led_matrix/animations/cycle_out_in_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(CYCLE_OUT_IN)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t CYCLE_OUT_IN_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) { return scale8(3 * dist / 2 + time, val); }
+static uint8_t CYCLE_OUT_IN_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uint8_t time) {
+    return scale8(3 * dist / 2 + time, val);
+}
 
-bool CYCLE_OUT_IN(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &CYCLE_OUT_IN_math); }
+bool CYCLE_OUT_IN(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &CYCLE_OUT_IN_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_CYCLE_OUT_IN
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_CYCLE_OUT_IN
diff --git a/quantum/led_matrix/animations/cycle_up_down_anim.h b/quantum/led_matrix/animations/cycle_up_down_anim.h
index b25947199c..7e2d71a0f1 100644
--- a/quantum/led_matrix/animations/cycle_up_down_anim.h
+++ b/quantum/led_matrix/animations/cycle_up_down_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(CYCLE_UP_DOWN)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t CYCLE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(g_led_config.point[i].y - time, val); }
+static uint8_t CYCLE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) {
+    return scale8(g_led_config.point[i].y - time, val);
+}
 
-bool CYCLE_UP_DOWN(effect_params_t* params) { return effect_runner_i(params, &CYCLE_UP_DOWN_math); }
+bool CYCLE_UP_DOWN(effect_params_t* params) {
+    return effect_runner_i(params, &CYCLE_UP_DOWN_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_CYCLE_UP_DOWN
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_CYCLE_UP_DOWN
diff --git a/quantum/led_matrix/animations/dual_beacon_anim.h b/quantum/led_matrix/animations/dual_beacon_anim.h
index 81735e323c..1dfb5ffe52 100644
--- a/quantum/led_matrix/animations/dual_beacon_anim.h
+++ b/quantum/led_matrix/animations/dual_beacon_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(DUAL_BEACON)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t DUAL_BEACON_math(uint8_t val, int8_t sin, int8_t cos, uint8_t i, uint8_t time) { return scale8(((g_led_config.point[i].y - k_led_matrix_center.y) * cos + (g_led_config.point[i].x - k_led_matrix_center.x) * sin) / 128, val); }
+static uint8_t DUAL_BEACON_math(uint8_t val, int8_t sin, int8_t cos, uint8_t i, uint8_t time) {
+    return scale8(((g_led_config.point[i].y - k_led_matrix_center.y) * cos + (g_led_config.point[i].x - k_led_matrix_center.x) * sin) / 128, val);
+}
 
-bool DUAL_BEACON(effect_params_t* params) { return effect_runner_sin_cos_i(params, &DUAL_BEACON_math); }
+bool DUAL_BEACON(effect_params_t* params) {
+    return effect_runner_sin_cos_i(params, &DUAL_BEACON_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_DUAL_BEACON
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_DUAL_BEACON
diff --git a/quantum/led_matrix/animations/runners/effect_runner_reactive.h b/quantum/led_matrix/animations/runners/effect_runner_reactive.h
index be3090aa53..8468458744 100644
--- a/quantum/led_matrix/animations/runners/effect_runner_reactive.h
+++ b/quantum/led_matrix/animations/runners/effect_runner_reactive.h
@@ -25,4 +25,4 @@ bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) {
     return led_matrix_check_finished_leds(led_max);
 }
 
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/runners/effect_runner_reactive_splash.h b/quantum/led_matrix/animations/runners/effect_runner_reactive_splash.h
index f6ffc825a1..aec4a6ffda 100644
--- a/quantum/led_matrix/animations/runners/effect_runner_reactive_splash.h
+++ b/quantum/led_matrix/animations/runners/effect_runner_reactive_splash.h
@@ -23,4 +23,4 @@ bool effect_runner_reactive_splash(uint8_t start, effect_params_t* params, react
     return led_matrix_check_finished_leds(led_max);
 }
 
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/solid_anim.h b/quantum/led_matrix/animations/solid_anim.h
index c728dbcc98..895542e152 100644
--- a/quantum/led_matrix/animations/solid_anim.h
+++ b/quantum/led_matrix/animations/solid_anim.h
@@ -12,4 +12,4 @@ bool SOLID(effect_params_t* params) {
     return led_matrix_check_finished_leds(led_max);
 }
 
-#endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/quantum/led_matrix/animations/solid_reactive_cross.h b/quantum/led_matrix/animations/solid_reactive_cross.h
index a149e9a929..55a2556996 100644
--- a/quantum/led_matrix/animations/solid_reactive_cross.h
+++ b/quantum/led_matrix/animations/solid_reactive_cross.h
@@ -23,13 +23,17 @@ static uint8_t SOLID_REACTIVE_CROSS_math(uint8_t val, int16_t dx, int16_t dy, ui
 }
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS
-bool SOLID_REACTIVE_CROSS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math); }
+bool SOLID_REACTIVE_CROSS(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math);
+}
 #            endif
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS
-bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math); }
+bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math);
+}
 #            endif
 
-#        endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS)
-#endif          // LED_MATRIX_KEYREACTIVE_ENABLED
+#        endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_CROSS) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTICROSS)
+#endif         // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/solid_reactive_nexus.h b/quantum/led_matrix/animations/solid_reactive_nexus.h
index 5a86e48c6c..b1ec54e3b1 100644
--- a/quantum/led_matrix/animations/solid_reactive_nexus.h
+++ b/quantum/led_matrix/animations/solid_reactive_nexus.h
@@ -20,13 +20,17 @@ static uint8_t SOLID_REACTIVE_NEXUS_math(uint8_t val, int16_t dx, int16_t dy, ui
 }
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS
-bool SOLID_REACTIVE_NEXUS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math); }
+bool SOLID_REACTIVE_NEXUS(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math);
+}
 #            endif
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS
-bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math); }
+bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math);
+}
 #            endif
 
-#        endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS)
-#endif          // LED_MATRIX_KEYREACTIVE_ENABLED
+#        endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_NEXUS) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTINEXUS)
+#endif         // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/solid_reactive_simple_anim.h b/quantum/led_matrix/animations/solid_reactive_simple_anim.h
index 14f5e90730..3b289c78dd 100644
--- a/quantum/led_matrix/animations/solid_reactive_simple_anim.h
+++ b/quantum/led_matrix/animations/solid_reactive_simple_anim.h
@@ -3,10 +3,14 @@
 LED_MATRIX_EFFECT(SOLID_REACTIVE_SIMPLE)
 #        ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t SOLID_REACTIVE_SIMPLE_math(uint8_t val, uint16_t offset) { return scale8(255 - offset, val); }
+static uint8_t SOLID_REACTIVE_SIMPLE_math(uint8_t val, uint16_t offset) {
+    return scale8(255 - offset, val);
+}
 
-bool SOLID_REACTIVE_SIMPLE(effect_params_t* params) { return effect_runner_reactive(params, &SOLID_REACTIVE_SIMPLE_math); }
+bool SOLID_REACTIVE_SIMPLE(effect_params_t* params) {
+    return effect_runner_reactive(params, &SOLID_REACTIVE_SIMPLE_math);
+}
 
-#        endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
-#endif          // LED_MATRIX_KEYREACTIVE_ENABLED
+#        endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // ENABLE_LED_MATRIX_SOLID_REACTIVE_SIMPLE
+#endif         // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/solid_reactive_wide.h b/quantum/led_matrix/animations/solid_reactive_wide.h
index 3aa88063a7..96338113f1 100644
--- a/quantum/led_matrix/animations/solid_reactive_wide.h
+++ b/quantum/led_matrix/animations/solid_reactive_wide.h
@@ -18,13 +18,17 @@ static uint8_t SOLID_REACTIVE_WIDE_math(uint8_t val, int16_t dx, int16_t dy, uin
 }
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
-bool SOLID_REACTIVE_WIDE(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math); }
+bool SOLID_REACTIVE_WIDE(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math);
+}
 #            endif
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE
-bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math); }
+bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math);
+}
 #            endif
 
-#        endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE)
-#endif          // LED_MATRIX_KEYREACTIVE_ENABLED
+#        endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE)
+#endif         // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/solid_splash_anim.h b/quantum/led_matrix/animations/solid_splash_anim.h
index 17b692a09a..b8b6e8ea5e 100644
--- a/quantum/led_matrix/animations/solid_splash_anim.h
+++ b/quantum/led_matrix/animations/solid_splash_anim.h
@@ -18,13 +18,17 @@ uint8_t SOLID_SPLASH_math(uint8_t val, int16_t dx, int16_t dy, uint8_t dist, uin
 }
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_SPLASH
-bool SOLID_SPLASH(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_SPLASH_math); }
+bool SOLID_SPLASH(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_SPLASH_math);
+}
 #            endif
 
 #            ifdef ENABLE_LED_MATRIX_SOLID_MULTISPLASH
-bool SOLID_MULTISPLASH(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_SPLASH_math); }
+bool SOLID_MULTISPLASH(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_SPLASH_math);
+}
 #            endif
 
-#        endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // defined(ENABLE_LED_MATRIX_SPLASH) || defined(ENABLE_LED_MATRIX_MULTISPLASH)
-#endif          // LED_MATRIX_KEYREACTIVE_ENABLED
+#        endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // defined(ENABLE_LED_MATRIX_SPLASH) || defined(ENABLE_LED_MATRIX_MULTISPLASH)
+#endif         // LED_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/led_matrix/animations/wave_left_right_anim.h b/quantum/led_matrix/animations/wave_left_right_anim.h
index 76487f8515..8dedd64738 100644
--- a/quantum/led_matrix/animations/wave_left_right_anim.h
+++ b/quantum/led_matrix/animations/wave_left_right_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(WAVE_LEFT_RIGHT)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t WAVE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(sin8(g_led_config.point[i].x - time), val); }
+static uint8_t WAVE_LEFT_RIGHT_math(uint8_t val, uint8_t i, uint8_t time) {
+    return scale8(sin8(g_led_config.point[i].x - time), val);
+}
 
-bool WAVE_LEFT_RIGHT(effect_params_t* params) { return effect_runner_i(params, &WAVE_LEFT_RIGHT_math); }
+bool WAVE_LEFT_RIGHT(effect_params_t* params) {
+    return effect_runner_i(params, &WAVE_LEFT_RIGHT_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_WAVE_LEFT_RIGHT
diff --git a/quantum/led_matrix/animations/wave_up_down_anim.h b/quantum/led_matrix/animations/wave_up_down_anim.h
index 94710f5c6e..4564f3e493 100644
--- a/quantum/led_matrix/animations/wave_up_down_anim.h
+++ b/quantum/led_matrix/animations/wave_up_down_anim.h
@@ -2,9 +2,13 @@
 LED_MATRIX_EFFECT(WAVE_UP_DOWN)
 #    ifdef LED_MATRIX_CUSTOM_EFFECT_IMPLS
 
-static uint8_t WAVE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) { return scale8(sin8(g_led_config.point[i].y - time), val); }
+static uint8_t WAVE_UP_DOWN_math(uint8_t val, uint8_t i, uint8_t time) {
+    return scale8(sin8(g_led_config.point[i].y - time), val);
+}
 
-bool WAVE_UP_DOWN(effect_params_t* params) { return effect_runner_i(params, &WAVE_UP_DOWN_math); }
+bool WAVE_UP_DOWN(effect_params_t* params) {
+    return effect_runner_i(params, &WAVE_UP_DOWN_math);
+}
 
-#    endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_LED_MATRIX_WAVE_UP_DOWN
+#    endif // LED_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_LED_MATRIX_WAVE_UP_DOWN
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index be1494e884..38ed79bed0 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -88,14 +88,14 @@ const led_point_t k_led_matrix_center = LED_MATRIX_CENTER;
 #endif
 
 // globals
-led_eeconfig_t led_matrix_eeconfig;  // TODO: would like to prefix this with g_ for global consistancy, do this in another pr
+led_eeconfig_t led_matrix_eeconfig; // TODO: would like to prefix this with g_ for global consistancy, do this in another pr
 uint32_t       g_led_timer;
 #ifdef LED_MATRIX_FRAMEBUFFER_EFFECTS
 uint8_t g_led_frame_buffer[MATRIX_ROWS][MATRIX_COLS] = {{0}};
-#endif  // LED_MATRIX_FRAMEBUFFER_EFFECTS
+#endif // LED_MATRIX_FRAMEBUFFER_EFFECTS
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
 last_hit_t g_last_hit_tracker;
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
 // internals
 static bool            suspend_state     = false;
@@ -105,13 +105,13 @@ static effect_params_t led_effect_params = {0, LED_FLAG_ALL, false};
 static led_task_states led_task_state    = SYNCING;
 #if LED_DISABLE_TIMEOUT > 0
 static uint32_t led_anykey_timer;
-#endif  // LED_DISABLE_TIMEOUT > 0
+#endif // LED_DISABLE_TIMEOUT > 0
 
 // double buffers
 static uint32_t led_timer_buffer;
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
 static last_hit_t last_hit_buffer;
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
 // split led matrix
 #if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
@@ -120,7 +120,9 @@ const uint8_t k_led_matrix_split[2] = LED_MATRIX_SPLIT;
 
 EECONFIG_DEBOUNCE_HELPER(led_matrix, EECONFIG_LED_MATRIX, led_matrix_eeconfig);
 
-void eeconfig_update_led_matrix(void) { eeconfig_flush_led_matrix(true); }
+void eeconfig_update_led_matrix(void) {
+    eeconfig_flush_led_matrix(true);
+}
 
 void eeconfig_update_led_matrix_default(void) {
     dprintf("eeconfig_update_led_matrix_default\n");
@@ -141,7 +143,9 @@ void eeconfig_debug_led_matrix(void) {
     dprintf("led_matrix_eeconfig.flags = %d\n", led_matrix_eeconfig.flags);
 }
 
-__attribute__((weak)) uint8_t led_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) { return 0; }
+__attribute__((weak)) uint8_t led_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) {
+    return 0;
+}
 
 uint8_t led_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i) {
     uint8_t led_count = led_matrix_map_row_column_to_led_kb(row, column, led_i);
@@ -153,7 +157,9 @@ uint8_t led_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *l
     return led_count;
 }
 
-void led_matrix_update_pwm_buffers(void) { led_matrix_driver.flush(); }
+void led_matrix_update_pwm_buffers(void) {
+    led_matrix_driver.flush();
+}
 
 void led_matrix_set_value(int index, uint8_t value) {
 #ifdef USE_CIE1931_CURVE
@@ -164,7 +170,8 @@ void led_matrix_set_value(int index, uint8_t value) {
 
 void led_matrix_set_value_all(uint8_t value) {
 #if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) led_matrix_set_value(i, value);
+    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++)
+        led_matrix_set_value(i, value);
 #else
 #    ifdef USE_CIE1931_CURVE
     led_matrix_driver.set_value_all(pgm_read_byte(&CIE1931_CURVE[value]));
@@ -180,7 +187,7 @@ void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
 #endif
 #if LED_DISABLE_TIMEOUT > 0
     led_anykey_timer = 0;
-#endif  // LED_DISABLE_TIMEOUT > 0
+#endif // LED_DISABLE_TIMEOUT > 0
 
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
     uint8_t led[LED_HITS_TO_REMEMBER];
@@ -190,7 +197,7 @@ void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
     if (!pressed)
 #    elif defined(LED_MATRIX_KEYPRESSES)
     if (pressed)
-#    endif  // defined(LED_MATRIX_KEYRELEASES)
+#    endif // defined(LED_MATRIX_KEYRELEASES)
     {
         led_count = led_matrix_map_row_column_to_led(row, col, led);
     }
@@ -198,7 +205,7 @@ void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
     if (last_hit_buffer.count + led_count > LED_HITS_TO_REMEMBER) {
         memcpy(&last_hit_buffer.x[0], &last_hit_buffer.x[led_count], LED_HITS_TO_REMEMBER - led_count);
         memcpy(&last_hit_buffer.y[0], &last_hit_buffer.y[led_count], LED_HITS_TO_REMEMBER - led_count);
-        memcpy(&last_hit_buffer.tick[0], &last_hit_buffer.tick[led_count], (LED_HITS_TO_REMEMBER - led_count) * 2);  // 16 bit
+        memcpy(&last_hit_buffer.tick[0], &last_hit_buffer.tick[led_count], (LED_HITS_TO_REMEMBER - led_count) * 2); // 16 bit
         memcpy(&last_hit_buffer.index[0], &last_hit_buffer.index[led_count], LED_HITS_TO_REMEMBER - led_count);
         last_hit_buffer.count = LED_HITS_TO_REMEMBER - led_count;
     }
@@ -211,13 +218,13 @@ void process_led_matrix(uint8_t row, uint8_t col, bool pressed) {
         last_hit_buffer.tick[index]  = 0;
         last_hit_buffer.count++;
     }
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
 #if defined(LED_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_LED_MATRIX_TYPING_HEATMAP)
     if (led_matrix_eeconfig.mode == LED_MATRIX_TYPING_HEATMAP) {
         process_led_matrix_typing_heatmap(row, col);
     }
-#endif  // defined(LED_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_LED_MATRIX_TYPING_HEATMAP)
+#endif // defined(LED_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_LED_MATRIX_TYPING_HEATMAP)
 }
 
 static bool led_matrix_none(effect_params_t *params) {
@@ -232,7 +239,7 @@ static bool led_matrix_none(effect_params_t *params) {
 static void led_task_timers(void) {
 #if defined(LED_MATRIX_KEYREACTIVE_ENABLED) || LED_DISABLE_TIMEOUT > 0
     uint32_t deltaTime = sync_timer_elapsed32(led_timer_buffer);
-#endif  // defined(LED_MATRIX_KEYREACTIVE_ENABLED) || LED_DISABLE_TIMEOUT > 0
+#endif // defined(LED_MATRIX_KEYREACTIVE_ENABLED) || LED_DISABLE_TIMEOUT > 0
     led_timer_buffer = sync_timer_read32();
 
     // Update double buffer timers
@@ -244,7 +251,7 @@ static void led_task_timers(void) {
             led_anykey_timer += deltaTime;
         }
     }
-#endif  // LED_DISABLE_TIMEOUT > 0
+#endif // LED_DISABLE_TIMEOUT > 0
 
     // Update double buffer last hit timers
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
@@ -256,7 +263,7 @@ static void led_task_timers(void) {
         }
         last_hit_buffer.tick[i] += deltaTime;
     }
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 }
 
 static void led_task_sync(void) {
@@ -273,7 +280,7 @@ static void led_task_start(void) {
     g_led_timer = led_timer_buffer;
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
     g_last_hit_tracker = last_hit_buffer;
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
     // next task
     led_task_state = RENDERING;
@@ -352,7 +359,7 @@ void led_matrix_task(void) {
     bool suspend_backlight = suspend_state ||
 #if LED_DISABLE_TIMEOUT > 0
                              (led_anykey_timer > (uint32_t)LED_DISABLE_TIMEOUT) ||
-#endif  // LED_DISABLE_TIMEOUT > 0
+#endif // LED_DISABLE_TIMEOUT > 0
                              false;
 
     uint8_t effect = suspend_backlight || !led_matrix_eeconfig.enable ? 0 : led_matrix_eeconfig.mode;
@@ -421,7 +428,7 @@ void led_matrix_init(void) {
     for (uint8_t i = 0; i < LED_HITS_TO_REMEMBER; ++i) {
         last_hit_buffer.tick[i] = UINT16_MAX;
     }
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
     if (!eeconfig_is_enabled()) {
         dprintf("led_matrix_init_drivers eeconfig is not enabled.\n");
@@ -434,20 +441,22 @@ void led_matrix_init(void) {
         dprintf("led_matrix_init_drivers led_matrix_eeconfig.mode = 0. Write default values to EEPROM.\n");
         eeconfig_update_led_matrix_default();
     }
-    eeconfig_debug_led_matrix();  // display current eeprom values
+    eeconfig_debug_led_matrix(); // display current eeprom values
 }
 
 void led_matrix_set_suspend_state(bool state) {
 #ifdef LED_DISABLE_WHEN_USB_SUSPENDED
-    if (state && !suspend_state && is_keyboard_master()) {  // only run if turning off, and only once
-        led_task_render(0);                                 // turn off all LEDs when suspending
-        led_task_flush(0);                                  // and actually flash led state to LEDs
+    if (state && !suspend_state && is_keyboard_master()) { // only run if turning off, and only once
+        led_task_render(0);                                // turn off all LEDs when suspending
+        led_task_flush(0);                                 // and actually flash led state to LEDs
     }
     suspend_state = state;
 #endif
 }
 
-bool led_matrix_get_suspend_state(void) { return suspend_state; }
+bool led_matrix_get_suspend_state(void) {
+    return suspend_state;
+}
 
 void led_matrix_toggle_eeprom_helper(bool write_to_eeprom) {
     led_matrix_eeconfig.enable ^= 1;
@@ -455,8 +464,12 @@ void led_matrix_toggle_eeprom_helper(bool write_to_eeprom) {
     eeconfig_flag_led_matrix(write_to_eeprom);
     dprintf("led matrix toggle [%s]: led_matrix_eeconfig.enable = %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_eeconfig.enable);
 }
-void led_matrix_toggle_noeeprom(void) { led_matrix_toggle_eeprom_helper(false); }
-void led_matrix_toggle(void) { led_matrix_toggle_eeprom_helper(true); }
+void led_matrix_toggle_noeeprom(void) {
+    led_matrix_toggle_eeprom_helper(false);
+}
+void led_matrix_toggle(void) {
+    led_matrix_toggle_eeprom_helper(true);
+}
 
 void led_matrix_enable(void) {
     led_matrix_enable_noeeprom();
@@ -478,7 +491,9 @@ void led_matrix_disable_noeeprom(void) {
     led_matrix_eeconfig.enable = 0;
 }
 
-uint8_t led_matrix_is_enabled(void) { return led_matrix_eeconfig.enable; }
+uint8_t led_matrix_is_enabled(void) {
+    return led_matrix_eeconfig.enable;
+}
 
 void led_matrix_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
     if (!led_matrix_eeconfig.enable) {
@@ -495,24 +510,38 @@ void led_matrix_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
     eeconfig_flag_led_matrix(write_to_eeprom);
     dprintf("led matrix mode [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_eeconfig.mode);
 }
-void led_matrix_mode_noeeprom(uint8_t mode) { led_matrix_mode_eeprom_helper(mode, false); }
-void led_matrix_mode(uint8_t mode) { led_matrix_mode_eeprom_helper(mode, true); }
+void led_matrix_mode_noeeprom(uint8_t mode) {
+    led_matrix_mode_eeprom_helper(mode, false);
+}
+void led_matrix_mode(uint8_t mode) {
+    led_matrix_mode_eeprom_helper(mode, true);
+}
 
-uint8_t led_matrix_get_mode(void) { return led_matrix_eeconfig.mode; }
+uint8_t led_matrix_get_mode(void) {
+    return led_matrix_eeconfig.mode;
+}
 
 void led_matrix_step_helper(bool write_to_eeprom) {
     uint8_t mode = led_matrix_eeconfig.mode + 1;
     led_matrix_mode_eeprom_helper((mode < LED_MATRIX_EFFECT_MAX) ? mode : 1, write_to_eeprom);
 }
-void led_matrix_step_noeeprom(void) { led_matrix_step_helper(false); }
-void led_matrix_step(void) { led_matrix_step_helper(true); }
+void led_matrix_step_noeeprom(void) {
+    led_matrix_step_helper(false);
+}
+void led_matrix_step(void) {
+    led_matrix_step_helper(true);
+}
 
 void led_matrix_step_reverse_helper(bool write_to_eeprom) {
     uint8_t mode = led_matrix_eeconfig.mode - 1;
     led_matrix_mode_eeprom_helper((mode < 1) ? LED_MATRIX_EFFECT_MAX - 1 : mode, write_to_eeprom);
 }
-void led_matrix_step_reverse_noeeprom(void) { led_matrix_step_reverse_helper(false); }
-void led_matrix_step_reverse(void) { led_matrix_step_reverse_helper(true); }
+void led_matrix_step_reverse_noeeprom(void) {
+    led_matrix_step_reverse_helper(false);
+}
+void led_matrix_step_reverse(void) {
+    led_matrix_step_reverse_helper(true);
+}
 
 void led_matrix_set_val_eeprom_helper(uint8_t val, bool write_to_eeprom) {
     if (!led_matrix_eeconfig.enable) {
@@ -522,37 +551,77 @@ void led_matrix_set_val_eeprom_helper(uint8_t val, bool write_to_eeprom) {
     eeconfig_flag_led_matrix(write_to_eeprom);
     dprintf("led matrix set val [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_eeconfig.val);
 }
-void led_matrix_set_val_noeeprom(uint8_t val) { led_matrix_set_val_eeprom_helper(val, false); }
-void led_matrix_set_val(uint8_t val) { led_matrix_set_val_eeprom_helper(val, true); }
+void led_matrix_set_val_noeeprom(uint8_t val) {
+    led_matrix_set_val_eeprom_helper(val, false);
+}
+void led_matrix_set_val(uint8_t val) {
+    led_matrix_set_val_eeprom_helper(val, true);
+}
 
-uint8_t led_matrix_get_val(void) { return led_matrix_eeconfig.val; }
+uint8_t led_matrix_get_val(void) {
+    return led_matrix_eeconfig.val;
+}
 
-void led_matrix_increase_val_helper(bool write_to_eeprom) { led_matrix_set_val_eeprom_helper(qadd8(led_matrix_eeconfig.val, LED_MATRIX_VAL_STEP), write_to_eeprom); }
-void led_matrix_increase_val_noeeprom(void) { led_matrix_increase_val_helper(false); }
-void led_matrix_increase_val(void) { led_matrix_increase_val_helper(true); }
+void led_matrix_increase_val_helper(bool write_to_eeprom) {
+    led_matrix_set_val_eeprom_helper(qadd8(led_matrix_eeconfig.val, LED_MATRIX_VAL_STEP), write_to_eeprom);
+}
+void led_matrix_increase_val_noeeprom(void) {
+    led_matrix_increase_val_helper(false);
+}
+void led_matrix_increase_val(void) {
+    led_matrix_increase_val_helper(true);
+}
 
-void led_matrix_decrease_val_helper(bool write_to_eeprom) { led_matrix_set_val_eeprom_helper(qsub8(led_matrix_eeconfig.val, LED_MATRIX_VAL_STEP), write_to_eeprom); }
-void led_matrix_decrease_val_noeeprom(void) { led_matrix_decrease_val_helper(false); }
-void led_matrix_decrease_val(void) { led_matrix_decrease_val_helper(true); }
+void led_matrix_decrease_val_helper(bool write_to_eeprom) {
+    led_matrix_set_val_eeprom_helper(qsub8(led_matrix_eeconfig.val, LED_MATRIX_VAL_STEP), write_to_eeprom);
+}
+void led_matrix_decrease_val_noeeprom(void) {
+    led_matrix_decrease_val_helper(false);
+}
+void led_matrix_decrease_val(void) {
+    led_matrix_decrease_val_helper(true);
+}
 
 void led_matrix_set_speed_eeprom_helper(uint8_t speed, bool write_to_eeprom) {
     led_matrix_eeconfig.speed = speed;
     eeconfig_flag_led_matrix(write_to_eeprom);
     dprintf("led matrix set speed [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_eeconfig.speed);
 }
-void led_matrix_set_speed_noeeprom(uint8_t speed) { led_matrix_set_speed_eeprom_helper(speed, false); }
-void led_matrix_set_speed(uint8_t speed) { led_matrix_set_speed_eeprom_helper(speed, true); }
+void led_matrix_set_speed_noeeprom(uint8_t speed) {
+    led_matrix_set_speed_eeprom_helper(speed, false);
+}
+void led_matrix_set_speed(uint8_t speed) {
+    led_matrix_set_speed_eeprom_helper(speed, true);
+}
 
-uint8_t led_matrix_get_speed(void) { return led_matrix_eeconfig.speed; }
+uint8_t led_matrix_get_speed(void) {
+    return led_matrix_eeconfig.speed;
+}
 
-void led_matrix_increase_speed_helper(bool write_to_eeprom) { led_matrix_set_speed_eeprom_helper(qadd8(led_matrix_eeconfig.speed, LED_MATRIX_SPD_STEP), write_to_eeprom); }
-void led_matrix_increase_speed_noeeprom(void) { led_matrix_increase_speed_helper(false); }
-void led_matrix_increase_speed(void) { led_matrix_increase_speed_helper(true); }
+void led_matrix_increase_speed_helper(bool write_to_eeprom) {
+    led_matrix_set_speed_eeprom_helper(qadd8(led_matrix_eeconfig.speed, LED_MATRIX_SPD_STEP), write_to_eeprom);
+}
+void led_matrix_increase_speed_noeeprom(void) {
+    led_matrix_increase_speed_helper(false);
+}
+void led_matrix_increase_speed(void) {
+    led_matrix_increase_speed_helper(true);
+}
 
-void led_matrix_decrease_speed_helper(bool write_to_eeprom) { led_matrix_set_speed_eeprom_helper(qsub8(led_matrix_eeconfig.speed, LED_MATRIX_SPD_STEP), write_to_eeprom); }
-void led_matrix_decrease_speed_noeeprom(void) { led_matrix_decrease_speed_helper(false); }
-void led_matrix_decrease_speed(void) { led_matrix_decrease_speed_helper(true); }
+void led_matrix_decrease_speed_helper(bool write_to_eeprom) {
+    led_matrix_set_speed_eeprom_helper(qsub8(led_matrix_eeconfig.speed, LED_MATRIX_SPD_STEP), write_to_eeprom);
+}
+void led_matrix_decrease_speed_noeeprom(void) {
+    led_matrix_decrease_speed_helper(false);
+}
+void led_matrix_decrease_speed(void) {
+    led_matrix_decrease_speed_helper(true);
+}
 
-led_flags_t led_matrix_get_flags(void) { return led_matrix_eeconfig.flags; }
+led_flags_t led_matrix_get_flags(void) {
+    return led_matrix_eeconfig.flags;
+}
 
-void led_matrix_set_flags(led_flags_t flags) { led_matrix_eeconfig.flags = flags; }
+void led_matrix_set_flags(led_flags_t flags) {
+    led_matrix_eeconfig.flags = flags;
+}
diff --git a/quantum/led_matrix/led_matrix_types.h b/quantum/led_matrix/led_matrix_types.h
index 61cdbd9b8e..3dc533100f 100644
--- a/quantum/led_matrix/led_matrix_types.h
+++ b/quantum/led_matrix/led_matrix_types.h
@@ -36,7 +36,7 @@
 // Last led hit
 #ifndef LED_HITS_TO_REMEMBER
 #    define LED_HITS_TO_REMEMBER 8
-#endif  // LED_HITS_TO_REMEMBER
+#endif // LED_HITS_TO_REMEMBER
 
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
 typedef struct PACKED {
@@ -46,7 +46,7 @@ typedef struct PACKED {
     uint8_t  index[LED_HITS_TO_REMEMBER];
     uint16_t tick[LED_HITS_TO_REMEMBER];
 } last_hit_t;
-#endif  // LED_MATRIX_KEYREACTIVE_ENABLED
+#endif // LED_MATRIX_KEYREACTIVE_ENABLED
 
 typedef enum led_task_states { STARTING, RENDERING, FLUSHING, SYNCING } led_task_states;
 
@@ -87,7 +87,7 @@ typedef union {
         uint8_t     mode : 6;
         uint16_t    reserved;
         uint8_t     val;
-        uint8_t     speed;  // EECONFIG needs to be increased to support this
+        uint8_t     speed; // EECONFIG needs to be increased to support this
         led_flags_t flags;
     };
 } led_eeconfig_t;
diff --git a/quantum/logging/debug.c b/quantum/logging/debug.c
index ea62deaa8c..ca7654eda2 100644
--- a/quantum/logging/debug.c
+++ b/quantum/logging/debug.c
@@ -17,9 +17,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 
 debug_config_t debug_config = {
-    .enable   = false,  //
-    .matrix   = false,  //
-    .keyboard = false,  //
-    .mouse    = false,  //
-    .reserved = 0       //
+    .enable   = false, //
+    .matrix   = false, //
+    .keyboard = false, //
+    .mouse    = false, //
+    .reserved = 0      //
 };
diff --git a/quantum/logging/print.c b/quantum/logging/print.c
index e8440e55ee..50a6b826ee 100644
--- a/quantum/logging/print.c
+++ b/quantum/logging/print.c
@@ -19,9 +19,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // bind lib/printf to console interface - sendchar
 
-static int8_t          null_sendchar_func(uint8_t c) { return 0; }
+static int8_t null_sendchar_func(uint8_t c) {
+    return 0;
+}
 static sendchar_func_t func = null_sendchar_func;
 
-void print_set_sendchar(sendchar_func_t send) { func = send; }
+void print_set_sendchar(sendchar_func_t send) {
+    func = send;
+}
 
-void _putchar(char character) { func(character); }
+void _putchar(char character) {
+    func(character);
+}
diff --git a/quantum/logging/print.h b/quantum/logging/print.h
index 8c055f549e..aa72fc7074 100644
--- a/quantum/logging/print.h
+++ b/quantum/logging/print.h
@@ -37,7 +37,7 @@ void print_set_sendchar(sendchar_func_t func);
 #        include_next "_print.h" /* Include the platforms print.h */
 #    else
 // Fall back to lib/printf
-#        include "printf.h"  // lib/printf/printf.h
+#        include "printf.h" // lib/printf/printf.h
 
 // Create user & normal print defines
 #        define print(s) printf(s)
diff --git a/quantum/logging/sendchar.c b/quantum/logging/sendchar.c
index 9422382f6f..5bc744b743 100644
--- a/quantum/logging/sendchar.c
+++ b/quantum/logging/sendchar.c
@@ -17,4 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "sendchar.h"
 
 /* default noop "null" implementation */
-__attribute__((weak)) int8_t sendchar(uint8_t c) { return 0; }
+__attribute__((weak)) int8_t sendchar(uint8_t c) {
+    return 0;
+}
diff --git a/quantum/main.c b/quantum/main.c
index 6ed6b95741..faba668056 100644
--- a/quantum/main.c
+++ b/quantum/main.c
@@ -45,7 +45,7 @@ void protocol_task(void) {
 
 #ifdef DEFERRED_EXEC_ENABLE
 void deferred_exec_task(void);
-#endif  // DEFERRED_EXEC_ENABLE
+#endif // DEFERRED_EXEC_ENABLE
 
 /** \brief Main
  *
@@ -66,7 +66,7 @@ int main(void) {
 #ifdef DEFERRED_EXEC_ENABLE
         // Run deferred executions
         deferred_exec_task();
-#endif  // DEFERRED_EXEC_ENABLE
+#endif // DEFERRED_EXEC_ENABLE
 
         housekeeping_task();
     }
diff --git a/quantum/matrix.c b/quantum/matrix.c
index 0b16184e12..db59b73754 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -51,15 +51,15 @@ static SPLIT_MUTABLE pin_t direct_pins[ROWS_PER_HAND][MATRIX_COLS] = DIRECT_PINS
 #elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
 #    ifdef MATRIX_ROW_PINS
 static SPLIT_MUTABLE_ROW pin_t row_pins[ROWS_PER_HAND] = MATRIX_ROW_PINS;
-#    endif  // MATRIX_ROW_PINS
+#    endif // MATRIX_ROW_PINS
 #    ifdef MATRIX_COL_PINS
 static SPLIT_MUTABLE_COL pin_t col_pins[MATRIX_COLS]   = MATRIX_COL_PINS;
-#    endif  // MATRIX_COL_PINS
+#    endif // MATRIX_COL_PINS
 #endif
 
 /* matrix state(1:on, 0:off) */
-extern matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
-extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
+extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
+extern matrix_row_t matrix[MATRIX_ROWS];     // debounced values
 
 #ifdef SPLIT_KEYBOARD
 // row offsets for each hand
@@ -86,7 +86,9 @@ static inline void setPinOutput_writeHigh(pin_t pin) {
 }
 
 static inline void setPinInputHigh_atomic(pin_t pin) {
-    ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
+    ATOMIC_BLOCK_FORCEON {
+        setPinInputHigh(pin);
+    }
 }
 
 static inline uint8_t readMatrixPin(pin_t pin) {
@@ -171,8 +173,8 @@ __attribute__((weak)) void matrix_read_cols_on_row(matrix_row_t current_matrix[]
     // Start with a clear matrix row
     matrix_row_t current_row_value = 0;
 
-    if (!select_row(current_row)) {  // Select row
-        return;                      // skip NO_PIN row
+    if (!select_row(current_row)) { // Select row
+        return;                     // skip NO_PIN row
     }
     matrix_output_select_delay();
 
@@ -187,7 +189,7 @@ __attribute__((weak)) void matrix_read_cols_on_row(matrix_row_t current_matrix[]
 
     // Unselect row
     unselect_row(current_row);
-    matrix_output_unselect_delay(current_row, current_row_value != 0);  // wait for all Col signals to go HIGH
+    matrix_output_unselect_delay(current_row, current_row_value != 0); // wait for all Col signals to go HIGH
 
     // Update the matrix
     current_matrix[current_row] = current_row_value;
@@ -234,8 +236,8 @@ __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[]
     bool key_pressed = false;
 
     // Select col
-    if (!select_col(current_col)) {  // select col
-        return;                      // skip NO_PIN col
+    if (!select_col(current_col)) { // select col
+        return;                     // skip NO_PIN col
     }
     matrix_output_select_delay();
 
@@ -254,13 +256,13 @@ __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[]
 
     // Unselect col
     unselect_col(current_col);
-    matrix_output_unselect_delay(current_col, key_pressed);  // wait for all Row signals to go HIGH
+    matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
 }
 
 #        else
 #            error DIODE_DIRECTION must be one of COL2ROW or ROW2COL!
 #        endif
-#    endif  // defined(MATRIX_ROW_PINS) && defined(MATRIX_COL_PINS)
+#    endif // defined(MATRIX_ROW_PINS) && defined(MATRIX_COL_PINS)
 #else
 #    error DIODE_DIRECTION is not defined!
 #endif
@@ -311,7 +313,7 @@ void matrix_init(void) {
 // Fallback implementation for keyboards not using the standard split_util.c
 __attribute__((weak)) bool transport_master_if_connected(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
     transport_master(master_matrix, slave_matrix);
-    return true;  // Treat the transport as always connected
+    return true; // Treat the transport as always connected
 }
 #endif
 
diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c
index d67aaf508c..1497ceae71 100644
--- a/quantum/matrix_common.c
+++ b/quantum/matrix_common.c
@@ -33,9 +33,13 @@ extern const matrix_row_t matrix_mask[];
 
 // user-defined overridable functions
 
-__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
+__attribute__((weak)) void matrix_init_kb(void) {
+    matrix_init_user();
+}
 
-__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
+__attribute__((weak)) void matrix_scan_kb(void) {
+    matrix_scan_user();
+}
 
 __attribute__((weak)) void matrix_init_user(void) {}
 
@@ -43,11 +47,17 @@ __attribute__((weak)) void matrix_scan_user(void) {}
 
 // helper functions
 
-inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
+inline uint8_t matrix_rows(void) {
+    return MATRIX_ROWS;
+}
 
-inline uint8_t matrix_cols(void) { return MATRIX_COLS; }
+inline uint8_t matrix_cols(void) {
+    return MATRIX_COLS;
+}
 
-inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
+inline bool matrix_is_on(uint8_t row, uint8_t col) {
+    return (matrix[row] & ((matrix_row_t)1 << col));
+}
 
 inline matrix_row_t matrix_get_row(uint8_t row) {
     // Matrix mask lets you disable switches in the returned matrix data. For example, if you have a
@@ -124,16 +134,26 @@ bool matrix_post_scan(void) {
 #endif
 
 /*　`matrix_io_delay ()` exists for backwards compatibility. From now on, use matrix_output_unselect_delay().　*/
-__attribute__((weak)) void matrix_io_delay(void) { wait_us(MATRIX_IO_DELAY); }
-__attribute__((weak)) void matrix_output_select_delay(void) { waitInputPinDelay(); }
-__attribute__((weak)) void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { matrix_io_delay(); }
+__attribute__((weak)) void matrix_io_delay(void) {
+    wait_us(MATRIX_IO_DELAY);
+}
+__attribute__((weak)) void matrix_output_select_delay(void) {
+    waitInputPinDelay();
+}
+__attribute__((weak)) void matrix_output_unselect_delay(uint8_t line, bool key_pressed) {
+    matrix_io_delay();
+}
 
 // CUSTOM MATRIX 'LITE'
 __attribute__((weak)) void matrix_init_custom(void) {}
-__attribute__((weak)) bool matrix_scan_custom(matrix_row_t current_matrix[]) { return true; }
+__attribute__((weak)) bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    return true;
+}
 
 #ifdef SPLIT_KEYBOARD
-__attribute__((weak)) void matrix_slave_scan_kb(void) { matrix_slave_scan_user(); }
+__attribute__((weak)) void matrix_slave_scan_kb(void) {
+    matrix_slave_scan_user();
+}
 __attribute__((weak)) void matrix_slave_scan_user(void) {}
 #endif
 
@@ -170,4 +190,6 @@ __attribute__((weak)) uint8_t matrix_scan(void) {
     return changed;
 }
 
-__attribute__((weak)) bool peek_matrix(uint8_t row_index, uint8_t col_index, bool raw) { return 0 != ((raw ? raw_matrix[row_index] : matrix[row_index]) & (MATRIX_ROW_SHIFTER << col_index)); }
+__attribute__((weak)) bool peek_matrix(uint8_t row_index, uint8_t col_index, bool raw) {
+    return 0 != ((raw ? raw_matrix[row_index] : matrix[row_index]) & (MATRIX_ROW_SHIFTER << col_index));
+}
diff --git a/quantum/mousekey.c b/quantum/mousekey.c
index c2291fb397..8bafbf977a 100644
--- a/quantum/mousekey.c
+++ b/quantum/mousekey.c
@@ -487,4 +487,6 @@ static void mousekey_debug(void) {
     print(")\n");
 }
 
-report_mouse_t mousekey_get_report(void) { return mouse_report; }
+report_mouse_t mousekey_get_report(void) {
+    return mouse_report;
+}
diff --git a/quantum/pointing_device.c b/quantum/pointing_device.c
index cce292e0bf..9627cab4b8 100644
--- a/quantum/pointing_device.c
+++ b/quantum/pointing_device.c
@@ -39,7 +39,9 @@ uint16_t       shared_cpi          = 0;
  *
  * @param[in] new_mouse_report report_mouse_t
  */
-void pointing_device_set_shared_report(report_mouse_t new_mouse_report) { shared_mouse_report = new_mouse_report; }
+void pointing_device_set_shared_report(report_mouse_t new_mouse_report) {
+    shared_mouse_report = new_mouse_report;
+}
 
 /**
  * @brief Gets current pointing device CPI if supported
@@ -50,7 +52,9 @@ void pointing_device_set_shared_report(report_mouse_t new_mouse_report) { shared
  *
  * @return cpi value as uint16_t
  */
-uint16_t pointing_device_get_shared_cpi(void) { return shared_cpi; }
+uint16_t pointing_device_get_shared_cpi(void) {
+    return shared_cpi;
+}
 
 #    if defined(POINTING_DEVICE_LEFT)
 #        define POINTING_DEVICE_THIS_SIDE is_keyboard_left()
@@ -60,7 +64,7 @@ uint16_t pointing_device_get_shared_cpi(void) { return shared_cpi; }
 #        define POINTING_DEVICE_THIS_SIDE true
 #    endif
 
-#endif  // defined(SPLIT_POINTING_ENABLE)
+#endif // defined(SPLIT_POINTING_ENABLE)
 
 static report_mouse_t local_mouse_report = {};
 
@@ -73,7 +77,9 @@ extern const pointing_device_driver_t pointing_device_driver;
  * @param[in] old report_mouse_t
  * @return bool result
  */
-__attribute__((weak)) bool has_mouse_report_changed(report_mouse_t new, report_mouse_t old) { return memcmp(&new, &old, sizeof(new)); }
+__attribute__((weak)) bool has_mouse_report_changed(report_mouse_t new, report_mouse_t old) {
+    return memcmp(&new, &old, sizeof(new));
+}
 
 /**
  * @brief Keyboard level code pointing device initialisation
@@ -95,7 +101,9 @@ __attribute__((weak)) void pointing_device_init_user(void) {}
  * @param[in] mouse_report report_mouse_t
  * @return report_mouse_t
  */
-__attribute__((weak)) report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) { return pointing_device_task_user(mouse_report); }
+__attribute__((weak)) report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
+    return pointing_device_task_user(mouse_report);
+}
 
 /**
  * @brief Weak function allowing for user level mouse report modification
@@ -105,7 +113,9 @@ __attribute__((weak)) report_mouse_t pointing_device_task_kb(report_mouse_t mous
  * @param[in] mouse_report report_mouse_t
  * @return report_mouse_t
  */
-__attribute__((weak)) report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) { return mouse_report; }
+__attribute__((weak)) report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
+    return mouse_report;
+}
 
 /**
  * @brief Handles pointing device buttons
@@ -246,7 +256,7 @@ __attribute__((weak)) void pointing_device_task(void) {
 #    endif
 #else
     local_mouse_report = pointing_device_driver.get_report(local_mouse_report);
-#endif  // defined(SPLIT_POINTING_ENABLE)
+#endif // defined(SPLIT_POINTING_ENABLE)
 
     // allow kb to intercept and modify report
 #if defined(SPLIT_POINTING_ENABLE) && defined(POINTING_DEVICE_COMBINED)
@@ -275,14 +285,18 @@ __attribute__((weak)) void pointing_device_task(void) {
  *
  * @return report_mouse_t
  */
-report_mouse_t pointing_device_get_report(void) { return local_mouse_report; }
+report_mouse_t pointing_device_get_report(void) {
+    return local_mouse_report;
+}
 
 /**
  * @brief Sets mouse report used be pointing device task
  *
  * @param[in] new_mouse_report
  */
-void pointing_device_set_report(report_mouse_t new_mouse_report) { local_mouse_report = new_mouse_report; }
+void pointing_device_set_report(report_mouse_t new_mouse_report) {
+    local_mouse_report = new_mouse_report;
+}
 
 /**
  * @brief Gets current pointing device CPI if supported
@@ -422,7 +436,9 @@ report_mouse_t pointing_device_adjust_by_defines_right(report_mouse_t mouse_repo
  * @param[in] right_report report_mouse_t
  * @return pointing_device_task_combined_user(left_report, right_report) by default
  */
-__attribute__((weak)) report_mouse_t pointing_device_task_combined_kb(report_mouse_t left_report, report_mouse_t right_report) { return pointing_device_task_combined_user(left_report, right_report); }
+__attribute__((weak)) report_mouse_t pointing_device_task_combined_kb(report_mouse_t left_report, report_mouse_t right_report) {
+    return pointing_device_task_combined_user(left_report, right_report);
+}
 
 /**
  * @brief Weak function allowing for user level mouse report modification
@@ -435,5 +451,7 @@ __attribute__((weak)) report_mouse_t pointing_device_task_combined_kb(report_mou
  * @param[in] right_report report_mouse_t
  * @return pointing_device_combine_reports(left_report, right_report) by default
  */
-__attribute__((weak)) report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, report_mouse_t right_report) { return pointing_device_combine_reports(left_report, right_report); }
+__attribute__((weak)) report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, report_mouse_t right_report) {
+    return pointing_device_combine_reports(left_report, right_report);
+}
 #endif
diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h
index 8394c20952..5f3845227a 100644
--- a/quantum/pointing_device.h
+++ b/quantum/pointing_device.h
@@ -103,5 +103,5 @@ report_mouse_t pointing_device_combine_reports(report_mouse_t left_report, repor
 report_mouse_t pointing_device_task_combined_kb(report_mouse_t left_report, report_mouse_t right_report);
 report_mouse_t pointing_device_task_combined_user(report_mouse_t left_report, report_mouse_t right_report);
 report_mouse_t pointing_device_adjust_by_defines_right(report_mouse_t mouse_report);
-#    endif  // defined(POINTING_DEVICE_COMBINED)
-#endif      // defined(SPLIT_POINTING_ENABLE)
+#    endif // defined(POINTING_DEVICE_COMBINED)
+#endif     // defined(SPLIT_POINTING_ENABLE)
diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device_drivers.c
index 7702958f88..b8ef6e67e5 100644
--- a/quantum/pointing_device_drivers.c
+++ b/quantum/pointing_device_drivers.c
@@ -120,7 +120,7 @@ report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) {
     int8_t          report_x = 0, report_y = 0;
     static bool     is_z_down = false;
 
-    cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale());  // Scale coordinates to arbitrary X, Y resolution
+    cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale()); // Scale coordinates to arbitrary X, Y resolution
 
     if (x && y && touchData.xValue && touchData.yValue) {
         report_x = (int8_t)(touchData.xValue - x);
@@ -207,11 +207,13 @@ const pointing_device_driver_t pointing_device_driver = {
 };
 // clang-format on
 #elif defined(POINTING_DEVICE_DRIVER_pmw3360)
-static void pmw3360_device_init(void) { pmw3360_init(); }
+static void pmw3360_device_init(void) {
+    pmw3360_init();
+}
 
 report_mouse_t pmw3360_get_report(report_mouse_t mouse_report) {
     report_pmw3360_t data        = pmw3360_read_burst();
-    static uint16_t  MotionStart = 0;  // Timer for accel, 0 is resting state
+    static uint16_t  MotionStart = 0; // Timer for accel, 0 is resting state
 
     if (data.isOnSurface && data.isMotion) {
         // Reset timer if stopped moving
@@ -243,11 +245,13 @@ const pointing_device_driver_t pointing_device_driver = {
 };
 // clang-format on
 #elif defined(POINTING_DEVICE_DRIVER_pmw3389)
-static void pmw3389_device_init(void) { pmw3389_init(); }
+static void pmw3389_device_init(void) {
+    pmw3389_init();
+}
 
 report_mouse_t pmw3389_get_report(report_mouse_t mouse_report) {
     report_pmw3389_t data        = pmw3389_read_burst();
-    static uint16_t  MotionStart = 0;  // Timer for accel, 0 is resting state
+    static uint16_t  MotionStart = 0; // Timer for accel, 0 is resting state
 
     if (data.isOnSurface && data.isMotion) {
         // Reset timer if stopped moving
@@ -280,9 +284,13 @@ const pointing_device_driver_t pointing_device_driver = {
 // clang-format on
 #else
 __attribute__((weak)) void           pointing_device_driver_init(void) {}
-__attribute__((weak)) report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) { return mouse_report; }
-__attribute__((weak)) uint16_t       pointing_device_driver_get_cpi(void) { return 0; }
-__attribute__((weak)) void           pointing_device_driver_set_cpi(uint16_t cpi) {}
+__attribute__((weak)) report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) {
+    return mouse_report;
+}
+__attribute__((weak)) uint16_t pointing_device_driver_get_cpi(void) {
+    return 0;
+}
+__attribute__((weak)) void pointing_device_driver_set_cpi(uint16_t cpi) {}
 
 // clang-format off
 const pointing_device_driver_t pointing_device_driver = {
diff --git a/quantum/process_keycode/process_audio.c b/quantum/process_keycode/process_audio.c
index 23664721e8..e7fe453308 100644
--- a/quantum/process_keycode/process_audio.c
+++ b/quantum/process_keycode/process_audio.c
@@ -50,11 +50,17 @@ bool process_audio(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void process_audio_noteon(uint8_t note) { play_note(compute_freq_for_midi_note(note), 0xF); }
+void process_audio_noteon(uint8_t note) {
+    play_note(compute_freq_for_midi_note(note), 0xF);
+}
 
-void process_audio_noteoff(uint8_t note) { stop_note(compute_freq_for_midi_note(note)); }
+void process_audio_noteoff(uint8_t note) {
+    stop_note(compute_freq_for_midi_note(note));
+}
 
-void process_audio_all_notes_off(void) { stop_all_notes(); }
+void process_audio_all_notes_off(void) {
+    stop_all_notes();
+}
 
 __attribute__((weak)) void audio_on_user() {}
 __attribute__((weak)) void audio_off_user() {}
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index bbc6367ff1..2150edd7b2 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -62,7 +62,9 @@ static struct {
 // clang-format on
 
 /** \brief Called on physical press, returns whether key should be added to Auto Shift */
-__attribute__((weak)) bool get_custom_auto_shifted_key(uint16_t keycode, keyrecord_t *record) { return false; }
+__attribute__((weak)) bool get_custom_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
+    return false;
+}
 
 /** \brief Called on physical press, returns whether is Auto Shift key */
 __attribute__((weak)) bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
@@ -82,8 +84,12 @@ __attribute__((weak)) bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *r
 }
 
 /** \brief Called to check whether defines should apply if PER_KEY is set for it */
-__attribute__((weak)) bool get_auto_shift_repeat(uint16_t keycode, keyrecord_t *record) { return true; }
-__attribute__((weak)) bool get_auto_shift_no_auto_repeat(uint16_t keycode, keyrecord_t *record) { return true; }
+__attribute__((weak)) bool get_auto_shift_repeat(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
+__attribute__((weak)) bool get_auto_shift_no_auto_repeat(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
 
 /** \brief Called when an Auto Shift key needs to be pressed */
 __attribute__((weak)) void autoshift_press_user(uint16_t keycode, bool shifted, keyrecord_t *record) {
@@ -94,7 +100,9 @@ __attribute__((weak)) void autoshift_press_user(uint16_t keycode, bool shifted,
 }
 
 /** \brief Called when an Auto Shift key needs to be released */
-__attribute__((weak)) void autoshift_release_user(uint16_t keycode, bool shifted, keyrecord_t *record) { unregister_code16((IS_RETRO(keycode)) ? keycode & 0xFF : keycode); }
+__attribute__((weak)) void autoshift_release_user(uint16_t keycode, bool shifted, keyrecord_t *record) {
+    unregister_code16((IS_RETRO(keycode)) ? keycode & 0xFF : keycode);
+}
 
 /** \brief Sets the shift state to use when keyrepeating, required by custom shifts */
 void set_autoshift_shift_state(uint16_t keycode, bool shifted) {
@@ -311,7 +319,9 @@ void autoshift_toggle(void) {
     autoshift_flush_shift();
 }
 
-void autoshift_enable(void) { autoshift_flags.enabled = true; }
+void autoshift_enable(void) {
+    autoshift_flags.enabled = true;
+}
 
 void autoshift_disable(void) {
     autoshift_flags.enabled = false;
@@ -328,12 +338,20 @@ void autoshift_timer_report(void) {
 }
 #    endif
 
-bool get_autoshift_state(void) { return autoshift_flags.enabled; }
+bool get_autoshift_state(void) {
+    return autoshift_flags.enabled;
+}
 
-uint16_t                       get_generic_autoshift_timeout() { return autoshift_timeout; }
-__attribute__((weak)) uint16_t get_autoshift_timeout(uint16_t keycode, keyrecord_t *record) { return autoshift_timeout; }
+uint16_t get_generic_autoshift_timeout() {
+    return autoshift_timeout;
+}
+__attribute__((weak)) uint16_t get_autoshift_timeout(uint16_t keycode, keyrecord_t *record) {
+    return autoshift_timeout;
+}
 
-void set_autoshift_timeout(uint16_t timeout) { autoshift_timeout = timeout; }
+void set_autoshift_timeout(uint16_t timeout) {
+    autoshift_timeout = timeout;
+}
 
 bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
     // Note that record->event.time isn't reliable, see:
diff --git a/quantum/process_keycode/process_clicky.c b/quantum/process_keycode/process_clicky.c
index 6ab382d4aa..9795734984 100644
--- a/quantum/process_keycode/process_clicky.c
+++ b/quantum/process_keycode/process_clicky.c
@@ -5,40 +5,40 @@
 
 #    ifndef AUDIO_CLICKY_DELAY_DURATION
 #        define AUDIO_CLICKY_DELAY_DURATION 1
-#    endif  // !AUDIO_CLICKY_DELAY_DURATION
+#    endif // !AUDIO_CLICKY_DELAY_DURATION
 #    ifndef AUDIO_CLICKY_FREQ_DEFAULT
 #        define AUDIO_CLICKY_FREQ_DEFAULT 440.0f
-#    endif  // !AUDIO_CLICKY_FREQ_DEFAULT
+#    endif // !AUDIO_CLICKY_FREQ_DEFAULT
 #    ifndef AUDIO_CLICKY_FREQ_MIN
 #        define AUDIO_CLICKY_FREQ_MIN 65.0f
-#    endif  // !AUDIO_CLICKY_FREQ_MIN
+#    endif // !AUDIO_CLICKY_FREQ_MIN
 #    ifndef AUDIO_CLICKY_FREQ_MAX
 #        define AUDIO_CLICKY_FREQ_MAX 1500.0f
-#    endif  // !AUDIO_CLICKY_FREQ_MAX
+#    endif // !AUDIO_CLICKY_FREQ_MAX
 #    ifndef AUDIO_CLICKY_FREQ_FACTOR
 #        define AUDIO_CLICKY_FREQ_FACTOR 1.18921f
-#    endif  // !AUDIO_CLICKY_FREQ_FACTOR
+#    endif // !AUDIO_CLICKY_FREQ_FACTOR
 #    ifndef AUDIO_CLICKY_FREQ_RANDOMNESS
 #        define AUDIO_CLICKY_FREQ_RANDOMNESS 0.05f
-#    endif  // !AUDIO_CLICKY_FREQ_RANDOMNESS
+#    endif // !AUDIO_CLICKY_FREQ_RANDOMNESS
 
 float clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT;
 float clicky_rand = AUDIO_CLICKY_FREQ_RANDOMNESS;
 
 // the first "note" is an intentional delay; the 2nd and 3rd notes are the "clicky"
-float clicky_song[][2] = {{AUDIO_CLICKY_FREQ_MIN, AUDIO_CLICKY_DELAY_DURATION}, {AUDIO_CLICKY_FREQ_DEFAULT, 3}, {AUDIO_CLICKY_FREQ_DEFAULT, 1}};  // 3 and 1 --> durations
+float clicky_song[][2] = {{AUDIO_CLICKY_FREQ_MIN, AUDIO_CLICKY_DELAY_DURATION}, {AUDIO_CLICKY_FREQ_DEFAULT, 3}, {AUDIO_CLICKY_FREQ_DEFAULT, 1}}; // 3 and 1 --> durations
 
 extern audio_config_t audio_config;
 
 #    ifndef NO_MUSIC_MODE
 extern bool music_activated;
 extern bool midi_activated;
-#    endif  // !NO_MUSIC_MODE
+#    endif // !NO_MUSIC_MODE
 
 void clicky_play(void) {
 #    ifndef NO_MUSIC_MODE
     if (music_activated || midi_activated || !audio_config.enable) return;
-#    endif  // !NO_MUSIC_MODE
+#    endif // !NO_MUSIC_MODE
     clicky_song[1][0] = 2.0f * clicky_freq * (1.0f + clicky_rand * (((float)rand()) / ((float)(RAND_MAX))));
     clicky_song[2][0] = clicky_freq * (1.0f + clicky_rand * (((float)rand()) / ((float)(RAND_MAX))));
     PLAY_SONG(clicky_song);
@@ -58,7 +58,9 @@ void clicky_freq_down(void) {
     }
 }
 
-void clicky_freq_reset(void) { clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT; }
+void clicky_freq_reset(void) {
+    clicky_freq = AUDIO_CLICKY_FREQ_DEFAULT;
+}
 
 void clicky_toggle(void) {
     audio_config.clicky_enable ^= 1;
@@ -75,7 +77,9 @@ void clicky_off(void) {
     eeconfig_update_audio(audio_config.raw);
 }
 
-bool is_clicky_on(void) { return (audio_config.clicky_enable != 0); }
+bool is_clicky_on(void) {
+    return (audio_config.clicky_enable != 0);
+}
 
 bool process_clicky(uint16_t keycode, keyrecord_t *record) {
     if (keycode == CLICKY_TOGGLE && record->event.pressed) {
@@ -101,8 +105,8 @@ bool process_clicky(uint16_t keycode, keyrecord_t *record) {
     }
 
     if (audio_config.enable && audio_config.clicky_enable) {
-        if (record->event.pressed) {                       // Leave this separate so it's easier to add upstroke sound
-            if (keycode != AU_OFF && keycode != AU_TOG) {  // DO NOT PLAY if audio will be disabled, and causes issuse on ARM
+        if (record->event.pressed) {                      // Leave this separate so it's easier to add upstroke sound
+            if (keycode != AU_OFF && keycode != AU_TOG) { // DO NOT PLAY if audio will be disabled, and causes issuse on ARM
                 clicky_play();
             }
         }
@@ -110,4 +114,4 @@ bool process_clicky(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-#endif  // AUDIO_CLICKY
+#endif // AUDIO_CLICKY
diff --git a/quantum/process_keycode/process_combo.c b/quantum/process_keycode/process_combo.c
index 21fd737ab7..efaf8fe0e9 100644
--- a/quantum/process_keycode/process_combo.c
+++ b/quantum/process_keycode/process_combo.c
@@ -30,33 +30,45 @@ extern uint16_t COMBO_LEN;
 __attribute__((weak)) void process_combo_event(uint16_t combo_index, bool pressed) {}
 
 #ifdef COMBO_MUST_HOLD_PER_COMBO
-__attribute__((weak)) bool get_combo_must_hold(uint16_t index, combo_t *combo) { return false; }
+__attribute__((weak)) bool get_combo_must_hold(uint16_t index, combo_t *combo) {
+    return false;
+}
 #endif
 
 #ifdef COMBO_MUST_TAP_PER_COMBO
-__attribute__((weak)) bool get_combo_must_tap(uint16_t index, combo_t *combo) { return false; }
+__attribute__((weak)) bool get_combo_must_tap(uint16_t index, combo_t *combo) {
+    return false;
+}
 #endif
 
 #ifdef COMBO_TERM_PER_COMBO
-__attribute__((weak)) uint16_t get_combo_term(uint16_t index, combo_t *combo) { return COMBO_TERM; }
+__attribute__((weak)) uint16_t get_combo_term(uint16_t index, combo_t *combo) {
+    return COMBO_TERM;
+}
 #endif
 
 #ifdef COMBO_MUST_PRESS_IN_ORDER_PER_COMBO
-__attribute__((weak)) bool get_combo_must_press_in_order(uint16_t combo_index, combo_t *combo) { return true; }
+__attribute__((weak)) bool get_combo_must_press_in_order(uint16_t combo_index, combo_t *combo) {
+    return true;
+}
 #endif
 
 #ifdef COMBO_PROCESS_KEY_RELEASE
-__attribute__((weak)) bool process_combo_key_release(uint16_t combo_index, combo_t *combo, uint8_t key_index, uint16_t keycode) { return false; }
+__attribute__((weak)) bool process_combo_key_release(uint16_t combo_index, combo_t *combo, uint8_t key_index, uint16_t keycode) {
+    return false;
+}
 #endif
 
 #ifdef COMBO_SHOULD_TRIGGER
-__attribute__((weak)) bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) { return true; }
+__attribute__((weak)) bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
 #endif
 
 #ifndef COMBO_NO_TIMER
 static uint16_t timer = 0;
 #endif
-static bool     b_combo_enable = true;  // defaults to enabled
+static bool     b_combo_enable = true; // defaults to enabled
 static uint16_t longest_term   = 0;
 
 typedef struct {
@@ -462,7 +474,7 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *
                     // get possible longer waiting time for tap-/hold-only combos.
                     longest_term = _get_wait_time(combo_index, combo);
                 }
-            }  // if timer elapsed end
+            } // if timer elapsed end
         }
     } else {
         // chord releases
@@ -477,7 +489,7 @@ static bool process_single_combo(combo_t *combo, uint16_t keycode, keyrecord_t *
             else if (get_combo_must_tap(combo_index, combo)) {
                 // immediately apply tap-only combo
                 apply_combo(combo_index, combo);
-                apply_combos();  // also apply other prepared combos and dump key buffer
+                apply_combos(); // also apply other prepared combos and dump key buffer
 #    ifdef COMBO_PROCESS_KEY_RELEASE
                 if (process_combo_key_release(combo_index, combo, key_index, keycode)) {
                     release_combo(combo_index, combo);
@@ -559,7 +571,7 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
             key_buffer[key_buffer_size++] = (queued_record_t){
                 .record      = *record,
                 .keycode     = keycode,
-                .combo_index = -1,  // this will be set when applying combos
+                .combo_index = -1, // this will be set when applying combos
             };
         }
     } else {
@@ -598,7 +610,9 @@ void combo_task(void) {
 #endif
 }
 
-void combo_enable(void) { b_combo_enable = true; }
+void combo_enable(void) {
+    b_combo_enable = true;
+}
 
 void combo_disable(void) {
 #ifndef COMBO_NO_TIMER
@@ -618,4 +632,6 @@ void combo_toggle(void) {
     }
 }
 
-bool is_combo_enabled(void) { return b_combo_enable; }
+bool is_combo_enabled(void) {
+    return b_combo_enable;
+}
diff --git a/quantum/process_keycode/process_dynamic_macro.c b/quantum/process_keycode/process_dynamic_macro.c
index 0feb634014..a1ada2d5a2 100644
--- a/quantum/process_keycode/process_dynamic_macro.c
+++ b/quantum/process_keycode/process_dynamic_macro.c
@@ -29,13 +29,21 @@ void dynamic_macro_led_blink(void) {
 
 /* User hooks for Dynamic Macros */
 
-__attribute__((weak)) void dynamic_macro_record_start_user(void) { dynamic_macro_led_blink(); }
+__attribute__((weak)) void dynamic_macro_record_start_user(void) {
+    dynamic_macro_led_blink();
+}
 
-__attribute__((weak)) void dynamic_macro_play_user(int8_t direction) { dynamic_macro_led_blink(); }
+__attribute__((weak)) void dynamic_macro_play_user(int8_t direction) {
+    dynamic_macro_led_blink();
+}
 
-__attribute__((weak)) void dynamic_macro_record_key_user(int8_t direction, keyrecord_t *record) { dynamic_macro_led_blink(); }
+__attribute__((weak)) void dynamic_macro_record_key_user(int8_t direction, keyrecord_t *record) {
+    dynamic_macro_led_blink();
+}
 
-__attribute__((weak)) void dynamic_macro_record_end_user(int8_t direction) { dynamic_macro_led_blink(); }
+__attribute__((weak)) void dynamic_macro_record_end_user(int8_t direction) {
+    dynamic_macro_led_blink();
+}
 
 /* Convenience macros used for retrieving the debug info. All of them
  * need a `direction` variable accessible at the call site.
diff --git a/quantum/process_keycode/process_joystick.c b/quantum/process_keycode/process_joystick.c
index fa9c2c1dbc..2fb092c573 100644
--- a/quantum/process_keycode/process_joystick.c
+++ b/quantum/process_keycode/process_joystick.c
@@ -74,7 +74,9 @@ void restorePinState(pin_t pin, uint16_t restoreState) {
 #endif
 }
 
-__attribute__((weak)) bool process_joystick_analogread() { return process_joystick_analogread_quantum(); }
+__attribute__((weak)) bool process_joystick_analogread() {
+    return process_joystick_analogread_quantum();
+}
 
 bool process_joystick_analogread_quantum() {
 #if JOYSTICK_AXES_COUNT > 0
diff --git a/quantum/process_keycode/process_key_override.c b/quantum/process_keycode/process_key_override.c
index 09b2725079..ad9683d106 100644
--- a/quantum/process_keycode/process_key_override.c
+++ b/quantum/process_keycode/process_key_override.c
@@ -106,7 +106,9 @@ void key_override_toggle(void) {
     }
 }
 
-bool key_override_is_enabled(void) { return enabled; }
+bool key_override_is_enabled(void) {
+    return enabled;
+}
 
 // Returns whether the modifiers that are pressed are such that the override should activate
 static bool key_override_matches_active_modifiers(const key_override_t *override, const uint8_t mods) {
@@ -150,7 +152,7 @@ static void schedule_deferred_register(const uint16_t keycode) {
     } else {
         // Wait a very short time when a modifier event triggers the override to avoid false activations when e.g. a modifier is pressed just before a key is released (with the intention of pairing the modifier with a different key), or a modifier is lifted shortly before the trigger key is lifted. Operating systems by default reject modifier-events that happen very close to a non-modifier event.
         defer_reference_time = timer_read32();
-        defer_delay          = 50;  // 50ms
+        defer_delay          = 50; // 50ms
     }
     deferred_register = keycode;
 }
@@ -174,8 +176,8 @@ const key_override_t *clear_active_override(const bool allow_reregister) {
 
     const uint8_t mod_free_replacement = clear_mods_from(active_override->replacement);
 
-    bool unregister_replacement = mod_free_replacement != KC_NO &&    // KC_NO is never registered
-                                  mod_free_replacement < SAFE_RANGE;  // Custom keycodes are never registered
+    bool unregister_replacement = mod_free_replacement != KC_NO &&   // KC_NO is never registered
+                                  mod_free_replacement < SAFE_RANGE; // Custom keycodes are never registered
 
     // Try firing the custom handler
     if (active_override->custom_action != NULL) {
@@ -195,11 +197,11 @@ const key_override_t *clear_active_override(const bool allow_reregister) {
 
     const uint16_t trigger = active_override->trigger;
 
-    const bool reregister_trigger = allow_reregister &&                                                   // Check if allowed from caller
-                                    (active_override->options & ko_option_no_reregister_trigger) == 0 &&  // Check if override allows
-                                    active_override_trigger_is_down &&                                    // Check if trigger is even down
-                                    trigger != KC_NO &&                                                   // KC_NO is never registered
-                                    trigger < SAFE_RANGE;                                                 // A custom keycode should not be registered
+    const bool reregister_trigger = allow_reregister &&                                                  // Check if allowed from caller
+                                    (active_override->options & ko_option_no_reregister_trigger) == 0 && // Check if override allows
+                                    active_override_trigger_is_down &&                                   // Check if trigger is even down
+                                    trigger != KC_NO &&                                                  // KC_NO is never registered
+                                    trigger < SAFE_RANGE;                                                // A custom keycode should not be registered
 
     // Optionally re-register the trigger if it is still down
     if (reregister_trigger) {
@@ -336,8 +338,8 @@ static bool try_activating_override(const uint16_t keycode, const uint8_t layer,
 
         const uint16_t mod_free_replacement = clear_mods_from(override->replacement);
 
-        bool register_replacement = mod_free_replacement != KC_NO &&    // KC_NO is never registered
-                                    mod_free_replacement < SAFE_RANGE;  // Custom keycodes are never registered
+        bool register_replacement = mod_free_replacement != KC_NO &&   // KC_NO is never registered
+                                    mod_free_replacement < SAFE_RANGE; // Custom keycodes are never registered
 
         // Try firing the custom handler
         if (override->custom_action != NULL) {
diff --git a/quantum/process_keycode/process_leader.c b/quantum/process_keycode/process_leader.c
index cf63f25141..c2fd02e5c7 100644
--- a/quantum/process_keycode/process_leader.c
+++ b/quantum/process_keycode/process_leader.c
@@ -51,13 +51,13 @@ bool process_leader(uint16_t keycode, keyrecord_t *record) {
         if (leading) {
 #    ifndef LEADER_NO_TIMEOUT
             if (timer_elapsed(leader_time) < LEADER_TIMEOUT)
-#    endif  // LEADER_NO_TIMEOUT
+#    endif // LEADER_NO_TIMEOUT
             {
 #    ifndef LEADER_KEY_STRICT_KEY_PROCESSING
                 if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) {
                     keycode = keycode & 0xFF;
                 }
-#    endif  // LEADER_KEY_STRICT_KEY_PROCESSING
+#    endif // LEADER_KEY_STRICT_KEY_PROCESSING
                 if (leader_sequence_size < (sizeof(leader_sequence) / sizeof(leader_sequence[0]))) {
                     leader_sequence[leader_sequence_size] = keycode;
                     leader_sequence_size++;
diff --git a/quantum/process_keycode/process_magic.c b/quantum/process_keycode/process_magic.c
index 6332be647c..10161adda3 100644
--- a/quantum/process_keycode/process_magic.c
+++ b/quantum/process_keycode/process_magic.c
@@ -76,7 +76,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
                         keymap_config.swap_backslash_backspace = true;
                         break;
                     case MAGIC_HOST_NKRO:
-                        clear_keyboard();  // clear first buffer to prevent stuck keys
+                        clear_keyboard(); // clear first buffer to prevent stuck keys
                         keymap_config.nkro = true;
                         break;
                     case MAGIC_SWAP_ALT_GUI:
@@ -119,7 +119,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
                         keymap_config.swap_backslash_backspace = false;
                         break;
                     case MAGIC_UNHOST_NKRO:
-                        clear_keyboard();  // clear first buffer to prevent stuck keys
+                        clear_keyboard(); // clear first buffer to prevent stuck keys
                         keymap_config.nkro = false;
                         break;
                     case MAGIC_UNSWAP_ALT_GUI:
@@ -157,7 +157,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
 #endif
                         break;
                     case MAGIC_TOGGLE_NKRO:
-                        clear_keyboard();  // clear first buffer to prevent stuck keys
+                        clear_keyboard(); // clear first buffer to prevent stuck keys
                         keymap_config.nkro = !keymap_config.nkro;
                         break;
                     case MAGIC_EE_HANDS_LEFT:
@@ -175,7 +175,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
                 }
 
                 eeconfig_update_keymap(keymap_config.raw);
-                clear_keyboard();  // clear to prevent stuck keys
+                clear_keyboard(); // clear to prevent stuck keys
 
                 return false;
         }
diff --git a/quantum/process_keycode/process_midi.c b/quantum/process_keycode/process_midi.c
index 9632d2b757..c49c31a525 100644
--- a/quantum/process_keycode/process_midi.c
+++ b/quantum/process_keycode/process_midi.c
@@ -22,13 +22,19 @@
 
 #    ifdef MIDI_BASIC
 
-void process_midi_basic_noteon(uint8_t note) { midi_send_noteon(&midi_device, 0, note, 127); }
+void process_midi_basic_noteon(uint8_t note) {
+    midi_send_noteon(&midi_device, 0, note, 127);
+}
 
-void process_midi_basic_noteoff(uint8_t note) { midi_send_noteoff(&midi_device, 0, note, 0); }
+void process_midi_basic_noteoff(uint8_t note) {
+    midi_send_noteoff(&midi_device, 0, note, 0);
+}
 
-void process_midi_all_notes_off(void) { midi_send_cc(&midi_device, 0, 0x7B, 0); }
+void process_midi_all_notes_off(void) {
+    midi_send_cc(&midi_device, 0, 0x7B, 0);
+}
 
-#    endif  // MIDI_BASIC
+#    endif // MIDI_BASIC
 
 #    ifdef MIDI_ADVANCED
 
@@ -41,7 +47,9 @@ static int8_t   midi_modulation_step;
 static uint16_t midi_modulation_timer;
 midi_config_t   midi_config;
 
-inline uint8_t compute_velocity(uint8_t setting) { return setting * (128 / (MIDI_VELOCITY_MAX - MIDI_VELOCITY_MIN)); }
+inline uint8_t compute_velocity(uint8_t setting) {
+    return setting * (128 / (MIDI_VELOCITY_MAX - MIDI_VELOCITY_MIN));
+}
 
 void midi_init(void) {
     midi_config.octave              = MI_OCT_2 - MIDI_OCTAVE_MIN;
@@ -60,7 +68,9 @@ void midi_init(void) {
     midi_modulation_timer = 0;
 }
 
-uint8_t midi_compute_note(uint16_t keycode) { return 12 * midi_config.octave + (keycode - MIDI_TONE_MIN) + midi_config.transpose; }
+uint8_t midi_compute_note(uint16_t keycode) {
+    return 12 * midi_config.octave + (keycode - MIDI_TONE_MIN) + midi_config.transpose;
+}
 
 bool process_midi(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
@@ -238,7 +248,7 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-#    endif  // MIDI_ADVANCED
+#    endif // MIDI_ADVANCED
 
 void midi_task(void) {
     midi_device_process(&midi_device);
@@ -263,4 +273,4 @@ void midi_task(void) {
 #    endif
 }
 
-#endif  // MIDI_ENABLE
+#endif // MIDI_ENABLE
diff --git a/quantum/process_keycode/process_midi.h b/quantum/process_keycode/process_midi.h
index 68c6eda666..e528c6ec0c 100644
--- a/quantum/process_keycode/process_midi.h
+++ b/quantum/process_keycode/process_midi.h
@@ -49,6 +49,6 @@ bool process_midi(uint16_t keycode, keyrecord_t *record);
 #        define MIDI_TONE_COUNT (MIDI_TONE_MAX - MIDI_TONE_MIN + 1)
 
 uint8_t midi_compute_note(uint16_t keycode);
-#    endif  // MIDI_ADVANCED
+#    endif // MIDI_ADVANCED
 
-#endif  // MIDI_ENABLE
+#endif // MIDI_ENABLE
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index 6822c5e289..eeec0c28a4 100644
--- a/quantum/process_keycode/process_music.c
+++ b/quantum/process_keycode/process_music.c
@@ -146,7 +146,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
 
     if (music_activated || midi_activated) {
         if (record->event.pressed) {
-            if (keycode == KC_LEFT_CTRL) {  // Start recording
+            if (keycode == KC_LEFT_CTRL) { // Start recording
                 music_all_notes_off();
                 music_sequence_recording = true;
                 music_sequence_recorded  = false;
@@ -155,9 +155,9 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
                 return false;
             }
 
-            if (keycode == KC_LEFT_ALT) {  // Stop recording/playing
+            if (keycode == KC_LEFT_ALT) { // Stop recording/playing
                 music_all_notes_off();
-                if (music_sequence_recording) {  // was recording
+                if (music_sequence_recording) { // was recording
                     music_sequence_recorded = true;
                 }
                 music_sequence_recording = false;
@@ -165,7 +165,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
                 return false;
             }
 
-            if (keycode == KC_LEFT_GUI && music_sequence_recorded) {  // Start playing
+            if (keycode == KC_LEFT_GUI && music_sequence_recorded) { // Start playing
                 music_all_notes_off();
                 music_sequence_recording = false;
                 music_sequence_playing   = true;
@@ -230,11 +230,17 @@ bool music_mask(uint16_t keycode) {
 #    endif
 }
 
-__attribute__((weak)) bool music_mask_kb(uint16_t keycode) { return music_mask_user(keycode); }
+__attribute__((weak)) bool music_mask_kb(uint16_t keycode) {
+    return music_mask_user(keycode);
+}
 
-__attribute__((weak)) bool music_mask_user(uint16_t keycode) { return keycode < 0xFF; }
+__attribute__((weak)) bool music_mask_user(uint16_t keycode) {
+    return keycode < 0xFF;
+}
 
-bool is_music_on(void) { return (music_activated != 0); }
+bool is_music_on(void) {
+    return (music_activated != 0);
+}
 
 void music_toggle(void) {
     if (!music_activated) {
@@ -260,7 +266,9 @@ void music_off(void) {
 #    endif
 }
 
-bool is_midi_on(void) { return (midi_activated != 0); }
+bool is_midi_on(void) {
+    return (midi_activated != 0);
+}
 
 void midi_toggle(void) {
     if (!midi_activated) {
@@ -315,4 +323,4 @@ __attribute__((weak)) void midi_on_user() {}
 
 __attribute__((weak)) void music_scale_user() {}
 
-#endif  // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
+#endif // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
diff --git a/quantum/process_keycode/process_music.h b/quantum/process_keycode/process_music.h
index e275cd9d26..83726a05ba 100644
--- a/quantum/process_keycode/process_music.h
+++ b/quantum/process_keycode/process_music.h
@@ -51,8 +51,10 @@ bool music_mask_kb(uint16_t keycode);
 bool music_mask_user(uint16_t keycode);
 
 #    ifndef SCALE
-#        define SCALE \
-            (int8_t[]) { 0 + (12 * 0), 2 + (12 * 0), 4 + (12 * 0), 5 + (12 * 0), 7 + (12 * 0), 9 + (12 * 0), 11 + (12 * 0), 0 + (12 * 1), 2 + (12 * 1), 4 + (12 * 1), 5 + (12 * 1), 7 + (12 * 1), 9 + (12 * 1), 11 + (12 * 1), 0 + (12 * 2), 2 + (12 * 2), 4 + (12 * 2), 5 + (12 * 2), 7 + (12 * 2), 9 + (12 * 2), 11 + (12 * 2), 0 + (12 * 3), 2 + (12 * 3), 4 + (12 * 3), 5 + (12 * 3), 7 + (12 * 3), 9 + (12 * 3), 11 + (12 * 3), 0 + (12 * 4), 2 + (12 * 4), 4 + (12 * 4), 5 + (12 * 4), 7 + (12 * 4), 9 + (12 * 4), 11 + (12 * 4), }
+#        define SCALE                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          \
+            (int8_t[]) {                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       \
+                0 + (12 * 0), 2 + (12 * 0), 4 + (12 * 0), 5 + (12 * 0), 7 + (12 * 0), 9 + (12 * 0), 11 + (12 * 0), 0 + (12 * 1), 2 + (12 * 1), 4 + (12 * 1), 5 + (12 * 1), 7 + (12 * 1), 9 + (12 * 1), 11 + (12 * 1), 0 + (12 * 2), 2 + (12 * 2), 4 + (12 * 2), 5 + (12 * 2), 7 + (12 * 2), 9 + (12 * 2), 11 + (12 * 2), 0 + (12 * 3), 2 + (12 * 3), 4 + (12 * 3), 5 + (12 * 3), 7 + (12 * 3), 9 + (12 * 3), 11 + (12 * 3), 0 + (12 * 4), 2 + (12 * 4), 4 + (12 * 4), 5 + (12 * 4), 7 + (12 * 4), 9 + (12 * 4), 11 + (12 * 4), \
+            }
 #    endif
 
-#endif  // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
+#endif // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
diff --git a/quantum/process_keycode/process_printer.c b/quantum/process_keycode/process_printer.c
index 0801f078ef..6dd1f28c9b 100644
--- a/quantum/process_keycode/process_printer.c
+++ b/quantum/process_keycode/process_printer.c
@@ -26,7 +26,9 @@ void enable_printing(void) {
     uart_init(19200);
 }
 
-void disable_printing(void) { printing_enabled = false; }
+void disable_printing(void) {
+    printing_enabled = false;
+}
 
 uint8_t shifted_numbers[10] = {0x21, 0x40, 0x23, 0x24, 0x25, 0x5E, 0x26, 0x2A, 0x28, 0x29};
 
@@ -41,7 +43,8 @@ void print_char(char c) {
 }
 
 void print_string(char c[]) {
-    for (uint8_t i = 0; i < strlen(c); i++) print_char(c[i]);
+    for (uint8_t i = 0; i < strlen(c); i++)
+        print_char(c[i]);
 }
 
 void print_box_string(const char text[]) {
diff --git a/quantum/process_keycode/process_printer_bb.c b/quantum/process_keycode/process_printer_bb.c
index 6c91bd27ef..88a9f33994 100644
--- a/quantum/process_keycode/process_printer_bb.c
+++ b/quantum/process_keycode/process_printer_bb.c
@@ -25,13 +25,21 @@ uint8_t character_shift  = 0;
 #define SERIAL_PIN_MASK _BV(PD3)
 #define SERIAL_DELAY 52
 
-inline static void serial_delay(void) { _delay_us(SERIAL_DELAY); }
+inline static void serial_delay(void) {
+    _delay_us(SERIAL_DELAY);
+}
 
-inline static void serial_high(void) { SERIAL_PIN_PORT |= SERIAL_PIN_MASK; }
+inline static void serial_high(void) {
+    SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
+}
 
-inline static void serial_low(void) { SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK; }
+inline static void serial_low(void) {
+    SERIAL_PIN_PORT &= ~SERIAL_PIN_MASK;
+}
 
-inline static void serial_output(void) { SERIAL_PIN_DDR |= SERIAL_PIN_MASK; }
+inline static void serial_output(void) {
+    SERIAL_PIN_DDR |= SERIAL_PIN_MASK;
+}
 
 void enable_printing() {
     printing_enabled = true;
@@ -39,7 +47,9 @@ void enable_printing() {
     serial_high();
 }
 
-void disable_printing() { printing_enabled = false; }
+void disable_printing() {
+    printing_enabled = false;
+}
 
 uint8_t shifted_numbers[10] = {0x21, 0x40, 0x23, 0x24, 0x25, 0x5E, 0x26, 0x2A, 0x28, 0x29};
 
@@ -61,7 +71,8 @@ void print_char(char c) {
 }
 
 void print_string(char c[]) {
-    for (uint8_t i = 0; i < strlen(c); i++) print_char(c[i]);
+    for (uint8_t i = 0; i < strlen(c); i++)
+        print_char(c[i]);
 }
 
 bool process_printer(uint16_t keycode, keyrecord_t *record) {
diff --git a/quantum/process_keycode/process_steno.c b/quantum/process_keycode/process_steno.c
index 5d0bb313b4..12ee898212 100644
--- a/quantum/process_keycode/process_steno.c
+++ b/quantum/process_keycode/process_steno.c
@@ -102,11 +102,17 @@ void steno_set_mode(steno_mode_t new_mode) {
 /* override to intercept chords right before they get sent.
  * return zero to suppress normal sending behavior.
  */
-__attribute__((weak)) bool send_steno_chord_user(steno_mode_t mode, uint8_t chord[6]) { return true; }
+__attribute__((weak)) bool send_steno_chord_user(steno_mode_t mode, uint8_t chord[6]) {
+    return true;
+}
 
-__attribute__((weak)) bool postprocess_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[6], int8_t pressed) { return true; }
+__attribute__((weak)) bool postprocess_steno_user(uint16_t keycode, keyrecord_t *record, steno_mode_t mode, uint8_t chord[6], int8_t pressed) {
+    return true;
+}
 
-__attribute__((weak)) bool process_steno_user(uint16_t keycode, keyrecord_t *record) { return true; }
+__attribute__((weak)) bool process_steno_user(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
 
 static void send_steno_chord(void) {
     if (send_steno_chord_user(mode, chord)) {
@@ -114,11 +120,11 @@ static void send_steno_chord(void) {
             case STENO_MODE_BOLT:
                 send_steno_state(BOLT_STATE_SIZE, false);
 #ifdef VIRTSER_ENABLE
-                virtser_send(0);  // terminating byte
+                virtser_send(0); // terminating byte
 #endif
                 break;
             case STENO_MODE_GEMINI:
-                chord[0] |= 0x80;  // Indicate start of packet
+                chord[0] |= 0x80; // Indicate start of packet
                 send_steno_state(GEMINI_STATE_SIZE, true);
                 break;
         }
@@ -126,9 +132,13 @@ static void send_steno_chord(void) {
     steno_clear_state();
 }
 
-uint8_t *steno_get_state(void) { return &state[0]; }
+uint8_t *steno_get_state(void) {
+    return &state[0];
+}
 
-uint8_t *steno_get_chord(void) { return &chord[0]; }
+uint8_t *steno_get_chord(void) {
+    return &chord[0];
+}
 
 static bool update_state_bolt(uint8_t key, bool press) {
     uint8_t boltcode = pgm_read_byte(boltmap + key);
diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c
index 035c9c265d..e99119b2ae 100644
--- a/quantum/process_keycode/process_tap_dance.c
+++ b/quantum/process_keycode/process_tap_dance.c
@@ -86,7 +86,9 @@ static inline void _process_tap_dance_action_fn(qk_tap_dance_state_t *state, voi
     }
 }
 
-static inline void process_tap_dance_action_on_each_tap(qk_tap_dance_action_t *action) { _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_each_tap); }
+static inline void process_tap_dance_action_on_each_tap(qk_tap_dance_action_t *action) {
+    _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_each_tap);
+}
 
 static inline void process_tap_dance_action_on_dance_finished(qk_tap_dance_action_t *action) {
     if (action->state.finished) return;
diff --git a/quantum/process_keycode/process_terminal.c b/quantum/process_keycode/process_terminal.c
index a059f3a521..da1c4d506f 100644
--- a/quantum/process_keycode/process_terminal.c
+++ b/quantum/process_keycode/process_terminal.c
@@ -27,12 +27,12 @@
 bool terminal_enabled = false;
 char buffer[80]       = "";
 char cmd_buffer[CMD_BUFF_SIZE][80];
-bool cmd_buffer_enabled = true;  // replace with ifdef?
+bool cmd_buffer_enabled = true; // replace with ifdef?
 char newline[2]         = "\n";
 char arguments[6][20];
 bool firstTime = true;
 
-short int current_cmd_buffer_pos = 0;  // used for up/down arrows - keeps track of where you are in the command buffer
+short int current_cmd_buffer_pos = 0; // used for up/down arrows - keeps track of where you are in the command buffer
 
 __attribute__((weak)) const char terminal_prompt[8] = "> ";
 
@@ -59,7 +59,8 @@ void enable_terminal(void) {
     terminal_enabled = true;
     strcpy(buffer, "");
     memset(cmd_buffer, 0, CMD_BUFF_SIZE * 80);
-    for (int i = 0; i < 6; i++) strcpy(arguments[i], "");
+    for (int i = 0; i < 6; i++)
+        strcpy(arguments[i], "");
     // select all text to start over
     // SEND_STRING(SS_LCTL("a"));
     send_string(terminal_prompt);
@@ -160,7 +161,7 @@ void print_cmd_buff(void) {
     for (int i = 0; i < CMD_BUFF_SIZE; i++) {
         char tmpChar = ' ';
         itoa(i, &tmpChar, 10);
-        const char *tmpCnstCharStr = &tmpChar;  // because sned_string wont take a normal char *
+        const char *tmpCnstCharStr = &tmpChar; // because sned_string wont take a normal char *
         send_string(tmpCnstCharStr);
         SEND_STRING(". ");
         send_string(cmd_buffer[i]);
@@ -185,7 +186,7 @@ void terminal_help(void) {
 }
 
 void command_not_found(void) {
-    wait_ms(50);  // sometimes buffer isnt grabbed quick enough
+    wait_ms(50); // sometimes buffer isnt grabbed quick enough
     SEND_STRING("command \"");
     send_string(buffer);
     SEND_STRING("\" not found\n");
@@ -217,15 +218,16 @@ void process_terminal_command(void) {
 
     if (terminal_enabled) {
         strcpy(buffer, "");
-        for (int i = 0; i < 6; i++) strcpy(arguments[i], "");
+        for (int i = 0; i < 6; i++)
+            strcpy(arguments[i], "");
         SEND_STRING(SS_TAP(X_HOME));
         send_string(terminal_prompt);
     }
 }
 void check_pos(void) {
-    if (current_cmd_buffer_pos >= CMD_BUFF_SIZE) {  // if over the top, move it back down to the top of the buffer so you can climb back down...
+    if (current_cmd_buffer_pos >= CMD_BUFF_SIZE) { // if over the top, move it back down to the top of the buffer so you can climb back down...
         current_cmd_buffer_pos = CMD_BUFF_SIZE - 1;
-    } else if (current_cmd_buffer_pos < 0) {  //...and if you fall under the bottom of the buffer, reset back to 0 so you can climb back up
+    } else if (current_cmd_buffer_pos < 0) { //...and if you fall under the bottom of the buffer, reset back to 0 so you can climb back up
         current_cmd_buffer_pos = 0;
     }
 }
@@ -278,33 +280,33 @@ bool process_terminal(uint16_t keycode, keyrecord_t *record) {
                 case KC_RIGHT:
                     return false;
                     break;
-                case KC_UP:                                             // 0 = recent
-                    check_pos();                                        // check our current buffer position is valid
-                    if (current_cmd_buffer_pos <= CMD_BUFF_SIZE - 1) {  // once we get to the top, dont do anything
+                case KC_UP:                                            // 0 = recent
+                    check_pos();                                       // check our current buffer position is valid
+                    if (current_cmd_buffer_pos <= CMD_BUFF_SIZE - 1) { // once we get to the top, dont do anything
                         str_len = strlen(buffer);
                         for (int i = 0; i < str_len; ++i) {
-                            send_string(SS_TAP(X_BSPACE));  // clear w/e is on the line already
+                            send_string(SS_TAP(X_BSPACE)); // clear w/e is on the line already
                             // process_terminal(KC_BACKSPACE,record);
                         }
                         strncpy(buffer, cmd_buffer[current_cmd_buffer_pos], 80);
 
                         send_string(buffer);
-                        ++current_cmd_buffer_pos;  // get ready to access the above cmd if up/down is pressed again
+                        ++current_cmd_buffer_pos; // get ready to access the above cmd if up/down is pressed again
                     }
                     return false;
                     break;
                 case KC_DOWN:
                     check_pos();
-                    if (current_cmd_buffer_pos >= 0) {  // once we get to the bottom, dont do anything
+                    if (current_cmd_buffer_pos >= 0) { // once we get to the bottom, dont do anything
                         str_len = strlen(buffer);
                         for (int i = 0; i < str_len; ++i) {
-                            send_string(SS_TAP(X_BSPACE));  // clear w/e is on the line already
+                            send_string(SS_TAP(X_BSPACE)); // clear w/e is on the line already
                             // process_terminal(KC_BACKSPACE,record);
                         }
                         strncpy(buffer, cmd_buffer[current_cmd_buffer_pos], 79);
 
                         send_string(buffer);
-                        --current_cmd_buffer_pos;  // get ready to access the above cmd if down/up is pressed again
+                        --current_cmd_buffer_pos; // get ready to access the above cmd if down/up is pressed again
                     }
                     return false;
                     break;
diff --git a/quantum/process_keycode/process_ucis.c b/quantum/process_keycode/process_ucis.c
index d084d2b66c..6a8d8f0ff6 100644
--- a/quantum/process_keycode/process_ucis.c
+++ b/quantum/process_keycode/process_ucis.c
@@ -27,7 +27,7 @@ void qk_ucis_start(void) {
 
 __attribute__((weak)) void qk_ucis_start_user(void) {
     unicode_input_start();
-    register_hex(0x2328);  // ⌨
+    register_hex(0x2328); // ⌨
     unicode_input_finish();
 }
 
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index 7685bb1c99..46b77e14ba 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -54,7 +54,9 @@ void unicode_input_mode_init(void) {
     dprintf("Unicode input mode init to: %u\n", unicode_config.input_mode);
 }
 
-uint8_t get_unicode_input_mode(void) { return unicode_config.input_mode; }
+uint8_t get_unicode_input_mode(void) {
+    return unicode_config.input_mode;
+}
 
 void set_unicode_input_mode(uint8_t mode) {
     unicode_config.input_mode = mode;
@@ -76,7 +78,9 @@ void cycle_unicode_input_mode(int8_t offset) {
 #endif
 }
 
-void persist_unicode_input_mode(void) { eeprom_update_byte(EECONFIG_UNICODEMODE, unicode_config.input_mode); }
+void persist_unicode_input_mode(void) {
+    eeprom_update_byte(EECONFIG_UNICODEMODE, unicode_config.input_mode);
+}
 
 __attribute__((weak)) void unicode_input_start(void) {
     unicode_saved_caps_lock = host_keyboard_led_state().caps_lock;
@@ -90,8 +94,8 @@ __attribute__((weak)) void unicode_input_start(void) {
         tap_code(KC_CAPS_LOCK);
     }
 
-    unicode_saved_mods = get_mods();  // Save current mods
-    clear_mods();                     // Unregister mods to start from a clean state
+    unicode_saved_mods = get_mods(); // Save current mods
+    clear_mods();                    // Unregister mods to start from a clean state
 
     switch (unicode_config.input_mode) {
         case UC_MAC:
@@ -140,7 +144,7 @@ __attribute__((weak)) void unicode_input_finish(void) {
             break;
     }
 
-    set_mods(unicode_saved_mods);  // Reregister previously set mods
+    set_mods(unicode_saved_mods); // Reregister previously set mods
 }
 
 __attribute__((weak)) void unicode_input_cancel(void) {
@@ -165,7 +169,7 @@ __attribute__((weak)) void unicode_input_cancel(void) {
             break;
     }
 
-    set_mods(unicode_saved_mods);  // Reregister previously set mods
+    set_mods(unicode_saved_mods); // Reregister previously set mods
 }
 
 // clang-format off
@@ -262,16 +266,16 @@ void send_unicode_hex_string(const char *str) {
 static const char *decode_utf8(const char *str, int32_t *code_point) {
     const char *next;
 
-    if (str[0] < 0x80) {  // U+0000-007F
+    if (str[0] < 0x80) { // U+0000-007F
         *code_point = str[0];
         next        = str + 1;
-    } else if ((str[0] & 0xE0) == 0xC0) {  // U+0080-07FF
+    } else if ((str[0] & 0xE0) == 0xC0) { // U+0080-07FF
         *code_point = ((int32_t)(str[0] & 0x1F) << 6) | ((int32_t)(str[1] & 0x3F) << 0);
         next        = str + 2;
-    } else if ((str[0] & 0xF0) == 0xE0) {  // U+0800-FFFF
+    } else if ((str[0] & 0xF0) == 0xE0) { // U+0800-FFFF
         *code_point = ((int32_t)(str[0] & 0x0F) << 12) | ((int32_t)(str[1] & 0x3F) << 6) | ((int32_t)(str[2] & 0x3F) << 0);
         next        = str + 3;
-    } else if ((str[0] & 0xF8) == 0xF0 && (str[0] <= 0xF4)) {  // U+10000-10FFFF
+    } else if ((str[0] & 0xF8) == 0xF0 && (str[0] <= 0xF4)) { // U+10000-10FFFF
         *code_point = ((int32_t)(str[0] & 0x07) << 18) | ((int32_t)(str[1] & 0x3F) << 12) | ((int32_t)(str[2] & 0x3F) << 6) | ((int32_t)(str[3] & 0x3F) << 0);
         next        = str + 4;
     } else {
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h
index 72defb445e..1a6607c757 100644
--- a/quantum/process_keycode/process_unicode_common.h
+++ b/quantum/process_keycode/process_unicode_common.h
@@ -59,12 +59,12 @@
 #define UC_OSX UC_MAC
 
 enum unicode_input_modes {
-    UC_MAC,    // macOS using Unicode Hex Input
-    UC_LNX,    // Linux using IBus
-    UC_WIN,    // Windows using EnableHexNumpad
-    UC_BSD,    // BSD (not implemented)
-    UC_WINC,   // Windows using WinCompose (https://github.com/samhocevar/wincompose)
-    UC__COUNT  // Number of available input modes (always leave at the end)
+    UC_MAC,   // macOS using Unicode Hex Input
+    UC_LNX,   // Linux using IBus
+    UC_WIN,   // Windows using EnableHexNumpad
+    UC_BSD,   // BSD (not implemented)
+    UC_WINC,  // Windows using WinCompose (https://github.com/samhocevar/wincompose)
+    UC__COUNT // Number of available input modes (always leave at the end)
 };
 
 typedef union {
diff --git a/quantum/programmable_button.c b/quantum/programmable_button.c
index be828fd17c..a3ef42d82b 100644
--- a/quantum/programmable_button.c
+++ b/quantum/programmable_button.c
@@ -22,16 +22,30 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 static uint32_t programmable_button_report = 0;
 
-void programmable_button_clear(void) { programmable_button_report = 0; }
+void programmable_button_clear(void) {
+    programmable_button_report = 0;
+}
 
-void programmable_button_send(void) { host_programmable_button_send(programmable_button_report); }
+void programmable_button_send(void) {
+    host_programmable_button_send(programmable_button_report);
+}
 
-void programmable_button_on(uint8_t index) { programmable_button_report |= REPORT_BIT(index); }
+void programmable_button_on(uint8_t index) {
+    programmable_button_report |= REPORT_BIT(index);
+}
 
-void programmable_button_off(uint8_t index) { programmable_button_report &= ~REPORT_BIT(index); }
+void programmable_button_off(uint8_t index) {
+    programmable_button_report &= ~REPORT_BIT(index);
+}
 
-bool programmable_button_is_on(uint8_t index) { return !!(programmable_button_report & REPORT_BIT(index)); };
+bool programmable_button_is_on(uint8_t index) {
+    return !!(programmable_button_report & REPORT_BIT(index));
+};
 
-uint32_t programmable_button_get_report(void) { return programmable_button_report; };
+uint32_t programmable_button_get_report(void) {
+    return programmable_button_report;
+};
 
-void programmable_button_set_report(uint32_t report) { programmable_button_report = report; }
+void programmable_button_set_report(uint32_t report) {
+    programmable_button_report = report;
+}
diff --git a/quantum/quantum.c b/quantum/quantum.c
index fb6220efa2..dce41c08ae 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -56,7 +56,7 @@ uint8_t extract_mod_bits(uint16_t code) {
 
     uint8_t mods_to_send = 0;
 
-    if (code & QK_RMODS_MIN) {  // Right mod flag is set
+    if (code & QK_RMODS_MIN) { // Right mod flag is set
         if (code & QK_LCTL) mods_to_send |= MOD_BIT(KC_RIGHT_CTRL);
         if (code & QK_LSFT) mods_to_send |= MOD_BIT(KC_RIGHT_SHIFT);
         if (code & QK_LALT) mods_to_send |= MOD_BIT(KC_RIGHT_ALT);
@@ -71,7 +71,9 @@ uint8_t extract_mod_bits(uint16_t code) {
     return mods_to_send;
 }
 
-void do_code16(uint16_t code, void (*f)(uint8_t)) { f(extract_mod_bits(code)); }
+void do_code16(uint16_t code, void (*f)(uint8_t)) {
+    f(extract_mod_bits(code));
+}
 
 __attribute__((weak)) void register_code16(uint16_t code) {
     if (IS_MOD(code) || code == KC_NO) {
@@ -101,13 +103,21 @@ __attribute__((weak)) void tap_code16(uint16_t code) {
     unregister_code16(code);
 }
 
-__attribute__((weak)) bool process_action_kb(keyrecord_t *record) { return true; }
+__attribute__((weak)) bool process_action_kb(keyrecord_t *record) {
+    return true;
+}
 
-__attribute__((weak)) bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return process_record_user(keycode, record); }
+__attribute__((weak)) bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    return process_record_user(keycode, record);
+}
 
-__attribute__((weak)) bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; }
+__attribute__((weak)) bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
 
-__attribute__((weak)) void post_process_record_kb(uint16_t keycode, keyrecord_t *record) { post_process_record_user(keycode, record); }
+__attribute__((weak)) void post_process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    post_process_record_user(keycode, record);
+}
 
 __attribute__((weak)) void post_process_record_user(uint16_t keycode, keyrecord_t *record) {}
 
@@ -123,7 +133,8 @@ void reset_keyboard(void) {
     uint16_t timer_start = timer_read();
     PLAY_SONG(goodbye_song);
     shutdown_user();
-    while (timer_elapsed(timer_start) < 250) wait_ms(1);
+    while (timer_elapsed(timer_start) < 250)
+        wait_ms(1);
     stop_all_notes();
 #else
     shutdown_user();
@@ -178,7 +189,7 @@ bool pre_process_record_quantum(keyrecord_t *record) {
             true)) {
         return false;
     }
-    return true;  // continue processing
+    return true; // continue processing
 }
 
 /* Get keycode, and then call keyboard function */
@@ -367,11 +378,17 @@ layer_state_t update_tri_layer_state(layer_state_t state, uint8_t layer1, uint8_
     return (state & mask12) == mask12 ? (state | mask3) : (state & ~mask3);
 }
 
-void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) { layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3)); }
+void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
+    layer_state_set(update_tri_layer_state(layer_state, layer1, layer2, layer3));
+}
 
 // TODO: remove legacy api
-void matrix_init_quantum() { matrix_init_kb(); }
-void matrix_scan_quantum() { matrix_scan_kb(); }
+void matrix_init_quantum() {
+    matrix_init_kb();
+}
+void matrix_scan_quantum() {
+    matrix_scan_kb();
+}
 
 //------------------------------------------------------------------------------
 // Override these functions in your keymap file to play different tunes on
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index b5b3566786..2552c48165 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -77,421 +77,421 @@ enum quantum_keycodes {
 
     // Loose keycodes - to be used directly
     QK_BOOTLOADER = 0x5C00,
-    QK_DEBUG_TOGGLE,  // 5C01
+    QK_DEBUG_TOGGLE, // 5C01
 
     // Magic
-    MAGIC_SWAP_CONTROL_CAPSLOCK,       // 5C02
-    MAGIC_CAPSLOCK_TO_CONTROL,         // 5C03
-    MAGIC_SWAP_LALT_LGUI,              // 5C04
-    MAGIC_SWAP_RALT_RGUI,              // 5C05
-    MAGIC_NO_GUI,                      // 5C06
-    MAGIC_SWAP_GRAVE_ESC,              // 5C07
-    MAGIC_SWAP_BACKSLASH_BACKSPACE,    // 5C08
-    MAGIC_HOST_NKRO,                   // 5C09
-    MAGIC_SWAP_ALT_GUI,                // 5C0A
-    MAGIC_UNSWAP_CONTROL_CAPSLOCK,     // 5C0B
-    MAGIC_UNCAPSLOCK_TO_CONTROL,       // 5C0C
-    MAGIC_UNSWAP_LALT_LGUI,            // 5C0D
-    MAGIC_UNSWAP_RALT_RGUI,            // 5C0E
-    MAGIC_UNNO_GUI,                    // 5C0F
-    MAGIC_UNSWAP_GRAVE_ESC,            // 5C10
-    MAGIC_UNSWAP_BACKSLASH_BACKSPACE,  // 5C11
-    MAGIC_UNHOST_NKRO,                 // 5C12
-    MAGIC_UNSWAP_ALT_GUI,              // 5C13
-    MAGIC_TOGGLE_NKRO,                 // 5C14
-    MAGIC_TOGGLE_ALT_GUI,              // 5C15
+    MAGIC_SWAP_CONTROL_CAPSLOCK,      // 5C02
+    MAGIC_CAPSLOCK_TO_CONTROL,        // 5C03
+    MAGIC_SWAP_LALT_LGUI,             // 5C04
+    MAGIC_SWAP_RALT_RGUI,             // 5C05
+    MAGIC_NO_GUI,                     // 5C06
+    MAGIC_SWAP_GRAVE_ESC,             // 5C07
+    MAGIC_SWAP_BACKSLASH_BACKSPACE,   // 5C08
+    MAGIC_HOST_NKRO,                  // 5C09
+    MAGIC_SWAP_ALT_GUI,               // 5C0A
+    MAGIC_UNSWAP_CONTROL_CAPSLOCK,    // 5C0B
+    MAGIC_UNCAPSLOCK_TO_CONTROL,      // 5C0C
+    MAGIC_UNSWAP_LALT_LGUI,           // 5C0D
+    MAGIC_UNSWAP_RALT_RGUI,           // 5C0E
+    MAGIC_UNNO_GUI,                   // 5C0F
+    MAGIC_UNSWAP_GRAVE_ESC,           // 5C10
+    MAGIC_UNSWAP_BACKSLASH_BACKSPACE, // 5C11
+    MAGIC_UNHOST_NKRO,                // 5C12
+    MAGIC_UNSWAP_ALT_GUI,             // 5C13
+    MAGIC_TOGGLE_NKRO,                // 5C14
+    MAGIC_TOGGLE_ALT_GUI,             // 5C15
 
     // Grave Escape
-    QK_GRAVE_ESCAPE,  // 5C16
+    QK_GRAVE_ESCAPE, // 5C16
 
     // Auto Shift
-    KC_ASUP,   // 5C17
-    KC_ASDN,   // 5C18
-    KC_ASRP,   // 5C19
-    KC_ASTG,   // 5C1A
-    KC_ASON,   // 5C1B
-    KC_ASOFF,  // 5C1C
+    KC_ASUP,  // 5C17
+    KC_ASDN,  // 5C18
+    KC_ASRP,  // 5C19
+    KC_ASTG,  // 5C1A
+    KC_ASON,  // 5C1B
+    KC_ASOFF, // 5C1C
 
     // Audio
-    AU_ON,   // 5C1D
-    AU_OFF,  // 5C1E
-    AU_TOG,  // 5C1F
+    AU_ON,  // 5C1D
+    AU_OFF, // 5C1E
+    AU_TOG, // 5C1F
 
     // Audio Clicky
-    CLICKY_TOGGLE,   // 5C20
-    CLICKY_ENABLE,   // 5C21
-    CLICKY_DISABLE,  // 5C22
-    CLICKY_UP,       // 5C23
-    CLICKY_DOWN,     // 5C24
-    CLICKY_RESET,    // 5C25
+    CLICKY_TOGGLE,  // 5C20
+    CLICKY_ENABLE,  // 5C21
+    CLICKY_DISABLE, // 5C22
+    CLICKY_UP,      // 5C23
+    CLICKY_DOWN,    // 5C24
+    CLICKY_RESET,   // 5C25
 
     // Music mode
-    MU_ON,   // 5C26
-    MU_OFF,  // 5C27
-    MU_TOG,  // 5C28
-    MU_MOD,  // 5C29
-    MUV_IN,  // 5C2A
-    MUV_DE,  // 5C2B
+    MU_ON,  // 5C26
+    MU_OFF, // 5C27
+    MU_TOG, // 5C28
+    MU_MOD, // 5C29
+    MUV_IN, // 5C2A
+    MUV_DE, // 5C2B
 
     // MIDI
-    MI_ON,   // 5C2C
-    MI_OFF,  // 5C2D
-    MI_TOG,  // 5C2E
+    MI_ON,  // 5C2C
+    MI_OFF, // 5C2D
+    MI_TOG, // 5C2E
 
-    MI_C,   // 5C2F
-    MI_Cs,  // 5C30
+    MI_C,  // 5C2F
+    MI_Cs, // 5C30
     MI_Db = MI_Cs,
-    MI_D,   // 5C31
-    MI_Ds,  // 5C32
+    MI_D,  // 5C31
+    MI_Ds, // 5C32
     MI_Eb = MI_Ds,
-    MI_E,   // 5C33
-    MI_F,   // 5C34
-    MI_Fs,  // 5C35
+    MI_E,  // 5C33
+    MI_F,  // 5C34
+    MI_Fs, // 5C35
     MI_Gb = MI_Fs,
-    MI_G,   // 5C36
-    MI_Gs,  // 5C37
+    MI_G,  // 5C36
+    MI_Gs, // 5C37
     MI_Ab = MI_Gs,
-    MI_A,   // 5C38
-    MI_As,  // 5C39
+    MI_A,  // 5C38
+    MI_As, // 5C39
     MI_Bb = MI_As,
-    MI_B,  // 5C3A
+    MI_B, // 5C3A
 
-    MI_C_1,   // 5C3B
-    MI_Cs_1,  // 5C3C
+    MI_C_1,  // 5C3B
+    MI_Cs_1, // 5C3C
     MI_Db_1 = MI_Cs_1,
-    MI_D_1,   // 5C3D
-    MI_Ds_1,  // 5C3E
+    MI_D_1,  // 5C3D
+    MI_Ds_1, // 5C3E
     MI_Eb_1 = MI_Ds_1,
-    MI_E_1,   // 5C3F
-    MI_F_1,   // 5C40
-    MI_Fs_1,  // 5C41
+    MI_E_1,  // 5C3F
+    MI_F_1,  // 5C40
+    MI_Fs_1, // 5C41
     MI_Gb_1 = MI_Fs_1,
-    MI_G_1,   // 5C42
-    MI_Gs_1,  // 5C43
+    MI_G_1,  // 5C42
+    MI_Gs_1, // 5C43
     MI_Ab_1 = MI_Gs_1,
-    MI_A_1,   // 5C44
-    MI_As_1,  // 5C45
+    MI_A_1,  // 5C44
+    MI_As_1, // 5C45
     MI_Bb_1 = MI_As_1,
-    MI_B_1,  // 5C46
+    MI_B_1, // 5C46
 
-    MI_C_2,   // 5C47
-    MI_Cs_2,  // 5C48
+    MI_C_2,  // 5C47
+    MI_Cs_2, // 5C48
     MI_Db_2 = MI_Cs_2,
-    MI_D_2,   // 5C49
-    MI_Ds_2,  // 5C4A
+    MI_D_2,  // 5C49
+    MI_Ds_2, // 5C4A
     MI_Eb_2 = MI_Ds_2,
-    MI_E_2,   // 5C4B
-    MI_F_2,   // 5C4C
-    MI_Fs_2,  // 5C4D
+    MI_E_2,  // 5C4B
+    MI_F_2,  // 5C4C
+    MI_Fs_2, // 5C4D
     MI_Gb_2 = MI_Fs_2,
-    MI_G_2,   // 5C4E
-    MI_Gs_2,  // 5C4F
+    MI_G_2,  // 5C4E
+    MI_Gs_2, // 5C4F
     MI_Ab_2 = MI_Gs_2,
-    MI_A_2,   // 5C50
-    MI_As_2,  // 5C51
+    MI_A_2,  // 5C50
+    MI_As_2, // 5C51
     MI_Bb_2 = MI_As_2,
-    MI_B_2,  // 5C52
+    MI_B_2, // 5C52
 
-    MI_C_3,   // 5C53
-    MI_Cs_3,  // 5C54
+    MI_C_3,  // 5C53
+    MI_Cs_3, // 5C54
     MI_Db_3 = MI_Cs_3,
-    MI_D_3,   // 5C55
-    MI_Ds_3,  // 5C56
+    MI_D_3,  // 5C55
+    MI_Ds_3, // 5C56
     MI_Eb_3 = MI_Ds_3,
-    MI_E_3,   // 5C57
-    MI_F_3,   // 5C58
-    MI_Fs_3,  // 5C59
+    MI_E_3,  // 5C57
+    MI_F_3,  // 5C58
+    MI_Fs_3, // 5C59
     MI_Gb_3 = MI_Fs_3,
-    MI_G_3,   // 5C5A
-    MI_Gs_3,  // 5C5B
+    MI_G_3,  // 5C5A
+    MI_Gs_3, // 5C5B
     MI_Ab_3 = MI_Gs_3,
-    MI_A_3,   // 5C5C
-    MI_As_3,  // 5C5D
+    MI_A_3,  // 5C5C
+    MI_As_3, // 5C5D
     MI_Bb_3 = MI_As_3,
-    MI_B_3,  // 5C5E
+    MI_B_3, // 5C5E
 
-    MI_C_4,   // 5C5F
-    MI_Cs_4,  // 5C60
+    MI_C_4,  // 5C5F
+    MI_Cs_4, // 5C60
     MI_Db_4 = MI_Cs_4,
-    MI_D_4,   // 5C61
-    MI_Ds_4,  // 5C62
+    MI_D_4,  // 5C61
+    MI_Ds_4, // 5C62
     MI_Eb_4 = MI_Ds_4,
-    MI_E_4,   // 5C63
-    MI_F_4,   // 5C64
-    MI_Fs_4,  // 5C65
+    MI_E_4,  // 5C63
+    MI_F_4,  // 5C64
+    MI_Fs_4, // 5C65
     MI_Gb_4 = MI_Fs_4,
-    MI_G_4,   // 5C66
-    MI_Gs_4,  // 5C67
+    MI_G_4,  // 5C66
+    MI_Gs_4, // 5C67
     MI_Ab_4 = MI_Gs_4,
-    MI_A_4,   // 5C68
-    MI_As_4,  // 5C69
+    MI_A_4,  // 5C68
+    MI_As_4, // 5C69
     MI_Bb_4 = MI_As_4,
-    MI_B_4,  // 5C6A
+    MI_B_4, // 5C6A
 
-    MI_C_5,   // 5C6B
-    MI_Cs_5,  // 5C6C
+    MI_C_5,  // 5C6B
+    MI_Cs_5, // 5C6C
     MI_Db_5 = MI_Cs_5,
-    MI_D_5,   // 5C6D
-    MI_Ds_5,  // 5C6E
+    MI_D_5,  // 5C6D
+    MI_Ds_5, // 5C6E
     MI_Eb_5 = MI_Ds_5,
-    MI_E_5,   // 5C6F
-    MI_F_5,   // 5C70
-    MI_Fs_5,  // 5C71
+    MI_E_5,  // 5C6F
+    MI_F_5,  // 5C70
+    MI_Fs_5, // 5C71
     MI_Gb_5 = MI_Fs_5,
-    MI_G_5,   // 5C72
-    MI_Gs_5,  // 5C73
+    MI_G_5,  // 5C72
+    MI_Gs_5, // 5C73
     MI_Ab_5 = MI_Gs_5,
-    MI_A_5,   // 5C74
-    MI_As_5,  // 5C75
+    MI_A_5,  // 5C74
+    MI_As_5, // 5C75
     MI_Bb_5 = MI_As_5,
-    MI_B_5,  // 5C76
+    MI_B_5, // 5C76
 
-    MI_OCT_N2,  // 5C77
-    MI_OCT_N1,  // 5C78
-    MI_OCT_0,   // 5C79
-    MI_OCT_1,   // 5C7A
-    MI_OCT_2,   // 5C7B
-    MI_OCT_3,   // 5C7C
-    MI_OCT_4,   // 5C7D
-    MI_OCT_5,   // 5C7E
-    MI_OCT_6,   // 5C7F
-    MI_OCT_7,   // 5C80
-    MI_OCTD,    // 5C81
-    MI_OCTU,    // 5C82
+    MI_OCT_N2, // 5C77
+    MI_OCT_N1, // 5C78
+    MI_OCT_0,  // 5C79
+    MI_OCT_1,  // 5C7A
+    MI_OCT_2,  // 5C7B
+    MI_OCT_3,  // 5C7C
+    MI_OCT_4,  // 5C7D
+    MI_OCT_5,  // 5C7E
+    MI_OCT_6,  // 5C7F
+    MI_OCT_7,  // 5C80
+    MI_OCTD,   // 5C81
+    MI_OCTU,   // 5C82
 
-    MI_TRNS_N6,  // 5C83
-    MI_TRNS_N5,  // 5C84
-    MI_TRNS_N4,  // 5C85
-    MI_TRNS_N3,  // 5C86
-    MI_TRNS_N2,  // 5C87
-    MI_TRNS_N1,  // 5C88
-    MI_TRNS_0,   // 5C89
-    MI_TRNS_1,   // 5C8A
-    MI_TRNS_2,   // 5C8B
-    MI_TRNS_3,   // 5C8C
-    MI_TRNS_4,   // 5C8D
-    MI_TRNS_5,   // 5C8E
-    MI_TRNS_6,   // 5C8F
-    MI_TRNSD,    // 5C90
-    MI_TRNSU,    // 5C91
+    MI_TRNS_N6, // 5C83
+    MI_TRNS_N5, // 5C84
+    MI_TRNS_N4, // 5C85
+    MI_TRNS_N3, // 5C86
+    MI_TRNS_N2, // 5C87
+    MI_TRNS_N1, // 5C88
+    MI_TRNS_0,  // 5C89
+    MI_TRNS_1,  // 5C8A
+    MI_TRNS_2,  // 5C8B
+    MI_TRNS_3,  // 5C8C
+    MI_TRNS_4,  // 5C8D
+    MI_TRNS_5,  // 5C8E
+    MI_TRNS_6,  // 5C8F
+    MI_TRNSD,   // 5C90
+    MI_TRNSU,   // 5C91
 
-    MI_VEL_0,  // 5C92
+    MI_VEL_0, // 5C92
 #ifdef VIA_ENABLE
     MI_VEL_1 = MI_VEL_0,
 #else
-    MI_VEL_1,  // 5C93
+    MI_VEL_1, // 5C93
 #endif
-    MI_VEL_2,   // 5C94
-    MI_VEL_3,   // 5C95
-    MI_VEL_4,   // 5C96
-    MI_VEL_5,   // 5C97
-    MI_VEL_6,   // 5C98
-    MI_VEL_7,   // 5C99
-    MI_VEL_8,   // 5C9A
-    MI_VEL_9,   // 5C9B
-    MI_VEL_10,  // 5C9C
-    MI_VELD,    // 5C9D
-    MI_VELU,    // 5C9E
+    MI_VEL_2,  // 5C94
+    MI_VEL_3,  // 5C95
+    MI_VEL_4,  // 5C96
+    MI_VEL_5,  // 5C97
+    MI_VEL_6,  // 5C98
+    MI_VEL_7,  // 5C99
+    MI_VEL_8,  // 5C9A
+    MI_VEL_9,  // 5C9B
+    MI_VEL_10, // 5C9C
+    MI_VELD,   // 5C9D
+    MI_VELU,   // 5C9E
 
-    MI_CH1,   // 5C9F
-    MI_CH2,   // 5CA0
-    MI_CH3,   // 5CA1
-    MI_CH4,   // 5CA2
-    MI_CH5,   // 5CA3
-    MI_CH6,   // 5CA4
-    MI_CH7,   // 5CA5
-    MI_CH8,   // 5CA6
-    MI_CH9,   // 5CA7
-    MI_CH10,  // 5CA8
-    MI_CH11,  // 5CA9
-    MI_CH12,  // 5CAA
-    MI_CH13,  // 5CAB
-    MI_CH14,  // 5CAC
-    MI_CH15,  // 5CAD
-    MI_CH16,  // 5CAE
-    MI_CHD,   // 5CAF
-    MI_CHU,   // 5CB0
+    MI_CH1,  // 5C9F
+    MI_CH2,  // 5CA0
+    MI_CH3,  // 5CA1
+    MI_CH4,  // 5CA2
+    MI_CH5,  // 5CA3
+    MI_CH6,  // 5CA4
+    MI_CH7,  // 5CA5
+    MI_CH8,  // 5CA6
+    MI_CH9,  // 5CA7
+    MI_CH10, // 5CA8
+    MI_CH11, // 5CA9
+    MI_CH12, // 5CAA
+    MI_CH13, // 5CAB
+    MI_CH14, // 5CAC
+    MI_CH15, // 5CAD
+    MI_CH16, // 5CAE
+    MI_CHD,  // 5CAF
+    MI_CHU,  // 5CB0
 
-    MI_ALLOFF,  // 5CB1
+    MI_ALLOFF, // 5CB1
 
-    MI_SUS,   // 5CB2
-    MI_PORT,  // 5CB3
-    MI_SOST,  // 5CB4
-    MI_SOFT,  // 5CB5
-    MI_LEG,   // 5CB6
+    MI_SUS,  // 5CB2
+    MI_PORT, // 5CB3
+    MI_SOST, // 5CB4
+    MI_SOFT, // 5CB5
+    MI_LEG,  // 5CB6
 
-    MI_MOD,    // 5CB7
-    MI_MODSD,  // 5CB8
-    MI_MODSU,  // 5CB9
+    MI_MOD,   // 5CB7
+    MI_MODSD, // 5CB8
+    MI_MODSU, // 5CB9
 
-    MI_BENDD,  // 5CBA
-    MI_BENDU,  // 5CBB
+    MI_BENDD, // 5CBA
+    MI_BENDU, // 5CBB
 
     // Backlight
-    BL_ON,    // 5CBC
-    BL_OFF,   // 5CBD
-    BL_DEC,   // 5CBE
-    BL_INC,   // 5CBF
-    BL_TOGG,  // 5CC0
-    BL_STEP,  // 5CC1
-    BL_BRTG,  // 5CC2
+    BL_ON,   // 5CBC
+    BL_OFF,  // 5CBD
+    BL_DEC,  // 5CBE
+    BL_INC,  // 5CBF
+    BL_TOGG, // 5CC0
+    BL_STEP, // 5CC1
+    BL_BRTG, // 5CC2
 
     // RGB underglow/matrix
-    RGB_TOG,            // 5CC3
-    RGB_MODE_FORWARD,   // 5CC4
-    RGB_MODE_REVERSE,   // 5CC5
-    RGB_HUI,            // 5CC6
-    RGB_HUD,            // 5CC7
-    RGB_SAI,            // 5CC8
-    RGB_SAD,            // 5CC9
-    RGB_VAI,            // 5CCA
-    RGB_VAD,            // 5CCB
-    RGB_SPI,            // 5CCC
-    RGB_SPD,            // 5CCD
-    RGB_MODE_PLAIN,     // 5CCE
-    RGB_MODE_BREATHE,   // 5CCF
-    RGB_MODE_RAINBOW,   // 5CD0
-    RGB_MODE_SWIRL,     // 5CD1
-    RGB_MODE_SNAKE,     // 5CD2
-    RGB_MODE_KNIGHT,    // 5CD3
-    RGB_MODE_XMAS,      // 5CD4
-    RGB_MODE_GRADIENT,  // 5CD5
-    RGB_MODE_RGBTEST,   // 5CD6
+    RGB_TOG,           // 5CC3
+    RGB_MODE_FORWARD,  // 5CC4
+    RGB_MODE_REVERSE,  // 5CC5
+    RGB_HUI,           // 5CC6
+    RGB_HUD,           // 5CC7
+    RGB_SAI,           // 5CC8
+    RGB_SAD,           // 5CC9
+    RGB_VAI,           // 5CCA
+    RGB_VAD,           // 5CCB
+    RGB_SPI,           // 5CCC
+    RGB_SPD,           // 5CCD
+    RGB_MODE_PLAIN,    // 5CCE
+    RGB_MODE_BREATHE,  // 5CCF
+    RGB_MODE_RAINBOW,  // 5CD0
+    RGB_MODE_SWIRL,    // 5CD1
+    RGB_MODE_SNAKE,    // 5CD2
+    RGB_MODE_KNIGHT,   // 5CD3
+    RGB_MODE_XMAS,     // 5CD4
+    RGB_MODE_GRADIENT, // 5CD5
+    RGB_MODE_RGBTEST,  // 5CD6
 
     // Velocikey
-    VLK_TOG,  // 5CD7
+    VLK_TOG, // 5CD7
 
     // Space Cadet
-    KC_LSPO,    // 5CD8
-    KC_RSPC,    // 5CD9
-    KC_SFTENT,  // 5CDA
+    KC_LSPO,   // 5CD8
+    KC_RSPC,   // 5CD9
+    KC_SFTENT, // 5CDA
 
     // Thermal Printer
-    PRINT_ON,   // 5CDB
-    PRINT_OFF,  // 5CDC
+    PRINT_ON,  // 5CDB
+    PRINT_OFF, // 5CDC
 
     // Bluetooth: output selection
-    OUT_AUTO,  // 5CDD
-    OUT_USB,   // 5CDE
+    OUT_AUTO, // 5CDD
+    OUT_USB,  // 5CDE
 
     // Clear EEPROM
-    QK_CLEAR_EEPROM,  // 5CDF
+    QK_CLEAR_EEPROM, // 5CDF
 
     // Unicode
-    UNICODE_MODE_FORWARD,  // 5CE0
-    UNICODE_MODE_REVERSE,  // 5CE1
-    UNICODE_MODE_MAC,      // 5CE2
-    UNICODE_MODE_LNX,      // 5CE3
-    UNICODE_MODE_WIN,      // 5CE4
-    UNICODE_MODE_BSD,      // 5CE5
-    UNICODE_MODE_WINC,     // 5CE6
+    UNICODE_MODE_FORWARD, // 5CE0
+    UNICODE_MODE_REVERSE, // 5CE1
+    UNICODE_MODE_MAC,     // 5CE2
+    UNICODE_MODE_LNX,     // 5CE3
+    UNICODE_MODE_WIN,     // 5CE4
+    UNICODE_MODE_BSD,     // 5CE5
+    UNICODE_MODE_WINC,    // 5CE6
 
     // Haptic
-    HPT_ON,    // 5CE7
-    HPT_OFF,   // 5CE8
-    HPT_TOG,   // 5CE9
-    HPT_RST,   // 5CEA
-    HPT_FBK,   // 5CEB
-    HPT_BUZ,   // 5CEC
-    HPT_MODI,  // 5CED
-    HPT_MODD,  // 5CEE
-    HPT_CONT,  // 5CEF
-    HPT_CONI,  // 5CF0
-    HPT_COND,  // 5CF1
-    HPT_DWLI,  // 5CF2
-    HPT_DWLD,  // 5CF3
+    HPT_ON,   // 5CE7
+    HPT_OFF,  // 5CE8
+    HPT_TOG,  // 5CE9
+    HPT_RST,  // 5CEA
+    HPT_FBK,  // 5CEB
+    HPT_BUZ,  // 5CEC
+    HPT_MODI, // 5CED
+    HPT_MODD, // 5CEE
+    HPT_CONT, // 5CEF
+    HPT_CONI, // 5CF0
+    HPT_COND, // 5CF1
+    HPT_DWLI, // 5CF2
+    HPT_DWLD, // 5CF3
 
     // Space Cadet (continued)
-    KC_LCPO,  // 5CF4
-    KC_RCPC,  // 5CF5
-    KC_LAPO,  // 5CF6
-    KC_RAPC,  // 5CF7
+    KC_LCPO, // 5CF4
+    KC_RCPC, // 5CF5
+    KC_LAPO, // 5CF6
+    KC_RAPC, // 5CF7
 
     // Combos
-    CMB_ON,   // 5CF8
-    CMB_OFF,  // 5CF9
-    CMB_TOG,  // 5CFA
+    CMB_ON,  // 5CF8
+    CMB_OFF, // 5CF9
+    CMB_TOG, // 5CFA
 
     // Magic (continued)
-    MAGIC_SWAP_LCTL_LGUI,    // 5CFB
-    MAGIC_SWAP_RCTL_RGUI,    // 5CFC
-    MAGIC_UNSWAP_LCTL_LGUI,  // 5CFD
-    MAGIC_UNSWAP_RCTL_RGUI,  // 5CFE
-    MAGIC_SWAP_CTL_GUI,      // 5CFF
-    MAGIC_UNSWAP_CTL_GUI,    // 5D00
-    MAGIC_TOGGLE_CTL_GUI,    // 5D01
-    MAGIC_EE_HANDS_LEFT,     // 5D02
-    MAGIC_EE_HANDS_RIGHT,    // 5D03
+    MAGIC_SWAP_LCTL_LGUI,   // 5CFB
+    MAGIC_SWAP_RCTL_RGUI,   // 5CFC
+    MAGIC_UNSWAP_LCTL_LGUI, // 5CFD
+    MAGIC_UNSWAP_RCTL_RGUI, // 5CFE
+    MAGIC_SWAP_CTL_GUI,     // 5CFF
+    MAGIC_UNSWAP_CTL_GUI,   // 5D00
+    MAGIC_TOGGLE_CTL_GUI,   // 5D01
+    MAGIC_EE_HANDS_LEFT,    // 5D02
+    MAGIC_EE_HANDS_RIGHT,   // 5D03
 
     // Dynamic Macros
-    DYN_REC_START1,   // 5D04
-    DYN_REC_START2,   // 5D05
-    DYN_REC_STOP,     // 5D06
-    DYN_MACRO_PLAY1,  // 5D07
-    DYN_MACRO_PLAY2,  // 5D08
+    DYN_REC_START1,  // 5D04
+    DYN_REC_START2,  // 5D05
+    DYN_REC_STOP,    // 5D06
+    DYN_MACRO_PLAY1, // 5D07
+    DYN_MACRO_PLAY2, // 5D08
 
     // Joystick
-    JS_BUTTON0,   // 5D09
-    JS_BUTTON1,   // 5D0A
-    JS_BUTTON2,   // 5D0B
-    JS_BUTTON3,   // 5D0C
-    JS_BUTTON4,   // 5D0D
-    JS_BUTTON5,   // 5D0E
-    JS_BUTTON6,   // 5D0F
-    JS_BUTTON7,   // 5D10
-    JS_BUTTON8,   // 5D11
-    JS_BUTTON9,   // 5D12
-    JS_BUTTON10,  // 5D13
-    JS_BUTTON11,  // 5D14
-    JS_BUTTON12,  // 5D15
-    JS_BUTTON13,  // 5D16
-    JS_BUTTON14,  // 5D17
-    JS_BUTTON15,  // 5D18
-    JS_BUTTON16,  // 5D19
-    JS_BUTTON17,  // 5D1A
-    JS_BUTTON18,  // 5D1B
-    JS_BUTTON19,  // 5D1C
-    JS_BUTTON20,  // 5D1D
-    JS_BUTTON21,  // 5D1E
-    JS_BUTTON22,  // 5D1F
-    JS_BUTTON23,  // 5D20
-    JS_BUTTON24,  // 5D21
-    JS_BUTTON25,  // 5D22
-    JS_BUTTON26,  // 5D23
-    JS_BUTTON27,  // 5D24
-    JS_BUTTON28,  // 5D25
-    JS_BUTTON29,  // 5D26
-    JS_BUTTON30,  // 5D27
-    JS_BUTTON31,  // 5D28
+    JS_BUTTON0,  // 5D09
+    JS_BUTTON1,  // 5D0A
+    JS_BUTTON2,  // 5D0B
+    JS_BUTTON3,  // 5D0C
+    JS_BUTTON4,  // 5D0D
+    JS_BUTTON5,  // 5D0E
+    JS_BUTTON6,  // 5D0F
+    JS_BUTTON7,  // 5D10
+    JS_BUTTON8,  // 5D11
+    JS_BUTTON9,  // 5D12
+    JS_BUTTON10, // 5D13
+    JS_BUTTON11, // 5D14
+    JS_BUTTON12, // 5D15
+    JS_BUTTON13, // 5D16
+    JS_BUTTON14, // 5D17
+    JS_BUTTON15, // 5D18
+    JS_BUTTON16, // 5D19
+    JS_BUTTON17, // 5D1A
+    JS_BUTTON18, // 5D1B
+    JS_BUTTON19, // 5D1C
+    JS_BUTTON20, // 5D1D
+    JS_BUTTON21, // 5D1E
+    JS_BUTTON22, // 5D1F
+    JS_BUTTON23, // 5D20
+    JS_BUTTON24, // 5D21
+    JS_BUTTON25, // 5D22
+    JS_BUTTON26, // 5D23
+    JS_BUTTON27, // 5D24
+    JS_BUTTON28, // 5D25
+    JS_BUTTON29, // 5D26
+    JS_BUTTON30, // 5D27
+    JS_BUTTON31, // 5D28
 
     // Leader Key
-    KC_LEAD,  // 5D29
+    KC_LEAD, // 5D29
 
     // Bluetooth: output selection (continued)
-    OUT_BT,  // 5D2A
+    OUT_BT, // 5D2A
 
     // Lock Key
-    KC_LOCK,  // 5D2B
+    KC_LOCK, // 5D2B
 
     // Terminal
-    TERM_ON,   // 5D2C
-    TERM_OFF,  // 5D2D
+    TERM_ON,  // 5D2C
+    TERM_OFF, // 5D2D
 
     // Sequencer
-    SQ_ON,   // 5D2E
-    SQ_OFF,  // 5D2F
-    SQ_TOG,  // 5D30
+    SQ_ON,  // 5D2E
+    SQ_OFF, // 5D2F
+    SQ_TOG, // 5D30
 
-    SQ_TMPD,  // 5D31
-    SQ_TMPU,  // 5D32
+    SQ_TMPD, // 5D31
+    SQ_TMPU, // 5D32
 
-    SQ_RESD,  // 5D33
-    SQ_RESU,  // 5D34
+    SQ_RESD, // 5D33
+    SQ_RESU, // 5D34
 
-    SQ_SALL,  // 5D35
-    SQ_SCLR,  // 5D36
+    SQ_SALL, // 5D35
+    SQ_SCLR, // 5D36
 
-    SEQUENCER_STEP_MIN,  // 5D37
+    SEQUENCER_STEP_MIN, // 5D37
     SEQUENCER_STEP_MAX = SEQUENCER_STEP_MIN + SEQUENCER_STEPS,
 
     SEQUENCER_RESOLUTION_MIN,
@@ -636,69 +636,69 @@ enum quantum_keycodes {
 #define MOD_MEH 0x7
 
 // US ANSI shifted keycode aliases
-#define KC_TILDE LSFT(KC_GRAVE)  // ~
+#define KC_TILDE LSFT(KC_GRAVE) // ~
 #define KC_TILD KC_TILDE
 
-#define KC_EXCLAIM LSFT(KC_1)  // !
+#define KC_EXCLAIM LSFT(KC_1) // !
 #define KC_EXLM KC_EXCLAIM
 
-#define KC_AT LSFT(KC_2)  // @
+#define KC_AT LSFT(KC_2) // @
 
-#define KC_HASH LSFT(KC_3)  // #
+#define KC_HASH LSFT(KC_3) // #
 
-#define KC_DOLLAR LSFT(KC_4)  // $
+#define KC_DOLLAR LSFT(KC_4) // $
 #define KC_DLR KC_DOLLAR
 
-#define KC_PERCENT LSFT(KC_5)  // %
+#define KC_PERCENT LSFT(KC_5) // %
 #define KC_PERC KC_PERCENT
 
-#define KC_CIRCUMFLEX LSFT(KC_6)  // ^
+#define KC_CIRCUMFLEX LSFT(KC_6) // ^
 #define KC_CIRC KC_CIRCUMFLEX
 
-#define KC_AMPERSAND LSFT(KC_7)  // &
+#define KC_AMPERSAND LSFT(KC_7) // &
 #define KC_AMPR KC_AMPERSAND
 
-#define KC_ASTERISK LSFT(KC_8)  // *
+#define KC_ASTERISK LSFT(KC_8) // *
 #define KC_ASTR KC_ASTERISK
 
-#define KC_LEFT_PAREN LSFT(KC_9)  // (
+#define KC_LEFT_PAREN LSFT(KC_9) // (
 #define KC_LPRN KC_LEFT_PAREN
 
-#define KC_RIGHT_PAREN LSFT(KC_0)  // )
+#define KC_RIGHT_PAREN LSFT(KC_0) // )
 #define KC_RPRN KC_RIGHT_PAREN
 
-#define KC_UNDERSCORE LSFT(KC_MINUS)  // _
+#define KC_UNDERSCORE LSFT(KC_MINUS) // _
 #define KC_UNDS KC_UNDERSCORE
 
-#define KC_PLUS LSFT(KC_EQUAL)  // +
+#define KC_PLUS LSFT(KC_EQUAL) // +
 
-#define KC_LEFT_CURLY_BRACE LSFT(KC_LEFT_BRACKET)  // {
+#define KC_LEFT_CURLY_BRACE LSFT(KC_LEFT_BRACKET) // {
 #define KC_LCBR KC_LEFT_CURLY_BRACE
 
-#define KC_RIGHT_CURLY_BRACE LSFT(KC_RIGHT_BRACKET)  // }
+#define KC_RIGHT_CURLY_BRACE LSFT(KC_RIGHT_BRACKET) // }
 #define KC_RCBR KC_RIGHT_CURLY_BRACE
 
-#define KC_LEFT_ANGLE_BRACKET LSFT(KC_COMMA)  // <
+#define KC_LEFT_ANGLE_BRACKET LSFT(KC_COMMA) // <
 #define KC_LABK KC_LEFT_ANGLE_BRACKET
 #define KC_LT KC_LEFT_ANGLE_BRACKET
 
-#define KC_RIGHT_ANGLE_BRACKET LSFT(KC_DOT)  // >
+#define KC_RIGHT_ANGLE_BRACKET LSFT(KC_DOT) // >
 #define KC_RABK KC_RIGHT_ANGLE_BRACKET
 #define KC_GT KC_RIGHT_ANGLE_BRACKET
 
-#define KC_COLON LSFT(KC_SEMICOLON)  // :
+#define KC_COLON LSFT(KC_SEMICOLON) // :
 #define KC_COLN KC_COLON
 
-#define KC_PIPE LSFT(KC_BACKSLASH)  // |
+#define KC_PIPE LSFT(KC_BACKSLASH) // |
 
-#define KC_QUESTION LSFT(KC_SLASH)  // ?
+#define KC_QUESTION LSFT(KC_SLASH) // ?
 #define KC_QUES KC_QUESTION
 
-#define KC_DOUBLE_QUOTE LSFT(KC_QUOTE)  // "
+#define KC_DOUBLE_QUOTE LSFT(KC_QUOTE) // "
 #define KC_DQUO KC_DOUBLE_QUOTE
 #define KC_DQT KC_DOUBLE_QUOTE
 
-#define KC_DELT KC_DELETE  // Del key (four letter code)
+#define KC_DELT KC_DELETE // Del key (four letter code)
 
 // Modified keycode aliases
 #define C(kc) LCTL(kc)
@@ -841,22 +841,22 @@ enum quantum_keycodes {
 #define CMD_T(kc) LCMD_T(kc)
 #define WIN_T(kc) LWIN_T(kc)
 
-#define C_S_T(kc) MT(MOD_LCTL | MOD_LSFT, kc)                         // Left Control + Shift e.g. for gnome-terminal
-#define MEH_T(kc) MT(MOD_LCTL | MOD_LSFT | MOD_LALT, kc)              // Meh is a less hyper version of the Hyper key -- doesn't include GUI, so just Left Control + Shift + Alt
-#define LCAG_T(kc) MT(MOD_LCTL | MOD_LALT | MOD_LGUI, kc)             // Left Control + Alt + GUI
-#define RCAG_T(kc) MT(MOD_RCTL | MOD_RALT | MOD_RGUI, kc)             // Right Control + Alt + GUI
-#define HYPR_T(kc) MT(MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI, kc)  // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/
-#define LSG_T(kc) MT(MOD_LSFT | MOD_LGUI, kc)                         // Left Shift + GUI
+#define C_S_T(kc) MT(MOD_LCTL | MOD_LSFT, kc)                        // Left Control + Shift e.g. for gnome-terminal
+#define MEH_T(kc) MT(MOD_LCTL | MOD_LSFT | MOD_LALT, kc)             // Meh is a less hyper version of the Hyper key -- doesn't include GUI, so just Left Control + Shift + Alt
+#define LCAG_T(kc) MT(MOD_LCTL | MOD_LALT | MOD_LGUI, kc)            // Left Control + Alt + GUI
+#define RCAG_T(kc) MT(MOD_RCTL | MOD_RALT | MOD_RGUI, kc)            // Right Control + Alt + GUI
+#define HYPR_T(kc) MT(MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI, kc) // see http://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/
+#define LSG_T(kc) MT(MOD_LSFT | MOD_LGUI, kc)                        // Left Shift + GUI
 #define SGUI_T(kc) LSG_T(kc)
 #define SCMD_T(kc) LSG_T(kc)
 #define SWIN_T(kc) LSG_T(kc)
-#define LAG_T(kc) MT(MOD_LALT | MOD_LGUI, kc)  // Left Alt + GUI
-#define RSG_T(kc) MT(MOD_RSFT | MOD_RGUI, kc)  // Right Shift + GUI
-#define RAG_T(kc) MT(MOD_RALT | MOD_RGUI, kc)  // Right Alt + GUI
-#define LCA_T(kc) MT(MOD_LCTL | MOD_LALT, kc)  // Left Control + Alt
-#define LSA_T(kc) MT(MOD_LSFT | MOD_LALT, kc)  // Left Shift + Alt
-#define RSA_T(kc) MT(MOD_RSFT | MOD_RALT, kc)  // Right Shift + Alt
-#define RCS_T(kc) MT(MOD_RCTL | MOD_RSFT, kc)  // Right Control + Shift
+#define LAG_T(kc) MT(MOD_LALT | MOD_LGUI, kc) // Left Alt + GUI
+#define RSG_T(kc) MT(MOD_RSFT | MOD_RGUI, kc) // Right Shift + GUI
+#define RAG_T(kc) MT(MOD_RALT | MOD_RGUI, kc) // Right Alt + GUI
+#define LCA_T(kc) MT(MOD_LCTL | MOD_LALT, kc) // Left Control + Alt
+#define LSA_T(kc) MT(MOD_LSFT | MOD_LALT, kc) // Left Shift + Alt
+#define RSA_T(kc) MT(MOD_RSFT | MOD_RALT, kc) // Right Shift + Alt
+#define RCS_T(kc) MT(MOD_RCTL | MOD_RSFT, kc) // Right Control + Shift
 #define SAGR_T(kc) RSA_T(kc)
 
 #define ALL_T(kc) HYPR_T(kc)
@@ -870,14 +870,14 @@ enum quantum_keycodes {
 #define UC(c) (QK_UNICODE | (c))
 // UNICODEMAP_ENABLE - Allows Unicode input up to 0x10FFFF, requires unicode_map
 #define X(i) (QK_UNICODEMAP | (i))
-#define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7))  // 127 max i and j
+#define XP(i, j) (QK_UNICODEMAP_PAIR | ((i)&0x7F) | (((j)&0x7F) << 7)) // 127 max i and j
 
 #define UC_MOD UNICODE_MODE_FORWARD
 #define UC_RMOD UNICODE_MODE_REVERSE
 
 #define UC_M_MA UNICODE_MODE_MAC
-#define UNICODE_MODE_OSX UNICODE_MODE_MAC  // Deprecated alias
-#define UC_M_OS UNICODE_MODE_MAC           // Deprecated alias
+#define UNICODE_MODE_OSX UNICODE_MODE_MAC // Deprecated alias
+#define UC_M_OS UNICODE_MODE_MAC          // Deprecated alias
 #define UC_M_LN UNICODE_MODE_LNX
 #define UC_M_WI UNICODE_MODE_WIN
 #define UC_M_BS UNICODE_MODE_BSD
diff --git a/quantum/rgb_matrix/animations/alpha_mods_anim.h b/quantum/rgb_matrix/animations/alpha_mods_anim.h
index d6136f1ba4..59b8381d69 100644
--- a/quantum/rgb_matrix/animations/alpha_mods_anim.h
+++ b/quantum/rgb_matrix/animations/alpha_mods_anim.h
@@ -22,5 +22,5 @@ bool ALPHAS_MODS(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_ALPHAS_MODS
diff --git a/quantum/rgb_matrix/animations/breathing_anim.h b/quantum/rgb_matrix/animations/breathing_anim.h
index 29187e1543..e9a3c96e1b 100644
--- a/quantum/rgb_matrix/animations/breathing_anim.h
+++ b/quantum/rgb_matrix/animations/breathing_anim.h
@@ -16,5 +16,5 @@ bool BREATHING(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BREATHING
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BREATHING
diff --git a/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h b/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h
index 0375d4937d..06aa8b5ed5 100644
--- a/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h
+++ b/quantum/rgb_matrix/animations/colorband_pinwheel_sat_anim.h
@@ -7,7 +7,9 @@ static HSV BAND_PINWHEEL_SAT_math(HSV hsv, int16_t dx, int16_t dy, uint8_t time)
     return hsv;
 }
 
-bool BAND_PINWHEEL_SAT(effect_params_t* params) { return effect_runner_dx_dy(params, &BAND_PINWHEEL_SAT_math); }
+bool BAND_PINWHEEL_SAT(effect_params_t* params) {
+    return effect_runner_dx_dy(params, &BAND_PINWHEEL_SAT_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
diff --git a/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h b/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h
index e40bf4cd1f..bcbc319498 100644
--- a/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h
+++ b/quantum/rgb_matrix/animations/colorband_pinwheel_val_anim.h
@@ -7,7 +7,9 @@ static HSV BAND_PINWHEEL_VAL_math(HSV hsv, int16_t dx, int16_t dy, uint8_t time)
     return hsv;
 }
 
-bool BAND_PINWHEEL_VAL(effect_params_t* params) { return effect_runner_dx_dy(params, &BAND_PINWHEEL_VAL_math); }
+bool BAND_PINWHEEL_VAL(effect_params_t* params) {
+    return effect_runner_dx_dy(params, &BAND_PINWHEEL_VAL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
diff --git a/quantum/rgb_matrix/animations/colorband_sat_anim.h b/quantum/rgb_matrix/animations/colorband_sat_anim.h
index 1c4f7de575..cb0897ad3e 100644
--- a/quantum/rgb_matrix/animations/colorband_sat_anim.h
+++ b/quantum/rgb_matrix/animations/colorband_sat_anim.h
@@ -8,7 +8,9 @@ static HSV BAND_SAT_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool BAND_SAT(effect_params_t* params) { return effect_runner_i(params, &BAND_SAT_math); }
+bool BAND_SAT(effect_params_t* params) {
+    return effect_runner_i(params, &BAND_SAT_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BAND_SAT
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BAND_SAT
diff --git a/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h b/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h
index cdd02b3797..d26eb37855 100644
--- a/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h
+++ b/quantum/rgb_matrix/animations/colorband_spiral_sat_anim.h
@@ -7,7 +7,9 @@ static HSV BAND_SPIRAL_SAT_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, u
     return hsv;
 }
 
-bool BAND_SPIRAL_SAT(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_SAT_math); }
+bool BAND_SPIRAL_SAT(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_SAT_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
diff --git a/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h b/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h
index e1331eaebe..3ae34bb6f0 100644
--- a/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h
+++ b/quantum/rgb_matrix/animations/colorband_spiral_val_anim.h
@@ -7,7 +7,9 @@ static HSV BAND_SPIRAL_VAL_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, u
     return hsv;
 }
 
-bool BAND_SPIRAL_VAL(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_VAL_math); }
+bool BAND_SPIRAL_VAL(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &BAND_SPIRAL_VAL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
diff --git a/quantum/rgb_matrix/animations/colorband_val_anim.h b/quantum/rgb_matrix/animations/colorband_val_anim.h
index 02ee4add67..69c29f53a3 100644
--- a/quantum/rgb_matrix/animations/colorband_val_anim.h
+++ b/quantum/rgb_matrix/animations/colorband_val_anim.h
@@ -8,7 +8,9 @@ static HSV BAND_VAL_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool BAND_VAL(effect_params_t* params) { return effect_runner_i(params, &BAND_VAL_math); }
+bool BAND_VAL(effect_params_t* params) {
+    return effect_runner_i(params, &BAND_VAL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_BAND_VAL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_BAND_VAL
diff --git a/quantum/rgb_matrix/animations/cycle_all_anim.h b/quantum/rgb_matrix/animations/cycle_all_anim.h
index 3b73b9d385..d8c7220d95 100644
--- a/quantum/rgb_matrix/animations/cycle_all_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_all_anim.h
@@ -7,7 +7,9 @@ static HSV CYCLE_ALL_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool CYCLE_ALL(effect_params_t* params) { return effect_runner_i(params, &CYCLE_ALL_math); }
+bool CYCLE_ALL(effect_params_t* params) {
+    return effect_runner_i(params, &CYCLE_ALL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_ALL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_ALL
diff --git a/quantum/rgb_matrix/animations/cycle_left_right_anim.h b/quantum/rgb_matrix/animations/cycle_left_right_anim.h
index bf6a574069..84c2127aff 100644
--- a/quantum/rgb_matrix/animations/cycle_left_right_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_left_right_anim.h
@@ -7,7 +7,9 @@ static HSV CYCLE_LEFT_RIGHT_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool CYCLE_LEFT_RIGHT(effect_params_t* params) { return effect_runner_i(params, &CYCLE_LEFT_RIGHT_math); }
+bool CYCLE_LEFT_RIGHT(effect_params_t* params) {
+    return effect_runner_i(params, &CYCLE_LEFT_RIGHT_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
diff --git a/quantum/rgb_matrix/animations/cycle_out_in_anim.h b/quantum/rgb_matrix/animations/cycle_out_in_anim.h
index 2bdb9d9375..9513fe9593 100644
--- a/quantum/rgb_matrix/animations/cycle_out_in_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_out_in_anim.h
@@ -7,7 +7,9 @@ static HSV CYCLE_OUT_IN_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint
     return hsv;
 }
 
-bool CYCLE_OUT_IN(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &CYCLE_OUT_IN_math); }
+bool CYCLE_OUT_IN(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &CYCLE_OUT_IN_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_OUT_IN
diff --git a/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h b/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h
index 51979c44fe..3cca45f27a 100644
--- a/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_out_in_dual_anim.h
@@ -9,7 +9,9 @@ static HSV CYCLE_OUT_IN_DUAL_math(HSV hsv, int16_t dx, int16_t dy, uint8_t time)
     return hsv;
 }
 
-bool CYCLE_OUT_IN_DUAL(effect_params_t* params) { return effect_runner_dx_dy(params, &CYCLE_OUT_IN_DUAL_math); }
+bool CYCLE_OUT_IN_DUAL(effect_params_t* params) {
+    return effect_runner_dx_dy(params, &CYCLE_OUT_IN_DUAL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
diff --git a/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h b/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h
index 10ba2b7c2c..de5993992c 100644
--- a/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_pinwheel_anim.h
@@ -7,7 +7,9 @@ static HSV CYCLE_PINWHEEL_math(HSV hsv, int16_t dx, int16_t dy, uint8_t time) {
     return hsv;
 }
 
-bool CYCLE_PINWHEEL(effect_params_t* params) { return effect_runner_dx_dy(params, &CYCLE_PINWHEEL_math); }
+bool CYCLE_PINWHEEL(effect_params_t* params) {
+    return effect_runner_dx_dy(params, &CYCLE_PINWHEEL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
diff --git a/quantum/rgb_matrix/animations/cycle_spiral_anim.h b/quantum/rgb_matrix/animations/cycle_spiral_anim.h
index 482c7e7da6..904450179e 100644
--- a/quantum/rgb_matrix/animations/cycle_spiral_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_spiral_anim.h
@@ -7,7 +7,9 @@ static HSV CYCLE_SPIRAL_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint
     return hsv;
 }
 
-bool CYCLE_SPIRAL(effect_params_t* params) { return effect_runner_dx_dy_dist(params, &CYCLE_SPIRAL_math); }
+bool CYCLE_SPIRAL(effect_params_t* params) {
+    return effect_runner_dx_dy_dist(params, &CYCLE_SPIRAL_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_SPIRAL
diff --git a/quantum/rgb_matrix/animations/cycle_up_down_anim.h b/quantum/rgb_matrix/animations/cycle_up_down_anim.h
index 277edccb2f..dce05fecff 100644
--- a/quantum/rgb_matrix/animations/cycle_up_down_anim.h
+++ b/quantum/rgb_matrix/animations/cycle_up_down_anim.h
@@ -7,7 +7,9 @@ static HSV CYCLE_UP_DOWN_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool CYCLE_UP_DOWN(effect_params_t* params) { return effect_runner_i(params, &CYCLE_UP_DOWN_math); }
+bool CYCLE_UP_DOWN(effect_params_t* params) {
+    return effect_runner_i(params, &CYCLE_UP_DOWN_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
diff --git a/quantum/rgb_matrix/animations/digital_rain_anim.h b/quantum/rgb_matrix/animations/digital_rain_anim.h
index 8ce8fd7039..4633145ff6 100644
--- a/quantum/rgb_matrix/animations/digital_rain_anim.h
+++ b/quantum/rgb_matrix/animations/digital_rain_anim.h
@@ -71,5 +71,5 @@ bool DIGITAL_RAIN(effect_params_t* params) {
     return false;
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(ENABLE_RGB_MATRIX_DIGITAL_RAIN)
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && !defined(ENABLE_RGB_MATRIX_DIGITAL_RAIN)
diff --git a/quantum/rgb_matrix/animations/dual_beacon_anim.h b/quantum/rgb_matrix/animations/dual_beacon_anim.h
index dbe9b3ecf1..5585015b86 100644
--- a/quantum/rgb_matrix/animations/dual_beacon_anim.h
+++ b/quantum/rgb_matrix/animations/dual_beacon_anim.h
@@ -7,7 +7,9 @@ static HSV DUAL_BEACON_math(HSV hsv, int8_t sin, int8_t cos, uint8_t i, uint8_t
     return hsv;
 }
 
-bool DUAL_BEACON(effect_params_t* params) { return effect_runner_sin_cos_i(params, &DUAL_BEACON_math); }
+bool DUAL_BEACON(effect_params_t* params) {
+    return effect_runner_sin_cos_i(params, &DUAL_BEACON_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_DUAL_BEACON
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_DUAL_BEACON
diff --git a/quantum/rgb_matrix/animations/gradient_left_right_anim.h b/quantum/rgb_matrix/animations/gradient_left_right_anim.h
index 8bb5e570bd..ebb06f59f2 100644
--- a/quantum/rgb_matrix/animations/gradient_left_right_anim.h
+++ b/quantum/rgb_matrix/animations/gradient_left_right_anim.h
@@ -18,5 +18,5 @@ bool GRADIENT_LEFT_RIGHT(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
diff --git a/quantum/rgb_matrix/animations/gradient_up_down_anim.h b/quantum/rgb_matrix/animations/gradient_up_down_anim.h
index a5674583e3..febc3919a8 100644
--- a/quantum/rgb_matrix/animations/gradient_up_down_anim.h
+++ b/quantum/rgb_matrix/animations/gradient_up_down_anim.h
@@ -18,5 +18,5 @@ bool GRADIENT_UP_DOWN(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
diff --git a/quantum/rgb_matrix/animations/hue_breathing_anim.h b/quantum/rgb_matrix/animations/hue_breathing_anim.h
index 82be1a4424..8537762832 100644
--- a/quantum/rgb_matrix/animations/hue_breathing_anim.h
+++ b/quantum/rgb_matrix/animations/hue_breathing_anim.h
@@ -18,5 +18,5 @@ bool HUE_BREATHING(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // DISABLE_RGB_HUE_BREATHING
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // DISABLE_RGB_HUE_BREATHING
diff --git a/quantum/rgb_matrix/animations/hue_pendulum_anim.h b/quantum/rgb_matrix/animations/hue_pendulum_anim.h
index a6e1c1074d..7d8cbcdfb2 100644
--- a/quantum/rgb_matrix/animations/hue_pendulum_anim.h
+++ b/quantum/rgb_matrix/animations/hue_pendulum_anim.h
@@ -11,7 +11,9 @@ static HSV HUE_PENDULUM_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool HUE_PENDULUM(effect_params_t* params) { return effect_runner_i(params, &HUE_PENDULUM_math); }
+bool HUE_PENDULUM(effect_params_t* params) {
+    return effect_runner_i(params, &HUE_PENDULUM_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // DISABLE_RGB_HUE_PENDULUM
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // DISABLE_RGB_HUE_PENDULUM
diff --git a/quantum/rgb_matrix/animations/hue_wave_anim.h b/quantum/rgb_matrix/animations/hue_wave_anim.h
index b1c72b7336..81aa7e139e 100644
--- a/quantum/rgb_matrix/animations/hue_wave_anim.h
+++ b/quantum/rgb_matrix/animations/hue_wave_anim.h
@@ -11,7 +11,9 @@ static HSV HUE_WAVE_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool HUE_WAVE(effect_params_t* params) { return effect_runner_i(params, &HUE_WAVE_math); }
+bool HUE_WAVE(effect_params_t* params) {
+    return effect_runner_i(params, &HUE_WAVE_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // DISABLE_RGB_HUE_WAVE
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // DISABLE_RGB_HUE_WAVE
diff --git a/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h b/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
index 3ffb57eb35..31dffcbc5a 100644
--- a/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
+++ b/quantum/rgb_matrix/animations/jellybean_raindrops_anim.h
@@ -25,5 +25,5 @@ bool JELLYBEAN_RAINDROPS(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
diff --git a/quantum/rgb_matrix/animations/pixel_flow_anim.h b/quantum/rgb_matrix/animations/pixel_flow_anim.h
index 312c87628c..714f5d174e 100644
--- a/quantum/rgb_matrix/animations/pixel_flow_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_flow_anim.h
@@ -14,7 +14,9 @@ static bool PIXEL_FLOW(effect_params_t* params) {
         return false;
     }
 
-    inline uint32_t interval(void) { return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16); }
+    inline uint32_t interval(void) {
+        return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
+    }
 
     if (params->init) {
         // Clear LEDs and fill the state array
@@ -45,5 +47,5 @@ static bool PIXEL_FLOW(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_PIXEL_FLOW
diff --git a/quantum/rgb_matrix/animations/pixel_fractal_anim.h b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
index 35187b92de..906da1a48e 100644
--- a/quantum/rgb_matrix/animations/pixel_fractal_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_fractal_anim.h
@@ -29,7 +29,9 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
         return false;
     }
 
-    inline uint32_t interval(void) { return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16); }
+    inline uint32_t interval(void) {
+        return 3000 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
+    }
 
     if (params->init) {
         rgb_matrix_set_color_all(0, 0, 0);
@@ -37,7 +39,7 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
 
     RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv);
     for (uint8_t h = 0; h < MATRIX_ROWS; ++h) {
-        for (uint8_t l = 0; l < MID_COL - 1; ++l) {  // Light and move left columns outwards
+        for (uint8_t l = 0; l < MID_COL - 1; ++l) { // Light and move left columns outwards
             if (led[h][l]) {
                 rgb_matrix_set_color(g_led_config.matrix_co[h][l], rgb.r, rgb.g, rgb.b);
             } else {
@@ -46,7 +48,7 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
             led[h][l] = led[h][l + 1];
         }
 
-        for (uint8_t r = MATRIX_COLS - 1; r > MID_COL; --r) {  // Light and move right columns outwards
+        for (uint8_t r = MATRIX_COLS - 1; r > MID_COL; --r) { // Light and move right columns outwards
             if (led[h][r]) {
                 rgb_matrix_set_color(g_led_config.matrix_co[h][r], rgb.r, rgb.g, rgb.b);
             } else {
@@ -74,5 +76,5 @@ static bool PIXEL_FRACTAL(effect_params_t* params) {
     wait_timer = g_rgb_timer + interval();
     return false;
 }
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_PIXEL_FRACTAL
diff --git a/quantum/rgb_matrix/animations/pixel_rain_anim.h b/quantum/rgb_matrix/animations/pixel_rain_anim.h
index 001649aa6e..03488b43df 100644
--- a/quantum/rgb_matrix/animations/pixel_rain_anim.h
+++ b/quantum/rgb_matrix/animations/pixel_rain_anim.h
@@ -24,7 +24,9 @@ static bool PIXEL_RAIN(effect_params_t* params) {
         return false;
     }
 
-    inline uint32_t interval(void) { return 500 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16); }
+    inline uint32_t interval(void) {
+        return 500 / scale16by8(qadd8(rgb_matrix_config.speed, 16), 16);
+    }
 
     bool rain_pixel(uint8_t i, effect_params_t * params, bool off) {
         if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) {
@@ -44,5 +46,5 @@ static bool PIXEL_RAIN(effect_params_t* params) {
     return rain_pixel(mod8(random8(), DRIVER_LED_TOTAL), params, random8() & 2);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_PIXEL_RAIN
diff --git a/quantum/rgb_matrix/animations/rainbow_beacon_anim.h b/quantum/rgb_matrix/animations/rainbow_beacon_anim.h
index cd529958db..bdcca5530f 100644
--- a/quantum/rgb_matrix/animations/rainbow_beacon_anim.h
+++ b/quantum/rgb_matrix/animations/rainbow_beacon_anim.h
@@ -7,7 +7,9 @@ static HSV RAINBOW_BEACON_math(HSV hsv, int8_t sin, int8_t cos, uint8_t i, uint8
     return hsv;
 }
 
-bool RAINBOW_BEACON(effect_params_t* params) { return effect_runner_sin_cos_i(params, &RAINBOW_BEACON_math); }
+bool RAINBOW_BEACON(effect_params_t* params) {
+    return effect_runner_sin_cos_i(params, &RAINBOW_BEACON_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_RAINBOW_BEACON
diff --git a/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h b/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h
index 2f3de64e9d..f7b8f6c2f3 100644
--- a/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h
+++ b/quantum/rgb_matrix/animations/rainbow_moving_chevron_anim.h
@@ -7,7 +7,9 @@ static HSV RAINBOW_MOVING_CHEVRON_math(HSV hsv, uint8_t i, uint8_t time) {
     return hsv;
 }
 
-bool RAINBOW_MOVING_CHEVRON(effect_params_t* params) { return effect_runner_i(params, &RAINBOW_MOVING_CHEVRON_math); }
+bool RAINBOW_MOVING_CHEVRON(effect_params_t* params) {
+    return effect_runner_i(params, &RAINBOW_MOVING_CHEVRON_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
diff --git a/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h b/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h
index dae2b5d190..91e31ea8cc 100644
--- a/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h
+++ b/quantum/rgb_matrix/animations/rainbow_pinwheels_anim.h
@@ -7,7 +7,9 @@ static HSV RAINBOW_PINWHEELS_math(HSV hsv, int8_t sin, int8_t cos, uint8_t i, ui
     return hsv;
 }
 
-bool RAINBOW_PINWHEELS(effect_params_t* params) { return effect_runner_sin_cos_i(params, &RAINBOW_PINWHEELS_math); }
+bool RAINBOW_PINWHEELS(effect_params_t* params) {
+    return effect_runner_sin_cos_i(params, &RAINBOW_PINWHEELS_math);
+}
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
diff --git a/quantum/rgb_matrix/animations/raindrops_anim.h b/quantum/rgb_matrix/animations/raindrops_anim.h
index 4b1b9dd9ec..2d4b53b7b0 100644
--- a/quantum/rgb_matrix/animations/raindrops_anim.h
+++ b/quantum/rgb_matrix/animations/raindrops_anim.h
@@ -35,5 +35,5 @@ bool RAINDROPS(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // ENABLE_RGB_MATRIX_RAINDROPS
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // ENABLE_RGB_MATRIX_RAINDROPS
diff --git a/quantum/rgb_matrix/animations/runners/effect_runner_reactive.h b/quantum/rgb_matrix/animations/runners/effect_runner_reactive.h
index d5c1a26cef..f9584d7071 100644
--- a/quantum/rgb_matrix/animations/runners/effect_runner_reactive.h
+++ b/quantum/rgb_matrix/animations/runners/effect_runner_reactive.h
@@ -26,4 +26,4 @@ bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/runners/effect_runner_reactive_splash.h b/quantum/rgb_matrix/animations/runners/effect_runner_reactive_splash.h
index d3a6e4e72f..41020eb47f 100644
--- a/quantum/rgb_matrix/animations/runners/effect_runner_reactive_splash.h
+++ b/quantum/rgb_matrix/animations/runners/effect_runner_reactive_splash.h
@@ -26,4 +26,4 @@ bool effect_runner_reactive_splash(uint8_t start, effect_params_t* params, react
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/solid_color_anim.h b/quantum/rgb_matrix/animations/solid_color_anim.h
index 4209959468..c8762dcbc2 100644
--- a/quantum/rgb_matrix/animations/solid_color_anim.h
+++ b/quantum/rgb_matrix/animations/solid_color_anim.h
@@ -12,4 +12,4 @@ bool SOLID_COLOR(effect_params_t* params) {
     return rgb_matrix_check_finished_leds(led_max);
 }
 
-#endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/quantum/rgb_matrix/animations/solid_reactive_anim.h b/quantum/rgb_matrix/animations/solid_reactive_anim.h
index 360d05a67a..d3a7ebbdf7 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_anim.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_anim.h
@@ -8,8 +8,10 @@ static HSV SOLID_REACTIVE_math(HSV hsv, uint16_t offset) {
     return hsv;
 }
 
-bool SOLID_REACTIVE(effect_params_t* params) { return effect_runner_reactive(params, &SOLID_REACTIVE_math); }
+bool SOLID_REACTIVE(effect_params_t* params) {
+    return effect_runner_reactive(params, &SOLID_REACTIVE_math);
+}
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/solid_reactive_cross.h b/quantum/rgb_matrix/animations/solid_reactive_cross.h
index 496651f8a5..043a369b73 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_cross.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_cross.h
@@ -24,13 +24,17 @@ static HSV SOLID_REACTIVE_CROSS_math(HSV hsv, int16_t dx, int16_t dy, uint8_t di
 }
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-bool SOLID_REACTIVE_CROSS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math); }
+bool SOLID_REACTIVE_CROSS(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_CROSS_math);
+}
 #            endif
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math); }
+bool SOLID_REACTIVE_MULTICROSS(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_CROSS_math);
+}
 #            endif
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS)
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS) || defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS)
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/solid_reactive_nexus.h b/quantum/rgb_matrix/animations/solid_reactive_nexus.h
index 3562e74a72..8d62a49fea 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_nexus.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_nexus.h
@@ -22,13 +22,17 @@ static HSV SOLID_REACTIVE_NEXUS_math(HSV hsv, int16_t dx, int16_t dy, uint8_t di
 }
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-bool SOLID_REACTIVE_NEXUS(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math); }
+bool SOLID_REACTIVE_NEXUS(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_NEXUS_math);
+}
 #            endif
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math); }
+bool SOLID_REACTIVE_MULTINEXUS(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_NEXUS_math);
+}
 #            endif
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS) || !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS)
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS) || !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS)
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h b/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h
index 69189f636b..0d0a424cf3 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_simple_anim.h
@@ -8,8 +8,10 @@ static HSV SOLID_REACTIVE_SIMPLE_math(HSV hsv, uint16_t offset) {
     return hsv;
 }
 
-bool SOLID_REACTIVE_SIMPLE(effect_params_t* params) { return effect_runner_reactive(params, &SOLID_REACTIVE_SIMPLE_math); }
+bool SOLID_REACTIVE_SIMPLE(effect_params_t* params) {
+    return effect_runner_reactive(params, &SOLID_REACTIVE_SIMPLE_math);
+}
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/solid_reactive_wide.h b/quantum/rgb_matrix/animations/solid_reactive_wide.h
index a613c7ff5f..7598796316 100644
--- a/quantum/rgb_matrix/animations/solid_reactive_wide.h
+++ b/quantum/rgb_matrix/animations/solid_reactive_wide.h
@@ -19,13 +19,17 @@ static HSV SOLID_REACTIVE_WIDE_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dis
 }
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-bool SOLID_REACTIVE_WIDE(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math); }
+bool SOLID_REACTIVE_WIDE(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_REACTIVE_WIDE_math);
+}
 #            endif
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math); }
+bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_REACTIVE_WIDE_math);
+}
 #            endif
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE) || !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE)
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE) || !defined(ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE)
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/solid_splash_anim.h b/quantum/rgb_matrix/animations/solid_splash_anim.h
index bd9c1cfe2b..77d6f8c5eb 100644
--- a/quantum/rgb_matrix/animations/solid_splash_anim.h
+++ b/quantum/rgb_matrix/animations/solid_splash_anim.h
@@ -19,13 +19,17 @@ HSV SOLID_SPLASH_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint16_t ti
 }
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_SPLASH
-bool SOLID_SPLASH(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_SPLASH_math); }
+bool SOLID_SPLASH(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SOLID_SPLASH_math);
+}
 #            endif
 
 #            ifdef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-bool SOLID_MULTISPLASH(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SOLID_SPLASH_math); }
+bool SOLID_MULTISPLASH(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SOLID_SPLASH_math);
+}
 #            endif
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_RGB_MATRIX_SPLASH) && !defined(ENABLE_RGB_MATRIX_MULTISPLASH)
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // !defined(ENABLE_RGB_MATRIX_SPLASH) && !defined(ENABLE_RGB_MATRIX_MULTISPLASH)
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/splash_anim.h b/quantum/rgb_matrix/animations/splash_anim.h
index 382355e9ed..06459e1b0a 100644
--- a/quantum/rgb_matrix/animations/splash_anim.h
+++ b/quantum/rgb_matrix/animations/splash_anim.h
@@ -20,13 +20,17 @@ HSV SPLASH_math(HSV hsv, int16_t dx, int16_t dy, uint8_t dist, uint16_t tick) {
 }
 
 #            ifdef ENABLE_RGB_MATRIX_SPLASH
-bool SPLASH(effect_params_t* params) { return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SPLASH_math); }
+bool SPLASH(effect_params_t* params) {
+    return effect_runner_reactive_splash(qsub8(g_last_hit_tracker.count, 1), params, &SPLASH_math);
+}
 #            endif
 
 #            ifdef ENABLE_RGB_MATRIX_MULTISPLASH
-bool MULTISPLASH(effect_params_t* params) { return effect_runner_reactive_splash(0, params, &SPLASH_math); }
+bool MULTISPLASH(effect_params_t* params) {
+    return effect_runner_reactive_splash(0, params, &SPLASH_math);
+}
 #            endif
 
-#        endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_RGB_MATRIX_SPLASH) || !defined(ENABLE_RGB_MATRIX_MULTISPLASH)
-#endif          // RGB_MATRIX_KEYREACTIVE_ENABLED
+#        endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#    endif     // !defined(ENABLE_RGB_MATRIX_SPLASH) || !defined(ENABLE_RGB_MATRIX_MULTISPLASH)
+#endif         // RGB_MATRIX_KEYREACTIVE_ENABLED
diff --git a/quantum/rgb_matrix/animations/typing_heatmap_anim.h b/quantum/rgb_matrix/animations/typing_heatmap_anim.h
index b66667b9b8..f3a94280c0 100644
--- a/quantum/rgb_matrix/animations/typing_heatmap_anim.h
+++ b/quantum/rgb_matrix/animations/typing_heatmap_anim.h
@@ -82,5 +82,5 @@ bool TYPING_HEATMAP(effect_params_t* params) {
     return led_max < sizeof(g_rgb_frame_buffer);
 }
 
-#    endif  // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
-#endif      // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
+#    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+#endif     // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index 5a4556f097..f721dfc7f2 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -31,7 +31,9 @@ const led_point_t k_rgb_matrix_center = {112, 32};
 const led_point_t k_rgb_matrix_center = RGB_MATRIX_CENTER;
 #endif
 
-__attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv); }
+__attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) {
+    return hsv_to_rgb(hsv);
+}
 
 // Generic effect runners
 #include "rgb_matrix_runners.inc"
@@ -109,14 +111,14 @@ __attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv
 #endif
 
 // globals
-rgb_config_t rgb_matrix_config;  // TODO: would like to prefix this with g_ for global consistancy, do this in another pr
+rgb_config_t rgb_matrix_config; // TODO: would like to prefix this with g_ for global consistancy, do this in another pr
 uint32_t     g_rgb_timer;
 #ifdef RGB_MATRIX_FRAMEBUFFER_EFFECTS
 uint8_t g_rgb_frame_buffer[MATRIX_ROWS][MATRIX_COLS] = {{0}};
-#endif  // RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#endif // RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
 last_hit_t g_last_hit_tracker;
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
 // internals
 static bool            suspend_state     = false;
@@ -126,13 +128,13 @@ static effect_params_t rgb_effect_params = {0, LED_FLAG_ALL, false};
 static rgb_task_states rgb_task_state    = SYNCING;
 #if RGB_DISABLE_TIMEOUT > 0
 static uint32_t rgb_anykey_timer;
-#endif  // RGB_DISABLE_TIMEOUT > 0
+#endif // RGB_DISABLE_TIMEOUT > 0
 
 // double buffers
 static uint32_t rgb_timer_buffer;
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
 static last_hit_t last_hit_buffer;
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
 // split rgb matrix
 #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
@@ -141,7 +143,9 @@ const uint8_t k_rgb_matrix_split[2] = RGB_MATRIX_SPLIT;
 
 EECONFIG_DEBOUNCE_HELPER(rgb_matrix, EECONFIG_RGB_MATRIX, rgb_matrix_config);
 
-void eeconfig_update_rgb_matrix(void) { eeconfig_flush_rgb_matrix(true); }
+void eeconfig_update_rgb_matrix(void) {
+    eeconfig_flush_rgb_matrix(true);
+}
 
 void eeconfig_update_rgb_matrix_default(void) {
     dprintf("eeconfig_update_rgb_matrix_default\n");
@@ -168,13 +172,15 @@ void rgb_matrix_reload_from_eeprom(void) {
     rgb_matrix_disable_noeeprom();
     /* Reset back to what we have in eeprom */
     eeconfig_init_rgb_matrix();
-    eeconfig_debug_rgb_matrix();  // display current eeprom values
+    eeconfig_debug_rgb_matrix(); // display current eeprom values
     if (rgb_matrix_config.enable) {
         rgb_matrix_mode_noeeprom(rgb_matrix_config.mode);
     }
 }
 
-__attribute__((weak)) uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) { return 0; }
+__attribute__((weak)) uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) {
+    return 0;
+}
 
 uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i) {
     uint8_t led_count = rgb_matrix_map_row_column_to_led_kb(row, column, led_i);
@@ -186,13 +192,18 @@ uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *l
     return led_count;
 }
 
-void rgb_matrix_update_pwm_buffers(void) { rgb_matrix_driver.flush(); }
+void rgb_matrix_update_pwm_buffers(void) {
+    rgb_matrix_driver.flush();
+}
 
-void rgb_matrix_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { rgb_matrix_driver.set_color(index, red, green, blue); }
+void rgb_matrix_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
+    rgb_matrix_driver.set_color(index, red, green, blue);
+}
 
 void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue) {
 #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
-    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) rgb_matrix_set_color(i, red, green, blue);
+    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++)
+        rgb_matrix_set_color(i, red, green, blue);
 #else
     rgb_matrix_driver.set_color_all(red, green, blue);
 #endif
@@ -204,7 +215,7 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
 #endif
 #if RGB_DISABLE_TIMEOUT > 0
     rgb_anykey_timer = 0;
-#endif  // RGB_DISABLE_TIMEOUT > 0
+#endif // RGB_DISABLE_TIMEOUT > 0
 
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
     uint8_t led[LED_HITS_TO_REMEMBER];
@@ -214,7 +225,7 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
     if (!pressed)
 #    elif defined(RGB_MATRIX_KEYPRESSES)
     if (pressed)
-#    endif  // defined(RGB_MATRIX_KEYRELEASES)
+#    endif // defined(RGB_MATRIX_KEYRELEASES)
     {
         led_count = rgb_matrix_map_row_column_to_led(row, col, led);
     }
@@ -222,7 +233,7 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
     if (last_hit_buffer.count + led_count > LED_HITS_TO_REMEMBER) {
         memcpy(&last_hit_buffer.x[0], &last_hit_buffer.x[led_count], LED_HITS_TO_REMEMBER - led_count);
         memcpy(&last_hit_buffer.y[0], &last_hit_buffer.y[led_count], LED_HITS_TO_REMEMBER - led_count);
-        memcpy(&last_hit_buffer.tick[0], &last_hit_buffer.tick[led_count], (LED_HITS_TO_REMEMBER - led_count) * 2);  // 16 bit
+        memcpy(&last_hit_buffer.tick[0], &last_hit_buffer.tick[led_count], (LED_HITS_TO_REMEMBER - led_count) * 2); // 16 bit
         memcpy(&last_hit_buffer.index[0], &last_hit_buffer.index[led_count], LED_HITS_TO_REMEMBER - led_count);
         last_hit_buffer.count = LED_HITS_TO_REMEMBER - led_count;
     }
@@ -235,13 +246,13 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {
         last_hit_buffer.tick[index]  = 0;
         last_hit_buffer.count++;
     }
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
 #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
     if (rgb_matrix_config.mode == RGB_MATRIX_TYPING_HEATMAP) {
         process_rgb_matrix_typing_heatmap(row, col);
     }
-#endif  // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
+#endif // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)
 }
 
 void rgb_matrix_test(void) {
@@ -280,7 +291,7 @@ static bool rgb_matrix_none(effect_params_t *params) {
 static void rgb_task_timers(void) {
 #if defined(RGB_MATRIX_KEYREACTIVE_ENABLED) || RGB_DISABLE_TIMEOUT > 0
     uint32_t deltaTime = sync_timer_elapsed32(rgb_timer_buffer);
-#endif  // defined(RGB_MATRIX_KEYREACTIVE_ENABLED) || RGB_DISABLE_TIMEOUT > 0
+#endif // defined(RGB_MATRIX_KEYREACTIVE_ENABLED) || RGB_DISABLE_TIMEOUT > 0
     rgb_timer_buffer = sync_timer_read32();
 
     // Update double buffer timers
@@ -288,7 +299,7 @@ static void rgb_task_timers(void) {
     if (rgb_anykey_timer + deltaTime <= UINT32_MAX) {
         rgb_anykey_timer += deltaTime;
     }
-#endif  // RGB_DISABLE_TIMEOUT > 0
+#endif // RGB_DISABLE_TIMEOUT > 0
 
     // Update double buffer last hit timers
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
@@ -300,7 +311,7 @@ static void rgb_task_timers(void) {
         }
         last_hit_buffer.tick[i] += deltaTime;
     }
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 }
 
 static void rgb_task_sync(void) {
@@ -317,7 +328,7 @@ static void rgb_task_start(void) {
     g_rgb_timer = rgb_timer_buffer;
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
     g_last_hit_tracker = last_hit_buffer;
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
     // next task
     rgb_task_state = RENDERING;
@@ -403,7 +414,7 @@ void rgb_matrix_task(void) {
     bool suspend_backlight = suspend_state ||
 #if RGB_DISABLE_TIMEOUT > 0
                              (rgb_anykey_timer > (uint32_t)RGB_DISABLE_TIMEOUT) ||
-#endif  // RGB_DISABLE_TIMEOUT > 0
+#endif // RGB_DISABLE_TIMEOUT > 0
                              false;
 
     uint8_t effect = suspend_backlight || !rgb_matrix_config.enable ? 0 : rgb_matrix_config.mode;
@@ -472,7 +483,7 @@ void rgb_matrix_init(void) {
     for (uint8_t i = 0; i < LED_HITS_TO_REMEMBER; ++i) {
         last_hit_buffer.tick[i] = UINT16_MAX;
     }
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
     if (!eeconfig_is_enabled()) {
         dprintf("rgb_matrix_init_drivers eeconfig is not enabled.\n");
@@ -485,20 +496,22 @@ void rgb_matrix_init(void) {
         dprintf("rgb_matrix_init_drivers rgb_matrix_config.mode = 0. Write default values to EEPROM.\n");
         eeconfig_update_rgb_matrix_default();
     }
-    eeconfig_debug_rgb_matrix();  // display current eeprom values
+    eeconfig_debug_rgb_matrix(); // display current eeprom values
 }
 
 void rgb_matrix_set_suspend_state(bool state) {
 #ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
-    if (state && !suspend_state) {  // only run if turning off, and only once
-        rgb_task_render(0);         // turn off all LEDs when suspending
-        rgb_task_flush(0);          // and actually flash led state to LEDs
+    if (state && !suspend_state) { // only run if turning off, and only once
+        rgb_task_render(0);        // turn off all LEDs when suspending
+        rgb_task_flush(0);         // and actually flash led state to LEDs
     }
     suspend_state = state;
 #endif
 }
 
-bool rgb_matrix_get_suspend_state(void) { return suspend_state; }
+bool rgb_matrix_get_suspend_state(void) {
+    return suspend_state;
+}
 
 void rgb_matrix_toggle_eeprom_helper(bool write_to_eeprom) {
     rgb_matrix_config.enable ^= 1;
@@ -506,8 +519,12 @@ void rgb_matrix_toggle_eeprom_helper(bool write_to_eeprom) {
     eeconfig_flag_rgb_matrix(write_to_eeprom);
     dprintf("rgb matrix toggle [%s]: rgb_matrix_config.enable = %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", rgb_matrix_config.enable);
 }
-void rgb_matrix_toggle_noeeprom(void) { rgb_matrix_toggle_eeprom_helper(false); }
-void rgb_matrix_toggle(void) { rgb_matrix_toggle_eeprom_helper(true); }
+void rgb_matrix_toggle_noeeprom(void) {
+    rgb_matrix_toggle_eeprom_helper(false);
+}
+void rgb_matrix_toggle(void) {
+    rgb_matrix_toggle_eeprom_helper(true);
+}
 
 void rgb_matrix_enable(void) {
     rgb_matrix_enable_noeeprom();
@@ -529,7 +546,9 @@ void rgb_matrix_disable_noeeprom(void) {
     rgb_matrix_config.enable = 0;
 }
 
-uint8_t rgb_matrix_is_enabled(void) { return rgb_matrix_config.enable; }
+uint8_t rgb_matrix_is_enabled(void) {
+    return rgb_matrix_config.enable;
+}
 
 void rgb_matrix_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
     if (!rgb_matrix_config.enable) {
@@ -546,24 +565,38 @@ void rgb_matrix_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
     eeconfig_flag_rgb_matrix(write_to_eeprom);
     dprintf("rgb matrix mode [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", rgb_matrix_config.mode);
 }
-void rgb_matrix_mode_noeeprom(uint8_t mode) { rgb_matrix_mode_eeprom_helper(mode, false); }
-void rgb_matrix_mode(uint8_t mode) { rgb_matrix_mode_eeprom_helper(mode, true); }
+void rgb_matrix_mode_noeeprom(uint8_t mode) {
+    rgb_matrix_mode_eeprom_helper(mode, false);
+}
+void rgb_matrix_mode(uint8_t mode) {
+    rgb_matrix_mode_eeprom_helper(mode, true);
+}
 
-uint8_t rgb_matrix_get_mode(void) { return rgb_matrix_config.mode; }
+uint8_t rgb_matrix_get_mode(void) {
+    return rgb_matrix_config.mode;
+}
 
 void rgb_matrix_step_helper(bool write_to_eeprom) {
     uint8_t mode = rgb_matrix_config.mode + 1;
     rgb_matrix_mode_eeprom_helper((mode < RGB_MATRIX_EFFECT_MAX) ? mode : 1, write_to_eeprom);
 }
-void rgb_matrix_step_noeeprom(void) { rgb_matrix_step_helper(false); }
-void rgb_matrix_step(void) { rgb_matrix_step_helper(true); }
+void rgb_matrix_step_noeeprom(void) {
+    rgb_matrix_step_helper(false);
+}
+void rgb_matrix_step(void) {
+    rgb_matrix_step_helper(true);
+}
 
 void rgb_matrix_step_reverse_helper(bool write_to_eeprom) {
     uint8_t mode = rgb_matrix_config.mode - 1;
     rgb_matrix_mode_eeprom_helper((mode < 1) ? RGB_MATRIX_EFFECT_MAX - 1 : mode, write_to_eeprom);
 }
-void rgb_matrix_step_reverse_noeeprom(void) { rgb_matrix_step_reverse_helper(false); }
-void rgb_matrix_step_reverse(void) { rgb_matrix_step_reverse_helper(true); }
+void rgb_matrix_step_reverse_noeeprom(void) {
+    rgb_matrix_step_reverse_helper(false);
+}
+void rgb_matrix_step_reverse(void) {
+    rgb_matrix_step_reverse_helper(true);
+}
 
 void rgb_matrix_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, bool write_to_eeprom) {
     if (!rgb_matrix_config.enable) {
@@ -575,56 +608,126 @@ void rgb_matrix_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, boo
     eeconfig_flag_rgb_matrix(write_to_eeprom);
     dprintf("rgb matrix set hsv [%s]: %u,%u,%u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v);
 }
-void rgb_matrix_sethsv_noeeprom(uint16_t hue, uint8_t sat, uint8_t val) { rgb_matrix_sethsv_eeprom_helper(hue, sat, val, false); }
-void rgb_matrix_sethsv(uint16_t hue, uint8_t sat, uint8_t val) { rgb_matrix_sethsv_eeprom_helper(hue, sat, val, true); }
+void rgb_matrix_sethsv_noeeprom(uint16_t hue, uint8_t sat, uint8_t val) {
+    rgb_matrix_sethsv_eeprom_helper(hue, sat, val, false);
+}
+void rgb_matrix_sethsv(uint16_t hue, uint8_t sat, uint8_t val) {
+    rgb_matrix_sethsv_eeprom_helper(hue, sat, val, true);
+}
 
-HSV     rgb_matrix_get_hsv(void) { return rgb_matrix_config.hsv; }
-uint8_t rgb_matrix_get_hue(void) { return rgb_matrix_config.hsv.h; }
-uint8_t rgb_matrix_get_sat(void) { return rgb_matrix_config.hsv.s; }
-uint8_t rgb_matrix_get_val(void) { return rgb_matrix_config.hsv.v; }
+HSV rgb_matrix_get_hsv(void) {
+    return rgb_matrix_config.hsv;
+}
+uint8_t rgb_matrix_get_hue(void) {
+    return rgb_matrix_config.hsv.h;
+}
+uint8_t rgb_matrix_get_sat(void) {
+    return rgb_matrix_config.hsv.s;
+}
+uint8_t rgb_matrix_get_val(void) {
+    return rgb_matrix_config.hsv.v;
+}
 
-void rgb_matrix_increase_hue_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h + RGB_MATRIX_HUE_STEP, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v, write_to_eeprom); }
-void rgb_matrix_increase_hue_noeeprom(void) { rgb_matrix_increase_hue_helper(false); }
-void rgb_matrix_increase_hue(void) { rgb_matrix_increase_hue_helper(true); }
+void rgb_matrix_increase_hue_helper(bool write_to_eeprom) {
+    rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h + RGB_MATRIX_HUE_STEP, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v, write_to_eeprom);
+}
+void rgb_matrix_increase_hue_noeeprom(void) {
+    rgb_matrix_increase_hue_helper(false);
+}
+void rgb_matrix_increase_hue(void) {
+    rgb_matrix_increase_hue_helper(true);
+}
 
-void rgb_matrix_decrease_hue_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h - RGB_MATRIX_HUE_STEP, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v, write_to_eeprom); }
-void rgb_matrix_decrease_hue_noeeprom(void) { rgb_matrix_decrease_hue_helper(false); }
-void rgb_matrix_decrease_hue(void) { rgb_matrix_decrease_hue_helper(true); }
+void rgb_matrix_decrease_hue_helper(bool write_to_eeprom) {
+    rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h - RGB_MATRIX_HUE_STEP, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v, write_to_eeprom);
+}
+void rgb_matrix_decrease_hue_noeeprom(void) {
+    rgb_matrix_decrease_hue_helper(false);
+}
+void rgb_matrix_decrease_hue(void) {
+    rgb_matrix_decrease_hue_helper(true);
+}
 
-void rgb_matrix_increase_sat_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, qadd8(rgb_matrix_config.hsv.s, RGB_MATRIX_SAT_STEP), rgb_matrix_config.hsv.v, write_to_eeprom); }
-void rgb_matrix_increase_sat_noeeprom(void) { rgb_matrix_increase_sat_helper(false); }
-void rgb_matrix_increase_sat(void) { rgb_matrix_increase_sat_helper(true); }
+void rgb_matrix_increase_sat_helper(bool write_to_eeprom) {
+    rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, qadd8(rgb_matrix_config.hsv.s, RGB_MATRIX_SAT_STEP), rgb_matrix_config.hsv.v, write_to_eeprom);
+}
+void rgb_matrix_increase_sat_noeeprom(void) {
+    rgb_matrix_increase_sat_helper(false);
+}
+void rgb_matrix_increase_sat(void) {
+    rgb_matrix_increase_sat_helper(true);
+}
 
-void rgb_matrix_decrease_sat_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, qsub8(rgb_matrix_config.hsv.s, RGB_MATRIX_SAT_STEP), rgb_matrix_config.hsv.v, write_to_eeprom); }
-void rgb_matrix_decrease_sat_noeeprom(void) { rgb_matrix_decrease_sat_helper(false); }
-void rgb_matrix_decrease_sat(void) { rgb_matrix_decrease_sat_helper(true); }
+void rgb_matrix_decrease_sat_helper(bool write_to_eeprom) {
+    rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, qsub8(rgb_matrix_config.hsv.s, RGB_MATRIX_SAT_STEP), rgb_matrix_config.hsv.v, write_to_eeprom);
+}
+void rgb_matrix_decrease_sat_noeeprom(void) {
+    rgb_matrix_decrease_sat_helper(false);
+}
+void rgb_matrix_decrease_sat(void) {
+    rgb_matrix_decrease_sat_helper(true);
+}
 
-void rgb_matrix_increase_val_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, qadd8(rgb_matrix_config.hsv.v, RGB_MATRIX_VAL_STEP), write_to_eeprom); }
-void rgb_matrix_increase_val_noeeprom(void) { rgb_matrix_increase_val_helper(false); }
-void rgb_matrix_increase_val(void) { rgb_matrix_increase_val_helper(true); }
+void rgb_matrix_increase_val_helper(bool write_to_eeprom) {
+    rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, qadd8(rgb_matrix_config.hsv.v, RGB_MATRIX_VAL_STEP), write_to_eeprom);
+}
+void rgb_matrix_increase_val_noeeprom(void) {
+    rgb_matrix_increase_val_helper(false);
+}
+void rgb_matrix_increase_val(void) {
+    rgb_matrix_increase_val_helper(true);
+}
 
-void rgb_matrix_decrease_val_helper(bool write_to_eeprom) { rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, qsub8(rgb_matrix_config.hsv.v, RGB_MATRIX_VAL_STEP), write_to_eeprom); }
-void rgb_matrix_decrease_val_noeeprom(void) { rgb_matrix_decrease_val_helper(false); }
-void rgb_matrix_decrease_val(void) { rgb_matrix_decrease_val_helper(true); }
+void rgb_matrix_decrease_val_helper(bool write_to_eeprom) {
+    rgb_matrix_sethsv_eeprom_helper(rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, qsub8(rgb_matrix_config.hsv.v, RGB_MATRIX_VAL_STEP), write_to_eeprom);
+}
+void rgb_matrix_decrease_val_noeeprom(void) {
+    rgb_matrix_decrease_val_helper(false);
+}
+void rgb_matrix_decrease_val(void) {
+    rgb_matrix_decrease_val_helper(true);
+}
 
 void rgb_matrix_set_speed_eeprom_helper(uint8_t speed, bool write_to_eeprom) {
     rgb_matrix_config.speed = speed;
     eeconfig_flag_rgb_matrix(write_to_eeprom);
     dprintf("rgb matrix set speed [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", rgb_matrix_config.speed);
 }
-void rgb_matrix_set_speed_noeeprom(uint8_t speed) { rgb_matrix_set_speed_eeprom_helper(speed, false); }
-void rgb_matrix_set_speed(uint8_t speed) { rgb_matrix_set_speed_eeprom_helper(speed, true); }
+void rgb_matrix_set_speed_noeeprom(uint8_t speed) {
+    rgb_matrix_set_speed_eeprom_helper(speed, false);
+}
+void rgb_matrix_set_speed(uint8_t speed) {
+    rgb_matrix_set_speed_eeprom_helper(speed, true);
+}
 
-uint8_t rgb_matrix_get_speed(void) { return rgb_matrix_config.speed; }
+uint8_t rgb_matrix_get_speed(void) {
+    return rgb_matrix_config.speed;
+}
 
-void rgb_matrix_increase_speed_helper(bool write_to_eeprom) { rgb_matrix_set_speed_eeprom_helper(qadd8(rgb_matrix_config.speed, RGB_MATRIX_SPD_STEP), write_to_eeprom); }
-void rgb_matrix_increase_speed_noeeprom(void) { rgb_matrix_increase_speed_helper(false); }
-void rgb_matrix_increase_speed(void) { rgb_matrix_increase_speed_helper(true); }
+void rgb_matrix_increase_speed_helper(bool write_to_eeprom) {
+    rgb_matrix_set_speed_eeprom_helper(qadd8(rgb_matrix_config.speed, RGB_MATRIX_SPD_STEP), write_to_eeprom);
+}
+void rgb_matrix_increase_speed_noeeprom(void) {
+    rgb_matrix_increase_speed_helper(false);
+}
+void rgb_matrix_increase_speed(void) {
+    rgb_matrix_increase_speed_helper(true);
+}
 
-void rgb_matrix_decrease_speed_helper(bool write_to_eeprom) { rgb_matrix_set_speed_eeprom_helper(qsub8(rgb_matrix_config.speed, RGB_MATRIX_SPD_STEP), write_to_eeprom); }
-void rgb_matrix_decrease_speed_noeeprom(void) { rgb_matrix_decrease_speed_helper(false); }
-void rgb_matrix_decrease_speed(void) { rgb_matrix_decrease_speed_helper(true); }
+void rgb_matrix_decrease_speed_helper(bool write_to_eeprom) {
+    rgb_matrix_set_speed_eeprom_helper(qsub8(rgb_matrix_config.speed, RGB_MATRIX_SPD_STEP), write_to_eeprom);
+}
+void rgb_matrix_decrease_speed_noeeprom(void) {
+    rgb_matrix_decrease_speed_helper(false);
+}
+void rgb_matrix_decrease_speed(void) {
+    rgb_matrix_decrease_speed_helper(true);
+}
 
-led_flags_t rgb_matrix_get_flags(void) { return rgb_matrix_config.flags; }
+led_flags_t rgb_matrix_get_flags(void) {
+    return rgb_matrix_config.flags;
+}
 
-void rgb_matrix_set_flags(led_flags_t flags) { rgb_matrix_config.flags = flags; }
+void rgb_matrix_set_flags(led_flags_t flags) {
+    rgb_matrix_config.flags = flags;
+}
diff --git a/quantum/rgb_matrix/rgb_matrix_types.h b/quantum/rgb_matrix/rgb_matrix_types.h
index df575d6577..d0ac4e4466 100644
--- a/quantum/rgb_matrix/rgb_matrix_types.h
+++ b/quantum/rgb_matrix/rgb_matrix_types.h
@@ -37,7 +37,7 @@
 // Last led hit
 #ifndef LED_HITS_TO_REMEMBER
 #    define LED_HITS_TO_REMEMBER 8
-#endif  // LED_HITS_TO_REMEMBER
+#endif // LED_HITS_TO_REMEMBER
 
 #ifdef RGB_MATRIX_KEYREACTIVE_ENABLED
 typedef struct PACKED {
@@ -47,7 +47,7 @@ typedef struct PACKED {
     uint8_t  index[LED_HITS_TO_REMEMBER];
     uint16_t tick[LED_HITS_TO_REMEMBER];
 } last_hit_t;
-#endif  // RGB_MATRIX_KEYREACTIVE_ENABLED
+#endif // RGB_MATRIX_KEYREACTIVE_ENABLED
 
 typedef enum rgb_task_states { STARTING, RENDERING, FLUSHING, SYNCING } rgb_task_states;
 
@@ -88,7 +88,7 @@ typedef union {
         uint8_t     enable : 2;
         uint8_t     mode : 6;
         HSV         hsv;
-        uint8_t     speed;  // EECONFIG needs to be increased to support this
+        uint8_t     speed; // EECONFIG needs to be increased to support this
         led_flags_t flags;
     };
 } rgb_config_t;
diff --git a/quantum/rgblight/rgblight.c b/quantum/rgblight/rgblight.c
index 148dae78f4..8f933a6e51 100644
--- a/quantum/rgblight/rgblight.c
+++ b/quantum/rgblight/rgblight.c
@@ -72,7 +72,7 @@ static uint8_t static_effect_table[] = {
 #define _RGBM_TMP_STATIC(sym, msym) RGBLIGHT_MODE_##msym,
 #define _RGBM_TMP_DYNAMIC(sym, msym) RGBLIGHT_MODE_##msym,
 static uint8_t mode_base_table[] = {
-    0,  // RGBLIGHT_MODE_zero
+    0, // RGBLIGHT_MODE_zero
 #include "rgblight_modes.h"
 };
 
@@ -96,7 +96,9 @@ static uint8_t mode_base_table[] = {
 #    define RGBLIGHT_DEFAULT_SPD 0
 #endif
 
-static inline int is_static_effect(uint8_t mode) { return memchr(static_effect_table, mode, sizeof(static_effect_table)) != NULL; }
+static inline int is_static_effect(uint8_t mode) {
+    return memchr(static_effect_table, mode, sizeof(static_effect_table)) != NULL;
+}
 
 #ifdef RGBLIGHT_LED_MAP
 const uint8_t led_map[] PROGMEM = RGBLIGHT_LED_MAP;
@@ -143,7 +145,9 @@ void rgblight_set_effect_range(uint8_t start_pos, uint8_t num_leds) {
     rgblight_ranges.effect_num_leds  = num_leds;
 }
 
-__attribute__((weak)) RGB rgblight_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv); }
+__attribute__((weak)) RGB rgblight_hsv_to_rgb(HSV hsv) {
+    return hsv_to_rgb(hsv);
+}
 
 void sethsv_raw(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) {
     HSV hsv = {hue, sat, val};
@@ -151,7 +155,9 @@ void sethsv_raw(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) {
     setrgb(rgb.r, rgb.g, rgb.b, led1);
 }
 
-void sethsv(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) { sethsv_raw(hue, sat, val > RGBLIGHT_LIMIT_VAL ? RGBLIGHT_LIMIT_VAL : val, led1); }
+void sethsv(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) {
+    sethsv_raw(hue, sat, val > RGBLIGHT_LIMIT_VAL ? RGBLIGHT_LIMIT_VAL : val, led1);
+}
 
 void setrgb(uint8_t r, uint8_t g, uint8_t b, LED_TYPE *led1) {
     led1->r = r;
@@ -191,7 +197,9 @@ void eeconfig_update_rgblight(uint32_t val) {
 #endif
 }
 
-void eeconfig_update_rgblight_current(void) { eeconfig_update_rgblight(rgblight_config.raw); }
+void eeconfig_update_rgblight_current(void) {
+    eeconfig_update_rgblight(rgblight_config.raw);
+}
 
 void eeconfig_update_rgblight_default(void) {
     rgblight_config.enable = 1;
@@ -238,9 +246,9 @@ void rgblight_init(void) {
     }
     rgblight_check_config();
 
-    eeconfig_debug_rgblight();  // display current eeprom values
+    eeconfig_debug_rgblight(); // display current eeprom values
 
-    rgblight_timer_init();  // setup the timer
+    rgblight_timer_init(); // setup the timer
 
     if (rgblight_config.enable) {
         rgblight_mode_noeeprom(rgblight_config.mode);
@@ -254,13 +262,15 @@ void rgblight_reload_from_eeprom(void) {
     rgblight_config.raw = eeconfig_read_rgblight();
     RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS;
     rgblight_check_config();
-    eeconfig_debug_rgblight();  // display current eeprom values
+    eeconfig_debug_rgblight(); // display current eeprom values
     if (rgblight_config.enable) {
         rgblight_mode_noeeprom(rgblight_config.mode);
     }
 }
 
-uint32_t rgblight_read_dword(void) { return rgblight_config.raw; }
+uint32_t rgblight_read_dword(void) {
+    return rgblight_config.raw;
+}
 
 void rgblight_update_dword(uint32_t dword) {
     RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS;
@@ -296,8 +306,12 @@ void rgblight_step_helper(bool write_to_eeprom) {
     }
     rgblight_mode_eeprom_helper(mode, write_to_eeprom);
 }
-void rgblight_step_noeeprom(void) { rgblight_step_helper(false); }
-void rgblight_step(void) { rgblight_step_helper(true); }
+void rgblight_step_noeeprom(void) {
+    rgblight_step_helper(false);
+}
+void rgblight_step(void) {
+    rgblight_step_helper(true);
+}
 void rgblight_step_reverse_helper(bool write_to_eeprom) {
     uint8_t mode = 0;
     mode         = rgblight_config.mode - 1;
@@ -306,8 +320,12 @@ void rgblight_step_reverse_helper(bool write_to_eeprom) {
     }
     rgblight_mode_eeprom_helper(mode, write_to_eeprom);
 }
-void rgblight_step_reverse_noeeprom(void) { rgblight_step_reverse_helper(false); }
-void rgblight_step_reverse(void) { rgblight_step_reverse_helper(true); }
+void rgblight_step_reverse_noeeprom(void) {
+    rgblight_step_reverse_helper(false);
+}
+void rgblight_step_reverse(void) {
+    rgblight_step_reverse_helper(true);
+}
 
 uint8_t rgblight_get_mode(void) {
     if (!rgblight_config.enable) {
@@ -346,9 +364,13 @@ void rgblight_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
     rgblight_sethsv_noeeprom(rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
 }
 
-void rgblight_mode(uint8_t mode) { rgblight_mode_eeprom_helper(mode, true); }
+void rgblight_mode(uint8_t mode) {
+    rgblight_mode_eeprom_helper(mode, true);
+}
 
-void rgblight_mode_noeeprom(uint8_t mode) { rgblight_mode_eeprom_helper(mode, false); }
+void rgblight_mode_noeeprom(uint8_t mode) {
+    rgblight_mode_eeprom_helper(mode, false);
+}
 
 void rgblight_toggle(void) {
     dprintf("rgblight toggle [EEPROM]: rgblight_config.enable = %u\n", !rgblight_config.enable);
@@ -401,64 +423,98 @@ void rgblight_disable_noeeprom(void) {
     rgblight_set();
 }
 
-bool rgblight_is_enabled(void) { return rgblight_config.enable; }
+bool rgblight_is_enabled(void) {
+    return rgblight_config.enable;
+}
 
 void rgblight_increase_hue_helper(bool write_to_eeprom) {
     uint8_t hue = rgblight_config.hue + RGBLIGHT_HUE_STEP;
     rgblight_sethsv_eeprom_helper(hue, rgblight_config.sat, rgblight_config.val, write_to_eeprom);
 }
-void rgblight_increase_hue_noeeprom(void) { rgblight_increase_hue_helper(false); }
-void rgblight_increase_hue(void) { rgblight_increase_hue_helper(true); }
+void rgblight_increase_hue_noeeprom(void) {
+    rgblight_increase_hue_helper(false);
+}
+void rgblight_increase_hue(void) {
+    rgblight_increase_hue_helper(true);
+}
 void rgblight_decrease_hue_helper(bool write_to_eeprom) {
     uint8_t hue = rgblight_config.hue - RGBLIGHT_HUE_STEP;
     rgblight_sethsv_eeprom_helper(hue, rgblight_config.sat, rgblight_config.val, write_to_eeprom);
 }
-void rgblight_decrease_hue_noeeprom(void) { rgblight_decrease_hue_helper(false); }
-void rgblight_decrease_hue(void) { rgblight_decrease_hue_helper(true); }
+void rgblight_decrease_hue_noeeprom(void) {
+    rgblight_decrease_hue_helper(false);
+}
+void rgblight_decrease_hue(void) {
+    rgblight_decrease_hue_helper(true);
+}
 void rgblight_increase_sat_helper(bool write_to_eeprom) {
     uint8_t sat = qadd8(rgblight_config.sat, RGBLIGHT_SAT_STEP);
     rgblight_sethsv_eeprom_helper(rgblight_config.hue, sat, rgblight_config.val, write_to_eeprom);
 }
-void rgblight_increase_sat_noeeprom(void) { rgblight_increase_sat_helper(false); }
-void rgblight_increase_sat(void) { rgblight_increase_sat_helper(true); }
+void rgblight_increase_sat_noeeprom(void) {
+    rgblight_increase_sat_helper(false);
+}
+void rgblight_increase_sat(void) {
+    rgblight_increase_sat_helper(true);
+}
 void rgblight_decrease_sat_helper(bool write_to_eeprom) {
     uint8_t sat = qsub8(rgblight_config.sat, RGBLIGHT_SAT_STEP);
     rgblight_sethsv_eeprom_helper(rgblight_config.hue, sat, rgblight_config.val, write_to_eeprom);
 }
-void rgblight_decrease_sat_noeeprom(void) { rgblight_decrease_sat_helper(false); }
-void rgblight_decrease_sat(void) { rgblight_decrease_sat_helper(true); }
+void rgblight_decrease_sat_noeeprom(void) {
+    rgblight_decrease_sat_helper(false);
+}
+void rgblight_decrease_sat(void) {
+    rgblight_decrease_sat_helper(true);
+}
 void rgblight_increase_val_helper(bool write_to_eeprom) {
     uint8_t val = qadd8(rgblight_config.val, RGBLIGHT_VAL_STEP);
     rgblight_sethsv_eeprom_helper(rgblight_config.hue, rgblight_config.sat, val, write_to_eeprom);
 }
-void rgblight_increase_val_noeeprom(void) { rgblight_increase_val_helper(false); }
-void rgblight_increase_val(void) { rgblight_increase_val_helper(true); }
+void rgblight_increase_val_noeeprom(void) {
+    rgblight_increase_val_helper(false);
+}
+void rgblight_increase_val(void) {
+    rgblight_increase_val_helper(true);
+}
 void rgblight_decrease_val_helper(bool write_to_eeprom) {
     uint8_t val = qsub8(rgblight_config.val, RGBLIGHT_VAL_STEP);
     rgblight_sethsv_eeprom_helper(rgblight_config.hue, rgblight_config.sat, val, write_to_eeprom);
 }
-void rgblight_decrease_val_noeeprom(void) { rgblight_decrease_val_helper(false); }
-void rgblight_decrease_val(void) { rgblight_decrease_val_helper(true); }
+void rgblight_decrease_val_noeeprom(void) {
+    rgblight_decrease_val_helper(false);
+}
+void rgblight_decrease_val(void) {
+    rgblight_decrease_val_helper(true);
+}
 
 void rgblight_increase_speed_helper(bool write_to_eeprom) {
     if (rgblight_config.speed < 3) rgblight_config.speed++;
     // RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED?
     if (write_to_eeprom) {
-        eeconfig_update_rgblight(rgblight_config.raw);  // EECONFIG needs to be increased to support this
+        eeconfig_update_rgblight(rgblight_config.raw); // EECONFIG needs to be increased to support this
     }
 }
-void rgblight_increase_speed(void) { rgblight_increase_speed_helper(true); }
-void rgblight_increase_speed_noeeprom(void) { rgblight_increase_speed_helper(false); }
+void rgblight_increase_speed(void) {
+    rgblight_increase_speed_helper(true);
+}
+void rgblight_increase_speed_noeeprom(void) {
+    rgblight_increase_speed_helper(false);
+}
 
 void rgblight_decrease_speed_helper(bool write_to_eeprom) {
     if (rgblight_config.speed > 0) rgblight_config.speed--;
     // RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED??
     if (write_to_eeprom) {
-        eeconfig_update_rgblight(rgblight_config.raw);  // EECONFIG needs to be increased to support this
+        eeconfig_update_rgblight(rgblight_config.raw); // EECONFIG needs to be increased to support this
     }
 }
-void rgblight_decrease_speed(void) { rgblight_decrease_speed_helper(true); }
-void rgblight_decrease_speed_noeeprom(void) { rgblight_decrease_speed_helper(false); }
+void rgblight_decrease_speed(void) {
+    rgblight_decrease_speed_helper(true);
+}
+void rgblight_decrease_speed_noeeprom(void) {
+    rgblight_decrease_speed_helper(false);
+}
 
 void rgblight_sethsv_noeeprom_old(uint8_t hue, uint8_t sat, uint8_t val) {
     if (rgblight_config.enable) {
@@ -478,7 +534,7 @@ void rgblight_sethsv_eeprom_helper(uint8_t hue, uint8_t sat, uint8_t val, bool w
             rgblight_setrgb(tmp_led.r, tmp_led.g, tmp_led.b);
         } else {
             // all LEDs in same color
-            if (1 == 0) {  // dummy
+            if (1 == 0) { // dummy
             }
 #ifdef RGBLIGHT_EFFECT_BREATHING
             else if (rgblight_status.base_mode == RGBLIGHT_MODE_BREATHING) {
@@ -540,33 +596,51 @@ void rgblight_sethsv_eeprom_helper(uint8_t hue, uint8_t sat, uint8_t val, bool w
     }
 }
 
-void rgblight_sethsv(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_sethsv_eeprom_helper(hue, sat, val, true); }
+void rgblight_sethsv(uint8_t hue, uint8_t sat, uint8_t val) {
+    rgblight_sethsv_eeprom_helper(hue, sat, val, true);
+}
 
-void rgblight_sethsv_noeeprom(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_sethsv_eeprom_helper(hue, sat, val, false); }
+void rgblight_sethsv_noeeprom(uint8_t hue, uint8_t sat, uint8_t val) {
+    rgblight_sethsv_eeprom_helper(hue, sat, val, false);
+}
 
-uint8_t rgblight_get_speed(void) { return rgblight_config.speed; }
+uint8_t rgblight_get_speed(void) {
+    return rgblight_config.speed;
+}
 
 void rgblight_set_speed_eeprom_helper(uint8_t speed, bool write_to_eeprom) {
     rgblight_config.speed = speed;
     if (write_to_eeprom) {
-        eeconfig_update_rgblight(rgblight_config.raw);  // EECONFIG needs to be increased to support this
+        eeconfig_update_rgblight(rgblight_config.raw); // EECONFIG needs to be increased to support this
         dprintf("rgblight set speed [EEPROM]: %u\n", rgblight_config.speed);
     } else {
         dprintf("rgblight set speed [NOEEPROM]: %u\n", rgblight_config.speed);
     }
 }
 
-void rgblight_set_speed(uint8_t speed) { rgblight_set_speed_eeprom_helper(speed, true); }
+void rgblight_set_speed(uint8_t speed) {
+    rgblight_set_speed_eeprom_helper(speed, true);
+}
 
-void rgblight_set_speed_noeeprom(uint8_t speed) { rgblight_set_speed_eeprom_helper(speed, false); }
+void rgblight_set_speed_noeeprom(uint8_t speed) {
+    rgblight_set_speed_eeprom_helper(speed, false);
+}
 
-uint8_t rgblight_get_hue(void) { return rgblight_config.hue; }
+uint8_t rgblight_get_hue(void) {
+    return rgblight_config.hue;
+}
 
-uint8_t rgblight_get_sat(void) { return rgblight_config.sat; }
+uint8_t rgblight_get_sat(void) {
+    return rgblight_config.sat;
+}
 
-uint8_t rgblight_get_val(void) { return rgblight_config.val; }
+uint8_t rgblight_get_val(void) {
+    return rgblight_config.val;
+}
 
-HSV rgblight_get_hsv(void) { return (HSV){rgblight_config.hue, rgblight_config.sat, rgblight_config.val}; }
+HSV rgblight_get_hsv(void) {
+    return (HSV){rgblight_config.hue, rgblight_config.sat, rgblight_config.val};
+}
 
 void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) {
     if (!rgblight_config.enable) {
@@ -648,14 +722,22 @@ void rgblight_sethsv_range(uint8_t hue, uint8_t sat, uint8_t val, uint8_t start,
 }
 
 #ifndef RGBLIGHT_SPLIT
-void rgblight_setrgb_master(uint8_t r, uint8_t g, uint8_t b) { rgblight_setrgb_range(r, g, b, 0, (uint8_t)RGBLED_NUM / 2); }
+void rgblight_setrgb_master(uint8_t r, uint8_t g, uint8_t b) {
+    rgblight_setrgb_range(r, g, b, 0, (uint8_t)RGBLED_NUM / 2);
+}
 
-void rgblight_setrgb_slave(uint8_t r, uint8_t g, uint8_t b) { rgblight_setrgb_range(r, g, b, (uint8_t)RGBLED_NUM / 2, (uint8_t)RGBLED_NUM); }
+void rgblight_setrgb_slave(uint8_t r, uint8_t g, uint8_t b) {
+    rgblight_setrgb_range(r, g, b, (uint8_t)RGBLED_NUM / 2, (uint8_t)RGBLED_NUM);
+}
 
-void rgblight_sethsv_master(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_sethsv_range(hue, sat, val, 0, (uint8_t)RGBLED_NUM / 2); }
+void rgblight_sethsv_master(uint8_t hue, uint8_t sat, uint8_t val) {
+    rgblight_sethsv_range(hue, sat, val, 0, (uint8_t)RGBLED_NUM / 2);
+}
 
-void rgblight_sethsv_slave(uint8_t hue, uint8_t sat, uint8_t val) { rgblight_sethsv_range(hue, sat, val, (uint8_t)RGBLED_NUM / 2, (uint8_t)RGBLED_NUM); }
-#endif  // ifndef RGBLIGHT_SPLIT
+void rgblight_sethsv_slave(uint8_t hue, uint8_t sat, uint8_t val) {
+    rgblight_sethsv_range(hue, sat, val, (uint8_t)RGBLED_NUM / 2, (uint8_t)RGBLED_NUM);
+}
+#endif // ifndef RGBLIGHT_SPLIT
 
 #ifdef RGBLIGHT_LAYERS
 void rgblight_set_layer_state(uint8_t layer, bool enabled) {
@@ -693,18 +775,18 @@ static void rgblight_layers_write(void) {
     // For each layer
     for (const rgblight_segment_t *const *layer_ptr = rgblight_layers; i < RGBLIGHT_MAX_LAYERS; layer_ptr++, i++) {
         if (!rgblight_get_layer_state(i)) {
-            continue;  // Layer is disabled
+            continue; // Layer is disabled
         }
         const rgblight_segment_t *segment_ptr = pgm_read_ptr(layer_ptr);
         if (segment_ptr == NULL) {
-            break;  // No more layers
+            break; // No more layers
         }
         // For each segment
         while (1) {
             rgblight_segment_t segment;
             memcpy_P(&segment, segment_ptr, sizeof(rgblight_segment_t));
             if (segment.index == RGBLIGHT_END_SEGMENT_INDEX) {
-                break;  // No more segments
+                break; // No more segments
             }
             // Write segment.count LEDs
             LED_TYPE *const limit = &led[MIN(segment.index + segment.count, RGBLED_NUM)];
@@ -726,7 +808,9 @@ static uint16_t       _repeat_timer;
 static uint8_t        _times_remaining;
 static uint16_t       _dur;
 
-void rgblight_blink_layer(uint8_t layer, uint16_t duration_ms) { rgblight_blink_layer_repeat(layer, duration_ms, 1); }
+void rgblight_blink_layer(uint8_t layer, uint16_t duration_ms) {
+    rgblight_blink_layer_repeat(layer, duration_ms, 1);
+}
 
 void rgblight_blink_layer_repeat(uint8_t layer, uint16_t duration_ms, uint8_t times) {
     _times_remaining = times * 2;
@@ -796,7 +880,9 @@ void rgblight_wakeup(void) {
 
 #endif
 
-__attribute__((weak)) void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) { ws2812_setleds(start_led, num_leds); }
+__attribute__((weak)) void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds) {
+    ws2812_setleds(start_led, num_leds);
+}
 
 #ifndef RGBLIGHT_CUSTOM_DRIVER
 
@@ -848,9 +934,13 @@ void rgblight_set(void) {
 
 #ifdef RGBLIGHT_SPLIT
 /* for split keyboard master side */
-uint8_t rgblight_get_change_flags(void) { return rgblight_status.change_flags; }
+uint8_t rgblight_get_change_flags(void) {
+    return rgblight_status.change_flags;
+}
 
-void rgblight_clear_change_flags(void) { rgblight_status.change_flags = 0; }
+void rgblight_clear_change_flags(void) {
+    rgblight_status.change_flags = 0;
+}
 
 void rgblight_get_syncinfo(rgblight_syncinfo_t *syncinfo) {
     syncinfo->config = rgblight_config;
@@ -866,7 +956,7 @@ void rgblight_update_sync(rgblight_syncinfo_t *syncinfo, bool write_to_eeprom) {
 #    endif
     if (syncinfo->status.change_flags & RGBLIGHT_STATUS_CHANGE_MODE) {
         if (syncinfo->config.enable) {
-            rgblight_config.enable = 1;  // == rgblight_enable_noeeprom();
+            rgblight_config.enable = 1; // == rgblight_enable_noeeprom();
             rgblight_mode_eeprom_helper(syncinfo->config.mode, write_to_eeprom);
         } else {
             rgblight_disable_noeeprom();
@@ -945,12 +1035,12 @@ static void rgblight_effect_dummy(animation_status_t *anim) {
 void rgblight_task(void) {
     if (rgblight_status.timer_enabled) {
         effect_func_t effect_func   = rgblight_effect_dummy;
-        uint16_t      interval_time = 2000;  // dummy interval
+        uint16_t      interval_time = 2000; // dummy interval
         uint8_t       delta         = rgblight_config.mode - rgblight_status.base_mode;
         animation_status.delta      = delta;
 
         // static light mode, do nothing here
-        if (1 == 0) {  // dummy
+        if (1 == 0) { // dummy
         }
 #    ifdef RGBLIGHT_EFFECT_BREATHING
         else if (rgblight_status.base_mode == RGBLIGHT_MODE_BREATHING) {
@@ -1016,7 +1106,7 @@ void rgblight_task(void) {
         if (animation_status.restart) {
             animation_status.restart    = false;
             animation_status.last_timer = sync_timer_read();
-            animation_status.pos16      = 0;  // restart signal to local each effect
+            animation_status.pos16      = 0; // restart signal to local each effect
         }
         uint16_t now = sync_timer_read();
         if (timer_expired(now, animation_status.last_timer)) {
@@ -1055,7 +1145,7 @@ void rgblight_task(void) {
 
 #    ifndef RGBLIGHT_EFFECT_BREATHE_CENTER
 #        ifndef RGBLIGHT_BREATHE_TABLE_SIZE
-#            define RGBLIGHT_BREATHE_TABLE_SIZE 256  // 256 or 128 or 64
+#            define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256 or 128 or 64
 #        endif
 #        include <rgblight_breathe_table.h>
 #    endif
@@ -1131,7 +1221,7 @@ void rgblight_effect_snake(animation_status_t *anim) {
     }
 
 #    if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
-    if (anim->pos == 0) {  // restart signal
+    if (anim->pos == 0) { // restart signal
         if (increment == 1) {
             pos = rgblight_ranges.effect_num_leds - 1;
         } else {
@@ -1194,7 +1284,7 @@ void rgblight_effect_knight(animation_status_t *anim) {
     uint8_t       i, cur;
 
 #    if defined(RGBLIGHT_SPLIT) && !defined(RGBLIGHT_SPLIT_NO_ANIMATION_SYNC)
-    if (anim->pos == 0) {  // restart signal
+    if (anim->pos == 0) { // restart signal
         anim->pos  = 1;
         low_bound  = 0;
         high_bound = RGBLIGHT_EFFECT_KNIGHT_LENGTH - 1;
@@ -1347,8 +1437,12 @@ void rgblight_effect_twinkle(animation_status_t *anim) {
     const uint8_t bottom = breathe_calc(0);
     const uint8_t top    = breathe_calc(127);
 
-    uint8_t frac(uint8_t n, uint8_t d) { return (uint16_t)255 * n / d; }
-    uint8_t scale(uint16_t v, uint8_t scale) { return (v * scale) >> 8; }
+    uint8_t frac(uint8_t n, uint8_t d) {
+        return (uint16_t)255 * n / d;
+    }
+    uint8_t scale(uint16_t v, uint8_t scale) {
+        return (v * scale) >> 8;
+    }
 
     for (uint8_t i = 0; i < rgblight_ranges.effect_num_leds; i++) {
         TwinkleState *t = &(led_twinkle_state[i]);
diff --git a/quantum/rgblight/rgblight.h b/quantum/rgblight/rgblight.h
index 5b90b8f49e..7076dc41ac 100644
--- a/quantum/rgblight/rgblight.h
+++ b/quantum/rgblight/rgblight.h
@@ -119,7 +119,7 @@ enum RGBLIGHT_EFFECT_MODE {
 // sample: #define RGBLIGHT_EFFECT_BREATHE_CENTER   1.85
 
 #ifndef RGBLIGHT_EFFECT_BREATHE_MAX
-#    define RGBLIGHT_EFFECT_BREATHE_MAX 255  // 0-255
+#    define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0-255
 #endif
 
 #ifndef RGBLIGHT_EFFECT_SNAKE_LENGTH
@@ -177,8 +177,8 @@ enum RGBLIGHT_EFFECT_MODE {
 
 #ifdef RGBLIGHT_LAYERS
 typedef struct {
-    uint8_t index;  // The first LED to light
-    uint8_t count;  // The number of LEDs to light
+    uint8_t index; // The first LED to light
+    uint8_t count; // The number of LEDs to light
     uint8_t hue;
     uint8_t sat;
     uint8_t val;
@@ -241,7 +241,7 @@ typedef union {
         uint8_t hue : 8;
         uint8_t sat : 8;
         uint8_t val : 8;
-        uint8_t speed : 8;  // EECONFIG needs to be increased to support this
+        uint8_t speed : 8; // EECONFIG needs to be increased to support this
     };
 } rgblight_config_t;
 
@@ -271,7 +271,7 @@ extern rgblight_ranges_t rgblight_ranges;
 
 /* === Utility Functions ===*/
 void sethsv(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1);
-void sethsv_raw(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1);  // without RGBLIGHT_LIMIT_VAL check
+void sethsv_raw(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1); // without RGBLIGHT_LIMIT_VAL check
 void setrgb(uint8_t r, uint8_t g, uint8_t b, LED_TYPE *led1);
 
 /* === Low level Functions === */
diff --git a/quantum/ring_buffer.h b/quantum/ring_buffer.h
index 284745ca8e..85419de11b 100644
--- a/quantum/ring_buffer.h
+++ b/quantum/ring_buffer.h
@@ -36,9 +36,13 @@ static inline uint8_t rbuf_dequeue(void) {
 }
 static inline bool rbuf_has_data(void) {
     bool has_data;
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { has_data = (rbuf_head != rbuf_tail); }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        has_data = (rbuf_head != rbuf_tail);
+    }
     return has_data;
 }
 static inline void rbuf_clear(void) {
-    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { rbuf_head = rbuf_tail = 0; }
+    ATOMIC_BLOCK(ATOMIC_RESTORESTATE) {
+        rbuf_head = rbuf_tail = 0;
+    }
 }
diff --git a/quantum/send_string.c b/quantum/send_string.c
index 1a7f7a1315..0de12ba12d 100644
--- a/quantum/send_string.c
+++ b/quantum/send_string.c
@@ -142,9 +142,13 @@ __attribute__((weak)) const uint8_t ascii_to_keycode_lut[128] PROGMEM = {
 // Note: we bit-pack in "reverse" order to optimize loading
 #define PGM_LOADBIT(mem, pos) ((pgm_read_byte(&((mem)[(pos) / 8])) >> ((pos) % 8)) & 0x01)
 
-void send_string(const char *str) { send_string_with_delay(str, 0); }
+void send_string(const char *str) {
+    send_string_with_delay(str, 0);
+}
 
-void send_string_P(const char *str) { send_string_with_delay_P(str, 0); }
+void send_string_P(const char *str) {
+    send_string_with_delay_P(str, 0);
+}
 
 void send_string_with_delay(const char *str, uint8_t interval) {
     while (1) {
@@ -173,7 +177,8 @@ void send_string_with_delay(const char *str, uint8_t interval) {
                     ms += keycode - '0';
                     keycode = *(++str);
                 }
-                while (ms--) wait_ms(1);
+                while (ms--)
+                    wait_ms(1);
             }
         } else {
             send_char(ascii_code);
@@ -182,7 +187,8 @@ void send_string_with_delay(const char *str, uint8_t interval) {
         // interval
         {
             uint8_t ms = interval;
-            while (ms--) wait_ms(1);
+            while (ms--)
+                wait_ms(1);
         }
     }
 }
@@ -214,7 +220,8 @@ void send_string_with_delay_P(const char *str, uint8_t interval) {
                     ms += keycode - '0';
                     keycode = pgm_read_byte(++str);
                 }
-                while (ms--) wait_ms(1);
+                while (ms--)
+                    wait_ms(1);
             }
         } else {
             send_char(ascii_code);
@@ -223,14 +230,15 @@ void send_string_with_delay_P(const char *str, uint8_t interval) {
         // interval
         {
             uint8_t ms = interval;
-            while (ms--) wait_ms(1);
+            while (ms--)
+                wait_ms(1);
         }
     }
 }
 
 void send_char(char ascii_code) {
 #if defined(AUDIO_ENABLE) && defined(SENDSTRING_BELL)
-    if (ascii_code == '\a') {  // BEL
+    if (ascii_code == '\a') { // BEL
         PLAY_SONG(bell_song);
         return;
     }
diff --git a/quantum/sequencer/sequencer.c b/quantum/sequencer/sequencer.c
index 18a83661ec..2e92f7b3eb 100644
--- a/quantum/sequencer/sequencer.c
+++ b/quantum/sequencer/sequencer.c
@@ -25,16 +25,18 @@
 #endif
 
 sequencer_config_t sequencer_config = {
-    false,     // enabled
-    {false},   // steps
-    {0},       // track notes
-    60,        // tempo
-    SQ_RES_4,  // resolution
+    false,    // enabled
+    {false},  // steps
+    {0},      // track notes
+    60,       // tempo
+    SQ_RES_4, // resolution
 };
 
 sequencer_state_t sequencer_internal_state = {0, 0, 0, 0, SEQUENCER_PHASE_ATTACK};
 
-bool is_sequencer_on(void) { return sequencer_config.enabled; }
+bool is_sequencer_on(void) {
+    return sequencer_config.enabled;
+}
 
 void sequencer_on(void) {
     dprintln("sequencer on");
@@ -65,7 +67,9 @@ void sequencer_set_track_notes(const uint16_t track_notes[SEQUENCER_TRACKS]) {
     }
 }
 
-bool is_sequencer_track_active(uint8_t track) { return (sequencer_internal_state.active_tracks >> track) & true; }
+bool is_sequencer_track_active(uint8_t track) {
+    return (sequencer_internal_state.active_tracks >> track) & true;
+}
 
 void sequencer_set_track_activation(uint8_t track, bool value) {
     if (value) {
@@ -76,7 +80,9 @@ void sequencer_set_track_activation(uint8_t track, bool value) {
     dprintf("sequencer: track %d is %s\n", track, value ? "active" : "inactive");
 }
 
-void sequencer_toggle_track_activation(uint8_t track) { sequencer_set_track_activation(track, !is_sequencer_track_active(track)); }
+void sequencer_toggle_track_activation(uint8_t track) {
+    sequencer_set_track_activation(track, !is_sequencer_track_active(track));
+}
 
 void sequencer_toggle_single_active_track(uint8_t track) {
     if (is_sequencer_track_active(track)) {
@@ -86,9 +92,13 @@ void sequencer_toggle_single_active_track(uint8_t track) {
     }
 }
 
-bool is_sequencer_step_on(uint8_t step) { return step < SEQUENCER_STEPS && (sequencer_config.steps[step] & sequencer_internal_state.active_tracks) > 0; }
+bool is_sequencer_step_on(uint8_t step) {
+    return step < SEQUENCER_STEPS && (sequencer_config.steps[step] & sequencer_internal_state.active_tracks) > 0;
+}
 
-bool is_sequencer_step_on_for_track(uint8_t step, uint8_t track) { return step < SEQUENCER_STEPS && (sequencer_config.steps[step] >> track) & true; }
+bool is_sequencer_step_on_for_track(uint8_t step, uint8_t track) {
+    return step < SEQUENCER_STEPS && (sequencer_config.steps[step] >> track) & true;
+}
 
 void sequencer_set_step(uint8_t step, bool value) {
     if (step < SEQUENCER_STEPS) {
@@ -122,7 +132,9 @@ void sequencer_set_all_steps(bool value) {
     dprintf("sequencer: all steps are %s\n", value ? "on" : "off");
 }
 
-uint8_t sequencer_get_tempo(void) { return sequencer_config.tempo; }
+uint8_t sequencer_get_tempo(void) {
+    return sequencer_config.tempo;
+}
 
 void sequencer_set_tempo(uint8_t tempo) {
     if (tempo > 0) {
@@ -142,9 +154,13 @@ void sequencer_increase_tempo(void) {
     }
 }
 
-void sequencer_decrease_tempo(void) { sequencer_set_tempo(sequencer_config.tempo - 1); }
+void sequencer_decrease_tempo(void) {
+    sequencer_set_tempo(sequencer_config.tempo - 1);
+}
 
-sequencer_resolution_t sequencer_get_resolution(void) { return sequencer_config.resolution; }
+sequencer_resolution_t sequencer_get_resolution(void) {
+    return sequencer_config.resolution;
+}
 
 void sequencer_set_resolution(sequencer_resolution_t resolution) {
     if (resolution >= 0 && resolution < SEQUENCER_RESOLUTIONS) {
@@ -155,11 +171,17 @@ void sequencer_set_resolution(sequencer_resolution_t resolution) {
     }
 }
 
-void sequencer_increase_resolution(void) { sequencer_set_resolution(sequencer_config.resolution + 1); }
+void sequencer_increase_resolution(void) {
+    sequencer_set_resolution(sequencer_config.resolution + 1);
+}
 
-void sequencer_decrease_resolution(void) { sequencer_set_resolution(sequencer_config.resolution - 1); }
+void sequencer_decrease_resolution(void) {
+    sequencer_set_resolution(sequencer_config.resolution - 1);
+}
 
-uint8_t sequencer_get_current_step(void) { return sequencer_internal_state.current_step; }
+uint8_t sequencer_get_current_step(void) {
+    return sequencer_internal_state.current_step;
+}
 
 void sequencer_phase_attack(void) {
     dprintf("sequencer: step %d\n", sequencer_internal_state.current_step);
@@ -229,9 +251,13 @@ void sequencer_task(void) {
     }
 }
 
-uint16_t sequencer_get_beat_duration(void) { return get_beat_duration(sequencer_config.tempo); }
+uint16_t sequencer_get_beat_duration(void) {
+    return get_beat_duration(sequencer_config.tempo);
+}
 
-uint16_t sequencer_get_step_duration(void) { return get_step_duration(sequencer_config.tempo, sequencer_config.resolution); }
+uint16_t sequencer_get_step_duration(void) {
+    return get_step_duration(sequencer_config.tempo, sequencer_config.resolution);
+}
 
 uint16_t get_beat_duration(uint8_t tempo) {
     // Don’t crash in the unlikely case where the given tempo is 0
diff --git a/quantum/sequencer/sequencer.h b/quantum/sequencer/sequencer.h
index 4017ae764e..a8ea16eece 100644
--- a/quantum/sequencer/sequencer.h
+++ b/quantum/sequencer/sequencer.h
@@ -48,7 +48,7 @@ typedef struct {
     bool                   enabled;
     uint8_t                steps[SEQUENCER_STEPS];
     uint16_t               track_notes[SEQUENCER_TRACKS];
-    uint8_t                tempo;  // Is a maximum tempo of 255 reasonable?
+    uint8_t                tempo; // Is a maximum tempo of 255 reasonable?
     sequencer_resolution_t resolution;
 } sequencer_config_t;
 
@@ -57,9 +57,9 @@ typedef struct {
  * We use a "phase" state machine to delay some of the events.
  */
 typedef enum sequencer_phase_t {
-    SEQUENCER_PHASE_ATTACK,   // t=0ms, send the MIDI note on signal
-    SEQUENCER_PHASE_RELEASE,  // t=SEQUENCER_PHASE_RELEASE_TIMEOUT ms, send the MIDI note off signal
-    SEQUENCER_PHASE_PAUSE     // t=step duration ms, loop
+    SEQUENCER_PHASE_ATTACK,  // t=0ms, send the MIDI note on signal
+    SEQUENCER_PHASE_RELEASE, // t=SEQUENCER_PHASE_RELEASE_TIMEOUT ms, send the MIDI note off signal
+    SEQUENCER_PHASE_PAUSE    // t=step duration ms, loop
 } sequencer_phase_t;
 
 typedef struct {
diff --git a/quantum/sequencer/tests/midi_mock.c b/quantum/sequencer/tests/midi_mock.c
index 236e16f9d7..5bd945d615 100644
--- a/quantum/sequencer/tests/midi_mock.c
+++ b/quantum/sequencer/tests/midi_mock.c
@@ -19,8 +19,14 @@
 uint16_t last_noteon  = 0;
 uint16_t last_noteoff = 0;
 
-uint16_t midi_compute_note(uint16_t keycode) { return keycode; }
+uint16_t midi_compute_note(uint16_t keycode) {
+    return keycode;
+}
 
-void process_midi_basic_noteon(uint16_t note) { last_noteon = note; }
+void process_midi_basic_noteon(uint16_t note) {
+    last_noteon = note;
+}
 
-void process_midi_basic_noteoff(uint16_t note) { last_noteoff = note; }
+void process_midi_basic_noteoff(uint16_t note) {
+    last_noteoff = note;
+}
diff --git a/quantum/sequencer/tests/sequencer_tests.cpp b/quantum/sequencer/tests/sequencer_tests.cpp
index 290605a52a..05e58e4111 100644
--- a/quantum/sequencer/tests/sequencer_tests.cpp
+++ b/quantum/sequencer/tests/sequencer_tests.cpp
@@ -78,7 +78,9 @@ class SequencerTest : public ::testing::Test {
     sequencer_state_t  state_copy;
 };
 
-TEST_F(SequencerTest, TestOffByDefault) { EXPECT_EQ(is_sequencer_on(), false); }
+TEST_F(SequencerTest, TestOffByDefault) {
+    EXPECT_EQ(is_sequencer_on(), false);
+}
 
 TEST_F(SequencerTest, TestOn) {
     sequencer_config.enabled = false;
diff --git a/quantum/split_common/post_config.h b/quantum/split_common/post_config.h
index a4c0a1956b..8f79beb6ed 100644
--- a/quantum/split_common/post_config.h
+++ b/quantum/split_common/post_config.h
@@ -5,6 +5,6 @@
 #    endif
 
 #    ifndef F_SCL
-#        define F_SCL 100000UL  // SCL frequency
+#        define F_SCL 100000UL // SCL frequency
 #    endif
 #endif
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c
index 35f0a9d181..7d50adf758 100644
--- a/quantum/split_common/split_util.c
+++ b/quantum/split_common/split_util.c
@@ -43,14 +43,14 @@
 // Set to 0 to disable the disconnection check altogether.
 #ifndef SPLIT_MAX_CONNECTION_ERRORS
 #    define SPLIT_MAX_CONNECTION_ERRORS 10
-#endif  // SPLIT_MAX_CONNECTION_ERRORS
+#endif // SPLIT_MAX_CONNECTION_ERRORS
 
 // How long (in milliseconds) to block all connection attempts after the communication has been flagged as disconnected.
 // One communication attempt will be allowed everytime this amount of time has passed since the last attempt. If that attempt succeeds, the communication is seen as working again.
 // Set to 0 to disable communication throttling while disconnected
 #ifndef SPLIT_CONNECTION_CHECK_TIMEOUT
 #    define SPLIT_CONNECTION_CHECK_TIMEOUT 500
-#endif  // SPLIT_CONNECTION_CHECK_TIMEOUT
+#endif // SPLIT_CONNECTION_CHECK_TIMEOUT
 
 static uint8_t connection_errors = 0;
 
@@ -68,7 +68,9 @@ static bool usbIsActive(void) {
     return false;
 }
 #else
-static inline bool usbIsActive(void) { return usb_vbus_state(); }
+static inline bool usbIsActive(void) {
+    return usb_vbus_state();
+}
 #endif
 
 #ifdef SPLIT_HAND_MATRIX_GRID
@@ -83,7 +85,7 @@ static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) {
     uint8_t pin_state = readPin(in_pin);
     // Set out_pin to a setting that is less susceptible to noise.
     setPinInputHigh(out_pin);
-    matrix_io_delay();  // Wait for the pull-up to go HIGH.
+    matrix_io_delay(); // Wait for the pull-up to go HIGH.
     return pin_state;
 }
 #endif
@@ -158,7 +160,9 @@ void split_post_init(void) {
     }
 }
 
-bool is_transport_connected(void) { return connection_errors < SPLIT_MAX_CONNECTION_ERRORS; }
+bool is_transport_connected(void) {
+    return connection_errors < SPLIT_MAX_CONNECTION_ERRORS;
+}
 
 bool transport_master_if_connected(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
 #if SPLIT_MAX_CONNECTION_ERRORS > 0 && SPLIT_CONNECTION_CHECK_TIMEOUT > 0
@@ -169,7 +173,7 @@ bool transport_master_if_connected(matrix_row_t master_matrix[], matrix_row_t sl
     if (is_disconnected && timer_elapsed(connection_check_timer) < SPLIT_CONNECTION_CHECK_TIMEOUT) {
         return false;
     }
-#endif  // SPLIT_MAX_CONNECTION_ERRORS > 0 && SPLIT_CONNECTION_CHECK_TIMEOUT > 0
+#endif // SPLIT_MAX_CONNECTION_ERRORS > 0 && SPLIT_CONNECTION_CHECK_TIMEOUT > 0
 
     __attribute__((unused)) bool okay = transport_master(master_matrix, slave_matrix);
 #if SPLIT_MAX_CONNECTION_ERRORS > 0
@@ -186,10 +190,10 @@ bool transport_master_if_connected(matrix_row_t master_matrix[], matrix_row_t sl
         return connected;
     } else if (is_disconnected) {
         dprintln("Target connected");
-#    endif  // SPLIT_CONNECTION_CHECK_TIMEOUT > 0
+#    endif // SPLIT_CONNECTION_CHECK_TIMEOUT > 0
     }
 
     connection_errors = 0;
-#endif  // SPLIT_MAX_CONNECTION_ERRORS > 0
+#endif // SPLIT_MAX_CONNECTION_ERRORS > 0
     return true;
 }
diff --git a/quantum/split_common/transaction_id_define.h b/quantum/split_common/transaction_id_define.h
index aa71c3621e..761a8884f4 100644
--- a/quantum/split_common/transaction_id_define.h
+++ b/quantum/split_common/transaction_id_define.h
@@ -19,87 +19,87 @@
 enum serial_transaction_id {
 #ifdef USE_I2C
     I2C_EXECUTE_CALLBACK,
-#endif  // USE_I2C
+#endif // USE_I2C
 
     GET_SLAVE_MATRIX_CHECKSUM,
     GET_SLAVE_MATRIX_DATA,
 
 #ifdef SPLIT_TRANSPORT_MIRROR
     PUT_MASTER_MATRIX,
-#endif  // SPLIT_TRANSPORT_MIRROR
+#endif // SPLIT_TRANSPORT_MIRROR
 
 #ifdef ENCODER_ENABLE
     GET_ENCODERS_CHECKSUM,
     GET_ENCODERS_DATA,
-#endif  // ENCODER_ENABLE
+#endif // ENCODER_ENABLE
 
 #ifndef DISABLE_SYNC_TIMER
     PUT_SYNC_TIMER,
-#endif  // DISABLE_SYNC_TIMER
+#endif // DISABLE_SYNC_TIMER
 
 #if !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
     PUT_LAYER_STATE,
     PUT_DEFAULT_LAYER_STATE,
-#endif  // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
+#endif // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
 
 #ifdef SPLIT_LED_STATE_ENABLE
     PUT_LED_STATE,
-#endif  // SPLIT_LED_STATE_ENABLE
+#endif // SPLIT_LED_STATE_ENABLE
 
 #ifdef SPLIT_MODS_ENABLE
     PUT_MODS,
-#endif  // SPLIT_MODS_ENABLE
+#endif // SPLIT_MODS_ENABLE
 
 #ifdef BACKLIGHT_ENABLE
     PUT_BACKLIGHT,
-#endif  // BACKLIGHT_ENABLE
+#endif // BACKLIGHT_ENABLE
 
 #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
     PUT_RGBLIGHT,
-#endif  // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+#endif // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
 
 #if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
     PUT_LED_MATRIX,
-#endif  // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+#endif // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
     PUT_RGB_MATRIX,
-#endif  // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+#endif // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
 
 #if defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
     PUT_WPM,
-#endif  // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
+#endif // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
 
 #if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
     PUT_OLED,
-#endif  // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#endif // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
 
 #if defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
     PUT_ST7565,
-#endif  // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
+#endif // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
 
 #if defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
     GET_POINTING_CHECKSUM,
     GET_POINTING_DATA,
     PUT_POINTING_CPI,
-#endif  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+#endif // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
     PUT_RPC_INFO,
     PUT_RPC_REQ_DATA,
     EXECUTE_RPC,
     GET_RPC_RESP_DATA,
-#endif  // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+#endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 
 // keyboard-specific
 #ifdef SPLIT_TRANSACTION_IDS_KB
     SPLIT_TRANSACTION_IDS_KB,
-#endif  // SPLIT_TRANSACTION_IDS_KB
+#endif // SPLIT_TRANSACTION_IDS_KB
 
 // user/keymap-specific
 #ifdef SPLIT_TRANSACTION_IDS_USER
     SPLIT_TRANSACTION_IDS_USER,
-#endif  // SPLIT_TRANSACTION_IDS_USER
+#endif // SPLIT_TRANSACTION_IDS_USER
 
     NUM_TOTAL_TRANSACTIONS
 };
diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c
index 4b059a2b8a..cffbccaeee 100644
--- a/quantum/split_common/transactions.c
+++ b/quantum/split_common/transactions.c
@@ -30,7 +30,7 @@
 
 #ifndef FORCED_SYNC_THROTTLE_MS
 #    define FORCED_SYNC_THROTTLE_MS 100
-#endif  // FORCED_SYNC_THROTTLE_MS
+#endif // FORCED_SYNC_THROTTLE_MS
 
 #define sizeof_member(type, member) sizeof(((type *)NULL)->member)
 
@@ -49,7 +49,7 @@
 // Forward-declare the RPC callback handlers
 void slave_rpc_info_callback(uint8_t initiator2target_buffer_size, const void *initiator2target_buffer, uint8_t target2initiator_buffer_size, void *target2initiator_buffer);
 void slave_rpc_exec_callback(uint8_t initiator2target_buffer_size, const void *initiator2target_buffer, uint8_t target2initiator_buffer_size, void *target2initiator_buffer);
-#endif  // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+#endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 
 ////////////////////////////////////////////////////
 // Helpers
@@ -63,7 +63,9 @@ static bool transaction_handler_master(matrix_row_t master_matrix[], matrix_row_
             }
         }
         bool this_okay = true;
-        ATOMIC_BLOCK_FORCEON { this_okay = handler(master_matrix, slave_matrix); };
+        ATOMIC_BLOCK_FORCEON {
+            this_okay = handler(master_matrix, slave_matrix);
+        };
         if (this_okay) return true;
     }
     dprintf("Failed to execute %s\n", prefix);
@@ -75,9 +77,11 @@ static bool transaction_handler_master(matrix_row_t master_matrix[], matrix_row_
         if (!transaction_handler_master(master_matrix, slave_matrix, #prefix, &prefix##_handlers_master)) return false; \
     } while (0)
 
-#define TRANSACTION_HANDLER_SLAVE(prefix)                                               \
-    do {                                                                                \
-        ATOMIC_BLOCK_FORCEON { prefix##_handlers_slave(master_matrix, slave_matrix); }; \
+#define TRANSACTION_HANDLER_SLAVE(prefix)                         \
+    do {                                                          \
+        ATOMIC_BLOCK_FORCEON {                                    \
+            prefix##_handlers_slave(master_matrix, slave_matrix); \
+        };                                                        \
     } while (0)
 
 inline static bool read_if_checksum_mismatch(int8_t trans_id_checksum, int8_t trans_id_retrieve, uint32_t *last_update, void *destination, const void *equiv_shmem, size_t length) {
@@ -116,8 +120,8 @@ inline static bool send_if_data_mismatch(int8_t trans_id, uint32_t *last_update,
 
 static bool slave_matrix_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
     static uint32_t     last_update                    = 0;
-    static matrix_row_t last_matrix[(MATRIX_ROWS) / 2] = {0};  // last successfully-read matrix, so we can replicate if there are checksum errors
-    matrix_row_t        temp_matrix[(MATRIX_ROWS) / 2];        // holding area while we test whether or not checksum is correct
+    static matrix_row_t last_matrix[(MATRIX_ROWS) / 2] = {0}; // last successfully-read matrix, so we can replicate if there are checksum errors
+    matrix_row_t        temp_matrix[(MATRIX_ROWS) / 2];       // holding area while we test whether or not checksum is correct
 
     bool okay = read_if_checksum_mismatch(GET_SLAVE_MATRIX_CHECKSUM, GET_SLAVE_MATRIX_DATA, &last_update, temp_matrix, split_shmem->smatrix.matrix, sizeof(split_shmem->smatrix.matrix));
     if (okay) {
@@ -161,13 +165,13 @@ static void master_matrix_handlers_slave(matrix_row_t master_matrix[], matrix_ro
 #    define TRANSACTIONS_MASTER_MATRIX_SLAVE() TRANSACTION_HANDLER_SLAVE(master_matrix)
 #    define TRANSACTIONS_MASTER_MATRIX_REGISTRATIONS [PUT_MASTER_MATRIX] = trans_initiator2target_initializer(mmatrix.matrix),
 
-#else  // SPLIT_TRANSPORT_MIRROR
+#else // SPLIT_TRANSPORT_MIRROR
 
 #    define TRANSACTIONS_MASTER_MATRIX_MASTER()
 #    define TRANSACTIONS_MASTER_MATRIX_SLAVE()
 #    define TRANSACTIONS_MASTER_MATRIX_REGISTRATIONS
 
-#endif  // SPLIT_TRANSPORT_MIRROR
+#endif // SPLIT_TRANSPORT_MIRROR
 
 ////////////////////////////////////////////////////
 // Encoders
@@ -200,13 +204,13 @@ static void encoder_handlers_slave(matrix_row_t master_matrix[], matrix_row_t sl
     [GET_ENCODERS_DATA]     = trans_target2initiator_initializer(encoders.state),
 // clang-format on
 
-#else  // ENCODER_ENABLE
+#else // ENCODER_ENABLE
 
 #    define TRANSACTIONS_ENCODERS_MASTER()
 #    define TRANSACTIONS_ENCODERS_SLAVE()
 #    define TRANSACTIONS_ENCODERS_REGISTRATIONS
 
-#endif  // ENCODER_ENABLE
+#endif // ENCODER_ENABLE
 
 ////////////////////////////////////////////////////
 // Sync timer
@@ -239,13 +243,13 @@ static void sync_timer_handlers_slave(matrix_row_t master_matrix[], matrix_row_t
 #    define TRANSACTIONS_SYNC_TIMER_SLAVE() TRANSACTION_HANDLER_SLAVE(sync_timer)
 #    define TRANSACTIONS_SYNC_TIMER_REGISTRATIONS [PUT_SYNC_TIMER] = trans_initiator2target_initializer(sync_timer),
 
-#else  // DISABLE_SYNC_TIMER
+#else // DISABLE_SYNC_TIMER
 
 #    define TRANSACTIONS_SYNC_TIMER_MASTER()
 #    define TRANSACTIONS_SYNC_TIMER_SLAVE()
 #    define TRANSACTIONS_SYNC_TIMER_REGISTRATIONS
 
-#endif  // DISABLE_SYNC_TIMER
+#endif // DISABLE_SYNC_TIMER
 
 ////////////////////////////////////////////////////
 // Layer state
@@ -276,13 +280,13 @@ static void layer_state_handlers_slave(matrix_row_t master_matrix[], matrix_row_
     [PUT_DEFAULT_LAYER_STATE] = trans_initiator2target_initializer(layers.default_layer_state),
 // clang-format on
 
-#else  // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
+#else // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
 
 #    define TRANSACTIONS_LAYER_STATE_MASTER()
 #    define TRANSACTIONS_LAYER_STATE_SLAVE()
 #    define TRANSACTIONS_LAYER_STATE_REGISTRATIONS
 
-#endif  // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
+#endif // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
 
 ////////////////////////////////////////////////////
 // LED state
@@ -304,13 +308,13 @@ static void led_state_handlers_slave(matrix_row_t master_matrix[], matrix_row_t
 #    define TRANSACTIONS_LED_STATE_SLAVE() TRANSACTION_HANDLER_SLAVE(led_state)
 #    define TRANSACTIONS_LED_STATE_REGISTRATIONS [PUT_LED_STATE] = trans_initiator2target_initializer(led_state),
 
-#else  // SPLIT_LED_STATE_ENABLE
+#else // SPLIT_LED_STATE_ENABLE
 
 #    define TRANSACTIONS_LED_STATE_MASTER()
 #    define TRANSACTIONS_LED_STATE_SLAVE()
 #    define TRANSACTIONS_LED_STATE_REGISTRATIONS
 
-#endif  // SPLIT_LED_STATE_ENABLE
+#endif // SPLIT_LED_STATE_ENABLE
 
 ////////////////////////////////////////////////////
 // Mods
@@ -336,7 +340,7 @@ static bool mods_handlers_master(matrix_row_t master_matrix[], matrix_row_t slav
     if (!mods_need_sync && new_mods.oneshot_mods != split_shmem->mods.oneshot_mods) {
         mods_need_sync = true;
     }
-#    endif  // NO_ACTION_ONESHOT
+#    endif // NO_ACTION_ONESHOT
 
     bool okay = true;
     if (mods_need_sync) {
@@ -361,13 +365,13 @@ static void mods_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave
 #    define TRANSACTIONS_MODS_SLAVE() TRANSACTION_HANDLER_SLAVE(mods)
 #    define TRANSACTIONS_MODS_REGISTRATIONS [PUT_MODS] = trans_initiator2target_initializer(mods),
 
-#else  // SPLIT_MODS_ENABLE
+#else // SPLIT_MODS_ENABLE
 
 #    define TRANSACTIONS_MODS_MASTER()
 #    define TRANSACTIONS_MODS_SLAVE()
 #    define TRANSACTIONS_MODS_REGISTRATIONS
 
-#endif  // SPLIT_MODS_ENABLE
+#endif // SPLIT_MODS_ENABLE
 
 ////////////////////////////////////////////////////
 // Backlight
@@ -380,19 +384,21 @@ static bool backlight_handlers_master(matrix_row_t master_matrix[], matrix_row_t
     return send_if_condition(PUT_BACKLIGHT, &last_update, (level != split_shmem->backlight_level), &level, sizeof(level));
 }
 
-static void backlight_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { backlight_set(split_shmem->backlight_level); }
+static void backlight_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    backlight_set(split_shmem->backlight_level);
+}
 
 #    define TRANSACTIONS_BACKLIGHT_MASTER() TRANSACTION_HANDLER_MASTER(backlight)
 #    define TRANSACTIONS_BACKLIGHT_SLAVE() TRANSACTION_HANDLER_SLAVE(backlight)
 #    define TRANSACTIONS_BACKLIGHT_REGISTRATIONS [PUT_BACKLIGHT] = trans_initiator2target_initializer(backlight_level),
 
-#else  // BACKLIGHT_ENABLE
+#else // BACKLIGHT_ENABLE
 
 #    define TRANSACTIONS_BACKLIGHT_MASTER()
 #    define TRANSACTIONS_BACKLIGHT_SLAVE()
 #    define TRANSACTIONS_BACKLIGHT_REGISTRATIONS
 
-#endif  // BACKLIGHT_ENABLE
+#endif // BACKLIGHT_ENABLE
 
 ////////////////////////////////////////////////////
 // RGBLIGHT
@@ -423,13 +429,13 @@ static void rgblight_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
 #    define TRANSACTIONS_RGBLIGHT_SLAVE() TRANSACTION_HANDLER_SLAVE(rgblight)
 #    define TRANSACTIONS_RGBLIGHT_REGISTRATIONS [PUT_RGBLIGHT] = trans_initiator2target_initializer(rgblight_sync),
 
-#else  // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+#else // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
 
 #    define TRANSACTIONS_RGBLIGHT_MASTER()
 #    define TRANSACTIONS_RGBLIGHT_SLAVE()
 #    define TRANSACTIONS_RGBLIGHT_REGISTRATIONS
 
-#endif  // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+#endif // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
 
 ////////////////////////////////////////////////////
 // LED Matrix
@@ -453,13 +459,13 @@ static void led_matrix_handlers_slave(matrix_row_t master_matrix[], matrix_row_t
 #    define TRANSACTIONS_LED_MATRIX_SLAVE() TRANSACTION_HANDLER_SLAVE(led_matrix)
 #    define TRANSACTIONS_LED_MATRIX_REGISTRATIONS [PUT_LED_MATRIX] = trans_initiator2target_initializer(led_matrix_sync),
 
-#else  // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+#else // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
 
 #    define TRANSACTIONS_LED_MATRIX_MASTER()
 #    define TRANSACTIONS_LED_MATRIX_SLAVE()
 #    define TRANSACTIONS_LED_MATRIX_REGISTRATIONS
 
-#endif  // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+#endif // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
 
 ////////////////////////////////////////////////////
 // RGB Matrix
@@ -483,13 +489,13 @@ static void rgb_matrix_handlers_slave(matrix_row_t master_matrix[], matrix_row_t
 #    define TRANSACTIONS_RGB_MATRIX_SLAVE() TRANSACTION_HANDLER_SLAVE(rgb_matrix)
 #    define TRANSACTIONS_RGB_MATRIX_REGISTRATIONS [PUT_RGB_MATRIX] = trans_initiator2target_initializer(rgb_matrix_sync),
 
-#else  // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+#else // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
 
 #    define TRANSACTIONS_RGB_MATRIX_MASTER()
 #    define TRANSACTIONS_RGB_MATRIX_SLAVE()
 #    define TRANSACTIONS_RGB_MATRIX_REGISTRATIONS
 
-#endif  // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+#endif // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
 
 ////////////////////////////////////////////////////
 // WPM
@@ -502,19 +508,21 @@ static bool wpm_handlers_master(matrix_row_t master_matrix[], matrix_row_t slave
     return send_if_condition(PUT_WPM, &last_update, (current_wpm != split_shmem->current_wpm), &current_wpm, sizeof(current_wpm));
 }
 
-static void wpm_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { set_current_wpm(split_shmem->current_wpm); }
+static void wpm_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    set_current_wpm(split_shmem->current_wpm);
+}
 
 #    define TRANSACTIONS_WPM_MASTER() TRANSACTION_HANDLER_MASTER(wpm)
 #    define TRANSACTIONS_WPM_SLAVE() TRANSACTION_HANDLER_SLAVE(wpm)
 #    define TRANSACTIONS_WPM_REGISTRATIONS [PUT_WPM] = trans_initiator2target_initializer(current_wpm),
 
-#else  // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
+#else // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
 
 #    define TRANSACTIONS_WPM_MASTER()
 #    define TRANSACTIONS_WPM_SLAVE()
 #    define TRANSACTIONS_WPM_REGISTRATIONS
 
-#endif  // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
+#endif // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
 
 ////////////////////////////////////////////////////
 // OLED
@@ -539,13 +547,13 @@ static void oled_handlers_slave(matrix_row_t master_matrix[], matrix_row_t slave
 #    define TRANSACTIONS_OLED_SLAVE() TRANSACTION_HANDLER_SLAVE(oled)
 #    define TRANSACTIONS_OLED_REGISTRATIONS [PUT_OLED] = trans_initiator2target_initializer(current_oled_state),
 
-#else  // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#else // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
 
 #    define TRANSACTIONS_OLED_MASTER()
 #    define TRANSACTIONS_OLED_SLAVE()
 #    define TRANSACTIONS_OLED_REGISTRATIONS
 
-#endif  // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#endif // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
 
 ////////////////////////////////////////////////////
 // ST7565
@@ -570,13 +578,13 @@ static void st7565_handlers_slave(matrix_row_t master_matrix[], matrix_row_t sla
 #    define TRANSACTIONS_ST7565_SLAVE() TRANSACTION_HANDLER_SLAVE(st7565)
 #    define TRANSACTIONS_ST7565_REGISTRATIONS [PUT_ST7565] = trans_initiator2target_initializer(current_st7565_state),
 
-#else  // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
+#else // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
 
 #    define TRANSACTIONS_ST7565_MASTER()
 #    define TRANSACTIONS_ST7565_SLAVE()
 #    define TRANSACTIONS_ST7565_REGISTRATIONS
 
-#endif  // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
+#endif // defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
 
 ////////////////////////////////////////////////////
 // POINTING
@@ -631,7 +639,7 @@ static void pointing_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
     }
     last_exec = timer_read32();
 #    endif
-    temp_cpi = !pointing_device_driver.get_cpi ? 0 : pointing_device_driver.get_cpi();  // check for NULL
+    temp_cpi = !pointing_device_driver.get_cpi ? 0 : pointing_device_driver.get_cpi(); // check for NULL
     if (split_shmem->pointing.cpi && memcmp(&split_shmem->pointing.cpi, &temp_cpi, sizeof(temp_cpi)) != 0) {
         if (pointing_device_driver.set_cpi) {
             pointing_device_driver.set_cpi(split_shmem->pointing.cpi);
@@ -648,13 +656,13 @@ static void pointing_handlers_slave(matrix_row_t master_matrix[], matrix_row_t s
 #    define TRANSACTIONS_POINTING_SLAVE() TRANSACTION_HANDLER_SLAVE(pointing)
 #    define TRANSACTIONS_POINTING_REGISTRATIONS [GET_POINTING_CHECKSUM] = trans_target2initiator_initializer(pointing.checksum), [GET_POINTING_DATA] = trans_target2initiator_initializer(pointing.report), [PUT_POINTING_CPI] = trans_initiator2target_initializer(pointing.cpi),
 
-#else  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+#else // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
 #    define TRANSACTIONS_POINTING_MASTER()
 #    define TRANSACTIONS_POINTING_SLAVE()
 #    define TRANSACTIONS_POINTING_REGISTRATIONS
 
-#endif  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+#endif // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
 ////////////////////////////////////////////////////
 
@@ -664,7 +672,7 @@ split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = {
 
 #ifdef USE_I2C
     [I2C_EXECUTE_CALLBACK] = trans_initiator2target_initializer(transaction_id),
-#endif  // USE_I2C
+#endif // USE_I2C
 
     // clang-format off
     TRANSACTIONS_SLAVE_MATRIX_REGISTRATIONS
@@ -689,7 +697,7 @@ split_transaction_desc_t split_transaction_table[NUM_TOTAL_TRANSACTIONS] = {
     [PUT_RPC_REQ_DATA]  = trans_initiator2target_initializer(rpc_m2s_buffer),
     [EXECUTE_RPC]       = trans_initiator2target_initializer_cb(rpc_info.transaction_id, slave_rpc_exec_callback),
     [GET_RPC_RESP_DATA] = trans_target2initiator_initializer(rpc_s2m_buffer),
-#endif  // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+#endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 };
 
 bool transactions_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
@@ -800,4 +808,4 @@ void slave_rpc_exec_callback(uint8_t initiator2target_buffer_size, const void *i
     }
 }
 
-#endif  // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+#endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
diff --git a/quantum/split_common/transport.c b/quantum/split_common/transport.c
index 060ba8a927..aade3c98d7 100644
--- a/quantum/split_common/transport.c
+++ b/quantum/split_common/transport.c
@@ -26,7 +26,7 @@
 
 #    ifndef SLAVE_I2C_TIMEOUT
 #        define SLAVE_I2C_TIMEOUT 100
-#    endif  // SLAVE_I2C_TIMEOUT
+#    endif // SLAVE_I2C_TIMEOUT
 
 #    ifndef SLAVE_I2C_ADDRESS
 #        define SLAVE_I2C_ADDRESS 0x32
@@ -40,8 +40,12 @@ _Static_assert(sizeof(split_shared_memory_t) <= I2C_SLAVE_REG_COUNT, "split_shar
 
 split_shared_memory_t *const split_shmem = (split_shared_memory_t *)i2c_slave_reg;
 
-void transport_master_init(void) { i2c_init(); }
-void transport_slave_init(void) { i2c_slave_init(SLAVE_I2C_ADDRESS); }
+void transport_master_init(void) {
+    i2c_init();
+}
+void transport_slave_init(void) {
+    i2c_slave_init(SLAVE_I2C_ADDRESS);
+}
 
 i2c_status_t transport_trigger_callback(int8_t id) {
     // If there's no callback, indicate that we were successful
@@ -82,15 +86,19 @@ bool transport_execute_transaction(int8_t id, const void *initiator2target_buf,
     return true;
 }
 
-#else  // USE_I2C
+#else // USE_I2C
 
 #    include "serial.h"
 
 static split_shared_memory_t shared_memory;
 split_shared_memory_t *const split_shmem = &shared_memory;
 
-void transport_master_init(void) { soft_serial_initiator_init(); }
-void transport_slave_init(void) { soft_serial_target_init(); }
+void transport_master_init(void) {
+    soft_serial_initiator_init();
+}
+void transport_slave_init(void) {
+    soft_serial_target_init();
+}
 
 bool transport_execute_transaction(int8_t id, const void *initiator2target_buf, uint16_t initiator2target_length, void *target2initiator_buf, uint16_t target2initiator_length) {
     split_transaction_desc_t *trans = &split_transaction_table[id];
@@ -111,8 +119,12 @@ bool transport_execute_transaction(int8_t id, const void *initiator2target_buf,
     return true;
 }
 
-#endif  // USE_I2C
+#endif // USE_I2C
 
-bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { return transactions_master(master_matrix, slave_matrix); }
+bool transport_master(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    return transactions_master(master_matrix, slave_matrix);
+}
 
-void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) { transactions_slave(master_matrix, slave_matrix); }
+void transport_slave(matrix_row_t master_matrix[], matrix_row_t slave_matrix[]) {
+    transactions_slave(master_matrix, slave_matrix);
+}
diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h
index 31b804908b..26bd136728 100644
--- a/quantum/split_common/transport.h
+++ b/quantum/split_common/transport.h
@@ -25,11 +25,11 @@
 
 #ifndef RPC_M2S_BUFFER_SIZE
 #    define RPC_M2S_BUFFER_SIZE 32
-#endif  // RPC_M2S_BUFFER_SIZE
+#endif // RPC_M2S_BUFFER_SIZE
 
 #ifndef RPC_S2M_BUFFER_SIZE
 #    define RPC_S2M_BUFFER_SIZE 32
-#endif  // RPC_S2M_BUFFER_SIZE
+#endif // RPC_S2M_BUFFER_SIZE
 
 void transport_master_init(void);
 void transport_slave_init(void);
@@ -43,15 +43,15 @@ bool transport_execute_transaction(int8_t id, const void *initiator2target_buf,
 #ifdef ENCODER_ENABLE
 #    include "encoder.h"
 #    define NUMBER_OF_ENCODERS (sizeof((pin_t[])ENCODERS_PAD_A) / sizeof(pin_t))
-#endif  // ENCODER_ENABLE
+#endif // ENCODER_ENABLE
 
 #ifdef BACKLIGHT_ENABLE
 #    include "backlight.h"
-#endif  // BACKLIGHT_ENABLE
+#endif // BACKLIGHT_ENABLE
 
 #ifdef RGBLIGHT_ENABLE
 #    include "rgblight.h"
-#endif  // RGBLIGHT_ENABLE
+#endif // RGBLIGHT_ENABLE
 
 typedef struct _split_slave_matrix_sync_t {
     uint8_t      checksum;
@@ -62,21 +62,21 @@ typedef struct _split_slave_matrix_sync_t {
 typedef struct _split_master_matrix_sync_t {
     matrix_row_t matrix[(MATRIX_ROWS) / 2];
 } split_master_matrix_sync_t;
-#endif  // SPLIT_TRANSPORT_MIRROR
+#endif // SPLIT_TRANSPORT_MIRROR
 
 #ifdef ENCODER_ENABLE
 typedef struct _split_slave_encoder_sync_t {
     uint8_t checksum;
     uint8_t state[NUMBER_OF_ENCODERS];
 } split_slave_encoder_sync_t;
-#endif  // ENCODER_ENABLE
+#endif // ENCODER_ENABLE
 
 #if !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
 typedef struct _split_layers_sync_t {
     layer_state_t layer_state;
     layer_state_t default_layer_state;
 } split_layers_sync_t;
-#endif  // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
+#endif // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
 
 #if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
 #    include "led_matrix.h"
@@ -85,7 +85,7 @@ typedef struct _led_matrix_sync_t {
     led_eeconfig_t led_matrix;
     bool           led_suspend_state;
 } led_matrix_sync_t;
-#endif  // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+#endif // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
 #    include "rgb_matrix.h"
@@ -94,7 +94,7 @@ typedef struct _rgb_matrix_sync_t {
     rgb_config_t rgb_matrix;
     bool         rgb_suspend_state;
 } rgb_matrix_sync_t;
-#endif  // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+#endif // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
 
 #ifdef SPLIT_MODS_ENABLE
 typedef struct _split_mods_sync_t {
@@ -102,9 +102,9 @@ typedef struct _split_mods_sync_t {
     uint8_t weak_mods;
 #    ifndef NO_ACTION_ONESHOT
     uint8_t oneshot_mods;
-#    endif  // NO_ACTION_ONESHOT
+#    endif // NO_ACTION_ONESHOT
 } split_mods_sync_t;
-#endif  // SPLIT_MODS_ENABLE
+#endif // SPLIT_MODS_ENABLE
 
 #if defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 #    include "pointing_device.h"
@@ -113,7 +113,7 @@ typedef struct _split_slave_pointing_sync_t {
     report_mouse_t report;
     uint16_t       cpi;
 } split_slave_pointing_sync_t;
-#endif  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+#endif // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 typedef struct _rpc_sync_info_t {
@@ -121,76 +121,76 @@ typedef struct _rpc_sync_info_t {
     uint8_t m2s_length;
     uint8_t s2m_length;
 } rpc_sync_info_t;
-#endif  // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+#endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 
 typedef struct _split_shared_memory_t {
 #ifdef USE_I2C
     int8_t transaction_id;
-#endif  // USE_I2C
+#endif // USE_I2C
 
     split_slave_matrix_sync_t smatrix;
 
 #ifdef SPLIT_TRANSPORT_MIRROR
     split_master_matrix_sync_t mmatrix;
-#endif  // SPLIT_TRANSPORT_MIRROR
+#endif // SPLIT_TRANSPORT_MIRROR
 
 #ifdef ENCODER_ENABLE
     split_slave_encoder_sync_t encoders;
-#endif  // ENCODER_ENABLE
+#endif // ENCODER_ENABLE
 
 #ifndef DISABLE_SYNC_TIMER
     uint32_t sync_timer;
-#endif  // DISABLE_SYNC_TIMER
+#endif // DISABLE_SYNC_TIMER
 
 #if !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
     split_layers_sync_t layers;
-#endif  // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
+#endif // !defined(NO_ACTION_LAYER) && defined(SPLIT_LAYER_STATE_ENABLE)
 
 #ifdef SPLIT_LED_STATE_ENABLE
     uint8_t led_state;
-#endif  // SPLIT_LED_STATE_ENABLE
+#endif // SPLIT_LED_STATE_ENABLE
 
 #ifdef SPLIT_MODS_ENABLE
     split_mods_sync_t mods;
-#endif  // SPLIT_MODS_ENABLE
+#endif // SPLIT_MODS_ENABLE
 
 #ifdef BACKLIGHT_ENABLE
     uint8_t backlight_level;
-#endif  // BACKLIGHT_ENABLE
+#endif // BACKLIGHT_ENABLE
 
 #if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
     rgblight_syncinfo_t rgblight_sync;
-#endif  // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+#endif // defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
 
 #if defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
     led_matrix_sync_t led_matrix_sync;
-#endif  // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
+#endif // defined(LED_MATRIX_ENABLE) && defined(LED_MATRIX_SPLIT)
 
 #if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
     rgb_matrix_sync_t rgb_matrix_sync;
-#endif  // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
+#endif // defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_SPLIT)
 
 #if defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
     uint8_t current_wpm;
-#endif  // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
+#endif // defined(WPM_ENABLE) && defined(SPLIT_WPM_ENABLE)
 
 #if defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
     uint8_t current_oled_state;
-#endif  // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
+#endif // defined(OLED_ENABLE) && defined(SPLIT_OLED_ENABLE)
 
 #if defined(ST7565_ENABLE) && defined(SPLIT_ST7565_ENABLE)
     uint8_t current_st7565_state;
-#endif  // ST7565_ENABLE(OLED_ENABLE) && defined(SPLIT_ST7565_ENABLE)
+#endif // ST7565_ENABLE(OLED_ENABLE) && defined(SPLIT_ST7565_ENABLE)
 
 #if defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
     split_slave_pointing_sync_t pointing;
-#endif  // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
+#endif // defined(POINTING_DEVICE_ENABLE) && defined(SPLIT_POINTING_ENABLE)
 
 #if defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
     rpc_sync_info_t rpc_info;
     uint8_t         rpc_m2s_buffer[RPC_M2S_BUFFER_SIZE];
     uint8_t         rpc_s2m_buffer[RPC_S2M_BUFFER_SIZE];
-#endif  // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
+#endif // defined(SPLIT_TRANSACTION_IDS_KB) || defined(SPLIT_TRANSACTION_IDS_USER)
 } split_shared_memory_t;
 
 extern split_shared_memory_t *const split_shmem;
diff --git a/quantum/sync_timer.c b/quantum/sync_timer.c
index de24b463b6..217891233f 100644
--- a/quantum/sync_timer.c
+++ b/quantum/sync_timer.c
@@ -29,7 +29,9 @@ SOFTWARE.
 #if defined(SPLIT_KEYBOARD) && !defined(DISABLE_SYNC_TIMER)
 volatile int32_t sync_timer_ms;
 
-void sync_timer_init(void) { sync_timer_ms = 0; }
+void sync_timer_init(void) {
+    sync_timer_ms = 0;
+}
 
 void sync_timer_update(uint32_t time) {
     if (is_keyboard_master()) return;
diff --git a/quantum/velocikey.c b/quantum/velocikey.c
index 6b7f82d950..58e14215bb 100644
--- a/quantum/velocikey.c
+++ b/quantum/velocikey.c
@@ -13,7 +13,9 @@
 #define TYPING_SPEED_MAX_VALUE 200
 uint8_t typing_speed = 0;
 
-bool velocikey_enabled(void) { return eeprom_read_byte(EECONFIG_VELOCIKEY) == 1; }
+bool velocikey_enabled(void) {
+    return eeprom_read_byte(EECONFIG_VELOCIKEY) == 1;
+}
 
 void velocikey_toggle(void) {
     if (velocikey_enabled())
@@ -39,4 +41,6 @@ void velocikey_decelerate(void) {
     }
 }
 
-uint8_t velocikey_match_speed(uint8_t minValue, uint8_t maxValue) { return MAX(minValue, maxValue - (maxValue - minValue) * ((float)typing_speed / TYPING_SPEED_MAX_VALUE)); }
+uint8_t velocikey_match_speed(uint8_t minValue, uint8_t maxValue) {
+    return MAX(minValue, maxValue - (maxValue - minValue) * ((float)typing_speed / TYPING_SPEED_MAX_VALUE));
+}
diff --git a/quantum/via.c b/quantum/via.c
index a3bd82d9b3..05ab799cbb 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -45,7 +45,7 @@
 #include "raw_hid.h"
 #include "dynamic_keymap.h"
 #include "eeprom.h"
-#include "version.h"  // for QMK_BUILDDATE used in EEPROM magic
+#include "version.h" // for QMK_BUILDDATE used in EEPROM magic
 #include "via_ensure_keycode.h"
 
 // Forward declare some helpers.
@@ -62,7 +62,7 @@ void via_qmk_rgblight_get_value(uint8_t *data);
 // Can be called in an overriding via_init_kb() to test if keyboard level code usage of
 // EEPROM is invalid and use/save defaults.
 bool via_eeprom_is_valid(void) {
-    char *  p      = QMK_BUILDDATE;  // e.g. "2019-11-05-11:29:54"
+    char *  p      = QMK_BUILDDATE; // e.g. "2019-11-05-11:29:54"
     uint8_t magic0 = ((p[2] & 0x0F) << 4) | (p[3] & 0x0F);
     uint8_t magic1 = ((p[5] & 0x0F) << 4) | (p[6] & 0x0F);
     uint8_t magic2 = ((p[8] & 0x0F) << 4) | (p[9] & 0x0F);
@@ -73,7 +73,7 @@ bool via_eeprom_is_valid(void) {
 // Sets VIA/keyboard level usage of EEPROM to valid/invalid
 // Keyboard level code (eg. via_init_kb()) should not call this
 void via_eeprom_set_valid(bool valid) {
-    char *  p      = QMK_BUILDDATE;  // e.g. "2019-11-05-11:29:54"
+    char *  p      = QMK_BUILDDATE; // e.g. "2019-11-05-11:29:54"
     uint8_t magic0 = ((p[2] & 0x0F) << 4) | (p[3] & 0x0F);
     uint8_t magic1 = ((p[5] & 0x0F) << 4) | (p[6] & 0x0F);
     uint8_t magic2 = ((p[8] & 0x0F) << 4) | (p[9] & 0x0F);
@@ -347,13 +347,13 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
         }
         case id_dynamic_keymap_macro_get_buffer: {
             uint16_t offset = (command_data[0] << 8) | command_data[1];
-            uint16_t size   = command_data[2];  // size <= 28
+            uint16_t size   = command_data[2]; // size <= 28
             dynamic_keymap_macro_get_buffer(offset, size, &command_data[3]);
             break;
         }
         case id_dynamic_keymap_macro_set_buffer: {
             uint16_t offset = (command_data[0] << 8) | command_data[1];
-            uint16_t size   = command_data[2];  // size <= 28
+            uint16_t size   = command_data[2]; // size <= 28
             dynamic_keymap_macro_set_buffer(offset, size, &command_data[3]);
             break;
         }
@@ -367,13 +367,13 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
         }
         case id_dynamic_keymap_get_buffer: {
             uint16_t offset = (command_data[0] << 8) | command_data[1];
-            uint16_t size   = command_data[2];  // size <= 28
+            uint16_t size   = command_data[2]; // size <= 28
             dynamic_keymap_get_buffer(offset, size, &command_data[3]);
             break;
         }
         case id_dynamic_keymap_set_buffer: {
             uint16_t offset = (command_data[0] << 8) | command_data[1];
-            uint16_t size   = command_data[2];  // size <= 28
+            uint16_t size   = command_data[2]; // size <= 28
             dynamic_keymap_set_buffer(offset, size, &command_data[3]);
             break;
         }
@@ -438,7 +438,7 @@ void via_qmk_backlight_set_value(uint8_t *data) {
     }
 }
 
-#endif  // #if defined(VIA_QMK_BACKLIGHT_ENABLE)
+#endif // #if defined(VIA_QMK_BACKLIGHT_ENABLE)
 
 #if defined(VIA_QMK_RGBLIGHT_ENABLE)
 
@@ -494,4 +494,4 @@ void via_qmk_rgblight_set_value(uint8_t *data) {
     }
 }
 
-#endif  // #if defined(VIA_QMK_RGBLIGHT_ENABLE)
+#endif // #if defined(VIA_QMK_RGBLIGHT_ENABLE)
diff --git a/quantum/via.h b/quantum/via.h
index 5d16917dfa..ac29a58902 100644
--- a/quantum/via.h
+++ b/quantum/via.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "eeconfig.h"  // for EECONFIG_SIZE
+#include "eeconfig.h" // for EECONFIG_SIZE
 
 // Keyboard level code can change where VIA stores the magic.
 // The magic is the build date YYMMDD encoded as BCD in 3 bytes,
@@ -59,7 +59,7 @@
 #define VIA_PROTOCOL_VERSION 0x0009
 
 enum via_command_id {
-    id_get_protocol_version                 = 0x01,  // always 0x01
+    id_get_protocol_version                 = 0x01, // always 0x01
     id_get_keyboard_value                   = 0x02,
     id_set_keyboard_value                   = 0x03,
     id_dynamic_keymap_get_keycode           = 0x04,
@@ -82,7 +82,7 @@ enum via_command_id {
 };
 
 enum via_keyboard_value_id {
-    id_uptime              = 0x01,  //
+    id_uptime              = 0x01, //
     id_layout_options      = 0x02,
     id_switch_matrix_state = 0x03
 };
diff --git a/quantum/wpm.c b/quantum/wpm.c
index 62d4128b8e..b2e6fe0430 100644
--- a/quantum/wpm.c
+++ b/quantum/wpm.c
@@ -55,12 +55,20 @@ static uint8_t  prev_wpm        = 0;
 static uint8_t  next_wpm        = 0;
 #endif
 
-void    set_current_wpm(uint8_t new_wpm) { current_wpm = new_wpm; }
-uint8_t get_current_wpm(void) { return current_wpm; }
+void set_current_wpm(uint8_t new_wpm) {
+    current_wpm = new_wpm;
+}
+uint8_t get_current_wpm(void) {
+    return current_wpm;
+}
 
-bool wpm_keycode(uint16_t keycode) { return wpm_keycode_kb(keycode); }
+bool wpm_keycode(uint16_t keycode) {
+    return wpm_keycode_kb(keycode);
+}
 
-__attribute__((weak)) bool wpm_keycode_kb(uint16_t keycode) { return wpm_keycode_user(keycode); }
+__attribute__((weak)) bool wpm_keycode_kb(uint16_t keycode) {
+    return wpm_keycode_user(keycode);
+}
 
 __attribute__((weak)) bool wpm_keycode_user(uint16_t keycode) {
     if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
@@ -122,7 +130,7 @@ void decay_wpm(void) {
     uint32_t duration = (((periods)*PERIOD_DURATION) + elapsed);
     int32_t  wpm_now  = (60000 * presses) / (duration * WPM_ESTIMATED_WORD_SIZE);
 
-    if (wpm_now < 0)  // set some reasonable WPM measurement limits
+    if (wpm_now < 0) // set some reasonable WPM measurement limits
         wpm_now = 0;
     if (wpm_now > 240) wpm_now = 240;
 
@@ -133,7 +141,7 @@ void decay_wpm(void) {
         elapsed                        = 0;
         wpm_timer                      = timer_read32();
     }
-    if (presses < 2)  // don't guess high WPM based on a single keypress.
+    if (presses < 2) // don't guess high WPM based on a single keypress.
         wpm_now = 0;
 
 #if defined(WPM_LAUNCH_CONTROL)
@@ -150,7 +158,7 @@ void decay_wpm(void) {
         wpm_now           = 0;
         period_presses[0] = 0;
     }
-#endif  // WPM_LAUNCH_CONTROL
+#endif // WPM_LAUNCH_CONTROL
 
 #if defined(WPM_UNFILTERED)
     current_wpm = wpm_now;
diff --git a/tests/test_common/keyboard_report_util.cpp b/tests/test_common/keyboard_report_util.cpp
index e148c76beb..7908e64f7f 100644
--- a/tests/test_common/keyboard_report_util.cpp
+++ b/tests/test_common/keyboard_report_util.cpp
@@ -36,7 +36,7 @@ std::vector<uint8_t> get_keys(const report_keyboard_t& report) {
     std::sort(result.begin(), result.end());
     return result;
 }
-}  // namespace
+} // namespace
 
 bool operator==(const report_keyboard_t& lhs, const report_keyboard_t& rhs) {
     auto lhskeys = get_keys(lhs);
@@ -72,8 +72,14 @@ KeyboardReportMatcher::KeyboardReportMatcher(const std::vector<uint8_t>& keys) {
     }
 }
 
-bool KeyboardReportMatcher::MatchAndExplain(report_keyboard_t& report, MatchResultListener* listener) const { return m_report == report; }
+bool KeyboardReportMatcher::MatchAndExplain(report_keyboard_t& report, MatchResultListener* listener) const {
+    return m_report == report;
+}
 
-void KeyboardReportMatcher::DescribeTo(::std::ostream* os) const { *os << "is equal to " << m_report; }
+void KeyboardReportMatcher::DescribeTo(::std::ostream* os) const {
+    *os << "is equal to " << m_report;
+}
 
-void KeyboardReportMatcher::DescribeNegationTo(::std::ostream* os) const { *os << "is not equal to " << m_report; }
+void KeyboardReportMatcher::DescribeNegationTo(::std::ostream* os) const {
+    *os << "is not equal to " << m_report;
+}
diff --git a/tests/test_common/matrix.c b/tests/test_common/matrix.c
index 9a92a801c7..7b24d560e3 100644
--- a/tests/test_common/matrix.c
+++ b/tests/test_common/matrix.c
@@ -30,7 +30,9 @@ uint8_t matrix_scan(void) {
     return 1;
 }
 
-matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
+matrix_row_t matrix_get_row(uint8_t row) {
+    return matrix[row];
+}
 
 void matrix_print(void) {}
 
@@ -38,10 +40,16 @@ void matrix_init_kb(void) {}
 
 void matrix_scan_kb(void) {}
 
-void press_key(uint8_t col, uint8_t row) { matrix[row] |= 1 << col; }
+void press_key(uint8_t col, uint8_t row) {
+    matrix[row] |= 1 << col;
+}
 
-void release_key(uint8_t col, uint8_t row) { matrix[row] &= ~(1 << col); }
+void release_key(uint8_t col, uint8_t row) {
+    matrix[row] &= ~(1 << col);
+}
 
-void clear_all_keys(void) { memset(matrix, 0, sizeof(matrix)); }
+void clear_all_keys(void) {
+    memset(matrix, 0, sizeof(matrix));
+}
 
 void led_set(uint8_t usb_led) {}
diff --git a/tests/test_common/test_driver.cpp b/tests/test_common/test_driver.cpp
index 2fa2b6a2e7..68f1dfd17d 100644
--- a/tests/test_common/test_driver.cpp
+++ b/tests/test_common/test_driver.cpp
@@ -23,17 +23,27 @@ TestDriver::TestDriver() : m_driver{&TestDriver::keyboard_leds, &TestDriver::sen
     m_this = this;
 }
 
-TestDriver::~TestDriver() { m_this = nullptr; }
+TestDriver::~TestDriver() {
+    m_this = nullptr;
+}
 
-uint8_t TestDriver::keyboard_leds(void) { return m_this->m_leds; }
+uint8_t TestDriver::keyboard_leds(void) {
+    return m_this->m_leds;
+}
 
 void TestDriver::send_keyboard(report_keyboard_t* report) {
     test_logger.trace() << *report;
     m_this->send_keyboard_mock(*report);
 }
 
-void TestDriver::send_mouse(report_mouse_t* report) { m_this->send_mouse_mock(*report); }
+void TestDriver::send_mouse(report_mouse_t* report) {
+    m_this->send_mouse_mock(*report);
+}
 
-void TestDriver::send_system(uint16_t data) { m_this->send_system_mock(data); }
+void TestDriver::send_system(uint16_t data) {
+    m_this->send_system_mock(data);
+}
 
-void TestDriver::send_consumer(uint16_t data) { m_this->send_consumer(data); }
+void TestDriver::send_consumer(uint16_t data) {
+    m_this->send_consumer(data);
+}
diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp
index 91bf3e779e..c98a679554 100644
--- a/tests/test_common/test_fixture.cpp
+++ b/tests/test_common/test_fixture.cpp
@@ -55,7 +55,9 @@ void TestFixture::SetUpTestCase() {
 
 void TestFixture::TearDownTestCase() {}
 
-TestFixture::TestFixture() { m_this = this; }
+TestFixture::TestFixture() {
+    m_this = this;
+}
 
 TestFixture::~TestFixture() {
     test_logger.info() << "TestFixture clean-up start." << std::endl;
diff --git a/tests/test_common/test_logger.cpp b/tests/test_common/test_logger.cpp
index 959fdde5ec..efc7719d13 100644
--- a/tests/test_common/test_logger.cpp
+++ b/tests/test_common/test_logger.cpp
@@ -34,6 +34,10 @@ TestLogger& TestLogger::error() {
     return *this;
 }
 
-void TestLogger::reset() { this->m_log.str(""); };
+void TestLogger::reset() {
+    this->m_log.str("");
+};
 
-void TestLogger::print_log() { std::cerr << this->m_log.str(); }
+void TestLogger::print_log() {
+    std::cerr << this->m_log.str();
+}
diff --git a/tmk_core/protocol/arm_atsam/adc.c b/tmk_core/protocol/arm_atsam/adc.c
index 1ef1b11d57..3afcbddf10 100644
--- a/tmk_core/protocol/arm_atsam/adc.c
+++ b/tmk_core/protocol/arm_atsam/adc.c
@@ -27,10 +27,10 @@ uint16_t v_con_2_boot;
 void ADC0_clock_init(void) {
     DBGC(DC_ADC0_CLOCK_INIT_BEGIN);
 
-    MCLK->APBDMASK.bit.ADC0_ = 1;  // ADC0 Clock Enable
+    MCLK->APBDMASK.bit.ADC0_ = 1; // ADC0 Clock Enable
 
-    GCLK->PCHCTRL[ADC0_GCLK_ID].bit.GEN  = GEN_OSC0;  // Select generator clock
-    GCLK->PCHCTRL[ADC0_GCLK_ID].bit.CHEN = 1;         // Enable peripheral clock
+    GCLK->PCHCTRL[ADC0_GCLK_ID].bit.GEN  = GEN_OSC0; // Select generator clock
+    GCLK->PCHCTRL[ADC0_GCLK_ID].bit.CHEN = 1;        // Enable peripheral clock
 
     DBGC(DC_ADC0_CLOCK_INIT_COMPLETE);
 }
@@ -39,15 +39,15 @@ void ADC0_init(void) {
     DBGC(DC_ADC0_INIT_BEGIN);
 
     // MCU
-    PORT->Group[1].DIRCLR.reg           = 1 << 0;  // PB00 as input 5V
-    PORT->Group[1].DIRCLR.reg           = 1 << 1;  // PB01 as input CON2
-    PORT->Group[1].DIRCLR.reg           = 1 << 2;  // PB02 as input CON1
-    PORT->Group[1].PMUX[0].bit.PMUXE    = 1;       // PB00 mux select B ADC 5V
-    PORT->Group[1].PMUX[0].bit.PMUXO    = 1;       // PB01 mux select B ADC CON2
-    PORT->Group[1].PMUX[1].bit.PMUXE    = 1;       // PB02 mux select B ADC CON1
-    PORT->Group[1].PINCFG[0].bit.PMUXEN = 1;       // PB01 mux ADC Enable 5V
-    PORT->Group[1].PINCFG[1].bit.PMUXEN = 1;       // PB01 mux ADC Enable CON2
-    PORT->Group[1].PINCFG[2].bit.PMUXEN = 1;       // PB02 mux ADC Enable CON1
+    PORT->Group[1].DIRCLR.reg           = 1 << 0; // PB00 as input 5V
+    PORT->Group[1].DIRCLR.reg           = 1 << 1; // PB01 as input CON2
+    PORT->Group[1].DIRCLR.reg           = 1 << 2; // PB02 as input CON1
+    PORT->Group[1].PMUX[0].bit.PMUXE    = 1;      // PB00 mux select B ADC 5V
+    PORT->Group[1].PMUX[0].bit.PMUXO    = 1;      // PB01 mux select B ADC CON2
+    PORT->Group[1].PMUX[1].bit.PMUXE    = 1;      // PB02 mux select B ADC CON1
+    PORT->Group[1].PINCFG[0].bit.PMUXEN = 1;      // PB01 mux ADC Enable 5V
+    PORT->Group[1].PINCFG[1].bit.PMUXEN = 1;      // PB01 mux ADC Enable CON2
+    PORT->Group[1].PINCFG[2].bit.PMUXEN = 1;      // PB02 mux ADC Enable CON1
 
     // ADC
     ADC0->CTRLA.bit.SWRST = 1;
@@ -81,7 +81,7 @@ void ADC0_init(void) {
     }
 
     // Settling
-    ADC0->SAMPCTRL.bit.SAMPLEN = 45;  // Sampling Time Length: 1-63, 1 ADC CLK per
+    ADC0->SAMPCTRL.bit.SAMPLEN = 45; // Sampling Time Length: 1-63, 1 ADC CLK per
     while (ADC0->SYNCBUSY.bit.SAMPCTRL) {
         DBGC(DC_ADC0_SAMPCTRL_SYNCING_1);
     }
diff --git a/tmk_core/protocol/arm_atsam/adc.h b/tmk_core/protocol/arm_atsam/adc.h
index 9ab653e5a2..74fbb0e66f 100644
--- a/tmk_core/protocol/arm_atsam/adc.h
+++ b/tmk_core/protocol/arm_atsam/adc.h
@@ -34,4 +34,4 @@ extern uint16_t v_con_2_boot;
 void ADC0_clock_init(void);
 void ADC0_init(void);
 
-#endif  //_ADC_H_
+#endif //_ADC_H_
diff --git a/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h b/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
index 319ff8487d..db9827f6a2 100644
--- a/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
+++ b/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
@@ -42,6 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "./usb/udc.h"
 #    include "./usb/udi_cdc.h"
 
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
 
-#endif  //_ARM_ATSAM_PROTOCOL_H_
+#endif //_ARM_ATSAM_PROTOCOL_H_
diff --git a/tmk_core/protocol/arm_atsam/clks.c b/tmk_core/protocol/arm_atsam/clks.c
index 84ed6d83af..9b9475c616 100644
--- a/tmk_core/protocol/arm_atsam/clks.c
+++ b/tmk_core/protocol/arm_atsam/clks.c
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 volatile clk_t    system_clks;
 volatile uint64_t ms_clk;
 uint32_t          usec_delay_mult;
-#define USEC_DELAY_LOOP_CYCLES 3  // Sum of instruction cycles in us delay loop
+#define USEC_DELAY_LOOP_CYCLES 3 // Sum of instruction cycles in us delay loop
 
 const uint32_t sercom_apbbase[] = {(uint32_t)SERCOM0, (uint32_t)SERCOM1, (uint32_t)SERCOM2, (uint32_t)SERCOM3, (uint32_t)SERCOM4, (uint32_t)SERCOM5};
 const uint8_t  sercom_pchan[]   = {7, 8, 23, 24, 34, 35};
@@ -59,9 +59,9 @@ void CLK_oscctrl_init(void) {
     while (posctrl->Dpll[USE_DPLL_IND].DPLLSYNCBUSY.bit.ENABLE) {
         DBGC(DC_CLK_OSC_INIT_DPLL_SYNC_DISABLE);
     }
-    posctrl->Dpll[USE_DPLL_IND].DPLLCTRLB.bit.REFCLK = 2;          // select XOSC0 (16MHz)
-    posctrl->Dpll[USE_DPLL_IND].DPLLCTRLB.bit.DIV    = 7;          // 16 MHz / (2 * (7 + 1)) = 1 MHz
-    posctrl->Dpll[USE_DPLL_IND].DPLLRATIO.bit.LDR    = PLL_RATIO;  // 1 MHz * (PLL_RATIO(47) + 1) = 48MHz
+    posctrl->Dpll[USE_DPLL_IND].DPLLCTRLB.bit.REFCLK = 2;         // select XOSC0 (16MHz)
+    posctrl->Dpll[USE_DPLL_IND].DPLLCTRLB.bit.DIV    = 7;         // 16 MHz / (2 * (7 + 1)) = 1 MHz
+    posctrl->Dpll[USE_DPLL_IND].DPLLRATIO.bit.LDR    = PLL_RATIO; // 1 MHz * (PLL_RATIO(47) + 1) = 48MHz
     while (posctrl->Dpll[USE_DPLL_IND].DPLLSYNCBUSY.bit.DPLLRATIO) {
         DBGC(DC_CLK_OSC_INIT_DPLL_SYNC_RATIO);
     }
@@ -87,7 +87,7 @@ void CLK_oscctrl_init(void) {
     system_clks.freq_gclk[0] = system_clks.freq_dpll[0];
 
     usec_delay_mult = system_clks.freq_gclk[0] / (USEC_DELAY_LOOP_CYCLES * 1000000);
-    if (usec_delay_mult < 1) usec_delay_mult = 1;  // Never allow a multiplier of zero
+    if (usec_delay_mult < 1) usec_delay_mult = 1; // Never allow a multiplier of zero
 
     DBGC(DC_CLK_OSC_INIT_COMPLETE);
 }
@@ -240,7 +240,7 @@ uint32_t CLK_enable_timebase(void) {
     // ptc4->COUNT16.DBGCTRL.bit.DBGRUN = 1;
 
     // wave mode
-    ptc4->COUNT16.WAVE.bit.WAVEGEN = 1;  // MFRQ match frequency mode, toggle each CC match
+    ptc4->COUNT16.WAVE.bit.WAVEGEN = 1; // MFRQ match frequency mode, toggle each CC match
     // generate event for next stage
     ptc4->COUNT16.EVCTRL.bit.MCEO0 = 1;
 
@@ -272,9 +272,9 @@ uint32_t CLK_enable_timebase(void) {
         DBGC(DC_CLK_ENABLE_TIMEBASE_TC0_SYNC_SWRST_2);
     }
     // CTRLA as default
-    ptc0->COUNT32.CTRLA.bit.MODE   = 2;  // 32 bit mode
-    ptc0->COUNT32.EVCTRL.bit.TCEI  = 1;  // enable incoming events
-    ptc0->COUNT32.EVCTRL.bit.EVACT = 2;  // count events
+    ptc0->COUNT32.CTRLA.bit.MODE   = 2; // 32 bit mode
+    ptc0->COUNT32.EVCTRL.bit.TCEI  = 1; // enable incoming events
+    ptc0->COUNT32.EVCTRL.bit.EVACT = 2; // count events
 
     DBGC(DC_CLK_ENABLE_TIMEBASE_TC0_COMPLETE);
 
@@ -284,10 +284,10 @@ uint32_t CLK_enable_timebase(void) {
     pmclk->APBBMASK.bit.EVSYS_               = 1;
     pgclk->PCHCTRL[EVSYS_GCLK_ID_0].bit.GEN  = GEN_TC45;
     pgclk->PCHCTRL[EVSYS_GCLK_ID_0].bit.CHEN = 1;
-    pevsys->USER[44].reg                     = EVSYS_ID_USER_PORT_EV_0;               // TC0 will get event channel 0
-    pevsys->Channel[0].CHANNEL.bit.EDGSEL    = EVSYS_CHANNEL_EDGSEL_RISING_EDGE_Val;  // Rising edge
-    pevsys->Channel[0].CHANNEL.bit.PATH      = EVSYS_CHANNEL_PATH_SYNCHRONOUS_Val;    // Synchronous
-    pevsys->Channel[0].CHANNEL.bit.EVGEN     = EVSYS_ID_GEN_TC4_MCX_0;                // TC4 MC0
+    pevsys->USER[44].reg                     = EVSYS_ID_USER_PORT_EV_0;              // TC0 will get event channel 0
+    pevsys->Channel[0].CHANNEL.bit.EDGSEL    = EVSYS_CHANNEL_EDGSEL_RISING_EDGE_Val; // Rising edge
+    pevsys->Channel[0].CHANNEL.bit.PATH      = EVSYS_CHANNEL_PATH_SYNCHRONOUS_Val;   // Synchronous
+    pevsys->Channel[0].CHANNEL.bit.EVGEN     = EVSYS_ID_GEN_TC4_MCX_0;               // TC4 MC0
 
     DBGC(DC_CLK_ENABLE_TIMEBASE_EVSYS_COMPLETE);
 
@@ -301,15 +301,15 @@ uint32_t CLK_enable_timebase(void) {
 }
 
 void CLK_delay_us(uint32_t usec) {
-    asm("CBZ R0, return\n\t"  // If usec == 0, branch to return label
+    asm("CBZ R0, return\n\t" // If usec == 0, branch to return label
     );
-    asm("MULS R0, %0\n\t"        // Multiply R0(usec) by usec_delay_mult and store in R0
-        ".balign 16\n\t"         // Ensure loop is aligned for fastest performance
-        "loop: SUBS R0, #1\n\t"  // Subtract 1 from R0 and update flags (1 cycle)
-        "BNE loop\n\t"           // Branch if non-zero to loop label (2 cycles)  NOTE: USEC_DELAY_LOOP_CYCLES is the sum of loop cycles
-        "return:\n\t"            // Return label
-        :                        // No output registers
-        : "r"(usec_delay_mult)   // For %0
+    asm("MULS R0, %0\n\t"       // Multiply R0(usec) by usec_delay_mult and store in R0
+        ".balign 16\n\t"        // Ensure loop is aligned for fastest performance
+        "loop: SUBS R0, #1\n\t" // Subtract 1 from R0 and update flags (1 cycle)
+        "BNE loop\n\t"          // Branch if non-zero to loop label (2 cycles)  NOTE: USEC_DELAY_LOOP_CYCLES is the sum of loop cycles
+        "return:\n\t"           // Return label
+        :                       // No output registers
+        : "r"(usec_delay_mult)  // For %0
     );
     // Note: BX LR generated
 }
diff --git a/tmk_core/protocol/arm_atsam/clks.h b/tmk_core/protocol/arm_atsam/clks.h
index 72df3a8e3f..6ee71aff8f 100644
--- a/tmk_core/protocol/arm_atsam/clks.h
+++ b/tmk_core/protocol/arm_atsam/clks.h
@@ -24,14 +24,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "config_led.h"
 #    include "config.h"
 
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
 
-#define PLL_RATIO 47                // mcu frequency ((X+1)MHz)
-#define FREQ_DFLL_DEFAULT 48000000  // DFLL frequency / usb clock
-#define FREQ_SPI_DEFAULT 1000000    // spi to 595 shift regs
-#define FREQ_I2C0_DEFAULT 100000    // i2c to hub
-#define FREQ_I2C1_DEFAULT I2C_HZ    // i2c to LED drivers
-#define FREQ_TC45_DEFAULT 1000000   // 1 usec resolution
+#define PLL_RATIO 47               // mcu frequency ((X+1)MHz)
+#define FREQ_DFLL_DEFAULT 48000000 // DFLL frequency / usb clock
+#define FREQ_SPI_DEFAULT 1000000   // spi to 595 shift regs
+#define FREQ_I2C0_DEFAULT 100000   // i2c to hub
+#define FREQ_I2C1_DEFAULT I2C_HZ   // i2c to LED drivers
+#define FREQ_TC45_DEFAULT 1000000  // 1 usec resolution
 
 // I2C1 Set      ~Result     PWM Time (2x Drivers)
 //     1000000  1090000
@@ -44,10 +44,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define FREQ_XOSC0 16000000
 
-#define CHAN_SERCOM_SPI 2   // shift regs
-#define CHAN_SERCOM_I2C0 0  // hub
-#define CHAN_SERCOM_I2C1 1  // led drivers
-#define CHAN_SERCOM_UART 3  // debug util
+#define CHAN_SERCOM_SPI 2  // shift regs
+#define CHAN_SERCOM_I2C0 0 // hub
+#define CHAN_SERCOM_I2C1 1 // led drivers
+#define CHAN_SERCOM_UART 3 // debug util
 
 // Generator clock channels
 #define GEN_DPLL0 0
@@ -86,4 +86,4 @@ uint32_t CLK_set_i2c0_freq(uint8_t sercomn, uint32_t freq);
 uint32_t CLK_set_i2c1_freq(uint8_t sercomn, uint32_t freq);
 void     CLK_init(void);
 
-#endif  // _CLKS_H_
+#endif // _CLKS_H_
diff --git a/tmk_core/protocol/arm_atsam/d51_util.c b/tmk_core/protocol/arm_atsam/d51_util.c
index df596f7ba2..5903233085 100644
--- a/tmk_core/protocol/arm_atsam/d51_util.c
+++ b/tmk_core/protocol/arm_atsam/d51_util.c
@@ -34,7 +34,8 @@ void dbg_print(uint32_t x) {
     while (t >= 0) {
         p2 = t;
         p  = 1;
-        while (p2--) p *= 10;
+        while (p2--)
+            p *= 10;
         n = x / p;
         x -= n * p;
         if (!n) {
@@ -55,7 +56,7 @@ void dbg_print(uint32_t x) {
     }
 
     for (w = DBG_PAUSE; w; w--)
-        ;  // Long pause after number is complete
+        ; // Long pause after number is complete
 }
 
 // Display unsigned 32-bit number through debug led
@@ -91,7 +92,8 @@ void dled_print(uint32_t x, uint8_t long_pause) {
     while (t >= 0) {
         p2 = t;
         p  = 1;
-        while (p2--) p *= 10;
+        while (p2--)
+            p *= 10;
         n = x / p;
         x -= n * p;
         if (!n) {
@@ -188,12 +190,12 @@ void debug_code_init(void) {
     DBGC(DC_UNSET);
 
     // Configure Ports for EIC
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].DIRCLR.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN;  // Input
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].OUTSET.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN;  // High
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.INEN    = 1;                            // Input Enable
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PULLEN  = 1;                            // Pull Enable
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PMUXEN  = 1;                            // Mux Enable
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PMUX[DEBUG_BOOT_TRACING_PIN / 2].bit.PMUXO = 0;                            // Mux A
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].DIRCLR.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN; // Input
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].OUTSET.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN; // High
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.INEN    = 1;                           // Input Enable
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PULLEN  = 1;                           // Pull Enable
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PMUXEN  = 1;                           // Mux Enable
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PMUX[DEBUG_BOOT_TRACING_PIN / 2].bit.PMUXO = 0;                           // Mux A
 
     // Enable CLK_EIC_APB
     MCLK->APBAMASK.bit.EIC_ = 1;
@@ -223,12 +225,12 @@ void debug_code_disable(void) {
     }
 
     // Default port configuration
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].DIRCLR.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN;  // Input
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].OUTCLR.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN;  // Low
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.INEN    = 0;                            // Input Disable
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PULLEN  = 0;                            // Pull Disable
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PMUXEN  = 0;                            // Mux Disable
-    PORT->Group[DEBUG_BOOT_TRACING_PORT].PMUX[DEBUG_BOOT_TRACING_PIN / 2].bit.PMUXO = 0;                            // Mux A
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].DIRCLR.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN; // Input
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].OUTCLR.reg                                 = 1 << DEBUG_BOOT_TRACING_PIN; // Low
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.INEN    = 0;                           // Input Disable
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PULLEN  = 0;                           // Pull Disable
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PINCFG[DEBUG_BOOT_TRACING_PIN].bit.PMUXEN  = 0;                           // Mux Disable
+    PORT->Group[DEBUG_BOOT_TRACING_PORT].PMUX[DEBUG_BOOT_TRACING_PIN / 2].bit.PMUXO = 0;                           // Mux A
 
     // Disable CLK_EIC_APB
     MCLK->APBAMASK.bit.EIC_ = 0;
@@ -239,4 +241,4 @@ void debug_code_disable(void) {
 void debug_code_init(void) {}
 void debug_code_disable(void) {}
 
-#endif  // DEBUG_BOOT_TRACING_ENABLE
+#endif // DEBUG_BOOT_TRACING_ENABLE
diff --git a/tmk_core/protocol/arm_atsam/d51_util.h b/tmk_core/protocol/arm_atsam/d51_util.h
index 89cf338d23..d301e55411 100644
--- a/tmk_core/protocol/arm_atsam/d51_util.h
+++ b/tmk_core/protocol/arm_atsam/d51_util.h
@@ -219,6 +219,6 @@ enum debug_code_list {
 #    define DBGC(n) \
         {}
 
-#endif  // DEBUG_BOOT_TRACING_ENABLE
+#endif // DEBUG_BOOT_TRACING_ENABLE
 
-#endif  //_D51_UTIL_H_
+#endif //_D51_UTIL_H_
diff --git a/tmk_core/protocol/arm_atsam/i2c_master.c b/tmk_core/protocol/arm_atsam/i2c_master.c
index af046625f4..6b0b9a703b 100644
--- a/tmk_core/protocol/arm_atsam/i2c_master.c
+++ b/tmk_core/protocol/arm_atsam/i2c_master.c
@@ -26,21 +26,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "config_led.h"
 #    include "matrix.h"
 
-#    define I2C_LED_USE_DMA 1  // Set 1 to use background DMA transfers for leds, Set 0 to use inline software transfers
+#    define I2C_LED_USE_DMA 1 // Set 1 to use background DMA transfers for leds, Set 0 to use inline software transfers
 
 DmacDescriptor dmac_desc;
 DmacDescriptor dmac_desc_wb;
 
-static uint8_t i2c_led_q[I2C_Q_SIZE];  // I2C queue circular buffer
-static uint8_t i2c_led_q_s;            // Start of circular buffer
-static uint8_t i2c_led_q_e;            // End of circular buffer
-static uint8_t i2c_led_q_full;         // Queue full counter for reset
+static uint8_t i2c_led_q[I2C_Q_SIZE]; // I2C queue circular buffer
+static uint8_t i2c_led_q_s;           // Start of circular buffer
+static uint8_t i2c_led_q_e;           // End of circular buffer
+static uint8_t i2c_led_q_full;        // Queue full counter for reset
 
-static uint8_t dma_sendbuf[I2C_DMA_MAX_SEND];  // Data being written to I2C
+static uint8_t dma_sendbuf[I2C_DMA_MAX_SEND]; // Data being written to I2C
 
 volatile uint8_t i2c_led_q_running;
 
-#endif  // !defined(MD_BOOTLOADER) && defined(RGB_MATRIX_ENABLE)
+#endif // !defined(MD_BOOTLOADER) && defined(RGB_MATRIX_ENABLE)
 
 void i2c0_init(void) {
     DBGC(DC_I2C0_INIT_BEGIN);
@@ -56,23 +56,23 @@ void i2c0_init(void) {
     // I2C
     // Note: SW Reset handled in CLK_set_i2c0_freq clks.c
 
-    SERCOM0->I2CM.CTRLA.bit.MODE = 5;  // Set master mode
+    SERCOM0->I2CM.CTRLA.bit.MODE = 5; // Set master mode
 
-    SERCOM0->I2CM.CTRLA.bit.SPEED    = 0;  // Set to 1 for Fast-mode Plus (FM+) up to 1 MHz
-    SERCOM0->I2CM.CTRLA.bit.RUNSTDBY = 1;  // Enabled
+    SERCOM0->I2CM.CTRLA.bit.SPEED    = 0; // Set to 1 for Fast-mode Plus (FM+) up to 1 MHz
+    SERCOM0->I2CM.CTRLA.bit.RUNSTDBY = 1; // Enabled
 
-    SERCOM0->I2CM.CTRLA.bit.ENABLE = 1;  // Enable the device
+    SERCOM0->I2CM.CTRLA.bit.ENABLE = 1; // Enable the device
     while (SERCOM0->I2CM.SYNCBUSY.bit.ENABLE) {
         DBGC(DC_I2C0_INIT_SYNC_ENABLING);
-    }  // Wait for SYNCBUSY.ENABLE to clear
+    } // Wait for SYNCBUSY.ENABLE to clear
 
-    SERCOM0->I2CM.STATUS.bit.BUSSTATE = 1;  // Force into IDLE state
+    SERCOM0->I2CM.STATUS.bit.BUSSTATE = 1; // Force into IDLE state
     while (SERCOM0->I2CM.SYNCBUSY.bit.SYSOP) {
         DBGC(DC_I2C0_INIT_SYNC_SYSOP);
     }
     while (SERCOM0->I2CM.STATUS.bit.BUSSTATE != 1) {
         DBGC(DC_I2C0_INIT_WAIT_IDLE);
-    }  // Wait while not idle
+    } // Wait while not idle
 
     DBGC(DC_I2C0_INIT_COMPLETE);
 }
@@ -139,27 +139,27 @@ void i2c1_init(void) {
     /* I2C */
     // Note: SW Reset handled in CLK_set_i2c1_freq clks.c
 
-    SERCOM1->I2CM.CTRLA.bit.MODE     = 5;  // MODE: Set master mode (No sync)
-    SERCOM1->I2CM.CTRLA.bit.SPEED    = 1;  // SPEED: Fm+ up to 1MHz (No sync)
-    SERCOM1->I2CM.CTRLA.bit.RUNSTDBY = 1;  // RUNSTBY: Enabled (No sync)
+    SERCOM1->I2CM.CTRLA.bit.MODE     = 5; // MODE: Set master mode (No sync)
+    SERCOM1->I2CM.CTRLA.bit.SPEED    = 1; // SPEED: Fm+ up to 1MHz (No sync)
+    SERCOM1->I2CM.CTRLA.bit.RUNSTDBY = 1; // RUNSTBY: Enabled (No sync)
 
-    SERCOM1->I2CM.CTRLB.bit.SMEN = 1;  // SMEN: Smart mode enabled (For DMA)(No sync)
+    SERCOM1->I2CM.CTRLB.bit.SMEN = 1; // SMEN: Smart mode enabled (For DMA)(No sync)
 
     NVIC_EnableIRQ(SERCOM1_0_IRQn);
     SERCOM1->I2CM.INTENSET.bit.ERROR = 1;
 
-    SERCOM1->I2CM.CTRLA.bit.ENABLE = 1;  // ENABLE: Enable the device (sync SYNCBUSY.ENABLE)
+    SERCOM1->I2CM.CTRLA.bit.ENABLE = 1; // ENABLE: Enable the device (sync SYNCBUSY.ENABLE)
     while (SERCOM1->I2CM.SYNCBUSY.bit.ENABLE) {
         DBGC(DC_I2C1_INIT_SYNC_ENABLING);
-    }  // Wait for SYNCBUSY.ENABLE to clear
+    } // Wait for SYNCBUSY.ENABLE to clear
 
-    SERCOM1->I2CM.STATUS.bit.BUSSTATE = 1;  // BUSSTATE: Force into IDLE state (sync SYNCBUSY.SYSOP)
+    SERCOM1->I2CM.STATUS.bit.BUSSTATE = 1; // BUSSTATE: Force into IDLE state (sync SYNCBUSY.SYSOP)
     while (SERCOM1->I2CM.SYNCBUSY.bit.SYSOP) {
         DBGC(DC_I2C1_INIT_SYNC_SYSOP);
     }
     while (SERCOM1->I2CM.STATUS.bit.BUSSTATE != 1) {
         DBGC(DC_I2C1_INIT_WAIT_IDLE);
-    }  // Wait while not idle
+    } // Wait while not idle
 
     DBGC(DC_I2C1_INIT_COMPLETE);
 }
@@ -240,7 +240,7 @@ void i2c_led_send_onoff(uint8_t drvid) {
     }
 #    endif
 
-    *issidrv[drvid].onoff = 0;  // Force start location offset to zero
+    *issidrv[drvid].onoff = 0; // Force start location offset to zero
     i2c1_transmit(issidrv[drvid].addr, issidrv[drvid].onoff, ISSI3733_PG0_BYTES, 0);
 }
 
@@ -265,7 +265,7 @@ void i2c_led_send_pwm(uint8_t drvid) {
     }
 #    endif
 
-    *issidrv[drvid].pwm = 0;  // Force start location offset to zero
+    *issidrv[drvid].pwm = 0; // Force start location offset to zero
     i2c1_transmit(issidrv[drvid].addr, issidrv[drvid].pwm, ISSI3733_PG1_BYTES, 0);
 }
 
@@ -300,12 +300,12 @@ uint8_t I2C3733_Init_Drivers(void) {
     // Set up master device
     i2c_led_send_CRWL(0);
     i2c_led_select_page(0, 3);
-    i2c_led_send_mode_op_gcr(0, 0, ISSI3733_CR_SSD_NORMAL);  // No SYNC due to brightness mismatch with second driver
+    i2c_led_send_mode_op_gcr(0, 0, ISSI3733_CR_SSD_NORMAL); // No SYNC due to brightness mismatch with second driver
 
     // Set up slave device
     i2c_led_send_CRWL(1);
     i2c_led_select_page(1, 3);
-    i2c_led_send_mode_op_gcr(1, 0, ISSI3733_CR_SSD_NORMAL);  // No SYNC due to brightness mismatch with first driver and slight flicker at rgb values 1,2
+    i2c_led_send_mode_op_gcr(1, 0, ISSI3733_CR_SSD_NORMAL); // No SYNC due to brightness mismatch with first driver and slight flicker at rgb values 1,2
 
     i2c_led_send_CRWL(0);
     i2c_led_select_page(0, 3);
@@ -326,41 +326,41 @@ void I2C_DMAC_LED_Init(void) {
     DBGC(DC_I2C_DMAC_LED_INIT_BEGIN);
 
     // Disable device
-    dmac->CTRL.bit.DMAENABLE = 0;  // Disable DMAC
+    dmac->CTRL.bit.DMAENABLE = 0; // Disable DMAC
     while (dmac->CTRL.bit.DMAENABLE) {
-    }                          // Wait for disabled state in case of ongoing transfers
-    dmac->CTRL.bit.SWRST = 1;  // Software Reset DMAC
+    }                         // Wait for disabled state in case of ongoing transfers
+    dmac->CTRL.bit.SWRST = 1; // Software Reset DMAC
     while (dmac->CTRL.bit.SWRST) {
-    }  // Wait for software reset to complete
+    } // Wait for software reset to complete
 
     // Configure device
-    dmac->BASEADDR.reg = (uint32_t)&dmac_desc;     // Set descriptor base address
-    dmac->WRBADDR.reg  = (uint32_t)&dmac_desc_wb;  // Set descriptor write back address
-    dmac->CTRL.reg |= 0x0f00;                      // Handle all priorities (LVL0-3)
+    dmac->BASEADDR.reg = (uint32_t)&dmac_desc;    // Set descriptor base address
+    dmac->WRBADDR.reg  = (uint32_t)&dmac_desc_wb; // Set descriptor write back address
+    dmac->CTRL.reg |= 0x0f00;                     // Handle all priorities (LVL0-3)
 
     // Disable channel
-    dmac->Channel[0].CHCTRLA.bit.ENABLE = 0;  // Disable the channel
+    dmac->Channel[0].CHCTRLA.bit.ENABLE = 0; // Disable the channel
     while (dmac->Channel[0].CHCTRLA.bit.ENABLE) {
-    }                                        // Wait for disabled state in case of ongoing transfers
-    dmac->Channel[0].CHCTRLA.bit.SWRST = 1;  // Software Reset the channel
+    }                                       // Wait for disabled state in case of ongoing transfers
+    dmac->Channel[0].CHCTRLA.bit.SWRST = 1; // Software Reset the channel
     while (dmac->Channel[0].CHCTRLA.bit.SWRST) {
-    }  // Wait for software reset to complete
+    } // Wait for software reset to complete
 
     // Configure channel
-    dmac->Channel[0].CHCTRLA.bit.THRESHOLD = 0;                   // 1BEAT
-    dmac->Channel[0].CHCTRLA.bit.BURSTLEN  = 0;                   // SINGLE
-    dmac->Channel[0].CHCTRLA.bit.TRIGACT   = 2;                   // BURST
-    dmac->Channel[0].CHCTRLA.bit.TRIGSRC   = SERCOM1_DMAC_ID_TX;  // Trigger source
-    dmac->Channel[0].CHCTRLA.bit.RUNSTDBY  = 1;                   // Run in standby
+    dmac->Channel[0].CHCTRLA.bit.THRESHOLD = 0;                  // 1BEAT
+    dmac->Channel[0].CHCTRLA.bit.BURSTLEN  = 0;                  // SINGLE
+    dmac->Channel[0].CHCTRLA.bit.TRIGACT   = 2;                  // BURST
+    dmac->Channel[0].CHCTRLA.bit.TRIGSRC   = SERCOM1_DMAC_ID_TX; // Trigger source
+    dmac->Channel[0].CHCTRLA.bit.RUNSTDBY  = 1;                  // Run in standby
 
     NVIC_EnableIRQ(DMAC_0_IRQn);
     dmac->Channel[0].CHINTENSET.bit.TCMPL = 1;
     dmac->Channel[0].CHINTENSET.bit.TERR  = 1;
 
     // Enable device
-    dmac->CTRL.bit.DMAENABLE = 1;  // Enable DMAC
+    dmac->CTRL.bit.DMAENABLE = 1; // Enable DMAC
     while (dmac->CTRL.bit.DMAENABLE == 0) {
-    }  // Wait for enable state
+    } // Wait for enable state
 
     DBGC(DC_I2C_DMAC_LED_INIT_COMPLETE);
 }
@@ -377,14 +377,14 @@ void I2C3733_Control_Set(uint8_t state) {
 }
 
 void i2c_led_desc_defaults(void) {
-    dmac_desc.BTCTRL.bit.STEPSIZE = 0;  // SRCINC used in favor for auto 1 inc
-    dmac_desc.BTCTRL.bit.STEPSEL  = 0;  // SRCINC used in favor for auto 1 inc
-    dmac_desc.BTCTRL.bit.DSTINC   = 0;  // The Destination Address Increment is disabled
-    dmac_desc.BTCTRL.bit.SRCINC   = 1;  // The Source Address Increment is enabled (Inc by 1)
-    dmac_desc.BTCTRL.bit.BEATSIZE = 0;  // 8-bit bus transfer
-    dmac_desc.BTCTRL.bit.BLOCKACT = 0;  // Channel will be disabled if it is the last block transfer in the transaction
-    dmac_desc.BTCTRL.bit.EVOSEL   = 0;  // Event generation disabled
-    dmac_desc.BTCTRL.bit.VALID    = 1;  // Set dmac valid
+    dmac_desc.BTCTRL.bit.STEPSIZE = 0; // SRCINC used in favor for auto 1 inc
+    dmac_desc.BTCTRL.bit.STEPSEL  = 0; // SRCINC used in favor for auto 1 inc
+    dmac_desc.BTCTRL.bit.DSTINC   = 0; // The Destination Address Increment is disabled
+    dmac_desc.BTCTRL.bit.SRCINC   = 1; // The Source Address Increment is enabled (Inc by 1)
+    dmac_desc.BTCTRL.bit.BEATSIZE = 0; // 8-bit bus transfer
+    dmac_desc.BTCTRL.bit.BLOCKACT = 0; // Channel will be disabled if it is the last block transfer in the transaction
+    dmac_desc.BTCTRL.bit.EVOSEL   = 0; // Event generation disabled
+    dmac_desc.BTCTRL.bit.VALID    = 1; // Set dmac valid
 }
 
 void i2c_led_prepare_send_dma(uint8_t *data, uint8_t len) {
@@ -397,9 +397,9 @@ void i2c_led_prepare_send_dma(uint8_t *data, uint8_t len) {
 }
 
 void i2c_led_begin_dma(uint8_t drvid) {
-    DMAC->Channel[0].CHCTRLA.bit.ENABLE = 1;  // Enable the channel
+    DMAC->Channel[0].CHCTRLA.bit.ENABLE = 1; // Enable the channel
 
-    SERCOM1->I2CM.ADDR.reg = (dmac_desc.BTCNT.reg << 16) | 0x2000 | issidrv[drvid].addr;  // Begin transfer
+    SERCOM1->I2CM.ADDR.reg = (dmac_desc.BTCNT.reg << 16) | 0x2000 | issidrv[drvid].addr; // Begin transfer
 }
 
 void i2c_led_send_CRWL_dma(uint8_t drvid) {
@@ -429,7 +429,7 @@ void i2c_led_send_GCR_dma(uint8_t drvid) {
 void i2c_led_send_pwm_dma(uint8_t drvid) {
     // Note: This copies the CURRENT pwm buffer, which may be getting modified
     memcpy(dma_sendbuf, issidrv[drvid].pwm, ISSI3733_PG1_BYTES);
-    *dma_sendbuf = 0;  // Force start location offset to zero
+    *dma_sendbuf = 0; // Force start location offset to zero
     i2c_led_prepare_send_dma(dma_sendbuf, ISSI3733_PG1_BYTES);
 
     i2c_led_begin_dma(drvid);
@@ -438,7 +438,7 @@ void i2c_led_send_pwm_dma(uint8_t drvid) {
 void i2c_led_send_onoff_dma(uint8_t drvid) {
     // Note: This copies the CURRENT onoff buffer, which may be getting modified
     memcpy(dma_sendbuf, issidrv[drvid].onoff, ISSI3733_PG0_BYTES);
-    *dma_sendbuf = 0;  // Force start location offset to zero
+    *dma_sendbuf = 0; // Force start location offset to zero
     i2c_led_prepare_send_dma(dma_sendbuf, ISSI3733_PG0_BYTES);
 
     i2c_led_begin_dma(drvid);
@@ -452,12 +452,16 @@ void i2c_led_q_init(void) {
     i2c_led_q_full    = 0;
 }
 
-uint8_t i2c_led_q_isempty(void) { return i2c_led_q_s == i2c_led_q_e; }
+uint8_t i2c_led_q_isempty(void) {
+    return i2c_led_q_s == i2c_led_q_e;
+}
 
-uint8_t i2c_led_q_size(void) { return (i2c_led_q_e - i2c_led_q_s) % I2C_Q_SIZE; }
+uint8_t i2c_led_q_size(void) {
+    return (i2c_led_q_e - i2c_led_q_s) % I2C_Q_SIZE;
+}
 
 uint8_t i2c_led_q_available(void) {
-    return I2C_Q_SIZE - i2c_led_q_size() - 1;  // Never allow end to meet start
+    return I2C_Q_SIZE - i2c_led_q_size() - 1; // Never allow end to meet start
 }
 
 void i2c_led_q_add(uint8_t cmd) {
@@ -466,11 +470,11 @@ void i2c_led_q_add(uint8_t cmd) {
     // Assign command
     i2c_led_q[i2c_led_q_e] = cmd;
 
-    i2c_led_q_e = (i2c_led_q_e + 1) % I2C_Q_SIZE;  // Move end up one or wrap
+    i2c_led_q_e = (i2c_led_q_e + 1) % I2C_Q_SIZE; // Move end up one or wrap
 }
 
 void i2c_led_q_s_advance(void) {
-    i2c_led_q_s = (i2c_led_q_s + 1) % I2C_Q_SIZE;  // Move start up one or wrap
+    i2c_led_q_s = (i2c_led_q_s + 1) % I2C_Q_SIZE; // Move start up one or wrap
 }
 
 // Always request room before adding commands
@@ -480,7 +484,7 @@ uint8_t i2c_led_q_request_room(uint8_t request_size) {
     if (request_size > i2c_led_q_available()) {
         i2c_led_q_full++;
 
-        if (i2c_led_q_full >= 100)  // Give the queue a chance to clear up
+        if (i2c_led_q_full >= 100) // Give the queue a chance to clear up
         {
             DBG_LED_ON;
             I2C_DMAC_LED_Init();
@@ -554,7 +558,7 @@ uint8_t i2c_led_q_run(void) {
 #    endif
         }
 
-        i2c_led_q_s_advance();  // Advance last run command or if the command byte was not serviced
+        i2c_led_q_s_advance(); // Advance last run command or if the command byte was not serviced
 
 #    if I2C_LED_USE_DMA != 1
     }
@@ -583,4 +587,4 @@ i2c_status_t i2c_transmit(uint8_t address, const uint8_t *data, uint16_t length,
     return ret ? I2C_STATUS_SUCCESS : I2C_STATUS_ERROR;
 }
 
-#endif  // !defined(MD_BOOTLOADER) && defined(RGB_MATRIX_ENABLE)
+#endif // !defined(MD_BOOTLOADER) && defined(RGB_MATRIX_ENABLE)
diff --git a/tmk_core/protocol/arm_atsam/i2c_master.h b/tmk_core/protocol/arm_atsam/i2c_master.h
index e11235d447..5459923de4 100644
--- a/tmk_core/protocol/arm_atsam/i2c_master.h
+++ b/tmk_core/protocol/arm_atsam/i2c_master.h
@@ -95,7 +95,7 @@ void    i2c1_init(void);
 uint8_t i2c1_transmit(uint8_t address, uint8_t *data, uint16_t length, uint16_t timeout);
 void    i2c1_stop(void);
 
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
 
 void    i2c0_init(void);
 uint8_t i2c0_transmit(uint8_t address, uint8_t *data, uint16_t length, uint16_t timeout);
@@ -110,4 +110,4 @@ typedef int16_t i2c_status_t;
 void         i2c_init(void);
 i2c_status_t i2c_transmit(uint8_t address, const uint8_t *data, uint16_t length, uint16_t timeout);
 
-#endif  // _I2C_MASTER_H_
+#endif // _I2C_MASTER_H_
diff --git a/tmk_core/protocol/arm_atsam/issi3733_driver.h b/tmk_core/protocol/arm_atsam/issi3733_driver.h
index bd29fe76b6..c01f147e13 100644
--- a/tmk_core/protocol/arm_atsam/issi3733_driver.h
+++ b/tmk_core/protocol/arm_atsam/issi3733_driver.h
@@ -20,29 +20,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // ISII3733 Registers
 
-#define ISSI3733_CMDR 0xFD  // Command Register (Write Only)
+#define ISSI3733_CMDR 0xFD // Command Register (Write Only)
 
-#define ISSI3733_CMDRWL 0xFE                    // Command Register Write Lock (Read/Write)
-#define ISSI3733_CMDRWL_WRITE_DISABLE 0x00      // Lock register
-#define ISSI3733_CMDRWL_WRITE_ENABLE_ONCE 0xC5  // Enable one write to register then reset to locked
+#define ISSI3733_CMDRWL 0xFE                   // Command Register Write Lock (Read/Write)
+#define ISSI3733_CMDRWL_WRITE_DISABLE 0x00     // Lock register
+#define ISSI3733_CMDRWL_WRITE_ENABLE_ONCE 0xC5 // Enable one write to register then reset to locked
 
-#define ISSI3733_IMR 0xF0         // Interrupt Mask Register (Write Only)
-#define ISSI3733_IMR_IAC_ON 0x08  // Auto Clear Interrupt Bit - Interrupt auto clear when INTB stay low exceeds 8ms
-#define ISSI3733_IMR_IAB_ON 0x04  // Auto Breath Interrupt Bit - Enable auto breath loop finish interrupt
-#define ISSI3733_IMR_IS_ON 0x02   // Dot Short Interrupt Bit - Enable dot short interrupt
-#define ISSI3733_IMR_IO_ON 0x01   // Dot Open Interrupt Bit - Enable dot open interrupt
+#define ISSI3733_IMR 0xF0        // Interrupt Mask Register (Write Only)
+#define ISSI3733_IMR_IAC_ON 0x08 // Auto Clear Interrupt Bit - Interrupt auto clear when INTB stay low exceeds 8ms
+#define ISSI3733_IMR_IAB_ON 0x04 // Auto Breath Interrupt Bit - Enable auto breath loop finish interrupt
+#define ISSI3733_IMR_IS_ON 0x02  // Dot Short Interrupt Bit - Enable dot short interrupt
+#define ISSI3733_IMR_IO_ON 0x01  // Dot Open Interrupt Bit - Enable dot open interrupt
 
-#define ISSI3733_ISR 0xF1              // Interrupt Status Register (Read Only)
-#define ISSI3733_ISR_ABM3_FINISH 0x10  // Auto Breath Mode 3 Finish Bit - ABM3 finished
-#define ISSI3733_ISR_ABM2_FINISH 0x08  // Auto Breath Mode 2 Finish Bit - ABM2 finished
-#define ISSI3733_ISR_ABM1_FINISH 0x04  // Auto Breath Mode 1 Finish Bit - ABM1 finished
-#define ISSI3733_ISR_SB 0x02           // Short Bit - Shorted
-#define ISSI3733_ISR_OB 0x01           // Open Bit - Opened
+#define ISSI3733_ISR 0xF1             // Interrupt Status Register (Read Only)
+#define ISSI3733_ISR_ABM3_FINISH 0x10 // Auto Breath Mode 3 Finish Bit - ABM3 finished
+#define ISSI3733_ISR_ABM2_FINISH 0x08 // Auto Breath Mode 2 Finish Bit - ABM2 finished
+#define ISSI3733_ISR_ABM1_FINISH 0x04 // Auto Breath Mode 1 Finish Bit - ABM1 finished
+#define ISSI3733_ISR_SB 0x02          // Short Bit - Shorted
+#define ISSI3733_ISR_OB 0x01          // Open Bit - Opened
 
-#define ISSI3733_PG0 0x00  // LED Control Register
-#define ISSI3733_PG1 0x01  // PWM Register
-#define ISSI3733_PG2 0x02  // Auto Breath Mode Register
-#define ISSI3733_PG3 0x03  // Function Register
+#define ISSI3733_PG0 0x00 // LED Control Register
+#define ISSI3733_PG1 0x01 // PWM Register
+#define ISSI3733_PG2 0x02 // Auto Breath Mode Register
+#define ISSI3733_PG3 0x03 // Function Register
 
 #define ISSI3733_PG_ONOFF ISSI3733_PG0
 #define ISSI3733_PG_OR ISSI3733_PG0
@@ -51,88 +51,88 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ISSI3733_PG_ABM ISSI3733_PG2
 #define ISSI3733_PG_FN ISSI3733_PG3
 
-#define ISSI3733_CR 0x00  // Configuration Register
+#define ISSI3733_CR 0x00 // Configuration Register
 
 // PG3: Configuration Register: Synchronize Configuration
-#define ISSI3733_CR_SYNC_MASTER 0x40    // Master
-#define ISSI3733_CR_SYNC_SLAVE 0x80     // Slave
-#define ISSI3733_CR_SYNC_HIGH_IMP 0xC0  // High Impedance
+#define ISSI3733_CR_SYNC_MASTER 0x40   // Master
+#define ISSI3733_CR_SYNC_SLAVE 0x80    // Slave
+#define ISSI3733_CR_SYNC_HIGH_IMP 0xC0 // High Impedance
 
 // PG3: Configuration Register: Open/Short Detection Enable Bit
 //#define ISSI3733_CR_OSD_DISABLE 0x00          //Disable open/short detection
-#define ISSI3733_CR_OSD_ENABLE 0x04  // Enable open/short detection
+#define ISSI3733_CR_OSD_ENABLE 0x04 // Enable open/short detection
 
 // PG3: Configuration Register: Auto Breath Enable
 //#define ISSI3733_CR_B_EN_PWM 0x00             //PWM Mode Enable
-#define ISSI3733_CR_B_EN_AUTO 0x02  // Auto Breath Mode Enable
+#define ISSI3733_CR_B_EN_AUTO 0x02 // Auto Breath Mode Enable
 
 // PG3: Configuration Register: Software Shutdown Control
 //#define ISSI3733_CR_SSD_SHUTDOWN 0x00         //Software shutdown
-#define ISSI3733_CR_SSD_NORMAL 0x01  // Normal operation
+#define ISSI3733_CR_SSD_NORMAL 0x01 // Normal operation
 
-#define ISSI3733_GCCR 0x01  // Global Current Control Register
+#define ISSI3733_GCCR 0x01 // Global Current Control Register
 
 // 1 Byte, Iout = (GCC / 256) * (840 / Rext)
 // TODO: Give user define for Rext
 
 // PG3: Auto Breath Control Register 1
-#define ISSI3733_ABCR1_ABM1 0x02  // Auto Breath Control Register 1 of ABM-1
-#define ISSI3733_ABCR1_ABM2 0x06  // Auto Breath Control Register 1 of ABM-2
-#define ISSI3733_ABCR1_ABM3 0x0A  // Auto Breath Control Register 1 of ABM-3
+#define ISSI3733_ABCR1_ABM1 0x02 // Auto Breath Control Register 1 of ABM-1
+#define ISSI3733_ABCR1_ABM2 0x06 // Auto Breath Control Register 1 of ABM-2
+#define ISSI3733_ABCR1_ABM3 0x0A // Auto Breath Control Register 1 of ABM-3
 
 // Rise time
-#define ISSI3733_ABCR1_T1_0021 0x00  // 0.21s
-#define ISSI3733_ABCR1_T1_0042 0x20  // 0.42s
-#define ISSI3733_ABCR1_T1_0084 0x40  // 0.84s
-#define ISSI3733_ABCR1_T1_0168 0x60  // 1.68s
-#define ISSI3733_ABCR1_T1_0336 0x80  // 3.36s
-#define ISSI3733_ABCR1_T1_0672 0xA0  // 6.72s
-#define ISSI3733_ABCR1_T1_1344 0xC0  // 13.44s
-#define ISSI3733_ABCR1_T1_2688 0xE0  // 26.88s
+#define ISSI3733_ABCR1_T1_0021 0x00 // 0.21s
+#define ISSI3733_ABCR1_T1_0042 0x20 // 0.42s
+#define ISSI3733_ABCR1_T1_0084 0x40 // 0.84s
+#define ISSI3733_ABCR1_T1_0168 0x60 // 1.68s
+#define ISSI3733_ABCR1_T1_0336 0x80 // 3.36s
+#define ISSI3733_ABCR1_T1_0672 0xA0 // 6.72s
+#define ISSI3733_ABCR1_T1_1344 0xC0 // 13.44s
+#define ISSI3733_ABCR1_T1_2688 0xE0 // 26.88s
 
 // Max value time
-#define ISSI3733_ABCR1_T2_0000 0x00  // 0s
-#define ISSI3733_ABCR1_T2_0021 0x02  // 0.21s
-#define ISSI3733_ABCR1_T2_0042 0x04  // 0.42s
-#define ISSI3733_ABCR1_T2_0084 0x06  // 0.84s
-#define ISSI3733_ABCR1_T2_0168 0x08  // 1.68s
-#define ISSI3733_ABCR1_T2_0336 0x0A  // 3.36s
-#define ISSI3733_ABCR1_T2_0672 0x0C  // 6.72s
-#define ISSI3733_ABCR1_T2_1344 0x0E  // 13.44s
-#define ISSI3733_ABCR1_T2_2688 0x10  // 26.88s
+#define ISSI3733_ABCR1_T2_0000 0x00 // 0s
+#define ISSI3733_ABCR1_T2_0021 0x02 // 0.21s
+#define ISSI3733_ABCR1_T2_0042 0x04 // 0.42s
+#define ISSI3733_ABCR1_T2_0084 0x06 // 0.84s
+#define ISSI3733_ABCR1_T2_0168 0x08 // 1.68s
+#define ISSI3733_ABCR1_T2_0336 0x0A // 3.36s
+#define ISSI3733_ABCR1_T2_0672 0x0C // 6.72s
+#define ISSI3733_ABCR1_T2_1344 0x0E // 13.44s
+#define ISSI3733_ABCR1_T2_2688 0x10 // 26.88s
 
 // PG3: Auto Breath Control Register 2
-#define ISSI3733_ABCR2_ABM1 0x03  // Auto Breath Control Register 2 of ABM-1
-#define ISSI3733_ABCR2_ABM2 0x07  // Auto Breath Control Register 2 of ABM-2
-#define ISSI3733_ABCR2_ABM3 0x0B  // Auto Breath Control Register 2 of ABM-3
+#define ISSI3733_ABCR2_ABM1 0x03 // Auto Breath Control Register 2 of ABM-1
+#define ISSI3733_ABCR2_ABM2 0x07 // Auto Breath Control Register 2 of ABM-2
+#define ISSI3733_ABCR2_ABM3 0x0B // Auto Breath Control Register 2 of ABM-3
 
 // Fall time
-#define ISSI3733_ABCR2_T3_0021 0x00  // 0.21s
-#define ISSI3733_ABCR2_T3_0042 0x20  // 0.42s
-#define ISSI3733_ABCR2_T3_0084 0x40  // 0.84s
-#define ISSI3733_ABCR2_T3_0168 0x60  // 1.68s
-#define ISSI3733_ABCR2_T3_0336 0x80  // 3.36s
-#define ISSI3733_ABCR2_T3_0672 0xA0  // 6.72s
-#define ISSI3733_ABCR2_T3_1344 0xC0  // 13.44s
-#define ISSI3733_ABCR2_T3_2688 0xE0  // 26.88s
+#define ISSI3733_ABCR2_T3_0021 0x00 // 0.21s
+#define ISSI3733_ABCR2_T3_0042 0x20 // 0.42s
+#define ISSI3733_ABCR2_T3_0084 0x40 // 0.84s
+#define ISSI3733_ABCR2_T3_0168 0x60 // 1.68s
+#define ISSI3733_ABCR2_T3_0336 0x80 // 3.36s
+#define ISSI3733_ABCR2_T3_0672 0xA0 // 6.72s
+#define ISSI3733_ABCR2_T3_1344 0xC0 // 13.44s
+#define ISSI3733_ABCR2_T3_2688 0xE0 // 26.88s
 
 // Min value time
-#define ISSI3733_ABCR2_T4_0000 0x00   // 0s
-#define ISSI3733_ABCR2_T4_0021 0x02   // 0.21s
-#define ISSI3733_ABCR2_T4_0042 0x04   // 0.42s
-#define ISSI3733_ABCR2_T4_0084 0x06   // 0.84s
-#define ISSI3733_ABCR2_T4_0168 0x08   // 1.68s
-#define ISSI3733_ABCR2_T4_0336 0x0A   // 3.36s
-#define ISSI3733_ABCR2_T4_0672 0x0C   // 6.72s
-#define ISSI3733_ABCR2_T4_1344 0x0E   // 13.44s
-#define ISSI3733_ABCR2_T4_2688 0x10   // 26.88s
-#define ISSI3733_ABCR2_T4_5376 0x12   // 53.76s
-#define ISSI3733_ABCR2_T4_10752 0x14  // 107.52s
+#define ISSI3733_ABCR2_T4_0000 0x00  // 0s
+#define ISSI3733_ABCR2_T4_0021 0x02  // 0.21s
+#define ISSI3733_ABCR2_T4_0042 0x04  // 0.42s
+#define ISSI3733_ABCR2_T4_0084 0x06  // 0.84s
+#define ISSI3733_ABCR2_T4_0168 0x08  // 1.68s
+#define ISSI3733_ABCR2_T4_0336 0x0A  // 3.36s
+#define ISSI3733_ABCR2_T4_0672 0x0C  // 6.72s
+#define ISSI3733_ABCR2_T4_1344 0x0E  // 13.44s
+#define ISSI3733_ABCR2_T4_2688 0x10  // 26.88s
+#define ISSI3733_ABCR2_T4_5376 0x12  // 53.76s
+#define ISSI3733_ABCR2_T4_10752 0x14 // 107.52s
 
 // PG3: Auto Breath Control Register 3
-#define ISSI3733_ABCR3_ABM1 0x04  // Auto Breath Control Register 3 of ABM-1
-#define ISSI3733_ABCR3_ABM2 0x08  // Auto Breath Control Register 3 of ABM-2
-#define ISSI3733_ABCR3_ABM3 0x0C  // Auto Breath Control Register 3 of ABM-3
+#define ISSI3733_ABCR3_ABM1 0x04 // Auto Breath Control Register 3 of ABM-1
+#define ISSI3733_ABCR3_ABM2 0x08 // Auto Breath Control Register 3 of ABM-2
+#define ISSI3733_ABCR3_ABM3 0x0C // Auto Breath Control Register 3 of ABM-3
 
 #define ISSI3733_ABCR3_LTA_LOOP_ENDLESS 0x00
 #define ISSI3733_ABCR3_LTA_LOOP_1 0x01
@@ -158,44 +158,44 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ISSI3733_ABCR3_LB_T4 0x30
 
 // Loop End
-#define ISSI3733_ABCR3_LE_T3 0x00  // End at Off state
-#define ISSI3733_ABCR3_LE_T1 0x40  // End at On State
+#define ISSI3733_ABCR3_LE_T3 0x00 // End at Off state
+#define ISSI3733_ABCR3_LE_T1 0x40 // End at On State
 
 // PG3: Auto Breath Control Register 4
-#define ISSI3733_ABCR4_ABM1 0x05  // Auto Breath Control Register 4 of ABM-1
-#define ISSI3733_ABCR4_ABM2 0x09  // Auto Breath Control Register 4 of ABM-2
-#define ISSI3733_ABCR4_ABM3 0x0D  // Auto Breath Control Register 4 of ABM-3
+#define ISSI3733_ABCR4_ABM1 0x05 // Auto Breath Control Register 4 of ABM-1
+#define ISSI3733_ABCR4_ABM2 0x09 // Auto Breath Control Register 4 of ABM-2
+#define ISSI3733_ABCR4_ABM3 0x0D // Auto Breath Control Register 4 of ABM-3
 
 #define ISSI3733_ABCR4_LTB_LOOP_ENDLESS 0x00
 // Or 8bit loop times
 
 // PG3: Time Update Register
 #define ISSI3733_TUR 0x0E
-#define ISSI3733_TUR_UPDATE 0x00  // Write to update 02h~0Dh time registers after configuring
+#define ISSI3733_TUR_UPDATE 0x00 // Write to update 02h~0Dh time registers after configuring
 
 // PG3: SWy Pull-Up Resistor Selection Register
 #define ISSI3733_SWYR_PUR 0x0F
-#define ISSI3733_SWYR_PUR_NONE 0x00   // No pull-up resistor
-#define ISSI3733_SWYR_PUR_500 0x01    // 0.5k Ohm
-#define ISSI3733_SWYR_PUR_1000 0x02   // 1.0k Ohm
-#define ISSI3733_SWYR_PUR_2000 0x03   // 2.0k Ohm
-#define ISSI3733_SWYR_PUR_4000 0x04   // 4.0k Ohm
-#define ISSI3733_SWYR_PUR_8000 0x05   // 8.0k Ohm
-#define ISSI3733_SWYR_PUR_16000 0x06  // 16k Ohm
-#define ISSI3733_SWYR_PUR_32000 0x07  // 32k Ohm
+#define ISSI3733_SWYR_PUR_NONE 0x00  // No pull-up resistor
+#define ISSI3733_SWYR_PUR_500 0x01   // 0.5k Ohm
+#define ISSI3733_SWYR_PUR_1000 0x02  // 1.0k Ohm
+#define ISSI3733_SWYR_PUR_2000 0x03  // 2.0k Ohm
+#define ISSI3733_SWYR_PUR_4000 0x04  // 4.0k Ohm
+#define ISSI3733_SWYR_PUR_8000 0x05  // 8.0k Ohm
+#define ISSI3733_SWYR_PUR_16000 0x06 // 16k Ohm
+#define ISSI3733_SWYR_PUR_32000 0x07 // 32k Ohm
 
 // PG3: CSx Pull-Down Resistor Selection Register
 #define ISSI3733_CSXR_PDR 0x10
-#define ISSI3733_CSXR_PDR_NONE 0x00   // No pull-down resistor
-#define ISSI3733_CSXR_PDR_500 0x01    // 0.5k Ohm
-#define ISSI3733_CSXR_PDR_1000 0x02   // 1.0k Ohm
-#define ISSI3733_CSXR_PDR_2000 0x03   // 2.0k Ohm
-#define ISSI3733_CSXR_PDR_4000 0x04   // 4.0k Ohm
-#define ISSI3733_CSXR_PDR_8000 0x05   // 8.0k Ohm
-#define ISSI3733_CSXR_PDR_16000 0x06  // 16k Ohm
-#define ISSI3733_CSXR_PDR_32000 0x07  // 32k Ohm
+#define ISSI3733_CSXR_PDR_NONE 0x00  // No pull-down resistor
+#define ISSI3733_CSXR_PDR_500 0x01   // 0.5k Ohm
+#define ISSI3733_CSXR_PDR_1000 0x02  // 1.0k Ohm
+#define ISSI3733_CSXR_PDR_2000 0x03  // 2.0k Ohm
+#define ISSI3733_CSXR_PDR_4000 0x04  // 4.0k Ohm
+#define ISSI3733_CSXR_PDR_8000 0x05  // 8.0k Ohm
+#define ISSI3733_CSXR_PDR_16000 0x06 // 16k Ohm
+#define ISSI3733_CSXR_PDR_32000 0x07 // 32k Ohm
 
 // PG3: Reset Register
-#define ISSI3733_RR 0x11  // Read to reset all registers to default values
+#define ISSI3733_RR 0x11 // Read to reset all registers to default values
 
-#endif  //_ISSI3733_DRIVER_H_
+#endif //_ISSI3733_DRIVER_H_
diff --git a/tmk_core/protocol/arm_atsam/main_arm_atsam.c b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
index de12821a74..d092da8682 100644
--- a/tmk_core/protocol/arm_atsam/main_arm_atsam.c
+++ b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // From keyboard's directory
 #include "config_led.h"
 
-uint8_t g_usb_state = USB_FSMSTATUS_FSMSTATE_OFF_Val;  // Saved USB state from hardware value to detect changes
+uint8_t g_usb_state = USB_FSMSTATUS_FSMSTATE_OFF_Val; // Saved USB state from hardware value to detect changes
 
 void    main_subtasks(void);
 uint8_t keyboard_leds(void);
@@ -42,7 +42,7 @@ void    send_consumer(uint16_t data);
 
 #ifdef DEFERRED_EXEC_ENABLE
 void deferred_exec_task(void);
-#endif  // DEFERRED_EXEC_ENABLE
+#endif // DEFERRED_EXEC_ENABLE
 
 host_driver_t arm_atsam_driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer};
 
@@ -53,7 +53,7 @@ uint8_t keyboard_leds(void) {
     if (keymap_config.nkro)
         return udi_hid_nkro_report_set;
     else
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
         return udi_hid_kbd_report_set;
 }
 
@@ -62,10 +62,10 @@ void send_keyboard(report_keyboard_t *report) {
 
 #ifdef NKRO_ENABLE
     if (!keymap_config.nkro) {
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
         while (udi_hid_kbd_b_report_trans_ongoing) {
             main_subtasks();
-        }  // Run other tasks while waiting for USB to be free
+        } // Run other tasks while waiting for USB to be free
 
         irqflags = __get_PRIMASK();
         __disable_irq();
@@ -81,7 +81,7 @@ void send_keyboard(report_keyboard_t *report) {
     } else {
         while (udi_hid_nkro_b_report_trans_ongoing) {
             main_subtasks();
-        }  // Run other tasks while waiting for USB to be free
+        } // Run other tasks while waiting for USB to be free
 
         irqflags = __get_PRIMASK();
         __disable_irq();
@@ -94,7 +94,7 @@ void send_keyboard(report_keyboard_t *report) {
         __DMB();
         __set_PRIMASK(irqflags);
     }
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
 }
 
 void send_mouse(report_mouse_t *report) {
@@ -111,7 +111,7 @@ void send_mouse(report_mouse_t *report) {
 
     __DMB();
     __set_PRIMASK(irqflags);
-#endif  // MOUSEKEY_ENABLE
+#endif // MOUSEKEY_ENABLE
 }
 
 #ifdef EXTRAKEY_ENABLE
@@ -130,18 +130,18 @@ void send_extra(uint8_t report_id, uint16_t data) {
     __DMB();
     __set_PRIMASK(irqflags);
 }
-#endif  // EXTRAKEY_ENABLE
+#endif // EXTRAKEY_ENABLE
 
 void send_system(uint16_t data) {
 #ifdef EXTRAKEY_ENABLE
     send_extra(REPORT_ID_SYSTEM, data);
-#endif  // EXTRAKEY_ENABLE
+#endif // EXTRAKEY_ENABLE
 }
 
 void send_consumer(uint16_t data) {
 #ifdef EXTRAKEY_ENABLE
     send_extra(REPORT_ID_CONSUMER, data);
-#endif  // EXTRAKEY_ENABLE
+#endif // EXTRAKEY_ENABLE
 }
 
 #ifdef CONSOLE_ENABLE
@@ -158,81 +158,81 @@ int8_t sendchar(uint8_t c) {
 
 void main_subtask_console_flush(void) {
     while (udi_hid_con_b_report_trans_ongoing) {
-    }  // Wait for any previous transfers to complete
+    } // Wait for any previous transfers to complete
 
     uint16_t result = console_printbuf_len;
     uint32_t irqflags;
-    char *   pconbuf  = console_printbuf;  // Pointer to start send from
-    int      send_out = CONSOLE_EPSIZE;    // Bytes to send per transfer
+    char *   pconbuf  = console_printbuf; // Pointer to start send from
+    int      send_out = CONSOLE_EPSIZE;   // Bytes to send per transfer
 
-    while (result > 0) {  // While not error and bytes remain
+    while (result > 0) { // While not error and bytes remain
         while (udi_hid_con_b_report_trans_ongoing) {
-        }  // Wait for any previous transfers to complete
+        } // Wait for any previous transfers to complete
 
         irqflags = __get_PRIMASK();
         __disable_irq();
         __DMB();
 
-        if (result < CONSOLE_EPSIZE) {                      // If remaining bytes are less than console epsize
-            memset(udi_hid_con_report, 0, CONSOLE_EPSIZE);  // Clear the buffer
-            send_out = result;                              // Send remaining size
+        if (result < CONSOLE_EPSIZE) {                     // If remaining bytes are less than console epsize
+            memset(udi_hid_con_report, 0, CONSOLE_EPSIZE); // Clear the buffer
+            send_out = result;                             // Send remaining size
         }
 
-        memcpy(udi_hid_con_report, pconbuf, send_out);  // Copy data into the send buffer
+        memcpy(udi_hid_con_report, pconbuf, send_out); // Copy data into the send buffer
 
-        udi_hid_con_b_report_valid = 1;  // Set report valid
-        udi_hid_con_send_report();       // Send report
+        udi_hid_con_b_report_valid = 1; // Set report valid
+        udi_hid_con_send_report();      // Send report
 
         __DMB();
         __set_PRIMASK(irqflags);
 
-        result -= send_out;   // Decrement result by bytes sent
-        pconbuf += send_out;  // Increment buffer point by bytes sent
+        result -= send_out;  // Decrement result by bytes sent
+        pconbuf += send_out; // Increment buffer point by bytes sent
     }
 
     console_printbuf_len = 0;
 }
 
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
 void main_subtask_usb_state(void) {
-    static uint64_t fsmstate_on_delay = 0;                          // Delay timer to be sure USB is actually operating before bringing up hardware
-    uint8_t         fsmstate_now      = USB->DEVICE.FSMSTATUS.reg;  // Current state from hardware register
+    static uint64_t fsmstate_on_delay = 0;                         // Delay timer to be sure USB is actually operating before bringing up hardware
+    uint8_t         fsmstate_now      = USB->DEVICE.FSMSTATUS.reg; // Current state from hardware register
 
-    if (fsmstate_now == USB_FSMSTATUS_FSMSTATE_SUSPEND_Val)  // If USB SUSPENDED
+    if (fsmstate_now == USB_FSMSTATUS_FSMSTATE_SUSPEND_Val) // If USB SUSPENDED
     {
-        fsmstate_on_delay = 0;  // Clear ON delay timer
+        fsmstate_on_delay = 0; // Clear ON delay timer
 
-        if (g_usb_state != USB_FSMSTATUS_FSMSTATE_SUSPEND_Val)  // If previously not SUSPENDED
+        if (g_usb_state != USB_FSMSTATUS_FSMSTATE_SUSPEND_Val) // If previously not SUSPENDED
         {
-            suspend_power_down();        // Run suspend routine
-            g_usb_state = fsmstate_now;  // Save current USB state
+            suspend_power_down();       // Run suspend routine
+            g_usb_state = fsmstate_now; // Save current USB state
         }
-    } else if (fsmstate_now == USB_FSMSTATUS_FSMSTATE_SLEEP_Val)  // Else if USB SLEEPING
+    } else if (fsmstate_now == USB_FSMSTATUS_FSMSTATE_SLEEP_Val) // Else if USB SLEEPING
     {
-        fsmstate_on_delay = 0;  // Clear ON delay timer
+        fsmstate_on_delay = 0; // Clear ON delay timer
 
-        if (g_usb_state != USB_FSMSTATUS_FSMSTATE_SLEEP_Val)  // If previously not SLEEPING
+        if (g_usb_state != USB_FSMSTATUS_FSMSTATE_SLEEP_Val) // If previously not SLEEPING
         {
-            suspend_power_down();        // Run suspend routine
-            g_usb_state = fsmstate_now;  // Save current USB state
+            suspend_power_down();       // Run suspend routine
+            g_usb_state = fsmstate_now; // Save current USB state
         }
-    } else if (fsmstate_now == USB_FSMSTATUS_FSMSTATE_ON_Val)  // Else if USB ON
+    } else if (fsmstate_now == USB_FSMSTATUS_FSMSTATE_ON_Val) // Else if USB ON
     {
-        if (g_usb_state != USB_FSMSTATUS_FSMSTATE_ON_Val)  // If previously not ON
+        if (g_usb_state != USB_FSMSTATUS_FSMSTATE_ON_Val) // If previously not ON
         {
-            if (fsmstate_on_delay == 0)  // If ON delay timer is cleared
+            if (fsmstate_on_delay == 0) // If ON delay timer is cleared
             {
-                fsmstate_on_delay = timer_read64() + 250;   // Set ON delay timer
-            } else if (timer_read64() > fsmstate_on_delay)  // Else if ON delay timer is active and timed out
+                fsmstate_on_delay = timer_read64() + 250;  // Set ON delay timer
+            } else if (timer_read64() > fsmstate_on_delay) // Else if ON delay timer is active and timed out
             {
-                suspend_wakeup_init();       // Run wakeup routine
-                g_usb_state = fsmstate_now;  // Save current USB state
+                suspend_wakeup_init();      // Run wakeup routine
+                g_usb_state = fsmstate_now; // Save current USB state
             }
         }
-    } else  // Else if USB is in a state not being tracked
+    } else // Else if USB is in a state not being tracked
     {
-        fsmstate_on_delay = 0;  // Clear ON delay timer
+        fsmstate_on_delay = 0; // Clear ON delay timer
     }
 }
 
@@ -262,7 +262,9 @@ void main_subtask_usb_extra_device(void) {
 }
 
 #ifdef RAW_ENABLE
-void main_subtask_raw(void) { udi_hid_raw_receive_report(); }
+void main_subtask_raw(void) {
+    udi_hid_raw_receive_report();
+}
 #endif
 
 void main_subtasks(void) {
@@ -296,7 +298,7 @@ int main(void) {
 
 #ifdef RGB_MATRIX_ENABLE
     i2c1_init();
-#endif  // RGB_MATRIX_ENABLE
+#endif // RGB_MATRIX_ENABLE
 
     matrix_init();
 
@@ -325,8 +327,9 @@ int main(void) {
 
     i2c_led_q_init();
 
-    for (uint8_t drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++) I2C_LED_Q_ONOFF(drvid);  // Queue data
-#endif                                                                                       // RGB_MATRIX_ENABLE
+    for (uint8_t drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++)
+        I2C_LED_Q_ONOFF(drvid); // Queue data
+#endif                          // RGB_MATRIX_ENABLE
 
     keyboard_setup();
 
@@ -336,18 +339,18 @@ int main(void) {
 
 #ifdef CONSOLE_ENABLE
     uint64_t next_print = 0;
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
     v_5v_avg = adc_get(ADC_5V);
 
     debug_code_disable();
 
     while (1) {
-        main_subtasks();  // Note these tasks will also be run while waiting for USB keyboard polling intervals
+        main_subtasks(); // Note these tasks will also be run while waiting for USB keyboard polling intervals
 
         if (g_usb_state == USB_FSMSTATUS_FSMSTATE_SUSPEND_Val || g_usb_state == USB_FSMSTATUS_FSMSTATE_SLEEP_Val) {
             if (suspend_wakeup_condition()) {
-                udc_remotewakeup();  // Send remote wakeup signal
+                udc_remotewakeup(); // Send remote wakeup signal
                 wait_ms(50);
             }
 
@@ -362,12 +365,12 @@ int main(void) {
             // Add any debug information here that you want to see very often
             // dprintf("5v=%u 5vu=%u dlow=%u dhi=%u gca=%u gcd=%u\r\n", v_5v, v_5v_avg, v_5v_avg - V5_LOW, v_5v_avg - V5_HIGH, gcr_actual, gcr_desired);
         }
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
 #ifdef DEFERRED_EXEC_ENABLE
         // Run deferred executions
         deferred_exec_task();
-#endif  // DEFERRED_EXEC_ENABLE
+#endif // DEFERRED_EXEC_ENABLE
 
         // Run housekeeping
         housekeeping_task();
diff --git a/tmk_core/protocol/arm_atsam/main_arm_atsam.h b/tmk_core/protocol/arm_atsam/main_arm_atsam.h
index 5b088f0e20..78205e2e1b 100644
--- a/tmk_core/protocol/arm_atsam/main_arm_atsam.h
+++ b/tmk_core/protocol/arm_atsam/main_arm_atsam.h
@@ -20,4 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 uint8_t keyboard_leds(void);
 
-#endif  //_MAIN_ARM_ATSAM_H_
+#endif //_MAIN_ARM_ATSAM_H_
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
index 0741584439..84ce3ee24b 100644
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
@@ -53,16 +53,20 @@ void eeconfig_update_md_led_default(void) {
     eeconfig_flush_md_led(true);
 }
 
-void md_led_changed(void) { eeconfig_flag_md_led(true); }
+void md_led_changed(void) {
+    eeconfig_flag_md_led(true);
+}
 
 // todo: use real task rather than this bodge
-void housekeeping_task_kb(void) { eeconfig_flush_md_led_task(FLUSH_TIMEOUT); }
+void housekeeping_task_kb(void) {
+    eeconfig_flush_md_led_task(FLUSH_TIMEOUT);
+}
 
 __attribute__((weak)) led_instruction_t led_instructions[] = {{.end = 1}};
 static void                             md_rgb_matrix_config_override(int i);
 #    else
 uint8_t gcr_desired;
-#    endif  // USE_MASSDROP_CONFIGURATOR
+#    endif // USE_MASSDROP_CONFIGURATOR
 
 void SERCOM1_0_Handler(void) {
     if (SERCOM1->I2CM.INTFLAG.bit.ERROR) {
@@ -125,9 +129,9 @@ void gcr_compute(void) {
     if (v_5v < V5_CAT) {
         I2C3733_Control_Set(0);
         // CDC_print("USB: WARNING: 5V catastrophic level reached! Disabling LED drivers!\r\n"); //Blocking print is bad here!
-        v_5v_cat_hit = 20;  //~100ms recover
-        gcr_actual   = 0;   // Minimize GCR
-        usb_gcr_auto = 1;   // Force auto mode enabled
+        v_5v_cat_hit = 20; //~100ms recover
+        gcr_actual   = 0;  // Minimize GCR
+        usb_gcr_auto = 1;  // Force auto mode enabled
         return;
     } else if (v_5v_cat_hit > 1) {
         v_5v_cat_hit--;
@@ -157,24 +161,24 @@ void gcr_compute(void) {
         gcr_min_counter = 0;
     } else if (action == ACT_GCR_INC) {
         if (LED_GCR_STEP_AUTO > LED_GCR_MAX - gcr_actual)
-            gcr_actual = LED_GCR_MAX;  // Obey max and prevent wrapping
+            gcr_actual = LED_GCR_MAX; // Obey max and prevent wrapping
         else
             gcr_actual += LED_GCR_STEP_AUTO;
         gcr_min_counter = 0;
     } else if (action == ACT_GCR_DEC) {
-        if (LED_GCR_STEP_AUTO > gcr_actual)  // Prevent wrapping
+        if (LED_GCR_STEP_AUTO > gcr_actual) // Prevent wrapping
         {
             gcr_actual = 0;
             // At this point, power can no longer be cut from the LED drivers, so focus on cutting out extra port if active
-            if (usb_extra_state != USB_EXTRA_STATE_DISABLED_UNTIL_REPLUG)  // If not in a wait for replug state
+            if (usb_extra_state != USB_EXTRA_STATE_DISABLED_UNTIL_REPLUG) // If not in a wait for replug state
             {
-                if (usb_extra_state == USB_EXTRA_STATE_ENABLED)  // If extra usb is enabled
+                if (usb_extra_state == USB_EXTRA_STATE_ENABLED) // If extra usb is enabled
                 {
                     gcr_min_counter++;
-                    if (gcr_min_counter > 200)  // 5ms per check = 1s delay
+                    if (gcr_min_counter > 200) // 5ms per check = 1s delay
                     {
                         USB_ExtraSetState(USB_EXTRA_STATE_DISABLED_UNTIL_REPLUG);
-                        usb_extra_manual = 0;  // Force disable manual mode of extra port
+                        usb_extra_manual = 0; // Force disable manual mode of extra port
                         if (usb_extra_manual)
                             CDC_print("USB: Disabling extra port until replug and manual mode toggle!\r\n");
                         else
@@ -275,11 +279,11 @@ static void flush(void) {
 #    ifdef USE_MASSDROP_CONFIGURATOR
     if (!led_enabled) {
         return;
-    }  // Prevent calculations and I2C traffic if LED drivers are not enabled
+    } // Prevent calculations and I2C traffic if LED drivers are not enabled
 #    else
     if (!sr_exp_data.bit.SDB_N) {
         return;
-    }  // Prevent calculations and I2C traffic if LED drivers are not enabled
+    } // Prevent calculations and I2C traffic if LED drivers are not enabled
 #    endif
 
     // Wait for previous transfer to complete
@@ -319,17 +323,19 @@ static void flush(void) {
     pomod = (uint32_t)pomod % 10000;
     pomod /= 100.0f;
 
-#    endif  // USE_MASSDROP_CONFIGURATOR
+#    endif // USE_MASSDROP_CONFIGURATOR
 
     uint8_t drvid;
 
     // NOTE: GCR does not need to be timed with LED processing, but there is really no harm
     if (gcr_actual != gcr_actual_last) {
-        for (drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++) I2C_LED_Q_GCR(drvid);  // Queue data
+        for (drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++)
+            I2C_LED_Q_GCR(drvid); // Queue data
         gcr_actual_last = gcr_actual;
     }
 
-    for (drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++) I2C_LED_Q_PWM(drvid);  // Queue data
+    for (drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++)
+        I2C_LED_Q_PWM(drvid); // Queue data
 
     i2c_led_q_run();
 }
@@ -341,19 +347,19 @@ void md_rgb_matrix_indicators_advanced(uint8_t led_min, uint8_t led_max) {
             if (
 #    if USB_LED_NUM_LOCK_SCANCODE != 255
                 (led_map[i].scan == USB_LED_NUM_LOCK_SCANCODE && (kbled & (1 << USB_LED_NUM_LOCK))) ||
-#    endif  // NUM LOCK
+#    endif // NUM LOCK
 #    if USB_LED_CAPS_LOCK_SCANCODE != 255
                 (led_map[i].scan == USB_LED_CAPS_LOCK_SCANCODE && (kbled & (1 << USB_LED_CAPS_LOCK))) ||
-#    endif  // CAPS LOCK
+#    endif // CAPS LOCK
 #    if USB_LED_SCROLL_LOCK_SCANCODE != 255
                 (led_map[i].scan == USB_LED_SCROLL_LOCK_SCANCODE && (kbled & (1 << USB_LED_SCROLL_LOCK))) ||
-#    endif  // SCROLL LOCK
+#    endif // SCROLL LOCK
 #    if USB_LED_COMPOSE_SCANCODE != 255
                 (led_map[i].scan == USB_LED_COMPOSE_SCANCODE && (kbled & (1 << USB_LED_COMPOSE))) ||
-#    endif  // COMPOSE
+#    endif // COMPOSE
 #    if USB_LED_KANA_SCANCODE != 255
                 (led_map[i].scan == USB_LED_KANA_SCANCODE && (kbled & (1 << USB_LED_KANA))) ||
-#    endif  // KANA
+#    endif // KANA
                 (0)) {
                 if (rgb_matrix_get_flags() & LED_FLAG_INDICATOR) {
                     led_buffer[i].r = 255 - led_buffer[i].r;
@@ -378,7 +384,7 @@ static void led_run_pattern(led_setup_t* f, float* ro, float* go, float* bo, flo
     float po;
 
     while (f->end != 1) {
-        po = pos;  // Reset po for new frame
+        po = pos; // Reset po for new frame
 
         // Add in any moving effects
         if ((!led_animation_direction && f->ef & EF_SCR_R) || (led_animation_direction && (f->ef & EF_SCR_L))) {
@@ -413,17 +419,17 @@ static void led_run_pattern(led_setup_t* f, float* ro, float* go, float* bo, flo
 
         // Add in any color effects
         if (f->ef & EF_OVER) {
-            *ro = (po * (f->re - f->rs)) + f->rs;  // + 0.5;
-            *go = (po * (f->ge - f->gs)) + f->gs;  // + 0.5;
-            *bo = (po * (f->be - f->bs)) + f->bs;  // + 0.5;
+            *ro = (po * (f->re - f->rs)) + f->rs; // + 0.5;
+            *go = (po * (f->ge - f->gs)) + f->gs; // + 0.5;
+            *bo = (po * (f->be - f->bs)) + f->bs; // + 0.5;
         } else if (f->ef & EF_SUBTRACT) {
-            *ro -= (po * (f->re - f->rs)) + f->rs;  // + 0.5;
-            *go -= (po * (f->ge - f->gs)) + f->gs;  // + 0.5;
-            *bo -= (po * (f->be - f->bs)) + f->bs;  // + 0.5;
+            *ro -= (po * (f->re - f->rs)) + f->rs; // + 0.5;
+            *go -= (po * (f->ge - f->gs)) + f->gs; // + 0.5;
+            *bo -= (po * (f->be - f->bs)) + f->bs; // + 0.5;
         } else {
-            *ro += (po * (f->re - f->rs)) + f->rs;  // + 0.5;
-            *go += (po * (f->ge - f->gs)) + f->gs;  // + 0.5;
-            *bo += (po * (f->be - f->bs)) + f->bs;  // + 0.5;
+            *ro += (po * (f->re - f->rs)) + f->rs; // + 0.5;
+            *go += (po * (f->ge - f->gs)) + f->gs; // + 0.5;
+            *bo += (po * (f->be - f->bs)) + f->bs; // + 0.5;
         }
 
         f++;
@@ -471,10 +477,10 @@ static void md_rgb_matrix_config_override(int i) {
 
             // Check if this applies to current index
             if (led_cur_instruction->flags & LED_FLAG_MATCH_ID) {
-                uint8_t   modid    = i / 32;                             // Calculate which id# contains the led bit
-                uint32_t  modidbit = 1 << (i % 32);                      // Calculate the bit within the id#
-                uint32_t* bitfield = &led_cur_instruction->id0 + modid;  // Add modid as offset to id0 address. *bitfield is now idX of the led id
-                if (~(*bitfield) & modidbit) {                           // Check if led bit is not set in idX
+                uint8_t   modid    = i / 32;                            // Calculate which id# contains the led bit
+                uint32_t  modidbit = 1 << (i % 32);                     // Calculate the bit within the id#
+                uint32_t* bitfield = &led_cur_instruction->id0 + modid; // Add modid as offset to id0 address. *bitfield is now idX of the led id
+                if (~(*bitfield) & modidbit) {                          // Check if led bit is not set in idX
                     goto next_iter;
                 }
             }
@@ -538,5 +544,5 @@ static void md_rgb_matrix_config_override(int i) {
     led_buffer[i].b = (uint8_t)bo;
 }
 
-#    endif  // USE_MASSDROP_CONFIGURATOR
-#endif      // RGB_MATRIX_ENABLE
+#    endif // USE_MASSDROP_CONFIGURATOR
+#endif     // RGB_MATRIX_ENABLE
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix.h b/tmk_core/protocol/arm_atsam/md_rgb_matrix.h
index deea12b888..f27da028a0 100644
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix.h
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix.h
@@ -31,10 +31,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ISSI3733_SW_COUNT 12
 
 #define ISSI3733_LED_RGB_COUNT ISSI3733_CS_COUNT *ISSI3733_SW_COUNT
-#define ISSI3733_PG0_BYTES ISSI3733_LED_RGB_COUNT / 8 + 1  //+1 for first byte being memory start offset for I2C transfer
-#define ISSI3733_PG1_BYTES ISSI3733_LED_RGB_COUNT + 1      //+1 for first byte being memory start offset for I2C transfer
-#define ISSI3733_PG2_BYTES ISSI3733_LED_RGB_COUNT + 1      //+1 for first byte being memory start offset for I2C transfer
-#define ISSI3733_PG3_BYTES 18 + 1                          //+1 for first byte being memory start offset for I2C transfer
+#define ISSI3733_PG0_BYTES ISSI3733_LED_RGB_COUNT / 8 + 1 //+1 for first byte being memory start offset for I2C transfer
+#define ISSI3733_PG1_BYTES ISSI3733_LED_RGB_COUNT + 1     //+1 for first byte being memory start offset for I2C transfer
+#define ISSI3733_PG2_BYTES ISSI3733_LED_RGB_COUNT + 1     //+1 for first byte being memory start offset for I2C transfer
+#define ISSI3733_PG3_BYTES 18 + 1                         //+1 for first byte being memory start offset for I2C transfer
 
 #define ISSI3733_PG_ONOFF_BYTES ISSI3733_PG0_BYTES
 #define ISSI3733_PG_OR_BYTES ISSI3733_PG0_BYTES
@@ -44,38 +44,38 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ISSI3733_PG_FN_BYTES ISSI3733_PG3_BYTES
 
 typedef struct issi3733_driver_s {
-    uint8_t addr;                            // Address of the driver according to wiring "ISSI3733: Table 1 Slave Address"
-    uint8_t onoff[ISSI3733_PG_ONOFF_BYTES];  // PG0 - LED Control Register - LED On/Off Register
-    uint8_t open[ISSI3733_PG_OR_BYTES];      // PG0 - LED Control Register - LED Open Register
-    uint8_t shrt[ISSI3733_PG_SR_BYTES];      // PG0 - LED Control Register - LED Short Register
-    uint8_t pwm[ISSI3733_PG_PWM_BYTES];      // PG1 - PWM Register
-    uint8_t abm[ISSI3733_PG_ABM_BYTES];      // PG2 - Auto Breath Mode Register
-    uint8_t conf[ISSI3733_PG_FN_BYTES];      // PG3 - Function Register
+    uint8_t addr;                           // Address of the driver according to wiring "ISSI3733: Table 1 Slave Address"
+    uint8_t onoff[ISSI3733_PG_ONOFF_BYTES]; // PG0 - LED Control Register - LED On/Off Register
+    uint8_t open[ISSI3733_PG_OR_BYTES];     // PG0 - LED Control Register - LED Open Register
+    uint8_t shrt[ISSI3733_PG_SR_BYTES];     // PG0 - LED Control Register - LED Short Register
+    uint8_t pwm[ISSI3733_PG_PWM_BYTES];     // PG1 - PWM Register
+    uint8_t abm[ISSI3733_PG_ABM_BYTES];     // PG2 - Auto Breath Mode Register
+    uint8_t conf[ISSI3733_PG_FN_BYTES];     // PG3 - Function Register
 } issi3733_driver_t;
 
 typedef struct issi3733_rgb_s {
-    uint8_t *r;  // Direct access into PWM data
-    uint8_t *g;  // Direct access into PWM data
-    uint8_t *b;  // Direct access into PWM data
+    uint8_t *r; // Direct access into PWM data
+    uint8_t *g; // Direct access into PWM data
+    uint8_t *b; // Direct access into PWM data
 } issi3733_rgb_t;
 
 typedef struct issi3733_rgb_adr_s {
-    uint8_t drv;  // Driver from given list
-    uint8_t cs;   // CS
-    uint8_t swr;  // SW Red
-    uint8_t swg;  // SW Green
-    uint8_t swb;  // SW Blue
+    uint8_t drv; // Driver from given list
+    uint8_t cs;  // CS
+    uint8_t swr; // SW Red
+    uint8_t swg; // SW Green
+    uint8_t swb; // SW Blue
 } issi3733_rgb_adr_t;
 
 typedef struct issi3733_led_s {
-    uint8_t            id;    // According to PCB ref
-    issi3733_rgb_t     rgb;   // PWM settings of R G B
-    issi3733_rgb_adr_t adr;   // Hardware addresses
-    float              x;     // Physical position X
-    float              y;     // Physical position Y
-    float              px;    // Physical position X in percent
-    float              py;    // Physical position Y in percent
-    uint8_t            scan;  // Key scan code from wiring (set 0xFF if no key)
+    uint8_t            id;   // According to PCB ref
+    issi3733_rgb_t     rgb;  // PWM settings of R G B
+    issi3733_rgb_adr_t adr;  // Hardware addresses
+    float              x;    // Physical position X
+    float              y;    // Physical position Y
+    float              px;   // Physical position X in percent
+    float              py;   // Physical position Y in percent
+    uint8_t            scan; // Key scan code from wiring (set 0xFF if no key)
 } issi3733_led_t;
 
 extern issi3733_driver_t issidrv[ISSI3733_DRIVER_COUNT];
@@ -92,44 +92,44 @@ void md_rgb_matrix_indicators_advanced(uint8_t led_min, uint8_t led_max);
 
 #ifdef USE_MASSDROP_CONFIGURATOR
 
-#    define EF_NONE 0x00000000      // No effect
-#    define EF_OVER 0x00000001      // Overwrite any previous color information with new
-#    define EF_SCR_L 0x00000002     // Scroll left
-#    define EF_SCR_R 0x00000004     // Scroll right
-#    define EF_SUBTRACT 0x00000008  // Subtract color values
+#    define EF_NONE 0x00000000     // No effect
+#    define EF_OVER 0x00000001     // Overwrite any previous color information with new
+#    define EF_SCR_L 0x00000002    // Scroll left
+#    define EF_SCR_R 0x00000004    // Scroll right
+#    define EF_SUBTRACT 0x00000008 // Subtract color values
 
 typedef struct led_setup_s {
-    float    hs;   // Band begin at percent
-    float    he;   // Band end at percent
-    uint8_t  rs;   // Red start value
-    uint8_t  re;   // Red end value
-    uint8_t  gs;   // Green start value
-    uint8_t  ge;   // Green end value
-    uint8_t  bs;   // Blue start value
-    uint8_t  be;   // Blue end value
-    uint32_t ef;   // Animation and color effects
-    uint8_t  end;  // Set to signal end of the setup
+    float    hs;  // Band begin at percent
+    float    he;  // Band end at percent
+    uint8_t  rs;  // Red start value
+    uint8_t  re;  // Red end value
+    uint8_t  gs;  // Green start value
+    uint8_t  ge;  // Green end value
+    uint8_t  bs;  // Blue start value
+    uint8_t  be;  // Blue end value
+    uint32_t ef;  // Animation and color effects
+    uint8_t  end; // Set to signal end of the setup
 } led_setup_t;
 
 extern const uint8_t led_setups_count;
 extern void *        led_setups[];
 
 // LED Extra Instructions
-#    define LED_FLAG_NULL 0x00                // Matching and coloring not used (default)
-#    define LED_FLAG_MATCH_ID 0x01            // Match on the ID of the LED (set id#'s to desired bit pattern, first LED is id 1)
-#    define LED_FLAG_MATCH_LAYER 0x02         // Match on the current active layer (set layer to desired match layer)
-#    define LED_FLAG_USE_RGB 0x10             // Use a specific RGB value (set r, g, b to desired output color values)
-#    define LED_FLAG_USE_PATTERN 0x20         // Use a specific pattern ID (set pattern_id to desired output pattern)
-#    define LED_FLAG_USE_ROTATE_PATTERN 0x40  // Use pattern the user has cycled to manually
+#    define LED_FLAG_NULL 0x00               // Matching and coloring not used (default)
+#    define LED_FLAG_MATCH_ID 0x01           // Match on the ID of the LED (set id#'s to desired bit pattern, first LED is id 1)
+#    define LED_FLAG_MATCH_LAYER 0x02        // Match on the current active layer (set layer to desired match layer)
+#    define LED_FLAG_USE_RGB 0x10            // Use a specific RGB value (set r, g, b to desired output color values)
+#    define LED_FLAG_USE_PATTERN 0x20        // Use a specific pattern ID (set pattern_id to desired output pattern)
+#    define LED_FLAG_USE_ROTATE_PATTERN 0x40 // Use pattern the user has cycled to manually
 
 typedef struct led_instruction_s {
-    uint16_t flags;  // Bitfield for LED instructions
-    uint32_t id0;    // Bitwise id, IDs 0-31
-    uint32_t id1;    // Bitwise id, IDs 32-63
-    uint32_t id2;    // Bitwise id, IDs 64-95
-    uint32_t id3;    // Bitwise id, IDs 96-127
-    uint32_t id4;    // Bitwise id, IDs 128-159
-    uint32_t id5;    // Bitwise id, IDs 160-191
+    uint16_t flags; // Bitfield for LED instructions
+    uint32_t id0;   // Bitwise id, IDs 0-31
+    uint32_t id1;   // Bitwise id, IDs 32-63
+    uint32_t id2;   // Bitwise id, IDs 64-95
+    uint32_t id3;   // Bitwise id, IDs 96-127
+    uint32_t id4;   // Bitwise id, IDs 128-159
+    uint32_t id5;   // Bitwise id, IDs 160-191
     uint8_t  layer;
     uint8_t  r;
     uint8_t  g;
@@ -141,7 +141,7 @@ typedef struct led_instruction_s {
 extern led_instruction_t led_instructions[];
 
 typedef struct led_config_s {
-    uint8_t ver;  // assumed to be zero on eeprom reset
+    uint8_t ver; // assumed to be zero on eeprom reset
 
     uint8_t desired_gcr;
     uint8_t animation_breathing;
@@ -178,27 +178,27 @@ void md_led_changed(void);
 #    define led_ratio_brightness md_led_config.ratio_brightness
 #    define led_edge_mode md_led_config.edge_mode
 
-#    define LED_MODE_NORMAL 0  // Must be 0
+#    define LED_MODE_NORMAL 0 // Must be 0
 #    define LED_MODE_KEYS_ONLY 1
 #    define LED_MODE_NON_KEYS_ONLY 2
 #    define LED_MODE_INDICATORS_ONLY 3
-#    define LED_MODE_MAX_INDEX LED_MODE_INDICATORS_ONLY  // Must be highest value
+#    define LED_MODE_MAX_INDEX LED_MODE_INDICATORS_ONLY // Must be highest value
 
-#    define LED_EDGE_MODE_ALL 0                        // All edge LEDs are active (Must be 0)
-#    define LED_EDGE_MODE_ALTERNATE 1                  // Alternate mode of edge LEDs are active (Intention is for 'only every other edge LED' to be active)
-#    define LED_EDGE_MODE_MAX LED_EDGE_MODE_ALTERNATE  // Must be the highest valued LED edge mode
+#    define LED_EDGE_MODE_ALL 0                       // All edge LEDs are active (Must be 0)
+#    define LED_EDGE_MODE_ALTERNATE 1                 // Alternate mode of edge LEDs are active (Intention is for 'only every other edge LED' to be active)
+#    define LED_EDGE_MODE_MAX LED_EDGE_MODE_ALTERNATE // Must be the highest valued LED edge mode
 
-#    define LED_EDGE_FULL_MODE 255  // LEDs configured with this scan code will always be on for edge lighting modes
-#    define LED_EDGE_ALT_MODE 254   // LEDs configured with this scan code will turn off in edge alternating mode
-#    define LED_EDGE_MIN_SCAN 254   // LEDs configured with scan code >= to this are assigned as edge LEDs
-#    define LED_INDICATOR_SCAN 253  // LEDs configured as dedicated indicators
+#    define LED_EDGE_FULL_MODE 255 // LEDs configured with this scan code will always be on for edge lighting modes
+#    define LED_EDGE_ALT_MODE 254  // LEDs configured with this scan code will turn off in edge alternating mode
+#    define LED_EDGE_MIN_SCAN 254  // LEDs configured with scan code >= to this are assigned as edge LEDs
+#    define LED_INDICATOR_SCAN 253 // LEDs configured as dedicated indicators
 
-#    define LED_IS_KEY(scan) (scan < LED_INDICATOR_SCAN)         // Return true if an LED's scan value indicates it is a key LED
-#    define LED_IS_EDGE(scan) (scan >= LED_EDGE_MIN_SCAN)        // Return true if an LED's scan value indicates an edge LED
-#    define LED_IS_EDGE_ALT(scan) (scan == LED_EDGE_ALT_MODE)    // Return true if an LED's scan value indicates an alternate edge mode LED
-#    define LED_IS_INDICATOR(scan) (scan == LED_INDICATOR_SCAN)  // Return true if an LED's scan value indicates it is a dedicated Indicator
+#    define LED_IS_KEY(scan) (scan < LED_INDICATOR_SCAN)        // Return true if an LED's scan value indicates it is a key LED
+#    define LED_IS_EDGE(scan) (scan >= LED_EDGE_MIN_SCAN)       // Return true if an LED's scan value indicates an edge LED
+#    define LED_IS_EDGE_ALT(scan) (scan == LED_EDGE_ALT_MODE)   // Return true if an LED's scan value indicates an alternate edge mode LED
+#    define LED_IS_INDICATOR(scan) (scan == LED_INDICATOR_SCAN) // Return true if an LED's scan value indicates it is a dedicated Indicator
 #else
 extern uint8_t gcr_desired;
-#endif  // USE_MASSDROP_CONFIGURATOR
+#endif // USE_MASSDROP_CONFIGURATOR
 
-#endif  //_LED_MATRIX_H_
+#endif //_LED_MATRIX_H_
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c b/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
index 92b40b5b85..69b3ad574c 100644
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
@@ -97,5 +97,5 @@ void *led_setups[] = {leds_rainbow_s, leds_rainbow_ns, leds_teal_salmon, leds_ye
 
 const uint8_t led_setups_count = sizeof(led_setups) / sizeof(led_setups[0]);
 
-#    endif  // USE_MASSDROP_CONFIGURATOR
-#endif      // RGB_MATRIX_ENABLE
\ No newline at end of file
+#    endif // USE_MASSDROP_CONFIGURATOR
+#endif     // RGB_MATRIX_ENABLE
\ No newline at end of file
diff --git a/tmk_core/protocol/arm_atsam/shift_register.c b/tmk_core/protocol/arm_atsam/shift_register.c
index 8d63af1b59..3adb682aa8 100644
--- a/tmk_core/protocol/arm_atsam/shift_register.c
+++ b/tmk_core/protocol/arm_atsam/shift_register.c
@@ -54,7 +54,9 @@ void shift_out_impl(const uint8_t *data, uint16_t length) {
 
 #else
 
-void shift_init_impl(void) { spi_init(); }
+void shift_init_impl(void) {
+    spi_init();
+}
 
 void shift_out_impl(const uint8_t *data, uint16_t length) {
     spi_start(SR_EXP_RCLK_PIN, true, 0, 0);
@@ -67,7 +69,9 @@ void shift_out_impl(const uint8_t *data, uint16_t length) {
 
 // ***************************************************************
 
-void shift_out(const uint8_t *data, uint16_t length) { shift_out_impl(data, length); }
+void shift_out(const uint8_t *data, uint16_t length) {
+    shift_out_impl(data, length);
+}
 
 void shift_enable(void) {
     setPinOutput(SR_EXP_OE_PIN);
@@ -90,8 +94,8 @@ sr_exp_t sr_exp_data;
 
 void SR_EXP_WriteData(void) {
     uint8_t data[2] = {
-        sr_exp_data.reg & 0xFF,         // Shift in bits 7-0
-        (sr_exp_data.reg >> 8) & 0xFF,  // Shift in bits 15-8
+        sr_exp_data.reg & 0xFF,        // Shift in bits 7-0
+        (sr_exp_data.reg >> 8) & 0xFF, // Shift in bits 15-8
     };
     shift_out(data, 2);
 }
diff --git a/tmk_core/protocol/arm_atsam/spi_master.c b/tmk_core/protocol/arm_atsam/spi_master.c
index 9781d45b1e..3be82fac1d 100644
--- a/tmk_core/protocol/arm_atsam/spi_master.c
+++ b/tmk_core/protocol/arm_atsam/spi_master.c
@@ -45,10 +45,10 @@ __attribute__((weak)) void spi_init(void) {
         CLK_set_spi_freq(CHAN_SERCOM_SPI, FREQ_SPI_DEFAULT);
 
         // Set up MCU SPI pins
-        PORT->Group[SAMD_PORT(SPI_DATAOUT_PIN)].PMUX[SAMD_PIN(SPI_DATAOUT_PIN) / 2].bit.SPI_DATAOUT_MUX_SEL = SPI_DATAOUT_MUX;  // MUX select for sercom
-        PORT->Group[SAMD_PORT(SPI_SCLK_PIN)].PMUX[SAMD_PIN(SPI_SCLK_PIN) / 2].bit.SPI_SCLK_MUX_SEL          = SPI_SCLK_MUX;     // MUX select for sercom
-        PORT->Group[SAMD_PORT(SPI_DATAOUT_PIN)].PINCFG[SAMD_PIN(SPI_DATAOUT_PIN)].bit.PMUXEN                = 1;                // MUX Enable
-        PORT->Group[SAMD_PORT(SPI_SCLK_PIN)].PINCFG[SAMD_PIN(SPI_SCLK_PIN)].bit.PMUXEN                      = 1;                // MUX Enable
+        PORT->Group[SAMD_PORT(SPI_DATAOUT_PIN)].PMUX[SAMD_PIN(SPI_DATAOUT_PIN) / 2].bit.SPI_DATAOUT_MUX_SEL = SPI_DATAOUT_MUX; // MUX select for sercom
+        PORT->Group[SAMD_PORT(SPI_SCLK_PIN)].PMUX[SAMD_PIN(SPI_SCLK_PIN) / 2].bit.SPI_SCLK_MUX_SEL          = SPI_SCLK_MUX;    // MUX select for sercom
+        PORT->Group[SAMD_PORT(SPI_DATAOUT_PIN)].PINCFG[SAMD_PIN(SPI_DATAOUT_PIN)].bit.PMUXEN                = 1;               // MUX Enable
+        PORT->Group[SAMD_PORT(SPI_SCLK_PIN)].PINCFG[SAMD_PIN(SPI_SCLK_PIN)].bit.PMUXEN                      = 1;               // MUX Enable
 
         DBGC(DC_SPI_INIT_COMPLETE);
     }
@@ -63,14 +63,14 @@ bool spi_start(pin_t csPin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
     setPinOutput(currentSelectPin);
     writePinLow(currentSelectPin);
 
-    SPI_SERCOM->SPI.CTRLA.bit.DORD = lsbFirst;  // Data Order - LSB is transferred first
-    SPI_SERCOM->SPI.CTRLA.bit.CPOL = 1;         // Clock Polarity - SCK high when idle. Leading edge of cycle is falling. Trailing rising.
-    SPI_SERCOM->SPI.CTRLA.bit.CPHA = 1;         // Clock Phase - Leading Edge Falling, change, Trailing Edge - Rising, sample
-    SPI_SERCOM->SPI.CTRLA.bit.DIPO = 3;         // Data In Pinout - SERCOM PAD[3] is used as data input (Configure away from DOPO. Not using input.)
-    SPI_SERCOM->SPI.CTRLA.bit.DOPO = 0;         // Data Output PAD[0], Serial Clock PAD[1]
-    SPI_SERCOM->SPI.CTRLA.bit.MODE = 3;         // Operating Mode - Master operation
+    SPI_SERCOM->SPI.CTRLA.bit.DORD = lsbFirst; // Data Order - LSB is transferred first
+    SPI_SERCOM->SPI.CTRLA.bit.CPOL = 1;        // Clock Polarity - SCK high when idle. Leading edge of cycle is falling. Trailing rising.
+    SPI_SERCOM->SPI.CTRLA.bit.CPHA = 1;        // Clock Phase - Leading Edge Falling, change, Trailing Edge - Rising, sample
+    SPI_SERCOM->SPI.CTRLA.bit.DIPO = 3;        // Data In Pinout - SERCOM PAD[3] is used as data input (Configure away from DOPO. Not using input.)
+    SPI_SERCOM->SPI.CTRLA.bit.DOPO = 0;        // Data Output PAD[0], Serial Clock PAD[1]
+    SPI_SERCOM->SPI.CTRLA.bit.MODE = 3;        // Operating Mode - Master operation
 
-    SPI_SERCOM->SPI.CTRLA.bit.ENABLE = 1;  // Enable - Peripheral is enabled or being enabled
+    SPI_SERCOM->SPI.CTRLA.bit.ENABLE = 1; // Enable - Peripheral is enabled or being enabled
     while (SPI_SERCOM->SPI.SYNCBUSY.bit.ENABLE) {
         DBGC(DC_SPI_SYNC_ENABLING);
     }
diff --git a/tmk_core/protocol/arm_atsam/usb/compiler.h b/tmk_core/protocol/arm_atsam/usb/compiler.h
index 6ba2322340..517499f946 100644
--- a/tmk_core/protocol/arm_atsam/usb/compiler.h
+++ b/tmk_core/protocol/arm_atsam/usb/compiler.h
@@ -876,66 +876,66 @@ typedef struct {
 // kmod #define LOW       0
 // kmod #define HIGH      1
 
-typedef int8_t   S8;   //!< 8-bit signed integer.
-typedef uint8_t  U8;   //!< 8-bit unsigned integer.
-typedef int16_t  S16;  //!< 16-bit signed integer.
-typedef uint16_t U16;  //!< 16-bit unsigned integer.
-typedef int32_t  S32;  //!< 32-bit signed integer.
-typedef uint32_t U32;  //!< 32-bit unsigned integer.
-typedef int64_t  S64;  //!< 64-bit signed integer.
-typedef uint64_t U64;  //!< 64-bit unsigned integer.
-typedef float    F32;  //!< 32-bit floating-point number.
-typedef double   F64;  //!< 64-bit floating-point number.
+typedef int8_t   S8;  //!< 8-bit signed integer.
+typedef uint8_t  U8;  //!< 8-bit unsigned integer.
+typedef int16_t  S16; //!< 16-bit signed integer.
+typedef uint16_t U16; //!< 16-bit unsigned integer.
+typedef int32_t  S32; //!< 32-bit signed integer.
+typedef uint32_t U32; //!< 32-bit unsigned integer.
+typedef int64_t  S64; //!< 64-bit signed integer.
+typedef uint64_t U64; //!< 64-bit unsigned integer.
+typedef float    F32; //!< 32-bit floating-point number.
+typedef double   F64; //!< 64-bit floating-point number.
 
-#    define MSB(u16) (((U8 *)&(u16))[1])  //!< Most significant byte of \a u16.
-#    define LSB(u16) (((U8 *)&(u16))[0])  //!< Least significant byte of \a u16.
+#    define MSB(u16) (((U8 *)&(u16))[1]) //!< Most significant byte of \a u16.
+#    define LSB(u16) (((U8 *)&(u16))[0]) //!< Least significant byte of \a u16.
 
-#    define MSH(u32) (((U16 *)&(u32))[1])   //!< Most significant half-word of \a u32.
-#    define LSH(u32) (((U16 *)&(u32))[0])   //!< Least significant half-word of \a u32.
-#    define MSB0W(u32) (((U8 *)&(u32))[3])  //!< Most significant byte of 1st rank of \a u32.
-#    define MSB1W(u32) (((U8 *)&(u32))[2])  //!< Most significant byte of 2nd rank of \a u32.
-#    define MSB2W(u32) (((U8 *)&(u32))[1])  //!< Most significant byte of 3rd rank of \a u32.
-#    define MSB3W(u32) (((U8 *)&(u32))[0])  //!< Most significant byte of 4th rank of \a u32.
-#    define LSB3W(u32) MSB0W(u32)           //!< Least significant byte of 4th rank of \a u32.
-#    define LSB2W(u32) MSB1W(u32)           //!< Least significant byte of 3rd rank of \a u32.
-#    define LSB1W(u32) MSB2W(u32)           //!< Least significant byte of 2nd rank of \a u32.
-#    define LSB0W(u32) MSB3W(u32)           //!< Least significant byte of 1st rank of \a u32.
+#    define MSH(u32) (((U16 *)&(u32))[1])  //!< Most significant half-word of \a u32.
+#    define LSH(u32) (((U16 *)&(u32))[0])  //!< Least significant half-word of \a u32.
+#    define MSB0W(u32) (((U8 *)&(u32))[3]) //!< Most significant byte of 1st rank of \a u32.
+#    define MSB1W(u32) (((U8 *)&(u32))[2]) //!< Most significant byte of 2nd rank of \a u32.
+#    define MSB2W(u32) (((U8 *)&(u32))[1]) //!< Most significant byte of 3rd rank of \a u32.
+#    define MSB3W(u32) (((U8 *)&(u32))[0]) //!< Most significant byte of 4th rank of \a u32.
+#    define LSB3W(u32) MSB0W(u32)          //!< Least significant byte of 4th rank of \a u32.
+#    define LSB2W(u32) MSB1W(u32)          //!< Least significant byte of 3rd rank of \a u32.
+#    define LSB1W(u32) MSB2W(u32)          //!< Least significant byte of 2nd rank of \a u32.
+#    define LSB0W(u32) MSB3W(u32)          //!< Least significant byte of 1st rank of \a u32.
 
-#    define MSW(u64) (((U32 *)&(u64))[1])   //!< Most significant word of \a u64.
-#    define LSW(u64) (((U32 *)&(u64))[0])   //!< Least significant word of \a u64.
-#    define MSH0(u64) (((U16 *)&(u64))[3])  //!< Most significant half-word of 1st rank of \a u64.
-#    define MSH1(u64) (((U16 *)&(u64))[2])  //!< Most significant half-word of 2nd rank of \a u64.
-#    define MSH2(u64) (((U16 *)&(u64))[1])  //!< Most significant half-word of 3rd rank of \a u64.
-#    define MSH3(u64) (((U16 *)&(u64))[0])  //!< Most significant half-word of 4th rank of \a u64.
-#    define LSH3(u64) MSH0(u64)             //!< Least significant half-word of 4th rank of \a u64.
-#    define LSH2(u64) MSH1(u64)             //!< Least significant half-word of 3rd rank of \a u64.
-#    define LSH1(u64) MSH2(u64)             //!< Least significant half-word of 2nd rank of \a u64.
-#    define LSH0(u64) MSH3(u64)             //!< Least significant half-word of 1st rank of \a u64.
-#    define MSB0D(u64) (((U8 *)&(u64))[7])  //!< Most significant byte of 1st rank of \a u64.
-#    define MSB1D(u64) (((U8 *)&(u64))[6])  //!< Most significant byte of 2nd rank of \a u64.
-#    define MSB2D(u64) (((U8 *)&(u64))[5])  //!< Most significant byte of 3rd rank of \a u64.
-#    define MSB3D(u64) (((U8 *)&(u64))[4])  //!< Most significant byte of 4th rank of \a u64.
-#    define MSB4D(u64) (((U8 *)&(u64))[3])  //!< Most significant byte of 5th rank of \a u64.
-#    define MSB5D(u64) (((U8 *)&(u64))[2])  //!< Most significant byte of 6th rank of \a u64.
-#    define MSB6D(u64) (((U8 *)&(u64))[1])  //!< Most significant byte of 7th rank of \a u64.
-#    define MSB7D(u64) (((U8 *)&(u64))[0])  //!< Most significant byte of 8th rank of \a u64.
-#    define LSB7D(u64) MSB0D(u64)           //!< Least significant byte of 8th rank of \a u64.
-#    define LSB6D(u64) MSB1D(u64)           //!< Least significant byte of 7th rank of \a u64.
-#    define LSB5D(u64) MSB2D(u64)           //!< Least significant byte of 6th rank of \a u64.
-#    define LSB4D(u64) MSB3D(u64)           //!< Least significant byte of 5th rank of \a u64.
-#    define LSB3D(u64) MSB4D(u64)           //!< Least significant byte of 4th rank of \a u64.
-#    define LSB2D(u64) MSB5D(u64)           //!< Least significant byte of 3rd rank of \a u64.
-#    define LSB1D(u64) MSB6D(u64)           //!< Least significant byte of 2nd rank of \a u64.
-#    define LSB0D(u64) MSB7D(u64)           //!< Least significant byte of 1st rank of \a u64.
+#    define MSW(u64) (((U32 *)&(u64))[1])  //!< Most significant word of \a u64.
+#    define LSW(u64) (((U32 *)&(u64))[0])  //!< Least significant word of \a u64.
+#    define MSH0(u64) (((U16 *)&(u64))[3]) //!< Most significant half-word of 1st rank of \a u64.
+#    define MSH1(u64) (((U16 *)&(u64))[2]) //!< Most significant half-word of 2nd rank of \a u64.
+#    define MSH2(u64) (((U16 *)&(u64))[1]) //!< Most significant half-word of 3rd rank of \a u64.
+#    define MSH3(u64) (((U16 *)&(u64))[0]) //!< Most significant half-word of 4th rank of \a u64.
+#    define LSH3(u64) MSH0(u64)            //!< Least significant half-word of 4th rank of \a u64.
+#    define LSH2(u64) MSH1(u64)            //!< Least significant half-word of 3rd rank of \a u64.
+#    define LSH1(u64) MSH2(u64)            //!< Least significant half-word of 2nd rank of \a u64.
+#    define LSH0(u64) MSH3(u64)            //!< Least significant half-word of 1st rank of \a u64.
+#    define MSB0D(u64) (((U8 *)&(u64))[7]) //!< Most significant byte of 1st rank of \a u64.
+#    define MSB1D(u64) (((U8 *)&(u64))[6]) //!< Most significant byte of 2nd rank of \a u64.
+#    define MSB2D(u64) (((U8 *)&(u64))[5]) //!< Most significant byte of 3rd rank of \a u64.
+#    define MSB3D(u64) (((U8 *)&(u64))[4]) //!< Most significant byte of 4th rank of \a u64.
+#    define MSB4D(u64) (((U8 *)&(u64))[3]) //!< Most significant byte of 5th rank of \a u64.
+#    define MSB5D(u64) (((U8 *)&(u64))[2]) //!< Most significant byte of 6th rank of \a u64.
+#    define MSB6D(u64) (((U8 *)&(u64))[1]) //!< Most significant byte of 7th rank of \a u64.
+#    define MSB7D(u64) (((U8 *)&(u64))[0]) //!< Most significant byte of 8th rank of \a u64.
+#    define LSB7D(u64) MSB0D(u64)          //!< Least significant byte of 8th rank of \a u64.
+#    define LSB6D(u64) MSB1D(u64)          //!< Least significant byte of 7th rank of \a u64.
+#    define LSB5D(u64) MSB2D(u64)          //!< Least significant byte of 6th rank of \a u64.
+#    define LSB4D(u64) MSB3D(u64)          //!< Least significant byte of 5th rank of \a u64.
+#    define LSB3D(u64) MSB4D(u64)          //!< Least significant byte of 4th rank of \a u64.
+#    define LSB2D(u64) MSB5D(u64)          //!< Least significant byte of 3rd rank of \a u64.
+#    define LSB1D(u64) MSB6D(u64)          //!< Least significant byte of 2nd rank of \a u64.
+#    define LSB0D(u64) MSB7D(u64)          //!< Least significant byte of 1st rank of \a u64.
 
-#    define LSB0(u32) LSB0W(u32)  //!< Least significant byte of 1st rank of \a u32.
-#    define LSB1(u32) LSB1W(u32)  //!< Least significant byte of 2nd rank of \a u32.
-#    define LSB2(u32) LSB2W(u32)  //!< Least significant byte of 3rd rank of \a u32.
-#    define LSB3(u32) LSB3W(u32)  //!< Least significant byte of 4th rank of \a u32.
-#    define MSB3(u32) MSB3W(u32)  //!< Most significant byte of 4th rank of \a u32.
-#    define MSB2(u32) MSB2W(u32)  //!< Most significant byte of 3rd rank of \a u32.
-#    define MSB1(u32) MSB1W(u32)  //!< Most significant byte of 2nd rank of \a u32.
-#    define MSB0(u32) MSB0W(u32)  //!< Most significant byte of 1st rank of \a u32.
+#    define LSB0(u32) LSB0W(u32) //!< Least significant byte of 1st rank of \a u32.
+#    define LSB1(u32) LSB1W(u32) //!< Least significant byte of 2nd rank of \a u32.
+#    define LSB2(u32) LSB2W(u32) //!< Least significant byte of 3rd rank of \a u32.
+#    define LSB3(u32) LSB3W(u32) //!< Least significant byte of 4th rank of \a u32.
+#    define MSB3(u32) MSB3W(u32) //!< Most significant byte of 4th rank of \a u32.
+#    define MSB2(u32) MSB2W(u32) //!< Most significant byte of 3rd rank of \a u32.
+#    define MSB1(u32) MSB1W(u32) //!< Most significant byte of 2nd rank of \a u32.
+#    define MSB0(u32) MSB0W(u32) //!< Most significant byte of 1st rank of \a u32.
 
 #    if defined(__ICCARM__)
 #        define SHORTENUM __packed
@@ -1031,7 +1031,9 @@ static inline void convert_16_bit_to_byte_address(uint16_t value, uint8_t *data)
  * @return 16-Bit value
  * @ingroup apiPalApi
  */
-static inline uint16_t convert_byte_array_to_16_bit(uint8_t *data) { return (data[0] | ((uint16_t)data[1] << 8)); }
+static inline uint16_t convert_byte_array_to_16_bit(uint8_t *data) {
+    return (data[0] | ((uint16_t)data[1] << 8));
+}
 
 /* Converts a 4 Byte array into a 32-Bit value */
 static inline uint32_t convert_byte_array_to_32_bit(uint8_t *data) {
diff --git a/tmk_core/protocol/arm_atsam/usb/conf_usb.h b/tmk_core/protocol/arm_atsam/usb/conf_usb.h
index 184a2e81dc..50d189a202 100644
--- a/tmk_core/protocol/arm_atsam/usb/conf_usb.h
+++ b/tmk_core/protocol/arm_atsam/usb/conf_usb.h
@@ -59,7 +59,7 @@
 #define USB_DEVICE_VENDOR_ID VENDOR_ID
 #define USB_DEVICE_PRODUCT_ID PRODUCT_ID
 #define USB_DEVICE_VERSION DEVICE_VER
-#define USB_DEVICE_POWER 500  // Consumption on Vbus line (mA)
+#define USB_DEVICE_POWER 500 // Consumption on Vbus line (mA)
 #define USB_DEVICE_ATTR (USB_CONFIG_ATTR_REMOTE_WAKEUP | USB_CONFIG_ATTR_BUS_POWERED)
 //                                      (USB_CONFIG_ATTR_REMOTE_WAKEUP|USB_CONFIG_ATTR_BUS_POWERED)
 //                                      (USB_CONFIG_ATTR_REMOTE_WAKEUP|USB_CONFIG_ATTR_SELF_POWERED)
@@ -161,4 +161,4 @@
 #include "usb_main.h"
 #include "ui.h"
 
-#endif  // _CONF_USB_H_
+#endif // _CONF_USB_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/main_usb.c b/tmk_core/protocol/arm_atsam/usb/main_usb.c
index 5fcb9a9c61..ee6ed25b85 100644
--- a/tmk_core/protocol/arm_atsam/usb/main_usb.c
+++ b/tmk_core/protocol/arm_atsam/usb/main_usb.c
@@ -25,15 +25,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 uint8_t keyboard_protocol = 1;
 
-void main_suspend_action(void) { ui_powerdown(); }
+void main_suspend_action(void) {
+    ui_powerdown();
+}
 
-void main_resume_action(void) { ui_wakeup(); }
+void main_resume_action(void) {
+    ui_wakeup();
+}
 
-void main_sof_action(void) { ui_process(udd_get_frame_number()); }
+void main_sof_action(void) {
+    ui_process(udd_get_frame_number());
+}
 
-void main_remotewakeup_enable(void) { ui_wakeup_enable(); }
+void main_remotewakeup_enable(void) {
+    ui_wakeup_enable();
+}
 
-void main_remotewakeup_disable(void) { ui_wakeup_disable(); }
+void main_remotewakeup_disable(void) {
+    ui_wakeup_disable();
+}
 
 volatile bool main_b_kbd_enable = false;
 bool          main_kbd_enable(void) {
@@ -41,7 +51,9 @@ bool          main_kbd_enable(void) {
     return true;
 }
 
-void main_kbd_disable(void) { main_b_kbd_enable = false; }
+void main_kbd_disable(void) {
+    main_b_kbd_enable = false;
+}
 
 #ifdef NKRO_ENABLE
 volatile bool main_b_nkro_enable = false;
@@ -50,7 +62,9 @@ bool          main_nkro_enable(void) {
     return true;
 }
 
-void main_nkro_disable(void) { main_b_nkro_enable = false; }
+void main_nkro_disable(void) {
+    main_b_nkro_enable = false;
+}
 #endif
 
 #ifdef EXTRAKEY_ENABLE
@@ -60,7 +74,9 @@ bool          main_exk_enable(void) {
     return true;
 }
 
-void main_exk_disable(void) { main_b_exk_enable = false; }
+void main_exk_disable(void) {
+    main_b_exk_enable = false;
+}
 #endif
 
 #ifdef CONSOLE_ENABLE
@@ -70,7 +86,9 @@ bool          main_con_enable(void) {
     return true;
 }
 
-void main_con_disable(void) { main_b_con_enable = false; }
+void main_con_disable(void) {
+    main_b_con_enable = false;
+}
 #endif
 
 #ifdef MOUSE_ENABLE
@@ -80,7 +98,9 @@ bool          main_mou_enable(void) {
     return true;
 }
 
-void main_mou_disable(void) { main_b_mou_enable = false; }
+void main_mou_disable(void) {
+    main_b_mou_enable = false;
+}
 #endif
 
 #ifdef RAW_ENABLE
@@ -90,7 +110,11 @@ bool          main_raw_enable(void) {
     return true;
 }
 
-void main_raw_disable(void) { main_b_raw_enable = false; }
+void main_raw_disable(void) {
+    main_b_raw_enable = false;
+}
 
-void main_raw_receive(uint8_t *buffer, uint8_t len) { raw_hid_receive(buffer, len); }
+void main_raw_receive(uint8_t *buffer, uint8_t len) {
+    raw_hid_receive(buffer, len);
+}
 #endif
diff --git a/tmk_core/protocol/arm_atsam/usb/status_codes.h b/tmk_core/protocol/arm_atsam/usb/status_codes.h
index a7a1230be0..72819a0d7d 100644
--- a/tmk_core/protocol/arm_atsam/usb/status_codes.h
+++ b/tmk_core/protocol/arm_atsam/usb/status_codes.h
@@ -124,20 +124,20 @@ typedef enum status_code status_code_genare_t;
  */
 enum status_code_wireless {
     // STATUS_OK               =  0, //!< Success
-    ERR_IO_ERROR              = -1,   //!< I/O error
-    ERR_FLUSHED               = -2,   //!< Request flushed from queue
-    ERR_TIMEOUT               = -3,   //!< Operation timed out
-    ERR_BAD_DATA              = -4,   //!< Data integrity check failed
-    ERR_PROTOCOL              = -5,   //!< Protocol error
-    ERR_UNSUPPORTED_DEV       = -6,   //!< Unsupported device
-    ERR_NO_MEMORY             = -7,   //!< Insufficient memory
-    ERR_INVALID_ARG           = -8,   //!< Invalid argument
-    ERR_BAD_ADDRESS           = -9,   //!< Bad address
-    ERR_BUSY                  = -10,  //!< Resource is busy
-    ERR_BAD_FORMAT            = -11,  //!< Data format not recognized
-    ERR_NO_TIMER              = -12,  //!< No timer available
-    ERR_TIMER_ALREADY_RUNNING = -13,  //!< Timer already running
-    ERR_TIMER_NOT_RUNNING     = -14,  //!< Timer not running
+    ERR_IO_ERROR              = -1,  //!< I/O error
+    ERR_FLUSHED               = -2,  //!< Request flushed from queue
+    ERR_TIMEOUT               = -3,  //!< Operation timed out
+    ERR_BAD_DATA              = -4,  //!< Data integrity check failed
+    ERR_PROTOCOL              = -5,  //!< Protocol error
+    ERR_UNSUPPORTED_DEV       = -6,  //!< Unsupported device
+    ERR_NO_MEMORY             = -7,  //!< Insufficient memory
+    ERR_INVALID_ARG           = -8,  //!< Invalid argument
+    ERR_BAD_ADDRESS           = -9,  //!< Bad address
+    ERR_BUSY                  = -10, //!< Resource is busy
+    ERR_BAD_FORMAT            = -11, //!< Data format not recognized
+    ERR_NO_TIMER              = -12, //!< No timer available
+    ERR_TIMER_ALREADY_RUNNING = -13, //!< Timer already running
+    ERR_TIMER_NOT_RUNNING     = -14, //!< Timer not running
 
     /**
      * \brief Operation in progress
diff --git a/tmk_core/protocol/arm_atsam/usb/udc.c b/tmk_core/protocol/arm_atsam/usb/udc.c
index 1f0c0d95d6..2a371c200a 100644
--- a/tmk_core/protocol/arm_atsam/usb/udc.c
+++ b/tmk_core/protocol/arm_atsam/usb/udc.c
@@ -52,7 +52,7 @@
 #include "udi.h"
 #include "udc.h"
 
-#define BOOTLOADER_SERIAL_MAX_SIZE 20  // DO NOT MODIFY!
+#define BOOTLOADER_SERIAL_MAX_SIZE 20 // DO NOT MODIFY!
 
 /**
  * \ingroup udc_group
@@ -132,13 +132,13 @@ uint8_t     bootloader_serial_number[BOOTLOADER_SERIAL_MAX_SIZE + 1] = "";
 static const uint8_t *udc_get_string_serial_name(void) {
 #if defined           USB_DEVICE_SERIAL_USE_BOOTLOADER_SERIAL
     uint32_t serial_ptrloc  = (uint32_t)&_srom - 4;
-    uint32_t serial_address = *(uint32_t *)serial_ptrloc;  // Address of bootloader's serial number if available
+    uint32_t serial_address = *(uint32_t *)serial_ptrloc; // Address of bootloader's serial number if available
 
-    if (serial_address != 0xFFFFFFFF && serial_address < serial_ptrloc)  // Check for factory programmed serial address
+    if (serial_address != 0xFFFFFFFF && serial_address < serial_ptrloc) // Check for factory programmed serial address
     {
-        if ((serial_address & 0xFF) % 4 == 0)  // Check alignment
+        if ((serial_address & 0xFF) % 4 == 0) // Check alignment
         {
-            uint16_t *serial_use    = (uint16_t *)(serial_address);  // Point to address of string in rom
+            uint16_t *serial_use    = (uint16_t *)(serial_address); // Point to address of string in rom
             uint8_t   serial_length = 0;
 
             while ((*(serial_use + serial_length) > 32 && *(serial_use + serial_length) < 127) && serial_length < BOOTLOADER_SERIAL_MAX_SIZE) {
@@ -149,7 +149,7 @@ static const uint8_t *udc_get_string_serial_name(void) {
 
             usb_device_serial_name_size = serial_length;
 
-            return bootloader_serial_number;  // Use serial programmed into bootloader rom
+            return bootloader_serial_number; // Use serial programmed into bootloader rom
         }
     }
 #endif
@@ -157,9 +157,9 @@ static const uint8_t *udc_get_string_serial_name(void) {
     usb_device_serial_name_size = USB_DEVICE_SERIAL_NAME_SIZE;
 
 #if defined USB_DEVICE_SERIAL_NAME
-    return (const uint8_t *)USB_DEVICE_SERIAL_NAME;  // Use serial supplied by keyboard's config.h
+    return (const uint8_t *)USB_DEVICE_SERIAL_NAME; // Use serial supplied by keyboard's config.h
 #else
-    return 0;  // No serial supplied
+    return 0; // No serial supplied
 #endif
 }
 
@@ -169,7 +169,7 @@ static const uint8_t *udc_get_string_serial_name(void) {
  */
 #ifndef BOOTLOADER_SERIAL_MAX_SIZE
 #    define BOOTLOADER_SERIAL_MAX_SIZE 0
-#endif  // BOOTLOADER_SERIAL_MAX_SIZE
+#endif // BOOTLOADER_SERIAL_MAX_SIZE
 struct udc_string_desc_t {
     usb_str_desc_t header;
     le16_t         string[Max(Max(Max(USB_DEVICE_MANUFACTURE_NAME_SIZE, USB_DEVICE_PRODUCT_NAME_SIZE), USB_DEVICE_SERIAL_NAME_SIZE), BOOTLOADER_SERIAL_MAX_SIZE)];
@@ -178,14 +178,18 @@ COMPILER_WORD_ALIGNED
 static UDC_DESC_STORAGE struct udc_string_desc_t udc_string_desc = {.header.bDescriptorType = USB_DT_STRING};
 //! @}
 
-usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void) { return udc_ptr_iface; }
+usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void) {
+    return udc_ptr_iface;
+}
 
 /**
  * \brief Returns a value to check the end of USB Configuration descriptor
  *
  * \return address after the last byte of USB Configuration descriptor
  */
-static usb_conf_desc_t UDC_DESC_STORAGE *udc_get_eof_conf(void) { return (UDC_DESC_STORAGE usb_conf_desc_t *)((uint8_t *)udc_ptr_conf->desc + le16_to_cpu(udc_ptr_conf->desc->wTotalLength)); }
+static usb_conf_desc_t UDC_DESC_STORAGE *udc_get_eof_conf(void) {
+    return (UDC_DESC_STORAGE usb_conf_desc_t *)((uint8_t *)udc_ptr_conf->desc + le16_to_cpu(udc_ptr_conf->desc->wTotalLength));
+}
 
 #if (0 != USB_DEVICE_MAX_EP)
 /**
@@ -209,15 +213,15 @@ static usb_conf_desc_t UDC_DESC_STORAGE *udc_next_desc_in_iface(usb_conf_desc_t
         // If new interface descriptor is found,
         // then it is the end of the current global interface descriptor
         if (USB_DT_INTERFACE == desc->bDescriptorType) {
-            break;  // End of global interface descriptor
+            break; // End of global interface descriptor
         }
         if (desc_id == desc->bDescriptorType) {
-            return desc;  // Specific descriptor found
+            return desc; // Specific descriptor found
         }
         // Go to next descriptor
         desc = (UDC_DESC_STORAGE usb_conf_desc_t *)((uint8_t *)desc + desc->bLength);
     }
-    return NULL;  // No specific descriptor found
+    return NULL; // No specific descriptor found
 }
 #endif
 
@@ -251,13 +255,13 @@ static bool udc_update_iface_desc(uint8_t iface_num, uint8_t setting_num) {
             // A interface descriptor is found
             // Check interface and alternate setting number
             if ((iface_num == udc_ptr_iface->bInterfaceNumber) && (setting_num == udc_ptr_iface->bAlternateSetting)) {
-                return true;  // Interface found
+                return true; // Interface found
             }
         }
         // Go to next descriptor
         udc_ptr_iface = (UDC_DESC_STORAGE usb_iface_desc_t *)((uint8_t *)udc_ptr_iface + udc_ptr_iface->bLength);
     }
-    return false;  // Interface not found
+    return false; // Interface not found
 }
 
 /**
@@ -343,7 +347,9 @@ static bool udc_iface_enable(uint8_t iface_num, uint8_t setting_num) {
 
 /*! \brief Start the USB Device stack
  */
-void udc_start(void) { udd_enable(); }
+void udc_start(void) {
+    udd_enable();
+}
 
 /*! \brief Stop the USB Device stack
  */
@@ -510,7 +516,7 @@ static bool udc_req_std_dev_set_feature(void) {
                     udd_g_ctrlreq.callback = udd_test_mode_packet;
                     return true;
 
-                case USB_DEV_TEST_MODE_FORCE_ENABLE:  // Only for downstream facing hub ports
+                case USB_DEV_TEST_MODE_FORCE_ENABLE: // Only for downstream facing hub ports
                 default:
                     break;
             }
@@ -544,7 +550,9 @@ static bool udc_req_std_ep_set_feature(void) {
  * \brief Change the address of device
  * Callback called at the end of request set address
  */
-static void udc_valid_address(void) { udd_set_address(udd_g_ctrlreq.req.wValue & 0x7F); }
+static void udc_valid_address(void) {
+    udd_set_address(udd_g_ctrlreq.req.wValue & 0x7F);
+}
 
 /**
  * \brief Standard device request to set device address
@@ -763,7 +771,7 @@ static bool udc_req_std_dev_set_configuration(void) {
     // Enable new configuration
     udc_num_configuration = udd_g_ctrlreq.req.wValue & 0xFF;
     if (udc_num_configuration == 0) {
-        return true;  // Default empty configuration requested
+        return true; // Default empty configuration requested
     }
     // Update pointer of the configuration descriptor
 #ifdef USB_DEVICE_HS_SUPPORT
@@ -796,10 +804,10 @@ static bool udc_req_std_iface_get_setting(void) {
     udi_api_t UDC_DESC_STORAGE *udi_api;
 
     if (udd_g_ctrlreq.req.wLength != 1) {
-        return false;  // Error in request
+        return false; // Error in request
     }
     if (!udc_num_configuration) {
-        return false;  // The device is not is configured state yet
+        return false; // The device is not is configured state yet
     }
 
     // Check the interface number included in the request
@@ -832,10 +840,10 @@ static bool udc_req_std_iface_set_setting(void) {
     uint8_t iface_num, setting_num;
 
     if (udd_g_ctrlreq.req.wLength) {
-        return false;  // Error in request
+        return false; // Error in request
     }
     if (!udc_num_configuration) {
-        return false;  // The device is not is configured state yet
+        return false; // The device is not is configured state yet
     }
 
     iface_num   = udd_g_ctrlreq.req.wIndex & 0xFF;
@@ -859,7 +867,7 @@ static bool udc_reqstd(void) {
     if (Udd_setup_is_in()) {
         // GET Standard Requests
         if (udd_g_ctrlreq.req.wLength == 0) {
-            return false;  // Error for USB host
+            return false; // Error for USB host
         }
 
         if (USB_REQ_RECIP_DEVICE == Udd_setup_recipient()) {
@@ -953,7 +961,7 @@ static bool udc_req_iface(void) {
     udi_api_t UDC_DESC_STORAGE *udi_api;
 
     if (0 == udc_num_configuration) {
-        return false;  // The device is not is configured state yet
+        return false; // The device is not is configured state yet
     }
     // Check interface number
     iface_num = udd_g_ctrlreq.req.wIndex & 0xFF;
@@ -987,7 +995,7 @@ static bool udc_req_ep(void) {
     udi_api_t UDC_DESC_STORAGE *udi_api;
 
     if (0 == udc_num_configuration) {
-        return false;  // The device is not is configured state yet
+        return false; // The device is not is configured state yet
     }
     // Send this request on all enabled interfaces
     iface_num = udd_g_ctrlreq.req.wIndex & 0xFF;
@@ -1027,7 +1035,7 @@ bool udc_process_setup(void) {
 
     if (Udd_setup_is_in()) {
         if (udd_g_ctrlreq.req.wLength == 0) {
-            return false;  // Error from USB host
+            return false; // Error from USB host
         }
     }
 
@@ -1055,7 +1063,7 @@ bool udc_process_setup(void) {
     // Here SETUP request unknown by UDC and UDIs
 #ifdef USB_DEVICE_SPECIFIC_REQUEST
     // Try to decode it in specific callback
-    return USB_DEVICE_SPECIFIC_REQUEST();  // Ex: Vendor request,...
+    return USB_DEVICE_SPECIFIC_REQUEST(); // Ex: Vendor request,...
 #else
     return false;
 #endif
diff --git a/tmk_core/protocol/arm_atsam/usb/udc.h b/tmk_core/protocol/arm_atsam/usb/udc.h
index 8d33307d3c..f2144059eb 100644
--- a/tmk_core/protocol/arm_atsam/usb/udc.h
+++ b/tmk_core/protocol/arm_atsam/usb/udc.h
@@ -172,7 +172,9 @@ extern "C" {
     }
 \endcode
  */
-static inline bool udc_include_vbus_monitoring(void) { return udd_include_vbus_monitoring(); }
+static inline bool udc_include_vbus_monitoring(void) {
+    return udd_include_vbus_monitoring();
+}
 
 /*! \brief Start the USB Device stack
  */
@@ -189,19 +191,25 @@ void udc_stop(void);
  * then it will attach device when an acceptable Vbus
  * level from the host is detected.
  */
-static inline void udc_attach(void) { udd_attach(); }
+static inline void udc_attach(void) {
+    udd_attach();
+}
 
 /**
  * \brief Detaches the device from the bus
  *
  * The driver must remove pull-up on USB line D- or D+.
  */
-static inline void udc_detach(void) { udd_detach(); }
+static inline void udc_detach(void) {
+    udd_detach();
+}
 
 /*! \brief The USB driver sends a resume signal called \e "Upstream Resume"
  * This is authorized only when the remote wakeup feature is enabled by host.
  */
-inline void udc_remotewakeup(void) { udd_send_remotewakeup(); }
+inline void udc_remotewakeup(void) {
+    udd_send_remotewakeup();
+}
 
 /**
  * \brief Returns a pointer on the current interface descriptor
@@ -245,4 +253,4 @@ usb_iface_desc_t UDC_DESC_STORAGE *udc_get_interface_desc(void);
 }
 #endif
 
-#endif  // _UDC_H_
+#endif // _UDC_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udc_desc.h b/tmk_core/protocol/arm_atsam/usb/udc_desc.h
index 39ea153b40..50861da964 100644
--- a/tmk_core/protocol/arm_atsam/usb/udc_desc.h
+++ b/tmk_core/protocol/arm_atsam/usb/udc_desc.h
@@ -129,4 +129,4 @@ extern UDC_DESC_STORAGE udc_config_t udc_config;
 #ifdef __cplusplus
 }
 #endif
-#endif  // _UDC_DESC_H_
+#endif // _UDC_DESC_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udd.h b/tmk_core/protocol/arm_atsam/usb/udd.h
index 805b761a77..d9f58baf0b 100644
--- a/tmk_core/protocol/arm_atsam/usb/udd.h
+++ b/tmk_core/protocol/arm_atsam/usb/udd.h
@@ -381,4 +381,4 @@ extern void udc_sof_notify(void);
 #ifdef __cplusplus
 }
 #endif
-#endif  // _UDD_H_
+#endif // _UDD_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi.h b/tmk_core/protocol/arm_atsam/usb/udi.h
index 89942cce4d..60b117f3ca 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi.h
@@ -130,4 +130,4 @@ typedef struct {
 #ifdef __cplusplus
 }
 #endif
-#endif  // _UDI_H_
+#endif // _UDI_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_cdc.c b/tmk_core/protocol/arm_atsam/usb/udi_cdc.c
index 27db4017c4..0391b49f66 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_cdc.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_cdc.c
@@ -386,7 +386,7 @@ bool udi_cdc_comm_setup(void) {
             switch (udd_g_ctrlreq.req.bRequest) {
                 case USB_REQ_CDC_GET_LINE_CODING:
                     // Get configuration of CDC line
-                    if (sizeof(usb_cdc_line_coding_t) != udd_g_ctrlreq.req.wLength) return false;  // Error for USB host
+                    if (sizeof(usb_cdc_line_coding_t) != udd_g_ctrlreq.req.wLength) return false; // Error for USB host
                     udd_g_ctrlreq.payload      = (uint8_t *)&udi_cdc_line_coding[port];
                     udd_g_ctrlreq.payload_size = sizeof(usb_cdc_line_coding_t);
                     return true;
@@ -400,7 +400,7 @@ bool udi_cdc_comm_setup(void) {
             switch (udd_g_ctrlreq.req.bRequest) {
                 case USB_REQ_CDC_SET_LINE_CODING:
                     // Change configuration of CDC line
-                    if (sizeof(usb_cdc_line_coding_t) != udd_g_ctrlreq.req.wLength) return false;  // Error for USB host
+                    if (sizeof(usb_cdc_line_coding_t) != udd_g_ctrlreq.req.wLength) return false; // Error for USB host
                     udd_g_ctrlreq.callback     = udi_cdc_line_coding_received;
                     udd_g_ctrlreq.payload      = (uint8_t *)&udi_cdc_line_coding[port];
                     udd_g_ctrlreq.payload_size = sizeof(usb_cdc_line_coding_t);
@@ -417,15 +417,15 @@ bool udi_cdc_comm_setup(void) {
             }
         }
     }
-    return false;  // request Not supported
+    return false; // request Not supported
 }
 
 bool udi_cdc_data_setup(void) {
-    return false;  // request Not supported
+    return false; // request Not supported
 }
 
 uint8_t udi_cdc_getsetting(void) {
-    return 0;  // CDC don't have multiple alternate setting
+    return 0; // CDC don't have multiple alternate setting
 }
 
 void udi_cdc_data_sof_notify(void) {
@@ -476,7 +476,7 @@ static void udi_cdc_line_coding_received(void) {
 
 static void udi_cdc_ctrl_state_change(uint8_t port, bool b_set, le16_t bit_mask) {
     udd_ep_id_t ep_comm;
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
 
     //#if UDI_CDC_PORT_NB == 1 // To optimize code
     port = 0;
@@ -514,7 +514,7 @@ static void udi_cdc_ctrl_state_change(uint8_t port, bool b_set, le16_t bit_mask)
 }
 
 static void udi_cdc_ctrl_state_notify(uint8_t port, udd_ep_id_t ep) {
-#    if UDI_CDC_PORT_NB == 1  // To optimize code
+#    if UDI_CDC_PORT_NB == 1 // To optimize code
     port = 0;
 #    endif
 
@@ -562,7 +562,7 @@ static void udi_cdc_serial_state_msg_sent(udd_ep_status_t status, iram_size_t n,
 //------- Internal routines to process data transfer
 
 static bool udi_cdc_rx_start(uint8_t port) {
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
     uint8_t     buf_sel_trans;
     udd_ep_id_t ep;
 
@@ -685,7 +685,7 @@ static void udi_cdc_data_sent(udd_ep_status_t status, iram_size_t n, udd_ep_id_t
 }
 
 static void udi_cdc_tx_send(uint8_t port) {
-    uint32_t        irqflags;  // irqflags_t
+    uint32_t        irqflags; // irqflags_t
     uint8_t         buf_sel_trans;
     bool            b_short_packet;
     udd_ep_id_t     ep;
@@ -696,15 +696,15 @@ static void udi_cdc_tx_send(uint8_t port) {
     //#endif
 
     if (udi_cdc_tx_trans_ongoing[port]) {
-        return;  // Already on going or wait next SOF to send next data
+        return; // Already on going or wait next SOF to send next data
     }
     if (udd_is_high_speed()) {
         if (udi_cdc_tx_sof_num[port] == udd_get_micro_frame_number()) {
-            return;  // Wait next SOF to send next data
+            return; // Wait next SOF to send next data
         }
     } else {
         if (udi_cdc_tx_sof_num[port] == udd_get_frame_number()) {
-            return;  // Wait next SOF to send next data
+            return; // Wait next SOF to send next data
         }
     }
 
@@ -743,7 +743,7 @@ static void udi_cdc_tx_send(uint8_t port) {
             udi_cdc_tx_sof_num[port] = udd_get_frame_number();
         }
     } else {
-        udi_cdc_tx_sof_num[port] = 0;  // Force next transfer without wait SOF
+        udi_cdc_tx_sof_num[port] = 0; // Force next transfer without wait SOF
     }
 
     /*
@@ -768,28 +768,48 @@ static void udi_cdc_tx_send(uint8_t port) {
 //---------------------------------------------
 //------- Application interface
 
-void udi_cdc_ctrl_signal_dcd(bool b_set) { udi_cdc_ctrl_state_change(0, b_set, CDC_SERIAL_STATE_DCD); }
+void udi_cdc_ctrl_signal_dcd(bool b_set) {
+    udi_cdc_ctrl_state_change(0, b_set, CDC_SERIAL_STATE_DCD);
+}
 
-void udi_cdc_ctrl_signal_dsr(bool b_set) { udi_cdc_ctrl_state_change(0, b_set, CDC_SERIAL_STATE_DSR); }
+void udi_cdc_ctrl_signal_dsr(bool b_set) {
+    udi_cdc_ctrl_state_change(0, b_set, CDC_SERIAL_STATE_DSR);
+}
 
-void udi_cdc_signal_framing_error(void) { udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_FRAMING); }
+void udi_cdc_signal_framing_error(void) {
+    udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_FRAMING);
+}
 
-void udi_cdc_signal_parity_error(void) { udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_PARITY); }
+void udi_cdc_signal_parity_error(void) {
+    udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_PARITY);
+}
 
-void udi_cdc_signal_overrun(void) { udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_OVERRUN); }
+void udi_cdc_signal_overrun(void) {
+    udi_cdc_ctrl_state_change(0, true, CDC_SERIAL_STATE_OVERRUN);
+}
 
-void udi_cdc_multi_ctrl_signal_dcd(uint8_t port, bool b_set) { udi_cdc_ctrl_state_change(port, b_set, CDC_SERIAL_STATE_DCD); }
+void udi_cdc_multi_ctrl_signal_dcd(uint8_t port, bool b_set) {
+    udi_cdc_ctrl_state_change(port, b_set, CDC_SERIAL_STATE_DCD);
+}
 
-void udi_cdc_multi_ctrl_signal_dsr(uint8_t port, bool b_set) { udi_cdc_ctrl_state_change(port, b_set, CDC_SERIAL_STATE_DSR); }
+void udi_cdc_multi_ctrl_signal_dsr(uint8_t port, bool b_set) {
+    udi_cdc_ctrl_state_change(port, b_set, CDC_SERIAL_STATE_DSR);
+}
 
-void udi_cdc_multi_signal_framing_error(uint8_t port) { udi_cdc_ctrl_state_change(port, true, CDC_SERIAL_STATE_FRAMING); }
+void udi_cdc_multi_signal_framing_error(uint8_t port) {
+    udi_cdc_ctrl_state_change(port, true, CDC_SERIAL_STATE_FRAMING);
+}
 
-void udi_cdc_multi_signal_parity_error(uint8_t port) { udi_cdc_ctrl_state_change(port, true, CDC_SERIAL_STATE_PARITY); }
+void udi_cdc_multi_signal_parity_error(uint8_t port) {
+    udi_cdc_ctrl_state_change(port, true, CDC_SERIAL_STATE_PARITY);
+}
 
-void udi_cdc_multi_signal_overrun(uint8_t port) { udi_cdc_ctrl_state_change(port, true, CDC_SERIAL_STATE_OVERRUN); }
+void udi_cdc_multi_signal_overrun(uint8_t port) {
+    udi_cdc_ctrl_state_change(port, true, CDC_SERIAL_STATE_OVERRUN);
+}
 
 iram_size_t udi_cdc_multi_get_nb_received_data(uint8_t port) {
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
     uint16_t    pos;
     iram_size_t nb_received;
 
@@ -807,14 +827,20 @@ iram_size_t udi_cdc_multi_get_nb_received_data(uint8_t port) {
     return nb_received;
 }
 
-iram_size_t udi_cdc_get_nb_received_data(void) { return udi_cdc_multi_get_nb_received_data(0); }
+iram_size_t udi_cdc_get_nb_received_data(void) {
+    return udi_cdc_multi_get_nb_received_data(0);
+}
 
-bool udi_cdc_multi_is_rx_ready(uint8_t port) { return (udi_cdc_multi_get_nb_received_data(port) > 0); }
+bool udi_cdc_multi_is_rx_ready(uint8_t port) {
+    return (udi_cdc_multi_get_nb_received_data(port) > 0);
+}
 
-bool udi_cdc_is_rx_ready(void) { return udi_cdc_multi_is_rx_ready(0); }
+bool udi_cdc_is_rx_ready(void) {
+    return udi_cdc_multi_is_rx_ready(0);
+}
 
 int udi_cdc_multi_getc(uint8_t port) {
-    uint32_t irqflags;  // irqflags_t
+    uint32_t irqflags; // irqflags_t
     int      rx_data = 0;
     bool     b_databit_9;
     uint16_t pos;
@@ -859,10 +885,12 @@ udi_cdc_getc_process_one_byte:
     return rx_data;
 }
 
-int udi_cdc_getc(void) { return udi_cdc_multi_getc(0); }
+int udi_cdc_getc(void) {
+    return udi_cdc_multi_getc(0);
+}
 
 iram_size_t udi_cdc_multi_read_buf(uint8_t port, void *buf, iram_size_t size) {
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
     uint8_t *   ptr_buf = (uint8_t *)buf;
     iram_size_t copy_nb;
     uint16_t    pos;
@@ -912,7 +940,7 @@ static iram_size_t udi_cdc_multi_read_no_polling(uint8_t port, void *buf, iram_s
     iram_size_t nb_avail_data;
     uint16_t    pos;
     uint8_t     buf_sel;
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
 
     //#if UDI_CDC_PORT_NB == 1 // To optimize code
     port = 0;
@@ -952,12 +980,16 @@ static iram_size_t udi_cdc_multi_read_no_polling(uint8_t port, void *buf, iram_s
     return (nb_avail_data);
 }
 
-iram_size_t udi_cdc_read_no_polling(void *buf, iram_size_t size) { return udi_cdc_multi_read_no_polling(0, buf, size); }
+iram_size_t udi_cdc_read_no_polling(void *buf, iram_size_t size) {
+    return udi_cdc_multi_read_no_polling(0, buf, size);
+}
 
-iram_size_t udi_cdc_read_buf(void *buf, iram_size_t size) { return udi_cdc_multi_read_buf(0, buf, size); }
+iram_size_t udi_cdc_read_buf(void *buf, iram_size_t size) {
+    return udi_cdc_multi_read_buf(0, buf, size);
+}
 
 iram_size_t udi_cdc_multi_get_free_tx_buffer(uint8_t port) {
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
     iram_size_t buf_sel_nb, retval;
     uint8_t     buf_sel;
 
@@ -986,14 +1018,20 @@ iram_size_t udi_cdc_multi_get_free_tx_buffer(uint8_t port) {
     return retval;
 }
 
-iram_size_t udi_cdc_get_free_tx_buffer(void) { return udi_cdc_multi_get_free_tx_buffer(0); }
+iram_size_t udi_cdc_get_free_tx_buffer(void) {
+    return udi_cdc_multi_get_free_tx_buffer(0);
+}
 
-bool udi_cdc_multi_is_tx_ready(uint8_t port) { return (udi_cdc_multi_get_free_tx_buffer(port) != 0); }
+bool udi_cdc_multi_is_tx_ready(uint8_t port) {
+    return (udi_cdc_multi_get_free_tx_buffer(port) != 0);
+}
 
-bool udi_cdc_is_tx_ready(void) { return udi_cdc_multi_is_tx_ready(0); }
+bool udi_cdc_is_tx_ready(void) {
+    return udi_cdc_multi_is_tx_ready(0);
+}
 
 int udi_cdc_multi_putc(uint8_t port, int value) {
-    uint32_t irqflags;  // irqflags_t
+    uint32_t irqflags; // irqflags_t
     bool     b_databit_9;
     uint8_t  buf_sel;
 
@@ -1030,10 +1068,12 @@ udi_cdc_putc_process_one_byte:
     return true;
 }
 
-int udi_cdc_putc(int value) { return udi_cdc_multi_putc(0, value); }
+int udi_cdc_putc(int value) {
+    return udi_cdc_multi_putc(0, value);
+}
 
 iram_size_t udi_cdc_multi_write_buf(uint8_t port, const void *buf, iram_size_t size) {
-    uint32_t    irqflags;  // irqflags_t
+    uint32_t    irqflags; // irqflags_t
     uint8_t     buf_sel;
     uint16_t    buf_nb;
     iram_size_t copy_nb;
@@ -1083,7 +1123,9 @@ udi_cdc_write_buf_loop_wait:
     return 0;
 }
 
-iram_size_t udi_cdc_write_buf(const void *buf, iram_size_t size) { return udi_cdc_multi_write_buf(0, buf, size); }
+iram_size_t udi_cdc_write_buf(const void *buf, iram_size_t size) {
+    return udi_cdc_multi_write_buf(0, buf, size);
+}
 
 #    define MAX_PRINT 256
 #    define CDC_SEND_INTERVAL 2
@@ -1121,10 +1163,10 @@ uint32_t CDC_print(char *printbuf) {
 char printbuf[CDC_PRINTBUF_SIZE];
 
 int CDC_printf(const char *_Format, ...) {
-    va_list va;  // Variable argument list variable
+    va_list va; // Variable argument list variable
     int     result;
 
-    va_start(va, _Format);  // Initialize the variable argument list
+    va_start(va, _Format); // Initialize the variable argument list
     result = vsnprintf(printbuf, CDC_PRINTBUF_SIZE, _Format, va);
     va_end(va);
 
@@ -1146,18 +1188,18 @@ uint32_t CDC_input_buf(inbuf_t inbuf, uint32_t inbuf_size) {
 
     if (RXChar) {
         switch (RXChar) {
-            case '\t':  // tab - repeat last
+            case '\t': // tab - repeat last
                 inbuf.count                = inbuf.lastcount;
                 inbuf.buf[inbuf.count + 1] = 0;
                 CDC_print(inbuf.buf);
                 break;
-            case '\r':  // enter
+            case '\r': // enter
                 inbuf.buf[inbuf.count] = 0;
                 inbuf.lastcount        = inbuf.count;
                 inbuf.count            = 0;
                 entered                = 1;
                 break;
-            case '\b':  // backspace
+            case '\b': // backspace
                 if (inbuf.count > 0) {
                     inbuf.count -= 1;
                     CDC_print("\b \b\0");
@@ -1181,7 +1223,9 @@ uint32_t CDC_input_buf(inbuf_t inbuf, uint32_t inbuf_size) {
     return entered;
 }
 
-uint32_t CDC_input() { return CDC_input_buf(inbuf, CDC_INBUF_SIZE); }
+uint32_t CDC_input() {
+    return CDC_input_buf(inbuf, CDC_INBUF_SIZE);
+}
 
 void CDC_init(void) {
     inbuf.count           = 0;
@@ -1190,19 +1234,27 @@ void CDC_init(void) {
     cdc_tx_send_time_next = timer_read64() + CDC_SEND_INTERVAL;
 }
 
-#else  // CDC line 62
+#else // CDC line 62
 
 char printbuf[CDC_PRINTBUF_SIZE];
 
-void CDC_send(void) { return; }
+void CDC_send(void) {
+    return;
+}
 
-uint32_t CDC_print(char *printbuf) { return 0; }
+uint32_t CDC_print(char *printbuf) {
+    return 0;
+}
 
-int CDC_printf(const char *_Format, ...) { return 0; }
+int CDC_printf(const char *_Format, ...) {
+    return 0;
+}
 
 inbuf_t inbuf;
 
-uint32_t CDC_input(void) { return 0; }
+uint32_t CDC_input(void) {
+    return 0;
+}
 
 void CDC_init(void) {
     inbuf.count     = 0;
@@ -1210,6 +1262,6 @@ void CDC_init(void) {
     printbuf[0]     = 0;
 }
 
-#endif  // CDC line 62
+#endif // CDC line 62
 
 //@}
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_cdc.h b/tmk_core/protocol/arm_atsam/usb/udi_cdc.h
index 406023980c..ff4f521ce0 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_cdc.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_cdc.h
@@ -346,7 +346,7 @@ typedef struct {
     char     buf[CDC_INBUF_SIZE];
 } inbuf_t;
 
-#else  // VIRTSER_ENABLE
+#else // VIRTSER_ENABLE
 
 // keep these to accommodate calls if remaining
 #    define CDC_PRINTBUF_SIZE 1
@@ -362,7 +362,7 @@ typedef struct {
 
 extern inbuf_t inbuf;
 
-#endif  // VIRTSER_ENABLE
+#endif // VIRTSER_ENABLE
 
 uint32_t CDC_print(char* printbuf);
 int      CDC_printf(const char* _Format, ...);
@@ -373,4 +373,4 @@ void     CDC_init(void);
 }
 #endif
 
-#endif  // _UDI_CDC_H_
+#endif // _UDI_CDC_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_cdc_conf.h b/tmk_core/protocol/arm_atsam/usb/udi_cdc_conf.h
index e079512492..e17ed7bf44 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_cdc_conf.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_cdc_conf.h
@@ -59,9 +59,9 @@
 extern "C" {
 #endif
 
-#define UDI_CDC_DATA_EP_IN_0 ((CDC_TX_ENDPOINT) | (USB_EP_DIR_IN))    // TX
-#define UDI_CDC_DATA_EP_OUT_0 ((CDC_RX_ENDPOINT) | (USB_EP_DIR_OUT))  // RX
-#define UDI_CDC_COMM_EP_0 ((CDC_ACM_ENDPOINT) | (USB_EP_DIR_IN))      // Notify endpoint
+#define UDI_CDC_DATA_EP_IN_0 ((CDC_TX_ENDPOINT) | (USB_EP_DIR_IN))   // TX
+#define UDI_CDC_DATA_EP_OUT_0 ((CDC_RX_ENDPOINT) | (USB_EP_DIR_OUT)) // RX
+#define UDI_CDC_COMM_EP_0 ((CDC_ACM_ENDPOINT) | (USB_EP_DIR_IN))     // Notify endpoint
 
 #define UDI_CDC_COMM_IFACE_NUMBER_0 (CDC_STATUS_INTERFACE)
 #define UDI_CDC_DATA_IFACE_NUMBER_0 (CDC_DATA_INTERFACE)
@@ -69,4 +69,4 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif  // _UDI_CDC_CONF_H_
+#endif // _UDI_CDC_CONF_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h b/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
index 1c0983115c..eeed196275 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
@@ -220,7 +220,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define NEXT_OUT_EPNUM_4 (CDC_OUT_EPNUM + 1)
 
 #    define CDC_ACM_SIZE CDC_NOTIFICATION_EPSIZE
-#    define CDC_RX_SIZE CDC_EPSIZE  // KFSMOD was 64
+#    define CDC_RX_SIZE CDC_EPSIZE // KFSMOD was 64
 #    define CDC_TX_SIZE CDC_RX_SIZE
 #    define CDC_ACM_POLLING_INTERVAL 255
 #    define CDC_EP_INTERVAL_STATUS CDC_ACM_POLLING_INTERVAL
@@ -370,7 +370,7 @@ extern udi_hid_exk_report_t udi_hid_exk_report;
 
 COMPILER_PACK_RESET()
 
-#endif  // EXTRAKEY_ENABLE
+#endif // EXTRAKEY_ENABLE
 
 // **********************************************************************
 // NKRO Descriptor structure and content
@@ -433,7 +433,7 @@ extern uint8_t udi_hid_nkro_report[UDI_HID_NKRO_REPORT_SIZE];
 
 COMPILER_PACK_RESET()
 
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
 
 // **********************************************************************
 // MOU Descriptor structure and content
@@ -449,7 +449,7 @@ typedef struct {
 } udi_hid_mou_desc_t;
 
 typedef struct {
-    uint8_t array[77];  // MOU PDS
+    uint8_t array[77]; // MOU PDS
 } udi_hid_mou_report_desc_t;
 
 // clang-format off
@@ -488,12 +488,12 @@ typedef struct {
 // clang-format on
 
 // report buffer
-#    define UDI_HID_MOU_REPORT_SIZE 5  // MOU PDS
+#    define UDI_HID_MOU_REPORT_SIZE 5 // MOU PDS
 extern uint8_t udi_hid_mou_report[UDI_HID_MOU_REPORT_SIZE];
 
 COMPILER_PACK_RESET()
 
-#endif  // MOUSE_ENABLE
+#endif // MOUSE_ENABLE
 
 // **********************************************************************
 // RAW Descriptor structure and content
@@ -565,7 +565,7 @@ extern uint8_t udi_hid_raw_report[UDI_HID_RAW_REPORT_SIZE];
 
 COMPILER_PACK_RESET()
 
-#endif  // RAW_ENABLE
+#endif // RAW_ENABLE
 
 // **********************************************************************
 // CON Descriptor structure and content
@@ -637,7 +637,7 @@ extern uint8_t udi_hid_con_report[UDI_HID_CON_REPORT_SIZE];
 
 COMPILER_PACK_RESET()
 
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
 // **********************************************************************
 // CDC Descriptor structure and content
@@ -780,7 +780,7 @@ typedef struct {
 
 COMPILER_PACK_RESET()
 
-#endif  // VIRTSER_ENABLE
+#endif // VIRTSER_ENABLE
 
 // **********************************************************************
 // CONFIGURATION Descriptor structure and content
@@ -815,4 +815,4 @@ typedef struct {
 
 COMPILER_PACK_RESET()
 
-#endif  //_UDI_DEVICE_CONF_H_
+#endif //_UDI_DEVICE_CONF_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_device_epsize.h b/tmk_core/protocol/arm_atsam/usb/udi_device_epsize.h
index 09de475469..7a9ed31930 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_device_epsize.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_device_epsize.h
@@ -28,4 +28,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define CDC_NOTIFICATION_EPSIZE 8
 #define CDC_EPSIZE 16
 
-#endif  //_UDI_DEVICE_EPSIZE_H_
+#endif //_UDI_DEVICE_EPSIZE_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid.c b/tmk_core/protocol/arm_atsam/usb/udi_hid.c
index b0bdcc6932..73e384a039 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid.c
@@ -110,7 +110,7 @@ bool udi_hid_setup(uint8_t *rate, uint8_t *protocol, uint8_t *report_desc, bool
             }
         }
     }
-    return false;  // Request not supported
+    return false; // Request not supported
 }
 
 //---------------------------------------------
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid.h b/tmk_core/protocol/arm_atsam/usb/udi_hid.h
index 6fd2cabd4c..a08b7db744 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid.h
@@ -82,4 +82,4 @@ bool udi_hid_setup(uint8_t *rate, uint8_t *protocol, uint8_t *report_desc, bool
 #ifdef __cplusplus
 }
 #endif
-#endif  // _UDI_HID_H_
+#endif // _UDI_HID_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
index 9ea4addcfc..be4f2bb0c9 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.c
@@ -94,42 +94,42 @@ static uint8_t udi_hid_kbd_report_trans[UDI_HID_KBD_REPORT_SIZE];
 
 COMPILER_WORD_ALIGNED
 UDC_DESC_STORAGE udi_hid_kbd_report_desc_t udi_hid_kbd_report_desc = {{
-    0x05, 0x01,  // Usage Page (Generic Desktop)
-    0x09, 0x06,  // Usage (Keyboard)
-    0xA1, 0x01,  // Collection (Application)
+    0x05, 0x01, // Usage Page (Generic Desktop)
+    0x09, 0x06, // Usage (Keyboard)
+    0xA1, 0x01, // Collection (Application)
     // Modifiers (8 bits)
-    0x05, 0x07,  //   Usage Page (Keyboard)
-    0x19, 0xE0,  //   Usage Minimum (Keyboard Left Control)
-    0x29, 0xE7,  //   Usage Maximum (Keyboard Right GUI)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0x01,  //   Logical Maximum (1)
-    0x95, 0x08,  //   Report Count (8)
-    0x75, 0x01,  //   Report Size (1)
-    0x81, 0x02,  //   Input (Data, Variable, Absolute)
+    0x05, 0x07, //   Usage Page (Keyboard)
+    0x19, 0xE0, //   Usage Minimum (Keyboard Left Control)
+    0x29, 0xE7, //   Usage Maximum (Keyboard Right GUI)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0x01, //   Logical Maximum (1)
+    0x95, 0x08, //   Report Count (8)
+    0x75, 0x01, //   Report Size (1)
+    0x81, 0x02, //   Input (Data, Variable, Absolute)
     // Reserved (1 byte)
-    0x81, 0x01,  //   Input (Constant)
+    0x81, 0x01, //   Input (Constant)
     // Keycodes (6 bytes)
-    0x19, 0x00,  //   Usage Minimum (0)
-    0x29, 0xFF,  //   Usage Maximum (255)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0xFF,  //   Logical Maximum (255)
-    0x95, 0x06,  //   Report Count (6)
-    0x75, 0x08,  //   Report Size (8)
-    0x81, 0x00,  //   Input (Data, Array, Absolute)
+    0x19, 0x00, //   Usage Minimum (0)
+    0x29, 0xFF, //   Usage Maximum (255)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0xFF, //   Logical Maximum (255)
+    0x95, 0x06, //   Report Count (6)
+    0x75, 0x08, //   Report Size (8)
+    0x81, 0x00, //   Input (Data, Array, Absolute)
 
     // Status LEDs (5 bits)
-    0x05, 0x08,  //   Usage Page (LED)
-    0x19, 0x01,  //   Usage Minimum (Num Lock)
-    0x29, 0x05,  //   Usage Maximum (Kana)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0x01,  //   Logical Maximum (1)
-    0x95, 0x05,  //   Report Count (5)
-    0x75, 0x01,  //   Report Size (1)
-    0x91, 0x02,  //   Output (Data, Variable, Absolute)
+    0x05, 0x08, //   Usage Page (LED)
+    0x19, 0x01, //   Usage Minimum (Num Lock)
+    0x29, 0x05, //   Usage Maximum (Kana)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0x01, //   Logical Maximum (1)
+    0x95, 0x05, //   Report Count (5)
+    0x75, 0x01, //   Report Size (1)
+    0x91, 0x02, //   Output (Data, Variable, Absolute)
     // LED padding (3 bits)
-    0x95, 0x03,  //   Report Count (3)
-    0x91, 0x01,  //   Output (Constant)
-    0xC0         // End Collection
+    0x95, 0x03, //   Report Count (3)
+    0x91, 0x01, //   Output (Constant)
+    0xC0        // End Collection
 }};
 
 static bool udi_hid_kbd_setreport(void);
@@ -148,11 +148,17 @@ bool udi_hid_kbd_enable(void) {
     return UDI_HID_KBD_ENABLE_EXT();
 }
 
-void udi_hid_kbd_disable(void) { UDI_HID_KBD_DISABLE_EXT(); }
+void udi_hid_kbd_disable(void) {
+    UDI_HID_KBD_DISABLE_EXT();
+}
 
-bool udi_hid_kbd_setup(void) { return udi_hid_setup(&udi_hid_kbd_rate, &udi_hid_kbd_protocol, (uint8_t *)&udi_hid_kbd_report_desc, udi_hid_kbd_setreport); }
+bool udi_hid_kbd_setup(void) {
+    return udi_hid_setup(&udi_hid_kbd_rate, &udi_hid_kbd_protocol, (uint8_t *)&udi_hid_kbd_report_desc, udi_hid_kbd_setreport);
+}
 
-uint8_t udi_hid_kbd_getsetting(void) { return 0; }
+uint8_t udi_hid_kbd_getsetting(void) {
+    return 0;
+}
 
 static bool udi_hid_kbd_setreport(void) {
     if ((USB_HID_REPORT_TYPE_OUTPUT == (udd_g_ctrlreq.req.wValue >> 8)) && (0 == (0xFF & udd_g_ctrlreq.req.wValue)) && (1 == udd_g_ctrlreq.req.wLength)) {
@@ -234,41 +240,41 @@ static uint8_t udi_hid_nkro_report_trans[UDI_HID_NKRO_REPORT_SIZE];
 
 COMPILER_WORD_ALIGNED
 UDC_DESC_STORAGE udi_hid_nkro_report_desc_t udi_hid_nkro_report_desc = {{
-    0x05, 0x01,  // Usage Page (Generic Desktop)
-    0x09, 0x06,  // Usage (Keyboard)
-    0xA1, 0x01,  // Collection (Application)
+    0x05, 0x01, // Usage Page (Generic Desktop)
+    0x09, 0x06, // Usage (Keyboard)
+    0xA1, 0x01, // Collection (Application)
 
     // Modifiers (8 bits)
-    0x05, 0x07,  //   Usage Page (Keyboard/Keypad)
-    0x19, 0xE0,  //   Usage Minimum (Keyboard Left Control)
-    0x29, 0xE7,  //   Usage Maximum (Keyboard Right GUI)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0x01,  //   Logical Maximum (1)
-    0x95, 0x08,  //   Report Count (8)
-    0x75, 0x01,  //   Report Size (1)
-    0x81, 0x02,  //   Input (Data, Variable, Absolute)
+    0x05, 0x07, //   Usage Page (Keyboard/Keypad)
+    0x19, 0xE0, //   Usage Minimum (Keyboard Left Control)
+    0x29, 0xE7, //   Usage Maximum (Keyboard Right GUI)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0x01, //   Logical Maximum (1)
+    0x95, 0x08, //   Report Count (8)
+    0x75, 0x01, //   Report Size (1)
+    0x81, 0x02, //   Input (Data, Variable, Absolute)
     // Keycodes
-    0x05, 0x07,  //   Usage Page (Keyboard/Keypad)
-    0x19, 0x00,  //   Usage Minimum (0)
-    0x29, 0xF7,  //   Usage Maximum (247)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0x01,  //   Logical Maximum (1)
-    0x95, 0xF8,  //   Report Count (248)
-    0x75, 0x01,  //   Report Size (1)
-    0x81, 0x02,  //   Input (Data, Variable, Absolute, Bitfield)
+    0x05, 0x07, //   Usage Page (Keyboard/Keypad)
+    0x19, 0x00, //   Usage Minimum (0)
+    0x29, 0xF7, //   Usage Maximum (247)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0x01, //   Logical Maximum (1)
+    0x95, 0xF8, //   Report Count (248)
+    0x75, 0x01, //   Report Size (1)
+    0x81, 0x02, //   Input (Data, Variable, Absolute, Bitfield)
 
     // Status LEDs (5 bits)
-    0x05, 0x08,  //   Usage Page (LED)
-    0x19, 0x01,  //   Usage Minimum (Num Lock)
-    0x29, 0x05,  //   Usage Maximum (Kana)
-    0x95, 0x05,  //   Report Count (5)
-    0x75, 0x01,  //   Report Size (1)
-    0x91, 0x02,  //   Output (Data, Variable, Absolute)
+    0x05, 0x08, //   Usage Page (LED)
+    0x19, 0x01, //   Usage Minimum (Num Lock)
+    0x29, 0x05, //   Usage Maximum (Kana)
+    0x95, 0x05, //   Report Count (5)
+    0x75, 0x01, //   Report Size (1)
+    0x91, 0x02, //   Output (Data, Variable, Absolute)
     // LED padding (3 bits)
-    0x95, 0x01,  //   Report Count (1)
-    0x75, 0x03,  //   Report Size (3)
-    0x91, 0x03,  //   Output (Constant)
-    0xC0         // End Collection
+    0x95, 0x01, //   Report Count (1)
+    0x75, 0x03, //   Report Size (3)
+    0x91, 0x03, //   Output (Constant)
+    0xC0        // End Collection
 }};
 
 static bool udi_hid_nkro_setreport(void);
@@ -285,18 +291,24 @@ bool udi_hid_nkro_enable(void) {
     return UDI_HID_NKRO_ENABLE_EXT();
 }
 
-void udi_hid_nkro_disable(void) { UDI_HID_NKRO_DISABLE_EXT(); }
+void udi_hid_nkro_disable(void) {
+    UDI_HID_NKRO_DISABLE_EXT();
+}
 
-bool udi_hid_nkro_setup(void) { return udi_hid_setup(&udi_hid_nkro_rate, &udi_hid_nkro_protocol, (uint8_t *)&udi_hid_nkro_report_desc, udi_hid_nkro_setreport); }
+bool udi_hid_nkro_setup(void) {
+    return udi_hid_setup(&udi_hid_nkro_rate, &udi_hid_nkro_protocol, (uint8_t *)&udi_hid_nkro_report_desc, udi_hid_nkro_setreport);
+}
 
-uint8_t udi_hid_nkro_getsetting(void) { return 0; }
+uint8_t udi_hid_nkro_getsetting(void) {
+    return 0;
+}
 
 // keyboard receives LED report here
 static bool udi_hid_nkro_setreport(void) {
     if ((USB_HID_REPORT_TYPE_OUTPUT == (udd_g_ctrlreq.req.wValue >> 8)) && (0 == (0xFF & udd_g_ctrlreq.req.wValue)) && (1 == udd_g_ctrlreq.req.wLength)) {
         // Report OUT type on report ID 0 from USB Host
         udd_g_ctrlreq.payload      = &udi_hid_nkro_report_set;
-        udd_g_ctrlreq.callback     = udi_hid_nkro_setreport_valid;  // must call routine to transform setreport to LED state
+        udd_g_ctrlreq.callback     = udi_hid_nkro_setreport_valid; // must call routine to transform setreport to LED state
         udd_g_ctrlreq.payload_size = 1;
         return true;
     }
@@ -333,7 +345,7 @@ static void udi_hid_nkro_setreport_valid(void) {
     // UDI_HID_NKRO_CHANGE_LED(udi_hid_nkro_report_set);
 }
 
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
 
 //********************************************************************************************
 // EXK (extra-keys) SYS-CTRL  Keyboard
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h
index a2d2281628..a330014498 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd.h
@@ -71,7 +71,7 @@ extern UDC_DESC_STORAGE udi_api_t udi_api_hid_nkro;
 extern bool                       udi_hid_nkro_b_report_valid;
 extern volatile bool              udi_hid_nkro_b_report_trans_ongoing;
 bool                              udi_hid_nkro_send_report(void);
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
 
 //********************************************************************************************
 // SYS-CTRL interface
@@ -81,7 +81,7 @@ extern UDC_DESC_STORAGE udi_api_t udi_api_hid_exk;
 extern bool                       udi_hid_exk_b_report_valid;
 extern uint8_t                    udi_hid_exk_report_set;
 bool                              udi_hid_exk_send_report(void);
-#endif  // EXTRAKEY_ENABLE
+#endif // EXTRAKEY_ENABLE
 
 //********************************************************************************************
 // CON Console
@@ -92,7 +92,7 @@ extern bool                       udi_hid_con_b_report_valid;
 extern uint8_t                    udi_hid_con_report_set[UDI_HID_CON_REPORT_SIZE];
 extern volatile bool              udi_hid_con_b_report_trans_ongoing;
 bool                              udi_hid_con_send_report(void);
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
 //********************************************************************************************
 // MOU Mouse
@@ -101,7 +101,7 @@ bool                              udi_hid_con_send_report(void);
 extern UDC_DESC_STORAGE udi_api_t udi_api_hid_mou;
 extern bool                       udi_hid_mou_b_report_valid;
 bool                              udi_hid_mou_send_report(void);
-#endif  // MOUSE_ENABLE
+#endif // MOUSE_ENABLE
 
 //********************************************************************************************
 // RAW Raw
@@ -110,7 +110,7 @@ bool                              udi_hid_mou_send_report(void);
 extern UDC_DESC_STORAGE udi_api_t udi_api_hid_raw;
 bool                              udi_hid_raw_send_report(void);
 bool                              udi_hid_raw_receive_report(void);
-#endif  // RAW_ENABLE
+#endif // RAW_ENABLE
 
 //@}
 
@@ -118,4 +118,4 @@ bool                              udi_hid_raw_receive_report(void);
 }
 #endif
 
-#endif  // _UDC_HID_KBD_H_
+#endif // _UDC_HID_KBD_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_conf.h b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_conf.h
index ec73252b69..db5db17ed5 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_conf.h
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_conf.h
@@ -57,4 +57,4 @@
 
 #include "udi_hid_kbd.h"
 
-#endif  // _UDI_HID_KBD_CONF_H_
+#endif // _UDI_HID_KBD_CONF_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
index 3c1c9a7926..2a60868ed2 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
@@ -78,17 +78,17 @@ UDC_DESC_STORAGE usb_dev_desc_t udc_device_desc = {.bLength         = sizeof(usb
 #ifdef USB_DEVICE_MANUFACTURE_NAME
                                                    .iManufacturer = 1,
 #else
-                                                   .iManufacturer = 0,  // No manufacture string
+                                                   .iManufacturer = 0, // No manufacture string
 #endif
 #ifdef USB_DEVICE_PRODUCT_NAME
                                                    .iProduct = 2,
 #else
-                                                   .iProduct      = 0,  // No product string
+                                                   .iProduct      = 0, // No product string
 #endif
 #if (defined USB_DEVICE_SERIAL_NAME || defined USB_DEVICE_GET_SERIAL_NAME_POINTER)
                                                    .iSerialNumber = 3,
 #else
-                                                   .iSerialNumber = 0,  // No serial string
+                                                   .iSerialNumber = 0, // No serial string
 #endif
                                                    .bNumConfigurations = 1};
 
diff --git a/tmk_core/protocol/arm_atsam/usb/ui.c b/tmk_core/protocol/arm_atsam/usb/ui.c
index 86c7edc94e..f5263d7289 100644
--- a/tmk_core/protocol/arm_atsam/usb/ui.c
+++ b/tmk_core/protocol/arm_atsam/usb/ui.c
@@ -48,7 +48,7 @@
 #    define ARM_MATH_CM4
 #endif
 
-#undef LITTLE_ENDIAN  // redefined in samd51j18a.h
+#undef LITTLE_ENDIAN // redefined in samd51j18a.h
 #include "samd51j18a.h"
 #include "ui.h"
 
diff --git a/tmk_core/protocol/arm_atsam/usb/ui.h b/tmk_core/protocol/arm_atsam/usb/ui.h
index f7bc652360..d1c767d457 100644
--- a/tmk_core/protocol/arm_atsam/usb/ui.h
+++ b/tmk_core/protocol/arm_atsam/usb/ui.h
@@ -73,4 +73,4 @@ void ui_process(uint16_t framenumber);
  */
 void ui_kbd_led(uint8_t value);
 
-#endif  // _UI_H_
+#endif // _UI_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/usb.c b/tmk_core/protocol/arm_atsam/usb/usb.c
index b7393660b1..1abf0a2f4d 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb.c
+++ b/tmk_core/protocol/arm_atsam/usb/usb.c
@@ -52,7 +52,7 @@
 #endif
 
 #include "compiler.h"
-#undef LITTLE_ENDIAN  // redefined in samd51j18a.h
+#undef LITTLE_ENDIAN // redefined in samd51j18a.h
 #include "samd51j18a.h"
 #include <stdbool.h>
 #include <string.h>
@@ -319,7 +319,7 @@ enum status_code usb_device_endpoint_enable_callback(struct usb_module *module_i
     module_inst->device_endpoint_enabled_callback_mask[ep_num] |= _usb_endpoint_irq_bits[callback_type];
 
     if (callback_type == USB_DEVICE_ENDPOINT_CALLBACK_TRCPT) {
-        if (ep_num == 0) {  // control endpoint
+        if (ep_num == 0) { // control endpoint
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENSET.reg = USB_DEVICE_EPINTENSET_TRCPT0 | USB_DEVICE_EPINTENSET_TRCPT1;
         } else if (ep & USB_EP_DIR_IN) {
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENSET.reg = USB_DEVICE_EPINTENSET_TRCPT1;
@@ -329,7 +329,7 @@ enum status_code usb_device_endpoint_enable_callback(struct usb_module *module_i
     }
 
     if (callback_type == USB_DEVICE_ENDPOINT_CALLBACK_TRFAIL) {
-        if (ep_num == 0) {  // control endpoint
+        if (ep_num == 0) { // control endpoint
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENSET.reg = USB_DEVICE_EPINTENSET_TRFAIL0 | USB_DEVICE_EPINTENSET_TRFAIL1;
         } else if (ep & USB_EP_DIR_IN) {
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENSET.reg = USB_DEVICE_EPINTENSET_TRFAIL1;
@@ -377,7 +377,7 @@ enum status_code usb_device_endpoint_disable_callback(struct usb_module *module_
     module_inst->device_endpoint_enabled_callback_mask[ep_num] &= ~_usb_endpoint_irq_bits[callback_type];
 
     if (callback_type == USB_DEVICE_ENDPOINT_CALLBACK_TRCPT) {
-        if (ep_num == 0) {  // control endpoint
+        if (ep_num == 0) { // control endpoint
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENCLR.reg = USB_DEVICE_EPINTENCLR_TRCPT0 | USB_DEVICE_EPINTENCLR_TRCPT1;
         } else if (ep & USB_EP_DIR_IN) {
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENCLR.reg = USB_DEVICE_EPINTENCLR_TRCPT1;
@@ -387,7 +387,7 @@ enum status_code usb_device_endpoint_disable_callback(struct usb_module *module_
     }
 
     if (callback_type == USB_DEVICE_ENDPOINT_CALLBACK_TRFAIL) {
-        if (ep_num == 0) {  // control endpoint
+        if (ep_num == 0) { // control endpoint
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENCLR.reg = USB_DEVICE_EPINTENCLR_TRFAIL0 | USB_DEVICE_EPINTENCLR_TRFAIL1;
         } else if (ep & USB_EP_DIR_IN) {
             module_inst->hw->DEVICE.DeviceEndpoint[ep_num].EPINTENCLR.reg = USB_DEVICE_EPINTENCLR_TRFAIL1;
@@ -903,11 +903,17 @@ void USB_0_Handler(void) {
     }
 }
 
-void USB_1_Handler(void) { _usb_device_interrupt_handler(); }
+void USB_1_Handler(void) {
+    _usb_device_interrupt_handler();
+}
 
-void USB_2_Handler(void) { _usb_device_interrupt_handler(); }
+void USB_2_Handler(void) {
+    _usb_device_interrupt_handler();
+}
 
-void USB_3_Handler(void) { _usb_device_interrupt_handler(); }
+void USB_3_Handler(void) {
+    _usb_device_interrupt_handler();
+}
 
 /**
  * \brief Get the default USB module settings
@@ -974,10 +980,10 @@ enum status_code usb_init(struct usb_module *module_inst, Usb *const hw, struct
     pmclk->APBBMASK.bit.USB_ = 1;
 
     /* Set up the USB DP/DN pins */
-    pport->Group[0].PMUX[12].reg          = 0x77;  // PA24, PA25, function column H for USB D-, D+
+    pport->Group[0].PMUX[12].reg          = 0x77; // PA24, PA25, function column H for USB D-, D+
     pport->Group[0].PINCFG[24].bit.PMUXEN = 1;
     pport->Group[0].PINCFG[25].bit.PMUXEN = 1;
-    pport->Group[1].PMUX[11].bit.PMUXE    = 7;  // PB22, function column H for USB SOF_1KHz output
+    pport->Group[1].PMUX[11].bit.PMUXE    = 7; // PB22, function column H for USB SOF_1KHz output
     pport->Group[1].PINCFG[22].bit.PMUXEN = 1;
 
     // configure and enable DFLL for USB clock recovery mode at 48MHz
@@ -996,7 +1002,7 @@ enum status_code usb_init(struct usb_module *module_inst, Usb *const hw, struct
     while (posc->DFLLSYNC.bit.DFLLCTRLB)
         ;
     posc->DFLLCTRLB.bit.CCDIS = 1;
-    posc->DFLLMUL.bit.MUL     = 0xbb80;  // 4800 x 1KHz
+    posc->DFLLMUL.bit.MUL     = 0xbb80; // 4800 x 1KHz
     while (posc->DFLLSYNC.bit.DFLLMUL)
         ;
     posc->DFLLCTRLA.bit.ENABLE = 1;
diff --git a/tmk_core/protocol/arm_atsam/usb/usb.h b/tmk_core/protocol/arm_atsam/usb/usb.h
index 4c937ecdc9..270143a112 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb.h
@@ -319,14 +319,18 @@ enum status_code usb_init(struct usb_module *module_inst, Usb *const hw, struct
  *
  * \param module_inst Pointer to USB device module instance
  */
-static inline void usb_device_attach(struct usb_module *module_inst) { module_inst->hw->DEVICE.CTRLB.reg &= ~USB_DEVICE_CTRLB_DETACH; }
+static inline void usb_device_attach(struct usb_module *module_inst) {
+    module_inst->hw->DEVICE.CTRLB.reg &= ~USB_DEVICE_CTRLB_DETACH;
+}
 
 /**
  * \brief Detach USB device from the bus
  *
  * \param module_inst Pointer to USB device module instance
  */
-static inline void usb_device_detach(struct usb_module *module_inst) { module_inst->hw->DEVICE.CTRLB.reg |= USB_DEVICE_CTRLB_DETACH; }
+static inline void usb_device_detach(struct usb_module *module_inst) {
+    module_inst->hw->DEVICE.CTRLB.reg |= USB_DEVICE_CTRLB_DETACH;
+}
 
 /**
  * \brief Get the speed mode of USB device
@@ -348,7 +352,9 @@ static inline enum usb_speed usb_device_get_speed(struct usb_module *module_inst
  * \param module_inst Pointer to USB device module instance
  * \return USB device address value.
  */
-static inline uint8_t usb_device_get_address(struct usb_module *module_inst) { return ((uint8_t)(module_inst->hw->DEVICE.DADD.bit.DADD)); }
+static inline uint8_t usb_device_get_address(struct usb_module *module_inst) {
+    return ((uint8_t)(module_inst->hw->DEVICE.DADD.bit.DADD));
+}
 
 /**
  * \brief Set the speed mode of USB device
@@ -356,7 +362,9 @@ static inline uint8_t usb_device_get_address(struct usb_module *module_inst) { r
  * \param module_inst Pointer to USB device module instance
  * \param address     USB device address value
  */
-static inline void usb_device_set_address(struct usb_module *module_inst, uint8_t address) { module_inst->hw->DEVICE.DADD.reg = USB_DEVICE_DADD_ADDEN | address; }
+static inline void usb_device_set_address(struct usb_module *module_inst, uint8_t address) {
+    module_inst->hw->DEVICE.DADD.reg = USB_DEVICE_DADD_ADDEN | address;
+}
 
 /**
  * \brief Get the frame number of USB device
@@ -364,7 +372,9 @@ static inline void usb_device_set_address(struct usb_module *module_inst, uint8_
  * \param module_inst Pointer to USB device module instance
  * \return USB device frame number value.
  */
-static inline uint16_t usb_device_get_frame_number(struct usb_module *module_inst) { return ((uint16_t)(module_inst->hw->DEVICE.FNUM.bit.FNUM)); }
+static inline uint16_t usb_device_get_frame_number(struct usb_module *module_inst) {
+    return ((uint16_t)(module_inst->hw->DEVICE.FNUM.bit.FNUM));
+}
 
 /**
  * \brief Get the micro-frame number of USB device
@@ -372,14 +382,18 @@ static inline uint16_t usb_device_get_frame_number(struct usb_module *module_ins
  * \param module_inst Pointer to USB device module instance
  * \return USB device micro-frame number value.
  */
-static inline uint16_t usb_device_get_micro_frame_number(struct usb_module *module_inst) { return ((uint16_t)(module_inst->hw->DEVICE.FNUM.reg)); }
+static inline uint16_t usb_device_get_micro_frame_number(struct usb_module *module_inst) {
+    return ((uint16_t)(module_inst->hw->DEVICE.FNUM.reg));
+}
 
 /**
  * \brief USB device send the resume wakeup
  *
  * \param module_inst Pointer to USB device module instance
  */
-static inline void usb_device_send_remote_wake_up(struct usb_module *module_inst) { module_inst->hw->DEVICE.CTRLB.reg |= USB_DEVICE_CTRLB_UPRSM; }
+static inline void usb_device_send_remote_wake_up(struct usb_module *module_inst) {
+    module_inst->hw->DEVICE.CTRLB.reg |= USB_DEVICE_CTRLB_UPRSM;
+}
 
 /**
  * \brief USB device set the LPM mode
@@ -387,7 +401,9 @@ static inline void usb_device_send_remote_wake_up(struct usb_module *module_inst
  * \param module_inst Pointer to USB device module instance
  * \param lpm_mode    LPM mode
  */
-static inline void usb_device_set_lpm_mode(struct usb_module *module_inst, enum usb_device_lpm_mode lpm_mode) { module_inst->hw->DEVICE.CTRLB.bit.LPMHDSK = lpm_mode; }
+static inline void usb_device_set_lpm_mode(struct usb_module *module_inst, enum usb_device_lpm_mode lpm_mode) {
+    module_inst->hw->DEVICE.CTRLB.bit.LPMHDSK = lpm_mode;
+}
 
 /**
  * \name USB Device Callback Management
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_atmel.h b/tmk_core/protocol/arm_atsam/usb/usb_atmel.h
index 1cef703788..82bafdc7d1 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_atmel.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_atmel.h
@@ -109,7 +109,7 @@
 #define USB_PID_ATMEL_UC3_EVK1101_CTRLPANEL_HID_MS 0x2306
 #define USB_PID_ATMEL_UC3_CDC 0x2307
 #define USB_PID_ATMEL_UC3_AUDIO_MICRO 0x2308
-#define USB_PID_ATMEL_UC3_CDC_DEBUG 0x2310  // Virtual Com (debug interface) on EVK11xx
+#define USB_PID_ATMEL_UC3_CDC_DEBUG 0x2310 // Virtual Com (debug interface) on EVK11xx
 #define USB_PID_ATMEL_UC3_AUDIO_SPEAKER_MICRO 0x2311
 #define USB_PID_ATMEL_UC3_CDC_MSC 0x2312
 //! @}
@@ -186,4 +186,4 @@
 
 //! @}
 
-#endif  // _USB_ATMEL_H_
+#endif // _USB_ATMEL_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c b/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c
index f138b42786..e4510e7363 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c
+++ b/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c
@@ -127,12 +127,12 @@ uint8_t udd_ctrl_buffer[USB_DEVICE_EP_CTRL_SIZE];
 
 /** Bit definitions about endpoint control state machine for udd_ep_control_state */
 typedef enum {
-    UDD_EPCTRL_SETUP                  = 0,  //!< Wait a SETUP packet
-    UDD_EPCTRL_DATA_OUT               = 1,  //!< Wait a OUT data packet
-    UDD_EPCTRL_DATA_IN                = 2,  //!< Wait a IN data packet
-    UDD_EPCTRL_HANDSHAKE_WAIT_IN_ZLP  = 3,  //!< Wait a IN ZLP packet
-    UDD_EPCTRL_HANDSHAKE_WAIT_OUT_ZLP = 4,  //!< Wait a OUT ZLP packet
-    UDD_EPCTRL_STALL_REQ              = 5,  //!< STALL enabled on IN & OUT packet
+    UDD_EPCTRL_SETUP                  = 0, //!< Wait a SETUP packet
+    UDD_EPCTRL_DATA_OUT               = 1, //!< Wait a OUT data packet
+    UDD_EPCTRL_DATA_IN                = 2, //!< Wait a IN data packet
+    UDD_EPCTRL_HANDSHAKE_WAIT_IN_ZLP  = 3, //!< Wait a IN ZLP packet
+    UDD_EPCTRL_HANDSHAKE_WAIT_OUT_ZLP = 4, //!< Wait a OUT ZLP packet
+    UDD_EPCTRL_STALL_REQ              = 5, //!< STALL enabled on IN & OUT packet
 } udd_ctrl_ep_state_t;
 
 /** Global variable to give and record information of the set up request management */
@@ -363,11 +363,17 @@ void udd_ep_abort(udd_ep_id_t ep) {
     }
 }
 
-bool udd_is_high_speed(void) { return false; }
+bool udd_is_high_speed(void) {
+    return false;
+}
 
-uint16_t udd_get_frame_number(void) { return usb_device_get_frame_number(&usb_device); }
+uint16_t udd_get_frame_number(void) {
+    return usb_device_get_frame_number(&usb_device);
+}
 
-uint16_t udd_get_micro_frame_number(void) { return usb_device_get_micro_frame_number(&usb_device); }
+uint16_t udd_get_micro_frame_number(void) {
+    return usb_device_get_micro_frame_number(&usb_device);
+}
 
 void udd_ep_free(udd_ep_id_t ep) {
     struct usb_device_endpoint_config config_ep;
@@ -436,7 +442,9 @@ bool udd_ep_alloc(udd_ep_id_t ep, uint8_t bmAttributes, uint16_t MaxEndpointSize
     return true;
 }
 
-bool udd_ep_is_halted(udd_ep_id_t ep) { return usb_device_endpoint_is_halted(&usb_device, ep); }
+bool udd_ep_is_halted(udd_ep_id_t ep) {
+    return usb_device_endpoint_is_halted(&usb_device, ep);
+}
 
 bool udd_ep_set_halt(udd_ep_id_t ep) {
     uint8_t ep_num = ep & USB_EP_ADDR_MASK;
@@ -591,9 +599,13 @@ bool udd_ep_run(udd_ep_id_t ep, bool b_shortpacket, uint8_t *buf, iram_size_t bu
     }
 }
 
-void udd_set_address(uint8_t address) { usb_device_set_address(&usb_device, address); }
+void udd_set_address(uint8_t address) {
+    usb_device_set_address(&usb_device, address);
+}
 
-uint8_t udd_getaddress(void) { return usb_device_get_address(&usb_device); }
+uint8_t udd_getaddress(void) {
+    return usb_device_get_address(&usb_device);
+}
 
 void udd_send_remotewakeup(void) {
     uint32_t try
@@ -913,7 +925,7 @@ static void _usb_device_lpm_suspend(struct usb_module *module_inst, void *pointe
     usb_device_enable_callback(&usb_device, USB_DEVICE_CALLBACK_WAKEUP);
 
     //#warning Here the sleep mode must be choose to have a DFLL startup time < bmAttribut.HIRD
-    udd_sleep_mode(UDD_STATE_SUSPEND_LPM);  // Enter in LPM SUSPEND mode
+    udd_sleep_mode(UDD_STATE_SUSPEND_LPM); // Enter in LPM SUSPEND mode
     if ((*lpm_wakeup_enable)) {
         UDC_REMOTEWAKEUP_LPM_ENABLE();
     }
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_hub.c b/tmk_core/protocol/arm_atsam/usb/usb_hub.c
index c5fd284aab..14fba799c7 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_hub.c
+++ b/tmk_core/protocol/arm_atsam/usb/usb_hub.c
@@ -27,7 +27,7 @@ uint8_t usb_extra_state;
 uint8_t usb_extra_manual;
 uint8_t usb_gcr_auto;
 
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
 
 uint16_t adc_extra;
 
@@ -51,10 +51,10 @@ void USB_Hub_init(void) {
     pmclk->APBBMASK.bit.USB_    = 1;
 
     // setup port pins for D-, D+, and SOF_1KHZ
-    pport->Group[0].PMUX[12].reg          = 0x77;  // PA24, PA25, function column H for USB D-, D+
+    pport->Group[0].PMUX[12].reg          = 0x77; // PA24, PA25, function column H for USB D-, D+
     pport->Group[0].PINCFG[24].bit.PMUXEN = 1;
     pport->Group[0].PINCFG[25].bit.PMUXEN = 1;
-    pport->Group[1].PMUX[11].bit.PMUXE    = 7;  // PB22, function column H for USB SOF_1KHz output
+    pport->Group[1].PMUX[11].bit.PMUXE    = 7; // PB22, function column H for USB SOF_1KHz output
     pport->Group[1].PINCFG[22].bit.PMUXEN = 1;
 
     // configure and enable DFLL for USB clock recovery mode at 48MHz
@@ -78,7 +78,7 @@ void USB_Hub_init(void) {
         DBGC(DC_USB2422_INIT_OSC_SYNC_DFLLCTRLB_4);
     }
     posc->DFLLCTRLB.bit.CCDIS = 1;
-    posc->DFLLMUL.bit.MUL     = 0xBB80;  // 4800 x 1KHz
+    posc->DFLLMUL.bit.MUL     = 0xBB80; // 4800 x 1KHz
     while (posc->DFLLSYNC.bit.DFLLMUL) {
         DBGC(DC_USB2422_INIT_OSC_SYNC_DFLLMUL);
     }
@@ -99,7 +99,7 @@ void USB_Hub_init(void) {
     pusb->DEVICE.PADCAL.bit.TRANSP = (USB_FUSES_TRANSP_ADDR >> USB_FUSES_TRANSP_Pos) & USB_FUSES_TRANSP_Msk;
     pusb->DEVICE.PADCAL.bit.TRIM   = (USB_FUSES_TRIM_ADDR >> USB_FUSES_TRIM_Pos) & USB_FUSES_TRIM_Msk;
     // device mode, enabled
-    pusb->DEVICE.CTRLB.bit.SPDCONF = 0;  // full speed
+    pusb->DEVICE.CTRLB.bit.SPDCONF = 0; // full speed
     pusb->DEVICE.CTRLA.bit.MODE    = 0;
     pusb->DEVICE.CTRLA.bit.ENABLE  = 1;
     while (pusb->DEVICE.SYNCBUSY.bit.ENABLE) {
@@ -111,8 +111,8 @@ void USB_Hub_init(void) {
 
     USB2422_init();
 
-    sr_exp_data.bit.HUB_CONNECT = 1;  // connect signal
-    sr_exp_data.bit.HUB_RESET_N = 1;  // reset high
+    sr_exp_data.bit.HUB_CONNECT = 1; // connect signal
+    sr_exp_data.bit.HUB_RESET_N = 1; // reset high
     SR_EXP_WriteData();
 
     wait_us(100);
@@ -122,7 +122,7 @@ void USB_Hub_init(void) {
     usb_extra_manual = 0;
     usb_gcr_auto     = 1;
 
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
 
     DBGC(DC_USB2422_INIT_COMPLETE);
 }
@@ -131,10 +131,10 @@ void USB_reset(void) {
     DBGC(DC_USB_RESET_BEGIN);
 
     // pulse reset for at least 1 usec
-    sr_exp_data.bit.HUB_RESET_N = 0;  // reset low
+    sr_exp_data.bit.HUB_RESET_N = 0; // reset low
     SR_EXP_WriteData();
     wait_us(2);
-    sr_exp_data.bit.HUB_RESET_N = 1;  // reset high to run
+    sr_exp_data.bit.HUB_RESET_N = 1; // reset high to run
     SR_EXP_WriteData();
 
     DBGC(DC_USB_RESET_COMPLETE);
@@ -150,7 +150,9 @@ void USB_configure(void) {
     DBGC(DC_USB_CONFIGURE_COMPLETE);
 }
 
-uint16_t USB_active(void) { return USB2422_active(); }
+uint16_t USB_active(void) {
+    return USB2422_active();
+}
 
 void USB_set_host_by_voltage(void) {
     // UP is upstream device (HOST)
@@ -162,13 +164,13 @@ void USB_set_host_by_voltage(void) {
     usb_host_port = USB_HOST_PORT_UNKNOWN;
 #ifndef MD_BOOTLOADER
     usb_extra_state = USB_EXTRA_STATE_UNKNOWN;
-#endif                             // MD_BOOTLOADER
-    sr_exp_data.bit.SRC_1    = 1;  // USBC-1 available for test
-    sr_exp_data.bit.SRC_2    = 1;  // USBC-2 available for test
-    sr_exp_data.bit.E_UP_N   = 1;  // HOST disable
-    sr_exp_data.bit.E_DN1_N  = 1;  // EXTRA disable
-    sr_exp_data.bit.E_VBUS_1 = 0;  // USBC-1 disable full power I/O
-    sr_exp_data.bit.E_VBUS_2 = 0;  // USBC-2 disable full power I/O
+#endif                            // MD_BOOTLOADER
+    sr_exp_data.bit.SRC_1    = 1; // USBC-1 available for test
+    sr_exp_data.bit.SRC_2    = 1; // USBC-2 available for test
+    sr_exp_data.bit.E_UP_N   = 1; // HOST disable
+    sr_exp_data.bit.E_DN1_N  = 1; // EXTRA disable
+    sr_exp_data.bit.E_VBUS_1 = 0; // USBC-1 disable full power I/O
+    sr_exp_data.bit.E_VBUS_2 = 0; // USBC-2 disable full power I/O
 
     SR_EXP_WriteData();
 
@@ -185,33 +187,33 @@ void USB_set_host_by_voltage(void) {
     v_con_2_boot = v_con_2;
 
     if (v_con_1 > v_con_2) {
-        sr_exp_data.bit.S_UP  = 0;  // HOST to USBC-1
-        sr_exp_data.bit.S_DN1 = 1;  // EXTRA to USBC-2
-        sr_exp_data.bit.SRC_1 = 1;  // HOST on USBC-1
-        sr_exp_data.bit.SRC_2 = 0;  // EXTRA available on USBC-2
+        sr_exp_data.bit.S_UP  = 0; // HOST to USBC-1
+        sr_exp_data.bit.S_DN1 = 1; // EXTRA to USBC-2
+        sr_exp_data.bit.SRC_1 = 1; // HOST on USBC-1
+        sr_exp_data.bit.SRC_2 = 0; // EXTRA available on USBC-2
 
-        sr_exp_data.bit.E_VBUS_1 = 1;  // USBC-1 enable full power I/O
-        sr_exp_data.bit.E_VBUS_2 = 0;  // USBC-2 disable full power I/O
+        sr_exp_data.bit.E_VBUS_1 = 1; // USBC-1 enable full power I/O
+        sr_exp_data.bit.E_VBUS_2 = 0; // USBC-2 disable full power I/O
 
         SR_EXP_WriteData();
 
-        sr_exp_data.bit.E_UP_N = 0;  // HOST enable
+        sr_exp_data.bit.E_UP_N = 0; // HOST enable
 
         SR_EXP_WriteData();
 
         usb_host_port = USB_HOST_PORT_1;
     } else {
-        sr_exp_data.bit.S_UP  = 1;  // EXTRA to USBC-1
-        sr_exp_data.bit.S_DN1 = 0;  // HOST to USBC-2
-        sr_exp_data.bit.SRC_1 = 0;  // EXTRA available on USBC-1
-        sr_exp_data.bit.SRC_2 = 1;  // HOST on USBC-2
+        sr_exp_data.bit.S_UP  = 1; // EXTRA to USBC-1
+        sr_exp_data.bit.S_DN1 = 0; // HOST to USBC-2
+        sr_exp_data.bit.SRC_1 = 0; // EXTRA available on USBC-1
+        sr_exp_data.bit.SRC_2 = 1; // HOST on USBC-2
 
-        sr_exp_data.bit.E_VBUS_1 = 0;  // USBC-1 disable full power I/O
-        sr_exp_data.bit.E_VBUS_2 = 1;  // USBC-2 enable full power I/O
+        sr_exp_data.bit.E_VBUS_1 = 0; // USBC-1 disable full power I/O
+        sr_exp_data.bit.E_VBUS_2 = 1; // USBC-2 enable full power I/O
 
         SR_EXP_WriteData();
 
-        sr_exp_data.bit.E_UP_N = 0;  // HOST enable
+        sr_exp_data.bit.E_UP_N = 0; // HOST enable
 
         SR_EXP_WriteData();
 
@@ -220,7 +222,7 @@ void USB_set_host_by_voltage(void) {
 
 #ifndef MD_BOOTLOADER
     usb_extra_state = USB_EXTRA_STATE_DISABLED;
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
 
     USB_reset();
     USB_configure();
@@ -241,7 +243,7 @@ uint8_t USB_Hub_Port_Detect_Init(void) {
     while (!USB_active()) {
         tmod = timer_read64() % PORT_DETECT_RETRY_INTERVAL;
 
-        if (v_con_1 > v_con_2)  // Values updated from USB_set_host_by_voltage();
+        if (v_con_1 > v_con_2) // Values updated from USB_set_host_by_voltage();
         {
             // 1 flash for port 1 detected
             if (tmod > 500 && tmod < 600) {
@@ -249,7 +251,7 @@ uint8_t USB_Hub_Port_Detect_Init(void) {
             } else {
                 DBG_LED_OFF;
             }
-        } else if (v_con_2 > v_con_1)  // Values updated from USB_set_host_by_voltage();
+        } else if (v_con_2 > v_con_1) // Values updated from USB_set_host_by_voltage();
         {
             // 2 flash for port 2 detected
             if (tmod > 500 && tmod < 600) {
@@ -321,7 +323,7 @@ void USB_HandleExtraDevice(void) {
         // Detect unplug and reset state to disabled
         if (adc_extra > USB_EXTRA_ADC_THRESHOLD) usb_extra_state = USB_EXTRA_STATE_DISABLED;
 
-        return;  // Return even if unplug detected
+        return; // Return even if unplug detected
     }
 
     if (usb_extra_manual) {
@@ -337,4 +339,4 @@ void USB_HandleExtraDevice(void) {
         USB_ExtraSetState(USB_EXTRA_STATE_DISABLED);
 }
 
-#endif  // MD_BOOTLOADER
+#endif // MD_BOOTLOADER
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_hub.h b/tmk_core/protocol/arm_atsam/usb/usb_hub.h
index 76b1e0a326..d7b2e3fab4 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_hub.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_hub.h
@@ -48,4 +48,4 @@ uint16_t adc_get(uint8_t muxpos);
 void     USB_HandleExtraDevice(void);
 void     USB_ExtraSetState(uint8_t state);
 
-#endif  //_USB2422_H_
+#endif //_USB2422_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_main.h b/tmk_core/protocol/arm_atsam/usb/usb_main.h
index d8461c6c9f..c3b1698c59 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_main.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_main.h
@@ -71,31 +71,31 @@ void                 main_kbd_disable(void);
 extern volatile bool main_b_nkro_enable;
 bool                 main_nkro_enable(void);
 void                 main_nkro_disable(void);
-#endif  // NKRO_ENABLE
+#endif // NKRO_ENABLE
 
 #ifdef EXTRAKEY_ENABLE
 extern volatile bool main_b_exk_enable;
 bool                 main_exk_enable(void);
 void                 main_exk_disable(void);
-#endif  // EXTRAKEY_ENABLE
+#endif // EXTRAKEY_ENABLE
 
 #ifdef CONSOLE_ENABLE
 extern volatile bool main_b_con_enable;
 bool                 main_con_enable(void);
 void                 main_con_disable(void);
-#endif  // CONSOLE_ENABLE
+#endif // CONSOLE_ENABLE
 
 #ifdef MOUSE_ENABLE
 extern volatile bool main_b_mou_enable;
 bool                 main_mou_enable(void);
 void                 main_mou_disable(void);
-#endif  // MOUSE_ENABLE
+#endif // MOUSE_ENABLE
 
 #ifdef RAW_ENABLE
 extern volatile bool main_b_raw_enable;
 bool                 main_raw_enable(void);
 void                 main_raw_disable(void);
 void                 main_raw_receive(uint8_t *buffer, uint8_t len);
-#endif  // RAW_ENABLE
+#endif // RAW_ENABLE
 
-#endif  // _MAIN_H_
+#endif // _MAIN_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_protocol.h b/tmk_core/protocol/arm_atsam/usb/usb_protocol.h
index 54d023a6ee..639b80a804 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_protocol.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_protocol.h
@@ -63,8 +63,8 @@
  */
 
 //! Value for field bcdUSB
-#define USB_V2_0 0x0200  //!< USB Specification version 2.00
-#define USB_V2_1 0x0201  //!< USB Specification version 2.01
+#define USB_V2_0 0x0200 //!< USB Specification version 2.00
+#define USB_V2_1 0x0201 //!< USB Specification version 2.01
 
 /*! \name Generic definitions (Class, subclass and protocol)
  */
@@ -85,26 +85,26 @@
 /**
  * \brief USB request data transfer direction (bmRequestType)
  */
-#define USB_REQ_DIR_OUT (0 << 7)   //!< Host to device
-#define USB_REQ_DIR_IN (1 << 7)    //!< Device to host
-#define USB_REQ_DIR_MASK (1 << 7)  //!< Mask
+#define USB_REQ_DIR_OUT (0 << 7)  //!< Host to device
+#define USB_REQ_DIR_IN (1 << 7)   //!< Device to host
+#define USB_REQ_DIR_MASK (1 << 7) //!< Mask
 
 /**
  * \brief USB request types (bmRequestType)
  */
-#define USB_REQ_TYPE_STANDARD (0 << 5)  //!< Standard request
-#define USB_REQ_TYPE_CLASS (1 << 5)     //!< Class-specific request
-#define USB_REQ_TYPE_VENDOR (2 << 5)    //!< Vendor-specific request
-#define USB_REQ_TYPE_MASK (3 << 5)      //!< Mask
+#define USB_REQ_TYPE_STANDARD (0 << 5) //!< Standard request
+#define USB_REQ_TYPE_CLASS (1 << 5)    //!< Class-specific request
+#define USB_REQ_TYPE_VENDOR (2 << 5)   //!< Vendor-specific request
+#define USB_REQ_TYPE_MASK (3 << 5)     //!< Mask
 
 /**
  * \brief USB recipient codes (bmRequestType)
  */
-#define USB_REQ_RECIP_DEVICE (0 << 0)     //!< Recipient device
-#define USB_REQ_RECIP_INTERFACE (1 << 0)  //!< Recipient interface
-#define USB_REQ_RECIP_ENDPOINT (2 << 0)   //!< Recipient endpoint
-#define USB_REQ_RECIP_OTHER (3 << 0)      //!< Recipient other
-#define USB_REQ_RECIP_MASK (0x1F)         //!< Mask
+#define USB_REQ_RECIP_DEVICE (0 << 0)    //!< Recipient device
+#define USB_REQ_RECIP_INTERFACE (1 << 0) //!< Recipient interface
+#define USB_REQ_RECIP_ENDPOINT (2 << 0)  //!< Recipient endpoint
+#define USB_REQ_RECIP_OTHER (3 << 0)     //!< Recipient other
+#define USB_REQ_RECIP_MASK (0x1F)        //!< Mask
 
 /**
  * \brief Standard USB requests (bRequest)
@@ -149,8 +149,8 @@ enum usb_endpoint_status {
  * \note valid for SetFeature request.
  */
 enum usb_device_feature {
-    USB_DEV_FEATURE_REMOTE_WAKEUP         = 1,  //!< Remote wakeup enabled
-    USB_DEV_FEATURE_TEST_MODE             = 2,  //!< USB test mode
+    USB_DEV_FEATURE_REMOTE_WAKEUP         = 1, //!< Remote wakeup enabled
+    USB_DEV_FEATURE_TEST_MODE             = 2, //!< USB test mode
     USB_DEV_FEATURE_OTG_B_HNP_ENABLE      = 3,
     USB_DEV_FEATURE_OTG_A_HNP_SUPPORT     = 4,
     USB_DEV_FEATURE_OTG_A_ALT_HNP_SUPPORT = 5
@@ -261,7 +261,7 @@ enum usb_ep_type {
  * \brief Standard USB language IDs for string descriptors
  */
 enum usb_langid {
-    USB_LANGID_EN_US = 0x0409,  //!< English (United States)
+    USB_LANGID_EN_US = 0x0409, //!< English (United States)
 };
 
 /**
@@ -396,14 +396,14 @@ typedef struct {
  * \brief Standard USB Interface Association Descriptor structure
  */
 typedef struct {
-    uint8_t bLength;            //!< size of this descriptor in bytes
-    uint8_t bDescriptorType;    //!< INTERFACE descriptor type
-    uint8_t bFirstInterface;    //!< Number of interface
-    uint8_t bInterfaceCount;    //!< value to select alternate setting
-    uint8_t bFunctionClass;     //!< Class code assigned by the USB
-    uint8_t bFunctionSubClass;  //!< Sub-class code assigned by the USB
-    uint8_t bFunctionProtocol;  //!< Protocol code assigned by the USB
-    uint8_t iFunction;          //!< Index of string descriptor
+    uint8_t bLength;           //!< size of this descriptor in bytes
+    uint8_t bDescriptorType;   //!< INTERFACE descriptor type
+    uint8_t bFirstInterface;   //!< Number of interface
+    uint8_t bInterfaceCount;   //!< value to select alternate setting
+    uint8_t bFunctionClass;    //!< Class code assigned by the USB
+    uint8_t bFunctionSubClass; //!< Sub-class code assigned by the USB
+    uint8_t bFunctionProtocol; //!< Protocol code assigned by the USB
+    uint8_t iFunction;         //!< Index of string descriptor
 } usb_association_desc_t;
 
 /**
@@ -420,25 +420,25 @@ typedef struct {
     uint8_t bMaxPower;
 } usb_conf_desc_t;
 
-#define USB_CONFIG_ATTR_MUST_SET (1 << 7)       //!< Must always be set
-#define USB_CONFIG_ATTR_BUS_POWERED (0 << 6)    //!< Bus-powered
-#define USB_CONFIG_ATTR_SELF_POWERED (1 << 6)   //!< Self-powered
-#define USB_CONFIG_ATTR_REMOTE_WAKEUP (1 << 5)  //!< remote wakeup supported
+#define USB_CONFIG_ATTR_MUST_SET (1 << 7)      //!< Must always be set
+#define USB_CONFIG_ATTR_BUS_POWERED (0 << 6)   //!< Bus-powered
+#define USB_CONFIG_ATTR_SELF_POWERED (1 << 6)  //!< Self-powered
+#define USB_CONFIG_ATTR_REMOTE_WAKEUP (1 << 5) //!< remote wakeup supported
 
-#define USB_CONFIG_MAX_POWER(ma) (((ma) + 1) / 2)  //!< Max power in mA
+#define USB_CONFIG_MAX_POWER(ma) (((ma) + 1) / 2) //!< Max power in mA
 
 /**
  * \brief Standard USB association descriptor structure
  */
 typedef struct {
-    uint8_t bLength;            //!< Size of this descriptor in bytes
-    uint8_t bDescriptorType;    //!< Interface descriptor type
-    uint8_t bFirstInterface;    //!< Number of interface
-    uint8_t bInterfaceCount;    //!< value to select alternate setting
-    uint8_t bFunctionClass;     //!< Class code assigned by the USB
-    uint8_t bFunctionSubClass;  //!< Sub-class code assigned by the USB
-    uint8_t bFunctionProtocol;  //!< Protocol code assigned by the USB
-    uint8_t iFunction;          //!< Index of string descriptor
+    uint8_t bLength;           //!< Size of this descriptor in bytes
+    uint8_t bDescriptorType;   //!< Interface descriptor type
+    uint8_t bFirstInterface;   //!< Number of interface
+    uint8_t bInterfaceCount;   //!< value to select alternate setting
+    uint8_t bFunctionClass;    //!< Class code assigned by the USB
+    uint8_t bFunctionSubClass; //!< Sub-class code assigned by the USB
+    uint8_t bFunctionProtocol; //!< Protocol code assigned by the USB
+    uint8_t iFunction;         //!< Index of string descriptor
 } usb_iad_desc_t;
 
 /**
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_protocol_cdc.h b/tmk_core/protocol/arm_atsam/usb/usb_protocol_cdc.h
index f35503a3be..1d36d58dbd 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_protocol_cdc.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_protocol_cdc.h
@@ -50,41 +50,41 @@
 
 #ifdef VIRTSER_ENABLE
 
-#    define CDC_CLASS_DEVICE 0x02  //!< USB Communication Device Class
-#    define CDC_CLASS_COMM 0x02    //!< CDC Communication Class Interface
-#    define CDC_CLASS_DATA 0x0A    //!< CDC Data Class Interface
+#    define CDC_CLASS_DEVICE 0x02 //!< USB Communication Device Class
+#    define CDC_CLASS_COMM 0x02   //!< CDC Communication Class Interface
+#    define CDC_CLASS_DATA 0x0A   //!< CDC Data Class Interface
 
-#    define CDC_SUBCLASS_DLCM 0x01  //!< Direct Line Control Model
-#    define CDC_SUBCLASS_ACM 0x02   //!< Abstract Control Model
-#    define CDC_SUBCLASS_TCM 0x03   //!< Telephone Control Model
-#    define CDC_SUBCLASS_MCCM 0x04  //!< Multi-Channel Control Model
-#    define CDC_SUBCLASS_CCM 0x05   //!< CAPI Control Model
-#    define CDC_SUBCLASS_ETH 0x06   //!< Ethernet Networking Control Model
-#    define CDC_SUBCLASS_ATM 0x07   //!< ATM Networking Control Model
+#    define CDC_SUBCLASS_DLCM 0x01 //!< Direct Line Control Model
+#    define CDC_SUBCLASS_ACM 0x02  //!< Abstract Control Model
+#    define CDC_SUBCLASS_TCM 0x03  //!< Telephone Control Model
+#    define CDC_SUBCLASS_MCCM 0x04 //!< Multi-Channel Control Model
+#    define CDC_SUBCLASS_CCM 0x05  //!< CAPI Control Model
+#    define CDC_SUBCLASS_ETH 0x06  //!< Ethernet Networking Control Model
+#    define CDC_SUBCLASS_ATM 0x07  //!< ATM Networking Control Model
 
-#    define CDC_PROTOCOL_V25TER 0x01  //!< Common AT commands
+#    define CDC_PROTOCOL_V25TER 0x01 //!< Common AT commands
 
-#    define CDC_PROTOCOL_I430 0x30    //!< ISDN BRI
-#    define CDC_PROTOCOL_HDLC 0x31    //!< HDLC
-#    define CDC_PROTOCOL_TRANS 0x32   //!< Transparent
-#    define CDC_PROTOCOL_Q921M 0x50   //!< Q.921 management protocol
-#    define CDC_PROTOCOL_Q921 0x51    //!< Q.931 [sic] Data link protocol
-#    define CDC_PROTOCOL_Q921TM 0x52  //!< Q.921 TEI-multiplexor
-#    define CDC_PROTOCOL_V42BIS 0x90  //!< Data compression procedures
-#    define CDC_PROTOCOL_Q931 0x91    //!< Euro-ISDN protocol control
-#    define CDC_PROTOCOL_V120 0x92    //!< V.24 rate adaption to ISDN
-#    define CDC_PROTOCOL_CAPI20 0x93  //!< CAPI Commands
-#    define CDC_PROTOCOL_HOST 0xFD    //!< Host based driver
+#    define CDC_PROTOCOL_I430 0x30   //!< ISDN BRI
+#    define CDC_PROTOCOL_HDLC 0x31   //!< HDLC
+#    define CDC_PROTOCOL_TRANS 0x32  //!< Transparent
+#    define CDC_PROTOCOL_Q921M 0x50  //!< Q.921 management protocol
+#    define CDC_PROTOCOL_Q921 0x51   //!< Q.931 [sic] Data link protocol
+#    define CDC_PROTOCOL_Q921TM 0x52 //!< Q.921 TEI-multiplexor
+#    define CDC_PROTOCOL_V42BIS 0x90 //!< Data compression procedures
+#    define CDC_PROTOCOL_Q931 0x91   //!< Euro-ISDN protocol control
+#    define CDC_PROTOCOL_V120 0x92   //!< V.24 rate adaption to ISDN
+#    define CDC_PROTOCOL_CAPI20 0x93 //!< CAPI Commands
+#    define CDC_PROTOCOL_HOST 0xFD   //!< Host based driver
 
 #    define CDC_PROTOCOL_PUFD 0xFE
 
-#    define CDC_CS_INTERFACE 0x24  //!< Interface Functional Descriptor
-#    define CDC_CS_ENDPOINT 0x25   //!< Endpoint Functional Descriptor
+#    define CDC_CS_INTERFACE 0x24 //!< Interface Functional Descriptor
+#    define CDC_CS_ENDPOINT 0x25  //!< Endpoint Functional Descriptor
 
-#    define CDC_SCS_HEADER 0x00     //!< Header Functional Descriptor
-#    define CDC_SCS_CALL_MGMT 0x01  //!< Call Management
-#    define CDC_SCS_ACM 0x02        //!< Abstract Control Management
-#    define CDC_SCS_UNION 0x06      //!< Union Functional Descriptor
+#    define CDC_SCS_HEADER 0x00    //!< Header Functional Descriptor
+#    define CDC_SCS_CALL_MGMT 0x01 //!< Call Management
+#    define CDC_SCS_ACM 0x02       //!< Abstract Control Management
+#    define CDC_SCS_UNION 0x06     //!< Union Functional Descriptor
 
 #    define USB_REQ_CDC_SEND_ENCAPSULATED_COMMAND 0x00
 #    define USB_REQ_CDC_GET_ENCAPSULATED_RESPONSE 0x01
@@ -144,17 +144,17 @@ typedef struct {
 #    pragma pack(pop)
 
 enum cdc_char_format {
-    CDC_STOP_BITS_1   = 0,  //!< 1 stop bit
-    CDC_STOP_BITS_1_5 = 1,  //!< 1.5 stop bits
-    CDC_STOP_BITS_2   = 2,  //!< 2 stop bits
+    CDC_STOP_BITS_1   = 0, //!< 1 stop bit
+    CDC_STOP_BITS_1_5 = 1, //!< 1.5 stop bits
+    CDC_STOP_BITS_2   = 2, //!< 2 stop bits
 };
 
 enum cdc_parity {
-    CDC_PAR_NONE  = 0,  //!< No parity
-    CDC_PAR_ODD   = 1,  //!< Odd parity
-    CDC_PAR_EVEN  = 2,  //!< Even parity
-    CDC_PAR_MARK  = 3,  //!< Parity forced to 0 (space)
-    CDC_PAR_SPACE = 4,  //!< Parity forced to 1 (mark)
+    CDC_PAR_NONE  = 0, //!< No parity
+    CDC_PAR_ODD   = 1, //!< Odd parity
+    CDC_PAR_EVEN  = 2, //!< Even parity
+    CDC_PAR_MARK  = 3, //!< Parity forced to 0 (space)
+    CDC_PAR_SPACE = 4, //!< Parity forced to 1 (mark)
 };
 
 typedef struct {
@@ -187,4 +187,4 @@ typedef struct {
 
 #endif
 
-#endif  // _USB_PROTOCOL_CDC_H_
+#endif // _USB_PROTOCOL_CDC_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h b/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
index fb97f63cef..c984c0762f 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_protocol_hid.h
@@ -121,13 +121,13 @@ COMPILER_PACK_SET(1)
 
 //! \brief HID Descriptor
 typedef struct {
-    uint8_t bLength;            //!< Size of this descriptor in bytes
-    uint8_t bDescriptorType;    //!< HID descriptor type
-    le16_t  bcdHID;             //!< Binary Coded Decimal Spec. release
-    uint8_t bCountryCode;       //!< Hardware target country
-    uint8_t bNumDescriptors;    //!< Number of HID class descriptors to follow
-    uint8_t bRDescriptorType;   //!< Report descriptor type
-    le16_t  wDescriptorLength;  //!< Total length of Report descriptor
+    uint8_t bLength;           //!< Size of this descriptor in bytes
+    uint8_t bDescriptorType;   //!< HID descriptor type
+    le16_t  bcdHID;            //!< Binary Coded Decimal Spec. release
+    uint8_t bCountryCode;      //!< Hardware target country
+    uint8_t bNumDescriptors;   //!< Number of HID class descriptors to follow
+    uint8_t bRDescriptorType;  //!< Report descriptor type
+    le16_t  wDescriptorLength; //!< Total length of Report descriptor
 } usb_hid_descriptor_t;
 
 COMPILER_PACK_RESET()
@@ -151,45 +151,45 @@ COMPILER_PACK_RESET()
 
 //! \name Country code
 //! @{
-#define USB_HID_NO_COUNTRY_CODE 0             // Not Supported
-#define USB_HID_COUNTRY_ARABIC 1              // Arabic
-#define USB_HID_COUNTRY_BELGIAN 2             // Belgian
-#define USB_HID_COUNTRY_CANADIAN_BILINGUAL 3  // Canadian-Bilingual
-#define USB_HID_COUNTRY_CANADIAN_FRENCH 4     // Canadian-French
-#define USB_HID_COUNTRY_CZECH_REPUBLIC 5      // Czech Republic
-#define USB_HID_COUNTRY_DANISH 6              // Danish
-#define USB_HID_COUNTRY_FINNISH 7             // Finnish
-#define USB_HID_COUNTRY_FRENCH 8              // French
-#define USB_HID_COUNTRY_GERMAN 9              // German
-#define USB_HID_COUNTRY_GREEK 10              // Greek
-#define USB_HID_COUNTRY_HEBREW 11             // Hebrew
-#define USB_HID_COUNTRY_HUNGARY 12            // Hungary
-#define USB_HID_COUNTRY_INTERNATIONAL_ISO 13  // International (ISO)
-#define USB_HID_COUNTRY_ITALIAN 14            // Italian
-#define USB_HID_COUNTRY_JAPAN_KATAKANA 15     // Japan (Katakana)
-#define USB_HID_COUNTRY_KOREAN 16             // Korean
-#define USB_HID_COUNTRY_LATIN_AMERICAN 17     // Latin American
-#define USB_HID_COUNTRY_NETHERLANDS_DUTCH 18  // Netherlands/Dutch
-#define USB_HID_COUNTRY_NORWEGIAN 19          // Norwegian
-#define USB_HID_COUNTRY_PERSIAN_FARSI 20      // Persian (Farsi)
-#define USB_HID_COUNTRY_POLAND 21             // Poland
-#define USB_HID_COUNTRY_PORTUGUESE 22         // Portuguese
-#define USB_HID_COUNTRY_RUSSIA 23             // Russia
-#define USB_HID_COUNTRY_SLOVAKIA 24           // Slovakia
-#define USB_HID_COUNTRY_SPANISH 25            // Spanish
-#define USB_HID_COUNTRY_SWEDISH 26            // Swedish
-#define USB_HID_COUNTRY_SWISS_FRENCH 27       // Swiss/French
-#define USB_HID_COUNTRY_SWISS_GERMAN 28       // Swiss/German
-#define USB_HID_COUNTRY_SWITZERLAND 29        // Switzerland
-#define USB_HID_COUNTRY_TAIWAN 30             // Taiwan
-#define USB_HID_COUNTRY_TURKISH_Q 31          // Turkish-Q
-#define USB_HID_COUNTRY_UK 32                 // UK
-#define USB_HID_COUNTRY_US 33                 // US
-#define USB_HID_COUNTRY_YUGOSLAVIA 34         // Yugoslavia
+#define USB_HID_NO_COUNTRY_CODE 0            // Not Supported
+#define USB_HID_COUNTRY_ARABIC 1             // Arabic
+#define USB_HID_COUNTRY_BELGIAN 2            // Belgian
+#define USB_HID_COUNTRY_CANADIAN_BILINGUAL 3 // Canadian-Bilingual
+#define USB_HID_COUNTRY_CANADIAN_FRENCH 4    // Canadian-French
+#define USB_HID_COUNTRY_CZECH_REPUBLIC 5     // Czech Republic
+#define USB_HID_COUNTRY_DANISH 6             // Danish
+#define USB_HID_COUNTRY_FINNISH 7            // Finnish
+#define USB_HID_COUNTRY_FRENCH 8             // French
+#define USB_HID_COUNTRY_GERMAN 9             // German
+#define USB_HID_COUNTRY_GREEK 10             // Greek
+#define USB_HID_COUNTRY_HEBREW 11            // Hebrew
+#define USB_HID_COUNTRY_HUNGARY 12           // Hungary
+#define USB_HID_COUNTRY_INTERNATIONAL_ISO 13 // International (ISO)
+#define USB_HID_COUNTRY_ITALIAN 14           // Italian
+#define USB_HID_COUNTRY_JAPAN_KATAKANA 15    // Japan (Katakana)
+#define USB_HID_COUNTRY_KOREAN 16            // Korean
+#define USB_HID_COUNTRY_LATIN_AMERICAN 17    // Latin American
+#define USB_HID_COUNTRY_NETHERLANDS_DUTCH 18 // Netherlands/Dutch
+#define USB_HID_COUNTRY_NORWEGIAN 19         // Norwegian
+#define USB_HID_COUNTRY_PERSIAN_FARSI 20     // Persian (Farsi)
+#define USB_HID_COUNTRY_POLAND 21            // Poland
+#define USB_HID_COUNTRY_PORTUGUESE 22        // Portuguese
+#define USB_HID_COUNTRY_RUSSIA 23            // Russia
+#define USB_HID_COUNTRY_SLOVAKIA 24          // Slovakia
+#define USB_HID_COUNTRY_SPANISH 25           // Spanish
+#define USB_HID_COUNTRY_SWEDISH 26           // Swedish
+#define USB_HID_COUNTRY_SWISS_FRENCH 27      // Swiss/French
+#define USB_HID_COUNTRY_SWISS_GERMAN 28      // Swiss/German
+#define USB_HID_COUNTRY_SWITZERLAND 29       // Switzerland
+#define USB_HID_COUNTRY_TAIWAN 30            // Taiwan
+#define USB_HID_COUNTRY_TURKISH_Q 31         // Turkish-Q
+#define USB_HID_COUNTRY_UK 32                // UK
+#define USB_HID_COUNTRY_US 33                // US
+#define USB_HID_COUNTRY_YUGOSLAVIA 34        // Yugoslavia
 #define USB_HID_COUNTRY_TURKISH_F \
-    35  // Turkish-F
-        //! @}
-        //! @}
+    35 // Turkish-F
+       //! @}
+       //! @}
 //! @}
 
 //! \name HID KEYS values
@@ -237,12 +237,12 @@ COMPILER_PACK_RESET()
 #define HID_SPACEBAR 44
 #define HID_UNDERSCORE 45
 #define HID_PLUS 46
-#define HID_OPEN_BRACKET 47   // {
-#define HID_CLOSE_BRACKET 48  // }
+#define HID_OPEN_BRACKET 47  // {
+#define HID_CLOSE_BRACKET 48 // }
 #define HID_BACKSLASH 49
-#define HID_ASH 50    // # ~
-#define HID_COLON 51  // ; :
-#define HID_QUOTE 52  // ' "
+#define HID_ASH 50   // # ~
+#define HID_COLON 51 // ; :
+#define HID_QUOTE 52 // ' "
 #define HID_TILDE 53
 #define HID_COMMA 54
 #define HID_DOT 55
@@ -314,4 +314,4 @@ COMPILER_PACK_RESET()
 #define HID_LED_KANA (1 << 4)
 //! @}
 
-#endif  // _USB_PROTOCOL_HID_H_
+#endif // _USB_PROTOCOL_HID_H_
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_util.c b/tmk_core/protocol/arm_atsam/usb/usb_util.c
index a682c00b58..c7555c84c6 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_util.c
+++ b/tmk_core/protocol/arm_atsam/usb/usb_util.c
@@ -11,17 +11,17 @@ char digit(int d, int radix) {
 }
 
 int UTIL_ltoa_radix(int64_t value, char *dest, int radix) {
-    int64_t original = value;  // save original value
+    int64_t original = value; // save original value
     char    buf[25]  = "";
     int     c        = sizeof(buf) - 1;
     int     last     = c;
     int     d;
     int     size;
 
-    if (value < 0)  // if it's negative, take the absolute value
+    if (value < 0) // if it's negative, take the absolute value
         value = -value;
 
-    do  // write least significant digit of value that's left
+    do // write least significant digit of value that's left
     {
         d        = (value % radix);
         buf[--c] = digit(d, radix);
@@ -30,14 +30,20 @@ int UTIL_ltoa_radix(int64_t value, char *dest, int radix) {
 
     if (original < 0) buf[--c] = '-';
 
-    size = last - c + 1;  // includes null at end
+    size = last - c + 1; // includes null at end
     memcpy(dest, &buf[c], last - c + 1);
 
-    return (size - 1);  // without null termination
+    return (size - 1); // without null termination
 }
 
-int UTIL_ltoa(int64_t value, char *dest) { return UTIL_ltoa_radix(value, dest, 10); }
+int UTIL_ltoa(int64_t value, char *dest) {
+    return UTIL_ltoa_radix(value, dest, 10);
+}
 
-int UTIL_itoa(int value, char *dest) { return UTIL_ltoa_radix((int64_t)value, dest, 10); }
+int UTIL_itoa(int value, char *dest) {
+    return UTIL_ltoa_radix((int64_t)value, dest, 10);
+}
 
-int UTIL_utoa(uint32_t value, char *dest) { return UTIL_ltoa_radix((int64_t)value, dest, 10); }
+int UTIL_utoa(uint32_t value, char *dest) {
+    return UTIL_ltoa_radix((int64_t)value, dest, 10);
+}
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_util.h b/tmk_core/protocol/arm_atsam/usb/usb_util.h
index 3bad2c26f2..3e5b4fbb32 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_util.h
+++ b/tmk_core/protocol/arm_atsam/usb/usb_util.h
@@ -6,4 +6,4 @@ int UTIL_ltoa(int64_t value, char *dest);
 int UTIL_itoa(int value, char *dest);
 int UTIL_utoa(uint32_t value, char *dest);
 
-#endif  //_USB_UTIL_H_
+#endif //_USB_UTIL_H_
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index b6cff05e9f..c9a480c325 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -107,7 +107,7 @@ __attribute__((weak)) void early_hardware_init_pre(void) {
 #if EARLY_INIT_PERFORM_BOOTLOADER_JUMP
     void enter_bootloader_mode_if_requested(void);
     enter_bootloader_mode_if_requested();
-#endif  // EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#endif // EARLY_INIT_PERFORM_BOOTLOADER_JUMP
 }
 
 __attribute__((weak)) void early_hardware_init_post(void) {}
@@ -176,7 +176,9 @@ void protocol_pre_init(void) {
     print("USB configured.\n");
 }
 
-void protocol_post_init(void) { host_set_driver(driver); }
+void protocol_post_init(void) {
+    host_set_driver(driver);
+}
 
 void protocol_pre_task(void) {
     usb_event_queue_task();
@@ -186,7 +188,7 @@ void protocol_pre_task(void) {
         print("[s]");
         while (USB_DRIVER.state == USB_SUSPENDED) {
             /* Do this in the suspended state */
-            suspend_power_down();  // on AVR this deep sleeps for 15ms
+            suspend_power_down(); // on AVR this deep sleeps for 15ms
             /* Remote wakeup */
             if (suspend_wakeup_condition()) {
                 usbWakeupHost(&USB_DRIVER);
diff --git a/tmk_core/protocol/chibios/usb_driver.c b/tmk_core/protocol/chibios/usb_driver.c
index cc0ce7600f..4de060f306 100644
--- a/tmk_core/protocol/chibios/usb_driver.c
+++ b/tmk_core/protocol/chibios/usb_driver.c
@@ -80,21 +80,37 @@ static bool qmkusb_start_receive(QMKUSBDriver *qmkusbp) {
  * Interface implementation.
  */
 
-static size_t _write(void *ip, const uint8_t *bp, size_t n) { return obqWriteTimeout(&((QMKUSBDriver *)ip)->obqueue, bp, n, TIME_INFINITE); }
+static size_t _write(void *ip, const uint8_t *bp, size_t n) {
+    return obqWriteTimeout(&((QMKUSBDriver *)ip)->obqueue, bp, n, TIME_INFINITE);
+}
 
-static size_t _read(void *ip, uint8_t *bp, size_t n) { return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, TIME_INFINITE); }
+static size_t _read(void *ip, uint8_t *bp, size_t n) {
+    return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, TIME_INFINITE);
+}
 
-static msg_t _put(void *ip, uint8_t b) { return obqPutTimeout(&((QMKUSBDriver *)ip)->obqueue, b, TIME_INFINITE); }
+static msg_t _put(void *ip, uint8_t b) {
+    return obqPutTimeout(&((QMKUSBDriver *)ip)->obqueue, b, TIME_INFINITE);
+}
 
-static msg_t _get(void *ip) { return ibqGetTimeout(&((QMKUSBDriver *)ip)->ibqueue, TIME_INFINITE); }
+static msg_t _get(void *ip) {
+    return ibqGetTimeout(&((QMKUSBDriver *)ip)->ibqueue, TIME_INFINITE);
+}
 
-static msg_t _putt(void *ip, uint8_t b, sysinterval_t timeout) { return obqPutTimeout(&((QMKUSBDriver *)ip)->obqueue, b, timeout); }
+static msg_t _putt(void *ip, uint8_t b, sysinterval_t timeout) {
+    return obqPutTimeout(&((QMKUSBDriver *)ip)->obqueue, b, timeout);
+}
 
-static msg_t _gett(void *ip, sysinterval_t timeout) { return ibqGetTimeout(&((QMKUSBDriver *)ip)->ibqueue, timeout); }
+static msg_t _gett(void *ip, sysinterval_t timeout) {
+    return ibqGetTimeout(&((QMKUSBDriver *)ip)->ibqueue, timeout);
+}
 
-static size_t _writet(void *ip, const uint8_t *bp, size_t n, sysinterval_t timeout) { return obqWriteTimeout(&((QMKUSBDriver *)ip)->obqueue, bp, n, timeout); }
+static size_t _writet(void *ip, const uint8_t *bp, size_t n, sysinterval_t timeout) {
+    return obqWriteTimeout(&((QMKUSBDriver *)ip)->obqueue, bp, n, timeout);
+}
 
-static size_t _readt(void *ip, uint8_t *bp, size_t n, sysinterval_t timeout) { return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, timeout); }
+static size_t _readt(void *ip, uint8_t *bp, size_t n, sysinterval_t timeout) {
+    return ibqReadTimeout(&((QMKUSBDriver *)ip)->ibqueue, bp, n, timeout);
+}
 
 static const struct QMKUSBDriverVMT vmt = {0, _write, _read, _put, _get, _putt, _gett, _writet, _readt};
 
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index 30bfac9f3e..d9aa351ecb 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -775,7 +775,9 @@ void kbd_in_cb(USBDriver *usbp, usbep_t ep) {
 /* start-of-frame handler
  * TODO: i guess it would be better to re-implement using timers,
  *  so that this is not going to have to be checked every 1ms */
-void kbd_sof_cb(USBDriver *usbp) { (void)usbp; }
+void kbd_sof_cb(USBDriver *usbp) {
+    (void)usbp;
+}
 
 /* Idle requests timer code
  * callback (called from ISR, unlocked state) */
@@ -815,7 +817,9 @@ static void keyboard_idle_timer_cb(void *arg) {
 }
 
 /* LED status */
-uint8_t keyboard_leds(void) { return keyboard_led_state; }
+uint8_t keyboard_leds(void) {
+    return keyboard_led_state;
+}
 
 /* prepare and start sending a report IN
  * not callable from ISR or locked state */
@@ -915,7 +919,9 @@ void send_mouse(report_mouse_t *report) {
 }
 
 #else  /* MOUSE_ENABLE */
-void send_mouse(report_mouse_t *report) { (void)report; }
+void send_mouse(report_mouse_t *report) {
+    (void)report;
+}
 #endif /* MOUSE_ENABLE */
 
 /* ---------------------------------------------------------
@@ -1107,7 +1113,9 @@ void raw_hid_task(void) {
 
 #ifdef MIDI_ENABLE
 
-void send_midi_packet(MIDI_EventPacket_t *event) { chnWrite(&drivers.midi_driver.driver, (uint8_t *)event, sizeof(MIDI_EventPacket_t)); }
+void send_midi_packet(MIDI_EventPacket_t *event) {
+    chnWrite(&drivers.midi_driver.driver, (uint8_t *)event, sizeof(MIDI_EventPacket_t));
+}
 
 bool recv_midi_packet(MIDI_EventPacket_t *const event) {
     size_t size = chnReadTimeout(&drivers.midi_driver.driver, (uint8_t *)event, sizeof(MIDI_EventPacket_t), TIME_IMMEDIATE);
@@ -1130,7 +1138,9 @@ void midi_ep_task(void) {
 
 void virtser_init(void) {}
 
-void virtser_send(const uint8_t byte) { chnWrite(&drivers.serial_driver.driver, &byte, 1); }
+void virtser_send(const uint8_t byte) {
+    chnWrite(&drivers.serial_driver.driver, &byte, 1);
+}
 
 __attribute__((weak)) void virtser_recv(uint8_t c) {
     // Ignore by default
@@ -1174,7 +1184,7 @@ void send_joystick_packet(joystick_t *joystick) {
           joystick->axes[5],
 #        endif
         },
-#    endif  // JOYSTICK_AXES_COUNT>0
+#    endif // JOYSTICK_AXES_COUNT>0
 
 #    if JOYSTICK_BUTTON_COUNT > 0
         .buttons = {
@@ -1190,7 +1200,7 @@ void send_joystick_packet(joystick_t *joystick) {
             joystick->buttons[3],
 #        endif
         }
-#    endif  // JOYSTICK_BUTTON_COUNT>0
+#    endif // JOYSTICK_BUTTON_COUNT>0
     };
 
     // chnWrite(&drivers.joystick_driver.driver, (uint8_t *)&rep, sizeof(rep));
diff --git a/tmk_core/protocol/chibios/usb_util.c b/tmk_core/protocol/chibios/usb_util.c
index e32d6ebfa4..c8b435db0c 100644
--- a/tmk_core/protocol/chibios/usb_util.c
+++ b/tmk_core/protocol/chibios/usb_util.c
@@ -16,6 +16,10 @@
 #include <hal.h>
 #include "usb_util.h"
 
-void usb_disconnect(void) { usbStop(&USBD1); }
+void usb_disconnect(void) {
+    usbStop(&USBD1);
+}
 
-bool usb_connected_state(void) { return usbGetDriverStateI(&USBD1) == USB_ACTIVE; }
+bool usb_connected_state(void) {
+    return usbGetDriverStateI(&USBD1) == USB_ACTIVE;
+}
diff --git a/tmk_core/protocol/host.c b/tmk_core/protocol/host.c
index 56d4bb0847..053d2b79e3 100644
--- a/tmk_core/protocol/host.c
+++ b/tmk_core/protocol/host.c
@@ -34,13 +34,19 @@ static uint16_t       last_system_report              = 0;
 static uint16_t       last_consumer_report            = 0;
 static uint32_t       last_programmable_button_report = 0;
 
-void host_set_driver(host_driver_t *d) { driver = d; }
+void host_set_driver(host_driver_t *d) {
+    driver = d;
+}
 
-host_driver_t *host_get_driver(void) { return driver; }
+host_driver_t *host_get_driver(void) {
+    return driver;
+}
 
 #ifdef SPLIT_KEYBOARD
 uint8_t split_led_state = 0;
-void    set_split_host_keyboard_leds(uint8_t led_state) { split_led_state = led_state; }
+void    set_split_host_keyboard_leds(uint8_t led_state) {
+    split_led_state = led_state;
+}
 #endif
 
 uint8_t host_keyboard_leds(void) {
@@ -51,7 +57,9 @@ uint8_t host_keyboard_leds(void) {
     return (*driver->keyboard_leds)();
 }
 
-led_t host_keyboard_led_state(void) { return (led_t)host_keyboard_leds(); }
+led_t host_keyboard_led_state(void) {
+    return (led_t)host_keyboard_leds();
+}
 
 /* send report */
 void host_keyboard_send(report_keyboard_t *report) {
@@ -131,8 +139,14 @@ void host_programmable_button_send(uint32_t report) {
     (*driver->send_programmable_button)(report);
 }
 
-uint16_t host_last_system_report(void) { return last_system_report; }
+uint16_t host_last_system_report(void) {
+    return last_system_report;
+}
 
-uint16_t host_last_consumer_report(void) { return last_consumer_report; }
+uint16_t host_last_consumer_report(void) {
+    return last_consumer_report;
+}
 
-uint32_t host_last_programmable_button_report(void) { return last_programmable_button_report; }
+uint32_t host_last_programmable_button_report(void) {
+    return last_programmable_button_report;
+}
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index 3943f8c92b..b4b03357a3 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -256,7 +256,8 @@ static void Console_Task(void) {
     }
 
     // fill empty bank
-    while (Endpoint_IsReadWriteAllowed()) Endpoint_Write_8(0);
+    while (Endpoint_IsReadWriteAllowed())
+        Endpoint_Write_8(0);
 
     // flush sendchar packet
     if (Endpoint_IsINReady()) {
@@ -296,7 +297,7 @@ void send_joystick_packet(joystick_t *joystick) {
           joystick->axes[5],
 #        endif
         },
-#    endif  // JOYSTICK_AXES_COUNT>0
+#    endif // JOYSTICK_AXES_COUNT>0
 
 #    if JOYSTICK_BUTTON_COUNT > 0
         .buttons = {
@@ -312,14 +313,15 @@ void send_joystick_packet(joystick_t *joystick) {
             joystick->buttons[3],
 #        endif
         }
-#    endif  // JOYSTICK_BUTTON_COUNT>0
+#    endif // JOYSTICK_BUTTON_COUNT>0
     };
 
     /* Select the Joystick Report Endpoint */
     Endpoint_SelectEndpoint(JOYSTICK_IN_EPNUM);
 
     /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+    while (timeout-- && !Endpoint_IsReadWriteAllowed())
+        _delay_us(40);
     if (!Endpoint_IsReadWriteAllowed()) return;
 
     /* Write Joystick Report Data */
@@ -414,9 +416,11 @@ void EVENT_USB_Device_WakeUp() {
 
 #ifdef CONSOLE_ENABLE
 static bool console_flush = false;
-#    define CONSOLE_FLUSH_SET(b)                                     \
-        do {                                                         \
-            ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { console_flush = b; } \
+#    define CONSOLE_FLUSH_SET(b)                \
+        do {                                    \
+            ATOMIC_BLOCK(ATOMIC_RESTORESTATE) { \
+                console_flush = b;              \
+            }                                   \
         } while (0)
 
 /** \brief Event USB Device Start Of Frame
@@ -634,7 +638,9 @@ void EVENT_USB_Device_ControlRequest(void) {
  *
  * FIXME: Needs doc
  */
-static uint8_t keyboard_leds(void) { return keyboard_led_state; }
+static uint8_t keyboard_leds(void) {
+    return keyboard_led_state;
+}
 
 /** \brief Send Keyboard
  *
@@ -665,7 +671,8 @@ static void send_keyboard(report_keyboard_t *report) {
 #endif
     Endpoint_SelectEndpoint(ep);
     /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+    while (timeout-- && !Endpoint_IsReadWriteAllowed())
+        _delay_us(40);
     if (!Endpoint_IsReadWriteAllowed()) return;
 
     /* If we're in Boot Protocol, don't send any report ID or other funky fields */
@@ -705,7 +712,8 @@ static void send_mouse(report_mouse_t *report) {
     Endpoint_SelectEndpoint(MOUSE_IN_EPNUM);
 
     /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+    while (timeout-- && !Endpoint_IsReadWriteAllowed())
+        _delay_us(40);
     if (!Endpoint_IsReadWriteAllowed()) return;
 
     /* Write Mouse Report Data */
@@ -725,7 +733,8 @@ static void send_report(void *report, size_t size) {
     Endpoint_SelectEndpoint(SHARED_IN_EPNUM);
 
     /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+    while (timeout-- && !Endpoint_IsReadWriteAllowed())
+        _delay_us(40);
     if (!Endpoint_IsReadWriteAllowed()) return;
 
     Endpoint_Write_Stream_LE(report, size, NULL);
@@ -876,9 +885,13 @@ USB_ClassInfo_MIDI_Device_t USB_MIDI_Interface = {
 
 // clang-format on
 
-void send_midi_packet(MIDI_EventPacket_t *event) { MIDI_Device_SendEventPacket(&USB_MIDI_Interface, event); }
+void send_midi_packet(MIDI_EventPacket_t *event) {
+    MIDI_Device_SendEventPacket(&USB_MIDI_Interface, event);
+}
 
-bool recv_midi_packet(MIDI_EventPacket_t *const event) { return MIDI_Device_ReceiveEventPacket(&USB_MIDI_Interface, event); }
+bool recv_midi_packet(MIDI_EventPacket_t *const event) {
+    return MIDI_Device_ReceiveEventPacket(&USB_MIDI_Interface, event);
+}
 
 #endif
 
@@ -934,7 +947,8 @@ void virtser_send(const uint8_t byte) {
             return;
         }
 
-        while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+        while (timeout-- && !Endpoint_IsReadWriteAllowed())
+            _delay_us(40);
 
         Endpoint_Write_8(byte);
         CDC_Device_Flush(&cdc_device);
@@ -957,7 +971,8 @@ void send_digitizer(report_digitizer_t *report) {
     Endpoint_SelectEndpoint(DIGITIZER_IN_EPNUM);
 
     /* Check if write ready for a polling interval around 10ms */
-    while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
+    while (timeout-- && !Endpoint_IsReadWriteAllowed())
+        _delay_us(40);
     if (!Endpoint_IsReadWriteAllowed()) return;
 
     Endpoint_Write_Stream_LE(report, sizeof(report_digitizer_t), NULL);
@@ -1033,7 +1048,9 @@ void protocol_pre_init(void) {
 #endif
 }
 
-void protocol_post_init(void) { host_set_driver(&lufa_driver); }
+void protocol_post_init(void) {
+    host_set_driver(&lufa_driver);
+}
 
 void protocol_pre_task(void) {
 #if !defined(NO_USB_STARTUP_CHECK)
@@ -1084,4 +1101,6 @@ void protocol_post_task(void) {
 #endif
 }
 
-uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint16_t wIndex, const void **const DescriptorAddress) { return get_usb_descriptor(wValue, wIndex, DescriptorAddress); }
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint16_t wIndex, const void **const DescriptorAddress) {
+    return get_usb_descriptor(wValue, wIndex, DescriptorAddress);
+}
diff --git a/tmk_core/protocol/lufa/usb_util.c b/tmk_core/protocol/lufa/usb_util.c
index 9691eff1e4..2e3b86b80e 100644
--- a/tmk_core/protocol/lufa/usb_util.c
+++ b/tmk_core/protocol/lufa/usb_util.c
@@ -22,13 +22,15 @@ void usb_disconnect(void) {
     USB_DeviceState = DEVICE_STATE_Unattached;
 }
 
-bool usb_connected_state(void) { return USB_Device_IsAddressSet(); }
+bool usb_connected_state(void) {
+    return USB_Device_IsAddressSet();
+}
 
 #if defined(OTGPADE)
 bool usb_vbus_state(void) {
-    USB_OTGPAD_On();  // enables VBUS pad
+    USB_OTGPAD_On(); // enables VBUS pad
     wait_us(5);
 
-    return USB_VBUS_GetStatus();  // checks state of VBUS
+    return USB_VBUS_GetStatus(); // checks state of VBUS
 }
 #endif
diff --git a/tmk_core/protocol/midi/bytequeue/bytequeue.c b/tmk_core/protocol/midi/bytequeue/bytequeue.c
index e36a9e66b1..0dd18680f0 100644
--- a/tmk_core/protocol/midi/bytequeue/bytequeue.c
+++ b/tmk_core/protocol/midi/bytequeue/bytequeue.c
@@ -52,7 +52,9 @@ byteQueueIndex_t bytequeue_length(byteQueue_t* queue) {
 }
 
 // we don't need to avoid interrupts if there is only one reader
-uint8_t bytequeue_get(byteQueue_t* queue, byteQueueIndex_t index) { return queue->data[(queue->start + index) % queue->length]; }
+uint8_t bytequeue_get(byteQueue_t* queue, byteQueueIndex_t index) {
+    return queue->data[(queue->start + index) % queue->length];
+}
 
 // we just update the start index to remove elements
 void bytequeue_remove(byteQueue_t* queue, byteQueueIndex_t numToRemove) {
diff --git a/tmk_core/protocol/midi/bytequeue/interrupt_setting.c b/tmk_core/protocol/midi/bytequeue/interrupt_setting.c
index 407cc65f49..d9c0035946 100644
--- a/tmk_core/protocol/midi/bytequeue/interrupt_setting.c
+++ b/tmk_core/protocol/midi/bytequeue/interrupt_setting.c
@@ -30,7 +30,9 @@ interrupt_setting_t store_and_clear_interrupt(void) {
     return sreg;
 }
 
-void restore_interrupt_setting(interrupt_setting_t setting) { SREG = setting; }
+void restore_interrupt_setting(interrupt_setting_t setting) {
+    SREG = setting;
+}
 #elif defined(__arm__)
 #    include <ch.h>
 
@@ -39,5 +41,7 @@ interrupt_setting_t store_and_clear_interrupt(void) {
     return 0;
 }
 
-void restore_interrupt_setting(interrupt_setting_t setting) { chSysUnlock(); }
+void restore_interrupt_setting(interrupt_setting_t setting) {
+    chSysUnlock();
+}
 #endif
diff --git a/tmk_core/protocol/midi/midi.c b/tmk_core/protocol/midi/midi.c
index 643c43722d..f3792552f4 100644
--- a/tmk_core/protocol/midi/midi.c
+++ b/tmk_core/protocol/midi/midi.c
@@ -17,7 +17,7 @@
 // along with avr-midi.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "midi.h"
-#include <string.h>  //for memcpy
+#include <string.h> //for memcpy
 
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
 
@@ -25,9 +25,13 @@
 #    define NULL 0
 #endif
 
-bool midi_is_statusbyte(uint8_t theByte) { return (bool)(theByte & MIDI_STATUSMASK); }
+bool midi_is_statusbyte(uint8_t theByte) {
+    return (bool)(theByte & MIDI_STATUSMASK);
+}
 
-bool midi_is_realtime(uint8_t theByte) { return (theByte >= MIDI_CLOCK); }
+bool midi_is_realtime(uint8_t theByte) {
+    return (theByte >= MIDI_CLOCK);
+}
 
 midi_packet_length_t midi_packet_length(uint8_t status) {
     switch (status & 0xF0) {
@@ -83,7 +87,9 @@ void midi_send_noteoff(MidiDevice* device, uint8_t chan, uint8_t num, uint8_t ve
     device->send_func(device, 3, MIDI_NOTEOFF | (chan & MIDI_CHANMASK), num & 0x7F, vel & 0x7F);
 }
 
-void midi_send_aftertouch(MidiDevice* device, uint8_t chan, uint8_t note_num, uint8_t amt) { device->send_func(device, 3, MIDI_AFTERTOUCH | (chan & MIDI_CHANMASK), note_num & 0x7F, amt & 0x7F); }
+void midi_send_aftertouch(MidiDevice* device, uint8_t chan, uint8_t note_num, uint8_t amt) {
+    device->send_func(device, 3, MIDI_AFTERTOUCH | (chan & MIDI_CHANMASK), note_num & 0x7F, amt & 0x7F);
+}
 
 // XXX does this work right?
 // amt in range -0x2000, 0x1fff
@@ -102,34 +108,62 @@ void midi_send_pitchbend(MidiDevice* device, uint8_t chan, int16_t amt) {
     device->send_func(device, 3, MIDI_PITCHBEND | (chan & MIDI_CHANMASK), uAmt & 0x7F, (uAmt >> 7) & 0x7F);
 }
 
-void midi_send_programchange(MidiDevice* device, uint8_t chan, uint8_t num) { device->send_func(device, 2, MIDI_PROGCHANGE | (chan & MIDI_CHANMASK), num & 0x7F, 0); }
+void midi_send_programchange(MidiDevice* device, uint8_t chan, uint8_t num) {
+    device->send_func(device, 2, MIDI_PROGCHANGE | (chan & MIDI_CHANMASK), num & 0x7F, 0);
+}
 
-void midi_send_channelpressure(MidiDevice* device, uint8_t chan, uint8_t amt) { device->send_func(device, 2, MIDI_CHANPRESSURE | (chan & MIDI_CHANMASK), amt & 0x7F, 0); }
+void midi_send_channelpressure(MidiDevice* device, uint8_t chan, uint8_t amt) {
+    device->send_func(device, 2, MIDI_CHANPRESSURE | (chan & MIDI_CHANMASK), amt & 0x7F, 0);
+}
 
-void midi_send_clock(MidiDevice* device) { device->send_func(device, 1, MIDI_CLOCK, 0, 0); }
+void midi_send_clock(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_CLOCK, 0, 0);
+}
 
-void midi_send_tick(MidiDevice* device) { device->send_func(device, 1, MIDI_TICK, 0, 0); }
+void midi_send_tick(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_TICK, 0, 0);
+}
 
-void midi_send_start(MidiDevice* device) { device->send_func(device, 1, MIDI_START, 0, 0); }
+void midi_send_start(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_START, 0, 0);
+}
 
-void midi_send_continue(MidiDevice* device) { device->send_func(device, 1, MIDI_CONTINUE, 0, 0); }
+void midi_send_continue(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_CONTINUE, 0, 0);
+}
 
-void midi_send_stop(MidiDevice* device) { device->send_func(device, 1, MIDI_STOP, 0, 0); }
+void midi_send_stop(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_STOP, 0, 0);
+}
 
-void midi_send_activesense(MidiDevice* device) { device->send_func(device, 1, MIDI_ACTIVESENSE, 0, 0); }
+void midi_send_activesense(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_ACTIVESENSE, 0, 0);
+}
 
-void midi_send_reset(MidiDevice* device) { device->send_func(device, 1, MIDI_RESET, 0, 0); }
+void midi_send_reset(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_RESET, 0, 0);
+}
 
-void midi_send_tcquarterframe(MidiDevice* device, uint8_t time) { device->send_func(device, 2, MIDI_TC_QUARTERFRAME, time & 0x7F, 0); }
+void midi_send_tcquarterframe(MidiDevice* device, uint8_t time) {
+    device->send_func(device, 2, MIDI_TC_QUARTERFRAME, time & 0x7F, 0);
+}
 
 // XXX is this right?
-void midi_send_songposition(MidiDevice* device, uint16_t pos) { device->send_func(device, 3, MIDI_SONGPOSITION, pos & 0x7F, (pos >> 7) & 0x7F); }
+void midi_send_songposition(MidiDevice* device, uint16_t pos) {
+    device->send_func(device, 3, MIDI_SONGPOSITION, pos & 0x7F, (pos >> 7) & 0x7F);
+}
 
-void midi_send_songselect(MidiDevice* device, uint8_t song) { device->send_func(device, 2, MIDI_SONGSELECT, song & 0x7F, 0); }
+void midi_send_songselect(MidiDevice* device, uint8_t song) {
+    device->send_func(device, 2, MIDI_SONGSELECT, song & 0x7F, 0);
+}
 
-void midi_send_tunerequest(MidiDevice* device) { device->send_func(device, 1, MIDI_TUNEREQUEST, 0, 0); }
+void midi_send_tunerequest(MidiDevice* device) {
+    device->send_func(device, 1, MIDI_TUNEREQUEST, 0, 0);
+}
 
-void midi_send_byte(MidiDevice* device, uint8_t b) { device->send_func(device, 1, b, 0, 0); }
+void midi_send_byte(MidiDevice* device, uint8_t b) {
+    device->send_func(device, 1, b, 0, 0);
+}
 
 void midi_send_data(MidiDevice* device, uint16_t count, uint8_t byte0, uint8_t byte1, uint8_t byte2) {
     // ensure that the count passed along is always 3 or lower
@@ -150,32 +184,62 @@ void midi_send_array(MidiDevice* device, uint16_t count, uint8_t* array) {
     }
 }
 
-void midi_register_cc_callback(MidiDevice* device, midi_three_byte_func_t func) { device->input_cc_callback = func; }
+void midi_register_cc_callback(MidiDevice* device, midi_three_byte_func_t func) {
+    device->input_cc_callback = func;
+}
 
-void midi_register_noteon_callback(MidiDevice* device, midi_three_byte_func_t func) { device->input_noteon_callback = func; }
+void midi_register_noteon_callback(MidiDevice* device, midi_three_byte_func_t func) {
+    device->input_noteon_callback = func;
+}
 
-void midi_register_noteoff_callback(MidiDevice* device, midi_three_byte_func_t func) { device->input_noteoff_callback = func; }
+void midi_register_noteoff_callback(MidiDevice* device, midi_three_byte_func_t func) {
+    device->input_noteoff_callback = func;
+}
 
-void midi_register_aftertouch_callback(MidiDevice* device, midi_three_byte_func_t func) { device->input_aftertouch_callback = func; }
+void midi_register_aftertouch_callback(MidiDevice* device, midi_three_byte_func_t func) {
+    device->input_aftertouch_callback = func;
+}
 
-void midi_register_pitchbend_callback(MidiDevice* device, midi_three_byte_func_t func) { device->input_pitchbend_callback = func; }
+void midi_register_pitchbend_callback(MidiDevice* device, midi_three_byte_func_t func) {
+    device->input_pitchbend_callback = func;
+}
 
-void midi_register_songposition_callback(MidiDevice* device, midi_three_byte_func_t func) { device->input_songposition_callback = func; }
+void midi_register_songposition_callback(MidiDevice* device, midi_three_byte_func_t func) {
+    device->input_songposition_callback = func;
+}
 
-void midi_register_progchange_callback(MidiDevice* device, midi_two_byte_func_t func) { device->input_progchange_callback = func; }
+void midi_register_progchange_callback(MidiDevice* device, midi_two_byte_func_t func) {
+    device->input_progchange_callback = func;
+}
 
-void midi_register_chanpressure_callback(MidiDevice* device, midi_two_byte_func_t func) { device->input_chanpressure_callback = func; }
+void midi_register_chanpressure_callback(MidiDevice* device, midi_two_byte_func_t func) {
+    device->input_chanpressure_callback = func;
+}
 
-void midi_register_songselect_callback(MidiDevice* device, midi_two_byte_func_t func) { device->input_songselect_callback = func; }
+void midi_register_songselect_callback(MidiDevice* device, midi_two_byte_func_t func) {
+    device->input_songselect_callback = func;
+}
 
-void midi_register_tc_quarterframe_callback(MidiDevice* device, midi_two_byte_func_t func) { device->input_tc_quarterframe_callback = func; }
+void midi_register_tc_quarterframe_callback(MidiDevice* device, midi_two_byte_func_t func) {
+    device->input_tc_quarterframe_callback = func;
+}
 
-void midi_register_realtime_callback(MidiDevice* device, midi_one_byte_func_t func) { device->input_realtime_callback = func; }
+void midi_register_realtime_callback(MidiDevice* device, midi_one_byte_func_t func) {
+    device->input_realtime_callback = func;
+}
 
-void midi_register_tunerequest_callback(MidiDevice* device, midi_one_byte_func_t func) { device->input_tunerequest_callback = func; }
+void midi_register_tunerequest_callback(MidiDevice* device, midi_one_byte_func_t func) {
+    device->input_tunerequest_callback = func;
+}
 
-void midi_register_sysex_callback(MidiDevice* device, midi_sysex_func_t func) { device->input_sysex_callback = func; }
+void midi_register_sysex_callback(MidiDevice* device, midi_sysex_func_t func) {
+    device->input_sysex_callback = func;
+}
 
-void midi_register_fallthrough_callback(MidiDevice* device, midi_var_byte_func_t func) { device->input_fallthrough_callback = func; }
+void midi_register_fallthrough_callback(MidiDevice* device, midi_var_byte_func_t func) {
+    device->input_fallthrough_callback = func;
+}
 
-void midi_register_catchall_callback(MidiDevice* device, midi_var_byte_func_t func) { device->input_catchall_callback = func; }
+void midi_register_catchall_callback(MidiDevice* device, midi_var_byte_func_t func) {
+    device->input_catchall_callback = func;
+}
diff --git a/tmk_core/protocol/midi/midi.h b/tmk_core/protocol/midi/midi.h
index 75f3b13b0b..34547077e4 100644
--- a/tmk_core/protocol/midi/midi.h
+++ b/tmk_core/protocol/midi/midi.h
@@ -48,7 +48,7 @@ extern "C" {
  *
  * @param device the device to initialize
  */
-void midi_device_init(MidiDevice* device);  // [implementation in midi_device.c]
+void midi_device_init(MidiDevice* device); // [implementation in midi_device.c]
 
 /**
  * @brief Process input data
@@ -58,7 +58,7 @@ void midi_device_init(MidiDevice* device);  // [implementation in midi_device.c]
  *
  * @param device the device to process
  */
-void midi_device_process(MidiDevice* device);  // [implementation in midi_device.c]
+void midi_device_process(MidiDevice* device); // [implementation in midi_device.c]
 
 /**@}*/
 
@@ -115,7 +115,7 @@ void midi_send_aftertouch(MidiDevice* device, uint8_t chan, uint8_t note_num, ui
  * @param chan the channel to send on, 0-15
  * @param amt the bend amount range: -8192..8191, 0 means no bend
  */
-void midi_send_pitchbend(MidiDevice* device, uint8_t chan, int16_t amt);  // range -8192, 8191
+void midi_send_pitchbend(MidiDevice* device, uint8_t chan, int16_t amt); // range -8192, 8191
 
 /**
  * @brief Send a program change message via the given device.
diff --git a/tmk_core/protocol/midi/midi_device.c b/tmk_core/protocol/midi/midi_device.c
index 58fe685e2d..77c010b156 100644
--- a/tmk_core/protocol/midi/midi_device.c
+++ b/tmk_core/protocol/midi/midi_device.c
@@ -60,12 +60,17 @@ void midi_device_init(MidiDevice* device) {
 
 void midi_device_input(MidiDevice* device, uint8_t cnt, uint8_t* input) {
     uint8_t i;
-    for (i = 0; i < cnt; i++) bytequeue_enqueue(&device->input_queue, input[i]);
+    for (i = 0; i < cnt; i++)
+        bytequeue_enqueue(&device->input_queue, input[i]);
 }
 
-void midi_device_set_send_func(MidiDevice* device, midi_var_byte_func_t send_func) { device->send_func = send_func; }
+void midi_device_set_send_func(MidiDevice* device, midi_var_byte_func_t send_func) {
+    device->send_func = send_func;
+}
 
-void midi_device_set_pre_input_process_func(MidiDevice* device, midi_no_byte_func_t pre_process_func) { device->pre_input_process_callback = pre_process_func; }
+void midi_device_set_pre_input_process_func(MidiDevice* device, midi_no_byte_func_t pre_process_func) {
+    device->pre_input_process_callback = pre_process_func;
+}
 
 void midi_device_process(MidiDevice* device) {
     // call the pre_input_process_callback if there is one
diff --git a/tmk_core/protocol/midi/qmk_midi.c b/tmk_core/protocol/midi/qmk_midi.c
index 3a454d61ae..f6a5d92281 100644
--- a/tmk_core/protocol/midi/qmk_midi.c
+++ b/tmk_core/protocol/midi/qmk_midi.c
@@ -50,7 +50,7 @@ static void usb_send_func(MidiDevice* device, uint16_t cnt, uint8_t byte0, uint8
                     event.Event = MIDI_EVENT(cable, SYSEX_START_OR_CONT);
                 break;
             default:
-                return;  // invalid cnt
+                return; // invalid cnt
         }
     } else {
         // deal with 'system common' messages
diff --git a/tmk_core/protocol/midi/sysex_tools.c b/tmk_core/protocol/midi/sysex_tools.c
index 84bca72158..c9a9d03285 100644
--- a/tmk_core/protocol/midi/sysex_tools.c
+++ b/tmk_core/protocol/midi/sysex_tools.c
@@ -35,7 +35,7 @@ uint16_t sysex_decoded_length(uint16_t encoded_length) {
 }
 
 uint16_t sysex_encode(uint8_t *encoded, const uint8_t *source, const uint16_t length) {
-    uint16_t encoded_full = length / 7;  // number of full 8 byte sections from 7 bytes of input
+    uint16_t encoded_full = length / 7; // number of full 8 byte sections from 7 bytes of input
     uint16_t i, j;
 
     // fill out the fully encoded sections
diff --git a/tmk_core/protocol/usb_descriptor.h b/tmk_core/protocol/usb_descriptor.h
index 0f0c78f66c..6c3424145c 100644
--- a/tmk_core/protocol/usb_descriptor.h
+++ b/tmk_core/protocol/usb_descriptor.h
@@ -200,7 +200,7 @@ enum usb_interfaces {
  * Endpoint numbers
  */
 enum usb_endpoints {
-    __unused_epnum__ = NEXT_EPNUM,  // Endpoint numbering starts at 1
+    __unused_epnum__ = NEXT_EPNUM, // Endpoint numbering starts at 1
 
 #ifndef KEYBOARD_SHARED_EP
     KEYBOARD_IN_EPNUM = NEXT_EPNUM,
diff --git a/tmk_core/protocol/usb_device_state.c b/tmk_core/protocol/usb_device_state.c
index 84f01943be..8d56ba4d2f 100644
--- a/tmk_core/protocol/usb_device_state.c
+++ b/tmk_core/protocol/usb_device_state.c
@@ -22,7 +22,9 @@
 
 enum usb_device_state usb_device_state = USB_DEVICE_STATE_NO_INIT;
 
-__attribute__((weak)) void notify_usb_device_state_change_kb(enum usb_device_state usb_device_state) { notify_usb_device_state_change_user(usb_device_state); }
+__attribute__((weak)) void notify_usb_device_state_change_kb(enum usb_device_state usb_device_state) {
+    notify_usb_device_state_change_user(usb_device_state);
+}
 
 __attribute__((weak)) void notify_usb_device_state_change_user(enum usb_device_state usb_device_state) {}
 
diff --git a/tmk_core/protocol/usb_device_state.h b/tmk_core/protocol/usb_device_state.h
index c229311d46..3be65ea7e1 100644
--- a/tmk_core/protocol/usb_device_state.h
+++ b/tmk_core/protocol/usb_device_state.h
@@ -27,10 +27,10 @@ void usb_device_state_set_reset(void);
 void usb_device_state_init(void);
 
 enum usb_device_state {
-    USB_DEVICE_STATE_NO_INIT    = 0,  // We're in this state before calling usb_device_state_init()
-    USB_DEVICE_STATE_INIT       = 1,  // Can consume up to 100mA
-    USB_DEVICE_STATE_CONFIGURED = 2,  // Can consume up to what is specified in configuration descriptor, typically 500mA
-    USB_DEVICE_STATE_SUSPEND    = 3   // Can consume only suspend current
+    USB_DEVICE_STATE_NO_INIT    = 0, // We're in this state before calling usb_device_state_init()
+    USB_DEVICE_STATE_INIT       = 1, // Can consume up to 100mA
+    USB_DEVICE_STATE_CONFIGURED = 2, // Can consume up to what is specified in configuration descriptor, typically 500mA
+    USB_DEVICE_STATE_SUSPEND    = 3  // Can consume only suspend current
 };
 
 extern enum usb_device_state usb_device_state;
diff --git a/tmk_core/protocol/usb_util.c b/tmk_core/protocol/usb_util.c
index dd1deeaa11..49aadedc2a 100644
--- a/tmk_core/protocol/usb_util.c
+++ b/tmk_core/protocol/usb_util.c
@@ -17,7 +17,9 @@
 #include "usb_util.h"
 
 __attribute__((weak)) void usb_disconnect(void) {}
-__attribute__((weak)) bool usb_connected_state(void) { return true; }
+__attribute__((weak)) bool usb_connected_state(void) {
+    return true;
+}
 __attribute__((weak)) bool usb_vbus_state(void) {
 #ifdef USB_VBUS_PIN
     setPinInput(USB_VBUS_PIN);
diff --git a/tmk_core/protocol/vusb/protocol.c b/tmk_core/protocol/vusb/protocol.c
index 644e77e021..20d0530483 100644
--- a/tmk_core/protocol/vusb/protocol.c
+++ b/tmk_core/protocol/vusb/protocol.c
@@ -97,7 +97,9 @@ static void vusb_wakeup(void) {
  *
  * FIXME: Needs doc
  */
-static void setup_usb(void) { initForUsbConnectivity(); }
+static void setup_usb(void) {
+    initForUsbConnectivity();
+}
 
 uint16_t sof_timer = 0;
 
diff --git a/tmk_core/protocol/vusb/usb_util.c b/tmk_core/protocol/vusb/usb_util.c
index 4ee2d3188b..38c4352d55 100644
--- a/tmk_core/protocol/vusb/usb_util.c
+++ b/tmk_core/protocol/vusb/usb_util.c
@@ -16,7 +16,9 @@
 #include <usbdrv/usbdrv.h>
 #include "usb_util.h"
 
-void usb_disconnect(void) { usbDeviceDisconnect(); }
+void usb_disconnect(void) {
+    usbDeviceDisconnect();
+}
 
 bool usb_connected_state(void) {
     usbPoll();
diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c
index 8bdcccc9c9..ebde955d3b 100644
--- a/tmk_core/protocol/vusb/vusb.c
+++ b/tmk_core/protocol/vusb/vusb.c
@@ -230,9 +230,13 @@ static void    send_programmable_button(uint32_t data);
 
 static host_driver_t driver = {keyboard_leds, send_keyboard, send_mouse, send_system, send_consumer, send_programmable_button};
 
-host_driver_t *vusb_driver(void) { return &driver; }
+host_driver_t *vusb_driver(void) {
+    return &driver;
+}
 
-static uint8_t keyboard_leds(void) { return keyboard_led_state; }
+static uint8_t keyboard_leds(void) {
+    return keyboard_led_state;
+}
 
 static void send_keyboard(report_keyboard_t *report) {
     uint8_t next = (kbuf_head + 1) % KBUF_SIZE;
@@ -348,7 +352,7 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) {
                 last_req.kind = SET_LED;
                 last_req.len  = rq->wLength.word;
             }
-            return USB_NO_MSG;  // to get data in usbFunctionWrite
+            return USB_NO_MSG; // to get data in usbFunctionWrite
         } else {
             dprint("UNKNOWN:");
         }
@@ -410,47 +414,47 @@ const PROGMEM uchar shared_hid_report[] = {
 #else
 const PROGMEM uchar keyboard_hid_report[] = {
 #endif
-    0x05, 0x01,  // Usage Page (Generic Desktop)
-    0x09, 0x06,  // Usage (Keyboard)
-    0xA1, 0x01,  // Collection (Application)
+    0x05, 0x01, // Usage Page (Generic Desktop)
+    0x09, 0x06, // Usage (Keyboard)
+    0xA1, 0x01, // Collection (Application)
 #ifdef KEYBOARD_SHARED_EP
-    0x85, REPORT_ID_KEYBOARD,  // Report ID
+    0x85, REPORT_ID_KEYBOARD, // Report ID
 #endif
     // Modifiers (8 bits)
-    0x05, 0x07,  //   Usage Page (Keyboard/Keypad)
-    0x19, 0xE0,  //   Usage Minimum (Keyboard Left Control)
-    0x29, 0xE7,  //   Usage Maximum (Keyboard Right GUI)
-    0x15, 0x00,  //   Logical Minimum (0)
-    0x25, 0x01,  //   Logical Maximum (1)
-    0x95, 0x08,  //   Report Count (8)
-    0x75, 0x01,  //   Report Size (1)
-    0x81, 0x02,  //   Input (Data, Variable, Absolute)
+    0x05, 0x07, //   Usage Page (Keyboard/Keypad)
+    0x19, 0xE0, //   Usage Minimum (Keyboard Left Control)
+    0x29, 0xE7, //   Usage Maximum (Keyboard Right GUI)
+    0x15, 0x00, //   Logical Minimum (0)
+    0x25, 0x01, //   Logical Maximum (1)
+    0x95, 0x08, //   Report Count (8)
+    0x75, 0x01, //   Report Size (1)
+    0x81, 0x02, //   Input (Data, Variable, Absolute)
     // Reserved (1 byte)
-    0x95, 0x01,  //   Report Count (1)
-    0x75, 0x08,  //   Report Size (8)
-    0x81, 0x03,  //   Input (Constant)
+    0x95, 0x01, //   Report Count (1)
+    0x75, 0x08, //   Report Size (8)
+    0x81, 0x03, //   Input (Constant)
     // Keycodes (6 bytes)
-    0x05, 0x07,        //   Usage Page (Keyboard/Keypad)
-    0x19, 0x00,        //   Usage Minimum (0)
-    0x29, 0xFF,        //   Usage Maximum (255)
-    0x15, 0x00,        //   Logical Minimum (0)
-    0x26, 0xFF, 0x00,  //   Logical Maximum (255)
-    0x95, 0x06,        //   Report Count (6)
-    0x75, 0x08,        //   Report Size (8)
-    0x81, 0x00,        //   Input (Data, Array, Absolute)
+    0x05, 0x07,       //   Usage Page (Keyboard/Keypad)
+    0x19, 0x00,       //   Usage Minimum (0)
+    0x29, 0xFF,       //   Usage Maximum (255)
+    0x15, 0x00,       //   Logical Minimum (0)
+    0x26, 0xFF, 0x00, //   Logical Maximum (255)
+    0x95, 0x06,       //   Report Count (6)
+    0x75, 0x08,       //   Report Size (8)
+    0x81, 0x00,       //   Input (Data, Array, Absolute)
 
     // Status LEDs (5 bits)
-    0x05, 0x08,  //   Usage Page (LED)
-    0x19, 0x01,  //   Usage Minimum (Num Lock)
-    0x29, 0x05,  //   Usage Maximum (Kana)
-    0x95, 0x05,  //   Report Count (5)
-    0x75, 0x01,  //   Report Size (1)
-    0x91, 0x02,  //   Output (Data, Variable, Absolute)
+    0x05, 0x08, //   Usage Page (LED)
+    0x19, 0x01, //   Usage Minimum (Num Lock)
+    0x29, 0x05, //   Usage Maximum (Kana)
+    0x95, 0x05, //   Report Count (5)
+    0x75, 0x01, //   Report Size (1)
+    0x91, 0x02, //   Output (Data, Variable, Absolute)
     // LED padding (3 bits)
-    0x95, 0x01,  //   Report Count (1)
-    0x75, 0x03,  //   Report Size (3)
-    0x91, 0x03,  //   Output (Constant)
-    0xC0,        // End Collection
+    0x95, 0x01, //   Report Count (1)
+    0x75, 0x03, //   Report Size (3)
+    0x91, 0x03, //   Output (Constant)
+    0xC0,       // End Collection
 #ifndef KEYBOARD_SHARED_EP
 };
 #endif
@@ -462,135 +466,135 @@ const PROGMEM uchar shared_hid_report[] = {
 
 #ifdef MOUSE_ENABLE
     // Mouse report descriptor
-    0x05, 0x01,             // Usage Page (Generic Desktop)
-    0x09, 0x02,             // Usage (Mouse)
-    0xA1, 0x01,             // Collection (Application)
-    0x85, REPORT_ID_MOUSE,  //   Report ID
-    0x09, 0x01,             //   Usage (Pointer)
-    0xA1, 0x00,             //   Collection (Physical)
+    0x05, 0x01,            // Usage Page (Generic Desktop)
+    0x09, 0x02,            // Usage (Mouse)
+    0xA1, 0x01,            // Collection (Application)
+    0x85, REPORT_ID_MOUSE, //   Report ID
+    0x09, 0x01,            //   Usage (Pointer)
+    0xA1, 0x00,            //   Collection (Physical)
     // Buttons (8 bits)
-    0x05, 0x09,  //     Usage Page (Button)
-    0x19, 0x01,  //     Usage Minimum (Button 1)
-    0x29, 0x08,  //     Usage Maximum (Button 8)
-    0x15, 0x00,  //     Logical Minimum (0)
-    0x25, 0x01,  //     Logical Maximum (1)
-    0x95, 0x08,  //     Report Count (8)
-    0x75, 0x01,  //     Report Size (1)
-    0x81, 0x02,  //     Input (Data, Variable, Absolute)
+    0x05, 0x09, //     Usage Page (Button)
+    0x19, 0x01, //     Usage Minimum (Button 1)
+    0x29, 0x08, //     Usage Maximum (Button 8)
+    0x15, 0x00, //     Logical Minimum (0)
+    0x25, 0x01, //     Logical Maximum (1)
+    0x95, 0x08, //     Report Count (8)
+    0x75, 0x01, //     Report Size (1)
+    0x81, 0x02, //     Input (Data, Variable, Absolute)
 
     // X/Y position (2 bytes)
-    0x05, 0x01,  //     Usage Page (Generic Desktop)
-    0x09, 0x30,  //     Usage (X)
-    0x09, 0x31,  //     Usage (Y)
-    0x15, 0x81,  //     Logical Minimum (-127)
-    0x25, 0x7F,  //     Logical Maximum (127)
-    0x95, 0x02,  //     Report Count (2)
-    0x75, 0x08,  //     Report Size (8)
-    0x81, 0x06,  //     Input (Data, Variable, Relative)
+    0x05, 0x01, //     Usage Page (Generic Desktop)
+    0x09, 0x30, //     Usage (X)
+    0x09, 0x31, //     Usage (Y)
+    0x15, 0x81, //     Logical Minimum (-127)
+    0x25, 0x7F, //     Logical Maximum (127)
+    0x95, 0x02, //     Report Count (2)
+    0x75, 0x08, //     Report Size (8)
+    0x81, 0x06, //     Input (Data, Variable, Relative)
 
     // Vertical wheel (1 byte)
-    0x09, 0x38,  //     Usage (Wheel)
-    0x15, 0x81,  //     Logical Minimum (-127)
-    0x25, 0x7F,  //     Logical Maximum (127)
-    0x95, 0x01,  //     Report Count (1)
-    0x75, 0x08,  //     Report Size (8)
-    0x81, 0x06,  //     Input (Data, Variable, Relative)
+    0x09, 0x38, //     Usage (Wheel)
+    0x15, 0x81, //     Logical Minimum (-127)
+    0x25, 0x7F, //     Logical Maximum (127)
+    0x95, 0x01, //     Report Count (1)
+    0x75, 0x08, //     Report Size (8)
+    0x81, 0x06, //     Input (Data, Variable, Relative)
     // Horizontal wheel (1 byte)
-    0x05, 0x0C,        //     Usage Page (Consumer)
-    0x0A, 0x38, 0x02,  //     Usage (AC Pan)
-    0x15, 0x81,        //     Logical Minimum (-127)
-    0x25, 0x7F,        //     Logical Maximum (127)
-    0x95, 0x01,        //     Report Count (1)
-    0x75, 0x08,        //     Report Size (8)
-    0x81, 0x06,        //     Input (Data, Variable, Relative)
-    0xC0,              //   End Collection
-    0xC0,              // End Collection
+    0x05, 0x0C,       //     Usage Page (Consumer)
+    0x0A, 0x38, 0x02, //     Usage (AC Pan)
+    0x15, 0x81,       //     Logical Minimum (-127)
+    0x25, 0x7F,       //     Logical Maximum (127)
+    0x95, 0x01,       //     Report Count (1)
+    0x75, 0x08,       //     Report Size (8)
+    0x81, 0x06,       //     Input (Data, Variable, Relative)
+    0xC0,             //   End Collection
+    0xC0,             // End Collection
 #endif
 
 #ifdef EXTRAKEY_ENABLE
     // Extrakeys report descriptor
-    0x05, 0x01,              // Usage Page (Generic Desktop)
-    0x09, 0x80,              // Usage (System Control)
-    0xA1, 0x01,              // Collection (Application)
-    0x85, REPORT_ID_SYSTEM,  //   Report ID
-    0x19, 0x01,              //   Usage Minimum (Pointer)
-    0x2A, 0xB7, 0x00,        //   Usage Maximum (System Display LCD Autoscale)
-    0x15, 0x01,              //   Logical Minimum
-    0x26, 0xB7, 0x00,        //   Logical Maximum
-    0x95, 0x01,              //   Report Count (1)
-    0x75, 0x10,              //   Report Size (16)
-    0x81, 0x00,              //   Input (Data, Array, Absolute)
-    0xC0,                    // End Collection
+    0x05, 0x01,             // Usage Page (Generic Desktop)
+    0x09, 0x80,             // Usage (System Control)
+    0xA1, 0x01,             // Collection (Application)
+    0x85, REPORT_ID_SYSTEM, //   Report ID
+    0x19, 0x01,             //   Usage Minimum (Pointer)
+    0x2A, 0xB7, 0x00,       //   Usage Maximum (System Display LCD Autoscale)
+    0x15, 0x01,             //   Logical Minimum
+    0x26, 0xB7, 0x00,       //   Logical Maximum
+    0x95, 0x01,             //   Report Count (1)
+    0x75, 0x10,             //   Report Size (16)
+    0x81, 0x00,             //   Input (Data, Array, Absolute)
+    0xC0,                   // End Collection
 
-    0x05, 0x0C,                // Usage Page (Consumer)
-    0x09, 0x01,                // Usage (Consumer Control)
-    0xA1, 0x01,                // Collection (Application)
-    0x85, REPORT_ID_CONSUMER,  //   Report ID
-    0x19, 0x01,                //   Usage Minimum (Consumer Control)
-    0x2A, 0xA0, 0x02,          //   Usage Maximum (AC Desktop Show All Applications)
-    0x15, 0x01,                //   Logical Minimum
-    0x26, 0xA0, 0x02,          //   Logical Maximum
-    0x95, 0x01,                //   Report Count (1)
-    0x75, 0x10,                //   Report Size (16)
-    0x81, 0x00,                //   Input (Data, Array, Absolute)
-    0xC0,                      // End Collection
+    0x05, 0x0C,               // Usage Page (Consumer)
+    0x09, 0x01,               // Usage (Consumer Control)
+    0xA1, 0x01,               // Collection (Application)
+    0x85, REPORT_ID_CONSUMER, //   Report ID
+    0x19, 0x01,               //   Usage Minimum (Consumer Control)
+    0x2A, 0xA0, 0x02,         //   Usage Maximum (AC Desktop Show All Applications)
+    0x15, 0x01,               //   Logical Minimum
+    0x26, 0xA0, 0x02,         //   Logical Maximum
+    0x95, 0x01,               //   Report Count (1)
+    0x75, 0x10,               //   Report Size (16)
+    0x81, 0x00,               //   Input (Data, Array, Absolute)
+    0xC0,                     // End Collection
 #endif
 
 #ifdef DIGITIZER_ENABLE
     // Digitizer report descriptor
-    0x05, 0x0D,                 // Usage Page (Digitizers)
-    0x09, 0x01,                 // Usage (Digitizer)
-    0xA1, 0x01,                 // Collection (Application)
-    0x85, REPORT_ID_DIGITIZER,  //   Report ID
-    0x09, 0x22,                 //   Usage (Finger)
-    0xA1, 0x00,                 //   Collection (Physical)
+    0x05, 0x0D,                // Usage Page (Digitizers)
+    0x09, 0x01,                // Usage (Digitizer)
+    0xA1, 0x01,                // Collection (Application)
+    0x85, REPORT_ID_DIGITIZER, //   Report ID
+    0x09, 0x22,                //   Usage (Finger)
+    0xA1, 0x00,                //   Collection (Physical)
     // Tip Switch (1 bit)
-    0x09, 0x42,  //     Usage (Tip Switch)
-    0x15, 0x00,  //     Logical Minimum
-    0x25, 0x01,  //     Logical Maximum
-    0x95, 0x01,  //     Report Count (1)
-    0x75, 0x01,  //     Report Size (16)
-    0x81, 0x02,  //     Input (Data, Variable, Absolute)
+    0x09, 0x42, //     Usage (Tip Switch)
+    0x15, 0x00, //     Logical Minimum
+    0x25, 0x01, //     Logical Maximum
+    0x95, 0x01, //     Report Count (1)
+    0x75, 0x01, //     Report Size (16)
+    0x81, 0x02, //     Input (Data, Variable, Absolute)
     // In Range (1 bit)
-    0x09, 0x32,  //     Usage (In Range)
-    0x81, 0x02,  //     Input (Data, Variable, Absolute)
+    0x09, 0x32, //     Usage (In Range)
+    0x81, 0x02, //     Input (Data, Variable, Absolute)
     // Padding (6 bits)
-    0x95, 0x06,  //     Report Count (6)
-    0x81, 0x03,  //     Input (Constant)
+    0x95, 0x06, //     Report Count (6)
+    0x81, 0x03, //     Input (Constant)
 
     // X/Y Position (4 bytes)
-    0x05, 0x01,        //     Usage Page (Generic Desktop)
-    0x26, 0xFF, 0x7F,  //     Logical Maximum (32767)
-    0x95, 0x01,        //     Report Count (1)
-    0x75, 0x10,        //     Report Size (16)
-    0x65, 0x33,        //     Unit (Inch, English Linear)
-    0x55, 0x0E,        //     Unit Exponent (-2)
-    0x09, 0x30,        //     Usage (X)
-    0x81, 0x02,        //     Input (Data, Variable, Absolute)
-    0x09, 0x31,        //     Usage (Y)
-    0x81, 0x02,        //     Input (Data, Variable, Absolute)
-    0xC0,              //   End Collection
-    0xC0,              // End Collection
+    0x05, 0x01,       //     Usage Page (Generic Desktop)
+    0x26, 0xFF, 0x7F, //     Logical Maximum (32767)
+    0x95, 0x01,       //     Report Count (1)
+    0x75, 0x10,       //     Report Size (16)
+    0x65, 0x33,       //     Unit (Inch, English Linear)
+    0x55, 0x0E,       //     Unit Exponent (-2)
+    0x09, 0x30,       //     Usage (X)
+    0x81, 0x02,       //     Input (Data, Variable, Absolute)
+    0x09, 0x31,       //     Usage (Y)
+    0x81, 0x02,       //     Input (Data, Variable, Absolute)
+    0xC0,             //   End Collection
+    0xC0,             // End Collection
 #endif
 
 #ifdef PROGRAMMABLE_BUTTON_ENABLE
     // Programmable buttons report descriptor
-    0x05, 0x0C,                           // Usage Page (Consumer)
-    0x09, 0x01,                           // Usage (Consumer Control)
-    0xA1, 0x01,                           // Collection (Application)
-    0x85, REPORT_ID_PROGRAMMABLE_BUTTON,  //   Report ID
-    0x09, 0x03,                           //   Usage (Programmable Buttons)
-    0xA1, 0x04,                           //   Collection (Named Array)
-    0x05, 0x09,                           //     Usage Page (Button)
-    0x19, 0x01,                           //     Usage Minimum (Button 1)
-    0x29, 0x20,                           //     Usage Maximum (Button 32)
-    0x15, 0x00,                           //     Logical Minimum (0)
-    0x25, 0x01,                           //     Logical Maximum (1)
-    0x95, 0x20,                           //     Report Count (32)
-    0x75, 0x01,                           //     Report Size (1)
-    0x81, 0x02,                           //     Input (Data, Variable, Absolute)
-    0xC0,                                 //   End Collection
-    0xC0,                                 // End Collection
+    0x05, 0x0C,                          // Usage Page (Consumer)
+    0x09, 0x01,                          // Usage (Consumer Control)
+    0xA1, 0x01,                          // Collection (Application)
+    0x85, REPORT_ID_PROGRAMMABLE_BUTTON, //   Report ID
+    0x09, 0x03,                          //   Usage (Programmable Buttons)
+    0xA1, 0x04,                          //   Collection (Named Array)
+    0x05, 0x09,                          //     Usage Page (Button)
+    0x19, 0x01,                          //     Usage Minimum (Button 1)
+    0x29, 0x20,                          //     Usage Maximum (Button 32)
+    0x15, 0x00,                          //     Logical Minimum (0)
+    0x25, 0x01,                          //     Logical Maximum (1)
+    0x95, 0x20,                          //     Report Count (32)
+    0x75, 0x01,                          //     Report Size (1)
+    0x81, 0x02,                          //     Input (Data, Variable, Absolute)
+    0xC0,                                //   End Collection
+    0xC0,                                // End Collection
 #endif
 
 #ifdef SHARED_EP_ENABLE
@@ -599,47 +603,47 @@ const PROGMEM uchar shared_hid_report[] = {
 
 #ifdef RAW_ENABLE
 const PROGMEM uchar raw_hid_report[] = {
-    0x06, RAW_USAGE_PAGE_LO, RAW_USAGE_PAGE_HI,  // Usage Page (Vendor Defined)
-    0x09, RAW_USAGE_ID,                          // Usage (Vendor Defined)
-    0xA1, 0x01,                                  // Collection (Application)
+    0x06, RAW_USAGE_PAGE_LO, RAW_USAGE_PAGE_HI, // Usage Page (Vendor Defined)
+    0x09, RAW_USAGE_ID,                         // Usage (Vendor Defined)
+    0xA1, 0x01,                                 // Collection (Application)
     // Data to host
-    0x09, 0x62,             //   Usage (Vendor Defined)
-    0x15, 0x00,             //   Logical Minimum (0)
-    0x26, 0xFF, 0x00,       //   Logical Maximum (255)
-    0x95, RAW_BUFFER_SIZE,  //   Report Count
-    0x75, 0x08,             //   Report Size (8)
-    0x81, 0x02,             //   Input (Data, Variable, Absolute)
+    0x09, 0x62,            //   Usage (Vendor Defined)
+    0x15, 0x00,            //   Logical Minimum (0)
+    0x26, 0xFF, 0x00,      //   Logical Maximum (255)
+    0x95, RAW_BUFFER_SIZE, //   Report Count
+    0x75, 0x08,            //   Report Size (8)
+    0x81, 0x02,            //   Input (Data, Variable, Absolute)
     // Data from host
-    0x09, 0x63,             //   Usage (Vendor Defined)
-    0x15, 0x00,             //   Logical Minimum (0)
-    0x26, 0xFF, 0x00,       //   Logical Maximum (255)
-    0x95, RAW_BUFFER_SIZE,  //   Report Count
-    0x75, 0x08,             //   Report Size (8)
-    0x91, 0x02,             //   Output (Data, Variable, Absolute)
-    0xC0                    // End Collection
+    0x09, 0x63,            //   Usage (Vendor Defined)
+    0x15, 0x00,            //   Logical Minimum (0)
+    0x26, 0xFF, 0x00,      //   Logical Maximum (255)
+    0x95, RAW_BUFFER_SIZE, //   Report Count
+    0x75, 0x08,            //   Report Size (8)
+    0x91, 0x02,            //   Output (Data, Variable, Absolute)
+    0xC0                   // End Collection
 };
 #endif
 
 #if defined(CONSOLE_ENABLE)
 const PROGMEM uchar console_hid_report[] = {
-    0x06, 0x31, 0xFF,  // Usage Page (Vendor Defined - PJRC Teensy compatible)
-    0x09, 0x74,        // Usage (Vendor Defined - PJRC Teensy compatible)
-    0xA1, 0x01,        // Collection (Application)
+    0x06, 0x31, 0xFF, // Usage Page (Vendor Defined - PJRC Teensy compatible)
+    0x09, 0x74,       // Usage (Vendor Defined - PJRC Teensy compatible)
+    0xA1, 0x01,       // Collection (Application)
     // Data to host
-    0x09, 0x75,                 //   Usage (Vendor Defined)
-    0x15, 0x00,                 //   Logical Minimum (0x00)
-    0x26, 0xFF, 0x00,           //   Logical Maximum (0x00FF)
-    0x95, CONSOLE_BUFFER_SIZE,  //   Report Count
-    0x75, 0x08,                 //   Report Size (8)
-    0x81, 0x02,                 //   Input (Data, Variable, Absolute)
+    0x09, 0x75,                //   Usage (Vendor Defined)
+    0x15, 0x00,                //   Logical Minimum (0x00)
+    0x26, 0xFF, 0x00,          //   Logical Maximum (0x00FF)
+    0x95, CONSOLE_BUFFER_SIZE, //   Report Count
+    0x75, 0x08,                //   Report Size (8)
+    0x81, 0x02,                //   Input (Data, Variable, Absolute)
     // Data from host
-    0x09, 0x76,                 //   Usage (Vendor Defined)
-    0x15, 0x00,                 //   Logical Minimum (0x00)
-    0x26, 0xFF, 0x00,           //   Logical Maximum (0x00FF)
-    0x95, CONSOLE_BUFFER_SIZE,  //   Report Count
-    0x75, 0x08,                 //   Report Size (8)
-    0x91, 0x02,                 //   Output (Data)
-    0xC0                        // End Collection
+    0x09, 0x76,                //   Usage (Vendor Defined)
+    0x15, 0x00,                //   Logical Minimum (0x00)
+    0x26, 0xFF, 0x00,          //   Logical Maximum (0x00FF)
+    0x95, CONSOLE_BUFFER_SIZE, //   Report Count
+    0x75, 0x08,                //   Report Size (8)
+    0x91, 0x02,                //   Output (Data)
+    0xC0                       // End Collection
 };
 #endif
 
@@ -939,16 +943,16 @@ USB_PUBLIC usbMsgLen_t usbFunctionDescriptor(struct usbRequest *rq) {
                     usbMsgPtr = (usbMsgPtr_t)&usbStringDescriptorZero;
                     len       = usbStringDescriptorZero.header.bLength;
                     break;
-                case 1:  // iManufacturer
+                case 1: // iManufacturer
                     usbMsgPtr = (usbMsgPtr_t)&usbStringDescriptorManufacturer;
                     len       = usbStringDescriptorManufacturer.header.bLength;
                     break;
-                case 2:  // iProduct
+                case 2: // iProduct
                     usbMsgPtr = (usbMsgPtr_t)&usbStringDescriptorProduct;
                     len       = usbStringDescriptorProduct.header.bLength;
                     break;
 #if defined(SERIAL_NUMBER)
-                case 3:  // iSerialNumber
+                case 3: // iSerialNumber
                     usbMsgPtr = (usbMsgPtr_t)&usbStringDescriptorSerial;
                     len       = usbStringDescriptorSerial.header.bLength;
                     break;

From 4fd04b23714ebfaa9aae75f8ebc4c33b90941aba Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 13 Feb 2022 20:44:44 +0000
Subject: [PATCH 624/867] Fix compilation of ChibiOS UART driver (#16348)

Cherry picked fix from 15724
---
 platforms/chibios/drivers/uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/chibios/drivers/uart.c b/platforms/chibios/drivers/uart.c
index dbe991efa3..4884d7024f 100644
--- a/platforms/chibios/drivers/uart.c
+++ b/platforms/chibios/drivers/uart.c
@@ -44,7 +44,7 @@ void uart_init(uint32_t baud) {
 }
 
 void uart_write(uint8_t data) {
-    sdPut(&SERIAL_DRIVER, c);
+    sdPut(&SERIAL_DRIVER, data);
 }
 
 uint8_t uart_read(void) {

From b6b7e1202967d19107f7b223f38f59f9ea975146 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 14 Feb 2022 13:01:39 +1100
Subject: [PATCH 625/867] Digicarp65: fix layouts (#16328)

---
 .../swiftrax/digicarp65/digicarp65.h          | 110 ++--
 .../handwired/swiftrax/digicarp65/info.json   | 552 +++++++++---------
 2 files changed, 331 insertions(+), 331 deletions(-)

diff --git a/keyboards/handwired/swiftrax/digicarp65/digicarp65.h b/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
index 2797d771d0..ba4a76ea10 100644
--- a/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
+++ b/keyboards/handwired/swiftrax/digicarp65/digicarp65.h
@@ -14,65 +14,65 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 #pragma once
 
 #include "quantum.h"
 
+#define XXX KC_NO
 
- #define LAYOUT_65_ansi( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
-     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
- ) \
- { \
-  { K00,   K01, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A, K0B,   K0C, KC_NO, K0E, K0F }, \
-  { K10, KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A, K1B,   K1C,   K1D, K1E, K1F }, \
-  { K20, KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A, K2B,   K2C,   K2D,KC_NO,K2F }, \
-  { K30, KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A, K3B, KC_NO,   K3D, K3E, K3F }, \
-  { K40,   K41, K42, KC_NO, KC_NO, KC_NO,   K46, KC_NO, KC_NO, KC_NO,   K4A, K4B,   K4C,   K4D, K4E, K4F }, \
- }
+#define LAYOUT_65_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, k3F, \
+    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \
+}
+
+#define LAYOUT_65_iso( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, k2F, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, k3F, \
+    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \
+}
+
+#define LAYOUT_65_ansi_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, k3F, \
+    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \
+}
 
- #define LAYOUT_65_iso( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
- ) \
- { \
-     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   KC_NO,   K0E, K0F }, \
-     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,     K1D,   K2D, K1F }, \
-     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C,   KC_NO,   K2E, K2F }, \
-     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,     K3D,   K3E, K3F }, \
-     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,     K4D,   K4E, K4F }, \
- }
- #define LAYOUT_65_ansi_split_bs( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
- ) \
- { \
-     { K00, K01,   K02,   K03, K04,   K05,   K06, K07,   K08,   K09,   K0A, K0B, K0C,   K0D,   K0E, K0F }, \
-     { K10, KC_NO, K12,   K13, K14,   K15,   K16, K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   K1E, K1F }, \
-     { K20, KC_NO, K22,   K23, K24,   K25,   K26, K27,   K28,   K29,   K2A, K2B, K2C,   KC_NO, K2E, K2F }, \
-     { K30, KC_NO, K32,   K33, K34,   K35,   K36, K37,   K38,   K39,   K3A, K3B, KC_NO, K3D,   K3E, K3F }, \
-     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C, K4D,   K4E, K4F }, \
- }
 #define LAYOUT_65_iso_split_bs( \
-     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
-     K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
-     K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \
-     K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-     K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E, K4F  \
- ) \
- { \
-     { K00, K01,   K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A, K0B,   K0C,   K0D,   K0E, K0F }, \
-     { K10, KC_NO, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A, K1B,   K1C,   K1D,   K2D, K1F }, \
-     { K20, KC_NO, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A, K2B,   K2C, KC_NO,   K2E, K2F }, \
-     { K30,   K31, K32,   K33,   K34,   K35, K36,   K37,   K38, K39,   K3A, K3B, KC_NO,   K3D,   K3E, K3F }, \
-     { K40, K41,   K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B,   K4C,   K4D,   K4E, K4F }, \
- }
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1F, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, k2F, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E, k3F, \
+    k40, k41, k42,                k46,                k4A, k4B, k4C, k4D, k4E, k4F \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \
+}
diff --git a/keyboards/handwired/swiftrax/digicarp65/info.json b/keyboards/handwired/swiftrax/digicarp65/info.json
index a5fe908e5d..48a4d31368 100644
--- a/keyboards/handwired/swiftrax/digicarp65/info.json
+++ b/keyboards/handwired/swiftrax/digicarp65/info.json
@@ -5,310 +5,310 @@
     "layouts": {
         "LAYOUT_65_ansi": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0, "w":2},
-                {"label": "r1_15", "x": 15, "y": 0},
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w":2},
+                {"x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "r3_14", "x": 15, "y": 2},
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
-                {"label": "r4_02", "x": 2.25, "y": 3},
-                {"label": "r4_03", "x": 3.25, "y": 3},
-                {"label": "r4_04", "x": 4.25, "y": 3},
-                {"label": "r4_05", "x": 5.25, "y": 3},
-                {"label": "r4_06", "x": 6.25, "y": 3},
-                {"label": "r4_07", "x": 7.25, "y": 3},
-                {"label": "r4_08", "x": 8.25, "y": 3},
-                {"label": "r4_09", "x": 9.25, "y": 3},
-                {"label": "r4_10", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0, "w":2},
-                {"label": "r1_15", "x": 15, "y": 0},
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w":2},
+                {"x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2},
-                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
-                {"label": "r3_15", "x": 15, "y": 2},
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 1, "w":1.25, "h":2},
+                {"x": 15, "y": 2},
 
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
-                {"label": "r4_02", "x": 1.25, "y": 3},
-                {"label": "r4_03", "x": 2.25, "y": 3},
-                {"label": "r4_04", "x": 3.25, "y": 3},
-                {"label": "r4_05", "x": 4.25, "y": 3},
-                {"label": "r4_06", "x": 5.25, "y": 3},
-                {"label": "r4_07", "x": 6.25, "y": 3},
-                {"label": "r4_08", "x": 7.25, "y": 3},
-                {"label": "r4_09", "x": 8.25, "y": 3},
-                {"label": "r4_10", "x": 9.25, "y": 3},
-                {"label": "r4_11", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
-
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_ansi_split_bs": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0},
-                {"label": "r1_15", "x": 14, "y": 0},
-                {"label": "r1_16", "x": 15, "y": 0},
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25},
-                {"label": "r3_14", "x": 15, "y": 2},
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x": 15, "y": 2},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 2.25},
-                {"label": "r4_02", "x": 2.25, "y": 3},
-                {"label": "r4_03", "x": 3.25, "y": 3},
-                {"label": "r4_04", "x": 4.25, "y": 3},
-                {"label": "r4_05", "x": 5.25, "y": 3},
-                {"label": "r4_06", "x": 6.25, "y": 3},
-                {"label": "r4_07", "x": 7.25, "y": 3},
-                {"label": "r4_08", "x": 8.25, "y": 3},
-                {"label": "r4_09", "x": 9.25, "y": 3},
-                {"label": "r4_10", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
 
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
             ]
         },
         "LAYOUT_65_iso_split_bs": {
             "layout": [
-                {"label": "r1_01", "x": 0, "y": 0},
-                {"label": "r1_02", "x": 1, "y": 0},
-                {"label": "r1_03", "x": 2, "y": 0},
-                {"label": "r1_04", "x": 3, "y": 0},
-                {"label": "r1_05", "x": 4, "y": 0},
-                {"label": "r1_06", "x": 5, "y": 0},
-                {"label": "r1_07", "x": 6, "y": 0},
-                {"label": "r1_08", "x": 7, "y": 0},
-                {"label": "r1_09", "x": 8, "y": 0},
-                {"label": "r1_10", "x": 9, "y": 0},
-                {"label": "r1_11", "x": 10, "y": 0},
-                {"label": "r1_12", "x": 11, "y": 0},
-                {"label": "r1_13", "x": 12, "y": 0},
-                {"label": "r1_14", "x": 13, "y": 0},
-                {"label": "r1_15", "x": 14, "y": 0},
-                {"label": "r1_16", "x": 15, "y": 0},
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
 
-                {"label": "r2_01", "x": 0, "y": 1, "w": 1.5},
-                {"label": "r2_02", "x": 1.5, "y": 1},
-                {"label": "r2_03", "x": 2.5, "y": 1},
-                {"label": "r2_04", "x": 3.5, "y": 1},
-                {"label": "r2_05", "x": 4.5, "y": 1},
-                {"label": "r2_06", "x": 5.5, "y": 1},
-                {"label": "r2_07", "x": 6.5, "y": 1},
-                {"label": "r2_08", "x": 7.5, "y": 1},
-                {"label": "r2_09", "x": 8.5, "y": 1},
-                {"label": "r2_10", "x": 9.5, "y": 1},
-                {"label": "r2_11", "x": 10.5, "y": 1},
-                {"label": "r2_12", "x": 11.5, "y": 1},
-                {"label": "r2_13", "x": 12.5, "y": 1},
-                {"label": "r2_14", "x": 13.5, "y": 1},
-                {"label": "r2_15", "x": 15, "y": 1},
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 15, "y": 1},
 
-                {"label": "r3_01", "x": 0, "y": 2, "w": 1.75},
-                {"label": "r3_02", "x": 1.75, "y": 2},
-                {"label": "r3_03", "x": 2.75, "y": 2},
-                {"label": "r3_04", "x": 3.75, "y": 2},
-                {"label": "r3_05", "x": 4.75, "y": 2},
-                {"label": "r3_06", "x": 5.75, "y": 2},
-                {"label": "r3_07", "x": 6.75, "y": 2},
-                {"label": "r3_08", "x": 7.75, "y": 2},
-                {"label": "r3_09", "x": 8.75, "y": 2},
-                {"label": "r3_10", "x": 9.75, "y": 2},
-                {"label": "r3_11", "x": 10.75, "y": 2},
-                {"label": "r3_12", "x": 11.75, "y": 2},
-                {"label": "r3_13", "x": 12.75, "y": 2},
-                {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2},
-                {"label": "r3_15", "x": 15, "y": 2},
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 1, "w":1.25, "h":2},
+                {"x": 15, "y": 2},
 
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
 
-                {"label": "r4_01", "x": 0, "y": 3, "w": 1.25},
-                {"label": "r4_02", "x": 1.25, "y": 3},
-                {"label": "r4_03", "x": 2.25, "y": 3},
-                {"label": "r4_04", "x": 3.25, "y": 3},
-                {"label": "r4_05", "x": 4.25, "y": 3},
-                {"label": "r4_06", "x": 5.25, "y": 3},
-                {"label": "r4_07", "x": 6.25, "y": 3},
-                {"label": "r4_08", "x": 7.25, "y": 3},
-                {"label": "r4_09", "x": 8.25, "y": 3},
-                {"label": "r4_10", "x": 9.25, "y": 3},
-                {"label": "r4_11", "x": 10.25, "y": 3},
-                {"label": "r4_11", "x": 11.25, "y": 3},
-                {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75},
-                {"label": "r4_13", "x": 14, "y": 3},
-                {"label": "r4_14", "x": 15, "y": 3},
-
-                {"label": "r5_01", "x": 0, "y": 4, "w": 1.25},
-                {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25},
-                {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25},
-                {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25},
-                {"label": "r5_05", "x": 10, "y": 4, "w": 1.25},
-                {"label": "r5_06", "x": 11.25, "y": 4, "w": 1.25},
-                {"label": "r4_07", "x": 13, "y": 4},
-                {"label": "r4_08", "x": 14, "y": 4},
-                {"label": "r4_09", "x": 15, "y": 4}
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
             ]
         }
     }

From 6b01657a8682c7d882c9721745010b56b362d55c Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 13 Feb 2022 22:24:11 -0800
Subject: [PATCH 626/867] Mode M75S Layout Additions, Configurator Data and
 Code Touch-Up (#16327)

* m75s.h: correct matrix position identifier

`K5C` is actually on row 4, so it should be `K4C`.

* m75s.h: add matrix diagram

* add QMK Configurator data

* polish whitespace

- convert tabs to spaces
- update indent to four spaces
- remove trailing whitespace

* update readme

Didn't seem to be fully updated after being copied from the M65S codebase.

* add LAYOUT_ansi with keymap

ANSI layout with 2u Backspace.

* add LAYOUT_iso with keymap

ISO layout with 2u Backspace.

* add LAYOUT_ansi_tsangan with keymap

ANSI layout with 2u Backspace and 7u Spacebar.

* add LAYOUT_iso_tsangan with keymap

ISO layout with 2u Backspace and 7u Spacebar.

* add LAYOUT_ansi_split_bs with keymap

ANSI layout with Split Backspace.

* add LAYOUT_iso_split_bs with keymap

ISO layout with Split Backspace.

* add LAYOUT_ansi_tsangan_split_bs with keymap

ANSI layout with Split Backspace and 7u Spacebar.

* add LAYOUT_iso_tsangan_split_bs with keymap

ISO layout with Split Backspace and 7u Spacebar.
---
 keyboards/mode/m75s/info.json                 | 824 ++++++++++++++++++
 keyboards/mode/m75s/keymaps/default/keymap.c  |  28 +-
 .../mode/m75s/keymaps/default_ansi/keymap.c   |  53 ++
 .../keymaps/default_ansi_split_bs/keymap.c    |  53 ++
 .../keymaps/default_ansi_tsangan/keymap.c     |  53 ++
 .../default_ansi_tsangan_split_bs/keymap.c    |  53 ++
 .../mode/m75s/keymaps/default_iso/keymap.c    |  53 ++
 .../keymaps/default_iso_split_bs/keymap.c     |  53 ++
 .../m75s/keymaps/default_iso_tsangan/keymap.c |  53 ++
 .../default_iso_tsangan_split_bs/keymap.c     |  53 ++
 keyboards/mode/m75s/keymaps/via/keymap.c      |  28 +-
 keyboards/mode/m75s/m75s.h                    | 182 +++-
 keyboards/mode/m75s/readme.md                 |  10 +-
 13 files changed, 1449 insertions(+), 47 deletions(-)
 create mode 100644 keyboards/mode/m75s/info.json
 create mode 100644 keyboards/mode/m75s/keymaps/default_ansi/keymap.c
 create mode 100644 keyboards/mode/m75s/keymaps/default_ansi_split_bs/keymap.c
 create mode 100644 keyboards/mode/m75s/keymaps/default_ansi_tsangan/keymap.c
 create mode 100644 keyboards/mode/m75s/keymaps/default_ansi_tsangan_split_bs/keymap.c
 create mode 100644 keyboards/mode/m75s/keymaps/default_iso/keymap.c
 create mode 100644 keyboards/mode/m75s/keymaps/default_iso_split_bs/keymap.c
 create mode 100644 keyboards/mode/m75s/keymaps/default_iso_tsangan/keymap.c
 create mode 100644 keyboards/mode/m75s/keymaps/default_iso_tsangan_split_bs/keymap.c

diff --git a/keyboards/mode/m75s/info.json b/keyboards/mode/m75s/info.json
new file mode 100644
index 0000000000..d45cee20dc
--- /dev/null
+++ b/keyboards/mode/m75s/info.json
@@ -0,0 +1,824 @@
+{
+    "keyboard_name": "Mode 75S",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "x":10, "y":1.5},
+                {"label":"-_", "x":11, "y":1.5},
+                {"label":"=+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5},
+                {"label":"Backspace", "x":14, "y":1.5},
+                {"label":"Home", "x":15, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[{", "x":11.5, "y":2.5},
+                {"label":"]}", "x":12.5, "y":2.5},
+                {"label":"\\|", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"Page Up", "x":15, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";:", "x":10.75, "y":3.5},
+                {"label":"'\"", "x":11.75, "y":3.5},
+                {"label":"#~", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":3.5, "w":1.25},
+                {"label":"Page Down", "x":15, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.5},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",<", "x":9.25, "y":4.5},
+                {"label":".>", "x":10.25, "y":4.5},
+                {"label":"/?", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"\u2191", "x":14, "y":4.5},
+                {"label":"End", "x":15, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"\u2190", "x":13, "y":5.5},
+                {"label":"\u2193", "x":14, "y":5.5},
+                {"label":"\u2192", "x":15, "y":5.5}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "x":10, "y":1.5},
+                {"label":"-_", "x":11, "y":1.5},
+                {"label":"=+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Home", "x":15, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[{", "x":11.5, "y":2.5},
+                {"label":"]}", "x":12.5, "y":2.5},
+                {"label":"\\|", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"Page Up", "x":15, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";:", "x":10.75, "y":3.5},
+                {"label":"'\"", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"Page Down", "x":15, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",<", "x":9.25, "y":4.5},
+                {"label":".>", "x":10.25, "y":4.5},
+                {"label":"/?", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"\u2191", "x":14, "y":4.5},
+                {"label":"End", "x":15, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"\u2190", "x":13, "y":5.5},
+                {"label":"\u2193", "x":14, "y":5.5},
+                {"label":"\u2192", "x":15, "y":5.5}
+            ]
+        },
+        "LAYOUT_ansi_split_bs": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "x":10, "y":1.5},
+                {"label":"-_", "x":11, "y":1.5},
+                {"label":"=+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5},
+                {"label":"Backspace", "x":14, "y":1.5},
+                {"label":"Home", "x":15, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[{", "x":11.5, "y":2.5},
+                {"label":"]}", "x":12.5, "y":2.5},
+                {"label":"\\|", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"Page Up", "x":15, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";:", "x":10.75, "y":3.5},
+                {"label":"'\"", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"Page Down", "x":15, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",<", "x":9.25, "y":4.5},
+                {"label":".>", "x":10.25, "y":4.5},
+                {"label":"/?", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"\u2191", "x":14, "y":4.5},
+                {"label":"End", "x":15, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"\u2190", "x":13, "y":5.5},
+                {"label":"\u2193", "x":14, "y":5.5},
+                {"label":"\u2192", "x":15, "y":5.5}
+            ]
+        },
+        "LAYOUT_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "x":10, "y":1.5},
+                {"label":"-_", "x":11, "y":1.5},
+                {"label":"=+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Home", "x":15, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[{", "x":11.5, "y":2.5},
+                {"label":"]}", "x":12.5, "y":2.5},
+                {"label":"\\|", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"Page Up", "x":15, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";:", "x":10.75, "y":3.5},
+                {"label":"'\"", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"Page Down", "x":15, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",<", "x":9.25, "y":4.5},
+                {"label":".>", "x":10.25, "y":4.5},
+                {"label":"/?", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"\u2191", "x":14, "y":4.5},
+                {"label":"End", "x":15, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":5.5},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
+                {"label":"Space", "x":4, "y":5.5, "w":7},
+                {"label":"Fn", "x":11, "y":5.5, "w":1.5},
+                {"label":"\u2190", "x":13, "y":5.5},
+                {"label":"\u2193", "x":14, "y":5.5},
+                {"label":"\u2192", "x":15, "y":5.5}
+            ]
+        },
+        "LAYOUT_ansi_tsangan_split_bs": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "x":10, "y":1.5},
+                {"label":"-_", "x":11, "y":1.5},
+                {"label":"=+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5},
+                {"label":"Backspace", "x":14, "y":1.5},
+                {"label":"Home", "x":15, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[{", "x":11.5, "y":2.5},
+                {"label":"]}", "x":12.5, "y":2.5},
+                {"label":"\\|", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"Page Up", "x":15, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";:", "x":10.75, "y":3.5},
+                {"label":"'\"", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"Page Down", "x":15, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",<", "x":9.25, "y":4.5},
+                {"label":".>", "x":10.25, "y":4.5},
+                {"label":"/?", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"\u2191", "x":14, "y":4.5},
+                {"label":"End", "x":15, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":5.5},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
+                {"label":"Space", "x":4, "y":5.5, "w":7},
+                {"label":"Fn", "x":11, "y":5.5, "w":1.5},
+                {"label":"\u2190", "x":13, "y":5.5},
+                {"label":"\u2193", "x":14, "y":5.5},
+                {"label":"\u2192", "x":15, "y":5.5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "x":10, "y":1.5},
+                {"label":"-_", "x":11, "y":1.5},
+                {"label":"=+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Home", "x":15, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[{", "x":11.5, "y":2.5},
+                {"label":"]}", "x":12.5, "y":2.5},
+                {"label":"Page Up", "x":15, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";:", "x":10.75, "y":3.5},
+                {"label":"'\"", "x":11.75, "y":3.5},
+                {"label":"#~", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"label":"Page Down", "x":15, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.5},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",<", "x":9.25, "y":4.5},
+                {"label":".>", "x":10.25, "y":4.5},
+                {"label":"/?", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"\u2191", "x":14, "y":4.5},
+                {"label":"End", "x":15, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"\u2190", "x":13, "y":5.5},
+                {"label":"\u2193", "x":14, "y":5.5},
+                {"label":"\u2192", "x":15, "y":5.5}
+            ]
+        },
+        "LAYOUT_iso_split_bs": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "x":10, "y":1.5},
+                {"label":"-_", "x":11, "y":1.5},
+                {"label":"=+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5},
+                {"label":"Backspace", "x":14, "y":1.5},
+                {"label":"Home", "x":15, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[{", "x":11.5, "y":2.5},
+                {"label":"]}", "x":12.5, "y":2.5},
+                {"label":"Page Up", "x":15, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";:", "x":10.75, "y":3.5},
+                {"label":"'\"", "x":11.75, "y":3.5},
+                {"label":"#~", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"label":"Page Down", "x":15, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.5},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",<", "x":9.25, "y":4.5},
+                {"label":".>", "x":10.25, "y":4.5},
+                {"label":"/?", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"\u2191", "x":14, "y":4.5},
+                {"label":"End", "x":15, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"\u2190", "x":13, "y":5.5},
+                {"label":"\u2193", "x":14, "y":5.5},
+                {"label":"\u2192", "x":15, "y":5.5}
+            ]
+        },
+        "LAYOUT_iso_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "x":10, "y":1.5},
+                {"label":"-_", "x":11, "y":1.5},
+                {"label":"=+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Home", "x":15, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[{", "x":11.5, "y":2.5},
+                {"label":"]}", "x":12.5, "y":2.5},
+                {"label":"Page Up", "x":15, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";:", "x":10.75, "y":3.5},
+                {"label":"'\"", "x":11.75, "y":3.5},
+                {"label":"#~", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"label":"Page Down", "x":15, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.5},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",<", "x":9.25, "y":4.5},
+                {"label":".>", "x":10.25, "y":4.5},
+                {"label":"/?", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"\u2191", "x":14, "y":4.5},
+                {"label":"End", "x":15, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":5.5},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
+                {"label":"Space", "x":4, "y":5.5, "w":7},
+                {"label":"Fn", "x":11, "y":5.5, "w":1.5},
+                {"label":"\u2190", "x":13, "y":5.5},
+                {"label":"\u2193", "x":14, "y":5.5},
+                {"label":"\u2192", "x":15, "y":5.5}
+            ]
+        },
+        "LAYOUT_iso_tsangan_split_bs": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+
+                {"label":"`~", "x":0, "y":1.5},
+                {"label":"1!", "x":1, "y":1.5},
+                {"label":"2@", "x":2, "y":1.5},
+                {"label":"3#", "x":3, "y":1.5},
+                {"label":"4$", "x":4, "y":1.5},
+                {"label":"5%", "x":5, "y":1.5},
+                {"label":"6^", "x":6, "y":1.5},
+                {"label":"7&", "x":7, "y":1.5},
+                {"label":"8*", "x":8, "y":1.5},
+                {"label":"9(", "x":9, "y":1.5},
+                {"label":"0)", "x":10, "y":1.5},
+                {"label":"-_", "x":11, "y":1.5},
+                {"label":"=+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5},
+                {"label":"Backspace", "x":14, "y":1.5},
+                {"label":"Home", "x":15, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[{", "x":11.5, "y":2.5},
+                {"label":"]}", "x":12.5, "y":2.5},
+                {"label":"Page Up", "x":15, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";:", "x":10.75, "y":3.5},
+                {"label":"'\"", "x":11.75, "y":3.5},
+                {"label":"#~", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"label":"Page Down", "x":15, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"\\|", "x":1.25, "y":4.5},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",<", "x":9.25, "y":4.5},
+                {"label":".>", "x":10.25, "y":4.5},
+                {"label":"/?", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"\u2191", "x":14, "y":4.5},
+                {"label":"End", "x":15, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.5},
+                {"label":"GUI", "x":1.5, "y":5.5},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.5},
+                {"label":"Space", "x":4, "y":5.5, "w":7},
+                {"label":"Fn", "x":11, "y":5.5, "w":1.5},
+                {"label":"\u2190", "x":13, "y":5.5},
+                {"label":"\u2193", "x":14, "y":5.5},
+                {"label":"\u2192", "x":15, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mode/m75s/keymaps/default/keymap.c b/keyboards/mode/m75s/keymaps/default/keymap.c
index dcea4af059..35db109a41 100755
--- a/keyboards/mode/m75s/keymaps/default/keymap.c
+++ b/keyboards/mode/m75s/keymaps/default/keymap.c
@@ -18,36 +18,36 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [0] = LAYOUT_all(
-        KC_ESC  , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6,  KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12,            KC_DEL , 
-        KC_TILD , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6,   KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,  KC_HOME,
-        KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y,   KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,           KC_PGUP,
-        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_NUBS, KC_ENT ,           KC_PGDN,
-        KC_LSFT , KC_NUHS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B,   KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  ,  KC_END ,
-        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN,  KC_RGHT 
-	),
-   [1] = LAYOUT_all(
+    [0] = LAYOUT_all(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_DEL ,
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_HOME,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_NUBS, KC_ENT ,          KC_PGDN,
+        KC_LSFT, KC_NUHS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
         RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
         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_VOLU,
         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_VOLD,
         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_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        ),
-   [2] = LAYOUT_all(
+    ),
+    [2] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        ),
-   [3] = LAYOUT_all(
+    ),
+    [3] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        )
+    )
 };
diff --git a/keyboards/mode/m75s/keymaps/default_ansi/keymap.c b/keyboards/mode/m75s/keymaps/default_ansi/keymap.c
new file mode 100644
index 0000000000..5ca5384010
--- /dev/null
+++ b/keyboards/mode/m75s/keymaps/default_ansi/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ansi(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_DEL ,
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,          KC_HOME,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ansi(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_MUTE,
+        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_VOLU,
+        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_VOLD,
+        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_MPLY,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+    ),
+    [3] = LAYOUT_ansi(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+    )
+};
diff --git a/keyboards/mode/m75s/keymaps/default_ansi_split_bs/keymap.c b/keyboards/mode/m75s/keymaps/default_ansi_split_bs/keymap.c
new file mode 100644
index 0000000000..0e74130e45
--- /dev/null
+++ b/keyboards/mode/m75s/keymaps/default_ansi_split_bs/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ansi_split_bs(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_DEL ,
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_HOME,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ansi_split_bs(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
+        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_VOLU,
+        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_VOLD,
+        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_MPLY,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_ansi_split_bs(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_ansi_split_bs(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/mode/m75s/keymaps/default_ansi_tsangan/keymap.c b/keyboards/mode/m75s/keymaps/default_ansi_tsangan/keymap.c
new file mode 100644
index 0000000000..ed2fd875b0
--- /dev/null
+++ b/keyboards/mode/m75s/keymaps/default_ansi_tsangan/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ansi_tsangan(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_DEL ,
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,          KC_HOME,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                                     MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ansi_tsangan(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_MUTE,
+        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_VOLU,
+        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_VOLD,
+        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_MPLY,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_ansi_tsangan(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+    ),
+    [3] = LAYOUT_ansi_tsangan(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+    )
+};
diff --git a/keyboards/mode/m75s/keymaps/default_ansi_tsangan_split_bs/keymap.c b/keyboards/mode/m75s/keymaps/default_ansi_tsangan_split_bs/keymap.c
new file mode 100644
index 0000000000..dda171515a
--- /dev/null
+++ b/keyboards/mode/m75s/keymaps/default_ansi_tsangan_split_bs/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ansi_tsangan_split_bs(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_DEL ,
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_HOME,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_PGDN,
+        KC_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                                     MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ansi_tsangan_split_bs(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
+        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_VOLU,
+        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_VOLD,
+        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_MPLY,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_ansi_tsangan_split_bs(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+    ),
+    [3] = LAYOUT_ansi_tsangan_split_bs(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+    )
+};
diff --git a/keyboards/mode/m75s/keymaps/default_iso/keymap.c b/keyboards/mode/m75s/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..6e21982e1b
--- /dev/null
+++ b/keyboards/mode/m75s/keymaps/default_iso/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_iso(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_DEL ,
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,          KC_HOME,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC,                   KC_PGUP,
+        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_NUBS, KC_ENT ,          KC_PGDN,
+        KC_LSFT, KC_NUHS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_iso(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_MUTE,
+        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_VOLU,
+        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_VOLD,
+        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_MPLY,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_iso(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_iso(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/mode/m75s/keymaps/default_iso_split_bs/keymap.c b/keyboards/mode/m75s/keymaps/default_iso_split_bs/keymap.c
new file mode 100644
index 0000000000..5f1851472c
--- /dev/null
+++ b/keyboards/mode/m75s/keymaps/default_iso_split_bs/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_iso_split_bs(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_DEL ,
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_HOME,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC,                   KC_PGUP,
+        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_NUBS, KC_ENT ,          KC_PGDN,
+        KC_LSFT, KC_NUHS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_iso_split_bs(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
+        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_VOLU,
+        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_VOLD,
+        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_MPLY,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_iso_split_bs(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_iso_split_bs(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/mode/m75s/keymaps/default_iso_tsangan/keymap.c b/keyboards/mode/m75s/keymaps/default_iso_tsangan/keymap.c
new file mode 100644
index 0000000000..7bba870fc0
--- /dev/null
+++ b/keyboards/mode/m75s/keymaps/default_iso_tsangan/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_iso_tsangan(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_DEL ,
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,          KC_HOME,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC,                   KC_PGUP,
+        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_NUBS, KC_ENT ,          KC_PGDN,
+        KC_LSFT, KC_NUHS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                                     MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_iso_tsangan(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_MUTE,
+        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_VOLU,
+        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_VOLD,
+        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_MPLY,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_iso_tsangan(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+    ),
+    [3] = LAYOUT_iso_tsangan(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
+    )
+};
diff --git a/keyboards/mode/m75s/keymaps/default_iso_tsangan_split_bs/keymap.c b/keyboards/mode/m75s/keymaps/default_iso_tsangan_split_bs/keymap.c
new file mode 100644
index 0000000000..2ad104262b
--- /dev/null
+++ b/keyboards/mode/m75s/keymaps/default_iso_tsangan_split_bs/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato <alvaro.volpato@usp.br>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_iso_tsangan_split_bs(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_DEL ,
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_HOME,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC,                   KC_PGUP,
+        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_NUBS, KC_ENT ,          KC_PGDN,
+        KC_LSFT, KC_NUHS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                                     MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_iso_tsangan_split_bs(
+        RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
+        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_VOLU,
+        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_VOLD,
+        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_MPLY,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_iso_tsangan_split_bs(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_iso_tsangan_split_bs(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/mode/m75s/keymaps/via/keymap.c b/keyboards/mode/m75s/keymaps/via/keymap.c
index dcea4af059..35db109a41 100755
--- a/keyboards/mode/m75s/keymaps/via/keymap.c
+++ b/keyboards/mode/m75s/keymaps/via/keymap.c
@@ -18,36 +18,36 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-   [0] = LAYOUT_all(
-        KC_ESC  , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6,  KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12,            KC_DEL , 
-        KC_TILD , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6,   KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC,  KC_HOME,
-        KC_TAB  , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y,   KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,           KC_PGUP,
-        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_NUBS, KC_ENT ,           KC_PGDN,
-        KC_LSFT , KC_NUHS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B,   KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  ,  KC_END ,
-        KC_LCTL , KC_LGUI, KC_LALT,                            KC_SPC,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN,  KC_RGHT 
-	),
-   [1] = LAYOUT_all(
+    [0] = LAYOUT_all(
+        KC_ESC , KC_F1  , KC_F2  , KC_F3  , KC_F4  ,          KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,          KC_DEL ,
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC, KC_BSPC, KC_HOME,
+        KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_NUBS, KC_ENT ,          KC_PGDN,
+        KC_LSFT, KC_NUHS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,          KC_UP  , KC_END ,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                            KC_RALT, MO(1)  ,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
         RESET  , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE,
         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_VOLU,
         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_VOLD,
         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_MPLY,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        ),
-   [2] = LAYOUT_all(
+    ),
+    [2] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        ),
-   [3] = LAYOUT_all(
+    ),
+    [3] = LAYOUT_all(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-        )
+    )
 };
diff --git a/keyboards/mode/m75s/m75s.h b/keyboards/mode/m75s/m75s.h
index 11a08d0dce..7306874a23 100644
--- a/keyboards/mode/m75s/m75s.h
+++ b/keyboards/mode/m75s/m75s.h
@@ -21,19 +21,175 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ___ KC_NO
 
+/*
+ *              ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐
+ *              │00 │ │01 │02 │03 │04 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0F │
+ *              └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+ *              │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │1F │    │1D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+ *              │20   │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E   │2F │      │     │
+ *              ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐3E  │ ISO Enter
+ *              │30    │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3E      │3F │   │3D │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+ * │40      │   │40  │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C    │4E │4F │
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ *              │50  │51  │52  │66                      │6A  │6B  │ │6D │6E │6F │
+ *              └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ *              │50   │51 │52   │66                         │6B   │ Tsangan
+ *              └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
 #define LAYOUT_all( \
-	K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
-	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C,      K4E, K4F, \
-	K50, K51, K52,                K66,                K6A, K6B,      K6D, K6E, K6F  \
+    K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, K3F, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
+    K50, K51, K52,                K66,                K6A, K6B,      K6D, K6E, K6F  \
 ) { \
-	{ K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
-	{ K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K5C, ___, K4E, K4F }, \
-	{ K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
-        { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, K6A, K6B, ___, K6D, K6E, K6F }  \
+    { K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E, K4F }, \
+    { K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, K6A, K6B, ___, K6D, K6E, K6F }  \
+}
+
+#define LAYOUT_ansi( \
+    K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
+    K50, K51, K52,                K66,                K6A, K6B,      K6D, K6E, K6F  \
+) { \
+    { K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, ___, K3E, K3F }, \
+    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E, K4F }, \
+    { K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, K6A, K6B, ___, K6D, K6E, K6F }  \
+}
+
+#define LAYOUT_ansi_split_bs( \
+    K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
+    K50, K51, K52,                K66,                K6A, K6B,      K6D, K6E, K6F  \
+) { \
+    { K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, ___, K3E, K3F }, \
+    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E, K4F }, \
+    { K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, K6A, K6B, ___, K6D, K6E, K6F }  \
+}
+
+#define LAYOUT_ansi_tsangan( \
+    K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
+    K50, K51, K52,                K66,                     K6B,      K6D, K6E, K6F  \
+) { \
+    { K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, ___, K3E, K3F }, \
+    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E, K4F }, \
+    { K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, ___, K6B, ___, K6D, K6E, K6F }  \
+}
+
+#define LAYOUT_ansi_tsangan_split_bs( \
+    K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           K3E, K3F, \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
+    K50, K51, K52,                K66,                     K6B,      K6D, K6E, K6F  \
+) { \
+    { K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, ___, K3E, K3F }, \
+    { K40, ___, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E, K4F }, \
+    { K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, ___, K6B, ___, K6D, K6E, K6F }  \
+}
+
+#define LAYOUT_iso( \
+    K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E,      K3F, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
+    K50, K51, K52,                K66,                K6A, K6B,      K6D, K6E, K6F  \
+) { \
+    { K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, ___, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E, K4F }, \
+    { K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, K6A, K6B, ___, K6D, K6E, K6F }  \
+}
+
+#define LAYOUT_iso_split_bs( \
+    K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E,      K3F, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
+    K50, K51, K52,                K66,                K6A, K6B,      K6D, K6E, K6F  \
+) { \
+    { K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, ___, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E, K4F }, \
+    { K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, K6A, K6B, ___, K6D, K6E, K6F }  \
+}
+
+#define LAYOUT_iso_tsangan( \
+    K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E,      K3F, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
+    K50, K51, K52,                K66,                     K6B,      K6D, K6E, K6F  \
+) { \
+    { K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, ___, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, ___, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E, K4F }, \
+    { K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, ___, K6B, ___, K6D, K6E, K6F }  \
+}
+
+#define LAYOUT_iso_tsangan_split_bs( \
+    K00, K01, K02, K03, K04,      K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E,      K3F, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4E, K4F, \
+    K50, K51, K52,                K66,                     K6B,      K6D, K6E, K6F  \
+) { \
+    { K00, K01, K02, K03, K04, ___, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___, K0F }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, ___, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E, K4F }, \
+    { K50, K51, K52, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ }, \
+    { ___, ___, ___, ___, ___, ___, K66, ___, ___, ___, ___, K6B, ___, K6D, K6E, K6F }  \
 }
diff --git a/keyboards/mode/m75s/readme.md b/keyboards/mode/m75s/readme.md
index a663847278..8ff9fb03b4 100644
--- a/keyboards/mode/m75s/readme.md
+++ b/keyboards/mode/m75s/readme.md
@@ -1,8 +1,6 @@
-# Mode SixtyFive M65S
+# Mode SeventyFive M75S
 
-![MODE75](https://raw.githubusercontent.com/Gondolindrim/file_hosting/main/mode_sixtyfive/Group_95_1024x1024.jpg)
-
-The M65S is the solderable PCB for the Mode SixtyFive keyboard, a sixty-five-percent high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/).
+The M75S is the solderable PCB for the Mode SeventyFive keyboard, a seventy-five-percent high-end keyboard sold by [Mode Designs](https://shop.modedesigns.com/).
 
 -   Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim)
 -   Hardware Supported: proprietary PCB using STM32F401 controller
@@ -10,10 +8,10 @@ The M65S is the solderable PCB for the Mode SixtyFive keyboard, a sixty-five-per
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mode/m65s:default
+    make mode/m75s:default
 
 Flashing example for this keyboard:
 
-    make mode/m65s:default:flash
+    make mode/m75s:default:flash
 
 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).

From 485cf920b4f2d7bf5702573d008c5e435ee570a2 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 13 Feb 2022 22:24:52 -0800
Subject: [PATCH 627/867] Xenon: correct QMK Configurator key sequence (#16332)

---
 keyboards/xenon/info.json | 62 +++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/keyboards/xenon/info.json b/keyboards/xenon/info.json
index e0b5e95264..fd1146a1d4 100644
--- a/keyboards/xenon/info.json
+++ b/keyboards/xenon/info.json
@@ -6,64 +6,64 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"x":3, "y":0},
-        {"x":11, "y":0},
-        {"x":2, "y":0.25},
-        {"x":4, "y":0.25},
-        {"x":10, "y":0.25},
-        {"x":12, "y":0.25},
-        {"x":5, "y":0.5},
-        {"x":9, "y":0.5},
         {"x":0, "y":0.75},
         {"x":1, "y":0.75},
+        {"x":2, "y":0.25},
+        {"x":3, "y":0},
+        {"x":4, "y":0.25},
+        {"x":5, "y":0.5},
+        {"x":9, "y":0.5},
+        {"x":10, "y":0.25},
+        {"x":11, "y":0},
+        {"x":12, "y":0.25},
         {"x":13, "y":0.75},
         {"x":14, "y":0.75},
 
-        {"x":3, "y":1},
-        {"x":11, "y":1},
-        {"x":2, "y":1.25},
-        {"x":4, "y":1.25},
-        {"x":10, "y":1.25},
-        {"x":12, "y":1.25},
-        {"x":5, "y":1.5},
-        {"x":9, "y":1.5},
         {"x":0, "y":1.75},
         {"x":1, "y":1.75},
+        {"x":2, "y":1.25},
+        {"x":3, "y":1},
+        {"x":4, "y":1.25},
+        {"x":5, "y":1.5},
+        {"x":9, "y":1.5},
+        {"x":10, "y":1.25},
+        {"x":11, "y":1},
+        {"x":12, "y":1.25},
         {"x":13, "y":1.75},
         {"x":14, "y":1.75},
 
-        {"x":3, "y":2},
-        {"x":11, "y":2},
-        {"x":2, "y":2.25},
-        {"x":4, "y":2.25},
-        {"x":10, "y":2.25},
-        {"x":12, "y":2.25},
-        {"x":5, "y":2.5},
-        {"x":9, "y":2.5},
         {"x":0, "y":2.75},
         {"x":1, "y":2.75},
+        {"x":2, "y":2.25},
+        {"x":3, "y":2},
+        {"x":4, "y":2.25},
+        {"x":5, "y":2.5},
+        {"x":9, "y":2.5},
+        {"x":10, "y":2.25},
+        {"x":11, "y":2},
+        {"x":12, "y":2.25},
         {"x":13, "y":2.75},
         {"x":14, "y":2.75},
 
-        {"x":3, "y":3},
-        {"x":11, "y":3},
         {"x":2, "y":3.25},
+        {"x":3, "y":3},
         {"x":4, "y":3.25},
-        {"x":10, "y":3.25},
-        {"x":12, "y":3.25},
         {"x":5, "y":3.5},
         {"x":6, "y":3.5},
         {"x":8, "y":3.5},
         {"x":9, "y":3.5},
+        {"x":10, "y":3.25},
+        {"x":11, "y":3},
+        {"x":12, "y":3.25},
 
         {"x":3, "y":4},
-        {"x":11, "y":4},
         {"x":4, "y":4.25},
-        {"x":10, "y":4.25},
         {"x":5, "y":4.5},
         {"x":6, "y":4.5},
         {"x":8, "y":4.5},
-        {"x":9, "y":4.5}
+        {"x":9, "y":4.5},
+        {"x":10, "y":4.25},
+        {"x":11, "y":4}
       ]
     }
   }

From 23c238a1807c3e8c3bdd4eb432506a1469640df5 Mon Sep 17 00:00:00 2001
From: Erovia <Erovia@users.noreply.github.com>
Date: Mon, 14 Feb 2022 11:02:35 +0000
Subject: [PATCH 628/867] CLI: Minor additions #12795 (#16276)

---
 lib/python/qmk/cli/new/keyboard.py | 89 +++++++++++++-----------------
 lib/python/qmk/constants.py        | 39 +++++++++++++
 2 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py
index 59e781a932..8596994d38 100644
--- a/lib/python/qmk/cli/new/keyboard.py
+++ b/lib/python/qmk/cli/new/keyboard.py
@@ -15,48 +15,11 @@ from qmk.json_schema import load_jsonschema
 from qmk.path import keyboard
 from qmk.json_encoders import InfoJSONEncoder
 from qmk.json_schema import deep_update
+from qmk.constants import MCU2BOOTLOADER
 
 COMMUNITY = Path('layouts/default/')
 TEMPLATE = Path('data/templates/keyboard/')
 
-MCU2BOOTLOADER = {
-    "MKL26Z64": "halfkay",
-    "MK20DX128": "halfkay",
-    "MK20DX256": "halfkay",
-    "MK66FX1M0": "halfkay",
-    "STM32F042": "stm32-dfu",
-    "STM32F072": "stm32-dfu",
-    "STM32F103": "stm32duino",
-    "STM32F303": "stm32-dfu",
-    "STM32F401": "stm32-dfu",
-    "STM32F405": "stm32-dfu",
-    "STM32F407": "stm32-dfu",
-    "STM32F411": "stm32-dfu",
-    "STM32F446": "stm32-dfu",
-    "STM32G431": "stm32-dfu",
-    "STM32G474": "stm32-dfu",
-    "STM32L412": "stm32-dfu",
-    "STM32L422": "stm32-dfu",
-    "STM32L432": "stm32-dfu",
-    "STM32L433": "stm32-dfu",
-    "STM32L442": "stm32-dfu",
-    "STM32L443": "stm32-dfu",
-    "GD32VF103": "gd32v-dfu",
-    "WB32F3G71": "wb32-dfu",
-    "atmega16u2": "atmel-dfu",
-    "atmega32u2": "atmel-dfu",
-    "atmega16u4": "atmel-dfu",
-    "atmega32u4": "atmel-dfu",
-    "at90usb162": "atmel-dfu",
-    "at90usb646": "atmel-dfu",
-    "at90usb647": "atmel-dfu",
-    "at90usb1286": "atmel-dfu",
-    "at90usb1287": "atmel-dfu",
-    "atmega32a": "bootloadhid",
-    "atmega328p": "usbasploader",
-    "atmega328": "usbasploader",
-}
-
 # defaults
 schema = dotty(load_jsonschema('keyboard'))
 mcu_types = sorted(schema["properties.processor.enum"], key=str.casefold)
@@ -141,20 +104,42 @@ def augment_community_info(src, dest):
     dest.write_text(json.dumps(info, cls=InfoJSONEncoder))
 
 
+def _question(*args, **kwargs):
+    """Ugly workaround until 'milc' learns to display a repromt msg
+    """
+    # TODO: Remove this once milc.questions.question handles reprompt messages
+
+    reprompt = kwargs["reprompt"]
+    del kwargs["reprompt"]
+    validate = kwargs["validate"]
+    del kwargs["validate"]
+
+    prompt = args[0]
+    ret = None
+    while not ret:
+        ret = question(prompt, **kwargs)
+        if not validate(ret):
+            ret = None
+            prompt = reprompt
+
+    return ret
+
+
 def prompt_keyboard():
     prompt = """{fg_yellow}Name Your Keyboard Project{style_reset_all}
-
 For more infomation, see:
 https://docs.qmk.fm/#/hardware_keyboard_guidelines?id=naming-your-keyboardproject
 
-keyboard Name? """
+Keyboard Name? """
 
-    return question(prompt, validate=lambda x: not keyboard(x).exists())
+    errmsg = 'Keyboard already exists! Please choose a different name:'
+
+    return _question(prompt, reprompt=errmsg, validate=lambda x: not keyboard(x).exists())
 
 
 def prompt_user():
-    prompt = """{fg_yellow}Attribution{style_reset_all}
-
+    prompt = """
+{fg_yellow}Attribution{style_reset_all}
 Used for maintainer, copyright, etc
 
 Your GitHub Username? """
@@ -162,8 +147,8 @@ Your GitHub Username? """
 
 
 def prompt_name(def_name):
-    prompt = """{fg_yellow}More Attribution{style_reset_all}
-
+    prompt = """
+{fg_yellow}More Attribution{style_reset_all}
 Used for maintainer, copyright, etc
 
 Your Real Name? """
@@ -171,8 +156,8 @@ Your Real Name? """
 
 
 def prompt_layout():
-    prompt = """{fg_yellow}Pick Base Layout{style_reset_all}
-
+    prompt = """
+{fg_yellow}Pick Base Layout{style_reset_all}
 As a starting point, one of the common layouts can be used to bootstrap the process
 
 Default Layout? """
@@ -184,8 +169,8 @@ Default Layout? """
 
 
 def prompt_mcu():
-    prompt = """{fg_yellow}What Powers Your Project{style_reset_all}
-
+    prompt = """
+{fg_yellow}What Powers Your Project{style_reset_all}
 For more infomation, see:
 https://docs.qmk.fm/#/compatible_microcontrollers
 
@@ -199,7 +184,7 @@ MCU? """
 @cli.argument('-kb', '--keyboard', help='Specify the name for the new keyboard directory', arg_only=True, type=keyboard_name)
 @cli.argument('-l', '--layout', help='Community layout to bootstrap with', arg_only=True, type=layout_type)
 @cli.argument('-t', '--type', help='Specify the keyboard MCU type', arg_only=True, type=mcu_type)
-@cli.argument('-u', '--username', help='Specify your username (default from Git config)', arg_only=True)
+@cli.argument('-u', '--username', help='Specify your username (default from Git config)', dest='name')
 @cli.argument('-n', '--realname', help='Specify your real name if you want to use that. Defaults to username', arg_only=True)
 @cli.subcommand('Creates a new keyboard directory')
 def new_keyboard(cli):
@@ -209,8 +194,8 @@ def new_keyboard(cli):
     cli.echo('')
 
     kb_name = cli.args.keyboard if cli.args.keyboard else prompt_keyboard()
-    user_name = cli.args.username if cli.args.username else prompt_user()
-    real_name = cli.args.realname or cli.args.username if cli.args.realname or cli.args.username else prompt_name(user_name)
+    user_name = cli.config.new_keyboard.name if cli.config.new_keyboard.name else prompt_user()
+    real_name = cli.args.realname or cli.config.new_keyboard.name if cli.args.realname or cli.config.new_keyboard.name else prompt_name(user_name)
     default_layout = cli.args.layout if cli.args.layout else prompt_layout()
     mcu = cli.args.type if cli.args.type else prompt_mcu()
     bootloader = select_default_bootloader(mcu)
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index 00e453189f..e4b699cdb1 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -17,6 +17,45 @@ CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MK
 LUFA_PROCESSORS = 'at90usb162', 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None
 VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85'
 
+# Bootloaders of the supported processors
+MCU2BOOTLOADER = {
+    "MKL26Z64": "halfkay",
+    "MK20DX128": "halfkay",
+    "MK20DX256": "halfkay",
+    "MK66FX1M0": "halfkay",
+    "STM32F042": "stm32-dfu",
+    "STM32F072": "stm32-dfu",
+    "STM32F103": "stm32duino",
+    "STM32F303": "stm32-dfu",
+    "STM32F401": "stm32-dfu",
+    "STM32F405": "stm32-dfu",
+    "STM32F407": "stm32-dfu",
+    "STM32F411": "stm32-dfu",
+    "STM32F446": "stm32-dfu",
+    "STM32G431": "stm32-dfu",
+    "STM32G474": "stm32-dfu",
+    "STM32L412": "stm32-dfu",
+    "STM32L422": "stm32-dfu",
+    "STM32L432": "stm32-dfu",
+    "STM32L433": "stm32-dfu",
+    "STM32L442": "stm32-dfu",
+    "STM32L443": "stm32-dfu",
+    "GD32VF103": "gd32v-dfu",
+    "WB32F3G71": "wb32-dfu",
+    "atmega16u2": "atmel-dfu",
+    "atmega32u2": "atmel-dfu",
+    "atmega16u4": "atmel-dfu",
+    "atmega32u4": "atmel-dfu",
+    "at90usb162": "atmel-dfu",
+    "at90usb646": "atmel-dfu",
+    "at90usb647": "atmel-dfu",
+    "at90usb1286": "atmel-dfu",
+    "at90usb1287": "atmel-dfu",
+    "atmega32a": "bootloadhid",
+    "atmega328p": "usbasploader",
+    "atmega328": "usbasploader",
+}
+
 # Common format strings
 DATE_FORMAT = '%Y-%m-%d'
 DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S %Z'

From ac8bee7091d5a5fc55afb7054562c0d23f932880 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 15 Feb 2022 12:15:53 +1100
Subject: [PATCH 629/867] Fix multiple definition errors for trackball "boards"
 with no keys (#16350)

---
 keyboards/handwired/aball/aball.c                      |  1 -
 keyboards/handwired/aball/aball.h                      | 10 +---------
 keyboards/handwired/aball/keymaps/default/keymap.c     |  3 ++-
 .../ploopyco/trackball_nano/keymaps/default/keymap.c   |  3 ++-
 .../ploopyco/trackball_nano/keymaps/maddie/keymap.c    |  3 +++
 keyboards/ploopyco/trackball_nano/trackball_nano.c     |  2 --
 keyboards/ploopyco/trackball_nano/trackball_nano.h     |  2 +-
 7 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/keyboards/handwired/aball/aball.c b/keyboards/handwired/aball/aball.c
index 0b3d2f165c..3f12243ac6 100644
--- a/keyboards/handwired/aball/aball.c
+++ b/keyboards/handwired/aball/aball.c
@@ -15,4 +15,3 @@
  */
 
 #include "aball.h"
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { };
diff --git a/keyboards/handwired/aball/aball.h b/keyboards/handwired/aball/aball.h
index 8daf6bf680..d6cb21bafc 100644
--- a/keyboards/handwired/aball/aball.h
+++ b/keyboards/handwired/aball/aball.h
@@ -18,12 +18,4 @@
 
 #include "quantum.h"
 
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT(k00) {{ KC_NO }}
+#define LAYOUT(k00) {{ k00 }}
diff --git a/keyboards/handwired/aball/keymaps/default/keymap.c b/keyboards/handwired/aball/keymaps/default/keymap.c
index 00826a0262..1e9605e661 100644
--- a/keyboards/handwired/aball/keymaps/default/keymap.c
+++ b/keyboards/handwired/aball/keymaps/default/keymap.c
@@ -15,4 +15,5 @@
  */
 #include QMK_KEYBOARD_H
 
-
+// Dummy
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }};
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c
index 1140c30a1d..167cf2c064 100644
--- a/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c
@@ -20,4 +20,5 @@
 
 // safe range starts at `PLOOPY_SAFE_RANGE` instead.
 
-// placeholder file so it will compile
\ No newline at end of file
+// Dummy
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }};
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
index 9e33db3783..66d5441abd 100644
--- a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
+++ b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
@@ -24,6 +24,9 @@ uint8_t lock_state = 0;
 int8_t  delta_x        = 0;
 int8_t  delta_y        = 0;
 
+// Dummy
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }};
+
 void process_mouse_user(report_mouse_t *mouse_report, int8_t x, int8_t y) {
     if (scroll_enabled) {
         delta_x += x;
diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.c b/keyboards/ploopyco/trackball_nano/trackball_nano.c
index 2702f60557..e208a728cb 100644
--- a/keyboards/ploopyco/trackball_nano/trackball_nano.c
+++ b/keyboards/ploopyco/trackball_nano/trackball_nano.c
@@ -48,8 +48,6 @@
 #    define PLOOPY_DPI_DEFAULT 2
 #endif
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { };
-
 keyboard_config_t keyboard_config;
 uint16_t          dpi_array[] = PLOOPY_DPI_OPTIONS;
 #define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
diff --git a/keyboards/ploopyco/trackball_nano/trackball_nano.h b/keyboards/ploopyco/trackball_nano/trackball_nano.h
index 88725eab68..5f16e96c41 100644
--- a/keyboards/ploopyco/trackball_nano/trackball_nano.h
+++ b/keyboards/ploopyco/trackball_nano/trackball_nano.h
@@ -21,7 +21,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT(k00) {{ KC_NO }}
+#define LAYOUT(k00) {{ k00 }}
 
 typedef union {
   uint32_t raw;

From b0621223bc53f634a28243b874379e8e157878fd Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 15 Feb 2022 01:42:58 +0000
Subject: [PATCH 630/867] Various fixes for new-keyboard (#16358)

---
 data/templates/keyboard/config.h   | 20 ++++++++++++++++++++
 data/templates/keyboard/info.json  |  1 +
 lib/python/qmk/cli/new/keyboard.py | 10 +++++++++-
 lib/python/qmk/info.py             |  1 +
 4 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 data/templates/keyboard/config.h

diff --git a/data/templates/keyboard/config.h b/data/templates/keyboard/config.h
new file mode 100644
index 0000000000..b15c8d31f1
--- /dev/null
+++ b/data/templates/keyboard/config.h
@@ -0,0 +1,20 @@
+// Copyright %YEAR% %REAL_NAME% (@%USER_NAME%)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/data/templates/keyboard/info.json b/data/templates/keyboard/info.json
index 92718faf3a..41bc691313 100644
--- a/data/templates/keyboard/info.json
+++ b/data/templates/keyboard/info.json
@@ -1,6 +1,7 @@
 {
     "keyboard_name": "%KEYBOARD%",
     "maintainer": "%USER_NAME%",
+    "manufacturer": "%REAL_NAME%",
     "processor": "%MCU%",
     "bootloader": "%BOOTLOADER%",
     "diode_direction": "COL2ROW",
diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py
index 8596994d38..6fa9ad5b2c 100644
--- a/lib/python/qmk/cli/new/keyboard.py
+++ b/lib/python/qmk/cli/new/keyboard.py
@@ -208,7 +208,15 @@ def new_keyboard(cli):
         cli.log.error(f'Keyboard {{fg_cyan}}{kb_name}{{fg_reset}} already exists! Please choose a different name.')
         return 1
 
-    tokens = {'YEAR': str(date.today().year), 'KEYBOARD': kb_name, 'USER_NAME': user_name, 'REAL_NAME': real_name, 'LAYOUT': default_layout, 'MCU': mcu, 'BOOTLOADER': bootloader}
+    tokens = {  # Comment here is to force multiline formatting
+        'YEAR': str(date.today().year),
+        'KEYBOARD': kb_name,
+        'USER_NAME': user_name,
+        'REAL_NAME': real_name,
+        'LAYOUT': default_layout,
+        'MCU': mcu,
+        'BOOTLOADER': bootloader
+    }
 
     if cli.config.general.verbose:
         cli.log.info("Creating keyboard with:")
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 905f10ecc2..7e6f531f9c 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -49,6 +49,7 @@ def info_json(keyboard):
         'parse_errors': [],
         'parse_warnings': [],
         'maintainer': 'qmk',
+        'manufacturer': 'qmk',
     }
 
     # Populate the list of JSON keymaps

From fede569bbe66e2fa0b16cc3ac7b7e6b66daf9f86 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 15 Feb 2022 04:41:16 +0000
Subject: [PATCH 631/867] Allow NO_PIN within info.json (#16359)

---
 data/schemas/definitions.jsonschema | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 3f92e289a7..9fd503a108 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -51,6 +51,10 @@
     },
     "mcu_pin": {
         "oneOf": [
+            {
+                "type": "string",
+                "enum": ["NO_PIN"]
+            },
             {
                 "type": "string",
                 "pattern": "^[A-K]\\d{1,2}$"

From 16767312dbb101fe8d87d02655a78809e4b6330f Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 15 Feb 2022 04:45:32 +0000
Subject: [PATCH 632/867] Align docs to new-keyboard behaviour (#16357)

---
 docs/_summary.md                     |  11 +-
 docs/hardware_avr.md                 | 182 ---------------------------
 docs/index.html                      |   1 -
 docs/porting_your_keyboard_to_qmk.md | 163 ++++++++++++++++++++++++
 4 files changed, 169 insertions(+), 188 deletions(-)
 delete mode 100644 docs/hardware_avr.md
 create mode 100644 docs/porting_your_keyboard_to_qmk.md

diff --git a/docs/_summary.md b/docs/_summary.md
index e26d9ae210..8c83a216ab 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -37,7 +37,6 @@
   * Guides
     * [Customizing Functionality](custom_quantum_functions.md)
     * [Driver Installation with Zadig](driver_installation_zadig.md)
-    * [Easy Maker for One Offs](easy_maker.md)
     * [Keymap Overview](keymap.md)
     * Development Environments
       * [Docker Guide](getting_started_docker.md)
@@ -53,9 +52,6 @@
       * [Your Fork](newbs_git_using_your_master_branch.md)
       * [Merge Conflicts](newbs_git_resolving_merge_conflicts.md)
       * [Fixing Your Branch](newbs_git_resynchronize_a_branch.md)
-    * Keyboard Building
-      * [Hand Wiring Guide](hand_wire.md)
-      * [ISP Flashing Guide](isp_flashing_guide.md)
 
   * Simple Keycodes
     * [Full List](keycodes.md)
@@ -124,6 +120,12 @@
     * [Thermal Printer](feature_thermal_printer.md)
     * [Velocikey](feature_velocikey.md)
 
+  * Keyboard Building
+    * [Easy Maker for One Offs](easy_maker.md)
+    * [Porting Keyboards](porting_your_keyboard_to_qmk.md)
+    * [Hand Wiring Guide](hand_wire.md)
+    * [ISP Flashing Guide](isp_flashing_guide.md)
+
 * Developing QMK
   * [PR Checklist](pr_checklist.md)
   * Breaking Changes
@@ -134,7 +136,6 @@
 
   * C Development
     * [ARM Debugging Guide](arm_debugging.md)
-    * [AVR Processors](hardware_avr.md)
     * [Coding Conventions](coding_conventions_c.md)
     * [Compatible Microcontrollers](compatible_microcontrollers.md)
     * [Drivers](hardware_drivers.md)
diff --git a/docs/hardware_avr.md b/docs/hardware_avr.md
deleted file mode 100644
index 69aca2cf34..0000000000
--- a/docs/hardware_avr.md
+++ /dev/null
@@ -1,182 +0,0 @@
-# Keyboards with AVR Processors
-
-This page describes the support for AVR processors in QMK. AVR processors include the atmega32u4, atmega32u2, at90usb1286, and other processors from Atmel Corporation. AVR processors are 8-bit MCUs that are designed to be easy to work with. The most common AVR processors in keyboards have on-board USB and plenty of GPIO for supporting large keyboard matrices. They are the most popular MCU for use in keyboards today.
-
-If you have not yet you should read the [Keyboard Guidelines](hardware_keyboard_guidelines.md) to get a sense of how keyboards fit into QMK.
-
-## Adding Your AVR Keyboard to QMK
-
-QMK has a number of features to simplify working with AVR keyboards. For most keyboards you don't have to write a single line of code. To get started, run `qmk new-keyboard`:
-
-```
-$ qmk new-keyboard
-Ψ Generating a new QMK keyboard directory
-
-Keyboard Name: mycoolkeeb
-Keyboard Type:
-        1. avr
-        2. ps2avrgb
-Please enter your choice:  [1]
-Your Name: [John Smith]
-Ψ Copying base template files...
-Ψ Copying avr template files...
-Ψ Renaming keyboard.[ch] to mycoolkeeb.[ch]...
-Ψ Replacing %YEAR% with 2021...
-Ψ Replacing %KEYBOARD% with mycoolkeeb...
-Ψ Replacing %YOUR_NAME% with John Smith...
-
-Ψ Created a new keyboard called mycoolkeeb.
-Ψ To start working on things, `cd` into keyboards/mycoolkeeb,
-Ψ or open the directory in your preferred text editor.
-```
-
-This will create all the files needed to support your new keyboard, and populate the settings with default values. Now you just need to customize it for your keyboard.
-
-## `readme.md`
-
-This is where you'll describe your keyboard. Please follow the [Keyboard Readme Template](documentation_templates.md#keyboard-readmemd-template) when writing your `readme.md`. You're encouraged to place an image at the top of your `readme.md`, please use an external service such as [Imgur](https://imgur.com) to host the images.
-
-## `<keyboard>.c`
-
-This is where all the custom logic for your keyboard goes. Many keyboards do not need to put anything at all in here. You can learn more about writing custom logic in [Custom Quantum Functions](custom_quantum_functions.md).
-
-## `<keyboard>.h`
-
-This is the file you define your [Layout Macro(s)](feature_layouts.md) in. At minimum you should have a `#define LAYOUT` for your keyboard that looks something like this:
-
-```c
-#define LAYOUT(          \
-      k00, k01, k02,     \
-      k10,   k11         \
-) {                      \
-    { k00, k01,   k02 }, \
-    { k10, KC_NO, k11 }, \
-}
-```
-
-The first half of the `LAYOUT` pre-processor macro defines the physical arrangement of keys. The second half of the macro defines the matrix the switches are connected to. This allows you to have a physical arrangement of keys that differs from the wiring matrix.
-
-Each of the `k__` variables needs to be unique, and typically they follow the format `k<row><col>`.
-
-The physical matrix (the second half) must have a number of rows equaling `MATRIX_ROWS`, and each row must have exactly `MATRIX_COLS` elements in it. If you do not have this many physical keys you can use `KC_NO` to fill in the blank spots.
-
-## `config.h`
-
-The `config.h` file is where you configure the hardware and feature set for your keyboard. There are a lot of options that can be placed in that file, too many to list there. For a complete overview of available options see the [Config Options](config_options.md) page.
-
-### Hardware Configuration
-
-
-At the top of the `config.h` you'll find USB related settings. These control how your keyboard appears to the Operating System. If you don't have a good reason to change you should leave the `VENDOR_ID` as `0xFEED`. For the `PRODUCT_ID` you should pick a number that is not yet in use.
-
-Do change the `MANUFACTURER` and `PRODUCT` lines to accurately reflect your keyboard.
-
-```c
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    You
-#define PRODUCT         my_awesome_keyboard
-```
-
-?> Windows and macOS will display the `MANUFACTURER` and `PRODUCT` in the list of USB devices. `lsusb` on Linux instead prefers the values in the list maintained by the [USB ID Repository](http://www.linux-usb.org/usb-ids.html). By default, it will only use `MANUFACTURER` and `PRODUCT` if the list does not contain that `VENDOR_ID` / `PRODUCT_ID`. `sudo lsusb -v` will show the values reported by the device, and they are also present in kernel logs after plugging it in.
-
-### Keyboard Matrix Configuration
-
-The next section of the `config.h` file deals with your keyboard's matrix. The first thing you should set is the matrix's size. This is usually, but not always, the same number of rows and columns as the physical key arrangement.
-
-```c
-#define MATRIX_ROWS 2
-#define MATRIX_COLS 3
-```
-
-Once you've defined the size of your matrix you need to define which pins on your MCU are connected to rows and columns. To do so simply specify the names of those pins:
-
-```c
-#define MATRIX_ROW_PINS { D0, D5 }
-#define MATRIX_COL_PINS { F1, F0, B0 }
-#define UNUSED_PINS
-```
-
-The number of `MATRIX_ROW_PINS` entries must be the same as the number you assigned to `MATRIX_ROWS`, and likewise for `MATRIX_COL_PINS` and `MATRIX_COLS`. You do not have to specify `UNUSED_PINS`, but you can if you want to document what pins are open.
-
-Finally, you can specify the direction your diodes point. This can be `COL2ROW` or `ROW2COL`.
-
-```c
-#define DIODE_DIRECTION COL2ROW
-```
-
-#### Direct Pin Matrix
-To configure a keyboard where each switch is connected to a separate pin and ground instead of sharing row and column pins, use `DIRECT_PINS`. The mapping defines the pins of each switch in rows and columns, from left to right. Must conform to the sizes within `MATRIX_ROWS` and `MATRIX_COLS`, use `NO_PIN` to fill in blank spaces. Overrides the behaviour of `DIODE_DIRECTION`, `MATRIX_ROW_PINS` and `MATRIX_COL_PINS`.
-
-```c
-// #define MATRIX_ROW_PINS { D0, D5 }
-// #define MATRIX_COL_PINS { F1, F0, B0 }
-#define DIRECT_PINS { \
-    { F1, E6, B0, B2, B3 }, \
-    { F5, F0, B1, B7, D2 }, \
-    { F6, F7, C7, D5, D3 }, \
-    { B5, C6, B6, NO_PIN, NO_PIN } \
-}
-#define UNUSED_PINS
-
-/* COL2ROW, ROW2COL */
-//#define DIODE_DIRECTION
-```
-
-### Backlight Configuration
-
-QMK supports backlighting on most GPIO pins. A select few of these can be driven by the MCU in hardware. For more details see the [Backlight Documentation](feature_backlight.md).
-
-```c
-#define BACKLIGHT_PIN B7
-#define BACKLIGHT_LEVELS 3
-#define BACKLIGHT_BREATHING
-#define BREATHING_PERIOD 6
-```
-
-### Other Configuration Options
-
-There are a lot of features that can be configured or tuned in `config.h`. You should see the [Config Options](config_options.md) page for more details.
-
-## `rules.mk`
-
-You use the `rules.mk` file to tell QMK what files to build and what features to enable. If you are building around an atmega32u4 you can largely leave these defaults alone. If you are using another MCU you may have to tweak some parameters.
-
-### MCU Options
-
-These options tell the build system what CPU to build for. Be very careful if you change any of these settings, you can render your keyboard inoperable.
-
-```make
-MCU = atmega32u4
-F_CPU = 16000000
-ARCH = AVR8
-F_USB = $(F_CPU)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-```
-
-### Bootloaders
-
-The bootloader is a special section of your MCU that allows you to upgrade the code stored on the MCU. Think of it like a Rescue Partition for your keyboard. 
-
-#### Teensy Bootloader Example
-
-```make
-BOOTLOADER = halfkay
-```
-
-#### Atmel DFU Loader Example
-
-```make
-BOOTLOADER = atmel-dfu
-```
-
-#### Pro Micro Bootloader Example
-
-```make
-BOOTLOADER = caterina
-```
-
-### Build Options
-
-There are a number of features that can be turned on or off in `rules.mk`. See the [Config Options](config_options.md#feature-options) page for a detailed list and description.
diff --git a/docs/index.html b/docs/index.html
index f5a8dbbf12..e24b25e73a 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -39,7 +39,6 @@
         '/glossary': '/reference_glossary',
         '/key_lock': '/feature_key_lock',
         '/make_instructions': '/getting_started_make_guide',
-        '/porting_your_keyboard_to_qmk': '/hardware_avr',
         '/space_cadet_shift': '/feature_space_cadet_shift',
         '/getting_started_getting_help': '/support',
         '/tap_dance': '/feature_tap_dance',
diff --git a/docs/porting_your_keyboard_to_qmk.md b/docs/porting_your_keyboard_to_qmk.md
new file mode 100644
index 0000000000..22996547f5
--- /dev/null
+++ b/docs/porting_your_keyboard_to_qmk.md
@@ -0,0 +1,163 @@
+# Adding Your Keyboard to QMK
+
+This page describes the support for [Compatible Microcontrollers](compatible_microcontrollers.md) in QMK.
+
+If you have not yet you should read the [Keyboard Guidelines](hardware_keyboard_guidelines.md) to get a sense of how keyboards fit into QMK.
+
+
+QMK has a number of features to simplify working with keyboards. For most, you don't have to write a single line of code. To get started, run `qmk new-keyboard`:
+
+```
+$ qmk new-keyboard
+Ψ Generating a new QMK keyboard directory
+
+Name Your Keyboard Project
+For more infomation, see:
+https://docs.qmk.fm/#/hardware_keyboard_guidelines?id=naming-your-keyboardproject
+
+keyboard Name? mycoolkeeb
+
+Attribution
+Used for maintainer, copyright, etc
+
+Your GitHub Username?  [jsmith] 
+
+More Attribution
+Used for maintainer, copyright, etc
+
+Your Real Name?  [John Smith] 
+
+Pick Base Layout
+As a starting point, one of the common layouts can be used to bootstrap the process
+
+Default Layout? 
+	1. 60_ansi
+...
+	50. tkl_iso
+	51. none of the above
+Please enter your choice:  [51] 
+
+What Powers Your Project
+For more infomation, see:
+https://docs.qmk.fm/#/compatible_microcontrollers
+
+MCU? 
+	1. atmega32u4
+...
+	22. STM32F303
+Please enter your choice:  [12]
+Ψ Created a new keyboard called mycoolkeeb.
+Ψ To start working on things, `cd` into keyboards/mycoolkeeb,
+Ψ or open the directory in your preferred text editor.
+Ψ And build with qmk compile -kb mycoolkeeb -km default.
+```
+
+This will create all the files needed to support your new keyboard, and populate the settings with default values. Now you just need to customize it for your keyboard.
+
+## `readme.md`
+
+This is where you'll describe your keyboard. Please follow the [Keyboard Readme Template](documentation_templates.md#keyboard-readmemd-template) when writing your `readme.md`. You're encouraged to place an image at the top of your `readme.md`, please use an external service such as [Imgur](https://imgur.com) to host the images.
+
+## `info.json`
+
+The `info.json` file is where you configure the hardware and feature set for your keyboard. There are a lot of options that can be placed in that file, too many to list here. For a complete overview of available options see the [Data Driven Configuration Options](reference_info_json.md) page.
+
+### Hardware Configuration
+
+At the top of the `info.json` you'll find USB related settings. These control how your keyboard appears to the Operating System. If you don't have a good reason to change you should leave the `usb.vid` as `0xFEED`. For the `usb.pid` you should pick a number that is not yet in use.
+
+Do change the `manufacturer` and `keyboard_name` lines to accurately reflect your keyboard.
+
+```json
+    "keyboard_name": "my_awesome_keyboard",
+    "maintainer": "You",
+    "usb": {
+        "device_ver": "0x0001",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+```
+
+?> Windows and macOS will display the `manufacturer` and `keyboard_name` in the list of USB devices. `lsusb` on Linux instead prefers the values in the list maintained by the [USB ID Repository](http://www.linux-usb.org/usb-ids.html). By default, it will only use `manufacturer` and `keyboard_name` if the list does not contain that `usb.vid` / `usb.pid`. `sudo lsusb -v` will show the values reported by the device, and they are also present in kernel logs after plugging it in.
+
+
+### Matrix Configuration
+
+The next section of the `info` file deals with your keyboard's matrix. The first thing you should define is which pins on your MCU are connected to rows and columns. To do so simply specify the names of those pins:
+
+```json
+    "matrix_pins": {
+        "cols": ["C1", "C2", "C3", "C4"],
+        "rows": ["D1", "D2", "D3", "D4"]
+    },
+```
+
+The size of the `matrix_pins.cols` and `matrix_pins.rows` arrays infer the size of the matrix (previously `MATRIX_ROWS` and `MATRIX_COLS`). 
+
+Finally, you can specify the direction your diodes point. This can be `COL2ROW` or `ROW2COL`.
+
+```json
+    "diode_direction": "ROW2COL",
+```
+
+#### Direct Pin Matrix
+To configure a keyboard where each switch is connected to a separate pin and ground instead of sharing row and column pins, use `matrix_pins.direct`. The mapping defines the pins of each switch in rows and columns, from left to right. The size of the `matrix_pins.direct` array infers the size of the matrix. Use `NO_PIN` to fill in blank spaces. Overrides the behaviour of `diode_direction`, `matrix_pins.cols` and `matrix_pins.rows`.
+
+```json
+    "matrix_pins": {
+        "direct": [
+            ["F1", "E6", "B0", "B2", "B3" ],
+            ["F5", "F0", "B1", "B7", "D2" ],
+            ["F6", "F7", "C7", "D5", "D3" ],
+            ["B5", "C6", "B6", "NO_PIN", "NO_PIN"]
+        ]
+    },
+```
+
+### Layout macros
+
+Next is configuring Layout Macro(s). These define the physical arrangement of keys, and its position within the matrix that a switch are connected to. This allows you to have a physical arrangement of keys that differs from the wiring matrix.
+
+```json
+    "layouts": {
+        "LAYOUT_ortho_4x4": {
+            "layout": [
+                { "matrix": [0, 0], "x": 0, "y": 0 },
+                { "matrix": [0, 1], "x": 1, "y": 0 },
+                { "matrix": [0, 2], "x": 2, "y": 0 },
+                { "matrix": [0, 3], "x": 3, "y": 0 },
+                { "matrix": [1, 0], "x": 0, "y": 1 },
+                { "matrix": [1, 1], "x": 1, "y": 1 },
+                { "matrix": [1, 2], "x": 2, "y": 1 },
+                { "matrix": [1, 3], "x": 3, "y": 1 },
+                { "matrix": [2, 0], "x": 0, "y": 2 },
+                { "matrix": [2, 1], "x": 1, "y": 2 },
+                { "matrix": [2, 2], "x": 2, "y": 2 },
+                { "matrix": [2, 3], "x": 3, "y": 2 },
+                { "matrix": [3, 0], "x": 0, "y": 3 },
+                { "matrix": [3, 1], "x": 1, "y": 3 },
+                { "matrix": [3, 2], "x": 2, "y": 3 },
+                { "matrix": [3, 3], "x": 3, "y": 3 }
+            ]
+        }
+    }
+
+```
+
+In the above example, 
+
+* `LAYOUT_ortho_4x4` defines the name of the layout macro
+  * It must conform to [hardware_keyboard_guidelines.md#ltkeyboard_namehgt]
+* `"matrix": [0, 0]` defines the electrical position
+
+## Additional Configuration
+
+There are a lot of features that can be turned on or off, configured or tuned. Some of these have yet to be migrated over to [Data Driven Configuration](data_driven_config.md). The following sections cover the process for when an `info.json` option is unavailable.
+
+### Configuration Options
+
+For available options for `config.h`, you should see the [Config Options](config_options.md) page for more details.
+
+### Build Options
+
+For available options for `rules.mk`, see the [Config Options](config_options.md#feature-options) page for a detailed list and description.

From 92eb067a63a1cf238583fe4de89f18911ec467ec Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 15 Feb 2022 18:01:54 +1100
Subject: [PATCH 633/867] Add extra braces for trackball keymaps (#16361)

---
 keyboards/handwired/aball/keymaps/default/keymap.c         | 2 +-
 keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c | 2 +-
 keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/handwired/aball/keymaps/default/keymap.c b/keyboards/handwired/aball/keymaps/default/keymap.c
index 1e9605e661..122112c7c8 100644
--- a/keyboards/handwired/aball/keymaps/default/keymap.c
+++ b/keyboards/handwired/aball/keymaps/default/keymap.c
@@ -16,4 +16,4 @@
 #include QMK_KEYBOARD_H
 
 // Dummy
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}};
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c
index 167cf2c064..dfc19787a6 100644
--- a/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball_nano/keymaps/default/keymap.c
@@ -21,4 +21,4 @@
 // safe range starts at `PLOOPY_SAFE_RANGE` instead.
 
 // Dummy
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}};
diff --git a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
index 66d5441abd..2e3e1136bf 100644
--- a/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
+++ b/keyboards/ploopyco/trackball_nano/keymaps/maddie/keymap.c
@@ -25,7 +25,7 @@ int8_t  delta_x        = 0;
 int8_t  delta_y        = 0;
 
 // Dummy
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{ KC_NO }};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {{{ KC_NO }}};
 
 void process_mouse_user(report_mouse_t *mouse_report, int8_t x, int8_t y) {
     if (scroll_enabled) {

From da68083fdf6e3237a1b6f4d1c8fee70ee10386c2 Mon Sep 17 00:00:00 2001
From: Dan Nixon <dan@dan-nixon.com>
Date: Tue, 15 Feb 2022 17:47:35 +0000
Subject: [PATCH 634/867] Update USB VID and PID for Aya (#16363)

---
 keyboards/aya/config.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/aya/config.h b/keyboards/aya/config.h
index 1ad9716d45..0381f224ca 100644
--- a/keyboards/aya/config.h
+++ b/keyboards/aya/config.h
@@ -18,8 +18,8 @@
 
 #include "config_common.h"
 
-#define VENDOR_ID       0xBEEF
-#define PRODUCT_ID      0x0003
+#define VENDOR_ID       0x1209
+#define PRODUCT_ID      0x2925
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    DanNixon
 #define PRODUCT         Aya

From 5ff823d35f81e6098a561480220a787144c1208c Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 16 Feb 2022 17:46:48 +0000
Subject: [PATCH 635/867] Bodge for helix build failures (#16376)

---
 keyboards/helix/pico/split_util.h | 4 ++++
 keyboards/helix/rev1/split_util.h | 4 ++++
 keyboards/helix/rev2/split_util.h | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/keyboards/helix/pico/split_util.h b/keyboards/helix/pico/split_util.h
index b839ce6e3e..535949118a 100644
--- a/keyboards/helix/pico/split_util.h
+++ b/keyboards/helix/pico/split_util.h
@@ -14,3 +14,7 @@ void split_keyboard_setup(void);
 bool is_helix_master(void);
 
 void matrix_master_OLED_init (void);
+
+// stubs as this is handled by legacy code
+static inline void split_pre_init(void){}
+static inline void split_post_init(void){}
diff --git a/keyboards/helix/rev1/split_util.h b/keyboards/helix/rev1/split_util.h
index 807412cd38..d3edb70b94 100644
--- a/keyboards/helix/rev1/split_util.h
+++ b/keyboards/helix/rev1/split_util.h
@@ -15,3 +15,7 @@ bool has_usb(void);
 void keyboard_slave_loop(void);
 
 void matrix_master_OLED_init (void);
+
+// stubs as this is handled by legacy code
+static inline void split_pre_init(void){}
+static inline void split_post_init(void){}
diff --git a/keyboards/helix/rev2/split_util.h b/keyboards/helix/rev2/split_util.h
index b839ce6e3e..535949118a 100644
--- a/keyboards/helix/rev2/split_util.h
+++ b/keyboards/helix/rev2/split_util.h
@@ -14,3 +14,7 @@ void split_keyboard_setup(void);
 bool is_helix_master(void);
 
 void matrix_master_OLED_init (void);
+
+// stubs as this is handled by legacy code
+static inline void split_pre_init(void){}
+static inline void split_post_init(void){}

From 0d9a0d5d97bfbe39777c3f87ed7f67cdf9446176 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 16 Feb 2022 20:58:40 +0000
Subject: [PATCH 636/867] Align new-keyboard with recent schema updates
 (#16378)

---
 data/templates/keyboard/info.json    | 2 +-
 docs/porting_your_keyboard_to_qmk.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/templates/keyboard/info.json b/data/templates/keyboard/info.json
index 41bc691313..777ceb3bd8 100644
--- a/data/templates/keyboard/info.json
+++ b/data/templates/keyboard/info.json
@@ -12,7 +12,7 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x0000",
-        "device_ver": "0x0001"
+        "device_version": "1.0.0"
     },
     "features": {
         "bootmagic_lite": true,
diff --git a/docs/porting_your_keyboard_to_qmk.md b/docs/porting_your_keyboard_to_qmk.md
index 22996547f5..484d079ea6 100644
--- a/docs/porting_your_keyboard_to_qmk.md
+++ b/docs/porting_your_keyboard_to_qmk.md
@@ -72,9 +72,9 @@ Do change the `manufacturer` and `keyboard_name` lines to accurately reflect you
     "keyboard_name": "my_awesome_keyboard",
     "maintainer": "You",
     "usb": {
-        "device_ver": "0x0001",
+        "vid": "0xFEED",
         "pid": "0x0000",
-        "vid": "0xFEED"
+        "device_version": "1.0.0"
     },
 ```
 

From 7e00fcd7bc8bca8b0f78f55a8827247f503a58ce Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Fri, 18 Feb 2022 01:18:16 +0900
Subject: [PATCH 637/867] [Keyboard] Remove Helix/rev1 (#16389)

---
 keyboards/helix/rev1/.noci                    |   0
 keyboards/helix/rev1/config.h                 |  86 ----
 keyboards/helix/rev1/info.json                |  80 ---
 .../helix/rev1/keymaps/OLED_sample/config.h   |  51 --
 .../helix/rev1/keymaps/OLED_sample/keymap.c   | 471 ------------------
 .../helix/rev1/keymaps/OLED_sample/readme.md  |  25 -
 .../helix/rev1/keymaps/OLED_sample/rules.mk   |   4 -
 .../rev1/keymaps/OLED_sample/serial_config.h  |   9 -
 keyboards/helix/rev1/keymaps/default/config.h |  34 --
 keyboards/helix/rev1/keymaps/default/keymap.c | 342 -------------
 keyboards/helix/rev1/matrix.c                 | 308 ------------
 keyboards/helix/rev1/rev1.c                   |  10 -
 keyboards/helix/rev1/rev1.h                   | 129 -----
 keyboards/helix/rev1/rules.mk                 |  11 -
 keyboards/helix/rev1/serial_config.h          |   9 -
 keyboards/helix/rev1/split_util.c             |  86 ----
 keyboards/helix/rev1/split_util.h             |  17 -
 17 files changed, 1672 deletions(-)
 delete mode 100644 keyboards/helix/rev1/.noci
 delete mode 100644 keyboards/helix/rev1/config.h
 delete mode 100644 keyboards/helix/rev1/info.json
 delete mode 100644 keyboards/helix/rev1/keymaps/OLED_sample/config.h
 delete mode 100644 keyboards/helix/rev1/keymaps/OLED_sample/keymap.c
 delete mode 100644 keyboards/helix/rev1/keymaps/OLED_sample/readme.md
 delete mode 100644 keyboards/helix/rev1/keymaps/OLED_sample/rules.mk
 delete mode 100644 keyboards/helix/rev1/keymaps/OLED_sample/serial_config.h
 delete mode 100644 keyboards/helix/rev1/keymaps/default/config.h
 delete mode 100644 keyboards/helix/rev1/keymaps/default/keymap.c
 delete mode 100644 keyboards/helix/rev1/matrix.c
 delete mode 100644 keyboards/helix/rev1/rev1.c
 delete mode 100644 keyboards/helix/rev1/rev1.h
 delete mode 100644 keyboards/helix/rev1/rules.mk
 delete mode 100644 keyboards/helix/rev1/serial_config.h
 delete mode 100644 keyboards/helix/rev1/split_util.c
 delete mode 100644 keyboards/helix/rev1/split_util.h

diff --git a/keyboards/helix/rev1/.noci b/keyboards/helix/rev1/.noci
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/helix/rev1/config.h b/keyboards/helix/rev1/config.h
deleted file mode 100644
index 19d1e3be65..0000000000
--- a/keyboards/helix/rev1/config.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x3265
-#define PRODUCT_ID      0x8000
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Yushakobo
-#define PRODUCT         Helix Alpha
-
-#include "serial_config.h"
-
-#define HELIX_ROWS 5
-
-/* key matrix size */
-// Rows are doubled-up
-#if HELIX_ROWS == 3
-  #define MATRIX_ROWS 6
-  #define MATRIX_ROW_PINS { D7, E6, B4 }
-#elif HELIX_ROWS == 4
-  #define MATRIX_ROWS 8
-  #define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#elif HELIX_ROWS == 5
-  #define MATRIX_ROWS 10
-  #define MATRIX_ROW_PINS { D7, E6, B4, B5, D4 }
-#else
-  #error "expected HELIX_ROWS 3 or 4 or 5"
-#endif
-#define MATRIX_COLS 6
-
-// wiring of each half
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-
-/* 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 D3
-
-#define RGBLED_NUM 12    // Number of LEDs
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/helix/rev1/info.json b/keyboards/helix/rev1/info.json
deleted file mode 100644
index c52da08974..0000000000
--- a/keyboards/helix/rev1/info.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "keyboard_name": "Helix rev. 1",
-    "url": "https://github.com/MakotoKurauchi/helix",
-    "maintainer": "MakotoKurauchi",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
-
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
-
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
-
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
-
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
-
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
-                {"x": 11, "y": 3},
-                {"x": 12, "y": 3},
-
-                {"x": 0, "y": 4},
-                {"x": 1, "y": 4},
-                {"x": 2, "y": 4},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 4},
-                {"x": 9, "y": 4},
-                {"x": 10, "y": 4},
-                {"x": 11, "y": 4},
-                {"x": 12, "y": 4}
-            ]
-        }
-    }
-}
diff --git a/keyboards/helix/rev1/keymaps/OLED_sample/config.h b/keyboards/helix/rev1/keymaps/OLED_sample/config.h
deleted file mode 100644
index 5e8989d96f..0000000000
--- a/keyboards/helix/rev1/keymaps/OLED_sample/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-/* Use I2C or Serial */
-
-#define USE_I2C
-#define USE_SERIAL
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define _MASTER_RIGHT
-// #define EE_HANDS
-
-#define SSD1306OLED
-
-#define USE_SERIAL_PD2
-
-#define TAPPING_FORCE_HOLD
-#define TAPPING_TERM 100
-
-
-#undef RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 6
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
-
-#endif
diff --git a/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c b/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c
deleted file mode 100644
index 6838b90e5e..0000000000
--- a/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c
+++ /dev/null
@@ -1,471 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "bootloader.h"
-#include <LUFA/Drivers/Peripheral/TWI.h>
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
-extern keymap_config_t keymap_config;
-
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-
-
-// 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 _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-  BACKLIT,
-  RGBLED_TOGGLE,
-  RGBLED_STEP_MODE,
-  RGBLED_INCREASE_HUE,
-  RGBLED_DECREASE_HUE,
-  RGBLED_INCREASE_SAT,
-  RGBLED_DECREASE_SAT,
-  RGBLED_INCREASE_VAL,
-  RGBLED_DECREASE_VAL,
-  M_SAMPLE
-};
-
-#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT( \
-      KC_GRV,  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_DEL, \
-      KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-      ),
-
-  /* Colemak
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_COLEMAK] = LAYOUT( \
-      KC_GRV,  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_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL, \
-      KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, \
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-      ),
-
-  /* Dvorak
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_DVORAK] = LAYOUT( \
-      KC_GRV,  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_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL, \
-      KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
-      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT , \
-      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-      ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT( \
-      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
-      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL, \
-      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
-      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-      ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT( \
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL, \
-      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
-      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______, \
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-      ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------------------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] =  LAYOUT( \
-      KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, \
-      _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
-      _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
-      )
-};
-
-#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-
-  [_QWERTY] = LAYOUT( \
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL, \
-      KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-      ),
-
-  /* Colemak
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_COLEMAK] = LAYOUT( \
-      KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC, \
-      KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, \
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT , \
-      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-      ),
-
-  /* Dvorak
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_DVORAK] = LAYOUT( \
-      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC, \
-      KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, \
-      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT , \
-      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT \
-      ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT( \
-      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
-      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
-      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-      ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT( \
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
-      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
-      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______, \
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \
-      ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------------------------------------------------.
-   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] =  LAYOUT( \
-      _______, RESET,   _______, M_SAMPLE, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \
-      _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______, \
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
-      )
-};
-
-#else
-#error "undefined keymaps"
-#endif
-
-
-#ifdef AUDIO_ENABLE
-
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-#endif
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-int RGB_current_mode;
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    rgblight_mode(RGB_current_mode);
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
-  }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-          //not sure how to have keyboard check mode and set it to a variable, so my work around
-          //uses another variable that would be set to true after the first time a reactive key is pressed.
-        if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-        } else {
-          TOG_STATUS = !TOG_STATUS;
-          rgblight_mode(RGBLIGHT_MODE_SNAKE + 1);
-        }
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        rgblight_mode(RGB_current_mode);   // revert RGB to initial mode prior to RGB mode change
-        TOG_STATUS = false;
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        //not sure how to have keyboard check mode and set it to a variable, so my work around
-        //uses another variable that would be set to true after the first time a reactive key is pressed.
-        if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
-        } else {
-          TOG_STATUS = !TOG_STATUS;
-          rgblight_mode(RGBLIGHT_MODE_SNAKE);
-        }
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        rgblight_mode(RGB_current_mode);  // revert RGB to initial mode prior to RGB mode change
-        layer_off(_RAISE);
-        TOG_STATUS = false;
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-        break;
-    case BACKLIT:
-      if (record->event.pressed) {
-        register_code(KC_RSFT);
-        #ifdef BACKLIGHT_ENABLE
-          backlight_step();
-        #endif
-      } else {
-        unregister_code(KC_RSFT);
-      }
-      return false;
-      break;
-      //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
-    case RGB_MOD:
-      if (record->event.pressed) {
-        rgblight_mode(RGB_current_mode);
-        rgblight_step();
-        RGB_current_mode = rgblight_config.mode;
-      }
-      return false;
-      break;
-    case M_SAMPLE:
-      if (record->event.pressed) {
-        SEND_STRING("hello world");
-      }
-      return false;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-    #ifdef AUDIO_ENABLE
-        startup_user();
-    #endif
-    RGB_current_mode = rgblight_config.mode;
-}
-
-//SSD1306 OLED init and update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-void matrix_master_OLED_init (void) {
-    TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 800000));
-    iota_gfx_init(0);   // turns on the display
-}
-
-void matrix_scan_user(void) {
-     iota_gfx_task();  // this is what updates the display continuously
-}
-#endif
-
-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
-    _delay_ms(20); // gets rid of tick
-}
-
-void shutdown_user()
-{
-    _delay_ms(150);
-    stop_all_notes();
-}
-
-void music_on_user(void)
-{
-    music_scale_user();
-}
-
-void music_scale_user(void)
-{
-    PLAY_SONG(music_scale);
-}
-
-#endif
diff --git a/keyboards/helix/rev1/keymaps/OLED_sample/readme.md b/keyboards/helix/rev1/keymaps/OLED_sample/readme.md
deleted file mode 100644
index 02888855b8..0000000000
--- a/keyboards/helix/rev1/keymaps/OLED_sample/readme.md
+++ /dev/null
@@ -1,25 +0,0 @@
-SSD1306 OLED Display via I2C
-======
-
-Features
---------
-
-Some features supported by the firmware:
-
-
-* I2C connection between the two halves is required as the OLED display will use this connection as well. Note this
-  requires pull-up resistors on the data and clock lines.
-* OLED display will connect from either side
-
-
-Wiring
-------
-
-
-Work in progress...
-
-
-OLED Configuration
--------------------------------
-
-Work in progress...
diff --git a/keyboards/helix/rev1/keymaps/OLED_sample/rules.mk b/keyboards/helix/rev1/keymaps/OLED_sample/rules.mk
deleted file mode 100644
index 69170e35c3..0000000000
--- a/keyboards/helix/rev1/keymaps/OLED_sample/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRAKEY_ENABLE = yes
-NKRO_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-SWAP_HANDS_ENABLE = no
diff --git a/keyboards/helix/rev1/keymaps/OLED_sample/serial_config.h b/keyboards/helix/rev1/keymaps/OLED_sample/serial_config.h
deleted file mode 100644
index f56951e707..0000000000
--- a/keyboards/helix/rev1/keymaps/OLED_sample/serial_config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-//// #error rev1/keymaps/OLED_sample serial config
-
-#ifndef SOFT_SERIAL_PIN
-/* Soft Serial defines */
-#define SOFT_SERIAL_PIN D2
-
-#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-#define SERIAL_MASTER_BUFFER_LENGTH 0
-#endif
diff --git a/keyboards/helix/rev1/keymaps/default/config.h b/keyboards/helix/rev1/keymaps/default/config.h
deleted file mode 100644
index 0f81f5f7be..0000000000
--- a/keyboards/helix/rev1/keymaps/default/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// place overrides here
-
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
-// #define USE_I2C
-
-/* Select hand configuration */
-
-#define MASTER_LEFT
-// #define _MASTER_RIGHT
-// #define EE_HANDS
diff --git a/keyboards/helix/rev1/keymaps/default/keymap.c b/keyboards/helix/rev1/keymaps/default/keymap.c
deleted file mode 100644
index 9cfa0e3617..0000000000
--- a/keyboards/helix/rev1/keymaps/default/keymap.c
+++ /dev/null
@@ -1,342 +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 _QWERTY 0
-#define _COLEMAK 1
-#define _DVORAK 2
-#define _LOWER 3
-#define _RAISE 4
-#define _ADJUST 16
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  COLEMAK,
-  DVORAK,
-  LOWER,
-  RAISE,
-  ADJUST,
-};
-
-#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT(
-      KC_GRV,  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_DEL,
-      KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-      ),
-
-  /* Colemak
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_COLEMAK] = LAYOUT(
-      KC_GRV,  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_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_DEL,
-      KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-      ),
-
-  /* Dvorak
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_DVORAK] = LAYOUT(
-      KC_GRV,  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_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_DEL,
-      KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-      ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT(
-      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
-      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-      ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT(
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
-      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-      ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------------------------------------------------.
-   * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] =  LAYOUT(
-      KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-      _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-      _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-      )
-};
-
-#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Qwerty
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-
-  [_QWERTY] = LAYOUT(
-      KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
-      KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-      ),
-
-  /* Colemak
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_COLEMAK] = LAYOUT(
-      KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
-      KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-      KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-      ),
-
-  /* Dvorak
-   * ,-----------------------------------------------------------------------------------.
-   * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Adjust| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_DVORAK] = LAYOUT(
-      KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
-      KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
-      KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
-      ADJUST,  KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-      ),
-
-  /* Lower
-   * ,-----------------------------------------------------------------------------------.
-   * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |     |    \  |  |   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | |      |      |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_LOWER] = LAYOUT(
-      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
-      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
-      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-      ),
-
-  /* Raise
-   * ,-----------------------------------------------------------------------------------.
-   * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |      |      |Enter |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      | Next | Vol- | Vol+ | Play |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_RAISE] = LAYOUT(
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-      KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-      _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-      ),
-
-  /* Adjust (Lower + Raise)
-   * ,-----------------------------------------------------------------------------------.
-   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |
-   * |------+------+------+------+------+-------------+------+------+------+------+------|
-   * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |
-   * |------+------+------+------+------+------|------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |             |      |      |      |      |      |
-   * `-----------------------------------------------------------------------------------'
-   */
-  [_ADJUST] =  LAYOUT(
-      _______, RESET,   _______, M_SAMPLE, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
-      _______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-      )
-};
-
-#else
-#error "undefined keymaps"
-#endif
-
-#ifdef AUDIO_ENABLE
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-#endif
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-      break;
-    case COLEMAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
-        persistent_default_layer_set(1UL<<_COLEMAK);
-      }
-      return false;
-      break;
-    case DVORAK:
-      if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
-        persistent_default_layer_set(1UL<<_DVORAK);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-      break;
-    case ADJUST:
-      if (record->event.pressed) {
-        layer_on(_ADJUST);
-      } else {
-        layer_off(_ADJUST);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/helix/rev1/matrix.c b/keyboards/helix/rev1/matrix.c
deleted file mode 100644
index aa2cc76905..0000000000
--- a/keyboards/helix/rev1/matrix.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- * scan matrix
- */
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include "print.h"
-#include "debug.h"
-#include "util.h"
-#include "matrix.h"
-#include "split_util.h"
-#include "config.h"
-#include "quantum.h"
-
-#ifdef USE_MATRIX_I2C
-#  include "i2c.h"
-#else // USE_SERIAL
-#  include "serial.h"
-#endif
-
-#ifndef DEBOUNCE
-#  define DEBOUNCE	5
-#endif
-
-#define ERROR_DISCONNECT_COUNT 5
-
-static uint8_t debouncing = DEBOUNCE;
-static const int ROWS_PER_HAND = MATRIX_ROWS/2;
-static uint8_t error_count = 0;
-
-static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-
-static matrix_row_t read_cols(void);
-static void init_cols(void);
-static void unselect_rows(void);
-static void select_row(uint8_t row);
-
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void)
-{
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
-}
-
-void matrix_init(void)
-{
-    debug_enable = true;
-    debug_matrix = true;
-    debug_mouse = true;
-    // initialize row and col
-    unselect_rows();
-    init_cols();
-
-    setPinOutput(B0);
-    setPinOutput(D5);
-
-    // initialize matrix state: all keys off
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
-        matrix[i] = 0;
-        matrix_debouncing[i] = 0;
-    }
-
-    matrix_init_quantum();
-}
-
-uint8_t _matrix_scan(void)
-{
-    // Right hand is stored after the left in the matirx so, we need to offset it
-    int offset = isLeftHand ? 0 : (ROWS_PER_HAND);
-
-    for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
-        select_row(i);
-        _delay_us(30);  // without this wait read unstable value.
-        matrix_row_t cols = read_cols();
-        if (matrix_debouncing[i+offset] != cols) {
-            matrix_debouncing[i+offset] = cols;
-            debouncing = DEBOUNCE;
-        }
-        unselect_rows();
-    }
-
-    if (debouncing) {
-        if (--debouncing) {
-            _delay_ms(1);
-        } else {
-            for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
-                matrix[i+offset] = matrix_debouncing[i+offset];
-            }
-        }
-    }
-
-    return 1;
-}
-
-#ifdef USE_MATRIX_I2C
-
-// Get rows from other half over i2c
-int i2c_transaction(void) {
-    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-
-    int err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE);
-    if (err) goto i2c_error;
-
-    // start of matrix stored at 0x00
-    err = i2c_master_write(0x00);
-    if (err) goto i2c_error;
-
-    // Start read
-    err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
-    if (err) goto i2c_error;
-
-    if (!err) {
-        int i;
-        for (i = 0; i < ROWS_PER_HAND-1; ++i) {
-            matrix[slaveOffset+i] = i2c_master_read(I2C_ACK);
-        }
-        matrix[slaveOffset+i] = i2c_master_read(I2C_NACK);
-        i2c_master_stop();
-    } else {
-i2c_error: // the cable is disconnceted, or something else went wrong
-        i2c_reset_state();
-        return err;
-    }
-
-    return 0;
-}
-
-#else // USE_SERIAL
-
-int serial_transaction(void) {
-    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-
-    if (serial_update_buffers()) {
-        return 1;
-    }
-
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        matrix[slaveOffset+i] = serial_slave_buffer[i];
-    }
-    return 0;
-}
-#endif
-
-uint8_t matrix_scan(void)
-{
-    int ret = _matrix_scan();
-
-
-
-#ifdef USE_MATRIX_I2C
-    if( i2c_transaction() ) {
-#else // USE_SERIAL
-    if( serial_transaction() ) {
-#endif
-        // turn on the indicator led when halves are disconnected
-        writePinLow(D5);
-
-        error_count++;
-
-        if (error_count > ERROR_DISCONNECT_COUNT) {
-            // reset other half if disconnected
-            int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-            for (int i = 0; i < ROWS_PER_HAND; ++i) {
-                matrix[slaveOffset+i] = 0;
-            }
-        }
-    } else {
-        // turn off the indicator led on no error
-        writePinHigh(D5);
-        error_count = 0;
-    }
-    matrix_scan_quantum();
-    return ret;
-}
-
-void matrix_slave_scan(void) {
-    _matrix_scan();
-
-    int offset = (isLeftHand) ? 0 : (MATRIX_ROWS / 2);
-
-#ifdef USE_MATRIX_I2C
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        /* i2c_slave_buffer[i] = matrix[offset+i]; */
-        i2c_slave_buffer[i] = matrix[offset+i];
-    }
-#else // USE_SERIAL
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        serial_slave_buffer[i] = matrix[offset+i];
-    }
-#endif
-}
-
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print("\nr/c 0123456789ABCDEF\n");
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_bin_reverse16(matrix_get_row(row));
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
-static void  init_cols(void)
-{
-    for(int x = 0; x < MATRIX_COLS; x++) {
-        _SFR_IO8((col_pins[x] >> 4) + 1) &=  ~_BV(col_pins[x] & 0xF);
-        _SFR_IO8((col_pins[x] >> 4) + 2) |= _BV(col_pins[x] & 0xF);
-    }
-}
-
-static matrix_row_t read_cols(void)
-{
-    matrix_row_t result = 0;
-    for(int x = 0; x < MATRIX_COLS; x++) {
-        result |= (_SFR_IO8(col_pins[x] >> 4) & _BV(col_pins[x] & 0xF)) ? 0 : (1 << x);
-    }
-    return result;
-}
-
-static void unselect_rows(void)
-{
-    for(int x = 0; x < ROWS_PER_HAND; x++) {
-        _SFR_IO8((row_pins[x] >> 4) + 1) &=  ~_BV(row_pins[x] & 0xF);
-        _SFR_IO8((row_pins[x] >> 4) + 2) |= _BV(row_pins[x] & 0xF);
-    }
-}
-
-static void select_row(uint8_t row)
-{
-    _SFR_IO8((row_pins[row] >> 4) + 1) |=  _BV(row_pins[row] & 0xF);
-    _SFR_IO8((row_pins[row] >> 4) + 2) &= ~_BV(row_pins[row] & 0xF);
-}
diff --git a/keyboards/helix/rev1/rev1.c b/keyboards/helix/rev1/rev1.c
deleted file mode 100644
index d053f0de17..0000000000
--- a/keyboards/helix/rev1/rev1.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "helix.h"
-
-
-#ifdef SSD1306OLED
-#include "ssd1306.h"
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	return process_record_gfx(keycode,record) && process_record_user(keycode, record);
-}
-#endif
diff --git a/keyboards/helix/rev1/rev1.h b/keyboards/helix/rev1/rev1.h
deleted file mode 100644
index 7db27bcca0..0000000000
--- a/keyboards/helix/rev1/rev1.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#pragma once
-
-#include "helix.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-    #include <avr/io.h>
-    #include <avr/interrupt.h>
-#endif
-#endif
-
-#if MATRIX_ROWS == 6 // HELIX_ROWS == 3
-    #ifndef FLIP_HALF
-        // Standard Keymap
-        // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
-        #define LAYOUT( \
-            L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-            L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-            L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \
-        ) { \
-            { L00, L01, L02, L03, L04, L05 }, \
-            { L10, L11, L12, L13, L14, L15 }, \
-            { L20, L21, L22, L23, L24, L25 }, \
-            { R05, R04, R03, R02, R01, R00 }, \
-            { R15, R14, R13, R12, R11, R10 }, \
-            { R25, R24, R23, R22, R21, R20 } \
-        }
-    #else
-        // Keymap with right side flipped
-        // (TRRS jack on both halves are to the right)
-        #define LAYOUT( \
-            L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-            L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-            L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \
-        ) { \
-            { L00, L01, L02, L03, L04, L05 }, \
-            { L10, L11, L12, L13, L14, L15 }, \
-            { L20, L21, L22, L23, L24, L25 }, \
-            { R00, R01, R02, R03, R04, R05 }, \
-            { R10, R11, R12, R13, R14, R15 }, \
-            { R20, R21, R22, R23, R24, R25 } \
-        }
-    #endif
-#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4
-    #ifndef FLIP_HALF
-        // Standard Keymap
-        // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
-        #define LAYOUT( \
-            L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-            L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-            L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-            L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-        ) { \
-            { L00, L01, L02, L03, L04, L05 }, \
-            { L10, L11, L12, L13, L14, L15 }, \
-            { L20, L21, L22, L23, L24, L25 }, \
-            { L30, L31, L32, L33, L34, L35 }, \
-            { R05, R04, R03, R02, R01, R00 }, \
-            { R15, R14, R13, R12, R11, R10 }, \
-            { R25, R24, R23, R22, R21, R20 }, \
-            { R35, R34, R33, R32, R31, R30 } \
-        }
-    #else
-        // Keymap with right side flipped
-        // (TRRS jack on both halves are to the right)
-        #define LAYOUT( \
-            L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-            L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-            L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-            L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
-        ) { \
-            { L00, L01, L02, L03, L04, L05 }, \
-            { L10, L11, L12, L13, L14, L15 }, \
-            { L20, L21, L22, L23, L24, L25 }, \
-            { L30, L31, L32, L33, L34, L35 }, \
-            { R00, R01, R02, R03, R04, R05 }, \
-            { R10, R11, R12, R13, R14, R15 }, \
-            { R20, R21, R22, R23, R24, R25 }, \
-            { R30, R31, R32, R33, R34, R35 } \
-        }
-    #endif
-#elif MATRIX_ROWS == 10 // HELIX_ROWS == 5
-    #ifndef FLIP_HALF
-        // Standard Keymap
-        // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-    L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
-    L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
-) { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { L30, L31, L32, L33, L34, L35 }, \
-    { L40, L41, L42, L43, L44, L45 }, \
-    { R05, R04, R03, R02, R01, R00 }, \
-    { R15, R14, R13, R12, R11, R10 }, \
-    { R25, R24, R23, R22, R21, R20 }, \
-    { R35, R34, R33, R32, R31, R30 }, \
-    { R45, R44, R43, R42, R41, R40 } \
-}
-    #else
-        // Keymap with right side flipped
-        // (TRRS jack on both halves are to the right)
-        #define LAYOUT( \
-            L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
-            L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
-            L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
-            L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
-            L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
-        ) { \
-            { L00, L01, L02, L03, L04, L05 }, \
-            { L10, L11, L12, L13, L14, L15 }, \
-            { L20, L21, L22, L23, L24, L25 }, \
-            { L30, L31, L32, L33, L34, L35 }, \
-            { L40, L41, L42, L43, L44, L45 }, \
-            { R00, R01, R02, R03, R04, R05 }, \
-            { R10, R11, R12, R13, R14, R15 }, \
-            { R20, R21, R22, R23, R24, R25 }, \
-            { R30, R31, R32, R33, R34, R35 }, \
-            { R40, R41, R42, R43, R44, R45 } \
-        }
-    #endif
-#else
-    #error "expected HELIX_ROWS 3 or 4 or 5"
-#endif
diff --git a/keyboards/helix/rev1/rules.mk b/keyboards/helix/rev1/rules.mk
deleted file mode 100644
index 1418f01786..0000000000
--- a/keyboards/helix/rev1/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-SRC += local_drivers/i2c.c
-SRC += local_drivers/serial.c
-SRC += local_drivers/ssd1306.c
-KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers
-
-CUSTOM_MATRIX = yes
-
-SRC += rev1/matrix.c
-SRC += rev1/split_util.c
-
-BACKLIGHT_ENABLE = no
diff --git a/keyboards/helix/rev1/serial_config.h b/keyboards/helix/rev1/serial_config.h
deleted file mode 100644
index 32218f9bbe..0000000000
--- a/keyboards/helix/rev1/serial_config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/// #error rev1 serial config
-
-#ifndef SOFT_SERIAL_PIN
-/* Soft Serial defines */
-#define SOFT_SERIAL_PIN D0
-
-#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-#define SERIAL_MASTER_BUFFER_LENGTH 0
-#endif
diff --git a/keyboards/helix/rev1/split_util.c b/keyboards/helix/rev1/split_util.c
deleted file mode 100644
index 5debd6e00b..0000000000
--- a/keyboards/helix/rev1/split_util.c
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/power.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <avr/eeprom.h>
-#include "split_util.h"
-#include "matrix.h"
-#include "keyboard.h"
-#include "config.h"
-
-#ifdef USE_MATRIX_I2C
-#  include "i2c.h"
-#else
-#  include "serial.h"
-#endif
-
-volatile bool isLeftHand = true;
-
-static void setup_handedness(void) {
-  #ifdef EE_HANDS
-    isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS);
-  #else
-    // I2C_MASTER_RIGHT is deprecated, use MASTER_RIGHT instead, since this works for both serial and i2c
-    #if defined(I2C_MASTER_RIGHT) || defined(MASTER_RIGHT)
-      isLeftHand = !has_usb();
-    #else
-      isLeftHand = has_usb();
-    #endif
-  #endif
-}
-
-static void keyboard_master_setup(void) {
-#ifdef USE_I2C
-#ifdef SSD1306OLED
-    matrix_master_OLED_init ();
-#endif
-#endif
-#ifdef USE_MATRIX_I2C
-    i2c_master_init();
-#else
-    serial_master_init();
-#endif
-}
-
-static void keyboard_slave_setup(void) {
-#ifdef USE_MATRIX_I2C
-    i2c_slave_init(SLAVE_I2C_ADDRESS);
-#else
-    serial_slave_init();
-#endif
-}
-
-bool has_usb(void) {
-   USBCON |= (1 << OTGPADE); //enables VBUS pad
-   _delay_us(5);
-   return (USBSTA & (1<<VBUS));  //checks state of VBUS
-}
-
-void split_keyboard_setup(void) {
-   setup_handedness();
-
-   if (has_usb()) {
-      keyboard_master_setup();
-   } else {
-      keyboard_slave_setup();
-   }
-   sei();
-}
-
-void keyboard_slave_loop(void) {
-   matrix_init();
-
-   while (1) {
-      matrix_slave_scan();
-   }
-}
-
-// this code runs before the usb and keyboard is initialized
-void matrix_setup(void) {
-    split_keyboard_setup();
-
-    if (!has_usb()) {
-        keyboard_slave_loop();
-    }
-}
diff --git a/keyboards/helix/rev1/split_util.h b/keyboards/helix/rev1/split_util.h
deleted file mode 100644
index 807412cd38..0000000000
--- a/keyboards/helix/rev1/split_util.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include "eeconfig.h"
-
-#define SLAVE_I2C_ADDRESS           0x32
-
-extern volatile bool isLeftHand;
-
-// slave version of matix scan, defined in matrix.c
-void matrix_slave_scan(void);
-
-void split_keyboard_setup(void);
-bool has_usb(void);
-void keyboard_slave_loop(void);
-
-void matrix_master_OLED_init (void);

From 7f63bcf38b55b3bf23c5606c2e1f8e15724f5984 Mon Sep 17 00:00:00 2001
From: Joakim Tufvegren <104522+firetech@users.noreply.github.com>
Date: Thu, 17 Feb 2022 17:33:07 +0100
Subject: [PATCH 638/867] [Bug] Re-add call to `suspend_power_down_kb()`
 (#16382)

---
 quantum/quantum.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quantum/quantum.c b/quantum/quantum.c
index 35b6351e9d..be43faaf6b 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -488,6 +488,7 @@ __attribute__((weak)) void suspend_power_down_user(void) {}
 __attribute__((weak)) void suspend_power_down_kb(void) { suspend_power_down_user(); }
 
 void suspend_power_down_quantum(void) {
+    suspend_power_down_kb();
 #ifndef NO_SUSPEND_POWER_DOWN
 // Turn off backlight
 #    ifdef BACKLIGHT_ENABLE

From 548a463fe9e60410e5798b6fd10a9e18ba2f28bb Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 18 Feb 2022 03:43:03 +1100
Subject: [PATCH 639/867] `mokey/xox70`: clean up layouts (#16375)

---
 keyboards/mokey/xox70/info.json               | 643 +++++++++++-------
 .../mokey/xox70/keymaps/default/keymap.c      |  19 +-
 keyboards/mokey/xox70/keymaps/via/keymap.c    |  44 +-
 keyboards/mokey/xox70/rules.mk                |   2 +
 keyboards/mokey/xox70/xox70.h                 | 129 ++--
 5 files changed, 529 insertions(+), 308 deletions(-)

diff --git a/keyboards/mokey/xox70/info.json b/keyboards/mokey/xox70/info.json
index 95089f6fc3..5baa620bc6 100644
--- a/keyboards/mokey/xox70/info.json
+++ b/keyboards/mokey/xox70/info.json
@@ -3,245 +3,428 @@
     "url": "",
     "maintainer": "Mokey",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_all": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0e", "x":13, "y":0, "w":2},
-                {"label":"k0f", "x":15.25, "y":0},
-                {"label":"k0g", "x":16.25, "y":0},
-                {"label":"k0h", "x":17.25, "y":0},
-                
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k12", "x":1.5, "y":1},
-                {"label":"k13", "x":2.5, "y":1},
-                {"label":"k14", "x":3.5, "y":1},
-                {"label":"k15", "x":4.5, "y":1},
-                {"label":"k16", "x":5.5, "y":1},
-                {"label":"k17", "x":6.5, "y":1},
-                {"label":"k18", "x":7.5, "y":1},
-                {"label":"k19", "x":8.5, "y":1},
-                {"label":"k1a", "x":9.5, "y":1},
-                {"label":"k1b", "x":10.5, "y":1},
-                {"label":"k1c", "x":11.5, "y":1},
-                {"label":"k1d", "x":12.5, "y":1},
-                {"label":"k1e", "x":13.5, "y":1, "w":1.5},
-                {"label":"k1f", "x":15.25, "y":1},
-                {"label":"k1g", "x":16.25, "y":1},
-                {"label":"k1h", "x":17.25, "y":1},
-                
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k22", "x":1.75, "y":2},
-                {"label":"k23", "x":2.75, "y":2},
-                {"label":"k24", "x":3.75, "y":2},
-                {"label":"k25", "x":4.75, "y":2},
-                {"label":"k26", "x":5.75, "y":2},
-                {"label":"k27", "x":6.75, "y":2},
-                {"label":"k28", "x":7.75, "y":2},
-                {"label":"k29", "x":8.75, "y":2},
-                {"label":"k2a", "x":9.75, "y":2},
-                {"label":"k2b", "x":10.75, "y":2},
-                {"label":"k2c", "x":11.75, "y":2},
-                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
-                
-                {"label":"k30", "x":0, "y":3, "w":2.25},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3d", "x":12.25, "y":3, "w":2.75},
-                {"label":"k3g", "x":16.25, "y":3},
+                {"label":"k00", "x": 0, "y": 0},
+                {"label":"k01", "x": 1, "y": 0},
+                {"label":"k02", "x": 2, "y": 0},
+                {"label":"k03", "x": 3, "y": 0},
+                {"label":"k04", "x": 4, "y": 0},
+                {"label":"k05", "x": 5, "y": 0},
+                {"label":"k06", "x": 6, "y": 0},
+                {"label":"k07", "x": 7, "y": 0},
+                {"label":"k08", "x": 8, "y": 0},
+                {"label":"k09", "x": 9, "y": 0},
+                {"label":"k0A", "x": 10, "y": 0},
+                {"label":"k0B", "x": 11, "y": 0},
+                {"label":"k0C", "x": 12, "y": 0},
+                {"label":"k0D", "x": 13, "y": 0},
+                {"label":"k0E", "x": 14, "y": 0},
 
-                {"label":"k40", "x":0, "y":4, "w":1.25},
-                {"label":"k41", "x":1.25, "y":4, "w":1.25},
-                {"label":"k43", "x":2.5, "y":4, "w":1.25},
-                {"label":"k46", "x":3.75, "y":4, "w":6.25},
-                {"label":"k4a", "x":10, "y":4, "w":1.25},
-                {"label":"k4b", "x":11.25, "y":4, "w":1.25},
-                {"label":"k4d", "x":12.5, "y":4, "w":1.25},
-                {"label":"k4e", "x":13.75, "y":4, "w":1.25},
-                {"label":"k4f", "x":15.25, "y":4},
-                {"label":"k4g", "x":16.25, "y":4},
-                {"label":"k4h", "x":17.25, "y":4}
+                {"label":"k0F", "x": 15.25, "y": 0},
+                {"label":"k0G", "x": 16.25, "y": 0},
+                {"label":"k0H", "x": 17.25, "y": 0},
+
+                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
+                {"label":"k12", "x": 1.5, "y": 1},
+                {"label":"k13", "x": 2.5, "y": 1},
+                {"label":"k14", "x": 3.5, "y": 1},
+                {"label":"k15", "x": 4.5, "y": 1},
+                {"label":"k16", "x": 5.5, "y": 1},
+                {"label":"k17", "x": 6.5, "y": 1},
+                {"label":"k18", "x": 7.5, "y": 1},
+                {"label":"k19", "x": 8.5, "y": 1},
+                {"label":"k1A", "x": 9.5, "y": 1},
+                {"label":"k1B", "x": 10.5, "y": 1},
+                {"label":"k1C", "x": 11.5, "y": 1},
+                {"label":"k1D", "x": 12.5, "y": 1},
+                {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label":"k1F", "x": 15.25, "y": 1},
+                {"label":"k1G", "x": 16.25, "y": 1},
+                {"label":"k1H", "x": 17.25, "y": 1},
+
+                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
+                {"label":"k22", "x": 1.75, "y": 2},
+                {"label":"k23", "x": 2.75, "y": 2},
+                {"label":"k24", "x": 3.75, "y": 2},
+                {"label":"k25", "x": 4.75, "y": 2},
+                {"label":"k26", "x": 5.75, "y": 2},
+                {"label":"k27", "x": 6.75, "y": 2},
+                {"label":"k28", "x": 7.75, "y": 2},
+                {"label":"k29", "x": 8.75, "y": 2},
+                {"label":"k2A", "x": 9.75, "y": 2},
+                {"label":"k2B", "x": 10.75, "y": 2},
+                {"label":"k2C", "x": 11.75, "y": 2},
+                {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label":"k30", "x": 0, "y": 3, "w": 1.25},
+                {"label":"k31", "x": 1.25, "y": 3},
+                {"label":"k32", "x": 2.25, "y": 3},
+                {"label":"k33", "x": 3.25, "y": 3},
+                {"label":"k34", "x": 4.25, "y": 3},
+                {"label":"k35", "x": 5.25, "y": 3},
+                {"label":"k36", "x": 6.25, "y": 3},
+                {"label":"k37", "x": 7.25, "y": 3},
+                {"label":"k38", "x": 8.25, "y": 3},
+                {"label":"k39", "x": 9.25, "y": 3},
+                {"label":"k3A", "x": 10.25, "y": 3},
+                {"label":"k3B", "x": 11.25, "y": 3},
+                {"label":"k3D", "x": 12.25, "y": 3, "w": 1.75},
+                {"label":"k3E", "x": 14, "y": 3},
+
+                {"label":"k3G", "x": 16.25, "y": 3},
+
+                {"label":"k40", "x": 0, "y": 4, "w": 1.5},
+                {"label":"k41", "x": 1.5, "y": 4},
+                {"label":"k43", "x": 2.5, "y": 4, "w": 1.5},
+                {"label":"k44", "x": 4, "y": 4, "w": 2.5},
+                {"label":"k46", "x": 6.5, "y": 4},
+                {"label":"k48", "x": 7.5, "y": 4, "w": 2.5},
+                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
+                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
+                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
+                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
+
+                {"label":"k4F", "x": 15.25, "y": 4},
+                {"label":"k4G", "x": 16.25, "y": 4},
+                {"label":"k4H", "x": 17.25, "y": 4}
             ]
         },
-        "LAYOUT_division_backspace":{
+        "LAYOUT_tkl_nofrow_ansi": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0},
-                {"label":"k0e", "x":14, "y":0},
-                {"label":"k0f", "x":15.25, "y":0},
-                {"label":"k0g", "x":16.25, "y":0},
-                {"label":"k0h", "x":17.25, "y":0},
-                
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k12", "x":1.5, "y":1},
-                {"label":"k13", "x":2.5, "y":1},
-                {"label":"k14", "x":3.5, "y":1},
-                {"label":"k15", "x":4.5, "y":1},
-                {"label":"k16", "x":5.5, "y":1},
-                {"label":"k17", "x":6.5, "y":1},
-                {"label":"k18", "x":7.5, "y":1},
-                {"label":"k19", "x":8.5, "y":1},
-                {"label":"k1a", "x":9.5, "y":1},
-                {"label":"k1b", "x":10.5, "y":1},
-                {"label":"k1c", "x":11.5, "y":1},
-                {"label":"k1d", "x":12.5, "y":1},
-                {"label":"k1f", "x":15.25, "y":1},
-                {"label":"k1g", "x":16.25, "y":1},
-                {"label":"k1h", "x":17.25, "y":1},
-                
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k22", "x":1.75, "y":2},
-                {"label":"k23", "x":2.75, "y":2},
-                {"label":"k24", "x":3.75, "y":2},
-                {"label":"k25", "x":4.75, "y":2},
-                {"label":"k26", "x":5.75, "y":2},
-                {"label":"k27", "x":6.75, "y":2},
-                {"label":"k28", "x":7.75, "y":2},
-                {"label":"k29", "x":8.75, "y":2},
-                {"label":"k2a", "x":9.75, "y":2},
-                {"label":"k2b", "x":10.75, "y":2},
-                {"label":"k2c", "x":11.75, "y":2},
-                {"label":"k1e", "x":12.75, "y":2},
-                {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h": 2},
-                
-                {"label":"k30", "x":0, "y":3, "w":1.25},
-                {"label":"k31", "x":1.25, "y":3},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3d", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3e", "x":14, "y":3},
-                {"label":"k3g", "x":16.25, "y":3},
+                {"label":"k00", "x": 0, "y": 0},
+                {"label":"k01", "x": 1, "y": 0},
+                {"label":"k02", "x": 2, "y": 0},
+                {"label":"k03", "x": 3, "y": 0},
+                {"label":"k04", "x": 4, "y": 0},
+                {"label":"k05", "x": 5, "y": 0},
+                {"label":"k06", "x": 6, "y": 0},
+                {"label":"k07", "x": 7, "y": 0},
+                {"label":"k08", "x": 8, "y": 0},
+                {"label":"k09", "x": 9, "y": 0},
+                {"label":"k0A", "x": 10, "y": 0},
+                {"label":"k0B", "x": 11, "y": 0},
+                {"label":"k0C", "x": 12, "y": 0},
+                {"label":"k0E", "x": 13, "y": 0, "w": 2},
 
-                {"label":"k40", "x":0, "y":4, "w":1.5},
-                {"label":"k41", "x":1.25, "y":4},
-                {"label":"k43", "x":2.5, "y":4, "w":1.5},
-                {"label":"k46", "x":4, "y":4, "w":7},
-                {"label":"k4b", "x":11, "y":4, "w":1.5},
-                {"label":"k4d", "x":12.5, "y":4},
-                {"label":"k4e", "x":13.75, "y":4, "w":1.5},
-                {"label":"k4f", "x":15.25, "y":4},
-                {"label":"k4g", "x":16.25, "y":4},
-                {"label":"k4h", "x":17.25, "y":4}
+                {"label":"k0F", "x": 15.25, "y": 0},
+                {"label":"k0G", "x": 16.25, "y": 0},
+                {"label":"k0H", "x": 17.25, "y": 0},
+
+                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
+                {"label":"k12", "x": 1.5, "y": 1},
+                {"label":"k13", "x": 2.5, "y": 1},
+                {"label":"k14", "x": 3.5, "y": 1},
+                {"label":"k15", "x": 4.5, "y": 1},
+                {"label":"k16", "x": 5.5, "y": 1},
+                {"label":"k17", "x": 6.5, "y": 1},
+                {"label":"k18", "x": 7.5, "y": 1},
+                {"label":"k19", "x": 8.5, "y": 1},
+                {"label":"k1A", "x": 9.5, "y": 1},
+                {"label":"k1B", "x": 10.5, "y": 1},
+                {"label":"k1C", "x": 11.5, "y": 1},
+                {"label":"k1D", "x": 12.5, "y": 1},
+                {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label":"k1F", "x": 15.25, "y": 1},
+                {"label":"k1G", "x": 16.25, "y": 1},
+                {"label":"k1H", "x": 17.25, "y": 1},
+
+                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
+                {"label":"k22", "x": 1.75, "y": 2},
+                {"label":"k23", "x": 2.75, "y": 2},
+                {"label":"k24", "x": 3.75, "y": 2},
+                {"label":"k25", "x": 4.75, "y": 2},
+                {"label":"k26", "x": 5.75, "y": 2},
+                {"label":"k27", "x": 6.75, "y": 2},
+                {"label":"k28", "x": 7.75, "y": 2},
+                {"label":"k29", "x": 8.75, "y": 2},
+                {"label":"k2A", "x": 9.75, "y": 2},
+                {"label":"k2B", "x": 10.75, "y": 2},
+                {"label":"k2C", "x": 11.75, "y": 2},
+                {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label":"k30", "x": 0, "y": 3, "w": 2.25},
+                {"label":"k32", "x": 2.25, "y": 3},
+                {"label":"k33", "x": 3.25, "y": 3},
+                {"label":"k34", "x": 4.25, "y": 3},
+                {"label":"k35", "x": 5.25, "y": 3},
+                {"label":"k36", "x": 6.25, "y": 3},
+                {"label":"k37", "x": 7.25, "y": 3},
+                {"label":"k38", "x": 8.25, "y": 3},
+                {"label":"k39", "x": 9.25, "y": 3},
+                {"label":"k3A", "x": 10.25, "y": 3},
+                {"label":"k3B", "x": 11.25, "y": 3},
+                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label":"k3G", "x": 16.25, "y": 3},
+
+                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
+                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
+                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
+                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
+                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
+                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
+                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
+                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
+
+                {"label":"k4F", "x": 15.25, "y": 4},
+                {"label":"k4G", "x": 16.25, "y": 4},
+                {"label":"k4H", "x": 17.25, "y": 4}
             ]
         },
-        "LAYOUT_iso":{
+        "LAYOUT_tkl_nofrow_iso": {
             "layout": [
-                {"label":"k00", "x":0, "y":0},
-                {"label":"k01", "x":1, "y":0},
-                {"label":"k02", "x":2, "y":0},
-                {"label":"k03", "x":3, "y":0},
-                {"label":"k04", "x":4, "y":0},
-                {"label":"k05", "x":5, "y":0},
-                {"label":"k06", "x":6, "y":0},
-                {"label":"k07", "x":7, "y":0},
-                {"label":"k08", "x":8, "y":0},
-                {"label":"k09", "x":9, "y":0},
-                {"label":"k0a", "x":10, "y":0},
-                {"label":"k0b", "x":11, "y":0},
-                {"label":"k0c", "x":12, "y":0},
-                {"label":"k0d", "x":13, "y":0},
-                {"label":"k0e", "x":14, "y":0},
-                {"label":"k0f", "x":15.25, "y":0},
-                {"label":"k0g", "x":16.25, "y":0},
-                {"label":"k0h", "x":17.25, "y":0},
-                
-                {"label":"k10", "x":0, "y":1, "w":1.5},
-                {"label":"k12", "x":1.5, "y":1},
-                {"label":"k13", "x":2.5, "y":1},
-                {"label":"k14", "x":3.5, "y":1},
-                {"label":"k15", "x":4.5, "y":1},
-                {"label":"k16", "x":5.5, "y":1},
-                {"label":"k17", "x":6.5, "y":1},
-                {"label":"k18", "x":7.5, "y":1},
-                {"label":"k19", "x":8.5, "y":1},
-                {"label":"k1a", "x":9.5, "y":1},
-                {"label":"k1b", "x":10.5, "y":1},
-                {"label":"k1c", "x":11.5, "y":1},
-                {"label":"k1d", "x":12.5, "y":1},
-                {"label":"k1f", "x":15.25, "y":1},
-                {"label":"k1g", "x":16.25, "y":1},
-                {"label":"k1h", "x":17.25, "y":1},
-                
-                {"label":"k20", "x":0, "y":2, "w":1.75},
-                {"label":"k22", "x":1.75, "y":2},
-                {"label":"k23", "x":2.75, "y":2},
-                {"label":"k24", "x":3.75, "y":2},
-                {"label":"k25", "x":4.75, "y":2},
-                {"label":"k26", "x":5.75, "y":2},
-                {"label":"k27", "x":6.75, "y":2},
-                {"label":"k28", "x":7.75, "y":2},
-                {"label":"k29", "x":8.75, "y":2},
-                {"label":"k2a", "x":9.75, "y":2},
-                {"label":"k2b", "x":10.75, "y":2},
-                {"label":"k2c", "x":11.75, "y":2},
-                {"label":"k1e", "x":12.75, "y":2},
-                {"label":"k2d", "x":13.75, "y":1, "w":1.25, "h": 2},
-                
-                {"label":"k30", "x":0, "y":3, "w":1.25},
-                {"label":"k31", "x":1.25, "y":3},
-                {"label":"k32", "x":2.25, "y":3},
-                {"label":"k33", "x":3.25, "y":3},
-                {"label":"k34", "x":4.25, "y":3},
-                {"label":"k35", "x":5.25, "y":3},
-                {"label":"k36", "x":6.25, "y":3},
-                {"label":"k37", "x":7.25, "y":3},
-                {"label":"k38", "x":8.25, "y":3},
-                {"label":"k39", "x":9.25, "y":3},
-                {"label":"k3a", "x":10.25, "y":3},
-                {"label":"k3b", "x":11.25, "y":3},
-                {"label":"k3d", "x":12.25, "y":3, "w":1.75},
-                {"label":"k3e", "x":14, "y":3},
-                {"label":"k3g", "x":16.25, "y":3},
-                
-                {"label":"k40", "x":0, "y":4, "w":1.5},
-                {"label":"k43", "x":2.5, "y":4, "w":1.5},
-                {"label":"k44", "x":4, "y":4, "w":3},
-                {"label":"k46", "x":7, "y":4},
-                {"label":"k48", "x":8, "y":4, "w":3},
-                {"label":"k4b", "x":11, "y":4, "w":1.5},
-                {"label":"k4e", "x":13.5, "y":4, "w":1.5},
-                {"label":"k4f", "x":15.25, "y":4},
-                {"label":"k4g", "x":16.25, "y":4},
-                {"label":"k4h", "x":17.25, "y":4}
+                {"label":"k00", "x": 0, "y": 0},
+                {"label":"k01", "x": 1, "y": 0},
+                {"label":"k02", "x": 2, "y": 0},
+                {"label":"k03", "x": 3, "y": 0},
+                {"label":"k04", "x": 4, "y": 0},
+                {"label":"k05", "x": 5, "y": 0},
+                {"label":"k06", "x": 6, "y": 0},
+                {"label":"k07", "x": 7, "y": 0},
+                {"label":"k08", "x": 8, "y": 0},
+                {"label":"k09", "x": 9, "y": 0},
+                {"label":"k0A", "x": 10, "y": 0},
+                {"label":"k0B", "x": 11, "y": 0},
+                {"label":"k0C", "x": 12, "y": 0},
+                {"label":"k0E", "x": 13, "y": 0, "w": 2},
+
+                {"label":"k0F", "x": 15.25, "y": 0},
+                {"label":"k0G", "x": 16.25, "y": 0},
+                {"label":"k0H", "x": 17.25, "y": 0},
+
+                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
+                {"label":"k12", "x": 1.5, "y": 1},
+                {"label":"k13", "x": 2.5, "y": 1},
+                {"label":"k14", "x": 3.5, "y": 1},
+                {"label":"k15", "x": 4.5, "y": 1},
+                {"label":"k16", "x": 5.5, "y": 1},
+                {"label":"k17", "x": 6.5, "y": 1},
+                {"label":"k18", "x": 7.5, "y": 1},
+                {"label":"k19", "x": 8.5, "y": 1},
+                {"label":"k1A", "x": 9.5, "y": 1},
+                {"label":"k1B", "x": 10.5, "y": 1},
+                {"label":"k1C", "x": 11.5, "y": 1},
+                {"label":"k1D", "x": 12.5, "y": 1},
+
+                {"label":"k1F", "x": 15.25, "y": 1},
+                {"label":"k1G", "x": 16.25, "y": 1},
+                {"label":"k1H", "x": 17.25, "y": 1},
+
+                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
+                {"label":"k22", "x": 1.75, "y": 2},
+                {"label":"k23", "x": 2.75, "y": 2},
+                {"label":"k24", "x": 3.75, "y": 2},
+                {"label":"k25", "x": 4.75, "y": 2},
+                {"label":"k26", "x": 5.75, "y": 2},
+                {"label":"k27", "x": 6.75, "y": 2},
+                {"label":"k28", "x": 7.75, "y": 2},
+                {"label":"k29", "x": 8.75, "y": 2},
+                {"label":"k2A", "x": 9.75, "y": 2},
+                {"label":"k2B", "x": 10.75, "y": 2},
+                {"label":"k2C", "x": 11.75, "y": 2},
+                {"label":"k1E", "x": 12.75, "y": 2},
+                {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label":"k30", "x": 0, "y": 3, "w": 1.25},
+                {"label":"k31", "x": 1.25, "y": 3},
+                {"label":"k32", "x": 2.25, "y": 3},
+                {"label":"k33", "x": 3.25, "y": 3},
+                {"label":"k34", "x": 4.25, "y": 3},
+                {"label":"k35", "x": 5.25, "y": 3},
+                {"label":"k36", "x": 6.25, "y": 3},
+                {"label":"k37", "x": 7.25, "y": 3},
+                {"label":"k38", "x": 8.25, "y": 3},
+                {"label":"k39", "x": 9.25, "y": 3},
+                {"label":"k3A", "x": 10.25, "y": 3},
+                {"label":"k3B", "x": 11.25, "y": 3},
+                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label":"k3G", "x": 16.25, "y": 3},
+
+                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
+                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
+                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
+                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
+                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
+                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
+                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
+                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
+
+                {"label":"k4F", "x": 15.25, "y": 4},
+                {"label":"k4G", "x": 16.25, "y": 4},
+                {"label":"k4H", "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_ansi_split_bs": {
+            "layout": [
+                {"label":"k00", "x": 0, "y": 0},
+                {"label":"k01", "x": 1, "y": 0},
+                {"label":"k02", "x": 2, "y": 0},
+                {"label":"k03", "x": 3, "y": 0},
+                {"label":"k04", "x": 4, "y": 0},
+                {"label":"k05", "x": 5, "y": 0},
+                {"label":"k06", "x": 6, "y": 0},
+                {"label":"k07", "x": 7, "y": 0},
+                {"label":"k08", "x": 8, "y": 0},
+                {"label":"k09", "x": 9, "y": 0},
+                {"label":"k0A", "x": 10, "y": 0},
+                {"label":"k0B", "x": 11, "y": 0},
+                {"label":"k0C", "x": 12, "y": 0},
+                {"label":"k0D", "x": 13, "y": 0},
+                {"label":"k0E", "x": 14, "y": 0},
+
+                {"label":"k0F", "x": 15.25, "y": 0},
+                {"label":"k0G", "x": 16.25, "y": 0},
+                {"label":"k0H", "x": 17.25, "y": 0},
+
+                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
+                {"label":"k12", "x": 1.5, "y": 1},
+                {"label":"k13", "x": 2.5, "y": 1},
+                {"label":"k14", "x": 3.5, "y": 1},
+                {"label":"k15", "x": 4.5, "y": 1},
+                {"label":"k16", "x": 5.5, "y": 1},
+                {"label":"k17", "x": 6.5, "y": 1},
+                {"label":"k18", "x": 7.5, "y": 1},
+                {"label":"k19", "x": 8.5, "y": 1},
+                {"label":"k1A", "x": 9.5, "y": 1},
+                {"label":"k1B", "x": 10.5, "y": 1},
+                {"label":"k1C", "x": 11.5, "y": 1},
+                {"label":"k1D", "x": 12.5, "y": 1},
+                {"label":"k1E", "x": 13.5, "y": 1, "w": 1.5},
+
+                {"label":"k1F", "x": 15.25, "y": 1},
+                {"label":"k1G", "x": 16.25, "y": 1},
+                {"label":"k1H", "x": 17.25, "y": 1},
+
+                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
+                {"label":"k22", "x": 1.75, "y": 2},
+                {"label":"k23", "x": 2.75, "y": 2},
+                {"label":"k24", "x": 3.75, "y": 2},
+                {"label":"k25", "x": 4.75, "y": 2},
+                {"label":"k26", "x": 5.75, "y": 2},
+                {"label":"k27", "x": 6.75, "y": 2},
+                {"label":"k28", "x": 7.75, "y": 2},
+                {"label":"k29", "x": 8.75, "y": 2},
+                {"label":"k2A", "x": 9.75, "y": 2},
+                {"label":"k2B", "x": 10.75, "y": 2},
+                {"label":"k2C", "x": 11.75, "y": 2},
+                {"label":"k2D", "x": 12.75, "y": 2, "w": 2.25},
+
+                {"label":"k30", "x": 0, "y": 3, "w": 2.25},
+                {"label":"k32", "x": 2.25, "y": 3},
+                {"label":"k33", "x": 3.25, "y": 3},
+                {"label":"k34", "x": 4.25, "y": 3},
+                {"label":"k35", "x": 5.25, "y": 3},
+                {"label":"k36", "x": 6.25, "y": 3},
+                {"label":"k37", "x": 7.25, "y": 3},
+                {"label":"k38", "x": 8.25, "y": 3},
+                {"label":"k39", "x": 9.25, "y": 3},
+                {"label":"k3A", "x": 10.25, "y": 3},
+                {"label":"k3B", "x": 11.25, "y": 3},
+                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label":"k3G", "x": 16.25, "y": 3},
+
+                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
+                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
+                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
+                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
+                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
+                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
+                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
+                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
+
+                {"label":"k4F", "x": 15.25, "y": 4},
+                {"label":"k4G", "x": 16.25, "y": 4},
+                {"label":"k4H", "x": 17.25, "y": 4}
+            ]
+        },
+        "LAYOUT_tkl_nofrow_iso_split_bs": {
+            "layout": [
+                {"label":"k00", "x": 0, "y": 0},
+                {"label":"k01", "x": 1, "y": 0},
+                {"label":"k02", "x": 2, "y": 0},
+                {"label":"k03", "x": 3, "y": 0},
+                {"label":"k04", "x": 4, "y": 0},
+                {"label":"k05", "x": 5, "y": 0},
+                {"label":"k06", "x": 6, "y": 0},
+                {"label":"k07", "x": 7, "y": 0},
+                {"label":"k08", "x": 8, "y": 0},
+                {"label":"k09", "x": 9, "y": 0},
+                {"label":"k0A", "x": 10, "y": 0},
+                {"label":"k0B", "x": 11, "y": 0},
+                {"label":"k0C", "x": 12, "y": 0},
+                {"label":"k0D", "x": 13, "y": 0},
+                {"label":"k0E", "x": 14, "y": 0},
+
+                {"label":"k0F", "x": 15.25, "y": 0},
+                {"label":"k0G", "x": 16.25, "y": 0},
+                {"label":"k0H", "x": 17.25, "y": 0},
+
+                {"label":"k10", "x": 0, "y": 1, "w": 1.5},
+                {"label":"k12", "x": 1.5, "y": 1},
+                {"label":"k13", "x": 2.5, "y": 1},
+                {"label":"k14", "x": 3.5, "y": 1},
+                {"label":"k15", "x": 4.5, "y": 1},
+                {"label":"k16", "x": 5.5, "y": 1},
+                {"label":"k17", "x": 6.5, "y": 1},
+                {"label":"k18", "x": 7.5, "y": 1},
+                {"label":"k19", "x": 8.5, "y": 1},
+                {"label":"k1A", "x": 9.5, "y": 1},
+                {"label":"k1B", "x": 10.5, "y": 1},
+                {"label":"k1C", "x": 11.5, "y": 1},
+                {"label":"k1D", "x": 12.5, "y": 1},
+
+                {"label":"k1F", "x": 15.25, "y": 1},
+                {"label":"k1G", "x": 16.25, "y": 1},
+                {"label":"k1H", "x": 17.25, "y": 1},
+
+                {"label":"k20", "x": 0, "y": 2, "w": 1.75},
+                {"label":"k22", "x": 1.75, "y": 2},
+                {"label":"k23", "x": 2.75, "y": 2},
+                {"label":"k24", "x": 3.75, "y": 2},
+                {"label":"k25", "x": 4.75, "y": 2},
+                {"label":"k26", "x": 5.75, "y": 2},
+                {"label":"k27", "x": 6.75, "y": 2},
+                {"label":"k28", "x": 7.75, "y": 2},
+                {"label":"k29", "x": 8.75, "y": 2},
+                {"label":"k2A", "x": 9.75, "y": 2},
+                {"label":"k2B", "x": 10.75, "y": 2},
+                {"label":"k2C", "x": 11.75, "y": 2},
+                {"label":"k1E", "x": 12.75, "y": 2},
+                {"label":"k2D", "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"label":"k30", "x": 0, "y": 3, "w": 1.25},
+                {"label":"k31", "x": 1.25, "y": 3},
+                {"label":"k32", "x": 2.25, "y": 3},
+                {"label":"k33", "x": 3.25, "y": 3},
+                {"label":"k34", "x": 4.25, "y": 3},
+                {"label":"k35", "x": 5.25, "y": 3},
+                {"label":"k36", "x": 6.25, "y": 3},
+                {"label":"k37", "x": 7.25, "y": 3},
+                {"label":"k38", "x": 8.25, "y": 3},
+                {"label":"k39", "x": 9.25, "y": 3},
+                {"label":"k3A", "x": 10.25, "y": 3},
+                {"label":"k3B", "x": 11.25, "y": 3},
+                {"label":"k3D", "x": 12.25, "y": 3, "w": 2.75},
+
+                {"label":"k3G", "x": 16.25, "y": 3},
+
+                {"label":"k40", "x": 0, "y": 4, "w": 1.25},
+                {"label":"k41", "x": 1.25, "y": 4, "w": 1.25},
+                {"label":"k43", "x": 2.5, "y": 4, "w": 1.25},
+                {"label":"k46", "x": 3.75, "y": 4, "w": 6.25},
+                {"label":"k4A", "x": 10, "y": 4, "w": 1.25},
+                {"label":"k4B", "x": 11.25, "y": 4, "w": 1.25},
+                {"label":"k4D", "x": 12.5, "y": 4, "w": 1.25},
+                {"label":"k4E", "x": 13.75, "y": 4, "w": 1.25},
+
+                {"label":"k4F", "x": 15.25, "y": 4},
+                {"label":"k4G", "x": 16.25, "y": 4},
+                {"label":"k4H", "x": 17.25, "y": 4}
             ]
         }
     }
diff --git a/keyboards/mokey/xox70/keymaps/default/keymap.c b/keyboards/mokey/xox70/keymaps/default/keymap.c
index 710acc04cb..b19174948b 100644
--- a/keyboards/mokey/xox70/keymaps/default/keymap.c
+++ b/keyboards/mokey/xox70/keymaps/default/keymap.c
@@ -15,21 +15,12 @@
 
 #include QMK_KEYBOARD_H
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    LAYOUT(
-        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_INSERT, KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DELETE, KC_END,  KC_PGDOWN,
+    LAYOUT_tkl_nofrow_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_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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, KC_GRV, KC_MENU, KC_RCTL,                KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-
-    LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                   _______, _______, _______, _______,            _______, _______, _______
+        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, KC_RGUI, KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT
     )
 };
diff --git a/keyboards/mokey/xox70/keymaps/via/keymap.c b/keyboards/mokey/xox70/keymaps/via/keymap.c
index 66e227e333..304fe3968c 100644
--- a/keyboards/mokey/xox70/keymaps/via/keymap.c
+++ b/keyboards/mokey/xox70/keymaps/via/keymap.c
@@ -16,36 +16,32 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    LAYOUT(
-        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_INSERT, KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DELETE, KC_END,  KC_PGDOWN,
+    LAYOUT_all(
+        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_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,             KC_DEL,  KC_END,  KC_PGDN,
         KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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, KC_GRV, KC_MENU, KC_RCTL,                KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                        KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,             KC_LEFT, KC_DOWN, KC_RGHT
     ),
-
-    LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+    LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                   _______, _______, _______, _______,            _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
     ),
-
-    LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+    LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                   _______, _______, _______, _______,            _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
     ),
-
-    LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+    LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,
-        _______, _______, _______,                            _______,                   _______, _______, _______, _______,            _______, _______, _______
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                      _______,
+        _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______,             _______, _______, _______
     )
 };
diff --git a/keyboards/mokey/xox70/rules.mk b/keyboards/mokey/xox70/rules.mk
index 7b507a4165..aa86669dc3 100644
--- a/keyboards/mokey/xox70/rules.mk
+++ b/keyboards/mokey/xox70/rules.mk
@@ -16,3 +16,5 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = tkl_nofrow_ansi tkl_nofrow_iso
diff --git a/keyboards/mokey/xox70/xox70.h b/keyboards/mokey/xox70/xox70.h
index 8c54e630c5..3c0f15d2f7 100644
--- a/keyboards/mokey/xox70/xox70.h
+++ b/keyboards/mokey/xox70/xox70.h
@@ -13,53 +13,102 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #pragma once
 
 #include "quantum.h"
 
-#define xxx KC_NO
+#define XXX KC_NO
 
-#define LAYOUT(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, k0h, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
-    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,           k3g, \
-    k40, k41,      k43,           k46,                k4a, k4b,      k4d, k4e, k4f, k4g, k4h \
-) \
-{ \
-    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,  KC_NO, k0e,     k0f,   k0g,   k0h }, \
-    { k10,  KC_NO, k12,   k13,  k14,  k15,   k16,  k17,   k18,  k19,   k1a,  k1b,  k1c,   k1d,  k1e,     k1f,   k1g,   k1h }, \
-    { k20,  KC_NO, k22,   k23,  k24,  k25,   k26,  k27,   k28,  k29,   k2a,  k2b,  k2c,   k2d,  KC_NO,   KC_NO, KC_NO,KC_NO }, \
-    { k30,  KC_NO, k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,  KC_NO, k3d,  KC_NO,   KC_NO,  k3g, KC_NO }, \
-    { k40,  k41,   KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4a,  k4b,  KC_NO, k4d,  k4e,      k4f,   k4g,   k4h }  \
+/*
+ *                                                                ┌───────┐
+ *                                                                │0E     │ 2u Backspace
+ *                                                                └───────┘
+ *            ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┐
+ *            │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0F │0G │0H │
+ *            ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┤    ┌─────┐
+ *            │10   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E   │ │1F │1G │1H │    │2D   │
+ *            ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ┌──┴┐    │ ISO Enter
+ *            │20    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │               │1E │    │
+ * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐     ├───┴────┴─┐
+ * │30      │ │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D    │3E │     │3G │     │3D        │
+ * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤ ┌───┼───┼───┐ └──────────┘
+ *            │40  │41  │43  │46                      │4A  │4B  │4D  │4E  │ │4F │4G │4H │
+ *            └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+ *            ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *            │40   │41 │43   │46                         │4B   │4D │4E   │
+ *            └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ *            ┌─────┐   ┌─────┬───────────┬───┬───────────┬─────┐   ┌─────┐
+ *            │40   │   │43   │44         │46 │48         │4B   │   │4E   │
+ *            └─────┘   └─────┴───────────┴───┴───────────┴─────┘   └─────┘
+ */
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, k0G, k0H, \
+    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,        k1F, k1G, k1H, \
+    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E,             k3G, \
+    k40, k41, k43,           k44, k46, k48,           k4A, k4B, k4D, k4E,        k4F, k4G, k4H \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, XXX, k3G, XXX }, \
+    { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
 }
 
-#define LAYOUT_division_backspace(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e,      k3g, \
-    k40, k41,      k43,           k46,                     k4b,      k4d, k4e, k4f, k4g, k4h \
-) \
-{ \
-    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,   k0d, k0e,   k0f,   k0g,   k0h }, \
-    { k10,  KC_NO, k12,   k13,  k14,  k15,   k16,  k17,   k18,  k19,   k1a,  k1b,  k1c,   k1d, k1f,   k1g,   k1h,   KC_NO }, \
-    { k20,  KC_NO, k22,   k23,  k24,  k25,   k26,  k27,   k28,  k29,   k2a,  k2b,  k2c,   k1e,  k2d, KC_NO, KC_NO, KC_NO }, \
-    { k30,  k31,   k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,  KC_NO, k3d,  k3e, KC_NO,  k3g,  KC_NO }, \
-    { k40,  k41,   KC_NO, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO,k4b, KC_NO,  k4d, k4e, k4f, k4g, k4h }  \
+#define LAYOUT_tkl_nofrow_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E,   k0F, k0G, k0H, \
+    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F, k1G, k1H, \
+    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,        k3G, \
+    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,   k4F, k4G, k4H \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F, k0G, k0H }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
+    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
 }
 
-#define LAYOUT_iso(\
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, \
-    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1f, k1g, k1h, \
-    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k1e, k2d, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e,       k3g, \
-    k40,           k43, k44,      k46,      k48,           k4b,           k4e, k4f, k4g, k4h \
-) \
-{ \
-    { k00,  k01,   k02,   k03,  k04,  k05,   k06,  k07,   k08,  k09,   k0a,  k0b,  k0c,   k0d,  k0e,     k0f,   k0g,   k0h }, \
-    { k10,  KC_NO, k12,   k13,  k14,  k15,   k16,  k17,   k18,  k19,   k1a,  k1b,  k1c,   k1d,  k1f,   k1g,   k1h,   KC_NO }, \
-    { k20,  KC_NO, k22,   k23,  k24,  k25,   k26,  k27,   k28,  k29,   k2a,  k2b,  k2c,   k1e,  k2d,  KC_NO, KC_NO, KC_NO }, \
-    { k30,  k31, k32,   k33,  k34,  k35,   k36,  k37,   k38,  k39,   k3a,  k3b,  KC_NO,   k3d,  k3e,   KC_NO,  k3g, KC_NO }, \
-    { k40,  KC_NO,  KC_NO, k43, k44, KC_NO, k46, KC_NO, k48, KC_NO, KC_NO, k4a,  KC_NO,   k4d,  k4e,    k4f,   k4g,   k4h }  \
+#define LAYOUT_tkl_nofrow_iso( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E,   k0F, k0G, k0H, \
+    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,        k1F, k1G, k1H, \
+    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,        k3G, \
+    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,   k4F, k4G, k4H \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F, k0G, k0H }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
+    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
+}
+
+#define LAYOUT_tkl_nofrow_ansi_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, k0G, k0H, \
+    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,        k1F, k1G, k1H, \
+    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,             k3G, \
+    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,        k4F, k4G, k4H \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
+    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
+}
+
+#define LAYOUT_tkl_nofrow_iso_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F, k0G, k0H, \
+    k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,             k1F, k1G, k1H, \
+    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,             k3G, \
+    k40, k41, k43,                k46,                k4A, k4B, k4D, k4E,        k4F, k4G, k4H \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \
+    { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX, XXX, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, k3G, XXX }, \
+    { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H } \
 }

From 7dd993fb066ad34623bc2875b7b609de1732a027 Mon Sep 17 00:00:00 2001
From: Joakim Tufvegren <104522+firetech@users.noreply.github.com>
Date: Thu, 17 Feb 2022 17:53:06 +0100
Subject: [PATCH 640/867] Fix build error for LED Matrix effect
 solid_reactive_wide. (#16383)

---
 quantum/led_matrix/animations/solid_reactive_wide.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quantum/led_matrix/animations/solid_reactive_wide.h b/quantum/led_matrix/animations/solid_reactive_wide.h
index 3aa88063a7..9f039c45d4 100644
--- a/quantum/led_matrix/animations/solid_reactive_wide.h
+++ b/quantum/led_matrix/animations/solid_reactive_wide.h
@@ -1,5 +1,5 @@
 #ifdef LED_MATRIX_KEYREACTIVE_ENABLED
-#    if !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE)
+#    if defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE)
 
 #        ifdef ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE
 LED_MATRIX_EFFECT(SOLID_REACTIVE_WIDE)
@@ -26,5 +26,5 @@ bool SOLID_REACTIVE_MULTIWIDE(effect_params_t* params) { return effect_runner_re
 #            endif
 
 #        endif  // LED_MATRIX_CUSTOM_EFFECT_IMPLS
-#    endif      // !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || !defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE)
+#    endif      // defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_WIDE) || defined(ENABLE_LED_MATRIX_SOLID_REACTIVE_MULTIWIDE)
 #endif          // LED_MATRIX_KEYREACTIVE_ENABLED

From 2d12eacb4b9bf1b3d331cec0bd06fd1a58a5d217 Mon Sep 17 00:00:00 2001
From: Simon <47527944+Frooastside@users.noreply.github.com>
Date: Thu, 17 Feb 2022 17:59:12 +0100
Subject: [PATCH 641/867] [Keyboard] Renamed Frooastboard to Frooastboard Nano
 (#16373)

---
 keyboards/frooastboard/{ => nano}/config.h             |  4 ++--
 keyboards/frooastboard/{ => nano}/info.json            |  4 ++--
 .../frooastboard/{ => nano}/keymaps/default/keymap.c   |  2 +-
 .../frooastboard/{ => nano}/keymaps/safe_mode/keymap.c |  2 +-
 keyboards/frooastboard/{ => nano}/keymaps/via/config.h |  2 +-
 keyboards/frooastboard/{ => nano}/keymaps/via/keymap.c |  2 +-
 keyboards/frooastboard/{ => nano}/keymaps/via/rules.mk |  0
 keyboards/frooastboard/{frooastboard.c => nano/nano.c} |  4 ++--
 keyboards/frooastboard/{frooastboard.h => nano/nano.h} |  2 +-
 keyboards/frooastboard/{ => nano}/readme.md            | 10 +++++-----
 keyboards/frooastboard/{ => nano}/rules.mk             |  0
 11 files changed, 16 insertions(+), 16 deletions(-)
 rename keyboards/frooastboard/{ => nano}/config.h (94%)
 rename keyboards/frooastboard/{ => nano}/info.json (85%)
 rename keyboards/frooastboard/{ => nano}/keymaps/default/keymap.c (96%)
 rename keyboards/frooastboard/{ => nano}/keymaps/safe_mode/keymap.c (96%)
 rename keyboards/frooastboard/{ => nano}/keymaps/via/config.h (96%)
 rename keyboards/frooastboard/{ => nano}/keymaps/via/keymap.c (96%)
 rename keyboards/frooastboard/{ => nano}/keymaps/via/rules.mk (100%)
 rename keyboards/frooastboard/{frooastboard.c => nano/nano.c} (92%)
 rename keyboards/frooastboard/{frooastboard.h => nano/nano.h} (95%)
 rename keyboards/frooastboard/{ => nano}/readme.md (78%)
 rename keyboards/frooastboard/{ => nano}/rules.mk (100%)

diff --git a/keyboards/frooastboard/config.h b/keyboards/frooastboard/nano/config.h
similarity index 94%
rename from keyboards/frooastboard/config.h
rename to keyboards/frooastboard/nano/config.h
index ebfc6a75d7..48af8e7e9c 100644
--- a/keyboards/frooastboard/config.h
+++ b/keyboards/frooastboard/nano/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
@@ -20,7 +20,7 @@
 
 /* USB Device descriptor parameter */
 #define MANUFACTURER    frooastside
-#define PRODUCT         Frooastboard
+#define PRODUCT         Frooastboard Nano
 
 /* key matrix size */
 #define MATRIX_ROWS 2
diff --git a/keyboards/frooastboard/info.json b/keyboards/frooastboard/nano/info.json
similarity index 85%
rename from keyboards/frooastboard/info.json
rename to keyboards/frooastboard/nano/info.json
index bb63e10920..7c594187eb 100644
--- a/keyboards/frooastboard/info.json
+++ b/keyboards/frooastboard/nano/info.json
@@ -1,6 +1,6 @@
 {
-    "keyboard_name": "Frooastboard",
-    "url": "https://github.com/frooastside/qmk_firmware/tree/master/keyboards/frooastboard",
+    "keyboard_name": "Frooastboard Nano",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/nano",
     "maintainer": "frooastside",
     "debounce": 5,
     "diode_direction": "COL2ROW",
diff --git a/keyboards/frooastboard/keymaps/default/keymap.c b/keyboards/frooastboard/nano/keymaps/default/keymap.c
similarity index 96%
rename from keyboards/frooastboard/keymaps/default/keymap.c
rename to keyboards/frooastboard/nano/keymaps/default/keymap.c
index 569937d8e2..aa3ed88da2 100644
--- a/keyboards/frooastboard/keymaps/default/keymap.c
+++ b/keyboards/frooastboard/nano/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
diff --git a/keyboards/frooastboard/keymaps/safe_mode/keymap.c b/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c
similarity index 96%
rename from keyboards/frooastboard/keymaps/safe_mode/keymap.c
rename to keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c
index dc040070ed..d237438da3 100644
--- a/keyboards/frooastboard/keymaps/safe_mode/keymap.c
+++ b/keyboards/frooastboard/nano/keymaps/safe_mode/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
diff --git a/keyboards/frooastboard/keymaps/via/config.h b/keyboards/frooastboard/nano/keymaps/via/config.h
similarity index 96%
rename from keyboards/frooastboard/keymaps/via/config.h
rename to keyboards/frooastboard/nano/keymaps/via/config.h
index 6bd3c6ea37..8c39695693 100644
--- a/keyboards/frooastboard/keymaps/via/config.h
+++ b/keyboards/frooastboard/nano/keymaps/via/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
diff --git a/keyboards/frooastboard/keymaps/via/keymap.c b/keyboards/frooastboard/nano/keymaps/via/keymap.c
similarity index 96%
rename from keyboards/frooastboard/keymaps/via/keymap.c
rename to keyboards/frooastboard/nano/keymaps/via/keymap.c
index 028462cded..bddd16bae5 100644
--- a/keyboards/frooastboard/keymaps/via/keymap.c
+++ b/keyboards/frooastboard/nano/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
diff --git a/keyboards/frooastboard/keymaps/via/rules.mk b/keyboards/frooastboard/nano/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/frooastboard/keymaps/via/rules.mk
rename to keyboards/frooastboard/nano/keymaps/via/rules.mk
diff --git a/keyboards/frooastboard/frooastboard.c b/keyboards/frooastboard/nano/nano.c
similarity index 92%
rename from keyboards/frooastboard/frooastboard.c
rename to keyboards/frooastboard/nano/nano.c
index 8e7f3c8998..584176a4e9 100644
--- a/keyboards/frooastboard/frooastboard.c
+++ b/keyboards/frooastboard/nano/nano.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
@@ -14,4 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "frooastboard.h"
+#include "nano.h"
diff --git a/keyboards/frooastboard/frooastboard.h b/keyboards/frooastboard/nano/nano.h
similarity index 95%
rename from keyboards/frooastboard/frooastboard.h
rename to keyboards/frooastboard/nano/nano.h
index da598cf4aa..76d1a42eac 100644
--- a/keyboards/frooastboard/frooastboard.h
+++ b/keyboards/frooastboard/nano/nano.h
@@ -1,4 +1,4 @@
-/* Copyright 2021 frooastside
+/* Copyright 2021-2022 frooastside
  *
  * 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
diff --git a/keyboards/frooastboard/readme.md b/keyboards/frooastboard/nano/readme.md
similarity index 78%
rename from keyboards/frooastboard/readme.md
rename to keyboards/frooastboard/nano/readme.md
index d465c3f4b7..d67f17483f 100644
--- a/keyboards/frooastboard/readme.md
+++ b/keyboards/frooastboard/nano/readme.md
@@ -1,19 +1,19 @@
-# Frooastboard
+# Frooastboard Nano
 
-![Frooastboard](https://i.imgur.com/f26O8JLh.jpg)
+![Frooastboard Nano](https://i.imgur.com/f26O8JLh.jpg)
 
 * Keyboard Maintainer: [Frooastside](https://github.com/frooastside)
-* Hardware Supported: Frooastboard
+* Hardware Supported: Frooastboard Nano
 * Hardware Availability: https://github.com/Frooastside/Frooastboard
 
 **Reset Key:** Hold down the key located at `K00`, commonly programmed as ESCAPE while plugging in the keyboard. (If via is used it is the key located at `K10`.)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make frooastboard:default
+    make frooastboard/nano:default
 
 Flashing example for this keyboard:
 
-    make frooastboard:default:flash
+    make frooastboard/nano:default:flash
 
 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).
diff --git a/keyboards/frooastboard/rules.mk b/keyboards/frooastboard/nano/rules.mk
similarity index 100%
rename from keyboards/frooastboard/rules.mk
rename to keyboards/frooastboard/nano/rules.mk

From 4666d2600801ecca959cc13911e69379978a0436 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 19 Feb 2022 02:53:36 +1100
Subject: [PATCH 642/867] Fix a couple of boards being wrongly identified as
 AVR (#16377)

---
 keyboards/mlego/m60_split/info.json            | 1 -
 keyboards/splitkb/kyria/rev1/proton_c/rules.mk | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/keyboards/mlego/m60_split/info.json b/keyboards/mlego/m60_split/info.json
index ad1f8f4bc9..c6c5ee480d 100644
--- a/keyboards/mlego/m60_split/info.json
+++ b/keyboards/mlego/m60_split/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "mlego/m60_split",
-    "keyboard_folder": "mlego/m60_split",
     "url": "https://gitlab.com/m-lego/m65",
     "maintainer": "alin elena",
     "layouts": {
diff --git a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk
index 9e0942398f..1a5f9a7cb3 100644
--- a/keyboards/splitkb/kyria/rev1/proton_c/rules.mk
+++ b/keyboards/splitkb/kyria/rev1/proton_c/rules.mk
@@ -1,3 +1,10 @@
+# MCU name
+MCU = STM32F303
+BOARD = QMK_PROTON_C
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 WS2812_DRIVER = pwm
 SERIAL_DRIVER = usart
 AUDIO_ENABLE = no

From 73657a7d5828b06c3a0dc9e35e126a0a26913b0b Mon Sep 17 00:00:00 2001
From: Matthew Dias <matthewdias@me.com>
Date: Sat, 19 Feb 2022 23:52:11 -0600
Subject: [PATCH 643/867] Add kikkou keyboard (#15291)

* Add kikkou keyboard

* Apply suggestions from code review

* Update keyboards/kikkou/rules.mk

* Apply suggestions from code review1
---
 keyboards/kikkou/config.h                 | 58 +++++++++++++++++++++++
 keyboards/kikkou/info.json                | 13 +++++
 keyboards/kikkou/keymaps/default/keymap.c | 54 +++++++++++++++++++++
 keyboards/kikkou/keymaps/via/keymap.c     | 54 +++++++++++++++++++++
 keyboards/kikkou/keymaps/via/rules.mk     |  1 +
 keyboards/kikkou/kikkou.c                 | 18 +++++++
 keyboards/kikkou/kikkou.h                 | 50 +++++++++++++++++++
 keyboards/kikkou/rules.mk                 | 18 +++++++
 8 files changed, 266 insertions(+)
 create mode 100644 keyboards/kikkou/config.h
 create mode 100644 keyboards/kikkou/info.json
 create mode 100644 keyboards/kikkou/keymaps/default/keymap.c
 create mode 100644 keyboards/kikkou/keymaps/via/keymap.c
 create mode 100644 keyboards/kikkou/keymaps/via/rules.mk
 create mode 100644 keyboards/kikkou/kikkou.c
 create mode 100644 keyboards/kikkou/kikkou.h
 create mode 100644 keyboards/kikkou/rules.mk

diff --git a/keyboards/kikkou/config.h b/keyboards/kikkou/config.h
new file mode 100644
index 0000000000..deedfd8382
--- /dev/null
+++ b/keyboards/kikkou/config.h
@@ -0,0 +1,58 @@
+/*
+Copyright 2021 Matthew Dias
+
+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       0x6D65
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Mechwerkes
+#define PRODUCT         Kikkou
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F0, F1, F4, F5, E6 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/kikkou/info.json b/keyboards/kikkou/info.json
new file mode 100644
index 0000000000..33b20030e3
--- /dev/null
+++ b/keyboards/kikkou/info.json
@@ -0,0 +1,13 @@
+{
+    "keyboard_name": "Kikkou",
+    "url": "",
+    "maintainer": "Mechwerkes",
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"0,14", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"1,14", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"2,14", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"3,14", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"0,14", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"1,14", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"2,14", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"3,14", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.5}, {"label":"4,1", "x":1.5, "y":4}, {"label":"4,2", "x":2.5, "y":4, "w":1.5}, {"label":"4,6", "x":4, "y":4, "w":7}, {"label":"4,11", "x":11, "y":4, "w":1.5}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/kikkou/keymaps/default/keymap.c b/keyboards/kikkou/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d7ac433753
--- /dev/null
+++ b/keyboards/kikkou/keymaps/default/keymap.c
@@ -0,0 +1,54 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_65_ansi_blocker(
+		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  
+		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_HOME,  
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,  
+		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_PGDN,  
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1] = LAYOUT_65_ansi_blocker(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[2] = LAYOUT_65_ansi_blocker(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[3] = LAYOUT_65_ansi_blocker(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	)
+
+};
diff --git a/keyboards/kikkou/keymaps/via/keymap.c b/keyboards/kikkou/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d7ac433753
--- /dev/null
+++ b/keyboards/kikkou/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_65_ansi_blocker(
+		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  
+		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_HOME,  
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,  
+		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_UP,   KC_PGDN,  
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LGUI, KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1] = LAYOUT_65_ansi_blocker(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[2] = LAYOUT_65_ansi_blocker(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[3] = LAYOUT_65_ansi_blocker(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+		KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	)
+
+};
diff --git a/keyboards/kikkou/keymaps/via/rules.mk b/keyboards/kikkou/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/kikkou/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/kikkou/kikkou.c b/keyboards/kikkou/kikkou.c
new file mode 100644
index 0000000000..704934ace2
--- /dev/null
+++ b/keyboards/kikkou/kikkou.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Matthew Dias
+
+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 "kikkou.h"
diff --git a/keyboards/kikkou/kikkou.h b/keyboards/kikkou/kikkou.h
new file mode 100644
index 0000000000..7a65880839
--- /dev/null
+++ b/keyboards/kikkou/kikkou.h
@@ -0,0 +1,50 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_65_ansi_blocker( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
+	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+	K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E  \
+) { \
+	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
+	{ K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+	{ K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }  \
+}
+
+#define LAYOUT_65_ansi_blocker_tsangan( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
+	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+	K40, K41, K42,                K46,                     K4B, K4C, K4D, K4E  \
+) { \
+	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
+	{ K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+	{ K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D, K4E }  \
+}
diff --git a/keyboards/kikkou/rules.mk b/keyboards/kikkou/rules.mk
new file mode 100644
index 0000000000..f9417ae2bf
--- /dev/null
+++ b/keyboards/kikkou/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file

From 60e28544b2ac9a4fc4150ece316352cf1d4eccef Mon Sep 17 00:00:00 2001
From: Benjamin Chausse <benjamin@chausse.xyz>
Date: Sun, 20 Feb 2022 02:10:15 -0500
Subject: [PATCH 644/867] Bliss Hotdox keymaps (#13160)

* Bliss Hotdox keymaps

* Update keyboards/hotdox/keymaps/bliss/keymap.c

* Update keyboards/hotdox/keymaps/bliss/keymap.c

* Add GPL License to keymap.c file
Changes to be committed:
	modified:   keymap.c

* make changes requested by fauxpark

* Update keyboards/hotdox/keymaps/bliss/readme.md

* Update keyboards/hotdox/keymaps/bliss/keymap.c

* Update keyboards/hotdox/keymaps/bliss/readme.md
---
 keyboards/hotdox/keymaps/bliss/keymap.c  | 173 +++++++++++++++++++++++
 keyboards/hotdox/keymaps/bliss/readme.md |   8 ++
 keyboards/hotdox/keymaps/bliss/rules.mk  |   5 +
 3 files changed, 186 insertions(+)
 create mode 100644 keyboards/hotdox/keymaps/bliss/keymap.c
 create mode 100644 keyboards/hotdox/keymaps/bliss/readme.md
 create mode 100644 keyboards/hotdox/keymaps/bliss/rules.mk

diff --git a/keyboards/hotdox/keymaps/bliss/keymap.c b/keyboards/hotdox/keymaps/bliss/keymap.c
new file mode 100644
index 0000000000..0076718fcb
--- /dev/null
+++ b/keyboards/hotdox/keymaps/bliss/keymap.c
@@ -0,0 +1,173 @@
+/* Copyright 2021 Benjamin Chausse
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "version.h"
+
+enum layer_names {
+    BASE, // default layer
+    FUNC, // functions keys, numbpad, and arrows
+};
+
+enum custom_keycodes {
+  VRSN = SAFE_RANGE,
+  RGB_SLD
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: default layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |    `   |   1  |   2  |   3  |   4  |   5  |   6  |           |   7  |   8  |   9  |   0  |   -  |   =  |  BkSp  |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * | Tab    |   Q  |   W  |   E  |   R  |   T  |   {  |           |  }   |   Y  |   U  |   I  |   O  |   P  |   \    |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * | TUX    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  | '/TUX  |
+ * |--------+------+------+------+------+------|   ^  |           |  &   |------+------+------+------+------+--------|
+ * | Shft/( |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |   /  | Shft/) |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   | Ctrl |  Alt | Caps |  MP1 | FUNC |                                       |  MR1 |  MS1 |   [  |   ]  | TFUNC |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,---------------.
+ *                                        |      | Prnt |       | INS  |  HOME  |
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      | Vol+ |       | PgUp |        |      |
+ *                                 | Space|Backsp|------|       |------|  Enter |  :   |
+ *                                 |      |ace   | Vol- |       | PgDn |        |      |
+ *                                 `--------------------'       `----------------------'
+ *
+ * MR1: Record macro 1               Prnt: Print Screen
+ * MS1: Stop recording macro 1       INS: INSERT
+ * MP1: Play macro 1                 TFUNC: Goto FUNC only while pressed
+ * FUNC: Set FUNC as default layer
+ *
+ *
+ */
+
+/* If it accepts an argument (i.e, is a function), it doesn't need KC_. */
+/* Otherwise, it needs KC_* */
+	[BASE] = LAYOUT_ergodox( /* layer 0: default */
+      /* Left hand */
+      KC_GRV,               KC_1,    KC_2,    KC_3,    KC_4,  KC_5, KC_6,
+      KC_TAB,               KC_Q,    KC_W,    KC_E,    KC_R,  KC_T, LSFT(KC_LBRC),
+      MT(MOD_LGUI, KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,  KC_G,
+      KC_LSPO,              KC_Z,    KC_X,    KC_C,    KC_V,  KC_B, LSFT(KC_6),
+      KC_LCTL,              KC_LALT, KC_CAPS, DM_PLY1, DF(1),
+
+      KC_NO, KC_PSCR,
+      KC_VOLU,
+      KC_SPC, KC_BSPC, KC_VOLD,
+
+      /* right hand */
+      KC_7,          KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,                KC_BSPC,
+      RSFT(KC_RBRC), KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,                  KC_BSLS,
+      KC_H,          KC_J,    KC_K,    KC_L,    KC_SCLN, MT(MOD_RGUI, KC_QUOT),
+      RSFT(KC_7),    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,               KC_RSPC,
+      DM_REC1,       DM_RSTP, KC_LBRC, KC_RBRC, MO(1),
+
+      KC_INS,  KC_HOME,
+      KC_PGUP,
+      KC_PGDN, KC_ENT,  RSFT(KC_SCLN)),
+
+/* Keymap 1: function keys, numpad, and arrows
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |        |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |           |  F7  |  F8  |  F9  | F10  | F11  | F12  |        |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      |      |  UP  |      |      |      |           |      |   /  |   7  |   8  |   9  |   -  |   \    |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      | LEFT | DOWN |RIGHT |      |------|           |------|   *  |   4  |   5  |   6  |   +  |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |   %  |   1  |   2  |   3  |   ,  | Shft/) |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   | Ctrl |  Alt | Caps |      | MAIN |                                       |   0  |   .  |  [   |   ]  |       |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,---------------.
+ *                                        |      | Prnt |       | Ins  |  Home  |
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      | Vol+ |       | PgUp |        |      |
+ *                                 | Space|Backsp|------|       |------|  Enter | Equal|
+ *                                 |      |ace   | Vol- |       | PgDn |        |      |
+ *                                 `--------------------'       `----------------------'
+ */
+
+	[FUNC] = LAYOUT_ergodox( /* layer 1: func */
+    /* left hand */
+    KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6,
+    KC_NO,   KC_NO,   KC_NO,   KC_UP,   KC_NO,   KC_NO, KC_NO,
+    KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,
+    KC_LCTL, KC_LALT, KC_CAPS, KC_NO,   DF(0),
+
+    KC_NO,   KC_PSCR,
+    KC_VOLU,
+    KC_SPC,  KC_BSPC, KC_VOLD,
+
+    /* right hand */
+    KC_F7,   KC_F8,      KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,
+    KC_NO,   KC_PSLS,    KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_BSLS,
+    KC_PAST, KC_P4,      KC_P5,   KC_P6,   KC_PPLS, KC_NO,
+    KC_NO,   LSFT(KC_5), KC_P1,   KC_P2,   KC_P3,   KC_PCMM, KC_RSPC,
+    KC_P0,   KC_PDOT,    KC_LBRC, KC_RBRC, KC_NO,
+
+    KC_INS,  KC_HOME,
+    KC_PGUP,
+    KC_PGDN, KC_ENT,  KC_PEQL)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    // dynamically generate these.
+    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 constantly in the background, in a loop.
+void matrix_scan_user(void) {
+
+    uint8_t layer = get_highest_layer(layer_state);
+
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
+    switch (layer) {
+      // TODO: Make this relevant to the ErgoDox EZ.
+        case 1:
+            ergodox_right_led_1_on();
+            break;
+        case 2:
+            ergodox_right_led_2_on();
+            break;
+        default:
+            // none
+            break;
+    }
+};
diff --git a/keyboards/hotdox/keymaps/bliss/readme.md b/keyboards/hotdox/keymaps/bliss/readme.md
new file mode 100644
index 0000000000..a31ee2826e
--- /dev/null
+++ b/keyboards/hotdox/keymaps/bliss/readme.md
@@ -0,0 +1,8 @@
+# Bliss for Hotdox
+
+This keymap for the ergodox hotdox is a take on a development setup I quite
+enjoy. Developers constantly use brackets and they should therefore be
+accessible instead of hidden away behind a shift key. Also this setup aims to minimize hand travel with a layer containing a numpad as well as arrows. Finally,
+this setup incorporates a dynamic macro recorder for an easy, software agnostic way to program macros.
+
+All keybinding diagrams can be read in the `keymap.c` file. It is quite well documented.
diff --git a/keyboards/hotdox/keymaps/bliss/rules.mk b/keyboards/hotdox/keymaps/bliss/rules.mk
new file mode 100644
index 0000000000..ca616d75ee
--- /dev/null
+++ b/keyboards/hotdox/keymaps/bliss/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
+EXTRAKEY_ENABLE = yes
+DYNAMIC_MACRO_ENABLE = yes

From 38e3be4c749f9d35a6d37e501d0fbaa737197240 Mon Sep 17 00:00:00 2001
From: Josh Hinnebusch <joshhinnebusch@gmail.com>
Date: Sun, 20 Feb 2022 03:21:18 -0500
Subject: [PATCH 645/867] Add h08_ocelot and h65 PCBs (#14054)

* add h65 start

* add h65 base files

* add ocelot base files

* add via keymap

* Update keyboards/hineybush/h08_ocelot/config.h

* Update keyboards/hineybush/h65/config.h

* add base files for h65 hotswap

* changes made per PR

* finally made updates per PR

* update readmes

* Update keyboards/hineybush/h65_hotswap/config.h

* Update keyboards/hineybush/h65_hotswap/rules.mk

* Update keyboards/hineybush/h65_hotswap/rules.mk

* Update keyboards/hineybush/h65_hotswap/readme.md

* Update keyboards/hineybush/h65_hotswap/info.json

* Update keyboards/hineybush/h65/rules.mk

* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c

* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c

* Update keyboards/hineybush/h65_hotswap/h65_hotswap.h

* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c

* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c

* Update keyboards/hineybush/h65/rules.mk

* Update keyboards/hineybush/h65/readme.md

* Update keyboards/hineybush/h08_ocelot/h08_ocelot.h

* Update keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c

* Update keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c

* Update keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c

* Update keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c

* Update keyboards/hineybush/h08_ocelot/readme.md

* Update keyboards/hineybush/h08_ocelot/rules.mk

* Update keyboards/hineybush/h08_ocelot/rules.mk

* Update keyboards/hineybush/h65/h65.h

* Update keyboards/hineybush/h08_ocelot/info.json

* Update keyboards/hineybush/h65/info.json

* Update keyboards/hineybush/h65/keymaps/default/keymap.c

* Apply suggestions from code review

* update jsons for default qmk config layout

* Update keyboards/hineybush/h08_ocelot/rules.mk

* Update keyboards/hineybush/h65/h65.h

* Update keyboards/hineybush/h65/info.json

* Update keyboards/hineybush/h65/keymaps/default/keymap.c

* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c

* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c

* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c

* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c

* Update keyboards/hineybush/h65_hotswap/rules.mk

* Update keyboards/hineybush/h65/config.h
---
 keyboards/hineybush/h08_ocelot/config.h       | 150 +++++++++++++++++
 keyboards/hineybush/h08_ocelot/h08_ocelot.c   |  17 ++
 keyboards/hineybush/h08_ocelot/h08_ocelot.h   |  36 +++++
 keyboards/hineybush/h08_ocelot/info.json      |  10 ++
 .../h08_ocelot/keymaps/default/keymap.c       |  35 ++++
 .../h08_ocelot/keymaps/default/readme.md      |   1 +
 .../hineybush/h08_ocelot/keymaps/via/keymap.c |  45 ++++++
 .../h08_ocelot/keymaps/via/readme.md          |   1 +
 .../hineybush/h08_ocelot/keymaps/via/rules.mk |   1 +
 keyboards/hineybush/h08_ocelot/readme.md      |  27 ++++
 keyboards/hineybush/h08_ocelot/rules.mk       |  18 +++
 keyboards/hineybush/h65/config.h              | 152 ++++++++++++++++++
 keyboards/hineybush/h65/h65.c                 |  17 ++
 keyboards/hineybush/h65/h65.h                 |  41 +++++
 keyboards/hineybush/h65/info.json             |  10 ++
 .../hineybush/h65/keymaps/default/keymap.c    |  40 +++++
 .../hineybush/h65/keymaps/default/readme.md   |   1 +
 keyboards/hineybush/h65/keymaps/mc65/keymap.c |  49 ++++++
 .../hineybush/h65/keymaps/mc65/readme.md      |   1 +
 keyboards/hineybush/h65/keymaps/mc65/rules.mk |   1 +
 keyboards/hineybush/h65/keymaps/via/keymap.c  |  49 ++++++
 keyboards/hineybush/h65/keymaps/via/readme.md |   1 +
 keyboards/hineybush/h65/keymaps/via/rules.mk  |   1 +
 keyboards/hineybush/h65/readme.md             |  27 ++++
 keyboards/hineybush/h65/rules.mk              |  21 +++
 keyboards/hineybush/h65_hotswap/config.h      | 150 +++++++++++++++++
 keyboards/hineybush/h65_hotswap/h65_hotswap.c |  17 ++
 keyboards/hineybush/h65_hotswap/h65_hotswap.h |  41 +++++
 keyboards/hineybush/h65_hotswap/info.json     |  10 ++
 .../h65_hotswap/keymaps/default/keymap.c      |  40 +++++
 .../h65_hotswap/keymaps/default/readme.md     |   1 +
 .../h65_hotswap/keymaps/via/keymap.c          |  49 ++++++
 .../h65_hotswap/keymaps/via/readme.md         |   1 +
 .../h65_hotswap/keymaps/via/rules.mk          |   1 +
 keyboards/hineybush/h65_hotswap/readme.md     |  27 ++++
 keyboards/hineybush/h65_hotswap/rules.mk      |  18 +++
 36 files changed, 1107 insertions(+)
 create mode 100644 keyboards/hineybush/h08_ocelot/config.h
 create mode 100644 keyboards/hineybush/h08_ocelot/h08_ocelot.c
 create mode 100644 keyboards/hineybush/h08_ocelot/h08_ocelot.h
 create mode 100644 keyboards/hineybush/h08_ocelot/info.json
 create mode 100644 keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c
 create mode 100644 keyboards/hineybush/h08_ocelot/keymaps/default/readme.md
 create mode 100644 keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c
 create mode 100644 keyboards/hineybush/h08_ocelot/keymaps/via/readme.md
 create mode 100644 keyboards/hineybush/h08_ocelot/keymaps/via/rules.mk
 create mode 100644 keyboards/hineybush/h08_ocelot/readme.md
 create mode 100644 keyboards/hineybush/h08_ocelot/rules.mk
 create mode 100644 keyboards/hineybush/h65/config.h
 create mode 100644 keyboards/hineybush/h65/h65.c
 create mode 100644 keyboards/hineybush/h65/h65.h
 create mode 100644 keyboards/hineybush/h65/info.json
 create mode 100644 keyboards/hineybush/h65/keymaps/default/keymap.c
 create mode 100644 keyboards/hineybush/h65/keymaps/default/readme.md
 create mode 100644 keyboards/hineybush/h65/keymaps/mc65/keymap.c
 create mode 100644 keyboards/hineybush/h65/keymaps/mc65/readme.md
 create mode 100644 keyboards/hineybush/h65/keymaps/mc65/rules.mk
 create mode 100644 keyboards/hineybush/h65/keymaps/via/keymap.c
 create mode 100644 keyboards/hineybush/h65/keymaps/via/readme.md
 create mode 100644 keyboards/hineybush/h65/keymaps/via/rules.mk
 create mode 100644 keyboards/hineybush/h65/readme.md
 create mode 100644 keyboards/hineybush/h65/rules.mk
 create mode 100644 keyboards/hineybush/h65_hotswap/config.h
 create mode 100644 keyboards/hineybush/h65_hotswap/h65_hotswap.c
 create mode 100644 keyboards/hineybush/h65_hotswap/h65_hotswap.h
 create mode 100644 keyboards/hineybush/h65_hotswap/info.json
 create mode 100644 keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
 create mode 100644 keyboards/hineybush/h65_hotswap/keymaps/default/readme.md
 create mode 100644 keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
 create mode 100644 keyboards/hineybush/h65_hotswap/keymaps/via/readme.md
 create mode 100644 keyboards/hineybush/h65_hotswap/keymaps/via/rules.mk
 create mode 100644 keyboards/hineybush/h65_hotswap/readme.md
 create mode 100644 keyboards/hineybush/h65_hotswap/rules.mk

diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h
new file mode 100644
index 0000000000..9b5fd2d9b9
--- /dev/null
+++ b/keyboards/hineybush/h08_ocelot/config.h
@@ -0,0 +1,150 @@
+/*
+Copyright 2021 hineybush
+
+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    0x04D8
+#define PRODUCT_ID   0xE8E9
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Hiney LLC
+#define PRODUCT      h08
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 4
+
+/*
+ * 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 { B4, B6 }
+#define MATRIX_COL_PINS { F4, C7, D0, D1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN F1
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 7
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 220 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/hineybush/h08_ocelot/h08_ocelot.c b/keyboards/hineybush/h08_ocelot/h08_ocelot.c
new file mode 100644
index 0000000000..e00bd9ecb5
--- /dev/null
+++ b/keyboards/hineybush/h08_ocelot/h08_ocelot.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 hineybush
+ *
+ * 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 "h08_ocelot.h"
diff --git a/keyboards/hineybush/h08_ocelot/h08_ocelot.h b/keyboards/hineybush/h08_ocelot/h08_ocelot.h
new file mode 100644
index 0000000000..92bded4558
--- /dev/null
+++ b/keyboards/hineybush/h08_ocelot/h08_ocelot.h
@@ -0,0 +1,36 @@
+/* Copyright 2021 hineybush
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13  \
+) { \
+    { k00, k01, k02, k03 }, \
+    { k10, k11, k12, k13 }  \
+}
+
diff --git a/keyboards/hineybush/h08_ocelot/info.json b/keyboards/hineybush/h08_ocelot/info.json
new file mode 100644
index 0000000000..2e8dd25a87
--- /dev/null
+++ b/keyboards/hineybush/h08_ocelot/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "h08",
+    "url": "",
+    "maintainer": "hineybush",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}]
+        }
+    }
+}
diff --git a/keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c b/keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e236a5c6ab
--- /dev/null
+++ b/keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 hineybush
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4,
+        KC_5, KC_6, KC_7, MO(_FN)
+    ),
+    [_FN] = LAYOUT(
+        RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
diff --git a/keyboards/hineybush/h08_ocelot/keymaps/default/readme.md b/keyboards/hineybush/h08_ocelot/keymaps/default/readme.md
new file mode 100644
index 0000000000..7bed472217
--- /dev/null
+++ b/keyboards/hineybush/h08_ocelot/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for h08
diff --git a/keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c b/keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d786dcad68
--- /dev/null
+++ b/keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2021 hineybush
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4,
+        KC_5, KC_6, KC_7, MO(_FN)
+    ),
+    [_FN1] = LAYOUT(
+        RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+    [_FN2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+    [_FN3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
diff --git a/keyboards/hineybush/h08_ocelot/keymaps/via/readme.md b/keyboards/hineybush/h08_ocelot/keymaps/via/readme.md
new file mode 100644
index 0000000000..54e95c67fd
--- /dev/null
+++ b/keyboards/hineybush/h08_ocelot/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA-enabled keymap for h08
diff --git a/keyboards/hineybush/h08_ocelot/keymaps/via/rules.mk b/keyboards/hineybush/h08_ocelot/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/hineybush/h08_ocelot/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/hineybush/h08_ocelot/readme.md b/keyboards/hineybush/h08_ocelot/readme.md
new file mode 100644
index 0000000000..07d170101c
--- /dev/null
+++ b/keyboards/hineybush/h08_ocelot/readme.md
@@ -0,0 +1,27 @@
+# h08
+
+![h08](https://i.imgur.com/8B0ORJE.png)
+
+8-key macropad for the Singa Ocelot.
+
+* Keyboard Maintainer: [hineybush](https://github.com/hineybush)
+* Hardware Supported: h08
+* Hardware Availability: Singa Ocelot
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hineybush/h08_ocelot:default
+
+Flashing example for this keyboard:
+
+    make hineybush/h08_ocelot:default:flash
+
+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).
diff --git a/keyboards/hineybush/h08_ocelot/rules.mk b/keyboards/hineybush/h08_ocelot/rules.mk
new file mode 100644
index 0000000000..465de5f68d
--- /dev/null
+++ b/keyboards/hineybush/h08_ocelot/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h
new file mode 100644
index 0000000000..320e9c6fe8
--- /dev/null
+++ b/keyboards/hineybush/h65/config.h
@@ -0,0 +1,152 @@
+/*
+Copyright 2021 hineybush
+
+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    0x04D8
+#define PRODUCT_ID   0xE9E4
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Hiney LLC
+#define PRODUCT      h65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 { D7, D6, D4, D1, D0 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, B0, B1, B2, B3 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+#define LED_CAPS_LOCK_PIN E6
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+#define BACKLIGHT_PIN B7
+#define BACKLIGHT_LEVELS 3
+#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN D2
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 17
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/hineybush/h65/h65.c b/keyboards/hineybush/h65/h65.c
new file mode 100644
index 0000000000..76467ef91b
--- /dev/null
+++ b/keyboards/hineybush/h65/h65.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 hineybush
+ *
+ * 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 "h65.h"
diff --git a/keyboards/hineybush/h65/h65.h b/keyboards/hineybush/h65/h65.h
new file mode 100644
index 0000000000..8e82f1620f
--- /dev/null
+++ b/keyboards/hineybush/h65/h65.h
@@ -0,0 +1,41 @@
+/* Copyright 2021 hineybush
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k114, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k214,  \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k314,  \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k414,  \
+    k400, k401, k402,       k403,       k406,       k408, k409, k410, k411, k412, k413   \
+) { \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114 }, \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214 }, \
+    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314 }, \
+    { k400, k401, k402, k403, KC_NO,KC_NO,k406,KC_NO, k408, k409, k410, k411, k412, k413, k414 }  \
+}
diff --git a/keyboards/hineybush/h65/info.json b/keyboards/hineybush/h65/info.json
new file mode 100644
index 0000000000..770875afae
--- /dev/null
+++ b/keyboards/hineybush/h65/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "h65",
+    "url": "",
+    "maintainer": "hineybush",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":12.75, "y":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/hineybush/h65/keymaps/default/keymap.c b/keyboards/hineybush/h65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d563cbbc7a
--- /dev/null
+++ b/keyboards/hineybush/h65/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 hineybush
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_all(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
+    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_HOME,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT),
+
+    [_FN] = LAYOUT(
+    KC_TRNS,  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_TRNS,  KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    RESET,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_PGUP,
+    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_PGDN,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_MPLY,  KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS
+    )
+};
diff --git a/keyboards/hineybush/h65/keymaps/default/readme.md b/keyboards/hineybush/h65/keymaps/default/readme.md
new file mode 100644
index 0000000000..17b99a5cde
--- /dev/null
+++ b/keyboards/hineybush/h65/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for h65
diff --git a/keyboards/hineybush/h65/keymaps/mc65/keymap.c b/keyboards/hineybush/h65/keymaps/mc65/keymap.c
new file mode 100644
index 0000000000..b135741b3f
--- /dev/null
+++ b/keyboards/hineybush/h65/keymaps/mc65/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 hineybush
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
+    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_HOME,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT),
+
+    [_FN1] = LAYOUT(
+    KC_TRNS, 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_TRNS,    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,    KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_PGUP,
+    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_PGDN,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS,  KC_MPLY,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS),
+
+    [_FN2] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS)
+};
+
+
diff --git a/keyboards/hineybush/h65/keymaps/mc65/readme.md b/keyboards/hineybush/h65/keymaps/mc65/readme.md
new file mode 100644
index 0000000000..ec8815555f
--- /dev/null
+++ b/keyboards/hineybush/h65/keymaps/mc65/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for h65
diff --git a/keyboards/hineybush/h65/keymaps/mc65/rules.mk b/keyboards/hineybush/h65/keymaps/mc65/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/hineybush/h65/keymaps/mc65/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/hineybush/h65/keymaps/via/keymap.c b/keyboards/hineybush/h65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b135741b3f
--- /dev/null
+++ b/keyboards/hineybush/h65/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 hineybush
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
+    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_HOME,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT),
+
+    [_FN1] = LAYOUT(
+    KC_TRNS, 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_TRNS,    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,    KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_PGUP,
+    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_PGDN,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS,  KC_MPLY,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS),
+
+    [_FN2] = LAYOUT(
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS)
+};
+
+
diff --git a/keyboards/hineybush/h65/keymaps/via/readme.md b/keyboards/hineybush/h65/keymaps/via/readme.md
new file mode 100644
index 0000000000..ec8815555f
--- /dev/null
+++ b/keyboards/hineybush/h65/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for h65
diff --git a/keyboards/hineybush/h65/keymaps/via/rules.mk b/keyboards/hineybush/h65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/hineybush/h65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/hineybush/h65/readme.md b/keyboards/hineybush/h65/readme.md
new file mode 100644
index 0000000000..c793a44966
--- /dev/null
+++ b/keyboards/hineybush/h65/readme.md
@@ -0,0 +1,27 @@
+# h65
+
+![h65](https://i.imgur.com/Q1m98Hnh.png)
+
+A 65%, USB 2.0 Type C PCB. 
+
+* Keyboard Maintainer: [hineybush](https://github.com/hineybush)
+* Hardware Supported: h65, Singa Kohaku, MC65 "mcbitch" PCB
+* Hardware Availability: Singa Kohaku Group Buy, MC65
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+Make example for this keyboard (after setting up your build environment):
+
+    make h65:default
+
+Flashing example for this keyboard:
+
+    make h65:default:flash
+
+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).
diff --git a/keyboards/hineybush/h65/rules.mk b/keyboards/hineybush/h65/rules.mk
new file mode 100644
index 0000000000..b8ddfaba64
--- /dev/null
+++ b/keyboards/hineybush/h65/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h
new file mode 100644
index 0000000000..805476d002
--- /dev/null
+++ b/keyboards/hineybush/h65_hotswap/config.h
@@ -0,0 +1,150 @@
+/*
+Copyright 2021 hineybush
+
+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    0x04D8
+#define PRODUCT_ID   0xE8B7
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Hiney LLC
+#define PRODUCT      h65 hotswap
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 { D7, D6, D4, D1, D0 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, B0, B1, B2, B3 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+#define LED_CAPS_LOCK_PIN E6
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+#define BACKLIGHT_PIN B7
+#define BACKLIGHT_LEVELS 3
+#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN D2
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 17
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/hineybush/h65_hotswap/h65_hotswap.c b/keyboards/hineybush/h65_hotswap/h65_hotswap.c
new file mode 100644
index 0000000000..df5e56bf0b
--- /dev/null
+++ b/keyboards/hineybush/h65_hotswap/h65_hotswap.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 hineybush
+ *
+ * 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 "h65_hotswap.h"
diff --git a/keyboards/hineybush/h65_hotswap/h65_hotswap.h b/keyboards/hineybush/h65_hotswap/h65_hotswap.h
new file mode 100644
index 0000000000..a4b41be481
--- /dev/null
+++ b/keyboards/hineybush/h65_hotswap/h65_hotswap.h
@@ -0,0 +1,41 @@
+/* Copyright 2021 hineybush
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k114, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k214,  \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k314,  \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k414,  \
+    k400, k401, k402,       k404,       k406,       k407, k409, k410, k411, k412, k413   \
+) { \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114 }, \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214 }, \
+    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314 }, \
+    { k400, k401, k402, KC_NO,k404 ,KC_NO,k406, k407, KC_NO, k409, k410, k411, k412, k413, k414 }  \
+}
diff --git a/keyboards/hineybush/h65_hotswap/info.json b/keyboards/hineybush/h65_hotswap/info.json
new file mode 100644
index 0000000000..105358b98d
--- /dev/null
+++ b/keyboards/hineybush/h65_hotswap/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "h65 hotswap",
+    "url": "",
+    "maintainer": "hineybush",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":12.75, "y":2}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c b/keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c69e1e34bd
--- /dev/null
+++ b/keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 hineybush
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
+    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_HOME,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT),
+
+    [_FN] = LAYOUT_all(
+    KC_TRNS,  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_TRNS,  KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    RESET,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_PGUP,
+    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_PGDN,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_MPLY,  KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS
+    )
+};
diff --git a/keyboards/hineybush/h65_hotswap/keymaps/default/readme.md b/keyboards/hineybush/h65_hotswap/keymaps/default/readme.md
new file mode 100644
index 0000000000..9984e09531
--- /dev/null
+++ b/keyboards/hineybush/h65_hotswap/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for h65 hotswap
diff --git a/keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c b/keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d225a8c834
--- /dev/null
+++ b/keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2021 hineybush
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_all(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
+    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_HOME,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT),
+
+    [_FN1] = LAYOUT_all(
+    KC_TRNS, 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_TRNS,    KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,    KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_PGUP,
+    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_PGDN,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS,  KC_MPLY,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS),
+
+    [_FN2] = LAYOUT_all(
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS)
+};
+
+
diff --git a/keyboards/hineybush/h65_hotswap/keymaps/via/readme.md b/keyboards/hineybush/h65_hotswap/keymaps/via/readme.md
new file mode 100644
index 0000000000..a8811e97c1
--- /dev/null
+++ b/keyboards/hineybush/h65_hotswap/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for h65 hotswap
diff --git a/keyboards/hineybush/h65_hotswap/keymaps/via/rules.mk b/keyboards/hineybush/h65_hotswap/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/hineybush/h65_hotswap/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/hineybush/h65_hotswap/readme.md b/keyboards/hineybush/h65_hotswap/readme.md
new file mode 100644
index 0000000000..5e2250b5af
--- /dev/null
+++ b/keyboards/hineybush/h65_hotswap/readme.md
@@ -0,0 +1,27 @@
+# h65 hotswap
+
+![h65 hotswap](https://i.imgur.com/QKeHtDrh.png)
+
+A 65%, hotswap, USB 2.0 Type C PCB. 
+
+* Keyboard Maintainer: [hineybush](https://github.com/hineybush)
+* Hardware Supported: h65hs, Singa Kohaku 
+* Hardware Availability: Singa Kohaku Group Buy 
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hineybush/h65:default
+
+Flashing example for this keyboard:
+
+    make hineybush/h65:default:flash
+
+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).
diff --git a/keyboards/hineybush/h65_hotswap/rules.mk b/keyboards/hineybush/h65_hotswap/rules.mk
new file mode 100644
index 0000000000..702fe717f2
--- /dev/null
+++ b/keyboards/hineybush/h65_hotswap/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 60f22831cb9fd65ab4157794df42828950f88300 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 21 Feb 2022 00:57:03 +1100
Subject: [PATCH 646/867] clueboard/card: disable Command to reduce size
 (#16404)

---
 keyboards/clueboard/card/info.json                    |  2 +-
 keyboards/clueboard/card/keymaps/default/rules.mk     | 11 +++--------
 keyboards/clueboard/card/keymaps/rgb_effects/rules.mk | 11 +++--------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/keyboards/clueboard/card/info.json b/keyboards/clueboard/card/info.json
index 24088b2c41..1a01f17d67 100644
--- a/keyboards/clueboard/card/info.json
+++ b/keyboards/clueboard/card/info.json
@@ -10,7 +10,7 @@
     "backlight": true,
     "bluetooth": false,
     "bootmagic": false,
-    "command": true,
+    "command": false,
     "console": true,
     "extrakey": true,
     "lto": true,
diff --git a/keyboards/clueboard/card/keymaps/default/rules.mk b/keyboards/clueboard/card/keymaps/default/rules.mk
index 61915b691f..55e9563d3e 100644
--- a/keyboards/clueboard/card/keymaps/default/rules.mk
+++ b/keyboards/clueboard/card/keymaps/default/rules.mk
@@ -1,9 +1,4 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
+MOUSEKEY_ENABLE = no
+EXTRAKEY_ENABLE = no
 NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
+AUDIO_ENABLE = no
diff --git a/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk b/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
index 1914acdbd4..55e9563d3e 100644
--- a/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
@@ -1,9 +1,4 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
-COMMAND_ENABLE = yes        # Commands for debug and configuration
+MOUSEKEY_ENABLE = no
+EXTRAKEY_ENABLE = no
 NKRO_ENABLE = yes
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.
+AUDIO_ENABLE = no

From d175ee1d9bc679b501391ad4a8b463d6d9def721 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 21 Feb 2022 05:36:15 +1100
Subject: [PATCH 647/867] rart67m: move OLED and WPM code to default keymap
 (#16403)

* rart67m: move OLED and WPM code to default keymap

* Apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
---
 .../rart/rart67m/keymaps/default/keymap.c     | 148 ++++++++++++++----
 keyboards/rart/rart67m/keymaps/via/rules.mk   |   3 +-
 keyboards/rart/rart67m/rart67m.c              | 122 ---------------
 3 files changed, 121 insertions(+), 152 deletions(-)

diff --git a/keyboards/rart/rart67m/keymaps/default/keymap.c b/keyboards/rart/rart67m/keymaps/default/keymap.c
index fcb55816c8..39fc0b31db 100644
--- a/keyboards/rart/rart67m/keymaps/default/keymap.c
+++ b/keyboards/rart/rart67m/keymaps/default/keymap.c
@@ -14,36 +14,128 @@
  */
 #include QMK_KEYBOARD_H
 
+#define IDLE_FRAMES 5
+#define IDLE_SPEED 30
+#define TAP_FRAMES 2
+#define TAP_SPEED 40
+#define ANIM_FRAME_DURATION 200
+#define ANIM_SIZE 512
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all(
-    KC_ESC,  KC_1,    KC_2,    KC_3,  KC_4,   KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,   KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,   KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,   KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
-    KC_LCTL, KC_LALT,                         KC_SPC,                        MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,  KC_4,   KC_5,   KC_6,  KC_7,  KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,   KC_T,   KC_Y,  KC_U,  KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,  KC_F,   KC_G,   KC_H,  KC_J,  KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,  KC_V,   KC_B,   KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LALT,                         KC_SPC,                        MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-  [1] = LAYOUT_all(
-    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
+    [1] = LAYOUT_all(
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
 
-  [2] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
+#ifdef OLED_ENABLE
+static uint32_t anim_timer = 0;
+static uint32_t anim_sleep = 0;
+static uint8_t current_idle_frame = 0;
+static uint8_t current_tap_frame = 0;
 
-  [3] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    ),
-}; 
\ No newline at end of file
+static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
+    {
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
+        64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    },
+    {
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
+        64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
+        7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    },
+    {
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
+        32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    },
+    {
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
+        64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
+        7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    },
+    {
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
+        32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    }
+};
+
+static const char PROGMEM prep[][ANIM_SIZE] = {
+    {
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
+        64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    }
+};
+
+static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
+    {
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
+        95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
+        1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    },
+    {
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
+        32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    }
+};
+
+void animation_phase(void) {
+    if (get_current_wpm() <= IDLE_SPEED) {
+        current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
+        oled_write_raw_P(idle[abs((IDLE_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
+    }
+
+    if (get_current_wpm() > IDLE_SPEED && get_current_wpm() < TAP_SPEED) {
+        oled_write_raw_P(prep[0], ANIM_SIZE);
+    }
+
+    if (get_current_wpm() >= TAP_SPEED) {
+        current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
+        oled_write_raw_P(tap[abs((TAP_FRAMES - 1) - current_tap_frame)], ANIM_SIZE);
+    }
+}
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+
+bool oled_task_user(void) {
+
+    if (get_current_wpm() > 0) {
+        oled_on();
+
+        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+            anim_timer = timer_read32();
+            animation_phase();
+        }
+
+        anim_sleep = timer_read32();
+    } else {
+        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
+            oled_off();
+        } else {
+            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+                anim_timer = timer_read32();
+                animation_phase();
+            }
+        }
+    }
+    return false;
+}
+
+#endif
diff --git a/keyboards/rart/rart67m/keymaps/via/rules.mk b/keyboards/rart/rart67m/keymaps/via/rules.mk
index 2a9abbb4dd..36b7ba9cbc 100644
--- a/keyboards/rart/rart67m/keymaps/via/rules.mk
+++ b/keyboards/rart/rart67m/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
-WPM_ENABLE = yes
 VIA_ENABLE = yes
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
diff --git a/keyboards/rart/rart67m/rart67m.c b/keyboards/rart/rart67m/rart67m.c
index e696a5cf3e..4aa99c5203 100644
--- a/keyboards/rart/rart67m/rart67m.c
+++ b/keyboards/rart/rart67m/rart67m.c
@@ -13,125 +13,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "rart67m.h"
-
-#define IDLE_FRAMES 5
-#define IDLE_SPEED 30
-#define TAP_FRAMES 2
-#define TAP_SPEED 40
-#define ANIM_FRAME_DURATION 200
-#define ANIM_SIZE 512
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;
-}
-
-bool oled_task_kb(void) {
-    if (!oled_task_user()) {
-        return false;
-    }
-static uint32_t anim_timer = 0;
-static uint32_t anim_sleep = 0;
-static uint8_t current_idle_frame = 0;
-static uint8_t current_tap_frame = 0;
-
-    static const char PROGMEM idle[IDLE_FRAMES][ANIM_SIZE] = {
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,16,8,8,4,4,4,8,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,100,130,2,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,56,4,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-            7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,64,64,64,64,32,32,32,32,16,8,4,2,2,4,24,96,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,60,194,1,1,2,2,4,4,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,96,96,0,129,130,130,132,8,16,32,64,128,0,0,0,0,128,128,128,128,64,64,64,64,32,
-            32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,25,6,0,0,0,0,0,0,0,24,24,24,27,3,0,64,160,34,36,20,18,18,18,11,8,8,8,8,5,5,9,9,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,
-            7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,8,4,2,2,2,4,56,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,226,1,1,2,2,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,192,193,193,194,4,8,16,32,64,128,0,0,0,128,128,128,128,64,64,64,64,
-            32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,12,12,12,13,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,2,2,4,4,8,8,8,8,8,7,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        }
-
-    };
-
-    static const char PROGMEM prep[][ANIM_SIZE] = {
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,
-            64,64,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,195,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        }
-
-    };
-
-    static const char PROGMEM tap[TAP_FRAMES][ANIM_SIZE] = {
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,248,248,248,248,0,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,129,128,128,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,1,2,4,8,16,32,67,135,7,1,0,184,188,190,159,
-            95,95,79,76,32,32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,24,6,5,152,153,132,67,124,65,65,64,64,32,33,34,18,17,17,17,9,8,8,8,8,4,4,8,8,16,16,16,16,16,17,15,1,61,124,252,252,252,252,252,60,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,2,2,1,1,1,
-            1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        },
-
-        {
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,0,0,0,0,0,128,64,64,32,32,32,32,16,16,16,16,8,4,2,1,1,2,12,48,64,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,225,0,0,1,1,2,2,1,0,0,0,0,128,128,0,0,0,0,0,0,0,0,0,128,0,48,48,0,0,1,225,26,6,9,49,53,1,138,124,0,0,128,128,128,128,64,64,64,64,32,
-            32,32,32,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,112,12,3,0,0,0,0,0,0,0,0,0,0,1,1,0,64,160,33,34,18,17,17,17,9,8,8,8,8,4,4,4,4,4,4,2,2,2,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,128,128,128,128,128,64,64,64,64,64,32,32,32,32,32,16,16,16,16,16,8,8,8,8,8,4,4,4,4,4,2,3,122,122,121,121,121,121,57,49,2,2,4,4,8,8,8,136,136,135,128,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-        }
-
-    };
-
-    void animation_phase(void) {
-
-        if (get_current_wpm() <=IDLE_SPEED) {
-            current_idle_frame = (current_idle_frame + 1) % IDLE_FRAMES;
-            oled_write_raw_P(idle[abs((IDLE_FRAMES-1)-current_idle_frame)], ANIM_SIZE);
-        }
-
-        if (get_current_wpm() >IDLE_SPEED && get_current_wpm() <TAP_SPEED) {
-            oled_write_raw_P(prep[0], ANIM_SIZE);
-        }
-
-        if (get_current_wpm() >=TAP_SPEED) {
-            current_tap_frame = (current_tap_frame + 1) % TAP_FRAMES;
-            oled_write_raw_P(tap[abs((TAP_FRAMES-1)-current_tap_frame)], ANIM_SIZE);
-        }
-    }
-
-    if (get_current_wpm() > 0) {
-
-        oled_on();
-
-        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-            anim_timer = timer_read32();
-            animation_phase();
-        }
-
-        anim_sleep = timer_read32();
-    } else {
-        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
-            oled_off();
-        } else {
-            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
-                anim_timer = timer_read32();
-                animation_phase();
-            }
-        }
-    }
-    return false;
-}
-
-#endif

From 3bc8afbb81d2910dbfff45d6c5a26bd54f793697 Mon Sep 17 00:00:00 2001
From: HorrorTroll <sonicvipduc@gmail.com>
Date: Mon, 21 Feb 2022 08:18:35 +0700
Subject: [PATCH 648/867] Update fix for MW65_rgb and added personal keymap
 (#15279)

* Update fix for MW65 and added personal keymap

* Resolve fix

* Resolved fix, again

* Added missing GPLv2 license headers

* Resolved issue
---
 keyboards/mwstudio/mw65_rgb/config.h          |  73 +++-
 .../mw65_rgb/keymaps/default/keymap.c         |   8 +-
 .../mw65_rgb/keymaps/horrortroll/config.h     |  40 +++
 .../mw65_rgb/keymaps/horrortroll/keymap.c     | 103 ++++++
 .../keymaps/horrortroll/keymap_stuff.h        | 335 ++++++++++++++++++
 .../keymaps/horrortroll/led/cool_diagonal.c   |  22 ++
 .../keymaps/horrortroll/led/custom_gradient.c |  74 ++++
 .../keymaps/horrortroll/led/diagonal.c        |  22 ++
 .../mw65_rgb/keymaps/horrortroll/led/kitt.c   |  68 ++++
 .../rainbow_reactive_simple.c                 |  25 ++
 .../rainbow_reactive_simple.h                 |  45 +++
 .../horrortroll/led/random_breath_rainbow.c   |  55 +++
 .../mw65_rgb/keymaps/horrortroll/readme.md    |  11 +
 .../keymaps/horrortroll/rgb_matrix_user.inc   |  17 +
 .../mw65_rgb/keymaps/horrortroll/rules.mk     |   6 +
 .../mw65_rgb/keymaps/thearesia/config.h       |  26 ++
 .../mw65_rgb/keymaps/thearesia/keymap.c       | 201 +++++++++++
 .../mw65_rgb/keymaps/thearesia/readme.md      |   3 +
 .../mw65_rgb/keymaps/thearesia/rules.mk       |   2 +
 .../mwstudio/mw65_rgb/keymaps/via/keymap.c    |   8 +-
 keyboards/mwstudio/mw65_rgb/mw65_rgb.c        |  44 +--
 keyboards/mwstudio/mw65_rgb/mw65_rgb.h        |  12 +-
 keyboards/mwstudio/mw65_rgb/rules.mk          |   2 +
 23 files changed, 1150 insertions(+), 52 deletions(-)
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/config.h
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap.c
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/cool_diagonal.c
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/custom_gradient.c
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/diagonal.c
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/kitt.c
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.c
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/random_breath_rainbow.c
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/readme.md
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/rgb_matrix_user.inc
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/rules.mk
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/thearesia/config.h
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/thearesia/readme.md
 create mode 100644 keyboards/mwstudio/mw65_rgb/keymaps/thearesia/rules.mk

diff --git a/keyboards/mwstudio/mw65_rgb/config.h b/keyboards/mwstudio/mw65_rgb/config.h
index 8a320664a9..d484f7e351 100644
--- a/keyboards/mwstudio/mw65_rgb/config.h
+++ b/keyboards/mwstudio/mw65_rgb/config.h
@@ -26,11 +26,11 @@
 #define PRODUCT         MW65
 
 /* key matrix size */
-#define MATRIX_ROWS 6
+#define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
 /* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, B7, B0 }
+#define MATRIX_ROW_PINS { D0, D1, D2, D3, B7 }
 #define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, D4, C7, F7, F6, F5, F4, F1, F0, E6 }
 
 #define BOOTMAGIC_LITE_ROW 0
@@ -42,20 +42,59 @@
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
-    #define RGBLIGHT_SLEEP
-
-    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
-    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
-    #define DRIVER_LED_TOTAL 83
-    #define RGBLED_NUM 83
-    #define RGB_MATRIX_KEYPRESSES
-
-    #define RGBLIGHT_HUE_STEP 8
-    #define RGBLIGHT_SAT_STEP 8
-    #define RGBLIGHT_VAL_STEP 8
-#endif
-
+/* Encoder pins */
 #define ENCODERS_PAD_A { B1 }
 #define ENCODERS_PAD_B { B2 }
+
+/* RGB Matrix config */
+#define RGB_DI_PIN B3
+
+#ifdef RGB_MATRIX_ENABLE
+    #define DRIVER_LED_TOTAL 83
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+    #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+    #define RGB_MATRIX_KEYPRESSES
+
+    /* RGB Matrix effect */
+    #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+    #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+    #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_BREATHING
+    #define ENABLE_RGB_MATRIX_BAND_SAT
+    #define ENABLE_RGB_MATRIX_BAND_VAL
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+    #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+    #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+    #define ENABLE_RGB_MATRIX_CYCLE_ALL
+    #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+    #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+    #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+    #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+    #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+    #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+    #define ENABLE_RGB_MATRIX_DUAL_BEACON
+    #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+    #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+    #define ENABLE_RGB_MATRIX_RAINDROPS
+    #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+    #define ENABLE_RGB_MATRIX_HUE_BREATHING
+    #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+    #define ENABLE_RGB_MATRIX_HUE_WAVE
+    #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+    #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+    #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+    #define ENABLE_RGB_MATRIX_SPLASH
+    #define ENABLE_RGB_MATRIX_MULTISPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+    #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/default/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/default/keymap.c
index 7028a223c5..ba043525e6 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/default/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[0] = LAYOUT_65_ansi_blocker(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_VOLD, KC_DEL,  KC_VOLU,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         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_PGDN,
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-	[1] = LAYOUT(
+	[1] = LAYOUT_65_ansi_blocker(
         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,  _______,   _______, RGB_HUI, _______,
         RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                            RGB_MOD, _______, RGB_SPD, RGB_VAD, RGB_SPI
     ),
 
-	[2] = LAYOUT(
+	[2] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
-	[3] = LAYOUT(
+	[3] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/config.h b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/config.h
new file mode 100644
index 0000000000..13cffea4da
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/config.h
@@ -0,0 +1,40 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 DYNAMIC_KEYMAP_LAYER_COUNT 3
+
+/* Forcing to use NKRO instead 6KRO */
+#define FORCE_NKRO
+
+/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
+#define USB_POLLING_INTERVAL_MS 1
+#define QMK_KEYS_PER_SCAN 12
+
+#ifdef RGB_MATRIX_ENABLE
+    /* RGB Matrix config */
+    #undef ENABLE_RGB_MATRIX_BAND_SAT
+    #undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+    #undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+    #undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+	
+    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+    #undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+    #undef ENABLE_RGB_MATRIX_SPLASH
+    #undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+#endif
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap.c
new file mode 100644
index 0000000000..2ca3152589
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap.c
@@ -0,0 +1,103 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "keymap_stuff.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+                                                                VolD ◯ VolU
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bckspc│Hom│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │End│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │PgU│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ ↑ │PgD│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ │ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+                                                                     ◯
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSht │   │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │    │    │ │   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5     6         7     8     9        10       11       12       13       14     */
+	[_BASE] = LAYOUT(
+                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_6,     KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_VOLD, KC_HOME, KC_VOLU,
+                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_END,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_H,     KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+                KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V, KC_B,     KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+                KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPACE,             MO(_FN), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+/*
+                                                                     ◯
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│  Home │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │     │   │   │   │   │   │   │   │   │   │   │   │   │Pause│Ins│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │      │   │   │   │   │   │   │   │   │   │   │   │  PrtSc │Del│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │ Fn │    │ │   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12       13        14     */
+	[_FN] = LAYOUT(
+                KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME,    _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PAUSE, KC_INS,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PSCR,  KC_DEL,
+                _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
+                _______, _______, _______,                            _______,                   _______, MO(_RN),          _______, _______,  _______
+    ),
+
+/*
+                                                                     ◯
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │Rst│   │   │   │   │   │   │   │   │   │   │   │   │       │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │     │1Hd│1Hi│1Sd│1Si│1Vd│1Vi│   │Hud│Hui│   │C_E│   │     │Tog│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │      │2Hd│2Hi│2Sd│2Si│2Vd│2Vi│   │Sad│Sai│   │   │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │        │Pre│Ref│Flp│   │   │   │Spd│Spi│   │   │      │Vai│   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │    │ Rn │ │Rod│Vad│Mod│
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12        13       14     */
+	[_RN] = LAYOUT(
+                RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,   _______, _______, _______,
+                _______, G1_HUD,  G1_HUI,  G1_SAD,  G1_SAI,  G1_VAD,  G1_VAI,  _______, RGB_HUD, RGB_HUI, _______, RGB_C_E, _______,  _______, RGB_TOG,
+                _______, G2_HUD,  G2_HUI,  G2_SAD,  G2_SAI,  G2_VAD,  G2_VAI,  _______, RGB_SAD, RGB_SAI, _______, _______,           _______, _______,
+                _______,          G_PRE,   REF_G,   G_FLIP,  _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______,  RGB_VAI, _______,
+                _______, _______, _______,                            _______,                   _______, _______,          RGB_RMOD, RGB_VAD, RGB_MOD
+    ),
+};
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h
new file mode 100644
index 0000000000..c8b8015363
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/keymap_stuff.h
@@ -0,0 +1,335 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 <string.h>
+#include <math.h>
+
+#include <lib/lib8tion/lib8tion.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.
+
+enum layer_names {
+    _BASE = 0,
+    _FN = 1,
+    _RN = 2
+};
+
+// For CUSTOM_GRADIENT
+HSV gradient_0          = {205, 250, 255};
+HSV gradient_100        = {140, 215, 125};
+bool reflected_gradient = false;
+uint8_t gp_i            = 0;
+
+typedef struct {
+    HSV gradient_0;
+    HSV gradient_1;
+    bool reflected;
+} CUSTOM_PRESETS;
+
+enum user_rgb_mode {
+    RGB_MODE_ALL,
+    RGB_MODE_KEYLIGHT,
+    RGB_MODE_UNDERGLOW,
+    RGB_MODE_NONE,
+};
+
+typedef union {
+    uint32_t raw;
+    struct {
+        uint8_t rgb_mode :8;
+    };
+} user_config_t;
+
+user_config_t user_config;
+
+enum layer_keycodes {
+    //Custom Gradient control keycode
+    G1_HUI = SAFE_RANGE, //Custom gradient color 1 hue increase
+    G1_HUD,              //Custom gradient color 1 hue decrease
+    G1_SAI,              //Custom gradient color 1 saturation increase
+    G1_SAD,              //Custom gradient color 1 saturation decrease
+    G1_VAI,              //Custom gradient color 1 value increase
+    G1_VAD,              //Custom gradient color 1 value decrease
+    G2_HUI,              //Custom gradient color 2 hue increase
+    G2_HUD,              //Custom gradient color 2 hue decrease
+    G2_SAI,              //Custom gradient color 2 saturation increase
+    G2_SAD,              //Custom gradient color 2 saturation decrease
+    G2_VAI,              //Custom gradient color 2 value increase
+    G2_VAD,              //Custom gradient color 2 value decrease
+    G_PRE,               //Gradient presets
+    REF_G,               //Toggle between linear and reflected gradient
+    G_FLIP,              //Flip the gradient colors
+  
+    //Custom led effect keycode
+    RGB_C_E,             //Cycle user effect
+};
+
+void keyboard_post_init_kb(void) {
+    user_config.raw = eeconfig_read_user();
+    switch (user_config.rgb_mode) {
+        case RGB_MODE_ALL:
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_enable_noeeprom();
+            break;
+        case RGB_MODE_KEYLIGHT:
+            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case RGB_MODE_UNDERGLOW:
+            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case RGB_MODE_NONE:
+            rgb_matrix_set_flags(LED_FLAG_NONE);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    uint8_t color_adj_step = 5;
+
+    CUSTOM_PRESETS gradient_presets[] = {
+    {{41 , 255, 255}, {233, 245, 255}, false },
+    {{45 , 245, 155}, {160, 255,  80}, false },
+    {{173, 245,  40}, {41 , 255, 205}, true  },
+    {{32 , 255, 165}, {217, 185,  70}, false },
+    {{240, 255, 145}, {115, 255, 245}, true  },
+    {{118, 255, 255}, {242, 255, 255}, false },
+    {{212,  0 ,   0}, {223, 235, 165}, true  },
+    {{205, 250, 255}, {140, 215, 125}, false },
+    };
+
+    uint8_t gp_length = sizeof(gradient_presets)/sizeof(gradient_presets[0]);
+
+    switch (keycode) {
+        case G1_HUI:
+            if (record->event.pressed) {
+                gradient_0.h += color_adj_step;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_HUD:
+            if (record->event.pressed) {
+                gradient_0.h -= color_adj_step;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_SAI:
+            if (record->event.pressed) {
+                gradient_0.s = (gradient_0.s + color_adj_step * 2 <= 255) ? gradient_0.s + color_adj_step * 2 : 255;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_SAD:
+            if (record->event.pressed) {
+                gradient_0.s = (gradient_0.s - color_adj_step * 2 >= 0) ? gradient_0.s - color_adj_step * 2 : 0;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_VAI:
+            if (record->event.pressed) {
+                gradient_0.v = (gradient_0.v + color_adj_step * 2 <= 255) ? gradient_0.v + color_adj_step * 2 : 255;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G1_VAD:
+            if (record->event.pressed) {
+                gradient_0.v = (gradient_0.v - color_adj_step * 2 >= 0) ? gradient_0.v - color_adj_step * 2 : 0;
+                dprintf("Gradient 0 HSV: %d, %d, %d\n", gradient_0.h, gradient_0.s, gradient_0.v);
+            }
+            return false;
+        case G2_HUI:
+            if (record->event.pressed) {
+                gradient_100.h += color_adj_step;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_HUD:
+            if (record->event.pressed) {
+                gradient_100.h -= color_adj_step;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_SAI:
+            if (record->event.pressed) {
+                gradient_100.s = (gradient_100.s + color_adj_step * 2 <= 255) ? gradient_100.s + color_adj_step * 2 : 255;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_SAD:
+            if (record->event.pressed) {
+                gradient_100.s = (gradient_100.s - color_adj_step * 2 >= 0) ? gradient_100.s - color_adj_step * 2 : 0;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_VAI:
+            if (record->event.pressed) {
+                gradient_100.v = (gradient_100.v + color_adj_step * 2 <= 255) ? gradient_100.v + color_adj_step * 2 : 255;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G2_VAD:
+            if (record->event.pressed) {
+                gradient_100.v = (gradient_100.v - color_adj_step * 2 >= 0) ? gradient_100.v - color_adj_step * 2 : 0;
+                dprintf("Gradient 100 HSV: %d, %d, %d\n", gradient_100.h, gradient_100.s, gradient_100.v);
+            }
+            return false;
+        case G_PRE:
+            if (record->event.pressed) {
+                gp_i = (gp_i + gp_length ) % gp_length;
+
+                gradient_0 = gradient_presets[gp_i].gradient_0;
+                gradient_100 = gradient_presets[gp_i].gradient_1;
+                reflected_gradient = gradient_presets[gp_i].reflected;
+
+                gp_i += 1;
+            }
+            return false;
+        case REF_G:
+            if (record->event.pressed) {
+                reflected_gradient = !reflected_gradient;
+            }
+            return false;
+        case G_FLIP:
+            if (record->event.pressed) {
+                HSV temp_color = gradient_0;
+                gradient_0 = gradient_100;
+                gradient_100 = temp_color;
+            }
+            return false;
+        case RGB_C_E:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_mode()) {
+                    case RGB_MATRIX_CUSTOM_CUSTOM_GRADIENT:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_DIAGONAL);
+                        return false;
+                    case RGB_MATRIX_CUSTOM_DIAGONAL:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_COOL_DIAGONAL);
+                        return false;
+                    case RGB_MATRIX_CUSTOM_COOL_DIAGONAL:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_RAINBOW_REACTIVE_SIMPLE);
+                        return false;
+                    case RGB_MATRIX_CUSTOM_RAINBOW_REACTIVE_SIMPLE:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_KITT);
+                        return false;
+                    case RGB_MATRIX_CUSTOM_KITT:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_RANDOM_BREATH_RAINBOW);
+                        return false;
+                    default:
+                        rgb_matrix_mode(RGB_MATRIX_CUSTOM_CUSTOM_GRADIENT);
+                        return false;
+                }
+            }
+            return false;
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_KEYLIGHT;
+                    }
+                    break;
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_UNDERGLOW;
+                    }
+                    break;
+                    case (LED_FLAG_UNDERGLOW): {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_NONE;
+                    }
+                    break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                        user_config.rgb_mode = RGB_MODE_ALL;
+                    }
+                    break;
+                }
+                eeconfig_update_user(user_config.raw);
+            }
+            return false;
+	}
+    return true;
+}
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+  if (index == 0) {
+    if (clockwise) {
+        tap_code(dynamic_keymap_get_keycode(biton32(layer_state), 4, 3));
+    } else {
+        tap_code(dynamic_keymap_get_keycode(biton32(layer_state), 4, 4));
+    }
+  }
+  return true;
+}
+#endif
+
+void rgb_matrix_indicators_user(void) {
+    switch (biton32(layer_state)) {
+        case _FN:
+            rgb_matrix_set_color(16, 0, 0, 0); rgb_matrix_set_color(17, 0, 0, 0); rgb_matrix_set_color(18, 0, 0, 0); rgb_matrix_set_color(21, 0, 0, 0);
+            rgb_matrix_set_color(22, 0, 0, 0); rgb_matrix_set_color(23, 0, 0, 0); rgb_matrix_set_color(24, 0, 0, 0); rgb_matrix_set_color(25, 0, 0, 0);
+            rgb_matrix_set_color(26, 0, 0, 0); rgb_matrix_set_color(27, 0, 0, 0); rgb_matrix_set_color(28, 0, 0, 0); rgb_matrix_set_color(29, 0, 0, 0);
+            rgb_matrix_set_color(30, 0, 0, 0); rgb_matrix_set_color(31, 0, 0, 0); rgb_matrix_set_color(32, 0, 0, 0); rgb_matrix_set_color(33, 0, 0, 0);
+            rgb_matrix_set_color(34, 0, 0, 0); rgb_matrix_set_color(35, 0, 0, 0); rgb_matrix_set_color(36, 0, 0, 0); rgb_matrix_set_color(37, 0, 0, 0);
+            rgb_matrix_set_color(38, 0, 0, 0); rgb_matrix_set_color(41, 0, 0, 0); rgb_matrix_set_color(42, 0, 0, 0); rgb_matrix_set_color(43, 0, 0, 0);
+            rgb_matrix_set_color(44, 0, 0, 0); rgb_matrix_set_color(45, 0, 0, 0); rgb_matrix_set_color(46, 0, 0, 0); rgb_matrix_set_color(47, 0, 0, 0);
+            rgb_matrix_set_color(48, 0, 0, 0); rgb_matrix_set_color(49, 0, 0, 0); rgb_matrix_set_color(50, 0, 0, 0); rgb_matrix_set_color(51, 0, 0, 0);
+            rgb_matrix_set_color(52, 0, 0, 0); rgb_matrix_set_color(53, 0, 0, 0); rgb_matrix_set_color(54, 0, 0, 0); rgb_matrix_set_color(55, 0, 0, 0);
+            rgb_matrix_set_color(56, 0, 0, 0); rgb_matrix_set_color(57, 0, 0, 0); rgb_matrix_set_color(58, 0, 0, 0); rgb_matrix_set_color(59, 0, 0, 0);
+            rgb_matrix_set_color(60, 0, 0, 0); rgb_matrix_set_color(61, 0, 0, 0); rgb_matrix_set_color(62, 0, 0, 0); rgb_matrix_set_color(63, 0, 0, 0);
+            rgb_matrix_set_color(64, 0, 0, 0); rgb_matrix_set_color(65, 0, 0, 0); rgb_matrix_set_color(68, 0, 0, 0);
+            break;
+        case _RN:
+            rgb_matrix_set_color(20, 0, 0, 0); rgb_matrix_set_color(21, 0, 0, 0); rgb_matrix_set_color(22, 0, 0, 0); rgb_matrix_set_color(23, 0, 0, 0);
+            rgb_matrix_set_color(24, 0, 0, 0); rgb_matrix_set_color(25, 0, 0, 0); rgb_matrix_set_color(29, 0, 0, 0); rgb_matrix_set_color(30, 0, 0, 0);
+            rgb_matrix_set_color(31, 0, 0, 0); rgb_matrix_set_color(34, 0, 0, 0); rgb_matrix_set_color(35, 0, 0, 0); rgb_matrix_set_color(36, 0, 0, 0);
+            rgb_matrix_set_color(38, 0, 0, 0); rgb_matrix_set_color(39, 0, 0, 0); rgb_matrix_set_color(40, 0, 0, 0); rgb_matrix_set_color(41, 0, 0, 0);
+            rgb_matrix_set_color(42, 0, 0, 0); rgb_matrix_set_color(45, 0, 0, 0); rgb_matrix_set_color(52, 0, 0, 0); rgb_matrix_set_color(53, 0, 0, 0);
+            rgb_matrix_set_color(60, 0, 0, 0); rgb_matrix_set_color(63, 0, 0, 0); rgb_matrix_set_color(65, 0, 0, 0); rgb_matrix_set_color(66, 0, 0, 0);
+            rgb_matrix_set_color(68, 0, 0, 0); rgb_matrix_set_color(69, 0, 0, 0); rgb_matrix_set_color(70, 0, 0, 0); rgb_matrix_set_color(71, 0, 0, 0);
+            rgb_matrix_set_color(72, 0, 0, 0); rgb_matrix_set_color(73, 0, 0, 0); rgb_matrix_set_color(74, 0, 0, 0); rgb_matrix_set_color(75, 0, 0, 0);
+            rgb_matrix_set_color(76, 0, 0, 0); rgb_matrix_set_color(77, 0, 0, 0); rgb_matrix_set_color(78, 0, 0, 0); rgb_matrix_set_color(79, 0, 0, 0);
+            rgb_matrix_set_color(80, 0, 0, 0); rgb_matrix_set_color(81, 0, 0, 0);
+            break;
+    }
+
+    HSV      hsv = rgb_matrix_config.hsv;
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
+    hsv.h        = time;
+    RGB      rgb = hsv_to_rgb(hsv);
+
+    if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
+        if (host_keyboard_led_state().caps_lock) {
+            rgb_matrix_set_color(52, rgb.r, rgb.g, rgb.b);
+        }
+    } else {
+        if (host_keyboard_led_state().caps_lock) {
+            rgb_matrix_set_color(52, rgb.r, rgb.g, rgb.b);
+        } else {
+            rgb_matrix_set_color(52, 0, 0, 0);
+        }
+    }
+}
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/cool_diagonal.c b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/cool_diagonal.c
new file mode 100644
index 0000000000..367b3d5720
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/cool_diagonal.c
@@ -0,0 +1,22 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+static HSV COOL_DIAGONAL_math(HSV hsv, uint8_t i, uint8_t time) {
+    hsv.h = (g_led_config.point[i].x / 4) - g_led_config.point[i].y - time;
+    return hsv;
+}
+
+bool COOL_DIAGONAL(effect_params_t* params) { return effect_runner_i(params, &COOL_DIAGONAL_math); }
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/custom_gradient.c b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/custom_gradient.c
new file mode 100644
index 0000000000..49e4a242fb
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/custom_gradient.c
@@ -0,0 +1,74 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+extern HSV gradient_0;
+extern HSV gradient_100;
+extern bool reflected_gradient;
+
+static HSV INTERPOLATE_HSV(float step, HSV gradient_0, HSV gradient_100) {
+    uint8_t cw, ccw;
+    HSV color;
+
+    cw = (gradient_0.h >= gradient_100.h) ? 255 + gradient_100.h - gradient_0.h : gradient_100.h - gradient_0.h;  // Hue range is 0 to 255.
+    ccw = (gradient_0.h >= gradient_100.h) ? gradient_0.h - gradient_100.h : 255 + gradient_0.h - gradient_100.h;
+
+    if( cw < ccw ) { // going clockwise
+        color.h = gradient_0.h + (uint8_t)(step * cw);
+    } else { // Going counter clockwise
+        color.h = gradient_0.h - (uint8_t)(step * ccw);
+    }
+
+    color.s = gradient_0.s + step * (gradient_100.s - gradient_0.s);
+
+    // Scale V with global RGB Matrix's V, so users can still control overall brightness with RGB_VAI & RGB_VAD0
+    color.v = round((gradient_0.v + step * (gradient_100.v - gradient_0.v)) * ((float)rgb_matrix_config.hsv.v / 255));
+
+    return color;
+}
+
+static HSV CUSTOM_GRADIENT_math(uint8_t led_x, uint8_t min_x, uint8_t max_x) {
+    float step = (float)led_x / (max_x - min_x);
+    float mid_gradient_pos = 0.5;
+
+    if( reflected_gradient ) {
+        if( step <= mid_gradient_pos ) {
+            return INTERPOLATE_HSV(step * (1/mid_gradient_pos), gradient_0, gradient_100);
+        } else {
+            return INTERPOLATE_HSV((step - mid_gradient_pos) * (1/(1-mid_gradient_pos)), gradient_100, gradient_0);
+        }
+
+    } else {
+        return INTERPOLATE_HSV(step, gradient_0, gradient_100);
+    }
+}
+
+static bool CUSTOM_GRADIENT(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t min_x = 0;  // X coordinate of the left-most LED
+    uint8_t max_x = 224; // X coordinate of the right-most LED
+
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+
+        HSV hsv_orig = CUSTOM_GRADIENT_math(g_led_config.point[i].x, min_x, max_x);
+        RGB rgb = hsv_to_rgb(hsv_orig);
+
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+
+    return led_max < DRIVER_LED_TOTAL;
+}
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/diagonal.c b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/diagonal.c
new file mode 100644
index 0000000000..19e3791bd6
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/diagonal.c
@@ -0,0 +1,22 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+static HSV DIAGONAL_math(HSV hsv, uint8_t i, uint8_t time) {
+    hsv.h = g_led_config.point[i].x - g_led_config.point[i].y - time;
+    return hsv;
+}
+
+bool DIAGONAL(effect_params_t* params) { return effect_runner_i(params, &DIAGONAL_math); }
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/kitt.c b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/kitt.c
new file mode 100644
index 0000000000..7f45cc23e2
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/kitt.c
@@ -0,0 +1,68 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+// variable for startup animation
+bool BASE_EFFECT_NOT_STARTED_YET = true;
+uint8_t base_effect_startup_counter = 255;
+
+uint8_t led_count = 10;
+uint8_t led_first = 41;
+
+static uint8_t time_to_led(uint8_t time, uint8_t led_behind) {
+    uint16_t led_time = led_count * time;
+    uint16_t step = ((2 * led_count + (led_time / 128)) - led_behind) % (2 * led_count);
+    uint8_t led;
+
+    if (step < led_count) {
+        led = step;
+    } else {
+        led = led_count - 1 - (step - led_count);
+    }
+
+    return led;
+}
+
+static HSV KITT_math(HSV hsv, uint8_t i, uint8_t time) {
+
+    // reset base effect startup
+    if (i == 0) {
+        BASE_EFFECT_NOT_STARTED_YET = true;
+    }
+
+    hsv.h = 0;
+    hsv.s = 255;
+
+    if (i >= led_first && i < led_first + led_count) {
+        uint8_t j = i - led_first;
+        if (j == time_to_led(time, 0)) {
+            hsv.v = hsv.v;
+        } else if (j == time_to_led(time, 1)) {
+            hsv.v = hsv.v/2;
+        } else if (j == time_to_led(time, 2)) {
+            hsv.v = hsv.v/4;
+        } else if (j == time_to_led(time, 3)) {
+            hsv.v = hsv.v/8;
+        } else {
+            hsv.v = 0;
+        }
+    } else {
+        hsv.v = 0;
+    }
+
+    return hsv;
+}
+
+bool KITT(effect_params_t* params) { return effect_runner_i(params, &KITT_math); }
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.c b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.c
new file mode 100644
index 0000000000..ae33988721
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.c
@@ -0,0 +1,25 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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 "led/rainbow_reactive_simple/rainbow_reactive_simple.h"
+
+static HSV RAINBOW_REACTIVE_SIMPLE_math(HSV hsv, uint8_t i, uint8_t time, uint16_t offset) {
+    hsv.h = g_led_config.point[i].x - time;
+    hsv.v = scale8(255 - offset, hsv.v);
+    return hsv;
+}
+
+bool RAINBOW_REACTIVE_SIMPLE(effect_params_t* params) { return effect_rainbow_reactive(params, &RAINBOW_REACTIVE_SIMPLE_math); }
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h
new file mode 100644
index 0000000000..56b204e0a9
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/rainbow_reactive_simple/rainbow_reactive_simple.h
@@ -0,0 +1,45 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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
+
+typedef HSV (*rainbow_reactive_f)(HSV hsv, uint8_t i, uint8_t time, uint16_t offset);
+
+bool effect_rainbow_reactive(effect_params_t* params, rainbow_reactive_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4);
+    uint16_t max_tick = 65535 / rgb_matrix_config.speed;
+
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        uint16_t tick = max_tick;
+
+        // Reverse search to find most recent key hit
+        for (int8_t j = g_last_hit_tracker.count - 1; j >= 0; j--) {
+            if (g_last_hit_tracker.index[j] == i && g_last_hit_tracker.tick[j] < tick) {
+                tick = g_last_hit_tracker.tick[j];
+                break;
+            }
+        }
+
+        uint16_t offset = scale16by8(tick, rgb_matrix_config.speed);
+        RGB      rgb    = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time, offset));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+
+    return led_max < DRIVER_LED_TOTAL;
+}
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/random_breath_rainbow.c b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/random_breath_rainbow.c
new file mode 100644
index 0000000000..041417477b
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/led/random_breath_rainbow.c
@@ -0,0 +1,55 @@
+/* Copyright 2021 HorrorTroll <https://github.com/HorrorTroll>
+ *
+ * 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/>.
+ */
+
+static uint8_t offset[DRIVER_LED_TOTAL];
+
+static void doRandom_breath_rainbow(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
+    uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 6);
+
+    if (rand() * 50 == 1) {
+        if (rand() * 2 == 1) {
+            offset[i]++;
+        }
+        else {
+            offset[i]--;
+        }
+    }
+
+    //float val = (((float)sin8(time + offset[i]) / 256)/2.1) + .05;
+    HSV hsv = {0, 255, 255};
+    hsv.h = scale16by8(g_rgb_timer + offset[i], rgb_matrix_config.speed / 4) + (offset[i]*2);
+    hsv.v = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+}
+
+bool RANDOM_BREATH_RAINBOW(effect_params_t* params) {
+    
+    if (!params->init) {
+        // Change one LED every tick, make sure speed is not 0
+        doRandom_breath_rainbow(rand() % DRIVER_LED_TOTAL, params);
+        return false;
+    }
+	
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    for (uint8_t i = led_min; i < led_max; i++) {
+        doRandom_breath_rainbow(i, params);
+    }
+
+    return led_max < DRIVER_LED_TOTAL;
+}
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/readme.md b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/readme.md
new file mode 100644
index 0000000000..2341d818ec
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/readme.md
@@ -0,0 +1,11 @@
+# My personal keymap with VIA and custom LED effect
+
+Keymap is default 67 qwerty, 65 ansi blocker layout
+
+It have new LED effect:
+
+- Custom gradient (ported from SirTimmyTimbit code [https://github.com/SirTimmyTimbit/customizable-gradient-effect-for-drop-alt])
+- Diagonal (ported from pleasuretek code [https://github.com/pleasuretek/qmk_firmware])
+- Rainbow reactive simple
+- Knight Rider (ported from jumper149 code [https://github.com/jumper149/qmk_firmware/blob/jumper149/keyboards/dztech/dz65rgb/keymaps/jumper149/])
+- Random breath rainbow (based from daed code [https://github.com/daed/qmk_firmware/blob/master/keyboards/massdrop/alt/keymaps/daed] and modify by me)
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/rgb_matrix_user.inc b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/rgb_matrix_user.inc
new file mode 100644
index 0000000000..ea742af2d4
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/rgb_matrix_user.inc
@@ -0,0 +1,17 @@
+RGB_MATRIX_EFFECT(CUSTOM_GRADIENT)
+RGB_MATRIX_EFFECT(DIAGONAL)
+RGB_MATRIX_EFFECT(COOL_DIAGONAL)
+RGB_MATRIX_EFFECT(RAINBOW_REACTIVE_SIMPLE)
+RGB_MATRIX_EFFECT(KITT)
+RGB_MATRIX_EFFECT(RANDOM_BREATH_RAINBOW)
+
+#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+#include "led/custom_gradient.c"
+#include "led/diagonal.c"
+#include "led/cool_diagonal.c"
+#include "led/rainbow_reactive_simple/rainbow_reactive_simple.c"
+#include "led/kitt.c"
+#include "led/random_breath_rainbow.c"
+
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/rules.mk b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/rules.mk
new file mode 100644
index 0000000000..c1f6494e2c
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/horrortroll/rules.mk
@@ -0,0 +1,6 @@
+MOUSEKEY_ENABLE = no       # Mouse keys
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
+# can this go just in the keymap?
+RGB_MATRIX_CUSTOM_USER = yes
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/config.h b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/config.h
new file mode 100644
index 0000000000..ba574e1e3c
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/config.h
@@ -0,0 +1,26 @@
+/* Copyright 2021 Thearesia
+ *
+ * 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 DYNAMIC_KEYMAP_LAYER_COUNT 2
+
+/* Forcing to use NKRO instead 6KRO */
+#define FORCE_NKRO
+
+/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
+#define USB_POLLING_INTERVAL_MS 1
+#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c
new file mode 100644
index 0000000000..70279c3347
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/keymap.c
@@ -0,0 +1,201 @@
+/* Copyright 2021 Thearesia
+ *
+ * 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 <string.h>
+#include <math.h>
+
+#include <lib/lib8tion/lib8tion.h>
+
+#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.
+
+enum layer_names {
+    _BASE = 0,
+    _FN = 1
+};
+
+// enum layer_keycodes { };
+
+enum user_rgb_mode {
+    RGB_MODE_ALL,
+    RGB_MODE_KEYLIGHT,
+    RGB_MODE_UNDERGLOW,
+    RGB_MODE_NONE,
+};
+
+typedef union {
+    uint32_t raw;
+    struct {
+        uint8_t rgb_mode :8;
+    };
+} user_config_t;
+
+user_config_t user_config;
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+                                                                VolD ◯ VolU
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Bckspc│Hom│
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │ Tab │ q │ w │ e │ r │ t │ y │ u │ i │ o │ p │ [ │ ] │  \  │End│
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ a │ s │ d │ f │ g │ h │ j │ k │ l │ ; │ ' │  Enter │PgU│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ z │ x │ c │ v │ b │ n │ m │ , │ . │ / │ RSft │ ↑ │PgD│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │LCrl│GUI │LAlt│         Space          │RAlt│ Fn │ │ ← │ ↓ │ → │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+                                                                     ◯
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+       │ ~ │ ! │ @ │ # │ $ │ % │ ^ │ & │ * │ ( │ ) │ _ │ + │       │   │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+       │     │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ { │ } │  |  │   │
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ : │ " │        │   │
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │ LShift │ Z │ X │ C │ V │ B │ N │ M │ < │ > │ ? │ RSht │   │   │
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │    │    │ │   │   │   │
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5     6         7     8     9        10       11       12       13       14     */
+	[_BASE] = LAYOUT(
+                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5, KC_6,     KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_VOLD, KC_HOME, KC_VOLU,
+                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_END,
+                KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G, KC_H,     KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+                KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V, KC_B,     KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+                KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPACE,             MO(_FN), KC_RCTL,          KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+/*
+       ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐      /────\
+       │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│  Home │     │     │
+       ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┐ │     │
+       │Reset│   │   │   │   │   │   │   │   │Hud│Hui│   │   │Pause│Ins│ \────/
+       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+       │      │   │   │   │   │   │   │   │   │Sad│Sai│   │  PrtSc │Del│
+       ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+       │        │   │   │   │   │   │   │   │Spd│Spi│   │      │Vai│Tog│
+       ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+       │    │    │    │                        │    │ Fn │ │Rod│Vad│Mod│
+       └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+*/
+    /*  Row:    0        1        2        3        4        5        6        7        8        9        10       11       12        13        14     */
+	[_FN] = LAYOUT(
+                KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,   KC_HOME,    _______, _______, _______,
+                RESET,   _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______,  KC_PAUSE, KC_INS,
+                _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______,           KC_PSCR,  KC_DEL,
+                _______,          _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, _______, _______, _______,  RGB_VAI,  RGB_TOG,
+                _______, _______, _______,                            _______,                   _______, _______,          RGB_RMOD, RGB_VAD,  RGB_MOD
+    ),
+};
+
+void keyboard_post_init_kb(void) {
+    user_config.raw = eeconfig_read_user();
+    switch (user_config.rgb_mode) {
+        case RGB_MODE_ALL:
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_enable_noeeprom();
+            break;
+        case RGB_MODE_KEYLIGHT:
+            rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case RGB_MODE_UNDERGLOW:
+            rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case RGB_MODE_NONE:
+            rgb_matrix_set_flags(LED_FLAG_NONE);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case RGB_TOG:
+            if (record->event.pressed) {
+                switch (rgb_matrix_get_flags()) {
+                    case LED_FLAG_ALL: {
+                        rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_KEYLIGHT;
+                    }
+                    break;
+                    case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+                        rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_UNDERGLOW;
+                    }
+                    break;
+                    case (LED_FLAG_UNDERGLOW): {
+                        rgb_matrix_set_flags(LED_FLAG_NONE);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                        user_config.rgb_mode = RGB_MODE_NONE;
+                    }
+                    break;
+                    default: {
+                        rgb_matrix_set_flags(LED_FLAG_ALL);
+                        rgb_matrix_enable_noeeprom();
+                        user_config.rgb_mode = RGB_MODE_ALL;
+                    }
+                    break;
+                }
+                eeconfig_update_user(user_config.raw);
+            }
+            return false;
+    }
+    return true;
+}
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+  if (index == 0) {
+    if (clockwise) {
+        tap_code(dynamic_keymap_get_keycode(biton32(layer_state), 4, 3));
+    } else {
+        tap_code(dynamic_keymap_get_keycode(biton32(layer_state), 4, 4));
+    }
+  }
+  return true;
+}
+#endif
+
+void rgb_matrix_indicators_user(void) {
+    HSV      hsv = rgb_matrix_config.hsv;
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(32, 1));
+    hsv.h        = time;
+    RGB      rgb = hsv_to_rgb(hsv);
+
+    if ((rgb_matrix_get_flags() & LED_FLAG_KEYLIGHT)) {
+        if (host_keyboard_led_state().caps_lock) {
+            rgb_matrix_set_color(52, rgb.r, rgb.g, rgb.b);
+        }
+    } else {
+        if (host_keyboard_led_state().caps_lock) {
+            rgb_matrix_set_color(52, rgb.r, rgb.g, rgb.b);
+        } else {
+            rgb_matrix_set_color(52, 0, 0, 0);
+        }
+    }
+}
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/readme.md b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/readme.md
new file mode 100644
index 0000000000..0fb9e0a292
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/readme.md
@@ -0,0 +1,3 @@
+# Personal Layout with VIA
+
+Keymap is default 67 qwerty, 65 ansi blocker layout
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/rules.mk b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/thearesia/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
index 78a17233e3..76884095a7 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ user_config_t user_config;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[0] = LAYOUT_65_ansi_blocker(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_VOLD, KC_DEL,  KC_VOLU,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         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_PGDN,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-	[1] = LAYOUT(
+	[1] = LAYOUT_65_ansi_blocker(
         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,  _______,   _______, RGB_HUI, _______,
         RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          USER00,  RGB_SAI,
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                   RGB_MOD, _______,          RGB_SPD, RGB_VAD, RGB_SPI
     ),
 
-	[2] = LAYOUT(
+	[2] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
-	[3] = LAYOUT(
+	[3] = LAYOUT_65_ansi_blocker(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
diff --git a/keyboards/mwstudio/mw65_rgb/mw65_rgb.c b/keyboards/mwstudio/mw65_rgb/mw65_rgb.c
index e49944f1ce..5fd657c6b9 100644
--- a/keyboards/mwstudio/mw65_rgb/mw65_rgb.c
+++ b/keyboards/mwstudio/mw65_rgb/mw65_rgb.c
@@ -18,28 +18,30 @@
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
-  { 82,     81,     80,     79,     78,     77,     76,     75,     74,     73,     72,     71,     70,     69,     68 },
-  { 53,     54,     55,     56,     57,     58,     59,     60,     61,     62,     63,     64,     65,     66,     67 },
-  { 52,     51,     50,     49,     48,     47,     46,     45,     44,     43,     42,     41,     NO_LED, 40,     39 },
-  { 25,     NO_LED, 26,     27,     28,     29,     30,     31,     32,     33,     34,     35,     36,     37,     38 },
-  { 24,     23,     22,     NO_LED, NO_LED, NO_LED, 21,     NO_LED, NO_LED, 15,     20,     19,     18,     17,     16 },
+    { 82,     81,     80,     79,     78,     77,     76,     75,     74,     73,     72,     71,     70,     69,     68 },
+    { 53,     54,     55,     56,     57,     58,     59,     60,     61,     62,     63,     64,     65,     66,     67 },
+    { 52,     51,     50,     49,     48,     47,     46,     45,     44,     43,     42,     41, NO_LED,     40,     39 },
+    { 25, NO_LED,     26,     27,     28,     29,     30,     31,     32,     33,     34,     35,     36,     37,     38 },
+    { 24,     23,     22, NO_LED, NO_LED, NO_LED,     21, NO_LED, NO_LED, NO_LED,     20,     19,     18,     17,     16 }
+}, {
+    //Underglow (0 -> 15)
+    {180, 52}, {146, 52}, {86 , 52}, {45 , 52}, {7  , 52}, {7  , 36}, {7  , 20}, {7  ,  4}, {45 ,  4}, {86 ,  4}, {146,  4}, {180,  4}, {217,  4}, {217, 20}, {217, 36}, {217, 52},
 
-  { 0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,     12,     13,     14 }
+    //Key matrix (16 -> 83)
+    {224, 64}, {209, 64}, {194, 64}, {173, 64}, {156, 64},                                  {96 , 64},                                  {36 , 64}, {19 , 64}, {2  , 64},
+    {8  , 48}, {31 , 48}, {46 , 48}, {61 , 48}, {76 , 48}, {91 , 48}, {106, 48}, {121, 48}, {136, 48}, {151, 48}, {166, 48}, {188, 48}, {210, 48},            {224, 48},
+    {224, 32}, {200, 32},            {175, 32}, {160, 32}, {145, 32}, {130, 32}, {115, 32}, {100, 32}, {85 , 32}, {70 , 32}, {55 , 32}, {40 , 32}, {25 , 32}, {5  , 32},
+    {3  , 16}, {21 , 16}, {36 , 16}, {51 , 16}, {66 , 16}, {81 , 16}, {96 , 16}, {111, 16}, {126, 16}, {141, 16}, {156, 16}, {171, 16}, {186, 16}, {205, 16}, {224, 16},
+    {224,  0}, {202,  0}, {180,  0}, {165,  0}, {150,  0}, {135,  0}, {120,  0}, {105,  0}, {90 ,  0}, {75 ,  0}, {60 ,  0}, {45 ,  0}, {30 ,  0}, {15 ,  0}, {0  ,  0},
 }, {
-    { 175, 45 },{ 130, 45 },{ 85, 45 },  { 50, 45 },  {  15, 45 }, { 15, 35 }, { 15, 25 }, { 15, 10 },
-    { 50, 10 }, { 85, 10 }, { 130, 10 }, { 175, 10 }, { 210, 10 }, { 210, 25 }, { 210, 35 }, { 210, 45 },
-    { 217, 54 }, { 203, 54 }, { 189, 54 }, { 166, 54 }, { 150, 54 }, { 95, 54 }, { 40, 54 }, { 24, 54 }, { 8, 54 },
-    { 17, 42 }, { 39, 42 }, { 53, 42 }, { 67, 42 }, { 81, 42 }, { 95, 42 }, { 109, 42 }, { 123, 42 }, { 137, 42 }, { 151, 42 }, { 165, 42 }, { 184, 42 }, { 203, 42 }, { 217, 42 },
-    { 217, 30 }, { 195, 30 }, { 172, 30 }, { 158, 30 }, { 144, 30 }, { 130, 30 }, { 116, 30 }, { 102, 30 }, { 88, 30 }, { 74, 30 }, { 60, 30 }, { 46, 30 }, { 32, 30 },{ 13, 30 },
-    { 9, 18 }, { 25, 18 }, { 39, 18 }, { 53, 18 }, { 67, 18 }, { 81, 18 }, { 95, 18 }, { 109, 18 }, { 123, 18 }, { 137, 18 }, { 151, 18 }, { 165, 18 }, { 181, 18 }, { 199, 18 }, { 217, 18 },
-    { 217, 6 }, { 196, 6 }, { 175, 6 }, { 161, 6 }, { 147, 6 }, { 133, 6 }, { 119, 6 }, { 105, 6 }, { 91, 6 }, { 77, 6 }, { 63, 6 }, { 49, 6 }, { 35, 6 }, { 21, 6 }, { 7, 6 },
-}, {
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+    //Underglow (0 -> 15)
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+
+    //Key matrix (16 -> 82)
+    4, 4, 4, 1, 1,          4,          1, 1, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 4,    4,
+    4, 1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
 } };
 #endif
-
diff --git a/keyboards/mwstudio/mw65_rgb/mw65_rgb.h b/keyboards/mwstudio/mw65_rgb/mw65_rgb.h
index fb769eda08..3c49721df0 100644
--- a/keyboards/mwstudio/mw65_rgb/mw65_rgb.h
+++ b/keyboards/mwstudio/mw65_rgb/mw65_rgb.h
@@ -13,6 +13,7 @@
  * 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"
@@ -34,16 +35,15 @@
  */
 
 #define LAYOUT( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,   K44, K0E, K43, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-	K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-	K40, K41, K42,                K46,           K4A, K4B,      K4C, K4D, K4E  \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,    K0D,    K44, K0E, K43, \
+	 K10,  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,   K1D, K1E, \
+	  K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,    K2D,   K2E, \
+	   K30,    K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,   K3C,  K3D, K3E, \
+	K40,  K41,  K42,                K46,                K4A,  K4B,  K4C, K4D, K4E  \
 ) { \
 	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
 	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
 	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
 	{ K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
 	{ K40, K41, K42, K43, K44, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }, \
-	{ XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }  \
 }
diff --git a/keyboards/mwstudio/mw65_rgb/rules.mk b/keyboards/mwstudio/mw65_rgb/rules.mk
index 9407031ed8..e2e979fb68 100644
--- a/keyboards/mwstudio/mw65_rgb/rules.mk
+++ b/keyboards/mwstudio/mw65_rgb/rules.mk
@@ -16,6 +16,8 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
+
 ENCODER_ENABLE = yes

From 65af7272f34148d8ea8e2b75e4e463fcb607e6f2 Mon Sep 17 00:00:00 2001
From: jack <59737601+waffle87@users.noreply.github.com>
Date: Sun, 20 Feb 2022 22:57:11 -0700
Subject: [PATCH 649/867] [Keyboard] Fix mwstudio/mw65_rgb errors (#16410)

---
 .../mw65_rgb/keymaps/default/keymap.c         | 24 ++++---------------
 .../mwstudio/mw65_rgb/keymaps/via/keymap.c    |  8 +++----
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/default/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/default/keymap.c
index ba043525e6..8153790b14 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/default/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/default/keymap.c
@@ -17,35 +17,19 @@
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT_65_ansi_blocker(
+	[0] = LAYOUT(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_VOLD, KC_DEL,  KC_VOLU,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         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_PGDN,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   RGB_TOG,
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
+  ),
 
-	[1] = LAYOUT_65_ansi_blocker(
+	[1] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,   _______, RGB_HUI, _______,
         RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI,
         _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD,
         _______, _______, _______,                            _______,                            RGB_MOD, _______, RGB_SPD, RGB_VAD, RGB_SPI
-    ),
-
-	[2] = LAYOUT_65_ansi_blocker(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
-    ),
-
-	[3] = LAYOUT_65_ansi_blocker(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
-    ),
+  )
 };
diff --git a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
index 76884095a7..78a17233e3 100644
--- a/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
+++ b/keyboards/mwstudio/mw65_rgb/keymaps/via/keymap.c
@@ -28,7 +28,7 @@ user_config_t user_config;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT_65_ansi_blocker(
+	[0] = LAYOUT(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_VOLD, KC_DEL,  KC_VOLU,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         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_PGDN,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-	[1] = LAYOUT_65_ansi_blocker(
+	[1] = LAYOUT(
         KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,   _______, RGB_HUI, _______,
         RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          USER00,  RGB_SAI,
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                   RGB_MOD, _______,          RGB_SPD, RGB_VAD, RGB_SPI
     ),
 
-	[2] = LAYOUT_65_ansi_blocker(
+	[2] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
-	[3] = LAYOUT_65_ansi_blocker(
+	[3] = LAYOUT(
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,

From f7b5d67a7bfc5cbcf7e71ad5a203b34961cfc352 Mon Sep 17 00:00:00 2001
From: TW59420 <40019210+TW59420@users.noreply.github.com>
Date: Mon, 21 Feb 2022 14:01:31 +0800
Subject: [PATCH 650/867] [Keyboard] Add MW75R2 PCB (#15042)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
---
 keyboards/mwstudio/mw75r2/config.h            |  80 ++++++++
 keyboards/mwstudio/mw75r2/info.json           |  97 ++++++++++
 .../mwstudio/mw75r2/keymaps/default/keymap.c  |  39 ++++
 .../mwstudio/mw75r2/keymaps/via/keymap.c      | 171 ++++++++++++++++++
 .../mwstudio/mw75r2/keymaps/via/rules.mk      |   2 +
 keyboards/mwstudio/mw75r2/mw75r2.c            |  28 +++
 keyboards/mwstudio/mw75r2/mw75r2.h            |  34 ++++
 keyboards/mwstudio/mw75r2/readme.md           |  22 +++
 keyboards/mwstudio/mw75r2/rules.mk            |  21 +++
 9 files changed, 494 insertions(+)
 create mode 100644 keyboards/mwstudio/mw75r2/config.h
 create mode 100644 keyboards/mwstudio/mw75r2/info.json
 create mode 100644 keyboards/mwstudio/mw75r2/keymaps/default/keymap.c
 create mode 100644 keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
 create mode 100644 keyboards/mwstudio/mw75r2/keymaps/via/rules.mk
 create mode 100644 keyboards/mwstudio/mw75r2/mw75r2.c
 create mode 100644 keyboards/mwstudio/mw75r2/mw75r2.h
 create mode 100644 keyboards/mwstudio/mw75r2/readme.md
 create mode 100644 keyboards/mwstudio/mw75r2/rules.mk

diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h
new file mode 100644
index 0000000000..4430d12a91
--- /dev/null
+++ b/keyboards/mwstudio/mw75r2/config.h
@@ -0,0 +1,80 @@
+/* Copyright 2021 TW59420 <https://github.com/TW59420>
+ *
+ * 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       0x7BA1
+#define PRODUCT_ID      0x7502
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    MWStudio
+#define PRODUCT         MW75R2
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, D5}
+#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D4, D6, F7, F6, E6, F0, F1, F4, F5 }
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define RGB_DI_PIN B3
+#define RGBLIGHT_SLEEP
+
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
+#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define DRIVER_LED_TOTAL 21
+#define RGBLED_NUM 21
+
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+
+#define ENCODERS_PAD_A { B1 }
+#define ENCODERS_PAD_B { B2 }
diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json
new file mode 100644
index 0000000000..ade25ee7b9
--- /dev/null
+++ b/keyboards/mwstudio/mw75r2/info.json
@@ -0,0 +1,97 @@
+{
+    "keyboard_name": "MW75R2",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1.5, "y":0},
+                {"label":"F2", "x":2.5, "y":0},
+                {"label":"F3", "x":3.5, "y":0},
+                {"label":"F4", "x":4.5, "y":0},
+                {"label":"F5", "x":6, "y":0},
+                {"label":"F6", "x":7, "y":0},
+                {"label":"F7", "x":8, "y":0},
+                {"label":"F8", "x":9, "y":0},
+                {"label":"F9", "x":10.5, "y":0},
+                {"label":"F10", "x":11.5, "y":0},
+                {"label":"F11", "x":12.5, "y":0},
+                {"label":"F12", "x":13.5, "y":0},
+                {"label":"DEL", "x":15, "y":0},
+
+                {"label":"`", "x":0, "y":1.5},
+                {"label":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"-", "x":11, "y":1.5},
+                {"label":"=", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Delete", "x":15, "y":1.5},
+
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[", "x":11.5, "y":2.5},
+                {"label":"]", "x":12.5, "y":2.5},
+                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"PgUp", "x":15, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";", "x":10.75, "y":3.5},
+                {"label":"'", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"PgDn", "x":15, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",", "x":9.25, "y":4.5},
+                {"label":".", "x":10.25, "y":4.5},
+                {"label":"/", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"\u2191", "x":14, "y":4.5},
+                {"label":"End", "x":15, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"x":3.75, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
+                {"label":"Fn", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"\u2190", "x":13, "y":5.5},
+                {"label":"\u2193", "x":14, "y":5.5},
+                {"label":"\u2192", "x":15, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mwstudio/mw75r2/keymaps/default/keymap.c b/keyboards/mwstudio/mw75r2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..73fd380112
--- /dev/null
+++ b/keyboards/mwstudio/mw75r2/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2021 TW59420 <https://github.com/TW59420>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+	  KC_ESC,  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  RGB_TOG,
+	  KC_GRV,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL,
+	  KC_TAB,  KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,  KC_PGUP,
+	  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_PGDN,
+	  KC_LSFT,        KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,    KC_END,
+	  KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPACE,                     KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+	[1] = LAYOUT(
+      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,
+      RGB_TOG, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI,
+      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD,
+      _______, _______, _______,                   _______,                                     RGB_MOD, _______, RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+};
diff --git a/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0648ac7bf6
--- /dev/null
+++ b/keyboards/mwstudio/mw75r2/keymaps/via/keymap.c
@@ -0,0 +1,171 @@
+/* Copyright 2021 TW59420 <https://github.com/TW59420>
+ *
+ * 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
+
+typedef union {
+  uint32_t raw;
+  struct {
+    bool top_rgb_change :1;
+    bool bottom_rgb_change :1;
+  };
+} user_config_t;
+
+user_config_t user_config;
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT(
+	  KC_ESC,  KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,   KC_F10,  KC_F11,  KC_F12,  RGB_TOG,
+	  KC_GRV,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL,
+	  KC_TAB,  KC_Q,  KC_W,  KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,  KC_PGUP,
+	  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_PGDN,
+	  KC_LSFT,        KC_Z,  KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,    KC_END,
+	  KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPACE,                     KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+
+	[1] = LAYOUT(
+      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, USER00,  USER01,  _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI,
+      RGB_TOG, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUD,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_SAI,
+      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD,
+      _______, _______, _______,                   _______,                                     RGB_MOD, _______, RGB_SPD, RGB_VAD, RGB_SPI
+    ),
+
+	[2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+	[3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+};
+
+
+void keyboard_post_init_user(void) {
+  // Read the user config from EEPROM
+  user_config.raw = eeconfig_read_user();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case USER00:
+      if (record->event.pressed) {
+        // Do something when pressed
+        user_config.top_rgb_change ^= 1; // Toggles the status
+        eeconfig_update_user(user_config.raw); // Writes the new status to EEPROM
+      } else {
+        // Do something else when release
+      }
+      return false; // Skip all further processing of this key
+    case USER01:
+      if (record->event.pressed) {
+        // Do something when pressed
+        user_config.bottom_rgb_change ^= 1; // Toggles the status
+        eeconfig_update_user(user_config.raw); // Writes the new status to EEPROM
+      } else {
+        // Do something else when release
+      }
+      return false; // Skip all further processing of this key
+    default:
+      return true; // Process all other keycodes normally
+  }
+}
+
+#ifdef ENCODER_ENABLE
+#define ENCODERS 1
+static uint8_t  encoder_state[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS] = {{3, 5}};
+static keypos_t encoder_ccw[ENCODERS] = {{4, 5}};
+
+
+void encoder_action_unregister(void) {
+#ifdef ENCODERS
+    for (uint8_t index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index]) {
+            keyevent_t encoder_event = (keyevent_t) {
+                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
+                .pressed = false,
+                .time = (timer_read() | 1)
+            };
+            encoder_state[index] = 0;
+            action_exec(encoder_event);
+        }
+    }
+#endif
+}
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = true,
+        .time = (timer_read() | 1)
+    };
+    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+}
+
+void matrix_scan_user(void) {
+    encoder_action_unregister();
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    return true;
+};
+#endif
+
+
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+    if (user_config.top_rgb_change)
+    {
+        for (size_t i = 14; i < 18; i++)
+        {
+            RGB_MATRIX_INDICATOR_SET_COLOR(i, 0, 0, 0);
+        }
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        for (size_t i = 14; i < 18; i++)
+        {
+            RGB_MATRIX_INDICATOR_SET_COLOR(i, 0, 255, 255); // assuming caps lock is at led #5
+        }
+    }
+    if (user_config.bottom_rgb_change)
+    {
+        for (size_t i = 0; i < 21; i++)
+        {
+            if (i >= 14 && i <18)
+                continue;
+
+            RGB_MATRIX_INDICATOR_SET_COLOR(i, 0, 0, 0);
+        }
+    }
+}
diff --git a/keyboards/mwstudio/mw75r2/keymaps/via/rules.mk b/keyboards/mwstudio/mw75r2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mwstudio/mw75r2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mwstudio/mw75r2/mw75r2.c b/keyboards/mwstudio/mw75r2/mw75r2.c
new file mode 100644
index 0000000000..0aa3874678
--- /dev/null
+++ b/keyboards/mwstudio/mw75r2/mw75r2.c
@@ -0,0 +1,28 @@
+/* Copyright 2021 TW59420 <https://github.com/TW59420>
+ *
+ * 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 "mw75r2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+  { 0,      1,      2,      3,      4,      5,      6,      7 },
+  { 8,      9,      10,     11,     12,     13,     14,    15 },
+  { 16,     17,     18,     19,     20 }
+}, {
+    { 105, 60 }, { 70, 60 }, { 35, 60 }, { 0, 60 }, {  0, 40 }, { 0, 20 }, { 0, 0 }, { 42, 0 }, { 84, 0 }, { 126, 0 }, { 168, 0 }, { 210, 0 }, { 210, 20 }, { 210, 40 }, { 40, 20 }, { 120, 20 }, { 40, 40 }, { 120, 40 }, { 210, 60 }, { 175, 60 },{ 140, 60 }
+}, {
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+} };
+#endif
diff --git a/keyboards/mwstudio/mw75r2/mw75r2.h b/keyboards/mwstudio/mw75r2/mw75r2.h
new file mode 100644
index 0000000000..593b2ebb11
--- /dev/null
+++ b/keyboards/mwstudio/mw75r2/mw75r2.h
@@ -0,0 +1,34 @@
+/* Copyright 2021 TW59420 <https://github.com/TW59420>
+ *
+ * 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( \
+	K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,\
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,\
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,\
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314,\
+	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414,\
+	K500, K501, K502,                   K506,                   K510, K511, K512, K513, K514\
+) { \
+	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 },\
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 },\
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 },\
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314 },\
+	{ K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413,  K414 },\
+	{ K500,  K501,  K502,  KC_NO, KC_NO, KC_NO, K506,  KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  K513,  K514 }\
+}
diff --git a/keyboards/mwstudio/mw75r2/readme.md b/keyboards/mwstudio/mw75r2/readme.md
new file mode 100644
index 0000000000..ef2efb3734
--- /dev/null
+++ b/keyboards/mwstudio/mw75r2/readme.md
@@ -0,0 +1,22 @@
+# MW75R2
+
+![MW75R2](https://i.imgur.com/S9Gd81b.jpg?1)
+
+Support Atmega32u4 keyboard.
+
+* Keyboard Maintainer: [TW59420](https://github.com/TW59420)
+* Hardware Supported: Atmega32u4
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mwstudio/mw75r2:default 
+
+Flashing example for this keyboard:
+
+    make mwstudio/mw75r2:default:flash
+
+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).
+
+## Bootloader
+* **Physical reset button**: Short press the button on the back of the PCB to enter the Bootloader and flash the firmware
+* **Keycode in layout**: Press the key mapped to RESET if it is available
diff --git a/keyboards/mwstudio/mw75r2/rules.mk b/keyboards/mwstudio/mw75r2/rules.mk
new file mode 100644
index 0000000000..9407031ed8
--- /dev/null
+++ b/keyboards/mwstudio/mw75r2/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+ENCODER_ENABLE = yes

From 2d1d44edb701a47571d8ad2a07cb0899f255849e Mon Sep 17 00:00:00 2001
From: jack <59737601+waffle87@users.noreply.github.com>
Date: Sun, 20 Feb 2022 23:04:43 -0700
Subject: [PATCH 651/867] [Keyboard] Fix Hineybush/h08_ocelot and
 Hineybush/h65(_hotswap) (#16405)

---
 .../hineybush/h08_ocelot/keymaps/via/keymap.c |  6 +--
 keyboards/hineybush/h65/config.h              |  2 -
 .../hineybush/h65/keymaps/default/keymap.c    | 23 +++++----
 keyboards/hineybush/h65/keymaps/mc65/keymap.c | 49 ------------------
 .../hineybush/h65/keymaps/mc65/readme.md      |  1 -
 keyboards/hineybush/h65/keymaps/mc65/rules.mk |  1 -
 keyboards/hineybush/h65/keymaps/via/keymap.c  | 50 ++++++++++++-------
 keyboards/hineybush/h65/rules.mk              |  5 +-
 .../h65_hotswap/keymaps/default/keymap.c      | 23 +++++----
 .../h65_hotswap/keymaps/via/keymap.c          | 50 ++++++++++++-------
 10 files changed, 90 insertions(+), 120 deletions(-)
 delete mode 100644 keyboards/hineybush/h65/keymaps/mc65/keymap.c
 delete mode 100644 keyboards/hineybush/h65/keymaps/mc65/readme.md
 delete mode 100644 keyboards/hineybush/h65/keymaps/mc65/rules.mk

diff --git a/keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c b/keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c
index d786dcad68..99e2b28c08 100644
--- a/keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c
+++ b/keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c
@@ -27,16 +27,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
         KC_1, KC_2, KC_3, KC_4,
-        KC_5, KC_6, KC_7, MO(_FN)
+        KC_5, KC_6, KC_7, MO(_FN1)
     ),
     [_FN1] = LAYOUT(
         RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
+    ),
     [_FN2] = LAYOUT(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
-    )
+    ),
     [_FN3] = LAYOUT(
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h
index 320e9c6fe8..b99f486013 100644
--- a/keyboards/hineybush/h65/config.h
+++ b/keyboards/hineybush/h65/config.h
@@ -148,5 +148,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
-
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/hineybush/h65/keymaps/default/keymap.c b/keyboards/hineybush/h65/keymaps/default/keymap.c
index d563cbbc7a..f17f822f69 100644
--- a/keyboards/hineybush/h65/keymaps/default/keymap.c
+++ b/keyboards/hineybush/h65/keymaps/default/keymap.c
@@ -24,17 +24,18 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
-    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_HOME,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(1),
-    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT),
+      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
+      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_HOME,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(_FN),
+      KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT
+    ),
 
-    [_FN] = LAYOUT(
-    KC_TRNS,  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_TRNS,  KC_TRNS, KC_TRNS,
-    KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    RESET,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_PGUP,
-    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_PGDN,
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_MPLY,  KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS
+    [_FN] = LAYOUT_all(
+      KC_TRNS,  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_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    RESET,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_PGUP,
+      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_PGDN,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_MPLY,  KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS
     )
 };
diff --git a/keyboards/hineybush/h65/keymaps/mc65/keymap.c b/keyboards/hineybush/h65/keymaps/mc65/keymap.c
deleted file mode 100644
index b135741b3f..0000000000
--- a/keyboards/hineybush/h65/keymaps/mc65/keymap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 hineybush
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-// Defines names for use in layer keycodes and the keymap
-enum layer_names {
-    _BASE,
-    _FN1,
-    _FN2
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [_BASE] = LAYOUT(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
-    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_HOME,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(1),
-    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT),
-
-    [_FN1] = LAYOUT(
-    KC_TRNS, 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_TRNS,    KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,    KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_PGUP,
-    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_PGDN,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS,  KC_MPLY,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS),
-
-    [_FN2] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS)
-};
-
-
diff --git a/keyboards/hineybush/h65/keymaps/mc65/readme.md b/keyboards/hineybush/h65/keymaps/mc65/readme.md
deleted file mode 100644
index ec8815555f..0000000000
--- a/keyboards/hineybush/h65/keymaps/mc65/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The VIA keymap for h65
diff --git a/keyboards/hineybush/h65/keymaps/mc65/rules.mk b/keyboards/hineybush/h65/keymaps/mc65/rules.mk
deleted file mode 100644
index 1e5b99807c..0000000000
--- a/keyboards/hineybush/h65/keymaps/mc65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
diff --git a/keyboards/hineybush/h65/keymaps/via/keymap.c b/keyboards/hineybush/h65/keymaps/via/keymap.c
index b135741b3f..4369579675 100644
--- a/keyboards/hineybush/h65/keymaps/via/keymap.c
+++ b/keyboards/hineybush/h65/keymaps/via/keymap.c
@@ -19,31 +19,43 @@
 enum layer_names {
     _BASE,
     _FN1,
-    _FN2
+    _FN2,
+    _FN3
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
-    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_HOME,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(1),
-    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT),
+    [_BASE] = LAYOUT_all(
+      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
+      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_HOME,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(_FN1),
+      KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT
+    ),
 
-    [_FN1] = LAYOUT(
-    KC_TRNS, 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_TRNS,    KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,    KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_PGUP,
-    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_PGDN,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS,  KC_MPLY,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS),
+    [_FN1] = LAYOUT_all(
+      KC_TRNS, 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_TRNS,    KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,    KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_PGUP,
+      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_PGDN,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS,  KC_MPLY,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS
+    ),
 
-    [_FN2] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS)
+    [_FN2] = LAYOUT_all(
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS
+    ),
+    
+    [_FN3] = LAYOUT_all(
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS
+    )
 };
 
 
diff --git a/keyboards/hineybush/h65/rules.mk b/keyboards/hineybush/h65/rules.mk
index b8ddfaba64..702fe717f2 100644
--- a/keyboards/hineybush/h65/rules.mk
+++ b/keyboards/hineybush/h65/rules.mk
@@ -12,10 +12,7 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no            # USB Nkey Rollover
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c b/keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
index c69e1e34bd..f8af1d5d15 100644
--- a/keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
+++ b/keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c
@@ -24,17 +24,18 @@ enum layer_names {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
     [_BASE] = LAYOUT(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
-    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_HOME,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(1),
-    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT),
+      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
+      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_HOME,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(_FN),
+      KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT
+    ),
 
-    [_FN] = LAYOUT_all(
-    KC_TRNS,  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_TRNS,  KC_TRNS, KC_TRNS,
-    KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    RESET,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_PGUP,
-    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_PGDN,
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_MPLY,  KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS
+    [_FN] = LAYOUT(
+      KC_TRNS,  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_TRNS,  KC_TRNS, KC_TRNS,
+      KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    RESET,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_PGUP,
+      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_PGDN,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS, KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,  KC_MPLY,  KC_TRNS,           KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,    KC_TRNS
     )
 };
diff --git a/keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c b/keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
index d225a8c834..bdd6458902 100644
--- a/keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
+++ b/keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c
@@ -19,31 +19,43 @@
 enum layer_names {
     _BASE,
     _FN1,
-    _FN2
+    _FN2,
+    _FN3
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [_BASE] = LAYOUT_all(
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
-    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_HOME,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(1),
-    KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT),
+    [_BASE] = LAYOUT(
+      KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC, KC_DEL,
+      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_HOME,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_NUHS,    KC_ENT,   KC_END,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    KC_UP,    MO(_FN1),
+      KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,  KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_LEFT,  KC_DOWN,    KC_RGHT
+    ),
 
-    [_FN1] = LAYOUT_all(
-    KC_TRNS, 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_TRNS,    KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,    KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_PGUP,
-    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_PGDN,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS,  KC_MPLY,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS),
+    [_FN1] = LAYOUT(
+      KC_TRNS, 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_TRNS,    KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,    KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_PGUP,
+      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_PGDN,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,                    KC_TRNS,  KC_MPLY,    KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,   KC_TRNS,    KC_TRNS
+    ),
 
-    [_FN2] = LAYOUT_all(
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS)
+    [_FN2] = LAYOUT(
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS
+    ),
+
+    [_FN3] = LAYOUT(
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,  KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,   KC_TRNS
+    )
 };
 
 

From 9bf25d1cd5f7616d30b000d50c51acd9dfaacd41 Mon Sep 17 00:00:00 2001
From: Ivan Gromov <38141348+key10iq@users.noreply.github.com>
Date: Mon, 21 Feb 2022 10:16:23 +0400
Subject: [PATCH 652/867] [Keyboard] Add Monoflex 60 keyboard (#16234)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/monoflex60/config.h                 |  42 ++++
 keyboards/monoflex60/info.json                | 217 ++++++++++++++++++
 .../keymaps/60_iso_tsangan/keymap.c           |  34 +++
 .../keymaps/60_tsangan_hhkb/keymap.c          |  34 +++
 keyboards/monoflex60/keymaps/default/keymap.c |  34 +++
 .../monoflex60/keymaps/default/readme.md      |   1 +
 keyboards/monoflex60/keymaps/via/keymap.c     |  48 ++++
 keyboards/monoflex60/keymaps/via/readme.md    |   1 +
 keyboards/monoflex60/keymaps/via/rules.mk     |   1 +
 keyboards/monoflex60/monoflex60.c             |  17 ++
 keyboards/monoflex60/monoflex60.h             | 102 ++++++++
 keyboards/monoflex60/readme.md                |  29 +++
 keyboards/monoflex60/rules.mk                 |  19 ++
 13 files changed, 579 insertions(+)
 create mode 100644 keyboards/monoflex60/config.h
 create mode 100644 keyboards/monoflex60/info.json
 create mode 100644 keyboards/monoflex60/keymaps/60_iso_tsangan/keymap.c
 create mode 100644 keyboards/monoflex60/keymaps/60_tsangan_hhkb/keymap.c
 create mode 100644 keyboards/monoflex60/keymaps/default/keymap.c
 create mode 100644 keyboards/monoflex60/keymaps/default/readme.md
 create mode 100644 keyboards/monoflex60/keymaps/via/keymap.c
 create mode 100644 keyboards/monoflex60/keymaps/via/readme.md
 create mode 100644 keyboards/monoflex60/keymaps/via/rules.mk
 create mode 100644 keyboards/monoflex60/monoflex60.c
 create mode 100644 keyboards/monoflex60/monoflex60.h
 create mode 100644 keyboards/monoflex60/readme.md
 create mode 100644 keyboards/monoflex60/rules.mk

diff --git a/keyboards/monoflex60/config.h b/keyboards/monoflex60/config.h
new file mode 100644
index 0000000000..6e02810027
--- /dev/null
+++ b/keyboards/monoflex60/config.h
@@ -0,0 +1,42 @@
+/*
+Copyright 2022 Ivan Gromov (@key10iq)
+
+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       0xDEB4
+#define PRODUCT_ID      0x60EB
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    SanitGo Customs
+#define PRODUCT         Monoflex 60
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D1, D0, D3, D2, D5 }
+#define MATRIX_COL_PINS { B7, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4}
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/monoflex60/info.json b/keyboards/monoflex60/info.json
new file mode 100644
index 0000000000..7a4fb99447
--- /dev/null
+++ b/keyboards/monoflex60/info.json
@@ -0,0 +1,217 @@
+{
+    "keyboard_name": "Monoflex 60",
+    "url": "",
+    "maintainer": "keyten",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+				{"x":0, "y":3, "w":1.25},
+				{"x":1.25, "y":3},
+				{"x":2.25, "y":3},
+				{"x":3.25, "y":3},
+				{"x":4.25, "y":3},
+				{"x":5.25, "y":3},
+				{"x":6.25, "y":3},
+				{"x":7.25, "y":3},
+				{"x":8.25, "y":3},
+				{"x":9.25, "y":3},
+				{"x":10.25, "y":3},
+				{"x":11.25, "y":3},
+				{"x":12.25, "y":3, "w":1.75},
+				{"x":14, "y":3},
+
+                {"x": 0, "y": 4, "w": 1.5},
+                {"x": 1.5, "y": 4},
+                {"x": 2.5, "y": 4, "w": 1.5},
+                {"x": 4, "y": 4, "w": 7},
+                {"x": 11, "y": 4, "w": 1.5},
+                {"x": 12.5, "y": 4},
+                {"x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+		"LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.5},
+                {"x": 1.5, "y": 4},
+                {"x": 2.5, "y": 4, "w": 1.5},
+                {"x": 4, "y": 4, "w": 7},
+                {"x": 11, "y": 4, "w": 1.5},
+                {"x": 12.5, "y": 4},
+                {"x": 13.5, "y": 4, "w": 1.5}
+            ]
+        },
+		"LAYOUT_60_iso_tsangan": {
+            "layout": [
+				{"x":0, "y":0},
+				{"x":1, "y":0},
+				{"x":2, "y":0},
+				{"x":3, "y":0},
+				{"x":4, "y":0},
+				{"x":5, "y":0},
+				{"x":6, "y":0},
+				{"x":7, "y":0},
+				{"x":8, "y":0},
+				{"x":9, "y":0},
+				{"x":10, "y":0},
+				{"x":11, "y":0},
+				{"x":12, "y":0},
+				{"x":13, "y":0, "w":2},
+				
+				{"x":0, "y":1, "w":1.5},
+				{"x":1.5, "y":1},
+				{"x":2.5, "y":1},
+				{"x":3.5, "y":1},
+				{"x":4.5, "y":1},
+				{"x":5.5, "y":1},
+				{"x":6.5, "y":1},
+				{"x":7.5, "y":1},
+				{"x":8.5, "y":1},
+				{"x":9.5, "y":1},
+				{"x":10.5, "y":1},
+				{"x":11.5, "y":1},
+				{"x":12.5, "y":1},
+				{"x":13.75, "y":1, "w":1.25, "h":2},
+				
+				{"x":0, "y":2, "w":1.75},
+				{"x":1.75, "y":2},
+				{"x":2.75, "y":2},
+				{"x":3.75, "y":2},
+				{"x":4.75, "y":2},
+				{"x":5.75, "y":2},
+				{"x":6.75, "y":2},
+				{"x":7.75, "y":2},
+				{"x":8.75, "y":2},
+				{"x":9.75, "y":2},
+				{"x":10.75, "y":2},
+				{"x":11.75, "y":2},
+				{"x":12.75, "y":2},
+				{"x":0, "y":3, "w":1.25},
+				
+				{"x":1.25, "y":3},
+				{"x":2.25, "y":3}, 
+				{"x":3.25, "y":3}, 
+				{"x":4.25, "y":3}, 
+				{"x":5.25, "y":3}, 
+				{"x":6.25, "y":3}, 
+				{"x":7.25, "y":3}, 
+				{"x":8.25, "y":3}, 
+				{"x":9.25, "y":3}, 
+				{"x":10.25, "y":3}, 
+				{"x":11.25, "y":3}, 
+				{"x":12.25, "y":3, "w":2.75}, 
+				
+				{"x":0, "y":4, "w":1.5}, 
+				{"x":1.5, "y":4}, 
+				{"x":2.5, "y":4, "w":1.5},
+				{"x":4, "y":4, "w":7},
+				{"x":11, "y":4, "w":1.5},
+				{"x":12.5, "y":4}, 
+				{"x":13.5, "y":4, "w":1.5}
+			]
+        }
+    }
+}
diff --git a/keyboards/monoflex60/keymaps/60_iso_tsangan/keymap.c b/keyboards/monoflex60/keymaps/60_iso_tsangan/keymap.c
new file mode 100644
index 0000000000..deb9f95b22
--- /dev/null
+++ b/keyboards/monoflex60/keymaps/60_iso_tsangan/keymap.c
@@ -0,0 +1,34 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_60_iso_tsangan(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT, 
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, MO(1),   
+		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  
+		KC_LCTL, KC_LGUI,          KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI,   KC_RCTL),
+
+	[1] = LAYOUT_60_iso_tsangan(
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______,          _______,                            _______,                            _______, _______, _______)
+};
diff --git a/keyboards/monoflex60/keymaps/60_tsangan_hhkb/keymap.c b/keyboards/monoflex60/keymaps/60_tsangan_hhkb/keymap.c
new file mode 100644
index 0000000000..8a5630554e
--- /dev/null
+++ b/keyboards/monoflex60/keymaps/60_tsangan_hhkb/keymap.c
@@ -0,0 +1,34 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_60_tsangan_hhkb(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, 
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC, 
+		KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), 
+		KC_LCTL, KC_LGUI,          KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
+
+	[1] = LAYOUT_60_tsangan_hhkb(
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______,          _______,                            _______,                            _______, _______, _______)
+};
diff --git a/keyboards/monoflex60/keymaps/default/keymap.c b/keyboards/monoflex60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2572aad355
--- /dev/null
+++ b/keyboards/monoflex60/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, 
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC, 
+		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), 
+		KC_LCTL, KC_LGUI,          KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
+
+	[1] = LAYOUT_all(
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______,          _______,                            _______,                            _______, _______, _______)
+};
diff --git a/keyboards/monoflex60/keymaps/default/readme.md b/keyboards/monoflex60/keymaps/default/readme.md
new file mode 100644
index 0000000000..146f52292d
--- /dev/null
+++ b/keyboards/monoflex60/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Monoflex 60
diff --git a/keyboards/monoflex60/keymaps/via/keymap.c b/keyboards/monoflex60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..92fee8dd1e
--- /dev/null
+++ b/keyboards/monoflex60/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, 
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, 
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_BSPC, 
+		KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), 
+		KC_LCTL, KC_LGUI,          KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL),
+
+	[1] = LAYOUT_all(
+		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______,          _______,                            _______,                            _______, _______, _______),
+		
+	[2] = LAYOUT_all(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______,          _______,                            _______,                            _______, _______, _______),
+		
+	[3] = LAYOUT_all(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______,          _______,                            _______,                            _______, _______, _______)	
+};
diff --git a/keyboards/monoflex60/keymaps/via/readme.md b/keyboards/monoflex60/keymaps/via/readme.md
new file mode 100644
index 0000000000..29862d748b
--- /dev/null
+++ b/keyboards/monoflex60/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for Monoflex 60
diff --git a/keyboards/monoflex60/keymaps/via/rules.mk b/keyboards/monoflex60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..69de2e4c5a
--- /dev/null
+++ b/keyboards/monoflex60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/monoflex60/monoflex60.c b/keyboards/monoflex60/monoflex60.c
new file mode 100644
index 0000000000..075a79125e
--- /dev/null
+++ b/keyboards/monoflex60/monoflex60.c
@@ -0,0 +1,17 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * 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 "monoflex60.h"
diff --git a/keyboards/monoflex60/monoflex60.h b/keyboards/monoflex60/monoflex60.h
new file mode 100644
index 0000000000..cac9300863
--- /dev/null
+++ b/keyboards/monoflex60/monoflex60.h
@@ -0,0 +1,102 @@
+ /* Copyright 2022 Ivan Gromov (@key10iq)
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/* LAYOUT_all
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │
+ * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+ * │40   │41 │43   │47                         │4b   │4c │4d   │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+#define LAYOUT_all( \
+	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+	k40, k41,      k43,                k47,                k4b, k4c, k4d  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d },  \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d },  \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d },  \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d },  \
+    { k40, k41, XXX, k43, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4b, k4c, k4d }   \
+}
+
+/* LAYOUT_60_tsangan_hhkb
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │2d │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c    │3d │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+ * │40   │41 │43   │47                         │4b   │4c │4d   │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+#define LAYOUT_60_tsangan_hhkb( \
+	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+	k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+	k40, k41,      k43,                k47,                k4b, k4c, k4d  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d },  \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d },  \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d },  \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d },  \
+    { k40, k41, XXX, k43, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4b, k4c, k4d }   \
+}
+
+/* LAYOUT_60_iso_tsangan
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ 1d │
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │    │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c        │
+ * ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤
+ * │40   │41 │43   │47                         │4b   │4c │4d   │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+#define LAYOUT_60_iso_tsangan( \
+	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      \
+	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      \
+	k40, k41,      k43,                k47,                k4b, k4c, k4d  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d },  \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d },  \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX },  \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX },  \
+    { k40, k41, XXX, k43, XXX, XXX, XXX, k47, XXX, XXX, XXX, k4b, k4c, k4d }   \
+}
diff --git a/keyboards/monoflex60/readme.md b/keyboards/monoflex60/readme.md
new file mode 100644
index 0000000000..cfb4e31d15
--- /dev/null
+++ b/keyboards/monoflex60/readme.md
@@ -0,0 +1,29 @@
+# Monoflex 60
+
+Monoflex 60 is a 60% keyboard with leafsping plate. The project failed because of a stupid runner (SantiGo Customs) who didn't know how to manage money.
+
+Case designed by [Bizunow](https://github.com/Bizunow) and PCB designed by [keyten](https://github.com/key10iq). Also [ILWrites](https://github.com/pikeeb) helped with PCBs production.
+
+![Monoflex 60 image](https://i.imgur.com/ip3J0y6l.jpeg)
+
+* Keyboard Maintainer: [keyten](https://github.com/key10iq)
+* Hardware Supported: Monoflex 60 PCB
+* Hardware Availability: [GB](https://geekhack.org/index.php?topic=110738.0)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make monoflex60:default
+	
+Flashing example for this keyboard:
+
+    make monoflex60:default:flash
+
+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).
+
+## Bootloader 
+
+Enter the bootloader in 3 ways:
+
+* Bootmagic reset: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* Keycode in layout: Press the key mapped to RESET if it is available
+* Physical reset button: Press the button on the back of the PCB
diff --git a/keyboards/monoflex60/rules.mk b/keyboards/monoflex60/rules.mk
new file mode 100644
index 0000000000..6983d5c803
--- /dev/null
+++ b/keyboards/monoflex60/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes

From 14fb3cc8b04d019b585b0ea25d11f2939949429f Mon Sep 17 00:00:00 2001
From: "L. K. Post" <Crote@users.noreply.github.com>
Date: Mon, 21 Feb 2022 07:33:00 +0100
Subject: [PATCH 653/867] [Keyboard] Add Kyria rev. 2 (#16178)

---
 .../splitkb/kyria/keymaps/default/config.h    |   6 +-
 keyboards/splitkb/kyria/kyria.c               | 102 +++++++++++++++++
 keyboards/splitkb/kyria/kyria.h               |   5 +-
 keyboards/splitkb/kyria/readme.md             |  10 +-
 keyboards/splitkb/kyria/rev1/config.h         |   6 +-
 keyboards/splitkb/kyria/rev1/rev1.c           | 108 ++----------------
 keyboards/splitkb/kyria/rev2/config.h         | 107 +++++++++++++++++
 .../splitkb/kyria/rev2/proton_c/chconf.h      |  22 ++++
 .../splitkb/kyria/rev2/proton_c/halconf.h     |  22 ++++
 .../splitkb/kyria/rev2/proton_c/mcuconf.h     |  29 +++++
 .../splitkb/kyria/rev2/proton_c/proton_c.c    |  17 +++
 .../splitkb/kyria/rev2/proton_c/proton_c.h    |  19 +++
 .../splitkb/kyria/rev2/proton_c/rules.mk      |  12 ++
 keyboards/splitkb/kyria/rev2/rev2.c           |  76 ++++++++++++
 keyboards/splitkb/kyria/rev2/rev2.h           |  70 ++++++++++++
 keyboards/splitkb/kyria/rev2/rules.mk         |   8 ++
 keyboards/splitkb/kyria/rules.mk              |   2 +-
 17 files changed, 508 insertions(+), 113 deletions(-)
 create mode 100644 keyboards/splitkb/kyria/rev2/config.h
 create mode 100644 keyboards/splitkb/kyria/rev2/proton_c/chconf.h
 create mode 100644 keyboards/splitkb/kyria/rev2/proton_c/halconf.h
 create mode 100644 keyboards/splitkb/kyria/rev2/proton_c/mcuconf.h
 create mode 100644 keyboards/splitkb/kyria/rev2/proton_c/proton_c.c
 create mode 100644 keyboards/splitkb/kyria/rev2/proton_c/proton_c.h
 create mode 100644 keyboards/splitkb/kyria/rev2/proton_c/rules.mk
 create mode 100644 keyboards/splitkb/kyria/rev2/rev2.c
 create mode 100644 keyboards/splitkb/kyria/rev2/rev2.h
 create mode 100644 keyboards/splitkb/kyria/rev2/rules.mk

diff --git a/keyboards/splitkb/kyria/keymaps/default/config.h b/keyboards/splitkb/kyria/keymaps/default/config.h
index be87e7ac99..f989d67408 100644
--- a/keyboards/splitkb/kyria/keymaps/default/config.h
+++ b/keyboards/splitkb/kyria/keymaps/default/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
+/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,3 @@
 
 // Lets you roll mod-tap keys
 #define IGNORE_MOD_TAP_INTERRUPT
-
-// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
-// #define SPLIT_USB_DETECT
-// #define NO_USB_STARTUP_CHECK
diff --git a/keyboards/splitkb/kyria/kyria.c b/keyboards/splitkb/kyria/kyria.c
index 21ed5e84c8..9bc3b2068a 100644
--- a/keyboards/splitkb/kyria/kyria.c
+++ b/keyboards/splitkb/kyria/kyria.c
@@ -14,3 +14,105 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "kyria.h"
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    if (is_keyboard_master()) {
+        // QMK Logo and version information
+        // clang-format off
+        static const char PROGMEM qmk_logo[] = {
+            0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+            0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+            0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
+        // clang-format on
+
+        oled_write_P(qmk_logo, false);
+        oled_write_P(PSTR("Kyria "), false);
+#if defined(KEYBOARD_splitkb_kyria_rev1)
+        oled_write_P(PSTR("rev1\n\n"), false);
+#elif defined(KEYBOARD_splitkb_kyria_rev2)
+        oled_write_P(PSTR("rev2\n\n"), false);
+#endif
+        // Host Keyboard Layer Status
+        oled_write_P(PSTR("Layer: "), false);
+        switch (get_highest_layer(layer_state | default_layer_state)) {
+            case 0:
+                oled_write_P(PSTR("QWERTY\n"), false);
+                break;
+            case 1:
+                oled_write_P(PSTR("Dvorak\n"), false);
+                break;
+            case 2:
+                oled_write_P(PSTR("Colemak-DH\n"), false);
+                break;
+            case 3:
+                oled_write_P(PSTR("Nav\n"), false);
+                break;
+            case 4:
+                oled_write_P(PSTR("Sym\n"), false);
+                break;
+            case 5:
+                oled_write_P(PSTR("Function\n"), false);
+                break;
+            case 6:
+                oled_write_P(PSTR("Adjust\n"), false);
+                break;
+            default:
+                oled_write_P(PSTR("Undefined\n"), false);
+        }
+
+        // Host Keyboard LED Status
+        led_t led_usb_state = host_keyboard_led_state();
+        oled_write_P(led_usb_state.num_lock ? PSTR("NUMLCK ") : PSTR("       "), false);
+        oled_write_P(led_usb_state.caps_lock ? PSTR("CAPLCK ") : PSTR("       "), false);
+        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
+    } else {
+        // clang-format off
+        static const char PROGMEM kyria_logo[] = {
+            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
+            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
+            0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
+        };
+        // clang-format on
+        oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
+    }
+    return false;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+
+    if (index == 0) {
+        // Volume control
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        // Page up/Page down
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/splitkb/kyria/kyria.h b/keyboards/splitkb/kyria/kyria.h
index 2b1a298152..984a83897f 100644
--- a/keyboards/splitkb/kyria/kyria.h
+++ b/keyboards/splitkb/kyria/kyria.h
@@ -1,4 +1,4 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
+/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +20,9 @@
 #if defined(KEYBOARD_splitkb_kyria_rev1)
 #    include "rev1.h"
 #endif
+#if defined(KEYBOARD_splitkb_kyria_rev2)
+#    include "rev2.h"
+#endif
 
 /* This a shortcut to help you visually see your layout.
  *
diff --git a/keyboards/splitkb/kyria/readme.md b/keyboards/splitkb/kyria/readme.md
index 7ecf3946f7..32e6ae5f8e 100644
--- a/keyboards/splitkb/kyria/readme.md
+++ b/keyboards/splitkb/kyria/readme.md
@@ -10,12 +10,16 @@ Hardware Availability: [splitkb.com](https://splitkb.com) and partners.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make splitkb/kyria/rev1:default
-    make splitkb/kyria/rev1/proton_c:default
+    make splitkb/kyria/rev2:default
+    make splitkb/kyria/rev2/proton_c:default
 
 Example of flashing this keyboard:
 
-    make splitkb/kyria/rev1:default:flash
+    make splitkb/kyria/rev2:default:flash
+
+Replace "rev2" with "rev1" if you have a Kyria of revision 1.4 or below.
+Not sure what revision yours is? It is printed on the outer lower edge of the PCB!
+As a rule of thumb, all Kyrias sold after January 1st 2022 are revision 2.x.
 
 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).
 
diff --git a/keyboards/splitkb/kyria/rev1/config.h b/keyboards/splitkb/kyria/rev1/config.h
index e19e8dfa9c..2fc34070f4 100644
--- a/keyboards/splitkb/kyria/rev1/config.h
+++ b/keyboards/splitkb/kyria/rev1/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Thomas Baart <thomas@splitkb.com>
+Copyright 2022 Thomas Baart <thomas@splitkb.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID    0x8D1D
 #define PRODUCT_ID   0x9D9D
 #define DEVICE_VER   0x0001
-#define MANUFACTURER splitKB
-#define PRODUCT      Kyria
+#define MANUFACTURER splitkb
+#define PRODUCT      Kyria rev1
 
 /* key matrix size */
 /* Rows are doubled up */
diff --git a/keyboards/splitkb/kyria/rev1/rev1.c b/keyboards/splitkb/kyria/rev1/rev1.c
index b2641fb40e..8398366e71 100644
--- a/keyboards/splitkb/kyria/rev1/rev1.c
+++ b/keyboards/splitkb/kyria/rev1/rev1.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
+/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +31,13 @@ __attribute__ ((weak)) const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATR
 #endif
 
 #ifdef RGB_MATRIX_ENABLE
-/* Map physical under glow LEDs for RGB matrix support */
+/* Map physical under glow LEDs for RGB matrix support
+ *
+ *  09, 05, xx, xx, 04, xx,                   xx, 14, xx, xx, 15, 19,
+ *  xx, xx, xx, xx, xx, 03,                   13, xx, xx, xx, xx, xx,
+ *  08, 06, 07, xx, xx, xx, 00, xx,   xx, 10, xx, xx, xx, 17, 16, 18,
+ *                  xx, 02, 01, xx,   xx, xx, xx, 11, 12, xx
+ */
 led_config_t g_led_config = { {
     // Key Matrix to LED Index
     { NO_LED, NO_LED, NO_LED, 4,      NO_LED, NO_LED, 5,      9     },
@@ -54,101 +60,3 @@ led_config_t g_led_config = { {
     LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL
 } };
 #endif
-
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;
-}
-
-bool oled_task_kb(void) {
-    if (!oled_task_user()) {
-        return false;
-    }
-    if (is_keyboard_master()) {
-        // QMK Logo and version information
-        // clang-format off
-        static const char PROGMEM qmk_logo[] = {
-            0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-            0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-            0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
-        // clang-format on
-
-        oled_write_P(qmk_logo, false);
-        oled_write_P(PSTR("Kyria rev1.0\n\n"), false);
-
-        // Host Keyboard Layer Status
-        oled_write_P(PSTR("Layer: "), false);
-        switch (get_highest_layer(layer_state | default_layer_state)) {
-            case 0:
-                oled_write_P(PSTR("QWERTY\n"), false);
-                break;
-            case 1:
-                oled_write_P(PSTR("Dvorak\n"), false);
-                break;
-            case 2:
-                oled_write_P(PSTR("Colemak-DH\n"), false);
-                break;
-            case 3:
-                oled_write_P(PSTR("Nav\n"), false);
-                break;
-            case 4:
-                oled_write_P(PSTR("Sym\n"), false);
-                break;
-            case 5:
-                oled_write_P(PSTR("Function\n"), false);
-                break;
-            case 6:
-                oled_write_P(PSTR("Adjust\n"), false);
-                break;
-            default:
-                oled_write_P(PSTR("Undefined\n"), false);
-        }
-
-        // Host Keyboard LED Status
-        led_t led_usb_state = host_keyboard_led_state();
-        oled_write_P(led_usb_state.num_lock ? PSTR("NUMLCK ") : PSTR("       "), false);
-        oled_write_P(led_usb_state.caps_lock ? PSTR("CAPLCK ") : PSTR("       "), false);
-        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
-    } else {
-        // clang-format off
-        static const char PROGMEM kyria_logo[] = {
-            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
-            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
-            0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
-            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
-        };
-        // clang-format on
-        oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
-    }
-    return false;
-}
-#endif
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) {
-        return false;
-    }
-
-    if (index == 0) {
-        // Volume control
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 1) {
-        // Page up/Page down
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
-#endif
diff --git a/keyboards/splitkb/kyria/rev2/config.h b/keyboards/splitkb/kyria/rev2/config.h
new file mode 100644
index 0000000000..8ff3813964
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev2/config.h
@@ -0,0 +1,107 @@
+/*
+Copyright 2022 Thomas Baart <thomas@splitkb.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x8D1D
+#define PRODUCT_ID   0x9D9D
+#define DEVICE_VER   0x0002
+#define MANUFACTURER splitkb
+#define PRODUCT      Kyria rev2
+
+/* key matrix size */
+/* Rows are doubled up */
+#define MATRIX_ROWS  8
+#define MATRIX_COLS  8
+
+// wiring
+#define MATRIX_ROW_PINS \
+    { F6, F7, B1, B3 }
+#define MATRIX_COL_PINS \
+    { B2, B6, B5, B4, E6, D7, C6, D4 }
+#define MATRIX_ROW_PINS_RIGHT \
+    { D4, C6, D7, E6 }
+#define MATRIX_COL_PINS_RIGHT \
+    { B4, B5, B6, B2, B3, B1, F7, F6 }
+#define UNUSED_PINS
+
+#define ENCODERS_PAD_A \
+    { F4 }
+#define ENCODERS_PAD_B \
+    { F5 }
+#define ENCODERS_PAD_A_RIGHT \
+    { F5 }
+#define ENCODERS_PAD_B_RIGHT \
+    { F4 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+// Side detection
+// col 4 row 3 on right-hand-side
+#define SPLIT_HAND_MATRIX_GRID E6, B3 // row first because the board is col2row
+#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
+#define MATRIX_MASKED // actual mask is defined by `matrix_mask` in `rev2.c`
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE        5
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+
+#if defined(CONVERT_TO_PROTON_C)
+#    define SERIAL_USART_FULL_DUPLEX      // Enable full duplex operation mode.
+#    define SERIAL_USART_PIN_SWAP         // Swap TX and RX pins if keyboard is master halve.
+#    define SERIAL_USART_DRIVER      SD1  // USART driver of TX pin. default: SD1
+#    define SERIAL_USART_TX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+#    define SERIAL_USART_TX_PIN      D3
+#    define SERIAL_USART_RX_PIN      D2
+
+#    define RGB_DI_PIN               PAL_LINE(GPIOA, 3)
+#    define WS2812_PWM_DRIVER        PWMD2                  // default: PWMD2
+#    define WS2812_PWM_CHANNEL       4                      // default: 2
+#    define WS2812_PWM_PAL_MODE      1                      // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
+#    define WS2812_DMA_STREAM        STM32_DMA1_STREAM2     // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#    define WS2812_DMA_CHANNEL       2                      // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#    define WS2812_DMAMUX_ID         STM32_DMAMUX1_TIM2_UP  // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.
+#else
+#    define RGB_DI_PIN D3
+#    define SOFT_SERIAL_PIN D2
+#endif
+
+#define RGBLED_SPLIT \
+    { 10, 10 }
+#define RGBLED_NUM 20
+
+#ifdef OLED_ENABLE
+#    define OLED_DISPLAY_128X64
+#    define SPLIT_OLED_ENABLE
+#endif
+
+/* RGB matrix support */
+#ifdef RGB_MATRIX_ENABLE
+#    define SPLIT_TRANSPORT_MIRROR
+#    define DRIVER_LED_TOTAL RGBLED_NUM // Number of LEDs
+#    define RGB_MATRIX_SPLIT { 10, 10 }
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+#endif
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/chconf.h b/keyboards/splitkb/kyria/rev2/proton_c/chconf.h
new file mode 100644
index 0000000000..7ca1d3d243
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev2/proton_c/chconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 QMK
+ *
+ * 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 CH_CFG_ST_RESOLUTION 16
+#define CH_CFG_ST_FREQUENCY  10000
+
+#include_next "chconf.h"
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/halconf.h b/keyboards/splitkb/kyria/rev2/proton_c/halconf.h
new file mode 100644
index 0000000000..99f2e11b9a
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev2/proton_c/halconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 QMK
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_I2C    TRUE
+#define HAL_USE_PWM    TRUE
+#define HAL_USE_SERIAL TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/mcuconf.h b/keyboards/splitkb/kyria/rev2/proton_c/mcuconf.h
new file mode 100644
index 0000000000..58348af390
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev2/proton_c/mcuconf.h
@@ -0,0 +1,29 @@
+/* Copyright 2020 QMK
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 FALSE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 3
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.c b/keyboards/splitkb/kyria/rev2/proton_c/proton_c.c
new file mode 100644
index 0000000000..9c74b45f77
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev2/proton_c/proton_c.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "proton_c.h"
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/proton_c.h b/keyboards/splitkb/kyria/rev2/proton_c/proton_c.h
new file mode 100644
index 0000000000..143b9e39dd
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev2/proton_c/proton_c.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "rev2.h"
diff --git a/keyboards/splitkb/kyria/rev2/proton_c/rules.mk b/keyboards/splitkb/kyria/rev2/proton_c/rules.mk
new file mode 100644
index 0000000000..1a5f9a7cb3
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev2/proton_c/rules.mk
@@ -0,0 +1,12 @@
+# MCU name
+MCU = STM32F303
+BOARD = QMK_PROTON_C
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+WS2812_DRIVER = pwm
+SERIAL_DRIVER = usart
+AUDIO_ENABLE = no
+LTO_ENABLE = no
+CONVERT_TO_PROTON_C = yes
diff --git a/keyboards/splitkb/kyria/rev2/rev2.c b/keyboards/splitkb/kyria/rev2/rev2.c
new file mode 100644
index 0000000000..0a181cdf12
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev2/rev2.c
@@ -0,0 +1,76 @@
+/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "rev2.h"
+
+// Mask out handedness diode to prevent it
+// from keeping the keyboard awake
+// - just mirroring `KC_NO` in the `LAYOUT`
+//   macro to keep it simple
+const matrix_row_t matrix_mask[] = {
+    0b11111100,
+    0b11111100,
+    0b11111111,
+    0b00101111,
+    0b11111100,
+    0b11111100,
+    0b11111111,
+    0b00101111,
+};
+
+#ifdef SWAP_HANDS_ENABLE
+// clang-format off
+__attribute__ ((weak)) const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    {{0, 4}, {1, 4}, {2, 4}, {3, 4}, {4, 4}, {5, 4}, {6, 4}, {7, 4}},
+    {{0, 5}, {1, 5}, {2, 5}, {3, 5}, {4, 5}, {5, 5}, {6, 5}, {7, 5}},
+    {{0, 6}, {1, 6}, {2, 6}, {3, 6}, {4, 6}, {5, 6}, {6, 6}, {7, 6}},
+    {{0, 7}, {1, 7}, {2, 7}, {3, 7}, {4, 7}, {5, 7}, {6, 7}, {7, 7}},
+    {{0, 0}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {6, 0}, {7, 0}},
+    {{0, 1}, {1, 1}, {2, 1}, {3, 1}, {4, 1}, {5, 1}, {6, 1}, {7, 1}},
+    {{0, 2}, {1, 2}, {2, 2}, {3, 2}, {4, 2}, {5, 2}, {6, 2}, {7, 2}},
+    {{0, 3}, {1, 3}, {2, 3}, {3, 3}, {4, 3}, {5, 3}, {6, 3}, {7, 3}}
+};
+// clang-format on
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+/* Map physical under glow LEDs for RGB matrix support
+ *  09, 02, xx, xx, 01, xx,                   xx, 11, xx, xx, 12, 19,
+ *  xx, xx, xx, xx, xx, 00,                   10, xx, xx, xx, xx, xx,
+ *  08, 03, 04, xx, xx, xx, 07, xx,   xx, 17, xx, xx, xx, 14, 13, 18,
+ *                  xx, 05, 06, xx,   xx, xx, xx, 16, 15, xx
+ */
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    { NO_LED, NO_LED, NO_LED, 1,      NO_LED, NO_LED, 2,      9     },
+    { NO_LED, NO_LED, 0,      NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+    { NO_LED, 7,      NO_LED, NO_LED, NO_LED, 4,      3,      8      },
+    { NO_LED, NO_LED, 6,      5,      NO_LED, NO_LED, NO_LED, NO_LED },
+    { NO_LED, NO_LED, NO_LED, 11,     NO_LED, NO_LED, 12,     19     },
+    { NO_LED, NO_LED, 10,     NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+    { NO_LED, 17,     NO_LED, NO_LED, NO_LED, 14,     13,     18     },
+    { NO_LED, NO_LED, 16,     15,     NO_LED, NO_LED, NO_LED, NO_LED },
+}, {
+    // LED Index to Physical Position
+    {77,24}, {63,8}, {21,8}, {21,40}, {35,40}, {63,56}, {77,56}, {91,40}, {7,40}, {7,8},
+    {147,24}, {161,8}, {203,8}, {203,40}, {189,40}, {161,56}, {147,56}, {133,40}, {217,40}, {217,8}
+}, {
+    // LED Index to Flag
+    LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+    LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+    LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
+    LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL
+} };
+#endif
diff --git a/keyboards/splitkb/kyria/rev2/rev2.h b/keyboards/splitkb/kyria/rev2/rev2.h
new file mode 100644
index 0000000000..ed4169b0ed
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev2/rev2.h
@@ -0,0 +1,70 @@
+/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "kyria.h"
+#ifdef KEYBOARD_splitkb_kyria_rev2_proton_c
+#    include "proton_c.h"
+#endif
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05,                     R06, R07, R08, R09, R10, R11, \
+    L12, L13, L14, L15, L16, L17,                     R18, R19, R20, R21, R22, R23, \
+    L24, L25, L26, L27, L28, L29, L30, L31, R32, R33, R34, R35, R36, R37, R38, R39, \
+                   L40, L41, L42, L43, L44, R45, R46, R47, R48, R49 \
+) \
+{ \
+    { KC_NO, KC_NO, L05,   L04,   L03,   L02,   L01,   L00   }, \
+    { KC_NO, KC_NO, L17,   L16,   L15,   L14,   L13,   L12   }, \
+    { L31,   L30,   L29,   L28,   L27,   L26,   L25,   L24   }, \
+    { L44,   L43,   L42,   L41,   KC_NO, L40,   KC_NO, KC_NO }, \
+    { KC_NO, KC_NO, R06,   R07,   R08,   R09,   R10,   R11   }, \
+    { KC_NO, KC_NO, R18,   R19,   R20,   R21,   R22,   R23   }, \
+    { R32,   R33,   R34,   R35,   R36,   R37,   R38,   R39   }, \
+    { R45,   R46,   R47,   R48,   KC_NO, R49,   KC_NO, KC_NO }, \
+}
+
+#define LAYOUT_stack(                               \
+    L00, L01, L02, L03, L04, L05,                   \
+    L12, L13, L14, L15, L16, L17,                   \
+    L24, L25, L26, L27, L28, L29, L30, L31,         \
+                   L40, L41, L42, L43, L44,         \
+                                                    \
+                  R06, R07, R08, R09, R10, R11,     \
+                  R18, R19, R20, R21, R22, R23,     \
+        R32, R33, R34, R35, R36, R37, R38, R39,     \
+        R45, R46, R47, R48, R49                     \
+)                                               \
+{                                               \
+    { KC_NO, KC_NO, L05,   L04,   L03,   L02,   L01,   L00   }, \
+    { KC_NO, KC_NO, L17,   L16,   L15,   L14,   L13,   L12   }, \
+    { L31,   L30,   L29,   L28,   L27,   L26,   L25,   L24   }, \
+    { L44,   L43,   L42,   L41,   KC_NO, L40,   KC_NO, KC_NO }, \
+    { KC_NO, KC_NO, R06,   R07,   R08,   R09,   R10,   R11   }, \
+    { KC_NO, KC_NO, R18,   R19,   R20,   R21,   R22,   R23   }, \
+    { R32,   R33,   R34,   R35,   R36,   R37,   R38,   R39   }, \
+    { R45,   R46,   R47,   R48,   KC_NO, R49,   KC_NO, KC_NO }, \
+}
+
+#define LAYOUT_split_3x6_5 LAYOUT
diff --git a/keyboards/splitkb/kyria/rev2/rules.mk b/keyboards/splitkb/kyria/rev2/rules.mk
new file mode 100644
index 0000000000..355c12024f
--- /dev/null
+++ b/keyboards/splitkb/kyria/rev2/rules.mk
@@ -0,0 +1,8 @@
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306   # Enables the use of OLED displays
+ENCODER_ENABLE = yes       # Enables the use of one or more encoders
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+RGB_MATRIX_ENABLE = no     # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
+RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
+
+RGB_MATRIX_SUPPORTED = yes
diff --git a/keyboards/splitkb/kyria/rules.mk b/keyboards/splitkb/kyria/rules.mk
index d778f6df85..7952bfe302 100644
--- a/keyboards/splitkb/kyria/rules.mk
+++ b/keyboards/splitkb/kyria/rules.mk
@@ -18,4 +18,4 @@ AUDIO_ENABLE = no          # Audio output
 SPLIT_KEYBOARD = yes       # Split common
 LTO_ENABLE = yes
 
-DEFAULT_FOLDER = splitkb/kyria/rev1
+DEFAULT_FOLDER = splitkb/kyria/rev2

From 2e31f542dc7f42fa95d16cbe1250da4243b04ac3 Mon Sep 17 00:00:00 2001
From: holtenc <holtenc@gmail.com>
Date: Mon, 21 Feb 2022 01:43:55 -0600
Subject: [PATCH 654/867] [Keyboard] Add Obro (#15884)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/obro/config.h             | 58 +++++++++++++++++++
 keyboards/handwired/obro/info.json            | 10 ++++
 .../handwired/obro/keymaps/default/keymap.c   | 49 ++++++++++++++++
 keyboards/handwired/obro/keymaps/via/keymap.c | 49 ++++++++++++++++
 keyboards/handwired/obro/keymaps/via/rules.mk |  1 +
 keyboards/handwired/obro/obro.c               | 18 ++++++
 keyboards/handwired/obro/obro.h               | 37 ++++++++++++
 keyboards/handwired/obro/readme.md            | 22 +++++++
 keyboards/handwired/obro/rules.mk             | 18 ++++++
 9 files changed, 262 insertions(+)
 create mode 100644 keyboards/handwired/obro/config.h
 create mode 100644 keyboards/handwired/obro/info.json
 create mode 100644 keyboards/handwired/obro/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/obro/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/obro/keymaps/via/rules.mk
 create mode 100644 keyboards/handwired/obro/obro.c
 create mode 100644 keyboards/handwired/obro/obro.h
 create mode 100644 keyboards/handwired/obro/readme.md
 create mode 100644 keyboards/handwired/obro/rules.mk

diff --git a/keyboards/handwired/obro/config.h b/keyboards/handwired/obro/config.h
new file mode 100644
index 0000000000..1217214dd7
--- /dev/null
+++ b/keyboards/handwired/obro/config.h
@@ -0,0 +1,58 @@
+/*
+Copyright 2022 Holten Campbell
+
+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       0x5052
+#define PRODUCT_ID      0x0042
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    Prime Keyboards
+#define PRODUCT         obro
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, F7, D4, B7, B3, D5, D3, D2, D1, D0 }
+#define MATRIX_ROW_PINS { E6, F0, F6, D7, D6 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN F1
+#define RGBLED_NUM 64
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_LIMIT_VAL 200
+
+/* 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
diff --git a/keyboards/handwired/obro/info.json b/keyboards/handwired/obro/info.json
new file mode 100644
index 0000000000..e289ae585e
--- /dev/null
+++ b/keyboards/handwired/obro/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Obro",
+    "url": "https://www.primekb.com",
+    "maintainer": "holtenc",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"~", "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":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "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":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"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":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "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":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":1.75}, {"label":"Fn", "x":15.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}]
+        }
+    }
+}
diff --git a/keyboards/handwired/obro/keymaps/default/keymap.c b/keyboards/handwired/obro/keymaps/default/keymap.c
new file mode 100644
index 0000000000..cf963b553d
--- /dev/null
+++ b/keyboards/handwired/obro/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2020 Holten Campbell
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,
+		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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          MO(1),
+		KC_LCTL, KC_LGUI,                   KC_LALT, KC_SPC,   KC_SPC,  KC_RALT,                                     KC_RGUI, KC_RGUI, KC_RCTL
+    ),
+    [1] = LAYOUT(
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP,   _______, KC_MPRV, KC_MPLY, KC_MNXT,          _______,
+        _______, KC_HOME, KC_PGDN, KC_END,  _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PSCR, _______,
+        _______, _______, _______,          _______,          _______,          _______,                   _______, _______, _______
+    ),
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,          _______,          _______,          _______,                   _______, _______, _______
+    ),
+    [3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,          _______,          _______,          _______,                   _______, _______, _______
+    )
+};
diff --git a/keyboards/handwired/obro/keymaps/via/keymap.c b/keyboards/handwired/obro/keymaps/via/keymap.c
new file mode 100644
index 0000000000..cf963b553d
--- /dev/null
+++ b/keyboards/handwired/obro/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2020 Holten Campbell
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,
+		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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          MO(1),
+		KC_LCTL, KC_LGUI,                   KC_LALT, KC_SPC,   KC_SPC,  KC_RALT,                                     KC_RGUI, KC_RGUI, KC_RCTL
+    ),
+    [1] = LAYOUT(
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP,   _______, KC_MPRV, KC_MPLY, KC_MNXT,          _______,
+        _______, KC_HOME, KC_PGDN, KC_END,  _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_PSCR, _______,
+        _______, _______, _______,          _______,          _______,          _______,                   _______, _______, _______
+    ),
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,          _______,          _______,          _______,                   _______, _______, _______
+    ),
+    [3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,          _______,          _______,          _______,                   _______, _______, _______
+    )
+};
diff --git a/keyboards/handwired/obro/keymaps/via/rules.mk b/keyboards/handwired/obro/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/handwired/obro/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/obro/obro.c b/keyboards/handwired/obro/obro.c
new file mode 100644
index 0000000000..e02765e6ad
--- /dev/null
+++ b/keyboards/handwired/obro/obro.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 Holten Campbell
+
+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 "obro.h"
diff --git a/keyboards/handwired/obro/obro.h b/keyboards/handwired/obro/obro.h
new file mode 100644
index 0000000000..8cff4ff96d
--- /dev/null
+++ b/keyboards/handwired/obro/obro.h
@@ -0,0 +1,37 @@
+/*
+Copyright 2022 Holten Campbell
+
+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 K_NO KC_NO
+
+#define LAYOUT( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K013, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, \
+	K400, K401,             K402, K404,       K407, K409,                   K411, K412, K413  \
+) \
+{ \
+	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
+	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
+	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K_NO, K213 }, \
+	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313}, \
+	{ K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413 }  \
+}
diff --git a/keyboards/handwired/obro/readme.md b/keyboards/handwired/obro/readme.md
new file mode 100644
index 0000000000..7be928050d
--- /dev/null
+++ b/keyboards/handwired/obro/readme.md
@@ -0,0 +1,22 @@
+# Obro
+
+* Keyboard Maintainer: [Holten Campbell](https://github.com/holtenc)
+* Hardware Supported: ATMEGA32u4
+* Hardware Availability: Not applicable
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/obro:default
+
+Flashing example for this keyboard:
+
+    make handwired/obro:default:flash
+
+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).
+
+# Bootloader
+
+Enter the bootloader in 3 ways:
+* Bootmagic reset: HOld down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* Physical reset button: Briefly press the button on the back of the PCB
+* Keycode in layout: Press the key mapped to RESET if it is available
diff --git a/keyboards/handwired/obro/rules.mk b/keyboards/handwired/obro/rules.mk
new file mode 100644
index 0000000000..ee0e024ddb
--- /dev/null
+++ b/keyboards/handwired/obro/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic
+MOUSEKEY_ENABLE = no       # 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          # Enable N-key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output

From deb0fe4bccb15cd28832928bab207ef1a16a2054 Mon Sep 17 00:00:00 2001
From: Tim Liu <74063834+Timliuzhaolu@users.noreply.github.com>
Date: Mon, 21 Feb 2022 15:52:39 +0800
Subject: [PATCH 655/867] [Keyboard] Add glacier in creatkeebs folder (#16079)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/creatkeebs/glacier/config.h         | 70 +++++++++++++
 keyboards/creatkeebs/glacier/glacier.c        | 17 ++++
 keyboards/creatkeebs/glacier/glacier.h        | 35 +++++++
 keyboards/creatkeebs/glacier/info.json        | 98 +++++++++++++++++++
 .../glacier/keymaps/default/keymap.c          | 31 ++++++
 keyboards/creatkeebs/glacier/readme.md        | 27 +++++
 keyboards/creatkeebs/glacier/rules.mk         | 18 ++++
 7 files changed, 296 insertions(+)
 create mode 100644 keyboards/creatkeebs/glacier/config.h
 create mode 100644 keyboards/creatkeebs/glacier/glacier.c
 create mode 100644 keyboards/creatkeebs/glacier/glacier.h
 create mode 100644 keyboards/creatkeebs/glacier/info.json
 create mode 100644 keyboards/creatkeebs/glacier/keymaps/default/keymap.c
 create mode 100644 keyboards/creatkeebs/glacier/readme.md
 create mode 100644 keyboards/creatkeebs/glacier/rules.mk

diff --git a/keyboards/creatkeebs/glacier/config.h b/keyboards/creatkeebs/glacier/config.h
new file mode 100644
index 0000000000..0509365a0d
--- /dev/null
+++ b/keyboards/creatkeebs/glacier/config.h
@@ -0,0 +1,70 @@
+/* Copyright 2022 Tim (https://github.com/Timliuzhaolu)
+  * 
+  * 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      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    creatkeebs
+#define PRODUCT         glacier
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F0, F1, F4, E6, F5, D0 }
+#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, F6, B0, B6, C6, C7, B1, B2, B3, B7, D3, D2, D1 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 0
+#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
+
+#ifdef RGB_DI_PIN
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 0
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#endif
diff --git a/keyboards/creatkeebs/glacier/glacier.c b/keyboards/creatkeebs/glacier/glacier.c
new file mode 100644
index 0000000000..27ff4d02c7
--- /dev/null
+++ b/keyboards/creatkeebs/glacier/glacier.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 Tim (https://github.com/Timliuzhaolu)
+  * 
+  * 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 "glacier.h"
diff --git a/keyboards/creatkeebs/glacier/glacier.h b/keyboards/creatkeebs/glacier/glacier.h
new file mode 100644
index 0000000000..2dcf15fc98
--- /dev/null
+++ b/keyboards/creatkeebs/glacier/glacier.h
@@ -0,0 +1,35 @@
+/* Copyright 2022 Tim (https://github.com/Timliuzhaolu)
+  * 
+  * 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( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016,       \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,       \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K315,       \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                           \
+	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,       K415,             \
+	K500, K501, K502,             K505,                         K510, K511,       K513, K514, K515, K516        \
+) { \
+	{ K000,  K001,   K002,  K003,  K004,   K005,  K006,  K007,  K008,   K009,   K010,  K011,  K012,   K013,  K014,   K015,  K016  }, \
+	{ K100,  K101,   K102,  K103,  K104,   K105,  K106,  K107,  K108,   K109,   K110,  K111,  K112,   K113,  K114    K115,  K116  }, \
+	{ K200,  K201,   K202,  K203,  K204,   K205,  K206,  K207,  K208,   K209,   K210,  K211,  K212,   K213,  K214    K215,  K216  }, \
+	{ K300,  K301,   K302,  K303,  K304,   K305,  K306,  K307,  K308,   K309,   K310,  K311,  KC_NO,  K313,  KC_NO   KC_NO, KC_NO }, \
+	{ K400,  KC_NO,  K402,  K403,  K404,   K405,  K406,  K407,  K408,   K409,   K410,  K411,  KC_NO,  K413,  KC_NO   K415,  KC_NO }, \
+	{ K500,  K501,   K502,  KC_NO, KC_NO,  K505,  KC_NO, KC_NO, KC_NO,  KC_NO,  K510,  K511,  KC_NO,  K513,  K514    K515,  K516  }  \
+}
diff --git a/keyboards/creatkeebs/glacier/info.json b/keyboards/creatkeebs/glacier/info.json
new file mode 100644
index 0000000000..a22dabba0b
--- /dev/null
+++ b/keyboards/creatkeebs/glacier/info.json
@@ -0,0 +1,98 @@
+{
+    "keyboard_name": "glacier",
+    "url": "",
+    "maintainer": "Tim",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+                {"x":16.25, "y":4.25},
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":1.5, "y":5.25},
+                {"x":2.5, "y":5.25, "w":1.5},
+                {"x":4, "y":5.25, "w":7},
+                {"x":11, "y":5.25, "w":1.5},
+                {"x":12.5, "y":5.25},
+                {"x":13.5, "y":5.25, "w":1.5},
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/creatkeebs/glacier/keymaps/default/keymap.c b/keyboards/creatkeebs/glacier/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ee381e17cc
--- /dev/null
+++ b/keyboards/creatkeebs/glacier/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+ /* Copyright 2022 Tim
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+
+
+	[0] = LAYOUT(
+		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS, 
+		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_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, KC_RGUI,          KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
+	)
+};
diff --git a/keyboards/creatkeebs/glacier/readme.md b/keyboards/creatkeebs/glacier/readme.md
new file mode 100644
index 0000000000..6901f93b27
--- /dev/null
+++ b/keyboards/creatkeebs/glacier/readme.md
@@ -0,0 +1,27 @@
+# glacier
+A 80% keyboard
+
+![glacier](https://i.imgur.com/BeyreN1.png)
+
+### Features
+* PCB gasket
+* Nickel-cobalt weight
+
+### Additional Information
+* Keyboard Maintainer: [Tim](https://github.com/Timliuzhaolu/qmk_firmware)
+* Hardware Supported: glacier PCB
+* Hardware Availability: [ESCHIT.com](https://eschit.com/products/gb-thera75)
+
+### Entering Bootloader
+
+Enter the bootloader in 2 ways:
+
+* Physical reset button: Press the `RESET` button on the back of the PCB.
+* Keycode in layout: Press the key mapped to `RESET` if it is available.
+
+### Building the Firmware
+Make example for this keyboard (after setting up your build environment):
+
+    make creatkeebs/glacier: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).
diff --git a/keyboards/creatkeebs/glacier/rules.mk b/keyboards/creatkeebs/glacier/rules.mk
new file mode 100644
index 0000000000..7c9fb95020
--- /dev/null
+++ b/keyboards/creatkeebs/glacier/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes    # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes     # Mouse keys
+EXTRAKEY_ENABLE = yes     # Audio control and System control
+CONSOLE_ENABLE = no       # Console for debug
+COMMAND_ENABLE = yes      # Commands for debug and configuration
+NKRO_ENABLE = no          # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no     # Enable keyboard backlight functionality
+AUDIO_ENABLE = no         # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = no      # Audio output

From 019dddcfa3cb7a1e961e1fefb302eb71bea312f9 Mon Sep 17 00:00:00 2001
From: hunter <hcdarrach@gmail.com>
Date: Mon, 21 Feb 2022 03:28:49 -0500
Subject: [PATCH 656/867] [Keyboard] Add foundation (#16289)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/wavtype/foundation/config.h         | 136 ++++++++++++++++++
 keyboards/wavtype/foundation/foundation.c     |   4 +
 keyboards/wavtype/foundation/foundation.h     |  76 ++++++++++
 keyboards/wavtype/foundation/info.json        |  19 +++
 .../foundation/keymaps/default/keymap.c       |  28 ++++
 .../wavtype/foundation/keymaps/via/keymap.c   |  42 ++++++
 .../wavtype/foundation/keymaps/via/rules.mk   |   1 +
 keyboards/wavtype/foundation/readme.md        |  22 +++
 keyboards/wavtype/foundation/rules.mk         |  18 +++
 9 files changed, 346 insertions(+)
 create mode 100644 keyboards/wavtype/foundation/config.h
 create mode 100644 keyboards/wavtype/foundation/foundation.c
 create mode 100644 keyboards/wavtype/foundation/foundation.h
 create mode 100644 keyboards/wavtype/foundation/info.json
 create mode 100644 keyboards/wavtype/foundation/keymaps/default/keymap.c
 create mode 100644 keyboards/wavtype/foundation/keymaps/via/keymap.c
 create mode 100644 keyboards/wavtype/foundation/keymaps/via/rules.mk
 create mode 100644 keyboards/wavtype/foundation/readme.md
 create mode 100644 keyboards/wavtype/foundation/rules.mk

diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h
new file mode 100644
index 0000000000..e19ea19f7e
--- /dev/null
+++ b/keyboards/wavtype/foundation/config.h
@@ -0,0 +1,136 @@
+// Copyright 2022 wavtype (@wavtype)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x03a7
+#define PRODUCT_ID   0x0003
+#define DEVICE_VER   0x0001
+#define MANUFACTURER protozoa.studio
+#define PRODUCT      foundation
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 18
+
+/*
+ * 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 { B3, B2, B1, F0, F1 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, D2, D1, D0, D3, D5, D4, B7, D6, D7, B4, B5, B6, C6, C7 }
+#define UNUSED_PINS { E6 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN B0
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 16
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/wavtype/foundation/foundation.c b/keyboards/wavtype/foundation/foundation.c
new file mode 100644
index 0000000000..9ac8ba6b72
--- /dev/null
+++ b/keyboards/wavtype/foundation/foundation.c
@@ -0,0 +1,4 @@
+// Copyright 2022 wavtype (@wavtype)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "foundation.h"
diff --git a/keyboards/wavtype/foundation/foundation.h b/keyboards/wavtype/foundation/foundation.h
new file mode 100644
index 0000000000..a01800f143
--- /dev/null
+++ b/keyboards/wavtype/foundation/foundation.h
@@ -0,0 +1,76 @@
+// Copyright 2022 wavtype (@wavtype)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define _x_ KC_NO
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    k00,   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k2e,   k0f, k0g, k0h, \
+    k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,        k1f, k1g, k1h, \
+	k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,                            \
+	k30,   k31,      k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                  k3g,      \
+	k40,   k41, k42, k43,                k47,                k4b, k4c, k4d, k4e,        k4f, k4g, k4h  \
+) \
+{ \
+    { k00,   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e,   k0f, k0g, k0h }, \
+    { k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,   k1f, k1g, k1h},  \
+	{ k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e,   _x_, _x_, _x_},  \
+    { k30,   k31, _x_, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, _x_,   _x_, k3g, _x_},  \
+	{ k40,   k41, k42, k43, _x_, _x_, _x_, k47, _x_, _x_, _x_, k4b, k4c, k4d, k4e,   k4f, k4g, k4h}   \
+}
+
+#define LAYOUT_tkl_ansi_7u( \
+    k00,   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k2e,   k0f, k0g, k0h, \
+    k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,        k1f, k1g, k1h, \
+	k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,                            \
+	k30,   k31,      k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                  k3g,      \
+	k40,   k41, k42, k43,                k47,                     k4c, k4d, k4e,        k4f, k4g, k4h  \
+) \
+{ \
+    { k00,   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e,   k0f, k0g, k0h }, \
+    { k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,   k1f, k1g, k1h},  \
+	{ k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e,   _x_, _x_, _x_},  \
+    { k30,   k31, _x_, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, _x_,   _x_, k3g, _x_},  \
+	{ k40,   k41, k42, k43, _x_, _x_, _x_, k47, _x_, _x_, _x_, _x_, k4c, k4d, k4e,   k4f, k4g, k4h}   \
+}
+
+#define LAYOUT_tkl_iso( \
+    k00,   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k2e,   k0f, k0g, k0h, \
+    k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,        k1f, k1g, k1h, \
+	k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,                            \
+	k30,   k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e,             k3g,      \
+	k40,   k41, k42, k43,                k47,                k4b, k4c, k4d, k4e,        k4f, k4g, k4h  \
+) \
+{ \
+    { k00,   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e,   k0f, k0g, k0h }, \
+    { k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,   k1f, k1g, k1h},  \
+	{ k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e,   _x_, _x_, _x_},  \
+    { k30,   k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e,   _x_, k3g, _x_},  \
+	{ k40,   k41, k42, k43, _x_, _x_, _x_, k47, _x_, _x_, _x_, k4b, k4c, k4d, k4e,   k4f, k4g, k4h}   \
+}
+
+#define LAYOUT_tkl_iso_7u( \
+     k00,   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k2e,  k0f, k0g, k0h, \
+    k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,        k1f, k1g, k1h, \
+	k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,                            \
+	k30,   k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e,             k3g,      \
+	k40,   k41, k42, k43,                k47,                     k4c, k4d, k4e,        k4f, k4g, k4h  \
+) \
+{ \
+    { k00,   k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e,   k0f, k0g, k0h }, \
+    { k10,   k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,   k1f, k1g, k1h},  \
+	{ k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e,   _x_, _x_, _x_},  \
+    { k30,   k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e,   _x_, k3g, _x_},  \
+	{ k40,   k41, k42, k43, _x_, _x_, _x_, k47, _x_, _x_, _x_, _x_, k4c, k4d, k4e,   k4f, k4g, k4h}   \
+}
diff --git a/keyboards/wavtype/foundation/info.json b/keyboards/wavtype/foundation/info.json
new file mode 100644
index 0000000000..317c5f5d14
--- /dev/null
+++ b/keyboards/wavtype/foundation/info.json
@@ -0,0 +1,19 @@
+{
+    "keyboard_name": "foundation",
+    "url": "",
+    "maintainer": "wavtype",
+    "layouts": {
+        "LAYOUT": {
+      "layout": [{"label":"F1", "x":0, "y":0}, {"label":"esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"-", "x":12.5, "y":0}, {"label":"=", "x":13.5, "y":0}, {"label":"BckSpc", "x":14.5, "y":0, "w":2}, {"label":"split", "x":15.5, "y":0}, {"label":"ins", "x":17, "y":0}, {"label":"home", "x":18, "y":0}, {"label":"pg up", "x":19, "y":0}, {"label":"F2", "x":0, "y":1}, {"label":"tab", "x":1.5, "y":1, "w":1.5}, {"label":"q", "x":3, "y":1}, {"label":"w", "x":4, "y":1}, {"label":"e", "x":5, "y":1}, {"label":"r", "x":6, "y":1}, {"label":"t", "x":7, "y":1}, {"label":"y", "x":8, "y":1}, {"label":"u", "x":9, "y":1}, {"label":"i", "x":10, "y":1}, {"label":"o", "x":11, "y":1}, {"label":"p", "x":12, "y":1}, {"label":"[", "x":13, "y":1}, {"label":"]", "x":14, "y":1}, {"label":"\\", "x":15, "y":1, "w":1.5}, {"label":"del", "x":17, "y":1}, {"label":"end", "x":18, "y":1}, {"label":"pg dn", "x":19, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"caps", "x":1.5, "y":2, "w":1.25}, {"label":"a", "x":3.25, "y":2}, {"label":"s", "x":4.25, "y":2}, {"label":"d", "x":5.25, "y":2}, {"label":"f", "x":6.25, "y":2}, {"label":"g", "x":7.25, "y":2}, {"label":"h", "x":8.25, "y":2}, {"label":"j", "x":9.25, "y":2}, {"label":"k", "x":10.25, "y":2}, {"label":"l", "x":11.25, "y":2}, {"label":";", "x":12.25, "y":2}, {"label":"'", "x":13.25, "y":2}, {"label":"enter", "x":14.25, "y":2, "w":2.25}, {"label":"F4", "x":0, "y":3}, {"label":"lshft", "x":1.5, "y":3, "w":2.25}, {"label":"z", "x":3.75, "y":3}, {"label":"x", "x":4.75, "y":3}, {"label":"c", "x":5.75, "y":3}, {"label":"v", "x":6.75, "y":3}, {"label":"b", "x":7.75, "y":3}, {"label":"n", "x":8.75, "y":3}, {"label":"m", "x":9.75, "y":3}, {"label":",", "x":10.75, "y":3}, {"label":".", "x":11.75, "y":3}, {"label":"/", "x":12.75, "y":3}, {"label":"rshft", "x":13.75, "y":3, "w":2.75}, {"label":"up", "x":18, "y":3}, {"label":"F5", "x":0, "y":4}, {"label":"lctrl", "x":1.5, "y":4, "w":1.25}, {"label":"lwin", "x":2.75, "y":4, "w":1.25}, {"label":"lalt", "x":4, "y":4, "w":1.25}, {"label":"spce", "x":5.25, "y":4, "w":6.25}, {"label":"ralt", "x":11.5, "y":4, "w":1.25}, {"label":"fn", "x":12.75, "y":4, "w":1.25}, {"label":"rwin", "x":14, "y":4}, {"label":"rctrl", "x":15, "y":4, "w":1.5}, {"label":"left", "x":17, "y":4}, {"label":"down", "x":18, "y":4}, {"label":"right", "x":19, "y":4}]
+        },
+        "LAYOUT_tkl_ansi_7u": {
+            "layout": [{"label":"F1", "x":0, "y":0}, {"label":"esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"-", "x":12.5, "y":0}, {"label":"=", "x":13.5, "y":0}, {"label":"BckSpc", "x":14.5, "y":0, "w":2}, {"label":"split", "x":15.5, "y":0}, {"label":"ins", "x":17, "y":0}, {"label":"home", "x":18, "y":0}, {"label":"pg up", "x":19, "y":0}, {"label":"F2", "x":0, "y":1}, {"label":"tab", "x":1.5, "y":1, "w":1.5}, {"label":"q", "x":3, "y":1}, {"label":"w", "x":4, "y":1}, {"label":"e", "x":5, "y":1}, {"label":"r", "x":6, "y":1}, {"label":"t", "x":7, "y":1}, {"label":"y", "x":8, "y":1}, {"label":"u", "x":9, "y":1}, {"label":"i", "x":10, "y":1}, {"label":"o", "x":11, "y":1}, {"label":"p", "x":12, "y":1}, {"label":"[", "x":13, "y":1}, {"label":"]", "x":14, "y":1}, {"label":"\\", "x":15, "y":1, "w":1.5}, {"label":"del", "x":17, "y":1}, {"label":"end", "x":18, "y":1}, {"label":"pg dn", "x":19, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"caps", "x":1.5, "y":2, "w":1.25}, {"label":"a", "x":3.25, "y":2}, {"label":"s", "x":4.25, "y":2}, {"label":"d", "x":5.25, "y":2}, {"label":"f", "x":6.25, "y":2}, {"label":"g", "x":7.25, "y":2}, {"label":"h", "x":8.25, "y":2}, {"label":"j", "x":9.25, "y":2}, {"label":"k", "x":10.25, "y":2}, {"label":"l", "x":11.25, "y":2}, {"label":";", "x":12.25, "y":2}, {"label":"'", "x":13.25, "y":2}, {"label":"enter", "x":14.25, "y":2, "w":2.25}, {"label":"F4", "x":0, "y":3}, {"label":"lshft", "x":1.5, "y":3, "w":2.25}, {"label":"z", "x":3.75, "y":3}, {"label":"x", "x":4.75, "y":3}, {"label":"c", "x":5.75, "y":3}, {"label":"v", "x":6.75, "y":3}, {"label":"b", "x":7.75, "y":3}, {"label":"n", "x":8.75, "y":3}, {"label":"m", "x":9.75, "y":3}, {"label":",", "x":10.75, "y":3}, {"label":".", "x":11.75, "y":3}, {"label":"/", "x":12.75, "y":3}, {"label":"rshft", "x":13.75, "y":3, "w":2.75}, {"label":"up", "x":18, "y":3}, {"label":"F5", "x":0, "y":4}, {"label":"lctrl", "x":1.5, "y":4, "w":1.5}, {"label":"lwin", "x":3, "y":4}, {"label":"lalt", "x":4, "y":4, "w":1.5}, {"label":"spce", "x":5.5, "y":4, "w":7}, {"label":"ralt", "x":12.5, "y":4, "w":1.5}, {"label":"fn", "x":14, "y":4, "w":1.25}, {"label":"rctrl", "x":15.25, "y":4, "w":1.25}, {"label":"left", "x":17, "y":4}, {"label":"down", "x":18, "y":4}, {"label":"right", "x":19, "y":4}]
+		},
+        "LAYOUT_tkl_iso": {
+            "layout": [{"label":"F1", "x":0, "y":0}, {"label":"esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"-", "x":12.5, "y":0}, {"label":"=", "x":13.5, "y":0}, {"label":"BckSpc", "x":14.5, "y":0, "w":2}, {"label":"split", "x":15.5, "y":0}, {"label":"ins", "x":17, "y":0}, {"label":"home", "x":18, "y":0}, {"label":"pg up", "x":19, "y":0}, {"label":"F2", "x":0, "y":1}, {"label":"tab", "x":1.5, "y":1, "w":1.5}, {"label":"q", "x":3, "y":1}, {"label":"w", "x":4, "y":1}, {"label":"e", "x":5, "y":1}, {"label":"r", "x":6, "y":1}, {"label":"t", "x":7, "y":1}, {"label":"y", "x":8, "y":1}, {"label":"u", "x":9, "y":1}, {"label":"i", "x":10, "y":1}, {"label":"o", "x":11, "y":1}, {"label":"p", "x":12, "y":1}, {"label":"[", "x":13, "y":1}, {"label":"]", "x":14, "y":1}, {"label":"iso", "x":15.25, "y":1, "w":1.25, "h":2}, {"label":"del", "x":17, "y":1}, {"label":"end", "x":18, "y":1}, {"label":"pg dn", "x":19, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"caps", "x":1.5, "y":2, "w":1.25}, {"label":"a", "x":3.25, "y":2}, {"label":"s", "x":4.25, "y":2}, {"label":"d", "x":5.25, "y":2}, {"label":"f", "x":6.25, "y":2}, {"label":"g", "x":7.25, "y":2}, {"label":"h", "x":8.25, "y":2}, {"label":"j", "x":9.25, "y":2}, {"label":"k", "x":10.25, "y":2}, {"label":"l", "x":11.25, "y":2}, {"label":";", "x":12.25, "y":2}, {"label":"'", "x":13.25, "y":2}, {"label":"\\", "x":14.25, "y":2}, {"label":"F4", "x":0, "y":3}, {"label":"ls1", "x":1.5, "y":3, "w":1.25}, {"label":"ls2", "x":2.75, "y":3}, {"label":"z", "x":3.75, "y":3}, {"label":"x", "x":4.75, "y":3}, {"label":"c", "x":5.75, "y":3}, {"label":"v", "x":6.75, "y":3}, {"label":"b", "x":7.75, "y":3}, {"label":"n", "x":8.75, "y":3}, {"label":"m", "x":9.75, "y":3}, {"label":",", "x":10.75, "y":3}, {"label":".", "x":11.75, "y":3}, {"label":"/", "x":12.75, "y":3}, {"label":"rs1", "x":13.75, "y":3, "w":1.75}, {"label":"rs2", "x":15.5, "y":3}, {"label":"up", "x":18, "y":3}, {"label":"F5", "x":0, "y":4}, {"label":"lctrl", "x":1.5, "y":4, "w":1.25}, {"label":"lwin", "x":2.75, "y":4, "w":1.25}, {"label":"lalt", "x":4, "y":4, "w":1.25}, {"label":"spce", "x":5.25, "y":4, "w":6.25}, {"label":"ralt", "x":11.5, "y":4, "w":1.25}, {"label":"fn", "x":12.75, "y":4, "w":1.25}, {"label":"rwin", "x":14, "y":4}, {"label":"rctrl", "x":15, "y":4, "w":1.5}, {"label":"left", "x":17, "y":4}, {"label":"down", "x":18, "y":4}, {"label":"right", "x":19, "y":4}]
+		},
+        "LAYOUT_tkl_iso_7u": {
+            "layout": [{"label":"F1", "x":0, "y":0}, {"label":"esc", "x":1.5, "y":0}, {"label":"1", "x":2.5, "y":0}, {"label":"2", "x":3.5, "y":0}, {"label":"3", "x":4.5, "y":0}, {"label":"4", "x":5.5, "y":0}, {"label":"5", "x":6.5, "y":0}, {"label":"6", "x":7.5, "y":0}, {"label":"7", "x":8.5, "y":0}, {"label":"8", "x":9.5, "y":0}, {"label":"9", "x":10.5, "y":0}, {"label":"0", "x":11.5, "y":0}, {"label":"-", "x":12.5, "y":0}, {"label":"=", "x":13.5, "y":0}, {"label":"BckSpc", "x":14.5, "y":0, "w":2}, {"label":"split", "x":15.5, "y":0}, {"label":"ins", "x":17, "y":0}, {"label":"home", "x":18, "y":0}, {"label":"pg up", "x":19, "y":0}, {"label":"F2", "x":0, "y":1}, {"label":"tab", "x":1.5, "y":1, "w":1.5}, {"label":"q", "x":3, "y":1}, {"label":"w", "x":4, "y":1}, {"label":"e", "x":5, "y":1}, {"label":"r", "x":6, "y":1}, {"label":"t", "x":7, "y":1}, {"label":"y", "x":8, "y":1}, {"label":"u", "x":9, "y":1}, {"label":"i", "x":10, "y":1}, {"label":"o", "x":11, "y":1}, {"label":"p", "x":12, "y":1}, {"label":"[", "x":13, "y":1}, {"label":"]", "x":14, "y":1}, {"label":"iso", "x":15.25, "y":1, "w":1.25, "h":2}, {"label":"del", "x":17, "y":1}, {"label":"end", "x":18, "y":1}, {"label":"pg dn", "x":19, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"caps", "x":1.5, "y":2, "w":1.25}, {"label":"a", "x":3.25, "y":2}, {"label":"s", "x":4.25, "y":2}, {"label":"d", "x":5.25, "y":2}, {"label":"f", "x":6.25, "y":2}, {"label":"g", "x":7.25, "y":2}, {"label":"h", "x":8.25, "y":2}, {"label":"j", "x":9.25, "y":2}, {"label":"k", "x":10.25, "y":2}, {"label":"l", "x":11.25, "y":2}, {"label":";", "x":12.25, "y":2}, {"label":"'", "x":13.25, "y":2}, {"label":"13,2", "x":14.25, "y":2}, {"label":"F4", "x":0, "y":3}, {"label":"ls1", "x":1.5, "y":3, "w":1.25}, {"label":"ls2", "x":2.75, "y":3}, {"label":"z", "x":3.75, "y":3}, {"label":"x", "x":4.75, "y":3}, {"label":"c", "x":5.75, "y":3}, {"label":"v", "x":6.75, "y":3}, {"label":"b", "x":7.75, "y":3}, {"label":"n", "x":8.75, "y":3}, {"label":"m", "x":9.75, "y":3}, {"label":",", "x":10.75, "y":3}, {"label":".", "x":11.75, "y":3}, {"label":"/", "x":12.75, "y":3}, {"label":"rs1", "x":13.75, "y":3, "w":1.75}, {"label":"rs2", "x":15.5, "y":3}, {"label":"up", "x":18, "y":3}, {"label":"F5", "x":0, "y":4}, {"label":"lctrl", "x":1.5, "y":4, "w":1.5}, {"label":"lwin", "x":3, "y":4}, {"label":"lalt", "x":4, "y":4, "w":1.5}, {"label":"spce", "x":5.5, "y":4, "w":7}, {"label":"ralt", "x":12.5, "y":4, "w":1.5}, {"label":"fn", "x":14, "y":4, "w":1.25}, {"label":"rctrl", "x":15.25, "y":4, "w":1.25}, {"label":"left", "x":17, "y":4}, {"label":"down", "x":18, "y":4}, {"label":"right", "x":19, "y":4}]
+	  }
+    }
+}
diff --git a/keyboards/wavtype/foundation/keymaps/default/keymap.c b/keyboards/wavtype/foundation/keymaps/default/keymap.c
new file mode 100644
index 0000000000..eea83c9889
--- /dev/null
+++ b/keyboards/wavtype/foundation/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2022 wavtype (@wavtype)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT(
+    KC_F1,   KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,   KC_INS, KC_HOME, KC_PGUP,
+    KC_F2,   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_DEL, KC_PGDN,
+	KC_F3,   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_F4,   KC_LSHIFT,      KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT,                    KC_UP,
+	KC_F5,   KC_LCTRL, KC_LGUI, KC_LALT,                KC_SPC,                KC_RALT, KC_RGUI, MO(1), KC_RCTRL,    KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT(
+    RGB_TOG,   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_INS, KC_HOME, KC_PGUP,
+    RGB_MOD,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS,
+	RGB_HUI,   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,
+	RGB_SAI,   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_VOLU,
+	RGB_VAI,   KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                    KC_MPRV, KC_VOLD, KC_MNXT
+    )
+};
diff --git a/keyboards/wavtype/foundation/keymaps/via/keymap.c b/keyboards/wavtype/foundation/keymaps/via/keymap.c
new file mode 100644
index 0000000000..2dcb0bebc8
--- /dev/null
+++ b/keyboards/wavtype/foundation/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+// Copyright 2022 wavtype (@wavtype)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [0] = LAYOUT(
+    KC_F1,   KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,   KC_INS, KC_HOME, KC_PGUP,
+    KC_F2,   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_DEL, KC_PGDN,
+	KC_F3,   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_F4,   KC_LSHIFT,      KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT,                    KC_UP,
+	KC_F5,   KC_LCTRL, KC_LGUI, KC_LALT,                KC_SPC,                KC_RALT, KC_RGUI, MO(1), KC_RCTRL,    KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [1] = LAYOUT(
+    RGB_TOG,   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_INS, KC_HOME, KC_PGUP,
+    RGB_MOD,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS,
+	RGB_HUI,   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,
+	RGB_SAI,   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_VOLU,
+	RGB_VAI,   KC_TRNS, KC_TRNS, KC_TRNS,                KC_MPLY,                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                    KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+	[2] = LAYOUT(
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_TRNS,   KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                  KC_TRNS,
+	KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                    KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+	[3] = LAYOUT(
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_TRNS,   KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                  KC_TRNS,
+	KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,                KC_TRNS,                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                    KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/wavtype/foundation/keymaps/via/rules.mk b/keyboards/wavtype/foundation/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/wavtype/foundation/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/wavtype/foundation/readme.md b/keyboards/wavtype/foundation/readme.md
new file mode 100644
index 0000000000..69f9bd3a0d
--- /dev/null
+++ b/keyboards/wavtype/foundation/readme.md
@@ -0,0 +1,22 @@
+# foundation
+
+The foundation pcb was designed for protozoa studio's foundation line of keyboards.
+
+* Keyboard Maintainer: wavtype
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wavtype/foundation:default
+
+Flashing example for this keyboard:
+
+    make wavtype/foundation:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+* **Bootmagic reset**: Hold down the key at (0,1) in the matrix (Escape key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to RESET if it is available (by default this is set to "Fn + R")
\ No newline at end of file
diff --git a/keyboards/wavtype/foundation/rules.mk b/keyboards/wavtype/foundation/rules.mk
new file mode 100644
index 0000000000..3ff392a61f
--- /dev/null
+++ b/keyboards/wavtype/foundation/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 2d1f2810a41b8a93c21035b14afacb717ef7c822 Mon Sep 17 00:00:00 2001
From: federicoweber <federicoweber@gmail.com>
Date: Mon, 21 Feb 2022 00:38:53 -0800
Subject: [PATCH 657/867] [Keyboard] add Gizmo Engineering GK6 keyboard
 (#13907)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/gizmo_engineering/gk6/config.h      |  83 +++++++
 keyboards/gizmo_engineering/gk6/gk6.c         | 183 +++++++++++++++
 keyboards/gizmo_engineering/gk6/gk6.h         |  64 ++++++
 keyboards/gizmo_engineering/gk6/info.json     | 209 ++++++++++++++++++
 .../gk6/keymaps/12x5/keymap.c                 | 118 ++++++++++
 .../gk6/keymaps/1x2u/keymap.c                 | 119 ++++++++++
 .../gk6/keymaps/default/keymap.c              | 104 +++++++++
 .../gk6/keymaps/via/keymap.c                  |  93 ++++++++
 .../gk6/keymaps/via/rules.mk                  |   1 +
 keyboards/gizmo_engineering/gk6/readme.md     |  13 ++
 keyboards/gizmo_engineering/gk6/rules.mk      |  21 ++
 11 files changed, 1008 insertions(+)
 create mode 100755 keyboards/gizmo_engineering/gk6/config.h
 create mode 100755 keyboards/gizmo_engineering/gk6/gk6.c
 create mode 100755 keyboards/gizmo_engineering/gk6/gk6.h
 create mode 100755 keyboards/gizmo_engineering/gk6/info.json
 create mode 100755 keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c
 create mode 100755 keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c
 create mode 100755 keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c
 create mode 100755 keyboards/gizmo_engineering/gk6/keymaps/via/keymap.c
 create mode 100755 keyboards/gizmo_engineering/gk6/keymaps/via/rules.mk
 create mode 100755 keyboards/gizmo_engineering/gk6/readme.md
 create mode 100755 keyboards/gizmo_engineering/gk6/rules.mk

diff --git a/keyboards/gizmo_engineering/gk6/config.h b/keyboards/gizmo_engineering/gk6/config.h
new file mode 100755
index 0000000000..f437840f91
--- /dev/null
+++ b/keyboards/gizmo_engineering/gk6/config.h
@@ -0,0 +1,83 @@
+/*
+Copyright 2021 Gizmo Engineering
+
+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       0x6532
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x3031
+#define MANUFACTURER    Gizmo Engineering
+#define PRODUCT         GK6
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 12
+
+/*
+ * Keyboard Matrix Assignments
+*/
+#define MATRIX_ROW_PINS { B6, B4, D7, D6, D4}
+#define MATRIX_COL_PINS { B5, C6, C7, F7, F6, D5, D3, D2, F1, F4, B7, F5 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+// Use ~ key for the bootloader
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+// RGB Matrix
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110111
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 32
+#define DRIVER_2_LED_TOTAL 32
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_STARTUP_SPD 127
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 25
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+
diff --git a/keyboards/gizmo_engineering/gk6/gk6.c b/keyboards/gizmo_engineering/gk6/gk6.c
new file mode 100755
index 0000000000..9066fc85a5
--- /dev/null
+++ b/keyboards/gizmo_engineering/gk6/gk6.c
@@ -0,0 +1,183 @@
+/* Copyright 2021 Gizmo Engineering
+ *
+ * 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 "gk6.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
+    {0, C1_8, C2_8, C3_8},     //0 led1
+    {0, C1_7, C2_7, C3_7},     //1 led2
+    {0, C1_6, C2_6, C3_6},     //2 led3
+    {0, C1_5, C2_5, C3_5},     //3 led4
+    {0, C1_4, C2_4, C3_4},     //4 led5
+    {0, C1_3, C2_3, C3_3},     //5 led6
+    {0, C1_2, C2_2, C4_3},     //6 led7
+    {0, C1_1, C3_2, C4_2},     //7 led7b
+    {0, C9_1, C8_1, C7_1},     //8 led8
+    {0, C9_2, C8_2, C7_2},     //9 led9
+    {0, C9_3, C8_3, C7_3},     //10 led10
+    {0, C9_4, C8_4, C7_4},     //11 led11
+    {0, C9_5, C8_5, C7_5},     //12 led12
+    {0, C9_6, C8_6, C7_6},     //13 led13
+    {0, C9_7, C8_7, C6_6},     //14 led14
+    {0, C9_8, C7_7, C6_7},     //15 led15
+    {0, C1_16, C2_16, C3_16},  //16 led16
+    {0, C1_15, C2_15, C3_15},  //17 led17
+    {0, C1_14, C2_14, C3_14},  //18 led18
+    {0, C1_13, C2_13, C3_13},  //19 led19
+    {0, C1_12, C2_12, C3_12},  //20 led20
+    {0, C1_11, C2_11, C3_11},  //21 led21
+    {0, C1_10, C2_10, C4_11},  //22 led22
+    {0, C9_9, C8_9, C7_9},     //23 led23
+    {0, C9_10, C8_10, C7_10},  //24 led24 missing on [default]
+    {0, C9_11, C8_11, C7_11},  //25 led25 missing on [1x2u, 12x5]
+    {0, C9_12, C8_12, C7_12},  //26 led26
+    {0, C9_13, C8_13, C7_13},  //27 led27
+    {0, C9_14, C8_14, C7_14},  //28 led28
+    {0, C9_15, C8_15, C6_14},  //29 led29
+    {0, C9_16, C7_15, C6_15},  //30 led30 missing on [default, 1x2u]
+    {1, C1_8, C2_8, C3_8},     //31 led31
+    {1, C1_7, C2_7, C3_7},     //32 led32
+    {1, C1_6, C2_6, C3_6},     //33 led33
+    {1, C1_5, C2_5, C3_5},     //34 led34
+    {1, C1_4, C2_4, C3_4},     //35 led35 missing on [default, 1x2u]
+    {1, C1_3, C2_3, C3_3},     //36 led36 missing on [default, 12x5]
+    {1, C1_2, C2_2, C4_3},     //37 led37
+    {1, C1_1, C3_2, C4_2},     //38 led37b
+    {1, C9_1, C8_1, C7_1},     //39 led38
+    {1, C9_2, C8_2, C7_2},     //40 led39
+    {1, C9_3, C8_3, C7_3},     //41 led40 missing on [default]
+    {1, C9_4, C8_4, C7_4},     //42 led41 missing on [1x2u, 12x5]
+    {1, C9_5, C8_5, C7_5},     //43 led42
+    {1, C9_6, C8_6, C7_6},     //44 led43
+    {1, C9_7, C8_7, C6_6},     //45 led44
+    {1, C9_8, C7_7, C6_7},     //46 led45
+    {1, C1_16, C2_16, C3_16},  //47 led46
+    {1, C1_15, C2_15, C3_15},  //48 led47
+    {1, C1_14, C2_14, C3_14},  //49 led48
+    {1, C1_13, C2_13, C3_13},  //50 led49
+    {1, C1_12, C2_12, C3_12},  //51 led50
+    {1, C1_11, C2_11, C3_11},  //52 led51
+    {1, C1_10, C2_10, C4_11},  //53 led52
+    {1, C1_9, C3_10, C4_10},   //54 led52b
+    {1, C9_9, C8_9, C7_9},     //55 led53
+    {1, C9_10, C8_10, C7_10},  //56 led54
+    {1, C9_11, C8_11, C7_11},  //57 led55
+    {1, C9_12, C8_12, C7_12},  //58 led56
+    {1, C9_13, C8_13, C7_13},  //59 led57
+    {1, C9_14, C8_14, C7_14},  //60 led58
+    {1, C9_15, C8_15, C6_14},  //61 led59
+    {1, C9_16, C7_15, C6_15},  //62 led60
+};
+
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+//   1, 6,  10, 15, 20, 26,     31,     37,  42, 47, 52,  56
+    {0, 5,  10, 15, 20, 26,     31,     37,  43, 48, 53,  58},
+//   2, 7,  11, 16, 21, 27,     32,     37b, 43, 48, 52b,  57
+    {1, 6,  11, 16, 21, 27,     32,     38,  44, 49, 54,  59},
+//   3, 7b, 12, 17, 22, 28,     33,     38,  44, 49, 53,  58
+    {2, 7,  12, 17, 22, 28,     33,     39,  45, 50, 55,  60},
+//   4, 8,  13, 18, 23, 29,     34,     39,  45, 50, 54,  59
+    {3, 8,  13, 18, 23, 29,     34,     40,  46, 51, 56,  61},
+//   5, 9,  14, 19, 25, NO_LED, NO_LED, 41,  46, 51, 55,  60
+    {4, 9,  14, 19, 25, NO_LED, NO_LED, 42,  47, 52, 57,  62},
+}, {
+    // LED Index to Physical Position
+    {0, 0}, // 0
+    {0, 16}, // 1
+    {0, 32}, // 2
+    {0, 48}, // 3
+    {0, 64}, // 4
+
+    {21, 0}, // 5
+    {21, 16}, // 6
+    {21, 32}, // 7
+    {21, 48}, // 8
+    {21, 64}, // 9
+
+    {41, 0}, // 10
+    {41, 16}, // 11
+    {41, 32}, // 12
+    {41, 48}, // 13
+    {41, 64}, // 14
+
+    {61, 0}, // 15
+    {61, 16}, // 16
+    {61, 32}, // 17
+    {61, 48}, // 18
+    {61, 64}, // 19
+
+    {82, 0}, // 20
+    {82, 16}, // 21
+    {82, 32}, // 22
+    {82, 48}, // 23
+    {82, 64}, // 24
+    {92, 64}, // 25
+
+    {102, 0}, // 26
+    {102, 16}, // 27
+    {102, 32}, // 28
+    {102, 48}, // 29
+    {102, 64}, // 30
+
+    {122, 0}, // 31
+    {122, 16}, // 32
+    {122, 32}, // 33
+    {122, 48}, // 34
+    {122, 64}, // 35
+    {112, 64}, // 36
+
+    {142, 0}, // 37
+    {142, 16}, // 38
+    {142, 32}, // 39
+    {142, 48}, // 40
+    {142, 64}, // 41
+    {132, 64}, // 42
+
+    {163, 0}, // 43
+    {163, 16}, // 44
+    {163, 32}, // 45
+    {163, 48}, // 46
+    {163, 64}, // 47
+
+    {183, 0}, // 48
+    {183, 16}, // 49
+    {183, 32}, // 50
+    {183, 48}, // 51
+    {183, 64}, // 52
+
+    {203, 0}, // 53
+    {203, 16}, // 54
+    {203, 32}, // 55
+    {203, 48}, // 56
+    {203, 64}, // 57
+
+    {224, 0}, // 58
+    {224, 16}, // 59
+    {224, 32}, // 60
+    {224, 48}, // 61
+    {224, 64}, // 62
+}, {
+    // LED Index to Flag
+    0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+    0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+    0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+    0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+    0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+    0x04, 0x04, 0x04
+} };
+#endif
diff --git a/keyboards/gizmo_engineering/gk6/gk6.h b/keyboards/gizmo_engineering/gk6/gk6.h
new file mode 100755
index 0000000000..70c0bee4ae
--- /dev/null
+++ b/keyboards/gizmo_engineering/gk6/gk6.h
@@ -0,0 +1,64 @@
+/* Copyright 2021 Gizmo Engineering
+ *
+ * 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_gk6_2x2u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    k40, k41, k42, k43,    k44,      k47,   k48, k49, k4a, k4b \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
+    { k40, k41, k42, k43, k44, KC_NO, KC_NO, k47, k48, k49, k4a, k4b }, \
+}
+
+#define LAYOUT_gk6_1x2u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    k40, k41, k42, k43, k44,   k46,    k47, k48, k49, k4a, k4b \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
+    { k40, k41, k42, k43, k44, KC_NO, k46, k47, k48, k49, k4a, k4b }, \
+}
+
+#define LAYOUT_ortho_5x12( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b }, \
+}
diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/info.json
new file mode 100755
index 0000000000..e38702d941
--- /dev/null
+++ b/keyboards/gizmo_engineering/gk6/info.json
@@ -0,0 +1,209 @@
+{
+    "keyboard_name": "Gizmo Engineering GK6",
+    "keyboard_folder": "gk6",
+    "url": "https://gizmo.engineering/",
+    "maintainer": "federicoweber",
+    "layouts": {
+        "LAYOUT_gk6_2x2u": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4, "w": 2},
+                {"x": 6, "y": 4, "w": 2},
+                {"x": 8, "y": 4},
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_ortho_5x12": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4},
+                {"x": 6, "y": 4},
+                {"x": 7, "y": 4},
+                {"x": 8, "y": 4},
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4}
+            ]
+        },
+        "LAYOUT_gk6_1x2u": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4},
+                {"x": 5, "y": 4, "w": 2},
+                {"x": 7, "y": 4},
+                {"x": 8, "y": 4},
+                {"x": 9, "y": 4},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c
new file mode 100755
index 0000000000..bb7b627ce4
--- /dev/null
+++ b/keyboards/gizmo_engineering/gk6/keymaps/12x5/keymap.c
@@ -0,0 +1,118 @@
+/* Copyright 2021 Gizmo Engineering
+ *
+ * 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 layers {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  /   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | CTRL |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  | GUI  |  Alt |Lower |  Back|Space |Space |  Alt |Raise | Left | Down |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_ortho_5x12(
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
+  KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_BSPC, KC_SPC, KC_SPC,  KC_RALT,  RAISE,   KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |   _  |   +  |   {  |   }  |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |   -  |   =  |   [  |   ]  |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |RGB_TG|RGB_M |RGB_HU|RGB_SI|RGB_VI|RGB_SP|      |      |      |   |  |   \  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Debug |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_ortho_5x12(
+  _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
+  _______, _______,  _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+  _______, RGB_TOG,  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_PIPE, KC_BSLS,
+  DEBUG,   _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  | F7   |  F8  |  F9  |  F10 |  F11 |  F12 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | CAPS | PSCR |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      | Home | End  | Ins  | Play |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  <<  |  >>  | Mute | Vol- | Vol+ |      |      |      |      | PgUp |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      | PgDn |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_ortho_5x12(
+  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_CAPS, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_HOME, KC_END,  KC_INS,  KC_MPLY, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, KC_PGUP, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______
+),
+
+};
+
+#ifdef RGB_MATRIX_ENABLE
+void rgb_matrix_indicators_user(void)
+{
+    rgb_matrix_set_color(25, 0, 0, 0);
+    rgb_matrix_set_color(36, 0, 0, 0);
+    rgb_matrix_set_color(42, 0, 0, 0);
+}
+
+void keyboard_pre_init_user(void) {
+    // 5, 9,  14, 19, 24, 30, 35, 40, 46, 51, 55, 60
+    g_led_config.matrix_co[4][0] = 5;
+    g_led_config.matrix_co[4][1] = 9;
+    g_led_config.matrix_co[4][2] = 14;
+    g_led_config.matrix_co[4][3] = 19;
+    g_led_config.matrix_co[4][4] = 24;
+    g_led_config.matrix_co[4][5] = 30;
+    g_led_config.matrix_co[4][6] = 35;
+    g_led_config.matrix_co[4][7] = 41;
+    g_led_config.matrix_co[4][8] = 47;
+    g_led_config.matrix_co[4][9] = 52;
+    g_led_config.matrix_co[4][10] = 57;
+    g_led_config.matrix_co[4][11] = 62;
+}
+#endif
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c
new file mode 100755
index 0000000000..41e3062dc2
--- /dev/null
+++ b/keyboards/gizmo_engineering/gk6/keymaps/1x2u/keymap.c
@@ -0,0 +1,119 @@
+/* Copyright 2021 Gizmo Engineering
+ *
+ * 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 layers {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  /   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | CTRL |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  | GUI  |  Alt |Lower |  Back|    Space    |  Alt |Raise | Left | Down |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_gk6_1x2u(
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
+  KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_BSPC,     KC_SPC,       KC_RALT, RAISE,   KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |   _  |   +  |   {  |   }  |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |   -  |   =  |   [  |   ]  |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |RGB_TG|RGB_M |RGB_HU|RGB_SI|RGB_VI|RGB_SP|      |      |      |   |  |   \  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Debug |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_gk6_1x2u(
+  _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
+  _______, _______,  _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+  _______, RGB_TOG,  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_PIPE, KC_BSLS,
+  DEBUG,   _______,  _______, _______, _______,     _______,      _______, _______, _______, _______, _______
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  | F7   |  F8  |  F9  |  F10 |  F11 |  F12 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | CAPS | PSCR |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      | Home | End  | Ins  | Play |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  <<  |  >>  | Mute | Vol- | Vol+ |      |      |      |      | PgUp |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |             |      |      |      | PgDn |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_gk6_1x2u(
+  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_CAPS, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_HOME, KC_END,  KC_INS,  KC_MPLY, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, KC_PGUP, _______,
+  _______, _______, _______, _______, _______,     _______,      _______, _______, _______, KC_PGDN, _______
+),
+
+};
+
+#ifdef RGB_MATRIX_ENABLE
+void rgb_matrix_indicators_user(void)
+{
+    rgb_matrix_set_color(25, 0, 0, 0);
+    rgb_matrix_set_color(30, 0, 0, 0);
+    rgb_matrix_set_color(35, 0, 0, 0);
+    rgb_matrix_set_color(42, 0, 0, 0);
+}
+
+void keyboard_pre_init_user(void) {
+    //   5, 9, 14, 19, 24, 30, 36, 40, 46, 51, 55,  60
+    g_led_config.matrix_co[4][0] = 5;
+    g_led_config.matrix_co[4][1] = 9;
+    g_led_config.matrix_co[4][2] = 14;
+    g_led_config.matrix_co[4][3] = 19;
+    g_led_config.matrix_co[4][4] = 24;
+    g_led_config.matrix_co[4][5] = 30;
+    g_led_config.matrix_co[4][6] = 36;
+    g_led_config.matrix_co[4][7] = 41;
+    g_led_config.matrix_co[4][8] = 47;
+    g_led_config.matrix_co[4][9] = 52;
+    g_led_config.matrix_co[4][10] = 57;
+    g_led_config.matrix_co[4][11] = 62;
+}
+#endif
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c
new file mode 100755
index 0000000000..ad357648ac
--- /dev/null
+++ b/keyboards/gizmo_engineering/gk6/keymaps/default/keymap.c
@@ -0,0 +1,104 @@
+/* Copyright 2021 Gizmo Engineering
+ *
+ * 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 layers {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  /   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | CTRL |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  | GUI  |  Alt |Lower |  Backspace  |    Space    |Raise | Left | Down |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_gk6_2x2u(
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
+  KC_LCTL, KC_LGUI, KC_LALT, LOWER,      KC_BSPC,           KC_SPC,       RAISE,   KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |   _  |   +  |   {  |   }  |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |   -  |   =  |   [  |   ]  |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |RGB_TG|RGB_M |RGB_HU|RGB_SI|RGB_VI|RGB_SP|      |      |      |   |  |   \  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Debug |      |      |      |             |             |      |      |      |R Alt |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_gk6_2x2u(
+  _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
+  _______, _______,  _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+  _______, RGB_TOG,  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_PIPE, KC_BSLS,
+  DEBUG,   _______,  _______, _______,    _______,          _______,       _______, _______, _______, KC_RALT
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  | F7   |  F8  |  F9  |  F10 |  F11 |  F12 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | CAPS | PSCR |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      | Home | End  | Ins  | Play |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  <<  |  >>  | Mute | Vol- | Vol+ |      |      |      |      | PgUp |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |             |             |      |      | PgDn |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_gk6_2x2u(
+  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_CAPS, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_HOME, KC_END,  KC_INS,  KC_MPLY, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, KC_PGUP, _______,
+  _______, _______, _______, _______,     _______,          _______,      _______, _______, KC_PGDN, _______
+),
+
+};
+
+#ifdef RGB_MATRIX_ENABLE
+void rgb_matrix_indicators_user(void)
+{
+    rgb_matrix_set_color(24, 0, 0, 0);
+    rgb_matrix_set_color(30, 0, 0, 0);
+    rgb_matrix_set_color(35, 0, 0, 0);
+    rgb_matrix_set_color(36, 0, 0, 0);
+    rgb_matrix_set_color(41, 0, 0, 0);
+}
+#endif
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/via/keymap.c b/keyboards/gizmo_engineering/gk6/keymaps/via/keymap.c
new file mode 100755
index 0000000000..e3ee7f9818
--- /dev/null
+++ b/keyboards/gizmo_engineering/gk6/keymaps/via/keymap.c
@@ -0,0 +1,93 @@
+/* Copyright 2021 Gizmo Engineering
+ *
+ * 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 layers {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |  /   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | CTRL |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  | GUI  |  Alt |Lower | Back | Back |Space |Space |Raise | Left | Down |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_ortho_5x12(
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,
+  KC_LCTL, KC_LGUI, KC_LALT, LOWER,   KC_BSPC, KC_BSPC, KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |   _  |   +  |   {  |   }  |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |   -  |   =  |   [  |   ]  |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |RGB_TG|RGB_M |RGB_HU|RGB_SI|RGB_VI|RGB_SP|      |      |      |   |  |   \  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |R Alt |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_ortho_5x12(
+  _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______,  _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
+  _______, _______,  _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+  _______, RGB_TOG,  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_PIPE, KC_BSLS,
+  _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RALT
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  | F7   |  F8  |  F9  |  F10 |  F11 |  F12 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | CAPS | PSCR |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      | Home | End  | Ins  | Play |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  <<  |  >>  | Mute | Vol- | Vol+ |      |      |      |      | PgUp |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      | PgDn |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_ortho_5x12(
+  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_CAPS, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_HOME, KC_END,  KC_INS,  KC_MPLY, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_MPRV, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, KC_PGUP, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______
+),
+
+};
diff --git a/keyboards/gizmo_engineering/gk6/keymaps/via/rules.mk b/keyboards/gizmo_engineering/gk6/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/gizmo_engineering/gk6/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/gizmo_engineering/gk6/readme.md b/keyboards/gizmo_engineering/gk6/readme.md
new file mode 100755
index 0000000000..2d4fd2ed6e
--- /dev/null
+++ b/keyboards/gizmo_engineering/gk6/readme.md
@@ -0,0 +1,13 @@
+# Gizmo Engineering GK6
+
+![GK6](https://i.imgur.com/M9xxMznh.jpg)
+
+* Keyboard Maintainer: [federicoweber](https://github.com/federicoweber)
+* Hardware Supported: atmega32a, Gizmo Engineering GK6
+* Hardware Availability: [Gizmo Engineering](https://gizmo.engineering/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make gizmo_engineering/gk6: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).
diff --git a/keyboards/gizmo_engineering/gk6/rules.mk b/keyboards/gizmo_engineering/gk6/rules.mk
new file mode 100755
index 0000000000..c70d2ea88d
--- /dev/null
+++ b/keyboards/gizmo_engineering/gk6/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3731

From 18490537a5a2c050ecfa1ee2209229eba6b8b342 Mon Sep 17 00:00:00 2001
From: xiao <307671+xia0@users.noreply.github.com>
Date: Mon, 21 Feb 2022 19:40:11 +1100
Subject: [PATCH 658/867] [Keyboard] Add Snatchpad keyboard (#16330)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: xia0 <xiao@morgan.net.au>
---
 keyboards/handwired/snatchpad/config.h        | 145 ++++++++++++++++++
 keyboards/handwired/snatchpad/info.json       |  21 +++
 .../snatchpad/keymaps/default/keymap.c        |  23 +++
 .../snatchpad/keymaps/default/readme.md       |   1 +
 keyboards/handwired/snatchpad/readme.md       |  34 ++++
 keyboards/handwired/snatchpad/rules.mk        |  20 +++
 keyboards/handwired/snatchpad/snatchpad.c     |  66 ++++++++
 keyboards/handwired/snatchpad/snatchpad.h     |  24 +++
 8 files changed, 334 insertions(+)
 create mode 100644 keyboards/handwired/snatchpad/config.h
 create mode 100644 keyboards/handwired/snatchpad/info.json
 create mode 100644 keyboards/handwired/snatchpad/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/snatchpad/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/snatchpad/readme.md
 create mode 100644 keyboards/handwired/snatchpad/rules.mk
 create mode 100644 keyboards/handwired/snatchpad/snatchpad.c
 create mode 100644 keyboards/handwired/snatchpad/snatchpad.h

diff --git a/keyboards/handwired/snatchpad/config.h b/keyboards/handwired/snatchpad/config.h
new file mode 100644
index 0000000000..c0d337d5df
--- /dev/null
+++ b/keyboards/handwired/snatchpad/config.h
@@ -0,0 +1,145 @@
+// Copyright 2022 xia0 (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x6662
+#define PRODUCT_ID   0x7370
+#define DEVICE_VER   0x0001
+#define MANUFACTURER xia0
+#define PRODUCT      snatchpad
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 3
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboards
+ * 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 { F4, F5, F6 }
+#define MATRIX_COL_PINS { B1, B3, B2 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Rotary encoder options */
+#define ENCODER_RESOLUTIONS { 4, 4 }
+#define ENCODERS_PAD_A { D3, D0 }
+#define ENCODERS_PAD_B { D2, D1 }
+
+
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/snatchpad/info.json b/keyboards/handwired/snatchpad/info.json
new file mode 100644
index 0000000000..c1d193cfe5
--- /dev/null
+++ b/keyboards/handwired/snatchpad/info.json
@@ -0,0 +1,21 @@
+{
+    "keyboard_name": "snatchpad",
+    "url": "",
+    "maintainer": "xia0",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+
+                {"x": 0, "y": 1},
+                {"x": 2, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/snatchpad/keymaps/default/keymap.c b/keyboards/handwired/snatchpad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a473d4778b
--- /dev/null
+++ b/keyboards/handwired/snatchpad/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2022 xia0 (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_ESC , KC_SPC , MO(2)  ,
+    KC_MPRV, KC_MNXT, KC_ENT ,
+    KC_MUTE,          KC_MPLY
+  ),
+  [1] = LAYOUT(
+    KC_LOCK, KC_UP  , _______,
+    KC_LEFT, KC_DOWN, KC_RGHT,
+    KC_BTN1,          KC_BTN2
+  ),
+  [2] = LAYOUT(
+    _______, _______, _______,
+    _______, _______, _______,
+    TO(0)  ,          TO(1)
+  )
+};
+
diff --git a/keyboards/handwired/snatchpad/keymaps/default/readme.md b/keyboards/handwired/snatchpad/keymaps/default/readme.md
new file mode 100644
index 0000000000..11c0c781c4
--- /dev/null
+++ b/keyboards/handwired/snatchpad/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for snatchpad
diff --git a/keyboards/handwired/snatchpad/readme.md b/keyboards/handwired/snatchpad/readme.md
new file mode 100644
index 0000000000..98021cc6bd
--- /dev/null
+++ b/keyboards/handwired/snatchpad/readme.md
@@ -0,0 +1,34 @@
+# snatchpad
+
+![snatchpad etch-a-sketch macropad](https://i.imgur.com/aRIM8Nah.jpg)
+
+A 6-key macropad with 2 rotary encoders intended for use as a pointing device.
+
+In addition to the 3d printed parts and microcontroller, the following hardware is required:
+* 4 * 3x3 mm threaded inserts
+* 4 * 4mm M3 bolt
+* USB daughter board
+
+---
+
+* Keyboard Maintainer: [xia0](https://github.com/xia0)
+* Hardware Supported: e.g. Arduino Pro Micro
+* Hardware Availability: [github](https://github.com/xia0/keeb_files/tree/main/snatchpad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/snatchpad:default
+
+Flashing example for this keyboard:
+
+    make handwired/snatchpad:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/snatchpad/rules.mk b/keyboards/handwired/snatchpad/rules.mk
new file mode 100644
index 0000000000..7c73773c0d
--- /dev/null
+++ b/keyboards/handwired/snatchpad/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+KEY_LOCK_ENABLE = yes
+ENCODER_ENABLE = yes
diff --git a/keyboards/handwired/snatchpad/snatchpad.c b/keyboards/handwired/snatchpad/snatchpad.c
new file mode 100644
index 0000000000..621ba11123
--- /dev/null
+++ b/keyboards/handwired/snatchpad/snatchpad.c
@@ -0,0 +1,66 @@
+// Copyright 2022 xia0 (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "snatchpad.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+
+    uint8_t layer = get_highest_layer(layer_state);
+
+    if (index == 0) { /* First encoder */
+        switch (layer) {
+            case 0:
+                if (clockwise) {
+                    tap_code_delay(KC_VOLU, 10);
+                } else {
+                    tap_code_delay(KC_VOLD, 10);
+                }
+                break;
+            case 2:
+                if (clockwise) {
+                    tap_code16(LCTL(KC_MINUS));
+                } else {
+                    tap_code16(LCTL(KC_EQUAL));
+                }
+                break;
+            default:
+                if (clockwise) {
+                    tap_code(KC_MS_L);
+                } else {
+                    tap_code(KC_MS_R);
+                }
+                break;
+        }
+
+    } else if (index == 1) { /* Second encoder */
+        switch (layer) {
+            case 0:
+                if (clockwise) {
+                    tap_code(KC_MFFD);
+                } else {
+                    tap_code(KC_MRWD);
+                }
+                break;
+            case 2:
+                if (clockwise) {
+                    tap_code16(LCTL(KC_Y));
+                } else {
+                    tap_code16(LCTL(KC_Z));
+                }
+                break;
+            default:
+                if (clockwise) {
+                    tap_code(KC_MS_D);
+                } else {
+                    tap_code(KC_MS_U);
+                }
+                break;
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/handwired/snatchpad/snatchpad.h b/keyboards/handwired/snatchpad/snatchpad.h
new file mode 100644
index 0000000000..07d6bd2093
--- /dev/null
+++ b/keyboards/handwired/snatchpad/snatchpad.h
@@ -0,0 +1,24 @@
+// Copyright 2022 xia0 (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    k00, k01, k02, \
+    k10, k11, k12, \
+    k20,      k22  \
+) { \
+    { k00    , k01    , k02 }, \
+    { k10    , k11    , k12 }, \
+    { k20    , KC_NO  , k22 }  \
+}

From 67b9a722c0d780e80a6d68c7a6981a68897db736 Mon Sep 17 00:00:00 2001
From: Brandon Claveria <48102030+swiftrax@users.noreply.github.com>
Date: Mon, 21 Feb 2022 00:55:05 -0800
Subject: [PATCH 659/867] [Keyboard] Add Ellora65 (#14754)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: swiftrax <swiftrax@github.com>
---
 keyboards/kikoslab/ellora65/config.h          |  55 ++++
 keyboards/kikoslab/ellora65/ellora65.c        |  17 ++
 keyboards/kikoslab/ellora65/ellora65.h        |  40 +++
 keyboards/kikoslab/ellora65/info.json         |  10 +
 .../ellora65/keymaps/default/keymap.c         | 240 +++++++++++++++++
 .../ellora65/keymaps/default/rules.mk         |   2 +
 .../kikoslab/ellora65/keymaps/via/keymap.c    | 249 ++++++++++++++++++
 .../kikoslab/ellora65/keymaps/via/rules.mk    |   3 +
 keyboards/kikoslab/ellora65/readme.md         |  21 ++
 keyboards/kikoslab/ellora65/rules.mk          |  19 ++
 10 files changed, 656 insertions(+)
 create mode 100644 keyboards/kikoslab/ellora65/config.h
 create mode 100644 keyboards/kikoslab/ellora65/ellora65.c
 create mode 100644 keyboards/kikoslab/ellora65/ellora65.h
 create mode 100644 keyboards/kikoslab/ellora65/info.json
 create mode 100644 keyboards/kikoslab/ellora65/keymaps/default/keymap.c
 create mode 100644 keyboards/kikoslab/ellora65/keymaps/default/rules.mk
 create mode 100644 keyboards/kikoslab/ellora65/keymaps/via/keymap.c
 create mode 100644 keyboards/kikoslab/ellora65/keymaps/via/rules.mk
 create mode 100644 keyboards/kikoslab/ellora65/readme.md
 create mode 100644 keyboards/kikoslab/ellora65/rules.mk

diff --git a/keyboards/kikoslab/ellora65/config.h b/keyboards/kikoslab/ellora65/config.h
new file mode 100644
index 0000000000..e3f7452f41
--- /dev/null
+++ b/keyboards/kikoslab/ellora65/config.h
@@ -0,0 +1,55 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xE88F
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Kikos Lab
+#define PRODUCT         Ellora65
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS { B7, B2, F1, F4, D6, D7, D5, D4, D3, D2 }
+#define MATRIX_COL_PINS { F5, F6, F7, C6, B6, B5, B4, B3 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define ENCODERS_PAD_A { B0 }
+#define ENCODERS_PAD_B { B1 }
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/*RGB TINGS*/
+#define RGB_DI_PIN E6
+#define RGBLED_NUM 12
+
+/* bootmagic row col assignment */
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kikoslab/ellora65/ellora65.c b/keyboards/kikoslab/ellora65/ellora65.c
new file mode 100644
index 0000000000..8ef707c2d8
--- /dev/null
+++ b/keyboards/kikoslab/ellora65/ellora65.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "ellora65.h"
diff --git a/keyboards/kikoslab/ellora65/ellora65.h b/keyboards/kikoslab/ellora65/ellora65.h
new file mode 100644
index 0000000000..2662f5a7a6
--- /dev/null
+++ b/keyboards/kikoslab/ellora65/ellora65.h
@@ -0,0 +1,40 @@
+/*
+Copyright 2021 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+    K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107,\
+    K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207      ,\
+    K400, K500, K401, K501, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507,\
+    K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K707,\
+    K800, K900, K801, K901,       K802,       K803,       K804,       K905, K806, K906, K807, K907 \
+){ \
+    {K000, K001, K002, K003, K004, K005, K006, K007},\
+    {K100, K101, K102, K103, K104, K105, K106, K107},\
+    {K200, K201, K202, K203, K204, K205, K206, K207},\
+    {K300, K301, K302, K303, K304, K305, K306,  XXX},\
+    {K400, K401, K402, K403, K404, K405, K406, K407},\
+    {K500, K501, K502, K503, K504, K505, K506, K507},\
+    {K600, K601, K602, K603, K604, K605, K606, K607},\
+    {K700, K701, K702, K703, K704, K705, K706, K707},\
+    {K800, K801, K802, K803, K804,  XXX, K806, K807},\
+    {K900, K901,  XXX,  XXX,  XXX, K905, K906, K907} \
+}
diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json
new file mode 100644
index 0000000000..64c3f7eaa5
--- /dev/null
+++ b/keyboards/kikoslab/ellora65/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Ellora65", 
+    "url": "https://github.com/swiftrax", 
+    "maintainer": "swiftrax", 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"label":"0,0", "x":1.25, "y":0}, {"label":"1,0", "x":2.5, "y":0.25}, {"label":"0,1", "x":3.5, "y":0.25}, {"label":"1,1", "x":4.5, "y":0.25}, {"label":"0,2", "x":5.5, "y":0.25}, {"label":"1,2", "x":6.5, "y":0.25}, {"label":"0,3", "x":7.5, "y":0.25}, {"label":"1,3", "x":8.5, "y":0.25}, {"label":"0,4", "x":9.5, "y":0.25}, {"label":"1,4", "x":10.5, "y":0.25}, {"label":"0,5", "x":11.5, "y":0.25}, {"label":"1,5", "x":12.5, "y":0.25}, {"label":"0,6", "x":13.5, "y":0.25}, {"label":"1,6", "x":14.5, "y":0.25}, {"label":"0,7", "x":15.5, "y":0.25}, {"label":"1,7", "x":16.5, "y":0.25}, {"label":"2,0", "x":1.25, "y":1.25}, {"label":"3,0", "x":2.5, "y":1.25, "w":1.5}, {"label":"2,1", "x":4, "y":1.25}, {"label":"3,1", "x":5, "y":1.25}, {"label":"2,2", "x":6, "y":1.25}, {"label":"3,2", "x":7, "y":1.25}, {"label":"2,3", "x":8, "y":1.25}, {"label":"3,3", "x":9, "y":1.25}, {"label":"2,4", "x":10, "y":1.25}, {"label":"3,4", "x":11, "y":1.25}, {"label":"2,5", "x":12, "y":1.25}, {"label":"3,5", "x":13, "y":1.25}, {"label":"2,6", "x":14, "y":1.25}, {"label":"3,6", "x":15, "y":1.25}, {"label":"2,7", "x":16, "y":1.25, "w":1.5}, {"label":"4,0", "x":1.25, "y":2.25}, {"label":"5,0", "x":2.5, "y":2.25, "w":1.75}, {"label":"4,1", "x":4.25, "y":2.25}, {"label":"5,1", "x":5.25, "y":2.25}, {"label":"4,2", "x":6.25, "y":2.25}, {"label":"5,2", "x":7.25, "y":2.25}, {"label":"4,3", "x":8.25, "y":2.25}, {"label":"5,3", "x":9.25, "y":2.25}, {"label":"4,4", "x":10.25, "y":2.25}, {"label":"5,4", "x":11.25, "y":2.25}, {"label":"4,5", "x":12.25, "y":2.25}, {"label":"5,5", "x":13.25, "y":2.25}, {"label":"4,6", "x":14.25, "y":2.25}, {"label":"5,6", "x":15.25, "y":2.25}, {"label":"4,7", "x":16.25, "y":2.25, "w":1.25}, {"label":"5,7", "x":17.5, "y":2.25}, {"label":"6,0", "x":1.25, "y":3.25}, {"label":"7,0", "x":2.5, "y":3.25, "w":1.25}, {"label":"6,1", "x":3.75, "y":3.25}, {"label":"7,1", "x":4.75, "y":3.25}, {"label":"6,2", "x":5.75, "y":3.25}, {"label":"7,2", "x":6.75, "y":3.25}, {"label":"6,3", "x":7.75, "y":3.25}, {"label":"7,3", "x":8.75, "y":3.25}, {"label":"6,4", "x":9.75, "y":3.25}, {"label":"7,4", "x":10.75, "y":3.25}, {"label":"6,5", "x":11.75, "y":3.25}, {"label":"7,5", "x":12.75, "y":3.25}, {"label":"6,6", "x":13.75, "y":3.25}, {"label":"7,6", "x":14.75, "y":3.25, "w":1.75}, {"label":"6,7", "x":16.5, "y":3.25}, {"label":"7,7", "x":17.5, "y":3.25}, {"label":"8,0", "x":1.25, "y":4.25}, {"label":"9,0", "x":2.5, "y":4.25, "w":1.25}, {"label":"8,1", "x":3.75, "y":4.25, "w":1.25}, {"label":"9,1", "x":5, "y":4.25, "w":1.25}, {"label":"8,2", "x":6.25, "y":4.25, "w":2.75}, {"label":"8,3", "x":9, "y":4.25, "w":1.25}, {"label":"8,4", "x":10.25, "y":4.25, "w":2.25}, {"label":"9,5", "x":12.5, "y":4.25}, {"label":"8,6", "x":13.5, "y":4.25, "w":1.5}, {"label":"9,6", "x":15.5, "y":4.25}, {"label":"8,7", "x":16.5, "y":4.25}, {"label":"9,7", "x":17.5, "y":4.25}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kikoslab/ellora65/keymaps/default/keymap.c b/keyboards/kikoslab/ellora65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..bf18fe87de
--- /dev/null
+++ b/keyboards/kikoslab/ellora65/keymaps/default/keymap.c
@@ -0,0 +1,240 @@
+/*
+Copyright 2021 Kiko <kikosdesignlab@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+enum _layer {
+   _MA,
+   _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [_MA] = LAYOUT_all(
+    KC_MUTE,   KC_ESC ,   KC_1   ,   KC_2   ,   KC_3   ,   KC_4   ,   KC_5   ,   KC_6   ,   KC_7   ,   KC_8   ,   KC_9   ,   KC_0   ,   KC_MINS,   KC_EQL ,   KC_BSPC,   KC_BSPC,
+    KC_F13 ,   KC_TAB ,   KC_Q   ,   KC_W   ,   KC_E   ,   KC_R   ,   KC_T   ,   KC_Y   ,   KC_U   ,   KC_I   ,   KC_O   ,   KC_P   ,   KC_LBRC,   KC_RBRC,   KC_BSLS,
+    KC_F14 ,   KC_CAPS,   KC_A   ,   KC_S   ,   KC_D   ,   KC_F   ,   KC_G   ,   KC_H   ,   KC_J   ,   KC_K   ,   KC_L   ,   KC_SCLN,   KC_QUOT,   KC_ENT ,   KC_ENT ,   KC_INS, 
+    KC_F15 ,   KC_LSFT,   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_DEL, 
+    KC_F16 ,   KC_LCTL,   KC_LGUI,   KC_LALT,            MO(_FN)  ,              KC_SPC ,            MO(_FN)  ,              MO(_FN),   MO(_FN),   KC_LEFT,   KC_DOWN,   KC_RGHT),
+
+ [_FN] = LAYOUT_all(
+    KC_DEL ,   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_BSPC,   KC_TRNS,
+    KC_F17 ,   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_F18 ,   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_F19 ,   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_F20 ,   KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,              RESET  ,              KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS)
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+
+    return false;
+}
+
+#ifdef OLED_ENABLE
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_90;
+}
+
+/* KEYBOARD PET START */
+
+/* settings */
+#define MIN_WALK_SPEED      10
+#define MIN_RUN_SPEED       40
+
+/* advanced settings */
+#define ANIM_FRAME_DURATION 200  // how long each frame lasts in ms
+#define ANIM_SIZE           96   // number of bytes in array. If you change sprites, minimize for adequate firmware size. max is 1024
+
+/* timers */
+uint32_t anim_timer = 0;
+uint32_t anim_sleep = 0;
+
+/* current frame */
+uint8_t current_frame = 0;
+
+/* status variables */
+int   current_wpm = 0;
+led_t led_usb_state;
+
+bool isSneaking = false;
+bool isJumping  = false;
+bool showedJump = true;
+
+/* logic */
+static void render_luna(int LUNA_X, int LUNA_Y) {
+    /* Sit */
+    static const char PROGMEM sit[2][ANIM_SIZE] = {/* 'sit1', 32x22px */
+                                                   {
+                                                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x68, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28, 0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                   },
+
+                                                   /* 'sit2', 32x22px */
+                                                   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x90, 0x08, 0x18, 0x60, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28, 0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
+
+    /* Walk */
+    static const char PROGMEM walk[2][ANIM_SIZE] = {/* 'walk1', 32x22px */
+                                                    {
+                                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x90, 0x90, 0x90, 0xa0, 0xc0, 0x80, 0x80, 0x80, 0x70, 0x08, 0x14, 0x08, 0x90, 0x10, 0x10, 0x08, 0xa4, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, 0xea, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x03, 0x06, 0x18, 0x20, 0x20, 0x3c, 0x0c, 0x12, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    },
+
+                                                    /* 'walk2', 32x22px */
+                                                    {
+                                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x20, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x28, 0x10, 0x20, 0x20, 0x20, 0x10, 0x48, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x20, 0xf8, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x30, 0xd5, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x02, 0x1c, 0x14, 0x08, 0x10, 0x20, 0x2c, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    }};
+
+    /* Run */
+    static const char PROGMEM run[2][ANIM_SIZE] = {/* 'run1', 32x22px */
+                                                   {
+                                                       0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x08, 0xc8, 0xb0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0xc4, 0xa4, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x58, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x09, 0x04, 0x04, 0x04, 0x04, 0x02, 0x03, 0x02, 0x01, 0x01, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                   },
+
+                                                   /* 'run2', 32x22px */
+                                                   {
+                                                       0x00, 0x00, 0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x78, 0x28, 0x08, 0x10, 0x20, 0x30, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xb0, 0x50, 0x55, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x1e, 0x20, 0x20, 0x18, 0x0c, 0x14, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                   }};
+
+    /* Bark */
+    static const char PROGMEM bark[2][ANIM_SIZE] = {/* 'bark1', 32x22px */
+                                                    {
+                                                        0x00, 0xc0, 0x20, 0x10, 0xd0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x48, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    },
+
+                                                    /* 'bark2', 32x22px */
+                                                    {
+                                                        0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x2c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x48, 0x28, 0x2a, 0x10, 0x0f, 0x20, 0x4a, 0x09, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    }};
+
+    /* Sneak */
+    static const char PROGMEM sneak[2][ANIM_SIZE] = {/* 'sneak1', 32x22px */
+                                                     {
+                                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x40, 0x80, 0x00, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x21, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x04, 0x04, 0x04, 0x03, 0x01, 0x00, 0x00, 0x09, 0x01, 0x80, 0x80, 0xab, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x02, 0x06, 0x18, 0x20, 0x20, 0x38, 0x08, 0x10, 0x18, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
+                                                     },
+
+                                                     /* 'sneak2', 32x22px */
+                                                     {
+                                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xa0, 0x20, 0x40, 0x80, 0xc0, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x41, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x40, 0x40, 0x55, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x04, 0x18, 0x10, 0x08, 0x10, 0x20, 0x28, 0x34, 0x06, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                     }};
+
+    /* animation */
+    void animate_luna(void) {
+        /* jump */
+        if (isJumping || !showedJump) {
+            /* clear */
+            oled_set_cursor(LUNA_X, LUNA_Y + 2);
+            oled_write("     ", false);
+
+            oled_set_cursor(LUNA_X, LUNA_Y - 1);
+
+            showedJump = true;
+        } else {
+            /* clear */
+            oled_set_cursor(LUNA_X, LUNA_Y - 1);
+            oled_write("     ", false);
+
+            oled_set_cursor(LUNA_X, LUNA_Y);
+        }
+
+        /* switch frame */
+        current_frame = (current_frame + 1) % 2;
+
+        /* current status */
+        if (led_usb_state.caps_lock) {
+            oled_write_raw_P(bark[abs(1 - current_frame)], ANIM_SIZE);
+
+        } else if (isSneaking) {
+            oled_write_raw_P(sneak[abs(1 - current_frame)], ANIM_SIZE);
+
+        } else if (current_wpm <= MIN_WALK_SPEED) {
+            oled_write_raw_P(sit[abs(1 - current_frame)], ANIM_SIZE);
+
+        } else if (current_wpm <= MIN_RUN_SPEED) {
+            oled_write_raw_P(walk[abs(1 - current_frame)], ANIM_SIZE);
+
+        } else {
+            oled_write_raw_P(run[abs(1 - current_frame)], ANIM_SIZE);
+        }
+    }
+
+    /* animation timer */
+    if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+        anim_timer = timer_read32();
+        animate_luna();
+    }
+
+    /* this fixes the screen on and off bug */
+    if (current_wpm > 0) {
+        oled_on();
+        anim_sleep = timer_read32();
+    } else if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
+        oled_off();
+    }
+}
+
+
+/* KEYBOARD PET END */
+
+static void print_status_narrow(void) {
+    render_luna(0, 13);
+}
+
+
+void oled_task_user(void) {
+    /* KEYBOARD PET VARIABLES START */
+
+    current_wpm   = get_current_wpm();
+    led_usb_state = host_keyboard_led_state();
+
+    /* KEYBOARD PET VARIABLES END */
+
+    print_status_narrow();
+    
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+             
+    /* KEYBOARD PET STATUS START */
+
+        case KC_LCTL:
+        case KC_RCTL:
+            if (record->event.pressed) {
+                isSneaking = true;
+            } else {
+                isSneaking = false;
+            }
+            break;
+        case KC_SPC:
+            if (record->event.pressed) {
+                isJumping  = true;
+                showedJump = false;
+            } else {
+                isJumping = false;
+            }
+            break;
+
+            /* KEYBOARD PET STATUS END */
+    }
+    return true;
+   
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/kikoslab/ellora65/keymaps/default/rules.mk b/keyboards/kikoslab/ellora65/keymaps/default/rules.mk
new file mode 100644
index 0000000000..bbe99c4238
--- /dev/null
+++ b/keyboards/kikoslab/ellora65/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+OLED_ENABLE = yes
+WPM_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kikoslab/ellora65/keymaps/via/keymap.c b/keyboards/kikoslab/ellora65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..707abaf6ba
--- /dev/null
+++ b/keyboards/kikoslab/ellora65/keymaps/via/keymap.c
@@ -0,0 +1,249 @@
+/*
+Copyright 2021 Kiko <kikosdesignlab@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_all(
+    KC_MUTE,   KC_ESC ,   KC_1   ,   KC_2   ,   KC_3   ,   KC_4   ,   KC_5   ,   KC_6   ,   KC_7   ,   KC_8   ,   KC_9   ,   KC_0   ,   KC_MINS,   KC_EQL ,   KC_BSPC,   KC_BSPC,
+    KC_F13 ,   KC_TAB ,   KC_Q   ,   KC_W   ,   KC_E   ,   KC_R   ,   KC_T   ,   KC_Y   ,   KC_U   ,   KC_I   ,   KC_O   ,   KC_P   ,   KC_LBRC,   KC_RBRC,   KC_BSLS,
+    KC_F14 ,   KC_CAPS,   KC_A   ,   KC_S   ,   KC_D   ,   KC_F   ,   KC_G   ,   KC_H   ,   KC_J   ,   KC_K   ,   KC_L   ,   KC_SCLN,   KC_QUOT,   KC_ENT ,   KC_ENT ,   KC_INS, 
+    KC_F15 ,   KC_LSFT,   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_DEL, 
+    KC_F16 ,   KC_LCTL,   KC_LGUI,   KC_LALT,              MO(1)  ,              KC_SPC ,              MO(1)  ,              MO(1)  ,   MO(1)  ,   KC_LEFT,   KC_DOWN,   KC_RGHT),
+
+ [1] = LAYOUT_all(
+    KC_DEL ,   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_BSPC,   KC_TRNS,
+    KC_F17 ,   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_F18 ,   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_F19 ,   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_F20 ,   KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,              RESET  ,              KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS),
+
+ [2] = LAYOUT_all(
+    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_BSPC,   KC_TRNS,
+    KC_F17 ,   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_F18 ,   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_F19 ,   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_F20 ,   KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,              KC_TRNS,              KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS),
+
+ [3] = LAYOUT_all(
+    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_BSPC,   KC_TRNS,
+    KC_F17 ,   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_F18 ,   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_F19 ,   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_F20 ,   KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,              KC_TRNS,              KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS)
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+
+    return false;
+}
+
+#ifdef OLED_ENABLE
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_90;
+}
+
+/* KEYBOARD PET START */
+
+/* settings */
+#define MIN_WALK_SPEED      10
+#define MIN_RUN_SPEED       40
+
+/* advanced settings */
+#define ANIM_FRAME_DURATION 200  // how long each frame lasts in ms
+#define ANIM_SIZE           96   // number of bytes in array. If you change sprites, minimize for adequate firmware size. max is 1024
+
+/* timers */
+uint32_t anim_timer = 0;
+uint32_t anim_sleep = 0;
+
+/* current frame */
+uint8_t current_frame = 0;
+
+/* status variables */
+int   current_wpm = 0;
+led_t led_usb_state;
+
+bool isSneaking = false;
+bool isJumping  = false;
+bool showedJump = true;
+
+/* logic */
+static void render_luna(int LUNA_X, int LUNA_Y) {
+    /* Sit */
+    static const char PROGMEM sit[2][ANIM_SIZE] = {/* 'sit1', 32x22px */
+                                                   {
+                                                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x68, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28, 0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                   },
+
+                                                   /* 'sit2', 32x22px */
+                                                   {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x1c, 0x02, 0x05, 0x02, 0x24, 0x04, 0x04, 0x02, 0xa9, 0x1e, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x90, 0x08, 0x18, 0x60, 0x10, 0x08, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x82, 0x7c, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x0c, 0x10, 0x10, 0x20, 0x20, 0x20, 0x28, 0x3e, 0x1c, 0x20, 0x20, 0x3e, 0x0f, 0x11, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
+
+    /* Walk */
+    static const char PROGMEM walk[2][ANIM_SIZE] = {/* 'walk1', 32x22px */
+                                                    {
+                                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x90, 0x90, 0x90, 0xa0, 0xc0, 0x80, 0x80, 0x80, 0x70, 0x08, 0x14, 0x08, 0x90, 0x10, 0x10, 0x08, 0xa4, 0x78, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0xfc, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, 0xea, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x03, 0x06, 0x18, 0x20, 0x20, 0x3c, 0x0c, 0x12, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    },
+
+                                                    /* 'walk2', 32x22px */
+                                                    {
+                                                        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x20, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x28, 0x10, 0x20, 0x20, 0x20, 0x10, 0x48, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x20, 0xf8, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x30, 0xd5, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x02, 0x1c, 0x14, 0x08, 0x10, 0x20, 0x2c, 0x32, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    }};
+
+    /* Run */
+    static const char PROGMEM run[2][ANIM_SIZE] = {/* 'run1', 32x22px */
+                                                   {
+                                                       0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x08, 0x08, 0xc8, 0xb0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0xc4, 0xa4, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x58, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x09, 0x04, 0x04, 0x04, 0x04, 0x02, 0x03, 0x02, 0x01, 0x01, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                   },
+
+                                                   /* 'run2', 32x22px */
+                                                   {
+                                                       0x00, 0x00, 0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x78, 0x28, 0x08, 0x10, 0x20, 0x30, 0x08, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0xb0, 0x50, 0x55, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x1e, 0x20, 0x20, 0x18, 0x0c, 0x14, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                   }};
+
+    /* Bark */
+    static const char PROGMEM bark[2][ANIM_SIZE] = {/* 'bark1', 32x22px */
+                                                    {
+                                                        0x00, 0xc0, 0x20, 0x10, 0xd0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x3c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0x48, 0x28, 0x2a, 0x10, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    },
+
+                                                    /* 'bark2', 32x22px */
+                                                    {
+                                                        0x00, 0xe0, 0x10, 0x10, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x2c, 0x14, 0x04, 0x08, 0x90, 0x18, 0x04, 0x08, 0xb0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x08, 0x10, 0x11, 0xf9, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x48, 0x28, 0x2a, 0x10, 0x0f, 0x20, 0x4a, 0x09, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x0c, 0x10, 0x20, 0x28, 0x37, 0x02, 0x02, 0x04, 0x08, 0x10, 0x26, 0x2b, 0x32, 0x04, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                    }};
+
+    /* Sneak */
+    static const char PROGMEM sneak[2][ANIM_SIZE] = {/* 'sneak1', 32x22px */
+                                                     {
+                                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x40, 0x80, 0x00, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x21, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x04, 0x04, 0x04, 0x03, 0x01, 0x00, 0x00, 0x09, 0x01, 0x80, 0x80, 0xab, 0x04, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1c, 0x20, 0x20, 0x3c, 0x0f, 0x11, 0x1f, 0x02, 0x06, 0x18, 0x20, 0x20, 0x38, 0x08, 0x10, 0x18, 0x04, 0x04, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00,
+                                                     },
+
+                                                     /* 'sneak2', 32x22px */
+                                                     {
+                                                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xa0, 0x20, 0x40, 0x80, 0xc0, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x41, 0xf0, 0x04, 0x02, 0x02, 0x02, 0x03, 0x02, 0x02, 0x02, 0x04, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x40, 0x40, 0x55, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x30, 0x0c, 0x02, 0x05, 0x09, 0x12, 0x1e, 0x04, 0x18, 0x10, 0x08, 0x10, 0x20, 0x28, 0x34, 0x06, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                     }};
+
+    /* animation */
+    void animate_luna(void) {
+        /* jump */
+        if (isJumping || !showedJump) {
+            /* clear */
+            oled_set_cursor(LUNA_X, LUNA_Y + 2);
+            oled_write("     ", false);
+
+            oled_set_cursor(LUNA_X, LUNA_Y - 1);
+
+            showedJump = true;
+        } else {
+            /* clear */
+            oled_set_cursor(LUNA_X, LUNA_Y - 1);
+            oled_write("     ", false);
+
+            oled_set_cursor(LUNA_X, LUNA_Y);
+        }
+
+        /* switch frame */
+        current_frame = (current_frame + 1) % 2;
+
+        /* current status */
+        if (led_usb_state.caps_lock) {
+            oled_write_raw_P(bark[abs(1 - current_frame)], ANIM_SIZE);
+
+        } else if (isSneaking) {
+            oled_write_raw_P(sneak[abs(1 - current_frame)], ANIM_SIZE);
+
+        } else if (current_wpm <= MIN_WALK_SPEED) {
+            oled_write_raw_P(sit[abs(1 - current_frame)], ANIM_SIZE);
+
+        } else if (current_wpm <= MIN_RUN_SPEED) {
+            oled_write_raw_P(walk[abs(1 - current_frame)], ANIM_SIZE);
+
+        } else {
+            oled_write_raw_P(run[abs(1 - current_frame)], ANIM_SIZE);
+        }
+    }
+
+    /* animation timer */
+    if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+        anim_timer = timer_read32();
+        animate_luna();
+    }
+
+    /* this fixes the screen on and off bug */
+    if (current_wpm > 0) {
+        oled_on();
+        anim_sleep = timer_read32();
+    } else if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
+        oled_off();
+    }
+}
+
+
+/* KEYBOARD PET END */
+
+static void print_status_narrow(void) {
+    render_luna(0, 13);
+}
+
+
+void oled_task_user(void) {
+    /* KEYBOARD PET VARIABLES START */
+
+    current_wpm   = get_current_wpm();
+    led_usb_state = host_keyboard_led_state();
+
+    /* KEYBOARD PET VARIABLES END */
+
+    print_status_narrow();
+    
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+             
+    /* KEYBOARD PET STATUS START */
+
+        case KC_LCTL:
+        case KC_RCTL:
+            if (record->event.pressed) {
+                isSneaking = true;
+            } else {
+                isSneaking = false;
+            }
+            break;
+        case KC_SPC:
+            if (record->event.pressed) {
+                isJumping  = true;
+                showedJump = false;
+            } else {
+                isJumping = false;
+            }
+            break;
+
+            /* KEYBOARD PET STATUS END */
+    }
+    return true;
+   
+}
+
+#endif
\ No newline at end of file
diff --git a/keyboards/kikoslab/ellora65/keymaps/via/rules.mk b/keyboards/kikoslab/ellora65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..fe4a69869e
--- /dev/null
+++ b/keyboards/kikoslab/ellora65/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+OLED_ENABLE = yes
+WPM_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kikoslab/ellora65/readme.md b/keyboards/kikoslab/ellora65/readme.md
new file mode 100644
index 0000000000..419c5418ec
--- /dev/null
+++ b/keyboards/kikoslab/ellora65/readme.md
@@ -0,0 +1,21 @@
+# Ellora65
+
+65% With Macro Column, Encoder, and OLED
+
+* Keyboard Maintainer: Kiko
+* Hardware Supported: KL-65 PCB
+* Hardware Availability: https://www.kikoslab.com
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (1,0) in the matrix (escape key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kikoslab/ellora65: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).
diff --git a/keyboards/kikoslab/ellora65/rules.mk b/keyboards/kikoslab/ellora65/rules.mk
new file mode 100644
index 0000000000..7fe30a833f
--- /dev/null
+++ b/keyboards/kikoslab/ellora65/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
\ No newline at end of file

From f252287b0ec08f1b977cb7bfa4279db4499e8a88 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Mon, 21 Feb 2022 00:55:23 -0800
Subject: [PATCH 660/867] Format code according to conventions (#16412)

---
 keyboards/monoflex60/keymaps/via/rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/monoflex60/keymaps/via/rules.mk b/keyboards/monoflex60/keymaps/via/rules.mk
index 69de2e4c5a..1e5b99807c 100644
--- a/keyboards/monoflex60/keymaps/via/rules.mk
+++ b/keyboards/monoflex60/keymaps/via/rules.mk
@@ -1 +1 @@
-VIA_ENABLE = yes
+VIA_ENABLE = yes

From ae5f43072f0de93b65854af569ba90564b8003de Mon Sep 17 00:00:00 2001
From: jackytrabbit <jacky_lijun@126.com>
Date: Mon, 21 Feb 2022 17:03:18 +0800
Subject: [PATCH 661/867] Update the support for lazydesigners/dimple (#14797)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/lazydesigners/dimple/config.h       |   1 +
 .../lazydesigners/dimple/ortho/info.json      | 150 ++++++++++++++++
 .../dimple/ortho/keymaps/default/keymap.c     |  53 ++++++
 .../dimple/ortho/keymaps/via/keymap.c         |  59 +++++++
 .../dimple/{ => ortho}/keymaps/via/rules.mk   |   0
 keyboards/lazydesigners/dimple/ortho/ortho.c  |  15 ++
 keyboards/lazydesigners/dimple/ortho/ortho.h  |  91 ++++++++++
 keyboards/lazydesigners/dimple/ortho/rules.mk |   3 +
 keyboards/lazydesigners/dimple/readme.md      |  17 +-
 keyboards/lazydesigners/dimple/rules.mk       |  14 +-
 .../dimple/{ => staggered}/info.json          |   0
 .../{ => staggered}/keymaps/default/keymap.c  |  10 +-
 .../{ => staggered}/keymaps/default/readme.md |   0
 .../dimple/staggered/keymaps/erovia/config.h  |  19 ++
 .../dimple/staggered/keymaps/erovia/keymap.c  | 162 ++++++++++++++++++
 .../dimple/staggered/keymaps/erovia/readme.md |  60 +++++++
 .../keymaps/oncesavedgaming/keymap.c          |  23 +++
 .../keymaps/tominabox1/keymap.c               |   0
 .../{ => staggered}/keymaps/via/keymap.c      |   0
 .../dimple/staggered/keymaps/via/rules.mk     |   2 +
 .../dimple/staggered/rev1/config.h            |  20 +++
 .../dimple/staggered/rev1/rules.mk            |   4 +
 .../dimple/staggered/rev2/rules.mk            |   4 +
 .../dimple/staggered/rev3/config.h            |  22 +++
 .../dimple/staggered/rev3/info.json           | 144 ++++++++++++++++
 .../staggered/rev3/keymaps/default/keymap.c   |  54 ++++++
 .../dimple/staggered/rev3/rev3.c              |  16 ++
 .../dimple/staggered/rev3/rev3.h              |  90 ++++++++++
 .../dimple/staggered/rev3/rules.mk            |   4 +
 .../{dimple.c => staggered/staggered.c}       |  19 +-
 .../{dimple.h => staggered/staggered.h}       |   1 -
 31 files changed, 1026 insertions(+), 31 deletions(-)
 create mode 100644 keyboards/lazydesigners/dimple/ortho/info.json
 create mode 100644 keyboards/lazydesigners/dimple/ortho/keymaps/default/keymap.c
 create mode 100644 keyboards/lazydesigners/dimple/ortho/keymaps/via/keymap.c
 rename keyboards/lazydesigners/dimple/{ => ortho}/keymaps/via/rules.mk (100%)
 create mode 100644 keyboards/lazydesigners/dimple/ortho/ortho.c
 create mode 100644 keyboards/lazydesigners/dimple/ortho/ortho.h
 create mode 100644 keyboards/lazydesigners/dimple/ortho/rules.mk
 rename keyboards/lazydesigners/dimple/{ => staggered}/info.json (100%)
 rename keyboards/lazydesigners/dimple/{ => staggered}/keymaps/default/keymap.c (97%)
 rename keyboards/lazydesigners/dimple/{ => staggered}/keymaps/default/readme.md (100%)
 create mode 100644 keyboards/lazydesigners/dimple/staggered/keymaps/erovia/config.h
 create mode 100644 keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
 create mode 100644 keyboards/lazydesigners/dimple/staggered/keymaps/erovia/readme.md
 create mode 100644 keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c
 rename keyboards/lazydesigners/dimple/{ => staggered}/keymaps/tominabox1/keymap.c (100%)
 rename keyboards/lazydesigners/dimple/{ => staggered}/keymaps/via/keymap.c (100%)
 create mode 100644 keyboards/lazydesigners/dimple/staggered/keymaps/via/rules.mk
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev1/config.h
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev1/rules.mk
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev2/rules.mk
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev3/config.h
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev3/info.json
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev3/keymaps/default/keymap.c
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev3/rev3.c
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev3/rev3.h
 create mode 100644 keyboards/lazydesigners/dimple/staggered/rev3/rules.mk
 rename keyboards/lazydesigners/dimple/{dimple.c => staggered/staggered.c} (77%)
 rename keyboards/lazydesigners/dimple/{dimple.h => staggered/staggered.h} (99%)

diff --git a/keyboards/lazydesigners/dimple/config.h b/keyboards/lazydesigners/dimple/config.h
index d5bab811ee..7ed6da4064 100644
--- a/keyboards/lazydesigners/dimple/config.h
+++ b/keyboards/lazydesigners/dimple/config.h
@@ -57,3 +57,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	/* #define RGBLIGHT_SAT_STEP 8 */
 	/* #define RGBLIGHT_VAL_STEP 8 */
 #endif
+
diff --git a/keyboards/lazydesigners/dimple/ortho/info.json b/keyboards/lazydesigners/dimple/ortho/info.json
new file mode 100644
index 0000000000..dbe70f821f
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/info.json
@@ -0,0 +1,150 @@
+{
+    "keyboard_name": "Dimple", 
+    "url": "http://lazydesigners.cn", 
+    "maintainer": "Jacky@LAZYDESIGNERS", 
+    "layouts": {
+        "LAYOUT_ortho_2u": {
+            "layout": [
+              {"label":"Esc", "x":0, "y":0, "w":1.25},
+              {"label":"Q", "x":1.25, "y":0},
+              {"label":"W", "x":2.25, "y":0},
+              {"label":"E", "x":3.25, "y":0},
+              {"label":"R", "x":4.25, "y":0},
+              {"label":"T", "x":5.25, "y":0},
+              {"label":"Y", "x":6.25, "y":0},
+              {"label":"U", "x":7.25, "y":0},
+              {"label":"I", "x":8.25, "y":0},
+              {"label":"O", "x":9.25, "y":0},
+              {"label":"P", "x":10.25, "y":0},
+              {"label":"BackSpace", "x":11.25, "y":0, "w":1.25},
+              {"label":"Tab", "x":0, "y":1, "w":1.25},
+              {"label":"A", "x":1.25, "y":1},
+              {"label":"S", "x":2.25, "y":1},
+              {"label":"D", "x":3.25, "y":1},
+              {"label":"F", "x":4.25, "y":1},
+              {"label":"G", "x":5.25, "y":1},
+              {"label":"H", "x":6.25, "y":1},
+              {"label":"J", "x":7.25, "y":1},
+              {"label":"K", "x":8.25, "y":1},
+              {"label":"L", "x":9.25, "y":1},
+              {"label":"'", "x":10.25, "y":1},
+              {"label":"Enter", "x":11.25, "y":1, "w":1.25},
+              {"label":"Shift", "x":0, "y":2, "w":1.25},
+              {"label":"Z", "x":1.25, "y":2},
+              {"label":"X", "x":2.25, "y":2},
+              {"label":"C", "x":3.25, "y":2},
+              {"label":"V", "x":4.25, "y":2},
+              {"label":"B", "x":5.25, "y":2},
+              {"label":"N", "x":6.25, "y":2},
+              {"label":"M", "x":7.25, "y":2},
+              {"label":",", "x":8.25, "y":2},
+              {"label":".", "x":9.25, "y":2},
+              {"label":"Up", "x":10.25, "y":2},
+              {"label":"FN", "x":11.25, "y":2, "w":1.25},
+              {"label":"Ctrl", "x":0.75, "y":3},
+              {"label":"Gui", "x":1.75, "y":3},
+              {"label":"Alt", "x":2.75, "y":3},
+              {"label":"Space", "x":3.75, "y":3, "w":2},
+              {"label":"FN", "x":5.75, "y":3},
+              {"label":"Space", "x":6.75, "y":3, "w":2},
+              {"label":"Left", "x":8.75, "y":3},
+              {"label":"Down", "x":9.75, "y":3},
+              {"label":"Right", "x":10.75, "y":3}
+           ]
+        },
+        "LAYOUT_ortho_3u": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0, "w":1.25},
+                {"label":"Q", "x":1.25, "y":0},
+                {"label":"W", "x":2.25, "y":0},
+                {"label":"E", "x":3.25, "y":0},
+                {"label":"R", "x":4.25, "y":0},
+                {"label":"T", "x":5.25, "y":0},
+                {"label":"Y", "x":6.25, "y":0},
+                {"label":"U", "x":7.25, "y":0},
+                {"label":"I", "x":8.25, "y":0},
+                {"label":"O", "x":9.25, "y":0},
+                {"label":"P", "x":10.25, "y":0},
+                {"label":"BackSpace", "x":11.25, "y":0, "w":1.25},
+                {"label":"Tab", "x":0, "y":1, "w":1.25},
+                {"label":"A", "x":1.25, "y":1},
+                {"label":"S", "x":2.25, "y":1},
+                {"label":"D", "x":3.25, "y":1},
+                {"label":"F", "x":4.25, "y":1},
+                {"label":"G", "x":5.25, "y":1},
+                {"label":"H", "x":6.25, "y":1},
+                {"label":"J", "x":7.25, "y":1},
+                {"label":"K", "x":8.25, "y":1},
+                {"label":"L", "x":9.25, "y":1},
+                {"label":"'", "x":10.25, "y":1},
+                {"label":"Enter", "x":11.25, "y":1, "w":1.25},
+                {"label":"Shift", "x":0, "y":2, "w":1.25},
+                {"label":"Z", "x":1.25, "y":2},
+                {"label":"X", "x":2.25, "y":2},
+                {"label":"C", "x":3.25, "y":2},
+                {"label":"V", "x":4.25, "y":2},
+                {"label":"B", "x":5.25, "y":2},
+                {"label":"N", "x":6.25, "y":2},
+                {"label":"M", "x":7.25, "y":2},
+                {"label":",", "x":8.25, "y":2},
+                {"label":".", "x":9.25, "y":2},
+                {"label":"Up", "x":10.25, "y":2},
+                {"label":"FN", "x":11.25, "y":2, "w":1.25},
+                {"label":"Ctrl", "x":0.75, "y":3},
+                {"label":"Gui", "x":1.75, "y":3},
+                {"label":"Alt", "x":2.75, "y":3},
+                {"label":"Raise", "x":3.75, "y":3},
+                {"label":"FN", "x":4.75, "y":3,"w":3},
+                {"label":"Lower", "x":7.75, "y":3},
+                {"label":"Left", "x":8.75, "y":3},
+                {"label":"Down", "x":9.75, "y":3},
+                {"label":"Right", "x":10.75, "y":3}
+           ]
+        },
+        "LAYOUT_ortho_7u": {
+            "layout": [
+                    {"label":"Esc", "x":0, "y":0, "w":1.25},
+                    {"label":"Q", "x":1.25, "y":0},
+                    {"label":"W", "x":2.25, "y":0},
+                    {"label":"E", "x":3.25, "y":0},
+                    {"label":"R", "x":4.25, "y":0},
+                    {"label":"T", "x":5.25, "y":0},
+                    {"label":"Y", "x":6.25, "y":0},
+                    {"label":"U", "x":7.25, "y":0},
+                    {"label":"I", "x":8.25, "y":0},
+                    {"label":"O", "x":9.25, "y":0},
+                    {"label":"P", "x":10.25, "y":0},
+                    {"label":"Back<br>Space", "x":11.25, "y":0, "w":1.25},
+                    {"label":"Tab", "x":0, "y":1, "w":1.25},
+                    {"label":"A", "x":1.25, "y":1},
+                    {"label":"S", "x":2.25, "y":1},
+                    {"label":"D", "x":3.25, "y":1},
+                    {"label":"F", "x":4.25, "y":1},
+                    {"label":"G", "x":5.25, "y":1},
+                    {"label":"H", "x":6.25, "y":1},
+                    {"label":"J", "x":7.25, "y":1},
+                    {"label":"K", "x":8.25, "y":1},
+                    {"label":"L", "x":9.25, "y":1},
+                    {"label":"'", "x":10.25, "y":1},
+                    {"label":"Enter", "x":11.25, "y":1, "w":1.25},
+                    {"label":"Shift", "x":0, "y":2, "w":1.25},
+                    {"label":"Z", "x":1.25, "y":2},
+                    {"label":"X", "x":2.25, "y":2},
+                    {"label":"C", "x":3.25, "y":2},
+                    {"label":"V", "x":4.25, "y":2},
+                    {"label":"B", "x":5.25, "y":2},
+                    {"label":"N", "x":6.25, "y":2},
+                    {"label":"M", "x":7.25, "y":2},
+                    {"label":",", "x":8.25, "y":2},
+                    {"label":".", "x":9.25, "y":2},
+                    {"label":"Up", "x":10.25, "y":2},
+                    {"label":"FN", "x":11.25, "y":2, "w":1.25},
+                    {"label":"Ctrl", "x":0.75, "y":3},
+                    {"label":"Gui", "x":1.75, "y":3},
+                    {"label":"Space", "x":2.75, "y":3, "w":7},
+                    {"label":"Down", "x":9.75, "y":3},
+                    {"label":"Right", "x":10.75, "y":3}
+           ]
+        }
+    }
+}
diff --git a/keyboards/lazydesigners/dimple/ortho/keymaps/default/keymap.c b/keyboards/lazydesigners/dimple/ortho/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6fd8f5875f
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2021 LAZYDESIGNERS
+ *
+ * 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
+
+#define LT2_TAB LT(2, KC_TAB)
+#define LT1_SPC LT(1, KC_SPC)
+
+/*
+ * ,------------------------------------------------------------------.
+ * |Esc    | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
+ * |------------------------------------------------------------------|
+ * |Tab/LT2| A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |  |Enter|
+ * |------------------------------------------------------------------|
+ * | Shift | Z  | X  | C  | V  | B  | N  | M  | ,  | .  | Up | MO(2)  |
+ * |------------------------------------------------------------------|
+ *      |Ctrl|Gui |Alt | Spc/LT1  | MO(2)|   Spc   |Left|Down|Rght|
+ *      `---------------------------------------------------------'
+ */
+
+ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_2u(
+        KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        LT2_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    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_UP,   MO(2),
+        KC_LCTL,   KC_LGUI, KC_RALT,          LT1_SPC, KC_SPC,  KC_SPC,           KC_LEFT, KC_DOWN, KC_RGHT
+        ),
+    [1] = LAYOUT_ortho_2u(
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
+        RESET,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_NO, 
+        KC_NO,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_VOLD,   KC_MUTE, KC_VOLU,          KC_TRNS, KC_NO,   KC_TRNS,          KC_NO,   KC_NO,   KC_NO
+        ),
+    [2] = LAYOUT_ortho_2u(
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO, 
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO
+        ),
+};
diff --git a/keyboards/lazydesigners/dimple/ortho/keymaps/via/keymap.c b/keyboards/lazydesigners/dimple/ortho/keymaps/via/keymap.c
new file mode 100644
index 0000000000..32b71b75df
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2021 LAZYDESIGNERS
+ *
+ * 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
+
+#define LT2_TAB LT(2, KC_TAB)
+#define LT1_SPC LT(1, KC_SPC)
+
+/*
+ * ,------------------------------------------------------------------.
+ * |Esc    | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
+ * |------------------------------------------------------------------|
+ * |Tab/LT2| A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |  |Enter|
+ * |------------------------------------------------------------------|
+ * | Shift | Z  | X  | C  | V  | B  | N  | M  | ,  | .  | Up | MO(2)  |
+ * |------------------------------------------------------------------|
+ *      |Ctrl|Gui |Alt | Spc/LT1  | MO(2)|   Spc   |Left|Down|Rght|
+ *      `---------------------------------------------------------'
+ */
+
+ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_2u(
+        KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        LT2_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    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_UP,   MO(2),
+        KC_LCTL,   KC_LGUI, KC_RALT,          LT1_SPC, KC_SPC,  KC_SPC,           KC_LEFT, KC_DOWN, KC_RGHT
+        ),
+    [1] = LAYOUT_ortho_2u(
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
+        RESET,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_NO, 
+        KC_NO,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_VOLD,   KC_MUTE, KC_VOLU,          KC_TRNS, KC_NO,   KC_TRNS,          KC_NO,   KC_NO,   KC_NO
+        ),
+    [2] = LAYOUT_ortho_2u(
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO, 
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO
+        ),
+    [3] = LAYOUT_ortho_2u(
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO, 
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   KC_NO
+        ),
+};
diff --git a/keyboards/lazydesigners/dimple/keymaps/via/rules.mk b/keyboards/lazydesigners/dimple/ortho/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/lazydesigners/dimple/keymaps/via/rules.mk
rename to keyboards/lazydesigners/dimple/ortho/keymaps/via/rules.mk
diff --git a/keyboards/lazydesigners/dimple/ortho/ortho.c b/keyboards/lazydesigners/dimple/ortho/ortho.c
new file mode 100644
index 0000000000..da76fde176
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/ortho.c
@@ -0,0 +1,15 @@
+/*
+ Copyright 2021 LAZYDESIGNERS
+ 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 "ortho.h"
diff --git a/keyboards/lazydesigners/dimple/ortho/ortho.h b/keyboards/lazydesigners/dimple/ortho/ortho.h
new file mode 100644
index 0000000000..592cf47de3
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/ortho.h
@@ -0,0 +1,91 @@
+/*
+ Copyright 2021 LAZYDESIGNERS
+ 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"
+
+/*
+ *  ,-------------------------------------------------------------.
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *      |    |    |    |   2U    |    |    2U   |    |    |    |
+ *      `------------------------------------------------------'
+ */
+
+#define LAYOUT_ortho_2u( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+	K300,       K302, K303, K304, K305, K306, K307, K308, K309              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211 }, \
+	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
+}
+
+/*
+ *  ,-------------------------------------------------------------.
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *      |    |    |    |    |      3U      |    |    |    |    |
+ *      `------------------------------------------------------'
+ */
+
+#define LAYOUT_ortho_3u( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+	K300,       K302, K303, K304, K305, K306, K307, K308, K309              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211  }, \
+	{ K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
+}
+
+/*
+ *  ,-------------------------------------------------------------.
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *  |     |    |    |    |    |    |    |    |    |    |    |     |
+ *  |-------------------------------------------------------------|
+ *      |    |    |               7U                 |    |    |
+ *      `------------------------------------------------------'
+ */
+
+#define LAYOUT_ortho_7u( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+	K300,       K302,             K305,             K308, K309              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211  }, \
+	{ K300,  KC_NO, K302,  KC_NO, KC_NO, K305,  KC_NO, KC_NO, K308,  K309,  KC_NO, KC_NO }  \
+}
+
+
diff --git a/keyboards/lazydesigners/dimple/ortho/rules.mk b/keyboards/lazydesigners/dimple/ortho/rules.mk
new file mode 100644
index 0000000000..902a3d4bbc
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/ortho/rules.mk
@@ -0,0 +1,3 @@
+# Disable unsupported hardware
+BACKLIGHT_SUPPORTED = no
+RGBLIGHT_ENABLE = no
diff --git a/keyboards/lazydesigners/dimple/readme.md b/keyboards/lazydesigners/dimple/readme.md
index 04b4b438d6..2e15cec2b9 100644
--- a/keyboards/lazydesigners/dimple/readme.md
+++ b/keyboards/lazydesigners/dimple/readme.md
@@ -4,13 +4,22 @@
 
 A 40% custom keyboard designed and produced by [LazyDesigners](http://lazydesigners.cn).
 
-Keyboard Maintainer: [Erovia](https://github.com/Erovia)  
-Hardware Supported: Dimple  
-Hardware Availability: Check for GBs on [Geekhack](https://geekhack.org) and on [LazyDesigner's homepage.](http://lazydesigners.cn)
+* Keyboard Maintainer: [Erovia](https://github.com/Erovia) / [Jacky@LAZYDESIGNERS](https://github.com/jackytrabbit)
+* Hardware Supported: Dimple by LAZYDESIGNERS
+* Hardware Availability: Check on [LAZYDESIGNERS's homepage.](http://lazydesigners.cn)
+
+Detail versions:
+
+ 1. Dimple Round 1 in 2019 (Use dimple/staggered/Rev1)
+ 2. Dimple Round 2 Hotswap in 2021 (Use dimple/staggered/Rev2)
+ 3. Dimple Round 2 Solder in 2021 (Use dimple/staggered/Rev3)
+ 4. Dimple Round 2 OrthoStrange (Use dimple/ortho)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make lazydesigners/dimple:default:dfu
+    make lazydesigners/dimple/staggered/rev1:default
+    make lazydesigners/dimple/staggered/rev2:default
+    make lazydesigners/dimple/ortho:default
 
 To enter the bootloader, either short the pins on the PCB or the RESET button on the FN layer.
 
diff --git a/keyboards/lazydesigners/dimple/rules.mk b/keyboards/lazydesigners/dimple/rules.mk
index 0581d54ba8..ee586a38e1 100644
--- a/keyboards/lazydesigners/dimple/rules.mk
+++ b/keyboards/lazydesigners/dimple/rules.mk
@@ -8,12 +8,16 @@ BOOTLOADER = atmel-dfu
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes        # Mouse keys
-EXTRAKEY_ENABLE = yes        # Audio control and System control
+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
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
 
 # Disable unsupported hardware
 AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no
+DEFAULT_FOLDER = lazydesigners/dimple/staggered/rev1
diff --git a/keyboards/lazydesigners/dimple/info.json b/keyboards/lazydesigners/dimple/staggered/info.json
similarity index 100%
rename from keyboards/lazydesigners/dimple/info.json
rename to keyboards/lazydesigners/dimple/staggered/info.json
diff --git a/keyboards/lazydesigners/dimple/keymaps/default/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
similarity index 97%
rename from keyboards/lazydesigners/dimple/keymaps/default/keymap.c
rename to keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
index d23c8e8a6e..65b81ff4e1 100644
--- a/keyboards/lazydesigners/dimple/keymaps/default/keymap.c
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/default/keymap.c
@@ -108,14 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	),
 };
 
-void led_set_user(uint8_t usb_led) {
-if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-	dimple_led_on();
-	} else {
-	dimple_led_off();
-	}
-}
-
+#ifdef KEYBOARD_lazydesigner_dimple_staggered_rev1
 layer_state_t layer_state_set_user(layer_state_t state) {
 	state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
 	switch (get_highest_layer(state)) {
@@ -134,3 +127,4 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 	}
 	return state;
 }
+#endif
diff --git a/keyboards/lazydesigners/dimple/keymaps/default/readme.md b/keyboards/lazydesigners/dimple/staggered/keymaps/default/readme.md
similarity index 100%
rename from keyboards/lazydesigners/dimple/keymaps/default/readme.md
rename to keyboards/lazydesigners/dimple/staggered/keymaps/default/readme.md
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/config.h b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/config.h
new file mode 100644
index 0000000000..214ff982c6
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 LAZYDESIGNERS
+ *
+ * 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 TAPPING_TERM 170
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
new file mode 100644
index 0000000000..6f893e187f
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/keymap.c
@@ -0,0 +1,162 @@
+/* Copyright 2019 Erovia
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "erovia.h"
+
+// Left space on tap, LOWER on hold
+#define SPC_LOW LT(_LOWER, KC_TAB)
+// Left space on tap, UPPER on hold
+#define SPC_UPR LT(_RAISE, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+ * ,---------------------------------------------------------------.
+ * | `  | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
+ * |---------------------------------------------------------------|
+ * | Esc  | A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |  .   |
+ * |---------------------------------------------------------------|
+ * | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | .  |  Enter  |
+ * |---------------------------------------------------------------|
+ *      |Ctrl|Gui |Alt | Spc/Lwr |   Spc/Rse   |    |    |    |
+ *      `-----------------------------------------------------'
+ */
+
+	[_QWERTY] = LAYOUT(
+		KC_GRV,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+		VIM_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_DOT,
+		TD_SHFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   TD_ENTR,
+		KC_LCTL, KC_LGUI, KC_LALT, SPC_LOW,  SPC_UPR,  KC_NO, KC_NO, KC_NO
+	),
+
+/*
+ * ,---------------------------------------------------------------.
+ * | `  | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
+ * |---------------------------------------------------------------|
+ * | Esc  | A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |  '   |
+ * |---------------------------------------------------------------|
+ * | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | .  |  Enter  |
+ * |---------------------------------------------------------------|
+ *      |Ctrl|Gui |Alt | Spc/Lwr |   Spc/Rse   |    |    |    |
+ *      `-----------------------------------------------------'
+ */
+
+	[_COLEMAK] = LAYOUT(
+		KC_GRV,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,    KC_BSPC,
+		VIM_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_G,    KC_M,    KC_N,    KC_E,    KC_I,    KC_O,       KC_QUOT,
+		TD_SHFT, KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,    KC_K,    KC_H,    KC_COMM, KC_DOT,  TD_ENTR,
+		KC_LCTL, KC_LGUI, KC_LALT, SPC_LOW,  SPC_UPR,  KC_NO, KC_NO, KC_NO
+	),
+
+/*
+ * ,---------------------------------------------------------------.
+ * | ~  | !  | @  | #  | $  | %  | ^  | &  | *  | (  | )  |        |
+ * |---------------------------------------------------------------|
+ * | Del  | F1 | F2 | F3 | F4 | F5 | F6 | _  | +  | {  | }  |  |   |
+ * |---------------------------------------------------------------|
+ * |        | F7 | F8 | F9 |F10 |F11 |F12 |    | ;  |PgUp|   /     |
+ * |---------------------------------------------------------------|
+ *      |    |    |    |         |             |Home|PgDn|End |
+ *      `-----------------------------------------------------'
+ */
+
+	[_LOWER] = LAYOUT(
+		KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
+		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_NO,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_SCLN, KC_PGUP, KC_SLSH,
+		KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END
+	),
+
+/*
+ * ,---------------------------------------------------------------.
+ * | `  | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  |        |
+ * |---------------------------------------------------------------|
+ * | Ins  | F1 | F2 | F3 | F4 | F5 | F6 | -  | =  | [  | ]  |  \   |
+ * |---------------------------------------------------------------|
+ * |        | F7 | F8 | F9 |F10 |F11 |F12  |    |    |   |         |
+ * |---------------------------------------------------------------|
+ *      |VolD|Mute|VolU|         |             |    |    |    |
+ *      `-----------------------------------------------------'
+ */
+
+	[_RAISE] = LAYOUT(
+		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_TRNS,
+		KC_INS,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+		KC_NO,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,
+		KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS, KC_NO,   KC_NO,   KC_NO
+	),
+
+/*
+ * ,---------------------------------------------------------------.
+ * |EEPR|RST |    |    |    |    |    |    |    |    |    |        |
+ * |---------------------------------------------------------------|
+ * |Leader|    |    |    |    |    |    |    |    |    |    |      |
+ * |---------------------------------------------------------------|
+ * |        |    |    |    |    |    |     |    |    |   |         |
+ * |---------------------------------------------------------------|
+ *      |RGB-|RGB |RGB+|         |             |    |    |    |
+ *      `-----------------------------------------------------'
+ */
+
+	[_ADJUST] = LAYOUT(
+		EEP_RST, RESET,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+		KC_LEAD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   QWERTY,  COLEMAK, KC_NO,   KC_NO,   KC_NO,   KC_NO,
+		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO
+	),
+
+/*
+ * ,---------------------------------------------------------------.
+ * |    |    |    |    |    |    |    |    |    |    |    |        |
+ * |---------------------------------------------------------------|
+ * |      |    |    |    |    |    | H  | J  | K  | L  |    |      |
+ * |---------------------------------------------------------------|
+ * |        |    |    |    |    |    |     |    |    |Up |         |
+ * |---------------------------------------------------------------|
+ *      |    |    |    |         |             |Left|Down|Rght|
+ *      `-----------------------------------------------------'
+ */
+
+	[_VIM] = LAYOUT(
+		EEP_RST, RESET,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_H,    KC_J,    KC_K,    KC_L,    KC_NO,   KC_NO,
+		KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_UP,   KC_NO,
+		RGB_VAD, RGB_TOG, RGB_VAI, KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT
+	),
+};
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+	state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+	switch (biton32(state)) {
+		case _LOWER:
+			rgblight_sethsv_noeeprom(HSV_GREEN);
+			break;
+		case _RAISE:
+			rgblight_sethsv_noeeprom(HSV_GOLD);
+			break;
+		case _ADJUST:
+			rgblight_sethsv_noeeprom(HSV_RED);
+			break;
+		default:
+			rgblight_sethsv_noeeprom(HSV_WHITE);
+			break;
+	}
+	return state;
+}
+
+void keyboard_post_init_user(void) {
+	dimple_led_off();
+}
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/readme.md b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/readme.md
new file mode 100644
index 0000000000..c334b6c367
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/erovia/readme.md
@@ -0,0 +1,60 @@
+# The default keymap for Dimple
+
+**Features**
+
+* Shift acts as CapsLock when tapped  
+* Left space: space on tap, Lower layer on hold  
+* Right space: space on tap, Raise layer on hold  
+* Both space: Adjust layer on hold  
+
+## QWERTY (Normal) Layer
+```
+ ,---------------------------------------------------------------.
+ |Esc | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
+ |---------------------------------------------------------------|
+ | Tab  | A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |Enter |
+ |---------------------------------------------------------------|
+ | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | Up |    .    |
+ |---------------------------------------------------------------|
+      |Ctrl|Gui |Alt | Spc/Lwr |   Spc/Rse   |Left|Down|Rght|
+      `-----------------------------------------------------'
+```
+
+## Lower Layer
+```
+ ,---------------------------------------------------------------.
+ | ~  | !  | @  | #  | $  | %  | ^  | &  | *  | (  | )  |        |
+ |---------------------------------------------------------------|
+ | Del  | F1 | F2 | F3 | F4 | F5 | F6 | _  | +  | {  | }  |  |   |
+ |---------------------------------------------------------------|
+ |        | F7 | F8 | F9 |F10 |F11 |F12 |    | ;  |PgUp|   /     |
+ |---------------------------------------------------------------|
+      |    |    |    |         |             |Home|PgDn|End |
+      `-----------------------------------------------------'
+```
+
+## Raise Layer
+```
+ ,---------------------------------------------------------------.
+ | `  | 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  |        |
+ |---------------------------------------------------------------|
+ | Ins  | F1 | F2 | F3 | F4 | F5 | F6 | -  | =  | [  | ]  |  \   |
+ |---------------------------------------------------------------|
+ |        | F7 | F8 | F9 |F10 |F11 |F12  |    |    |   |         |
+ |---------------------------------------------------------------|
+      |VolD|Mute|VolU|         |             |    |    |    |
+      `-----------------------------------------------------'
+```
+
+## Adjust Layer
+```
+,---------------------------------------------------------------.
+ |EEPR|RST |    |    |    |    |    |    |    |    |    |        |
+ |---------------------------------------------------------------|
+ |      |    |    |    |    |    |    |    |    |    |    |      |
+ |---------------------------------------------------------------|
+ |        |    |    |    |    |    |     |    |    |   |         |
+ |---------------------------------------------------------------|
+      |RGB-|RGB |RGB+|         |             |    |    |    |
+      `-----------------------------------------------------'
+```
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c
new file mode 100644
index 0000000000..e4b4161b04
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/oncesavedgaming/keymap.c
@@ -0,0 +1,23 @@
+/* Copyright 2021 LAZYDESIGNERS
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT(KC_SLSH), KC_DEL, KC_ESC, KC_LALT, KC_SPC, LT(1,KC_SPC), KC_RALT, KC_RGUI, KC_LCTL),
+	[1] = LAYOUT(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, RESET, RGB_SPI, RGB_SPD, RGB_M_P, RGB_M_B, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, KC_SCLN, KC_NO, KC_LSFT, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, MO(2), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
+	[2] = LAYOUT(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_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
+};
diff --git a/keyboards/lazydesigners/dimple/keymaps/tominabox1/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/tominabox1/keymap.c
similarity index 100%
rename from keyboards/lazydesigners/dimple/keymaps/tominabox1/keymap.c
rename to keyboards/lazydesigners/dimple/staggered/keymaps/tominabox1/keymap.c
diff --git a/keyboards/lazydesigners/dimple/keymaps/via/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/lazydesigners/dimple/keymaps/via/keymap.c
rename to keyboards/lazydesigners/dimple/staggered/keymaps/via/keymap.c
diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/via/rules.mk b/keyboards/lazydesigners/dimple/staggered/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/config.h b/keyboards/lazydesigners/dimple/staggered/rev1/config.h
new file mode 100644
index 0000000000..b62f3c4195
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev1/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 LAZYDESIGNERS
+ *
+ * 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 LED_CAPS_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
diff --git a/keyboards/lazydesigners/dimple/staggered/rev1/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev1/rules.mk
new file mode 100644
index 0000000000..2fdb308d16
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev1/rules.mk
@@ -0,0 +1,4 @@
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+
+# Disable unsupported hardware
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk
new file mode 100644
index 0000000000..1961392f2d
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev2/rules.mk
@@ -0,0 +1,4 @@
+BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
+
+# Disable unsupported hardware
+RGBLIGHT_ENABLE = no
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/config.h b/keyboards/lazydesigners/dimple/staggered/rev3/config.h
new file mode 100644
index 0000000000..cc32223f3a
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 LAZYDESIGNERS
+ *
+ * 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 BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
+
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/info.json b/keyboards/lazydesigners/dimple/staggered/rev3/info.json
new file mode 100644
index 0000000000..eb1d8b14dc
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/info.json
@@ -0,0 +1,144 @@
+{
+    "keyboard_name": "Dimple", 
+    "url": "http://lazydesigners.cn", 
+    "maintainer": "Jacky@LAZYDESIGNERS", 
+    "layouts": {
+        "LAYOUT_all": {
+            "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":"Back<br>Space", "x":11, "y":0, "w":1.5},
+              {"label":"Tab", "x":0, "y":1, "w":1.25},
+              {"label":"A", "x":1.25, "y":1},
+              {"label":"S", "x":2.25, "y":1},
+              {"label":"D", "x":3.25, "y":1},
+              {"label":"F", "x":4.25, "y":1},
+              {"label":"G", "x":5.25, "y":1},
+              {"label":"H", "x":6.25, "y":1},
+              {"label":"J", "x":7.25, "y":1},
+              {"label":"K", "x":8.25, "y":1},
+              {"label":"L", "x":9.25, "y":1},
+              {"label":"'", "x":10.25, "y":1},
+              {"label":"Enter", "x":11.25, "y":1, "w":1.25},
+              {"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":"Up", "x":9.75, "y":2},
+              {"label":".", "x":10.75, "y":2, "w":1.75},
+              {"label":"Ctrl", "x":0.75, "y":3},
+              {"label":"Gui", "x":1.75, "y":3},
+              {"label":"Alt", "x":2.75, "y":3},
+              {"label":"Space", "x":3.75, "y":3, "w":2.25},
+              {"label":"Space", "x":6, "y":3, "w":2.75},
+              {"label":"Left", "x":8.75, "y":3},
+              {"label":"Down", "x":9.75, "y":3},
+              {"label":"Right", "x":10.75, "y":3}
+           ]
+        },
+        "LAYOUT_iso": {
+            "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":"Tab", "x":0, "y":1, "w":1.25},
+              {"label":"A", "x":1.25, "y":1},
+              {"label":"S", "x":2.25, "y":1},
+              {"label":"D", "x":3.25, "y":1},
+              {"label":"F", "x":4.25, "y":1},
+              {"label":"G", "x":5.25, "y":1},
+              {"label":"H", "x":6.25, "y":1},
+              {"label":"J", "x":7.25, "y":1},
+              {"label":"K", "x":8.25, "y":1},
+              {"label":"L", "x":9.25, "y":1},
+              {"label":"'", "x":10.25, "y":1},
+              {"label":"Enter", "x":11.25, "y":0, "w":1.25,"h":2},
+              {"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":"Up", "x":9.75, "y":2},
+              {"label":".", "x":10.75, "y":2, "w":1.75},
+              {"label":"Ctrl", "x":0.75, "y":3},
+              {"label":"Gui", "x":1.75, "y":3},
+              {"label":"Alt", "x":2.75, "y":3},
+              {"label":"Space", "x":3.75, "y":3, "w":2.25},
+              {"label":"Space", "x":6, "y":3, "w":2.75},
+              {"label":"Left", "x":8.75, "y":3},
+              {"label":"Down", "x":9.75, "y":3},
+              {"label":"Right", "x":10.75, "y":3}
+           ]
+        },
+        "LAYOUT_7u": {
+            "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":"Back<br>Space", "x":11, "y":0, "w":1.5},
+                    {"label":"Tab", "x":0, "y":1, "w":1.25},
+                    {"label":"A", "x":1.25, "y":1},
+                    {"label":"S", "x":2.25, "y":1},
+                    {"label":"D", "x":3.25, "y":1},
+                    {"label":"F", "x":4.25, "y":1},
+                    {"label":"G", "x":5.25, "y":1},
+                    {"label":"H", "x":6.25, "y":1},
+                    {"label":"J", "x":7.25, "y":1},
+                    {"label":"K", "x":8.25, "y":1},
+                    {"label":"L", "x":9.25, "y":1},
+                    {"label":"'", "x":10.25, "y":1},
+                    {"label":"Enter", "x":11.25, "y":1, "w":1.25},
+                    {"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":"Up", "x":9.75, "y":2},
+                    {"label":".", "x":10.75, "y":2, "w":1.75},
+                    {"label":"Ctrl", "x":0.75, "y":3},
+                    {"label":"Gui", "x":1.75, "y":3},
+                    {"label":"Space", "x":2.75, "y":3, "w":7},
+                    {"label":"Down", "x":9.75, "y":3},
+                    {"label":"Right", "x":10.75, "y":3}
+           ]
+        }
+    }
+}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/default/keymap.c b/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..ca20b00201
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/keymaps/default/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2021 LAZYDESIGNERS
+ *
+ * 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
+
+#define LT2_TAB LT(2, KC_TAB)
+#define LT1_SPC LT(1, KC_SPC)
+
+/*
+ * ,---------------------------------------------------------------.
+ * |Esc | Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  |  Bspc  |
+ * |---------------------------------------------------------------|
+ * |Tab/LT2| A  | S  | D  | F  | G  | H  | J  | K  | L  | '  |Enter|
+ * |---------------------------------------------------------------|
+ * | Shift  | Z  | X  | C  | V  | B  | N  | M  | ,  | Up |  MO(2)  |
+ * |---------------------------------------------------------------|
+ *      |Ctrl|Gui |Alt | Spc/LT1 |   Spc       |Left|Down|Rght|
+ *      `-----------------------------------------------------'
+ */
+
+ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        LT2_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENT,
+        KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM,  KC_UP,   MO(2),
+        KC_LCTL,   KC_LGUI, KC_RALT,          LT1_SPC,          KC_SPC,           KC_LEFT, KC_DOWN, KC_RGHT
+        ),
+    [1] = LAYOUT_all(
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_NO,
+        RESET,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_NO, 
+        KC_NO,     KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,  
+        KC_VOLD,   KC_MUTE, KC_VOLU,          KC_TRNS,          KC_TRNS,          KC_NO,   KC_NO,   KC_NO
+        ),
+    [2] = LAYOUT_all(
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,    KC_NO, 
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,  
+        KC_NO,     KC_NO,   KC_NO,            KC_NO,            KC_NO,            KC_NO,   KC_NO,   KC_NO
+        ),
+};
+
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/rev3.c b/keyboards/lazydesigners/dimple/staggered/rev3/rev3.c
new file mode 100644
index 0000000000..afa1d38b6d
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/rev3.c
@@ -0,0 +1,16 @@
+/* Copyright 2019 Erovia
+ *
+ * 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 "rev3.h"
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/rev3.h b/keyboards/lazydesigners/dimple/staggered/rev3/rev3.h
new file mode 100644
index 0000000000..2aec210d9e
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/rev3.h
@@ -0,0 +1,90 @@
+/* Copyright 2019 Erovia
+ *
+ * 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( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
+	K300,       K302, K303, K304,       K306, K307, K308, K309  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO }, \
+	{ K300,  KC_NO, K302,  K303,  K304,  KC_NO, K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
+}
+
+/*
+ *  ,---------------------------------------------------------------.
+ *  |    |    |    |    |    |    |    |    |    |    |    |        |
+ *  |--------------------------------------------------------       |
+ *  |      |    |    |    |    |    |    |    |    |    |    |      |
+ *  |---------------------------------------------------------------|
+ *  |        |    |    |    |    |    |    |    |    |    |         |
+ *  |---------------------------------------------------------------|
+ *       |    |    |    |         |             |    |    |    |
+ *       `-----------------------------------------------------'
+ */
+
+#define LAYOUT_iso( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,       \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
+	K300,       K302, K303, K304,       K306, K307, K308, K309              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  KC_NO }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO }, \
+	{ K300,  KC_NO, K302,  K303,  K304,  KC_NO, K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
+}
+
+/*
+ *  ,---------------------------------------------------------------.
+ *  |    |    |    |    |    |    |    |    |    |    |    |        |
+ *  |---------------------------------------------------------------|
+ *  |      |    |    |    |    |    |    |    |    |    |    |      |
+ *  |---------------------------------------------------------------|
+ *  |        |    |    |    |    |    |    |    |    |    |         |
+ *  |---------------------------------------------------------------|
+ *       |    |    |                                 |    |    |
+ *       `-----------------------------------------------------'
+ */
+
+#define LAYOUT_7u( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210,       \
+	K300,       K302,       K304,                   K308, K309              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  KC_NO }, \
+	{ K300,  KC_NO, K302,  KC_NO, K304,  KC_NO, KC_NO, KC_NO, K308,  K309,  KC_NO, KC_NO }  \
+}
diff --git a/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk b/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk
new file mode 100644
index 0000000000..b3b1cc58a1
--- /dev/null
+++ b/keyboards/lazydesigners/dimple/staggered/rev3/rules.mk
@@ -0,0 +1,4 @@
+BACKLIGHT_ENABLE = yes        # Enable keyboard backlight functionality
+
+# Disable unsupported hardware
+RGBLIGHT_ENABLE = no
diff --git a/keyboards/lazydesigners/dimple/dimple.c b/keyboards/lazydesigners/dimple/staggered/staggered.c
similarity index 77%
rename from keyboards/lazydesigners/dimple/dimple.c
rename to keyboards/lazydesigners/dimple/staggered/staggered.c
index 6bbb9a0477..2cd8c018db 100644
--- a/keyboards/lazydesigners/dimple/dimple.c
+++ b/keyboards/lazydesigners/dimple/staggered/staggered.c
@@ -13,18 +13,11 @@
  * 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 "dimple.h"
-
+#include "staggered.h"
 void dimple_led_on() {
-  writePinLow(E6);
-}
+    writePinLow(E6);
+  }
 
-void dimple_led_off() {
-  writePinHigh(E6);
-}
-
-void keyboard_pre_init_kb(void) {
-  // Initialize Caps Lock LED
-  setPinOutput(E6);
-  keyboard_pre_init_user();
-}
+ void dimple_led_off() {
+    writePinHigh(E6);
+  }
diff --git a/keyboards/lazydesigners/dimple/dimple.h b/keyboards/lazydesigners/dimple/staggered/staggered.h
similarity index 99%
rename from keyboards/lazydesigners/dimple/dimple.h
rename to keyboards/lazydesigners/dimple/staggered/staggered.h
index ba8a413ed6..433de3b897 100644
--- a/keyboards/lazydesigners/dimple/dimple.h
+++ b/keyboards/lazydesigners/dimple/staggered/staggered.h
@@ -41,6 +41,5 @@
 	{ K300,  KC_NO, K302,  K303,  K304,  KC_NO, K306,  K307,  K308,  K309,  KC_NO, KC_NO }  \
 }
 
-
 void dimple_led_on(void);
 void dimple_led_off(void);

From b1de11c27575f9956d2f7dfd6bf0240d630e3ae1 Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Mon, 21 Feb 2022 23:13:06 +0900
Subject: [PATCH 662/867] Fix a potential bug in encoder_init(). (#16372)

After executing `setPinInputHigh(pin)`, it is necessary to wait for the charging time to read from the corresponding pin. This is the same as requiring `matrix_output_unselect_delay()` after doing `unselect_row()` in matrix.c.
---
 quantum/encoder.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/quantum/encoder.c b/quantum/encoder.c
index 8fb87281c2..ecbc0c1615 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -59,6 +59,8 @@ static uint8_t thisHand, thatHand;
 static uint8_t encoder_value[NUMBER_OF_ENCODERS] = {0};
 #endif
 
+__attribute__((weak)) void encoder_wait_pullup_charge(void) { wait_us(100); }
+
 __attribute__((weak)) bool encoder_update_user(uint8_t index, bool clockwise) { return true; }
 
 __attribute__((weak)) bool encoder_update_kb(uint8_t index, bool clockwise) { return encoder_update_user(index, clockwise); }
@@ -84,7 +86,9 @@ void encoder_init(void) {
     for (int i = 0; i < NUMBER_OF_ENCODERS; i++) {
         setPinInputHigh(encoders_pad_a[i]);
         setPinInputHigh(encoders_pad_b[i]);
-
+    }
+    encoder_wait_pullup_charge();
+    for (int i = 0; i < NUMBER_OF_ENCODERS; i++) {
         encoder_state[i] = (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1);
     }
 

From f30f963a0b6ccaa151fe83dd8302fa1f6829086e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 22 Feb 2022 02:47:44 +1100
Subject: [PATCH 663/867] Internal docs generation updates (#16411)

---
 .gitignore                          |  1 -
 Doxyfile                            |  6 +++---
 lib/python/qmk/cli/generate/docs.py | 16 ++++++++++------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 768f40b191..3cc40dc2ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,7 +18,6 @@
 
 # QMK-specific
 api_data/v1
-doxygen/
 quantum/version.h
 *.bin
 *.eep
diff --git a/Doxyfile b/Doxyfile
index 218d77b4dd..4b0ea3f086 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -21,7 +21,7 @@ DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "QMK Firmware"
 PROJECT_NUMBER         = https://github.com/qmk/qmk_firmware
 PROJECT_BRIEF          = "Keyboard controller firmware for Atmel AVR and ARM USB families"
-OUTPUT_DIRECTORY       = doxygen
+OUTPUT_DIRECTORY       = .build/doxygen
 ALLOW_UNICODE_NAMES    = NO
 OUTPUT_LANGUAGE        = English
 BRIEF_MEMBER_DESC      = YES
@@ -145,7 +145,7 @@ FILE_PATTERNS          = *.c \
 RECURSIVE              = YES
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       = */protocol/arm_atsam/*
 EXCLUDE_SYMBOLS        = 
 EXAMPLE_PATH           = 
 EXAMPLE_PATTERNS       = *
@@ -209,7 +209,7 @@ EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = 
 INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
+PREDEFINED             = __DOXYGEN__ PROGMEM
 EXPAND_AS_DEFINED      = 
 SKIP_FUNCTION_MACROS   = YES
 
diff --git a/lib/python/qmk/cli/generate/docs.py b/lib/python/qmk/cli/generate/docs.py
index 749336fea5..74112d834d 100644
--- a/lib/python/qmk/cli/generate/docs.py
+++ b/lib/python/qmk/cli/generate/docs.py
@@ -7,7 +7,9 @@ from subprocess import DEVNULL
 from milc import cli
 
 DOCS_PATH = Path('docs/')
-BUILD_PATH = Path('.build/docs/')
+BUILD_PATH = Path('.build/')
+BUILD_DOCS_PATH = BUILD_PATH / 'docs'
+DOXYGEN_PATH = BUILD_PATH / 'doxygen'
 
 
 @cli.subcommand('Build QMK documentation.', hidden=False if cli.config.user.developer else True)
@@ -18,10 +20,12 @@ def generate_docs(cli):
         * [ ] Add a real build step... something static docs
     """
 
-    if BUILD_PATH.exists():
-        shutil.rmtree(BUILD_PATH)
+    if BUILD_DOCS_PATH.exists():
+        shutil.rmtree(BUILD_DOCS_PATH)
+    if DOXYGEN_PATH.exists():
+        shutil.rmtree(DOXYGEN_PATH)
 
-    shutil.copytree(DOCS_PATH, BUILD_PATH)
+    shutil.copytree(DOCS_PATH, BUILD_DOCS_PATH)
 
     # When not verbose we want to hide all output
     args = {
@@ -34,6 +38,6 @@ def generate_docs(cli):
 
     # Generate internal docs
     cli.run(['doxygen', 'Doxyfile'], **args)
-    cli.run(['moxygen', '-q', '-a', '-g', '-o', BUILD_PATH / 'internals_%s.md', 'doxygen/xml'], **args)
+    cli.run(['moxygen', '-q', '-g', '-o', BUILD_DOCS_PATH / 'internals_%s.md', DOXYGEN_PATH / 'xml'], **args)
 
-    cli.log.info('Successfully generated internal docs to %s.', BUILD_PATH)
+    cli.log.info('Successfully generated internal docs to %s.', BUILD_DOCS_PATH)

From 25ba9b41c119fde21b5c996a90a0b28b3e32d271 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Mon, 21 Feb 2022 08:29:54 -0800
Subject: [PATCH 664/867] Format code according to conventions (#16421)

---
 drivers/ps2/ps2_busywait.c                    |   5 +-
 quantum/action.c                              |  91 ++-
 quantum/action.h                              |   2 +-
 tmk_core/protocol/arm_atsam/usb/compiler.h    | 538 +++++++++---------
 tmk_core/protocol/arm_atsam/usb/udi_cdc.c     |  16 +-
 .../protocol/arm_atsam/usb/usb_device_udd.c   |   5 +-
 6 files changed, 320 insertions(+), 337 deletions(-)

diff --git a/drivers/ps2/ps2_busywait.c b/drivers/ps2/ps2_busywait.c
index c5a0183bb7..18e2501a26 100644
--- a/drivers/ps2/ps2_busywait.c
+++ b/drivers/ps2/ps2_busywait.c
@@ -125,11 +125,10 @@ uint8_t ps2_host_recv_response(void) {
     // Command may take 25ms/20ms at most([5]p.46, [3]p.21)
     // 250 * 100us(wait for start bit in ps2_host_recv)
     uint8_t data = 0;
-    uint8_t try
-        = 250;
+    uint8_t try  = 250;
     do {
         data = ps2_host_recv();
-    } while (try --&&ps2_error);
+    } while (try-- && ps2_error);
     return data;
 }
 
diff --git a/quantum/action.c b/quantum/action.c
index 2bb1c34985..3efed443a3 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -833,10 +833,9 @@ __attribute__((weak)) void register_code(uint8_t code) {
     }
 #endif
 
-    else if
-        IS_KEY(code) {
-            // TODO: should push command_proc out of this block?
-            if (command_proc(code)) return;
+    else if IS_KEY (code) {
+        // TODO: should push command_proc out of this block?
+        if (command_proc(code)) return;
 
 #ifndef NO_ACTION_ONESHOT
 /* TODO: remove
@@ -853,39 +852,33 @@ __attribute__((weak)) void register_code(uint8_t code) {
         } else
 */
 #endif
-            {
-                // Force a new key press if the key is already pressed
-                // without this, keys with the same keycode, but different
-                // modifiers will be reported incorrectly, see issue #1708
-                if (is_key_pressed(keyboard_report, code)) {
-                    del_key(code);
-                    send_keyboard_report();
-                }
-                add_key(code);
+        {
+            // Force a new key press if the key is already pressed
+            // without this, keys with the same keycode, but different
+            // modifiers will be reported incorrectly, see issue #1708
+            if (is_key_pressed(keyboard_report, code)) {
+                del_key(code);
                 send_keyboard_report();
             }
-        }
-    else if
-        IS_MOD(code) {
-            add_mods(MOD_BIT(code));
+            add_key(code);
             send_keyboard_report();
         }
+    } else if IS_MOD (code) {
+        add_mods(MOD_BIT(code));
+        send_keyboard_report();
+    }
 #ifdef EXTRAKEY_ENABLE
-    else if
-        IS_SYSTEM(code) {
-            host_system_send(KEYCODE2SYSTEM(code));
-        }
-    else if
-        IS_CONSUMER(code) {
-            host_consumer_send(KEYCODE2CONSUMER(code));
-        }
+    else if IS_SYSTEM (code) {
+        host_system_send(KEYCODE2SYSTEM(code));
+    } else if IS_CONSUMER (code) {
+        host_consumer_send(KEYCODE2CONSUMER(code));
+    }
 #endif
 #ifdef MOUSEKEY_ENABLE
-    else if
-        IS_MOUSEKEY(code) {
-            mousekey_on(code);
-            mousekey_send();
-        }
+    else if IS_MOUSEKEY (code) {
+        mousekey_on(code);
+        mousekey_send();
+    }
 #endif
 }
 
@@ -930,30 +923,22 @@ __attribute__((weak)) void unregister_code(uint8_t code) {
     }
 #endif
 
-    else if
-        IS_KEY(code) {
-            del_key(code);
-            send_keyboard_report();
-        }
-    else if
-        IS_MOD(code) {
-            del_mods(MOD_BIT(code));
-            send_keyboard_report();
-        }
-    else if
-        IS_SYSTEM(code) {
-            host_system_send(0);
-        }
-    else if
-        IS_CONSUMER(code) {
-            host_consumer_send(0);
-        }
+    else if IS_KEY (code) {
+        del_key(code);
+        send_keyboard_report();
+    } else if IS_MOD (code) {
+        del_mods(MOD_BIT(code));
+        send_keyboard_report();
+    } else if IS_SYSTEM (code) {
+        host_system_send(0);
+    } else if IS_CONSUMER (code) {
+        host_consumer_send(0);
+    }
 #ifdef MOUSEKEY_ENABLE
-    else if
-        IS_MOUSEKEY(code) {
-            mousekey_off(code);
-            mousekey_send();
-        }
+    else if IS_MOUSEKEY (code) {
+        mousekey_off(code);
+        mousekey_send();
+    }
 #endif
 }
 
diff --git a/quantum/action.h b/quantum/action.h
index 39b5da63b8..08e1f6ac29 100644
--- a/quantum/action.h
+++ b/quantum/action.h
@@ -72,7 +72,7 @@ extern bool disable_action_cache;
 
 /* Code for handling one-handed key modifiers. */
 #ifdef SWAP_HANDS_ENABLE
-extern bool           swap_hands;
+extern bool                   swap_hands;
 extern const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS];
 #    if (MATRIX_COLS <= 8)
 typedef uint8_t swap_state_row_t;
diff --git a/tmk_core/protocol/arm_atsam/usb/compiler.h b/tmk_core/protocol/arm_atsam/usb/compiler.h
index 517499f946..9fb04ff628 100644
--- a/tmk_core/protocol/arm_atsam/usb/compiler.h
+++ b/tmk_core/protocol/arm_atsam/usb/compiler.h
@@ -43,7 +43,7 @@
  */
 
 #ifndef UTILS_COMPILER_H_INCLUDED
-#    define UTILS_COMPILER_H_INCLUDED
+#define UTILS_COMPILER_H_INCLUDED
 
 /**
  * \defgroup group_sam0_utils Compiler abstraction layer and code utilities
@@ -54,38 +54,38 @@
  * @{
  */
 
-#    if (defined __ICCARM__)
-#        include <intrinsics.h>
-#    endif
+#if (defined __ICCARM__)
+#    include <intrinsics.h>
+#endif
 
-#    include <stddef.h>
+#include <stddef.h>
 //#include <parts.h>
 //#include <status_codes.h>
 //#include <preprocessor.h>
 //#include <io.h>
 
-#    ifndef __ASSEMBLY__
+#ifndef __ASSEMBLY__
 
-#        include <stdio.h>
-#        include <stdbool.h>
-#        include <stdint.h>
-#        include <stdlib.h>
+#    include <stdio.h>
+#    include <stdbool.h>
+#    include <stdint.h>
+#    include <stdlib.h>
 
 /**
  * \def UNUSED
  * \brief Marking \a v as a unused parameter or value.
  */
-#        define UNUSED(v) (void)(v)
+#    define UNUSED(v) (void)(v)
 
 /**
  * \def barrier
  * \brief Memory barrier
  */
-#        ifdef __GNUC__
-#            define barrier() asm volatile("" ::: "memory")
-#        else
-#            define barrier() asm("")
-#        endif
+#    ifdef __GNUC__
+#        define barrier() asm volatile("" ::: "memory")
+#    else
+#        define barrier() asm("")
+#    endif
 
 /**
  * \brief Emit the compiler pragma \a arg.
@@ -93,37 +93,37 @@
  * \param[in] arg  The pragma directive as it would appear after \e \#pragma
  *             (i.e. not stringified).
  */
-#        define COMPILER_PRAGMA(arg) _Pragma(#        arg)
+#    define COMPILER_PRAGMA(arg) _Pragma(#    arg)
 
 /**
  * \def COMPILER_PACK_SET(alignment)
  * \brief Set maximum alignment for subsequent struct and union definitions to \a alignment.
  */
-#        define COMPILER_PACK_SET(alignment) COMPILER_PRAGMA(pack(alignment))
+#    define COMPILER_PACK_SET(alignment) COMPILER_PRAGMA(pack(alignment))
 
 /**
  * \def COMPILER_PACK_RESET()
  * \brief Set default alignment for subsequent struct and union definitions.
  */
-#        define COMPILER_PACK_RESET() COMPILER_PRAGMA(pack())
+#    define COMPILER_PACK_RESET() COMPILER_PRAGMA(pack())
 
 /**
  * \brief Set aligned boundary.
  */
-#        if (defined __GNUC__) || (defined __CC_ARM)
-#            define COMPILER_ALIGNED(a) __attribute__((__aligned__(a)))
-#        elif (defined __ICCARM__)
-#            define COMPILER_ALIGNED(a) COMPILER_PRAGMA(data_alignment = a)
-#        endif
+#    if (defined __GNUC__) || (defined __CC_ARM)
+#        define COMPILER_ALIGNED(a) __attribute__((__aligned__(a)))
+#    elif (defined __ICCARM__)
+#        define COMPILER_ALIGNED(a) COMPILER_PRAGMA(data_alignment = a)
+#    endif
 
 /**
  * \brief Set word-aligned boundary.
  */
-#        if (defined __GNUC__) || defined(__CC_ARM)
-#            define COMPILER_WORD_ALIGNED __attribute__((__aligned__(4)))
-#        elif (defined __ICCARM__)
-#            define COMPILER_WORD_ALIGNED COMPILER_PRAGMA(data_alignment = 4)
-#        endif
+#    if (defined __GNUC__) || defined(__CC_ARM)
+#        define COMPILER_WORD_ALIGNED __attribute__((__aligned__(4)))
+#    elif (defined __ICCARM__)
+#        define COMPILER_WORD_ALIGNED COMPILER_PRAGMA(data_alignment = 4)
+#    endif
 
 /**
  * \def __always_inline
@@ -133,15 +133,15 @@
  * heuristics and inline the function no matter how big it thinks it
  * becomes.
  */
-#        if !defined(__always_inline)
-#            if defined(__CC_ARM)
-#                define __always_inline __forceinline
-#            elif (defined __GNUC__)
-#                define __always_inline __attribute__((__always_inline__))
-#            elif (defined __ICCARM__)
-#                define __always_inline _Pragma("inline=forced")
-#            endif
+#    if !defined(__always_inline)
+#        if defined(__CC_ARM)
+#            define __always_inline __forceinline
+#        elif (defined __GNUC__)
+#            define __always_inline __attribute__((__always_inline__))
+#        elif (defined __ICCARM__)
+#            define __always_inline _Pragma("inline=forced")
 #        endif
+#    endif
 
 /**
  * \def __no_inline
@@ -151,13 +151,13 @@
  * heuristics and not inline the function no matter how small it thinks it
  * becomes.
  */
-#        if defined(__CC_ARM)
-#            define __no_inline __attribute__((noinline))
-#        elif (defined __GNUC__)
-#            define __no_inline __attribute__((noinline))
-#        elif (defined __ICCARM__)
-#            define __no_inline _Pragma("inline=never")
-#        endif
+#    if defined(__CC_ARM)
+#        define __no_inline __attribute__((noinline))
+#    elif (defined __GNUC__)
+#        define __no_inline __attribute__((noinline))
+#    elif (defined __ICCARM__)
+#        define __no_inline _Pragma("inline=never")
+#    endif
 
 /** \brief This macro is used to test fatal errors.
  *
@@ -168,47 +168,47 @@
  *
  * \param[in] expr  Expression to evaluate and supposed to be nonzero.
  */
-#        if defined(_ASSERT_ENABLE_)
-#            if defined(TEST_SUITE_DEFINE_ASSERT_MACRO)
-#                include "unit_test/suite.h"
-#            else
-#                undef TEST_SUITE_DEFINE_ASSERT_MACRO
-#                define Assert(expr)                 \
-                    {                                \
-                        if (!(expr)) asm("BKPT #0"); \
-                    }
-#            endif
+#    if defined(_ASSERT_ENABLE_)
+#        if defined(TEST_SUITE_DEFINE_ASSERT_MACRO)
+#            include "unit_test/suite.h"
 #        else
-#            define Assert(expr) ((void)0)
+#            undef TEST_SUITE_DEFINE_ASSERT_MACRO
+#            define Assert(expr)                 \
+                {                                \
+                    if (!(expr)) asm("BKPT #0"); \
+                }
 #        endif
+#    else
+#        define Assert(expr) ((void)0)
+#    endif
 
 /* Define WEAK attribute */
-#        if defined(__CC_ARM)
-#            define WEAK __attribute__((weak))
-#        elif defined(__ICCARM__)
-#            define WEAK __weak
-#        elif defined(__GNUC__)
-#            define WEAK __attribute__((weak))
-#        endif
+#    if defined(__CC_ARM)
+#        define WEAK __attribute__((weak))
+#    elif defined(__ICCARM__)
+#        define WEAK __weak
+#    elif defined(__GNUC__)
+#        define WEAK __attribute__((weak))
+#    endif
 
 /* Define NO_INIT attribute */
-#        if defined(__CC_ARM)
-#            define NO_INIT __attribute__((zero_init))
-#        elif defined(__ICCARM__)
-#            define NO_INIT __no_init
-#        elif defined(__GNUC__)
-#            define NO_INIT __attribute__((section(".no_init")))
-#        endif
+#    if defined(__CC_ARM)
+#        define NO_INIT __attribute__((zero_init))
+#    elif defined(__ICCARM__)
+#        define NO_INIT __no_init
+#    elif defined(__GNUC__)
+#        define NO_INIT __attribute__((section(".no_init")))
+#    endif
 
 //#include "interrupt.h"
 
 /** \name Usual Types
  * @{ */
-#        ifndef __cplusplus
-#            if !defined(__bool_true_false_are_defined)
+#    ifndef __cplusplus
+#        if !defined(__bool_true_false_are_defined)
 typedef unsigned char bool;
-#            endif
 #        endif
+#    endif
 typedef uint16_t le16_t;
 typedef uint16_t be16_t;
 typedef uint32_t le32_t;
@@ -347,22 +347,22 @@ typedef struct {
 
 /** @} */
 
-#    endif /* #ifndef __ASSEMBLY__ */
+#endif /* #ifndef __ASSEMBLY__ */
 
 /** \name Usual Constants
  * @{ */
 // kmod #define DISABLE   0
 // kmod #define ENABLE    1
 
-#    ifndef __cplusplus
-#        if !defined(__bool_true_false_are_defined)
-#            define false 0
-#            define true 1
-#        endif
+#ifndef __cplusplus
+#    if !defined(__bool_true_false_are_defined)
+#        define false 0
+#        define true 1
 #    endif
+#endif
 /** @} */
 
-#    ifndef __ASSEMBLY__
+#ifndef __ASSEMBLY__
 
 /** \name Optimization Control
  * @{ */
@@ -371,17 +371,17 @@ typedef struct {
  * \def likely(exp)
  * \brief The expression \a exp is likely to be true
  */
-#        if !defined(likely) || defined(__DOXYGEN__)
-#            define likely(exp) (exp)
-#        endif
+#    if !defined(likely) || defined(__DOXYGEN__)
+#        define likely(exp) (exp)
+#    endif
 
 /**
  * \def unlikely(exp)
  * \brief The expression \a exp is unlikely to be true
  */
-#        if !defined(unlikely) || defined(__DOXYGEN__)
-#            define unlikely(exp) (exp)
-#        endif
+#    if !defined(unlikely) || defined(__DOXYGEN__)
+#        define unlikely(exp) (exp)
+#    endif
 
 /**
  * \def is_constant(exp)
@@ -391,11 +391,11 @@ typedef struct {
  *
  * \return true if \a exp is constant, false otherwise.
  */
-#        if (defined __GNUC__) || (defined __CC_ARM)
-#            define is_constant(exp) __builtin_constant_p(exp)
-#        else
-#            define is_constant(exp) (0)
-#        endif
+#    if (defined __GNUC__) || (defined __CC_ARM)
+#        define is_constant(exp) __builtin_constant_p(exp)
+#    else
+#        define is_constant(exp) (0)
+#    endif
 
 /** @} */
 
@@ -409,7 +409,7 @@ typedef struct {
  *
  * \return Read bits.
  */
-#        define Rd_bits(value, mask) ((value) & (mask))
+#    define Rd_bits(value, mask) ((value) & (mask))
 
 /** \brief Writes the bits of a C lvalue specified by a given bit-mask.
  *
@@ -419,7 +419,7 @@ typedef struct {
  *
  * \return Resulting value with written bits.
  */
-#        define Wr_bits(lvalue, mask, bits) ((lvalue) = ((lvalue) & ~(mask)) | ((bits) & (mask)))
+#    define Wr_bits(lvalue, mask, bits) ((lvalue) = ((lvalue) & ~(mask)) | ((bits) & (mask)))
 
 /** \brief Tests the bits of a value specified by a given bit-mask.
  *
@@ -428,7 +428,7 @@ typedef struct {
  *
  * \return \c 1 if at least one of the tested bits is set, else \c 0.
  */
-#        define Tst_bits(value, mask) (Rd_bits(value, mask) != 0)
+#    define Tst_bits(value, mask) (Rd_bits(value, mask) != 0)
 
 /** \brief Clears the bits of a C lvalue specified by a given bit-mask.
  *
@@ -437,7 +437,7 @@ typedef struct {
  *
  * \return Resulting value with cleared bits.
  */
-#        define Clr_bits(lvalue, mask) ((lvalue) &= ~(mask))
+#    define Clr_bits(lvalue, mask) ((lvalue) &= ~(mask))
 
 /** \brief Sets the bits of a C lvalue specified by a given bit-mask.
  *
@@ -446,7 +446,7 @@ typedef struct {
  *
  * \return Resulting value with set bits.
  */
-#        define Set_bits(lvalue, mask) ((lvalue) |= (mask))
+#    define Set_bits(lvalue, mask) ((lvalue) |= (mask))
 
 /** \brief Toggles the bits of a C lvalue specified by a given bit-mask.
  *
@@ -455,7 +455,7 @@ typedef struct {
  *
  * \return Resulting value with toggled bits.
  */
-#        define Tgl_bits(lvalue, mask) ((lvalue) ^= (mask))
+#    define Tgl_bits(lvalue, mask) ((lvalue) ^= (mask))
 
 /** \brief Reads the bit-field of a value specified by a given bit-mask.
  *
@@ -464,7 +464,7 @@ typedef struct {
  *
  * \return Read bit-field.
  */
-#        define Rd_bitfield(value, mask) (Rd_bits(value, mask) >> ctz(mask))
+#    define Rd_bitfield(value, mask) (Rd_bits(value, mask) >> ctz(mask))
 
 /** \brief Writes the bit-field of a C lvalue specified by a given bit-mask.
  *
@@ -474,7 +474,7 @@ typedef struct {
  *
  * \return Resulting value with written bit-field.
  */
-#        define Wr_bitfield(lvalue, mask, bitfield) (Wr_bits(lvalue, mask, (uint32_t)(bitfield) << ctz(mask)))
+#    define Wr_bitfield(lvalue, mask, bitfield) (Wr_bits(lvalue, mask, (uint32_t)(bitfield) << ctz(mask)))
 
 /** @} */
 
@@ -498,11 +498,11 @@ typedef struct {
  *
  * \return The count of leading zero bits in \a u.
  */
-#        if (defined __GNUC__) || (defined __CC_ARM)
-#            define clz(u) ((u) ? __builtin_clz(u) : 32)
-#        else
-#            define clz(u) (((u) == 0) ? 32 : ((u) & (1ul << 31)) ? 0 : ((u) & (1ul << 30)) ? 1 : ((u) & (1ul << 29)) ? 2 : ((u) & (1ul << 28)) ? 3 : ((u) & (1ul << 27)) ? 4 : ((u) & (1ul << 26)) ? 5 : ((u) & (1ul << 25)) ? 6 : ((u) & (1ul << 24)) ? 7 : ((u) & (1ul << 23)) ? 8 : ((u) & (1ul << 22)) ? 9 : ((u) & (1ul << 21)) ? 10 : ((u) & (1ul << 20)) ? 11 : ((u) & (1ul << 19)) ? 12 : ((u) & (1ul << 18)) ? 13 : ((u) & (1ul << 17)) ? 14 : ((u) & (1ul << 16)) ? 15 : ((u) & (1ul << 15)) ? 16 : ((u) & (1ul << 14)) ? 17 : ((u) & (1ul << 13)) ? 18 : ((u) & (1ul << 12)) ? 19 : ((u) & (1ul << 11)) ? 20 : ((u) & (1ul << 10)) ? 21 : ((u) & (1ul << 9)) ? 22 : ((u) & (1ul << 8)) ? 23 : ((u) & (1ul << 7)) ? 24 : ((u) & (1ul << 6)) ? 25 : ((u) & (1ul << 5)) ? 26 : ((u) & (1ul << 4)) ? 27 : ((u) & (1ul << 3)) ? 28 : ((u) & (1ul << 2)) ? 29 : ((u) & (1ul << 1)) ? 30 : 31)
-#        endif
+#    if (defined __GNUC__) || (defined __CC_ARM)
+#        define clz(u) ((u) ? __builtin_clz(u) : 32)
+#    else
+#        define clz(u) (((u) == 0) ? 32 : ((u) & (1ul << 31)) ? 0 : ((u) & (1ul << 30)) ? 1 : ((u) & (1ul << 29)) ? 2 : ((u) & (1ul << 28)) ? 3 : ((u) & (1ul << 27)) ? 4 : ((u) & (1ul << 26)) ? 5 : ((u) & (1ul << 25)) ? 6 : ((u) & (1ul << 24)) ? 7 : ((u) & (1ul << 23)) ? 8 : ((u) & (1ul << 22)) ? 9 : ((u) & (1ul << 21)) ? 10 : ((u) & (1ul << 20)) ? 11 : ((u) & (1ul << 19)) ? 12 : ((u) & (1ul << 18)) ? 13 : ((u) & (1ul << 17)) ? 14 : ((u) & (1ul << 16)) ? 15 : ((u) & (1ul << 15)) ? 16 : ((u) & (1ul << 14)) ? 17 : ((u) & (1ul << 13)) ? 18 : ((u) & (1ul << 12)) ? 19 : ((u) & (1ul << 11)) ? 20 : ((u) & (1ul << 10)) ? 21 : ((u) & (1ul << 9)) ? 22 : ((u) & (1ul << 8)) ? 23 : ((u) & (1ul << 7)) ? 24 : ((u) & (1ul << 6)) ? 25 : ((u) & (1ul << 5)) ? 26 : ((u) & (1ul << 4)) ? 27 : ((u) & (1ul << 3)) ? 28 : ((u) & (1ul << 2)) ? 29 : ((u) & (1ul << 1)) ? 30 : 31)
+#    endif
 
 /** \brief Counts the trailing zero bits of the given value considered as a 32-bit integer.
  *
@@ -510,11 +510,11 @@ typedef struct {
  *
  * \return The count of trailing zero bits in \a u.
  */
-#        if (defined __GNUC__) || (defined __CC_ARM)
-#            define ctz(u) ((u) ? __builtin_ctz(u) : 32)
-#        else
-#            define ctz(u) ((u) & (1ul << 0) ? 0 : (u) & (1ul << 1) ? 1 : (u) & (1ul << 2) ? 2 : (u) & (1ul << 3) ? 3 : (u) & (1ul << 4) ? 4 : (u) & (1ul << 5) ? 5 : (u) & (1ul << 6) ? 6 : (u) & (1ul << 7) ? 7 : (u) & (1ul << 8) ? 8 : (u) & (1ul << 9) ? 9 : (u) & (1ul << 10) ? 10 : (u) & (1ul << 11) ? 11 : (u) & (1ul << 12) ? 12 : (u) & (1ul << 13) ? 13 : (u) & (1ul << 14) ? 14 : (u) & (1ul << 15) ? 15 : (u) & (1ul << 16) ? 16 : (u) & (1ul << 17) ? 17 : (u) & (1ul << 18) ? 18 : (u) & (1ul << 19) ? 19 : (u) & (1ul << 20) ? 20 : (u) & (1ul << 21) ? 21 : (u) & (1ul << 22) ? 22 : (u) & (1ul << 23) ? 23 : (u) & (1ul << 24) ? 24 : (u) & (1ul << 25) ? 25 : (u) & (1ul << 26) ? 26 : (u) & (1ul << 27) ? 27 : (u) & (1ul << 28) ? 28 : (u) & (1ul << 29) ? 29 : (u) & (1ul << 30) ? 30 : (u) & (1ul << 31) ? 31 : 32)
-#        endif
+#    if (defined __GNUC__) || (defined __CC_ARM)
+#        define ctz(u) ((u) ? __builtin_ctz(u) : 32)
+#    else
+#        define ctz(u) ((u) & (1ul << 0) ? 0 : (u) & (1ul << 1) ? 1 : (u) & (1ul << 2) ? 2 : (u) & (1ul << 3) ? 3 : (u) & (1ul << 4) ? 4 : (u) & (1ul << 5) ? 5 : (u) & (1ul << 6) ? 6 : (u) & (1ul << 7) ? 7 : (u) & (1ul << 8) ? 8 : (u) & (1ul << 9) ? 9 : (u) & (1ul << 10) ? 10 : (u) & (1ul << 11) ? 11 : (u) & (1ul << 12) ? 12 : (u) & (1ul << 13) ? 13 : (u) & (1ul << 14) ? 14 : (u) & (1ul << 15) ? 15 : (u) & (1ul << 16) ? 16 : (u) & (1ul << 17) ? 17 : (u) & (1ul << 18) ? 18 : (u) & (1ul << 19) ? 19 : (u) & (1ul << 20) ? 20 : (u) & (1ul << 21) ? 21 : (u) & (1ul << 22) ? 22 : (u) & (1ul << 23) ? 23 : (u) & (1ul << 24) ? 24 : (u) & (1ul << 25) ? 25 : (u) & (1ul << 26) ? 26 : (u) & (1ul << 27) ? 27 : (u) & (1ul << 28) ? 28 : (u) & (1ul << 29) ? 29 : (u) & (1ul << 30) ? 30 : (u) & (1ul << 31) ? 31 : 32)
+#    endif
 
 /** @} */
 
@@ -527,7 +527,7 @@ typedef struct {
  *
  * \return Value resulting from \a u8 with reversed bits.
  */
-#        define bit_reverse8(u8) ((U8)(bit_reverse32((U8)(u8)) >> 24))
+#    define bit_reverse8(u8) ((U8)(bit_reverse32((U8)(u8)) >> 24))
 
 /** \brief Reverses the bits of \a u16.
  *
@@ -535,7 +535,7 @@ typedef struct {
  *
  * \return Value resulting from \a u16 with reversed bits.
  */
-#        define bit_reverse16(u16) ((uint16_t)(bit_reverse32((uint16_t)(u16)) >> 16))
+#    define bit_reverse16(u16) ((uint16_t)(bit_reverse32((uint16_t)(u16)) >> 16))
 
 /** \brief Reverses the bits of \a u32.
  *
@@ -543,7 +543,7 @@ typedef struct {
  *
  * \return Value resulting from \a u32 with reversed bits.
  */
-#        define bit_reverse32(u32) __RBIT(u32)
+#    define bit_reverse32(u32) __RBIT(u32)
 
 /** \brief Reverses the bits of \a u64.
  *
@@ -551,7 +551,7 @@ typedef struct {
  *
  * \return Value resulting from \a u64 with reversed bits.
  */
-#        define bit_reverse64(u64) ((uint64_t)(((uint64_t)bit_reverse32((uint64_t)(u64) >> 32)) | ((uint64_t)bit_reverse32((uint64_t)(u64)) << 32)))
+#    define bit_reverse64(u64) ((uint64_t)(((uint64_t)bit_reverse32((uint64_t)(u64) >> 32)) | ((uint64_t)bit_reverse32((uint64_t)(u64)) << 32)))
 
 /** @} */
 
@@ -565,7 +565,7 @@ typedef struct {
  *
  * \return \c 1 if the number \a val is aligned with the \a n boundary, else \c 0.
  */
-#        define Test_align(val, n) (!Tst_bits(val, (n)-1))
+#    define Test_align(val, n) (!Tst_bits(val, (n)-1))
 
 /** \brief Gets alignment of the number \a val with respect to the \a n boundary.
  *
@@ -574,7 +574,7 @@ typedef struct {
  *
  * \return Alignment of the number \a val with respect to the \a n boundary.
  */
-#        define Get_align(val, n) (Rd_bits(val, (n)-1))
+#    define Get_align(val, n) (Rd_bits(val, (n)-1))
 
 /** \brief Sets alignment of the lvalue number \a lval to \a alg with respect to the \a n boundary.
  *
@@ -584,7 +584,7 @@ typedef struct {
  *
  * \return New value of \a lval resulting from its alignment set to \a alg with respect to the \a n boundary.
  */
-#        define Set_align(lval, n, alg) (Wr_bits(lval, (n)-1, alg))
+#    define Set_align(lval, n, alg) (Wr_bits(lval, (n)-1, alg))
 
 /** \brief Aligns the number \a val with the upper \a n boundary.
  *
@@ -593,7 +593,7 @@ typedef struct {
  *
  * \return Value resulting from the number \a val aligned with the upper \a n boundary.
  */
-#        define Align_up(val, n) (((val) + ((n)-1)) & ~((n)-1))
+#    define Align_up(val, n) (((val) + ((n)-1)) & ~((n)-1))
 
 /** \brief Aligns the number \a val with the lower \a n boundary.
  *
@@ -602,7 +602,7 @@ typedef struct {
  *
  * \return Value resulting from the number \a val aligned with the lower \a n boundary.
  */
-#        define Align_down(val, n) ((val) & ~((n)-1))
+#    define Align_down(val, n) ((val) & ~((n)-1))
 
 /** @} */
 
@@ -627,9 +627,9 @@ typedef struct {
  *
  * \note More optimized if only used with values known at compile time.
  */
-#        define Abs(a) (((a) < 0) ? -(a) : (a))
+#    define Abs(a) (((a) < 0) ? -(a) : (a))
 
-#        ifndef __cplusplus
+#    ifndef __cplusplus
 /** \brief Takes the minimal value of \a a and \a b.
  *
  * \param[in] a Input value.
@@ -639,7 +639,7 @@ typedef struct {
  *
  * \note More optimized if only used with values known at compile time.
  */
-#            define Min(a, b) (((a) < (b)) ? (a) : (b))
+#        define Min(a, b) (((a) < (b)) ? (a) : (b))
 
 /** \brief Takes the maximal value of \a a and \a b.
  *
@@ -650,7 +650,7 @@ typedef struct {
  *
  * \note More optimized if only used with values known at compile time.
  */
-#            define Max(a, b) (((a) > (b)) ? (a) : (b))
+#        define Max(a, b) (((a) > (b)) ? (a) : (b))
 
 /** \brief Takes the minimal value of \a a and \a b.
  *
@@ -661,7 +661,7 @@ typedef struct {
  *
  * \note More optimized if only used with values unknown at compile time.
  */
-#            define min(a, b) Min(a, b)
+#        define min(a, b) Min(a, b)
 
 /** \brief Takes the maximal value of \a a and \a b.
  *
@@ -672,8 +672,8 @@ typedef struct {
  *
  * \note More optimized if only used with values unknown at compile time.
  */
-#            define max(a, b) Max(a, b)
-#        endif
+#        define max(a, b) Max(a, b)
+#    endif
 
 /** @} */
 
@@ -688,34 +688,34 @@ typedef struct {
  *
  * \note It may be used as a long jump opcode in some special cases.
  */
-#        define Long_call(addr) ((*(void (*)(void))(addr))())
+#    define Long_call(addr) ((*(void (*)(void))(addr))())
 
 /** \name MCU Endianism Handling
  *  ARM is MCU little endian.
  *
  * @{ */
-#        define BE16(x) swap16(x)
-#        define LE16(x) (x)
+#    define BE16(x) swap16(x)
+#    define LE16(x) (x)
 
-#        define le16_to_cpu(x) (x)
-#        define cpu_to_le16(x) (x)
-#        define LE16_TO_CPU(x) (x)
-#        define CPU_TO_LE16(x) (x)
+#    define le16_to_cpu(x) (x)
+#    define cpu_to_le16(x) (x)
+#    define LE16_TO_CPU(x) (x)
+#    define CPU_TO_LE16(x) (x)
 
-#        define be16_to_cpu(x) swap16(x)
-#        define cpu_to_be16(x) swap16(x)
-#        define BE16_TO_CPU(x) swap16(x)
-#        define CPU_TO_BE16(x) swap16(x)
+#    define be16_to_cpu(x) swap16(x)
+#    define cpu_to_be16(x) swap16(x)
+#    define BE16_TO_CPU(x) swap16(x)
+#    define CPU_TO_BE16(x) swap16(x)
 
-#        define le32_to_cpu(x) (x)
-#        define cpu_to_le32(x) (x)
-#        define LE32_TO_CPU(x) (x)
-#        define CPU_TO_LE32(x) (x)
+#    define le32_to_cpu(x) (x)
+#    define cpu_to_le32(x) (x)
+#    define LE32_TO_CPU(x) (x)
+#    define CPU_TO_LE32(x) (x)
 
-#        define be32_to_cpu(x) swap32(x)
-#        define cpu_to_be32(x) swap32(x)
-#        define BE32_TO_CPU(x) swap32(x)
-#        define CPU_TO_BE32(x) swap32(x)
+#    define be32_to_cpu(x) swap32(x)
+#    define cpu_to_be32(x) swap32(x)
+#    define BE32_TO_CPU(x) swap32(x)
+#    define CPU_TO_BE32(x) swap32(x)
 /** @} */
 
 /** \name Endianism Conversion
@@ -738,7 +738,7 @@ typedef struct {
  *
  * \note More optimized if only used with values known at compile time.
  */
-#        define Swap16(u16) ((uint16_t)(((uint16_t)(u16) >> 8) | ((uint16_t)(u16) << 8)))
+#    define Swap16(u16) ((uint16_t)(((uint16_t)(u16) >> 8) | ((uint16_t)(u16) << 8)))
 
 /** \brief Toggles the endianism of \a u32 (by swapping its bytes).
  *
@@ -748,7 +748,7 @@ typedef struct {
  *
  * \note More optimized if only used with values known at compile time.
  */
-#        define Swap32(u32) ((uint32_t)(((uint32_t)Swap16((uint32_t)(u32) >> 16)) | ((uint32_t)Swap16((uint32_t)(u32)) << 16)))
+#    define Swap32(u32) ((uint32_t)(((uint32_t)Swap16((uint32_t)(u32) >> 16)) | ((uint32_t)Swap16((uint32_t)(u32)) << 16)))
 
 /** \brief Toggles the endianism of \a u64 (by swapping its bytes).
  *
@@ -758,7 +758,7 @@ typedef struct {
  *
  * \note More optimized if only used with values known at compile time.
  */
-#        define Swap64(u64) ((uint64_t)(((uint64_t)Swap32((uint64_t)(u64) >> 32)) | ((uint64_t)Swap32((uint64_t)(u64)) << 32)))
+#    define Swap64(u64) ((uint64_t)(((uint64_t)Swap32((uint64_t)(u64) >> 32)) | ((uint64_t)Swap32((uint64_t)(u64)) << 32)))
 
 /** \brief Toggles the endianism of \a u16 (by swapping its bytes).
  *
@@ -768,7 +768,7 @@ typedef struct {
  *
  * \note More optimized if only used with values unknown at compile time.
  */
-#        define swap16(u16) Swap16(u16)
+#    define swap16(u16) Swap16(u16)
 
 /** \brief Toggles the endianism of \a u32 (by swapping its bytes).
  *
@@ -778,11 +778,11 @@ typedef struct {
  *
  * \note More optimized if only used with values unknown at compile time.
  */
-#        if (defined __GNUC__)
-#            define swap32(u32) ((uint32_t)__builtin_bswap32((uint32_t)(u32)))
-#        else
-#            define swap32(u32) Swap32(u32)
-#        endif
+#    if (defined __GNUC__)
+#        define swap32(u32) ((uint32_t)__builtin_bswap32((uint32_t)(u32)))
+#    else
+#        define swap32(u32) Swap32(u32)
+#    endif
 
 /** \brief Toggles the endianism of \a u64 (by swapping its bytes).
  *
@@ -792,11 +792,11 @@ typedef struct {
  *
  * \note More optimized if only used with values unknown at compile time.
  */
-#        if (defined __GNUC__)
-#            define swap64(u64) ((uint64_t)__builtin_bswap64((uint64_t)(u64)))
-#        else
-#            define swap64(u64) ((uint64_t)(((uint64_t)swap32((uint64_t)(u64) >> 32)) | ((uint64_t)swap32((uint64_t)(u64)) << 32)))
-#        endif
+#    if (defined __GNUC__)
+#        define swap64(u64) ((uint64_t)__builtin_bswap64((uint64_t)(u64)))
+#    else
+#        define swap64(u64) ((uint64_t)(((uint64_t)swap32((uint64_t)(u64) >> 32)) | ((uint64_t)swap32((uint64_t)(u64)) << 32)))
+#    endif
 
 /** @} */
 
@@ -804,16 +804,16 @@ typedef struct {
  *
  * @{ */
 
-#        define _GLOBEXT_ extern   /**< extern storage-class specifier. */
-#        define _CONST_TYPE_ const /**< const type qualifier. */
-#        define _MEM_TYPE_SLOW_    /**< Slow memory type. */
-#        define _MEM_TYPE_MEDFAST_ /**< Fairly fast memory type. */
-#        define _MEM_TYPE_FAST_    /**< Fast memory type. */
+#    define _GLOBEXT_ extern   /**< extern storage-class specifier. */
+#    define _CONST_TYPE_ const /**< const type qualifier. */
+#    define _MEM_TYPE_SLOW_    /**< Slow memory type. */
+#    define _MEM_TYPE_MEDFAST_ /**< Fairly fast memory type. */
+#    define _MEM_TYPE_FAST_    /**< Fast memory type. */
 
-#        define memcmp_ram2ram memcmp  /**< Target-specific memcmp of RAM to RAM. */
-#        define memcmp_code2ram memcmp /**< Target-specific memcmp of RAM to NVRAM. */
-#        define memcpy_ram2ram memcpy  /**< Target-specific memcpy from RAM to RAM. */
-#        define memcpy_code2ram memcpy /**< Target-specific memcpy from NVRAM to RAM. */
+#    define memcmp_ram2ram memcmp  /**< Target-specific memcmp of RAM to RAM. */
+#    define memcmp_code2ram memcmp /**< Target-specific memcmp of RAM to NVRAM. */
+#    define memcpy_ram2ram memcpy  /**< Target-specific memcpy from RAM to RAM. */
+#    define memcpy_code2ram memcpy /**< Target-specific memcpy from NVRAM to RAM. */
 
 /** @} */
 
@@ -826,51 +826,51 @@ typedef struct {
  *
  * \return (\a a / \a b) rounded up to the nearest integer.
  */
-#        define div_ceil(a, b) (((a) + (b)-1) / (b))
+#    define div_ceil(a, b) (((a) + (b)-1) / (b))
 
-#    endif /* #ifndef __ASSEMBLY__ */
-#    ifdef __ICCARM__
+#endif /* #ifndef __ASSEMBLY__ */
+#ifdef __ICCARM__
 /** \name Compiler Keywords
  *
  * Port of some keywords from GCC to IAR Embedded Workbench.
  *
  * @{ */
 
-#        define __asm__ asm
-#        define __inline__ inline
-#        define __volatile__
+#    define __asm__ asm
+#    define __inline__ inline
+#    define __volatile__
 
 /** @} */
 
-#    endif
+#endif
 
-#    define FUNC_PTR void *
+#define FUNC_PTR void *
 /**
  * \def unused
  * \brief Marking \a v as a unused parameter or value.
  */
-#    define unused(v)  \
-        do {           \
-            (void)(v); \
-        } while (0)
+#define unused(v)  \
+    do {           \
+        (void)(v); \
+    } while (0)
 
 /* Define RAMFUNC attribute */
-#    if defined(__CC_ARM) /* Keil uVision 4 */
-#        define RAMFUNC __attribute__((section(".ramfunc")))
-#    elif defined(__ICCARM__) /* IAR Ewarm 5.41+ */
-#        define RAMFUNC __ramfunc
-#    elif defined(__GNUC__) /* GCC CS3 2009q3-68 */
-#        define RAMFUNC __attribute__((section(".ramfunc")))
-#    endif
+#if defined(__CC_ARM) /* Keil uVision 4 */
+#    define RAMFUNC __attribute__((section(".ramfunc")))
+#elif defined(__ICCARM__) /* IAR Ewarm 5.41+ */
+#    define RAMFUNC __ramfunc
+#elif defined(__GNUC__) /* GCC CS3 2009q3-68 */
+#    define RAMFUNC __attribute__((section(".ramfunc")))
+#endif
 
 /* Define OPTIMIZE_HIGH attribute */
-#    if defined(__CC_ARM) /* Keil uVision 4 */
-#        define OPTIMIZE_HIGH _Pragma("O3")
-#    elif defined(__ICCARM__) /* IAR Ewarm 5.41+ */
-#        define OPTIMIZE_HIGH _Pragma("optimize=high")
-#    elif defined(__GNUC__) /* GCC CS3 2009q3-68 */
-#        define OPTIMIZE_HIGH __attribute__((optimize("s")))
-#    endif
+#if defined(__CC_ARM) /* Keil uVision 4 */
+#    define OPTIMIZE_HIGH _Pragma("O3")
+#elif defined(__ICCARM__) /* IAR Ewarm 5.41+ */
+#    define OPTIMIZE_HIGH _Pragma("optimize=high")
+#elif defined(__GNUC__) /* GCC CS3 2009q3-68 */
+#    define OPTIMIZE_HIGH __attribute__((optimize("s")))
+#endif
 // kmod #define PASS      0
 // kmod #define FAIL      1
 // kmod #define LOW       0
@@ -887,101 +887,101 @@ typedef uint64_t U64; //!< 64-bit unsigned integer.
 typedef float    F32; //!< 32-bit floating-point number.
 typedef double   F64; //!< 64-bit floating-point number.
 
-#    define MSB(u16) (((U8 *)&(u16))[1]) //!< Most significant byte of \a u16.
-#    define LSB(u16) (((U8 *)&(u16))[0]) //!< Least significant byte of \a u16.
+#define MSB(u16) (((U8 *)&(u16))[1]) //!< Most significant byte of \a u16.
+#define LSB(u16) (((U8 *)&(u16))[0]) //!< Least significant byte of \a u16.
 
-#    define MSH(u32) (((U16 *)&(u32))[1])  //!< Most significant half-word of \a u32.
-#    define LSH(u32) (((U16 *)&(u32))[0])  //!< Least significant half-word of \a u32.
-#    define MSB0W(u32) (((U8 *)&(u32))[3]) //!< Most significant byte of 1st rank of \a u32.
-#    define MSB1W(u32) (((U8 *)&(u32))[2]) //!< Most significant byte of 2nd rank of \a u32.
-#    define MSB2W(u32) (((U8 *)&(u32))[1]) //!< Most significant byte of 3rd rank of \a u32.
-#    define MSB3W(u32) (((U8 *)&(u32))[0]) //!< Most significant byte of 4th rank of \a u32.
-#    define LSB3W(u32) MSB0W(u32)          //!< Least significant byte of 4th rank of \a u32.
-#    define LSB2W(u32) MSB1W(u32)          //!< Least significant byte of 3rd rank of \a u32.
-#    define LSB1W(u32) MSB2W(u32)          //!< Least significant byte of 2nd rank of \a u32.
-#    define LSB0W(u32) MSB3W(u32)          //!< Least significant byte of 1st rank of \a u32.
+#define MSH(u32) (((U16 *)&(u32))[1])  //!< Most significant half-word of \a u32.
+#define LSH(u32) (((U16 *)&(u32))[0])  //!< Least significant half-word of \a u32.
+#define MSB0W(u32) (((U8 *)&(u32))[3]) //!< Most significant byte of 1st rank of \a u32.
+#define MSB1W(u32) (((U8 *)&(u32))[2]) //!< Most significant byte of 2nd rank of \a u32.
+#define MSB2W(u32) (((U8 *)&(u32))[1]) //!< Most significant byte of 3rd rank of \a u32.
+#define MSB3W(u32) (((U8 *)&(u32))[0]) //!< Most significant byte of 4th rank of \a u32.
+#define LSB3W(u32) MSB0W(u32)          //!< Least significant byte of 4th rank of \a u32.
+#define LSB2W(u32) MSB1W(u32)          //!< Least significant byte of 3rd rank of \a u32.
+#define LSB1W(u32) MSB2W(u32)          //!< Least significant byte of 2nd rank of \a u32.
+#define LSB0W(u32) MSB3W(u32)          //!< Least significant byte of 1st rank of \a u32.
 
-#    define MSW(u64) (((U32 *)&(u64))[1])  //!< Most significant word of \a u64.
-#    define LSW(u64) (((U32 *)&(u64))[0])  //!< Least significant word of \a u64.
-#    define MSH0(u64) (((U16 *)&(u64))[3]) //!< Most significant half-word of 1st rank of \a u64.
-#    define MSH1(u64) (((U16 *)&(u64))[2]) //!< Most significant half-word of 2nd rank of \a u64.
-#    define MSH2(u64) (((U16 *)&(u64))[1]) //!< Most significant half-word of 3rd rank of \a u64.
-#    define MSH3(u64) (((U16 *)&(u64))[0]) //!< Most significant half-word of 4th rank of \a u64.
-#    define LSH3(u64) MSH0(u64)            //!< Least significant half-word of 4th rank of \a u64.
-#    define LSH2(u64) MSH1(u64)            //!< Least significant half-word of 3rd rank of \a u64.
-#    define LSH1(u64) MSH2(u64)            //!< Least significant half-word of 2nd rank of \a u64.
-#    define LSH0(u64) MSH3(u64)            //!< Least significant half-word of 1st rank of \a u64.
-#    define MSB0D(u64) (((U8 *)&(u64))[7]) //!< Most significant byte of 1st rank of \a u64.
-#    define MSB1D(u64) (((U8 *)&(u64))[6]) //!< Most significant byte of 2nd rank of \a u64.
-#    define MSB2D(u64) (((U8 *)&(u64))[5]) //!< Most significant byte of 3rd rank of \a u64.
-#    define MSB3D(u64) (((U8 *)&(u64))[4]) //!< Most significant byte of 4th rank of \a u64.
-#    define MSB4D(u64) (((U8 *)&(u64))[3]) //!< Most significant byte of 5th rank of \a u64.
-#    define MSB5D(u64) (((U8 *)&(u64))[2]) //!< Most significant byte of 6th rank of \a u64.
-#    define MSB6D(u64) (((U8 *)&(u64))[1]) //!< Most significant byte of 7th rank of \a u64.
-#    define MSB7D(u64) (((U8 *)&(u64))[0]) //!< Most significant byte of 8th rank of \a u64.
-#    define LSB7D(u64) MSB0D(u64)          //!< Least significant byte of 8th rank of \a u64.
-#    define LSB6D(u64) MSB1D(u64)          //!< Least significant byte of 7th rank of \a u64.
-#    define LSB5D(u64) MSB2D(u64)          //!< Least significant byte of 6th rank of \a u64.
-#    define LSB4D(u64) MSB3D(u64)          //!< Least significant byte of 5th rank of \a u64.
-#    define LSB3D(u64) MSB4D(u64)          //!< Least significant byte of 4th rank of \a u64.
-#    define LSB2D(u64) MSB5D(u64)          //!< Least significant byte of 3rd rank of \a u64.
-#    define LSB1D(u64) MSB6D(u64)          //!< Least significant byte of 2nd rank of \a u64.
-#    define LSB0D(u64) MSB7D(u64)          //!< Least significant byte of 1st rank of \a u64.
+#define MSW(u64) (((U32 *)&(u64))[1])  //!< Most significant word of \a u64.
+#define LSW(u64) (((U32 *)&(u64))[0])  //!< Least significant word of \a u64.
+#define MSH0(u64) (((U16 *)&(u64))[3]) //!< Most significant half-word of 1st rank of \a u64.
+#define MSH1(u64) (((U16 *)&(u64))[2]) //!< Most significant half-word of 2nd rank of \a u64.
+#define MSH2(u64) (((U16 *)&(u64))[1]) //!< Most significant half-word of 3rd rank of \a u64.
+#define MSH3(u64) (((U16 *)&(u64))[0]) //!< Most significant half-word of 4th rank of \a u64.
+#define LSH3(u64) MSH0(u64)            //!< Least significant half-word of 4th rank of \a u64.
+#define LSH2(u64) MSH1(u64)            //!< Least significant half-word of 3rd rank of \a u64.
+#define LSH1(u64) MSH2(u64)            //!< Least significant half-word of 2nd rank of \a u64.
+#define LSH0(u64) MSH3(u64)            //!< Least significant half-word of 1st rank of \a u64.
+#define MSB0D(u64) (((U8 *)&(u64))[7]) //!< Most significant byte of 1st rank of \a u64.
+#define MSB1D(u64) (((U8 *)&(u64))[6]) //!< Most significant byte of 2nd rank of \a u64.
+#define MSB2D(u64) (((U8 *)&(u64))[5]) //!< Most significant byte of 3rd rank of \a u64.
+#define MSB3D(u64) (((U8 *)&(u64))[4]) //!< Most significant byte of 4th rank of \a u64.
+#define MSB4D(u64) (((U8 *)&(u64))[3]) //!< Most significant byte of 5th rank of \a u64.
+#define MSB5D(u64) (((U8 *)&(u64))[2]) //!< Most significant byte of 6th rank of \a u64.
+#define MSB6D(u64) (((U8 *)&(u64))[1]) //!< Most significant byte of 7th rank of \a u64.
+#define MSB7D(u64) (((U8 *)&(u64))[0]) //!< Most significant byte of 8th rank of \a u64.
+#define LSB7D(u64) MSB0D(u64)          //!< Least significant byte of 8th rank of \a u64.
+#define LSB6D(u64) MSB1D(u64)          //!< Least significant byte of 7th rank of \a u64.
+#define LSB5D(u64) MSB2D(u64)          //!< Least significant byte of 6th rank of \a u64.
+#define LSB4D(u64) MSB3D(u64)          //!< Least significant byte of 5th rank of \a u64.
+#define LSB3D(u64) MSB4D(u64)          //!< Least significant byte of 4th rank of \a u64.
+#define LSB2D(u64) MSB5D(u64)          //!< Least significant byte of 3rd rank of \a u64.
+#define LSB1D(u64) MSB6D(u64)          //!< Least significant byte of 2nd rank of \a u64.
+#define LSB0D(u64) MSB7D(u64)          //!< Least significant byte of 1st rank of \a u64.
 
-#    define LSB0(u32) LSB0W(u32) //!< Least significant byte of 1st rank of \a u32.
-#    define LSB1(u32) LSB1W(u32) //!< Least significant byte of 2nd rank of \a u32.
-#    define LSB2(u32) LSB2W(u32) //!< Least significant byte of 3rd rank of \a u32.
-#    define LSB3(u32) LSB3W(u32) //!< Least significant byte of 4th rank of \a u32.
-#    define MSB3(u32) MSB3W(u32) //!< Most significant byte of 4th rank of \a u32.
-#    define MSB2(u32) MSB2W(u32) //!< Most significant byte of 3rd rank of \a u32.
-#    define MSB1(u32) MSB1W(u32) //!< Most significant byte of 2nd rank of \a u32.
-#    define MSB0(u32) MSB0W(u32) //!< Most significant byte of 1st rank of \a u32.
+#define LSB0(u32) LSB0W(u32) //!< Least significant byte of 1st rank of \a u32.
+#define LSB1(u32) LSB1W(u32) //!< Least significant byte of 2nd rank of \a u32.
+#define LSB2(u32) LSB2W(u32) //!< Least significant byte of 3rd rank of \a u32.
+#define LSB3(u32) LSB3W(u32) //!< Least significant byte of 4th rank of \a u32.
+#define MSB3(u32) MSB3W(u32) //!< Most significant byte of 4th rank of \a u32.
+#define MSB2(u32) MSB2W(u32) //!< Most significant byte of 3rd rank of \a u32.
+#define MSB1(u32) MSB1W(u32) //!< Most significant byte of 2nd rank of \a u32.
+#define MSB0(u32) MSB0W(u32) //!< Most significant byte of 1st rank of \a u32.
 
-#    if defined(__ICCARM__)
-#        define SHORTENUM __packed
-#    elif defined(__GNUC__)
-#        define SHORTENUM __attribute__((packed))
-#    endif
+#if defined(__ICCARM__)
+#    define SHORTENUM __packed
+#elif defined(__GNUC__)
+#    define SHORTENUM __attribute__((packed))
+#endif
 
 /* No operation */
-#    if defined(__ICCARM__)
-#        define nop() __no_operation()
-#    elif defined(__GNUC__)
-#        define nop() (__NOP())
-#    endif
+#if defined(__ICCARM__)
+#    define nop() __no_operation()
+#elif defined(__GNUC__)
+#    define nop() (__NOP())
+#endif
 
-#    define FLASH_DECLARE(x) const x
-#    define FLASH_EXTERN(x) extern const x
-#    define PGM_READ_BYTE(x) *(x)
-#    define PGM_READ_WORD(x) *(x)
-#    define MEMCPY_ENDIAN memcpy
-#    define PGM_READ_BLOCK(dst, src, len) memcpy((dst), (src), (len))
+#define FLASH_DECLARE(x) const x
+#define FLASH_EXTERN(x) extern const x
+#define PGM_READ_BYTE(x) *(x)
+#define PGM_READ_WORD(x) *(x)
+#define MEMCPY_ENDIAN memcpy
+#define PGM_READ_BLOCK(dst, src, len) memcpy((dst), (src), (len))
 
 /*Defines the Flash Storage for the request and response of MAC*/
-#    define CMD_ID_OCTET (0)
+#define CMD_ID_OCTET (0)
 
 /* Converting of values from CPU endian to little endian. */
-#    define CPU_ENDIAN_TO_LE16(x) (x)
-#    define CPU_ENDIAN_TO_LE32(x) (x)
-#    define CPU_ENDIAN_TO_LE64(x) (x)
+#define CPU_ENDIAN_TO_LE16(x) (x)
+#define CPU_ENDIAN_TO_LE32(x) (x)
+#define CPU_ENDIAN_TO_LE64(x) (x)
 
 /* Converting of values from little endian to CPU endian. */
-#    define LE16_TO_CPU_ENDIAN(x) (x)
-#    define LE32_TO_CPU_ENDIAN(x) (x)
-#    define LE64_TO_CPU_ENDIAN(x) (x)
+#define LE16_TO_CPU_ENDIAN(x) (x)
+#define LE32_TO_CPU_ENDIAN(x) (x)
+#define LE64_TO_CPU_ENDIAN(x) (x)
 
 /* Converting of constants from little endian to CPU endian. */
-#    define CLE16_TO_CPU_ENDIAN(x) (x)
-#    define CLE32_TO_CPU_ENDIAN(x) (x)
-#    define CLE64_TO_CPU_ENDIAN(x) (x)
+#define CLE16_TO_CPU_ENDIAN(x) (x)
+#define CLE32_TO_CPU_ENDIAN(x) (x)
+#define CLE64_TO_CPU_ENDIAN(x) (x)
 
 /* Converting of constants from CPU endian to little endian. */
-#    define CCPU_ENDIAN_TO_LE16(x) (x)
-#    define CCPU_ENDIAN_TO_LE32(x) (x)
-#    define CCPU_ENDIAN_TO_LE64(x) (x)
+#define CCPU_ENDIAN_TO_LE16(x) (x)
+#define CCPU_ENDIAN_TO_LE32(x) (x)
+#define CCPU_ENDIAN_TO_LE64(x) (x)
 
-#    define ADDR_COPY_DST_SRC_16(dst, src) ((dst) = (src))
-#    define ADDR_COPY_DST_SRC_64(dst, src) ((dst) = (src))
+#define ADDR_COPY_DST_SRC_16(dst, src) ((dst) = (src))
+#define ADDR_COPY_DST_SRC_64(dst, src) ((dst) = (src))
 
 /**
  * @brief Converts a 64-Bit value into  a 8 Byte array
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_cdc.c b/tmk_core/protocol/arm_atsam/usb/udi_cdc.c
index 0391b49f66..d40030f36d 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_cdc.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_cdc.c
@@ -89,14 +89,14 @@
  *
  * @{
  */
-bool             udi_cdc_comm_enable(void);
-void             udi_cdc_comm_disable(void);
-bool             udi_cdc_comm_setup(void);
-bool             udi_cdc_data_enable(void);
-void             udi_cdc_data_disable(void);
-bool             udi_cdc_data_setup(void);
-uint8_t          udi_cdc_getsetting(void);
-void             udi_cdc_data_sof_notify(void);
+bool                       udi_cdc_comm_enable(void);
+void                       udi_cdc_comm_disable(void);
+bool                       udi_cdc_comm_setup(void);
+bool                       udi_cdc_data_enable(void);
+void                       udi_cdc_data_disable(void);
+bool                       udi_cdc_data_setup(void);
+uint8_t                    udi_cdc_getsetting(void);
+void                       udi_cdc_data_sof_notify(void);
 UDC_DESC_STORAGE udi_api_t udi_api_cdc_comm = {.enable = udi_cdc_comm_enable, .disable = udi_cdc_comm_disable, .setup = udi_cdc_comm_setup, .getsetting = udi_cdc_getsetting, .sof_notify = NULL};
 UDC_DESC_STORAGE udi_api_t udi_api_cdc_data = {
     .enable     = udi_cdc_data_enable,
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c b/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c
index e4510e7363..bc5e79d9f0 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c
+++ b/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c
@@ -608,11 +608,10 @@ uint8_t udd_getaddress(void) {
 }
 
 void udd_send_remotewakeup(void) {
-    uint32_t try
-        = 5;
+    uint32_t try = 5;
     udd_wait_clock_ready();
     udd_sleep_mode(UDD_STATE_IDLE);
-    while (2 != usb_get_state_machine_status(&usb_device) && try --) {
+    while (2 != usb_get_state_machine_status(&usb_device) && try--) {
         usb_device_send_remote_wake_up(&usb_device);
     }
 }

From c204c735af9fc5bf2438ca4fedfc8914529d660e Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Tue, 22 Feb 2022 01:30:49 +0900
Subject: [PATCH 665/867] Helix/pico move to split_common (#16418)

---
 keyboards/helix/pico/config.h                 |  10 +-
 keyboards/helix/pico/keymaps/biacco/keymap.c  |  35 +-
 keyboards/helix/pico/keymaps/biacco/rules.mk  |   6 +-
 keyboards/helix/pico/keymaps/default/keymap.c | 135 +------
 .../helix/pico/keymaps/default/readme.md      |   6 +-
 .../helix/pico/keymaps/default/readme_jp.md   |  14 +-
 keyboards/helix/pico/keymaps/default/rules.mk |   6 +-
 keyboards/helix/pico/keymaps/mtei/keymap.c    | 163 +--------
 keyboards/helix/pico/keymaps/mtei/rules.mk    |   6 +-
 keyboards/helix/pico/matrix.c                 | 342 ------------------
 .../override_helix_options.mk-maintenance     |  42 +++
 keyboards/helix/pico/pico.c                   |  29 +-
 keyboards/helix/pico/pico.h                   |  20 +-
 keyboards/helix/pico/post_rules.mk            | 138 ++-----
 keyboards/helix/pico/qmk_conf/rules.mk        |   2 -
 keyboards/helix/pico/rules.mk                 |   4 +-
 keyboards/helix/pico/split_util.c             | 104 ------
 keyboards/helix/pico/split_util.h             |  16 -
 18 files changed, 165 insertions(+), 913 deletions(-)
 delete mode 100644 keyboards/helix/pico/matrix.c
 create mode 100644 keyboards/helix/pico/override_helix_options.mk-maintenance
 delete mode 100644 keyboards/helix/pico/split_util.c
 delete mode 100644 keyboards/helix/pico/split_util.h

diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index b01fd3a001..ea2ce8c941 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -1,6 +1,7 @@
 /*
 Copyright 2012 Jun Wako <wakojun@gmail.com>
 Copyright 2015 Jack Humbert
+Copyright 2018 MakotoKurauchi
 
 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
@@ -42,12 +43,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-// Helix keyboard OLED support
-//      see ./rules.mk: OLED_ENABLE=yes or no
-#ifdef OLED_ENABLE
-  #define SSD1306OLED
-#endif
-
 /* key matrix size */
 // Rows are doubled-up
 #define MATRIX_ROWS 8
@@ -114,8 +109,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
 // USB_MAX_POWER_CONSUMPTION value for Helix keyboard
-//  120  RGBoff, OLEDoff
-//  120  OLED
+//  120  RGBoff
 //  330  RGB 6
 //  300  RGB 32
 //  310  OLED & RGB 32
diff --git a/keyboards/helix/pico/keymaps/biacco/keymap.c b/keyboards/helix/pico/keymaps/biacco/keymap.c
index a1d041c022..aa196c7e6a 100644
--- a/keyboards/helix/pico/keymaps/biacco/keymap.c
+++ b/keyboards/helix/pico/keymaps/biacco/keymap.c
@@ -1,24 +1,19 @@
+/* Copyright 2018 Biacco42
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #include QMK_KEYBOARD_H
-#include "bootloader.h"
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/helix/pico/keymaps/biacco/rules.mk b/keyboards/helix/pico/keymaps/biacco/rules.mk
index 993ade2673..d971359461 100644
--- a/keyboards/helix/pico/keymaps/biacco/rules.mk
+++ b/keyboards/helix/pico/keymaps/biacco/rules.mk
@@ -10,10 +10,8 @@ AUDIO_ENABLE = yes           # Audio output on port B5
 LTO_ENABLE = no  # if firmware size over limit, try this option
 
 # Helix Spacific Build Options
-# you can uncomment and edit follows 6 Variables
-#  jp: 以下の6つの変数を必要に応じて編集し、コメントアウトをはずします。
-# OLED_ENABLE = no            # OLED_ENABLE
-# LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
+# you can uncomment and edit follows 4 Variables
+#  jp: 以下の4つの変数を必要に応じて編集し、コメントアウトをはずします。
 # LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
 LED_ANIMATIONS = no           # LED animations
diff --git a/keyboards/helix/pico/keymaps/default/keymap.c b/keyboards/helix/pico/keymaps/default/keymap.c
index f23ab85761..11ee30258c 100644
--- a/keyboards/helix/pico/keymaps/default/keymap.c
+++ b/keyboards/helix/pico/keymaps/default/keymap.c
@@ -1,24 +1,25 @@
+/* Copyright 2018 MakotoKurauchi
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #include QMK_KEYBOARD_H
-#include "bootloader.h"
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
 
 #ifdef RGBLIGHT_ENABLE
 //Following line allows macro to read current RGB settings
 extern rgblight_config_t rgblight_config;
 #endif
 
-extern uint8_t is_master;
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -334,10 +335,6 @@ void matrix_init_user(void) {
     #ifdef RGBLIGHT_ENABLE
       RGB_current_mode = rgblight_config.mode;
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
 }
 
 
@@ -365,105 +362,3 @@ void music_scale_user(void)
 }
 
 #endif
-
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-void matrix_scan_user(void) {
-     iota_gfx_task();  // this is what updates the display continuously
-}
-
-void matrix_update(struct CharacterMatrix *dest,
-                          const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-//assign the right code to your layers for OLED display
-#define L_BASE 0
-#define L_LOWER (1<<_LOWER)
-#define L_RAISE (1<<_RAISE)
-#define L_ADJUST (1<<_ADJUST)
-#define L_ADJUST_TRI (L_ADJUST|L_RAISE|L_LOWER)
-
-static void render_logo(struct CharacterMatrix *matrix) {
-
-  static char logo[]={
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
-    0};
-  matrix_write(matrix, logo);
-  //matrix_write_P(&matrix, PSTR(" Split keyboard kit"));
-}
-
-
-
-void render_status(struct CharacterMatrix *matrix) {
-
-  // Render to mode icon
-  static char logo[][2][3]={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
-  if(keymap_config.swap_lalt_lgui==false){
-    matrix_write(matrix, logo[0][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write(matrix, logo[0][1]);
-  }else{
-    matrix_write(matrix, logo[1][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write(matrix, logo[1][1]);
-  }
-
-  // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
-  char buf[40];
-  snprintf(buf,sizeof(buf), "Undef-%ld", layer_state);
-  matrix_write_P(matrix, PSTR("\nLayer: "));
-    switch (layer_state) {
-        case L_BASE:
-           matrix_write_P(matrix, PSTR("Default"));
-           break;
-        case L_RAISE:
-           matrix_write_P(matrix, PSTR("Raise"));
-           break;
-        case L_LOWER:
-           matrix_write_P(matrix, PSTR("Lower"));
-           break;
-        case L_ADJUST:
-        case L_ADJUST_TRI:
-           matrix_write_P(matrix, PSTR("Adjust"));
-           break;
-        default:
-           matrix_write(matrix, buf);
-    }
-
-  // Host Keyboard LED Status
-  char led[40];
-    snprintf(led, sizeof(led), "\n%s  %s  %s",
-            (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NUMLOCK" : "       ",
-            (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : "    ",
-            (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : "    ");
-  matrix_write(matrix, led);
-}
-
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  matrix_clear(&matrix);
-  if(is_master){
-    render_status(&matrix);
-  }else{
-    render_logo(&matrix);
-  }
-  matrix_update(&display, &matrix);
-}
-
-#endif
diff --git a/keyboards/helix/pico/keymaps/default/readme.md b/keyboards/helix/pico/keymaps/default/readme.md
index 789097021b..a6c81651a3 100644
--- a/keyboards/helix/pico/keymaps/default/readme.md
+++ b/keyboards/helix/pico/keymaps/default/readme.md
@@ -96,10 +96,8 @@ see `qmk_firmware/keyboards/helix/pico/keymaps/default/rules.mk`
 
 ```
 # Helix Spacific Build Options
-# you can uncomment and edit follows 6 Variables
-#  jp: 以下の6つの変数を必要に応じて編集し、コメントアウトをはずします。
-# OLED_ENABLE = no            # OLED_ENABLE
-# LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
+# you can uncomment and edit follows 4 Variables
+#  jp: 以下の4つの変数を必要に応じて編集し、コメントアウトをはずします。
 # LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
 # LED_ANIMATIONS = yes        # LED animations
diff --git a/keyboards/helix/pico/keymaps/default/readme_jp.md b/keyboards/helix/pico/keymaps/default/readme_jp.md
index 28594dafcb..73f97ad9a6 100644
--- a/keyboards/helix/pico/keymaps/default/readme_jp.md
+++ b/keyboards/helix/pico/keymaps/default/readme_jp.md
@@ -58,16 +58,13 @@
 
 ## カスタマイズ
 
-オプションの OLED をつけたり、
 RGB バックライトまたは、RGB Underglow をつけた場合は、
 `qmk_firmware/keyboards/helix/pico/keymaps/default/rules.mk` の以下の部分を編集して機能を有効化してください。
 
 ```
 # Helix Spacific Build Options
-# you can uncomment and edit follows 6 Variables
-#  jp: 以下の6つの変数を必要に応じて編集し、コメントアウトをはずします。
-# OLED_ENABLE = no            # OLED_ENABLE
-# LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
+# you can uncomment and edit follows 4 Variables
+#  jp: 以下の4つの変数を必要に応じて編集し、コメントアウトをはずします。
 # LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
 # LED_ANIMATIONS = yes        # LED animations
@@ -89,13 +86,6 @@ rules.mk の下記の部分を編集して no を yes に変更してくださ
 LED_UNDERGLOW_ENABLE = yes   # LED underglow (Enable WS2812 RGB underlight.)
 ```
 
-## OLEDを有効にする
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-```
-OLED_ENABLE = yes            # OLED_ENABLE
-```
-
 ## iPad/iPhoneサポートを有効にする。
 
 rules.mk の下記の部分を編集して no を yes に変更してください。
diff --git a/keyboards/helix/pico/keymaps/default/rules.mk b/keyboards/helix/pico/keymaps/default/rules.mk
index b50519fef5..9a29406c17 100644
--- a/keyboards/helix/pico/keymaps/default/rules.mk
+++ b/keyboards/helix/pico/keymaps/default/rules.mk
@@ -3,10 +3,8 @@ AUDIO_ENABLE = yes          # Audio output
 LTO_ENABLE = no  # if firmware size over limit, try this option
 
 # Helix Spacific Build Options
-# you can uncomment and edit follows 6 Variables
-#  jp: 以下の6つの変数を必要に応じて編集し、コメントアウトをはずします。
-# OLED_ENABLE = no            # OLED_ENABLE
-# LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
+# you can uncomment and edit follows 4 Variables
+#  jp: 以下の4つの変数を必要に応じて編集し、コメントアウトをはずします。
 # LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
 # LED_ANIMATIONS = yes        # LED animations
diff --git a/keyboards/helix/pico/keymaps/mtei/keymap.c b/keyboards/helix/pico/keymaps/mtei/keymap.c
index 728ef0eb5f..58684be497 100644
--- a/keyboards/helix/pico/keymaps/mtei/keymap.c
+++ b/keyboards/helix/pico/keymaps/mtei/keymap.c
@@ -1,31 +1,23 @@
+/* Copyright 2018 mtei
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #include QMK_KEYBOARD_H
-#include "bootloader.h"
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-#ifdef CONSOLE_ENABLE
-  #include <print.h>
-#endif
 
 #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
 #define kc5(a,b,c,d,e) KC_##a, KC_##b, KC_##c, KC_##d, KC_##e
 
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -373,10 +365,6 @@ void matrix_init_user(void) {
     #ifdef AUDIO_ENABLE
         startup_user();
     #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
 }
 
 
@@ -404,124 +392,3 @@ void music_scale_user(void)
 }
 
 #endif
-
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-void matrix_scan_user(void) {
-     iota_gfx_task();  // this is what updates the display continuously
-}
-
-void matrix_update(struct CharacterMatrix *dest,
-                          const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-static void render_logo(struct CharacterMatrix *matrix) {
-
-  static char logo[]={
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
-    0};
-  matrix_write(matrix, logo);
-#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_ANIMATIONS)
-  char buf[30];
-  if(rgblight_config.enable) {
-      snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
-               rgblight_config.mode,
-               rgblight_config.hue/RGBLIGHT_HUE_STEP,
-               rgblight_config.sat/RGBLIGHT_SAT_STEP,
-               rgblight_config.val/RGBLIGHT_VAL_STEP);
-      matrix_write(matrix, buf);
-  }
-#endif
-  //matrix_write_P(&matrix, PSTR(" Split keyboard kit"));
-}
-
-static const char Qwerty_name[]  PROGMEM = " Qwerty";
-static const char Colemak_name[] PROGMEM = " Colemak";
-static const char Dvorak_name[]  PROGMEM = " Dvorak";
-static const char Eucalyn_name[] PROGMEM = " Eucalyn";
-
-static const char NumL_name[]     PROGMEM = ":NumL";
-static const char NumR_name[]     PROGMEM = ":NumR";
-static const char Lower_name[]   PROGMEM = ":Func";
-static const char Raise_name[]   PROGMEM = ":Extra";
-static const char Adjust_name[]  PROGMEM = ":Adjust";
-
-static const char *layer_names[] = {
-    [_QWERTY]  = Qwerty_name,
-    [_COLEMAK] = Colemak_name,
-    [_DVORAK]  = Dvorak_name,
-    [_EUCALYN] = Eucalyn_name,
-
-    [_NUML]    = NumL_name,
-    [_NUMR]    = NumR_name,
-    [_LOWER]   = Lower_name,
-    [_RAISE]   = Raise_name,
-    [_ADJUST]  = Adjust_name
-};
-
-void render_status(struct CharacterMatrix *matrix) {
-
-  // Render to mode icon
-  static char logo[][2][3]={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
-  if(keymap_config.swap_lalt_lgui==false){
-    matrix_write(matrix, logo[0][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write(matrix, logo[0][1]);
-  }else{
-    matrix_write(matrix, logo[1][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write(matrix, logo[1][1]);
-  }
-
-  // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
-  int name_num;
-  uint32_t lstate;
-  matrix_write_P(matrix, layer_names[current_default_layer]);
-  matrix_write_P(matrix, PSTR("\n"));
-  for( lstate = layer_state, name_num = 0;
-       lstate && name_num < sizeof(layer_names)/sizeof(char *);
-       lstate >>=1, name_num++ ) {
-      if( (lstate & 1) != 0 ) {
-          if( layer_names[name_num] ) {
-              matrix_write_P(matrix, layer_names[name_num]);
-          }
-      }
-  }
-
-  // Host Keyboard LED Status
-  char led[40];
-    snprintf(led, sizeof(led), "\n%s  %s  %s",
-             (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NUMLOCK" : "       ",
-             (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : "    ",
-             (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : "    ");
-  matrix_write(matrix, led);
-}
-
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  matrix_clear(&matrix);
-  if(is_master){
-    render_status(&matrix);
-  }else{
-    render_logo(&matrix);
-  }
-  matrix_update(&display, &matrix);
-}
-
-#endif
diff --git a/keyboards/helix/pico/keymaps/mtei/rules.mk b/keyboards/helix/pico/keymaps/mtei/rules.mk
index 05a60f67d5..413d0519d6 100644
--- a/keyboards/helix/pico/keymaps/mtei/rules.mk
+++ b/keyboards/helix/pico/keymaps/mtei/rules.mk
@@ -10,10 +10,8 @@ AUDIO_ENABLE = yes          # Audio output on port B5
 LTO_ENABLE = no  # if firmware size over limit, try this option
 
 # Helix Spacific Build Options
-# you can uncomment and edit follows 6 Variables
-#  jp: 以下の6つの変数を必要に応じて編集し、コメントアウトをはずします。
-# OLED_ENABLE = no            # OLED_ENABLE
-# LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
+# you can uncomment and edit follows 4 Variables
+#  jp: 以下の4つの変数を必要に応じて編集し、コメントアウトをはずします。
 # LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
 # LED_ANIMATIONS = yes        # LED animations
diff --git a/keyboards/helix/pico/matrix.c b/keyboards/helix/pico/matrix.c
deleted file mode 100644
index b18213d846..0000000000
--- a/keyboards/helix/pico/matrix.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- * scan matrix
- */
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include "print.h"
-#include "debug.h"
-#include "util.h"
-#include "matrix.h"
-#include "split_util.h"
-#include "quantum.h"
-
-#ifdef USE_MATRIX_I2C
-#  include "i2c.h"
-#else // USE_SERIAL
-#  include "serial.h"
-#endif
-
-#ifndef DEBOUNCE
-#  define DEBOUNCE	5
-#endif
-
-#define ERROR_DISCONNECT_COUNT 5
-
-static uint8_t debouncing = DEBOUNCE;
-static const int ROWS_PER_HAND = MATRIX_ROWS/2;
-static uint8_t error_count = 0;
-
-static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-
-static matrix_row_t read_cols(void);
-static void init_cols(void);
-static void unselect_rows(void);
-static void select_row(uint8_t row);
-static uint8_t matrix_master_scan(void);
-
-
-__attribute__ ((weak))
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-
-__attribute__ ((weak))
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-inline
-uint8_t matrix_rows(void)
-{
-    return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
-    return MATRIX_COLS;
-}
-
-void matrix_init(void)
-{
-    split_keyboard_setup();
-
-    // initialize row and col
-    unselect_rows();
-    init_cols();
-
-    setPinOutput(B0);
-    setPinOutput(D5);
-    writePinHigh(B0);
-    writePinHigh(D5);
-
-    // initialize matrix state: all keys off
-    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
-        matrix[i] = 0;
-        matrix_debouncing[i] = 0;
-    }
-
-    matrix_init_quantum();
-}
-
-uint8_t _matrix_scan(void)
-{
-    // Right hand is stored after the left in the matirx so, we need to offset it
-    int offset = isLeftHand ? 0 : (ROWS_PER_HAND);
-
-    for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
-        select_row(i);
-        _delay_us(30);  // without this wait read unstable value.
-        matrix_row_t cols = read_cols();
-        if (matrix_debouncing[i+offset] != cols) {
-            matrix_debouncing[i+offset] = cols;
-            debouncing = DEBOUNCE;
-        }
-        unselect_rows();
-    }
-
-    if (debouncing) {
-        if (--debouncing) {
-            _delay_ms(1);
-        } else {
-            for (uint8_t i = 0; i < ROWS_PER_HAND; i++) {
-                matrix[i+offset] = matrix_debouncing[i+offset];
-            }
-        }
-    }
-
-    return 1;
-}
-
-#ifdef USE_MATRIX_I2C
-
-// Get rows from other half over i2c
-int i2c_transaction(void) {
-    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-
-    int err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_WRITE);
-    if (err) goto i2c_error;
-
-    // start of matrix stored at 0x00
-    err = i2c_master_write(0x00);
-    if (err) goto i2c_error;
-
-    // Start read
-    err = i2c_master_start(SLAVE_I2C_ADDRESS + I2C_READ);
-    if (err) goto i2c_error;
-
-    if (!err) {
-        int i;
-        for (i = 0; i < ROWS_PER_HAND-1; ++i) {
-            matrix[slaveOffset+i] = i2c_master_read(I2C_ACK);
-        }
-        matrix[slaveOffset+i] = i2c_master_read(I2C_NACK);
-        i2c_master_stop();
-    } else {
-i2c_error: // the cable is disconnceted, or something else went wrong
-        i2c_reset_state();
-        return err;
-    }
-
-    return 0;
-}
-
-#else // USE_SERIAL
-
-int serial_transaction(void) {
-    int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-    int ret=serial_update_buffers();
-    if (ret ) {
-        if(ret==2) writePinLow(B0);
-        return 1;
-    }
-    writePinHigh(B0);
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        matrix[slaveOffset+i] = serial_slave_buffer[i];
-    }
-    return 0;
-}
-#endif
-
-uint8_t matrix_scan(void)
-{
-    if (is_helix_master()) {
-        matrix_master_scan();
-    }else{
-        matrix_slave_scan();
-
-          int offset = (isLeftHand) ? ROWS_PER_HAND : 0;
-
-          for (int i = 0; i < ROWS_PER_HAND; ++i) {
-              matrix[offset+i] = serial_master_buffer[i];
-          }
-
-        matrix_scan_quantum();
-    }
-    return 1;
-}
-
-
-uint8_t matrix_master_scan(void) {
-
-    int ret = _matrix_scan();
-
-#ifndef KEYBOARD_helix_rev1
-    int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
-
-#ifdef USE_MATRIX_I2C
-//    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        /* i2c_slave_buffer[i] = matrix[offset+i]; */
-//        i2c_slave_buffer[i] = matrix[offset+i];
-//    }
-#else // USE_SERIAL
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        serial_master_buffer[i] = matrix[offset+i];
-    }
-#endif
-#endif
-
-#ifdef USE_MATRIX_I2C
-    if( i2c_transaction() ) {
-#else // USE_SERIAL
-    if( serial_transaction() ) {
-#endif
-        // turn on the indicator led when halves are disconnected
-        writePinLow(D5);
-
-        error_count++;
-
-        if (error_count > ERROR_DISCONNECT_COUNT) {
-            // reset other half if disconnected
-            int slaveOffset = (isLeftHand) ? (ROWS_PER_HAND) : 0;
-            for (int i = 0; i < ROWS_PER_HAND; ++i) {
-                matrix[slaveOffset+i] = 0;
-            }
-        }
-    } else {
-        // turn off the indicator led on no error
-        writePinHigh(D5);
-        error_count = 0;
-    }
-    matrix_scan_quantum();
-    return ret;
-}
-
-void matrix_slave_scan(void) {
-    _matrix_scan();
-
-    int offset = (isLeftHand) ? 0 : ROWS_PER_HAND;
-
-#ifdef USE_MATRIX_I2C
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        /* i2c_slave_buffer[i] = matrix[offset+i]; */
-        i2c_slave_buffer[i] = matrix[offset+i];
-    }
-#else // USE_SERIAL
-    for (int i = 0; i < ROWS_PER_HAND; ++i) {
-        serial_slave_buffer[i] = matrix[offset+i];
-    }
-#endif
-}
-
-bool matrix_is_modified(void)
-{
-    if (debouncing) return false;
-    return true;
-}
-
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
-    return (matrix[row] & ((matrix_row_t)1<<col));
-}
-
-inline
-matrix_row_t matrix_get_row(uint8_t row)
-{
-    return matrix[row];
-}
-
-void matrix_print(void)
-{
-    print("\nr/c 0123456789ABCDEF\n");
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
-        print_hex8(row); print(": ");
-        print_bin_reverse16(matrix_get_row(row));
-        print("\n");
-    }
-}
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
-static void  init_cols(void)
-{
-    for(int x = 0; x < MATRIX_COLS; x++) {
-        _SFR_IO8((col_pins[x] >> 4) + 1) &=  ~_BV(col_pins[x] & 0xF);
-        _SFR_IO8((col_pins[x] >> 4) + 2) |= _BV(col_pins[x] & 0xF);
-    }
-}
-
-static matrix_row_t read_cols(void)
-{
-    matrix_row_t result = 0;
-    for(int x = 0; x < MATRIX_COLS; x++) {
-        result |= (_SFR_IO8(col_pins[x] >> 4) & _BV(col_pins[x] & 0xF)) ? 0 : (1 << x);
-    }
-    return result;
-}
-
-static void unselect_rows(void)
-{
-    for(int x = 0; x < ROWS_PER_HAND; x++) {
-        _SFR_IO8((row_pins[x] >> 4) + 1) &=  ~_BV(row_pins[x] & 0xF);
-        _SFR_IO8((row_pins[x] >> 4) + 2) |= _BV(row_pins[x] & 0xF);
-    }
-}
-
-static void select_row(uint8_t row)
-{
-    _SFR_IO8((row_pins[row] >> 4) + 1) |=  _BV(row_pins[row] & 0xF);
-    _SFR_IO8((row_pins[row] >> 4) + 2) &= ~_BV(row_pins[row] & 0xF);
-}
diff --git a/keyboards/helix/pico/override_helix_options.mk-maintenance b/keyboards/helix/pico/override_helix_options.mk-maintenance
new file mode 100644
index 0000000000..0ff930957e
--- /dev/null
+++ b/keyboards/helix/pico/override_helix_options.mk-maintenance
@@ -0,0 +1,42 @@
+#
+# This file is not normally used. It is used for maintenance testing purposes.
+# To use it, do the following:
+#
+#  $ cp override_helix_options.mk-maintenance override_helix_options.mk
+#
+$(info -------------------------)
+$(info override_helix_options.mk)
+$(info -------------------------)
+
+define HELIX_OVERRIDE_PARSE
+    ifeq ($(strip $1),back)
+        LED_BACK_ENABLE = yes
+        LED_UNDERGLOW_ENABLE = no
+    endif
+    ifeq ($(strip $1),under)
+        LED_BACK_ENABLE = no
+        LED_UNDERGLOW_ENABLE = yes
+    endif
+    ifneq ($(filter noled led-off led_off,$(strip $1)),)
+        LED_BACK_ENABLE = no
+        LED_UNDERGLOW_ENABLE = no
+    endif
+    ifneq ($(filter noaudio audio-off audio_off,$(strip $1)),)
+        AUDIO_ENABLE = no
+    endif
+    ifneq ($(filter audio audio-on audio_on,$(strip $1)),)
+        AUDIO_ENABLE = yes
+    endif
+    ifneq ($(filter sc split-common split_common,$(strip $1)),)
+        SPLIT_KEYBOARD = yes
+    endif
+    ifneq ($(filter nosc no-sc no-split-common no-split_common,$(strip $1)),)
+        SPLIT_KEYBOARD = no
+    endif
+    ifeq ($(strip $1),scan)
+        DEBUG_MATRIX_SCAN_RATE_ENABLE = yes
+    endif
+    ifeq ($(strip $1),scan-api)
+        DEBUG_MATRIX_SCAN_RATE_ENABLE = api
+    endif
+endef # end of HELIX_OVERRIDE_PARSE
diff --git a/keyboards/helix/pico/pico.c b/keyboards/helix/pico/pico.c
index 315b35a7ae..4cd1953632 100644
--- a/keyboards/helix/pico/pico.c
+++ b/keyboards/helix/pico/pico.c
@@ -1,3 +1,18 @@
+/* Copyright 2018 MakotoKurauchi
+ *
+ * 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 "helix.h"
 
 // Each keymap.c should use is_keyboard_master() instead of 'is_master'.
@@ -5,14 +20,6 @@
 //  for the old keymap.c.
 uint8_t is_master = false;
 
-#ifdef SSD1306OLED
-#include "ssd1306.h"
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	return process_record_gfx(keycode,record) && process_record_user(keycode, record);
-}
-#endif
-
 void matrix_init_kb(void) {
     // Each keymap.c should use is_keyboard_master() instead of is_master.
     // But keep is_master for a while for backwards compatibility
@@ -28,9 +35,3 @@ void keyboard_post_init_kb(void) {
 #endif
     keyboard_post_init_user();
 }
-
-#if defined(SPLIT_KEYBOARD) && defined(SSD1306OLED)
-void matrix_slave_scan_user(void) {
-    matrix_scan_user();
-}
-#endif
diff --git a/keyboards/helix/pico/pico.h b/keyboards/helix/pico/pico.h
index 5fa5f72958..3e51d54d84 100644
--- a/keyboards/helix/pico/pico.h
+++ b/keyboards/helix/pico/pico.h
@@ -1,12 +1,22 @@
+/* Copyright 2018 MakotoKurauchi
+ *
+ * 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 "helix.h"
 
-#ifndef SPLIT_KEYBOARD
-  extern bool is_helix_master(void);
-  #define is_keyboard_master() is_helix_master()
-#endif
-
 // Each keymap.c should use is_keyboard_master() instead of 'is_master', 'has_usb()'.
 // But keep 'is_master' for a while for backwards compatibility
 //  for the old keymap.c.
diff --git a/keyboards/helix/pico/post_rules.mk b/keyboards/helix/pico/post_rules.mk
index 38573d75a5..88bb5482ba 100644
--- a/keyboards/helix/pico/post_rules.mk
+++ b/keyboards/helix/pico/post_rules.mk
@@ -4,90 +4,30 @@
 #   Post-processing rules convert keyboard-specific shortcuts (that represent
 #   combinations of standard options) into QMK standard options.
 #
+-include $(strip $(HELIX_TOP_DIR)/pico/override_helix_options.mk) ## File dedicated to maintenance
 
-define HELIX_CUSTOMISE_MSG
-  $(info Helix Spacific Build Options)
-  $(info -  OLED_ENABLE          = $(OLED_ENABLE))
-  $(info -  LED_BACK_ENABLE      = $(LED_BACK_ENABLE))
-  $(info -  LED_UNDERGLOW_ENABLE = $(LED_UNDERGLOW_ENABLE))
-  $(info -  LED_ANIMATIONS       = $(LED_ANIMATIONS))
-  $(info -  IOS_DEVICE_ENABLE    = $(IOS_DEVICE_ENABLE))
-  $(info )
-endef
+# Parse 'HELIX=xx,yy,zz' option
+ifneq ($(strip $(HELIX)),)
+    # make HELIX=ios helix/pico:AKEYMAP
+    # make HELIX=no-ani helix/pico:AKEYMAP
+    # make HELIX=ios,no-ani helix/pico:AKEYMAP
+    define HELIX_OPTION_PARSE
+        # parce 'no-ani' 'ios'
+        $(if $(SHOW_PARCE),$(info parse .$1.))  #debug
+        $(if $(HELIX_OVERRIDE_PARSE),$(call HELIX_OVERRIDE_PARSE,$1))
 
-define HELIX_HELP_MSG
-  $(info Helix keyboard convenient command line option)
-  $(info -    make HELIX=<options> helix/pico:<keymap>)
-  $(info -    option= oled | back | under | na | no-ani)
-  $(info -             ios | sc | split-common | scan | verbose)
-  $(info -    ex.)
-  $(info -      make HELIX=oled     helix/pico:<keymap>)
-  $(info -      make HELIX=back     helix/pico:<keymap>)
-  $(info -      make HELIX=under    helix/pico:<keymap>)
-  $(info -      make HELIX=back,na  helix/pico:<keymap>)
-  $(info -      make HELIX=back,ios helix/pico:<keymap>)
-  $(info )
-endef
+        ifeq ($(strip $1),ios)
+            IOS_DEVICE_ENABLE = yes
+        endif
+        ifneq ($(filter na no_ani no-ani,$(strip $1)),)
+            LED_ANIMATIONS = no
+        endif
+    endef # end of HELIX_OPTION_PARSE
 
-  ifneq ($(strip $(HELIX)),)
     COMMA=,
-    helix_option := $(subst $(COMMA), , $(HELIX))
-    ifneq ($(filter help,$(helix_option)),)
-      $(eval $(call HELIX_HELP_MSG))
-      $(error )
-    endif
-    ifneq ($(filter oled,$(helix_option)),)
-      OLED_ENABLE = yes
-    endif
-    ifneq ($(filter back,$(helix_option)),)
-      LED_BACK_ENABLE = yes
-    else ifneq ($(filter under,$(helix_option)),)
-      LED_UNDERGLOW_ENABLE = yes
-    endif
-    ifneq ($(filter na,$(helix_option)),)
-      LED_ANIMATIONS = no
-    endif
-    ifneq ($(filter no_ani,$(helix_option)),)
-      LED_ANIMATIONS = no
-    endif
-    ifneq ($(filter no-ani,$(helix_option)),)
-      LED_ANIMATIONS = no
-    endif
-    ifneq ($(filter ios,$(helix_option)),)
-      IOS_DEVICE_ENABLE = yes
-    endif
-    ifneq ($(filter sc,$(helix_option)),)
-      SPLIT_KEYBOARD = yes
-    endif
-    ifneq ($(filter split-common,$(helix_option)),)
-      SPLIT_KEYBOARD = yes
-    endif
-    ifneq ($(filter scan,$(helix_option)),)
-      # use DEBUG_MATRIX_SCAN_RATE
-      # see docs/newbs_testing_debugging.md
-      OPT_DEFS +=  -DDEBUG_MATRIX_SCAN_RATE
-      CONSOLE_ENABLE = yes
-      SHOW_VERBOSE_INFO = yes
-    endif
-    ifneq ($(filter verbose,$(helix_option)),)
-      SHOW_VERBOSE_INFO = yes
-    endif
+    $(eval $(foreach A_OPTION_NAME,$(subst $(COMMA), ,$(HELIX)),  \
+        $(call HELIX_OPTION_PARSE,$(A_OPTION_NAME))))
     SHOW_HELIX_OPTIONS = yes
-  endif
-
-ifneq ($(strip $(SPLIT_KEYBOARD)), yes)
-  SRC += local_drivers/serial.c
-  KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers
-
-  # A workaround until #7089 is merged.
-  #   serial.c must not be compiled with the -lto option.
-  #   The current LIB_SRC has a side effect with the -fno-lto option, so use it.
-  LIB_SRC += local_drivers/serial.c
-
-  CUSTOM_MATRIX = yes
-
-  SRC += pico/matrix.c
-  SRC += pico/split_util.c
 endif
 
 ########
@@ -98,7 +38,6 @@ ifeq ($(strip $(LED_BACK_ENABLE)), yes)
   RGBLIGHT_ENABLE = yes
   OPT_DEFS += -DRGBLED_BACK
   ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
-    $(eval $(call HELIX_CUSTOMISE_MSG))
     $(error LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE both 'yes')
   endif
 else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
@@ -113,35 +52,26 @@ ifeq ($(strip $(LED_ANIMATIONS)), yes)
     OPT_DEFS += -DLED_ANIMATIONS
 endif
 
-ifeq ($(strip $(OLED_ENABLE)), yes)
-    SRC += local_drivers/i2c.c
-    SRC += local_drivers/ssd1306.c
-    KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers
-    OPT_DEFS += -DOLED_ENABLE
-    ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
-        OPT_DEFS += -DLOCAL_GLCDFONT
-    endif
-endif
-
 ifeq ($(strip $(AUDIO_ENABLE)),yes)
   ifeq ($(strip $(RGBLIGHT_ENABLE)),yes)
     LTO_ENABLE = yes
   endif
-  ifeq ($(strip $(OLED_ENABLE)),yes)
-    LTO_ENABLE = yes
-  endif
 endif
 
 ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
-  $(eval $(call HELIX_CUSTOMISE_MSG))
-  ifneq ($(strip $(SHOW_VERBOSE_INFO)),)
-     $(info -- RGBLIGHT_ENABLE    = $(RGBLIGHT_ENABLE))
-     $(info -- CONSOLE_ENABLE     = $(CONSOLE_ENABLE))
-     $(info -- OPT_DEFS           = $(OPT_DEFS))
-     $(info -- SPLIT_KEYBOARD     = $(SPLIT_KEYBOARD))
-     $(info -- LTO_ENABLE         = $(LTO_ENABLE))
-     $(info )
-  endif
+  $(info Helix Spacific Build Options)
+  $(info -  LED_BACK_ENABLE      = $(LED_BACK_ENABLE))
+  $(info -  LED_UNDERGLOW_ENABLE = $(LED_UNDERGLOW_ENABLE))
+  $(info -  LED_ANIMATIONS       = $(LED_ANIMATIONS))
+  $(info -  IOS_DEVICE_ENABLE    = $(IOS_DEVICE_ENABLE))
+  $(info )
+  $(info QMK Build Options)
+  $(info -- SPLIT_KEYBOARD     = $(SPLIT_KEYBOARD))
+  $(info -- AUDIO_ENABLE       = $(AUDIO_ENABLE))
+  $(info -- RGBLIGHT_ENABLE    = $(RGBLIGHT_ENABLE))
+  $(info -- CONSOLE_ENABLE     = $(CONSOLE_ENABLE))
+  $(info -- OPT_DEFS           = $(OPT_DEFS))
+  $(info -- LTO_ENABLE         = $(LTO_ENABLE))
+  $(info -- DEBUG_MATRIX_SCAN_RATE_ENABLE = $(DEBUG_MATRIX_SCAN_RATE_ENABLE))
+  $(info )
 endif
-
-OLED_ENABLE = no # disable OLED in TOP/common_features.mk
diff --git a/keyboards/helix/pico/qmk_conf/rules.mk b/keyboards/helix/pico/qmk_conf/rules.mk
index e2993b3f80..08ca8e094d 100644
--- a/keyboards/helix/pico/qmk_conf/rules.mk
+++ b/keyboards/helix/pico/qmk_conf/rules.mk
@@ -1,4 +1,2 @@
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 AUDIO_ENABLE = yes          # Audio output
-
-include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
diff --git a/keyboards/helix/pico/rules.mk b/keyboards/helix/pico/rules.mk
index 12caec37ef..efa7ae4be5 100644
--- a/keyboards/helix/pico/rules.mk
+++ b/keyboards/helix/pico/rules.mk
@@ -1,6 +1,6 @@
+SPLIT_KEYBOARD = yes
+
 # Helix Spacific Build Options default values
-OLED_ENABLE = no            # OLED_ENABLE
-LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
 LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
 LED_ANIMATIONS = yes        # LED animations
diff --git a/keyboards/helix/pico/split_util.c b/keyboards/helix/pico/split_util.c
deleted file mode 100644
index c77e63f33c..0000000000
--- a/keyboards/helix/pico/split_util.c
+++ /dev/null
@@ -1,104 +0,0 @@
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/power.h>
-#include <avr/interrupt.h>
-#include <util/delay.h>
-#include <avr/eeprom.h>
-#include "split_util.h"
-#include "matrix.h"
-#include "keyboard.h"
-#include "wait.h"
-
-#ifdef USE_MATRIX_I2C
-#  include "i2c.h"
-#else
-#  include "serial.h"
-#endif
-
-#ifdef EE_HANDS
-#    include "eeconfig.h"
-#endif
-
-#ifndef SPLIT_USB_TIMEOUT
-  #define SPLIT_USB_TIMEOUT 2500
-#endif
-
-volatile bool isLeftHand = true;
-
-bool waitForUsb(void) {
-    for (uint8_t i = 0; i < (SPLIT_USB_TIMEOUT / 100); i++) {
-        // This will return true of a USB connection has been established
-        if (UDADDR & _BV(ADDEN)) {
-            return true;
-        }
-        wait_ms(100);
-    }
-
-    // Avoid NO_USB_STARTUP_CHECK - Disable USB as the previous checks seem to enable it somehow
-    (USBCON &= ~(_BV(USBE) | _BV(OTGPADE)));
-
-    return false;
-}
-
-bool is_keyboard_left(void) {
-#if defined(SPLIT_HAND_PIN)
-    // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand
-    setPinInput(SPLIT_HAND_PIN);
-    return readPin(SPLIT_HAND_PIN);
-#elif defined(EE_HANDS)
-    return eeconfig_read_handedness();
-#elif defined(MASTER_RIGHT)
-    return !is_helix_master();
-#endif
-
-    return is_helix_master();
-}
-
-bool is_helix_master(void) {
-    static enum { UNKNOWN, MASTER, SLAVE } usbstate = UNKNOWN;
-
-    // only check once, as this is called often
-    if (usbstate == UNKNOWN) {
-#if defined(SPLIT_USB_DETECT)
-        usbstate = waitForUsb() ? MASTER : SLAVE;
-#elif defined(__AVR__)
-        USBCON |= (1 << OTGPADE);  // enables VBUS pad
-        wait_us(5);
-
-        usbstate = (USBSTA & (1 << VBUS)) ? MASTER : SLAVE;  // checks state of VBUS
-#else
-        usbstate = MASTER;
-#endif
-    }
-
-    return (usbstate == MASTER);
- }
-
-static void keyboard_master_setup(void) {
-
-#ifdef USE_MATRIX_I2C
-    i2c_master_init();
-#else
-    serial_master_init();
-#endif
-}
-
-static void keyboard_slave_setup(void) {
-
-#ifdef USE_MATRIX_I2C
-    i2c_slave_init(SLAVE_I2C_ADDRESS);
-#else
-    serial_slave_init();
-#endif
-}
-
-void split_keyboard_setup(void) {
-   isLeftHand = is_keyboard_left();
-
-   if (is_helix_master()) {
-      keyboard_master_setup();
-   } else {
-      keyboard_slave_setup();
-   }
-   sei();
-}
diff --git a/keyboards/helix/pico/split_util.h b/keyboards/helix/pico/split_util.h
deleted file mode 100644
index b839ce6e3e..0000000000
--- a/keyboards/helix/pico/split_util.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <stdbool.h>
-#include "eeconfig.h"
-
-#define SLAVE_I2C_ADDRESS           0x32
-
-extern volatile bool isLeftHand;
-
-// slave version of matix scan, defined in matrix.c
-void matrix_slave_scan(void);
-
-void split_keyboard_setup(void);
-bool is_helix_master(void);
-
-void matrix_master_OLED_init (void);

From d3584be431871cb636cca95107c956c614684b4d Mon Sep 17 00:00:00 2001
From: Michal Petrik <misopetrik@gmail.com>
Date: Mon, 21 Feb 2022 18:08:07 +0100
Subject: [PATCH 666/867] [Docs] Update newbs_building_firmware.md (#16333)

---
 docs/newbs_building_firmware.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/newbs_building_firmware.md b/docs/newbs_building_firmware.md
index ed51a9aea5..c4ce9fd9f3 100644
--- a/docs/newbs_building_firmware.md
+++ b/docs/newbs_building_firmware.md
@@ -1,6 +1,6 @@
 # Building Your First Firmware
 
-Now that you have setup your build environment you are ready to start building custom firmware. For this section of the guide we will bounce between 3 programs- your file manager, your text editor, and your terminal window. Keep all 3 open until you are done and happy with your keyboard firmware.
+Now that you have set up your build environment you are ready to start building custom firmware. For this section of the guide we will bounce between 3 programs- your file manager, your text editor, and your terminal window. Keep all 3 open until you are done and happy with your keyboard firmware.
 
 ## Configure Your Build Environment Defaults (Optional)
 

From b1f86225136247177858203f08e7a3af09c4ad63 Mon Sep 17 00:00:00 2001
From: Michal Petrik <misopetrik@gmail.com>
Date: Mon, 21 Feb 2022 18:08:36 +0100
Subject: [PATCH 667/867] [Docs] Update feature_leader_key.md (#16344)

Co-authored-by: zvecr <git@zvecr.com>
---
 docs/feature_leader_key.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/feature_leader_key.md b/docs/feature_leader_key.md
index f10bca7589..e5b1e7a4d9 100644
--- a/docs/feature_leader_key.md
+++ b/docs/feature_leader_key.md
@@ -37,7 +37,7 @@ void matrix_scan_user(void) {
 }
 ```
 
-As you can see, you have a few function. You can use `SEQ_ONE_KEY` for single-key sequences (Leader followed by just one key), and `SEQ_TWO_KEYS`, `SEQ_THREE_KEYS` up to `SEQ_FIVE_KEYS` for longer sequences.
+As you can see, you have a few functions. You can use `SEQ_ONE_KEY` for single-key sequences (Leader followed by just one key), and `SEQ_TWO_KEYS`, `SEQ_THREE_KEYS` up to `SEQ_FIVE_KEYS` for longer sequences.
 
 Each of these accepts one or more keycodes as arguments. This is an important point: You can use keycodes from **any layer on your keyboard**. That layer would need to be active for the leader macro to fire, obviously.
 
@@ -74,9 +74,9 @@ SEQ_THREE_KEYS(KC_C, KC_C, KC_C) {
 
 ## Infinite Leader key timeout
 
-Sometimes your leader key is not on a comfortable places as the rest of keys on your sequence. Imagine that your leader key is one of your outer top right keys, you may need to reposition your hand just to reach your leader key.
+Sometimes your leader key is not on a comfortable place as the rest of keys on your sequence. Imagine that your leader key is one of your outer top right keys, you may need to reposition your hand just to reach your leader key.
 This can make typing the entire sequence on time hard even if you are able to type most of the sequence fast. For example, if your sequence is `Leader + asd` typing `asd` fast is very easy once you have your hands in your home row. However starting the sequence in time after moving your hand out of the home row to reach the leader key and back is not.
-To remove the stress this situation produces to your hands you can enable an infinite timeout just for the leader key. This mean that, after you hit the leader key you will have an infinite amount of time to start the rest of the sequence, allowing you to proper position your hands on the best position to type the rest of the sequence comfortably.
+To remove the stress this situation produces to your hands you can enable an infinite timeout just for the leader key. This means that after you hit the leader key you will have an infinite amount of time to start the rest of the sequence, allowing you to proper position your hands on the best position to type the rest of the sequence comfortably.
 This infinite timeout only affects the leader key, so in our previous example of `Leader + asd` you will have an infinite amount of time between `Leader` and `a`, but once you start the sequence the timeout you have configured (global or per key) will work normally.
 This way you can configure a very short `LEADER_TIMEOUT` but still have plenty of time to position your hands.
 
@@ -89,11 +89,11 @@ In order to enable this, place this in your `config.h`:
 
 By default, the Leader Key feature will filter the keycode out of [`Mod-Tap`](mod_tap.md) and [`Layer Tap`](feature_layers.md#switching-and-toggling-layers) functions when checking for the Leader sequences. That means if you're using `LT(3, KC_A)`, it will pick this up as `KC_A` for the sequence, rather than `LT(3, KC_A)`, giving a more expected behavior for newer users.
 
-While, this may be fine for most, if you want to specify the whole keycode (eg, `LT(3, KC_A)` from the example above) in the sequence, you can enable this by added `#define LEADER_KEY_STRICT_KEY_PROCESSING` to your `config.h` file.  This will then disable the filtering, and you'll need to specify the whole keycode.
+While, this may be fine for most, if you want to specify the whole keycode (eg, `LT(3, KC_A)` from the example above) in the sequence, you can enable this by adding `#define LEADER_KEY_STRICT_KEY_PROCESSING` to your `config.h` file.  This will then disable the filtering, and you'll need to specify the whole keycode.
 
 ## Customization 
 
-The Leader Key feature has some additional customization to how the Leader Key feature works.  It has two functions that can be called at certain parts of the process.  Namely `leader_start()` and `leader_end()`.
+The Leader Key feature has some additional customization to how the Leader Key feature works. It has two functions that can be called at certain parts of the process. Namely `leader_start()` and `leader_end()`.
 
 The `leader_start()` function is called when you tap the `KC_LEAD` key, and the `leader_end()` function is called when either the leader sequence is completed, or the leader timeout is hit. 
 

From 249eb871028aaaaf508136088ef25fb67a83b28e Mon Sep 17 00:00:00 2001
From: 66f9e4eae <99080777+66f94eae@users.noreply.github.com>
Date: Tue, 22 Feb 2022 01:09:19 +0800
Subject: [PATCH 668/867] [Keyboard] [redox_w] add dvorak layout and white led
 support (#16259)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/redox_w/keymaps/dvorak/keymap.c  | 128 +++++++++++++++++++++
 keyboards/redox_w/keymaps/dvorak/readme.md |  38 ++++++
 keyboards/redox_w/redox_w.c                |  13 ++-
 keyboards/redox_w/redox_w.h                |  27 +++--
 4 files changed, 188 insertions(+), 18 deletions(-)
 create mode 100644 keyboards/redox_w/keymaps/dvorak/keymap.c
 create mode 100644 keyboards/redox_w/keymaps/dvorak/readme.md

diff --git a/keyboards/redox_w/keymaps/dvorak/keymap.c b/keyboards/redox_w/keymaps/dvorak/keymap.c
new file mode 100644
index 0000000000..f2c2d85f04
--- /dev/null
+++ b/keyboards/redox_w/keymaps/dvorak/keymap.c
@@ -0,0 +1,128 @@
+/* Copyright 2021 66f94eae(66f94eae@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layers {
+    _DVORAK,
+    _SYMB,
+    _QWERTY,
+    _ADJUST,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_DVORAK] = LAYOUT(
+//┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
+    KC_GESC  ,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_QUOT ,KC_COMM ,KC_DOT  ,KC_P    ,KC_Y    ,KC_LBRC,                          KC_RBRC ,KC_F    ,KC_G    ,KC_C    ,KC_R    ,KC_L    ,KC_SLSH  ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_LCTL  ,KC_A   ,KC_O    ,KC_E    ,KC_U    ,KC_I    ,KC_MINS,                          KC_EQL   ,KC_D    ,KC_H    ,KC_T    ,KC_N    ,KC_S    ,KC_BSLS ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_LSFT ,KC_SCLN ,KC_Q    ,KC_J    ,KC_K    ,KC_X    ,KC_PGUP ,KC_HOME ,        KC_END  ,KC_PGDN ,KC_B    ,KC_M    ,KC_W   ,KC_V     ,KC_Z    ,KC_RSFT ,
+//├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
+    KC_CAPS ,KC_APP ,KC_LALT ,KC_LGUI  ,    LT(3,KC_MUTE), KC_SPC  ,KC_INS  ,        KC_DEL  ,KC_ENT  ,    KC_RALT ,     KC_LEFT ,KC_DOWN ,KC_UP   ,KC_RGHT
+//└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
+),
+
+[_SYMB] = LAYOUT(
+//┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
+    KC_GESC  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,                                            KC_F8   ,KC_F9   ,KC_F10   ,KC_F11  ,KC_F12 ,KC_BSPC ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_TAB , KC_BTN1 ,KC_MS_U  ,KC_BTN2 ,KC_WH_U ,KC_COPY ,KC_F6 ,                            KC_F7  ,KC_COPY ,KC_P7 	,KC_P8 	 ,KC_P9   ,KC_MPRV ,KC_PPLS ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_LCTL ,KC_MS_L ,KC_MS_D  ,KC_MS_R ,KC_WH_D ,KC_CUT  ,KC_VOLD ,                          KC_VOLU ,KC_CUT ,KC_P4 	,KC_P5   ,KC_P6   ,KC_MNXT ,KC_PMNS ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_LSFT ,KC_WH_L ,KC_UP   ,KC_WH_R ,KC_LGUI ,KC_PSTE ,KC_WH_U ,KC_SLCK ,        KC_NLCK ,KC_WH_D ,KC_PSTE ,KC_P1 	,KC_P2   ,KC_P3   ,KC_PEQL ,KC_PAST ,
+//├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
+    KC_CAPS ,KC_LEFT ,KC_DOWN ,KC_RGHT, LT(3,KC_MUTE)     ,KC_SPC  ,KC_ESC ,        KC_DEL  ,KC_ENT ,    KC_APP   ,     KC_P0   ,KC_PDOT ,KC_PENT ,KC_PSLS 
+//└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
+),
+
+[_QWERTY] = LAYOUT(
+//┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
+    KC_GESC  ,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_MINS ,                          KC_EQL  ,KC_Y    ,KC_U    ,KC_I    ,KC_O    ,KC_P    ,KC_BSLS ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_LCTL ,KC_A    ,KC_S    ,KC_D    ,KC_F    ,KC_G    ,KC_LBRC ,                          KC_RBRC ,KC_H    ,KC_J    ,KC_K    ,KC_L    ,KC_SCLN ,KC_QUOT ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_LSFT ,KC_Z    ,KC_X    ,KC_C    ,KC_V    ,KC_B    ,KC_HOME ,KC_PGUP ,        KC_PGDN ,KC_END   ,KC_N   ,KC_M    ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_RSFT ,
+//├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
+    KC_CAPS ,KC_LGUI ,KC_LALT , KC_APP  ,LT(3,KC_MUTE) ,   KC_SPC ,KC_INS ,          KC_DEL ,KC_ENT       , KC_APP      , KC_LEFT ,KC_UP   ,KC_DOWN  ,KC_RGHT
+//└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
+),
+
+[_ADJUST] = LAYOUT(
+//┌────────┬────────┬────────┬────────┬────────┬────────┐                                           ┌────────┬────────┬────────┬────────┬────────┬────────┐
+    KC_GESC   ,TO(0)   ,TO(1)   ,TO(2)   ,KC_NO   ,KC_NO   ,                                            KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO  ,KC_NO   ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐                         ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,                          KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┤                         ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,                          KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,
+//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐       ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_LSFT  ,KC_NO   ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO           ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO ,KC_RSFT ,
+//├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤       ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
+    KC_NO   ,KC_NO   ,KC_NO   ,KC_LGUI        ,LT(3,KC_MUTE), KC_NO   ,KC_NO           ,KC_NO   ,KC_NO        ,KC_APP    ,KC_NO  ,KC_NO   ,KC_NO   ,KC_NO
+//└────────┴────────┴────────┴────────┘    └────────┘   └────────┴────────┘       └────────┴────────┘   └────────┘    └────────┴────────┴────────┴────────┘
+)
+
+};
+
+layer_state_t layer_state_set_user(layer_state_t state)
+{
+    switch (get_highest_layer(state)) {
+        case _DVORAK:
+            blu_led_off;
+            grn_led_off;
+            break;
+        case _SYMB:
+            blu_led_on;
+            grn_led_off;
+            break;
+        case _QWERTY:
+            blu_led_off;
+            grn_led_on;
+            break;
+        case _ADJUST:
+            blu_led_on;
+            grn_led_on;
+            break;
+        default:
+            break;
+    }
+    return state;
+}
+
+bool led_update_user(led_t led_state)
+{
+    if (led_state.caps_lock) {
+        red_led_on;
+    } else {
+        red_led_off;
+    }
+    if (led_state.num_lock) {
+        wht_led_on;
+    } else {
+        wht_led_off;
+    }
+    return false;
+}
diff --git a/keyboards/redox_w/keymaps/dvorak/readme.md b/keyboards/redox_w/keymaps/dvorak/readme.md
new file mode 100644
index 0000000000..cdc90976a7
--- /dev/null
+++ b/keyboards/redox_w/keymaps/dvorak/readme.md
@@ -0,0 +1,38 @@
+### fork from default layout，and support dvorak layout[defalut layer]
+
+##### only use 3 layers
+
+```
+Keymap: 3 Layers                   
+-----------------                  
+stack of layers                     
+       ____________ precedence      
+      /           / | high                 
+  31 /___________// |                           
+   :   _:_:_:_:_:__ |           
+   3 /___________// | --- adjust   
+   2 /___________// | --- qwerty         
+   1 /___________// | --- symb
+   0 /___________/  | --- dvorak[default]        
+```
+
+defalut LED indicators
+
+RED --------- CAPS LOCK
+
+BLUE ------- SYMB layer
+
+GREEN----- QWERTY layer
+
+WHITE------ NUM LOCK *in my test case,this is inefficient on mac os*
+
+> BLUE and GREEN as a bit flag
+> 
+> 0                    0
+
+| BLUE(0) | GREEN(0) | STATUS | DESCRIBE                                            |
+|:-------:|:--------:|:------:|:--------------------------------------------------- |
+| 0       | 0        | 0      | layer 0[dvorak] is active,and blue,green led is off |
+| 1       | 0        | 1      | layer1[symb] is active, and blue led is on          |
+| 0       | 1        | 2      | layer 2[qwerty] is active,and green led is on       |
+| 1       | 1        | 3      | layer 3[adjust] is active,and blue,green led is on  |
diff --git a/keyboards/redox_w/redox_w.c b/keyboards/redox_w/redox_w.c
index 5b86344536..48ea7d3bed 100644
--- a/keyboards/redox_w/redox_w.c
+++ b/keyboards/redox_w/redox_w.c
@@ -1,10 +1,15 @@
 #include "redox_w.h"
 
 void led_init(void) {
-	DDRD  |= (1<<1);
-	PORTD |= (1<<1);
-	DDRF  |= (1<<4) | (1<<5);
-	PORTF |= (1<<4) | (1<<5);
+    setPinOutput(D0);
+    setPinOutput(D1);
+    setPinOutput(F4);
+    setPinOutput(F5);
+    
+    writePinHigh(D0);
+    writePinHigh(D1);
+    writePinHigh(F4);
+    writePinHigh(F5);
 }
 
 
diff --git a/keyboards/redox_w/redox_w.h b/keyboards/redox_w/redox_w.h
index 727c3050dc..1ed42c8458 100644
--- a/keyboards/redox_w/redox_w.h
+++ b/keyboards/redox_w/redox_w.h
@@ -2,21 +2,20 @@
 
 #include "quantum.h"
 
-#define red_led_off   PORTF |= (1<<5)
-#define red_led_on    PORTF &= ~(1<<5)
-#define blu_led_off   PORTF |= (1<<4)
-#define blu_led_on    PORTF &= ~(1<<4)
-#define grn_led_off   PORTD |= (1<<1)
-#define grn_led_on    PORTD &= ~(1<<1)
+#define red_led_off   writePinHigh(F5)
+#define red_led_on    writePinLow(F5)
+#define blu_led_off   writePinHigh(F4)
+#define blu_led_on    writePinLow(F4)
+#define grn_led_off   writePinHigh(D1)
+#define grn_led_on    writePinLow(D1)
+#define wht_led_off   writePinHigh(D0)
+#define wht_led_on    writePinLow(D0)
 
-#define set_led_off     red_led_off; grn_led_off; blu_led_off
-#define set_led_red     red_led_on;  grn_led_off; blu_led_off
-#define set_led_blue    red_led_off; grn_led_off; blu_led_on
-#define set_led_green   red_led_off; grn_led_on;  blu_led_off
-#define set_led_yellow  red_led_on;  grn_led_on;  blu_led_off
-#define set_led_magenta red_led_on;  grn_led_off; blu_led_on
-#define set_led_cyan    red_led_off; grn_led_on;  blu_led_on
-#define set_led_white   red_led_on;  grn_led_on;  blu_led_on
+#define set_led_off     red_led_off; grn_led_off; blu_led_off; wht_led_off
+#define set_led_red     red_led_on;  grn_led_off; blu_led_off; wht_led_off
+#define set_led_blue    red_led_off; grn_led_off; blu_led_on;  wht_led_off
+#define set_led_green   red_led_off; grn_led_on;  blu_led_off; wht_led_off
+#define set_led_white   red_led_off;  grn_led_off;  blu_led_off; wht_led_on
 
 // This a shortcut to help you visually see your layout.
 // The first section contains all of the arguements

From 7fb22706fdb41030bff7fc1bf480d8b002ec86c5 Mon Sep 17 00:00:00 2001
From: Wolf Van Herreweghe <wolfvanh@gmail.com>
Date: Mon, 21 Feb 2022 18:10:06 +0100
Subject: [PATCH 669/867] [Keyboard] Add sabre (#15964)

Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
---
 keyboards/wolf/sabre/config.h                 | 61 +++++++++++++++++++
 keyboards/wolf/sabre/info.json                | 10 +++
 keyboards/wolf/sabre/keymaps/default/keymap.c | 41 +++++++++++++
 keyboards/wolf/sabre/keymaps/via/keymap.c     | 61 +++++++++++++++++++
 keyboards/wolf/sabre/keymaps/via/rules.mk     |  1 +
 keyboards/wolf/sabre/readme.md                | 21 +++++++
 keyboards/wolf/sabre/rules.mk                 | 23 +++++++
 keyboards/wolf/sabre/sabre.c                  | 14 +++++
 keyboards/wolf/sabre/sabre.h                  | 40 ++++++++++++
 9 files changed, 272 insertions(+)
 create mode 100644 keyboards/wolf/sabre/config.h
 create mode 100644 keyboards/wolf/sabre/info.json
 create mode 100644 keyboards/wolf/sabre/keymaps/default/keymap.c
 create mode 100644 keyboards/wolf/sabre/keymaps/via/keymap.c
 create mode 100644 keyboards/wolf/sabre/keymaps/via/rules.mk
 create mode 100644 keyboards/wolf/sabre/readme.md
 create mode 100644 keyboards/wolf/sabre/rules.mk
 create mode 100644 keyboards/wolf/sabre/sabre.c
 create mode 100644 keyboards/wolf/sabre/sabre.h

diff --git a/keyboards/wolf/sabre/config.h b/keyboards/wolf/sabre/config.h
new file mode 100644
index 0000000000..02b897ba4f
--- /dev/null
+++ b/keyboards/wolf/sabre/config.h
@@ -0,0 +1,61 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+
+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    0x5453 // TS - ToastyStoemp
+#define PRODUCT_ID   0x0055 // Sabre
+#define DEVICE_VER   0x0001 // Version 1
+#define MANUFACTURER    ToastyStoemp
+#define PRODUCT         Sabre
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 9
+
+/*
+ * 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)
+ *
+*/
+
+// Checked with Eagle Schematic
+#define MATRIX_ROW_PINS { D0, D1, F1, F0, B5, B6, C7, C6, F6, F7, F4, F5 }
+#define MATRIX_COL_PINS { D2, D3, D5, D4, D6, D7, B4, B2, B1 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+#define BACKLIGHT_PIN B7
+
+#define LED_CAPS_LOCK_PIN B3
+#define LED_SCROLL_LOCK_PIN B0
+
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json
new file mode 100644
index 0000000000..3fb912fdb4
--- /dev/null
+++ b/keyboards/wolf/sabre/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Sabre", 
+    "url": "", 
+    "maintainer": "ToastyStoemp", 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":8.25, "y":0}, {"label":"PrtSc", "x":17.25, "y":0}, {"label":"Scroll Lock", "x":18.25, "y":0}, {"label":"Pause", "x":19.25, "y":0}, {"label":"\u00ac", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"\"", "x":2, "y":1.25}, {"label":"\u00a3", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"Insert", "x":17.25, "y":1.25}, {"label":"Home", "x":18.25, "y":1.25}, {"label":"PgUp", "x":19.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Delete", "x":17.25, "y":2.25}, {"label":"End", "x":18.25, "y":2.25}, {"label":"PgDn", "x":19.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"\u2191", "x":18.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Win", "x":2.5, "y":5.25, "w":1.5}, {"label":"Alt", "x":4, "y":5.25}, {"x":5, "y":5.25, "w":2.25}, {"label":"\u2190", "x":17.25, "y":5.25}, {"label":"\u2193", "x":18.25, "y":5.25}, {"label":"\u2192", "x":19.25, "y":5.25}, {"label":"F6", "x":-7.75, "y":6.25}, {"label":"F7", "x":-6.75, "y":6.25}, {"label":"F8", "x":-5.75, "y":6.25}, {"label":"F9", "x":-4.5, "y":6.25}, {"label":"F10", "x":-3.5, "y":6.25}, {"label":"F11", "x":-2.5, "y":6.25}, {"label":"F12", "x":-1.5, "y":6.25}, {"label":"&", "x":-8.5, "y":7.5}, {"label":"*", "x":-7.5, "y":7.5}, {"label":"(", "x":-6.5, "y":7.5}, {"label":")", "x":-5.5, "y":7.5}, {"label":"_", "x":-4.5, "y":7.5}, {"label":"+", "x":-3.5, "y":7.5}, {"label":"BackSpace", "x":-2.5, "y":7.5, "w":2}, {"label":"Y", "x":-9.0, "y":8.5}, {"label":"U", "x":-8, "y":8.5}, {"label":"I", "x":-7.0, "y":8.5}, {"label":"O", "x":-6, "y":8.5}, {"label":"P", "x":-5.0, "y":8.5}, {"label":"{", "x":-4, "y":8.5}, {"label":"}", "x":-3.0, "y":8.5}, {"label":"|", "x":-2, "y":8.5, "w":1.5}, {"label":"H", "x":-8.75, "y":9.5}, {"label":"J", "x":-7.75, "y":9.5}, {"label":"K", "x":-6.75, "y":9.5}, {"label":"L", "x":-5.75, "y":9.5}, {"label":":", "x":-4.75, "y":9.5}, {"label":"@", "x":-3.75, "y":9.5}, {"label":"Enter", "x":-2.75, "y":9.5, "w":2.25}, {"label":"B", "x":-9.25, "y":10.5}, {"label":"N", "x":-8.25, "y":10.5}, {"label":"M", "x":-7.25, "y":10.5}, {"label":"<", "x":-6.25, "y":10.5}, {"label":">", "x":-5.25, "y":10.5}, {"label":"?", "x":-4.25, "y":10.5}, {"label":"Shift", "x":-3.25, "y":10.5, "w":1.75}, {"x":-1.5, "y":10.5}, {"x":-9.25, "y":11.5, "w":2.75}, {"label":"<", "x":-6.5, "y":11.5}, {"label":"Alt", "x":-5.5, "y":11.5, "w":1.5}, {"label":"Ctrl", "x":-3.0, "y":11.5, "w":1.5}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/wolf/sabre/keymaps/default/keymap.c b/keyboards/wolf/sabre/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a873ab89fb
--- /dev/null
+++ b/keyboards/wolf/sabre/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+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 layers {
+    _LAYER0,
+    _LAYER1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                     KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT, KC_RGUI,          KC_RCTRL,                  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   BL_INC,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   BL_TOGG, BL_DEC, BL_BRTG
+    )
+};
diff --git a/keyboards/wolf/sabre/keymaps/via/keymap.c b/keyboards/wolf/sabre/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6a6c35bb0e
--- /dev/null
+++ b/keyboards/wolf/sabre/keymaps/via/keymap.c
@@ -0,0 +1,61 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+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 layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_DEL,  KC_END,  KC_PGDN,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),                     KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,                    KC_SPC,           KC_RALT, KC_RGUI,          KC_RCTRL,                  KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   BL_INC,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   BL_TOGG, BL_DEC, BL_BRTG
+    ),
+
+    [_LAYER2] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER3] = LAYOUT(
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/wolf/sabre/keymaps/via/rules.mk b/keyboards/wolf/sabre/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/wolf/sabre/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/wolf/sabre/readme.md b/keyboards/wolf/sabre/readme.md
new file mode 100644
index 0000000000..b06217d0ee
--- /dev/null
+++ b/keyboards/wolf/sabre/readme.md
@@ -0,0 +1,21 @@
+# Sabre
+
+The following is the QMK Firmware for the Sabre PCB.
+
+The PCB features:
+* QMK & VIA compatibility
+
+---
+
+* Keyboard Maintainer: [ToastyStoemp](https://github.com/ToastyStoemp)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wolf/sabre: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).
+
+## Bootloader Enter the bootloader in 3 ways: 
+* **Bootmagic reset**: Hold down the key ESC key and plug in the keyboard (Top Left most switch)
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the B key on layer 1 which is mapped to `RESET`
diff --git a/keyboards/wolf/sabre/rules.mk b/keyboards/wolf/sabre/rules.mk
new file mode 100644
index 0000000000..39ad4aa5a0
--- /dev/null
+++ b/keyboards/wolf/sabre/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+BACKLIGHT_ENABLE = yes
+BACKLIGHT_DRIVER = pwm
\ No newline at end of file
diff --git a/keyboards/wolf/sabre/sabre.c b/keyboards/wolf/sabre/sabre.c
new file mode 100644
index 0000000000..84577ef867
--- /dev/null
+++ b/keyboards/wolf/sabre/sabre.c
@@ -0,0 +1,14 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+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 "sabre.h"
diff --git a/keyboards/wolf/sabre/sabre.h b/keyboards/wolf/sabre/sabre.h
new file mode 100644
index 0000000000..4580f46e93
--- /dev/null
+++ b/keyboards/wolf/sabre/sabre.h
@@ -0,0 +1,40 @@
+/*
+Copyright 2020 <contact@vwolf.be>
+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"
+
+/* sabre Keymap Definitions */
+#define LAYOUT( \
+    K00,      K01, K11, K02, K12,      K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      K37, K28, K38, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,      K57, K48, K58, \
+    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75,      K76,                     \
+    K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96,           K88,      \
+    KA0, KB0, KA1,      KA2,           KB3,      KB4, KA5,      KA6,           KB7, KA8, KB8  \
+) { \
+    { K00,   K01,   K02,   KC_NO, K04,   K05,   K06,   K07,   K08   }, \
+    { KC_NO, K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   KC_NO, K28   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   KC_NO, K48   }, \
+    { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58   }, \
+    { K60,   K61,   K62,   K63,   K64,   K65,   KC_NO, KC_NO, KC_NO }, \
+    { K70,   K71,   K72,   K73,   K74,   K75,   K76,   KC_NO, KC_NO }, \
+    { K80,   K81,   K82,   K83,   K84,   K85,   K86,   KC_NO, K88   }, \
+    { K90,   K91,   K92,   K93,   K94,   K95,   K96,   KC_NO, KC_NO }, \
+    { KA0,   KA1,   KA2,   KC_NO, KC_NO, KA5,   KA6,   KC_NO, KA8   }, \
+    { KB0,   KC_NO, KC_NO, KB3,   KB4,   KC_NO, KC_NO, KB7,   KB8   }  \
+}

From 59f671744b7474cdc07830799053ba1d61edbf72 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 22 Feb 2022 01:10:19 +0800
Subject: [PATCH 670/867] [Keyboard] ID75 v2 (#16351)

---
 keyboards/idobao/id75/v2/config.h  | 152 +++++++++++++++++++++++++++++
 keyboards/idobao/id75/v2/info.json |  10 ++
 keyboards/idobao/id75/v2/readme.md |  27 +++++
 keyboards/idobao/id75/v2/rules.mk  |  24 +++++
 keyboards/idobao/id75/v2/v2.c      |  49 ++++++++++
 keyboards/idobao/id75/v2/v2.h      |  41 ++++++++
 6 files changed, 303 insertions(+)
 create mode 100644 keyboards/idobao/id75/v2/config.h
 create mode 100644 keyboards/idobao/id75/v2/info.json
 create mode 100644 keyboards/idobao/id75/v2/readme.md
 create mode 100644 keyboards/idobao/id75/v2/rules.mk
 create mode 100644 keyboards/idobao/id75/v2/v2.c
 create mode 100644 keyboards/idobao/id75/v2/v2.h

diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h
new file mode 100644
index 0000000000..c2b64649cb
--- /dev/null
+++ b/keyboards/idobao/id75/v2/config.h
@@ -0,0 +1,152 @@
+/* Copyright 2022 peepeetee
+ *
+ * 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       0x6964 // ID
+#define PRODUCT_ID      0x0075
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    IDOBAO
+#define PRODUCT         ID75
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 { B0, B3, C7, B6, C6 }
+#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D5, D3, D2, D1, D0, D4, D6, D7, B4, B5 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#undef RGB_DI_PIN
+#define RGB_DI_PIN F0
+#ifdef RGB_MATRIX_ENABLE
+#    define DRIVER_LED_TOTAL 85 /* 10 Bottom 75 top*/
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define RGB_MATRIX_KEYPRESSES
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only if RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json
new file mode 100644
index 0000000000..fe24920f81
--- /dev/null
+++ b/keyboards/idobao/id75/v2/info.json
@@ -0,0 +1,10 @@
+{
+  "keyboard_name": "idobao/id75/v2",
+  "url": "",
+  "maintainer": "qmk",
+  "layouts": {
+      "LAYOUT_ortho_5x15": {
+          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
+      }
+  }
+}
diff --git a/keyboards/idobao/id75/v2/readme.md b/keyboards/idobao/id75/v2/readme.md
new file mode 100644
index 0000000000..76a94ae38c
--- /dev/null
+++ b/keyboards/idobao/id75/v2/readme.md
@@ -0,0 +1,27 @@
+# ID75 v2
+
+![ID75 v2](https://i.imgur.com/KdAjS5f.jpg)
+
+A 5x15 ortholinear keyboard with hotswap sockets and north facing in switch RGB LEDs and RGB underglow
+
+* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
+* Hardware Supported: ID75 v2
+* Hardware Availability: https://idobao.net/products/idobao-id75-crystal-hot-swap-keyboard-kit?_pos=1&_sid=8758d3561&_ss=r
+
+Make example for this keyboard (after setting up your build environment):
+
+    make idobao/id75/v2:default
+
+Flashing example for this keyboard:
+
+    make idobao/id75/v2:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/idobao/id75/v2/rules.mk b/keyboards/idobao/id75/v2/rules.mk
new file mode 100644
index 0000000000..303a814c3a
--- /dev/null
+++ b/keyboards/idobao/id75/v2/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes            # Use link time optimization
+
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+LAYOUTS = ortho_5x15
diff --git a/keyboards/idobao/id75/v2/v2.c b/keyboards/idobao/id75/v2/v2.c
new file mode 100644
index 0000000000..f65a9e3362
--- /dev/null
+++ b/keyboards/idobao/id75/v2/v2.c
@@ -0,0 +1,49 @@
+/* Copyright 2022 peepeetee
+ *
+ * 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 "v2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+{ 84, 83, 82, 81, 80, 79, 78, 77, 76, 75, 74, 73, 72, 71, 70 },
+{ 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55 },
+{ 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40 },
+{ 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25 },
+{ 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10 }
+}, {
+    // LED Index to Physical Position
+{8, 12},{60, 12},{112, 12},{164, 12},{216, 12},
+{216, 60},{164, 60},{112, 60},{60, 60},{8, 60},
+
+
+{224, 64}, {208, 64}, {192, 64}, {176, 64}, {160, 64}, {144, 64}, {128, 64}, {112, 64}, {96, 64}, {80, 64}, {64, 64}, {48, 64}, {32, 64}, {16, 64}, {0, 64},
+{224, 48}, {208, 48}, {192, 48}, {176, 48}, {160, 48}, {144, 48}, {128, 48}, {112, 48}, {96, 48}, {80, 48}, {64, 48}, {48, 48}, {32, 48}, {16, 48}, {0, 48},
+{224, 32}, {208, 32}, {192, 32}, {176, 32}, {160, 32}, {144, 32}, {128, 32}, {112, 32}, {96, 32}, {80, 32}, {64, 32}, {48, 32}, {32, 32}, {16, 32}, {0, 32},
+{224, 16}, {208, 16}, {192, 16}, {176, 16}, {160, 16}, {144, 16}, {128, 16}, {112, 16}, {96, 16}, {80, 16}, {64, 16}, {48, 16}, {32, 16}, {16, 16}, {0, 16},
+{224,  0}, {208,  0}, {192,  0}, {176,  0}, {160,  0}, {144,  0}, {128,  0}, {112,  0}, {96,  0}, {80,  0}, {64,  0}, {48,  0}, {32,  0}, {16,  0}, {0,  0},
+
+}, {
+    // LED Index to Flag
+2,2,2,2,2,2,2,2,2,2,
+4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+
+} };
+
+#endif
diff --git a/keyboards/idobao/id75/v2/v2.h b/keyboards/idobao/id75/v2/v2.h
new file mode 100644
index 0000000000..9643a1efd3
--- /dev/null
+++ b/keyboards/idobao/id75/v2/v2.h
@@ -0,0 +1,41 @@
+/* Copyright 2018 MechMerlin
+ *
+ * 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"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_ortho_5x15( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E } \
+}

From 7e4f74d6897c5c34be084317a3647f974fdd4e71 Mon Sep 17 00:00:00 2001
From: takashicompany <t@kashi.company>
Date: Tue, 22 Feb 2022 02:11:00 +0900
Subject: [PATCH 671/867] [Keyboard] Update Heavy Left (#16354)

---
 keyboards/takashicompany/heavy_left/config.h  |  2 +
 .../keymaps/takashicompany/keymap.c           | 69 +++++++++++++++++++
 .../keymaps/takashicompany/rules.mk           |  1 +
 keyboards/takashicompany/heavy_left/rules.mk  |  2 +-
 4 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
 create mode 100644 keyboards/takashicompany/heavy_left/keymaps/takashicompany/rules.mk

diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h
index e7f37f251c..b5a16def68 100644
--- a/keyboards/takashicompany/heavy_left/config.h
+++ b/keyboards/takashicompany/heavy_left/config.h
@@ -143,3 +143,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
+
+#define EE_HANDS
\ No newline at end of file
diff --git a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
new file mode 100644
index 0000000000..11beb28ca0
--- /dev/null
+++ b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2021 takashicompany
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "keymap_jp.h"
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    KC_00 = USER00,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    LAYOUT(
+        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_JYEN, KC_BSPC, KC_DEL,
+        KC_P7, KC_P8, KC_P9, KC_PPLS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_HOME,
+        KC_P4, KC_P5, KC_P6, KC_PCMM,KC_LCTL, KC_A, KC_S, LT(2, KC_D), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_END,
+        KC_P1, KC_P2, KC_P3, KC_PEQL, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS, KC_UP, KC_RSFT, KC_PGUP,
+        KC_P0, KC_00, KC_PDOT, KC_PENT, KC_LCTL, KC_LGUI, KC_LALT, LALT_T(KC_LANG2), LALT_T(KC_LANG2), LSFT_T(KC_TAB), KC_SPC, LT(1, KC_LANG1), KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, MO(3)
+    ),
+
+    LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQL, KC_LBRC, KC_SLSH, KC_MINS, KC_RO, KC_SCLN, KC_QUOT, KC_RBRC, KC_NUHS, KC_JYEN, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    
+    LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+      LAYOUT(
+        KC_NLCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI,   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, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, 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, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_M_T,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CAPS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_00:
+            if (record->event.pressed) {
+                SEND_STRING("00");
+            }
+            return false;
+    }
+    return true;
+}
\ No newline at end of file
diff --git a/keyboards/takashicompany/heavy_left/keymaps/takashicompany/rules.mk b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/takashicompany/heavy_left/keymaps/takashicompany/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/takashicompany/heavy_left/rules.mk b/keyboards/takashicompany/heavy_left/rules.mk
index a92a794ed6..ce3c5bfaeb 100644
--- a/keyboards/takashicompany/heavy_left/rules.mk
+++ b/keyboards/takashicompany/heavy_left/rules.mk
@@ -14,7 +14,7 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD=yes
\ No newline at end of file

From 0b21fbc37b784db576adfa46aea6ef7237c7b62e Mon Sep 17 00:00:00 2001
From: evanmcook <42785294+evanmcook@users.noreply.github.com>
Date: Mon, 21 Feb 2022 12:11:23 -0500
Subject: [PATCH 672/867] [Keyboard] add evancookaudio sleepingdinosaur
 (#16320)

Co-authored-by: Joel Challis <git@zvecr.com>
---
 .../evancookaudio/sleepingdinosaur/config.h   | 44 +++++++++++++++++++
 .../evancookaudio/sleepingdinosaur/info.json  | 44 +++++++++++++++++++
 .../sleepingdinosaur/keymaps/default/keymap.c | 40 +++++++++++++++++
 .../evancookaudio/sleepingdinosaur/readme.md  | 17 +++++++
 .../evancookaudio/sleepingdinosaur/rules.mk   | 18 ++++++++
 .../sleepingdinosaur/sleepingdinosaur.c       | 17 +++++++
 .../sleepingdinosaur/sleepingdinosaur.h       | 41 +++++++++++++++++
 7 files changed, 221 insertions(+)
 create mode 100644 keyboards/evancookaudio/sleepingdinosaur/config.h
 create mode 100644 keyboards/evancookaudio/sleepingdinosaur/info.json
 create mode 100644 keyboards/evancookaudio/sleepingdinosaur/keymaps/default/keymap.c
 create mode 100644 keyboards/evancookaudio/sleepingdinosaur/readme.md
 create mode 100644 keyboards/evancookaudio/sleepingdinosaur/rules.mk
 create mode 100644 keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.c
 create mode 100644 keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.h

diff --git a/keyboards/evancookaudio/sleepingdinosaur/config.h b/keyboards/evancookaudio/sleepingdinosaur/config.h
new file mode 100644
index 0000000000..4412e9eb60
--- /dev/null
+++ b/keyboards/evancookaudio/sleepingdinosaur/config.h
@@ -0,0 +1,44 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * 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       0x636F
+#define PRODUCT_ID      0x0002
+#define DEVICE_VER      0x0000
+#define MANUFACTURER    evancook.audio
+#define PRODUCT         sleepingdinosaur
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 6
+
+/* key matrix pins */
+
+#define MATRIX_ROW_PINS {D0, D1, D4, C6, D7}
+#define MATRIX_COL_PINS {F4, F5, F6, F7, B1, B3}
+
+#define UNUSED_PINS {B2, B6, B7, D5, C7, F1, F0, B4, E6}
+
diff --git a/keyboards/evancookaudio/sleepingdinosaur/info.json b/keyboards/evancookaudio/sleepingdinosaur/info.json
new file mode 100644
index 0000000000..2c21777d49
--- /dev/null
+++ b/keyboards/evancookaudio/sleepingdinosaur/info.json
@@ -0,0 +1,44 @@
+{
+    "keyboard_name": "evancook.audio sleepingdinosaur",
+    "url": "https://evancook.audio/",
+    "maintainer": "evanmcook",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"1", "x":0, "y":0}, 
+                {"label":"2", "x":1, "y":0}, 
+                {"label":"3", "x":2, "y":0}, 
+                {"label":"4", "x":3, "y":0}, 
+                {"label":"5", "x":4, "y":0}, 
+                {"label":"-", "x":5, "y":0}, 
+
+                {"label":"6", "x":0, "y":1}, 
+                {"label":"7", "x":1, "y":1}, 
+                {"label":"8", "x":2, "y":1}, 
+                {"label":"9", "x":3, "y":1}, 
+                {"label":"0", "x":4, "y":1}, 
+                {"label":"R", "x":5, "y":1}, 
+
+                {"label":"/", "x":0, "y":2}, 
+                {"label":"Q", "x":1, "y":2}, 
+                {"label":"W", "x":2, "y":2}, 
+                {"label":"E", "x":3, "y":2}, 
+                {"label":"U", "x":4, "y":2}, 
+                {"label":"V", "x":5, "y":2},
+
+                {"label":"Enter", "x":0, "y":3, "h":2}, 
+                {"label":"A", "x":1, "y":3}, 
+                {"label":"S", "x":2, "y":3}, 
+                {"label":"D", "x":3, "y":3}, 
+                {"label":"Space", "x":4, "y":3, "h":2}, 
+                {"label":"O", "x":5, "y":3}, 
+                
+                {"label":"Z", "x":1, "y":4}, 
+                {"label":"X", "x":2, "y":4}, 
+                {"label":"C", "x":3, "y":4}, 
+                {"label":"N", "x":5, "y":4}
+                
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/evancookaudio/sleepingdinosaur/keymaps/default/keymap.c b/keyboards/evancookaudio/sleepingdinosaur/keymaps/default/keymap.c
new file mode 100644
index 0000000000..94cbc390df
--- /dev/null
+++ b/keyboards/evancookaudio/sleepingdinosaur/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* LAYER 0
+ * ,-----------------------------------------------.
+ * |   1   |   2   |   3   |   4   |   5   |   -   |
+ * |-------+-------+-------|-------|-------|-------|
+ * |   6   |   7   |   8   |   9   |   0   |   R   |
+ * |-------+-------+-------|-------|-------|-------|
+ * |   /   |   Q   |   W   |   E   |   U   |   V   |
+ *  -------+-------+-------|-------|-------|-------|
+ * | ENTER |   A   |   S   |   D   | SPACE |   O   |
+ * |       |-------+-------+-------|       |-------|
+ * |       |   Z   |   X   |   C   |       |   N   |
+ * ,-----------------------------------------------.
+ */
+[0] = LAYOUT(
+  KC_1,       KC_2,      KC_3,      KC_4,      KC_5,      KC_MINS,
+  KC_6,       KC_7,      KC_8,      KC_9,      KC_0,      KC_R,
+  KC_SLSH,    KC_Q,      KC_W,      KC_E,      KC_U,      KC_V,
+  KC_ENT,     KC_A,      KC_S,      KC_D,      KC_SPC,    KC_O,
+              KC_Z,      KC_X,      KC_C,                 KC_N     
+)
+};
diff --git a/keyboards/evancookaudio/sleepingdinosaur/readme.md b/keyboards/evancookaudio/sleepingdinosaur/readme.md
new file mode 100644
index 0000000000..064e4981fe
--- /dev/null
+++ b/keyboards/evancookaudio/sleepingdinosaur/readme.md
@@ -0,0 +1,17 @@
+# tenpad macropad
+
+A 28 button macropad, in a format that is closest to a 5x6 grid, designed by evan cook
+[Default Layout](https://raw.githubusercontent.com/evanmcook/sleepingdinosaur/main/images/layouts/sleepingdinosaurdefault.jpg)
+
+* Keyboard Maintainer: [evan cook](https://github.com/evanmcook/)
+* Hardware Supported: sleepingdinosaur Macropad PCB
+* Hardware Availability: [tenpad Github](https://github.com/evanmcook/sleepingdinosaur)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make evancookaudio/sleepingdinosaur: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).
+
+## Enter the bootloader: 
+* **Physical reset button**: On the underside of the board, near the USB connector and microcontroller, press and hold the small button labeled reset for more than one second to enter the bootloader.
\ No newline at end of file
diff --git a/keyboards/evancookaudio/sleepingdinosaur/rules.mk b/keyboards/evancookaudio/sleepingdinosaur/rules.mk
new file mode 100644
index 0000000000..6cf6d9358b
--- /dev/null
+++ b/keyboards/evancookaudio/sleepingdinosaur/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.c b/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.c
new file mode 100644
index 0000000000..814275e3f0
--- /dev/null
+++ b/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * 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 "sleepingdinosaur.h"
diff --git a/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.h b/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.h
new file mode 100644
index 0000000000..9672fca289
--- /dev/null
+++ b/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.h
@@ -0,0 +1,41 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT(\
+    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  \
+    ) \
+    { \
+        {k00,   k01, k02, k03, k04,   k05},\
+        {k06,   k07, k08, k09, k10,   k11},\
+        {k12,   k13, k14, k15, k16,   k17},\
+        {k18,   k19, k20, k21, k22,   k23},\
+        {KC_NO, k24, k25, k26, KC_NO, k27},\
+    }

From 83b9483045d6a84d282e3a4e9d650e81f5368c53 Mon Sep 17 00:00:00 2001
From: yiancar <yiangosyiangou@cytanet.com.cy>
Date: Mon, 21 Feb 2022 17:11:49 +0000
Subject: [PATCH 673/867] [keyboard] DC01 i2c timeout fix (#16392)

---
 keyboards/dc01/left/config.h | 2 +-
 keyboards/dc01/left/matrix.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/dc01/left/config.h b/keyboards/dc01/left/config.h
index bc934e4a39..43883975c4 100644
--- a/keyboards/dc01/left/config.h
+++ b/keyboards/dc01/left/config.h
@@ -55,7 +55,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define BACKLIGHT_LEVELS 3
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
+#define DEBOUNCE 0
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c
index bf5aba8497..40533beac4 100644
--- a/keyboards/dc01/left/matrix.c
+++ b/keyboards/dc01/left/matrix.c
@@ -419,7 +419,7 @@ static void unselect_cols(void)
 
 // Complete rows from other modules over i2c
 i2c_status_t i2c_transaction(uint8_t address, uint32_t mask, uint8_t col_offset) {
-    i2c_status_t status = i2c_start(address, 50);
+    i2c_status_t status = i2c_start(address, 5);
     if (status < 0) {
         goto error;
     }

From 32903779181c31244c7c7b97a04bda0fd5b59de1 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 22 Feb 2022 01:12:18 +0800
Subject: [PATCH 674/867] [Keyboard] infinity81 (#16387)

---
 keyboards/ada/infinity81/config.h             | 126 ++++++++++++++++++
 keyboards/ada/infinity81/infinity81.c         |   4 +
 keyboards/ada/infinity81/infinity81.h         |  30 +++++
 keyboards/ada/infinity81/info.json            |  92 +++++++++++++
 .../ada/infinity81/keymaps/default/keymap.c   |  23 ++++
 .../ada/infinity81/keymaps/default/readme.md  |   1 +
 keyboards/ada/infinity81/readme.md            |  27 ++++
 keyboards/ada/infinity81/rules.mk             |  18 +++
 8 files changed, 321 insertions(+)
 create mode 100644 keyboards/ada/infinity81/config.h
 create mode 100644 keyboards/ada/infinity81/infinity81.c
 create mode 100644 keyboards/ada/infinity81/infinity81.h
 create mode 100644 keyboards/ada/infinity81/info.json
 create mode 100644 keyboards/ada/infinity81/keymaps/default/keymap.c
 create mode 100644 keyboards/ada/infinity81/keymaps/default/readme.md
 create mode 100644 keyboards/ada/infinity81/readme.md
 create mode 100644 keyboards/ada/infinity81/rules.mk

diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
new file mode 100644
index 0000000000..1cbce84720
--- /dev/null
+++ b/keyboards/ada/infinity81/config.h
@@ -0,0 +1,126 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xADA0
+#define PRODUCT_ID   0x0081
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Ada
+#define PRODUCT      infinity81
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+/*
+ * 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 { B3, B2, B1, B0, F6, B7 }
+#define MATRIX_COL_PINS { D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F5, F1, F4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN D0
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 107
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ada/infinity81/infinity81.c b/keyboards/ada/infinity81/infinity81.c
new file mode 100644
index 0000000000..7e20a1d705
--- /dev/null
+++ b/keyboards/ada/infinity81/infinity81.c
@@ -0,0 +1,4 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "infinity81.h"
diff --git a/keyboards/ada/infinity81/infinity81.h b/keyboards/ada/infinity81/infinity81.h
new file mode 100644
index 0000000000..199c6f3642
--- /dev/null
+++ b/keyboards/ada/infinity81/infinity81.h
@@ -0,0 +1,30 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,             \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413, K414, \
+	K500, K501, K502,             K505,                         K510, K511, K512, K513, K514  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, KC_NO }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  KC_NO, K413,  K414 }, \
+	{ K500,  K501,  K502,  KC_NO, KC_NO, K505,  KC_NO, KC_NO, KC_NO, KC_NO, K510,  K511,  K512,  K513,  K514 }  \
+}
diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json
new file mode 100644
index 0000000000..71fb774721
--- /dev/null
+++ b/keyboards/ada/infinity81/info.json
@@ -0,0 +1,92 @@
+{
+    "keyboard_name": "infinity81",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "K00 (B3,D1)", "x": 0, "y": 0 },
+                { "label": "K01 (B3,D2)", "x": 1.25, "y": 0 },
+                { "label": "K02 (B3,D3)", "x": 2.25, "y": 0 },
+                { "label": "K03 (B3,D5)", "x": 3.25, "y": 0 },
+                { "label": "K04 (B3,D4)", "x": 4.25, "y": 0 },
+                { "label": "K05 (B3,D6)", "x": 5.5, "y": 0 },
+                { "label": "K06 (B3,D7)", "x": 6.5, "y": 0 },
+                { "label": "K07 (B3,B4)", "x": 7.5, "y": 0 },
+                { "label": "K08 (B3,B5)", "x": 8.5, "y": 0 },
+                { "label": "K09 (B3,B6)", "x": 9.75, "y": 0 },
+                { "label": "K0A (B3,C6)", "x": 10.75, "y": 0 },
+                { "label": "K0B (B3,C7)", "x": 11.75, "y": 0 },
+                { "label": "K0C (B3,F5)", "x": 12.75, "y": 0 },
+                { "label": "K10 (B2,D1)", "x": 0, "y": 1.25 },
+                { "label": "K11 (B2,D2)", "x": 1, "y": 1.25 },
+                { "label": "K12 (B2,D3)", "x": 2, "y": 1.25 },
+                { "label": "K13 (B2,D5)", "x": 3, "y": 1.25 },
+                { "label": "K14 (B2,D4)", "x": 4, "y": 1.25 },
+                { "label": "K15 (B2,D6)", "x": 5, "y": 1.25 },
+                { "label": "K16 (B2,D7)", "x": 6, "y": 1.25 },
+                { "label": "K17 (B2,B4)", "x": 7, "y": 1.25 },
+                { "label": "K18 (B2,B5)", "x": 8, "y": 1.25 },
+                { "label": "K19 (B2,B6)", "x": 9, "y": 1.25 },
+                { "label": "K1A (B2,C6)", "x": 10, "y": 1.25 },
+                { "label": "K1B (B2,C7)", "x": 11, "y": 1.25 },
+                { "label": "K1C (B2,F5)", "x": 12, "y": 1.25 },
+                { "label": "K1D (B2,F1)", "x": 13, "y": 1.25, "w": 2 },
+                { "label": "K1E (B2,F4)", "x": 15, "y": 1.25 },
+                { "label": "K20 (B1,D1)", "x": 0, "y": 2.25, "w": 1.5 },
+                { "label": "K21 (B1,D2)", "x": 1.5, "y": 2.25 },
+                { "label": "K22 (B1,D3)", "x": 2.5, "y": 2.25 },
+                { "label": "K23 (B1,D5)", "x": 3.5, "y": 2.25 },
+                { "label": "K24 (B1,D4)", "x": 4.5, "y": 2.25 },
+                { "label": "K25 (B1,D6)", "x": 5.5, "y": 2.25 },
+                { "label": "K26 (B1,D7)", "x": 6.5, "y": 2.25 },
+                { "label": "K27 (B1,B4)", "x": 7.5, "y": 2.25 },
+                { "label": "K28 (B1,B5)", "x": 8.5, "y": 2.25 },
+                { "label": "K29 (B1,B6)", "x": 9.5, "y": 2.25 },
+                { "label": "K2A (B1,C6)", "x": 10.5, "y": 2.25 },
+                { "label": "K2B (B1,C7)", "x": 11.5, "y": 2.25 },
+                { "label": "K2C (B1,F5)", "x": 12.5, "y": 2.25 },
+                { "label": "K2D (B1,F1)", "x": 13.5, "y": 2.25, "w": 1.5 },
+                { "label": "K2E (B1,F4)", "x": 15, "y": 2.25 },
+                { "label": "K30 (B0,D1)", "x": 0, "y": 3.25, "w": 1.75 },
+                { "label": "K31 (B0,D2)", "x": 1.75, "y": 3.25 },
+                { "label": "K32 (B0,D3)", "x": 2.75, "y": 3.25 },
+                { "label": "K33 (B0,D5)", "x": 3.75, "y": 3.25 },
+                { "label": "K34 (B0,D4)", "x": 4.75, "y": 3.25 },
+                { "label": "K35 (B0,D6)", "x": 5.75, "y": 3.25 },
+                { "label": "K36 (B0,D7)", "x": 6.75, "y": 3.25 },
+                { "label": "K37 (B0,B4)", "x": 7.75, "y": 3.25 },
+                { "label": "K38 (B0,B5)", "x": 8.75, "y": 3.25 },
+                { "label": "K39 (B0,B6)", "x": 9.75, "y": 3.25 },
+                { "label": "K3A (B0,C6)", "x": 10.75, "y": 3.25 },
+                { "label": "K3B (B0,C7)", "x": 11.75, "y": 3.25 },
+                { "label": "K3D (B0,F1)", "x": 12.75, "y": 3.25, "w": 2.25 },
+                { "label": "K3E (B0,F4)", "x": 15, "y": 3.25 },
+                { "label": "K40 (F6,D1)", "x": 0, "y": 4.25, "w": 2.25 },
+                { "label": "K41 (F6,D2)", "x": 2.25, "y": 4.25 },
+                { "label": "K42 (F6,D3)", "x": 3.25, "y": 4.25 },
+                { "label": "K43 (F6,D5)", "x": 4.25, "y": 4.25 },
+                { "label": "K44 (F6,D4)", "x": 5.25, "y": 4.25 },
+                { "label": "K45 (F6,D6)", "x": 6.25, "y": 4.25 },
+                { "label": "K46 (F6,D7)", "x": 7.25, "y": 4.25 },
+                { "label": "K47 (F6,B4)", "x": 8.25, "y": 4.25 },
+                { "label": "K48 (F6,B5)", "x": 9.25, "y": 4.25 },
+                { "label": "K49 (F6,B6)", "x": 10.25, "y": 4.25 },
+                { "label": "K4A (F6,C6)", "x": 11.25, "y": 4.25 },
+                { "label": "K4B (F6,C7)", "x": 12.25, "y": 4.25, "w": 1.75 },
+                { "label": "K4D (F6,F1)", "x": 14, "y": 4.25 },
+                { "label": "K4E (F6,F4)", "x": 15, "y": 4.25 },
+                { "label": "K50 (B7,D1)", "x": 0, "y": 5.25, "w": 1.25 },
+                { "label": "K51 (B7,D2)", "x": 1.25, "y": 5.25, "w": 1.25 },
+                { "label": "K52 (B7,D3)", "x": 2.5, "y": 5.25, "w": 1.25 },
+                { "label": "K55 (B7,D6)", "x": 3.75, "y": 5.25, "w": 6.25 },
+                { "label": "K5A (B7,C6)", "x": 10, "y": 5.25, "w": 1.25 },
+                { "label": "K5B (B7,C7)", "x": 11.25, "y": 5.25, "w": 1.25 },
+                { "label": "K5C (B7,F5)", "x": 13, "y": 5.25 },
+                { "label": "K5D (B7,F1)", "x": 14, "y": 5.25 },
+                { "label": "K5E (B7,F4)", "x": 15, "y": 5.25 }
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/ada/infinity81/keymaps/default/keymap.c b/keyboards/ada/infinity81/keymaps/default/keymap.c
new file mode 100644
index 0000000000..0a6aae93f4
--- /dev/null
+++ b/keyboards/ada/infinity81/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+		KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
+		KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+		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_PGDN,
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, MO(1),
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+    [1] = LAYOUT(
+		RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/ada/infinity81/keymaps/default/readme.md b/keyboards/ada/infinity81/keymaps/default/readme.md
new file mode 100644
index 0000000000..1b6598c1df
--- /dev/null
+++ b/keyboards/ada/infinity81/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for infinity81
diff --git a/keyboards/ada/infinity81/readme.md b/keyboards/ada/infinity81/readme.md
new file mode 100644
index 0000000000..a134379ce5
--- /dev/null
+++ b/keyboards/ada/infinity81/readme.md
@@ -0,0 +1,27 @@
+# infinity81
+
+![infinity81](https://i.imgur.com/9d6IcuA.jpg)
+
+A per key RGB 75% with blocker keyboard
+
+* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
+* Hardware Supported: infinity81
+* Hardware Availability: no longer avaliable - future groupbuy possible
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ada/infinity81:default
+
+Flashing example for this keyboard:
+
+    make ada/infinity81:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/ada/infinity81/rules.mk b/keyboards/ada/infinity81/rules.mk
new file mode 100644
index 0000000000..3ff392a61f
--- /dev/null
+++ b/keyboards/ada/infinity81/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From a5901a6c0d4f5495279467650797a4fa0ac40368 Mon Sep 17 00:00:00 2001
From: Adam Lickel <adam@lickel.com>
Date: Mon, 21 Feb 2022 09:35:23 -0800
Subject: [PATCH 675/867] [Keymap] BDN9 keymap (#15924)

---
 keyboards/keebio/bdn9/keymaps/lickel/keymap.c | 157 ++++++++++++++++++
 .../keebio/bdn9/keymaps/lickel/readme.md      |  17 ++
 keyboards/keebio/bdn9/keymaps/lickel/rules.mk |   5 +
 3 files changed, 179 insertions(+)
 create mode 100644 keyboards/keebio/bdn9/keymaps/lickel/keymap.c
 create mode 100644 keyboards/keebio/bdn9/keymaps/lickel/readme.md
 create mode 100644 keyboards/keebio/bdn9/keymaps/lickel/rules.mk

diff --git a/keyboards/keebio/bdn9/keymaps/lickel/keymap.c b/keyboards/keebio/bdn9/keymaps/lickel/keymap.c
new file mode 100644
index 0000000000..7067b12d87
--- /dev/null
+++ b/keyboards/keebio/bdn9/keymaps/lickel/keymap.c
@@ -0,0 +1,157 @@
+/* Copyright 2022 @ Adam Lickel
+ *
+ * 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 encoder_names {
+    _LEFT,
+    _RIGHT,
+    _MIDDLE,
+};
+
+enum bdn9_layers {
+    _MEDIA = 0,
+    _XCODE,
+    _CUST1,
+    _CUST2,
+};
+
+#define KC_XCRUN LGUI(KC_R)
+#define KC_XCPAUSE LCTL(LGUI(KC_Y))
+#define KC_XCSTOP LGUI(KC_DOT)
+
+// clang-format off
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MEDIA] = LAYOUT(
+        TO(_XCODE), RGB_SPD,    RGB_SPI,
+        RGB_MOD,    KC_MPLY,    KC_MSTP,
+        RGB_RMOD,   KC_MNXT,    KC_MPRV
+    ),
+    [_XCODE] = LAYOUT(
+        TG(_XCODE), KC_NO,      KC_NO,
+        KC_XCRUN,   KC_XCPAUSE, KC_XCSTOP,
+        KC_F6,      KC_F7,      KC_F8
+    ),
+    [_CUST1] = LAYOUT(
+        TG(_CUST1), _______,    _______,
+        _______,    _______,    _______,
+        _______,    _______,    _______
+    ),
+    [_CUST2] = LAYOUT(
+        TG(_CUST2), _______,    _______,
+        _______,    _______,    _______,
+        _______,    _______,    _______
+    ),
+};
+
+// clang-format on
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+    uint8_t layer = get_highest_layer(state);
+
+    switch (layer) {
+        case _MEDIA:  // Reset
+            rgblight_reload_from_eeprom();
+            break;
+
+        case _XCODE:
+            rgblight_sethsv_noeeprom(HSV_BLUE);
+#    if defined(RGB_MATRIX_ENABLE) && defined(ENABLE_RGB_MATRIX_BREATHING)
+            rgb_matrix_mode_noeeprom(RGB_MATRIX_BREATHING);
+#    elif defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_EFFECT_BREATHING)
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 1);
+#    endif
+            break;
+
+        case _CUST1:
+            rgblight_sethsv_noeeprom(HSV_GREEN);
+#    if defined(RGB_MATRIX_ENABLE) && defined(ENABLE_RGB_MATRIX_BREATHING)
+            rgb_matrix_mode_noeeprom(RGB_MATRIX_BREATHING);
+#    elif defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_EFFECT_BREATHING)
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 1);
+#    endif
+            break;
+
+        case _CUST2:
+            rgblight_sethsv_noeeprom(HSV_PURPLE);
+#    if defined(RGB_MATRIX_ENABLE) && defined(ENABLE_RGB_MATRIX_BREATHING)
+            rgb_matrix_mode_noeeprom(RGB_MATRIX_BREATHING);
+#    elif defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_EFFECT_BREATHING)
+            rgblight_mode_noeeprom(RGBLIGHT_MODE_BREATHING + 1);
+#    endif
+            break;
+
+        default:
+            break;
+    }
+#endif
+    return state;
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    uint8_t layer = get_highest_layer(layer_state);
+
+    switch (layer) {
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+        case 0:  // Reset
+            if (index == _LEFT) {
+                if (clockwise) {
+                    rgblight_increase_hue();
+                } else {
+                    rgblight_decrease_hue();
+                }
+            } else if (index == _MIDDLE) {
+                if (clockwise) {
+                    rgblight_increase_sat();
+                } else {
+                    rgblight_decrease_sat();
+                }
+            } else if (index == _RIGHT) {
+                if (clockwise) {
+                    rgblight_increase_val();
+                } else {
+                    rgblight_decrease_val();
+                }
+            }
+            break;
+#endif
+
+        default:
+            if (index == _LEFT) {
+                if (clockwise) {
+                    tap_code(KC_VOLU);
+                } else {
+                    tap_code(KC_VOLD);
+                }
+            } else if (index == _MIDDLE) {
+                if (clockwise) {
+                    tap_code(KC_DOWN);
+                } else {
+                    tap_code(KC_UP);
+                }
+            } else if (index == _RIGHT) {
+                if (clockwise) {
+                    tap_code(KC_PGDN);
+                } else {
+                    tap_code(KC_PGUP);
+                }
+            }
+            break;
+    }
+    return true;
+}
diff --git a/keyboards/keebio/bdn9/keymaps/lickel/readme.md b/keyboards/keebio/bdn9/keymaps/lickel/readme.md
new file mode 100644
index 0000000000..b729319b99
--- /dev/null
+++ b/keyboards/keebio/bdn9/keymaps/lickel/readme.md
@@ -0,0 +1,17 @@
+# lickel's BDN9 keymap
+
+- Via support is enabled by default
+- Changing layers to non-zero changes the RGBs to breathing colors
+- Changing to layer 0 resets the RGBs to EEPROM settings
+- Layer 0 encoders are: Hue, Saturation, Value
+- Other layers are: Volume, Arrow, Pg up/down
+
+- Layer 0: Media Controls & RGB Effects
+- Layer 1: Xcode Debugging
+- Layers 2 and 3: Reserved for Via
+
+## Changelog
+
+### 1/17/2022 - 1.0
+
+- Initial release
diff --git a/keyboards/keebio/bdn9/keymaps/lickel/rules.mk b/keyboards/keebio/bdn9/keymaps/lickel/rules.mk
new file mode 100644
index 0000000000..c44f74d53a
--- /dev/null
+++ b/keyboards/keebio/bdn9/keymaps/lickel/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no

From 2f0dc0fb6d36b43e0d143224e4a9058b77c4e0e3 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Mon, 21 Feb 2022 09:44:27 -0800
Subject: [PATCH 676/867] Format code according to conventions (#16419)

---
 drivers/ps2/ps2_busywait.c                    |   5 +-
 quantum/action.c                              |  83 ++-
 quantum/action.h                              |   2 +-
 tmk_core/protocol/arm_atsam/usb/compiler.h    | 538 +++++++++---------
 tmk_core/protocol/arm_atsam/usb/udi_cdc.c     |  16 +-
 .../protocol/arm_atsam/usb/usb_device_udd.c   |   5 +-
 6 files changed, 320 insertions(+), 329 deletions(-)

diff --git a/drivers/ps2/ps2_busywait.c b/drivers/ps2/ps2_busywait.c
index 983194eea8..a426090155 100644
--- a/drivers/ps2/ps2_busywait.c
+++ b/drivers/ps2/ps2_busywait.c
@@ -125,11 +125,10 @@ uint8_t ps2_host_recv_response(void) {
     // Command may take 25ms/20ms at most([5]p.46, [3]p.21)
     // 250 * 100us(wait for start bit in ps2_host_recv)
     uint8_t data = 0;
-    uint8_t try
-        = 250;
+    uint8_t try  = 250;
     do {
         data = ps2_host_recv();
-    } while (try --&&ps2_error);
+    } while (try-- && ps2_error);
     return data;
 }
 
diff --git a/quantum/action.c b/quantum/action.c
index 5e81efb671..7a330b05cd 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -834,10 +834,9 @@ void register_code(uint8_t code) {
     }
 #endif
 
-    else if
-        IS_KEY(code) {
-            // TODO: should push command_proc out of this block?
-            if (command_proc(code)) return;
+    else if IS_KEY (code) {
+        // TODO: should push command_proc out of this block?
+        if (command_proc(code)) return;
 
 #ifndef NO_ACTION_ONESHOT
 /* TODO: remove
@@ -854,35 +853,33 @@ void register_code(uint8_t code) {
         } else
 */
 #endif
-            {
-                // Force a new key press if the key is already pressed
-                // without this, keys with the same keycode, but different
-                // modifiers will be reported incorrectly, see issue #1708
-                if (is_key_pressed(keyboard_report, code)) {
-                    del_key(code);
-                    send_keyboard_report();
-                }
-                add_key(code);
+        {
+            // Force a new key press if the key is already pressed
+            // without this, keys with the same keycode, but different
+            // modifiers will be reported incorrectly, see issue #1708
+            if (is_key_pressed(keyboard_report, code)) {
+                del_key(code);
                 send_keyboard_report();
             }
-        }
-    else if
-        IS_MOD(code) {
-            add_mods(MOD_BIT(code));
+            add_key(code);
             send_keyboard_report();
         }
+    } else if IS_MOD (code) {
+        add_mods(MOD_BIT(code));
+        send_keyboard_report();
+    }
 #ifdef EXTRAKEY_ENABLE
-    else if
-        IS_SYSTEM(code) { host_system_send(KEYCODE2SYSTEM(code)); }
-    else if
-        IS_CONSUMER(code) { host_consumer_send(KEYCODE2CONSUMER(code)); }
+    else if IS_SYSTEM (code) {
+        host_system_send(KEYCODE2SYSTEM(code));
+    } else if IS_CONSUMER (code) {
+        host_consumer_send(KEYCODE2CONSUMER(code));
+    }
 #endif
 #ifdef MOUSEKEY_ENABLE
-    else if
-        IS_MOUSEKEY(code) {
-            mousekey_on(code);
-            mousekey_send();
-        }
+    else if IS_MOUSEKEY (code) {
+        mousekey_on(code);
+        mousekey_send();
+    }
 #endif
 }
 
@@ -927,26 +924,22 @@ void unregister_code(uint8_t code) {
     }
 #endif
 
-    else if
-        IS_KEY(code) {
-            del_key(code);
-            send_keyboard_report();
-        }
-    else if
-        IS_MOD(code) {
-            del_mods(MOD_BIT(code));
-            send_keyboard_report();
-        }
-    else if
-        IS_SYSTEM(code) { host_system_send(0); }
-    else if
-        IS_CONSUMER(code) { host_consumer_send(0); }
+    else if IS_KEY (code) {
+        del_key(code);
+        send_keyboard_report();
+    } else if IS_MOD (code) {
+        del_mods(MOD_BIT(code));
+        send_keyboard_report();
+    } else if IS_SYSTEM (code) {
+        host_system_send(0);
+    } else if IS_CONSUMER (code) {
+        host_consumer_send(0);
+    }
 #ifdef MOUSEKEY_ENABLE
-    else if
-        IS_MOUSEKEY(code) {
-            mousekey_off(code);
-            mousekey_send();
-        }
+    else if IS_MOUSEKEY (code) {
+        mousekey_off(code);
+        mousekey_send();
+    }
 #endif
 }
 
diff --git a/quantum/action.h b/quantum/action.h
index b562f18c5b..8a357ded87 100644
--- a/quantum/action.h
+++ b/quantum/action.h
@@ -88,7 +88,7 @@ extern bool disable_action_cache;
 
 /* Code for handling one-handed key modifiers. */
 #ifdef SWAP_HANDS_ENABLE
-extern bool           swap_hands;
+extern bool                   swap_hands;
 extern const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS];
 #    if (MATRIX_COLS <= 8)
 typedef uint8_t swap_state_row_t;
diff --git a/tmk_core/protocol/arm_atsam/usb/compiler.h b/tmk_core/protocol/arm_atsam/usb/compiler.h
index 6ba2322340..4eeef96cf4 100644
--- a/tmk_core/protocol/arm_atsam/usb/compiler.h
+++ b/tmk_core/protocol/arm_atsam/usb/compiler.h
@@ -43,7 +43,7 @@
  */
 
 #ifndef UTILS_COMPILER_H_INCLUDED
-#    define UTILS_COMPILER_H_INCLUDED
+#define UTILS_COMPILER_H_INCLUDED
 
 /**
  * \defgroup group_sam0_utils Compiler abstraction layer and code utilities
@@ -54,38 +54,38 @@
  * @{
  */
 
-#    if (defined __ICCARM__)
-#        include <intrinsics.h>
-#    endif
+#if (defined __ICCARM__)
+#    include <intrinsics.h>
+#endif
 
-#    include <stddef.h>
+#include <stddef.h>
 //#include <parts.h>
 //#include <status_codes.h>
 //#include <preprocessor.h>
 //#include <io.h>
 
-#    ifndef __ASSEMBLY__
+#ifndef __ASSEMBLY__
 
-#        include <stdio.h>
-#        include <stdbool.h>
-#        include <stdint.h>
-#        include <stdlib.h>
+#    include <stdio.h>
+#    include <stdbool.h>
+#    include <stdint.h>
+#    include <stdlib.h>
 
 /**
  * \def UNUSED
  * \brief Marking \a v as a unused parameter or value.
  */
-#        define UNUSED(v) (void)(v)
+#    define UNUSED(v) (void)(v)
 
 /**
  * \def barrier
  * \brief Memory barrier
  */
-#        ifdef __GNUC__
-#            define barrier() asm volatile("" ::: "memory")
-#        else
-#            define barrier() asm("")
-#        endif
+#    ifdef __GNUC__
+#        define barrier() asm volatile("" ::: "memory")
+#    else
+#        define barrier() asm("")
+#    endif
 
 /**
  * \brief Emit the compiler pragma \a arg.
@@ -93,37 +93,37 @@
  * \param[in] arg  The pragma directive as it would appear after \e \#pragma
  *             (i.e. not stringified).
  */
-#        define COMPILER_PRAGMA(arg) _Pragma(#        arg)
+#    define COMPILER_PRAGMA(arg) _Pragma(#    arg)
 
 /**
  * \def COMPILER_PACK_SET(alignment)
  * \brief Set maximum alignment for subsequent struct and union definitions to \a alignment.
  */
-#        define COMPILER_PACK_SET(alignment) COMPILER_PRAGMA(pack(alignment))
+#    define COMPILER_PACK_SET(alignment) COMPILER_PRAGMA(pack(alignment))
 
 /**
  * \def COMPILER_PACK_RESET()
  * \brief Set default alignment for subsequent struct and union definitions.
  */
-#        define COMPILER_PACK_RESET() COMPILER_PRAGMA(pack())
+#    define COMPILER_PACK_RESET() COMPILER_PRAGMA(pack())
 
 /**
  * \brief Set aligned boundary.
  */
-#        if (defined __GNUC__) || (defined __CC_ARM)
-#            define COMPILER_ALIGNED(a) __attribute__((__aligned__(a)))
-#        elif (defined __ICCARM__)
-#            define COMPILER_ALIGNED(a) COMPILER_PRAGMA(data_alignment = a)
-#        endif
+#    if (defined __GNUC__) || (defined __CC_ARM)
+#        define COMPILER_ALIGNED(a) __attribute__((__aligned__(a)))
+#    elif (defined __ICCARM__)
+#        define COMPILER_ALIGNED(a) COMPILER_PRAGMA(data_alignment = a)
+#    endif
 
 /**
  * \brief Set word-aligned boundary.
  */
-#        if (defined __GNUC__) || defined(__CC_ARM)
-#            define COMPILER_WORD_ALIGNED __attribute__((__aligned__(4)))
-#        elif (defined __ICCARM__)
-#            define COMPILER_WORD_ALIGNED COMPILER_PRAGMA(data_alignment = 4)
-#        endif
+#    if (defined __GNUC__) || defined(__CC_ARM)
+#        define COMPILER_WORD_ALIGNED __attribute__((__aligned__(4)))
+#    elif (defined __ICCARM__)
+#        define COMPILER_WORD_ALIGNED COMPILER_PRAGMA(data_alignment = 4)
+#    endif
 
 /**
  * \def __always_inline
@@ -133,15 +133,15 @@
  * heuristics and inline the function no matter how big it thinks it
  * becomes.
  */
-#        if !defined(__always_inline)
-#            if defined(__CC_ARM)
-#                define __always_inline __forceinline
-#            elif (defined __GNUC__)
-#                define __always_inline __attribute__((__always_inline__))
-#            elif (defined __ICCARM__)
-#                define __always_inline _Pragma("inline=forced")
-#            endif
+#    if !defined(__always_inline)
+#        if defined(__CC_ARM)
+#            define __always_inline __forceinline
+#        elif (defined __GNUC__)
+#            define __always_inline __attribute__((__always_inline__))
+#        elif (defined __ICCARM__)
+#            define __always_inline _Pragma("inline=forced")
 #        endif
+#    endif
 
 /**
  * \def __no_inline
@@ -151,13 +151,13 @@
  * heuristics and not inline the function no matter how small it thinks it
  * becomes.
  */
-#        if defined(__CC_ARM)
-#            define __no_inline __attribute__((noinline))
-#        elif (defined __GNUC__)
-#            define __no_inline __attribute__((noinline))
-#        elif (defined __ICCARM__)
-#            define __no_inline _Pragma("inline=never")
-#        endif
+#    if defined(__CC_ARM)
+#        define __no_inline __attribute__((noinline))
+#    elif (defined __GNUC__)
+#        define __no_inline __attribute__((noinline))
+#    elif (defined __ICCARM__)
+#        define __no_inline _Pragma("inline=never")
+#    endif
 
 /** \brief This macro is used to test fatal errors.
  *
@@ -168,47 +168,47 @@
  *
  * \param[in] expr  Expression to evaluate and supposed to be nonzero.
  */
-#        if defined(_ASSERT_ENABLE_)
-#            if defined(TEST_SUITE_DEFINE_ASSERT_MACRO)
-#                include "unit_test/suite.h"
-#            else
-#                undef TEST_SUITE_DEFINE_ASSERT_MACRO
-#                define Assert(expr)                 \
-                    {                                \
-                        if (!(expr)) asm("BKPT #0"); \
-                    }
-#            endif
+#    if defined(_ASSERT_ENABLE_)
+#        if defined(TEST_SUITE_DEFINE_ASSERT_MACRO)
+#            include "unit_test/suite.h"
 #        else
-#            define Assert(expr) ((void)0)
+#            undef TEST_SUITE_DEFINE_ASSERT_MACRO
+#            define Assert(expr)                 \
+                {                                \
+                    if (!(expr)) asm("BKPT #0"); \
+                }
 #        endif
+#    else
+#        define Assert(expr) ((void)0)
+#    endif
 
 /* Define WEAK attribute */
-#        if defined(__CC_ARM)
-#            define WEAK __attribute__((weak))
-#        elif defined(__ICCARM__)
-#            define WEAK __weak
-#        elif defined(__GNUC__)
-#            define WEAK __attribute__((weak))
-#        endif
+#    if defined(__CC_ARM)
+#        define WEAK __attribute__((weak))
+#    elif defined(__ICCARM__)
+#        define WEAK __weak
+#    elif defined(__GNUC__)
+#        define WEAK __attribute__((weak))
+#    endif
 
 /* Define NO_INIT attribute */
-#        if defined(__CC_ARM)
-#            define NO_INIT __attribute__((zero_init))
-#        elif defined(__ICCARM__)
-#            define NO_INIT __no_init
-#        elif defined(__GNUC__)
-#            define NO_INIT __attribute__((section(".no_init")))
-#        endif
+#    if defined(__CC_ARM)
+#        define NO_INIT __attribute__((zero_init))
+#    elif defined(__ICCARM__)
+#        define NO_INIT __no_init
+#    elif defined(__GNUC__)
+#        define NO_INIT __attribute__((section(".no_init")))
+#    endif
 
 //#include "interrupt.h"
 
 /** \name Usual Types
  * @{ */
-#        ifndef __cplusplus
-#            if !defined(__bool_true_false_are_defined)
+#    ifndef __cplusplus
+#        if !defined(__bool_true_false_are_defined)
 typedef unsigned char bool;
-#            endif
 #        endif
+#    endif
 typedef uint16_t le16_t;
 typedef uint16_t be16_t;
 typedef uint32_t le32_t;
@@ -347,22 +347,22 @@ typedef struct {
 
 /** @} */
 
-#    endif /* #ifndef __ASSEMBLY__ */
+#endif /* #ifndef __ASSEMBLY__ */
 
 /** \name Usual Constants
  * @{ */
 // kmod #define DISABLE   0
 // kmod #define ENABLE    1
 
-#    ifndef __cplusplus
-#        if !defined(__bool_true_false_are_defined)
-#            define false 0
-#            define true 1
-#        endif
+#ifndef __cplusplus
+#    if !defined(__bool_true_false_are_defined)
+#        define false 0
+#        define true 1
 #    endif
+#endif
 /** @} */
 
-#    ifndef __ASSEMBLY__
+#ifndef __ASSEMBLY__
 
 /** \name Optimization Control
  * @{ */
@@ -371,17 +371,17 @@ typedef struct {
  * \def likely(exp)
  * \brief The expression \a exp is likely to be true
  */
-#        if !defined(likely) || defined(__DOXYGEN__)
-#            define likely(exp) (exp)
-#        endif
+#    if !defined(likely) || defined(__DOXYGEN__)
+#        define likely(exp) (exp)
+#    endif
 
 /**
  * \def unlikely(exp)
  * \brief The expression \a exp is unlikely to be true
  */
-#        if !defined(unlikely) || defined(__DOXYGEN__)
-#            define unlikely(exp) (exp)
-#        endif
+#    if !defined(unlikely) || defined(__DOXYGEN__)
+#        define unlikely(exp) (exp)
+#    endif
 
 /**
  * \def is_constant(exp)
@@ -391,11 +391,11 @@ typedef struct {
  *
  * \return true if \a exp is constant, false otherwise.
  */
-#        if (defined __GNUC__) || (defined __CC_ARM)
-#            define is_constant(exp) __builtin_constant_p(exp)
-#        else
-#            define is_constant(exp) (0)
-#        endif
+#    if (defined __GNUC__) || (defined __CC_ARM)
+#        define is_constant(exp) __builtin_constant_p(exp)
+#    else
+#        define is_constant(exp) (0)
+#    endif
 
 /** @} */
 
@@ -409,7 +409,7 @@ typedef struct {
  *
  * \return Read bits.
  */
-#        define Rd_bits(value, mask) ((value) & (mask))
+#    define Rd_bits(value, mask) ((value) & (mask))
 
 /** \brief Writes the bits of a C lvalue specified by a given bit-mask.
  *
@@ -419,7 +419,7 @@ typedef struct {
  *
  * \return Resulting value with written bits.
  */
-#        define Wr_bits(lvalue, mask, bits) ((lvalue) = ((lvalue) & ~(mask)) | ((bits) & (mask)))
+#    define Wr_bits(lvalue, mask, bits) ((lvalue) = ((lvalue) & ~(mask)) | ((bits) & (mask)))
 
 /** \brief Tests the bits of a value specified by a given bit-mask.
  *
@@ -428,7 +428,7 @@ typedef struct {
  *
  * \return \c 1 if at least one of the tested bits is set, else \c 0.
  */
-#        define Tst_bits(value, mask) (Rd_bits(value, mask) != 0)
+#    define Tst_bits(value, mask) (Rd_bits(value, mask) != 0)
 
 /** \brief Clears the bits of a C lvalue specified by a given bit-mask.
  *
@@ -437,7 +437,7 @@ typedef struct {
  *
  * \return Resulting value with cleared bits.
  */
-#        define Clr_bits(lvalue, mask) ((lvalue) &= ~(mask))
+#    define Clr_bits(lvalue, mask) ((lvalue) &= ~(mask))
 
 /** \brief Sets the bits of a C lvalue specified by a given bit-mask.
  *
@@ -446,7 +446,7 @@ typedef struct {
  *
  * \return Resulting value with set bits.
  */
-#        define Set_bits(lvalue, mask) ((lvalue) |= (mask))
+#    define Set_bits(lvalue, mask) ((lvalue) |= (mask))
 
 /** \brief Toggles the bits of a C lvalue specified by a given bit-mask.
  *
@@ -455,7 +455,7 @@ typedef struct {
  *
  * \return Resulting value with toggled bits.
  */
-#        define Tgl_bits(lvalue, mask) ((lvalue) ^= (mask))
+#    define Tgl_bits(lvalue, mask) ((lvalue) ^= (mask))
 
 /** \brief Reads the bit-field of a value specified by a given bit-mask.
  *
@@ -464,7 +464,7 @@ typedef struct {
  *
  * \return Read bit-field.
  */
-#        define Rd_bitfield(value, mask) (Rd_bits(value, mask) >> ctz(mask))
+#    define Rd_bitfield(value, mask) (Rd_bits(value, mask) >> ctz(mask))
 
 /** \brief Writes the bit-field of a C lvalue specified by a given bit-mask.
  *
@@ -474,7 +474,7 @@ typedef struct {
  *
  * \return Resulting value with written bit-field.
  */
-#        define Wr_bitfield(lvalue, mask, bitfield) (Wr_bits(lvalue, mask, (uint32_t)(bitfield) << ctz(mask)))
+#    define Wr_bitfield(lvalue, mask, bitfield) (Wr_bits(lvalue, mask, (uint32_t)(bitfield) << ctz(mask)))
 
 /** @} */
 
@@ -498,11 +498,11 @@ typedef struct {
  *
  * \return The count of leading zero bits in \a u.
  */
-#        if (defined __GNUC__) || (defined __CC_ARM)
-#            define clz(u) ((u) ? __builtin_clz(u) : 32)
-#        else
-#            define clz(u) (((u) == 0) ? 32 : ((u) & (1ul << 31)) ? 0 : ((u) & (1ul << 30)) ? 1 : ((u) & (1ul << 29)) ? 2 : ((u) & (1ul << 28)) ? 3 : ((u) & (1ul << 27)) ? 4 : ((u) & (1ul << 26)) ? 5 : ((u) & (1ul << 25)) ? 6 : ((u) & (1ul << 24)) ? 7 : ((u) & (1ul << 23)) ? 8 : ((u) & (1ul << 22)) ? 9 : ((u) & (1ul << 21)) ? 10 : ((u) & (1ul << 20)) ? 11 : ((u) & (1ul << 19)) ? 12 : ((u) & (1ul << 18)) ? 13 : ((u) & (1ul << 17)) ? 14 : ((u) & (1ul << 16)) ? 15 : ((u) & (1ul << 15)) ? 16 : ((u) & (1ul << 14)) ? 17 : ((u) & (1ul << 13)) ? 18 : ((u) & (1ul << 12)) ? 19 : ((u) & (1ul << 11)) ? 20 : ((u) & (1ul << 10)) ? 21 : ((u) & (1ul << 9)) ? 22 : ((u) & (1ul << 8)) ? 23 : ((u) & (1ul << 7)) ? 24 : ((u) & (1ul << 6)) ? 25 : ((u) & (1ul << 5)) ? 26 : ((u) & (1ul << 4)) ? 27 : ((u) & (1ul << 3)) ? 28 : ((u) & (1ul << 2)) ? 29 : ((u) & (1ul << 1)) ? 30 : 31)
-#        endif
+#    if (defined __GNUC__) || (defined __CC_ARM)
+#        define clz(u) ((u) ? __builtin_clz(u) : 32)
+#    else
+#        define clz(u) (((u) == 0) ? 32 : ((u) & (1ul << 31)) ? 0 : ((u) & (1ul << 30)) ? 1 : ((u) & (1ul << 29)) ? 2 : ((u) & (1ul << 28)) ? 3 : ((u) & (1ul << 27)) ? 4 : ((u) & (1ul << 26)) ? 5 : ((u) & (1ul << 25)) ? 6 : ((u) & (1ul << 24)) ? 7 : ((u) & (1ul << 23)) ? 8 : ((u) & (1ul << 22)) ? 9 : ((u) & (1ul << 21)) ? 10 : ((u) & (1ul << 20)) ? 11 : ((u) & (1ul << 19)) ? 12 : ((u) & (1ul << 18)) ? 13 : ((u) & (1ul << 17)) ? 14 : ((u) & (1ul << 16)) ? 15 : ((u) & (1ul << 15)) ? 16 : ((u) & (1ul << 14)) ? 17 : ((u) & (1ul << 13)) ? 18 : ((u) & (1ul << 12)) ? 19 : ((u) & (1ul << 11)) ? 20 : ((u) & (1ul << 10)) ? 21 : ((u) & (1ul << 9)) ? 22 : ((u) & (1ul << 8)) ? 23 : ((u) & (1ul << 7)) ? 24 : ((u) & (1ul << 6)) ? 25 : ((u) & (1ul << 5)) ? 26 : ((u) & (1ul << 4)) ? 27 : ((u) & (1ul << 3)) ? 28 : ((u) & (1ul << 2)) ? 29 : ((u) & (1ul << 1)) ? 30 : 31)
+#    endif
 
 /** \brief Counts the trailing zero bits of the given value considered as a 32-bit integer.
  *
@@ -510,11 +510,11 @@ typedef struct {
  *
  * \return The count of trailing zero bits in \a u.
  */
-#        if (defined __GNUC__) || (defined __CC_ARM)
-#            define ctz(u) ((u) ? __builtin_ctz(u) : 32)
-#        else
-#            define ctz(u) ((u) & (1ul << 0) ? 0 : (u) & (1ul << 1) ? 1 : (u) & (1ul << 2) ? 2 : (u) & (1ul << 3) ? 3 : (u) & (1ul << 4) ? 4 : (u) & (1ul << 5) ? 5 : (u) & (1ul << 6) ? 6 : (u) & (1ul << 7) ? 7 : (u) & (1ul << 8) ? 8 : (u) & (1ul << 9) ? 9 : (u) & (1ul << 10) ? 10 : (u) & (1ul << 11) ? 11 : (u) & (1ul << 12) ? 12 : (u) & (1ul << 13) ? 13 : (u) & (1ul << 14) ? 14 : (u) & (1ul << 15) ? 15 : (u) & (1ul << 16) ? 16 : (u) & (1ul << 17) ? 17 : (u) & (1ul << 18) ? 18 : (u) & (1ul << 19) ? 19 : (u) & (1ul << 20) ? 20 : (u) & (1ul << 21) ? 21 : (u) & (1ul << 22) ? 22 : (u) & (1ul << 23) ? 23 : (u) & (1ul << 24) ? 24 : (u) & (1ul << 25) ? 25 : (u) & (1ul << 26) ? 26 : (u) & (1ul << 27) ? 27 : (u) & (1ul << 28) ? 28 : (u) & (1ul << 29) ? 29 : (u) & (1ul << 30) ? 30 : (u) & (1ul << 31) ? 31 : 32)
-#        endif
+#    if (defined __GNUC__) || (defined __CC_ARM)
+#        define ctz(u) ((u) ? __builtin_ctz(u) : 32)
+#    else
+#        define ctz(u) ((u) & (1ul << 0) ? 0 : (u) & (1ul << 1) ? 1 : (u) & (1ul << 2) ? 2 : (u) & (1ul << 3) ? 3 : (u) & (1ul << 4) ? 4 : (u) & (1ul << 5) ? 5 : (u) & (1ul << 6) ? 6 : (u) & (1ul << 7) ? 7 : (u) & (1ul << 8) ? 8 : (u) & (1ul << 9) ? 9 : (u) & (1ul << 10) ? 10 : (u) & (1ul << 11) ? 11 : (u) & (1ul << 12) ? 12 : (u) & (1ul << 13) ? 13 : (u) & (1ul << 14) ? 14 : (u) & (1ul << 15) ? 15 : (u) & (1ul << 16) ? 16 : (u) & (1ul << 17) ? 17 : (u) & (1ul << 18) ? 18 : (u) & (1ul << 19) ? 19 : (u) & (1ul << 20) ? 20 : (u) & (1ul << 21) ? 21 : (u) & (1ul << 22) ? 22 : (u) & (1ul << 23) ? 23 : (u) & (1ul << 24) ? 24 : (u) & (1ul << 25) ? 25 : (u) & (1ul << 26) ? 26 : (u) & (1ul << 27) ? 27 : (u) & (1ul << 28) ? 28 : (u) & (1ul << 29) ? 29 : (u) & (1ul << 30) ? 30 : (u) & (1ul << 31) ? 31 : 32)
+#    endif
 
 /** @} */
 
@@ -527,7 +527,7 @@ typedef struct {
  *
  * \return Value resulting from \a u8 with reversed bits.
  */
-#        define bit_reverse8(u8) ((U8)(bit_reverse32((U8)(u8)) >> 24))
+#    define bit_reverse8(u8) ((U8)(bit_reverse32((U8)(u8)) >> 24))
 
 /** \brief Reverses the bits of \a u16.
  *
@@ -535,7 +535,7 @@ typedef struct {
  *
  * \return Value resulting from \a u16 with reversed bits.
  */
-#        define bit_reverse16(u16) ((uint16_t)(bit_reverse32((uint16_t)(u16)) >> 16))
+#    define bit_reverse16(u16) ((uint16_t)(bit_reverse32((uint16_t)(u16)) >> 16))
 
 /** \brief Reverses the bits of \a u32.
  *
@@ -543,7 +543,7 @@ typedef struct {
  *
  * \return Value resulting from \a u32 with reversed bits.
  */
-#        define bit_reverse32(u32) __RBIT(u32)
+#    define bit_reverse32(u32) __RBIT(u32)
 
 /** \brief Reverses the bits of \a u64.
  *
@@ -551,7 +551,7 @@ typedef struct {
  *
  * \return Value resulting from \a u64 with reversed bits.
  */
-#        define bit_reverse64(u64) ((uint64_t)(((uint64_t)bit_reverse32((uint64_t)(u64) >> 32)) | ((uint64_t)bit_reverse32((uint64_t)(u64)) << 32)))
+#    define bit_reverse64(u64) ((uint64_t)(((uint64_t)bit_reverse32((uint64_t)(u64) >> 32)) | ((uint64_t)bit_reverse32((uint64_t)(u64)) << 32)))
 
 /** @} */
 
@@ -565,7 +565,7 @@ typedef struct {
  *
  * \return \c 1 if the number \a val is aligned with the \a n boundary, else \c 0.
  */
-#        define Test_align(val, n) (!Tst_bits(val, (n)-1))
+#    define Test_align(val, n) (!Tst_bits(val, (n)-1))
 
 /** \brief Gets alignment of the number \a val with respect to the \a n boundary.
  *
@@ -574,7 +574,7 @@ typedef struct {
  *
  * \return Alignment of the number \a val with respect to the \a n boundary.
  */
-#        define Get_align(val, n) (Rd_bits(val, (n)-1))
+#    define Get_align(val, n) (Rd_bits(val, (n)-1))
 
 /** \brief Sets alignment of the lvalue number \a lval to \a alg with respect to the \a n boundary.
  *
@@ -584,7 +584,7 @@ typedef struct {
  *
  * \return New value of \a lval resulting from its alignment set to \a alg with respect to the \a n boundary.
  */
-#        define Set_align(lval, n, alg) (Wr_bits(lval, (n)-1, alg))
+#    define Set_align(lval, n, alg) (Wr_bits(lval, (n)-1, alg))
 
 /** \brief Aligns the number \a val with the upper \a n boundary.
  *
@@ -593,7 +593,7 @@ typedef struct {
  *
  * \return Value resulting from the number \a val aligned with the upper \a n boundary.
  */
-#        define Align_up(val, n) (((val) + ((n)-1)) & ~((n)-1))
+#    define Align_up(val, n) (((val) + ((n)-1)) & ~((n)-1))
 
 /** \brief Aligns the number \a val with the lower \a n boundary.
  *
@@ -602,7 +602,7 @@ typedef struct {
  *
  * \return Value resulting from the number \a val aligned with the lower \a n boundary.
  */
-#        define Align_down(val, n) ((val) & ~((n)-1))
+#    define Align_down(val, n) ((val) & ~((n)-1))
 
 /** @} */
 
@@ -627,9 +627,9 @@ typedef struct {
  *
  * \note More optimized if only used with values known at compile time.
  */
-#        define Abs(a) (((a) < 0) ? -(a) : (a))
+#    define Abs(a) (((a) < 0) ? -(a) : (a))
 
-#        ifndef __cplusplus
+#    ifndef __cplusplus
 /** \brief Takes the minimal value of \a a and \a b.
  *
  * \param[in] a Input value.
@@ -639,7 +639,7 @@ typedef struct {
  *
  * \note More optimized if only used with values known at compile time.
  */
-#            define Min(a, b) (((a) < (b)) ? (a) : (b))
+#        define Min(a, b) (((a) < (b)) ? (a) : (b))
 
 /** \brief Takes the maximal value of \a a and \a b.
  *
@@ -650,7 +650,7 @@ typedef struct {
  *
  * \note More optimized if only used with values known at compile time.
  */
-#            define Max(a, b) (((a) > (b)) ? (a) : (b))
+#        define Max(a, b) (((a) > (b)) ? (a) : (b))
 
 /** \brief Takes the minimal value of \a a and \a b.
  *
@@ -661,7 +661,7 @@ typedef struct {
  *
  * \note More optimized if only used with values unknown at compile time.
  */
-#            define min(a, b) Min(a, b)
+#        define min(a, b) Min(a, b)
 
 /** \brief Takes the maximal value of \a a and \a b.
  *
@@ -672,8 +672,8 @@ typedef struct {
  *
  * \note More optimized if only used with values unknown at compile time.
  */
-#            define max(a, b) Max(a, b)
-#        endif
+#        define max(a, b) Max(a, b)
+#    endif
 
 /** @} */
 
@@ -688,34 +688,34 @@ typedef struct {
  *
  * \note It may be used as a long jump opcode in some special cases.
  */
-#        define Long_call(addr) ((*(void (*)(void))(addr))())
+#    define Long_call(addr) ((*(void (*)(void))(addr))())
 
 /** \name MCU Endianism Handling
  *  ARM is MCU little endian.
  *
  * @{ */
-#        define BE16(x) swap16(x)
-#        define LE16(x) (x)
+#    define BE16(x) swap16(x)
+#    define LE16(x) (x)
 
-#        define le16_to_cpu(x) (x)
-#        define cpu_to_le16(x) (x)
-#        define LE16_TO_CPU(x) (x)
-#        define CPU_TO_LE16(x) (x)
+#    define le16_to_cpu(x) (x)
+#    define cpu_to_le16(x) (x)
+#    define LE16_TO_CPU(x) (x)
+#    define CPU_TO_LE16(x) (x)
 
-#        define be16_to_cpu(x) swap16(x)
-#        define cpu_to_be16(x) swap16(x)
-#        define BE16_TO_CPU(x) swap16(x)
-#        define CPU_TO_BE16(x) swap16(x)
+#    define be16_to_cpu(x) swap16(x)
+#    define cpu_to_be16(x) swap16(x)
+#    define BE16_TO_CPU(x) swap16(x)
+#    define CPU_TO_BE16(x) swap16(x)
 
-#        define le32_to_cpu(x) (x)
-#        define cpu_to_le32(x) (x)
-#        define LE32_TO_CPU(x) (x)
-#        define CPU_TO_LE32(x) (x)
+#    define le32_to_cpu(x) (x)
+#    define cpu_to_le32(x) (x)
+#    define LE32_TO_CPU(x) (x)
+#    define CPU_TO_LE32(x) (x)
 
-#        define be32_to_cpu(x) swap32(x)
-#        define cpu_to_be32(x) swap32(x)
-#        define BE32_TO_CPU(x) swap32(x)
-#        define CPU_TO_BE32(x) swap32(x)
+#    define be32_to_cpu(x) swap32(x)
+#    define cpu_to_be32(x) swap32(x)
+#    define BE32_TO_CPU(x) swap32(x)
+#    define CPU_TO_BE32(x) swap32(x)
 /** @} */
 
 /** \name Endianism Conversion
@@ -738,7 +738,7 @@ typedef struct {
  *
  * \note More optimized if only used with values known at compile time.
  */
-#        define Swap16(u16) ((uint16_t)(((uint16_t)(u16) >> 8) | ((uint16_t)(u16) << 8)))
+#    define Swap16(u16) ((uint16_t)(((uint16_t)(u16) >> 8) | ((uint16_t)(u16) << 8)))
 
 /** \brief Toggles the endianism of \a u32 (by swapping its bytes).
  *
@@ -748,7 +748,7 @@ typedef struct {
  *
  * \note More optimized if only used with values known at compile time.
  */
-#        define Swap32(u32) ((uint32_t)(((uint32_t)Swap16((uint32_t)(u32) >> 16)) | ((uint32_t)Swap16((uint32_t)(u32)) << 16)))
+#    define Swap32(u32) ((uint32_t)(((uint32_t)Swap16((uint32_t)(u32) >> 16)) | ((uint32_t)Swap16((uint32_t)(u32)) << 16)))
 
 /** \brief Toggles the endianism of \a u64 (by swapping its bytes).
  *
@@ -758,7 +758,7 @@ typedef struct {
  *
  * \note More optimized if only used with values known at compile time.
  */
-#        define Swap64(u64) ((uint64_t)(((uint64_t)Swap32((uint64_t)(u64) >> 32)) | ((uint64_t)Swap32((uint64_t)(u64)) << 32)))
+#    define Swap64(u64) ((uint64_t)(((uint64_t)Swap32((uint64_t)(u64) >> 32)) | ((uint64_t)Swap32((uint64_t)(u64)) << 32)))
 
 /** \brief Toggles the endianism of \a u16 (by swapping its bytes).
  *
@@ -768,7 +768,7 @@ typedef struct {
  *
  * \note More optimized if only used with values unknown at compile time.
  */
-#        define swap16(u16) Swap16(u16)
+#    define swap16(u16) Swap16(u16)
 
 /** \brief Toggles the endianism of \a u32 (by swapping its bytes).
  *
@@ -778,11 +778,11 @@ typedef struct {
  *
  * \note More optimized if only used with values unknown at compile time.
  */
-#        if (defined __GNUC__)
-#            define swap32(u32) ((uint32_t)__builtin_bswap32((uint32_t)(u32)))
-#        else
-#            define swap32(u32) Swap32(u32)
-#        endif
+#    if (defined __GNUC__)
+#        define swap32(u32) ((uint32_t)__builtin_bswap32((uint32_t)(u32)))
+#    else
+#        define swap32(u32) Swap32(u32)
+#    endif
 
 /** \brief Toggles the endianism of \a u64 (by swapping its bytes).
  *
@@ -792,11 +792,11 @@ typedef struct {
  *
  * \note More optimized if only used with values unknown at compile time.
  */
-#        if (defined __GNUC__)
-#            define swap64(u64) ((uint64_t)__builtin_bswap64((uint64_t)(u64)))
-#        else
-#            define swap64(u64) ((uint64_t)(((uint64_t)swap32((uint64_t)(u64) >> 32)) | ((uint64_t)swap32((uint64_t)(u64)) << 32)))
-#        endif
+#    if (defined __GNUC__)
+#        define swap64(u64) ((uint64_t)__builtin_bswap64((uint64_t)(u64)))
+#    else
+#        define swap64(u64) ((uint64_t)(((uint64_t)swap32((uint64_t)(u64) >> 32)) | ((uint64_t)swap32((uint64_t)(u64)) << 32)))
+#    endif
 
 /** @} */
 
@@ -804,16 +804,16 @@ typedef struct {
  *
  * @{ */
 
-#        define _GLOBEXT_ extern   /**< extern storage-class specifier. */
-#        define _CONST_TYPE_ const /**< const type qualifier. */
-#        define _MEM_TYPE_SLOW_    /**< Slow memory type. */
-#        define _MEM_TYPE_MEDFAST_ /**< Fairly fast memory type. */
-#        define _MEM_TYPE_FAST_    /**< Fast memory type. */
+#    define _GLOBEXT_ extern   /**< extern storage-class specifier. */
+#    define _CONST_TYPE_ const /**< const type qualifier. */
+#    define _MEM_TYPE_SLOW_    /**< Slow memory type. */
+#    define _MEM_TYPE_MEDFAST_ /**< Fairly fast memory type. */
+#    define _MEM_TYPE_FAST_    /**< Fast memory type. */
 
-#        define memcmp_ram2ram memcmp  /**< Target-specific memcmp of RAM to RAM. */
-#        define memcmp_code2ram memcmp /**< Target-specific memcmp of RAM to NVRAM. */
-#        define memcpy_ram2ram memcpy  /**< Target-specific memcpy from RAM to RAM. */
-#        define memcpy_code2ram memcpy /**< Target-specific memcpy from NVRAM to RAM. */
+#    define memcmp_ram2ram memcmp  /**< Target-specific memcmp of RAM to RAM. */
+#    define memcmp_code2ram memcmp /**< Target-specific memcmp of RAM to NVRAM. */
+#    define memcpy_ram2ram memcpy  /**< Target-specific memcpy from RAM to RAM. */
+#    define memcpy_code2ram memcpy /**< Target-specific memcpy from NVRAM to RAM. */
 
 /** @} */
 
@@ -826,51 +826,51 @@ typedef struct {
  *
  * \return (\a a / \a b) rounded up to the nearest integer.
  */
-#        define div_ceil(a, b) (((a) + (b)-1) / (b))
+#    define div_ceil(a, b) (((a) + (b)-1) / (b))
 
-#    endif /* #ifndef __ASSEMBLY__ */
-#    ifdef __ICCARM__
+#endif /* #ifndef __ASSEMBLY__ */
+#ifdef __ICCARM__
 /** \name Compiler Keywords
  *
  * Port of some keywords from GCC to IAR Embedded Workbench.
  *
  * @{ */
 
-#        define __asm__ asm
-#        define __inline__ inline
-#        define __volatile__
+#    define __asm__ asm
+#    define __inline__ inline
+#    define __volatile__
 
 /** @} */
 
-#    endif
+#endif
 
-#    define FUNC_PTR void *
+#define FUNC_PTR void *
 /**
  * \def unused
  * \brief Marking \a v as a unused parameter or value.
  */
-#    define unused(v)  \
-        do {           \
-            (void)(v); \
-        } while (0)
+#define unused(v)  \
+    do {           \
+        (void)(v); \
+    } while (0)
 
 /* Define RAMFUNC attribute */
-#    if defined(__CC_ARM) /* Keil uVision 4 */
-#        define RAMFUNC __attribute__((section(".ramfunc")))
-#    elif defined(__ICCARM__) /* IAR Ewarm 5.41+ */
-#        define RAMFUNC __ramfunc
-#    elif defined(__GNUC__) /* GCC CS3 2009q3-68 */
-#        define RAMFUNC __attribute__((section(".ramfunc")))
-#    endif
+#if defined(__CC_ARM) /* Keil uVision 4 */
+#    define RAMFUNC __attribute__((section(".ramfunc")))
+#elif defined(__ICCARM__) /* IAR Ewarm 5.41+ */
+#    define RAMFUNC __ramfunc
+#elif defined(__GNUC__) /* GCC CS3 2009q3-68 */
+#    define RAMFUNC __attribute__((section(".ramfunc")))
+#endif
 
 /* Define OPTIMIZE_HIGH attribute */
-#    if defined(__CC_ARM) /* Keil uVision 4 */
-#        define OPTIMIZE_HIGH _Pragma("O3")
-#    elif defined(__ICCARM__) /* IAR Ewarm 5.41+ */
-#        define OPTIMIZE_HIGH _Pragma("optimize=high")
-#    elif defined(__GNUC__) /* GCC CS3 2009q3-68 */
-#        define OPTIMIZE_HIGH __attribute__((optimize("s")))
-#    endif
+#if defined(__CC_ARM) /* Keil uVision 4 */
+#    define OPTIMIZE_HIGH _Pragma("O3")
+#elif defined(__ICCARM__) /* IAR Ewarm 5.41+ */
+#    define OPTIMIZE_HIGH _Pragma("optimize=high")
+#elif defined(__GNUC__) /* GCC CS3 2009q3-68 */
+#    define OPTIMIZE_HIGH __attribute__((optimize("s")))
+#endif
 // kmod #define PASS      0
 // kmod #define FAIL      1
 // kmod #define LOW       0
@@ -887,101 +887,101 @@ typedef uint64_t U64;  //!< 64-bit unsigned integer.
 typedef float    F32;  //!< 32-bit floating-point number.
 typedef double   F64;  //!< 64-bit floating-point number.
 
-#    define MSB(u16) (((U8 *)&(u16))[1])  //!< Most significant byte of \a u16.
-#    define LSB(u16) (((U8 *)&(u16))[0])  //!< Least significant byte of \a u16.
+#define MSB(u16) (((U8 *)&(u16))[1])  //!< Most significant byte of \a u16.
+#define LSB(u16) (((U8 *)&(u16))[0])  //!< Least significant byte of \a u16.
 
-#    define MSH(u32) (((U16 *)&(u32))[1])   //!< Most significant half-word of \a u32.
-#    define LSH(u32) (((U16 *)&(u32))[0])   //!< Least significant half-word of \a u32.
-#    define MSB0W(u32) (((U8 *)&(u32))[3])  //!< Most significant byte of 1st rank of \a u32.
-#    define MSB1W(u32) (((U8 *)&(u32))[2])  //!< Most significant byte of 2nd rank of \a u32.
-#    define MSB2W(u32) (((U8 *)&(u32))[1])  //!< Most significant byte of 3rd rank of \a u32.
-#    define MSB3W(u32) (((U8 *)&(u32))[0])  //!< Most significant byte of 4th rank of \a u32.
-#    define LSB3W(u32) MSB0W(u32)           //!< Least significant byte of 4th rank of \a u32.
-#    define LSB2W(u32) MSB1W(u32)           //!< Least significant byte of 3rd rank of \a u32.
-#    define LSB1W(u32) MSB2W(u32)           //!< Least significant byte of 2nd rank of \a u32.
-#    define LSB0W(u32) MSB3W(u32)           //!< Least significant byte of 1st rank of \a u32.
+#define MSH(u32) (((U16 *)&(u32))[1])   //!< Most significant half-word of \a u32.
+#define LSH(u32) (((U16 *)&(u32))[0])   //!< Least significant half-word of \a u32.
+#define MSB0W(u32) (((U8 *)&(u32))[3])  //!< Most significant byte of 1st rank of \a u32.
+#define MSB1W(u32) (((U8 *)&(u32))[2])  //!< Most significant byte of 2nd rank of \a u32.
+#define MSB2W(u32) (((U8 *)&(u32))[1])  //!< Most significant byte of 3rd rank of \a u32.
+#define MSB3W(u32) (((U8 *)&(u32))[0])  //!< Most significant byte of 4th rank of \a u32.
+#define LSB3W(u32) MSB0W(u32)           //!< Least significant byte of 4th rank of \a u32.
+#define LSB2W(u32) MSB1W(u32)           //!< Least significant byte of 3rd rank of \a u32.
+#define LSB1W(u32) MSB2W(u32)           //!< Least significant byte of 2nd rank of \a u32.
+#define LSB0W(u32) MSB3W(u32)           //!< Least significant byte of 1st rank of \a u32.
 
-#    define MSW(u64) (((U32 *)&(u64))[1])   //!< Most significant word of \a u64.
-#    define LSW(u64) (((U32 *)&(u64))[0])   //!< Least significant word of \a u64.
-#    define MSH0(u64) (((U16 *)&(u64))[3])  //!< Most significant half-word of 1st rank of \a u64.
-#    define MSH1(u64) (((U16 *)&(u64))[2])  //!< Most significant half-word of 2nd rank of \a u64.
-#    define MSH2(u64) (((U16 *)&(u64))[1])  //!< Most significant half-word of 3rd rank of \a u64.
-#    define MSH3(u64) (((U16 *)&(u64))[0])  //!< Most significant half-word of 4th rank of \a u64.
-#    define LSH3(u64) MSH0(u64)             //!< Least significant half-word of 4th rank of \a u64.
-#    define LSH2(u64) MSH1(u64)             //!< Least significant half-word of 3rd rank of \a u64.
-#    define LSH1(u64) MSH2(u64)             //!< Least significant half-word of 2nd rank of \a u64.
-#    define LSH0(u64) MSH3(u64)             //!< Least significant half-word of 1st rank of \a u64.
-#    define MSB0D(u64) (((U8 *)&(u64))[7])  //!< Most significant byte of 1st rank of \a u64.
-#    define MSB1D(u64) (((U8 *)&(u64))[6])  //!< Most significant byte of 2nd rank of \a u64.
-#    define MSB2D(u64) (((U8 *)&(u64))[5])  //!< Most significant byte of 3rd rank of \a u64.
-#    define MSB3D(u64) (((U8 *)&(u64))[4])  //!< Most significant byte of 4th rank of \a u64.
-#    define MSB4D(u64) (((U8 *)&(u64))[3])  //!< Most significant byte of 5th rank of \a u64.
-#    define MSB5D(u64) (((U8 *)&(u64))[2])  //!< Most significant byte of 6th rank of \a u64.
-#    define MSB6D(u64) (((U8 *)&(u64))[1])  //!< Most significant byte of 7th rank of \a u64.
-#    define MSB7D(u64) (((U8 *)&(u64))[0])  //!< Most significant byte of 8th rank of \a u64.
-#    define LSB7D(u64) MSB0D(u64)           //!< Least significant byte of 8th rank of \a u64.
-#    define LSB6D(u64) MSB1D(u64)           //!< Least significant byte of 7th rank of \a u64.
-#    define LSB5D(u64) MSB2D(u64)           //!< Least significant byte of 6th rank of \a u64.
-#    define LSB4D(u64) MSB3D(u64)           //!< Least significant byte of 5th rank of \a u64.
-#    define LSB3D(u64) MSB4D(u64)           //!< Least significant byte of 4th rank of \a u64.
-#    define LSB2D(u64) MSB5D(u64)           //!< Least significant byte of 3rd rank of \a u64.
-#    define LSB1D(u64) MSB6D(u64)           //!< Least significant byte of 2nd rank of \a u64.
-#    define LSB0D(u64) MSB7D(u64)           //!< Least significant byte of 1st rank of \a u64.
+#define MSW(u64) (((U32 *)&(u64))[1])   //!< Most significant word of \a u64.
+#define LSW(u64) (((U32 *)&(u64))[0])   //!< Least significant word of \a u64.
+#define MSH0(u64) (((U16 *)&(u64))[3])  //!< Most significant half-word of 1st rank of \a u64.
+#define MSH1(u64) (((U16 *)&(u64))[2])  //!< Most significant half-word of 2nd rank of \a u64.
+#define MSH2(u64) (((U16 *)&(u64))[1])  //!< Most significant half-word of 3rd rank of \a u64.
+#define MSH3(u64) (((U16 *)&(u64))[0])  //!< Most significant half-word of 4th rank of \a u64.
+#define LSH3(u64) MSH0(u64)             //!< Least significant half-word of 4th rank of \a u64.
+#define LSH2(u64) MSH1(u64)             //!< Least significant half-word of 3rd rank of \a u64.
+#define LSH1(u64) MSH2(u64)             //!< Least significant half-word of 2nd rank of \a u64.
+#define LSH0(u64) MSH3(u64)             //!< Least significant half-word of 1st rank of \a u64.
+#define MSB0D(u64) (((U8 *)&(u64))[7])  //!< Most significant byte of 1st rank of \a u64.
+#define MSB1D(u64) (((U8 *)&(u64))[6])  //!< Most significant byte of 2nd rank of \a u64.
+#define MSB2D(u64) (((U8 *)&(u64))[5])  //!< Most significant byte of 3rd rank of \a u64.
+#define MSB3D(u64) (((U8 *)&(u64))[4])  //!< Most significant byte of 4th rank of \a u64.
+#define MSB4D(u64) (((U8 *)&(u64))[3])  //!< Most significant byte of 5th rank of \a u64.
+#define MSB5D(u64) (((U8 *)&(u64))[2])  //!< Most significant byte of 6th rank of \a u64.
+#define MSB6D(u64) (((U8 *)&(u64))[1])  //!< Most significant byte of 7th rank of \a u64.
+#define MSB7D(u64) (((U8 *)&(u64))[0])  //!< Most significant byte of 8th rank of \a u64.
+#define LSB7D(u64) MSB0D(u64)           //!< Least significant byte of 8th rank of \a u64.
+#define LSB6D(u64) MSB1D(u64)           //!< Least significant byte of 7th rank of \a u64.
+#define LSB5D(u64) MSB2D(u64)           //!< Least significant byte of 6th rank of \a u64.
+#define LSB4D(u64) MSB3D(u64)           //!< Least significant byte of 5th rank of \a u64.
+#define LSB3D(u64) MSB4D(u64)           //!< Least significant byte of 4th rank of \a u64.
+#define LSB2D(u64) MSB5D(u64)           //!< Least significant byte of 3rd rank of \a u64.
+#define LSB1D(u64) MSB6D(u64)           //!< Least significant byte of 2nd rank of \a u64.
+#define LSB0D(u64) MSB7D(u64)           //!< Least significant byte of 1st rank of \a u64.
 
-#    define LSB0(u32) LSB0W(u32)  //!< Least significant byte of 1st rank of \a u32.
-#    define LSB1(u32) LSB1W(u32)  //!< Least significant byte of 2nd rank of \a u32.
-#    define LSB2(u32) LSB2W(u32)  //!< Least significant byte of 3rd rank of \a u32.
-#    define LSB3(u32) LSB3W(u32)  //!< Least significant byte of 4th rank of \a u32.
-#    define MSB3(u32) MSB3W(u32)  //!< Most significant byte of 4th rank of \a u32.
-#    define MSB2(u32) MSB2W(u32)  //!< Most significant byte of 3rd rank of \a u32.
-#    define MSB1(u32) MSB1W(u32)  //!< Most significant byte of 2nd rank of \a u32.
-#    define MSB0(u32) MSB0W(u32)  //!< Most significant byte of 1st rank of \a u32.
+#define LSB0(u32) LSB0W(u32)  //!< Least significant byte of 1st rank of \a u32.
+#define LSB1(u32) LSB1W(u32)  //!< Least significant byte of 2nd rank of \a u32.
+#define LSB2(u32) LSB2W(u32)  //!< Least significant byte of 3rd rank of \a u32.
+#define LSB3(u32) LSB3W(u32)  //!< Least significant byte of 4th rank of \a u32.
+#define MSB3(u32) MSB3W(u32)  //!< Most significant byte of 4th rank of \a u32.
+#define MSB2(u32) MSB2W(u32)  //!< Most significant byte of 3rd rank of \a u32.
+#define MSB1(u32) MSB1W(u32)  //!< Most significant byte of 2nd rank of \a u32.
+#define MSB0(u32) MSB0W(u32)  //!< Most significant byte of 1st rank of \a u32.
 
-#    if defined(__ICCARM__)
-#        define SHORTENUM __packed
-#    elif defined(__GNUC__)
-#        define SHORTENUM __attribute__((packed))
-#    endif
+#if defined(__ICCARM__)
+#    define SHORTENUM __packed
+#elif defined(__GNUC__)
+#    define SHORTENUM __attribute__((packed))
+#endif
 
 /* No operation */
-#    if defined(__ICCARM__)
-#        define nop() __no_operation()
-#    elif defined(__GNUC__)
-#        define nop() (__NOP())
-#    endif
+#if defined(__ICCARM__)
+#    define nop() __no_operation()
+#elif defined(__GNUC__)
+#    define nop() (__NOP())
+#endif
 
-#    define FLASH_DECLARE(x) const x
-#    define FLASH_EXTERN(x) extern const x
-#    define PGM_READ_BYTE(x) *(x)
-#    define PGM_READ_WORD(x) *(x)
-#    define MEMCPY_ENDIAN memcpy
-#    define PGM_READ_BLOCK(dst, src, len) memcpy((dst), (src), (len))
+#define FLASH_DECLARE(x) const x
+#define FLASH_EXTERN(x) extern const x
+#define PGM_READ_BYTE(x) *(x)
+#define PGM_READ_WORD(x) *(x)
+#define MEMCPY_ENDIAN memcpy
+#define PGM_READ_BLOCK(dst, src, len) memcpy((dst), (src), (len))
 
 /*Defines the Flash Storage for the request and response of MAC*/
-#    define CMD_ID_OCTET (0)
+#define CMD_ID_OCTET (0)
 
 /* Converting of values from CPU endian to little endian. */
-#    define CPU_ENDIAN_TO_LE16(x) (x)
-#    define CPU_ENDIAN_TO_LE32(x) (x)
-#    define CPU_ENDIAN_TO_LE64(x) (x)
+#define CPU_ENDIAN_TO_LE16(x) (x)
+#define CPU_ENDIAN_TO_LE32(x) (x)
+#define CPU_ENDIAN_TO_LE64(x) (x)
 
 /* Converting of values from little endian to CPU endian. */
-#    define LE16_TO_CPU_ENDIAN(x) (x)
-#    define LE32_TO_CPU_ENDIAN(x) (x)
-#    define LE64_TO_CPU_ENDIAN(x) (x)
+#define LE16_TO_CPU_ENDIAN(x) (x)
+#define LE32_TO_CPU_ENDIAN(x) (x)
+#define LE64_TO_CPU_ENDIAN(x) (x)
 
 /* Converting of constants from little endian to CPU endian. */
-#    define CLE16_TO_CPU_ENDIAN(x) (x)
-#    define CLE32_TO_CPU_ENDIAN(x) (x)
-#    define CLE64_TO_CPU_ENDIAN(x) (x)
+#define CLE16_TO_CPU_ENDIAN(x) (x)
+#define CLE32_TO_CPU_ENDIAN(x) (x)
+#define CLE64_TO_CPU_ENDIAN(x) (x)
 
 /* Converting of constants from CPU endian to little endian. */
-#    define CCPU_ENDIAN_TO_LE16(x) (x)
-#    define CCPU_ENDIAN_TO_LE32(x) (x)
-#    define CCPU_ENDIAN_TO_LE64(x) (x)
+#define CCPU_ENDIAN_TO_LE16(x) (x)
+#define CCPU_ENDIAN_TO_LE32(x) (x)
+#define CCPU_ENDIAN_TO_LE64(x) (x)
 
-#    define ADDR_COPY_DST_SRC_16(dst, src) ((dst) = (src))
-#    define ADDR_COPY_DST_SRC_64(dst, src) ((dst) = (src))
+#define ADDR_COPY_DST_SRC_16(dst, src) ((dst) = (src))
+#define ADDR_COPY_DST_SRC_64(dst, src) ((dst) = (src))
 
 /**
  * @brief Converts a 64-Bit value into  a 8 Byte array
diff --git a/tmk_core/protocol/arm_atsam/usb/udi_cdc.c b/tmk_core/protocol/arm_atsam/usb/udi_cdc.c
index 27db4017c4..322a32ebcc 100644
--- a/tmk_core/protocol/arm_atsam/usb/udi_cdc.c
+++ b/tmk_core/protocol/arm_atsam/usb/udi_cdc.c
@@ -89,14 +89,14 @@
  *
  * @{
  */
-bool             udi_cdc_comm_enable(void);
-void             udi_cdc_comm_disable(void);
-bool             udi_cdc_comm_setup(void);
-bool             udi_cdc_data_enable(void);
-void             udi_cdc_data_disable(void);
-bool             udi_cdc_data_setup(void);
-uint8_t          udi_cdc_getsetting(void);
-void             udi_cdc_data_sof_notify(void);
+bool                       udi_cdc_comm_enable(void);
+void                       udi_cdc_comm_disable(void);
+bool                       udi_cdc_comm_setup(void);
+bool                       udi_cdc_data_enable(void);
+void                       udi_cdc_data_disable(void);
+bool                       udi_cdc_data_setup(void);
+uint8_t                    udi_cdc_getsetting(void);
+void                       udi_cdc_data_sof_notify(void);
 UDC_DESC_STORAGE udi_api_t udi_api_cdc_comm = {.enable = udi_cdc_comm_enable, .disable = udi_cdc_comm_disable, .setup = udi_cdc_comm_setup, .getsetting = udi_cdc_getsetting, .sof_notify = NULL};
 UDC_DESC_STORAGE udi_api_t udi_api_cdc_data = {
     .enable     = udi_cdc_data_enable,
diff --git a/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c b/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c
index f138b42786..b3d9cba826 100644
--- a/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c
+++ b/tmk_core/protocol/arm_atsam/usb/usb_device_udd.c
@@ -596,11 +596,10 @@ void udd_set_address(uint8_t address) { usb_device_set_address(&usb_device, addr
 uint8_t udd_getaddress(void) { return usb_device_get_address(&usb_device); }
 
 void udd_send_remotewakeup(void) {
-    uint32_t try
-        = 5;
+    uint32_t try = 5;
     udd_wait_clock_ready();
     udd_sleep_mode(UDD_STATE_IDLE);
-    while (2 != usb_get_state_machine_status(&usb_device) && try --) {
+    while (2 != usb_get_state_machine_status(&usb_device) && try--) {
         usb_device_send_remote_wake_up(&usb_device);
     }
 }

From 6ad86042fedf80ed31f0696759750f2f8aa033e3 Mon Sep 17 00:00:00 2001
From: jack <59737601+waffle87@users.noreply.github.com>
Date: Mon, 21 Feb 2022 10:57:13 -0700
Subject: [PATCH 677/867] Fix kikoslab/ellora65 (#16415)

---
 .../ellora65/keymaps/default/keymap.c         | 16 ++++++-----
 .../kikoslab/ellora65/keymaps/via/keymap.c    | 27 ++++++++++---------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/keyboards/kikoslab/ellora65/keymaps/default/keymap.c b/keyboards/kikoslab/ellora65/keymaps/default/keymap.c
index bf18fe87de..e904026b8e 100644
--- a/keyboards/kikoslab/ellora65/keymaps/default/keymap.c
+++ b/keyboards/kikoslab/ellora65/keymaps/default/keymap.c
@@ -23,19 +23,21 @@ enum _layer {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
- [_MA] = LAYOUT_all(
+  [_MA] = LAYOUT_all(
     KC_MUTE,   KC_ESC ,   KC_1   ,   KC_2   ,   KC_3   ,   KC_4   ,   KC_5   ,   KC_6   ,   KC_7   ,   KC_8   ,   KC_9   ,   KC_0   ,   KC_MINS,   KC_EQL ,   KC_BSPC,   KC_BSPC,
     KC_F13 ,   KC_TAB ,   KC_Q   ,   KC_W   ,   KC_E   ,   KC_R   ,   KC_T   ,   KC_Y   ,   KC_U   ,   KC_I   ,   KC_O   ,   KC_P   ,   KC_LBRC,   KC_RBRC,   KC_BSLS,
     KC_F14 ,   KC_CAPS,   KC_A   ,   KC_S   ,   KC_D   ,   KC_F   ,   KC_G   ,   KC_H   ,   KC_J   ,   KC_K   ,   KC_L   ,   KC_SCLN,   KC_QUOT,   KC_ENT ,   KC_ENT ,   KC_INS, 
     KC_F15 ,   KC_LSFT,   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_DEL, 
-    KC_F16 ,   KC_LCTL,   KC_LGUI,   KC_LALT,            MO(_FN)  ,              KC_SPC ,            MO(_FN)  ,              MO(_FN),   MO(_FN),   KC_LEFT,   KC_DOWN,   KC_RGHT),
+    KC_F16 ,   KC_LCTL,   KC_LGUI,   KC_LALT,            MO(_FN)  ,              KC_SPC ,            MO(_FN)  ,              MO(_FN),   MO(_FN),   KC_LEFT,   KC_DOWN,   KC_RGHT
+  ),
 
- [_FN] = LAYOUT_all(
+  [_FN] = LAYOUT_all(
     KC_DEL ,   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_BSPC,   KC_TRNS,
     KC_F17 ,   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_F18 ,   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_F19 ,   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_F20 ,   KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,              RESET  ,              KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS)
+    KC_F20 ,   KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,              RESET  ,              KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
+  )
 };
 
 bool encoder_update_user(uint8_t index, bool clockwise) {
@@ -197,7 +199,7 @@ static void print_status_narrow(void) {
 }
 
 
-void oled_task_user(void) {
+bool oled_task_user(void) {
     /* KEYBOARD PET VARIABLES START */
 
     current_wpm   = get_current_wpm();
@@ -206,7 +208,7 @@ void oled_task_user(void) {
     /* KEYBOARD PET VARIABLES END */
 
     print_status_narrow();
-    
+    return false;  
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -237,4 +239,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/kikoslab/ellora65/keymaps/via/keymap.c b/keyboards/kikoslab/ellora65/keymaps/via/keymap.c
index 707abaf6ba..fbe101d3d1 100644
--- a/keyboards/kikoslab/ellora65/keymaps/via/keymap.c
+++ b/keyboards/kikoslab/ellora65/keymaps/via/keymap.c
@@ -17,34 +17,37 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [0] = LAYOUT_all(
+  [0] = LAYOUT_all(
     KC_MUTE,   KC_ESC ,   KC_1   ,   KC_2   ,   KC_3   ,   KC_4   ,   KC_5   ,   KC_6   ,   KC_7   ,   KC_8   ,   KC_9   ,   KC_0   ,   KC_MINS,   KC_EQL ,   KC_BSPC,   KC_BSPC,
     KC_F13 ,   KC_TAB ,   KC_Q   ,   KC_W   ,   KC_E   ,   KC_R   ,   KC_T   ,   KC_Y   ,   KC_U   ,   KC_I   ,   KC_O   ,   KC_P   ,   KC_LBRC,   KC_RBRC,   KC_BSLS,
     KC_F14 ,   KC_CAPS,   KC_A   ,   KC_S   ,   KC_D   ,   KC_F   ,   KC_G   ,   KC_H   ,   KC_J   ,   KC_K   ,   KC_L   ,   KC_SCLN,   KC_QUOT,   KC_ENT ,   KC_ENT ,   KC_INS, 
     KC_F15 ,   KC_LSFT,   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_DEL, 
-    KC_F16 ,   KC_LCTL,   KC_LGUI,   KC_LALT,              MO(1)  ,              KC_SPC ,              MO(1)  ,              MO(1)  ,   MO(1)  ,   KC_LEFT,   KC_DOWN,   KC_RGHT),
+    KC_F16 ,   KC_LCTL,   KC_LGUI,   KC_LALT,              MO(1)  ,              KC_SPC ,              MO(1)  ,              MO(1)  ,   MO(1)  ,   KC_LEFT,   KC_DOWN,   KC_RGHT
+  ),
 
- [1] = LAYOUT_all(
+  [1] = LAYOUT_all(
     KC_DEL ,   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_BSPC,   KC_TRNS,
     KC_F17 ,   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_F18 ,   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_F19 ,   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_F20 ,   KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,              RESET  ,              KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS),
+    KC_F20 ,   KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,              RESET  ,              KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
+  ),
 
- [2] = LAYOUT_all(
+  [2] = LAYOUT_all(
     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_BSPC,   KC_TRNS,
     KC_F17 ,   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_F18 ,   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_F19 ,   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_F20 ,   KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,              KC_TRNS,              KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS),
+    KC_F20 ,   KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,              KC_TRNS,              KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
+  ),
 
- [3] = LAYOUT_all(
+  [3] = LAYOUT_all(
     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_BSPC,   KC_TRNS,
     KC_F17 ,   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_F18 ,   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_F19 ,   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_F20 ,   KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,              KC_TRNS,              KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS)
+    KC_F20 ,   KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS,              KC_TRNS,              KC_TRNS,              KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS
+  )
 };
 
 bool encoder_update_user(uint8_t index, bool clockwise) {
@@ -206,7 +209,7 @@ static void print_status_narrow(void) {
 }
 
 
-void oled_task_user(void) {
+bool oled_task_user(void) {
     /* KEYBOARD PET VARIABLES START */
 
     current_wpm   = get_current_wpm();
@@ -215,7 +218,7 @@ void oled_task_user(void) {
     /* KEYBOARD PET VARIABLES END */
 
     print_status_narrow();
-    
+    return false; 
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
@@ -246,4 +249,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    
 }
 
-#endif
\ No newline at end of file
+#endif

From 302ed624ac0910eea80ff4376dc2b8df5fd94b3f Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Mon, 21 Feb 2022 13:02:30 -0500
Subject: [PATCH 678/867] Add encoder defaults for Keebio boards (#16398)

* Add BDN9 encoder defaults

* Add DSP40 encoder default

* Add FoldKB encoder defaults

* Add Iris encoder defaults

* Update Iris Rev. 6 encoder orientation

* Add KBO-5000 encoder defaults

* Add Quefrency encoder defaults

* Add Sinc encoder defaults

* Add Stick encoder defaults

* Remove encoder settings from VIA keymaps
---
 .../keebio/bdn9/keymaps/default/keymap.c      |  2 +-
 keyboards/keebio/bdn9/keymaps/via/keymap.c    | 25 ------------------
 keyboards/keebio/bdn9/rev1/rev1.c             | 26 +++++++++++++++++++
 keyboards/keebio/bdn9/rev2/rev2.c             | 26 +++++++++++++++++++
 .../keebio/dsp40/keymaps/default/keymap.c     |  2 +-
 keyboards/keebio/dsp40/keymaps/via/keymap.c   | 11 --------
 keyboards/keebio/dsp40/rev1/rev1.c            | 12 +++++++++
 .../keebio/foldkb/keymaps/default/keymap.c    | 17 ------------
 keyboards/keebio/foldkb/keymaps/via/keymap.c  | 17 ------------
 keyboards/keebio/foldkb/rev1/rev1.c           | 18 +++++++++++++
 .../keebio/iris/keymaps/default/keymap.c      |  2 +-
 keyboards/keebio/iris/keymaps/via/keymap.c    | 18 -------------
 keyboards/keebio/iris/rev3/rev3.c             | 18 +++++++++++++
 keyboards/keebio/iris/rev4/rev4.c             | 18 +++++++++++++
 keyboards/keebio/iris/rev5/rev5.c             | 18 +++++++++++++
 keyboards/keebio/iris/rev6/config.h           |  8 +++---
 keyboards/keebio/iris/rev6/rev6.c             | 18 +++++++++++++
 .../keebio/kbo5000/keymaps/default/keymap.c   |  2 +-
 keyboards/keebio/kbo5000/keymaps/via/keymap.c | 23 ----------------
 keyboards/keebio/kbo5000/rev1/rev1.c          | 24 +++++++++++++++++
 .../quefrency/keymaps/default65/keymap.c      |  2 +-
 .../quefrency/keymaps/default65macro/keymap.c |  2 +-
 .../keebio/quefrency/keymaps/via/keymap.c     | 17 ------------
 keyboards/keebio/quefrency/rev2/rev2.c        | 18 +++++++++++++
 keyboards/keebio/quefrency/rev3/rev3.c        | 18 +++++++++++++
 keyboards/keebio/quefrency/rev4/rev4.c        | 18 +++++++++++++
 .../keebio/sinc/keymaps/default/keymap.c      |  2 +-
 keyboards/keebio/sinc/keymaps/via/keymap.c    | 17 ------------
 keyboards/keebio/sinc/rev1/rev1.c             | 18 +++++++++++++
 keyboards/keebio/sinc/rev2/rev2.c             | 18 +++++++++++++
 .../keebio/stick/keymaps/default/keymap.c     |  2 +-
 keyboards/keebio/stick/keymaps/via/keymap.c   | 18 -------------
 keyboards/keebio/stick/stick.c                | 18 +++++++++++++
 33 files changed, 298 insertions(+), 175 deletions(-)

diff --git a/keyboards/keebio/bdn9/keymaps/default/keymap.c b/keyboards/keebio/bdn9/keymaps/default/keymap.c
index e33e94b536..1dc680a1f6 100644
--- a/keyboards/keebio/bdn9/keymaps/default/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/default/keymap.c
@@ -67,5 +67,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_PGUP);
         }
     }
-    return true;
+    return false;
 }
diff --git a/keyboards/keebio/bdn9/keymaps/via/keymap.c b/keyboards/keebio/bdn9/keymaps/via/keymap.c
index 7c380a4fdd..655f3e5ed4 100644
--- a/keyboards/keebio/bdn9/keymaps/via/keymap.c
+++ b/keyboards/keebio/bdn9/keymaps/via/keymap.c
@@ -40,28 +40,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 
 };
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == _LEFT) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    else if (index == _MIDDLE) {
-        if (clockwise) {
-            tap_code(KC_DOWN);
-        } else {
-            tap_code(KC_UP);
-        }
-    }
-    else if (index == _RIGHT) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/bdn9/rev1/rev1.c b/keyboards/keebio/bdn9/rev1/rev1.c
index 4b32b73a0b..b1b0afc608 100644
--- a/keyboards/keebio/bdn9/rev1/rev1.c
+++ b/keyboards/keebio/bdn9/rev1/rev1.c
@@ -16,3 +16,29 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_DOWN);
+        } else {
+            tap_code(KC_UP);
+        }
+    }
+    else if (index == 2) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/bdn9/rev2/rev2.c b/keyboards/keebio/bdn9/rev2/rev2.c
index 689abd0b1d..9c2f5169f3 100644
--- a/keyboards/keebio/bdn9/rev2/rev2.c
+++ b/keyboards/keebio/bdn9/rev2/rev2.c
@@ -37,3 +37,29 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_DOWN);
+        } else {
+            tap_code(KC_UP);
+        }
+    }
+    else if (index == 2) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/dsp40/keymaps/default/keymap.c b/keyboards/keebio/dsp40/keymaps/default/keymap.c
index f9bf6c27c5..a4f65f5f48 100755
--- a/keyboards/keebio/dsp40/keymaps/default/keymap.c
+++ b/keyboards/keebio/dsp40/keymaps/default/keymap.c
@@ -113,5 +113,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_VOLD);
         }
     }
-    return true;
+    return false;
 }
diff --git a/keyboards/keebio/dsp40/keymaps/via/keymap.c b/keyboards/keebio/dsp40/keymaps/via/keymap.c
index 6575bbc8c6..f2f87663c5 100755
--- a/keyboards/keebio/dsp40/keymaps/via/keymap.c
+++ b/keyboards/keebio/dsp40/keymaps/via/keymap.c
@@ -63,14 +63,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
 };
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/dsp40/rev1/rev1.c b/keyboards/keebio/dsp40/rev1/rev1.c
index 04c85b08d1..41187b90b6 100644
--- a/keyboards/keebio/dsp40/rev1/rev1.c
+++ b/keyboards/keebio/dsp40/rev1/rev1.c
@@ -24,3 +24,15 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/foldkb/keymaps/default/keymap.c b/keyboards/keebio/foldkb/keymaps/default/keymap.c
index 0a71ef4d2d..45bc1673e2 100644
--- a/keyboards/keebio/foldkb/keymaps/default/keymap.c
+++ b/keyboards/keebio/foldkb/keymaps/default/keymap.c
@@ -32,20 +32,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_VOLD,          _______, _______, _______, _______, _______, _______,     _______, KC_0,    _______, _______, _______, _______
   ),
 };
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/foldkb/keymaps/via/keymap.c b/keyboards/keebio/foldkb/keymaps/via/keymap.c
index d3e3a95bf6..85d6912760 100644
--- a/keyboards/keebio/foldkb/keymaps/via/keymap.c
+++ b/keyboards/keebio/foldkb/keymaps/via/keymap.c
@@ -46,20 +46,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,          _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______
   )
 };
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/foldkb/rev1/rev1.c b/keyboards/keebio/foldkb/rev1/rev1.c
index bab2674003..a0dfb31b52 100644
--- a/keyboards/keebio/foldkb/rev1/rev1.c
+++ b/keyboards/keebio/foldkb/rev1/rev1.c
@@ -24,3 +24,21 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/iris/keymaps/default/keymap.c b/keyboards/keebio/iris/keymaps/default/keymap.c
index e3cd532694..169e5b50c7 100644
--- a/keyboards/keebio/iris/keymaps/default/keymap.c
+++ b/keyboards/keebio/iris/keymaps/default/keymap.c
@@ -127,5 +127,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_PGUP);
         }
     }
-    return true;
+    return false;
 }
diff --git a/keyboards/keebio/iris/keymaps/via/keymap.c b/keyboards/keebio/iris/keymaps/via/keymap.c
index f6183f1f7d..0a71bad92b 100644
--- a/keyboards/keebio/iris/keymaps/via/keymap.c
+++ b/keyboards/keebio/iris/keymaps/via/keymap.c
@@ -65,21 +65,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                 // └────────┴────────┴────────┘                 └────────┴────────┴────────┘
   )
 };
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/iris/rev3/rev3.c b/keyboards/keebio/iris/rev3/rev3.c
index b97b097b78..e874b9beae 100644
--- a/keyboards/keebio/iris/rev3/rev3.c
+++ b/keyboards/keebio/iris/rev3/rev3.c
@@ -35,3 +35,21 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/iris/rev4/rev4.c b/keyboards/keebio/iris/rev4/rev4.c
index de2ba26db3..36ef461cd0 100644
--- a/keyboards/keebio/iris/rev4/rev4.c
+++ b/keyboards/keebio/iris/rev4/rev4.c
@@ -16,3 +16,21 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/iris/rev5/rev5.c b/keyboards/keebio/iris/rev5/rev5.c
index a4191719c0..2a89c6923b 100644
--- a/keyboards/keebio/iris/rev5/rev5.c
+++ b/keyboards/keebio/iris/rev5/rev5.c
@@ -12,3 +12,21 @@ 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 "rev5.h"
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/iris/rev6/config.h b/keyboards/keebio/iris/rev6/config.h
index 386416f113..e26dc5fa50 100644
--- a/keyboards/keebio/iris/rev6/config.h
+++ b/keyboards/keebio/iris/rev6/config.h
@@ -36,10 +36,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS_RIGHT { D4, D6, D7, C7, F1, F4 }
 #define SPLIT_HAND_PIN D5
 
-#define ENCODERS_PAD_A { B2 }
-#define ENCODERS_PAD_B { B3 }
-#define ENCODERS_PAD_A_RIGHT { B2 }
-#define ENCODERS_PAD_B_RIGHT { B3 }
+#define ENCODERS_PAD_A { B3 }
+#define ENCODERS_PAD_B { B2 }
+#define ENCODERS_PAD_A_RIGHT { B3 }
+#define ENCODERS_PAD_B_RIGHT { B2 }
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/keebio/iris/rev6/rev6.c b/keyboards/keebio/iris/rev6/rev6.c
index ff9f9d25a1..152df0b2f9 100644
--- a/keyboards/keebio/iris/rev6/rev6.c
+++ b/keyboards/keebio/iris/rev6/rev6.c
@@ -63,3 +63,21 @@ led_config_t g_led_config = { {
 
 } };
 #endif
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/kbo5000/keymaps/default/keymap.c b/keyboards/keebio/kbo5000/keymaps/default/keymap.c
index 0261d11915..d2881206d6 100644
--- a/keyboards/keebio/kbo5000/keymaps/default/keymap.c
+++ b/keyboards/keebio/kbo5000/keymaps/default/keymap.c
@@ -55,5 +55,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_UP);
         }
     }
-    return true;
+    return false;
 }
diff --git a/keyboards/keebio/kbo5000/keymaps/via/keymap.c b/keyboards/keebio/kbo5000/keymaps/via/keymap.c
index 11075faf6f..a7fd62dddb 100644
--- a/keyboards/keebio/kbo5000/keymaps/via/keymap.c
+++ b/keyboards/keebio/kbo5000/keymaps/via/keymap.c
@@ -34,26 +34,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,                   _______, _______, _______, _______
   )
 };
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == LEFT_HALF_ENC) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    } else if (index == RIGHT_HALF_ENC1) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    } else if (index == RIGHT_HALF_ENC2) {
-        if (clockwise) {
-            tap_code(KC_DOWN);
-        } else {
-            tap_code(KC_UP);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/kbo5000/rev1/rev1.c b/keyboards/keebio/kbo5000/rev1/rev1.c
index fafad9b6ab..757a8be2a1 100644
--- a/keyboards/keebio/kbo5000/rev1/rev1.c
+++ b/keyboards/keebio/kbo5000/rev1/rev1.c
@@ -30,3 +30,27 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 2) {
+        if (clockwise) {
+            tap_code(KC_DOWN);
+        } else {
+            tap_code(KC_UP);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/quefrency/keymaps/default65/keymap.c b/keyboards/keebio/quefrency/keymaps/default65/keymap.c
index 0ae9d50e20..481de2aa00 100644
--- a/keyboards/keebio/quefrency/keymaps/default65/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/default65/keymap.c
@@ -46,5 +46,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_VOLD);
         }
     }
-    return true;
+    return false;
 }
diff --git a/keyboards/keebio/quefrency/keymaps/default65macro/keymap.c b/keyboards/keebio/quefrency/keymaps/default65macro/keymap.c
index 86f6911779..f452232b2d 100644
--- a/keyboards/keebio/quefrency/keymaps/default65macro/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/default65macro/keymap.c
@@ -46,5 +46,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_VOLD);
         }
     }
-    return true;
+    return false;
 }
diff --git a/keyboards/keebio/quefrency/keymaps/via/keymap.c b/keyboards/keebio/quefrency/keymaps/via/keymap.c
index 213f7af325..5ac83ef57c 100644
--- a/keyboards/keebio/quefrency/keymaps/via/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/via/keymap.c
@@ -33,20 +33,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   )
 };
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/quefrency/rev2/rev2.c b/keyboards/keebio/quefrency/rev2/rev2.c
index 69edfd415f..590c9850c2 100644
--- a/keyboards/keebio/quefrency/rev2/rev2.c
+++ b/keyboards/keebio/quefrency/rev2/rev2.c
@@ -30,3 +30,21 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/quefrency/rev3/rev3.c b/keyboards/keebio/quefrency/rev3/rev3.c
index 40771e2c68..0f8f964d92 100644
--- a/keyboards/keebio/quefrency/rev3/rev3.c
+++ b/keyboards/keebio/quefrency/rev3/rev3.c
@@ -46,3 +46,21 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/quefrency/rev4/rev4.c b/keyboards/keebio/quefrency/rev4/rev4.c
index a66d19166d..190135420f 100644
--- a/keyboards/keebio/quefrency/rev4/rev4.c
+++ b/keyboards/keebio/quefrency/rev4/rev4.c
@@ -15,3 +15,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "quefrency.h"
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/sinc/keymaps/default/keymap.c b/keyboards/keebio/sinc/keymaps/default/keymap.c
index 650314295b..060bf5dc6c 100644
--- a/keyboards/keebio/sinc/keymaps/default/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/default/keymap.c
@@ -33,5 +33,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_VOLD);
         }
     }
-    return true;
+    return false;
 }
diff --git a/keyboards/keebio/sinc/keymaps/via/keymap.c b/keyboards/keebio/sinc/keymaps/via/keymap.c
index 20cfdd79bb..225e9c07df 100644
--- a/keyboards/keebio/sinc/keymaps/via/keymap.c
+++ b/keyboards/keebio/sinc/keymaps/via/keymap.c
@@ -37,20 +37,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
   )
 };
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    } else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/sinc/rev1/rev1.c b/keyboards/keebio/sinc/rev1/rev1.c
index 562a245344..906b9b7d58 100644
--- a/keyboards/keebio/sinc/rev1/rev1.c
+++ b/keyboards/keebio/sinc/rev1/rev1.c
@@ -22,3 +22,21 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/sinc/rev2/rev2.c b/keyboards/keebio/sinc/rev2/rev2.c
index aea877d83c..47bb1e9e68 100644
--- a/keyboards/keebio/sinc/rev2/rev2.c
+++ b/keyboards/keebio/sinc/rev2/rev2.c
@@ -38,3 +38,21 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/stick/keymaps/default/keymap.c b/keyboards/keebio/stick/keymaps/default/keymap.c
index ea4ca3f54f..8e9b43a14a 100644
--- a/keyboards/keebio/stick/keymaps/default/keymap.c
+++ b/keyboards/keebio/stick/keymaps/default/keymap.c
@@ -39,5 +39,5 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_UP);
         }
     }
-    return true;
+    return false;
 }
diff --git a/keyboards/keebio/stick/keymaps/via/keymap.c b/keyboards/keebio/stick/keymaps/via/keymap.c
index 3f196dda69..752b2de054 100644
--- a/keyboards/keebio/stick/keymaps/via/keymap.c
+++ b/keyboards/keebio/stick/keymaps/via/keymap.c
@@ -35,21 +35,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
     ),
 };
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_DOWN);
-        } else {
-            tap_code(KC_UP);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/keebio/stick/stick.c b/keyboards/keebio/stick/stick.c
index 050c4eff81..c2d25f8860 100644
--- a/keyboards/keebio/stick/stick.c
+++ b/keyboards/keebio/stick/stick.c
@@ -48,3 +48,21 @@ void eeconfig_init_kb(void) {
     eeconfig_update_kb(0);
     eeconfig_init_user();
 }
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_DOWN);
+        } else {
+            tap_code(KC_UP);
+        }
+    }
+    return false;
+}

From 31f590066646b0be76d3ba9bb1b38174b46d507f Mon Sep 17 00:00:00 2001
From: jack <59737601+waffle87@users.noreply.github.com>
Date: Mon, 21 Feb 2022 11:04:14 -0700
Subject: [PATCH 679/867] fix layout macro (#16414)

Co-authored-by: jack <{ID}+{username}@users.noreply.github.com>
---
 keyboards/creatkeebs/glacier/glacier.h               | 12 ++++++------
 .../creatkeebs/glacier/keymaps/default/keymap.c      |  3 ---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/keyboards/creatkeebs/glacier/glacier.h b/keyboards/creatkeebs/glacier/glacier.h
index 2dcf15fc98..3b7b1320f5 100644
--- a/keyboards/creatkeebs/glacier/glacier.h
+++ b/keyboards/creatkeebs/glacier/glacier.h
@@ -21,15 +21,15 @@
 #define LAYOUT( \
 	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016,       \
 	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,       \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K315,       \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,       \
 	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                           \
 	K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K413,       K415,             \
 	K500, K501, K502,             K505,                         K510, K511,       K513, K514, K515, K516        \
 ) { \
 	{ K000,  K001,   K002,  K003,  K004,   K005,  K006,  K007,  K008,   K009,   K010,  K011,  K012,   K013,  K014,   K015,  K016  }, \
-	{ K100,  K101,   K102,  K103,  K104,   K105,  K106,  K107,  K108,   K109,   K110,  K111,  K112,   K113,  K114    K115,  K116  }, \
-	{ K200,  K201,   K202,  K203,  K204,   K205,  K206,  K207,  K208,   K209,   K210,  K211,  K212,   K213,  K214    K215,  K216  }, \
-	{ K300,  K301,   K302,  K303,  K304,   K305,  K306,  K307,  K308,   K309,   K310,  K311,  KC_NO,  K313,  KC_NO   KC_NO, KC_NO }, \
-	{ K400,  KC_NO,  K402,  K403,  K404,   K405,  K406,  K407,  K408,   K409,   K410,  K411,  KC_NO,  K413,  KC_NO   K415,  KC_NO }, \
-	{ K500,  K501,   K502,  KC_NO, KC_NO,  K505,  KC_NO, KC_NO, KC_NO,  KC_NO,  K510,  K511,  KC_NO,  K513,  K514    K515,  K516  }  \
+	{ K100,  K101,   K102,  K103,  K104,   K105,  K106,  K107,  K108,   K109,   K110,  K111,  K112,   K113,  K114,    K115,  K116  }, \
+	{ K200,  K201,   K202,  K203,  K204,   K205,  K206,  K207,  K208,   K209,   K210,  K211,  K212,   K213,  K214,    K215,  K216  }, \
+	{ K300,  K301,   K302,  K303,  K304,   K305,  K306,  K307,  K308,   K309,   K310,  K311,  KC_NO,  K313,  KC_NO,   KC_NO, KC_NO }, \
+	{ K400,  KC_NO,  K402,  K403,  K404,   K405,  K406,  K407,  K408,   K409,   K410,  K411,  KC_NO,  K413,  KC_NO,   K415,  KC_NO }, \
+	{ K500,  K501,   K502,  KC_NO, KC_NO,  K505,  KC_NO, KC_NO, KC_NO,  KC_NO,  K510,  K511,  KC_NO,  K513,  K514,    K515,  K516  }  \
 }
diff --git a/keyboards/creatkeebs/glacier/keymaps/default/keymap.c b/keyboards/creatkeebs/glacier/keymaps/default/keymap.c
index ee381e17cc..e58d790545 100644
--- a/keyboards/creatkeebs/glacier/keymaps/default/keymap.c
+++ b/keyboards/creatkeebs/glacier/keymaps/default/keymap.c
@@ -17,9 +17,6 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-
-
 	[0] = LAYOUT(
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS, 
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,

From 239fed2ef1f41d8d2c962e8519de39fff5ce44ac Mon Sep 17 00:00:00 2001
From: Alexander <7888825+keyzog@users.noreply.github.com>
Date: Mon, 21 Feb 2022 22:21:54 +0300
Subject: [PATCH 680/867] [Keyboard] Move rgb animation defines for KAPL
 keyboard (#16341)

---
 keyboards/kapl/keymaps/default/config.h | 42 -----------------------
 keyboards/kapl/keymaps/via/config.h     | 42 -----------------------
 keyboards/kapl/rev1/config.h            | 44 +++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 84 deletions(-)

diff --git a/keyboards/kapl/keymaps/default/config.h b/keyboards/kapl/keymaps/default/config.h
index 788c3b41bb..cc82705192 100644
--- a/keyboards/kapl/keymaps/default/config.h
+++ b/keyboards/kapl/keymaps/default/config.h
@@ -1,45 +1,3 @@
 // Copyright 2022 Alexander Lozyuk (@keyzog)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 16
-#define RGBLIGHT_VAL_STEP 16
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 16
-#define RGB_MATRIX_VAL_STEP 16
-#define RGB_MATRIX_SPD_STEP 10
-// EFFECTS
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_HUE_BREATHING
-#define ENABLE_RGB_MATRIX_HUE_WAVE
-// KEYPRESSES EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
diff --git a/keyboards/kapl/keymaps/via/config.h b/keyboards/kapl/keymaps/via/config.h
index 788c3b41bb..cc82705192 100644
--- a/keyboards/kapl/keymaps/via/config.h
+++ b/keyboards/kapl/keymaps/via/config.h
@@ -1,45 +1,3 @@
 // Copyright 2022 Alexander Lozyuk (@keyzog)
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 16
-#define RGBLIGHT_VAL_STEP 16
-#endif
-
-#ifdef RGB_MATRIX_ENABLE
-#define RGB_MATRIX_HUE_STEP 8
-#define RGB_MATRIX_SAT_STEP 16
-#define RGB_MATRIX_VAL_STEP 16
-#define RGB_MATRIX_SPD_STEP 10
-// EFFECTS
-#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#define ENABLE_RGB_MATRIX_HUE_BREATHING
-#define ENABLE_RGB_MATRIX_HUE_WAVE
-// KEYPRESSES EFFECTS
-#define RGB_MATRIX_KEYPRESSES
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#define ENABLE_RGB_MATRIX_MULTISPLASH
-#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#endif
diff --git a/keyboards/kapl/rev1/config.h b/keyboards/kapl/rev1/config.h
index 12007a3a13..4984459275 100644
--- a/keyboards/kapl/rev1/config.h
+++ b/keyboards/kapl/rev1/config.h
@@ -35,6 +35,7 @@
 /* Select hand configuration */
 #define MASTER_LEFT
 
+
 #define RGB_DI_PIN D4
 #define RGBLED_NUM 88
 #define RGBLED_SPLIT { 44, 44 }
@@ -46,6 +47,49 @@
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
 #define SPLIT_TRANSPORT_MIRROR
 
+#ifdef RGBLIGHT_ENABLE
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 16
+#define RGBLIGHT_VAL_STEP 16
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_MATRIX_HUE_STEP 8
+#define RGB_MATRIX_SAT_STEP 16
+#define RGB_MATRIX_VAL_STEP 16
+#define RGB_MATRIX_SPD_STEP 10
+// EFFECTS
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+// KEYPRESSES EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
+
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */

From ffe9c220328ac05f7e6be64b6552547f7a12ed38 Mon Sep 17 00:00:00 2001
From: xiao <307671+xia0@users.noreply.github.com>
Date: Tue, 22 Feb 2022 06:22:25 +1100
Subject: [PATCH 681/867] [Keyboard] Add keyboard 3dortho14u (#16329)

Co-authored-by: xia0 <xiao@morgan.net.au>
---
 .../3dortho14u/keymaps/default/keymap.c       |  27 ++++
 .../3dortho14u/keymaps/default/readme.md      |   1 +
 .../handwired/3dortho14u/keymaps/via/keymap.c |  35 ++++++
 .../handwired/3dortho14u/keymaps/via/rules.mk |   4 +
 keyboards/handwired/3dortho14u/readme.md      |  40 ++++++
 keyboards/handwired/3dortho14u/rev1/config.h  |   6 +
 keyboards/handwired/3dortho14u/rev1/info.json | 115 ++++++++++++++++++
 keyboards/handwired/3dortho14u/rev1/readme.md |  39 ++++++
 keyboards/handwired/3dortho14u/rev1/rev1.c    |   4 +
 keyboards/handwired/3dortho14u/rev1/rev1.h    |   6 +
 keyboards/handwired/3dortho14u/rev1/rules.mk  |   1 +
 keyboards/handwired/3dortho14u/rev2/config.h  |   6 +
 keyboards/handwired/3dortho14u/rev2/info.json | 115 ++++++++++++++++++
 keyboards/handwired/3dortho14u/rev2/readme.md |  39 ++++++
 keyboards/handwired/3dortho14u/rev2/rev2.c    |   4 +
 keyboards/handwired/3dortho14u/rev2/rev2.h    |   6 +
 keyboards/handwired/3dortho14u/rev2/rules.mk  |   1 +
 17 files changed, 449 insertions(+)
 create mode 100644 keyboards/handwired/3dortho14u/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/3dortho14u/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/3dortho14u/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/3dortho14u/keymaps/via/rules.mk
 create mode 100644 keyboards/handwired/3dortho14u/readme.md
 create mode 100644 keyboards/handwired/3dortho14u/rev1/config.h
 create mode 100644 keyboards/handwired/3dortho14u/rev1/info.json
 create mode 100644 keyboards/handwired/3dortho14u/rev1/readme.md
 create mode 100644 keyboards/handwired/3dortho14u/rev1/rev1.c
 create mode 100644 keyboards/handwired/3dortho14u/rev1/rev1.h
 create mode 100644 keyboards/handwired/3dortho14u/rev1/rules.mk
 create mode 100644 keyboards/handwired/3dortho14u/rev2/config.h
 create mode 100644 keyboards/handwired/3dortho14u/rev2/info.json
 create mode 100644 keyboards/handwired/3dortho14u/rev2/readme.md
 create mode 100644 keyboards/handwired/3dortho14u/rev2/rev2.c
 create mode 100644 keyboards/handwired/3dortho14u/rev2/rev2.h
 create mode 100644 keyboards/handwired/3dortho14u/rev2/rules.mk

diff --git a/keyboards/handwired/3dortho14u/keymaps/default/keymap.c b/keyboards/handwired/3dortho14u/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e8d96d22ce
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2022 Xiao (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+      KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,
+      KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
+      KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NO  , 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_DEL ,
+      KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_NO  , KC_NO  , KC_SPC , KC_NO  , KC_NO  , KC_NO  , KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT(
+      KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_DEL ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END
+    )
+};
diff --git a/keyboards/handwired/3dortho14u/keymaps/default/readme.md b/keyboards/handwired/3dortho14u/keymaps/default/readme.md
new file mode 100644
index 0000000000..04e5d40fd5
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for 3dortho14u
diff --git a/keyboards/handwired/3dortho14u/keymaps/via/keymap.c b/keyboards/handwired/3dortho14u/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ba5a1cde3f
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+// Copyright 2022 Xiao (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+      KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSPC,
+      KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
+      KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NO  , 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_DEL ,
+      KC_LCTL, KC_LGUI, KC_LALT, MO(1)  , KC_NO  , KC_NO  , KC_SPC , KC_NO  , KC_NO  , KC_NO  , KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+      KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_DEL ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS ,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END
+    ),
+    [2] = LAYOUT(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/handwired/3dortho14u/keymaps/via/rules.mk b/keyboards/handwired/3dortho14u/keymaps/via/rules.mk
new file mode 100644
index 0000000000..7a49719505
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+# rules.mk overrides to enable VIA
+
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/handwired/3dortho14u/readme.md b/keyboards/handwired/3dortho14u/readme.md
new file mode 100644
index 0000000000..3163891d48
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/readme.md
@@ -0,0 +1,40 @@
+# 3dortho14u
+
+![3dortho14u](https://i.imgur.com/us16LYTh.jpg)
+
+A symmetrical 14u wide ortholinear keyboard.
+
+In addition to the 3d printed parts and microcontroller, the following hardware is required:
+* 8 * 12 mm M3 bolt
+* Either:
+  * 8 * M3 muts and CA glue
+    OR
+  * 8 * 3x3 mm threaded insert
+* Optional:
+  * USB daughter board
+
+---
+
+* Keyboard Maintainer: [xia0](https://github.com/xia0)
+* Hardware Supported:
+  * rev1: Teensy 2.0 (ATmega32u4)
+  * rev2: Arduino Pro Micro (ATmega32u4)
+* Hardware Availability: [github](https://github.com/xia0/keeb_files/tree/main/3dortho14u)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 3dortho14u/rev1:default
+
+Flashing example for this keyboard:
+
+    make 3dortho14u/rev1:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/3dortho14u/rev1/config.h b/keyboards/handwired/3dortho14u/rev1/config.h
new file mode 100644
index 0000000000..d78fd0a7f8
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/rev1/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Xiao (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
diff --git a/keyboards/handwired/3dortho14u/rev1/info.json b/keyboards/handwired/3dortho14u/rev1/info.json
new file mode 100644
index 0000000000..72ed95e5f4
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/rev1/info.json
@@ -0,0 +1,115 @@
+{
+    "manufacturer": "xia0",
+    "keyboard_name": "3dortho14u",
+    "url": "",
+    "maintainer": "xia0",
+    "processor": "atmega32u4",
+    "debounce": 5,
+    "diode_direction": "COL2ROW",
+    "features": {
+    "audio": false,
+    "backlight": false,
+    "bluetooth": false,
+    "bootmagic": true,
+    "command": false,
+    "console": true,
+    "extrakey": true,
+    "midi": false,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": false,
+    "unicode": false
+    },
+    "indicators": {
+      "caps_lock": "F0"
+    },
+    "matrix_pins": {
+      "cols": ["D0", "D1", "D2", "D3", "C6", "C7", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "F7"],
+      "rows": ["B0", "B1", "B2", "B3", "B7"]
+    },
+    "usb": {
+      "device_ver": "0x0001",
+      "pid": "0x3D14",
+      "vid": "0x6662"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [1, 7], "x": 7, "y": 1},
+                {"matrix": [1, 8], "x": 8, "y": 1},
+                {"matrix": [1, 9], "x": 9, "y": 1},
+                {"matrix": [1, 10], "x": 10, "y": 1},
+                {"matrix": [1, 11], "x": 11, "y": 1},
+                {"matrix": [1, 12], "x": 12, "y": 1},
+                {"matrix": [1, 13], "x": 13, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [2, 7], "x": 7, "y": 2},
+                {"matrix": [2, 8], "x": 8, "y": 2},
+                {"matrix": [2, 9], "x": 9, "y": 2},
+                {"matrix": [2, 10], "x": 10, "y": 2},
+                {"matrix": [2, 11], "x": 11, "y": 2},
+                {"matrix": [2, 12], "x": 12, "y": 2},
+                {"matrix": [2, 13], "x": 13, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [3, 7], "x": 7, "y": 3},
+                {"matrix": [3, 8], "x": 8, "y": 3},
+                {"matrix": [3, 9], "x": 9, "y": 3},
+                {"matrix": [3, 10], "x": 10, "y": 3},
+                {"matrix": [3, 11], "x": 11, "y": 3},
+                {"matrix": [3, 12], "x": 12, "y": 3},
+                {"matrix": [3, 13], "x": 13, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 10], "x": 10, "y": 4},
+                {"matrix": [4, 11], "x": 11, "y": 4},
+                {"matrix": [4, 12], "x": 12, "y": 4},
+                {"matrix": [4, 13], "x": 13, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/3dortho14u/rev1/readme.md b/keyboards/handwired/3dortho14u/rev1/readme.md
new file mode 100644
index 0000000000..e785369b23
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/rev1/readme.md
@@ -0,0 +1,39 @@
+# 3dortho14u
+
+![3dortho14u](https://i.imgur.com/us16LYTh.jpg)
+
+A symmetrical 14u wide ortholinear keyboard.
+
+In addition to the 3d printed parts and microcontroller, the following hardware is required:
+* 8 * 12 mm M3 bolt
+* Either:
+  * 8 * M3 muts and CA glue
+    OR
+  * 8 * 3x3 mm threaded insert
+* Optional:
+  * USB daughter board
+
+---
+
+* Keyboard Maintainer: [xia0](https://github.com/xia0)
+* Hardware Supported:
+  * Teensy 2.0 (ATmega32u4)
+* Hardware Availability: [github](https://github.com/xia0/keeb_files/tree/main/3dortho14u)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 3dortho14u/rev1:default
+
+Flashing example for this keyboard:
+
+    make 3dortho14u/rev1:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/3dortho14u/rev1/rev1.c b/keyboards/handwired/3dortho14u/rev1/rev1.c
new file mode 100644
index 0000000000..220fd71cfe
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/rev1/rev1.c
@@ -0,0 +1,4 @@
+// Copyright 2022 Xiao (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "rev1.h"
diff --git a/keyboards/handwired/3dortho14u/rev1/rev1.h b/keyboards/handwired/3dortho14u/rev1/rev1.h
new file mode 100644
index 0000000000..d8f47c43f8
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/rev1/rev1.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Xiao (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/handwired/3dortho14u/rev1/rules.mk b/keyboards/handwired/3dortho14u/rev1/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/rev1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/handwired/3dortho14u/rev2/config.h b/keyboards/handwired/3dortho14u/rev2/config.h
new file mode 100644
index 0000000000..d78fd0a7f8
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/rev2/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Xiao (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
diff --git a/keyboards/handwired/3dortho14u/rev2/info.json b/keyboards/handwired/3dortho14u/rev2/info.json
new file mode 100644
index 0000000000..705d6b5570
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/rev2/info.json
@@ -0,0 +1,115 @@
+{
+    "manufacturer": "xia0",
+    "keyboard_name": "3dortho14u",
+    "url": "",
+    "maintainer": "xia0",
+    "processor": "atmega32u4",
+    "debounce": 5,
+    "diode_direction": "COL2ROW",
+    "features": {
+    "audio": false,
+    "backlight": false,
+    "bluetooth": false,
+    "bootmagic": true,
+    "command": false,
+    "console": true,
+    "extrakey": true,
+    "midi": false,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": false,
+    "unicode": false
+    },
+    "indicators": {
+      "caps_lock": "F4"
+    },
+    "matrix_pins": {
+      "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+      "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
+    },
+    "usb": {
+      "device_ver": "0x0001",
+      "pid": "0x3D14",
+      "vid": "0x6662"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [5, 0], "x": 7, "y": 0},
+                {"matrix": [5, 1], "x": 8, "y": 0},
+                {"matrix": [5, 2], "x": 9, "y": 0},
+                {"matrix": [5, 3], "x": 10, "y": 0},
+                {"matrix": [5, 4], "x": 11, "y": 0},
+                {"matrix": [5, 5], "x": 12, "y": 0},
+                {"matrix": [5, 6], "x": 13, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
+                {"matrix": [1, 6], "x": 6, "y": 1},
+                {"matrix": [6, 0], "x": 7, "y": 1},
+                {"matrix": [6, 1], "x": 8, "y": 1},
+                {"matrix": [6, 2], "x": 9, "y": 1},
+                {"matrix": [6, 3], "x": 10, "y": 1},
+                {"matrix": [6, 4], "x": 11, "y": 1},
+                {"matrix": [6, 5], "x": 12, "y": 1},
+                {"matrix": [6, 6], "x": 13, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
+                {"matrix": [2, 6], "x": 6, "y": 2},
+                {"matrix": [7, 0], "x": 7, "y": 2},
+                {"matrix": [7, 1], "x": 8, "y": 2},
+                {"matrix": [7, 2], "x": 9, "y": 2},
+                {"matrix": [7, 3], "x": 10, "y": 2},
+                {"matrix": [7, 4], "x": 11, "y": 2},
+                {"matrix": [7, 5], "x": 12, "y": 2},
+                {"matrix": [7, 6], "x": 13, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
+                {"matrix": [3, 6], "x": 6, "y": 3},
+                {"matrix": [8, 0], "x": 7, "y": 3},
+                {"matrix": [8, 1], "x": 8, "y": 3},
+                {"matrix": [8, 2], "x": 9, "y": 3},
+                {"matrix": [8, 3], "x": 10, "y": 3},
+                {"matrix": [8, 4], "x": 11, "y": 3},
+                {"matrix": [8, 5], "x": 12, "y": 3},
+                {"matrix": [8, 6], "x": 13, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 7, "y": 4},
+                {"matrix": [9, 1], "x": 8, "y": 4},
+                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [9, 3], "x": 10, "y": 4},
+                {"matrix": [9, 4], "x": 11, "y": 4},
+                {"matrix": [9, 5], "x": 12, "y": 4},
+                {"matrix": [9, 6], "x": 13, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/3dortho14u/rev2/readme.md b/keyboards/handwired/3dortho14u/rev2/readme.md
new file mode 100644
index 0000000000..bb2e982130
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/rev2/readme.md
@@ -0,0 +1,39 @@
+# 3dortho14u
+
+![3dortho14u](https://i.imgur.com/us16LYTh.jpg)
+
+A symmetrical 14u wide ortholinear keyboard.
+
+In addition to the 3d printed parts and microcontroller, the following hardware is required:
+* 8 * 12 mm M3 bolt
+* Either:
+  * 8 * M3 muts and CA glue
+    OR
+  * 8 * 3x3 mm threaded insert
+* Optional:
+  * USB daughter board
+
+---
+
+* Keyboard Maintainer: [xia0](https://github.com/xia0)
+* Hardware Supported:
+  * Arduino Pro Micro (ATmega32u4)
+* Hardware Availability: [github](https://github.com/xia0/keeb_files/tree/main/3dortho14u)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 3dortho14u/rev2:default
+
+Flashing example for this keyboard:
+
+    make 3dortho14u/rev2:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/3dortho14u/rev2/rev2.c b/keyboards/handwired/3dortho14u/rev2/rev2.c
new file mode 100644
index 0000000000..545fea9fad
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/rev2/rev2.c
@@ -0,0 +1,4 @@
+// Copyright 2022 Xiao (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "rev2.h"
diff --git a/keyboards/handwired/3dortho14u/rev2/rev2.h b/keyboards/handwired/3dortho14u/rev2/rev2.h
new file mode 100644
index 0000000000..d8f47c43f8
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/rev2/rev2.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Xiao (@xia0)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/handwired/3dortho14u/rev2/rules.mk b/keyboards/handwired/3dortho14u/rev2/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/handwired/3dortho14u/rev2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank

From e0342fec18e4b6b14a820d7a5d62954853c91756 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <fernando.delphi@gmail.com>
Date: Mon, 21 Feb 2022 16:23:29 -0300
Subject: [PATCH 682/867] [Keyboard] Fixed default keymap and add VIA for
 Baredev rev1 (#15818)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/handwired/baredev/rev1/info.json    |  2 +-
 .../baredev/rev1/keymaps/default/keymap.c     |  2 +-
 .../baredev/rev1/keymaps/via/keymap.c         | 88 +++++++++++++++++++
 .../baredev/rev1/keymaps/via/rules.mk         |  4 +
 4 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/handwired/baredev/rev1/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/baredev/rev1/keymaps/via/rules.mk

diff --git a/keyboards/handwired/baredev/rev1/info.json b/keyboards/handwired/baredev/rev1/info.json
index 83b1c7cdd0..601b5df128 100644
--- a/keyboards/handwired/baredev/rev1/info.json
+++ b/keyboards/handwired/baredev/rev1/info.json
@@ -42,7 +42,7 @@
         ]
     },
     "usb": {
-        "vid": "0xFEED",
+        "vid": "0x1209",
         "pid": "0x4126",
         "device_ver": "0x0001",
         "polling_interval": 1,
diff --git a/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c
index e679667ba0..6efed6ac1a 100644
--- a/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c
+++ b/keyboards/handwired/baredev/rev1/keymaps/default/keymap.c
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
               KC_LSFT,   BR_BSLS,   BR_Z,     BR_X,     BR_C,     BR_V,     BR_B,     BR_N,     BR_M,    BR_COMM,  BR_DOT,   BR_SCLN,      BR_SLSH,       KC_UP,
         /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
-              KC_LCTL,   KC_LGUI,     KC_LALT,                                KC_SPC,                            KC_APP,    KC_DEL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+              KC_LCTL,   KC_LGUI,     KC_LALT,                        LT(LAYER_FUNCTIONS,KC_SPC),                KC_APP,    KC_DEL,  KC_LEFT,  KC_DOWN,  KC_RGHT
         /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
     ),
     [LAYER_FUNCTIONS] = LAYOUT(
diff --git a/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c b/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a7b127f089
--- /dev/null
+++ b/keyboards/handwired/baredev/rev1/keymaps/via/keymap.c
@@ -0,0 +1,88 @@
+/* Copyright 2021 Fernando "ManoShu" Rodrigues
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+#include "keymap_br_abnt2.h"
+
+enum { 
+    LAYER_BASE, 
+    LAYER_FUNCTIONS,
+    BLANK_LAYER1,
+    BLANK_LAYER2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [LAYER_BASE] = LAYOUT(
+        /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+              KC_ESC,             KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,              KC_F9,    KC_F10,  KC_F11,   KC_F12,
+        /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
+             BR_QUOT,   BR_1,     BR_2,     BR_3,      BR_4,    BR_5,     BR_6,      BR_7,    BR_8,     BR_9,     BR_0,    BR_MINS,  BR_EQL,        KC_BSPC,
+        /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
+                KC_TAB,      BR_Q,     BR_W,     BR_E,     BR_R,     BR_T,     BR_Y,     BR_U,     BR_I,     BR_O,     BR_P,    BR_ACUT,  BR_LBRC,      KC_ENT,
+        /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ┤ */
+                  KC_CAPS,      BR_A,     BR_S,      BR_D,    BR_F,     BR_G,     BR_H,     BR_J,     BR_K,     BR_L,    BR_CCED,  BR_TILD,  BR_RBRC,
+        /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
+              KC_LSFT,   BR_BSLS,   BR_Z,     BR_X,     BR_C,     BR_V,     BR_B,     BR_N,     BR_M,    BR_COMM,  BR_DOT,   BR_SCLN,      BR_SLSH,       KC_UP,
+        /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
+              KC_LCTL,   KC_LGUI,     KC_LALT,                    LT(LAYER_FUNCTIONS, KC_SPC),                   KC_APP,    KC_DEL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+        /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+    ),
+    [LAYER_FUNCTIONS] = LAYOUT(
+        /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+              RESET,             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  KC_PSCR,  KC_SLCK,  KC_PAUS, 
+        /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
+             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
+        /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
+               _______,     KC_MPLY,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,
+        /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ┤ */
+                 _______,      KC_MPRV,  KC_MNXT,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    
+        /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
+              _______,   _______,  KC_VOLU,  KC_VOLD,  KC_CALC,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,      KC_PGUP, 
+        /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
+              _______,    _______,    _______,                                _______,                           _______,   KC_INS,  KC_HOME,  KC_PGDN,  KC_END
+        /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+    ),
+    [BLANK_LAYER1] = LAYOUT(
+        /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+             _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______, 
+        /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
+             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
+        /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
+               _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,
+        /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ┤ */
+                 _______,      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    
+        /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
+              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,      _______, 
+        /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
+              _______,    _______,    _______,                                _______,                           _______,  _______,  _______,  _______,  _______
+        /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */    
+    ),
+    [BLANK_LAYER2] = LAYOUT(
+        /* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+             _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______, 
+        /* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┤ */
+             _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
+        /* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┤ */
+               _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,
+        /* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ┤ */
+                 _______,      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    
+        /* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┤ */
+              _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,      _______,      _______, 
+        /* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┤ */
+              _______,    _______,    _______,                                _______,                           _______,  _______,  _______,  _______,  _______
+        /* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */    
+    )
+};
\ No newline at end of file
diff --git a/keyboards/handwired/baredev/rev1/keymaps/via/rules.mk b/keyboards/handwired/baredev/rev1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..084cd1bd08
--- /dev/null
+++ b/keyboards/handwired/baredev/rev1/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+
+LEADER_ENABLE = no
+LTO_ENABLE = yes
\ No newline at end of file

From 5dcc0743f596f97cbae548315b48478ce4d81e47 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 22 Feb 2022 02:57:52 +0000
Subject: [PATCH 683/867] Install extra CLI dependencies that are missing
 (#16425)

---
 .github/workflows/format.yaml      | 1 +
 .github/workflows/format_push.yaml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
index f1525526ce..9415861eaa 100644
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@@ -22,6 +22,7 @@ jobs:
     - name: Install dependencies
       run: |
         apt-get update && apt-get install -y dos2unix
+        pip3 install -r requirements-dev.txt
 
     - uses: actions/checkout@v2
       with:
diff --git a/.github/workflows/format_push.yaml b/.github/workflows/format_push.yaml
index b79130f17a..5a17a4d65c 100644
--- a/.github/workflows/format_push.yaml
+++ b/.github/workflows/format_push.yaml
@@ -16,6 +16,7 @@ jobs:
     - name: Install dependencies
       run: |
         apt-get update && apt-get install -y dos2unix
+        pip3 install -r requirements-dev.txt
 
     - uses: actions/checkout@v2
       with:

From 7646e567bdf7119899a32f50cc0bad6d957b4f6d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 23 Feb 2022 01:09:45 +1100
Subject: [PATCH 684/867] handwired/frankie_macropad: disable some features to
 reduce size (#16431)

---
 keyboards/handwired/frankie_macropad/rules.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/keyboards/handwired/frankie_macropad/rules.mk b/keyboards/handwired/frankie_macropad/rules.mk
index 175a3d4ef6..46e261ffcb 100644
--- a/keyboards/handwired/frankie_macropad/rules.mk
+++ b/keyboards/handwired/frankie_macropad/rules.mk
@@ -18,3 +18,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 LTO_ENABLE = yes
+SPACE_CADET_ENABLE = no
+MAGIC_ENABLE = no
+GRAVE_ESC_ENABLE = no

From 5330d0888dd10bfbdb55196d0713db344e0c3fbb Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 22 Feb 2022 18:24:18 +0000
Subject: [PATCH 685/867] Install extra CLI dependencies that are missing
 (#16426)

* Install extra CLI dependencies that are missing

* dos2unix is part of base container
---
 .github/workflows/format.yaml      | 9 ++++-----
 .github/workflows/format_push.yaml | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
index 9415861eaa..ba0a86aa78 100644
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@@ -19,15 +19,14 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
-    - name: Install dependencies
-      run: |
-        apt-get update && apt-get install -y dos2unix
-        pip3 install -r requirements-dev.txt
-
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
 
+    - name: Install dependencies
+      run: |
+        pip3 install -r requirements-dev.txt
+
     - uses: trilom/file-changes-action@v1.2.4
       id: file_changes
       with:
diff --git a/.github/workflows/format_push.yaml b/.github/workflows/format_push.yaml
index 5a17a4d65c..4b51213b36 100644
--- a/.github/workflows/format_push.yaml
+++ b/.github/workflows/format_push.yaml
@@ -13,15 +13,14 @@ jobs:
     container: qmkfm/qmk_cli
 
     steps:
-    - name: Install dependencies
-      run: |
-        apt-get update && apt-get install -y dos2unix
-        pip3 install -r requirements-dev.txt
-
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
 
+    - name: Install dependencies
+      run: |
+        pip3 install -r requirements-dev.txt
+
     - name: Run qmk formatters
       shell: 'bash {0}'
       run: |

From 8aec20c0da9481c5294b216346231a98570d1626 Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Tue, 22 Feb 2022 10:29:47 -0800
Subject: [PATCH 686/867] Format code according to conventions (#16435)

---
 lib/python/qmk/cli/pytest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/python/qmk/cli/pytest.py b/lib/python/qmk/cli/pytest.py
index 2e4a0a9f00..b7b17f0e9d 100644
--- a/lib/python/qmk/cli/pytest.py
+++ b/lib/python/qmk/cli/pytest.py
@@ -12,7 +12,8 @@ from milc import cli
 def pytest(cli):
     """Run several linting/testing commands.
     """
-    nose2 = cli.run(['nose2', '-v', '-t' 'lib/python', *cli.args.test], capture_output=False, stdin=DEVNULL)
+    nose2 = cli.run(['nose2', '-v', '-t'
+                     'lib/python', *cli.args.test], capture_output=False, stdin=DEVNULL)
     flake8 = cli.run(['flake8', 'lib/python'], capture_output=False, stdin=DEVNULL)
 
     return flake8.returncode | nose2.returncode

From cf31355f08dca311a013168eb3eb995e2fc6a3d1 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 23 Feb 2022 17:33:08 +0000
Subject: [PATCH 687/867] Changelog 2022q1 (#16380)

* Initial changelog pass

* update generate-develop-pr-list content

* Fix bad word-ness

* Fix generate-develop-pr-list ignores

* Update docs/ChangeLog/20220226.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
---
 docs/ChangeLog/20220226.md                    | 489 ++++++++++++++++++
 docs/ChangeLog/20220226/PR15304.md            |  13 -
 docs/_summary.md                              |   2 +-
 docs/breaking_changes.md                      |  17 +-
 docs/breaking_changes_history.md              |   1 +
 .../qmk/cli/generate/develop_pr_list.py       |   3 +-
 6 files changed, 502 insertions(+), 23 deletions(-)
 create mode 100644 docs/ChangeLog/20220226.md
 delete mode 100644 docs/ChangeLog/20220226/PR15304.md

diff --git a/docs/ChangeLog/20220226.md b/docs/ChangeLog/20220226.md
new file mode 100644
index 0000000000..a469612fe8
--- /dev/null
+++ b/docs/ChangeLog/20220226.md
@@ -0,0 +1,489 @@
+# QMK Breaking Changes - 2022 February 26 Changelog
+
+## Notable Features :id=notable-features
+
+### Default USB Polling rate now 1kHz ([#15352](https://github.com/qmk/qmk_firmware/pull/15352))
+
+The default USB Polling rate has been aligned across supported platforms to now be 1ms/1kHz.
+
+Something something *Lets go gamers!*
+
+### Split support for pointing devices ([#15304](https://github.com/qmk/qmk_firmware/pull/15304))
+
+Pointing devices can now be shared across a split keyboard with support for a single pointing device or a pointing device on each side.
+
+See the [Pointing Device](feature_pointing_device.md) documentation for further configuration options.
+
+## Changes Requiring User Action :id=changes-requiring-user-action
+
+### Legacy macro and action_function system removed ([#16025](https://github.com/qmk/qmk_firmware/pull/16025))
+
+The long time deprecated `MACRO()` and `action_get_macro` methods have been removed. Where possible, existing usages have been migrated over to core [Macros](feature_macros.md).
+
+### Create a build error if no bootloader is specified ([#16181](https://github.com/qmk/qmk_firmware/pull/16181))
+
+Bootloader configuration is no longer assumed. Keyboards must now set either:
+
+* `BOOTLOADER` within `rules.mk`
+* `bootloader` within `info.json`
+
+### Rename `AdafruitBLE` to `BluefruitLE` ([#16127](https://github.com/qmk/qmk_firmware/pull/16127))
+
+In preparation of future bluetooth work, the `AdafruitBLE` integration has been renamed to allow potential for any other Adafruit BLE products. 
+
+### Updated Keyboard Codebases :id=updated-keyboard-codebases
+
+The following keyboards have had their source moved within QMK:
+
+| Old Keyboard Name          | New Keyboard Name                  |
+|----------------------------|------------------------------------|
+|  6ball                     |  maple_computing/6ball             |
+|  7skb                      |  salicylic_acid3/7skb              |
+|  7splus                    |  salicylic_acid3/7splus            |
+|  acr60                     |  mechkeys/acr60                    |
+|  adalyn                    |  tominabox1/adalyn                 |
+|  ajisai74                  |  salicylic_acid3/ajisai74          |
+|  aleth42                   |  25keys/aleth42                    |
+|  alicia_cook               |  ibnuda/alicia_cook                |
+|  allison_numpad            |  prototypist/allison_numpad        |
+|  allison                   |  prototypist/allison               |
+|  alu84                     |  mechkeys/alu84                    |
+|  angel17                   |  kakunpc/angel17                   |
+|  angel64/alpha             |  kakunpc/angel64/alpha             |
+|  angel64/rev1              |  kakunpc/angel64/rev1              |
+|  arch_36                   |  obosob/arch_36                    |
+|  bakeneko60                |  kkatano/bakeneko60                |
+|  bakeneko65/rev2           |  kkatano/bakeneko65/rev2           |
+|  bakeneko65/rev3           |  kkatano/bakeneko65/rev3           |
+|  bakeneko80                |  kkatano/bakeneko80                |
+|  barleycorn                |  yiancardesigns/barleycorn         |
+|  bat43/rev1                |  dailycraft/bat43/rev1             |
+|  bat43/rev2                |  dailycraft/bat43/rev2             |
+|  bigseries/1key            |  woodkeys/bigseries/1key           |
+|  bigseries/2key            |  woodkeys/bigseries/2key           |
+|  bigseries/3key            |  woodkeys/bigseries/3key           |
+|  bigseries/4key            |  woodkeys/bigseries/4key           |
+|  bkf                       |  drhigsby/bkf                      |
+|  business_card/alpha       |  kakunpc/business_card/alpha       |
+|  business_card/beta        |  kakunpc/business_card/beta        |
+|  butterstick               |  gboards/butterstick               |
+|  c39                       |  maple_computing/c39               |
+|  cassette42                |  25keys/cassette42                 |
+|  chidori                   |  kagizaraya/chidori                |
+|  chili                     |  ydkb/chili                        |
+|  chimera_ergo              |  glenpickle/chimera_ergo           |
+|  chimera_ls                |  glenpickle/chimera_ls             |
+|  chimera_ortho             |  glenpickle/chimera_ortho          |
+|  chimera_ortho_plus        |  glenpickle/chimera_ortho_plus     |
+|  choco60                   |  recompile_keys/choco60            |
+|  choc_taro                 |  kakunpc/choc_taro                 |
+|  christmas_tree            |  maple_computing/christmas_tree    |
+|  claw44/rev1               |  dailycraft/claw44/rev1            |
+|  cocoa40                   |  recompile_keys/cocoa40            |
+|  comet46                   |  satt/comet46                      |
+|  cu24                      |  capsunlocked/cu24                 |
+|  cu75                      |  capsunlocked/cu75                 |
+|  cu80                      |  capsunlocked/cu80/v1              |
+|  delilah                   |  rainkeebs/delilah                 |
+|  diverge3                  |  unikeyboard/diverge3              |
+|  divergetm2                |  unikeyboard/divergetm2            |
+|  dozen0                    |  yynmt/dozen0                      |
+|  dubba175                  |  drhigsby/dubba175                 |
+|  eggman                    |  qpockets/eggman                   |
+|  ergo42                    |  biacco42/ergo42                   |
+|  ergoarrows                |  salicylic_acid3/ergoarrows        |
+|  ergodash/mini             |  omkbd/ergodash/mini               |
+|  ergodash/rev1             |  omkbd/ergodash/rev1               |
+|  ergodox_infinity          |  input_club/ergodox_infinity       |
+|  ergotaco                  |  gboards/ergotaco                  |
+|  espectro                  |  mechkeys/espectro                 |
+|  felix                     |  unikeyboard/felix                 |
+|  four_banger               |  bpiphany/four_banger              |
+|  freyr                     |  hnahkb/freyr                      |
+|  geminate60                |  weirdo/geminate60                 |
+|  georgi                    |  gboards/georgi                    |
+|  gergo                     |  gboards/gergo                     |
+|  getta25                   |  salicylic_acid3/getta25           |
+|  gingham                   |  yiancardesigns/gingham            |
+|  gurindam                  |  ibnuda/gurindam                   |
+|  halberd                   |  kagizaraya/halberd                |
+|  hecomi/alpha              |  takashiski/hecomi/alpha           |
+|  hid_liber                 |  bpiphany/hid_liber                |
+|  id67/default_rgb          |  idobao/id67/default_rgb           |
+|  id67/rgb                  |  idobao/id67/rgb                   |
+|  id80                      |  idobao/id80/v1                    |
+|  id87                      |  idobao/id87/v1                    |
+|  idobo                     |  idobao/id75/v1                    |
+|  infinity60                |  input_club/infinity60             |
+|  ivy/rev1                  |  maple_computing/ivy/rev1          |
+|  jisplit89                 |  salicylic_acid3/jisplit89         |
+|  jnao                      |  maple_computing/jnao              |
+|  just60                    |  ydkb/just60                       |
+|  kagamidget                |  yynmt/kagamidget                  |
+|  kelowna/rgb64             |  weirdo/kelowna/rgb64              |
+|  kprepublic/bm65hsrgb_iso  |  kprepublic/bm65hsrgb_iso/rev1     |
+|  kprepublic/bm68hsrgb      |  kprepublic/bm68hsrgb/rev1         |
+|  k_type                    |  input_club/k_type                 |
+|  latin17rgb                |  latincompass/latin17rgb           |
+|  latin47ble                |  latincompass/latin47ble           |
+|  latin60rgb                |  latincompass/latin60rgb           |
+|  latin64ble                |  latincompass/latin64ble           |
+|  latin6rgb                 |  latincompass/latin6rgb            |
+|  latinpadble               |  latincompass/latinpadble          |
+|  latinpad                  |  latincompass/latinpad             |
+|  launchpad/rev1            |  maple_computing/launchpad/rev1    |
+|  lck75                     |  lyso1/lck75                       |
+|  le_chiffre                |  tominabox1/le_chiffre             |
+|  lefishe                   |  lyso1/lefishe                     |
+|  lets_split_eh/eh          |  maple_computing/lets_split_eh/eh  |
+|  ls_60                     |  weirdo/ls_60                      |
+|  m3n3van                   |  matthewdias/m3n3van               |
+|  mechmini/v1               |  mechkeys/mechmini/v1              |
+|  mechmini/v2               |  mechkeys/mechmini/v2              |
+|  meira                     |  woodkeys/meira                    |
+|  meishi2                   |  biacco42/meishi2                  |
+|  meishi                    |  biacco42/meishi                   |
+|  minidox/rev1              |  maple_computing/minidox/rev1      |
+|  minim                     |  matthewdias/minim                 |
+|  mio                       |  recompile_keys/mio                |
+|  model_v                   |  matthewdias/model_v               |
+|  montex                    |  idobao/montex/v1                  |
+|  nafuda                    |  salicylic_acid3/nafuda            |
+|  naiping/np64              |  weirdo/naiping/np64               |
+|  naiping/nphhkb            |  weirdo/naiping/nphhkb             |
+|  naiping/npminila          |  weirdo/naiping/npminila           |
+|  naked48                   |  salicylic_acid3/naked48           |
+|  naked60                   |  salicylic_acid3/naked60           |
+|  naked64                   |  salicylic_acid3/naked64           |
+|  namecard2x4               |  takashiski/namecard2x4            |
+|  nebula12                  |  spaceholdings/nebula12            |
+|  nebula68b                 |  spaceholdings/nebula68b           |
+|  nebula68                  |  spaceholdings/nebula68            |
+|  niu_mini                  |  kbdfans/niu_mini                  |
+|  nk1                       |  novelkeys/nk1                     |
+|  nk65                      |  novelkeys/nk65                    |
+|  nk87                      |  novelkeys/nk87                    |
+|  nknl7en                   |  salicylic_acid3/nknl7en           |
+|  nknl7jp                   |  salicylic_acid3/nknl7jp           |
+|  nomu30                    |  recompile_keys/nomu30             |
+|  novelpad                  |  novelkeys/novelpad                |
+|  ogurec                    |  drhigsby/ogurec                   |
+|  otaku_split/rev0          |  takashiski/otaku_split/rev0       |
+|  otaku_split/rev1          |  takashiski/otaku_split/rev1       |
+|  owl8                      |  dailycraft/owl8                   |
+|  packrat                   |  drhigsby/packrat                  |
+|  pistachio_mp              |  rate/pistachio_mp                 |
+|  pistachio_pro             |  rate/pistachio_pro                |
+|  pistachio                 |  rate/pistachio                    |
+|  plexus75                  |  checkerboards/plexus75            |
+|  pursuit40                 |  checkerboards/pursuit40           |
+|  qaz                       |  tominabox1/qaz                    |
+|  quark                     |  checkerboards/quark               |
+|  rabbit_capture_plan       |  kakunpc/rabbit_capture_plan       |
+|  rainkeeb                  |  rainkeebs/rainkeeb                |
+|  reviung33                 |  reviung/reviung33                 |
+|  reviung34                 |  reviung/reviung34                 |
+|  reviung39                 |  reviung/reviung39                 |
+|  reviung41                 |  reviung/reviung41                 |
+|  reviung53                 |  reviung/reviung53                 |
+|  reviung5                  |  reviung/reviung5                  |
+|  reviung61                 |  reviung/reviung61                 |
+|  runner3680/3x6            |  omkbd/runner3680/3x6              |
+|  runner3680/3x7            |  omkbd/runner3680/3x7              |
+|  runner3680/3x8            |  omkbd/runner3680/3x8              |
+|  runner3680/4x6            |  omkbd/runner3680/4x6              |
+|  runner3680/4x7            |  omkbd/runner3680/4x7              |
+|  runner3680/4x8            |  omkbd/runner3680/4x8              |
+|  runner3680/5x6_5x8        |  omkbd/runner3680/5x6_5x8          |
+|  runner3680/5x6            |  omkbd/runner3680/5x6              |
+|  runner3680/5x7            |  omkbd/runner3680/5x7              |
+|  runner3680/5x8            |  omkbd/runner3680/5x8              |
+|  scarletbandana            |  woodkeys/scarletbandana           |
+|  scythe                    |  kagizaraya/scythe                 |
+|  seigaiha                  |  yiancardesigns/seigaiha           |
+|  setta21                   |  salicylic_acid3/setta21           |
+|  space_space/rev1          |  qpockets/space_space/rev1         |
+|  space_space/rev2          |  qpockets/space_space/rev2         |
+|  spiderisland/winry25tc    |  winry/winry25tc                   |
+|  splitreus62               |  nacly/splitreus62                 |
+|  squiggle/rev1             |  ibnuda/squiggle/rev1              |
+|  standaside                |  edi/standaside                    |
+|  steal_this_keyboard       |  obosob/steal_this_keyboard        |
+|  stella                    |  hnahkb/stella                     |
+|  suihankey/alpha           |  kakunpc/suihankey/alpha           |
+|  suihankey/rev1            |  kakunpc/suihankey/rev1            |
+|  suihankey/split           |  kakunpc/suihankey/split           |
+|  thedogkeyboard            |  kakunpc/thedogkeyboard            |
+|  the_ruler                 |  maple_computing/the_ruler         |
+|  tiger910                  |  weirdo/tiger910                   |
+|  treadstone32              |  marksard/treadstone32             |
+|  treadstone48/rev1         |  marksard/treadstone48/rev1        |
+|  treadstone48/rev2         |  marksard/treadstone48/rev2        |
+|  txuu                      |  matthewdias/txuu                  |
+|  ua62                      |  nacly/ua62                        |
+|  underscore33/rev1         |  tominabox1/underscore33/rev1      |
+|  underscore33/rev2         |  tominabox1/underscore33/rev2      |
+|  vn66                      |  hnahkb/vn66                       |
+|  wallaby                   |  kkatano/wallaby                   |
+|  wanten                    |  qpockets/wanten                   |
+|  whitefox                  |  input_club/whitefox               |
+|  wings42/rev1              |  dailycraft/wings42/rev1           |
+|  wings42/rev1_extkeys      |  dailycraft/wings42/rev1_extkeys   |
+|  wings42/rev2              |  dailycraft/wings42/rev2           |
+|  yasui                     |  rainkeebs/yasui                   |
+|  yd60mq                    |  ymdk/yd60mq                       |
+|  yd68                      |  ydkb/yd68                         |
+|  ymd75                     |  ymdk/ymd75                        |
+|  ymd96                     |  ymdk/ymd96                        |
+|  ymdk_np21                 |  ymdk/np21                         |
+|  yurei                     |  kkatano/yurei                     |
+|  zinc                      |  25keys/zinc                       |
+|  zinc/rev1                 |  25keys/zinc/rev1                  |
+|  zinc/reva                 |  25keys/zinc/reva                  |
+
+## Notable core changes :id=notable-core
+
+### New MCU Support :id=new-mcu-support
+
+Building on previous cycles, QMK firmware picked up support for a couple extra MCU variants:
+
+* STM32L432
+* STM32L442
+
+### New Drivers
+
+QMK now has core-supplied support for the following device peripherals:
+
+#### LED
+
+* IS31FL3742A
+* IS31FL3743A
+* IS31FL3745
+* IS31FL3746A
+
+#### GPIO
+
+* SN74x138
+* mcp23018
+
+---
+
+## Full changelist
+
+Core:
+* Initial pass at data driven new-keyboard subcommand ([#12795](https://github.com/qmk/qmk_firmware/pull/12795))
+* Don't send keyboard reports that propagate no changes to the host ([#14065](https://github.com/qmk/qmk_firmware/pull/14065))
+* Custom matrix lite support for split keyboards ([#14674](https://github.com/qmk/qmk_firmware/pull/14674))
+* Add sym_defer_pr debouncer type ([#14948](https://github.com/qmk/qmk_firmware/pull/14948))
+* Add RGB matrix & LED Matrix support for IS31FL3742A, IS31FL3743A, IS31FL3745, IS31FL3746A ([#14989](https://github.com/qmk/qmk_firmware/pull/14989))
+* New combo configuration options ([#15083](https://github.com/qmk/qmk_firmware/pull/15083))
+* IS31FL3733 driver for LED Matrix ([#15088](https://github.com/qmk/qmk_firmware/pull/15088))
+* Add open-drain GPIO support. ([#15282](https://github.com/qmk/qmk_firmware/pull/15282))
+* Make (un)register code functions weak ([#15285](https://github.com/qmk/qmk_firmware/pull/15285))
+* Split support for pointing devices. ([#15304](https://github.com/qmk/qmk_firmware/pull/15304))
+* Added cancel_key_lock function ([#15321](https://github.com/qmk/qmk_firmware/pull/15321))
+* Remove matrix_is_modified() and debounce_is_active() ([#15349](https://github.com/qmk/qmk_firmware/pull/15349))
+* Change default USB Polling rate to 1kHz ([#15352](https://github.com/qmk/qmk_firmware/pull/15352))
+* Implement MAGIC_TOGGLE_CONTROL_CAPSLOCK ([#15368](https://github.com/qmk/qmk_firmware/pull/15368))
+* Tidy up existing i2c_master implementations ([#15376](https://github.com/qmk/qmk_firmware/pull/15376))
+* Generalize Unicode defines ([#15409](https://github.com/qmk/qmk_firmware/pull/15409))
+* Added external spi flash driver. ([#15419](https://github.com/qmk/qmk_firmware/pull/15419))
+* Remove Deprecated USB Polling comment from vusb.c ([#15420](https://github.com/qmk/qmk_firmware/pull/15420))
+* Expand rotational range for PMW3360 Optical Sensor ([#15431](https://github.com/qmk/qmk_firmware/pull/15431))
+* ChibiOS SVN mirror script update ([#15435](https://github.com/qmk/qmk_firmware/pull/15435))
+* Refactor `bootloader_jump()` implementations ([#15450](https://github.com/qmk/qmk_firmware/pull/15450))
+* added missing audio_off_user() callback ([#15457](https://github.com/qmk/qmk_firmware/pull/15457))
+* Migrate serial_uart usages to UART driver ([#15479](https://github.com/qmk/qmk_firmware/pull/15479))
+* Migrate RN42 to UART driver and refactor ([#15492](https://github.com/qmk/qmk_firmware/pull/15492))
+* pwm3360 driver cleanup and diff reduction to adns9800 ([#15559](https://github.com/qmk/qmk_firmware/pull/15559))
+* Advanced deferred_exec for core-side code. ([#15579](https://github.com/qmk/qmk_firmware/pull/15579))
+* Adjust tap_code16 to account for TAP_HOLD_CAPS_DELAY ([#15635](https://github.com/qmk/qmk_firmware/pull/15635))
+* Slight tidy up of keyboard task loop ([#15725](https://github.com/qmk/qmk_firmware/pull/15725))
+* Unify the key up/down behaviour of RGB keycodes ([#15730](https://github.com/qmk/qmk_firmware/pull/15730))
+* Add PMW3389 optical sensor Support (Updated) ([#15740](https://github.com/qmk/qmk_firmware/pull/15740))
+* ChibiOS: add support for HID Programmable Buttons ([#15787](https://github.com/qmk/qmk_firmware/pull/15787))
+* ChibiOS: shorten USB disconnect state on boot to 50ms ([#15805](https://github.com/qmk/qmk_firmware/pull/15805))
+* Add init function to clear previous matrix effect ([#15815](https://github.com/qmk/qmk_firmware/pull/15815))
+* Optimize initialization of PMW3360 Sensor ([#15821](https://github.com/qmk/qmk_firmware/pull/15821))
+* Add Pixel Flow RGB matrix effect ([#15829](https://github.com/qmk/qmk_firmware/pull/15829))
+* PMW3389 Revert Firmware load during Initilization ([#15859](https://github.com/qmk/qmk_firmware/pull/15859))
+* Combo `TAP_CODE_DELAY` and `clear_weak_mods` ([#15866](https://github.com/qmk/qmk_firmware/pull/15866))
+* Relocate matrix_scan_quantum tasks ([#15882](https://github.com/qmk/qmk_firmware/pull/15882))
+* Adjust mouse key defaults ([#15883](https://github.com/qmk/qmk_firmware/pull/15883))
+* RGB Matrix: Reload from EEPROM ([#15923](https://github.com/qmk/qmk_firmware/pull/15923))
+* Enable a default task throttle for split pointing. ([#15925](https://github.com/qmk/qmk_firmware/pull/15925))
+* Move mcp23018 driver to core ([#15944](https://github.com/qmk/qmk_firmware/pull/15944))
+* Relocate matrix_init_quantum content ([#15953](https://github.com/qmk/qmk_firmware/pull/15953))
+* Align location of some host led logic ([#15954](https://github.com/qmk/qmk_firmware/pull/15954))
+* Rename some Quantum keycodes ([#15968](https://github.com/qmk/qmk_firmware/pull/15968))
+* Migrate more makefile utilities to builddefs sub-directory ([#16002](https://github.com/qmk/qmk_firmware/pull/16002))
+* Various Makefile optimisations ([#16015](https://github.com/qmk/qmk_firmware/pull/16015))
+* Add support for STM32L432, STM32L442. ([#16016](https://github.com/qmk/qmk_firmware/pull/16016))
+* EEPROM refactor: remove `eeprom_teensy.c` by default, use transient instead ([#16020](https://github.com/qmk/qmk_firmware/pull/16020))
+* Deprecate Split Transaction status field ([#16023](https://github.com/qmk/qmk_firmware/pull/16023))
+* Rip out old macro and action_function system ([#16025](https://github.com/qmk/qmk_firmware/pull/16025))
+* Add a script that simplifies running commands under docker. ([#16028](https://github.com/qmk/qmk_firmware/pull/16028))
+* Add support for Q-series on the ckled2001 LED driver ([#16051](https://github.com/qmk/qmk_firmware/pull/16051))
+* Remove unused suspend_idle ([#16063](https://github.com/qmk/qmk_firmware/pull/16063))
+* Initial migration of suspend callbacks ([#16067](https://github.com/qmk/qmk_firmware/pull/16067))
+* Add layout change callbacks to VIA ([#16087](https://github.com/qmk/qmk_firmware/pull/16087))
+* Rename `AdafruitBLE` to `BluefruitLE` ([#16127](https://github.com/qmk/qmk_firmware/pull/16127))
+* Update outputselect to use platform connected state API ([#16185](https://github.com/qmk/qmk_firmware/pull/16185))
+* Remove default pointing device driver. ([#16190](https://github.com/qmk/qmk_firmware/pull/16190))
+* Add SN74x138 demultiplexer driver ([#16217](https://github.com/qmk/qmk_firmware/pull/16217))
+* Standardise error output. ([#16220](https://github.com/qmk/qmk_firmware/pull/16220))
+* Followup to #16220, more test error output. ([#16221](https://github.com/qmk/qmk_firmware/pull/16221))
+* Misc size regression script improvements. ([#16268](https://github.com/qmk/qmk_firmware/pull/16268))
+* Align existing pca9555 driver to better match mcp23018 API ([#16277](https://github.com/qmk/qmk_firmware/pull/16277))
+* Size checks print out target firmware file instead ([#16290](https://github.com/qmk/qmk_firmware/pull/16290))
+
+CLI:
+* `develop` changelog generator: use the PR title instead ([#15537](https://github.com/qmk/qmk_firmware/pull/15537))
+* `develop` changelog generator: skip code formatting in listing ([#16215](https://github.com/qmk/qmk_firmware/pull/16215))
+
+Keyboards:
+* Durgod: Increase scan rate by using wait_us timer ([#14091](https://github.com/qmk/qmk_firmware/pull/14091))
+* Add another GMMK Pro ANSI Keymap with custom RGB. ([#14243](https://github.com/qmk/qmk_firmware/pull/14243))
+* Parse USB device version BCD ([#14580](https://github.com/qmk/qmk_firmware/pull/14580))
+* Add vitoni keymap for GMMK Pro (ISO) ([#15006](https://github.com/qmk/qmk_firmware/pull/15006))
+* Move bm65hsrgb_iso and bm68hsrgb to rev1/ to prepare for updates to the boards ([#15132](https://github.com/qmk/qmk_firmware/pull/15132))
+* Convert ergoinu to SPLIT_KEYBOARD ([#15305](https://github.com/qmk/qmk_firmware/pull/15305))
+* Convert not_so_minidox to SPLIT_KEYBOARD ([#15306](https://github.com/qmk/qmk_firmware/pull/15306))
+* Added new handwired keyboard Wakizashi 40 ([#15336](https://github.com/qmk/qmk_firmware/pull/15336))
+* Convert ai03/orbit to SPLIT_KEYBOARD ([#15340](https://github.com/qmk/qmk_firmware/pull/15340))
+* Remove manual enable of LTO within user keymaps ([#15378](https://github.com/qmk/qmk_firmware/pull/15378))
+* Move to organization folder ([#15481](https://github.com/qmk/qmk_firmware/pull/15481))
+* Convert some more boards to Matrix Lite ([#15489](https://github.com/qmk/qmk_firmware/pull/15489))
+* Organize Reviung boards into a directory ([#15636](https://github.com/qmk/qmk_firmware/pull/15636))
+* move winry25tc to winry/ ([#15637](https://github.com/qmk/qmk_firmware/pull/15637))
+* Rename ymdk_np21 to np21 + move to ymdk vendor folder ([#15641](https://github.com/qmk/qmk_firmware/pull/15641))
+* move ymd96 to ymdk vendor folder ([#15643](https://github.com/qmk/qmk_firmware/pull/15643))
+* move ymd75 to ymdk vendor folder ([#15645](https://github.com/qmk/qmk_firmware/pull/15645))
+* move yd60mq to ymdk vendor folder ([#15647](https://github.com/qmk/qmk_firmware/pull/15647))
+* rename idobo to idobao/id75, move to vendor folder ([#15661](https://github.com/qmk/qmk_firmware/pull/15661))
+* move ID67 to IDOBAO vendor folder ([#15662](https://github.com/qmk/qmk_firmware/pull/15662))
+* move ID80 to IDOBAO vendor folder ([#15665](https://github.com/qmk/qmk_firmware/pull/15665))
+* move ID87 to IDOBAO vendor folder ([#15667](https://github.com/qmk/qmk_firmware/pull/15667))
+* move montex to IDOBAO vendor folder ([#15668](https://github.com/qmk/qmk_firmware/pull/15668))
+* move @yangdigi 's keyboards to a YDKB folder ([#15681](https://github.com/qmk/qmk_firmware/pull/15681))
+* move @kkatano 's keyboards to kkatano user folder ([#15684](https://github.com/qmk/qmk_firmware/pull/15684))
+* Sol 3 Keyboard from RGBKB ([#15687](https://github.com/qmk/qmk_firmware/pull/15687))
+* move cu24, cu75, cu80/v1 into capsunlocked folder ([#15758](https://github.com/qmk/qmk_firmware/pull/15758))
+* move mechkeys keyboards into the mechkeys/ vendor folder ([#15760](https://github.com/qmk/qmk_firmware/pull/15760))
+* move @lyso1 's boards into lyso1/ ([#15767](https://github.com/qmk/qmk_firmware/pull/15767))
+* move prototypist boards into vendor folder ([#15780](https://github.com/qmk/qmk_firmware/pull/15780))
+* move @yiancar 's boards into yiancardesigns/ ([#15781](https://github.com/qmk/qmk_firmware/pull/15781))
+* move novelkeys keyboards to vendor folder ([#15783](https://github.com/qmk/qmk_firmware/pull/15783))
+* move @weirdo-f 's keyboards into weirdo/ ([#15785](https://github.com/qmk/qmk_firmware/pull/15785))
+* move @marksard 's boards to marksard/ ([#15786](https://github.com/qmk/qmk_firmware/pull/15786))
+* move input club keyboards into vendor folder ([#15788](https://github.com/qmk/qmk_firmware/pull/15788))
+* move @monksoffunk 's boards into 25keys/ ([#15789](https://github.com/qmk/qmk_firmware/pull/15789))
+* move @Salicylic-acid3 's keyboards to salicylic-acid3/ ([#15791](https://github.com/qmk/qmk_firmware/pull/15791))
+* move @rainkeebs 's keyboards to rainkeebs/ ([#15797](https://github.com/qmk/qmk_firmware/pull/15797))
+* move standaside into edi/ ([#15798](https://github.com/qmk/qmk_firmware/pull/15798))
+* move @obosob 's boards into obosob/ ([#15799](https://github.com/qmk/qmk_firmware/pull/15799))
+* move @nacly 's boards to nacly/ ([#15801](https://github.com/qmk/qmk_firmware/pull/15801))
+* move @kakunpc 's keebs into kakunpc/ ([#15814](https://github.com/qmk/qmk_firmware/pull/15814))
+* move @qpocket 's keyboards to qpocket/ ([#15827](https://github.com/qmk/qmk_firmware/pull/15827))
+* BDN9 keymap ([#15924](https://github.com/qmk/qmk_firmware/pull/15924))
+* move @matthewdias 's keebs into matthewdias/ ([#15991](https://github.com/qmk/qmk_firmware/pull/15991))
+* move id80 and id75 to v1 to accommodate for id75 v2 and id80 v3 ([#15992](https://github.com/qmk/qmk_firmware/pull/15992))
+* Remove `action_function()` from LFKeyboards boards ([#15993](https://github.com/qmk/qmk_firmware/pull/15993))
+* move @latincompass (aka @18438880 , @haierwangwei2005)'s boards to /latincompass ([#16039](https://github.com/qmk/qmk_firmware/pull/16039))
+* move g heavy industry boards into /gboards ([#16040](https://github.com/qmk/qmk_firmware/pull/16040))
+* move @drhigsby 's boards into /drhigsby ([#16041](https://github.com/qmk/qmk_firmware/pull/16041))
+* More keyboard rules.mk cleanups ([#16044](https://github.com/qmk/qmk_firmware/pull/16044))
+* move @That-Canadian 's boards into /maple_computing ([#16050](https://github.com/qmk/qmk_firmware/pull/16050))
+* move @takai 's keyboards into /recompile_keys ([#16053](https://github.com/qmk/qmk_firmware/pull/16053))
+* move @satt99 's comet46 to satt/ ([#16059](https://github.com/qmk/qmk_firmware/pull/16059))
+* move @ka2hiro 's boards into /kagizaraya ([#16070](https://github.com/qmk/qmk_firmware/pull/16070))
+* move @GlenPickle 's chimera* boards into a folder ([#16072](https://github.com/qmk/qmk_firmware/pull/16072))
+* move @yynmt 's boards into /yynmt ([#16075](https://github.com/qmk/qmk_firmware/pull/16075))
+* move @Biacco42 's keebs into /biacco42 ([#16080](https://github.com/qmk/qmk_firmware/pull/16080))
+* move unikeyboard boards to /unikeyboard ([#16081](https://github.com/qmk/qmk_firmware/pull/16081))
+* move four_banger to bpiphany ([#16082](https://github.com/qmk/qmk_firmware/pull/16082))
+* move @takashiski 's keebs into /takashiski ([#16089](https://github.com/qmk/qmk_firmware/pull/16089))
+* move hid_liber to /bpiphany ([#16091](https://github.com/qmk/qmk_firmware/pull/16091))
+* move spaceholdings boards into /spaceholdings ([#16096](https://github.com/qmk/qmk_firmware/pull/16096))
+* move @7-rate 's keebs to /rate ([#16099](https://github.com/qmk/qmk_firmware/pull/16099))
+* move @npspears 's boards into /checkerboards ([#16100](https://github.com/qmk/qmk_firmware/pull/16100))
+* move @vuhopkep 's keebs into /hnahkb ([#16102](https://github.com/qmk/qmk_firmware/pull/16102))
+* move @ibnuda 's keebs into /ibnuda ([#16108](https://github.com/qmk/qmk_firmware/pull/16108))
+* move @tominabox1 's keebs into /tominabox1 ([#16109](https://github.com/qmk/qmk_firmware/pull/16109))
+* move niu_mini to /kbdfans ([#16112](https://github.com/qmk/qmk_firmware/pull/16112))
+* move woodkeys.click keyboards to /woodkeys ([#16113](https://github.com/qmk/qmk_firmware/pull/16113))
+* move @omkbd 's boards to /omkbd ([#16116](https://github.com/qmk/qmk_firmware/pull/16116))
+* Overhaul Tractyl Manuform ([#16134](https://github.com/qmk/qmk_firmware/pull/16134))
+* Reduce firmware size for dztech/dz60rgb_wkl/v2_1:via ([#16254](https://github.com/qmk/qmk_firmware/pull/16254))
+
+Keyboard fixes:
+* Fix build failure for UT47 ([#15483](https://github.com/qmk/qmk_firmware/pull/15483))
+* Update grs_70ec to use newer custom matrix ([#15609](https://github.com/qmk/qmk_firmware/pull/15609))
+* fix compiler issue with Tractyl Manuform 4x6 ([#15646](https://github.com/qmk/qmk_firmware/pull/15646))
+* Fix CI. ([#15828](https://github.com/qmk/qmk_firmware/pull/15828))
+* Yet another bad `DEFAULT_FOLDER` fix. ([#15904](https://github.com/qmk/qmk_firmware/pull/15904))
+* Fix build failures for `mschwingen/modelm` ([#15987](https://github.com/qmk/qmk_firmware/pull/15987))
+* `rocketboard_16`: Fix mismatched LUT sizes ([#15997](https://github.com/qmk/qmk_firmware/pull/15997))
+* Fix erroneous SRC for Clueboard 66 hotswap ([#16007](https://github.com/qmk/qmk_firmware/pull/16007))
+* Fix handwired/ms_sculpt_mobile default keymap ([#16032](https://github.com/qmk/qmk_firmware/pull/16032))
+* Re-org Hillside folders as new model prep. Fix default keymap. ([#16128](https://github.com/qmk/qmk_firmware/pull/16128))
+* Fix up default folder locations. Again. ([#16135](https://github.com/qmk/qmk_firmware/pull/16135))
+* Sol3 rgb fix ([#16157](https://github.com/qmk/qmk_firmware/pull/16157))
+* Add missing `BOOTLOADER` for a handful of boards ([#16225](https://github.com/qmk/qmk_firmware/pull/16225))
+* Remove half implemented micronucleus bootloader support ([#16252](https://github.com/qmk/qmk_firmware/pull/16252))
+* Fixup bootloaders. ([#16256](https://github.com/qmk/qmk_firmware/pull/16256))
+* Fix idobao/id80/v3 compilation errors ([#16280](https://github.com/qmk/qmk_firmware/pull/16280))
+* Remove parent-relative paths from keyboards. ([#16282](https://github.com/qmk/qmk_firmware/pull/16282))
+* Bodge for helix build failures ([#16376](https://github.com/qmk/qmk_firmware/pull/16376))
+
+Others:
+* Add a clarification to an error message ([#15207](https://github.com/qmk/qmk_firmware/pull/15207))
+* Clang-format tweaks ([#15906](https://github.com/qmk/qmk_firmware/pull/15906))
+* Add example implementations for compatible MCUs list ([#15935](https://github.com/qmk/qmk_firmware/pull/15935))
+* Add version.h to gitignore ([#16222](https://github.com/qmk/qmk_firmware/pull/16222))
+* Update keyboard mapping for all moved boards this cycle ([#16312](https://github.com/qmk/qmk_firmware/pull/16312))
+* Align docs to new-keyboard behaviour ([#16357](https://github.com/qmk/qmk_firmware/pull/16357))
+* Align new-keyboard with recent schema updates ([#16378](https://github.com/qmk/qmk_firmware/pull/16378))
+
+Bugs:
+* Fixes potential wpm sampling overflow, along with code comment fixes ([#15277](https://github.com/qmk/qmk_firmware/pull/15277))
+* Add missing define for unicode common ([#15416](https://github.com/qmk/qmk_firmware/pull/15416))
+* Fix for SPI write timing in PMW3360 driver ([#15519](https://github.com/qmk/qmk_firmware/pull/15519))
+* Documentation Typo fix ([#15538](https://github.com/qmk/qmk_firmware/pull/15538))
+* fix a typo ([#15557](https://github.com/qmk/qmk_firmware/pull/15557))
+* Fix avr serial compile ([#15589](https://github.com/qmk/qmk_firmware/pull/15589))
+* More AVR GPIO compilation fixes. ([#15592](https://github.com/qmk/qmk_firmware/pull/15592))
+* Fix bug and code regression for Split Common ([#15603](https://github.com/qmk/qmk_firmware/pull/15603))
+* Include missing string.h include in split ([#15606](https://github.com/qmk/qmk_firmware/pull/15606))
+* Fixes for bootloader refactor build failures ([#15638](https://github.com/qmk/qmk_firmware/pull/15638))
+* Update pmw3360 driver after reading the datasheet top to bottom. Fix some outdated refs. ([#15682](https://github.com/qmk/qmk_firmware/pull/15682))
+* Fix split pointing for analog joystick ([#15691](https://github.com/qmk/qmk_firmware/pull/15691))
+* Fix broken bootloader builds in develop. ([#15880](https://github.com/qmk/qmk_firmware/pull/15880))
+* Fix optical sensor firmware upload ([#15919](https://github.com/qmk/qmk_firmware/pull/15919))
+* Pass in the keyrecord_t of the dual-role/tapping key when calling per-key tap hold functions ([#15938](https://github.com/qmk/qmk_firmware/pull/15938))
+* fixed typo in orange HSV colors decalartion ([#15976](https://github.com/qmk/qmk_firmware/pull/15976))
+* Fix hack for chibiOS reset name ([#15984](https://github.com/qmk/qmk_firmware/pull/15984))
+* Fix right side ws2812 leds having two indices ([#15985](https://github.com/qmk/qmk_firmware/pull/15985))
+* Workaround in Makefile for recursive rule matching ([#15988](https://github.com/qmk/qmk_firmware/pull/15988))
+* Fix BACKLIGHT_CAPS_LOCK warning ([#15999](https://github.com/qmk/qmk_firmware/pull/15999))
+* Fix compilation issues for led indicators ([#16001](https://github.com/qmk/qmk_firmware/pull/16001))
+* ChibiOS timer fixes ([#16017](https://github.com/qmk/qmk_firmware/pull/16017))
+* Fix bootloader_jump for certain CTRL boards ([#16026](https://github.com/qmk/qmk_firmware/pull/16026))
+* Fix up issue with PROGMEM and hand_swap_config ([#16027](https://github.com/qmk/qmk_firmware/pull/16027))
+* Don't make EEPROM size assumptions with dynamic keymaps. ([#16054](https://github.com/qmk/qmk_firmware/pull/16054))
+* fix missed .noci in reviung move ([#16107](https://github.com/qmk/qmk_firmware/pull/16107))
+* Fix issues with Python Tests ([#16162](https://github.com/qmk/qmk_firmware/pull/16162))
+* Fixup multibuild filegen ([#16166](https://github.com/qmk/qmk_firmware/pull/16166))
+* Remove old .gitignore entry. Add more macOS junk exclusions. ([#16167](https://github.com/qmk/qmk_firmware/pull/16167))
+* Fixup builds so that teensy EEPROM knows which MCU it's targeting. ([#16168](https://github.com/qmk/qmk_firmware/pull/16168))
+* Create a build error if no bootloader is specified. ([#16181](https://github.com/qmk/qmk_firmware/pull/16181))
+* Ensure `version.h` is recreated each build. ([#16188](https://github.com/qmk/qmk_firmware/pull/16188))
+* Add `custom` to list of valid bootloader types in info.json ([#16228](https://github.com/qmk/qmk_firmware/pull/16228))
+* Fix `layer_state` restoration at end of dynamic macro feature #16208 ([#16230](https://github.com/qmk/qmk_firmware/pull/16230))
+* Minor additions #12795 ([#16276](https://github.com/qmk/qmk_firmware/pull/16276))
+* Various fixes for matrix _RIGHT handling ([#16292](https://github.com/qmk/qmk_firmware/pull/16292))
+* Fix slashes in build_full_test.mk ([#16300](https://github.com/qmk/qmk_firmware/pull/16300))
+* ps2/avr: use the correct file name ([#16316](https://github.com/qmk/qmk_firmware/pull/16316))
+* Fix compilation of ChibiOS UART driver ([#16348](https://github.com/qmk/qmk_firmware/pull/16348))
+* Various fixes for new-keyboard ([#16358](https://github.com/qmk/qmk_firmware/pull/16358))
+* Allow NO_PIN within data driven configuration ([#16359](https://github.com/qmk/qmk_firmware/pull/16359))
diff --git a/docs/ChangeLog/20220226/PR15304.md b/docs/ChangeLog/20220226/PR15304.md
deleted file mode 100644
index 3cdb40db10..0000000000
--- a/docs/ChangeLog/20220226/PR15304.md
+++ /dev/null
@@ -1,13 +0,0 @@
-### Split Common core now supports Pointing Devices ([#15304](https://github.com/qmk/qmk_firmware/pull/15304))
-
-Pointing devices can now be shared across a split keyboard with support for a single pointing device or a pointing device on each side.
-
-This feature can be enabled with `#define SPLIT_POINTING_ENABLE` and one of the following options:
-
-| Setting                   | Description                        |
-|---------------------------|------------------------------------|
-|`POINTING_DEVICE_LEFT`     | Pointing device on the left side   |
-|`POINTING_DEVICE_RIGHT`    | Pointing device on the right side  |
-|`POINTING_DEVICE_COMBINED` | Pointing device on both sides      |
-
-See the [Pointing Device](../feature_pointing_device.md) documentation for further configuration options.
diff --git a/docs/_summary.md b/docs/_summary.md
index 8c83a216ab..74203aa0f8 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -131,7 +131,7 @@
   * Breaking Changes
     * [Overview](breaking_changes.md)
     * [My Pull Request Was Flagged](breaking_changes_instructions.md)
-    * [Most Recent ChangeLog](ChangeLog/20211127.md "QMK v0.15.0 - 2021 Nov 27")
+    * [Most Recent ChangeLog](ChangeLog/20220226.md "QMK v0.16.0 - 2022 Feb 26")
     * [Past Breaking Changes](breaking_changes_history.md)
 
   * C Development
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index 8bde6c88f7..3fed268b98 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -8,6 +8,7 @@ The breaking change period is when we will merge PR's that change QMK in dangero
 
 ## What has been included in past Breaking Changes?
 
+* [2022 Feb 26](ChangeLog/20220226.md)
 * [2021 Nov 27](ChangeLog/20211127.md)
 * [2021 Aug 28](ChangeLog/20210828.md)
 * [2021 May 29](ChangeLog/20210529.md)
@@ -20,17 +21,17 @@ The breaking change period is when we will merge PR's that change QMK in dangero
 
 ## When is the next Breaking Change?
 
-The next Breaking Change is scheduled for February 26, 2022.
+The next Breaking Change is scheduled for May 28, 2022.
 
 ### Important Dates
 
-* [x] 2021 Nov 27 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
-* [ ] 2022 Jan 31 - `develop` closed to new PR's.
-* [ ] 2022 Jan 31 - Call for testers.
-* [ ] 2022 Feb 12 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
-* [ ] 2022 Feb 24 - `master` is locked, no PR's merged.
-* [ ] 2022 Feb 26 - Merge `develop` to `master`.
-* [ ] 2022 Feb 26 - `master` is unlocked. PR's can be merged again.
+* [x] 2022 Feb 26 - `develop` is tagged with a new release version. Each push to `master` is subsequently merged to `develop` by GitHub actions.
+* [ ] 2022 Apr 31 - `develop` closed to new PR's.
+* [ ] 2022 Apr 31 - Call for testers.
+* [ ] 2022 May 14 - Last day for merges -- after this point `develop` is locked for testing and accepts only bugfixes
+* [ ] 2022 May 26 - `master` is locked, no PR's merged.
+* [ ] 2022 May 28 - Merge `develop` to `master`.
+* [ ] 2022 May 28 - `master` is unlocked. PR's can be merged again.
 
 ## What changes will be included?
 
diff --git a/docs/breaking_changes_history.md b/docs/breaking_changes_history.md
index 6b1b71b1fd..c40989fb5e 100644
--- a/docs/breaking_changes_history.md
+++ b/docs/breaking_changes_history.md
@@ -2,6 +2,7 @@
 
 This page links to all previous changelogs from the QMK Breaking Changes process.
 
+* [2022 Feb 26](ChangeLog/20220226.md) - version 0.16.0
 * [2021 Nov 27](ChangeLog/20211127.md) - version 0.15.0
 * [2021 Aug 28](ChangeLog/20210828.md) - version 0.14.0
 * [2021 May 29](ChangeLog/20210529.md) - version 0.13.0
diff --git a/lib/python/qmk/cli/generate/develop_pr_list.py b/lib/python/qmk/cli/generate/develop_pr_list.py
index 09236a7c42..549db5b185 100755
--- a/lib/python/qmk/cli/generate/develop_pr_list.py
+++ b/lib/python/qmk/cli/generate/develop_pr_list.py
@@ -18,7 +18,8 @@ ignored_titles = ["Format code according to conventions"]
 def _is_ignored(title):
     for ignore in ignored_titles:
         if ignore in title:
-            return
+            return True
+    return False
 
 
 def _get_pr_info(cache, gh, pr_num):

From 83a32b257473c5dc9fbacd71a3c1470dde21ad84 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 26 Feb 2022 03:20:57 +0000
Subject: [PATCH 688/867] Remove 1k USB_POLLING_INTERVAL_MS config from
 keyboards and default-ish keymaps (#16448)

* Remove 1k USB_POLLING_INTERVAL_MS config from keyboard level

* Remove 1k USB_POLLING_INTERVAL_MS config from default|via keymaps
---
 keyboards/ai03/jp60/keymaps/default/config.h             | 3 +--
 keyboards/ai03/jp60/keymaps/via/config.h                 | 3 +--
 keyboards/bastardkb/skeletyl/config.h                    | 1 -
 keyboards/bastardkb/tbkmini/config.h                     | 1 -
 keyboards/durgod/dgk6x/config.h                          | 1 -
 keyboards/durgod/k3x0/config.h                           | 2 --
 keyboards/geekboards/macropad_v2/config.h                | 1 -
 keyboards/gmmk/pro/config.h                              | 3 ---
 keyboards/handwired/marauder/config.h                    | 1 -
 keyboards/handwired/xealousbrown/config.h                | 1 -
 keyboards/horrortroll/chinese_pcb/devil68_pro/config.h   | 3 +--
 keyboards/horrortroll/chinese_pcb/m63_rgb/config.h       | 3 +--
 keyboards/horrortroll/handwired_k552/config.h            | 3 +--
 keyboards/ianklug/grooveboard/config.h                   | 1 -
 keyboards/jadookb/jkb2/keymaps/via/config.h              | 1 -
 keyboards/jadookb/jkb65/keymaps/via/config.h             | 1 -
 keyboards/kinesis/kint2pp/config.h                       | 4 ----
 keyboards/kinesis/kint36/config.h                        | 4 ----
 keyboards/kinesis/kint41/config.h                        | 4 ----
 keyboards/kprepublic/bm60hsrgb/rev2/config.h             | 1 -
 keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h         | 1 -
 keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h       | 1 -
 keyboards/linworks/fave87/config.h                       | 3 +--
 keyboards/linworks/whale75/config.h                      | 3 +--
 keyboards/lz/erghost/config.h                            | 3 ---
 keyboards/mechlovin/infinity87/rev2/config.h             | 3 ---
 keyboards/mechlovin/serratus/config.h                    | 3 ---
 keyboards/ploopyco/mouse/config.h                        | 3 ---
 keyboards/ploopyco/trackball/config.h                    | 3 ---
 keyboards/ploopyco/trackball_mini/config.h               | 3 ---
 keyboards/ploopyco/trackball_nano/config.h               | 3 ---
 keyboards/rgbkb/mun/config.h                             | 2 --
 keyboards/rgbkb/sol3/config.h                            | 2 --
 keyboards/sanctified/dystopia/config.h                   | 1 -
 keyboards/splitkb/kyria/keymaps/via/config.h             | 2 --
 keyboards/xelus/dharma/keymaps/default/config.h          | 1 -
 keyboards/xelus/dharma/keymaps/via/config.h              | 1 -
 keyboards/xelus/kangaroo/keymaps/default/config.h        | 1 -
 keyboards/xelus/kangaroo/keymaps/via/config.h            | 1 -
 keyboards/xelus/la_plus/keymaps/default/config.h         | 2 --
 keyboards/xelus/la_plus/keymaps/via/config.h             | 2 --
 keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h | 1 -
 keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h     | 1 -
 keyboards/xelus/pachi/rev1/keymaps/default/config.h      | 1 -
 keyboards/xelus/pachi/rev1/keymaps/via/config.h          | 1 -
 keyboards/xelus/pachi/rgb/keymaps/default/config.h       | 1 -
 keyboards/xelus/pachi/rgb/keymaps/via/config.h           | 2 --
 keyboards/xelus/rs60/keymaps/default/config.h            | 1 -
 keyboards/xelus/rs60/keymaps/via/config.h                | 1 -
 keyboards/xelus/valor/rev2/keymaps/default/config.h      | 2 +-
 keyboards/xelus/valor/rev2/keymaps/via/config.h          | 2 +-
 keyboards/xelus/valor_frl_tkl/keymaps/default/config.h   | 1 -
 keyboards/xelus/valor_frl_tkl/keymaps/via/config.h       | 1 -
 keyboards/xelus/xs60/keymaps/default/config.h            | 1 -
 keyboards/xelus/xs60/keymaps/via/config.h                | 1 -
 55 files changed, 9 insertions(+), 94 deletions(-)

diff --git a/keyboards/ai03/jp60/keymaps/default/config.h b/keyboards/ai03/jp60/keymaps/default/config.h
index ee63d9feee..9e0623524a 100644
--- a/keyboards/ai03/jp60/keymaps/default/config.h
+++ b/keyboards/ai03/jp60/keymaps/default/config.h
@@ -16,6 +16,5 @@
 
 #pragma once
 
-/* Increase polling rates and scan quantity for improved performance */
-#define USB_POLLING_INTERVAL_MS 1
+/* Increase scan quantity for improved performance */
 #define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/ai03/jp60/keymaps/via/config.h b/keyboards/ai03/jp60/keymaps/via/config.h
index ee63d9feee..9e0623524a 100644
--- a/keyboards/ai03/jp60/keymaps/via/config.h
+++ b/keyboards/ai03/jp60/keymaps/via/config.h
@@ -16,6 +16,5 @@
 
 #pragma once
 
-/* Increase polling rates and scan quantity for improved performance */
-#define USB_POLLING_INTERVAL_MS 1
+/* Increase scan quantity for improved performance */
 #define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/bastardkb/skeletyl/config.h b/keyboards/bastardkb/skeletyl/config.h
index a7530a5e73..fae8e2ec03 100644
--- a/keyboards/bastardkb/skeletyl/config.h
+++ b/keyboards/bastardkb/skeletyl/config.h
@@ -40,7 +40,6 @@
 
 #define SOFT_SERIAL_PIN D0
 
-#define USB_POLLING_INTERVAL_MS 1
 #define MASTER_RIGHT
 
 // RGB matrix support
diff --git a/keyboards/bastardkb/tbkmini/config.h b/keyboards/bastardkb/tbkmini/config.h
index b2308bc8ed..094544de9a 100644
--- a/keyboards/bastardkb/tbkmini/config.h
+++ b/keyboards/bastardkb/tbkmini/config.h
@@ -43,7 +43,6 @@
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
 #define F_SCL 400000L
-#define USB_POLLING_INTERVAL_MS 1
 #define MASTER_RIGHT
 
 // RGB matrix support
diff --git a/keyboards/durgod/dgk6x/config.h b/keyboards/durgod/dgk6x/config.h
index a15ed86650..28a506cf8d 100644
--- a/keyboards/durgod/dgk6x/config.h
+++ b/keyboards/durgod/dgk6x/config.h
@@ -22,7 +22,6 @@
 #define VENDOR_ID       0xD60D
 #define MANUFACTURER    Hoksi Technology
 
-#define USB_POLLING_INTERVAL_MS 1
 #define WAIT_US_TIMER           GPTD3
 
 /* COL2ROW, ROW2COL*/
diff --git a/keyboards/durgod/k3x0/config.h b/keyboards/durgod/k3x0/config.h
index af543bb970..691076ecac 100644
--- a/keyboards/durgod/k3x0/config.h
+++ b/keyboards/durgod/k3x0/config.h
@@ -23,7 +23,6 @@
 #define VENDOR_ID       0xD60D
 #define MANUFACTURER    Hoksi Technology
 
-#define USB_POLLING_INTERVAL_MS 1
 #define WAIT_US_TIMER           GPTD3
 
 /* key matrix size (rows in specific keyboard variant) */
@@ -41,7 +40,6 @@
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-// #define USB_POLLING_INTERVAL_MS 1
 
 /* Bootmagic Lite key configuration */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/geekboards/macropad_v2/config.h b/keyboards/geekboards/macropad_v2/config.h
index cdb3a7dbe8..cb671bfab7 100644
--- a/keyboards/geekboards/macropad_v2/config.h
+++ b/keyboards/geekboards/macropad_v2/config.h
@@ -100,7 +100,6 @@
 
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 #define WAIT_FOR_USB
-#define USB_POLLING_INTERVAL_MS 1
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
index bb2cca1921..d83c965fc5 100644
--- a/keyboards/gmmk/pro/config.h
+++ b/keyboards/gmmk/pro/config.h
@@ -114,9 +114,6 @@
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 
-/* 1000Hz USB polling - it's the default on stock firmware */
-#define USB_POLLING_INTERVAL_MS 1
-
 /* Send up to 4 key press events per scan */
 #define QMK_KEYS_PER_SCAN 4
 
diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h
index df30a6c226..7c6a6d74d4 100644
--- a/keyboards/handwired/marauder/config.h
+++ b/keyboards/handwired/marauder/config.h
@@ -43,7 +43,6 @@
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, B0 }
 #define DIODE_DIRECTION COL2ROW
 #define LAYER_STATE_8BIT
-#define USB_POLLING_INTERVAL_MS 1 //1000Hz polling rate
 #define QMK_KEYS_PER_SCAN 12 // moar gaming code
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
diff --git a/keyboards/handwired/xealousbrown/config.h b/keyboards/handwired/xealousbrown/config.h
index 70775ffaeb..cb787ba0c2 100644
--- a/keyboards/handwired/xealousbrown/config.h
+++ b/keyboards/handwired/xealousbrown/config.h
@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 13
 #define DEBOUNCE 10
-#define USB_POLLING_INTERVAL_MS 1
 /* layer optimization */
 #define LAYER_STATE_8BIT
 #define MAX_LAYER 2
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
index 825b6d3e5b..af7affbb83 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/config.h
@@ -45,8 +45,7 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
-#define USB_POLLING_INTERVAL_MS 1
+/* Change larger keys per scan for elite gaming */
 #define QMK_KEYS_PER_SCAN 12
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h b/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h
index 2983971258..4c126bb3f3 100644
--- a/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h
+++ b/keyboards/horrortroll/chinese_pcb/m63_rgb/config.h
@@ -45,8 +45,7 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
-#define USB_POLLING_INTERVAL_MS 1
+/* Change larger keys per scan for elite gaming */
 #define QMK_KEYS_PER_SCAN 12
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/horrortroll/handwired_k552/config.h b/keyboards/horrortroll/handwired_k552/config.h
index 87908a1dcd..3caaee51e5 100644
--- a/keyboards/horrortroll/handwired_k552/config.h
+++ b/keyboards/horrortroll/handwired_k552/config.h
@@ -46,8 +46,7 @@
 /* Forcing to use NKRO instead 6KRO */
 #define FORCE_NKRO
 
-/* Change USB Polling Rate to 1000hz and a larger keys per scan for elite gaming */
-#define USB_POLLING_INTERVAL_MS 1
+/* Change larger keys per scan for elite gaming */
 #define QMK_KEYS_PER_SCAN 12
 
 /* EEPROM size */
diff --git a/keyboards/ianklug/grooveboard/config.h b/keyboards/ianklug/grooveboard/config.h
index e42c5f14e8..aac9be1022 100644
--- a/keyboards/ianklug/grooveboard/config.h
+++ b/keyboards/ianklug/grooveboard/config.h
@@ -154,5 +154,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/jadookb/jkb2/keymaps/via/config.h b/keyboards/jadookb/jkb2/keymaps/via/config.h
index ecd00aced4..31022ca535 100644
--- a/keyboards/jadookb/jkb2/keymaps/via/config.h
+++ b/keyboards/jadookb/jkb2/keymaps/via/config.h
@@ -16,5 +16,4 @@
   */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/jadookb/jkb65/keymaps/via/config.h b/keyboards/jadookb/jkb65/keymaps/via/config.h
index 31f7507464..9d4eaf74ee 100644
--- a/keyboards/jadookb/jkb65/keymaps/via/config.h
+++ b/keyboards/jadookb/jkb65/keymaps/via/config.h
@@ -16,5 +16,4 @@
 
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
index 4191446e68..54ba07d3d6 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/config.h
@@ -41,10 +41,6 @@
 
 #define IGNORE_MOD_TAP_INTERRUPT
 
-// Reduce input latency by lowering the USB polling interval
-// from its 10ms default to the 1ms minimum that USB 1.x (Full Speed) allows:
-#define USB_POLLING_INTERVAL_MS 1
-
 // The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as
 // per https://www.pjrc.com/teensy/low_power.html
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
index 3738629ea7..188c83345d 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/config.h
@@ -59,10 +59,6 @@
 
 #define IGNORE_MOD_TAP_INTERRUPT
 
-// Reduce input latency by lowering the USB polling interval
-// from its 10ms default to the 1ms minimum that USB 1.x (Full Speed) allows:
-#define USB_POLLING_INTERVAL_MS 1
-
 // The Teensy 3.6 consumes about 80 mA of current at its full speed of 180 MHz:
 // https://forum.pjrc.com/threads/47256-What-is-the-power-consumption-of-the-Teensy-3-6
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h
index 7d87b8dd76..3e13e84606 100644
--- a/keyboards/kinesis/kint41/config.h
+++ b/keyboards/kinesis/kint41/config.h
@@ -86,10 +86,6 @@
 
 #define IGNORE_MOD_TAP_INTERRUPT
 
-// Reduce input latency by lowering the USB polling interval
-// from its 10ms default to the 125μs minimum that USB 2.x (High Speed) allows:
-#define USB_POLLING_INTERVAL_MS 1
-
 // The Teensy 4.1 consumes about 100 mA of current at its full speed of 600 MHz
 // as per https://www.pjrc.com/store/teensy41.html
 #define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index e25f0ad489..b4aa1a549c 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -44,7 +44,6 @@
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define USB_POLLING_INTERVAL_MS 1
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index 8286b447a8..5e695aec57 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -46,7 +46,6 @@
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define USB_POLLING_INTERVAL_MS 1
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index b5efc1f596..27c3a6df55 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -44,7 +44,6 @@
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
-#define USB_POLLING_INTERVAL_MS 1
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/keyboards/linworks/fave87/config.h b/keyboards/linworks/fave87/config.h
index d6d5ab5cf4..ef934024f7 100644
--- a/keyboards/linworks/fave87/config.h
+++ b/keyboards/linworks/fave87/config.h
@@ -23,8 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MANUFACTURER    Lx3
 #define PRODUCT         FAVE-87
 
-/* Set 1 kHz polling rate and force USB NKRO */
-#define USB_POLLING_INTERVAL_MS 1
+/* Force USB NKRO */
 #define FORCE_NKRO
 
 /* key matrix size */
diff --git a/keyboards/linworks/whale75/config.h b/keyboards/linworks/whale75/config.h
index 5ba4494309..2e0b26b397 100644
--- a/keyboards/linworks/whale75/config.h
+++ b/keyboards/linworks/whale75/config.h
@@ -23,8 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MANUFACTURER    Lx3
 #define PRODUCT         Whale-75
 
-/* Set 1 kHz polling rate and force USB NKRO */
-#define USB_POLLING_INTERVAL_MS 1
+/* Force USB NKRO */
 #define FORCE_NKRO
 
 /* key matrix size */
diff --git a/keyboards/lz/erghost/config.h b/keyboards/lz/erghost/config.h
index 74867baf7f..0936f6c271 100644
--- a/keyboards/lz/erghost/config.h
+++ b/keyboards/lz/erghost/config.h
@@ -46,9 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-#define USB_POLLING_INTERVAL_MS 1
-
-
 #define LED_NUM_LOCK_PIN D7
 #define LED_CAPS_LOCK_PIN D6
 #define LED_SCROLL_LOCK_PIN B4
diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h
index ddf9df4593..575e826a9b 100644
--- a/keyboards/mechlovin/infinity87/rev2/config.h
+++ b/keyboards/mechlovin/infinity87/rev2/config.h
@@ -36,9 +36,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-#define USB_POLLING_INTERVAL_MS 1
-
-
 #define LED_NUM_LOCK_PIN D7
 #define LED_CAPS_LOCK_PIN D6
 #define LED_SCROLL_LOCK_PIN B4
diff --git a/keyboards/mechlovin/serratus/config.h b/keyboards/mechlovin/serratus/config.h
index 055557b3a4..0bb9ccbea9 100644
--- a/keyboards/mechlovin/serratus/config.h
+++ b/keyboards/mechlovin/serratus/config.h
@@ -45,9 +45,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
 
-#define USB_POLLING_INTERVAL_MS 1
-
-
 #define LED_NUM_LOCK_PIN D7
 #define LED_CAPS_LOCK_PIN D6
 #define LED_SCROLL_LOCK_PIN B4
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index 4f2103e31c..df1ea1297b 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -54,9 +54,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* Much more so than a keyboard, speed matters for a mouse. So we'll go for as high
-   a polling rate as possible. */
-#define USB_POLLING_INTERVAL_MS 1
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h
index 7b0f3faa04..4275e9d119 100644
--- a/keyboards/ploopyco/trackball/config.h
+++ b/keyboards/ploopyco/trackball/config.h
@@ -44,9 +44,6 @@
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-/* Much more so than a keyboard, speed matters for a mouse. So we'll go for as high
-   a polling rate as possible. */
-#define USB_POLLING_INTERVAL_MS 1
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* Bootmagic Lite key configuration */
diff --git a/keyboards/ploopyco/trackball_mini/config.h b/keyboards/ploopyco/trackball_mini/config.h
index af1e63eb71..731e6fbc97 100644
--- a/keyboards/ploopyco/trackball_mini/config.h
+++ b/keyboards/ploopyco/trackball_mini/config.h
@@ -45,9 +45,6 @@
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-/* Much more so than a keyboard, speed matters for a mouse. So we'll go for as high
-   a polling rate as possible. */
-#define USB_POLLING_INTERVAL_MS 1
 #define USB_MAX_POWER_CONSUMPTION 100
 
 /* Bootmagic Lite key configuration */
diff --git a/keyboards/ploopyco/trackball_nano/config.h b/keyboards/ploopyco/trackball_nano/config.h
index 4c0aab8c62..98a2c662fa 100644
--- a/keyboards/ploopyco/trackball_nano/config.h
+++ b/keyboards/ploopyco/trackball_nano/config.h
@@ -41,9 +41,6 @@
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
-/* Much more so than a keyboard, speed matters for a mouse. So we'll go for as high
-   a polling rate as possible. */
-#define USB_POLLING_INTERVAL_MS 1
 #define USB_MAX_POWER_CONSUMPTION 100
 
 #define ADNS5050_SCLK_PIN         B7
diff --git a/keyboards/rgbkb/mun/config.h b/keyboards/rgbkb/mun/config.h
index eec3009d8c..de658eb93c 100644
--- a/keyboards/rgbkb/mun/config.h
+++ b/keyboards/rgbkb/mun/config.h
@@ -17,8 +17,6 @@
 #define MANUFACTURER    RGBKB
 #define PRODUCT         Mün
 
-#define USB_POLLING_INTERVAL_MS 1
-
 /* Matrix Configuration - Rows are doubled up */
 #define MATRIX_ROWS 14
 // Last pins reserved for encoder / touch encoder support
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h
index 8d87e5b2fa..92db3def6b 100644
--- a/keyboards/rgbkb/sol3/config.h
+++ b/keyboards/rgbkb/sol3/config.h
@@ -17,8 +17,6 @@
 #define MANUFACTURER    RGBKB
 #define PRODUCT         Sol 3
 
-#define USB_POLLING_INTERVAL_MS 1
-
 /* Matrix Configuration - Rows are doubled up */
 #define MATRIX_ROWS 12
 // Last pins reserved for encoder / touch encoder support
diff --git a/keyboards/sanctified/dystopia/config.h b/keyboards/sanctified/dystopia/config.h
index dbed621724..3cb61cfde6 100644
--- a/keyboards/sanctified/dystopia/config.h
+++ b/keyboards/sanctified/dystopia/config.h
@@ -35,5 +35,4 @@
 
 #define DIODE_DIRECTION COL2ROW
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/splitkb/kyria/keymaps/via/config.h b/keyboards/splitkb/kyria/keymaps/via/config.h
index 3ca93f4fd3..f4449ac7a0 100644
--- a/keyboards/splitkb/kyria/keymaps/via/config.h
+++ b/keyboards/splitkb/kyria/keymaps/via/config.h
@@ -36,5 +36,3 @@
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 150
 #endif
-
-#define USB_POLLING_INTERVAL_MS 1
diff --git a/keyboards/xelus/dharma/keymaps/default/config.h b/keyboards/xelus/dharma/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/dharma/keymaps/default/config.h
+++ b/keyboards/xelus/dharma/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/dharma/keymaps/via/config.h b/keyboards/xelus/dharma/keymaps/via/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/dharma/keymaps/via/config.h
+++ b/keyboards/xelus/dharma/keymaps/via/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/kangaroo/keymaps/default/config.h b/keyboards/xelus/kangaroo/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/kangaroo/keymaps/default/config.h
+++ b/keyboards/xelus/kangaroo/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/kangaroo/keymaps/via/config.h b/keyboards/xelus/kangaroo/keymaps/via/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/kangaroo/keymaps/via/config.h
+++ b/keyboards/xelus/kangaroo/keymaps/via/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/la_plus/keymaps/default/config.h b/keyboards/xelus/la_plus/keymaps/default/config.h
index 393166c4f4..e559a15426 100644
--- a/keyboards/xelus/la_plus/keymaps/default/config.h
+++ b/keyboards/xelus/la_plus/keymaps/default/config.h
@@ -16,6 +16,4 @@
 
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
-
diff --git a/keyboards/xelus/la_plus/keymaps/via/config.h b/keyboards/xelus/la_plus/keymaps/via/config.h
index ef2ec42057..58c086282c 100644
--- a/keyboards/xelus/la_plus/keymaps/via/config.h
+++ b/keyboards/xelus/la_plus/keymaps/via/config.h
@@ -19,6 +19,4 @@
 // Enable RGB Matrix
 #define VIA_QMK_RGBLIGHT_ENABLE
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
-
diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h b/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h
+++ b/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h b/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h
index 0315ad280f..fc3a2bd0b2 100644
--- a/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h
+++ b/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h
@@ -19,5 +19,4 @@
 // 3 layers or else it will not fit in EEPROM
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/rev1/keymaps/default/config.h b/keyboards/xelus/pachi/rev1/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/pachi/rev1/keymaps/default/config.h
+++ b/keyboards/xelus/pachi/rev1/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/rev1/keymaps/via/config.h b/keyboards/xelus/pachi/rev1/keymaps/via/config.h
index 0315ad280f..fc3a2bd0b2 100644
--- a/keyboards/xelus/pachi/rev1/keymaps/via/config.h
+++ b/keyboards/xelus/pachi/rev1/keymaps/via/config.h
@@ -19,5 +19,4 @@
 // 3 layers or else it will not fit in EEPROM
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/rgb/keymaps/default/config.h b/keyboards/xelus/pachi/rgb/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/pachi/rgb/keymaps/default/config.h
+++ b/keyboards/xelus/pachi/rgb/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/pachi/rgb/keymaps/via/config.h b/keyboards/xelus/pachi/rgb/keymaps/via/config.h
index 76d009f29e..1213e7a8f2 100644
--- a/keyboards/xelus/pachi/rgb/keymaps/via/config.h
+++ b/keyboards/xelus/pachi/rgb/keymaps/via/config.h
@@ -22,6 +22,4 @@
 // Enable RGB Matrix
 #define VIA_QMK_RGBLIGHT_ENABLE
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
-
diff --git a/keyboards/xelus/rs60/keymaps/default/config.h b/keyboards/xelus/rs60/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/rs60/keymaps/default/config.h
+++ b/keyboards/xelus/rs60/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/rs60/keymaps/via/config.h b/keyboards/xelus/rs60/keymaps/via/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/rs60/keymaps/via/config.h
+++ b/keyboards/xelus/rs60/keymaps/via/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/valor/rev2/keymaps/default/config.h b/keyboards/xelus/valor/rev2/keymaps/default/config.h
index 824d4633cc..5d972dd48c 100644
--- a/keyboards/xelus/valor/rev2/keymaps/default/config.h
+++ b/keyboards/xelus/valor/rev2/keymaps/default/config.h
@@ -13,6 +13,6 @@
  * 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 USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/valor/rev2/keymaps/via/config.h b/keyboards/xelus/valor/rev2/keymaps/via/config.h
index 456369d884..490964f272 100644
--- a/keyboards/xelus/valor/rev2/keymaps/via/config.h
+++ b/keyboards/xelus/valor/rev2/keymaps/via/config.h
@@ -13,6 +13,7 @@
  * 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
 
 // RGB Matrix
 #define VIA_QMK_RGBLIGHT_ENABLE
@@ -20,5 +21,4 @@
 // More layers
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h b/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h
index 604c00df9f..7b8de5510e 100644
--- a/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h
+++ b/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h b/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h
index 604c00df9f..7b8de5510e 100644
--- a/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h
+++ b/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/xs60/keymaps/default/config.h b/keyboards/xelus/xs60/keymaps/default/config.h
index ea9bfa60eb..5d972dd48c 100644
--- a/keyboards/xelus/xs60/keymaps/default/config.h
+++ b/keyboards/xelus/xs60/keymaps/default/config.h
@@ -15,5 +15,4 @@
  */
 #pragma once
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/xelus/xs60/keymaps/via/config.h b/keyboards/xelus/xs60/keymaps/via/config.h
index 54aaf775da..b608adcfc4 100644
--- a/keyboards/xelus/xs60/keymaps/via/config.h
+++ b/keyboards/xelus/xs60/keymaps/via/config.h
@@ -18,5 +18,4 @@
 // More layers
 #define DYNAMIC_KEYMAP_LAYER_COUNT 8
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4

From 3057e5f8ca523427644ca1e8745bc0b5492a6d67 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Sun, 27 Feb 2022 09:06:48 +0800
Subject: [PATCH 689/867] [Keyboard] ada1800mini (#16386)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/ada/ada1800mini/ada1800mini.c       |  4 +
 keyboards/ada/ada1800mini/ada1800mini.h       | 38 +++++++++
 keyboards/ada/ada1800mini/config.h            | 70 ++++++++++++++++
 keyboards/ada/ada1800mini/info.json           | 82 +++++++++++++++++++
 .../ada/ada1800mini/keymaps/default/keymap.c  | 37 +++++++++
 .../ada/ada1800mini/keymaps/default/readme.md |  1 +
 keyboards/ada/ada1800mini/readme.md           | 27 ++++++
 keyboards/ada/ada1800mini/rules.mk            | 22 +++++
 8 files changed, 281 insertions(+)
 create mode 100644 keyboards/ada/ada1800mini/ada1800mini.c
 create mode 100644 keyboards/ada/ada1800mini/ada1800mini.h
 create mode 100644 keyboards/ada/ada1800mini/config.h
 create mode 100644 keyboards/ada/ada1800mini/info.json
 create mode 100644 keyboards/ada/ada1800mini/keymaps/default/keymap.c
 create mode 100644 keyboards/ada/ada1800mini/keymaps/default/readme.md
 create mode 100644 keyboards/ada/ada1800mini/readme.md
 create mode 100644 keyboards/ada/ada1800mini/rules.mk

diff --git a/keyboards/ada/ada1800mini/ada1800mini.c b/keyboards/ada/ada1800mini/ada1800mini.c
new file mode 100644
index 0000000000..a7d8ead5df
--- /dev/null
+++ b/keyboards/ada/ada1800mini/ada1800mini.c
@@ -0,0 +1,4 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "ada1800mini.h"
diff --git a/keyboards/ada/ada1800mini/ada1800mini.h b/keyboards/ada/ada1800mini/ada1800mini.h
new file mode 100644
index 0000000000..89ac0beba3
--- /dev/null
+++ b/keyboards/ada/ada1800mini/ada1800mini.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 peepeetee
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, K2D, K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3C, K3D, K3E, K3B, \
+    K40, K41, K42, K43, K46, K47, K48, K4D, K4E, K4A, K4B, K4C  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, K43, XXX, XXX, K46, K47, K48, XXX, K4A, K4B, K4C, K4D, K4E }, \
+}
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ada/ada1800mini/config.h b/keyboards/ada/ada1800mini/config.h
new file mode 100644
index 0000000000..38be5ad5c7
--- /dev/null
+++ b/keyboards/ada/ada1800mini/config.h
@@ -0,0 +1,70 @@
+/* Copyright 2022 peepeetee
+ *
+ * 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       0xADA0
+#define PRODUCT_ID      0x1800
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Ada
+#define PRODUCT         ada1800mini
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 { D0, D1, D2, D3, D5 }
+#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, B3, B2, B1 }
+
+#define DIODE_DIRECTION COL2ROW
+
+
+//TODO: implement RGB matrix when I get the hardware
+#define RGB_DI_PIN F0
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 100
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#endif
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json
new file mode 100644
index 0000000000..8e746467fc
--- /dev/null
+++ b/keyboards/ada/ada1800mini/info.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "ada1800mini",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "K00 (D0,F1)", "x": 0, "y": 0 },
+                { "label": "K01 (D0,F4)", "x": 1.25, "y": 0 },
+                { "label": "K02 (D0,F5)", "x": 2.25, "y": 0 },
+                { "label": "K03 (D0,F6)", "x": 3.25, "y": 0 },
+                { "label": "K04 (D0,F7)", "x": 4.5, "y": 0 },
+                { "label": "K05 (D0,C7)", "x": 5.5, "y": 0 },
+                { "label": "K06 (D0,C6)", "x": 6.5, "y": 0 },
+                { "label": "K07 (D0,B6)", "x": 7.5, "y": 0 },
+                { "label": "K08 (D0,B5)", "x": 8.75, "y": 0 },
+                { "label": "K09 (D0,B4)", "x": 9.75, "y": 0 },
+                { "label": "K0A (D0,D7)", "x": 10.75, "y": 0 },
+                { "label": "K0B (D0,D6)", "x": 12, "y": 0 },
+                { "label": "K0C (D0,B3)", "x": 13.5, "y": 0 },
+                { "label": "K0D (D0,B2)", "x": 14.5, "y": 0 },
+                { "label": "K0E (D0,B1)", "x": 15.5, "y": 0 },
+                { "label": "K10 (D1,F1)", "x": 0, "y": 1.25, "w": 1.5 },
+                { "label": "K11 (D1,F4)", "x": 1.5, "y": 1.25 },
+                { "label": "K12 (D1,F5)", "x": 2.5, "y": 1.25 },
+                { "label": "K13 (D1,F6)", "x": 3.5, "y": 1.25 },
+                { "label": "K14 (D1,F7)", "x": 4.5, "y": 1.25 },
+                { "label": "K15 (D1,C7)", "x": 5.5, "y": 1.25 },
+                { "label": "K16 (D1,C6)", "x": 6.5, "y": 1.25 },
+                { "label": "K17 (D1,B6)", "x": 7.5, "y": 1.25 },
+                { "label": "K18 (D1,B5)", "x": 8.5, "y": 1.25 },
+                { "label": "K19 (D1,B4)", "x": 9.5, "y": 1.25 },
+                { "label": "K1A (D1,D7)", "x": 10.5, "y": 1.25 },
+                { "label": "K1B (D1,D6)", "x": 11.5, "y": 1.25, "w": 1.5 },
+                { "label": "K1C (D1,B3)", "x": 13.5, "y": 1.25 },
+                { "label": "K1D (D1,B2)", "x": 14.5, "y": 1.25 },
+                { "label": "K1E (D1,B1)", "x": 15.5, "y": 1.25 },
+                { "label": "K20 (D2,F1)", "x": 0, "y": 2.25, "w": 1.75 },
+                { "label": "K21 (D2,F4)", "x": 1.75, "y": 2.25 },
+                { "label": "K22 (D2,F5)", "x": 2.75, "y": 2.25 },
+                { "label": "K23 (D2,F6)", "x": 3.75, "y": 2.25 },
+                { "label": "K24 (D2,F7)", "x": 4.75, "y": 2.25 },
+                { "label": "K25 (D2,C7)", "x": 5.75, "y": 2.25 },
+                { "label": "K26 (D2,C6)", "x": 6.75, "y": 2.25 },
+                { "label": "K27 (D2,B6)", "x": 7.75, "y": 2.25 },
+                { "label": "K28 (D2,B5)", "x": 8.75, "y": 2.25 },
+                { "label": "K29 (D2,B4)", "x": 9.75, "y": 2.25 },
+                { "label": "K2A (D2,D7)", "x": 10.75, "y": 2.25, "w": 2.25 },
+                { "label": "K2C (D2,B3)", "x": 13.5, "y": 2.25 },
+                { "label": "K2D (D2,B2)", "x": 14.5, "y": 2.25 },
+                { "label": "K2E (D2,B1)", "x": 15.5, "y": 2.25 },
+                { "label": "K30 (D3,F1)", "x": 0, "y": 3.25, "w": 2.25 },
+                { "label": "K31 (D3,F4)", "x": 2.25, "y": 3.25 },
+                { "label": "K32 (D3,F5)", "x": 3.25, "y": 3.25 },
+                { "label": "K33 (D3,F6)", "x": 4.25, "y": 3.25 },
+                { "label": "K34 (D3,F7)", "x": 5.25, "y": 3.25 },
+                { "label": "K35 (D3,C7)", "x": 6.25, "y": 3.25 },
+                { "label": "K36 (D3,C6)", "x": 7.25, "y": 3.25 },
+                { "label": "K37 (D3,B6)", "x": 8.25, "y": 3.25 },
+                { "label": "K38 (D3,B5)", "x": 9.25, "y": 3.25 },
+                { "label": "K39 (D3,B4)", "x": 10.25, "y": 3.25, "w": 1.75 },
+                { "label": "K3C (D3,B3)", "x": 13.5, "y": 3.25 },
+                { "label": "K3D (D3,B2)", "x": 14.5, "y": 3.25 },
+                { "label": "K3E (D3,B1)", "x": 15.5, "y": 3.25 },
+                { "label": "K3B (D3,D6)", "x": 12.25, "y": 3.5 },
+                { "label": "K40 (D5,F1)", "x": 0, "y": 4.25, "w": 1.25 },
+                { "label": "K41 (D5,F4)", "x": 1.25, "y": 4.25, "w": 1.25 },
+                { "label": "K42 (D5,F5)", "x": 2.5, "y": 4.25, "w": 1.25 },
+                { "label": "K43 (D5,F6)", "x": 3.75, "y": 4.25, "w": 2.75 },
+                { "label": "K46 (D5,C6)", "x": 6.5, "y": 4.25, "w": 2.25 },
+                { "label": "K47 (D5,B6)", "x": 8.75, "y": 4.25 },
+                { "label": "K48 (D5,B5)", "x": 9.75, "y": 4.25, "w": 1.25 },
+                { "label": "K4D (D5,B2)", "x": 14.5, "y": 4.25 },
+                { "label": "K4E (D5,B1)", "x": 15.5, "y": 4.25 },
+                { "label": "K4A (D5,D7)", "x": 11.25, "y": 4.5 },
+                { "label": "K4B (D5,D6)", "x": 12.25, "y": 4.5 },
+                { "label": "K4C (D5,B3)", "x": 13.25, "y": 4.5 }
+            ]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/ada/ada1800mini/keymaps/default/keymap.c b/keyboards/ada/ada1800mini/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6937871a01
--- /dev/null
+++ b/keyboards/ada/ada1800mini/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2022 peepeetee
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, KC_MINS, KC_EQL,  KC_NLCK,
+        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_P7,   KC_P8,   KC_P9,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,  KC_P4,   KC_P5,   KC_P6,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_LSFT, KC_P1,   KC_P2,   KC_P3,   KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(1),   KC_LALT, KC_LCTL, KC_P0,   KC_PDOT, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+        RESET,   _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_DEL,  _______, _______, _______,
+        _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_SCLN, KC_QUOT, _______, _______, _______, _______,
+        _______, RGB_TOG, RGB_MOD, _______, _______, _______, KC_COMM, KC_DOT,  KC_SLSH, _______, _______, _______, _______, KC_VOLU,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______
+    ),
+
+};
diff --git a/keyboards/ada/ada1800mini/keymaps/default/readme.md b/keyboards/ada/ada1800mini/keymaps/default/readme.md
new file mode 100644
index 0000000000..366b3134fd
--- /dev/null
+++ b/keyboards/ada/ada1800mini/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for ada1800mini
diff --git a/keyboards/ada/ada1800mini/readme.md b/keyboards/ada/ada1800mini/readme.md
new file mode 100644
index 0000000000..ad323114a6
--- /dev/null
+++ b/keyboards/ada/ada1800mini/readme.md
@@ -0,0 +1,27 @@
+# ada1800mini
+
+![ada1800mini](https://i.imgur.com/87Rn2MJh.jpeg)
+
+A per key RGB mini 1800 keyboard
+
+* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
+* Hardware Supported: ada1800mini
+* Hardware Availability: no longer avaliable - future groupbuy possible
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ada/ada1800mini:default
+
+Flashing example for this keyboard:
+
+    make ada/ada1800mini:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/ada/ada1800mini/rules.mk b/keyboards/ada/ada1800mini/rules.mk
new file mode 100644
index 0000000000..de0a7a0629
--- /dev/null
+++ b/keyboards/ada/ada1800mini/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+
+# generated by KBFirmware JSON to QMK Parser
+# https://noroadsleft.github.io/kbf_qmk_converter/

From d94b5d0b8219dfce42aad5798d3bb1d6cf7fec19 Mon Sep 17 00:00:00 2001
From: Dari <41168529+dari-studios@users.noreply.github.com>
Date: Sat, 26 Feb 2022 20:18:51 -0500
Subject: [PATCH 690/867] [Handwired] Support for Adafruit lemon keypad
 (#16395)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: zvecr <git@zvecr.com>
---
 keyboards/handwired/lemonpad/config.h         | 140 ++++++++++++++++++
 keyboards/handwired/lemonpad/info.json        |  18 +++
 .../lemonpad/keymaps/default/keymap.c         |  31 ++++
 .../lemonpad/keymaps/default/readme.md        |   1 +
 .../handwired/lemonpad/keymaps/via/config.h   |  19 +++
 .../handwired/lemonpad/keymaps/via/keymap.c   |  78 ++++++++++
 .../handwired/lemonpad/keymaps/via/readme.md  |   1 +
 .../handwired/lemonpad/keymaps/via/rules.mk   |   2 +
 keyboards/handwired/lemonpad/lemonpad.c       |  17 +++
 keyboards/handwired/lemonpad/lemonpad.h       |  38 +++++
 keyboards/handwired/lemonpad/readme.md        |  27 ++++
 keyboards/handwired/lemonpad/rules.mk         |  20 +++
 12 files changed, 392 insertions(+)
 create mode 100644 keyboards/handwired/lemonpad/config.h
 create mode 100644 keyboards/handwired/lemonpad/info.json
 create mode 100644 keyboards/handwired/lemonpad/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/lemonpad/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/lemonpad/keymaps/via/config.h
 create mode 100644 keyboards/handwired/lemonpad/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/lemonpad/keymaps/via/readme.md
 create mode 100644 keyboards/handwired/lemonpad/keymaps/via/rules.mk
 create mode 100644 keyboards/handwired/lemonpad/lemonpad.c
 create mode 100644 keyboards/handwired/lemonpad/lemonpad.h
 create mode 100644 keyboards/handwired/lemonpad/readme.md
 create mode 100644 keyboards/handwired/lemonpad/rules.mk

diff --git a/keyboards/handwired/lemonpad/config.h b/keyboards/handwired/lemonpad/config.h
new file mode 100644
index 0000000000..46369cb999
--- /dev/null
+++ b/keyboards/handwired/lemonpad/config.h
@@ -0,0 +1,140 @@
+/* Copyright 2022 dari-studios (@dari-studios)
+ *
+ * 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    0x6473
+#define PRODUCT_ID   0x4C50
+#define DEVICE_VER   0x0001
+#define MANUFACTURER dari-studios
+#define PRODUCT      lemonpad
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 3
+
+/*
+ * 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 DIRECT_PINS { 	\
+    { E6, D7, C6 }, 	\
+    { B4, B5, D4 }  	\
+}
+#define UNUSED_PINS
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/lemonpad/info.json b/keyboards/handwired/lemonpad/info.json
new file mode 100644
index 0000000000..e9d13d147f
--- /dev/null
+++ b/keyboards/handwired/lemonpad/info.json
@@ -0,0 +1,18 @@
+{
+    "keyboard_name": "lemonpad",
+    "url": "",
+    "maintainer": "dari-studios",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "k00", "x": 0, "y": 0},
+                {"label": "k01", "x": 1, "y": 0},
+                {"label": "k02", "x": 2, "y": 0},
+
+                {"label": "k10", "x": 0, "y": 1},
+                {"label": "k11", "x": 1, "y": 1},
+                {"label": "k12", "x": 2, "y": 1}
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/lemonpad/keymaps/default/keymap.c b/keyboards/handwired/lemonpad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..06ebf2083f
--- /dev/null
+++ b/keyboards/handwired/lemonpad/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2022 dari-studios (@dari-studios)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+/* Defines names for use in layer keycodes and the keymap*/
+
+enum layer_names {
+    	_BASE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    	[_BASE] = LAYOUT(
+        		KC_A,    KC_B,    KC_C,
+        		KC_D,    KC_E,    KC_F 
+    	),
+
+};
diff --git a/keyboards/handwired/lemonpad/keymaps/default/readme.md b/keyboards/handwired/lemonpad/keymaps/default/readme.md
new file mode 100644
index 0000000000..7d4196c9e3
--- /dev/null
+++ b/keyboards/handwired/lemonpad/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for lemonpad
diff --git a/keyboards/handwired/lemonpad/keymaps/via/config.h b/keyboards/handwired/lemonpad/keymaps/via/config.h
new file mode 100644
index 0000000000..0baa186e23
--- /dev/null
+++ b/keyboards/handwired/lemonpad/keymaps/via/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 dari-studios (@dari-studios)
+ *
+ * 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 DYNAMIC_KEYMAP_LAYER_COUNT 9
\ No newline at end of file
diff --git a/keyboards/handwired/lemonpad/keymaps/via/keymap.c b/keyboards/handwired/lemonpad/keymaps/via/keymap.c
new file mode 100644
index 0000000000..71b94011cb
--- /dev/null
+++ b/keyboards/handwired/lemonpad/keymaps/via/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2022 dari-studios (@dari-studios)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+/* Defines names for use in layer keycodes and the keymap */
+
+enum layer_names {
+        _BASE,
+        _EMPTY1,
+        _EMPTY2,
+        _EMPTY3,
+        _EMPTY4,
+        _EMPTY5,
+        _EMPTY6,
+        _EMPTY7,
+        _EMPTY8
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+        [_BASE] = LAYOUT(
+                KC_A,    KC_B,    KC_C,
+                KC_D,    KC_E,    KC_F 
+        ),
+
+        [_EMPTY1] = LAYOUT(
+                KC_TRNS,    KC_TRNS,    KC_TRNS,
+                KC_TRNS,    KC_TRNS,    KC_TRNS
+        ),
+
+        [_EMPTY2] = LAYOUT(
+                KC_TRNS,    KC_TRNS,    KC_TRNS,
+                KC_TRNS,    KC_TRNS,    KC_TRNS
+        ),
+
+        [_EMPTY3] = LAYOUT(
+                KC_TRNS,    KC_TRNS,    KC_TRNS,
+                KC_TRNS,    KC_TRNS,    KC_TRNS
+        ),
+
+        [_EMPTY4] = LAYOUT(
+                KC_TRNS,    KC_TRNS,    KC_TRNS,
+                KC_TRNS,    KC_TRNS,    KC_TRNS
+        ),
+
+        [_EMPTY5] = LAYOUT(
+                KC_TRNS,    KC_TRNS,    KC_TRNS,
+                KC_TRNS,    KC_TRNS,    KC_TRNS
+        ),
+
+        [_EMPTY6] = LAYOUT(
+                KC_TRNS,    KC_TRNS,    KC_TRNS,
+                KC_TRNS,    KC_TRNS,    KC_TRNS
+        ),
+
+        [_EMPTY7] = LAYOUT(
+                KC_TRNS,    KC_TRNS,    KC_TRNS,
+                KC_TRNS,    KC_TRNS,    KC_TRNS
+        ),
+
+        [_EMPTY8] = LAYOUT(
+                KC_TRNS,    KC_TRNS,    KC_TRNS,
+                KC_TRNS,    KC_TRNS,    KC_TRNS
+        )
+};
diff --git a/keyboards/handwired/lemonpad/keymaps/via/readme.md b/keyboards/handwired/lemonpad/keymaps/via/readme.md
new file mode 100644
index 0000000000..907b8f5add
--- /dev/null
+++ b/keyboards/handwired/lemonpad/keymaps/via/readme.md
@@ -0,0 +1 @@
+# Basic VIA config, 9 layers.
\ No newline at end of file
diff --git a/keyboards/handwired/lemonpad/keymaps/via/rules.mk b/keyboards/handwired/lemonpad/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/handwired/lemonpad/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/handwired/lemonpad/lemonpad.c b/keyboards/handwired/lemonpad/lemonpad.c
new file mode 100644
index 0000000000..cb5c1461a5
--- /dev/null
+++ b/keyboards/handwired/lemonpad/lemonpad.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 dari-studios (@dari-studios)
+ *
+ * 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 "lemonpad.h"
diff --git a/keyboards/handwired/lemonpad/lemonpad.h b/keyboards/handwired/lemonpad/lemonpad.h
new file mode 100644
index 0000000000..8f9b64c19a
--- /dev/null
+++ b/keyboards/handwired/lemonpad/lemonpad.h
@@ -0,0 +1,38 @@
+/* Copyright 2022 dari-studios (@dari-studios)
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+//Top 3 on the usb port side, bottom 3 on the opposite side
+ 
+#define LAYOUT(         \
+      k00, k01, k02,    \
+      k10, k11, k12    	\
+) {                     \
+    { k00, k01, k02 },  \
+    { k10, k11, k12 },  \
+}
diff --git a/keyboards/handwired/lemonpad/readme.md b/keyboards/handwired/lemonpad/readme.md
new file mode 100644
index 0000000000..4c1c2082e9
--- /dev/null
+++ b/keyboards/handwired/lemonpad/readme.md
@@ -0,0 +1,27 @@
+# lemonpad
+
+![lemonpad](https://i.imgur.com/hAp2Nich.jpeg)
+
+This is a QMK and VIA implementation for an atmega32u4 based adaptation of the Adafruit Lemon Keypad. By default it uses a Pro Micro, if you would like to use a different microcontroller please make sure you have the correct bootloader set. 
+
+* Keyboard Maintainer: [dari-studios](https://github.com/dari-studios)
+* Hardware Supported: atmega32u4 based boards with the Caterina bootloader
+* Hardware Availability: https://learn.adafruit.com/qtpy-lemon-mechanical-keypad-macropad
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/lemonpad:default
+
+Flashing example for this keyboard:
+
+    make handwired/lemonpad:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/handwired/lemonpad/rules.mk b/keyboards/handwired/lemonpad/rules.mk
new file mode 100644
index 0000000000..6174b9bd66
--- /dev/null
+++ b/keyboards/handwired/lemonpad/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes         # Console for debug
+COMMAND_ENABLE = yes         # Commands for debug and configuration
+NKRO_ENABLE = yes            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LTO_ENABLE = yes

From 97d0e7cb2d1b4e3db16aa68a3d87437ffd472ffe Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 27 Feb 2022 12:35:10 +1100
Subject: [PATCH 691/867] [Docs] Add commands to flashing docs (#16456)

---
 docs/flashing.md | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/docs/flashing.md b/docs/flashing.md
index f6b5ff78b2..83f4bf82ae 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -25,6 +25,11 @@ Compatible flashers:
 
 * [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI)
 * [dfu-programmer](https://github.com/dfu-programmer/dfu-programmer) / `:dfu` target in QMK (recommended command line)
+  ```
+  dfu-programmer <mcu> erase --force
+  dfu-programmer <mcu> flash --force <filename>
+  dfu-programmer <mcu> reset
+  ```
 
 Flashing sequence:
 
@@ -73,8 +78,11 @@ BOOTLOADER = caterina
 Compatible flashers:
 
 * [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI)
-* [avrdude](https://www.nongnu.org/avrdude/) with the `avr109` programmer / `:avrdude` target in QMK (recommended command line)
 * [AVRDUDESS](https://github.com/zkemble/AVRDUDESS)
+* [avrdude](https://www.nongnu.org/avrdude/) with the `avr109` programmer / `:avrdude` target in QMK (recommended command line)
+  ```
+  avrdude -p <mcu> -c avr109 -P <serialport> -U flash:w:<filename>:i
+  ```
 
 Flashing sequence:
 
@@ -106,8 +114,11 @@ BOOTLOADER = halfkay
 Compatible flashers:
 
 * [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI)
-* [Teensy Loader Command Line](https://www.pjrc.com/teensy/loader_cli.html) / `:teensy` target in QMK (recommended command line)
 * [Teensy Loader](https://www.pjrc.com/teensy/loader.html)
+* [Teensy Loader Command Line](https://www.pjrc.com/teensy/loader_cli.html) / `:teensy` target in QMK (recommended command line)
+  ```
+  teensy_loader_cli -v -mmcu=<mcu> <filename>
+  ```
 
 Flashing sequence:
 
@@ -133,8 +144,11 @@ BOOTLOADER = usbasploader
 Compatible flashers:
 
 * [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI)
-* [avrdude](https://www.nongnu.org/avrdude/) with the `usbasp` programmer / `:usbasp` target in QMK (recommended command line)
 * [AVRDUDESS](https://github.com/zkemble/AVRDUDESS)
+* [avrdude](https://www.nongnu.org/avrdude/) with the `usbasp` programmer / `:usbasp` target in QMK (recommended command line)
+  ```
+  avrdude -p <mcu> -c usbasp -U flash:w:<filename>:i
+  ```
 
 Flashing sequence:
 
@@ -159,8 +173,11 @@ BOOTLOADER = bootloadhid
 Compatible flashers:
 
 * [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI)
-* [bootloadHID CLI](https://www.obdev.at/products/vusb/bootloadhid.html) / `:bootloadhid` target in QMK (recommended command line)
 * [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash)
+* [bootloadHID CLI](https://www.obdev.at/products/vusb/bootloadhid.html) / `:bootloadhid` target in QMK (recommended command line)
+  ```
+  bootloadHID -r <filename>
+  ```
 
 Flashing sequence:
 
@@ -232,6 +249,9 @@ Compatible flashers:
 
 * [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI)
 * [dfu-util](https://dfu-util.sourceforge.net/) / `:dfu-util` target in QMK (recommended command line)
+  ```
+  dfu-util -a 0 -d 0483:DF11 -s 0x8000000:leave -D <filename>
+  ```
 
 Flashing sequence:
 
@@ -265,6 +285,9 @@ Compatible flashers:
 
 * [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI)
 * [dfu-util](https://dfu-util.sourceforge.net/) / `:dfu-util` target in QMK (recommended command line)
+  ```
+  dfu-util -a 2 -d 1EAF:0003 -D <filename>
+  ```
 
 Flashing sequence:
 
@@ -286,6 +309,9 @@ Compatible flashers:
 
 * [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) (recommended GUI)
 * [dfu-util](https://dfu-util.sourceforge.net/) / `:dfu-util` target in QMK (recommended command line)
+  ```
+  dfu-util -a 0 -d 1C11:B007 -D <filename>
+  ```
 
 Flashing sequence:
 

From c1e008b0520a983226622af21e82d7ebe24b83f3 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sat, 26 Feb 2022 17:36:30 -0800
Subject: [PATCH 692/867] [Keyboard] add YMDK YMD21 v2 (#16442)

* [Keyboard] add YMDK YMD21 v2

* remove trailing whitespace from default keymap
---
 keyboards/ymdk/ymd21/v2/config.h              | 71 +++++++++++++++++++
 keyboards/ymdk/ymd21/v2/info.json             | 40 +++++++++++
 .../ymdk/ymd21/v2/keymaps/default/keymap.c    | 39 ++++++++++
 keyboards/ymdk/ymd21/v2/readme.md             | 27 +++++++
 keyboards/ymdk/ymd21/v2/rules.mk              | 20 ++++++
 keyboards/ymdk/ymd21/v2/v2.c                  | 17 +++++
 keyboards/ymdk/ymd21/v2/v2.h                  | 58 +++++++++++++++
 7 files changed, 272 insertions(+)
 create mode 100644 keyboards/ymdk/ymd21/v2/config.h
 create mode 100644 keyboards/ymdk/ymd21/v2/info.json
 create mode 100644 keyboards/ymdk/ymd21/v2/keymaps/default/keymap.c
 create mode 100644 keyboards/ymdk/ymd21/v2/readme.md
 create mode 100644 keyboards/ymdk/ymd21/v2/rules.mk
 create mode 100644 keyboards/ymdk/ymd21/v2/v2.c
 create mode 100644 keyboards/ymdk/ymd21/v2/v2.h

diff --git a/keyboards/ymdk/ymd21/v2/config.h b/keyboards/ymdk/ymd21/v2/config.h
new file mode 100644
index 0000000000..81af6cab24
--- /dev/null
+++ b/keyboards/ymdk/ymd21/v2/config.h
@@ -0,0 +1,71 @@
+/* Copyright 2022 QMK / James Young (@noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x45D4
+#define PRODUCT_ID      0x0110
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    YMDK
+#define PRODUCT         YMD21 v2
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 4
+
+/*
+ * 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 { B3, B6, B2, B1, D7, B4 }
+#define MATRIX_COL_PINS { F5, F4, D3, D2 }
+
+#define DIODE_DIRECTION ROW2COL
+
+#define BACKLIGHT_PIN B7
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
+
+#define RGB_DI_PIN E2
+#if defined(RGBLIGHT_ENABLE)
+    #define RGBLED_NUM 8
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+    #define RGBLIGHT_ANIMATIONS
+// /*== or choose 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
diff --git a/keyboards/ymdk/ymd21/v2/info.json b/keyboards/ymdk/ymd21/v2/info.json
new file mode 100644
index 0000000000..c28c2c3634
--- /dev/null
+++ b/keyboards/ymdk/ymd21/v2/info.json
@@ -0,0 +1,40 @@
+{
+    "keyboard_name": "YMD21 v2",
+    "url": "",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_ortho_6x4": {
+            "layout": [
+                {"label":"F1", "x":0, "y":0},
+                {"label":"F2", "x":1, "y":0},
+                {"label":"F3", "x":2, "y":0},
+                {"label":"F4", "x":3, "y":0},
+
+                {"label":"Num Lock", "x":0, "y":1.25},
+                {"label":"/", "x":1, "y":1.25},
+                {"label":"*", "x":2, "y":1.25},
+                {"label":"-", "x":3, "y":1.25},
+
+                {"label":"7", "x":0, "y":2.25},
+                {"label":"8", "x":1, "y":2.25},
+                {"label":"9", "x":2, "y":2.25},
+                {"label":"=", "x":3, "y":2.25},
+
+                {"label":"4", "x":0, "y":3.25},
+                {"label":"5", "x":1, "y":3.25},
+                {"label":"6", "x":2, "y":3.25},
+                {"label":"+", "x":3, "y":3.25},
+
+                {"label":"1", "x":0, "y":4.25},
+                {"label":"2", "x":1, "y":4.25},
+                {"label":"3", "x":2, "y":4.25},
+                {"label":"Space", "x":3, "y":4.25},
+
+                {"label":"Fn", "x":0, "y":5.25},
+                {"label":"0", "x":1, "y":5.25},
+                {"label":".", "x":2, "y":5.25},
+                {"label":"Enter", "x":3, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ymdk/ymd21/v2/keymaps/default/keymap.c b/keyboards/ymdk/ymd21/v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d19d342f14
--- /dev/null
+++ b/keyboards/ymdk/ymd21/v2/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2022 QMK / James Young (@noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_ortho_6x4(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,
+        KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,   KC_P2,   KC_P3,   KC_SPC,
+        MO(1),   KC_P0,   KC_PDOT, KC_PENT
+    ),
+
+    [1] = LAYOUT_ortho_6x4(
+        RGB_MOD, BL_STEP, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______,
+        _______, _______, _______, _______
+    ),
+
+};
diff --git a/keyboards/ymdk/ymd21/v2/readme.md b/keyboards/ymdk/ymd21/v2/readme.md
new file mode 100644
index 0000000000..8a7968e346
--- /dev/null
+++ b/keyboards/ymdk/ymd21/v2/readme.md
@@ -0,0 +1,27 @@
+# YMDK YMD21 v2
+
+![YMDK YMD21 v2](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/ymdk/ymd21/v2/New-YMD21-V2-QMK-VIA-21-23-24-Key-RGB-Programmable-Marco-Function-MX-Cherry-Gateron.jpg_Q90.jpg_1_640.jpg)
+
+A 21-to-24-key numpad with RGB Underglow, USB-C, and support for in-switch LEDs.
+
+* Keyboard Maintainer: [The QMK Community](https://github.com/qmk)
+* Hardware Supported: YMDK YMD21 v2 (ATmega32U4)
+* Hardware Availability: [YMDKey.com](https://ymdkey.com/collections/num-pad-diy/products/new-ymd21-v2-qmk-via-21-23-24-key-rgb-programmable-marco-function-mx-cherry-gateron-switches-numpad-for-lol-battlegrounds), [AliExpress](https://www.aliexpress.com/item/32916152785.html)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ymdk/ymd21/v2:default
+
+Flashing example for this keyboard:
+
+    make ymdk/ymd21/v2:default:flash
+
+## Bootloader
+
+Enter the bootloader using one of the following methods:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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).
diff --git a/keyboards/ymdk/ymd21/v2/rules.mk b/keyboards/ymdk/ymd21/v2/rules.mk
new file mode 100644
index 0000000000..06a82f1643
--- /dev/null
+++ b/keyboards/ymdk/ymd21/v2/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = ortho_6x4
diff --git a/keyboards/ymdk/ymd21/v2/v2.c b/keyboards/ymdk/ymd21/v2/v2.c
new file mode 100644
index 0000000000..7d498f738d
--- /dev/null
+++ b/keyboards/ymdk/ymd21/v2/v2.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 QMK / James Young (@noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "v2.h"
diff --git a/keyboards/ymdk/ymd21/v2/v2.h b/keyboards/ymdk/ymd21/v2/v2.h
new file mode 100644
index 0000000000..a234b60508
--- /dev/null
+++ b/keyboards/ymdk/ymd21/v2/v2.h
@@ -0,0 +1,58 @@
+/* Copyright 2022 QMK / James Young (@noroadsleft)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/*
+ * ┌───┬───┬───┬───┐
+ * │00 │01 │02 │03 │
+ * └───┴───┴───┴───┘
+ * ┌───┬───┬───┬───┐
+ * │10 │11 │12 │13 │
+ * ├───┼───┼───┼───┤   ┌───┐
+ * │20 │21 │22 │23 │   │   │
+ * ├───┼───┼───┼───┤   │?? │ 2u Plus
+ * │30 │31 │32 │33 │   │   │
+ * ├───┼───┼───┼───┤   ├───┤
+ * │40 │41 │42 │43 │   │   │
+ * ├───┼───┼───┼───┤   │?? │ 2u Enter
+ * │50 │51 │52 │53 │   │   │
+ * └───┴───┴───┴───┘   └───┘
+ * ┌───────┐
+ * │??     │ 2u 0
+ * └───────┘
+ */
+
+
+#define LAYOUT_ortho_6x4( \
+    K00, K01, K02, K03, \
+    K10, K11, K12, K13, \
+    K20, K21, K22, K23, \
+    K30, K31, K32, K33, \
+    K40, K41, K42, K43, \
+    K50, K51, K52, K53  \
+) { \
+    { K00, K01, K02, K03 }, \
+    { K10, K11, K12, K13 }, \
+    { K20, K21, K22, K23 }, \
+    { K30, K31, K32, K33 }, \
+    { K40, K41, K42, K43 }, \
+    { K50, K51, K52, K53 }, \
+}

From 259cf769664b075613399afd888e916a3b028897 Mon Sep 17 00:00:00 2001
From: Dasky <32983009+daskygit@users.noreply.github.com>
Date: Sun, 27 Feb 2022 01:50:44 +0000
Subject: [PATCH 693/867] Link WS2812 driver page from rgb feature docs
 (#16366)

---
 docs/feature_rgb_matrix.md | 2 ++
 docs/feature_rgblight.md   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index a021779d43..e2312f2766 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -361,6 +361,8 @@ Configure the hardware via your `config.h`:
 #define DRIVER_LED_TOTAL 70
 ```
 
+?> There are additional configuration options for ARM controllers that offer increased performance over the default bitbang driver. Please see [WS2812 Driver](ws2812_driver.md) for more information.
+
 ---
 
 ### APA102 :id=apa102
diff --git a/docs/feature_rgblight.md b/docs/feature_rgblight.md
index 194daee294..08e820c0a6 100644
--- a/docs/feature_rgblight.md
+++ b/docs/feature_rgblight.md
@@ -22,6 +22,8 @@ On keyboards with onboard RGB LEDs, it is usually enabled by default. If it is n
 RGBLIGHT_ENABLE = yes
 ```
 
+?> There are additional configuration options for ARM controllers that offer increased performance over the default WS2812 bitbang driver. Please see [WS2812 Driver](ws2812_driver.md) for more information.
+
 For APA102 LEDs, add the following to your `rules.mk`:
 
 ```make

From 1d30ee72ab0ed78fb4b4eda39cd8f2886d156a1c Mon Sep 17 00:00:00 2001
From: stanrc85 <47038504+stanrc85@users.noreply.github.com>
Date: Sat, 26 Feb 2022 21:29:59 -0500
Subject: [PATCH 694/867] [Keymap] stanrc85 userspace rules cleanup (#16447)

---
 users/stanrc85/rules.mk | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/users/stanrc85/rules.mk b/users/stanrc85/rules.mk
index d17f2df007..16cf1ace5d 100644
--- a/users/stanrc85/rules.mk
+++ b/users/stanrc85/rules.mk
@@ -28,22 +28,16 @@ ifeq ($(strip $(KEYBOARD)), tkc/osav2)
   VELOCIKEY_ENABLE=yes
   SRC += rgb_timeout.c
 endif
-ifeq ($(strip $(KEYBOARD)), boardsource/the_mark)
-  RGB_MATRIX_ENABLE = yes
-  RGBLIGHT_ENABLE = no
-endif
 ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65)
   BACKLIGHT_ENABLE = yes
   RGB_MATRIX_ENABLE = yes
   RGBLIGHT_ENABLE = no
   SRC += rgb_layers.c
 endif
-ifeq ($(strip $(KEYBOARD)), tkc/portico)
-  SRC += rgb_timeout.c
-endif
-ifeq ($(strip $(KEYBOARD)), kiwikey/wanderland)
-  SRC += rgb_timeout.c
-endif
 ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/rgb_led/rev2)
   SRC += rgb_layers.c
 endif
+ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/standard_led/arm/rev4/stm32f303)
+  SRC += rgb_timeout.c
+  SRC += layer_rgb.c
+endif

From 29ab430f1f302bc64ad1549147f24235ba230a9c Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Sun, 27 Feb 2022 10:38:46 +0800
Subject: [PATCH 695/867] [Docs] Anchor link correction in rgb matrix docs
 (#16460)

---
 docs/feature_rgb_matrix.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index e2312f2766..87dbc5f780 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -528,7 +528,7 @@ All RGB keycodes are currently shared with the RGBLIGHT system:
 
 `RGB_MODE_PLAIN`, `RGB_MODE_BREATHE`, `RGB_MODE_RAINBOW`, and `RGB_MODE_SWIRL` are the only ones that are mapped properly. The rest don't have a direct equivalent, and are not mapped.
 
-?> `RGB_*` keycodes cannot be used with functions like `tap_code16(RGB_HUD)` as they're not USB HID keycodes. If you wish to replicate similar behaviour in custom code within your firmware (e.g. inside `encoder_update_user()` or `process_record_user()`), the equivalent [RGB functions](#functions-idfunctions) should be used instead.
+?> `RGB_*` keycodes cannot be used with functions like `tap_code16(RGB_HUD)` as they're not USB HID keycodes. If you wish to replicate similar behaviour in custom code within your firmware (e.g. inside `encoder_update_user()` or `process_record_user()`), the equivalent [RGB functions](#functions) should be used instead.
 
 
 !> By default, if you have both the [RGB Light](feature_rgblight.md) and the RGB Matrix feature enabled, these keycodes will work for both features, at the same time. You can disable the keycode functionality by defining the `*_DISABLE_KEYCODES` option for the specific feature.

From 57601d3cfe7db69e245b9bc45d16317ba05ab366 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 27 Feb 2022 00:38:51 -0800
Subject: [PATCH 696/867] Wren: fix QMK Configurator key sequence (#16462)

* Wren: fix QMK Configurator key sequence

* info.json: update maintainer field
---
 keyboards/wren/info.json | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/keyboards/wren/info.json b/keyboards/wren/info.json
index ef11ffea27..8aaddc65b3 100644
--- a/keyboards/wren/info.json
+++ b/keyboards/wren/info.json
@@ -1,6 +1,6 @@
 {
     "keyboard_name": "wren",
-    "maintainer": "vinorodrigues",
+    "maintainer": "walterhanley",
     "layouts": {
         "LAYOUT": {
             "layout": [
@@ -35,17 +35,17 @@
                 {"label":"L17","x":7.5, "y":1},
                 {"label":"L18","x":8.5, "y":1.25},
                 {"label":"L19","x":9.5, "y":1.5},
-                {"label":"R10","x":16, "y":1},
+                {"label":"R10","x":14, "y":1.5},
                 {"label":"R11","x":15, "y":1.25},
-                {"label":"R12","x":17, "y":1.25},
-                {"label":"R13","x":14, "y":1.5},
+                {"label":"R12","x":16, "y":1},
+                {"label":"R13","x":17, "y":1.25},
                 {"label":"R14","x":18, "y":1.5},
                 {"label":"R15","x":19, "y":1.5},
                 {"label":"R16","x":20.5, "y":1.5},
                 {"label":"R17","x":21.5, "y":1.5},
                 {"label":"R18","x":22.5, "y":1.5},
                 {"label":"R19","x":23.5, "y":1.5},
-                
+
                 {"label":"L20","x":0, "y":2.5},
                 {"label":"L21","x":1, "y":2.5},
                 {"label":"L22","x":2, "y":2.5},
@@ -88,7 +88,6 @@
                 {"label":"R38","x":22.5, "y":3.5},
                 {"label":"R39","x":23.5, "y":3.5},
 
-
                 {"label":"LT0","x":6, "y":4.5},
                 {"label":"LT1","x":7, "y":4.5},
                 {"label":"LT2","x":8, "y":4.5},
@@ -102,4 +101,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}

From a7a3f722353d5fafa7d1f89c4d0f969ff2c75b87 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Sun, 27 Feb 2022 02:08:10 -0800
Subject: [PATCH 697/867] Wolf Sabre: fix Configurator layout data (#16465)

* apply friendly formatting to info.json

* rebuild Configurator layout data

KLE Rotation leads to incorrect layout data when converted to `info.json` format.

* add matrix diagram to sabre.h
---
 keyboards/wolf/sabre/info.json | 99 +++++++++++++++++++++++++++++++++-
 keyboards/wolf/sabre/sabre.h   | 23 ++++++++
 2 files changed, 120 insertions(+), 2 deletions(-)

diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json
index 3fb912fdb4..2e1197de8c 100644
--- a/keyboards/wolf/sabre/info.json
+++ b/keyboards/wolf/sabre/info.json
@@ -4,7 +4,102 @@
     "maintainer": "ToastyStoemp", 
     "layouts": {
         "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":8.25, "y":0}, {"label":"PrtSc", "x":17.25, "y":0}, {"label":"Scroll Lock", "x":18.25, "y":0}, {"label":"Pause", "x":19.25, "y":0}, {"label":"\u00ac", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"\"", "x":2, "y":1.25}, {"label":"\u00a3", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"Insert", "x":17.25, "y":1.25}, {"label":"Home", "x":18.25, "y":1.25}, {"label":"PgUp", "x":19.25, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Delete", "x":17.25, "y":2.25}, {"label":"End", "x":18.25, "y":2.25}, {"label":"PgDn", "x":19.25, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"\u2191", "x":18.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, {"label":"Win", "x":2.5, "y":5.25, "w":1.5}, {"label":"Alt", "x":4, "y":5.25}, {"x":5, "y":5.25, "w":2.25}, {"label":"\u2190", "x":17.25, "y":5.25}, {"label":"\u2193", "x":18.25, "y":5.25}, {"label":"\u2192", "x":19.25, "y":5.25}, {"label":"F6", "x":-7.75, "y":6.25}, {"label":"F7", "x":-6.75, "y":6.25}, {"label":"F8", "x":-5.75, "y":6.25}, {"label":"F9", "x":-4.5, "y":6.25}, {"label":"F10", "x":-3.5, "y":6.25}, {"label":"F11", "x":-2.5, "y":6.25}, {"label":"F12", "x":-1.5, "y":6.25}, {"label":"&", "x":-8.5, "y":7.5}, {"label":"*", "x":-7.5, "y":7.5}, {"label":"(", "x":-6.5, "y":7.5}, {"label":")", "x":-5.5, "y":7.5}, {"label":"_", "x":-4.5, "y":7.5}, {"label":"+", "x":-3.5, "y":7.5}, {"label":"BackSpace", "x":-2.5, "y":7.5, "w":2}, {"label":"Y", "x":-9.0, "y":8.5}, {"label":"U", "x":-8, "y":8.5}, {"label":"I", "x":-7.0, "y":8.5}, {"label":"O", "x":-6, "y":8.5}, {"label":"P", "x":-5.0, "y":8.5}, {"label":"{", "x":-4, "y":8.5}, {"label":"}", "x":-3.0, "y":8.5}, {"label":"|", "x":-2, "y":8.5, "w":1.5}, {"label":"H", "x":-8.75, "y":9.5}, {"label":"J", "x":-7.75, "y":9.5}, {"label":"K", "x":-6.75, "y":9.5}, {"label":"L", "x":-5.75, "y":9.5}, {"label":":", "x":-4.75, "y":9.5}, {"label":"@", "x":-3.75, "y":9.5}, {"label":"Enter", "x":-2.75, "y":9.5, "w":2.25}, {"label":"B", "x":-9.25, "y":10.5}, {"label":"N", "x":-8.25, "y":10.5}, {"label":"M", "x":-7.25, "y":10.5}, {"label":"<", "x":-6.25, "y":10.5}, {"label":">", "x":-5.25, "y":10.5}, {"label":"?", "x":-4.25, "y":10.5}, {"label":"Shift", "x":-3.25, "y":10.5, "w":1.75}, {"x":-1.5, "y":10.5}, {"x":-9.25, "y":11.5, "w":2.75}, {"label":"<", "x":-6.5, "y":11.5}, {"label":"Alt", "x":-5.5, "y":11.5, "w":1.5}, {"label":"Ctrl", "x":-3.0, "y":11.5, "w":1.5}]
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":8.75, "y":0},
+                {"label":"F6", "x":9.75, "y":0},
+                {"label":"F7", "x":10.75, "y":0},
+                {"label":"F8", "x":11.75, "y":0},
+                {"label":"F9", "x":13, "y":0},
+                {"label":"F10", "x":14, "y":0},
+                {"label":"F11", "x":15, "y":0},
+                {"label":"F12", "x":16, "y":0},
+                {"label":"Print Screen", "x":17.25, "y":0},
+                {"label":"Scroll Lock", "x":18.25, "y":0},
+                {"label":"Pause", "x":19.25, "y":0},
+
+                {"label":"`\u00ac", "x":0, "y":1.25},
+                {"label":"1!", "x":1, "y":1.25},
+                {"label":"2\"", "x":2, "y":1.25},
+                {"label":"3\u00a3", "x":3, "y":1.25},
+                {"label":"4$", "x":4, "y":1.25},
+                {"label":"5%", "x":5, "y":1.25},
+                {"label":"6^", "x":6, "y":1.25},
+                {"label":"7&", "x":9, "y":1.25},
+                {"label":"8*", "x":10, "y":1.25},
+                {"label":"9(", "x":11, "y":1.25},
+                {"label":"0)", "x":12, "y":1.25},
+                {"label":"-_", "x":13, "y":1.25},
+                {"label":"=+", "x":14, "y":1.25},
+                {"label":"BackSpace", "x":15, "y":1.25, "w":2},
+                {"label":"Insert", "x":17.25, "y":1.25},
+                {"label":"Home", "x":18.25, "y":1.25},
+                {"label":"Page Up", "x":19.25, "y":1.25},
+
+                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.25},
+                {"label":"W", "x":2.5, "y":2.25},
+                {"label":"E", "x":3.5, "y":2.25},
+                {"label":"R", "x":4.5, "y":2.25},
+                {"label":"T", "x":5.5, "y":2.25},
+                {"label":"Y", "x":8.5, "y":2.25},
+                {"label":"U", "x":9.5, "y":2.25},
+                {"label":"I", "x":10.5, "y":2.25},
+                {"label":"O", "x":11.5, "y":2.25},
+                {"label":"P", "x":12.5, "y":2.25},
+                {"label":"[{", "x":13.5, "y":2.25},
+                {"label":"]}", "x":14.5, "y":2.25},
+                {"label":"\\|", "x":15.5, "y":2.25, "w":1.5},
+                {"label":"Delete", "x":17.25, "y":2.25},
+                {"label":"End", "x":18.25, "y":2.25},
+                {"label":"Page Down", "x":19.25, "y":2.25},
+
+                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.25},
+                {"label":"S", "x":2.75, "y":3.25},
+                {"label":"D", "x":3.75, "y":3.25},
+                {"label":"F", "x":4.75, "y":3.25},
+                {"label":"G", "x":5.75, "y":3.25},
+                {"label":"H", "x":8.75, "y":3.25},
+                {"label":"J", "x":9.75, "y":3.25},
+                {"label":"K", "x":10.75, "y":3.25},
+                {"label":"L", "x":11.75, "y":3.25},
+                {"label":";:", "x":12.75, "y":3.25},
+                {"label":"'@", "x":13.75, "y":3.25},
+                {"label":"Enter", "x":14.75, "y":3.25, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.25},
+                {"label":"X", "x":3.25, "y":4.25},
+                {"label":"C", "x":4.25, "y":4.25},
+                {"label":"V", "x":5.25, "y":4.25},
+                {"label":"B", "x":6.25, "y":4.25},
+                {"label":"B", "x":8.25, "y":4.25},
+                {"label":"N", "x":9.25, "y":4.25},
+                {"label":"M", "x":10.25, "y":4.25},
+                {"label":",<", "x":11.25, "y":4.25},
+                {"label":".>", "x":12.25, "y":4.25},
+                {"label":"/?", "x":13.25, "y":4.25},
+                {"label":"Shift", "x":14.25, "y":4.25, "w":1.75},
+                {"label":"Fn", "x":16, "y":4.25},
+                {"label":"\u2191", "x":18.25, "y":4.25},
+
+                {"label":"Ctrl", "x":0, "y":5.25, "w":1.5},
+                {"label":"GUI", "x":2.5, "y":5.25, "w":1.5},
+                {"label":"Alt", "x":4, "y":5.25},
+                {"label":"Space", "x":5, "y":5.25, "w":2.25},
+                {"label":"Space", "x":8.25, "y":5.25, "w":2.75},
+                {"label":"Alt", "x":11, "y":5.25},
+                {"label":"GUI", "x":12, "y":5.25, "w":1.5},
+                {"label":"Ctrl", "x":14.5, "y":5.25, "w":1.5},
+                {"label":"\u2190", "x":17.25, "y":5.25},
+                {"label":"\u2193", "x":18.25, "y":5.25},
+                {"label":"\u2192", "x":19.25, "y":5.25}
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/wolf/sabre/sabre.h b/keyboards/wolf/sabre/sabre.h
index 4580f46e93..adc9872cc3 100644
--- a/keyboards/wolf/sabre/sabre.h
+++ b/keyboards/wolf/sabre/sabre.h
@@ -16,6 +16,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
+/*
+ * ┌───┐   ┌───┬───┬───┬───┐         ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+ * │00 │   │01 │11 │02 │12 │         │13 │04 │14 │05 │ │15 │06 │16 │07 │ │17 │08 │18 │
+ * └───┘   └───┴───┴───┴───┘         └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┐       ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+ * │20 │30 │21 │31 │22 │32 │23 │       │33 │24 │34 │25 │35 │26 │36     │ │37 │28 │38 │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+ * │40   │50 │41 │51 │42 │52 │       │43 │53 │44 │54 │45 │55 │46 │56   │ │57 │48 │58 │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐      └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+ * │60    │70 │61 │71 │62 │72 │       │63 │73 │64 │74 │65 │75 │76      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐   ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤     ┌───┐       ┌──────────┐
+ * │80      │90 │81 │91 │82 │92 │   │83 │93 │84 │94 │85 │95 │86    │96 │     │88 │       │86        │ 2.75u RShift
+ * ├─────┬──┴┬──┴──┬┴──┬┴───┴───┤   ├───┴───┴──┬┴──┬┴───┴┬──┴┬────┬┴───┘ ┌───┼───┼───┐   └──────────┘
+ * │A0   │   │B0   │A1 │A2      │   │B3        │B4 │A5   │   │A6  │      │B7 │A8 │B8 │
+ * └─────┘   └─────┴───┴────────┘   └──────────┴───┴─────┘   └────┘      └───┴───┴───┘
+ *           ┌───┬─────┐                       ┌─────┬───┐
+ *           │B0 │A1   │                       │B4   │A5 │
+ *           └───┴─────┘                       └─────┴───┘
+ *           ┌────┬────┐                       ┌────┬────┐
+ *           │B0  │A1  │                       │B4  │A5  │
+ *           └────┴────┘                       └────┴────┘
+ */
+
 /* sabre Keymap Definitions */
 #define LAYOUT( \
     K00,      K01, K11, K02, K12,      K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \

From 77cdb20e1627950c6cff28f0f2f96ed22aa17f82 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 27 Feb 2022 10:34:26 +0000
Subject: [PATCH 698/867] Revert CLI default for manufacturer (#16467)

---
 lib/python/qmk/info.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 7e6f531f9c..905f10ecc2 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -49,7 +49,6 @@ def info_json(keyboard):
         'parse_errors': [],
         'parse_warnings': [],
         'maintainer': 'qmk',
-        'manufacturer': 'qmk',
     }
 
     # Populate the list of JSON keymaps

From e884414e1ef336361217f9e6a2dae9817bd19508 Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Sun, 27 Feb 2022 20:30:00 +0900
Subject: [PATCH 699/867] fix helix/rev2:edvorakjp build error (#16433)

'helix/rev2/keymaps/edvorakjp' was no longer buildable due to changes made by #14864.
The reason is that the prototype of `oled_task_user()` was changed in keymaps/edvorakjp/oled.c, but keymaps/edvorakjp/oled.h was not changed.
Therefore, I modified the prototype in keymaps/edvorakjp/oled.h.
---
 keyboards/helix/rev2/keymaps/edvorakjp/oled.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/oled.h b/keyboards/helix/rev2/keymaps/edvorakjp/oled.h
index 994dcb5f54..d0c5685283 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/oled.h
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/oled.h
@@ -9,4 +9,4 @@ void            render_layer_state(void);
 void            render_logo(void);
 void            render_mode_icon(bool is_windows);
 oled_rotation_t oled_init_user(oled_rotation_t rotation);
-void            oled_task_user(void);
+bool            oled_task_user(void);

From 779c7debcfff1a4a3ad578a0c12bdd50cba11039 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 27 Feb 2022 12:39:24 +0000
Subject: [PATCH 700/867] Fix issues with data driven split keyboards (#16457)

---
 lib/python/qmk/cli/generate/config_h.py | 36 ++++++++++++++-----------
 lib/python/qmk/cli/generate/layouts.py  | 16 +++++------
 lib/python/qmk/cli/generate/rules_mk.py |  2 +-
 lib/python/qmk/info.py                  |  5 ++++
 4 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index 6b1012fae7..24bbbdf517 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -21,18 +21,7 @@ def direct_pins(direct_pins, postfix):
         cols = ','.join(map(str, [col or 'NO_PIN' for col in row]))
         rows.append('{' + cols + '}')
 
-    col_count = len(direct_pins[0])
-    row_count = len(direct_pins)
-
     return f"""
-#ifndef MATRIX_COLS{postfix}
-#   define MATRIX_COLS{postfix} {col_count}
-#endif // MATRIX_COLS{postfix}
-
-#ifndef MATRIX_ROWS{postfix}
-#   define MATRIX_ROWS{postfix} {row_count}
-#endif // MATRIX_ROWS{postfix}
-
 #ifndef DIRECT_PINS{postfix}
 #   define DIRECT_PINS{postfix} {{ {", ".join(rows)} }}
 #endif // DIRECT_PINS{postfix}
@@ -42,14 +31,9 @@ def direct_pins(direct_pins, postfix):
 def pin_array(define, pins, postfix):
     """Return the config.h lines that set a pin array.
     """
-    pin_num = len(pins)
     pin_array = ', '.join(map(str, [pin or 'NO_PIN' for pin in pins]))
 
     return f"""
-#ifndef {define}S{postfix}
-#   define {define}S{postfix} {pin_num}
-#endif // {define}S{postfix}
-
 #ifndef {define}_PINS{postfix}
 #   define {define}_PINS{postfix} {{ {pin_array} }}
 #endif // {define}_PINS{postfix}
@@ -73,6 +57,24 @@ def matrix_pins(matrix_pins, postfix=''):
     return '\n'.join(pins)
 
 
+def generate_matrix_size(kb_info_json, config_h_lines):
+    """Add the matrix size to the config.h.
+    """
+    if 'matrix_pins' in kb_info_json:
+        col_count = kb_info_json['matrix_size']['cols']
+        row_count = kb_info_json['matrix_size']['rows']
+
+        config_h_lines.append(f"""
+#ifndef MATRIX_COLS
+#   define MATRIX_COLS {col_count}
+#endif // MATRIX_COLS
+
+#ifndef MATRIX_ROWS
+#   define MATRIX_ROWS {row_count}
+#endif // MATRIX_ROWS
+""")
+
+
 def generate_config_items(kb_info_json, config_h_lines):
     """Iterate through the info_config map to generate basic config values.
     """
@@ -183,6 +185,8 @@ def generate_config_h(cli):
 
     generate_config_items(kb_info_json, config_h_lines)
 
+    generate_matrix_size(kb_info_json, config_h_lines)
+
     if 'matrix_pins' in kb_info_json:
         config_h_lines.append(matrix_pins(kb_info_json['matrix_pins']))
 
diff --git a/lib/python/qmk/cli/generate/layouts.py b/lib/python/qmk/cli/generate/layouts.py
index e44266e1c8..a21311bd49 100755
--- a/lib/python/qmk/cli/generate/layouts.py
+++ b/lib/python/qmk/cli/generate/layouts.py
@@ -40,16 +40,12 @@ def generate_layouts(cli):
     # Build the layouts.h file.
     layouts_h_lines = ['/* This file was generated by `qmk generate-layouts`. Do not edit or copy.', ' */', '', '#pragma once']
 
-    if 'matrix_pins' in kb_info_json:
-        if 'direct' in kb_info_json['matrix_pins']:
-            col_num = len(kb_info_json['matrix_pins']['direct'][0])
-            row_num = len(kb_info_json['matrix_pins']['direct'])
-        elif 'cols' in kb_info_json['matrix_pins'] and 'rows' in kb_info_json['matrix_pins']:
-            col_num = len(kb_info_json['matrix_pins']['cols'])
-            row_num = len(kb_info_json['matrix_pins']['rows'])
-        else:
-            cli.log.error('%s: Invalid matrix config.', cli.config.generate_layouts.keyboard)
-            return False
+    if 'matrix_size' not in kb_info_json:
+        cli.log.error('%s: Invalid matrix config.', cli.config.generate_layouts.keyboard)
+        return False
+
+    col_num = kb_info_json['matrix_size']['cols']
+    row_num = kb_info_json['matrix_size']['rows']
 
     for layout_name in kb_info_json['layouts']:
         if kb_info_json['layouts'][layout_name]['c_macro']:
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
index 5d8d7cc8a7..ce824f6378 100755
--- a/lib/python/qmk/cli/generate/rules_mk.py
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -29,7 +29,7 @@ def process_mapping_rule(kb_info_json, rules_key, info_dict):
     if key_type in ['array', 'list']:
         return f'{rules_key} ?= {" ".join(rules_value)}'
     elif key_type == 'bool':
-        return f'{rules_key} ?= {"on" if rules_value else "off"}'
+        return f'{rules_key} ?= {"yes" if rules_value else "no"}'
     elif key_type == 'mapping':
         return '\n'.join([f'{key} ?= {value}' for key, value in rules_value.items()])
 
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 905f10ecc2..b86eaa059f 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -550,6 +550,11 @@ def _matrix_size(info_data):
             info_data['matrix_size']['cols'] = len(info_data['matrix_pins']['cols'])
             info_data['matrix_size']['rows'] = len(info_data['matrix_pins']['rows'])
 
+        # Assumption of split common
+        if 'split' in info_data:
+            if info_data['split'].get('enabled', False):
+                info_data['matrix_size']['rows'] *= 2
+
     return info_data
 
 

From fbfd5312b995a32af690c183cad0dc988f695e89 Mon Sep 17 00:00:00 2001
From: Erovia <Erovia@users.noreply.github.com>
Date: Mon, 28 Feb 2022 20:02:39 +0000
Subject: [PATCH 701/867] CLI: Validate JSON keymap input (#16261)

* Fix schema validator

It should use the passed schema.

* Add required attributes to keymap schema

* Rework subcommands to validate the JSON keymaps

The 'compile', 'flash' and 'json2c' subcommands were reworked to add
JSON keymap validation so error is reported for non-JSON and
non-compliant-JSON inputs.

* Fix required fields in keymap schema

* Add tests

* Fix compiling keymaps directly from keymap directory

* Schema should not require version for now.
---
 data/schemas/keymap.jsonschema            |  7 ++++++-
 lib/python/qmk/cli/json2c.py              | 13 +++----------
 lib/python/qmk/commands.py                | 19 +++++++++++++++----
 lib/python/qmk/json_schema.py             |  8 ++++++--
 lib/python/qmk/path.py                    |  6 +++++-
 lib/python/qmk/tests/test_cli_commands.py | 12 ++++++++++++
 6 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/data/schemas/keymap.jsonschema b/data/schemas/keymap.jsonschema
index faa250a942..3803301a66 100644
--- a/data/schemas/keymap.jsonschema
+++ b/data/schemas/keymap.jsonschema
@@ -53,5 +53,10 @@
             "type": "string",
             "description": "asdf"
         }
-    }
+    },
+    "required": [
+        "keyboard",
+        "layout",
+        "layers"
+    ]
 }
diff --git a/lib/python/qmk/cli/json2c.py b/lib/python/qmk/cli/json2c.py
index ae8248e6b7..2873a9bfd3 100755
--- a/lib/python/qmk/cli/json2c.py
+++ b/lib/python/qmk/cli/json2c.py
@@ -1,12 +1,11 @@
 """Generate a keymap.c from a configurator export.
 """
-import json
-
 from argcomplete.completers import FilesCompleter
 from milc import cli
 
 import qmk.keymap
 import qmk.path
+from qmk.commands import parse_configurator_json
 
 
 @cli.argument('-o', '--output', arg_only=True, type=qmk.path.normpath, help='File to write to')
@@ -19,14 +18,8 @@ def json2c(cli):
     This command uses the `qmk.keymap` module to generate a keymap.c from a configurator export. The generated keymap is written to stdout, or to a file if -o is provided.
     """
 
-    try:
-        # Parse the configurator from json file (or stdin)
-        user_keymap = json.load(cli.args.filename)
-
-    except json.decoder.JSONDecodeError as ex:
-        cli.log.error('The JSON input does not appear to be valid.')
-        cli.log.error(ex)
-        return False
+    # Parse the configurator from json file (or stdin)
+    user_keymap = parse_configurator_json(cli.args.filename)
 
     # Environment processing
     if cli.args.output and cli.args.output.name == '-':
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 275cd72e5c..e38f17156a 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -1,6 +1,5 @@
 """Helper functions for commands.
 """
-import json
 import os
 import sys
 import shutil
@@ -9,10 +8,11 @@ from subprocess import DEVNULL
 from time import strftime
 
 from milc import cli
+import jsonschema
 
 import qmk.keymap
 from qmk.constants import QMK_FIRMWARE, KEYBOARD_OUTPUT_PREFIX
-from qmk.json_schema import json_load
+from qmk.json_schema import json_load, validate
 
 time_fmt = '%Y-%m-%d-%H:%M:%S'
 
@@ -185,6 +185,10 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va
 
         A command to run to compile and flash the C file.
     """
+    # In case the user passes a keymap.json from a keymap directory directly to the CLI.
+    # e.g.: qmk compile - < keyboards/clueboard/california/keymaps/default/keymap.json
+    user_keymap["keymap"] = user_keymap.get("keymap", "default_json")
+
     # Write the keymap.c file
     keyboard_filesafe = user_keymap['keyboard'].replace('/', '_')
     target = f'{keyboard_filesafe}_{user_keymap["keymap"]}'
@@ -248,8 +252,15 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va
 def parse_configurator_json(configurator_file):
     """Open and parse a configurator json export
     """
-    # FIXME(skullydazed/anyone): Add validation here
-    user_keymap = json.load(configurator_file)
+    user_keymap = json_load(configurator_file)
+    # Validate against the jsonschema
+    try:
+        validate(user_keymap, 'qmk.keymap.v1')
+
+    except jsonschema.ValidationError as e:
+        cli.log.error(f'Invalid JSON keymap: {configurator_file} : {e.message}')
+        exit(1)
+
     orig_keyboard = user_keymap['keyboard']
     aliases = json_load(Path('data/mappings/keyboard_aliases.json'))
 
diff --git a/lib/python/qmk/json_schema.py b/lib/python/qmk/json_schema.py
index ffc7c6bcd1..2b48782fbb 100644
--- a/lib/python/qmk/json_schema.py
+++ b/lib/python/qmk/json_schema.py
@@ -16,7 +16,11 @@ def json_load(json_file):
     Note: file must be a Path object.
     """
     try:
-        return hjson.load(json_file.open(encoding='utf-8'))
+        # Get the IO Stream for Path objects
+        # Not necessary if the data is provided via stdin
+        if isinstance(json_file, Path):
+            json_file = json_file.open(encoding='utf-8')
+        return hjson.load(json_file)
 
     except (json.decoder.JSONDecodeError, hjson.HjsonDecodeError) as e:
         cli.log.error('Invalid JSON encountered attempting to load {fg_cyan}%s{fg_reset}:\n\t{fg_red}%s', json_file, e)
@@ -62,7 +66,7 @@ def create_validator(schema):
     """Creates a validator for the given schema id.
     """
     schema_store = compile_schema_store()
-    resolver = jsonschema.RefResolver.from_schema(schema_store['qmk.keyboard.v1'], store=schema_store)
+    resolver = jsonschema.RefResolver.from_schema(schema_store[schema], store=schema_store)
 
     return jsonschema.Draft7Validator(schema_store[schema], resolver=resolver).validate
 
diff --git a/lib/python/qmk/path.py b/lib/python/qmk/path.py
index dfb8371f84..9b94abbc12 100644
--- a/lib/python/qmk/path.py
+++ b/lib/python/qmk/path.py
@@ -70,9 +70,13 @@ def normpath(path):
 
 
 class FileType(argparse.FileType):
+    def __init__(self, encoding='UTF-8'):
+        # Use UTF8 by default for stdin
+        return super().__init__(encoding=encoding)
+
     def __call__(self, string):
         """normalize and check exists
             otherwise magic strings like '-' for stdin resolve to bad paths
         """
         norm = normpath(string)
-        return super().__call__(norm if norm.exists() else string)
+        return norm if norm.exists() else super().__call__(string)
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index 54b143c64f..55e69175e6 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -156,6 +156,18 @@ def test_json2c_stdin():
     assert result.stdout == '#include QMK_KEYBOARD_H\nconst uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {\t[0] = LAYOUT_ortho_1x1(KC_A)};\n\n'
 
 
+def test_json2c_wrong_json():
+    result = check_subcommand('json2c', 'keyboards/handwired/pytest/info.json')
+    check_returncode(result, [1])
+    assert 'Invalid JSON keymap' in result.stdout
+
+
+def test_json2c_no_json():
+    result = check_subcommand('json2c', 'keyboards/handwired/pytest/pytest.h')
+    check_returncode(result, [1])
+    assert 'Invalid JSON encountered' in result.stdout
+
+
 def test_info():
     result = check_subcommand('info', '-kb', 'handwired/pytest/basic')
     check_returncode(result)

From d1068b23ad4bc70d135e94d6e278733df93024d8 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 28 Feb 2022 15:32:33 -0800
Subject: [PATCH 702/867] snatchpad: update layout data (#16476)

Fixes key overlaps in QMK Configurator.
---
 keyboards/handwired/snatchpad/info.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/handwired/snatchpad/info.json b/keyboards/handwired/snatchpad/info.json
index c1d193cfe5..1306d72b06 100644
--- a/keyboards/handwired/snatchpad/info.json
+++ b/keyboards/handwired/snatchpad/info.json
@@ -5,16 +5,16 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
                 {"x": 1, "y": 0},
                 {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
 
-                {"x": 0, "y": 1},
                 {"x": 1, "y": 1},
                 {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
 
-                {"x": 0, "y": 1},
-                {"x": 2, "y": 1}
+                {"x": 0, "y": 2},
+                {"x": 4, "y": 2}
             ]
         }
     }

From 3ac769b6abe9b97a94033f376b28482d2d5f7b00 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 28 Feb 2022 15:33:21 -0800
Subject: [PATCH 703/867] handwired/3dortho14u: refactor layout data (#16475)

Remove nonextant matrix positions from the layout data.
---
 keyboards/handwired/3dortho14u/keymaps/default/keymap.c | 4 ++--
 keyboards/handwired/3dortho14u/keymaps/via/keymap.c     | 8 ++++----
 keyboards/handwired/3dortho14u/rev1/info.json           | 7 +------
 keyboards/handwired/3dortho14u/rev2/info.json           | 7 +------
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/keyboards/handwired/3dortho14u/keymaps/default/keymap.c b/keyboards/handwired/3dortho14u/keymaps/default/keymap.c
index e8d96d22ce..3c62719efa 100644
--- a/keyboards/handwired/3dortho14u/keymaps/default/keymap.c
+++ b/keyboards/handwired/3dortho14u/keymaps/default/keymap.c
@@ -15,13 +15,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
       KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NO  , 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_DEL ,
-      KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_NO  , KC_NO  , KC_SPC , KC_NO  , KC_NO  , KC_NO  , KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
+      KC_LCTL, KC_LGUI, KC_LALT, MO(_FN),                   KC_SPC ,                            KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FN] = LAYOUT(
       KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_DEL ,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS ,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END
+      _______, _______, _______, _______,                   _______,                            _______, KC_HOME, _______, KC_END
     )
 };
diff --git a/keyboards/handwired/3dortho14u/keymaps/via/keymap.c b/keyboards/handwired/3dortho14u/keymaps/via/keymap.c
index ba5a1cde3f..c961378fb5 100644
--- a/keyboards/handwired/3dortho14u/keymaps/via/keymap.c
+++ b/keyboards/handwired/3dortho14u/keymaps/via/keymap.c
@@ -9,27 +9,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
       KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NO  , 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_DEL ,
-      KC_LCTL, KC_LGUI, KC_LALT, MO(1)  , KC_NO  , KC_NO  , KC_SPC , KC_NO  , KC_NO  , KC_NO  , KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
+      KC_LCTL, KC_LGUI, KC_LALT, MO(1)  ,                   KC_SPC ,                            KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT(
       KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_DEL ,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS ,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END
+      _______, _______, _______, _______,                   _______,                            _______, KC_HOME, _______, KC_END
     ),
     [2] = LAYOUT(
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+      _______, _______, _______, _______,                   _______,                            _______, _______, _______, _______
     ),
     [3] = LAYOUT(
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+      _______, _______, _______, _______,                   _______,                            _______, _______, _______, _______
     )
 };
diff --git a/keyboards/handwired/3dortho14u/rev1/info.json b/keyboards/handwired/3dortho14u/rev1/info.json
index 72ed95e5f4..540a804a33 100644
--- a/keyboards/handwired/3dortho14u/rev1/info.json
+++ b/keyboards/handwired/3dortho14u/rev1/info.json
@@ -99,12 +99,7 @@
                 {"matrix": [4, 1], "x": 1, "y": 4},
                 {"matrix": [4, 2], "x": 2, "y": 4},
                 {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 6], "x": 6, "y": 4},
-                {"matrix": [4, 7], "x": 7, "y": 4},
-                {"matrix": [4, 8], "x": 8, "y": 4},
-                {"matrix": [4, 9], "x": 9, "y": 4},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 6},
                 {"matrix": [4, 10], "x": 10, "y": 4},
                 {"matrix": [4, 11], "x": 11, "y": 4},
                 {"matrix": [4, 12], "x": 12, "y": 4},
diff --git a/keyboards/handwired/3dortho14u/rev2/info.json b/keyboards/handwired/3dortho14u/rev2/info.json
index 705d6b5570..b296a42610 100644
--- a/keyboards/handwired/3dortho14u/rev2/info.json
+++ b/keyboards/handwired/3dortho14u/rev2/info.json
@@ -99,12 +99,7 @@
                 {"matrix": [4, 1], "x": 1, "y": 4},
                 {"matrix": [4, 2], "x": 2, "y": 4},
                 {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 4], "x": 4, "y": 4},
-                {"matrix": [4, 5], "x": 5, "y": 4},
-                {"matrix": [4, 6], "x": 6, "y": 4},
-                {"matrix": [9, 0], "x": 7, "y": 4},
-                {"matrix": [9, 1], "x": 8, "y": 4},
-                {"matrix": [9, 2], "x": 9, "y": 4},
+                {"matrix": [4, 6], "x": 4, "y": 4, "w": 6},
                 {"matrix": [9, 3], "x": 10, "y": 4},
                 {"matrix": [9, 4], "x": 11, "y": 4},
                 {"matrix": [9, 5], "x": 12, "y": 4},

From f293e6b4da5a3eca36e6a6da7c1bcbf3ecd536e8 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 28 Feb 2022 15:33:55 -0800
Subject: [PATCH 704/867] Glacier: Community Layout support (#16474)

* Glacier: Community Layout support

Enables the Glacier to use QMK's `tkl_f13_ansi_tsangan` community layout.

- rename `LAYOUT` to `LAYOUT_tkl_f13_ansi_tsangan`
- add `LAYOUTS` rule to `rules.mk`

* info.json: correct maintainer value

Use the maintainer's GitHub username.
---
 keyboards/creatkeebs/glacier/glacier.h                | 2 +-
 keyboards/creatkeebs/glacier/info.json                | 7 +++++--
 keyboards/creatkeebs/glacier/keymaps/default/keymap.c | 2 +-
 keyboards/creatkeebs/glacier/rules.mk                 | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/keyboards/creatkeebs/glacier/glacier.h b/keyboards/creatkeebs/glacier/glacier.h
index 3b7b1320f5..91400e8b13 100644
--- a/keyboards/creatkeebs/glacier/glacier.h
+++ b/keyboards/creatkeebs/glacier/glacier.h
@@ -18,7 +18,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
+#define LAYOUT_tkl_f13_ansi_tsangan( \
 	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016,       \
 	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116,       \
 	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216,       \
diff --git a/keyboards/creatkeebs/glacier/info.json b/keyboards/creatkeebs/glacier/info.json
index a22dabba0b..3bc2ee2018 100644
--- a/keyboards/creatkeebs/glacier/info.json
+++ b/keyboards/creatkeebs/glacier/info.json
@@ -1,9 +1,12 @@
 {
     "keyboard_name": "glacier",
     "url": "",
-    "maintainer": "Tim",
+    "maintainer": "Timliuzhaolu",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_tkl_f13_ansi_tsangan"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_tkl_f13_ansi_tsangan": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1.25, "y":0},
diff --git a/keyboards/creatkeebs/glacier/keymaps/default/keymap.c b/keyboards/creatkeebs/glacier/keymaps/default/keymap.c
index e58d790545..209b89d1c9 100644
--- a/keyboards/creatkeebs/glacier/keymaps/default/keymap.c
+++ b/keyboards/creatkeebs/glacier/keymaps/default/keymap.c
@@ -17,7 +17,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	[0] = LAYOUT(
+	[0] = LAYOUT_tkl_f13_ansi_tsangan(
 		KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,  KC_PSCR, KC_SLCK, KC_PAUS, 
 		KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
diff --git a/keyboards/creatkeebs/glacier/rules.mk b/keyboards/creatkeebs/glacier/rules.mk
index 7c9fb95020..95a02dff26 100644
--- a/keyboards/creatkeebs/glacier/rules.mk
+++ b/keyboards/creatkeebs/glacier/rules.mk
@@ -16,3 +16,5 @@ NKRO_ENABLE = no          # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no     # Enable keyboard backlight functionality
 AUDIO_ENABLE = no         # Enable keyboard RGB underglow
 RGBLIGHT_ENABLE = no      # Audio output
+
+LAYOUTS = tkl_f13_ansi_tsangan

From c9d9e70ac7ae6170728cbc8ac91c9c3269afe993 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 1 Mar 2022 01:52:01 +0000
Subject: [PATCH 705/867] Move projectcain encoder logic to keyboard level
 (#16479)

---
 keyboards/projectcain/vault35/config.h                 | 4 ++++
 keyboards/projectcain/vault35/keymaps/default/config.h | 3 ---
 keyboards/projectcain/vault35/keymaps/default/rules.mk | 1 -
 keyboards/projectcain/vault35/rules.mk                 | 1 +
 keyboards/projectcain/vault45/config.h                 | 4 ++++
 keyboards/projectcain/vault45/keymaps/default/config.h | 3 ---
 keyboards/projectcain/vault45/keymaps/default/rules.mk | 1 -
 keyboards/projectcain/vault45/rules.mk                 | 1 +
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/keyboards/projectcain/vault35/config.h b/keyboards/projectcain/vault35/config.h
index 5eccd57172..d88863e5b5 100644
--- a/keyboards/projectcain/vault35/config.h
+++ b/keyboards/projectcain/vault35/config.h
@@ -44,6 +44,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define ENCODERS_PAD_A { D6 }
+#define ENCODERS_PAD_B { D7 }
+#define ENCODER_RESOLUTION 2
+
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
diff --git a/keyboards/projectcain/vault35/keymaps/default/config.h b/keyboards/projectcain/vault35/keymaps/default/config.h
index 35f670c86b..3022aa84c4 100644
--- a/keyboards/projectcain/vault35/keymaps/default/config.h
+++ b/keyboards/projectcain/vault35/keymaps/default/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#define ENCODERS_PAD_A { D6 }
-#define ENCODERS_PAD_B { D7 }
-#define ENCODER_RESOLUTION 2
 #define COMBO_COUNT 2
 #define COMBO_TERM 50
 #define TAPPING_FORCE_HOLD
diff --git a/keyboards/projectcain/vault35/keymaps/default/rules.mk b/keyboards/projectcain/vault35/keymaps/default/rules.mk
index dca6713d4f..ff681299e4 100644
--- a/keyboards/projectcain/vault35/keymaps/default/rules.mk
+++ b/keyboards/projectcain/vault35/keymaps/default/rules.mk
@@ -1,2 +1 @@
-ENCODER_ENABLE = yes
 COMBO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/projectcain/vault35/rules.mk b/keyboards/projectcain/vault35/rules.mk
index 1275531ef6..77d9fdb410 100644
--- a/keyboards/projectcain/vault35/rules.mk
+++ b/keyboards/projectcain/vault35/rules.mk
@@ -16,3 +16,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
diff --git a/keyboards/projectcain/vault45/config.h b/keyboards/projectcain/vault45/config.h
index 2cbf55dd0f..6accb223a4 100644
--- a/keyboards/projectcain/vault45/config.h
+++ b/keyboards/projectcain/vault45/config.h
@@ -47,6 +47,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define ENCODERS_PAD_A { B3, D1 }
+#define ENCODERS_PAD_B { B2, D2 }
+#define ENCODER_RESOLUTION 2
+
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
diff --git a/keyboards/projectcain/vault45/keymaps/default/config.h b/keyboards/projectcain/vault45/keymaps/default/config.h
index 81321715af..2ca1e8f123 100644
--- a/keyboards/projectcain/vault45/keymaps/default/config.h
+++ b/keyboards/projectcain/vault45/keymaps/default/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#define ENCODERS_PAD_A { B3, D1 }
-#define ENCODERS_PAD_B { B2, D2 }
-#define ENCODER_RESOLUTION 2
 #define COMBO_COUNT 2
 #define COMBO_TERM 50
 #define TAPPING_FORCE_HOLD
diff --git a/keyboards/projectcain/vault45/keymaps/default/rules.mk b/keyboards/projectcain/vault45/keymaps/default/rules.mk
index dca6713d4f..ff681299e4 100644
--- a/keyboards/projectcain/vault45/keymaps/default/rules.mk
+++ b/keyboards/projectcain/vault45/keymaps/default/rules.mk
@@ -1,2 +1 @@
-ENCODER_ENABLE = yes
 COMBO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/projectcain/vault45/rules.mk b/keyboards/projectcain/vault45/rules.mk
index 1275531ef6..77d9fdb410 100644
--- a/keyboards/projectcain/vault45/rules.mk
+++ b/keyboards/projectcain/vault45/rules.mk
@@ -16,3 +16,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes

From 36635c2203fa022b87241ae2e31dc36c4612ab5b Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Mon, 28 Feb 2022 17:53:53 -0800
Subject: [PATCH 706/867] Ellora65: remove dead space from Configurator
 rendering (#16478)

---
 keyboards/kikoslab/ellora65/info.json | 84 ++++++++++++++++++++++++++-
 1 file changed, 82 insertions(+), 2 deletions(-)

diff --git a/keyboards/kikoslab/ellora65/info.json b/keyboards/kikoslab/ellora65/info.json
index 64c3f7eaa5..2d6b676098 100644
--- a/keyboards/kikoslab/ellora65/info.json
+++ b/keyboards/kikoslab/ellora65/info.json
@@ -4,7 +4,87 @@
     "maintainer": "swiftrax", 
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"0,0", "x":1.25, "y":0}, {"label":"1,0", "x":2.5, "y":0.25}, {"label":"0,1", "x":3.5, "y":0.25}, {"label":"1,1", "x":4.5, "y":0.25}, {"label":"0,2", "x":5.5, "y":0.25}, {"label":"1,2", "x":6.5, "y":0.25}, {"label":"0,3", "x":7.5, "y":0.25}, {"label":"1,3", "x":8.5, "y":0.25}, {"label":"0,4", "x":9.5, "y":0.25}, {"label":"1,4", "x":10.5, "y":0.25}, {"label":"0,5", "x":11.5, "y":0.25}, {"label":"1,5", "x":12.5, "y":0.25}, {"label":"0,6", "x":13.5, "y":0.25}, {"label":"1,6", "x":14.5, "y":0.25}, {"label":"0,7", "x":15.5, "y":0.25}, {"label":"1,7", "x":16.5, "y":0.25}, {"label":"2,0", "x":1.25, "y":1.25}, {"label":"3,0", "x":2.5, "y":1.25, "w":1.5}, {"label":"2,1", "x":4, "y":1.25}, {"label":"3,1", "x":5, "y":1.25}, {"label":"2,2", "x":6, "y":1.25}, {"label":"3,2", "x":7, "y":1.25}, {"label":"2,3", "x":8, "y":1.25}, {"label":"3,3", "x":9, "y":1.25}, {"label":"2,4", "x":10, "y":1.25}, {"label":"3,4", "x":11, "y":1.25}, {"label":"2,5", "x":12, "y":1.25}, {"label":"3,5", "x":13, "y":1.25}, {"label":"2,6", "x":14, "y":1.25}, {"label":"3,6", "x":15, "y":1.25}, {"label":"2,7", "x":16, "y":1.25, "w":1.5}, {"label":"4,0", "x":1.25, "y":2.25}, {"label":"5,0", "x":2.5, "y":2.25, "w":1.75}, {"label":"4,1", "x":4.25, "y":2.25}, {"label":"5,1", "x":5.25, "y":2.25}, {"label":"4,2", "x":6.25, "y":2.25}, {"label":"5,2", "x":7.25, "y":2.25}, {"label":"4,3", "x":8.25, "y":2.25}, {"label":"5,3", "x":9.25, "y":2.25}, {"label":"4,4", "x":10.25, "y":2.25}, {"label":"5,4", "x":11.25, "y":2.25}, {"label":"4,5", "x":12.25, "y":2.25}, {"label":"5,5", "x":13.25, "y":2.25}, {"label":"4,6", "x":14.25, "y":2.25}, {"label":"5,6", "x":15.25, "y":2.25}, {"label":"4,7", "x":16.25, "y":2.25, "w":1.25}, {"label":"5,7", "x":17.5, "y":2.25}, {"label":"6,0", "x":1.25, "y":3.25}, {"label":"7,0", "x":2.5, "y":3.25, "w":1.25}, {"label":"6,1", "x":3.75, "y":3.25}, {"label":"7,1", "x":4.75, "y":3.25}, {"label":"6,2", "x":5.75, "y":3.25}, {"label":"7,2", "x":6.75, "y":3.25}, {"label":"6,3", "x":7.75, "y":3.25}, {"label":"7,3", "x":8.75, "y":3.25}, {"label":"6,4", "x":9.75, "y":3.25}, {"label":"7,4", "x":10.75, "y":3.25}, {"label":"6,5", "x":11.75, "y":3.25}, {"label":"7,5", "x":12.75, "y":3.25}, {"label":"6,6", "x":13.75, "y":3.25}, {"label":"7,6", "x":14.75, "y":3.25, "w":1.75}, {"label":"6,7", "x":16.5, "y":3.25}, {"label":"7,7", "x":17.5, "y":3.25}, {"label":"8,0", "x":1.25, "y":4.25}, {"label":"9,0", "x":2.5, "y":4.25, "w":1.25}, {"label":"8,1", "x":3.75, "y":4.25, "w":1.25}, {"label":"9,1", "x":5, "y":4.25, "w":1.25}, {"label":"8,2", "x":6.25, "y":4.25, "w":2.75}, {"label":"8,3", "x":9, "y":4.25, "w":1.25}, {"label":"8,4", "x":10.25, "y":4.25, "w":2.25}, {"label":"9,5", "x":12.5, "y":4.25}, {"label":"8,6", "x":13.5, "y":4.25, "w":1.5}, {"label":"9,6", "x":15.5, "y":4.25}, {"label":"8,7", "x":16.5, "y":4.25}, {"label":"9,7", "x":17.5, "y":4.25}]
+            "layout": [
+                {"label":"Mute", "x":0, "y":0},
+                {"label":"Esc", "x":1.25, "y":0.25},
+                {"label":"1", "x":2.25, "y":0.25},
+                {"label":"2", "x":3.25, "y":0.25},
+                {"label":"3", "x":4.25, "y":0.25},
+                {"label":"4", "x":5.25, "y":0.25},
+                {"label":"5", "x":6.25, "y":0.25},
+                {"label":"6", "x":7.25, "y":0.25},
+                {"label":"7", "x":8.25, "y":0.25},
+                {"label":"8", "x":9.25, "y":0.25},
+                {"label":"9", "x":10.25, "y":0.25},
+                {"label":"0", "x":11.25, "y":0.25},
+                {"label":"-_", "x":12.25, "y":0.25},
+                {"label":"=+", "x":13.25, "y":0.25},
+                {"label":"Backspace", "x":14.25, "y":0.25},
+                {"label":"Backspace", "x":15.25, "y":0.25},
+
+                {"label":"F13", "x":0, "y":1.25},
+                {"label":"Tab", "x":1.25, "y":1.25, "w":1.5},
+                {"label":"Q", "x":2.75, "y":1.25},
+                {"label":"W", "x":3.75, "y":1.25},
+                {"label":"E", "x":4.75, "y":1.25},
+                {"label":"R", "x":5.75, "y":1.25},
+                {"label":"T", "x":6.75, "y":1.25},
+                {"label":"Y", "x":7.75, "y":1.25},
+                {"label":"U", "x":8.75, "y":1.25},
+                {"label":"I", "x":9.75, "y":1.25},
+                {"label":"O", "x":10.75, "y":1.25},
+                {"label":"P", "x":11.75, "y":1.25},
+                {"label":"[{", "x":12.75, "y":1.25},
+                {"label":"]}", "x":13.75, "y":1.25},
+                {"label":"\\|", "x":14.75, "y":1.25, "w":1.5},
+
+                {"label":"F14", "x":0, "y":2.25},
+                {"label":"Caps Lock", "x":1.25, "y":2.25, "w":1.75},
+                {"label":"A", "x":3, "y":2.25},
+                {"label":"S", "x":4, "y":2.25},
+                {"label":"D", "x":5, "y":2.25},
+                {"label":"F", "x":6, "y":2.25},
+                {"label":"G", "x":7, "y":2.25},
+                {"label":"H", "x":8, "y":2.25},
+                {"label":"J", "x":9, "y":2.25},
+                {"label":"K", "x":10, "y":2.25},
+                {"label":"L", "x":11, "y":2.25},
+                {"label":";:", "x":12, "y":2.25},
+                {"label":"'\"", "x":13, "y":2.25},
+                {"label":"Enter", "x":14, "y":2.25},
+                {"label":"Enter", "x":15, "y":2.25, "w":1.25},
+                {"label":"Insert", "x":16.25, "y":2.25},
+
+                {"label":"F15", "x":0, "y":3.25},
+                {"label":"Shift", "x":1.25, "y":3.25, "w":1.25},
+                {"label":"\\|", "x":2.5, "y":3.25},
+                {"label":"Z", "x":3.5, "y":3.25},
+                {"label":"X", "x":4.5, "y":3.25},
+                {"label":"C", "x":5.5, "y":3.25},
+                {"label":"V", "x":6.5, "y":3.25},
+                {"label":"B", "x":7.5, "y":3.25},
+                {"label":"N", "x":8.5, "y":3.25},
+                {"label":"M", "x":9.5, "y":3.25},
+                {"label":",<", "x":10.5, "y":3.25},
+                {"label":".>", "x":11.5, "y":3.25},
+                {"label":"/?", "x":12.5, "y":3.25},
+                {"label":"Shift", "x":13.5, "y":3.25, "w":1.75},
+                {"label":"\u2191", "x":15.25, "y":3.25},
+                {"label":"Delete", "x":16.25, "y":3.25},
+
+                {"label":"F16", "x":0, "y":4.25},
+                {"label":"Ctrl", "x":1.25, "y":4.25, "w":1.25},
+                {"label":"GUI", "x":2.5, "y":4.25, "w":1.25},
+                {"label":"Alt", "x":3.75, "y":4.25, "w":1.25},
+                {"label":"Fn", "x":5, "y":4.25, "w":2.75},
+                {"label":"Space", "x":7.75, "y":4.25, "w":1.25},
+                {"label":"Fn", "x":9, "y":4.25, "w":2.25},
+                {"label":"Fn", "x":11.25, "y":4.25},
+                {"label":"Fn", "x":12.25, "y":4.25, "w":1.5},
+                {"label":"\u2190", "x":14.25, "y":4.25},
+                {"label":"\u2193", "x":15.25, "y":4.25},
+                {"label":"\u2192", "x":16.25, "y":4.25}
+            ]
         }
     }
-}
\ No newline at end of file
+}

From 369575ad138656a47e2f94ce41e5a31e39a3dc84 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 1 Mar 2022 02:12:01 +0000
Subject: [PATCH 707/867] Remove invalid keyboard_folder from gk6 (#16480)

---
 keyboards/gizmo_engineering/gk6/info.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/gizmo_engineering/gk6/info.json b/keyboards/gizmo_engineering/gk6/info.json
index e38702d941..ffd59e41b1 100755
--- a/keyboards/gizmo_engineering/gk6/info.json
+++ b/keyboards/gizmo_engineering/gk6/info.json
@@ -1,6 +1,5 @@
 {
     "keyboard_name": "Gizmo Engineering GK6",
-    "keyboard_folder": "gk6",
     "url": "https://gizmo.engineering/",
     "maintainer": "federicoweber",
     "layouts": {

From 325c6341017381382f804efa214a83f3014f399f Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 1 Mar 2022 14:52:25 -0800
Subject: [PATCH 708/867] atlas_65 Layout Macro Refactor (#16483)

* atlas_65.h: add matrix diagram

* atlas_65.h: apply linting

- convert tabs to spaces
  - four-space indent
- align backslashes in layout macro

* atlas_65.h: adjust layout macro alignment

Visually separates each side. White-space-only change.

* physically arrange layout macro

Move the matrix position identifiers in the layout macro to resemble the assembled keyboard's layout.

- move `k46` (right side B) to the fourth (Shift) row
- move each of `k1E`, `k2E` and `k3E` (right side navigation keys) up one row
- update keymaps to match

* update maintainer data

Update the maintainer data in `info.json` and `readme.md`.
---
 keyboards/atlas_65/atlas_65.h               | 44 ++++++++++++---------
 keyboards/atlas_65/info.json                |  2 +-
 keyboards/atlas_65/keymaps/default/keymap.c | 40 +++++++++----------
 keyboards/atlas_65/keymaps/via/keymap.c     | 40 +++++++++----------
 keyboards/atlas_65/readme.md                |  4 +-
 5 files changed, 69 insertions(+), 61 deletions(-)

diff --git a/keyboards/atlas_65/atlas_65.h b/keyboards/atlas_65/atlas_65.h
index c54140fd7d..8f7e68ab29 100644
--- a/keyboards/atlas_65/atlas_65.h
+++ b/keyboards/atlas_65/atlas_65.h
@@ -17,26 +17,34 @@
 
 #include "quantum.h"
 
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
 #define XXX KC_NO
+
+/*                                                                        ┌───┐
+ *    ┌───┬───┬───┬───┬───┬───┬───┐      ┌───┬───┬───┬───┬───┬───┬───┬───┐│1E │     ┌───────┐
+ *    │00 │01 │02 │03 │04 │05 │06 │      │07 │08 │09 │0A │0B │0C │0D │0E │└┬──┴┐    │0D     │ 2u Backspace
+ *   ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘     ┌┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴───┴┐│2E │    └───────┘
+ *   │10   │11 │12 │13 │14 │15 │        │16 │17 │18 │19 │1A │1B │1C │1D   │└┬──┴┐
+ *  ┌┴─────┼───┼───┼───┼───┼───┤        └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─────┴┐│3E │
+ *  │20    │21 │22 │23 │24 │25 │          │26 │27 │28 │29 │2A │2B │2C      │└───┘
+ * ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘
+ * │30      │31 │32 │33 │34 │35 │       │46 │36 │37 │38 │39 │3A │3B    │┌───┐
+ * ├─────┬──┴───┼───┴─┬─┴───┴─┬─┴─┐   ┌─┴───┴───┴┬──┴──┬┴───┴───┴──────┘│3D │
+ * │40   │      │42   │44     │45 │   │47        │49   │            ┌───┼───┼───┐
+ * └─────┘      └─────┴───────┴───┘   └──────────┴─────┘            │4C │4D │4E │
+ *                                                                  └───┴───┴───┘
+ */
+
 #define LAYOUT( \
-	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,           \
-	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,      k1E, \
-	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,           k2E, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,      k3E,  \
-	k40,      k42,      k44, k45, k46, k47,      k49,           k4C, k4D, k4E       \
+    k00, k01, k02, k03, k04, k05, k06,             k07, k08, k09, k0A, k0B, k0C, k0D,   k1E, \
+    k10, k11, k12, k13, k14, k15,             k16, k17, k18, k19, k1A, k1B, k1C, k1D,   k2E, \
+    k20, k21, k22, k23, k24, k25,             k26, k27, k28, k29, k2A, k2B,      k2C,   k3E, \
+    k30, k31, k32, k33, k34, k35,        k46, k36, k37, k38, k39, k3A, k3B,        k3D,      \
+    k40,      k42,      k44, k45,        k47,      k49,                       k4C, k4D, k4E  \
 ) \
 { \
-	{ k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   XXX }, \
-	{ k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   k1E }, \
-	{ k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C,   XXX,   k2E }, \
-	{ k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   XXX,   k3D,   k3E }, \
-	{ k40,   XXX,   k42,   XXX,   k44,   k45,   k46,   k47,   XXX,   k49,   XXX,   XXX,   k4C,   k4D,   k4E } \
+    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k0A,   k0B,   k0C,   k0D,   XXX }, \
+    { k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19,   k1A,   k1B,   k1C,   k1D,   k1E }, \
+    { k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29,   k2A,   k2B,   k2C,   XXX,   k2E }, \
+    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k3A,   k3B,   XXX,   k3D,   k3E }, \
+    { k40,   XXX,   k42,   XXX,   k44,   k45,   k46,   k47,   XXX,   k49,   XXX,   XXX,   k4C,   k4D,   k4E }  \
 }
diff --git a/keyboards/atlas_65/info.json b/keyboards/atlas_65/info.json
index e95b25511c..d6c0eedb00 100644
--- a/keyboards/atlas_65/info.json
+++ b/keyboards/atlas_65/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "atlas-65",
     "url": "https://github.com/ryanstevensmith/atlas-65",
-    "maintainer": "Joshua Nguyen",
+    "maintainer": "ryanstevensmith, Joshua Nguyen",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/atlas_65/keymaps/default/keymap.c b/keyboards/atlas_65/keymaps/default/keymap.c
index 55406a165f..7883a921ac 100644
--- a/keyboards/atlas_65/keymaps/default/keymap.c
+++ b/keyboards/atlas_65/keymaps/default/keymap.c
@@ -17,33 +17,33 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-    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_PGDN,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_LNUM,
-    KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI, KC_B,    KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
+    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_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_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_LNUM,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
+    KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI,             KC_SPC,           KC_RALT,                                     KC_LEFT, KC_DOWN, KC_RGHT
   ) ,
 
   [1] = LAYOUT(
-    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,   KC_F11,  KC_F12,  _______,
-    _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,          _______,          _______, _______, _______, _______,          _______,                   _______, _______, _______
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,               KC_F7,   KC_F8,   KC_F9,  KC_F10,   KC_F11,  KC_F12,  _______,          _______,
+    _______, _______, _______, _______, RESET,   _______,             _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
+    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______,          _______,          _______,
+    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______,          _______,          _______, _______,             _______,          _______,                                     _______, _______, _______
   ) ,
 
   [2] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,          _______,          _______, _______, _______, _______,          _______,                   _______, _______, _______
+    _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______,          _______,          _______,
+    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______,          _______,          _______, _______,             _______,          _______,                                     _______, _______, _______
   ) ,
   [3] = LAYOUT(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,          _______,          _______, _______, _______, _______,          _______,                   _______, _______, _______
+    _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______,          _______,          _______,
+    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______,          _______,          _______, _______,             _______,          _______,                                     _______, _______, _______
   )
 } ;
diff --git a/keyboards/atlas_65/keymaps/via/keymap.c b/keyboards/atlas_65/keymaps/via/keymap.c
index d519682cc9..f8e9155362 100644
--- a/keyboards/atlas_65/keymaps/via/keymap.c
+++ b/keyboards/atlas_65/keymaps/via/keymap.c
@@ -17,33 +17,33 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT(
-    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_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-    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_PGDN,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_LNUM,
-    KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI, KC_B,    KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
+    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_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_PGDN,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_LNUM,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
+    KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI,             KC_SPC,           KC_RALT,                                     KC_LEFT, KC_DOWN, KC_RGHT
   ) ,
 
   [1] = LAYOUT(
-    KC_TRNS, 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_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,  KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,               KC_F7,   KC_F8,   KC_F9,  KC_F10,   KC_F11,  KC_F12,  KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,           KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,             KC_TRNS,          KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
   ) ,
 
   [2] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,             KC_TRNS,          KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
   ) ,
   [3] = LAYOUT(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
-    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,             KC_TRNS,          KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS
   )
 } ;
diff --git a/keyboards/atlas_65/readme.md b/keyboards/atlas_65/readme.md
index 3bc401db39..40eebba6f4 100644
--- a/keyboards/atlas_65/readme.md
+++ b/keyboards/atlas_65/readme.md
@@ -3,7 +3,7 @@
 
 A version of an Alice Keyboard with a full sized backspace and an extra B key. 
 
-* Keyboard Maintainer: Joshua Nguyen
+* Keyboard Maintainer: [Ryan Smith](https://github.com/ryanstevensmith), Joshua Nguyen
 * Hardware Supported: atlas-65 keyboards
 * Hardware Availability: Message Josh
 
@@ -23,4 +23,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
\ No newline at end of file
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available

From 09a43b12cbb914eb239ce447ad89004f0304be71 Mon Sep 17 00:00:00 2001
From: xiao <307671+xia0@users.noreply.github.com>
Date: Wed, 2 Mar 2022 10:18:38 +1030
Subject: [PATCH 709/867] Revert "handwired/3dortho14u: refactor layout data
 (#16475)" (#16485)

This reverts commit 3ac769b6abe9b97a94033f376b28482d2d5f7b00.
---
 keyboards/handwired/3dortho14u/keymaps/default/keymap.c | 4 ++--
 keyboards/handwired/3dortho14u/keymaps/via/keymap.c     | 8 ++++----
 keyboards/handwired/3dortho14u/rev1/info.json           | 7 ++++++-
 keyboards/handwired/3dortho14u/rev2/info.json           | 7 ++++++-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/keyboards/handwired/3dortho14u/keymaps/default/keymap.c b/keyboards/handwired/3dortho14u/keymaps/default/keymap.c
index 3c62719efa..e8d96d22ce 100644
--- a/keyboards/handwired/3dortho14u/keymaps/default/keymap.c
+++ b/keyboards/handwired/3dortho14u/keymaps/default/keymap.c
@@ -15,13 +15,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
       KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NO  , 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_DEL ,
-      KC_LCTL, KC_LGUI, KC_LALT, MO(_FN),                   KC_SPC ,                            KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
+      KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_NO  , KC_NO  , KC_SPC , KC_NO  , KC_NO  , KC_NO  , KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FN] = LAYOUT(
       KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_DEL ,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS ,
-      _______, _______, _______, _______,                   _______,                            _______, KC_HOME, _______, KC_END
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END
     )
 };
diff --git a/keyboards/handwired/3dortho14u/keymaps/via/keymap.c b/keyboards/handwired/3dortho14u/keymaps/via/keymap.c
index c961378fb5..ba5a1cde3f 100644
--- a/keyboards/handwired/3dortho14u/keymaps/via/keymap.c
+++ b/keyboards/handwired/3dortho14u/keymaps/via/keymap.c
@@ -9,27 +9,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSLS,
       KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_NO  , 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_DEL ,
-      KC_LCTL, KC_LGUI, KC_LALT, MO(1)  ,                   KC_SPC ,                            KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
+      KC_LCTL, KC_LGUI, KC_LALT, MO(1)  , KC_NO  , KC_NO  , KC_SPC , KC_NO  , KC_NO  , KC_NO  , KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT(
       KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_DEL ,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS ,
-      _______, _______, _______, _______,                   _______,                            _______, KC_HOME, _______, KC_END
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, KC_END
     ),
     [2] = LAYOUT(
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______,                   _______,                            _______, _______, _______, _______
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     ),
     [3] = LAYOUT(
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-      _______, _______, _______, _______,                   _______,                            _______, _______, _______, _______
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
     )
 };
diff --git a/keyboards/handwired/3dortho14u/rev1/info.json b/keyboards/handwired/3dortho14u/rev1/info.json
index 540a804a33..72ed95e5f4 100644
--- a/keyboards/handwired/3dortho14u/rev1/info.json
+++ b/keyboards/handwired/3dortho14u/rev1/info.json
@@ -99,7 +99,12 @@
                 {"matrix": [4, 1], "x": 1, "y": 4},
                 {"matrix": [4, 2], "x": 2, "y": 4},
                 {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 6},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [4, 7], "x": 7, "y": 4},
+                {"matrix": [4, 8], "x": 8, "y": 4},
+                {"matrix": [4, 9], "x": 9, "y": 4},
                 {"matrix": [4, 10], "x": 10, "y": 4},
                 {"matrix": [4, 11], "x": 11, "y": 4},
                 {"matrix": [4, 12], "x": 12, "y": 4},
diff --git a/keyboards/handwired/3dortho14u/rev2/info.json b/keyboards/handwired/3dortho14u/rev2/info.json
index b296a42610..705d6b5570 100644
--- a/keyboards/handwired/3dortho14u/rev2/info.json
+++ b/keyboards/handwired/3dortho14u/rev2/info.json
@@ -99,7 +99,12 @@
                 {"matrix": [4, 1], "x": 1, "y": 4},
                 {"matrix": [4, 2], "x": 2, "y": 4},
                 {"matrix": [4, 3], "x": 3, "y": 4},
-                {"matrix": [4, 6], "x": 4, "y": 4, "w": 6},
+                {"matrix": [4, 4], "x": 4, "y": 4},
+                {"matrix": [4, 5], "x": 5, "y": 4},
+                {"matrix": [4, 6], "x": 6, "y": 4},
+                {"matrix": [9, 0], "x": 7, "y": 4},
+                {"matrix": [9, 1], "x": 8, "y": 4},
+                {"matrix": [9, 2], "x": 9, "y": 4},
                 {"matrix": [9, 3], "x": 10, "y": 4},
                 {"matrix": [9, 4], "x": 11, "y": 4},
                 {"matrix": [9, 5], "x": 12, "y": 4},

From e73f8e942c8f0aa4b471669436d16ad785b63a38 Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Wed, 2 Mar 2022 20:15:10 +0900
Subject: [PATCH 710/867] Change 'helix/rev2:default' setting to use
 split_common (#16432)

* add licenses message to helix/rev2 files

* Minimize the processing of helix/rev2/local_features.mk

* Changed helix/rev2 default setting to use split_common

* fix helix/rev2:edvorakjp build error

* Remove unnecessary '#include' from keymap.c

* helix keymaps Workaround for build errors. five_rows_jis, fraanrosi, froggy, froggy_106, yshrsmz

* Revert "fix helix/rev2:edvorakjp build error"

This reverts commit 731dbbe15155b3efe2ff9f5ad61c7d0cf529e837.
Separated into a single PR #16433.

* Revert "Changed helix/rev2 default setting to use split_common"

This reverts commit e76dbd7762e06e0781ee004213878b1a5029fa98.

* add 'SPLIT_*_STATE_ENABLE' into helix/rev2/config.h

* Revert "helix keymaps Workaround for build errors. five_rows_jis, fraanrosi, froggy, froggy_106, yshrsmz"

This reverts commit 9b316c1c6a532f908f2ac430233089797ce7c794.

* change helix:default to use split_common

* change helix:five_rows to use split_common

* add comment into helix/rev2/rules.mk

* change helix:led_test to use split_common
---
 keyboards/helix/rev2/config.h                 |   4 +
 keyboards/helix/rev2/keymaps/default/keymap.c |   8 --
 keyboards/helix/rev2/keymaps/default/rules.mk |   2 +
 .../helix/rev2/keymaps/five_rows/keymap.c     |  10 +-
 .../helix/rev2/keymaps/five_rows/rules.mk     |   2 +
 .../helix/rev2/keymaps/led_test/rules.mk      |   2 +
 keyboards/helix/rev2/local_features.mk        | 132 +++++-------------
 .../helix/rev2/override_helix_options.mk      |  44 ++++++
 keyboards/helix/rev2/rev2.c                   |  15 ++
 keyboards/helix/rev2/rev2.h                   |  15 ++
 keyboards/helix/rev2/rules.mk                 |   2 +
 11 files changed, 123 insertions(+), 113 deletions(-)
 create mode 100644 keyboards/helix/rev2/override_helix_options.mk

diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index 041acee215..9b813b347a 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -1,6 +1,7 @@
 /*
 Copyright 2012 Jun Wako <wakojun@gmail.com>
 Copyright 2015 Jack Humbert
+Copyright 2018 MakotoKurauchi
 
 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
@@ -28,6 +29,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 100
 
+#define SPLIT_LAYER_STATE_ENABLE
+#define SPLIT_LED_STATE_ENABLE
+
 /* Use I2C or Serial */
 #define USE_SERIAL
 //#define USE_MATRIX_I2C
diff --git a/keyboards/helix/rev2/keymaps/default/keymap.c b/keyboards/helix/rev2/keymaps/default/keymap.c
index 88820dac8a..c3994d3184 100644
--- a/keyboards/helix/rev2/keymaps/default/keymap.c
+++ b/keyboards/helix/rev2/keymaps/default/keymap.c
@@ -15,14 +15,6 @@
  */
 
 #include QMK_KEYBOARD_H
-#include "bootloader.h"
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
 
 // 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.
diff --git a/keyboards/helix/rev2/keymaps/default/rules.mk b/keyboards/helix/rev2/keymaps/default/rules.mk
index 2aa62bc830..508c4ba40e 100644
--- a/keyboards/helix/rev2/keymaps/default/rules.mk
+++ b/keyboards/helix/rev2/keymaps/default/rules.mk
@@ -1,3 +1,5 @@
+SPLIT_KEYBOARD = yes
+
 LTO_ENABLE = yes  # if firmware size over limit, try this option
 
 # Helix Spacific Build Options
diff --git a/keyboards/helix/rev2/keymaps/five_rows/keymap.c b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
index 16eff49244..2b3f6233c1 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows/keymap.c
@@ -15,15 +15,7 @@
  */
 
 #include QMK_KEYBOARD_H
-#include "util.h"
-#include "bootloader.h"
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
-#ifdef CONSOLE_ENABLE
-  #include <print.h>
-#endif
+
 #include "layer_number.h"
 
 extern keymap_config_t keymap_config;
diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
index e4d0390c3a..60dc4b61a6 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
@@ -1,3 +1,5 @@
+ SPLIT_KEYBOARD = yes
+
  CONSOLE_ENABLE = no        # Console for debug
  COMMAND_ENABLE = no        # Commands for debug and configuration
  # CONSOLE_ENABLE and COMMAND_ENABLE
diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk
index 3ab27acfc2..1dc12bb1cb 100644
--- a/keyboards/helix/rev2/keymaps/led_test/rules.mk
+++ b/keyboards/helix/rev2/keymaps/led_test/rules.mk
@@ -5,6 +5,8 @@
 #   See TOP/keyboards/helix/rules.mk for a list of options that can be set.
 #   See TOP/docs/config_options.md for more information.
 #
+SPLIT_KEYBOARD = yes
+
 LTO_ENABLE = no  # if firmware size over limit, try this option
 
 # Helix Spacific Build Options
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk
index 8c3ac9c3c1..1484312064 100644
--- a/keyboards/helix/rev2/local_features.mk
+++ b/keyboards/helix/rev2/local_features.mk
@@ -6,40 +6,24 @@
 #
 
 KEYBOARD_LOCAL_FEATURES_MK :=
+-include $(strip $(HELIX_TOP_DIR)/pico/override_helix_options.mk) ## File dedicated to maintenance
 
-define HELIX_CUSTOMISE_MSG
-  $(info Helix Spacific Build Options)
-  $(info -  OLED_ENABLE          = $(OLED_ENABLE))
-  $(info -  OLED_SELECT          = $(OLED_SELECT))
-  $(info -  LED_BACK_ENABLE      = $(LED_BACK_ENABLE))
-  $(info -  LED_UNDERGLOW_ENABLE = $(LED_UNDERGLOW_ENABLE))
-  $(info -  LED_ANIMATIONS       = $(LED_ANIMATIONS))
-  $(info -  IOS_DEVICE_ENABLE    = $(IOS_DEVICE_ENABLE))
-  $(info )
-endef
-
-define HELIX_HELP_MSG
-  $(info Helix keyboard convenient command line option)
-  $(info -    make HELIX=<options> helix:<keymap>)
-  $(info -    option= oled | core-oled | local-oled | no-oled )
-  $(info -            back | no-back   | under      | na   | no-ani )
-  $(info -             ios | sc        | split-common | scan | verbose)
-  $(info -    eg.)
-  $(info -      make HELIX=no-oled       helix:<keymap>)
-  $(info -      make HELIX=oled,no-back  helix:<keymap>)
-  $(info -      make HELIX=oled,under    helix:<keymap>)
-  $(info -      make HELIX=oled,back,na  helix:<keymap>)
-  $(info -      make HELIX=oled,back,ios helix:<keymap>)
-  $(info )
-endef
-
-  ifneq ($(strip $(HELIX)),)
+# Parse 'HELIX=xx,yy,zz' option
+ifneq ($(strip $(HELIX)),)
+    # make HELIX=ios helix/pico:AKEYMAP
+    # make HELIX=no-ani helix/pico:AKEYMAP
+    # make HELIX=no-oled helix/pico:AKEYMAP
+    # make HELIX=ios,no-ani,no-oled helix/pico:AKEYMAP
     define HELIX_OPTION_PARSE
-      # parce 'oled' 'back' 'under' 'ios' etc.
-      $(if $(SHOW_PARCE),$(info parse .$1.))  #debug
+        # parce 'no-ani' 'ios' 'no-oled'
+        $(if $(SHOW_PARCE),$(info parse .$1.))  #debug
+        $(if $(HELIX_OVERRIDE_PARSE),$(call HELIX_OVERRIDE_PARSE,$1))
 
-      ifeq ($(strip $1),help)
-        HELP=on
+      ifeq ($(strip $1),ios)
+        IOS_DEVICE_ENABLE = yes
+      endif
+      ifneq ($(filter na no_ani no-ani,$(strip $1)),)
+        LED_ANIMATIONS = no
       endif
       ifneq ($(filter nooled no-oled,$(strip $1)),)
         OLED_ENABLE = no
@@ -47,68 +31,17 @@ endef
       ifeq ($(strip $1),oled)
         OLED_ENABLE = yes
       endif
-      ifneq ($(filter core-oled core_oled newoled new-oled olednew oled-new,$(strip $1)),)
-        OLED_ENABLE = yes
-        OLED_SELECT = core
-      endif
-      ifneq ($(filter local-oled local_oled oldoled old-oled oledold oled-old,$(strip $1)),)
-        OLED_ENABLE = yes
-        OLED_SELECT = local
-      endif
-      ifneq ($(filter noback no-back nounder no-under,$(strip $1)),)
-        LED_BACK_ENABLE = no
-        LED_UNDERGLOW_ENABLE = no
-      endif
-      ifeq ($(strip $1),back)
-        LED_BACK_ENABLE = yes
-        LED_UNDERGLOW_ENABLE = no
-      endif
-      ifeq ($(strip $1),under)
-        LED_BACK_ENABLE = no
-        LED_UNDERGLOW_ENABLE = yes
-      endif
-      ifneq ($(filter na no_ani no-ani,$(strip $1)),)
-        LED_ANIMATIONS = no
-      endif
-      ifeq ($(strip $1),ios)
-        IOS_DEVICE_ENABLE = yes
-      endif
-      ifneq ($(filter sc split-common split_common,$(strip $1)),)
-        SPLIT_KEYBOARD = yes
-      endif
-      ifneq ($(filter nosc no-sc no-split-common no-split_common,$(strip $1)),)
-        SPLIT_KEYBOARD = no
-      endif
-      ifeq ($(strip $1),scan)
-        # use DEBUG_MATRIX_SCAN_RATE
-        # see docs/newbs_testing_debugging.md
-        OPT_DEFS +=  -DDEBUG_MATRIX_SCAN_RATE
-        CONSOLE_ENABLE = yes
-        SHOW_VERBOSE_INFO = yes
-      endif
-      ifeq ($(strip $1),verbose)
-        SHOW_VERBOSE_INFO = yes
-      endif
-      ifeq ($(strip $1),lto)
-        LTO_ENABLE = yes
-      endif
-      ifneq ($(filter nolto no-lto no_lto,$(strip $1)),)
-        LTO_ENABLE = no
-      endif
     endef # end of HELIX_OPTION_PARSE
 
     COMMA=,
     $(eval $(foreach A_OPTION_NAME,$(subst $(COMMA), ,$(HELIX)),  \
         $(call HELIX_OPTION_PARSE,$(A_OPTION_NAME))))
 
-    ifeq ($(strip $(HELP)),on)
-       $(eval $(call HELIX_HELP_MSG))
-       $(error )
-    endif
     SHOW_HELIX_OPTIONS = yes
-  endif
+endif
 
 ifneq ($(strip $(SPLIT_KEYBOARD)), yes)
+  # In the very near future, all keymaps will be compatible with split_common and this block will be removed.
   SRC += local_drivers/serial.c
   KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers
 
@@ -139,7 +72,6 @@ ifeq ($(strip $(LED_BACK_ENABLE)), yes)
   RGBLIGHT_ENABLE = yes
   OPT_DEFS += -DRGBLED_BACK
   ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
-    $(eval $(call HELIX_CUSTOMISE_MSG))
     $(error LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE both 'yes')
   endif
 else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
@@ -164,6 +96,8 @@ ifeq ($(strip $(OLED_ENABLE)), yes)
            OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
         endif
     else
+
+        # In the very near future, all keymaps will be compatible with QMK standard oled_driver and this block will be removed.
         ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
             $(info Helix/rev2: The following combinations are not supported.)
             $(info - SPLIT_KEYBOARD = $(SPLIT_KEYBOARD)) # yes
@@ -188,15 +122,21 @@ ifeq ($(strip $(OLED_ENABLE)), yes)
 endif
 
 ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
-  $(eval $(call HELIX_CUSTOMISE_MSG))
-  ifneq ($(strip $(SHOW_VERBOSE_INFO)),)
-     $(info -- RGBLIGHT_ENABLE    = $(RGBLIGHT_ENABLE))
-     $(info -- OLED_DRIVER        = $(OLED_DRIVER))
-     $(info -- OLED_LOCAL_ENABLE  = $(OLED_LOCAL_ENABLE))
-     $(info -- CONSOLE_ENABLE     = $(CONSOLE_ENABLE))
-     $(info -- OPT_DEFS           = $(OPT_DEFS))
-     $(info -- SPLIT_KEYBOARD     = $(SPLIT_KEYBOARD))
-     $(info -- LTO_ENABLE         = $(LTO_ENABLE))
-     $(info )
-  endif
+  $(info Helix Spacific Build Options)
+  $(info -  OLED_ENABLE          = $(OLED_ENABLE))
+  $(info -  OLED_SELECT          = $(OLED_SELECT))
+  $(info -  LED_BACK_ENABLE      = $(LED_BACK_ENABLE))
+  $(info -  LED_UNDERGLOW_ENABLE = $(LED_UNDERGLOW_ENABLE))
+  $(info -  LED_ANIMATIONS       = $(LED_ANIMATIONS))
+  $(info -  IOS_DEVICE_ENABLE    = $(IOS_DEVICE_ENABLE))
+  $(info )
+  $(info QMK Build Options)
+  $(info -- SPLIT_KEYBOARD     = $(SPLIT_KEYBOARD))
+  $(info -- RGBLIGHT_ENABLE    = $(RGBLIGHT_ENABLE))
+  $(info -- OLED_DRIVER        = $(OLED_DRIVER))
+  $(info -- OLED_LOCAL_ENABLE  = $(OLED_LOCAL_ENABLE))
+  $(info -- CONSOLE_ENABLE     = $(CONSOLE_ENABLE))
+  $(info -- OPT_DEFS           = $(OPT_DEFS))
+  $(info -- LTO_ENABLE         = $(LTO_ENABLE))
+  $(info )
 endif
diff --git a/keyboards/helix/rev2/override_helix_options.mk b/keyboards/helix/rev2/override_helix_options.mk
new file mode 100644
index 0000000000..a6d3331e80
--- /dev/null
+++ b/keyboards/helix/rev2/override_helix_options.mk
@@ -0,0 +1,44 @@
+$(info -------------------------)
+$(info override_helix_options.mk)
+$(info -------------------------)
+
+define HELIX_OVERRIDE_PARSE
+      ifeq ($(strip $1),back)
+        LED_BACK_ENABLE = yes
+        LED_UNDERGLOW_ENABLE = no
+      endif
+      ifeq ($(strip $1),under)
+        LED_BACK_ENABLE = no
+        LED_UNDERGLOW_ENABLE = yes
+      endif
+      ifneq ($(filter led-off led_off noback no-back nounder no-under,$(strip $1)),)
+        LED_BACK_ENABLE = no
+        LED_UNDERGLOW_ENABLE = no
+      endif
+      ifneq ($(filter core-oled core_oled newoled new-oled olednew oled-new,$(strip $1)),)
+        OLED_ENABLE = yes
+        OLED_SELECT = core
+      endif
+      ifneq ($(filter local-oled local_oled oldoled old-oled oledold oled-old,$(strip $1)),)
+        OLED_ENABLE = yes
+        OLED_SELECT = local
+      endif
+      ifneq ($(filter sc split-common split_common,$(strip $1)),)
+        SPLIT_KEYBOARD = yes
+      endif
+      ifneq ($(filter nosc no-sc no-split-common no-split_common,$(strip $1)),)
+        SPLIT_KEYBOARD = no
+      endif
+      ifeq ($(strip $1),scan)
+          DEBUG_MATRIX_SCAN_RATE_ENABLE = yes
+      endif
+      ifeq ($(strip $1),scan-api)
+          DEBUG_MATRIX_SCAN_RATE_ENABLE = api
+      endif
+      ifeq ($(strip $1),lto)
+          LTO_ENABLE = yes
+      endif
+      ifneq ($(filter nolto no-lto no_lto,$(strip $1)),)
+          LTO_ENABLE = no
+      endif
+endef # end of HELIX_OVERRIDE_PARSE
diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c
index b92580f9f9..f579027c71 100644
--- a/keyboards/helix/rev2/rev2.c
+++ b/keyboards/helix/rev2/rev2.c
@@ -1,3 +1,18 @@
+/* Copyright 2018 MakotoKurauchi
+ *
+ * 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 "helix.h"
 
 // Each keymap.c should use is_keyboard_master() instead of 'is_master'.
diff --git a/keyboards/helix/rev2/rev2.h b/keyboards/helix/rev2/rev2.h
index 787b6c67bb..5c7cc93d17 100644
--- a/keyboards/helix/rev2/rev2.h
+++ b/keyboards/helix/rev2/rev2.h
@@ -1,3 +1,18 @@
+/* Copyright 2018 MakotoKurauchi
+ *
+ * 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 "helix.h"
diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk
index a31e9d9b22..5ed92ff0ad 100644
--- a/keyboards/helix/rev2/rules.mk
+++ b/keyboards/helix/rev2/rules.mk
@@ -1,5 +1,7 @@
 KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk
 
+# SPLIT_KEYBOARD = yes
+
 # Helix Spacific Build Options default values
 HELIX_ROWS = 5              # Helix Rows is 4 or 5
 OLED_ENABLE = yes           # OLED_ENABLE

From 96b6ddf4bf79f22f850504d205a57e2730578b3b Mon Sep 17 00:00:00 2001
From: Jake VanderVaate <96353168+jakevandervaate@users.noreply.github.com>
Date: Thu, 3 Mar 2022 09:53:40 +0000
Subject: [PATCH 711/867] fixed typo in docs/newbs_getting_started.md (#16501)

---
 docs/newbs_getting_started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/newbs_getting_started.md b/docs/newbs_getting_started.md
index d6c080173c..c03e6acdb4 100644
--- a/docs/newbs_getting_started.md
+++ b/docs/newbs_getting_started.md
@@ -145,7 +145,7 @@ In most situations you will want to answer `y` to all of the prompts.
 ?>**Note on Debian, Ubuntu and their derivatives**:
 It's possible, that you will get an error saying something like: `bash: qmk: command not found`.
 This is due to a [bug](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=839155) Debian introduced with their Bash 4.4 release, which removed `$HOME/.local/bin` from the PATH. This bug was later fixed on Debian and Ubuntu.
-Sadly, Ubuntu reitroduced this bug and is [yet to fix it](https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1588562).
+Sadly, Ubuntu reintroduced this bug and is [yet to fix it](https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1588562).
 Luckily, the fix is easy. Run this as your user: `echo 'PATH="$HOME/.local/bin:$PATH"' >> $HOME/.bashrc && source $HOME/.bashrc`
 
 ###  ** FreeBSD **

From 75b40dc7a537e7f223a73c165a3f6f0e2e91817c Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Thu, 3 Mar 2022 23:27:21 +0900
Subject: [PATCH 712/867] Fix mistakes in the include path in
 `helix/rev2/local_features.mk`. (#16507)

```diff
  --- a/keyboards/helix/rev2/local_features.mk
  +++ b/keyboards/helix/rev2/local_features.mk
  @@ -6,7 +6,7 @@
   #

   KEYBOARD_LOCAL_FEATURES_MK :=
  --include $(strip $(HELIX_TOP_DIR)/pico/override_helix_options.mk) ## File ded  icated to maintenance
  +-include $(strip $(HELIX_TOP_DIR)/rev2/override_helix_options.mk) ## File dedicated to maintenance
  ```
---
 keyboards/helix/rev2/local_features.mk         | 2 +-
 keyboards/helix/rev2/override_helix_options.mk | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk
index 1484312064..cfff8fd64d 100644
--- a/keyboards/helix/rev2/local_features.mk
+++ b/keyboards/helix/rev2/local_features.mk
@@ -6,7 +6,7 @@
 #
 
 KEYBOARD_LOCAL_FEATURES_MK :=
--include $(strip $(HELIX_TOP_DIR)/pico/override_helix_options.mk) ## File dedicated to maintenance
+-include $(strip $(HELIX_TOP_DIR)/rev2/override_helix_options.mk) ## File dedicated to maintenance
 
 # Parse 'HELIX=xx,yy,zz' option
 ifneq ($(strip $(HELIX)),)
diff --git a/keyboards/helix/rev2/override_helix_options.mk b/keyboards/helix/rev2/override_helix_options.mk
index a6d3331e80..56dee8ce78 100644
--- a/keyboards/helix/rev2/override_helix_options.mk
+++ b/keyboards/helix/rev2/override_helix_options.mk
@@ -1,6 +1,8 @@
-$(info -------------------------)
-$(info override_helix_options.mk)
-$(info -------------------------)
+ifneq ($(strip $(HELIX)),)
+  $(info -------------------------)
+  $(info override_helix_options.mk)
+  $(info -------------------------)
+endif
 
 define HELIX_OVERRIDE_PARSE
       ifeq ($(strip $1),back)

From ae2c77c8272a3b90c75dc2750a0f13a9cd629953 Mon Sep 17 00:00:00 2001
From: Gompa <gompa@h-bomb.nl>
Date: Thu, 3 Mar 2022 18:24:04 +0100
Subject: [PATCH 713/867] [Bug] fix v-usb connection enumeration, ifdef
 workaround (#16511)

Co-authored-by: Joel Challis <git@zvecr.com>
---
 quantum/action_util.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/quantum/action_util.c b/quantum/action_util.c
index 64a1b6b30d..4ea0bf61fb 100644
--- a/quantum/action_util.c
+++ b/quantum/action_util.c
@@ -270,6 +270,9 @@ void send_keyboard_report(void) {
     keyboard_report->mods |= weak_override_mods;
 #endif
 
+#ifdef PROTOCOL_VUSB
+    host_keyboard_send(keyboard_report);
+#else
     static report_keyboard_t last_report;
 
     /* Only send the report if there are changes to propagate to the host. */
@@ -277,6 +280,7 @@ void send_keyboard_report(void) {
         memcpy(&last_report, keyboard_report, sizeof(report_keyboard_t));
         host_keyboard_send(keyboard_report);
     }
+#endif
 }
 
 /** \brief Get mods

From 4a66bdf29443607ae01c1a6c87b657f89d3a1769 Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Fri, 4 Mar 2022 05:23:49 +0900
Subject: [PATCH 714/867] Fix helix/rev2 not working properly when using
 split_common. (#16512)

When helix/rev2 was using split_common, it didn't work properly and I couldn't type on the right hand side.

The cause is that the following code, added in 0.16.0 to `quantum/keyboard.c`, does not include `quantum/split_common/split_util.h` but instead includes `keyboards/helix/rev2/split_util.h`. Therefore, `split_pre_init()/split_post_init()` in `quantum/split_common/split_util.c` was not called.

```c
  #ifdef SPLIT_KEYBOARD
  #    include "split_util.h"
  #endif
```
---
 keyboards/helix/rev2/{ => custom}/matrix.c      | 0
 keyboards/helix/rev2/{ => custom}/split_scomm.c | 0
 keyboards/helix/rev2/{ => custom}/split_scomm.h | 0
 keyboards/helix/rev2/{ => custom}/split_util.c  | 0
 keyboards/helix/rev2/{ => custom}/split_util.h  | 9 +++++----
 keyboards/helix/rev2/local_features.mk          | 7 ++++---
 6 files changed, 9 insertions(+), 7 deletions(-)
 rename keyboards/helix/rev2/{ => custom}/matrix.c (100%)
 rename keyboards/helix/rev2/{ => custom}/split_scomm.c (100%)
 rename keyboards/helix/rev2/{ => custom}/split_scomm.h (100%)
 rename keyboards/helix/rev2/{ => custom}/split_util.c (100%)
 rename keyboards/helix/rev2/{ => custom}/split_util.h (69%)

diff --git a/keyboards/helix/rev2/matrix.c b/keyboards/helix/rev2/custom/matrix.c
similarity index 100%
rename from keyboards/helix/rev2/matrix.c
rename to keyboards/helix/rev2/custom/matrix.c
diff --git a/keyboards/helix/rev2/split_scomm.c b/keyboards/helix/rev2/custom/split_scomm.c
similarity index 100%
rename from keyboards/helix/rev2/split_scomm.c
rename to keyboards/helix/rev2/custom/split_scomm.c
diff --git a/keyboards/helix/rev2/split_scomm.h b/keyboards/helix/rev2/custom/split_scomm.h
similarity index 100%
rename from keyboards/helix/rev2/split_scomm.h
rename to keyboards/helix/rev2/custom/split_scomm.h
diff --git a/keyboards/helix/rev2/split_util.c b/keyboards/helix/rev2/custom/split_util.c
similarity index 100%
rename from keyboards/helix/rev2/split_util.c
rename to keyboards/helix/rev2/custom/split_util.c
diff --git a/keyboards/helix/rev2/split_util.h b/keyboards/helix/rev2/custom/split_util.h
similarity index 69%
rename from keyboards/helix/rev2/split_util.h
rename to keyboards/helix/rev2/custom/split_util.h
index 535949118a..3b1d4249f5 100644
--- a/keyboards/helix/rev2/split_util.h
+++ b/keyboards/helix/rev2/custom/split_util.h
@@ -1,5 +1,10 @@
 #pragma once
 
+#ifdef SPLIT_KEYBOARD
+#   error This is helix local split_util.h.
+#   error This header file is used only when SPLIT_KEYBOARD=no.
+#endif
+
 #include <stdbool.h>
 #include "eeconfig.h"
 
@@ -14,7 +19,3 @@ void split_keyboard_setup(void);
 bool is_helix_master(void);
 
 void matrix_master_OLED_init (void);
-
-// stubs as this is handled by legacy code
-static inline void split_pre_init(void){}
-static inline void split_post_init(void){}
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk
index cfff8fd64d..c6f818bf39 100644
--- a/keyboards/helix/rev2/local_features.mk
+++ b/keyboards/helix/rev2/local_features.mk
@@ -52,9 +52,10 @@ ifneq ($(strip $(SPLIT_KEYBOARD)), yes)
 
   CUSTOM_MATRIX = yes
 
-  SRC += rev2/matrix.c
-  SRC += rev2/split_util.c
-  SRC += rev2/split_scomm.c
+  SRC += rev2/custom/matrix.c
+  SRC += rev2/custom/split_util.c
+  SRC += rev2/custom/split_scomm.c
+  KEYBOARD_PATHS += $(HELIX_TOP_DIR)/rev2/custom
 endif
 
 ########

From 7fb312ccd7d62a151a35ba70decb722aa9193115 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 3 Mar 2022 22:35:51 +0000
Subject: [PATCH 715/867] Fix use of ISSI driver config before init (#16493)

---
 tmk_core/protocol/arm_atsam/i2c_master.c     | 3 +++
 tmk_core/protocol/arm_atsam/main_arm_atsam.c | 2 --
 tmk_core/protocol/arm_atsam/md_rgb_matrix.c  | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tmk_core/protocol/arm_atsam/i2c_master.c b/tmk_core/protocol/arm_atsam/i2c_master.c
index 6b0b9a703b..07ffcc8172 100644
--- a/tmk_core/protocol/arm_atsam/i2c_master.c
+++ b/tmk_core/protocol/arm_atsam/i2c_master.c
@@ -297,6 +297,9 @@ uint8_t I2C3733_Init_Drivers(void) {
     if (gcr_actual > LED_GCR_MAX) gcr_actual = LED_GCR_MAX;
     gcr_desired = gcr_actual;
 
+    void issi3733_prepare_arrays(void);
+    issi3733_prepare_arrays();
+
     // Set up master device
     i2c_led_send_CRWL(0);
     i2c_led_select_page(0, 3);
diff --git a/tmk_core/protocol/arm_atsam/main_arm_atsam.c b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
index d092da8682..8ee9e042e7 100644
--- a/tmk_core/protocol/arm_atsam/main_arm_atsam.c
+++ b/tmk_core/protocol/arm_atsam/main_arm_atsam.c
@@ -300,8 +300,6 @@ int main(void) {
     i2c1_init();
 #endif // RGB_MATRIX_ENABLE
 
-    matrix_init();
-
     USB_Hub_init();
 
     DBGC(DC_MAIN_UDC_START_BEGIN);
diff --git a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
index 84ce3ee24b..3ed83a44a6 100644
--- a/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
+++ b/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
@@ -206,6 +206,12 @@ void gcr_compute(void) {
 }
 
 void issi3733_prepare_arrays(void) {
+    static bool s_init = false;
+    if (s_init) {
+        return;
+    }
+    s_init = true;
+
     memset(issidrv, 0, sizeof(issi3733_driver_t) * ISSI3733_DRIVER_COUNT);
 
     int     i;

From e01307f265a9c82befd1fe725f04b3930a875230 Mon Sep 17 00:00:00 2001
From: jels <66403163+Jels02@users.noreply.github.com>
Date: Fri, 4 Mar 2022 09:38:24 +1000
Subject: [PATCH 716/867] Typo in squeezing_avr.md (#16506)

Fixed typo in squeezing_avr docs.
---
 docs/squeezing_avr.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/squeezing_avr.md b/docs/squeezing_avr.md
index 4a147e0c66..62f0a5d290 100644
--- a/docs/squeezing_avr.md
+++ b/docs/squeezing_avr.md
@@ -34,7 +34,7 @@ Largest in size is "magic" -- the QMK magic keycodes -- which control things lik
 
 If you've done all of that, and you don't want to disable features like RGB, Audio, OLEDs, etc, there are some additional options that you can add to your config.h that can help.
 
-Starting with Lock Key support. If you have an Cherry MX Lock switch (lucky you!), you don't want to do this. But chances are, you don't. In that case, add this to your `config.h`:
+Starting with Lock Key support. If you have a Cherry MX Lock switch (lucky you!), you don't want to do this. But chances are, you don't. In that case, add this to your `config.h`:
 ```c
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE

From 61ba8efa3e358fbf4495c76b9d7c33aa2ec1259e Mon Sep 17 00:00:00 2001
From: jels <66403163+Jels02@users.noreply.github.com>
Date: Fri, 4 Mar 2022 11:49:14 +1000
Subject: [PATCH 717/867] Update pr_checklist.md (#16484)

Update readme.md template link from https://github.com/qmk/qmk_firmware/blob/master/data/templates/avr/readme.md to https://github.com/qmk/qmk_firmware/blob/master/data/templates/keyboard/readme.md
---
 docs/pr_checklist.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pr_checklist.md b/docs/pr_checklist.md
index e4564746b4..591c21b97b 100644
--- a/docs/pr_checklist.md
+++ b/docs/pr_checklist.md
@@ -50,7 +50,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
     - valid maintainer
     - displays correctly in Configurator (press Ctrl+Shift+I to preview local file, turn on fast input to verify ordering)
 - `readme.md`
-    - standard template should be present -- [link to template](https://github.com/qmk/qmk_firmware/blob/master/data/templates/avr/readme.md)
+    - standard template should be present -- [link to template](https://github.com/qmk/qmk_firmware/blob/master/data/templates/keyboard/readme.md)
     - flash command is present, and has `:flash` at end
     - valid hardware availability link (unless handwired) -- private groupbuys are okay, but one-off prototypes will be questioned. If open-source, a link to files should be provided.
     - clear instructions on how to reset the board into bootloader mode

From aab2ac22c5217afcbbbaff8b5444b02765f6de66 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 4 Mar 2022 14:52:15 +1100
Subject: [PATCH 718/867] Melody96 refactor (#16455)

---
 keyboards/melody96/info.json                  | 886 +++++++++++++++++-
 keyboards/melody96/keymaps/default/keymap.c   |  86 +-
 .../keymap.c                                  |  32 +-
 .../default_std60_split_num0/readme.md        |  39 -
 keyboards/melody96/keymaps/via/keymap.c       |  64 +-
 keyboards/melody96/keymaps/via/readme.md      |   5 -
 keyboards/melody96/keymaps/via/rules.mk       |   2 +-
 keyboards/melody96/melody96.h                 | 310 ++++--
 keyboards/melody96/readme.md                  |  14 +-
 keyboards/melody96/rules.mk                   |  14 +-
 10 files changed, 1177 insertions(+), 275 deletions(-)
 rename keyboards/melody96/keymaps/{default_std60_split_num0 => default_96_with60_split_num0}/keymap.c (82%)
 delete mode 100644 keyboards/melody96/keymaps/default_std60_split_num0/readme.md
 delete mode 100644 keyboards/melody96/keymaps/via/readme.md

diff --git a/keyboards/melody96/info.json b/keyboards/melody96/info.json
index e6f3a03ad8..7db60fa7d4 100644
--- a/keyboards/melody96/info.json
+++ b/keyboards/melody96/info.json
@@ -1,16 +1,884 @@
 {
-    "keyboard_name": "melody96", 
-    "url": "", 
-    "maintainer": "qmk", 
+    "keyboard_name": "melody96",
+    "url": "",
+    "maintainer": "qmk",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_all",
+        "LAYOUT_hotswap": "LAYOUT_96_ansi"
+    },
     "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Scroll Lock", "x":14, "y":0}, {"label":"Pause", "x":15, "y":0}, {"label":"Insert", "x":16, "y":0}, {"label":"Home", "x":17, "y":0}, {"label":"PgUp", "x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"label":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"-", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"+", "x":18, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"x":18, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Win", "x":11, "y":5}, {"x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}, {"x":18, "y":5}]
+        "LAYOUT_all": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+                {"x": 17, "y": 0},
+                {"x": 18, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 17, "y": 1},
+                {"x": 18, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.5},
+                {"x": 1.5, "y": 2},
+                {"x": 2.5, "y": 2},
+                {"x": 3.5, "y": 2},
+                {"x": 4.5, "y": 2},
+                {"x": 5.5, "y": 2},
+                {"x": 6.5, "y": 2},
+                {"x": 7.5, "y": 2},
+                {"x": 8.5, "y": 2},
+                {"x": 9.5, "y": 2},
+                {"x": 10.5, "y": 2},
+                {"x": 11.5, "y": 2},
+                {"x": 12.5, "y": 2},
+                {"x": 13.5, "y": 2, "w": 1.5},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+                {"x": 17, "y": 2},
+                {"x": 18, "y": 2},
+
+                {"x": 0, "y": 3, "w": 1.75},
+                {"x": 1.75, "y": 3},
+                {"x": 2.75, "y": 3},
+                {"x": 3.75, "y": 3},
+                {"x": 4.75, "y": 3},
+                {"x": 5.75, "y": 3},
+                {"x": 6.75, "y": 3},
+                {"x": 7.75, "y": 3},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3},
+                {"x": 10.75, "y": 3},
+                {"x": 11.75, "y": 3},
+                {"x": 12.75, "y": 3, "w": 2.25},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+                {"x": 17, "y": 3},
+                {"x": 18, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4},
+                {"x": 2.25, "y": 4},
+                {"x": 3.25, "y": 4},
+                {"x": 4.25, "y": 4},
+                {"x": 5.25, "y": 4},
+                {"x": 6.25, "y": 4},
+                {"x": 7.25, "y": 4},
+                {"x": 8.25, "y": 4},
+                {"x": 9.25, "y": 4},
+                {"x": 10.25, "y": 4},
+                {"x": 11.25, "y": 4},
+                {"x": 12.25, "y": 4, "w": 1.75},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+                {"x": 17, "y": 4},
+                {"x": 18, "y": 4},
+
+                {"x": 0, "y": 5, "w": 1.25},
+                {"x": 1.25, "y": 5, "w": 1.25},
+                {"x": 2.5, "y": 5, "w": 1.25},
+                {"x": 3.75, "y": 5, "w": 6.25},
+                {"x": 10, "y": 5},
+                {"x": 11, "y": 5},
+                {"x": 12, "y": 5},
+                {"x": 13, "y": 5},
+                {"x": 14, "y": 5},
+                {"x": 15, "y": 5},
+                {"x": 16, "y": 5},
+                {"x": 17, "y": 5},
+                {"x": 18, "y": 5}
+            ]
         },
-        "LAYOUT_hotswap": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Home", "x":13, "y":0}, {"label":"End", "x":14, "y":0}, {"label":"PgUp", "x":15, "y":0}, {"label":"PgDn", "x":16, "y":0}, {"label":"Media Play", "x":17, "y":0}, {"label":"Pause", "x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"-", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"+", "x":18, "y":2, "h":2}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"Up", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"GUI", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"label":"Space", "x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"Left", "x":13, "y":5}, {"label":"Down", "x":14, "y":5}, {"label":"Right", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}, {"label":"Enter", "x":18, "y":4, "h":2}]
+        "LAYOUT_96_ansi": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+                {"x": 17, "y": 0},
+                {"x": 18, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1, "w": 2},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 17, "y": 1},
+                {"x": 18, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.5},
+                {"x": 1.5, "y": 2},
+                {"x": 2.5, "y": 2},
+                {"x": 3.5, "y": 2},
+                {"x": 4.5, "y": 2},
+                {"x": 5.5, "y": 2},
+                {"x": 6.5, "y": 2},
+                {"x": 7.5, "y": 2},
+                {"x": 8.5, "y": 2},
+                {"x": 9.5, "y": 2},
+                {"x": 10.5, "y": 2},
+                {"x": 11.5, "y": 2},
+                {"x": 12.5, "y": 2},
+                {"x": 13.5, "y": 2, "w": 1.5},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+                {"x": 17, "y": 2},
+                {"x": 18, "y": 2, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.75},
+                {"x": 1.75, "y": 3},
+                {"x": 2.75, "y": 3},
+                {"x": 3.75, "y": 3},
+                {"x": 4.75, "y": 3},
+                {"x": 5.75, "y": 3},
+                {"x": 6.75, "y": 3},
+                {"x": 7.75, "y": 3},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3},
+                {"x": 10.75, "y": 3},
+                {"x": 11.75, "y": 3},
+                {"x": 12.75, "y": 3, "w": 2.25},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+                {"x": 17, "y": 3},
+
+                {"x": 0, "y": 4, "w": 2.25},
+                {"x": 2.25, "y": 4},
+                {"x": 3.25, "y": 4},
+                {"x": 4.25, "y": 4},
+                {"x": 5.25, "y": 4},
+                {"x": 6.25, "y": 4},
+                {"x": 7.25, "y": 4},
+                {"x": 8.25, "y": 4},
+                {"x": 9.25, "y": 4},
+                {"x": 10.25, "y": 4},
+                {"x": 11.25, "y": 4},
+                {"x": 12.25, "y": 4, "w": 1.75},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+                {"x": 17, "y": 4},
+                {"x": 18, "y": 4, "h": 2},
+
+                {"x": 0, "y": 5, "w": 1.25},
+                {"x": 1.25, "y": 5, "w": 1.25},
+                {"x": 2.5, "y": 5, "w": 1.25},
+                {"x": 3.75, "y": 5, "w": 6.25},
+                {"x": 10, "y": 5},
+                {"x": 11, "y": 5},
+                {"x": 12, "y": 5},
+                {"x": 13, "y": 5},
+                {"x": 14, "y": 5},
+                {"x": 15, "y": 5},
+                {"x": 16, "y": 5},
+                {"x": 17, "y": 5}
+            ]
         },
-        "LAYOUT_std60_split_num0": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Home", "x":14, "y":0}, {"label":"End", "x":15, "y":0}, {"label":"PgUp", "x":16, "y":0}, {"label":"PgDn", "x":17, "y":0}, {"label":"Delete", "x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"-", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"+", "x":18, "y":2, "h":2}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":2.75}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"GUI", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"label":"Space", "x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.25}, {"label":"Fn", "x":11.25, "y":5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5, "w":1.25}, {"label":"0", "x":15, "y":5}, {"label":"00", "x":16, "y":5}, {"label":".", "x":17, "y":5}, {"label":"Enter", "x":18, "y":4, "h":2}]
+        "LAYOUT_96_ansi_splitbs": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+                {"x": 17, "y": 0},
+                {"x": 18, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 17, "y": 1},
+                {"x": 18, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.5},
+                {"x": 1.5, "y": 2},
+                {"x": 2.5, "y": 2},
+                {"x": 3.5, "y": 2},
+                {"x": 4.5, "y": 2},
+                {"x": 5.5, "y": 2},
+                {"x": 6.5, "y": 2},
+                {"x": 7.5, "y": 2},
+                {"x": 8.5, "y": 2},
+                {"x": 9.5, "y": 2},
+                {"x": 10.5, "y": 2},
+                {"x": 11.5, "y": 2},
+                {"x": 12.5, "y": 2},
+                {"x": 13.5, "y": 2, "w": 1.5},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+                {"x": 17, "y": 2},
+                {"x": 18, "y": 2, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.75},
+                {"x": 1.75, "y": 3},
+                {"x": 2.75, "y": 3},
+                {"x": 3.75, "y": 3},
+                {"x": 4.75, "y": 3},
+                {"x": 5.75, "y": 3},
+                {"x": 6.75, "y": 3},
+                {"x": 7.75, "y": 3},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3},
+                {"x": 10.75, "y": 3},
+                {"x": 11.75, "y": 3},
+                {"x": 12.75, "y": 3, "w": 2.25},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+                {"x": 17, "y": 3},
+
+                {"x": 0, "y": 4, "w": 2.25},
+                {"x": 2.25, "y": 4},
+                {"x": 3.25, "y": 4},
+                {"x": 4.25, "y": 4},
+                {"x": 5.25, "y": 4},
+                {"x": 6.25, "y": 4},
+                {"x": 7.25, "y": 4},
+                {"x": 8.25, "y": 4},
+                {"x": 9.25, "y": 4},
+                {"x": 10.25, "y": 4},
+                {"x": 11.25, "y": 4},
+                {"x": 12.25, "y": 4, "w": 1.75},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+                {"x": 17, "y": 4},
+                {"x": 18, "y": 4, "h": 2},
+
+                {"x": 0, "y": 5, "w": 1.25},
+                {"x": 1.25, "y": 5, "w": 1.25},
+                {"x": 2.5, "y": 5, "w": 1.25},
+                {"x": 3.75, "y": 5, "w": 6.25},
+                {"x": 10, "y": 5},
+                {"x": 11, "y": 5},
+                {"x": 12, "y": 5},
+                {"x": 13, "y": 5},
+                {"x": 14, "y": 5},
+                {"x": 15, "y": 5},
+                {"x": 16, "y": 5},
+                {"x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_iso": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+                {"x": 17, "y": 0},
+                {"x": 18, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1, "w": 2},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 17, "y": 1},
+                {"x": 18, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.5},
+                {"x": 1.5, "y": 2},
+                {"x": 2.5, "y": 2},
+                {"x": 3.5, "y": 2},
+                {"x": 4.5, "y": 2},
+                {"x": 5.5, "y": 2},
+                {"x": 6.5, "y": 2},
+                {"x": 7.5, "y": 2},
+                {"x": 8.5, "y": 2},
+                {"x": 9.5, "y": 2},
+                {"x": 10.5, "y": 2},
+                {"x": 11.5, "y": 2},
+                {"x": 12.5, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+                {"x": 17, "y": 2},
+                {"x": 18, "y": 2, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.75},
+                {"x": 1.75, "y": 3},
+                {"x": 2.75, "y": 3},
+                {"x": 3.75, "y": 3},
+                {"x": 4.75, "y": 3},
+                {"x": 5.75, "y": 3},
+                {"x": 6.75, "y": 3},
+                {"x": 7.75, "y": 3},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3},
+                {"x": 10.75, "y": 3},
+                {"x": 11.75, "y": 3},
+                {"x": 12.75, "y": 3},
+                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+                {"x": 17, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4},
+                {"x": 2.25, "y": 4},
+                {"x": 3.25, "y": 4},
+                {"x": 4.25, "y": 4},
+                {"x": 5.25, "y": 4},
+                {"x": 6.25, "y": 4},
+                {"x": 7.25, "y": 4},
+                {"x": 8.25, "y": 4},
+                {"x": 9.25, "y": 4},
+                {"x": 10.25, "y": 4},
+                {"x": 11.25, "y": 4},
+                {"x": 12.25, "y": 4, "w": 1.75},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+                {"x": 17, "y": 4},
+                {"x": 18, "y": 4, "h": 2},
+
+                {"x": 0, "y": 5, "w": 1.25},
+                {"x": 1.25, "y": 5, "w": 1.25},
+                {"x": 2.5, "y": 5, "w": 1.25},
+                {"x": 3.75, "y": 5, "w": 6.25},
+                {"x": 10, "y": 5},
+                {"x": 11, "y": 5},
+                {"x": 12, "y": 5},
+                {"x": 13, "y": 5},
+                {"x": 14, "y": 5},
+                {"x": 15, "y": 5},
+                {"x": 16, "y": 5},
+                {"x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_iso_splitbs": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+                {"x": 17, "y": 0},
+                {"x": 18, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 17, "y": 1},
+                {"x": 18, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.5},
+                {"x": 1.5, "y": 2},
+                {"x": 2.5, "y": 2},
+                {"x": 3.5, "y": 2},
+                {"x": 4.5, "y": 2},
+                {"x": 5.5, "y": 2},
+                {"x": 6.5, "y": 2},
+                {"x": 7.5, "y": 2},
+                {"x": 8.5, "y": 2},
+                {"x": 9.5, "y": 2},
+                {"x": 10.5, "y": 2},
+                {"x": 11.5, "y": 2},
+                {"x": 12.5, "y": 2},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+                {"x": 17, "y": 2},
+                {"x": 18, "y": 2, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.75},
+                {"x": 1.75, "y": 3},
+                {"x": 2.75, "y": 3},
+                {"x": 3.75, "y": 3},
+                {"x": 4.75, "y": 3},
+                {"x": 5.75, "y": 3},
+                {"x": 6.75, "y": 3},
+                {"x": 7.75, "y": 3},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3},
+                {"x": 10.75, "y": 3},
+                {"x": 11.75, "y": 3},
+                {"x": 12.75, "y": 3},
+                {"x": 13.75, "y": 2, "w": 1.25, "h": 2},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+                {"x": 17, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4},
+                {"x": 2.25, "y": 4},
+                {"x": 3.25, "y": 4},
+                {"x": 4.25, "y": 4},
+                {"x": 5.25, "y": 4},
+                {"x": 6.25, "y": 4},
+                {"x": 7.25, "y": 4},
+                {"x": 8.25, "y": 4},
+                {"x": 9.25, "y": 4},
+                {"x": 10.25, "y": 4},
+                {"x": 11.25, "y": 4},
+                {"x": 12.25, "y": 4, "w": 1.75},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+                {"x": 17, "y": 4},
+                {"x": 18, "y": 4, "h": 2},
+
+                {"x": 0, "y": 5, "w": 1.25},
+                {"x": 1.25, "y": 5, "w": 1.25},
+                {"x": 2.5, "y": 5, "w": 1.25},
+                {"x": 3.75, "y": 5, "w": 6.25},
+                {"x": 10, "y": 5},
+                {"x": 11, "y": 5},
+                {"x": 12, "y": 5},
+                {"x": 13, "y": 5},
+                {"x": 14, "y": 5},
+                {"x": 15, "y": 5},
+                {"x": 16, "y": 5},
+                {"x": 17, "y": 5}
+            ]
+        },
+        "LAYOUT_96_with60": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+                {"x": 17, "y": 0},
+                {"x": 18, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1, "w": 2},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 17, "y": 1},
+                {"x": 18, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.5},
+                {"x": 1.5, "y": 2},
+                {"x": 2.5, "y": 2},
+                {"x": 3.5, "y": 2},
+                {"x": 4.5, "y": 2},
+                {"x": 5.5, "y": 2},
+                {"x": 6.5, "y": 2},
+                {"x": 7.5, "y": 2},
+                {"x": 8.5, "y": 2},
+                {"x": 9.5, "y": 2},
+                {"x": 10.5, "y": 2},
+                {"x": 11.5, "y": 2},
+                {"x": 12.5, "y": 2},
+                {"x": 13.5, "y": 2, "w": 1.5},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+                {"x": 17, "y": 2},
+                {"x": 18, "y": 2, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.75},
+                {"x": 1.75, "y": 3},
+                {"x": 2.75, "y": 3},
+                {"x": 3.75, "y": 3},
+                {"x": 4.75, "y": 3},
+                {"x": 5.75, "y": 3},
+                {"x": 6.75, "y": 3},
+                {"x": 7.75, "y": 3},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3},
+                {"x": 10.75, "y": 3},
+                {"x": 11.75, "y": 3},
+                {"x": 12.75, "y": 3, "w": 2.25},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+                {"x": 17, "y": 3},
+
+                {"x": 0, "y": 4, "w": 2.25},
+                {"x": 2.25, "y": 4},
+                {"x": 3.25, "y": 4},
+                {"x": 4.25, "y": 4},
+                {"x": 5.25, "y": 4},
+                {"x": 6.25, "y": 4},
+                {"x": 7.25, "y": 4},
+                {"x": 8.25, "y": 4},
+                {"x": 9.25, "y": 4},
+                {"x": 10.25, "y": 4},
+                {"x": 11.25, "y": 4},
+                {"x": 12.25, "y": 4, "w": 2.75},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+                {"x": 17, "y": 4},
+                {"x": 18, "y": 4, "h": 2}
+
+                {"x": 0, "y": 5, "w": 1.25},
+                {"x": 1.25, "y": 5, "w": 1.25},
+                {"x": 2.5, "y": 5, "w": 1.25},
+                {"x": 3.75, "y": 5, "w": 6.25},
+                {"x": 10, "y": 5, "w": 1.25},
+                {"x": 11.25, "y": 5, "w": 1.25},
+                {"x": 12.5, "y": 5, "w": 1.25},
+                {"x": 13.75, "y": 5, "w": 1.25},
+                {"x": 15, "y": 5, "w": 2},
+                {"x": 17, "y": 5},
+            ]
+        },
+        "LAYOUT_96_with60_splitbs": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+                {"x": 17, "y": 0},
+                {"x": 18, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1},
+                {"x": 14, "y": 1},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 17, "y": 1},
+                {"x": 18, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.5},
+                {"x": 1.5, "y": 2},
+                {"x": 2.5, "y": 2},
+                {"x": 3.5, "y": 2},
+                {"x": 4.5, "y": 2},
+                {"x": 5.5, "y": 2},
+                {"x": 6.5, "y": 2},
+                {"x": 7.5, "y": 2},
+                {"x": 8.5, "y": 2},
+                {"x": 9.5, "y": 2},
+                {"x": 10.5, "y": 2},
+                {"x": 11.5, "y": 2},
+                {"x": 12.5, "y": 2},
+                {"x": 13.5, "y": 2, "w": 1.5},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+                {"x": 17, "y": 2},
+                {"x": 18, "y": 2, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.75},
+                {"x": 1.75, "y": 3},
+                {"x": 2.75, "y": 3},
+                {"x": 3.75, "y": 3},
+                {"x": 4.75, "y": 3},
+                {"x": 5.75, "y": 3},
+                {"x": 6.75, "y": 3},
+                {"x": 7.75, "y": 3},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3},
+                {"x": 10.75, "y": 3},
+                {"x": 11.75, "y": 3},
+                {"x": 12.75, "y": 3, "w": 2.25},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+                {"x": 17, "y": 3},
+
+                {"x": 0, "y": 4, "w": 2.25},
+                {"x": 2.25, "y": 4},
+                {"x": 3.25, "y": 4},
+                {"x": 4.25, "y": 4},
+                {"x": 5.25, "y": 4},
+                {"x": 6.25, "y": 4},
+                {"x": 7.25, "y": 4},
+                {"x": 8.25, "y": 4},
+                {"x": 9.25, "y": 4},
+                {"x": 10.25, "y": 4},
+                {"x": 11.25, "y": 4},
+                {"x": 12.25, "y": 4, "w": 2.75},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+                {"x": 17, "y": 4},
+                {"x": 18, "y": 4, "h": 2}
+
+                {"x": 0, "y": 5, "w": 1.25},
+                {"x": 1.25, "y": 5, "w": 1.25},
+                {"x": 2.5, "y": 5, "w": 1.25},
+                {"x": 3.75, "y": 5, "w": 6.25},
+                {"x": 10, "y": 5, "w": 1.25},
+                {"x": 11.25, "y": 5, "w": 1.25},
+                {"x": 12.5, "y": 5, "w": 1.25},
+                {"x": 13.75, "y": 5, "w": 1.25},
+                {"x": 15, "y": 5, "w": 2},
+                {"x": 17, "y": 5},
+            ]
+        },
+        "LAYOUT_96_with60_split_num0": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15, "y": 0},
+                {"x": 16, "y": 0},
+                {"x": 17, "y": 0},
+                {"x": 18, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+                {"x": 12, "y": 1},
+                {"x": 13, "y": 1, "w": 2},
+                {"x": 15, "y": 1},
+                {"x": 16, "y": 1},
+                {"x": 17, "y": 1},
+                {"x": 18, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.5},
+                {"x": 1.5, "y": 2},
+                {"x": 2.5, "y": 2},
+                {"x": 3.5, "y": 2},
+                {"x": 4.5, "y": 2},
+                {"x": 5.5, "y": 2},
+                {"x": 6.5, "y": 2},
+                {"x": 7.5, "y": 2},
+                {"x": 8.5, "y": 2},
+                {"x": 9.5, "y": 2},
+                {"x": 10.5, "y": 2},
+                {"x": 11.5, "y": 2},
+                {"x": 12.5, "y": 2},
+                {"x": 13.5, "y": 2, "w": 1.5},
+                {"x": 15, "y": 2},
+                {"x": 16, "y": 2},
+                {"x": 17, "y": 2},
+                {"x": 18, "y": 2, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.75},
+                {"x": 1.75, "y": 3},
+                {"x": 2.75, "y": 3},
+                {"x": 3.75, "y": 3},
+                {"x": 4.75, "y": 3},
+                {"x": 5.75, "y": 3},
+                {"x": 6.75, "y": 3},
+                {"x": 7.75, "y": 3},
+                {"x": 8.75, "y": 3},
+                {"x": 9.75, "y": 3},
+                {"x": 10.75, "y": 3},
+                {"x": 11.75, "y": 3},
+                {"x": 12.75, "y": 3, "w": 2.25},
+                {"x": 15, "y": 3},
+                {"x": 16, "y": 3},
+                {"x": 17, "y": 3},
+
+                {"x": 0, "y": 4, "w": 2.25},
+                {"x": 2.25, "y": 4},
+                {"x": 3.25, "y": 4},
+                {"x": 4.25, "y": 4},
+                {"x": 5.25, "y": 4},
+                {"x": 6.25, "y": 4},
+                {"x": 7.25, "y": 4},
+                {"x": 8.25, "y": 4},
+                {"x": 9.25, "y": 4},
+                {"x": 10.25, "y": 4},
+                {"x": 11.25, "y": 4},
+                {"x": 12.25, "y": 4, "w": 2.75},
+                {"x": 15, "y": 4},
+                {"x": 16, "y": 4},
+                {"x": 17, "y": 4},
+                {"x": 18, "y": 4, "h": 2},
+
+                {"x": 0, "y": 5, "w": 1.25},
+                {"x": 1.25, "y": 5, "w": 1.25},
+                {"x": 2.5, "y": 5, "w": 1.25},
+                {"x": 3.75, "y": 5, "w": 6.25},
+                {"x": 10, "y": 5, "w": 1.25},
+                {"x": 11.25, "y": 5, "w": 1.25},
+                {"x": 12.5, "y": 5, "w": 1.25},
+                {"x": 13.75, "y": 5, "w": 1.25},
+                {"x": 15, "y": 5},
+                {"x": 16, "y": 5},
+                {"x": 17, "y": 5}
+            ]
         }
     }
 }
diff --git a/keyboards/melody96/keymaps/default/keymap.c b/keyboards/melody96/keymaps/default/keymap.c
index ba73cbce83..3ed6f3068b 100644
--- a/keyboards/melody96/keymaps/default/keymap.c
+++ b/keyboards/melody96/keymaps/default/keymap.c
@@ -1,74 +1,20 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-  /* Layer 0, default layer
-____________________________________________________________________________________________________________________________________________________________________________
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-| ESC*   |   F1   |   F2   |   F3   |   F4   |   F5   |   F6   |   F7   |   F8   |   F9   |  F10   |  F11   |  F12   | P SCN  |  HOME  |   END  |  P UP  | P DOWN |  DEL   |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        | BACK   |  NUM   |        |        |        |
-|  ~`    |   1    |   2    |   3    |   4    |   5    |   6    |   7    |   8    |   9    |   0    |  _ -   | =  +   |   \    | SPACE  |  LOCK  |   /    |  *     |   -    |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|            |        |        |        |        |        |        |        |        |        |        |  [     |   ]    |             |        |        |        |        |
-|    TAB     |   Q    |   W    |   E    |   R    |   T    |   Y    |   U    |   I    |   O    |   P    |  {     |   }    |  |   \      |   7    |   8    |   9    |   -    |
-|____________|________|________|________|________|________|________|________|________|________|________|________|________|_____________|________|________|________|________|
-|              |        |        |        |        |        |        |        |        |        |   ;    |   '    |                    |        |        |        |        |
-|   CAPS LOCK  |   A    |   S    |   D    |   F    |   G    |   H    |   J    |   K    |   L    |   :    |   "    |       ENTER        |   4    |   5    |   6    |   +    |
-|______________|________|________|________|________|________|________|________|________|________|________|________|____________________|________|________|________|________|
-|         |        |        |        |        |        |        |        |        |   ,    |    .   |   /    |                |        |        |        |        |        |
-|  SHIFT  |  NUBS  |   Z    |   X    |   C    |   V    |   B    |   N    |   M    |   <    |    >   |   ?    |       SHIFT    |   UP   |   1    |   2    |   3    | ENTER  |
-|_________|________|________|________|________|________|________|________|________|________|________|________|________________|________|________|________|________|________|
-|          |          |          |                                                        |        |   MO   |   MO   |        |        |        |        |        |        |
-| CTRL     |   LGUI   | L ALT    |                      SPACE                             | R ALT  |  _FN   |  _FN   |  LEFT  |  DOWN  | RIGHT  |   0    |   .    | ENTER  |
-|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
-*/
-
-
-
-	LAYOUT(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
-    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_P7,   KC_P8,   KC_P9,   KC_PMNS,
-    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_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   MO(1),   KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
-
-
-
-  /* Layer 1, function layer
-____________________________________________________________________________________________________________________________________________________________________________
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |  VOL   |  VOL   |        |        |        |
-| RESET  |        |        |        |        |        |        |        |        |        |        |        |        | MUTE   |  DOWN  |   UP   |        |        |        |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-|        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
-|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|________|
-|            |  RGB   |        |  RGB   |  HUE   |  HUE   | SATUR. | SATUR. | VALUE  | VALUE  |        |        |        |             |        |        |        |        |
-|            | TOGGLE |        |  MODE  |INCREASE| DCRSE  |INCREASE| DCRSE  |INCREASE| DCRSE  |        |        |        |             |        |        |        |        |
-|____________|________|________|________|________|________|________|________|________|________|________|________|________|_____________|________|________|________|________|
-| BACKLIGHT    |        |        |        |        |        |        |        |        |        |        |        |                    |        |        |        |        |
-| TOGGLE       |        |        |        |        |        |        |        |        |        |        |        |                    |        |        |        |        |
-|______________|________|________|________|________|________|________|________|________|________|________|________|____________________|________|________|________|________|
-|         |        |        |        |BACKLHT |BACKLHT |BACKLHT |        |        |        |        |        |                |        |        |        |        |        |
-|         |        |        |        | DCRSE  |TOGGLE  |INCREASE|        |        |        |        |        |                |        |        |        |        |        |
-|_________|________|________|________|________|________|________|________|________|________|________|________|________________|________|________|________|________|________|
-|          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
-|          |          |          |                                                        |        |        |        |        |        |        |        |        |        |
-|__________|__________|__________|________________________________________________________|________|________|________|________|________|________|________|________|________|
-BL_TOGG, BL_DEC, BL_INC changes the in-switch LEDs
-*/
-
-
-	LAYOUT(
-    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
-    BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
-    _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______),
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   MO(1),   KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT_all(
+        RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
+        BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
diff --git a/keyboards/melody96/keymaps/default_std60_split_num0/keymap.c b/keyboards/melody96/keymaps/default_96_with60_split_num0/keymap.c
similarity index 82%
rename from keyboards/melody96/keymaps/default_std60_split_num0/keymap.c
rename to keyboards/melody96/keymaps/default_96_with60_split_num0/keymap.c
index 25881d3f80..5dc26b150d 100644
--- a/keyboards/melody96/keymaps/default_std60_split_num0/keymap.c
+++ b/keyboards/melody96/keymaps/default_96_with60_split_num0/keymap.c
@@ -1,40 +1,36 @@
 #include QMK_KEYBOARD_H
 
-// Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
     KC_P00 = SAFE_RANGE
 };
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_std60_split_num0(
+    [0] = LAYOUT_96_with60_split_num0(
         KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
-        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_P7,   KC_P8,   KC_P9,
-        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
-        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_P1,   KC_P2,   KC_P3,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),            KC_APP,  KC_RCTL, KC_P0,   KC_P00,  KC_PDOT, KC_PENT
+        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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        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_P4,   KC_P5,   KC_P6,
+        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_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),            KC_APP,  KC_RCTL, KC_P0,   KC_P00,  KC_PDOT
     ),
-
-    [0] = LAYOUT_std60_split_num0(
+    [1] = LAYOUT_96_with60_split_num0(
         RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-        _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,          _______, _______, _______, _______,
-        BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
-        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
-        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______, _______
-    ),
-
+        _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,          _______, _______, _______, _______, _______,
+        BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______, _______, _______
+    )
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         case KC_P00:
             if (record->event.pressed) {
-                SEND_STRING("00");
+                tap_code(KC_P0);
+                tap_code(KC_P0);
             }
-            break;
+            return false;
     }
     return true;
 }
diff --git a/keyboards/melody96/keymaps/default_std60_split_num0/readme.md b/keyboards/melody96/keymaps/default_std60_split_num0/readme.md
deleted file mode 100644
index d20a179aa9..0000000000
--- a/keyboards/melody96/keymaps/default_std60_split_num0/readme.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# default_std60_split_num0
-
-A modified default keymap for use with the LAYOUT_std60_split_num0 macro.
-
-## Base Layer
-
-```
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-│Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Prt│Hm │End│PUp│PDn│Del│
-├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┤
-│` ~│1 !│2 @│3 #│4 $│5 %│6 ^│7 &│8 *│9 (│0 )│- _│= +│ Bksp  │NLk│ / │ * │ - │
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┼───┼───┼───┤
-│ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │[ {│] }│ \ | │7  │8  │9  │ + │
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤   │
-│CapsLk│ A │ S │ D │ F │ G │ H │ J │ K │ L │; :│' "│ Enter  │4  │5  │6  │   │
-├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┼───┼───┼───┼───┤
-│ Shift  │ Z │ X │ C │ V │ B │ N │ M │, <│. >│/ ?│  Shift   │1  │2  │3  │Ent│
-├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┼───┼───┼───┤   │
-│Ctrl│GUI │Alt │Space                   │Alt │Fn  │Menu│Ctrl│0  │00 │ . │   │
-└────┴────┴────┴────────────────────────┴────┴────┴────┴────┴───┴───┴───┴───┘
-```
-
-## Function Layer
-
-```
-┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
-│RST│   │   │   │   │   │   │   │   │   │   │   │   │Mut│VDn│VUp│   │   │   │
-├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┤
-│   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │   │   │   │
-├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┼───┼───┼───┤
-│     │RTg│   │RMd│RH+│RH-│RS+│RS-│RV+│RV-│   │   │   │     │   │   │   │   │
-├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤   │
-│BLTogg│   │   │   │   │   │   │   │   │   │   │   │        │   │   │   │   │
-├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┼───┼───┼───┼───┤
-│        │   │   │BL-│BTg│BL+│   │   │   │   │   │          │   │   │   │   │
-├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┼───┼───┼───┤   │
-│    │    │    │                        │    │    │    │    │   │   │   │   │
-└────┴────┴────┴────────────────────────┴────┴────┴────┴────┴───┴───┴───┴───┘
-```
diff --git a/keyboards/melody96/keymaps/via/keymap.c b/keyboards/melody96/keymaps/via/keymap.c
index 24d7d2d8ad..c02fa785a8 100644
--- a/keyboards/melody96/keymaps/via/keymap.c
+++ b/keyboards/melody96/keymaps/via/keymap.c
@@ -1,36 +1,36 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-	[0] = LAYOUT(
-    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
-    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_P7,   KC_P8,   KC_P9,   KC_PMNS,
-    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_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   MO(1),   KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
-
-	[1] = LAYOUT(
-    RESET,   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_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, RGB_TOG, KC_TRNS, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[2] = LAYOUT(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-	[3] = LAYOUT(
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_DEL,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   MO(1),   KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT_all(
+        RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,          _______, _______, _______, _______,
+        BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+        _______, _______, _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
 };
diff --git a/keyboards/melody96/keymaps/via/readme.md b/keyboards/melody96/keymaps/via/readme.md
deleted file mode 100644
index 9db51187a4..0000000000
--- a/keyboards/melody96/keymaps/via/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# The via keymap for YMDK Melody 96
-
-This folder contains the [VIA](https://caniusevia.com/) configuration for the YMDK Melody 96
-
-Maintained by: [vlee489](https://github.com/vlee489)
diff --git a/keyboards/melody96/keymaps/via/rules.mk b/keyboards/melody96/keymaps/via/rules.mk
index 6d6d45bac8..36b7ba9cbc 100644
--- a/keyboards/melody96/keymaps/via/rules.mk
+++ b/keyboards/melody96/keymaps/via/rules.mk
@@ -1,2 +1,2 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes # reduce firmware size
+LTO_ENABLE = yes
diff --git a/keyboards/melody96/melody96.h b/keyboards/melody96/melody96.h
index 37a6a85b09..3d3bc6070c 100644
--- a/keyboards/melody96/melody96.h
+++ b/keyboards/melody96/melody96.h
@@ -2,100 +2,232 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
-  K050, K051, K052, K053, K054, K055, K056, K057, K058, K118, K117, K115, K114, K113, K116, K112, K111, K110, K063, \
-  K040, K041, K042, K043, K044, K045, K046, K047, K048, K108, K107, K105, K104, K103, K106, K102, K101, K100, K064, \
-  K030, K031, K032, K033, K034, K035, K036, K037, K038, K098, K097, K095, K094, K084,       K096, K092, K091, K090, \
-  K020, K021, K022, K023, K024, K025, K026, K027, K028, K088, K087, K085, K093,             K086, K082, K081, K080, \
-  K010, K011, K012, K013, K014, K015, K016, K017, K018, K078, K077, K075, K074,       K073, K076, K072, K071, K070, \
-  K000, K001, K002,                   K006,                   K008, K007, K005, K004, K003, K066, K062, K061, K060  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
-	{ K060,  K061,  K062,  K063,  K064,  KC_NO, K066,  KC_NO, KC_NO }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077,  K078 }, \
-	{ K080,  K081,  K082,  KC_NO, K084,  K085,  K086,  K087,  K088 }, \
-	{ K090,  K091,  K092,  K093,  K094,  K095,  K096,  K097,  K098 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108 }, \
-	{ K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118 }  \
-}
+#define XXX KC_NO
 
 /*
- * The layout macro for the layout of hotswap keyboards, with illustrative grid of a typical
- * assignment.
- * ,---------------------------------------------------------------------------
- * |ESC|F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|PSC|HOM|END|PGU|PGD|DEL|
- * ,--------------------------------------------------------------------------|
- * | ` |1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | BKSPC |NLK| / | * | - |
- * |--------------------------------------------------------------------------|
- * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \ | 7 | 8 | 9 |   |
- * |----------------------------------------------------------------------| + |
- * | CTRL  | A | S | D | F | G | H | J | K | L | ; | ' |  RET | 4 | 5 | 6 |   |
- * |----------------------------------------------------------------------|---|
- * | LSHIFT | Z | X | C | V | B | N | M | , | . | / |RSHFT| ↑ | 1 | 2 | 3 |   |
- * |----------------------------------------------------------------------|ENT|
- * |LCTL|LWIN|LALT|         SPACE         |CTL|ALT|FN | ← | ↓ | → | 0 | . |   |
- * `---------------------------------------------------------------------------
+ * ┌────┬───┐                                          ┌───┬───┐
+ * │10  │11 │                                          │A3 │A6 │
+ * └────┴───┘                                          └───┴───┘
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │50 │51 │52 │53 │54 │55 │56 │57 │58 │B8 │B7 │B5 │B4 │B3 │B6 │B2 │B1 │B0 │63 │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┤
+ * │40 │41 │42 │43 │44 │45 │46 │47 │48 │A8 │A7 │A5 │A4 │A6     │A2 │A1 │A0 │64 │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┼───┼───┼───┤    ┌─────┐ ┌───┐
+ * │30   │31 │32 │33 │34 │35 │36 │37 │38 │98 │97 │95 │94 │93   │96 │92 │91 │80 │    │93   │ │90 │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤   │ ┌──┴┐    │ ├───┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │88 │87 │85 │84      │86 │82 │81 │   │ │84 │    │ │80 │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┼───┼───┼───┤ ├───┼────┘ └───┘
+ * │10      │12 │13 │14 │15 │16 │17 │18 │78 │77 │75 │74    │73 │76 │72 │71 │60 │ │70 │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┴───┼───┤   │ ├───┤
+ * │00  │01  │02  │06                      │08 │07 │05 │04 │03 │62     │61 │   │ │60 │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───────┴───┴───┘ └───┘
+ *                                                  ┌──────────┬───┬───┐
+ *                                                  │74        │66 │62 │
+ *                                                  └──────────┴───┴───┘
+ * ┌────┬────┬────┬────────────────────────┬─────┬─────┬───┬───┐
+ * │00  │01  │02  │06                      │08   │05   │04 │03 │
+ * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┘
+ * ┌────┬────┬────┬─────────────────────────────┬────┬────┬────┐
+ * │00  │01  │02  │06                      │08  │07  │04  │03  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ * ┌─────┬─────┬───────────────────────────┬─────┬─────┬───┬───┐
+ * │00   │01   │06                         │08   │05   │04 │03 │
+ * └─────┴─────┴───────────────────────────┴─────┴─────┴───┴───┘
+ * ┌─────┬─────┬───────────────────────────┬────┬────┬────┬────┐
+ * │00   │01   │06                         │08  │07  │04  │03  │
+ * └─────┴─────┴───────────────────────────┴────┴────┴────┴────┘
+ * ┌─────┬─────┬───────────────────────────┬───┬───┬───┬───┬───┐
+ * │00   │01   │06                         │08 │07 │05 │04 │03 │
+ * └─────┴─────┴───────────────────────────┴───┴───┴───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ * │00   │01 │02   │06                         │07   │04 │03   │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ * ┌─────┬───┬─────┬───────────────────────────┬───┬───┬───┬───┐
+ * │00   │01 │02   │06                         │07 │05 │04 │03 │
+ * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────┬─────┬─────┬───┬───┐
+ * │00   │01 │02   │06                     │08   │05   │04 │03 │
+ * └─────┴───┴─────┴───────────────────────┴─────┴─────┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────┬───┬───┬───┬───┬───┐
+ * │00   │01 │02   │06                     │08 │07 │05 │04 │03 │
+ * └─────┴───┴─────┴───────────────────────┴───┴───┴───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────┬────┬────┬────┬────┐
+ * │00   │01 │02   │06                     │08  │07  │04  │03  │
+ * └─────┴───┴─────┴───────────────────────┴────┴────┴────┴────┘
  */
-#define LAYOUT_hotswap( \
-  K050, K051, K052, K053, K054, K055, K056, K057, K058, K118, K117, K115, K114, K113, K116, K112, K111, K110, K063, \
-  K040, K041, K042, K043, K044, K045, K046, K047, K048, K108, K107, K105, K104,       K106, K102, K101, K100, K064, \
-  K030, K031, K032, K033, K034, K035, K036, K037, K038, K098, K097, K095, K094,       K093, K096, K092, K091,       \
-  K020, K021, K022, K023, K024, K025, K026, K027, K028, K088, K087, K085,             K084, K086, K082, K081, K080, \
-  K010,       K012, K013, K014, K015, K016, K017, K018, K078, K077, K075, K074,       K073, K076, K072, K071,       \
-  K000, K001, K002,                   K006,                   K008, K007, K005, K004, K003, K066, K062, K061, K060  \
+
+#define LAYOUT_all( \
+    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA3, kA6, kA2, kA1, kA0, k64, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94, k93, k96, k92, k91, k90, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85,      k84, k86, k82, k81, k80, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k78, k77, k75, k74, k73, k76, k72, k71, k70, \
+    k00, k01, k02,                k06,           k08, k07, k05, k04, k03, k66, k62, k61, k60 \
 ) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008 }, \
-	{ K010,  KC_NO, K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
-	{ K060,  K061,  K062,  K063,  K064,  KC_NO, K066,  KC_NO, KC_NO }, \
-	{ KC_NO, K071,  K072,  K073,  K074,  K075,  K076,  K077,  K078 }, \
-	{ K080,  K081,  K082,  KC_NO, K084,  K085,  K086,  K087,  K088 }, \
-	{ KC_NO, K091,  K092,  K093,  K094,  K095,  K096,  K097,  K098 }, \
-	{ K100,  K101,  K102,  KC_NO, K104,  K105,  K106,  K107,  K108 }, \
-	{ K110,  K111,  K112,  K113,  K114,  K115,  K116,  K117,  K118 }  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
+    { k60, k61, k62, k63, k64, XXX, k66, XXX, XXX }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, k78 }, \
+    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
+    { k90, k91, k92, k93, k94, k95, k96, k97, k98 }, \
+    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8 }, \
+    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
 }
 
-/* LAYOUT_std60_split_num0
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│Prt│Pau│Hm │End│PUp│PDn│
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┼───┼───┼───┤
- * │` ~│1 !│2 @│3 #│4 $│5 %│6 ^│7 &│8 *│9 (│0 )│- _│= +│ Bksp  │NLk│ / │ * │ - │
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┼───┼───┼───┤
- * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │[ {│] }│ \ | │7  │8  │9  │ + │
- * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┼───┼───┤   │
- * │CapsLk│ A │ S │ D │ F │ G │ H │ J │ K │ L │; :│' "│ Enter  │4  │5  │6  │   │
- * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┼───┼───┼───┼───┤
- * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │, <│. >│/ ?│  Shift   │1  │2  │3  │Ent│
- * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┼───┼───┼───┤   │
- * │Ctrl│GUI │Alt │Space                   │Alt │GUI │Menu│Ctrl│0  │00 │ . │   │
- * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴───┴───┴───┴───┘
- */
-#define LAYOUT_std60_split_num0( \
-  K50, K51, K52, K53, K54, K55, K56, K57, K58, KB8, KB7, KB5, KB4, KB3, KB6,  KB2, KB1, KB0, K63, \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,      KA6,  KA2, KA1, KA0, K64, \
-  K30,   K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K94,    K84,  K96, K92, K91,      \
-  K20,    K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85,        K93,  K86, K82, K81, K80, \
-  K10,      K12, K13, K14, K15, K16, K17, K18, K78, K77, K75,           K74,  K76, K72, K71,      \
-  K00, K01, K02,                  K06,                   K08, K07, K04, K03,  K66, K62, K61, K60  \
+#define LAYOUT_96_ansi( \
+    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA6, kA2, kA1, kA0, k64, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94, k93, k96, k92, k91, k80, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85,      k84, k86, k82, k81, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k78, k77, k75, k74, k73, k76, k72, k71, k60, \
+    k00, k01, k02,                k06,           k08, k07, k05, k04, k03, k66, k62, k61 \
 ) { \
-	{ K00,    K01,    K02,  K03,    K04,  KC_NO,  K06,  K07,    K08   }, \
-	{ K10,    KC_NO,  K12,  K13,    K14,  K15,    K16,  K17,    K18   }, \
-	{ K20,    K21,    K22,  K23,    K24,  K25,    K26,  K27,    K28   }, \
-	{ K30,    K31,    K32,  K33,    K34,  K35,    K36,  K37,    K38   }, \
-	{ K40,    K41,    K42,  K43,    K44,  K45,    K46,  K47,    K48   }, \
-	{ K50,    K51,    K52,  K53,    K54,  K55,    K56,  K57,    K58   }, \
-	{ K60,    K61,    K62,  K63,    K64,  KC_NO,  K66,  KC_NO,  KC_NO }, \
-	{ KC_NO,  K71,    K72,  KC_NO,  K74,  K75,    K76,  K77,    K78   }, \
-	{ K80,    K81,    K82,  KC_NO,  K84,  K85,    K86,  K87,    K88   }, \
-	{ KC_NO,  K91,    K92,  K93,    K94,  K95,    K96,  K97,    K98   }, \
-	{ KA0,    KA1,    KA2,  KC_NO,  KA4,  KA5,    KA6,  KA7,    KA8   }, \
-	{ KB0,    KB1,    KB2,  KB3,    KB4,  KB5,    KB6,  KB7,    KB8   }  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
+    { k60, k61, k62, k63, k64, XXX, k66, XXX, XXX }, \
+    { XXX, k71, k72, k73, k74, k75, k76, k77, k78 }, \
+    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
+    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
+    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, kA8 }, \
+    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
+}
+
+#define LAYOUT_96_ansi_splitbs( \
+    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA3, kA6, kA2, kA1, kA0, k64, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94, k93, k96, k92, k91, k80, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85,      k84, k86, k82, k81, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k78, k77, k75, k74, k73, k76, k72, k71, k60, \
+    k00, k01, k02,                k06,           k08, k07, k05, k04, k03, k66, k62, k61 \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
+    { k60, k61, k62, k63, k64, XXX, k66, XXX, XXX }, \
+    { XXX, k71, k72, k73, k74, k75, k76, k77, k78 }, \
+    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
+    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
+    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, kA8 }, \
+    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
+}
+
+#define LAYOUT_96_iso( \
+    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA6, kA2, kA1, kA0, k64, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94,      k96, k92, k91, k80, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85, k84, k93, k86, k82, k81, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k78, k77, k75, k74, k73, k76, k72, k71, k60, \
+    k00, k01, k02,                k06,           k08, k07, k05, k04, k03, k66, k62, k61 \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
+    { k60, k61, k62, k63, k64, XXX, k66, XXX, XXX }, \
+    { XXX, k71, k72, k73, k74, k75, k76, k77, k78 }, \
+    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
+    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
+    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, kA8 }, \
+    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
+}
+
+#define LAYOUT_96_iso_splitbs( \
+    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA3, kA6, kA2, kA1, kA0, k64, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94,      k96, k92, k91, k80, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85, k84, k93, k86, k82, k81, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k78, k77, k75, k74, k73, k76, k72, k71, k60, \
+    k00, k01, k02,                k06,           k08, k07, k05, k04, k03, k66, k62, k61 \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
+    { k60, k61, k62, k63, k64, XXX, k66, XXX, XXX }, \
+    { XXX, k71, k72, k73, k74, k75, k76, k77, k78 }, \
+    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
+    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
+    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8 }, \
+    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
+}
+
+#define LAYOUT_96_with60( \
+    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA6, kA2, kA1, kA0, k64, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94, k84, k96, k92, k91, k80, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85,      k93, k86, k82, k81, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k78, k77, k75,      k74, k76, k72, k71, k60,\
+    k00, k01, k02,                k06,                k08, k07, k04, k03, k62,      k61 \
+) { \
+    { k00, k01, k02, k03, k04, XXX, k06, k07, k08 }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
+    { k60, k61, k62, k63, k64, XXX, XXX, XXX, XXX }, \
+    { XXX, k71, k72, XXX, k74, k75, k76, k77, k78 }, \
+    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
+    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
+    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, kA8 }, \
+    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
+}
+
+#define LAYOUT_96_with60_splitbs( \
+    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA3, kA6, kA2, kA1, kA0, k64, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94, k84, k96, k92, k91, k80, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85,      k93, k86, k82, k81, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k78, k77, k75,      k74, k76, k72, k71, k60, \
+    k00, k01, k02,                k06,                k08, k07, k04, k03, k62,      k61 \
+) { \
+    { k00, k01, k02, k03, k04, XXX, k06, k07, k08 }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
+    { k60, k61, k62, k63, k64, XXX, XXX, XXX, XXX }, \
+    { XXX, k71, k72, XXX, k74, k75, k76, k77, k78 }, \
+    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
+    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
+    { kA0, kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8 }, \
+    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
+}
+
+#define LAYOUT_96_with60_split_num0( \
+    k50, k51, k52, k53, k54, k55, k56, k57, k58, kB8, kB7, kB5, kB4, kB3, kB6, kB2, kB1, kB0, k63, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, kA8, kA7, kA5, kA4, kA6, kA2, kA1, kA0, k64, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k98, k97, k95, k94, k84, k96, k92, k91, k80,\
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85,      k93, k86, k82, k81, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k78, k77, k75,      k74, k76, k72, k71, k60, \
+    k00, k01, k02,                k06,                k08, k07, k04, k03, k66, k62, k61 \
+) { \
+    { k00, k01, k02, k03, k04, XXX, k06, k07, k08 }, \
+    { k10, XXX, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
+    { k60, k61, k62, k63, k64, XXX, k66, XXX, XXX }, \
+    { XXX, k71, k72, XXX, k74, k75, k76, k77, k78 }, \
+    { k80, k81, k82, XXX, k84, k85, k86, k87, k88 }, \
+    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
+    { kA0, kA1, kA2, XXX, kA4, kA5, kA6, kA7, kA8 }, \
+    { kB0, kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8 } \
 }
diff --git a/keyboards/melody96/readme.md b/keyboards/melody96/readme.md
index 2d472b3276..16338e9ed3 100644
--- a/keyboards/melody96/readme.md
+++ b/keyboards/melody96/readme.md
@@ -1,15 +1,19 @@
 # YMDK Melody96
 
-![melody96](https://i.imgur.com/9o0a6XF.png)
+![melody96](https://i.imgur.com/9o0a6XFh.png)
 
-96-key Keyboard from YMDK. The PCB for this board is also commonly used in the NYM96. 
+96-key Keyboard from YMDK. The PCB for this board is also commonly used in the NYM96.
 
-Keyboard Maintainer: [superuser41](https://github.com/kaylanm)  
-Hardware Supported: melody96  
-Hardware Availability: [YMDK on Geekhack, group buy closed](https://geekhack.org/index.php?topic=93614.0),  [NYM96 on Massdrop](https://www.massdrop.com/buy/nym96-aluminum-mechanical-keyboard?mode=guest_open)  
+* Keyboard Maintainer: [superuser41](https://github.com/kaylanm)
+* Hardware Supported: melody96
+* Hardware Availability: [YMDK on Geekhack, group buy closed](https://geekhack.org/index.php?topic=93614.0),  [NYM96 on Massdrop](https://www.massdrop.com/buy/nym96-aluminum-mechanical-keyboard?mode=guest_open)
 
 Make example for this keyboard (after setting up your build environment):
 
     make melody96:default
 
+Flashing example for this keyboard:
+
+    make melody96:default:flash
+
 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).
diff --git a/keyboards/melody96/rules.mk b/keyboards/melody96/rules.mk
index 9ccce6abf4..b27013f863 100644
--- a/keyboards/melody96/rules.mk
+++ b/keyboards/melody96/rules.mk
@@ -8,11 +8,11 @@ BOOTLOADER = atmel-dfu
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-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
+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
 NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From d412854e37a53d35e567af3dc5c452d64c570fdd Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 4 Mar 2022 14:56:59 +1100
Subject: [PATCH 719/867] analog.[ch]: remove unnecessary includes (#16471)

---
 drivers/sensors/analog_joystick.c  | 2 ++
 platforms/avr/drivers/analog.c     | 3 ---
 platforms/avr/drivers/analog.h     | 2 +-
 platforms/chibios/drivers/analog.c | 1 -
 platforms/chibios/drivers/analog.h | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/sensors/analog_joystick.c b/drivers/sensors/analog_joystick.c
index 95f8cff23a..12256a8e7a 100644
--- a/drivers/sensors/analog_joystick.c
+++ b/drivers/sensors/analog_joystick.c
@@ -18,6 +18,8 @@
 #include "analog.h"
 #include "gpio.h"
 #include "wait.h"
+#include "timer.h"
+#include <stdlib.h>
 
 // Set Parameters
 uint16_t minAxisValue = ANALOG_JOYSTICK_AXIS_MIN;
diff --git a/platforms/avr/drivers/analog.c b/platforms/avr/drivers/analog.c
index ed4d563609..a68c6a371d 100644
--- a/platforms/avr/drivers/analog.c
+++ b/platforms/avr/drivers/analog.c
@@ -14,9 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <avr/io.h>
-#include <avr/pgmspace.h>
-#include <stdint.h>
 #include "analog.h"
 
 static uint8_t aref = ADC_REF_POWER;
diff --git a/platforms/avr/drivers/analog.h b/platforms/avr/drivers/analog.h
index fb13e106ff..214f1f01fb 100644
--- a/platforms/avr/drivers/analog.h
+++ b/platforms/avr/drivers/analog.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <stdint.h>
-#include "quantum.h"
+#include "gpio.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/platforms/chibios/drivers/analog.c b/platforms/chibios/drivers/analog.c
index 48a59fd290..a7b7ec76d7 100644
--- a/platforms/chibios/drivers/analog.c
+++ b/platforms/chibios/drivers/analog.c
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "analog.h"
 #include <ch.h>
 #include <hal.h>
diff --git a/platforms/chibios/drivers/analog.h b/platforms/chibios/drivers/analog.h
index 8a821719e3..67a7b466a5 100644
--- a/platforms/chibios/drivers/analog.h
+++ b/platforms/chibios/drivers/analog.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <stdint.h>
-#include "quantum.h"
+#include "gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

From 34ba7f1c18a6924f47947e76b32d7620411d1e7a Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 4 Mar 2022 15:43:55 +1100
Subject: [PATCH 720/867] Bug report template: require `qmk doctor` output
 (#16517)

---
 .github/ISSUE_TEMPLATE/bug_report.md | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 57b415f7b3..81561eaba6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -18,19 +18,18 @@ assignees: ''
 
 ## System Information
 
- - Keyboard:  
-   - Revision (if applicable):  
- - Operating system:
- - AVR GCC version: 
-<!-- Run `avr-gcc --version` to find this out. -->
- - ARM GCC version: 
-<!-- Run `arm-none-eabi-gcc --version` to find this out. -->
- - QMK Firmware version:
-<!-- Run `git describe --abbrev=0 --tags` to find this out. -->
- - Any keyboard related software installed? 
-   - [ ] AutoHotKey
-   - [ ] Karabiner
-   - [ ] Other:
+**Keyboard:** 
+**Revision (if applicable):** 
+**Operating system:** 
+**`qmk doctor` output:** 
+```
+(Paste output here)
+```
+
+**Any keyboard related software installed?** 
+ - [ ] AutoHotKey (Windows)
+ - [ ] Karabiner (macOS)
+ - [ ] Other:
 
 ## Additional Context
 

From c0185116d780cee4bf61c70be0221be2e8ce5962 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 4 Mar 2022 17:06:15 +0000
Subject: [PATCH 721/867] More validation of declared LAYOUT macro names
 (#16520)

---
 data/schemas/definitions.jsonschema | 28 +++++++++++++++++++++++++++-
 data/schemas/keyboard.jsonschema    |  1 +
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/data/schemas/definitions.jsonschema b/data/schemas/definitions.jsonschema
index 9fd503a108..46aba52cbd 100644
--- a/data/schemas/definitions.jsonschema
+++ b/data/schemas/definitions.jsonschema
@@ -33,7 +33,33 @@
         "oneOf": [
             {
                 "type": "string",
-                "enum": ["LAYOUT", "LAYOUT_planck_1x2uC"]
+                "enum": [
+                    "LAYOUT",
+                    "LAYOUT_1x2uC",
+                    "LAYOUT_1x2uL",
+                    "LAYOUT_1x2uR",
+                    "LAYOUT_2x2uC",
+                    "LAYOUT_2x3uC",
+                    "LAYOUT_625uC",
+                    "LAYOUT_ANSI_DEFAULT",
+                    "LAYOUT_JP",
+                    "LAYOUT_ortho_3x12_1x2uC",
+                    "LAYOUT_ortho_4x12_1x2uC",
+                    "LAYOUT_ortho_4x12_1x2uL",
+                    "LAYOUT_ortho_4x12_1x2uR",
+                    "LAYOUT_ortho_5x12_1x2uC",
+                    "LAYOUT_ortho_5x12_2x2uC",
+                    "LAYOUT_ortho_5x14_1x2uC",
+                    "LAYOUT_ortho_5x14_1x2uL",
+                    "LAYOUT_ortho_5x14_1x2uR",
+                    "LAYOUT_planck_1x2uC",
+                    "LAYOUT_planck_1x2uL",
+                    "LAYOUT_planck_1x2uR",
+                    "LAYOUT_preonic_1x2uC",
+                    "LAYOUT_preonic_1x2uL",
+                    "LAYOUT_preonic_1x2uR",
+                    "LAYOUT_reviung34_2uL"
+                ]
             },
             {
                 "type": "string",
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index fc0844a086..a8b3d06933 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -109,6 +109,7 @@
         },
         "layouts": {
             "type": "object",
+            "propertyNames": {"$ref": "qmk.definitions.v1#/layout_macro"},
             "additionalProperties": {
                 "type": "object",
                 "additionalProperties": false,

From 0be73456408c0509a69ef0893e6e5674ba53ae3e Mon Sep 17 00:00:00 2001
From: Kyle McCreery <mccreery.kyle@gmail.com>
Date: Fri, 4 Mar 2022 13:10:32 -0500
Subject: [PATCH 722/867] [Keyboard] BDE Rev2 (#15877)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/mechwild/bde/bde.c                  |  17 ++
 keyboards/mechwild/bde/bde.h                  |  26 ++
 keyboards/mechwild/bde/config.h               |  20 ++
 keyboards/mechwild/bde/{righty => }/info.json |   8 +-
 .../mechwild/bde/keymaps/default/keymap.c     |  59 +++++
 .../lefty_default}/config.h                   |   0
 .../lefty_default}/keymap.c                   |   0
 .../fancy => keymaps/lefty_fancy}/config.h    |   0
 .../fancy => keymaps/lefty_fancy}/keymap.c    |   0
 .../fancy => keymaps/lefty_fancy}/rules.mk    |   0
 .../via => keymaps/lefty_via}/config.h        |   0
 .../via => keymaps/lefty_via}/keymap.c        |   0
 .../via => keymaps/lefty_via}/rules.mk        |   0
 .../righty_default}/config.h                  |   0
 .../righty_default}/keymap.c                  |   0
 .../via => keymaps/righty_via}/config.h       |   0
 .../via => keymaps/righty_via}/keymap.c       |   0
 .../via => keymaps/righty_via}/rules.mk       |   0
 keyboards/mechwild/bde/keymaps/via/config.h   |  22 ++
 keyboards/mechwild/bde/keymaps/via/keymap.c   |  59 +++++
 keyboards/mechwild/bde/keymaps/via/rules.mk   |   3 +
 keyboards/mechwild/bde/lefty/info.json        |  14 -
 keyboards/mechwild/bde/lefty/lefty.c          |   3 +-
 keyboards/mechwild/bde/lib/rev2.c             | 244 ++++++++++++++++++
 keyboards/mechwild/bde/{lefty => }/readme.md  |   8 +-
 keyboards/mechwild/bde/rev2/config.h          |  74 ++++++
 keyboards/mechwild/bde/rev2/rev2.c            |  88 +++++++
 keyboards/mechwild/bde/rev2/rev2.h            |  31 +++
 keyboards/mechwild/bde/rev2/rules.mk          |   3 +
 keyboards/mechwild/bde/righty/readme.md       |  15 --
 keyboards/mechwild/bde/righty/righty.c        |   3 +-
 keyboards/mechwild/bde/righty/rules.mk        |  19 --
 keyboards/mechwild/bde/{lefty => }/rules.mk   |   1 +
 33 files changed, 657 insertions(+), 60 deletions(-)
 create mode 100644 keyboards/mechwild/bde/bde.c
 create mode 100644 keyboards/mechwild/bde/bde.h
 create mode 100644 keyboards/mechwild/bde/config.h
 rename keyboards/mechwild/bde/{righty => }/info.json (60%)
 create mode 100644 keyboards/mechwild/bde/keymaps/default/keymap.c
 rename keyboards/mechwild/bde/{lefty/keymaps/default => keymaps/lefty_default}/config.h (100%)
 rename keyboards/mechwild/bde/{lefty/keymaps/default => keymaps/lefty_default}/keymap.c (100%)
 rename keyboards/mechwild/bde/{lefty/keymaps/fancy => keymaps/lefty_fancy}/config.h (100%)
 rename keyboards/mechwild/bde/{lefty/keymaps/fancy => keymaps/lefty_fancy}/keymap.c (100%)
 rename keyboards/mechwild/bde/{lefty/keymaps/fancy => keymaps/lefty_fancy}/rules.mk (100%)
 rename keyboards/mechwild/bde/{lefty/keymaps/via => keymaps/lefty_via}/config.h (100%)
 rename keyboards/mechwild/bde/{lefty/keymaps/via => keymaps/lefty_via}/keymap.c (100%)
 rename keyboards/mechwild/bde/{lefty/keymaps/via => keymaps/lefty_via}/rules.mk (100%)
 rename keyboards/mechwild/bde/{righty/keymaps/default => keymaps/righty_default}/config.h (100%)
 rename keyboards/mechwild/bde/{righty/keymaps/default => keymaps/righty_default}/keymap.c (100%)
 rename keyboards/mechwild/bde/{righty/keymaps/via => keymaps/righty_via}/config.h (100%)
 rename keyboards/mechwild/bde/{righty/keymaps/via => keymaps/righty_via}/keymap.c (100%)
 rename keyboards/mechwild/bde/{righty/keymaps/via => keymaps/righty_via}/rules.mk (100%)
 create mode 100644 keyboards/mechwild/bde/keymaps/via/config.h
 create mode 100644 keyboards/mechwild/bde/keymaps/via/keymap.c
 create mode 100644 keyboards/mechwild/bde/keymaps/via/rules.mk
 delete mode 100644 keyboards/mechwild/bde/lefty/info.json
 create mode 100644 keyboards/mechwild/bde/lib/rev2.c
 rename keyboards/mechwild/bde/{lefty => }/readme.md (74%)
 create mode 100644 keyboards/mechwild/bde/rev2/config.h
 create mode 100644 keyboards/mechwild/bde/rev2/rev2.c
 create mode 100644 keyboards/mechwild/bde/rev2/rev2.h
 create mode 100644 keyboards/mechwild/bde/rev2/rules.mk
 delete mode 100644 keyboards/mechwild/bde/righty/readme.md
 delete mode 100644 keyboards/mechwild/bde/righty/rules.mk
 rename keyboards/mechwild/bde/{lefty => }/rules.mk (94%)

diff --git a/keyboards/mechwild/bde/bde.c b/keyboards/mechwild/bde/bde.c
new file mode 100644
index 0000000000..911d1c0434
--- /dev/null
+++ b/keyboards/mechwild/bde/bde.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 Kyle McCreery 
+ * 
+ * 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 "bde.h"
diff --git a/keyboards/mechwild/bde/bde.h b/keyboards/mechwild/bde/bde.h
new file mode 100644
index 0000000000..3d16bdb8db
--- /dev/null
+++ b/keyboards/mechwild/bde/bde.h
@@ -0,0 +1,26 @@
+/* Copyright 2022 Kyle McCreery 
+ * 
+ * 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"
+
+#ifdef KEYBOARD_mechwild_bde_rev2
+    #include "rev2.h"
+#elif KEYBOARD_mechwild_bde_lefty
+    #include "lefty.h"
+#elif KEYBOARD_mechwild_bde_righty
+    #include "righty.h"
+#endif
diff --git a/keyboards/mechwild/bde/config.h b/keyboards/mechwild/bde/config.h
new file mode 100644
index 0000000000..5130918c08
--- /dev/null
+++ b/keyboards/mechwild/bde/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 Kyle McCreery
+
+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"
\ No newline at end of file
diff --git a/keyboards/mechwild/bde/righty/info.json b/keyboards/mechwild/bde/info.json
similarity index 60%
rename from keyboards/mechwild/bde/righty/info.json
rename to keyboards/mechwild/bde/info.json
index 93b84e2872..f1aa8ea7f9 100644
--- a/keyboards/mechwild/bde/righty/info.json
+++ b/keyboards/mechwild/bde/info.json
@@ -1,13 +1,13 @@
 {
-    "keyboard_name": "MechWild BDE Righty",
+    "keyboard_name": "MechWild BDE Rev2",
     "url": "mechwild.com",
     "maintainer": "kylemccreery",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0},  {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0},   {"label":"0", "x":10, "y":0},            {"label":"7", "x":11, "y":0}, {"label":"8", "x":12, "y":0}, {"label":"9", "x":13, "y":0},
-                {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1},  {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":"ESC", "x":9, "y":1}, {"label":"Enter", "x":10, "y":1, "h":2}, {"label":"4", "x":11, "y":1}, {"label":"5", "x":12, "y":1}, {"label":"6", "x":13, "y":1},
-                {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"BS", "x":4, "y":2}, {"label":"", "x":5, "y":2},  {"label":"B", "x":6, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":"ENT", "x":9, "y":2},                                          {"label":"1", "x":11, "y":2}, {"label":"2", "x":12, "y":2}, {"label":"3", "x":13, "y":2}
+                {"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0},  {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0},   {"label":"7", "x":10, "y":0}, {"label":"8", "x":11, "y":0}, {"label":"9", "x":12, "y":0}, {"label":"Mute", "x":13, "y":0},            
+                {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1},  {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":"ESC", "x":9, "y":1}, {"label":"4", "x":10, "y":1}, {"label":"5", "x":11, "y":1}, {"label":"6", "x":12, "y":1}, {"label":"0", "x":13, "y":1,}, 
+                {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"BS", "x":4, "y":2}, {"label":"", "x":5, "y":2},  {"label":"B", "x":6, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":"ENT", "x":9, "y":2}, {"label":"1", "x":10, "y":2}, {"label":"2", "x":11, "y":2}, {"label":"3", "x":12, "y":2}, {"label":"EQL", "x":13, "y":2,}
             ]
         }
     }
diff --git a/keyboards/mechwild/bde/keymaps/default/keymap.c b/keyboards/mechwild/bde/keymaps/default/keymap.c
new file mode 100644
index 0000000000..63f5e51f35
--- /dev/null
+++ b/keyboards/mechwild/bde/keymaps/default/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2022 Kyle McCreery 
+ * 
+ * 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
+
+#define FN1_BSPC    LT(1, KC_BSPC)
+#define FN2_SPC     LT(2, KC_SPC)
+#define FN3_B       LT(3, KC_B)
+#define CTL_Z       CTL_T(KC_Z)
+#define ALT_X       ALT_T(KC_X)
+#define ALT_N       ALGR_T(KC_N)
+#define CTL_M       RCTL_T(KC_M)
+#define SFT_ENT     RSFT_T(KC_ENT)
+#define WIN_C		LGUI_T(KC_C)
+
+enum layer_names {
+  _BASE,
+  _FN1,
+  _FN2,
+  _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,    KC_P7,   KC_P8,   KC_P9,   KC_MUTE,       
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,     KC_K,    KC_L,    KC_ESC,  KC_P4,   KC_P5,   KC_P6,   KC_P0,
+    CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN1_BSPC, FN2_SPC, FN3_B,    ALT_N,   CTL_M,   SFT_ENT, KC_P1,   KC_P2,   KC_P3,   KC_MINS
+  ),                                                                                                     
+  [_FN1] = LAYOUT(                                                                                       
+    _______, _______, _______, RESET,   _______,  _______,  KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_7,    KC_8,    KC_9,    KC_NLCK,       
+    _______, _______, _______, _______, _______,  _______,  _______, KC_GRV,  KC_SCLN, KC_QUOT, KC_4,    KC_5,    KC_6,    KC_0, 
+    _______, _______, _______, _______, _______,  KC_TAB,   KC_LGUI, KC_COMM, KC_DOT,  KC_SLSH, KC_1,    KC_2,    KC_3,    KC_EQL
+  ),
+  [_FN2] = LAYOUT(
+    _______, _______, _______, _______, _______,  _______,  _______, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_ASTR, KC_LPRN, KC_CLCK,       
+    _______, _______, _______, _______, _______,  _______,  _______, KC_TILD, KC_COLN, KC_DQUO, KC_DLR,  KC_PERC, KC_CIRC, KC_RPRN, 
+    _______, _______, _______, _______, KC_DEL,   _______,  _______, KC_LABK, KC_RABK, KC_QUES, KC_EXLM, KC_AT,   KC_HASH, KC_PLUS
+  ),                                                        
+  [_FN3] = LAYOUT(                                          
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,       
+    _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______,  
+    _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______
+  )
+
+};
diff --git a/keyboards/mechwild/bde/lefty/keymaps/default/config.h b/keyboards/mechwild/bde/keymaps/lefty_default/config.h
similarity index 100%
rename from keyboards/mechwild/bde/lefty/keymaps/default/config.h
rename to keyboards/mechwild/bde/keymaps/lefty_default/config.h
diff --git a/keyboards/mechwild/bde/lefty/keymaps/default/keymap.c b/keyboards/mechwild/bde/keymaps/lefty_default/keymap.c
similarity index 100%
rename from keyboards/mechwild/bde/lefty/keymaps/default/keymap.c
rename to keyboards/mechwild/bde/keymaps/lefty_default/keymap.c
diff --git a/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h b/keyboards/mechwild/bde/keymaps/lefty_fancy/config.h
similarity index 100%
rename from keyboards/mechwild/bde/lefty/keymaps/fancy/config.h
rename to keyboards/mechwild/bde/keymaps/lefty_fancy/config.h
diff --git a/keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c b/keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c
similarity index 100%
rename from keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c
rename to keyboards/mechwild/bde/keymaps/lefty_fancy/keymap.c
diff --git a/keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk b/keyboards/mechwild/bde/keymaps/lefty_fancy/rules.mk
similarity index 100%
rename from keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk
rename to keyboards/mechwild/bde/keymaps/lefty_fancy/rules.mk
diff --git a/keyboards/mechwild/bde/lefty/keymaps/via/config.h b/keyboards/mechwild/bde/keymaps/lefty_via/config.h
similarity index 100%
rename from keyboards/mechwild/bde/lefty/keymaps/via/config.h
rename to keyboards/mechwild/bde/keymaps/lefty_via/config.h
diff --git a/keyboards/mechwild/bde/lefty/keymaps/via/keymap.c b/keyboards/mechwild/bde/keymaps/lefty_via/keymap.c
similarity index 100%
rename from keyboards/mechwild/bde/lefty/keymaps/via/keymap.c
rename to keyboards/mechwild/bde/keymaps/lefty_via/keymap.c
diff --git a/keyboards/mechwild/bde/lefty/keymaps/via/rules.mk b/keyboards/mechwild/bde/keymaps/lefty_via/rules.mk
similarity index 100%
rename from keyboards/mechwild/bde/lefty/keymaps/via/rules.mk
rename to keyboards/mechwild/bde/keymaps/lefty_via/rules.mk
diff --git a/keyboards/mechwild/bde/righty/keymaps/default/config.h b/keyboards/mechwild/bde/keymaps/righty_default/config.h
similarity index 100%
rename from keyboards/mechwild/bde/righty/keymaps/default/config.h
rename to keyboards/mechwild/bde/keymaps/righty_default/config.h
diff --git a/keyboards/mechwild/bde/righty/keymaps/default/keymap.c b/keyboards/mechwild/bde/keymaps/righty_default/keymap.c
similarity index 100%
rename from keyboards/mechwild/bde/righty/keymaps/default/keymap.c
rename to keyboards/mechwild/bde/keymaps/righty_default/keymap.c
diff --git a/keyboards/mechwild/bde/righty/keymaps/via/config.h b/keyboards/mechwild/bde/keymaps/righty_via/config.h
similarity index 100%
rename from keyboards/mechwild/bde/righty/keymaps/via/config.h
rename to keyboards/mechwild/bde/keymaps/righty_via/config.h
diff --git a/keyboards/mechwild/bde/righty/keymaps/via/keymap.c b/keyboards/mechwild/bde/keymaps/righty_via/keymap.c
similarity index 100%
rename from keyboards/mechwild/bde/righty/keymaps/via/keymap.c
rename to keyboards/mechwild/bde/keymaps/righty_via/keymap.c
diff --git a/keyboards/mechwild/bde/righty/keymaps/via/rules.mk b/keyboards/mechwild/bde/keymaps/righty_via/rules.mk
similarity index 100%
rename from keyboards/mechwild/bde/righty/keymaps/via/rules.mk
rename to keyboards/mechwild/bde/keymaps/righty_via/rules.mk
diff --git a/keyboards/mechwild/bde/keymaps/via/config.h b/keyboards/mechwild/bde/keymaps/via/config.h
new file mode 100644
index 0000000000..d09385ca5d
--- /dev/null
+++ b/keyboards/mechwild/bde/keymaps/via/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 Kyle McCreery 
+ * 
+ * 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
+/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
+#define TAPPING_TERM 250
diff --git a/keyboards/mechwild/bde/keymaps/via/keymap.c b/keyboards/mechwild/bde/keymaps/via/keymap.c
new file mode 100644
index 0000000000..30018d1d7e
--- /dev/null
+++ b/keyboards/mechwild/bde/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2022 Kyle McCreery 
+ * 
+ * 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
+
+#define FN1_BSPC    LT(1, KC_BSPC)
+#define FN2_SPC     LT(2, KC_SPC)
+#define FN3_B       LT(3, KC_B)
+#define CTL_Z       CTL_T(KC_Z)
+#define ALT_X       ALT_T(KC_X)
+#define ALT_N       ALGR_T(KC_N)
+#define CTL_M       RCTL_T(KC_M)
+#define SFT_ENT     RSFT_T(KC_ENT)
+#define WIN_C		LGUI_T(KC_C)
+
+enum layer_names {
+  _BASE,
+  _FN1,
+  _FN2,
+  _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,     KC_I,    KC_O,    KC_P,    KC_P7,   KC_P8,   KC_P9,   KC_MUTE,       
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,     KC_K,    KC_L,    KC_ESC,  KC_P4,   KC_P5,   KC_P6,   KC_P0,
+    CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN1_BSPC, FN2_SPC, FN3_B,    ALT_N,   CTL_M,   SFT_ENT, KC_P1,   KC_P2,   KC_P3,   KC_MINS
+  ),                                                                                                     
+  [_FN1] = LAYOUT(                                                                                       
+    _______, _______, _______, RESET,   _______,  _______,  KC_PSCR, KC_LBRC, KC_RBRC, KC_BSLS, KC_7,    KC_8,    KC_9,    KC_NLCK,       
+    _______, _______, _______, _______, _______,  _______,  _______, KC_GRV,  KC_SCLN, KC_QUOT, KC_4,    KC_5,    KC_6,    KC_0, 
+    _______, _______, _______, _______, _______,  KC_TAB,   KC_LGUI, KC_COMM, KC_DOT,  KC_SLSH, KC_1,    KC_2,    KC_3,    KC_EQL
+  ),
+  [_FN2] = LAYOUT(
+    _______, _______, _______, _______, _______,  _______,  _______, KC_LCBR, KC_RCBR, KC_PIPE, KC_AMPR, KC_ASTR, KC_LPRN, KC_CLCK,       
+    _______, _______, _______, _______, _______,  _______,  _______, KC_TILD, KC_COLN, KC_DQUO, KC_DLR,  KC_PERC, KC_CIRC, KC_RPRN, 
+    _______, _______, _______, _______, KC_DEL,   _______,  _______, KC_LABK, KC_RABK, KC_QUES, KC_EXLM, KC_AT,   KC_HASH, KC_PLUS
+  ),                                                        
+  [_FN3] = LAYOUT(                                          
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,    KC_F6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RGB_TOG,       
+    _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  
+    _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD
+  )
+
+};
diff --git a/keyboards/mechwild/bde/keymaps/via/rules.mk b/keyboards/mechwild/bde/keymaps/via/rules.mk
new file mode 100644
index 0000000000..07681b4f2c
--- /dev/null
+++ b/keyboards/mechwild/bde/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+RGBLIGHT_ENABLE = yes
+VIA_ENABLE = yes
+LTO_ENABLE = no
diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/info.json
deleted file mode 100644
index f955618e94..0000000000
--- a/keyboards/mechwild/bde/lefty/info.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "keyboard_name": "MechWild BDE Lefty",
-    "url": "mechwild.com",
-    "maintainer": "kylemccreery",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"0", "x":3, "y":0},            {"label":"Q", "x":4, "y":0}, {"label":"W", "x":5, "y":0}, {"label":"E", "x":6, "y":0}, {"label":"R", "x":7, "y":0}, {"label":"T", "x":8, "y":0},  {"label":"Y", "x":9, "y":0}, {"label":"U", "x":10, "y":0}, {"label":"I", "x":11, "y":0}, {"label":"O", "x":12, "y":0}, {"label":"P", "x":13, "y":0},
-                {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"Enter", "x":3, "y":1, "h":2}, {"label":"A", "x":4, "y":1}, {"label":"S", "x":5, "y":1}, {"label":"D", "x":6, "y":1}, {"label":"F", "x":7, "y":1}, {"label":"G", "x":8, "y":1},  {"label":"H", "x":9, "y":1}, {"label":"J", "x":10, "y":1}, {"label":"K", "x":11, "y":1}, {"label":"L", "x":12, "y":1}, {"label":"ESC", "x":13, "y":1},
-                {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2},                                         {"label":"Z", "x":4, "y":2}, {"label":"X", "x":5, "y":2}, {"label":"C", "x":6, "y":2}, {"label":"V", "x":7, "y":2}, {"label":"BS", "x":8, "y":2}, {"label":"", "x":9, "y":2},  {"label":"B", "x":10, "y":2}, {"label":"N", "x":11, "y":2}, {"label":"M", "x":12, "y":2}, {"label":"ENT", "x":13, "y":2}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechwild/bde/lefty/lefty.c b/keyboards/mechwild/bde/lefty/lefty.c
index 77286f5af3..6873ed36a0 100644
--- a/keyboards/mechwild/bde/lefty/lefty.c
+++ b/keyboards/mechwild/bde/lefty/lefty.c
@@ -14,5 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
  */
 
-
-#include "lefty.h"
+#include "bde.h"
diff --git a/keyboards/mechwild/bde/lib/rev2.c b/keyboards/mechwild/bde/lib/rev2.c
new file mode 100644
index 0000000000..d2a7720117
--- /dev/null
+++ b/keyboards/mechwild/bde/lib/rev2.c
@@ -0,0 +1,244 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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 "progmem.h"
+
+const unsigned char font[] PROGMEM = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
+  0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
+  0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
+  0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
+  0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
+  0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
+  0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
+  0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
+  0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
+  0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
+  0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
+  0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
+  0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
+  0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
+  0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
+  0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
+  0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
+  0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+  0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+  0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+  0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+  0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+  0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
+  0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
+  0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
+  0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
+  0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
+  0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
+  0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
+  0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
+  0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x5F, 0x00, 0x00, 0x00,
+  0x00, 0x07, 0x00, 0x07, 0x00, 0x00,
+  0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
+  0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00,
+  0x23, 0x13, 0x08, 0x64, 0x62, 0x00,
+  0x36, 0x49, 0x56, 0x20, 0x50, 0x00,
+  0x00, 0x08, 0x07, 0x03, 0x00, 0x00,
+  0x00, 0x1C, 0x22, 0x41, 0x00, 0x00,
+  0x00, 0x41, 0x22, 0x1C, 0x00, 0x00,
+  0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+  0x08, 0x08, 0x3E, 0x08, 0x08, 0x00,
+  0x00, 0x80, 0x70, 0x30, 0x00, 0x00,
+  0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+  0x00, 0x00, 0x60, 0x60, 0x00, 0x00,
+  0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+  0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00,
+  0x00, 0x42, 0x7F, 0x40, 0x00, 0x00,
+  0x72, 0x49, 0x49, 0x49, 0x46, 0x00,
+  0x21, 0x41, 0x49, 0x4D, 0x33, 0x00,
+  0x18, 0x14, 0x12, 0x7F, 0x10, 0x00,
+  0x27, 0x45, 0x45, 0x45, 0x39, 0x00,
+  0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00,
+  0x41, 0x21, 0x11, 0x09, 0x07, 0x00,
+  0x36, 0x49, 0x49, 0x49, 0x36, 0x00,
+  0x46, 0x49, 0x49, 0x29, 0x1E, 0x00,
+  0x00, 0x00, 0x14, 0x00, 0x00, 0x00,
+  0x00, 0x40, 0x34, 0x00, 0x00, 0x00,
+  0x00, 0x08, 0x14, 0x22, 0x41, 0x00,
+  0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+  0x00, 0x41, 0x22, 0x14, 0x08, 0x00,
+  0x02, 0x01, 0x59, 0x09, 0x06, 0x00,
+  0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00,
+  0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00,
+  0x7F, 0x49, 0x49, 0x49, 0x36, 0x00,
+  0x3E, 0x41, 0x41, 0x41, 0x22, 0x00,
+  0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00,
+  0x7F, 0x49, 0x49, 0x49, 0x41, 0x00,
+  0x7F, 0x09, 0x09, 0x09, 0x01, 0x00,
+  0x3E, 0x41, 0x41, 0x51, 0x73, 0x00,
+  0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00,
+  0x00, 0x41, 0x7F, 0x41, 0x00, 0x00,
+  0x20, 0x40, 0x41, 0x3F, 0x01, 0x00,
+  0x7F, 0x08, 0x14, 0x22, 0x41, 0x00,
+  0x7F, 0x40, 0x40, 0x40, 0x40, 0x00,
+  0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00,
+  0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00,
+  0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00,
+  0x7F, 0x09, 0x09, 0x09, 0x06, 0x00,
+  0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00,
+  0x7F, 0x09, 0x19, 0x29, 0x46, 0x00,
+  0x26, 0x49, 0x49, 0x49, 0x32, 0x00,
+  0x03, 0x01, 0x7F, 0x01, 0x03, 0x00,
+  0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00,
+  0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00,
+  0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00,
+  0x63, 0x14, 0x08, 0x14, 0x63, 0x00,
+  0x03, 0x04, 0x78, 0x04, 0x03, 0x00,
+  0x61, 0x59, 0x49, 0x4D, 0x43, 0x00,
+  0x00, 0x7F, 0x41, 0x41, 0x41, 0x00,
+  0x02, 0x04, 0x08, 0x10, 0x20, 0x00,
+  0x00, 0x41, 0x41, 0x41, 0x7F, 0x00,
+  0x04, 0x02, 0x01, 0x02, 0x04, 0x00,
+  0x40, 0x40, 0x40, 0x40, 0x40, 0x00,
+  0x00, 0x03, 0x07, 0x08, 0x00, 0x00,
+  0x20, 0x54, 0x54, 0x78, 0x40, 0x00,
+  0x7F, 0x28, 0x44, 0x44, 0x38, 0x00,
+  0x38, 0x44, 0x44, 0x44, 0x28, 0x00,
+  0x38, 0x44, 0x44, 0x28, 0x7E, 0x00,
+  0x38, 0x54, 0x54, 0x54, 0x18, 0x00,
+  0x00, 0x08, 0x7E, 0x09, 0x02, 0x00,
+  0x18, 0x24, 0x24, 0x1C, 0x78, 0x00,
+  0x7F, 0x08, 0x04, 0x04, 0x78, 0x00,
+  0x00, 0x44, 0x7D, 0x40, 0x00, 0x00,
+  0x20, 0x40, 0x40, 0x3D, 0x00, 0x00,
+  0x7F, 0x10, 0x28, 0x44, 0x00, 0x00,
+  0x00, 0x41, 0x7F, 0x40, 0x00, 0x00,
+  0x7C, 0x04, 0x78, 0x04, 0x78, 0x00,
+  0x7C, 0x08, 0x04, 0x04, 0x78, 0x00,
+  0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+  0x7C, 0x18, 0x24, 0x24, 0x18, 0x00,
+  0x18, 0x24, 0x24, 0x18, 0x7C, 0x00,
+  0x7C, 0x08, 0x04, 0x04, 0x08, 0x00,
+  0x48, 0x54, 0x54, 0x54, 0x24, 0x00,
+  0x04, 0x04, 0x3F, 0x44, 0x24, 0x00,
+  0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00,
+  0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00,
+  0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00,
+  0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+  0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00,
+  0x44, 0x64, 0x54, 0x4C, 0x44, 0x00,
+  0x00, 0x08, 0x36, 0x41, 0x00, 0x00,
+  0x00, 0x00, 0x77, 0x00, 0x00, 0x00,
+  0x00, 0x41, 0x36, 0x08, 0x00, 0x00,
+  0x02, 0x01, 0x02, 0x04, 0x02, 0x00,
+  0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00,
+  0x00, 0x00, 0x00, 0xE0, 0xFE, 0xFF,
+  0xFE, 0xF8, 0xC0, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xE0, 0xFC, 0xFF, 0xFE,
+  0xF0, 0xC0, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x3E,
+  0xE0, 0x80, 0x70, 0x0E, 0x01, 0x00,
+  0x00, 0x00, 0x00, 0x07, 0x3C, 0xE0,
+  0x80, 0x78, 0x07, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0xE0, 0xFE, 0xFF,
+  0xFE, 0xF8, 0xC0, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xE0, 0xFC, 0xFF, 0xFE,
+  0xF0, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x01, 0x3E, 0xE0, 0x80, 0x70, 0x0E,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x07,
+  0x3C, 0xE0, 0x80, 0x78, 0x07, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xF8, 0xFF, 0xFF, 0x1F,
+  0x07, 0x1F, 0xFF, 0xFE, 0xF0, 0xC0,
+  0xF8, 0xFF, 0xF7, 0x07, 0x07, 0x7F,
+  0xFF, 0xFF, 0xF8, 0x00, 0xC0, 0x38,
+  0x0C, 0x18, 0x60, 0x80, 0x00, 0x00,
+  0x00, 0xF0, 0x0C, 0x04, 0xF4, 0x1C,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x80, 0xC0, 0xFC, 0xE6, 0xC3, 0xC1,
+  0xC1, 0xC3, 0xE6, 0xFC, 0xC0, 0x80,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0xF8, 0xFF, 0xF7, 0x07,
+  0x07, 0x1F, 0xFF, 0xFE, 0xF0, 0xC0,
+  0xF8, 0x3F, 0x8F, 0x0F, 0x3F, 0xFF,
+  0xFF, 0xFE, 0x80, 0xF0, 0x0C, 0x04,
+  0xF4, 0x1C, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x1F, 0x1F, 0x1F, 0x07, 0x00,
+  0x00, 0x00, 0x00, 0x03, 0x1F, 0x1F,
+  0x0F, 0x01, 0x03, 0x06, 0xF8, 0x00,
+  0x07, 0x7F, 0x3F, 0x0E, 0xC1, 0x38,
+  0x07, 0x0E, 0x70, 0x83, 0x1C, 0x60,
+  0x1E, 0x03, 0xC0, 0x3E, 0x01, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x3F, 0x7F, 0xFF, 0xFF, 0xF9, 0xC0,
+  0xC0, 0xF9, 0xFF, 0xFF, 0x7F, 0x3F,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x1F, 0x1F, 0x1F, 0x07, 0x06,
+  0xF8, 0x00, 0x00, 0x73, 0x3F, 0x0F,
+  0xC1, 0x38, 0x07, 0x0F, 0x70, 0x83,
+  0x07, 0x7F, 0x1F, 0x03, 0xC0, 0x3E,
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
diff --git a/keyboards/mechwild/bde/lefty/readme.md b/keyboards/mechwild/bde/readme.md
similarity index 74%
rename from keyboards/mechwild/bde/lefty/readme.md
rename to keyboards/mechwild/bde/readme.md
index 88e7be0202..5481b47160 100644
--- a/keyboards/mechwild/bde/lefty/readme.md
+++ b/keyboards/mechwild/bde/readme.md
@@ -1,15 +1,15 @@
 # BIG DILL EXTENDED
 
-![BIG DILL EXTENDED](https://i0.wp.com/mechwild.com/wp-content/uploads/2020/10/IMG_4458_web.jpg)
+![BIG DILL EXTENDED](https://i.imgur.com/hraQxsRh.png)
 
-A 41 key keyboard.
+A 42 key keyboard.
 
 * Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery)
-* Hardware Supported: BDE v2.3 Lefty
+* Hardware Supported: BDE Rev1 v2.3, BDE Rev2 v1.1
 * Hardware Availability: [BIG DILL EXTENDED on MechWild](https://mechwild.com/product/big-dill-extended-bde/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mechwild/bde/lefty:default
+    make mechwild/bde: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).
diff --git a/keyboards/mechwild/bde/rev2/config.h b/keyboards/mechwild/bde/rev2/config.h
new file mode 100644
index 0000000000..ca14cf784d
--- /dev/null
+++ b/keyboards/mechwild/bde/rev2/config.h
@@ -0,0 +1,74 @@
+/*
+Copyright 2022 Kyle McCreery
+
+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       0x6D77 // mw = "MechWild"
+#define PRODUCT_ID      0x170A
+#define DEVICE_VER      0x0101
+#define MANUFACTURER    MechWild
+#define PRODUCT         BDE Rev2
+
+/* Key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 7
+
+/* Key matrix pins */
+#define MATRIX_ROW_PINS { C6, D7, B4, D4, E6, B2 }
+#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4, B5 }
+#define UNUSED_PINS
+
+/* Encoder pins */
+#define ENCODERS_PAD_A { D3 }
+#define ENCODERS_PAD_B { D2 }
+
+/* Encoder resolution */
+#define ENCODER_RESOLUTION 4
+#define TAP_CODE_DELAY 10
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define OLED_FONT_H "keyboards/mechwild/bde/lib/rev2.c"
+
+#define RGB_DI_PIN B6
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 8
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== Chosen enabled animations ==*/
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
\ No newline at end of file
diff --git a/keyboards/mechwild/bde/rev2/rev2.c b/keyboards/mechwild/bde/rev2/rev2.c
new file mode 100644
index 0000000000..88c06988d9
--- /dev/null
+++ b/keyboards/mechwild/bde/rev2/rev2.c
@@ -0,0 +1,88 @@
+/* Copyright 2022 Kyle McCreery 
+ * 
+ * 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 "bde.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    switch (index) {
+        case 0:
+            if (clockwise) {
+                tap_code(KC_VOLU);
+            } else {
+                tap_code(KC_VOLD);
+            }
+        break;
+    }
+    return true;
+}
+#endif
+
+#ifdef OLED_ENABLE
+	oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+		return OLED_ROTATION_270;       // flips the display 270 degrees
+	}
+
+	static void render_logo(void) {     // Render MechWild "MW" Logo
+		static const char PROGMEM logo_1[] = {0x8A, 0x8B, 0x8C, 0x8D, 0x00};
+		static const char PROGMEM logo_2[] = {0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0x00};
+		static const char PROGMEM logo_3[] = {0xCA, 0xCB, 0xCC, 0xCD, 0x00};
+		static const char PROGMEM logo_4[] = {0x20, 0x8E, 0x8F, 0x90, 0x00};
+		oled_set_cursor(0,0);
+		oled_write_P(logo_1, false);
+		oled_set_cursor(0,1);
+		oled_write_P(logo_2, false);
+		oled_set_cursor(0,2);
+		oled_write_P(logo_3, false);
+		oled_set_cursor(0,3);
+		oled_write_P(logo_4, false);
+	}
+
+	bool oled_task_user(void) {
+		render_logo();
+		oled_set_cursor(0,6);
+
+		oled_write_ln_P(PSTR("Layer"), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_ln_P(PSTR("Base"), false);
+            break;
+        case 1:
+            oled_write_ln_P(PSTR("FN 1"), false);
+            break;
+        case 2:
+            oled_write_ln_P(PSTR("FN 2"), false);
+            break;
+        case 3:
+            oled_write_ln_P(PSTR("FN 3"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Undef"), false);
+    }
+	oled_write_ln_P(PSTR(""), false);
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_ln_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_ln_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_ln_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+    
+    return false;
+        
+	}
+#endif
diff --git a/keyboards/mechwild/bde/rev2/rev2.h b/keyboards/mechwild/bde/rev2/rev2.h
new file mode 100644
index 0000000000..8c8191710a
--- /dev/null
+++ b/keyboards/mechwild/bde/rev2/rev2.h
@@ -0,0 +1,31 @@
+/* Copyright 2022 Kyle McCreery 
+ * 
+ * This program is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 2 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,\
+  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,\
+  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D \
+) { \
+	{ K00,   K01,   K02,   K03,   K04,   K05,   K06 }, \
+	{ K10,   K11,   K12,   K13,   K14,   K15,   K16 }, \
+	{ K20,   K21,   K22,   K23,   K24,   K25,   K26 }, \
+	{ K0D,   K0C,   K0B,   K0A,   K09,   K08,   K07 }, \
+	{ K1D,   K1C,   K1B,   K1A,   K19,   K18,   K17 }, \
+	{ K2D,   K2C,   K2B,   K2A,   K29,   K28,   K27 }  \
+}
diff --git a/keyboards/mechwild/bde/rev2/rules.mk b/keyboards/mechwild/bde/rev2/rules.mk
new file mode 100644
index 0000000000..307b1ef797
--- /dev/null
+++ b/keyboards/mechwild/bde/rev2/rules.mk
@@ -0,0 +1,3 @@
+ENCODER_ENABLE = yes        # Enable encoder
+OLED_ENABLE = yes           # Enable OLED Screen
+OLED_DRIVER = SSD1306       # Set OLED Driver
diff --git a/keyboards/mechwild/bde/righty/readme.md b/keyboards/mechwild/bde/righty/readme.md
deleted file mode 100644
index 619ea61f00..0000000000
--- a/keyboards/mechwild/bde/righty/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# BIG DILL EXTENDED
-
-![BIG DILL EXTENDED](https://i0.wp.com/mechwild.com/wp-content/uploads/2020/10/IMG_4458_web.jpg)
-
-A 41 key keyboard.
-
-* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery)
-* Hardware Supported: BDE v2.3 Righty
-* Hardware Availability: [BIG DILL EXTENDED on MechWild](https://mechwild.com/product/big-dill-extended-bde/)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make mechwild/bde/righty: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).
diff --git a/keyboards/mechwild/bde/righty/righty.c b/keyboards/mechwild/bde/righty/righty.c
index d285e2e559..6873ed36a0 100644
--- a/keyboards/mechwild/bde/righty/righty.c
+++ b/keyboards/mechwild/bde/righty/righty.c
@@ -14,5 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
  */
 
-
-#include "righty.h"
+#include "bde.h"
diff --git a/keyboards/mechwild/bde/righty/rules.mk b/keyboards/mechwild/bde/righty/rules.mk
deleted file mode 100644
index ba23033c82..0000000000
--- a/keyboards/mechwild/bde/righty/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-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
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
diff --git a/keyboards/mechwild/bde/lefty/rules.mk b/keyboards/mechwild/bde/rules.mk
similarity index 94%
rename from keyboards/mechwild/bde/lefty/rules.mk
rename to keyboards/mechwild/bde/rules.mk
index ba23033c82..2ae725a20b 100644
--- a/keyboards/mechwild/bde/lefty/rules.mk
+++ b/keyboards/mechwild/bde/rules.mk
@@ -17,3 +17,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
+DEFAULT_FOLDER = mechwild/bde/rev2

From 82dd84e257db8e5fd1eb33c152a0026ee5bee7fe Mon Sep 17 00:00:00 2001
From: yulei <yuleiz@gmail.com>
Date: Sat, 5 Mar 2022 12:57:19 +0800
Subject: [PATCH 723/867] support more leds (#15840)

---
 keyboards/neson_design/n6/config.h            |  19 +--
 .../neson_design/n6/keymaps/via/keymap.c      |   8 +-
 keyboards/neson_design/n6/n6.c                | 132 +++++++++++++-----
 3 files changed, 114 insertions(+), 45 deletions(-)

diff --git a/keyboards/neson_design/n6/config.h b/keyboards/neson_design/n6/config.h
index 4a9d3c56c6..2f564ab4c4 100644
--- a/keyboards/neson_design/n6/config.h
+++ b/keyboards/neson_design/n6/config.h
@@ -50,17 +50,20 @@
 //#define NO_PRINT
 
 
+#define DRIVER_1_LED_TOTAL 32
+#define DRIVER_2_LED_TOTAL 32
+#define DRIVER_ADDR_1 0b1110100
+#define DRIVER_ADDR_2 0b1110111
+#define DRIVER_COUNT 2
+#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL+DRIVER_2_LED_TOTAL)
+
+#define LED_CAPS_LOCK_PIN   F5
+
 //rgb light setting
-//#define RGBLIGHT_LIMIT_VAL 128
-#define RGBLED_NUM          33
+#define RGBLED_NUM          65
 #define RGB_DI_PIN          B3
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_HUE_STEP   8
 #define RGBLIGHT_SAT_STEP   8
 #define RGBLIGHT_VAL_STEP   8
-
-#define DRIVER_ADDR_1 0b1110100
-#define DRIVER_COUNT 1
-#define DRIVER_LED_TOTAL 32
-
-#define CAPS_PIN    F5
+#define RGBLIGHT_LIMIT_VAL  192
diff --git a/keyboards/neson_design/n6/keymaps/via/keymap.c b/keyboards/neson_design/n6/keymaps/via/keymap.c
index 66156956d5..2d8d24b980 100644
--- a/keyboards/neson_design/n6/keymaps/via/keymap.c
+++ b/keyboards/neson_design/n6/keymaps/via/keymap.c
@@ -19,16 +19,16 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_65_ansi_blocker_split_bs(
-      KC_ESC,      KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_DEL, KC_BSPC, KC_PSCR,
+      KC_ESC,      KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_DEL, KC_BSPC, KC_DEL,
       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_HOME,
       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_END,
       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,   MO(1),
-      KC_LCTL,  KC_LGUI,  KC_LALT,                        KC_SPC,                  KC_RALT,KC_RGUI,                KC_LEFT,KC_DOWN, KC_RIGHT),
+      KC_LCTL,  KC_LGUI,  KC_LALT,                        KC_SPC,                  KC_RALT,KC_RCTL,                KC_LEFT,KC_DOWN, KC_RIGHT),
 
     [1] = LAYOUT_65_ansi_blocker_split_bs(
       _______,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10, KC_F11, KC_F12,_______,KC_PSCR,_______,
-      RESET,  RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,        _______,
-      _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,_______,        _______,
+      RESET,  RGB_TOG,RGB_MOD,RGB_RMOD,RGB_HUI,RGB_HUD,RGB_SAI,RGB_SAD,RGB_VAI,RGB_VAD,KC_MUTE,KC_VOLU,KC_VOLD,_______,        _______,
+      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,
       _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,
       _______,_______,_______,                        _______,                        _______,_______,        _______,_______,_______),
 
diff --git a/keyboards/neson_design/n6/n6.c b/keyboards/neson_design/n6/n6.c
index e99467fa0c..4d5927cae1 100644
--- a/keyboards/neson_design/n6/n6.c
+++ b/keyboards/neson_design/n6/n6.c
@@ -34,7 +34,7 @@ enum {
 };
 
 // alert state update interval
-#define ALERT_INTERVAL      600
+#define ALERT_INTERVAL      500
 // self testing state update interval
 #define ST_INTERVAL         100
 // self testing start index
@@ -46,6 +46,26 @@ enum {
 // self testing stage end duration
 #define ST_END_DURATION     10
 
+// led index
+#define ST_LEFT_BEGIN       0
+#ifdef DRIVER_ADDR_2
+#define ST_LEFT_SIZE        4
+#else
+#define ST_LEFT_SIZE        2
+#endif
+#define ST_LEFT_END         (ST_LEFT_BEGIN+ST_LEFT_SIZE-1)
+#ifdef DRIVER_ADDR_2
+#define ST_RIGHT_BEGIN      60
+#else
+#define ST_RIGHT_BEGIN      30
+#endif
+#ifdef DRIVER_ADDR_2
+#define ST_RIGHT_SIZE       4
+#else
+#define ST_RIGHT_SIZE       2
+#endif
+#define ST_RIGHT_END        (ST_RIGHT_BEGIN+ST_RIGHT_SIZE-1)
+
 #ifdef RGBLIGHT_ENABLE
 extern rgblight_config_t rgblight_config;
 
@@ -94,21 +114,21 @@ static void self_testing(void)
                 IS31FL3731_set_color_all(0, 0, 0);
             }
 
-            if (rgb_state.index >= 1) {
-                for (int i = rgb_state.index-1; i < 32-rgb_state.index+1; i++) {
+            if (rgb_state.index >= ST_LEFT_END) {
+                for (int i = rgb_state.index - 1; i < DRIVER_LED_TOTAL - rgb_state.index + 1; i++) {
                     IS31FL3731_set_color(i, led.r, led.g, led.b);
                 }
-                if (rgb_state.index==1) {
-                    rgb_state.index=0;
+                if (rgb_state.index == ST_LEFT_END) {
+                    rgb_state.index = ST_LEFT_BEGIN;
                 } else {
-                    rgb_state.index -= 2;
+                    rgb_state.index -= ST_LEFT_SIZE;
                 }
             } else{
                 if (rgb_state.delay > 0) {
                     rgb_state.delay--;
                 } else {
                     // move to stage 2
-                    rgb_state.index = 2;
+                    rgb_state.index = ST_LEFT_BEGIN+ST_LEFT_SIZE;
                     rgb_state.testing = ST_STAGE_2;
                 }
             }
@@ -116,28 +136,32 @@ static void self_testing(void)
         case ST_STAGE_2: {
             // clear all
             IS31FL3731_set_color_all(0, 0, 0);
+            int i = 0;
             // light left and right
-            IS31FL3731_set_color(0, led.r, led.g, led.b);
-            IS31FL3731_set_color(1, led.r, led.g, led.b);
-            IS31FL3731_set_color(30, led.r, led.g, led.b);
-            IS31FL3731_set_color(31, led.r, led.g, led.b);
+            for (i = 0; i < ST_LEFT_SIZE; i++) {
+                IS31FL3731_set_color(ST_LEFT_BEGIN+i, led.r, led.g, led.b);
+            }
+            for (i = 0; i < ST_RIGHT_SIZE; i++) {
+                IS31FL3731_set_color(ST_RIGHT_BEGIN+i, led.r, led.g, led.b);
+
+            }
             if (rgb_state.dir) {
                 // left to right
-                for (int i = rgb_state.index; i < rgb_state.index+4; i++) {
+                for (int i = rgb_state.index; i < rgb_state.index+ST_LEFT_SIZE+ST_RIGHT_SIZE; i++) {
                     IS31FL3731_set_color(i, led.r, led.g, led.b);
                 }
-                rgb_state.index += 4;
-                if (rgb_state.index == 30) {
+                rgb_state.index += ST_LEFT_SIZE+ST_RIGHT_SIZE;
+                if (rgb_state.index == ST_RIGHT_BEGIN) {
                     rgb_state.dir = !rgb_state.dir;
                     rgb_state.count--;
                 }
             } else {
                 // right to left
-                for (int i = rgb_state.index-4; i < rgb_state.index; i++) {
+                for (int i = rgb_state.index - ST_RIGHT_SIZE; i < rgb_state.index; i++) {
                     IS31FL3731_set_color(i, led.r, led.g, led.b);
                 }
-                rgb_state.index -= 4;
-                if (rgb_state.index == 2) {
+                rgb_state.index -= ST_LEFT_SIZE + ST_RIGHT_SIZE;
+                if (rgb_state.index == ST_LEFT_BEGIN+ST_LEFT_SIZE) {
                     rgb_state.dir = !rgb_state.dir;
                     rgb_state.count--;
                 }
@@ -153,13 +177,13 @@ static void self_testing(void)
         }
         break;
         case ST_STAGE_3:
-            if (rgb_state.index != 16) {
+            if (rgb_state.index != DRIVER_LED_TOTAL/2) {
                 IS31FL3731_set_color_all(0, 0, 0);
             }
 
             // light left and right
 
-            if (rgb_state.index == 16) {
+            if (rgb_state.index == DRIVER_LED_TOTAL/2) {
                 if (rgb_state.duration) {
                     rgb_state.duration--;
                 } else {
@@ -176,7 +200,7 @@ static void self_testing(void)
                     IS31FL3731_set_color(i, led.r, led.g, led.b);
                 }
                 // right
-                for (int i = 31; i > 31-rgb_state.index-1; i--) {
+                for (int i = ST_RIGHT_END; i > ST_RIGHT_END - rgb_state.index - 1; i--) {
                     IS31FL3731_set_color(i, led.r, led.g, led.b);
                 }
                 rgb_state.index ++;
@@ -230,27 +254,66 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, C9_14, C8_14, C7_14},
     {0, C9_15, C8_15, C6_14},
     {0, C9_16, C7_15, C6_15},
+
+    // right CA
+    {1, C1_1, C3_2, C4_2},
+    {1, C1_2, C2_2, C4_3},
+    {1, C1_3, C2_3, C3_3},
+    {1, C1_4, C2_4, C3_4},
+    {1, C1_5, C2_5, C3_5},
+    {1, C1_6, C2_6, C3_6},
+    {1, C1_7, C2_7, C3_7},
+    {1, C1_8, C2_8, C3_8},
+
+    {1, C9_1, C8_1, C7_1},
+    {1, C9_2, C8_2, C7_2},
+    {1, C9_3, C8_3, C7_3},
+    {1, C9_4, C8_4, C7_4},
+    {1, C9_5, C8_5, C7_5},
+    {1, C9_6, C8_6, C7_6},
+    {1, C9_7, C8_7, C6_6},
+    {1, C9_8, C7_7, C6_7},
+    // right CB
+    {1, C1_9, C3_10, C4_10},
+    {1, C1_10, C2_10, C4_11},
+    {1, C1_11, C2_11, C3_11},
+    {1, C1_12, C2_12, C3_12},
+    {1, C1_13, C2_13, C3_13},
+    {1, C1_14, C2_14, C3_14},
+    {1, C1_15, C2_15, C3_15},
+    {1, C1_16, C2_16, C3_16},
+
+    {1, C9_9, C8_9, C7_9},
+    {1, C9_10, C8_10, C7_10},
+    {1, C9_11, C8_11, C7_11},
+    {1, C9_12, C8_12, C7_12},
+    {1, C9_13, C8_13, C7_13},
+    {1, C9_14, C8_14, C7_14},
+    {1, C9_15, C8_15, C6_14},
+    {1, C9_16, C7_15, C6_15},
 };
-#endif
 
 void matrix_init_kb(void)
 {
-    // clear caps led
-    setPinOutput(CAPS_PIN);
-    writePinLow(CAPS_PIN);
-#ifdef RGBLIGHT_ENABLE
+    setPinOutput(LED_CAPS_LOCK_PIN);
+    writePinLow(LED_CAPS_LOCK_PIN);
+
     i2c_init();
     IS31FL3731_init(DRIVER_ADDR_1);
+#ifdef DRIVER_ADDR_2
+    IS31FL3731_init(DRIVER_ADDR_2);
+#endif
     for (int index = 0; index < DRIVER_LED_TOTAL; index++) {
         IS31FL3731_set_led_control_register(index, true, true, true);
     }
     IS31FL3731_update_led_control_registers(DRIVER_ADDR_1, 0);
-    update_ticks();
+#ifdef DRIVER_ADDR_2
+    IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
 #endif
+    update_ticks();
     matrix_init_user();
 }
 
-#ifdef RGBLIGHT_ENABLE
 void housekeeping_task_kb(void)
 {
     if (rgb_state.state == SELF_TESTING) {
@@ -259,7 +322,8 @@ void housekeeping_task_kb(void)
         //gold 0xFF, 0xD9, 0x00
         LED_TYPE led = {
             .r = 0xFF,
-            .g = 0xD9,
+            //.g = 0xD9,
+            .g = 0xA5,
             .b = 0x00,
         };
         if (rgb_state.alert) {
@@ -279,7 +343,10 @@ void housekeeping_task_kb(void)
         }
     }
 
-    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1,0);
+    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_1, 0);
+#ifdef DRIVER_ADDR_2
+    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
+#endif
 
     housekeeping_task_user();
 }
@@ -293,15 +360,13 @@ void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
     }
     ws2812_setleds(start_led+DRIVER_LED_TOTAL, 1);
 }
-#endif
 
 bool led_update_kb(led_t led_state)
 {
     bool res = led_update_user(led_state);
     if (res) {
-        writePin(CAPS_PIN, led_state.caps_lock);
+        writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
 
-#ifdef RGBLIGHT_ENABLE
         if (rgb_state.state != SELF_TESTING) {
             if (led_state.caps_lock) {
                 rgb_state.state = CAPS_ALERT;
@@ -311,7 +376,8 @@ bool led_update_kb(led_t led_state)
                 rgblight_set();
             }
         }
-#endif
     }
     return res;
 }
+
+#endif
\ No newline at end of file

From da6d6ce2e1f266892badbd42fb8c6735e61e784f Mon Sep 17 00:00:00 2001
From: kiilerix <mads@kiilerich.com>
Date: Sat, 5 Mar 2022 05:58:50 +0100
Subject: [PATCH 724/867] Some docs improvements (#15845)

* docs: clarify in "Keymap Overview" what LAYOUT is and isn't

It is not strictly necessary to use LAYOUT macros in keyboard.c, but it
is a convenient abstraction of hardware internals, allowing focus on the
physical keyboard layout.

From the C source point of view LAYOUT is macro with a parameter list,
which expands to a array of rows that each is an array with a keyboard
scancode for each column. A macro parameter list is not an array, and
even less a single array.

Perhaps no big deal, but also no reason to give incorrect hints.

* docs: update "Understanding QMK's Code" to current code structure introduced in 96e2b13d1de

This part of the documentation was no longer correct. I tried updating
it, mainly copy editing and using github links to latest release.

This is not trying to fix all problems, but just trying to fix some
problems while reusing much of the old phrases and structure.

* Update docs to use "qmk format-python"
---
 docs/cli_development.md    |  4 ++--
 docs/ja/cli_commands.md    |  4 ++--
 docs/ja/cli_development.md |  4 ++--
 docs/keymap.md             |  6 ++++--
 docs/understanding_qmk.md  | 15 +++++----------
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/docs/cli_development.md b/docs/cli_development.md
index 62be3b3d8c..17370a732a 100644
--- a/docs/cli_development.md
+++ b/docs/cli_development.md
@@ -188,7 +188,7 @@ cli.log.info('Reading from %s and writing to %s', cli.args.filename, cli.args.ou
 
 # Testing, and Linting, and Formatting (oh my!)
 
-We use nose2, flake8, and yapf to test, lint, and format code. You can use the `pytest` and `format-py` subcommands to run these tests:
+We use nose2, flake8, and yapf to test, lint, and format code. You can use the `pytest` and `format-python` subcommands to run these tests:
 
 ### Testing and Linting
 
@@ -196,7 +196,7 @@ We use nose2, flake8, and yapf to test, lint, and format code. You can use the `
 
 ### Formatting
 
-    qmk format-py
+    qmk format-python
 
 ## Formatting Details
 
diff --git a/docs/ja/cli_commands.md b/docs/ja/cli_commands.md
index 8a661d56ee..b48de077cd 100644
--- a/docs/ja/cli_commands.md
+++ b/docs/ja/cli_commands.md
@@ -275,14 +275,14 @@ $ qmk kle2json -f kle.txt -f
 Ψ Wrote out to info.json
 ```
 
-## `qmk format-py`
+## `qmk format-python`
 
 このコマンドは `qmk_firmware` 内の python コードを整形します。
 
 **使用法**:
 
 ```
-qmk format-py
+qmk format-python
 ```
 
 ## `qmk pytest`
diff --git a/docs/ja/cli_development.md b/docs/ja/cli_development.md
index 28cdd91c1e..082bc5dafa 100644
--- a/docs/ja/cli_development.md
+++ b/docs/ja/cli_development.md
@@ -192,7 +192,7 @@ cli.log.info('Reading from %s and writing to %s', cli.args.filename, cli.args.ou
 
 # テスト、リントおよびフォーマット
 
-nose2、flake8 および yapf を使ってコードをテスト、リントおよびフォーマットします。これらのテストを実行するために `pytest` と `format-py` サブコマンドを使うことができます。
+nose2、flake8 および yapf を使ってコードをテスト、リントおよびフォーマットします。これらのテストを実行するために `pytest` と `format-python` サブコマンドを使うことができます。
 
 ### テストとリント
 
@@ -200,7 +200,7 @@ nose2、flake8 および yapf を使ってコードをテスト、リントお
 
 ### フォーマット
 
-    qmk format-py
+    qmk format-python
 
 ## フォーマットの詳細
 
diff --git a/docs/keymap.md b/docs/keymap.md
index a7c9c50d74..ab8a255bc3 100644
--- a/docs/keymap.md
+++ b/docs/keymap.md
@@ -132,7 +132,7 @@ The main part of this file is the `keymaps[]` definition. This is where you list
 
     const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-After this you'll find a list of LAYOUT() macros. A LAYOUT() is simply a list of keys to define a single layer. Typically you'll have one or more "base layers" (such as QWERTY, Dvorak, or Colemak) and then you'll layer on top of that one or more "function" layers. Due to the way layers are processed you can't overlay a "lower" layer on top of a "higher" layer.
+After this you'll find the layer definitions. Typically you'll have one or more "base layers" (such as QWERTY, Dvorak, or Colemak) and then you'll layer on top of that one or more "function" layers. Due to the way layers are processed you can't overlay a "lower" layer on top of a "higher" layer.
 
 `keymaps[][MATRIX_ROWS][MATRIX_COLS]` in QMK holds the 16 bit action code (sometimes referred as the quantum keycode) in it.  For the keycode representing typical keys, its high byte is 0 and its low byte is the USB HID usage ID for keyboard.
 
@@ -153,7 +153,9 @@ Here is an example of the Clueboard's base layer:
 
 Some interesting things to note about this:
 
-* From a C source point of view it's only a single array, but we have embedded whitespace to more easily visualize where each key is on the physical device.
+* The layer is defined using the LAYOUT macro, traditionally defined in the keyboard's `.h` file.
+* The LAYOUT macro takes a single list of keycodes, but we have written it in the C source using embedded whitespace and newlines to visualize where each key is on the physical device.
+* The LAYOUT macro hides and handles the mapping to the hardware's key scan matrix.
 * Plain keyboard scancodes are prefixed with KC_, while "special" keys are not.
 * The upper left key activates custom function 0 (`F(0)`)
 * The "Fn" key is defined with `MO(_FL)`, which moves to the `_FL` layer while that key is being held down.
diff --git a/docs/understanding_qmk.md b/docs/understanding_qmk.md
index 582cbf46f2..9b80fb179e 100644
--- a/docs/understanding_qmk.md
+++ b/docs/understanding_qmk.md
@@ -8,27 +8,22 @@ This document attempts to explain how the QMK firmware works from a very high le
 
 ## Startup
 
-You can think of QMK as no different from any other computer program. It is started, performs its tasks, and then ends. The entry point for the program is the `main()` function, just like it is on any other C program. However, for a newcomer to QMK it can be confusing because the `main()` function appears in multiple places, and it can be hard to tell which one to look at.
+You can think of QMK as no different from any other computer program. It is started and performs its tasks, but this program never finishes. Like other C programs, the entry point is the `main()` function. For QMK, the `main()` function is found in [`quantum/main.c`](https://github.com/qmk/qmk_firmware/blob/0.15.13/quantum/main.c#L55).
 
-The reason for this is the different platforms that QMK supports. The most common platform is `lufa`, which runs on AVR processors such at the atmega32u4. We also support `chibios` and `vusb`.
+If you browse through the `main()` function you'll find that it starts by initializing any hardware that has been configured (including USB to the host). The most common platform for QMK is `lufa`, which runs on AVR processors such as the atmega32u4. When compiled for that platform, it will invoke for example `platform_setup()` in [`platforms/avr/platform.c`](https://github.com/qmk/qmk_firmware/blob/0.15.13/platforms/avr/platform.c#L19) and `protocol_setup()` in [`tmk_core/protocol/lufa/lufa.c`](https://github.com/qmk/qmk_firmware/blob/0.15.13/tmk_core/protocol/lufa/lufa.c#L1066). It will use other implementations when compiled for other platforms like `chibios` and `vusb`. At first glance, it can look like a lot of functionality but most of the time the code will be disabled by `#define`s.
 
-We'll focus on AVR processors for the moment, which use the `lufa` platform. You can find the `main()` function in [tmk_core/protocol/lufa/lufa.c](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/tmk_core/protocol/lufa/lufa.c#L1028). If you browse through that function you'll find that it initializes any hardware that has been configured (including USB to the host) and then it starts the core part of the program with a [`while(1)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/tmk_core/protocol/lufa/lufa.c#L1069). This is [The Main Loop](#the-main-loop).
+The `main()` function will then start the core part of the program with a [`while (true)`](https://github.com/qmk/qmk_firmware/blob/0.15.13/quantum/main.c#L63). This is [The Main Loop](#the-main-loop).
 
 ## The Main Loop
 
-This section of code is called "The Main Loop" because it's responsible for looping over the same set of instructions forever. This is where QMK dispatches out to the functions responsible for making the keyboard do everything it is supposed to do. At first glance it can look like a lot of functionality but most of the time the code will be disabled by `#define`'s.
+This section of code is called "The Main Loop" because it's responsible for looping over the same set of instructions forever, without ever reaching the end. This is where QMK dispatches out to the functions responsible for making the keyboard do everything it is supposed to do.
 
-```
-    keyboard_task();
-```
-
-This is where all the keyboard specific functionality is dispatched. The source code for `keyboard_task()` can be found in [tmk_core/common/keyboard.c](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/tmk_core/common/keyboard.c#L216), and it is responsible for detecting changes in the matrix and turning status LEDs on and off.
+The main loop will call [`protocol_task()`](https://github.com/qmk/qmk_firmware/blob/0.15.13/quantum/main.c#L38), which in turn will call `keyboard_task()` in [`quantum/keyboard.c`](https://github.com/qmk/qmk_firmware/blob/0.15.13/quantum/keyboard.c#L377). This is where all the keyboard specific functionality is dispatched, and it is responsible for detecting changes in the matrix and turning status LEDs on and off.
 
 Within `keyboard_task()` you'll find code to handle:
 
 * [Matrix Scanning](#matrix-scanning)
 * Mouse Handling
-* Serial Link(s)
 * Keyboard status LEDs (Caps Lock, Num Lock, Scroll Lock)
 
 #### Matrix Scanning

From b202e593226c2dd88b922e99c0c7ba8db401003e Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 5 Mar 2022 20:59:54 +0000
Subject: [PATCH 725/867] Update info.json (#16540)

---
 data/templates/keyboard/info.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/templates/keyboard/info.json b/data/templates/keyboard/info.json
index 777ceb3bd8..65f935fb42 100644
--- a/data/templates/keyboard/info.json
+++ b/data/templates/keyboard/info.json
@@ -15,11 +15,11 @@
         "device_version": "1.0.0"
     },
     "features": {
-        "bootmagic_lite": true,
+        "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true
     }
-}
\ No newline at end of file
+}

From 8e9d45d2708d71cf89bed704e8e0e1bf5671804f Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 6 Mar 2022 09:54:32 +1100
Subject: [PATCH 726/867] `qmk info`: nicer rendering of ISO enter (#16466)

---
 lib/python/qmk/keyboard.py | 94 ++++++++++++++++++++++++++++----------
 1 file changed, 69 insertions(+), 25 deletions(-)

diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py
index c87ea9050b..0530c4acc5 100644
--- a/lib/python/qmk/keyboard.py
+++ b/lib/python/qmk/keyboard.py
@@ -162,13 +162,12 @@ def render_layout(layout_data, render_ascii, key_labels=None):
     """
     textpad = [array('u', ' ' * 200) for x in range(100)]
     style = 'ascii' if render_ascii else 'unicode'
-    box_chars = BOX_DRAWING_CHARACTERS[style]
 
     for key in layout_data:
-        x = ceil(key.get('x', 0) * 4)
-        y = ceil(key.get('y', 0) * 3)
-        w = ceil(key.get('w', 1) * 4)
-        h = ceil(key.get('h', 1) * 3)
+        x = key.get('x', 0)
+        y = key.get('y', 0)
+        w = key.get('w', 1)
+        h = key.get('h', 1)
 
         if key_labels:
             label = key_labels.pop(0)
@@ -177,26 +176,10 @@ def render_layout(layout_data, render_ascii, key_labels=None):
         else:
             label = key.get('label', '')
 
-        label_len = w - 2
-        label_leftover = label_len - len(label)
-
-        if len(label) > label_len:
-            label = label[:label_len]
-
-        label_blank = ' ' * label_len
-        label_border = box_chars['h'] * label_len
-        label_middle = label + ' '*label_leftover  # noqa: yapf insists there be no whitespace around *
-
-        top_line = array('u', box_chars['tl'] + label_border + box_chars['tr'])
-        lab_line = array('u', box_chars['v'] + label_middle + box_chars['v'])
-        mid_line = array('u', box_chars['v'] + label_blank + box_chars['v'])
-        bot_line = array('u', box_chars['bl'] + label_border + box_chars['br'])
-
-        textpad[y][x:x + w] = top_line
-        textpad[y + 1][x:x + w] = lab_line
-        for i in range(h - 3):
-            textpad[y + i + 2][x:x + w] = mid_line
-        textpad[y + h - 1][x:x + w] = bot_line
+        if x >= 0.25 and w == 1.25 and h == 2:
+            render_key_isoenter(textpad, x, y, w, h, label, style)
+        else:
+            render_key_rect(textpad, x, y, w, h, label, style)
 
     lines = []
     for line in textpad:
@@ -216,3 +199,64 @@ def render_layouts(info_json, render_ascii):
         layouts[layout] = render_layout(layout_data, render_ascii)
 
     return layouts
+
+
+def render_key_rect(textpad, x, y, w, h, label, style):
+    box_chars = BOX_DRAWING_CHARACTERS[style]
+    x = ceil(x * 4)
+    y = ceil(y * 3)
+    w = ceil(w * 4)
+    h = ceil(h * 3)
+
+    label_len = w - 2
+    label_leftover = label_len - len(label)
+
+    if len(label) > label_len:
+        label = label[:label_len]
+
+    label_blank = ' ' * label_len
+    label_border = box_chars['h'] * label_len
+    label_middle = label + ' '*label_leftover  # noqa: yapf insists there be no whitespace around *
+
+    top_line = array('u', box_chars['tl'] + label_border + box_chars['tr'])
+    lab_line = array('u', box_chars['v'] + label_middle + box_chars['v'])
+    mid_line = array('u', box_chars['v'] + label_blank + box_chars['v'])
+    bot_line = array('u', box_chars['bl'] + label_border + box_chars['br'])
+
+    textpad[y][x:x + w] = top_line
+    textpad[y + 1][x:x + w] = lab_line
+    for i in range(h - 3):
+        textpad[y + i + 2][x:x + w] = mid_line
+    textpad[y + h - 1][x:x + w] = bot_line
+
+
+def render_key_isoenter(textpad, x, y, w, h, label, style):
+    box_chars = BOX_DRAWING_CHARACTERS[style]
+    x = ceil(x * 4)
+    y = ceil(y * 3)
+    w = ceil(w * 4)
+    h = ceil(h * 3)
+
+    label_len = w - 1
+    label_leftover = label_len - len(label)
+
+    if len(label) > label_len:
+        label = label[:label_len]
+
+    label_blank = ' ' * (label_len-1)  # noqa: yapf insists there be no whitespace around - and *
+    label_border_top = box_chars['h'] * label_len
+    label_border_bottom = box_chars['h'] * (label_len-1)  # noqa
+    label_middle = label + ' '*label_leftover  # noqa
+
+    top_line = array('u', box_chars['tl'] + label_border_top + box_chars['tr'])
+    lab_line = array('u', box_chars['v'] + label_middle + box_chars['v'])
+    crn_line = array('u', box_chars['bl'] + box_chars['tr'] + label_blank + box_chars['v'])
+    mid_line = array('u', box_chars['v'] + label_blank + box_chars['v'])
+    bot_line = array('u', box_chars['bl'] + label_border_bottom + box_chars['br'])
+
+    textpad[y][x - 1:x + w] = top_line
+    textpad[y + 1][x - 1:x + w] = lab_line
+    textpad[y + 2][x - 1:x + w] = crn_line
+    textpad[y + 3][x:x + w] = mid_line
+    textpad[y + 4][x:x + w] = mid_line
+    textpad[y + h - 1][x:x + w] = bot_line

From 16cd1d9bf78539dfd2590a831ba9708dcac69411 Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Sun, 6 Mar 2022 10:18:41 +0900
Subject: [PATCH 727/867] Change helix:five_rows keymap to use QMK standerd
 oled driver (#16539)

---
 keyboards/helix/rev2/keymaps/five_rows/rules.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
index 60dc4b61a6..a92591d36b 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
@@ -19,6 +19,7 @@ HELIX_ROWS = 5              # Helix Rows is 4 or 5
 # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
 # LED_ANIMATIONS = yes        # LED animations
 # IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
+OLED_SELECT = core
 
 CUSTOM_DELAY = yes
 

From 30209de9fd2e2d142ef1e086a851ceeb058cfcef Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sun, 6 Mar 2022 21:58:08 +0000
Subject: [PATCH 728/867] merge/uma - Resolve configurator issues (#16551)

---
 keyboards/merge/uma/uma.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/merge/uma/uma.c b/keyboards/merge/uma/uma.c
index 376cdfd3fe..565a09fb27 100644
--- a/keyboards/merge/uma/uma.c
+++ b/keyboards/merge/uma/uma.c
@@ -50,8 +50,6 @@ static const char PROGMEM merge_logo[] = {
     0x01, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00
 };
 
-int current_wpm = 0;
-
 static void print_status_narrow(void) {
     oled_set_cursor(0,1);
     oled_write_raw_P(merge_logo, sizeof(merge_logo));
@@ -86,6 +84,7 @@ static void print_status_narrow(void) {
     //oled_write_ln_P(PSTR(" "), false);
     oled_write_P(PSTR("-----"), false);
 
+#ifdef WPM_ENABLE
     // WPM counter Start
     oled_set_cursor(0,13);
     oled_write(" ", false);
@@ -93,6 +92,7 @@ static void print_status_narrow(void) {
     oled_set_cursor(0,14);
     oled_write(" WPM ", false);
     // WPM counter End
+#endif
 }
 
 bool oled_task_kb(void) {

From 4cae7becb19f58005e68a3c4ec4ce426c5d74d5b Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Mon, 7 Mar 2022 12:02:00 +0900
Subject: [PATCH 729/867] [Keymap] Change helix:fraanrosi keymap to use
 split_common (#16533)

---
 keyboards/helix/rev2/keymaps/fraanrosi/rules.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk b/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk
index 98585b0d60..4e80183863 100644
--- a/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk
+++ b/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk
@@ -5,6 +5,7 @@
 #   See TOP/keyboards/helix/rules.mk for a list of options that can be set.
 #   See TOP/docs/config_options.md for more information.
 #
+SPLIT_KEYBOARD = yes
 LTO_ENABLE = no  # if firmware size over limit, try this option
 MOUSEKEY_ENABLE = yes    # Mouse keys
 EXTRAKEY_ENABLE = yes    # Audio control and System control

From 9d6cea070e3687b743500b05efca060c13eb4685 Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Mon, 7 Mar 2022 12:02:40 +0900
Subject: [PATCH 730/867] [Keymap] Change helix:five_rows_jis keymap to use
 split_common (#16538)

---
 .../helix/rev2/keymaps/five_rows_jis/keymap.c | 130 +++++++++++++++---
 .../helix/rev2/keymaps/five_rows_jis/rules.mk |   9 ++
 2 files changed, 118 insertions(+), 21 deletions(-)

diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
index a22a4b1663..24b2a59012 100644
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
+++ b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
@@ -1,10 +1,7 @@
 #include QMK_KEYBOARD_H
 #include "keymap_jp.h"
-#include "bootloader.h"
-#ifdef PROTOCOL_LUFA
-#include "lufa.h"
-#include "split_util.h"
-#endif
+#include <stdio.h>
+#include <string.h>
 #ifdef SSD1306OLED
   #include "ssd1306.h"
 #endif
@@ -15,15 +12,6 @@
 // * If you want to use the Kana key you can enable this comment out. However, the binary size may be over. *
 // #define KANA_ENABLE
 
-extern keymap_config_t keymap_config;
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -209,7 +197,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #error "undefined keymaps"
 #endif
 
-#ifdef SSD1306OLED
+#if defined(SSD1306OLED) || defined(OLED_ENABLE)
 char keylog[24] = {};
 const char code_to_name[60] = {
     ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
@@ -266,7 +254,7 @@ void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
 #endif
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  #ifdef SSD1306OLED
+  #if defined(SSD1306OLED) || defined(OLED_ENABLE)
     if (record->event.pressed) {
       set_keylog(keycode, record);
     }
@@ -279,7 +267,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
           if (record->event.pressed) {
             rgblight_mode(RGB_current_mode);
             rgblight_step();
-            RGB_current_mode = rgblight_config.mode;
+            RGB_current_mode = rgblight_get_mode();
           }
         break;
     #endif
@@ -312,7 +300,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
           if (record->event.pressed) {
             eeconfig_update_rgblight_default();
             rgblight_enable();
-            RGB_current_mode = rgblight_config.mode;
+            RGB_current_mode = rgblight_get_mode();
           }
         break;
     #endif
@@ -325,7 +313,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 void matrix_init_user(void) {
   #ifdef RGBLIGHT_ENABLE
-    RGB_current_mode = rgblight_config.mode;
+    RGB_current_mode = rgblight_get_mode();
   #endif
   //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
   #ifdef SSD1306OLED
@@ -431,7 +419,7 @@ void iota_gfx_task_user(void) {
   #endif
 
   matrix_clear(&matrix);
-  if (is_master) {
+  if (is_keyboard_master()) {
     render_status(&matrix);
   } else {
     render_logo(&matrix);
@@ -440,4 +428,104 @@ void iota_gfx_task_user(void) {
   matrix_update(&display, &matrix);
 }
 
-#endif
+#endif // end of SSD1306OLED
+
+//OLED update loop
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    if (is_keyboard_master()) {
+        return OLED_ROTATION_0;
+    } else {
+        return OLED_ROTATION_180;
+    }
+}
+
+//assign the right code to your layers for OLED display
+#define L_BASE _BASE
+#define L_LOWER (1<<_LOWER)
+#define L_RAISE (1<<_RAISE)
+#define L_ADJUST (1<<_ADJUST)
+#define L_ADJUST_TRI (L_ADJUST|L_RAISE|L_LOWER)
+#define L_LOW_E (1<<_LOW_E)
+#define L_RAI_E (1<<_RAI_E)
+#define L_ADJUST_TRIE (L_ADJUST|L_RAI_E|L_LOW_E)
+
+const char helix_logo[]={
+  0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+  0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+  0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
+  0};
+
+static inline void render_logo(void) {
+  oled_write(helix_logo, false);
+}
+
+const char mac_win_logo[][2][3]={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
+
+static inline void render_status(void) {
+  char buf[20];
+  // Render to mode icon
+  if(keymap_config.swap_lalt_lgui==false){
+    oled_write(mac_win_logo[0][0], false);
+    oled_write_P(PSTR("\n"), false);
+    oled_write(mac_win_logo[0][1], false);
+  } else {
+    oled_write(mac_win_logo[1][0], false);
+    oled_write_P(PSTR("\n"), false);
+    oled_write(mac_win_logo[1][1], false);
+  }
+
+  #ifdef RGBLIGHT_ENABLE
+    snprintf(buf, sizeof(buf), "  LED mode:%d", (short)RGB_current_mode);
+    oled_write(buf, false);
+  #endif
+
+  // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
+  oled_write_P(PSTR("\nLayer: "), false);
+  switch (layer_state) {
+    case L_BASE:
+      oled_write_P(default_layer_state == (1UL<<_BAS_E) ? PSTR("BaseEx") : PSTR("Base"), false);
+      break;
+    case L_RAISE:
+      oled_write_P(PSTR("Raise"), false);
+      break;
+    case L_RAI_E:
+      oled_write_P(PSTR("RaiseEx"), false);
+      break;
+    case L_LOWER:
+      oled_write_P(PSTR("Lower"), false);
+      break;
+    case L_LOW_E:
+      oled_write_P(PSTR("LowerEx"), false);
+      break;
+    case L_ADJUST:
+    case L_ADJUST_TRI:
+    case L_ADJUST_TRIE:
+      oled_write_P(PSTR("Adjust"), false);
+      break;
+    default:
+      snprintf(buf, sizeof(buf), "%d", (short)layer_state);
+      oled_write(buf, false);
+  }
+
+  oled_write(keylog, false);
+}
+
+bool oled_task_user(void) {
+
+#    if DEBUG_TO_SCREEN
+    if (debug_enable) {
+        return;
+    }
+#    endif
+
+  if (is_keyboard_master()) {
+    render_status();
+  } else {
+    render_logo();
+  }
+
+  return false;
+}
+
+#endif // end of OLED_ENABLE
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
index 3ef6f82366..6300137fd6 100644
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
@@ -1,4 +1,5 @@
 LTO_ENABLE = no  # if firmware size over limit, try this option
+SPLIT_KEYBOARD = yes
 
 # Helix Spacific Build Options
 # you can uncomment and edit follows 7 Variables
@@ -10,3 +11,11 @@ HELIX_ROWS = 5              # Helix Rows is 4 or 5
 # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
 # LED_ANIMATIONS = yes        # LED animations
 # IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
+
+# OLED_ENABLE が yes のとき
+#   OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
+#   OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
+# If OLED_ENABLE is 'yes'
+#   If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
+#   If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
+OLED_SELECT = core

From b77d51f41aaee66b5d9743a7ba58655f944f4d71 Mon Sep 17 00:00:00 2001
From: npspears <40127181+npspears@users.noreply.github.com>
Date: Sun, 6 Mar 2022 21:26:23 -0600
Subject: [PATCH 731/867] [Keyboard] add support for Quark_Plus (#16324)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/checkerboards/quark_plus/config.h   | 74 +++++++++++++++
 keyboards/checkerboards/quark_plus/info.json  | 23 +++++
 .../quark_plus/keymaps/2u/config.h            |  1 +
 .../quark_plus/keymaps/2u/keymap.c            | 82 +++++++++++++++++
 .../quark_plus/keymaps/2x225u/config.h        |  1 +
 .../quark_plus/keymaps/2x225u/keymap.c        | 82 +++++++++++++++++
 .../quark_plus/keymaps/2x3u/config.h          |  1 +
 .../quark_plus/keymaps/2x3u/keymap.c          | 82 +++++++++++++++++
 .../quark_plus/keymaps/default/config.h       |  1 +
 .../quark_plus/keymaps/default/keymap.c       | 82 +++++++++++++++++
 .../quark_plus/keymaps/default/readme.md      |  1 +
 .../quark_plus/keymaps/via/keymap.c           | 89 +++++++++++++++++++
 .../quark_plus/keymaps/via/rules.mk           |  1 +
 .../checkerboards/quark_plus/quark_plus.c     | 35 ++++++++
 .../checkerboards/quark_plus/quark_plus.h     | 82 +++++++++++++++++
 keyboards/checkerboards/quark_plus/readme.md  | 17 ++++
 keyboards/checkerboards/quark_plus/rules.mk   | 20 +++++
 17 files changed, 674 insertions(+)
 create mode 100644 keyboards/checkerboards/quark_plus/config.h
 create mode 100644 keyboards/checkerboards/quark_plus/info.json
 create mode 100644 keyboards/checkerboards/quark_plus/keymaps/2u/config.h
 create mode 100644 keyboards/checkerboards/quark_plus/keymaps/2u/keymap.c
 create mode 100644 keyboards/checkerboards/quark_plus/keymaps/2x225u/config.h
 create mode 100644 keyboards/checkerboards/quark_plus/keymaps/2x225u/keymap.c
 create mode 100644 keyboards/checkerboards/quark_plus/keymaps/2x3u/config.h
 create mode 100644 keyboards/checkerboards/quark_plus/keymaps/2x3u/keymap.c
 create mode 100644 keyboards/checkerboards/quark_plus/keymaps/default/config.h
 create mode 100644 keyboards/checkerboards/quark_plus/keymaps/default/keymap.c
 create mode 100644 keyboards/checkerboards/quark_plus/keymaps/default/readme.md
 create mode 100644 keyboards/checkerboards/quark_plus/keymaps/via/keymap.c
 create mode 100644 keyboards/checkerboards/quark_plus/keymaps/via/rules.mk
 create mode 100644 keyboards/checkerboards/quark_plus/quark_plus.c
 create mode 100644 keyboards/checkerboards/quark_plus/quark_plus.h
 create mode 100644 keyboards/checkerboards/quark_plus/readme.md
 create mode 100644 keyboards/checkerboards/quark_plus/rules.mk

diff --git a/keyboards/checkerboards/quark_plus/config.h b/keyboards/checkerboards/quark_plus/config.h
new file mode 100644
index 0000000000..a2d2dc230c
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/config.h
@@ -0,0 +1,74 @@
+/* Copyright 2022 Nathan Spears
+ *
+ * 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       0x7070
+#define PRODUCT_ID      0x5344
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Nasp
+#define PRODUCT         QUARK_PlUS
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 6
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B4, B1, C2, D0, D6, B0, B6, B5 }
+#define MATRIX_COL_PINS { C6, D1, D5, D4, D3, D2 }
+#define UNUSED_PINS
+
+/* 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
+
+/* Switch LED Backlighting */
+#define BACKLIGHT_PIN C4
+#define BACKLIGHT_LEVELS 6
+#define BACKLIGHT_BREATHING
+#define BREATHING_PERIOD 6
+
+// ws2812 options
+#define RGB_DI_PIN C5 // pin the DI on the ws2812 is hooked-up to
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 14 // number of LEDs
+#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
+#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
+#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
+
+#define ENCODERS_PAD_A { C7, B7, B3, B2}
+#define ENCODERS_PAD_B { B7, C7, B2, B3}
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/checkerboards/quark_plus/info.json b/keyboards/checkerboards/quark_plus/info.json
new file mode 100644
index 0000000000..b5a111ce8e
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/info.json
@@ -0,0 +1,23 @@
+{
+    "keyboard_name": "Quark_Plus",
+    "url": "https://www.github.com/qmk/qmk_firmware/tree/master/keyboards/checkerboards/quark_plus",
+    "maintainer": "nasp",
+    "layouts": {
+          "LAYOUT_grid": {
+              "layout":
+                [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":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":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3}, {"label":"WIN", "x":1, "y":3}, {"label":"MENU", "x":2, "y":3}, {"label":"ALT", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"&uArr;", "x":7, "y":3}, {"label":"LEFT", "x":8, "y":3}, {"label":"DOWN", "x":9, "y":3}, {"label":"UP", "x":10, "y":3}, {"label":"RIGHT", "x":11, "y":3}]
+                               },
+          "LAYOUT_2u":   {
+              "layout":
+                [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":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":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3}, {"label":"WIN", "x":1, "y":3}, {"label":"MENU", "x":2, "y":3}, {"label":"ALT", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"&uArr;", "x":7, "y":3}, {"label":"LEFT", "x":8, "y":3}, {"label":"DOWN", "x":9, "y":3}, {"label":"UP", "x":10, "y":3}, {"label":"RIGHT", "x":11, "y":3}]
+                               },
+          "LAYOUT_2x225u": {
+              "layout":
+                [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":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":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3, "w":1.25}, {"label":"WIN", "x":1.25, "y":3, "w":1.25}, {"label":"ALT", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.25}, {"label":"ALT", "x":8.25, "y":3, "w":1.25}, {"label":"MENU", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3, "w":1.25}]
+                               },
+          "LAYOUT_2x3u":   {
+              "layout":
+                [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":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":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3}, {"label":"WIN", "x":1, "y":3}, {"label":"ALT", "x":2, "y":3}, {"x":3, "y":3, "w":3}, {"x":6, "y":3, "w":3}, {"label":"ALT", "x":9, "y":3}, {"label":"MENU", "x":10, "y":3}, {"label":"CTRL", "x":11, "y":3}]
+                               }
+                 }
+  }
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2u/config.h b/keyboards/checkerboards/quark_plus/keymaps/2u/config.h
new file mode 100644
index 0000000000..9ec4fd1a94
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/2u/config.h
@@ -0,0 +1 @@
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2u/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/2u/keymap.c
new file mode 100644
index 0000000000..b62e60370e
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/2u/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2022 Nathan Spears
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* [0]
+  * ,-----------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+------|
+  * | TAB       |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | DEL   |
+  * |------------+------+------+------+------+-------------+------+------+------+------+------|
+  * | CTRL&ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "    |
+  * |------------+------+------+------+------+------|------+------+------+------+------+------|
+  * | SHIFT     |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | ENTER |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+  * |    PRINT   | Ctrl | ALT  | GUI  |LOWER |   SPACE    |RAISE | LEFT | DOWN |  UP  |RIGHT  |
+  * `-----------------------------------------------------------------------------------------'
+  */
+  [0] = LAYOUT_2u(
+      KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+      CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+      KC_PSCR,       KC_LCTL, KC_LALT, KC_LGUI, TT(1),   KC_SPC,  TT(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+  /* [1]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+----|
+  * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+  * |------------+------+------+------+------+-------------+------+------+------+------+----|
+  * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+  * |------------+------+------+------+------+------|------+------+------+------+------+----|
+  * |       |       |      |      |      |      |      |   +   |   =  |      |      |       |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+  * |     |    | ESC  |CTRL-ALT-DEL|TASK|        |     |     |    |  '|'  |   `   |       |
+  * `---------------------------------------------------------------------------------------'
+  */
+  [1] = LAYOUT_2u(
+      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+      KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL, _______, _______, _______,
+      _______, KC_ESC,  CALTDEL,  TSKMGR, _______, _______, _______, _______, KC_NUBS, KC_GRV, _______
+    ),
+
+  /* [2]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+---|
+  * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+  * |------------+------+------+------+------+-------------+------+------+------+------+---|
+  * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+  * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+  * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+  * |RESET |    |      |       |       |            |      |       |      |       |        |
+  * `---------------------------------------------------------------------------------------'
+     */
+  [2] = LAYOUT_2u(
+      _______,  _______,  _______,   KC_UP,   _______,   _______,  _______,  KC_UNDS, _______,  KC_LBRC,  KC_RBRC, _______,
+      _______,  _______,   KC_LEFT, KC_DOWN,  KC_RGHT,   _______,  _______,  KC_MINS, _______,  KC_LCBR,  KC_RCBR, _______,
+      KC_F1,    KC_F2,     KC_F3,   KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,    KC_F10,   KC_F11,  KC_F12,
+      RESET,    _______,   _______, _______,  _______,    _______,  _______, _______,  _______,  _______, _______
+    ),
+    };
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2x225u/config.h b/keyboards/checkerboards/quark_plus/keymaps/2x225u/config.h
new file mode 100644
index 0000000000..9ec4fd1a94
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/2x225u/config.h
@@ -0,0 +1 @@
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2x225u/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/2x225u/keymap.c
new file mode 100644
index 0000000000..f490f76f9f
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/2x225u/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2015-2017 Jack Humbert
+ * Modified by Nasp for the Quark
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* [0]
+  * ,-----------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+------|
+  * | Tab        |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+  * |------------+------+------+------+------+-------------+------+------+------+------+------|
+  * | CTL & ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+  * |------------+------+------+------+------+------|------+------+------+------+------+------|
+  * | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+  * | PRINT   |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
+  * `-----------------------------------------------------------------------------------------'
+  */
+  [0] = LAYOUT_2x225u(
+    KC_TAB,        KC_Q,    KC_W,    KC_F,     KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+    CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,     KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    KC_LSFT,       KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+    KC_PSCR, KC_LGUI, KC_LALT, TT(1), LT(2, KC_SPC), KC_LBRC, KC_RBRC, KC_CAPS
+    ),
+
+  /* [1]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+----|
+  * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+  * |------------+------+------+------+------+-------------+------+------+------+------+----|
+  * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+  * |------------+------+------+------+------+------|------+------+------+------+------+----|
+  * |     |      |      |      |      |      |      |   +   |   =   |      |        |       |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+  * |   ESC  |  CTRL-ALT-DEL   |   TASK   |         |        |    '|'    |    `    |        |
+  * `---------------------------------------------------------------------------------------'
+  */
+  [1] = LAYOUT_2x225u(
+      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+      KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL, _______, _______, _______,
+      KC_ESC,  CALTDEL,  TSKMGR, _______, _______, KC_NUBS, KC_GRV,  _______
+    ),
+
+  /* [2]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+---|
+  * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+  * |------------+------+------+------+------+-------------+------+------+------+------+---|
+  * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+  * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+  * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+  * |     RESET    |           |          |         |         |         |        |         |
+  * `---------------------------------------------------------------------------------------'
+     */
+  [2] = LAYOUT_2x225u(
+      _______,  _______,  _______,   KC_UP,   _______,  _______,  _______,  KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
+      _______,  _______,   KC_LEFT, KC_DOWN, KC_RGHT,   _______,  _______,  KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
+      KC_F1,    KC_F2,     KC_F3,   KC_F4,   KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
+      RESET,  _______, _______, _______,  _______,  _______,  _______, _______
+    ),
+    };
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2x3u/config.h b/keyboards/checkerboards/quark_plus/keymaps/2x3u/config.h
new file mode 100644
index 0000000000..9ec4fd1a94
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/2x3u/config.h
@@ -0,0 +1 @@
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2x3u/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/2x3u/keymap.c
new file mode 100644
index 0000000000..ea65b98cd9
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/2x3u/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2015-2017 Jack Humbert
+ * Modified by Nasp for the Quark
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* [0]
+* ,-----------------------------------------------------------------------------------------.
+* |------------+------+------+------+------+------+------+------+------+------+------+------|
+* | Tab        |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+* |------------+------+------+------+------+-------------+------+------+------+------+------|
+* | CTL & ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+* |------------+------+------+------+------+------|------+------+------+------+------+------|
+* | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+* |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+* | PRINT   |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
+* `-----------------------------------------------------------------------------------------'
+*/
+[0] = LAYOUT_2x3u(
+    KC_TAB,        KC_Q,    KC_W,    KC_F,     KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,   KC_SCLN,  KC_BSPC,
+    CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,     KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,   KC_O,     KC_QUOT,
+    KC_LSFT,       KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+    KC_PSCR, KC_LGUI, KC_LALT, TT(1), LT(2, KC_SPC), KC_LBRC, KC_RBRC, KC_CAPS
+  ),
+
+/* [1]
+* ,---------------------------------------------------------------------------------------.
+* |------------+------+------+------+------+------+------+------+------+------+------+----|
+* |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+* |------------+------+------+------+------+-------------+------+------+------+------+----|
+* |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+* |------------+------+------+------+------+------|------+------+------+------+------+----|
+* |     |      |      |      |      |      |      |   +   |   =   |      |        |       |
+* |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+* |   ESC  |  CTRL-ALT-DEL   |   TASK   |         |        |    '|'    |    `    |        |
+* `---------------------------------------------------------------------------------------'
+*/
+[1] = LAYOUT_2x3u(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL, _______, _______, _______,
+    KC_ESC,  CALTDEL,  TSKMGR, _______, _______, KC_NUBS, KC_GRV,  _______
+  ),
+
+/* [2]
+* ,---------------------------------------------------------------------------------------.
+* |------------+------+------+------+------+------+------+------+------+------+------+---|
+* |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+* |------------+------+------+------+------+-------------+------+------+------+------+---|
+* |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+* |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+* |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+* |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+* |     RESET    |           |          |         |         |         |        |         |
+* `---------------------------------------------------------------------------------------'
+   */
+[2] = LAYOUT_2x3u(
+    _______,  _______,  _______,   KC_UP,   _______,  _______,  _______,  KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
+    _______,  _______,   KC_LEFT, KC_DOWN, KC_RGHT,   _______,  _______,  KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
+    KC_F1,    KC_F2,     KC_F3,   KC_F4,   KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
+    RESET,  _______, _______, _______,  _______,  _______,  _______, _______
+  ),
+  };
diff --git a/keyboards/checkerboards/quark_plus/keymaps/default/config.h b/keyboards/checkerboards/quark_plus/keymaps/default/config.h
new file mode 100644
index 0000000000..9ec4fd1a94
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/default/config.h
@@ -0,0 +1 @@
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark_plus/keymaps/default/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/default/keymap.c
new file mode 100644
index 0000000000..871a386441
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/default/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2022 Nathan Spears
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* [0]
+  * ,-----------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+------|
+  * | TAB       |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | DEL   |
+  * |------------+------+------+------+------+-------------+------+------+------+------+------|
+  * | CTRL&ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "    |
+  * |------------+------+------+------+------+------|------+------+------+------+------+------|
+  * | SHIFT     |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | ENTER |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+  * |    PRINT   | Ctrl | ALT  | GUI  |LOWER |SPACE |SPACE|RAISE | LEFT | DOWN |  UP  |RIGHT  |
+  * `-----------------------------------------------------------------------------------------'
+  */
+  [0] = LAYOUT_grid(
+      KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+      CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+      KC_PSCR,       KC_LCTL, KC_LALT, KC_LGUI, TT(1),   KC_SPC,  KC_SPC,  TT(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+  /* [1]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+----|
+  * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+  * |------------+------+------+------+------+-------------+------+------+------+------+----|
+  * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+  * |------------+------+------+------+------+------|------+------+------+------+------+----|
+  * |       |       |      |      |      |      |      |   +   |   =  |      |      |       |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+  * |     |    | ESC  |CTRL-ALT-DEL|TASK|    |     |     |     |    |  '|'  |   `   |       |
+  * `---------------------------------------------------------------------------------------'
+  */
+  [1] = LAYOUT_grid(
+      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+      KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL, _______, _______, _______,
+      _______, KC_ESC,  CALTDEL,  TSKMGR, _______, _______, _______, _______, _______, KC_NUBS, KC_GRV, _______
+    ),
+
+  /* [2]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+---|
+  * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+  * |------------+------+------+------+------+-------------+------+------+------+------+---|
+  * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+  * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+  * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+  * |RESET |    |      |       |       |     |      |      |       |      |       |        |
+  * `---------------------------------------------------------------------------------------'
+     */
+  [2] = LAYOUT_grid(
+      _______,  _______,  _______,   KC_UP,   _______,   _______,  _______,  KC_UNDS, _______,  KC_LBRC,  KC_RBRC, _______,
+      _______,  _______,   KC_LEFT, KC_DOWN,  KC_RGHT,   _______,  _______,  KC_MINS, _______,  KC_LCBR,  KC_RCBR, _______,
+      KC_F1,    KC_F2,     KC_F3,   KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,    KC_F10,   KC_F11,  KC_F12,
+      RESET,    _______,   _______, _______,  _______,   _______,  _______,  _______, _______,  _______,  _______, _______
+    ),
+  };
diff --git a/keyboards/checkerboards/quark_plus/keymaps/default/readme.md b/keyboards/checkerboards/quark_plus/keymaps/default/readme.md
new file mode 100644
index 0000000000..65ffbc82db
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/default/readme.md
@@ -0,0 +1 @@
+The Default Quark_Plus Layout
diff --git a/keyboards/checkerboards/quark_plus/keymaps/via/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/via/keymap.c
new file mode 100644
index 0000000000..165ecbbd53
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/via/keymap.c
@@ -0,0 +1,89 @@
+/* Copyright 2022 Nathan Spears
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* [0]
+  * ,-----------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+------|
+  * | TAB       |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | DEL   |
+  * |------------+------+------+------+------+-------------+------+------+------+------+------|
+  * | CTRL&ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "    |
+  * |------------+------+------+------+------+------|------+------+------+------+------+------|
+  * | SHIFT     |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | ENTER |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+  * |    PRINT   | Ctrl | ALT  | GUI  |LOWER |SPACE |SPACE|RAISE | LEFT | DOWN |  UP  |RIGHT  |
+  * `-----------------------------------------------------------------------------------------'
+  */
+  [0] = LAYOUT_grid(
+      KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+      CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+      KC_PSCR,       KC_LCTL, KC_LALT, KC_LGUI, TT(1),   KC_SPC,  KC_SPC,  TT(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+  /* [1]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+----|
+  * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+  * |------------+------+------+------+------+-------------+------+------+------+------+----|
+  * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+  * |------------+------+------+------+------+------|------+------+------+------+------+----|
+  * |       |       |      |      |      |      |      |   +   |   =  |      |      |       |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+  * |     |    | ESC  |CTRL-ALT-DEL|TASK|    |     |     |     |    |  '|'  |   `   |       |
+  * `---------------------------------------------------------------------------------------'
+  */
+  [1] = LAYOUT_grid(
+      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+      KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL, _______, _______, _______,
+      _______, KC_ESC,  CALTDEL,  TSKMGR, _______, _______, _______, _______, _______, KC_NUBS, KC_GRV, _______
+    ),
+
+  /* [2]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+---|
+  * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+  * |------------+------+------+------+------+-------------+------+------+------+------+---|
+  * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+  * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+  * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+  * |RESET |    |      |       |       |     |      |      |       |      |       |        |
+  * `---------------------------------------------------------------------------------------'
+     */
+  [2] = LAYOUT_grid(
+      _______,  _______,  _______,   KC_UP,   _______,   _______,  _______,  KC_UNDS, _______,  KC_LBRC,  KC_RBRC, _______,
+      _______,  _______,   KC_LEFT, KC_DOWN,  KC_RGHT,   _______,  _______,  KC_MINS, _______,  KC_LCBR,  KC_RCBR, _______,
+      KC_F1,    KC_F2,     KC_F3,   KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,    KC_F10,   KC_F11,  KC_F12,
+      RESET,    _______,   _______, _______,  _______,   _______,  _______,  _______, _______,  _______,  _______, _______
+    ),
+
+  [3] = LAYOUT_grid(
+      _______, _______, _______,   KC_UP,  _______, _______,  _______,  KC_UNDS, _______,  KC_LBRC,  KC_RBRC, _______,
+      _______, _______, KC_LEFT, KC_DOWN,  KC_RGHT, _______,  _______,  KC_MINS, _______,  KC_LCBR,  KC_RCBR, _______,
+      KC_F1,   KC_F2,   KC_F3,     KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
+      RESET,   _______, _______, _______,  _______, _______,  _______,  _______, _______,  _______,  _______, _______
+    ),
+  };
diff --git a/keyboards/checkerboards/quark_plus/keymaps/via/rules.mk b/keyboards/checkerboards/quark_plus/keymaps/via/rules.mk
new file mode 100644
index 0000000000..69de2e4c5a
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/checkerboards/quark_plus/quark_plus.c b/keyboards/checkerboards/quark_plus/quark_plus.c
new file mode 100644
index 0000000000..036d3a96c5
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/quark_plus.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 Nathan Spears
+ *
+ * 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 "quark_plus.h"
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_kb(index, clockwise)) { return false; }
+    if (index == 1) { /* left encoder*/
+                if (clockwise){
+                    tap_code(KC_WH_U);
+                } else {
+                    tap_code(KC_WH_D);
+                }
+    } else if (index == 0) { /* right encoder */
+                if (clockwise){
+                    tap_code(KC_VOLU);
+                } else {
+                    tap_code(KC_VOLD);
+        }
+    }
+    return true;
+}
diff --git a/keyboards/checkerboards/quark_plus/quark_plus.h b/keyboards/checkerboards/quark_plus/quark_plus.h
new file mode 100644
index 0000000000..4152acbe50
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/quark_plus.h
@@ -0,0 +1,82 @@
+/* Copyright 2022 Nathan Spears
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_grid( \
+    k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
+    k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
+    k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
+    k60, k70, k71, k61, k62, k72, k73, k63, k64, k74, k75, k65 \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k40, k41, k42, k43, k44, k45 }, \
+    { k50, k51, k52, k53, k54, k55 }, \
+    { k60, k61, k62, k63, k64, k65 }, \
+    { k70, k71, k72, k73, k74, k75 } \
+}
+#define LAYOUT_2u( \
+    k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
+    k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
+    k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
+    k60, k70, k71, k61, k62,      k73, k63, k64, k74, k75, k65 \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k40, k41, k42, k43, k44, k45 }, \
+    { k50, k51, k52, k53, k54, k55 }, \
+    { k60, k61, k62, XXX, k64, k65 }, \
+    { k70, k71, XXX, k73, k74, k75 } \
+}
+#define LAYOUT_2x225u( \
+    k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
+    k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
+    k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
+    k60, k70,      k61, k62,           k63, k64,      k75, k65 \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k40, k41, k42, k43, k44, k45 }, \
+    { k50, k51, k52, k53, k54, k55 }, \
+    { k60, k61, k62, k63, k64, k65 }, \
+    { k70, XXX, XXX, XXX, XXX, k75 } \
+}
+#define LAYOUT_2x3u( \
+    k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
+    k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
+    k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
+    k60, k70, k71,      k62,           k63,      k74, k75, k65 \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k40, k41, k42, k43, k44, k45 }, \
+    { k50, k51, k52, k53, k54, k55 }, \
+    { k60, XXX, k62, k63, XXX, k65 }, \
+    { k70, k71, XXX, XXX, k74, k75 } \
+}
diff --git a/keyboards/checkerboards/quark_plus/readme.md b/keyboards/checkerboards/quark_plus/readme.md
new file mode 100644
index 0000000000..6e4ff5f65f
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/readme.md
@@ -0,0 +1,17 @@
+# Quark_Plus
+
+![Quark_Plus](https://i.imgur.com/4TI6BA0h.png)
+
+The Quark Plus is a premium Quark for those that want more features of the original. It features support for 4 rotary encoders (it is recommended to use 1 per left and right side), LED backlighting, RGB underglow, JST connector, and compatibility for earlier revisions of your favorite ortholinear keyboard.
+
+* Keyboard Maintainer: [Nasp](https://github.com/npspears)
+* Hardware Supported: Quark_Plus
+* Hardware Availability: https://www.checkerboards.xyz
+
+Make example for this keyboard (after setting up your build environment):
+
+    make checkerboards/quark_plus:default
+
+To enter the bootloader, press the hardware button on the back of the PCB just to the left of the USB connector.
+
+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).
diff --git a/keyboards/checkerboards/quark_plus/rules.mk b/keyboards/checkerboards/quark_plus/rules.mk
new file mode 100644
index 0000000000..8ffb43e252
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+BACKLIGHT_DRIVER = pwm	    # Valid driver values are pwm, software, custom or no
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes	      # Enable rotary encoder

From de10757f057d31a148d0b881535d875ff4af5c9c Mon Sep 17 00:00:00 2001
From: Andrew Garver <andrewsgarver@gmail.com>
Date: Sun, 6 Mar 2022 20:27:08 -0700
Subject: [PATCH 732/867] [Keyboard] fourier via keymap (#16335)

---
 keyboards/keebio/fourier/keymaps/via/keymap.c | 69 +++++++++++++++++++
 keyboards/keebio/fourier/keymaps/via/rules.mk |  2 +
 2 files changed, 71 insertions(+)
 create mode 100644 keyboards/keebio/fourier/keymaps/via/keymap.c
 create mode 100644 keyboards/keebio/fourier/keymaps/via/rules.mk

diff --git a/keyboards/keebio/fourier/keymaps/via/keymap.c b/keyboards/keebio/fourier/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c16ff08d06
--- /dev/null
+++ b/keyboards/keebio/fourier/keymaps/via/keymap.c
@@ -0,0 +1,69 @@
+/*
+Copyright 2022 Andrew Garver <contact@keebmaker.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum custom_layers {
+  _BASE,
+  _FN1,
+  _FN2,
+  _FN3,
+};
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+};
+
+#define KC_FN1 MO(_FN1)
+#define KC_FN2 MO(_FN2)
+#define SPFN1 LT(_FN1, KC_SPACE)
+#define BSFN2 LT(_FN2, KC_BSPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,  KC_BSPC,
+    KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    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_LCTL, KC_LALT, KC_LGUI, KC_FN1,  SPFN1,            BSFN2,                     KC_RGUI, KC_RALT, KC_FN2,  KC_RCTL
+  ),
+
+  [_FN1] = LAYOUT(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
+    RESET,   RGB_HUI, RGB_SAI, RGB_VAI, KC_VOLU, KC_LBRC, KC_RBRC, KC_4,    KC_5,    KC_6,    KC_SCLN,          _______,
+    RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_VOLD, KC_LCBR, KC_RCBR,          KC_1,    KC_2,    KC_3,    KC_UP,   _______,
+    RGB_TOG, _______, _______, _______, _______,          KC_DEL,                    KC_0,    KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [_FN2] = LAYOUT(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_UNDS, KC_PLUS,
+    _______, _______, _______, KC_INS,  KC_PGUP, KC_HOME, _______, _______, _______, _______, KC_COLN,          _______,
+    _______, _______, _______, KC_DEL,  KC_PGDN, KC_END,  _______,          _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, KC_DEL,           _______,                   _______, _______, _______, _______
+  ),
+
+  [_FN3] = LAYOUT(
+    _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______,  _______,          _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,           _______,                   _______, _______, _______, _______
+  ),
+
+};
diff --git a/keyboards/keebio/fourier/keymaps/via/rules.mk b/keyboards/keebio/fourier/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/keebio/fourier/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

From 5de86a05c31482b5c770888e33c98d933c42b34c Mon Sep 17 00:00:00 2001
From: Takuya Urakawa <urkwtky@gmail.com>
Date: Mon, 7 Mar 2022 12:27:41 +0900
Subject: [PATCH 733/867] [Keyboard] Add Lain keyboard (#16345)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/dm9records/lain/config.h            | 47 ++++++++++
 keyboards/dm9records/lain/info.json           | 60 +++++++++++++
 .../dm9records/lain/keymaps/default/keymap.c  | 79 ++++++++++++++++
 .../dm9records/lain/keymaps/default/readme.md |  5 ++
 .../dm9records/lain/keymaps/via/keymap.c      | 90 +++++++++++++++++++
 .../dm9records/lain/keymaps/via/readme.md     |  8 ++
 .../dm9records/lain/keymaps/via/rules.mk      |  1 +
 keyboards/dm9records/lain/lain.c              | 49 ++++++++++
 keyboards/dm9records/lain/lain.h              | 41 +++++++++
 keyboards/dm9records/lain/readme.md           | 32 +++++++
 keyboards/dm9records/lain/rules.mk            | 18 ++++
 11 files changed, 430 insertions(+)
 create mode 100644 keyboards/dm9records/lain/config.h
 create mode 100644 keyboards/dm9records/lain/info.json
 create mode 100644 keyboards/dm9records/lain/keymaps/default/keymap.c
 create mode 100644 keyboards/dm9records/lain/keymaps/default/readme.md
 create mode 100644 keyboards/dm9records/lain/keymaps/via/keymap.c
 create mode 100644 keyboards/dm9records/lain/keymaps/via/readme.md
 create mode 100644 keyboards/dm9records/lain/keymaps/via/rules.mk
 create mode 100644 keyboards/dm9records/lain/lain.c
 create mode 100644 keyboards/dm9records/lain/lain.h
 create mode 100644 keyboards/dm9records/lain/readme.md
 create mode 100644 keyboards/dm9records/lain/rules.mk

diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h
new file mode 100644
index 0000000000..8bccf4bbb5
--- /dev/null
+++ b/keyboards/dm9records/lain/config.h
@@ -0,0 +1,47 @@
+// Copyright 2022 Takuya Urakawa @hsgw (dm9records.com, 5z6p.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x04D8
+#define PRODUCT_ID 0xE8F4
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Dm9Records
+#define PRODUCT lain
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+/*
+ * Keyboard Matrix Assignments
+ */
+#define MATRIX_ROW_PINS \
+    { C6, D7, D6, D4 }
+#define MATRIX_COL_PINS \
+    { C7, F7, F6, F5, F4, F1, F0, B3, B2, B1, D2, D3, D5 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* LED Settings */
+#define LED_NUM 3
+#define LED_PINS \
+    { B6, B5, B4 }
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6
diff --git a/keyboards/dm9records/lain/info.json b/keyboards/dm9records/lain/info.json
new file mode 100644
index 0000000000..57e28d28dd
--- /dev/null
+++ b/keyboards/dm9records/lain/info.json
@@ -0,0 +1,60 @@
+{
+    "keyboard_name": "lain",
+    "url": "https://5z6p.com/lain",
+    "maintainer": "hsgw",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "x": 0, "y": 0 },
+                { "x": 1, "y": 0 },
+                { "x": 2, "y": 0 },
+                { "x": 3, "y": 0 },
+                { "x": 4, "y": 0 },
+                { "x": 5, "y": 0 },
+                { "x": 6, "y": 0 },
+                { "x": 8.5, "y": 0 },
+                { "x": 9.5, "y": 0 },
+                { "x": 10.5, "y": 0 },
+                { "x": 11.5, "y": 0 },
+                { "x": 12.5, "y": 0 },
+                { "x": 13.5, "y": 0, "w": 1.5 },
+                { "x": 0.25, "y": 1 },
+                { "x": 1.25, "y": 1 },
+                { "x": 2.25, "y": 1 },
+                { "x": 3.25, "y": 1 },
+                { "x": 4.25, "y": 1 },
+                { "x": 5.25, "y": 1 },
+                { "x": 6.25, "y": 1 },
+                { "x": 8.75, "y": 1 },
+                { "x": 9.75, "y": 1 },
+                { "x": 10.75, "y": 1 },
+                { "x": 11.75, "y": 1 },
+                { "x": 12.75, "y": 1 },
+                { "x": 13.75, "y": 1 },
+                { "x": 0.5, "y": 2, "w": 1.25 },
+                { "x": 1.75, "y": 2 },
+                { "x": 2.75, "y": 2 },
+                { "x": 3.75, "y": 2 },
+                { "x": 4.75, "y": 2 },
+                { "x": 5.75, "y": 2 },
+                { "x": 8.25, "y": 2 },
+                { "x": 9.25, "y": 2 },
+                { "x": 10.25, "y": 2 },
+                { "x": 11.25, "y": 2 },
+                { "x": 12.25, "y": 2 },
+                { "x": 13.25, "y": 2, "w": 1.25 },
+                { "x": 1, "y": 3, "w": 1.75 },
+                { "x": 2.75, "y": 3, "w": 1.25 },
+                { "x": 4, "y": 3 },
+                { "x": 5, "y": 3, "w": 1.25 },
+                { "x": 6.25, "y": 3 },
+                { "x": 7.75, "y": 3 },
+                { "x": 8.75, "y": 3, "w": 1.25 },
+                { "x": 10, "y": 3 },
+                { "x": 11, "y": 3 },
+                { "x": 12, "y": 3 },
+                { "x": 13, "y": 3, "w": 1.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/dm9records/lain/keymaps/default/keymap.c b/keyboards/dm9records/lain/keymaps/default/keymap.c
new file mode 100644
index 0000000000..655e3211b2
--- /dev/null
+++ b/keyboards/dm9records/lain/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+// Copyright 2022 Takuya Urakawa @hsgw (dm9records.com, 5z6p.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers { BASE, NUM, FUNC, CONF };
+enum custom_keycodes { LED_EN = SAFE_RANGE };
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [BASE] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,     KC_BSPC,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_RBRC,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,               KC_INS, KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,
+        KC_LCTL,                   KC_LALT, KC_LGUI, MO(NUM), KC_SPC,    KC_ENT, MO(FUNC), KC_RALT, KC_MENU, KC_RCTL,  KC_RSFT
+    ),
+    [NUM] = LAYOUT(
+        KC_DEL,  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_CAPS, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6),   S(KC_7), S(KC_8), S(KC_9), S(KC_0), S(KC_MINS),S(KC_EQL),
+        _______, _______, _______, _______, _______, _______,            KC_PSCR, _______, _______, _______, _______,  KC_BSLS,
+        _______,                   _______, _______, _______, _______,   _______, _______, _______, _______, _______,  _______
+    ),
+    [FUNC] = LAYOUT(
+        KC_DEL,  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_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, _______,
+        _______, _______, _______, _______, _______, _______,            _______, _______, _______, _______, _______, _______,
+        _______,                   _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______
+    ),
+    [CONF] = LAYOUT(
+        RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        LED_EN,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case LED_EN:
+            if (record->event.pressed) {
+                lain_enable_leds_toggle();
+            }
+            return false;
+        default:
+            break;
+    }
+    return true;
+}
+
+// clang-format on
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    layer_state_t computed = update_tri_layer_state(state, NUM, FUNC, CONF);
+    switch (get_highest_layer(computed)) {
+        case NUM:
+            lain_set_led(1, 1);
+            lain_set_led(2, 0);
+            break;
+        case FUNC:
+            lain_set_led(1, 0);
+            lain_set_led(2, 1);
+            break;
+        case CONF:
+            lain_set_led(1, 1);
+            lain_set_led(2, 1);
+            break;
+        default:
+            lain_set_led(1, 0);
+            lain_set_led(2, 0);
+            break;
+    }
+    return computed;
+}
+
+bool led_update_user(led_t led_state) {
+    lain_set_led(0, led_state.caps_lock);
+    return false;
+}
diff --git a/keyboards/dm9records/lain/keymaps/default/readme.md b/keyboards/dm9records/lain/keymaps/default/readme.md
new file mode 100644
index 0000000000..2f59c80ebc
--- /dev/null
+++ b/keyboards/dm9records/lain/keymaps/default/readme.md
@@ -0,0 +1,5 @@
+# The default keymap for lain
+
+## Leds setting
+1: CAPS LOCK   
+2-3: Layor indicator
diff --git a/keyboards/dm9records/lain/keymaps/via/keymap.c b/keyboards/dm9records/lain/keymaps/via/keymap.c
new file mode 100644
index 0000000000..829ffb624f
--- /dev/null
+++ b/keyboards/dm9records/lain/keymaps/via/keymap.c
@@ -0,0 +1,90 @@
+// Copyright 2022 Takuya Urakawa @hsgw (dm9records.com, 5z6p.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers { BASE, NUM, FUNC, CONF, _04, _05 };
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [BASE] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,     KC_BSPC,
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_RBRC,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,               KC_INS, KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,
+        KC_LCTL,                   KC_LALT, KC_LGUI, FN_MO13, KC_SPC,    KC_ENT, FN_MO23, KC_RALT, KC_MENU, KC_RCTL,  KC_RSFT
+    ),
+    [NUM] = LAYOUT(
+        KC_DEL,  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_CAPS, S(KC_1), S(KC_2), S(KC_3), S(KC_4), S(KC_5), S(KC_6),   S(KC_7), S(KC_8), S(KC_9), S(KC_0), S(KC_MINS),S(KC_EQL),
+        _______, _______, _______, _______, _______, _______,            KC_PSCR, _______, _______, _______, _______,  KC_BSLS,
+        _______,                   _______, _______, _______, _______,   _______, _______, _______, _______, _______,  _______
+    ),
+    [FUNC] = LAYOUT(
+        KC_DEL,  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_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, _______,
+        _______, _______, _______, _______, _______, _______,            _______, _______, _______, _______, _______, _______,
+        _______,                   _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______
+    ),
+    [CONF] = LAYOUT(
+        RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        USER00,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+    ),
+    [_04] = LAYOUT(
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+    ),
+    [_05] = LAYOUT(
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,            XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+    )
+};
+
+// clang-format on
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case USER00:
+            // via user keycode USER00 : toggle leds enable
+            if (record->event.pressed) {
+                lain_enable_leds_toggle();
+            }
+            return false;
+        default:
+            break;
+    }
+    return true;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+        case NUM:
+            lain_set_led(1, 1);
+            lain_set_led(2, 0);
+            break;
+        case FUNC:
+            lain_set_led(1, 0);
+            lain_set_led(2, 1);
+            break;
+        case CONF:
+            lain_set_led(1, 1);
+            lain_set_led(2, 1);
+            break;
+        default:
+            lain_set_led(1, 0);
+            lain_set_led(2, 0);
+            break;
+    }
+    return state;
+}
+
+bool led_update_user(led_t led_state) {
+    lain_set_led(0, led_state.caps_lock);
+    return false;
+}
diff --git a/keyboards/dm9records/lain/keymaps/via/readme.md b/keyboards/dm9records/lain/keymaps/via/readme.md
new file mode 100644
index 0000000000..efde27cb47
--- /dev/null
+++ b/keyboards/dm9records/lain/keymaps/via/readme.md
@@ -0,0 +1,8 @@
+# The via keymap for lain
+
+## Leds setting
+1: CAPS LOCK   
+2-3: Layor indicator
+
+## Via user keycode
+USER00 : toggle leds enable
diff --git a/keyboards/dm9records/lain/keymaps/via/rules.mk b/keyboards/dm9records/lain/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/dm9records/lain/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/dm9records/lain/lain.c b/keyboards/dm9records/lain/lain.c
new file mode 100644
index 0000000000..cb8354e5c2
--- /dev/null
+++ b/keyboards/dm9records/lain/lain.c
@@ -0,0 +1,49 @@
+// Copyright 2022 Takuya Urakawa @hsgw (dm9records.com, 5z6p.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "lain.h"
+
+keyboard_config_t lain_config;
+
+static const pin_t leds[LED_NUM]       = LED_PINS;
+bool               led_states[LED_NUM] = {0};
+
+void lain_eeconfig_update_kb(void) { eeconfig_update_kb(lain_config.raw); }
+
+void lain_set_led(uint8_t no, bool flag) {
+    led_states[no] = flag;
+    writePin(leds[no], lain_config.led_enabled ? flag : false);
+}
+
+void lain_enable_leds(bool flag) {
+    lain_config.led_enabled = flag;
+    lain_eeconfig_update_kb();
+
+    for (int i = 0; i < LED_NUM; i++) {
+        writePin(leds[i], lain_config.led_enabled ? led_states[i] : false);
+    }
+}
+
+void lain_enable_leds_toggle(void) { lain_enable_leds(!lain_config.led_enabled); }
+
+void led_init_ports(void) {
+    for (uint8_t i = 0; i < LED_NUM; i++) {
+        setPinOutput(leds[i]);
+        lain_set_led(leds[i], 0);
+    }
+}
+
+void eeconfig_init_kb(void) {
+    // set default config
+    lain_config.led_enabled = true;
+    lain_eeconfig_update_kb();
+
+    eeconfig_init_user();
+}
+
+void keyboard_post_init_kb(void) {
+    // read stored config
+    lain_config.raw = eeconfig_read_kb();
+
+    keyboard_post_init_user();
+}
diff --git a/keyboards/dm9records/lain/lain.h b/keyboards/dm9records/lain/lain.h
new file mode 100644
index 0000000000..e449416e50
--- /dev/null
+++ b/keyboards/dm9records/lain/lain.h
@@ -0,0 +1,41 @@
+// Copyright 2022 Takuya Urakawa @hsgw (dm9records.com, 5z6p.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+typedef union {
+    uint32_t raw;
+    struct {
+        bool led_enabled : 1;
+    };
+} keyboard_config_t;
+
+extern keyboard_config_t lain_config;
+
+void lain_set_led(uint8_t no, bool flag);
+void lain_enable_leds(bool flag);
+void lain_enable_leds_toggle(void);
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+// clang-format off
+#define LAYOUT( \
+    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,k36,k37,k38, \
+            k39,k40,k41,k42,k43,    k44,k45,k46,k47,k48,k49) \
+    { \
+        {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,KC_NO,  k33,k34,k35,k36,k37,k38}, \
+        {KC_NO,k39,  k40,k41,k42,k43,KC_NO,  k44,k45,k46,k47,k48,k49} \
+    }
+// clang-format on
diff --git a/keyboards/dm9records/lain/readme.md b/keyboards/dm9records/lain/readme.md
new file mode 100644
index 0000000000..6eb216af61
--- /dev/null
+++ b/keyboards/dm9records/lain/readme.md
@@ -0,0 +1,32 @@
+# lain
+
+![lain](https://i.imgur.com/V0mR1Bgh.jpg)
+
+Ergonomic 40% keyboard.
+
+serial exprement lain themed.    
+licensed under #lainttl (https://www.nbcuni.co.jp/rondorobe/anime/lain/ttl/)
+
+* Keyboard Maintainer: [Takuya Urakawa @hsgw](https://github.com/hsgw), https://5z6p.com
+* Hardware Supported: onboard MCU.
+* Hardware Availability: Group buy. (https://5z6p.com/products/lain/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dm9records/lain:default:flash
+
+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).
+
+## Note
+### PCB revision
+
+If your pcb is not Rev.1, you should use the firmware in below repository.   
+https://github.com/hsgw/qmk_firmware/tree/lain/keyboards/dm9records/lain
+
+### Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/dm9records/lain/rules.mk b/keyboards/dm9records/lain/rules.mk
new file mode 100644
index 0000000000..476cf49f27
--- /dev/null
+++ b/keyboards/dm9records/lain/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From dcfa4712fb6a000079b5bea8d7cbfc8db91d7bcb Mon Sep 17 00:00:00 2001
From: Felix Jen <fjen@felixjen.com>
Date: Sun, 6 Mar 2022 21:30:13 -0600
Subject: [PATCH 734/867] [Keyboard] Add Kyuu Hotswap (#16360)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/fjlabs/kyuu/config.h                | 120 ++++++++++++++++++
 keyboards/fjlabs/kyuu/info.json               |  83 ++++++++++++
 .../fjlabs/kyuu/keymaps/default/keymap.c      |  39 ++++++
 keyboards/fjlabs/kyuu/keymaps/via/keymap.c    |  58 +++++++++
 keyboards/fjlabs/kyuu/keymaps/via/rules.mk    |   1 +
 keyboards/fjlabs/kyuu/kyuu.c                  |  14 ++
 keyboards/fjlabs/kyuu/kyuu.h                  |  32 +++++
 keyboards/fjlabs/kyuu/readme.md               |  16 +++
 keyboards/fjlabs/kyuu/rules.mk                |  20 +++
 9 files changed, 383 insertions(+)
 create mode 100644 keyboards/fjlabs/kyuu/config.h
 create mode 100644 keyboards/fjlabs/kyuu/info.json
 create mode 100644 keyboards/fjlabs/kyuu/keymaps/default/keymap.c
 create mode 100644 keyboards/fjlabs/kyuu/keymaps/via/keymap.c
 create mode 100644 keyboards/fjlabs/kyuu/keymaps/via/rules.mk
 create mode 100644 keyboards/fjlabs/kyuu/kyuu.c
 create mode 100644 keyboards/fjlabs/kyuu/kyuu.h
 create mode 100644 keyboards/fjlabs/kyuu/readme.md
 create mode 100644 keyboards/fjlabs/kyuu/rules.mk

diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h
new file mode 100644
index 0000000000..b73d6c8f85
--- /dev/null
+++ b/keyboards/fjlabs/kyuu/config.h
@@ -0,0 +1,120 @@
+/*
+Copyright 2021 <felix@fjlaboratories.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x7074 // FJLabs
+#define PRODUCT_ID   0x1012 // Kyuu Hotswap
+#define DEVICE_VER   0x0001 // Version 1
+#define MANUFACTURER    FJLabs
+#define PRODUCT         Kyuu Hotswap
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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)
+ *
+*/
+
+// Checked with Eagle Schematic
+#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
+#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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 Badge RGB */
+#define RGB_DI_PIN C7
+#define RGBLED_NUM 16
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGB_VAL_STEP 12
+#define RGBLIGHT_DEFAULT_SPD 144
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL
+/* #define RGBLIGHT_LAYER_BLINK*/
+
+/* Define less important options */
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ * These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/kyuu/info.json b/keyboards/fjlabs/kyuu/info.json
new file mode 100644
index 0000000000..2bb1ebe843
--- /dev/null
+++ b/keyboards/fjlabs/kyuu/info.json
@@ -0,0 +1,83 @@
+{
+    "keyboard_name": "BKS65",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "FJLabs",
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_badge": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x": 15, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x": 15, "y": 2},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/fjlabs/kyuu/keymaps/default/keymap.c b/keyboards/fjlabs/kyuu/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2e671423b5
--- /dev/null
+++ b/keyboards/fjlabs/kyuu/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2021 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_65_ansi_blocker_badge(
+        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_DEL,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
+        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_PGDN, 
+        KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_65_ansi_blocker_badge(
+        KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, RESET, KC_PGUP,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    )
+};
diff --git a/keyboards/fjlabs/kyuu/keymaps/via/keymap.c b/keyboards/fjlabs/kyuu/keymaps/via/keymap.c
new file mode 100644
index 0000000000..2a97513b38
--- /dev/null
+++ b/keyboards/fjlabs/kyuu/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+/*
+Copyright 2021 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_65_ansi_blocker_badge(
+        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_DEL,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
+        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_PGDN, 
+        KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, 
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_65_ansi_blocker_badge(
+        KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, RESET, KC_PGUP,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    ),
+
+    [_LAYER2] = LAYOUT_65_ansi_blocker_badge(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [_LAYER3] = LAYOUT_65_ansi_blocker_badge(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+};
diff --git a/keyboards/fjlabs/kyuu/keymaps/via/rules.mk b/keyboards/fjlabs/kyuu/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/fjlabs/kyuu/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/fjlabs/kyuu/kyuu.c b/keyboards/fjlabs/kyuu/kyuu.c
new file mode 100644
index 0000000000..9de177c600
--- /dev/null
+++ b/keyboards/fjlabs/kyuu/kyuu.c
@@ -0,0 +1,14 @@
+/*
+Copyright 2021 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "kyuu.h"
diff --git a/keyboards/fjlabs/kyuu/kyuu.h b/keyboards/fjlabs/kyuu/kyuu.h
new file mode 100644
index 0000000000..865708eaf5
--- /dev/null
+++ b/keyboards/fjlabs/kyuu/kyuu.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2021 <felix@fjlaboratories.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+/* BKS65 Keymap Definitions */
+#define LAYOUT_65_ansi_blocker_badge( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,           K45,                     K4A, K4B, K4C, K4D, K4E \
+) { \
+    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09,   K0A, K0B, K0C, K0D,   K0E }, \
+    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19,   K1A, K1B, K1C, K1D,   K1E }, \
+    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29,   K2A, K2B, K2C, KC_NO, K2E }, \
+    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39,   K3A, K3B, K3C, K3D,   K3E }, \
+    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D,   K4E }  \
+}
diff --git a/keyboards/fjlabs/kyuu/readme.md b/keyboards/fjlabs/kyuu/readme.md
new file mode 100644
index 0000000000..775868c5d1
--- /dev/null
+++ b/keyboards/fjlabs/kyuu/readme.md
@@ -0,0 +1,16 @@
+# PaperSky Studio Kyuu Hotswap
+
+The following is the QMK Firmware for the Kyuu compatible Hotswap PCB
+
+---
+
+* Keyboard Maintainer: FJLabs
+* Hardware Supported: Kyuu Hotswap PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make fjlabs/kyuu: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).
+
+You can enter the bootloader by pressing the two reset pads on the back of the PCB with tweezers.
diff --git a/keyboards/fjlabs/kyuu/rules.mk b/keyboards/fjlabs/kyuu/rules.mk
new file mode 100644
index 0000000000..3bbcce8b85
--- /dev/null
+++ b/keyboards/fjlabs/kyuu/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
\ No newline at end of file

From 0e08fad5c5dfd8dd2522a9ed43058d993d35fdf4 Mon Sep 17 00:00:00 2001
From: kopibeng <52724926+kopibeng@users.noreply.github.com>
Date: Mon, 7 Mar 2022 11:36:22 +0800
Subject: [PATCH 735/867] [Keyboard] Add support for Typ65+ (#16399)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/kopibeng/typ65/config.h             | 59 +++++++++++++
 keyboards/kopibeng/typ65/info.json            | 88 +++++++++++++++++++
 .../kopibeng/typ65/keymaps/default/keymap.c   | 57 ++++++++++++
 keyboards/kopibeng/typ65/keymaps/via/keymap.c | 57 ++++++++++++
 keyboards/kopibeng/typ65/keymaps/via/rules.mk |  2 +
 keyboards/kopibeng/typ65/readme.md            | 21 +++++
 keyboards/kopibeng/typ65/rules.mk             | 19 ++++
 keyboards/kopibeng/typ65/typ65.c              | 51 +++++++++++
 keyboards/kopibeng/typ65/typ65.h              | 54 ++++++++++++
 9 files changed, 408 insertions(+)
 create mode 100644 keyboards/kopibeng/typ65/config.h
 create mode 100644 keyboards/kopibeng/typ65/info.json
 create mode 100644 keyboards/kopibeng/typ65/keymaps/default/keymap.c
 create mode 100644 keyboards/kopibeng/typ65/keymaps/via/keymap.c
 create mode 100644 keyboards/kopibeng/typ65/keymaps/via/rules.mk
 create mode 100644 keyboards/kopibeng/typ65/readme.md
 create mode 100644 keyboards/kopibeng/typ65/rules.mk
 create mode 100644 keyboards/kopibeng/typ65/typ65.c
 create mode 100644 keyboards/kopibeng/typ65/typ65.h

diff --git a/keyboards/kopibeng/typ65/config.h b/keyboards/kopibeng/typ65/config.h
new file mode 100644
index 0000000000..9b96483b6a
--- /dev/null
+++ b/keyboards/kopibeng/typ65/config.h
@@ -0,0 +1,59 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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       0x4B50 // 'KP' kopibeng  
+#define PRODUCT_ID      0x065E 
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    kopibeng
+#define PRODUCT         Typ65+
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * 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 { D0, D1, D2, F6, B0 }
+#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F5, F4, F1, F0, E6 }
+
+#define LED_CAPS_LOCK_PIN B1
+#define INDICATOR_0 B2
+#define INDICATOR_1 B7
+#define INDICATOR_2 B3
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
diff --git a/keyboards/kopibeng/typ65/info.json b/keyboards/kopibeng/typ65/info.json
new file mode 100644
index 0000000000..ce3bfbee39
--- /dev/null
+++ b/keyboards/kopibeng/typ65/info.json
@@ -0,0 +1,88 @@
+{
+    "keyboard_name": "Typ65+",
+    "maintainer": "kopibeng",
+    "url": "https://www.axiomstudios.shop/",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "K01", "x": 1.25, "y": 0 },
+                { "label": "K02", "x": 2.25, "y": 0 },
+                { "label": "K03", "x": 3.25, "y": 0 },
+                { "label": "K04", "x": 4.25, "y": 0 },
+                { "label": "K05", "x": 5.25, "y": 0 },
+                { "label": "K06", "x": 6.25, "y": 0 },
+                { "label": "K07", "x": 7.25, "y": 0 },
+                { "label": "K08", "x": 8.25, "y": 0 },
+                { "label": "K09", "x": 9.25, "y": 0 },
+                { "label": "K0A", "x": 10.25, "y": 0 },
+                { "label": "K0B", "x": 11.25, "y": 0 },
+                { "label": "K0C", "x": 12.25, "y": 0 },
+                { "label": "K0D", "x": 13.25, "y": 0 },
+                { "label": "K1E", "x": 14.25, "y": 0 },
+                { "label": "K0E", "x": 15.25, "y": 0 },
+                { "label": "K0F", "x": 16.25, "y": 0 },
+				
+                { "label": "K00", "x": 0, "y": 1 },
+                { "label": "K11", "w": 1.5, "x": 1.25, "y": 1 },
+                { "label": "K12", "x": 2.75, "y": 1 },
+                { "label": "K13", "x": 3.75, "y": 1 },
+                { "label": "K14", "x": 4.75, "y": 1 },
+                { "label": "K15", "x": 5.75, "y": 1 },
+                { "label": "K16", "x": 6.75, "y": 1 },
+                { "label": "K17", "x": 7.75, "y": 1 },
+                { "label": "K18", "x": 8.75, "y": 1 },
+                { "label": "K19", "x": 9.75, "y": 1 },
+                { "label": "K1A", "x": 10.75, "y": 1 },
+                { "label": "K1B", "x": 11.75, "y": 1 },
+                { "label": "K1C", "x": 12.75, "y": 1 },
+                { "label": "K1D", "x": 13.75, "y": 1 },
+                { "label": "K2E", "w": 1.5, "x": 14.75, "y": 1 },
+                { "label": "K1F", "x": 16.25, "y": 1 },
+                
+                { "label": "K10", "x": 0, "y": 2 },
+				{ "label": "K21", "w": 1.75, "x": 1.25, "y": 2 },
+                { "label": "K22", "x": 3, "y": 2 },
+                { "label": "K23", "x": 4, "y": 2 },
+                { "label": "K24", "x": 5, "y": 2 },
+                { "label": "K25", "x": 6, "y": 2 },
+                { "label": "K26", "x": 7, "y": 2 },
+                { "label": "K27", "x": 8, "y": 2 },
+                { "label": "K28", "x": 9, "y": 2 },
+                { "label": "K29", "x": 10, "y": 2 },
+                { "label": "K2A", "x": 11, "y": 2 },
+                { "label": "K2B", "x": 12, "y": 2 },
+                { "label": "K2C", "x": 13, "y": 2 },
+                { "label": "K2D", "w": 2.25, "x": 14, "y": 2 },
+                { "label": "K2F", "x": 16.25, "y": 2 },
+                
+				{ "label": "K20", "x": 0, "y": 3 },
+                { "label": "K31", "w": 1.25, "x": 1.25, "y": 3 },
+                { "label": "K32", "x": 2.5, "y": 3 },
+                { "label": "K33", "x": 3.5, "y": 3 },
+                { "label": "K34", "x": 4.5, "y": 3 },
+                { "label": "K35", "x": 5.5, "y": 3 },
+                { "label": "K36", "x": 6.5, "y": 3 },
+                { "label": "K37", "x": 7.5, "y": 3 },
+                { "label": "K38", "x": 8.5, "y": 3 },
+                { "label": "K39", "x": 9.5, "y": 3 },
+                { "label": "K3A", "x": 10.5, "y": 3 },
+                { "label": "K3B", "x": 11.5, "y": 3 },
+                { "label": "K3C", "x": 12.5, "y": 3 },
+                { "label": "K3D", "w": 1.75, "x": 13.5, "y": 3 },
+                { "label": "K3E", "x": 15.25, "y": 3 },
+                { "label": "K3F", "x": 16.25, "y": 3 },
+                
+				{ "label": "K30", "x": 0, "y": 4 },
+                { "label": "K41", "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "K42", "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "K43", "w": 1.25, "x": 3.75, "y": 4 },
+                { "label": "K47", "w": 6.25, "x": 5, "y": 4 },
+                { "label": "K4B", "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "K4C", "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "K4D", "x": 14.25, "y": 4 },
+                { "label": "K4E", "x": 15.25, "y": 4 },
+                { "label": "K4F", "x": 16.25, "y": 4 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kopibeng/typ65/keymaps/default/keymap.c b/keyboards/kopibeng/typ65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..63628ade61
--- /dev/null
+++ b/keyboards/kopibeng/typ65/keymaps/default/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	// Default layer
+	[0] = LAYOUT_all(
+		         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_BSPC, KC_HOME,
+		KC_TRNS, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+		KC_TRNS, 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_PGDN,
+		KC_TRNS, KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_END,
+		KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN,          KC_RGHT
+	),
+
+	// Fn1 Layer
+	[1] = LAYOUT_all(
+		         KC_TRNS, 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_TRNS, KC_TRNS, RESET,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+	),
+
+	// Fn2 Layer
+	[2] = LAYOUT_all(
+		         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+	),
+	
+	// Fn3 Layer
+	[3] = LAYOUT_all(
+		         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+	),
+};
+
diff --git a/keyboards/kopibeng/typ65/keymaps/via/keymap.c b/keyboards/kopibeng/typ65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..63628ade61
--- /dev/null
+++ b/keyboards/kopibeng/typ65/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	// Default layer
+	[0] = LAYOUT_all(
+		         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_BSPC, KC_HOME,
+		KC_TRNS, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+		KC_TRNS, 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_PGDN,
+		KC_TRNS, KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,            KC_END,
+		KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN,          KC_RGHT
+	),
+
+	// Fn1 Layer
+	[1] = LAYOUT_all(
+		         KC_TRNS, 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_TRNS, KC_TRNS, RESET,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+	),
+
+	// Fn2 Layer
+	[2] = LAYOUT_all(
+		         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+	),
+	
+	// Fn3 Layer
+	[3] = LAYOUT_all(
+		         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS
+	),
+};
+
diff --git a/keyboards/kopibeng/typ65/keymaps/via/rules.mk b/keyboards/kopibeng/typ65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/kopibeng/typ65/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kopibeng/typ65/readme.md b/keyboards/kopibeng/typ65/readme.md
new file mode 100644
index 0000000000..af8106891d
--- /dev/null
+++ b/keyboards/kopibeng/typ65/readme.md
@@ -0,0 +1,21 @@
+# Typ65+
+
+![Typ65+](https://i.imgur.com/WCTwfdF.jpg)
+
+A 65% solderable or hotswap PCB with left side macro column, support for VIA and layer indicator LEDs.
+
+* Keyboard Maintainer: kopibeng
+* Hardware Supported: A 65% keyboard with ATMEGA32U4
+* Hardware Availability: https://www.axiomstudios.shop/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kopibeng/typ65:via
+    
+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).
+
+## Bootloader
+
+* Physical reset button: Press the RESET switch on top side of PCB.
+* Bootmagic reset: Unplug keyboard, hold down ESC key and plug in the keyboard.
+* Keycode reset: Press the RESET keycode (default: MO(1) + HOME keys in default layout).
diff --git a/keyboards/kopibeng/typ65/rules.mk b/keyboards/kopibeng/typ65/rules.mk
new file mode 100644
index 0000000000..6089f643c4
--- /dev/null
+++ b/keyboards/kopibeng/typ65/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no			# Enable Encoder
\ No newline at end of file
diff --git a/keyboards/kopibeng/typ65/typ65.c b/keyboards/kopibeng/typ65/typ65.c
new file mode 100644
index 0000000000..152b2e7737
--- /dev/null
+++ b/keyboards/kopibeng/typ65/typ65.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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 "typ65.h"
+
+void keyboard_pre_init_kb (void) {
+  setPinOutput(INDICATOR_0);
+  setPinOutput(INDICATOR_1);
+  setPinOutput(INDICATOR_2);
+
+  keyboard_pre_init_user();
+}
+
+__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+        case 1:
+            writePinHigh(INDICATOR_0);
+            writePinLow(INDICATOR_1);
+            writePinLow(INDICATOR_2);
+            break;
+        case 2:
+            writePinLow(INDICATOR_0);
+            writePinHigh(INDICATOR_1);
+            writePinLow(INDICATOR_2);
+            break;
+		case 3:
+            writePinLow(INDICATOR_0);
+            writePinLow(INDICATOR_1);
+            writePinHigh(INDICATOR_2);
+            break;
+        default:
+            writePinHigh(INDICATOR_0);
+            writePinHigh(INDICATOR_1);
+            writePinHigh(INDICATOR_2);
+            break;
+    }
+	return state;
+}
\ No newline at end of file
diff --git a/keyboards/kopibeng/typ65/typ65.h b/keyboards/kopibeng/typ65/typ65.h
new file mode 100644
index 0000000000..189139df3b
--- /dev/null
+++ b/keyboards/kopibeng/typ65/typ65.h
@@ -0,0 +1,54 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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 ___ KC_NO
+
+/*
+ * 
+ *                   ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐  ┌───────┐
+ *                   │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1E │0E │0F │  │0E     │ Full Backspace
+ *             ┌───┐ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤  └─┬─────┤
+ *             │00 │ │11   │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2E   │1F │    │2E   │
+ *  2.25u      ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤  ┌─┴─┐   │ ISO
+ *  LShift     │10 │ │21    │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D      │2F │  │2D │   │
+ * ┌────────┐  ├───┤ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤  └───┴───┘
+ * │31      │  │20 │ │31  │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D    │3E │3F │
+ * └────────┘  ├───┤ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ *             │30 │ │41  │42  │43  │47                      │4B  │4C  │ │4D │4E │4F │
+ *             └───┘ └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ *                   ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ *                   │41   │42 │43   │47                         │4C   │ 7u Tsangan
+ *                   └─────┴───┴─────┴───────────────────────────┴─────┘
+ *
+ */
+
+#define LAYOUT_all( \
+         K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1E, K0E, K0F, \
+    K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E,      K1F, \
+    K10, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,           K2F, \
+    K20, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E, K3F, \
+    K30, K41, K42, K43,                K47,                K4B, K4C,      K4D, K4E, K4F  \
+) { \
+    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F}, \
+    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F}, \
+    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F}, \
+    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F}, \
+    {___, K41, K42, K43, ___, ___, ___, K47, ___, ___, ___, K4B, K4C, K4D, K4E, K4F}  \
+}

From d8971d707eddea5d16ef5fa3dad807b494aed39f Mon Sep 17 00:00:00 2001
From: QMK Bot <hello@qmk.fm>
Date: Sun, 6 Mar 2022 20:55:08 -0800
Subject: [PATCH 736/867] Format code according to conventions (#16554)

---
 keyboards/checkerboards/quark_plus/keymaps/via/rules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/checkerboards/quark_plus/keymaps/via/rules.mk b/keyboards/checkerboards/quark_plus/keymaps/via/rules.mk
index 69de2e4c5a..1e5b99807c 100644
--- a/keyboards/checkerboards/quark_plus/keymaps/via/rules.mk
+++ b/keyboards/checkerboards/quark_plus/keymaps/via/rules.mk
@@ -1 +1 @@
-VIA_ENABLE = yes
+VIA_ENABLE = yes

From ff6c70415c536e6435023627197550889ffa1501 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Sun, 6 Mar 2022 22:12:17 -0800
Subject: [PATCH 737/867] [Keymap] Drashna Mouse keys and oled updates (#16556)

---
 .../charybdis/3x5/keymaps/drashna/keymap.c    |   4 +-
 .../charybdis/3x5/keymaps/drashna/mcuconf.h   |  14 +-
 .../charybdis/3x5/keymaps/drashna/rules.mk    |   7 +-
 .../charybdis/4x6/keymaps/drashna/chconf.h    |  38 +++
 .../charybdis/4x6/keymaps/drashna/config.h    |  91 ++++++
 .../charybdis/4x6/keymaps/drashna/halconf.h   |  26 ++
 .../charybdis/4x6/keymaps/drashna/keymap.c    | 132 ++++++++
 .../charybdis/4x6/keymaps/drashna/mcuconf.h   |  44 +++
 .../charybdis/4x6/keymaps/drashna/rules.mk    |  24 ++
 .../tractyl_manuform/5x6_right/f411/mcuconf.h |  14 +-
 .../tractyl_manuform/5x6_right/info.json      |   1 -
 .../5x6_right/keymaps/drashna/config.h        |   5 +
 .../5x6_right/keymaps/drashna/keymap.c        |  84 +++--
 .../5x6_right/keymaps/drashna/rules.mk        |   1 +
 keyboards/handwired/tractyl_manuform/config.h |   1 -
 .../handwired/tractyl_manuform/info.json      |   4 +
 .../tractyl_manuform/tractyl_manuform.c       |   4 +-
 .../tractyl_manuform/tractyl_manuform.h       |   4 +-
 .../splitkb/kyria/keymaps/drashna/rules.mk    |   1 +
 layouts/community/ortho_4x12/drashna/rules.mk |  24 +-
 layouts/community/ortho_5x12/drashna/rules.mk |  10 +-
 .../community/split_3x6_3/drashna/keymap.c    |   4 +-
 users/drashna/callbacks.c                     |  20 +-
 users/drashna/callbacks.h                     |   3 +
 users/drashna/config.h                        |   2 +
 users/drashna/keyrecords/caps_word.c          | 164 ++++++----
 users/drashna/keyrecords/caps_word.h          |  77 +++++
 users/drashna/keyrecords/process_records.c    |  26 +-
 users/drashna/keyrecords/process_records.h    |   4 +-
 users/drashna/keyrecords/unicode.c            |   4 +-
 users/drashna/oled/oled_stuff.c               | 290 ++++--------------
 users/drashna/oled/sh110x.c                   |  86 ++----
 users/drashna/pointing/pointing.c             |   2 +-
 users/drashna/post_config.h                   |   5 +-
 users/drashna/rgb/rgb_stuff.c                 |   4 +-
 users/drashna/rules.mk                        |   5 +-
 users/drashna/split/transport_sync.c          |  12 +-
 37 files changed, 776 insertions(+), 465 deletions(-)
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/drashna/chconf.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
 create mode 100644 keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
 create mode 100644 keyboards/handwired/tractyl_manuform/info.json

diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
index aba169dbb5..1af9868855 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/keymap.c
@@ -58,9 +58,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_MOUSE] = LAYOUT_charybdis_3x5(
-        _______, _______, _______, S_D_MOD, DPI_MOD,    KC_WH_U, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,    KC_WH_U, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD,
         _______, _______, _______, _______, _______,    KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6,
-        _______, _______, _______, S_D_RMOD,DPI_RMOD,   KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______,
+        _______, _______, _______, _______, _______,    KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______,
                           _______, SNIPING, _______,    _______, _______
     ),
     [_LOWER] = LAYOUT_charybdis_3x5_wrapper(
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
index d868eae48e..05b5776ac3 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/mcuconf.h
@@ -21,8 +21,8 @@
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
 
-#undef STM32_I2C_I2C1_RX_DMA_STREAM
-#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
+// #undef STM32_I2C_I2C1_RX_DMA_STREAM
+// #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
 #undef STM32_I2C_I2C1_TX_DMA_STREAM
 #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
 
@@ -35,19 +35,9 @@
 #undef STM32_SPI_USE_SPI1
 #define STM32_SPI_USE_SPI1           TRUE
 
-#undef STM32_SPI_SPI1_RX_DMA_STREAM
-#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
-#undef STM32_SPI_SPI1_TX_DMA_STREAM
-#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
-
 #undef STM32_SERIAL_USE_USART2
 #define STM32_SERIAL_USE_USART2 TRUE
 
-#undef STM32_UART_USART2_RX_DMA_STREAM
-#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
-#undef STM32_UART_USART2_TX_DMA_STREAM
-#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
-
 #undef STM32_GPT_USE_TIM4
 #define STM32_GPT_USE_TIM4 TRUE
 
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
index d23bf99aac..0cff2a7a2e 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/drashna/rules.mk
@@ -2,7 +2,10 @@
 MCU = STM32F411
 
 # Bootloader selection
-BOOTLOADER = stm32-dfu
+# BOOTLOADER = stm32-dfu
+BOOTLOADER := tinyuf2
+
+LTO_ENABLE := no
 
 BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
 KEYBOARD_SHARED_EP = yes
@@ -20,3 +23,5 @@ NKRO_ENABLE = yes
 CONSOLE_ENABLE = yes
 
 AUTOCORRECTION_ENABLE = yes
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/chconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/chconf.h
new file mode 100644
index 0000000000..8b55eaeef0
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/chconf.h
@@ -0,0 +1,38 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
+
+#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
+
+#define CH_CFG_FACTORY_SEMAPHORES TRUE
+
+#define CH_CFG_FACTORY_MAILBOXES TRUE
+
+#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
+
+#define CH_CFG_FACTORY_PIPES TRUE
+
+#include_next <chconf.h>
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
new file mode 100644
index 0000000000..f384318dc4
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/config.h
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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
+
+#undef MATRIX_COL_PINS
+#define MATRIX_COL_PINS \
+    { B0, B1, B10, B3, B4, B5 }
+#undef MATRIX_COL_PINS_RIGHT
+#define MATRIX_COL_PINS_RIGHT \
+    { B0, B1, B10, B3, B4, B5 }
+
+#undef MATRIX_ROW_PINS
+#define MATRIX_ROW_PINS \
+    { B15, A2, B8, A8, B9 }
+#undef MATRIX_ROW_PINS_RIGHT
+#define MATRIX_ROW_PINS_RIGHT \
+    { B15, A2, B8, A8, B9 }
+
+#define DIODE_DIRECTION ROW2COL
+#define SPLIT_HAND_PIN A3
+
+#undef RGB_DI_PIN
+#define RGB_DI_PIN A1
+#define WS2812_EXTERNAL_PULLUP
+#define WS2812_PWM_DRIVER PWMD2
+#define WS2812_PWM_CHANNEL 2
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_EXTERNAL_PULLUP
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM1
+#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_TARGET_PERIOD 800000
+
+#define DEBUG_LED_PIN     C13
+
+#undef SOFT_SERIAL_PIN
+// #define SERIAL_USART_FULL_DUPLEX  // Enable full duplex operation mode.
+#define SERIAL_USART_TX_PIN      A9
+// #define SERIAL_USART_RX_PIN      A3
+// #define SERIAL_USART_DRIVER      SD2
+// #define SERIAL_USART_TX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+// #define SERIAL_USART_RX_PAL_MODE 7    // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7
+// #define SERIAL_USART_TIMEOUT     100  // USART driver timeout. default 100
+// // #define SERIAL_USART_PIN_SWAP // swap RX and TX pins on master
+// // To use the highest possible baudrate (3.75Mbit/s) uncomment the following
+// // line, this can result in dropped communications so lower the speed if there
+// // are many timeouts.
+// // #define SERIAL_USART_SPEED (STM32_PCLK2 >> 4)
+
+#define CRC8_USE_TABLE
+#define CRC8_OPTIMIZE_SPEED
+
+/* spi config for eeprom and pmw3360 sensor */
+#define SPI_DRIVER                           SPID1
+#define SPI_SCK_PIN                          A5
+#define SPI_SCK_PAL_MODE                     5
+#define SPI_MOSI_PIN                         A7
+#define SPI_MOSI_PAL_MODE                    5
+#define SPI_MISO_PIN                         A6
+#define SPI_MISO_PAL_MODE                    5
+
+#define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
+#define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR    64
+
+#undef PMW3360_CS_PIN
+#define PMW3360_CS_PIN                       B14
+#define PMW3360_CS_MODE 3
+#define PMW3360_CS_DIVISOR 64
+
+#define CHARYBDIS_MINIMUM_DEFAULT_DPI     1200
+#define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 400
+#define CHARYBDIS_MINIMUM_SNIPING_DPI     200
+#define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 100
+
+/* RGB Matrix. */
+
+#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h
new file mode 100644
index 0000000000..97a288d7bd
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/halconf.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_PWM     TRUE
+#define HAL_USE_SERIAL  TRUE
+// #define HAL_USE_I2C     TRUE
+#define HAL_USE_SPI     TRUE
+#define SPI_USE_WAIT    TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+// #define HAL_USE_GPT     TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
new file mode 100644
index 0000000000..e26ffc14aa
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/keymap.c
@@ -0,0 +1,132 @@
+/**
+ * Copyright 2021 Charly Delay <charly@codesink.dev> (@0xcharly)
+ *
+ * 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 "drashna.h"
+
+#define LAYOUT_charybdis_4x6_wrapper(...) LAYOUT_charybdis_4x6(__VA_ARGS__)
+#define LAYOUT_charybdis_4x6_base( \
+    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
+    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
+    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
+  ) \
+  LAYOUT_charybdis_4x6_wrapper( \
+     KC_ESC,  ________________NUMBER_LEFT________________,            ________________NUMBER_RIGHT_______________, UC_CLUE, \
+     SH_TT,   K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A,     SH_TT, \
+     LALT_T(KC_TAB), K11, K12,  K13,     K14,     K15,                K16,     K17,     K18,     K19,     K1A,     RALT_T(K1B), \
+     OS_LSFT, CTL_T(K21), K22,  K23,     K24,     K25,                K26,     K27,     K28,     K29, RCTL_T(K2A), OS_RSFT, \
+                                   KC_GRV, OS_LALT, OS_LGUI,    TT(_MOUSE),  KC_ENT, \
+                                           KC_SPC, BK_LWER,     DL_RAIS \
+    )
+
+#define LAYOUT_base_wrapper(...)       LAYOUT_charybdis_4x6_base(__VA_ARGS__)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_DEFAULT_LAYER_1] = LAYOUT_base_wrapper(
+        _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
+        _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
+        _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
+    ),
+
+    [_DEFAULT_LAYER_2] = LAYOUT_base_wrapper(
+        ______________COLEMAK_MOD_DH_L1____________, ______________COLEMAK_MOD_DH_R1____________,
+        ______________COLEMAK_MOD_DH_L2____________, ______________COLEMAK_MOD_DH_R2____________,
+        ______________COLEMAK_MOD_DH_L3____________, ______________COLEMAK_MOD_DH_R3____________
+    ),
+    [_DEFAULT_LAYER_3] = LAYOUT_base_wrapper(
+        _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
+        _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
+        _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
+    ),
+
+    [_DEFAULT_LAYER_4] = LAYOUT_base_wrapper(
+        _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
+        _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
+        _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
+    ),
+
+
+
+    [_MOUSE] = LAYOUT_charybdis_4x6(
+        _______, _______, _______, _______, _______, _______,   DRGSCRL, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, SNP_TOG,
+        _______, _______, _______, _______, _______, _______,   KC_WH_U, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,   KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
+        _______, _______, _______, _______, _______, _______,   KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
+                                   _______, _______, _______,    _______, _______,
+                                           _______, _______,      _______
+    ),
+    [_GAMEPAD] = LAYOUT_charybdis_4x6(
+        KC_ESC,  KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,       _______, _______, _______, _______, _______, _______,
+        KC_F1,   KC_K,    KC_Q,    KC_W,    KC_E,    KC_R,       _______, _______, _______, _______, _______, _______,
+        KC_TAB,  KC_G,    KC_A,    KC_S,    KC_D,    KC_F,       _______, _______, _______, _______, _______, _______,
+        KC_LCTL, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_H,       _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______,    _______, _______,
+                                           _______, _______,      _______
+    ),
+    [_DIABLO] = LAYOUT_charybdis_4x6(
+        KC_ESC,  KC_V,    KC_D,    KC_LALT, KC_NO,   KC_NO,      KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,
+        KC_TAB,  KC_S,    KC_I,    KC_F,    KC_M,    KC_T,       _______, _______, _______, _______, _______, _______,
+        KC_Q,    KC_1,    KC_2,    KC_3,    KC_4,    KC_G,       _______, _______, _______, _______, _______, _______,
+        KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z,       _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______,    _______, _______,
+                                           _______, _______,      _______
+    ),
+    [_DIABLOII] = LAYOUT_charybdis_4x6(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_GRV,     _______, _______, _______, _______, _______, _______,
+        KC_TAB,  KC_A,    KC_T,    KC_Q,    KC_I,    KC_M,       _______, _______, _______, _______, _______, _______,
+        KC_S,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,      _______, _______, _______, _______, _______, _______,
+        KC_LCTL, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,     _______, _______, _______, _______, _______, _______,
+                                   _______, _______, _______,    _______, _______,
+                                           _______, _______,      _______
+    ),
+
+    [_LOWER] = LAYOUT_charybdis_4x6_wrapper(
+        KC_F12,  _________________FUNC_LEFT_________________,    _________________FUNC_RIGHT________________, KC_F11,
+        _______, _________________LOWER_L1__________________,    _________________LOWER_R1__________________, _______,
+        _______, _________________LOWER_L2__________________,    _________________LOWER_R2__________________, KC_PIPE,
+        _______, _________________LOWER_L3__________________,    _________________LOWER_R3__________________, _______,
+                                   _______, _______, _______,    _______, _______,
+                                           _______, _______,      _______
+  ),
+
+    [_RAISE] = LAYOUT_charybdis_4x6_wrapper(
+        KC_F12,  _________________FUNC_LEFT_________________,    _________________FUNC_RIGHT________________, KC_F11,
+        KC_GRV,  _________________RAISE_L1__________________,    _________________RAISE_R1__________________, _______,
+        _______, _________________RAISE_L2__________________,    _________________RAISE_R2__________________, KC_BSLS,
+        _______, _________________RAISE_L3__________________,    _________________RAISE_R3__________________, _______,
+                                   _______, _______, _______,    _______, _______,
+                                           _______, _______,      _______
+  )
+
+};
+// clang-format on
+
+
+void matrix_init_keyemap(void) { setPinInputHigh(A0); }
+
+void matrix_scan_keymap(void) {
+    if (!readPin(A0)) {
+        reset_keyboard();
+    }
+}
+
+#ifdef USB_VBUS_PIN
+bool usb_vbus_state(void) {
+    setPinInputLow(USB_VBUS_PIN);
+    wait_us(5);
+    return readPin(USB_VBUS_PIN);
+}
+#endif
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
new file mode 100644
index 0000000000..0f60612d79
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/mcuconf.h
@@ -0,0 +1,44 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "mcuconf.h"
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+// #undef STM32_I2C_I2C1_RX_DMA_STREAM
+// #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
+#undef STM32_I2C_I2C1_TX_DMA_STREAM
+#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
+
+#undef STM32_PWM_USE_TIM2
+#define STM32_PWM_USE_TIM2 TRUE
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+#undef STM32_SERIAL_USE_USART1
+#define STM32_SERIAL_USE_USART1 TRUE
+
+#undef STM32_GPT_USE_TIM4
+#define STM32_GPT_USE_TIM4 TRUE
+
+#undef STM32_ST_USE_TIMER
+#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
new file mode 100644
index 0000000000..ab86b1b8ba
--- /dev/null
+++ b/keyboards/bastardkb/charybdis/4x6/keymaps/drashna/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = STM32F411
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+# BOOTLOADER := tinyuf2
+
+LTO_ENABLE := no
+
+BOOTMAGIC_ENABLE = yes     # Enable Bootmagic Lite
+KEYBOARD_SHARED_EP = yes
+MOUSE_SHARED_EP = yes
+
+EEPROM_DRIVER = spi
+WS2812_DRIVER = pwm
+SERIAL_DRIVER = usart
+
+MOUSEKEY_ENABLE = yes
+NKRO_ENABLE = yes
+CONSOLE_ENABLE = yes
+
+AUTOCORRECTION_ENABLE = yes
+
+DEBOUNCE_TYPE = asym_eager_defer_pk
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h
index d868eae48e..05b5776ac3 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/mcuconf.h
@@ -21,8 +21,8 @@
 #undef STM32_I2C_USE_I2C1
 #define STM32_I2C_USE_I2C1 TRUE
 
-#undef STM32_I2C_I2C1_RX_DMA_STREAM
-#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
+// #undef STM32_I2C_I2C1_RX_DMA_STREAM
+// #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0)
 #undef STM32_I2C_I2C1_TX_DMA_STREAM
 #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 1)
 
@@ -35,19 +35,9 @@
 #undef STM32_SPI_USE_SPI1
 #define STM32_SPI_USE_SPI1           TRUE
 
-#undef STM32_SPI_SPI1_RX_DMA_STREAM
-#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
-#undef STM32_SPI_SPI1_TX_DMA_STREAM
-#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
-
 #undef STM32_SERIAL_USE_USART2
 #define STM32_SERIAL_USE_USART2 TRUE
 
-#undef STM32_UART_USART2_RX_DMA_STREAM
-#define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
-#undef STM32_UART_USART2_TX_DMA_STREAM
-#define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
-
 #undef STM32_GPT_USE_TIM4
 #define STM32_GPT_USE_TIM4 TRUE
 
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
index 51eb009aa5..81a308fd21 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
@@ -1,7 +1,6 @@
 {
     "keyboard_name": "Tractyl Manuform 5x6",
     "url": "",
-    "maintainer": "drashna",
     "layouts": {
         "LAYOUT_5x6_right": {
             "layout": [
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
index c3a30d2bc8..2a7a18f01b 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/config.h
@@ -22,3 +22,8 @@
 #ifdef OLED_DRIVER_SH1107
 #    undef OLED_DISPLAY_128X64
 #endif
+
+#        define CHARYBDIS_MINIMUM_DEFAULT_DPI 1200
+#        define CHARYBDIS_DEFAULT_DPI_CONFIG_STEP 200
+#        define CHARYBDIS_MINIMUM_SNIPING_DPI 400
+#        define CHARYBDIS_SNIPING_DPI_CONFIG_STEP 200
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
index 570760cf66..82fd4cbea3 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c
@@ -60,13 +60,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_MOUSE] = LAYOUT_5x6_right(
-        _______, _______, _______, _______, _______, _______,                        _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______,                        KC_WH_U, DPI_MOD, DPI_RMOD,S_D_MOD, S_D_RMOD,DRGSCRL,
+        _______, _______, _______, _______, _______, _______,                        DRGSCRL, DPI_RMOD,DPI_MOD, S_D_RMOD,S_D_MOD, SNP_TOG,
+        _______, _______, _______, _______, _______, _______,                        KC_WH_U, _______, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______,                        KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN6, SNIPING,
         _______, _______, _______, _______, _______, _______,                        KC_BTN7, KC_BTN4, KC_BTN5, KC_BTN8, _______, _______,
                           _______, _______,                                                            _______, _______,
                                             _______, _______,                                 KC_BTN3,
-                                                     _______, KC_ACCEL,              _______,
+                                                     _______, _______,               _______,
                                                      _______, _______,      _______, _______
     ),
     [_GAMEPAD] = LAYOUT_5x6_right(
@@ -104,30 +104,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _________________LOWER_L1__________________,                        _________________LOWER_R1__________________, _______,
         _______, _________________LOWER_L2__________________,                        _________________LOWER_R2__________________, KC_PIPE,
         _______, _________________LOWER_L3__________________,                        _________________LOWER_R3__________________, _______,
-                          _______, _______,                                                          _______, _______,
-                                            _______, _______,                               _______,
-                                                     _______, _______,             _______,
-                                                     _______, _______,    _______, _______
+                          _______, _______,                                                            _______, _______,
+                                            _______, _______,                                 _______,
+                                                     _______, _______,               _______,
+                                                     _______, _______,      _______, _______
     ),
     [_RAISE] = LAYOUT_5x6_right_wrapper(
-        KC_F12,  _________________FUNC_LEFT_________________,                      _________________FUNC_RIGHT________________, KC_F11,
-        KC_GRV,  _________________RAISE_L1__________________,                      _________________RAISE_R1__________________, _______,
-        _______, _________________RAISE_L2__________________,                      _________________RAISE_R2__________________, KC_BSLS,
-        _______, _________________RAISE_L3__________________,                      _________________RAISE_R3__________________, _______,
-                          _______, _______,                                                          _______, _______,
-                                            _______, _______,                               _______,
-                                                     _______, _______,             _______,
-                                                     _______, _______,    _______, _______
+        KC_F12,  _________________FUNC_LEFT_________________,                        _________________FUNC_RIGHT________________, KC_F11,
+        KC_GRV,  _________________RAISE_L1__________________,                        _________________RAISE_R1__________________, _______,
+        _______, _________________RAISE_L2__________________,                        _________________RAISE_R2__________________, KC_BSLS,
+        _______, _________________RAISE_L3__________________,                        _________________RAISE_R3__________________, _______,
+                          _______, _______,                                                            _______, _______,
+                                            _______, _______,                                 _______,
+                                                     _______, _______,               _______,
+                                                     _______, _______,      _______, _______
     ),
     [_ADJUST] = LAYOUT_5x6_right_wrapper(
-        KC_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_NOMODE,               KC_NOMODE,KC_BLOCKS,KC_REGIONAL,_______,_______, KC_RST,
-        VRSN,    _________________ADJUST_L1_________________,                      _________________ADJUST_R1_________________, EEP_RST,
-        KEYLOCK, _________________ADJUST_L2_________________,                      _________________ADJUST_R2_________________, TG_MODS,
-        UC_MOD,  _________________ADJUST_L3_________________,                      _________________ADJUST_R3_________________, KC_MPLY,
-                   TG(_DIABLOII), AUTO_CTN,                                                          TG_GAME, TG_DBLO,
-                                            _______, REBOOT,                                KC_NUKE,
-                                                     _______, _______,             _______,
-                                                     _______, _______,    KC_NUKE, _______
+        KC_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_NOMODE,                 KC_NOMODE,KC_BLOCKS,KC_REGIONAL,_______,_______, KC_RST,
+        VRSN,    _________________ADJUST_L1_________________,                        _________________ADJUST_R1_________________, EEP_RST,
+        KEYLOCK, _________________ADJUST_L2_________________,                        _________________ADJUST_R2_________________, TG_MODS,
+        UC_MOD,  _________________ADJUST_L3_________________,                        _________________ADJUST_R3_________________, KC_MPLY,
+                   TG(_DIABLOII), AUTO_CTN,                                                            TG_GAME, TG_DBLO,
+                                            _______, REBOOT,                                  KC_NUKE,
+                                                     _______, _______,               _______,
+                                                     _______, _______,      KC_NUKE, _______
     ),
 };
 
@@ -149,6 +149,16 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 };
 // clang-format on
 #else
+
+deferred_token encoder_token  = INVALID_DEFERRED_TOKEN;
+static int8_t  last_direction = -1;
+
+static uint32_t encoder_callback(uint32_t trigger_time, void *cb_arg) {
+    unregister_code(last_direction ? KC_WH_D : KC_WH_U);
+    last_direction = -1;
+    return 0;
+}
+
 bool encoder_update_user(uint8_t index, bool clockwise) {
 #    ifdef SWAP_HANDS_ENABLE
     if (swap_hands) {
@@ -158,7 +168,20 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) {
         tap_code_delay(clockwise ? KC_VOLD : KC_VOLU, 5);
     } else if (index == 1) {
-        tap_code_delay(clockwise ? KC_WH_D : KC_WH_U, 5);
+        if (last_direction != clockwise || encoder_token == INVALID_DEFERRED_TOKEN) {
+            uint8_t keycode = clockwise ? KC_WH_D : KC_WH_U;
+            last_direction  = clockwise;
+            if (encoder_token != INVALID_DEFERRED_TOKEN) {
+                if (cancel_deferred_exec(encoder_token)) {
+                    encoder_token = INVALID_DEFERRED_TOKEN;
+                }
+                unregister_code(clockwise ? KC_WH_U : KC_WH_D);
+            }
+            register_code(keycode);
+            encoder_token = defer_exec(MOUSEKEY_WHEEL_DELAY + MOUSEKEY_WHEEL_INTERVAL, encoder_callback, NULL);
+        } else {
+            extend_deferred_exec(encoder_token, MOUSEKEY_WHEEL_INTERVAL);
+        }
     }
     return false;
 }
@@ -167,7 +190,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
 #ifdef OLED_ENABLE
 extern uint16_t typing_mode;
 
-oled_rotation_t oled_init_keymap(oled_rotation_t rotation) { return OLED_ROTATION_180; }
+oled_rotation_t oled_init_keymap(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
 
 void oled_render_large_display(void) {
     if (is_keyboard_left()) {
@@ -176,13 +201,16 @@ void oled_render_large_display(void) {
         oled_advance_page(true);
         oled_advance_page(true);
 
+        // clang-format off
         static const char PROGMEM logo[] = {
             0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
             0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
             0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
         };
+        // clang-format on
         oled_write_P(logo, false);
 
+#    ifdef CUSTOM_UNICODE_ENABLE
         oled_set_cursor(1, 14);
         oled_write_ln_P(PSTR("Unicode:"), false);
         switch (typing_mode) {
@@ -204,10 +232,14 @@ void oled_render_large_display(void) {
             case KC_ZALGO:
                 oled_write_P(PSTR("       Zalgo"), false);
                 break;
-            default:
+            case KC_NOMODE:
                 oled_write_P(PSTR("      Normal"), false);
                 break;
+            default:
+                oled_write_P(PSTR("     Unknown"), false);
+                break;
         }
+#    endif
     }
 }
 #endif
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
index 9ef58ab5ec..4cad07ef66 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/rules.mk
@@ -10,6 +10,7 @@ ENCODER_ENABLE                   = yes
 ENCODER_MAP_ENABLE               = yes
 AUTOCORRECTION_ENABLE            = yes
 CAPS_WORD_ENABLE                 = yes
+DEFERRED_EXEC_ENABLE             = yes
 
 ifeq ($(strip $(KEYBOARD)), handwired/tractyl_manuform/5x6_right/elite_c)
     RGBLIGHT_ENABLE              = no
diff --git a/keyboards/handwired/tractyl_manuform/config.h b/keyboards/handwired/tractyl_manuform/config.h
index f9160ea148..821f9be9b6 100644
--- a/keyboards/handwired/tractyl_manuform/config.h
+++ b/keyboards/handwired/tractyl_manuform/config.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID               0x44DD
-#define MANUFACTURER            Drashna
 
 /* disable debug print */
 // #define NO_DEBUG
diff --git a/keyboards/handwired/tractyl_manuform/info.json b/keyboards/handwired/tractyl_manuform/info.json
new file mode 100644
index 0000000000..7214e6773b
--- /dev/null
+++ b/keyboards/handwired/tractyl_manuform/info.json
@@ -0,0 +1,4 @@
+{
+    "manufacturer": "QMK Community",
+    "maintainer": "Drashna Jael're"
+}
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
index 033146134d..0ae49b6397 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.c
@@ -247,7 +247,7 @@ static bool has_shift_mod(void) {
  *   - default DPI: internal table index/actual DPI
  *   - sniping DPI: internal table index/actual DPI
  */
-static void debug_charybdis_config_to_console(charybdis_config_t* config) {
+__attribute__((unused)) static void debug_charybdis_config_to_console(charybdis_config_t* config) {
 #    ifdef CONSOLE_ENABLE
     dprintf("(charybdis) process_record_kb: config = {\n"
             "\traw = 0x%04X,\n"
@@ -264,7 +264,6 @@ static void debug_charybdis_config_to_console(charybdis_config_t* config) {
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
     if (!process_record_user(keycode, record)) {
-        debug_charybdis_config_to_console(&g_charybdis_config);
         return false;
     }
 #    ifndef NO_CHARYBDIS_KEYCODES
@@ -321,7 +320,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
         pointing_device_send();
     }
 #    endif  // !MOUSEKEY_ENABLE
-    debug_charybdis_config_to_console(&g_charybdis_config);
     return true;
 }
 
diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
index 197aee985e..b62b6f7553 100644
--- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
+++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h
@@ -24,8 +24,6 @@
 #    include "4x6_right.h"
 #endif
 
-#ifdef POINTING_DEVICE_ENABLE
-#    ifndef NO_CHARYBDIS_KEYCODES
 enum charybdis_keycodes {
 #        ifdef VIA_ENABLE
     POINTER_DEFAULT_DPI_FORWARD = USER00,
@@ -50,8 +48,8 @@ enum charybdis_keycodes {
 #        define SNP_TOG SNIPING_MODE_TOGGLE
 #        define DRGSCRL DRAGSCROLL_MODE
 #        define DRG_TOG DRAGSCROLL_MODE_TOGGLE
-#    endif  // !NO_CHARYBDIS_KEYCODES
 
+#ifdef POINTING_DEVICE_ENABLE
 /** \brief Return the current DPI value for the pointer's default mode. */
 uint16_t charybdis_get_pointer_default_dpi(void);
 
diff --git a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
index ddba0780a2..3ddcddbee3 100644
--- a/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
+++ b/keyboards/splitkb/kyria/keymaps/drashna/rules.mk
@@ -20,6 +20,7 @@ ifeq ($(strip $(KEYBOARD)), splitkb/kyria/rev1/proton_c)
     CTPC                   = yes
     AUTOCORRECTION_ENABLE  = yes
     CAPS_WORD_ENABLE       = yes
+    OLED_DRIVER            = custom
     DEBUG_MATRIX_SCAN_RATE_ENABLE = api
 else
     LTO_ENABLE             = yes
diff --git a/layouts/community/ortho_4x12/drashna/rules.mk b/layouts/community/ortho_4x12/drashna/rules.mk
index 2905fb0fd4..e5c25d6fd5 100644
--- a/layouts/community/ortho_4x12/drashna/rules.mk
+++ b/layouts/community/ortho_4x12/drashna/rules.mk
@@ -1,24 +1,22 @@
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE   = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE    = no       # Mouse keys
-EXTRAKEY_ENABLE    = yes       # Audio control and System control
+EXTRAKEY_ENABLE    = yes      # Audio control and System control
 TAP_DANCE_ENABLE   = no
-SPACE_CADET_ENABLE = no
 NKRO_ENABLE        = yes
 CAPS_WORD_ENABLE   = no
+CONSOLE_ENABLE     = no
+COMMAND_ENABLE     = no
+BACKLIGHT_ENABLE   = no
 
-ifneq ($(strip $(KEYBOARD)), planck/rev6)
-    CONSOLE_ENABLE              = no
-    COMMAND_ENABLE              = no
-    ifeq ($(strip $(LAYOUT_HAS_RGB)), yes)
-        RGBLIGHT_ENABLE         = yes
-        INDICATOR_LIGHTS        = yes
-        RGBLIGHT_STARTUP_ANIMATION  = yes
-    endif
-else
+ifeq ($(strip $(LAYOUT_HAS_RGB)), yes)
+    RGBLIGHT_ENABLE            = yes
+endif
+
+ifeq ($(strip $(KEYBOARD)), planck/rev6)
     CONSOLE_ENABLE              = yes
     RGBLIGHT_ENABLE             = yes
-    RGBLIGHT_STARTUP_ANIMATION  = yes
     RGB_MATRIX_ENABLE           = no
+    RGBLIGHT_STARTUP_ANIMATION  = yes
     AUDIO_ENABLE                = yes
     EEPROM_DRIVER               = i2c
     ENCODER_MAP_ENABLE          = yes
diff --git a/layouts/community/ortho_5x12/drashna/rules.mk b/layouts/community/ortho_5x12/drashna/rules.mk
index 98ac829092..57cc3ce0be 100644
--- a/layouts/community/ortho_5x12/drashna/rules.mk
+++ b/layouts/community/ortho_5x12/drashna/rules.mk
@@ -1,7 +1,7 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE   = no       # Mouse keys(+4700)
-EXTRAKEY_ENABLE   = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE    = no         # Console for debug(+400)
+BOOTMAGIC_ENABLE  = yes       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE   = no        # Mouse keys
+EXTRAKEY_ENABLE   = yes       # Audio control and System control
+CONSOLE_ENABLE    = no        # Console for debug
 COMMAND_ENABLE    = no        # Commands for debug and configuration
 TAP_DANCE_ENABLE  = no
 NKRO_ENABLE       = yes
@@ -12,7 +12,7 @@ ifeq ($(strip $(KEYBOARD)), fractal)
     AUDIO_SUPPORTED             = yes
     RGBLIGHT_SUPPORTED          = yes
     RGBLIGHT_ENABLE             = yes
-    RGBLIGHT_STARTUP_ANIMATION  = yes
+    RGBLIGHT_STARTUP_ANIMATION  = no
     BOOTLOADER                  = qmk-dfu
     CUSTOM_UNICODE_ENABLE       = no
 endif
diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c
index 4bd4618d0c..1bc758fce9 100644
--- a/layouts/community/split_3x6_3/drashna/keymap.c
+++ b/layouts/community/split_3x6_3/drashna/keymap.c
@@ -123,7 +123,7 @@ uint8_t  current_kaki_frame  = 0;
 uint8_t  current_rtogi_frame = 0;
 // uint8_t current_ltogi_frame = 0;
 // clang-format off
-void render_kitty(void) {
+void render_small_kitty(void) {
     // Images credit j-inc(/James Incandenza) and pixelbenny. Credit to obosob for initial animation approach.
     static const char PROGMEM sleep[SLEEP_FRAMES][ANIM_SIZE] = {{
                                                                     // 'sleep1', 32x32px
@@ -228,7 +228,7 @@ void render_kitty(void) {
 }
 
 void oled_driver_render_logo_right(void) {
-    render_kitty();
+    render_small_kitty();
 
     oled_set_cursor(0, 4);
     render_default_layer_state();
diff --git a/users/drashna/callbacks.c b/users/drashna/callbacks.c
index f01aab433e..c11a381dee 100644
--- a/users/drashna/callbacks.c
+++ b/users/drashna/callbacks.c
@@ -33,10 +33,10 @@ void                       matrix_init_user(void) {
 
 __attribute__((weak)) void keyboard_post_init_keymap(void) {}
 void                       keyboard_post_init_user(void) {
-#if defined(RGBLIGHT_ENABLE)
+#if defined(CUSTOM_RGBLIGHT)
     keyboard_post_init_rgb_light();
 #endif
-#if defined(RGB_MATRIX_ENABLE)
+#if defined(CUSTOM_RGB_MATRIX)
     keyboard_post_init_rgb_matrix();
 #endif
 #if defined(SPLIT_KEYBOARD) && defined(SPLIT_TRANSACTION_IDS_USER)
@@ -104,8 +104,10 @@ void                       matrix_scan_user(void) {
 #ifdef TAP_DANCE_ENABLE  // Run Diablo 3 macro checking code.
     run_diablo_macro_check();
 #endif  // TAP_DANCE_ENABLE
-
-#if defined(RGB_MATRIX_ENABLE)
+#ifdef CAPS_WORD_ENABLE
+    caps_word_task();
+#endif
+#if defined(CUSTOM_RGB_MATRIX)
     matrix_scan_rgb_matrix();
 #endif
     matrix_scan_secret();
@@ -126,12 +128,12 @@ layer_state_t                       layer_state_set_user(layer_state_t state) {
     }
 
     state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
-#if defined(POINTING_DEVICE_ENABLE)
+#if defined(CUSTOM_POINTING_DEVICE)
     state = layer_state_set_pointing(state);
 #endif
-#if defined(RGBLIGHT_ENABLE)
+#if defined(CUSTOM_RGBLIGHT)
     state = layer_state_set_rgb_light(state);
-#endif  // RGBLIGHT_ENABLE
+#endif  // CUSTOM_RGBLIGHT
 #if defined(AUDIO_ENABLE) && !defined(__arm__)
     static bool is_gamepad_on = false;
     if (layer_state_cmp(state, _GAMEPAD) != is_gamepad_on) {
@@ -156,9 +158,9 @@ layer_state_t                       default_layer_state_set_user(layer_state_t s
 
     state = default_layer_state_set_keymap(state);
 #if 0
-#    if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+#    if defined(CUSTOM_RGBLIGHT) || defined(RGB_MATRIX_ENABLE)
   state = default_layer_state_set_rgb(state);
-#    endif  // RGBLIGHT_ENABLE
+#    endif
 #endif
     return state;
 }
diff --git a/users/drashna/callbacks.h b/users/drashna/callbacks.h
index f6ac6b88de..5fe5f6a808 100644
--- a/users/drashna/callbacks.h
+++ b/users/drashna/callbacks.h
@@ -23,3 +23,6 @@ void matrix_init_unicode(void);
 #ifdef SPLIT_KEYBOARD
 void matrix_slave_scan_keymap(void);
 #endif
+#ifdef CAPS_WORD_ENABLE
+#    include "keyrecords/caps_word.h"
+#endif
diff --git a/users/drashna/config.h b/users/drashna/config.h
index f55ed36bc2..4551c3504f 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -291,4 +291,6 @@
 #    ifndef OLED_BRIGHTNESS
 #        define OLED_BRIGHTNESS 50
 #    endif
+#    undef OLED_UPDATE_INTERVAL
+#    define OLED_UPDATE_INTERVAL 100
 #endif
diff --git a/users/drashna/keyrecords/caps_word.c b/users/drashna/keyrecords/caps_word.c
index 0c7cd6cfe5..a152b2387b 100644
--- a/users/drashna/keyrecords/caps_word.c
+++ b/users/drashna/keyrecords/caps_word.c
@@ -1,83 +1,139 @@
-// Copyright 2021 Google LLC.
-// SPDX-License-Identifier: Apache-2.0
-
 #include "caps_word.h"
 
-#ifndef IS_COMMAND
-#    define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
-#endif
+static bool caps_word_active = false;
 
-bool caps_word_enabled = false;
-bool caps_word_shifted = false;
+#if CAPS_WORD_IDLE_TIMEOUT > 0
+#    if CAPS_WORD_IDLE_TIMEOUT < 100 || CAPS_WORD_IDLE_TIMEOUT > 30000
+// Constrain timeout to a sensible range. With the 16-bit timer, the longest
+// representable timeout is 32768 ms, rounded here to 30000 ms = half a minute.
+#        error "caps_word: CAPS_WORD_IDLE_TIMEOUT must be between 100 and 30000 ms"
+#    endif
+
+static uint16_t idle_timer = 0;
+
+void caps_word_task(void) {
+    if (caps_word_active && timer_expired(timer_read(), idle_timer)) {
+        caps_word_set(false);
+    }
+}
+#endif // CAPS_WORD_IDLE_TIMEOUT > 0
 
-/**
- * @brief Handler for Caps Word feature.
- *
- * This checks the keycodes, and applies shift to the correct keys, if and when needid.
- *
- * @param keycode Keycode from matrix
- * @param record keyrecord_t data structure
- * @return true Continue processing keycode and sent to host
- * @return false Stop processing keycode, and do not send to host
- */
 bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
-    if (!caps_word_enabled) {
+#ifndef NO_ACTION_ONESHOT
+    const uint8_t mods = get_mods() | get_oneshot_mods();
+#else
+    const uint8_t mods = get_mods();
+#endif // NO_ACTION_ONESHOT
+
+    if (!caps_word_active) {
         // Pressing both shift keys at the same time enables caps word.
-        if (IS_COMMAND()) {
-            clear_mods();
-            clear_oneshot_mods();
-            caps_word_shifted = false;
-            caps_word_enabled = true;
+        if ((mods & MOD_MASK_SHIFT) == MOD_MASK_SHIFT) {
+            caps_word_set(true); // Activate Caps Word.
             return false;
         }
         return true;
+    } else {
+#if CAPS_WORD_IDLE_TIMEOUT > 0
+        idle_timer = record->event.time + CAPS_WORD_IDLE_TIMEOUT;
+#endif // CAPS_WORD_IDLE_TIMEOUT > 0
     }
 
     if (!record->event.pressed) {
         return true;
     }
 
-    if (!((get_mods() | get_oneshot_mods()) & ~MOD_MASK_SHIFT)) {
+    if (!(mods & ~MOD_MASK_SHIFT)) {
         switch (keycode) {
+            // Ignore MO, TO, TG, TT, and OSL layer switch keys.
+            case QK_MOMENTARY ... QK_MOMENTARY_MAX:
+            case QK_TO ... QK_TO_MAX:
+            case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:
+            case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
+            case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:
+                return true;
+
+#ifndef NO_ACTION_TAPPING
             case QK_MOD_TAP ... QK_MOD_TAP_MAX:
+                if (record->tap.count == 0) {
+                    // Deactivate if a mod becomes active through holding a mod-tap key.
+                    caps_word_set(false);
+                    return true;
+                }
+                keycode &= 0xff;
+                break;
+
+#    ifndef NO_ACTION_LAYER
             case QK_LAYER_TAP ... QK_LAYER_TAP_MAX:
-                // Earlier return if this has not been considered tapped yet.
+#    endif // NO_ACTION_LAYER
                 if (record->tap.count == 0) {
                     return true;
                 }
-                // Get the base tapping keycode of a mod- or layer-tap key.
                 keycode &= 0xff;
+                break;
+#endif // NO_ACTION_TAPPING
+
+#ifdef SWAP_HANDS_ENABLE
+            case QK_SWAP_HANDS ... QK_SWAP_HANDS_MAX:
+                if (keycode > 0x56F0 || record->tap.count == 0) {
+                    return true;
+                }
+                keycode &= 0xff;
+                break;
+#endif // SWAP_HANDS_ENABLE
         }
 
-        switch (keycode) {
-            // Letter keys should be shifted.
-            case KC_A ... KC_Z:
-                if (!caps_word_shifted) {
-                    register_code(KC_LSFT);
-                }
-                caps_word_shifted = true;
-                return true;
-
-            // Keycodes that continue caps word but shouldn't get shifted.
-            case KC_1 ... KC_0:
-            case KC_BSPC:
-            case KC_MINS:
-            case KC_UNDS:
-                if (caps_word_shifted) {
-                    unregister_code(KC_LSFT);
-                }
-                caps_word_shifted = false;
-                return true;
-
-                // Any other keycode disables caps word.
+        if (caps_word_press_user(keycode)) {
+            return true;
         }
     }
 
-    // Disable caps word.
-    caps_word_enabled = false;
-    if (caps_word_shifted) {
-        unregister_code(KC_LSFT);
-    }
-    caps_word_shifted = false;
+    caps_word_set(false); // Deactivate Caps Word.
     return true;
 }
+
+void caps_word_set(bool active) {
+    if (active != caps_word_active) {
+        if (active) {
+            clear_mods();
+#ifndef NO_ACTION_ONESHOT
+            clear_oneshot_mods();
+#endif // NO_ACTION_ONESHOT
+#if CAPS_WORD_IDLE_TIMEOUT > 0
+            idle_timer = timer_read() + CAPS_WORD_IDLE_TIMEOUT;
+#endif // CAPS_WORD_IDLE_TIMEOUT > 0
+        } else if ((get_weak_mods() & MOD_BIT(KC_LSFT)) != 0) {
+            // If the weak shift mod is still on, turn it off and send an update to
+            // the host computer.
+            del_weak_mods(MOD_BIT(KC_LSFT));
+            send_keyboard_report();
+        }
+
+        caps_word_active = active;
+        caps_word_set_user(active);
+    }
+}
+
+bool caps_word_get(void) {
+    return caps_word_active;
+}
+
+__attribute__((weak)) void caps_word_set_user(bool active) {}
+
+__attribute__((weak)) bool caps_word_press_user(uint16_t keycode) {
+    switch (keycode) {
+        // Keycodes that continue Caps Word, with shift applied.
+        case KC_A ... KC_Z:
+            add_weak_mods(MOD_BIT(KC_LSFT)); // Apply shift to the next key.
+            return true;
+
+        // Keycodes that continue Caps Word, without shifting.
+        case KC_1 ... KC_0:
+        case KC_BSPC:
+        case KC_MINS:
+        case KC_UNDS:
+            return true;
+
+        default:
+            return false; // Deactivate Caps Word.
+    }
+}
diff --git a/users/drashna/keyrecords/caps_word.h b/users/drashna/keyrecords/caps_word.h
index 79e410ddda..4279d7e831 100644
--- a/users/drashna/keyrecords/caps_word.h
+++ b/users/drashna/keyrecords/caps_word.h
@@ -5,4 +5,81 @@
 
 #include "drashna.h"
 
+// Call this function from `process_record_user()` to implement Caps Word.
 bool process_caps_word(uint16_t keycode, keyrecord_t* record);
+
+// If CAPS_WORD_IDLE_TIMEOUT is set, call `caps_word_task()` from
+// `matrix_scan_user()` as described above.
+//
+// If CAPS_WORD_IDLE_TIMEOUT isn't set, calling this function has no effect (but
+// will still compile).
+#if CAPS_WORD_IDLE_TIMEOUT > 0
+void caps_word_task(void);
+#else
+static inline void caps_word_task(void) {}
+#endif
+
+// Activates or deactivates Caps Word. For instance activate Caps Word with a
+// combo by defining a `COMBO_ACTION` that calls `caps_word_set(true)`:
+//
+// void process_combo_event(uint16_t combo_index, bool pressed) {
+//   switch(combo_index) {
+//     case CAPS_COMBO:
+//       if (pressed) {
+//         caps_word_set(true);  // Activate Caps Word.
+//       }
+//       break;
+//
+//     // Other combos...
+//   }
+// }
+void caps_word_set(bool active);
+
+// Returns whether Caps Word is currently active.
+bool caps_word_get(void);
+
+// An optional callback that gets called when Caps Word turns on or off. This is
+// useful to represent the current Caps Word state, e.g. by setting an LED or
+// playing a sound. In your keymap, define
+//
+//   void caps_word_set_user(bool active) {
+//     if (active) {
+//       // Do something when Caps Word activates.
+//     } else {
+//       // Do something when Caps Word deactivates.
+//     }
+//   }
+void caps_word_set_user(bool active);
+
+// An optional callback which is called on every key press while Caps Word is
+// active. When the key should be shifted (that is, a letter key), the callback
+// should call `add_weak_mods(MOD_BIT(KC_LSFT))` to shift the key. The callback
+// also determines whether the key should continue Caps Word. Returning true
+// continues the current "word", while returning false is "word breaking" and
+// deactivates Caps Word. The default callback is
+//
+//   bool caps_word_press_user(uint16_t keycode) {
+//     switch (keycode) {
+//       // Keycodes that continue Caps Word, with shift applied.
+//       case KC_A ... KC_Z:
+//         add_weak_mods(MOD_BIT(KC_LSFT));  // Apply shift to the next key.
+//         return true;
+//
+//       // Keycodes that continue Caps Word, without shifting.
+//       case KC_1 ... KC_0:
+//       case KC_BSPC:
+//       case KC_MINS:
+//       case KC_UNDS:
+//         return true;
+//
+//       default:
+//         return false;  // Deactivate Caps Word.
+//     }
+//   }
+//
+// To customize, copy the above function into your keymap and add/remove
+// keycodes to the above cases.
+//
+// NOTE: Outside of this callback, you can use `caps_word_set(false)` to
+// deactivate Caps Word.
+bool caps_word_press_user(uint16_t keycode);
diff --git a/users/drashna/keyrecords/process_records.c b/users/drashna/keyrecords/process_records.c
index 160a880215..99267d88a8 100644
--- a/users/drashna/keyrecords/process_records.c
+++ b/users/drashna/keyrecords/process_records.c
@@ -41,21 +41,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #ifdef KEYLOGGER_ENABLE
     uprintf("KL: kc: 0x%04X, col: %2u, row: %2u, pressed: %b, time: %5u, int: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
 #endif  // KEYLOGGER_ENABLE
-#ifdef OLED_ENABLE
+#if defined(OLED_ENABLE) && defined(CUSTOM_OLED_DRIVER)
     process_record_user_oled(keycode, record);
 #endif  // OLED
 
     if (!(process_record_keymap(keycode, record) && process_record_secrets(keycode, record)
-#ifdef RGB_MATRIX_ENABLE
+#ifdef CUSTOM_RGB_MATRIX
           && process_record_user_rgb_matrix(keycode, record)
 #endif
-#ifdef RGBLIGHT_ENABLE
+#ifdef CUSTOM_RGBLIGHT
           && process_record_user_rgb_light(keycode, record)
 #endif
 #ifdef CUSTOM_UNICODE_ENABLE
           && process_record_unicode(keycode, record)
 #endif
-#if defined(POINTING_DEVICE_ENABLE)
+#if defined(CUSTOM_POINTING_DEVICE)
           && process_record_pointing(keycode, record)
 #endif
 #ifdef CAPS_WORD_ENABLE
@@ -142,26 +142,26 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
             break;
         case KC_RGB_T:  // This allows me to use underglow as layer indication, or as normal
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+#if defined(CUSTOM_RGBLIGHT) || defined(CUSTOM_RGB_MATRIX)
             if (record->event.pressed) {
                 userspace_config.rgb_layer_change ^= 1;
                 dprintf("rgblight layer change [EEPROM]: %u\n", userspace_config.rgb_layer_change);
                 eeconfig_update_user(userspace_config.raw);
                 if (userspace_config.rgb_layer_change) {
-#    if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
+#    if defined(CUSTOM_RGBLIGHT) && defined(CUSTOM_RGB_MATRIX)
                     rgblight_enable_noeeprom();
 #    endif
                     layer_state_set(layer_state);  // This is needed to immediately set the layer color (looks better)
-#    if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
+#    if defined(CUSTOM_RGBLIGHT) && defined(CUSTOM_RGB_MATRIX)
                 } else {
                     rgblight_disable_noeeprom();
 #    endif
                 }
             }
-#endif  // RGBLIGHT_ENABLE
+#endif  // CUSTOM_RGBLIGHT
             break;
 
-#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+#if defined(CUSTOM_RGBLIGHT) || defined(CUSTOM_RGB_MATRIX)
         case RGB_TOG:
             // Split keyboards need to trigger on key-up for edge-case issue
 #    ifndef SPLIT_KEYBOARD
@@ -169,10 +169,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #    else
             if (!record->event.pressed) {
 #    endif
-#    if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
+#    if defined(CUSTOM_RGBLIGHT) && !defined(RGBLIGHT_DISABLE_KEYCODES)
                 rgblight_toggle();
 #    endif
-#    if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
+#    if defined(CUSTOM_RGB_MATRIX) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
                 rgb_matrix_toggle();
 #    endif
             }
@@ -181,7 +181,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case RGB_MODE_FORWARD ... RGB_MODE_GRADIENT:  // quantum_keycodes.h L400 for definitions
             if (record->event.pressed) {
                 bool is_eeprom_updated;
-#    if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
+#    if defined(CUSTOM_RGBLIGHT) && !defined(RGBLIGHT_DISABLE_KEYCODES)
                 // This disables layer indication, as it's assumed that if you're changing this ... you want that disabled
                 if (userspace_config.rgb_layer_change) {
                     userspace_config.rgb_layer_change = false;
@@ -189,7 +189,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                     is_eeprom_updated = true;
                 }
 #    endif
-#    if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
+#    if defined(CUSTOM_RGB_MATRIX) && defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
                 if (userspace_config.rgb_matrix_idle_anim) {
                     userspace_config.rgb_matrix_idle_anim = false;
                     dprintf("RGB Matrix Idle Animation [EEPROM]: %u\n", userspace_config.rgb_matrix_idle_anim);
diff --git a/users/drashna/keyrecords/process_records.h b/users/drashna/keyrecords/process_records.h
index d7a81d4607..5ca2966131 100644
--- a/users/drashna/keyrecords/process_records.h
+++ b/users/drashna/keyrecords/process_records.h
@@ -4,8 +4,10 @@
 #pragma once
 #include "drashna.h"
 
-#if defined(KEYBOARD_handwired_tractyl_manuform)
+#if defined(KEYBOARD_handwired_tractyl_manuform) && defined(POINTING_DEVICE_ENABLE)
 #    define PLACEHOLDER_SAFE_RANGE KEYMAP_SAFE_RANGE
+#elif defined(KEYBOARD_bastardkb_charybdis)
+#    define PLACEHOLDER_SAFE_RANGE CHARYBDIS_SAFE_RANGE
 #else
 #    define PLACEHOLDER_SAFE_RANGE SAFE_RANGE
 #endif
diff --git a/users/drashna/keyrecords/unicode.c b/users/drashna/keyrecords/unicode.c
index 5acd51da9b..af87ee2a61 100644
--- a/users/drashna/keyrecords/unicode.c
+++ b/users/drashna/keyrecords/unicode.c
@@ -6,7 +6,7 @@
 #include "drashna.h"
 #include "process_unicode_common.h"
 
-uint16_t typing_mode;
+uint16_t typing_mode = KC_NOMODE;
 
 /**
  * @brief Registers the unicode keystrokes based on desired unicode
@@ -245,7 +245,7 @@ bool process_record_unicode(uint16_t keycode, keyrecord_t *record) {
                 if (typing_mode != keycode) {
                     typing_mode = keycode;
                 } else {
-                    typing_mode = 0;
+                    typing_mode = KC_NOMODE;
                 }
             }
             break;
diff --git a/users/drashna/oled/oled_stuff.c b/users/drashna/oled/oled_stuff.c
index 752829e0fa..2a26b8b638 100644
--- a/users/drashna/oled/oled_stuff.c
+++ b/users/drashna/oled/oled_stuff.c
@@ -19,6 +19,9 @@
 #ifdef UNICODE_COMMON_ENABLE
 #    include "process_unicode_common.h"
 #endif
+#    ifdef AUDIO_CLICKY
+#        include "process_clicky.h"
+#    endif
 #include <string.h>
 
 extern bool host_driver_disabled;
@@ -26,7 +29,9 @@ extern bool host_driver_disabled;
 uint32_t                  oled_timer                        = 0;
 char                      keylog_str[OLED_KEYLOGGER_LENGTH] = {0};
 static uint16_t           log_timer                         = 0;
+#ifdef OLED_DISPLAY_VERBOSE
 static const char PROGMEM display_border[3]                 = {0x0, 0xFF, 0x0};
+#endif
 
 deferred_token kittoken;
 
@@ -101,12 +106,6 @@ bool process_record_user_oled(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-void update_log(void) {
-    if (timer_elapsed(log_timer) > 750) {
-        // add_keylog(0);
-    }
-}
-
 /**
  * @brief Renders keylogger buffer to oled
  *
@@ -448,20 +447,24 @@ void render_bootmagic_status(void) {
 #endif
 }
 
-#if defined(POINTING_DEVICE_ENABLE)
+#if defined(CUSTOM_POINTING_DEVICE)
 extern bool tap_toggling;
 #endif
 
 void render_user_status(void) {
 #ifdef AUDIO_ENABLE
-    bool is_audio_on = false, is_clicky_on = false;
+    bool is_audio_on = false, l_is_clicky_on = false;
 #    ifdef SPLIT_KEYBOARD
 
-    is_audio_on  = user_state.audio_enable;
-    is_clicky_on = user_state.audio_clicky_enable;
+    is_audio_on = user_state.audio_enable;
+#        ifdef AUDIO_CLICKY
+    l_is_clicky_on = user_state.audio_clicky_enable;
+#        endif
 #    else
     is_audio_on  = is_audio_on();
-    is_clicky_on = is_clicky_on();
+#        ifdef AUDIO_CLICKY
+    l_is_clicky_on = is_clicky_on();
+#        endif
 #    endif
 #endif
 #if defined(OLED_DISPLAY_VERBOSE)
@@ -476,7 +479,7 @@ void render_user_status(void) {
 #    if !defined(OLED_DISPLAY_VERBOSE)
     oled_write_P(PSTR(" "), false);
 #    endif
-#elif defined(POINTING_DEVICE_ENABLE)
+#elif defined(CUSTOM_POINTING_DEVICE)
     static const char PROGMEM mouse_lock[3] = {0xF2, 0xF3, 0};
     oled_write_P(mouse_lock, tap_toggling);
 #endif
@@ -486,7 +489,7 @@ void render_user_status(void) {
 
 #    ifdef AUDIO_CLICKY
     static const char PROGMEM audio_clicky_status[2][3] = {{0xF4, 0xF5, 0}, {0xF6, 0xF7, 0}};
-    oled_write_P(audio_clicky_status[is_clicky_on && is_audio_on], false);
+    oled_write_P(audio_clicky_status[l_is_clicky_on && is_audio_on], false);
 #        if !defined(OLED_DISPLAY_VERBOSE)
     oled_write_P(PSTR(" "), false);
 #        endif
@@ -540,6 +543,7 @@ void render_wpm(uint8_t padding) {
 // vertical_offset          = 0;
 
 void render_wpm_graph(uint8_t max_lines_graph, uint8_t vertical_offset) {
+#ifdef WPM_ENABLE
     static uint16_t timer   = 0;
     static uint8_t  x       = OLED_DISPLAY_HEIGHT - 1;
     uint8_t         currwpm = get_current_wpm();
@@ -588,6 +592,7 @@ void render_wpm_graph(uint8_t max_lines_graph, uint8_t vertical_offset) {
 
         timer = timer_read();  // refresh the timer for the next iteration
     }
+#endif
 }
 
 #if defined(POINTING_DEVICE_ENABLE)
@@ -625,7 +630,7 @@ __attribute__((weak)) void oled_driver_render_logo_right(void) {
 
 //#define ANIM_FRAME_DURATION 500 // how long each frame lasts in ms
 // #define SLEEP_TIMER 60000 // should sleep after this period of 0 wpm, needs fixing
-#define OLED_ANIM_SIZE 32  // number of bytes in array, minimize for adequate firmware size, max is 1024
+#define OLED_ANIM_SIZE 36
 #define OLED_ANIM_ROWS 4
 #define OLED_ANIM_MAX_FRAMES 3
 #if (OLED_SLEEP_FRAMES > OLED_ANIM_MAX_FRAMES) || (OLED_WAKE_FRAMES > OLED_ANIM_MAX_FRAMES) || (OLED_KAKI_FRAMES > OLED_ANIM_MAX_FRAMES) || (OLED_RTOGI_FRAMES > OLED_ANIM_MAX_FRAMES)
@@ -645,247 +650,67 @@ void render_kitty(void) {
         // sleep frames
         {
             {
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08,
-                    0xa8, 0x48, 0xa8, 0x18, 0x08, 0x00, 0x00, 0x00,
-                    0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03,
-                    0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x80,
-                    0x44, 0x84, 0x06, 0x05, 0x04, 0x80, 0x40, 0x20,
-                    0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20,
-                    0x18, 0x04, 0x04, 0x02, 0x7a, 0x86, 0x01, 0x80,
-                    0x80, 0x01, 0x03, 0x05, 0x07, 0x01, 0x00, 0x00,
-                    0x80, 0x83, 0x45, 0xfa, 0x3c, 0xe0, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08,
-                    0x10, 0x10, 0x10, 0x10, 0x10, 0x33, 0x24, 0x28,
-                    0x28, 0x29, 0x29, 0x29, 0x3a, 0x18, 0x1c, 0x39,
-                    0x24, 0x24, 0x3a, 0x2d, 0x26, 0x31, 0x1f, 0x00
-                }
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xa8, 0x48, 0xa8, 0x18, 0x08, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x80, 0x44, 0x84, 0x06, 0x05, 0x04, 0x80, 0x40, 0x20, 0x10, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x18, 0x04, 0x04, 0x02, 0x7a, 0x86, 0x01, 0x80, 0x80, 0x01, 0x03, 0x05, 0x07, 0x01, 0x00, 0x00, 0x80, 0x83, 0x45, 0xfa, 0x3c, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10, 0x33, 0x24, 0x28, 0x28, 0x29, 0x29, 0x29, 0x3a, 0x18, 0x1c, 0x39, 0x24, 0x24, 0x3a, 0x2d, 0x26, 0x31, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00 }
             },
             {
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x22, 0x22, 0x3a, 0x2a, 0x26, 0x22, 0x80, 0xc0,
-                    0x80, 0x00, 0x24, 0x34, 0x2c, 0xe4, 0x60, 0x10,
-                    0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x38,
-                    0x04, 0x02, 0x02, 0x01, 0x79, 0x87, 0x01, 0x80,
-                    0x81, 0x83, 0x05, 0x05, 0x03, 0x01, 0x00, 0x00,
-                    0x80, 0x43, 0x05, 0xfa, 0x3c, 0xe0, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08,
-                    0x10, 0x10, 0x10, 0x10, 0x10, 0x33, 0x24, 0x28,
-                    0x28, 0x28, 0x29, 0x29, 0x3a, 0x18, 0x1c, 0x39,
-                    0x24, 0x24, 0x3a, 0x2d, 0x26, 0x31, 0x1f, 0x00
-                }
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x22, 0x3a, 0x2a, 0x26, 0x22, 0x80, 0xc0, 0x80, 0x00, 0x24, 0x34, 0x2c, 0xe4, 0x60, 0x10, 0x70, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x38, 0x04, 0x02, 0x02, 0x01, 0x79, 0x87, 0x01, 0x80, 0x81, 0x83, 0x05, 0x05, 0x03, 0x01, 0x00, 0x00, 0x80, 0x43, 0x05, 0xfa, 0x3c, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x08, 0x10, 0x10, 0x10, 0x10, 0x10, 0x33, 0x24, 0x28, 0x28, 0x28, 0x29, 0x29, 0x3a, 0x18, 0x1c, 0x39, 0x24, 0x24, 0x3a, 0x2d, 0x26, 0x31, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00 }
             }
         },
         // wake frames
         {
             {
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0xc0, 0x30, 0x08, 0x10, 0x60, 0x80,
-                    0x00, 0x80, 0x60, 0x10, 0x08, 0x30, 0xc0, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x7f, 0x80, 0x40, 0x40, 0x5c, 0x00, 0x01,
-                    0x41, 0x01, 0x00, 0x5c, 0x40, 0x40, 0x80, 0x7f,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-                    0x40, 0x40, 0x80, 0xe1, 0x12, 0x0a, 0x06, 0x00,
-                    0x80, 0x00, 0x06, 0x0a, 0x12, 0xe1, 0x80, 0x40,
-                    0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
-                    0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
-                    0x0f, 0x18, 0x10, 0x10, 0x1f, 0x11, 0x10, 0x10,
-                    0x14, 0x14, 0x1f, 0x1c, 0x14, 0x14, 0x14, 0x08
-                }
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x08, 0x10, 0x60, 0x80, 0x00, 0x80, 0x60, 0x10, 0x08, 0x30, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x80, 0x40, 0x40, 0x5c, 0x00, 0x01, 0x41, 0x01, 0x00, 0x5c, 0x40, 0x40, 0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x80, 0xe1, 0x12, 0x0a, 0x06, 0x00, 0x80, 0x00, 0x06, 0x0a, 0x12, 0xe1, 0x80, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x11, 0x10, 0x10, 0x14, 0x14, 0x1f, 0x1c, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00 }
             },
             {
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0xc0, 0x30, 0x08, 0x10, 0x60, 0x80,
-                    0x00, 0x80, 0x60, 0x10, 0x08, 0x30, 0xc0, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x7f, 0x90, 0x12, 0x0a, 0x02, 0xf4, 0x09,
-                    0x0d, 0xf1, 0x04, 0x02, 0x0a, 0x12, 0x90, 0x7f,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-                    0x40, 0x40, 0x80, 0xe1, 0x12, 0x0a, 0x06, 0x01,
-                    0x81, 0x00, 0x06, 0x0a, 0x12, 0xe1, 0x80, 0x40,
-                    0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
-                    0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
-                    0x0f, 0x18, 0x10, 0x10, 0x1f, 0x11, 0x10, 0x10,
-                    0x14, 0x14, 0x1f, 0x1c, 0x14, 0x14, 0x14, 0x08
-                }
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x30, 0x08, 0x10, 0x60, 0x80, 0x00, 0x80, 0x60, 0x10, 0x08, 0x30, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x90, 0x12, 0x0a, 0x02, 0xf4, 0x09, 0x0d, 0xf1, 0x04, 0x02, 0x0a, 0x12, 0x90, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x80, 0xe1, 0x12, 0x0a, 0x06, 0x01, 0x81, 0x00, 0x06, 0x0a, 0x12, 0xe1, 0x80, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x11, 0x10, 0x10, 0x14, 0x14, 0x1f, 0x1c, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00 }
             }
         },
         // kaki frames
         {
             {
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x40,
-                    0x80, 0x80, 0x80, 0x00, 0xfc, 0x84, 0x08, 0x08,
-                    0x10, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x60,
-                    0x80, 0x00, 0x00, 0x91, 0xa1, 0x80, 0x00, 0x00,
-                    0x22, 0x84, 0x40, 0x50, 0x48, 0xc1, 0x3e, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-                    0x40, 0x41, 0x82, 0xe2, 0x12, 0x0a, 0x06, 0x00,
-                    0x80, 0x88, 0x4f, 0x02, 0x22, 0xe2, 0x9f, 0x40,
-                    0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
-                    0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
-                    0x0f, 0x18, 0x14, 0x10, 0x10, 0x10, 0x10, 0x10,
-                    0x14, 0x14, 0x1f, 0x1a, 0x0a, 0x0a, 0x04, 0x00
-                }
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x40, 0x80, 0x80, 0x80, 0x00, 0xfc, 0x84, 0x08, 0x08, 0x10, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1e, 0x60, 0x80, 0x00, 0x00, 0x91, 0xa1, 0x80, 0x00, 0x00, 0x22, 0x84, 0x40, 0x50, 0x48, 0xc1, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x41, 0x82, 0xe2, 0x12, 0x0a, 0x06, 0x00, 0x80, 0x88, 0x4f, 0x02, 0x22, 0xe2, 0x9f, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x14, 0x10, 0x10, 0x10, 0x10, 0x10, 0x14, 0x14, 0x1f, 0x1a, 0x0a, 0x0a, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00 }
             },
             {
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0xf0, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x06, 0x1a, 0x22, 0xc2, 0x04, 0x04,
-                    0x04, 0x07, 0x00, 0xc0, 0x20, 0x10, 0x80, 0x80,
-                    0x01, 0x01, 0x02, 0xfc, 0xfe, 0x02, 0x3c, 0x20,
-                    0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d,
-                    0x55, 0x50, 0x94, 0xf0, 0x10, 0x09, 0x08, 0x00,
-                    0x80, 0x00, 0x06, 0x09, 0x1b, 0xee, 0x00, 0x00,
-                    0x00, 0x00, 0x81, 0xfe, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
-                    0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
-                    0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c,
-                    0x14, 0x16, 0x15, 0x14, 0x14, 0x14, 0x14, 0x08
-                }
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x06, 0x1a, 0x22, 0xc2, 0x04, 0x04, 0x04, 0x07, 0x00, 0xc0, 0x20, 0x10, 0x80, 0x80, 0x01, 0x01, 0x02, 0xfc, 0xfe, 0x02, 0x3c, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d, 0x55, 0x50, 0x94, 0xf0, 0x10, 0x09, 0x08, 0x00, 0x80, 0x00, 0x06, 0x09, 0x1b, 0xee, 0x00, 0x00, 0x00, 0x00, 0x81, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c, 0x14, 0x16, 0x15, 0x14, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00 }
             },
             {
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x20, 0x40,
-                    0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x01,
-                    0x02, 0x04, 0x04, 0x03, 0x80, 0x40, 0x40, 0x20,
-                    0x00, 0x01, 0x02, 0x8c, 0x70, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d,
-                    0x55, 0x50, 0x94, 0xf0, 0x10, 0x0a, 0x0e, 0x1d,
-                    0x95, 0x24, 0x24, 0x27, 0x13, 0xe1, 0x01, 0x01,
-                    0x01, 0x01, 0x02, 0xfc, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14,
-                    0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18,
-                    0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c,
-                    0x14, 0x14, 0x17, 0x14, 0x14, 0x14, 0x14, 0x08
-                }
+                { 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x01, 0x02, 0x04, 0x04, 0x03, 0x80, 0x40, 0x40, 0x20, 0x00, 0x01, 0x02, 0x8c, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0d, 0x8d, 0x55, 0x50, 0x94, 0xf0, 0x10, 0x0a, 0x0e, 0x1d, 0x95, 0x24, 0x24, 0x27, 0x13, 0xe1, 0x01, 0x01, 0x01, 0x01, 0x02, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1f, 0x14, 0x14, 0x10, 0x10, 0x11, 0x1f, 0x10, 0x10, 0x18, 0x0f, 0x18, 0x10, 0x10, 0x1f, 0x19, 0x18, 0x1c, 0x14, 0x14, 0x17, 0x14, 0x14, 0x14, 0x14, 0x08, 0x00, 0x00, 0x00, 0x00 }
             }
         },
         // rtogi frames
         {
             {
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02,
-                    0x01, 0x0f, 0x90, 0x10, 0x20, 0xf0, 0xf8, 0xf8
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-                    0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08,
-                    0x48, 0x47, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x08, 0x88, 0xc7, 0xc4, 0x62, 0x23, 0x11, 0x3f
-                },
-                {
-                    0x80, 0x40, 0x20, 0x10, 0x88, 0xcc, 0x43, 0x80,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0,
-                    0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c,
-                    0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                {
-                    0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
-                    0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04,
-                    0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                }
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02, 0x01, 0x0f, 0x90, 0x10, 0x20, 0xf0, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x48, 0x47, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x88, 0xc7, 0xc4, 0x62, 0x23, 0x11, 0x3f, 0x00, 0x00, 0x00, 0x00 },
+                { 0x80, 0x40, 0x20, 0x10, 0x88, 0xcc, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
             },
             {
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02,
-                    0x01, 0x1f, 0xa0, 0x20, 0x40, 0x80, 0x00, 0xf0
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-                    0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08,
-                    0x48, 0x47, 0x88, 0x00, 0x00, 0x00, 0x00, 0x24,
-                    0x24, 0x28, 0x6b, 0x40, 0xa0, 0x99, 0x86, 0xff
-                },
-                {
-                    0x0f, 0x11, 0x22, 0x44, 0x48, 0x4c, 0x43, 0x80,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0,
-                    0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c,
-                    0x04, 0x06, 0x06, 0x06, 0x0e, 0x0e, 0x06, 0x01
-                },
-                {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04,
-                    0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                }
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x10, 0x10, 0x08, 0x04, 0x02, 0x01, 0x1f, 0xa0, 0x20, 0x40, 0x80, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x10, 0x08, 0x08, 0x08, 0x08, 0x48, 0x47, 0x88, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x28, 0x6b, 0x40, 0xa0, 0x99, 0x86, 0xff, 0x00, 0x00, 0x00, 0x00 },
+                { 0x0f, 0x11, 0x22, 0x44, 0x48, 0x4c, 0x43, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x80, 0x80, 0xc0, 0xe1, 0xfe, 0xb8, 0x88, 0x0c, 0x04, 0x06, 0x06, 0x06, 0x0e, 0x0e, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00 },
+                { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x06, 0x04, 0x04, 0x04, 0x04, 0x05, 0x04, 0x04, 0x04, 0x07, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
             }
         }
     };
@@ -899,7 +724,7 @@ void render_kitty(void) {
 
 uint32_t kitty_animation_phases(uint32_t triger_time, void *cb_arg) {
     static uint32_t anim_frame_duration = 500;
-#ifdef POINTING_DEVICE_ENABLE
+#ifdef CUSTOM_POINTING_DEVICE
     if (tap_toggling) {
         animation_frame     = (animation_frame + 1) % OLED_RTOGI_FRAMES;
         animation_type      = 3;
@@ -953,7 +778,7 @@ void oled_driver_render_logo_left(void) {
     render_matrix_scan_rate(2);
 #    endif
     oled_set_cursor(7, 2);
-#    if defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)
+#    if (defined(KEYBOARD_bastardkb_charybdis) || defined(KEYBOARD_handwired_tractyl_manuform)) && defined(POINTING_DEVICE_ENABLE)
     render_pointing_dpi_status(charybdis_get_pointer_sniping_enabled() ? charybdis_get_pointer_sniping_dpi() : charybdis_get_pointer_default_dpi(), 1);
 
 // credit and thanks to jaspertandy on discord for these images
@@ -1054,7 +879,6 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 __attribute__((weak)) bool oled_task_keymap(void) { return true; }
 
 bool oled_task_user(void) {
-    update_log();
 
     if (is_keyboard_master()) {
 #ifndef OLED_DISPLAY_TEST
diff --git a/users/drashna/oled/sh110x.c b/users/drashna/oled/sh110x.c
index c850a47538..cfdae1db16 100644
--- a/users/drashna/oled/sh110x.c
+++ b/users/drashna/oled/sh110x.c
@@ -26,8 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "keyboard.h"
 
-// Used commands from spec sheet: https://cdn-shop.adafruit.com/datasheets/SSD1306.pdf
-// for SH1106: https://www.velleman.eu/downloads/29/infosheets/sh1106_datasheet.pdf
+// for SH1107: https://www.displayfuture.com/Display/datasheet/controller/SH1107.pdf
 
 // Fundamental Commands
 #define CONTRAST 0x81
@@ -97,17 +96,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define OLED_ALL_BLOCKS_MASK (((((OLED_BLOCK_TYPE)1 << (OLED_BLOCK_COUNT - 1)) - 1) << 1) | 1)
 
-#define OLED_IC_HAS_HORIZONTAL_MODE (OLED_IC == OLED_IC_SSD1306)
-#define OLED_IC_COM_PINS_ARE_COLUMNS (OLED_IC == OLED_IC_SH1107)
-
 #ifndef OLED_COM_PIN_COUNT
-#    if OLED_IC == OLED_IC_SH1106
-#        define OLED_COM_PIN_COUNT 64
-#    elif OLED_IC == OLED_IC_SH1107
-#        define OLED_COM_PIN_COUNT 128
-#    else
-#        error Invalid OLED_IC value
-#    endif
+#    define OLED_COM_PIN_COUNT 128
 #endif
 
 #ifndef OLED_COM_PIN_OFFSET
@@ -203,24 +193,12 @@ bool oled_init(oled_rotation_t rotation) {
         DISPLAY_CLOCK,
         0x80,
         MULTIPLEX_RATIO,
-#if OLED_IC_COM_PINS_ARE_COLUMNS
         OLED_DISPLAY_WIDTH - 1,
-#else
-        OLED_DISPLAY_HEIGHT - 1,
-#endif
-        DISPLAY_OFFSET,
+        SH1107_DISPLAY_START_LINE,
         0x00,
-        DISPLAY_START_LINE | 0x00,
         CHARGE_PUMP,
         0x14,
-#if (OLED_IC != OLED_IC_SH1106)
-        // MEMORY_MODE is unsupported on SH1106 (Page Addressing only)
-        MEMORY_MODE,
-        0x00,  // Horizontal addressing mode
-#elif OLED_IC == OLED_IC_SH1107
-        // Page addressing mode
         SH1107_MEMORY_MODE_PAGE,
-#endif
     };
     if (I2C_TRANSMIT_P(display_setup1) != I2C_STATUS_SUCCESS) {
         print("oled_init cmd set 1 failed\n");
@@ -229,7 +207,11 @@ bool oled_init(oled_rotation_t rotation) {
 
     if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_180)) {
         static const uint8_t PROGMEM display_normal[] = {
-            I2C_CMD, SEGMENT_REMAP_INV, COM_SCAN_DEC, DISPLAY_OFFSET, OLED_COM_PIN_OFFSET,
+            I2C_CMD,
+            SEGMENT_REMAP_INV,
+            COM_SCAN_DEC,
+            DISPLAY_OFFSET,
+            OLED_COM_PIN_OFFSET,
         };
         if (I2C_TRANSMIT_P(display_normal) != I2C_STATUS_SUCCESS) {
             print("oled_init cmd normal rotation failed\n");
@@ -237,7 +219,11 @@ bool oled_init(oled_rotation_t rotation) {
         }
     } else {
         static const uint8_t PROGMEM display_flipped[] = {
-            I2C_CMD, SEGMENT_REMAP, COM_SCAN_INC, DISPLAY_OFFSET, (OLED_COM_PIN_COUNT - OLED_COM_PIN_OFFSET) % OLED_COM_PIN_COUNT,
+            I2C_CMD,
+            SEGMENT_REMAP,
+            COM_SCAN_INC,
+            DISPLAY_OFFSET,
+            (OLED_COM_PIN_COUNT - OLED_COM_PIN_OFFSET) % OLED_COM_PIN_COUNT,
         };
         if (I2C_TRANSMIT_P(display_flipped) != I2C_STATUS_SUCCESS) {
             print("display_flipped failed\n");
@@ -245,7 +231,18 @@ bool oled_init(oled_rotation_t rotation) {
         }
     }
 
-    static const uint8_t PROGMEM display_setup2[] = {I2C_CMD, COM_PINS, OLED_COM_PINS, CONTRAST, OLED_BRIGHTNESS, PRE_CHARGE_PERIOD, 0x22, VCOM_DETECT, 0x35, DISPLAY_ALL_ON_RESUME, NORMAL_DISPLAY, DEACTIVATE_SCROLL, DISPLAY_ON};    if (I2C_TRANSMIT_P(display_setup2) != I2C_STATUS_SUCCESS) {
+    static const uint8_t PROGMEM display_setup2[] = {
+        I2C_CMD, COM_PINS,
+        OLED_COM_PINS,
+        CONTRAST, OLED_BRIGHTNESS,
+        PRE_CHARGE_PERIOD, 0x22,
+        VCOM_DETECT, 0x35,
+        DISPLAY_ALL_ON_RESUME,
+        NORMAL_DISPLAY,
+        DEACTIVATE_SCROLL,
+        DISPLAY_ON
+    };
+    if (I2C_TRANSMIT_P(display_setup2) != I2C_STATUS_SUCCESS) {
         print("display_setup2 failed\n");
         return false;
     }
@@ -277,22 +274,11 @@ static void calc_bounds(uint8_t update_start, uint8_t *cmd_array) {
     // Calculate commands to set memory addressing bounds.
     uint8_t start_page   = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_WIDTH;
     uint8_t start_column = OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_WIDTH;
-#if !OLED_IC_HAS_HORIZONTAL_MODE
     // Commands for Page Addressing Mode. Sets starting page and column; has no end bound.
     // Column value must be split into high and low nybble and sent as two commands.
     cmd_array[0] = PAM_PAGE_ADDR | start_page;
     cmd_array[1] = PAM_SETCOLUMN_LSB | ((OLED_COLUMN_OFFSET + start_column) & 0x0f);
     cmd_array[2] = PAM_SETCOLUMN_MSB | ((OLED_COLUMN_OFFSET + start_column) >> 4 & 0x0f);
-    cmd_array[3] = NOP;
-    cmd_array[4] = NOP;
-    cmd_array[5] = NOP;
-#else
-    // Commands for use in Horizontal Addressing mode.
-    cmd_array[1] = start_column + OLED_COLUMN_OFFSET;
-    cmd_array[4] = start_page;
-    cmd_array[2] = (OLED_BLOCK_SIZE + OLED_DISPLAY_WIDTH - 1) % OLED_DISPLAY_WIDTH + cmd_array[1];
-    cmd_array[5] = (OLED_BLOCK_SIZE + OLED_DISPLAY_WIDTH - 1) / OLED_DISPLAY_WIDTH - 1 + cmd_array[4];
-#endif
 }
 
 static void calc_bounds_90(uint8_t update_start, uint8_t *cmd_array) {
@@ -310,19 +296,12 @@ static void calc_bounds_90(uint8_t update_start, uint8_t *cmd_array) {
     // Top page number for a block which is at the bottom edge of the screen.
     const uint8_t bottom_block_top_page = (height_in_pages - page_inc_per_block) % height_in_pages;
 
-#if !OLED_IC_HAS_HORIZONTAL_MODE
     // Only the Page Addressing Mode is supported
     uint8_t start_page   = bottom_block_top_page - (OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_HEIGHT / 8);
     uint8_t start_column = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_HEIGHT * 8;
     cmd_array[0] = PAM_PAGE_ADDR | start_page;
     cmd_array[1] = PAM_SETCOLUMN_LSB | ((OLED_COLUMN_OFFSET + start_column) & 0x0f);
     cmd_array[2] = PAM_SETCOLUMN_MSB | ((OLED_COLUMN_OFFSET + start_column) >> 4 & 0x0f);
-#else
-    cmd_array[1] = OLED_BLOCK_SIZE * update_start / OLED_DISPLAY_HEIGHT * 8 + OLED_COLUMN_OFFSET;
-    cmd_array[4] = bottom_block_top_page - (OLED_BLOCK_SIZE * update_start % OLED_DISPLAY_HEIGHT / 8);
-    cmd_array[2] = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) / OLED_DISPLAY_HEIGHT * 8 - 1 + cmd_array[1];
-    cmd_array[5] = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) % OLED_DISPLAY_HEIGHT / 8 + cmd_array[4];
-#endif
 }
 
 uint8_t crot(uint8_t a, int8_t n) {
@@ -358,11 +337,7 @@ void oled_render(void) {
     }
 
     // Set column & page position
-#if OLED_IC_HAS_HORIZONTAL_MODE
-    static uint8_t display_start[] = {I2C_CMD, COLUMN_ADDR, 0, OLED_DISPLAY_WIDTH - 1, PAGE_ADDR, 0, OLED_DISPLAY_HEIGHT / 8 - 1};
-#else
     static uint8_t display_start[] = {I2C_CMD, PAM_PAGE_ADDR, PAM_SETCOLUMN_LSB, PAM_SETCOLUMN_MSB};
-#endif
     if (!HAS_FLAGS(oled_rotation, OLED_ROTATION_90)) {
         calc_bounds(update_start, &display_start[1]);  // Offset from I2C_CMD byte at the start
     } else {
@@ -392,13 +367,6 @@ void oled_render(void) {
             rotate_90(&oled_buffer[OLED_BLOCK_SIZE * update_start + source_map[i]], &temp_buffer[target_map[i]]);
         }
 
-#if OLED_IC_HAS_HORIZONTAL_MODE
-        // Send render data chunk after rotating
-        if (I2C_WRITE_REG(I2C_DATA, &temp_buffer[0], OLED_BLOCK_SIZE) != I2C_STATUS_SUCCESS) {
-            print("oled_render90 data failed\n");
-            return;
-        }
-#else
         // For SH1106 or SH1107 the data chunk must be split into separate pieces for each page
         const uint8_t columns_in_block = (OLED_BLOCK_SIZE + OLED_DISPLAY_HEIGHT - 1) / OLED_DISPLAY_HEIGHT * 8;
         const uint8_t num_pages = OLED_BLOCK_SIZE / columns_in_block;
@@ -417,7 +385,6 @@ void oled_render(void) {
                 return;
             }
         }
-#endif
     }
 
     // Turn on display if it is off
@@ -825,7 +792,7 @@ void oled_task(void) {
     }
 #else
     oled_set_cursor(0, 0);
-    oled_task_kb();
+    oled_task_kbr();
 #endif
 
 #if OLED_SCROLL_TIMEOUT > 0
@@ -856,5 +823,6 @@ void oled_task(void) {
 #endif
 }
 
+
 __attribute__((weak)) bool oled_task_kb(void) { return oled_task_user(); }
 __attribute__((weak)) bool oled_task_user(void) { return true; }
diff --git a/users/drashna/pointing/pointing.c b/users/drashna/pointing/pointing.c
index d0a83e2c26..2e313ba574 100644
--- a/users/drashna/pointing/pointing.c
+++ b/users/drashna/pointing/pointing.c
@@ -118,7 +118,7 @@ bool process_record_pointing(uint16_t keycode, keyrecord_t* record) {
 }
 
 layer_state_t layer_state_set_pointing(layer_state_t state) {
-    if (layer_state_cmp(state, _GAMEPAD) || layer_state_cmp(state, _DIABLO)) {
+    if (layer_state_cmp(state, _GAMEPAD) || layer_state_cmp(state, _DIABLO) || layer_state_cmp(state, _DIABLOII)) {
         state |= ((layer_state_t)1 << _MOUSE);
     }
     return state;
diff --git a/users/drashna/post_config.h b/users/drashna/post_config.h
index 0c9bda2eeb..2d5e6438d6 100644
--- a/users/drashna/post_config.h
+++ b/users/drashna/post_config.h
@@ -37,10 +37,9 @@
 #    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_REST_MODE
 #endif
 
-#ifdef QMK_KEYS_PER_SCAN
-#    undef QMK_KEYS_PER_SCAN
+#ifndef QMK_KEYS_PER_SCAN
+#    define QMK_KEYS_PER_SCAN 8
 #endif
-#define QMK_KEYS_PER_SCAN 4
 
 #ifdef MOUSEKEY_ENABLE
 // mouse movement config
diff --git a/users/drashna/rgb/rgb_stuff.c b/users/drashna/rgb/rgb_stuff.c
index 09071f7151..7d2cf0c73d 100644
--- a/users/drashna/rgb/rgb_stuff.c
+++ b/users/drashna/rgb/rgb_stuff.c
@@ -24,7 +24,6 @@ static bool     is_rgblight_startup;
 static HSV      old_hsv;
 static uint8_t  old_mode;
 deferred_token rgb_startup_token;
-#    endif
 
 uint32_t rgb_startup_animation(uint32_t triger_time, void *cb_arg) {
     if (is_rgblight_startup && is_keyboard_master()) {
@@ -45,6 +44,7 @@ uint32_t rgb_startup_animation(uint32_t triger_time, void *cb_arg) {
     }
     return is_rgblight_startup ? 10 : 0;
 }
+#    endif
 
 void keyboard_post_init_rgb_light(void) {
 #    if defined(RGBLIGHT_STARTUP_ANIMATION)
@@ -56,11 +56,11 @@ void keyboard_post_init_rgb_light(void) {
     old_mode = rgblight_get_mode();
     rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
     is_rgblight_startup = true;
+    rgb_startup_token = defer_exec(300, rgb_startup_animation, NULL);
 #    endif
     if (userspace_config.rgb_layer_change) {
         layer_state_set_rgb_light(layer_state);
     }
-    rgb_startup_token = defer_exec(300, rgb_startup_animation, NULL);
 
 }
 
diff --git a/users/drashna/rules.mk b/users/drashna/rules.mk
index 4bc71b6939..12fa956b7d 100644
--- a/users/drashna/rules.mk
+++ b/users/drashna/rules.mk
@@ -53,6 +53,7 @@ CUSTOM_RGBLIGHT ?= yes
 ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
     ifeq ($(strip $(CUSTOM_RGBLIGHT)), yes)
         SRC += $(USER_PATH)/rgb/rgb_stuff.c
+        OPT_DEFS += -DCUSTOM_RGBLIGHT
         ifeq ($(strip $(RGBLIGHT_NOEEPROM)), yes)
             OPT_DEFS += -DRGBLIGHT_NOEEPROM
         endif
@@ -67,6 +68,7 @@ CUSTOM_RGB_MATRIX ?= yes
 ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
     ifeq ($(strip $(CUSTOM_RGB_MATRIX)), yes)
         SRC += $(USER_PATH)/rgb/rgb_matrix_stuff.c
+        OPT_DEFS += -DCUSTOM_RGB_MATRIX
     endif
 endif
 
@@ -86,7 +88,7 @@ ifeq ($(strip $(OLED_ENABLE)), yes)
         QUANTUM_LIB_SRC += i2c_master.c
     endif
     ifeq ($(strip $(CUSTOM_OLED_DRIVER)), yes)
-        OPT_DEFS += -DCUSTOM_OLED_DRIVER_CODE
+        OPT_DEFS += -DCUSTOM_OLED_DRIVER
         SRC += $(USER_PATH)/oled/oled_stuff.c
     endif
     ifeq ($(strip $(OLED_DISPLAY_TEST)), yes)
@@ -99,6 +101,7 @@ CUSTOM_POINTING_DEVICE ?= yes
 ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
     ifeq ($(strip $(CUSTOM_POINTING_DEVICE)), yes)
         SRC += $(USER_PATH)/pointing/pointing.c
+        OPT_DEFS += -DCUSTOM_POINTING_DEVICE
     endif
 endif
 
diff --git a/users/drashna/split/transport_sync.c b/users/drashna/split/transport_sync.c
index 4c113ec257..539a18900c 100644
--- a/users/drashna/split/transport_sync.c
+++ b/users/drashna/split/transport_sync.c
@@ -57,7 +57,7 @@ void user_config_sync(uint8_t initiator2target_buffer_size, const void* initiato
 void watchdog_handler(uint8_t in_buflen, const void* in_data, uint8_t out_buflen, void* out_data) { watchdog_ping_done = true; }
 #endif
 
-#ifdef OLED_ENABLE
+#ifdef CUSTOM_OLED_DRIVER
 #    include "oled/oled_stuff.h"
 void keylogger_string_sync(uint8_t initiator2target_buffer_size, const void* initiator2target_buffer, uint8_t target2initiator_buffer_size, void* target2initiator_buffer) {
     if (initiator2target_buffer_size == OLED_KEYLOGGER_LENGTH) {
@@ -71,7 +71,7 @@ void keyboard_post_init_transport_sync(void) {
     transaction_register_rpc(RPC_ID_USER_STATE_SYNC, user_state_sync);
     transaction_register_rpc(RPC_ID_USER_KEYMAP_SYNC, user_keymap_sync);
     transaction_register_rpc(RPC_ID_USER_CONFIG_SYNC, user_config_sync);
-#ifdef OLED_ENABLE
+#ifdef CUSTOM_OLED_DRIVER
     transaction_register_rpc(RPC_ID_USER_KEYLOG_STR, keylogger_string_sync);
 #endif
 
@@ -92,7 +92,7 @@ void user_transport_update(void) {
         user_state.audio_enable        = is_audio_on();
         user_state.audio_clicky_enable = is_clicky_on();
 #endif
-#if defined(POINTING_DEVICE_ENABLE) && defined(KEYBOARD_handwired_tractyl_manuform)
+#if defined(CUSTOM_POINTING_DEVICE)
         user_state.tap_toggling = tap_toggling;
 #endif
 #ifdef UNICODE_COMMON_ENABLE
@@ -111,7 +111,7 @@ void user_transport_update(void) {
 #ifdef UNICODE_COMMON_ENABLE
         unicode_config.input_mode = user_state.unicode_mode;
 #endif
-#if defined(POINTING_DEVICE_ENABLE) && defined(KEYBOARD_handwired_tractyl_manuform)
+#if defined(CUSTOM_POINTING_DEVICE)
         tap_toggling = user_state.tap_toggling;
 #endif
 #ifdef SWAP_HANDS_ENABLE
@@ -127,7 +127,7 @@ void user_transport_sync(void) {
         static uint16_t last_keymap = 0;
         static uint32_t last_config = 0, last_sync[4], last_user_state = 0;
         bool            needs_sync = false;
-#ifdef OLED_ENABLE
+#ifdef CUSTOM_OLED_DRIVER
         static char keylog_temp[OLED_KEYLOGGER_LENGTH] = {0};
 #endif
 
@@ -187,7 +187,7 @@ void user_transport_sync(void) {
             needs_sync = false;
         }
 
-#ifdef OLED_ENABLE
+#ifdef CUSTOM_OLED_DRIVER
         // Check if the state values are different
         if (memcmp(&keylog_str, &keylog_temp, OLED_KEYLOGGER_LENGTH)) {
             needs_sync = true;

From 0978dca728e18d79c6888f095c6cb861c895b746 Mon Sep 17 00:00:00 2001
From: owlab-git <88034417+owlab-git@users.noreply.github.com>
Date: Mon, 7 Mar 2022 14:41:16 +0800
Subject: [PATCH 738/867] [Keyboard] add qk65 files by qwertykeys studio
 (#16491)

---
 keyboards/qwertykeys/qk65/hotswap/config.h    |  46 ++++++
 keyboards/qwertykeys/qk65/hotswap/hotswap.c   |  17 ++
 keyboards/qwertykeys/qk65/hotswap/hotswap.h   |  33 ++++
 keyboards/qwertykeys/qk65/hotswap/info.json   |  78 +++++++++
 .../qk65/hotswap/keymaps/default/keymap.c     |  54 +++++++
 .../qk65/hotswap/keymaps/via/keymap.c         |  54 +++++++
 .../qk65/hotswap/keymaps/via/rules.mk         |   2 +
 keyboards/qwertykeys/qk65/hotswap/readme.md   |  21 +++
 keyboards/qwertykeys/qk65/hotswap/rules.mk    |  18 +++
 keyboards/qwertykeys/qk65/solder/config.h     |  44 +++++
 keyboards/qwertykeys/qk65/solder/info.json    | 152 ++++++++++++++++++
 .../qk65/solder/keymaps/default/keymap.c      |  53 ++++++
 .../qk65/solder/keymaps/via/keymap.c          |  53 ++++++
 .../qk65/solder/keymaps/via/rules.mk          |   2 +
 keyboards/qwertykeys/qk65/solder/readme.md    |  21 +++
 keyboards/qwertykeys/qk65/solder/rules.mk     |  18 +++
 keyboards/qwertykeys/qk65/solder/solder.c     |  17 ++
 keyboards/qwertykeys/qk65/solder/solder.h     |  49 ++++++
 18 files changed, 732 insertions(+)
 create mode 100644 keyboards/qwertykeys/qk65/hotswap/config.h
 create mode 100644 keyboards/qwertykeys/qk65/hotswap/hotswap.c
 create mode 100644 keyboards/qwertykeys/qk65/hotswap/hotswap.h
 create mode 100644 keyboards/qwertykeys/qk65/hotswap/info.json
 create mode 100644 keyboards/qwertykeys/qk65/hotswap/keymaps/default/keymap.c
 create mode 100644 keyboards/qwertykeys/qk65/hotswap/keymaps/via/keymap.c
 create mode 100644 keyboards/qwertykeys/qk65/hotswap/keymaps/via/rules.mk
 create mode 100644 keyboards/qwertykeys/qk65/hotswap/readme.md
 create mode 100644 keyboards/qwertykeys/qk65/hotswap/rules.mk
 create mode 100644 keyboards/qwertykeys/qk65/solder/config.h
 create mode 100644 keyboards/qwertykeys/qk65/solder/info.json
 create mode 100644 keyboards/qwertykeys/qk65/solder/keymaps/default/keymap.c
 create mode 100644 keyboards/qwertykeys/qk65/solder/keymaps/via/keymap.c
 create mode 100644 keyboards/qwertykeys/qk65/solder/keymaps/via/rules.mk
 create mode 100644 keyboards/qwertykeys/qk65/solder/readme.md
 create mode 100644 keyboards/qwertykeys/qk65/solder/rules.mk
 create mode 100644 keyboards/qwertykeys/qk65/solder/solder.c
 create mode 100644 keyboards/qwertykeys/qk65/solder/solder.h

diff --git a/keyboards/qwertykeys/qk65/hotswap/config.h b/keyboards/qwertykeys/qk65/hotswap/config.h
new file mode 100644
index 0000000000..8dfaf1648d
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/hotswap/config.h
@@ -0,0 +1,46 @@
+/* 
+Copyright 2022 qwertykeys
+
+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       0x4F53  //0x4F53 for qwertykeys
+#define PRODUCT_ID      0x514B  //0x514B QK for QK65
+#define DEVICE_VER      0x0001 
+#define MANUFACTURER    qwertykeys 
+#define PRODUCT         QK65
+
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* Keyboard Matrix Assignments */
+#define MATRIX_ROW_PINS { B0, B7, D0, D1, D2 }
+#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* NKRO */
+#define FORCE_NKRO 
+
+
diff --git a/keyboards/qwertykeys/qk65/hotswap/hotswap.c b/keyboards/qwertykeys/qk65/hotswap/hotswap.c
new file mode 100644
index 0000000000..78de3ff275
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/hotswap/hotswap.c
@@ -0,0 +1,17 @@
+/* 
+Copyright 2022 qwertykeys
+
+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 "hotswap.h"
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/hotswap/hotswap.h b/keyboards/qwertykeys/qk65/hotswap/hotswap.h
new file mode 100644
index 0000000000..1f61c5ed6b
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/hotswap/hotswap.h
@@ -0,0 +1,33 @@
+/* 
+Copyright 2022 qwertykeys
+
+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_hotswap( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, K314, \
+	K400, K401, K402,       K404,             K407, K408,                   K412, K413, K414  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 }, \
+	{ K400,  K401,  K402,  KC_NO, K404,  KC_NO, KC_NO, K407,  K408,  KC_NO, KC_NO, KC_NO, K412,  K413,  K414 }  \
+}
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/hotswap/info.json b/keyboards/qwertykeys/qk65/hotswap/info.json
new file mode 100644
index 0000000000..2848a3f5e8
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/hotswap/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "qk65",
+    "url": "",
+    "maintainer": "qwertykeys",
+    "layouts": {
+        "LAYOUT_hotswap": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":13, "y":4},
+		        {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/hotswap/keymaps/default/keymap.c b/keyboards/qwertykeys/qk65/hotswap/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4c9960f29e
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,54 @@
+/* 
+Copyright 2022 qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_hotswap(
+		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
+		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_PGDN, 
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1), 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1] = LAYOUT_hotswap(
+		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_TRNS, RESET, 
+		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_HOME, 
+		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_END, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[2] = LAYOUT_hotswap(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[3] = LAYOUT_hotswap(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	)
+
+};
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/hotswap/keymaps/via/keymap.c b/keyboards/qwertykeys/qk65/hotswap/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ca81553007
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/hotswap/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* 
+Copyright 2022 qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_hotswap(
+		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
+		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_PGDN, 
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, MO(1), 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1] = LAYOUT_hotswap(
+		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_TRNS, RESET, 
+		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_HOME, 
+		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_END, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[2] = LAYOUT_hotswap(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[3] = LAYOUT_hotswap(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	)
+
+};
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/hotswap/keymaps/via/rules.mk b/keyboards/qwertykeys/qk65/hotswap/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/hotswap/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/hotswap/readme.md b/keyboards/qwertykeys/qk65/hotswap/readme.md
new file mode 100644
index 0000000000..f7c0c64d80
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/hotswap/readme.md
@@ -0,0 +1,21 @@
+# qk65 - hotswap PCB
+
+![qk65](https://i.imgur.com/kFhx5qS.png)
+
+A 65% made by qwertykeys.
+
+* Keyboard Maintainer: [qwertykeys](https://github.com/owlab-git)
+* Hardware Supported: qk65 hotswap PCB
+* Hardware Availability: 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make qwertykeys/qk65/hotswap:default
+
+Flashing example for this keyboard:
+
+    make qwertykeys/qk65/hotswap:default:flash
+
+**Bootloader:** Press the physical reset button on the bottom side of the PCB (labeled SW1) or hold down ESC while plugging in the board.
+
+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).
diff --git a/keyboards/qwertykeys/qk65/hotswap/rules.mk b/keyboards/qwertykeys/qk65/hotswap/rules.mk
new file mode 100644
index 0000000000..f9417ae2bf
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/hotswap/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/solder/config.h b/keyboards/qwertykeys/qk65/solder/config.h
new file mode 100644
index 0000000000..be8c11bbda
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/solder/config.h
@@ -0,0 +1,44 @@
+/* 
+Copyright 2022 qwertykeys
+
+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 s*/
+#define VENDOR_ID       0x4F53  // 0x4F53  for qwertykeys
+#define PRODUCT_ID      0x5153  //0x5153 QS for QK65 Solder
+#define DEVICE_VER      0x0001 
+#define MANUFACTURER    qwertykeys 
+#define PRODUCT         QK65
+
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* Keyboard Matrix Assignments */
+#define MATRIX_ROW_PINS { B0, B7, D0, D1, D2 }
+#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 }
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* NKRO */
+#define FORCE_NKRO
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/solder/info.json b/keyboards/qwertykeys/qk65/solder/info.json
new file mode 100644
index 0000000000..2251813623
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/solder/info.json
@@ -0,0 +1,152 @@
+{
+    "keyboard_name": "qk65",
+    "url": "",
+    "maintainer": "qwertykeys",
+    "layouts": {
+        "LAYOUT_solder": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":13, "y":4},
+		        {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        },
+	"LAYOUT_iso": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":15, "y":1},
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"x":15, "y":2},
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":13, "y":4},
+		        {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+	    }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/solder/keymaps/default/keymap.c b/keyboards/qwertykeys/qk65/solder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8d52b17d2a
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/solder/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* 
+Copyright 2022 qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_iso(
+		KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, 
+		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_PGUP, 
+		KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,    KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,  KC_PGDN, 
+		KC_LSFT, KC_BSLS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,   MO(1), 
+		KC_LCTL, KC_LGUI, KC_LALT,        KC_SPC,                 KC_RALT, KC_RCTL,                           KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1] = LAYOUT_iso(
+		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_TRNS, RESET, 
+		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_HOME, 
+		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_END, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[2] = LAYOUT_iso(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[3] = LAYOUT_iso(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
+	)
+};
diff --git a/keyboards/qwertykeys/qk65/solder/keymaps/via/keymap.c b/keyboards/qwertykeys/qk65/solder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..88afc5984b
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/solder/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* 
+Copyright 2022 qwertykeys
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_solder(
+		KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_DEL, 
+		KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, 
+		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_PGDN, 
+		KC_LSFT, KC_BSLS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,   MO(1), 
+		KC_LCTL, KC_LGUI, KC_LALT,        KC_SPC,                 KC_RALT, KC_RCTL,                           KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1] = LAYOUT_solder(
+		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_TRNS, KC_TRNS, RESET, 
+		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_HOME, 
+		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_END, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[2] = LAYOUT_solder(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[3] = LAYOUT_solder(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS
+	)
+};
diff --git a/keyboards/qwertykeys/qk65/solder/keymaps/via/rules.mk b/keyboards/qwertykeys/qk65/solder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/solder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/solder/readme.md b/keyboards/qwertykeys/qk65/solder/readme.md
new file mode 100644
index 0000000000..8987ebc586
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/solder/readme.md
@@ -0,0 +1,21 @@
+# qk65 - solder PCB
+
+![qk65](https://i.imgur.com/BnZl8Xz.png)
+
+A 65% made by qwertykeys.
+
+* Keyboard Maintainer: [qwertykeys](https://github.com/owlab-git)
+* Hardware Supported: qk65 solder PCB
+* Hardware Availability: 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make qwertykeys/qk65/solder:default
+
+Flashing example for this keyboard:
+
+    make qwertykeys/qk65/solder:default:flash
+
+**Bootloader:** Press the physical reset button on the bottom side of the PCB (labeled SW1) or hold down ESC while plugging in the board.
+
+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).
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/solder/rules.mk b/keyboards/qwertykeys/qk65/solder/rules.mk
new file mode 100644
index 0000000000..f9417ae2bf
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/solder/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/solder/solder.c b/keyboards/qwertykeys/qk65/solder/solder.c
new file mode 100644
index 0000000000..fc95c768fd
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/solder/solder.c
@@ -0,0 +1,17 @@
+/* 
+Copyright 2022 qwertykeys
+
+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 "solder.h"
\ No newline at end of file
diff --git a/keyboards/qwertykeys/qk65/solder/solder.h b/keyboards/qwertykeys/qk65/solder/solder.h
new file mode 100644
index 0000000000..5409662229
--- /dev/null
+++ b/keyboards/qwertykeys/qk65/solder/solder.h
@@ -0,0 +1,49 @@
+/* 
+Copyright 2022 qwertykeys
+
+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_solder( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K113, K013, K014,       \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K212, K114,             \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214,             \
+	K300, K312, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314,             \
+	K400, K401, K402,       K404,             K407, K408,                   K412, K413, K414              \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
+	{ K400,  K401,  K402,  KC_NO, K404,  KC_NO, KC_NO, K407,  K408,  KC_NO, KC_NO, KC_NO, K412,  K413,  K414 }  \
+}
+
+
+
+#define LAYOUT_iso( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,       \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114,       \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,       \
+	K300, K312, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314,       \
+	K400, K401, K402,       K404,             K407, K408,                   K412, K413, K414        \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 },  \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114 },  \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 },  \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 },  \
+	{ K400,  K401,  K402,  KC_NO, K404,  KC_NO, KC_NO, K407,  K408,  KC_NO, KC_NO, KC_NO, K412,  K413,  K414 }   \
+}
\ No newline at end of file

From 1a1b22ef07e7a60292bfebc8fc1c973b69d88c8c Mon Sep 17 00:00:00 2001
From: xiao <307671+xia0@users.noreply.github.com>
Date: Mon, 7 Mar 2022 17:22:49 +1030
Subject: [PATCH 739/867] [Keyboard] Sick68 VIA keymap (#16508)

Co-authored-by: xia0 <xiao@morgan.net.au>
---
 .../handwired/sick68/keymaps/via/config.h     | 20 +++++++
 .../handwired/sick68/keymaps/via/keymap.c     | 60 +++++++++++++++++++
 .../handwired/sick68/keymaps/via/readme.md    |  2 +
 .../handwired/sick68/keymaps/via/rules.mk     |  2 +
 4 files changed, 84 insertions(+)
 create mode 100644 keyboards/handwired/sick68/keymaps/via/config.h
 create mode 100644 keyboards/handwired/sick68/keymaps/via/keymap.c
 create mode 100644 keyboards/handwired/sick68/keymaps/via/readme.md
 create mode 100644 keyboards/handwired/sick68/keymaps/via/rules.mk

diff --git a/keyboards/handwired/sick68/keymaps/via/config.h b/keyboards/handwired/sick68/keymaps/via/config.h
new file mode 100644
index 0000000000..4ce1e3e785
--- /dev/null
+++ b/keyboards/handwired/sick68/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2022 @xia0
+
+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/>.
+*/
+
+#define ENCODERS_PAD_A { F0 }
+#define ENCODERS_PAD_B { F1 }
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/handwired/sick68/keymaps/via/keymap.c b/keyboards/handwired/sick68/keymaps/via/keymap.c
new file mode 100644
index 0000000000..3257c1b973
--- /dev/null
+++ b/keyboards/handwired/sick68/keymaps/via/keymap.c
@@ -0,0 +1,60 @@
+/* Copyright 2020 umbynos
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+        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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1)  , KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_END,
+        _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
+        _______, _______, _______,                            _______,                   _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+    ),
+    [2] = LAYOUT_65_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_65_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    )
+};
+
+/* Volume control by default
+*/
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/handwired/sick68/keymaps/via/readme.md b/keyboards/handwired/sick68/keymaps/via/readme.md
new file mode 100644
index 0000000000..f03fbedb48
--- /dev/null
+++ b/keyboards/handwired/sick68/keymaps/via/readme.md
@@ -0,0 +1,2 @@
+# VIA keymap for sick68
+Adds support for VIA mapping and encoder (pin F0 and F1 by default).
diff --git a/keyboards/handwired/sick68/keymaps/via/rules.mk b/keyboards/handwired/sick68/keymaps/via/rules.mk
new file mode 100644
index 0000000000..7225ba1fa1
--- /dev/null
+++ b/keyboards/handwired/sick68/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_ENABLE = yes

From bbd47fcaa258422caeb3ad5dca7cb3cce3b539ed Mon Sep 17 00:00:00 2001
From: fOmey <pauly.galea@gmail.com>
Date: Mon, 7 Mar 2022 17:55:56 +1100
Subject: [PATCH 740/867] [Keyboard] Atlantis ak81_ve encoder behaviour
 enhancement & fixes (#16503)

---
 keyboards/atlantis/ak81_ve/ak81_ve.c | 31 +++++++++++++++++++++++-----
 keyboards/atlantis/ak81_ve/ak81_ve.h |  1 -
 keyboards/atlantis/ak81_ve/config.h  |  8 +++----
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.c b/keyboards/atlantis/ak81_ve/ak81_ve.c
index fcf279ed46..2426d70fe8 100644
--- a/keyboards/atlantis/ak81_ve/ak81_ve.c
+++ b/keyboards/atlantis/ak81_ve/ak81_ve.c
@@ -40,8 +40,8 @@ led_config_t g_led_config = { {
   4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
   4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
   4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 8, 
-  4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-  4, 4, 4, 1, 1, 4, 1, 1, 1, 
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4, 4, 
   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
 } };
 #endif
@@ -52,9 +52,30 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
         return false;
     }
     if (clockwise) {
-        tap_code(KC_VOLD);
-    } else {
-        tap_code(KC_VOLU);
+        switch (get_highest_layer(layer_state)) {
+          case 0:
+            tap_code(KC_VOLU);
+            break;
+          case 1:
+            rgb_matrix_step();
+            break;
+          default:
+            tap_code(KC_VOLU);
+            break;
+        }
+      }
+    else {
+        switch (get_highest_layer(layer_state)) {
+          case 0:
+            tap_code(KC_VOLD);
+            break;
+          case 1:
+            rgb_matrix_step_reverse();
+            break;
+          default:
+            tap_code(KC_VOLD);
+            break;
+        }
     }
     return true;
 }
diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.h b/keyboards/atlantis/ak81_ve/ak81_ve.h
index c43f477c0a..d295320689 100644
--- a/keyboards/atlantis/ak81_ve/ak81_ve.h
+++ b/keyboards/atlantis/ak81_ve/ak81_ve.h
@@ -16,7 +16,6 @@
 
 #pragma once
 #include "quantum.h"
-#include "encoder_actions.h"
 
 #define LAYOUT( \
 	K000, K001, K002, K003, K004, K005, K006, K007, K008,       K010, K011, K012, K013, K014, \
diff --git a/keyboards/atlantis/ak81_ve/config.h b/keyboards/atlantis/ak81_ve/config.h
index 44507c47f7..1b6050f9ac 100644
--- a/keyboards/atlantis/ak81_ve/config.h
+++ b/keyboards/atlantis/ak81_ve/config.h
@@ -35,12 +35,12 @@
 #define UNUSED_PINS
 
 /* Encoder pins */
-#define ENCODERS_PAD_A { B0 }
-#define ENCODERS_PAD_B { E6 }
+#define ENCODERS_PAD_A { E6 }
+#define ENCODERS_PAD_B { B0 }
 #define ENCODER_RESOLUTION 4
 #define ENCODERS 1
-#define ENCODERS_CCW_KEY { { 3, 5 } } // Note:  array is { col, row )
-#define ENCODERS_CW_KEY  { { 4, 5 } } // Note:  array is { col, row )
+#define ENCODERS_CCW_KEY { { 4, 5 } } // Note:  array is { col, row )
+#define ENCODERS_CW_KEY  { { 3, 5 } } // Note:  array is { col, row )
 
 /* LED pins */
 #define LED_CAPS_LOCK_PIN D4

From 2d8266bd7b896a7e9c3f971d4b8ed5be274c7951 Mon Sep 17 00:00:00 2001
From: Koobaczech <67293963+Koobaczech@users.noreply.github.com>
Date: Mon, 7 Mar 2022 01:58:06 -0500
Subject: [PATCH 741/867] [Keyboard] Tidy Up pearlboards (#16497)

---
 keyboards/pearlboards/pandora/rules.mk        | 12 +++++-----
 keyboards/pearlboards/zeus/rules.mk           |  8 +++----
 .../zeuspad/keymaps/default/keymap.c          | 24 +++++++++----------
 .../pearlboards/zeuspad/keymaps/via/keymap.c  | 24 +++++++++----------
 keyboards/pearlboards/zeuspad/rules.mk        |  8 +++----
 5 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/keyboards/pearlboards/pandora/rules.mk b/keyboards/pearlboards/pandora/rules.mk
index 04aacf572b..e0d88f1d85 100644
--- a/keyboards/pearlboards/pandora/rules.mk
+++ b/keyboards/pearlboards/pandora/rules.mk
@@ -10,13 +10,13 @@ BOOTLOADER = atmel-dfu
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 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
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-ENCODER_ENABLE = yes
+DIP_SWITCH_ENABLE = yes     # Enable dip switches
+ENCODER_ENABLE = yes        # Rotary encoder
 
-LTO_ENABLE = yes
+LTO_ENABLE = yes            # Link time optimization
diff --git a/keyboards/pearlboards/zeus/rules.mk b/keyboards/pearlboards/zeus/rules.mk
index b75d687546..556a5e9df9 100644
--- a/keyboards/pearlboards/zeus/rules.mk
+++ b/keyboards/pearlboards/zeus/rules.mk
@@ -16,8 +16,8 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = yes          # Audio output
-ENCODER_ENABLE = yes
-HAPTIC_ENABLE = yes
-HAPTIC_DRIVER = DRV2605L
+ENCODER_ENABLE = yes        # Rotary encoder
+HAPTIC_ENABLE = yes         # Rumble feefback
+HAPTIC_DRIVER = DRV2605L    # Rumble motor
 
-LTO_ENABLE = yes
+LTO_ENABLE = yes            # Link time optimization
diff --git a/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c b/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c
index 3faa703484..71a33c4545 100644
--- a/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c
+++ b/keyboards/pearlboards/zeuspad/keymaps/default/keymap.c
@@ -19,18 +19,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-		KC_ESC,   KC_LCTL,  KC_LALT,  KC_MEDIA_PLAY_PAUSE,
-		KC_NLCK,  KC_PSLS,  KC_PAST,  MO(1),
-		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
-		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
-		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+		LT(1, KC_ESC),  KC_LCTL,  KC_LALT,  KC_MEDIA_PLAY_PAUSE,
+		KC_NLCK,        KC_PSLS,  KC_PAST,  KC_PMNS,
+		KC_P7,          KC_P8,    KC_P9,    KC_PPLS,
+		KC_P4,          KC_P5,    KC_P6,    KC_PPLS,
+		KC_P1,          KC_P2,    KC_P3,    KC_PENT,
+		KC_P0,          KC_P0,    KC_PDOT,  KC_PENT),
 
   [1] = LAYOUT_all(
-		RESET,    KC_LCTL,  KC_LALT,  KC_TRNS,
-		RGB_TOG,  RGB_MOD,  RGB_HUI,  KC_PMNS,
-		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
-		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
-		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT)
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		RESET,    RGB_TOG,  RGB_MOD,  RGB_HUI,
+    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)
 };
diff --git a/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c b/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c
index a0c6b0c69f..5c99ae2acc 100644
--- a/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c
+++ b/keyboards/pearlboards/zeuspad/keymaps/via/keymap.c
@@ -19,20 +19,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [0] = LAYOUT_all(
-		KC_ESC,   RGB_TOG,  RGB_MOD,  KC_MEDIA_PLAY_PAUSE,
-		KC_NLCK,  KC_PSLS,  KC_PAST,  MO(1),
-		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
-		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
-		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+		LT(1, KC_ESC),  RGB_TOG,  RGB_MOD,  KC_MEDIA_PLAY_PAUSE,
+		KC_NLCK,        KC_PSLS,  KC_PAST,  KC_PMNS,
+		KC_P7,          KC_P8,    KC_P9,    KC_PPLS,
+		KC_P4,          KC_P5,    KC_P6,    KC_PPLS,
+		KC_P1,          KC_P2,    KC_P3,    KC_PENT,
+		KC_P0,          KC_P0,    KC_PDOT,  KC_PENT),
 
   [1] = LAYOUT_all(
-		RESET,    KC_LCTL,  KC_LALT,  KC_TRNS,
-		RGB_TOG,  RGB_MOD,  RGB_HUI,  KC_PMNS,
-		KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
-		KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-		KC_P1,    KC_P2,    KC_P3,    KC_PENT,
-		KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+		KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+		RESET,    RGB_TOG,  RGB_MOD,  RGB_HUI,
+    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),
 
   [2] = LAYOUT_all(
     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
diff --git a/keyboards/pearlboards/zeuspad/rules.mk b/keyboards/pearlboards/zeuspad/rules.mk
index 0299b99a2f..b76fe206a1 100644
--- a/keyboards/pearlboards/zeuspad/rules.mk
+++ b/keyboards/pearlboards/zeuspad/rules.mk
@@ -16,8 +16,8 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-OLED_DRIVER = SSD1306
+ENCODER_ENABLE = yes        # Rotary encoder
+OLED_ENABLE = yes           # Enable oled
+OLED_DRIVER = SSD1306       # Oled type
 
-LTO_ENABLE = yes
+LTO_ENABLE = yes            # Link time optimization

From b26217414c8bd421d2d0e6edd161c6e7ea0bc1be Mon Sep 17 00:00:00 2001
From: Koobaczech <67293963+Koobaczech@users.noreply.github.com>
Date: Mon, 7 Mar 2022 01:58:38 -0500
Subject: [PATCH 742/867] [Keyboard] Delete duplicate pandora directory
 (#16496)

---
 keyboards/pandora/config.h                 | 83 ----------------------
 keyboards/pandora/info.json                | 10 ---
 keyboards/pandora/keymaps/default/keymap.c | 43 -----------
 keyboards/pandora/keymaps/via/keymap.c     | 58 ---------------
 keyboards/pandora/keymaps/via/rules.mk     |  1 -
 keyboards/pandora/pandora.c                | 17 -----
 keyboards/pandora/pandora.h                | 38 ----------
 keyboards/pandora/readme.md                | 21 ------
 keyboards/pandora/rules.mk                 | 21 ------
 9 files changed, 292 deletions(-)
 delete mode 100644 keyboards/pandora/config.h
 delete mode 100644 keyboards/pandora/info.json
 delete mode 100644 keyboards/pandora/keymaps/default/keymap.c
 delete mode 100644 keyboards/pandora/keymaps/via/keymap.c
 delete mode 100644 keyboards/pandora/keymaps/via/rules.mk
 delete mode 100644 keyboards/pandora/pandora.c
 delete mode 100644 keyboards/pandora/pandora.h
 delete mode 100644 keyboards/pandora/readme.md
 delete mode 100644 keyboards/pandora/rules.mk

diff --git a/keyboards/pandora/config.h b/keyboards/pandora/config.h
deleted file mode 100644
index 3a44129c49..0000000000
--- a/keyboards/pandora/config.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Copyright 2020 Koobaczech
-
-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 0x6963
-#define PRODUCT_ID 0x6963
-#define DEVICE_VER 0x0002
-#define MANUFACTURER Koobaczech
-#define PRODUCT Pandora
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-/*
- * 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 { B4, D7, D6, B3, B0 }
-#define MATRIX_COL_PINS { D2, D1, D0, D3, D5, B5, B6, B7, D4, C6, C7, F0, F1, F4, F7 }
-#define UNUSED_PINS
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define LED_CAPS_LOCK_PIN E6
-#define LED_PIN_ON_STATE 0
-
-/* Encoder Function */
-#define ENCODERS_PAD_A { F6 }
-#define ENCODERS_PAD_B { F5 }
-//#define ENCODER_DIRECTION_FLIP
-#define ENCODER_RESOLUTION 1
-#define DIP_SWITCH_PINS { B2, B5 }
-
-//#define BACKLIGHT_PIN
-//#define BACKLIGHT_LEVELS 5
-// #define BACKLIGHT_BREATHING
-
-/*== all animations enabled ==*/
-/* If RGBLIGHT_SLEEP defined, the RGB lighting will be switched off when the host goes to sleep */
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
-#    define RGBLIGHT_ANIMATIONS
-#    define RGBLED_NUM 12
-#    define RGBLIGHT_HUE_STEP 8
-#    define RGBLIGHT_SAT_STEP 8
-#    define RGBLIGHT_VAL_STEP 8
-#    define RGBLIGHT_SLEEP
-#endif
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 0
-
-/* 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
diff --git a/keyboards/pandora/info.json b/keyboards/pandora/info.json
deleted file mode 100644
index ed84808c5d..0000000000
--- a/keyboards/pandora/info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "keyboard_name": "Pandora",
-    "url": "",
-    "maintainer": "Koobaczech",
-    "layouts": {
-        "LAYOUT": {
-            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2}, {"label":"2,13", "x":13.75, "y":2, "w":1.25}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":12.5, "y":4, "w":1.25}, {"label":"4,13", "x":13.75, "y":4, "w":1.25}]
-        }
-    }
-}
diff --git a/keyboards/pandora/keymaps/default/keymap.c b/keyboards/pandora/keymaps/default/keymap.c
deleted file mode 100644
index 1878f078ce..0000000000
--- a/keyboards/pandora/keymaps/default/keymap.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT_all(
-        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_DEL,  KC_BSPC,
-        KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,   KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
-        KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,  KC_J,   KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,  KC_N,   KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
-        KC_LCTL,  KC_LGUI,  KC_LALT,                              KC_SPC,                  KC_RALT,  KC_RGUI,  KC_APP,   KC_RCTL),
-
-    [1] = LAYOUT_all(
-        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_TRNS,  KC_DEL,
-        KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  RESET,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_INS,   KC_HOME,  KC_PGUP,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  KC_TRNS,  KC_DEL,   KC_END,   KC_PGDN,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
-};
-
-// Encoder rotate function
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    /* First encoder */
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_AUDIO_VOL_UP);
-        } else {
-            tap_code(KC_AUDIO_VOL_DOWN);
-        }
-    }
-    return true;
-}
-
-// Encoder click function
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-    /* First encoder */
-    case 0:
-        if (active) {
-            tap_code(KC_MUTE);
-        }
-        break;
-    }
-    return true;
-}
diff --git a/keyboards/pandora/keymaps/via/keymap.c b/keyboards/pandora/keymaps/via/keymap.c
deleted file mode 100644
index eb2007447b..0000000000
--- a/keyboards/pandora/keymaps/via/keymap.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    [0] = LAYOUT_all(
-        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_DEL,  KC_BSPC,
-        KC_TAB,   KC_Q,     KC_W,     KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,   KC_I,  KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,
-        KC_CAPS,  KC_A,     KC_S,     KC_D,  KC_F,  KC_G,  KC_H,  KC_J,   KC_K,  KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
-        KC_LSFT,  KC_NUBS,  KC_Z,     KC_X,  KC_C,  KC_V,  KC_B,  KC_N,   KC_M,  KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,  MO(1),
-        KC_LCTL,  KC_LGUI,  KC_LALT,                              KC_SPC,                  KC_RALT,  KC_RGUI,  KC_APP,   KC_RCTL),
-
-    [1] = LAYOUT_all(
-        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_TRNS,  KC_DEL,
-        KC_TRNS,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,  KC_PSCR,  KC_SLCK,  KC_PAUS,  RESET,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_INS,   KC_HOME,  KC_PGUP,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  KC_TRNS,  KC_DEL,   KC_END,   KC_PGDN,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
-
-    [2] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS),
-
-    [3] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
-        KC_TRNS,  KC_TRNS,  KC_TRNS,                                          KC_TRNS,                      KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS)
-};
-
-// Encoder rotate function
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    /* First encoder */
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_AUDIO_VOL_UP);
-        } else {
-            tap_code(KC_AUDIO_VOL_DOWN);
-        }
-    }
-    return true;
-}
-
-// Encoder click function
-bool dip_switch_update_user(uint8_t index, bool active) {
-    switch (index) {
-    /* First encoder */
-    case 0:
-        if (active) {
-            tap_code(KC_MUTE);
-        }
-        break;
-    }
-    return true;
-}
diff --git a/keyboards/pandora/keymaps/via/rules.mk b/keyboards/pandora/keymaps/via/rules.mk
deleted file mode 100644
index 1e5b99807c..0000000000
--- a/keyboards/pandora/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
diff --git a/keyboards/pandora/pandora.c b/keyboards/pandora/pandora.c
deleted file mode 100644
index 3d166646b8..0000000000
--- a/keyboards/pandora/pandora.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Koobaczech
- *
- * 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 "pandora.h"
diff --git a/keyboards/pandora/pandora.h b/keyboards/pandora/pandora.h
deleted file mode 100644
index d73ae84473..0000000000
--- a/keyboards/pandora/pandora.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 Koobaczech
- *
- * 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/>.
- */
-
-/*
- * This layout covers all of the possible build layouts. Also, any
- * built layouts will work without having to change anything.
-*/
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_all( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      \
-    k40, k41, k42,                     k46,           k4a, k4b, k4c, k4d       \
-) { \
-    { k00,  k01,  k02,  k03,    k04,    k05,    k06,  k07,    k08,    k09,    k0a,  k0b,  k0c,  k0d,  k0e    }, \
-    { k10,  k11,  k12,  k13,    k14,    k15,    k16,  k17,    k18,    k19,    k1a,  k1b,  k1c,  k1d,  KC_NO  }, \
-    { k20,  k21,  k22,  k23,    k24,    k25,    k26,  k27,    k28,    k29,    k2a,  k2b,  k2c,  k2d,  KC_NO  }, \
-    { k30,  k31,  k32,  k33,    k34,    k35,    k36,    k37,  k38,    k39,    k3a,  k3b,  k3c,  k3d,  KC_NO  }, \
-    { k40,  k41,  k42,  KC_NO,  KC_NO,  KC_NO,  k46,  KC_NO,  KC_NO,  KC_NO,  k4a,  k4b,  k4c,  k4d,  KC_NO  }  \
-}
diff --git a/keyboards/pandora/readme.md b/keyboards/pandora/readme.md
deleted file mode 100644
index 4870c9981c..0000000000
--- a/keyboards/pandora/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Pandora
-
-![Pandora](https://i.imgur.com/fQRmwfO.jpg)
-
-Pandora is an ultra premium 60 percent keyboard. The construction uses 6063 alu,
-pvd coated brass/stainless steel and dyed polycarbonate. The finishes include
-e-coating, anodizing, micro arc anodization, metal polish and fine beadblasting.
-Layouts are limited to a few ANSI variations such as tsangan/wkl and ISO. The
-keyboard also has a usb-c daugtherboard, an integrated usb hub and rotary
-encoder. The case has indicator lights for caps and is gasket mounted. The pcb
-is designed by me in house and has some super cool tricks up its sleeve as well.
-
-* Keyboard Maintainer: Koobaczech
-* Hardware Supported: Pandora
-* Availability: Link to come
-
-Make example for this keyboard (after setting up your build environment):
-
-    make pandora: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).
diff --git a/keyboards/pandora/rules.mk b/keyboards/pandora/rules.mk
deleted file mode 100644
index 6ee43455f1..0000000000
--- a/keyboards/pandora/rules.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-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
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-DIP_SWITCH_ENABLE = yes
-ENCODER_ENABLE = yes
-OLED_ENABLE = no      # Future release

From 9dea8a7d86970570022030f3a99023b0f2ba291c Mon Sep 17 00:00:00 2001
From: jels <66403163+Jels02@users.noreply.github.com>
Date: Mon, 7 Mar 2022 16:59:30 +1000
Subject: [PATCH 743/867] [Keyboard] Update Jels88 (#16486)

---
 keyboards/jels/jels88/info.json | 189 ++++++++++++++++++++++++++++++++
 keyboards/jels/jels88/jels88.h  |   6 +-
 keyboards/jels/jels88/readme.md |   2 +-
 3 files changed, 193 insertions(+), 4 deletions(-)

diff --git a/keyboards/jels/jels88/info.json b/keyboards/jels/jels88/info.json
index 96a740a9fd..827e911494 100644
--- a/keyboards/jels/jels88/info.json
+++ b/keyboards/jels/jels88/info.json
@@ -97,6 +97,195 @@
                 { "label": "\u2193", "x": 16.25, "y": 5.25 },
                 { "label": "\u2192", "x": 17.25, "y": 5.25 }
             ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 1.25, "y": 0 },
+                { "label": "F2", "x": 2.25, "y": 0 },
+                { "label": "F3", "x": 3.25, "y": 0 },
+                { "label": "F4", "x": 4.25, "y": 0 },
+                { "label": "F5", "x": 5.5, "y": 0 },
+                { "label": "F6", "x": 6.5, "y": 0 },
+                { "label": "F7", "x": 7.5, "y": 0 },
+                { "label": "F8", "x": 8.5, "y": 0 },
+                { "label": "F9", "x": 9.75, "y": 0 },
+                { "label": "F10", "x": 10.75, "y": 0 },
+                { "label": "F11", "x": 11.75, "y": 0 },
+                { "label": "F12", "x": 12.75, "y": 0 },
+                { "label": "F13", "x": 14, "y": 0 },
+                { "label": "PrtSc", "x": 15.25, "y": 0 },
+                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
+                { "label": "Pause", "x": 17.25, "y": 0 },
+                { "label": "~", "x": 0, "y": 1.25 },
+                { "label": "!", "x": 1, "y": 1.25 },
+                { "label": "@", "x": 2, "y": 1.25 },
+                { "label": "#", "x": 3, "y": 1.25 },
+                { "label": "$", "x": 4, "y": 1.25 },
+                { "label": "%", "x": 5, "y": 1.25 },
+                { "label": "^", "x": 6, "y": 1.25 },
+                { "label": "&", "x": 7, "y": 1.25 },
+                { "label": "*", "x": 8, "y": 1.25 },
+                { "label": "(", "x": 9, "y": 1.25 },
+                { "label": ")", "x": 10, "y": 1.25 },
+                { "label": "_", "x": 11, "y": 1.25 },
+                { "label": "+", "x": 12, "y": 1.25 },
+                { "label": "Bksp", "x": 13, "y": 1.25 },
+                { "label": "~", "x": 14, "y": 1.25 },
+                { "label": "Insert", "x": 15.25, "y": 1.25 },
+                { "label": "Home", "x": 16.25, "y": 1.25 },
+                { "label": "PgUp", "x": 17.25, "y": 1.25 },
+                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 2.25 },
+                { "label": "W", "x": 2.5, "y": 2.25 },
+                { "label": "E", "x": 3.5, "y": 2.25 },
+                { "label": "R", "x": 4.5, "y": 2.25 },
+                { "label": "T", "x": 5.5, "y": 2.25 },
+                { "label": "Y", "x": 6.5, "y": 2.25 },
+                { "label": "U", "x": 7.5, "y": 2.25 },
+                { "label": "I", "x": 8.5, "y": 2.25 },
+                { "label": "O", "x": 9.5, "y": 2.25 },
+                { "label": "P", "x": 10.5, "y": 2.25 },
+                { "label": "{", "x": 11.5, "y": 2.25 },
+                { "label": "}", "x": 12.5, "y": 2.25 },
+                { "label": "|", "x": 13.5, "y": 2.25, "w": 1.5 },
+                { "label": "Delete", "x": 15.25, "y": 2.25 },
+                { "label": "End", "x": 16.25, "y": 2.25 },
+                { "label": "PgDn", "x": 17.25, "y": 2.25 },
+                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 3.25 },
+                { "label": "S", "x": 2.75, "y": 3.25 },
+                { "label": "D", "x": 3.75, "y": 3.25 },
+                { "label": "F", "x": 4.75, "y": 3.25 },
+                { "label": "G", "x": 5.75, "y": 3.25 },
+                { "label": "H", "x": 6.75, "y": 3.25 },
+                { "label": "J", "x": 7.75, "y": 3.25 },
+                { "label": "K", "x": 8.75, "y": 3.25 },
+                { "label": "L", "x": 9.75, "y": 3.25 },
+                { "label": ":", "x": 10.75, "y": 3.25 },
+                { "label": "\"", "x": 11.75, "y": 3.25 },
+                { "label": "Enter", "x": 12.75, "y": 3.25, "w": 2.25 },
+                { "label": "Shift", "x": 0, "y": 4.25, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 4.25 },
+                { "label": "X", "x": 3.25, "y": 4.25 },
+                { "label": "C", "x": 4.25, "y": 4.25 },
+                { "label": "V", "x": 5.25, "y": 4.25 },
+                { "label": "B", "x": 6.25, "y": 4.25 },
+                { "label": "N", "x": 7.25, "y": 4.25 },
+                { "label": "M", "x": 8.25, "y": 4.25 },
+                { "label": "<", "x": 9.25, "y": 4.25 },
+                { "label": ">", "x": 10.25, "y": 4.25 },
+                { "label": "?", "x": 11.25, "y": 4.25 },
+                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 1.75 },
+                { "x": 14, "y": 4.25 },
+                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
+                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
+                { "x": 3.75, "y": 5.25, "w": 6.25 },
+                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
+                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
+                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
+                { "label": "\u2190", "x": 15.25, "y": 5.25 },
+                { "label": "\u2193", "x": 16.25, "y": 5.25 },
+                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "F1", "x": 1.25, "y": 0 },
+                { "label": "F2", "x": 2.25, "y": 0 },
+                { "label": "F3", "x": 3.25, "y": 0 },
+                { "label": "F4", "x": 4.25, "y": 0 },
+                { "label": "F5", "x": 5.5, "y": 0 },
+                { "label": "F6", "x": 6.5, "y": 0 },
+                { "label": "F7", "x": 7.5, "y": 0 },
+                { "label": "F8", "x": 8.5, "y": 0 },
+                { "label": "F9", "x": 9.75, "y": 0 },
+                { "label": "F10", "x": 10.75, "y": 0 },
+                { "label": "F11", "x": 11.75, "y": 0 },
+                { "label": "F12", "x": 12.75, "y": 0 },
+                { "label": "F13", "x": 14, "y": 0 },
+                { "label": "PrtSc", "x": 15.25, "y": 0 },
+                { "label": "Scroll Lock", "x": 16.25, "y": 0 },
+                { "label": "Pause", "x": 17.25, "y": 0 },
+                { "label": "~", "x": 0, "y": 1.25 },
+                { "label": "!", "x": 1, "y": 1.25 },
+                { "label": "@", "x": 2, "y": 1.25 },
+                { "label": "#", "x": 3, "y": 1.25 },
+                { "label": "$", "x": 4, "y": 1.25 },
+                { "label": "%", "x": 5, "y": 1.25 },
+                { "label": "^", "x": 6, "y": 1.25 },
+                { "label": "&", "x": 7, "y": 1.25 },
+                { "label": "*", "x": 8, "y": 1.25 },
+                { "label": "(", "x": 9, "y": 1.25 },
+                { "label": ")", "x": 10, "y": 1.25 },
+                { "label": "_", "x": 11, "y": 1.25 },
+                { "label": "+", "x": 12, "y": 1.25 },
+                { "label": "Bksp", "x": 13, "y": 1.25 },
+                { "label": "~", "x": 14, "y": 1.25 },
+                { "label": "Insert", "x": 15.25, "y": 1.25 },
+                { "label": "Home", "x": 16.25, "y": 1.25 },
+                { "label": "PgUp", "x": 17.25, "y": 1.25 },
+                { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 2.25 },
+                { "label": "W", "x": 2.5, "y": 2.25 },
+                { "label": "E", "x": 3.5, "y": 2.25 },
+                { "label": "R", "x": 4.5, "y": 2.25 },
+                { "label": "T", "x": 5.5, "y": 2.25 },
+                { "label": "Y", "x": 6.5, "y": 2.25 },
+                { "label": "U", "x": 7.5, "y": 2.25 },
+                { "label": "I", "x": 8.5, "y": 2.25 },
+                { "label": "O", "x": 9.5, "y": 2.25 },
+                { "label": "P", "x": 10.5, "y": 2.25 },
+                { "label": "{", "x": 11.5, "y": 2.25 },
+                { "label": "}", "x": 12.5, "y": 2.25 },
+                { "label": "Enter", "x": 13.75, "y": 2.25, "w": 1.25, "h":2 },
+                { "label": "Delete", "x": 15.25, "y": 2.25 },
+                { "label": "End", "x": 16.25, "y": 2.25 },
+                { "label": "PgDn", "x": 17.25, "y": 2.25 },
+                { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 3.25 },
+                { "label": "S", "x": 2.75, "y": 3.25 },
+                { "label": "D", "x": 3.75, "y": 3.25 },
+                { "label": "F", "x": 4.75, "y": 3.25 },
+                { "label": "G", "x": 5.75, "y": 3.25 },
+                { "label": "H", "x": 6.75, "y": 3.25 },
+                { "label": "J", "x": 7.75, "y": 3.25 },
+                { "label": "K", "x": 8.75, "y": 3.25 },
+                { "label": "L", "x": 9.75, "y": 3.25 },
+                { "label": ":", "x": 10.75, "y": 3.25 },
+                { "label": "\"", "x": 11.75, "y": 3.25 },
+                { "label": "|", "x": 12.75, "y": 3.25, "w": 1 },
+                { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 },
+                { "label": "|", "x": 1.25, "y": 4.25 },
+                { "label": "Z", "x": 2.25, "y": 4.25 },
+                { "label": "X", "x": 3.25, "y": 4.25 },
+                { "label": "C", "x": 4.25, "y": 4.25 },
+                { "label": "V", "x": 5.25, "y": 4.25 },
+                { "label": "B", "x": 6.25, "y": 4.25 },
+                { "label": "N", "x": 7.25, "y": 4.25 },
+                { "label": "M", "x": 8.25, "y": 4.25 },
+                { "label": "<", "x": 9.25, "y": 4.25 },
+                { "label": ">", "x": 10.25, "y": 4.25 },
+                { "label": "?", "x": 11.25, "y": 4.25 },
+                { "label": "Shift", "x": 12.25, "y": 4.25, "w": 1.75 },
+                { "x": 14, "y": 4.25 },
+                { "label": "\u2191", "x": 16.25, "y": 4.25 },
+                { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 },
+                { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 },
+                { "x": 3.75, "y": 5.25, "w": 6.25 },
+                { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 },
+                { "label": "Win", "x": 11.25, "y": 5.25, "w": 1.25 },
+                { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 },
+                { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 },
+                { "label": "\u2190", "x": 15.25, "y": 5.25 },
+                { "label": "\u2193", "x": 16.25, "y": 5.25 },
+                { "label": "\u2192", "x": 17.25, "y": 5.25 }
+            ]
         }
     }
 }
diff --git a/keyboards/jels/jels88/jels88.h b/keyboards/jels/jels88/jels88.h
index 8314d0d2e0..2a7f870772 100644
--- a/keyboards/jels/jels88/jels88.h
+++ b/keyboards/jels/jels88/jels88.h
@@ -48,7 +48,7 @@
     K1A0, K1A1, K1B1, K1B2, K1A2, K1A3, K1B3, K1B4, K1A4, K1A5, K1B5, K1B6, K1A6, K1A7, K2B7,   K2A7, K2A8, K1A8, \
     K2B0, K2B1, K2A1, K2A2, K2B2, K2B3, K2A3, K2A4, K2B4, K2B5, K2A5, K2A6, K2B6, K3A7,         K1B7, K1B8, K2B8, \
     K3A0, K3A1, K3B1, K3B2, K3A2, K3A3, K3B3, K3B4, K3A4, K3A5, K3B5, K3B6, K3A6,                                 \
-    K4B0, K4A1, K4A2, K4B2, K4B3, K4A3, K4A4, K4B4, K4B5, K4A5, K4A6, K4B6, K4B7,               K4A7,             \
+    K4B0, K4A1, K4A2, K4B2, K4B3, K4A3, K4A4, K4B4, K4B5, K4A5, K4A6, K4B6, K4B7,                     K4A7,       \
     K5A0, K5A1, K5B1,                   K5B3,                         K5A5, K5A6, K5B6, K5B7,   K5A7, K5A8, K4A8  \
 ){ \
     {____, K0A1, K0A2, K0A3, K0A4, K0A5, K0A6, K0A7, K0A8}, \
@@ -71,7 +71,7 @@
     K1A0, K1A1, K1B1, K1B2, K1A2, K1A3, K1B3, K1B4, K1A4, K1A5, K1B5, K1B6, K1A6, K1A7, K3A7,   K2A7, K2A8, K1A8, \
     K2B0, K2B1, K2A1, K2A2, K2B2, K2B3, K2A3, K2A4, K2B4, K2B5, K2A5, K2A6, K2B6, K2B7,         K1B7, K1B8, K2B8, \
     K3A0, K3A1, K3B1, K3B2, K3A2, K3A3, K3B3, K3B4, K3A4, K3A5, K3B5, K3B6, K3A6,                                 \
-    K4B0, K4A1, K4A2, K4B2, K4B3, K4A3, K4A4, K4B4, K4B5, K4A5, K4A6, K4B6, K4B7,               K4A7,       \
+    K4B0, K4B1, K4A1, K4A2, K4B2, K4B3, K4A3, K4A4, K4B4, K4B5, K4A5, K4A6, K4B6, K4B7,               K4A7,       \
     K5A0, K5A1, K5B1,                   K5B3,                         K5A5, K5A6, K5B6, K5B7,   K5A7, K5A8, K4A8  \
 ){ \
     {____, K0A1, K0A2, K0A3, K0A4, K0A5, K0A6, K0A7, K0A8}, \
@@ -83,7 +83,7 @@
     {K3A0, K3A1, K3A2, K3A3, K3A4, K3A5, K3A6, K3A7, ____}, \
     {____, K3B1, K3B2, K3B3, K3B4, K3B5, K3B6, ____, ____}, \
     {____, K4A1, K4A2, K4A3, K4A4, K4A5, K4A6, K4A7, K4A8}, \
-    {K4B0, ____, K4B2, K4B3, K4B4, K4B5, K4B6, K4B7, ____}, \
+    {K4B0, K4B1, K4B2, K4B3, K4B4, K4B5, K4B6, K4B7, ____}, \
     {K5A0, K5A1, ____, ____, ____, K5A5, K5A6, K5A7, K5A8}, \
     {____, K5B1, ____, K5B3, ____, ____, K5B6, K5B7, ____}  \
 }
diff --git a/keyboards/jels/jels88/readme.md b/keyboards/jels/jels88/readme.md
index 0ea1f4c64c..37d18dbf40 100644
--- a/keyboards/jels/jels88/readme.md
+++ b/keyboards/jels/jels88/readme.md
@@ -2,7 +2,7 @@
 
 ![jels88](https://i.imgur.com/7kuYR4G.png)
 
-* Keyboard Maintainer: [jels](https://github.com/Jels-kb)
+* Keyboard Maintainer: [jels](https://github.com/Jels02)
 * Hardware Supported: jels88b/jels88c PCB
 * Hardware Availabililty: Group buys, Various dates.
 

From 6e61126e08a2219db81ab0fc2ad6b385e2bd6098 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Mon, 7 Mar 2022 15:02:31 +0800
Subject: [PATCH 744/867] [Keyboard] BM68HSRGB/rev2 (#16454)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/kprepublic/bm68hsrgb/rev1/readme.md |   4 +-
 keyboards/kprepublic/bm68hsrgb/rev2/config.h  | 133 ++++++++++++++++++
 keyboards/kprepublic/bm68hsrgb/rev2/info.json |  83 +++++++++++
 .../bm68hsrgb/rev2/keymaps/default/keymap.c   | 103 ++++++++++++++
 .../bm68hsrgb/rev2/keymaps/via/keymap.c       | 103 ++++++++++++++
 .../bm68hsrgb/rev2/keymaps/via/rules.mk       |   2 +
 keyboards/kprepublic/bm68hsrgb/rev2/readme.md |  24 ++++
 keyboards/kprepublic/bm68hsrgb/rev2/rev2.c    | 124 ++++++++++++++++
 keyboards/kprepublic/bm68hsrgb/rev2/rev2.h    |  34 +++++
 keyboards/kprepublic/bm68hsrgb/rev2/rules.mk  |  21 +++
 10 files changed, 629 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/kprepublic/bm68hsrgb/rev2/config.h
 create mode 100644 keyboards/kprepublic/bm68hsrgb/rev2/info.json
 create mode 100644 keyboards/kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c
 create mode 100644 keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c
 create mode 100644 keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/rules.mk
 create mode 100644 keyboards/kprepublic/bm68hsrgb/rev2/readme.md
 create mode 100644 keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
 create mode 100644 keyboards/kprepublic/bm68hsrgb/rev2/rev2.h
 create mode 100644 keyboards/kprepublic/bm68hsrgb/rev2/rules.mk

diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/readme.md b/keyboards/kprepublic/bm68hsrgb/rev1/readme.md
index 54d71cab2c..d74a9659f8 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/readme.md
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/readme.md
@@ -10,11 +10,11 @@ A 65% hotswap in switch RGB keyboard from KPRepublic.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kprepublic/bm68hsrgb:default
+    make kprepublic/bm68hsrgb/rev1:default
 
 Flashing example for this keyboard:
 
-    make kprepublic/bm68hsrgb:default:flash
+    make kprepublic/bm68hsrgb/rev1:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
new file mode 100644
index 0000000000..4faca73c0d
--- /dev/null
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
@@ -0,0 +1,133 @@
+ /* Copyright 2022 bdtc123
+  * Copyright 2022 peepeetee
+  *
+  * 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       0x4B50
+#define PRODUCT_ID      0x1131
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    KP republic
+#define PRODUCT         bm68v2
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+#define MATRIX_ROW_PINS { D6, D4, D5, D3, F6 }
+#define MATRIX_COL_PINS { F0, F1, B0, B1, B2, B3, E6, B7, D2, D7, B4, B5, B6, C6, C7}
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+#define USB_POLLING_INTERVAL_MS 1
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+#define RGBLIGHT_LIMIT_VAL 150
+#define RGBLED_NUM          6
+#define RGB_DI_PIN          E2
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+#define RGBLIGHT_HUE_STEP   8
+#define RGBLIGHT_SAT_STEP   8
+#define RGBLIGHT_VAL_STEP   8
+
+
+
+#define DRIVER_ADDR_1 0b0110000
+
+#define DRIVER_COUNT 1
+#define DRIVER_1_LED_TOTAL 68
+#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define DRIVER_INDICATOR_LED_TOTAL 0
+
+#ifdef RGB_MATRIX_ENABLE
+
+#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
+#define RGB_MATRIX_KEYPRESSES
+
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+// #    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+// #    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+// #    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+// #    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+// #    define ENABLE_RGB_MATRIX_DUAL_BEACON
+// #    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+// #    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// #    define ENABLE_RGB_MATRIX_RAINDROPS
+// #    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+// #    define ENABLE_RGB_MATRIX_HUE_BREATHING
+// #    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// #    define ENABLE_RGB_MATRIX_HUE_WAVE
+// #    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// #    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// #    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
+
+
+#if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE)
+    #define RGB_MATRIX_DISABLE_KEYCODES
+#endif
+
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/info.json b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
new file mode 100644
index 0000000000..23a4d4d38f
--- /dev/null
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/info.json
@@ -0,0 +1,83 @@
+{
+    "keyboard_name": "bm68hsrgb/rev2",
+    "url": "",
+    "maintainer": "bdtc123",
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e4542b553f
--- /dev/null
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/default/keymap.c
@@ -0,0 +1,103 @@
+ /* Copyright 2022 bdtc123
+  *
+  * 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 my_keycodes {
+    RMT = SAFE_RANGE,
+    RMS,
+    RMIH,
+    RMDH,
+    RMIS,
+    RMDS,
+    RMIV,
+    RMDV
+};
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case RMT:
+      if (record->event.pressed)
+      {rgb_matrix_toggle();
+      }
+      return false;
+    case RMS:
+      if (record->event.pressed)
+      {rgb_matrix_step();
+      }
+      return false;
+      case RMIH:
+      if (record->event.pressed)
+      {rgb_matrix_increase_hue();
+      }
+      return false;
+      case RMDH:
+      if (record->event.pressed)
+      {rgb_matrix_decrease_hue();
+      }
+      return false;
+      case RMIS:
+      if (record->event.pressed)
+      {rgb_matrix_increase_sat();
+      }
+      return false;
+      case RMDS:
+      if (record->event.pressed)
+      {rgb_matrix_decrease_sat();
+      }
+      return false;
+      case RMIV:
+      if (record->event.pressed)
+      {rgb_matrix_increase_val();
+      }
+      return false;
+      case RMDV:
+      if (record->event.pressed)
+      {rgb_matrix_decrease_val();
+      }
+      return true;
+      default:
+      return true;
+  }
+}
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_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_HOME,
+        KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi(
+        KC_GESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  RESET,
+        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______, _______,
+        KC_CAPS,        RMT,     RMS,     RMIH,    RMDH,    RMIS,    RMDS,    RMIV,    RMDV,    _______, _______,  _______,         _______, _______,
+        _______,                 _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______,
+        _______,        _______, _______,                            _______,                   _______, _______, _______, _______, KC_VOLD, _______
+    ),
+    [2] = LAYOUT_65_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_65_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..02c54584c6
--- /dev/null
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/keymap.c
@@ -0,0 +1,103 @@
+ /* Copyright 2022 bdtc123
+  *
+  * 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 my_keycodes {
+    RM_TOGG = SAFE_RANGE,
+    RM_MOD,
+    RM_HUI,
+    RM_HUD,
+    RM_SAI,
+    RM_SAD,
+    RM_VAI,
+    RM_VAD
+};
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case RM_TOGG:
+      if (record->event.pressed)
+      {rgb_matrix_toggle();
+      }
+      return false;
+    case RM_MOD:
+      if (record->event.pressed)
+      {rgb_matrix_step();
+      }
+      return false;
+      case RM_HUI:
+      if (record->event.pressed)
+      {rgb_matrix_increase_hue();
+      }
+      return false;
+      case RM_HUD:
+      if (record->event.pressed)
+      {rgb_matrix_decrease_hue();
+      }
+      return false;
+      case RM_SAI:
+      if (record->event.pressed)
+      {rgb_matrix_increase_sat();
+      }
+      return false;
+      case RM_SAD:
+      if (record->event.pressed)
+      {rgb_matrix_decrease_sat();
+      }
+      return false;
+      case RM_VAI:
+      if (record->event.pressed)
+      {rgb_matrix_increase_val();
+      }
+      return false;
+      case RM_VAD:
+      if (record->event.pressed)
+      {rgb_matrix_decrease_val();
+      }
+      return true;
+      default:
+      return true;
+  }
+}
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_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_HOME,
+        KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi(
+        KC_GESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  RESET,
+        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, _______, _______,
+        KC_CAPS,        RM_TOGG, RM_MOD,  RM_HUI,  RM_HUD,  RM_SAI,  RM_SAD,  RM_VAI,  RM_VAD,  _______, _______,  _______,         _______, _______,
+        _______,                 _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, _______,
+        _______,        _______, _______,                            _______,                   _______, _______, _______, _______, KC_VOLD, _______
+    ),
+    [2] = LAYOUT_65_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_65_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/readme.md b/keyboards/kprepublic/bm68hsrgb/rev2/readme.md
new file mode 100644
index 0000000000..ec66db99d6
--- /dev/null
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/readme.md
@@ -0,0 +1,24 @@
+# BM68HSRGB
+
+![BM68HSRGB](https://i.imgur.com/uuYP8OIl.jpeg)
+
+A 65% hotswap in switch RGB keyboard from KPRepublic.
+
+* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
+* Hardware Supported: BM68HSRGB
+* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm68rgb-bm68-rgb-65-hot-swappable-custom-mechanical-keyboard-pcb-programmed-qmk-via-firmware-full-rgb-switch-underglow-type-c)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kprepublic/bm68hsrgb/rev2:default
+
+Flashing example for this keyboard:
+
+    make kprepublic/bm68hsrgb/rev2:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Short the two-pad footprint to the left of the spacebar switch while the board is plugged in
+* Hold the Esc key while connecting the USB cable (also erases persistent settings)
+
+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).
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
new file mode 100644
index 0000000000..be743cbae5
--- /dev/null
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
@@ -0,0 +1,124 @@
+ /* Copyright 2022 bdtc123
+  *
+  * 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 "rev2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+    {0, CS6_SW1, CS5_SW1, CS4_SW1},
+    {0, CS6_SW2, CS5_SW2, CS4_SW2},
+    {0, CS6_SW3, CS5_SW3, CS4_SW3},
+    {0, CS6_SW4, CS5_SW4, CS4_SW4},
+    {0, CS6_SW5, CS5_SW5, CS4_SW5},
+    {0, CS6_SW6, CS5_SW6, CS4_SW6},
+    {0, CS6_SW7, CS5_SW7, CS4_SW7},
+    {0, CS6_SW8, CS5_SW8, CS4_SW8},
+    {0, CS18_SW1, CS17_SW1, CS16_SW1},
+    {0, CS18_SW2, CS17_SW2, CS16_SW2},
+    {0, CS18_SW3, CS17_SW3, CS16_SW3},
+    {0, CS18_SW4, CS17_SW4, CS16_SW4},
+    {0, CS18_SW5, CS17_SW5, CS16_SW5},
+    {0, CS18_SW6, CS17_SW6, CS16_SW6},
+    {0, CS18_SW7, CS17_SW7, CS16_SW7},
+
+    {0, CS9_SW1, CS8_SW1, CS7_SW1},
+    {0, CS9_SW2, CS8_SW2, CS7_SW2},
+    {0, CS9_SW3, CS8_SW3, CS7_SW3},
+    {0, CS9_SW4, CS8_SW4, CS7_SW4},
+    {0, CS9_SW5, CS8_SW5, CS7_SW5},
+    {0, CS9_SW6, CS8_SW6, CS7_SW6},
+    {0, CS9_SW7, CS8_SW7, CS7_SW7},
+    {0, CS9_SW8, CS8_SW8, CS7_SW8},
+    {0, CS21_SW1, CS20_SW1, CS19_SW1},
+    {0, CS21_SW2, CS20_SW2, CS19_SW2},
+    {0, CS21_SW3, CS20_SW3, CS19_SW3},
+    {0, CS21_SW4, CS20_SW4, CS19_SW4},
+    {0, CS21_SW5, CS20_SW5, CS19_SW5},
+    {0, CS21_SW6, CS20_SW6, CS19_SW6},
+    {0, CS21_SW7, CS20_SW7, CS19_SW7},
+
+    {0, CS12_SW1, CS11_SW1, CS10_SW1},
+    {0, CS12_SW2, CS11_SW2, CS10_SW2},
+    {0, CS12_SW3, CS11_SW3, CS10_SW3},
+    {0, CS12_SW4, CS11_SW4, CS10_SW4},
+    {0, CS12_SW5, CS11_SW5, CS10_SW5},
+    {0, CS12_SW6, CS11_SW6, CS10_SW6},
+    {0, CS12_SW7, CS11_SW7, CS10_SW7},
+    {0, CS12_SW8, CS11_SW8, CS10_SW8},
+    {0, CS24_SW1, CS23_SW1, CS22_SW1},
+    {0, CS24_SW2, CS23_SW2, CS22_SW2},
+    {0, CS24_SW3, CS23_SW3, CS22_SW3},
+    {0, CS24_SW4, CS23_SW4, CS22_SW4},
+    {0, CS24_SW6, CS23_SW6, CS22_SW6},
+    {0, CS24_SW7, CS23_SW7, CS22_SW7},
+
+    {0, CS15_SW1, CS14_SW1, CS13_SW1},
+    {0, CS15_SW3, CS14_SW3, CS13_SW3},
+    {0, CS15_SW4, CS14_SW4, CS13_SW4},
+    {0, CS15_SW5, CS14_SW5, CS13_SW5},
+    {0, CS15_SW6, CS14_SW6, CS13_SW6},
+    {0, CS15_SW7, CS14_SW7, CS13_SW7},
+    {0, CS15_SW8, CS14_SW8, CS13_SW8},
+    {0, CS27_SW1, CS26_SW1, CS25_SW1},
+    {0, CS27_SW2, CS26_SW2, CS25_SW2},
+    {0, CS27_SW3, CS26_SW3, CS25_SW3},
+    {0, CS27_SW4, CS26_SW4, CS25_SW4},
+    {0, CS27_SW5, CS26_SW5, CS25_SW5},
+    {0, CS27_SW6, CS26_SW6, CS25_SW6},
+    {0, CS27_SW7, CS26_SW7, CS25_SW7},
+
+    {0, CS3_SW1, CS2_SW1, CS1_SW1},
+    {0, CS3_SW2, CS2_SW2, CS1_SW2},
+    {0, CS3_SW3, CS2_SW3, CS1_SW3},
+    {0, CS3_SW7, CS2_SW7, CS1_SW7},
+    {0, CS30_SW2, CS29_SW2, CS28_SW2},
+    {0, CS30_SW3, CS29_SW3, CS28_SW3},
+    {0, CS30_SW4, CS29_SW4, CS28_SW4},
+    {0, CS30_SW5, CS29_SW5, CS28_SW5},
+    {0, CS30_SW6, CS29_SW6, CS28_SW6},
+    {0, CS30_SW7, CS29_SW7, CS28_SW7}
+
+};
+led_config_t g_led_config = { {
+    {  0,      1,  2,      3,      4,     5,   6,       7,       8,  9,  10,  11,     12,    13,  14 },
+    {  15,    16, 17,     18,     19,    20,  21,      22,      23, 24,  25,  26,     27,    28,  29 },
+    {  30,    31, 32,     33,     34,    35,  36,      37,      38, 39,  40,  41, NO_LED,    42,  43 },
+    {  44,NO_LED, 45,     46,     47,    48,  49,      50,      51, 52,  53,  54,     55,    56,  57 },
+    {  58,    59, 60, NO_LED, NO_LED,NO_LED,  61,  NO_LED,  NO_LED, 62,  63,  64,     65,    66,  67 }
+}, {
+    {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0},
+	{4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16},
+	{6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32},
+	{9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48},
+        {   2,  64 }, {  21,  64 }, {  39,  64 },                                           {  96,  64 },                             { 150,  64 }, { 165,  64 }, { 180,  64 }, { 195,  64 }, { 210,  64 }, { 224,  64 }
+}, {
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 1, 4, 1, 1, 1, 1, 1, 1
+} };
+
+
+__attribute__ ((weak))
+void rgb_matrix_indicators_user(void)
+{
+    if (host_keyboard_led_state().caps_lock)
+    {
+        rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
+    }
+}
+#endif
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.h b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.h
new file mode 100644
index 0000000000..c4cff29a77
--- /dev/null
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.h
@@ -0,0 +1,34 @@
+ /* Copyright 2022 bdtc123
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_65_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
new file mode 100644
index 0000000000..3520ee3229
--- /dev/null
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3741
+LTO_ENABLE = yes

From 41fb9120d0aff73664da880871d4e168ad158ae2 Mon Sep 17 00:00:00 2001
From: takashicompany <t@kashi.company>
Date: Mon, 7 Mar 2022 16:02:52 +0900
Subject: [PATCH 745/867] [Keyboard] Update DogTag Macro Pad (#16446)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/takashicompany/dogtag/config.h      | 12 +++----
 keyboards/takashicompany/dogtag/dogtag.c      | 28 ++++++++++++---
 keyboards/takashicompany/dogtag/dogtag.h      | 15 ++++----
 keyboards/takashicompany/dogtag/info.json     | 34 ++++++++++++++-----
 .../dogtag/keymaps/default/keymap.c           |  8 ++---
 .../dogtag/keymaps/via/config.h               |  2 +-
 .../dogtag/keymaps/via/keymap.c               |  8 ++---
 keyboards/takashicompany/dogtag/rules.mk      |  1 +
 8 files changed, 74 insertions(+), 34 deletions(-)

diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h
index 542a44ce62..631435092d 100644
--- a/keyboards/takashicompany/dogtag/config.h
+++ b/keyboards/takashicompany/dogtag/config.h
@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT      DogTag
 
 /* key matrix size */
-#define MATRIX_ROWS 2 * 2
+#define MATRIX_ROWS 6
 #define MATRIX_COLS 5
 
 /*
@@ -40,9 +40,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  */
-#define MATRIX_ROW_PINS { B2, B6 }
+#define MATRIX_ROW_PINS { B2, B6, B3 }
 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-#define MATRIX_ROW_PINS_RIGHT { B2, B6 }
+#define MATRIX_ROW_PINS_RIGHT { B2, B6, B3 }
 #define MATRIX_COL_PINS_RIGHT { B1, F7, F6, F5, F4 }
 
 #define UNUSED_PINS
@@ -50,7 +50,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-#define ENCODER_RESOLUTION 1
+#define ENCODER_RESOLUTION 4
 #define ENCODERS_PAD_A { D4 }
 #define ENCODERS_PAD_B { C6 }
 
@@ -71,8 +71,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D3
 #ifdef RGB_DI_PIN
-#    define RGBLED_NUM 3 * 2
-#    define RGBLED_SPLIT {3, 3}
+#    define RGBLED_NUM 4 * 2
+#    define RGBLED_SPLIT { 4, 4 }
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
diff --git a/keyboards/takashicompany/dogtag/dogtag.c b/keyboards/takashicompany/dogtag/dogtag.c
index 459ca9d3f8..e5d0779c08 100644
--- a/keyboards/takashicompany/dogtag/dogtag.c
+++ b/keyboards/takashicompany/dogtag/dogtag.c
@@ -17,11 +17,31 @@
 #include "dogtag.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (clockwise) {
-        tap_code(KC_MS_WH_DOWN);
+    keypos_t key;
+    if (index == 0) {
+        if (clockwise) {
+            key.row = 2;
+            key.col = 1;
+        } else {
+            key.row = 2;
+            key.col = 0;
+        }
+        uint8_t layer = layer_switch_get_layer(key);
+        uint16_t keycode = keymap_key_to_keycode(layer, key);
+
+        tap_code16(keycode);
     } else {
-        tap_code(KC_MS_WH_UP);
+        if (clockwise) {
+            key.row = 5;
+            key.col = 0;
+        } else {
+            key.row = 5;
+            key.col = 1;
+        }
+        uint8_t  layer   = layer_switch_get_layer(key);
+        uint16_t keycode = keymap_key_to_keycode(layer, key);
+
+        tap_code16(keycode);
     }
 
     return true;
diff --git a/keyboards/takashicompany/dogtag/dogtag.h b/keyboards/takashicompany/dogtag/dogtag.h
index f2b7f5f601..fb5ae151ea 100644
--- a/keyboards/takashicompany/dogtag/dogtag.h
+++ b/keyboards/takashicompany/dogtag/dogtag.h
@@ -27,11 +27,14 @@
  * represents the switch matrix.
  */
 #define LAYOUT( \
-    l01, l02, l03, l04,           r01, r02, r03, r04,\
-    l05, l06, l07, l08, l09, r05, r06, r07, r08, r09 \
+    l01, l02, l03, l04,           r01, r02, r03, r04,   \
+    l05, l06, l07, l08, l09, r05, r06, r07, r08, r09,   \
+                   l10, l11, r10, r11                   \
 ) { \
-    { l01, l02, l03, l04, KC_NO }, \
-    { l05, l06, l07, l08, l09 },   \
-    { KC_NO, r01, r02, r03, r04,}, \
-    { r05, r06, r07, r08, r09 }    \
+    { l01, l02, l03, l04, KC_NO },      \
+    { l05, l06, l07, l08, l09 },        \
+    { l10, l11, KC_NO, KC_NO, KC_NO },   \
+    { KC_NO, r01, r02, r03, r04},      \
+    { r05, r06, r07, r08, r09 },        \
+    { r10, r11, KC_NO, KC_NO, KC_NO }    \
 }
diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json
index 9dad380b70..64079408a8 100644
--- a/keyboards/takashicompany/dogtag/info.json
+++ b/keyboards/takashicompany/dogtag/info.json
@@ -21,10 +21,6 @@
                     "x": 3,
                     "y": 0
                 },
-                {
-                    "x": 7,
-                    "y": 0
-                },
                 {
                     "x": 8,
                     "y": 0
@@ -37,6 +33,10 @@
                     "x": 10,
                     "y": 0
                 },
+                {
+                    "x": 11,
+                    "y": 0
+                },
                 {
                     "x": 0,
                     "y": 1
@@ -53,10 +53,6 @@
                     "x": 3,
                     "y": 1
                 },
-                {
-                    "x": 7,
-                    "y": 1
-                },
                 {
                     "x": 8,
                     "y": 1
@@ -69,13 +65,33 @@
                     "x": 10,
                     "y": 1
                 },
+                {
+                    "x": 11,
+                    "y": 1
+                },
                 {
                     "x": 4,
                     "y": 2
                 },
                 {
-                    "x": 6,
+                    "x": 7,
                     "y": 2
+                },
+                {
+                    "x": 3.5,
+                    "y": 3.25
+                },
+                {
+                    "x": 4.5,
+                    "y": 3.25
+                },
+                {
+                    "x": 6.5,
+                    "y": 3.25
+                },
+                {
+                    "x": 7.5,
+                    "y": 3.25
                 }
             ]
         }
diff --git a/keyboards/takashicompany/dogtag/keymaps/default/keymap.c b/keyboards/takashicompany/dogtag/keymaps/default/keymap.c
index 790d1b8126..865e6a2290 100644
--- a/keyboards/takashicompany/dogtag/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/dogtag/keymaps/default/keymap.c
@@ -16,15 +16,15 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
     LAYOUT(
         LT(1, KC_ESC), KC_Q, KC_W, KC_E,                 KC_Y, KC_U, KC_I, KC_O,
-        KC_LSFT,       KC_A, KC_S, KC_D, KC_SPC, KC_TAB, KC_H, KC_J, KC_K, KC_L
+        KC_LSFT,       KC_A, KC_S, KC_D, KC_SPC, KC_TAB, KC_H, KC_J, KC_K, KC_L,
+        KC_WH_U, KC_WH_D, KC_WH_U, KC_WH_D
     ),
 
     LAYOUT(
         KC_TRNS, RGB_MOD, RGB_HUI, RGB_SAI,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_M_P, RGB_M_K, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, RGB_M_P, RGB_M_K, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_WH_L, KC_WH_R, KC_WH_L, KC_WH_R
     )
-
 };
diff --git a/keyboards/takashicompany/dogtag/keymaps/via/config.h b/keyboards/takashicompany/dogtag/keymaps/via/config.h
index 2ae708b32d..60e30a615f 100644
--- a/keyboards/takashicompany/dogtag/keymaps/via/config.h
+++ b/keyboards/takashicompany/dogtag/keymaps/via/config.h
@@ -17,4 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 16
\ No newline at end of file
+#define DYNAMIC_KEYMAP_LAYER_COUNT 12
\ No newline at end of file
diff --git a/keyboards/takashicompany/dogtag/keymaps/via/keymap.c b/keyboards/takashicompany/dogtag/keymaps/via/keymap.c
index 790d1b8126..865e6a2290 100644
--- a/keyboards/takashicompany/dogtag/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/dogtag/keymaps/via/keymap.c
@@ -16,15 +16,15 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
     LAYOUT(
         LT(1, KC_ESC), KC_Q, KC_W, KC_E,                 KC_Y, KC_U, KC_I, KC_O,
-        KC_LSFT,       KC_A, KC_S, KC_D, KC_SPC, KC_TAB, KC_H, KC_J, KC_K, KC_L
+        KC_LSFT,       KC_A, KC_S, KC_D, KC_SPC, KC_TAB, KC_H, KC_J, KC_K, KC_L,
+        KC_WH_U, KC_WH_D, KC_WH_U, KC_WH_D
     ),
 
     LAYOUT(
         KC_TRNS, RGB_MOD, RGB_HUI, RGB_SAI,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS, RGB_M_P, RGB_M_K, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        KC_TRNS, RGB_M_P, RGB_M_K, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_WH_L, KC_WH_R, KC_WH_L, KC_WH_R
     )
-
 };
diff --git a/keyboards/takashicompany/dogtag/rules.mk b/keyboards/takashicompany/dogtag/rules.mk
index dc6f5127fc..08b1ffe09c 100644
--- a/keyboards/takashicompany/dogtag/rules.mk
+++ b/keyboards/takashicompany/dogtag/rules.mk
@@ -19,3 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 ENCODER_ENABLE = yes
 SPLIT_KEYBOARD = yes
+MOUSEKEY_ENABLE = yes
\ No newline at end of file

From 4b4f1c6edb3c0fdba20f241e453407c80f262620 Mon Sep 17 00:00:00 2001
From: Will McGloughlin <3410869+wymcg@users.noreply.github.com>
Date: Mon, 7 Mar 2022 02:16:50 -0500
Subject: [PATCH 746/867] [Keymap] Add encoder showcase keymap (#16544)

---
 keyboards/psuieee/pluto12/config.h            | 110 ++----------------
 .../psuieee/pluto12/keymaps/default/keymap.c  |   2 +-
 .../psuieee/pluto12/keymaps/wymcg/keymap.c    |  56 +++++++++
 .../psuieee/pluto12/keymaps/wymcg/readme.md   |   1 +
 keyboards/psuieee/pluto12/pluto12.c           |   2 +-
 keyboards/psuieee/pluto12/pluto12.h           |   2 +-
 keyboards/psuieee/pluto12/rules.mk            |   1 +
 7 files changed, 68 insertions(+), 106 deletions(-)
 create mode 100644 keyboards/psuieee/pluto12/keymaps/wymcg/keymap.c
 create mode 100644 keyboards/psuieee/pluto12/keymaps/wymcg/readme.md

diff --git a/keyboards/psuieee/pluto12/config.h b/keyboards/psuieee/pluto12/config.h
index 60d3f0a501..b59bd05afe 100644
--- a/keyboards/psuieee/pluto12/config.h
+++ b/keyboards/psuieee/pluto12/config.h
@@ -1,4 +1,4 @@
-// Copyright 2021 Willem McGloughlin (wymcg)
+// Copyright 2021-22 Willem McGloughlin (wymcg)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
@@ -16,123 +16,27 @@
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 4
 
-/*
- * 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)
- *
- */
+/* Keyboard Matrix Assignments */
 #define MATRIX_ROW_PINS { D0, D4, C6 }
 #define MATRIX_COL_PINS { D7, E6, B4, B5 }
 #define UNUSED_PINS
 
+/* Encoder Assignments */
+#define ENCODERS_PAD_A { B6 }
+#define ENCODERS_PAD_B { B2 }
+#define ENCODER_RESOLUTION 4
+
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
-
-//#define LED_NUM_LOCK_PIN B0
-//#define LED_CAPS_LOCK_PIN B1
-//#define LED_SCROLL_LOCK_PIN B2
-//#define LED_COMPOSE_PIN B3
-//#define LED_KANA_PIN B4
-
-//#define BACKLIGHT_PIN B7
-//#define BACKLIGHT_LEVELS 3
-//#define BACKLIGHT_BREATHING
-
-//#define RGB_DI_PIN E2
-//#ifdef RGB_DI_PIN
-//#    define RGBLED_NUM 16
-//#    define RGBLIGHT_HUE_STEP 8
-//#    define RGBLIGHT_SAT_STEP 8
-//#    define RGBLIGHT_VAL_STEP 8
-//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-/*== all animations enable ==*/
-//#    define RGBLIGHT_ANIMATIONS
-/*== or choose 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
-/*== customize breathing effect ==*/
-/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-/*==== use exp() and sin() ====*/
-//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-//#endif
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
 /* 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
 
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-//#define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
 /* disable these deprecated features by default */
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
-
-/* Bootmagic Lite key configuration */
-//#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/psuieee/pluto12/keymaps/default/keymap.c b/keyboards/psuieee/pluto12/keymaps/default/keymap.c
index 1c09c4fc83..c7008dad9e 100644
--- a/keyboards/psuieee/pluto12/keymaps/default/keymap.c
+++ b/keyboards/psuieee/pluto12/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2021 Will McGLoughlin (wymcg)
+// Copyright 2021-22 Will McGLoughlin (wymcg)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
diff --git a/keyboards/psuieee/pluto12/keymaps/wymcg/keymap.c b/keyboards/psuieee/pluto12/keymaps/wymcg/keymap.c
new file mode 100644
index 0000000000..96499b8789
--- /dev/null
+++ b/keyboards/psuieee/pluto12/keymaps/wymcg/keymap.c
@@ -0,0 +1,56 @@
+// Copyright 2021-22 Will McGLoughlin (wymcg)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _NAV,
+    _PROD
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+    KC_MUTE,    KC_MPRV,    KC_MPLY,    KC_MNXT,
+    TO(_NAV),   G(KC_1),    G(KC_2),    G(KC_3),
+    TO(_PROD),  G(KC_4),    G(KC_5),    G(KC_6)
+  ),
+  [_NAV] = LAYOUT(
+    TO(_BASE),  KC_HOME,    KC_UP,      KC_END,
+    A(KC_TAB),  KC_LEFT,    KC_DOWN,    KC_RIGHT,
+    G(KC_TAB),  KC_PGDN,    KC_PGUP,    MO(_BASE)
+  ),
+  [_PROD] = LAYOUT(
+    TO(_BASE),  KC_NO,      KC_NO,      KC_NO,
+    C(KC_Z),    C(KC_X),    C(KC_C),    C(KC_V),
+    C(KC_A),    C(KC_LEFT), C(KC_RIGHT),MO(_BASE)
+  )
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    switch (biton32(layer_state)) {
+        case _BASE:
+            if (clockwise) {
+                tap_code(KC_VOLU);
+            } else {
+                tap_code(KC_VOLD);
+            }
+            break;
+        case _NAV:
+            if (clockwise) {
+                tap_code16(C(G(KC_RIGHT)));
+            } else {
+                tap_code16(C(G(KC_LEFT)));
+            }
+            break;
+        case _PROD:
+            if (clockwise) {
+                tap_code16(C(KC_Y));
+            } else {
+                tap_code16(C(KC_Z));
+            }
+            break;
+    }
+    return false;
+}
diff --git a/keyboards/psuieee/pluto12/keymaps/wymcg/readme.md b/keyboards/psuieee/pluto12/keymaps/wymcg/readme.md
new file mode 100644
index 0000000000..60d2f19be3
--- /dev/null
+++ b/keyboards/psuieee/pluto12/keymaps/wymcg/readme.md
@@ -0,0 +1 @@
+# wymcg's custom keymap
diff --git a/keyboards/psuieee/pluto12/pluto12.c b/keyboards/psuieee/pluto12/pluto12.c
index c08911493c..15d5fad99f 100644
--- a/keyboards/psuieee/pluto12/pluto12.c
+++ b/keyboards/psuieee/pluto12/pluto12.c
@@ -1,4 +1,4 @@
-// Copyright 2021 Will McGloughlin (@wymcg)
+// Copyright 2021-22 Will McGloughlin (@wymcg)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include "pluto12.h"
diff --git a/keyboards/psuieee/pluto12/pluto12.h b/keyboards/psuieee/pluto12/pluto12.h
index 7a01de10f7..fc3f391156 100644
--- a/keyboards/psuieee/pluto12/pluto12.h
+++ b/keyboards/psuieee/pluto12/pluto12.h
@@ -1,4 +1,4 @@
-// Copyright 2021 Will McGloughlin (@wymcg)
+// Copyright 2021-22 Will McGloughlin (@wymcg)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
diff --git a/keyboards/psuieee/pluto12/rules.mk b/keyboards/psuieee/pluto12/rules.mk
index 515ca5621f..a56e12eb22 100644
--- a/keyboards/psuieee/pluto12/rules.mk
+++ b/keyboards/psuieee/pluto12/rules.mk
@@ -16,3 +16,4 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes

From d953aa730e38d94b9218948ddaa0deea667f85f3 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 7 Mar 2022 04:23:15 -0700
Subject: [PATCH 747/867] new lines at eof's (#16558)

---
 keyboards/qwertykeys/qk65/hotswap/hotswap.h | 3 ++-
 keyboards/qwertykeys/qk65/solder/solder.h   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/keyboards/qwertykeys/qk65/hotswap/hotswap.h b/keyboards/qwertykeys/qk65/hotswap/hotswap.h
index 1f61c5ed6b..334ce82277 100644
--- a/keyboards/qwertykeys/qk65/hotswap/hotswap.h
+++ b/keyboards/qwertykeys/qk65/hotswap/hotswap.h
@@ -30,4 +30,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214 }, \
 	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314 }, \
 	{ K400,  K401,  K402,  KC_NO, K404,  KC_NO, KC_NO, K407,  K408,  KC_NO, KC_NO, KC_NO, K412,  K413,  K414 }  \
-}
\ No newline at end of file
+}
+
diff --git a/keyboards/qwertykeys/qk65/solder/solder.h b/keyboards/qwertykeys/qk65/solder/solder.h
index 5409662229..b796ae1e91 100644
--- a/keyboards/qwertykeys/qk65/solder/solder.h
+++ b/keyboards/qwertykeys/qk65/solder/solder.h
@@ -46,4 +46,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214 },  \
 	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 },  \
 	{ K400,  K401,  K402,  KC_NO, K404,  KC_NO, KC_NO, K407,  K408,  KC_NO, KC_NO, KC_NO, K412,  K413,  K414 }   \
-}
\ No newline at end of file
+}
+

From 2ff646c642152df064da8dcf62ef328585de0197 Mon Sep 17 00:00:00 2001
From: Matthew Bautista <nayoshi12gaming@gmail.com>
Date: Mon, 7 Mar 2022 12:05:41 -0500
Subject: [PATCH 748/867] [Keyboard] LFK78 VIA support and Update (#16502)

---
 keyboards/lfkeyboards/lfk78/config.h          |  4 +-
 .../lfkeyboards/lfk78/keymaps/via/keymap.c    | 72 +++++++++++++++++++
 .../lfkeyboards/lfk78/keymaps/via/readme.md   |  1 +
 .../lfkeyboards/lfk78/keymaps/via/rules.mk    |  2 +
 keyboards/lfkeyboards/lfk78/lfk78.c           |  4 +-
 keyboards/lfkeyboards/lfk78/lfk78.h           |  2 +-
 6 files changed, 80 insertions(+), 5 deletions(-)
 create mode 100644 keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
 create mode 100644 keyboards/lfkeyboards/lfk78/keymaps/via/readme.md
 create mode 100644 keyboards/lfkeyboards/lfk78/keymaps/via/rules.mk

diff --git a/keyboards/lfkeyboards/lfk78/config.h b/keyboards/lfkeyboards/lfk78/config.h
index 05ead71c86..fbb02e71ee 100644
--- a/keyboards/lfkeyboards/lfk78/config.h
+++ b/keyboards/lfkeyboards/lfk78/config.h
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
+#define VENDOR_ID       0x4C46 // LF
+#define PRODUCT_ID      0x3738 // 78
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    LFKeyboards
 #define PRODUCT         LFK78
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
new file mode 100644
index 0000000000..48e183984f
--- /dev/null
+++ b/keyboards/lfkeyboards/lfk78/keymaps/via/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2021 Matt Bautista (@nayoshi)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Keymap VANILLA: (Base Layer) Default Layer
+     * ,---------.  ,------------------------------------------------------------.  ,---------.
+     * | F1 | F2 |  |Esc~| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |  0| - | = |Backspa|  | Ins|PgUp|
+     * |---------|  |------------------------------------------------------------|  |---------|
+     * | F3 | F4 |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|     \|  | Del|PgDn|
+     * |---------|  |------------------------------------------------------------|  `---------'
+     * | F5 | F6 |  |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| Return |
+     * |---------|  |------------------------------------------------------------|  ,----.
+     * | F7 | F8 |  |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift      |  | Up |
+     * |---------|  |-------------------------------------------------------------------------.
+     * | F9 | F10|  |Ctrl|Win |Alt |      Space            |Alt |Ctrl|Func |    |Lft| Dn |Rig |
+     * `---------'  `------------------------------------------------------'    `-------------'
+     */
+
+    [0] = LAYOUT(
+        KC_F1,   KC_F2,   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_F3,   KC_F4,   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_PGDN,
+        KC_F5,   KC_F6,   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_F7,   KC_F8,   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_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL, MO(1),          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,                KC_TRNS, KC_HOME,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_END,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, 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_MUTE, KC_VOLD, KC_VOLU, KC_TRNS,          TG(2),          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_ENT,                             KC_TRNS, KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_INC,  BL_TOGG,          RGB_TOG, RGB_VAI,
+        KC_TRNS, KC_TRNS, MU_MOD,  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,          RGB_MOD, RGB_VAD,
+        KC_TRNS, KC_TRNS, AU_TOG,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RESET,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MU_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_HUI,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          RGB_SAD, RGB_HUD, RGB_SAI
+    ),
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_INC,  BL_TOGG,          RGB_TOG, RGB_VAI,
+        KC_TRNS, KC_TRNS, MU_MOD,  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,          RGB_MOD, RGB_VAD,
+        KC_TRNS, KC_TRNS, AU_TOG,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RESET,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MU_TOG,  KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          RGB_HUI,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          RGB_SAD, RGB_HUD, RGB_SAI
+    )
+};
+
+void matrix_init_user(void) {
+    // This keymap only has a single base layer, so reset the default if needed
+    if (eeconfig_read_default_layer() > 1) {
+        eeconfig_update_default_layer(1);
+        default_layer_set(1);
+    }
+}
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/via/readme.md b/keyboards/lfkeyboards/lfk78/keymaps/via/readme.md
new file mode 100644
index 0000000000..5ec8e4e34d
--- /dev/null
+++ b/keyboards/lfkeyboards/lfk78/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The via keymap for LFK78
diff --git a/keyboards/lfkeyboards/lfk78/keymaps/via/rules.mk b/keyboards/lfkeyboards/lfk78/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/lfkeyboards/lfk78/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/lfkeyboards/lfk78/lfk78.c b/keyboards/lfkeyboards/lfk78/lfk78.c
index 2f8f1b34ef..96fe96f03f 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.c
+++ b/keyboards/lfkeyboards/lfk78/lfk78.c
@@ -110,7 +110,7 @@ void matrix_scan_kb(void) {
     matrix_scan_user();
 }
 
-void click(uint16_t freq, uint16_t duration) {
+void clicking_notes(uint16_t freq, uint16_t duration) {
 #ifdef AUDIO_ENABLE
     if (freq >= 100 && freq <= 20000 && duration < 100) {
         play_note(freq, 10);
@@ -124,7 +124,7 @@ void click(uint16_t freq, uint16_t duration) {
 
 bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
     if (click_toggle && record->event.pressed) {
-        click(click_hz, click_time);
+        clicking_notes(click_hz, click_time);
     }
 
     if (keycode == RESET) {
diff --git a/keyboards/lfkeyboards/lfk78/lfk78.h b/keyboards/lfkeyboards/lfk78/lfk78.h
index ffa4894bbc..d5e1c7b3c7 100644
--- a/keyboards/lfkeyboards/lfk78/lfk78.h
+++ b/keyboards/lfkeyboards/lfk78/lfk78.h
@@ -30,4 +30,4 @@ extern const Layer_Info layer_info[];
 #define CLICK_ENABLED 0
 
 void reset_keyboard_kb(void);
-void click(uint16_t freq, uint16_t duration);
+void clicking_notes(uint16_t freq, uint16_t duration);

From 893d86cb896d82eb8c9d16251062dd6afa802533 Mon Sep 17 00:00:00 2001
From: bwisn <56162793+bwisn@users.noreply.github.com>
Date: Tue, 8 Mar 2022 02:12:53 +0100
Subject: [PATCH 749/867] Add Anne Pro 2 keyboard (#14385)

* [keyboard] Initial support for Anne Pro 2

* [keyboard][AnnePro2] Keymap:update to a reasonable keymap with caps+hjkl => arrow

* :(

* changed to use HSI

* support for annepro2 c18

* keyboard/annepro2: Very stupid matrix scan bug fix.

* typo

* swap COL14/13

* keyboard/annepro2: startup secondary LED MCU

* keyboard/annepro2: typo fix

* Add IO Values

* Disable Combo feature

* Update default keymap to Anne Pro 2 Official Keymap

* keyboard/annepro2: keymap layer name changes

* keyboard/annepro2 BLE Support

* Fix keymap comment

FN1 ESC was listed as ~ instead of `

* keyboard/annepro2: Bluetooth path

* Keyboard annepro2 bidir led comms (#5)

* Added bidirectional shine comms and moved led functionality to new file

* Added bidirectional shine comms and moved led functionality to new file

* Restore original functionality to existing keymaps using new shine commands

* Fix dangling bracketless if statements

* PR cleanup

* add custom keycodes to switch led profiles

* Optimize code

* switch to prev profile before turning leds off

* Add persistent led support with eeprom (#9)

* adding HT32 support to chibios SPI master driver

* add support for W25X20CL SPI eeprom

* add makefile flag for eeprom feature

* add spi support to keyboard startup and config

* example keymap using eeprom profile loading

* Cleanup to fix C15 eeprom/spi build errors (#11)

* Cleanup to fix C15 eeprom/spi build errors

* add newline at eof

* LED Masking support for Shine

Introduce companion update to ledSetMask and ledClearMask.
In keymap `codetector` there is example of how to map caps_lock
to the caps_lock key light on the keyboard.

* [AnnePro2]: update bluetooth connection

* Merge the custom keys enums on annepro2.h (#13)

* Keyboard annepro2 ble caps lock (#12)

* Move matrix_scan_kb out of board.c to annepro2.c

* add buffer clear after init and caplock polling

* Add support for LED intensity (#15)

* Improve logic for switching off and on of LEDs (#16)

* Implement animation speed (#17)

* Include logic to send solid colors as foreground to shine and add sample profiles (#14)

Include the logic to send a solid color from qmk to shine. That solid color will act as a foreground (will override the current profile) until reset (witch will reactivate the current profile).
This functionality depends on changes made for shine as well.

Include 3 new profiles:

    default-full-caps -> same as default, but with the logic of using the red foreground color on caps lock.
    default-layer-indicators -> same as default, but with the logic of red foreground on caps lock, green foreground on FN1 and blue foreground on FN2.
    thomazmoura -> my own profile as a sample of an over-engineered advanced case scenario.

* Implement reactive lighting effects (#18)

* Added multiarrow keymap (#19)

* Add LED documentation (#26)

* add LED documentation

* add LED documentation to other default profiles

* Implement QMK's IAP default keybind (#29)

* Add keymap for going into IAP

* switch to default QMK keybind for IAP mode

* implement bluetooth IAP mode

* Make default config more like Obins stock default (#30)

* Add new message type for resetting foreground color (#31)

* annepro2(bluetooth): add media keys support (#41)

* Asynchronous, robust serial protocol. (#39)

* bla personal ap2-c18 keymap.

* Bidirectional, asynchronous message-based communication with Shine.

- Requires a matching Shine version.
- Protocol is resiliant to loosing bytes during communication, chips won't lock
  waiting for bytes that aren't coming.
- Chips resynchronize in event of loosing a byte using a AA0D header.

Regressions:
- Key masking/locking doesn't work right now. (did it work before?)
- Not all user keymaps build against it.

* Clang-format + code to ease reducing speed of LED UART.

- Did clang-format --style=file -i on multiple files according to
  coding_conventions_c.md

- Added separate serial speed for IAP boot and Led communication, it's possible
  that reducing this to 9600 helped someone with faulty HW. With this code they
  can do it with simple replacing of a value.

* Main chip can set/clear foreground using a mask mechanism.

- Some preparations for selective colouring.

* Selective mask works - tested on capslock.

- Migrated personal keymaps to new status API.

* Clear the foreground colors to show profile when it's modified.

- Show example of achieving selective caps-lock painting + foreground painting
  for layers.
- annepro2LedMaskSetRow is implemented, but still requires testing.

* Implement the QMK side of led blinking to indicate the command was received.

- This stupidly blinks the key when user presses one of the bluetooth commands
to let the user know that the command was received and forwarded to the BT chip.

- TODO: Row/col key positions are hardcoded and not taken from the keymap.

* Reduce memory footprint.

Applying code review suggestions. Moved msgId to globals - preparing for
transmission without copying payload when no retries are necessary.

Added empty readme.md files - required by QMK lint.

Co-authored-by: Tomasz bla Fortuna <bla@thera.be>

* Let the LED chip settle a bit before waking it from the bootloader. (#42)

At least for one person that helps to reliably get the LEDs working without
disconnecting/reconnecting the power to the board multiple times.

Co-authored-by: Tomasz bla Fortuna <bla@thera.be>

* annepro2: rename KEYMAP to LAYOUT, as required by new version of QMK

* annepro2: update ChibiOS configuration files

* annepro2: fix undefined reference to dprint and timer_read32

* annepro2: update ChibiOS MCU name

* update spi driver, fix bad merging with master

* annepro2: add readme and info.json

* annepro2: make code compatible with QMK coding conventions

* tmk_core: temporary fix to allow HT32 based keyboards to work without patched ChibiOS-contrib (AnnePro2)

* AnnePro2: removed core changes

* AnnePro2: Leave only default keymaps

Missing keymaps will be restored in another PR

* annepro2: add licence information

* annepro2: satisfy qmk lint

* annepro2: fix drashna's suggestions

* annepro2: fix matrix

* annepro2: apply code review suggestions

* annepro2: apply remaining code review suggestions

* annepro2: update info.json

* annepro2: remove include

* annepro2: rename keymap to layout

* annepro2: fix typing

* annepro2: apply suggestions from tzarc's code review

Co-authored-by: Nick Brassel <nick@tzarc.org>

* annepro2: more fixes

* annepro2: apply suggestions from code review

Co-authored-by: Joel Challis <git@zvecr.com>

* annepro2: rename file

* more fixes

* Apply suggestions from @tzarc code review

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update keyboards/annepro2/protocol.h

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update keyboards/annepro2/chconf.h

Co-authored-by: Nick Brassel <nick@tzarc.org>

* apply CR suggestions

* upgrade readme

* IAP

* update IAP comments, defines

* led fix

* init fix

* annepro2: GPIO cleanup

* annepro2: ioline

* change waiting time

* Start develop for 2022q2

* [Core] Squeeze AVR some more with `-mrelax` and `-mcall-prologues` (#16269)

* Rework generate-api CLI command to use .build directory (#16441)

* Remove `send_unicode_hex_string()` (#16518)

* Change data driven "str" type to represent a quoted string literal (#16516)

* Change data driven "str" type to represent a quoted string literal

* Update docs

* Map data driven `DESCRIPTION` as string literal (#16523)

* update bootloader

* Revert "Merge pull request #2 from qmk/develop"

This reverts commit 9c76065188c3adda98bdaa1f28dad85600e73ee9, reversing
changes made to 240745dc05783c612e92bab153da5c46e037d675.

* Revert "update bootloader"

This reverts commit 240745dc05783c612e92bab153da5c46e037d675.

* fix rules.mk

* change PROGRAM_CMD

Co-authored-by: codetector <codetector@codetector.cn>
Co-authored-by: Fagl4 <18francisco18@gmail.com>
Co-authored-by: Jakob Gillich <jakob@gillich.me>
Co-authored-by: tech2077 <tech2077@gmail.com>
Co-authored-by: jcdeA <31413538+JcdeA@users.noreply.github.com>
Co-authored-by: Thomaz Moura <5599621+thomazmoura@users.noreply.github.com>
Co-authored-by: Darkhan <darkhanu@gmail.com>
Co-authored-by: Paco <70448173+packorf@users.noreply.github.com>
Co-authored-by: jmarmstrong1207 <32995055+jmarmstrong1207@users.noreply.github.com>
Co-authored-by: 1Conan <7620342+1Conan@users.noreply.github.com>
Co-authored-by: Tomasz bla Fortuna <blagh@thera.be>
Co-authored-by: Tomasz bla Fortuna <bla@thera.be>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: QMK Bot <hello@qmk.fm>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/annepro2/annepro2.c                 | 202 +++++++++++
 keyboards/annepro2/annepro2.h                 |  65 ++++
 keyboards/annepro2/annepro2_ble.c             | 170 +++++++++
 keyboards/annepro2/annepro2_ble.h             |  27 ++
 keyboards/annepro2/ap2_led.c                  | 134 +++++++
 keyboards/annepro2/ap2_led.h                  |  84 +++++
 .../annepro2/boards/ANNEPRO2_C15/board.c      | 103 ++++++
 .../annepro2/boards/ANNEPRO2_C15/board.h      |  39 +++
 .../annepro2/boards/ANNEPRO2_C15/board.mk     |   5 +
 .../annepro2/boards/ANNEPRO2_C18/board.c      | 103 ++++++
 .../annepro2/boards/ANNEPRO2_C18/board.h      |  39 +++
 .../annepro2/boards/ANNEPRO2_C18/board.mk     |   5 +
 keyboards/annepro2/c15/config.h               |  47 +++
 keyboards/annepro2/c15/readme.md              |   1 +
 keyboards/annepro2/c15/rules.mk               |  37 ++
 keyboards/annepro2/c18/config.h               |  45 +++
 keyboards/annepro2/c18/readme.md              |   1 +
 keyboards/annepro2/c18/rules.mk               |  37 ++
 keyboards/annepro2/chconf.h                   |  31 ++
 keyboards/annepro2/halconf.h                  |  28 ++
 keyboards/annepro2/info.json                  | 330 ++++++++++++++++++
 .../keymaps/default-full-caps/config.h        |  20 ++
 .../keymaps/default-full-caps/keymap.c        | 120 +++++++
 .../keymaps/default-layer-indicators/config.h |  20 ++
 .../keymaps/default-layer-indicators/keymap.c | 147 ++++++++
 keyboards/annepro2/keymaps/default/config.h   |  20 ++
 keyboards/annepro2/keymaps/default/keymap.c   | 106 ++++++
 keyboards/annepro2/ld/HT32F52342_ANNEPRO2.ld  |  91 +++++
 keyboards/annepro2/matrix.c                   |  63 ++++
 keyboards/annepro2/mcuconf.h                  |  62 ++++
 keyboards/annepro2/protocol.c                 | 116 ++++++
 keyboards/annepro2/protocol.h                 | 111 ++++++
 keyboards/annepro2/readme.md                  |  50 +++
 33 files changed, 2459 insertions(+)
 create mode 100644 keyboards/annepro2/annepro2.c
 create mode 100644 keyboards/annepro2/annepro2.h
 create mode 100644 keyboards/annepro2/annepro2_ble.c
 create mode 100644 keyboards/annepro2/annepro2_ble.h
 create mode 100644 keyboards/annepro2/ap2_led.c
 create mode 100644 keyboards/annepro2/ap2_led.h
 create mode 100644 keyboards/annepro2/boards/ANNEPRO2_C15/board.c
 create mode 100644 keyboards/annepro2/boards/ANNEPRO2_C15/board.h
 create mode 100644 keyboards/annepro2/boards/ANNEPRO2_C15/board.mk
 create mode 100644 keyboards/annepro2/boards/ANNEPRO2_C18/board.c
 create mode 100644 keyboards/annepro2/boards/ANNEPRO2_C18/board.h
 create mode 100644 keyboards/annepro2/boards/ANNEPRO2_C18/board.mk
 create mode 100644 keyboards/annepro2/c15/config.h
 create mode 100644 keyboards/annepro2/c15/readme.md
 create mode 100644 keyboards/annepro2/c15/rules.mk
 create mode 100644 keyboards/annepro2/c18/config.h
 create mode 100644 keyboards/annepro2/c18/readme.md
 create mode 100644 keyboards/annepro2/c18/rules.mk
 create mode 100644 keyboards/annepro2/chconf.h
 create mode 100644 keyboards/annepro2/halconf.h
 create mode 100644 keyboards/annepro2/info.json
 create mode 100644 keyboards/annepro2/keymaps/default-full-caps/config.h
 create mode 100644 keyboards/annepro2/keymaps/default-full-caps/keymap.c
 create mode 100644 keyboards/annepro2/keymaps/default-layer-indicators/config.h
 create mode 100644 keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
 create mode 100644 keyboards/annepro2/keymaps/default/config.h
 create mode 100644 keyboards/annepro2/keymaps/default/keymap.c
 create mode 100644 keyboards/annepro2/ld/HT32F52342_ANNEPRO2.ld
 create mode 100644 keyboards/annepro2/matrix.c
 create mode 100644 keyboards/annepro2/mcuconf.h
 create mode 100644 keyboards/annepro2/protocol.c
 create mode 100644 keyboards/annepro2/protocol.h
 create mode 100644 keyboards/annepro2/readme.md

diff --git a/keyboards/annepro2/annepro2.c b/keyboards/annepro2/annepro2.c
new file mode 100644
index 0000000000..37489defff
--- /dev/null
+++ b/keyboards/annepro2/annepro2.c
@@ -0,0 +1,202 @@
+/* Copyright 2021 OpenAnnePro community
+ *
+ * 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 "hal.h"
+#include "annepro2.h"
+#include "annepro2_ble.h"
+#include "spi_master.h"
+#include "ap2_led.h"
+#include "protocol.h"
+
+#define RAM_MAGIC_LOCATION 0x20001ffc
+#define IAP_MAGIC_VALUE 0x0000fab2
+
+static const SerialConfig ledUartInitConfig = {
+    .speed = 115200,
+};
+
+#ifndef LED_UART_BAUD_RATE
+#    define LED_UART_BAUD_RATE 115200
+#endif  // LED_UART_BAUD_RATE
+
+static const SerialConfig ledUartRuntimeConfig = {
+    .speed = LED_UART_BAUD_RATE,
+};
+
+static const SerialConfig bleUartConfig = {
+    .speed = 115200,
+};
+
+static uint8_t ledMcuWakeup[11] = {0x7b, 0x10, 0x43, 0x10, 0x03, 0x00, 0x00, 0x7d, 0x02, 0x01, 0x02};
+
+ble_capslock_t BLECapsLock = {._dummy = {0}, .caps_lock = false};
+
+void bootloader_jump(void) {
+    // Send msg to shine to boot into IAP
+    annepro2SetIAP();
+
+    // wait for shine to boot into IAP
+    wait_ms(15);
+
+    // Load ble into IAP
+    annepro2_ble_bootload();
+    wait_ms(15);
+
+    // Magic key to set keyboard to IAP
+    // It’s from reversing original boot loader
+    // If value is that it stays in boot loader aka IAP
+    *((uint32_t *)RAM_MAGIC_LOCATION) = IAP_MAGIC_VALUE;
+
+    // Load the main MCU into IAP
+    __disable_irq();
+    NVIC_SystemReset();
+}
+
+void keyboard_pre_init_kb(void) {
+    // Start LED UART
+    sdStart(&SD0, &ledUartInitConfig);
+    /* Let the LED chip settle a bit before switching the mode.
+     * That helped at least one person. */
+    wait_ms(15);
+    sdWrite(&SD0, ledMcuWakeup, sizeof(ledMcuWakeup));
+
+    // wait to receive response from wakeup
+    wait_ms(15);
+
+    protoInit(&proto, ledCommandCallback);
+
+    // loop to clear out receive buffer from shine wakeup
+    while (!sdGetWouldBlock(&SD0)) sdGet(&SD0);
+
+    sdStart(&SD0, &ledUartRuntimeConfig);
+    keyboard_pre_init_user();
+}
+
+void keyboard_post_init_kb(void) {
+    // Start BLE UART
+    sdStart(&SD1, &bleUartConfig);
+    annepro2_ble_startup();
+
+    // Give the send uart thread some time to
+    // send out the queue before we read back
+    wait_ms(100);
+
+    // loop to clear out receive buffer from ble wakeup
+    while (!sdGetWouldBlock(&SD1)) sdGet(&SD1);
+
+    annepro2LedGetStatus();
+
+    keyboard_post_init_user();
+}
+
+void matrix_scan_kb() {
+    // if there's stuff on the ble serial buffer
+    // read it into the capslock struct
+    while (!sdGetWouldBlock(&SD1)) {
+        sdReadTimeout(&SD1, (uint8_t *)&BLECapsLock, sizeof(ble_capslock_t), 10);
+    }
+
+    /* While there's data from LED keyboard sent - read it. */
+    while (!sdGetWouldBlock(&SD0)) {
+        uint8_t byte = sdGet(&SD0);
+        protoConsume(&proto, byte);
+    }
+
+    matrix_scan_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        if (annepro2LedStatus.matrixEnabled && annepro2LedStatus.isReactive) {
+            annepro2LedForwardKeypress(record->event.key.row, record->event.key.col);
+        }
+
+        const annepro2Led_t blue = {
+            .p.blue  = 0xff,
+            .p.red   = 0x00,
+            .p.green = 0x00,
+            .p.alpha = 0xff,
+        };
+
+        switch (keycode) {
+            case KC_AP2_BT1:
+                annepro2_ble_broadcast(0);
+                /* FIXME: This hardcodes col/row position */
+                annepro2LedBlink(0, 1, blue, 8, 50);
+                return false;
+
+            case KC_AP2_BT2:
+                annepro2_ble_broadcast(1);
+                annepro2LedBlink(0, 2, blue, 8, 50);
+                return false;
+
+            case KC_AP2_BT3:
+                annepro2_ble_broadcast(2);
+                annepro2LedBlink(0, 3, blue, 8, 50);
+                return false;
+
+            case KC_AP2_BT4:
+                annepro2_ble_broadcast(3);
+                annepro2LedBlink(0, 4, blue, 8, 50);
+                return false;
+
+            case KC_AP2_USB:
+                annepro2_ble_disconnect();
+                return false;
+
+            case KC_AP2_BT_UNPAIR:
+                annepro2_ble_unpair();
+                return false;
+
+            case KC_AP_LED_OFF:
+                annepro2LedDisable();
+                break;
+
+            case KC_AP_LED_ON:
+                if (annepro2LedStatus.matrixEnabled) {
+                    annepro2LedNextProfile();
+                } else {
+                    annepro2LedEnable();
+                }
+                annepro2LedResetForegroundColor();
+                break;
+
+            case KC_AP_LED_NEXT_PROFILE:
+                annepro2LedNextProfile();
+                annepro2LedResetForegroundColor();
+                break;
+
+            case KC_AP_LED_PREV_PROFILE:
+                annepro2LedPrevProfile();
+                annepro2LedResetForegroundColor();
+                break;
+
+            case KC_AP_LED_NEXT_INTENSITY:
+                annepro2LedNextIntensity();
+                annepro2LedResetForegroundColor();
+                return false;
+
+            case KC_AP_LED_SPEED:
+                annepro2LedNextAnimationSpeed();
+                annepro2LedResetForegroundColor();
+                return false;
+
+            default:
+                break;
+        }
+    }
+    return process_record_user(keycode, record);
+}
diff --git a/keyboards/annepro2/annepro2.h b/keyboards/annepro2/annepro2.h
new file mode 100644
index 0000000000..b08f8c5352
--- /dev/null
+++ b/keyboards/annepro2/annepro2.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2018 Yaotian Feng
+ *
+ * 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"
+#include <stdint.h>
+#include "ap2_led.h"
+
+typedef struct __attribute__((__packed__)) {
+    uint8_t _dummy[10];
+    bool    caps_lock;
+} ble_capslock_t;
+extern ble_capslock_t BLECapsLock;
+
+// Matrix keymap
+// clang-format off
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \
+    K40, K42, K43,                K46,           K49,  K4A,   K4B,   K4C  \
+) { \
+    /*            COL1   COL2   COL3   COL4   COL5   COL6   COL7   COL8   COL9   COL10  COL11  COL12  COL13  COL14*/ \
+    /* ROW1  */ { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D  }, \
+    /* ROW2  */ { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D  }, \
+    /* ROW3  */ { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO}, \
+    /* ROW4  */ { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO}, \
+    /* ROW5  */ { K40,   KC_NO, K42,   K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   KC_NO}, \
+}
+// clang-format on
+
+enum AP2KeyCodes {
+    KC_AP2_BT1 = SAFE_RANGE,
+    KC_AP2_BT2,
+    KC_AP2_BT3,
+    KC_AP2_BT4,
+    KC_AP2_BT_UNPAIR,
+    KC_AP2_USB,
+    KC_AP_LED_ON,
+    KC_AP_LED_OFF,
+    KC_AP_LED_NEXT_PROFILE,
+    KC_AP_LED_PREV_PROFILE,
+    KC_AP_LED_NEXT_INTENSITY,
+    KC_AP_LED_SPEED,
+    AP2_SAFE_RANGE,
+};
+
+#undef SAFE_RANGE
+#define SAFE_RANGE AP2_SAFE_RANGE
+
diff --git a/keyboards/annepro2/annepro2_ble.c b/keyboards/annepro2/annepro2_ble.c
new file mode 100644
index 0000000000..72cbb68016
--- /dev/null
+++ b/keyboards/annepro2/annepro2_ble.c
@@ -0,0 +1,170 @@
+/*
+    Copyright (C) 2020 Yaotian Feng, Codetector<codetector@codetector.cn>
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "annepro2_ble.h"
+#include "ch.h"
+#include "hal.h"
+#include "host.h"
+#include "host_driver.h"
+#include "report.h"
+
+/* -------------------- Static Function Prototypes -------------------------- */
+static uint8_t ap2_ble_leds(void);
+static void    ap2_ble_mouse(report_mouse_t *report);
+static void    ap2_ble_system(uint16_t data);
+static void    ap2_ble_consumer(uint16_t data);
+static void    ap2_ble_keyboard(report_keyboard_t *report);
+
+static void ap2_ble_swtich_ble_driver(void);
+
+/* -------------------- Static Local Variables ------------------------------ */
+static host_driver_t ap2_ble_driver = {
+    ap2_ble_leds, ap2_ble_keyboard, ap2_ble_mouse, ap2_ble_system, ap2_ble_consumer,
+};
+
+static uint8_t bleMcuWakeup[11] = {0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x01, 0x7d, 0x02, 0x01, 0x02};
+
+static uint8_t bleMcuStartBroadcast[11] = {
+    0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x00, 0x7d, 0x40, 0x01, 0x00  // Broadcast ID[0-3]
+};
+
+static uint8_t bleMcuConnect[11] = {
+    0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x00, 0x7d, 0x40, 0x04, 0x00  // Connect ID [0-3]
+};
+
+static uint8_t bleMcuSendReport[10] = {
+    0x7b, 0x12, 0x53, 0x00, 0x0A, 0x00, 0x00, 0x7d, 0x10, 0x04,
+};
+
+static uint8_t bleMcuSendConsumerReport[10] = {
+    0x7b, 0x12, 0x53, 0x00, 0x06, 0x00, 0x00, 0x7d, 0x10, 0x08,
+};
+
+static uint8_t bleMcuUnpair[10] = {
+    0x7b, 0x12, 0x53, 0x00, 0x02, 0x00, 0x00, 0x7d, 0x40, 0x05,
+};
+
+static uint8_t bleMcuBootload[11] = {0x7b, 0x10, 0x51, 0x10, 0x03, 0x00, 0x00, 0x7d, 0x02, 0x01, 0x01};
+
+static host_driver_t *lastHostDriver = NULL;
+#ifdef NKRO_ENABLE
+static bool lastNkroStatus = false;
+#endif  // NKRO_ENABLE
+
+/* -------------------- Public Function Implementation ---------------------- */
+
+void annepro2_ble_bootload(void) { sdWrite(&SD1, bleMcuBootload, sizeof(bleMcuBootload)); }
+
+void annepro2_ble_startup(void) { sdWrite(&SD1, bleMcuWakeup, sizeof(bleMcuWakeup)); }
+
+void annepro2_ble_broadcast(uint8_t port) {
+    if (port > 3) {
+        port = 3;
+    }
+    // sdPut(&SD1, 0x00);
+    sdWrite(&SD1, bleMcuStartBroadcast, sizeof(bleMcuStartBroadcast));
+    sdPut(&SD1, port);
+    static int lastBroadcast = -1;
+    if (lastBroadcast == port) {
+        annepro2_ble_connect(port);
+    }
+    lastBroadcast = port;
+}
+
+void annepro2_ble_connect(uint8_t port) {
+    if (port > 3) {
+        port = 3;
+    }
+    sdWrite(&SD1, bleMcuConnect, sizeof(bleMcuConnect));
+    sdPut(&SD1, port);
+    ap2_ble_swtich_ble_driver();
+}
+
+void annepro2_ble_disconnect(void) {
+    /* Skip if the driver is already enabled */
+    if (host_get_driver() != &ap2_ble_driver) {
+        return;
+    }
+
+    clear_keyboard();
+#ifdef NKRO_ENABLE
+    keymap_config.nkro = lastNkroStatus;
+#endif
+    host_set_driver(lastHostDriver);
+}
+
+void annepro2_ble_unpair(void) {
+    // sdPut(&SD1, 0x0);
+    sdWrite(&SD1, bleMcuUnpair, sizeof(bleMcuUnpair));
+}
+
+/* ------------------- Static Function Implementation ----------------------- */
+static void ap2_ble_swtich_ble_driver(void) {
+    if (host_get_driver() == &ap2_ble_driver) {
+        return;
+    }
+    clear_keyboard();
+    lastHostDriver = host_get_driver();
+#ifdef NKRO_ENABLE
+    lastNkroStatus = keymap_config.nkro;
+#endif
+    keymap_config.nkro = false;
+    host_set_driver(&ap2_ble_driver);
+}
+
+static uint8_t ap2_ble_leds(void) {
+    return 0;  // TODO: Figure out how to obtain LED status
+}
+
+static void ap2_ble_mouse(report_mouse_t *report) {}
+
+static void ap2_ble_system(uint16_t data) {}
+
+static inline uint16_t CONSUMER2AP2(uint16_t usage) {
+    switch (usage) {
+        case AUDIO_VOL_DOWN:
+            return 0x04;
+        case AUDIO_VOL_UP:
+            return 0x02;
+        case AUDIO_MUTE:
+            return 0x01;
+        case TRANSPORT_PLAY_PAUSE:
+            return 0x08;
+        case TRANSPORT_NEXT_TRACK:
+            return 0x10;
+        case TRANSPORT_PREV_TRACK:
+            return 0x20;
+        default:
+            return 0x00;
+    }
+}
+
+static void ap2_ble_consumer(uint16_t data) {
+    sdPut(&SD1, 0x0);
+    sdWrite(&SD1, bleMcuSendConsumerReport, sizeof(bleMcuSendConsumerReport));
+    sdPut(&SD1, CONSUMER2AP2(data));
+    static const uint8_t dummy[3] = {0};
+    sdWrite(&SD1, dummy, sizeof(dummy));
+}
+
+/*!
+ * @brief  Send keyboard HID report for Bluetooth driver
+ */
+static void ap2_ble_keyboard(report_keyboard_t *report) {
+    sdPut(&SD1, 0x0);
+    sdWrite(&SD1, bleMcuSendReport, sizeof(bleMcuSendReport));
+    sdWrite(&SD1, &report->raw[0], KEYBOARD_REPORT_SIZE);
+}
diff --git a/keyboards/annepro2/annepro2_ble.h b/keyboards/annepro2/annepro2_ble.h
new file mode 100644
index 0000000000..0cfb68e071
--- /dev/null
+++ b/keyboards/annepro2/annepro2_ble.h
@@ -0,0 +1,27 @@
+/*
+    Copyright (C) 2020 Yaotian Feng, Codetector<codetector@codetector.cn>
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#pragma once
+
+#include "annepro2.h"
+#include "quantum.h"
+
+void annepro2_ble_bootload(void);
+void annepro2_ble_startup(void);
+void annepro2_ble_broadcast(uint8_t port);
+void annepro2_ble_connect(uint8_t port);
+void annepro2_ble_disconnect(void);
+void annepro2_ble_unpair(void);
diff --git a/keyboards/annepro2/ap2_led.c b/keyboards/annepro2/ap2_led.c
new file mode 100644
index 0000000000..9969fcd02a
--- /dev/null
+++ b/keyboards/annepro2/ap2_led.c
@@ -0,0 +1,134 @@
+/* Copyright 2021 OpenAnnePro community
+ *
+ * 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 <string.h>
+#include <stdio.h>
+#include "hal.h"
+#include "annepro2.h"
+#include "ap2_led.h"
+#include "protocol.h"
+
+annepro2Led_t       ledMask[KEY_COUNT];
+annepro2LedStatus_t annepro2LedStatus;
+
+void ledCommandCallback(const message_t *msg) {
+    switch (msg->command) {
+        case CMD_LED_STATUS:
+            annepro2LedStatus.amountOfProfiles = msg->payload[0];
+            annepro2LedStatus.currentProfile   = msg->payload[1];
+            annepro2LedStatus.matrixEnabled    = msg->payload[2];
+            annepro2LedStatus.isReactive       = msg->payload[3];
+            annepro2LedStatus.ledIntensity     = msg->payload[4];
+            annepro2LedStatus.errors           = msg->payload[5];
+            break;
+
+#ifdef CONSOLE_ENABLE
+        case CMD_LED_DEBUG:
+            /* TODO: Don't use printf. */
+            printf("LED:");
+            for (int i = 0; i < msg->payloadSize; i++) {
+                printf("%02x ", msg->payload[i]);
+            }
+            for (int i = 0; i < msg->payloadSize; i++) {
+                printf("%c", msg->payload[i]);
+            }
+            printf("\n");
+            break;
+#endif
+    }
+}
+
+void annepro2SetIAP(void) { protoTx(CMD_LED_IAP, NULL, 0, 3); }
+
+void annepro2LedDisable(void) { protoTx(CMD_LED_OFF, NULL, 0, 3); }
+
+void annepro2LedEnable(void) { protoTx(CMD_LED_ON, NULL, 0, 3); }
+
+void annepro2LedSetProfile(uint8_t prof) { protoTx(CMD_LED_SET_PROFILE, &prof, sizeof(prof), 3); }
+
+void annepro2LedGetStatus() { protoTx(CMD_LED_GET_STATUS, NULL, 0, 3); }
+
+void annepro2LedNextProfile() { protoTx(CMD_LED_NEXT_PROFILE, NULL, 0, 3); }
+
+void annepro2LedNextIntensity() { protoTx(CMD_LED_NEXT_INTENSITY, NULL, 0, 3); }
+
+void annepro2LedNextAnimationSpeed() { protoTx(CMD_LED_NEXT_ANIMATION_SPEED, NULL, 0, 3); }
+
+void annepro2LedPrevProfile() { protoTx(CMD_LED_PREV_PROFILE, NULL, 0, 3); }
+
+void annepro2LedMaskSetKey(uint8_t row, uint8_t col, annepro2Led_t color) {
+    uint8_t payload[] = {row, col, color.p.blue, color.p.green, color.p.red, color.p.alpha};
+    protoTx(CMD_LED_MASK_SET_KEY, payload, sizeof(payload), 1);
+}
+
+/* Push a whole local row to the shine */
+void annepro2LedMaskSetRow(uint8_t row) {
+    uint8_t payload[NUM_COLUMN * sizeof(annepro2Led_t) + 1];
+    payload[0] = row;
+    memcpy(payload + 1, &ledMask[ROWCOL2IDX(row, 0)], sizeof(*ledMask) * NUM_COLUMN);
+    protoTx(CMD_LED_MASK_SET_ROW, payload, sizeof(payload), 1);
+}
+
+/* Synchronize all rows */
+void annepro2LedMaskSetAll(void) {
+    for (int row = 0; row < 5; row++) annepro2LedMaskSetRow(row);
+}
+
+/* Set all keys to a given color */
+void annepro2LedMaskSetMono(const annepro2Led_t color) { protoTx(CMD_LED_MASK_SET_MONO, (uint8_t *)&color, sizeof(color), 1); }
+
+void annepro2LedBlink(uint8_t row, uint8_t col, annepro2Led_t color, uint8_t count, uint8_t hundredths) {
+    uint8_t payload[] = {row, col, color.p.blue, color.p.green, color.p.red, color.p.alpha, count, hundredths};
+    protoTx(CMD_LED_KEY_BLINK, payload, sizeof(payload), 1);
+}
+
+void annepro2LedSetForegroundColor(uint8_t red, uint8_t green, uint8_t blue) {
+    annepro2Led_t color = {.p.red = red, .p.green = green, .p.blue = blue, .p.alpha = 0xff};
+    annepro2LedMaskSetMono(color);
+}
+
+void annepro2LedResetForegroundColor() {
+    annepro2Led_t color = {
+        .p.red   = 0,
+        .p.green = 0,
+        .p.blue  = 0,
+        .p.alpha = 0,
+    };
+    annepro2LedMaskSetMono(color);
+}
+
+/*
+ * Currently keypresses are unified with other messages, still with single 1
+ * byte payload. Transfer is normally fast enough for that to not be a problem -
+ * especially with asynchronous message reading.
+ *
+ *
+ * Previous description:
+ * If enabled, this data is sent to LED MCU on every keypress.
+ * In order to improve performance, both row and column values
+ * are packed into a single byte.
+ * Row range is [0, 4] and requires only 3 bits.
+ * Column range is [0, 13] and requires 4 bits.
+ *
+ * In order to differentiate this command from regular commands,
+ * the leftmost bit is set to 1 (0b10000000).
+ * Following it are 3 bits of row and 4 bits of col.
+ * 1 + 3 + 4 = 8 bits - only a single byte is sent for every keypress.
+ */
+void annepro2LedForwardKeypress(uint8_t row, uint8_t col) {
+    const uint8_t payload = row << 4 | col;
+    protoTx(CMD_LED_KEY_DOWN, &payload, 1, 1);
+}
diff --git a/keyboards/annepro2/ap2_led.h b/keyboards/annepro2/ap2_led.h
new file mode 100644
index 0000000000..23712a2555
--- /dev/null
+++ b/keyboards/annepro2/ap2_led.h
@@ -0,0 +1,84 @@
+ /* Copyright 2021 OpenAnnePro community
+  * 
+  * 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 "protocol.h"
+
+// Struct defining an LED and its RGB color components
+// Compatible with Shine firmware.
+typedef union {
+    struct {
+        /* Little endian ordering to match uint32_t */
+        uint8_t blue, green, red;
+        /* Used in mask; nonzero means - use color from mask. */
+        uint8_t alpha;
+    } p; /* parts */
+    /* Parts vector access: 0 - blue, 1 - green, 2 - red */
+    uint8_t pv[4];
+    /* 0xrgb in mem is b g r a */
+    uint32_t rgb;
+} annepro2Led_t;
+
+#define ROWCOL2IDX(row, col) (NUM_COLUMN * (row) + (col))
+#define NUM_COLUMN 14
+#define NUM_ROW 5
+#define KEY_COUNT 70
+
+/* Local copy of ledMask, used to override colors on the board */
+extern annepro2Led_t ledMask[KEY_COUNT];
+
+/* Handle incoming messages */
+extern void ledCommandCallback(const message_t *msg);
+
+void annepro2SetIAP(void);
+void annepro2LedDisable(void);
+void annepro2LedEnable(void);
+void annepro2LedSetProfile(uint8_t prof);
+void annepro2LedGetStatus(void);
+void annepro2LedNextProfile(void);
+void annepro2LedPrevProfile(void);
+void annepro2LedNextIntensity(void);
+void annepro2LedNextAnimationSpeed(void);
+void annepro2LedForwardKeypress(uint8_t row, uint8_t col);
+
+/* Set single key to a given color; alpha controls which is displayed */
+void annepro2LedMaskSetKey(uint8_t row, uint8_t col, annepro2Led_t color);
+/* Push a whole local row to the shine */
+void annepro2LedMaskSetRow(uint8_t row);
+/* Synchronize all rows */
+void annepro2LedMaskSetAll(void);
+
+/* Set all keys to a given color */
+void annepro2LedMaskSetMono(annepro2Led_t color);
+
+/* Blink given key `count` times by masking it with a `color`. Blink takes `hundredths` of a second */
+void annepro2LedBlink(uint8_t row, uint8_t col, annepro2Led_t color, uint8_t count, uint8_t hundredths);
+
+/* Kept for compatibility, but implemented using masks */
+void annepro2LedSetForegroundColor(uint8_t red, uint8_t green, uint8_t blue);
+void annepro2LedResetForegroundColor(void);
+
+typedef struct {
+    uint8_t amountOfProfiles;
+    uint8_t currentProfile;
+    uint8_t matrixEnabled;
+    uint8_t isReactive;
+    uint8_t ledIntensity;
+    uint8_t errors;
+} annepro2LedStatus_t;
+
+extern annepro2LedStatus_t annepro2LedStatus;
diff --git a/keyboards/annepro2/boards/ANNEPRO2_C15/board.c b/keyboards/annepro2/boards/ANNEPRO2_C15/board.c
new file mode 100644
index 0000000000..60c1826155
--- /dev/null
+++ b/keyboards/annepro2/boards/ANNEPRO2_C15/board.c
@@ -0,0 +1,103 @@
+/*
+    Copyright (C) 2020 Yaotian Feng, Codetector<codetector@codetector.cn>
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "hal.h"
+
+/* ============ Private Defines ===================== */
+
+/* ============ Function Prototypes ================== */
+
+#define PBIT(PORT, LINE) ((PAL_PORT(LINE) == PORT) ? (1 << PAL_PAD(LINE)) : 0)
+#define PAFIO_L(PORT, LINE, AF) (((PAL_PORT(LINE) == PORT) && (PAL_PAD(LINE) < 8)) ? (AF << (PAL_PAD(LINE) << 2)) : 0)
+#define PAFIO_H(PORT, LINE, AF) (((PAL_PORT(LINE) == PORT) && (PAL_PAD(LINE) >= 8)) ? (AF << ((PAL_PAD(LINE) - 8) << 2)) : 0)
+#define PAFIO(PORT, N, LINE, AF) ((N) ? PAFIO_H(PORT, LINE, AF) : PAFIO_L(PORT, LINE, AF))
+
+#define OUT_BITS(PORT) (PBIT(PORT, C2) | PBIT(PORT, C1) | PBIT(PORT, B5) | PBIT(PORT, B4) | PBIT(PORT, C3) | 0)
+
+#define IN_BITS(PORT) (PBIT(PORT, C4) | PBIT(PORT, C5) | PBIT(PORT, B10) | PBIT(PORT, B11) | PBIT(PORT, C0) | PBIT(PORT, A15) | PBIT(PORT, A8) | PBIT(PORT, A10) | PBIT(PORT, A11) | PBIT(PORT, A12) | PBIT(PORT, A13) | PBIT(PORT, A14) | PBIT(PORT, B2) | PBIT(PORT, B3) | 0)
+
+// Alternate Functions
+#define AF_BITS(PORT, N) (PAFIO(PORT, N, LINE_UART_RX, AFIO_USART) | PAFIO(PORT, N, LINE_UART_TX, AFIO_USART) | PAFIO(PORT, N, LINE_BT_UART_TX, AFIO_USART) | PAFIO(PORT, N, LINE_BT_UART_RX, AFIO_USART) | PAFIO(PORT, N, C2, AFIO_GPIO) | PAFIO(PORT, N, C1, AFIO_GPIO) | PAFIO(PORT, N, B5, AFIO_GPIO) | PAFIO(PORT, N, B4, AFIO_GPIO) | PAFIO(PORT, N, C3, AFIO_GPIO) | PAFIO(PORT, N, C4, AFIO_GPIO) | PAFIO(PORT, N, C5, AFIO_GPIO) | PAFIO(PORT, N, B10, AFIO_GPIO) | PAFIO(PORT, N, B11, AFIO_GPIO) | PAFIO(PORT, N, C0, AFIO_GPIO) | PAFIO(PORT, N, A15, AFIO_GPIO) | PAFIO(PORT, N, A8, AFIO_GPIO) | PAFIO(PORT, N, A10, AFIO_GPIO) | PAFIO(PORT, N, A11, AFIO_GPIO) | PAFIO(PORT, N, A12, AFIO_GPIO) | PAFIO(PORT, N, A13, AFIO_GPIO) | PAFIO(PORT, N, A14, AFIO_GPIO) | PAFIO(PORT, N, B2, AFIO_GPIO) | PAFIO(PORT, N, B3, AFIO_GPIO) | 0)
+
+/**
+ * @brief   PAL setup.
+ * @details Digital I/O ports static configuration as defined in @p board.h.
+ *          This variable is used by the HAL when initializing the PAL driver.
+ */
+const PALConfig pal_default_config = {
+    // GPIO A
+    .setup[0] =
+        {
+            .DIR    = OUT_BITS(IOPORTA),
+            .INE    = IN_BITS(IOPORTA),
+            .PU     = IN_BITS(IOPORTA),
+            .PD     = 0x0000,
+            .OD     = 0x0000,
+            .DRV    = 0x0000,
+            .LOCK   = 0x0000,
+            .OUT    = 0x0000,
+            .CFG[0] = AF_BITS(IOPORTA, 0),
+            .CFG[1] = AF_BITS(IOPORTA, 1),
+        },
+    // GPIO B
+    .setup[1] =
+        {
+            .DIR    = OUT_BITS(IOPORTB),
+            .INE    = IN_BITS(IOPORTB),
+            .PU     = IN_BITS(IOPORTB),
+            .PD     = 0x0000,
+            .OD     = 0x0000,
+            .DRV    = 0x0000,
+            .LOCK   = 0x0000,
+            .OUT    = 0x0000,
+            .CFG[0] = AF_BITS(IOPORTB, 0),
+            .CFG[1] = AF_BITS(IOPORTB, 1),
+        },
+    // GPIO C
+    .setup[2] =
+        {
+            .DIR    = OUT_BITS(IOPORTC),
+            .INE    = IN_BITS(IOPORTC),
+            .PU     = IN_BITS(IOPORTC),
+            .PD     = 0x0000,
+            .OD     = 0x0000,
+            .DRV    = 0x0000,
+            .LOCK   = 0x0000,
+            .OUT    = 0x0000,
+            .CFG[0] = AF_BITS(IOPORTC, 0),
+            .CFG[1] = AF_BITS(IOPORTC, 1),
+        },
+    // GPIO D
+    .setup[3] =
+        {
+            .DIR    = OUT_BITS(IOPORTD),
+            .INE    = IN_BITS(IOPORTD),
+            .PU     = IN_BITS(IOPORTD),
+            .PD     = 0x0000,
+            .OD     = 0x0000,
+            .DRV    = 0x0000,
+            .LOCK   = 0x0000,
+            .OUT    = 0x0000,
+            .CFG[0] = AF_BITS(IOPORTD, 0),
+            .CFG[1] = AF_BITS(IOPORTD, 1),
+        },
+    .ESSR[0] = 0x00000000,
+    .ESSR[1] = 0x00000000,
+};
+
+void __early_init(void) { ht32_clock_init(); }
+
+void boardInit(void) {}
diff --git a/keyboards/annepro2/boards/ANNEPRO2_C15/board.h b/keyboards/annepro2/boards/ANNEPRO2_C15/board.h
new file mode 100644
index 0000000000..0a044ea181
--- /dev/null
+++ b/keyboards/annepro2/boards/ANNEPRO2_C15/board.h
@@ -0,0 +1,39 @@
+/*
+    ChibiOS - Copyright (C) 2020 Codetector <codetector@codetector.cn>
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#pragma once
+/*
+ * Setup for Anne Pro 2 board.
+ */
+
+/*
+ * Board identifier.
+ */
+#define BOARD_NAME "Anne Pro 2"
+
+#define HT32F52342
+
+#define FLASH_SIZE (0x10000 - 0x4000)  // 64kB - 16kB
+
+#if !defined(_FROM_ASM_)
+#ifdef __cplusplus
+extern "C" {
+#endif
+void boardInit(void);
+#ifdef __cplusplus
+}
+#endif
+#endif /* _FROM_ASM_ */
\ No newline at end of file
diff --git a/keyboards/annepro2/boards/ANNEPRO2_C15/board.mk b/keyboards/annepro2/boards/ANNEPRO2_C15/board.mk
new file mode 100644
index 0000000000..f308892e7c
--- /dev/null
+++ b/keyboards/annepro2/boards/ANNEPRO2_C15/board.mk
@@ -0,0 +1,5 @@
+# List of all the board related files.
+BOARDSRC = $(BOARD_PATH)/boards/ANNEPRO2_C15/board.c
+
+# Required include directories
+BOARDINC = $(BOARD_PATH)/boards/ANNEPRO2_C15
diff --git a/keyboards/annepro2/boards/ANNEPRO2_C18/board.c b/keyboards/annepro2/boards/ANNEPRO2_C18/board.c
new file mode 100644
index 0000000000..42c03d3d00
--- /dev/null
+++ b/keyboards/annepro2/boards/ANNEPRO2_C18/board.c
@@ -0,0 +1,103 @@
+/*
+    Copyright (C) 2020 Yaotian Feng, Codetector<codetector@codetector.cn>
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "hal.h"
+
+/* ============ Private Defines ===================== */
+
+/* ============ Function Prototypes ================== */
+
+#define PBIT(PORT, LINE) ((PAL_PORT(LINE) == PORT) ? (1 << PAL_PAD(LINE)) : 0)
+#define PAFIO_L(PORT, LINE, AF) (((PAL_PORT(LINE) == PORT) && (PAL_PAD(LINE) < 8)) ? (AF << (PAL_PAD(LINE) << 2)) : 0)
+#define PAFIO_H(PORT, LINE, AF) (((PAL_PORT(LINE) == PORT) && (PAL_PAD(LINE) >= 8)) ? (AF << ((PAL_PAD(LINE) - 8) << 2)) : 0)
+#define PAFIO(PORT, N, LINE, AF) ((N) ? PAFIO_H(PORT, LINE, AF) : PAFIO_L(PORT, LINE, AF))
+
+#define OUT_BITS(PORT) (PBIT(PORT, B5) | PBIT(PORT, B4) | PBIT(PORT, B3) | PBIT(PORT, B2) | PBIT(PORT, D1) | 0)
+
+#define IN_BITS(PORT) (PBIT(PORT, C4) | PBIT(PORT, C5) | PBIT(PORT, D0) | PBIT(PORT, B15) | PBIT(PORT, C11) | PBIT(PORT, A15) | PBIT(PORT, C12) | PBIT(PORT, C13) | PBIT(PORT, A8) | PBIT(PORT, A10) | PBIT(PORT, A11) | PBIT(PORT, A14) | PBIT(PORT, D2) | PBIT(PORT, D3) | 0)
+
+// Alternate Functions
+#define AF_BITS(PORT, N) (PAFIO(PORT, N, LINE_UART_RX, AFIO_USART) | PAFIO(PORT, N, LINE_UART_TX, AFIO_USART) | PAFIO(PORT, N, LINE_BT_UART_TX, AFIO_USART) | PAFIO(PORT, N, LINE_BT_UART_RX, AFIO_USART) | PAFIO(PORT, N, B5, AFIO_GPIO) | PAFIO(PORT, N, B4, AFIO_GPIO) | PAFIO(PORT, N, B3, AFIO_GPIO) | PAFIO(PORT, N, B2, AFIO_GPIO) | PAFIO(PORT, N, D1, AFIO_GPIO) | PAFIO(PORT, N, C4, AFIO_GPIO) | PAFIO(PORT, N, C5, AFIO_GPIO) | PAFIO(PORT, N, D0, AFIO_GPIO) | PAFIO(PORT, N, B15, AFIO_GPIO) | PAFIO(PORT, N, C11, AFIO_GPIO) | PAFIO(PORT, N, A15, AFIO_GPIO) | PAFIO(PORT, N, C12, AFIO_GPIO) | PAFIO(PORT, N, C13, AFIO_GPIO) | PAFIO(PORT, N, A8, AFIO_GPIO) | PAFIO(PORT, N, A10, AFIO_GPIO) | PAFIO(PORT, N, A11, AFIO_GPIO) | PAFIO(PORT, N, A14, AFIO_GPIO) | PAFIO(PORT, N, D2, AFIO_GPIO) | PAFIO(PORT, N, D3, AFIO_GPIO) | 0)
+
+/**
+ * @brief   PAL setup.
+ * @details Digital I/O ports static configuration as defined in @p board.h.
+ *          This variable is used by the HAL when initializing the PAL driver.
+ */
+const PALConfig pal_default_config = {
+    // GPIO A
+    .setup[0] =
+        {
+            .DIR    = OUT_BITS(IOPORTA),
+            .INE    = IN_BITS(IOPORTA),
+            .PU     = IN_BITS(IOPORTA),
+            .PD     = 0x0000,
+            .OD     = 0x0000,
+            .DRV    = 0x0000,
+            .LOCK   = 0x0000,
+            .OUT    = 0x0000,
+            .CFG[0] = AF_BITS(IOPORTA, 0),
+            .CFG[1] = AF_BITS(IOPORTA, 1),
+        },
+    // GPIO B
+    .setup[1] =
+        {
+            .DIR    = OUT_BITS(IOPORTB),
+            .INE    = IN_BITS(IOPORTB),
+            .PU     = IN_BITS(IOPORTB),
+            .PD     = 0x0000,
+            .OD     = 0x0000,
+            .DRV    = 0x0000,
+            .LOCK   = 0x0000,
+            .OUT    = 0x0000,
+            .CFG[0] = AF_BITS(IOPORTB, 0),
+            .CFG[1] = AF_BITS(IOPORTB, 1),
+        },
+    // GPIO C
+    .setup[2] =
+        {
+            .DIR    = OUT_BITS(IOPORTC),
+            .INE    = IN_BITS(IOPORTC),
+            .PU     = IN_BITS(IOPORTC),
+            .PD     = 0x0000,
+            .OD     = 0x0000,
+            .DRV    = 0x0000,
+            .LOCK   = 0x0000,
+            .OUT    = 0x0000,
+            .CFG[0] = AF_BITS(IOPORTC, 0),
+            .CFG[1] = AF_BITS(IOPORTC, 1),
+        },
+    // GPIO D
+    .setup[3] =
+        {
+            .DIR    = OUT_BITS(IOPORTD),
+            .INE    = IN_BITS(IOPORTD),
+            .PU     = IN_BITS(IOPORTD),
+            .PD     = 0x0000,
+            .OD     = 0x0000,
+            .DRV    = 0x0000,
+            .LOCK   = 0x0000,
+            .OUT    = 0x0000,
+            .CFG[0] = AF_BITS(IOPORTD, 0),
+            .CFG[1] = AF_BITS(IOPORTD, 1),
+        },
+    .ESSR[0] = 0x00000000,
+    .ESSR[1] = 0x00000000,
+};
+
+void __early_init(void) { ht32_clock_init(); }
+
+void boardInit(void) {}
diff --git a/keyboards/annepro2/boards/ANNEPRO2_C18/board.h b/keyboards/annepro2/boards/ANNEPRO2_C18/board.h
new file mode 100644
index 0000000000..7345b24231
--- /dev/null
+++ b/keyboards/annepro2/boards/ANNEPRO2_C18/board.h
@@ -0,0 +1,39 @@
+/*
+    ChibiOS - Copyright (C) 2020 Codetector <codetector@codetector.cn>
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#pragma once
+/*
+ * Setup for Anne Pro 2 board.
+ */
+
+/*
+ * Board identifier.
+ */
+#define BOARD_NAME "Anne Pro 2"
+
+#define HT32F52342
+
+#define FLASH_SIZE (0x10000 - 0x4000)  // 64kB - 16kB
+
+#if !defined(_FROM_ASM_)
+#ifdef __cplusplus
+extern "C" {
+#endif
+void boardInit(void);
+#ifdef __cplusplus
+}
+#endif
+#endif /* _FROM_ASM_ */
diff --git a/keyboards/annepro2/boards/ANNEPRO2_C18/board.mk b/keyboards/annepro2/boards/ANNEPRO2_C18/board.mk
new file mode 100644
index 0000000000..1b41dede85
--- /dev/null
+++ b/keyboards/annepro2/boards/ANNEPRO2_C18/board.mk
@@ -0,0 +1,5 @@
+# List of all the board related files.
+BOARDSRC = $(BOARD_PATH)/boards/ANNEPRO2_C18/board.c
+
+# Required include directories
+BOARDINC = $(BOARD_PATH)/boards/ANNEPRO2_C18
diff --git a/keyboards/annepro2/c15/config.h b/keyboards/annepro2/c15/config.h
new file mode 100644
index 0000000000..f28a6a1b53
--- /dev/null
+++ b/keyboards/annepro2/c15/config.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2018 Charlie Waters
+ *
+ * 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 "pin_defs.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xfeed
+#define PRODUCT_ID 0xac15
+#define DEVICE_VER 0x1337
+#define MANUFACTURER Obins
+#define PRODUCT Anne Pro 2 QMK
+// key matrix size
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+// layer size: MATRIX_ROWS * MATRIX_COLS * sizeof(uint16_t) = 140 bytes
+
+#define LINE_UART_TX B0  // Master TX, LED RX
+#define LINE_UART_RX B1  // Master RX, LED TX
+
+#define LINE_BT_UART_TX A4  // Master TX, BLE RX
+#define LINE_BT_UART_RX A5  // Master RX, BLE TX
+
+// outputs (rows are pulled low)
+#define MATRIX_ROW_PINS \
+    { C2, C1, B5, B4, C3 }
+
+// inputs (columns are sampled)
+// PORTA 12,13 conflict with SWD
+
+#define MATRIX_COL_PINS \
+    { C4, C5, B10, B11, C0, A15, A8, A10, A11, A12, A13, A14, B2, B3 }
diff --git a/keyboards/annepro2/c15/readme.md b/keyboards/annepro2/c15/readme.md
new file mode 100644
index 0000000000..5fadb73909
--- /dev/null
+++ b/keyboards/annepro2/c15/readme.md
@@ -0,0 +1 @@
+AnnePro2, ANSI C15 version.
diff --git a/keyboards/annepro2/c15/rules.mk b/keyboards/annepro2/c15/rules.mk
new file mode 100644
index 0000000000..554ddc28ce
--- /dev/null
+++ b/keyboards/annepro2/c15/rules.mk
@@ -0,0 +1,37 @@
+# Anne Pro 2
+SRC = \
+	matrix.c \
+	annepro2_ble.c \
+	ap2_led.c \
+	protocol.c
+
+# MCU
+MCU = cortex-m0plus
+ARMV = 6
+USE_FPU = no
+MCU_FAMILY = HT32
+MCU_SERIES = HT32F523xx
+MCU_LDSCRIPT = HT32F52342_ANNEPRO2
+MCU_STARTUP = ht32f523xx
+
+BOARD = ANNEPRO2_C15
+
+# Options
+
+# Keys
+CUSTOM_MATRIX = lite
+NKRO_ENABLE = no
+MOUSEKEY_ENABLE = no
+EXTRAKEY_ENABLE = yes
+KEY_LOCK_ENABLE = no
+
+# Other featues
+BOOTMAGIC_ENABLE = no
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no
+RAW_ENABLE = no
+MIDI_ENABLE = no
+VIRTSER_ENABLE = no
+COMBO_ENABLE = no
+BOOTLOADER = custom
+PROGRAM_CMD = annepro2_tools --boot $(BUILD_DIR)/$(TARGET).bin
diff --git a/keyboards/annepro2/c18/config.h b/keyboards/annepro2/c18/config.h
new file mode 100644
index 0000000000..f610ef76e4
--- /dev/null
+++ b/keyboards/annepro2/c18/config.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2018 Charlie Waters
+ *
+ * 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 "pin_defs.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xfeed
+#define PRODUCT_ID 0xac18
+#define DEVICE_VER 0x1337
+#define MANUFACTURER Obins
+#define PRODUCT Anne Pro 2(c18)QMK
+// key matrix size
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+// layer size: MATRIX_ROWS * MATRIX_COLS * sizeof(uint16_t) = 140 bytes
+
+#define LINE_UART_TX B0
+#define LINE_UART_RX B1
+
+#define LINE_BT_UART_TX A4  // Master TX, BLE RX
+#define LINE_BT_UART_RX A5  // Master RX, BLE TX
+
+// outputs (rows are pulled low)
+#define MATRIX_ROW_PINS \
+    { B5, B4, B3, B2, D1 }
+
+// inputs (columns are sampled)
+#define MATRIX_COL_PINS \
+    { C4, C5, D0, B15, C11, A15, C12, C13, A8, A10, A11, A14, D2, D3 }
diff --git a/keyboards/annepro2/c18/readme.md b/keyboards/annepro2/c18/readme.md
new file mode 100644
index 0000000000..f2e2fc45b8
--- /dev/null
+++ b/keyboards/annepro2/c18/readme.md
@@ -0,0 +1 @@
+AnnePro2, ANSI C18 version.
diff --git a/keyboards/annepro2/c18/rules.mk b/keyboards/annepro2/c18/rules.mk
new file mode 100644
index 0000000000..b2e16cc35f
--- /dev/null
+++ b/keyboards/annepro2/c18/rules.mk
@@ -0,0 +1,37 @@
+# Anne Pro 2
+SRC = \
+	matrix.c \
+	annepro2_ble.c \
+	ap2_led.c \
+	protocol.c
+
+# MCU
+MCU = cortex-m0plus
+ARMV = 6
+USE_FPU = no
+MCU_FAMILY = HT32
+MCU_SERIES = HT32F523xx
+MCU_LDSCRIPT = HT32F52342_ANNEPRO2
+MCU_STARTUP = ht32f523xx
+
+BOARD = ANNEPRO2_C18
+
+# Options
+
+# Keys
+CUSTOM_MATRIX = lite
+NKRO_ENABLE = no
+MOUSEKEY_ENABLE = no
+EXTRAKEY_ENABLE = yes
+KEY_LOCK_ENABLE = no
+
+# Other featues
+BOOTMAGIC_ENABLE = yes
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no
+RAW_ENABLE = no
+MIDI_ENABLE = no
+VIRTSER_ENABLE = no
+COMBO_ENABLE = no
+BOOTLOADER = custom
+PROGRAM_CMD = annepro2_tools --boot $(BUILD_DIR)/$(TARGET).bin
diff --git a/keyboards/annepro2/chconf.h b/keyboards/annepro2/chconf.h
new file mode 100644
index 0000000000..51fe38cf27
--- /dev/null
+++ b/keyboards/annepro2/chconf.h
@@ -0,0 +1,31 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/annepro2/chconf.h -r platforms/chibios/common/configs/chconf.h`
+ */
+
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 1000
+
+#define CH_CFG_ST_TIMEDELTA 0
+
+#define CH_CFG_TIME_QUANTUM 20
+
+
+#include_next <chconf.h>
\ No newline at end of file
diff --git a/keyboards/annepro2/halconf.h b/keyboards/annepro2/halconf.h
new file mode 100644
index 0000000000..686b91a7fb
--- /dev/null
+++ b/keyboards/annepro2/halconf.h
@@ -0,0 +1,28 @@
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confmigrate -i keyboards/annepro2/halconf.h -r platforms/chibios/common/configs/halconf.h`
+ */
+
+#pragma once
+
+#define HAL_USE_SERIAL TRUE
+
+#define SERIAL_USB_BUFFERS_SIZE 256
+
+#include_next <halconf.h>
diff --git a/keyboards/annepro2/info.json b/keyboards/annepro2/info.json
new file mode 100644
index 0000000000..8fd515bd10
--- /dev/null
+++ b/keyboards/annepro2/info.json
@@ -0,0 +1,330 @@
+{
+    "keyboard_name": "Anne Pro 2",
+    "url": "https://openannepro.github.io/",
+    "maintainer": "community",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "label": "~",
+                    "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": "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": "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": "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": "Alt",
+                    "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
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/annepro2/keymaps/default-full-caps/config.h b/keyboards/annepro2/keymaps/default-full-caps/config.h
new file mode 100644
index 0000000000..413c5d8dc5
--- /dev/null
+++ b/keyboards/annepro2/keymaps/default-full-caps/config.h
@@ -0,0 +1,20 @@
+ /* Copyright 2021 OpenAnnePro community
+  * 
+  * 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
+
+// Obins stock firmware has something similar to this already enabled, but disabled by default in QMK
+#define PERMISSIVE_HOLD
diff --git a/keyboards/annepro2/keymaps/default-full-caps/keymap.c b/keyboards/annepro2/keymaps/default-full-caps/keymap.c
new file mode 100644
index 0000000000..8ac9211ac4
--- /dev/null
+++ b/keyboards/annepro2/keymaps/default-full-caps/keymap.c
@@ -0,0 +1,120 @@
+ /* Copyright 2021 OpenAnnePro community
+  * 
+  * 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 anne_pro_layers {
+    _BASE_LAYER,
+    _FN1_LAYER,
+    _FN2_LAYER,
+};
+
+// clang-format off
+
+// Key symbols are based on QMK. Use them to remap your keyboard
+/*
+* Layer _BASE_LAYER
+* ,-----------------------------------------------------------------------------------------.
+* | esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
+* |-----------------------------------------------------------------------------------------+
+* | Tab    |  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  |  [  |  ]  |   \    |
+* |-----------------------------------------------------------------------------------------+
+* | Caps    |  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |  '  |    Enter    |
+* |-----------------------------------------------------------------------------------------+
+* | Shift      |  z  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |    Shift       |
+* |-----------------------------------------------------------------------------------------+
+* | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
+* \-----------------------------------------------------------------------------------------/
+* Layer TAP in _BASE_LAYER
+* ,-----------------------------------------------------------------------------------------.
+* |     |     |     |     |     |     |     |     |     |     |     |     |     |           |
+* |-----------------------------------------------------------------------------------------+
+* |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
+* |-----------------------------------------------------------------------------------------+
+* |         |     |     |     |     |     |     |     |     |     |     |     |             |
+* |-----------------------------------------------------------------------------------------+
+* |            |     |     |     |     |     |     |     |     |     |     |       UP       |
+* |-----------------------------------------------------------------------------------------+
+* |       |       |       |                                 |       |  LEFT | DOWN  | RIGHT |
+* \-----------------------------------------------------------------------------------------/
+*/
+ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE_LAYER] = LAYOUT( /* Base */
+    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+    LT(_FN1_LAYER,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, RSFT_T(KC_UP),
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, LT(_FN1_LAYER,KC_LEFT), LT(_FN2_LAYER,KC_DOWN), RCTL_T(KC_RGHT)
+),
+  /*
+  * Layer _FN1_LAYER
+  * ,-----------------------------------------------------------------------------------------.
+  * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  DELETE   |
+  * |-----------------------------------------------------------------------------------------+
+  * | Tab    |  q  | UP  |  e  |  r  |  t  |  y  |  u  |  i  |  o  | PS | HOME | END |   \    |
+  * |-----------------------------------------------------------------------------------------+
+  * | Esc     |LEFT |DOWN |RIGHT|  f  |  g  |  h  |  j  |  k  |  l  | PGUP|PGDN |    Enter    |
+  * |-----------------------------------------------------------------------------------------+
+  * | Shift      |V-UP |V-DWN|MUTE |  v  |  b  |  n  |  m  |  ,  |INSRT| DEL |    Shift       |
+  * |-----------------------------------------------------------------------------------------+
+  * | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
+  * \-----------------------------------------------------------------------------------------/
+  *
+  */
+ [_FN1_LAYER] = LAYOUT( /* Base */
+    KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
+    KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
+    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
+    KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN2_LAYER), KC_TRNS
+),
+  /*
+  * Layer _FN2_LAYER
+  * ,-----------------------------------------------------------------------------------------.
+  * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 |  F7 |LEDOF|LEDON| F10 | F11 | F12 |    Bksp   |
+  * |-----------------------------------------------------------------------------------------+
+  * | Tab    |  q  | UP  |  e  |  r  |  t  |  y  |  u  |  i  |  o  | PS | HOME | END |   \    |
+  * |-----------------------------------------------------------------------------------------+
+  * | Esc     |LEFT |DOWN |RIGHT|  f  |  g  |  h  |  j  |  k  |  l  | PGUP|PGDN |    Enter    |
+  * |-----------------------------------------------------------------------------------------+
+  * | Shift      |  z  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |INSRT| DEL |    Shift       |
+  * |-----------------------------------------------------------------------------------------+
+  * | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
+  * \-----------------------------------------------------------------------------------------/
+  *
+  */
+ [_FN2_LAYER] = LAYOUT( /* Base */
+    KC_TRNS, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, KC_TRNS, KC_TRNS, KC_TRNS, KC_AP_LED_OFF, KC_AP_LED_ON, KC_AP_LED_NEXT_INTENSITY, KC_AP_LED_SPEED, KC_TRNS, KC_TRNS,
+    MO(_FN2_LAYER), KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
+    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN1_LAYER), MO(_FN2_LAYER), KC_TRNS
+ ),
+};
+
+// clang-format on
+
+// The function to handle the caps lock logic
+bool led_update_user(led_t leds) {
+    if (leds.caps_lock) {
+        // Set the leds to red
+        annepro2LedSetForegroundColor(0xFF, 0x00, 0x00);
+    } else {
+        annepro2LedResetForegroundColor();
+    }
+
+    return true;
+}
diff --git a/keyboards/annepro2/keymaps/default-layer-indicators/config.h b/keyboards/annepro2/keymaps/default-layer-indicators/config.h
new file mode 100644
index 0000000000..413c5d8dc5
--- /dev/null
+++ b/keyboards/annepro2/keymaps/default-layer-indicators/config.h
@@ -0,0 +1,20 @@
+ /* Copyright 2021 OpenAnnePro community
+  * 
+  * 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
+
+// Obins stock firmware has something similar to this already enabled, but disabled by default in QMK
+#define PERMISSIVE_HOLD
diff --git a/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c b/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
new file mode 100644
index 0000000000..ac2b421d06
--- /dev/null
+++ b/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
@@ -0,0 +1,147 @@
+ /* Copyright 2021 OpenAnnePro community
+  * 
+  * 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 anne_pro_layers {
+    _BASE_LAYER,
+    _FN1_LAYER,
+    _FN2_LAYER,
+};
+
+// clang-format off
+
+// Key symbols are based on QMK. Use them to remap your keyboard
+/*
+* Layer _BASE_LAYER
+* ,-----------------------------------------------------------------------------------------.
+* | esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
+* |-----------------------------------------------------------------------------------------+
+* | Tab    |  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  |  [  |  ]  |   \    |
+* |-----------------------------------------------------------------------------------------+
+* | Caps    |  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |  '  |    Enter    |
+* |-----------------------------------------------------------------------------------------+
+* | Shift      |  z  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |    Shift       |
+* |-----------------------------------------------------------------------------------------+
+* | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
+* \-----------------------------------------------------------------------------------------/
+* Layer TAP in _BASE_LAYER
+* ,-----------------------------------------------------------------------------------------.
+* |     |     |     |     |     |     |     |     |     |     |     |     |     |           |
+* |-----------------------------------------------------------------------------------------+
+* |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
+* |-----------------------------------------------------------------------------------------+
+* |         |     |     |     |     |     |     |     |     |     |     |     |             |
+* |-----------------------------------------------------------------------------------------+
+* |            |     |     |     |     |     |     |     |     |     |     |       UP       |
+* |-----------------------------------------------------------------------------------------+
+* |       |       |       |                                 |       |  LEFT | DOWN  | RIGHT |
+* \-----------------------------------------------------------------------------------------/
+*/
+ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE_LAYER] = LAYOUT( /* Base */
+    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+    LT(_FN1_LAYER,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, RSFT_T(KC_UP),
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, LT(_FN1_LAYER,KC_LEFT), LT(_FN2_LAYER,KC_DOWN), RCTL_T(KC_RGHT)
+),
+  /*
+  * Layer _FN1_LAYER
+  * ,-----------------------------------------------------------------------------------------.
+  * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  DELETE   |
+  * |-----------------------------------------------------------------------------------------+
+  * | Tab    |  q  | UP  |  e  |  r  |  t  |  y  |  u  |  i  |  o  | PS | HOME | END |   \    |
+  * |-----------------------------------------------------------------------------------------+
+  * | Esc     |LEFT |DOWN |RIGHT|  f  |  g  |  h  |  j  |  k  |  l  | PGUP|PGDN |    Enter    |
+  * |-----------------------------------------------------------------------------------------+
+  * | Shift      |V-UP |V-DWN|MUTE |  v  |  b  |  n  |  m  |  ,  |INSRT| DEL |    Shift       |
+  * |-----------------------------------------------------------------------------------------+
+  * | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
+  * \-----------------------------------------------------------------------------------------/
+  *
+  */
+ [_FN1_LAYER] = LAYOUT( /* Base */
+    KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
+    KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
+    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
+    KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN2_LAYER), KC_TRNS
+),
+  /*
+  * Layer _FN2_LAYER
+  * ,-----------------------------------------------------------------------------------------.
+  * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 |  F7 |LEDOF|LEDON| F10 | F11 | F12 |    Bksp   |
+  * |-----------------------------------------------------------------------------------------+
+  * | Tab    |  q  | UP  |  e  |  r  |  t  |  y  |  u  |  i  |  o  | PS | HOME | END |   \    |
+  * |-----------------------------------------------------------------------------------------+
+  * | Esc     |LEFT |DOWN |RIGHT|  f  |  g  |  h  |  j  |  k  |  l  | PGUP|PGDN |    Enter    |
+  * |-----------------------------------------------------------------------------------------+
+  * | Shift      |  z  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |INSRT| DEL |    Shift       |
+  * |-----------------------------------------------------------------------------------------+
+  * | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
+  * \-----------------------------------------------------------------------------------------/
+  *
+  */
+ [_FN2_LAYER] = LAYOUT( /* Base */
+    KC_TRNS, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, KC_TRNS, KC_TRNS, KC_TRNS, KC_AP_LED_OFF, KC_AP_LED_ON, KC_AP_LED_NEXT_INTENSITY, KC_AP_LED_SPEED, KC_TRNS, KC_TRNS,
+    MO(_FN2_LAYER), KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
+    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN1_LAYER), MO(_FN2_LAYER), KC_TRNS
+ ),
+};
+
+// clang-format on
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+        case _FN1_LAYER:
+            // Set the leds to green
+            annepro2LedSetForegroundColor(0x00, 0xFF, 0x00);
+            break;
+        case _FN2_LAYER:
+            // Set the leds to blue
+            annepro2LedSetForegroundColor(0x00, 0x00, 0xFF);
+            break;
+        default:
+            // Reset back to the current profile
+            annepro2LedResetForegroundColor();
+            break;
+    }
+    return state;
+}
+
+// The function to handle the caps lock logic
+// It's called after the capslock changes state or after entering layers 1 and 2.
+bool led_update_user(led_t leds) {
+    if (leds.caps_lock) {
+        // Set the caps-lock to red
+        const annepro2Led_t color = {.p.red = 0xff, .p.green = 0x00, .p.blue = 0x00, .p.alpha = 0xff};
+
+        annepro2LedMaskSetKey(2, 0, color);
+        /* NOTE: Instead of colouring the capslock only, you can change the whole
+           keyboard with annepro2LedSetForegroundColor */
+    } else {
+        // Reset the capslock if there is no layer active
+        if (!layer_state_is(_FN1_LAYER) && !layer_state_is(_FN2_LAYER)) {
+            const annepro2Led_t color = {.p.red = 0xff, .p.green = 0x00, .p.blue = 0x00, .p.alpha = 0x00};
+            annepro2LedMaskSetKey(2, 0, color);
+        }
+    }
+
+    return true;
+}
diff --git a/keyboards/annepro2/keymaps/default/config.h b/keyboards/annepro2/keymaps/default/config.h
new file mode 100644
index 0000000000..413c5d8dc5
--- /dev/null
+++ b/keyboards/annepro2/keymaps/default/config.h
@@ -0,0 +1,20 @@
+ /* Copyright 2021 OpenAnnePro community
+  * 
+  * 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
+
+// Obins stock firmware has something similar to this already enabled, but disabled by default in QMK
+#define PERMISSIVE_HOLD
diff --git a/keyboards/annepro2/keymaps/default/keymap.c b/keyboards/annepro2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a984b05830
--- /dev/null
+++ b/keyboards/annepro2/keymaps/default/keymap.c
@@ -0,0 +1,106 @@
+ /* Copyright 2021 OpenAnnePro community
+  * 
+  * 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 anne_pro_layers {
+    _BASE_LAYER,
+    _FN1_LAYER,
+    _FN2_LAYER,
+};
+
+// clang-format off
+// Key symbols are based on QMK. Use them to remap your keyboard
+/*
+* Layer _BASE_LAYER
+* ,-----------------------------------------------------------------------------------------.
+* | esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
+* |-----------------------------------------------------------------------------------------+
+* | Tab    |  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  |  [  |  ]  |   \    |
+* |-----------------------------------------------------------------------------------------+
+* | Caps    |  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |  '  |    Enter    |
+* |-----------------------------------------------------------------------------------------+
+* | Shift      |  z  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |    Shift       |
+* |-----------------------------------------------------------------------------------------+
+* | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
+* \-----------------------------------------------------------------------------------------/
+* Layer TAP in _BASE_LAYER
+* ,-----------------------------------------------------------------------------------------.
+* |     |     |     |     |     |     |     |     |     |     |     |     |     |           |
+* |-----------------------------------------------------------------------------------------+
+* |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
+* |-----------------------------------------------------------------------------------------+
+* |         |     |     |     |     |     |     |     |     |     |     |     |             |
+* |-----------------------------------------------------------------------------------------+
+* |            |     |     |     |     |     |     |     |     |     |     |       UP       |
+* |-----------------------------------------------------------------------------------------+
+* |       |       |       |                                 |       |  LEFT | DOWN  | RIGHT |
+* \-----------------------------------------------------------------------------------------/
+*/
+ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE_LAYER] = LAYOUT( /* Base */
+    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+    LT(_FN1_LAYER,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, RSFT_T(KC_UP),
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, LT(_FN1_LAYER,KC_LEFT), LT(_FN2_LAYER,KC_DOWN), RCTL_T(KC_RGHT)
+),
+  /*
+  * Layer _FN1_LAYER
+  * ,-----------------------------------------------------------------------------------------.
+  * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  DELETE   |
+  * |-----------------------------------------------------------------------------------------+
+  * | Tab    |  q  | UP  |  e  |  r  |  t  |  y  |  u  |  i  |  o  | PS | HOME | END |   \    |
+  * |-----------------------------------------------------------------------------------------+
+  * | Esc     |LEFT |DOWN |RIGHT|  f  |  g  |  h  |  j  |  k  |  l  | PGUP|PGDN |    Enter    |
+  * |-----------------------------------------------------------------------------------------+
+  * | Shift      |V-UP |V-DWN|MUTE |  v  |  b  |  n  |  m  |  ,  |INSRT| DEL |    Shift       |
+  * |-----------------------------------------------------------------------------------------+
+  * | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
+  * \-----------------------------------------------------------------------------------------/
+  *
+  */
+ [_FN1_LAYER] = LAYOUT( /* Base */
+    KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
+    KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
+    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
+    KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN2_LAYER), KC_TRNS
+),
+  /*
+  * Layer _FN2_LAYER
+  * ,-----------------------------------------------------------------------------------------.
+  * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 |  F7 |LEDOF|LEDON| F10 | F11 | F12 |    Bksp   |
+  * |-----------------------------------------------------------------------------------------+
+  * | Tab    |  q  | UP  |  e  |  r  |  t  |  y  |  u  |  i  |  o  | PS | HOME | END |   \    |
+  * |-----------------------------------------------------------------------------------------+
+  * | Esc     |LEFT |DOWN |RIGHT|  f  |  g  |  h  |  j  |  k  |  l  | PGUP|PGDN |    Enter    |
+  * |-----------------------------------------------------------------------------------------+
+  * | Shift      |  z  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |INSRT| DEL |    Shift       |
+  * |-----------------------------------------------------------------------------------------+
+  * | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
+  * \-----------------------------------------------------------------------------------------/
+  *
+  */
+ [_FN2_LAYER] = LAYOUT( /* Base */
+    KC_TRNS, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, KC_TRNS, KC_TRNS, KC_TRNS, KC_AP_LED_OFF, KC_AP_LED_ON, KC_AP_LED_NEXT_INTENSITY, KC_AP_LED_SPEED, KC_TRNS, KC_TRNS,
+    MO(_FN2_LAYER), KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
+    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN1_LAYER), MO(_FN2_LAYER), KC_TRNS
+ ),
+};
+// clang-format on
diff --git a/keyboards/annepro2/ld/HT32F52342_ANNEPRO2.ld b/keyboards/annepro2/ld/HT32F52342_ANNEPRO2.ld
new file mode 100644
index 0000000000..544400b948
--- /dev/null
+++ b/keyboards/annepro2/ld/HT32F52342_ANNEPRO2.ld
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2013-2016 Fabio UJonathan A. Kollaschtzig, http://fabioutzig.com
+ *           (c) 2020 Yaotian Feng (Codetector) <codetector@codetector.cn>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*
+ * HT32F52342 w/ Anne Pro 2 bootloader memory setup.
+ */
+MEMORY {
+    flash0   : org = 0x00004000, len = 64k - 16k       /* firmware */
+    flash1   : org = 0x00000000, len = 0
+    flash2   : org = 0x00000000, len = 0
+    flash3   : org = 0x00000000, len = 0
+    flash4   : org = 0x00000000, len = 0
+    flash5   : org = 0x00000000, len = 0
+    flash6   : org = 0x00000000, len = 0
+    flash7   : org = 0x00000000, len = 0
+    ram0     : org = 0x20000000, len = 8k - 4          /* RAM */
+    ram1     : org = 0x00000000, len = 0
+    ram2     : org = 0x00000000, len = 0
+    ram3     : org = 0x00000000, len = 0
+    ram4     : org = 0x00000000, len = 0
+    ram5     : org = 0x00000000, len = 0
+    ram6     : org = 0x00000000, len = 0
+    ram7     : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
diff --git a/keyboards/annepro2/matrix.c b/keyboards/annepro2/matrix.c
new file mode 100644
index 0000000000..a1585e4ddf
--- /dev/null
+++ b/keyboards/annepro2/matrix.c
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2018 Charlie Waters
+ *
+ * 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 <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <hal.h>
+#include "timer.h"
+#include "wait.h"
+#include "print.h"
+#include "matrix.h"
+#include "annepro2.h"
+
+pin_t row_list[MATRIX_ROWS] = MATRIX_ROW_PINS;
+pin_t col_list[MATRIX_COLS] = MATRIX_COL_PINS;
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool matrix_has_changed = false;
+    // cache of input ports for columns
+    static uint16_t port_cache[4];
+    // scan each row
+    for (int row = 0; row < MATRIX_ROWS; row++) {
+        palClearLine(row_list[row]);
+        __NOP();
+        __NOP();
+        __NOP();
+        __NOP();
+        // read i/o ports
+        port_cache[0] = palReadPort(IOPORTA);
+        port_cache[1] = palReadPort(IOPORTB);
+        port_cache[2] = palReadPort(IOPORTC);
+        port_cache[3] = palReadPort(IOPORTD);
+        palSetLine(row_list[row]);
+
+        // get columns from ports
+        matrix_row_t data = 0;
+        for (int col = 0; col < MATRIX_COLS; ++col) {
+            pin_t line = col_list[col];
+            uint16_t port = port_cache[HT32_PAL_IDX(PAL_PORT(line))];
+            data |= (((port & (1 << PAL_PAD(line))) ? 0 : 1) << col);
+        }
+
+        if (current_matrix[row] != data) {
+            current_matrix[row] = data;
+            matrix_has_changed  = true;
+        }
+    }
+    return matrix_has_changed;
+}
\ No newline at end of file
diff --git a/keyboards/annepro2/mcuconf.h b/keyboards/annepro2/mcuconf.h
new file mode 100644
index 0000000000..8265fe6eb9
--- /dev/null
+++ b/keyboards/annepro2/mcuconf.h
@@ -0,0 +1,62 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+#pragma once
+
+#include "nvic.h"
+
+#define HT32F52342_MCUCONF
+
+/*
+ * HAL driver system settings.
+ */
+
+/*
+ * Clock configuration.
+ */
+
+// This configuration:
+// 8 MHz HSE crystal
+// PLL multiplies HSE to 48 MHz core and peripheral clock
+// 48 MHz to UART
+// 48 MHz to USB
+
+#define HT32_CK_HSE_FREQUENCY 8000000UL  // 8 MHz
+#define HT32_CKCU_SW CKCU_GCCR_SW_PLL
+#define HT32_PLL_USE_HSE TRUE
+#define HT32_PLL_FBDIV 6  // 8 MHz -> 48 MHz
+#define HT32_PLL_OTDIV 0
+#define HT32_AHB_PRESCALER 1    // 48 MHz -> 48 MHz
+#define HT32_USART_PRESCALER 1  // 48 MHz
+#define HT32_USB_PRESCALER 1    // 48 MHz -> 48 MHz
+// SysTick uses processor clock at 48MHz
+#define HT32_ST_USE_HCLK TRUE
+
+/*
+ * Peripheral driver settings
+ */
+
+#define HT32_SERIAL_USE_USART0 TRUE
+#define HT32_USART0_IRQ_PRIORITY 6
+
+#define HT32_SERIAL_USE_USART1 TRUE
+#define HT32_USART1_IRQ_PRIORITY 7
+
+/*
+ * USB driver settings
+ */
+
+#define HT32_USB_USE_USB0 TRUE
+#define HT32_USB_USB0_IRQ_PRIORITY 5
diff --git a/keyboards/annepro2/protocol.c b/keyboards/annepro2/protocol.c
new file mode 100644
index 0000000000..171ac5c239
--- /dev/null
+++ b/keyboards/annepro2/protocol.c
@@ -0,0 +1,116 @@
+/*
+ * (c) 2021 by Tomasz bla Fortuna
+ * License: GPLv2
+ *
+ * This file is shared with the Shine firmware. Keep it in sync (and in the
+ * shine's clang formatting).
+ *
+ * Implementation of a robust serial protocol which can handle single dropped
+ * characters during transit without locking.
+ *
+ * At 115200, transmitting the shortest message takes 0.043ms, at 9600 - 0.52ms.
+ *
+ */
+
+#include "protocol.h"
+#include "board.h"
+#include "ch.h"
+#include "hal.h"
+
+/* UART communication protocol state */
+protocol_t proto;
+
+void protoInit(protocol_t *proto, void (*callback)(const message_t *)) {
+    proto->previousId = 0;
+    proto->callback   = callback;
+    proto->state      = STATE_SYNC_1;
+    proto->errors     = 0;
+}
+
+static uint8_t msgId = 0;
+void           protoTx(uint8_t cmd, const unsigned char *buf, int payloadSize, int retries) {
+    chDbgCheck(payloadSize <= MAX_PAYLOAD_SIZE);
+
+    const uint8_t header[5] = {
+        0x7A, 0x1D, cmd, ++msgId, payloadSize,
+    };
+
+    /* We don't implement ACKs, yet some messages should not be lost. */
+    for (int i = 0; i < retries; i++) {
+        sdWrite(&PROTOCOL_SD, header, sizeof(header));
+        if (payloadSize) sdWrite(&PROTOCOL_SD, buf, payloadSize);
+    }
+}
+
+static inline void messageReceived(protocol_t *proto) {
+    if (proto->buffer.msgId != proto->previousId) {
+        /* It's not a resend / duplicate */
+        proto->callback(&proto->buffer);
+        proto->previousId = proto->buffer.msgId;
+    }
+    proto->state = STATE_SYNC_1;
+}
+
+void protoConsume(protocol_t *proto, uint8_t byte) {
+    switch (proto->state) {
+        case STATE_SYNC_1:
+            if (byte == 0x7A) {
+                proto->state = STATE_SYNC_2;
+            } else {
+                proto->errors++;
+            }
+            return;
+
+        case STATE_SYNC_2:
+            if (byte == 0x1D) {
+                proto->state = STATE_CMD;
+            } else {
+                proto->state = STATE_SYNC_1;
+                proto->errors++;
+            }
+            return;
+
+        case STATE_CMD:
+            proto->buffer.command = byte;
+            proto->state          = STATE_ID;
+            return;
+
+        case STATE_ID:
+            proto->buffer.msgId = byte;
+            proto->state        = STATE_PAYLOAD_SIZE;
+            return;
+
+        case STATE_PAYLOAD_SIZE:
+            proto->buffer.payloadSize = byte;
+            if (proto->buffer.payloadSize > MAX_PAYLOAD_SIZE) {
+                proto->buffer.payloadSize = MAX_PAYLOAD_SIZE;
+                proto->errors++;
+            }
+            proto->payloadPosition = 0;
+            if (proto->buffer.payloadSize == 0) {
+                /* No payload - whole message received */
+                messageReceived(proto);
+            } else {
+                proto->state = STATE_PAYLOAD;
+            }
+            return;
+
+        case STATE_PAYLOAD:
+            /* NOTE: This could be read with sdReadTimeout probably, but that breaks
+             * abstraction */
+            proto->buffer.payload[proto->payloadPosition] = byte;
+            proto->payloadPosition++;
+            if (proto->payloadPosition == proto->buffer.payloadSize) {
+                /* Payload read - message received */
+                messageReceived(proto);
+            }
+            return;
+    }
+}
+
+void protoSilence(protocol_t *proto) {
+    if (proto->state != STATE_SYNC_1) {
+        proto->state = STATE_SYNC_1;
+        proto->errors++;
+    }
+}
diff --git a/keyboards/annepro2/protocol.h b/keyboards/annepro2/protocol.h
new file mode 100644
index 0000000000..d1a05683c8
--- /dev/null
+++ b/keyboards/annepro2/protocol.h
@@ -0,0 +1,111 @@
+/*
+ * (c) 2021 by Tomasz bla Fortuna
+ * License: GPLv2
+ *
+ * This file is shared with the Shine firmware. Keep it in sync (and in the
+ * shine's clang formatting).
+ */
+
+#pragma once
+#include <stdint.h>
+
+#define PROTOCOL_SD SD0
+
+enum {
+    /*
+     * Main -> LED
+     */
+    /* Basic config */
+    CMD_LED_ON  = 0x01,
+    CMD_LED_OFF = 0x02,
+
+    CMD_LED_SET_PROFILE  = 0x03,
+    CMD_LED_NEXT_PROFILE = 0x04,
+    CMD_LED_PREV_PROFILE = 0x05,
+
+    CMD_LED_NEXT_INTENSITY       = 0x06,
+    CMD_LED_NEXT_ANIMATION_SPEED = 0x07,
+
+    /* Masks */
+    /* Override a key color, eg. capslock */
+    CMD_LED_MASK_SET_KEY = 0x10,
+    /* Override all keys in a row with configurable colors */
+    CMD_LED_MASK_SET_ROW = 0x11,
+
+    /* Override all keys with single color (eg. foreground color) */
+    CMD_LED_MASK_SET_MONO = 0x12,
+
+    /* Reactive / status */
+    CMD_LED_GET_STATUS = 0x20,
+    CMD_LED_KEY_BLINK  = 0x21,
+    CMD_LED_KEY_DOWN   = 0x22,
+    CMD_LED_KEY_UP     = 0x23, /* TODO */
+    CMD_LED_IAP        = 0x24,
+
+    /* LED -> Main */
+    /* Payload with data to send over HID */
+    CMD_LED_DEBUG = 0x40,
+
+    /* Number of profiles, current profile, on/off state,
+       reactive flag, brightness, errors */
+    CMD_LED_STATUS = 0x41,
+};
+
+/* 1 ROW * 14 COLS * 4B (RGBX) = 56 + header prefix. */
+#define MAX_PAYLOAD_SIZE 64
+
+/** Enum of the states used for the serial protocol finite-state automaton */
+enum protoState {
+    /* 2-byte initial start-of-message sync */
+    STATE_SYNC_1,
+    STATE_SYNC_2,
+    /* Waiting for command byte */
+    STATE_CMD,
+    /* Waiting for ID byte */
+    STATE_ID,
+    /* Waiting for payload size */
+    STATE_PAYLOAD_SIZE,
+    /* Reading payload until payloadPosition == payloadSize */
+    STATE_PAYLOAD,
+};
+
+/* Buffer holding a single message */
+typedef struct {
+    uint8_t command;
+    uint8_t msgId;
+    uint8_t payloadSize;
+    uint8_t payload[MAX_PAYLOAD_SIZE];
+} message_t;
+
+/* Internal protocol state */
+typedef struct {
+    /* Callback to call upon receiving a valid message */
+    void (*callback)(const message_t *);
+
+    /* Number of read payload bytes */
+    uint8_t payloadPosition;
+
+    /* Current finite-state-automata state */
+    enum protoState state;
+
+    uint8_t previousId;
+    uint8_t errors;
+
+    /* Currently received message */
+    message_t buffer;
+} protocol_t;
+
+/* NOTE: This didn't work when defined on stack */
+extern protocol_t proto;
+
+/* Init state */
+extern void protoInit(protocol_t *proto, void (*callback)(const message_t *));
+
+/* Consume one byte and push state forward - might call the callback */
+extern void protoConsume(protocol_t *proto, uint8_t byte);
+
+/* Prolonged silence - reset state */
+extern void protoSilence(protocol_t *proto);
+
+/* Transmit message */
+extern void protoTx(uint8_t cmd, const unsigned char *buf, int payloadSize, int retries);
diff --git a/keyboards/annepro2/readme.md b/keyboards/annepro2/readme.md
new file mode 100644
index 0000000000..e3e0b95be4
--- /dev/null
+++ b/keyboards/annepro2/readme.md
@@ -0,0 +1,50 @@
+# Anne Pro 2 rev. C15 and C18 QMK firmware
+
+## Introduction
+
+This is the QMK firmware repository for the Anne Pro 2 rev. C15 and C18 keyboard.
+
+## Layouts
+
+Keyboard has 60% ANSI standard layout.
+
+## How to compile
+
+After setting up your build environment, you can compile the Anne Pro 2 C18 default keymap by using:
+
+    make annepro2/c18:default
+
+If you want to compile the Anne Pro 2 C15 default keymap use:
+
+    make annepro2/c15:default
+
+## Installing
+
+### Get AnnePro2 Tools
+
+If you want the executable instead of compiling it yourself, [download it here](https://ci.codetector.org/job/OpenAnnePro/job/AnnePro2-Tools/job/master/).
+Windows and Linux versions are available. Otherwise, follow the steps below:
+
+0. Install the latest stable `rust` toolchain using [rustup](https://rustup.rs/)
+0. Also install [Visual Studio Community edition](https://visualstudio.microsoft.com/downloads/)
+including the C/C++ module to prevent errors while compiling
+0. Download or Clone the [AnnePro2-Tools](https://github.com/OpenAnnePro/AnnePro2-Tools) project.
+0. Compile the tool using
+```bash
+cargo build --release
+```
+0. The compiled tool should be in `./target/release/annepro2_tools` (In later I will refer to this as `annepro2_tools`)
+
+### Flashing the firmware
+0. Put the keyboard into DFU/IAP mode by unplugging the keyboard, then holding ESC while plugging it back in.
+0. Run annepro2_tools with the firmware you just built.
+
+**Please substitute with the correct paths and correct bin file if you chose another keymap profile**
+```bash
+annepro2_tools annepro2_c15_default.bin
+```
+
+If the tool can't find the keyboard please double check you have the keyboard in IAP mode.
+
+
+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).
\ No newline at end of file

From 59954322025b7f7bea4b7dc08148b5702f08e030 Mon Sep 17 00:00:00 2001
From: FearlessSpiff <fearless.spiff@me.com>
Date: Tue, 8 Mar 2022 03:17:30 +0100
Subject: [PATCH 750/867] [Keymap] add mouse controls to Mechwilds Mercutio
 FearlessSpiff  (#16566)

---
 .../mercutio/keymaps/fearless_spiff/config.h  |  9 ++++++++
 .../mercutio/keymaps/fearless_spiff/keymap.c  | 22 +++++++++++++------
 .../mercutio/keymaps/fearless_spiff/readme.md |  7 +++++-
 .../mercutio/keymaps/fearless_spiff/rules.mk  |  2 +-
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h
index 9d588ed8c0..f29c91f9e0 100644
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/config.h
@@ -17,3 +17,12 @@
 #pragma once
 
 #define TAPPING_TERM 180
+
+#define MK_KINETIC_SPEED
+#define MOUSEKEY_DELAY 8
+#define MOUSEKEY_INTERVAL 5
+#define MOUSEKEY_MOVE_DELTA 1
+#define MOUSEKEY_INITIAL_SPEED 3
+#define MOUSEKEY_BASE_SPEED 120
+#define MOUSEKEY_DECELERATED_SPEED 100
+#define MOUSEKEY_ACCELERATED_SPEED 1000
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
index ada92103c3..36dcd4816f 100644
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/keymap.c
@@ -36,7 +36,8 @@
 enum layers {
   QWERT,
   FN_1,
-  FN_2
+  FN_2,
+  FN_MOUSE
 };
 
 enum custom_user_keycodes {
@@ -105,26 +106,33 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [QWERT] = LAYOUT_all(
+    [QWERT] = LAYOUT_all(
                                                                                                                       KC_ENC,
           TD(TD_TAB_ESC),   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    DE_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-          MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    DE_PLUS,          KC_ENT,
+          MO(FN_1), KC_A,   KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    DE_PLUS,          KC_ENT,
           KC_LSFT, DE_LABK, DE_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,           KC_RSFT,
-          KC_LCTL, KC_LGUI, KC_LALT,   LT(2,KC_SPC),  LT(2,KC_SPC),   LT(2,KC_SPC),        KC_RALT, DE_MINS,          KC_RCTL ),
+          KC_LCTL, KC_LGUI, KC_LALT,   LT(FN_2,KC_SPC),   LT(FN_2,KC_SPC),     LT(FN_2,KC_SPC),      KC_RALT, DE_MINS,          KC_RCTL ),
 
     [FN_1] = LAYOUT_all(
                                                                                                                        KC_MUTE,
     	  KC_GESC,          _______, _______, _______, DE_LCBR, DE_RCBR, _______, DE_UDIA, KC_UP,    DE_ODIA, DE_QUES, KC_DEL,
     	  _______,          DE_ADIA, DE_SS,   _______, DE_LPRN, DE_RPRN, _______, KC_LEFT, KC_DOWN, KC_RIGHT, DE_HASH, _______,
-    	  _______, DE_CIRC, DE_ACUT, _______, _______, DE_LBRC, DE_RBRC, KC_HOME, KC_END,  DE_QUOT,  DE_DQUO,          DE_EQL,
-    	  _______,   _______, _______,          _______, _______,          _______,          DE_BSLS, DE_SLSH,         DE_TILD ),
+    	  _______, _______, DE_CIRC, DE_ACUT, _______, DE_LBRC, DE_RBRC, KC_HOME, KC_END,  DE_QUOT,  DE_DQUO,          DE_EQL,
+    	  _______,   _______, _______,    MO(FN_MOUSE),   MO(FN_MOUSE),       MO(FN_MOUSE),          DE_BSLS, DE_SLSH,         DE_TILD ),
 
     [FN_2] = LAYOUT_all(
                                                                                                                       _______,
     	  KC_F1,            KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_BSPC,
     	  KC_1,             KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______,
     	  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_COMM, KC_DOT,           _______,
-    	  _______, _______, _______,          _______, _______,          _______,          _______, _______,          _______ )
+    	  _______, _______, _______,          _______, _______,          _______,          _______, _______,          _______ ),
+
+    [FN_MOUSE] = LAYOUT_all(
+                                                                                                                      _______,
+          _______,          _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, _______,
+          _______,          _______, _______, _______, KC_ACL0, _______, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______,
+          _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,          _______,
+          _______,   _______, _______,        _______,   _______,        _______,          _______, _______,         _______ )
 };
 
 #ifdef ENCODER_ENABLE
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md
index 33240ffbcd..85b3490608 100644
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/readme.md
@@ -9,16 +9,21 @@ Features
   - Additional encoder functionality 
     - While holding FN_1, page up and down
     - While holding FN_2, volume up and down
+  - Mouse controls by holding Caps-Space
   - Use my templates for your own layout overview at [Keyboard Layout Editor](http://www.keyboard-layout-editor.com) using my gist [here](https://gist.github.com/FearlessSpiff)
+  - Shout out to [KMonad](https://github.com/kmonad/kmonad) which enabled my laptop keyboard to behave like my Mercutio!
 
 QWERT Layer
 ![image](https://user-images.githubusercontent.com/1927259/148683284-04932e15-a34d-451e-b657-335780033f36.png)
 
 FN_1 Layer
-![image](https://user-images.githubusercontent.com/1927259/148683299-f2c80403-3f29-4ba8-9fc4-957729f30b05.png)
+![image](https://user-images.githubusercontent.com/1927259/157032746-8aa68e1c-27b9-4cf5-88ed-a071d8238f56.png)
 
 FN_2 layer
 ![image](https://user-images.githubusercontent.com/1927259/148683306-364bc59c-b41b-4092-b93b-d7b4fc58567b.png)
 
+FN_MOUSE layer
+![image](https://user-images.githubusercontent.com/1927259/157032817-83922578-8932-42bf-a2d2-f785136b4d4e.png)
+
 
 
diff --git a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk
index 16f26944e8..fc0ec28153 100644
--- a/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk
+++ b/keyboards/mechwild/mercutio/keymaps/fearless_spiff/rules.mk
@@ -1,7 +1,7 @@
 WPM_ENABLE = yes
 TAP_DANCE_ENABLE = yes
 VIA_ENABLE = no
-MOUSEKEY_ENABLE = no
+MOUSEKEY_ENABLE = yes
 EXTRAKEY_ENABLE = yes # Audio control and System control
 KEY_LOCK_ENABLE = no
 CONSOLE_ENABLE = no

From 6928bce46185eafde03dc1e0c3fc6a582ad77999 Mon Sep 17 00:00:00 2001
From: yiancar <yiangosyiangou@cytanet.com.cy>
Date: Tue, 8 Mar 2022 02:28:26 +0000
Subject: [PATCH 751/867] [Keyboard] Add Cassini keyboard (#16522)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: yiancar <yiancar@gmail.com>
---
 keyboards/protozoa/cassini/cassini.c          | 21 +++++
 keyboards/protozoa/cassini/cassini.h          | 34 ++++++++
 keyboards/protozoa/cassini/config.h           | 80 +++++++++++++++++++
 keyboards/protozoa/cassini/info.json          | 10 +++
 .../protozoa/cassini/keymaps/default/keymap.c | 32 ++++++++
 .../cassini/keymaps/default/readme.md         |  5 ++
 .../protozoa/cassini/keymaps/via/keymap.c     | 46 +++++++++++
 .../protozoa/cassini/keymaps/via/readme.md    |  5 ++
 .../protozoa/cassini/keymaps/via/rules.mk     |  1 +
 keyboards/protozoa/cassini/readme.md          | 34 ++++++++
 keyboards/protozoa/cassini/rules.mk           | 26 ++++++
 11 files changed, 294 insertions(+)
 create mode 100644 keyboards/protozoa/cassini/cassini.c
 create mode 100644 keyboards/protozoa/cassini/cassini.h
 create mode 100644 keyboards/protozoa/cassini/config.h
 create mode 100644 keyboards/protozoa/cassini/info.json
 create mode 100644 keyboards/protozoa/cassini/keymaps/default/keymap.c
 create mode 100644 keyboards/protozoa/cassini/keymaps/default/readme.md
 create mode 100644 keyboards/protozoa/cassini/keymaps/via/keymap.c
 create mode 100644 keyboards/protozoa/cassini/keymaps/via/readme.md
 create mode 100644 keyboards/protozoa/cassini/keymaps/via/rules.mk
 create mode 100644 keyboards/protozoa/cassini/readme.md
 create mode 100644 keyboards/protozoa/cassini/rules.mk

diff --git a/keyboards/protozoa/cassini/cassini.c b/keyboards/protozoa/cassini/cassini.c
new file mode 100644
index 0000000000..80eb279bf3
--- /dev/null
+++ b/keyboards/protozoa/cassini/cassini.c
@@ -0,0 +1,21 @@
+/* Copyright 2022 Yiancar-Designs
+ *
+ * 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 "cassini.h"
+
+void led_init_ports(void) {
+    // Set our LED pins as open drain outputs
+    palSetLineMode(LED_CAPS_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN);
+}
diff --git a/keyboards/protozoa/cassini/cassini.h b/keyboards/protozoa/cassini/cassini.h
new file mode 100644
index 0000000000..27e91906e9
--- /dev/null
+++ b/keyboards/protozoa/cassini/cassini.h
@@ -0,0 +1,34 @@
+/* Copyright 2022 Yiancar-Designs
+ *
+ * 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 XXX KC_NO
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D       \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D }  \
+}
diff --git a/keyboards/protozoa/cassini/config.h b/keyboards/protozoa/cassini/config.h
new file mode 100644
index 0000000000..cdcef1e0ac
--- /dev/null
+++ b/keyboards/protozoa/cassini/config.h
@@ -0,0 +1,80 @@
+/*
+Copyright 2022 Yiancar-Designs
+
+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       0x8968
+#define PRODUCT_ID      0x4341
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Yiancar-Designs
+#define PRODUCT         Cassini
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define MATRIX_ROW_PINS { A2, B9, B8, B5, B4 }
+#define MATRIX_COL_PINS { A1, B1, B0, A7, A6, A5, A4, A3, B2, B10, B11, B12, B13, B14 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Ensure we jump to bootloader if the RESET keycode was pressed */
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
+/* Indicator LEDs */
+#define LED_CAPS_LOCK_PIN B6
+#define LED_PIN_ON_STATE 0
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/protozoa/cassini/info.json b/keyboards/protozoa/cassini/info.json
new file mode 100644
index 0000000000..be662952e2
--- /dev/null
+++ b/keyboards/protozoa/cassini/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Cassini",
+    "url": "https://yiancar-designs.com",
+    "maintainer": "Yiancar-Designs",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
+        }
+    }
+}
diff --git a/keyboards/protozoa/cassini/keymaps/default/keymap.c b/keyboards/protozoa/cassini/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b631c1f66a
--- /dev/null
+++ b/keyboards/protozoa/cassini/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2022 Yiancar-Designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                           KC_RALT, KC_APP,  KC_RCTL, MO(1)),
+
+    [1] = LAYOUT_all( /* FN */
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_VOLU, KC_VOLD, KC_MUTE,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/protozoa/cassini/keymaps/default/readme.md b/keyboards/protozoa/cassini/keymaps/default/readme.md
new file mode 100644
index 0000000000..b12cdddebd
--- /dev/null
+++ b/keyboards/protozoa/cassini/keymaps/default/readme.md
@@ -0,0 +1,5 @@
+# The default keymap for Cassini.
+
+![Layer 0](https://i.imgur.com/ETGhLKR.png)
+
+![Layer 1](https://i.imgur.com/JgUsHhA.png)
diff --git a/keyboards/protozoa/cassini/keymaps/via/keymap.c b/keyboards/protozoa/cassini/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ebbc577f8d
--- /dev/null
+++ b/keyboards/protozoa/cassini/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2022 Yiancar-Designs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all( /* Base */
+    KC_GESC, KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+    KC_LSFT, KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                           KC_RALT, KC_APP,  KC_RCTL, MO(1)),
+
+[1] = LAYOUT_all( /* FN */
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_VOLU, KC_VOLD, KC_MUTE,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_all( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_all( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/protozoa/cassini/keymaps/via/readme.md b/keyboards/protozoa/cassini/keymaps/via/readme.md
new file mode 100644
index 0000000000..d101a027bb
--- /dev/null
+++ b/keyboards/protozoa/cassini/keymaps/via/readme.md
@@ -0,0 +1,5 @@
+# The default keymap for Cassini. VIA support enabled.
+
+![Layer 0](https://i.imgur.com/ETGhLKR.png)
+
+![Layer 1](https://i.imgur.com/JgUsHhA.png)
\ No newline at end of file
diff --git a/keyboards/protozoa/cassini/keymaps/via/rules.mk b/keyboards/protozoa/cassini/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/protozoa/cassini/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/protozoa/cassini/readme.md b/keyboards/protozoa/cassini/readme.md
new file mode 100644
index 0000000000..7e719a93d2
--- /dev/null
+++ b/keyboards/protozoa/cassini/readme.md
@@ -0,0 +1,34 @@
+# Cassini
+
+This is a standard 60% layout PCB. It supports VIA.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A 60% keyboard with STM32F072CB
+* Hardware Availability: https://protozoa.studio 
+
+![Cassini](https://i.imgur.com/4vYgmRjh.png)
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make protozoa/cassini: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).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or CLI (`make protozoa/cassini:<keymap>:flash`)
diff --git a/keyboards/protozoa/cassini/rules.mk b/keyboards/protozoa/cassini/rules.mk
new file mode 100644
index 0000000000..169c45b479
--- /dev/null
+++ b/keyboards/protozoa/cassini/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -v FFFF -p FFFF
+
+# Do not put the microcontroller into power saving mode
+# when we get USB suspend event. We want it to keep updating
+# backlight effects.
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 8bcac1c8f73ba79a083d69cffaa54a133820de9b Mon Sep 17 00:00:00 2001
From: Steven Karrmann <skarrmann@gmail.com>
Date: Mon, 7 Mar 2022 21:39:58 -0500
Subject: [PATCH 752/867] [Keyboard] Add Morizon (#16549)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/morizon/config.h                 | 46 +++++++++++++
 keyboards/morizon/info.json                | 77 ++++++++++++++++++++++
 keyboards/morizon/keymaps/default/keymap.c | 50 ++++++++++++++
 keyboards/morizon/morizon.c                | 17 +++++
 keyboards/morizon/morizon.h                | 48 ++++++++++++++
 keyboards/morizon/readme.md                | 27 ++++++++
 keyboards/morizon/rules.mk                 | 18 +++++
 7 files changed, 283 insertions(+)
 create mode 100644 keyboards/morizon/config.h
 create mode 100644 keyboards/morizon/info.json
 create mode 100644 keyboards/morizon/keymaps/default/keymap.c
 create mode 100644 keyboards/morizon/morizon.c
 create mode 100644 keyboards/morizon/morizon.h
 create mode 100644 keyboards/morizon/readme.md
 create mode 100644 keyboards/morizon/rules.mk

diff --git a/keyboards/morizon/config.h b/keyboards/morizon/config.h
new file mode 100644
index 0000000000..bf9e1b9a35
--- /dev/null
+++ b/keyboards/morizon/config.h
@@ -0,0 +1,46 @@
+/*
+Copyright 2022 Steven Karrmann
+
+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 Steven Karrmann
+#define PRODUCT      Morizon
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
+#define UNUSED_PINS { F4 }
+
+#define DIODE_DIRECTION COL2ROW
+
+/* 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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/morizon/info.json b/keyboards/morizon/info.json
new file mode 100644
index 0000000000..5e22001c79
--- /dev/null
+++ b/keyboards/morizon/info.json
@@ -0,0 +1,77 @@
+{
+  "keyboard_name": "Morizon",
+  "url": "https://github.com/skarrmann/morizon",
+  "maintainer": "Steven Karrmann",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        { "x": 0, "y": 0 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
+        { "x": 8, "y": 0 },
+        { "x": 9, "y": 0 },
+        { "x": 10, "y": 0 },
+        { "x": 11, "y": 0 },
+        { "x": 12, "y": 0 },
+        { "x": 13, "y": 0 },
+        { "x": 0, "y": 1 },
+        { "x": 1, "y": 1 },
+        { "x": 2, "y": 1 },
+        { "x": 3, "y": 1 },
+        { "x": 4, "y": 1 },
+        { "x": 5, "y": 1 },
+        { "x": 8, "y": 1 },
+        { "x": 9, "y": 1 },
+        { "x": 10, "y": 1 },
+        { "x": 11, "y": 1 },
+        { "x": 12, "y": 1 },
+        { "x": 13, "y": 1 },
+        { "x": 0, "y": 2 },
+        { "x": 1, "y": 2 },
+        { "x": 2, "y": 2 },
+        { "x": 3, "y": 2 },
+        { "x": 4, "y": 2 },
+        { "x": 5, "y": 2 },
+        { "x": 6, "y": 2 },
+        { "x": 7, "y": 2 },
+        { "x": 8, "y": 2 },
+        { "x": 9, "y": 2 },
+        { "x": 10, "y": 2 },
+        { "x": 11, "y": 2 },
+        { "x": 12, "y": 2 },
+        { "x": 13, "y": 2 },
+        { "x": 0, "y": 3 },
+        { "x": 1, "y": 3 },
+        { "x": 2, "y": 3 },
+        { "x": 3, "y": 3 },
+        { "x": 4, "y": 3 },
+        { "x": 5, "y": 3 },
+        { "x": 6, "y": 3 },
+        { "x": 7, "y": 3 },
+        { "x": 8, "y": 3 },
+        { "x": 9, "y": 3 },
+        { "x": 10, "y": 3 },
+        { "x": 11, "y": 3 },
+        { "x": 12, "y": 3 },
+        { "x": 13, "y": 3 },
+        { "x": 0, "y": 4 },
+        { "x": 1, "y": 4 },
+        { "x": 2, "y": 4 },
+        { "x": 3, "y": 4 },
+        { "x": 4, "y": 4 },
+        { "x": 5, "y": 4 },
+        { "x": 6, "y": 4 },
+        { "x": 7, "y": 4 },
+        { "x": 8, "y": 4 },
+        { "x": 9, "y": 4 },
+        { "x": 10, "y": 4 },
+        { "x": 11, "y": 4 },
+        { "x": 12, "y": 4 },
+        { "x": 13, "y": 4 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/morizon/keymaps/default/keymap.c b/keyboards/morizon/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9b7ce4b291
--- /dev/null
+++ b/keyboards/morizon/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2022 Steven Karrmann
+ *
+ * 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 layer_names {
+    _BASE,
+    _SYMBOL,
+    _FUNCTION
+};
+
+#define MO_SYMB MO(_SYMBOL)
+#define MO_FUNC MO(_FUNCTION)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_CLCK, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                   KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSLS,
+        KC_GRV , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   ,                   KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_MINS,
+        KC_EQL , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_LBRC, KC_RBRC, KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_ESC , KC_ENT , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LALT, KC_LGUI, KC_APP , KC_DEL , KC_TAB , MO_SYMB, MO_FUNC, KC_SPC , KC_BSPC, KC_APP , KC_RGUI, KC_RALT, KC_RCTL
+    ),
+    [_SYMBOL] = LAYOUT(
+        _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
+        KC_TILD, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                   KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_UNDS,
+        KC_PLUS, KC_EXLM, KC_LPRN, KC_RPRN, KC_DLR , KC_AMPR, _______, _______, KC_PIPE, KC_HASH, KC_LCBR, KC_RCBR, KC_COLN, KC_DQUO,
+        _______, KC_AT  , KC_LBRC, KC_RBRC, KC_BSLS, KC_PERC, _______, _______, KC_CIRC, KC_ASTR, KC_LABK, KC_RABK, KC_QUES, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [_FUNCTION] = LAYOUT(
+        _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
+        _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_PSCR,                   KC_SLCK, KC_HOME, KC_PGDN, KC_PGUP, KC_END , _______,
+        _______, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_INS , _______, _______, KC_CLCK, KC_LEFT, KC_DOWN, KC_UP  , KC_RGHT, _______,
+        _______, KC_F9  , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
\ No newline at end of file
diff --git a/keyboards/morizon/morizon.c b/keyboards/morizon/morizon.c
new file mode 100644
index 0000000000..1196375cd0
--- /dev/null
+++ b/keyboards/morizon/morizon.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 Steven Karrmann
+ *
+ * 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 "morizon.h"
diff --git a/keyboards/morizon/morizon.h b/keyboards/morizon/morizon.h
new file mode 100644
index 0000000000..a6c84ee502
--- /dev/null
+++ b/keyboards/morizon/morizon.h
@@ -0,0 +1,48 @@
+/* Copyright 2022 Steven Karrmann
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05,           k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15,           k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d  \
+) \
+{ \
+    { k00  , k01, k02, k03, k04, k05, KC_NO }, \
+    { k10  , k11, k12, k13, k14, k15, KC_NO }, \
+    { k20  , k21, k22, k23, k24, k25, k26   }, \
+    { k30  , k31, k32, k33, k34, k35, k36   }, \
+    { k40  , k41, k42, k43, k44, k45, k46   }, \
+    { KC_NO, k06, k07, k08, k09, k0a, k0b   }, \
+    { KC_NO, k16, k17, k18, k19, k1a, k1b   }, \
+    { k27  , k28, k29, k2a, k2b, k2c, k2d   }, \
+    { k37  , k38, k39, k3a, k3b, k3c, k3d   }, \
+    { k47  , k48, k49, k4a, k4b, k4c, k4d   }  \
+}
diff --git a/keyboards/morizon/readme.md b/keyboards/morizon/readme.md
new file mode 100644
index 0000000000..5c95e9788c
--- /dev/null
+++ b/keyboards/morizon/readme.md
@@ -0,0 +1,27 @@
+# Morizon
+
+![Morizon](https://i.imgur.com/2EEP412h.jpg)
+
+A simple 66-key (5x14) ortholinear keyboard, powered by an Arduino Pro Micro. The design is based on the [Horizon keyboard](https://github.com/skarrmann/horizon).
+
+* Keyboard Maintainer: [Steven Karrmann](https://github.com/skarrmann)
+* Hardware Supported: Morizon PCBs, Arduino Pro Micro
+* Hardware Availability: [Morizon GitHub repository](https://github.com/skarrmann/morizon)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make morizon:default
+
+Flashing example for this keyboard:
+
+    make morizon:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard.
+* **Physical reset button**: Briefly press the button on the top center of the PCB.
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available.
diff --git a/keyboards/morizon/rules.mk b/keyboards/morizon/rules.mk
new file mode 100644
index 0000000000..9cfcaf1bbc
--- /dev/null
+++ b/keyboards/morizon/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+COMMAND_ENABLE = no         # Commands for debug and configuration
+CONSOLE_ENABLE = yes        # Console for debug
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From f0d27e22aa8994fd1650680b313b9ae8d03dcb5a Mon Sep 17 00:00:00 2001
From: Umberto Baldi <34278123+umbynos@users.noreply.github.com>
Date: Tue, 8 Mar 2022 03:44:49 +0100
Subject: [PATCH 753/867] [Keyboard] Change vendor ID for sick68 keyboard
 (#16563)

---
 keyboards/handwired/sick68/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/handwired/sick68/config.h b/keyboards/handwired/sick68/config.h
index 65583af18d..2205126cc3 100644
--- a/keyboards/handwired/sick68/config.h
+++ b/keyboards/handwired/sick68/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
+#define VENDOR_ID 0x5E68
 #define PRODUCT_ID 0x5F00
 #define DEVICE_VER 0x0001
 #define MANUFACTURER umbynos

From c84d361e9575e91cca8d0faaa6af1b787c467b40 Mon Sep 17 00:00:00 2001
From: Salicylic-acid3 <46864619+Salicylic-acid3@users.noreply.github.com>
Date: Tue, 8 Mar 2022 11:45:28 +0900
Subject: [PATCH 754/867] [Keyboard] Change maximum LED brightness for naked48
 (#16564)

---
 .../naked48/keymaps/via_rgb_matrix/config.h   | 30 +++++++++++--------
 .../salicylic_acid3/naked48/rev1/config.h     | 22 +-------------
 2 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
index 0920b2bc35..7deffe33ff 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
@@ -28,17 +28,21 @@
 #define DRIVER_LED_TOTAL 48
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
-// #   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 150  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#    define RGB_MATRIX_HUE_STEP 8
-#    define RGB_MATRIX_SAT_STEP 8
-#    define RGB_MATRIX_LIMIT_VAL 50
-#    define RGB_MATRIX_VAL_STEP 5
-#    define RGB_MATRIX_SPD_STEP 10
+  #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+//  #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+//  #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
+//  #define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
+//  #define RGB_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: number of ticks to wait until disabling effects
+  #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+  #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+  #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 255 // 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_LEFT_RIGHT // Sets the default mode, if none has been set
+  #define RGB_MATRIX_STARTUP_HUE 0 // Sets the default hue value, if none has been set
+  #define RGB_MATRIX_STARTUP_SAT 255 // Sets the default saturation value, if none has been set
+  #define RGB_MATRIX_STARTUP_VAL 50 // Sets the default brightness value, if none has been set
+  #define RGB_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set
+//  #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature)
+//  #define RGB_MATRIX_SPLIT { X, Y }     // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
+                                        // If RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
 #endif
-
diff --git a/keyboards/salicylic_acid3/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h
index b79384a48a..faeb719019 100644
--- a/keyboards/salicylic_acid3/naked48/rev1/config.h
+++ b/keyboards/salicylic_acid3/naked48/rev1/config.h
@@ -56,27 +56,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_DEFAULT_VAL 50
 
-#ifndef IOS_DEVICE_ENABLE
-  #define RGBLIGHT_LIMIT_VAL 180
-  #define RGBLIGHT_VAL_STEP 17
-#else
-  #define RGBLIGHT_LIMIT_VAL 50
-  #define RGBLIGHT_VAL_STEP 4
-#endif
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
-
-#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
-// USB_MAX_POWER_CONSUMPTION value for naked48 keyboard
-//  120  RGBoff, OLEDoff
-//  120  OLED
-//  330  RGB 6
-//  300  RGB 32
-//  310  OLED & RGB 32
-  #define USB_MAX_POWER_CONSUMPTION 400
-#else
-  // fix iPhone and iPad power adapter issue
-  // iOS device need lessthan 100
-  #define USB_MAX_POWER_CONSUMPTION 100
-#endif

From 8e888794fa57ba845cf3080d1971d96bccc58521 Mon Sep 17 00:00:00 2001
From: Nabos <9805355+nab-os@users.noreply.github.com>
Date: Tue, 8 Mar 2022 03:46:54 +0100
Subject: [PATCH 755/867] [Keymap] Add nabos keymap to dactyl_manuform (5x6)
 (#16547)

Co-authored-by: Nicolas Ballet <balletn@igbmc.fr>
---
 .../5x6/keymaps/nabos/config.h                | 21 ++++++
 .../5x6/keymaps/nabos/keymap.c                | 75 +++++++++++++++++++
 2 files changed, 96 insertions(+)
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/config.h
 create mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c

diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/config.h
new file mode 100644
index 0000000000..2ab0c912a3
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2022 Nabos <nabos at glargh dot fr>
+
+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 EE_HANDS
+
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
new file mode 100644
index 0000000000..4a83a5e73a
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
@@ -0,0 +1,75 @@
+/*
+Copyright 2022 Nabos <nabos at glargh dot fr>
+
+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 layer_names {
+    _QWERTY,
+    _FUNCTIONS,
+    _NUMPAD,
+    _GAMING
+};
+
+#define FUNCTIONS MO(_FUNCTIONS)
+#define NUMPAD MO(_NUMPAD)
+#define GAMING TG(_GAMING)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT_5x6(
+     KC_GESC, KC_1 , KC_2  ,  KC_3  , KC_4  , KC_5  ,         KC_6     , KC_7  , KC_8  , KC_9 , KC_0  ,KC_RBRC,
+     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_PGUP, KC_A , KC_S  ,  KC_D  , KC_F  , KC_G  ,         KC_H     , KC_J  , KC_K  , KC_L ,KC_SCLN,KC_QUOT,
+     KC_PGDN, KC_Z , KC_X  ,  KC_C  , KC_V  , KC_B  ,         KC_N     , KC_M  ,KC_COMM,KC_DOT,KC_SLSH,_______,
+                    KC_LEFT,KC_RIGHT,                                           KC_DOWN,KC_UP ,
+                                     KC_LSFT,KC_SPC ,         KC_ENT   ,KC_BSPC,
+                                     KC_LGUI,KC_LALT,         FUNCTIONS,KC_RALT,
+                                     KC_DEL ,GAMING ,         NUMPAD   ,KC_RCTL
+  ),
+
+  [_FUNCTIONS] = LAYOUT_5x6(
+     KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,         KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
+     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
+     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
+     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
+                     _______,_______,                                         _______,_______,
+                                     _______,_______,         _______,_______,
+                                     _______,_______,         _______,_______,
+                                     _______,_______,         _______,_______
+  ),
+
+  [_NUMPAD] = LAYOUT_5x6(
+     _______,_______,_______,_______,_______,_______,         _______,KC_NLCK,_______,_______,KC_MINS,KC_EQL ,
+     _______,_______,_______,_______,_______,_______,         _______,KC_KP_7,KC_KP_8,KC_KP_9,_______,_______,
+     _______,_______,_______,_______,_______,_______,         _______,KC_KP_4,KC_KP_5,KC_KP_6,_______,_______,
+     _______,_______,_______,_______,_______,_______,         _______,KC_KP_1,KC_KP_2,KC_KP_3,_______,KC_PSCR,
+                     _______,_______,                                         KC_KP_0,KC_PDOT,
+                                     _______,_______,         KC_PENT,_______,
+                                     _______,_______,         _______,_______,
+                                     _______,_______,         _______,_______
+  ),
+
+  [_GAMING] = LAYOUT_5x6(
+     _______,_______,_______,_______,_______,_______,         _______,_______,_______,_______,_______,_______,
+      KC_T  ,KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  ,         _______,_______,_______,_______,_______,_______,
+      KC_G  ,KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  ,         _______,_______,_______,_______,_______,_______,
+      KC_B  ,KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  ,         _______,_______,_______,_______,_______,_______,
+                     _______,_______,                                         _______,_______,
+                                     _______,_______,         _______,_______,
+                                     _______,_______,         _______,_______,
+                                     _______,_______,         _______,_______
+  )
+};
+

From 8014fb14b6c37636d459f64ebdf9fb4bedd1f7f3 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 8 Mar 2022 10:50:03 +0800
Subject: [PATCH 756/867] Fix in-page links in reference_info_json.md (#16487)

---
 docs/reference_info_json.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index 3cc807c179..51576ac83e 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -28,11 +28,11 @@ The `info.json` file is a JSON formatted dictionary with the following keys avai
 * `layout_aliases`
     * A dictionary containing layout aliases. The key is the alias and the value is a layout in `layouts` it maps to.
 * `layouts`
-    * Physical Layout representations. See the [Layout Format](#layout_format) section for more detail.
+    * Physical Layout representations. See the [Layout Format](#layout-format) section for more detail.
 * `matrix_pins`
-    * Configure the pins corresponding to columns and rows, or direct pins. See the [Matrix Pins](#matrix_pins) section for more detail.
+    * Configure the pins corresponding to columns and rows, or direct pins. See the [Matrix Pins](#matrix-pins) section for more detail.
 * `rgblight`
-    * Configure the [RGB Lighting feature](feature_rgblight.md). See the [RGB Lighting](#rgb_lighting) section for more detail.
+    * Configure the [RGB Lighting feature](feature_rgblight.md). See the [RGB Lighting](#rgb-lighting) section for more detail.
 * `usb`
     * Configure USB VID, PID, and other parameters. See the [USB](#USB) section for more detail.
 

From 869ede8e4afb22a00ecbace4af02a3a18ea9e32d Mon Sep 17 00:00:00 2001
From: Matthew Dias <matthewdias@me.com>
Date: Mon, 7 Mar 2022 21:00:35 -0600
Subject: [PATCH 757/867] [Keyboard] Add parallel 65 (#16445)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../parallel/parallel_65/hotswap/config.h     | 109 +++++
 .../parallel/parallel_65/hotswap/hotswap.c    |  17 +
 .../parallel/parallel_65/hotswap/hotswap.h    |  63 +++
 .../parallel/parallel_65/hotswap/info.json    | 155 ++++++
 .../hotswap/keymaps/default/keymap.c          |  38 ++
 .../hotswap/keymaps/default/readme.md         |   1 +
 .../parallel_65/hotswap/keymaps/via/keymap.c  |  54 ++
 .../parallel_65/hotswap/keymaps/via/rules.mk  |   1 +
 .../parallel/parallel_65/hotswap/readme.md    |  18 +
 .../parallel/parallel_65/hotswap/rules.mk     |  20 +
 .../parallel/parallel_65/soldered/config.h    | 109 +++++
 .../parallel/parallel_65/soldered/info.json   | 461 ++++++++++++++++++
 .../soldered/keymaps/default/keymap.c         |  38 ++
 .../soldered/keymaps/default/readme.md        |   1 +
 .../parallel_65/soldered/keymaps/via/keymap.c |  54 ++
 .../parallel_65/soldered/keymaps/via/rules.mk |   1 +
 .../parallel/parallel_65/soldered/readme.md   |  18 +
 .../parallel/parallel_65/soldered/rules.mk    |  20 +
 .../parallel/parallel_65/soldered/soldered.c  |  17 +
 .../parallel/parallel_65/soldered/soldered.h  | 122 +++++
 20 files changed, 1317 insertions(+)
 create mode 100644 keyboards/parallel/parallel_65/hotswap/config.h
 create mode 100644 keyboards/parallel/parallel_65/hotswap/hotswap.c
 create mode 100644 keyboards/parallel/parallel_65/hotswap/hotswap.h
 create mode 100644 keyboards/parallel/parallel_65/hotswap/info.json
 create mode 100644 keyboards/parallel/parallel_65/hotswap/keymaps/default/keymap.c
 create mode 100644 keyboards/parallel/parallel_65/hotswap/keymaps/default/readme.md
 create mode 100644 keyboards/parallel/parallel_65/hotswap/keymaps/via/keymap.c
 create mode 100644 keyboards/parallel/parallel_65/hotswap/keymaps/via/rules.mk
 create mode 100644 keyboards/parallel/parallel_65/hotswap/readme.md
 create mode 100644 keyboards/parallel/parallel_65/hotswap/rules.mk
 create mode 100644 keyboards/parallel/parallel_65/soldered/config.h
 create mode 100644 keyboards/parallel/parallel_65/soldered/info.json
 create mode 100644 keyboards/parallel/parallel_65/soldered/keymaps/default/keymap.c
 create mode 100644 keyboards/parallel/parallel_65/soldered/keymaps/default/readme.md
 create mode 100644 keyboards/parallel/parallel_65/soldered/keymaps/via/keymap.c
 create mode 100644 keyboards/parallel/parallel_65/soldered/keymaps/via/rules.mk
 create mode 100644 keyboards/parallel/parallel_65/soldered/readme.md
 create mode 100644 keyboards/parallel/parallel_65/soldered/rules.mk
 create mode 100644 keyboards/parallel/parallel_65/soldered/soldered.c
 create mode 100644 keyboards/parallel/parallel_65/soldered/soldered.h

diff --git a/keyboards/parallel/parallel_65/hotswap/config.h b/keyboards/parallel/parallel_65/hotswap/config.h
new file mode 100644
index 0000000000..26734936ed
--- /dev/null
+++ b/keyboards/parallel/parallel_65/hotswap/config.h
@@ -0,0 +1,109 @@
+/*
+Copyright 2021 Matthew Dias
+
+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    0x504C
+#define PRODUCT_ID   0x5069
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Parallel Limited
+#define PRODUCT      Parallel 65% Hotswap PCB
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * 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 { E6, B7, F7, F4, F5 }
+#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/parallel/parallel_65/hotswap/hotswap.c b/keyboards/parallel/parallel_65/hotswap/hotswap.c
new file mode 100644
index 0000000000..4189a8a80c
--- /dev/null
+++ b/keyboards/parallel/parallel_65/hotswap/hotswap.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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 "hotswap.h"
diff --git a/keyboards/parallel/parallel_65/hotswap/hotswap.h b/keyboards/parallel/parallel_65/hotswap/hotswap.h
new file mode 100644
index 0000000000..3da75e2ce3
--- /dev/null
+++ b/keyboards/parallel/parallel_65/hotswap/hotswap.h
@@ -0,0 +1,63 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0E     │0F │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1F │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2F │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │40  │41  │42  │46                      │49  │4B  │ │4C │4D │4F │
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ */
+
+#define LAYOUT_65_ansi_blocker( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
+    k40, k41, k42,                k46,                k49, k4B,      k4C, k4D, k4F  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
+}
+
+#define LAYOUT_65_ansi_blocker_tsangan( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
+    k40, k41, k42,                k46,                          k4B, k4C, k4D, k4F  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D, XXX, k4F }  \
+}
diff --git a/keyboards/parallel/parallel_65/hotswap/info.json b/keyboards/parallel/parallel_65/hotswap/info.json
new file mode 100644
index 0000000000..28b1dda23e
--- /dev/null
+++ b/keyboards/parallel/parallel_65/hotswap/info.json
@@ -0,0 +1,155 @@
+{
+    "keyboard_name": "Parallel 65% Hotswap PCB",
+    "maintainer": "matthewdias",
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                { "x":0, "y":0 },
+                { "x":1, "y":0 },
+                { "x":2, "y":0 },
+                { "x":3, "y":0 },
+                { "x":4, "y":0 },
+                { "x":5, "y":0 },
+                { "x":6, "y":0 },
+                { "x":7, "y":0 },
+                { "x":8, "y":0 },
+                { "x":9, "y":0 },
+                { "x":10, "y":0 },
+                { "x":11, "y":0 },
+                { "x":12, "y":0 },
+                { "x":13, "y":0, "w": 2 },
+                { "x":15, "y":0 },
+
+                { "x":0, "y":1, "w":1.5 },
+                { "x":1.5, "y":1 },
+                { "x":2.5, "y":1 },
+                { "x":3.5, "y":1 },
+                { "x":4.5, "y":1 },
+                { "x":5.5, "y":1 },
+                { "x":6.5, "y":1 },
+                { "x":7.5, "y":1 },
+                { "x":8.5, "y":1 },
+                { "x":9.5, "y":1 },
+                { "x":10.5, "y":1 },
+                { "x":11.5, "y":1 },
+                { "x":12.5, "y":1 },
+                { "x":13.5, "y":1, "w":1.5 },
+                { "x":15, "y":1 },
+
+                { "x":0, "y":2, "w":1.75 },
+                { "x":1.75, "y":2 },
+                { "x":2.75, "y":2 },
+                { "x":3.75, "y":2 },
+                { "x":4.75, "y":2 },
+                { "x":5.75, "y":2 },
+                { "x":6.75, "y":2 },
+                { "x":7.75, "y":2 },
+                { "x":8.75, "y":2 },
+                { "x":9.75, "y":2 },
+                { "x":10.75, "y":2 },
+                { "x":11.75, "y":2 },
+                { "x":12.75, "y":2, "w":2.25 },
+                { "x":15, "y":2 },
+
+                { "x":0, "y":3, "w":2.25 },
+                { "x":2.25, "y":3 },
+                { "x":3.25, "y":3 },
+                { "x":4.25, "y":3 },
+                { "x":5.25, "y":3 },
+                { "x":6.25, "y":3 },
+                { "x":7.25, "y":3 },
+                { "x":8.25, "y":3 },
+                { "x":9.25, "y":3 },
+                { "x":10.25, "y":3 },
+                { "x":11.25, "y":3 },
+                { "x":12.25, "y":3, "w":1.75 },
+                { "x":14, "y":3 },
+                { "x":15, "y":3 },
+
+                { "x":0, "y":4, "w":1.25 },
+                { "x":1.25, "y":4, "w":1.25 },
+                { "x":2.5, "y":4, "w":1.25 },
+                { "x":3.75, "y":4, "w":6.25 },
+                { "x":10, "y":4, "w":1.25 },
+                { "x":11.25, "y":4, "w":1.25 },
+                { "x":13, "y":4 },
+                { "x":14, "y":4 },
+                { "x":15, "y":4 }
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [
+                { "x":0, "y":0 },
+                { "x":1, "y":0 },
+                { "x":2, "y":0 },
+                { "x":3, "y":0 },
+                { "x":4, "y":0 },
+                { "x":5, "y":0 },
+                { "x":6, "y":0 },
+                { "x":7, "y":0 },
+                { "x":8, "y":0 },
+                { "x":9, "y":0 },
+                { "x":10, "y":0 },
+                { "x":11, "y":0 },
+                { "x":12, "y":0 },
+                { "x":13, "y":0, "w":2 },
+                { "x":15, "y":0 },
+
+                { "x":0, "y":1, "w":1.5 },
+                { "x":1.5, "y":1 },
+                { "x":2.5, "y":1 },
+                { "x":3.5, "y":1 },
+                { "x":4.5, "y":1 },
+                { "x":5.5, "y":1 },
+                { "x":6.5, "y":1 },
+                { "x":7.5, "y":1 },
+                { "x":8.5, "y":1 },
+                { "x":9.5, "y":1 },
+                { "x":10.5, "y":1 },
+                { "x":11.5, "y":1 },
+                { "x":12.5, "y":1 },
+                { "x":13.5, "y":1, "w":1.5 },
+                { "x":15, "y":1 },
+
+                { "x":0, "y":2, "w":1.75 },
+                { "x":1.75, "y":2 },
+                { "x":2.75, "y":2 },
+                { "x":3.75, "y":2 },
+                { "x":4.75, "y":2 },
+                { "x":5.75, "y":2 },
+                { "x":6.75, "y":2 },
+                { "x":7.75, "y":2 },
+                { "x":8.75, "y":2 },
+                { "x":9.75, "y":2 },
+                { "x":10.75, "y":2 },
+                { "x":11.75, "y":2 },
+                { "x":12.75, "y":2, "w":2.25 },
+                { "x":15, "y":2 },
+
+                { "x":0, "y":3, "w":2.25 },
+                { "x":2.25, "y":3 },
+                { "x":3.25, "y":3 },
+                { "x":4.25, "y":3 },
+                { "x":5.25, "y":3 },
+                { "x":6.25, "y":3 },
+                { "x":7.25, "y":3 },
+                { "x":8.25, "y":3 },
+                { "x":9.25, "y":3 },
+                { "x":10.25, "y":3 },
+                { "x":11.25, "y":3 },
+                { "x":12.25, "y":3, "w":1.75 },
+                { "x":14, "y":3 },
+                { "x":15, "y":3 },
+
+                { "x":0, "y":4, "w":1.5 },
+                { "x":1.5, "y":4, "w":1 },
+                { "x":2.5, "y":4, "w":1.5 },
+                { "x":4, "y":4, "w":7 },
+                { "x":11, "y":4,  "w":1.5 },
+                { "x":13, "y":4 },
+                { "x":14, "y":4 },
+                { "x":15, "y":4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/parallel/parallel_65/hotswap/keymaps/default/keymap.c b/keyboards/parallel/parallel_65/hotswap/keymaps/default/keymap.c
new file mode 100644
index 0000000000..8b24dd2ec3
--- /dev/null
+++ b/keyboards/parallel/parallel_65/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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 layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_65_ansi_blocker(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_PGUP, 
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   MO(_FN),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_65_ansi_blocker(
+        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_TRNS, KC_PSCR,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_HOME,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_END,
+        KC_TRNS,          KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_LGUI, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_RGUI,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/parallel/parallel_65/hotswap/keymaps/default/readme.md b/keyboards/parallel/parallel_65/hotswap/keymaps/default/readme.md
new file mode 100644
index 0000000000..64ddedeed4
--- /dev/null
+++ b/keyboards/parallel/parallel_65/hotswap/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Parallel 65% Hotswap PCB
diff --git a/keyboards/parallel/parallel_65/hotswap/keymaps/via/keymap.c b/keyboards/parallel/parallel_65/hotswap/keymaps/via/keymap.c
new file mode 100644
index 0000000000..0e4c1b61c4
--- /dev/null
+++ b/keyboards/parallel/parallel_65/hotswap/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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 layer_names {
+    _L0,
+    _L1,
+    _L2,
+    _L3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_L0] = LAYOUT_65_ansi_blocker(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_PGUP, 
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   MO(_L1),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_L1] = LAYOUT_65_ansi_blocker(
+        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_TRNS, KC_PSCR,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_HOME,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_END,
+        KC_TRNS,          KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_LGUI, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_RGUI,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [_L2] = LAYOUT_65_ansi_blocker(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______,          _______, _______, _______, _______
+    ),
+    [_L3] = LAYOUT_65_ansi_blocker(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______,          _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/parallel/parallel_65/hotswap/keymaps/via/rules.mk b/keyboards/parallel/parallel_65/hotswap/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/parallel/parallel_65/hotswap/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/parallel/parallel_65/hotswap/readme.md b/keyboards/parallel/parallel_65/hotswap/readme.md
new file mode 100644
index 0000000000..41c2f71179
--- /dev/null
+++ b/keyboards/parallel/parallel_65/hotswap/readme.md
@@ -0,0 +1,18 @@
+# Parallel 65% Hotswap PCB
+
+A 65% keyboard
+
+-   Keyboard Maintainer: matthewdias
+-   Hardware Supported: Parallel 65% Hotswap PCB
+
+To reset the keyboard into bootloader mode, press the reset switch on the underside.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make parallel/parallel_65/hotswap:default
+
+Flashing example for this keyboard:
+
+    make parallel/parallel_65/hotswap:default:flash
+
+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).
diff --git a/keyboards/parallel/parallel_65/hotswap/rules.mk b/keyboards/parallel/parallel_65/hotswap/rules.mk
new file mode 100644
index 0000000000..59fa2e87f8
--- /dev/null
+++ b/keyboards/parallel/parallel_65/hotswap/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 65_ansi_blocker
diff --git a/keyboards/parallel/parallel_65/soldered/config.h b/keyboards/parallel/parallel_65/soldered/config.h
new file mode 100644
index 0000000000..a5eace0be2
--- /dev/null
+++ b/keyboards/parallel/parallel_65/soldered/config.h
@@ -0,0 +1,109 @@
+/*
+Copyright 2021 Matthew Dias
+
+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    0x504C
+#define PRODUCT_ID   0x5068
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Parallel Limited
+#define PRODUCT      Parallel 65% PCB
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * 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 { E6, B7, F7, F4, F5 }
+#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/parallel/parallel_65/soldered/info.json b/keyboards/parallel/parallel_65/soldered/info.json
new file mode 100644
index 0000000000..4b0ae27b00
--- /dev/null
+++ b/keyboards/parallel/parallel_65/soldered/info.json
@@ -0,0 +1,461 @@
+{
+    "keyboard_name": "Parallel 65% PCB",
+    "maintainer": "matthewdias",
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_split_bs": {
+            "layout": [
+                { "x":0, "y":0 },
+                { "x":1, "y":0 },
+                { "x":2, "y":0 },
+                { "x":3, "y":0 },
+                { "x":4, "y":0 },
+                { "x":5, "y":0 },
+                { "x":6, "y":0 },
+                { "x":7, "y":0 },
+                { "x":8, "y":0 },
+                { "x":9, "y":0 },
+                { "x":10, "y":0 },
+                { "x":11, "y":0 },
+                { "x":12, "y":0 },
+                { "x":13, "y":0 },
+                { "x":14, "y":0 },
+                { "x":15, "y":0 },
+
+                { "x":0, "y":1, "w":1.5 },
+                { "x":1.5, "y":1 },
+                { "x":2.5, "y":1 },
+                { "x":3.5, "y":1 },
+                { "x":4.5, "y":1 },
+                { "x":5.5, "y":1 },
+                { "x":6.5, "y":1 },
+                { "x":7.5, "y":1 },
+                { "x":8.5, "y":1 },
+                { "x":9.5, "y":1 },
+                { "x":10.5, "y":1 },
+                { "x":11.5, "y":1 },
+                { "x":12.5, "y":1 },
+                { "x":13.5, "y":1, "w":1.5 },
+                { "x":15, "y":1 },
+
+                { "x":0, "y":2, "w":1.75 },
+                { "x":1.75, "y":2 },
+                { "x":2.75, "y":2 },
+                { "x":3.75, "y":2 },
+                { "x":4.75, "y":2 },
+                { "x":5.75, "y":2 },
+                { "x":6.75, "y":2 },
+                { "x":7.75, "y":2 },
+                { "x":8.75, "y":2 },
+                { "x":9.75, "y":2 },
+                { "x":10.75, "y":2 },
+                { "x":11.75, "y":2 },
+                { "x":12.75, "y":2, "w":2.25 },
+                { "x":15, "y":2 },
+
+                { "x":0, "y":3, "w":2.25 },
+                { "x":2.25, "y":3 },
+                { "x":3.25, "y":3 },
+                { "x":4.25, "y":3 },
+                { "x":5.25, "y":3 },
+                { "x":6.25, "y":3 },
+                { "x":7.25, "y":3 },
+                { "x":8.25, "y":3 },
+                { "x":9.25, "y":3 },
+                { "x":10.25, "y":3 },
+                { "x":11.25, "y":3 },
+                { "x":12.25, "y":3, "w":1.75 },
+                { "x":14, "y":3 },
+                { "x":15, "y":3 },
+
+                { "x":0, "y":4, "w":1.25 },
+                { "x":1.25, "y":4, "w":1.25 },
+                { "x":2.5, "y":4, "w":1.25 },
+                { "x":3.75, "y":4, "w":6.25 },
+                { "x":10, "y":4, "w":1.25 },
+                { "x":11.25, "y":4,  "w":1.25 },
+                { "x":13, "y":4 },
+                { "x":14, "y":4 },
+                { "x":15, "y":4 }
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                { "x":0, "y":0 },
+                { "x":1, "y":0 },
+                { "x":2, "y":0 },
+                { "x":3, "y":0 },
+                { "x":4, "y":0 },
+                { "x":5, "y":0 },
+                { "x":6, "y":0 },
+                { "x":7, "y":0 },
+                { "x":8, "y":0 },
+                { "x":9, "y":0 },
+                { "x":10, "y":0 },
+                { "x":11, "y":0 },
+                { "x":12, "y":0 },
+                { "x":13, "y":0, "w": 2 },
+                { "x":15, "y":0 },
+
+                { "x":0, "y":1, "w":1.5 },
+                { "x":1.5, "y":1 },
+                { "x":2.5, "y":1 },
+                { "x":3.5, "y":1 },
+                { "x":4.5, "y":1 },
+                { "x":5.5, "y":1 },
+                { "x":6.5, "y":1 },
+                { "x":7.5, "y":1 },
+                { "x":8.5, "y":1 },
+                { "x":9.5, "y":1 },
+                { "x":10.5, "y":1 },
+                { "x":11.5, "y":1 },
+                { "x":12.5, "y":1 },
+                { "x":13.5, "y":1, "w":1.5 },
+                { "x":15, "y":1 },
+
+                { "x":0, "y":2, "w":1.75 },
+                { "x":1.75, "y":2 },
+                { "x":2.75, "y":2 },
+                { "x":3.75, "y":2 },
+                { "x":4.75, "y":2 },
+                { "x":5.75, "y":2 },
+                { "x":6.75, "y":2 },
+                { "x":7.75, "y":2 },
+                { "x":8.75, "y":2 },
+                { "x":9.75, "y":2 },
+                { "x":10.75, "y":2 },
+                { "x":11.75, "y":2 },
+                { "x":12.75, "y":2, "w":2.25 },
+                { "x":15, "y":2 },
+
+                { "x":0, "y":3, "w":2.25 },
+                { "x":2.25, "y":3 },
+                { "x":3.25, "y":3 },
+                { "x":4.25, "y":3 },
+                { "x":5.25, "y":3 },
+                { "x":6.25, "y":3 },
+                { "x":7.25, "y":3 },
+                { "x":8.25, "y":3 },
+                { "x":9.25, "y":3 },
+                { "x":10.25, "y":3 },
+                { "x":11.25, "y":3 },
+                { "x":12.25, "y":3, "w":1.75 },
+                { "x":14, "y":3 },
+                { "x":15, "y":3 },
+
+                { "x":0, "y":4, "w":1.25 },
+                { "x":1.25, "y":4, "w":1.25 },
+                { "x":2.5, "y":4, "w":1.25 },
+                { "x":3.75, "y":4, "w":6.25 },
+                { "x":10, "y":4, "w":1.25 },
+                { "x":11.25, "y":4,  "w":1.25 },
+                { "x":13, "y":4 },
+                { "x":14, "y":4 },
+                { "x":15, "y":4 }
+            ]
+        },
+        "LAYOUT_65_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                { "x":0, "y":0 },
+                { "x":1, "y":0 },
+                { "x":2, "y":0 },
+                { "x":3, "y":0 },
+                { "x":4, "y":0 },
+                { "x":5, "y":0 },
+                { "x":6, "y":0 },
+                { "x":7, "y":0 },
+                { "x":8, "y":0 },
+                { "x":9, "y":0 },
+                { "x":10, "y":0 },
+                { "x":11, "y":0 },
+                { "x":12, "y":0 },
+                { "x":13, "y":0 },
+                { "x":14, "y":0 },
+                { "x":15, "y":0 },
+
+                { "x":0, "y":1, "w":1.5 },
+                { "x":1.5, "y":1 },
+                { "x":2.5, "y":1 },
+                { "x":3.5, "y":1 },
+                { "x":4.5, "y":1 },
+                { "x":5.5, "y":1 },
+                { "x":6.5, "y":1 },
+                { "x":7.5, "y":1 },
+                { "x":8.5, "y":1 },
+                { "x":9.5, "y":1 },
+                { "x":10.5, "y":1 },
+                { "x":11.5, "y":1 },
+                { "x":12.5, "y":1 },
+                { "x":13.5, "y":1, "w":1.5 },
+                { "x":15, "y":1 },
+
+                { "x":0, "y":2, "w":1.75 },
+                { "x":1.75, "y":2 },
+                { "x":2.75, "y":2 },
+                { "x":3.75, "y":2 },
+                { "x":4.75, "y":2 },
+                { "x":5.75, "y":2 },
+                { "x":6.75, "y":2 },
+                { "x":7.75, "y":2 },
+                { "x":8.75, "y":2 },
+                { "x":9.75, "y":2 },
+                { "x":10.75, "y":2 },
+                { "x":11.75, "y":2 },
+                { "x":12.75, "y":2, "w":2.25 },
+                { "x":15, "y":2 },
+
+                { "x":0, "y":3, "w":2.25 },
+                { "x":2.25, "y":3 },
+                { "x":3.25, "y":3 },
+                { "x":4.25, "y":3 },
+                { "x":5.25, "y":3 },
+                { "x":6.25, "y":3 },
+                { "x":7.25, "y":3 },
+                { "x":8.25, "y":3 },
+                { "x":9.25, "y":3 },
+                { "x":10.25, "y":3 },
+                { "x":11.25, "y":3 },
+                { "x":12.25, "y":3, "w":1.75 },
+                { "x":14, "y":3 },
+                { "x":15, "y":3 },
+
+                { "x":0, "y":4, "w":1.5 },
+                { "x":1.5, "y":4, "w":1 },
+                { "x":2.5, "y":4, "w":1.5 },
+                { "x":4, "y":4, "w":7 },
+                { "x":11, "y":4,  "w":1.5 },
+                { "x":13, "y":4 },
+                { "x":14, "y":4 },
+                { "x":15, "y":4 }
+            ]
+        },
+        "LAYOUT_65_iso_blocker_split_bs": {
+            "layout": [
+                { "x":0, "y":0 },
+                { "x":1, "y":0 },
+                { "x":2, "y":0 },
+                { "x":3, "y":0 },
+                { "x":4, "y":0 },
+                { "x":5, "y":0 },
+                { "x":6, "y":0 },
+                { "x":7, "y":0 },
+                { "x":8, "y":0 },
+                { "x":9, "y":0 },
+                { "x":10, "y":0 },
+                { "x":11, "y":0 },
+                { "x":12, "y":0 },
+                { "x":13, "y":0 },
+                { "x":14, "y":0 },
+                { "x":15, "y":0 },
+
+                { "x":0, "y":1, "w":1.5 },
+                { "x":1.5, "y":1 },
+                { "x":2.5, "y":1 },
+                { "x":3.5, "y":1 },
+                { "x":4.5, "y":1 },
+                { "x":5.5, "y":1 },
+                { "x":6.5, "y":1 },
+                { "x":7.5, "y":1 },
+                { "x":8.5, "y":1 },
+                { "x":9.5, "y":1 },
+                { "x":10.5, "y":1 },
+                { "x":11.5, "y":1 },
+                { "x":12.5, "y":1 },
+                { "x":15, "y":1 },
+
+                { "x":0, "y":2, "w":1.75 },
+                { "x":1.75, "y":2 },
+                { "x":2.75, "y":2 },
+                { "x":3.75, "y":2 },
+                { "x":4.75, "y":2 },
+                { "x":5.75, "y":2 },
+                { "x":6.75, "y":2 },
+                { "x":7.75, "y":2 },
+                { "x":8.75, "y":2 },
+                { "x":9.75, "y":2 },
+                { "x":10.75, "y":2 },
+                { "x":11.75, "y":2 },
+                { "x":12.75, "y":2 },
+                { "x":13.75, "y":1, "w":1.25, "h":2 },
+                { "x":15, "y":2 },
+
+                { "x":0, "y":3, "w":1.25 },
+                { "x":1.25, "y":3 },
+                { "x":2.25, "y":3 },
+                { "x":3.25, "y":3 },
+                { "x":4.25, "y":3 },
+                { "x":5.25, "y":3 },
+                { "x":6.25, "y":3 },
+                { "x":7.25, "y":3 },
+                { "x":8.25, "y":3 },
+                { "x":9.25, "y":3 },
+                { "x":10.25, "y":3 },
+                { "x":11.25, "y":3 },
+                { "x":12.25, "y":3, "w":1.75 },
+                { "x":14, "y":3 },
+                { "x":15, "y":3 },
+
+                { "x":0, "y":4, "w":1.25 },
+                { "x":1.25, "y":4, "w":1.25 },
+                { "x":2.5, "y":4, "w":1.25 },
+                { "x":3.75, "y":4, "w":6.25 },
+                { "x":10, "y":4, "w":1.25 },
+                { "x":11.25, "y":4,  "w":1.25 },
+                { "x":13, "y":4 },
+                { "x":14, "y":4 },
+                { "x":15, "y":4 }
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                { "x":0, "y":0 },
+                { "x":1, "y":0 },
+                { "x":2, "y":0 },
+                { "x":3, "y":0 },
+                { "x":4, "y":0 },
+                { "x":5, "y":0 },
+                { "x":6, "y":0 },
+                { "x":7, "y":0 },
+                { "x":8, "y":0 },
+                { "x":9, "y":0 },
+                { "x":10, "y":0 },
+                { "x":11, "y":0 },
+                { "x":12, "y":0 },
+                { "x":13, "y":0, "w": 2 },
+                { "x":15, "y":0 },
+
+                { "x":0, "y":1, "w":1.5 },
+                { "x":1.5, "y":1 },
+                { "x":2.5, "y":1 },
+                { "x":3.5, "y":1 },
+                { "x":4.5, "y":1 },
+                { "x":5.5, "y":1 },
+                { "x":6.5, "y":1 },
+                { "x":7.5, "y":1 },
+                { "x":8.5, "y":1 },
+                { "x":9.5, "y":1 },
+                { "x":10.5, "y":1 },
+                { "x":11.5, "y":1 },
+                { "x":12.5, "y":1 },
+                { "x":15, "y":1 },
+
+                { "x":0, "y":2, "w":1.75 },
+                { "x":1.75, "y":2 },
+                { "x":2.75, "y":2 },
+                { "x":3.75, "y":2 },
+                { "x":4.75, "y":2 },
+                { "x":5.75, "y":2 },
+                { "x":6.75, "y":2 },
+                { "x":7.75, "y":2 },
+                { "x":8.75, "y":2 },
+                { "x":9.75, "y":2 },
+                { "x":10.75, "y":2 },
+                { "x":11.75, "y":2 },
+                { "x":12.75, "y":2 },
+                { "x":13.75, "y":1, "w":1.25, "h":2 },
+                { "x":15, "y":2 },
+
+                { "x":0, "y":3, "w":1.25 },
+                { "x":1.25, "y":3 },
+                { "x":2.25, "y":3 },
+                { "x":3.25, "y":3 },
+                { "x":4.25, "y":3 },
+                { "x":5.25, "y":3 },
+                { "x":6.25, "y":3 },
+                { "x":7.25, "y":3 },
+                { "x":8.25, "y":3 },
+                { "x":9.25, "y":3 },
+                { "x":10.25, "y":3 },
+                { "x":11.25, "y":3 },
+                { "x":12.25, "y":3, "w":1.75 },
+                { "x":14, "y":3 },
+                { "x":15, "y":3 },
+
+                { "x":0, "y":4, "w":1.25 },
+                { "x":1.25, "y":4, "w":1.25 },
+                { "x":2.5, "y":4, "w":1.25 },
+                { "x":3.75, "y":4, "w":6.25 },
+                { "x":10, "y":4, "w":1.25 },
+                { "x":11.25, "y":4,  "w":1.25 },
+                { "x":13, "y":4 },
+                { "x":14, "y":4 },
+                { "x":15, "y":4 }
+            ]
+        },
+        "LAYOUT_65_iso_blocker_tsangan_split_bs": {
+            "layout": [
+                { "x":0, "y":0 },
+                { "x":1, "y":0 },
+                { "x":2, "y":0 },
+                { "x":3, "y":0 },
+                { "x":4, "y":0 },
+                { "x":5, "y":0 },
+                { "x":6, "y":0 },
+                { "x":7, "y":0 },
+                { "x":8, "y":0 },
+                { "x":9, "y":0 },
+                { "x":10, "y":0 },
+                { "x":11, "y":0 },
+                { "x":12, "y":0 },
+                { "x":13, "y":0 },
+                { "x":14, "y":0 },
+                { "x":15, "y":0 },
+
+                { "x":0, "y":1, "w":1.5 },
+                { "x":1.5, "y":1 },
+                { "x":2.5, "y":1 },
+                { "x":3.5, "y":1 },
+                { "x":4.5, "y":1 },
+                { "x":5.5, "y":1 },
+                { "x":6.5, "y":1 },
+                { "x":7.5, "y":1 },
+                { "x":8.5, "y":1 },
+                { "x":9.5, "y":1 },
+                { "x":10.5, "y":1 },
+                { "x":11.5, "y":1 },
+                { "x":12.5, "y":1 },
+                { "x":15, "y":1 },
+
+                { "x":0, "y":2, "w":1.75 },
+                { "x":1.75, "y":2 },
+                { "x":2.75, "y":2 },
+                { "x":3.75, "y":2 },
+                { "x":4.75, "y":2 },
+                { "x":5.75, "y":2 },
+                { "x":6.75, "y":2 },
+                { "x":7.75, "y":2 },
+                { "x":8.75, "y":2 },
+                { "x":9.75, "y":2 },
+                { "x":10.75, "y":2 },
+                { "x":11.75, "y":2 },
+                { "x":12.75, "y":2 },
+                { "x":13.75, "y":1, "w":1.25, "h":2 },
+                { "x":15, "y":2 },
+
+                { "x":0, "y":3, "w":1.25 },
+                { "x":1.25, "y":3 },
+                { "x":2.25, "y":3 },
+                { "x":3.25, "y":3 },
+                { "x":4.25, "y":3 },
+                { "x":5.25, "y":3 },
+                { "x":6.25, "y":3 },
+                { "x":7.25, "y":3 },
+                { "x":8.25, "y":3 },
+                { "x":9.25, "y":3 },
+                { "x":10.25, "y":3 },
+                { "x":11.25, "y":3 },
+                { "x":12.25, "y":3, "w":1.75 },
+                { "x":14, "y":3 },
+                { "x":15, "y":3 },
+
+                { "x":0, "y":4, "w":1.5 },
+                { "x":1.5, "y":4, "w":1 },
+                { "x":2.5, "y":4, "w":1.5 },
+                { "x":4, "y":4, "w":7 },
+                { "x":11, "y":4,  "w":1.5 },
+                { "x":13, "y":4 },
+                { "x":14, "y":4 },
+                { "x":15, "y":4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/parallel/parallel_65/soldered/keymaps/default/keymap.c b/keyboards/parallel/parallel_65/soldered/keymaps/default/keymap.c
new file mode 100644
index 0000000000..837e3e5e9a
--- /dev/null
+++ b/keyboards/parallel/parallel_65/soldered/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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 layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_65_ansi_blocker_split_bs(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_PGUP, 
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   MO(_FN),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_65_ansi_blocker_split_bs(
+        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_TRNS, KC_TRNS, KC_PSCR,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_HOME,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_END,
+        KC_TRNS,          KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_LGUI, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_RGUI,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/parallel/parallel_65/soldered/keymaps/default/readme.md b/keyboards/parallel/parallel_65/soldered/keymaps/default/readme.md
new file mode 100644
index 0000000000..149c5a0bf1
--- /dev/null
+++ b/keyboards/parallel/parallel_65/soldered/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Parallel 65% PCB
diff --git a/keyboards/parallel/parallel_65/soldered/keymaps/via/keymap.c b/keyboards/parallel/parallel_65/soldered/keymaps/via/keymap.c
new file mode 100644
index 0000000000..cf8b4cddaf
--- /dev/null
+++ b/keyboards/parallel/parallel_65/soldered/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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 layer_names {
+    _L0,
+    _L1,
+    _L2,
+    _L3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_L0] = LAYOUT_65_ansi_blocker_split_bs(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC, KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_PGUP, 
+        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_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   MO(_L1),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_L1] = LAYOUT_65_ansi_blocker_split_bs(
+        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_TRNS, KC_TRNS, KC_PSCR,
+        KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_HOME,
+        KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_END,
+        KC_TRNS,          KC_VOLD, KC_VOLU, KC_MPRV, KC_MNXT, KC_LGUI, KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_RGUI,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [_L2] = LAYOUT_65_ansi_blocker_split_bs(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______,          _______, _______, _______, _______
+    ),
+    [_L3] = LAYOUT_65_ansi_blocker_split_bs(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______,          _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/parallel/parallel_65/soldered/keymaps/via/rules.mk b/keyboards/parallel/parallel_65/soldered/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/parallel/parallel_65/soldered/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/parallel/parallel_65/soldered/readme.md b/keyboards/parallel/parallel_65/soldered/readme.md
new file mode 100644
index 0000000000..e9099321cb
--- /dev/null
+++ b/keyboards/parallel/parallel_65/soldered/readme.md
@@ -0,0 +1,18 @@
+# Parallel 65% PCB
+
+A 65% keyboard
+
+-   Keyboard Maintainer: matthewdias
+-   Hardware Supported: Parallel 65% PCB
+
+To reset the keyboard into bootloader mode, press the reset switch on the underside.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make parallel/parallel_65/soldered:default
+
+Flashing example for this keyboard:
+
+    make parallel/parallel_65/soldered:default:flash
+
+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).
diff --git a/keyboards/parallel/parallel_65/soldered/rules.mk b/keyboards/parallel/parallel_65/soldered/rules.mk
new file mode 100644
index 0000000000..8a86833620
--- /dev/null
+++ b/keyboards/parallel/parallel_65/soldered/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_iso_blocker 65_iso_blocker_split_bs
diff --git a/keyboards/parallel/parallel_65/soldered/soldered.c b/keyboards/parallel/parallel_65/soldered/soldered.c
new file mode 100644
index 0000000000..a74cd21dea
--- /dev/null
+++ b/keyboards/parallel/parallel_65/soldered/soldered.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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 "soldered.h"
diff --git a/keyboards/parallel/parallel_65/soldered/soldered.h b/keyboards/parallel/parallel_65/soldered/soldered.h
new file mode 100644
index 0000000000..b2ae9cbaac
--- /dev/null
+++ b/keyboards/parallel/parallel_65/soldered/soldered.h
@@ -0,0 +1,122 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │    │0E     │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤    └─┬─────┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1F │      │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤   ┌──┴┐2D  │ ISO Enter
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2F │   │2C │    │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤   └───┴────┘
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3F │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │40  │41  │42  │46                      │49  │4B  │ │4C │4D │4F │
+ * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ * ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ * │40   │41 │42   │46                         │4B   │ Tsangan
+ * └─────┴───┴─────┴───────────────────────────┴─────┘
+ */
+
+#define LAYOUT_65_ansi_blocker_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
+    k40, k41, k42,                k46,                k49,      k4B, k4C, k4D, k4F  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
+}
+
+#define LAYOUT_65_ansi_blocker( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
+    k40, k41, k42,                k46,                k49,      k4B, k4C, k4D, k4F  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
+}
+
+#define LAYOUT_65_ansi_blocker_tsangan_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,      k1D, k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,           k2D, k2F, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
+    k40, k41, k42,                k46,                          k4B, k4C, k4D, k4F  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, XXX, k2F }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D, XXX, k4F }  \
+}
+
+#define LAYOUT_65_iso_blocker_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
+    k40, k41, k42,                k46,                k49,      k4B, k4C, k4D, k4F  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
+}
+
+#define LAYOUT_65_iso_blocker( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
+    k40, k41, k42,                k46,                k49,      k4B, k4C, k4D, k4F  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, XXX, k4F }  \
+}
+
+#define LAYOUT_65_iso_blocker_tsangan_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C,           k1F, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      k2D, k2F, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3C, k3D, k3F, \
+    k40, k41, k42,                k46,                          k4B, k4C, k4D, k4F  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, XXX, k1F }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, k4C, k4D, XXX, k4F }  \
+}

From b2fdb072e590ea06237dc5407ae1902fc15ce405 Mon Sep 17 00:00:00 2001
From: Uthol <83434905+Uthol@users.noreply.github.com>
Date: Mon, 7 Mar 2022 20:01:47 -0700
Subject: [PATCH 758/867] [Keyboard] Uthol (#16393)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/handwired/uthol/config.h            |  30 +
 keyboards/handwired/uthol/info.json           | 248 ++++++
 .../handwired/uthol/keymaps/default/keymap.c  |  34 +
 .../handwired/uthol/keymaps/numswap/keymap.c  |  34 +
 .../handwired/uthol/keymaps/oled/helix.c      |  18 +
 .../handwired/uthol/keymaps/oled/helix.h      | 421 +++++++++
 .../handwired/uthol/keymaps/oled/keymap.c     |  97 ++
 .../handwired/uthol/keymaps/oled/ricardo.c    | 840 ++++++++++++++++++
 .../handwired/uthol/keymaps/oled/rules.mk     |   3 +
 .../handwired/uthol/keymaps/oled/smiley.c     |  98 ++
 keyboards/handwired/uthol/keymaps/oled/star.c | 206 +++++
 keyboards/handwired/uthol/readme.md           |  27 +
 keyboards/handwired/uthol/rev1/config.h       |  29 +
 keyboards/handwired/uthol/rev1/readme.md      |   4 +
 keyboards/handwired/uthol/rev1/rules.mk       |  13 +
 keyboards/handwired/uthol/rev2/config.h       |  35 +
 keyboards/handwired/uthol/rev2/readme.md      |   4 +
 keyboards/handwired/uthol/rev2/rules.mk       |  15 +
 keyboards/handwired/uthol/rev3/chconf.h       |  34 +
 keyboards/handwired/uthol/rev3/config.h       |  69 ++
 keyboards/handwired/uthol/rev3/halconf.h      |  24 +
 keyboards/handwired/uthol/rev3/mcuconf.h      |  25 +
 keyboards/handwired/uthol/rev3/readme.md      |   4 +
 keyboards/handwired/uthol/rev3/rev3.c         |  20 +
 keyboards/handwired/uthol/rev3/rules.mk       |  19 +
 keyboards/handwired/uthol/uthol.c             |  18 +
 keyboards/handwired/uthol/uthol.h             |  45 +
 27 files changed, 2414 insertions(+)
 create mode 100644 keyboards/handwired/uthol/config.h
 create mode 100644 keyboards/handwired/uthol/info.json
 create mode 100644 keyboards/handwired/uthol/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/uthol/keymaps/numswap/keymap.c
 create mode 100644 keyboards/handwired/uthol/keymaps/oled/helix.c
 create mode 100644 keyboards/handwired/uthol/keymaps/oled/helix.h
 create mode 100644 keyboards/handwired/uthol/keymaps/oled/keymap.c
 create mode 100644 keyboards/handwired/uthol/keymaps/oled/ricardo.c
 create mode 100644 keyboards/handwired/uthol/keymaps/oled/rules.mk
 create mode 100644 keyboards/handwired/uthol/keymaps/oled/smiley.c
 create mode 100644 keyboards/handwired/uthol/keymaps/oled/star.c
 create mode 100644 keyboards/handwired/uthol/readme.md
 create mode 100644 keyboards/handwired/uthol/rev1/config.h
 create mode 100644 keyboards/handwired/uthol/rev1/readme.md
 create mode 100644 keyboards/handwired/uthol/rev1/rules.mk
 create mode 100644 keyboards/handwired/uthol/rev2/config.h
 create mode 100644 keyboards/handwired/uthol/rev2/readme.md
 create mode 100644 keyboards/handwired/uthol/rev2/rules.mk
 create mode 100644 keyboards/handwired/uthol/rev3/chconf.h
 create mode 100644 keyboards/handwired/uthol/rev3/config.h
 create mode 100644 keyboards/handwired/uthol/rev3/halconf.h
 create mode 100644 keyboards/handwired/uthol/rev3/mcuconf.h
 create mode 100644 keyboards/handwired/uthol/rev3/readme.md
 create mode 100644 keyboards/handwired/uthol/rev3/rev3.c
 create mode 100644 keyboards/handwired/uthol/rev3/rules.mk
 create mode 100644 keyboards/handwired/uthol/uthol.c
 create mode 100644 keyboards/handwired/uthol/uthol.h

diff --git a/keyboards/handwired/uthol/config.h b/keyboards/handwired/uthol/config.h
new file mode 100644
index 0000000000..1e0b533386
--- /dev/null
+++ b/keyboards/handwired/uthol/config.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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 MANUFACTURER Uthol
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 12
+
+#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/uthol/info.json b/keyboards/handwired/uthol/info.json
new file mode 100644
index 0000000000..40f99dbade
--- /dev/null
+++ b/keyboards/handwired/uthol/info.json
@@ -0,0 +1,248 @@
+{
+    "keyboard_name": "Uthol",
+    "url": "",
+    "maintainer": "uthol",
+    "layouts": {
+        "LAYOUT_uthol": {
+            "layout": [
+                {
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "x": 7,
+                    "y": 0
+                },
+                {
+                    "x": 8,
+                    "y": 0
+                },
+                {
+                    "x": 9,
+                    "y": 0
+                },
+                {
+                    "x": 10,
+                    "y": 0
+                },
+                {
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "x": 0,
+                    "y": 1
+                },
+                {
+                    "x": 1,
+                    "y": 1
+                },
+                {
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "x": 3,
+                    "y": 1
+                },
+                {
+                    "x": 4,
+                    "y": 1
+                },
+                {
+                    "x": 5,
+                    "y": 1
+                },
+                {
+                    "x": 6,
+                    "y": 1
+                },
+                {
+                    "x": 7,
+                    "y": 1
+                },
+                {
+                    "x": 8,
+                    "y": 1
+                },
+                {
+                    "x": 9,
+                    "y": 1
+                },
+                {
+                    "x": 10,
+                    "y": 1
+                },
+                {
+                    "x": 11,
+                    "y": 1
+                },
+                {
+                    "x": 0,
+                    "y": 2
+                },
+                {
+                    "x": 1,
+                    "y": 2
+                },
+                {
+                    "x": 2,
+                    "y": 2
+                },
+                {
+                    "x": 3,
+                    "y": 2
+                },
+                {
+                    "x": 4,
+                    "y": 2
+                },
+                {
+                    "x": 5,
+                    "y": 2
+                },
+                {
+                    "x": 6,
+                    "y": 2
+                },
+                {
+                    "x": 7,
+                    "y": 2
+                },
+                {
+                    "x": 8,
+                    "y": 2
+                },
+                {
+                    "x": 9,
+                    "y": 2
+                },
+                {
+                    "x": 10,
+                    "y": 2
+                },
+                {
+                    "x": 11,
+                    "y": 2
+                },
+                {
+                    "x": 0,
+                    "y": 3
+                },
+                {
+                    "x": 1,
+                    "y": 3
+                },
+                {
+                    "x": 2,
+                    "y": 3
+                },
+                {
+                    "x": 3,
+                    "y": 3
+                },
+                {
+                    "x": 4,
+                    "y": 3
+                },
+                {
+                    "x": 5,
+                    "y": 3
+                },
+                {
+                    "x": 6,
+                    "y": 3
+                },
+                {
+                    "x": 7,
+                    "y": 3
+                },
+                {
+                    "x": 8,
+                    "y": 3
+                },
+                {
+                    "x": 9,
+                    "y": 3
+                },
+                {
+                    "x": 10,
+                    "y": 3
+                },
+                {
+                    "x": 11,
+                    "y": 3
+                },
+                {
+                    "x": 0,
+                    "y": 4
+                },
+                {
+                    "x": 1,
+                    "y": 4
+                },
+                {
+                    "x": 2,
+                    "y": 4
+                },
+                {
+                    "x": 3,
+                    "y": 4
+                },
+                {
+                    "x": 4,
+                    "y": 4
+                },
+                {
+                    "x": 5,
+                    "y": 4,
+                    "w": 2
+                },
+                {
+                    "x": 7,
+                    "y": 4
+                },
+                {
+                    "x": 8,
+                    "y": 4
+                },
+                {
+                    "x": 9,
+                    "y": 4
+                },
+                {
+                    "x": 10,
+                    "y": 4
+                },
+                {
+                    "x": 11,
+                    "y": 4
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/uthol/keymaps/default/keymap.c b/keyboards/handwired/uthol/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d33f3eb6b6
--- /dev/null
+++ b/keyboards/handwired/uthol/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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 uthol_layers { _QWERTY, _COLEMAK, _LOWER, _RAISE, _SETTINGS };
+
+#define QWERTY DF(_QWERTY)
+#define COLEMAK DF(_COLEMAK)
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+#define SETTINGS MO(_SETTINGS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY]   = LAYOUT_uthol(KC_GRV, 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_DEL, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+  [_COLEMAK]  = LAYOUT_uthol(KC_GRV, 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_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+  [_LOWER]    = LAYOUT_uthol(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_MINS, KC_EQL, KC_INS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
+  [_RAISE]    = LAYOUT_uthol(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_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
+  [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_SLCK, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NLCK, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_SAI, RGB_MODE_PLAIN, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MODE_REVERSE, RGB_VAD, RGB_VAI, RGB_MODE_FORWARD)
+};
diff --git a/keyboards/handwired/uthol/keymaps/numswap/keymap.c b/keyboards/handwired/uthol/keymaps/numswap/keymap.c
new file mode 100644
index 0000000000..b571ba8b91
--- /dev/null
+++ b/keyboards/handwired/uthol/keymaps/numswap/keymap.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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 uthol_layers { _QWERTY, _COLEMAK, _LOWER, _RAISE, _SETTINGS };
+
+#define QWERTY DF(_QWERTY)
+#define COLEMAK DF(_COLEMAK)
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+#define SETTINGS MO(_SETTINGS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY]   = LAYOUT_uthol(KC_GRV, 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_DEL, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+  [_COLEMAK]  = LAYOUT_uthol(KC_GRV, 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_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+  [_LOWER]    = LAYOUT_uthol(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_MINS, KC_EQL, KC_INS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_P0, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
+  [_RAISE]    = LAYOUT_uthol(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_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_BSLS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_P0, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
+  [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLCK, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_NO, KC_NLCK, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
+};
diff --git a/keyboards/handwired/uthol/keymaps/oled/helix.c b/keyboards/handwired/uthol/keymaps/oled/helix.c
new file mode 100644
index 0000000000..9661914408
--- /dev/null
+++ b/keyboards/handwired/uthol/keymaps/oled/helix.c
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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 "helix.h"
diff --git a/keyboards/handwired/uthol/keymaps/oled/helix.h b/keyboards/handwired/uthol/keymaps/oled/helix.h
new file mode 100644
index 0000000000..584f9eae41
--- /dev/null
+++ b/keyboards/handwired/uthol/keymaps/oled/helix.h
@@ -0,0 +1,421 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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 "progmem.h"
+
+    static const char PROGMEM animation[][1024] = {
+        // 'frame_00_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0x7c, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x40, 0x00, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xcc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x70, 0x20, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe3, 0xf3, 0xfb, 0xfc, 0x7c, 0x3e, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x1f, 0x3f, 0x3e, 0x7e, 0x7e, 0x3c, 0x7c, 0x78, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x78, 0x78, 0x7e, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xfe, 0xfc, 0xfe, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x80, 0xf0, 0xfc, 0xff, 0x7f, 0x3f,
+         0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x0f, 0x03, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x08, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xdf, 0x1f, 0xbf, 0x7f, 0x3f, 0x1f, 0x1f, 0x1f, 0x3f, 0x7e, 0x7f, 0xfe, 0xfe, 0xff, 0xfd, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff,
+         0xff, 0x7f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfc, 0xfe, 0x7f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1e, 0xbe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe6, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xe0, 0xe8, 0xe0, 0xe0, 0xe1, 0xf3, 0xf3, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3c, 0x18, 0x0c, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xc7, 0xc1, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0x21, 0x31, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x08, 0x0d, 0x09, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_01_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0x3e, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0xc1, 0xc3, 0x03, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x81, 0xc3, 0xe1, 0xf8, 0xfc, 0x7e, 0x3e, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x03, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x6f, 0x1f, 0x1f, 0x3f, 0x1e, 0x3e, 0x3e, 0x7c, 0x7c, 0x7c, 0x7c, 0x78, 0x78, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x78, 0x78, 0x7c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xff, 0x7f,
+         0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x98, 0x98, 0x80, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xde, 0xcf, 0xdf, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff,
+         0xff, 0x1f, 0x0b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xfc, 0xfe, 0x7f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf6, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe2, 0xe0, 0xe1, 0xe3, 0xe3, 0xf7, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1c, 0x0d, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x40, 0x80, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0xff, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xf0, 0xfc, 0xff, 0xff, 0xdf, 0xc7, 0xe1, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x01, 0x01, 0x01, 0xc1, 0x81, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x43, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x06, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_02_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x10, 0x00, 0x40, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf9, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xfb, 0xf9, 0xfc, 0xfe, 0x3e, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x87, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x70, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xfe, 0x7e, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1e, 0x1e, 0x3e, 0x3e, 0x7c, 0x3c, 0x7c, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x7b, 0x7b, 0x7b, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xfe, 0x7c, 0xbc, 0xf8, 0xf0, 0xf0, 0xf0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xf0, 0xfc, 0xff,
+         0x7f, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xb0, 0xf8, 0xf0, 0x80, 0x80, 0x80, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7e, 0xff, 0xff, 0xfe, 0xff, 0xfd, 0xff, 0xff, 0xfd, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xef, 0xcf, 0xcf, 0xcf, 0xcf, 0xcf, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0x7f,
+         0x0f, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfe, 0xff, 0x3f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x0f, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xf0, 0xf1, 0xe3, 0xf3, 0xe7, 0xef, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x0c, 0x04, 0x02, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x20, 0xb0, 0xc0, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf8, 0xe0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xe7, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x07, 0x27, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_03_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf9, 0xfb, 0xff, 0xff, 0xf8, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x12, 0x00, 0xc0, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xfc, 0xff, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xc7, 0xe3, 0xf0, 0xf8, 0xfc, 0xfe, 0xbf, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xfe, 0x3e, 0x1f, 0x0f, 0x07, 0x03, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3e, 0x1e, 0x3e, 0x3e, 0x3c, 0x7c, 0x7c, 0x7c, 0x78, 0x78, 0x7d, 0x7e, 0x3e, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc1, 0xc1, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0xe0, 0xf0, 0xfc,
+         0xfe, 0xff, 0x1f, 0x07, 0x01, 0x00, 0x80, 0x80, 0x80, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xe0, 0xc0, 0xc0, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xfe, 0xf7, 0xdb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xcf, 0x8f, 0x8f, 0x8f, 0x8f, 0xcf, 0xcf, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x7f, 0x1f,
+         0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xfe, 0xff, 0x3f, 0x0f, 0x07, 0x07, 0x03, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x77, 0x63, 0xe0, 0xe0, 0xf0, 0xf1, 0xf3, 0xf3, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x1f, 0x9f, 0x06, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x48, 0x70, 0x30, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xef, 0xe3, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x41, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_04_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xfa, 0xf9, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0x3f, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x70, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xf9, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xe3, 0xe1, 0xe0, 0xf0, 0xf8, 0xfe, 0xfe, 0xdf, 0x8f, 0x87, 0x83, 0x03, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfc, 0xfe, 0x3f, 0x1f, 0x8f, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xcf, 0xe3, 0xf9, 0xf9, 0xff, 0x7f, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1e, 0x1e, 0x3e, 0x3e, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfe, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe3, 0xe3, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xf8,
+         0xf8, 0xff, 0xff, 0x9f, 0x87, 0x81, 0x80, 0xc0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x1f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xc0, 0xc0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xfd, 0xff, 0xef, 0xf7, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf3, 0xf3, 0xe3, 0xe3, 0xe3, 0xf7, 0xff, 0xff, 0xff, 0xbf, 0x8f, 0x87, 0x87, 0x87, 0xcf, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x3f, 0x3f, 0x03,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xff, 0x7f, 0x1f, 0x07, 0x03, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x7f, 0x1f, 0x0d, 0xc9, 0xdb, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x07, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x0d, 0x00, 0x09, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xef, 0xf1, 0xf0, 0xf0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x13, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_05_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0xc0, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x78, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xf1, 0xf1, 0xf1, 0xf0, 0xf8, 0xf9, 0xff, 0xff, 0xff, 0xcf, 0xc7, 0x83, 0x87, 0x87, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x7f, 0x7e, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfc, 0x7e, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x80, 0x80, 0xe0, 0xf8, 0xfc, 0xff, 0x7f, 0x1f, 0x0f, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x0f, 0x1f, 0x1f, 0x1e, 0x1e, 0x3e, 0x3e, 0x3e, 0x7f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xef, 0xec, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xe0,
+         0xf8, 0xfe, 0xff, 0xff, 0x9f, 0x87, 0xc1, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7d, 0x7e, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x7f, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf1, 0xf1, 0xe1, 0xe1, 0xc1, 0xc3, 0xc3, 0xe3, 0xf3, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x87, 0xc7, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x1f, 0x1f, 0x03, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfe, 0xff, 0x7f, 0x1f, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x3f, 0x3f, 0x1f, 0x1f, 0x7f, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xf7, 0xf1, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x8f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_06_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x38, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xef, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x79, 0xf9, 0x79, 0xf9, 0xf9, 0xf1, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xef, 0xcf, 0xcf, 0xcf, 0xdf, 0x9f, 0xbf, 0xbf, 0x7f, 0x7f, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x07, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xfc, 0xfe, 0x7f, 0x1b, 0x0f, 0x03, 0x01, 0x03, 0x01, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x0f, 0x1f, 0x1f, 0x5f, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xc0, 0xc0, 0x80, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+         0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf8, 0x7c, 0x7e, 0x3e, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf1, 0xf1, 0xf0, 0xc1, 0xc0, 0xc1, 0x81, 0x81, 0x81, 0xc1, 0xe1, 0xf1, 0xff, 0xff, 0x7f, 0x9f, 0x8f, 0xe3, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4f, 0x0f, 0x13, 0x01, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x48, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0x7f, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x7f, 0xbf, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xf7, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_07_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x3f, 0x7f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xfc, 0xfe, 0x3d, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x8f, 0xdf, 0xcf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0,
+         0xe0, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf0, 0xf8, 0x78, 0x7c, 0x3e, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xf7, 0xff, 0xdf, 0xef, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xf1, 0xe1, 0xf0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x01, 0x00, 0x80, 0xc1, 0xe1, 0xf1, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x03, 0x07, 0x01, 0x01, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x01, 0x0d, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe3, 0xf3, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x1f, 0x1f, 0x3f, 0x7f, 0x7e, 0xff, 0xfb, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_08_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xfe, 0xfe, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xef, 0xe7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x78, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0b, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xfc, 0xfd, 0x3f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x8f, 0x9f, 0x9f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0x78, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0,
+         0xf0, 0xf0, 0xf0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xf0, 0xf0, 0xf0, 0xf8, 0x78, 0x7c, 0x3e, 0x7f, 0x3f, 0xcf, 0x87, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xe3, 0xe1, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x80, 0xc0, 0xc0, 0xe0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x01, 0x03, 0x01, 0x01, 0x01, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x81, 0xc1, 0xe3, 0xf3, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_09_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc8, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xcf, 0xc7, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x70, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x3f, 0x1f, 0x1f, 0x1f, 0x3f, 0x1f, 0x1f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf0, 0xfc, 0x7f, 0x3f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xf0, 0xc0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe1, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0xf8, 0x78, 0x78, 0xf8,
+         0xf8, 0xf0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0x78, 0x7c, 0x3e, 0x7e, 0x3f, 0x1f, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfb, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xe7, 0xc3, 0xc1, 0x81, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x1c, 0x80, 0xc0, 0xe0, 0xe0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x83, 0xc3, 0xe7, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x78, 0x7c, 0x7c, 0x7c, 0x7c, 0x78, 0x78, 0x78, 0x78, 0x78, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0xfe, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_10_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0x9f, 0x8f, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x3f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xfa, 0xfc, 0x7f, 0x3f, 0x1f, 0x07, 0x03, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x3f, 0x3f, 0x7f, 0xff, 0xfd, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfc, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xc2, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x7c, 0x7c, 0x7c, 0x7c, 0x3c, 0x3c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c,
+         0x78, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x78, 0x7d, 0x7d, 0x3e, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0xdf, 0x8f, 0x87, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0xf0, 0x80, 0xc0, 0xe0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x06, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x87, 0x8f, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0x3c, 0x7c, 0x7c, 0x7c, 0xfc, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x27, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_11_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xdc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0x7e, 0x1f, 0x8f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xf7, 0xfe, 0xff, 0xfd, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x01, 0x01, 0x00, 0x00, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0xa0, 0xb0, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfe, 0x7e, 0x3f, 0x1f, 0x07, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc1, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c,
+         0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf0, 0xf0, 0xf0, 0xf0, 0x78, 0xf8, 0x78, 0x78, 0x7c, 0x3c, 0x3c, 0x3e, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xf7, 0xfb, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xbf, 0x8f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x01, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x0f, 0x1f, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0x78, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0xbc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x1e, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7e, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_12_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7c, 0x3e, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x77, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xfe, 0xf8, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x03, 0x00, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x07, 0x03, 0x05, 0x16, 0x12, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0xf1, 0xf9, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0x78, 0x7c, 0x3c, 0x3c, 0x3e, 0x3e, 0x1e, 0x1e, 0x1e, 0x1e, 0x3e, 0x1e, 0xfe,
+         0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xf8, 0x78, 0xf8, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x3c, 0x3c, 0x3f, 0x1e, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0xfe, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0xdf, 0x8f, 0x87, 0x83, 0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x0f, 0x0f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3e, 0x3e, 0x1e, 0x3e, 0x1e, 0x3e, 0x3e, 0x3e, 0x3c, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x5e, 0x1e, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_13_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0xf8, 0xf8, 0x7d, 0x3e, 0x1f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x1e, 0x1e, 0xc4, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0xc1, 0xe3, 0xf3, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x7c, 0x3c, 0x3c, 0x3e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1f, 0x1f, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7c, 0x7c, 0x7c, 0x78, 0x78, 0x78, 0x7c, 0x7c, 0x7c, 0x3c, 0x30, 0x3e, 0x1e, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xdf, 0xef, 0xff, 0xff, 0xff, 0xff, 0xbe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xdf, 0xcf, 0xc7, 0x83, 0x81, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb7, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0x7c, 0x3c, 0x3c, 0x1e, 0x1e, 0x1e, 0x1e, 0x1f, 0x1f, 0x1e, 0x1e, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x1e, 0x1e, 0x1e, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_14_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0xc0, 0xe0, 0xf8, 0xf8, 0x7c, 0x3e, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xde, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xc7, 0xf9, 0xfc, 0xff, 0x3f, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x87, 0xc7, 0xef, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xf7, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xa0, 0xe0, 0xe0, 0xf0, 0xf8, 0x78, 0x7c, 0x3c, 0x1e, 0x1e, 0x1e, 0x1f, 0x0f, 0x0f, 0xcf, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x3f, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1e, 0x0e, 0x1e, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xfe, 0x7e, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0x78, 0xf8, 0xf8, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xc7, 0xc3, 0xc1, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf9, 0xfb, 0xf3, 0xf7, 0xf3, 0xf7, 0xf7, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0x7c, 0x3e, 0x1e, 0x1e, 0x1e, 0x1f, 0x1f, 0x1f, 0x0f, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x1e, 0x1e, 0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x0f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_15_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xfd, 0xff, 0xfc, 0xff, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xf8, 0xf0, 0xe0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xbf, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xc7, 0x8f, 0x8f, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x03, 0x83, 0xd0, 0xf0, 0xfc, 0xff, 0x3f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x8f, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfe, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0xe0, 0xf0, 0xf0, 0xf8, 0x7c, 0x3c, 0x3e, 0x1e, 0x1f, 0x0f, 0x0f, 0xcf, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0x3f, 0x1f, 0x3f, 0x3e, 0x3e, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x1e, 0x3e, 0x1e, 0x1e, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x01, 0x80, 0x80, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xde, 0x9e, 0xbe, 0x3e, 0x3e, 0x3c, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xe7, 0xe3, 0xc1, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xfb, 0xff, 0xf7, 0xff, 0xfd, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf0, 0xf1, 0xf1, 0xe1, 0xf1, 0xe3, 0xe3, 0xf3, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xf0, 0xf0, 0xf8, 0x7c, 0x3c, 0x3e, 0x1e, 0x1f, 0x0f, 0x0f, 0x0f, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x0f, 0x0f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_16_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xbc, 0xfc, 0xff, 0xfc, 0xfd, 0xfc, 0xff, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xf0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xfd, 0xfb, 0xf9, 0xf1, 0xf9, 0xf9, 0xff, 0xff, 0xbf, 0x8f, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x07, 0x01, 0x00, 0xc0, 0xe0, 0xf8, 0xfc, 0xff, 0x3f, 0x0f, 0x07, 0x01, 0x01, 0x03, 0x03, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0xfe, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7c, 0x3e, 0x1e, 0x1f, 0x0f, 0xcf, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x8f, 0xef, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x1f, 0x1f, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x41, 0xe1, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xef, 0xff, 0xdf, 0xef, 0xff, 0xff, 0xff, 0xdf, 0xff, 0x7e, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xdf, 0x8f, 0x8f, 0x0f, 0x1f, 0x1f, 0x1e, 0x3e, 0x3e, 0xbe, 0xfc, 0xfc, 0xf8, 0xf8, 0xfe, 0xff, 0xfe, 0xff, 0xf7, 0xe3, 0xe1, 0xe0, 0xc0, 0xc0, 0xc0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7c, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x80, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xf7, 0xf3, 0xe1, 0xe0, 0xe0, 0xe0, 0xe1, 0xe1, 0xe3, 0xf3, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7c, 0x3e, 0x1e, 0x1f, 0x0f, 0x0f, 0x0f, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xcf, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_17_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x1c, 0x1c, 0x0c, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xf8, 0xfd, 0xf8, 0xfb, 0xfc, 0xf3, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xff, 0xff, 0xff, 0xfd, 0xfc, 0xf8, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0xf1, 0xf9, 0xff, 0xff, 0x3f, 0x0f, 0x07, 0x03, 0x03, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x83, 0x81, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0xfc, 0xff, 0xff, 0x3f, 0x0f, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfc, 0xfc, 0xfc, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0xc0, 0xc0, 0xf0, 0xf8, 0xf8, 0x7c, 0x3e, 0x1e, 0x1f, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x07, 0x07, 0x87, 0xcf, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1e, 0x1e, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x33, 0x27, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xdf, 0xff, 0xbf, 0xff, 0x7f, 0xff, 0xef, 0xef, 0xff, 0xfc, 0xf8, 0xf8, 0xf8, 0xfe, 0xfe, 0x9f, 0x8f, 0x8f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3e, 0x9e, 0xfe, 0xfc, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xf3, 0xf1, 0xf0, 0xe0, 0xe0, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x7c, 0x7e, 0x3e, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xef, 0xe7, 0xe3, 0xe1, 0xc0, 0xe0, 0xe0, 0xe0, 0xf1, 0xf1, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x2f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0x7c, 0x3e, 0x1e, 0x1f, 0x0f, 0x0f, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x9f, 0xcf, 0x8f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_19_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0xc0, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x71, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf3, 0xf0, 0xf1, 0xf0, 0xf0, 0xf1, 0xfe, 0xf8, 0xfd, 0xd0, 0x86, 0x80, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf1, 0xf8, 0xe0, 0xf0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfc, 0xfe, 0x7f, 0x1f, 0x0f, 0x07, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xe3, 0xe1, 0xc1, 0xc1, 0xc1, 0xc1, 0xc3, 0xc3, 0xc7, 0xf7, 0xff, 0xff, 0xff, 0xbf, 0xbf, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xdf, 0xff, 0xbf, 0xff, 0xff, 0xfb, 0xf8, 0xf0, 0xf0, 0xf0, 0xfc, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xa0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xef, 0xc3, 0x03, 0x01, 0x03, 0x03, 0x03, 0x83, 0xc3, 0xf3, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x07, 0x0f, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xe0, 0xe0, 0xc0, 0xe0, 0xf8, 0xfc, 0x7e, 0x3f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x9f, 0xff, 0xff, 0xfe, 0xfe, 0x7e, 0x3f, 0x7f, 0x7f, 0xfb, 0xf9, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf3, 0xf3, 0xf0, 0xf8, 0x7c, 0x7c, 0x3e, 0x1f, 0x0f, 0x0f, 0x07, 0x01, 0x00, 0x08, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xfb, 0xfd, 0xee, 0xff, 0xef, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xdf, 0x8f, 0xc7, 0xc3, 0xc1, 0xc0, 0xe0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0xc7, 0xc1, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xf8, 0xfc, 0x3e, 0x3f, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc7, 0xe7, 0xf7, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x1f, 0x3f, 0x3d, 0x7e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_18_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xfd, 0xfd, 0xf9, 0xff, 0xf1, 0xff, 0xf9, 0xfa, 0xf0, 0xeb, 0xe0, 0xe0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0x78, 0x78, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xf8, 0xf8, 0xf8, 0xe0, 0xe0, 0xc0, 0xe0, 0x80, 0x80, 0xc0, 0xf0, 0xf8, 0xfe, 0x7f, 0x1f, 0x0f, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xc1, 0xc0, 0xc0, 0xc0, 0x80, 0x81, 0xc1, 0xf1, 0xfb, 0xff, 0xff, 0x3f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf7, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xf8, 0xfc, 0xf0, 0xf0, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7c, 0x3e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x03, 0x03, 0x07, 0x03, 0x87, 0xe7, 0xf7, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x1f, 0x1f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7d, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xbf, 0xff, 0xf7, 0xff, 0xef, 0x7f, 0xff, 0xfe, 0xfc, 0xf8, 0xf8, 0xf0, 0xe0, 0xf8, 0xfc, 0xfe, 0x3f, 0x1f, 0x0f, 0x07, 0x07, 0x07, 0x0f, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x9f, 0xfe, 0xfe, 0xfe, 0xfc, 0x7f, 0x7f, 0xf7, 0xff, 0xfb, 0xf1, 0xf0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf8, 0x78, 0x7c, 0x3e, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x40, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08, 0x00, 0x00, 0x80, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xfe, 0xff, 0xfb, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xc7, 0xc3, 0xc1, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xc3, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7e, 0x3e, 0x1f, 0x0f, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x9f, 0x8f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_20_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x48, 0x48, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xf8, 0xf8, 0xf4, 0x12, 0xa4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x78, 0x7c, 0x7c, 0x3c, 0x3c, 0x3c, 0x7c, 0x3c, 0x3c, 0x7c, 0x3c, 0xfc, 0xfc, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xf7, 0xe3, 0xe1, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfc, 0xfe, 0x7f, 0x1f, 0xcf, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe3, 0xe3, 0xe1, 0xe1, 0xe1, 0xe3, 0xe3, 0xe3, 0xe7, 0xe7, 0xcf, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xfb, 0xff, 0xff, 0xef, 0xff, 0xff, 0xef, 0xff, 0x7f, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xf7, 0xe3, 0xf0, 0xf0, 0xfe, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0x07, 0x01, 0x81, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xc3, 0xc3, 0xfb, 0xfb, 0xff, 0x7f, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xef, 0xb7, 0xff, 0xbf, 0xff, 0xef, 0xfe, 0xde, 0xff, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0xc0, 0xf0, 0xfc, 0xfe, 0x7f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x87, 0xcf, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xf7, 0xff, 0xff, 0xf8, 0x78, 0x7c, 0x3c, 0x3e, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xdf, 0xff, 0xbd, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfe, 0xfe, 0x9f, 0x9f, 0x8f, 0xc7, 0xc3, 0xe1, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x03, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xf0, 0xf8, 0xfc, 0x7e, 0xbe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x87, 0x83, 0xc3, 0xe7, 0xf7, 0xff, 0xff, 0x7f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_21_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x16, 0x12, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x70, 0xc8, 0x58, 0x48, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x3c, 0x3c, 0x3c, 0x3c, 0x1c, 0x3e, 0x3e, 0x3e, 0x3e, 0x3e, 0x3e, 0xbe, 0xbe, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xe7, 0xc3, 0x83, 0x81, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf8, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xf7, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xe7, 0xf3, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0x17, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x81, 0xe1, 0xe1, 0xf1, 0xfb, 0xff, 0x3f, 0x1f, 0x07, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xef, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xfe, 0xec, 0xc8, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xfc, 0xfe, 0x7f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x03, 0x03, 0x83, 0x03, 0x07, 0x03, 0x87, 0xcf, 0xef, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf2, 0xfc, 0xfd, 0x7c, 0x78, 0x78, 0x3c, 0x3e, 0x1e, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xf7, 0xbf, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xf7, 0xf9, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xbc, 0xbe, 0x9f, 0x8f, 0xcf, 0xc7, 0xe3, 0xf9, 0xfc, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0x00, 0x40, 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xd8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x03, 0x83, 0xc7, 0xef, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_22_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x04, 0x0d, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x60, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x7c, 0x3c, 0x3c, 0x3c, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xef, 0xff, 0xff, 0xfe, 0xbe, 0xff, 0xff, 0xfe, 0xfb, 0xfa, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0x8f, 0x47, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 0xe0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf3, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xfc, 0xf0, 0xf0, 0xf8, 0xf8, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0xa0, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0x7f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x80, 0xc0, 0xe1, 0xf1, 0xfd, 0xff, 0x3f, 0x1f, 0x07, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xff, 0x3f, 0x1f, 0x07, 0x03, 0x03, 0x01, 0x21, 0x01, 0x01, 0x03, 0x03, 0x83, 0x83, 0xc7, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7a, 0x78, 0x78, 0x78, 0x78, 0x78, 0x7c, 0xf8, 0x78, 0x3c, 0x3c, 0x3e, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfc, 0xf7, 0xff, 0xff, 0xef, 0xff, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xe3, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0x78, 0x7c, 0xbe, 0x9e, 0x9f, 0xcf, 0xe7, 0xf3, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x07, 0x00, 0x00, 0x40, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x27, 0x03, 0x07, 0x8f, 0x8f, 0xdf, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_23_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xd0, 0x90, 0x78, 0x7c, 0x3c, 0x3c, 0x1e, 0x1e, 0x1e, 0x1f, 0x1f, 0x0f, 0x1f, 0x1f, 0x1f, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xff, 0xfe, 0xf1, 0xed, 0xe8, 0xf0, 0xf8, 0xfc, 0xbe, 0xbf, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf9, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xd8, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f,
+         0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf9, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x78, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x20, 0x00, 0x00, 0xe0, 0xf8, 0xfc, 0xff, 0x3f, 0x0f, 0x07, 0x03, 0x09, 0x09, 0x01, 0x01, 0x01, 0x01, 0x01, 0x83, 0x83, 0xe3, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3d, 0x7c, 0x7c, 0x78, 0x78, 0x78, 0xf8, 0xf8, 0xf8, 0xfc, 0x3c, 0x3c, 0x3e, 0x1e, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x01,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf9, 0xef, 0xff, 0xff, 0xdf, 0xf7, 0xbf, 0xff, 0xdf, 0x9f, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xef, 0xe3, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0x78, 0x7c, 0x3c, 0xbe, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x20, 0x70, 0x20, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0xc0, 0xe0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x2f, 0x07, 0x0f, 0x0f, 0x9f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_24_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xe3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0x78, 0x3c, 0x3c, 0x1e, 0x1e, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xfc, 0xf4, 0xe4, 0xa6, 0xf0, 0xf8, 0xf8, 0xfe, 0xbf, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 0x30, 0x00, 0x00, 0x80, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xf0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe4, 0xe0, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07,
+         0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0xc1, 0xf3, 0xf7, 0xff, 0x7f, 0x3f, 0x1f, 0x3f, 0x3f, 0x7e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xf0, 0xfc, 0xfe, 0xfe, 0xff, 0xbf, 0xdf, 0xef, 0xff, 0x7f, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xfe, 0xff, 0x3f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x81, 0xc1, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3e, 0x3e, 0x3e, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0xfc, 0x7c, 0xfe, 0xbc, 0x3c, 0x3e, 0x1e, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x03,
+         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xed, 0xff, 0xbf, 0xef, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xf8, 0xff, 0xff, 0xff, 0xef, 0xe3, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0x78, 0x7c, 0xbc, 0xbe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x7c, 0x78, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x0f, 0x1f, 0x3f, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xfb, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_25_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x84, 0x80, 0x80, 0xe0, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x7c, 0x3c, 0x3e, 0x1e, 0x1f, 0x0f, 0x0f, 0x0f, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0xe0, 0x90, 0x20, 0xf8, 0xa0, 0xf8, 0xf8, 0x3e, 0x7f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0xc0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x07,
+         0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x83, 0x87, 0xef, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf8, 0xfc, 0xfe, 0xbe, 0xff, 0xbf, 0xff, 0xbf, 0x7e, 0xfe, 0xfc, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xfc, 0xfe, 0x7f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x0f, 0x1f, 0x1e, 0x3e, 0x1e, 0x3e, 0x3e, 0x3e, 0x3c, 0x3c, 0x3c, 0x3c, 0x3e, 0x1e, 0x1e, 0x1e, 0x0f, 0x0f, 0x07, 0x07, 0x03,
+         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x15, 0x03, 0x03, 0x03, 0x17, 0x37, 0x7f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xff, 0xff, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xfe, 0xff, 0xed, 0xff, 0xfb, 0xfd, 0x3f, 0xdf, 0xff, 0x3f, 0xff, 0xfe, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xff, 0xff, 0xff, 0xf7, 0xf1, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0x78, 0x7c, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x07, 0x0f, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfc, 0x7c, 0x7c, 0x78, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x0f, 0x1f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfb, 0xbf, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_26_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0xf8, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0x7c, 0x3c, 0x3e, 0x1e, 0x1f, 0x0f, 0x0f, 0x87, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x60, 0x70, 0xf0, 0x7c, 0xfe, 0x7f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x06, 0x0e, 0x04, 0x00, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xbf, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfb, 0xfd, 0xfd, 0xff, 0xfb, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf2, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x78, 0x78, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x8f,
+         0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x07, 0x07, 0x0f, 0x8f, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x7e, 0xbe, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xff, 0x7f, 0x1f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x2f, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x0f, 0x1f, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x0f, 0x0f, 0x0f, 0x07, 0x07,
+         0x03, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfd, 0xff, 0xfb, 0xff, 0xff, 0xeb, 0x77, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xf7, 0xf1, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x3f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x07, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfc, 0x7c, 0x3c, 0x7c, 0x7c, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x3f, 0x7e, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xef, 0xfb, 0xff, 0xef, 0xff, 0xff, 0xbf, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_27_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xf8, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x80, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf0, 0xf8, 0x7c, 0x3c, 0x1e, 0x1f, 0x0f, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xe0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x48, 0xe0, 0x70, 0xfc, 0xfe, 0x7f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x03, 0x03, 0x00, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x20, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x9f, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xef, 0xf7, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xe2, 0xf9, 0xeb, 0xff, 0xff, 0xf8, 0xf8, 0x78, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x7c, 0x7c, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x9f,
+         0x8f, 0x87, 0x83, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x1f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x0f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xbe, 0xfe, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xff, 0x7f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x07, 0x07, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07,
+         0x03, 0x03, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0x9f, 0xbf, 0xff, 0xf7, 0xff, 0xf7, 0xff, 0xff, 0xdf, 0xff, 0xf7, 0xbf, 0xff, 0xff, 0xbf, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf8, 0x78, 0x78, 0x78, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x65, 0x70, 0x30,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfc, 0xfc, 0x7e, 0x3e, 0x3e, 0x7c, 0x7c, 0x78, 0xf8, 0xf8, 0xf7, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xbf, 0xff, 0xfe, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0x7c, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_28_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0x3e, 0x1e, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfe, 0xfc, 0xf8, 0xf0, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x00, 0x80, 0xe0, 0xf0, 0xfc, 0xfe, 0x7f, 0x1f, 0x0f, 0x03, 0x01, 0x01, 0x00, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x08, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xaf, 0x4f, 0x5f, 0xff, 0x7f, 0x7c, 0x3c, 0x7c, 0x7c, 0x78, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf0, 0xf8, 0x78, 0x7c, 0x3c, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf8, 0xfc, 0xfe, 0xff,
+         0xdf, 0xcf, 0xc7, 0x81, 0x81, 0x81, 0x01, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xf3, 0xf3, 0xff, 0xff, 0x7f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0x7c, 0xbe, 0x7e, 0xfc, 0xfc, 0xfc, 0xf8, 0xf0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xff, 0x3f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x07, 0x03, 0x01, 0x03, 0x83, 0x87, 0x07, 0x0f, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07,
+         0x07, 0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfb, 0xe7, 0xff, 0xff, 0xff, 0xbe, 0xef, 0xf7, 0xf7, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0x70, 0x78, 0x7c, 0x78, 0x78, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xff, 0x7f, 0x7f, 0x7b, 0x78, 0x78, 0x78, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfc, 0xfe, 0x3e, 0x1e, 0x3e, 0x7e, 0x3c, 0xfc, 0xff, 0xff, 0x7f, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_29_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x09, 0x09, 0x10, 0x05, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7c, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xfc, 0xfc, 0xf8, 0xf0, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xfe, 0x7f, 0x1f, 0x07, 0x03, 0x81, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xdf, 0xdf, 0x9f, 0xef, 0xff, 0x3f, 0x7f, 0xfe, 0x3f, 0x3f, 0x3e, 0x3e, 0x3c, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0x7c, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf0, 0xf8, 0xfc, 0xfe,
+         0xff, 0xff, 0xc7, 0xc3, 0xc3, 0x83, 0x87, 0x87, 0x8f, 0x9f, 0x9f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfd, 0xfa, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x7f, 0x1f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0x7c, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfe, 0xff, 0x3f, 0x0f, 0x07, 0x01, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0xe3, 0x63, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x0f, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07,
+         0x07, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x3e, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xfd, 0xf6, 0xef, 0xff, 0xd3, 0xfb, 0x7f, 0xff, 0xff, 0x7f, 0xbf, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xbc, 0xbc, 0x3c, 0x1c, 0x1c, 0x3c, 0x7c, 0x3c, 0x7c, 0xfc, 0xfc, 0xf8, 0xfc, 0xfe, 0x7f, 0x7f, 0x7f, 0x7f, 0x78, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x38, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xfc, 0xfe, 0xff, 0x1f, 0x1f, 0x1e, 0xfe, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xfb, 0xf9, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x38, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_30_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x20, 0x0e, 0x00, 0x26, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xfe, 0x7f, 0x1f, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xef, 0xc7, 0xc7, 0x87, 0x8f, 0x0f, 0x0f, 0xcf, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x1f, 0x1f, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x1f, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xfd, 0xfc, 0xf8, 0xf8, 0xf8, 0xfe,
+         0xff, 0xff, 0xff, 0xe7, 0xe7, 0xcf, 0xcf, 0xdf, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe1, 0xf2, 0xf6, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xff, 0x3f, 0x0f, 0xc3, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0x7e, 0x3f, 0x1f, 0x0f, 0x07, 0x19, 0x19, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x07, 0x07, 0x07, 0x07,
+         0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xff, 0xdf, 0xef, 0xbf, 0xff, 0xfe, 0xfc, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xbe, 0xbe, 0x1e, 0x1e, 0x3e, 0x1e, 0x1e, 0x1e, 0x3e, 0x3e, 0x3c, 0x3c, 0xbc, 0xfc, 0xfc, 0xfc, 0xff, 0x7f, 0x7f, 0x3f, 0xff, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x03, 0x01, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf8, 0xfe, 0xff, 0x7f, 0x1f, 0xdf, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xf7, 0xef, 0xff, 0xff, 0xfd, 0xfe, 0xfb, 0xff, 0xfe, 0xff, 0xff, 0xdf, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7e, 0xfc, 0xfe, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_31_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x40, 0x00, 0x00, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xfc, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xc0, 0x80, 0xc0, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xc0, 0xe0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x13, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0xe0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xe7, 0xe7, 0xc7, 0x87, 0x83, 0x07, 0x07, 0x07, 0x07, 0x07, 0x87, 0x87, 0xe7, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x1f, 0x1f, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x3e, 0x3c, 0xfc, 0xfd, 0xfd, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xbf, 0xff, 0xff, 0xef, 0x81, 0xc8, 0xfc, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xf8, 0x78, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xfe, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0x0f, 0x0f, 0x05, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x03, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x0f,
+         0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xf5, 0xd3, 0xfb, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xfc, 0x7c, 0xf8, 0xf0, 0xf0, 0xf8, 0xfc, 0xfc, 0x3c, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x3e, 0x3e, 0xbe, 0xfe, 0xfc, 0xfc, 0xff, 0x7f, 0x3f, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf7, 0xfc, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xe0, 0xc4, 0xec, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_32_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x08, 0x12, 0x10, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x8e, 0xf4, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0x34, 0x00, 0x20, 0x20, 0xe0, 0xc0, 0xc0, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xef, 0xff, 0xff, 0xef, 0xff, 0xdf, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc7, 0xc3, 0x83, 0x83, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x87, 0x87, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x1f, 0x0f, 0x1f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x90, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xde, 0xfc, 0xfe, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0x7f, 0xbf, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd7, 0xe0, 0xf0, 0xf0, 0xf8, 0x7c, 0x3e, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f,
+         0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0x7f, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf5, 0xbb, 0x4b, 0xb5, 0xff, 0x7b, 0xbf, 0xdf, 0xff, 0xfe, 0xfc, 0xfc, 0xf0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0x7c, 0x3e, 0x1e, 0x1e, 0x1e, 0x1f, 0x1f, 0x0f, 0x0f, 0x1f, 0x0f, 0x1f, 0x1e, 0x1e, 0x1e, 0x9e, 0xbe, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf7, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xfe, 0x3e, 0x3e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_33_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x08, 0x58, 0x08, 0x80, 0x30, 0x00, 0x00, 0x04, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc1, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0,
+         0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xe0, 0xf0, 0xf1, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xef, 0xc7, 0xc7, 0x83, 0x83, 0x03, 0x03, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x01, 0x01, 0x03, 0x03, 0x83, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0xdf, 0xdf, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x17, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0x70, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfe, 0xff, 0xfd, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0xc1, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0x7e, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f,
+         0x7f, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xfe, 0xfa, 0x7d, 0x7d, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0x6f, 0x9f, 0xfe, 0xff, 0x97, 0xff, 0xbf, 0xff, 0x7e, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0xf0, 0xf0, 0xf8, 0x7c, 0x3c, 0x3e, 0x1e, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x9f, 0xdf, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1c, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xfd, 0xff, 0xe7, 0xff, 0xcf, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xfb, 0xff, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_34_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xe3, 0xf0, 0xe4, 0xf0, 0xf0, 0xf6, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x81, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xe0, 0xf8,
+         0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x8f, 0x0f, 0x0f, 0x8f, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xdf, 0x8f, 0x87, 0x07, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xc3, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x0f, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x7f, 0x0f, 0x9f, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x1f, 0x9f, 0xff, 0xff, 0xff, 0xaf, 0x80, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7c, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x01, 0x01, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xfd,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfb, 0xeb, 0x61, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf3, 0xfd, 0xff, 0xef, 0xff, 0xff, 0x7b, 0x3f, 0xdf, 0xff, 0x7e, 0xfc, 0xfc, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7c, 0x3e, 0x1e, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x0f, 0x87, 0x8f, 0x8f, 0x0f, 0x0f, 0x0f, 0x0f, 0x8f, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf9, 0xf9, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_35_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0x68, 0xd8, 0x98, 0xa0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xc3, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfe,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xfe, 0x3e, 0x7c, 0x78, 0xf8, 0xf4, 0xe0, 0xf8, 0xf8, 0xfc, 0xfe, 0x1f, 0x9f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x01, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0xf0, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x1f, 0x3f, 0x3f, 0x3f, 0xff,
+         0xff, 0xfc, 0xf8, 0xf8, 0xf8, 0xfd, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x83, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x7c, 0x3e, 0x3f, 0x1f, 0x0f, 0x07, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xfe, 0xff, 0xff, 0xff,
+         0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc7, 0xff, 0x43, 0x7f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xef, 0xf7, 0xef, 0xbf, 0x5f, 0xff, 0xff, 0xdf, 0x7e, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0x7c, 0x3e, 0x3e, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0xc7, 0xe7, 0x07, 0x07, 0x07, 0x0f, 0x07, 0x8f, 0x8f, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x3b, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xfe, 0xff, 0xfb, 0xee, 0xfb, 0xff, 0xe7, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_36_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0x78, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xe1, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x30, 0x38, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfc, 0xfe,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xf8, 0xf8, 0xf0, 0xf0, 0xd0, 0xc0, 0xa0, 0xb8, 0xfc, 0xfc, 0x3e, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x08, 0x1c, 0x21, 0x33, 0x22, 0x21, 0x0c, 0x00, 0xc0, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x1f, 0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x7f, 0x7f, 0xff, 0xff,
+         0xfe, 0xff, 0xfb, 0xc7, 0x87, 0x87, 0xc7, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x81, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x7c, 0x3e, 0x1f, 0x0f, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0x8f, 0xaf, 0x37, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xdf, 0x6f, 0xef, 0xdf, 0xff, 0xfe, 0xfc, 0xfc, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7c, 0x3e, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x77, 0x37, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xf7, 0xfb, 0xef, 0xff, 0xf7, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x70, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_37_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xe3, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf6, 0xfc, 0xfe, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xf8, 0xe0, 0xe0, 0xc0, 0x82, 0x40, 0x00, 0x60, 0xf8, 0xfc, 0x7e, 0x3e, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x20, 0x60, 0x20, 0xfc, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x7e, 0x7f, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xf7, 0xcf, 0x4f, 0x37, 0x3f, 0x7f, 0xfe, 0xfe, 0xdf, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf3, 0xf8, 0xfc, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x83, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x7d, 0x7f, 0x3f, 0x1f, 0x0f, 0x0f, 0x0f, 0x1e, 0x1c, 0x3c, 0x7c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xdf, 0x9f, 0x0f, 0x63, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xfb, 0xff, 0xff, 0xff, 0xef, 0xff, 0x7e, 0xfe, 0xf4, 0xe0, 0xf0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7e, 0x1f, 0x1f, 0x0f, 0x07, 0x07, 0x1f, 0x3f, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xed, 0xfe, 0xff, 0xdf, 0xf7, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_38_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xdf, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x78, 0x7c, 0x3c, 0x3c, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xf0, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf4, 0xfc, 0xfe, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0xe0, 0xf0, 0xf8, 0xfc, 0x7e, 0x3f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x3f, 0x3e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff,
+         0xff, 0xef, 0xff, 0xbf, 0xff, 0x7f, 0x7f, 0xff, 0xfc, 0xf8, 0xf9, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xff, 0x97, 0xeb, 0xdb, 0xd7, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x8f, 0x83, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf1, 0xf1, 0xfb, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x63, 0xc0, 0xc3, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xbf, 0x1f, 0xd3, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xdf, 0xff, 0xef, 0xff, 0x7f, 0xfe, 0xfe, 0xfb, 0xf4, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf0, 0xfc, 0x7e, 0x3e, 0x1f, 0x0f, 0x07, 0x07, 0x0f, 0x0f, 0x03, 0x03, 0x03, 0x03, 0x03, 0xc3, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xe7, 0xf3, 0xdf, 0xf7, 0xdf, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_39_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x8f, 0xe3, 0xf1, 0xf8, 0xfe, 0x7f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x7c, 0x3c, 0x3c, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xfc, 0xfc, 0xfe, 0x7f, 0xff, 0xff, 0xfb, 0xf8, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xd8, 0xfc, 0xfe, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7e, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0x3f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0xd8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7d, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff,
+         0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xe3, 0xe3, 0xe7, 0xff, 0xcf, 0xef, 0xff, 0x9f, 0x9e, 0xbe, 0xbe, 0xbe, 0xbc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xc7, 0xc3, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe1, 0xe3, 0xf3, 0xf7, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xf7, 0x3b, 0x17, 0x1f, 0x1f, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0x78, 0x7f, 0x98, 0xbf, 0x13, 0xd1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x7f, 0x7f, 0xaf, 0xbf, 0xfe, 0xfd, 0xf9, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x01, 0x01, 0x01, 0x81, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x03, 0x02, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x40, 0xc0, 0x41, 0x01, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xfb, 0xec, 0xff, 0xdf, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xbf, 0xbf, 0xbf, 0xbc, 0xbc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_40_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x1f, 0x0f, 0x03, 0x83, 0xe1, 0xe8, 0xf8, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x3c, 0x3c, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x3f, 0xbe, 0xbe, 0xfc, 0xfe, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x78, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0x7c, 0x7e, 0xfe, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xfc, 0xfc, 0xbf, 0x9f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xf2, 0xf8, 0xfe, 0x7f, 0x3f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x70, 0x70, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0xdf, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xf9, 0xff, 0xff, 0xd7, 0x8f, 0x87, 0x87, 0xc7, 0x87, 0x8f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1e, 0xbe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xfc, 0xff, 0xff, 0xdf, 0xc7, 0xc1, 0xc0, 0xc1, 0xe1, 0xe3, 0xe3, 0xe7, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xaf, 0x27, 0xa5, 0x90, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xef, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf4, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x3e, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x01, 0x01, 0x81, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x01, 0x00, 0x18, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfc, 0xf3, 0xff, 0xff, 0xe6, 0xbf, 0x7f, 0xff, 0xbf, 0xdf, 0xff, 0xff, 0xfd, 0xfd, 0xf9, 0xf1, 0xf3, 0xf3, 0xf3, 0xff, 0xff, 0xff, 0xbf, 0x9f, 0x9f, 0x9f, 0x1f, 0x3f, 0x3e, 0x3e, 0xbc, 0xbc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_41_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x84, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x4f, 0x07, 0x03, 0x01, 0x81, 0xc0, 0xf0, 0xf8, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x80, 0xd0, 0xe0, 0xe0, 0xf0, 0xf8, 0x78, 0x7c, 0x3c, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x1f, 0x1f, 0x9f, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0x3f, 0x3f, 0x7f, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xbc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0x78, 0x78, 0x78, 0x78, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0x9f, 0x8f, 0x87, 0x03, 0x01, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0x9f, 0x82, 0xc0, 0xf0, 0xf0, 0xfe, 0x7f, 0x3f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0xfe, 0xfe, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xf8, 0xfd, 0xff, 0x7f, 0x1f, 0x47, 0x03, 0x87, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x38, 0x70, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0xc0, 0x80, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe2, 0xe0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xe7, 0xe1, 0xe3, 0xe7, 0xe7, 0xef, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xfe, 0xfc, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0xfe,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0xff, 0xcb, 0x68, 0x48, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0xef, 0xff, 0x5f, 0xff, 0xff, 0x7e, 0xfc, 0xf8, 0xf0, 0xe0, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0xc0, 0xf0, 0xf0, 0xfc, 0x7e, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x81, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x03, 0x01, 0x03, 0x03, 0x01, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x06, 0x07, 0x07, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x03, 0x03, 0x0c, 0x08, 0x00, 0x0a, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfe, 0xff, 0xff, 0xfb, 0xff, 0xbe, 0xdb, 0xff, 0xf7, 0xfb, 0xef, 0xbf, 0xff, 0xff, 0xbf, 0xff, 0xf8, 0xf8, 0xf0, 0xe0, 0xe1, 0xe1, 0xe1, 0xf3, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1e, 0xbe, 0x9e, 0xfe, 0xfe, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_42_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x01, 0x80, 0xc0, 0xf0, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0xcf, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xff,
+         0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xfc, 0xfc, 0xe0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf8, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0x78, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xdf, 0xc7, 0x83, 0x81, 0x81, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0x07, 0x01, 0x80, 0xc0, 0xc0, 0xe0, 0xf8, 0xfc, 0x7f, 0x3f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x7f, 0x7f, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xbf, 0xfe,
+         0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfe, 0x7f, 0x3f, 0x0f, 0x07, 0x03, 0x03, 0x03, 0x03, 0x07, 0x87, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, 0x06, 0x06, 0x2c, 0x20, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x00, 0x00, 0x32, 0x38, 0x39, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xe0, 0x80, 0xc2, 0xc3, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xe7, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xf8, 0xfe, 0xfe, 0xfe, 0xfe, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x4d, 0x54, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0x78, 0x78, 0x78, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xfd, 0x7f, 0x3f, 0x1f, 0x07, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x24, 0x4e, 0x00, 0x64, 0x2c, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfb, 0xec, 0xff, 0xdb, 0xe7, 0xfe, 0xdb, 0xff, 0xb7, 0xff, 0xdf, 0xff, 0xbf, 0xff, 0x7f, 0xff, 0xf1, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xe0, 0xf1, 0xfb, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x0f, 0x0f, 0x1f, 0x9f, 0x9f, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_43_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x9f, 0x8f, 0x8f, 0x8f, 0x83, 0x83, 0x81, 0x81, 0x01, 0x01, 0xe1, 0xf1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x87, 0xcf, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfd, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe,
+         0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf6, 0xee, 0xc4, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0x78, 0x78, 0x7c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x3c, 0x7c, 0x7c, 0x7c, 0xf8, 0x78, 0xf8, 0xf8, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xef, 0xc7, 0xc3, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xff, 0x07, 0x02, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7f, 0xff, 0xdf, 0xc7, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc6, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfc, 0xf8,
+         0xf0, 0xf0, 0xe0, 0xf8, 0xfc, 0xd8, 0xf8, 0xe0, 0xf0, 0xf8, 0xfc, 0x7f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x83, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x70, 0x20, 0x80, 0x80, 0xd8, 0xf8, 0xe0, 0xf0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf1, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xfe, 0xfe, 0xf0, 0xe2, 0xf0, 0xfc, 0xfe, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x1d, 0x24, 0x3a, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xf8, 0xf0, 0xf0, 0x80, 0x00, 0x00, 0x03, 0x03, 0x83, 0xe0, 0xf0, 0xf8, 0xf8, 0x78, 0x78, 0x78, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xe0, 0xf8, 0xf8, 0xfc, 0x7f, 0x1f, 0x0f, 0x07, 0x03, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xe1, 0xf0, 0xf8, 0xfc, 0x7f, 0x3f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x70, 0x00, 0x20, 0x60,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xfe, 0xf9, 0x67, 0xfe, 0xfe, 0xff, 0xbf, 0xff, 0x7f, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xe3, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf1, 0xf9, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x07, 0x0f, 0x8f, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_44_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xcf, 0xcf, 0xdf, 0xfb, 0xdb, 0xc3, 0x83, 0x83, 0x83, 0x83, 0x83, 0xe3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x07, 0x07, 0x03, 0x07, 0x07, 0x07, 0x03, 0x07, 0x07, 0x07, 0x87, 0xe7, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
+         0xfc, 0xfc, 0x78, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc6, 0xc6, 0x80, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0x7c, 0x3c, 0x3c, 0x3c, 0x3e, 0x3e, 0x3e, 0x3e, 0x3c, 0x3c, 0x7c, 0x7c, 0x7c, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x37, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0x7f, 0x3f, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x8e, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0xf9, 0xf0, 0xf0,
+         0xe0, 0xe0, 0xc0, 0x8e, 0x8e, 0x0e, 0x80, 0xc0, 0xe0, 0xf0, 0xfc, 0x7e, 0x3f, 0x1f, 0x0f, 0x07, 0x01, 0x81, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x10, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7c, 0x78, 0x78, 0x79, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xec, 0x84, 0x04, 0xcc, 0xfe, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x07, 0x0f, 0x03, 0x1c, 0x0a, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0xfe, 0xfe, 0xfc, 0xf8, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x71, 0x70, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0x7c, 0x3c, 0x7c, 0x7c, 0x78, 0x78, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xbf, 0x1f, 0x0f, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xc1, 0xe0, 0xe0, 0xf0, 0xf8, 0x7e, 0x3f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x40, 0x00, 0x80,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf9, 0x76, 0xb7, 0xff, 0xe5, 0xff, 0xdb, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xcf, 0x83, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0x7d, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x87, 0x87, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x01, 0x00, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_45_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xfb, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xcf, 0xe7, 0xe7, 0xff, 0xf3, 0xe3, 0xc3, 0xc3, 0xc3, 0xc3, 0xc7, 0xc7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0xc3, 0xe7, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8,
+         0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x87, 0x02, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0x78, 0x7c, 0x3c, 0xbc, 0x9e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x3e, 0x3e, 0x3c, 0xfc, 0xfc, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd3, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe2, 0xf3, 0xff, 0xfe, 0x7f, 0x3f, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x3c, 0x1f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xe0, 0xc0,
+         0xc0, 0xc0, 0x83, 0x03, 0x03, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xf0, 0xfc, 0x7e, 0x3f, 0x1f, 0x0f, 0x87, 0xe1, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x87, 0x87, 0x07, 0x07, 0x07, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x18, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3c, 0x7c, 0x3d, 0x5f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf8, 0xf8, 0x98, 0x0c, 0x1e, 0xff, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x07, 0x03, 0x06, 0x07, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xfe, 0xfc, 0xf9, 0xe1, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0xe0, 0xe0, 0xf8, 0xf8, 0x7c, 0x3c, 0x3c, 0x3c, 0x7c, 0x7c, 0x7c, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xf0, 0xf8, 0xfc, 0xff, 0xbf, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0x7e, 0x3f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9f, 0xcb, 0xf7, 0xd7, 0xdf, 0xbf, 0xbf, 0xff, 0xfe, 0xbe, 0xfc, 0xf8, 0xf8, 0xe0, 0xfe, 0xff, 0xff, 0xbf, 0x8f, 0x81, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0x7c, 0x7c, 0x3f, 0x1f, 0x0f, 0x07, 0x87, 0xc3, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x03, 0x23, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x10, 0x15, 0x04, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_46_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xef, 0xe7, 0xe7, 0xe7, 0xf7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xef, 0xef, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x0f, 0x07, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x41, 0x61, 0xc1, 0x01, 0x01, 0x01, 0x03, 0x81, 0xe3, 0xf3, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0x70,
+         0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0x80, 0x80, 0x02, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0x7c, 0xfc, 0xfe, 0xfe, 0xde, 0x1e, 0x1f, 0x1f, 0x1f, 0x0f, 0x1f, 0x1e, 0x1e, 0x1e, 0x1e, 0xfe, 0xfe, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xf2, 0xf8, 0xfe, 0x7f, 0x3f, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfe, 0x7f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xc7, 0xe1, 0x80,
+         0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf0, 0xf0, 0xfc, 0x7e, 0x3f, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x67, 0x03, 0x47, 0x07, 0x03, 0x03, 0x07, 0x07, 0x07, 0x03, 0x07, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3e, 0x3f, 0x3f, 0x3f, 0x3f, 0xbf, 0x7f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf9, 0xf8, 0xbc, 0x1e, 0x1f, 0x3f, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x00, 0x01, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfc, 0xfc, 0xfb, 0xe2, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf8, 0xfc, 0x7c, 0x3e, 0x3e, 0x3e, 0x3e, 0x3c, 0x7c, 0x7c, 0x78, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x81, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xfa, 0x7c, 0x7e, 0x3f, 0x1f, 0x0f, 0x03, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x7e, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd7, 0xdf, 0x6d, 0x95, 0xff, 0x7f, 0xff, 0xff, 0x7c, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0xe2, 0xfc, 0xff, 0xff, 0xff, 0x87, 0x81, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x7c, 0x3e, 0x3f, 0x1f, 0x8f, 0xc7, 0xe3, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x16, 0x2a, 0x2a, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_47_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xef, 0xef, 0xf7, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x37, 0x03, 0x03, 0x03, 0x03, 0x01, 0x09, 0x0d, 0x0d, 0x00, 0x01, 0x01, 0x03, 0x03, 0x01, 0x01, 0x81, 0xe3, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0,
+         0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xf8, 0x7c, 0x7e, 0x7e, 0x1e, 0x0f, 0x0f, 0x0f, 0x0f, 0x8f, 0xcf, 0x0f, 0x1f, 0x0f, 0x1f, 0x1f, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xfc, 0x7e, 0x7f, 0x3f, 0x1f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfc, 0xf8, 0xf8, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0x8f, 0x07, 0x01,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb9, 0xd1, 0x71, 0x01, 0x03, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf8, 0xfd, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xf7, 0xf3, 0xfb, 0xfd, 0xfe, 0x3f, 0x3f, 0x7f, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xf8, 0xfe, 0xf6, 0xa0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfc, 0xfc, 0x3e, 0x1e, 0x1e, 0x1e, 0x3e, 0x3e, 0x3e, 0x7c, 0x7c, 0x78, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x82, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xfc, 0x7c, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x7c, 0x3e, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x7f, 0xdf, 0xff, 0x7f, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0xc0, 0xf0, 0xfe, 0xff, 0xff, 0x9f, 0x87, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x7c, 0x7c, 0x3e, 0x1f, 0xcf, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x2c, 0x3a, 0x02, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // 'frame_48_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xef, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0xc7, 0xc3, 0x03, 0x01, 0x01, 0x01, 0x01, 0x05, 0x08, 0x00, 0x00, 0x00, 0x02, 0x06, 0x06, 0x00, 0x00, 0x81, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0,
+         0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xfc, 0x7c, 0x3c, 0x3e, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x0f, 0x0f, 0x07, 0x0f, 0x0f, 0x0f, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xf9, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x7e, 0x3e, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xf8, 0xfe, 0xff, 0x3f, 0x0f, 0x03,
+         0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xf8, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x2f, 0x20, 0x38, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xf1, 0xfb, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x7e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xef, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xf7, 0xf7, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0x7f, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0xf8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xf8, 0xfc, 0xfe, 0x3e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x3e, 0x7c, 0x7c, 0xfc, 0xf8, 0xf8, 0xf0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x81, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0x78, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7d, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x7c, 0x3c, 0x1f, 0x0f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd5, 0xdf, 0xff, 0xbf, 0xff, 0xfc, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0xc0, 0xf0, 0xfe, 0xff, 0xff, 0x8f, 0x83, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x7c, 0x3e, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x03, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03, 0x41, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x22, 0x36, 0x22, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+        // frame_49_delay-0', 128x64px
+        {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x08, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xc0, 0xe0, 0x80, 0x80,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe4, 0xff, 0xfe, 0x7c, 0x3e, 0x1e, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x7f, 0x7c, 0x7c, 0xf8, 0xf8, 0xf8, 0xf6, 0xf6, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x7c, 0x7c, 0x3f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf0, 0xf0, 0xc0, 0xe0, 0x80, 0xc0, 0xe0, 0xf8, 0xfe, 0x7f, 0x3f, 0x0f,
+         0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x0a, 0x09, 0x0d, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc7, 0xe7, 0xff, 0xff, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xfd, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0x1f, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xf0, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xfc, 0x7e, 0x1f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3e, 0x3e, 0x7c, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc1, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf1, 0xf9, 0x7f, 0x3f, 0x3f, 0x1f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0x7f, 0x7f, 0x3c, 0x38, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xdf, 0xff, 0xff, 0xfc, 0xfc, 0xf0, 0xe0, 0xe0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0xfc, 0xfe, 0xff, 0xff, 0xcf, 0xc3, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0x78, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1a, 0x1e, 0x12, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+};
diff --git a/keyboards/handwired/uthol/keymaps/oled/keymap.c b/keyboards/handwired/uthol/keymaps/oled/keymap.c
new file mode 100644
index 0000000000..3019a1fe85
--- /dev/null
+++ b/keyboards/handwired/uthol/keymaps/oled/keymap.c
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "helix.h"
+
+enum uthol_layers { _QWERTY, _COLEMAK, _LOWER, _RAISE, _SETTINGS };
+
+#define QWERTY DF(_QWERTY)
+#define COLEMAK DF(_COLEMAK)
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+#define SETTINGS MO(_SETTINGS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY]   = LAYOUT_uthol(KC_GRV, 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_DEL, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+    [_COLEMAK]  = LAYOUT_uthol(KC_GRV, 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_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_DEL, KC_ESC, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_LCTL, SETTINGS, KC_LGUI, KC_LALT, RAISE, KC_SPC, LOWER, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT),
+    [_LOWER]    = LAYOUT_uthol(KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_MINS, KC_EQL, KC_INS, KC_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
+    [_RAISE]    = LAYOUT_uthol(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_TRNS, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_BSLS, KC_P0, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_EQL, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SPC, KC_TRNS, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT),
+    [_SETTINGS] = LAYOUT_uthol(QWERTY, COLEMAK, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RESET, RGB_TOG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, KC_PWR, KC_NO, KC_SLCK, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_NO, RGB_HUD, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NLCK, KC_CAPS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_SAI, RGB_SAI, RGB_MODE_PLAIN, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MODE_REVERSE, RGB_VAD, RGB_VAI, RGB_MODE_FORWARD)
+};
+
+#define ANIM_SIZE 1024           // number of bytes in array, minimize for adequate firmware size, max is 1024
+#define ANIM_FRAMES 50           // Number of frames
+#define ANIM_FRAME_DURATION 160  // How long each frame lasts in ms
+
+uint32_t anim_timer         = 0;
+uint32_t anim_sleep         = 0;
+uint8_t  current_idle_frame = 0;
+
+static void render_anim(void) {
+    // assumes 1 frame prep stage
+    void animation_phase(void) {
+        current_idle_frame = (current_idle_frame + 1) % ANIM_FRAMES;
+        oled_write_raw_P(animation[abs((ANIM_FRAMES - 1) - current_idle_frame)], ANIM_SIZE);
+    }
+    if (get_current_wpm() != 000) {
+        oled_on();
+        if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+            anim_timer = timer_read32();
+            animation_phase();
+        }
+        anim_sleep = timer_read32();
+    } else {
+        if (timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
+            oled_off();
+        } else {
+            if (timer_elapsed32(anim_timer) > ANIM_FRAME_DURATION) {
+                anim_timer = timer_read32();
+                animation_phase();
+            }
+        }
+    }
+}
+
+// Used to draw on to the oled screen
+bool oled_task_user(void) {
+    render_anim();
+    oled_write_P(PSTR("Layer:"), false);
+    switch (get_highest_layer(layer_state | default_layer_state)) {
+        case _QWERTY:
+            oled_write_P(PSTR("QWERTY\n"), false);
+            break;
+        case _LOWER:
+            oled_write_P(PSTR("Lower\n"), false);
+            break;
+        case _RAISE:
+            oled_write_P(PSTR("Raise\n"), false);
+            break;
+        case _COLEMAK:
+            oled_write_P(PSTR("Colemak\n"), false);
+            break;
+        case _SETTINGS:
+            oled_write_P(PSTR("Settings\n"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
+    oled_write_P(PSTR("WPM: "), false);
+    oled_write(get_u8_str(get_current_wpm(), '0'), false);
+
+    return false;
+}
diff --git a/keyboards/handwired/uthol/keymaps/oled/ricardo.c b/keyboards/handwired/uthol/keymaps/oled/ricardo.c
new file mode 100644
index 0000000000..935ae504c7
--- /dev/null
+++ b/keyboards/handwired/uthol/keymaps/oled/ricardo.c
@@ -0,0 +1,840 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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 "progmem.h"
+
+static const char PROGMEM animation[][1024] = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0xc5, 0xf8, 0x28, 0x28, 0x6c, 0xf8, 0xb8, 0x7c, 0x7c, 0xbe, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf4, 0xf0, 0xc0, 0x01, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x02, 0x01, 0x01, 0x03, 0x06, 0x26, 0x36, 0x8f, 0xce, 0xc3, 0xf3, 0xfb, 0xff, 0xff, 0xff, 0x37, 0x4f, 0x1b, 0x0b, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc3, 0xef, 0xff, 0xff, 0xcf, 0x80,
+                                                0x02, 0x00, 0x40, 0x20, 0xd0, 0xf0, 0xff, 0xff, 0xff, 0xb6, 0x14, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x20, 0x70, 0x30, 0x30, 0x30, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0xe0, 0xe0, 0xf0, 0xd0, 0xf0, 0xe0, 0xe0, 0xc0, 0xe1, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xe1, 0xf5, 0xfe, 0xfe, 0xf8, 0xf8, 0xf8, 0xfc,
+                                                0xfc, 0xfc, 0xfc, 0x70, 0x00, 0x20, 0x20, 0x00, 0x20, 0x80, 0xa0, 0xa0, 0x80, 0x90, 0x00, 0x00, 0x50, 0x80, 0xc0, 0x00, 0xc1, 0x44, 0xc4, 0xfc, 0xf4, 0xf8, 0xf0, 0xd0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x3f, 0x7f, 0xff, 0xef, 0x3f, 0xff, 0xff, 0xff, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xee, 0xde, 0xee, 0xff, 0xff, 0xdf, 0xff, 0xef, 0xf7, 0xdb, 0xeb, 0xb1, 0xd1, 0xf1, 0xe1, 0xf1, 0xd1, 0xd9, 0xf5, 0xe5, 0xf9, 0xef, 0xf4, 0xfa, 0xe0, 0xfd, 0xe0, 0xfc, 0xfb, 0xfb, 0xfe, 0xfb, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfd,
+                                                0xfa, 0xfb, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0xe1, 0xf5, 0xfa, 0xfb, 0xfc, 0xfc, 0xe0, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x40, 0x78, 0xf0, 0x60, 0xf8, 0x70, 0xf3, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x2e, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x0f, 0x07, 0x3f, 0x7f, 0x7f, 0xfe, 0xfe, 0xfc, 0xfa,
+                                                0xf8, 0xf4, 0xe0, 0xf8, 0xa0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x04, 0x01, 0x01, 0x03, 0x0a, 0x15, 0x0f, 0x2f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe3, 0x16, 0x1b, 0xdf, 0x1f, 0x5f, 0xbf, 0x3f, 0x3f, 0x1f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x07, 0x07, 0x07, 0x0f, 0x1f, 0x0f, 0x0f, 0x1f, 0x1f, 0x7f, 0xfc, 0x78, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x01, 0x0f, 0x03, 0x0b, 0x07, 0x0f, 0x03, 0x3f, 0x3f, 0x3f, 0xff, 0xfd, 0xfd, 0xff, 0xff, 0x9f, 0xff, 0xfc, 0xf6, 0xbc, 0xff, 0xfe, 0xff, 0xff, 0xfe, 0xfe, 0x3c, 0xbc, 0x04, 0x02, 0x58, 0x08, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0xe1, 0xd8, 0x40, 0x18, 0xe0, 0xdc, 0xfc, 0xf8, 0xfc, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xf8, 0xe8, 0xe0, 0x80, 0x01, 0x03, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x04, 0x7e, 0x2c, 0x9f, 0xde, 0xcf, 0xe3, 0xfb, 0xfb, 0xfd, 0x7f, 0xdf, 0xa7, 0x17, 0x0a, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf4,
+                                                0xc0, 0x80, 0x80, 0xa0, 0x00, 0xd8, 0xfd, 0xff, 0xff, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x38, 0x30, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xe0, 0x40, 0xf8, 0xf8, 0xfc, 0xf0, 0x20, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0x7f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfd, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
+                                                0xfe, 0x7e, 0x3e, 0x1c, 0x80, 0x20, 0x80, 0x00, 0x80, 0x20, 0x80, 0xc0, 0x00, 0xa0, 0x40, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x68, 0xea, 0x78, 0xfc, 0xf8, 0xf0, 0xf0, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x3f, 0x7f, 0x3f, 0x05, 0x3f, 0x7f, 0x7f, 0x01, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xe3, 0xeb, 0xff, 0xe3, 0xe7, 0xdf, 0xff, 0xe7, 0xf3, 0xed, 0xd9, 0xf1, 0xe1, 0xa0, 0xe8, 0xb0, 0x94, 0xd0, 0xa1, 0x6c, 0xd8, 0xd2, 0x6c, 0xd9, 0xf2, 0xf4, 0xfc, 0xea, 0xfb, 0xf6, 0xfb, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xfd, 0xff, 0xfc, 0x21,
+                                                0x5c, 0x10, 0x00, 0x00, 0x00, 0x00, 0x01, 0x21, 0xf9, 0x7e, 0xfe, 0xfe, 0xdc, 0xff, 0xd4, 0xa0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x0c, 0x54, 0x68, 0x7c, 0x04, 0xf8, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xbf, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1c, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x05, 0x0f, 0x0f, 0x3f, 0x3f, 0x7f, 0x7e, 0xfe,
+                                                0xfe, 0xf8, 0xf8, 0xf8, 0xf0, 0xf8, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x04, 0x05, 0x0b, 0x0b, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xf9, 0xe1, 0x87, 0x21, 0x8f, 0x67, 0x8f, 0x3f, 0xdf, 0x3f, 0x1f, 0x0f, 0x0f, 0x07, 0x0f, 0x01, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x05, 0x01, 0x07, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x05, 0x01, 0x03, 0x23, 0x0d, 0x9f, 0x5f, 0x9e, 0xfc, 0xdf, 0xf2, 0xdf, 0xcd, 0xff, 0xfc, 0xaa, 0xfc, 0x9e, 0xee, 0xff, 0xff, 0xcf, 0xfe, 0x4e, 0x8a, 0x84, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0xdb, 0xd3, 0xc8, 0x40, 0x58, 0xe0, 0xb9, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xfa, 0xf4, 0xf0, 0x00, 0x00, 0x03, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x0a, 0x7e, 0x2c, 0x1d, 0x9e, 0xcf, 0xe7, 0xf3, 0xf2, 0xff, 0xb7, 0x9f, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x07, 0xff, 0xff, 0xff, 0xfe, 0xfd,
+                                                0xe0, 0xe0, 0xc0, 0xc0, 0xe0, 0xd4, 0xff, 0xff, 0xf9, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x18, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xf8, 0xf0, 0x90, 0xfc, 0xfe, 0xff, 0xfc, 0x70, 0xfc, 0xfc, 0xf8, 0xfc, 0xf8, 0xff, 0x1f, 0xdf, 0xdf, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7e, 0x7c, 0x7c, 0x7c, 0x7c, 0x7e, 0x7e, 0x7e, 0x3f,
+                                                0x7f, 0x3f, 0x1f, 0x4e, 0x00, 0x00, 0x00, 0x20, 0x00, 0x80, 0x80, 0x80, 0x80, 0x20, 0x80, 0xc0, 0x00, 0xc0, 0x00, 0x00, 0x34, 0x30, 0x7c, 0x7d, 0xf8, 0x7c, 0x70, 0xa0, 0x70, 0x40, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0x0f, 0x01, 0x0f, 0x1f, 0x1f, 0x00, 0x07, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xf8, 0xd8, 0xf1, 0xde, 0xe9, 0xe5, 0xd1, 0xe9, 0xf5, 0xe0, 0xe8, 0xd8, 0x80, 0x61, 0xc0, 0xf0, 0xd8, 0xec, 0x30, 0xd8, 0xb2, 0xb9, 0xb2, 0xe8, 0xd2, 0xf8, 0xe2, 0xf8, 0xfa, 0xfb, 0xfc, 0xfb, 0xfe, 0xff, 0xff, 0xff, 0xfd, 0xff, 0x7b, 0xfa, 0xd0,
+                                                0x19, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x7e, 0xd7, 0xff, 0xf7, 0xfe, 0xf0, 0xf4, 0xd0, 0xc0, 0x80, 0x40, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x04, 0x4c, 0x9a, 0x7c, 0x7f, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1e, 0x09, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x07, 0x07, 0x17, 0x2f, 0x3f, 0x3f,
+                                                0x3f, 0x7f, 0xfc, 0x7e, 0xfc, 0x7c, 0xfc, 0xf4, 0xf0, 0xe0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x03, 0x09, 0x0f, 0x37, 0x1f, 0x7f, 0x7f, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xef, 0xff, 0xff, 0xf8, 0xe1, 0x17, 0x05, 0x07, 0x2f, 0x0f, 0x9f, 0x9f, 0x0f, 0x0f, 0x07, 0x0f, 0x07, 0x03, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xc0, 0x08, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x01, 0x01, 0x01, 0x9f, 0x9f, 0x6f, 0xef, 0xce, 0xec, 0xfb, 0xa7, 0xb4, 0xbd, 0x7b, 0xb6, 0x95, 0x4f, 0x5f, 0xa7, 0xff, 0xdf, 0x86, 0x84, 0x8a, 0x80, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x72, 0xb0, 0x90, 0x9c, 0x34, 0xec, 0xbf, 0xfc, 0xfd, 0xfe, 0x7f, 0xff, 0xff, 0xfe, 0xf8, 0xf0, 0x40, 0x00, 0x01, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x1f, 0x0f, 0x37, 0x77, 0xf3, 0xf9, 0xf9, 0xf8, 0xee, 0x12, 0x0f, 0x0b, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xc0, 0x80, 0x80, 0x81, 0x61, 0x01, 0x01, 0xf1, 0xf8, 0xf8, 0xf8,
+                                                0xf8, 0xf8, 0xf0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xf2, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x90, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x40, 0x80, 0xa0, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xfe, 0xfe, 0xfc, 0x06, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfe, 0xfc, 0xfe, 0xfc, 0x2f, 0x0f, 0x27, 0x37, 0x2f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0xbf, 0x3f, 0x3f, 0x3e, 0x3e, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f,
+                                                0x3f, 0x1f, 0x1f, 0x0f, 0x00, 0xc0, 0x28, 0xc0, 0xf0, 0xe0, 0xd8, 0xc8, 0xe0, 0xd8, 0xe0, 0x50, 0xe8, 0xa0, 0x1a, 0x44, 0x46, 0x06, 0x0f, 0x0f, 0x0f, 0x0f, 0x8f, 0xef, 0xee, 0xf8, 0xfe, 0x78, 0xe8, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x07, 0x00, 0x03, 0x07, 0x07, 0x03, 0x01, 0x83, 0x0f, 0x9f, 0xbf, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xdc, 0xf4, 0xe4, 0xe8, 0xf4, 0xe4, 0xe8, 0xb0, 0xc8, 0x60, 0x70, 0xc0, 0xc0, 0x80, 0xe0, 0x38, 0xd0, 0xf0, 0xfa, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9d, 0xaf, 0x62, 0x08,
+                                                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x0b, 0x0f, 0x1f, 0x1f, 0x3f, 0x7f, 0x7e, 0x7d, 0x7f, 0xfc, 0xfd, 0xf8, 0xfc, 0xf0, 0xfc, 0xf0, 0xe0, 0xc0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x04, 0x49, 0x80, 0xbc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x17, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x01, 0x01, 0x03, 0x03, 0x01, 0x01, 0x03, 0x03, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x03, 0x06, 0x0f, 0x0f, 0x0f, 0x1f, 0x3f, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0x7e, 0xb9, 0xbf, 0x9f, 0x9f, 0xff, 0xff, 0xff, 0xbf, 0x7d, 0x8e, 0x80, 0x88, 0x40, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8,
+                                                0xf8, 0xf8, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x06, 0x18, 0x4c, 0x28, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x93, 0x0f, 0x8f, 0xc7, 0xef, 0xdf, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xdf, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xd7, 0xe6, 0x85, 0x46, 0x41, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x0c, 0x0c, 0x04, 0x06, 0x07, 0x07, 0x07, 0x07, 0x0b, 0x1f, 0x3f, 0xff, 0xc2, 0x01, 0x1f, 0xff, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x70, 0x9a, 0x84, 0x5c, 0xa4, 0xfc, 0xf6, 0xfc, 0xfc, 0x7f, 0xfe, 0xbf, 0xfe, 0xfc, 0xf8, 0xc0, 0x80, 0x00, 0x06, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x03, 0x07, 0x1f, 0x77, 0xf3, 0xfd, 0xfd, 0xfc, 0xfb, 0x53, 0x07, 0x13, 0x05, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0xc1, 0xc3, 0xc3, 0x01, 0x00, 0xc0, 0xc0, 0xe0,
+                                                0xc0, 0xc0, 0xf0, 0xe0, 0xfe, 0xff, 0xff, 0xfe, 0x70, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x30, 0x18, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0xb0, 0x40, 0x40, 0xe0, 0xe0, 0xc0, 0xe0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xf8, 0xfc, 0xfa, 0x44, 0xff, 0xff, 0xff, 0xff, 0x7b, 0xff, 0xf9, 0xf1, 0xf8, 0xf0, 0x3f, 0x1f, 0x1f, 0x8f, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc,
+                                                0xfc, 0xfc, 0xfc, 0x78, 0xa0, 0xe0, 0xf0, 0xc8, 0xf0, 0xf8, 0xec, 0xf8, 0xf0, 0xf0, 0xfc, 0xf0, 0xf8, 0xe8, 0xfa, 0xde, 0x1f, 0x1f, 0x3f, 0x1f, 0x0f, 0x3f, 0x1f, 0x9f, 0xdf, 0xfe, 0xfc, 0xfe, 0xfc, 0xd0, 0x00, 0xc0, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x0f, 0x02, 0x07, 0x0f, 0x0f, 0x0f, 0x80, 0x0f, 0x1f, 0x3f, 0xff, 0xff, 0xfe, 0xfc, 0xec, 0xe8, 0xf4, 0xf8, 0xfc, 0xc8, 0xf0, 0xc4, 0xf0, 0xb0, 0xc8, 0x20, 0xc8, 0xc0, 0xb4, 0xd2, 0xe8, 0xfd, 0xf0, 0xef, 0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0x37, 0x5f, 0x01,
+                                                0x10, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x06, 0x0f, 0x07, 0x0f, 0x2f, 0x1f, 0x3f, 0x3f, 0x7f, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf0, 0xf4, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x05, 0x93, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x5f, 0x3f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0f, 0x1f, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfa, 0xf7, 0x5f, 0x7f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0x79, 0x40, 0xf0, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x40, 0x70, 0x78, 0xf8, 0xd4, 0xfe, 0xfe, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xfe,
+                                                0x0d, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0xb0, 0x18, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x6b, 0x8f, 0x7f, 0x5f, 0xff, 0xbf, 0xff, 0xff, 0xef, 0xff, 0xfc, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xbe, 0xee, 0x04, 0xc4, 0x49, 0x08, 0x80, 0xa0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x30, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x7d, 0xf8, 0x80, 0x03, 0x0f, 0x7f, 0xf8, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0xe0, 0xa4, 0x90, 0x10, 0xe8, 0x58, 0x60, 0xf8, 0x3c, 0xfc, 0x7e, 0x7f, 0xfc, 0xe4, 0xf0, 0xc0, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x07, 0x03, 0x13, 0x7b, 0xf3, 0xf1, 0xf9, 0xfc, 0xf5, 0x08, 0x08, 0x0b, 0x0d, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x05, 0x07, 0x00, 0x00, 0x00, 0x80,
+                                                0x80, 0x80, 0x80, 0xb0, 0xfc, 0xfe, 0xfc, 0xf7, 0xb8, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x40, 0x50, 0x70, 0x60, 0x38, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0xc0, 0x80, 0xe0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xc0, 0x60, 0xfc, 0xfe, 0xfc, 0xf0, 0xbe, 0xfe, 0xe7, 0xe3, 0xe0, 0xc0, 0xff, 0x7f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+                                                0xf0, 0xf8, 0xf8, 0xf8, 0xf0, 0x80, 0xa0, 0x00, 0xa0, 0xd0, 0xe0, 0xe0, 0xd0, 0xe8, 0xe0, 0xf8, 0xf8, 0xfd, 0xf4, 0xfd, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0x7e, 0x7c, 0xfc, 0x7c, 0xf0, 0xf4, 0xd8, 0xf8, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x3f, 0x3f, 0x00, 0x1f, 0x3f, 0x3f, 0x7f, 0x03, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xfd, 0xd0, 0xe1, 0xe3, 0x93, 0x93, 0xa3, 0xe3, 0x83, 0x63, 0x83, 0x01, 0x41, 0x01, 0x01, 0x01, 0x01, 0x01, 0x81, 0xa1, 0x63, 0xc1, 0xd1, 0xf1, 0xf8, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x37, 0x0b,
+                                                0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x20, 0x1e, 0x2f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xec, 0xf4, 0xd8, 0xe0, 0xd0, 0xd0, 0x40, 0x40, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0a, 0x00, 0x04, 0xd8, 0xf4, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfd, 0xff, 0xfc, 0xf0, 0xc2, 0x40, 0x28, 0x9d, 0xff, 0x7f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x5f, 0x1f, 0x05, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03,
+                                                0x03, 0x03, 0x07, 0x07, 0x83, 0x83, 0xc3, 0xe1, 0xc0, 0xe0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf6, 0xe0, 0x83, 0x16, 0x1f, 0x07, 0x7f, 0x2f, 0xdf, 0xbf, 0x97, 0x8b, 0xcf, 0x41, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x06, 0x06, 0x06, 0x06, 0x0f, 0x0f, 0x1f, 0x1f, 0xbf, 0xff, 0xbf, 0x0f, 0x1f, 0xff, 0xff, 0xe3, 0x81, 0x00, 0x00, 0x00,
+                                                0x00, 0x03, 0x03, 0x07, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x03, 0x05, 0x03, 0x07, 0x03, 0x03, 0x1b, 0x27, 0x7f, 0x7f, 0xff, 0x7f, 0xff, 0x7b, 0xff, 0xff, 0xff, 0xfb, 0xea, 0xf8, 0xb6, 0xfc, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x78, 0x3b, 0x05, 0x14, 0x04, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3f, 0xf8, 0xc0, 0x00, 0x07, 0x3f, 0x3f, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x03, 0x02, 0x01, 0x00, 0x00, 0x60, 0x60, 0xe0, 0xb0, 0xb4, 0xb8, 0xec, 0xf8, 0xf8, 0xf4, 0xf8, 0x7c, 0xf8, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x05, 0x08, 0x0e, 0x20, 0x04, 0x8f, 0x4f, 0x8f, 0x47, 0xf7, 0xf7, 0x77, 0xf1, 0xbf, 0x01, 0x04, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x01,
+                                                0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x80, 0x00, 0x80, 0xe0, 0xf0, 0xf8, 0xf0, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0x60, 0xe0, 0x60, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x87, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x3c, 0x3c, 0x00, 0x01,
+                                                0x01, 0x01, 0x03, 0x01, 0x01, 0x00, 0x00, 0x80, 0x00, 0x40, 0x80, 0xc0, 0xc0, 0x80, 0x80, 0xc8, 0xf4, 0xea, 0xf8, 0xfd, 0xfe, 0xfe, 0xfc, 0xf8, 0xfc, 0xf0, 0xf0, 0xea, 0xf8, 0xf4, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x20, 0xa0, 0x40, 0xe0, 0x90, 0x43, 0xf7, 0x03, 0x83, 0x05, 0x01, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xa0, 0xb0, 0xec, 0xf8, 0xfc, 0xfc, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x17,
+                                                0x07, 0x87, 0xc7, 0xc7, 0xcf, 0xe7, 0xef, 0xe7, 0x4f, 0x0f, 0x07, 0xcf, 0xcf, 0xdf, 0xd7, 0xf9, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xfe, 0xfc, 0xfc, 0xfd, 0xae, 0xf6, 0xc0, 0xfc, 0xf7, 0xfd, 0xff, 0xff, 0xfe, 0xfd, 0xfd, 0xf4, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x10, 0x00, 0xa7, 0xdc, 0xfb, 0xfe, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f, 0x3f, 0x5f, 0x3f, 0x1f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+                                                0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x3f, 0xbf, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x0f, 0x82, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0x7c, 0x3c, 0x1d, 0x08, 0x08, 0x1e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x8f, 0xff, 0xff, 0xff, 0xff, 0x63, 0x01, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x3f, 0x7f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0x00, 0x20, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x03, 0x03, 0x01, 0x00, 0x03, 0x07, 0x07, 0x0f, 0x3f, 0x7f, 0x3f, 0x0f, 0x07, 0x07, 0x0f, 0x17, 0x0f, 0x0f, 0x2f, 0x03, 0x1b, 0x41, 0x04, 0x0f, 0x0e, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x67, 0xe7, 0x07, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x0f, 0x1f, 0x1f, 0x0f, 0x0c, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x17, 0x07, 0x03, 0x07, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0xb0, 0xd8, 0x90, 0x14, 0xd0, 0x10, 0xb8, 0x7c, 0xa0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x10, 0x07, 0x02, 0x00, 0x00, 0x0e, 0x47, 0x47, 0xe7, 0x47, 0x43, 0x03, 0x70, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xc0, 0xc0, 0x52, 0x2b, 0xff, 0xff, 0x7f, 0x3c, 0x10, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0x68, 0xe0, 0xf8, 0xf4, 0xf8, 0xfc, 0xf8, 0xf0, 0xf0, 0xf8, 0xf0, 0x78, 0xf0, 0xb0, 0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xf0, 0xe4, 0xe0, 0xfa, 0xfc, 0xf6, 0x7a, 0x7d, 0x3f, 0x3f, 0xbf, 0xff, 0xef, 0xe0, 0xe0,
+                                                0xf1, 0xe1, 0x00, 0x03, 0x01, 0x81, 0xe1, 0xe0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x01, 0x40, 0xc0, 0x00, 0x00, 0x15, 0xf0, 0xe1, 0xec, 0xf1, 0xec, 0xc1, 0x15, 0xa2, 0x48, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x07, 0x2f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xf7, 0xcf, 0xff, 0xfe, 0xfe, 0xfe, 0xab, 0x6f, 0x7f, 0x2f, 0xbf, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+                                                0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf8, 0xec, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfb, 0xfc, 0xfc, 0xff, 0xfe, 0x17, 0x4c, 0xd4, 0xe1, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfb, 0xf2, 0xf0, 0xe0, 0xb0, 0x80, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xfc, 0xfc, 0x3c, 0x10, 0x00, 0x00, 0x0c, 0x0f, 0x7f, 0xff, 0xff, 0xf1, 0x01, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x01, 0x07, 0x03, 0x07, 0x0b, 0x0f, 0x2f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x5b, 0x7e, 0x10, 0x48, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0x07, 0x02, 0x3f, 0x7f, 0x7f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x0a, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x07, 0x0f, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x1f, 0x1f, 0x1f, 0x0c, 0x01, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x01, 0x03, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41, 0xe0, 0xe0, 0x40, 0x00, 0x00, 0x90, 0x90, 0x90, 0x90, 0xd8, 0x40, 0x94, 0x10, 0x18, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0a, 0x12, 0x0f, 0x03, 0x03, 0x07, 0x04, 0x27, 0xe7, 0xe3, 0x43, 0x43, 0x42, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x0a, 0x72, 0x37, 0x3a,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0xc0, 0xc0, 0x20, 0x60, 0x28, 0x18, 0x14, 0x78, 0x7c, 0x38, 0x1c, 0x18, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0x80, 0x00, 0x20, 0x20, 0x00, 0x12, 0x1c, 0x04, 0x0d, 0x08, 0xf2, 0xf1, 0xf2, 0xf1, 0xf9, 0xf8, 0xf8, 0x80,
+                                                0x00, 0x00, 0x80, 0xf1, 0xfb, 0xfe, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x92, 0x71, 0xec, 0xf0, 0xea, 0xd0, 0x8c, 0xb0, 0xd4, 0x40, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x07, 0x07, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xfb, 0x67, 0x57, 0xff, 0xff, 0xff, 0xfb, 0x9b, 0x1f, 0x17, 0x7f, 0x1f, 0x6f, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf0, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x80, 0xc0, 0xe0, 0x60, 0xa0, 0xc0, 0xc0, 0xfc, 0xe4, 0xf8, 0x5c, 0xf4, 0xd0, 0xa0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x03, 0x17, 0x03, 0x13, 0x0d, 0x15, 0x24, 0xbd, 0x51, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xfe, 0xfe, 0x18, 0x0c, 0x00, 0x02, 0x02, 0x1f, 0x3f, 0xff, 0xff, 0xf8, 0xc0, 0x03, 0x3f, 0xff, 0xff, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x05, 0x03, 0x07, 0x1f, 0x0f, 0x1f, 0x3f, 0x3f, 0x7f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x07, 0x01, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x2b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0xa7, 0xe5, 0xfa, 0xf5, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc3, 0xc0, 0xc0, 0x40, 0x00, 0x0e, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x1e, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x20, 0xe0, 0x4c, 0x70, 0xf8, 0xf0, 0xf8, 0xf4, 0xc8, 0x00, 0x00, 0xc8, 0xd8, 0x98, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x27, 0x0d, 0x05, 0x03, 0x07, 0x03, 0x33, 0x83, 0xe2, 0x6b, 0x7b, 0x61, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x08, 0x10, 0xd8, 0xe2, 0xe0, 0xc0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x78, 0x78, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xfc, 0xf8,
+                                                0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xb0, 0xd8, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x15, 0xa0, 0x3b, 0xfc, 0x4d, 0xb0, 0x82, 0x40, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe1, 0xf5, 0xf9, 0xd1, 0x81, 0x01, 0x71, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xfd, 0xe3, 0x87, 0x1f, 0x7f, 0xff, 0xff, 0xf8, 0xe1, 0x82, 0x07, 0x07, 0x15, 0x0f, 0x17, 0x1f, 0x1f, 0x1f, 0x3f, 0x1f, 0x3f, 0x1f, 0x3f,
+                                                0x1f, 0x0f, 0x03, 0x06, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0x60, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x05, 0x04, 0x12, 0x00, 0x08, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfe, 0xff, 0x7f, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x3f, 0xff, 0xff, 0xfc, 0xf0, 0xe3, 0x0f, 0x1f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xbc, 0xd8, 0xfe, 0xfe, 0xff, 0xf5, 0xfe, 0x5e, 0x7d, 0xff, 0xce, 0xfd, 0xe0, 0xff, 0xf0, 0xf0, 0xf0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x60, 0x94, 0xf9, 0xfb, 0xfe, 0xbc, 0x7c, 0xea, 0xe2, 0xc0, 0xa0, 0xa4, 0xec, 0xa4, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x09, 0x01, 0x00, 0x08, 0x01, 0x20, 0x79, 0x39, 0x3c, 0x5c, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xf0, 0x80, 0xc0, 0xf8, 0xe0, 0xf1, 0xfc, 0xfd, 0xff, 0xff, 0xfc, 0xfe, 0xfe, 0xfe, 0xf8, 0xf0, 0xe0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x8f, 0x8f, 0xef, 0x3f, 0x9f, 0x1f, 0x1f, 0x1f, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x3f, 0x17, 0x3f, 0xbf, 0x3f, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1a, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x2c, 0x10, 0x04, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfe, 0xff, 0xff, 0x7f, 0x0d, 0x01, 0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x1f, 0x7f, 0xff, 0xff, 0xfe, 0xf8, 0xc3, 0x07, 0x3f, 0xff, 0xff, 0xff, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x08, 0x3c, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0c, 0x11, 0x1b, 0x2f, 0x0f, 0xdf, 0x1a, 0x04, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0xd0, 0xc0, 0xd0, 0xfc, 0x00, 0x58, 0x25, 0x2c, 0xfb, 0x2d, 0xea, 0xd6, 0xc5, 0xf0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x64, 0x7e, 0xbb, 0x7c, 0x7f, 0x9e, 0xef, 0xff, 0xf2, 0xf4, 0xf0, 0xf2, 0x72, 0x76, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0c, 0x03, 0x01, 0x00, 0x0c, 0x0c, 0x1e, 0x3e, 0x3e, 0x1e, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xf1, 0xf2, 0xf2, 0xf9, 0xef, 0xfb, 0xfb, 0xff, 0xff, 0xfe, 0xff, 0xfa, 0x3c, 0xc0, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xeb, 0xf7, 0xd7, 0xff, 0xcf, 0x4f, 0x0f, 0x0f,
+                                                0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x1f, 0x0f, 0x1f, 0x3f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0c, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x21, 0x44, 0x00, 0x8a, 0x80, 0x60, 0x00, 0x40, 0x00, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xfc, 0xff, 0xff, 0x3f, 0x1f, 0x47, 0x42, 0x00, 0x61, 0x00, 0x20, 0x00, 0x00, 0x05, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xf8, 0xc0, 0x07, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xf0, 0x40,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x00, 0x0c, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x9e, 0xbf, 0x9d, 0xbb, 0xff, 0x1b, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xe0, 0xf0, 0xe8, 0xe8, 0x50, 0xf4, 0x28, 0xff, 0xf4, 0xdd, 0xef, 0xee, 0xd0, 0xc6, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x8a, 0xf3, 0xbf, 0xbe, 0x5f, 0x7f, 0x3f, 0x7f, 0x38, 0x3a, 0x70, 0x39, 0xbd, 0x3b, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x01, 0x00, 0x02, 0x05, 0x0b, 0x3f, 0x2f, 0x0f, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfd, 0xff, 0xfc, 0xfa, 0xf8, 0x38, 0x38, 0x38, 0x30, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x68, 0x04, 0xd0, 0x40, 0x80, 0x20, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x80, 0xe0, 0xf0, 0xfc, 0xfc, 0xf0, 0xf5, 0xf1, 0x47, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x84, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0b, 0x1b, 0xbc, 0x7e, 0x15, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x09, 0x0f, 0x7a, 0x00, 0x2e, 0x24, 0x53, 0x6c, 0xb4, 0x60, 0x70, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xf1, 0xc7, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x01, 0x08, 0x00, 0x04, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x11, 0x01, 0x50, 0x80, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x40, 0x74, 0xb8, 0x38, 0xbd, 0xfe, 0x7f, 0x7f, 0xdf, 0x3f, 0x1f, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xa0, 0xc8, 0x68, 0x68, 0xb2, 0x6c, 0xff, 0xfe, 0xde, 0xde, 0xe7, 0xd8, 0xc7, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x20, 0x88, 0x08, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0xc0, 0x80, 0x80, 0xe2, 0x43, 0x00, 0x86, 0x40, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x02, 0x02, 0x01, 0x02, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0xdc, 0xff, 0x7f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7c, 0x78, 0x7c, 0x31, 0xb9, 0x3b, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x00, 0x02, 0x01, 0x00, 0x06, 0x01, 0x27, 0x4f, 0x1f, 0x1f, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x3c, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xf8, 0xf8, 0x38, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x50, 0x60, 0xa0, 0xd0, 0x5a, 0xe4, 0x5a, 0xd4, 0xca, 0x10, 0x44, 0x80, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xe0, 0xf8, 0xfc, 0xf0, 0xf8, 0xf4, 0xe7, 0x03, 0x07, 0x07, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1f, 0x7e, 0xff, 0xff, 0x7b, 0x0a, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x11, 0x06, 0x64, 0x1b, 0xe0, 0x3b, 0xbe, 0xf5, 0xf8, 0xf6, 0xfd, 0xf4, 0xf0, 0xf9, 0x68, 0x28, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0xa0, 0x38, 0x24, 0x82, 0xd8, 0xf4, 0xe4, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x07, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x1f, 0x7f, 0xff, 0xff, 0xfc, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x03, 0x0b, 0x05, 0x1c, 0x63, 0x0e, 0x0f, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x40, 0x20, 0xa1, 0xa0, 0x23, 0x87, 0x87, 0x07, 0x07, 0x27, 0x07, 0x03, 0x03, 0x21, 0x60, 0x10, 0x40, 0x74, 0x78, 0xec, 0xf4, 0xd8, 0xcb, 0x7e, 0xe2, 0x0e, 0x18, 0x00, 0x00, 0x03, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x48, 0x70, 0x3c, 0x7e, 0x7c, 0xfe, 0xff, 0xce, 0xde, 0xca, 0xcd, 0x87, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x60, 0x88, 0xa8, 0x94, 0x00, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x88, 0x9e, 0x1e, 0x18, 0x04, 0x00, 0x0a, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x01, 0x10, 0x05, 0x02, 0x11, 0x09, 0x04, 0x03, 0x04, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x40, 0xf8, 0x3b, 0xbc, 0x3c, 0x84, 0x3d, 0xf1, 0xc8, 0xe0, 0xf0, 0x76, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x07, 0x01, 0x00, 0x00, 0x00, 0x08, 0x04, 0x14, 0x3c, 0x1e, 0x3e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x40, 0xb0, 0xa0, 0xe0, 0xf8, 0xec, 0xf4, 0xd8, 0xd4, 0xe0, 0x7c, 0x70, 0xc0, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xe8, 0xe0, 0xfc, 0xe0, 0xe8, 0xa0, 0x00, 0x04, 0x0d, 0x0f, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x7f, 0xff, 0xf8, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0xfe, 0xfe, 0xfe, 0xfc, 0x78, 0x48, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x3f, 0x14, 0xbf, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf6, 0x9a, 0xea, 0xa3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x30, 0x00, 0xa0, 0x20, 0xc4, 0x10, 0x24, 0x10, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf0,
+                                                0xfe, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x03, 0x07, 0x1f, 0x3f, 0x7f, 0xfc, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x05, 0x01, 0x0f, 0x0e, 0x0f, 0x87, 0x0f, 0xcf, 0x5f, 0x07, 0xd7, 0xf7, 0xe1, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x12, 0x18, 0x05, 0x26, 0x02, 0x18, 0x0b, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1e, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x43, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x03, 0x07, 0x0f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xc0, 0xf0, 0xf0, 0xe4, 0x6c, 0xf8, 0x20, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x60, 0x60, 0x05, 0x13, 0x0f, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0x80, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x10, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xe8, 0xf0, 0xfa, 0xf6, 0x70, 0xc9, 0xc0, 0xb0, 0x80, 0xc8, 0xd8, 0xbc, 0x08, 0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x01, 0x00, 0x02, 0x03, 0x00, 0x39, 0xea, 0x7b, 0x7b, 0x3b, 0x01, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x10, 0xc0, 0x50, 0xd0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xd4, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc2, 0x40, 0xe4, 0xad, 0xe6, 0xf9, 0xfa, 0xe6, 0xfa, 0xf8, 0xfc, 0xf4, 0xe0, 0xc8, 0xc0, 0x30, 0x80, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xd0, 0x80, 0x20, 0x20, 0x10, 0x48, 0x10, 0x5f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xfe, 0xfe, 0xff, 0xfe, 0xfd, 0xff, 0x78, 0x0c, 0x1b, 0x00, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x56, 0x75, 0x3d, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xfe, 0x7b, 0x76, 0x38, 0x08, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x40, 0x80, 0x50, 0xc0, 0xb0, 0x80, 0x40, 0xc8, 0xa0, 0x40, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x80, 0xc0, 0xe0, 0xfc, 0xfe, 0xff, 0xff, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x05, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x01, 0x07, 0x3f, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xba, 0x28, 0x20, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x05, 0x07, 0x23, 0x0f, 0xaf, 0x3f, 0x9f, 0xbf, 0x3f, 0x1f, 0x9f, 0xbf, 0x8f, 0xb7, 0x07, 0x00, 0x00, 0x00, 0x00, 0x08, 0x44, 0x2c, 0x7b, 0xda, 0x3d, 0xa0, 0x37, 0xc9, 0x02, 0x08, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x3c, 0x3c, 0x3e, 0x3e, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1f, 0x3f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x40, 0x80, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x20, 0x37, 0x45, 0x6f, 0x1e, 0x3f, 0x0d, 0x01, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xb8, 0xd0, 0xe4, 0xf8, 0x7e, 0xf2, 0xdc, 0x84, 0x50, 0x90, 0x90, 0xb8, 0xb8, 0x00, 0x00, 0x60, 0x90, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x07, 0x05, 0x01, 0x0b, 0x00, 0x33, 0xf6, 0xe7, 0xf7, 0xf7, 0x9f, 0x17, 0x07, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x2c, 0x78, 0xfc, 0xf0, 0x70, 0x68, 0x70, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xc0, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0xe7, 0x3c, 0x90, 0x80, 0x00, 0x40, 0x80, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x80, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xb2, 0xdd, 0xdd, 0xe9, 0xf7, 0xf6, 0xfa, 0xff, 0xf4, 0xff, 0xf8, 0xfc, 0xe8, 0xf0, 0xc8, 0x40, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x05, 0x01, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xe0, 0xe0, 0xc0, 0xf0, 0x20, 0x20, 0x00, 0x30, 0x6d, 0x6f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x3e, 0x2f, 0x19, 0x06, 0x02, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x56, 0x9f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf9, 0x1e, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0xa0, 0x60, 0xf0, 0x40, 0xb0, 0x90, 0x62, 0xc0, 0xb0, 0xb0, 0x48, 0x28, 0x14, 0x12, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfc, 0xfe, 0xff, 0x7f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x02, 0x14, 0xdc, 0xf2, 0x58, 0x05, 0x00, 0x00, 0x00, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x05, 0x07, 0x0f, 0x17, 0x1f, 0x1f, 0x9f, 0xbf, 0xff, 0x1f, 0x9f, 0xbf, 0xbf, 0xcf, 0xe7, 0x07, 0x01, 0x00, 0x02, 0x04, 0x40, 0x38, 0xdf, 0xdb, 0x5e, 0xfb, 0x17, 0xf9, 0x7b, 0x26, 0x0d, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x3c, 0x3e, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x02, 0xf0, 0x13, 0xbf, 0x3f, 0x1f, 0x3c, 0x0d, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x81, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xa0, 0xb0, 0xfa, 0xfa, 0xfa, 0xfa, 0xa0, 0x08, 0xe0, 0x00, 0x30, 0xf0, 0x70, 0x30, 0x00, 0x80, 0x50, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x39, 0x03, 0x01, 0x03, 0x66, 0x27, 0xe5, 0xe6, 0xe7, 0xf7, 0x37, 0x37, 0x67, 0xc4, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x03, 0x01, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x1a, 0x34, 0x1e, 0x7a, 0x3e, 0x38, 0x10, 0x18, 0x00, 0x00, 0xc0, 0x00, 0x80, 0x20, 0xc0, 0x20, 0x00,
+                                                0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0xc9, 0x80, 0x40, 0x00, 0x80, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x30, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xa0, 0x80, 0x40, 0x80, 0x80, 0x40, 0x80, 0x00, 0x40, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xa0, 0xaa, 0xed, 0xf9, 0xf8, 0xff, 0xfe, 0xfd, 0xfe, 0xfe, 0xfc, 0xfa, 0xf8, 0xe2, 0xd0, 0xd0, 0x40, 0xa0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfa, 0xf4, 0xec, 0xcc, 0x44, 0x08, 0x02, 0x16, 0x03, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x2f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x0f, 0x09, 0x05, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1e, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xfe, 0xfe, 0x1e, 0x01, 0x00, 0x80, 0x80, 0x20, 0xc8, 0xa0, 0x00, 0xf8, 0x40, 0xf0, 0xa0, 0xea, 0xa0, 0xb0, 0xea, 0x58, 0x16, 0x32, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xa0, 0xbe, 0xf4, 0x32, 0x2a, 0x05, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x01, 0x05, 0x07, 0x07, 0x8f, 0x1f, 0xbf, 0xbf, 0xdf, 0x5f, 0xbf, 0x9f, 0xff, 0xf7, 0x47, 0x03, 0x00, 0x00, 0x00, 0x6c, 0x24, 0xaf, 0xf2, 0x7d, 0xfd, 0x79, 0x6f, 0x35, 0x4d, 0x06, 0x17, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x40, 0x40, 0x80, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x00, 0xe0, 0x10, 0x51, 0xbb, 0xbf, 0x1f, 0x3f, 0x0f, 0x06, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc2, 0xc0, 0x81, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0xf0, 0xfe, 0xfc, 0xfe, 0xfe, 0xfb, 0xc8, 0xe0, 0x20, 0xb0, 0xf4, 0xfc, 0x30, 0x14, 0xfc, 0xe8, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x13, 0x0f, 0x0b, 0x27, 0x47, 0x45, 0xc7, 0x9f, 0xde, 0xff, 0x7f, 0x7b, 0x1e, 0x18, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0xa0, 0xc0, 0xe0, 0xc0, 0xc0, 0xe0, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x0e, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x50, 0x10, 0x00, 0x00, 0x00, 0x01, 0x05, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x80, 0x44, 0xa4,
+                                                0xaa, 0x94, 0xf0, 0xe8, 0xd0, 0x90, 0xe0, 0xc0, 0x40, 0x40, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x32, 0x20, 0x00, 0x20, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xf8, 0xfc, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0xf0, 0xf8, 0xfc, 0xf8, 0xf8, 0xfa, 0xfc, 0xfc, 0xfd, 0xfc, 0xfd, 0x3a, 0x7a, 0x7d, 0x0c, 0x32, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xb4, 0x7f, 0xfd, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfe, 0xf8, 0xfc, 0xf2, 0x08, 0x00,
+                                                0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0x80, 0x80, 0xc0, 0xa0, 0xc0, 0xc0, 0xc0, 0xc0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x40, 0xe8, 0x12, 0x9c, 0xa0, 0x48, 0x90, 0x01, 0x17, 0x3f, 0x3f, 0x1f, 0x0f, 0x0f, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x1f, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0xc0, 0x69, 0xd4, 0xf7, 0xf8, 0xfd, 0xfc, 0xfd, 0xfe, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0x7e, 0xbf, 0x3f, 0x1f, 0x27, 0x0f,
+                                                0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1e, 0x3e, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x04, 0x0b, 0x2f, 0x6d, 0x1f, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x0c, 0xdf, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x00, 0x00, 0x40, 0x09, 0xf5, 0x7f, 0x7f, 0x7f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x0f, 0x0b, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x20, 0xe0, 0x40, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xd0, 0xf0, 0xe8, 0xe0, 0xf8, 0xe8, 0xe8, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x00, 0x6c, 0xd8, 0xfe, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xbf, 0x43, 0x03, 0x00, 0x80, 0x02, 0x41, 0x00, 0xc0, 0x12, 0x9c, 0x3e, 0x38, 0x79, 0x39, 0x31, 0x60, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x0a, 0x52, 0x7f, 0x1d, 0x76, 0x11, 0x09, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x8e, 0xf2, 0x10, 0xb0, 0xfc, 0xfc, 0x98, 0x28, 0xfd, 0xfc, 0xfa, 0xf8, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x0f, 0x03, 0x23, 0x6d, 0x77, 0xc6, 0xcf, 0xdb, 0xdf, 0x7f, 0x7f, 0x7f, 0x1f, 0x5a, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x80, 0xe0, 0xe0, 0xe0, 0xf0, 0x78, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x07, 0x00, 0x00, 0x0c, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x40, 0x00, 0x40, 0x40, 0x30, 0xbc, 0x40, 0xf4, 0x08, 0x50, 0xc0, 0x05, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0xa4,
+                                                0xfb, 0xca, 0xf8, 0xf1, 0xfc, 0xfa, 0xee, 0xf8, 0xe8, 0xe4, 0xd0, 0xe0, 0xe0, 0x20, 0x80, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x34, 0x31, 0x10, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7d, 0x1f, 0x1f, 0x1f, 0x0f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0x78, 0x02,
+                                                0x00, 0x80, 0x40, 0x80, 0x00, 0x00, 0xc0, 0x80, 0x80, 0x80, 0x80, 0xd0, 0xd0, 0xe0, 0xa0, 0xe0, 0xf0, 0xc0, 0xe0, 0xe8, 0xd0, 0xf0, 0x30, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0x7f, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xf0, 0xe0, 0xd2, 0xdc, 0xa6, 0x7a, 0x50, 0x00, 0x07, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0f, 0x1f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x07, 0x28, 0x68, 0xd0, 0xfe, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x9f, 0x3f, 0x7f,
+                                                0x4f, 0x2f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x81, 0x01, 0x15, 0x37, 0x7f, 0x3f, 0x1f, 0x0b, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0xdd, 0xd7, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x1f, 0x1f, 0x8f, 0xc2, 0x10, 0x74, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xbf, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0xe0, 0xe0, 0xe0, 0xa0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xfc, 0xfc, 0xfc, 0x7c, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0xf8, 0xbd, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x93, 0x85, 0x51, 0xe4, 0x8b, 0xe5, 0xd6, 0x9f, 0xcf, 0xdf, 0x1f, 0x3f, 0x3c, 0xfd, 0xb9, 0x7d, 0x8b, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x08, 0x28, 0x1c, 0xf7, 0x3f, 0x7f, 0x4f, 0x1b, 0x09, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xfe, 0xe9, 0xdc, 0xff, 0xff, 0xd8, 0x3e, 0xff, 0x7f, 0xff, 0xff, 0xfe, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0f, 0x13, 0x0d, 0x33, 0x7f, 0xf3, 0xeb, 0xef, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0xcf, 0x05, 0x11, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x78, 0x68, 0xfa, 0xf0, 0xf0, 0xf8, 0xfc, 0x78, 0x7c, 0x24, 0x20, 0xa0, 0x40, 0xa0, 0xe0, 0xc0, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x80, 0x80, 0x00, 0x00, 0x01, 0x03, 0x0f, 0x0f, 0x06, 0x00, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xd0, 0xe8, 0xe8, 0xfc, 0xfa, 0xfc, 0xfe, 0xff, 0xfb, 0xfe, 0xff, 0x7f, 0x0f, 0x05, 0x00, 0x00, 0x80, 0xf0, 0xe8,
+                                                0xf4, 0xfd, 0xff, 0xff, 0xfe, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xfc, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xf8, 0x40, 0xe0, 0x40, 0x60, 0x00, 0x0d, 0x3f, 0x3f, 0x1e, 0x18, 0x1c, 0x1c, 0x0e, 0x0f, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x1f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x01, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xf7, 0x68, 0xe8, 0xe0, 0xb0, 0xf8, 0xf0, 0xe8, 0xe0, 0xf8, 0xf0, 0xfc, 0xf8, 0xf0, 0xf8, 0xfc, 0xf8, 0xf4, 0xfc, 0xe0, 0xf8, 0xf0, 0xf8, 0xf8, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x70, 0xf0, 0xf8, 0xfe, 0xfe, 0xfe, 0xfc, 0xff, 0xfc, 0x2c, 0x07, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x2f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0x7f, 0xbf, 0x3f, 0x0f, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xa8, 0xf0, 0x03, 0x4d, 0xbf, 0x7f, 0x7f, 0x3f, 0x1f, 0x0b, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x10, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xed, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xe7, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0x7f, 0x7f, 0x87, 0x47, 0x87, 0x03, 0x07, 0x01, 0x01, 0x80, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0x7e, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x14, 0x13, 0x59, 0xa4, 0xba, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9e, 0x02, 0x16, 0x05, 0x0c, 0x78, 0xb5, 0x7c, 0x7e, 0xb9, 0xfa, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x3e, 0xfe, 0x78, 0xe0, 0xcc, 0xf2, 0xfe, 0xff, 0xf7, 0xf2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xf4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x3f, 0x78, 0xfb, 0xdb, 0x9f, 0xdf, 0xff, 0xff, 0xf7, 0xff, 0x79, 0x5b, 0x2f, 0x03, 0x0d, 0x0f, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xd8, 0xf8, 0xf8, 0xf4, 0xfa, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xf6, 0xfc, 0xea, 0x8e, 0xc4, 0x80, 0x80, 0x00, 0x00, 0x0f, 0x1c, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x01, 0x00, 0x00, 0x03, 0x03, 0x07, 0x81, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfe, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6f, 0x07, 0x03, 0x43, 0xa7,
+                                                0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf8, 0xf0, 0xf8, 0xe0, 0xe0, 0x84, 0x9e, 0xfc, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x0f, 0x0b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x3f, 0x3f, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x04, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0xf4, 0xf9, 0xf9, 0xe9, 0xf9, 0xfb, 0xf9, 0xf1, 0xf8, 0xf0, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xf4, 0xf4, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x11, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x07, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0xec, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x17, 0x17, 0x0f, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x84, 0xf0, 0xfc, 0xfd, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f, 0x7f, 0x1f, 0x1f, 0x9f, 0x0f, 0xc3, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0x40, 0x2c, 0xf0, 0xf8, 0x0d, 0x77, 0x4f, 0x2f, 0x3f, 0x3f, 0x0f, 0x0f, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0xf4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xfb, 0xff, 0xf9, 0xf8, 0xe0, 0xf0, 0xfd, 0xf9, 0xfe, 0xfe, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x80, 0x40, 0xd0, 0xf6, 0xfe, 0xff, 0xf7, 0xf7, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfa, 0x6f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xf8, 0x0b, 0xdb, 0xfb, 0xff, 0xff, 0xf7, 0xf7, 0xf3, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x3f, 0x1f, 0x0a, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf8, 0xe0, 0xf8, 0xfc, 0xfc, 0xff, 0xfe, 0xfd, 0xff, 0xfe, 0xff, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0x78, 0xb2, 0x6e, 0x5e, 0x9e, 0x7c, 0x78, 0x3c, 0x78, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x01, 0x00, 0x07, 0x07, 0x07, 0x07, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe8, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x7f, 0x3f, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfd, 0xf8, 0xf4, 0xf9, 0xf4, 0xe0, 0xf0, 0xc0, 0xa0, 0x80, 0xc8, 0x70, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x7f, 0x2f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf0, 0xf4, 0xfc, 0xfc, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x00, 0x00, 0xa4, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xfe, 0xfd, 0xfb, 0xfb, 0xe7, 0xc7, 0xc7, 0xd7, 0xc7, 0xc7, 0xc7, 0xc3, 0xc1, 0xe0, 0x80, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x0f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0x3e, 0x3c, 0x08, 0x0c, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x97, 0x7f, 0xff, 0x1f, 0x1f, 0x1f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe8, 0xb4, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf1, 0xfd, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x3f, 0x3f, 0x1f, 0x0f, 0x01, 0x00, 0x09, 0x07, 0x05, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xf0, 0xec, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x13, 0x05, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0xd4, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xaf, 0x8f, 0x3f, 0x8f, 0x87, 0x03, 0x83, 0xa5, 0xc0, 0xf2, 0xf0, 0xf8, 0xfc, 0xfc, 0xce, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0xfe, 0xff, 0xf7, 0xe7, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfd, 0xf9, 0xef, 0x07, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x0c, 0xeb, 0xff, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x01, 0x00, 0x00, 0x30, 0x38, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xd0, 0xf0, 0xf8, 0xf0, 0xf8, 0xf8, 0xf8, 0xfc, 0xf8, 0xf0, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xf0, 0xd0, 0xc0, 0xf8, 0xf8, 0x70, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x03, 0x07, 0x07, 0x07, 0x07, 0x03, 0x01, 0x03, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xfc, 0xf9, 0xf9, 0xf1, 0xe9, 0xe3, 0xe0, 0xc1, 0xc1, 0xc1, 0x80, 0x80, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfe, 0xfc, 0xfe, 0x3e, 0x1e, 0x0a, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xb0, 0xe0, 0xcc, 0xf4, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x07, 0x03, 0xc3, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff,
+                                                0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x8f, 0x8f, 0xcf, 0x9f, 0xcf, 0x9f, 0xcf, 0xdf, 0x0d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf4, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x0f, 0x03, 0x00, 0x00, 0x02, 0x11, 0x57, 0x7f, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xfe, 0xff, 0xff, 0xfc, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa0, 0x60, 0xe0, 0xe0, 0xc0, 0xc0, 0x40, 0xc0, 0xc5, 0x3f, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x6f, 0x0f, 0x8b, 0x39, 0x59, 0x40, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x28, 0x00, 0x0c, 0xa8, 0x5c, 0xb0, 0x24, 0xd8, 0x80, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x7f, 0x0f, 0x12, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x88, 0xe4, 0xe1, 0xfc, 0xfa, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x17, 0x87, 0xc7, 0xc3, 0xe1, 0x40, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xf6, 0xf7, 0xf7, 0xf7, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x3f, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x3f, 0x0d, 0x25, 0x7c, 0x7c, 0x7c, 0x7c, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x80, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x60, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0b, 0x07, 0x3f, 0x07, 0x77, 0x07, 0x2f, 0x03, 0x5f, 0x03, 0x03, 0x83, 0xc1, 0xe0, 0xf0, 0x70, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe8, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xef, 0xff, 0xf6, 0xc6, 0xe2, 0xc5, 0xc3, 0xc7, 0x87, 0x87, 0x03, 0x07, 0x01, 0x02, 0x00, 0x40, 0xe0, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x1f, 0x07, 0x0d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xa0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0x3f, 0x3f, 0x3f, 0x35, 0x3a, 0x00, 0x08, 0x00, 0x08, 0x60, 0x70, 0x60, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xec, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0e, 0x00, 0x08, 0x38, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xfc, 0xfc, 0xf0, 0xf8, 0xf0,
+                                                0xf0, 0xf0, 0xf0, 0xc0, 0xe0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x07, 0x5f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x1f, 0x0f, 0x0e, 0x1c, 0x3e, 0x3c, 0x38, 0x10, 0x10, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xfe, 0xff, 0xff, 0x7f, 0xdf, 0xff, 0x3f, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x50, 0xd9, 0xf4, 0x50, 0xfc, 0x7c, 0xf8, 0xfa, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x07, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x40, 0xc8, 0xf0, 0xf8, 0xf4, 0xf4, 0xf4, 0xb0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf4, 0xf6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9c, 0xc4, 0xcc, 0xc4, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xc7, 0xdf, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x0f, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0,
+                                                0x80, 0x80, 0xc0, 0x80, 0xc0, 0x80, 0xc0, 0x80, 0xc0, 0xc0, 0x80, 0x00, 0x80, 0x00, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0xbf, 0xbf, 0xbf, 0xbf, 0xdf, 0xdf, 0xff, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x7f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf4, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xf7, 0xfd, 0xe2, 0xeb, 0x8b, 0xc7,
+                                                0xc7, 0x07, 0x03, 0x01, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xd7, 0xf5, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfd, 0xfe, 0xfa, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff,
+                                                0xbf, 0xbf, 0xbf, 0xbf, 0x3f, 0xbf, 0x7f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7e, 0xfc, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xe0, 0xf0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0xf0, 0xf0, 0xfa, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x02, 0x18, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xfe, 0xfe, 0xff, 0xf4, 0xfc, 0xf0, 0xf8, 0xf0, 0xf1, 0xc1, 0xe1, 0xc1, 0x01, 0x01,
+                                                0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x3e, 0x1c, 0x7e, 0x3c, 0xf8, 0xb8, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0b, 0x0f, 0xb7, 0x6f, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0xf0, 0xe0, 0xc8, 0xe2, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xf4, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf0, 0xe6, 0xe4, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x5f, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0x80, 0xc0,
+                                                0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x1f, 0x9f, 0xbf, 0xbf, 0xff, 0xdf, 0xff, 0xff, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xde, 0xec, 0x99, 0xcb, 0xe3, 0xc7, 0x83, 0x02,
+                                                0x00, 0x00, 0x00, 0x80, 0xe8, 0xfa, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xea, 0xf8, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x1f, 0x3f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xbf, 0xff, 0xff, 0x1f, 0xbf, 0x3f, 0x3f, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfd, 0xff, 0xfc, 0xfc, 0xf8, 0xf9, 0xf1, 0xe1, 0xd1, 0x80, 0x56, 0x00, 0x98, 0xb8,
+                                                0xb0, 0xd0, 0xd0, 0xe0, 0x00, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0x7c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x3f, 0x3e, 0x7b, 0xfc, 0x7a, 0xea, 0xe9, 0xfd, 0xff, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x1f, 0x3f, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xc0, 0xe0, 0xeb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x1f, 0x3f, 0x0f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x01, 0x01, 0x03, 0x17, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0xf4, 0xf7, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xe3, 0xfa, 0xfa, 0xf0, 0xc4, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xaf, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe8, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
+                                                0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x80, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x1f, 0x3f, 0x1f, 0x3f, 0x1f, 0x3f, 0xbf, 0xff, 0xdf, 0xdf, 0xdf, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xbf, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xf1, 0xc1, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x06, 0x0c, 0x18, 0x10, 0x80, 0x40, 0xf0, 0xf0, 0xf0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0xce, 0xfb, 0xf1, 0xbf, 0xc3, 0xc4, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x58, 0xfc,
+                                                0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfa, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xfc, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x0f, 0xef, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xbf, 0xdf, 0xff, 0xff, 0xff, 0xef, 0xef, 0xef, 0xff, 0xcf, 0xdf, 0xef, 0x8f,
+                                                0x1f, 0x8f, 0x5f, 0x3f, 0x3f, 0x7e, 0x7e, 0x7c, 0x38, 0x98, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0xc7, 0xcf, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x0f, 0x03, 0x00, 0x00, 0x01, 0x05, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xf2, 0xfb, 0xfb, 0xde, 0xfe, 0xfc, 0xf8, 0xfc, 0xf8,
+                                                0xf8, 0xf8, 0xf8, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3b, 0x9f, 0xff, 0xff, 0x7f, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x5c, 0xb4, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x1f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xe0, 0xe0, 0xf1, 0xeb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0x5f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x04, 0x01, 0x01, 0x01, 0x03, 0x07, 0x07, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xee, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd7, 0xf7, 0xfa, 0xfa, 0xf8, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x9f, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xc0,
+                                                0xc0, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x0f, 0x1f, 0x7f, 0x3f, 0x3f, 0x3f, 0xdf, 0xff, 0xff, 0xdf, 0xdf, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xe0, 0xe5, 0xcb, 0xcf, 0x96, 0x8f, 0xa8, 0x80, 0x00, 0x80, 0x00, 0x12, 0xfd, 0xfe, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xec, 0xf4, 0xda, 0xe0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfa, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xe7, 0xdf, 0xa7, 0xef, 0xaf, 0xdf,
+                                                0x9f, 0x9f, 0x3f, 0x3f, 0x0f, 0xae, 0xcc, 0xcc, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1f, 0x0f, 0x0f, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x5f, 0xff, 0xdf, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf0, 0xd0, 0xe8,
+                                                0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x3f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xfe, 0xf8, 0xf8, 0xe0, 0x01, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x17, 0x3f, 0x3f, 0x7d, 0x78, 0xfa, 0xf9, 0xf2, 0xf2, 0xf4, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x17, 0x0f, 0x0f, 0x1f, 0x1f, 0xa7, 0x4f, 0x1f, 0xdf, 0x5e, 0xfc, 0xd0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe3, 0xe1, 0x90, 0xb8, 0x38, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x07, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xde, 0xdf, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc2, 0xe0, 0xfb, 0xf2, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x87, 0xe3, 0xff, 0xff, 0xff, 0x17, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x0f, 0x1f, 0x3f, 0x7f, 0x7f, 0x3f, 0x3f, 0xbf, 0xff, 0xff, 0xdf, 0xff, 0xf6, 0xfd, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xc3, 0xe7, 0xf7, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xf8, 0xf8, 0xe1, 0xe6, 0xc7, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xfa, 0x81, 0xe0, 0x58, 0x78, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0x1f, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xfd, 0xfe, 0x7e, 0xfd, 0x7f, 0x7f, 0x3f, 0x5f, 0xcf, 0xef, 0x4f, 0xef, 0xef, 0xef, 0xe7, 0xe3, 0xf3, 0xd7, 0xc3, 0xd3, 0xe1, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xcf, 0xc3, 0xc3, 0x83,
+                                                0x80, 0x80, 0x00, 0x20, 0x80, 0xe0, 0xc0, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0d, 0x06, 0x04, 0x00, 0x06, 0x00, 0x00, 0x80, 0x80, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x01, 0x07, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xc0, 0xc0, 0xc0, 0x80, 0xc1, 0x80, 0x80, 0x80, 0x80, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xff, 0xfc, 0xff, 0xf8, 0xf0, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xe0, 0x80, 0x03, 0x03, 0x07, 0x07, 0x1f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xdf, 0xe3, 0xc3, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xe0, 0xc0, 0x82, 0x03, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1f, 0x3f, 0x1f, 0x3f, 0x7f, 0x7f, 0x7f, 0x2f, 0x3f, 0x7f, 0x3f, 0xdd, 0xf0, 0xe0, 0xfc, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xf0, 0xe4, 0xf8, 0xe4, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xfc, 0xfe, 0xef, 0xef, 0xff, 0xff, 0xfe, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xc2, 0xf2, 0xf2, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x05, 0x82, 0xe0, 0xff, 0x9f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x03, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x9f, 0xdf, 0xdf, 0xcf, 0xef, 0xe1, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xfc, 0xf8, 0xfc, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xd0, 0xa0, 0x98, 0xf8, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+                                                0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xe8, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x7e, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x3f, 0x1d, 0x4f, 0x03, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xfc, 0xf8, 0x84, 0x08, 0x10, 0x01, 0x03, 0x03, 0x01, 0x01, 0x03, 0x01, 0x01, 0x01, 0x81, 0x81, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf8, 0xf0, 0xc0, 0x00, 0xc0, 0x50, 0x80, 0x00, 0x40, 0x03, 0x03, 0x83, 0x03, 0x07, 0x03, 0x07, 0x43, 0xff, 0x73, 0x17, 0x17, 0x0f, 0x0f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xbe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xf8, 0xe0, 0x80, 0x01, 0x01, 0x03, 0x07, 0x07, 0xbf, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfd, 0xfc, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x05, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x7f, 0x3f, 0xff, 0x2f, 0x3f, 0x3f, 0x5f, 0x3f, 0x7e, 0x7a, 0x30, 0x80, 0x40, 0x68, 0xaf, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xe3, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0xfc, 0xfe, 0xef, 0xef, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xaf, 0x27, 0x80, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x0b, 0x01, 0x80, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f,
+                                                0x0f, 0x1f, 0x1f, 0x8f, 0xdf, 0xcb, 0xcf, 0xcf, 0xe1, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x7c, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3e, 0x30, 0x39, 0x14, 0x1c,
+                                                0x18, 0x3c, 0x38, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xc1, 0xc1, 0xc1, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0xf8, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xfe, 0xfe, 0xfb, 0xff, 0xcf, 0x1f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfd, 0xf5, 0xa1, 0x01, 0x01, 0x01, 0x01, 0x81, 0x80, 0x00, 0x80, 0x40, 0x40, 0xc0, 0xd0, 0xe0, 0x80, 0xe0, 0xd0, 0xf0, 0xe0, 0xc4, 0xf0, 0x9c, 0xc4, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0x9f, 0xef, 0xbf, 0x3f, 0x5f, 0x3f, 0x0f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0xb5, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfd, 0xfe, 0xda, 0xfb, 0xfc, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x4f, 0x0f, 0x0f, 0x07, 0x01, 0x03, 0x00, 0x05, 0x07, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x03, 0x03, 0x03, 0x03, 0x27, 0x4f, 0x2f, 0x1f, 0xbf, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xe0, 0xf0, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x03, 0x05, 0x07, 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x07, 0x47, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x2d, 0x14, 0xed, 0xd0, 0xf0, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x01, 0x6d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0x1f, 0x3f, 0x0f, 0x1c, 0x3c, 0x1c, 0x28, 0x70, 0x00, 0x00, 0x00, 0x11, 0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfb, 0xf0, 0xe0, 0xa0, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x36, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x17, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xf8, 0xfc, 0xff, 0xdf, 0xff, 0xff, 0xfe, 0xfc, 0xfd, 0xfd, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0x96, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x7e, 0x1e, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x23, 0x73, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0a, 0x01, 0x00, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x72, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0b, 0x1f,
+                                                0x17, 0x8f, 0x8b, 0xd7, 0xc9, 0xc7, 0xc7, 0xe0, 0xe1, 0xf0, 0xf8, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1e, 0x1e, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xf8, 0xf5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3e, 0x1c, 0x00, 0x04, 0x08, 0x08, 0x0c, 0x00,
+                                                0x84, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0xa0, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf8, 0xf0, 0xe0, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x28, 0xe8, 0xd8, 0xfc, 0xf8, 0xf8, 0xfc, 0xf8, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfd, 0xf9, 0x41, 0x01, 0x02, 0x03, 0x01, 0x01, 0x00, 0xa0, 0xa0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f, 0xdf,
+                                                0x7f, 0x1f, 0x0f, 0xa7, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfa, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xfe, 0xfe, 0x7c, 0xb0, 0xe8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0x9b, 0xfe, 0xfa, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x97, 0x27, 0x03, 0x0b, 0x07, 0x05, 0x07, 0x0c, 0x02, 0x13, 0x08, 0x0f, 0x24, 0x29, 0x4c, 0x10, 0xfd, 0xed, 0xfc, 0xde, 0xb8, 0xf0, 0xd8, 0xfa, 0xcf, 0xaf, 0xef, 0xbf, 0x1f, 0x0f,
+                                                0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x17, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3f, 0x3f, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x1f, 0x1f, 0x1f, 0x07, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x03, 0x17, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xf9, 0xfd, 0xff, 0xfb, 0xdf, 0xf0, 0xe4, 0xfa, 0xfc, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0b, 0x0f, 0x05, 0x07, 0x0b, 0x1f, 0x0b, 0x2e, 0x1f, 0x07, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0x20, 0xc0, 0x94, 0xf0, 0xe4, 0xec, 0xf8, 0xf8, 0xec, 0xfd, 0x2f, 0x3f,
+                                                0x0d, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x17, 0x0f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0x1f, 0x3f, 0x7f, 0x1f, 0xbf, 0xff, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x02, 0x07, 0x04, 0x07, 0x07, 0x07, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf1, 0xf1, 0xf3, 0xbb, 0x8b, 0x87, 0xe3, 0xff, 0xff, 0xff, 0xff, 0xf6, 0xf6, 0xe6, 0xe6, 0xce, 0xcc, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6f, 0x1f, 0xff, 0xdf, 0xff, 0xdf, 0xff, 0xbc, 0x3f, 0xff, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x80, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0x38, 0x3c, 0x1c, 0x1e, 0x0e, 0x00, 0x00, 0x13, 0x07, 0x1f, 0x87, 0x87, 0x9f, 0xdf, 0x7f, 0x4f,
+                                                0x1f, 0x0f, 0x8f, 0x07, 0x4b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0x83, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0x7e, 0x37, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf0, 0xf4, 0xfc, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0xef, 0xae, 0xce, 0xe4, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xf0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf2, 0xe0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x3f, 0x0d, 0x17, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0xc0, 0xd0, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xfe, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xbc, 0xc0, 0x90, 0xe0, 0xe0, 0xe8, 0xe0, 0xe8, 0xe0, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x02, 0x3f, 0x9f, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x0f, 0x0f, 0x07, 0x01, 0x01, 0x01, 0x09, 0x89, 0x89, 0xd9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe8, 0xf4, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xc3, 0xc7, 0xe1, 0xc0, 0xe0, 0xe1, 0xe1, 0xe3, 0xe3, 0xe7, 0xcf, 0x9f, 0x1f, 0x1d, 0x1e, 0x1b, 0x19, 0x13, 0x17, 0x1f, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x0f, 0x3f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f,
+                                                0x7f, 0x7f, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x18, 0x00, 0x00, 0x00, 0x02, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xfc, 0xfc, 0xf6, 0xfc, 0xf8, 0xc0, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x80, 0x00, 0x48, 0x37, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x03, 0x01, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x07, 0x03, 0x07,
+                                                0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x00, 0x00, 0x07, 0x1f, 0x0f, 0x1f, 0x7f, 0x7f, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0x90, 0x00, 0xc0, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xc0, 0xc4, 0xe4, 0xee, 0x34, 0x0f, 0x87, 0xff, 0xff, 0xff, 0xff, 0xed, 0xed, 0xcc, 0xcc, 0xcc, 0x98, 0xf0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x10, 0xff, 0x3f, 0xdf, 0xff, 0xaf, 0xff, 0xf9, 0x7f, 0x7f, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xe0, 0xe0, 0x60, 0x30, 0x30, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x5f, 0xcf, 0x8f, 0x06, 0x0f, 0x3f, 0xff, 0xdf, 0x7f, 0x0f,
+                                                0x2f, 0x0f, 0x8f, 0x17, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xe1, 0xf1, 0xf1, 0xf1, 0xf0, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0x6a, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xfc, 0xfc,
+                                                0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x3f, 0x1c, 0x1c, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xf8, 0xf8, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x1f, 0x7f, 0xff, 0x3f, 0x1f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x80, 0xc0, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdb, 0x7f, 0xff, 0xf5, 0xfc, 0xfd, 0xfe, 0xfe, 0xff, 0xfe, 0xfe,
+                                                0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xa0, 0xf0, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x81, 0x41, 0xc0, 0x30, 0x80, 0xf8, 0xf0, 0xf8, 0xe8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xfe, 0xdc, 0x00, 0x00, 0x00, 0x80, 0x00, 0x90, 0xd0, 0xf4, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x0f, 0x07, 0x83, 0x83, 0x83, 0x83, 0x02, 0x87, 0x89, 0x08, 0x3d, 0x31, 0x43, 0x3b, 0x27, 0x0f, 0x0f, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0xff, 0x7f, 0x7f, 0xff, 0x7f, 0x7f, 0xbf, 0x4b, 0x81,
+                                                0x60, 0xc0, 0xe8, 0xfc, 0xf0, 0xfe, 0xf3, 0xff, 0xfd, 0xdd, 0xf2, 0xfc, 0xfe, 0xff, 0xf1, 0xff, 0x7f, 0xf7, 0xdd, 0x33, 0x25, 0x01, 0x01, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x40, 0xd0, 0xf0, 0xe8, 0xe8, 0xf8, 0xf8, 0xe0, 0x80, 0x00, 0x02, 0xb0, 0xfa, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x01, 0x3d, 0x6f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x05, 0x03, 0x07, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x04, 0x00, 0x0e, 0x07, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xa2, 0x81, 0x87, 0xef, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x89, 0x99, 0xd9, 0x7b, 0x1f, 0x1f, 0xff, 0xff, 0xff, 0xdf, 0xdd, 0xdd, 0xdd, 0xdd, 0x98, 0xb8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x7c, 0xff, 0x7f, 0xff, 0xf9, 0x7e, 0xf2, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x03, 0x0f, 0xbe, 0x1f, 0x3f, 0x0c, 0x3f, 0xff, 0xff, 0xff, 0x9f, 0x2f,
+                                                0x0f, 0x0f, 0x2f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x83, 0x80, 0xc2, 0xe3, 0xe3, 0xe2, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xf8, 0xf0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x80, 0x00, 0x80, 0x90, 0xe8, 0xe0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0x70, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x78, 0x7c, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x0f, 0x07, 0x81, 0x21, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xf0, 0xf4, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x8f, 0x07, 0x07, 0x07, 0x03, 0x41, 0x01, 0x80, 0x80, 0x40, 0xc0,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x1f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0xc0, 0x80, 0x80, 0xc0, 0x80, 0xe0, 0xe0, 0xf0, 0xe0, 0xc0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xff, 0xfc, 0xfd, 0xfd, 0xf0, 0x00, 0xe8, 0xf8, 0xf8, 0xc8, 0xe6, 0xf8, 0xec, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x17, 0x08, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0a, 0x04, 0x05, 0x03, 0x1e, 0x4f, 0x7f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf8, 0xf0, 0x50, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x90,
+                                                0xf0, 0xec, 0xf8, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe1, 0xeb, 0xf3, 0xd7, 0xd3, 0x85, 0x03, 0x8f, 0x3f, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xed, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0x40, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x05, 0x03, 0x03, 0x00, 0x01, 0x00, 0x05, 0x05, 0x13, 0x1b, 0x17, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x0f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x00, 0x00, 0x06, 0x07, 0x1f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0x0f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x67, 0x67, 0x7f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xfb, 0xfb, 0x99, 0x98, 0x98, 0x98, 0x30, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0xe6, 0x74, 0xe2, 0x19, 0xe0, 0xce, 0xff, 0xff, 0xf7, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xfe, 0xf4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0f, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x1d, 0x3f, 0x39, 0x18, 0x1c, 0x3f, 0x1f, 0x1e, 0x0f, 0x0c,
+                                                0x07, 0x03, 0x07, 0x03, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03,
+                                                0x03, 0x07, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x20, 0x50, 0x40, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1e, 0x3e, 0x7f, 0xfe, 0xff, 0xd0, 0x08, 0x3c, 0x3c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x21, 0x11, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xf8, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xfc, 0xfc, 0xf4, 0xfc, 0xf8, 0xf4, 0xf8, 0xf8, 0xe0, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xd0, 0x80, 0xf0, 0xc0, 0xf8, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xe4, 0xe0, 0xd0, 0x80, 0xe0, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0f, 0xdf, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x07, 0x01, 0x01, 0x70, 0xf8, 0xfc, 0xc2, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xe1, 0xc3, 0xc7, 0x87, 0x0f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xbf, 0x1f, 0x1f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x07, 0x07, 0x03, 0x03, 0x07, 0x05, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x66, 0x67, 0x7f, 0x3f, 0x7f, 0x7f, 0xff, 0x7f, 0xbf, 0x3b, 0x3a, 0x9a, 0x98, 0x90, 0x30, 0x70, 0xf0, 0x80, 0x00, 0xc0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x64, 0x60, 0x60, 0x10, 0xa0, 0x8c, 0xff, 0xfe, 0xe7, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0x00, 0x01, 0xe3, 0x27, 0x07, 0x0f, 0x1e, 0x3c, 0x78, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x39, 0x39, 0x00, 0x1c, 0x1e, 0x1f, 0x1e, 0x0e, 0x04, 0x02,
+                                                0x00, 0x03, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x5f, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x7f, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xa0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x2e, 0x3e, 0x24, 0x20, 0x00, 0x00, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf0, 0xc0, 0x80, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x77, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfc, 0xf8, 0xfc, 0xfc, 0xf0, 0xf8, 0xe0, 0xe0, 0x80, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x80, 0xe0, 0xe0, 0xc0, 0xe0, 0xa0, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x6f, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x1f, 0x3f, 0x3f, 0xbf, 0x1f, 0x0f, 0x1f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfd, 0xf4, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfc, 0xfe, 0xfc, 0xf4, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xbf, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x07, 0x07, 0x01, 0x30, 0x38, 0xfc, 0xff, 0xfc, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf3, 0xe1, 0xc3, 0xff, 0xdf, 0x5f, 0xff, 0xbf, 0xff, 0xcf, 0x4f, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x01, 0x03, 0x02, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x4c, 0xee, 0x7e, 0x3e, 0x7f, 0xfe, 0x7e, 0x7e, 0x36, 0x32, 0x32, 0x30, 0x30, 0x30, 0x60, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0xe0, 0x40, 0x00, 0x20, 0x88, 0xdc, 0xfe, 0xef, 0xe5, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfd, 0xe8, 0x06, 0x1e, 0x3e, 0x7c, 0x78, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x11, 0x31, 0x01, 0x11, 0x3f, 0x1d, 0x3d, 0x15, 0x0c, 0x03, 0x01, 0x07,
+                                                0x07, 0x0f, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xdf, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xf4, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x70, 0xf0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xc0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0,
+                                                0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xd3, 0xfb, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x80, 0xc0, 0x80, 0xc0, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x8f, 0xef, 0xff, 0xff, 0x3f, 0x1f, 0x03, 0x1f, 0x0f, 0x1f, 0x07, 0x07, 0x0f, 0x0f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xfa, 0xfc, 0xf4, 0xf8, 0xe0, 0xf9, 0xfb, 0xfd, 0xff, 0xfe, 0xff, 0xff, 0xfd, 0xff, 0xfd, 0xfe, 0xf8, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x2f, 0x1f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x03, 0x01, 0x1c, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf1, 0xf3, 0xfb, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xc7, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x98, 0xb8, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xfc, 0xd8, 0xc8, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc1,
+                                                0x81, 0x49, 0x81, 0x20, 0xf1, 0xff, 0xbf, 0x93, 0xf8, 0xfc, 0xf4, 0xfc, 0xfc, 0xf8, 0xf5, 0x61, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x1f, 0x3f, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x04, 0x00, 0xe4, 0xe7, 0xef, 0xcf, 0xff, 0xff, 0xff, 0xf7, 0xff, 0x77, 0x0b, 0x03, 0x07, 0x1e, 0x04, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xf8, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x1d, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xfc, 0xfe, 0xfe, 0xff, 0xfe, 0xfc, 0xfe, 0x7e, 0x72, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
+                                                0x23, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xfc, 0xfc, 0xf8, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf1, 0xf9, 0xe1, 0xf1, 0x81, 0xe0, 0x80, 0x40, 0x20, 0x80, 0xf0, 0xe8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfa, 0xfc, 0xfc, 0xf8, 0xfc, 0xfe, 0xfe, 0xfc, 0xfc, 0xfa, 0xf8, 0xf4, 0xf0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0x07, 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x5f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xb0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x01, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe1, 0xe1, 0xff, 0xc7, 0xaf, 0xcf, 0xff, 0x7f, 0xff, 0xff, 0xf1, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x42, 0x56, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x13, 0xbb, 0xfb, 0x3f,
+                                                0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xbb, 0x9b, 0xb9, 0x98, 0x90, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf8, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x7f, 0xff, 0x7f, 0xdd, 0xfc, 0xf6, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x09, 0x1e, 0x1e, 0x9f, 0x19, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0xff, 0x5f, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xe0, 0xf0,
+                                                0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x0f, 0x0f, 0x8f, 0x2f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x82, 0xc2, 0xc3, 0xe7, 0xe3, 0xf5, 0xf0, 0xf2, 0xfa, 0xfc, 0xfe, 0xfc, 0xfe, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfe, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0x67, 0xf3, 0xe1, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0,
+                                                0xf0, 0xe0, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xc0, 0xe8, 0xf8, 0xf0, 0xfe, 0xfe, 0xfc, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x87, 0xdf, 0x9f, 0xdf, 0x9f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0xe0, 0xf0, 0xf8, 0xfa, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x06, 0x1f, 0x1e, 0x1f, 0x6f, 0x7f, 0xef, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xbf, 0x5f, 0x3f, 0xbf, 0x3f, 0xbf, 0x7f, 0xbf, 0x7f, 0x3f, 0x3f, 0x26, 0x00, 0x7a, 0x36, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+                                                0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x80, 0xc0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xf6, 0xf0, 0xf4, 0xf6, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xe0, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x87, 0x07, 0x01, 0x01, 0x00, 0x2a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x48, 0xcc, 0xce, 0xfe, 0xfe, 0xfe,
+                                                0xfe, 0xfe, 0xfe, 0xfe, 0x6c, 0xe8, 0xe8, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x3f, 0xfe, 0xfe, 0xf8, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x10, 0xe0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xfc, 0xfc, 0xe6, 0xe3, 0xd8, 0xfc, 0xff, 0xdf, 0xdf, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xf7, 0x43, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xf0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x16, 0x13, 0x7a, 0xfb, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0x3f, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8,
+                                                0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x08, 0x08, 0x0f, 0x0f, 0x97, 0xaf, 0x82, 0xc3, 0xf4, 0xfb, 0xfa, 0xfa, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xfa, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
+                                                0xfc, 0xfc, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x10, 0xc0, 0x20, 0xe0, 0xe8, 0xf8, 0xfc, 0xfe, 0xf8, 0xfe, 0xfe, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x2b, 0x0f, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x3e, 0x7f, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0xc0, 0xe0, 0xf0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x7f, 0x7f, 0xf7, 0xff, 0xff, 0xff, 0xef, 0xf7, 0xff, 0xef, 0x6f, 0xff, 0x5f, 0xbf, 0x3f, 0x1f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3e, 0x3f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x3f, 0x3f,
+                                                0x7f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xe0, 0xf8, 0xf4, 0xf4, 0xf0, 0xf8, 0xe0, 0x00, 0x80, 0x78, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0,
+                                                0xc0, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf0, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x89, 0x1d, 0x3f, 0x0f, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf3, 0xf7, 0xf7, 0xe6, 0xfe, 0xec, 0xdc, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x7f, 0xff, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xf8, 0xfc, 0xfc, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x1e, 0x58, 0x46, 0x31, 0xfb, 0x7f, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0,
+                                                0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0f, 0x0b, 0x07, 0x1f, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x9f, 0x0f, 0xe3, 0x91, 0xa0, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xfb, 0xf9, 0xfe, 0xfa, 0xfc, 0xfc, 0xf8, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
+                                                0xf8, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x28, 0x00, 0x60, 0xe0, 0xf0, 0xec, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfa, 0xfc, 0xfe, 0xfe, 0xfc, 0xff, 0xc8, 0xdf, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x37, 0x3f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x30, 0xf0, 0xf8, 0xf8, 0xfd, 0xff, 0xff, 0x7f, 0x3f, 0x0c, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xfc, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x7f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xdf, 0xdf, 0xff, 0xef, 0xbf, 0xdf, 0xbf, 0x1f, 0x9f, 0x3f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x3f, 0x3f, 0x1f, 0x1d, 0x3f, 0x1f, 0x7f, 0x7f, 0x7f, 0x3f,
+                                                0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x47, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xfc, 0xfd, 0xf9, 0xf1, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfa, 0xff, 0xfe, 0xff, 0xfc, 0xf0, 0xc0, 0x80, 0x22, 0x15, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0x80,
+                                                0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x78, 0xf8, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x13, 0x93, 0xff, 0x1f, 0x1f, 0xdf, 0xff, 0xff, 0xdd, 0xcd, 0xec, 0xce, 0xcc, 0xcc, 0xdc, 0xfc, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0xfe, 0xfc, 0xfc, 0xf0, 0xf8, 0xf0, 0xe0, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x3f, 0x7b, 0xa9, 0xcc, 0x52, 0xf7, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+                                                0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1c, 0x1e, 0x0d, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x3f, 0x0f, 0x13, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xd0, 0xf0, 0xfa, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0xdf, 0xf3, 0xe3, 0xf1, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xf0, 0xf0, 0xf0,
+                                                0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf8, 0xf8, 0xf0, 0xf8, 0x30, 0x00, 0x00, 0xc0, 0x60, 0xd0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xec, 0xef, 0xd7, 0xcf, 0x07, 0x07, 0x07, 0x07, 0x03, 0x0b, 0x0f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0xe0, 0xf0, 0xf0, 0xf0, 0xfc, 0xfe, 0xfe, 0x7e, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe8, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xbf, 0xbf, 0xbf, 0xbf, 0x3f, 0xbf, 0x7f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x7e, 0x38, 0x22, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f,
+                                                0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x1f, 0x0e, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd1, 0xe1, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf9, 0xf9, 0xf9, 0xfb, 0xf3, 0xe3, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfc, 0xfe, 0xf0, 0x80, 0x00, 0x00, 0x50, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x3e, 0xfe, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x18, 0xf0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x98, 0x99, 0xdb, 0xfb, 0x3f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xdd, 0xdd, 0xd8, 0x98, 0x90, 0x30, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3f, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xfc, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xfe, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x0e, 0x3e, 0xbe, 0x3f, 0x3b, 0x3b, 0x7f, 0xff, 0x7f, 0xbf, 0x3f, 0x4f, 0x0f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x3e, 0x5e, 0x46, 0x06, 0xc0, 0xc0, 0xe0, 0xc0, 0xe0, 0xc0, 0xe0, 0xc0, 0xe0, 0xc0, 0xe0,
+                                                0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xe0, 0xf0, 0xf0, 0x70, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xf4, 0xfc, 0xfc, 0xfc, 0xfe, 0xfc, 0xfe, 0xfe, 0xf4, 0xfa, 0xfe, 0xfc, 0x1c, 0x1a, 0x00, 0x01, 0x03, 0x01, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xe3, 0xf1, 0xf0, 0xf0, 0xf9, 0xfc, 0xfc, 0x58, 0x00, 0x00, 0x00, 0x00, 0x80, 0xa0, 0xe0, 0xe8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfb, 0xff, 0xfd, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0x3f, 0x3f, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0xff, 0x7f, 0x7f, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7e, 0x7c, 0x34, 0x3e, 0x7e, 0x7f, 0x7f, 0x7f,
+                                                0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x8f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x83, 0xc3, 0xc0, 0xc0, 0xc1, 0xf3, 0xf3, 0xe7, 0xe3, 0xe7, 0xc7, 0x0e, 0x07, 0x06, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdf, 0xdf, 0xff, 0xf8, 0xf0, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xc0, 0xf0, 0xf8, 0xf8, 0xf8, 0xfc, 0xfe, 0xfc, 0xfe, 0xfe, 0xff, 0xf0, 0x80, 0x80, 0x00, 0xec, 0x71, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x60, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1f, 0xfe, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xf0, 0xff, 0xff, 0xfc, 0xfc, 0xf8, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0xcc, 0xe6, 0xe2, 0xf2, 0xfe, 0xff, 0xff, 0x87, 0xef, 0xff, 0xff, 0xff, 0xf7, 0xf6,
+                                                0xe6, 0xe6, 0xe6, 0xac, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xff, 0x3f, 0xff, 0xbf, 0xbf, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0x2f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc7, 0xf7, 0xe3, 0xe3, 0xc5, 0xdf, 0xbf, 0x7f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x0f, 0x7f, 0x1f, 0x0e, 0x3e, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x0b, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x7e, 0xbe, 0x0e, 0xa6, 0xc0, 0xe0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0,
+                                                0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0x20, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfe, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf8, 0xff, 0x3f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0x7e, 0x3e, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfc, 0xfa, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6b, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x3f, 0xbf, 0x7f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x7f, 0x3f, 0x7d, 0x36, 0x34, 0x76,
+                                                0x7f, 0x3f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0x00, 0x60, 0x61, 0xc3, 0xef, 0x87, 0x07, 0x03, 0x01, 0x00, 0x00, 0xa0, 0xe0, 0xe0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc7, 0x83, 0xc1, 0xc0, 0xc1, 0xc1, 0xe3, 0xe3, 0xe3, 0xe7, 0xc7, 0x0f, 0x07, 0x0f, 0x0f, 0x0e, 0x0d, 0x04, 0x09, 0x02, 0x01, 0x06, 0x00, 0x05, 0x05, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x16, 0x40, 0x00, 0x00, 0x08, 0x00, 0x00, 0x44, 0xe0, 0xf8, 0xf8, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xc0, 0x88, 0x44, 0xeb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xf0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x90, 0x98, 0x98, 0xbc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xb8, 0xb0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x7f, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0xff, 0xe3, 0xf9, 0xf8, 0xfd, 0xfd, 0xff, 0xf7, 0xe3, 0xff, 0xff,
+                                                0xff, 0xff, 0xfb, 0xfb, 0xfb, 0xf9, 0xfb, 0xe2, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0xf7, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x7f, 0x1f, 0x0f, 0x7f, 0xef, 0xef, 0xef, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xf9, 0xfb, 0xef, 0xef, 0x2f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xfe, 0xfe, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0b, 0x1f, 0x1f, 0x07, 0x07, 0x2f, 0x3f, 0x2f, 0x0b, 0x83, 0x80, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x3e, 0x1e, 0x8e, 0xc6, 0xc0, 0xe0, 0xc0,
+                                                0xe0, 0xc0, 0xe0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0x83, 0x81, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x5c, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x01, 0x00, 0x00, 0xc0, 0x40, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xfd, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x68,
+                                                0xf0, 0x32, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x80, 0xc0, 0xa0, 0xa0, 0xe0, 0xf0, 0xf0, 0xf0, 0xd9, 0xdb, 0xf3, 0x41, 0x01, 0x00, 0x80, 0xc0, 0xe8, 0xf0, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x87, 0x81, 0xc3, 0xe0, 0xc1, 0xe1, 0xe3, 0xc3, 0xc7, 0x8f, 0x07, 0x0e, 0x07, 0x0e, 0x0f, 0x0c, 0x1d, 0x06, 0x05, 0x09, 0x0f, 0x0b, 0x06, 0x07, 0x0b, 0x06, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x9f, 0x9f, 0x8f, 0x83, 0x81, 0x84, 0x94, 0x84, 0x00, 0x0e, 0x33, 0x96, 0xf7, 0xf6, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xcc, 0x8b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xaf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x01, 0x01, 0x02, 0x06, 0xee, 0xfc, 0xf8, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x40, 0x60, 0x6c, 0x6e, 0xef, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xee, 0xe8, 0xe8, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xdb, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff,
+                                                0xff, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfd, 0xe3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x07, 0x0f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x1f, 0x2f, 0x47, 0x37, 0x5f, 0xfb, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfe, 0xfe, 0xfd, 0xff, 0xff, 0x7b, 0x17, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xfc, 0xff, 0xff, 0xc7, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x07, 0x03, 0x8b, 0xa1, 0x8f, 0x87, 0x84, 0xc0, 0xc0, 0xc0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0xe0, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x7c, 0x3c,
+                                                0x1c, 0x80, 0x00, 0xc0, 0x80, 0x80, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0xc0, 0x80, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xe7, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0e, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x0f, 0x02, 0x80, 0x80, 0xc0, 0xc0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xfc, 0xff, 0xfe, 0xff, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xfe, 0x58, 0x80, 0xa0, 0x20, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdf, 0xdf, 0x9f, 0xbf, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xf0, 0xe0, 0xa0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xa0, 0xe0, 0xe0, 0xc0, 0xe0, 0xf0, 0xe0, 0xe0, 0xf0, 0xe0, 0xe0, 0xe8, 0xfc, 0xf0, 0xfc, 0xf4, 0xfd, 0xfe, 0xf5, 0xe0, 0xd8, 0xc0, 0xec, 0xfa, 0xf4, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x87, 0x83, 0x80, 0x80, 0xc3, 0x83, 0x87, 0x0f, 0x0f, 0x0b, 0x1a, 0x1f, 0x0c, 0x1f, 0x0a, 0x1b, 0x36, 0x17, 0x0f, 0x1f, 0x0f, 0x1f, 0x1f, 0x1d, 0x1d, 0x08, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0xf3, 0xe7, 0xe7, 0xef, 0xff, 0xef, 0xf0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf1, 0xfb, 0xf3, 0xc3, 0x03, 0x03, 0x8d, 0x77, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x70, 0x70, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xf0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x18, 0x1c, 0x9c, 0xcc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xa0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x5e, 0xee, 0xe7, 0xf3, 0xf3, 0xff, 0xc7, 0xdf, 0xef, 0xff, 0xff, 0xf3, 0xf3, 0xf3, 0xf3, 0xf0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6f, 0x2f, 0x47, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x1e, 0x1e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x09, 0x0f, 0x05, 0x0d, 0x2b, 0x1f,
+                                                0x3f, 0xbf, 0x7f, 0x37, 0xfb, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xef, 0xef, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xff, 0xff, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x60, 0xe0, 0xc0, 0xc0, 0xe0, 0x40, 0x00, 0x24, 0xbe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xfc, 0xfc, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x1f, 0x7f, 0x7e, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xf0, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xfc, 0xfc, 0xf9, 0xf9, 0xfd, 0xf8, 0xf8, 0xf0, 0xf8, 0xff, 0xf7, 0xff, 0xff, 0xef, 0xef, 0xff, 0xaf, 0xdf, 0xef, 0xdf, 0xdf, 0xef, 0xc6, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xbf, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x04, 0x34, 0x58, 0x74, 0xdc, 0xb8, 0xb4, 0xe0, 0x10, 0x00, 0x00, 0x10, 0x56, 0xeb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x07,
+                                                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf1, 0xf1, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x8f, 0xc3, 0x83, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe1, 0x01, 0x07, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x03, 0x0f, 0x0f, 0x0f, 0x07, 0x0b, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x90, 0x98, 0x98, 0xf8, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xd0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x60, 0x60, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x87, 0xfb, 0xf1, 0xf9, 0xe9, 0xeb, 0xe3, 0xf1, 0xd9, 0xf9, 0xf9, 0xd9, 0xe0, 0x20, 0x70, 0x40, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xcc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xec, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xbf, 0x7f, 0xff, 0x7f, 0xfe, 0xff, 0xfb, 0xfb, 0xff, 0x7f, 0xff, 0x7f, 0xfa, 0x39, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x03, 0x03, 0x73, 0x2b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x84, 0x03,
+                                                0x01, 0x00, 0x00, 0x02, 0x0f, 0x3f, 0x0f, 0xfc, 0x0c, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0x90, 0xe0, 0x00, 0x18, 0x08, 0x28, 0x00, 0x20, 0x0c, 0x1d, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe8, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xdc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfe, 0xfa, 0xfe, 0xfe, 0xfd, 0xeb, 0xff, 0xf7, 0xef, 0xff, 0xdf, 0xef, 0x8f, 0xdf, 0x8f, 0xcf, 0xef, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x0f, 0x17, 0x2f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x07,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xd8, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0xe3, 0xfb, 0xf1, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xd0, 0xe1, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x47, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x00, 0x02, 0x08, 0x01, 0x00, 0x00, 0x02, 0x07, 0x3f, 0x5f, 0x7f, 0x7f, 0xff, 0x3f, 0x7f, 0x3f, 0x3f, 0x0f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc8, 0xcc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0x68, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xc7, 0xe9, 0xe8, 0xfc, 0xf0, 0xf0, 0xf9, 0xb9, 0xe8, 0xec, 0xfc, 0xec, 0xa8, 0xb0, 0x90, 0x60, 0xf0, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xf1, 0xf3, 0xf7, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xbf, 0xdf, 0x37, 0x1f, 0xfb, 0xfd, 0xfd, 0xff, 0x17, 0x13, 0x1d, 0x39, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x7e, 0x1f, 0x1f, 0x8f, 0xdf, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x80, 0x80, 0x01, 0x80, 0x80, 0x00, 0x00, 0x02, 0x07, 0x07, 0x2f, 0x16, 0x1c, 0x25, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xe0, 0x80, 0xc4, 0x84, 0x88, 0x10, 0x18, 0x00, 0x32, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xe0, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfe, 0xff, 0xf5, 0xf3, 0xff, 0xef, 0xef, 0xdf, 0xdf, 0x9f, 0x9f, 0xdf, 0xcf, 0xc0, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x00, 0x03, 0x0f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xf8, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x07, 0x15, 0xf9, 0xfd, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xf8, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7b, 0x01, 0x00, 0x00, 0x02, 0x0a, 0x0a, 0x01, 0x0d, 0x20, 0x08, 0x00, 0x00, 0x6a, 0x0d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x1f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x20, 0x30, 0x30, 0x32, 0x73, 0x7f, 0x3f, 0x7f, 0x3f, 0x7e, 0x7e, 0x7c, 0x64, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfd, 0xfc, 0xbe, 0xfd, 0xde, 0xdb, 0xfc, 0x7e, 0xfa, 0xfb, 0xff, 0xf7, 0xd6, 0xbc, 0x78, 0xfe, 0xf4, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6f, 0x4f, 0x1e, 0x17, 0x1f, 0xef, 0xdf, 0xff, 0xff, 0x7f, 0x15, 0xdd, 0xff, 0x3e, 0x3c, 0x1d, 0x01, 0x05, 0x01, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x84, 0x83, 0xbd, 0xb7, 0x87, 0xbf, 0x03, 0x0f, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xf8, 0xfe, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0xe0, 0xe0, 0x60, 0xf0, 0xe0, 0xf0, 0x10, 0x00, 0x00, 0xf6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xfe, 0xff, 0xff, 0x65, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x80, 0x40, 0x50, 0x70, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xfc, 0xf9, 0xfc, 0xf8, 0xfc, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xfc, 0xf8, 0xfc, 0xea, 0xfb, 0xf7, 0xff, 0xef, 0xff, 0xff, 0xbf, 0xdf, 0xbf, 0xcf, 0xdf, 0xdf, 0x9f, 0xcf, 0xef, 0xe7, 0xef, 0xe7, 0xc0, 0xe2, 0xc0, 0xc4, 0x82, 0x84, 0x84, 0x84, 0x84, 0x80, 0x00, 0x80, 0x80, 0x80, 0x00,
+                                                0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x80, 0x01, 0x01, 0x01, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x07, 0x5f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x3e, 0x3c, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x3f, 0x0b, 0x07, 0x05, 0x31, 0x1e, 0xac, 0xfe, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xfc, 0xfc, 0xf8, 0xf8, 0xe0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x60, 0x30, 0x10, 0x30, 0x10, 0x72, 0x76, 0x7f, 0x7f, 0x7e, 0x7e, 0xfe, 0xfc, 0xec, 0x68, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xfe, 0xfd, 0xff, 0xff, 0xfd, 0x6c, 0xfe, 0xfa, 0xfb, 0xff, 0xf7, 0xf6, 0xfc, 0xfc, 0xfc, 0xfc, 0xe0, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x17, 0x08, 0x0f, 0x06, 0xae, 0xff, 0xff, 0xff, 0x7f, 0x07, 0xff, 0xff, 0x3f, 0x3e, 0x7d, 0x3f, 0x5f, 0x37, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x80, 0x00, 0x00, 0x80, 0x88, 0x85, 0x9d, 0xb7, 0xaf, 0x3f, 0x1b, 0x0b, 0x81, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xfc, 0xff, 0xff, 0xef, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0xc0, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xfd, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x83, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x40, 0x40, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xf7, 0xf6, 0xf3, 0xe3, 0xfb, 0xf8, 0xf4, 0xf8, 0xf8, 0xf2, 0xf0, 0xf0, 0xf9, 0xf0, 0xf1, 0xf8, 0xf0, 0xc8, 0xe8, 0xd0, 0xf0, 0xfe, 0xcf, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xbf, 0xbf, 0xbf, 0xff, 0xff, 0xcf, 0xef, 0xc7, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xf7, 0xe7, 0x8f, 0xcf, 0x97, 0xd6, 0x96, 0x8c, 0x00, 0x80, 0x80, 0x80, 0x80,
+                                                0xc0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xf2, 0xe0, 0xe0, 0xc0, 0xe0, 0xe0, 0xf8, 0xf8, 0xf8, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x07, 0x17, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x7e, 0x7c, 0x38, 0x10, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x6f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x0f, 0x06, 0x00, 0x02, 0x17, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x7f, 0x3f, 0x7f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x60, 0x30, 0x30, 0x10, 0x30, 0x72, 0x76, 0x7f, 0x7e, 0x7e, 0xfe, 0xfc, 0xfc, 0xc8, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xfa, 0xfd, 0xbf, 0xdd, 0x5c, 0x6d, 0xfc, 0xea, 0xfa, 0xff, 0xff, 0xf6, 0xbe, 0x7c, 0xfc, 0xe8, 0xe8, 0xc1, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x17, 0x07, 0x01, 0x0e, 0xcf, 0xbf, 0xef, 0xff, 0x7f, 0x17, 0xfd, 0xff, 0x3f, 0x3e, 0x5d, 0xff, 0x3b, 0x7f, 0x7f, 0x3f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x80, 0x8d, 0x8d, 0xb9, 0xbf, 0x3f, 0xb7, 0x27, 0xdf, 0x83, 0x81, 0x20, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xf7, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xf8, 0xfc, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xe0, 0xc0, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x20, 0x38, 0xfc, 0xfa, 0x7c, 0xfe, 0xfe, 0xfc, 0xfd, 0xfa, 0xeb, 0xf1, 0xf1, 0xf1, 0xfc, 0xf9, 0xf8, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf1, 0xf8, 0xf1, 0xd0, 0xf0, 0xf0, 0xe0, 0xd0, 0x9c, 0xbf, 0xff, 0xdf, 0xff, 0xff, 0xbf, 0x7f, 0xbf, 0xbf, 0xff, 0xdf, 0xff, 0xc7, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xcf, 0xaf, 0x97, 0x9f, 0xdf, 0x96, 0x8a, 0x80, 0xc0, 0xc0, 0xc0, 0xf0,
+                                                0xf8, 0xf0, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xdf, 0x9f, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0x7c, 0x78,
+                                                0x18, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x07, 0x00, 0x07, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x7f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x60, 0x20, 0x20, 0x30, 0x30, 0x74, 0x76, 0x7e, 0x7e, 0xfe, 0xfc, 0xfc, 0xf8, 0xd8, 0xd0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x78, 0x7c, 0xfc, 0x9f, 0xf9, 0xdd, 0xf8, 0xfd, 0xd4, 0xf6, 0xfe, 0xfe, 0xec, 0xf9, 0xf9, 0xe8, 0xf8, 0xe1, 0xc1, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x07, 0x0d, 0x13, 0x15, 0xcf, 0xfe, 0x7e, 0xfe, 0x1f, 0xdb, 0xfb, 0xff, 0x7f, 0x7d, 0x7b, 0x7f, 0xff, 0x9f, 0x7f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0c, 0xaf, 0x1b, 0x77, 0x1e, 0x7f, 0x17, 0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xe7, 0xc3, 0xc1, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0xc0, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0xc0, 0x80, 0x80, 0x00, 0x00, 0xc0, 0x80, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xe0, 0xfd, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xe1, 0x80, 0x00, 0x01, 0x01, 0x03, 0x03, 0x41, 0xe0, 0xc8, 0xe7, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xf9, 0xfc, 0xfe, 0xf8, 0xfc, 0xfe, 0xfa, 0xf8, 0xf4, 0xf8, 0xf8, 0xf0, 0xf8, 0xe8, 0xf0, 0xf0, 0xf0, 0xa0, 0xc0, 0xc4, 0xff, 0x9f, 0xdf, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0x7f, 0xff, 0xff, 0xbf, 0xff, 0xbf, 0xdf, 0xdf, 0x9f, 0x9f, 0xdf, 0x9f, 0xbf, 0xaf, 0x2f, 0xbe, 0x26, 0x2c, 0x04, 0x00,
+                                                0x80, 0x80, 0x80, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1f, 0x9f, 0x9f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfa, 0x2b, 0x00, 0x40, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc,
+                                                0xf8, 0xf0, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x58, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x7f, 0x3f, 0x7f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xfe, 0xfe, 0xfe, 0xf8, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x60, 0x60, 0x20, 0x60, 0xe0, 0xec, 0xec, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf9, 0xfc, 0xfe, 0x7e, 0xbe, 0x7e, 0xfe, 0xba, 0xc9, 0xd8, 0xf9, 0xf9, 0xbb, 0xf7, 0xc3, 0xd3, 0x67, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x2e, 0x7f, 0x1f, 0x7f, 0xbf, 0x7f, 0x7f, 0xff, 0xfb, 0xff, 0xff, 0xdf, 0xdf, 0xff, 0xff, 0xe7, 0xaf, 0xef, 0x6f, 0xbf, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xc0, 0x80, 0x81, 0x00, 0x00, 0x00, 0x4f, 0x6f, 0xd7, 0xdf, 0x67, 0x03, 0x0f, 0x07, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xdf, 0x8f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfe, 0xfc, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xf8, 0xf2, 0xfe, 0x7e, 0xfe, 0x3e, 0xbe, 0xfe, 0x3c, 0x5c, 0x00, 0x00, 0x00, 0xc4, 0xfe, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xfc, 0xf8, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xc7, 0xe3, 0xe3, 0xe3, 0xf3, 0xe1, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfc, 0xfc, 0xfe, 0xf8, 0xf8, 0xf4, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xbf, 0x7f, 0x3f, 0x7f, 0x70, 0x78, 0x78, 0x78,
+                                                0x70, 0xe0, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xff, 0xf9, 0xf9, 0xfb, 0xfb, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xe0,
+                                                0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x0f, 0x3f, 0x1f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x05, 0x07, 0x03, 0x07, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0d, 0x0f, 0x0f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f, 0x9f, 0x9f, 0x1f, 0xcf, 0x8f, 0x47, 0x86, 0x84, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0x40, 0x60, 0x68, 0xec, 0xcc, 0xdc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc2, 0xf1, 0xf9, 0xfd, 0xfc, 0xfe, 0xfe, 0xf4, 0x77, 0xfa, 0xd9, 0xd3, 0xf9, 0xf9, 0xb7, 0xa7, 0xc7, 0x26, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x54, 0xbf, 0x7f, 0xbf, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0x9f, 0xd1, 0x4d, 0x0b, 0x1f, 0x3f, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0x80, 0x80,
+                                                0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe8, 0xe8, 0xe0, 0x80, 0x01, 0x02, 0x00, 0x02, 0x42, 0x47, 0x2f, 0xbf, 0x0f, 0x47, 0x03, 0x1c, 0x03, 0x05, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0x7c, 0x3e, 0x1e, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xbf, 0xff, 0xbf, 0xff, 0xbf, 0xff, 0x7f, 0xfe, 0x7e, 0x04, 0x00, 0x90, 0xfc,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf0, 0xf8, 0xf0, 0xd0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x3f, 0xff, 0xe1, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0x4b, 0x48, 0x00, 0xa0,
+                                                0xc0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x01, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfe, 0xff, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0xfc, 0xf0, 0xf0, 0xe1, 0xe1, 0xe3, 0xc3, 0xc1, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x80, 0x40, 0x80, 0x00, 0x80, 0x80, 0x80, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x03, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0f, 0x0f, 0x07, 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7e, 0x7f, 0x7e, 0x3f, 0x3f, 0x3d, 0x3d, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0x90, 0x98, 0xb8, 0xf0, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0xe3, 0xe7, 0xfb, 0xf1, 0xfd, 0xfc, 0xe8, 0xfc, 0xfd, 0xe7, 0xa7, 0x27, 0xf3, 0xf7, 0x67, 0xcf, 0x8e, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xfe, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x26, 0x17, 0x0f, 0x3e, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
+                                                0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xd0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xe0, 0xf0, 0xc0, 0x01, 0x07, 0x0a, 0x03, 0x13, 0x43, 0x35, 0xff, 0x1d, 0x3f, 0x1f, 0x0f, 0x01, 0x10, 0x06, 0x07, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xa0, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xdf, 0xdf, 0x3f, 0x7f,
+                                                0x14, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0x81, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfc, 0xfe, 0x7f, 0x3f, 0x07, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0xfc, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0xa3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xfe, 0x07, 0x01,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x03, 0x07, 0xe3, 0xfb, 0xf3, 0xf1, 0xf0, 0xf0, 0xe0, 0xe0, 0x00, 0x00, 0x0b, 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfc, 0xf9, 0xfd, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0xc2, 0x84, 0x8e, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0x7f, 0x3f, 0x7f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x3f, 0x3f, 0xbf, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xe0, 0xc0, 0x43, 0x87, 0x67, 0x03, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x90, 0x90, 0xb0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xe2, 0xe7, 0xf3, 0xfb, 0xe9, 0xf8, 0xf9, 0xf9, 0xa9, 0xcf, 0x67, 0x67, 0xe7, 0xef, 0xcf, 0xdf, 0x1d, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0x34, 0x0e, 0x1d, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff,
+                                                0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xd0, 0xb0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xf8, 0xf8, 0xe0, 0xc0, 0x80, 0x22, 0x0b, 0x03, 0x0b, 0x07, 0x62, 0x5b, 0x9f, 0x3b, 0x3f, 0x1f, 0x1f, 0x03, 0x04, 0x07, 0x06, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xbf, 0xef, 0xbf,
+                                                0x7f, 0x0a, 0x00, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf8, 0xf8, 0xf9, 0xe1, 0x41, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xfc, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x09, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x14,
+                                                0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xe3, 0xe0, 0xf0, 0xfc, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfa, 0xfe, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x0f, 0x0f, 0x07, 0x0f, 0xc7, 0xf7, 0xf3, 0xfb, 0xf1, 0xf0, 0xe0, 0xe0, 0x40, 0x00, 0x01, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xfb, 0xfb, 0xf9, 0xf1, 0xf1, 0xe0, 0xc0, 0x80, 0x00, 0xc0, 0x00, 0x0c, 0x0c, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x07, 0x0f, 0x07, 0x07, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x7f, 0x3f, 0x7f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe8, 0x80, 0x83, 0x89, 0xc3, 0xc3, 0xcb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xd0, 0x90, 0x98, 0xb8, 0xf0, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe6, 0xf3, 0xf7, 0xfb, 0xfd, 0xfc, 0xfc, 0xf9, 0xed, 0xe7, 0xa3, 0x27, 0xf3, 0xf7, 0x67, 0xcf, 0x0f, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x8a, 0xfe, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x7f, 0x1a, 0x0b, 0x1e, 0x3e, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe,
+                                                0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xc0, 0xd0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xe0, 0xfc, 0xf8, 0xc0, 0x01, 0x27, 0x0d, 0x05, 0x81, 0x42, 0xb5, 0xff, 0x1f, 0x3f, 0x1f, 0x1f, 0x03, 0x12, 0x06, 0x07, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xe0, 0xe0, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x7f,
+                                                0x0e, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xf8, 0xfc, 0xf8, 0x71, 0x01, 0x40, 0x81, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfc, 0xfe, 0x7f, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0f, 0xb7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x2f, 0x02,
+                                                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x07, 0xf3, 0xf3, 0xf3, 0xf9, 0xf1, 0xe0, 0xe0, 0xc0, 0x40, 0x00, 0x07, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xf8, 0xf9, 0xfb, 0xf9, 0xf8, 0xd8, 0xe0, 0xa0, 0xa0, 0xc0, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x1f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x7f, 0x7f, 0x1f, 0x1f, 0x1f, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x3f, 0x7f, 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xe0, 0xc0, 0x85, 0x17, 0xc3, 0xc3, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfc, 0xfc, 0xf0, 0xf0, 0xe0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0x40, 0x60, 0xe8, 0xc8, 0xcc, 0xdc, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe3, 0xf3, 0xf9, 0xff, 0xfe, 0xfe, 0x7c, 0xfe, 0x78, 0x73, 0xd1, 0xd9, 0xf9, 0xfb, 0xb7, 0xf3, 0xc7, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xce, 0xbf, 0xff, 0x3f, 0x77, 0xdf, 0x7f, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xd9, 0xc9, 0x2f, 0x3f, 0x1f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xe0, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+                                                0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xe0, 0x81, 0x01, 0x02, 0x00, 0x00, 0x03, 0x9b, 0x7f, 0xcf, 0x27, 0x07, 0x02, 0x1e, 0x0d, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0x7c, 0x3e, 0x1e, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xfc, 0xfc, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xdf, 0x5f, 0x3f, 0x7f, 0x0e, 0x04, 0x00, 0xc8, 0xf9,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf1, 0xf8, 0xe8, 0xf8, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x9f, 0xdf, 0xe1, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf0, 0xf8, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x37, 0x82, 0x40, 0xa0,
+                                                0xe0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x02, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xf0, 0xf9, 0xf0, 0xe1, 0xe1, 0xc3, 0xc0, 0xc1, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x80, 0x80, 0x00, 0x40, 0x00, 0x80, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x07, 0x01, 0x03, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x07, 0x07, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfe, 0x7d, 0xff, 0x7f, 0x3f, 0x3f, 0x3f, 0x1a, 0x1c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0x60, 0x20, 0x60, 0x64, 0xec, 0xec, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0x70, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xf0, 0xf3, 0xfd, 0xfc, 0x7e, 0xfe, 0xfe, 0xba, 0xfa, 0xe9, 0xd9, 0xfd, 0xf9, 0xb9, 0xf3, 0xc3, 0xe3, 0xa7, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa5, 0xbf, 0x5f, 0x7f, 0xff, 0x7d, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xdf, 0xff, 0xff, 0xef, 0xc7, 0x6f, 0xbf, 0x7f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xc0, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0c, 0x7f, 0x7f, 0xaf, 0x23, 0x03, 0x1e, 0x0f, 0x03, 0x01, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xde, 0x8f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xfc, 0xfe, 0xfc, 0xfe, 0xfe, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0x78, 0xfc, 0xfe, 0xfe, 0xfe, 0x3c, 0x7e, 0x3e, 0x7c, 0x1c, 0x00, 0x00, 0x80, 0xf0, 0xf7, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xc7, 0xc3, 0xe3, 0xe3, 0xe3, 0xe1, 0xe0, 0xf0, 0xf8, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x3f, 0xff, 0x3f, 0x7f, 0x78, 0x70, 0xfc, 0x78,
+                                                0x70, 0xf0, 0x60, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xff, 0xf9, 0xf9, 0xf8, 0xf0, 0xf8, 0xe0, 0xf0, 0xf0, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0,
+                                                0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x01, 0x07, 0x07, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x1f, 0x0f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xbf, 0xbf, 0x9f, 0x8f, 0x8f, 0x8f, 0xc6, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x60, 0x20, 0x20, 0x60, 0x74, 0xe6, 0xfc, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xb0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf4, 0xf8, 0x7f, 0xba, 0xfe, 0xb7, 0xbd, 0xfd, 0xe4, 0xfc, 0xfc, 0xfe, 0x5d, 0xf3, 0xf1, 0xd1, 0xb1, 0xa1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x17, 0x3f, 0x15, 0x1f, 0xde, 0x7f, 0xfd, 0xfd, 0xbf, 0xbf, 0xef, 0xff, 0xff, 0xff, 0xf3, 0xff, 0xf7, 0x7f, 0xff, 0x7f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x80, 0x00, 0x00, 0x10, 0x63, 0x3b, 0x2f, 0x77, 0x6d, 0x64, 0x0b, 0x07, 0x00, 0x02, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xe0, 0xf0, 0xfc, 0xfc, 0xfe, 0xff, 0xef, 0xe7, 0xe1, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0xf0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf0, 0xe0, 0xf0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xf0, 0xe0, 0xf0, 0xd0, 0xf0, 0x70, 0xf8, 0x78, 0x78, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf4, 0xfc, 0xfd, 0xfe, 0xfd, 0xfe,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xe1, 0xc0, 0xc0, 0x80, 0xc1, 0xc1, 0xc1, 0xc0, 0xe0, 0xc8, 0xf2, 0xfc, 0xf5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfc, 0xff, 0xfa, 0xfd, 0xfd, 0xfa, 0xf8, 0xfc, 0xf4, 0xf8, 0xfc, 0xf8, 0xe0, 0xe8, 0xf8, 0xed, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xbf, 0xbf, 0xbf, 0xff, 0xbf, 0x3f, 0xbe, 0x7e, 0x3c, 0xfc, 0xd8, 0xf8,
+                                                0x38, 0x30, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x0f, 0x0f, 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x3f, 0x0f, 0x00, 0x00, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfe, 0xfc, 0xfe, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8,
+                                                0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x3a, 0x0f, 0x7f, 0x3f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x3f, 0x0f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xf3, 0xf1, 0xf1, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x20, 0x00, 0x30, 0xb0, 0x32, 0x76, 0x7e, 0x7e, 0x7e, 0x7e, 0xfc, 0xfc, 0xc8, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf0, 0xfc, 0x7c, 0x9f, 0xff, 0xcf, 0x78, 0x6c, 0xfa, 0xfa, 0xff, 0xff, 0xf7, 0xfc, 0xfc, 0xf4, 0xf8, 0xe0, 0xe1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x37, 0x0e, 0x02, 0x27, 0x0f, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0xf9, 0xbf, 0xff, 0x3f, 0x3d, 0x79, 0x7f, 0x7f, 0x7f, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x80, 0xc1, 0x8f, 0xbf, 0x9f, 0x3f, 0x2f, 0x9f, 0x07, 0x81, 0xc0, 0xa1, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xf7, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfa, 0xfb, 0xfe, 0xfa, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xe0, 0xc0, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x28, 0x18, 0x38, 0xb8, 0xfe, 0xfe, 0xfc, 0xfe, 0xfe, 0xee, 0xf5, 0xf1, 0xf4, 0xf9, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf0, 0xf1, 0xd8, 0xd0, 0xf0, 0xf0, 0xd0, 0xc0, 0xa0, 0xfc, 0x8e, 0x9f, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xbf, 0xff, 0xbf, 0xff, 0xcf, 0xc7, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xcf, 0xdf, 0xaf, 0x9f, 0xd7, 0x96, 0x1e, 0x86, 0x82, 0x80, 0xc0, 0xc0, 0xc8,
+                                                0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x9c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xcf, 0xdf, 0x9f, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf0, 0xf0, 0xe0, 0xf8, 0xfe, 0xfa, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0x7c, 0x7c, 0x3c,
+                                                0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x13, 0x2f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x1f, 0x07, 0x00, 0x05, 0x7f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xf0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x60, 0x20, 0x10, 0x10, 0x30, 0xb2, 0x76, 0x7f, 0x7f, 0x7e, 0x7e, 0x7e, 0xfc, 0xec, 0xe8, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfc, 0xbf, 0xfd, 0xdf, 0x69, 0xfd, 0xee, 0xfb, 0xfb, 0xff, 0xf7, 0xf6, 0xfc, 0xf8, 0xfc, 0xfc, 0xe0, 0xc1, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3d, 0x4b, 0x0a, 0x17, 0x0f, 0xae, 0xfe, 0xff, 0xff, 0x7f, 0x07, 0xff, 0xff, 0xff, 0xbf, 0x3c, 0x6d, 0x9f, 0x1f, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x80, 0x88, 0xb7, 0xcf, 0xbd, 0xbf, 0x3b, 0x8f, 0x8f, 0x82, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xfb, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xba, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x83, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x40, 0x00, 0x70, 0x70, 0xf8, 0xfc, 0xfe, 0xfc, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xf6, 0xf7, 0xf2, 0xf1, 0xf1, 0xf8, 0xf8, 0xf8, 0xf0, 0xf8, 0xf0, 0xf8, 0xf9, 0xf9, 0xf9, 0xf0, 0xf0, 0xe8, 0xf0, 0xe0, 0xde, 0xff, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xbf, 0xbf, 0xbf, 0xff, 0xdf, 0xef, 0xc7, 0xef, 0xef, 0xef, 0xef, 0xef, 0xef, 0xe7, 0xe7, 0x8f, 0x87, 0x9f, 0x96, 0x96, 0x94, 0x80, 0x80, 0x80, 0xc0, 0x80,
+                                                0xc0, 0xe0, 0xe0, 0xc0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xf4, 0xf0, 0xe0, 0xc0, 0xe0, 0xe0, 0xf0, 0xfc, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x03, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7c, 0x7c, 0x38, 0x90, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x0f, 0x07, 0x00, 0x01, 0x1f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x7f, 0x7f, 0x3f, 0x7f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfe, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x60, 0x70, 0x30, 0x32, 0x32, 0x77, 0x7f, 0x7f, 0x7f, 0x7f, 0x7e, 0x7e, 0x7e, 0x64, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf9, 0xfe, 0xfa, 0xfd, 0xff, 0xfe, 0x7d, 0x7e, 0xfa, 0xfb, 0xff, 0xf7, 0xf6, 0xfc, 0xfe, 0xfc, 0xfc, 0xf4, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x5f, 0xff, 0x0d, 0x2f, 0x1f, 0xee, 0xdf, 0xff, 0xff, 0x7f, 0x1d, 0xfd, 0xff, 0x1e, 0x3c, 0x1f, 0x03, 0x0d, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x80, 0x9b, 0xb7, 0x9f, 0xaf, 0xbf, 0x1f, 0x0b, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xfe, 0x7e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0x80, 0xc0, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x20, 0x60, 0xe0, 0xe0, 0x60, 0xf0, 0xc0, 0x70, 0x00, 0x00, 0x00, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf0, 0xf0, 0x70, 0x20, 0x00, 0x00, 0x00, 0x60, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfd, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xfc, 0xfc, 0xf9, 0xfc, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xdf, 0xdf, 0xdf, 0xcf, 0xef, 0xf7, 0xe7, 0xe3, 0xe7, 0xe0, 0xe2, 0xc2, 0xa6, 0x86, 0xcc, 0xc4, 0x84, 0x80, 0x80, 0x80, 0x00, 0x80, 0x00,
+                                                0x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xa0, 0x01, 0x01, 0x01, 0x80, 0x80, 0xc0, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x07, 0x03, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7e, 0x3e, 0x3c, 0x1c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x1f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x7f, 0x3f, 0x7f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x5f, 0x0f, 0x07, 0x01, 0x3a, 0x65, 0x7e, 0xfe, 0xfc, 0xfe, 0xff, 0xff, 0xfe, 0xff, 0xfc, 0xfe, 0xf8, 0xf8, 0xf8, 0xe0, 0xe0, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xd8, 0xc8, 0xdc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xe8, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0xf1, 0xf9, 0xe4, 0xfc, 0x7c, 0xf5, 0xf9, 0xe8, 0xec, 0xfc, 0xec, 0xcc, 0xb4, 0x20, 0x60, 0x60, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xf1, 0xf3, 0xf7, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xef, 0x3d, 0x3f, 0x3b, 0xff, 0x7f, 0xfd, 0xff, 0x77, 0x3f, 0xff, 0x3c, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x7e, 0x1f, 0x1f, 0xdf, 0x9f, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0xc0, 0x86, 0xc4, 0x84, 0x00, 0x80, 0x03, 0x17, 0x07, 0x77, 0x0c, 0x36, 0x16, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xf8, 0xe8, 0xc0, 0xe0, 0x88, 0x88, 0xbc, 0x18, 0x01, 0x3f, 0x3f, 0xbf, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xe0, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf2, 0xff, 0xf7, 0xff, 0xff, 0xd7, 0xff, 0xff, 0xff, 0xdf, 0x9f, 0xdf, 0xcf, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0xc0, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x00, 0x03, 0x0f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xd8, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x07, 0x0f, 0x03, 0x1b, 0xef, 0xfd, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x01, 0x00, 0x00, 0x06, 0x0b, 0x0a, 0x0b, 0x05, 0x18, 0x04, 0x00, 0x04, 0x00, 0x3e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x2f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x90, 0x98, 0x98, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xd0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe0, 0x60, 0x60, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x8a, 0xf3, 0xf9, 0xf9, 0xe9, 0xed, 0xe3, 0xf1, 0x99, 0xf9, 0xfd, 0xd8, 0xe8, 0xa0, 0x70, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xce, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xdf, 0x5f, 0x37, 0x7f, 0x56, 0xfb, 0xfb, 0x7f, 0xff, 0xef, 0x7d, 0xfa, 0xfb, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x03, 0x03, 0x63, 0x37, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x02, 0x82,
+                                                0x01, 0x00, 0x00, 0x00, 0x07, 0x8f, 0x2f, 0xa9, 0x1e, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x3f, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xf8, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf0, 0xf0, 0xf0, 0x90, 0x80, 0x20, 0x10, 0x10, 0x20, 0x60, 0xc0, 0x05, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xe8, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xfa, 0xee, 0xec, 0xfa, 0xfa, 0xff, 0xfb, 0xdf, 0xef, 0xdf, 0x6f, 0xcf, 0xef, 0x8f, 0xdf, 0xcf, 0xcf, 0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0x80, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x0f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x78, 0x00, 0x00, 0x00, 0x80, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xa8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0xf3, 0xf3, 0xf9, 0xf8, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xd0, 0xe1, 0xcf, 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x01, 0x04, 0x12, 0x00, 0x00, 0x02, 0x04, 0x11, 0x2f, 0x3f, 0x7f, 0x7f, 0x3f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x70, 0x70, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xa0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x18, 0x1c, 0xcc, 0xdc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xa0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x3c, 0xe6, 0xf2, 0xf3, 0xf3, 0xff, 0xe7, 0xd7, 0x77, 0xf7, 0xf7, 0xf7, 0xf3, 0xf3, 0xe3, 0xf2, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xef, 0xb7, 0x17, 0x57, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x1e, 0x1e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x09, 0x0b, 0x07, 0x00, 0x03, 0x0f, 0x1f,
+                                                0xff, 0x37, 0x7b, 0x7b, 0xbf, 0x3f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xff, 0xff, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xa0, 0x08, 0x64, 0x7f, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfd, 0xfc, 0xfc, 0xfd, 0xfc, 0xf8, 0xfc, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x1f, 0x7f, 0x7e, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe0, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfe, 0xfa, 0xfc, 0xfc, 0xf9, 0xf1, 0xf9, 0xf4, 0xf4, 0xf8, 0xf8, 0xfb, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xcf, 0xff, 0xcf, 0xe5, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xe0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0xd0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x34, 0x00, 0x00, 0x00, 0x08, 0x20, 0x04, 0x58, 0x34, 0xb0, 0xc8, 0xe8, 0xb4, 0x48, 0x00, 0x00, 0x18, 0xd8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f,
+                                                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe1, 0xf1, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x8f, 0x87, 0x83, 0xc1, 0xc0, 0xc0, 0xc0, 0xc0, 0xa1, 0x01, 0x03, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x3f, 0xf3, 0xc3, 0x01, 0x01, 0x81, 0xc3, 0xc3, 0xff, 0xfe, 0xfc, 0xf8, 0xd0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0x30, 0x92, 0x9b, 0x9b, 0xfb, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3a, 0xb2, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfd,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x0f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x27, 0x1f, 0x1f, 0x7f, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x1f, 0x07, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xf0, 0xf0, 0xfc, 0xff, 0xff, 0xc7, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc1, 0xc1, 0xc2, 0xc2, 0xc6, 0xea, 0xc9, 0xe1, 0xf0, 0xe0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xc0, 0xa0,
+                                                0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x81, 0x01, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x97, 0xaf, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x9f, 0x9f, 0xdf, 0x07, 0xcf, 0x81, 0xc0, 0xe0, 0xf0, 0xf0, 0xe8, 0xf8, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0x33, 0xf5, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe,
+                                                0xfe, 0xfe, 0xfc, 0xfc, 0x00, 0x00, 0x40, 0xf0, 0xf4, 0xfa, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcf, 0xdf, 0xdf, 0xff, 0xbf, 0x7f, 0x7f, 0xff, 0xfe, 0xf8, 0x34, 0x04, 0x0c, 0x9e, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xfd, 0xfe, 0xff, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x01, 0x00, 0x01, 0x07, 0x06, 0x18, 0x0d, 0x33, 0x08, 0x31, 0x3b, 0x1d, 0x57, 0x7f, 0x5b, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x77, 0x61, 0x44, 0x00, 0x02, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x01,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb, 0xff, 0xf7, 0xf7, 0xf7, 0xff, 0xfc, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfd, 0x3f, 0x33, 0x00, 0x06, 0x0b, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x90, 0x98, 0xb8, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xb0, 0xb0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcb, 0xf3, 0xf9, 0xfc, 0xfd, 0xff, 0xff, 0xeb, 0x63, 0xf7, 0xff,
+                                                0xff, 0xff, 0xfb, 0xf9, 0xfb, 0xfb, 0xfb, 0xf7, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x3f, 0xdf, 0x2f, 0xff, 0xef, 0xff, 0xef, 0xef, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfb, 0xff, 0xf7, 0x6f, 0x0f, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf8, 0xfe, 0xfe, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x2b, 0x1f, 0x07, 0x27, 0x07, 0x3f, 0x0f, 0x1f, 0x83, 0x88, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xe8, 0xf0, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x7e, 0xbe, 0xce, 0xc6, 0xc0, 0xe0, 0xe0,
+                                                0xc0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xf0, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0x83, 0x81, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x7c, 0x7c, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xf0, 0xf0, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xf8,
+                                                0x60, 0x56, 0x7e, 0x7f, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xf0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x40, 0x00, 0x80, 0xa0, 0xa0, 0xc0, 0xa0, 0xc0, 0xb0, 0xf8, 0xd3, 0xfb, 0xd3, 0xc3, 0x01, 0x80, 0x00, 0xe8, 0xf0, 0xf0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xc7, 0xc1, 0xc1, 0xc1, 0xe0, 0xe1, 0xe3, 0xe3, 0xc7, 0x8f, 0x0f, 0x0e, 0x0f, 0x0f, 0x0e, 0x0f, 0x0f, 0x0e, 0x05, 0x0d, 0x05, 0x0b, 0x0e, 0x0f, 0x0e, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x8f, 0x0f, 0x8f, 0x1f, 0x1f, 0x1f, 0x1f, 0x9f, 0xc3, 0xc1, 0x8a, 0xc6, 0x08, 0x05, 0x00, 0x36, 0x53, 0xf5, 0xfd, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0xe2, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x60, 0x70, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe2, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1f, 0xfe, 0xf8, 0xf0, 0xe0, 0xf0, 0xf0, 0xe0, 0xe1, 0xff, 0xff, 0xfc, 0xfc, 0xf8, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xc6, 0xe6, 0xe2, 0xf2, 0xf7, 0xfe, 0xff, 0x8f, 0xef, 0xff, 0xff, 0xff, 0xff, 0xf6,
+                                                0xe6, 0xe6, 0xe6, 0x84, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x75, 0x3f, 0x5f, 0xbf, 0xff, 0xbf, 0xbf, 0xdf, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe7, 0xc3, 0xc3, 0xe3, 0x87, 0xff, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0f, 0x2f, 0x3f, 0x1f, 0x1e, 0x9f, 0xff, 0x3f, 0x4f, 0x07, 0x07, 0x09, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x7e, 0xbe, 0xae, 0xc6, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0,
+                                                0xc0, 0xc0, 0xe0, 0xe0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xe0, 0xf0, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe8, 0xf4, 0xf8, 0xfa, 0xfe, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xfc, 0xff, 0xbf, 0x07, 0x07, 0x03, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0x7e, 0x7e, 0x3d, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd0, 0xe8, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x78, 0x34, 0x10, 0x3e,
+                                                0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0xa0, 0xa3, 0xa7, 0xaf, 0xef, 0x07, 0x03, 0x01, 0x00, 0x00, 0xa0, 0xc0, 0xe0, 0xec, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xc7, 0x83, 0xc1, 0xc1, 0xc0, 0xc0, 0xe1, 0xe3, 0xe7, 0xcf, 0xcf, 0x0f, 0x07, 0x0f, 0x0e, 0x09, 0x07, 0x04, 0x09, 0x0e, 0x01, 0x06, 0x03, 0x04, 0x05, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x26, 0x00, 0x00, 0x00, 0x10, 0x08, 0x30, 0xc8, 0xe8, 0xf0, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xe0, 0xc4, 0x32, 0x76, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x3e, 0xfe, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x38, 0xf0, 0xe0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x90, 0x89, 0x99, 0xfb, 0xfb, 0xbf, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xdd, 0xdd, 0xdc, 0xd8, 0xb8, 0x70, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf6, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfe, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x04, 0x0c, 0x3e, 0x3e, 0x5f, 0x3b, 0x3b, 0x7f, 0xff, 0xff, 0x7f, 0x1f, 0xbf, 0x0f, 0x07, 0x47, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xbe, 0xce, 0xc0, 0xa0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0,
+                                                0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0x60, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf0, 0xf0, 0xfc, 0xfc, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xfe, 0xfe, 0xfc, 0xfb, 0xff, 0x7c, 0x3e, 0x08, 0x01, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc2, 0xe0, 0xe3, 0xe3, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0x74, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xfe, 0xff, 0xff, 0x7f, 0xff, 0x3f, 0xff, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7a, 0x7e, 0x4d, 0x1d, 0x7f, 0x7f, 0xff, 0x7f,
+                                                0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x87, 0x8f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x80, 0x40, 0xd0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0x87, 0x83, 0xc0, 0xc1, 0xc0, 0xc1, 0xf3, 0xf3, 0xe7, 0xe7, 0xe7, 0x8f, 0x06, 0x0f, 0x04, 0x0e, 0x04, 0x04, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9f, 0xdf, 0xff, 0xf8, 0xf0, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xf0, 0xe8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfd, 0xfe, 0xff, 0xff, 0xf0, 0xc0, 0x00, 0x00, 0x62, 0xdc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80,
+                                                0x80, 0xc0, 0x80, 0x80, 0x80, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x3c, 0xfc, 0xf8, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x13, 0x9b, 0xfb, 0x7f, 0x1f, 0xbf, 0xff, 0xff, 0xff, 0xdd, 0xdd, 0xdd, 0xdd, 0xcc, 0xd8, 0xb8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0xff, 0xff, 0xfc, 0xfc, 0xfc, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x7d, 0x3f, 0xbf, 0xfe, 0xdd, 0xf6, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x03, 0x3c, 0x3f, 0x1f, 0x3b, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x0f, 0x0f, 0x3f, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xc6, 0xf4, 0xe2, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+                                                0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x40, 0x80, 0xe0, 0xf0, 0xf8, 0xfc, 0xf8, 0xfc, 0xfc, 0xf8, 0xf4, 0xfc, 0xfc, 0xfa, 0xf8, 0xfc, 0xfd, 0xf9, 0xff, 0x3b, 0x5d, 0x01, 0x01, 0x01, 0x02, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0xe1, 0xe0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfc, 0x16, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xc0, 0xe0, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0x3f, 0x7f, 0x3f, 0x7f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7c, 0x25, 0x7c, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f,
+                                                0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x8f, 0x1f, 0x1f, 0x0f, 0x07, 0x07, 0x01, 0x00, 0x00, 0x40, 0xe0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd7, 0xc7, 0xc1, 0xe0, 0xc1, 0xe1, 0xf1, 0xf3, 0xf3, 0xf3, 0xe7, 0xe7, 0x87, 0x07, 0x06, 0x06, 0x06, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfd, 0xfc, 0xfc, 0xff, 0xfe, 0xf0, 0xc0, 0x00, 0x00, 0x40, 0x7e, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xc0, 0xf0,
+                                                0xc0, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xf0, 0xf0, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x09, 0x5d, 0x3f, 0x0f, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xf7, 0xf7, 0xf7, 0xf6, 0xee, 0xfe, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x3f, 0xff, 0xfc, 0xf8, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0xf8, 0xfc, 0xfc, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2d, 0x1d, 0x10, 0x76, 0x31, 0xb9, 0xff, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
+                                                0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x07, 0x06, 0x07, 0x1f, 0xff, 0xff, 0x7f, 0xff, 0x3f, 0x2f, 0x03, 0x9f, 0x35, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0xe0, 0xf0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xdd, 0xff, 0xf9, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8,
+                                                0xf8, 0xf8, 0xf8, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xa8, 0x00, 0xe0, 0xb0, 0xe0, 0xfc, 0xf8, 0xfc, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xb0, 0xcf, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x37, 0x3f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x70, 0xf8, 0xf8, 0xfd, 0xff, 0xff, 0x7f, 0x3f, 0x10, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfa, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xdf, 0xff, 0xdf, 0xdf, 0xdf, 0x9f, 0xbf, 0xdf, 0x9f, 0x3f, 0x5f, 0x3f, 0x5f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x12, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f,
+                                                0x7f, 0x7f, 0x3f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x07, 0x8f, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xfc, 0xfd, 0xf9, 0xf1, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xc0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xfc, 0xf0, 0xc0, 0x80, 0x00, 0x85, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x48, 0xcc, 0xce, 0xfe, 0xfe, 0xfe,
+                                                0xfe, 0xfe, 0xfe, 0xfe, 0x6c, 0xe8, 0xe8, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x3f, 0xfe, 0xfc, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x90, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xf8, 0xec, 0xf6, 0x73, 0xd0, 0xfc, 0xff, 0xdf, 0xdf, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xf7, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x01, 0x1f, 0x73, 0xfb, 0x7f, 0x2f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x3f, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xf8, 0xf0,
+                                                0xf0, 0xf8, 0xf8, 0xf8, 0x70, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x08, 0x08, 0x0f, 0x0f, 0x87, 0x87, 0x81, 0xc0, 0xea, 0xfb, 0xf0, 0xf4, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xfd, 0xff, 0xfe, 0xfe, 0xfd, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc,
+                                                0xfc, 0xf8, 0xfc, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xbc, 0x08, 0x80, 0xc0, 0xa0, 0xe8, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x53, 0x0b, 0x01, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0e, 0x3f, 0x7f, 0x7f, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x0f, 0x01, 0x80, 0xd0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xf7, 0xef, 0xff, 0xf7, 0xcf, 0xff, 0x6f, 0x1f, 0x8f, 0x7f, 0x5f, 0xbf, 0x3f, 0x1f, 0x3f, 0x3f, 0x1f, 0x1f, 0x3f, 0x1f, 0x3e, 0x1f, 0x1b, 0x3f, 0x3f, 0x3f, 0x3f, 0x7f, 0x3f,
+                                                0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0xe0, 0xf0, 0xf0, 0xfa, 0xf8, 0xe0, 0xc0, 0x00, 0x00, 0x30, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfd, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0x80, 0x80, 0xc0, 0x80, 0x80, 0x80, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x10, 0x11, 0x9b, 0xfb, 0x7f,
+                                                0x1f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0x9b, 0x9f, 0xbb, 0x98, 0xb8, 0xf0, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7b, 0xbf, 0xfd, 0xfd, 0xfd, 0xe8, 0xf6, 0xfe, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x0e, 0x3e, 0x1e, 0x1f, 0x1d, 0x7f, 0xff, 0xff, 0xff, 0xbf, 0xbf, 0x3f, 0x7f, 0xff, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xe0, 0xe0, 0xe0, 0xe0,
+                                                0xe0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x0f, 0x0f, 0x0f, 0x9f, 0x2f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0x80, 0xc2, 0xe7, 0xe3, 0xf3, 0xf1, 0xf4, 0xf0, 0xfc, 0xfe, 0xfc, 0xfc, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0xe0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x07, 0xf3, 0xc1, 0xf0, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0,
+                                                0xf0, 0xe0, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xd0, 0xe0, 0xf8, 0xf8, 0xfe, 0xfc, 0xfe, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0x7e, 0x1f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc7, 0xdf, 0xbf, 0xbf, 0xdf, 0x0f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0xd0, 0xf0, 0xf0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x07, 0x16, 0x0f, 0x1f, 0x3f, 0x1f, 0x6f, 0xff, 0xef, 0xef, 0xbf, 0xef, 0xff, 0x3f, 0x3f, 0xbf, 0x3f, 0x3f, 0xbf, 0x3f, 0xff, 0xbf, 0x7f, 0x3f, 0x1c, 0x00, 0x7a, 0x3e, 0x3f, 0x7e, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f,
+                                                0x7f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfe, 0xfa, 0xe8, 0xfa, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x86, 0x01, 0x01, 0x00, 0x00, 0x2a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x60, 0x70, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x70, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x42, 0x26, 0x36,
+                                                0x1f, 0x87, 0xc7, 0xff, 0xff, 0xef, 0xf7, 0xf3, 0xf3, 0xf3, 0xf3, 0xf3, 0xee, 0x8c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x5f, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x37, 0x9c, 0xdb, 0xdc, 0x7f, 0x7f, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x31, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x07, 0x43, 0x07, 0x4f, 0x7f, 0x7f, 0x3f, 0x7f, 0x0b, 0x03, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x37, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0xa0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe8, 0xe0, 0xf8, 0x8e, 0x0e, 0x0f, 0x0f, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0x80, 0xe0, 0xa0, 0xe0, 0xe0, 0xf0, 0xe7, 0xdf, 0xd7, 0xf7, 0xd7, 0x93, 0xe3, 0x83, 0xc0, 0xe0, 0xe0, 0xd8, 0xf0, 0xf8, 0xfe, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0b, 0x16, 0x1b, 0x3c, 0x3f, 0x7f, 0x5e, 0x7f, 0x3e, 0x3f, 0x3f, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x38, 0x5e, 0x6a, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x01, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0x7e, 0x7e, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf9, 0xfb, 0xfa, 0xf4, 0xf8, 0xec, 0xf8, 0xfc, 0xf8, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0b, 0x37, 0x06, 0x00, 0x01, 0x00, 0x0f, 0x0f, 0x3f, 0x7f, 0xff, 0x7f, 0xbf, 0x1f, 0x1f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x8f, 0x7f, 0xff, 0x0f, 0x1f, 0x2f, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x4c, 0x6e, 0x7e, 0x3e, 0x7f, 0xfe, 0xfe, 0xfe, 0x36, 0x32, 0x32, 0x30, 0x30, 0x30, 0xa0, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x80, 0x60, 0x40, 0x00, 0x20, 0x08, 0xdc, 0xfe, 0xee, 0xe5, 0xfc, 0xfd, 0xfe, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xd0, 0x06, 0x1e, 0x3e, 0x7c, 0x78, 0x60, 0xe0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x01, 0x09, 0x3f, 0x1d, 0x1d, 0x1d, 0x09, 0x05, 0x00, 0x07,
+                                                0x07, 0x07, 0x06, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x87, 0xdf, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xf4, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x70, 0xf0, 0xf0, 0xf6, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xb3, 0xe3, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xf8, 0xfc, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x40, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcf, 0xff, 0xff, 0xff, 0x1f, 0x0f, 0x03, 0x0f, 0x0f, 0x5f, 0x07, 0x07, 0x07, 0x0f, 0x1f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfa, 0xf8, 0xfa, 0xf0, 0xf1, 0xed, 0xfd, 0xff, 0xff, 0xfd, 0xff, 0xfd, 0xfd, 0xfd, 0xfe, 0xfa, 0xe0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0b, 0x3f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x3f, 0x1f, 0x1f, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x07, 0x03, 0x00, 0x1c, 0x3e, 0xfe, 0xfe, 0xfc, 0xf8, 0xfc, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xf0, 0xf3, 0xfb, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xe1, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xc7, 0x47, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x67, 0x7f, 0x3f, 0x3f, 0xff, 0x7f, 0xff, 0xbb, 0xbb, 0x1a, 0xba, 0x98, 0xb8, 0x30, 0xf0, 0xe0, 0x00, 0x00, 0xc0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x62, 0x50, 0x00, 0xcc, 0xfe, 0xff, 0xe7, 0xf6, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xfc, 0xe0, 0x00, 0x01, 0xf1, 0x07, 0x07, 0x0f, 0x1e, 0x1c, 0x78, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x39, 0x19, 0x08, 0x1c, 0x1f, 0x1f, 0x1e, 0x0e, 0x06, 0x00,
+                                                0x03, 0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x1f, 0x3f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x7f, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x3a, 0x3c, 0x70, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x0f, 0x0f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf0, 0xc0, 0x80, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0xd7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xfc, 0xfc, 0xf0, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xa0, 0x80, 0xc0, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xe0, 0xc0, 0xe0, 0xd0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x5f, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x3f, 0xff, 0xbf, 0x1f, 0x1f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xfa, 0xf9, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfd, 0xff, 0xfd, 0xfa, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x07, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x5f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x06, 0x03, 0x03, 0x38, 0x38, 0xfc, 0xff, 0xfd, 0xf0, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf1, 0xc7, 0xc3, 0xd7, 0x9f, 0xff, 0x7f, 0xff, 0xff, 0x4f, 0x87, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x8f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x26, 0x26, 0x67, 0x7f, 0x7f, 0x3f, 0x7f, 0xff, 0xff, 0xfb, 0xdb, 0x99, 0x98, 0x98, 0x98, 0xb0, 0xf0, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0xf6, 0x62, 0x38, 0x88, 0xce, 0xff, 0xff, 0xf7, 0xf7, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xfe, 0xfe, 0xe8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x09, 0x7e, 0x18, 0x18, 0x1d, 0x3f, 0x1f, 0x1e, 0x0f, 0x04,
+                                                0x03, 0x03, 0x07, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03,
+                                                0x03, 0x07, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0c, 0x3e, 0x3e, 0xfe, 0xff, 0xe0, 0x00, 0x38, 0x78, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1b, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0xbe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfe, 0xfc, 0xfe, 0xfc, 0xf8, 0xfc, 0xf8, 0xf4, 0xf4, 0xf8, 0xf8, 0xe4, 0xf0, 0xf8, 0xf0, 0xd0, 0xc0, 0xe0, 0xd0, 0xe0, 0xa0, 0xc0, 0xe0, 0xa0, 0xe0, 0xf0, 0xf0, 0xc0, 0xe0, 0xf4, 0xd0, 0xd0, 0xe0, 0xe0, 0xc0, 0x40, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0b, 0x03, 0x01, 0x70, 0xf8, 0xf4, 0xc2, 0xc2, 0xc0, 0xc0, 0xc0, 0xc0, 0xe1, 0xc3, 0xc7, 0x87, 0x0f, 0x1f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0x1f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x0f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x07, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xc9, 0x99, 0xf9, 0x3f, 0x1f, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xdd, 0xdd, 0xdd, 0x9c, 0x98, 0x18, 0xf0, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x3c, 0x7f, 0xff, 0xff, 0xf9, 0xfc, 0xe2, 0xff, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xe4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x03, 0x0e, 0x1e, 0x9f, 0x7e, 0x0e, 0x3f, 0x7f, 0xdf, 0xff, 0x3f, 0x5f,
+                                                0x1f, 0x1f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x83, 0xc0, 0xc0, 0xe3, 0xe3, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe8, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf0, 0xf0, 0x70, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x78, 0x7c, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x8f, 0x07, 0x01, 0x80, 0x00, 0x00, 0x80, 0xe0, 0xc0, 0xf0, 0xe8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x9f, 0x87, 0x07, 0x07, 0xc3, 0x01, 0x01, 0x00, 0xc0, 0x40, 0x80,
+                                                0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x8f, 0xbf, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x20, 0xa0, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xd0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xff, 0xfe, 0xff, 0xfc, 0xf0, 0x48, 0xc8, 0xb0, 0xf2, 0xec, 0xd0, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x0d, 0x03, 0x16, 0x0f, 0x6f, 0x5f, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xfa, 0xf8, 0xf8, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80,
+                                                0xe0, 0xf8, 0xfa, 0xfe, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x17, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xc1, 0xe1, 0xe3, 0xe7, 0xc7, 0x83, 0x07, 0x07, 0xbf, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf4, 0xbf, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfd, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf0, 0x40, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02, 0x00, 0x02, 0x03, 0x07, 0x01, 0x05, 0x00, 0x00, 0x00, 0x08, 0x0a, 0x02, 0x0b, 0x25, 0x1f, 0x3f, 0x1f, 0x3f, 0x3f, 0x3f, 0x1f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x1f, 0x0f, 0x00, 0x03, 0x03, 0x07, 0x1f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfb, 0xc7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xdd, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x80, 0xc0, 0x64, 0xe4, 0x0c, 0x07, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xef, 0xcc, 0xcc, 0xce, 0xcc, 0xc8, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x10, 0x3f, 0x2e, 0x3f, 0x7f, 0xee, 0xbd, 0xf1, 0x7f, 0x7f, 0xfb, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xf0, 0xe0, 0xe0, 0xe0, 0xf0, 0x30, 0x10, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0f, 0x9f, 0x8f, 0x06, 0x0f, 0x3f, 0xdf, 0xbf, 0x7f, 0x2f,
+                                                0x0f, 0x17, 0x9f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xe0, 0xf0, 0xf1, 0xf1, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0x6a, 0x50, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xc0, 0xe0, 0xe8, 0xfc,
+                                                0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x3e, 0xbe, 0x1c, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xf8, 0xf8, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x1f, 0x7f, 0xff, 0x3f, 0x1f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf0, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0x77, 0xff, 0xed, 0xfe, 0xfc, 0xfa, 0xfe, 0xfd, 0xff, 0xff,
+                                                0xfc, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xe0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x70, 0x78, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x01, 0x81, 0x60, 0x80, 0xa0, 0xa0, 0xf8, 0xf8, 0xf8, 0xfc, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xf0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x9f, 0x07, 0x83, 0x82, 0x01, 0x02, 0x82, 0x80, 0x89, 0x1d, 0x28, 0x19, 0x25, 0x33, 0x0f, 0x57, 0x0f, 0x2f, 0x1f, 0x1f, 0x1f, 0x3f, 0x7f, 0x7f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x8f, 0x13, 0x41,
+                                                0x00, 0x30, 0xd0, 0xfc, 0xf2, 0xfc, 0x73, 0xfe, 0xf7, 0xfb, 0xcc, 0xf8, 0xf8, 0xd3, 0x55, 0xff, 0xfb, 0xf7, 0x0b, 0x23, 0x01, 0x21, 0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x80, 0xd0, 0xd0, 0xe8, 0xd0, 0xf8, 0xf0, 0xe0, 0x40, 0x00, 0x00, 0xf2, 0xf0, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x80, 0x00, 0x9a, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x03, 0x01, 0x05, 0x03, 0x07, 0x0f, 0x0f, 0x03, 0x0f, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x00, 0x01, 0x01, 0x0f, 0x3f, 0x7f, 0xbf, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0x61, 0x01, 0x47, 0x79, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe2, 0xe0, 0xf1, 0xf3, 0x3b, 0x9f, 0x83, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xe6, 0xfe, 0xe6, 0xee, 0xc6, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0f, 0x7f, 0x5f, 0x9f, 0xdf, 0xff, 0xfe, 0x7d, 0x3f, 0xff, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0x70, 0x3c, 0x1e, 0x1e, 0x0e, 0x00, 0x02, 0x17, 0x47, 0x47, 0x8b, 0x07, 0x8f, 0xff, 0xff, 0x1f,
+                                                0x2f, 0x17, 0x47, 0x1f, 0x43, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcf, 0x83, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xa0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0x7f, 0x0f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xd0, 0xe0, 0xf8, 0xfa, 0xfe, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xaf, 0xef, 0xd6, 0xca, 0xe0, 0xc0, 0xc0, 0xc0, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf2, 0xe0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x05, 0x1f, 0x3f, 0x1b, 0x07, 0x0f, 0x0f, 0x03, 0x03, 0x01, 0x01, 0x80, 0xe0, 0xe0, 0xf0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0x7f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0x7c, 0xa8, 0x80, 0xe0, 0xe0, 0xe0, 0xe0, 0xe8, 0xf0, 0xe8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x3f, 0x9f, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x01, 0x01, 0x01, 0x11, 0x91, 0xb9, 0xfd, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x80, 0x40, 0xa0, 0xd0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc3, 0xc3, 0xc1, 0xc0, 0xc0, 0xe1, 0xe1, 0xe3, 0xe3, 0xe7, 0xcf, 0x8e, 0x1f, 0x3a, 0x1d, 0x15, 0x37, 0x2f, 0x07, 0x37, 0x0f, 0x07, 0x0f, 0x17, 0x07, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f,
+                                                0x7f, 0xff, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x38, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xfc, 0xf8, 0xfc, 0xf8, 0xf8, 0xc0, 0x00, 0x10, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x80, 0x00, 0x2d, 0x4c, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x03, 0x01, 0x03, 0x03, 0x03, 0x03, 0x07, 0x03, 0x07, 0x03,
+                                                0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x3f, 0x00, 0x00, 0x07, 0x0f, 0x0f, 0x3f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7c, 0x00, 0x80, 0xc5, 0xeb, 0xef, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xeb, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf8, 0xdc, 0x89, 0x01, 0xe1, 0xf8, 0xff, 0x7f, 0xff, 0xff, 0xf9, 0xfb, 0xff, 0xf7, 0xf7, 0xf7, 0xfe, 0xff, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xf0, 0xf0, 0xe0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0x7c,
+                                                0x1e, 0x14, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x21, 0xe3, 0xed, 0xde, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe1, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x2f, 0x3f, 0x1f,
+                                                0x0f, 0x0f, 0x07, 0x0b, 0x83, 0xc5, 0xc3, 0xc1, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xe0, 0xe4, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x1e, 0x0a, 0x00, 0x00, 0x00, 0xc0, 0x80, 0xe0, 0xe8, 0xe0,
+                                                0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0x7c, 0x78, 0x70, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x10, 0x7e, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x05, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x41, 0xc1, 0x80, 0xe0, 0xe0, 0xe0, 0xf0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf1, 0xe7, 0x07, 0x05, 0x07, 0x03, 0x03, 0x01, 0x01, 0x80, 0xc0, 0xf0, 0xe0, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xfb, 0xff, 0xfb, 0xfd, 0xff, 0xfc,
+                                                0xff, 0xff, 0xfc, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xdf, 0xff, 0xff, 0x8f, 0x00, 0x00, 0x00, 0x06, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xe0, 0xb0, 0xd0, 0xfc, 0xf8, 0xe0, 0xc0, 0x80, 0x80, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x40, 0xf0, 0xa8, 0xf8, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0x87, 0x83, 0x83, 0x81, 0x81, 0x85, 0x87, 0x85, 0x15, 0x2b, 0x2f, 0x51, 0x2b, 0x0f, 0x2f, 0x8f, 0x3f, 0x9f, 0xbf, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xbf, 0x8f, 0xeb, 0xe0, 0xf8, 0xf4, 0xf8, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x80, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0e, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xc0, 0x03, 0x07, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x01, 0x03, 0x03, 0x03, 0x01, 0x02, 0x0f, 0x07, 0x1f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x5f, 0x1f, 0x1f,
+                                                0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x03, 0x07, 0x03, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x3f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x3f, 0xbf, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xc8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0xfc, 0xfe, 0xef, 0xef, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x26, 0x80, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x79, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x0f, 0x00, 0x81, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f,
+                                                0x0f, 0x0f, 0x1f, 0x9f, 0xcf, 0xdf, 0xcf, 0xe7, 0xe3, 0xf1, 0xf8, 0xfc, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x7c, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e, 0x7f, 0x3e, 0x2e, 0x18, 0x3c,
+                                                0x3c, 0x3c, 0x38, 0x38, 0x38, 0x30, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xe0, 0xc1, 0xe1, 0xc1, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbc, 0xfe, 0xfd, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xfa, 0xff, 0x4f, 0x1f, 0xbf, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xed, 0xf1, 0xc1, 0xa1, 0x00, 0x03, 0x81, 0x81, 0x80, 0x40, 0x00, 0x80, 0xa0, 0xa0, 0xe0, 0xa0, 0xe0, 0xa0, 0xe8, 0xe0, 0xe0, 0xe4, 0x98, 0xec, 0xee, 0xfc, 0xfe, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x5f, 0x3f, 0x7f, 0x3f, 0x7f, 0x7f, 0xff, 0x7f, 0x3f, 0x7f, 0x7f, 0x0f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0xb6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa7, 0x57, 0x0f, 0x07, 0x01, 0x03, 0x01, 0x03, 0x07, 0x07, 0x07, 0x07, 0x0f, 0x07, 0x03, 0x03, 0x83, 0x23, 0x1f, 0x9f, 0x0f, 0x3f, 0x9f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf0, 0xf0, 0xc0, 0x80, 0x00, 0x01, 0x01, 0x07, 0x0f, 0x5f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x47, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x39, 0xc7, 0x5a, 0x94, 0xe0, 0xea, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x3f, 0x1f, 0x3f, 0x0f, 0x1c, 0x3c, 0x7c, 0x38, 0x60, 0x00, 0x01, 0x04, 0x38, 0xf5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xe2, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x09, 0x35, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xfc, 0xfe, 0xef, 0xef, 0xff, 0xff, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x77, 0xc2, 0xf3, 0xf6, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x17, 0x83, 0xe3, 0xff, 0xff, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x07, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0x9f, 0xdf, 0xdf, 0xdf, 0xff, 0xed, 0xf9, 0xfc, 0xfe, 0xff, 0xff, 0x7f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0xf8, 0xfc, 0xfc, 0xf8, 0xfc, 0xf8, 0xfc, 0xf8, 0xfc, 0xfc, 0xf0, 0xf8, 0xe0, 0xca, 0xbe, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xa0, 0xc8, 0x80, 0x88, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x78, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7e,
+                                                0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8, 0xfc, 0xe8, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5e, 0x3f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0x7f, 0x1d, 0x5f, 0x63, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xf8, 0xfa, 0xc8, 0x74, 0x00, 0x14, 0x01, 0x03, 0x01, 0x03, 0x03, 0x01, 0x03, 0x01, 0x01, 0x81, 0x81, 0xc1, 0xc0, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf0, 0xe0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x0f, 0x0f, 0x1f, 0x17, 0x1f, 0x1f, 0x3f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x07, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x90, 0x20, 0x60, 0x40, 0x40, 0x00, 0x30, 0x40, 0x03, 0x43, 0x43, 0x03, 0x47, 0x83, 0xc3, 0xff, 0xff, 0x1f, 0x0f, 0x9f, 0x07, 0x8f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xff, 0xfe, 0xf8, 0xe0, 0x80, 0x00, 0x03, 0x03, 0x07, 0x07, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf6, 0xed, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0x7e, 0x4e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x7f, 0x5f, 0xff, 0xbf, 0x7e, 0x18, 0xe0, 0x56, 0xbc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xe7, 0xf2, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xde, 0xdf, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xca, 0xe0, 0xfb, 0xf2, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0b, 0x97, 0xf1, 0xff, 0xff, 0xff, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x3f, 0x7f, 0x3f, 0x7f, 0x3f, 0x3f, 0xbf, 0xdf, 0xdf, 0xff, 0xdd, 0xe9, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x9f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe1, 0xc3, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xf2, 0xc7, 0xc6, 0xce, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0xac, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xd0, 0xe0, 0xc0, 0x7c, 0xf8, 0xe0, 0xe0, 0xe0, 0xc0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0xff, 0xff, 0x7f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xdf, 0xef, 0xcf, 0xcf, 0xef, 0xef, 0xe3, 0xf3, 0xe3, 0xe7, 0xe7, 0xc3, 0xc3, 0xc3, 0xff, 0xff, 0xff, 0xbf, 0xef, 0xcf, 0xc3, 0xc1, 0x03,
+                                                0x80, 0x00, 0x00, 0x40, 0xc0, 0xc0, 0x80, 0x80, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x00, 0x0d, 0x09, 0x00, 0x06, 0x00, 0x00, 0x80, 0x80, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x01, 0x07, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfa, 0xfe, 0xfc, 0xf8, 0xd0, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xe0, 0x80, 0x01, 0x03, 0x07, 0x07, 0x1f, 0x5f, 0x7f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc7, 0xe3, 0xc3, 0x03, 0x03, 0x03, 0x03, 0x07, 0x07, 0x0f, 0x1f, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xf0, 0xc0, 0x83, 0x17, 0xff, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1f, 0x7f, 0x3f, 0x1f, 0x7f, 0x3f, 0x3f, 0x1f, 0x3f, 0xbf, 0x3f, 0xea, 0xf4, 0xf8, 0xf0, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfa, 0xec, 0xfe, 0xfe, 0xdf, 0xf8, 0xc0, 0xf0, 0xf0, 0xd0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xf4, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xee, 0xef, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xf9, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0xe3, 0xf9, 0xfa, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x8f, 0xe7, 0xff, 0xff, 0xff, 0xff, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xc0, 0xe0, 0xc0, 0xe0, 0xe0, 0xc0, 0xe0, 0xc0, 0x80, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xe5, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x05, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc4, 0xee, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf0, 0xe1, 0xe3, 0xc7, 0x87, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xda, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xd8, 0xe0, 0x20, 0xe8, 0xf0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0x7f, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x9f, 0xdf, 0xf7, 0x17, 0xb7, 0xdf, 0xc7, 0x27, 0x87, 0x03, 0x13, 0x83, 0xe7, 0xf7, 0xff, 0xff, 0xff,
+                                                0xff, 0xb7, 0x47, 0x06, 0x00, 0x00, 0xa0, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x7f, 0x7f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x0f, 0x07, 0x03, 0x03, 0x03, 0x81, 0x81, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x07, 0x07, 0x03, 0x07, 0x07, 0x07, 0x06, 0x82, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xf2, 0xff, 0xff, 0xfe, 0xff, 0xfd, 0xfc, 0xfc, 0xfc, 0xec, 0xf0, 0xd0, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xe0, 0x80, 0x01, 0x07, 0x07, 0x07, 0x07, 0x1f, 0x5f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0x5f, 0x1f, 0x0e, 0x0e, 0x0e, 0x1e, 0x1c, 0x1c, 0x7c, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xef, 0x07, 0x03, 0x01, 0xef, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x0f, 0x1f, 0x0f, 0x1f, 0x3f, 0x9f, 0x5f, 0xaf, 0x9f, 0x3f, 0xde, 0xf0, 0xf0, 0xe0, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf8, 0xf0, 0xe0, 0x80, 0x80, 0xb0, 0x18, 0x80, 0x80, 0x00, 0x01, 0x01, 0x03, 0x03, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xe7, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0xf6, 0xf7, 0xff, 0xff, 0xff, 0xfc, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xe1, 0xf9, 0xf1, 0xf0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x9f, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfe, 0xff, 0xff, 0xff, 0xf6, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
+                                                0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x17, 0x3f, 0x1f, 0x3f, 0x3f, 0x3f, 0xbf, 0xff, 0xff, 0xdf, 0xdf, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6f, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf9, 0xf1, 0xc1, 0x81, 0x03, 0x03, 0x03, 0x03, 0x07, 0x06, 0x0c, 0x18, 0x00, 0x80, 0x70, 0xe0, 0xf8, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xcc, 0xf9, 0xbb, 0xff, 0xc3, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0xd0, 0xfc,
+                                                0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xf4, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xfe, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0xe0, 0xe0, 0xf0, 0xfa, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x4f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xbf, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xcf, 0xcf, 0xdf, 0xaf,
+                                                0x1f, 0x5f, 0x1f, 0x3f, 0x7f, 0xfe, 0x7e, 0x7c, 0x18, 0x18, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0xdf, 0xef, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x05, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xf8, 0x7c, 0xf0, 0xf0, 0xf1, 0xe1, 0xfb, 0xff, 0xfe, 0xdf, 0xfc, 0xfc, 0xfc, 0xf8,
+                                                0xf8, 0xf8, 0xf8, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x3f, 0x7f, 0x7f, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x08, 0x68, 0xf8, 0xf0, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x0f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xe0, 0xe3, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xbf, 0xff, 0x1f, 0x3f, 0x1f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0b, 0x0f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xf4, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd4, 0xe8, 0xe2, 0xe0, 0xd0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x5f, 0xd7, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0,
+                                                0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x0f, 0x3f, 0x3f, 0x1f, 0x3f, 0x9f, 0x9f, 0xdf, 0xdf, 0xdf, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0x9e, 0xf9, 0xef, 0xb3, 0x87, 0x83, 0x80,
+                                                0x00, 0x00, 0x00, 0x80, 0xf0, 0xfa, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfb, 0xfd, 0xf4, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x3f, 0x3f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x3f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf,
+                                                0xff, 0xff, 0x9f, 0xbf, 0x7f, 0xbf, 0x3f, 0x7f, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x04, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc, 0xf1, 0xf1, 0xd1, 0xc1, 0xe2, 0x88, 0x40, 0x18, 0x6c,
+                                                0x50, 0xd0, 0x90, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf8, 0xf8, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x07, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x5f, 0x3f, 0x3f, 0x3d, 0x7b, 0xfa, 0xfc, 0xee, 0xf8, 0xfb, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x3f, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x70, 0xf1, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x7f, 0x3f, 0x1f, 0x0f, 0x0f, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x05, 0x01, 0x03, 0x0f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc4, 0xf6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xdf, 0xd4, 0xc0, 0xc8, 0xc2, 0xc8, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0xaf, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x0f, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80,
+                                                0x80, 0x80, 0xc0, 0x80, 0xc0, 0x80, 0x80, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xe0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x1f, 0x3f, 0x1f, 0x3f, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xbf, 0xff, 0xf7, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0x2f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xfc, 0xf8, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xec, 0xe4, 0xe5, 0x83, 0xa7,
+                                                0x87, 0x07, 0x83, 0x00, 0x00, 0x00, 0x40, 0xe8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xd7, 0xf6, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfd, 0xfd, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x3f, 0xbf, 0xbf, 0xff, 0xff,
+                                                0xff, 0xbf, 0xbf, 0x7f, 0xbf, 0x3f, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xf8, 0xf8, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x0e, 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf2, 0xfe, 0xf8, 0xf8, 0xfc, 0xf0, 0xf1, 0xf3, 0xe3, 0x81, 0x80, 0x81,
+                                                0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x05, 0x07, 0x0f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3e, 0x1e, 0x3c, 0x78, 0x7a, 0xf0, 0x50, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x07,
+                                                0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x8f, 0x77, 0x8f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x60, 0xc0, 0xf0, 0xe0, 0xf1, 0xf9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x1f, 0x0f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x0f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0xf6, 0xf7, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0e, 0x18, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfa, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x5f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x80, 0x80, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0x07, 0x0f, 0x37, 0x1f, 0x7f, 0x1f, 0xbf, 0xff, 0xbf, 0xfd, 0xdd, 0xe3, 0xf8, 0xfc, 0xfd, 0xfe, 0x7f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe8, 0xf4, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xef, 0xf7, 0xe2,
+                                                0xe5, 0x81, 0x8b, 0x87, 0x87, 0x07, 0x07, 0x07, 0x01, 0x00, 0x80, 0xa0, 0xf0, 0xfe, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x3f, 0x8f, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x7f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfa, 0xfe, 0xfe, 0xfa, 0xf5, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x3f,
+                                                0x3f, 0x3f, 0x7f, 0xff, 0x3f, 0xbf, 0x3f, 0xff, 0x3f, 0x06, 0x1b, 0x3e, 0x78, 0x7e, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x7c, 0x7e, 0xfe, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfd, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x10, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfa, 0xfa, 0xfe, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0,
+                                                0xc0, 0x81, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x07, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xd0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x0f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x05, 0x07, 0x07, 0x0f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3e, 0x1c, 0x1c, 0x18, 0x38, 0x78, 0xf8, 0x40, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0xef, 0xff, 0xbf, 0xbf, 0x1f, 0x9f, 0x3f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xc0, 0xb0, 0xd8, 0xf8, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x0f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x90, 0xe0, 0xc0, 0xa0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfe, 0xff, 0xf6, 0xe7, 0xff, 0xff, 0xfe, 0xfc, 0xfc, 0xf8, 0xfd, 0xfd, 0xfd, 0xf5, 0x4f, 0x0f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x08, 0xed, 0xfb, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xf3, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x0f, 0x01, 0x00, 0x00, 0x30, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0xf8, 0xf0, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xc0, 0x88, 0xb8, 0xb0, 0x70, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xf0, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x07, 0x03, 0x07, 0x01, 0x03, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf4, 0xfc, 0xf8, 0xf1, 0xf1, 0xf0, 0xf0, 0xc1, 0xc1, 0xc1, 0x00, 0x41, 0x00, 0x80, 0x40, 0xe0, 0xf8, 0xf8, 0xfd, 0xff, 0xff, 0xfe, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfe, 0x3e, 0x1e, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xc0, 0xd0, 0xe8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0x03, 0x83, 0x5b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xfe, 0xff, 0xf9, 0xff, 0xf7, 0xff, 0xff, 0xcf, 0x8f, 0x8f, 0xcf, 0x9f, 0x9f, 0x8f, 0x9f, 0x8f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf4, 0xfd, 0xfd, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x03, 0x1f, 0x1f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xfe, 0xfc, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0xf0, 0xf8, 0xfc, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xc0, 0x40, 0xc0, 0x80, 0xc0, 0xc0, 0xc9, 0x5f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x07, 0x03, 0x7b, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x10, 0x00, 0x10, 0x64, 0xd8, 0x14, 0x48, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x3f, 0xbf, 0x1f, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xa0, 0xf4, 0xfb, 0xff, 0xff, 0xfd, 0x7f, 0xde, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x7f, 0x7f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x83, 0x83, 0xe1, 0xe1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x02, 0x18, 0xe4, 0xf6, 0xff, 0xff, 0xf7, 0xfe, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0x47, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xf0, 0x9b, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf3, 0xff, 0x7f, 0x3f, 0x3f, 0x7f, 0x3f, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xc0, 0xf8, 0xec, 0xf8, 0xfc, 0xfc, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfc, 0xfe, 0x7c, 0xf8, 0xf4, 0xf0, 0xdc, 0x76, 0x1c, 0x9c, 0x7c, 0x7c, 0x38, 0x78, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf8, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0xbf, 0xbf, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfb, 0xfc, 0xfd, 0xf8, 0xe8, 0xe0, 0xd0, 0x80, 0xc0, 0x40, 0xf8, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0x7f, 0x5f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xe8, 0xf8, 0xfe, 0xfc, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x00, 0x00, 0x78, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xe3, 0xe7, 0xe7, 0xef, 0xf7, 0xe7, 0xf7, 0xe7, 0xf1, 0xc1, 0xe0, 0xc0, 0xc0, 0xc0, 0x80, 0xc0, 0xc0, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x0f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0x3e, 0x1c, 0x9c, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xc0, 0xf0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x10, 0xe8, 0xb4, 0xfc, 0xd8, 0xf8, 0xe0, 0xf0, 0xf9, 0xf3, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x3f, 0x9f, 0x0f, 0x03, 0x01, 0x1c, 0x07, 0x05, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0xfc, 0x5e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x1e, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xfa, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x4f, 0xbf, 0x47, 0x07, 0x83, 0x03, 0xc5, 0xe1, 0xf1, 0xf0, 0xf8, 0xf8, 0xfe, 0xe3, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0xfe, 0xfe, 0xbf, 0xf8, 0xfc, 0xf2, 0xff, 0xff, 0xf7, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x7a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0xf8, 0xfb, 0xdf, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xf7, 0x7b, 0x3f, 0x1f, 0x07, 0x2f, 0x1f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc, 0xfd, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xde, 0xcd, 0xc7, 0xb8, 0x80, 0x00, 0x00, 0x03, 0x0e, 0x14, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0xc0, 0xc0, 0x00, 0x01, 0x03, 0x01, 0x02, 0x03, 0x03, 0x03, 0x83, 0x81, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0xf0, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x07, 0x07, 0x57, 0xd7,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xfe, 0xf0, 0xf8, 0xf0, 0xe0, 0xe0, 0xc0, 0xbe, 0x7d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x1f, 0x07, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x95, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xf8, 0xf1, 0xf1, 0xf3, 0xff, 0xf3, 0xf1, 0xf9, 0xf8, 0xf0, 0xf8, 0xf0, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0x90, 0xe0, 0xf8, 0xf8, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x61, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x60, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x17, 0x0f, 0x0f, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x90, 0xf4, 0xfd, 0xf6, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0xaf, 0x8f, 0x8f, 0xcf, 0x03, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x90, 0xd0, 0xcc, 0xf8, 0xe5, 0x1a, 0x7f, 0x57, 0x5f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xec, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xed, 0xf8, 0xe0, 0xf8, 0xfa, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xfc, 0xfc, 0xf8, 0xfc, 0x78, 0x3c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xfa, 0xe8, 0xdd, 0xff, 0xff, 0xde, 0xee, 0xff, 0xff, 0xff, 0xfe, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0f, 0x1f, 0x03, 0x2f, 0x3b, 0xe3, 0xe7, 0xcf, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0xef, 0x05, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xe0, 0xb8, 0xf0, 0xe0, 0xf8, 0xf0, 0xfc, 0x78, 0x3c, 0x24, 0x20, 0xe0, 0x64, 0xa0, 0xc0, 0xc0, 0x40, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0x00, 0x00, 0x03, 0x07, 0x03, 0x0f, 0x02, 0x00, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0x80, 0xe0, 0xf0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfc, 0xfe, 0xfc, 0xfe, 0xff, 0x7f, 0x0f, 0x03, 0x00, 0x00, 0xd0, 0xc0, 0xfc,
+                                                0xe9, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xfd, 0xfe, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xe0, 0xf0, 0xc0, 0xc0, 0x00, 0x00, 0x1c, 0x3f, 0x3f, 0x1a, 0x1a, 0x1c, 0x1e, 0x0e, 0x0f, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa8, 0xfc, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x1f, 0x1f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x06, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0x73, 0xfa, 0xf0, 0xf0, 0xe8, 0xf0, 0xf8, 0xe8, 0xf2, 0xec, 0xf0, 0xf4, 0xfa, 0xf8, 0xf0, 0xf8, 0xf0, 0xf8, 0xf8, 0xfc, 0xf0, 0xf8, 0xf0, 0xf8, 0x1c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0xf8, 0xfc, 0xf0, 0xff, 0xfe, 0xfa, 0xfe, 0x7c, 0x06, 0x07, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x1f, 0x3f, 0x1f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0x7f, 0xbf, 0x7f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xf8, 0xf0, 0x42, 0x1a, 0x7f, 0x7f, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x30, 0xc0, 0xe4, 0xe6, 0xf1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xdf, 0xff, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x3f, 0xbf, 0x4f, 0x07, 0x07, 0x03, 0x07, 0x03, 0x02, 0x00, 0x80, 0x40, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x30, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x16, 0x1b, 0x61, 0x00, 0xbc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x02, 0x16, 0x04, 0x2f, 0x60, 0xb5, 0x72, 0xfe, 0xf5, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0x2b, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb1, 0xff, 0xfd, 0xfe, 0xfe, 0xff, 0xff, 0xcc, 0x60, 0x92, 0xb0, 0xfc, 0xfd, 0x10, 0x48, 0xfd, 0x7f, 0xfc, 0xf0, 0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x0f, 0x27, 0x11, 0x7f, 0x25, 0xe7, 0xd7, 0x8f, 0xdf, 0x7f, 0x7f, 0x7f, 0x1f, 0x0a, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x08, 0x60, 0x30, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x0f, 0x00, 0x00, 0x0e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xd0, 0x50, 0xb8, 0xe0, 0xb0, 0xe8, 0xd8, 0x80, 0xe1, 0x2b, 0x01, 0x01, 0x00, 0x00, 0x00, 0x80, 0xa0, 0x9a,
+                                                0xf1, 0xff, 0xf4, 0xfb, 0xe9, 0xfa, 0xfc, 0xf4, 0xd8, 0xf0, 0xd0, 0xc0, 0xa0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x32, 0x10, 0x10, 0x10, 0x08, 0x04, 0x00, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0xfe, 0xfe, 0xfe, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xfe, 0x7f, 0x3f, 0x5f, 0x1e, 0x3f, 0x1f, 0x0e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x7c, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfa, 0x7a, 0x0a,
+                                                0x00, 0x00, 0x00, 0x80, 0x00, 0x40, 0x80, 0xc0, 0x80, 0x00, 0xc0, 0xf0, 0xf0, 0xd0, 0xf0, 0xe0, 0xd0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0xe0, 0xfc, 0xfe, 0xff, 0xff, 0x7f, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xd4, 0xf0, 0xed, 0x64, 0xbe, 0xa0, 0x00, 0x07, 0x3f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x17, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x0f, 0xc0, 0xe8, 0xf5, 0xf5, 0xfe, 0xfd, 0xfd, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x7f, 0x2f,
+                                                0x2f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41, 0x00, 0x15, 0x1f, 0x5f, 0x1f, 0x1f, 0x03, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0xe0, 0xad, 0xf7, 0xef, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0xbf, 0x1f, 0x8f, 0x81, 0x50, 0x90, 0x7d, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x9f, 0x7f, 0x1f, 0x1f, 0x3f, 0x1f, 0x07, 0x03, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0xe0, 0xe0, 0xe0, 0xe0, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xe0, 0xf0, 0xf8, 0xf0, 0xfa, 0xfc, 0xfc, 0x7e, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x90, 0x65, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0x3b, 0x81, 0xc5, 0xb9, 0x94, 0xec, 0xc7, 0xdf, 0xcf, 0xdf, 0x9f, 0x3e, 0x3c, 0x7b, 0xbd, 0x79, 0xbd, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x24, 0x0a, 0x28, 0x36, 0xb7, 0xff, 0x3f, 0x3f, 0x17, 0x15, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xf0, 0xfe, 0xf2, 0xfe, 0xfe, 0xfe, 0xcc, 0x60, 0x00, 0xb0, 0xf8, 0x7a, 0x30, 0x10, 0xcc, 0xf4, 0xf8, 0xf4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x0b, 0x03, 0x13, 0x05, 0xe7, 0x45, 0xd6, 0x9f, 0xfa, 0xff, 0x7f, 0x7f, 0x19, 0x10, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x80, 0xe0, 0x00, 0xe0, 0xc0, 0xc0, 0x80, 0xe0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x07, 0x07, 0x0f, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xa0, 0x80, 0x00, 0x03, 0x03, 0x03, 0x03, 0x01, 0x01, 0x00, 0x80, 0x50, 0x30, 0x98,
+                                                0xe0, 0xb4, 0xf8, 0xf0, 0xb4, 0xf0, 0xd0, 0xf0, 0x80, 0xa0, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x30, 0x10, 0x00, 0x00, 0x10, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xf8, 0xf8, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xf8, 0xf8, 0xfc, 0xf0, 0xfa, 0xfe, 0xfc, 0xf8, 0xfa, 0xfe, 0x7d, 0x7e, 0x37, 0x5d, 0x2e, 0x37, 0x02, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x40, 0x3c, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfa, 0xec, 0xfd, 0xf6, 0xca, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0x80, 0x60, 0x80, 0xa0, 0xe0, 0xc0, 0xc0, 0xe0, 0x40, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe0, 0xe0, 0x90, 0xc8, 0xa4, 0x78, 0x00, 0x01, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0f, 0x17, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x0f, 0x80, 0x20, 0x68, 0xd0, 0xfe, 0xfa, 0xed, 0xfd, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x3f, 0x1f, 0x0f, 0x0f,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1e, 0x3e, 0x1f, 0x1f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x01, 0x02, 0x03, 0x2b, 0x3f, 0x1f, 0x19, 0x1c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x42, 0xab, 0xdf, 0xff, 0xff, 0xff, 0xfb, 0xef, 0x7f, 0x3f, 0x3f, 0x1f, 0x00, 0x00, 0x20, 0x24, 0x75, 0xff, 0xbf, 0xff, 0x3f, 0x3f, 0x1f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x07, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x40, 0x80, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xe8, 0xe8, 0xf8, 0xfc, 0xe0, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x18, 0xf2, 0x7c, 0xf8, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x5f, 0x43, 0x03, 0x81, 0x00, 0x82, 0x51, 0x05, 0x80, 0xdc, 0x11, 0x3a, 0x3c, 0x38, 0x38, 0x30, 0x70, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x04, 0x14, 0xb4, 0x3d, 0x07, 0x14, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xfa, 0xf8, 0xfc, 0xf2, 0xfe, 0x98, 0x4c, 0xa0, 0x20, 0xb0, 0xf0, 0x60, 0x20, 0x80, 0xb0, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0f, 0x03, 0x03, 0x02, 0xaf, 0xcd, 0xc6, 0xcd, 0xd6, 0x7f, 0x7f, 0x77, 0x57, 0x40, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x07, 0x0f, 0x01, 0x00, 0x04, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x01, 0x0d, 0x1f, 0x1e, 0x1d, 0x1c, 0x06, 0x06, 0x04, 0x00, 0x00, 0xc8, 0x40, 0xb0, 0xd0,
+                                                0x80, 0xe0, 0x60, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xf9, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x84, 0x44, 0xac, 0xb4, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xe0, 0x80, 0xc0, 0xc0, 0x90, 0x80, 0xe0, 0xe0, 0xd0, 0x68, 0xb2, 0xa2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x4c, 0xfc, 0xf9, 0xfd, 0xff, 0xfc, 0xff, 0xff, 0xfe, 0xfe, 0xff, 0xfe, 0xfa, 0xfe, 0xfc, 0xec, 0xf0, 0xe8, 0xa0, 0x80, 0xd0, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xfd, 0xfb, 0x3f, 0x00, 0x02, 0x01, 0x02, 0x02, 0x0b, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x80, 0x40, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x1f, 0x0f, 0x02, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x05, 0x2f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x0f, 0x02, 0x00, 0x40, 0x00, 0x90, 0xa0, 0xa0, 0xb0, 0xe8, 0xf0, 0xf8, 0xc2, 0xfe, 0xf8, 0xf8, 0xfe, 0x7e, 0x3e, 0x3d, 0x06, 0x08, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xff, 0x7f, 0x3f, 0x1f, 0x07, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x32, 0x9a, 0xae, 0x6a, 0x93, 0x55, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x2b, 0xcf, 0x6f, 0xef, 0xff, 0xc7, 0x8f, 0xff, 0xe7, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x05, 0x14, 0x87, 0xfe, 0xff, 0xbf, 0x3f, 0x3f, 0x3f, 0x7f, 0x3f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x01, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xb0, 0x40, 0x38, 0xa0, 0xe8, 0xfc, 0xfc, 0xff, 0x8f, 0x1f, 0x0f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xe1, 0xe0, 0xe0, 0xc0, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x4c, 0x12, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xd0, 0xf8, 0xf6, 0xf0, 0xf2, 0xcc, 0x80, 0x40, 0x10, 0x90, 0xb8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d, 0x02, 0x01, 0x00, 0x06, 0x23, 0xe6, 0xe2, 0xf7, 0xf7, 0x07, 0x17, 0x07, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x14, 0x30, 0x38, 0x60, 0x68, 0x70, 0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x99, 0x6a, 0xc0, 0x40, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x80, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x40, 0x00, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x84, 0xc5, 0xd9, 0xd4, 0xfe, 0xf9, 0xfe, 0xf3, 0xec, 0xf2, 0xf8, 0xf4, 0xf0, 0x40, 0x90, 0x90, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x01, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xd0, 0xf0, 0x80, 0x70, 0x20, 0x00, 0x20, 0x41, 0x2f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x04, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7c, 0x3f, 0x1f, 0x00, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x7d, 0x9d, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xa9, 0xfd, 0x3b, 0x04, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x40, 0x80, 0x40, 0x00, 0xd0, 0x50, 0x90, 0xd0, 0x40, 0x48, 0x20, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xfc, 0xfe, 0xff, 0x7f, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x14, 0x44, 0x28, 0x08, 0x10, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x01, 0x0f, 0x17, 0x1f, 0xef, 0x1f, 0x6f, 0x3f, 0x7f, 0x1f, 0x9f, 0x8f, 0xbf, 0xe7, 0x07, 0x00, 0x00, 0x00, 0x00, 0x60, 0x2e, 0xfb, 0x5a, 0xfd, 0x35, 0x61, 0x3e, 0x96, 0x29, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x3c, 0x3c, 0x3e, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x90, 0xb7, 0x25, 0x3f, 0x5e, 0x1d, 0x05, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xb8, 0x60, 0x78, 0x34, 0xf1, 0x88, 0x40, 0xb0, 0x00, 0x88, 0xd8, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x0b, 0x03, 0x01, 0x01, 0x02, 0x03, 0x31, 0x23, 0xfb, 0x73, 0x3b, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x50, 0xd0, 0x60, 0xc0, 0x40, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd4, 0xbc, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x30, 0xf4, 0x5d, 0xe8, 0xf2, 0xf4, 0xfa, 0xe2, 0xf8, 0xc0, 0xf4, 0xe0, 0xc0, 0xf0, 0x40, 0x00, 0x00, 0x40, 0x00, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xc0, 0xf0, 0x90, 0xa0, 0x20, 0x00, 0x10, 0x08, 0x47, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0xfa, 0x3b, 0x2d, 0x0a, 0x08, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x5b, 0xef, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfb, 0x75, 0x5c, 0xbc, 0x08, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x80, 0xa0, 0x00, 0xa0, 0x20, 0xa0, 0x40, 0xa8, 0xa0, 0xa0, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x80, 0xc0, 0xe0, 0xfc, 0xfe, 0xff, 0xff, 0x3f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x01, 0x0f, 0x1f, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x52, 0x04, 0x02, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x05, 0x0f, 0x03, 0x17, 0x1f, 0x7f, 0x9f, 0x3f, 0x3f, 0x1f, 0x9f, 0xbf, 0x8f, 0xb7, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xcc, 0x2a, 0xa4, 0x7a, 0x3e, 0x69, 0x3d, 0x02, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x3c, 0x3e, 0x3e, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x1f, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0xe0, 0x80, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0xe0, 0x3b, 0x2f, 0x3e, 0x1e, 0x0f, 0x01, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x9a, 0xef, 0x1c, 0xdf, 0x5f, 0x5e, 0x7b, 0x58, 0x52, 0x68, 0x60, 0x7b, 0x73, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x0b, 0x0f, 0x5f, 0x1f, 0x1f, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xfe, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0xe0, 0x10, 0x8a, 0xb0, 0x64, 0xd8, 0xd0, 0x28, 0xe2, 0x98, 0xe0, 0x88, 0x00, 0xc0, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xe8, 0xf0, 0xfc, 0xf0, 0xe8, 0xe4, 0x0a, 0x03, 0x07, 0x0f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xfc, 0xf0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x5e, 0xff, 0xfe, 0xfe, 0x7d, 0x0c, 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0x03, 0x5e, 0xd7, 0x2f, 0xfb, 0x5f, 0xfd, 0xff, 0xfd, 0xfe, 0xfb, 0xf5, 0xda, 0xe1, 0x49, 0xe8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x10, 0x80, 0x30, 0x00, 0xc0, 0x28, 0x20, 0x10, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xfc, 0xff, 0xff, 0xff, 0x3f,
+                                                0x0f, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xfc, 0xc0, 0x03, 0x07, 0x1f, 0x3f, 0x7f, 0x7c, 0x78, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x01, 0x00, 0xab, 0x23, 0xcf, 0x63, 0x1b, 0x31, 0x3a, 0x39, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x01, 0x04, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x8f, 0x87, 0x07, 0x81, 0x00, 0x40, 0x20, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x07,
+                                                0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x50, 0x78, 0xd8, 0xe8, 0xfc, 0xfc, 0xfb, 0x9c, 0xde, 0x0c, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x60, 0x81, 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x70, 0x30, 0x61, 0x61, 0x51, 0x03, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x20, 0x03, 0x0a, 0x13, 0x5c, 0x04, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xa8, 0xf1, 0x3c, 0x3a, 0x3e, 0x84, 0xf5, 0x71, 0xc4, 0xe0, 0x50, 0xf2, 0xb6, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x14, 0x34, 0x3e, 0x1e, 0x3e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x98, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1a, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x20, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0x70, 0x30, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x20, 0x48, 0xf0, 0xd8, 0xe0, 0xfa, 0xf8, 0xe0, 0xb8, 0x60, 0x70, 0xc0, 0x20, 0xc0, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xe0, 0xfc, 0xe8, 0xe8, 0xc8, 0xc8, 0x02, 0x0c, 0x0b, 0x0f, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x7f, 0xff, 0xf8, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0xfc, 0xff, 0xfe, 0xfc, 0x7c, 0x58, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x09, 0x7f, 0x95, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xec, 0xbe, 0xaf, 0xd4, 0xcc, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x00, 0xc0, 0x60, 0xa0, 0x20, 0x40, 0x08, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf0,
+                                                0xfc, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x03, 0x07, 0x1f, 0x3f, 0x7e, 0x7c, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x24, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x07, 0x06, 0x0b, 0x0b, 0x47, 0x9f, 0x4f, 0x5f, 0x07, 0x57, 0xff, 0xeb, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x09, 0x24, 0x0a, 0x19, 0x05, 0x10, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x1e, 0x1f, 0x1f, 0x9f, 0x1f, 0x0f, 0x07, 0x43, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x70, 0xd0, 0xf8, 0xf4, 0xf8, 0x78, 0xa8, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x90, 0x80, 0xc5, 0x35, 0x1b, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0x40, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x02, 0x08, 0x50, 0x20, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xea, 0xfb, 0x7f, 0x7f, 0x7f, 0x1f, 0x7f, 0x7f, 0x79, 0x38, 0x38, 0xb1, 0xbd, 0x3b, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x03, 0x00, 0x04, 0x03, 0x06, 0x0f, 0x1f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xfa, 0xf8, 0x78, 0x38, 0x38, 0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xa0, 0xa0, 0xc0, 0x24, 0xb8, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x80, 0xe0, 0xf0, 0xf8, 0xfc, 0xfb, 0xfb, 0xf7, 0x57, 0x23, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x05, 0x5b, 0x3c, 0x7d, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x04, 0x10, 0x05, 0x31, 0x84, 0x56, 0x00, 0x3d, 0xa8, 0xec, 0x75, 0xb8, 0xa0, 0x78, 0x48, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc8, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2f, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xf1, 0x87, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x01, 0x06, 0x02, 0x06, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03, 0x03, 0x03, 0x11, 0x31, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x30, 0x54, 0x70, 0xdc, 0xf8, 0xbf, 0x7f, 0xff, 0x9f, 0x5f, 0x1f, 0x1f, 0x0f, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xb0, 0xc4, 0xb8, 0xf0, 0x7c, 0xfe, 0xff, 0xce, 0xdf, 0xd3, 0xeb, 0x84, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x50, 0x60, 0x08, 0x00, 0x00, 0x00, 0x80, 0x00, 0x40, 0x00, 0x80, 0x80, 0xc0, 0xe1, 0x80, 0x46, 0x00, 0x88, 0x00, 0x04, 0x01, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x05, 0x0e, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x5e, 0xfa, 0xfe, 0xfc, 0xff, 0xfe, 0xff, 0xff, 0xf1, 0xfc, 0xe0, 0x62, 0xf3, 0x36, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0d, 0x01, 0x08, 0x00, 0x04, 0x1c, 0x28, 0x3e, 0x5c, 0x1e, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf3, 0xea, 0xfb, 0xee, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xa0, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe3, 0xf7, 0xdf, 0xef, 0xcf, 0x0f, 0x8f, 0x0f,
+                                                0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0x0f, 0x1f, 0x3f, 0x3f, 0x1f, 0x07, 0x05, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x0a, 0x18, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0x18, 0x24, 0x0a, 0x11, 0x54, 0x24, 0x80, 0x20, 0x00, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xf0, 0xfc, 0xff, 0xff, 0x7f, 0x1f, 0x0f, 0xa2, 0x01, 0x01, 0x10, 0x04, 0x20, 0x00, 0x03, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xf8, 0xc0, 0x07, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xe0, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x01, 0x04, 0x03, 0x00, 0x08, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x1f, 0x5f, 0x9e, 0x5f, 0x7f, 0x9f, 0x1d, 0x35, 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xc0, 0xe0, 0xd0, 0xec, 0x72, 0x24, 0xbe, 0xfd, 0xfe, 0xfe, 0xef, 0xfd, 0xcb, 0xc2, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xa0, 0x80, 0x40, 0xc0, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x92, 0xb8, 0xfb, 0xfa, 0x78, 0xfe, 0xdc, 0xe6, 0x62, 0xe8, 0x20, 0x84, 0xee, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x05, 0x00, 0x01, 0x01, 0x01, 0x09, 0x11, 0x11, 0x3d, 0x7d, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0xf0, 0xf0, 0xf8, 0xf8, 0xfc, 0xfc, 0xfc, 0xfe, 0xfe, 0xc0, 0xe0, 0xe0, 0xc0, 0xd2, 0xe1, 0xf4, 0xff, 0xfe, 0xff, 0xff, 0xfc, 0xff, 0xfe, 0xfc, 0xf8, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0xcf, 0xdf, 0xef, 0x9f, 0x9f, 0x9f, 0x1f, 0x1f, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0x2f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x7f, 0x5f, 0x7f, 0xff, 0x3f, 0xbf, 0xff, 0x3f, 0x1f, 0x0b, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x01, 0x02, 0x10, 0x04, 0x00, 0x00, 0x00, 0x40, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xf0, 0xff, 0xff, 0xff, 0x7f, 0x0f, 0x04, 0x02, 0x00, 0x01, 0x01, 0x00, 0x05, 0x2f, 0x7f, 0xff, 0xff, 0xfe, 0xf8, 0xc1, 0x07, 0x3f, 0xff, 0xff, 0xff, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x08, 0x00, 0x00, 0x10, 0x1c, 0x3e, 0x3f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1f, 0x1f, 0x1f, 0x3f, 0x1f, 0x1c, 0x01, 0x81, 0x27, 0x37, 0x5f, 0x15, 0x78, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0xc0, 0xc0, 0xf8, 0xe4, 0x70, 0x26, 0x28, 0x98, 0x3b, 0xec, 0xfa, 0xd6, 0xed, 0xc0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xea, 0xf0, 0xf8, 0xf8, 0xb8, 0x84, 0xc0, 0x00, 0x80, 0x88, 0x8c, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x06, 0x01, 0x03, 0x00, 0x03, 0x01, 0x31, 0x33, 0x38, 0x7d, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf8, 0xf8, 0xf8, 0x80, 0x00, 0x00, 0xc0, 0xc4, 0xc8, 0xe0, 0xfc, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf0, 0xf8, 0xd0, 0xc0, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x0e, 0x1e, 0x1f, 0x3e, 0x3e, 0x3c, 0x7c, 0x7e, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x7f, 0xdf, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3a, 0x39, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x28, 0x9c, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfc, 0xff, 0xf8, 0xf7, 0x14, 0x08, 0x00, 0x0c, 0x07, 0x07, 0x1f, 0x7f, 0xff, 0xff, 0xfe, 0xf0, 0xc3, 0x0f, 0x3f, 0xff, 0xff, 0xfe, 0xf0, 0xc0, 0x80, 0x01, 0x02, 0x03, 0x03, 0x07, 0x03, 0x07, 0x03, 0x03,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x05, 0x04, 0x04, 0x00, 0x00, 0x00, 0x70, 0xf8, 0xfc, 0xfe, 0x7f, 0x7f, 0x3f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x3f, 0x7f, 0x7f, 0x7e, 0x3c, 0x19, 0x07, 0x07, 0x07, 0x03, 0x03, 0x08, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0x70, 0x80, 0xf8, 0xf0, 0xe4, 0xf6, 0x88, 0x7a, 0x96, 0x70, 0xed, 0xdb, 0xf4, 0xd1, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0xa0, 0xc0, 0x40, 0x40, 0x00, 0x00, 0x90, 0x10, 0x90, 0x98, 0x90, 0x20, 0x00, 0x70, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x03, 0x0a, 0x07, 0x03, 0x04, 0x03, 0x46, 0x66, 0x77, 0x43, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x10, 0x7a, 0x2b, 0x10,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x80, 0x80, 0xc0, 0xc0, 0x20, 0x40, 0x08, 0x38, 0x30, 0x30, 0x38, 0x7c, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x20, 0x10, 0x04, 0x20, 0x0c, 0x08, 0x86, 0xe0, 0xf1, 0xf0, 0xf1, 0xf9, 0xf9, 0xf8, 0x80,
+                                                0x00, 0x00, 0x80, 0xf1, 0xfb, 0xfe, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0xe8, 0xf0, 0xf0, 0xe2, 0xe8, 0x88, 0xa0, 0x10, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x1e, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xfb, 0x62, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x9b, 0x13, 0x3b, 0x1f, 0x07, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+                                                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xec, 0xa8, 0xd0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x80, 0x80, 0xc0, 0xc0, 0x00, 0xa0, 0xf0, 0xd8, 0xe0, 0xe8, 0x68, 0x30, 0x9c, 0xc0, 0x00, 0x80, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x03, 0x05, 0x03, 0x0d, 0x26, 0x11, 0x48, 0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xfc, 0xfc, 0x1d, 0x00, 0x02, 0x00, 0x05, 0x0f, 0x7f, 0xff, 0xff, 0xf8, 0x80, 0x07, 0x3f, 0xff, 0xff, 0xfc, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x09, 0x07, 0x0f, 0x1f, 0x1f, 0x2f, 0x3f, 0x1f, 0x3f, 0x3f, 0x1f, 0x0f, 0x1f, 0x07, 0x00, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0x2a, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0x7f, 0x1f, 0x5f, 0x8f, 0xe3, 0xeb, 0xe8, 0xfe, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0xe0, 0xc0, 0xe0, 0xc0, 0xc2, 0xe2, 0xc0, 0x00, 0x00, 0x0e, 0x0f, 0x1f, 0x0f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x1f, 0x0e, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x80, 0x80, 0x00, 0x20, 0x30, 0xb0, 0xb0, 0xd0, 0x88, 0x10, 0xc8, 0xb8, 0xd8, 0x28, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x02, 0x0c, 0x00, 0x02, 0x0c, 0xc7, 0xa7, 0xc7, 0x43, 0x03, 0x13, 0x71, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0xc1, 0xe0, 0x22, 0x0f, 0xff, 0xff, 0x7f, 0x3a, 0x38, 0x00,
+                                                0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x80, 0xf0, 0xec, 0xf8, 0xf8, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0x70, 0xb0, 0x60, 0xa0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xf0, 0xf0, 0xf2, 0xf4, 0xf8, 0x7b, 0x7f, 0x7d, 0x3e, 0x3e, 0xbf, 0xff, 0xe7, 0xe0, 0xe0,
+                                                0xf0, 0xf0, 0xa1, 0x01, 0x01, 0x81, 0xe1, 0xe8, 0xe0, 0xf0, 0xe0, 0xe0, 0xc8, 0x82, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x40, 0xc2, 0x00, 0x00, 0x02, 0x00, 0x8c, 0xf1, 0xed, 0xe0, 0xf6, 0xd1, 0xec, 0x50, 0x64, 0x80, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x07, 0x0f, 0x3f, 0x1f, 0x3f, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xf7, 0xcd, 0xff, 0xff, 0xfe, 0xfa, 0xbf, 0x17, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+                                                0xfe, 0xfe, 0xfe, 0xfc, 0xf8, 0xf8, 0xf8, 0xf0, 0xf0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfc, 0xfc, 0xf8, 0xfc, 0xfe, 0xfe, 0xfc, 0xfc, 0xfe, 0xfe, 0x7e, 0x3e, 0x0b, 0xcc, 0xf2, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xf7, 0xf8, 0xf0, 0xe0, 0xe0, 0x80, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xfc, 0xfc, 0x38, 0x10, 0x00, 0x08, 0x00, 0x0f, 0x7f, 0xff, 0xff, 0xf1, 0x01, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x80, 0x00, 0x00, 0x01, 0x01, 0x07, 0x0f, 0x07, 0x0f, 0x0f, 0x3f, 0x3f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x3f, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0x07, 0x0d, 0x3f, 0x7f, 0x7f, 0x07, 0xff, 0xff, 0xff, 0xff, 0xfa, 0x0e, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x03, 0x07, 0x07, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x3f, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x1f, 0x1f, 0x1f, 0x0c, 0x01, 0x01, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x06, 0x07, 0x00, 0x00, 0x01, 0x60, 0x61, 0xf0, 0x78, 0xb4, 0x94, 0xf8, 0xf4, 0xf8, 0xfc, 0xfc, 0xfc, 0xf8, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x02, 0x04, 0x0e, 0x09, 0x10, 0x16, 0x0f, 0x4f, 0x8f, 0xc7, 0xaf, 0xf7, 0xf7, 0x71, 0x97, 0x19, 0x01, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x80, 0xc0, 0xf0, 0xf8, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x80, 0x80, 0xc0, 0x80, 0x80, 0xe0, 0xc0, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe0, 0xcb, 0xf7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7d, 0x34, 0x00, 0x01,
+                                                0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0x80, 0x80, 0xd0, 0xa4, 0xd0, 0xfc, 0xf8, 0xfe, 0xfc, 0xf8, 0xfc, 0xfc, 0xf0, 0xf8, 0xf8, 0xe4, 0xf8, 0xf8, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x40, 0x00, 0x00, 0xe0, 0xa0, 0x60, 0xc0, 0x43, 0x33, 0x93, 0x83, 0x87, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0xa0, 0xf0, 0xf8, 0xfc, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x0b,
+                                                0x03, 0xc7, 0xc7, 0xc7, 0xc7, 0xe7, 0xef, 0xef, 0xc7, 0x07, 0x07, 0x8f, 0xc7, 0xeb, 0xf7, 0xd7, 0xa4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfc, 0xf8, 0xf8, 0xf8, 0xfe, 0xfe, 0x7a, 0xb4, 0xf1, 0xe4, 0xfd, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xff, 0xf0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x12, 0x42, 0xbb, 0xaa, 0xfb, 0xff, 0xfd, 0xff, 0xff, 0x7f, 0xff, 0x7f, 0x3f, 0x3f, 0x0f, 0x0f, 0x0f, 0x0f, 0x1f, 0x1f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+                                                0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x3f, 0x3f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x1f, 0x08, 0x80, 0xc0, 0xc0, 0xe0, 0xf0, 0xf8, 0xf8, 0x7c, 0x3c, 0x1e, 0x10, 0x00, 0x1e, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0xff, 0x63, 0x03, 0x01, 0x07, 0x07, 0x07, 0x1f, 0x3f, 0x5f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xfe, 0xe8, 0xa0, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x03, 0x03, 0x01, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x1f, 0x7f, 0x3f, 0x03, 0x0f, 0x0f, 0x07, 0x0f, 0x0f, 0x07, 0x17, 0x33, 0x07, 0x60, 0x00, 0x0c, 0x0f, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x67, 0xe7, 0x07, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x1f, 0x1f, 0x1f, 0x0d, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0f, 0x07, 0x0f, 0x0f, 0x07, 0x0f, 0x05, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61, 0xf4, 0x20, 0x90, 0x98, 0x7c, 0x40, 0xd8, 0xb8, 0xfc, 0x7c, 0xbe, 0xff, 0xfc, 0xf0, 0xd0, 0xc0, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x05, 0x02, 0x07, 0x37, 0xf3, 0xf9, 0xf9, 0xfc, 0x98, 0x06, 0x13, 0x0f, 0x03, 0x1b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x05, 0x06, 0x00, 0x00, 0x00, 0x80,
+                                                0x80, 0x80, 0x80, 0xb0, 0xfc, 0xfe, 0xfd, 0xec, 0xd8, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x20, 0x20, 0x40, 0x00, 0x60, 0x40, 0x78, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x80, 0x80, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xe0, 0x50, 0xfc, 0xfe, 0xfe, 0xfc, 0xfc, 0xfe, 0xe6, 0xe2, 0xe2, 0xc0, 0x7f, 0x7f, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+                                                0xf0, 0xf8, 0xf8, 0xf8, 0xf0, 0x40, 0x40, 0xc0, 0x70, 0xc0, 0xf0, 0xd0, 0xe0, 0xc8, 0xf0, 0xe8, 0xf8, 0xf0, 0xfd, 0xf9, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xfe, 0x3e, 0x38, 0xe8, 0xf0, 0xfa, 0xf8, 0xfc, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x3f, 0x3f, 0x00, 0x1f, 0x3f, 0x3f, 0x3f, 0x07, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x81, 0xf3, 0xe3, 0x43, 0xa3, 0x8b, 0x23, 0xa3, 0x03, 0x41, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x81, 0x43, 0xe1, 0xc3, 0xd1, 0xf1, 0xf0, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f, 0xbf, 0x07,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x10, 0x08, 0x1a, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xe4, 0xf8, 0xe0, 0xe0, 0xc0, 0x90, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x84, 0xf8, 0xf8, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xff, 0xfe, 0xf8, 0xe0, 0x39, 0xc0, 0x5c, 0xbd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x7f, 0x5f, 0x7f, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x03,
+                                                0x03, 0x07, 0x07, 0x87, 0x07, 0x83, 0xc1, 0xc0, 0xe0, 0xe0, 0xf0, 0xf0, 0xe0, 0xa0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x5f, 0x7f, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xe3, 0x80, 0x07, 0xa3, 0x5f, 0x5f, 0x3f, 0xdf, 0xdf, 0x8f, 0xcf, 0x87, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, 0x06, 0x06, 0x06, 0x07, 0x0f, 0x0f, 0x1f, 0x3c, 0xbb, 0xff, 0xff, 0x0f, 0x1f, 0xff, 0xff, 0xc1, 0x81, 0x01, 0x00, 0x00,
+                                                0x00, 0x03, 0x03, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x01, 0x07, 0x07, 0x01, 0x07, 0x03, 0xa7, 0xbf, 0x7f, 0x7f, 0x7f, 0x7e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xba, 0xfe, 0xfd, 0xff, 0xff, 0xff, 0x7d, 0x7d, 0xdd, 0x1d, 0x26, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x3f, 0xf8, 0x80, 0x00, 0x03, 0x3f, 0x7f, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x70, 0x94, 0x80, 0x78, 0xf4, 0x74, 0x7c, 0xfe, 0xfc, 0xff, 0x7e, 0x7f, 0xfe, 0xf8, 0xf8, 0xc0, 0x00, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x03, 0x03, 0x1f, 0x77, 0xf1, 0xfd, 0xfc, 0xfc, 0xf5, 0x2d, 0x0d, 0x05, 0x05, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x00, 0x00, 0x81, 0xc3, 0xe3, 0x82, 0x00, 0xc0, 0xc0, 0xe0,
+                                                0xc0, 0xc0, 0xe0, 0xe0, 0xfe, 0xff, 0xff, 0xfc, 0x70, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x18, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xa0, 0xc0, 0xa0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xfc, 0xfc, 0xfc, 0x04, 0xff, 0xff, 0xff, 0xff, 0xda, 0xf7, 0xfd, 0xf0, 0xf8, 0xf0, 0x3f, 0x1f, 0x1f, 0xcf, 0x5f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0x7f, 0x7f, 0x7c, 0xfc, 0xf8, 0xf8, 0xf8, 0xfc, 0xfc,
+                                                0xfc, 0xfc, 0xfc, 0x78, 0x80, 0xd0, 0xe0, 0xd0, 0xe0, 0xd8, 0xe4, 0xf8, 0xf0, 0xf4, 0xc8, 0xf4, 0xf0, 0xd0, 0xfe, 0x5e, 0x1e, 0x0f, 0x1f, 0x1f, 0x0f, 0x1f, 0x2f, 0x9f, 0xbb, 0xf6, 0xfc, 0xfc, 0xf4, 0x5c, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x0f, 0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x01, 0x0f, 0x0f, 0x3f, 0xff, 0xff, 0xfe, 0xf0, 0xe0, 0x70, 0xd4, 0xec, 0xa0, 0xb8, 0xec, 0xa0, 0x90, 0x40, 0x80, 0xc0, 0x40, 0x84, 0xc0, 0xa8, 0xdf, 0xf0, 0xad, 0xff, 0xdd, 0xde, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xbf, 0x37, 0xcb, 0x10,
+                                                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0a, 0x03, 0x0e, 0x0b, 0x1f, 0x2f, 0x1e, 0x3f, 0x3f, 0x7f, 0x7c, 0xfe, 0xfc, 0xf8, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x1a, 0xf4, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfb, 0xef, 0xff, 0xfe, 0xff, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x3f, 0x3f, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x01, 0x00, 0x03, 0x01, 0x01, 0x03, 0x03, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x07, 0x2f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xee, 0x35, 0x3f, 0xbf, 0xbf, 0xff, 0xff, 0xf3, 0xff, 0xd3, 0x58, 0x50, 0x50, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0xc0, 0x70, 0x78, 0xf8, 0xf8, 0xee, 0xfe, 0xff, 0xbf, 0x5f, 0x7f, 0xfe, 0xff,
+                                                0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x18, 0x50, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x03, 0x65, 0x7b, 0x3f, 0x9f, 0x7f, 0x3f, 0xfe, 0xff, 0xff, 0xfb, 0xfe, 0xfa, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xdf, 0xbf, 0xb5, 0x84, 0x04, 0x11, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x3b, 0xf8, 0x80, 0x03, 0x0f, 0x7e, 0xfc, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x71, 0xb0, 0x90, 0x1c, 0x74, 0x6c, 0xfc, 0xfa, 0xfc, 0xbf, 0xff, 0x7e, 0xff, 0xfa, 0xf0, 0xf0, 0x80, 0x00, 0x01, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x05, 0x1f, 0x0f, 0x27, 0xf7, 0xf3, 0xf9, 0xfd, 0xf8, 0xf3, 0x1f, 0x09, 0x0b, 0x03, 0x02, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xc0, 0x00, 0xc0, 0x81, 0x21, 0x01, 0x01, 0xf1, 0xf8, 0xf8, 0xf8,
+                                                0xf8, 0xf0, 0xf0, 0xf0, 0xfe, 0xff, 0xff, 0xfe, 0x92, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0xc0, 0x80, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xfe, 0xfe, 0xfe, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xf6, 0xfe, 0xfe, 0xfc, 0xfe, 0xfd, 0x2f, 0x07, 0x27, 0x37, 0x2f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0xbf, 0x3f, 0x1f, 0x3e, 0x3e, 0x3e, 0x3f, 0x3f, 0x3f, 0x3f,
+                                                0x3f, 0x1f, 0x1f, 0x0f, 0x80, 0xd0, 0xd0, 0x28, 0xe8, 0xd0, 0xe0, 0xf0, 0xf8, 0xc8, 0xf8, 0xf0, 0x8c, 0xa0, 0x88, 0x00, 0x8f, 0x06, 0x07, 0x0f, 0x0f, 0x0f, 0x8f, 0xc7, 0xfe, 0xf8, 0xfc, 0x78, 0xd4, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x07, 0x00, 0x03, 0x07, 0x87, 0xc3, 0x01, 0x03, 0x8f, 0x9f, 0xbf, 0xff, 0xff, 0xfc, 0xfc, 0xf8, 0xde, 0xe8, 0xfc, 0xd0, 0xe4, 0x70, 0xd8, 0x68, 0x24, 0xd0, 0xa0, 0xa0, 0x80, 0xa0, 0xd0, 0xf0, 0xf0, 0xec, 0xfa, 0xf9, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6d, 0xbf, 0x42, 0x0c,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x0a, 0x0b, 0x05, 0x1f, 0x1f, 0x3f, 0x7f, 0xff, 0x7f, 0x7f, 0xfc, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x12, 0x68, 0x9c, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xff, 0xfb, 0xee, 0xfd, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x1f, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x01, 0x03, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x06, 0x07, 0x0f, 0x0f, 0x1f, 0xbf, 0xff, 0x3f, 0xff, 0xff, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5f, 0xff, 0x7f, 0xff, 0xff, 0x7f, 0x36, 0x9b, 0xdf, 0xdf, 0xff, 0xff, 0xff, 0x9b, 0xac, 0x30, 0x04, 0x00, 0xc8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xf0, 0xf0, 0xf0, 0xf0, 0xf8,
+                                                0xf0, 0xf8, 0xf0, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x1c, 0x2e, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x14, 0x4e, 0x8f, 0xbf, 0xc7, 0xdf, 0xef, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xa7, 0x87, 0x6b, 0x01, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x0c, 0x0c, 0x0c, 0x04, 0x07, 0x07, 0x07, 0x0f, 0x0b, 0x0f, 0x1f, 0xff, 0x81, 0x07, 0x07, 0x7f, 0xf8, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0xc3, 0xd1, 0x50, 0x30, 0x20, 0xfc, 0x38, 0xf8, 0xfc, 0xfe, 0xfe, 0xff, 0xff, 0xfe, 0xf8, 0xe0, 0xe0, 0x00, 0x00, 0x03, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x0c, 0x2f, 0x3c, 0x97, 0x8e, 0xcf, 0xe3, 0xf3, 0xf9, 0xff, 0x7f, 0x67, 0x3f, 0x03, 0x06, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x3f, 0xff, 0xff, 0xff, 0xfd,
+                                                0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xfe, 0xf3, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x90, 0xa0, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xfe, 0x80, 0xdf, 0xff, 0xff, 0xfe, 0x37, 0xfc, 0xfe, 0xfe, 0xfe, 0xfe, 0xff, 0x07, 0x27, 0x67, 0x77, 0x6f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, 0x3f, 0x1f, 0x3f, 0x1f, 0x1f, 0x3f, 0x1f, 0x3f, 0x3f,
+                                                0x1f, 0x1f, 0x0f, 0x07, 0x00, 0x80, 0x20, 0x00, 0x60, 0x80, 0x80, 0x80, 0x80, 0x60, 0x80, 0xc0, 0x00, 0xa0, 0x80, 0x00, 0x19, 0x1a, 0x1f, 0x3d, 0x1e, 0x1c, 0x1c, 0xf8, 0xc0, 0xf0, 0xc0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x07, 0x00, 0x07, 0x07, 0x07, 0x80, 0x03, 0x87, 0x1f, 0x7f, 0xff, 0xff, 0xfc, 0xf4, 0xe8, 0xe8, 0xf4, 0xf8, 0xe8, 0xfa, 0xe0, 0xb8, 0xe0, 0x44, 0x30, 0x90, 0x90, 0xc0, 0xe0, 0x90, 0x68, 0xec, 0x50, 0xe0, 0xd4, 0xb8, 0xe8, 0xf8, 0xa8, 0xea, 0xf9, 0xfc, 0xff, 0xfc, 0xec, 0xfe, 0xfd, 0xff, 0xfd, 0xff, 0x7e, 0xe3, 0x9c,
+                                                0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x04, 0x12, 0x3b, 0x5f, 0x33, 0xfd, 0xfb, 0xfe, 0xf8, 0xfa, 0xf8, 0xe0, 0xe0, 0xc0, 0x80, 0xc0, 0x80, 0x40, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x9a, 0xac, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xef, 0xff, 0xff, 0xef, 0xef, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0x7f, 0x1e, 0x03, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x0f,
+                                                0x1f, 0x1f, 0x0f, 0x1f, 0x3f, 0x1f, 0x1e, 0x3f, 0x1e, 0x38, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x01, 0x0f, 0x17, 0x1f, 0x3f, 0xbf, 0xff, 0x7f, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x7f, 0xfd, 0x71, 0x41, 0x09, 0x47, 0x1b, 0x37, 0x9f, 0xcf, 0x8f, 0x07, 0x0f, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x18, 0x30, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02, 0x01, 0x00, 0x03, 0x01, 0x00, 0x20, 0x8f, 0x8f, 0x57, 0x6f, 0xce, 0xf7, 0xe9, 0xea, 0x43, 0xfe, 0xf6, 0x45, 0xdb, 0xa7, 0xd7, 0xe7, 0xdf, 0x7b, 0x87, 0x84, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0x80, 0xe0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x81, 0xeb, 0xc1, 0x40, 0x18, 0x60, 0xdc, 0xf4, 0xf8, 0xfc, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xf8, 0xf0, 0xe8, 0x00, 0x01, 0x07, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x06, 0x0c, 0x6f, 0x6d, 0x1f, 0xdf, 0xcf, 0xe3, 0xfb, 0xf1, 0xff, 0x7b, 0xff, 0x3f, 0x0f, 0x28, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0xf0,
+                                                0xc0, 0x80, 0x80, 0xa0, 0x80, 0x70, 0xfd, 0xff, 0xfb, 0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x38, 0x30, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xe0, 0x40, 0xf8, 0xfc, 0xfc, 0xf0, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, 0xf1, 0xff, 0x7f, 0x3f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfd, 0xf8, 0xf8, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xfc,
+                                                0xfe, 0x7e, 0x7e, 0x3c, 0x40, 0x10, 0x00, 0xa0, 0x80, 0x20, 0x40, 0xc0, 0x80, 0x20, 0x80, 0x80, 0x00, 0xa0, 0x80, 0x42, 0x45, 0x7a, 0xe8, 0xfa, 0xfe, 0xf8, 0xe4, 0xf0, 0xc0, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x3f, 0x7f, 0x7f, 0x0f, 0x3f, 0x7f, 0x7f, 0x01, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf7, 0xeb, 0xff, 0xf3, 0xff, 0xef, 0xf7, 0xef, 0xf7, 0x9b, 0xe7, 0x98, 0xd1, 0xd0, 0xe8, 0xb4, 0xe9, 0xe6, 0xf8, 0xd6, 0xf8, 0xfa, 0xfa, 0xd9, 0xf1, 0xff, 0xf4, 0xf9, 0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x74,
+                                                0x5b, 0x22, 0x00, 0x00, 0x00, 0x00, 0x60, 0x13, 0xf9, 0xfd, 0xfe, 0xff, 0xee, 0xfc, 0xe6, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x40, 0x78, 0x94, 0xb4, 0x04, 0xf8, 0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6e, 0x1b, 0x15, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x03, 0x0f, 0x0f, 0x3f, 0x7f, 0x7f, 0xff, 0xfe,
+                                                0xfe, 0xfc, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0xe0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x03, 0x0c, 0x27, 0x1f, 0x2f, 0x1f, 0x5f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xe7, 0xd1, 0x0f, 0x9f, 0x2f, 0x1f, 0xbf, 0x3f, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x03, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x05, 0x07, 0x07, 0x0f, 0x1f, 0x0f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x07, 0x03, 0x07, 0x33, 0x07, 0x5f, 0x7f, 0x7e, 0xdf, 0xff, 0xfb, 0xff, 0x9d, 0xf7, 0xf4, 0xfe, 0xfc, 0x9f, 0xde, 0xff, 0xff, 0xfe, 0xbe, 0x1e, 0x44, 0x96, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0xe3, 0xc0, 0x28, 0x20, 0xf8, 0x4c, 0x74, 0x78, 0x7e, 0xfe, 0x7e, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xe0, 0x00, 0x01, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x00, 0x26, 0x36, 0x8f, 0xcf, 0xc3, 0xe3, 0xfb, 0xf9, 0xff, 0x9d, 0x0f, 0x7b, 0x0d, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc7, 0xeb, 0xff, 0xff, 0xcb, 0x82,
+                                                0x00, 0x00, 0x00, 0xa0, 0xc0, 0xc8, 0xff, 0xff, 0xff, 0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x40, 0x70, 0x30, 0x30, 0x30, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0xe0, 0xf0, 0xe0, 0xc0, 0xf0, 0xc0, 0xe0, 0xc0, 0xe1, 0xf7, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfd, 0xf4, 0xf4, 0xfc, 0xfe, 0xfc, 0xf8, 0xfc, 0xf8, 0xfc,
+                                                0xfc, 0xfc, 0x7c, 0x08, 0x00, 0x20, 0x00, 0x20, 0x00, 0xc0, 0x00, 0x40, 0x20, 0x80, 0xc0, 0x80, 0xc0, 0x40, 0x80, 0x41, 0x00, 0x68, 0xce, 0xd4, 0xf8, 0xf8, 0xf8, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x3f, 0xff, 0xff, 0xfb, 0x1f, 0xff, 0xff, 0xff, 0x13, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe4, 0xee, 0xee, 0xde, 0xef, 0xaf, 0xdf, 0xff, 0xff, 0xef, 0xe3, 0xdb, 0xf1, 0xd3, 0xb1, 0xe1, 0xd1, 0xed, 0xa1, 0xdb, 0xa5, 0xf3, 0xf4, 0xec, 0xc8, 0xf0, 0xf8, 0x5a, 0xf4, 0xfd, 0xf5, 0xfc, 0xff, 0xff, 0xfe, 0xff, 0xfd, 0xfd, 0xff, 0xfc, 0xf2,
+                                                0x5e, 0xc0, 0x10, 0x00, 0x00, 0x00, 0x01, 0x83, 0xa3, 0xf5, 0x7c, 0xf5, 0xfc, 0xe2, 0xf4, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0xe0, 0x98, 0x68, 0x50, 0x80, 0x71, 0xe7, 0xdf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x03, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x0f, 0x0f, 0x3f, 0x7f, 0xff, 0xfd, 0xfc, 0xfc,
+                                                0xf8, 0xe0, 0xd0, 0xc0, 0xc0, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x01, 0x01, 0x02, 0x01, 0x00, 0x0f, 0x05, 0x1f, 0x4b, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0xeb, 0xeb, 0x01, 0x07, 0x1f, 0x2f, 0x3f, 0x7f, 0x5f, 0x7f, 0x1f, 0x1f, 0x1f, 0x0f, 0x07, 0x03, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x07, 0x0f, 0x07, 0x0f, 0x3f, 0x0f, 0x5f, 0xbe, 0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x03, 0x03, 0x03, 0x07, 0x0f, 0x07, 0x07, 0x2f, 0x1f, 0x7f, 0xfd, 0x7f, 0xfb, 0xff, 0xa7, 0xff, 0xff, 0xf3, 0xf8, 0x9c, 0xfe, 0xfe, 0xff, 0xff, 0xfe, 0xfc, 0x7c, 0x9c, 0x94, 0x00, 0x08, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+
+};
diff --git a/keyboards/handwired/uthol/keymaps/oled/rules.mk b/keyboards/handwired/uthol/keymaps/oled/rules.mk
new file mode 100644
index 0000000000..9bd2ec39f9
--- /dev/null
+++ b/keyboards/handwired/uthol/keymaps/oled/rules.mk
@@ -0,0 +1,3 @@
+OLED_ENABLE = yes
+WPM_ENABLE = yes
+SRC  += helix.c
diff --git a/keyboards/handwired/uthol/keymaps/oled/smiley.c b/keyboards/handwired/uthol/keymaps/oled/smiley.c
new file mode 100644
index 0000000000..0e80475cf9
--- /dev/null
+++ b/keyboards/handwired/uthol/keymaps/oled/smiley.c
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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 "progmem.h"
+
+static const char PROGMEM animation[][1024] = {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0xfe, 0x0e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06,
+                                                0x0e, 0xfe, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x03, 0xfa, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfa, 0x03, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x03, 0x07, 0x7c, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x7c, 0x07, 0x03, 0x00, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x40, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1e, 0x3c, 0x38, 0xe0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0x38, 0x3c, 0x1e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x40, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfc, 0xfe, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xfe, 0xfe, 0xfe, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x26, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+                                                0x07, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x0c, 0x0e, 0xfe, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x06, 0xff, 0x0e, 0x04, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfc, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, 0x7c, 0xf8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf8, 0x7c, 0x1f, 0x03, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x18, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x1c, 0x38, 0x30, 0x60, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0x60, 0x30, 0x38, 0x1c, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x18, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x18, 0x04, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x0c, 0x18, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0xe0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f,
+                                                0x0f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0e, 0xfe, 0xfe, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x02, 0xff, 0xff, 0x0e, 0x0e, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x1f, 0xfc, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfc, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x18, 0x18, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1e, 0x3c, 0x70, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x78, 0x3c, 0x1e, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x18, 0x18, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x10, 0x20, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x07, 0x0e, 0x0e, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x0e, 0x0e, 0x07, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x20, 0x10, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x30, 0x18, 0x0c, 0x04, 0x00, 0x02, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x02, 0x00, 0x04, 0x0c, 0x18, 0x30, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x10, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfc, 0xfe, 0xfe, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfc, 0xfe, 0xfc, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x10, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f,
+                                                0x1f, 0x0f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0x1f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x3e, 0xfe, 0xf2, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x02, 0xf3, 0xff, 0x3f, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x3c, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0x3c, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x08, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18, 0x10, 0x30, 0x70, 0x60, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0x60, 0x70, 0x30, 0x10, 0x18, 0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x60, 0x08, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x10, 0x30, 0x20, 0x00, 0x40, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x40, 0x00, 0x20, 0x30, 0x10, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x00, 0x08, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x01, 0x02, 0x04, 0x08, 0x00, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x20, 0x20, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xff, 0xff, 0xff, 0xff, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f,
+                                                0x3f, 0x1f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1f, 0x3f, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x02, 0x1e, 0x7f, 0xe3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0xe1, 0x7f, 0x1e, 0x02, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x20, 0x80, 0x00, 0x00, 0x00, 0x01, 0x06, 0x1c, 0x10, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x40, 0x20, 0x10, 0x1c, 0x06, 0x01, 0x00, 0x00, 0x00, 0x80, 0x20, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x20, 0x40, 0x80, 0x00, 0x00, 0x01, 0x03, 0x03, 0x07, 0x07, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x07, 0x07, 0x03, 0x03, 0x01, 0x00, 0x00, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x00, 0x08, 0x08, 0x00, 0x00, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x00, 0x00, 0x08, 0x08, 0x00, 0x10, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x20, 0x00, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfc, 0xfe, 0xfe, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xfe, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x00, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f,
+                                                0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x1f, 0x3f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 0x00, 0x00, 0x06, 0x1f, 0xe3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x80, 0xe1, 0x1f, 0x06, 0x00, 0x00, 0x00, 0xc0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x20, 0x40, 0x00, 0x01, 0x03, 0x03, 0x04, 0x18, 0x30, 0x20, 0x60, 0x40, 0x40, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x40, 0x40, 0x60, 0x20, 0x30, 0x18, 0x04, 0x03, 0x03, 0x01, 0x00, 0x40, 0x20, 0x00, 0x04, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x04, 0x08, 0x00, 0x10, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x10, 0x00, 0x08, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x20, 0x10, 0x08, 0x00, 0x00, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x00, 0x00, 0x00, 0x08, 0x10, 0x20, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xfc, 0x08, 0x00, 0x00, 0x00, 0x00, 0x10, 0xf8, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x0f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x07, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x02, 0x0e, 0x0f, 0xe1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0x0f,
+                                                0x0e, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x00, 0x80, 0x80, 0x01, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x40, 0xc0, 0xc0, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xc0, 0x40, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x01, 0x80, 0x80, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x08, 0x10, 0x10, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x10, 0x10, 0x08, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x0f, 0x1f, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x06, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x3f, 0x00, 0x00,
+                                                0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x80, 0x00, 0x07, 0x1f, 0x30, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x30, 0x1f, 0x07, 0x00, 0x80, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x03, 0x07, 0x06, 0x04, 0x04, 0x04, 0x04, 0x06, 0x03, 0x03, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfc, 0x80, 0x00, 0x00, 0x00, 0x1c, 0xfc, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x01, 0x70, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x70, 0x01, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x07, 0x18, 0x30, 0x60, 0xe0, 0xc0, 0xc0, 0xe0, 0x60, 0x30, 0x18, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x02, 0x02, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x60, 0xe0, 0x80, 0x00, 0x00, 0x02, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xfb, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0x9f, 0x01, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0xe6, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe7, 0x0e, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x3f, 0x1f, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x1f, 0x3f, 0x00, 0x00, 0x0f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x0f, 0x0f, 0xf0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf0, 0x07, 0x07, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x40, 0x00, 0x00, 0x00, 0x03, 0x06, 0x0c, 0x1c, 0x1c, 0x1c, 0x1c, 0x0c, 0x06, 0x03, 0x00, 0x00, 0x00, 0x40, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+                                               {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x18, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xf8, 0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x18, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x07, 0x07, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xfe, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x7e, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x60, 0x00, 0x00, 0x03, 0x38, 0xf8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf8, 0x38, 0x03, 0x00, 0x00, 0x60, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x18, 0x80, 0x00, 0x00, 0x03, 0x07, 0x1e, 0x30, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xe0, 0x30, 0x1e, 0x07, 0x03, 0x00, 0x00, 0x80, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+
+};
diff --git a/keyboards/handwired/uthol/keymaps/oled/star.c b/keyboards/handwired/uthol/keymaps/oled/star.c
new file mode 100644
index 0000000000..a0152be680
--- /dev/null
+++ b/keyboards/handwired/uthol/keymaps/oled/star.c
@@ -0,0 +1,206 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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 "progmem.h"
+
+static const char PROGMEM animation[][1024] = {
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x40, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18, 0xff, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x0b, 0x0e, 0x0c, 0x18, 0x38, 0x78, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0x78, 0x78, 0x38, 0x1c, 0x0c, 0x0b, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x90, 0xd0, 0x70, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x30, 0x70, 0xf0, 0x90, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x20, 0x18, 0xff, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x01, 0x03, 0x07, 0xff, 0x3f, 0x30, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x40, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x0e, 0x0c, 0x18, 0xff, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x0b, 0x0f, 0x0c, 0x18, 0x38, 0x78, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0x78, 0x78, 0x18, 0x1c, 0x0c, 0x0b, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x90, 0xd0, 0x70, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x30, 0x70, 0xf0, 0x90, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x20, 0x18, 0xff, 0x0f, 0x03, 0x03, 0x00, 0x00, 0x01, 0x03, 0x07, 0xff, 0x3f, 0x30, 0x60, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x06, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x40, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x1c, 0x38, 0xff, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x1c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x0b, 0x0e, 0x1e, 0x1c, 0x38, 0x78, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0x38, 0x3c, 0x1c, 0x0e, 0x0a, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x90, 0xd0, 0x70, 0x70, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x30, 0x70, 0x70, 0x90, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x30, 0x1c, 0xff, 0x0f, 0x07, 0x01, 0x01, 0x00, 0x01, 0x03, 0x07, 0xff, 0x3f, 0x30, 0x40, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x02, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x1c, 0x58, 0xff, 0xf6, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x1c, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x19, 0x1b, 0x0e, 0x1e, 0x18, 0x3c, 0x78, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0x78, 0x78, 0x3c, 0x1c, 0x1e, 0x0b, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x90, 0xd0, 0x70, 0x70, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x38, 0x70, 0xf0, 0x90, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x30, 0x1c, 0xff, 0x1f, 0x07, 0x03, 0x00, 0x00, 0x01, 0x03, 0x0f, 0xff, 0x3f, 0x30, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0c, 0x78, 0xff, 0xf8, 0xe0, 0x80, 0x20, 0x20, 0x80, 0xc0, 0xf0, 0xfc, 0xfe,
+     0x0c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x09, 0x0a, 0x1e, 0x3c, 0xbc, 0x3c, 0x78, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xfc, 0xf8, 0x7c, 0x3c, 0x3c, 0x1c, 0x0a, 0x09, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa0, 0x70, 0x70, 0x38, 0x39, 0x3c, 0x3e, 0x3f, 0x3f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3f, 0x3c, 0x3c, 0x38, 0x78, 0x70, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x1e, 0xff, 0x1f, 0x0f, 0x03, 0x01, 0x01, 0x01, 0x07, 0x1f, 0x7f, 0x7f, 0x30, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xc0,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x78, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0x78, 0x38, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfc, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xf8, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xf8,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x1c, 0x18, 0x38, 0x78, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0x78, 0x38, 0x18, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x1f, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x01, 0x03, 0x07, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x06, 0x2c, 0xb8, 0xff, 0xfc, 0xe8, 0x80, 0x00, 0x00, 0x80, 0xc8, 0xf8, 0xff, 0xf8,
+     0x3c, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x09, 0x1b, 0x3e, 0x1c, 0x3e, 0x38, 0x7c, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0x78, 0x38, 0x1e, 0x1e, 0x1a, 0x09, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x90, 0xd0, 0x7c, 0x78, 0x78, 0x3c, 0x3e, 0x3f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x7a, 0x70, 0xf8, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x38, 0x18, 0xff, 0x3f, 0x07, 0x03, 0x01, 0x00, 0x09, 0x03, 0x2f, 0xff, 0x3f, 0x38, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x06, 0x04, 0x78, 0xff, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x1c, 0x06, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x0b, 0x0c, 0x1c, 0x1c, 0x3c, 0x78, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0x78, 0x3c, 0x1c, 0x0f, 0x0b, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x90, 0xd0, 0x70, 0x70, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x38, 0x70, 0x70, 0x90, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x50, 0x30, 0x1c, 0xff, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x01, 0x03, 0x0f, 0xff, 0x3f, 0x30, 0x40, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x40, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18, 0xff, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x0c, 0x06, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x0b, 0x0f, 0x0c, 0x18, 0x38, 0x78, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0x78, 0x78, 0x38, 0x1c, 0x0c, 0x0b, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x90, 0xd0, 0x70, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x30, 0x70, 0xf0, 0x90, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x20, 0x18, 0xff, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x01, 0x03, 0x07, 0xff, 0x3f, 0x30, 0x60, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x20, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x06, 0x0c, 0x18, 0xff, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x0b, 0x0e, 0x1c, 0x18, 0x38, 0x78, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0x78, 0x38, 0x38, 0x1c, 0x0e, 0x0a, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x90, 0xd0, 0x70, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x30, 0x70, 0x70, 0x90, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x30, 0x18, 0xff, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x01, 0x03, 0x07, 0xff, 0x3f, 0x30, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x06, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x20, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x06, 0x0c, 0x18, 0xff, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x0b, 0x0e, 0x1c, 0x18, 0x38, 0x78, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0x78, 0x38, 0x38, 0x1c, 0x0e, 0x0a, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x90, 0xd0, 0x70, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x30, 0x70, 0xf0, 0x90, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x30, 0x18, 0xff, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x01, 0x03, 0x07, 0xff, 0x3f, 0x30, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x06, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x20, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x60, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x01, 0x07, 0x06, 0x0c, 0x38, 0xff, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x0c, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x20, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x0b, 0x0e, 0x1c, 0x1c, 0x38, 0x78, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0x38, 0x38, 0x1c, 0x0c, 0x0a, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x90, 0xd0, 0x70, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x70, 0x70, 0xf0, 0x90, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x06, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x20, 0x18, 0xff, 0x0f, 0x07, 0x01, 0x01, 0x00, 0x01, 0x03, 0x07, 0xff, 0x3f, 0x38, 0x60, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x06, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x20, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x20, 0x40, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x06, 0x0c, 0x18, 0xff, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x0c, 0x06, 0x03, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x0b, 0x0e, 0x1c, 0x18, 0x38, 0x78, 0xf8, 0xfa, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0x78, 0x38, 0x1c, 0x0c, 0x0b, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x90, 0xd0, 0x70, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x30, 0x30, 0xf0, 0x90, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0x02, 0x03, 0x01, 0x00, 0x00, 0x08, 0x00, 0x80, 0x80, 0x60, 0x20, 0x18, 0xff, 0x0f, 0x07, 0x03, 0x01, 0x00, 0x01, 0x03, 0x07, 0xff, 0x3f, 0x20, 0x60, 0xe0, 0x82, 0x00, 0x00, 0x00, 0x01, 0x01, 0x03, 0x02, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x06, 0x04, 0x58, 0xff, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x1c, 0x06, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x18, 0x08, 0x09, 0x1b, 0x0c, 0x1c, 0x38, 0x3c, 0x78, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0x78, 0x7c, 0x3c, 0x1c, 0x0f, 0x0b, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x90, 0xd0, 0x70, 0x70, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x38, 0x70, 0xf0, 0x90, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x70, 0x30, 0x1e, 0xff, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x01, 0x03, 0x0f, 0xff, 0x3f, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0e, 0x0c, 0x38, 0xff, 0xff, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x0c, 0x0e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x18, 0x19, 0x1b, 0x1f, 0x1c, 0x1c, 0x3c, 0x78, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0x7c, 0x3c, 0x1c, 0x1e, 0x1b, 0x19, 0x18, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x98, 0xd0, 0xf0, 0x30, 0x78, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x78, 0x70, 0xf0, 0x90, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x60, 0x30, 0x1e, 0xff, 0x7f, 0x07, 0x03, 0x01, 0x00, 0x01, 0x03, 0x2f, 0xff, 0x3f, 0x38, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x1c, 0xb8, 0xff, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xf8, 0xfe, 0xfe,
+     0x1c, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x09, 0x0a, 0x1e, 0x1e, 0x3c, 0x38, 0x7c, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xfc, 0x78, 0x3a, 0x1c, 0x1e, 0x1a, 0x09, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xb0, 0xf0, 0x78, 0x78, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0xbf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x3c, 0x38, 0x78, 0x70, 0x90, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x34, 0x19, 0xff, 0x3f, 0x07, 0x03, 0x01, 0x00, 0x01, 0x07, 0x1f, 0x7f, 0xff, 0x30, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xfc, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xf8, 0xf8,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x0c, 0x08, 0x18, 0x38, 0x78, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0x78, 0x38, 0x38, 0x18, 0x0c, 0x0a, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x30, 0x30, 0x70, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x7f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x01, 0x03, 0x07, 0x7f, 0x3f, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xe0, 0xc0,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x78, 0xfc, 0xf8, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0x78, 0x38, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x07, 0x07, 0x03, 0x01, 0x00, 0x01, 0x03, 0x07, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xfc, 0x3c, 0x1e, 0x1e, 0x1e, 0x1e, 0x3c, 0xfc, 0xf8, 0xf8, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x3f, 0x3f, 0x7c, 0x78, 0x78, 0x78, 0x78, 0x7c, 0x3f, 0x3f, 0x1f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x1c, 0x78, 0xff, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xf8, 0xfe, 0xf8,
+     0x5c, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x09, 0x0a, 0x1e, 0x1e, 0x3c, 0x3c, 0x78, 0xf8, 0xf8, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0x7c, 0x3c, 0x1c, 0x1e, 0x1a, 0x09, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xd0, 0x78, 0x78, 0x38, 0x7c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x3c, 0x38, 0x70, 0xf0, 0x90, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x30, 0x1e, 0xff, 0x3f, 0x07, 0x03, 0x01, 0x00, 0x01, 0x07, 0x0f, 0xff, 0x3f, 0x30, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
+
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x06, 0x04, 0x38, 0xff, 0xf0, 0xc0, 0x80, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0xff, 0xf8,
+     0x1c, 0x06, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x0b, 0x0c, 0x1c, 0x1c, 0x38, 0x78, 0xf8, 0xf8, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0x78, 0x38, 0x3c, 0x1c, 0x0e, 0x0a, 0x09, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x90, 0xd0, 0x70, 0x70, 0x38, 0x3c, 0x3e, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0x3f, 0x3e, 0x3c, 0x38, 0x38, 0x70, 0xf0, 0x90, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x40, 0x30, 0x1c, 0xff, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x01, 0x03, 0x0f, 0xff, 0x3f, 0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x02, 0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}
+
+};
diff --git a/keyboards/handwired/uthol/readme.md b/keyboards/handwired/uthol/readme.md
new file mode 100644
index 0000000000..c4eb3e51ca
--- /dev/null
+++ b/keyboards/handwired/uthol/readme.md
@@ -0,0 +1,27 @@
+# Uthol
+
+![Uthol](https://i.imgur.com/weFwdhfh.jpeg)
+
+A handwired 50% (12x5) ortholinear keyboard made by Uthol
+
+* Keyboard Maintainer: [Uthol](https://github.com/Uthol)
+* Hardware Supported: Pro Micro ATMega32u4, Blackpill STM32F4x1 
+* Hardware Availability: [Pro Micro](https://www.sparkfun.com/products/12640), [Blackpill STM32F4x1 ](https://www.aliexpress.com/item/1005001456186625.html)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/uthol/rev2:default
+
+Flashing example for this keyboard:
+
+    make handwired/uthol/rev2:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard
+* **Physical reset button**: On the Pro Micro, short the `GND` and `RST` pins. On the Blackpill, press `BOOT0` key and the `RST` key, then release the `RST` key, and release the `BOOT0` key 
+* **Keycode in layout**: Press the key mapped to `Settings + Backspace`
diff --git a/keyboards/handwired/uthol/rev1/config.h b/keyboards/handwired/uthol/rev1/config.h
new file mode 100644
index 0000000000..dbda8e90ed
--- /dev/null
+++ b/keyboards/handwired/uthol/rev1/config.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define DEVICE_VER 0x0001
+#define PRODUCT_ID 0x67F3
+#define PRODUCT UtholOne
+
+/* Uthol PCB default pin-out */
+#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
+#define MATRIX_COL_PINS { D3, B6, B2, B3, B1, F7, F6, F5, F4, B5, B4, D2 }
+#define UNUSED_PINS
diff --git a/keyboards/handwired/uthol/rev1/readme.md b/keyboards/handwired/uthol/rev1/readme.md
new file mode 100644
index 0000000000..6f5ddfead3
--- /dev/null
+++ b/keyboards/handwired/uthol/rev1/readme.md
@@ -0,0 +1,4 @@
+Uthol
+===
+
+Rev 1 - Aluminum 
diff --git a/keyboards/handwired/uthol/rev1/rules.mk b/keyboards/handwired/uthol/rev1/rules.mk
new file mode 100644
index 0000000000..0da1dde9cb
--- /dev/null
+++ b/keyboards/handwired/uthol/rev1/rules.mk
@@ -0,0 +1,13 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+NKRO_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h
new file mode 100644
index 0000000000..3ef6fc172c
--- /dev/null
+++ b/keyboards/handwired/uthol/rev2/config.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define DEVICE_VER 0x0002
+#define PRODUCT_ID 0x67F3
+#define PRODUCT UtholTwo
+
+/* Uthol PCB default pin-out */
+#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 }
+#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, B5, B4, B6, B2, B3 }
+#define UNUSED_PINS
+
+//RGB Stuff
+#define RGB_DI_PIN E6
+#define RGBLED_NUM 39
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_DEFAULT_HUE 201
diff --git a/keyboards/handwired/uthol/rev2/readme.md b/keyboards/handwired/uthol/rev2/readme.md
new file mode 100644
index 0000000000..080e02d310
--- /dev/null
+++ b/keyboards/handwired/uthol/rev2/readme.md
@@ -0,0 +1,4 @@
+Uthol
+===
+
+Rev 2 - Standard
diff --git a/keyboards/handwired/uthol/rev2/rules.mk b/keyboards/handwired/uthol/rev2/rules.mk
new file mode 100644
index 0000000000..63476766fd
--- /dev/null
+++ b/keyboards/handwired/uthol/rev2/rules.mk
@@ -0,0 +1,15 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+NKRO_ENABLE = yes
+LTO_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+RGBLIGHT_DRIVER = WS2812
diff --git a/keyboards/handwired/uthol/rev3/chconf.h b/keyboards/handwired/uthol/rev3/chconf.h
new file mode 100644
index 0000000000..e4147c75b1
--- /dev/null
+++ b/keyboards/handwired/uthol/rev3/chconf.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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 CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
+
+#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
+
+#define CH_CFG_FACTORY_SEMAPHORES TRUE
+
+#define CH_CFG_FACTORY_MAILBOXES TRUE
+
+#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
+
+#define CH_CFG_FACTORY_PIPES TRUE
+
+#include_next <chconf.h>
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
new file mode 100644
index 0000000000..47f079e612
--- /dev/null
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+#define DEVICE_VER 0x0003
+#define PRODUCT_ID 0x67F3
+#define PRODUCT UtholThree
+
+/* key matrix size */
+// A11 and A12 dont work. They are reserved for USB. B2 is reserved for BOOT1
+#define MATRIX_COL_PINS \
+    { B1, B10, B9, B8, B5, B4, B3, A15, B15, B14, B13, B12 }
+#define MATRIX_ROW_PINS \
+    { A4, A3, A2, A1, A0 }
+
+#define UNUSED_PINS
+
+// Encoder config
+#define ENCODERS_PAD_A \
+    { C15 }
+#define ENCODERS_PAD_B \
+    { C14 }
+#define ENCODER_RESOLUTION 2
+
+// OLED config
+#define OLED_DISPLAY_128X64
+#define OLED_DISPLAY_WIDTH 128
+#define OLED_DISPLAY_HEIGHT 64
+#define OLED_UPDATE_INTERVAL 0
+#define OLED_BRIGHTNESS 255
+#define OLED_DISPLAY_ADDRESS 0x3C
+#define OLED_RESET -1
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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 TAPPING_TERM 500
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+// RGB Stuff
+#define RGB_DI_PIN B0
+#define RGBLED_NUM 39
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_DEFAULT_HUE 201
diff --git a/keyboards/handwired/uthol/rev3/halconf.h b/keyboards/handwired/uthol/rev3/halconf.h
new file mode 100644
index 0000000000..47e02bc102
--- /dev/null
+++ b/keyboards/handwired/uthol/rev3/halconf.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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 HAL_USE_I2C TRUE
+
+#define HAL_USE_PWM TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/handwired/uthol/rev3/mcuconf.h b/keyboards/handwired/uthol/rev3/mcuconf.h
new file mode 100644
index 0000000000..24fb0ef3a5
--- /dev/null
+++ b/keyboards/handwired/uthol/rev3/mcuconf.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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_next "mcuconf.h"
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_PWM_USE_TIM5
+#define STM32_PWM_USE_TIM5 TRUE
diff --git a/keyboards/handwired/uthol/rev3/readme.md b/keyboards/handwired/uthol/rev3/readme.md
new file mode 100644
index 0000000000..6b6897ef44
--- /dev/null
+++ b/keyboards/handwired/uthol/rev3/readme.md
@@ -0,0 +1,4 @@
+Uthol
+===
+
+Rev 3 - Blackpill
diff --git a/keyboards/handwired/uthol/rev3/rev3.c b/keyboards/handwired/uthol/rev3/rev3.c
new file mode 100644
index 0000000000..2ababdfbe8
--- /dev/null
+++ b/keyboards/handwired/uthol/rev3/rev3.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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
+
+void board_init(void) { setPinInputHigh(B9); }
diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk
new file mode 100644
index 0000000000..b64e4ec8d1
--- /dev/null
+++ b/keyboards/handwired/uthol/rev3/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes
+NKRO_ENABLE = yes
+KEYBOARD_SHARED_EP = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+WPM_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+ENCODER_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+RGBLIGHT_DRIVER = WS2812
diff --git a/keyboards/handwired/uthol/uthol.c b/keyboards/handwired/uthol/uthol.c
new file mode 100644
index 0000000000..2b02e899d4
--- /dev/null
+++ b/keyboards/handwired/uthol/uthol.c
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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 "uthol.h"
diff --git a/keyboards/handwired/uthol/uthol.h b/keyboards/handwired/uthol/uthol.h
new file mode 100644
index 0000000000..a774fdb940
--- /dev/null
+++ b/keyboards/handwired/uthol/uthol.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2022 Uthol
+ *
+ * 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"
+
+/**************************************************
+** Include headers specific to keyboard revision **
+**************************************************/
+#if defined(KEYBOARD_uthol_rev1)
+#    include "rev1.h"
+#elif defined(KEYBOARD_uthol_rev2)
+#    include "rev2.h"
+#elif defined(KEYBOARD_uthol_rev2)
+#    include "rev3.h"
+#endif
+
+#define LAYOUT_uthol( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
+    k40, k41, k42, k43, k44,    k45,   k47, k48, k49, k4a, k4b \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
+    { k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \
+}

From ec3df85f08edf2636599edb96f358004ee020c86 Mon Sep 17 00:00:00 2001
From: TerryMathews <terry@terrymathews.net>
Date: Mon, 7 Mar 2022 22:39:33 -0500
Subject: [PATCH 759/867] [Keyboard] TKC Portico68 v2 (#15916)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/tkc/portico68v2/config.h            | 106 +++++++++++++
 keyboards/tkc/portico68v2/info.json           |  82 ++++++++++
 .../tkc/portico68v2/keymaps/default/keymap.c  |  35 +++++
 .../tkc/portico68v2/keymaps/via/config.h      |  19 +++
 .../tkc/portico68v2/keymaps/via/keymap.c      | 121 +++++++++++++++
 .../tkc/portico68v2/keymaps/via/rules.mk      |   1 +
 keyboards/tkc/portico68v2/portico68v2.c       | 145 ++++++++++++++++++
 keyboards/tkc/portico68v2/portico68v2.h       |  36 +++++
 keyboards/tkc/portico68v2/readme.md           |  21 +++
 keyboards/tkc/portico68v2/rules.mk            |  21 +++
 10 files changed, 587 insertions(+)
 create mode 100644 keyboards/tkc/portico68v2/config.h
 create mode 100644 keyboards/tkc/portico68v2/info.json
 create mode 100644 keyboards/tkc/portico68v2/keymaps/default/keymap.c
 create mode 100644 keyboards/tkc/portico68v2/keymaps/via/config.h
 create mode 100644 keyboards/tkc/portico68v2/keymaps/via/keymap.c
 create mode 100644 keyboards/tkc/portico68v2/keymaps/via/rules.mk
 create mode 100644 keyboards/tkc/portico68v2/portico68v2.c
 create mode 100644 keyboards/tkc/portico68v2/portico68v2.h
 create mode 100644 keyboards/tkc/portico68v2/readme.md
 create mode 100644 keyboards/tkc/portico68v2/rules.mk

diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h
new file mode 100644
index 0000000000..af0a162810
--- /dev/null
+++ b/keyboards/tkc/portico68v2/config.h
@@ -0,0 +1,106 @@
+/*
+Copyright 2022 Terry Mathews
+
+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       0x544B //TK
+#define PRODUCT_ID      0x0012 //Portico68v2
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    TKC
+#define PRODUCT         Portico68v2
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS { B6, C6, C7, F7, D2 }
+#define MATRIX_COL_PINS { D3, D5, D4, D6, D7, B4, B5, F6, F5, F4, F1, B0, B1, B2, B3 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 3
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#define DRIVER_ADDR_1 0b0110000
+#define DRIVER_COUNT 1
+#define DRIVER_1_LED_TOTAL 82
+#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+#define DRIVER_INDICATOR_LED_TOTAL 0
+#define RGB_MATRIX_CENTER { 116, 32 }
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 175
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+// #define RGB_MATRIX_LED_PROCESS_LIMIT 5
+// #define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/tkc/portico68v2/info.json b/keyboards/tkc/portico68v2/info.json
new file mode 100644
index 0000000000..d3ea7cb264
--- /dev/null
+++ b/keyboards/tkc/portico68v2/info.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "TKC Portico68 v2",
+    "url": "",
+    "maintainer": "TerryMathews",
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label":"~", "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":"Home", "x":15, "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":"PgUp", "x":15, "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":"PgDn", "x":15, "y":2},
+
+                {"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":1.75},
+                {"label":"<i class='kb kb-Arrows-Up'></i>", "x":14, "y":3},
+                {"label":"End", "x":15, "y":3},
+
+                {"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":"Fn", "x":10, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":11.25, "y":4, "w":1.25},
+                {"label":"<i class='kb kb-Arrows-Left'></i>", "x":13, "y":4},
+                {"label":"<i class='kb kb-Arrows-Down'></i>", "x":14, "y":4},
+                {"label":"<i class='kb kb-Arrows-Right'></i>", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/tkc/portico68v2/keymaps/default/keymap.c b/keyboards/tkc/portico68v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d8ecbe1c0a
--- /dev/null
+++ b/keyboards/tkc/portico68v2/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2022 Terry Mathews
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi_blocker(
+        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_HOME,
+        KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT,             KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,   KC_UP,  KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                               MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker(
+        KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,   RESET, KC_PGUP,
+        KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
+        KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
+        _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
+    )
+};
diff --git a/keyboards/tkc/portico68v2/keymaps/via/config.h b/keyboards/tkc/portico68v2/keymaps/via/config.h
new file mode 100644
index 0000000000..39b11550cf
--- /dev/null
+++ b/keyboards/tkc/portico68v2/keymaps/via/config.h
@@ -0,0 +1,19 @@
+/*
+Copyright 2022 Terry Mathews
+
+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 VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/tkc/portico68v2/keymaps/via/keymap.c b/keyboards/tkc/portico68v2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b8fd68f625
--- /dev/null
+++ b/keyboards/tkc/portico68v2/keymaps/via/keymap.c
@@ -0,0 +1,121 @@
+/*
+Copyright 2022 Terry Mathews
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_65_ansi_blocker(
+        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_HOME,
+        KC_TAB,     KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT,             KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,   KC_UP,  KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                               MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi_blocker(
+        KC_GESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL, KC_HOME,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, KC_PSCR, KC_SLCK, KC_PAUS,   RESET, KC_PGUP,
+        KC_CAPS, RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_PGDN,
+        KC_LSFT,          _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, KC_VOLU, KC_MUTE,
+        _______, _______, _______,                            _______,                            _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
+    ),
+    [2] = LAYOUT_65_ansi_blocker(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_65_ansi_blocker(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    )
+};
+
+void via_qmk_rgblight_get_value(uint8_t *data) {
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    switch (*value_id) {
+        case id_qmk_rgblight_brightness: {
+            value_data[0] = rgb_matrix_get_val();
+            break;
+        }
+        case id_qmk_rgblight_effect: {
+            value_data[0] = rgb_matrix_get_flags() ? rgb_matrix_get_mode() : 0;
+            break;
+        }
+        case id_qmk_rgblight_effect_speed: {
+            value_data[0] = rgb_matrix_get_speed();
+            break;
+        }
+        case id_qmk_rgblight_color: {
+            value_data[0] = rgb_matrix_get_hue();
+            value_data[1] = rgb_matrix_get_sat();
+            break;
+        }
+    }
+}
+
+void via_qmk_rgblight_set_value(uint8_t *data) {
+    uint8_t *value_id   = &(data[0]);
+    uint8_t *value_data = &(data[1]);
+    switch (*value_id) {
+        case id_qmk_rgblight_brightness: {
+            rgb_matrix_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), value_data[0]);
+            break;
+        }
+        case id_qmk_rgblight_effect: {
+            if (value_data[0] == 0) {
+                rgb_matrix_set_flags(LED_FLAG_NONE);
+            } else {
+                rgb_matrix_mode_noeeprom(value_data[0]);
+                rgb_matrix_set_flags(LED_FLAG_MODIFIER|LED_FLAG_UNDERGLOW|LED_FLAG_KEYLIGHT);
+            }
+            break;
+        }
+        case id_qmk_rgblight_effect_speed: {
+            rgb_matrix_set_speed_noeeprom(value_data[0]);
+            break;
+        }
+        case id_qmk_rgblight_color: {
+            rgb_matrix_sethsv_noeeprom(value_data[0], value_data[1], rgblight_get_val());
+            break;
+        }
+    }
+}
+
+void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
+    uint8_t *command_id = &(data[0]);
+    uint8_t *command_data = &(data[1]);
+    switch (*command_id) {
+        case id_lighting_set_value:
+            via_qmk_rgblight_set_value(command_data);
+            break;
+        case id_lighting_get_value:
+            via_qmk_rgblight_get_value(command_data);
+            break;
+        case id_lighting_save:
+            eeconfig_update_rgb_matrix();
+            break;
+        default:
+            // Unhandled message.
+            *command_id = id_unhandled;
+            break;
+    }
+}
diff --git a/keyboards/tkc/portico68v2/keymaps/via/rules.mk b/keyboards/tkc/portico68v2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/tkc/portico68v2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/tkc/portico68v2/portico68v2.c b/keyboards/tkc/portico68v2/portico68v2.c
new file mode 100644
index 0000000000..8e98034ca5
--- /dev/null
+++ b/keyboards/tkc/portico68v2/portico68v2.c
@@ -0,0 +1,145 @@
+/*
+Copyright 2022 Terry Mathews
+
+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 "portico68v2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+    {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB1 */
+    {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB2 */
+    {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB3 */
+    {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB4 */
+    {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB5 */
+    {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB6 */
+    {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB7 */
+    {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB8 */
+    {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB9 */
+    {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB10 */
+    {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB11 */
+    {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB12 */
+    {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB13 */
+    {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB14 */
+    {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB15 */
+    {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB16 */
+    {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB17 */
+    {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB18 */
+    {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB19 */
+    {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
+    {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB21 */
+    {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB22 */
+    {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB23 */
+    {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB24 */
+    {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB25 */
+    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB26 */
+    {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB27 */
+    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB28 */
+    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB29 */
+    {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB30 */
+    {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB31 */
+    {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB32 */
+    {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB33 */
+    {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB34 */
+    {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB35 */
+    {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB36 */
+    {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB37 */
+    {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB38 */
+    {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB39 */
+    {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB40 */
+    {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB41 */
+    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB42 */
+    {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB43 */
+    {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB44 */
+    {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB45 */
+    {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB46 */
+    {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB47 */
+    {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB48 */
+    {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB49 */
+    {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB50 */
+    {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB51 */
+    {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB52 */
+    {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB53 */
+    {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB54 */
+    {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB55 */
+    {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB56 */
+    {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB57 */
+    {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB58 */
+    {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB59 */
+    {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB60 */
+    {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB61 */
+    {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB62 */
+    {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB63 */
+    {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB64 */
+    {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB65 */
+    {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB66 */
+    {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB67 */
+
+    {0,CS36_SW1,CS35_SW1,CS34_SW1}, /* RGB68 */
+    {0,CS36_SW2,CS35_SW2,CS34_SW2}, /* RGB69 */
+    {0,CS36_SW3,CS35_SW3,CS34_SW3}, /* RGB70 */
+    {0,CS36_SW4,CS35_SW4,CS34_SW4}, /* RGB71 */
+    {0,CS36_SW5,CS35_SW5,CS34_SW5}, /* RGB72 */
+    {0,CS36_SW6,CS35_SW6,CS34_SW6}, /* RGB73 */
+    {0,CS36_SW7,CS35_SW7,CS34_SW7}, /* RGB74 */
+    {0,CS36_SW8,CS35_SW8,CS34_SW8}, /* RGB75 */
+    {0,CS36_SW9,CS35_SW9,CS34_SW9}, /* RGB76 */
+    {0,CS39_SW1,CS38_SW1,CS37_SW1}, /* RGB77 */
+    {0,CS39_SW2,CS38_SW2,CS37_SW2}, /* RGB78 */
+    {0,CS39_SW3,CS38_SW3,CS37_SW3}, /* RGB79 */
+    {0,CS39_SW4,CS38_SW4,CS37_SW4}, /* RGB80 */
+    {0,CS39_SW5,CS38_SW5,CS37_SW5}, /* RGB81 */
+    {0,CS39_SW6,CS38_SW6,CS37_SW6}, /* RGB82 */
+};
+
+led_config_t g_led_config = {
+    {
+	    {  0,      1,  2,      3,      4,      5,  6,      7,      8,      9, 10, 11, 12,     13, 14 },
+        { 15,     16, 17,     18,     19,     20, 21,     22,     23,     24, 25, 26, 27,     28, 29 },
+        { 30,     31, 32,     33,     34,     35, 36,     37,     38,     39, 40, 41, 42, NO_LED, 43 },
+        { 44, NO_LED, 45,     46,     47,     48, 49,     50,     51,     52, 53, 54, 55,     56, 57 },
+        { 58,     59, 60, NO_LED, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 62, 63, 64,     65, 66 }
+    }, {
+        {   0,   0 }, {  15,   0 }, {  30,   0 }, {  45,   0 }, {  60,   0 }, {  75,   0 }, {  90,   0 }, { 105,   0 }, { 120,   0 }, { 135,   0 }, { 150,   0 }, { 165,   0 }, { 180,   0 }, { 203,   0 }, { 224,   0 },
+        {   4,  16 }, {  23,  16 }, {  38,  16 }, {  53,  16 }, {  68,  16 }, {  83,  16 }, {  98,  16 }, { 113,  16 }, { 128,  16 }, { 143,  16 }, { 158,  16 }, { 173,  16 }, { 188,  16 }, { 206,  16 }, { 224,  16 },
+        {   6,  32 }, {  26,  32 }, {  41,  32 }, {  56,  32 }, {  71,  32 }, {  86,  32 }, { 101,  32 }, { 116,  32 }, { 131,  32 }, { 146,  32 }, { 161,  32 }, { 176,  32 },               { 201,  32 }, { 224,  32 },
+        {   9,  48 },               {  34,  48 }, {  49,  48 }, {  64,  48 }, {  79,  48 }, {  94,  48 }, { 109,  48 }, { 124,  48 }, { 139,  48 }, { 154,  48 }, { 169,  48 }, { 189,  48 }, { 210,  48 }, { 224,  48 },
+        {   2,  64 }, {  21,  64 }, {  39,  64 },                                           {  96,  64 },                                           { 152,  64 }, { 171,  64 }, { 195,  64 }, { 210,  64 }, { 224,  64 },
+        {0,0},{180,0},{224,0},{200,64},{224,64},{224,32},{44,0},{88,0},{136,0},{0,32},{0,64},{24,64},{78,64},{112,64},{146,64}
+}, {
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4,
+        4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4,          4,          4, 4, 4, 4, 4,
+        2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+    }
+};
+
+void rgb_matrix_indicators_kb(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        for (uint8_t i = 0; i < DRIVER_1_LED_TOTAL; i++) {
+            rgb_matrix_set_color(i, 0xFF, 0xFF, 0xFF);
+        }
+    }
+    else {
+         if (rgb_matrix_get_flags() == LED_FLAG_NONE) {
+            for (uint8_t i = 0; i < DRIVER_1_LED_TOTAL; i++) {
+                rgb_matrix_set_color(i, 0, 0, 0);
+            }
+        }
+    }
+}
+#endif
diff --git a/keyboards/tkc/portico68v2/portico68v2.h b/keyboards/tkc/portico68v2/portico68v2.h
new file mode 100644
index 0000000000..3cbe46d560
--- /dev/null
+++ b/keyboards/tkc/portico68v2/portico68v2.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2022 Terry Mathews
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_65_ansi_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E,\
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }  \
+}
diff --git a/keyboards/tkc/portico68v2/readme.md b/keyboards/tkc/portico68v2/readme.md
new file mode 100644
index 0000000000..df031fabe8
--- /dev/null
+++ b/keyboards/tkc/portico68v2/readme.md
@@ -0,0 +1,21 @@
+# TKC Portico68 v2
+
+![TKC Portico68](https://raw.githubusercontent.com/noroadsleft/qmk_images/master/keyboards/tkc/portico/portico-clear_overhead_1024x1024.webp)
+
+A 65% keyboard kit with per-key and underglow RGB lighting.
+
+* Keyboard Maintainer: [TerryMathews](https://github.com/TerryMathews)
+* Hardware Supported: TKC Portico (ATmega32U4)
+* Hardware Availability: [TheKey.Company](https://thekey.company/products/portico-keyboard)
+
+Reset board into bootloader by holding down Esc key while plugging in USB-C cable.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make tkc/portico68v2:default
+
+Flashing example for this keyboard:
+
+    make tkc/portico68v2:default:flash
+
+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).
diff --git a/keyboards/tkc/portico68v2/rules.mk b/keyboards/tkc/portico68v2/rules.mk
new file mode 100644
index 0000000000..f8e7ced981
--- /dev/null
+++ b/keyboards/tkc/portico68v2/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes         # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes          # Mouse keys
+EXTRAKEY_ENABLE = yes          # Audio control and System control
+CONSOLE_ENABLE = no            # Console for debug
+COMMAND_ENABLE = yes           # Commands for debug and configuration
+NKRO_ENABLE = yes              # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
+AUDIO_ENABLE = no              # Audio output
+LTO_ENABLE = yes			   # Compile-time optimizations
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
\ No newline at end of file

From 86966fce69369fe4f82efcab9540805b26632967 Mon Sep 17 00:00:00 2001
From: Beanaccle <25994266+Beanaccle@users.noreply.github.com>
Date: Tue, 8 Mar 2022 12:40:46 +0900
Subject: [PATCH 760/867] [Keyboard] Add KB58 (#15896)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/kb58/config.h                 | 154 ++++++++++++++++++++++++
 keyboards/kb58/info.json                |  73 +++++++++++
 keyboards/kb58/kb58.c                   |  17 +++
 keyboards/kb58/kb58.h                   |  46 +++++++
 keyboards/kb58/keymaps/default/keymap.c |  40 ++++++
 keyboards/kb58/readme.md                |  23 ++++
 keyboards/kb58/rules.mk                 |  20 +++
 7 files changed, 373 insertions(+)
 create mode 100644 keyboards/kb58/config.h
 create mode 100644 keyboards/kb58/info.json
 create mode 100644 keyboards/kb58/kb58.c
 create mode 100644 keyboards/kb58/kb58.h
 create mode 100644 keyboards/kb58/keymaps/default/keymap.c
 create mode 100644 keyboards/kb58/readme.md
 create mode 100644 keyboards/kb58/rules.mk

diff --git a/keyboards/kb58/config.h b/keyboards/kb58/config.h
new file mode 100644
index 0000000000..9b8216e75b
--- /dev/null
+++ b/keyboards/kb58/config.h
@@ -0,0 +1,154 @@
+/*
+Copyright 2021 beanaccle
+
+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 beanaccle
+#define PRODUCT      kb58
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 7
+
+/*
+ * 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 { F4, B6, E6, B4, B5 }
+#define MATRIX_COL_PINS { F5, F6, F7, B1, D7, D4, D0 }
+#define MATRIX_ROW_PINS_RIGHT { F7, B5, B3, B2, B6 }
+#define MATRIX_COL_PINS_RIGHT { F6, B1, E6, D7, C6, D4, D0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D2  // or D0, D1, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kb58/info.json b/keyboards/kb58/info.json
new file mode 100644
index 0000000000..5114eec6ae
--- /dev/null
+++ b/keyboards/kb58/info.json
@@ -0,0 +1,73 @@
+{
+    "keyboard_name": "KB58",
+    "url": "https://github.com/beanaccle/kb58_pico",
+    "maintainer": "beanaccle",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1", "x":1, "y":0},
+                {"label":"2", "x":2, "y":0},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0},
+                {"label":"5", "x":5, "y":0},
+                {"label":"6", "x":6, "y":0},
+                {"label":"7", "x":7, "y":0},
+                {"label":"8", "x":8, "y":0},
+                {"label":"9", "x":9, "y":0},
+                {"label":"0", "x":10, "y":0},
+                {"label":"-", "x":11, "y":0},
+                {"label":"=", "x":12, "y":0},
+
+                {"label":"Tab", "x":0, "y":1},
+                {"label":"Q", "x":1, "y":1},
+                {"label":"W", "x":2, "y":1},
+                {"label":"E", "x":3, "y":1},
+                {"label":"R", "x":4, "y":1},
+                {"label":"T", "x":5, "y":1},
+                {"label":"Y", "x":6, "y":1},
+                {"label":"U", "x":7, "y":1},
+                {"label":"I", "x":8, "y":1},
+                {"label":"O", "x":9, "y":1},
+                {"label":"P", "x":10, "y":1},
+                {"label":"[", "x":11, "y":1},
+                {"label":"]", "x":12, "y":1},
+
+                {"label":"Control", "x":0, "y":2},
+                {"label":"A", "x":1, "y":2},
+                {"label":"S", "x":2, "y":2},
+                {"label":"D", "x":3, "y":2},
+                {"label":"F", "x":4, "y":2},
+                {"label":"G", "x":5, "y":2},
+                {"label":"H", "x":6, "y":2},
+                {"label":"J", "x":7, "y":2},
+                {"label":"K", "x":8, "y":2},
+                {"label":"L", "x":9, "y":2},
+                {"label":";", "x":10, "y":2},
+                {"label":"'", "x":11, "y":2},
+                {"label":"Enter", "x":12, "y":2},
+
+                {"label":"Shift", "x":0, "y":3},
+                {"label":"Z", "x":1, "y":3},
+                {"label":"X", "x":2, "y":3},
+                {"label":"C", "x":3, "y":3},
+                {"label":"Y", "x":4, "y":3},
+                {"label":"B", "x":5, "y":3},
+                {"label":"N", "x":6, "y":3},
+                {"label":"M", "x":7, "y":3},
+                {"label":",", "x":8, "y":3},
+                {"label":".", "x":9, "y":3},
+                {"label":"/", "x":10, "y":3},
+                {"label":"\\", "x":11, "y":3},
+                {"label":"Shift", "x":12, "y":3},
+
+                {"label":"Alt", "x":3, "y":4},
+                {"label":"GUI", "x":4, "y":4},
+                {"x":5, "y":4},
+                {"x":6, "y":4},
+                {"label":"Fn", "x":7, "y":4},
+                {"label":"Delete", "x":8, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/kb58/kb58.c b/keyboards/kb58/kb58.c
new file mode 100644
index 0000000000..5d189fa321
--- /dev/null
+++ b/keyboards/kb58/kb58.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 beanaccle
+ *
+ * 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 "kb58.h"
diff --git a/keyboards/kb58/kb58.h b/keyboards/kb58/kb58.h
new file mode 100644
index 0000000000..d936215ae8
--- /dev/null
+++ b/keyboards/kb58/kb58.h
@@ -0,0 +1,46 @@
+/* Copyright 2021 beanaccle
+ *
+ * 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"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05,    R00, R01, R02, R03, R04, R05, R06, \
+    L06, L07, L08, L09, L10, L11,    R07, R08, R09, R10, R11, R12, R13, \
+    L12, L13, L14, L15, L16, L17,    R14, R15, R16, R17, R18, R19, R20, \
+    L18, L19, L20, L21, L22, L23,    R21, R22, R23, R24, R25, R26, R27, \
+                   L24, L25, L26,    R28, R29, R30 \
+) { \
+    {   L00,   L01,   L02,   L03,   L04,   L05 }, \
+    {   L06,   L07,   L08,   L09,   L10,   L11 }, \
+    {   L12,   L13,   L14,   L15,   L16,   L17 }, \
+    {   L18,   L19,   L20,   L21,   L22,   L23 }, \
+    { KC_NO, KC_NO, KC_NO,   L24,   L25,   L26 }, \
+    {   R00,   R01,   R02,   R03,   R04,   R05,   R06 }, \
+    {   R07,   R08,   R09,   R10,   R11,   R12,   R13 }, \
+    {   R14,   R15,   R16,   R17,   R18,   R19,   R20 }, \
+    {   R21,   R22,   R23,   R24,   R25,   R26,   R27 }, \
+    {   R28,   R29,   R30, KC_NO, KC_NO, KC_NO, KC_NO } \
+}
diff --git a/keyboards/kb58/keymaps/default/keymap.c b/keyboards/kb58/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e85c7a23ca
--- /dev/null
+++ b/keyboards/kb58/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 beanaccle
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
+        KC_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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_BSLS, KC_RSFT,
+                                   KC_LOPT, KC_LGUI, KC_SPC,  KC_SPC,  MO(_FN), KC_BSPC
+    ),
+    [_FN] = LAYOUT(
+        _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,
+        _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,
+        _______, 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_CAPS, _______, KC_ESC,  KC_ESC,  _______, KC_DEL
+    )
+};
diff --git a/keyboards/kb58/readme.md b/keyboards/kb58/readme.md
new file mode 100644
index 0000000000..6d02b1787a
--- /dev/null
+++ b/keyboards/kb58/readme.md
@@ -0,0 +1,23 @@
+# KB58
+
+![kb58_pico](https://user-images.githubusercontent.com/25994266/146207912-b725e22f-92dc-4a40-9157-c2fddff45ce2.jpg)
+
+This is 58 keys keyboard.
+
+* Keyboard Maintainer: [beanaccle](https://github.com/beanaccle)
+* Hardware Supported: KB58
+* Hardware Availability: [KB58 Pico](https://github.com/beanaccle/kb58_pico)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kb58:default
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+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).
diff --git a/keyboards/kb58/rules.mk b/keyboards/kb58/rules.mk
new file mode 100644
index 0000000000..0854164fb6
--- /dev/null
+++ b/keyboards/kb58/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+SPLIT_KEYBOARD = yes        # Enables split keyboard support

From 249bc3a5c58607d71534cb538a8c76565557849a Mon Sep 17 00:00:00 2001
From: Sergey Vlasov <sigprof@gmail.com>
Date: Tue, 8 Mar 2022 06:45:30 +0300
Subject: [PATCH 761/867] [Keyboard] Add Winry315 keyboard (#15894)

---
 keyboards/winry/winry315/config.h             | 138 +++++++++
 keyboards/winry/winry315/info.json            | 104 +++++++
 .../winry/winry315/keymaps/default/keymap.c   |  79 ++++++
 .../winry/winry315/keymaps/default/readme.md  |   1 +
 .../winry315/keymaps/left_numpad/config.h     |   6 +
 .../winry315/keymaps/left_numpad/keymap.c     |  81 ++++++
 .../winry315/keymaps/left_numpad/readme.md    |   3 +
 keyboards/winry/winry315/keymaps/via/config.h |  15 +
 .../winry315/keymaps/via/encoder_actions.c    |  85 ++++++
 .../winry315/keymaps/via/encoder_actions.h    |  21 ++
 keyboards/winry/winry315/keymaps/via/keymap.c |  44 +++
 keyboards/winry/winry315/keymaps/via/rules.mk |   4 +
 keyboards/winry/winry315/readme.md            |  45 +++
 keyboards/winry/winry315/rules.mk             |  21 ++
 keyboards/winry/winry315/winry315.c           | 262 ++++++++++++++++++
 keyboards/winry/winry315/winry315.h           |  86 ++++++
 16 files changed, 995 insertions(+)
 create mode 100644 keyboards/winry/winry315/config.h
 create mode 100644 keyboards/winry/winry315/info.json
 create mode 100644 keyboards/winry/winry315/keymaps/default/keymap.c
 create mode 100644 keyboards/winry/winry315/keymaps/default/readme.md
 create mode 100644 keyboards/winry/winry315/keymaps/left_numpad/config.h
 create mode 100644 keyboards/winry/winry315/keymaps/left_numpad/keymap.c
 create mode 100644 keyboards/winry/winry315/keymaps/left_numpad/readme.md
 create mode 100644 keyboards/winry/winry315/keymaps/via/config.h
 create mode 100644 keyboards/winry/winry315/keymaps/via/encoder_actions.c
 create mode 100644 keyboards/winry/winry315/keymaps/via/encoder_actions.h
 create mode 100644 keyboards/winry/winry315/keymaps/via/keymap.c
 create mode 100644 keyboards/winry/winry315/keymaps/via/rules.mk
 create mode 100644 keyboards/winry/winry315/readme.md
 create mode 100644 keyboards/winry/winry315/rules.mk
 create mode 100644 keyboards/winry/winry315/winry315.c
 create mode 100644 keyboards/winry/winry315/winry315.h

diff --git a/keyboards/winry/winry315/config.h b/keyboards/winry/winry315/config.h
new file mode 100644
index 0000000000..1a9617c1e3
--- /dev/null
+++ b/keyboards/winry/winry315/config.h
@@ -0,0 +1,138 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+// Key matrix size.
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 24
+
+// Key pins (including encoder press switches).
+// The NO_PIN entries are reserved for encoder rotation mappings.
+#define DIRECT_PINS                                                                                                                \
+    {                                                                                                                              \
+        { F4, C7, D4, D5, D1, F5, C6, D6, D3, D2, F6, B6, D7, B4, B5, B2, D0, E6, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
+    }
+
+// clang-format off
+
+// Encoder pins.
+// Encoder numbering (assuming the default board orientation with encoders on
+// the top side):
+//   0 - left
+//   1 - center (with a longer shaft and a larger knob)
+//   2 - right
+#define ENCODERS_PAD_A { F1, B0, B3 }
+#define ENCODERS_PAD_B { F0, B1, B7 }
+#define ENCODER_RESOLUTION 4
+
+// Encoder mappings (used for VIA).
+#define ENCODERS 3
+#define ENCODERS_CW_KEY  { { 22, 0 }, { 18, 0 }, { 20, 0 } }
+#define ENCODERS_CCW_KEY { { 23, 0 }, { 19, 0 }, { 21, 0 } }
+
+// clang-format on
+
+// RGB LED parameters.
+// This PCB uses a single chain of WS2812-compatible addressable RGB LEDs for
+// per-key backlight and underglow.
+#define RGB_DI_PIN F7
+#define RGBLED_NUM 27
+#define RGBLIGHT_LIMIT_VAL 150
+
+// RGB Lighting configuration.  This mode is used by the vendor firmware, and
+// can be chosen if the full RGB Matrix support is not desired for some reason.
+#ifdef RGBLIGHT_ENABLE
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_SLEEP
+#    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
+
+// RGB Matrix configuration.
+#ifdef RGB_MATRIX_ENABLE
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
+
+#    define RGB_MATRIX_CENTER \
+        { 35, 35 }
+
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+// This option is required for the TYPING_HEATMAP and DIGITAL_RAIN effects,
+// both of which are disabled below, so the common support for those effects is
+// disabled too.
+#    undef RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+// This option is required for reactive effects; disabling this option will
+// implicitly disable all of them.
+#    define RGB_MATRIX_KEYPRESSES
+
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// The PIXEL_FRACTAL effect does not work properly when the matrix layout is
+// different from the physical layout; it also has problems when underglow
+// LEDs are present, or when multiple LEDs are associated with the same key.
+#    undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+
+// Framebuffer effects; can be enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS
+// is defined.  Both of these effects currently don't work properly when the
+// key matrix does not match the physical layout, so they are disabled.
+#    undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
+// Reactive effects; can be enabled only if at least one of
+// RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined.
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#endif
+
+// Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed.
+#define DEBOUNCE 5
diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/info.json
new file mode 100644
index 0000000000..6410c6222f
--- /dev/null
+++ b/keyboards/winry/winry315/info.json
@@ -0,0 +1,104 @@
+{
+    "manufacturer": "Winry",
+    "keyboard_name": "Winry315",
+    "maintainer": "sigprof",
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0315",
+        "vid": "0xF1F1"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_top"
+    },
+    "layouts": {
+        "LAYOUT_top": {
+            "layout": [
+                { "label": "E0", "x": 0.5,  "y": 0.25 },
+                { "label": "E1", "x": 1.75, "y": 0,   "h": 1.5, "w": 1.5 },
+                { "label": "E2", "x": 3.5,  "y": 0.25 },
+                { "label": "0",  "x": 0,    "y": 1.75 },
+                { "label": "1",  "x": 1,    "y": 1.75 },
+                { "label": "2",  "x": 2,    "y": 1.75 },
+                { "label": "3",  "x": 3,    "y": 1.75 },
+                { "label": "4",  "x": 4,    "y": 1.75 },
+                { "label": "5",  "x": 0,    "y": 2.75 },
+                { "label": "6",  "x": 1,    "y": 2.75 },
+                { "label": "7",  "x": 2,    "y": 2.75 },
+                { "label": "8",  "x": 3,    "y": 2.75 },
+                { "label": "9",  "x": 4,    "y": 2.75 },
+                { "label": "10", "x": 0,    "y": 3.75 },
+                { "label": "11", "x": 1,    "y": 3.75 },
+                { "label": "12", "x": 2,    "y": 3.75 },
+                { "label": "13", "x": 3,    "y": 3.75 },
+                { "label": "14", "x": 4,    "y": 3.75 }
+            ]
+        },
+        "LAYOUT_left": {
+            "layout": [
+                { "label": "E2", "x": 0.25, "y": 0.5  },
+                { "label": "4",  "x": 1.75, "y": 0    },
+                { "label": "9",  "x": 2.75, "y": 0    },
+                { "label": "14", "x": 3.75, "y": 0    },
+                { "label": "3",  "x": 1.75, "y": 1    },
+                { "label": "8",  "x": 2.75, "y": 1    },
+                { "label": "13", "x": 3.75, "y": 1    },
+                { "label": "E1", "x": 0,    "y": 1.75, "h": 1.5, "w": 1.5 },
+                { "label": "2",  "x": 1.75, "y": 2    },
+                { "label": "7",  "x": 2.75, "y": 2    },
+                { "label": "12", "x": 3.75, "y": 2    },
+                { "label": "1",  "x": 1.75, "y": 3    },
+                { "label": "6",  "x": 2.75, "y": 3    },
+                { "label": "11", "x": 3.75, "y": 3    },
+                { "label": "E0", "x": 0.25, "y": 3.5  },
+                { "label": "0",  "x": 1.75, "y": 4    },
+                { "label": "5",  "x": 2.75, "y": 4    },
+                { "label": "10", "x": 3.75, "y": 4    }
+            ]
+        },
+        "LAYOUT_right": {
+            "layout": [
+                { "label": "10", "x": 0,    "y": 0    },
+                { "label": "5",  "x": 1,    "y": 0    },
+                { "label": "0",  "x": 2,    "y": 0    },
+                { "label": "E0", "x": 3.5,  "y": 0.5  },
+                { "label": "11", "x": 0,    "y": 1    },
+                { "label": "6",  "x": 1,    "y": 1    },
+                { "label": "1",  "x": 2,    "y": 1    },
+                { "label": "12", "x": 0,    "y": 2    },
+                { "label": "7",  "x": 1,    "y": 2    },
+                { "label": "2",  "x": 2,    "y": 2    },
+                { "label": "E1", "x": 3.25, "y": 1.75, "h": 1.5, "w": 1.5 },
+                { "label": "13", "x": 0,    "y": 3    },
+                { "label": "8",  "x": 1,    "y": 3    },
+                { "label": "3",  "x": 2,    "y": 3    },
+                { "label": "14", "x": 0,    "y": 4    },
+                { "label": "9",  "x": 1,    "y": 4    },
+                { "label": "4",  "x": 2,    "y": 4    },
+                { "label": "E2", "x": 3.5,  "y": 3.5  }
+            ]
+        },
+        "LAYOUT_bottom": {
+            "layout": [
+                { "label": "14", "x": 0,    "y": 0    },
+                { "label": "13", "x": 1,    "y": 0    },
+                { "label": "12", "x": 2,    "y": 0    },
+                { "label": "11", "x": 3,    "y": 0    },
+                { "label": "10", "x": 4,    "y": 0    },
+                { "label": "9",  "x": 0,    "y": 1    },
+                { "label": "8",  "x": 1,    "y": 1    },
+                { "label": "7",  "x": 2,    "y": 1    },
+                { "label": "6",  "x": 3,    "y": 1    },
+                { "label": "5",  "x": 4,    "y": 1    },
+                { "label": "4",  "x": 0,    "y": 2    },
+                { "label": "3",  "x": 1,    "y": 2    },
+                { "label": "2",  "x": 2,    "y": 2    },
+                { "label": "1",  "x": 3,    "y": 2    },
+                { "label": "0",  "x": 4,    "y": 2    },
+                { "label": "E2", "x": 0.5,  "y": 3.5  },
+                { "label": "E1", "x": 1.75, "y": 3.25, "h": 1.5, "w": 1.5 },
+                { "label": "E0", "x": 3.5,  "y": 3.5  }
+            ]
+        }
+    }
+}
diff --git a/keyboards/winry/winry315/keymaps/default/keymap.c b/keyboards/winry/winry315/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a0bc2706ca
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _RGB,
+};
+
+// Shorter defines for some QMK keycodes (to keep the keymap aligned)
+#define U_LTESC LT(_RGB, KC_ESC)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // Base
+    [_BASE] = LAYOUT_top(
+            KC_HOME,      KC_MUTE,     KC_MPLY,
+        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+        U_LTESC, KC_TAB,  KC_SPC,  KC_BSPC, KC_ENT
+    ),
+
+    // RGB configuration
+    [_RGB] = LAYOUT_top(
+            RGB_M_P,      RGB_M_B,     RGB_M_R,
+        RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,
+        RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,
+        KC_TRNS, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R
+    ),
+};
+// clang-format on
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    uint8_t layer = get_highest_layer(layer_state | default_layer_state);
+
+    switch (index) {
+        case 0:
+            // Left encoder
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_hue();
+                } else {
+                    rgblight_decrease_hue();
+                }
+            } else {
+                tap_code(clockwise ? KC_PGDN : KC_PGUP);
+            }
+            break;
+
+        case 1:
+            // Center encoder
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_sat();
+                } else {
+                    rgblight_decrease_sat();
+                }
+            } else {
+                tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, 10);
+            }
+            break;
+
+        case 2:
+            // Right encoder
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_val();
+                } else {
+                    rgblight_decrease_val();
+                }
+            } else {
+                tap_code_delay(clockwise ? KC_MNXT : KC_MPRV, 10);
+            }
+            break;
+    }
+    return false;
+}
diff --git a/keyboards/winry/winry315/keymaps/default/readme.md b/keyboards/winry/winry315/keymaps/default/readme.md
new file mode 100644
index 0000000000..685bea5767
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Winry315
diff --git a/keyboards/winry/winry315/keymaps/left_numpad/config.h b/keyboards/winry/winry315/keymaps/left_numpad/config.h
new file mode 100644
index 0000000000..acb72b5bb4
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/left_numpad/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_LEFT
diff --git a/keyboards/winry/winry315/keymaps/left_numpad/keymap.c b/keyboards/winry/winry315/keymaps/left_numpad/keymap.c
new file mode 100644
index 0000000000..8864b1b45a
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/left_numpad/keymap.c
@@ -0,0 +1,81 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _RGB,
+};
+
+// Shorter defines for some QMK keycodes (to keep the keymap aligned)
+#define U_LTESC LT(_RGB, KC_ESC)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_left(
+        KC_MPLY,    U_LTESC, KC_BSPC, KC_PENT,
+                    KC_P7,   KC_P8,   KC_P9,
+        KC_MUTE,    KC_P4,   KC_P5,   KC_P6,
+                    KC_P1,   KC_P2,   KC_P3,
+        KC_HOME,    KC_P0,   KC_P0,   KC_PDOT
+    ),
+
+    /* RGB configuration */
+    [_RGB] = LAYOUT_left(
+        RGB_M_R,    KC_TRNS, RGB_SPD, RGB_SPI,
+                    RGB_TOG, RGB_HUD, RGB_HUI,
+        RGB_M_B,    RGB_M_P, RGB_SAD, RGB_SAI,
+                    KC_NO,   RGB_VAD, RGB_VAI,
+        RGB_M_P,    KC_NLCK, RGB_RMOD,RGB_MOD
+    ),
+};
+// clang-format on
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    uint8_t layer = get_highest_layer(layer_state | default_layer_state);
+
+    switch (index) {
+        case 0:
+            // Bottom encoder (left in the default orientation)
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_val();
+                } else {
+                    rgblight_decrease_val();
+                }
+            } else {
+                tap_code(clockwise ? KC_PGDN : KC_PGUP);
+            }
+            break;
+
+        case 1:
+            // Center encoder
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_sat();
+                } else {
+                    rgblight_decrease_sat();
+                }
+            } else {
+                tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, 10);
+            }
+            break;
+
+        case 2:
+            // Top encoder (right in the default orientation)
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_hue();
+                } else {
+                    rgblight_decrease_hue();
+                }
+            } else {
+                tap_code_delay(clockwise ? KC_MNXT : KC_MPRV, 10);
+            }
+            break;
+    }
+    return false;
+}
diff --git a/keyboards/winry/winry315/keymaps/left_numpad/readme.md b/keyboards/winry/winry315/keymaps/left_numpad/readme.md
new file mode 100644
index 0000000000..9562c2fc19
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/left_numpad/readme.md
@@ -0,0 +1,3 @@
+# The “Left Numpad” keymap for Winry315
+
+This is a keymap example for the Winry315 board in the “left” orientation (the board is rotated so that the encoders are on the left side, and the keys are in 5 rows of 3 keys).  The `LAYOUT_left` macro is used for this orientation, and `WINRY315_DEFAULT_ORIENTATION` is redefined in `config.h` to change the behavior of RGB Matrix effects.
diff --git a/keyboards/winry/winry315/keymaps/via/config.h b/keyboards/winry/winry315/keymaps/via/config.h
new file mode 100644
index 0000000000..5fc0e02531
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/config.h
@@ -0,0 +1,15 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
+
+// Enable a limited form of RGB Matrix support in VIA (requires redefining the
+// effect list in the VIA JSON, which then becomes not 100% compatible with the
+// RGBLIGHT firmwares).
+#define VIA_QMK_RGBLIGHT_ENABLE
+
+// Enable the workaround for the speed parameter mismatch between RGBLIGHT and
+// RGB Matrix, so that the speed slider in VIA behaves in a more useful way.
+#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/winry/winry315/keymaps/via/encoder_actions.c b/keyboards/winry/winry315/keymaps/via/encoder_actions.c
new file mode 100644
index 0000000000..96dfe74bca
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/encoder_actions.c
@@ -0,0 +1,85 @@
+/* Copyright 2020 Neil Brian Ramirez
+ * Copyright 2021 drashna jael're (@drashna)
+ * Copyright 2022 Sergey Vlasov (@sigprof)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "encoder_actions.h"
+
+#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+
+#    ifndef ENCODER_TAP_DURATION_MS
+#        define ENCODER_TAP_DURATION_MS 10
+#    endif
+
+#    define ENCODER_STATE_CW 0x01
+#    define ENCODER_STATE_CCW 0x02
+
+#    ifdef ENCODERS
+static uint8_t  encoder_state[ENCODERS] = {0};
+static uint16_t encoder_timer[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[ENCODERS]   = ENCODERS_CCW_KEY;
+
+static void exec_encoder_action(uint8_t index, bool clockwise, bool pressed) {
+    // clang-format off
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = pressed,
+        .time = (timer_read() | 1)
+    };
+    // clang-format on
+    action_exec(encoder_event);
+}
+#    endif
+
+void encoder_action_unregister(void) {
+#    ifdef ENCODERS
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index] && (timer_elapsed(encoder_timer[index]) >= ENCODER_TAP_DURATION_MS)) {
+            bool clockwise       = !!(encoder_state[index] & ENCODER_STATE_CW);
+            encoder_state[index] = 0;
+            exec_encoder_action(index, clockwise, false);
+        }
+    }
+#    endif
+}
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+#    ifdef ENCODERS
+    if (encoder_state[index]) {
+        bool was_clockwise   = !!(encoder_state[index] & ENCODER_STATE_CW);
+        encoder_state[index] = 0;
+        exec_encoder_action(index, was_clockwise, false);
+    }
+    encoder_state[index] = clockwise ? ENCODER_STATE_CW : ENCODER_STATE_CCW;
+    encoder_timer[index] = timer_read();
+    exec_encoder_action(index, clockwise, true);
+#    endif
+}
+
+void matrix_scan_kb(void) {
+    encoder_action_unregister();
+    matrix_scan_user();
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    // don't return user actions, because they are in the keymap
+    // encoder_update_user(index, clockwise);
+    return true;
+};
+
+#endif
diff --git a/keyboards/winry/winry315/keymaps/via/encoder_actions.h b/keyboards/winry/winry315/keymaps/via/encoder_actions.h
new file mode 100644
index 0000000000..2484af52ae
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/encoder_actions.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Neil Brian Ramirez
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+void encoder_action_unregister(void);
+
+void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/winry/winry315/keymaps/via/keymap.c b/keyboards/winry/winry315/keymaps/via/keymap.c
new file mode 100644
index 0000000000..67598ac337
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+#define LAYOUT_via(             \
+      k17,     k15,    k16,     \
+    k23,k22, k19,k18, k21,k20,  \
+     k00, k01, k02, k03, k04,   \
+     k05, k06, k07, k08, k09,   \
+     k10, k11, k12, k13, k14    \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23 } \
+}
+
+#define U_LTESC LT(1, KC_ESC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_via(
+            KC_HOME,           KC_MUTE,           KC_MPLY,
+        KC_PGUP, KC_PGDN,  KC_VOLD, KC_VOLU,  KC_MPRV, KC_MNXT,
+             KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+             U_LTESC, KC_TAB,  KC_SPC,  KC_BSPC, KC_ENT
+    ),
+    [1] = LAYOUT_via(
+            RGB_M_P,           RGB_M_B,           RGB_M_R,
+        RGB_HUD, RGB_HUI,  RGB_SAD, RGB_SAI,  RGB_VAD, RGB_VAI,
+             RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,
+             RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,
+             KC_TRNS, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R
+    ),
+    [2 ... 7] = LAYOUT_via(
+            KC_TRNS,           KC_TRNS,           KC_TRNS,
+        KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
+
+// clang-format on
diff --git a/keyboards/winry/winry315/keymaps/via/rules.mk b/keyboards/winry/winry315/keymaps/via/rules.mk
new file mode 100644
index 0000000000..6098ef3ad8
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
+SRC += encoder_actions.c
diff --git a/keyboards/winry/winry315/readme.md b/keyboards/winry/winry315/readme.md
new file mode 100644
index 0000000000..099e6b42b4
--- /dev/null
+++ b/keyboards/winry/winry315/readme.md
@@ -0,0 +1,45 @@
+# Winry315
+
+![Winry315](https://i.imgur.com/nWE5mbXh.jpeg)
+
+Winry315 is a macropad with 3 rotary encoders and 15 keys (arranged as 3 rows of 5 keys).
+
+This board may also be known as “YD3xn15mx”, “YD315” or “YD 3x15m”.  Boards sold by the [SpiderIsland shop on AliExpress](https://www.aliexpress.com/store/5241107) may have “DEBROGLIE” on the bottom side of the case.
+
+More photos can be found [in this Imgur album](https://imgur.com/a/0xf9pju).
+
+* Keyboard Maintainer: [Sergey Vlasov](https://github.com/sigprof)
+* Hardware Supported: Winry315 PCB
+* Hardware Availability: [Taobao](https://world.taobao.com/item/657924681898.htm), [AliExpress](https://www.aliexpress.com/item/1005003500083583.html)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make winry/winry315:default
+
+Flashing example for this keyboard:
+
+    make winry/winry315:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key (not the encoder) and plug in the keyboard.  This apparently also works with the vendor VIA firmware.
+  * Note that the bootmagic key does not change with the board orientation configured using `WINRY315_DEFAULT_ORIENTATION` — the “top left” key position in the default orientation (encoders on the top side) is always used.
+* **Physical reset button**: Briefly press the button on the back of the PCB (the acrylic bottom cover should have a hole to access that button).
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available (the default keymap does not have that keycode assigned to any key, but you can use that keycode in your custom keymap if you want to have easier access to the bootloader).
+
+## Orientation
+
+Although the normal orientation of this macropad is with the encoders on the “top” side (away from the user), you may prefer using it in a sideways orientation (with the encoders on the left or right side).  There are extra layout macros (`LAYOUT_left`, `LAYOUT_right` and even `LAYOUT_bottom` for completeness) which you can use in the keymap; however, just using one of those macros won't change the behavior of RGB Matrix effects.  If you want to change the orientation of various RGB Matrix effects too, you can specify the desired orientation in the `config.h` file for your custom keymap by using one of the following defines:
+
+    #define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_TOP
+    #define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_LEFT
+    #define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_RIGHT
+    #define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_BOTTOM
+
+The VIA firmware changes the orientation for RGB Matrix effects automatically when the “Encoder Side” layout option is changed.
+
+Note that stems of MX switches are not symmetrical with respect to 90° rotation, so you may have some difficulties when putting the keycaps on switches if you choose one of sideways orientations.
diff --git a/keyboards/winry/winry315/rules.mk b/keyboards/winry/winry315/rules.mk
new file mode 100644
index 0000000000..c10a9d570a
--- /dev/null
+++ b/keyboards/winry/winry315/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/winry/winry315/winry315.c b/keyboards/winry/winry315/winry315.c
new file mode 100644
index 0000000000..c741ffeb74
--- /dev/null
+++ b/keyboards/winry/winry315/winry315.c
@@ -0,0 +1,262 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "winry315.h"
+
+#include "via.h"
+
+#if !defined(WINRY315_DEFAULT_ORIENTATION)
+#    define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_TOP
+#endif
+
+#if !defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+#    ifndef MEDIA_KEY_DELAY
+#        define MEDIA_KEY_DELAY 10
+#    endif
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    if (index == 0) {
+        // Left encoder (assuming the default "top" orientation)
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    } else if (index == 1) {
+        // Center encoder
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+        } else {
+            tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+        }
+    } else if (index == 2) {
+        // Right encoder
+        if (clockwise) {
+            tap_code_delay(KC_MNXT, MEDIA_KEY_DELAY);
+        } else {
+            tap_code_delay(KC_MPRV, MEDIA_KEY_DELAY);
+        }
+    }
+    return true;
+}
+#endif // !defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+
+#if defined(RGB_MATRIX_ENABLE)
+
+// LED mapping (assuming the default "top" orientation):
+//   0 - right encoder, top right
+//   1 - right encoder, top left
+//   2 - center encoder, top right
+//   3 - center encoder, top left
+//   4 - left encoder, top right
+//   5 - left encoder, top left
+//   6 - row 0, column 0
+//   7 - row 1, column 0
+//   8 - row 2, column 0
+//   9 - row 2, column 1
+//  10 - row 1, column 1
+//  11 - row 0, column 1
+//  12 - row 0, column 2
+//  13 - row 1, column 2
+//  14 - row 2, column 2
+//  15 - row 2, column 3
+//  16 - row 1, column 3
+//  17 - row 0, column 3
+//  18 - row 0, column 4
+//  19 - row 1, column 4
+//  20 - row 2, column 4
+//  21 - underglow, right bottom
+//  22 - underglow, left bottom
+//  23 - underglow, left middle
+//  24 - underglow, left top
+//  25 - underglow, right top
+//  26 - underglow, right middle
+
+#    define X_MM_MIN (-42)
+#    define X_MM_MAX 42
+#    define Y_MM_MIN (-40) // actually -35, but adjusted to get height = width
+#    define Y_MM_MAX 44    // actually 40, but adjusted to get height = width
+#    define WIDTH_MM (X_MM_MAX - X_MM_MIN)
+#    define HEIGHT_MM (Y_MM_MAX - Y_MM_MIN)
+#    define WIDTH_UNITS (35 * 2)  // needs to match RGB_MATRIX_CENTER
+#    define HEIGHT_UNITS (35 * 2) // needs to match RGB_MATRIX_CENTER
+
+// Convert the LED physical coordinates from millimeters with the origin at the
+// PCB center to the form expected by the RGB Matrix code.
+#    define LED(x_mm, y_mm) \
+        { ((x_mm - X_MM_MIN) * WIDTH_UNITS + WIDTH_MM / 2) / WIDTH_MM, ((Y_MM_MAX - y_mm) * HEIGHT_UNITS + HEIGHT_MM / 2) / HEIGHT_MM }
+
+// clang-format off
+static const led_config_t PROGMEM initial_led_config = {
+    {
+        { 6, 11, 12, 17, 18, 7, 10, 13, 16, 19, 8, 9, 14, 15, 20, 2, 0, 4, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }
+    },
+    {
+        LED( 35,  36),
+        LED( 21,  36),
+        LED( 8,   34),
+        LED(-8,   34),
+        LED(-21,  36),
+        LED(-35,  36),
+        LED(-38,   5),
+        LED(-38, -14),
+        LED(-38, -33),
+        LED(-19, -33),
+        LED(-19, -14),
+        LED(-19,   5),
+        LED(  0,   5),
+        LED(  0, -14),
+        LED(  0, -33),
+        LED( 19, -33),
+        LED( 19, -14),
+        LED( 19,   5),
+        LED( 38,   5),
+        LED( 38, -14),
+        LED( 38, -33),
+        LED( 28, -35),
+        LED(-28, -35),
+        LED(-37,  -9),
+        LED(-42,  40),
+        LED( 42,  40),
+        LED( 37,  -9)
+    },
+    {
+        1, 1, 1, 1, 1, 1,                               // encoders (colored as modifiers)
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    // regular keys
+        2, 2, 2, 2, 2, 2                                // underglow
+    }
+};
+// clang-format on
+
+led_config_t g_led_config;
+
+void keyboard_pre_init_kb(void) {
+    // To be safe against any possible changes to rgb_matrix_init(),
+    // g_led_config should be initialized before rgb_matrix_init() is called;
+    // matrix_init_kb() would be too late, so keyboard_pre_init_kb() is used.
+    memcpy_P(&g_led_config, &initial_led_config, sizeof(g_led_config));
+    winry315_set_orientation(WINRY315_DEFAULT_ORIENTATION);
+
+    keyboard_pre_init_user();
+}
+
+// Encoders have two associated LEDs on this board; supporting more than one
+// LED per key requires defining rgb_matrix_map_row_column_to_led_kb() to
+// report any extra LEDs.
+uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) {
+    if (row == 0) {
+        switch (column) {
+            case 15: // center encoder
+                led_i[0] = 3;
+                return 1;
+
+            case 16: // right encoder
+                led_i[0] = 1;
+                return 1;
+
+            case 17: // left encoder
+                led_i[0] = 5;
+                return 1;
+        }
+    }
+    return 0;
+}
+
+#    if defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
+
+// VIA supports only 4 discrete values for effect speed; map these to some
+// useful speed values for RGB Matrix.
+enum speed_values {
+    RGBLIGHT_SPEED_0 = UINT8_MAX / 16, // not 0 to avoid really slow effects
+    RGBLIGHT_SPEED_1 = UINT8_MAX / 4,
+    RGBLIGHT_SPEED_2 = UINT8_MAX / 2,     // matches the default value
+    RGBLIGHT_SPEED_3 = UINT8_MAX / 4 * 3, // UINT8_MAX is really fast
+};
+
+static uint8_t speed_from_rgblight(uint8_t rgblight_speed) {
+    switch (rgblight_speed) {
+        case 0:
+            return RGBLIGHT_SPEED_0;
+        case 1:
+            return RGBLIGHT_SPEED_1;
+        case 2:
+        default:
+            return RGBLIGHT_SPEED_2;
+        case 3:
+            return RGBLIGHT_SPEED_3;
+    }
+}
+
+static uint8_t speed_to_rgblight(uint8_t rgb_matrix_speed) {
+    if (rgb_matrix_speed < ((RGBLIGHT_SPEED_0 + RGBLIGHT_SPEED_1) / 2)) {
+        return 0;
+    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_1 + RGBLIGHT_SPEED_2) / 2)) {
+        return 1;
+    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_2 + RGBLIGHT_SPEED_3) / 2)) {
+        return 2;
+    } else {
+        return 3;
+    }
+}
+
+void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
+    switch (data[0]) {
+        case id_lighting_get_value:
+            if (data[1] == id_qmk_rgblight_effect_speed) {
+                data[2] = speed_to_rgblight(rgb_matrix_get_speed());
+            }
+            break;
+        case id_lighting_set_value:
+            if (data[1] == id_qmk_rgblight_effect_speed) {
+                rgb_matrix_set_speed_noeeprom(speed_from_rgblight(data[2]));
+            }
+            break;
+    }
+}
+
+#    endif // defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
+
+#endif // defined(RGB_MATRIX_ENABLE)
+
+void winry315_set_orientation(uint8_t orientation) {
+    (void)orientation;
+#if defined(RGB_MATRIX_ENABLE)
+    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+        led_point_t *      dst_point = &g_led_config.point[i];
+        const led_point_t *src_point = &initial_led_config.point[i];
+        uint8_t            x         = pgm_read_byte(&src_point->x);
+        uint8_t            y         = pgm_read_byte(&src_point->y);
+
+        switch (orientation) {
+            case WINRY315_ORIENTATION_TOP:
+            default:
+                dst_point->x = x;
+                dst_point->y = y;
+                break;
+
+            case WINRY315_ORIENTATION_LEFT:
+                dst_point->x = y;
+                dst_point->y = WIDTH_UNITS - x;
+                break;
+
+            case WINRY315_ORIENTATION_RIGHT:
+                dst_point->x = HEIGHT_UNITS - y;
+                dst_point->y = x;
+                break;
+
+            case WINRY315_ORIENTATION_BOTTOM:
+                dst_point->x = WIDTH_UNITS - x;
+                dst_point->y = HEIGHT_UNITS - y;
+                break;
+        }
+    }
+#endif // defined(RGB_MATRIX_ENABLE)
+}
+
+#if defined(VIA_ENABLE)
+void via_set_layout_options_kb(uint32_t value) {
+    winry315_set_orientation(value & 0x03);
+}
+#endif // defined(VIA_ENABLE)
diff --git a/keyboards/winry/winry315/winry315.h b/keyboards/winry/winry315/winry315.h
new file mode 100644
index 0000000000..4796089003
--- /dev/null
+++ b/keyboards/winry/winry315/winry315.h
@@ -0,0 +1,86 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+// Supported orientations of the board.  The enum values must match the layout
+// option values used by VIA.
+enum winry315_orientation {
+    WINRY315_ORIENTATION_TOP,   // Encoders at the top side (default)
+    WINRY315_ORIENTATION_LEFT,  // Encoders at the left side
+    WINRY315_ORIENTATION_RIGHT, // Encoders at the right side
+    WINRY315_ORIENTATION_BOTTOM // Encoders at the bottom side
+};
+
+// Set the orientation of the board (changes the RGB Matrix effect behavior to
+// match the new orientation).
+//
+// This function is intended to be used in the `via` keymap, where the board
+// orientation is configured dynamically using a VIA layout option.  If you are
+// making a custom keymap for one specific orientation, it is better to set the
+// orientation in config.h (e.g., `#define WINRY315_DEFAULT_ORIENTATION
+// WINRY315_ORIENTATION_LEFT`) instead of adding custom code that calls this
+// function.
+void winry315_set_orientation(uint8_t orientation);
+
+// clang-format off
+
+// This is a shortcut to help you visually see your layout.
+//
+// The first section contains all of the arguments representing the physical
+// layout of the board and position of the keys.
+//
+// The second converts the arguments into a two-dimensional array which
+// represents the switch matrix.
+//
+// For this board multiple layouts are defined to make it easier to use the
+// board in a sideways orientation; the actual PCB supports only a single
+// layout (LAYOUT_top).
+
+// Default layout: encoders at the top side (WINRY315_ORIENTATION_TOP).
+#define LAYOUT_top(             \
+      k17,    k15,   k16,       \
+    k00, k01, k02, k03, k04,    \
+    k05, k06, k07, k08, k09,    \
+    k10, k11, k12, k13, k14     \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
+}
+
+// Encoders at the left side (WINRY315_ORIENTATION_LEFT).
+#define LAYOUT_left(            \
+    k16,    k04, k09, k14,      \
+            k03, k08, k13,      \
+    k15,    k02, k07, k12,      \
+            k01, k06, k11,      \
+    k17,    k00, k05, k10       \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
+}
+
+// Encoders at the right side (WINRY315_ORIENTATION_RIGHT).
+#define LAYOUT_right(           \
+    k10, k05, k00,    k17,      \
+    k11, k06, k01,              \
+    k12, k07, k02,    k15,      \
+    k13, k08, k03,              \
+    k14, k09, k04,    k16       \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
+}
+
+// Encoders at the bottom side (WINRY315_ORIENTATION_BOTTOM).
+#define LAYOUT_bottom(          \
+    k14, k13, k12, k11, k10,    \
+    k09, k08, k07, k06, k05,    \
+    k04, k03, k02, k01, k00,    \
+      k16,    k15,   k17        \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
+}
+
+#define LAYOUT_all LAYOUT_top
+
+// clang-format on

From eb35f58a6ec9068329a39e3ef8449568e90931e9 Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 8 Mar 2022 11:45:54 +0800
Subject: [PATCH 762/867] [Keyboard] Idobao ID87 v2 (#15875)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/idobao/id87/v2/config.h             | 163 ++++++++++++++++++
 keyboards/idobao/id87/v2/info.json            |  98 +++++++++++
 .../idobao/id87/v2/keymaps/default/keymap.c   |  35 ++++
 .../idobao/id87/v2/keymaps/default/readme.md  |   1 +
 keyboards/idobao/id87/v2/keymaps/via/keymap.c |  50 ++++++
 keyboards/idobao/id87/v2/keymaps/via/rules.mk |   2 +
 keyboards/idobao/id87/v2/readme.md            |  27 +++
 keyboards/idobao/id87/v2/rules.mk             |  22 +++
 keyboards/idobao/id87/v2/v2.c                 |  45 +++++
 keyboards/idobao/id87/v2/v2.h                 |  40 +++++
 10 files changed, 483 insertions(+)
 create mode 100644 keyboards/idobao/id87/v2/config.h
 create mode 100644 keyboards/idobao/id87/v2/info.json
 create mode 100644 keyboards/idobao/id87/v2/keymaps/default/keymap.c
 create mode 100644 keyboards/idobao/id87/v2/keymaps/default/readme.md
 create mode 100644 keyboards/idobao/id87/v2/keymaps/via/keymap.c
 create mode 100644 keyboards/idobao/id87/v2/keymaps/via/rules.mk
 create mode 100644 keyboards/idobao/id87/v2/readme.md
 create mode 100644 keyboards/idobao/id87/v2/rules.mk
 create mode 100644 keyboards/idobao/id87/v2/v2.c
 create mode 100644 keyboards/idobao/id87/v2/v2.h

diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h
new file mode 100644
index 0000000000..8a2c58aa2d
--- /dev/null
+++ b/keyboards/idobao/id87/v2/config.h
@@ -0,0 +1,163 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6964   // "id"
+#define PRODUCT_ID      0x0087
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    IDOBAO
+#define PRODUCT         ID87
+
+/* key matrix size */
+#define MATRIX_ROWS 11
+#define MATRIX_COLS 9
+
+/*
+ * 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 { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
+
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+//#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+#define LED_CAPS_LOCK_PIN C7
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN E2
+#    define DRIVER_LED_TOTAL 103 /* 16 Bottom 87 top*/
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 103 /* 16 Bottom 87 top*/
+#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#endif
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define RGB_MATRIX_KEYPRESSES
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
+
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json
new file mode 100644
index 0000000000..e4e252aa64
--- /dev/null
+++ b/keyboards/idobao/id87/v2/info.json
@@ -0,0 +1,98 @@
+{
+    "keyboard_name": "ID87",
+    "url": "https://www.idobao.net/products/idobao-id87-80-hot-swappable-mechanical-keyboard-kit",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":2, "y":0},
+                {"label":"F2", "x":3, "y":0},
+                {"label":"F3", "x":4, "y":0},
+                {"label":"F4", "x":5, "y":0},
+                {"label":"F5", "x":6.5, "y":0},
+                {"label":"F6", "x":7.5, "y":0},
+                {"label":"F7", "x":8.5, "y":0},
+                {"label":"F8", "x":9.5, "y":0},
+                {"label":"F9", "x":11, "y":0},
+                {"label":"F10", "x":12, "y":0},
+                {"label":"F11", "x":13, "y":0},
+                {"label":"F12", "x":14, "y":0},
+                {"label":"PrtSc", "x":15.25, "y":0},
+                {"label":"Scroll Lock", "x":16.25, "y":0},
+                {"label":"Pause", "x":17.25, "y":0},
+                {"label":"~", "x":0, "y":1.5},
+                {"label":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"-", "x":11, "y":1.5},
+                {"label":"=", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"PgUp", "x":17.25, "y":1.5},
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[", "x":11.5, "y":2.5},
+                {"label":"]", "x":12.5, "y":2.5},
+                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";", "x":10.75, "y":3.5},
+                {"label":"'", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",", "x":9.25, "y":4.5},
+                {"label":".", "x":10.25, "y":4.5},
+                {"label":"/", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"Up", "x":16.25, "y":4.5},
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
+                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"LT(1, KC_APP)", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"Left", "x":15.25, "y":5.5},
+                {"label":"Down", "x":16.25, "y":5.5},
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id87/v2/keymaps/default/keymap.c b/keyboards/idobao/id87/v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2b07bdb0ec
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2020 Tybera
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_tkl_ansi(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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,   KC_RGUI,   LT(1, KC_APP),     KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_ansi(
+        RESET,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, RGB_HUI, _______,
+        _______,     BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        RGB_VAI, RGB_SAI, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                            BL_INC,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      BL_INC,  BL_DEC, RGB_MOD
+    ),
+
+};
diff --git a/keyboards/idobao/id87/v2/keymaps/default/readme.md b/keyboards/idobao/id87/v2/keymaps/default/readme.md
new file mode 100644
index 0000000000..6054431de4
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for id87
\ No newline at end of file
diff --git a/keyboards/idobao/id87/v2/keymaps/via/keymap.c b/keyboards/idobao/id87/v2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..534784555c
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 Tybera
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT_tkl_ansi(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,            KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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,   KC_RGUI,   LT(1, KC_APP),     KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_ansi(
+        RESET,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, RGB_HUI, _______,
+        _______,     BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        RGB_VAI, RGB_SAI, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                            BL_INC,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      BL_INC,  BL_DEC, RGB_MOD
+    ),
+	[2] = LAYOUT_tkl_ansi(
+        _______,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______,  _______, _______
+                ),
+	[3] = LAYOUT_tkl_ansi(
+                _______,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______,  _______, _______
+                ),
+};
diff --git a/keyboards/idobao/id87/v2/keymaps/via/rules.mk b/keyboards/idobao/id87/v2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..ca9fed0e6b
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/idobao/id87/v2/readme.md b/keyboards/idobao/id87/v2/readme.md
new file mode 100644
index 0000000000..06a3f2c08a
--- /dev/null
+++ b/keyboards/idobao/id87/v2/readme.md
@@ -0,0 +1,27 @@
+# ID87 v2
+
+![ID87 v2](https://i.imgur.com/woTSycN.jpg)
+
+A TKL keyboard with hotswap sockets and in switch RGB.
+
+* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
+* Hardware Supported: ID87 v2
+* Hardware Availability: [Drop](https://drop.com/buy/idobao-id87-v2-tkl-mechanical-keyboard-kit), [idobao](https://idobao.net/products/idobao-id87-v2-tkl-pcb-mounted-hot-swappable-mechanical-keyboard-kit)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make idobao/id87/v2:default
+
+Flashing example for this keyboard:
+
+    make idobao/id87/v2:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/idobao/id87/v2/rules.mk b/keyboards/idobao/id87/v2/rules.mk
new file mode 100644
index 0000000000..1d519258e3
--- /dev/null
+++ b/keyboards/idobao/id87/v2/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE =  no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+LAYOUTS = tkl_ansi
diff --git a/keyboards/idobao/id87/v2/v2.c b/keyboards/idobao/id87/v2/v2.c
new file mode 100644
index 0000000000..5bca630ca3
--- /dev/null
+++ b/keyboards/idobao/id87/v2/v2.c
@@ -0,0 +1,45 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "v2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    { 102,   NO_LED,   101,   100,   99,   98,   97,   96,   95   }, //0
+    { 70,   71,   72,   73,   74,   75,   76,   77,   78   }, //1
+    { 69,   68,   67,   66,   65,   64,   63,   62,   61   }, //2
+    { 40,   41,   42,   43,   44,   45,   46,   47,   48   }, //3
+    { 39,   NO_LED,   38,   37,   36,   35,   34,   33,   32   }, //4
+    { 16,   17,   18,   23,   22,   NO_LED,   19,   21,   20   }, //5
+    { NO_LED,   87,   88,   90,   91,   92,   89,   93,   94   }, //6
+    { 80,   86,   85,   83,   NO_LED,   82,   84,   81,   79   }, //7
+    { NO_LED,   53,   54,   56,   57,   58,   55,   59,   60   }, //8
+    { NO_LED,   NO_LED,   27,   52,   NO_LED,   51,   NO_LED,   50,   49   }, //9
+    { NO_LED,   26,   25,   NO_LED,   28,   29,   24,   30,   31   } //A
+}, {
+    // LED Index to Physical Position
+    {  13,  51 },{ 40,  51},{ 73,  51},{ 108,  51},{ 141,  51},{ 174,  51},{ 207,  51},
+    { 207,  32},
+    { 207,  13},{ 174,  13},{ 141,  13},{ 108,  13},{ 73,  13},{ 40,  13},{ 13,  13},
+    { 13,  32},
+
+{   8,  59 }, {  23,  59 }, {  38,  59 }, {  83,  59 }, { 129,  59 }, { 144,  59 }, { 159,  59 }, { 174,  59 }, { 193,  59 }, { 205,  59 }, { 217,  59 },
+{ 205,  49 }, { 165,  49 }, { 142,  49 }, { 130,  49 }, { 118,  49 }, { 106,  49 }, {  94,  49 }, {  82,  49 }, {  70,  49 }, {  58,  49 }, {  46,  49 }, {  34,  49 }, {  14,  49 },
+{  11,  39 }, {  28,  39 }, {  40,  39 }, {  52,  39 }, {  64,  39 }, {  76,  39 }, {  88,  39 }, { 100,  39 }, { 112,  39 }, { 124,  39 }, { 136,  39 }, { 148,  39 }, { 168,  39 },
+{ 217,  30 }, { 205,  30 }, { 193,  30 }, { 172,  30 }, { 157,  30 }, { 145,  30 }, { 133,  30 }, { 121,  30 }, { 109,  30 }, {  97,  30 }, {  85,  30 }, {  73,  30 }, {  61,  30 }, {  49,  30 }, {  37,  30 }, {  25,  30 }, {  10,  30 },
+{   7,  20 }, {  19,  20 }, {  31,  20 }, {  43,  20 }, {  55,  20 }, {  67,  20 }, {  79,  20 }, {  91,  20 }, { 103,  20 }, { 115,  20 }, { 127,  20 }, { 139,  20 }, { 151,  20 }, { 169,  20 }, { 193,  20 }, { 205,  20 }, { 217,  20 },
+{ 217,   5 }, { 205,   5 }, { 193,   5 }, { 175,   5 }, { 163,   5 }, { 151,   5 }, { 139,   5 }, { 121,   5 },  { 109,   5 }, {  97,   5 },  {  85,   5 },  {  67,   5 }, {  55,   5 }, {  43,   5 }, {  31,   5 },{   7,   5 },
+}, {
+    // LED Index to Flag
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+
+1,1,1,4,1,1,1,1,1,1,1,
+1,1,4,4,4,4,4,4,4,4,4,4,1,
+9,4,4,4,4,4,4,4,4,4,4,4,1,
+1,1,1,4,4,4,4,4,4,4,4,4,4,4,4,4,1,
+4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,
+1,9,1,4,4,4,4,1,1,1,1,4,4,4,4,1
+} };
+
+#endif
diff --git a/keyboards/idobao/id87/v2/v2.h b/keyboards/idobao/id87/v2/v2.h
new file mode 100644
index 0000000000..1a75d95755
--- /dev/null
+++ b/keyboards/idobao/id87/v2/v2.h
@@ -0,0 +1,40 @@
+/*
+Copyright 2020 Tybera
+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_tkl_ansi( \
+    K00,      K02, K03, K04, K05,   K06, K07, K08, K68,    K67, K65, K64, K63,  K66, K62, K61,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73,       K76, K72, K71,  \
+    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83,     K86, K82, K81,  \
+    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93,                         \
+    K40,       K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,                K92,       \
+    K50,  K51,  K52,              K56,                K58,  K57,  K54,  K53,    KA6, KA2, KA1   \
+) { \
+    { K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
+    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
+    { K50,   K51,   K52,   K53,   K54,   KC_NO, K56,   K57,   K58   }, \
+    { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68   }, \
+    { K70,   K71,   K72,   K73,   KC_NO, K75,   K76,   K77,   K78   }, \
+    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88   }, \
+    { KC_NO, KC_NO, K92,   K93,   KC_NO, K95,   KC_NO, K97,   K98   }, \
+    { KC_NO, KA1,   KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8   }, \
+}
+
+

From 87c2f97def26e4899d1c48a4428f3026aa914275 Mon Sep 17 00:00:00 2001
From: rookiebwoy <81021475+rookiebwoy@users.noreply.github.com>
Date: Tue, 8 Mar 2022 04:59:50 +0100
Subject: [PATCH 763/867] [Keyboard] Add LATE-9 keyboard (#13966)

---
 keyboards/late9/config.h                      |  31 +++
 keyboards/late9/readme.md                     |  27 ++
 keyboards/late9/rev1/config.h                 |  38 +++
 keyboards/late9/rev1/info.json                |  18 ++
 keyboards/late9/rev1/keymaps/default/keymap.c |  84 +++++++
 .../late9/rev1/keymaps/default/readme.md      |   3 +
 .../late9/rev1/keymaps/multitap/keymap.c      | 235 ++++++++++++++++++
 .../late9/rev1/keymaps/multitap/readme.md     |   3 +
 .../late9/rev1/keymaps/multitap/rules.mk      |   2 +
 keyboards/late9/rev1/readme.md                |   5 +
 keyboards/late9/rev1/rev1.c                   |  60 +++++
 keyboards/late9/rev1/rev1.h                   |  59 +++++
 keyboards/late9/rev1/rules.mk                 |  21 ++
 keyboards/late9/rules.mk                      |   1 +
 14 files changed, 587 insertions(+)
 create mode 100644 keyboards/late9/config.h
 create mode 100644 keyboards/late9/readme.md
 create mode 100644 keyboards/late9/rev1/config.h
 create mode 100644 keyboards/late9/rev1/info.json
 create mode 100644 keyboards/late9/rev1/keymaps/default/keymap.c
 create mode 100644 keyboards/late9/rev1/keymaps/default/readme.md
 create mode 100644 keyboards/late9/rev1/keymaps/multitap/keymap.c
 create mode 100644 keyboards/late9/rev1/keymaps/multitap/readme.md
 create mode 100644 keyboards/late9/rev1/keymaps/multitap/rules.mk
 create mode 100644 keyboards/late9/rev1/readme.md
 create mode 100644 keyboards/late9/rev1/rev1.c
 create mode 100644 keyboards/late9/rev1/rev1.h
 create mode 100644 keyboards/late9/rev1/rules.mk
 create mode 100755 keyboards/late9/rules.mk

diff --git a/keyboards/late9/config.h b/keyboards/late9/config.h
new file mode 100644
index 0000000000..a4dc07a7c4
--- /dev/null
+++ b/keyboards/late9/config.h
@@ -0,0 +1,31 @@
+/*
+Copyright 2021 rookiebwoy
+
+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      0x3777
+#define MANUFACTURER    rookiebwoy
+#define PRODUCT         LATE-9
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/late9/readme.md b/keyboards/late9/readme.md
new file mode 100644
index 0000000000..1d85e788fb
--- /dev/null
+++ b/keyboards/late9/readme.md
@@ -0,0 +1,27 @@
+# LATE-9
+
+
+The LATE-9 is a multi-tap input keyboard based on mobile phones from the late '90s. LATE-9 is intended as a dev board with 18 buttons and an OLED screen, made by through-hole components only. With this, you can experiment QMK OLED capabilities with very little expense.
+
+![LATE-9](https://i.imgur.com/QXycTC3h.jpg "LATE-9 first proto")
+
+See the project repository for gerbers.
+
+* Keyboard maintainer: [rookiebwoy](https://github.com/rookiebwoy)
+* Hardware supported: ProMicro, _Elite-C (not tested)_
+* Project repository: [LATE-9 on github](https://github.com/rookiebwoy/late-9)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make late9/rev1:default
+
+Flashing example for this keyboard:
+
+    make late9/rev1:default:flash
+
+
+When asked by the terminal, short with a metal wire the pins on the backside of the board highlighted as `RST` (one is the `RESET` and the other one is `GROUND`) to enter the bootloader and let the OS detects the device.
+After installing this firmware you can use Bootmagic to enter the bootloader while plugging in your LATE-9. By default it's the button on the upper-left of the keyboard.
+
+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 [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
diff --git a/keyboards/late9/rev1/config.h b/keyboards/late9/rev1/config.h
new file mode 100644
index 0000000000..20d1a553cc
--- /dev/null
+++ b/keyboards/late9/rev1/config.h
@@ -0,0 +1,38 @@
+/*
+Copyright 2021 rookiebwoy
+
+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 DEVICE_VER      0x0010
+
+/* Column/Row IO definitions */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 3
+#define MATRIX_ROW_PINS { B4, E6, D7, B3, B2, B6 }
+#define MATRIX_COL_PINS { B5, C6, D4 }
+
+/* Bootmagic - hold down top left button while plugging in to enter bootloader */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* Tap interval for tap dance */
+#define TAPPING_TERM 400
+
+/* Oneshot interval */
+#define ONESHOT_TIMEOUT 5000
diff --git a/keyboards/late9/rev1/info.json b/keyboards/late9/rev1/info.json
new file mode 100644
index 0000000000..66175c9afa
--- /dev/null
+++ b/keyboards/late9/rev1/info.json
@@ -0,0 +1,18 @@
+{
+    "keyboard_name": "LATE-9",
+    "keyboard_folder": "late9/rev1",
+    "url": "https://github.com/rookiebwoy/late-9)",
+    "maintainer": "rookiebwoy",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0},
+                {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1},
+                {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2},
+                {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3},
+                {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4},
+                {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/late9/rev1/keymaps/default/keymap.c b/keyboards/late9/rev1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..bed15eb57e
--- /dev/null
+++ b/keyboards/late9/rev1/keymaps/default/keymap.c
@@ -0,0 +1,84 @@
+/* Copyright 2021 rookiebwoy
+ *
+ * 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
+
+// Layers declarations
+enum layers {
+    _BL,
+    _OL
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap _BL: Base Layer
+ * ,-----------------------.
+ * |MO(OP) | ↑     | BSPC  |
+ * |       |       |       |
+ * |-------|-------|-------|
+ * | <-    | ↓     | ->    |
+ * |       |       |       |
+ * |-------|-------|-------|
+ * | 1     | 2     | 3     |
+ * |       |       |       |
+ * |-------|-------|-------|
+ * | 4     | 5     | 6     |
+ * |       |       |       |
+ * |-------|-------|-------|
+ * | 7     | 8     | 9     |
+ * |       |       |       |
+ * |-------|-------|-------|
+ * | 0     | .     | =     |
+ * |       |       |       |
+ * `-----------------------'
+ */
+  [_BL] = LAYOUT(
+    MO(1),         KC_UP,         KC_BSPC,
+    KC_LEFT,       KC_DOWN,       KC_RIGHT,
+    KC_P1,         KC_P2,         KC_P3,
+    KC_P4,         KC_P5,         KC_P6,
+    KC_P7,         KC_P8,         KC_P9,
+    KC_P0,         KC_PDOT,       KC_PEQL
+  ),
+
+/* Keymap _OP: Operators Layer
+ * ,-----------------------.
+ * |MO(OP) | ↑     | BSPC  |
+ * |       |       |       |
+ * |-------|-------|-------|
+ * | <-    | ↓     | ->    |
+ * |       |       |       |
+ * |-------|-------|-------|
+ * | /     | *     | -     |
+ * |       |       |       |
+ * |-------|-------|-------|
+ * | (     | )     | +     |
+ * |       |       |       |
+ * |-------|-------|-------|
+ * | &     | %     | ^     |
+ * |       |       |       |
+ * |-------|-------|-------|
+ * | |     | .     | =     |
+ * |       |       |       |
+ * `-----------------------'
+ */
+  [_OL] = LAYOUT(
+    MO(1),         KC_UP,         KC_BSPC,
+    KC_LEFT,       KC_DOWN,       KC_RIGHT,
+    KC_PSLS,       KC_PAST,       KC_PMNS,
+    LSFT(KC_9),    LSFT(KC_0),    KC_PPLS,
+    LSFT(KC_7),    LSFT(KC_5),    LSFT(KC_6),
+    LSFT(KC_BSLS), KC_PDOT,       KC_PEQL
+  ),
+};
\ No newline at end of file
diff --git a/keyboards/late9/rev1/keymaps/default/readme.md b/keyboards/late9/rev1/keymaps/default/readme.md
new file mode 100644
index 0000000000..f78318d7de
--- /dev/null
+++ b/keyboards/late9/rev1/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# LATE-9 default keymap
+
+This is a simple 2-layer calculator look-a-like layout.
diff --git a/keyboards/late9/rev1/keymaps/multitap/keymap.c b/keyboards/late9/rev1/keymaps/multitap/keymap.c
new file mode 100644
index 0000000000..9c32699c42
--- /dev/null
+++ b/keyboards/late9/rev1/keymaps/multitap/keymap.c
@@ -0,0 +1,235 @@
+/* Copyright 2021 rookiebwoy
+ *
+ * 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
+
+// Layers declarations
+enum layers {
+    _BL
+};
+
+// Tap Dance declarations
+enum {
+    TD_PNCT,
+    TD_ABC,
+    TD_DEF,
+    TD_GHI,
+    TD_JKL,
+    TD_MNO,
+    TD_PQRS,
+    TD_TUV,
+    TD_WXYZ,
+    TD_SPACE,
+    TD_UPRCS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap _BL: Base Layer
+ * ,-----------------------.
+ * |ENTER  | ↑     | BSPC  |
+ * |       |       |       |
+ * |-------|-------|-------|
+ * | <-    | ↓     | ->    |
+ * |       |       |       |
+ * |-------|-------|-------|
+ * | 1 .,' | 2     | 3     |
+ * |?!-:;/ | abc   | def   |
+ * |-------|-------|-------|
+ * | 4     | 5     | 6     |
+ * | ghi   | jkl   | mno   |
+ * |-------|-------|-------|
+ * | 7     | 8     | 9     |
+ * | pqrs  | tuv   | wxyz  |
+ * |-------|-------|-------|
+ * | *     | 0     | CAPS  |
+ * |       | space |       |
+ * `-----------------------'
+ */
+  [_BL] = LAYOUT(
+    KC_ENT,       KC_UP,        KC_BSPC,
+    KC_LEFT,      KC_DOWN,      KC_RIGHT,
+    TD(TD_PNCT),  TD(TD_ABC),   TD(TD_DEF),
+    TD(TD_GHI),   TD(TD_JKL),   TD(TD_MNO),
+    TD(TD_PQRS),  TD(TD_TUV),   TD(TD_WXYZ),
+    KC_PAST,      TD(TD_SPACE), TD(TD_UPRCS)
+  ),
+};
+
+// Tap Dance cycles
+void dance_1 (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return tap_code(KC_DOT);
+        else return tap_code(KC_1);
+    } else if (state->count == 2) {
+        tap_code (KC_COMM);
+    } else if (state->count == 3) {
+        tap_code(KC_QUOT);
+    } else if (state->count == 4) {
+        tap_code16(KC_QUES);
+    } else if (state->count == 5) {
+        tap_code16(KC_EXLM);
+    } else if (state->count == 6) {
+        tap_code(KC_MINS);
+    } else if (state->count == 7) {
+        tap_code16(KC_COLN);
+    } else if (state->count == 8) {
+        tap_code(KC_SCLN);
+    } else if (state->count == 9) {
+        tap_code(KC_SLSH);
+    } else {
+        reset_tap_dance (state);
+    }
+}
+
+void dance_2 (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return tap_code(KC_A);
+        else return tap_code(KC_2);
+    } else if (state->count == 2) {
+        tap_code (KC_B);
+    } else if (state->count == 3) {
+        tap_code(KC_C);
+    } else {
+        reset_tap_dance (state);
+    }
+}
+
+void dance_3 (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return tap_code(KC_D);
+        else return tap_code(KC_3);
+    } else if (state->count == 2) {
+        tap_code (KC_E);
+    } else if (state->count == 3) {
+        tap_code(KC_F);
+    } else {
+        reset_tap_dance (state);
+    }
+}
+
+void dance_4 (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return tap_code(KC_G);
+        else return tap_code(KC_4);
+    } else if (state->count == 2) {
+        tap_code (KC_H);
+    } else if (state->count == 3) {
+        tap_code(KC_I);
+    } else {
+        reset_tap_dance (state);
+    }
+}
+
+void dance_5 (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return tap_code(KC_J);
+        else return tap_code(KC_5);
+    } else if (state->count == 2) {
+        tap_code (KC_K);
+    } else if (state->count == 3) {
+        tap_code(KC_L);
+    } else {
+        reset_tap_dance (state);
+    }
+}
+
+void dance_6 (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return tap_code(KC_M);
+        else return tap_code(KC_6);
+    } else if (state->count == 2) {
+        tap_code (KC_N);
+    } else if (state->count == 3) {
+        tap_code(KC_O);
+    } else {
+        reset_tap_dance (state);
+    }
+}
+
+void dance_7 (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return tap_code(KC_P);
+        else return tap_code(KC_7);
+    } else if (state->count == 2) {
+        tap_code (KC_Q);
+    } else if (state->count == 3) {
+        tap_code(KC_R);
+    } else if (state->count == 4) {
+        tap_code(KC_S);
+    } else {
+        reset_tap_dance (state);
+    }
+}
+
+void dance_8 (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return tap_code(KC_T);
+        else return tap_code(KC_8);
+    } else if (state->count == 2) {
+        tap_code (KC_U);
+    } else if (state->count == 3) {
+        tap_code(KC_V);
+    } else {
+        reset_tap_dance (state);
+    }
+}
+
+void dance_9 (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return tap_code(KC_W);
+        else return tap_code(KC_9);
+    } else if (state->count == 2) {
+        tap_code (KC_X);
+    } else if (state->count == 3) {
+        tap_code(KC_Y);
+    } else if (state->count == 4) {
+        tap_code(KC_Z);
+    } else {
+        reset_tap_dance (state);
+    }
+}
+
+void dance_0 (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return tap_code(KC_SPACE);
+        else return tap_code(KC_0);
+    } else {
+        reset_tap_dance (state);
+    }
+}
+
+void dance_maiusc (qk_tap_dance_state_t *state, void *user_data) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return set_oneshot_mods(MOD_BIT(KC_LSFT)); 
+        else return tap_code(KC_CAPS);
+    } else {
+        reset_tap_dance (state);
+    }
+}
+
+// Tap Dance actions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_PNCT] = ACTION_TAP_DANCE_FN (dance_1),
+    [TD_ABC] = ACTION_TAP_DANCE_FN (dance_2),
+    [TD_DEF] = ACTION_TAP_DANCE_FN (dance_3),
+    [TD_GHI] = ACTION_TAP_DANCE_FN (dance_4),
+    [TD_JKL] = ACTION_TAP_DANCE_FN (dance_5),
+    [TD_MNO] = ACTION_TAP_DANCE_FN (dance_6),
+    [TD_PQRS] = ACTION_TAP_DANCE_FN (dance_7),
+    [TD_TUV] = ACTION_TAP_DANCE_FN (dance_8),
+    [TD_WXYZ] = ACTION_TAP_DANCE_FN (dance_9),
+    [TD_SPACE] = ACTION_TAP_DANCE_FN (dance_0),
+    [TD_UPRCS] = ACTION_TAP_DANCE_FN (dance_maiusc),
+};
diff --git a/keyboards/late9/rev1/keymaps/multitap/readme.md b/keyboards/late9/rev1/keymaps/multitap/readme.md
new file mode 100644
index 0000000000..2b5136c2b8
--- /dev/null
+++ b/keyboards/late9/rev1/keymaps/multitap/readme.md
@@ -0,0 +1,3 @@
+# LATE-9 multitap keymap
+
+This is the intended LATE-9 layout with multitap `ON` and old mobile phone look-a-like layout..
diff --git a/keyboards/late9/rev1/keymaps/multitap/rules.mk b/keyboards/late9/rev1/keymaps/multitap/rules.mk
new file mode 100644
index 0000000000..4141c3e7a4
--- /dev/null
+++ b/keyboards/late9/rev1/keymaps/multitap/rules.mk
@@ -0,0 +1,2 @@
+# Enable Tap Dance feature
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/late9/rev1/readme.md b/keyboards/late9/rev1/readme.md
new file mode 100644
index 0000000000..d9683222a9
--- /dev/null
+++ b/keyboards/late9/rev1/readme.md
@@ -0,0 +1,5 @@
+# LATE-9 rev1
+
+First (and final untill now) revision of the LATE-9. For in depth look please go to [project repository](https://github.com/rookiebwoy/late-9).
+
+
diff --git a/keyboards/late9/rev1/rev1.c b/keyboards/late9/rev1/rev1.c
new file mode 100644
index 0000000000..e79f76cd3b
--- /dev/null
+++ b/keyboards/late9/rev1/rev1.c
@@ -0,0 +1,60 @@
+/* Copyright 2021 rookiebwoy
+ *
+ * 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 "rev1.h"
+
+// OLED logo
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+        static const char PROGMEM rb_logo[] = {
+            // rookiebwoy 128x32px
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 
+            0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0xe0, 0xe0, 
+            0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
+            0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0xe3, 0xe3, 0xe3, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x1c, 
+            0x1c, 0x1c, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 
+            0xe0, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 
+            0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0x00, 
+            0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0xe0, 0xe0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x38, 0x38, 0x38, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x3f, 0x3f, 
+            0x3f, 0x38, 0x38, 0x38, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x07, 0x07, 0x07, 
+            0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x3f, 
+            0x3f, 0x3f, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x38, 0x38, 0x38, 0x3f, 0x3f, 
+            0x3f, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x38, 0x38, 0x38, 0x3f, 0x3f, 0x3f, 0x38, 0x38, 0x38, 
+            0x07, 0x07, 0x07, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x38, 0x38, 0x38, 0x3f, 0x3f, 0x3f, 0x00, 
+            0x00, 0x00, 0x07, 0x07, 0x07, 0x38, 0x38, 0x38, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0e, 0x0e, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
+        };
+    oled_write_raw_P(rb_logo, sizeof(rb_logo));
+}
+
+#endif
diff --git a/keyboards/late9/rev1/rev1.h b/keyboards/late9/rev1/rev1.h
new file mode 100644
index 0000000000..2e5bb5ec52
--- /dev/null
+++ b/keyboards/late9/rev1/rev1.h
@@ -0,0 +1,59 @@
+/* Copyright 2021 rookiebwoy
+ *
+ * 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"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+/* Matrix layout
+ *   ,--------------.
+ *   | 00 | 01 | 02 |
+ *   |----|----|----|
+ *   | 10 | 11 | 12 |
+ *   |----|----|----|
+ *   | 20 | 21 | 22 |
+ *   |----|----|----|
+ *   | 30 | 31 | 32 |
+ *   |----|----|----|
+ *   | 40 | 41 | 42 |
+ *   |----|----|----|
+ *   | 50 | 51 | 52 |
+ *   `--------------'
+ */
+#define LAYOUT( \
+	k00, k01, k02,  \
+	k10, k11, k12,  \
+	k20, k21, k22,  \
+	k30, k31, k32,  \
+	k40, k41, k42,  \
+	k50, k51, k52   \
+) \
+{ \
+	{k00, k01, k02}, \
+	{k10, k11, k12}, \
+	{k20, k21, k22}, \
+	{k30, k31, k32}, \
+	{k40, k41, k42}, \
+	{k50, k51, k52}  \
+}
diff --git a/keyboards/late9/rev1/rules.mk b/keyboards/late9/rev1/rules.mk
new file mode 100644
index 0000000000..26b6991c2f
--- /dev/null
+++ b/keyboards/late9/rev1/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+OLED_ENABLE = yes
+DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/late9/rules.mk b/keyboards/late9/rules.mk
new file mode 100755
index 0000000000..51c1b0d2a6
--- /dev/null
+++ b/keyboards/late9/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = late9/rev1

From 8f70adc0b6e8c1e7f08f9fd2496385c4053282ee Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 8 Mar 2022 12:09:54 +0800
Subject: [PATCH 764/867] [Keyboard] Update encoder code for macro3 (#16005)

---
 keyboards/macro3/config.h                 | 2 +-
 keyboards/macro3/keymaps/default/keymap.c | 2 +-
 keyboards/macro3/macro3.c                 | 4 ++--
 keyboards/macro3/readme.md                | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/keyboards/macro3/config.h b/keyboards/macro3/config.h
index 722cdf319f..7e7b371960 100644
--- a/keyboards/macro3/config.h
+++ b/keyboards/macro3/config.h
@@ -18,7 +18,7 @@
 #define MATRIX_COLS 4
 
 /* key matrix pins */
-#define DIRECT_PINS { \
+#define DIRECT_PINS {   \
     { D7, C6, D4, D1 }, \
     { B1, B4, B5, B3 }  \
 }
diff --git a/keyboards/macro3/keymaps/default/keymap.c b/keyboards/macro3/keymaps/default/keymap.c
index 11ebeff023..e866d481df 100644
--- a/keyboards/macro3/keymaps/default/keymap.c
+++ b/keyboards/macro3/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
     [1] = LAYOUT(
         _______, _______, _______, _______,
-        RESET,   _______, _______, _______
+        QK_BOOT, _______, _______, _______
     )
 };
 
diff --git a/keyboards/macro3/macro3.c b/keyboards/macro3/macro3.c
index 90bb982509..0937abfc83 100644
--- a/keyboards/macro3/macro3.c
+++ b/keyboards/macro3/macro3.c
@@ -10,9 +10,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 0) {
         if (clockwise) {
-            tap_code(KC_VOLU);
+            tap_code_delay(KC_VOLU, 10);
         } else {
-            tap_code(KC_VOLD);
+            tap_code_delay(KC_VOLD, 10);
         }
     } else if (index == 1) {
         if (clockwise) {
diff --git a/keyboards/macro3/readme.md b/keyboards/macro3/readme.md
index 0234741174..40cf927392 100644
--- a/keyboards/macro3/readme.md
+++ b/keyboards/macro3/readme.md
@@ -6,7 +6,7 @@ Macro3 is a low-profile macro pad with dual encoder support designed by [@davidp
 
 ## Keyboard Info
 
-* Keyboard Maintainer: [davidphilipbarr](https://github.com/davidphilipbarr)
+* Keyboard Maintainer: [filterpaper](https://github.com/filterpaper), [davidphilipbarr](https://github.com/davidphilipbarr)
 * Hardware Supported: [Macro3](https://github.com/davidphilipbarr/Macropads/tree/main/macro3)
 * Hardware Availability: order PCBs with gerber file from the repository
 
@@ -21,6 +21,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the top right key and plug in the controller.
-* **Keycode in layout**: Press the key mapped to `RESET` if it is configured.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is configured.
 * **Physical reset pins**: Briefly short the RST and GND pins on the microcontroller using tweezers, a paperclip, or any other conductive material.
 

From 0880850b158ca5da4eae28c43849909c01350f0f Mon Sep 17 00:00:00 2001
From: ZiTe <honmonoh@gmail.com>
Date: Tue, 8 Mar 2022 12:16:35 +0800
Subject: [PATCH 765/867] [Bug] Rename has_mouse_report_changed parameters
 (#16417)

Fixes compilation issues when bluetooth is enabled, due to issues
with cpp used by bluetooth code.

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 docs/feature_pointing_device.md    |  6 +++---
 docs/ja/feature_pointing_device.md |  4 ++--
 quantum/pointing_device.c          | 14 +++++++-------
 quantum/pointing_device.h          |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 4b39599f8a..23a16b843d 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -245,7 +245,7 @@ The following configuration options are only available when using `SPLIT_POINTIN
 | `pointing_device_get_report(void)`                         | Returns the current mouse report (as a `mouse_report_t` data structure).                                      | 
 | `pointing_device_set_report(mouse_report)`                 | Sets the mouse report to the assigned `mouse_report_t` data structured passed to the function.                | 
 | `pointing_device_send(void)`                               | Sends the current mouse report to the host system.  Function can be replaced.                                 | 
-| `has_mouse_report_changed(old, new)`                       | Compares the old and new `mouse_report_t` data and returns true only if it has changed.                       |
+| `has_mouse_report_changed(new_report, old_report)`         | Compares the old and new `mouse_report_t` data and returns true only if it has changed.                       |
 | `pointing_device_adjust_by_defines(mouse_report)`          | Applies rotations and invert configurations to a raw mouse report.                                             |
 
 
@@ -276,14 +276,14 @@ The report_mouse_t (here "mouseReport") has the following properties:
 To manually manipulate the mouse reports outside of the `pointing_device_task_*` functions, you can use:
 
 * `pointing_device_get_report()` - Returns the current report_mouse_t that represents the information sent to the host computer
-* `pointing_device_set_report(report_mouse_t newMouseReport)` - Overrides and saves the report_mouse_t to be sent to the host computer
+* `pointing_device_set_report(report_mouse_t mouse_report)` - Overrides and saves the report_mouse_t to be sent to the host computer
 * `pointing_device_send()` - Sends the mouse report to the host and zeroes out the report. 
 
 When the mouse report is sent, the x, y, v, and h values are set to 0 (this is done in `pointing_device_send()`, which can be overridden to avoid this behavior).  This way, button states persist, but movement will only occur once.  For further customization, both `pointing_device_init` and `pointing_device_task` can be overridden.
 
 Additionally, by default, `pointing_device_send()` will only send a report when the report has actually changed.  This prevents it from continuously sending mouse reports, which will keep the host system awake.  This behavior can be changed by creating your own `pointing_device_send()` function.
 
-Also, you use the `has_mouse_report_changed(new, old)` function to check to see if the report has changed.
+Also, you use the `has_mouse_report_changed(new_report, old_report)` function to check to see if the report has changed.
 
 ## Examples
 
diff --git a/docs/ja/feature_pointing_device.md b/docs/ja/feature_pointing_device.md
index 69bd86c552..0f472f0ffe 100644
--- a/docs/ja/feature_pointing_device.md
+++ b/docs/ja/feature_pointing_device.md
@@ -16,7 +16,7 @@ POINTING_DEVICE_ENABLE = yes
 マウスレポートを操作するために、以下の関数を使うことができます:
 
 * `pointing_device_get_report()` - ホストコンピュータに送信された情報を表す現在の report_mouse_t を返します。
-* `pointing_device_set_report(report_mouse_t newMouseReport)` - ホストコンピュータに送信される report_mouse_t を上書き保存します。
+* `pointing_device_set_report(report_mouse_t mouse_report)` - ホストコンピュータに送信される report_mouse_t を上書き保存します。
 
 report_mouse_t (ここでは "mouseReport") が以下のプロパティを持つことを覚えておいてください:
 
@@ -34,7 +34,7 @@ report_mouse_t (ここでは "mouseReport") が以下のプロパティを持つ
 
 さらに、デフォルトでは、`pointing_device_send()` はレポートが実際に変更された場合のみレポートを送信します。これにより、マウスレポートが継続的に送信されてホストシステムが起動されたままになることを防ぎます。この動作は、独自の `pointing_device_send()` 関数を作成することで変更できます。
 
-また、`has_mouse_report_changed(new, old)` 関数を使って、レポートが変更されたかどうかを確認できます。(訳注：独自の `pointing_device_send()` 関数を作成する場合でも、その中で `has_mouse_report_changed(new, old)` 関数でチェックして、デフォルトの `pointing_device_send()` と類似の無駄なレポートの抑制をして、ホストシステムがスリープ状態に入れる余地を残すようにしておくのが良いでしょう。)
+また、`has_mouse_report_changed(new_report, old_report)` 関数を使って、レポートが変更されたかどうかを確認できます。(訳注：独自の `pointing_device_send()` 関数を作成する場合でも、その中で `has_mouse_report_changed(new_report, old_report)` 関数でチェックして、デフォルトの `pointing_device_send()` と類似の無駄なレポートの抑制をして、ホストシステムがスリープ状態に入れる余地を残すようにしておくのが良いでしょう。)
 
 以下の例では、カスタムキーを使ってマウスをクリックし垂直および水平方向に127単位スクロールし、リリースされた時にそれを全て元に戻します - なぜならこれは完全に便利な機能だからです。いいですか、以下はひとつの例です:
 
diff --git a/quantum/pointing_device.c b/quantum/pointing_device.c
index 9627cab4b8..47a0af45d2 100644
--- a/quantum/pointing_device.c
+++ b/quantum/pointing_device.c
@@ -73,12 +73,12 @@ extern const pointing_device_driver_t pointing_device_driver;
 /**
  * @brief Compares 2 mouse reports for difference and returns result
  *
- * @param[in] new report_mouse_t
- * @param[in] old report_mouse_t
+ * @param[in] new_report report_mouse_t
+ * @param[in] old_report report_mouse_t
  * @return bool result
  */
-__attribute__((weak)) bool has_mouse_report_changed(report_mouse_t new, report_mouse_t old) {
-    return memcmp(&new, &old, sizeof(new));
+__attribute__((weak)) bool has_mouse_report_changed(report_mouse_t new_report, report_mouse_t old_report) {
+    return memcmp(&new_report, &old_report, sizeof(new_report));
 }
 
 /**
@@ -292,10 +292,10 @@ report_mouse_t pointing_device_get_report(void) {
 /**
  * @brief Sets mouse report used be pointing device task
  *
- * @param[in] new_mouse_report
+ * @param[in] mouse_report
  */
-void pointing_device_set_report(report_mouse_t new_mouse_report) {
-    local_mouse_report = new_mouse_report;
+void pointing_device_set_report(report_mouse_t mouse_report) {
+    local_mouse_report = mouse_report;
 }
 
 /**
diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h
index 5f3845227a..a6bdbf120c 100644
--- a/quantum/pointing_device.h
+++ b/quantum/pointing_device.h
@@ -79,8 +79,8 @@ void           pointing_device_init(void);
 void           pointing_device_task(void);
 void           pointing_device_send(void);
 report_mouse_t pointing_device_get_report(void);
-void           pointing_device_set_report(report_mouse_t newMouseReport);
-bool           has_mouse_report_changed(report_mouse_t new, report_mouse_t old);
+void           pointing_device_set_report(report_mouse_t mouse_report);
+bool           has_mouse_report_changed(report_mouse_t new_report, report_mouse_t old_report);
 uint16_t       pointing_device_get_cpi(void);
 void           pointing_device_set_cpi(uint16_t cpi);
 

From 4493f31f801c0065d62f334d0b986195861fbf87 Mon Sep 17 00:00:00 2001
From: yiancar <yiangosyiangou@cytanet.com.cy>
Date: Tue, 8 Mar 2022 04:18:41 +0000
Subject: [PATCH 766/867] Add HS version of Nebula65b due to different number
 of per-key-RGB (#16514)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: yiancar <yiancar@gmail.com>
---
 keyboards/spaceholdings/nebula68b/hs/config.h | 19 +++++++++
 keyboards/spaceholdings/nebula68b/hs/hs.c     | 41 +++++++++++++++++++
 keyboards/spaceholdings/nebula68b/hs/rules.mk |  0
 keyboards/spaceholdings/nebula68b/nebula68b.c |  2 +
 4 files changed, 62 insertions(+)
 create mode 100755 keyboards/spaceholdings/nebula68b/hs/config.h
 create mode 100755 keyboards/spaceholdings/nebula68b/hs/hs.c
 create mode 100644 keyboards/spaceholdings/nebula68b/hs/rules.mk

diff --git a/keyboards/spaceholdings/nebula68b/hs/config.h b/keyboards/spaceholdings/nebula68b/hs/config.h
new file mode 100755
index 0000000000..ac25a8ef1d
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/hs/config.h
@@ -0,0 +1,19 @@
+/*
+Copyright 2021 Yiancar
+
+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/>.
+*/
+
+#undef DRIVER_LED_TOTAL
+#define DRIVER_LED_TOTAL 78
diff --git a/keyboards/spaceholdings/nebula68b/hs/hs.c b/keyboards/spaceholdings/nebula68b/hs/hs.c
new file mode 100755
index 0000000000..e411f64196
--- /dev/null
+++ b/keyboards/spaceholdings/nebula68b/hs/hs.c
@@ -0,0 +1,41 @@
+/* Copyright 2021 Yiancar
+ *
+ * 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 "nebula68b.h"
+
+#ifdef RGB_MATRIX_ENABLE
+// clang-format off
+led_config_t g_led_config = { {
+    {  0,      1,  2,      4,      5,      6,  7,      9,     10, 11, 13, 14, 15,     17, 18 },
+    { 35,     34, 33,     32,     31,     30, 29,     28,     27, 26, 25, 24, 23, NO_LED, 21 },
+    { 37,     38, 39,     40,     41,     42, 43,     44,     45, 46, 47, 48, 22,     49, 19 },
+    { 63, NO_LED, 62,     61,     60,     59, 58,     57,     56, 55, 54, 53, 52,     51, 20 },
+    { 64,     65, 67, NO_LED, NO_LED, NO_LED, 69, NO_LED, NO_LED, 71, 72, 73, 75,     76, 77 }
+}, {
+    {  6, 10}, { 19, 10}, { 32, 10}, { 39, 11}, { 45, 10}, { 58, 10}, { 71, 10}, { 84, 10}, { 90, 11}, { 97, 10}, {110, 10}, {123, 10}, {130, 11}, {136, 10}, {149, 10}, {162, 10},
+    {178, 13}, {182, 10}, {205, 10}, {218, 10}, {218, 23}, {205, 23}, {185, 23}, {169, 23}, {156, 23}, {143, 23}, {130, 23}, {117, 23}, {104, 23}, { 91, 23}, { 78, 23},
+    { 65, 23}, { 52, 23}, { 39, 23}, { 26, 23}, { 10, 23}, {  4, 26}, { 17, 29}, { 29, 35}, { 42, 35}, { 55, 35}, { 68, 35}, { 81, 35}, { 94, 35}, {107, 35}, {120, 35}, {133, 35},
+    {146, 35}, {159, 35}, {180, 35}, {220, 32}, {205, 48}, {177, 48}, {153, 48}, {140, 48}, {127, 48}, {114, 48}, {101, 48}, { 88, 48}, { 75, 48}, { 62, 48}, { 49, 48}, { 36, 48},
+    { 15, 48}, {  8, 61}, { 24, 61}, { 32, 52}, { 41, 61}, { 81, 56}, { 89, 61}, {132, 53}, {138, 61}, {154, 61}, {170, 61}, {179, 53}, {192, 61}, {205, 61}, {218, 61}
+}, {
+    1, 4, 4, 2, 4, 4, 4, 4, 2, 4, 4, 4, 2, 4, 4, 4, 2, 1, 1, 1,
+    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 2,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 2,
+    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 2, 1, 2, 4, 2, 1, 1, 1, 2, 1, 1, 1
+} };
+// clang-format on
+#endif
diff --git a/keyboards/spaceholdings/nebula68b/hs/rules.mk b/keyboards/spaceholdings/nebula68b/hs/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/spaceholdings/nebula68b/nebula68b.c b/keyboards/spaceholdings/nebula68b/nebula68b.c
index 4842d9be92..4d4f878c6b 100755
--- a/keyboards/spaceholdings/nebula68b/nebula68b.c
+++ b/keyboards/spaceholdings/nebula68b/nebula68b.c
@@ -17,6 +17,7 @@
 #include "nebula68b.h"
 #include <lib/lib8tion/lib8tion.h>
 
+#ifndef KEYBOARD_spaceholdings_nebula68b_hs
 #ifdef RGB_MATRIX_ENABLE
 // clang-format off
 led_config_t g_led_config = { {
@@ -40,6 +41,7 @@ led_config_t g_led_config = { {
 } };
 // clang-format on
 #endif
+#endif
 
 #if defined(RGB_MATRIX_ENABLE) && defined(VIA_ENABLE)
 void raw_hid_receive_kb(uint8_t *data, uint8_t length) {

From 996880a1da6960979430a9a5b2a154eee58e1799 Mon Sep 17 00:00:00 2001
From: Ryan Baker <76887060+ryanbaekr@users.noreply.github.com>
Date: Mon, 7 Mar 2022 23:19:45 -0500
Subject: [PATCH 767/867] [Keyboard] Add rb69 (#16526)

---
 keyboards/ryanbaekr/rb69/config.h             | 118 ++++++++++++++++++
 keyboards/ryanbaekr/rb69/info.json            |  10 ++
 .../ryanbaekr/rb69/keymaps/default/keymap.c   |  34 +++++
 .../ryanbaekr/rb69/keymaps/default/readme.md  |   1 +
 keyboards/ryanbaekr/rb69/keymaps/via/keymap.c |  50 ++++++++
 keyboards/ryanbaekr/rb69/keymaps/via/rules.mk |   2 +
 keyboards/ryanbaekr/rb69/rb69.c               |  17 +++
 keyboards/ryanbaekr/rb69/rb69.h               |  35 ++++++
 keyboards/ryanbaekr/rb69/readme.md            |  15 +++
 keyboards/ryanbaekr/rb69/rules.mk             |  18 +++
 10 files changed, 300 insertions(+)
 create mode 100644 keyboards/ryanbaekr/rb69/config.h
 create mode 100644 keyboards/ryanbaekr/rb69/info.json
 create mode 100644 keyboards/ryanbaekr/rb69/keymaps/default/keymap.c
 create mode 100644 keyboards/ryanbaekr/rb69/keymaps/default/readme.md
 create mode 100644 keyboards/ryanbaekr/rb69/keymaps/via/keymap.c
 create mode 100644 keyboards/ryanbaekr/rb69/keymaps/via/rules.mk
 create mode 100644 keyboards/ryanbaekr/rb69/rb69.c
 create mode 100644 keyboards/ryanbaekr/rb69/rb69.h
 create mode 100644 keyboards/ryanbaekr/rb69/readme.md
 create mode 100644 keyboards/ryanbaekr/rb69/rules.mk

diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h
new file mode 100644
index 0000000000..2112eda1a7
--- /dev/null
+++ b/keyboards/ryanbaekr/rb69/config.h
@@ -0,0 +1,118 @@
+/*
+Copyright 2021 ryanbaekr
+
+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 0x7262
+#define PRODUCT_ID 0x0069
+#define DEVICE_VER 0x0003
+#define MANUFACTURER ryanbaekr
+#define PRODUCT rb69
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * 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 { D7, C6, D4, D0, D1 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, F0, F1, B4, B5, B7, D5, C7, E6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+#define BACKLIGHT_LEVELS 10
+
+/* Underglow options */
+#define RGB_DI_PIN B0
+#ifdef RGB_DI_PIN
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 14
+#define RGBLED_HUE_STEP 8
+#define RGBLED_SAT_STEP 8
+#define RGBLED_VAL_STEP 8
+#endif
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/info.json
new file mode 100644
index 0000000000..0377479cf6
--- /dev/null
+++ b/keyboards/ryanbaekr/rb69/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "rb69", 
+    "url": "", 
+    "maintainer": "qmk", 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":15.25, "y":3.25}, {"x":0, "y":4.25, "w":2.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.5}, {"x":15.25, "y":4.25}, {"x":14, "y":4.5}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25, "w":1.25}, {"x":2.75, "y":5.25, "w":1.25}, {"x":4, "y":5.25, "w":6.25}, {"x":10.25, "y":5.25, "w":1.25}, {"x":11.5, "y":5.25, "w":1.25}, {"x":13, "y":5.5}, {"x":14, "y":5.5}, {"x":15, "y":5.5}]
+        }
+    }
+}
diff --git a/keyboards/ryanbaekr/rb69/keymaps/default/keymap.c b/keyboards/ryanbaekr/rb69/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c3ed407b70
--- /dev/null
+++ b/keyboards/ryanbaekr/rb69/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2021 ryanbaekr
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS, KC_HOME,
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_DEL,  KC_END,
+        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
+                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL,          KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT,          TG(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______, _______,          _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______,          _______, _______,                            _______,                   _______,          _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/ryanbaekr/rb69/keymaps/default/readme.md b/keyboards/ryanbaekr/rb69/keymaps/default/readme.md
new file mode 100644
index 0000000000..35d623b10e
--- /dev/null
+++ b/keyboards/ryanbaekr/rb69/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for rb69
diff --git a/keyboards/ryanbaekr/rb69/keymaps/via/keymap.c b/keyboards/ryanbaekr/rb69/keymaps/via/keymap.c
new file mode 100644
index 0000000000..eb7ba1aeeb
--- /dev/null
+++ b/keyboards/ryanbaekr/rb69/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2021 ryanbaekr
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS, KC_HOME,
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_DEL,  KC_END,
+        KC_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
+                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL,          KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT,          TG(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______, _______,          _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______,          _______, _______,                            _______,                   _______,          _______, _______, _______, _______
+    ),
+    
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______,          _______, _______,                            _______,                   _______,          _______, _______, _______, _______
+    ),
+    
+    [3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+        _______,          _______, _______,                            _______,                   _______,          _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/ryanbaekr/rb69/keymaps/via/rules.mk b/keyboards/ryanbaekr/rb69/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/ryanbaekr/rb69/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/ryanbaekr/rb69/rb69.c b/keyboards/ryanbaekr/rb69/rb69.c
new file mode 100644
index 0000000000..68d27ce39a
--- /dev/null
+++ b/keyboards/ryanbaekr/rb69/rb69.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 ryanbaekr
+ *
+ * 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 "rb69.h"
diff --git a/keyboards/ryanbaekr/rb69/rb69.h b/keyboards/ryanbaekr/rb69/rb69.h
new file mode 100644
index 0000000000..6ae6e1ac93
--- /dev/null
+++ b/keyboards/ryanbaekr/rb69/rb69.h
@@ -0,0 +1,35 @@
+/* Copyright 2021 ryanbaekr
+ *
+ * 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 ___ KC_NO
+
+#define LAYOUT(                                                                     \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2f, \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, k3f, \
+    k40,      k42, k43,                k47,           k4a,      k4c, k4d, k4e, k4f  \
+){ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f },  \
+    { k10, ___, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f },  \
+    { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, ___, k2f },  \
+    { ___, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, k3d, k3e, k3f },  \
+    { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, k4a, ___, k4c, k4d, k4e, k4f }   \
+}
diff --git a/keyboards/ryanbaekr/rb69/readme.md b/keyboards/ryanbaekr/rb69/readme.md
new file mode 100644
index 0000000000..d90c973a89
--- /dev/null
+++ b/keyboards/ryanbaekr/rb69/readme.md
@@ -0,0 +1,15 @@
+# rb69
+
+A diy stacked acrylic 65% keyboard. 
+
+* Keyboard Maintainer: [ryanbaekr](https://github.com/ryanbaekr)
+* Hardware Supported: rb69 with Elite-C
+* Hardware Availability: 2022/03/04
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ryanbaekr/rb69:default
+
+To boot into the bootloader, hold the reset button on the Elite-C on plug in
+
+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).
diff --git a/keyboards/ryanbaekr/rb69/rules.mk b/keyboards/ryanbaekr/rb69/rules.mk
new file mode 100644
index 0000000000..ebbb7bc613
--- /dev/null
+++ b/keyboards/ryanbaekr/rb69/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 4d2ae22690eec671dc7a45e3adfbab8ee0727fba Mon Sep 17 00:00:00 2001
From: Matthew Dias <matthewdias@me.com>
Date: Mon, 7 Mar 2022 22:23:06 -0600
Subject: [PATCH 768/867] [Keyboard] Add mini winni (#15341)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/winkeys/mini_winni/config.h         | 68 +++++++++++++++++++
 keyboards/winkeys/mini_winni/info.json        |  9 +++
 .../mini_winni/keymaps/default/keymap.c       | 42 ++++++++++++
 .../winkeys/mini_winni/keymaps/via/keymap.c   | 42 ++++++++++++
 .../winkeys/mini_winni/keymaps/via/rules.mk   |  1 +
 keyboards/winkeys/mini_winni/mini_winni.c     | 18 +++++
 keyboards/winkeys/mini_winni/mini_winni.h     | 27 ++++++++
 keyboards/winkeys/mini_winni/readme.md        | 22 ++++++
 keyboards/winkeys/mini_winni/rules.mk         | 18 +++++
 9 files changed, 247 insertions(+)
 create mode 100644 keyboards/winkeys/mini_winni/config.h
 create mode 100644 keyboards/winkeys/mini_winni/info.json
 create mode 100644 keyboards/winkeys/mini_winni/keymaps/default/keymap.c
 create mode 100644 keyboards/winkeys/mini_winni/keymaps/via/keymap.c
 create mode 100644 keyboards/winkeys/mini_winni/keymaps/via/rules.mk
 create mode 100644 keyboards/winkeys/mini_winni/mini_winni.c
 create mode 100644 keyboards/winkeys/mini_winni/mini_winni.h
 create mode 100644 keyboards/winkeys/mini_winni/readme.md
 create mode 100644 keyboards/winkeys/mini_winni/rules.mk

diff --git a/keyboards/winkeys/mini_winni/config.h b/keyboards/winkeys/mini_winni/config.h
new file mode 100644
index 0000000000..821f5cdc76
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/config.h
@@ -0,0 +1,68 @@
+
+/*
+Copyright 2021 Matthew Dias
+
+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       0x574B
+#define PRODUCT_ID      0x7770
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    WinKeys
+#define PRODUCT         Mini Winni
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 4
+
+/* key matrix pins */
+#define DIRECT_PINS { { F4, F5, B4, D7 }, { F6, F7, B6, B5 } }
+#define UNUSED_PINS
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define RGB_DI_PIN E6
+#define RGBLED_NUM 4
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/winkeys/mini_winni/info.json b/keyboards/winkeys/mini_winni/info.json
new file mode 100644
index 0000000000..2545073551
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/info.json
@@ -0,0 +1,9 @@
+{
+    "keyboard_name": "Mini Winni",
+    "maintainer": "Matthew Dias",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}]
+        }
+    }
+}
diff --git a/keyboards/winkeys/mini_winni/keymaps/default/keymap.c b/keyboards/winkeys/mini_winni/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5613ca4d89
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_F1,  KC_F2,  KC_F3,  KC_F4,  
+		KC_F5,  KC_F6,  KC_F7,  KC_F8
+	),
+
+	[1] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	)
+
+};
\ No newline at end of file
diff --git a/keyboards/winkeys/mini_winni/keymaps/via/keymap.c b/keyboards/winkeys/mini_winni/keymaps/via/keymap.c
new file mode 100644
index 0000000000..5613ca4d89
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] = LAYOUT_all(
+		KC_F1,  KC_F2,  KC_F3,  KC_F4,  
+		KC_F5,  KC_F6,  KC_F7,  KC_F8
+	),
+
+	[1] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	)
+
+};
\ No newline at end of file
diff --git a/keyboards/winkeys/mini_winni/keymaps/via/rules.mk b/keyboards/winkeys/mini_winni/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/winkeys/mini_winni/mini_winni.c b/keyboards/winkeys/mini_winni/mini_winni.c
new file mode 100644
index 0000000000..35c75c4ad7
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/mini_winni.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2021 Matthew Dias
+
+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 "mini_winni.h"
diff --git a/keyboards/winkeys/mini_winni/mini_winni.h b/keyboards/winkeys/mini_winni/mini_winni.h
new file mode 100644
index 0000000000..4d4374761d
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/mini_winni.h
@@ -0,0 +1,27 @@
+/*
+Copyright 2021 Matthew Dias
+
+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, \
+	K10, K11, K12, K13  \
+) { \
+	{ K00, K01, K02, K03 }, \
+	{ K10, K11, K12, K13 }  \
+}
diff --git a/keyboards/winkeys/mini_winni/readme.md b/keyboards/winkeys/mini_winni/readme.md
new file mode 100644
index 0000000000..e7c43995c0
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/readme.md
@@ -0,0 +1,22 @@
+# Mini Winni
+
+A 2x4 Macropad by WinKeys
+
+-   Keyboard Maintainer: [matthewdias](https://github.com/matthewdias)
+-   Hardware Supported: mini winni PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make winkeys/mini_winni:default
+
+Flashing example for this keyboard:
+
+    make winkeys/mini_winni:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader:
+
+-   **Physical reset button**: Briefly press the button on the back of the PCB (or short the reset/ground pads, should a tactile button not be installed)
diff --git a/keyboards/winkeys/mini_winni/rules.mk b/keyboards/winkeys/mini_winni/rules.mk
new file mode 100644
index 0000000000..7b7949afcb
--- /dev/null
+++ b/keyboards/winkeys/mini_winni/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 403536986d4a4808a02bb0e0a2d0de8ab4551541 Mon Sep 17 00:00:00 2001
From: drewpyun <48503175+drewpyun@users.noreply.github.com>
Date: Mon, 7 Mar 2022 23:23:53 -0500
Subject: [PATCH 769/867] [Keyboard] Add Iskar (#16562)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/drewkeys/iskar/config.h             |  56 +++
 keyboards/drewkeys/iskar/info.json            | 383 ++++++++++++++++++
 keyboards/drewkeys/iskar/iskar.c              |  17 +
 keyboards/drewkeys/iskar/iskar.h              | 155 +++++++
 .../drewkeys/iskar/keymaps/default/keymap.c   |  33 ++
 .../drewkeys/iskar/keymaps/default/readme.md  |   1 +
 keyboards/drewkeys/iskar/readme.md            |  24 ++
 keyboards/drewkeys/iskar/rules.mk             |  19 +
 8 files changed, 688 insertions(+)
 create mode 100644 keyboards/drewkeys/iskar/config.h
 create mode 100644 keyboards/drewkeys/iskar/info.json
 create mode 100644 keyboards/drewkeys/iskar/iskar.c
 create mode 100644 keyboards/drewkeys/iskar/iskar.h
 create mode 100644 keyboards/drewkeys/iskar/keymaps/default/keymap.c
 create mode 100644 keyboards/drewkeys/iskar/keymaps/default/readme.md
 create mode 100644 keyboards/drewkeys/iskar/readme.md
 create mode 100644 keyboards/drewkeys/iskar/rules.mk

diff --git a/keyboards/drewkeys/iskar/config.h b/keyboards/drewkeys/iskar/config.h
new file mode 100644
index 0000000000..e20369fde0
--- /dev/null
+++ b/keyboards/drewkeys/iskar/config.h
@@ -0,0 +1,56 @@
+/*
+Copyright 2021 Drewkeys
+
+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    0xDE43
+#define PRODUCT_ID   0x1284
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Drewkeys
+#define PRODUCT      Iskar
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+ //                       0   1   2   3   4   5   6   7   8   9   10  11  12  13  14  15
+#define MATRIX_ROW_PINS { D6, D7, B4, B5, D4 }
+#define MATRIX_COL_PINS { B6, C6, C7, F6, F5, F4, F7, F1, F0, E6, B7, D0, D1, D2, D3, D5 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/drewkeys/iskar/info.json b/keyboards/drewkeys/iskar/info.json
new file mode 100644
index 0000000000..0505fece10
--- /dev/null
+++ b/keyboards/drewkeys/iskar/info.json
@@ -0,0 +1,383 @@
+{
+    "keyboard_name": "Iskar",
+    "url": "https://bitmapstudio.xyz/collections/iskar",
+    "maintainer": "Drewkeys",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "Esc 0,0", "x": 0, "y": 0},
+                {"label": "1 0,1", "x": 1, "y": 0},
+                {"label": "2 0,2", "x": 2, "y": 0},
+                {"label": "3 0,3", "x": 3, "y": 0},
+                {"label": "4 0,4", "x": 4, "y": 0},
+                {"label": "5 0,5", "x": 5, "y": 0},
+                {"label": "6 0,6", "x": 6, "y": 0},
+                {"label": "7 0,7", "x": 7, "y": 0},
+                {"label": "8 0,8", "x": 8, "y": 0},
+                {"label": "9 0,9", "x": 9, "y": 0},
+                {"label": "0 0,10", "x": 10, "y": 0},
+                {"label": "- 0,11", "x": 11, "y": 0},
+                {"label": "= 0,12", "x": 12, "y": 0},
+                {"label": "bsp extra 0,13", "x": 13, "y": 0},
+                {"label": "bsp 0,14", "x": 14, "y": 0},
+                {"label": "del 0,15", "x": 15, "y": 0},
+
+                {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
+                {"label": "q 1,2", "x": 1.5, "y": 1},
+                {"label": "w 1,3", "x": 2.5, "y": 1},
+                {"label": "e 1,4", "x": 3.5, "y": 1},
+                {"label": "r 1,5", "x": 4.5, "y": 1},
+                {"label": "t 1,6", "x": 5.5, "y": 1},
+                {"label": "y 1,7", "x": 6.5, "y": 1},
+                {"label": "u 1,8", "x": 7.5, "y": 1},
+                {"label": "i 1,9", "x": 8.5, "y": 1},
+                {"label": "o 1,10", "x": 9.5, "y": 1},
+                {"label": "p 1,11", "x": 10.5, "y": 1},
+                {"label": "[ 1,12", "x": 11.5, "y": 1},
+                {"label": "] 1,13", "x": 12.5, "y": 1},
+                {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
+                {"label": "home 1,15", "x": 15, "y": 1},
+
+                {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
+                {"label": "a 2,2", "x": 1.75, "y": 2},
+                {"label": "s 2,3", "x": 2.75, "y": 2},
+                {"label": "d 2,4", "x": 3.75, "y": 2},
+                {"label": "f 2,5", "x": 4.75, "y": 2},
+                {"label": "g 2,6", "x": 5.75, "y": 2},
+                {"label": "h 2,7", "x": 6.75, "y": 2},
+                {"label": "j 2,8", "x": 7.75, "y": 2},
+                {"label": "k 2,9", "x": 8.75, "y": 2},
+                {"label": "l 2,10", "x": 9.75, "y": 2},
+                {"label": "; 2,11", "x": 10.75, "y": 2},
+                {"label": "' 2,12", "x": 11.75, "y": 2},
+                {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
+                {"label": "pg up 2,15", "x": 15, "y": 2},
+
+                {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
+                {"label": "z 3,2", "x": 2.25, "y": 3},
+                {"label": "x 3,3", "x": 3.25, "y": 3},
+                {"label": "c 3,4", "x": 4.25, "y": 3},
+                {"label": "v 3,5", "x": 5.25, "y": 3},
+                {"label": "b 3,6", "x": 6.25, "y": 3},
+                {"label": "n 3,7", "x": 7.25, "y": 3},
+                {"label": "m 3,8", "x": 8.25, "y": 3},
+                {"label": ", 3,9", "x": 9.25, "y": 3},
+                {"label": ". 3,10", "x": 10.25, "y": 3},
+                {"label": "/ 3,11", "x": 11.25, "y": 3},
+                {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
+                {"label": "up 3,14", "x": 14, "y": 3},
+                {"label": "pg dn 3,15", "x": 15, "y": 3},
+
+                {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25},
+                {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25},
+                {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25},
+                {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25},
+                {"label": "left 4,13", "x": 13, "y": 4},
+                {"label": "down 4,14", "x": 14, "y": 4},
+                {"label": "right 4,15", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+              {"label": "Esc 0,0", "x": 0, "y": 0},
+              {"label": "1 0,1", "x": 1, "y": 0},
+              {"label": "2 0,2", "x": 2, "y": 0},
+              {"label": "3 0,3", "x": 3, "y": 0},
+              {"label": "4 0,4", "x": 4, "y": 0},
+              {"label": "5 0,5", "x": 5, "y": 0},
+              {"label": "6 0,6", "x": 6, "y": 0},
+              {"label": "7 0,7", "x": 7, "y": 0},
+              {"label": "8 0,8", "x": 8, "y": 0},
+              {"label": "9 0,9", "x": 9, "y": 0},
+              {"label": "0 0,10", "x": 10, "y": 0},
+              {"label": "- 0,11", "x": 11, "y": 0},
+              {"label": "= 0,12", "x": 12, "y": 0},
+              {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2},
+              {"label": "del 0,15", "x": 15, "y": 0},
+
+              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
+              {"label": "q 1,2", "x": 1.5, "y": 1},
+              {"label": "w 1,3", "x": 2.5, "y": 1},
+              {"label": "e 1,4", "x": 3.5, "y": 1},
+              {"label": "r 1,5", "x": 4.5, "y": 1},
+              {"label": "t 1,6", "x": 5.5, "y": 1},
+              {"label": "y 1,7", "x": 6.5, "y": 1},
+              {"label": "u 1,8", "x": 7.5, "y": 1},
+              {"label": "i 1,9", "x": 8.5, "y": 1},
+              {"label": "o 1,10", "x": 9.5, "y": 1},
+              {"label": "p 1,11", "x": 10.5, "y": 1},
+              {"label": "[ 1,12", "x": 11.5, "y": 1},
+              {"label": "] 1,13", "x": 12.5, "y": 1},
+              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
+              {"label": "home 1,15", "x": 15, "y": 1},
+
+              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
+              {"label": "a 2,2", "x": 1.75, "y": 2},
+              {"label": "s 2,3", "x": 2.75, "y": 2},
+              {"label": "d 2,4", "x": 3.75, "y": 2},
+              {"label": "f 2,5", "x": 4.75, "y": 2},
+              {"label": "g 2,6", "x": 5.75, "y": 2},
+              {"label": "h 2,7", "x": 6.75, "y": 2},
+              {"label": "j 2,8", "x": 7.75, "y": 2},
+              {"label": "k 2,9", "x": 8.75, "y": 2},
+              {"label": "l 2,10", "x": 9.75, "y": 2},
+              {"label": "; 2,11", "x": 10.75, "y": 2},
+              {"label": "' 2,12", "x": 11.75, "y": 2},
+              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
+              {"label": "pg up 2,15", "x": 15, "y": 2},
+
+              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
+              {"label": "z 3,2", "x": 2.25, "y": 3},
+              {"label": "x 3,3", "x": 3.25, "y": 3},
+              {"label": "c 3,4", "x": 4.25, "y": 3},
+              {"label": "v 3,5", "x": 5.25, "y": 3},
+              {"label": "b 3,6", "x": 6.25, "y": 3},
+              {"label": "n 3,7", "x": 7.25, "y": 3},
+              {"label": "m 3,8", "x": 8.25, "y": 3},
+              {"label": ", 3,9", "x": 9.25, "y": 3},
+              {"label": ". 3,10", "x": 10.25, "y": 3},
+              {"label": "/ 3,11", "x": 11.25, "y": 3},
+              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
+              {"label": "up 3,14", "x": 14, "y": 3},
+              {"label": "pg dn 3,15", "x": 15, "y": 3},
+
+              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25},
+              {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25},
+              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25},
+              {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25},
+              {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25},
+              {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25},
+              {"label": "left 4,13", "x": 13, "y": 4},
+              {"label": "down 4,14", "x": 14, "y": 4},
+              {"label": "right 4,15", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_ansi_split_bs": {
+            "layout": [
+              {"label": "Esc 0,0", "x": 0, "y": 0},
+              {"label": "1 0,1", "x": 1, "y": 0},
+              {"label": "2 0,2", "x": 2, "y": 0},
+              {"label": "3 0,3", "x": 3, "y": 0},
+              {"label": "4 0,4", "x": 4, "y": 0},
+              {"label": "5 0,5", "x": 5, "y": 0},
+              {"label": "6 0,6", "x": 6, "y": 0},
+              {"label": "7 0,7", "x": 7, "y": 0},
+              {"label": "8 0,8", "x": 8, "y": 0},
+              {"label": "9 0,9", "x": 9, "y": 0},
+              {"label": "0 0,10", "x": 10, "y": 0},
+              {"label": "- 0,11", "x": 11, "y": 0},
+              {"label": "= 0,12", "x": 12, "y": 0},
+              {"label": "bsp extra 0,13", "x": 13, "y": 0},
+              {"label": "bsp 0,14", "x": 14, "y": 0},
+              {"label": "del 0,15", "x": 15, "y": 0},
+
+              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
+              {"label": "q 1,2", "x": 1.5, "y": 1},
+              {"label": "w 1,3", "x": 2.5, "y": 1},
+              {"label": "e 1,4", "x": 3.5, "y": 1},
+              {"label": "r 1,5", "x": 4.5, "y": 1},
+              {"label": "t 1,6", "x": 5.5, "y": 1},
+              {"label": "y 1,7", "x": 6.5, "y": 1},
+              {"label": "u 1,8", "x": 7.5, "y": 1},
+              {"label": "i 1,9", "x": 8.5, "y": 1},
+              {"label": "o 1,10", "x": 9.5, "y": 1},
+              {"label": "p 1,11", "x": 10.5, "y": 1},
+              {"label": "[ 1,12", "x": 11.5, "y": 1},
+              {"label": "] 1,13", "x": 12.5, "y": 1},
+              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
+              {"label": "home 1,15", "x": 15, "y": 1},
+
+              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
+              {"label": "a 2,2", "x": 1.75, "y": 2},
+              {"label": "s 2,3", "x": 2.75, "y": 2},
+              {"label": "d 2,4", "x": 3.75, "y": 2},
+              {"label": "f 2,5", "x": 4.75, "y": 2},
+              {"label": "g 2,6", "x": 5.75, "y": 2},
+              {"label": "h 2,7", "x": 6.75, "y": 2},
+              {"label": "j 2,8", "x": 7.75, "y": 2},
+              {"label": "k 2,9", "x": 8.75, "y": 2},
+              {"label": "l 2,10", "x": 9.75, "y": 2},
+              {"label": "; 2,11", "x": 10.75, "y": 2},
+              {"label": "' 2,12", "x": 11.75, "y": 2},
+              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
+              {"label": "pg up 2,15", "x": 15, "y": 2},
+
+              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
+              {"label": "z 3,2", "x": 2.25, "y": 3},
+              {"label": "x 3,3", "x": 3.25, "y": 3},
+              {"label": "c 3,4", "x": 4.25, "y": 3},
+              {"label": "v 3,5", "x": 5.25, "y": 3},
+              {"label": "b 3,6", "x": 6.25, "y": 3},
+              {"label": "n 3,7", "x": 7.25, "y": 3},
+              {"label": "m 3,8", "x": 8.25, "y": 3},
+              {"label": ", 3,9", "x": 9.25, "y": 3},
+              {"label": ". 3,10", "x": 10.25, "y": 3},
+              {"label": "/ 3,11", "x": 11.25, "y": 3},
+              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
+              {"label": "up 3,14", "x": 14, "y": 3},
+              {"label": "pg dn 3,15", "x": 15, "y": 3},
+
+              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.25},
+              {"label": "win 4,1", "x": 1.25, "y": 4, "w": 1.25},
+              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.25},
+              {"label": "spacebar 4,6", "x": 3.75, "y": 4, "w": 6.25},
+              {"label": "fn 4,10", "x": 10, "y": 4, "w": 1.25},
+              {"label": "ctrl 4,11", "x": 11.25, "y": 4, "w": 1.25},
+              {"label": "left 4,13", "x": 13, "y": 4},
+              {"label": "down 4,14", "x": 14, "y": 4},
+              {"label": "right 4,15", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_tsangan": {
+            "layout": [
+              {"label": "Esc 0,0", "x": 0, "y": 0},
+              {"label": "1 0,1", "x": 1, "y": 0},
+              {"label": "2 0,2", "x": 2, "y": 0},
+              {"label": "3 0,3", "x": 3, "y": 0},
+              {"label": "4 0,4", "x": 4, "y": 0},
+              {"label": "5 0,5", "x": 5, "y": 0},
+              {"label": "6 0,6", "x": 6, "y": 0},
+              {"label": "7 0,7", "x": 7, "y": 0},
+              {"label": "8 0,8", "x": 8, "y": 0},
+              {"label": "9 0,9", "x": 9, "y": 0},
+              {"label": "0 0,10", "x": 10, "y": 0},
+              {"label": "- 0,11", "x": 11, "y": 0},
+              {"label": "= 0,12", "x": 12, "y": 0},
+              {"label": "bsp 0,14", "x": 13, "y": 0, "w": 2},
+              {"label": "del 0,15", "x": 15, "y": 0},
+
+              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
+              {"label": "q 1,2", "x": 1.5, "y": 1},
+              {"label": "w 1,3", "x": 2.5, "y": 1},
+              {"label": "e 1,4", "x": 3.5, "y": 1},
+              {"label": "r 1,5", "x": 4.5, "y": 1},
+              {"label": "t 1,6", "x": 5.5, "y": 1},
+              {"label": "y 1,7", "x": 6.5, "y": 1},
+              {"label": "u 1,8", "x": 7.5, "y": 1},
+              {"label": "i 1,9", "x": 8.5, "y": 1},
+              {"label": "o 1,10", "x": 9.5, "y": 1},
+              {"label": "p 1,11", "x": 10.5, "y": 1},
+              {"label": "[ 1,12", "x": 11.5, "y": 1},
+              {"label": "] 1,13", "x": 12.5, "y": 1},
+              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
+              {"label": "home 1,15", "x": 15, "y": 1},
+
+              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
+              {"label": "a 2,2", "x": 1.75, "y": 2},
+              {"label": "s 2,3", "x": 2.75, "y": 2},
+              {"label": "d 2,4", "x": 3.75, "y": 2},
+              {"label": "f 2,5", "x": 4.75, "y": 2},
+              {"label": "g 2,6", "x": 5.75, "y": 2},
+              {"label": "h 2,7", "x": 6.75, "y": 2},
+              {"label": "j 2,8", "x": 7.75, "y": 2},
+              {"label": "k 2,9", "x": 8.75, "y": 2},
+              {"label": "l 2,10", "x": 9.75, "y": 2},
+              {"label": "; 2,11", "x": 10.75, "y": 2},
+              {"label": "' 2,12", "x": 11.75, "y": 2},
+              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
+              {"label": "pg up 2,15", "x": 15, "y": 2},
+
+              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
+              {"label": "z 3,2", "x": 2.25, "y": 3},
+              {"label": "x 3,3", "x": 3.25, "y": 3},
+              {"label": "c 3,4", "x": 4.25, "y": 3},
+              {"label": "v 3,5", "x": 5.25, "y": 3},
+              {"label": "b 3,6", "x": 6.25, "y": 3},
+              {"label": "n 3,7", "x": 7.25, "y": 3},
+              {"label": "m 3,8", "x": 8.25, "y": 3},
+              {"label": ", 3,9", "x": 9.25, "y": 3},
+              {"label": ". 3,10", "x": 10.25, "y": 3},
+              {"label": "/ 3,11", "x": 11.25, "y": 3},
+              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
+              {"label": "up 3,14", "x": 14, "y": 3},
+              {"label": "pg dn 3,15", "x": 15, "y": 3},
+
+              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5},
+              {"label": "win 4,1", "x": 1.5, "y": 4},
+              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5},
+              {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7},
+              {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5},
+              {"label": "left 4,13", "x": 13, "y": 4},
+              {"label": "down 4,14", "x": 14, "y": 4},
+              {"label": "right 4,15", "x": 15, "y": 4}
+            ]
+        },
+        "LAYOUT_65_tsangan_split_bs": {
+            "layout": [
+              {"label": "Esc 0,0", "x": 0, "y": 0},
+              {"label": "1 0,1", "x": 1, "y": 0},
+              {"label": "2 0,2", "x": 2, "y": 0},
+              {"label": "3 0,3", "x": 3, "y": 0},
+              {"label": "4 0,4", "x": 4, "y": 0},
+              {"label": "5 0,5", "x": 5, "y": 0},
+              {"label": "6 0,6", "x": 6, "y": 0},
+              {"label": "7 0,7", "x": 7, "y": 0},
+              {"label": "8 0,8", "x": 8, "y": 0},
+              {"label": "9 0,9", "x": 9, "y": 0},
+              {"label": "0 0,10", "x": 10, "y": 0},
+              {"label": "- 0,11", "x": 11, "y": 0},
+              {"label": "= 0,12", "x": 12, "y": 0},
+              {"label": "bsp extra 0,13", "x": 13, "y": 0},
+              {"label": "bsp 0,14", "x": 14, "y": 0},
+              {"label": "del 0,15", "x": 15, "y": 0},
+
+              {"label": "tab 1,0", "x": 0, "y": 1, "w": 1.5},
+              {"label": "q 1,2", "x": 1.5, "y": 1},
+              {"label": "w 1,3", "x": 2.5, "y": 1},
+              {"label": "e 1,4", "x": 3.5, "y": 1},
+              {"label": "r 1,5", "x": 4.5, "y": 1},
+              {"label": "t 1,6", "x": 5.5, "y": 1},
+              {"label": "y 1,7", "x": 6.5, "y": 1},
+              {"label": "u 1,8", "x": 7.5, "y": 1},
+              {"label": "i 1,9", "x": 8.5, "y": 1},
+              {"label": "o 1,10", "x": 9.5, "y": 1},
+              {"label": "p 1,11", "x": 10.5, "y": 1},
+              {"label": "[ 1,12", "x": 11.5, "y": 1},
+              {"label": "] 1,13", "x": 12.5, "y": 1},
+              {"label": "| 1,14", "x": 13.5, "y": 1, "w": 1.5},
+              {"label": "home 1,15", "x": 15, "y": 1},
+
+              {"label": "caps 2,0", "x": 0, "y": 2, "w": 1.75},
+              {"label": "a 2,2", "x": 1.75, "y": 2},
+              {"label": "s 2,3", "x": 2.75, "y": 2},
+              {"label": "d 2,4", "x": 3.75, "y": 2},
+              {"label": "f 2,5", "x": 4.75, "y": 2},
+              {"label": "g 2,6", "x": 5.75, "y": 2},
+              {"label": "h 2,7", "x": 6.75, "y": 2},
+              {"label": "j 2,8", "x": 7.75, "y": 2},
+              {"label": "k 2,9", "x": 8.75, "y": 2},
+              {"label": "l 2,10", "x": 9.75, "y": 2},
+              {"label": "; 2,11", "x": 10.75, "y": 2},
+              {"label": "' 2,12", "x": 11.75, "y": 2},
+              {"label": "enter 2,13", "x": 12.75, "y": 2, "w": 2.25},
+              {"label": "pg up 2,15", "x": 15, "y": 2},
+
+              {"label": "shift 3,1", "x": 0, "y": 3, "w": 2.25},
+              {"label": "z 3,2", "x": 2.25, "y": 3},
+              {"label": "x 3,3", "x": 3.25, "y": 3},
+              {"label": "c 3,4", "x": 4.25, "y": 3},
+              {"label": "v 3,5", "x": 5.25, "y": 3},
+              {"label": "b 3,6", "x": 6.25, "y": 3},
+              {"label": "n 3,7", "x": 7.25, "y": 3},
+              {"label": "m 3,8", "x": 8.25, "y": 3},
+              {"label": ", 3,9", "x": 9.25, "y": 3},
+              {"label": ". 3,10", "x": 10.25, "y": 3},
+              {"label": "/ 3,11", "x": 11.25, "y": 3},
+              {"label": "shift 3,13", "x": 12.25, "y":3, "w": 1.75},
+              {"label": "up 3,14", "x": 14, "y": 3},
+              {"label": "pg dn 3,15", "x": 15, "y": 3},
+
+              {"label": "ctrl 4,0", "x": 0, "y": 4, "w": 1.5},
+              {"label": "win 4,1", "x": 1.5, "y": 4},
+              {"label": "alt 4,2", "x": 2.5, "y": 4, "w": 1.5},
+              {"label": "spacebar 4,6", "x": 4, "y": 4, "w": 7},
+              {"label": "ctrl 4,11", "x": 11, "y": 4, "w": 1.5},
+              {"label": "left 4,13", "x": 13, "y": 4},
+              {"label": "down 4,14", "x": 14, "y": 4},
+              {"label": "right 4,15", "x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/drewkeys/iskar/iskar.c b/keyboards/drewkeys/iskar/iskar.c
new file mode 100644
index 0000000000..32ea7aa2e4
--- /dev/null
+++ b/keyboards/drewkeys/iskar/iskar.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Drewkeys
+ *
+ * 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 "iskar.h"
diff --git a/keyboards/drewkeys/iskar/iskar.h b/keyboards/drewkeys/iskar/iskar.h
new file mode 100644
index 0000000000..0ad2601d33
--- /dev/null
+++ b/keyboards/drewkeys/iskar/iskar.h
@@ -0,0 +1,155 @@
+/* Copyright 2021 Drewkeys
+ *
+ * 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"
+// Corresponding changes to the layout names and/or definitions must also be made to info.json
+
+/* Standard arrangement / LAYOUT
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
+ * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤
+ * │40  │41  │43  │        46              │4a  │4b  │▓│4d │4e │4f │
+ * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘
+*/
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F,    \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
+    k40, k41, k42,                k46,                k4A, k4B,      k4D, k4E,   k4F     \
+) { \
+    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
+    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
+    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
+    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
+    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }  \
+}
+
+/* Standard arrangement / 65 ANSI
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │0f │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
+ * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤
+ * │40  │41  │43  │        46              │4a  │4b  │ │4d │4e │4f │
+ * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘
+*/
+#define LAYOUT_65_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,        k0E, k0F,    \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D,   k1E, k1F,    \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,   k3E, k3F,    \
+    k40, k41, k42,                k46,                k4A, k4B,      k4D,   k4E, k4F     \
+) { \
+    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   KC_NO, k0E, k0F }, \
+    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
+    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
+    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
+    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }  \
+}
+
+/* Standard arrangement / 65 ANSI SPLIT
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
+ * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┬┴───┬┴┬───┼───┤───┤
+ * │40  │41  │43  │        46              │4a  │4b  │ │4d │4e │4f │
+ * └────┴────┴────┴────────────────────────┴────┴────┴ ┴───┴───┘───┘
+*/
+#define LAYOUT_65_ansi_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F,    \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
+    k40, k41, k42,                k46,                k4A, k4B,      k4D, k4E,   k4F     \
+) { \
+    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
+    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
+    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
+    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
+    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, KC_NO, k4D, k4E,   k4F }  \
+}
+
+/* Standard arrangement / 65 TSANGAN
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │0f │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
+ * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
+ * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤
+ * │40   │41 │43  │        46                   │4b  │ │4d │4e │4f │
+ * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘
+*/
+#define LAYOUT_65_tsangan( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C,      k0E,  k0F,     \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
+    k40, k41, k42,                k46,                     k4B,      k4D, k4E,   k4F     \
+) { \
+    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   KC_NO, k0E, k0F }, \
+    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
+    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
+    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
+    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E, k4F }  \
+}
+
+/* Standard arrangement / 65 TSANGAN SPLIT
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │0f │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤───┤
+ * │10   │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e   │1f │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤───┤
+ * │20    │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d      │2f │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤───┤
+ * │31      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │3f │
+ * ├─────┬─┴─┬──┴─┬─┴───┴───┴───┴───┴───┴───┴───┬┴───┬┴┬───┼───┤───┤
+ * │40   │41 │43  │        46                   │4b  │ │4d │4e │4f │
+ * └─────┴───┴────┴─────────────────────────────┴────┴ ┴───┴───┘───┘
+*/
+#define LAYOUT_65_tsangan_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,   k0F,    \
+    k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,   k1F,    \
+    k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,        k2F,    \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, k3E,   k3F,    \
+    k40, k41, k42,                k46,                     k4B,      k4D, k4E,   k4F     \
+) { \
+    { k00,   k01,   k02, k03,   k04,   k05,   k06, k07,   k08,   k09,   k0A, k0B, k0C,   k0D, k0E,   k0F }, \
+    { k10,   KC_NO, k12, k13,   k14,   k15,   k16, k17,   k18,   k19,   k1A, k1B, k1C,   k1D, k1E,   k1F }, \
+    { k20,   KC_NO, k22, k23,   k24,   k25,   k26, k27,   k28,   k29,   k2A, k2B, k2C,   k2D, KC_NO, k2F }, \
+    { KC_NO, k31,   k32, k33,   k34,   k35,   k36, k37,   k38,   k39,   k3A, k3B, KC_NO, k3D, k3E,   k3F }, \
+    { k40,   k41,   k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k4B, KC_NO, k4D, k4E,   k4F }  \
+}
diff --git a/keyboards/drewkeys/iskar/keymaps/default/keymap.c b/keyboards/drewkeys/iskar/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d97403dfd5
--- /dev/null
+++ b/keyboards/drewkeys/iskar/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 Drewkeys
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT(
+        QK_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_DEL,  KC_BSPC, KC_HOME,
+        KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,             KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_INS,
+        KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,             KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
+          KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,                    KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTRL, KC_LGUI, KC_LALT,        KC_SPC,                    MO(1), KC_RCTRL,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    LAYOUT(
+        KC_GRAVE,    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_TRNS,   KC_TRNS,  KC_TRNS,
+        KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS,                    KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/drewkeys/iskar/keymaps/default/readme.md b/keyboards/drewkeys/iskar/keymaps/default/readme.md
new file mode 100644
index 0000000000..d7cffe7242
--- /dev/null
+++ b/keyboards/drewkeys/iskar/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for iskar -- ansi and split back space
diff --git a/keyboards/drewkeys/iskar/readme.md b/keyboards/drewkeys/iskar/readme.md
new file mode 100644
index 0000000000..152ec5e47e
--- /dev/null
+++ b/keyboards/drewkeys/iskar/readme.md
@@ -0,0 +1,24 @@
+# Iskar
+
+![Iskar](https://i.imgur.com/qBh0gA2.png)
+
+![Layouts supported](https://i.imgur.com/SB2G7mL.png)
+Note: No split backspace for hotswap vers.
+
+65% PCB for Bitmap studio's Iskar
+
+* Keyboard Maintainer: [Drewkeys](https://github.com/drewpyun)
+* Hardware Supported: Made specifically for Iskar, 65% hotswap supported
+* Hardware Availability: https://bitmapstudio.xyz/collections/iskar
+
+Make example for this keyboard (after setting up your build environment):
+
+    make drewkkeys/iskar:default
+
+Flashing example for this keyboard:
+
+    make drewkeys/iskar:default:flash
+
+Resetting Board: Press the button on the PCB next to the logo to soft reset the board to reflash (bootloader mode).
+
+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).
diff --git a/keyboards/drewkeys/iskar/rules.mk b/keyboards/drewkeys/iskar/rules.mk
new file mode 100644
index 0000000000..9591f732c4
--- /dev/null
+++ b/keyboards/drewkeys/iskar/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes

From 89a515913fdfb3abc3d7c511c1cacdd664d079b4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 8 Mar 2022 16:30:37 +1100
Subject: [PATCH 770/867] Oddball: set default pointing device driver (#16574)

---
 keyboards/oddball/keymaps/default/rules.mk | 1 -
 keyboards/oddball/readme.md                | 2 +-
 keyboards/oddball/rules.mk                 | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 keyboards/oddball/keymaps/default/rules.mk

diff --git a/keyboards/oddball/keymaps/default/rules.mk b/keyboards/oddball/keymaps/default/rules.mk
deleted file mode 100644
index 84de35aeb1..0000000000
--- a/keyboards/oddball/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-POINTING_DEVICE_DRIVER = adns9800
diff --git a/keyboards/oddball/readme.md b/keyboards/oddball/readme.md
index f797fc34e8..573fd7cc5c 100644
--- a/keyboards/oddball/readme.md
+++ b/keyboards/oddball/readme.md
@@ -3,7 +3,7 @@
 A split keyboard with trackball support.
 
 * Keyboard Maintainer: [Alexander Tulloh](https://github.com/atulloh)
-* Hardware Supported: Oddball PCB and plates, and using an [ADNS9800](https://www.tindie.com/products/jkicklighter/adns-9800-laser-motion-sensor/) or a [PMW3360](https://www.tindie.com/products/jkicklighter/pmw3360-motion-sensor/) breakout board for mouse
+* Hardware Supported: Oddball PCB and plates, and using an [ADNS9800](https://www.tindie.com/products/jkicklighter/adns-9800-laser-motion-sensor/) (default) or a [PMW3360](https://www.tindie.com/products/jkicklighter/pmw3360-motion-sensor/) breakout board for mouse
 * Hardware Availability: [atulloh.github.io/oddball](https://atulloh.github.io/oddball)
 
 Make examples for this keyboard (after setting up your build environment):
diff --git a/keyboards/oddball/rules.mk b/keyboards/oddball/rules.mk
index b096a922c5..4698218128 100644
--- a/keyboards/oddball/rules.mk
+++ b/keyboards/oddball/rules.mk
@@ -16,5 +16,6 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 POINTING_DEVICE_ENABLE = yes
+POINTING_DEVICE_DRIVER = adns9800
 
 DEFAULT_FOLDER = oddball/v1

From fe8b7619d30f9571da386b4eff9103a5d6ca48d4 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 7 Mar 2022 22:48:56 -0700
Subject: [PATCH 771/867] [Keyboard] Fix late9/rev1 (#16576)

---
 keyboards/late9/rev1/rev1.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/late9/rev1/rev1.c b/keyboards/late9/rev1/rev1.c
index e79f76cd3b..ffba137189 100644
--- a/keyboards/late9/rev1/rev1.c
+++ b/keyboards/late9/rev1/rev1.c
@@ -55,6 +55,7 @@ bool oled_task_kb(void) {
             0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0e, 0x0e, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
         };
     oled_write_raw_P(rb_logo, sizeof(rb_logo));
+    return false;
 }
 
 #endif

From d92994be71d1f9a6e353d218f17de43f4dcf4017 Mon Sep 17 00:00:00 2001
From: Callum Hart <mini-ninja-64@users.noreply.github.com>
Date: Tue, 8 Mar 2022 16:47:57 +0000
Subject: [PATCH 772/867] [Keyboard] Add Novus 60% keyboard  (#16473)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/cutie_club/novus/config.h           |  56 ++++
 keyboards/cutie_club/novus/info.json          | 277 ++++++++++++++++++
 .../cutie_club/novus/keymaps/default/keymap.c |  33 +++
 .../cutie_club/novus/keymaps/via/keymap.c     |  47 +++
 .../cutie_club/novus/keymaps/via/rules.mk     |   1 +
 keyboards/cutie_club/novus/novus.c            |  17 ++
 keyboards/cutie_club/novus/novus.h            |  33 +++
 keyboards/cutie_club/novus/readme.md          |  26 ++
 keyboards/cutie_club/novus/rules.mk           |  18 ++
 9 files changed, 508 insertions(+)
 create mode 100644 keyboards/cutie_club/novus/config.h
 create mode 100644 keyboards/cutie_club/novus/info.json
 create mode 100644 keyboards/cutie_club/novus/keymaps/default/keymap.c
 create mode 100644 keyboards/cutie_club/novus/keymaps/via/keymap.c
 create mode 100644 keyboards/cutie_club/novus/keymaps/via/rules.mk
 create mode 100644 keyboards/cutie_club/novus/novus.c
 create mode 100644 keyboards/cutie_club/novus/novus.h
 create mode 100644 keyboards/cutie_club/novus/readme.md
 create mode 100644 keyboards/cutie_club/novus/rules.mk

diff --git a/keyboards/cutie_club/novus/config.h b/keyboards/cutie_club/novus/config.h
new file mode 100644
index 0000000000..842ec901d0
--- /dev/null
+++ b/keyboards/cutie_club/novus/config.h
@@ -0,0 +1,56 @@
+/*
+Copyright 2022 Cutie Club
+
+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    0xFB9C
+#define PRODUCT_ID   0x3F42
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Cutie Club
+#define PRODUCT      Novus
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 { F0, F1, F4, F5, F6 }
+#define MATRIX_COL_PINS { B6, C6, C7, B2, B3, D0, D1, D2, D3, D7, B4, B5, D5, D4, D6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
diff --git a/keyboards/cutie_club/novus/info.json b/keyboards/cutie_club/novus/info.json
new file mode 100644
index 0000000000..cae4e25c89
--- /dev/null
+++ b/keyboards/cutie_club/novus/info.json
@@ -0,0 +1,277 @@
+{
+    "keyboard_name": "Novus",
+    "url": "",
+    "maintainer": "Cutie Club",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "x": 1,
+                    "y": 0
+                },
+                {
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "x": 6,
+                    "y": 0
+                },
+                {
+                    "x": 7,
+                    "y": 0
+                },
+                {
+                    "x": 8,
+                    "y": 0
+                },
+                {
+                    "x": 9,
+                    "y": 0
+                },
+                {
+                    "x": 10,
+                    "y": 0
+                },
+                {
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "x": 12,
+                    "y": 0
+                },
+                {
+                    "x": 13,
+                    "y": 0
+                },
+                {
+                    "x": 14,
+                    "y": 0
+                },
+                {
+                    "x": 0,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "x": 1.5,
+                    "y": 1
+                },
+                {
+                    "x": 2.5,
+                    "y": 1
+                },
+                {
+                    "x": 3.5,
+                    "y": 1
+                },
+                {
+                    "x": 4.5,
+                    "y": 1
+                },
+                {
+                    "x": 5.5,
+                    "y": 1
+                },
+                {
+                    "x": 6.5,
+                    "y": 1
+                },
+                {
+                    "x": 7.5,
+                    "y": 1
+                },
+                {
+                    "x": 8.5,
+                    "y": 1
+                },
+                {
+                    "x": 9.5,
+                    "y": 1
+                },
+                {
+                    "x": 10.5,
+                    "y": 1
+                },
+                {
+                    "x": 11.5,
+                    "y": 1
+                },
+                {
+                    "x": 12.5,
+                    "y": 1
+                },
+                {
+                    "x": 13.5,
+                    "y": 1,
+                    "w": 1.5
+                },
+                {
+                    "x": 0,
+                    "y": 2,
+                    "w": 1.75
+                },
+                {
+                    "x": 1.75,
+                    "y": 2
+                },
+                {
+                    "x": 2.75,
+                    "y": 2
+                },
+                {
+                    "x": 3.75,
+                    "y": 2
+                },
+                {
+                    "x": 4.75,
+                    "y": 2
+                },
+                {
+                    "x": 5.75,
+                    "y": 2
+                },
+                {
+                    "x": 6.75,
+                    "y": 2
+                },
+                {
+                    "x": 7.75,
+                    "y": 2
+                },
+                {
+                    "x": 8.75,
+                    "y": 2
+                },
+                {
+                    "x": 9.75,
+                    "y": 2
+                },
+                {
+                    "x": 10.75,
+                    "y": 2
+                },
+                {
+                    "x": 11.75,
+                    "y": 2
+                },
+                {
+                    "x": 12.75,
+                    "y": 2,
+                    "w": 2.25
+                },
+                {
+                    "x": 0,
+                    "y": 3,
+                    "w": 2.25
+                },
+                {
+                    "x": 2.25,
+                    "y": 3
+                },
+                {
+                    "x": 3.25,
+                    "y": 3
+                },
+                {
+                    "x": 4.25,
+                    "y": 3
+                },
+                {
+                    "x": 5.25,
+                    "y": 3
+                },
+                {
+                    "x": 6.25,
+                    "y": 3
+                },
+                {
+                    "x": 7.25,
+                    "y": 3
+                },
+                {
+                    "x": 8.25,
+                    "y": 3
+                },
+                {
+                    "x": 9.25,
+                    "y": 3
+                },
+                {
+                    "x": 10.25,
+                    "y": 3
+                },
+                {
+                    "x": 11.25,
+                    "y": 3
+                },
+                {
+                    "x": 12.25,
+                    "y": 3,
+                    "w": 1.75
+                },
+                {
+                    "x": 14,
+                    "y": 3
+                },
+                {
+                    "x": 0,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 1.25,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 2.5,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 3.75,
+                    "y": 4,
+                    "w": 6.25
+                },
+                {
+                    "x": 10,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 11.25,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 12.5,
+                    "y": 4,
+                    "w": 1.25
+                },
+                {
+                    "x": 13.75,
+                    "y": 4,
+                    "w": 1.25
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/cutie_club/novus/keymaps/default/keymap.c b/keyboards/cutie_club/novus/keymaps/default/keymap.c
new file mode 100644
index 0000000000..feeb27de8c
--- /dev/null
+++ b/keyboards/cutie_club/novus/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2022 Cutie Club
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,      KC_EQL,     KC_BSPC, KC_BSPC,
+        KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,      KC_RBRC,    KC_BSLS,
+        KC_CAPS,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,      KC_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,      MO(1),
+        KC_LCTL,    KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RGUI,  KC_APP,       KC_RCTRL
+    ),
+    [1] = LAYOUT_all(
+        KC_GRV,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______, _______,
+        _______,    _______,     KC_UP,       _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______,
+        _______,    KC_LEFT,     KC_DOWN,     KC_RIGHT,    _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,                               _______,                                            _______,     _______,   _______,      _______
+    )
+};
diff --git a/keyboards/cutie_club/novus/keymaps/via/keymap.c b/keyboards/cutie_club/novus/keymaps/via/keymap.c
new file mode 100644
index 0000000000..24e55dc1cf
--- /dev/null
+++ b/keyboards/cutie_club/novus/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2022 Cutie Club
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,      KC_EQL,     KC_BSPC, KC_BSPC,
+        KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,      KC_RBRC,    KC_BSLS,
+        KC_CAPS,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,      KC_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,      MO(1),
+        KC_LCTL,    KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RGUI,  KC_APP,       KC_RCTRL
+    ),
+    [1] = LAYOUT_all(
+        KC_GRV,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______, _______,
+        _______,    _______,     KC_UP,       _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______,
+        _______,    KC_LEFT,     KC_DOWN,     KC_RIGHT,    _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,                               _______,                                            _______,     _______,   _______,      _______
+    ),
+    [2] = LAYOUT_all(
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______, _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,                               _______,                                            _______,     _______,   _______,      _______
+    ),
+    [3] = LAYOUT_all(
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______, _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,    _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,     _______,   _______,      _______,
+        _______,    _______,     _______,                               _______,                                            _______,     _______,   _______,      _______
+    )
+};
diff --git a/keyboards/cutie_club/novus/keymaps/via/rules.mk b/keyboards/cutie_club/novus/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/cutie_club/novus/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/cutie_club/novus/novus.c b/keyboards/cutie_club/novus/novus.c
new file mode 100644
index 0000000000..2fe5fbfc8f
--- /dev/null
+++ b/keyboards/cutie_club/novus/novus.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 Cutie Club
+ *
+ * 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 "novus.h"
diff --git a/keyboards/cutie_club/novus/novus.h b/keyboards/cutie_club/novus/novus.h
new file mode 100644
index 0000000000..31ed6a8ac6
--- /dev/null
+++ b/keyboards/cutie_club/novus/novus.h
@@ -0,0 +1,33 @@
+/* Copyright 2022 Cutie Club
+ *
+ * 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_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, \
+    k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13,         \
+    k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12,                 \
+    k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12,                 \
+    k04_00, k04_01, k04_02,                 k04_05,                         k04_09, k04_10, k04_11, k04_12                  \
+) { \
+    { k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14 }, \
+    { k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, KC_NO  }, \
+    { k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, KC_NO,  KC_NO  }, \
+    { k03_00, k03_01, k03_02, k03_03, k03_04, k03_05, k03_06, k03_07, k03_08, k03_09, k03_10, k03_11, k03_12, KC_NO,  KC_NO  }, \
+    { k04_00, k04_01, k04_02, KC_NO,  KC_NO,  k04_05, KC_NO,  KC_NO,  KC_NO,  k04_09, k04_10, k04_11, k04_12, KC_NO,  KC_NO  }  \
+}
diff --git a/keyboards/cutie_club/novus/readme.md b/keyboards/cutie_club/novus/readme.md
new file mode 100644
index 0000000000..94e284e33e
--- /dev/null
+++ b/keyboards/cutie_club/novus/readme.md
@@ -0,0 +1,26 @@
+# Novus
+
+![Novus](https://i.imgur.com/kuCDFb0h.png)
+
+Novus 60% Keyboard
+
+* Keyboard Maintainer: [Cutie Club](https://github.com/cutie-club)
+* Hardware Supported: Atmega32u4 based pcb for Novus keyboard
+* Hardware Availability: https://mechsandco.com/products/gb-novus60-keyboard
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cutie_club/novus:default
+
+Flashing example for this keyboard:
+
+    make cutie_club/novus:default:flash
+
+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).
+
+## Bootloader
+
+Using the default keymaps you can enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (the top left key) and plug in the keyboard
+* **Physical reset button**: Press the button on the back of the PCB
\ No newline at end of file
diff --git a/keyboards/cutie_club/novus/rules.mk b/keyboards/cutie_club/novus/rules.mk
new file mode 100644
index 0000000000..1275531ef6
--- /dev/null
+++ b/keyboards/cutie_club/novus/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 40d6766576da5f9116bb16fb73c0742f4e4ce3b8 Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Wed, 9 Mar 2022 01:03:05 +0800
Subject: [PATCH 773/867] [Keyboard] Add Y&R Studio zhou65 keyboard (#14192)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/yandrstudio/zhou65/config.h         | 38 +++++++++
 keyboards/yandrstudio/zhou65/f401/board.h     | 21 +++++
 keyboards/yandrstudio/zhou65/f401/config.h    | 33 ++++++++
 keyboards/yandrstudio/zhou65/f401/halconf.h   | 33 ++++++++
 keyboards/yandrstudio/zhou65/f401/mcuconf.h   | 81 +++++++++++++++++++
 keyboards/yandrstudio/zhou65/f401/rules.mk    |  6 ++
 keyboards/yandrstudio/zhou65/info.json        | 10 +++
 .../zhou65/keymaps/default/keymap.c           | 32 ++++++++
 .../yandrstudio/zhou65/keymaps/via/keymap.c   | 32 ++++++++
 .../yandrstudio/zhou65/keymaps/via/rules.mk   |  1 +
 keyboards/yandrstudio/zhou65/readme.md        | 22 +++++
 keyboards/yandrstudio/zhou65/rules.mk         | 12 +++
 keyboards/yandrstudio/zhou65/zhou65.c         | 17 ++++
 keyboards/yandrstudio/zhou65/zhou65.h         | 32 ++++++++
 14 files changed, 370 insertions(+)
 create mode 100644 keyboards/yandrstudio/zhou65/config.h
 create mode 100644 keyboards/yandrstudio/zhou65/f401/board.h
 create mode 100644 keyboards/yandrstudio/zhou65/f401/config.h
 create mode 100644 keyboards/yandrstudio/zhou65/f401/halconf.h
 create mode 100644 keyboards/yandrstudio/zhou65/f401/mcuconf.h
 create mode 100644 keyboards/yandrstudio/zhou65/f401/rules.mk
 create mode 100644 keyboards/yandrstudio/zhou65/info.json
 create mode 100644 keyboards/yandrstudio/zhou65/keymaps/default/keymap.c
 create mode 100644 keyboards/yandrstudio/zhou65/keymaps/via/keymap.c
 create mode 100644 keyboards/yandrstudio/zhou65/keymaps/via/rules.mk
 create mode 100644 keyboards/yandrstudio/zhou65/readme.md
 create mode 100644 keyboards/yandrstudio/zhou65/rules.mk
 create mode 100644 keyboards/yandrstudio/zhou65/zhou65.c
 create mode 100644 keyboards/yandrstudio/zhou65/zhou65.h

diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h
new file mode 100644
index 0000000000..7dbbd037ec
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/config.h
@@ -0,0 +1,38 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * 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       0xAA96
+#define PRODUCT_ID      0xAAAD
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    ZHOU_Y&R
+#define PRODUCT         zhou65
+
+/* enable the nkro when using the VIA. */
+#define FORCE_NKRO
+
+/* fix VIA RGB_light */
+#define VIA_HAS_BROKEN_KEYCODES
+
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define USB_POLLING_INTERVAL_MS 1
+#define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/yandrstudio/zhou65/f401/board.h b/keyboards/yandrstudio/zhou65/f401/board.h
new file mode 100644
index 0000000000..80dd97ed57
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/f401/board.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 8000000
diff --git a/keyboards/yandrstudio/zhou65/f401/config.h b/keyboards/yandrstudio/zhou65/f401/config.h
new file mode 100644
index 0000000000..d5214b75d0
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/f401/config.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * 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"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { A2, A1, B8, B7, C15 }
+#define MATRIX_COL_PINS { B9, B6, B5, B4, B3, B1, B0, A7, A6, A5, A4, A3, A8, B15, B14 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+#define LED_CAPS_LOCK_PIN A15
+#define LED_PIN_ON_STATE    0
+
diff --git a/keyboards/yandrstudio/zhou65/f401/halconf.h b/keyboards/yandrstudio/zhou65/f401/halconf.h
new file mode 100644
index 0000000000..cf7665e3f7
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/f401/halconf.h
@@ -0,0 +1,33 @@
+/* Copyright 2020 QMK
+ *
+ * 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_next <halconf.h>
+
+
+#undef  SERIAL_USB_BUFFERS_SIZE
+#define SERIAL_USB_BUFFERS_SIZE 256
+
+#undef  SERIAL_BUFFERS_SIZE
+#define SERIAL_BUFFERS_SIZE     128
+
+#undef  SPI_USE_WAIT
+#define SPI_USE_WAIT TRUE
+
+#undef  SPI_SELECT_MODE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
diff --git a/keyboards/yandrstudio/zhou65/f401/mcuconf.h b/keyboards/yandrstudio/zhou65/f401/mcuconf.h
new file mode 100644
index 0000000000..435455d3a9
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/f401/mcuconf.h
@@ -0,0 +1,81 @@
+/* Copyright 2020 QMK
+ *
+ * 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_next <mcuconf.h>
+
+#undef STM32_NO_INIT
+#undef STM32_HSI_ENABLED
+#undef STM32_LSI_ENABLED
+#undef STM32_HSE_ENABLED
+#undef STM32_LSE_ENABLED
+#undef STM32_CLOCK48_REQUIRED
+#undef STM32_SW
+#undef STM32_PLLSRC
+#undef STM32_PLLM_VALUE
+#undef STM32_PLLN_VALUE
+#undef STM32_PLLP_VALUE
+#undef STM32_PLLQ_VALUE
+#undef STM32_HPRE
+#undef STM32_PPRE1
+#undef STM32_PPRE2
+#undef STM32_RTCSEL
+#undef STM32_RTCPRE_VALUE
+#undef STM32_MCO1SEL
+#undef STM32_MCO1PRE
+#undef STM32_MCO2SEL
+#undef STM32_MCO2PRE
+#undef STM32_I2SSRC
+#undef STM32_PLLI2SN_VALUE
+#undef STM32_PLLI2SR_VALUE
+#undef STM32_PVD_ENABLE
+#undef STM32_PLS
+#undef STM32_BKPRAM_ENABLE
+
+#define STM32_NO_INIT                       FALSE
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_CLOCK48_REQUIRED              TRUE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSE
+#define STM32_PLLM_VALUE                    8
+#define STM32_PLLN_VALUE                    192
+#define STM32_PLLP_VALUE                    4
+#define STM32_PLLQ_VALUE                    4
+// AHB prescaler value.
+#define STM32_HPRE                          STM32_HPRE_DIV1
+//APB1 prescaler value.
+#define STM32_PPRE1                         STM32_PPRE1_DIV4
+//APB2 prescaler value.
+#define STM32_PPRE2                         STM32_PPRE2_DIV2
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+#define STM32_RTCPRE_VALUE                  8
+#define STM32_MCO1SEL                       STM32_MCO1SEL_HSI
+#define STM32_MCO1PRE                       STM32_MCO1PRE_DIV1
+#define STM32_MCO2SEL                       STM32_MCO2SEL_SYSCLK
+#define STM32_MCO2PRE                       STM32_MCO2PRE_DIV5
+#define STM32_I2SSRC                        STM32_I2SSRC_CKIN
+#define STM32_PLLI2SN_VALUE                 192
+#define STM32_PLLI2SR_VALUE                 5
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_BKPRAM_ENABLE                 FALSE
+
+
+
diff --git a/keyboards/yandrstudio/zhou65/f401/rules.mk b/keyboards/yandrstudio/zhou65/f401/rules.mk
new file mode 100644
index 0000000000..3e060b4195
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/f401/rules.mk
@@ -0,0 +1,6 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json
new file mode 100644
index 0000000000..640fb7ad68
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "zhou65", 
+    "url": "https://github.com/Oh-My-Mechanical-Keyboard ", 
+    "maintainer": "Jason Ren (biu)", 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0, "w":2}, {"label":"0,14", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"1,14", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,13", "x":12.75, "y":2, "w":2.25}, {"label":"2,14", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,1", "x":2.25, "y":3}, {"label":"3,2", "x":3.25, "y":3}, {"label":"3,3", "x":4.25, "y":3}, {"label":"3,4", "x":5.25, "y":3}, {"label":"3,5", "x":6.25, "y":3}, {"label":"3,6", "x":7.25, "y":3}, {"label":"3,7", "x":8.25, "y":3}, {"label":"3,8", "x":9.25, "y":3}, {"label":"3,9", "x":10.25, "y":3}, {"label":"3,10", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"3,14", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,5", "x":3.75, "y":4, "w":6.25}, {"label":"4,9", "x":10, "y":4, "w":1.25}, {"label":"4,10", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/yandrstudio/zhou65/keymaps/default/keymap.c b/keyboards/yandrstudio/zhou65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b06ae7e70b
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	LAYOUT(
+		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+		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_PGDN,
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+
+	LAYOUT(
+		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/keyboards/yandrstudio/zhou65/keymaps/via/keymap.c b/keyboards/yandrstudio/zhou65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b06ae7e70b
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/keymaps/via/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	LAYOUT(
+		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+		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_PGDN,
+		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+
+	LAYOUT(
+		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/keyboards/yandrstudio/zhou65/keymaps/via/rules.mk b/keyboards/yandrstudio/zhou65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yandrstudio/zhou65/readme.md b/keyboards/yandrstudio/zhou65/readme.md
new file mode 100644
index 0000000000..84c889f5ab
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/readme.md
@@ -0,0 +1,22 @@
+# zhou65 version 1.0
+
+A 65% keys keyboard with rgb (keys).
+This keyboard use 8mhz HSE and STM32F401 as MCU.
+
+- Keyboard Maintainer: https://github.com/jiaxin96
+- Hardware Supported: zhou65
+- Hardware Availability: https://github.com/Oh-My-Mechanical-Keyboard 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yandrstudio/zhou65/f401:default
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key which is Escape in this keyboard) and plug in the keyboard
+* **Physical reset pins**: Short circuit the `bt0` and `vcc` pins on the back of the PCB and plug in the keyboard
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available.
diff --git a/keyboards/yandrstudio/zhou65/rules.mk b/keyboards/yandrstudio/zhou65/rules.mk
new file mode 100644
index 0000000000..b851d0ab39
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/rules.mk
@@ -0,0 +1,12 @@
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/yandrstudio/zhou65/zhou65.c b/keyboards/yandrstudio/zhou65/zhou65.c
new file mode 100644
index 0000000000..e527550c9d
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/zhou65.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * 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 "zhou65.h"
diff --git a/keyboards/yandrstudio/zhou65/zhou65.h b/keyboards/yandrstudio/zhou65/zhou65.h
new file mode 100644
index 0000000000..2f22710f46
--- /dev/null
+++ b/keyboards/yandrstudio/zhou65/zhou65.h
@@ -0,0 +1,32 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * 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(\
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,\
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,\
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,       K213, K214,\
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,       K312, K313, K314,\
+    K400, K401, K402,             K405,                   K409, K410,       K412, K413, K414\
+) {\
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014 },\
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114 },\
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, K213,  K214 },\
+    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  KC_NO, K312,  K313,  K314 },\
+    { K400,  K401,  K402,  KC_NO, KC_NO, K405,  KC_NO, KC_NO, KC_NO, K409,  K410,  KC_NO, K412,  K413,  K414 }\
+}

From 65eb0f939fb35de66e6772ca358311f2c12344f6 Mon Sep 17 00:00:00 2001
From: drewpyun <48503175+drewpyun@users.noreply.github.com>
Date: Tue, 8 Mar 2022 13:56:48 -0500
Subject: [PATCH 774/867] [keymap] Add via support for Iskar (#16575)

* iskar initial commit

* testing

* added info.json to iskar

* Updated read.me

* updated info.json removed unnessary keymap folders, fixed rules.mk, added second layer to default layout, added vendor/product id, tested and compiled

* Update readme.md

* Update readme.md

* updated info.json, formatted files according to PR checklist

* Update keyboards/drewkeys/iskar/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/drewkeys/iskar/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* added keymaps onto iskar.h that was referenced in info.json

* changed filename to lowercase to match guidelines

* initial commit of VIA files

* edited via keymap

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/drewkeys/iskar/keymaps/via/keymap.c | 47 +++++++++++++++++++
 .../drewkeys/iskar/keymaps/via/readme.md      |  1 +
 keyboards/drewkeys/iskar/keymaps/via/rules.mk |  2 +
 3 files changed, 50 insertions(+)
 create mode 100644 keyboards/drewkeys/iskar/keymaps/via/keymap.c
 create mode 100644 keyboards/drewkeys/iskar/keymaps/via/readme.md
 create mode 100644 keyboards/drewkeys/iskar/keymaps/via/rules.mk

diff --git a/keyboards/drewkeys/iskar/keymaps/via/keymap.c b/keyboards/drewkeys/iskar/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ba77cb4077
--- /dev/null
+++ b/keyboards/drewkeys/iskar/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2021 Drewkeys
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] LAYOUT(
+      QK_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_DEL,  KC_BSPC, KC_HOME,
+      KC_TAB,    KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,             KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_INS,
+      KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,             KC_SCLN, KC_QUOT, KC_ENT,           KC_PGUP,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,                    KC_RSFT, KC_UP,   KC_PGDN,
+      KC_LCTRL, KC_LGUI, KC_LALT,        KC_SPC,                    MO(1), KC_RCTRL,                   KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [1] LAYOUT(
+      KC_GRAVE,    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_TRNS,   RESET,  KC_TRNS,
+      KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS,                    KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+  [2] LAYOUT(
+      KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,     KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,
+      KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS,                    KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+  [3] LAYOUT(
+      KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS,     KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS,
+      KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS,        KC_TRNS,                    KC_TRNS, KC_TRNS,                 KC_TRNS, KC_TRNS, KC_TRNS
+  )
+};
diff --git a/keyboards/drewkeys/iskar/keymaps/via/readme.md b/keyboards/drewkeys/iskar/keymaps/via/readme.md
new file mode 100644
index 0000000000..9b6e8c67b5
--- /dev/null
+++ b/keyboards/drewkeys/iskar/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default keymap for iskar for via
diff --git a/keyboards/drewkeys/iskar/keymaps/via/rules.mk b/keyboards/drewkeys/iskar/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/drewkeys/iskar/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

From b593cfccbde7b4fa7feb0e756eb601f7717bed98 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 9 Mar 2022 07:45:47 +1100
Subject: [PATCH 775/867] `qmk info`: Nicer rendering of big-ass enter (#16541)

* `qmk info`: Nicer rendering of big-ass enter

* Formatting...
---
 lib/python/qmk/keyboard.py | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py
index 0530c4acc5..7cd0a1d5a7 100644
--- a/lib/python/qmk/keyboard.py
+++ b/lib/python/qmk/keyboard.py
@@ -178,6 +178,8 @@ def render_layout(layout_data, render_ascii, key_labels=None):
 
         if x >= 0.25 and w == 1.25 and h == 2:
             render_key_isoenter(textpad, x, y, w, h, label, style)
+        elif w == 2.25 and h == 2:
+            render_key_baenter(textpad, x, y, w, h, label, style)
         else:
             render_key_rect(textpad, x, y, w, h, label, style)
 
@@ -259,4 +261,36 @@ def render_key_isoenter(textpad, x, y, w, h, label, style):
     textpad[y + 2][x - 1:x + w] = crn_line
     textpad[y + 3][x:x + w] = mid_line
     textpad[y + 4][x:x + w] = mid_line
-    textpad[y + h - 1][x:x + w] = bot_line
+    textpad[y + 5][x:x + w] = bot_line
+
+
+def render_key_baenter(textpad, x, y, w, h, label, style):
+    box_chars = BOX_DRAWING_CHARACTERS[style]
+    x = ceil(x * 4)
+    y = ceil(y * 3)
+    w = ceil(w * 4)
+    h = ceil(h * 3)
+
+    label_len = w - 2
+    label_leftover = label_len - len(label)
+
+    if len(label) > label_len:
+        label = label[:label_len]
+
+    label_blank = ' ' * (label_len-3)  # noqa: yapf insists there be no whitespace around - and *
+    label_border_top = box_chars['h'] * (label_len-3)  # noqa
+    label_border_bottom = box_chars['h'] * label_len
+    label_middle = label + ' '*label_leftover  # noqa
+
+    top_line = array('u', box_chars['tl'] + label_border_top + box_chars['tr'])
+    mid_line = array('u', box_chars['v'] + label_blank + box_chars['v'])
+    crn_line = array('u', box_chars['tl'] + box_chars['h'] + box_chars['h'] + box_chars['br'] + label_blank + box_chars['v'])
+    lab_line = array('u', box_chars['v'] + label_middle + box_chars['v'])
+    bot_line = array('u', box_chars['bl'] + label_border_bottom + box_chars['br'])
+
+    textpad[y][x + 3:x + w] = top_line
+    textpad[y + 1][x + 3:x + w] = mid_line
+    textpad[y + 2][x + 3:x + w] = mid_line
+    textpad[y + 3][x:x + w] = crn_line
+    textpad[y + 4][x:x + w] = lab_line
+    textpad[y + 5][x:x + w] = bot_line

From d38696a4937525d34445bf23863f99675ec2f54c Mon Sep 17 00:00:00 2001
From: Jason Barnachea <jrbarnachea@gmail.com>
Date: Tue, 8 Mar 2022 13:24:06 -0800
Subject: [PATCH 776/867] [Keyboard] Add Rama Works M4-A (#16570)

* Initial commit

Add Rama Works M4-A keyboard.

* Update default keymap.c

* Update keyboards/machine_industries/m4_a/config.h

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/machine_industries/m4_a/config.h    | 138 ++++++++++++++++++
 keyboards/machine_industries/m4_a/info.json   |  15 ++
 .../m4_a/keymaps/default/keymap.c             |  17 +++
 keyboards/machine_industries/m4_a/m4_a.c      |   4 +
 keyboards/machine_industries/m4_a/m4_a.h      |  22 +++
 keyboards/machine_industries/m4_a/readme.md   |  27 ++++
 keyboards/machine_industries/m4_a/rules.mk    |  18 +++
 7 files changed, 241 insertions(+)
 create mode 100644 keyboards/machine_industries/m4_a/config.h
 create mode 100644 keyboards/machine_industries/m4_a/info.json
 create mode 100644 keyboards/machine_industries/m4_a/keymaps/default/keymap.c
 create mode 100644 keyboards/machine_industries/m4_a/m4_a.c
 create mode 100644 keyboards/machine_industries/m4_a/m4_a.h
 create mode 100644 keyboards/machine_industries/m4_a/readme.md
 create mode 100644 keyboards/machine_industries/m4_a/rules.mk

diff --git a/keyboards/machine_industries/m4_a/config.h b/keyboards/machine_industries/m4_a/config.h
new file mode 100644
index 0000000000..1ba3f4f715
--- /dev/null
+++ b/keyboards/machine_industries/m4_a/config.h
@@ -0,0 +1,138 @@
+// Copyright 2022 naut
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x5241 // "RA"
+#define PRODUCT_ID   0x004A // 4-A
+#define DEVICE_VER   0x0001
+#define MANUFACTURER RAMA WORKS
+#define PRODUCT      M4-A
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 2
+
+/*
+ * 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 { C7, C6 }
+#define MATRIX_COL_PINS { F6, F7 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/machine_industries/m4_a/info.json b/keyboards/machine_industries/m4_a/info.json
new file mode 100644
index 0000000000..4a2f03e741
--- /dev/null
+++ b/keyboards/machine_industries/m4_a/info.json
@@ -0,0 +1,15 @@
+{
+    "keyboard_name": "Rama Works M4-A",
+    "url": "http://rama.works",
+    "maintainer": "naut",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0, "h":2},
+                {"x":0, "y":1, "w":2}
+            ]
+        }
+    }
+}
diff --git a/keyboards/machine_industries/m4_a/keymaps/default/keymap.c b/keyboards/machine_industries/m4_a/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f5c02a185b
--- /dev/null
+++ b/keyboards/machine_industries/m4_a/keymaps/default/keymap.c
@@ -0,0 +1,17 @@
+// Copyright 2022 naut
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_1,   KC_2,   KC_3,
+        KC_0
+    )
+};
diff --git a/keyboards/machine_industries/m4_a/m4_a.c b/keyboards/machine_industries/m4_a/m4_a.c
new file mode 100644
index 0000000000..a1598688a8
--- /dev/null
+++ b/keyboards/machine_industries/m4_a/m4_a.c
@@ -0,0 +1,4 @@
+// Copyright 2022 naut
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "m4_a.h"
diff --git a/keyboards/machine_industries/m4_a/m4_a.h b/keyboards/machine_industries/m4_a/m4_a.h
new file mode 100644
index 0000000000..13d3010991
--- /dev/null
+++ b/keyboards/machine_industries/m4_a/m4_a.h
@@ -0,0 +1,22 @@
+// Copyright 2022 naut
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    k00, k01, k11, \
+    k10  \
+) { \
+    { k00, k01 }, \
+    { k10, k11 }  \
+}
diff --git a/keyboards/machine_industries/m4_a/readme.md b/keyboards/machine_industries/m4_a/readme.md
new file mode 100644
index 0000000000..37c16639d1
--- /dev/null
+++ b/keyboards/machine_industries/m4_a/readme.md
@@ -0,0 +1,27 @@
+# Rama Works x Machine Industries M4-A
+
+![Rama Works x Machine Industries M4-A](https://images.squarespace-cdn.com/content/v1/563c788ae4b099120ae219e2/1479361502907-WL2VUR210J6RFD84WH2E/image-asset.jpeg?format=1500w)
+
+A tiny 4-key macropad designed by Rama Works.
+
+* Keyboard Maintainer: [naut](https://github.com/nautxx)
+* Hardware Supported: Rama Works x Machine Industries M4-A PCB
+* Hardware Availability: [Rama Works Store](https://ramaworks.store/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make machine_industries/m4_a:default
+
+Flashing example for this keyboard:
+
+    make machine_industries/m4_a:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/machine_industries/m4_a/rules.mk b/keyboards/machine_industries/m4_a/rules.mk
new file mode 100644
index 0000000000..1275531ef6
--- /dev/null
+++ b/keyboards/machine_industries/m4_a/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 3347b63d83d019219770f55627f3d5136806bb5c Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 9 Mar 2022 09:07:02 +1100
Subject: [PATCH 777/867] handwired/misterdeck refactor (#16572)

* handwired/misterdeck refactor

* Forgot to remove this
---
 keyboards/handwired/misterdeck/config.h       | 57 ++++++-------------
 keyboards/handwired/misterdeck/info.json      | 31 ++++++++++
 .../misterdeck/keymaps/default/config.h       |  3 +-
 .../misterdeck/keymaps/default/keymap.c       | 13 +++--
 .../misterdeck/keymaps/default/rules.mk       |  1 +
 .../misterdeck/keymaps/nobuttons/config.h     | 31 +++++-----
 .../misterdeck/keymaps/nobuttons/keymap.c     | 13 +++--
 .../misterdeck/keymaps/nobuttons/rules.mk     |  1 +
 keyboards/handwired/misterdeck/misterdeck.c   |  3 +-
 keyboards/handwired/misterdeck/misterdeck.h   | 11 ++--
 keyboards/handwired/misterdeck/readme.md      |  2 +-
 keyboards/handwired/misterdeck/rules.mk       |  3 -
 12 files changed, 89 insertions(+), 80 deletions(-)
 create mode 100644 keyboards/handwired/misterdeck/keymaps/default/rules.mk
 create mode 100644 keyboards/handwired/misterdeck/keymaps/nobuttons/rules.mk

diff --git a/keyboards/handwired/misterdeck/config.h b/keyboards/handwired/misterdeck/config.h
index 3aaef79d0a..085142d2d5 100644
--- a/keyboards/handwired/misterdeck/config.h
+++ b/keyboards/handwired/misterdeck/config.h
@@ -1,45 +1,20 @@
 /*
-Copyright 2021 Chris Broekema (broekema@gmail.com)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ * Copyright 2021 Chris Broekema (broekema@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #pragma once
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0xBEEF
-#define PRODUCT_ID   0x6969
-#define DEVICE_VER   0x0001
-#define MANUFACTURER QMK
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 4
-
-#define MATRIX_ROW_PINS { D1, D0, D4 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-//#define JOYSTICK_AXES_COUNT 4
-//#define JOYSTICK_BUTTON_COUNT 8
+#include "config_common.h"
diff --git a/keyboards/handwired/misterdeck/info.json b/keyboards/handwired/misterdeck/info.json
index 84c3863107..20d74d8e3c 100644
--- a/keyboards/handwired/misterdeck/info.json
+++ b/keyboards/handwired/misterdeck/info.json
@@ -1,5 +1,36 @@
 {
     "keyboard_name": "MisteRdeck",
+    "manufacturer": "broekema",
     "url": "https://www.thingiverse.com/thing:4627779",
     "maintainer": "broekema",
+    "usb": {
+        "vid": "0xBEEF",
+        "pid": "0x6969",
+        "device_version": "0.0.1"
+    },
+    "diode_direction": "ROW2COL",
+    "matrix_pins": {
+        "cols": ["D7", "E6", "B4", "B5"],
+        "rows": ["D1", "D0", "D4"]
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2}
+            ]
+        }
+    }
 }
diff --git a/keyboards/handwired/misterdeck/keymaps/default/config.h b/keyboards/handwired/misterdeck/keymaps/default/config.h
index c21c29910b..92157a0938 100644
--- a/keyboards/handwired/misterdeck/keymaps/default/config.h
+++ b/keyboards/handwired/misterdeck/keymaps/default/config.h
@@ -1,4 +1,5 @@
-/* Copyright 2021 Chris Broekema (broekema@gmail.com)
+/*
+ * Copyright 2021 Chris Broekema (broekema@gmail.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/keyboards/handwired/misterdeck/keymaps/default/keymap.c b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
index a6b6ee467e..217d25551c 100644
--- a/keyboards/handwired/misterdeck/keymaps/default/keymap.c
+++ b/keyboards/handwired/misterdeck/keymaps/default/keymap.c
@@ -15,20 +15,21 @@
  */
 
 #include QMK_KEYBOARD_H
+
 #include "joystick.h"
 
-enum layers {
+enum layer_names {
   NORMAL_LAYER = 0
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [NORMAL_LAYER] = LAYOUT( C(S(KC_F1)), C(S(KC_F2)), C(S(KC_F3)), C(S(KC_F4)),
-			   C(S(KC_F5)), C(S(KC_F6)), C(S(KC_F7)), C(S(KC_F8)),
-			   JS_BUTTON0,  JS_BUTTON1,  JS_BUTTON2,  JS_BUTTON3 ),
+    [NORMAL_LAYER] = LAYOUT(
+        C(S(KC_F1)), C(S(KC_F2)), C(S(KC_F3)), C(S(KC_F4)),
+        C(S(KC_F5)), C(S(KC_F6)), C(S(KC_F7)), C(S(KC_F8)),
+        JS_BUTTON0,  JS_BUTTON1,  JS_BUTTON2,  JS_BUTTON3
+    )
 };
 
-
-
 joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
     [0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023),
     [1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023),
diff --git a/keyboards/handwired/misterdeck/keymaps/default/rules.mk b/keyboards/handwired/misterdeck/keymaps/default/rules.mk
new file mode 100644
index 0000000000..9e44c470f2
--- /dev/null
+++ b/keyboards/handwired/misterdeck/keymaps/default/rules.mk
@@ -0,0 +1 @@
+JOYSTICK_ENABLE = yes
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h b/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
index bd150139c1..f609bf2962 100644
--- a/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/config.h
@@ -1,20 +1,19 @@
 /*
-Copyright 2021 Chris Broekema (broekema@gmail.com)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+ * Copyright 2021 Chris Broekema (broekema@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #pragma once
 
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c b/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
index fbeb636cf2..d4c52be35d 100644
--- a/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/keymap.c
@@ -15,20 +15,21 @@
  */
 
 #include QMK_KEYBOARD_H
+
 #include "joystick.h"
 
-enum layers {
+enum layer_names {
   NORMAL_LAYER = 0
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [NORMAL_LAYER] = LAYOUT( C(S(KC_F1)), C(S(KC_F2)), C(S(KC_F3)), C(S(KC_F4)),
-			   C(S(KC_F5)), C(S(KC_F6)), C(S(KC_F7)), C(S(KC_F8)),
-			   C(S(KC_F9)), C(S(KC_F10)), C(S(KC_F11)), C(S(KC_F12))),
+    [NORMAL_LAYER] = LAYOUT(
+        C(S(KC_F1)), C(S(KC_F2)),  C(S(KC_F3)),  C(S(KC_F4)),
+        C(S(KC_F5)), C(S(KC_F6)),  C(S(KC_F7)),  C(S(KC_F8)),
+        C(S(KC_F9)), C(S(KC_F10)), C(S(KC_F11)), C(S(KC_F12))
+    ),
 };
 
-
-
 joystick_config_t joystick_axes[JOYSTICK_AXES_COUNT] = {
     [0] = JOYSTICK_AXIS_IN(F4, 0, 512, 1023),
     [1] = JOYSTICK_AXIS_IN(F5, 0, 512, 1023),
diff --git a/keyboards/handwired/misterdeck/keymaps/nobuttons/rules.mk b/keyboards/handwired/misterdeck/keymaps/nobuttons/rules.mk
new file mode 100644
index 0000000000..9e44c470f2
--- /dev/null
+++ b/keyboards/handwired/misterdeck/keymaps/nobuttons/rules.mk
@@ -0,0 +1 @@
+JOYSTICK_ENABLE = yes
diff --git a/keyboards/handwired/misterdeck/misterdeck.c b/keyboards/handwired/misterdeck/misterdeck.c
index a096e9ce95..ee9cc93b3a 100644
--- a/keyboards/handwired/misterdeck/misterdeck.c
+++ b/keyboards/handwired/misterdeck/misterdeck.c
@@ -1,4 +1,5 @@
-/* Copyright 2021 Chris Broekema (broekema@gmail.com)
+/*
+ * Copyright 2021 Chris Broekema (broekema@gmail.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/keyboards/handwired/misterdeck/misterdeck.h b/keyboards/handwired/misterdeck/misterdeck.h
index a86ca2c2c9..324ccb755f 100644
--- a/keyboards/handwired/misterdeck/misterdeck.h
+++ b/keyboards/handwired/misterdeck/misterdeck.h
@@ -1,4 +1,5 @@
-/* Copyright 2021 Chris Broekema (broekema@gmail.com)
+/*
+ * Copyright 2021 Chris Broekema (broekema@gmail.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,11 +20,11 @@
 #include "quantum.h"
 
 #define LAYOUT( \
-  k00, k01, k02, k03, \
-  k10, k11, k12, k13, \
-  k20, k21, k22, k23  \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13, \
+    k20, k21, k22, k23 \
 ) { \
     { k00, k01, k02, k03 }, \
     { k10, k11, k12, k13 }, \
-    { k20, k21, k22, k23 }  \
+    { k20, k21, k22, k23 } \
 }
diff --git a/keyboards/handwired/misterdeck/readme.md b/keyboards/handwired/misterdeck/readme.md
index b9d472319a..dd592e646a 100644
--- a/keyboards/handwired/misterdeck/readme.md
+++ b/keyboards/handwired/misterdeck/readme.md
@@ -18,4 +18,4 @@ Flashing example for this keyboard:
 
 Connect a momentary switch to RST and GND, hit twice in succession to reset the board into bootloader mode.
 
-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).
\ No newline at end of file
+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).
diff --git a/keyboards/handwired/misterdeck/rules.mk b/keyboards/handwired/misterdeck/rules.mk
index c19a30931a..7479d0121f 100644
--- a/keyboards/handwired/misterdeck/rules.mk
+++ b/keyboards/handwired/misterdeck/rules.mk
@@ -16,6 +16,3 @@ NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-
-# use joystick feature for sliders
-JOYSTICK_ENABLE = yes

From 022e1fdac86c38136d6f818aec15d34b1ab92be5 Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Tue, 8 Mar 2022 17:08:02 -0500
Subject: [PATCH 778/867] Add Big Switch Seat (#16524)

* Add Big Switch Seat

* Update keyboards/keebio/bigswitchseat/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/keebio/bigswitchseat/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../keebio/bigswitchseat/bigswitchseat.c      |  4 +
 .../keebio/bigswitchseat/bigswitchseat.h      | 12 +++
 keyboards/keebio/bigswitchseat/config.h       | 86 +++++++++++++++++++
 keyboards/keebio/bigswitchseat/info.json      | 10 +++
 .../bigswitchseat/keymaps/default/keymap.c    | 27 ++++++
 .../bigswitchseat/keymaps/default/rules.mk    |  1 +
 .../keebio/bigswitchseat/keymaps/via/keymap.c | 27 ++++++
 .../keebio/bigswitchseat/keymaps/via/rules.mk |  2 +
 keyboards/keebio/bigswitchseat/readme.md      | 25 ++++++
 keyboards/keebio/bigswitchseat/rules.mk       | 18 ++++
 10 files changed, 212 insertions(+)
 create mode 100644 keyboards/keebio/bigswitchseat/bigswitchseat.c
 create mode 100644 keyboards/keebio/bigswitchseat/bigswitchseat.h
 create mode 100644 keyboards/keebio/bigswitchseat/config.h
 create mode 100644 keyboards/keebio/bigswitchseat/info.json
 create mode 100644 keyboards/keebio/bigswitchseat/keymaps/default/keymap.c
 create mode 100644 keyboards/keebio/bigswitchseat/keymaps/default/rules.mk
 create mode 100644 keyboards/keebio/bigswitchseat/keymaps/via/keymap.c
 create mode 100644 keyboards/keebio/bigswitchseat/keymaps/via/rules.mk
 create mode 100644 keyboards/keebio/bigswitchseat/readme.md
 create mode 100644 keyboards/keebio/bigswitchseat/rules.mk

diff --git a/keyboards/keebio/bigswitchseat/bigswitchseat.c b/keyboards/keebio/bigswitchseat/bigswitchseat.c
new file mode 100644
index 0000000000..a322fdad62
--- /dev/null
+++ b/keyboards/keebio/bigswitchseat/bigswitchseat.c
@@ -0,0 +1,4 @@
+// Copyright 2021 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "bigswitchseat.h"
diff --git a/keyboards/keebio/bigswitchseat/bigswitchseat.h b/keyboards/keebio/bigswitchseat/bigswitchseat.h
new file mode 100644
index 0000000000..3f66c6bc3b
--- /dev/null
+++ b/keyboards/keebio/bigswitchseat/bigswitchseat.h
@@ -0,0 +1,12 @@
+// Copyright 2021 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    k00 \
+) { \
+    { k00 }  \
+}
diff --git a/keyboards/keebio/bigswitchseat/config.h b/keyboards/keebio/bigswitchseat/config.h
new file mode 100644
index 0000000000..f5558ca279
--- /dev/null
+++ b/keyboards/keebio/bigswitchseat/config.h
@@ -0,0 +1,86 @@
+// Copyright 2021 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xCB10
+#define PRODUCT_ID   0x1011
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Keebio
+#define PRODUCT      Big Switch Seat
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 1
+
+/*
+ * Keyboard Matrix Assignments
+ */
+
+#define MATRIX_ROW_PINS { E6 }
+#define MATRIX_COL_PINS { F0 }
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keebio/bigswitchseat/info.json b/keyboards/keebio/bigswitchseat/info.json
new file mode 100644
index 0000000000..10328da26f
--- /dev/null
+++ b/keyboards/keebio/bigswitchseat/info.json
@@ -0,0 +1,10 @@
+{
+    "keyboard_name": "Big Switch Seat",
+    "url": "https://robotcandy.company/",
+    "maintainer": "nooges",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"x": 0, "y": 0, "w": 4, "h": 4}]
+        }
+    }
+}
diff --git a/keyboards/keebio/bigswitchseat/keymaps/default/keymap.c b/keyboards/keebio/bigswitchseat/keymaps/default/keymap.c
new file mode 100644
index 0000000000..6d4378b995
--- /dev/null
+++ b/keyboards/keebio/bigswitchseat/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2021 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _MAIN,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MAIN] = LAYOUT(
+        KC_A
+    ),
+    [_FN1] = LAYOUT(
+        _______
+    ),
+    [_FN2] = LAYOUT(
+        _______
+    ),
+    [_FN3] = LAYOUT(
+        _______
+    )
+};
diff --git a/keyboards/keebio/bigswitchseat/keymaps/default/rules.mk b/keyboards/keebio/bigswitchseat/keymaps/default/rules.mk
new file mode 100644
index 0000000000..4da205a168
--- /dev/null
+++ b/keyboards/keebio/bigswitchseat/keymaps/default/rules.mk
@@ -0,0 +1 @@
+LTO_ENABLE = yes
diff --git a/keyboards/keebio/bigswitchseat/keymaps/via/keymap.c b/keyboards/keebio/bigswitchseat/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6d4378b995
--- /dev/null
+++ b/keyboards/keebio/bigswitchseat/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+// Copyright 2021 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _MAIN,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MAIN] = LAYOUT(
+        KC_A
+    ),
+    [_FN1] = LAYOUT(
+        _______
+    ),
+    [_FN2] = LAYOUT(
+        _______
+    ),
+    [_FN3] = LAYOUT(
+        _______
+    )
+};
diff --git a/keyboards/keebio/bigswitchseat/keymaps/via/rules.mk b/keyboards/keebio/bigswitchseat/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/keebio/bigswitchseat/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/keebio/bigswitchseat/readme.md b/keyboards/keebio/bigswitchseat/readme.md
new file mode 100644
index 0000000000..43e62d4e53
--- /dev/null
+++ b/keyboards/keebio/bigswitchseat/readme.md
@@ -0,0 +1,25 @@
+# Big Switch Seat
+
+PCB for the Big Switch.
+
+* Keyboard Maintainer: [Keebio](https://github.com/nooges)
+* Hardware Supported: Big Switch Seat PCB
+* Hardware Availability: [Robot Candy Company](https://robotcandy.company/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keebio/bigswitchseat:default
+
+Flashing example for this keyboard:
+
+    make keebio/bigswitchseat:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/keebio/bigswitchseat/rules.mk b/keyboards/keebio/bigswitchseat/rules.mk
new file mode 100644
index 0000000000..d6d12ae0db
--- /dev/null
+++ b/keyboards/keebio/bigswitchseat/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # 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 = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 5244b13173e3df8f12f6e7338533c262e3acf88f Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 8 Mar 2022 17:37:40 -0700
Subject: [PATCH 779/867] Fix yandrstudio/zhou65 (#16589)

* initial cleanup and hotfix for rgb....

* remove /f401
---
 .../yandrstudio/zhou65/{f401 => }/board.h     |  0
 keyboards/yandrstudio/zhou65/config.h         | 19 ++++++---
 keyboards/yandrstudio/zhou65/f401/config.h    | 33 ----------------
 keyboards/yandrstudio/zhou65/f401/halconf.h   | 33 ----------------
 keyboards/yandrstudio/zhou65/f401/rules.mk    |  6 ---
 .../zhou65/keymaps/default/keymap.c           | 24 ++++++------
 .../yandrstudio/zhou65/keymaps/via/keymap.c   | 39 +++++++++++++------
 .../yandrstudio/zhou65/{f401 => }/mcuconf.h   |  3 --
 keyboards/yandrstudio/zhou65/readme.md        |  2 +-
 keyboards/yandrstudio/zhou65/rules.mk         |  8 +++-
 10 files changed, 61 insertions(+), 106 deletions(-)
 rename keyboards/yandrstudio/zhou65/{f401 => }/board.h (100%)
 delete mode 100644 keyboards/yandrstudio/zhou65/f401/config.h
 delete mode 100644 keyboards/yandrstudio/zhou65/f401/halconf.h
 delete mode 100644 keyboards/yandrstudio/zhou65/f401/rules.mk
 rename keyboards/yandrstudio/zhou65/{f401 => }/mcuconf.h (99%)

diff --git a/keyboards/yandrstudio/zhou65/f401/board.h b/keyboards/yandrstudio/zhou65/board.h
similarity index 100%
rename from keyboards/yandrstudio/zhou65/f401/board.h
rename to keyboards/yandrstudio/zhou65/board.h
diff --git a/keyboards/yandrstudio/zhou65/config.h b/keyboards/yandrstudio/zhou65/config.h
index 7dbbd037ec..f4d8199e13 100644
--- a/keyboards/yandrstudio/zhou65/config.h
+++ b/keyboards/yandrstudio/zhou65/config.h
@@ -24,15 +24,24 @@
 #define MANUFACTURER    ZHOU_Y&R
 #define PRODUCT         zhou65
 
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { A2, A1, B8, B7, C15 }
+#define MATRIX_COL_PINS { B9, B6, B5, B4, B3, B1, B0, A7, A6, A5, A4, A3, A8, B15, B14 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+#define LED_CAPS_LOCK_PIN A15
+#define LED_PIN_ON_STATE    0
+
 /* enable the nkro when using the VIA. */
 #define FORCE_NKRO
 
-/* fix VIA RGB_light */
-#define VIA_HAS_BROKEN_KEYCODES
-
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
-#define USB_POLLING_INTERVAL_MS 1
 #define QMK_KEYS_PER_SCAN 4
diff --git a/keyboards/yandrstudio/zhou65/f401/config.h b/keyboards/yandrstudio/zhou65/f401/config.h
deleted file mode 100644
index d5214b75d0..0000000000
--- a/keyboards/yandrstudio/zhou65/f401/config.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 JasonRen(biu)
- *
- * 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"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { A2, A1, B8, B7, C15 }
-#define MATRIX_COL_PINS { B9, B6, B5, B4, B3, B1, B0, A7, A6, A5, A4, A3, A8, B15, B14 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-#define LED_CAPS_LOCK_PIN A15
-#define LED_PIN_ON_STATE    0
-
diff --git a/keyboards/yandrstudio/zhou65/f401/halconf.h b/keyboards/yandrstudio/zhou65/f401/halconf.h
deleted file mode 100644
index cf7665e3f7..0000000000
--- a/keyboards/yandrstudio/zhou65/f401/halconf.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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_next <halconf.h>
-
-
-#undef  SERIAL_USB_BUFFERS_SIZE
-#define SERIAL_USB_BUFFERS_SIZE 256
-
-#undef  SERIAL_BUFFERS_SIZE
-#define SERIAL_BUFFERS_SIZE     128
-
-#undef  SPI_USE_WAIT
-#define SPI_USE_WAIT TRUE
-
-#undef  SPI_SELECT_MODE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
diff --git a/keyboards/yandrstudio/zhou65/f401/rules.mk b/keyboards/yandrstudio/zhou65/f401/rules.mk
deleted file mode 100644
index 3e060b4195..0000000000
--- a/keyboards/yandrstudio/zhou65/f401/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# MCU name
-MCU = STM32F401
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
diff --git a/keyboards/yandrstudio/zhou65/keymaps/default/keymap.c b/keyboards/yandrstudio/zhou65/keymaps/default/keymap.c
index b06ae7e70b..bf15ded873 100644
--- a/keyboards/yandrstudio/zhou65/keymaps/default/keymap.c
+++ b/keyboards/yandrstudio/zhou65/keymaps/default/keymap.c
@@ -16,17 +16,17 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	LAYOUT(
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-		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_PGDN,
-		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+  [0] = LAYOUT(
+    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+    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_PGDN,
+    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
 
-	LAYOUT(
-		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+  [1] = LAYOUT(
+    KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
diff --git a/keyboards/yandrstudio/zhou65/keymaps/via/keymap.c b/keyboards/yandrstudio/zhou65/keymaps/via/keymap.c
index b06ae7e70b..2a13c6d4ac 100644
--- a/keyboards/yandrstudio/zhou65/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/zhou65/keymaps/via/keymap.c
@@ -16,17 +16,32 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-	LAYOUT(
-		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
-		KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
-		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_PGDN,
-		KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+  [0] = LAYOUT(
+    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+    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_PGDN,
+    KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
+
+  [1] = LAYOUT(
+    KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+  [2] = LAYOUT(
+    KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+  [3] = LAYOUT(
+    KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
-	LAYOUT(
-		KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 };
diff --git a/keyboards/yandrstudio/zhou65/f401/mcuconf.h b/keyboards/yandrstudio/zhou65/mcuconf.h
similarity index 99%
rename from keyboards/yandrstudio/zhou65/f401/mcuconf.h
rename to keyboards/yandrstudio/zhou65/mcuconf.h
index 435455d3a9..85376734f4 100644
--- a/keyboards/yandrstudio/zhou65/f401/mcuconf.h
+++ b/keyboards/yandrstudio/zhou65/mcuconf.h
@@ -76,6 +76,3 @@
 #define STM32_PVD_ENABLE                    FALSE
 #define STM32_PLS                           STM32_PLS_LEV0
 #define STM32_BKPRAM_ENABLE                 FALSE
-
-
-
diff --git a/keyboards/yandrstudio/zhou65/readme.md b/keyboards/yandrstudio/zhou65/readme.md
index 84c889f5ab..bcbc59c1b1 100644
--- a/keyboards/yandrstudio/zhou65/readme.md
+++ b/keyboards/yandrstudio/zhou65/readme.md
@@ -9,7 +9,7 @@ This keyboard use 8mhz HSE and STM32F401 as MCU.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make yandrstudio/zhou65/f401:default
+    make yandrstudio/zhou65:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/yandrstudio/zhou65/rules.mk b/keyboards/yandrstudio/zhou65/rules.mk
index b851d0ab39..35a39a549a 100644
--- a/keyboards/yandrstudio/zhou65/rules.mk
+++ b/keyboards/yandrstudio/zhou65/rules.mk
@@ -1,3 +1,9 @@
+# MCU name
+MCU = STM32F401
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
 # Build Options
 #   change yes to no to disable
 #
@@ -8,5 +14,5 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output

From ed169a6b3003cb9102a70e86ccd01d21d4794538 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 9 Mar 2022 01:24:59 +0000
Subject: [PATCH 780/867] Correct order of takashicompany/dogtag info.json
 (#16591)

---
 keyboards/takashicompany/dogtag/info.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json
index 64079408a8..72bd5eb136 100644
--- a/keyboards/takashicompany/dogtag/info.json
+++ b/keyboards/takashicompany/dogtag/info.json
@@ -53,6 +53,14 @@
                     "x": 3,
                     "y": 1
                 },
+                {
+                    "x": 4,
+                    "y": 2
+                },
+                {
+                    "x": 7,
+                    "y": 2
+                },
                 {
                     "x": 8,
                     "y": 1
@@ -69,14 +77,6 @@
                     "x": 11,
                     "y": 1
                 },
-                {
-                    "x": 4,
-                    "y": 2
-                },
-                {
-                    "x": 7,
-                    "y": 2
-                },
                 {
                     "x": 3.5,
                     "y": 3.25

From c5c5d37e0894031d68c5d9c3960b7fa6ae8e37ff Mon Sep 17 00:00:00 2001
From: Salicylic-acid3 <46864619+Salicylic-acid3@users.noreply.github.com>
Date: Wed, 9 Mar 2022 10:34:37 +0900
Subject: [PATCH 781/867] [Keymap] Added RGB_Matrix effect mode for
 naked48/j73gl (#16578)

---
 .../j73gl/keymaps/via_rgb_matrix/config.h     | 74 ++++++++++++++++---
 .../naked48/keymaps/via_rgb_matrix/config.h   | 45 +++++++++++
 2 files changed, 107 insertions(+), 12 deletions(-)

diff --git a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
index d2e1d20893..ef0643ce94 100644
--- a/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
+++ b/keyboards/gl516/j73gl/keymaps/via_rgb_matrix/config.h
@@ -28,16 +28,66 @@
 #define DRIVER_LED_TOTAL 73
 
 #ifdef RGB_MATRIX_ENABLE
-#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses
-// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-// #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
-// #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
-// #   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 150  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
-#    define RGB_MATRIX_HUE_STEP 8
-#    define RGB_MATRIX_SAT_STEP 8
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-#    define RGB_MATRIX_VAL_STEP 5
-#    define RGB_MATRIX_SPD_STEP 10
+  #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+//  #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
+//  #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // enable framebuffer effects
+//  #define RGB_DISABLE_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
+//  #define RGB_DISABLE_AFTER_TIMEOUT 0 // OBSOLETE: number of ticks to wait until disabling effects
+  #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+  #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+  #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 255 // 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_LEFT_RIGHT // Sets the default mode, if none has been set
+  #define RGB_MATRIX_STARTUP_HUE 0 // Sets the default hue value, if none has been set
+  #define RGB_MATRIX_STARTUP_SAT 255 // Sets the default saturation value, if none has been set
+  #define RGB_MATRIX_STARTUP_VAL 50 // Sets the default brightness value, if none has been set
+  #define RGB_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set
+//  #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature)
+//  #define RGB_MATRIX_SPLIT { X, Y }     // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
+                                        // If RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
+
+  #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+  #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+  #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+  #define ENABLE_RGB_MATRIX_BREATHING
+  #define ENABLE_RGB_MATRIX_BAND_SAT
+  #define ENABLE_RGB_MATRIX_BAND_VAL
+  #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+  #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+  #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+  #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+  #define ENABLE_RGB_MATRIX_CYCLE_ALL
+  #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+  #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+  #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+  #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+  #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+  #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+  #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+  #define ENABLE_RGB_MATRIX_DUAL_BEACON
+  #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+  #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+  #define ENABLE_RGB_MATRIX_RAINDROPS
+  #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+  #define ENABLE_RGB_MATRIX_HUE_BREATHING
+  #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+  #define ENABLE_RGB_MATRIX_HUE_WAVE
+  #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+  #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+  #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+  #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+  #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+  #define ENABLE_RGB_MATRIX_SPLASH
+  #define ENABLE_RGB_MATRIX_MULTISPLASH
+  #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+  #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
 #endif
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
index 7deffe33ff..7eabf9e831 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
+++ b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
@@ -45,4 +45,49 @@
 //  #define RGB_MATRIX_DISABLE_KEYCODES // disables control of rgb matrix by keycodes (must use code functions to control the feature)
 //  #define RGB_MATRIX_SPLIT { X, Y }     // (Optional) For split keyboards, the number of LEDs connected on each half. X = left, Y = Right.
                                         // If RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is enabled, you also will want to enable SPLIT_TRANSPORT_MIRROR
+
+  #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+  #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+  #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+  #define ENABLE_RGB_MATRIX_BREATHING
+ //  #define ENABLE_RGB_MATRIX_BAND_SAT
+  #define ENABLE_RGB_MATRIX_BAND_VAL
+ //  #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+  #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+//  #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+  #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+  #define ENABLE_RGB_MATRIX_CYCLE_ALL
+  #define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+  #define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+  #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+  #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+//  #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+  #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+  #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+  #define ENABLE_RGB_MATRIX_DUAL_BEACON
+  #define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+//  #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+  #define ENABLE_RGB_MATRIX_RAINDROPS
+  #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+//  #define ENABLE_RGB_MATRIX_HUE_BREATHING
+//  #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+//  #define ENABLE_RGB_MATRIX_HUE_WAVE
+  #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+  #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+  #define ENABLE_RGB_MATRIX_PIXEL_RAIN
+  #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+  #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+  #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+  #define ENABLE_RGB_MATRIX_SPLASH
+  #define ENABLE_RGB_MATRIX_MULTISPLASH
+  #define ENABLE_RGB_MATRIX_SOLID_SPLASH
+  #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
 #endif

From 6ab5a7d048358f261d7068c56ef73dd3da4319aa Mon Sep 17 00:00:00 2001
From: jpe230 <pablin.123.ra@gmail.com>
Date: Tue, 8 Mar 2022 19:35:33 -0600
Subject: [PATCH 782/867] [Keymap] Personal keymap for crkbd (#16546)

---
 keyboards/crkbd/keymaps/jpe230/config.h  |  24 ++
 keyboards/crkbd/keymaps/jpe230/keymap.c  | 399 +++++++++++++++++++++++
 keyboards/crkbd/keymaps/jpe230/readme.md |  15 +
 keyboards/crkbd/keymaps/jpe230/rules.mk  |   6 +
 4 files changed, 444 insertions(+)
 create mode 100644 keyboards/crkbd/keymaps/jpe230/config.h
 create mode 100644 keyboards/crkbd/keymaps/jpe230/keymap.c
 create mode 100644 keyboards/crkbd/keymaps/jpe230/readme.md
 create mode 100644 keyboards/crkbd/keymaps/jpe230/rules.mk

diff --git a/keyboards/crkbd/keymaps/jpe230/config.h b/keyboards/crkbd/keymaps/jpe230/config.h
new file mode 100644
index 0000000000..3680f7c480
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/config.h
@@ -0,0 +1,24 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define SPLIT_WPM_ENABLE
diff --git a/keyboards/crkbd/keymaps/jpe230/keymap.c b/keyboards/crkbd/keymaps/jpe230/keymap.c
new file mode 100644
index 0000000000..65cb6f73f7
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/keymap.c
@@ -0,0 +1,399 @@
+/*
+Copyright 2019 @foostan
+Copyright 2020 Drashna Jaelre <@drashna>
+Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#ifdef VIA_ENABLE
+    #define USER_START USER00
+#else
+    #define USER_START SAFE_RANGE
+#endif
+
+// Keycode to toggle Sarcasm Mode
+enum custom_keycodes {
+    KC_SCASM = USER_START
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ESC,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(1),  KC_ENT,     KC_SPC,   MO(2), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+
+  ),
+
+  [1] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_CAPS, _______, _______, _______, _______, _______,                      _______,   KC_UP, _______, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT, _______, _______, _______, _______, _______,                      KC_LEFT, KC_DOWN,KC_RIGHT, _______, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______, _______,   _______,   MO(3), KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [2] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+       KC_TAB, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_CAPS, _______, _______, _______, _______, _______,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_LSFT, _______, _______, _______, _______, _______,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,   MO(3), _______,      TG(3), _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [3] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      KC_MUTE, KC_WBAK, KC_WFWD,   KC_F7,   KC_F8,   KC_F9,                      _______,    KC_7,    KC_8,    KC_9, _______, RESET,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_VOLU, _______, KC_MNXT,   KC_F6,   KC_F5,   KC_F6,                      _______,    KC_6,    KC_5,    KC_4, _______, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      KC_VOLD, KC_MPRV, KC_MNXT,   KC_F1,   KC_F2,   KC_F3,                      _______,    KC_1,    KC_2,    KC_3, _______, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,KC_SCASM,      TG(3), _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  )
+};
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  return rotation;
+}
+
+#define L_BASE 0
+#define L_LOWER 2
+#define L_RAISE 4
+#define L_ADJUST 8
+
+void oled_render_layer_state(void) {
+    oled_write_P(PSTR("Layer: "), false);
+    switch (layer_state) {
+        case L_BASE:
+            oled_write_ln_P(PSTR("Default"), false);
+            break;
+        case L_LOWER:
+            oled_write_ln_P(PSTR("Lower"), false);
+            break;
+        case L_RAISE:
+            oled_write_ln_P(PSTR("Raise"), false);
+            break;
+        case L_ADJUST:
+        case L_ADJUST|L_LOWER:
+        case L_ADJUST|L_RAISE:
+        case L_ADJUST|L_LOWER|L_RAISE:
+            oled_write_ln_P(PSTR("Adjust"), false);
+            break;
+    }
+}
+
+
+static char logged_char = ' ';
+static uint8_t logged_row = 0, logged_col = 0;
+static uint16_t logged_keycode = 0;
+
+const char code_to_name[60] = {
+    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
+    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
+    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
+    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+
+void set_keylog(uint16_t keycode, keyrecord_t *record) {
+    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
+        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
+    if (keycode < 60) {
+        logged_char = code_to_name[keycode];
+    }
+
+    // update keylog
+    logged_row = record->event.key.row;
+    logged_col = record->event.key.col;
+    logged_keycode = keycode;
+}
+
+void oled_render_keylog(void) {
+    oled_write(get_u8_str(logged_row, '0'), false);
+    oled_write_P(PSTR(":"), false);
+    oled_write(get_u8_str(logged_col, '0'), false);
+    oled_write_P(PSTR(", "), false);
+    oled_write(get_u16_str(logged_keycode, ' '), false);
+    oled_write_P(PSTR(" : "), false);
+    oled_write((const char *)&logged_char, false);
+}
+
+void render_bootmagic_status(bool status) {
+    /* Show Ctrl-Gui Swap options */
+    static const char PROGMEM logo[][2][3] = {
+        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
+        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
+    };
+    if (status) {
+        oled_write_ln_P(logo[0][0], false);
+        oled_write_ln_P(logo[0][1], false);
+    } else {
+        oled_write_ln_P(logo[1][0], false);
+        oled_write_ln_P(logo[1][1], false);
+    }
+}
+
+// frame 0, 128x32px
+const char PROGMEM cat_frame_0 [] PROGMEM = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0xc0, 0xc0,
+	0x60, 0x60, 0x60, 0x60, 0x40, 0x40, 0xc0, 0xc0, 0xc0, 0x70, 0x38, 0x18, 0xec, 0x3c, 0x02, 0x02,
+	0x7a, 0x7a, 0xf2, 0xf2, 0x06, 0x04, 0x04, 0x0c, 0x0e, 0x0a, 0x1f, 0xfd, 0xf9, 0x39, 0x0f, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0xff, 0xff, 0x03, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xfc, 0xff, 0x01, 0x08, 0x3c, 0x00,
+	0x00, 0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x83, 0x7e, 0x00, 0x00,
+	0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf8, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xf0, 0xff, 0xff, 0x80, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x87, 0x83, 0xc0, 0x80, 0x88,
+	0x1e, 0x1e, 0x0f, 0x00, 0x80, 0x80, 0x80, 0x40, 0x40, 0xc0, 0xe0, 0xfe, 0x87, 0xbe, 0xf0, 0x00,
+	0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f,
+	0x12, 0x34, 0x34, 0x34, 0x34, 0x1e, 0x0e, 0x06, 0x03, 0x03, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+// frame 1, 128x32px
+const char PROGMEM cat_frame_1 [] PROGMEM = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0xc0, 0x60,
+	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x60, 0x60, 0xe0, 0xf0, 0x90,
+	0x18, 0x08, 0x08, 0x88, 0x88, 0x98, 0x10, 0x10, 0x30, 0x30, 0x70, 0xf8, 0x08, 0x88, 0xf8, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0xff, 0xff, 0x01, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0x04, 0x06, 0x07, 0x03, 0x01,
+	0xc0, 0x00, 0x00, 0x87, 0x87, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x1f, 0xf0, 0x00,
+	0x00, 0x00, 0xc0, 0xe0, 0xf0, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xf8, 0xff, 0xff, 0xc0, 0x80,
+	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x10, 0x30, 0xf0, 0xe0, 0x00,
+	0x01, 0x00, 0x60, 0xf0, 0xf0, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xfc, 0xc7, 0x00,
+	0x00, 0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x03, 0x02, 0x06,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x02, 0x02, 0x07, 0x07, 0x07, 0x04, 0x07, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+// frame 2, 128x32px
+const char PROGMEM cat_frame_2 [] PROGMEM = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xc0, 0x60, 0x30,
+	0x38, 0x18, 0x18, 0x18, 0x18, 0x30, 0x30, 0x30, 0x78, 0x48, 0x78, 0xc0, 0x80, 0xc0, 0x40, 0x40,
+	0x40, 0x40, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0x03, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x20, 0xf0, 0x80, 0x80, 0x60, 0x18, 0x00, 0x00, 0x00, 0x01, 0x00, 0x1c, 0x3c,
+	0x7c, 0x38, 0x00, 0x00, 0x00, 0x01, 0x01, 0x07, 0x06, 0x3c, 0xff, 0xc3, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xe0, 0xe0, 0xf0, 0xf0, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xff, 0xff, 0xf0, 0x80, 0x00,
+	0x00, 0x80, 0x80, 0x80, 0x00, 0x01, 0x00, 0x1e, 0x7f, 0xc0, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x0c,
+	0x8c, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x01, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,
+	0x01, 0x01, 0x00, 0x01, 0x01, 0x0f, 0x18, 0x10, 0x18, 0x0f, 0x0e, 0x18, 0x10, 0x30, 0x27, 0x2f,
+	0x2f, 0x27, 0x20, 0x30, 0x10, 0x10, 0x10, 0x30, 0x3c, 0x2d, 0x27, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+const char* cat_frames[3] = {
+	cat_frame_0,
+	cat_frame_1,
+	cat_frame_2
+};
+
+#define FRAME_SIZE 528
+
+static int      current_frame = 0;
+static uint32_t frame_timer = 0;
+static uint32_t anim_sleep = 0;
+static uint8_t  anim_speed = 120;
+
+void oled_render_logo(void) {
+
+    if(get_current_wpm() != 000) {
+        oled_on();
+        int8_t wpm_speed = (int8_t)(get_current_wpm() / 2);
+        if(wpm_speed < 100)
+        {
+            anim_speed = 120 - wpm_speed;
+        }
+        if(timer_elapsed32(frame_timer) > anim_speed) {
+            frame_timer = timer_read32();  // resets timer
+            current_frame = (current_frame + 1) % 3;
+        }
+        oled_write_raw_P(cat_frames[current_frame], FRAME_SIZE);
+        anim_sleep = timer_read32();
+    } else {
+        anim_speed = 150;
+        if(timer_elapsed32(anim_sleep) > OLED_TIMEOUT) {
+            oled_off();
+        } else {
+             if(timer_elapsed32(frame_timer) > anim_speed) {
+                frame_timer = timer_read32();  // resets timer
+                current_frame = (current_frame + 1) % 3;
+            }
+            oled_write_raw_P(cat_frames[current_frame], FRAME_SIZE);
+        }
+    }
+}
+
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        oled_render_layer_state();
+        oled_render_keylog();
+    } else {
+        oled_render_logo();
+    }
+    return false;
+}
+
+#endif // OLED_ENABLE
+
+// saRcASm MOde
+bool tog_sarcasm = false;
+bool uppercase = false;
+uint8_t prev_upper = 0;
+uint8_t prev_lower = 0;
+
+bool process_record_sarcasm(uint16_t keycode, keyrecord_t *record) {
+    if (keycode == KC_ENTER && record->event.pressed) {
+        uppercase = false;
+        return true;
+    }
+
+    if (uppercase == false && record->event.pressed)  { // Dont start with an uppercase letter on new line
+        uppercase = true;
+        return true;
+    }
+
+    if((KC_A <= keycode) && (keycode <= KC_Z)) {
+        if ( record->event.pressed ) {
+            bool press = rand() % 2;
+
+            if (prev_upper > 2) {           // if more than 3 lower's in a row print upper
+                prev_upper = 0;
+                press = false;
+            } else if (prev_lower > 2) {    // if more than 3 upper's in a row print lower
+                prev_lower = 0;
+                press = true;
+            }
+            if (press) {
+                prev_upper++;
+                tap_code16(S(keycode));
+                clear_mods();
+            } else {
+                prev_lower++;
+                tap_code16(keycode);
+            }
+        }
+        return false;
+    }
+
+    return true;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+#ifdef OLED_ENABLE
+    if (record->event.pressed) {
+        set_keylog(keycode, record);
+    }
+#endif
+
+    switch (keycode) {
+        case KC_SCASM:
+            if (record->event.pressed) {
+                tog_sarcasm = !tog_sarcasm;
+
+                if (tog_sarcasm)
+                    dprint("Enabling saRCaSm ModE\n");
+                else
+                    dprint("Disabling saRCaSm ModE\n");
+
+                uppercase = false;
+                prev_upper = 0;
+                prev_lower = 0;
+            }
+            return false;
+    }
+
+    if (tog_sarcasm) {
+        return process_record_sarcasm(keycode, record);
+    }
+
+    return true;
+}
diff --git a/keyboards/crkbd/keymaps/jpe230/readme.md b/keyboards/crkbd/keymaps/jpe230/readme.md
new file mode 100644
index 0000000000..31bbc4ebd1
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/readme.md
@@ -0,0 +1,15 @@
+# Jpe230's CRKBD Layout
+
+## Layers
+The four layers:
+- BASE Layer: QWERTY
+- LOWER Layer: Numbers + Arrows
+- RAISE Layer: Symbols
+- ADJUST Layer: Numpad + Media Keys + Fn keys
+
+## OLED
+-Master: Renders layer state + keylog
+-Slave : Renders an animation of a cat that varies its animation speed based on the current WPM
+
+## Flashing
+Flash using `qmk compile -kb crkbd -km jpe230` for Pro Micro
diff --git a/keyboards/crkbd/keymaps/jpe230/rules.mk b/keyboards/crkbd/keymaps/jpe230/rules.mk
new file mode 100644
index 0000000000..27a25ddeb3
--- /dev/null
+++ b/keyboards/crkbd/keymaps/jpe230/rules.mk
@@ -0,0 +1,6 @@
+MOUSEKEY_ENABLE = yes
+OLED_ENABLE     = yes
+OLED_DRIVER     = SSD1306
+LTO_ENABLE      = yes
+WPM_ENABLE      = yes
+VIA_ENABLE      = yes

From dc67fd9b87b0e86cea8d176d8b9bbce3e8a8676d Mon Sep 17 00:00:00 2001
From: jpe230 <pablin.123.ra@gmail.com>
Date: Tue, 8 Mar 2022 23:49:29 -0600
Subject: [PATCH 783/867] Various improvements for the AnnePro2 (#16579)

---
 keyboards/annepro2/annepro2.c                 |  92 ++++++++++------
 keyboards/annepro2/annepro2.h                 |   6 +-
 keyboards/annepro2/annepro2_ble.c             |  34 +++---
 keyboards/annepro2/ap2_led.c                  |  79 +++++++-------
 keyboards/annepro2/ap2_led.h                  |  93 ++++++++--------
 keyboards/annepro2/c15/config.h               |   1 +
 keyboards/annepro2/c15/rules.mk               |   5 +-
 keyboards/annepro2/c18/config.h               |   1 +
 keyboards/annepro2/c18/rules.mk               |   5 +-
 keyboards/annepro2/config_led.c               |  43 ++++++++
 keyboards/annepro2/config_led.h               |  72 +++++++++++++
 keyboards/annepro2/info.json                  |   2 +-
 .../keymaps/default-full-caps/keymap.c        |  84 +++++++--------
 .../keymaps/default-layer-indicators/keymap.c | 102 +++++++++---------
 keyboards/annepro2/keymaps/default/keymap.c   |  80 +++++++-------
 keyboards/annepro2/keymaps/default/rules.mk   |   3 +
 keyboards/annepro2/protocol.c                 |  40 +++----
 keyboards/annepro2/protocol.h                 |  22 ++--
 keyboards/annepro2/rgb_driver.c               |  66 ++++++++++++
 19 files changed, 526 insertions(+), 304 deletions(-)
 create mode 100644 keyboards/annepro2/config_led.c
 create mode 100644 keyboards/annepro2/config_led.h
 create mode 100644 keyboards/annepro2/keymaps/default/rules.mk
 create mode 100644 keyboards/annepro2/rgb_driver.c

diff --git a/keyboards/annepro2/annepro2.c b/keyboards/annepro2/annepro2.c
index 37489defff..8767265315 100644
--- a/keyboards/annepro2/annepro2.c
+++ b/keyboards/annepro2/annepro2.c
@@ -24,7 +24,7 @@
 #define RAM_MAGIC_LOCATION 0x20001ffc
 #define IAP_MAGIC_VALUE 0x0000fab2
 
-static const SerialConfig ledUartInitConfig = {
+static const SerialConfig led_uart_init_config = {
     .speed = 115200,
 };
 
@@ -32,21 +32,25 @@ static const SerialConfig ledUartInitConfig = {
 #    define LED_UART_BAUD_RATE 115200
 #endif  // LED_UART_BAUD_RATE
 
-static const SerialConfig ledUartRuntimeConfig = {
+static const SerialConfig led_uart_runtine_config = {
     .speed = LED_UART_BAUD_RATE,
 };
 
-static const SerialConfig bleUartConfig = {
+static const SerialConfig ble_uart_config = {
     .speed = 115200,
 };
 
-static uint8_t ledMcuWakeup[11] = {0x7b, 0x10, 0x43, 0x10, 0x03, 0x00, 0x00, 0x7d, 0x02, 0x01, 0x02};
+static uint8_t led_mcu_wakeup[11] = {0x7b, 0x10, 0x43, 0x10, 0x03, 0x00, 0x00, 0x7d, 0x02, 0x01, 0x02};
 
-ble_capslock_t BLECapsLock = {._dummy = {0}, .caps_lock = false};
+ble_capslock_t ble_capslock = {._dummy = {0}, .caps_lock = false};
+
+#ifdef RGB_MATRIX_ENABLE
+static uint8_t current_rgb_row = 0;
+#endif
 
 void bootloader_jump(void) {
     // Send msg to shine to boot into IAP
-    annepro2SetIAP();
+    ap2_set_IAP();
 
     // wait for shine to boot into IAP
     wait_ms(15);
@@ -67,27 +71,27 @@ void bootloader_jump(void) {
 
 void keyboard_pre_init_kb(void) {
     // Start LED UART
-    sdStart(&SD0, &ledUartInitConfig);
+    sdStart(&SD0, &led_uart_init_config);
     /* Let the LED chip settle a bit before switching the mode.
      * That helped at least one person. */
     wait_ms(15);
-    sdWrite(&SD0, ledMcuWakeup, sizeof(ledMcuWakeup));
+    sdWrite(&SD0, led_mcu_wakeup, sizeof(led_mcu_wakeup));
 
     // wait to receive response from wakeup
     wait_ms(15);
 
-    protoInit(&proto, ledCommandCallback);
+    proto_init(&proto, led_command_callback);
 
     // loop to clear out receive buffer from shine wakeup
     while (!sdGetWouldBlock(&SD0)) sdGet(&SD0);
 
-    sdStart(&SD0, &ledUartRuntimeConfig);
+    sdStart(&SD0, &led_uart_runtine_config);
     keyboard_pre_init_user();
 }
 
 void keyboard_post_init_kb(void) {
     // Start BLE UART
-    sdStart(&SD1, &bleUartConfig);
+    sdStart(&SD1, &ble_uart_config);
     annepro2_ble_startup();
 
     // Give the send uart thread some time to
@@ -97,7 +101,11 @@ void keyboard_post_init_kb(void) {
     // loop to clear out receive buffer from ble wakeup
     while (!sdGetWouldBlock(&SD1)) sdGet(&SD1);
 
-    annepro2LedGetStatus();
+    ap2_led_get_status();
+
+    #ifdef RGB_MATRIX_ENABLE
+    ap2_led_enable();
+    #endif
 
     keyboard_post_init_user();
 }
@@ -106,25 +114,35 @@ void matrix_scan_kb() {
     // if there's stuff on the ble serial buffer
     // read it into the capslock struct
     while (!sdGetWouldBlock(&SD1)) {
-        sdReadTimeout(&SD1, (uint8_t *)&BLECapsLock, sizeof(ble_capslock_t), 10);
+        sdReadTimeout(&SD1, (uint8_t *)&ble_capslock, sizeof(ble_capslock_t), 10);
     }
 
     /* While there's data from LED keyboard sent - read it. */
     while (!sdGetWouldBlock(&SD0)) {
         uint8_t byte = sdGet(&SD0);
-        protoConsume(&proto, byte);
+        proto_consume(&proto, byte);
     }
 
+    #ifdef RGB_MATRIX_ENABLE
+    /* If there's data ready to be sent to LED MCU - send it. */
+    if(rgb_row_changed[current_rgb_row])
+    {
+        rgb_row_changed[current_rgb_row] = 0;
+        ap2_led_mask_set_row(current_rgb_row);
+    }
+    current_rgb_row = (current_rgb_row + 1) % NUM_ROW;
+    #endif
+
     matrix_scan_user();
 }
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     if (record->event.pressed) {
-        if (annepro2LedStatus.matrixEnabled && annepro2LedStatus.isReactive) {
-            annepro2LedForwardKeypress(record->event.key.row, record->event.key.col);
+        if (ap2_led_status.matrix_enabled && ap2_led_status.is_reactive) {
+            ap2_led_forward_keypress(record->event.key.row, record->event.key.col);
         }
 
-        const annepro2Led_t blue = {
+        const ap2_led_t blue = {
             .p.blue  = 0xff,
             .p.red   = 0x00,
             .p.green = 0x00,
@@ -135,22 +153,22 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
             case KC_AP2_BT1:
                 annepro2_ble_broadcast(0);
                 /* FIXME: This hardcodes col/row position */
-                annepro2LedBlink(0, 1, blue, 8, 50);
+                ap2_led_blink(0, 1, blue, 8, 50);
                 return false;
 
             case KC_AP2_BT2:
                 annepro2_ble_broadcast(1);
-                annepro2LedBlink(0, 2, blue, 8, 50);
+                ap2_led_blink(0, 2, blue, 8, 50);
                 return false;
 
             case KC_AP2_BT3:
                 annepro2_ble_broadcast(2);
-                annepro2LedBlink(0, 3, blue, 8, 50);
+                ap2_led_blink(0, 3, blue, 8, 50);
                 return false;
 
             case KC_AP2_BT4:
                 annepro2_ble_broadcast(3);
-                annepro2LedBlink(0, 4, blue, 8, 50);
+                ap2_led_blink(0, 4, blue, 8, 50);
                 return false;
 
             case KC_AP2_USB:
@@ -162,37 +180,43 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
                 return false;
 
             case KC_AP_LED_OFF:
-                annepro2LedDisable();
+                ap2_led_disable();
                 break;
 
             case KC_AP_LED_ON:
-                if (annepro2LedStatus.matrixEnabled) {
-                    annepro2LedNextProfile();
+                if (ap2_led_status.matrix_enabled) {
+                    ap2_led_next_profile();
                 } else {
-                    annepro2LedEnable();
+                    ap2_led_enable();
                 }
-                annepro2LedResetForegroundColor();
+                ap2_led_reset_foreground_color();
                 break;
 
             case KC_AP_LED_NEXT_PROFILE:
-                annepro2LedNextProfile();
-                annepro2LedResetForegroundColor();
+                ap2_led_next_profile();
+                ap2_led_reset_foreground_color();
                 break;
 
             case KC_AP_LED_PREV_PROFILE:
-                annepro2LedPrevProfile();
-                annepro2LedResetForegroundColor();
+                ap2_led_prev_profile();
+                ap2_led_reset_foreground_color();
                 break;
 
             case KC_AP_LED_NEXT_INTENSITY:
-                annepro2LedNextIntensity();
-                annepro2LedResetForegroundColor();
+                ap2_led_next_intensity();
+                ap2_led_reset_foreground_color();
                 return false;
 
             case KC_AP_LED_SPEED:
-                annepro2LedNextAnimationSpeed();
-                annepro2LedResetForegroundColor();
+                ap2_led_next_animation_speed();
+                ap2_led_reset_foreground_color();
                 return false;
+            #ifdef RGB_MATRIX_ENABLE
+            case RGB_TOG:
+                if(rgb_matrix_is_enabled()) ap2_led_disable();
+                else ap2_led_enable();
+                return true;
+            #endif
 
             default:
                 break;
diff --git a/keyboards/annepro2/annepro2.h b/keyboards/annepro2/annepro2.h
index b08f8c5352..1b5933f577 100644
--- a/keyboards/annepro2/annepro2.h
+++ b/keyboards/annepro2/annepro2.h
@@ -24,16 +24,16 @@ typedef struct __attribute__((__packed__)) {
     uint8_t _dummy[10];
     bool    caps_lock;
 } ble_capslock_t;
-extern ble_capslock_t BLECapsLock;
+extern ble_capslock_t ble_capslock;
 
 // Matrix keymap
 // clang-format off
-#define LAYOUT( \
+#define LAYOUT_60_ansi( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      \
     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \
-    K40, K42, K43,                K46,           K49,  K4A,   K4B,   K4C  \
+    K40, K42, K43,                K46,           K49, K4A, K4B, K4C       \
 ) { \
     /*            COL1   COL2   COL3   COL4   COL5   COL6   COL7   COL8   COL9   COL10  COL11  COL12  COL13  COL14*/ \
     /* ROW1  */ { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D  }, \
diff --git a/keyboards/annepro2/annepro2_ble.c b/keyboards/annepro2/annepro2_ble.c
index 72cbb68016..0336d6a76c 100644
--- a/keyboards/annepro2/annepro2_ble.c
+++ b/keyboards/annepro2/annepro2_ble.c
@@ -35,47 +35,47 @@ static host_driver_t ap2_ble_driver = {
     ap2_ble_leds, ap2_ble_keyboard, ap2_ble_mouse, ap2_ble_system, ap2_ble_consumer,
 };
 
-static uint8_t bleMcuWakeup[11] = {0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x01, 0x7d, 0x02, 0x01, 0x02};
+static uint8_t ble_mcu_wakeup[11] = {0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x01, 0x7d, 0x02, 0x01, 0x02};
 
-static uint8_t bleMcuStartBroadcast[11] = {
+static uint8_t ble_mcu_start_broadcast[11] = {
     0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x00, 0x7d, 0x40, 0x01, 0x00  // Broadcast ID[0-3]
 };
 
-static uint8_t bleMcuConnect[11] = {
+static uint8_t ble_mcu_connect[11] = {
     0x7b, 0x12, 0x53, 0x00, 0x03, 0x00, 0x00, 0x7d, 0x40, 0x04, 0x00  // Connect ID [0-3]
 };
 
-static uint8_t bleMcuSendReport[10] = {
+static uint8_t ble_mcu_send_report[10] = {
     0x7b, 0x12, 0x53, 0x00, 0x0A, 0x00, 0x00, 0x7d, 0x10, 0x04,
 };
 
-static uint8_t bleMcuSendConsumerReport[10] = {
+static uint8_t ble_mcu_send_consumer_report[10] = {
     0x7b, 0x12, 0x53, 0x00, 0x06, 0x00, 0x00, 0x7d, 0x10, 0x08,
 };
 
-static uint8_t bleMcuUnpair[10] = {
+static uint8_t ble_mcu_unpair[10] = {
     0x7b, 0x12, 0x53, 0x00, 0x02, 0x00, 0x00, 0x7d, 0x40, 0x05,
 };
 
-static uint8_t bleMcuBootload[11] = {0x7b, 0x10, 0x51, 0x10, 0x03, 0x00, 0x00, 0x7d, 0x02, 0x01, 0x01};
+static uint8_t ble_mcu_bootload[11] = {0x7b, 0x10, 0x51, 0x10, 0x03, 0x00, 0x00, 0x7d, 0x02, 0x01, 0x01};
 
-static host_driver_t *lastHostDriver = NULL;
+static host_driver_t *last_host_driver = NULL;
 #ifdef NKRO_ENABLE
 static bool lastNkroStatus = false;
 #endif  // NKRO_ENABLE
 
 /* -------------------- Public Function Implementation ---------------------- */
 
-void annepro2_ble_bootload(void) { sdWrite(&SD1, bleMcuBootload, sizeof(bleMcuBootload)); }
+void annepro2_ble_bootload(void) { sdWrite(&SD1, ble_mcu_bootload, sizeof(ble_mcu_bootload)); }
 
-void annepro2_ble_startup(void) { sdWrite(&SD1, bleMcuWakeup, sizeof(bleMcuWakeup)); }
+void annepro2_ble_startup(void) { sdWrite(&SD1, ble_mcu_wakeup, sizeof(ble_mcu_wakeup)); }
 
 void annepro2_ble_broadcast(uint8_t port) {
     if (port > 3) {
         port = 3;
     }
     // sdPut(&SD1, 0x00);
-    sdWrite(&SD1, bleMcuStartBroadcast, sizeof(bleMcuStartBroadcast));
+    sdWrite(&SD1, ble_mcu_start_broadcast, sizeof(ble_mcu_start_broadcast));
     sdPut(&SD1, port);
     static int lastBroadcast = -1;
     if (lastBroadcast == port) {
@@ -88,7 +88,7 @@ void annepro2_ble_connect(uint8_t port) {
     if (port > 3) {
         port = 3;
     }
-    sdWrite(&SD1, bleMcuConnect, sizeof(bleMcuConnect));
+    sdWrite(&SD1, ble_mcu_connect, sizeof(ble_mcu_connect));
     sdPut(&SD1, port);
     ap2_ble_swtich_ble_driver();
 }
@@ -103,12 +103,12 @@ void annepro2_ble_disconnect(void) {
 #ifdef NKRO_ENABLE
     keymap_config.nkro = lastNkroStatus;
 #endif
-    host_set_driver(lastHostDriver);
+    host_set_driver(last_host_driver);
 }
 
 void annepro2_ble_unpair(void) {
     // sdPut(&SD1, 0x0);
-    sdWrite(&SD1, bleMcuUnpair, sizeof(bleMcuUnpair));
+    sdWrite(&SD1, ble_mcu_unpair, sizeof(ble_mcu_unpair));
 }
 
 /* ------------------- Static Function Implementation ----------------------- */
@@ -117,7 +117,7 @@ static void ap2_ble_swtich_ble_driver(void) {
         return;
     }
     clear_keyboard();
-    lastHostDriver = host_get_driver();
+    last_host_driver = host_get_driver();
 #ifdef NKRO_ENABLE
     lastNkroStatus = keymap_config.nkro;
 #endif
@@ -154,7 +154,7 @@ static inline uint16_t CONSUMER2AP2(uint16_t usage) {
 
 static void ap2_ble_consumer(uint16_t data) {
     sdPut(&SD1, 0x0);
-    sdWrite(&SD1, bleMcuSendConsumerReport, sizeof(bleMcuSendConsumerReport));
+    sdWrite(&SD1, ble_mcu_send_consumer_report, sizeof(ble_mcu_send_consumer_report));
     sdPut(&SD1, CONSUMER2AP2(data));
     static const uint8_t dummy[3] = {0};
     sdWrite(&SD1, dummy, sizeof(dummy));
@@ -165,6 +165,6 @@ static void ap2_ble_consumer(uint16_t data) {
  */
 static void ap2_ble_keyboard(report_keyboard_t *report) {
     sdPut(&SD1, 0x0);
-    sdWrite(&SD1, bleMcuSendReport, sizeof(bleMcuSendReport));
+    sdWrite(&SD1, ble_mcu_send_report, sizeof(ble_mcu_send_report));
     sdWrite(&SD1, &report->raw[0], KEYBOARD_REPORT_SIZE);
 }
diff --git a/keyboards/annepro2/ap2_led.c b/keyboards/annepro2/ap2_led.c
index 9969fcd02a..73b21f6eb1 100644
--- a/keyboards/annepro2/ap2_led.c
+++ b/keyboards/annepro2/ap2_led.c
@@ -21,28 +21,29 @@
 #include "ap2_led.h"
 #include "protocol.h"
 
-annepro2Led_t       ledMask[KEY_COUNT];
-annepro2LedStatus_t annepro2LedStatus;
+ap2_led_t       led_mask[KEY_COUNT];
+ap2_led_status_t ap2_led_status;
+uint8_t rgb_row_changed[NUM_ROW];
 
-void ledCommandCallback(const message_t *msg) {
+void led_command_callback(const message_t *msg) {
     switch (msg->command) {
         case CMD_LED_STATUS:
-            annepro2LedStatus.amountOfProfiles = msg->payload[0];
-            annepro2LedStatus.currentProfile   = msg->payload[1];
-            annepro2LedStatus.matrixEnabled    = msg->payload[2];
-            annepro2LedStatus.isReactive       = msg->payload[3];
-            annepro2LedStatus.ledIntensity     = msg->payload[4];
-            annepro2LedStatus.errors           = msg->payload[5];
+            ap2_led_status.amount_of_profiles = msg->payload[0];
+            ap2_led_status.current_profile    = msg->payload[1];
+            ap2_led_status.matrix_enabled     = msg->payload[2];
+            ap2_led_status.is_reactive        = msg->payload[3];
+            ap2_led_status.led_intensity      = msg->payload[4];
+            ap2_led_status.errors             = msg->payload[5];
             break;
 
 #ifdef CONSOLE_ENABLE
         case CMD_LED_DEBUG:
             /* TODO: Don't use printf. */
             printf("LED:");
-            for (int i = 0; i < msg->payloadSize; i++) {
+            for (int i = 0; i < msg->payload_size; i++) {
                 printf("%02x ", msg->payload[i]);
             }
-            for (int i = 0; i < msg->payloadSize; i++) {
+            for (int i = 0; i < msg->payload_size; i++) {
                 printf("%c", msg->payload[i]);
             }
             printf("\n");
@@ -51,63 +52,63 @@ void ledCommandCallback(const message_t *msg) {
     }
 }
 
-void annepro2SetIAP(void) { protoTx(CMD_LED_IAP, NULL, 0, 3); }
+void ap2_set_IAP(void) { proto_tx(CMD_LED_IAP, NULL, 0, 3); }
 
-void annepro2LedDisable(void) { protoTx(CMD_LED_OFF, NULL, 0, 3); }
+void ap2_led_disable(void) { proto_tx(CMD_LED_OFF, NULL, 0, 3); }
 
-void annepro2LedEnable(void) { protoTx(CMD_LED_ON, NULL, 0, 3); }
+void ap2_led_enable(void) { proto_tx(CMD_LED_ON, NULL, 0, 3); }
 
-void annepro2LedSetProfile(uint8_t prof) { protoTx(CMD_LED_SET_PROFILE, &prof, sizeof(prof), 3); }
+void ap2_led_set_profile(uint8_t prof) { proto_tx(CMD_LED_SET_PROFILE, &prof, sizeof(prof), 3); }
 
-void annepro2LedGetStatus() { protoTx(CMD_LED_GET_STATUS, NULL, 0, 3); }
+void ap2_led_get_status() { proto_tx(CMD_LED_GET_STATUS, NULL, 0, 3); }
 
-void annepro2LedNextProfile() { protoTx(CMD_LED_NEXT_PROFILE, NULL, 0, 3); }
+void ap2_led_next_profile() { proto_tx(CMD_LED_NEXT_PROFILE, NULL, 0, 3); }
 
-void annepro2LedNextIntensity() { protoTx(CMD_LED_NEXT_INTENSITY, NULL, 0, 3); }
+void ap2_led_next_intensity() { proto_tx(CMD_LED_NEXT_INTENSITY, NULL, 0, 3); }
 
-void annepro2LedNextAnimationSpeed() { protoTx(CMD_LED_NEXT_ANIMATION_SPEED, NULL, 0, 3); }
+void ap2_led_next_animation_speed() { proto_tx(CMD_LED_NEXT_ANIMATION_SPEED, NULL, 0, 3); }
 
-void annepro2LedPrevProfile() { protoTx(CMD_LED_PREV_PROFILE, NULL, 0, 3); }
+void ap2_led_prev_profile() { proto_tx(CMD_LED_PREV_PROFILE, NULL, 0, 3); }
 
-void annepro2LedMaskSetKey(uint8_t row, uint8_t col, annepro2Led_t color) {
+void ap2_led_mask_set_key(uint8_t row, uint8_t col, ap2_led_t color) {
     uint8_t payload[] = {row, col, color.p.blue, color.p.green, color.p.red, color.p.alpha};
-    protoTx(CMD_LED_MASK_SET_KEY, payload, sizeof(payload), 1);
+    proto_tx(CMD_LED_MASK_SET_KEY, payload, sizeof(payload), 1);
 }
 
 /* Push a whole local row to the shine */
-void annepro2LedMaskSetRow(uint8_t row) {
-    uint8_t payload[NUM_COLUMN * sizeof(annepro2Led_t) + 1];
+void ap2_led_mask_set_row(uint8_t row) {
+    uint8_t payload[NUM_COLUMN * sizeof(ap2_led_t) + 1];
     payload[0] = row;
-    memcpy(payload + 1, &ledMask[ROWCOL2IDX(row, 0)], sizeof(*ledMask) * NUM_COLUMN);
-    protoTx(CMD_LED_MASK_SET_ROW, payload, sizeof(payload), 1);
+    memcpy(payload + 1, &led_mask[ROWCOL2IDX(row, 0)], sizeof(*led_mask) * NUM_COLUMN);
+    proto_tx(CMD_LED_MASK_SET_ROW, payload, sizeof(payload), 1);
 }
 
 /* Synchronize all rows */
-void annepro2LedMaskSetAll(void) {
-    for (int row = 0; row < 5; row++) annepro2LedMaskSetRow(row);
+void ap2_led_mask_set_all(void) {
+    for (int row = 0; row < 5; row++) ap2_led_mask_set_row(row);
 }
 
 /* Set all keys to a given color */
-void annepro2LedMaskSetMono(const annepro2Led_t color) { protoTx(CMD_LED_MASK_SET_MONO, (uint8_t *)&color, sizeof(color), 1); }
+void ap2_led_mask_set_mono(const ap2_led_t color) { proto_tx(CMD_LED_MASK_SET_MONO, (uint8_t *)&color, sizeof(color), 1); }
 
-void annepro2LedBlink(uint8_t row, uint8_t col, annepro2Led_t color, uint8_t count, uint8_t hundredths) {
+void ap2_led_blink(uint8_t row, uint8_t col, ap2_led_t color, uint8_t count, uint8_t hundredths) {
     uint8_t payload[] = {row, col, color.p.blue, color.p.green, color.p.red, color.p.alpha, count, hundredths};
-    protoTx(CMD_LED_KEY_BLINK, payload, sizeof(payload), 1);
+    proto_tx(CMD_LED_KEY_BLINK, payload, sizeof(payload), 1);
 }
 
-void annepro2LedSetForegroundColor(uint8_t red, uint8_t green, uint8_t blue) {
-    annepro2Led_t color = {.p.red = red, .p.green = green, .p.blue = blue, .p.alpha = 0xff};
-    annepro2LedMaskSetMono(color);
+void ap2_led_set_foreground_color(uint8_t red, uint8_t green, uint8_t blue) {
+    ap2_led_t color = {.p.red = red, .p.green = green, .p.blue = blue, .p.alpha = 0xff};
+    ap2_led_mask_set_mono(color);
 }
 
-void annepro2LedResetForegroundColor() {
-    annepro2Led_t color = {
+void ap2_led_reset_foreground_color() {
+    ap2_led_t color = {
         .p.red   = 0,
         .p.green = 0,
         .p.blue  = 0,
         .p.alpha = 0,
     };
-    annepro2LedMaskSetMono(color);
+    ap2_led_mask_set_mono(color);
 }
 
 /*
@@ -128,7 +129,7 @@ void annepro2LedResetForegroundColor() {
  * Following it are 3 bits of row and 4 bits of col.
  * 1 + 3 + 4 = 8 bits - only a single byte is sent for every keypress.
  */
-void annepro2LedForwardKeypress(uint8_t row, uint8_t col) {
+void ap2_led_forward_keypress(uint8_t row, uint8_t col) {
     const uint8_t payload = row << 4 | col;
-    protoTx(CMD_LED_KEY_DOWN, &payload, 1, 1);
+    proto_tx(CMD_LED_KEY_DOWN, &payload, 1, 1);
 }
diff --git a/keyboards/annepro2/ap2_led.h b/keyboards/annepro2/ap2_led.h
index 23712a2555..b68589d204 100644
--- a/keyboards/annepro2/ap2_led.h
+++ b/keyboards/annepro2/ap2_led.h
@@ -1,18 +1,18 @@
  /* Copyright 2021 OpenAnnePro community
-  * 
-  * 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/>. 
-  */ 
+  *
+  * 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
 
@@ -31,54 +31,63 @@ typedef union {
     uint8_t pv[4];
     /* 0xrgb in mem is b g r a */
     uint32_t rgb;
-} annepro2Led_t;
+} ap2_led_t;
 
 #define ROWCOL2IDX(row, col) (NUM_COLUMN * (row) + (col))
 #define NUM_COLUMN 14
 #define NUM_ROW 5
 #define KEY_COUNT 70
 
-/* Local copy of ledMask, used to override colors on the board */
-extern annepro2Led_t ledMask[KEY_COUNT];
+/* Local copy of led_mask, used to override colors on the board */
+extern ap2_led_t led_mask[KEY_COUNT];
+extern uint8_t rgb_row_changed[NUM_ROW];
 
 /* Handle incoming messages */
-extern void ledCommandCallback(const message_t *msg);
+extern void led_command_callback(const message_t *msg);
 
-void annepro2SetIAP(void);
-void annepro2LedDisable(void);
-void annepro2LedEnable(void);
-void annepro2LedSetProfile(uint8_t prof);
-void annepro2LedGetStatus(void);
-void annepro2LedNextProfile(void);
-void annepro2LedPrevProfile(void);
-void annepro2LedNextIntensity(void);
-void annepro2LedNextAnimationSpeed(void);
-void annepro2LedForwardKeypress(uint8_t row, uint8_t col);
+void ap2_set_IAP(void);
+void ap2_led_disable(void);
+void ap2_led_enable(void);
+void ap2_led_set_profile(uint8_t prof);
+void ap2_led_get_status(void);
+void ap2_led_next_profile(void);
+void ap2_led_prev_profile(void);
+void ap2_led_next_intensity(void);
+void ap2_led_next_animation_speed(void);
+void ap2_led_forward_keypress(uint8_t row, uint8_t col);
 
 /* Set single key to a given color; alpha controls which is displayed */
-void annepro2LedMaskSetKey(uint8_t row, uint8_t col, annepro2Led_t color);
+void ap2_led_mask_set_key(uint8_t row, uint8_t col, ap2_led_t color);
 /* Push a whole local row to the shine */
-void annepro2LedMaskSetRow(uint8_t row);
+void ap2_led_mask_set_row(uint8_t row);
 /* Synchronize all rows */
-void annepro2LedMaskSetAll(void);
+void ap2_led_mask_set_all(void);
 
 /* Set all keys to a given color */
-void annepro2LedMaskSetMono(annepro2Led_t color);
+void ap2_led_mask_set_mono(ap2_led_t color);
 
 /* Blink given key `count` times by masking it with a `color`. Blink takes `hundredths` of a second */
-void annepro2LedBlink(uint8_t row, uint8_t col, annepro2Led_t color, uint8_t count, uint8_t hundredths);
+void ap2_led_blink(uint8_t row, uint8_t col, ap2_led_t color, uint8_t count, uint8_t hundredths);
 
 /* Kept for compatibility, but implemented using masks */
-void annepro2LedSetForegroundColor(uint8_t red, uint8_t green, uint8_t blue);
-void annepro2LedResetForegroundColor(void);
+void ap2_led_set_foreground_color(uint8_t red, uint8_t green, uint8_t blue);
+void ap2_led_reset_foreground_color(void);
 
 typedef struct {
-    uint8_t amountOfProfiles;
-    uint8_t currentProfile;
-    uint8_t matrixEnabled;
-    uint8_t isReactive;
-    uint8_t ledIntensity;
+    uint8_t amount_of_profiles;
+    uint8_t current_profile;
+    uint8_t matrix_enabled;
+    uint8_t is_reactive;
+    uint8_t led_intensity;
     uint8_t errors;
-} annepro2LedStatus_t;
+} ap2_led_status_t;
 
-extern annepro2LedStatus_t annepro2LedStatus;
+extern ap2_led_status_t ap2_led_status;
+
+#ifdef RGB_MATRIX_ENABLE
+/* RGB driver functions */
+void init(void);
+void flush(void);
+void set_color(int index, uint8_t r, uint8_t g, uint8_t b);
+void set_color_all(uint8_t r, uint8_t g, uint8_t b);
+#endif
diff --git a/keyboards/annepro2/c15/config.h b/keyboards/annepro2/c15/config.h
index f28a6a1b53..012b412dc9 100644
--- a/keyboards/annepro2/c15/config.h
+++ b/keyboards/annepro2/c15/config.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include "pin_defs.h"
+#include "config_led.h"
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID 0xfeed
diff --git a/keyboards/annepro2/c15/rules.mk b/keyboards/annepro2/c15/rules.mk
index 554ddc28ce..5cef8b8a87 100644
--- a/keyboards/annepro2/c15/rules.mk
+++ b/keyboards/annepro2/c15/rules.mk
@@ -3,7 +3,9 @@ SRC = \
 	matrix.c \
 	annepro2_ble.c \
 	ap2_led.c \
-	protocol.c
+	protocol.c \
+	rgb_driver.c \
+	config_led.c
 
 # MCU
 MCU = cortex-m0plus
@@ -24,6 +26,7 @@ NKRO_ENABLE = no
 MOUSEKEY_ENABLE = no
 EXTRAKEY_ENABLE = yes
 KEY_LOCK_ENABLE = no
+LAYOUTS = 60_ansi
 
 # Other featues
 BOOTMAGIC_ENABLE = no
diff --git a/keyboards/annepro2/c18/config.h b/keyboards/annepro2/c18/config.h
index f610ef76e4..5887333f2e 100644
--- a/keyboards/annepro2/c18/config.h
+++ b/keyboards/annepro2/c18/config.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include "pin_defs.h"
+#include "config_led.h"
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID 0xfeed
diff --git a/keyboards/annepro2/c18/rules.mk b/keyboards/annepro2/c18/rules.mk
index b2e16cc35f..afc248dafa 100644
--- a/keyboards/annepro2/c18/rules.mk
+++ b/keyboards/annepro2/c18/rules.mk
@@ -3,7 +3,9 @@ SRC = \
 	matrix.c \
 	annepro2_ble.c \
 	ap2_led.c \
-	protocol.c
+	protocol.c \
+	rgb_driver.c \
+	config_led.c
 
 # MCU
 MCU = cortex-m0plus
@@ -24,6 +26,7 @@ NKRO_ENABLE = no
 MOUSEKEY_ENABLE = no
 EXTRAKEY_ENABLE = yes
 KEY_LOCK_ENABLE = no
+LAYOUTS = 60_ansi
 
 # Other featues
 BOOTMAGIC_ENABLE = yes
diff --git a/keyboards/annepro2/config_led.c b/keyboards/annepro2/config_led.c
new file mode 100644
index 0000000000..efa68dff3d
--- /dev/null
+++ b/keyboards/annepro2/config_led.c
@@ -0,0 +1,43 @@
+/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef RGB_MATRIX_ENABLE
+
+#include "rgb_matrix.h"
+#include "config_led.h"
+
+#define NA NO_LED
+
+led_config_t g_led_config = { {
+    { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13 },
+    { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 },
+    { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NA },
+    { 41, NA, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, NA },
+    { 53, NA, 54, 55, NA, NA, 56, NA, NA, 57, 58, 59, 60, NA }
+}, {
+    { 0 ,  0 }, { 16,  0 }, { 32,  0 }, { 48,  0 }, { 65,  0 }, { 81,  0 }, { 97 ,  0 }, { 113,  0 }, { 129,  0 }, { 145,  0 }, { 161,  0 }, { 178,  0 }, { 194,  0 }, { 218,  0 },
+    { 4 , 16 }, { 24, 16 }, { 40, 16 }, { 57, 16 }, { 73, 16 }, { 89, 16 }, { 105, 16 }, { 121, 16 }, { 137, 16 }, { 153, 16 }, { 170, 16 }, { 186, 16 }, { 202, 16 }, { 222, 16 },
+    { 6 , 32 }, { 28, 32 }, { 44, 32 }, { 61, 32 }, { 77, 32 }, { 93, 32 }, { 109, 32 }, { 125, 32 }, { 141, 32 }, { 157, 32 }, { 174, 32 }, { 190, 32 }, { 216, 32 },
+    { 10, 48 },             { 36, 48 }, { 52, 48 }, { 69, 48 }, { 85, 48 }, { 101, 48 }, { 117, 48 }, { 133, 48 }, { 149, 48 }, { 165, 48 }, { 182, 48 }, { 212, 48 },
+    { 2 , 64 }, { 22, 64 }, { 42, 64 },                                     { 103, 64 },                           { 163, 64 }, { 184, 64 }, { 204, 64 }, { 224, 64 },
+}, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4,
+    1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
+    1, 1, 1,          4,          1, 1, 1, 1,
+} };
+#endif
diff --git a/keyboards/annepro2/config_led.h b/keyboards/annepro2/config_led.h
new file mode 100644
index 0000000000..19a1dd4baa
--- /dev/null
+++ b/keyboards/annepro2/config_led.h
@@ -0,0 +1,72 @@
+/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef RGB_MATRIX_ENABLE
+
+#define DRIVER_LED_TOTAL 61
+
+/* Limit animations to 62.5 FPS to avoid tearing. (1/.016 = 62.5 FPS). */
+#define RGB_MATRIX_LED_FLUSH_LIMIT 16
+
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+#define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+#define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#endif
diff --git a/keyboards/annepro2/info.json b/keyboards/annepro2/info.json
index 8fd515bd10..8d6c85b5d1 100644
--- a/keyboards/annepro2/info.json
+++ b/keyboards/annepro2/info.json
@@ -3,7 +3,7 @@
     "url": "https://openannepro.github.io/",
     "maintainer": "community",
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_60_ansi": {
             "layout": [
                 {
                     "label": "~",
diff --git a/keyboards/annepro2/keymaps/default-full-caps/keymap.c b/keyboards/annepro2/keymaps/default-full-caps/keymap.c
index 8ac9211ac4..c87447d311 100644
--- a/keyboards/annepro2/keymaps/default-full-caps/keymap.c
+++ b/keyboards/annepro2/keymaps/default-full-caps/keymap.c
@@ -1,32 +1,31 @@
  /* Copyright 2021 OpenAnnePro community
-  * 
-  * 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/>. 
-  */ 
+  *
+  * 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 anne_pro_layers {
-    _BASE_LAYER,
-    _FN1_LAYER,
-    _FN2_LAYER,
+    BASE,
+    FN1,
+    FN2,
 };
 
 // clang-format off
-
 // Key symbols are based on QMK. Use them to remap your keyboard
 /*
-* Layer _BASE_LAYER
+* Layer BASE
 * ,-----------------------------------------------------------------------------------------.
 * | esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
 * |-----------------------------------------------------------------------------------------+
@@ -38,7 +37,7 @@ enum anne_pro_layers {
 * |-----------------------------------------------------------------------------------------+
 * | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
 * \-----------------------------------------------------------------------------------------/
-* Layer TAP in _BASE_LAYER
+* Layer TAP in BASE
 * ,-----------------------------------------------------------------------------------------.
 * |     |     |     |     |     |     |     |     |     |     |     |     |     |           |
 * |-----------------------------------------------------------------------------------------+
@@ -52,15 +51,15 @@ enum anne_pro_layers {
 * \-----------------------------------------------------------------------------------------/
 */
  const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE_LAYER] = LAYOUT( /* Base */
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-    LT(_FN1_LAYER,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, RSFT_T(KC_UP),
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, LT(_FN1_LAYER,KC_LEFT), LT(_FN2_LAYER,KC_DOWN), RCTL_T(KC_RGHT)
+ [BASE] = LAYOUT_60_ansi( /* Base */
+    KC_ESC,           KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,             KC_MINS,          KC_EQL,        KC_BSPC,
+    KC_TAB,           KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O,    KC_P,             KC_LBRC,          KC_RBRC,       KC_BSLS,
+    LT(FN1, 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,          RSFT_T(KC_UP),
+    KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,             KC_RALT, LT(FN1, KC_LEFT), LT(FN2, KC_DOWN), RCTL_T(KC_RGHT)
 ),
   /*
-  * Layer _FN1_LAYER
+  * Layer FN1
   * ,-----------------------------------------------------------------------------------------.
   * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  DELETE   |
   * |-----------------------------------------------------------------------------------------+
@@ -74,15 +73,15 @@ enum anne_pro_layers {
   * \-----------------------------------------------------------------------------------------/
   *
   */
- [_FN1_LAYER] = LAYOUT( /* Base */
-    KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-    KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
-    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
-    KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN2_LAYER), KC_TRNS
+ [FN1] = LAYOUT_60_ansi( /* FN1 */
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,  _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
+    _______,          KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
+    _______, _______, _______,                            _______,                   _______, _______, MO(FN2), _______
 ),
   /*
-  * Layer _FN2_LAYER
+  * Layer FN2
   * ,-----------------------------------------------------------------------------------------.
   * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 |  F7 |LEDOF|LEDON| F10 | F11 | F12 |    Bksp   |
   * |-----------------------------------------------------------------------------------------+
@@ -96,24 +95,23 @@ enum anne_pro_layers {
   * \-----------------------------------------------------------------------------------------/
   *
   */
- [_FN2_LAYER] = LAYOUT( /* Base */
-    KC_TRNS, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, KC_TRNS, KC_TRNS, KC_TRNS, KC_AP_LED_OFF, KC_AP_LED_ON, KC_AP_LED_NEXT_INTENSITY, KC_AP_LED_SPEED, KC_TRNS, KC_TRNS,
-    MO(_FN2_LAYER), KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
-    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN1_LAYER), MO(_FN2_LAYER), KC_TRNS
+ [FN2] = LAYOUT_60_ansi( /* FN2 */
+    _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, KC_AP_LED_OFF, KC_AP_LED_ON, _______, _______, _______, _______,
+    MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______,       _______,      KC_PSCR, KC_HOME, KC_END,  _______,
+    _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______,       _______,      KC_PGUP, KC_PGDN, _______,
+    _______,             _______,    _______,    _______,    _______, _______, _______, _______,       _______,      KC_INS,  KC_DEL,  _______,
+    _______, _______,    _______,                                     _______,                         _______,      MO(FN1), MO(FN2), _______
  ),
 };
-
 // clang-format on
 
 // The function to handle the caps lock logic
 bool led_update_user(led_t leds) {
     if (leds.caps_lock) {
         // Set the leds to red
-        annepro2LedSetForegroundColor(0xFF, 0x00, 0x00);
+        ap2_led_set_foreground_color(0xFF, 0x00, 0x00);
     } else {
-        annepro2LedResetForegroundColor();
+        ap2_led_reset_foreground_color();
     }
 
     return true;
diff --git a/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c b/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
index ac2b421d06..405769466a 100644
--- a/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
+++ b/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
@@ -1,32 +1,31 @@
  /* Copyright 2021 OpenAnnePro community
-  * 
-  * 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/>. 
-  */ 
+  *
+  * 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 anne_pro_layers {
-    _BASE_LAYER,
-    _FN1_LAYER,
-    _FN2_LAYER,
+    BASE,
+    FN1,
+    FN2,
 };
 
 // clang-format off
-
 // Key symbols are based on QMK. Use them to remap your keyboard
 /*
-* Layer _BASE_LAYER
+* Layer BASE
 * ,-----------------------------------------------------------------------------------------.
 * | esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
 * |-----------------------------------------------------------------------------------------+
@@ -38,7 +37,7 @@ enum anne_pro_layers {
 * |-----------------------------------------------------------------------------------------+
 * | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
 * \-----------------------------------------------------------------------------------------/
-* Layer TAP in _BASE_LAYER
+* Layer TAP in BASE
 * ,-----------------------------------------------------------------------------------------.
 * |     |     |     |     |     |     |     |     |     |     |     |     |     |           |
 * |-----------------------------------------------------------------------------------------+
@@ -52,15 +51,15 @@ enum anne_pro_layers {
 * \-----------------------------------------------------------------------------------------/
 */
  const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE_LAYER] = LAYOUT( /* Base */
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-    LT(_FN1_LAYER,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, RSFT_T(KC_UP),
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, LT(_FN1_LAYER,KC_LEFT), LT(_FN2_LAYER,KC_DOWN), RCTL_T(KC_RGHT)
+ [BASE] = LAYOUT_60_ansi( /* Base */
+    KC_ESC,           KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,             KC_MINS,          KC_EQL,        KC_BSPC,
+    KC_TAB,           KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O,    KC_P,             KC_LBRC,          KC_RBRC,       KC_BSLS,
+    LT(FN1, 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,          RSFT_T(KC_UP),
+    KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,             KC_RALT, LT(FN1, KC_LEFT), LT(FN2, KC_DOWN), RCTL_T(KC_RGHT)
 ),
   /*
-  * Layer _FN1_LAYER
+  * Layer FN1
   * ,-----------------------------------------------------------------------------------------.
   * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  DELETE   |
   * |-----------------------------------------------------------------------------------------+
@@ -74,15 +73,15 @@ enum anne_pro_layers {
   * \-----------------------------------------------------------------------------------------/
   *
   */
- [_FN1_LAYER] = LAYOUT( /* Base */
-    KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-    KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
-    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
-    KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN2_LAYER), KC_TRNS
+ [FN1] = LAYOUT_60_ansi( /* FN1 */
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,  _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
+    _______,          KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
+    _______, _______, _______,                            _______,                   _______, _______, MO(FN2), _______
 ),
   /*
-  * Layer _FN2_LAYER
+  * Layer FN2
   * ,-----------------------------------------------------------------------------------------.
   * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 |  F7 |LEDOF|LEDON| F10 | F11 | F12 |    Bksp   |
   * |-----------------------------------------------------------------------------------------+
@@ -96,30 +95,29 @@ enum anne_pro_layers {
   * \-----------------------------------------------------------------------------------------/
   *
   */
- [_FN2_LAYER] = LAYOUT( /* Base */
-    KC_TRNS, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, KC_TRNS, KC_TRNS, KC_TRNS, KC_AP_LED_OFF, KC_AP_LED_ON, KC_AP_LED_NEXT_INTENSITY, KC_AP_LED_SPEED, KC_TRNS, KC_TRNS,
-    MO(_FN2_LAYER), KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
-    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN1_LAYER), MO(_FN2_LAYER), KC_TRNS
+ [FN2] = LAYOUT_60_ansi( /* FN2 */
+    _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, KC_AP_LED_OFF, KC_AP_LED_ON, _______, _______, _______, _______,
+    MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,  _______,
+    _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
+    _______,             _______,    _______,    _______,    _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
+    _______, _______,    _______,                                     _______,                   _______, MO(FN1), MO(FN2), _______
  ),
 };
-
 // clang-format on
 
 layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
-        case _FN1_LAYER:
+        case FN1:
             // Set the leds to green
-            annepro2LedSetForegroundColor(0x00, 0xFF, 0x00);
+            ap2_led_set_foreground_color(0x00, 0xFF, 0x00);
             break;
-        case _FN2_LAYER:
+        case FN2:
             // Set the leds to blue
-            annepro2LedSetForegroundColor(0x00, 0x00, 0xFF);
+            ap2_led_set_foreground_color(0x00, 0x00, 0xFF);
             break;
         default:
             // Reset back to the current profile
-            annepro2LedResetForegroundColor();
+            ap2_led_reset_foreground_color();
             break;
     }
     return state;
@@ -130,16 +128,16 @@ layer_state_t layer_state_set_user(layer_state_t state) {
 bool led_update_user(led_t leds) {
     if (leds.caps_lock) {
         // Set the caps-lock to red
-        const annepro2Led_t color = {.p.red = 0xff, .p.green = 0x00, .p.blue = 0x00, .p.alpha = 0xff};
+        const ap2_led_t color = {.p.red = 0xff, .p.green = 0x00, .p.blue = 0x00, .p.alpha = 0xff};
 
-        annepro2LedMaskSetKey(2, 0, color);
+        ap2_led_mask_set_key(2, 0, color);
         /* NOTE: Instead of colouring the capslock only, you can change the whole
-           keyboard with annepro2LedSetForegroundColor */
+           keyboard with ap2_led_set_foreground_color */
     } else {
         // Reset the capslock if there is no layer active
-        if (!layer_state_is(_FN1_LAYER) && !layer_state_is(_FN2_LAYER)) {
-            const annepro2Led_t color = {.p.red = 0xff, .p.green = 0x00, .p.blue = 0x00, .p.alpha = 0x00};
-            annepro2LedMaskSetKey(2, 0, color);
+        if (!layer_state_is(FN1) && !layer_state_is(FN2)) {
+            const ap2_led_t color = {.p.red = 0xff, .p.green = 0x00, .p.blue = 0x00, .p.alpha = 0x00};
+            ap2_led_mask_set_key(2, 0, color);
         }
     }
 
diff --git a/keyboards/annepro2/keymaps/default/keymap.c b/keyboards/annepro2/keymaps/default/keymap.c
index a984b05830..8f5b639bb8 100644
--- a/keyboards/annepro2/keymaps/default/keymap.c
+++ b/keyboards/annepro2/keymaps/default/keymap.c
@@ -1,31 +1,31 @@
  /* Copyright 2021 OpenAnnePro community
-  * 
-  * 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/>. 
-  */ 
+  *
+  * 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 anne_pro_layers {
-    _BASE_LAYER,
-    _FN1_LAYER,
-    _FN2_LAYER,
+    BASE,
+    FN1,
+    FN2,
 };
 
 // clang-format off
 // Key symbols are based on QMK. Use them to remap your keyboard
 /*
-* Layer _BASE_LAYER
+* Layer BASE
 * ,-----------------------------------------------------------------------------------------.
 * | esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
 * |-----------------------------------------------------------------------------------------+
@@ -37,7 +37,7 @@ enum anne_pro_layers {
 * |-----------------------------------------------------------------------------------------+
 * | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  FN1  |  FN2  | Ctrl  |
 * \-----------------------------------------------------------------------------------------/
-* Layer TAP in _BASE_LAYER
+* Layer TAP in BASE
 * ,-----------------------------------------------------------------------------------------.
 * |     |     |     |     |     |     |     |     |     |     |     |     |     |           |
 * |-----------------------------------------------------------------------------------------+
@@ -51,15 +51,15 @@ enum anne_pro_layers {
 * \-----------------------------------------------------------------------------------------/
 */
  const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE_LAYER] = LAYOUT( /* Base */
-    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
-    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-    LT(_FN1_LAYER,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, RSFT_T(KC_UP),
-    KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, LT(_FN1_LAYER,KC_LEFT), LT(_FN2_LAYER,KC_DOWN), RCTL_T(KC_RGHT)
+ [BASE] = LAYOUT_60_ansi( /* Base */
+    KC_ESC,           KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7, KC_8, KC_9,    KC_0,             KC_MINS,          KC_EQL,        KC_BSPC,
+    KC_TAB,           KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U, KC_I, KC_O,    KC_P,             KC_LBRC,          KC_RBRC,       KC_BSLS,
+    LT(FN1, 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,          RSFT_T(KC_UP),
+    KC_LCTL,          KC_LGUI, KC_LALT,                   KC_SPC,             KC_RALT, LT(FN1, KC_LEFT), LT(FN2, KC_DOWN), RCTL_T(KC_RGHT)
 ),
   /*
-  * Layer _FN1_LAYER
+  * Layer FN1
   * ,-----------------------------------------------------------------------------------------.
   * |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |  DELETE   |
   * |-----------------------------------------------------------------------------------------+
@@ -73,17 +73,17 @@ enum anne_pro_layers {
   * \-----------------------------------------------------------------------------------------/
   *
   */
- [_FN1_LAYER] = LAYOUT( /* Base */
-    KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
-    KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
-    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
-    KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN2_LAYER), KC_TRNS
+ [FN1] = LAYOUT_60_ansi( /* FN1 */
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,  _______,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
+    _______,          KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
+    _______, _______, _______,                            _______,                   _______, _______, MO(FN2), _______
 ),
   /*
-  * Layer _FN2_LAYER
+  * Layer FN2
   * ,-----------------------------------------------------------------------------------------.
-  * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 |  F7 |LEDOF|LEDON| F10 | F11 | F12 |    Bksp   |
+  * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 | HUE | SAT | BRI | SPD | MOD | TOG |    Bksp   |
   * |-----------------------------------------------------------------------------------------+
   * | Tab    |  q  | UP  |  e  |  r  |  t  |  y  |  u  |  i  |  o  | PS | HOME | END |   \    |
   * |-----------------------------------------------------------------------------------------+
@@ -95,12 +95,12 @@ enum anne_pro_layers {
   * \-----------------------------------------------------------------------------------------/
   *
   */
- [_FN2_LAYER] = LAYOUT( /* Base */
-    KC_TRNS, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, KC_TRNS, KC_TRNS, KC_TRNS, KC_AP_LED_OFF, KC_AP_LED_ON, KC_AP_LED_NEXT_INTENSITY, KC_AP_LED_SPEED, KC_TRNS, KC_TRNS,
-    MO(_FN2_LAYER), KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_HOME, KC_END, KC_TRNS,
-    KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_PGDN, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL, KC_TRNS,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(_FN1_LAYER), MO(_FN2_LAYER), KC_TRNS
+ [FN2] = LAYOUT_60_ansi( /* FN2 */
+    _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD, RGB_TOG, _______,
+    MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,  _______,
+    _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
+    _______,             _______,    _______,    _______,    _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
+    _______, _______,    _______,                                     _______,                   _______, MO(FN1), MO(FN2), _______
  ),
 };
 // clang-format on
diff --git a/keyboards/annepro2/keymaps/default/rules.mk b/keyboards/annepro2/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ca1110b835
--- /dev/null
+++ b/keyboards/annepro2/keymaps/default/rules.mk
@@ -0,0 +1,3 @@
+# Custom RGB matrix handling
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = custom
diff --git a/keyboards/annepro2/protocol.c b/keyboards/annepro2/protocol.c
index 171ac5c239..ff30658cd7 100644
--- a/keyboards/annepro2/protocol.c
+++ b/keyboards/annepro2/protocol.c
@@ -20,38 +20,38 @@
 /* UART communication protocol state */
 protocol_t proto;
 
-void protoInit(protocol_t *proto, void (*callback)(const message_t *)) {
-    proto->previousId = 0;
+void proto_init(protocol_t *proto, void (*callback)(const message_t *)) {
+    proto->previous_id = 0;
     proto->callback   = callback;
     proto->state      = STATE_SYNC_1;
     proto->errors     = 0;
 }
 
-static uint8_t msgId = 0;
-void           protoTx(uint8_t cmd, const unsigned char *buf, int payloadSize, int retries) {
-    chDbgCheck(payloadSize <= MAX_PAYLOAD_SIZE);
+static uint8_t msg_id = 0;
+void           proto_tx(uint8_t cmd, const unsigned char *buf, int payload_size, int retries) {
+    chDbgCheck(payload_size <= MAX_PAYLOAD_SIZE);
 
     const uint8_t header[5] = {
-        0x7A, 0x1D, cmd, ++msgId, payloadSize,
+        0x7A, 0x1D, cmd, ++msg_id, payload_size,
     };
 
     /* We don't implement ACKs, yet some messages should not be lost. */
     for (int i = 0; i < retries; i++) {
         sdWrite(&PROTOCOL_SD, header, sizeof(header));
-        if (payloadSize) sdWrite(&PROTOCOL_SD, buf, payloadSize);
+        if (payload_size) sdWrite(&PROTOCOL_SD, buf, payload_size);
     }
 }
 
 static inline void messageReceived(protocol_t *proto) {
-    if (proto->buffer.msgId != proto->previousId) {
+    if (proto->buffer.msg_id != proto->previous_id) {
         /* It's not a resend / duplicate */
         proto->callback(&proto->buffer);
-        proto->previousId = proto->buffer.msgId;
+        proto->previous_id = proto->buffer.msg_id;
     }
     proto->state = STATE_SYNC_1;
 }
 
-void protoConsume(protocol_t *proto, uint8_t byte) {
+void proto_consume(protocol_t *proto, uint8_t byte) {
     switch (proto->state) {
         case STATE_SYNC_1:
             if (byte == 0x7A) {
@@ -76,18 +76,18 @@ void protoConsume(protocol_t *proto, uint8_t byte) {
             return;
 
         case STATE_ID:
-            proto->buffer.msgId = byte;
+            proto->buffer.msg_id = byte;
             proto->state        = STATE_PAYLOAD_SIZE;
             return;
 
         case STATE_PAYLOAD_SIZE:
-            proto->buffer.payloadSize = byte;
-            if (proto->buffer.payloadSize > MAX_PAYLOAD_SIZE) {
-                proto->buffer.payloadSize = MAX_PAYLOAD_SIZE;
+            proto->buffer.payload_size = byte;
+            if (proto->buffer.payload_size > MAX_PAYLOAD_SIZE) {
+                proto->buffer.payload_size = MAX_PAYLOAD_SIZE;
                 proto->errors++;
             }
-            proto->payloadPosition = 0;
-            if (proto->buffer.payloadSize == 0) {
+            proto->payload_position = 0;
+            if (proto->buffer.payload_size == 0) {
                 /* No payload - whole message received */
                 messageReceived(proto);
             } else {
@@ -98,9 +98,9 @@ void protoConsume(protocol_t *proto, uint8_t byte) {
         case STATE_PAYLOAD:
             /* NOTE: This could be read with sdReadTimeout probably, but that breaks
              * abstraction */
-            proto->buffer.payload[proto->payloadPosition] = byte;
-            proto->payloadPosition++;
-            if (proto->payloadPosition == proto->buffer.payloadSize) {
+            proto->buffer.payload[proto->payload_position] = byte;
+            proto->payload_position++;
+            if (proto->payload_position == proto->buffer.payload_size) {
                 /* Payload read - message received */
                 messageReceived(proto);
             }
@@ -108,7 +108,7 @@ void protoConsume(protocol_t *proto, uint8_t byte) {
     }
 }
 
-void protoSilence(protocol_t *proto) {
+void proto_silence(protocol_t *proto) {
     if (proto->state != STATE_SYNC_1) {
         proto->state = STATE_SYNC_1;
         proto->errors++;
diff --git a/keyboards/annepro2/protocol.h b/keyboards/annepro2/protocol.h
index d1a05683c8..208fcd806c 100644
--- a/keyboards/annepro2/protocol.h
+++ b/keyboards/annepro2/protocol.h
@@ -55,7 +55,7 @@ enum {
 #define MAX_PAYLOAD_SIZE 64
 
 /** Enum of the states used for the serial protocol finite-state automaton */
-enum protoState {
+enum proto_state {
     /* 2-byte initial start-of-message sync */
     STATE_SYNC_1,
     STATE_SYNC_2,
@@ -65,15 +65,15 @@ enum protoState {
     STATE_ID,
     /* Waiting for payload size */
     STATE_PAYLOAD_SIZE,
-    /* Reading payload until payloadPosition == payloadSize */
+    /* Reading payload until payload_position == payload_size */
     STATE_PAYLOAD,
 };
 
 /* Buffer holding a single message */
 typedef struct {
     uint8_t command;
-    uint8_t msgId;
-    uint8_t payloadSize;
+    uint8_t msg_id;
+    uint8_t payload_size;
     uint8_t payload[MAX_PAYLOAD_SIZE];
 } message_t;
 
@@ -83,12 +83,12 @@ typedef struct {
     void (*callback)(const message_t *);
 
     /* Number of read payload bytes */
-    uint8_t payloadPosition;
+    uint8_t payload_position;
 
     /* Current finite-state-automata state */
-    enum protoState state;
+    enum proto_state state;
 
-    uint8_t previousId;
+    uint8_t previous_id;
     uint8_t errors;
 
     /* Currently received message */
@@ -99,13 +99,13 @@ typedef struct {
 extern protocol_t proto;
 
 /* Init state */
-extern void protoInit(protocol_t *proto, void (*callback)(const message_t *));
+extern void proto_init(protocol_t *proto, void (*callback)(const message_t *));
 
 /* Consume one byte and push state forward - might call the callback */
-extern void protoConsume(protocol_t *proto, uint8_t byte);
+extern void proto_consume(protocol_t *proto, uint8_t byte);
 
 /* Prolonged silence - reset state */
-extern void protoSilence(protocol_t *proto);
+extern void proto_silence(protocol_t *proto);
 
 /* Transmit message */
-extern void protoTx(uint8_t cmd, const unsigned char *buf, int payloadSize, int retries);
+extern void proto_tx(uint8_t cmd, const unsigned char *buf, int payload_size, int retries);
diff --git a/keyboards/annepro2/rgb_driver.c b/keyboards/annepro2/rgb_driver.c
new file mode 100644
index 0000000000..240a5f4e5b
--- /dev/null
+++ b/keyboards/annepro2/rgb_driver.c
@@ -0,0 +1,66 @@
+/* Copyright 2022 Jose Pablo Ramirez <jp.ramangulo@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef RGB_MATRIX_ENABLE
+
+#include "rgb_matrix.h"
+#include "ap2_led.h"
+
+uint8_t led_pos[DRIVER_LED_TOTAL];
+
+void init(void) {
+    unsigned int i = 0;
+    for (unsigned int y = 0; y < NUM_ROW; y++) {
+        for (unsigned int x = 0; x < NUM_COLUMN; x++) {
+            if (g_led_config.matrix_co[y][x] != NO_LED) {
+                led_pos[g_led_config.matrix_co[y][x]] = i;
+            }
+            i++;
+        }
+    }
+}
+
+void flush(void) {}
+
+void set_color(int index, uint8_t r, uint8_t g, uint8_t b) {
+    if (r != led_mask[led_pos[index]].p.red   ||
+        g != led_mask[led_pos[index]].p.green ||
+        b != led_mask[led_pos[index]].p.blue)
+        {
+            led_mask[led_pos[index]] = (ap2_led_t){
+                .p.blue  = b,
+                .p.red   = r,
+                .p.green = g,
+                .p.alpha = 0xff,
+            };
+            int row = led_pos[index] / NUM_COLUMN;
+            rgb_row_changed[row] = 1;
+        }
+}
+
+void set_color_all(uint8_t r, uint8_t g, uint8_t b) {
+    for (int i=0; i<DRIVER_LED_TOTAL; i++)
+        set_color(i, r, g, b);
+}
+
+const rgb_matrix_driver_t rgb_matrix_driver = {
+    .init          = init,
+    .flush         = flush,
+    .set_color     = set_color,
+    .set_color_all = set_color_all,
+};
+
+#endif

From db16271a728268995d8ec93d0d2a26658867bc28 Mon Sep 17 00:00:00 2001
From: Tony Grosinger <tony@grosinger.net>
Date: Wed, 9 Mar 2022 13:47:57 -0800
Subject: [PATCH 784/867] Add Gergoplex keymap for tgrosinger (#15148)

* Add Gergoplex keymap for tgrosinger

* Add improved shortcuts for PopOS

* Add license
---
 .../gergoplex/keymaps/tgrosinger/combos.def   |  11 +
 .../keymaps/tgrosinger/gergoplex.def          |  17 ++
 .../gergoplex/keymaps/tgrosinger/keymap.c     | 286 ++++++++++++++++++
 .../gergoplex/keymaps/tgrosinger/readme.md    |  12 +
 .../gergoplex/keymaps/tgrosinger/rules.mk     |  17 ++
 5 files changed, 343 insertions(+)
 create mode 100644 keyboards/gboards/gergoplex/keymaps/tgrosinger/combos.def
 create mode 100644 keyboards/gboards/gergoplex/keymaps/tgrosinger/gergoplex.def
 create mode 100644 keyboards/gboards/gergoplex/keymaps/tgrosinger/keymap.c
 create mode 100644 keyboards/gboards/gergoplex/keymaps/tgrosinger/readme.md
 create mode 100644 keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk

diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/combos.def b/keyboards/gboards/gergoplex/keymaps/tgrosinger/combos.def
new file mode 100644
index 0000000000..ef953d53f5
--- /dev/null
+++ b/keyboards/gboards/gergoplex/keymaps/tgrosinger/combos.def
@@ -0,0 +1,11 @@
+// List any combo dictionaries you want loaded to your device below!
+
+// QMK wide includes
+//#include "combos/germ-vim-helpers.def"
+//#include "combos/germ-mouse-keys.def"
+
+// User includes
+#include "gergoplex.def"
+
+// Word completion
+// #include "combos/eng-combos.def"
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/gergoplex.def b/keyboards/gboards/gergoplex/keymaps/tgrosinger/gergoplex.def
new file mode 100644
index 0000000000..c7a93ed294
--- /dev/null
+++ b/keyboards/gboards/gergoplex/keymaps/tgrosinger/gergoplex.def
@@ -0,0 +1,17 @@
+// Gergoplex specfic combos
+
+COMB(qwGrav,      KC_GRV,           KC_W, KC_Q)
+COMB(wsEsc,       KC_ESC,           KC_W, KC_S)
+COMB(sdBackspace, KC_BSPC,          KC_S, KC_D)
+COMB(dfTab,       KC_TAB,           KC_D, KC_F)
+COMB(cvEnter,     KC_ENT,           KC_C, KC_V)
+
+COMB(ioMinus,     KC_MINS,          KC_I, KC_O)
+COMB(opBackslash, KC_BSLS,          KC_O, KC_P)
+COMB(hjLess,      KC_LT,            KC_H, KC_J)
+COMB(klGreat,     KC_GT,            KC_K, KC_L)
+COMB(jkColon,     KC_COLN,          KC_J, KC_K)
+COMB(mcUnder,     KC_UNDS,          KC_M, KC_COMM)
+COMB(nmQuote,     KC_QUOT,          KC_N, KC_M)
+
+SUBS(pasta,       "I'd just like to interject for a moment.",       KC_H, KC_J, KC_K, KC_L)
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/keymap.c b/keyboards/gboards/gergoplex/keymaps/tgrosinger/keymap.c
new file mode 100644
index 0000000000..74c0899fdb
--- /dev/null
+++ b/keyboards/gboards/gergoplex/keymaps/tgrosinger/keymap.c
@@ -0,0 +1,286 @@
+/* Copyright 2022 Tony Grosinger
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "g/keymap_combo.h"
+
+enum {
+  _ALPHA,  // Default
+  _SYMB,   // Symbols
+  _NUMB,   // Numbers
+  _ARROWS, // Arrows and OS
+  _TMUX,   // TMUX Nav layer
+  _POPOS,  // Gnome Shell, aka PopOS
+};
+
+
+// Macros
+enum custom_keycodes {
+  TMUX_NEW = SAFE_RANGE,
+  TMUX_ZOOM,
+  TMUX_SCROLL,
+  TMUX_PN_LT,
+  TMUX_PN_UP,
+  TMUX_PN_DN,
+  TMUX_PN_RT,
+  TMUX_WN_LT,
+  TMUX_WN_RT,
+  TMUX_SP_VT,
+  TMUX_SP_HZ,
+  VIM_CLIP_CP,
+  VIM_CLIP_PST,
+  VIM_MACRO,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case TMUX_NEW:
+      if (record->event.pressed) {
+        tap_code16(C(KC_B));
+        SEND_STRING("c");
+      }
+      break;
+    case TMUX_ZOOM:
+      if (record->event.pressed) {
+        tap_code16(C(KC_B));
+        SEND_STRING("z");
+      }
+      break;
+    case TMUX_SCROLL:
+      if (record->event.pressed) {
+        tap_code16(C(KC_B));
+        SEND_STRING("[");
+      }
+      break;
+    case TMUX_PN_LT:
+      if (record->event.pressed) {
+        tap_code16(C(KC_B));
+        tap_code(KC_LEFT);
+      }
+      break;
+    case TMUX_PN_DN:
+      if (record->event.pressed) {
+        tap_code16(C(KC_B));
+        tap_code(KC_DOWN);
+      }
+      break;
+    case TMUX_PN_UP:
+      if (record->event.pressed) {
+        tap_code16(C(KC_B));
+        tap_code(KC_UP);
+      }
+      break;
+    case TMUX_PN_RT:
+      if (record->event.pressed) {
+        tap_code16(C(KC_B));
+        tap_code(KC_RIGHT);
+      }
+      break;
+    case TMUX_WN_LT:
+      if (record->event.pressed) {
+        tap_code16(C(KC_B));
+        SEND_STRING("p");
+      }
+      break;
+    case TMUX_WN_RT:
+      if (record->event.pressed) {
+        tap_code16(C(KC_B));
+        SEND_STRING("n");
+      }
+      break;
+    case TMUX_SP_VT:
+      if (record->event.pressed) {
+        tap_code16(C(KC_B));
+        SEND_STRING("%");
+      }
+      break;
+    case TMUX_SP_HZ:
+      if (record->event.pressed) {
+        tap_code16(C(KC_B));
+        SEND_STRING("\"");
+      }
+      break;
+    case VIM_CLIP_CP:
+      if (record->event.pressed) {
+        tap_code16(S(KC_QUOTE));
+        tap_code16(S(KC_EQUAL));
+        tap_code(KC_Y);
+      }
+      break;
+    case VIM_CLIP_PST:
+      if (record->event.pressed) {
+        tap_code16(S(KC_QUOTE));
+        tap_code16(S(KC_EQUAL));
+        tap_code(KC_P);
+      }
+      break;
+    case VIM_MACRO:
+      if (record->event.pressed) {
+        tap_code16(S(KC_2));
+        tap_code(KC_Q);
+      }
+      break;
+    /*
+    case LAYRMOD:
+      // Act as a mod key if held, or toggle a layer if tapped
+      // replace KC_LCTL with desired mod, and _TARGET with desired layer name / number
+      if (record->event.pressed) {
+        uint8_t key_timer = timer_read();
+        register_mods(MOD_BIT(KC_LCTL));
+      } else {
+        unregister_mods(MOD_BIT(KC_LCTL));
+        if (timer_elapsed(key_timer) < 200) {
+          layer_invert(_TARGET);
+        }
+      }
+      return false;
+      break;
+    */
+  }
+  return true;
+}
+
+/* Combos
+ *
+ * ,-----------------------------.      ,-----------------------------.
+ * |     `     |     |     |     |      |     |    MINS   |    BSLH   |
+ * |-----+----ESC----+-----+-----|      |-----+-----+-----+-----------|
+ * |     |   BSPC   TAB    |     |      |    LES   COLN  GRT    |     |
+ * |-----+-----+-----+--RMB+-LMB-|      |-----+-----+-----+-----------|
+ * |     |     |    ENT    |     |      |    QUO   UNDR   |     |     |
+ * `-----+-----+-----+-----+-----'      `-----------------------------'
+ *     .-------------------------.           .-------------------.
+ *     |        |       |        |           |        |    |     |
+ *     '-------------------------'           '-------------------'
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap 0: Default layer
+  * ,------------------------------.      ,----------------------------------.
+  * |  Q   |  W  |  E  |  R  |  T  |      |  Y  |  U  |  I  |   O   |    P   |
+  * |------+-----+-----+-----+-----|      |-----+-----+-----+-------+--------|
+  * |CTRL/A|  S  |  D  |  F  |  G  |      |  H  |  J  |  K  |   L   | CTRL/; |
+  * |------+-----+-----+-----+-----|      |-----+-----+-----+-------+--------|
+  * |SHFT/Z|ALT/X|  C  |  V  |  B  |      |  N  |  M  |  <  | ALT/> | SHFT/? |
+  * `------+-----+-----+------+----'      `----------------------------------'
+  *           .-----------------.             .----------------------.
+  *           |   |GUI |SPC(NUM)|             |SPC(SYM)|TMUX | PopOS |
+  *           '-----------------'             '----------------------'
+  */
+  [_ALPHA] = LAYOUT_split_3x5_3(
+      KC_Q,              KC_W,               KC_E, KC_R, KC_T,    KC_Y, KC_U, KC_I,    KC_O,   KC_P, 
+      MT(MOD_LCTL, KC_A),KC_S,               KC_D, KC_F, KC_G,    KC_H, KC_J, KC_K,    KC_L,   MT(MOD_LCTL, KC_SCLN),
+      MT(MOD_LSFT, KC_Z),MT(MOD_LALT, KC_X), KC_C, KC_V, KC_B,    KC_N, KC_M, KC_COMM, MT(MOD_LALT, KC_DOT), MT(MOD_RSFT, KC_SLSH),
+              
+      KC_NO,   KC_LGUI, LT(_NUMB, KC_SPC),       // Left
+      LT(_SYMB, KC_SPC), MO(_TMUX), MO(_POPOS)   // Right
+      ),
+
+  /* Keymap 1: Symbols layer
+  * ,------------------------------.      ,-------------------------------.
+  * |  !   |  @  |  #  |  $  |  %  |      |  ^  |  &  |  *  |  +  |   =   |
+  * |------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
+  * |  F1  | F2  | F3  | F4  | F5  |      | F6  | F7  | F8  | F9  |  F10  |
+  * |------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
+  * |      |     |     |     |     |      |     |     |     | F11 |  F12  |
+  * `------+-----+-----+-----+-----'      `-------------------------------'
+  *        .-----------------.                  .-----------------.
+  *        |     | DEL | MO3 |                  | HLD | SPC |     |
+  *        '-----------------'                  '-----------------'
+  */
+  [_SYMB] = LAYOUT_split_3x5_3(
+      KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,   KC_CIRC, KC_AMPR, KC_ASTR, KC_PLUS, KC_EQL,
+      KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
+      KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_F11,  KC_F12,
+                KC_NO, KC_DEL, MO(_ARROWS),                 KC_TRNS,  KC_SPC, KC_NO
+      ),
+
+  /* Keymap 2: Number layer
+  * ,------------------------------.      ,-------------------------------.
+  * |  1   |  2  |  3  |  4  |  5  |      |  6  |  7  |  8  |  9  |   0   |
+  * |------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
+  * | CTRL |     |  (  |  )  |     |      |     |  4  |  7  |  6  |       |
+  * |------+-----+-----+-----+-----|      |-----+-----+-----+-----+-------|
+  * | SHFT |     |  [  |  ]  |     |      |     |  1  |  2  |  3  |   .   |
+  * `------+-----+-----+-----+-----'      `-------------------------------'
+  *        .-----------------.                  .-----------------.
+  *        |     |     | HLD |                  | MO3 |  0  |     |
+  *        '-----------------'                  '-----------------'
+  */
+  [_NUMB] = LAYOUT_split_3x5_3(
+      KC_1,    KC_2,  KC_3,    KC_4,    KC_5,       KC_6,  KC_7, KC_8, KC_9,  KC_0,
+      KC_LCTL, KC_NO, KC_LPRN, KC_RPRN, KC_NO,      KC_NO, KC_4, KC_5, KC_6,  KC_NO,
+      KC_LSFT, KC_NO, KC_LBRC, KC_RBRC, KC_NO,      KC_NO, KC_1, KC_2, KC_3,  KC_DOT,
+                  KC_NO,KC_NO,KC_TRNS,                   MO(_ARROWS),KC_0,KC_NO
+      ),
+
+  /* Keymap 3: Arrows and OS
+  * ,------------------------------.      ,------------------------------------.
+  * |      |     |     |     |     |      |       |       |      |       |     |
+  * |------+-----+-----+-----+-----|      |-------+-------+------+-------+-----|
+  * | CTRL |HOME | PUP |     |     |      | LEFT  | DOWN  |  UP  | RIGHT |     |
+  * |------+-----+-----+-----+-----|      |-------+-------+------+-------+-----|
+  * | SHFT |END  | PDN |     |     |      |       |       |      |       |     |
+  * `------+-----+-----+-----+-----'      `------------------------------------'
+  *        .-----------------.                   .-----------------.
+  *        |     |     | HLD |                   | HLD |     |     |
+  *        '-----------------'                   '-----------------'
+  */
+  [_ARROWS] = LAYOUT_split_3x5_3(
+      KC_NO,   KC_NO,   KC_NO,   KC_NO, KC_NO,     KC_NO,        KC_NO,         KC_NO,         KC_NO,         KC_NO,
+      KC_LCTL, KC_HOME, KC_PGUP, KC_NO, KC_NO,     KC_LEFT,      KC_DOWN,       KC_UP,         KC_RGHT,       KC_NO,
+      KC_LSFT, KC_END,  KC_PGDN, KC_NO, KC_NO,     KC_NO,        KC_NO,         KC_NO,         KC_NO,         KC_NO,
+                  KC_NO,KC_NO,KC_TRNS,                   KC_TRNS,KC_NO,KC_NO
+      ),
+      
+  /* Keymap 4: Tmux navigation layer
+  * ,----------------------------------.      ,---------------------------------------.
+  * | Vi Mcr |     |     |     | SP VT |      | Vi Ynk|       |       |       | Vi PT |
+  * |--------+-----+-----+-----+-------|      |-------+-------+-------+-------+-------|
+  * |        | SCRL|     |     |       |      | PN LT | PN DN | PN UP | PN RT | SP HZ |
+  * |--------+-----+-----+-----+-------|      |-------+-------+-------+-------+-------|
+  * |  ZOOM  | KILL| NEW |     |       |      | W LT  |       |       | W RT  |       |
+  * `--------+-----+-----+-----+-------'      `---------------------------------------'
+  *          .-----------------.                   .-----------------.
+  *          |     |     |     |                   |     | HLD |     |
+  *          '-----------------'                   '-----------------'
+  */
+  [_TMUX] = LAYOUT_split_3x5_3(
+      VIM_MACRO, KC_NO,       KC_NO,    KC_NO, TMUX_SP_VT,      VIM_CLIP_CP, KC_NO,      KC_NO,      KC_NO,      VIM_CLIP_PST,
+      KC_NO,     TMUX_SCROLL, KC_NO,    KC_NO, KC_NO,           TMUX_PN_LT,  TMUX_PN_DN, TMUX_PN_UP, TMUX_PN_RT, TMUX_SP_HZ,
+      TMUX_ZOOM, KC_NO,       TMUX_NEW, KC_NO, KC_NO,           TMUX_WN_LT,  KC_NO,      KC_NO,      TMUX_WN_RT, KC_NO,
+                  KC_NO,KC_NO,KC_NO,                              KC_NO,KC_TRNS,KC_NO
+      ),
+
+  /* Keymap 5: Gnome Shell (PopOS)
+  * ,------------------------------.      ,--------------------------------------.
+  * |      |     |     |     |     |      | MV-DWN| D-DWN | D-UP  | MV-UP | Flip |
+  * |------+-----+-----+-----+-----|      |-------+-------+-------+-------+------|
+  * |      |     |     |     |     |      |  W-L  | W-DWN | W-UP  | W-R   |      |
+  * |------+-----+-----+-----+-----|      |-------+-------+-------+-------+------|
+  * |      |     |     |     |     |      | Scrns | Apps  | Close |       |      |
+  * `------+-----+-----+-----+-----'      `--------------------------------------'
+  *        .-----------------.                   .-----------------.
+  *        |     |     |     |                   |     |     | HLD |
+  *        '-----------------'                   '-----------------'
+  */
+  [_POPOS] = LAYOUT_split_3x5_3(
+      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     SGUI(KC_J), LCTL(LGUI(KC_J)), LCTL(LGUI(KC_K)), SGUI(KC_K), LGUI(KC_O),
+      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     LGUI(KC_H), LGUI(KC_J),       LGUI(KC_K),       LGUI(KC_L), KC_NO,
+      KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,     LGUI(KC_D), LGUI(KC_A),       LGUI(KC_Q),       KC_NO,      KC_NO,
+                  KC_NO,KC_NO,KC_NO,                   KC_NO,KC_NO,KC_TRNS
+      ),
+};
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/readme.md b/keyboards/gboards/gergoplex/keymaps/tgrosinger/readme.md
new file mode 100644
index 0000000000..0a53aa1cbf
--- /dev/null
+++ b/keyboards/gboards/gergoplex/keymaps/tgrosinger/readme.md
@@ -0,0 +1,12 @@
+# GergoPlex
+
+This keymap I created for the GergoPlex with a focus on:
+
+- Keeping keys close to their normal locations when possible (number/symbol rows)
+- Work well for vim, tmux, and Ubuntu default desktop shortcuts
+- Work okay for OSx shortcuts
+
+## Firmware Building
+
+    util/docker_build.sh gboards/gergoplex:tgrosinger
+    util/docker_build.sh gboards/gergoplex:tgrosinger:flash
diff --git a/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk b/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk
new file mode 100644
index 0000000000..e882b8008d
--- /dev/null
+++ b/keyboards/gboards/gergoplex/keymaps/tgrosinger/rules.mk
@@ -0,0 +1,17 @@
+#----------------------------------------------------------------------------
+# make gboards/gergoplex:default:flash
+# Make sure you have dfu-programmer installed!
+#----------------------------------------------------------------------------
+
+#Debug options
+VERBOSE                = no
+DEBUG_MATRIX_SCAN_RATE = no
+DEBUG_MATRIX           = no
+CONSOLE_ENABLE         = no
+
+#Combos!
+VPATH                  +=  keyboards/gboards/
+
+ifeq ($(strip $(DEBUG_MATRIX)), yes)
+    OPT_DEFS += -DDEBUG_MATRIX
+endif

From caeb213400e7f612598af10354306fd4d3ee0adf Mon Sep 17 00:00:00 2001
From: Hansol Kim <kimatg@gmail.com>
Date: Thu, 10 Mar 2022 07:04:41 +0900
Subject: [PATCH 785/867] Add macOS-friendly keymap for GMMK Pro (ANSI)
 (#14333)

* Add macOS keymap for GMMK Pro (ANSI)

* Change macOS keymap directory name to lowercase

* Add toggleable layer with alternative keymap for function row

* Update readme
---
 .../gmmk/pro/ansi/keymaps/macos/config.h      |  80 ++++
 .../gmmk/pro/ansi/keymaps/macos/keymap.c      | 448 ++++++++++++++++++
 .../gmmk/pro/ansi/keymaps/macos/readme.md     |  85 ++++
 .../gmmk/pro/ansi/keymaps/macos/rules.mk      |   4 +
 4 files changed, 617 insertions(+)
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/macos/config.h
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/macos/keymap.c
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/macos/readme.md
 create mode 100644 keyboards/gmmk/pro/ansi/keymaps/macos/rules.mk

diff --git a/keyboards/gmmk/pro/ansi/keymaps/macos/config.h b/keyboards/gmmk/pro/ansi/keymaps/macos/config.h
new file mode 100644
index 0000000000..799c5d9593
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/macos/config.h
@@ -0,0 +1,80 @@
+/* Copyright 2021 zvuc <https://github.com/zvuc>
+ *
+ * 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
+
+// At the time of this, there are 41 effects! That may be a bit too many to cycle through - keeping what I believe is the best.
+#ifdef RGB_MATRIX_ENABLE
+    #define RGB_DISABLE_TIMEOUT 1200000     // 20 minutes (20 * 60 * 1000ms)
+
+// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+
+// Below added per: https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#suspended-state-id-suspended-state
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+// Effects
+    #define RGB_MATRIX_FRAMEBUFFER_EFFECTS  // Heatmap, Rain
+    #define RGB_MATRIX_KEYPRESSES           // REACTIVE, SPLASH modes
+
+    // Disable effects you don't like.
+    // Soon, you'll have to explicitly enable effects you want: https://github.com/qmk/qmk_firmware/pull/13758
+    // #define DISABLE_RGB_MATRIX_SOLID_COLOR,             // Static single hue, no speed support
+    // #define DISABLE_RGB_MATRIX_ALPHAS_MODS,             // Static dual hue, speed is hue for secondary hue
+    // #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN,        // Static gradient top to bottom, speed controls how much gradient changes
+    // #define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT,     // Static gradient left to right, speed controls how much gradient changes
+    // #define DISABLE_RGB_MATRIX_BREATHING,               // Single hue brightness cycling animation
+    // #define DISABLE_RGB_MATRIX_BAND_SAT,                // Single hue band fading saturation scrolling left to right
+    // #define DISABLE_RGB_MATRIX_BAND_VAL,                // Single hue band fading brightness scrolling left to right
+    // #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT,       // Single hue 3 blade spinning pinwheel fades saturation
+    // #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL,       // Single hue 3 blade spinning pinwheel fades brightness
+    // #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT,         // Single hue spinning spiral fades saturation
+    // #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL,         // Single hue spinning spiral fades brightness
+    // #define DISABLE_RGB_MATRIX_CYCLE_ALL,               // Full keyboard solid hue cycling through full gradient
+    // #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT,        // Full gradient scrolling left to right
+    // #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN,           // Full gradient scrolling top to bottom
+    // #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN,            // Full gradient scrolling out to in
+    // #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL,       // Full dual gradients scrolling out to in
+    // #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON,  // Full gradent Chevron shapped scrolling left to right
+    // #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL,          // Full gradient spinning pinwheel around center of keyboard
+    // #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL,            // Full gradient spinning spiral around center of keyboard
+    // #define DISABLE_RGB_MATRIX_DUAL_BEACON,             // Full gradient spinning around center of keyboard
+    // #define DISABLE_RGB_MATRIX_RAINBOW_BEACON,          // Full tighter gradient spinning around center of keyboard
+    // #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS,       // Full dual gradients spinning two halfs of keyboard
+    // #define DISABLE_RGB_MATRIX_RAINDROPS,               // Randomly changes a single key's hue
+    // #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS,     // Randomly changes a single key's hue and saturation
+    // #define DISABLE_RGB_MATRIX_HUE_BREATHING,           // Hue shifts up a slight ammount at the same time, then shifts back
+    // #define DISABLE_RGB_MATRIX_HUE_PENDULUM,            // Hue shifts up a slight ammount in a wave to the right, then back to the left
+    // #define DISABLE_RGB_MATRIX_HUE_WAVE,                // Hue shifts up a slight ammount and then back down in a wave to the right
+
+    // Framebuffer effects
+    // #define DISABLE_RGB_MATRIX_TYPING_HEATMAP,          // How hot is your WPM!
+    // #define DISABLE_RGB_MATRIX_DIGITAL_RAIN,            // That famous computer simulation
+
+    // Reactive effects
+    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE,      // Pulses keys hit to hue & value then fades value out
+    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE,             // Static single hue, pulses keys hit to shifted hue then fades to current hue
+    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE         // Hue & value pulse near a single key hit then fades value out
+    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE    // Hue & value pulse near multiple key hits then fades value out
+    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS        // Hue & value pulse the same column and row of a single key hit then fades value out
+    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS   // Hue & value pulse the same column and row of multiple key hits then fades value out
+    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS        // Hue & value pulse away on the same column and row of a single key hit then fades value out
+    // #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS   // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+    // #define DISABLE_RGB_MATRIX_SPLASH,                     // Full gradient & value pulse away from a single key hit then fades value out
+    // #define DISABLE_RGB_MATRIX_MULTISPLASH,                // Full gradient & value pulse away from multiple key hits then fades value out
+    // #define DISABLE_RGB_MATRIX_SOLID_SPLASH,               // Hue & value pulse away from a single key hit then fades value out
+    // #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH,          // Hue & value pulse away from multiple key hits then fades value out
+
+#endif
diff --git a/keyboards/gmmk/pro/ansi/keymaps/macos/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/macos/keymap.c
new file mode 100644
index 0000000000..1f8c47306a
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/macos/keymap.c
@@ -0,0 +1,448 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+
+   GMMK Pro Standard keymap for macOS
+   by zvuc <https://github.com/zvuc>
+
+   with code snippets from
+   Andre Brait <andrebrait@gmail.com>, stickandgum
+
+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 my_keycodes {
+  KC_MSCTRL = SAFE_RANGE,
+  KC_LNPD,
+  LED_TLDE,
+  LED_1,
+  LED_2,
+  LED_3,
+  LED_4,
+  LED_5,
+  LED_6,
+  LED_7,
+  LED_8,
+  LED_9,
+  LED_0,
+  LED_MINS,
+  LED_EQL
+};
+
+#ifdef RGB_MATRIX_ENABLE
+  #ifndef RGB_CONFIRMATION_BLINKING_TIME
+    #define RGB_CONFIRMATION_BLINKING_TIME 2000 // 2 seconds
+  #endif
+#endif // RGB_MATRIX_ENABLE
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12      Eject          Rotary(Mute)
+//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)      BackSpc           Del
+//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]        \                 PgUp
+//      Caps     A        S        D        F        G        H        J        K        L        ;        "                 Enter             PgDn
+//      Sh_L              Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       F13
+//      Ct_L     Opt_L    Cmd_L                               SPACE                               Cmd_R    Opt_R    FN       Left     Down     Right
+
+
+  // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+  // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
+  // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
+  // if that's your preference.
+  //
+  // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
+  // it'll be back to normal when you plug it back in.
+  //
+  // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
+  // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
+  // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
+  [0] = LAYOUT(
+    KC_ESC,  KC_BRID, KC_BRIU, KC_MSCTRL,  KC_LNPD, RGB_VAD, RGB_VAI, KC_F7,   KC_F8,   KC_MRWD, KC_MPLY, KC_MFFD, KC_F12,  KC_EJCT,          KC_MUTE,
+    KC_GRV,  KC_1,    KC_2,    KC_3,       KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,       KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+    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_PGDN,
+    KC_LSFT,          KC_Z,    KC_X,       KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_F13,
+    KC_LCTL, KC_LOPT, KC_LCMD,                               KC_SPC,                             KC_RCMD, KC_ROPT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT(
+    _______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,  _______,           RGB_TOG,
+    LED_TLDE, LED_1,   LED_2,   LED_3,   LED_4,   LED_5,   LED_6,   LED_7,   LED_8,   LED_9,   LED_0,   LED_MINS, LED_EQL, _______,           KC_PSCR,
+    _______,  RGB_HUI, RGB_VAI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,  _______, RESET,             _______,
+    _______,  RGB_HUD, RGB_VAD, RGB_SAD, TG(2),   _______, _______, _______, _______, _______, _______, _______,           _______,           _______,
+    _______,           _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,           _______, RGB_MOD,  RGB_TOG,
+    _______,  _______, _______,                            _______,                            _______, _______,  _______, RGB_SPD, RGB_RMOD, RGB_SPI
+  ),
+
+  // This is an alternative togglable layer to change default function row to standard F keys
+  [2] = LAYOUT(
+    _______, 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_F24,           _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______
+  ),
+
+
+};
+// clang-format on
+
+#ifdef ENCODER_ENABLE
+  bool encoder_update_user(uint8_t index, bool clockwise) {
+    // https://beta.docs.qmk.fm/using-qmk/simple-keycodes/feature_advanced_keycodes#alt-escape-for-alt-tab-id-alt-escape-for-alt-tab
+    if (get_mods() & MOD_MASK_CTRL) { // If CTRL is held
+      uint8_t mod_state = get_mods(); // Store all  modifiers that are held
+      unregister_mods(MOD_MASK_CTRL); // Immediately unregister the CRTL key (don't send CTRL-PgDn) - del_mods doesn't work here (not immediate)
+      if (clockwise) {
+        rgblight_increase_hue();
+      } else {
+        rgblight_decrease_hue();
+      }
+      set_mods(mod_state); // Add back in the CTRL key - so ctrl-key will work if ctrl was never released after paging.
+    } else if (get_mods() & MOD_MASK_ALT) {
+      uint8_t mod_state = get_mods();
+      unregister_mods(MOD_MASK_ALT);
+      if (clockwise) {
+        rgblight_increase_sat();
+      } else {
+        rgblight_decrease_sat();
+      }
+      set_mods(mod_state);
+    } else if (get_mods() & MOD_MASK_GUI) {
+      uint8_t mod_state = get_mods();
+      unregister_mods(MOD_MASK_GUI);
+      if (clockwise) {
+        rgblight_increase_val();
+      } else {
+        rgblight_decrease_val();
+      }
+      set_mods(mod_state);
+    } else if (get_mods() & MOD_MASK_SHIFT) {
+      uint8_t mod_state = get_mods();
+      unregister_mods(MOD_MASK_SHIFT);
+      if (clockwise) {
+        rgblight_increase_speed();
+      } else {
+        rgblight_decrease_speed();
+      }
+      set_mods(mod_state);
+    } else if (clockwise) { // All else volume.
+      tap_code(KC_VOLU);
+    } else {
+      tap_code(KC_VOLD);
+    }
+    return true;
+  }
+#endif //ENCODER_ENABLE
+
+#ifdef RGB_MATRIX_ENABLE
+
+  // Called on powerup and is the last _init that is run.
+  void keyboard_post_init_user(void) {
+
+     int mods[35] = {0,2,3,4,5,11,17,33,49,55,65,95,97,79,94,85,93,96,90,69,92,67,76,80,91,75,86,68,77,81,92,28,34,39,44};
+     int j;
+
+     /* output each array element's value */
+     for (j = 0; j < 35; j++ ) {
+        g_led_config.flags[mods[j]] = LED_FLAG_MODIFIER;
+     }
+
+    if (!rgb_matrix_is_enabled()) {
+        rgb_matrix_enable();
+        #ifdef CONSOLE_ENABLE
+          uprintf("ERROR! RGB Matrix Enabled and wrote to EEPROM! -How was the RGB Matrix Disabled?");
+        #endif
+    }
+  }
+
+  /* Renaming those to make the purpose on this keymap clearer */
+  #define LED_FLAG_CAPS LED_FLAG_NONE
+  #define LED_FLAG_EFFECTS LED_FLAG_INDICATOR
+
+  static void set_rgb_caps_leds(void);
+
+  #if RGB_CONFIRMATION_BLINKING_TIME > 0
+    static uint16_t effect_started_time = 0;
+    static uint8_t r_effect = 0x0, g_effect = 0x0, b_effect = 0x0;
+    static void start_effects(void);
+
+    /* The higher this is, the slower the blinking will be */
+    #ifndef TIME_SELECTED_BIT
+      #define TIME_SELECTED_BIT 8
+    #endif
+    #if TIME_SELECTED_BIT < 0 || TIME_SELECTED_BIT >= 16
+      #error "TIME_SELECTED_BIT must be a positive integer smaller than 16"
+    #endif
+    #define effect_red() r_effect = 0xFF, g_effect = 0x0, b_effect = 0x0
+    #define effect_green() r_effect = 0x0, g_effect = 0xFF, b_effect = 0x0
+  #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
+
+  bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
+      if (!rgb_matrix_is_enabled()) {
+        /* Turn ON the RGB Matrix for CAPS LOCK */
+        rgb_matrix_set_flags(LED_FLAG_CAPS);
+        rgb_matrix_enable();
+      }
+    } else if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
+      /* RGB Matrix was only ON because of CAPS LOCK. Turn it OFF. */
+      rgb_matrix_set_flags(LED_FLAG_ALL);
+      rgb_matrix_disable();
+    }
+    return true;
+  }
+
+  bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+      // https://github.com/qmk/qmk_firmware/issues/10111
+      case KC_MSCTRL:
+        if (record->event.pressed) {
+          host_consumer_send(0x29F);
+        } else {
+          host_consumer_send(0);
+        }
+        return false; /* Skip all further processing of this key */
+
+      case KC_LNPD:
+        if (record->event.pressed) {
+          host_consumer_send(0x2A0);
+        } else {
+          host_consumer_send(0);
+        }
+        return false; /* Skip all further processing of this key */
+
+      #ifdef NKRO_ENABLE
+        #if RGB_CONFIRMATION_BLINKING_TIME > 0
+          case NK_TOGG:
+            if (record->event.pressed) {
+              if (keymap_config.nkro) {
+                /* Turning NKRO OFF */
+                effect_red();
+              } else {
+                /* Turning NKRO ON */
+                effect_green();
+              }
+              start_effects();
+            }
+            break;
+        #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
+      #endif // NKRO_ENABLE
+
+      #if RGB_CONFIRMATION_BLINKING_TIME > 0
+        case TG(2):
+          if (record->event.pressed) {
+            if (IS_LAYER_OFF(2)) {
+              effect_red();
+            } else {
+              effect_green();
+            }
+            start_effects();
+          }
+          break;
+      #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
+
+      /* LED quick preset keys assignments */
+      case LED_TLDE:
+        rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);          // Can use RGB_M_P built-in keycode instead.
+        break;
+      case LED_1:
+        rgb_matrix_mode(RGB_MATRIX_ALPHAS_MODS);
+        break;
+      case LED_2:
+        rgb_matrix_mode(RGB_MATRIX_GRADIENT_UP_DOWN);
+        break;
+      case LED_3:
+        rgb_matrix_mode(RGB_MATRIX_JELLYBEAN_RAINDROPS);
+        break;
+      case LED_4:
+        rgb_matrix_mode(RGB_MATRIX_BAND_SAT);
+        break;
+      case LED_5:
+        rgb_matrix_mode(RGB_MATRIX_BAND_VAL);
+        break;
+      case LED_6:
+        rgb_matrix_mode(RGB_MATRIX_BAND_SPIRAL_VAL);
+        break;
+      case LED_7:
+        rgb_matrix_mode(RGB_MATRIX_CYCLE_LEFT_RIGHT);    // Can use RGB_M_R built-in keycode instead.
+        break;
+      case LED_8:
+        rgb_matrix_mode(RGB_MATRIX_CYCLE_PINWHEEL);      // Can use RGB_M_SW built-in keycode instead.
+        break;
+      case LED_9:
+         rgb_matrix_mode(RGB_MATRIX_BREATHING);          // Can use RGB_M_B built-in keycode instead.
+        break;
+
+      #ifdef RGB_MATRIX_KEYPRESSES                         // Reactive effects require RGB_MATRIX_KEYPRESSES in config.h
+        case LED_0:
+          rgb_matrix_mode(RGB_MATRIX_SOLID_REACTIVE_WIDE);
+          break;
+      #endif //RGB_MATRIX_KEYPRESSES
+
+      #ifdef RGB_MATRIX_FRAMEBUFFER_EFFECTS               // Heatmap and Rain require #define RGB_MATRIX_FRAMEBUFFER_EFFECTS in config.h
+        case LED_MINS:
+          rgb_matrix_mode(RGB_MATRIX_DIGITAL_RAIN);
+          break;
+        case LED_EQL:
+          rgb_matrix_mode(RGB_MATRIX_TYPING_HEATMAP);
+          break;
+      #endif //RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+
+      // case RGB_MOD:
+      // case RGB_RMOD:
+      // case RGB_HUI:
+      // case RGB_HUD:
+      // case RGB_SAI:
+      // case RGB_SAD:
+      // case RGB_VAI:
+      // case RGB_VAD:
+      // case RGB_SPI:
+      case RGB_SPD:
+        if (record->event.pressed) {
+          if (rgb_matrix_get_flags() != LED_FLAG_ALL) {
+            /* Ignore changes to RGB settings while only it's supposed to be OFF */
+            return false;
+          }
+        }
+        break;
+
+      case RGB_TOG:
+        // if (record->event.pressed) {
+        //     if (rgb_matrix_get_flags() == LED_FLAG_ALL) {
+        //         rgb_matrix_set_flags(LED_FLAG_NONE);
+        //         rgb_matrix_set_color_all(0, 0, 0);
+        //     } else {
+        //         rgb_matrix_set_flags(LED_FLAG_ALL);
+        //     }
+        // }
+        // return false;
+        if (record->event.pressed) {
+          if (rgb_matrix_is_enabled()) {
+            switch (rgb_matrix_get_flags()) {
+              #if RGB_CONFIRMATION_BLINKING_TIME > 0
+              case LED_FLAG_EFFECTS:
+              #endif
+              case LED_FLAG_CAPS:
+                /* Turned ON because of EFFECTS or CAPS, is actually OFF */
+                /* Change to LED_FLAG_ALL to signal it's really ON */
+                rgb_matrix_set_flags(LED_FLAG_ALL);
+                /* Will be re-enabled by the processing of the toggle */
+                rgb_matrix_disable_noeeprom();
+                break;
+              case LED_FLAG_ALL:
+                /* Is actually ON */
+                #if RGB_CONFIRMATION_BLINKING_TIME > 0
+                if (effect_started_time > 0) {
+                  /* Signal EFFECTS */
+                  rgb_matrix_set_flags(LED_FLAG_EFFECTS);
+                  /* Will be re-enabled by the processing of the toggle */
+                  rgb_matrix_disable_noeeprom();
+                } else
+                #endif
+                if (host_keyboard_led_state().caps_lock) {
+                  /* Signal CAPS */
+                  rgb_matrix_set_flags(LED_FLAG_CAPS);
+                  /* Will be re-enabled by the processing of the toggle */
+                  rgb_matrix_disable_noeeprom();
+                }
+                break;
+            }
+          }
+        }
+        break;
+
+    }
+    return true;
+  }
+
+
+  void rgb_matrix_indicators_user() {
+    #if RGB_CONFIRMATION_BLINKING_TIME > 0
+    if (effect_started_time > 0) {
+      /* Render blinking EFFECTS */
+      uint16_t deltaTime = sync_timer_elapsed(effect_started_time);
+      if (deltaTime <= RGB_CONFIRMATION_BLINKING_TIME) {
+        uint8_t led_state = ((~deltaTime) >> TIME_SELECTED_BIT) & 0x01;
+        uint8_t val_r = led_state * r_effect;
+        uint8_t val_g = led_state * g_effect;
+        uint8_t val_b = led_state * b_effect;
+        rgb_matrix_set_color_all(val_r, val_g, val_b);
+        if (host_keyboard_led_state().caps_lock) {
+          set_rgb_caps_leds();
+        }
+        return;
+      } else {
+        /* EFFECTS duration is finished */
+        effect_started_time = 0;
+        if (rgb_matrix_get_flags() == LED_FLAG_EFFECTS) {
+          /* It was turned ON because of EFFECTS */
+          if (host_keyboard_led_state().caps_lock) {
+            /* CAPS is still ON. Demote to CAPS */
+            rgb_matrix_set_flags(LED_FLAG_CAPS);
+          } else {
+            /* There is nothing else keeping RGB enabled. Reset flags and turn if off. */
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_disable_noeeprom();
+          }
+        }
+      }
+    }
+    #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
+    if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
+      rgb_matrix_set_color_all(0x0, 0x0, 0x0);
+    }
+    if (host_keyboard_led_state().caps_lock) {
+      set_rgb_caps_leds();
+    }
+  }
+
+  #if RGB_CONFIRMATION_BLINKING_TIME > 0
+  static void start_effects() {
+    effect_started_time = sync_timer_read();
+    if (!rgb_matrix_is_enabled()) {
+      /* Turn it ON, signal the cause (EFFECTS) */
+      rgb_matrix_set_flags(LED_FLAG_EFFECTS);
+      rgb_matrix_enable_noeeprom();
+    } else if (rgb_matrix_get_flags() == LED_FLAG_CAPS) {
+      /* It's already ON, promote the cause from CAPS to EFFECTS */
+      rgb_matrix_set_flags(LED_FLAG_EFFECTS);
+    }
+  }
+  #endif // RGB_CONFIRMATION_BLINKING_TIME > 0
+
+  static void set_rgb_caps_leds() {
+    rgb_matrix_set_color(67, 0xFF, 0x0, 0x0); // Left side LED 1
+    rgb_matrix_set_color(68, 0xFF, 0x0, 0x0); // Right side LED 1
+    rgb_matrix_set_color(70, 0xFF, 0x0, 0x0); // Left side LED 2
+    rgb_matrix_set_color(71, 0xFF, 0x0, 0x0); // Right side LED 2
+    rgb_matrix_set_color(73, 0xFF, 0x0, 0x0); // Left side LED 3
+    rgb_matrix_set_color(74, 0xFF, 0x0, 0x0); // Right side LED 3
+    rgb_matrix_set_color(76, 0xFF, 0x0, 0x0); // Left side LED 4
+    rgb_matrix_set_color(77, 0xFF, 0x0, 0x0); // Right side LED 4
+    rgb_matrix_set_color(80, 0xFF, 0x0, 0x0); // Left side LED 5
+    rgb_matrix_set_color(81, 0xFF, 0x0, 0x0); // Right side LED 5
+    rgb_matrix_set_color(83, 0xFF, 0x0, 0x0); // Left side LED 6
+    rgb_matrix_set_color(84, 0xFF, 0x0, 0x0); // Right side LED 6
+    rgb_matrix_set_color(87, 0xFF, 0x0, 0x0); // Left side LED 7
+    rgb_matrix_set_color(88, 0xFF, 0x0, 0x0); // Right side LED 7
+    rgb_matrix_set_color(91, 0xFF, 0x0, 0x0); // Left side LED 8
+    rgb_matrix_set_color(92, 0xFF, 0x0, 0x0); // Right side LED 8
+    rgb_matrix_set_color(3, 0xFF, 0x0, 0x0); // CAPS LED
+  }
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/gmmk/pro/ansi/keymaps/macos/readme.md b/keyboards/gmmk/pro/ansi/keymaps/macos/readme.md
new file mode 100644
index 0000000000..8024e77cc1
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/macos/readme.md
@@ -0,0 +1,85 @@
+# GMMK Pro Standard Layout for macOS by zvuc
+
+As you may know, Glorious does not (yet) provide their Glorious Core software for macOS; so with stock firmware, there aren't any ways to customize layouts on the hardware level unless you turn to software-based override solutions such as [Karabiner Elements](https://karabiner-elements.pqrs.org/). This is my attempt to try to create the most macOS-like experience on the GMMK Pro, taking close notes from Apple's Magic Keyboard, also referencing code from other community keymaps.
+
+## Keymap
+Layer 0
+<img width="1092" alt="Layer0" src="https://user-images.githubusercontent.com/2870726/132235505-64ac1c89-ecf9-49b5-a030-1d94389fc66d.png">
+
+Layer 1 (Hold <kbd>Fn</kbd>)
+<img width="1088" alt="Layer1" src="https://user-images.githubusercontent.com/2870726/133090831-5e84fb69-a8bf-463e-a8f6-f1f38a5901d6.png">
+
+Layer 2 (Togglable alternative function row layout by pressing <kbd>Fn</kbd>+<kbd>F</kbd>)
+<img width="1094" alt="Layer2" src="https://user-images.githubusercontent.com/2870726/133090841-0c6a8b16-bf46-4e6c-b8fa-79f213f95765.png">
+
+
+## Notable differences from stock key layout for Windows:
+- <kbd>Delete</kbd> key placed right next to backspace (under rotary encoder)
+- <kbd>F13</kbd> key for the bottommost row (Assign it to a shortcut you like in macOS preferences! [For example: "Emoji & Symbols" to bring up the emoji input popup instantly](https://user-images.githubusercontent.com/2870726/132237211-7e13c156-96a8-4a91-b215-28d310228feb.png))
+- <kbd>Eject</kbd> key for the last key in function row: Needed for macOS native global "Sleep" hotkey (<kbd>⌘</kbd><kbd>⌥</kbd><kbd>Eject</kbd>)
+
+## Notable Features
+- VIA support
+- Rotary Encoder support (Defaults to stock behavior Volume Up/Down)
+- Standard order for macOS modifier keys: 
+    * Left: <kbd>⌃ Control</kbd><kbd>⌥ Option</kbd><kbd>⌘ Command</kbd> 
+    * Right: <kbd>⌘ Command</kbd><kbd>⌥ Option</kbd><kbd>Fn</kbd>
+- Apple Magic Keyboard-like Function Row Mode (Toggle with <kbd>Fn</kbd>+<kbd>F</kbd>)
+    * <kbd>F1</kbd>: Decrease display brightness
+    * <kbd>F2</kbd>: Increase display brightness
+    * <kbd>F3</kbd>: Mission Control
+    * <kbd>F4</kbd>: Launchpad
+    * <kbd>F5</kbd>: Decrease keyboard backlight brightness
+    * <kbd>F6</kbd>: Increase keyboard backlight brightness
+    * <kbd>F7</kbd>: (none)
+    * <kbd>F8</kbd>: (none)
+    * <kbd>F9</kbd>: Media Rewind 
+    * <kbd>F10</kbd>: Media Play/Pause
+    * <kbd>F11</kbd>: Media Fast Forward
+    * <kbd>F12</kbd>: (none)
+
+> #### NOTE
+> - Media key mappings follow Apple Magic Keyboard except <kbd>F8</kbd> thru <kbd>F12</kbd>, where keys have been shifted by one to the right. It's because I wanted to get over the awkward gap between <kbd>F8</kbd> and <kbd>F9</kbd> that the GMMK Pro has—and also because we don't need dedicated keys for volume control when we have the more convenient rotary knob.
+> - To access standard <kbd>F1</kbd> - <kbd>F12</kbd> keys, press the Function keys while holding <kbd>Fn</kbd>.
+> - If you're planning to use Karabiner Elements, use the standard Function row mode (<kbd>F1</kbd> - <kbd>F12</kbd>) because Karabiner Elements always overrides function keys even if you want to just use simple or complex modifications, and it doesn't catch custom keys like Mission Control, Launchpad or <kbd>Eject</kbd>. (<kbd>Eject</kbd> is mapped as <kbd>F24</kbd> so you can replace it with 'Eject' within Karabiner.)
+
+## RGB Lighting
+- Retains Glorious stock firmware key mappings for control
+    * <kbd>Fn</kbd><kbd>Up</kbd> / <kbd>Fn</kbd><kbd>Down</kbd>: Cycle presets
+    * <kbd>Fn</kbd><kbd>Left</kbd> / <kbd>Fn</kbd><kbd>Right</kbd>: Adjust speed
+    * <kbd>Fn</kbd><kbd>W</kbd> / <kbd>Fn</kbd><kbd>S</kbd>: Adjust brightness
+- Quickly switch to popular presets:
+    * <kbd>Fn</kbd><kbd>`</kbd> : Solid color (no animation)
+    * <kbd>Fn</kbd><kbd>1</kbd> : Solid duotone (no animation) - <kbd>Shift</kbd><kbd>Knob</kbd> to change secondary color.
+    * <kbd>Fn</kbd><kbd>2</kbd> : Vertical gradient - <kbd>Shift</kbd><kbd>Knob</kbd> to change secondary color.
+    * <kbd>Fn</kbd><kbd>3</kbd> : "Jellybean Raindrops"
+    * <kbd>Fn</kbd><kbd>4</kbd> : Horizontal wipe with white backlight
+    * <kbd>Fn</kbd><kbd>5</kbd> : Horizontal wipe
+    * <kbd>Fn</kbd><kbd>6</kbd> : Single color pinwheel
+    * <kbd>Fn</kbd><kbd>7</kbd> : Horizontal rainbow
+    * <kbd>Fn</kbd><kbd>8</kbd> : Rainbow pinwheel
+    * <kbd>Fn</kbd><kbd>9</kbd> : Breathing
+    * <kbd>Fn</kbd><kbd>0</kbd> : Reactive (light up on keypress)
+    * <kbd>Fn</kbd><kbd>-</kbd> : "Digital Rain"
+    * <kbd>Fn</kbd><kbd>=</kbd> : "Heatmap"
+- RGB turns off after 20 minutes of inactivity
+- RGB turns off when USB is suspended / enters sleep
+- <kbd>Caps Lock</kbd> toggle indicator (<kbd>Caps Lock</kbd> key and side lights will turn red)
+- Easy RGB control using Rotary Encoder
+    - <kbd>Control</kbd>+<kbd>Rotate Knob</kbd>: Adjust hue
+    - <kbd>Option</kbd>+<kbd>Rotate Knob</kbd>: Adjust saturation
+    - <kbd>Command</kbd>+<kbd>Rotate Knob</kbd>: Adjust brightness
+
+> All latest QMK effects [(41 as of now)](https://beta.docs.qmk.fm/using-qmk/hardware-features/lighting/feature_rgb_matrix#rgb-matrix-effects-id-rgb-matrix-effects) are enabled by default and will apply in order when cycling through using <kbd>Fn</kbd><kbd>Up</kbd> / <kbd>Fn</kbd><kbd>Down</kbd>. You can disable specific effects by uncommenting (remove the `//` at the beginning of line) respective lines (ex: `#define DISABLE_RGB_MATRIX_BREATHING`) in `qmk_firmware/keyboards/gmmk/pro/ansi/keymaps/zvuc/config.h` then recompiling the firmware.
+
+## Other Features
+- 1000hz polling rate
+- Short DEBOUNCE time (5 ms)
+- Per-key debounce algorithm (`sym_defer_pk`)
+- NKRO toggle (<kbd>Fn</kbd>+<kbd>N</kbd>)
+
+## Warning regarding VIA support
+When observing this keyboard firmware in VIA, some custom-implemented keys such as Mission Control/Launchpad and RGB preset shortcuts appear as keycodes such as `0x5d62`. **These must not be modified!** There is no way to get their default functionality back unless you re-flash the firmware through QMK Toolbox.
+
+## Download pre-compiled firmware binary file
+[Download BIN file from here](https://github.com/zvuc/qmk_firmware/releases/tag/zvuc-1.0.1)
diff --git a/keyboards/gmmk/pro/ansi/keymaps/macos/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/macos/rules.mk
new file mode 100644
index 0000000000..e9073d44a0
--- /dev/null
+++ b/keyboards/gmmk/pro/ansi/keymaps/macos/rules.mk
@@ -0,0 +1,4 @@
+# Enable additional features.
+
+DEBOUNCE_TYPE = sym_defer_pk
+VIA_ENABLE = yes

From 708b3f91928d578a1f9babaf27490c80f1b7a918 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Wed, 9 Mar 2022 20:46:30 -0700
Subject: [PATCH 786/867] [Keyboard] Size reduction for
 kbdfans/kbd67/mkiirgb_iso (#16601)

---
 keyboards/kbdfans/kbd67/mkiirgb_iso/config.h | 7 +------
 keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
index 8806624e24..42f5af8c25 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
@@ -42,9 +42,7 @@
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
 #define RGB_DI_PIN C7
-#define RGBLED_NUM 68
-#define DRIVER_LED_TOTAL RGBLED_NUM
-#define RGBLIGHT_ANIMATIONS
+#define DRIVER_LED_TOTAL 68
 
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_KEYPRESSES           // reacts to keypresses
@@ -85,9 +83,6 @@
 #    define ENABLE_RGB_MATRIX_HUE_BREATHING
 #    define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
 #    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
index 7e5b22ef73..14509a1872 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk
@@ -3,6 +3,7 @@ MCU = atmega32u4
 
 # Bootloader selection
 BOOTLOADER = lufa-ms
+BOOTLOADER_SIZE = 6144
 
 # Build Options
 #   change yes to no to disable

From 8bcb77cb9ac19cbd140ea7bb07e0231eec65282d Mon Sep 17 00:00:00 2001
From: maherma-adg <maherma-adg@users.noreply.github.com>
Date: Thu, 10 Mar 2022 04:56:42 +0100
Subject: [PATCH 787/867] Personalizacion del teclado de AdG (#15738)

* Personalizacion del teclado de AdG

Update layout description

fix symbol layer

* fix doc Colemak

* explicitly define enabled animations

* Change keymap folder name
---
 .../kyria/keymaps/maherma-adg/config.h        |  41 ++
 .../kyria/keymaps/maherma-adg/keymap.c        | 420 ++++++++++++++++++
 .../kyria/keymaps/maherma-adg/readme.md       |  17 +
 .../kyria/keymaps/maherma-adg/rules.mk        |   5 +
 4 files changed, 483 insertions(+)
 create mode 100644 keyboards/splitkb/kyria/keymaps/maherma-adg/config.h
 create mode 100644 keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
 create mode 100644 keyboards/splitkb/kyria/keymaps/maherma-adg/readme.md
 create mode 100644 keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk

diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h b/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h
new file mode 100644
index 0000000000..1a4c64ed13
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h
@@ -0,0 +1,41 @@
+/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef RGBLIGHT_ENABLE
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+#    define RGBLIGHT_HUE_STEP  8
+#    define RGBLIGHT_SAT_STEP  8
+#    define RGBLIGHT_VAL_STEP  8
+#    define RGBLIGHT_LIMIT_VAL 150
+#endif
+
+// Lets you roll mod-tap keys
+#define IGNORE_MOD_TAP_INTERRUPT
+
+// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
+// #define SPLIT_USB_DETECT
+// #define NO_USB_STARTUP_CHECK
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c b/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
new file mode 100644
index 0000000000..240bc6edf5
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/keymap.c
@@ -0,0 +1,420 @@
+/* Copyright 2019 Thomas Baart <thomas@splitkb.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "keymap_spanish.h"
+
+enum layers {
+    _QWERTY = 0,
+    _DVORAK,
+    _COLEMAK_DH,
+    _NAV,
+    _SYM,
+    _FUNCTION,
+    _ADJUST,
+    _NUMPAD,
+    _MOUSE
+};
+
+
+// Aliases for readability
+#define QWERTY   DF(_QWERTY)
+#define COLEMAK  DF(_COLEMAK_DH)
+#define DVORAK   DF(_DVORAK)
+
+#define NUMPAD   DF(_NUMPAD)
+#define MOUSE    DF(_MOUSE)
+#define DNAV     DF(_NAV)
+
+#define SYM      MO(_SYM)
+#define NAV      MO(_NAV)
+#define FKEYS    MO(_FUNCTION)
+#define ADJUST   MO(_ADJUST)
+
+#define CTL_ESC  MT(MOD_LCTL, KC_ESC)
+#define CTL_QUOT MT(MOD_RCTL, KC_QUOTE)
+#define CTL_MINS MT(MOD_RCTL, KC_MINUS)
+#define ALT_ENT  MT(MOD_LALT, KC_ENT) 
+#define LGUI_ENT MT(MOD_LGUI, KC_ENT)
+#define LALT_SUP MT(MOD_LALT, KC_DEL)
+#define RGUI_TAB MT(MOD_RGUI, KC_TAB)
+#define RALT_BS  MT(MOD_RALT, KC_BSPC)
+#define LSFT_LPR MT(MOD_LSFT, ES_LPRN)
+#define RSFT_RPR MT(MOD_RSFT, ES_RPRN)
+
+#define NAV_ESC  LT(NAV, KC_ESC)
+#define SYM_SPC  LT(SYM, KC_SPC)
+#define NAV_SPC  LT(NAV, KC_SPC)
+#define SYM_ENT  LT(SYM, KC_ENT)
+
+#define OSX_TILD ALGR(KC_SCLN)
+
+// Note: LAlt/Enter (ALT_ENT) is not the same thing as the keyboard shortcut Alt+Enter.
+// The notation `mod/tap` denotes a key that activates the modifier `mod` when held down, and
+// produces the key `tap` when tapped (i.e. pressed and released).
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/*
+ * Base Layer: QWERTY
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |  Tab   |   Q  |   W  |   E  |   R  |   T  |                              |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |Ctrl/Esc|   A  |   S  |   D  |   F  |   G  |                              |   H  |   J  |   K  |   L  |   Ñ  |Ctrl/´ ¨|
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |LShift/(|   Z  |   X  |   C  |   V  |   B  | `^[  |CapsLk|  |F-keys|  +*] |   N  |   M  | , ;  | . :  | -  _ |RShift/)|
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |Adjust| LAlt/| LGUI/| Sym/ | Nav/ |  | Sym/ | Nav/ | RGUI/| RAlt/| Menu |
+ *                        |      | Supr | Enter| Space| Esc  |  | Enter| Space| Tab  | Bksp |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_QWERTY] = LAYOUT(
+     KC_TAB   , KC_Q ,  KC_W   ,  KC_E  ,   KC_R ,   KC_T ,                                        KC_Y,   KC_U ,  KC_I ,   KC_O  , KC_P , KC_BSPC,
+     CTL_ESC  , KC_A ,  KC_S   ,  KC_D  ,   KC_F ,   KC_G ,                                        KC_H,   KC_J ,  KC_K ,   KC_L  , KC_SCLN, CTL_QUOT,
+     LSFT_LPR , KC_Z ,  KC_X   ,  KC_C  ,   KC_V ,   KC_B , ES_GRV , KC_CAPS,       FKEYS  , ES_PLUS , KC_N    ,  KC_M,  KC_COMM , KC_DOT , KC_SLSH, RSFT_RPR,
+                                ADJUST , LALT_SUP, LGUI_ENT, SYM_SPC , NAV_ESC,     SYM_ENT, NAV_SPC , RGUI_TAB, RALT_BS, KC_APP
+    ),
+
+/*
+ * Base Layer: Dvorak
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |  Tab   | ´ ¨  | , ;  | . :  |   P  |   Y  |                              |   F  |   G  |   C  |   R  |   L  |  Bksp  |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |Ctrl/Esc|   A  |   O  |   E  |   U  |   I  |                              |   D  |   H  |   T  |   N  |   S  |Ctrl/' ?|
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |LShift/(|   Ñ  |   Q  |   J  |   K  |   X  | `^[  |CapsLk|  |F-keys|  +*] |   B  |   M  |   W  |   V  |   Z  |RShift/)|
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |Adjust| LAlt/| LGUI/| Sym/ | Nav/ |  | Sym/ | Nav/ | RGUI/| RAlt/| Menu |
+ *                        |      | Supr | Enter| Space| Esc  |  | Enter| Space| Tab  | Bksp |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_DVORAK] = LAYOUT(
+     KC_TAB   ,KC_QUOTE,KC_COMM,  KC_DOT,   KC_P ,   KC_Y ,                                        KC_F,   KC_G ,  KC_C ,   KC_R ,  KC_L , KC_BSPC,
+     CTL_ESC  , KC_A ,  KC_O   ,  KC_E  ,   KC_U ,   KC_I ,                                        KC_D,   KC_H ,  KC_T ,   KC_N ,  KC_S , CTL_MINS,
+     LSFT_LPR ,KC_SCLN, KC_Q   ,  KC_J  ,   KC_K ,   KC_X , ES_GRV, KC_CAPS,     FKEYS  , ES_PLUS, KC_B,   KC_M ,  KC_W ,   KC_V ,  KC_Z , RSFT_RPR,
+                                ADJUST , LALT_SUP, LGUI_ENT, SYM_SPC , NAV_ESC,     SYM_ENT, NAV_SPC , RGUI_TAB, RALT_BS, KC_APP
+    ),
+
+/*
+ * Base Layer: Colemak DH
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |  Tab   |   Q  |   W  |   F  |   P  |   B  |                              |   J  |   L  |   U  |   Y  |   Ñ  |  Bksp  |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |Ctrl/Esc|   A  |   R  |   S  |   T  |   G  |                              |   M  |   N  |   E  |   I  |   O  |Ctrl/´ ¨|
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |LShift/(|   Z  |   X  |   C  |   D  |   V  | `^[  |CapsLk|  |F-keys|  +*] |   K  |   H  | , ;  | . :  | -  _ |RShift/)|
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |Adjust| LAlt/| LGUI/| Sym/ | Nav/ |  | Sym/ | Nav/ | RGUI/| RAlt/| Menu |
+ *                        |      | Supr | Enter| Space| Esc  |  | Enter| Space| Tab  | Bksp |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_COLEMAK_DH] = LAYOUT(
+     KC_TAB   , KC_Q ,  KC_W   ,  KC_F  ,   KC_P ,   KC_B ,                                        KC_J,   KC_L , KC_U    , KC_Y    , KC_SCLN , KC_BSPC,
+     CTL_ESC  , KC_A ,  KC_R   ,  KC_S  ,   KC_T ,   KC_G ,                                        KC_M,   KC_N , KC_E    , KC_I    , KC_O    , CTL_QUOT,
+     LSFT_LPR , KC_Z ,  KC_X   ,  KC_C  ,   KC_D ,   KC_V , ES_GRV, KC_CAPS,        FKEYS  , ES_PLUS , KC_K     , KC_H    , KC_COMM , KC_DOT  , KC_SLSH, RSFT_RPR,
+                                ADJUST , LALT_SUP, LGUI_ENT, SYM_SPC , NAV_ESC,     SYM_ENT, NAV_SPC , RGUI_TAB , RALT_BS , KC_APP
+    ),
+
+/*
+ * Nav Layer: Media, navigation
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        |      |      |      |      |      |                              | PgUp | Home |   ↑  | End  | VolUp| Delete |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        | Shift| Ctrl | Alt  |  GUI |      |                              | PgDn |  ←   |   ↓  |   →  | VolDn| Insert |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |ScLck |  |      |      | Pause|M Prev|M Play|M Next|VolMut| PrtSc  |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_NAV] = LAYOUT(
+      _______, _______, _______, _______, _______, _______,                                     KC_PGUP, KC_HOME, KC_UP,   KC_END,  KC_VOLU, KC_DEL,
+      _______, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, _______,                                     KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_VOLD, KC_INS,
+      _______, _______, _______, _______, _______, _______, _______, KC_SLCK, _______, _______,KC_PAUSE, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_PSCR,
+                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+/*
+ * Sym Layer: Numbers and symbols
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |    º   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   '    |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |    ª   |  !   |  "   |  ·   |  $   |  %   |                              |   &  |  /   |  (   |  )   |  =   |   ?    |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |    \   |  |   |   @  |  #   |  ~   |  €   |  ¬   |      |  |      |      |   ¡  |  <   |  >   |   {  |  }   |   ¿    |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_SYM] = LAYOUT(
+     KC_NUBS,   KC_1 ,   KC_2 ,   KC_3 ,   KC_4 ,   KC_5 ,                                               KC_6 ,   KC_7 ,   KC_8 ,   KC_9 ,   KC_0 , ES_QUOT,
+     S(KC_NUBS) , ES_EXLM,  ES_DQUO , ES_BULT,  ES_DLR, ES_PERC,                                       ES_AMPR, ES_SLSH, ES_LPRN, ES_RPRN, ES_EQL, ES_QUES,
+     A(KC_NUBS), ES_PIPE, ES_AT, ES_HASH , OSX_TILD, A(KC_E), ES_NOT, _______,   S(ES_CCED), ES_CCED,  ES_IEXL, KC_GRAVE, S(KC_GRAVE),  ES_LCBR, ES_RCBR, ES_IQUE,
+                                  _______, _______, _______, _______, _______,      _______, _______, _______, _______, _______
+    ),
+
+/*
+ * Sym Layer: Numbers and symbols
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |    `   |  1   |  2   |  3   |  4   |  5   |                              |   6  |  7   |  8   |  9   |  0   |   '    |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |    ~   |  !   |  @   |  ·   |  $   |  %   |                              |   &  |  /   |  (   |  )   |  =   |   ¿    |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |    |   |   \  |  :   |  ;   |  -   |  [   |  {   |      |  |      |   }  |   ]  |  _   |  ,   |  .   |  /   |   ?    |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+//    [_SYM] = LAYOUT(
+//     C(KC_GRV),   KC_1 ,   KC_2 ,   KC_3 ,   KC_4 ,   KC_5 ,                                       KC_6 ,   KC_7 ,   KC_8 ,   KC_9 ,   KC_0 , KC_EQL ,
+//     OSX_TILD , KC_EXLM,  KC_AT , KC_HASH,  KC_DLR, KC_PERC,                                     KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS,
+//     ES_PIPE , A(KC_NUHS) , ES_COLN, ES_SCLN, ES_MINS, ES_LBRC, ES_LCBR, _______, _______, ES_RCBR, ES_RBRC, ES_UNDS, ES_COMM,  ES_DOT, ES_SLSH, ES_QUOT,
+//                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+//    ),
+
+/*
+ * Function Layer: Function keys
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        |  F9  | F10  | F11  | F12  |      |                              |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        |  F5  |  F6  |  F7  |  F8  |      |                              |      |  GUI |  Alt | Ctrl | Shift|        |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |        |  F1  |  F2  |  F3  |  F4  |      |      |      |  |      |      |      |      |      |      |      |        |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_FUNCTION] = LAYOUT(
+      _______,  KC_F9 ,  KC_F10,  KC_F11,  KC_F12, _______,                                     _______, _______, _______, _______, _______, _______,
+      _______,  KC_F5 ,  KC_F6 ,  KC_F7 ,  KC_F8 , _______,                                     _______, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT, _______,
+      _______,  KC_F1 ,  KC_F2 ,  KC_F3 ,  KC_F4 , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+/*
+ * Adjust Layer: Default layer settings, RGB
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * | NumPad |      |      |QWERTY|      |      |                              |      |      |      |      |      | RESET  |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * | Mouse  |      |      |Dvorak|      |      |                              | TOG  | SAI  | HUI  | VAI  | MOD  | DEBUG  |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |Nav Perm|      |      |Colmak|      |      |      |      |  |      |      |      | SAD  | HUD  | VAD  | RMOD | EEP_RST|
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_ADJUST] = LAYOUT(
+      NUMPAD , _______, _______, QWERTY , _______, _______,                                    _______, _______, _______, _______,  _______, RESET  ,
+      MOUSE  , _______, _______, DVORAK , _______, _______,                                    RGB_TOG, RGB_SAI, RGB_HUI, RGB_VAI,  RGB_MOD, DEBUG  ,
+      DNAV   , _______, _______, COLEMAK, _______, _______,_______, _______, _______, _______, _______, RGB_SAD, RGB_HUD, RGB_VAD, RGB_RMOD, EEPROM_RESET,
+                                 _______, _______, _______,_______, _______, _______, _______, _______, _______, _______
+    ),
+
+/*
+ * Layer NumPad
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |Adjust|      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_NUMPAD] = LAYOUT(
+      _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                                 ADJUST , _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+/*
+ * Layer Mouse
+ *
+ * ,-------------------------------------------.                              ,-------------------------------------------.
+ * |        |      |      |      |      |      |                              |      |MS LCL| MS ↑ |MS RCL| Whl ↑|        |
+ * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+ * |        | Shift| Ctrl | Alt  |  GUI |      |                              |      | MS ← | MS ↓ | MS → | Whl ↓|        |
+ * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
+ * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+ *                        |Adjust|      |      |      |      |  |      |      |      |      |      |
+ *                        |      |      |      |      |      |  |      |      |      |      |      |
+ *                        `----------------------------------'  `----------------------------------'
+ */
+    [_MOUSE] = LAYOUT(
+      _______, _______, _______, _______, _______, _______,                                     _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______,
+      _______, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, _______,                                     _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                                 ADJUST , _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+/*
+//  * Layer template
+//  *
+//  * ,-------------------------------------------.                              ,-------------------------------------------.
+//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
+//  * |--------+------+------+------+------+------|                              |------+------+------+------+------+--------|
+//  * |        |      |      |      |      |      |                              |      |      |      |      |      |        |
+//  * |--------+------+------+------+------+------+-------------.  ,-------------+------+------+------+------+------+--------|
+//  * |        |      |      |      |      |      |      |      |  |      |      |      |      |      |      |      |        |
+//  * `----------------------+------+------+------+------+------|  |------+------+------+------+------+----------------------'
+//  *                        |      |      |      |      |      |  |      |      |      |      |      |
+//  *                        |      |      |      |      |      |  |      |      |      |      |      |
+//  *                        `----------------------------------'  `----------------------------------'
+//  */
+//     [_LAYERINDEX] = LAYOUT(
+//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______,                                     _______, _______, _______, _______, _______, _______,
+//       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+//                                  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+//     ),
+};
+
+/* The default OLED and rotary encoder code can be found at the bottom of qmk_firmware/keyboards/splitkb/kyria/rev1/rev1.c
+ * These default settings can be overriden by your own settings in your keymap.c
+ * For your convenience, here's a copy of those settings so that you can uncomment them if you wish to apply your own modifications.
+ * DO NOT edit the rev1.c file; instead override the weakly defined default functions by your own.
+ */
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
+
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        // QMK Logo and version information
+        // clang-format off
+        static const char PROGMEM qmk_logo[] = {
+            0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+            0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+            0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
+        // clang-format on
+
+        oled_write_P(qmk_logo, false);
+        oled_write_P(PSTR("Kyria AdG v0.1\n\n"), false);
+
+        // Host Keyboard Layer Status
+        oled_write_P(PSTR("Layer: "), false);
+        switch (get_highest_layer(layer_state|default_layer_state)) {
+            case _QWERTY:
+                oled_write_P(PSTR("QWERTY\n"), false);
+                break;
+            case _DVORAK:
+                oled_write_P(PSTR("Dvorak\n"), false);
+                break;
+            case _COLEMAK_DH:
+                oled_write_P(PSTR("Colemak-DH\n"), false);
+                break;
+            case _NAV:
+                oled_write_P(PSTR("Nav\n"), false);
+                break;
+            case _SYM:
+                oled_write_P(PSTR("Sym\n"), false);
+                break;
+            case _FUNCTION:
+                oled_write_P(PSTR("Function\n"), false);
+                break;
+            case _ADJUST:
+                oled_write_P(PSTR("Adjust\n"), false);
+                break;
+            case _NUMPAD:
+                oled_write_P(PSTR("NumPad\n"), false);
+                break;
+            case _MOUSE:
+                oled_write_P(PSTR("Mouse\n"), false);
+                break;
+            default:
+                oled_write_P(PSTR("Undefined\n"), false);
+        }
+
+        // Write host Keyboard LED Status to OLEDs
+        led_t led_usb_state = host_keyboard_led_state();
+        oled_write_P(led_usb_state.num_lock    ? PSTR("NUMLCK ") : PSTR("       "), false);
+        oled_write_P(led_usb_state.caps_lock   ? PSTR("CAPLCK ") : PSTR("       "), false);
+        oled_write_P(led_usb_state.scroll_lock ? PSTR("SCRLCK ") : PSTR("       "), false);
+    } else {
+        // clang-format off
+        static const char PROGMEM kyria_logo[] = {
+            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,128,128,192,224,240,112,120, 56, 60, 28, 30, 14, 14, 14,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7, 14, 14, 14, 30, 28, 60, 56,120,112,240,224,192,128,128,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,  0,  0,  0,192,224,240,124, 62, 31, 15,  7,  3,  1,128,192,224,240,120, 56, 60, 28, 30, 14, 14,  7,  7,135,231,127, 31,255,255, 31,127,231,135,  7,  7, 14, 14, 30, 28, 60, 56,120,240,224,192,128,  1,  3,  7, 15, 31, 62,124,240,224,192,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,240,252,255, 31,  7,  1,  0,  0,192,240,252,254,255,247,243,177,176, 48, 48, 48, 48, 48, 48, 48,120,254,135,  1,  0,  0,255,255,  0,  0,  1,135,254,120, 48, 48, 48, 48, 48, 48, 48,176,177,243,247,255,254,252,240,192,  0,  0,  1,  7, 31,255,252,240,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,254,255,255,  1,  1,  7, 30,120,225,129,131,131,134,134,140,140,152,152,177,183,254,248,224,255,255,224,248,254,183,177,152,152,140,140,134,134,131,131,129,225,120, 30,  7,  1,  1,255,255,254,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0,255,255,  0,  0,192,192, 48, 48,  0,  0,240,240,  0,  0,  0,  0,  0,  0,240,240,  0,  0,240,240,192,192, 48, 48, 48, 48,192,192,  0,  0, 48, 48,243,243,  0,  0,  0,  0,  0,  0, 48, 48, 48, 48, 48, 48,192,192,  0,  0,  0,  0,  0,
+            0,  0,  0,255,255,255,  0,  0,  0,  0,  0,127,255,255,128,128,224,120, 30,135,129,193,193, 97, 97, 49, 49, 25, 25,141,237,127, 31,  7,255,255,  7, 31,127,237,141, 25, 25, 49, 49, 97, 97,193,193,129,135, 30,120,224,128,128,255,255,127,  0,  0,  0,  0,  0,255,255,255,  0,  0,  0,  0, 63, 63,  3,  3, 12, 12, 48, 48,  0,  0,  0,  0, 51, 51, 51, 51, 51, 51, 15, 15,  0,  0, 63, 63,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 48, 48, 63, 63, 48, 48,  0,  0, 12, 12, 51, 51, 51, 51, 51, 51, 63, 63,  0,  0,  0,  0,  0,
+            0,  0,  0,  0, 15, 63,255,248,224,128,  0,  0,  3, 15, 63,127,255,239,207,141, 13, 12, 12, 12, 12, 12, 12, 12, 30,127,225,128,  0,  0,255,255,  0,  0,128,225,127, 30, 12, 12, 12, 12, 12, 12, 12, 13,141,207,239,255,127, 63, 15,  3,  0,  0,128,224,248,255, 63, 15,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,  0,  0,  0,  3,  7, 15, 62,124,248,240,224,192,128,  1,  3,  7, 15, 30, 28, 60, 56,120,112,112,224,224,225,231,254,248,255,255,248,254,231,225,224,224,112,112,120, 56, 60, 28, 30, 15,  7,  3,  1,128,192,224,240,248,124, 62, 15,  7,  3,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+            0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  1,  3,  7, 15, 14, 30, 28, 60, 56,120,112,112,112,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,112,112,112,120, 56, 60, 28, 30, 14, 15,  7,  3,  1,  1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
+        };
+        // clang-format on
+        oled_write_raw_P(kyria_logo, sizeof(kyria_logo));
+    }
+    return false;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+
+    if (index == 0) {
+        // Volume control
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        // Page up/Page down
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
+#endif
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case LSFT_LPR:
+            if (record->tap.count && record->event.pressed) {
+                tap_code16(ES_LPRN); // Send KC_DQUO on tap
+                return false;        // Return false to ignore further processing of key
+            }
+            break;
+        case RSFT_RPR:
+            if (record->tap.count && record->event.pressed) {
+                tap_code16(ES_RPRN); // Send KC_DQUO on tap
+                return false;        // Return false to ignore further processing of key
+            }
+            break;
+    }
+    return true;
+}
\ No newline at end of file
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/readme.md b/keyboards/splitkb/kyria/keymaps/maherma-adg/readme.md
new file mode 100644
index 0000000000..bf54275d2b
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/readme.md
@@ -0,0 +1,17 @@
+# Kyria's Keymap adapted to Spanish MacOS (WIP)
+
+
+
+The default keymap contains 7 layers which allows it to include all keys found on spanish Apple keyboard plus media keys.
+Hardware features of the Kyria such as OLEDs and underglow are also supported.
+
+The five different layers are the following:
+1. Base layer (QWERTY, Colemak-DH or Dvorak)
+2. Navigation layer
+3. Symbols/Numbers layer
+4. Function layer
+5. Adjust layer
+6. Numpad layer
+7. Mouse layer
+
+Look into keymap.c to view mappings
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk b/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk
new file mode 100644
index 0000000000..f37eabe3d5
--- /dev/null
+++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/rules.mk
@@ -0,0 +1,5 @@
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306   # Enables the use of OLED displays
+ENCODER_ENABLE = no       # Enables the use of one or more encoders
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+MOUSEKEY_ENABLE = yes	 # Enable mouse movements
\ No newline at end of file

From 9d0153dc70d0ebc8314946209778b61a88d7d716 Mon Sep 17 00:00:00 2001
From: Takeshi Nishio <kkeennnn+github@gmail.com>
Date: Thu, 10 Mar 2022 13:14:53 +0900
Subject: [PATCH 788/867] [keyboard]Add v1 to jones keyboard (#14405)

* Change for latest information.

* Update from v03_1 to v1.

* Add v1 files.

* Remove finished todo comment.

* Fix COLUMN number, from "a" to "9".

* Formatting

* Update keyboards/jones/v1/rules.mk

* Add license header.

https://github.com/qmk/qmk_firmware/pull/14405#discussion_r710752035

* Implement better way to handle keycode for encoder.

Use "action_exec" instead of "tap_code16"
https://github.com/qmk/qmk_firmware/pull/14405#discussion_r710752924

* Move External EEPROM config  to keyboard level

* Move the lest of DYNAMIC_KEYMAP config  to keyboard level

https://github.com/qmk/qmk_firmware/pull/14405#discussion_r711668094

* Move the rest of DYNAMIC_KEYMAP config  to keyboard level

https://github.com/qmk/qmk_firmware/pull/14405#discussion_r711668094

* Update keyboards/jones/v1/rules.mk

* Update keyboards/jones/v1/rules.mk

* Update keyboards/jones/v1/rules.mk
---
 keyboards/jones/readme.md                    |  19 +-
 keyboards/jones/rules.mk                     |   2 +-
 keyboards/jones/v1/config.h                  |  83 +++++++
 keyboards/jones/v1/info.json                 |  17 ++
 keyboards/jones/v1/keymaps/default/keymap.c  |  64 ++++++
 keyboards/jones/v1/keymaps/default/readme.md |  10 +
 keyboards/jones/v1/keymaps/via/config.h      |  34 +++
 keyboards/jones/v1/keymaps/via/keymap.c      | 225 +++++++++++++++++++
 keyboards/jones/v1/keymaps/via/readme.md     |  35 +++
 keyboards/jones/v1/keymaps/via/rules.mk      |   2 +
 keyboards/jones/v1/readme.md                 |  23 ++
 keyboards/jones/v1/rules.mk                  |  24 ++
 keyboards/jones/v1/v1.c                      |  28 +++
 keyboards/jones/v1/v1.h                      |  57 +++++
 14 files changed, 612 insertions(+), 11 deletions(-)
 create mode 100644 keyboards/jones/v1/config.h
 create mode 100644 keyboards/jones/v1/info.json
 create mode 100644 keyboards/jones/v1/keymaps/default/keymap.c
 create mode 100644 keyboards/jones/v1/keymaps/default/readme.md
 create mode 100644 keyboards/jones/v1/keymaps/via/config.h
 create mode 100644 keyboards/jones/v1/keymaps/via/keymap.c
 create mode 100644 keyboards/jones/v1/keymaps/via/readme.md
 create mode 100644 keyboards/jones/v1/keymaps/via/rules.mk
 create mode 100644 keyboards/jones/v1/readme.md
 create mode 100644 keyboards/jones/v1/rules.mk
 create mode 100644 keyboards/jones/v1/v1.c
 create mode 100644 keyboards/jones/v1/v1.h

diff --git a/keyboards/jones/readme.md b/keyboards/jones/readme.md
index 180c12e18a..43500d0a1d 100644
--- a/keyboards/jones/readme.md
+++ b/keyboards/jones/readme.md
@@ -1,23 +1,22 @@
 # Jones
 
-![Jones, ANSI style](https://github.com/jpskenn/Jones/raw/master/assets/IMG_2204.jpeg)
+![Jones, "Wide" layout](https://raw.githubusercontent.com/jpskenn/Jones/master/assets/_DSF0714.jpeg)
 
-![Jones, JP style](https://github.com/jpskenn/Jones/raw/master/assets/DSC_7189.jpeg)
-
-A 60% keyboard combined with Ortho-Linear and Row-staggered. It has gapless R2-R3 row.  
-GH60 case compatible PCB and keyplate.
+A symmetrical 60% keyboard combined with Ortho-Linear and Row-staggered. It has gapless Row 2 - Row 3.  
+GH60 case compatible PCB and keyplate.  
+[More info](https://github.com/jpskenn/Jones)
 
 * Keyboard Maintainer: [jpskenn](https://github.com/jpskenn)
-* Hardware Supported: Jones PCB, Keyplate
-* Hardware Availability: [GitHub](https://github.com/jpskenn/Jones), [BOOTH](https://jpskenn.booth.pm)
+* Hardware Supported: PCB, Key plate, Bottom plate
+* Hardware Availability: [GitHub](https://github.com/jpskenn/Jones), [BOOTH](https://jpskenn.booth.pm), [Yushakobo](https://yushakobo.jp)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make jones/v03_1:default_ansi
-    
+    make jones/v1:default
+
 Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):
 
-    make jones/v03_1:default_ansi:flash
+    make jones/v1:default:flash
 
 To reset the keyboard into bootloader mode, press the reset switch on the underside.
 
diff --git a/keyboards/jones/rules.mk b/keyboards/jones/rules.mk
index 6b49430357..9f0da2abec 100644
--- a/keyboards/jones/rules.mk
+++ b/keyboards/jones/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = jones/v03_1
+DEFAULT_FOLDER = jones/v1
diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h
new file mode 100644
index 0000000000..1f8acc6eb6
--- /dev/null
+++ b/keyboards/jones/v1/config.h
@@ -0,0 +1,83 @@
+/*
+Copyright 2021 Takeshi Nishio
+
+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 0xB9DD
+#define PRODUCT_ID 0x175A
+#define DEVICE_VER 0x0100
+#define MANUFACTURER jpskenn
+#define PRODUCT Jones
+
+/* key matrix size */
+// Same number for Round-Robin matrix.
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 10
+
+// Same pins for Round-Robin matrix.
+#define MATRIX_ROW_PINS { B3, B2, E6, D6, D4, B0, B1, B7, B4, D7 }
+#define MATRIX_COL_PINS { B3, B2, E6, D6, D4, B0, B1, B7, B4, D7 }
+
+#define DIODE_DIRECTION COL2ROW
+
+/* Rotary Encoder */
+#define ENCODERS_PAD_A { F5, D2 }
+#define ENCODERS_PAD_B { F4, D3 }
+#define ENCODER_RESOLUTION 4  //the default & suggested is 4
+
+/* Audio */
+#ifdef AUDIO_ENABLE
+  #define AUDIO_PIN C6
+  #define AUDIO_CLICKY
+  #define MUSIC_MAP
+#endif
+
+/* RGBLIGHT */
+#define RGB_DI_PIN F1
+#ifdef RGB_DI_PIN
+  #define RGBLED_NUM 4 // Left(2) + Right(2)
+  #define RGBLIGHT_HUE_STEP 8
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+  /*== Lighting Layers ==*/
+  #define RGBLIGHT_LAYERS
+  #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF // Overriding RGB Lighting on/off status
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite trigger key. Left-Top of the layout. */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 9
+
+/* External EEPROM */
+// Use 24LC64 EEPROM
+#define EEPROM_I2C_24LC64
+// Set MAX_ADDR to specify actual EEPROM size.
+// If it's not set, EEPROM size will be set ATmega32u4's 1023.
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8191
+// How many layers to use with VIA / Remap.
+#define DYNAMIC_KEYMAP_LAYER_COUNT 6 // default:4
diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json
new file mode 100644
index 0000000000..6aba4fd74b
--- /dev/null
+++ b/keyboards/jones/v1/info.json
@@ -0,0 +1,17 @@
+{
+  "keyboard_name": "Jones",
+  "url": "https://github.com/jpskenn/Jones",
+  "maintainer": "jpskenn",
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {"x":0.5, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0},
+        {"x":0.5, "y":1, "w":1.5}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1, "w":1.5},
+        {"x":0.5, "y":2, "w":1.5}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2, "w":1.5},
+        {"x":0.5, "y":3}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3},
+        {"x":0.5, "y":4}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4}, {"x":7.5, "y":4}, {"x":8.5, "y":4}, {"x":9.5, "y":4, "w":1.5}, {"x":11, "y":4, "w":1.25}, {"x":12.25, "y":4, "w":1.25}, {"x":13.5, "y":4}, {"x":14.5, "y":4},
+        {"x":0, "y":5}, {"x":1, "y":5}, {"x":14, "y":5}, {"x":15, "y":5}
+      ]
+    }
+  }
+}
diff --git a/keyboards/jones/v1/keymaps/default/keymap.c b/keyboards/jones/v1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d1f952de66
--- /dev/null
+++ b/keyboards/jones/v1/keymaps/default/keymap.c
@@ -0,0 +1,64 @@
+/* Copyright 2021 Takeshi Nishio
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_number {
+    _BASE = 0,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+// Key Macro
+#define SP_LOW  LT(_LOWER, KC_SPC)
+#define SP_RAI  LT(_RAISE, KC_SPC)
+#define SP_ADJ  LT(_ADJUST, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_GRV,   KC_BSLS,  KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,
+           KC_TAB,     KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_LBRC,  KC_RBRC,  KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,       KC_BSPC,
+           KC_LCTL,    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_SCLN,  KC_QUOT,  KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,    KC_ENT,
+        KC_LSFT,  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_LEFT,  KC_RGHT,  KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_UP,    KC_SLSH,
+        KC_MUTE,  KC_LANG2, KC_LGUI,     KC_LALT,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,KC_RALT,      KC_RALT,     KC_LEFT,  KC_DOWN,  KC_RGHT,
+        KC_VOLD,  KC_VOLU,                                                                                                                KC_VOLD,  KC_VOLU
+    ),
+    [_LOWER] = LAYOUT(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
+            KC_ESC,     KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  _______,  _______,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  KC_INS,
+            _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_GRV,   KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_BSLS,
+        _______,  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  KC_TILD,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,
+        _______,  _______,  _______,     _______,        _______,      _______,  _______,     SP_ADJ,_______,      _______,     _______,  _______,  _______,
+        _______,  _______,                                                                                                                _______,  _______
+    ),
+    [_RAISE] = LAYOUT(
+        KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
+            KC_ESC,     KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     _______,  _______,  KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_DEL,
+            _______,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_SCLN,  KC_QUOT,
+        _______,  _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,  _______,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_F11,   KC_F12,
+        _______,  _______,  _______,     _______,        SP_ADJ,       _______,  _______,      _______,_______,     _______,    _______,  KC_DOWN,  KC_UP,
+        _______,  _______,                                                                                                                _______,  _______
+    ),
+    [_ADJUST] = LAYOUT(
+        _______,   RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,
+            _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  RGB_RMOD,  _______,
+            _______,    AU_TOG,   CK_TOGG,  MU_TOG,   MU_MOD,   _______,  _______,  _______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_TOG,  RGB_MOD,   _______,
+        KC_CAPS,  KC_CAPS,  CK_RST,   CK_DOWN,  CK_UP,    MUV_DE,   MUV_IN,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,     _______,    _______,  _______,  _______,
+        _______,  _______,                                                                                                                _______,  _______
+    )
+};
diff --git a/keyboards/jones/v1/keymaps/default/readme.md b/keyboards/jones/v1/keymaps/default/readme.md
new file mode 100644
index 0000000000..453d9e858c
--- /dev/null
+++ b/keyboards/jones/v1/keymaps/default/readme.md
@@ -0,0 +1,10 @@
+# Defalut keymap for Jones
+
+Simple keymap.
+
+## Layers
+
+- Base
+- Lower
+- Raise
+- Adjust
diff --git a/keyboards/jones/v1/keymaps/via/config.h b/keyboards/jones/v1/keymaps/via/config.h
new file mode 100644
index 0000000000..5d24e1f91a
--- /dev/null
+++ b/keyboards/jones/v1/keymaps/via/config.h
@@ -0,0 +1,34 @@
+/*
+Copyright 2021 Takeshi Nishio
+
+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
+
+//------------------------------------------------------------------------------
+// Rotary Encoder
+//------------------------------------------------------------------------------
+// Encoder triggers specific key matrix position,
+// when turn knob clockwise or counterclockwise.
+// This is handy to assign key codes by VIA.
+
+// Number of endoder
+#define ENCODERS 2
+
+// Mappings of encoder rotation to key position in key matrix.
+// First encoder,  Left side  : k85, k86
+// Second encoder, Right side : k95, k96
+#define ENCODERS_CW_KEY  { { 6, 8 }, { 6, 9 } }
+#define ENCODERS_CCW_KEY { { 5, 8 }, { 5, 9 } }
diff --git a/keyboards/jones/v1/keymaps/via/keymap.c b/keyboards/jones/v1/keymaps/via/keymap.c
new file mode 100644
index 0000000000..7cd1434bbc
--- /dev/null
+++ b/keyboards/jones/v1/keymaps/via/keymap.c
@@ -0,0 +1,225 @@
+/* Copyright 2021 Takeshi Nishio
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "keymap_jp.h"
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_number {
+    _BASE1 = 0,
+    _BASE2,
+    _BASE3,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+// Key Macro
+#define SP_LOW  LT(_LOWER, KC_SPC)
+#define SP_RAI  LT(_RAISE, KC_SPC)
+#define SP_ADJ  LT(_ADJUST, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE1] = LAYOUT(
+        KC_ESC,   JP_1,     JP_2,     JP_3,     JP_4,     JP_5,     JP_CIRC,  JP_YEN,   JP_6,     JP_7,     JP_8,     JP_9,     JP_0,     JP_MINS,  KC_BSPC,
+           KC_TAB,     JP_Q,     JP_W,     JP_E,     JP_R,     JP_T,     JP_AT,    JP_LBRC,  JP_Y,     JP_U,     JP_I,     JP_O,     JP_P,       KC_BSPC,
+           KC_LCTL,    JP_A,     JP_S,     JP_D,     JP_F,     JP_G,     JP_COLN,  JP_RBRC,  JP_H,     JP_J,     JP_K,     JP_L,     JP_SCLN,    KC_ENT,
+        KC_LSFT,  KC_LSFT,  JP_Z,     JP_X,     JP_C,     JP_V,     JP_B,     JP_SLSH,  JP_BSLS,  JP_N,     JP_M,     JP_COMM,  JP_DOT,   KC_DOWN,  KC_UP,
+        KC_MUTE,  KC_LGUI,  KC_LALT,     JP_MHEN,       SP_LOW,        SP_RAI,   KC_BSPC,     SP_RAI,SP_RAI,       JP_HENK,     JP_KANA,  KC_LEFT,  KC_RGHT,
+        KC_VOLD,  KC_VOLU,                                                                                                                KC_VOLD,  KC_VOLU
+    ),
+    [_BASE2] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSLS,  KC_PAST,  KC_PMNS,  _______,  _______,
+           _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,   _______,
+           _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_P4,    KC_P5,    KC_P6,    KC_PPLS,   _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_P1,    KC_P2,    KC_P3,    _______,  _______,
+        _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,    KC_P0,       KC_PDOT,  _______,  _______,
+        _______,  _______,                                                                                                                _______,  _______
+    ),
+    [_BASE3] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+           _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,
+           _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,     _______,    _______,  _______,  _______,
+        _______,  _______,                                                                                                                _______,  _______
+    ),
+    [_LOWER] = LAYOUT(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    _______,  _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
+            _______,    JP_EXLM,  JP_DQUO,  JP_HASH,  JP_DLR,   JP_PERC,  JP_TILD,  JP_PIPE,  JP_AMPR,  JP_QUOT,  JP_LPRN,  JP_RPRN,  JP_EQL,   KC_INS,
+            _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,     _______,        _______,      SP_ADJ,   _______,     SP_ADJ,SP_ADJ,       _______,     _______,  _______,  _______,
+        _______,  _______,                                                                                                                _______,  _______
+    ),
+    [_RAISE] = LAYOUT(
+        KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    _______,  _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
+            KC_ESC,     JP_1,     JP_2,     JP_3,     JP_4,     JP_5,     JP_CIRC,  JP_YEN,   JP_6,     JP_7,     JP_8,     JP_9,     JP_0,     KC_DEL,
+            _______,    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  _______,  _______,
+        _______,  _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   _______,  _______,
+        _______,  _______,  _______,     _______,        SP_ADJ,       _______,  _______,      _______,_______,     _______,    _______,  KC_DOWN,  KC_UP,
+        _______,  _______,                                                                                                                _______,  _______
+    ),
+    [_ADJUST] = LAYOUT(
+        _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  KC_PSCR,  KC_SLCK,  KC_PAUS,
+            _______,    DF(_BASE1),DF(_BASE2),DF(_BASE3),_______,  _______,  _______,  _______,  RGB_HUI,  RGB_SAI,  RGB_VAI,  _______,  RGB_RMOD,  _______,
+            _______,    AU_TOG,   CK_TOGG,  MU_TOG,   MU_MOD,   _______,  _______,  _______,  RGB_HUD,  RGB_SAD,  RGB_VAD,  RGB_TOG,  RGB_MOD,   _______,
+        KC_CAPS,  KC_CAPS,  CK_RST,   CK_DOWN,  CK_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,     _______,        _______,      _______,  _______,      _______,_______,     _______,    _______,  _______,  _______,
+        _______,  _______,                                                                                                                _______,  _______
+    ),
+};
+
+
+//------------------------------------------------------------------------------
+// RGB Light settings
+//------------------------------------------------------------------------------
+#ifdef RGBLIGHT_LAYERS
+
+// Indicator LED settings
+#define JONES_LED_INDICATOR_INDEX 0         // where to start indicator
+#define JONES_LED_INDICATOR_COUNT 4         // how many leds used for indicator
+#define JONES_LED_INDICATOR_CHANGE_COUNT 1  // how meny leds to change for temporally layer
+#define JONES_LED_DIMMER_LEVEL 200          // brightness dimmer
+
+// for Default layer (= Base layer)
+const rgblight_segment_t PROGMEM my_base1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_COUNT, HSV_WHITE - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_base2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_COUNT, HSV_BLUE - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_base3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_COUNT, HSV_YELLOW - JONES_LED_DIMMER_LEVEL}
+);
+
+// for temporal layer
+const rgblight_segment_t PROGMEM my_caps_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX + 1 , 1, HSV_MAGENTA - JONES_LED_DIMMER_LEVEL},
+    {JONES_LED_INDICATOR_INDEX + 1 + 2 , 1, HSV_MAGENTA - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_lower_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_GREEN - JONES_LED_DIMMER_LEVEL},
+    {JONES_LED_INDICATOR_INDEX + 2, JONES_LED_INDICATOR_CHANGE_COUNT, HSV_GREEN - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_raise_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_CYAN - JONES_LED_DIMMER_LEVEL},
+    {JONES_LED_INDICATOR_INDEX + 2, JONES_LED_INDICATOR_CHANGE_COUNT, HSV_CYAN - JONES_LED_DIMMER_LEVEL}
+);
+
+const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {JONES_LED_INDICATOR_INDEX , JONES_LED_INDICATOR_CHANGE_COUNT, HSV_RED - JONES_LED_DIMMER_LEVEL},
+    {JONES_LED_INDICATOR_INDEX + 2, JONES_LED_INDICATOR_CHANGE_COUNT, HSV_RED - JONES_LED_DIMMER_LEVEL}
+);
+
+// Define the array of layers. Later layers take precedence
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_base1_layer,
+    my_base2_layer,
+    my_base3_layer,
+    my_caps_layer,
+    my_lower_layer,
+    my_raise_layer,
+    my_adjust_layer
+);
+
+// Enabling and disabling lighting layers
+layer_state_t layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(4, layer_state_cmp(state, _LOWER));
+    rgblight_set_layer_state(5, layer_state_cmp(state, _RAISE));
+    rgblight_set_layer_state(6, layer_state_cmp(state, _ADJUST));
+
+    return state;
+}
+
+// Enabling and disabling lighting layers for default layer
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    rgblight_set_layer_state(0, layer_state_cmp(state, _BASE1));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _BASE2));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _BASE3));
+
+    return state;
+}
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(3, IS_HOST_LED_ON(USB_LED_CAPS_LOCK));
+
+    return true;
+}
+#endif
+
+
+//------------------------------------------------------------------------------
+// Rotary Encoder
+//------------------------------------------------------------------------------
+static uint8_t  encoder_state[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[ENCODERS]   = ENCODERS_CCW_KEY;
+
+void encoder_action_unregister(void) {
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index]) {
+            keyevent_t encoder_event = (keyevent_t) {
+                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
+                .pressed = false,
+                .time = (timer_read() | 1)
+            };
+            encoder_state[index] = 0;
+            action_exec(encoder_event);
+        }
+    }
+}
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = true,
+        .time = (timer_read() | 1)
+    };
+    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+}
+
+void matrix_scan_kb(void) {
+    encoder_action_unregister();
+    matrix_scan_user();
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    return true;
+};
+
+
+//------------------------------------------------------------------------------
+// Keyboard Initialization
+//------------------------------------------------------------------------------
+void keyboard_post_init_user(void) {
+debug_enable=true;
+#ifdef RGB_DI_PIN
+  #ifdef RGBLIGHT_LAYERS
+    // Enable the LED layers.
+    rgblight_layers = my_rgb_layers;
+
+    // prevent RGB light overrides layer indicator.
+    layer_state_set(default_layer_state);
+  #endif
+#endif
+
+}
diff --git a/keyboards/jones/v1/keymaps/via/readme.md b/keyboards/jones/v1/keymaps/via/readme.md
new file mode 100644
index 0000000000..95da48228c
--- /dev/null
+++ b/keyboards/jones/v1/keymaps/via/readme.md
@@ -0,0 +1,35 @@
+# Keymap for Jones with VIA support
+
+VIA supported basic keymap with external EEPROM.
+
+## Layout
+
+Japanese style "Wide" layout.
+
+## Layers
+
+- Base #1
+- Base #2
+- Base #3
+- Lower
+- Raise
+- Adjust
+
+## External EEPROM
+
+I2C connected external EEPROM.
+
+## LED lighting
+
+4 LEDsfor layer indicator.  
+2 for Left side and 2 for Right side.
+
+## Rotary encoder
+
+Supports up to 2 rotary encoders.  
+Left bottom and Right bottom.
+
+## Audio
+
+Supports monophonic audio.  
+"Music Mode" and "Audio Click" are enabled.
diff --git a/keyboards/jones/v1/keymaps/via/rules.mk b/keyboards/jones/v1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..e1d2dc0582
--- /dev/null
+++ b/keyboards/jones/v1/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+# Use VIA
+VIA_ENABLE = yes
diff --git a/keyboards/jones/v1/readme.md b/keyboards/jones/v1/readme.md
new file mode 100644
index 0000000000..43500d0a1d
--- /dev/null
+++ b/keyboards/jones/v1/readme.md
@@ -0,0 +1,23 @@
+# Jones
+
+![Jones, "Wide" layout](https://raw.githubusercontent.com/jpskenn/Jones/master/assets/_DSF0714.jpeg)
+
+A symmetrical 60% keyboard combined with Ortho-Linear and Row-staggered. It has gapless Row 2 - Row 3.  
+GH60 case compatible PCB and keyplate.  
+[More info](https://github.com/jpskenn/Jones)
+
+* Keyboard Maintainer: [jpskenn](https://github.com/jpskenn)
+* Hardware Supported: PCB, Key plate, Bottom plate
+* Hardware Availability: [GitHub](https://github.com/jpskenn/Jones), [BOOTH](https://jpskenn.booth.pm), [Yushakobo](https://yushakobo.jp)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jones/v1:default
+
+Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):
+
+    make jones/v1:default:flash
+
+To reset the keyboard into bootloader mode, press the reset switch on the underside.
+
+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).
diff --git a/keyboards/jones/v1/rules.mk b/keyboards/jones/v1/rules.mk
new file mode 100644
index 0000000000..56d629cfe9
--- /dev/null
+++ b/keyboards/jones/v1/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = yes          # Audio output
+ENCODER_ENABLE = yes        # Rotary Encoder
+
+# Use I2C connected External EEPROM
+EEPROM_DRIVER = i2c
+
+LTO_ENABLE = yes
diff --git a/keyboards/jones/v1/v1.c b/keyboards/jones/v1/v1.c
new file mode 100644
index 0000000000..292a1fbabe
--- /dev/null
+++ b/keyboards/jones/v1/v1.c
@@ -0,0 +1,28 @@
+/* Copyright 2021 Takeshi Nishio
+ *
+ * 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 "v1.h"
+
+#if defined(AUDIO_ENABLE) && defined(MUSIC_MAP)
+const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT(
+    0,  24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+      0,  12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,  24,
+      0,  12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,  24,
+    0,  0,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12,
+    0,  0,  0,  0,     0,     0,  0,     0,  0,  0,  0,  0,  0,
+  0,  0,                                                   0,  0
+);
+#endif
diff --git a/keyboards/jones/v1/v1.h b/keyboards/jones/v1/v1.h
new file mode 100644
index 0000000000..e37c34accc
--- /dev/null
+++ b/keyboards/jones/v1/v1.h
@@ -0,0 +1,57 @@
+/* Copyright 2021 Takeshi Nishio
+ *
+ * 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"
+
+/*
+FULL 10x10 ROUND-ROBIN MATRIX for Reference
+
+{ KC_NO, k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09   }, \
+{ k10,   KC_NO, k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19   }, \
+{ k20,   k21,   KC_NO, k23,   k24,   k25,   k26,   k27,   k28,   k29   }, \
+{ k30,   k31,   k32,   KC_NO, k34,   k35,   k36,   k37,   k38,   k39   }, \
+{ k40,   k41,   k42,   k43,   KC_NO, k45,   k46,   k47,   k48,   k49   }, \
+{ k50,   k51,   k52,   k53,   k54,   KC_NO, k56,   k57,   k58,   k59   }, \
+{ k60,   k61,   k62,   k63,   k64,   k65,   KC_NO, k67,   k68,   k69   }, \
+{ k70,   k71,   k72,   k73,   k74,   k75,   k76,   KC_NO, k78,   k79   }, \
+{ k80,   k81,   k82,   k83,   k84,   k85,   k86,   k87,   KC_NO, k89   }, \
+{ k90,   k91,   k92,   k93,   k94,   k95,   k96,   k97,   k98,   KC_NO }  \
+
+*/
+
+/* Keys on 6th row are used with rotary encoder. */
+#define LAYOUT( \
+      k09, k59, k08, k54, k04, k50, k56, k06, k05, k52, k02, k53, k07, k51, k01,  \
+        k19,  k69, k18, k64, k14, k60, k10, k16, k15, k62, k12, k63, k17,  k61,   \
+        k29,  k79, k28, k74, k24, k70, k20, k26, k25, k72, k23, k73, k27,  k71,   \
+      k39, k89, k38, k84, k34, k80, k30, k36, k35, k82, k32, k83, k37, k81, k31,  \
+      k49, k98,  k48,  k94,   k90,    k46, k45,    k92, k42, k93, k47, k91, k41,  \
+    k85, k86,                                                            k95, k96 \
+) \
+{ \
+    { KC_NO, k01,   k02,   KC_NO, k04,   k05,   k06,   k07,   k08,   k09,  }, \
+    { k10,   KC_NO, k12,   KC_NO, k14,   k15,   k16,   k17,   k18,   k19,  }, \
+    { k20,   KC_NO, KC_NO, k23,   k24,   k25,   k26,   k27,   k28,   k29,  }, \
+    { k30,   k31,   k32,   KC_NO, k34,   k35,   k36,   k37,   k38,   k39,  }, \
+    { KC_NO, k41,   k42,   KC_NO, KC_NO, k45,   k46,   k47,   k48,   k49,  }, \
+    { k50,   k51,   k52,   k53,   k54,   KC_NO, k56,   KC_NO, KC_NO, k59,  }, \
+    { k60,   k61,   k62,   k63,   k64,   KC_NO, KC_NO, KC_NO, KC_NO, k69,  }, \
+    { k70,   k71,   k72,   k73,   k74,   KC_NO, KC_NO, KC_NO, KC_NO, k79,  }, \
+    { k80,   k81,   k82,   k83,   k84,   k85,   k86,   KC_NO, KC_NO, k89,  }, \
+    { k90,   k91,   k92,   k93,   k94,   k95,   k96,   KC_NO, k98,   KC_NO }  \
+}

From dc8db6551d2d11534920d1d723d06a99c1b93071 Mon Sep 17 00:00:00 2001
From: Hao Xiang Liew <62730710+haoxiangliew@users.noreply.github.com>
Date: Thu, 10 Mar 2022 02:35:54 -0500
Subject: [PATCH 789/867] [KEYBOARD] keyboardio/atreus: VIA support (#16604)

---
 .../keyboardio/atreus/keymaps/via/keymap.c    | 53 +++++++++++++++++++
 .../keyboardio/atreus/keymaps/via/rules.mk    |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 keyboards/keyboardio/atreus/keymaps/via/keymap.c
 create mode 100644 keyboards/keyboardio/atreus/keymaps/via/rules.mk

diff --git a/keyboards/keyboardio/atreus/keymaps/via/keymap.c b/keyboards/keyboardio/atreus/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c649ec1c65
--- /dev/null
+++ b/keyboards/keyboardio/atreus/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+// Copyright (C) 2022, Hao Xiang Liew
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT( /* Qwerty */
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P    ,
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN ,
+    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_GRV,  KC_BSLS, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH ,
+    KC_ESC, KC_TAB, KC_LGUI,  KC_LSFT, KC_BSPC,  KC_LCTL, KC_LALT, KC_SPC,  MO(1),   KC_MINS, KC_QUOT, KC_ENT ),
+
+  /*
+   *  !       @     up     {    }        ||     pgup    7     8     9    *
+   *  #     left   down  right  $        ||     pgdn    4     5     6    +
+   *  [       ]      (     )    &        ||       `     1     2     3    \
+   * lower  insert super shift bksp ctrl || alt space   fn    .     0    =
+   */
+  [1] = LAYOUT( /* [> RAISE <] */
+    KC_EXLM, KC_AT,   KC_UP,   KC_DLR,  KC_PERC,                  KC_PGUP, KC_7,    KC_8,   KC_9, KC_BSPC,
+    KC_LPRN, KC_LEFT, KC_DOWN, KC_RGHT, KC_RPRN,                  KC_PGDN, KC_4,    KC_5,   KC_6, KC_BSLS,
+    KC_LBRC, KC_RBRC, KC_HASH, KC_LCBR, KC_RCBR, KC_CIRC, KC_AMPR,KC_ASTR, KC_1,    KC_2,   KC_3, KC_PLUS,
+    TG(2),   KC_INS,  KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT,KC_SPC,  KC_TRNS, KC_DOT, KC_0, KC_EQL ),
+  /*
+   * insert home   up  end   pgup       ||      up     F7    F8    F9   F10
+   *  del   left  down right pgdn       ||     down    F4    F5    F6   F11
+   *       volup             reset      ||             F1    F2    F3   F12
+   *       voldn  super shift bksp ctrl || alt space   L0  prtsc scroll pause
+   */
+  [2] = LAYOUT( /* [> LOWER <] */
+    KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_PGUP,                   KC_UP,   KC_F7,   KC_F8,   KC_F9,   KC_F10  ,
+    KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,                   KC_DOWN, KC_F4,   KC_F5,   KC_F6,   KC_F11  ,
+    KC_NO,   KC_VOLU, KC_NO,   KC_NO,   RESET,   KC_TRNS, KC_TRNS, KC_NO,   KC_F1,   KC_F2,   KC_F3,   KC_F12  ,
+    TO(0),   KC_VOLD, KC_LGUI, KC_LSFT, KC_BSPC, KC_LCTL, KC_LALT, KC_SPC,  TO(0),   KC_PSCR, KC_SLCK, KC_PAUS ),
+
+  [3] = LAYOUT( /* blank */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS )
+};
diff --git a/keyboards/keyboardio/atreus/keymaps/via/rules.mk b/keyboards/keyboardio/atreus/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/keyboardio/atreus/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

From bd70f5261cbb7fd4700bf9876da94c9661dadf63 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 10 Mar 2022 23:18:07 +1100
Subject: [PATCH 790/867] Remove `matrix_key_count()` (#16603)

* Remove `matrix_key_count()`

* Remove `matrix_bitpop()`
---
 keyboards/40percentclub/ut47/matrix.c         |  9 ---------
 keyboards/amj96/matrix.c                      |  9 ---------
 keyboards/bpiphany/hid_liber/matrix.c         | 12 ------------
 keyboards/bpiphany/kitten_paw/matrix.c        |  8 --------
 keyboards/bpiphany/pegasushoof/2013/matrix.c  |  9 ---------
 keyboards/bpiphany/pegasushoof/2015/matrix.c  |  9 ---------
 keyboards/bpiphany/tiger_lily/matrix.c        |  7 -------
 keyboards/bpiphany/unloved_bastard/matrix.c   |  7 -------
 keyboards/converter/ibm_terminal/matrix.c     |  1 -
 keyboards/converter/palm_usb/matrix.c         |  9 ---------
 keyboards/converter/sun_usb/matrix.c          |  9 ---------
 keyboards/converter/usb_usb/custom_matrix.cpp | 12 ------------
 keyboards/dc01/arrow/matrix.c                 | 16 +---------------
 keyboards/dc01/left/matrix.c                  | 14 --------------
 keyboards/dc01/numpad/matrix.c                | 16 +---------------
 keyboards/dc01/right/matrix.c                 | 16 +---------------
 keyboards/dichotomy/matrix.c                  | 12 ------------
 keyboards/duck/jetfire/matrix.c               | 11 +----------
 keyboards/gboards/ergotaco/matrix.c           |  9 ---------
 keyboards/gboards/georgi/matrix.c             |  9 ---------
 keyboards/gboards/gergo/matrix.c              |  8 --------
 keyboards/gboards/gergoplex/matrix.c          |  7 -------
 keyboards/handwired/dactyl/matrix.c           |  9 ---------
 keyboards/handwired/frenchdev/matrix.c        |  9 ---------
 keyboards/handwired/owlet60/matrix.c          | 12 ------------
 keyboards/handwired/promethium/matrix.c       | 13 -------------
 keyboards/handwired/pterodactyl/matrix.c      |  9 ---------
 keyboards/helix/rev2/custom/matrix.c          |  9 ---------
 keyboards/hhkb/ansi/matrix.c                  |  8 --------
 keyboards/hhkb/jp/matrix.c                    |  8 --------
 keyboards/honeycomb/matrix.c                  | 12 ------------
 keyboards/hotdox/matrix.c                     |  9 ---------
 keyboards/kakunpc/angel64/alpha/matrix.c      | 12 ------------
 keyboards/kakunpc/angel64/rev1/matrix.c       | 12 ------------
 keyboards/kakunpc/thedogkeyboard/matrix.c     | 12 ------------
 keyboards/kinesis/alvicstep/matrix.c          |  9 ---------
 keyboards/kmac/matrix.c                       | 11 -----------
 keyboards/kmini/matrix.c                      |  9 ---------
 keyboards/ktec/ergodone/matrix.c              |  9 ---------
 keyboards/moon/matrix.c                       | 11 -----------
 keyboards/nek_type_a/matrix.c                 | 14 --------------
 keyboards/redscarf_iiplus/verb/matrix.c       | 13 -------------
 keyboards/redscarf_iiplus/verc/matrix.c       | 13 -------------
 keyboards/redscarf_iiplus/verd/matrix.c       | 13 -------------
 keyboards/sirius/unigo66/custom_matrix.cpp    | 12 ------------
 keyboards/sixkeyboard/matrix.c                | 10 ----------
 keyboards/sx60/matrix.c                       | 12 ------------
 keyboards/woodkeys/meira/matrix.c             | 13 -------------
 keyboards/ymdk/sp64/matrix.c                  |  9 ---------
 keyboards/yosino58/rev1/matrix.c              |  9 ---------
 quantum/matrix_common.c                       | 11 -----------
 51 files changed, 4 insertions(+), 527 deletions(-)

diff --git a/keyboards/40percentclub/ut47/matrix.c b/keyboards/40percentclub/ut47/matrix.c
index 89537592c5..97922e2dbe 100644
--- a/keyboards/40percentclub/ut47/matrix.c
+++ b/keyboards/40percentclub/ut47/matrix.c
@@ -118,15 +118,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 /* Column pin configuration
  * col: 0   1   2   3   4   5   6   7   8   9   10  11
  * pin: D7  E6  B4  B5  B6  B2  B3  B1  F7  F6  F5  F4
diff --git a/keyboards/amj96/matrix.c b/keyboards/amj96/matrix.c
index ffd66d120f..2999c6241b 100644
--- a/keyboards/amj96/matrix.c
+++ b/keyboards/amj96/matrix.c
@@ -130,15 +130,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 /* Column pin configuration
  * col: 0   1   2   3   4   5   6   7   8   9   10  11  12  13  14  15
  * pin: F7  F6  F5  F4  F1  F0  E6  D7  D6  D5  D1  D0  B7  B6  B0  C7
diff --git a/keyboards/bpiphany/hid_liber/matrix.c b/keyboards/bpiphany/hid_liber/matrix.c
index da73c616d7..90e8a327b5 100755
--- a/keyboards/bpiphany/hid_liber/matrix.c
+++ b/keyboards/bpiphany/hid_liber/matrix.c
@@ -245,15 +245,3 @@ void matrix_print(void)
         print("\n");
     }
 }
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        for (uint8_t j = 0; j < MATRIX_COLS; j++) {
-            if (matrix_is_on(i, j))
-                count++;
-        }
-    }
-    return count;
-}
diff --git a/keyboards/bpiphany/kitten_paw/matrix.c b/keyboards/bpiphany/kitten_paw/matrix.c
index 56114858f1..6548040c7c 100644
--- a/keyboards/bpiphany/kitten_paw/matrix.c
+++ b/keyboards/bpiphany/kitten_paw/matrix.c
@@ -132,14 +132,6 @@ void matrix_print(void) {
   }
 }
 
-uint8_t matrix_key_count(void) {
-  uint8_t count = 0;
-  for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-    count += bitpop32(matrix[i]);
-  }
-  return count;
-}
-
 static uint8_t read_rows(void) {
   return
     (PINC&(1<<7) ? 0 : (1<<0)) |
diff --git a/keyboards/bpiphany/pegasushoof/2013/matrix.c b/keyboards/bpiphany/pegasushoof/2013/matrix.c
index 09244982d9..a55cba7afd 100644
--- a/keyboards/bpiphany/pegasushoof/2013/matrix.c
+++ b/keyboards/bpiphany/pegasushoof/2013/matrix.c
@@ -132,15 +132,6 @@ void matrix_print(void)
 	}
 }
 
-uint8_t matrix_key_count(void)
-{
-	uint8_t count = 0;
-	for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-		count += bitpop16(matrix[i]);
-	}
-	return count;
-}
-
 static matrix_row_t read_cols(void)
 {
 	return
diff --git a/keyboards/bpiphany/pegasushoof/2015/matrix.c b/keyboards/bpiphany/pegasushoof/2015/matrix.c
index b05869feda..2b142f9fc8 100644
--- a/keyboards/bpiphany/pegasushoof/2015/matrix.c
+++ b/keyboards/bpiphany/pegasushoof/2015/matrix.c
@@ -111,15 +111,6 @@ void matrix_print(void)
   }
 }
 
-uint8_t matrix_key_count(void)
-{
-  uint8_t count = 0;
-  for (uint8_t i = 0; i < matrix_rows(); i++) {
-    count += bitpop16(matrix_get_row(i));
-  }
-  return count;
-}
-
 static matrix_row_t read_cols(void)
 {
   return
diff --git a/keyboards/bpiphany/tiger_lily/matrix.c b/keyboards/bpiphany/tiger_lily/matrix.c
index 47a92268c8..abf6f3f42b 100644
--- a/keyboards/bpiphany/tiger_lily/matrix.c
+++ b/keyboards/bpiphany/tiger_lily/matrix.c
@@ -146,10 +146,3 @@ void matrix_print(void) {
     }
 	#endif
 }
-
-uint8_t matrix_key_count(void) {
-    uint8_t count = 0;
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++)
-        count += bitpop32(matrix[row]);
-    return count;
-}
diff --git a/keyboards/bpiphany/unloved_bastard/matrix.c b/keyboards/bpiphany/unloved_bastard/matrix.c
index 328d9015c2..98cdf22f48 100644
--- a/keyboards/bpiphany/unloved_bastard/matrix.c
+++ b/keyboards/bpiphany/unloved_bastard/matrix.c
@@ -147,10 +147,3 @@ void matrix_print(void) {
     }
 #endif
 }
-
-uint8_t matrix_key_count(void) {
-    uint8_t count = 0;
-    for (uint8_t row = 0; row < MATRIX_ROWS; row++)
-        count += bitpop32(matrix[row]);
-    return count;
-}
diff --git a/keyboards/converter/ibm_terminal/matrix.c b/keyboards/converter/ibm_terminal/matrix.c
index caa0a38051..3d6736a0cc 100644
--- a/keyboards/converter/ibm_terminal/matrix.c
+++ b/keyboards/converter/ibm_terminal/matrix.c
@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
 #define print_matrix_header()  print("\nr/c 01234567\n")
-#define matrix_bitpop(i)       bitpop(matrix[i])
 #define ROW_SHIFTER ((uint8_t)1)
 
 
diff --git a/keyboards/converter/palm_usb/matrix.c b/keyboards/converter/palm_usb/matrix.c
index 010fd56c79..28d4b87d83 100644
--- a/keyboards/converter/palm_usb/matrix.c
+++ b/keyboards/converter/palm_usb/matrix.c
@@ -379,12 +379,3 @@ void matrix_print(void)
         print("\n");
     }
 }
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop(matrix[i]);
-    }
-    return count;
-}
diff --git a/keyboards/converter/sun_usb/matrix.c b/keyboards/converter/sun_usb/matrix.c
index e28d165d52..35ec391024 100644
--- a/keyboards/converter/sun_usb/matrix.c
+++ b/keyboards/converter/sun_usb/matrix.c
@@ -179,12 +179,3 @@ void matrix_print(void)
         print("\n");
     }
 }
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop(matrix[i]);
-    }
-    return count;
-}
diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp
index 265fb2c68d..00b5bc5053 100644
--- a/keyboards/converter/usb_usb/custom_matrix.cpp
+++ b/keyboards/converter/usb_usb/custom_matrix.cpp
@@ -225,18 +225,6 @@ extern "C"
         return row_bits;
     }
 
-    uint8_t matrix_key_count(void) {
-        uint8_t count = 0;
-
-        count += bitpop(local_keyboard_report.mods);
-        for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
-            if (IS_ANY(local_keyboard_report.keys[i])) {
-                count++;
-            }
-        }
-        return count;
-    }
-
     void matrix_print(void) {
         print("\nr/c 0123456789ABCDEF\n");
         for (uint8_t row = 0; row < matrix_rows(); row++) {
diff --git a/keyboards/dc01/arrow/matrix.c b/keyboards/dc01/arrow/matrix.c
index b69e147914..e7c3bec2b5 100644
--- a/keyboards/dc01/arrow/matrix.c
+++ b/keyboards/dc01/arrow/matrix.c
@@ -48,17 +48,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -234,17 +231,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
-
-
 #if (DIODE_DIRECTION == COL2ROW)
 
 static void init_cols(void)
@@ -388,4 +374,4 @@ static void unselect_cols(void)
 void matrix_setup(void){
     i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
     sei(); //enable interupts
-}
\ No newline at end of file
+}
diff --git a/keyboards/dc01/left/matrix.c b/keyboards/dc01/left/matrix.c
index 3eeb2586bc..8b8f89a081 100644
--- a/keyboards/dc01/left/matrix.c
+++ b/keyboards/dc01/left/matrix.c
@@ -52,17 +52,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -259,17 +256,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
-
-
 #if (DIODE_DIRECTION == COL2ROW)
 
 static void init_cols(void)
diff --git a/keyboards/dc01/numpad/matrix.c b/keyboards/dc01/numpad/matrix.c
index e8e2a1b14a..1dc90a6b84 100644
--- a/keyboards/dc01/numpad/matrix.c
+++ b/keyboards/dc01/numpad/matrix.c
@@ -48,17 +48,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -234,17 +231,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
-
-
 #if (DIODE_DIRECTION == COL2ROW)
 
 static void init_cols(void)
@@ -388,4 +374,4 @@ static void unselect_cols(void)
 void matrix_setup(void){
     i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
     sei(); //enable interupts
-}
\ No newline at end of file
+}
diff --git a/keyboards/dc01/right/matrix.c b/keyboards/dc01/right/matrix.c
index 2509bd7d4c..f21dec1d2b 100644
--- a/keyboards/dc01/right/matrix.c
+++ b/keyboards/dc01/right/matrix.c
@@ -49,17 +49,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -235,17 +232,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
-
-
 #if (DIODE_DIRECTION == COL2ROW)
 
 static void init_cols(void)
@@ -389,4 +375,4 @@ static void unselect_cols(void)
 void matrix_setup(void){
     i2c_slave_init(SLAVE_I2C_ADDRESS); //setup address of slave i2c
     sei(); //enable interupts
-}
\ No newline at end of file
+}
diff --git a/keyboards/dichotomy/matrix.c b/keyboards/dichotomy/matrix.c
index 806b66d498..dc90e7501e 100755
--- a/keyboards/dichotomy/matrix.c
+++ b/keyboards/dichotomy/matrix.c
@@ -34,17 +34,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -215,12 +212,3 @@ void matrix_print(void)
         print("\n");
     }
 }
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
diff --git a/keyboards/duck/jetfire/matrix.c b/keyboards/duck/jetfire/matrix.c
index 729fa6dd14..2b64885842 100644
--- a/keyboards/duck/jetfire/matrix.c
+++ b/keyboards/duck/jetfire/matrix.c
@@ -136,15 +136,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop32(matrix[i]);
-    }
-    return count;
-}
-
 static void init_ports(void)
 {
     // Rows are inputs (inputs are 0)
@@ -268,4 +259,4 @@ static void select_col(uint8_t col)
             PORTB |= 0b00000001;
             break;
     }
-}
\ No newline at end of file
+}
diff --git a/keyboards/gboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
index 16300a7e4f..7e5d675218 100644
--- a/keyboards/gboards/ergotaco/matrix.c
+++ b/keyboards/gboards/ergotaco/matrix.c
@@ -221,15 +221,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 // Remember this means ROWS
 static void  init_cols(void)
 {
diff --git a/keyboards/gboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c
index 7d635ad8d7..24bb2d7acf 100644
--- a/keyboards/gboards/georgi/matrix.c
+++ b/keyboards/gboards/georgi/matrix.c
@@ -242,15 +242,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 // Remember this means ROWS
 static void  init_cols(void)
 {
diff --git a/keyboards/gboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c
index 443e97132b..3898246e30 100644
--- a/keyboards/gboards/gergo/matrix.c
+++ b/keyboards/gboards/gergo/matrix.c
@@ -286,14 +286,6 @@ void matrix_print(void) {
     }
 }
 
-uint8_t matrix_key_count(void) {
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 // Remember this means ROWS
 static void  init_cols(void) {
     // init on mcp23018
diff --git a/keyboards/gboards/gergoplex/matrix.c b/keyboards/gboards/gergoplex/matrix.c
index a075b85725..d5b046fe40 100644
--- a/keyboards/gboards/gergoplex/matrix.c
+++ b/keyboards/gboards/gergoplex/matrix.c
@@ -164,13 +164,6 @@ void matrix_print(void) {
         print("\n");
     }
 }
-uint8_t matrix_key_count(void) {
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
 
 // Remember this means ROWS
 static void init_cols(void) {
diff --git a/keyboards/handwired/dactyl/matrix.c b/keyboards/handwired/dactyl/matrix.c
index a70e8c5aca..5869b43c1b 100644
--- a/keyboards/handwired/dactyl/matrix.c
+++ b/keyboards/handwired/dactyl/matrix.c
@@ -307,15 +307,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 #if (DIODE_DIRECTION == COL2ROW)
 
 static void init_cols(void) {
diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c
index a043f78538..6dec9c6a74 100644
--- a/keyboards/handwired/frenchdev/matrix.c
+++ b/keyboards/handwired/frenchdev/matrix.c
@@ -196,15 +196,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 /* Column pin configuration
  *
  * Teensy
diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c
index 211273d1fa..3b68c08b45 100644
--- a/keyboards/handwired/owlet60/matrix.c
+++ b/keyboards/handwired/owlet60/matrix.c
@@ -33,17 +33,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -130,15 +127,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
 // uses standard row code
 static void select_row(uint8_t row)
 {
diff --git a/keyboards/handwired/promethium/matrix.c b/keyboards/handwired/promethium/matrix.c
index 90dbce14a9..3b03ab8893 100644
--- a/keyboards/handwired/promethium/matrix.c
+++ b/keyboards/handwired/promethium/matrix.c
@@ -43,17 +43,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -178,16 +175,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
-
 #define ROW_MASK 0b11100000
 
 static const uint8_t row_bit[MATRIX_ROWS] = {
diff --git a/keyboards/handwired/pterodactyl/matrix.c b/keyboards/handwired/pterodactyl/matrix.c
index d0f74802a0..9d81a64bb4 100644
--- a/keyboards/handwired/pterodactyl/matrix.c
+++ b/keyboards/handwired/pterodactyl/matrix.c
@@ -308,15 +308,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 #if (DIODE_DIRECTION == COL2ROW)
 
 static void init_cols(void) {
diff --git a/keyboards/helix/rev2/custom/matrix.c b/keyboards/helix/rev2/custom/matrix.c
index 699c15358b..5221d7fd4e 100644
--- a/keyboards/helix/rev2/custom/matrix.c
+++ b/keyboards/helix/rev2/custom/matrix.c
@@ -309,15 +309,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 static void  init_cols(void)
 {
     for(int x = 0; x < MATRIX_COLS; x++) {
diff --git a/keyboards/hhkb/ansi/matrix.c b/keyboards/hhkb/ansi/matrix.c
index 5dde74cce9..8b0e4606bc 100644
--- a/keyboards/hhkb/ansi/matrix.c
+++ b/keyboards/hhkb/ansi/matrix.c
@@ -189,14 +189,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void) {
-    uint8_t count = 0;
-    for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) {
-        count += bitpop16(matrix_get_row(r));
-    }
-    return count;
-}
-
 void matrix_power_up(void) {
     KEY_POWER_ON();
 }
diff --git a/keyboards/hhkb/jp/matrix.c b/keyboards/hhkb/jp/matrix.c
index 81db77fca7..9d04d62849 100644
--- a/keyboards/hhkb/jp/matrix.c
+++ b/keyboards/hhkb/jp/matrix.c
@@ -190,14 +190,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void) {
-    uint8_t count = 0;
-    for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) {
-        count += bitpop16(matrix_get_row(r));
-    }
-    return count;
-}
-
 void matrix_power_up(void) {
     KEY_POWER_ON();
 }
diff --git a/keyboards/honeycomb/matrix.c b/keyboards/honeycomb/matrix.c
index fe1e4ce8ff..9a87ca9a2e 100755
--- a/keyboards/honeycomb/matrix.c
+++ b/keyboards/honeycomb/matrix.c
@@ -35,17 +35,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 # define print_matrix_header()  print("\nr/c 01234567\n")
 # define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-# define matrix_bitpop(i)       bitpop(matrix[i])
 # define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 # define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 # define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-# define matrix_bitpop(i)       bitpop16(matrix[i])
 # define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 # define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 # define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-# define matrix_bitpop(i)       bitpop32(matrix[i])
 # define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -191,12 +188,3 @@ void matrix_print(void)
         print("\n");
     }
 }
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
diff --git a/keyboards/hotdox/matrix.c b/keyboards/hotdox/matrix.c
index 5d0b0f6dd5..0da5a3e3a2 100644
--- a/keyboards/hotdox/matrix.c
+++ b/keyboards/hotdox/matrix.c
@@ -160,15 +160,6 @@ void matrix_print(void)
   }
 }
 
-uint8_t matrix_key_count(void)
-{
-  uint8_t count = 0;
-  for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-    count += bitpop16(matrix[i]);
-  }
-  return count;
-}
-
 static void init_cols(void)
 {
   // Pro Micro
diff --git a/keyboards/kakunpc/angel64/alpha/matrix.c b/keyboards/kakunpc/angel64/alpha/matrix.c
index 2851859cf2..8ca9841e48 100644
--- a/keyboards/kakunpc/angel64/alpha/matrix.c
+++ b/keyboards/kakunpc/angel64/alpha/matrix.c
@@ -27,17 +27,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -119,15 +116,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
 static void select_row(uint8_t row)
 {
     setPinOutput(row_pins[row]);
diff --git a/keyboards/kakunpc/angel64/rev1/matrix.c b/keyboards/kakunpc/angel64/rev1/matrix.c
index 2851859cf2..8ca9841e48 100644
--- a/keyboards/kakunpc/angel64/rev1/matrix.c
+++ b/keyboards/kakunpc/angel64/rev1/matrix.c
@@ -27,17 +27,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -119,15 +116,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
 static void select_row(uint8_t row)
 {
     setPinOutput(row_pins[row]);
diff --git a/keyboards/kakunpc/thedogkeyboard/matrix.c b/keyboards/kakunpc/thedogkeyboard/matrix.c
index 2851859cf2..8ca9841e48 100644
--- a/keyboards/kakunpc/thedogkeyboard/matrix.c
+++ b/keyboards/kakunpc/thedogkeyboard/matrix.c
@@ -27,17 +27,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -119,15 +116,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
 static void select_row(uint8_t row)
 {
     setPinOutput(row_pins[row]);
diff --git a/keyboards/kinesis/alvicstep/matrix.c b/keyboards/kinesis/alvicstep/matrix.c
index 9c05374510..5636418849 100644
--- a/keyboards/kinesis/alvicstep/matrix.c
+++ b/keyboards/kinesis/alvicstep/matrix.c
@@ -158,15 +158,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 static matrix_row_t read_row(uint8_t row)
 {
 	_delay_us(30);  // without this wait read unstable value.
diff --git a/keyboards/kmac/matrix.c b/keyboards/kmac/matrix.c
index 3d5a3081d1..2052a9be71 100644
--- a/keyboards/kmac/matrix.c
+++ b/keyboards/kmac/matrix.c
@@ -27,17 +27,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header() print("\nr/c 01234567\n")
 #    define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i) bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i) bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i) bitpop32(matrix[i])
 #    define ROW_SHIFTER ((uint32_t)1)
 #endif
 
@@ -79,14 +76,6 @@ void matrix_print(void) {
     }
 }
 
-uint8_t matrix_key_count(void) {
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
 /* Columns 0 - 15
  * These columns uses two 74HC237D 3 to 8 bit demultiplexers.
  * col / pin:    PB6  PC6  PC7  PF1  PF0
diff --git a/keyboards/kmini/matrix.c b/keyboards/kmini/matrix.c
index eee19054ea..f3e60eb869 100755
--- a/keyboards/kmini/matrix.c
+++ b/keyboards/kmini/matrix.c
@@ -132,15 +132,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop32(matrix[i]);
-    }
-    return count;
-}
-
 static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
 {
     bool matrix_changed = false;
diff --git a/keyboards/ktec/ergodone/matrix.c b/keyboards/ktec/ergodone/matrix.c
index 3973ff3484..529974532a 100644
--- a/keyboards/ktec/ergodone/matrix.c
+++ b/keyboards/ktec/ergodone/matrix.c
@@ -158,15 +158,6 @@ void matrix_print(void)
   }
 }
 
-uint8_t matrix_key_count(void)
-{
-  uint8_t count = 0;
-  for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-    count += bitpop16(matrix[i]);
-  }
-  return count;
-}
-
 /* Column pin configuration
  *
  * Pro Micro: 6    5    4    3    2    1    0
diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c
index 0615b60ad3..977338b2f6 100644
--- a/keyboards/moon/matrix.c
+++ b/keyboards/moon/matrix.c
@@ -76,17 +76,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #  define print_matrix_header() print("\nr/c 01234567\n")
 #  define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
-#  define matrix_bitpop(i) bitpop(matrix[i])
 #  define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #  define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
 #  define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
-#  define matrix_bitpop(i) bitpop16(matrix[i])
 #  define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #  define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #  define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
-#  define matrix_bitpop(i) bitpop32(matrix[i])
 #  define ROW_SHIFTER ((uint32_t)1)
 #endif
 
@@ -125,14 +122,6 @@ void matrix_print(void) {
   }
 }
 
-uint8_t matrix_key_count(void) {
-  uint8_t count = 0;
-  for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-    count += matrix_bitpop(i);
-  }
-  return count;
-}
-
 static void init_i2c(void) {
   pca9555_init(IC1);
   pca9555_init(IC2);
diff --git a/keyboards/nek_type_a/matrix.c b/keyboards/nek_type_a/matrix.c
index b396be9911..2989af5108 100644
--- a/keyboards/nek_type_a/matrix.c
+++ b/keyboards/nek_type_a/matrix.c
@@ -50,17 +50,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -234,17 +231,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
-
-
 #if (DIODE_DIRECTION == COL2ROW)
 
 static void init_cols(void)
diff --git a/keyboards/redscarf_iiplus/verb/matrix.c b/keyboards/redscarf_iiplus/verb/matrix.c
index 88ecb586b3..930d246434 100755
--- a/keyboards/redscarf_iiplus/verb/matrix.c
+++ b/keyboards/redscarf_iiplus/verb/matrix.c
@@ -27,17 +27,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -123,16 +120,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
-
 #ifdef DIRECT_PINS
 
 static void init_pins(void) {
diff --git a/keyboards/redscarf_iiplus/verc/matrix.c b/keyboards/redscarf_iiplus/verc/matrix.c
index 88ecb586b3..930d246434 100755
--- a/keyboards/redscarf_iiplus/verc/matrix.c
+++ b/keyboards/redscarf_iiplus/verc/matrix.c
@@ -27,17 +27,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -123,16 +120,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
-
 #ifdef DIRECT_PINS
 
 static void init_pins(void) {
diff --git a/keyboards/redscarf_iiplus/verd/matrix.c b/keyboards/redscarf_iiplus/verd/matrix.c
index d9dbb3c0a3..b703932229 100644
--- a/keyboards/redscarf_iiplus/verd/matrix.c
+++ b/keyboards/redscarf_iiplus/verd/matrix.c
@@ -27,17 +27,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -123,16 +120,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
-
 #ifdef DIRECT_PINS
 
 static void init_pins(void) {
diff --git a/keyboards/sirius/unigo66/custom_matrix.cpp b/keyboards/sirius/unigo66/custom_matrix.cpp
index 955ce189a8..72e120400f 100644
--- a/keyboards/sirius/unigo66/custom_matrix.cpp
+++ b/keyboards/sirius/unigo66/custom_matrix.cpp
@@ -205,18 +205,6 @@ extern "C"
         return row_bits;
     }
 
-    uint8_t matrix_key_count(void) {
-        uint8_t count = 0;
-
-        count += bitpop(local_keyboard_report.mods);
-        for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
-            if (IS_ANY(local_keyboard_report.keys[i])) {
-                count++;
-            }
-        }
-        return count;
-    }
-
     void matrix_print(void) {
         print("\nr/c 0123456789ABCDEF\n");
         for (uint8_t row = 0; row < matrix_rows(); row++) {
diff --git a/keyboards/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c
index a6b28f3a12..36ae05fb42 100644
--- a/keyboards/sixkeyboard/matrix.c
+++ b/keyboards/sixkeyboard/matrix.c
@@ -129,13 +129,3 @@ matrix_row_t matrix_get_row(uint8_t row)
 void matrix_print(void)
 {
 }
-
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
diff --git a/keyboards/sx60/matrix.c b/keyboards/sx60/matrix.c
index 231e1c8836..94d581f574 100644
--- a/keyboards/sx60/matrix.c
+++ b/keyboards/sx60/matrix.c
@@ -42,17 +42,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -201,15 +198,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
 static void init_cols(void)
 {
     for(uint8_t x = 0; x < ATMEGA_COLS; x++) {
diff --git a/keyboards/woodkeys/meira/matrix.c b/keyboards/woodkeys/meira/matrix.c
index 8e8e9485b4..4fdc354237 100644
--- a/keyboards/woodkeys/meira/matrix.c
+++ b/keyboards/woodkeys/meira/matrix.c
@@ -45,17 +45,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header()  print("\nr/c 01234567\n")
 #    define print_matrix_row(row)  print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop(matrix[i])
 #    define ROW_SHIFTER ((uint8_t)1)
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop16(matrix[i])
 #    define ROW_SHIFTER ((uint16_t)1)
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header()  print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row)  print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(i)       bitpop32(matrix[i])
 #    define ROW_SHIFTER  ((uint32_t)1)
 #endif
 
@@ -183,16 +180,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
-
 static void init_rows(void)
 {
     for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
diff --git a/keyboards/ymdk/sp64/matrix.c b/keyboards/ymdk/sp64/matrix.c
index 9a6e37bcdc..69276c7b3c 100644
--- a/keyboards/ymdk/sp64/matrix.c
+++ b/keyboards/ymdk/sp64/matrix.c
@@ -154,15 +154,6 @@ void matrix_print(void)
   }
 }
 
-uint8_t matrix_key_count(void)
-{
-  uint8_t count = 0;
-  for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-    count += bitpop16(matrix[i]);
-  }
-  return count;
-}
-
 static void matrix_select_row(uint8_t row)
 {
 #ifdef RIGHT_HALF
diff --git a/keyboards/yosino58/rev1/matrix.c b/keyboards/yosino58/rev1/matrix.c
index e2be7113bf..802ce00cc6 100644
--- a/keyboards/yosino58/rev1/matrix.c
+++ b/keyboards/yosino58/rev1/matrix.c
@@ -311,15 +311,6 @@ void matrix_print(void)
     }
 }
 
-uint8_t matrix_key_count(void)
-{
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += bitpop16(matrix[i]);
-    }
-    return count;
-}
-
 static void  init_cols(void)
 {
     for(int x = 0; x < MATRIX_COLS; x++) {
diff --git a/quantum/matrix_common.c b/quantum/matrix_common.c
index 1497ceae71..2cf8484347 100644
--- a/quantum/matrix_common.c
+++ b/quantum/matrix_common.c
@@ -72,15 +72,12 @@ inline matrix_row_t matrix_get_row(uint8_t row) {
 #if (MATRIX_COLS <= 8)
 #    define print_matrix_header() print("\nr/c 01234567\n")
 #    define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
-#    define matrix_bitpop(row) bitpop(matrix_get_row(row))
 #elif (MATRIX_COLS <= 16)
 #    define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
 #    define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
-#    define matrix_bitpop(row) bitpop16(matrix_get_row(row))
 #elif (MATRIX_COLS <= 32)
 #    define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
 #    define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
-#    define matrix_bitpop(row) bitpop32(matrix_get_row(row))
 #endif
 
 void matrix_print(void) {
@@ -94,14 +91,6 @@ void matrix_print(void) {
     }
 }
 
-uint8_t matrix_key_count(void) {
-    uint8_t count = 0;
-    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
-        count += matrix_bitpop(i);
-    }
-    return count;
-}
-
 #ifdef SPLIT_KEYBOARD
 bool matrix_post_scan(void) {
     bool changed = false;

From 265b96a12ca1580e0cb8c3b5bac3687f005e4f30 Mon Sep 17 00:00:00 2001
From: makenova <makenova@users.noreply.github.com>
Date: Thu, 10 Mar 2022 12:10:05 -0700
Subject: [PATCH 791/867] [Keyboard] Add omega4 (#16464)

---
 keyboards/makenova/omega/omega4/config.h      | 26 ++++++++
 keyboards/makenova/omega/omega4/info.json     | 37 +++++++++++
 .../omega/omega4/keymaps/default/config.h     | 12 ++++
 .../omega/omega4/keymaps/default/keymap.c     | 64 ++++++++++++++++++
 .../omega/omega4/keymaps/default/readme.md    |  1 +
 .../omega/omega4/keymaps/default/rules.mk     |  1 +
 .../omega4/keymaps/default_10u_bar/config.h   | 12 ++++
 .../omega4/keymaps/default_10u_bar/keymap.c   | 65 +++++++++++++++++++
 .../omega4/keymaps/default_10u_bar/readme.md  |  1 +
 .../omega4/keymaps/default_10u_bar/rules.mk   |  1 +
 .../omega4/keymaps/default_6u_bar/config.h    | 12 ++++
 .../omega4/keymaps/default_6u_bar/keymap.c    | 64 ++++++++++++++++++
 .../omega4/keymaps/default_6u_bar/readme.md   |  1 +
 .../omega4/keymaps/default_6u_bar/rules.mk    |  1 +
 keyboards/makenova/omega/omega4/omega4.c      |  4 ++
 keyboards/makenova/omega/omega4/omega4.h      | 51 +++++++++++++++
 keyboards/makenova/omega/omega4/readme.md     | 23 +++++++
 keyboards/makenova/omega/omega4/rules.mk      | 18 +++++
 18 files changed, 394 insertions(+)
 create mode 100644 keyboards/makenova/omega/omega4/config.h
 create mode 100644 keyboards/makenova/omega/omega4/info.json
 create mode 100644 keyboards/makenova/omega/omega4/keymaps/default/config.h
 create mode 100644 keyboards/makenova/omega/omega4/keymaps/default/keymap.c
 create mode 100644 keyboards/makenova/omega/omega4/keymaps/default/readme.md
 create mode 100644 keyboards/makenova/omega/omega4/keymaps/default/rules.mk
 create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
 create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c
 create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_10u_bar/readme.md
 create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_10u_bar/rules.mk
 create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
 create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c
 create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_6u_bar/readme.md
 create mode 100644 keyboards/makenova/omega/omega4/keymaps/default_6u_bar/rules.mk
 create mode 100644 keyboards/makenova/omega/omega4/omega4.c
 create mode 100644 keyboards/makenova/omega/omega4/omega4.h
 create mode 100644 keyboards/makenova/omega/omega4/readme.md
 create mode 100644 keyboards/makenova/omega/omega4/rules.mk

diff --git a/keyboards/makenova/omega/omega4/config.h b/keyboards/makenova/omega/omega4/config.h
new file mode 100644
index 0000000000..acd482324d
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/config.h
@@ -0,0 +1,26 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/makenova/omega/omega4/info.json b/keyboards/makenova/omega/omega4/info.json
new file mode 100644
index 0000000000..5e9bf22595
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/info.json
@@ -0,0 +1,37 @@
+{
+    "manufacturer": "makenova",
+    "keyboard_name": "omega4",
+    "maintainer": "makenova",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D4", "F4", "B5", "F5", "F6", "B6", "B2", "B3", "B1", "F7"],
+        "rows": ["C6", "D7", "E6", "B4"]
+    },
+    "processor": "atmega32u4",
+    "url": "https://github.com/makenova/omega",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x0000",
+        "vid": "0xFEED"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"A", "x":0.25, "y":1}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":":", "x":9.25, "y":1}, {"label":"Z", "x":0.5, "y":2}, {"label":"X", "x":1.5, "y":2}, {"label":"C", "x":2.5, "y":2}, {"label":"V", "x":3.5, "y":2}, {"label":"", "x":4.5, "y":2}, {"label":"", "x":5.5, "y":2}, {"label":"B", "x":6.5, "y":2}, {"label":"N", "x":7.5, "y":2}, {"label":"M", "x":8.5, "y":2}, {"label":"<", "x":9.5, "y":2}, {"label":"", "x":0.75, "y":3}, {"label":"", "x":1.75, "y":3}, {"label":"Space", "x":2.75, "y":3, "w":6}, {"label":"", "x":8.75, "y":3}, {"label":"", "x":9.75, "y":3}]
+        },
+        "LAYOUT_6u_bar": {
+            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"A", "x":0.25, "y":1}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":":", "x":9.25, "y":1}, {"label":"Z", "x":0.5, "y":2}, {"label":"X", "x":1.5, "y":2}, {"label":"C", "x":2.5, "y":2}, {"label":"V", "x":3.5, "y":2}, {"label":"", "x":4.5, "y":2}, {"label":"", "x":5.5, "y":2}, {"label":"B", "x":6.5, "y":2}, {"label":"N", "x":7.5, "y":2}, {"label":"M", "x":8.5, "y":2}, {"label":"<", "x":9.5, "y":2}, {"label":"", "x":0.75, "y":3}, {"label":"Space", "x":1.75, "y":3, "w":8}, {"label":"", "x":9.75, "y":3}]
+        },
+        "LAYOUT_10u_bar": {
+            "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0}, {"label":"A", "x":0.25, "y":1}, {"label":"S", "x":1.25, "y":1}, {"label":"D", "x":2.25, "y":1}, {"label":"F", "x":3.25, "y":1}, {"label":"G", "x":4.25, "y":1}, {"label":"H", "x":5.25, "y":1}, {"label":"J", "x":6.25, "y":1}, {"label":"K", "x":7.25, "y":1}, {"label":"L", "x":8.25, "y":1}, {"label":":", "x":9.25, "y":1}, {"label":"Z", "x":0.5, "y":2}, {"label":"X", "x":1.5, "y":2}, {"label":"C", "x":2.5, "y":2}, {"label":"V", "x":3.5, "y":2}, {"label":"", "x":4.5, "y":2}, {"label":"", "x":5.5, "y":2}, {"label":"B", "x":6.5, "y":2}, {"label":"N", "x":7.5, "y":2}, {"label":"M", "x":8.5, "y":2}, {"label":"<", "x":9.5, "y":2}, {"label":"Space", "x":0.75, "y":3, "w":10}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/config.h b/keyboards/makenova/omega/omega4/keymaps/default/config.h
new file mode 100644
index 0000000000..1d2dd05351
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default/config.h
@@ -0,0 +1,12 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 4
+#    define COMBO_TERM 50
+#endif
+
+#define TAPPING_TERM 150
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default/keymap.c
new file mode 100644
index 0000000000..26c5ada806
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default/keymap.c
@@ -0,0 +1,64 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// ctrl
+#define CTRL_S LCTL_T(KC_S)
+#define CTRL_L RCTL_T(KC_L)
+// alt
+#define ALT_D LALT_T(KC_D)
+#define ALT_K RALT_T(KC_K)
+//gui
+#define GUI_F LGUI_T(KC_F)
+#define GUI_J RGUI_T(KC_J)
+// shift
+#define SFT_A LSFT_T(KC_A)
+#define SFT_SCLN RSFT_T(KC_SCLN)
+// layers
+#define OS_SFT OSM(MOD_RSFT)
+#define OS_3 OSL(3)
+#define OS_4 OSL(4)
+#define LT1_SPC LT(1,KC_SPC)
+#define LT2_ESC LT(2,KC_ESC)
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_bspc[] = {GUI_J, ALT_K,   COMBO_END};
+const uint16_t PROGMEM combo_ent[]  = {ALT_D, GUI_F,   COMBO_END};
+const uint16_t PROGMEM combo_tab[]  = {KC_C,  KC_V,    COMBO_END};
+const uint16_t PROGMEM combo_del[]  = {KC_M,  KC_COMM, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  COMBO(combo_bspc,KC_BSPC), // 1
+  COMBO(combo_ent,KC_ENT), // 2
+  COMBO(combo_tab,KC_TAB), // 3
+  COMBO(combo_del,KC_DEL), // 4
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT(
+    KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,  KC_Y, KC_U,  KC_I,    KC_O,   KC_P,
+    SFT_A,   CTRL_S,  ALT_D,   GUI_F, KC_G,  KC_H, GUI_J, ALT_K,   CTRL_L, SFT_SCLN,
+    KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,  KC_N, KC_M,  KC_COMM, KC_DOT, KC_SLSH,
+    OS_4,    LT2_ESC, LT1_SPC, OS_3,  OS_SFT
+    ),
+    LAYOUT(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_QUOT,
+    KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_MINS, KC_EQL,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    LAYOUT(
+    KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_DQUO,
+    KC_TILDE, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, KC_UNDS, KC_PLUS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    LAYOUT(
+    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_TRNS,  KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU,  KC_TRNS,
+    RESET,   KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/readme.md b/keyboards/makenova/omega/omega4/keymaps/default/readme.md
new file mode 100644
index 0000000000..9e5e5aeb1e
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for omega4
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/rules.mk b/keyboards/makenova/omega/omega4/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
new file mode 100644
index 0000000000..1d2dd05351
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
@@ -0,0 +1,12 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 4
+#    define COMBO_TERM 50
+#endif
+
+#define TAPPING_TERM 150
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c
new file mode 100644
index 0000000000..b60275d3ab
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/keymap.c
@@ -0,0 +1,65 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// ctrl
+#define CTRL_S LCTL_T(KC_S)
+#define CTRL_L RCTL_T(KC_L)
+// alt
+#define ALT_D LALT_T(KC_D)
+#define ALT_K RALT_T(KC_K)
+//gui
+#define GUI_F LGUI_T(KC_F)
+#define GUI_J RGUI_T(KC_J)
+// shift
+#define SFT_A LSFT_T(KC_A)
+#define SFT_SCLN RSFT_T(KC_SCLN)
+// layers
+#define OS_SFT OSM(MOD_RSFT)
+#define OS_3 OSL(3)
+#define OS_4 OSL(4)
+#define LT1_SPC LT(1,KC_SPC)
+#define LT2_Z LT(2,KC_Z)
+#define LT3_SLSH LT(3,KC_SLSH)
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_bspc[] = {GUI_J, ALT_K,   COMBO_END};
+const uint16_t PROGMEM combo_ent[]  = {ALT_D, GUI_F,   COMBO_END};
+const uint16_t PROGMEM combo_tab[]  = {KC_C,  KC_V,    COMBO_END};
+const uint16_t PROGMEM combo_del[]  = {KC_M,  KC_COMM, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  COMBO(combo_bspc,KC_BSPC), // 1
+  COMBO(combo_ent,KC_ENT), // 2
+  COMBO(combo_tab,KC_TAB), // 3
+  COMBO(combo_del,KC_DEL), // 4
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT_10u_bar(
+    KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,  KC_Y, KC_U,  KC_I,    KC_O,   KC_P,
+    SFT_A,   CTRL_S,  ALT_D,   GUI_F, KC_G,  KC_H, GUI_J, ALT_K,   CTRL_L, SFT_SCLN,
+    LT2_Z,   KC_X,    KC_C,    KC_V,  KC_B,  KC_N, KC_M,  KC_COMM, KC_DOT, LT3_SLSH,
+    LT1_SPC
+    ),
+    LAYOUT_10u_bar(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_QUOT,
+    KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_MINS, KC_EQL,   KC_TRNS,
+    KC_TRNS
+    ),
+    LAYOUT_10u_bar(
+    KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_DQUO,
+    KC_TRNS,  KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, KC_UNDS, KC_PLUS, KC_TILDE,
+    KC_TRNS
+    ),
+    LAYOUT_10u_bar(
+    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_TRNS,  KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU,  KC_TRNS,
+    RESET
+    )
+};
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/readme.md b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/readme.md
new file mode 100644
index 0000000000..3089385415
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/readme.md
@@ -0,0 +1 @@
+# The default keymap for 10u spacebar omega4
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/rules.mk b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
new file mode 100644
index 0000000000..1d2dd05351
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
@@ -0,0 +1,12 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 4
+#    define COMBO_TERM 50
+#endif
+
+#define TAPPING_TERM 150
+#define IGNORE_MOD_TAP_INTERRUPT
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c
new file mode 100644
index 0000000000..477582613c
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/keymap.c
@@ -0,0 +1,64 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// ctrl
+#define CTRL_S LCTL_T(KC_S)
+#define CTRL_L RCTL_T(KC_L)
+// alt
+#define ALT_D LALT_T(KC_D)
+#define ALT_K RALT_T(KC_K)
+//gui
+#define GUI_F LGUI_T(KC_F)
+#define GUI_J RGUI_T(KC_J)
+// shift
+#define SFT_A LSFT_T(KC_A)
+#define SFT_SCLN RSFT_T(KC_SCLN)
+// layers
+#define OS_SFT OSM(MOD_RSFT)
+#define OS_3 OSL(3)
+#define OS_4 OSL(4)
+#define LT1_SPC LT(1,KC_SPC)
+#define LT2_ESC LT(2,KC_ESC)
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_bspc[] = {GUI_J, ALT_K,   COMBO_END};
+const uint16_t PROGMEM combo_ent[]  = {ALT_D, GUI_F,   COMBO_END};
+const uint16_t PROGMEM combo_tab[]  = {KC_C,  KC_V,    COMBO_END};
+const uint16_t PROGMEM combo_del[]  = {KC_M,  KC_COMM, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  COMBO(combo_bspc,KC_BSPC), // 1
+  COMBO(combo_ent,KC_ENT), // 2
+  COMBO(combo_tab,KC_TAB), // 3
+  COMBO(combo_del,KC_DEL), // 4
+};
+#endif
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT_6u_bar(
+    KC_Q,    KC_W,    KC_E,    KC_R,  KC_T,  KC_Y, KC_U,  KC_I,    KC_O,   KC_P,
+    SFT_A,   CTRL_S,  ALT_D,   GUI_F, KC_G,  KC_H, GUI_J, ALT_K,   CTRL_L, SFT_SCLN,
+    KC_Z,    KC_X,    KC_C,    KC_V,  KC_B,  KC_N, KC_M,  KC_COMM, KC_DOT, KC_SLSH,
+    LT2_ESC, LT1_SPC, OS_3
+    ),
+    LAYOUT_6u_bar(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_QUOT,
+    KC_TRNS, KC_LBRC, KC_RBRC, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_MINS, KC_EQL,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    LAYOUT_6u_bar(
+    KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+    KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_DQUO,
+    KC_TILDE, KC_LCBR, KC_RCBR, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, KC_UNDS, KC_PLUS,  KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS
+    ),
+    LAYOUT_6u_bar(
+    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_TRNS,  KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU,  KC_TRNS,
+    RESET,   KC_TRNS, KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/readme.md b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/readme.md
new file mode 100644
index 0000000000..31f6b4c019
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/readme.md
@@ -0,0 +1 @@
+# The default keymap for 6u spacebar omega4
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/rules.mk b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/makenova/omega/omega4/omega4.c b/keyboards/makenova/omega/omega4/omega4.c
new file mode 100644
index 0000000000..b64ae638bd
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/omega4.c
@@ -0,0 +1,4 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "omega4.h"
diff --git a/keyboards/makenova/omega/omega4/omega4.h b/keyboards/makenova/omega/omega4/omega4.h
new file mode 100644
index 0000000000..754b58ee35
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/omega4.h
@@ -0,0 +1,51 @@
+// Copyright 2022 makenova (@makenova)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT( \
+    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,                K35,           K38, K39 \
+){ \
+    { 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, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, K38, K39 } \
+}
+
+#define LAYOUT_6u_bar( \
+    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,                     K35,                K39 \
+){ \
+    { 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, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, KC_NO, K39 } \
+}
+
+#define LAYOUT_10u_bar( \
+    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, \
+                             K35                      \
+){ \
+    { 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 }, \
+    { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, KC_NO, KC_NO } \
+}
diff --git a/keyboards/makenova/omega/omega4/readme.md b/keyboards/makenova/omega/omega4/readme.md
new file mode 100644
index 0000000000..0b4db785d5
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/readme.md
@@ -0,0 +1,23 @@
+# omega4
+
+![omega4](https://i.imgur.com/tV4iCoD.png)
+
+uniform stagger 4 row board.
+
+-   Keyboard Maintainer: [makenova](https://github.com/makenova)
+-   Hardware Supported: [omega4](https://github.com/makenova/omega)
+-   Hardware Availability: https://www.cbkbd.com/product/omega4-keyboard-kit
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb makenova/omega/omega4 -km 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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+-   **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+-   **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+-   **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/makenova/omega/omega4/rules.mk b/keyboards/makenova/omega/omega4/rules.mk
new file mode 100644
index 0000000000..515ca5621f
--- /dev/null
+++ b/keyboards/makenova/omega/omega4/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 61a8a60dfb5af399f84321fbf82e974aab0a5968 Mon Sep 17 00:00:00 2001
From: kopibeng <52724926+kopibeng@users.noreply.github.com>
Date: Fri, 11 Mar 2022 03:10:34 +0800
Subject: [PATCH 792/867] [Keyboard] Add MNK65 (#16400)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/kopibeng/mnk65/config.h             | 60 +++++++++++++
 keyboards/kopibeng/mnk65/info.json            | 84 +++++++++++++++++++
 .../kopibeng/mnk65/keymaps/default/keymap.c   | 39 +++++++++
 keyboards/kopibeng/mnk65/keymaps/via/keymap.c | 57 +++++++++++++
 keyboards/kopibeng/mnk65/keymaps/via/rules.mk |  1 +
 keyboards/kopibeng/mnk65/mnk65.c              | 17 ++++
 keyboards/kopibeng/mnk65/mnk65.h              | 55 ++++++++++++
 keyboards/kopibeng/mnk65/readme.md            | 21 +++++
 keyboards/kopibeng/mnk65/rules.mk             | 18 ++++
 9 files changed, 352 insertions(+)
 create mode 100644 keyboards/kopibeng/mnk65/config.h
 create mode 100644 keyboards/kopibeng/mnk65/info.json
 create mode 100644 keyboards/kopibeng/mnk65/keymaps/default/keymap.c
 create mode 100644 keyboards/kopibeng/mnk65/keymaps/via/keymap.c
 create mode 100644 keyboards/kopibeng/mnk65/keymaps/via/rules.mk
 create mode 100644 keyboards/kopibeng/mnk65/mnk65.c
 create mode 100644 keyboards/kopibeng/mnk65/mnk65.h
 create mode 100644 keyboards/kopibeng/mnk65/readme.md
 create mode 100644 keyboards/kopibeng/mnk65/rules.mk

diff --git a/keyboards/kopibeng/mnk65/config.h b/keyboards/kopibeng/mnk65/config.h
new file mode 100644
index 0000000000..6059de6ab1
--- /dev/null
+++ b/keyboards/kopibeng/mnk65/config.h
@@ -0,0 +1,60 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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       0x4B50 // 'KP' kopibeng  
+#define PRODUCT_ID      0x0651 
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    kopibeng
+#define PRODUCT         MNK65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 { F0, F1, F4, B7, B3 }
+#define MATRIX_COL_PINS { D0, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5 }
+#define UNUSED_PINS
+
+#define LED_CAPS_LOCK_PIN D1
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
diff --git a/keyboards/kopibeng/mnk65/info.json b/keyboards/kopibeng/mnk65/info.json
new file mode 100644
index 0000000000..e0bd2f7859
--- /dev/null
+++ b/keyboards/kopibeng/mnk65/info.json
@@ -0,0 +1,84 @@
+{
+    "keyboard_name": "MNK65",
+    "maintainer": "kopibeng",
+    "url": "https://monokei.co/",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "0,0", "x": 0, "y": 0 },
+                { "label": "0,1", "x": 1, "y": 0 },
+                { "label": "0,2", "x": 2, "y": 0 },
+                { "label": "0,3", "x": 3, "y": 0 },
+                { "label": "0,4", "x": 4, "y": 0 },
+                { "label": "0,5", "x": 5, "y": 0 },
+                { "label": "0,6", "x": 6, "y": 0 },
+                { "label": "0,7", "x": 7, "y": 0 },
+                { "label": "0,8", "x": 8, "y": 0 },
+                { "label": "0,9", "x": 9, "y": 0 },
+                { "label": "0,10", "x": 10, "y": 0 },
+                { "label": "0,11", "x": 11, "y": 0 },
+                { "label": "0,12", "x": 12, "y": 0 },
+                { "label": "1,13", "x": 13, "y": 0 },
+                { "label": "0,13", "x": 14, "y": 0 },
+                { "label": "0,14", "x": 15, "y": 0 },
+				
+                { "label": "1,0", "w": 1.5, "x": 0, "y": 1 },
+                { "label": "1,1", "x": 1.5, "y": 1 },
+                { "label": "1,2", "x": 2.5, "y": 1 },
+                { "label": "1,3", "x": 3.5, "y": 1 },
+                { "label": "1,4", "x": 4.5, "y": 1 },
+                { "label": "1,5", "x": 5.5, "y": 1 },
+                { "label": "1,6", "x": 6.5, "y": 1 },
+                { "label": "1,7", "x": 7.5, "y": 1 },
+                { "label": "1,8", "x": 8.5, "y": 1 },
+                { "label": "1,9", "x": 9.5, "y": 1 },
+                { "label": "1,10", "x": 10.5, "y": 1 },
+                { "label": "1,11", "x": 11.5, "y": 1 },
+                { "label": "2,12", "x": 12.5, "y": 1 },
+                { "label": "1,12", "w": 1.5, "x": 13.5, "y": 1 },
+                { "label": "1,14", "x": 15, "y": 1 },
+				
+                { "label": "2,0", "w": 1.75, "x": 0, "y": 2 },
+                { "label": "2,1", "x": 1.75, "y": 2 },
+                { "label": "2,2", "x": 2.75, "y": 2 },
+                { "label": "2,3", "x": 3.75, "y": 2 },
+                { "label": "2,4", "x": 4.75, "y": 2 },
+                { "label": "2,5", "x": 5.75, "y": 2 },
+                { "label": "2,6", "x": 6.75, "y": 2 },
+                { "label": "2,7", "x": 7.75, "y": 2 },
+                { "label": "2,8", "x": 8.75, "y": 2 },
+                { "label": "2,9", "x": 9.75, "y": 2 },
+                { "label": "2,10", "x": 10.75, "y": 2 },
+                { "label": "2,11", "x": 11.75, "y": 2 },
+                { "label": "2,13", "w": 2.25, "x": 12.75, "y": 2 },
+                { "label": "2,14", "x": 15, "y": 2 },
+				
+                { "label": "3,0", "w": 1.25, "x": 0, "y": 3 },
+                { "label": "3,1", "x": 1.25, "y": 3 },
+                { "label": "3,2", "x": 2.25, "y": 3 },
+                { "label": "3,3", "x": 3.25, "y": 3 },
+                { "label": "3,4", "x": 4.25, "y": 3 },
+                { "label": "3,5", "x": 5.25, "y": 3 },
+                { "label": "3,6", "x": 6.25, "y": 3 },
+                { "label": "3,7", "x": 7.25, "y": 3 },
+                { "label": "3,8", "x": 8.25, "y": 3 },
+                { "label": "3,9", "x": 9.25, "y": 3 },
+                { "label": "3,10", "x": 10.25, "y": 3 },
+                { "label": "3,11", "x": 11.25, "y": 3 },
+                { "label": "3,12", "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "3,13", "x": 14, "y": 3 },
+                { "label": "3,14", "x": 15, "y": 3 },
+				
+                { "label": "4,0", "w": 1.25, "x": 0, "y": 4 },
+                { "label": "4,1", "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "4,2", "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "4,6", "w": 6.25, "x": 3.75, "y": 4 },
+                { "label": "4,10", "w": 1.25, "x": 10, "y": 4 },
+                { "label": "4,11", "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "4,12", "x": 13, "y": 4 },
+                { "label": "4,13", "x": 14, "y": 4 },
+                { "label": "4,14", "x": 15, "y": 4 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kopibeng/mnk65/keymaps/default/keymap.c b/keyboards/kopibeng/mnk65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f588475516
--- /dev/null
+++ b/keyboards/kopibeng/mnk65/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	// Default layer
+	[0] = LAYOUT_all(
+		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_BSPC, KC_HOME,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+		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_PGDN,
+		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	// Fn1 Layer
+	[1] = LAYOUT_all(
+		KC_TRNS, 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_TRNS, KC_TRNS, RESET,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+	),
+};
+
diff --git a/keyboards/kopibeng/mnk65/keymaps/via/keymap.c b/keyboards/kopibeng/mnk65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ea2fcff18c
--- /dev/null
+++ b/keyboards/kopibeng/mnk65/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	// Default layer
+	[0] = LAYOUT_all(
+		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_BSPC, KC_HOME,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+		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_PGDN,
+		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,   KC_END,
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	// Fn1 Layer
+	[1] = LAYOUT_all(
+		KC_TRNS, 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_TRNS, KC_TRNS, RESET,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	// Fn2 Layer
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+	),
+	
+	// Fn3 Layer
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+	),
+};
+
diff --git a/keyboards/kopibeng/mnk65/keymaps/via/rules.mk b/keyboards/kopibeng/mnk65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/kopibeng/mnk65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kopibeng/mnk65/mnk65.c b/keyboards/kopibeng/mnk65/mnk65.c
new file mode 100644
index 0000000000..2ae4eec194
--- /dev/null
+++ b/keyboards/kopibeng/mnk65/mnk65.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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 "mnk65.h"
\ No newline at end of file
diff --git a/keyboards/kopibeng/mnk65/mnk65.h b/keyboards/kopibeng/mnk65/mnk65.h
new file mode 100644
index 0000000000..60a92f1a65
--- /dev/null
+++ b/keyboards/kopibeng/mnk65/mnk65.h
@@ -0,0 +1,55 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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 ___ KC_NO
+
+/*
+ * 
+ *             ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐  ┌───────┐
+ *             │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │1D │0D │0E │  │0D     │ Full Backspace
+ *             ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤  └─┬─────┤
+ *             │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │2C │1C   │1E │    │2D   │
+ *  2.25u      ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤  ┌─┴─┐   │ ISO
+ *  LShift     │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │  │1C │   │
+ * ┌────────┐  ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤  └───┴───┘
+ * │30      │  │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+ * └────────┘  ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ *             │40  │41  │42  │46                      │4A  │4B  │ │4C │4D │4E │
+ *             └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+ *             ┌─────┬───┬─────┬───────────────────────────┬─────┐
+ *             │40   │41 │42   │46                         │4B   │ 7u Tsangan
+ *             └─────┴───┴─────┴───────────────────────────┴─────┘
+ *
+ */
+
+// LAYOUT_all:
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K1D, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K2C, K1C,      K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,      K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, K3E, \
+    K40, K41, K42,                K46,                K4A, K4B,      K4C, K4D, K4E  \
+) { \
+    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \
+    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \
+    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E}, \
+    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E}, \
+    {K40, K41, K42, ___, ___, ___, K46, ___, ___, ___, K4A, K4B, K4C, K4D, K4E}  \
+}
diff --git a/keyboards/kopibeng/mnk65/readme.md b/keyboards/kopibeng/mnk65/readme.md
new file mode 100644
index 0000000000..80e256e617
--- /dev/null
+++ b/keyboards/kopibeng/mnk65/readme.md
@@ -0,0 +1,21 @@
+# MNK65
+
+![MNK65](https://i.imgur.com/5BzAgPgl.png)
+
+A QMK-powered, VIA-enabled 65% PCB with support for ANSI/ISO layouts, split Backspace and 6.25U/7U bottom row.
+
+* Keyboard Maintainer: kopibeng
+* Hardware Supported: MONOKEI - Hiro
+* Hardware Availability: https://monokei.co/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kopibeng/mnk65: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).
+
+## Bootloader
+
+* Physical reset button: Press the RESET switch on top side of PCB.
+* Bootmagic reset: Unplug keyboard, hold down ESC key and plug in the keyboard.
+* Keycode reset: Press the RESET keycode (default: MO(1) + Home keys) in layout if available.
diff --git a/keyboards/kopibeng/mnk65/rules.mk b/keyboards/kopibeng/mnk65/rules.mk
new file mode 100644
index 0000000000..73ac281e0b
--- /dev/null
+++ b/keyboards/kopibeng/mnk65/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 98da119293b7f231694119b51afc709b3d817ea2 Mon Sep 17 00:00:00 2001
From: Era James <51322608+era1112@users.noreply.github.com>
Date: Thu, 10 Mar 2022 23:07:37 +0300
Subject: [PATCH 793/867] era1112 keymap for preonic (#16064)

Added the keymap I have been using as a daily driver for the last month.

* good firmware 26 jan, best clicky mode stability so far

* modified to reflect master branch coding style

* further modified to reflect master branch coding style

* improving clicky stability, tuned down clicky delay duration

* changed name of keymap folder to use lowercase letters
---
 keyboards/preonic/keymaps/era1112/config.h  |  60 ++++
 keyboards/preonic/keymaps/era1112/keymap.c  | 365 ++++++++++++++++++++
 keyboards/preonic/keymaps/era1112/readme.md |   8 +
 keyboards/preonic/keymaps/era1112/rules.mk  |  26 ++
 4 files changed, 459 insertions(+)
 create mode 100644 keyboards/preonic/keymaps/era1112/config.h
 create mode 100644 keyboards/preonic/keymaps/era1112/keymap.c
 create mode 100644 keyboards/preonic/keymaps/era1112/readme.md
 create mode 100644 keyboards/preonic/keymaps/era1112/rules.mk

diff --git a/keyboards/preonic/keymaps/era1112/config.h b/keyboards/preonic/keymaps/era1112/config.h
new file mode 100644
index 0000000000..86cc6135e5
--- /dev/null
+++ b/keyboards/preonic/keymaps/era1112/config.h
@@ -0,0 +1,60 @@
+// Copyright 2022 Era James(@Era1112)
+// SPDX - License - Identifier: GPL - 2.0 - or -later
+
+#pragma once
+
+
+//----------- Default statements -----------//
+//------------------------------------------//
+#define MUSIC_MASK (keycode < 0xFF)
+
+/*
+ * MIDI options
+ */
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 2
+
+
+//----------- Added statements -------------//
+//------------------------------------------//
+#define TAPPING_TERM 200                        // For tapdances
+
+// Commented to see if it helps stalls on clicky mode #define DYNAMIC_MACRO_NO_NESTING                // Improve dynamic macro stability
+#ifdef AUDIO_ENABLE
+	#define AUDIO_INIT_DELAY                    // to make startup audio work
+	#define STARTUP_SONG SONG(PREONIC_SOUND)
+	#define AUDIO_CLICKY                        // enable clicky mode
+
+	// Clicky mode parameters
+	#define AUDIO_CLICKY_FREQ_MIN 65.0f         // Default 65
+	#define AUDIO_CLICKY_FREQ_DEFAULT 800.0f    // Default 440
+	#define AUDIO_CLICKY_FREQ_MAX 1500.0f       // Defaul 1500
+	#define AUDIO_CLICKY_FREQ_RANDOMNESS 1.0f   // Default 0.05
+	#define AUDIO_CLICKY_DELAY_DURATION 0.1f    // Default 1
+#endif  //AUDIO_ENABLE
+
+#define RGBLIGHT_SLEEP                  // RGB lights turn off when host sleeps
+
+// Firmware minimization
+
+// Commented to see if it helps stalls on clicky mode 
+// #define NO_ACTION_ONESHOT
+// #undef LOCKING_SUPPORT_ENABLE
+// #undef LOCKING_RESYNC_ENABLE
+// #define NO_MUSIC_MODE
+// #define LAYER_STATE_8BIT        // Limits keymap to 8 layers
+// #undef RGBLIGHT_ANIMATIONS      // Removes rgb animations
diff --git a/keyboards/preonic/keymaps/era1112/keymap.c b/keyboards/preonic/keymaps/era1112/keymap.c
new file mode 100644
index 0000000000..4031f998db
--- /dev/null
+++ b/keyboards/preonic/keymaps/era1112/keymap.c
@@ -0,0 +1,365 @@
+// Copyright 2022 Era James(@Era1112)
+// SPDX - License - Identifier: GPL - 2.0 - or -later
+
+#include QMK_KEYBOARD_H                     // Default statement
+
+#define HSV_RETRO_CONSOLE   36, 150, 255    //HSV_YELLOW = 43, 255, 255
+
+
+//----------- RGB Default Settings -----------//
+//--------------------------------------------//
+#ifdef RGBLIGHT_ENABLE
+
+void keyboard_post_init_user(void) {
+    rgblight_enable_noeeprom(); // Enables RGB, without saving settings
+    rgblight_sethsv_noeeprom(HSV_RETRO_CONSOLE);
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+}
+
+#endif  // RGBLIGHT_ENABLE
+
+//----------- Layer names -----------//
+//-----------------------------------//
+enum preonic_layers {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+  _ADJUST,
+};
+
+
+//----------- Sounds -----------//
+//------------------------------//
+#ifdef AUDIO_ENABLE
+
+    float capslockToggleSound[][2] = SONG(STARTUP_SOUND);
+    float dynamicBufferRecordSound[][2] = SONG(STARTUP_SOUND);
+    float dynamicBufferFullSound[][2] = SONG(GOODBYE_SOUND);
+
+#endif  // AUDIO_ENABLE
+
+
+//----------- Called when dynamic buffer full -----------//
+//-------------------------------------------------------//
+void backlight_toggle(void) {
+#ifdef AUDIO_ENABLE
+
+    PLAY_SONG(dynamicBufferFullSound);
+
+#endif  // AUDIO_ENABLE
+}
+
+
+//----------- Tapdance prelims -----------//
+//----------------------------------------//
+typedef enum {
+    TD_NONE,
+    TD_UNKNOWN,
+    TD_1_TAP,
+    TD_1_HOLD,
+    TD_2_TAP,
+    TD_2_HOLD,
+} td_state_t;
+
+typedef struct {
+    bool is_press_action;
+    td_state_t state;
+} td_tap_t;
+
+td_state_t cur_dance(qk_tap_dance_state_t* state);
+
+/* Return an integer that corresponds to what kind of tap dance should be executed.
+ *
+ * How to figure out tap dance state: interrupted and pressed.
+ *
+ * Interrupted: If the state of a dance dance is "interrupted", that means that another key has been hit
+ *  under the tapping term. This is typically indicitive that you are trying to "tap" the key.
+ *
+ * Pressed: Whether or not the key is still being pressed. If this value is true, that means the tapping term
+ *  has ended, but the key is still being pressed down. This generally means the key is being "held".
+ *
+ * One thing that is currenlty not possible with qmk software in regards to tap dance is to mimic the "permissive hold"
+ *  feature. In general, advanced tap dances do not work well if they are used with commonly typed letters.
+ *  For example "A". Tap dances are best used on non-letter keys that are not hit while typing letters.
+ *
+ * Good places to put an advanced tap dance:
+ *  z,q,x,j,k,v,b, any function key, home/end, comma, semi-colon
+ *
+ * Criteria for "good placement" of a tap dance key:
+ *  Not a key that is hit frequently in a sentence
+ *  Not a key that is used frequently to double tap, for example 'tab' is often double tapped in a terminal, or
+ *    in a web form. So 'tab' would be a poor choice for a tap dance.
+ *  Letters used in common words as a double. For example 'p' in 'pepper'. If a tap dance function existed on the
+ *    letter 'p', the word 'pepper' would be quite frustating to type.
+ *
+ * For the third point, there does exist the 'TD_DOUBLE_SINGLE_TAP', however this is not fully tested
+ *
+ */
+td_state_t cur_dance(qk_tap_dance_state_t* state) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) {
+            return TD_1_TAP;
+        // Key has not been interrupted, but the key is still held. Means you want to send a 'HOLD'.
+        } else {
+        return TD_1_HOLD;
+        }
+    } else if (state->count == 2) {
+        // TD_DOUBLE_SINGLE_TAP is to distinguish between typing "pepper", and actually wanting a double tap
+        // action when hitting 'pp'. Suggested use case for this return value is when you want to send two
+        // keystrokes of the key, and not the 'double tap' action/macro.
+        if (state->pressed) return TD_2_HOLD;
+        else return TD_2_TAP;
+    } else {
+        return TD_UNKNOWN;
+    }
+}
+
+
+//----------- 2tap capslock --------------//
+//----------------------------------------//
+void twoCapsLock_finished(qk_tap_dance_state_t* state, void* user_data);
+void twoCapsLock_reset(qk_tap_dance_state_t* state, void* user_data);
+
+static td_tap_t twoCapsLock_tap_state = {
+    .is_press_action = true,
+    .state = TD_NONE
+};
+
+void twoCapsLock_finished(qk_tap_dance_state_t* state, void* user_data) {
+    twoCapsLock_tap_state.state = cur_dance(state);
+    switch (twoCapsLock_tap_state.state) {
+    case TD_NONE: register_code(KC_LSFT); break;
+    case TD_UNKNOWN: register_code(KC_LSFT); break;
+    case TD_1_TAP: register_code(KC_LSFT); break;
+    case TD_1_HOLD: register_code(KC_LSFT); break;
+    case TD_2_TAP:
+        register_code(KC_CAPS);
+#ifdef AUDIO_ENABLE
+        PLAY_SONG(capslockToggleSound);
+#endif  // AUDIO_ENABLE
+        break;
+    case TD_2_HOLD: register_code(KC_LSFT); break;      
+    }
+}
+
+void twoCapsLock_reset(qk_tap_dance_state_t* state, void* user_data) {
+    switch (twoCapsLock_tap_state.state) {
+    case TD_UNKNOWN: unregister_code(KC_LSFT); break;
+    case TD_NONE: unregister_code(KC_LSFT); break;
+    case TD_1_TAP: unregister_code(KC_LSFT); break;
+    case TD_1_HOLD: unregister_code(KC_LSFT); break;
+    case TD_2_TAP:
+        unregister_code(KC_CAPS);
+#ifdef AUDIO_ENABLE
+        PLAY_SONG(capslockToggleSound);
+#endif  // AUDIO_ENABLE
+        break;
+    case TD_2_HOLD: unregister_code(KC_LSFT); break;
+    }
+    twoCapsLock_tap_state.state = TD_NONE;
+}
+
+
+//----------- Rotary Encoder --------------//
+//----------------------------------------//
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (layer_state_is(_QWERTY)) {
+        if (clockwise) {
+            tap_code(KC_WH_U);
+        } else {
+            tap_code(KC_WH_D);
+        }
+    }
+    else if (layer_state_is(_LOWER)) {
+        if (clockwise) {
+            tap_code16(S(KC_F3));
+        } else {
+            tap_code(KC_F3);
+        }
+    } else if (layer_state_is(_RAISE)) {
+        if (clockwise) {
+            tap_code16(C(KC_Z));
+        } else {
+            tap_code16(C(KC_Y));
+        }
+    }
+    return false;
+}
+
+//----------- Custom keycodes ------------//
+//----------------------------------------//
+enum {
+    TD_2_CAPSLOCK
+};
+
+enum custom_keycodes {
+    CU_BLNKON = SAFE_RANGE,
+    CU_BLNKOFF,
+    CU_RGBON,
+    CU_RGBOFF,
+    ENC_MODE
+};
+
+static bool blinky = false;         // Track blinky behavior on/off for keycode
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_2_CAPSLOCK] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, twoCapsLock_finished, twoCapsLock_reset)
+};
+
+
+//----------- Intercepts and overrides ------------//
+//-------------------------------------=-----------//
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+    // Turn RGB LEDs off
+    case CU_RGBOFF:
+
+        // If pressed
+        if (record->event.pressed) {
+            rgblight_sethsv_noeeprom(HSV_OFF);   
+            return true;
+
+        // If released
+        } else {
+            return true;
+        }
+
+    // Turn RGB LEDs on
+    case CU_RGBON:
+
+        // If pressed
+        if (record->event.pressed) {
+            rgblight_sethsv_noeeprom(HSV_RETRO_CONSOLE);  
+            return true;
+
+        // If released
+        } else {
+            return true;
+        }
+
+    // Turn blinky LEDs off
+    case CU_BLNKOFF:
+
+        // If pressed
+        if (record->event.pressed) {
+            blinky = false;
+            return true;
+
+        // If released
+        } else {
+            return true;
+        }
+
+    // Turn blinky LEDs on
+    case CU_BLNKON:
+
+        // If pressed
+        if (record->event.pressed) {
+            blinky = true;
+            return true;
+
+        // If released
+        } else {
+            return true;
+        }
+
+    // Sound when Dynamic recording started
+    case DYN_REC_START1:
+
+        // If pressed
+        if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+            PLAY_SONG(dynamicBufferRecordSound);
+        #endif  // AUDIO_ENABLE
+            return true; // Let QMK send the press/release events
+
+        // If released
+        } else {
+            return true; // Let QMK send the press/release events
+        }
+
+    // Sound when Dynamic recording stopped
+    case DYN_REC_STOP:
+
+        // If pressed
+        if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+            PLAY_SONG(dynamicBufferFullSound); 
+        #endif  // AUDIO_ENABLE
+            return true; // Let QMK send the enter press/release events
+
+        // If released
+        } else {
+            return true; // Let QMK send the press/release events
+        }
+
+    // Encoder Click
+    case ENC_MODE:
+        if (record->event.pressed) {
+            if (layer_state_is(_QWERTY)) {
+                tap_code(KC_BTN1);
+                return false;
+            } else if (layer_state_is(_LOWER)) {
+                return false;
+            } else if (layer_state_is(_RAISE)) {
+                return false;
+            }
+        }
+
+
+    // Adds blinks if blinky is on
+    default:
+        if (blinky == true) {
+            rgblight_toggle();
+        }
+
+    return true; // Process all other keycodes normally
+
+    }
+}
+
+
+//----------- Keymap ------------//
+//-------------------------------//
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    // main layer
+    [_QWERTY] = LAYOUT_ortho_5x12 (
+        // (Non-disabled top row), uncomment and replace if you want preonic-style instead of planck-style
+        // KC_MINS,            KC_1,           KC_2,           KC_3,           KC_4,           KC_5,           KC_6,           KC_7,           KC_8,       KC_9,       KC_0,       KC_EQL,
+		KC_NO,              KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,          KC_NO,      KC_NO,      KC_NO,      KC_NO,
+        KC_TAB,             KC_Q,           KC_W,           KC_E,           KC_R,           KC_T,           KC_Y,           KC_U,           KC_I,       KC_O,       KC_P,       KC_BSPC,
+        KC_ESC,             KC_A,           KC_S,           KC_D,           KC_F,           KC_G,           KC_H,           KC_J,           KC_K,       KC_L,       KC_SCLN,    KC_ENT,
+        KC_LSFT,            KC_Z,           KC_X,           KC_C,           KC_V,           KC_B,           KC_N,           KC_M,           KC_COMM,    KC_DOT,     KC_SLSH,    TD(TD_2_CAPSLOCK),
+        ENC_MODE,           KC_LCTL,        KC_LGUI,        KC_LALT,        MO(_LOWER),     KC_SPC,         KC_SPC,         MO(_RAISE),     KC_LEFT,    KC_DOWN,    KC_UP,      KC_RGHT
+    ),
+
+    // lower key
+    [_LOWER] = LAYOUT_ortho_5x12 (
+        DYN_MACRO_PLAY1,    DYN_REC_START1, DYN_REC_STOP,   KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,            KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,
+        KC_TRNS,            KC_1,           KC_2,           KC_3,           KC_4,           KC_5,           KC_6,           KC_7,               KC_8,           KC_9,       KC_0,       KC_DEL,
+        KC_BSPC,            KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_F6,          KC_QUOT,            KC_GRV,         KC_LCBR,    KC_RCBR,    KC_TRNS,
+        KC_TRNS,            KC_F7,          KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         KC_MINS,            KC_EQL,         KC_TRNS,    KC_BSLS,    KC_TRNS,
+        KC_TRNS,            KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        MO(_ADJUST),        KC_HOME,        KC_PGDN,    KC_PGUP,    KC_END
+    ),
+
+    // raise key
+    [_RAISE] = LAYOUT_ortho_5x12 (
+        DYN_MACRO_PLAY1,    DYN_REC_START1, DYN_REC_STOP,   KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS,            KC_TRNS,        KC_TRNS,    KC_TRNS,    KC_TRNS,
+        KC_TRNS,            KC_EXLM,        KC_AT,          KC_HASH,        KC_DLR,         KC_PERC,        KC_CIRC,        KC_AMPR,            KC_ASTR,        KC_LPRN,    KC_RPRN,    KC_DEL,
+        KC_DEL,             KC_F1,          KC_F2,          KC_F3,          KC_F4,          KC_F5,          KC_F6,          KC_DQUO,            KC_TILD,        KC_LBRC,    KC_RBRC,    KC_TRNS,
+        KC_TRNS,            KC_F7,          KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,         KC_UNDS,            KC_PLUS	,       KC_TRNS,    KC_PIPE,    KC_TRNS,
+        KC_TRNS,            KC_TRNS,        KC_TRNS,        KC_TRNS,        MO(_ADJUST),    KC_TRNS,        KC_TRNS,        KC_TRNS,            KC_MUTE,        KC_VOLD,    KC_VOLU,    KC_F24
+    ),
+
+    // hardware adjust layer, raise+lower
+    [_ADJUST] = LAYOUT_ortho_5x12 (
+        AU_ON,              AU_OFF,          CK_ON,           CK_OFF,          KC_NO,           KC_NO,           KC_NO,       KC_NO,           KC_NO,       KC_NO,       KC_NO,       KC_NO,
+																																															
+        CU_RGBON,           CU_RGBOFF,       CU_BLNKON,       CU_BLNKOFF,      KC_NO,           KC_NO,           KC_NO,       KC_NO,           KC_NO,       KC_NO,       KC_NO,       KC_NO,
+		KC_NO,              KC_NO,           KC_NO,           KC_NO,           KC_NO,           KC_NO,           KC_NO,       KC_NO,           KC_NO,       KC_NO,       KC_NO,       KC_NO,
+        KC_NO,              KC_NO,           KC_NO,           KC_NO,           KC_NO,           KC_NO,           KC_NO,       KC_NO,           KC_NO,       KC_NO,       KC_NO,       KC_NO,
+        KC_NO,              KC_NO,           KC_NO,           KC_NO,           KC_NO,           KC_NO,           KC_NO,       KC_NO,           KC_NO,       KC_NO,       KC_NO,       KC_NO
+    )
+    
+};
diff --git a/keyboards/preonic/keymaps/era1112/readme.md b/keyboards/preonic/keymaps/era1112/readme.md
new file mode 100644
index 0000000000..76775b85aa
--- /dev/null
+++ b/keyboards/preonic/keymaps/era1112/readme.md
@@ -0,0 +1,8 @@
+A preonic keymap that includes:
+- doubletap tapdance for caps lock
+- rotary encoder
+- macro record/playback
+- light on/off
+- sound on/off
+- blink-on-keypress w/ on/off keystroke
+- beep-on-keypress w/ on/off keystroke (this has stability issues when typing fast, still trying to remediate)
\ No newline at end of file
diff --git a/keyboards/preonic/keymaps/era1112/rules.mk b/keyboards/preonic/keymaps/era1112/rules.mk
new file mode 100644
index 0000000000..4e83382dad
--- /dev/null
+++ b/keyboards/preonic/keymaps/era1112/rules.mk
@@ -0,0 +1,26 @@
+## Copyright 2022 Era James (@Era1112)
+## SPDX-License-Identifier: GPL-2.0-or-later
+
+# DEFAULT STATEMENTS
+# ==================
+
+SRC += muse.c
+
+
+# ADDED STATEMENTS
+# ================
+
+AUDIO_ENABLE = yes          # Audio output on
+TAP_DANCE_ENABLE = yes		# For double-tap tapdances
+DYNAMIC_MACRO_ENABLE = yes	# For dynamuic macros
+RGBLIGHT_ENABLE = yes		# For RGB lighting functions
+ENCODER_ENABLE = yes		# For Rotary encoders
+
+
+# Firmware minimization
+# Commented to see if it helps stalls on clicky mode 													 
+CONSOLE_ENABLE = no
+#LTO_ENABLE = yes
+SPACE_CADET_ENABLE = no
+GRAVE_ESC_ENABLE = no 
+MAGIC_ENABLE = no

From fc7a41fdceaf2fe6a42497c25f4fcfc9597cf638 Mon Sep 17 00:00:00 2001
From: Liashenko Volodymyr <LVladymyr@users.noreply.github.com>
Date: Thu, 10 Mar 2022 22:21:55 +0200
Subject: [PATCH 794/867] [Keyboard] lily58/glow_enc (#16101)

Add rgb-light and encoder for lily58 mod

* add support for lily58 encoders (one per size) and rgb-light.

The pcb and details here https://github.com/orvisevans/Lily58-Glow-Enc

* add support for lily58 encoders (one per size) and rgb-light.

The pcb and details here https://github.com/orvisevans/Lily58-Glow-Enc

* Update keyboards/lily58/glowEnc/config.h

* add GPL License to growEnc.h

* rename folder according to requirement to lower case
---
 keyboards/lily58/glow_enc/config.h   | 55 +++++++++++++++++++++++
 keyboards/lily58/glow_enc/glow_enc.c | 16 +++++++
 keyboards/lily58/glow_enc/glow_enc.h | 66 ++++++++++++++++++++++++++++
 keyboards/lily58/glow_enc/info.json  | 16 +++++++
 keyboards/lily58/glow_enc/rules.mk   |  8 ++++
 keyboards/lily58/lily58.h            |  2 +
 6 files changed, 163 insertions(+)
 create mode 100644 keyboards/lily58/glow_enc/config.h
 create mode 100644 keyboards/lily58/glow_enc/glow_enc.c
 create mode 100644 keyboards/lily58/glow_enc/glow_enc.h
 create mode 100644 keyboards/lily58/glow_enc/info.json
 create mode 100644 keyboards/lily58/glow_enc/rules.mk

diff --git a/keyboards/lily58/glow_enc/config.h b/keyboards/lily58/glow_enc/config.h
new file mode 100644
index 0000000000..5e51acea25
--- /dev/null
+++ b/keyboards/lily58/glow_enc/config.h
@@ -0,0 +1,55 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2017 F_YUUCHI
+Copyright 2020 Ben Roesner (keycapsss.com)
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFC51
+#define PRODUCT_ID      0x0059
+#define DEVICE_VER      0x0100
+#define MANUFACTURER    ORVISEVANS+
+#define PRODUCT         Lily58GlowEnc
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define SOFT_SERIAL_PIN D2
+
+#define RGB_DI_PIN F4
+
+#define RGBLED_NUM 72    // Number of LEDs
+
+#define RGBLED_SPLIT { 36, 36 }
+#define RGBLIGHT_SPLIT
+#define RGBLIGHT_LIMIT_VAL 120
+
+#define ENCODERS_PAD_A { F5 }
+#define ENCODERS_PAD_B { D4 }
+#define ENCODERS_PAD_A_RIGHT { D4 }
+#define ENCODERS_PAD_B_RIGHT { F5 }
diff --git a/keyboards/lily58/glow_enc/glow_enc.c b/keyboards/lily58/glow_enc/glow_enc.c
new file mode 100644
index 0000000000..57a0df93db
--- /dev/null
+++ b/keyboards/lily58/glow_enc/glow_enc.c
@@ -0,0 +1,16 @@
+/*
+Copyright 2020 Ben Roesner (keycapsss.com)
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "lily58.h"
+
diff --git a/keyboards/lily58/glow_enc/glow_enc.h b/keyboards/lily58/glow_enc/glow_enc.h
new file mode 100644
index 0000000000..f9cc1c26b8
--- /dev/null
+++ b/keyboards/lily58/glow_enc/glow_enc.h
@@ -0,0 +1,66 @@
+/* Copyright 2022 Liashenko Volodymyr (@LVladymyr)
+ *
+ * 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 "lily58.h"
+
+#include "quantum.h"
+
+
+#ifndef FLIP_HALF
+#define LAYOUT( \
+	L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05,  \
+	L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
+	L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25,  \
+	L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \
+	               L41, L42, L43, L44, R41, R42, R43, R44  \
+	) \
+	{ \
+		{ L00, L01, L02, L03, L04, L05 }, \
+		{ L10, L11, L12, L13, L14, L15 }, \
+		{ L20, L21, L22, L23, L24, L25 }, \
+		{ L30, L31, L32, L33, L34, L35 }, \
+		{ KC_NO, L41, L42, L43, L44, L45 }, \
+		{ R05, R04, R03, R02, R01, R00 }, \
+		{ R15, R14, R13, R12, R11, R10 }, \
+		{ R25, R24, R23, R22, R21, R20 }, \
+		{ R35, R34, R33, R32, R31, R30 }, \
+		{ KC_NO, R44, R43, R42, R41, R40 } \
+	}
+#else
+// Keymap with right side flipped
+// (TRRS jack on both halves are to the right)
+#define LAYOUT( \
+	L00, L01, L02, L03, L04, L05,      R00, R01, R02, R03, R04, R05, \
+	L10, L11, L12, L13, L14, L15,      R10, R11, R12, R13, R14, R15, \
+	L20, L21, L22, L23, L24, L25,      R20, R21, R22, R23, R24, R25, \
+	L30, L31, L32, L33, L34, L35, L45, R30, R31, R32, R33, R34, R35, R45, \
+                   L41, L42, L43, L44,                R41, R42, R43, R44 \
+	) \
+	{ \
+		{ L00, L01, L02, L03, L04, L05 }, \
+		{ L10, L11, L12, L13, L14, L15 }, \
+		{ L20, L21, L22, L23, L24, L25 }, \
+		{ L30, L31, L32, L33, L34, L35 }, \
+        { KC_NO, L41, L42, L43, L44, L45 }, \
+		{ R00, R01, R02, R03, R04, R05 }, \
+		{ R10, R11, R12, R13, R14, R15 }, \
+		{ R20, R21, R22, R23, R24, R25 }, \
+		{ R30, R31, R32, R33, R34, R35 }, \
+        { KC_NO, R41, R42, R43, R44, R45 } \
+	}
+#endif
diff --git a/keyboards/lily58/glow_enc/info.json b/keyboards/lily58/glow_enc/info.json
new file mode 100644
index 0000000000..503cdaae12
--- /dev/null
+++ b/keyboards/lily58/glow_enc/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Lily58",
+    "url": "https://keycapsss.com",
+    "maintainer": "BenRoe",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5},
+                {"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5},
+                {"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5},
+                {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5},
+                {"x":2.5, "y":4.125}, {"x":3.5, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12, "y":4.15}, {"x":13, "y":4.15}
+            ]
+        }
+    }
+}
diff --git a/keyboards/lily58/glow_enc/rules.mk b/keyboards/lily58/glow_enc/rules.mk
new file mode 100644
index 0000000000..3d80190eb2
--- /dev/null
+++ b/keyboards/lily58/glow_enc/rules.mk
@@ -0,0 +1,8 @@
+ENCODER_ENABLE = yes       # ENables the use of one or more encoders
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB light
+LTO_ENABLE = yes 		   # significantly reduce the compiled size, but disable the legacy TMK Macros and Functions features
+BOOTMAGIC_ENABLE = no
+RGB_MATRIX_ENABLE = no     # Per key rgb leds
+
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/keyboards/lily58/lily58.h b/keyboards/lily58/lily58.h
index 4f6f262bbc..c082030032 100644
--- a/keyboards/lily58/lily58.h
+++ b/keyboards/lily58/lily58.h
@@ -4,4 +4,6 @@
     #include "rev1.h"
 #elif KEYBOARD_lily58_light
     #include "light.h"
+#elif KEYBOARD_lily58_glow_enc
+    #include "glow_enc.h"
 #endif

From b33fdc299c7ae702582969ef66d73fcc5806bcbb Mon Sep 17 00:00:00 2001
From: Christian Hofstede <4440939+chofstede@users.noreply.github.com>
Date: Thu, 10 Mar 2022 21:41:30 +0100
Subject: [PATCH 795/867] add chofstede keymap for gmmk/pro/iso (#16045)

Add new keymap for GMMK with some additional mappings and led indicator for caps lock

* add chofstede keymap

* fix formatting

* fix formatting

* add readme

* Update keyboards/gmmk/pro/iso/keymaps/chofstede/keymap.c
---
 .../gmmk/pro/iso/keymaps/chofstede/keymap.c   | 106 ++++++++++++++++++
 .../gmmk/pro/iso/keymaps/chofstede/readme.md  |   8 ++
 2 files changed, 114 insertions(+)
 create mode 100644 keyboards/gmmk/pro/iso/keymaps/chofstede/keymap.c
 create mode 100644 keyboards/gmmk/pro/iso/keymaps/chofstede/readme.md

diff --git a/keyboards/gmmk/pro/iso/keymaps/chofstede/keymap.c b/keyboards/gmmk/pro/iso/keymaps/chofstede/keymap.c
new file mode 100644
index 0000000000..84fbcf37ff
--- /dev/null
+++ b/keyboards/gmmk/pro/iso/keymaps/chofstede/keymap.c
@@ -0,0 +1,106 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//      ESC      F1       F2       F3       F4       F5       F6       F7       F8       F9       F10      F11      F12	     Prt           Rotary(Mute)
+//      ~        1        2        3        4        5        6        7        8        9        0         -       (=)	     BackSpc           Del
+//      Tab      Q        W        E        R        T        Y        U        I        O        P        [        ]                          PgUp
+//      Caps     A        S        D        F        G        H        J        K        L        ;        "        #        Enter             PgDn
+//      Sh_L     /        Z        X        C        V        B        N        M        ,        .        ?                 Sh_R     Up       End
+//      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
+
+
+    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
+    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
+    // if that's your preference.
+    //
+    // To put the keyboard in bootloader mode, use FN+backspace. If you accidentally put it into bootloader, you can just unplug the USB cable and
+    // it'll be back to normal when you plug it back in.
+    //
+    // This keyboard defaults to 6KRO instead of NKRO for compatibility reasons (some KVMs and BIOSes are incompatible with NKRO).
+    // Since this is, among other things, a "gaming" keyboard, a key combination to enable NKRO on the fly is provided for convenience.
+    // Press Fn+N to toggle between 6KRO and NKRO. This setting is persisted to the EEPROM and thus persists between restarts.
+    [0] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME,          KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        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_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,           KC_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [1] = LAYOUT(
+        _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_PSCR,          _______,
+        _______, RGB_TOG, RGB_M_P, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+        _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_INS, _______,          _______,
+        _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
+    ),
+
+
+};
+// clang-format on
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+      tap_code(KC_VOLU);
+    } else {
+      tap_code(KC_VOLD);
+    }
+    return false;
+}
+#endif
+
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    static uint32_t cycle_led_timer = 0;
+    static uint8_t  current_value   = 0;
+    static uint8_t  left_side_leds[8] = {68, 71, 74, 77, 81, 84, 88, 92};
+    static uint8_t  right_side_leds[8] = {69, 72, 75, 78, 82, 85, 89, 93};
+
+    if (host_keyboard_led_state().caps_lock) {
+        if (timer_elapsed32(cycle_led_timer) > 500) {
+            current_value = current_value == 0 ? 255 : 0;
+            cycle_led_timer = timer_read32();
+        }
+    HSV tempHSV = {.h = 0, .s = 255, .v = current_value};
+    RGB tempRGB = hsv_to_rgb(tempHSV);
+    for (uint8_t i = 0; i < sizeof(left_side_leds) / sizeof(left_side_leds[0]); i++) {
+        rgb_matrix_set_color(left_side_leds[i], tempRGB.r, tempRGB.g, tempRGB.b);
+        rgb_matrix_set_color(right_side_leds[i], tempRGB.r, tempRGB.g, tempRGB.b);
+        }
+    }
+
+    static uint8_t l2_functions[26] = {6, 7, 8, 12, 13, 14, 15, 16, 18, 23, 28, 34, 38, 39, 44, 50, 56, 61, 66, 70, 80, 86, 94, 95, 96, 98};
+    switch(get_highest_layer(layer_state)){  // special handling per layer
+       case 2:  //layer one
+         break;
+       case 1:
+         for (uint8_t i = 0; i < sizeof(l2_functions) / sizeof(l2_functions[0]); i++) {
+             RGB_MATRIX_INDICATOR_SET_COLOR(l2_functions[i], 255, 0, 0);
+         }
+         break;
+       default:
+         break;
+       break;
+    }
+}
diff --git a/keyboards/gmmk/pro/iso/keymaps/chofstede/readme.md b/keyboards/gmmk/pro/iso/keymaps/chofstede/readme.md
new file mode 100644
index 0000000000..da66c447ad
--- /dev/null
+++ b/keyboards/gmmk/pro/iso/keymaps/chofstede/readme.md
@@ -0,0 +1,8 @@
+# chofstede GMMK Pro layout
+
+- Added Print-Screen to FN+POS1
+- Added Insert to FN+#
+- The LED bars on the left and right side of the keyboard blink red when CAPS Lock is enabled
+- All mapped keys light up red when FN is being pressed
+
+

From 6c40b6856bb843e39bf0992164f41e29ce7ea72c Mon Sep 17 00:00:00 2001
From: WJH <hou32hou@gmail.com>
Date: Fri, 11 Mar 2022 04:48:33 +0800
Subject: [PATCH 796/867] [Docs] Include ASCII diagram to explain tap-hold
 modes (#15873)

* [Docs] Include ASCII diagram to explain tap-hold modes

* [Docs]: add examples for Default mode for Tap Hold

* [Docs] fix some wrong explanation in tap_hold.md
---
 docs/tap_hold.md | 115 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 115 insertions(+)

diff --git a/docs/tap_hold.md b/docs/tap_hold.md
index d206c10cc5..39fa84a9f3 100644
--- a/docs/tap_hold.md
+++ b/docs/tap_hold.md
@@ -126,6 +126,61 @@ The code which decides between the tap and hold actions of dual-role keys suppor
 
 Note that until the tap-or-hold decision completes (which happens when either the dual-role key is released, or the tapping term has expired, or the extra condition for the selected decision mode is satisfied), key events are delayed and not transmitted to the host immediately.  The default mode gives the most delay (if the dual-role key is held down, this mode always waits for the whole tapping term), and the other modes may give less delay when other keys are pressed, because the hold action may be selected earlier.
 
+### Default Mode
+Example sequence 1 (the `L` key is also mapped to `KC_RGHT` on layer 2):
+
+```
+             TAPPING_TERM
+  +---------------|--------------------+
+  | +-------------|-------+            |
+  | | LT(2, KC_A) |       |            |
+  | +-------------|-------+            |
+  |               | +--------------+   |
+  |               | | KC_L         |   |
+  |               | +--------------+   |
+  +---------------|--------------------+
+```
+The above sequence would send a `KC_RGHT`, since `LT(2, KC_A)` is held longer than the `TAPPING_TERM`.
+
+---
+
+Example sequence 2 (the `L` key is also mapped to `KC_RGHT` on layer 2):
+
+```
+                           TAPPING_TERM
+  +-----------------------------|------+
+  | +---------------+           |      |
+  | | LT(2, KC_A)   |           |      |
+  | +---------------+           |      |
+  |            +--------------+ |      |
+  |            | KC_L         | |      |
+  |            +--------------+ |      |
+  +-----------------------------|------+
+```
+The above sequence will not send `KC_RGHT` but `KC_A` `KC_L` instead, since `LT(2, KC_A)` is not held longer than the `TAPPING_TERM`.
+
+---
+
+Example sequence 3 (Mod Tap):
+
+```
+                         TAPPING_TERM
+  +---------------------------|--------+
+  | +-------------+           |        |
+  | | SFT_T(KC_A) |           |        |
+  | +-------------+           |        |
+  |       +--------------+    |        |
+  |       | KC_X         |    |        |
+  |       +--------------+    |        |
+  +---------------------------|--------+
+```
+Based previous examples, you might have expected the output of the above sequence to be `KC_A` `KC_X`
+since `SFT_T(KC_A)` is NOT held longer than the `TAPPING_TERM`.
+However, the actual output would be capital `X` (`SHIFT` + `x`) due to reasons
+explained under [Ignore Mod Tap Interrupt](#ignore-mod-tap-interrupt).
+
+
+
 ### Permissive Hold
 
 The “permissive hold” mode can be enabled for all dual-role keys by adding the corresponding option to `config.h`:
@@ -145,6 +200,18 @@ An example of a sequence which is affected by the “permissive hold” mode:
 - `KC_L` Up
 - `LT(2, KC_A)` Up
 
+```
+                         TAPPING_TERM   
+  +---------------------------|--------+
+  | +----------------------+  |        |
+  | | LT(2, KC_A)          |  |        |
+  | +----------------------+  |        |
+  |    +--------------+       |        |
+  |    | KC_L         |       |        |
+  |    +--------------+       |        |
+  +---------------------------|--------+
+```
+
 Normally, if you do all this within the `TAPPING_TERM` (default: 200ms), this will be registered as `al` by the firmware and host system.  With the `PERMISSIVE_HOLD` option enabled, the Layer Tap key is considered as a layer switch if another key is tapped, and the above sequence would be registered as `KC_RGHT` (the mapping of `L` on layer 2). We could describe this sequence as a “nested press” (the modified key's key down and key up events are “nested” between the dual-role key's key down and key up events).
 
 However, this slightly different sequence will not be affected by the “permissive hold” mode:
@@ -154,6 +221,18 @@ However, this slightly different sequence will not be affected by the “permiss
 - `LT(2, KC_A)` Up
 - `KC_L` Up
 
+```
+                         TAPPING_TERM   
+  +---------------------------|--------+
+  | +-------------+           |        |
+  | | LT(2, KC_A) |           |        |
+  | +-------------+           |        |
+  |       +--------------+    |        |
+  |       | KC_L         |    |        |
+  |       +--------------+    |        |
+  +---------------------------|--------+
+```
+
 In the sequence above the dual-role key is released before the other key is released, and if that happens within the tapping term, the “permissive hold” mode will still choose the tap action for the dual-role key, and the sequence will be registered as `al` by the host. We could describe this as a “rolling press” (the two keys' key down and key up events behave as if you were rolling a ball across the two keys, first pressing each key down in sequence and then releasing them in the same order).
 
 ?> The `PERMISSIVE_HOLD` option also affects Mod Tap keys, but this may not be noticeable if you do not also enable the `IGNORE_MOD_TAP_INTERRUPT` option for those keys, because the default handler for Mod Tap keys also considers both the “nested press” and “rolling press” sequences like shown above as a modifier hold, not the tap action.  If you do not enable `IGNORE_MOD_TAP_INTERRUPT`, the effect of `PERMISSIVE_HOLD` on Mod Tap keys would be limited to reducing the delay before the key events are made visible to the host.
@@ -198,6 +277,18 @@ An example of a sequence which is affected by the “hold on other key press”
 - `LT(2, KC_A)` Up
 - `KC_L` Up
 
+```
+                         TAPPING_TERM
+  +---------------------------|--------+
+  | +-------------+           |        |
+  | | LT(2, KC_A) |           |        |
+  | +-------------+           |        |
+  |       +--------------+    |        |
+  |       | KC_L         |    |        |
+  |       +--------------+    |        |
+  +---------------------------|--------+
+```
+
 Normally, if you do all this within the `TAPPING_TERM` (default: 200ms), this will be registered as `al` by the firmware and host system.  With the `HOLD_ON_OTHER_KEY_PRESS` option enabled, the Layer Tap key is considered as a layer switch if another key is pressed, and the above sequence would be registered as `KC_RGHT` (the mapping of `L` on layer 2).
 
 ?> The `HOLD_ON_OTHER_KEY_PRESS` option also affects Mod Tap keys, but this may not be noticeable if you do not also enable the `IGNORE_MOD_TAP_INTERRUPT` option for those keys, because the default handler for Mod Tap keys also considers the “rolling press” sequence like shown above as a modifier hold, not the tap action.  If you do not enable `IGNORE_MOD_TAP_INTERRUPT`, the effect of `HOLD_ON_OTHER_KEY_PRESS` on Mod Tap keys would be limited to reducing the delay before the key events are made visible to the host.
@@ -245,6 +336,18 @@ An example of a sequence which will be affected by the `IGNORE_MOD_TAP_INTERRUPT
 - `SFT_T(KC_A)` Up
 - `KC_X` Up
 
+```
+                         TAPPING_TERM
+  +---------------------------|--------+
+  | +-------------+           |        |
+  | | SFT_T(KC_A) |           |        |
+  | +-------------+           |        |
+  |       +--------------+    |        |
+  |       | KC_X         |    |        |
+  |       +--------------+    |        |
+  +---------------------------|--------+
+```
+
 Normally, this would send a capital `X` (`SHIFT`+`x`), even if the sequence is performed faster than the `TAPPING_TERM`.  However, if the `IGNORE_MOD_TAP_INTERRUPT` option is enabled, the `SFT_T(KC_A)` key must be held longer than the `TAPPING_TERM` to register the hold action.  A quick tap will output `ax` in this case, while a hold will still output a capital `X` (`SHIFT`+`x`).
 
 However, if the `HOLD_ON_OTHER_KEY_PRESS` option is enabled in addition to `IGNORE_MOD_TAP_INTERRUPT`, the above sequence will again send a capital `X` (`SHIFT`+`x`) even if performed faster that the `TAPPING_TERM`.  The difference from the default configuration is that by default the host will receive the key events only after the `SFT_T(KC_A)` key is released, but with the `HOLD_ON_OTHER_KEY_PRESS` option the host will start receiving key events when the `KC_X` key is pressed.
@@ -327,6 +430,18 @@ Holding and releasing a dual function key without pressing another key will resu
 
 For instance, holding and releasing `LT(2, KC_SPC)` without hitting another key will result in nothing happening. With this enabled, it will send `KC_SPC` instead.
 
+```
+               TAPPING_TERM
+  +-----------------|------------------+
+  | +---------------|-------+          |
+  | | LT(2, KC_SPC) |       |          |
+  | +---------------|-------+          |
+  |                 |                  |
+  |                 |                  |
+  |                 |                  |
+  +-----------------|------------------+
+```
+
 For more granular control of this feature, you can add the following to your `config.h`:
 
 ```c

From b75f6691a15a78b9c200a88e28792974ca2f9461 Mon Sep 17 00:00:00 2001
From: Erovia <Erovia@users.noreply.github.com>
Date: Thu, 10 Mar 2022 21:33:41 +0000
Subject: [PATCH 797/867] CLI: Fix 'cd' subcommand on Windows (#16610)

The 'cd' subcommand was failing as the current shell's Windows path was
mangled while milc processed it.
Using 'subprocess' directly avoids this issue and an extra layer of
subshell.
---
 lib/python/qmk/cli/cd.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/python/qmk/cli/cd.py b/lib/python/qmk/cli/cd.py
index c62c3f56c6..ef03011f1f 100755
--- a/lib/python/qmk/cli/cd.py
+++ b/lib/python/qmk/cli/cd.py
@@ -2,6 +2,7 @@
 """
 import sys
 import os
+import subprocess
 
 from milc import cli
 
@@ -41,6 +42,6 @@ def cd(cli):
             # Set the prompt for the new shell
             qmk_env['MSYS2_PS1'] = qmk_env['PS1']
             # Start the new subshell
-            cli.run([os.environ.get('SHELL', '/usr/bin/bash')], env=qmk_env)
+            subprocess.run([os.environ.get('SHELL', '/usr/bin/bash')], env=qmk_env)
     else:
         cli.log.info("Already within qmk_firmware directory.")

From ee71362f99d1356c8dc48fb98d53c88300a087f8 Mon Sep 17 00:00:00 2001
From: Rocco Meli <r.meli@bluemail.ch>
Date: Thu, 10 Mar 2022 23:27:37 +0000
Subject: [PATCH 798/867] Personal user space and CRKBD R2G keymap (#15888)

* r2g folder groundwork

* Default mb keymap featuring mb logos

* Migrate Oled to keyboard folder

* Move rules configs to support config better

* update readmes

* Liscnece update

* Update config and fix issues caused by redef errs

* funciton name adjusts, define specific rgb modes

* move default oled font to postconfig

* update oled in line with develop merge

* fix return value

* Add some default rgb matrix defines

* del ugfx

* remove #include <stdio.h>

* create personal keymap for r2g

* reduce firmware size

* change keymap to follow physical layout

* remove RGBlight config lines to make both sides work (@Dasky on MechboardsUK Discord)

* strip down configuration, similar to crkbd/r2g:mb_via

* remove wrong oled code overwriting the r2g one

* broken code with RGB matrix (briks right side)

* remove high max brightness limit

* caps lock tap dance and RGB indicator for active caps lock

* fix caps lock led on right side

* add test macro

* remove latex macro which is too slow

* move caps lock tap dance to RALT and add space cadet shift

* switch CTL with ALT in first layer

* add tap dance for ESC/DEL

* space cadet tap dance with caps lock; shift works by needs a short pause

* add space cadet tap dance with caps lock on the right; shift works by needs a short pause and does not hold

* make more keys transparent

* enable auto shift and use logo on both oleds

* add user oled logo, slows down linking considerably

* oled name

* add arrow keys in usual configuration and add linear configuration to symbol layer

* add unicoede support

* add accents

* update to latest version

* add colemak dh layer

* report auto shift timeout

* define layer name shorcuts correctly

* disable VIA to enable more layers

* enable NKRO

* move some rules and unicode to user space

* move oled and tap dances to user space

* move tap dances fully out of keymap

* expand unicode map

* fix unicode code

* revert changes to r2g, make it equal to merged code

* revert changes to r2g, make it equal to merged code

* clang-format userspace

* clang-format config file

* Update keyboards/crkbd/keymaps/rmeli/keymap.c

* replace define with enum

* add licenses
---
 keyboards/crkbd/keymaps/rmeli/config.h |  80 ++++++++++++++
 keyboards/crkbd/keymaps/rmeli/keymap.c | 131 +++++++++++++++++++++++
 keyboards/crkbd/keymaps/rmeli/rules.mk |  12 +++
 users/rmeli/keyrecords/tap_dances.c    | 139 +++++++++++++++++++++++++
 users/rmeli/keyrecords/tap_dances.h    |  70 +++++++++++++
 users/rmeli/keyrecords/unicode.h       |  85 +++++++++++++++
 users/rmeli/oled/oled.c                |  96 +++++++++++++++++
 users/rmeli/oled/oled.h                |  26 +++++
 users/rmeli/readme.md                  |  14 +++
 users/rmeli/rmeli.h                    |  28 +++++
 users/rmeli/rules.mk                   |  20 ++++
 11 files changed, 701 insertions(+)
 create mode 100644 keyboards/crkbd/keymaps/rmeli/config.h
 create mode 100644 keyboards/crkbd/keymaps/rmeli/keymap.c
 create mode 100644 keyboards/crkbd/keymaps/rmeli/rules.mk
 create mode 100644 users/rmeli/keyrecords/tap_dances.c
 create mode 100644 users/rmeli/keyrecords/tap_dances.h
 create mode 100644 users/rmeli/keyrecords/unicode.h
 create mode 100644 users/rmeli/oled/oled.c
 create mode 100644 users/rmeli/oled/oled.h
 create mode 100644 users/rmeli/readme.md
 create mode 100644 users/rmeli/rmeli.h
 create mode 100644 users/rmeli/rules.mk

diff --git a/keyboards/crkbd/keymaps/rmeli/config.h b/keyboards/crkbd/keymaps/rmeli/config.h
new file mode 100644
index 0000000000..36fb755d00
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rmeli/config.h
@@ -0,0 +1,80 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2021 Rocco Meli <@RMeli>
+
+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 MASTER_LEFT  // Left side is the master
+#define SPLIT_LED_STATE_ENABLE
+
+#define TAPPING_TERM 200
+
+#define UNICODE_SELECTED_MODES UC_MAC, UC_LNX
+
+#define AUTO_SHIFT_REPEAT
+
+#ifdef RGBLIGHT_ENABLE
+#    define RGBLIGHT_LIMIT_VAL 120
+#    define RGBLIGHT_HUE_STEP 10
+#    define RGBLIGHT_SAT_STEP 17
+#    define RGBLIGHT_VAL_STEP 17
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+// RGB matrix options
+#    define RGB_MATRIX_KEYPRESSES  // enable keypress effects
+#    define RGB_MATRIX_LED_FLUSH_LIMIT 16
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+// Disable unwanted R2G effects (from r2g/config.h)
+#    undef ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    undef ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    undef ENABLE_RGB_MATRIX_BREATHING
+#    undef ENABLE_RGB_MATRIX_BAND_SAT
+#    undef ENABLE_RGB_MATRIX_BAND_VAL
+#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    undef ENABLE_RGB_MATRIX_CYCLE_ALL
+#    undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    undef ENABLE_RGB_MATRIX_RAINDROPS
+#    undef ENABLE_RGB_MATRIX_HUE_BREATHING
+#    undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+//#   undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    undef ENABLE_RGB_MATRIX_SPLASH
+#    undef ENABLE_RGB_MATRIX_SOLID_SPLASH
+// Enable effects
+#    define ENABLE_RGB_MATRIX_SOLID_COLOR
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+// Default effect
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#    define RGB_MATRIX_STARTUP_HUE 10
+#    define RGB_MATRIX_STARTUP_SAT 255
+#    define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#endif
+
+// https://github.com/qmk/qmk_firmware/blob/develop/docs/squeezing_avr.md
+#undef LOCKING_SUPPORT_ENABLE
+#undef LOCKING_RESYNC_ENABLE
+#define NO_MUSIC_MODE
+#define LAYER_STATE_8BIT  // Limit to 8 layers
diff --git a/keyboards/crkbd/keymaps/rmeli/keymap.c b/keyboards/crkbd/keymaps/rmeli/keymap.c
new file mode 100644
index 0000000000..f7901d1cfd
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rmeli/keymap.c
@@ -0,0 +1,131 @@
+/*
+Copyright 2019 @foostan
+Copyright 2020 Drashna Jaelre <@drashna>
+Copyright 2021 Rocco Meli <@RMeli>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#include "rmeli.h"
+
+// + -------------------- +
+// + RGB MATRIX CALLBACKS |
+// + -------------------- +
+
+// LED numbers:
+//      https://github.com/foostan/crkbd/blob/main/corne-classic/doc/buildguide_en.md
+
+// Change LED color to red when CAPS LOCK is active
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(26, 255, 0, 0);
+        // Only works with SPLIT_LED_STATE_ENABLE
+        rgb_matrix_set_color(53, 255, 0, 0);
+    }
+}
+
+// + ---- +
+// + OLED |
+// + ---- +
+
+bool oled_task_user(void) {
+    if (is_keyboard_master()) {
+        oled_render_rocco();
+    } else {
+        oled_render_meli();
+    }
+    return false;
+}
+
+// + ------- +
+// + KEY MAP |
+// + ------- +
+
+// Layer names
+enum layer_names {
+    _QWERTY,
+    _COLEMAK_DH,
+    _DWN,
+    _UP,
+    _CONFIG,
+};
+
+// Layer names shortcuts
+#define _QWY 0
+#define _CMK 1
+#define _CFG 4
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT_split_3x6_3(
+  //|-----------------------------------------------------|                    |-----------------------------------------------------|
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        TD_ED,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      TD_LSPC,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, TD_RSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,MO(_DWN),  KC_SPC,     KC_ENT,MO(_UP),  KC_RCTL
+                                      //|--------------------------|  |--------------------------|
+  ),
+
+  [_COLEMAK_DH] = LAYOUT_split_3x6_3(
+  //|-----------------------------------------------------|                    |-----------------------------------------------------|
+       KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,                         KC_J,    KC_L,    KC_U, KC_SCLN,   KC_P,  KC_BSPC,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+        TD_ED,    KC_A,    KC_R,    KC_S,    KC_T,    KC_G,                         KC_M,    KC_N,    KC_E,    KC_I,    KC_O, KC_QUOT,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      TD_LSPC,    KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,                         KC_K,    KC_H, KC_COMM,  KC_DOT, KC_SLSH, TD_RSPC,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI,MO(_DWN),  KC_SPC,     KC_ENT,MO(_UP),  KC_RCTL
+                                      //|--------------------------|  |--------------------------|
+  ),
+
+  [_DWN] = LAYOUT_split_3x6_3(
+  //|-----------------------------------------------------|                    |-----------------------------------------------------|
+      _______,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______,   A_GRV,   E_GRV,   I_GRV,   O_GRV,   U_GRV,                      XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, KC_PGUP, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______,   A_UML,   E_ACT,   I_CIR,   O_UML,   U_UML,                      XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, KC_PGDN, _______,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______, _______,    _______,MO(_CFG), _______
+                                      //|--------------------------|  |--------------------------|
+  ),
+
+  [_UP] = LAYOUT_split_3x6_3(
+  //|-----------------------------------------------------|                    |-----------------------------------------------------|
+      _______, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, KC_LEFT, KC_DOWN,  KC_UP, KC_RIGHT, XXXXXXX,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          _______,MO(_CFG), _______,   _______, _______, _______
+                                      //|--------------------------|  |--------------------------|
+  ),
+
+  [_CONFIG] = LAYOUT_split_3x6_3(
+  //|-----------------------------------------------------|                    |-----------------------------------------------------|
+        RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      UC_MOD,  KC_ASUP,   NK_ON, XXXXXXX, XXXXXXX,DF(_QWY),
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,                      XXXXXXX, KC_ASTG, NK_TOGG, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      XXXXXXX,RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,                      UC_RMOD, KC_ASDN,  NK_OFF, XXXXXXX, XXXXXXX,DF(_CMK),
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          _______, _______, _______,   _______, _______, _______
+                                      //|--------------------------|  |--------------------------|
+  )
+};
\ No newline at end of file
diff --git a/keyboards/crkbd/keymaps/rmeli/rules.mk b/keyboards/crkbd/keymaps/rmeli/rules.mk
new file mode 100644
index 0000000000..8e9dbbf8cf
--- /dev/null
+++ b/keyboards/crkbd/keymaps/rmeli/rules.mk
@@ -0,0 +1,12 @@
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
+
+TAP_DANCE_ENABLE = yes
+AUTO_SHIFT_ENABLE = yes
+
+UNICODEMAP_ENABLE = yes
+
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = yes
+
+NKRO_ENABLE = yes
diff --git a/users/rmeli/keyrecords/tap_dances.c b/users/rmeli/keyrecords/tap_dances.c
new file mode 100644
index 0000000000..3b38bf4a33
--- /dev/null
+++ b/users/rmeli/keyrecords/tap_dances.c
@@ -0,0 +1,139 @@
+/*
+Copyright 2021-2022 Rocco Meli <@RMeli>
+
+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 "keyrecords/tap_dances.h"
+
+// + ---------- +
+// + TAP DANCES |
+// + ---------- +
+
+// Tap dances definitions
+// Need to needs to be defined in a .c file to avoid a linker error (multiple definitions)
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_LSPO_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, LSPO_CAPS_finished, LSPO_CAPS_reset),
+    [TD_RSPC_CAPS] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, RSPC_CAPS_finished, RSPC_CAPS_reset),
+    [TD_ESC_DEL]   = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_DEL),
+};
+
+// + ------ +
+// + DANCES |
+// + ------ +
+
+// https://github.com/qmk/qmk_firmware/blob/9294258c02d3e025e01935a06c4d9f1997535bda/users/gordon/gordon.c#L112-L135
+td_state_t hold_cur_dance(qk_tap_dance_state_t *state) {
+    if (state->count == 1) {
+        if (state->interrupted) {
+            if (!state->pressed)
+                return TD_SINGLE_TAP;
+            else
+                return TD_SINGLE_HOLD;
+        } else {
+            if (!state->pressed)
+                return TD_SINGLE_TAP;
+            else
+                return TD_SINGLE_HOLD;
+        }
+    } else if (state->count == 2) {
+        if (state->pressed)
+            return TD_NONE;
+        else
+            return TD_DOUBLE_TAP;
+    } else
+        return TD_NONE;
+}
+
+// + ------------------------------------------------ +
+// + LEFT SHIFT PARENTHESIS OPEN (LSPO) AND CAPS LOCK |
+// + ------------------------------------------------ +
+
+// Create an instance of 'td_tap_t' for the 'LSPO_CAPS' tap dance.
+static td_tap_t LSPO_CAPS_state = {.is_press_action = true, .state = TD_NONE};
+
+void LSPO_CAPS_finished(qk_tap_dance_state_t *state, void *user_data) {
+    LSPO_CAPS_state.state = hold_cur_dance(state);
+    switch (LSPO_CAPS_state.state) {
+        case TD_SINGLE_TAP:
+            register_code16(KC_LPRN);
+            break;
+        case TD_SINGLE_HOLD:
+            register_code16(KC_LSFT);
+            break;
+        case TD_DOUBLE_TAP:
+            register_code16(KC_CAPS);
+            break;
+        case TD_NONE:
+            break;
+    }
+}
+
+void LSPO_CAPS_reset(qk_tap_dance_state_t *state, void *user_data) {
+    switch (LSPO_CAPS_state.state) {
+        case TD_SINGLE_TAP:
+            unregister_code16(KC_LPRN);
+            break;
+        case TD_SINGLE_HOLD:
+            unregister_code16(KC_LSFT);
+            break;
+        case TD_DOUBLE_TAP:
+            unregister_code16(KC_CAPS);
+            break;
+        case TD_NONE:
+            break;
+    }
+    LSPO_CAPS_state.state = TD_NONE;
+}
+
+// + -------------------------------------------------- +
+// + RIGHT SHIFT PARENTHESIS CLOSE (RSPC) AND CAPS LOCK |
+// + -------------------------------------------------- +
+
+// Create an instance of 'td_tap_t' for the 'RSPC_CAPS' tap dance.
+static td_tap_t RSPC_CAPS_state = {.is_press_action = true, .state = TD_NONE};
+
+void RSPC_CAPS_finished(qk_tap_dance_state_t *state, void *user_data) {
+    RSPC_CAPS_state.state = hold_cur_dance(state);
+    switch (RSPC_CAPS_state.state) {
+        case TD_SINGLE_TAP:
+            register_code16(KC_RPRN);
+            break;
+        case TD_SINGLE_HOLD:
+            register_code16(KC_RSFT);
+            break;
+        case TD_DOUBLE_TAP:
+            register_code16(KC_CAPS);
+            break;
+        case TD_NONE:
+            break;
+    }
+}
+
+void RSPC_CAPS_reset(qk_tap_dance_state_t *state, void *user_data) {
+    switch (RSPC_CAPS_state.state) {
+        case TD_SINGLE_TAP:
+            unregister_code16(KC_RPRN);
+            break;
+        case TD_SINGLE_HOLD:
+            unregister_code16(KC_RSFT);
+            break;
+        case TD_DOUBLE_TAP:
+            unregister_code16(KC_CAPS);
+            break;
+        case TD_NONE:
+            break;
+    }
+    RSPC_CAPS_state.state = TD_NONE;
+}
diff --git a/users/rmeli/keyrecords/tap_dances.h b/users/rmeli/keyrecords/tap_dances.h
new file mode 100644
index 0000000000..fa749a17f4
--- /dev/null
+++ b/users/rmeli/keyrecords/tap_dances.h
@@ -0,0 +1,70 @@
+/*
+Copyright 2021-2022 Rocco Meli <@RMeli>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+#include QMK_KEYBOARD_H
+
+// https://beta.docs.qmk.fm/using-qmk/software-features/feature_tap_dance#example-4-quad-function-tap-dance-id-example-4
+
+// + ---------- +
+// + TAP DANCES |
+// + ---------- +
+
+// Tap dance enums
+enum {
+    TD_LSPO_CAPS,  // Tap once for (, hold once for LSFT, tap twice for CAPS
+    TD_RSPC_CAPS,  // Tap once for ), hold once for RSFT, tap twice for CAPS
+    TD_ESC_DEL,    // Tap once for KC_ESC, twice for KC_DEL
+};
+
+// Rename tap dances for keymap with shortcuts
+#define TD_LSPC TD(TD_LSPO_CAPS)
+#define TD_RSPC TD(TD_RSPC_CAPS)
+#define TD_ED TD(TD_ESC_DEL)
+
+// + ----------- +
+// + KEY PRESSES |
+// + ----------- +
+
+// Different types of key presses
+typedef enum {
+    TD_NONE,
+    TD_SINGLE_TAP,
+    TD_SINGLE_HOLD,
+    TD_DOUBLE_TAP,
+} td_state_t;
+
+// Key press state
+typedef struct {
+    bool       is_press_action;
+    td_state_t state;
+} td_tap_t;
+
+// + --------- +
+// + FUNCTIONS |
+// + --------- +
+
+// Tap dance for fast modifiers; favors being held over being tapped.
+td_state_t hold_cur_dance(qk_tap_dance_state_t *state);
+
+// Left Shift Parenthesis Open (LSPO) and Caps Lock (CAPS) on DOUBLE_TAP
+void LSPO_CAPS_finished(qk_tap_dance_state_t *state, void *user_data);
+void LSPO_CAPS_reset(qk_tap_dance_state_t *state, void *user_data);
+
+// Right Shift Parenthesis Close (RSPC) and Caps Lock (CAPS) on DOUBLE_TAP
+void RSPC_CAPS_finished(qk_tap_dance_state_t *state, void *user_data);
+void RSPC_CAPS_reset(qk_tap_dance_state_t *state, void *user_data);
diff --git a/users/rmeli/keyrecords/unicode.h b/users/rmeli/keyrecords/unicode.h
new file mode 100644
index 0000000000..8e0c02d278
--- /dev/null
+++ b/users/rmeli/keyrecords/unicode.h
@@ -0,0 +1,85 @@
+/*
+Copyright 2021-2022 Rocco Meli <@RMeli>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+#include QMK_KEYBOARD_H
+
+// Needs to be active on the OS side as well
+// https://docs.qmk.fm/#/feature_unicode?id=input-modes
+
+enum unicode_names {
+    aGRV,
+    AGRV,
+    aUML,
+    AUML,
+    eGRV,
+    EGRV,
+    eACT,
+    EACT,
+    iGRV,
+    IGRV,
+    iCIR,
+    ICIR,
+    oGRV,
+    OGRV,
+    oUML,
+    OUML,
+    uGRV,
+    UGRV,
+    uUML,
+    UUML,
+};
+
+const uint32_t PROGMEM unicode_map[] = {
+    // KC_A
+    [aGRV] = 0x00E0,  // à
+    [AGRV] = 0x00C0,  // À
+    [aUML] = 0x00E4,  // ä
+    [AUML] = 0x00C4,  // Ä
+    // KC_E
+    [eGRV] = 0x00E8,  // è
+    [EGRV] = 0x00C8,  // È
+    [eACT] = 0x00E9,  // é
+    [EACT] = 0x00C9,  // É
+    // KC_I
+    [iGRV] = 0x00EC,  // ì
+    [IGRV] = 0x00CC,  // Ì
+    [iCIR] = 0x00EE,  // î
+    [ICIR] = 0x00CE,  // Î
+    // KC_O
+    [oGRV] = 0x00F2,  // ò
+    [OGRV] = 0x00D2,  // Ò
+    [oUML] = 0x00F6,  // ö
+    [OUML] = 0x00D6,  // Ö
+    // KC_U
+    [uGRV] = 0x00F9,  // ù
+    [UGRV] = 0x00D9,  // Ù
+    [uUML] = 0x00FC,  // ü
+    [UUML] = 0x00DC,  // Ü
+};
+
+// Accents
+#define A_GRV XP(aGRV, AGRV)
+#define A_UML XP(aUML, AUML)
+#define E_GRV XP(eGRV, EGRV)
+#define E_ACT XP(eACT, EACT)
+#define I_GRV XP(iGRV, IGRV)
+#define I_CIR XP(iCIR, ICIR)
+#define O_GRV XP(oGRV, OGRV)
+#define O_UML XP(oUML, OUML)
+#define U_GRV XP(uGRV, UGRV)
+#define U_UML XP(uUML, UUML)
diff --git a/users/rmeli/oled/oled.c b/users/rmeli/oled/oled.c
new file mode 100644
index 0000000000..d6d4b2c43c
--- /dev/null
+++ b/users/rmeli/oled/oled.c
@@ -0,0 +1,96 @@
+/*
+Copyright 2021-2022 Rocco Meli <@RMeli>
+
+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 "oled/oled.h"
+
+void oled_render_rocco(void) {
+    static const char PROGMEM rocco[] = {
+        // 'rocco', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf8, 0xf8, 0xf8, 0x18, 
+        0x18, 0x18, 0x18, 0x18, 0x38, 0x38, 0x78, 0xf0, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x80, 
+        0x80, 0x80, 0x80, 0x80, 0x80, 0xc0, 0xe0, 0xff, 0x7f, 0x3f, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x80, 0xe0, 0xf0, 0x78, 0x38, 0x1c, 0x1c, 0x1c, 0x0c, 0x1c, 0x1c, 0x1c, 0x38, 0xf8, 0xf0, 
+        0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xe0, 0xf0, 0x78, 0x38, 0x1c, 0x1c, 0x1c, 
+        0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xf8, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 
+        0xf0, 0xf0, 0x38, 0x3c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0xf8, 0xf8, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf0, 0x38, 0x38, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 
+        0x38, 0x78, 0xf0, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x03, 
+        0x03, 0x03, 0x03, 0x03, 0x0f, 0x3f, 0xff, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x18, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
+        0xff, 0xff, 0x18, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xff, 0xff, 0xc1, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
+        0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x81, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x1f, 0x1f, 0x1c, 0x10, 0x00, 0x00, 0x00, 
+        0x00, 0x01, 0x03, 0x07, 0x0f, 0x1e, 0x1c, 0x18, 0x18, 0x38, 0x18, 0x18, 0x1c, 0x1c, 0x0f, 0x07, 
+        0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x07, 0x0f, 0x0f, 0x1e, 0x1c, 0x1c, 0x1c, 
+        0x38, 0x38, 0x18, 0x1c, 0x1c, 0x1c, 0x0e, 0x0e, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 
+        0x07, 0x0f, 0x0e, 0x1e, 0x1c, 0x1c, 0x18, 0x38, 0x18, 0x1c, 0x1c, 0x1c, 0x1c, 0x0e, 0x0e, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 0x0e, 0x1c, 0x1c, 0x18, 0x18, 0x18, 0x18, 0x18, 
+        0x1c, 0x0e, 0x0f, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    };
+    oled_write_raw_P(rocco, sizeof(rocco));
+}
+
+void oled_render_meli(void) {
+    static const char PROGMEM meli[] = {
+        // 'meli', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0xf8, 0xf8, 0xe0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0xc0, 0xf0, 0xf8, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x38, 0xf8, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x30, 0x78, 0x78, 0x78, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x01, 0x07, 0x1f, 0x3f, 0xfc, 0xf8, 0xf0, 0xf8, 
+        0x7e, 0x1f, 0x07, 0x03, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xf0, 
+        0x38, 0x18, 0x1c, 0x1c, 0x1c, 0x0c, 0x1c, 0x1c, 0x1c, 0x38, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 
+        0x1c, 0xfc, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x8c, 
+        0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0f, 0x0f, 0x0f, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x07, 0x0f, 
+        0x0e, 0x1c, 0x1c, 0x18, 0x18, 0x38, 0x18, 0x18, 0x1c, 0x1c, 0x0c, 0x0e, 0x06, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x1f, 0x1c, 0x18, 0x38, 0x38, 0x18, 
+        0x1c, 0x1c, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+        0x18, 0x1f, 0x1f, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    };
+    oled_write_raw_P(meli, sizeof(meli));
+}
diff --git a/users/rmeli/oled/oled.h b/users/rmeli/oled/oled.h
new file mode 100644
index 0000000000..b91fe2d76b
--- /dev/null
+++ b/users/rmeli/oled/oled.h
@@ -0,0 +1,26 @@
+/*
+Copyright 2021-2022 Rocco Meli <@RMeli>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+#include QMK_KEYBOARD_H
+
+// + --------- +
+// + RENDERERS |
+// + --------- +
+
+void oled_render_rocco(void);
+void oled_render_meli(void);
diff --git a/users/rmeli/readme.md b/users/rmeli/readme.md
new file mode 100644
index 0000000000..ed5561dea7
--- /dev/null
+++ b/users/rmeli/readme.md
@@ -0,0 +1,14 @@
+Copyright 2022 Rocco Meli @RMeli
+
+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/>.
\ No newline at end of file
diff --git a/users/rmeli/rmeli.h b/users/rmeli/rmeli.h
new file mode 100644
index 0000000000..e6f51d4908
--- /dev/null
+++ b/users/rmeli/rmeli.h
@@ -0,0 +1,28 @@
+/*
+Copyright 2021-2022 Rocco Meli <@RMeli>
+
+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/>.
+*/
+
+#ifdef UNICODEMAP_ENABLE
+#    include "keyrecords/unicode.h"
+#endif
+
+#ifdef OLED_ENABLE
+#    include "oled/oled.h"
+#endif
+
+#ifdef TAP_DANCE_ENABLE
+#    include "keyrecords/tap_dances.h"
+#endif
\ No newline at end of file
diff --git a/users/rmeli/rules.mk b/users/rmeli/rules.mk
new file mode 100644
index 0000000000..293685e08b
--- /dev/null
+++ b/users/rmeli/rules.mk
@@ -0,0 +1,20 @@
+# https://github.com/qmk/qmk_firmware/blob/develop/docs/squeezing_avr.md
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no # Needed for Space Cadet Shift
+MOUSEKEY_ENABLE = no
+SPACE_CADET_ENABLE = no # Implemented with tap dance
+GRAVE_ESC_ENABLE = no
+MAGIC_ENABLE = no
+MUSIC_ENABLE = no
+
+# VIA only support 4 layers by default
+# Use "#define DYNAMIC_KEYMAP_LAYER_COUNT" in config.h to change the limit
+VIA_ENABLE = no
+
+ifeq ($(strip $(OLED_ENABLE)), yes)
+    SRC += $(USER_PATH)/oled/oled.c
+endif
+
+ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
+    SRC += $(USER_PATH)/keyrecords/tap_dances.c
+endif
\ No newline at end of file

From 003231aaf25facf7437caa32f3e8bc2a2e9cbe7d Mon Sep 17 00:00:00 2001
From: mechlovin <57231893+mechlovin@users.noreply.github.com>
Date: Fri, 11 Mar 2022 12:02:40 +0700
Subject: [PATCH 799/867] [Keyboard] Add Mechlovin Infinity87.5 PCB (#15163)

* add infinity87.5

* Update readme.md

* Update keyboards/mechlovin/infinity875/config.h

* Update keyboards/mechlovin/infinity875/info.json

* Update keyboards/mechlovin/infinity875/rules.mk

* Update keyboards/mechlovin/infinity875/rules.mk

* Update keyboards/mechlovin/infinity875/config.h

* Enable RGB matrix effect

* update keymap default

* undef RGB matrix effect

* Update keyboards/mechlovin/infinity875/rules.mk

* Update keyboards/mechlovin/infinity875/rules.mk

* Update keyboards/mechlovin/infinity875/rules.mk

* Update keyboards/mechlovin/infinity875/readme.md

* Update keyboards/mechlovin/infinity875/infinity875.h

* Update keyboards/mechlovin/infinity875/infinity875.h

* Update keyboards/mechlovin/infinity875/info.json

* Update keyboards/mechlovin/infinity875/infinity875.h

* Update keyboards/mechlovin/infinity875/infinity875.h

* Update keyboards/mechlovin/infinity875/info.json

* Update keyboards/mechlovin/infinity875/info.json

* Update keyboards/mechlovin/infinity875/info.json
---
 keyboards/mechlovin/infinity875/config.h      |  64 ++
 keyboards/mechlovin/infinity875/infinity875.c |  45 ++
 keyboards/mechlovin/infinity875/infinity875.h |  99 +++
 keyboards/mechlovin/infinity875/info.json     |  23 +
 .../infinity875/keymaps/default/keymap.c      |  35 +
 .../infinity875/keymaps/default/readme.md     |   1 +
 .../keymaps/default/rgb_matrix_user.inc       | 764 ++++++++++++++++++
 .../infinity875/keymaps/default/rules.mk      |   1 +
 .../infinity875/keymaps/via/config.h          |  24 +
 .../infinity875/keymaps/via/keymap.c          |  51 ++
 .../infinity875/keymaps/via/readme.md         |   1 +
 .../keymaps/via/rgb_matrix_user.inc           | 764 ++++++++++++++++++
 .../infinity875/keymaps/via/rules.mk          |   3 +
 keyboards/mechlovin/infinity875/matrix.c      | 388 +++++++++
 keyboards/mechlovin/infinity875/readme.md     |  24 +
 keyboards/mechlovin/infinity875/rules.mk      |  23 +
 16 files changed, 2310 insertions(+)
 create mode 100644 keyboards/mechlovin/infinity875/config.h
 create mode 100644 keyboards/mechlovin/infinity875/infinity875.c
 create mode 100644 keyboards/mechlovin/infinity875/infinity875.h
 create mode 100644 keyboards/mechlovin/infinity875/info.json
 create mode 100644 keyboards/mechlovin/infinity875/keymaps/default/keymap.c
 create mode 100644 keyboards/mechlovin/infinity875/keymaps/default/readme.md
 create mode 100644 keyboards/mechlovin/infinity875/keymaps/default/rgb_matrix_user.inc
 create mode 100644 keyboards/mechlovin/infinity875/keymaps/default/rules.mk
 create mode 100644 keyboards/mechlovin/infinity875/keymaps/via/config.h
 create mode 100644 keyboards/mechlovin/infinity875/keymaps/via/keymap.c
 create mode 100644 keyboards/mechlovin/infinity875/keymaps/via/readme.md
 create mode 100644 keyboards/mechlovin/infinity875/keymaps/via/rgb_matrix_user.inc
 create mode 100644 keyboards/mechlovin/infinity875/keymaps/via/rules.mk
 create mode 100644 keyboards/mechlovin/infinity875/matrix.c
 create mode 100644 keyboards/mechlovin/infinity875/readme.md
 create mode 100644 keyboards/mechlovin/infinity875/rules.mk

diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h
new file mode 100644
index 0000000000..6b6a8147f6
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/config.h
@@ -0,0 +1,64 @@
+/*
+Copyright 2021 Mechlovin' Studio
+
+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   0x4D4C // ML
+#define PRODUCT_ID  0x0875
+#define DEVICE_VER  0x0001
+#define PRODUCT     Infinity87.5
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+ 
+
+/*
+ * 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 { D5, D2, D4, D3, D0, D1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+#define LED_CAPS_LOCK_PIN D6
+#define LED_SCROLL_LOCK_PIN B4
+#define LED_PIN_ON_STATE 1
+
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_DI_PIN E2
+#define DRIVER_LED_TOTAL 42
+#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // 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 220 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+#endif
+
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mechlovin/infinity875/infinity875.c b/keyboards/mechlovin/infinity875/infinity875.c
new file mode 100644
index 0000000000..43606b6c92
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/infinity875.c
@@ -0,0 +1,45 @@
+/* Copyright 2021 Mechlovin' Studio
+ *
+ * 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 "infinity875.h"
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+  //Key Matrix to LED Index
+  {0,          1,         2,           3,          4,          6,          7,          8,          9,         10,         11,          12,          13,          14,          15,         16,         17},
+  {NO_LED, NO_LED,   NO_LED,      NO_LED,      NO_LED,    NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,      NO_LED,     NO_LED,      NO_LED,      NO_LED,      NO_LED,     NO_LED,     NO_LED},
+  {NO_LED, NO_LED,    NO_LED,      NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,      NO_LED,     NO_LED,      NO_LED,      NO_LED,      NO_LED,     NO_LED,     NO_LED},
+  {NO_LED, NO_LED,    NO_LED,      NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,      NO_LED,     NO_LED,      NO_LED,      NO_LED,      NO_LED,     NO_LED,     NO_LED},
+  {NO_LED, NO_LED,    NO_LED,      NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,      NO_LED,     NO_LED,      NO_LED,      NO_LED,      NO_LED,     NO_LED,     NO_LED},
+  {NO_LED, NO_LED,    NO_LED,      NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,     NO_LED,      NO_LED,     NO_LED,      NO_LED,      NO_LED,      NO_LED,     NO_LED,     NO_LED}
+}, {
+  //LED Index to Physical Positon
+  {0,0},  {14,0},    {28,0},      {42,0},     {56,0},     {67,0},     {70,0},     {84,0},     {98,0},    {112,0},    {126,0},     {140,0},     {154,0},     {168,0},     {182,0},     {196,0},    {210,0},     {224,0},
+  {224,13},          {196,13},                {182,13},               {154,13},               {112,13},                           {84,13},                  {56,13},     {28,13},                 {0,13},
+  {0,25},                                                                                                                                                                                         {0,38},
+  {0,51},                                                                                                                                                                                         {0,64},
+  {28,64},                                                                                                                                                                                        {56,64},
+  {84,64},           {112,64},                {154,64},                           {182,64},              {196,64},                {224,64},    {224,51},                 {224,38},                {224,25},
+//{244,64},          {196,64},                {182,64},                           {154,64},              {112,64},                {84,64},     {56,64},                  {28,64},                 {0,64},
+}, {
+      1,       1,         1,           1,          1,          1,          1,          1,          1,          1,           1,          1,           1,           1,           1,           1,          1,           1,
+      1,                  1,                       1,                      1,                      1,                                   1,                        1,           1,                       1,
+      1,                                                                                                                                                                                                1,
+      1,                                                                                                                                                                                                1,
+      1,                                                                                                                                                                                                1,
+      1,                  1,                       1,                                  1,                      1,                       1,           1,                        1,                       1,
+} };
+#endif
+
diff --git a/keyboards/mechlovin/infinity875/infinity875.h b/keyboards/mechlovin/infinity875/infinity875.h
new file mode 100644
index 0000000000..2febe0824c
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/infinity875.h
@@ -0,0 +1,99 @@
+/* Copyright 2021 Mechlovin' Studio
+ *
+ * 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, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,        K2E, K2F, K2G,  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                        \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
+    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
+}
+
+#define LAYOUT_tkl_f13_ansi_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,        K2E, K2F, K2G,  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                        \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
+    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
+    { K40, KC_NO,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
+}
+
+#define LAYOUT_tkl_f13_iso_split_bs_rshift( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K2E, K2F, K2G,  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                        \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
+    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
+}
+
+#define LAYOUT_tkl_ansi_split_bs_rshift( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C,        K2E, K2F, K2G,  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                        \
+    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
+    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
+) { \
+    { K00, KC_NO,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
+    { K40, KC_NO,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
+}
+
+#define LAYOUT_tkl_iso_split_bs_rshift( \
+    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        K0E, K0F, K0G,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,   K1E, K1F, K1G,  \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,             K2E, K2F, K2G,  \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                        \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,             K4F,       \
+    K50, K51, K52,                K56,                K5A, K5B, K5C, K5D,        K5E, K5F, K5G   \
+) { \
+    { K00, KC_NO,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   KC_NO, KC_NO, KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
+}
diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json
new file mode 100644
index 0000000000..e24c0d1cc2
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/info.json
@@ -0,0 +1,23 @@
+{
+    "keyboard_name": "Infinity87.5",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "layouts": {
+        "LAYOUT_tkl_ansi_split_bs_rshift": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        },
+        "LAYOUT_tkl_iso_split_bs_rshift": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"0,2", "x":3, "y":0}, {"label":"0,3", "x":4, "y":0}, {"label":"0,4", "x":5, "y":0}, {"label":"0,5", "x":6.5, "y":0}, {"label":"0,6", "x":7.5, "y":0}, {"label":"0,7", "x":8.5, "y":0}, {"label":"0,8", "x":9.5, "y":0}, {"label":"0,9", "x":11, "y":0}, {"label":"0,10", "x":12, "y":0}, {"label":"0,11", "x":13, "y":0}, {"label":"0,12", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,13", "x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        },
+        "LAYOUT_tkl_f13_ansi_split_bs_rshift": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        },
+        "LAYOUT_tkl_f13_iso_split_bs_rshift": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,13", "x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        },
+        "LAYOUT_all": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"2,13", "x":14, "y":1.25}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"3,12", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,13", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25}, {"label":"4,13", "x":13.25, "y":4.25, "w":1.75}, {"label":"4,15", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,10", "x":10, "y":5.25, "w":1.25}, {"label":"5,11", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,12", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,13", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}]
+        }
+    }
+    ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}
diff --git a/keyboards/mechlovin/infinity875/keymaps/default/keymap.c b/keyboards/mechlovin/infinity875/keymaps/default/keymap.c
new file mode 100644
index 0000000000..93073a1722
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 Mechlovin' Studio
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,    KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_LSFT,                     KC_UP,
+        KC_LCTL,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LGUI, MO(1),   KC_LCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, RGB_SAI, RGB_HUI,
+        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, RGB_SAD, RGB_HUD,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_TOG,
+        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,                      RGB_VAI,
+        KC_TRNS,   KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            RGB_RMOD, RGB_VAD, RGB_MOD
+    )
+};
diff --git a/keyboards/mechlovin/infinity875/keymaps/default/readme.md b/keyboards/mechlovin/infinity875/keymaps/default/readme.md
new file mode 100644
index 0000000000..877e1a6862
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for infinity875
diff --git a/keyboards/mechlovin/infinity875/keymaps/default/rgb_matrix_user.inc b/keyboards/mechlovin/infinity875/keymaps/default/rgb_matrix_user.inc
new file mode 100644
index 0000000000..cee6a3f038
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/keymaps/default/rgb_matrix_user.inc
@@ -0,0 +1,764 @@
+/*
+Copyright 2020 Evy Dekkers
+
+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/>.
+*/
+
+RGB_MATRIX_EFFECT(solid_esc)
+RGB_MATRIX_EFFECT(solid_f13)
+RGB_MATRIX_EFFECT(solid_clus)
+RGB_MATRIX_EFFECT(breathing_all)
+RGB_MATRIX_EFFECT(breathing_esc)
+RGB_MATRIX_EFFECT(breathing_f13)
+RGB_MATRIX_EFFECT(breathing_clus)
+RGB_MATRIX_EFFECT(band_val_all)
+RGB_MATRIX_EFFECT(band_val_esc)
+RGB_MATRIX_EFFECT(band_val_f13)
+RGB_MATRIX_EFFECT(band_val_clus)
+RGB_MATRIX_EFFECT(cycle_up_down_all)
+RGB_MATRIX_EFFECT(cycle_up_down_esc)
+RGB_MATRIX_EFFECT(cycle_up_down_f13)
+RGB_MATRIX_EFFECT(cycle_up_down_clus)
+RGB_MATRIX_EFFECT(cycle_out_in_dual_all)
+RGB_MATRIX_EFFECT(cycle_out_in_dual_esc)
+RGB_MATRIX_EFFECT(cycle_out_in_dual_f13)
+RGB_MATRIX_EFFECT(cycle_out_in_dual_clus)
+RGB_MATRIX_EFFECT(rainbow_moving_chevron_all)
+RGB_MATRIX_EFFECT(rainbow_moving_chevron_esc)
+RGB_MATRIX_EFFECT(rainbow_moving_chevron_f13)
+RGB_MATRIX_EFFECT(rainbow_moving_chevron_clus)
+RGB_MATRIX_EFFECT(cycle_pimwheel_all)
+RGB_MATRIX_EFFECT(cycle_pimwheel_esc)
+RGB_MATRIX_EFFECT(cycle_pimwheel_f13)
+RGB_MATRIX_EFFECT(cycle_pimwheel_clus)
+RGB_MATRIX_EFFECT(rainbow_beacon_all)
+RGB_MATRIX_EFFECT(rainbow_beacon_esc)
+RGB_MATRIX_EFFECT(rainbow_beacon_f13)
+RGB_MATRIX_EFFECT(rainbow_beacon_clus)
+RGB_MATRIX_EFFECT(raindrops_all)
+RGB_MATRIX_EFFECT(raindrops_esc)
+RGB_MATRIX_EFFECT(raindrops_f13)
+RGB_MATRIX_EFFECT(raindrops_clus)
+
+#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+bool effect_runner_all(effect_params_t* params, i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed / 4, 1));
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_esc(effect_params_t* params, i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed / 4, 1));
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    for (uint8_t i = 1; i < 18; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_f13(effect_params_t* params, i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed / 4, 1));
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(17, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 0; i < 14; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_clus(effect_params_t* params, i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed / 4, 1));
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    for (uint8_t i = 0; i < 15; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_dx_dy_all(effect_params_t* params, dx_dy_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 2);
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        int16_t dx  = g_led_config.point[i].x - k_rgb_matrix_center.x;
+        int16_t dy  = g_led_config.point[i].y - k_rgb_matrix_center.y;
+        RGB     rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_dx_dy_esc(effect_params_t* params, dx_dy_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 2);
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        int16_t dx  = g_led_config.point[i].x - k_rgb_matrix_center.x;
+        int16_t dy  = g_led_config.point[i].y - k_rgb_matrix_center.y;
+        RGB     rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    for (uint8_t i = 1; i < 18; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_dx_dy_f13(effect_params_t* params, dx_dy_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 2);
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        int16_t dx  = g_led_config.point[i].x - k_rgb_matrix_center.x;
+        int16_t dy  = g_led_config.point[i].y - k_rgb_matrix_center.y;
+        RGB     rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(17, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 0; i < 14; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_dx_dy_clus(effect_params_t* params, dx_dy_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 2);
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        int16_t dx  = g_led_config.point[i].x - k_rgb_matrix_center.x;
+        int16_t dy  = g_led_config.point[i].y - k_rgb_matrix_center.y;
+        RGB     rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    for (uint8_t i = 0; i < 15; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_sin_cos_all(effect_params_t* params, sin_cos_i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint16_t time      = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4);
+    int8_t   cos_value = cos8(time) - 128;
+    int8_t   sin_value = sin8(time) - 128;
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_sin_cos_esc(effect_params_t* params, sin_cos_i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint16_t time      = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4);
+    int8_t   cos_value = cos8(time) - 128;
+    int8_t   sin_value = sin8(time) - 128;
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    for (uint8_t i = 1; i < 18; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_sin_cos_f13(effect_params_t* params, sin_cos_i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint16_t time      = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4);
+    int8_t   cos_value = cos8(time) - 128;
+    int8_t   sin_value = sin8(time) - 128;
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(17, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 0; i < 14; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_sin_cos_clus(effect_params_t* params, sin_cos_i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint16_t time      = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4);
+    int8_t   cos_value = cos8(time) - 128;
+    int8_t   sin_value = sin8(time) - 128;
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    for (uint8_t i = 0; i < 15; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+static void raindrops_set_color_all(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
+    HSV hsv = {0, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v};
+
+    // Take the shortest path between hues
+    int16_t deltaH = ((rgb_matrix_config.hsv.h + 180) % 360 - rgb_matrix_config.hsv.h) / 4;
+    if (deltaH > 127) {
+        deltaH -= 256;
+    } else if (deltaH < -127) {
+        deltaH += 256;
+    }
+
+    hsv.h   = rgb_matrix_config.hsv.h + (deltaH * (rand() & 0x03));
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+}
+
+static void raindrops_set_color_esc(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
+    HSV hsv = {0, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v};
+
+    // Take the shortest path between hues
+    int16_t deltaH = ((rgb_matrix_config.hsv.h + 180) % 360 - rgb_matrix_config.hsv.h) / 4;
+    if (deltaH > 127) {
+        deltaH -= 256;
+    } else if (deltaH < -127) {
+        deltaH += 256;
+    }
+
+    hsv.h   = rgb_matrix_config.hsv.h + (deltaH * (rand() & 0x03));
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    for (uint8_t i = 1; i < 18; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+}
+
+static void raindrops_set_color_f13(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
+    HSV hsv = {0, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v};
+
+    // Take the shortest path between hues
+    int16_t deltaH = ((rgb_matrix_config.hsv.h + 180) % 360 - rgb_matrix_config.hsv.h) / 4;
+    if (deltaH > 127) {
+        deltaH -= 256;
+    } else if (deltaH < -127) {
+        deltaH += 256;
+    }
+
+    hsv.h   = rgb_matrix_config.hsv.h + (deltaH * (rand() & 0x03));
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(17, 0x00, 0x00, 0x00);
+    for (uint8_t i = 0; i < 14; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+}
+
+static void raindrops_set_color_clus(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
+    HSV hsv = {0, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v};
+
+    // Take the shortest path between hues
+    int16_t deltaH = ((rgb_matrix_config.hsv.h + 180) % 360 - rgb_matrix_config.hsv.h) / 4;
+    if (deltaH > 127) {
+        deltaH -= 256;
+    } else if (deltaH < -127) {
+        deltaH += 256;
+    }
+
+    hsv.h   = rgb_matrix_config.hsv.h + (deltaH * (rand() & 0x03));
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    for (uint8_t i = 0; i < 15; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+}
+
+static HSV BAND_VAL_CUSTOM(HSV hsv, uint8_t i, uint8_t time) {
+    int16_t v = hsv.v - abs(scale8(g_led_config.point[i].x, 228) + 28 - time) * 8;
+    hsv.v     = scale8(v < 0 ? 0 : v, hsv.v);
+    return hsv;
+}
+
+static HSV CYCLE_UP_DOWN_CUSTOM(HSV hsv, uint8_t i, uint8_t time) {
+        hsv.h = g_led_config.point[i].y - time;
+    return hsv;
+}
+
+static HSV CYCLE_OUT_IN_DUAL_CUSTOM(HSV hsv, int16_t dx, int16_t dy, uint8_t time) {
+    dx           = (k_rgb_matrix_center.x / 2) - abs8(dx);
+    uint8_t dist = sqrt16(dx * dx + dy * dy);
+    hsv.h        = 3 * dist + time;
+    return hsv;
+}
+
+static HSV RAINBOW_MOVING_CHEVRON_CUSTOM(HSV hsv, uint8_t i, uint8_t time) {
+    hsv.h += abs8(g_led_config.point[i].y - k_rgb_matrix_center.y) + (g_led_config.point[i].x - time);
+    return hsv;
+}
+
+static HSV CYCLE_PINWHEEL_CUSTOM(HSV hsv, int16_t dx, int16_t dy, uint8_t time) {
+    hsv.h = atan2_8(dy, dx) + time;
+    return hsv;
+}
+
+static HSV RAINBOW_BEACON_CUSTOM(HSV hsv, int8_t sin, int8_t cos, uint8_t i, uint8_t time) {
+    hsv.h += ((g_led_config.point[i].y - k_rgb_matrix_center.y) * 2 * cos + (g_led_config.point[i].x - k_rgb_matrix_center.x) * 2 * sin) / 128;
+    return hsv;
+}
+
+
+
+// Solid ESC
+static bool solid_esc(effect_params_t* params) {
+    HSV hsv = rgb_matrix_config.hsv;
+    RGB rgb = hsv_to_rgb(hsv);
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 18 ; i < led_max; i++) {
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Solid F13
+static bool solid_f13(effect_params_t* params) {
+    HSV hsv = rgb_matrix_config.hsv;
+    RGB rgb = hsv_to_rgb(hsv);
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 18 ; i < led_max; i++) {
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        rgb_matrix_set_color(14, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Solid cluster
+static bool solid_clus(effect_params_t* params) {
+    HSV hsv = rgb_matrix_config.hsv;
+    RGB rgb = hsv_to_rgb(hsv);
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 15 ; i < led_max; i++) {
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Breathing all
+
+bool breathing_all(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    HSV      hsv  = rgb_matrix_config.hsv;
+    uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
+    hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+    RGB rgb       = rgb_matrix_hsv_to_rgb(hsv);
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Breathing ESC
+static bool breathing_esc(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    HSV      hsv  = rgb_matrix_config.hsv;
+    uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
+    hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+    RGB rgb       = rgb_matrix_hsv_to_rgb(hsv);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 18; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+        rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b);
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Breathing F13
+static bool breathing_f13(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    HSV      hsv  = rgb_matrix_config.hsv;
+    uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
+    hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+    RGB rgb       = rgb_matrix_hsv_to_rgb(hsv);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 18; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+        rgb_matrix_set_color(14, rgb.r, rgb.g, rgb.b);
+    return led_max < DRIVER_LED_TOTAL;  
+}
+
+// Breathing cluster
+static bool breathing_clus(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    HSV      hsv  = rgb_matrix_config.hsv;
+    uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
+    hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+    RGB rgb       = rgb_matrix_hsv_to_rgb(hsv);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 15; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Band Val all
+bool band_val_all(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_all(params, &BAND_VAL_CUSTOM); 
+}
+
+// Band Val ESC
+bool band_val_esc(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_esc(params, &BAND_VAL_CUSTOM); 
+}
+
+// Band Val F13
+bool band_val_f13(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_f13(params, &BAND_VAL_CUSTOM); 
+}
+
+// Band Val Cluster
+bool band_val_clus(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_clus(params, &BAND_VAL_CUSTOM); 
+}
+
+// Cycle Up Down All
+static bool cycle_up_down_all(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_all(params, &CYCLE_UP_DOWN_CUSTOM);
+}
+
+// Cycle Up Down ESC
+static bool cycle_up_down_esc(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_esc(params, &CYCLE_UP_DOWN_CUSTOM);
+}
+
+// Cycle up down F13
+static bool cycle_up_down_f13(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_f13(params, &CYCLE_UP_DOWN_CUSTOM);
+}
+
+// Cycle up down cluster
+static bool cycle_up_down_clus(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_clus(params, &CYCLE_UP_DOWN_CUSTOM);
+}
+
+// Cycle out in dual All
+static bool cycle_out_in_dual_all(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_all(params, &CYCLE_OUT_IN_DUAL_CUSTOM); 
+}
+
+// Cycle out in dual ESC
+static bool cycle_out_in_dual_esc(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_esc(params, &CYCLE_OUT_IN_DUAL_CUSTOM); 
+}
+
+// Cycle out in dual f13
+static bool cycle_out_in_dual_f13(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_f13(params, &CYCLE_OUT_IN_DUAL_CUSTOM); 
+}
+
+// Cycle out in dual cluster
+static bool cycle_out_in_dual_clus(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_clus(params, &CYCLE_OUT_IN_DUAL_CUSTOM); 
+}
+
+// Moving chevron all
+static bool rainbow_moving_chevron_all(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_all(params, &RAINBOW_MOVING_CHEVRON_CUSTOM); 
+}
+
+// Moving chevron ESC
+static bool rainbow_moving_chevron_esc(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_esc(params, &RAINBOW_MOVING_CHEVRON_CUSTOM); 
+}
+// Moving chevron F13
+static bool rainbow_moving_chevron_f13(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_f13(params, &RAINBOW_MOVING_CHEVRON_CUSTOM); 
+}
+// Moving chevron cluster
+static bool rainbow_moving_chevron_clus(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_clus(params, &RAINBOW_MOVING_CHEVRON_CUSTOM); 
+}
+
+// Moving cycle pimwheel all
+static bool cycle_pimwheel_all(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_all(params, &CYCLE_PINWHEEL_CUSTOM); 
+}
+
+// Moving cycle pimwheel esc
+static bool cycle_pimwheel_esc(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_esc(params, &CYCLE_PINWHEEL_CUSTOM); 
+}
+
+// Moving cycle pimwheel f13
+static bool cycle_pimwheel_f13(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_f13(params, &CYCLE_PINWHEEL_CUSTOM); 
+}
+
+// Moving cycle pimwheel cluster
+static bool cycle_pimwheel_clus(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_clus(params, &CYCLE_PINWHEEL_CUSTOM); 
+}
+
+// Moving rainbow beacon all
+static bool rainbow_beacon_all(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_sin_cos_all(params, &RAINBOW_BEACON_CUSTOM); 
+}
+
+// Moving rainbow beacon esc
+static bool rainbow_beacon_esc(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_sin_cos_esc(params, &RAINBOW_BEACON_CUSTOM); 
+}
+
+// Moving rainbow beacon f13
+static bool rainbow_beacon_f13(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_sin_cos_f13(params, &RAINBOW_BEACON_CUSTOM); 
+}
+
+// Moving rainbow beacon cluster
+static bool rainbow_beacon_clus(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_sin_cos_clus(params, &RAINBOW_BEACON_CUSTOM); 
+}
+
+// Raindrops all
+static bool raindrops_all(effect_params_t* params) { 
+    if (!params->init) {
+        // Change one LED every tick, make sure speed is not 0
+        if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
+            raindrops_set_color_all(rand() % DRIVER_LED_TOTAL, params);
+        }
+        return false;
+    }
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (int i = led_min; i < led_max; i++) {
+        raindrops_set_color_all(i, params);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Raindrops ESC
+static bool raindrops_esc(effect_params_t* params) { 
+    if (!params->init) {
+        // Change one LED every tick, make sure speed is not 0
+        if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
+            raindrops_set_color_esc(rand() % DRIVER_LED_TOTAL, params);
+        }
+        return false;
+    }
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (int i = led_min; i < led_max; i++) {
+        raindrops_set_color_esc(i, params);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Raindrops F13
+static bool raindrops_f13(effect_params_t* params) { 
+    if (!params->init) {
+        // Change one LED every tick, make sure speed is not 0
+        if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
+            raindrops_set_color_f13(rand() % DRIVER_LED_TOTAL, params);
+        }
+        return false;
+    }
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (int i = led_min; i < led_max; i++) {
+        raindrops_set_color_f13(i, params);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Raindrops Cluster
+static bool raindrops_clus(effect_params_t* params) { 
+    if (!params->init) {
+        // Change one LED every tick, make sure speed is not 0
+        if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
+            raindrops_set_color_clus(rand() % DRIVER_LED_TOTAL, params);
+        }
+        return false;
+    }
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (int i = led_min; i < led_max; i++) {
+        raindrops_set_color_clus(i, params);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/mechlovin/infinity875/keymaps/default/rules.mk b/keyboards/mechlovin/infinity875/keymaps/default/rules.mk
new file mode 100644
index 0000000000..64a7fa8664
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/keymaps/default/rules.mk
@@ -0,0 +1 @@
+RGB_MATRIX_CUSTOM_USER = no
\ No newline at end of file
diff --git a/keyboards/mechlovin/infinity875/keymaps/via/config.h b/keyboards/mechlovin/infinity875/keymaps/via/config.h
new file mode 100644
index 0000000000..74ee03f3f9
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/keymaps/via/config.h
@@ -0,0 +1,24 @@
+/*
+Copyright 2021 Mechlovin' Studio
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#ifdef RGB_MATRIX_ENABLE
+
+#define VIA_QMK_RGBLIGHT_ENABLE
+
+#endif
diff --git a/keyboards/mechlovin/infinity875/keymaps/via/keymap.c b/keyboards/mechlovin/infinity875/keymaps/via/keymap.c
new file mode 100644
index 0000000000..283104b5b2
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 Mechlovin' Studio
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,    KC_F1,   KC_F2,   KC_F3,   KC_F4,            KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_F13,    KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, KC_LSFT,                     KC_UP,
+        KC_LCTL,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT,  KC_LGUI,MO(1), KC_LCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, RGB_SAI, RGB_HUI,
+        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, RGB_SAD, RGB_HUD,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          RGB_TOG,
+        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,                      RGB_VAI,
+        KC_TRNS,   KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            RGB_RMOD, RGB_VAD, RGB_MOD
+    ),
+    [2] = LAYOUT_all(
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                      KC_TRNS,
+        KC_TRNS,   KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
diff --git a/keyboards/mechlovin/infinity875/keymaps/via/readme.md b/keyboards/mechlovin/infinity875/keymaps/via/readme.md
new file mode 100644
index 0000000000..9289e7dbe2
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for infinity87.5
diff --git a/keyboards/mechlovin/infinity875/keymaps/via/rgb_matrix_user.inc b/keyboards/mechlovin/infinity875/keymaps/via/rgb_matrix_user.inc
new file mode 100644
index 0000000000..cee6a3f038
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/keymaps/via/rgb_matrix_user.inc
@@ -0,0 +1,764 @@
+/*
+Copyright 2020 Evy Dekkers
+
+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/>.
+*/
+
+RGB_MATRIX_EFFECT(solid_esc)
+RGB_MATRIX_EFFECT(solid_f13)
+RGB_MATRIX_EFFECT(solid_clus)
+RGB_MATRIX_EFFECT(breathing_all)
+RGB_MATRIX_EFFECT(breathing_esc)
+RGB_MATRIX_EFFECT(breathing_f13)
+RGB_MATRIX_EFFECT(breathing_clus)
+RGB_MATRIX_EFFECT(band_val_all)
+RGB_MATRIX_EFFECT(band_val_esc)
+RGB_MATRIX_EFFECT(band_val_f13)
+RGB_MATRIX_EFFECT(band_val_clus)
+RGB_MATRIX_EFFECT(cycle_up_down_all)
+RGB_MATRIX_EFFECT(cycle_up_down_esc)
+RGB_MATRIX_EFFECT(cycle_up_down_f13)
+RGB_MATRIX_EFFECT(cycle_up_down_clus)
+RGB_MATRIX_EFFECT(cycle_out_in_dual_all)
+RGB_MATRIX_EFFECT(cycle_out_in_dual_esc)
+RGB_MATRIX_EFFECT(cycle_out_in_dual_f13)
+RGB_MATRIX_EFFECT(cycle_out_in_dual_clus)
+RGB_MATRIX_EFFECT(rainbow_moving_chevron_all)
+RGB_MATRIX_EFFECT(rainbow_moving_chevron_esc)
+RGB_MATRIX_EFFECT(rainbow_moving_chevron_f13)
+RGB_MATRIX_EFFECT(rainbow_moving_chevron_clus)
+RGB_MATRIX_EFFECT(cycle_pimwheel_all)
+RGB_MATRIX_EFFECT(cycle_pimwheel_esc)
+RGB_MATRIX_EFFECT(cycle_pimwheel_f13)
+RGB_MATRIX_EFFECT(cycle_pimwheel_clus)
+RGB_MATRIX_EFFECT(rainbow_beacon_all)
+RGB_MATRIX_EFFECT(rainbow_beacon_esc)
+RGB_MATRIX_EFFECT(rainbow_beacon_f13)
+RGB_MATRIX_EFFECT(rainbow_beacon_clus)
+RGB_MATRIX_EFFECT(raindrops_all)
+RGB_MATRIX_EFFECT(raindrops_esc)
+RGB_MATRIX_EFFECT(raindrops_f13)
+RGB_MATRIX_EFFECT(raindrops_clus)
+
+#ifdef RGB_MATRIX_CUSTOM_EFFECT_IMPLS
+
+bool effect_runner_all(effect_params_t* params, i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed / 4, 1));
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_esc(effect_params_t* params, i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed / 4, 1));
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    for (uint8_t i = 1; i < 18; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_f13(effect_params_t* params, i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed / 4, 1));
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(17, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 0; i < 14; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_clus(effect_params_t* params, i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed / 4, 1));
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    for (uint8_t i = 0; i < 15; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_dx_dy_all(effect_params_t* params, dx_dy_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 2);
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        int16_t dx  = g_led_config.point[i].x - k_rgb_matrix_center.x;
+        int16_t dy  = g_led_config.point[i].y - k_rgb_matrix_center.y;
+        RGB     rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_dx_dy_esc(effect_params_t* params, dx_dy_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 2);
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        int16_t dx  = g_led_config.point[i].x - k_rgb_matrix_center.x;
+        int16_t dy  = g_led_config.point[i].y - k_rgb_matrix_center.y;
+        RGB     rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    for (uint8_t i = 1; i < 18; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_dx_dy_f13(effect_params_t* params, dx_dy_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 2);
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        int16_t dx  = g_led_config.point[i].x - k_rgb_matrix_center.x;
+        int16_t dy  = g_led_config.point[i].y - k_rgb_matrix_center.y;
+        RGB     rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(17, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 0; i < 14; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_dx_dy_clus(effect_params_t* params, dx_dy_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 2);
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        int16_t dx  = g_led_config.point[i].x - k_rgb_matrix_center.x;
+        int16_t dy  = g_led_config.point[i].y - k_rgb_matrix_center.y;
+        RGB     rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    for (uint8_t i = 0; i < 15; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_sin_cos_all(effect_params_t* params, sin_cos_i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint16_t time      = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4);
+    int8_t   cos_value = cos8(time) - 128;
+    int8_t   sin_value = sin8(time) - 128;
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_sin_cos_esc(effect_params_t* params, sin_cos_i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint16_t time      = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4);
+    int8_t   cos_value = cos8(time) - 128;
+    int8_t   sin_value = sin8(time) - 128;
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    for (uint8_t i = 1; i < 18; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_sin_cos_f13(effect_params_t* params, sin_cos_i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint16_t time      = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4);
+    int8_t   cos_value = cos8(time) - 128;
+    int8_t   sin_value = sin8(time) - 128;
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(17, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 0; i < 14; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+bool effect_runner_sin_cos_clus(effect_params_t* params, sin_cos_i_f effect_func) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    uint16_t time      = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4);
+    int8_t   cos_value = cos8(time) - 128;
+    int8_t   sin_value = sin8(time) - 128;
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time));
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    for (uint8_t i = 0; i < 15; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+static void raindrops_set_color_all(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
+    HSV hsv = {0, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v};
+
+    // Take the shortest path between hues
+    int16_t deltaH = ((rgb_matrix_config.hsv.h + 180) % 360 - rgb_matrix_config.hsv.h) / 4;
+    if (deltaH > 127) {
+        deltaH -= 256;
+    } else if (deltaH < -127) {
+        deltaH += 256;
+    }
+
+    hsv.h   = rgb_matrix_config.hsv.h + (deltaH * (rand() & 0x03));
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+}
+
+static void raindrops_set_color_esc(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
+    HSV hsv = {0, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v};
+
+    // Take the shortest path between hues
+    int16_t deltaH = ((rgb_matrix_config.hsv.h + 180) % 360 - rgb_matrix_config.hsv.h) / 4;
+    if (deltaH > 127) {
+        deltaH -= 256;
+    } else if (deltaH < -127) {
+        deltaH += 256;
+    }
+
+    hsv.h   = rgb_matrix_config.hsv.h + (deltaH * (rand() & 0x03));
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    for (uint8_t i = 1; i < 18; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+}
+
+static void raindrops_set_color_f13(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
+    HSV hsv = {0, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v};
+
+    // Take the shortest path between hues
+    int16_t deltaH = ((rgb_matrix_config.hsv.h + 180) % 360 - rgb_matrix_config.hsv.h) / 4;
+    if (deltaH > 127) {
+        deltaH -= 256;
+    } else if (deltaH < -127) {
+        deltaH += 256;
+    }
+
+    hsv.h   = rgb_matrix_config.hsv.h + (deltaH * (rand() & 0x03));
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        rgb_matrix_set_color(15, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(16, 0x00, 0x00, 0x00);
+        rgb_matrix_set_color(17, 0x00, 0x00, 0x00);
+    for (uint8_t i = 0; i < 14; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+}
+
+static void raindrops_set_color_clus(int i, effect_params_t* params) {
+    if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
+    HSV hsv = {0, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v};
+
+    // Take the shortest path between hues
+    int16_t deltaH = ((rgb_matrix_config.hsv.h + 180) % 360 - rgb_matrix_config.hsv.h) / 4;
+    if (deltaH > 127) {
+        deltaH -= 256;
+    } else if (deltaH < -127) {
+        deltaH += 256;
+    }
+
+    hsv.h   = rgb_matrix_config.hsv.h + (deltaH * (rand() & 0x03));
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
+    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    for (uint8_t i = 0; i < 15; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+}
+
+static HSV BAND_VAL_CUSTOM(HSV hsv, uint8_t i, uint8_t time) {
+    int16_t v = hsv.v - abs(scale8(g_led_config.point[i].x, 228) + 28 - time) * 8;
+    hsv.v     = scale8(v < 0 ? 0 : v, hsv.v);
+    return hsv;
+}
+
+static HSV CYCLE_UP_DOWN_CUSTOM(HSV hsv, uint8_t i, uint8_t time) {
+        hsv.h = g_led_config.point[i].y - time;
+    return hsv;
+}
+
+static HSV CYCLE_OUT_IN_DUAL_CUSTOM(HSV hsv, int16_t dx, int16_t dy, uint8_t time) {
+    dx           = (k_rgb_matrix_center.x / 2) - abs8(dx);
+    uint8_t dist = sqrt16(dx * dx + dy * dy);
+    hsv.h        = 3 * dist + time;
+    return hsv;
+}
+
+static HSV RAINBOW_MOVING_CHEVRON_CUSTOM(HSV hsv, uint8_t i, uint8_t time) {
+    hsv.h += abs8(g_led_config.point[i].y - k_rgb_matrix_center.y) + (g_led_config.point[i].x - time);
+    return hsv;
+}
+
+static HSV CYCLE_PINWHEEL_CUSTOM(HSV hsv, int16_t dx, int16_t dy, uint8_t time) {
+    hsv.h = atan2_8(dy, dx) + time;
+    return hsv;
+}
+
+static HSV RAINBOW_BEACON_CUSTOM(HSV hsv, int8_t sin, int8_t cos, uint8_t i, uint8_t time) {
+    hsv.h += ((g_led_config.point[i].y - k_rgb_matrix_center.y) * 2 * cos + (g_led_config.point[i].x - k_rgb_matrix_center.x) * 2 * sin) / 128;
+    return hsv;
+}
+
+
+
+// Solid ESC
+static bool solid_esc(effect_params_t* params) {
+    HSV hsv = rgb_matrix_config.hsv;
+    RGB rgb = hsv_to_rgb(hsv);
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 18 ; i < led_max; i++) {
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Solid F13
+static bool solid_f13(effect_params_t* params) {
+    HSV hsv = rgb_matrix_config.hsv;
+    RGB rgb = hsv_to_rgb(hsv);
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 18 ; i < led_max; i++) {
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+        rgb_matrix_set_color(14, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Solid cluster
+static bool solid_clus(effect_params_t* params) {
+    HSV hsv = rgb_matrix_config.hsv;
+    RGB rgb = hsv_to_rgb(hsv);
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 15 ; i < led_max; i++) {
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Breathing all
+
+bool breathing_all(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    HSV      hsv  = rgb_matrix_config.hsv;
+    uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
+    hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+    RGB rgb       = rgb_matrix_hsv_to_rgb(hsv);
+    for (uint8_t i = led_min; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Breathing ESC
+static bool breathing_esc(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    HSV      hsv  = rgb_matrix_config.hsv;
+    uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
+    hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+    RGB rgb       = rgb_matrix_hsv_to_rgb(hsv);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 18; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+        rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b);
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Breathing F13
+static bool breathing_f13(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    HSV      hsv  = rgb_matrix_config.hsv;
+    uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
+    hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+    RGB rgb       = rgb_matrix_hsv_to_rgb(hsv);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 18; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+        rgb_matrix_set_color(14, rgb.r, rgb.g, rgb.b);
+    return led_max < DRIVER_LED_TOTAL;  
+}
+
+// Breathing cluster
+static bool breathing_clus(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+
+    HSV      hsv  = rgb_matrix_config.hsv;
+    uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
+    hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+    RGB rgb       = rgb_matrix_hsv_to_rgb(hsv);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    for (uint8_t i = 15; i < led_max; i++) {
+        RGB_MATRIX_TEST_LED_FLAGS();
+        rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Band Val all
+bool band_val_all(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_all(params, &BAND_VAL_CUSTOM); 
+}
+
+// Band Val ESC
+bool band_val_esc(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_esc(params, &BAND_VAL_CUSTOM); 
+}
+
+// Band Val F13
+bool band_val_f13(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_f13(params, &BAND_VAL_CUSTOM); 
+}
+
+// Band Val Cluster
+bool band_val_clus(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_clus(params, &BAND_VAL_CUSTOM); 
+}
+
+// Cycle Up Down All
+static bool cycle_up_down_all(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_all(params, &CYCLE_UP_DOWN_CUSTOM);
+}
+
+// Cycle Up Down ESC
+static bool cycle_up_down_esc(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_esc(params, &CYCLE_UP_DOWN_CUSTOM);
+}
+
+// Cycle up down F13
+static bool cycle_up_down_f13(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_f13(params, &CYCLE_UP_DOWN_CUSTOM);
+}
+
+// Cycle up down cluster
+static bool cycle_up_down_clus(effect_params_t* params) {
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_clus(params, &CYCLE_UP_DOWN_CUSTOM);
+}
+
+// Cycle out in dual All
+static bool cycle_out_in_dual_all(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_all(params, &CYCLE_OUT_IN_DUAL_CUSTOM); 
+}
+
+// Cycle out in dual ESC
+static bool cycle_out_in_dual_esc(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_esc(params, &CYCLE_OUT_IN_DUAL_CUSTOM); 
+}
+
+// Cycle out in dual f13
+static bool cycle_out_in_dual_f13(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_f13(params, &CYCLE_OUT_IN_DUAL_CUSTOM); 
+}
+
+// Cycle out in dual cluster
+static bool cycle_out_in_dual_clus(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_clus(params, &CYCLE_OUT_IN_DUAL_CUSTOM); 
+}
+
+// Moving chevron all
+static bool rainbow_moving_chevron_all(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_all(params, &RAINBOW_MOVING_CHEVRON_CUSTOM); 
+}
+
+// Moving chevron ESC
+static bool rainbow_moving_chevron_esc(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_esc(params, &RAINBOW_MOVING_CHEVRON_CUSTOM); 
+}
+// Moving chevron F13
+static bool rainbow_moving_chevron_f13(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_f13(params, &RAINBOW_MOVING_CHEVRON_CUSTOM); 
+}
+// Moving chevron cluster
+static bool rainbow_moving_chevron_clus(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_clus(params, &RAINBOW_MOVING_CHEVRON_CUSTOM); 
+}
+
+// Moving cycle pimwheel all
+static bool cycle_pimwheel_all(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_all(params, &CYCLE_PINWHEEL_CUSTOM); 
+}
+
+// Moving cycle pimwheel esc
+static bool cycle_pimwheel_esc(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_esc(params, &CYCLE_PINWHEEL_CUSTOM); 
+}
+
+// Moving cycle pimwheel f13
+static bool cycle_pimwheel_f13(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_f13(params, &CYCLE_PINWHEEL_CUSTOM); 
+}
+
+// Moving cycle pimwheel cluster
+static bool cycle_pimwheel_clus(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_dx_dy_clus(params, &CYCLE_PINWHEEL_CUSTOM); 
+}
+
+// Moving rainbow beacon all
+static bool rainbow_beacon_all(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_sin_cos_all(params, &RAINBOW_BEACON_CUSTOM); 
+}
+
+// Moving rainbow beacon esc
+static bool rainbow_beacon_esc(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_sin_cos_esc(params, &RAINBOW_BEACON_CUSTOM); 
+}
+
+// Moving rainbow beacon f13
+static bool rainbow_beacon_f13(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_sin_cos_f13(params, &RAINBOW_BEACON_CUSTOM); 
+}
+
+// Moving rainbow beacon cluster
+static bool rainbow_beacon_clus(effect_params_t* params) { 
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (uint8_t i = led_min ; i < led_max; i++) {
+        rgb_matrix_set_color(i, 0x00, 0x00, 0x00);
+    }
+    return effect_runner_sin_cos_clus(params, &RAINBOW_BEACON_CUSTOM); 
+}
+
+// Raindrops all
+static bool raindrops_all(effect_params_t* params) { 
+    if (!params->init) {
+        // Change one LED every tick, make sure speed is not 0
+        if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
+            raindrops_set_color_all(rand() % DRIVER_LED_TOTAL, params);
+        }
+        return false;
+    }
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (int i = led_min; i < led_max; i++) {
+        raindrops_set_color_all(i, params);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Raindrops ESC
+static bool raindrops_esc(effect_params_t* params) { 
+    if (!params->init) {
+        // Change one LED every tick, make sure speed is not 0
+        if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
+            raindrops_set_color_esc(rand() % DRIVER_LED_TOTAL, params);
+        }
+        return false;
+    }
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (int i = led_min; i < led_max; i++) {
+        raindrops_set_color_esc(i, params);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Raindrops F13
+static bool raindrops_f13(effect_params_t* params) { 
+    if (!params->init) {
+        // Change one LED every tick, make sure speed is not 0
+        if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
+            raindrops_set_color_f13(rand() % DRIVER_LED_TOTAL, params);
+        }
+        return false;
+    }
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (int i = led_min; i < led_max; i++) {
+        raindrops_set_color_f13(i, params);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+// Raindrops Cluster
+static bool raindrops_clus(effect_params_t* params) { 
+    if (!params->init) {
+        // Change one LED every tick, make sure speed is not 0
+        if (scale16by8(g_rgb_timer, qadd8(rgb_matrix_config.speed, 16)) % 10 == 0) {
+            raindrops_set_color_clus(rand() % DRIVER_LED_TOTAL, params);
+        }
+        return false;
+    }
+
+    RGB_MATRIX_USE_LIMITS(led_min, led_max);
+    for (int i = led_min; i < led_max; i++) {
+        raindrops_set_color_clus(i, params);
+    }
+    return led_max < DRIVER_LED_TOTAL;
+}
+
+#endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS
diff --git a/keyboards/mechlovin/infinity875/keymaps/via/rules.mk b/keyboards/mechlovin/infinity875/keymaps/via/rules.mk
new file mode 100644
index 0000000000..0e604ef69a
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+
+RGB_MATRIX_CUSTOM_USER = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/infinity875/matrix.c b/keyboards/mechlovin/infinity875/matrix.c
new file mode 100644
index 0000000000..b1b0d20654
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/matrix.c
@@ -0,0 +1,388 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+Copyright 2019 Evy Dekkers
+
+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 <stdint.h>
+#include <stdbool.h>
+#include "wait.h"
+#include "util.h"
+#include "matrix.h"
+#include "debounce.h"
+#include "quantum.h"
+
+#ifdef DIRECT_PINS
+static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
+#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+//static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif
+
+// matrix code
+
+#ifdef DIRECT_PINS
+
+static void init_pins(void) {
+    for (int row = 0; row < MATRIX_ROWS; row++) {
+        for (int col = 0; col < MATRIX_COLS; col++) {
+            pin_t pin = direct_pins[row][col];
+            if (pin != NO_PIN) {
+                setPinInputHigh(pin);
+            }
+        }
+    }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+    matrix_row_t last_row_value = current_matrix[current_row];
+    current_matrix[current_row] = 0;
+
+    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+        pin_t pin = direct_pins[current_row][col_index];
+        if (pin != NO_PIN) {
+            current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+        }
+    }
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+#elif (DIODE_DIRECTION == ROW2COL)
+
+/* Cols 0 - 16
+ * These columns use two 74HC138 3 to 8 bit demultiplexer. B0, F1 is the enable pin, must be set high (1) to use it.
+ *
+ * col / pin:     PB5  PB7  PF0  PB0  PF1  PE6
+ * 0:              0 ── 0 ── 0    1 ── 0    0 
+ * ────────────────────────────────────────────
+ * 1:              0 ── 0 ── 1    1 ── 0    0
+ * ────────────────────────────────────────────    
+ * 2:              0 ── 1 ── 0    1 ── 0    0 
+ * ────────────────────────────────────────────    
+ * 3:              0 ── 1 ── 1    1 ── 0    0 
+ * ────────────────────────────────────────────    
+ * 4:              1 ── 0 ── 0    1 ── 0    0 
+ * ────────────────────────────────────────────    
+ * 5:              1 ── 0 ── 1    1 ── 0    0 
+ * ────────────────────────────────────────────    
+ * 6:              1 ── 1 ── 0    1 ── 0    0 
+ * ────────────────────────────────────────────    
+ * 7:              1 ── 1 ── 1    1 ── 0    0 
+ * ────────────────────────────────────────────    
+ * 8:              0 ── 0 ── 0    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ * 9:              0 ── 0 ── 1    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *10:              0 ── 1 ── 0    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *11:              0 ── 1 ── 1    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *12:              1 ── 0 ── 0    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *13:              1 ── 0 ── 1    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *14:              1 ── 1 ── 1    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *15:              1 ── 1 ── 0    0 ── 1    0 
+ * ────────────────────────────────────────────    
+ *16:              0 ── 0 ── 0    0 ── 0    1  
+ *
+ */
+static void select_col(uint8_t col) {
+    switch (col) {
+        case 0:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinHigh(B0);
+          break;
+        case 1:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinHigh(B0);
+          break;
+        case 2:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinHigh(B0);
+          break;
+        case 3:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinHigh(B0);
+          break;
+        case 4:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinHigh(B0);
+          break;
+        case 5:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinHigh(B0);
+          break;
+        case 6:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinHigh(B0);
+          break;
+        case 7:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinHigh(B0);
+          break;
+        case 8:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinHigh(F1);
+          break;
+        case 9:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinHigh(F1);
+          break;
+        case 10:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinHigh(F1);
+          break;
+        case 11:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinHigh(F1);
+          break;
+        case 12:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinHigh(F1);
+          break;
+        case 13:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinHigh(F1);
+          break;
+        case 14:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinHigh(F1);
+          break;
+        case 15:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinHigh(F1);
+          break;
+        case 16:
+          writePinLow(E6);
+          break;
+    }
+}
+
+static void unselect_col(uint8_t col) {
+    switch (col) {
+        case 0:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinLow(B0);
+          break;
+        case 1:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinLow(B0);
+          break;
+        case 2:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinLow(B0);
+          break;
+        case 3:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinLow(B0);
+          break;
+        case 4:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinLow(B0);
+          break;
+        case 5:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinLow(B0);
+          break;
+        case 6:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinLow(B0);
+          break;
+        case 7:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinLow(B0);
+          break;
+        case 8:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinLow(F1);
+          break;
+        case 9:
+          writePinHigh(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinLow(F1);
+          break;
+        case 10:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinLow(F1);
+          break;
+        case 11:
+          writePinHigh(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinLow(F1);
+          break;
+        case 12:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinHigh(F0);
+          writePinLow(F1);
+          break;
+        case 13:
+          writePinLow(B5);
+          writePinHigh(B7);
+          writePinLow(F0);
+          writePinLow(F1);
+          break;
+        case 14:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinLow(F0);
+          writePinLow(F1);
+          break;
+        case 15:
+          writePinLow(B5);
+          writePinLow(B7);
+          writePinHigh(F0);
+          writePinLow(F1);
+          break;
+        case 16:
+          writePinHigh(E6);
+          break;
+    }
+}
+
+static void unselect_cols(void) {
+    //Native
+    writePinHigh(E6);
+
+    //Demultiplexer
+    writePinLow(B0);
+    writePinLow(F1);
+    writePinHigh(B5);
+    writePinHigh(B7);
+    writePinHigh(F0);
+}
+
+static void init_pins(void) {
+    unselect_cols();
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+    setPinOutput(B5);
+    setPinOutput(B7);
+    setPinOutput(F0);
+    setPinOutput(B0);
+    setPinOutput(F1);
+    setPinOutput(E6);
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
+    bool matrix_changed = false;
+
+    // Select col and wait for col selecton to stabilize
+    select_col(current_col);
+    wait_us(30);
+
+    // For each row...
+    for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[row_index];
+
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0) {
+            // Pin LO, set col bit
+            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
+        } else {
+            // Pin HI, clear col bit
+            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
+            matrix_changed = true;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+
+    return matrix_changed;
+}
+
+#endif
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool changed = false;
+
+#if defined(DIRECT_PINS) || (DIODE_DIRECTION == ROW2COL)
+    // Set col, read rows
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+        changed |= read_rows_on_col(current_matrix, current_col);
+    }
+#endif
+
+    return changed;
+}
diff --git a/keyboards/mechlovin/infinity875/readme.md b/keyboards/mechlovin/infinity875/readme.md
new file mode 100644
index 0000000000..b3e14a7bb7
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/readme.md
@@ -0,0 +1,24 @@
+# infinity875
+
+![infinity875](https://i.imgur.com/qt4YBwSl.jpeg)
+
+The Infinity 87.5 is in the popular A87 form factor with Top-sided USB Type-C and supports BOTH the F12 and F13 footprints, so it’s compatible with a number of TKL boards like Geonworks Frog/F1-8x; KFE-CE; Singa Jaguar, among others.
+
+* Keyboard Maintainer: [Mechlovin' Studio](https://github.com/mechlovin)
+* Hardware Supported: Infinity87.5, Atmega32u4
+* Hardware Availability: [GB](https://geekhack.org/index.php?topic=115251.0), [CBB Planet](https://cbbplanet.com/products/infinity-87-5-pcb), [Mechlovin' Studio](https://mechlovin.studio)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/infinity875:default
+
+Flashing example for this keyboard:
+
+    make mechlovin/infinity875:default:flash
+
+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).
+
+**Reset Key:** 3 ways to put the IF87.5 into bootloader:
+- By keycode: Tap RESET keycode.
+- By bootmagic: hold ESC key while plugging in.
+- By hardware: Push reset button on bottom of the PCB while the PCB is plugged in.
\ No newline at end of file
diff --git a/keyboards/mechlovin/infinity875/rules.mk b/keyboards/mechlovin/infinity875/rules.mk
new file mode 100644
index 0000000000..d16f1ac35b
--- /dev/null
+++ b/keyboards/mechlovin/infinity875/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+CUSTOM_MATRIX = lite
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+SRC += matrix.c

From 74b24e410bb02180aaf373c12ae3d2550e7eac29 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 11 Mar 2022 05:25:31 -0800
Subject: [PATCH 800/867] DZ64RGB: add info.json (#16616)

---
 keyboards/dztech/dz64rgb/info.json | 79 ++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 keyboards/dztech/dz64rgb/info.json

diff --git a/keyboards/dztech/dz64rgb/info.json b/keyboards/dztech/dz64rgb/info.json
new file mode 100644
index 0000000000..8e602bd7c0
--- /dev/null
+++ b/keyboards/dztech/dz64rgb/info.json
@@ -0,0 +1,79 @@
+{
+    "keyboard_name": "DZ64RGB",
+    "url": "",
+    "maintainer": "moyi4681",
+    "layouts": {
+        "LAYOUT_64_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1!", "x":1, "y":0},
+                {"label":"2@", "x":2, "y":0},
+                {"label":"3#", "x":3, "y":0},
+                {"label":"4$", "x":4, "y":0},
+                {"label":"5%", "x":5, "y":0},
+                {"label":"6^", "x":6, "y":0},
+                {"label":"7&", "x":7, "y":0},
+                {"label":"8*", "x":8, "y":0},
+                {"label":"9(", "x":9, "y":0},
+                {"label":"0)", "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":"\\|", "x":13.5, "y":1, "w":1.5},
+
+                {"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},
+                {"label":"Z", "x":2, "y":3},
+                {"label":"X", "x":3, "y":3},
+                {"label":"C", "x":4, "y":3},
+                {"label":"V", "x":5, "y":3},
+                {"label":"B", "x":6, "y":3},
+                {"label":"N", "x":7, "y":3},
+                {"label":"M", "x":8, "y":3},
+                {"label":",<", "x":9, "y":3},
+                {"label":".>", "x":10, "y":3},
+                {"label":"/?", "x":11, "y":3},
+                {"label":"Shift", "x":12, "y":3},
+                {"label":"\u2191", "x":13, "y":3},
+                {"label":"Delete", "x":14, "y":3},
+
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Ctrl", "x":11, "y":4},
+                {"label":"\u2190", "x":12, "y":4},
+                {"label":"\u2193", "x":13, "y":4},
+                {"label":"\u2192", "x":14, "y":4}
+            ]
+        }
+    }
+}

From 3f797080952029e792361d7ea2cee9b423e07f72 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 11 Mar 2022 05:26:15 -0800
Subject: [PATCH 801/867] Acheron Elongate Delta: add info.json (#16615)

---
 keyboards/acheron/elongate/delta/info.json | 68 ++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 keyboards/acheron/elongate/delta/info.json

diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/info.json
new file mode 100644
index 0000000000..d96805a66a
--- /dev/null
+++ b/keyboards/acheron/elongate/delta/info.json
@@ -0,0 +1,68 @@
+{
+    "keyboard_name": "Elongate",
+    "url": "http://gondolindrim.github.io/AcheronDocs/elongate/introduction.html",
+    "maintainer": "Gondolindrim",
+    "layouts": {
+        "LAYOUT_all": {
+            "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":"Backspace", "x":11, "y":0},
+                {"label":"7", "x":12.5, "y":0},
+                {"label":"8", "x":13.5, "y":0},
+                {"label":"9", "x":14.5, "y":0},
+
+                {"label":"Tab", "x":0, "y":1, "w":1.25},
+                {"label":"A", "x":1.25, "y":1},
+                {"label":"S", "x":2.25, "y":1},
+                {"label":"D", "x":3.25, "y":1},
+                {"label":"F", "x":4.25, "y":1},
+                {"label":"G", "x":5.25, "y":1},
+                {"label":"H", "x":6.25, "y":1},
+                {"label":"J", "x":7.25, "y":1},
+                {"label":"K", "x":8.25, "y":1},
+                {"label":"L", "x":9.25, "y":1},
+                {"label":"Enter", "x":10.25, "y":1, "w":1.75},
+                {"label":"4", "x":12.5, "y":1},
+                {"label":"5", "x":13.5, "y":1},
+                {"label":"6", "x":14.5, "y":1},
+
+                {"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":"Fn", "x":9.75, "y":2, "w":1.25},
+                {"label":"\u2191", "x":11.25, "y":2.25},
+                {"label":"1", "x":12.5, "y":2},
+                {"label":"2", "x":13.5, "y":2},
+                {"label":"3", "x":14.5, "y":2},
+
+                {"label":"Ctrl", "x":0, "y":3, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":3},
+                {"label":"Alt", "x":2.25, "y":3, "w":1.25},
+                {"label":"Space/Fn2", "x":3.5, "y":3, "w":2.25},
+                {"label":"Space", "x":6.25, "y":3, "w":2.75},
+                {"label":"Alt", "x":9, "y":3},
+                {"label":"\u2190", "x":10.25, "y":3.25},
+                {"label":"\u2193", "x":11.25, "y":3.25},
+                {"label":"\u2192", "x":12.25, "y":3.25},
+                {"label":"0", "x":13.5, "y":3},
+                {"label":".", "x":14.5, "y":3}
+            ]
+        }
+    }
+}

From 86b123141bea2e3f831a57eb115368cbbbdb2da1 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <Kriechi@users.noreply.github.com>
Date: Sat, 12 Mar 2022 13:42:25 +0100
Subject: [PATCH 802/867] docs: fix code sample (#16623)

---
 docs/feature_pointing_device.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/feature_pointing_device.md b/docs/feature_pointing_device.md
index 23a16b843d..8c51865558 100644
--- a/docs/feature_pointing_device.md
+++ b/docs/feature_pointing_device.md
@@ -325,7 +325,8 @@ report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
     if (set_scrolling) {
         mouse_report.h = mouse_report.x;
         mouse_report.v = mouse_report.y;
-        mouse_report.x = mouse_report.y = 0
+        mouse_report.x = 0;
+        mouse_report.y = 0;
     }
     return mouse_report;
 }

From 20424fd37f84cbe08740539a48b6bb4839e0a179 Mon Sep 17 00:00:00 2001
From: Matthew Dias <matthewdias@me.com>
Date: Sun, 13 Mar 2022 01:36:12 -0600
Subject: [PATCH 803/867] [Keyboard] Add Glitch (#16444)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/p3d/glitch/config.h                 |  84 +++++
 keyboards/p3d/glitch/glitch.c                 |  58 ++++
 keyboards/p3d/glitch/glitch.h                 |  40 +++
 keyboards/p3d/glitch/info.json                | 300 ++++++++++++++++++
 keyboards/p3d/glitch/keymaps/default/keymap.c |  29 ++
 .../p3d/glitch/keymaps/default/readme.md      |   1 +
 keyboards/p3d/glitch/readme.md                |  24 ++
 keyboards/p3d/glitch/rules.mk                 |  20 ++
 8 files changed, 556 insertions(+)
 create mode 100644 keyboards/p3d/glitch/config.h
 create mode 100644 keyboards/p3d/glitch/glitch.c
 create mode 100644 keyboards/p3d/glitch/glitch.h
 create mode 100644 keyboards/p3d/glitch/info.json
 create mode 100644 keyboards/p3d/glitch/keymaps/default/keymap.c
 create mode 100644 keyboards/p3d/glitch/keymaps/default/readme.md
 create mode 100644 keyboards/p3d/glitch/readme.md
 create mode 100644 keyboards/p3d/glitch/rules.mk

diff --git a/keyboards/p3d/glitch/config.h b/keyboards/p3d/glitch/config.h
new file mode 100644
index 0000000000..e7f78123d9
--- /dev/null
+++ b/keyboards/p3d/glitch/config.h
@@ -0,0 +1,84 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+#define VENDOR_ID       0x7033
+#define PRODUCT_ID      0x3568
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    P3D Store
+#define PRODUCT         Glitch
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+
+/*
+ * 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)
+ *
+ */
+
+/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */
+#define MATRIX_ROW_PINS { D5, D6, B6, D7, C7, B4, B5, D3, D4, C6 }
+#define MATRIX_COL_PINS { B2, D2, B3, B7, F5, F4, F1, F0 }
+#define UNUSED_PINS
+
+#define RGB_DI_PIN B1
+#define RGBLED_NUM 25
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
+#define ENCODERS_PAD_A { F6 }
+#define ENCODERS_PAD_B { F7 }
+#define ENCODER_RESOLUTION 2
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define USB_MAX_POWER_CONSUMPTION 400
+
+/* 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
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
diff --git a/keyboards/p3d/glitch/glitch.c b/keyboards/p3d/glitch/glitch.c
new file mode 100644
index 0000000000..a62f578994
--- /dev/null
+++ b/keyboards/p3d/glitch/glitch.c
@@ -0,0 +1,58 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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 "glitch.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    if (clockwise) {
+        // tap_code(RGB_MOD);
+        rgblight_step();
+    } else {
+        // tap_code(RGB_RMOD);
+        rgblight_step_reverse();
+    }
+
+    return false;
+}
+#endif
+
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+        return false;
+    }
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case 0:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        default:
+            oled_write_P(PSTR("Undefined\n"), false);
+    }
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
+
+    return false;
+}
diff --git a/keyboards/p3d/glitch/glitch.h b/keyboards/p3d/glitch/glitch.h
new file mode 100644
index 0000000000..4b4f77396b
--- /dev/null
+++ b/keyboards/p3d/glitch/glitch.h
@@ -0,0 +1,40 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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 XXX KC_NO
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10, K11, K12, K13, K14, K15,      K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+    K20, K21, K22, K23, K24, K25,      K27, K28, K29, K2A, K2B, K2C,      K2E, K2F, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \
+    K40, K41,      K43,      K45,      K47,      K49,      K4B, K4C, K4D, K4E, K4F  \
+) { \
+    { K00, K02, K04, K06, K08, K0A, K0C, K0E }, \
+    { K01, K03, K05, K07, K09, K0B, K0D, K0F }, \
+    { K10, K12, K14, XXX, K18, K1A, K1C, K1E }, \
+    { K11, K13, K15, K17, K19, K1B, K1D, K1F }, \
+    { K20, K22, K24, XXX, K28, K2A, K2C, K2E }, \
+    { K21, K23, K25, K27, K29, K2B, XXX, K2F }, \
+    { K30, K32, K34, K36, K38, K3A, K3C, K3E }, \
+    { XXX, K33, K35, K37, K39, K3B, K3D, K3F }, \
+    { K40, XXX, XXX, XXX, XXX, XXX, K4C, K4E }, \
+    { K41, K43, K45, K47, K49, K4B, K4D, K4F } \
+}
diff --git a/keyboards/p3d/glitch/info.json b/keyboards/p3d/glitch/info.json
new file mode 100644
index 0000000000..6445e200f8
--- /dev/null
+++ b/keyboards/p3d/glitch/info.json
@@ -0,0 +1,300 @@
+{
+    "keyboard_name": "Glitch",
+    "url": "https://p3dstore.com/products/p3d-glitch-group-buy",
+    "maintainer": "matthewdias",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{
+                "x": 19.1,
+                "y": 0.1
+            }, {
+                "label": "ESC",
+                "x": 0.5,
+                "y": 0.5
+            }, {
+                "label": "1",
+                "x": 1.5,
+                "y": 0.5
+            }, {
+                "label": "_",
+                "x": 14.5,
+                "y": 0.6
+            }, {
+                "label": "+",
+                "x": 15.5,
+                "y": 0.6
+            }, {
+                "label": "Back",
+                "x": 16.5,
+                "y": 0.6
+            }, {
+                "label": "Del",
+                "x": 17.5,
+                "y": 0.6
+            }, {
+                "label": "2",
+                "x": 3.25,
+                "y": 1.0
+            }, {
+                "label": "3",
+                "x": 4.25,
+                "y": 1.0
+            }, {
+                "label": "4",
+                "x": 5.25,
+                "y": 1.0
+            }, {
+                "label": "5",
+                "x": 6.25,
+                "y": 1.0
+            }, {
+                "label": "6",
+                "x": 7.25,
+                "y": 1.0
+            }, {
+                "label": "7",
+                "x": 10,
+                "y": 1.0
+            }, {
+                "label": "8",
+                "x": 11,
+                "y": 1.0
+            }, {
+                "label": "9",
+                "x": 12,
+                "y": 1.0
+            }, {
+                "label": "0",
+                "x": 13,
+                "y": 1.0
+            }, {
+                "label": "TAB",
+                "x": 0.15,
+                "y": 1.5,
+                "w": 1.5
+            }, {
+                "label": "Q",
+                "x": 1.65,
+                "y": 1.5
+            }, {
+                "label": "P",
+                "x": 14.35,
+                "y": 1.6
+            }, {
+                "label": "[",
+                "x": 15.35,
+                "y": 1.6
+            }, {
+                "label": "]",
+                "x": 16.35,
+                "y": 1.6
+            }, {
+                "label": "\\",
+                "x": 17.35,
+                "y": 1.6,
+                "w": 1.5
+            }, {
+                "x": 19.1,
+                "y": 1.6
+            }, {
+                "label": "W",
+                "x": 3.75,
+                "y": 2.0
+            }, {
+                "label": "E",
+                "x": 4.75,
+                "y": 2.0
+            }, {
+                "label": "R",
+                "x": 5.75,
+                "y": 2.0
+            }, {
+                "label": "T",
+                "x": 6.75,
+                "y": 2.0
+            }, {
+                "label": "Y",
+                "x": 9.5,
+                "y": 2.0
+            }, {
+                "label": "U",
+                "x": 10.5,
+                "y": 2.0
+            }, {
+                "label": "I",
+                "x": 11.5,
+                "y": 2.0
+            }, {
+                "label": "O",
+                "x": 12.5,
+                "y": 2.0
+            }, {
+                "label": "CAPS",
+                "x": 0.15,
+                "y": 2.5,
+                "w": 1.75
+            }, {
+                "label": "A",
+                "x": 1.9,
+                "y": 2.5
+            }, {
+                "label": ";",
+                "x": 14.6,
+                "y": 2.6
+            }, {
+                "label": "'",
+                "x": 15.6,
+                "y": 2.6
+            }, {
+                "label": "ENTER",
+                "x": 16.6,
+                "y": 2.6,
+                "w": 2.25
+            }, {
+                "x": 19.1,
+                "y": 2.6
+            }, {
+                "label": "S",
+                "x": 4,
+                "y": 3.0
+            }, {
+                "label": "D",
+                "x": 5,
+                "y": 3.0
+            }, {
+                "label": "F",
+                "x": 6,
+                "y": 3.0
+            }, {
+                "label": "G",
+                "x": 7,
+                "y": 3.0
+            }, {
+                "label": "H",
+                "x": 9.75,
+                "y": 3.0
+            }, {
+                "label": "J",
+                "x": 10.75,
+                "y": 3.0
+            }, {
+                "label": "K",
+                "x": 11.75,
+                "y": 3.0
+            }, {
+                "label": "L",
+                "x": 12.75,
+                "y": 3.0
+            }, {
+                "label": "SHIFT",
+                "x": 0,
+                "y": 3.5,
+                "w": 2.25
+            }, {
+                "label": "Z",
+                "x": 2.25,
+                "y": 3.5
+            }, {
+                "label": ".",
+                "x": 14.25,
+                "y": 3.6
+            }, {
+                "label": "?",
+                "x": 15.25,
+                "y": 3.6
+            }, {
+                "label": "SHIFT",
+                "x": 16.25,
+                "y": 3.6,
+                "w": 1.75
+            }, {
+                "x": 19.5,
+                "y": 3.6
+            }, {
+                "label": "UP",
+                "x": 18.25,
+                "y": 3.85
+            }, {
+                "label": "X",
+                "x": 4.5,
+                "y": 4.0
+            }, {
+                "label": "C",
+                "x": 5.5,
+                "y": 4.0
+            }, {
+                "label": "V",
+                "x": 6.5,
+                "y": 4.0
+            }, {
+                "label": "B",
+                "x": 7.5,
+                "y": 4.0
+            }, {
+                "label": "BEE",
+                "x": 9.25,
+                "y": 4.0
+            }, {
+                "label": "N",
+                "x": 10.25,
+                "y": 4.0
+            }, {
+                "label": "M",
+                "x": 11.25,
+                "y": 4.0
+            }, {
+                "label": ",",
+                "x": 12.25,
+                "y": 4.0
+            }, {
+                "label": "CTRL",
+                "x": 0,
+                "y": 4.5,
+                "w": 1.25
+            }, {
+                "label": "WIN",
+                "x": 1.25,
+                "y": 4.5,
+                "w": 1.25
+            }, {
+                "label": "WIN",
+                "x": 15,
+                "y": 4.6
+            }, {
+                "label": "CTRL",
+                "x": 16,
+                "y": 4.6
+            }, {
+                "label": "LEFT",
+                "x": 17.25,
+                "y": 4.85
+            }, {
+                "label": "DOWN",
+                "x": 18.25,
+                "y": 4.85
+            }, {
+                "label": "RIGHT",
+                "x": 19.25,
+                "y": 4.85
+            }, {
+                "x": 4.75,
+                "y": 5.0,
+                "w": 2.75
+            }, {
+                "label": "ALT",
+                "x": 7.5,
+                "y": 5.0,
+                "w": 1.25
+            }, {
+                "label": "ALT",
+                "x": 9.5,
+                "y": 5.0,
+                "w": 1.25
+            }, {
+                "x": 10.75,
+                "y": 5.0,
+                "w": 2.25
+            }]
+        }
+    }
+}
diff --git a/keyboards/p3d/glitch/keymaps/default/keymap.c b/keyboards/p3d/glitch/keymaps/default/keymap.c
new file mode 100644
index 0000000000..43aa53c9f1
--- /dev/null
+++ b/keyboards/p3d/glitch/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/* Copyright 2021 Matthew Dias
+ *
+ * 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
+
+//This is the ANSI version of the PCB
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[0] = LAYOUT_all(
+    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_MUTE,
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,      KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+    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_PGDN,
+    KC_LSFT,      KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+    KC_LCTL, KC_LGUI,      KC_LALT,      KC_SPC,      KC_SPC,      KC_RALT,      KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+)
+};
+
diff --git a/keyboards/p3d/glitch/keymaps/default/readme.md b/keyboards/p3d/glitch/keymaps/default/readme.md
new file mode 100644
index 0000000000..8661c4b95f
--- /dev/null
+++ b/keyboards/p3d/glitch/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Glitch
diff --git a/keyboards/p3d/glitch/readme.md b/keyboards/p3d/glitch/readme.md
new file mode 100644
index 0000000000..b29dc6e930
--- /dev/null
+++ b/keyboards/p3d/glitch/readme.md
@@ -0,0 +1,24 @@
+# Glitch
+
+Hotswap RGB Alice-style with OLED and Rotary Knob
+
+-   Keyboard Maintainer: matthewdias
+-   Hardware Supported: Glitch PCB
+-   Hardware Availability: https://p3dstore.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make p3d/glitch:default
+
+Flashing example for this keyboard:
+
+    make p3d/glitch:default:flash
+    
+## Bootloader
+
+Enter the bootloader in one of 2 ways:
+
+* **Bootmagic reset**: Hold down the top left and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the top of the PCB
+
+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).
diff --git a/keyboards/p3d/glitch/rules.mk b/keyboards/p3d/glitch/rules.mk
new file mode 100644
index 0000000000..7ec8d5c09a
--- /dev/null
+++ b/keyboards/p3d/glitch/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+OLED_ENABLE = yes

From dccb5711c710d074c29f715494b93f9275f5ac55 Mon Sep 17 00:00:00 2001
From: Matthew Dias <matthewdias@me.com>
Date: Sun, 13 Mar 2022 01:37:22 -0600
Subject: [PATCH 804/867] [Keyboard] Add damapad (#16443)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/bolsa/damapad/config.h              |  59 ++++++++++
 keyboards/bolsa/damapad/damapad.c             |  81 +++++++++++++
 keyboards/bolsa/damapad/damapad.h             |  32 +++++
 keyboards/bolsa/damapad/info.json             | 109 ++++++++++++++++++
 .../bolsa/damapad/keymaps/default/keymap.c    |  29 +++++
 keyboards/bolsa/damapad/keymaps/via/keymap.c  |  47 ++++++++
 keyboards/bolsa/damapad/keymaps/via/rules.mk  |   1 +
 keyboards/bolsa/damapad/readme.md             |  22 ++++
 keyboards/bolsa/damapad/rules.mk              |  21 ++++
 9 files changed, 401 insertions(+)
 create mode 100644 keyboards/bolsa/damapad/config.h
 create mode 100644 keyboards/bolsa/damapad/damapad.c
 create mode 100644 keyboards/bolsa/damapad/damapad.h
 create mode 100644 keyboards/bolsa/damapad/info.json
 create mode 100644 keyboards/bolsa/damapad/keymaps/default/keymap.c
 create mode 100644 keyboards/bolsa/damapad/keymaps/via/keymap.c
 create mode 100644 keyboards/bolsa/damapad/keymaps/via/rules.mk
 create mode 100644 keyboards/bolsa/damapad/readme.md
 create mode 100644 keyboards/bolsa/damapad/rules.mk

diff --git a/keyboards/bolsa/damapad/config.h b/keyboards/bolsa/damapad/config.h
new file mode 100644
index 0000000000..b829a8a998
--- /dev/null
+++ b/keyboards/bolsa/damapad/config.h
@@ -0,0 +1,59 @@
+
+/*
+Copyright 2021 Matthew Dias
+
+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       0x6D64
+#define PRODUCT_ID      0x6470
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Bolsa Keyboard Supply
+#define PRODUCT         Damapad
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 6
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { E6, F7, C7 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, B7 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define ENCODERS_PAD_A { B2 }
+#define ENCODERS_PAD_B { B3 }
+#define ENCODER_RESOLUTION 2
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
diff --git a/keyboards/bolsa/damapad/damapad.c b/keyboards/bolsa/damapad/damapad.c
new file mode 100644
index 0000000000..d57a60c166
--- /dev/null
+++ b/keyboards/bolsa/damapad/damapad.c
@@ -0,0 +1,81 @@
+/*
+Copyright 2021 Matthew Dias
+
+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 "damapad.h" 
+
+#ifdef OLED_ENABLE
+bool oled_task_kb(void) {
+    if (!oled_task_user()) {
+    	return false; 
+    }
+    static const char PROGMEM bolsa_logo[] = {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x1e, 0x3e, 0xfe, 0xfe, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 
+        0xfc, 0xfe, 0xfe, 0x3e, 0x1e, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0e, 0x1e, 0x3e, 0x3e, 0xfe, 0xfe, 0xff, 0x7f, 0x7f, 
+        0xff, 0xff, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
+        0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 
+        0x7f, 0xff, 0xfe, 0xfe, 0x3e, 0x3e, 0x1e, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfc, 0xff, 0x07, 0x00, 0x00, 0xf8, 
+        0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xf8, 
+        0x00, 0x00, 0x0f, 0xff, 0xfe, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x3f, 0x3f, 0x0f, 0x00, 0x00, 0x00, 0x1f, 0x1f, 
+        0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x1f, 
+        0x1f, 0x00, 0x00, 0x00, 0x07, 0x3f, 0x3f, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    oled_write_raw_P(bolsa_logo, sizeof(bolsa_logo));
+    return false;
+}
+
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/bolsa/damapad/damapad.h b/keyboards/bolsa/damapad/damapad.h
new file mode 100644
index 0000000000..da0a4d863e
--- /dev/null
+++ b/keyboards/bolsa/damapad/damapad.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_wkl( \
+	K00, K01, K02, K03, K04, K05, \
+	K10, K11, K12, K13, K14, K15, \
+	K20, K21,      K23,      K25  \
+) { \
+	{ K00, K01, K02, K03, K04, K05 }, \
+	{ K10, K11, K12, K13, K14, K15 }, \
+	{ K20, K21, XXX, K23, XXX, K25 }  \
+}
diff --git a/keyboards/bolsa/damapad/info.json b/keyboards/bolsa/damapad/info.json
new file mode 100644
index 0000000000..28d0c4fc82
--- /dev/null
+++ b/keyboards/bolsa/damapad/info.json
@@ -0,0 +1,109 @@
+{
+    "keyboard_name": "Damapad",
+    "url": "",
+    "maintainer": "matthewdias",
+    "layouts": {
+        "LAYOUT_wkl": {
+            "layout": [{
+                "x": 5.25,
+                "y": 0
+            }, {
+                "x": 0,
+                "y": 0.25
+            }, {
+                "x": 1,
+                "y": 0.25
+            }, {
+                "x": 2,
+                "y": 0.25
+            }, {
+                "x": 3,
+                "y": 0.25
+            }, {
+                "x": 4,
+                "y": 0.25
+            }, {
+                "x": 0,
+                "y": 1.25
+            }, {
+                "x": 1,
+                "y": 1.25
+            }, {
+                "x": 2,
+                "y": 1.25
+            }, {
+                "x": 3,
+                "y": 1.25
+            }, {
+                "x": 4,
+                "y": 1.25
+            }, {
+                "x": 5.25,
+                "y": 1.25
+            }, {
+                "x": 0,
+                "y": 2.25
+            }, {
+                "x": 1.75,
+                "y": 2.25
+            }, {
+                "x": 2.75,
+                "y": 2.25,
+                "w": 2.25
+            }, {
+                "x": 5.25,
+                "y": 2.25
+            }]
+        },
+        "LAYOUT_bar": {
+            "layout": [{
+                "x": 5.25,
+                "y": 0
+            }, {
+                "x": 0,
+                "y": 0.25
+            }, {
+                "x": 1,
+                "y": 0.25
+            }, {
+                "x": 2,
+                "y": 0.25
+            }, {
+                "x": 3,
+                "y": 0.25
+            }, {
+                "x": 4,
+                "y": 0.25
+            }, {
+                "x": 0,
+                "y": 1.25
+            }, {
+                "x": 1,
+                "y": 1.25
+            }, {
+                "x": 2,
+                "y": 1.25
+            }, {
+                "x": 3,
+                "y": 1.25
+            }, {
+                "x": 4,
+                "y": 1.25
+            }, {
+                "x": 5.25,
+                "y": 1.25
+            }, {
+                "x": 0,
+                "y": 2.25,
+                "w": 2.75
+            }, {
+                "x": 2.75,
+                "y": 2.25,
+                "w": 2.25
+            }, {
+                "x": 5.25,
+                "y": 2.25
+            }]
+        }
+    }
+}
diff --git a/keyboards/bolsa/damapad/keymaps/default/keymap.c b/keyboards/bolsa/damapad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..00c8e05333
--- /dev/null
+++ b/keyboards/bolsa/damapad/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_wkl(
+        KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_MSEL, KC_MUTE,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_PGUP,  
+        KC_NO,   KC_COPY,          KC_PASTE,         KC_PGDN
+    )
+
+};
+
diff --git a/keyboards/bolsa/damapad/keymaps/via/keymap.c b/keyboards/bolsa/damapad/keymaps/via/keymap.c
new file mode 100644
index 0000000000..18ae315207
--- /dev/null
+++ b/keyboards/bolsa/damapad/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/*
+Copyright 2021 Matthew Dias
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_wkl(
+        KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_MSEL, KC_MUTE,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_PGUP,  
+        KC_NO,   KC_COPY,          KC_PASTE,         KC_PGDN
+    ),
+
+    [1] = LAYOUT_wkl(
+        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
+    ),
+
+    [2] = LAYOUT_wkl(
+        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
+    ),
+
+    [3] = LAYOUT_wkl(
+        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
+    )
+
+};
+
diff --git a/keyboards/bolsa/damapad/keymaps/via/rules.mk b/keyboards/bolsa/damapad/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/bolsa/damapad/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/bolsa/damapad/readme.md b/keyboards/bolsa/damapad/readme.md
new file mode 100644
index 0000000000..1cfa1c06b7
--- /dev/null
+++ b/keyboards/bolsa/damapad/readme.md
@@ -0,0 +1,22 @@
+# Damapad
+
+A Macropad by Bolsa Supply
+
+-   Keyboard Maintainer: [matthewdias](https://github.com/matthewdias)
+-   Hardware Supported: Damapad PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bolsa/damapad:default
+
+Flashing example for this keyboard:
+
+    make bolsa/damapad:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader:
+
+-   **Physical reset button**: Briefly press the button on the back of the PCB (or short the reset/ground pads, should a tactile button not be installed)
diff --git a/keyboards/bolsa/damapad/rules.mk b/keyboards/bolsa/damapad/rules.mk
new file mode 100644
index 0000000000..48717046e4
--- /dev/null
+++ b/keyboards/bolsa/damapad/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306

From 08794fef4e8e0a5fb6ba32595c099bf1e167c12b Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 13 Mar 2022 04:08:33 -0600
Subject: [PATCH 805/867] [Keyboard] add missing endif in glitch keyboard
 (#16629)

---
 keyboards/p3d/glitch/glitch.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/p3d/glitch/glitch.c b/keyboards/p3d/glitch/glitch.c
index a62f578994..9957e0c7ad 100644
--- a/keyboards/p3d/glitch/glitch.c
+++ b/keyboards/p3d/glitch/glitch.c
@@ -56,3 +56,4 @@ bool oled_task_kb(void) {
 
     return false;
 }
+#endif

From 1f63dbfb8e3b00f7d1c87cb29d05770a93a77f9c Mon Sep 17 00:00:00 2001
From: jpe230 <pablin.123.ra@gmail.com>
Date: Sun, 13 Mar 2022 04:09:36 -0600
Subject: [PATCH 806/867] [Keymap] Update personal crkbd keymap (#16624)

---
 keyboards/crkbd/keymaps/jpe230/config.h | 22 ++++++++++-
 keyboards/crkbd/keymaps/jpe230/keymap.c | 49 +++++++++++++++++++++----
 keyboards/crkbd/keymaps/jpe230/rules.mk | 18 ++++++---
 3 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/keyboards/crkbd/keymaps/jpe230/config.h b/keyboards/crkbd/keymaps/jpe230/config.h
index 3680f7c480..2887b5014c 100644
--- a/keyboards/crkbd/keymaps/jpe230/config.h
+++ b/keyboards/crkbd/keymaps/jpe230/config.h
@@ -21,4 +21,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define SPLIT_WPM_ENABLE
+#ifndef RGB_MATRIX_ENABLE
+#   define SPLIT_WPM_ENABLE
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+#   define RGB_MATRIX_KEYPRESSES
+#   define RGB_DISABLE_WHEN_USB_SUSPENDED
+#   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128
+#   define RGB_MATRIX_STARTUP_HUE 215
+#   define RGB_MATRIX_STARTUP_SAT 255
+#   define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#   define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#   define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#   define ENABLE_RGB_MATRIX_BAND_VAL
+#   define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#   define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#   define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#   define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#   define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
diff --git a/keyboards/crkbd/keymaps/jpe230/keymap.c b/keyboards/crkbd/keymaps/jpe230/keymap.c
index 65cb6f73f7..6e812c0e61 100644
--- a/keyboards/crkbd/keymaps/jpe230/keymap.c
+++ b/keyboards/crkbd/keymaps/jpe230/keymap.c
@@ -46,11 +46,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [1] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
+       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_CAPS, _______, _______, _______, _______, _______,                      _______,   KC_UP, _______, _______, _______, _______,
+      KC_CAPS, _______, _______, _______, _______, _______,                      _______,   KC_UP, _______, RGB_MOD, RGB_HUI, RGB_VAI,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, _______, _______, _______, _______, _______,                      KC_LEFT, KC_DOWN,KC_RIGHT, _______, _______, _______,
+      KC_LSFT, _______, _______, _______, _______, _______,                      KC_LEFT, KC_DOWN,KC_RIGHT, RGB_TOG, RGB_SAI, RGB_SPI,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                           KC_LGUI, _______, _______,   _______,   MO(3), KC_RALT
                                       //`--------------------------'  `--------------------------'
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [2] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+       KC_ESC, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       KC_CAPS, _______, _______, _______, _______, _______,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
@@ -83,7 +83,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  return rotation;
+#ifdef RGB_MATRIX_ENABLE
+    if (!is_keyboard_master()) {
+        return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+    }
+#endif
+    return rotation;
 }
 
 #define L_BASE 0
@@ -163,6 +168,7 @@ void render_bootmagic_status(bool status) {
     }
 }
 
+#ifndef RGB_MATRIX_ENABLE
 // frame 0, 128x32px
 const char PROGMEM cat_frame_0 [] PROGMEM = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -282,8 +288,18 @@ static uint32_t frame_timer = 0;
 static uint32_t anim_sleep = 0;
 static uint8_t  anim_speed = 120;
 
-void oled_render_logo(void) {
+#endif
 
+void oled_render_logo(void) {
+#ifdef RGB_MATRIX_ENABLE
+    static const char PROGMEM crkbd_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+        0};
+    oled_write_P(crkbd_logo, false);
+#endif
+#ifndef RGB_MATRIX_ENABLE
     if(get_current_wpm() != 000) {
         oled_on();
         int8_t wpm_speed = (int8_t)(get_current_wpm() / 2);
@@ -309,6 +325,7 @@ void oled_render_logo(void) {
             oled_write_raw_P(cat_frames[current_frame], FRAME_SIZE);
         }
     }
+#endif
 }
 
 bool oled_task_user(void) {
@@ -328,6 +345,9 @@ bool tog_sarcasm = false;
 bool uppercase = false;
 uint8_t prev_upper = 0;
 uint8_t prev_lower = 0;
+uint8_t prev_mode = 0;
+HSV prev_hsv;
+
 
 bool process_record_sarcasm(uint16_t keycode, keyrecord_t *record) {
     if (keycode == KC_ENTER && record->event.pressed) {
@@ -379,10 +399,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             if (record->event.pressed) {
                 tog_sarcasm = !tog_sarcasm;
 
-                if (tog_sarcasm)
+                if (tog_sarcasm) {
                     dprint("Enabling saRCaSm ModE\n");
-                else
+
+                    #ifdef RGB_MATRIX_ENABLE
+                    prev_hsv = rgb_matrix_get_hsv();
+                    prev_mode = rgb_matrix_get_mode();
+                    rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_MULTISPLASH);
+                    rgb_matrix_sethsv_noeeprom(HSV_YELLOW);
+                    #endif
+                }
+                else {
                     dprint("Disabling saRCaSm ModE\n");
+                    #ifdef RGB_MATRIX_ENABLE
+                    rgb_matrix_mode_noeeprom(prev_mode);
+                    rgb_matrix_sethsv_noeeprom(prev_hsv.h, prev_hsv.s, prev_hsv.v);
+                    #endif
+                }
 
                 uppercase = false;
                 prev_upper = 0;
diff --git a/keyboards/crkbd/keymaps/jpe230/rules.mk b/keyboards/crkbd/keymaps/jpe230/rules.mk
index 27a25ddeb3..82d5eb321d 100644
--- a/keyboards/crkbd/keymaps/jpe230/rules.mk
+++ b/keyboards/crkbd/keymaps/jpe230/rules.mk
@@ -1,6 +1,12 @@
-MOUSEKEY_ENABLE = yes
-OLED_ENABLE     = yes
-OLED_DRIVER     = SSD1306
-LTO_ENABLE      = yes
-WPM_ENABLE      = yes
-VIA_ENABLE      = yes
+# Shared rules for both of my Corne
+OLED_ENABLE       = yes
+OLED_DRIVER       = SSD1306
+LTO_ENABLE        = yes
+VIA_ENABLE        = yes
+
+# Rules for my Corne without RGB
+# WPM_ENABLE        = yes
+# MOUSEKEY_ENABLE   = yes
+
+# Rules for my Corne with RGB
+RGB_MATRIX_ENABLE = yes

From b906af0073e08927ed5105c826d579c6421cb7ac Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Sun, 13 Mar 2022 22:56:56 +0900
Subject: [PATCH 807/867] helix:edvorakjp keymap change to use split_common
 (#16532)

---
 keyboards/helix/rev2/keymaps/edvorakjp/rules.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk b/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
index 59b7acad5b..6b2d147514 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/rules.mk
@@ -5,6 +5,7 @@
 #   See TOP/keyboards/helix/rules.mk for a list of options that can be set.
 #   See TOP/docs/config_options.md for more information.
 #
+SPLIT_KEYBOARD = yes
 LTO_ENABLE = no  # if firmware size over limit, try this option
 TAP_DANCE_ENABLE = yes
 

From 109c60feeb24081f6bcc78276d7426c5340f2822 Mon Sep 17 00:00:00 2001
From: jels <66403163+Jels02@users.noreply.github.com>
Date: Mon, 14 Mar 2022 03:30:55 +1000
Subject: [PATCH 808/867] [Keyboard] Add support for Jels60 (#16605)

Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/jels/jels60/config.h                |  49 +++
 keyboards/jels/jels60/info.json               | 344 ++++++++++++++++++
 keyboards/jels/jels60/jels60.c                |  21 ++
 keyboards/jels/jels60/jels60.h                |  95 +++++
 .../jels/jels60/keymaps/default/keymap.c      |  50 +++
 keyboards/jels/jels60/keymaps/via/keymap.c    |  50 +++
 keyboards/jels/jels60/keymaps/via/rules.mk    |   1 +
 keyboards/jels/jels60/readme.md               |  23 ++
 keyboards/jels/jels60/rules.mk                |  18 +
 9 files changed, 651 insertions(+)
 create mode 100644 keyboards/jels/jels60/config.h
 create mode 100644 keyboards/jels/jels60/info.json
 create mode 100644 keyboards/jels/jels60/jels60.c
 create mode 100644 keyboards/jels/jels60/jels60.h
 create mode 100644 keyboards/jels/jels60/keymaps/default/keymap.c
 create mode 100644 keyboards/jels/jels60/keymaps/via/keymap.c
 create mode 100644 keyboards/jels/jels60/keymaps/via/rules.mk
 create mode 100644 keyboards/jels/jels60/readme.md
 create mode 100644 keyboards/jels/jels60/rules.mk

diff --git a/keyboards/jels/jels60/config.h b/keyboards/jels/jels60/config.h
new file mode 100644
index 0000000000..0157da213c
--- /dev/null
+++ b/keyboards/jels/jels60/config.h
@@ -0,0 +1,49 @@
+ /* Copyright 2022 Joah Nelson (Jels)
+ *
+ * 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 paramater */
+#define VENDOR_ID       0x006A    //Jels (J)
+#define PRODUCT_ID      0x0060    //Jels 60
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    jels
+#define PRODUCT         jels60
+
+/* Define Matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*Define Matrix Pins */
+#define MATRIX_ROW_PINS {B3, D1, F0, F4, F1}
+#define MATRIX_COL_PINS {E6, C7, B4, D7, D6, D4, D5, D3, F5, F6, F7, C6, B6, B5}
+
+// Caps lock Pin
+#define LED_CAPS_LOCK_PIN B7
+
+/* 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
+
diff --git a/keyboards/jels/jels60/info.json b/keyboards/jels/jels60/info.json
new file mode 100644
index 0000000000..b958bb6905
--- /dev/null
+++ b/keyboards/jels/jels60/info.json
@@ -0,0 +1,344 @@
+{
+    "keyboard_name": "Jels60",
+    "url": "",
+    "maintainer": "Jels",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "ESC", "x": 0, "y": 0 },
+                { "label": "1", "x": 1, "y": 0 },
+                { "label": "2", "x": 2, "y": 0 },
+                { "label": "3", "x": 3, "y": 0 },
+                { "label": "4", "x": 4, "y": 0 },
+                { "label": "5", "x": 5, "y": 0 },
+                { "label": "6", "x": 6, "y": 0 },
+                { "label": "7", "x": 7, "y": 0 },
+                { "label": "8", "x": 8, "y": 0 },
+                { "label": "9", "x": 9, "y": 0 },
+                { "label": "0", "x": 10, "y": 0 },
+                { "label": "-", "x": 11, "y": 0 },
+                { "label": "=", "x": 12, "y": 0 },
+                { "label": "Bksp", "x": 13, "y": 0 },
+                { "label": "~", "x": 14, "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": "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": 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": 1.75 },
+                { "x": 14, "y": 3 },
+                { "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": 2.75 },
+                { "x": 6.5, "y": 4, "w": 1 },
+                { "x": 7.5, "y": 4, "w": 2.5 },
+                { "label": "Alt", "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_ansi": {
+            "layout": [
+                { "label": "ESC", "x": 0, "y": 0 },
+                { "label": "1", "x": 1, "y": 0 },
+                { "label": "2", "x": 2, "y": 0 },
+                { "label": "3", "x": 3, "y": 0 },
+                { "label": "4", "x": 4, "y": 0 },
+                { "label": "5", "x": 5, "y": 0 },
+                { "label": "6", "x": 6, "y": 0 },
+                { "label": "7", "x": 7, "y": 0 },
+                { "label": "8", "x": 8, "y": 0 },
+                { "label": "9", "x": 9, "y": 0 },
+                { "label": "0", "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": "|", "x": 13.5, "y": 1, "w": 1.5 },
+                { "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": "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": "Alt", "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_split_space": {
+            "layout": [
+                { "label": "ESC", "x": 0, "y": 0 },
+                { "label": "1", "x": 1, "y": 0 },
+                { "label": "2", "x": 2, "y": 0 },
+                { "label": "3", "x": 3, "y": 0 },
+                { "label": "4", "x": 4, "y": 0 },
+                { "label": "5", "x": 5, "y": 0 },
+                { "label": "6", "x": 6, "y": 0 },
+                { "label": "7", "x": 7, "y": 0 },
+                { "label": "8", "x": 8, "y": 0 },
+                { "label": "9", "x": 9, "y": 0 },
+                { "label": "0", "x": 10, "y": 0 },
+                { "label": "-", "x": 11, "y": 0 },
+                { "label": "=", "x": 12, "y": 0 },
+                { "label": "Bksp", "x": 13, "y": 0 },
+                { "label": "~", "x": 14, "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": "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": 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": 1.75 },
+                { "x": 14, "y": 3 },
+                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 },
+                { "label": "Win", "x": 1.5, "y": 4, "w": 1 },
+                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 },
+                { "x": 4, "y": 4, "w": 2.75 },
+                { "x": 6.75, "y": 4, "w": 1.5 },
+                { "x": 8.25, "y": 4, "w": 2.75 },
+                { "label": "Alt", "x": 11, "y": 4, "w": 1.5 },
+                { "label": "Win", "x": 12.5, "y": 4, "w": 1 },
+                { "label": "Ctrl", "x": 13.5, "y": 4, "w": 1.5 }
+            ]
+        },
+        "LAYOUT_tsangan_split_bs": {
+            "layout": [
+                { "label": "ESC", "x": 0, "y": 0 },
+                { "label": "1", "x": 1, "y": 0 },
+                { "label": "2", "x": 2, "y": 0 },
+                { "label": "3", "x": 3, "y": 0 },
+                { "label": "4", "x": 4, "y": 0 },
+                { "label": "5", "x": 5, "y": 0 },
+                { "label": "6", "x": 6, "y": 0 },
+                { "label": "7", "x": 7, "y": 0 },
+                { "label": "8", "x": 8, "y": 0 },
+                { "label": "9", "x": 9, "y": 0 },
+                { "label": "0", "x": 10, "y": 0 },
+                { "label": "-", "x": 11, "y": 0 },
+                { "label": "=", "x": 12, "y": 0 },
+                { "label": "Bksp", "x": 13, "y": 0 },
+                { "label": "~", "x": 14, "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": "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": 1.75 },
+                { "x": 14, "y": 3 },
+                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.5 },
+                { "label": "Win", "x": 1.5, "y": 4, "w": 1 },
+                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.5 },
+                { "x": 4, "y": 4, "w": 7 },
+                { "label": "Alt", "x": 11, "y": 4, "w": 1.5 },
+                { "label": "Win", "x": 12.5, "y": 4, "w": 1 },
+                { "label": "Ctrl", "x": 13.5, "y": 4, "w": 1.5 }
+            ]
+        },
+        "LAYOUT_iso": {
+         "layout": [
+                { "label": "ESC", "x": 0, "y": 0 },
+                { "label": "1", "x": 1, "y": 0 },
+                { "label": "2", "x": 2, "y": 0 },
+                { "label": "3", "x": 3, "y": 0 },
+                { "label": "4", "x": 4, "y": 0 },
+                { "label": "5", "x": 5, "y": 0 },
+                { "label": "6", "x": 6, "y": 0 },
+                { "label": "7", "x": 7, "y": 0 },
+                { "label": "8", "x": 8, "y": 0 },
+                { "label": "9", "x": 9, "y": 0 },
+                { "label": "0", "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": "Alt", "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 }
+            ]
+        }
+
+    }
+}
diff --git a/keyboards/jels/jels60/jels60.c b/keyboards/jels/jels60/jels60.c
new file mode 100644
index 0000000000..6e8fd58da8
--- /dev/null
+++ b/keyboards/jels/jels60/jels60.c
@@ -0,0 +1,21 @@
+ /* Copyright 2022 Joah Nelson (Jels)
+ *
+ * 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 "jels60.h"
+
+
+
+
diff --git a/keyboards/jels/jels60/jels60.h b/keyboards/jels/jels60/jels60.h
new file mode 100644
index 0000000000..f8bc296e1a
--- /dev/null
+++ b/keyboards/jels/jels60/jels60.h
@@ -0,0 +1,95 @@
+/*  copyright 2022 Joah Nelson (Jels)
+*
+*   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
+*   MERAHANTABILITY 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 <https://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define ____ KC_NO
+
+
+#define LAYOUT_all( \
+    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13, K1x13,  \
+    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x13,         \
+    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12,                \
+    K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13,         \
+    K4x0, K4x1, K4x2,       K4x4,       K4x6,             K4x9, K4x10, K4x11, K4x12, K4x13          \
+){ \
+    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
+    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K1x13}, \
+    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
+    {K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13}, \
+    {K4x0, K4x1, K4x2, ____, K4x4, ____, K4x6, ____, ____, K4x9, K4x10, K4x11, K4x12, K4x13}  \
+}
+
+#define LAYOUT_ansi( \
+    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13, \
+    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x13, \
+    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12,        \
+    K3x0,       K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12,        \
+    K4x0, K4x1, K4x2,             K4x6,                         K4x10, K4x11, K4x12, K4x13  \
+){ \
+    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
+    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, ____ }, \
+    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
+    {K3x0, ____, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, ____ }, \
+    {K4x0, K4x1, K4x2, ____, ____, ____, K4x6, ____, ____, ____, K4x10, K4x11, K4x12, K4x13}  \
+}
+
+#define LAYOUT_split_space( \
+    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13, K1x13,  \
+    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x13,         \
+    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12,                \
+    K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13,         \
+    K4x0, K4x1, K4x2,       K4x4,       K4x6,             K4x9,        K4x11, K4x12, K4x13          \
+){ \
+    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
+    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K1x13}, \
+    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
+    {K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13}, \
+    {K4x0, K4x1, K4x2, ____, K4x4, ____, K4x6, ____, ____, K4x9,  ____, K4x11, K4x12, K4x13}  \
+}
+
+#define LAYOUT_tsangan_split_bs( \
+    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13, K1x13,  \
+    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x13,         \
+    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12,                \
+    K3x0,       K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13,         \
+    K4x0, K4x1, K4x2,              K4x6,                        K4x10,        K4x12, K4x13          \
+){ \
+    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
+    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K1x13}, \
+    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
+    {K3x0, ____, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13}, \
+    {K4x0, K4x1, K4x2, ____, ____, ____, K4x6, ____, ____, ____, K4x10,  ____, K4x12, K4x13}  \
+}
+
+#define LAYOUT_iso( \
+    K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13,         \
+    K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, K2x12,         \
+    K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x13,                \
+    K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13,         \
+    K4x0, K4x1, K4x2,              K4x6,                        K4x10,        K4x12, K4x13          \
+){ \
+    {K0x0, K0x1, K0x2, K0x3, K0x4, K0x5, K0x6, K0x7, K0x8, K0x9, K0x10, K0x11, K0x12, K0x13}, \
+    {K1x0, K1x1, K1x2, K1x3, K1x4, K1x5, K1x6, K1x7, K1x8, K1x9, K1x10, K1x11, K1x12, ____ }, \
+    {K2x0, K2x1, K2x2, K2x3, K2x4, K2x5, K2x6, K2x7, K2x8, K2x9, K2x10, K2x11, K2x12, K2x13}, \
+    {K3x0, K3x1, K3x2, K3x3, K3x4, K3x5, K3x6, K3x7, K3x8, K3x9, K3x10, K3x11, K3x12, K3x13}, \
+    {K4x0, K4x1, K4x2, ____, ____, ____, K4x6, ____, ____, ____, K4x10,  ____, K4x12, K4x13}  \
+}
+
+
+
diff --git a/keyboards/jels/jels60/keymaps/default/keymap.c b/keyboards/jels/jels60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..072ae3e059
--- /dev/null
+++ b/keyboards/jels/jels60/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+ /* Copyright 2022 Joah Nelson (Jels)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,   either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//base layer
+[0] = LAYOUT_all(
+    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_GRV,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+    KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RALT, KC_RGUI, KC_RCTL
+),
+[1] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP  , _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
+    _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______
+    ),
+[2] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______
+    ),
+[3] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/jels/jels60/keymaps/via/keymap.c b/keyboards/jels/jels60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..072ae3e059
--- /dev/null
+++ b/keyboards/jels/jels60/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+ /* Copyright 2022 Joah Nelson (Jels)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation,   either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+//base layer
+[0] = LAYOUT_all(
+    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_GRV,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+    KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,                    KC_RALT, KC_RALT, KC_RGUI, KC_RCTL
+),
+[1] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
+    KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP  , _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,
+    _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______
+    ),
+[2] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______
+    ),
+[3] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                   _______, _______, _______,                   _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/jels/jels60/keymaps/via/rules.mk b/keyboards/jels/jels60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/jels/jels60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/jels/jels60/readme.md b/keyboards/jels/jels60/readme.md
new file mode 100644
index 0000000000..0b72d3e346
--- /dev/null
+++ b/keyboards/jels/jels60/readme.md
@@ -0,0 +1,23 @@
+# Jels60
+
+![jels60](https://i.imgur.com/3Ec4YZNh.png)
+
+A 60% PCB
+
+* Keyboard Maintainer: [Jels](https://github.com/Jels02)
+* Hardware Supported: Jels60 PCB
+* Hardware Availabililty: Limited Group buys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jels/jels60:default
+
+Flashing example for this keyboard:
+
+    make jels/jels60:default:flash
+
+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).
+
+* **Bootmagic reset**: Hold down the top left key (ESC/Tilde) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/jels/jels60/rules.mk b/keyboards/jels/jels60/rules.mk
new file mode 100644
index 0000000000..476cf49f27
--- /dev/null
+++ b/keyboards/jels/jels60/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 8fe3864fe7601a7e6572e7db680775edeff771ac Mon Sep 17 00:00:00 2001
From: Spencer Peterson <spencerjp@google.com>
Date: Sun, 13 Mar 2022 14:49:47 -0700
Subject: [PATCH 809/867] [Keyboard] Add "Uno" rev2 (#14071)

* [Keyboard] Add "Uno" rev2

Adds support for the second revision of Uno, courtesy of @Snipeye.

* Update keyboards/uno/rev2/rules.mk

* Update keyboards/uno/rev1/rules.mk

* Update keyboards/uno/uno.h

* Update keyboards/uno/rev2/rules.mk

* Update keyboards/uno/rev1/rules.mk

* Update keyboards/uno/keymaps/demo/keymap.c

* Update keyboards/uno/keymaps/demo/keymap.c

* Update keyboards/uno/keymaps/demo/keymap.c

* Update keyboards/uno/rev2/rules.mk

* Update keyboards/uno/rev1/rules.mk

* Align rules.mk comments

* Update keyboards/uno/info.json

* Update keyboards/uno/rev1/config.h

* Update keyboards/uno/rev2/config.h

* Update keyboards/uno/rev2/config.h

* Update keyboards/uno/rev2/config.h

* Update keyboards/uno/rev1/config.h
---
 keyboards/uno/config.h                    |  54 +---------
 keyboards/uno/keymaps/copypasta/keymap.c  |  85 +++++++++++++++
 keyboards/uno/keymaps/copypasta/readme.md |   4 +
 keyboards/uno/keymaps/default/keymap.c    |  89 +++++-----------
 keyboards/uno/keymaps/default/readme.md   |   5 +-
 keyboards/uno/keymaps/demo/keymap.c       | 123 ++++++++++++++++++++++
 keyboards/uno/keymaps/demo/readme.md      |   4 +
 keyboards/uno/readme.md                   |  35 ++++--
 keyboards/uno/rev1/config.h               |  74 +++++++++++++
 keyboards/uno/rev1/rev1.h                 |  25 +++++
 keyboards/uno/rev1/rules.mk               |  18 ++++
 keyboards/uno/rev2/config.h               |  49 +++++++++
 keyboards/uno/rev2/rev2.h                 |  25 +++++
 keyboards/uno/rev2/rules.mk               |  19 ++++
 keyboards/uno/rules.mk                    |  19 +---
 keyboards/uno/uno.h                       |  11 +-
 16 files changed, 489 insertions(+), 150 deletions(-)
 create mode 100644 keyboards/uno/keymaps/copypasta/keymap.c
 create mode 100644 keyboards/uno/keymaps/copypasta/readme.md
 create mode 100644 keyboards/uno/keymaps/demo/keymap.c
 create mode 100644 keyboards/uno/keymaps/demo/readme.md
 create mode 100644 keyboards/uno/rev1/config.h
 create mode 100644 keyboards/uno/rev1/rev1.h
 create mode 100644 keyboards/uno/rev1/rules.mk
 create mode 100644 keyboards/uno/rev2/config.h
 create mode 100644 keyboards/uno/rev2/rev2.h
 create mode 100644 keyboards/uno/rev2/rules.mk

diff --git a/keyboards/uno/config.h b/keyboards/uno/config.h
index 1cae17f50a..0128ee2d5d 100644
--- a/keyboards/uno/config.h
+++ b/keyboards/uno/config.h
@@ -13,57 +13,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #pragma once
+
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0xACC8
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Broekhuijsen
-#define PRODUCT         Uno
-
-/* key matrix size */
-#define MATRIX_ROWS 1
-#define MATRIX_COLS 1
-
-/* Uno default pinout */
-#define DIRECT_PINS { \
-    { B6 } \
-}
-#define UNUSED_PINS
-
-#define RGB_DI_PIN F6
-#ifdef RGB_DI_PIN
-#define RGBLED_NUM 1
-//   #define RGBLIGHT_HUE_STEP 32
-//   #define RGBLIGHT_SAT_STEP 32
-//   #define RGBLIGHT_VAL_STEP 32
-//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-#define RGBLIGHT_ANIMATIONS
-// /*== or choose 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
-// /*== customize breathing effect ==*/
-//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-//   /*==== use exp() and sin() ====*/
-//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-#endif
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+// See rev1/config.h and rev2/config.h to configure your uno.
diff --git a/keyboards/uno/keymaps/copypasta/keymap.c b/keyboards/uno/keymaps/copypasta/keymap.c
new file mode 100644
index 0000000000..74e5f62fc5
--- /dev/null
+++ b/keyboards/uno/keymaps/copypasta/keymap.c
@@ -0,0 +1,85 @@
+/* Copyright 2020 Snipeye
+ *
+ * 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 uno_keycode
+{
+  UNO = SAFE_RANGE
+};
+
+static uint16_t pressTimer = 0xFFFF;
+#define CUSTOM_LONGPRESS 1000
+#define PASTA_COUNT 4
+
+const char *pasta[PASTA_COUNT] =  {
+    "Hey - I'm Uno... V2.  This time, I have uno more features: I support a rotary encoder, too.  That's it.  That's the only difference.",
+    "Did you ever hear the tragedy of Darth Plagueis the Wise?  I thought not. It's not a story the Jedi would tell you. It's a Sith legend. Darth Plagueis was a Dark Lord of the Sith, so powerful and so wise he could use the Force to influence the midichlorians to create life... He had such a knowledge of the dark side that he could even keep the ones he cared about from dying. The dark side of the Force is a pathway to many abilities some consider to be unnatural. He became so powerful... the only thing he was afraid of was losing his power, which eventually, of course, he did. Unfortunately, he taught his apprentice everything he knew, then his apprentice killed him in his sleep. Ironic, he could save others from death, but not himself.",
+    "The intent is to provide players with a sense of pride and accomplishment for unlocking different heroes.  As for cost, we selected initial values based upon data from the Open Beta and other adjustments made to milestone rewards before launch. Among other things, we're looking at average per-player credit earn rates on a daily basis, and we'll be making constant adjustments to ensure that players have challenges that are compelling, rewarding, and of course attainable via gameplay.  We appreciate the candid feedback, and the passion the community has put forth around the current topics here on Reddit, our forums and across numerous social media outlets.  Our team will continue to make changes and monitor community feedback and update everyone as soon and as often as we can.",
+    "The FitnessGram Pacer Test is a multistage aerobic capacity test that progressively gets more difficult as it continues. The 20 meter pacer test will begin in 30 seconds. Line up at the start. The running speed starts slowly, but gets faster each minute after you hear this signal. [beep] A single lap should be completed each time you hear this sound. [ding] Remember to run in a straight line, and run as long as possible. The second time you fail to complete a lap before the sound, your test is over. The test will begin on the word start. On your mark, get ready, start.",
+};
+
+uint8_t pastaIndex = 0;
+
+enum encoder_names {
+	_ENCODER,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        UNO
+    )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+	switch (keycode) {
+		case UNO:
+            if (record->event.pressed) {
+                pressTimer = timer_read();
+            } else {
+                uint16_t timeElapsed = timer_elapsed(pressTimer);
+                if (timeElapsed < CUSTOM_LONGPRESS) {
+                    send_string(pasta[pastaIndex]);
+                } else {
+                    reset_keyboard();
+                }
+            }
+        break;
+    }
+    return false;
+}
+
+void keyboard_post_init_user(void) {
+    rgblight_enable_noeeprom();
+    rgblight_sethsv_noeeprom(0, 255, 255);
+    rgblight_mode_noeeprom(1);
+    //rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
+}
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == _ENCODER) { /* First encoder */
+        if (clockwise) {
+            pastaIndex++;
+            pastaIndex %= PASTA_COUNT;
+        } else {
+            pastaIndex += PASTA_COUNT;
+            pastaIndex--;
+            pastaIndex %= PASTA_COUNT;
+        }
+        rgblight_sethsv_noeeprom((255/PASTA_COUNT)*pastaIndex, 255, 255);
+        rgblight_mode_noeeprom(1);
+    }
+}
diff --git a/keyboards/uno/keymaps/copypasta/readme.md b/keyboards/uno/keymaps/copypasta/readme.md
new file mode 100644
index 0000000000..1ad009c16c
--- /dev/null
+++ b/keyboards/uno/keymaps/copypasta/readme.md
@@ -0,0 +1,4 @@
+# A copypasta keymap for uno
+![Picture](https://i.imgur.com/OqPyWbbl.jpg)
+
+[A demo of this keymap can be found here.](https://www.reddit.com/r/MechanicalKeyboards/comments/k7w1j1/qmk_is_a_pathway_to_many_abilities_some_consider/)
diff --git a/keyboards/uno/keymaps/default/keymap.c b/keyboards/uno/keymaps/default/keymap.c
index bb19ea7ddb..43c885c800 100644
--- a/keyboards/uno/keymaps/default/keymap.c
+++ b/keyboards/uno/keymaps/default/keymap.c
@@ -13,6 +13,7 @@
  * 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 uno_keycode
@@ -20,20 +21,9 @@ enum uno_keycode
   UNO = SAFE_RANGE
 };
 
-static uint16_t pressTimer = 0xFFFF;
-#define CUSTOM_LONGPRESS 150
-#define CUSTOM_LONGERPRESS 750
-#define CUSTOM_STRING "I can put a whole buncha text in here and type it all with a single keypress."
-#define RESET_LENGTH 3000
-const uint8_t PROGMEM RGBLED_RAINBOW_MOOD_INTERVALS[] = { 10, 25, 50 };
-
-char stringToSend[2] = "a";
-char maxLetter = 'z';
-
-uint8_t presetCounter = 0;
-
-#define COUNTER X_A
-
+enum encoder_names {
+	_ENCODER,
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       [0] = LAYOUT(
@@ -44,59 +34,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 	switch (keycode) {
 		case UNO:
-            if (record->event.pressed) {
-                pressTimer = timer_read();
-            } else {
-                uint16_t timeElapsed = timer_elapsed(pressTimer);
-                switch (presetCounter) {
-                    case 0:
-                        SEND_STRING(SS_LCMD("n"));
-                    break;
-                    case 1:
-                        SEND_STRING("Hello!");
-                    break;
-                    case 2:
-                        SEND_STRING(SS_TAP(X_ENTER)SS_TAP(X_ENTER)"I am uno!");
-                    break;
-                    case 3:
-                        SEND_STRING(SS_TAP(X_ENTER)SS_TAP(X_ENTER)"I can do all sorts of useless things!");
-                    break;
-                    case 4:
-                        SEND_STRING(SS_TAP(X_ENTER)SS_TAP(X_ENTER)"And I have a built-in RGB LED!"SS_TAP(X_ENTER)SS_TAP(X_ENTER)SS_TAP(X_ENTER));
-                        rgblight_sethsv_noeeprom(255, 255, 255);
-                        rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
-                    break;
-                    default:
-                        if (timeElapsed < CUSTOM_LONGPRESS) {
-                            // Normal press.  We're going to send the current letter and increment the counter.
-                            SEND_STRING(SS_TAP(X_BSPACE));
-                            send_string(stringToSend);
-                            stringToSend[0]++;
-                            if (stringToSend[0] > maxLetter) {
-                                stringToSend[0] = 'a';
-                            }
-                        } else if (timeElapsed < CUSTOM_LONGERPRESS) {
-                            // Long press, confirm the current letter, reset counter
-                            stringToSend[0] = 'a';
-                            send_string(stringToSend);
-                        } else if (timeElapsed < RESET_LENGTH) {
-                            // Longer press, display macro.
-                            SEND_STRING(CUSTOM_STRING);
-                        } else {
-                            reset_keyboard();
-                        }
-                        presetCounter--;
-                    break;
-                }
-                presetCounter++;
-            }
-        break;
+			if (record->event.pressed) {
+				SEND_STRING("Hello!");
+			}
+			break;
+			return false;
     }
-    return false;
+    return true;
 }
 
 void keyboard_post_init_user(void) {
     rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom(0, 0, 0);
-    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+    rgblight_sethsv_noeeprom(255, 255, 255);
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
 }
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == _ENCODER) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_A);
+        } else {
+            tap_code(KC_B);
+        }
+		return false;
+    }
+	return true;
+}
+
diff --git a/keyboards/uno/keymaps/default/readme.md b/keyboards/uno/keymaps/default/readme.md
index 53b762f878..d783a80acc 100644
--- a/keyboards/uno/keymaps/default/readme.md
+++ b/keyboards/uno/keymaps/default/readme.md
@@ -1,4 +1,5 @@
 # The default keymap for uno
-![Keymap](https://i.imgur.com/lCPZZpO.png)
+![Picture](https://i.imgur.com/OqPyWbbl.jpg)
 
-The 'Macro' key does a few things: If you open up textedit (was made for a mac), it sends "Command+n" for the first press to make a new document.  It then types a few different messages, activates the RGB LED, and finally ends in a "scroll through the alphabet with a long press to confirm a certain character" keyboard mode.
+This keymap types "Hello!" when pressed and presses 'A' and 'B' when turning the
+encoder.
diff --git a/keyboards/uno/keymaps/demo/keymap.c b/keyboards/uno/keymaps/demo/keymap.c
new file mode 100644
index 0000000000..cd3c3dadef
--- /dev/null
+++ b/keyboards/uno/keymaps/demo/keymap.c
@@ -0,0 +1,123 @@
+/* Copyright 2020 Snipeye
+ *
+ * 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 uno_keycode
+{
+  UNO = SAFE_RANGE
+};
+
+static uint16_t pressTimer = 0xFFFF;
+#define CUSTOM_LONGPRESS 150
+#define CUSTOM_LONGERPRESS 750
+#define CUSTOM_STRING "I can put a whole buncha text in here and type it all with a single keypress."
+#define RESET_LENGTH 3000
+const uint8_t PROGMEM RGBLED_RAINBOW_MOOD_INTERVALS[] = { 10, 25, 50 };
+
+char stringToSend[2] = "a";
+char maxLetter = 'z';
+
+uint8_t presetCounter = 0;
+
+#define COUNTER X_A
+
+enum encoder_names {
+	_ENCODER,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+      [0] = LAYOUT(
+            UNO
+          )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+	switch (keycode) {
+		case UNO:
+            if (record->event.pressed) {
+                pressTimer = timer_read();
+            } else {
+                uint16_t timeElapsed = timer_elapsed(pressTimer);
+                switch (presetCounter) {
+                    case 0:
+                        SEND_STRING(SS_LCMD("n"));
+                    break;
+                    case 1:
+                        SEND_STRING("Hello!");
+                    break;
+                    case 2:
+                        SEND_STRING("\n\nI am uno!");
+                    break;
+                    case 3:
+                        SEND_STRING("\n\nI can do all sorts of useless things!");
+                    break;
+                    case 4:
+                        SEND_STRING("\n\nAnd I have a built-in RGB LED!\n\n\n");
+                        rgblight_sethsv_noeeprom(255, 255, 255);
+                        rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
+                    break;
+                    default:
+                        if (timeElapsed < CUSTOM_LONGPRESS) {
+                            // Normal press.  We're going to send the current letter and increment the counter.
+                            SEND_STRING(SS_TAP(X_BSPACE));
+                            send_string(stringToSend);
+                            stringToSend[0]++;
+                            if (stringToSend[0] > maxLetter) {
+                                stringToSend[0] = 'a';
+                            }
+                        } else if (timeElapsed < CUSTOM_LONGERPRESS) {
+                            // Long press, confirm the current letter, reset counter
+                            stringToSend[0] = 'a';
+                            send_string(stringToSend);
+                        } else if (timeElapsed < RESET_LENGTH) {
+                            // Longer press, display macro.
+                            SEND_STRING(CUSTOM_STRING);
+                        } else {
+                            reset_keyboard();
+                        }
+                        presetCounter--;
+                    break;
+                }
+                presetCounter++;
+            }
+        break;
+    }
+    return false;
+}
+
+void keyboard_post_init_user(void) {
+    rgblight_enable_noeeprom();
+    rgblight_sethsv_noeeprom(0, 0, 0);
+    rgblight_mode(1);
+    // Uncomment to enable rainbow mode when plugged in.
+    // Otherwise, the LED will be revealed after a few keypresses.
+    //rgblight_sethsv_noeeprom(255, 255, 255);
+    //rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == _ENCODER) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_A);
+        } else {
+            tap_code(KC_B);
+        }
+		return false;
+    }
+	return true;
+}
+
diff --git a/keyboards/uno/keymaps/demo/readme.md b/keyboards/uno/keymaps/demo/readme.md
new file mode 100644
index 0000000000..ec91247861
--- /dev/null
+++ b/keyboards/uno/keymaps/demo/readme.md
@@ -0,0 +1,4 @@
+# The demo keymap for uno
+![Picture](https://i.imgur.com/OqPyWbbl.jpg)
+
+[You can find a video of this keymap being demoed here](https://imgur.com/a/Z7G5Aam).
diff --git a/keyboards/uno/readme.md b/keyboards/uno/readme.md
index ce4cccd196..b60ef23e97 100644
--- a/keyboards/uno/readme.md
+++ b/keyboards/uno/readme.md
@@ -1,19 +1,34 @@
-# uno
+# Uno
 
- ![uno](https://i.imgur.com/OqPyWbbl.jpg)
+![Uno](https://i.imgur.com/OqPyWbbl.jpg)
 
 A 1-key, in-USB "board" for the lulz
 
- * Keyboard Maintainer: [Snipeye](https://github.com/Snipeye)
- * Hardware Supported: uno pcb
- * Hardware Availability: [GB](https://www.reddit.com/r/mechmarket/comments/gyijm7/gb_uno/)
+* Keyboard Maintainer: [Snipeye](https://github.com/Snipeye)
+* Hardware Availability: [keyhive.xyz](https://keyhive.xyz/shop/uno-single-key-keyboard)
 
- Make example for this keyboard (after setting up your build environment):
+There are two revisions of Uno. If your Uno supports a rotary encoder, use rev2.
+If it *does not* support a rotary encoder, use rev1. The following examples use
+`rev2` &mdash; be sure to change this if you are using `rev1`.
 
-     make uno:default
+Make example for this keyboard (after setting up your build environment; make
+sure to change `rev2` to your Uno's version):
 
- Flashing example for this keyboard:
+    make uno/rev2:default
 
-     make uno:default:flash
+Flashing example for this keyboard (change `rev2` to `rev1` if needed):
 
- 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).
+    make uno/rev2:default:flash
+
+If you prefer to use the `qmk` tool:
+
+    qmk compile -kb uno/rev2 -km default
+
+Create your own keymap with:
+
+    qmk new-keymap -kb uno/rev2
+
+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).
+
+### Credits
++ Everything by Snipeye
diff --git a/keyboards/uno/rev1/config.h b/keyboards/uno/rev1/config.h
new file mode 100644
index 0000000000..11c84ad2ab
--- /dev/null
+++ b/keyboards/uno/rev1/config.h
@@ -0,0 +1,74 @@
+/* Copyright 2020 Snipeye
+ *
+ * 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      0xACC8
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Broekhuijsen
+#define PRODUCT         Uno rev1
+
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+// #define RGBLIGHT_ANIMATIONS
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 1
+
+/* Uno default pinout */
+#define DIRECT_PINS { \
+    { B6 } \
+}
+#define UNUSED_PINS
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN F6
+#define RGBLED_NUM 1
+#endif
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 32
+//   #define RGBLIGHT_SAT_STEP 32
+//   #define RGBLIGHT_VAL_STEP 32
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose 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
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/uno/rev1/rev1.h b/keyboards/uno/rev1/rev1.h
new file mode 100644
index 0000000000..691bdd1dc3
--- /dev/null
+++ b/keyboards/uno/rev1/rev1.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 Snipeye
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+  K00  \
+) { \
+  { K00 } \
+}
diff --git a/keyboards/uno/rev1/rules.mk b/keyboards/uno/rev1/rules.mk
new file mode 100644
index 0000000000..7180be7497
--- /dev/null
+++ b/keyboards/uno/rev1/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
diff --git a/keyboards/uno/rev2/config.h b/keyboards/uno/rev2/config.h
new file mode 100644
index 0000000000..37ea08c017
--- /dev/null
+++ b/keyboards/uno/rev2/config.h
@@ -0,0 +1,49 @@
+/* Copyright 2020 Snipeye
+ *
+ * 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      0xACC8
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    Broekhuijsen
+#define PRODUCT         Uno rev2
+
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+
+/* ENCODER */
+#define ENCODERS_PAD_A { B2 }
+#define ENCODERS_PAD_B { B3 }
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 1
+
+/* Uno default pinout */
+#define DIRECT_PINS { \
+    { D0 } \
+}
+#define UNUSED_PINS
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN D1
+#define RGBLED_NUM 1
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/uno/rev2/rev2.h b/keyboards/uno/rev2/rev2.h
new file mode 100644
index 0000000000..691bdd1dc3
--- /dev/null
+++ b/keyboards/uno/rev2/rev2.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 Snipeye
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+  K00  \
+) { \
+  { K00 } \
+}
diff --git a/keyboards/uno/rev2/rules.mk b/keyboards/uno/rev2/rules.mk
new file mode 100644
index 0000000000..1ce2738442
--- /dev/null
+++ b/keyboards/uno/rev2/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes      # Enable keyboard RGB underglow
+AUDIO_ENABLE = no          # Audio output
+ENCODER_ENABLE = yes
diff --git a/keyboards/uno/rules.mk b/keyboards/uno/rules.mk
index ebbb7bc613..367faedeaf 100644
--- a/keyboards/uno/rules.mk
+++ b/keyboards/uno/rules.mk
@@ -1,18 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-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
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+DEFAULT_FOLDER = uno/rev1
diff --git a/keyboards/uno/uno.h b/keyboards/uno/uno.h
index 91d48d2ad5..bb3248e293 100644
--- a/keyboards/uno/uno.h
+++ b/keyboards/uno/uno.h
@@ -13,12 +13,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #pragma once
 
 #include "quantum.h"
 
-#define LAYOUT( \
-  K00  \
-) { \
-  { K00 } \
-}
+#if defined(KEYBOARD_uno_rev1)
+#    include "rev1.h"
+#elif defined(KEYBOARD_uno_rev2)
+#    include "rev2.h"
+#endif

From df3770551a4dcbf8188a16453dd64fe1787f83d8 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 14 Mar 2022 10:46:13 +1100
Subject: [PATCH 810/867] USB-USB converter cleanup (#16618)

---
 keyboards/converter/usb_usb/ble/ble.h         |   2 +-
 keyboards/converter/usb_usb/ble/config.h      |   9 +-
 keyboards/converter/usb_usb/ble/readme.md     |  11 --
 keyboards/converter/usb_usb/ble/rules.mk      |  12 +--
 keyboards/converter/usb_usb/config.h          |   4 +-
 keyboards/converter/usb_usb/custom_matrix.cpp |  40 +++----
 keyboards/converter/usb_usb/hasu/hasu.h       |   2 +-
 keyboards/converter/usb_usb/main.c            | 102 ------------------
 .../converter/usb_usb/pro_micro/pro_micro.h   |   2 +-
 keyboards/converter/usb_usb/rules.mk          |  18 ++--
 keyboards/converter/usb_usb/usb_usb.h         |   8 ++
 11 files changed, 41 insertions(+), 169 deletions(-)
 delete mode 100644 keyboards/converter/usb_usb/main.c

diff --git a/keyboards/converter/usb_usb/ble/ble.h b/keyboards/converter/usb_usb/ble/ble.h
index 3dccc23a41..3351176047 100644
--- a/keyboards/converter/usb_usb/ble/ble.h
+++ b/keyboards/converter/usb_usb/ble/ble.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include QMK_KEYBOARD_H
+#include "usb_usb.h"
diff --git a/keyboards/converter/usb_usb/ble/config.h b/keyboards/converter/usb_usb/ble/config.h
index 92df24d003..675183f082 100644
--- a/keyboards/converter/usb_usb/ble/config.h
+++ b/keyboards/converter/usb_usb/ble/config.h
@@ -1,13 +1,6 @@
 #pragma once
 
 #undef PRODUCT
-#define PRODUCT         QMK BLE Adapter
+#define PRODUCT QMK BLE Adapter
 
-// Turn off the mode leds on the BLE module
-#define BLUEFRUIT_LE_ENABLE_MODE_LEDS 0
-#define BLUEFRUIT_LE_ENABLE_POWER_LED 0
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 #define NO_ACTION_ONESHOT
-
diff --git a/keyboards/converter/usb_usb/ble/readme.md b/keyboards/converter/usb_usb/ble/readme.md
index 0ee7223fd4..05cf437399 100644
--- a/keyboards/converter/usb_usb/ble/readme.md
+++ b/keyboards/converter/usb_usb/ble/readme.md
@@ -17,14 +17,3 @@ Part list:
 * [Pololu 5V Step-Up Voltage Regulator U3V12F5](https://www.pololu.com/product/2115)
 * [Lithium Ion Battery - 3.7v 2000mAh](https://www.adafruit.com/product/2011)
 * Some sort of switch to be able to turn it off
-
-Building and Flashing
----------------------
-
-```
-make converter-usb_usb-ble
-```
-
-```
-make converter-usb_usb-ble-avrdude
-```
\ No newline at end of file
diff --git a/keyboards/converter/usb_usb/ble/rules.mk b/keyboards/converter/usb_usb/ble/rules.mk
index df5bc36635..86a4e15ffe 100644
--- a/keyboards/converter/usb_usb/ble/rules.mk
+++ b/keyboards/converter/usb_usb/ble/rules.mk
@@ -1,17 +1,7 @@
 # Processor frequency
 F_CPU = 8000000
 
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-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
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
+EXTRAKEY_ENABLE = no
 BLUETOOTH_ENABLE = yes
 BLUETOOTH_DRIVER = BluefruitLE
-
 LTO_ENABLE = yes
diff --git a/keyboards/converter/usb_usb/config.h b/keyboards/converter/usb_usb/config.h
index d2488336a5..5f791eaa34 100644
--- a/keyboards/converter/usb_usb/config.h
+++ b/keyboards/converter/usb_usb/config.h
@@ -17,6 +17,8 @@ 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      0x005B
@@ -43,5 +45,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/converter/usb_usb/custom_matrix.cpp b/keyboards/converter/usb_usb/custom_matrix.cpp
index 00b5bc5053..a92feeb6c1 100644
--- a/keyboards/converter/usb_usb/custom_matrix.cpp
+++ b/keyboards/converter/usb_usb/custom_matrix.cpp
@@ -58,36 +58,31 @@ extern "C" {
  */
 #define ROW_MASK 0xF0
 #define COL_MASK 0x0F
-#define CODE(row, col)  (((row) << 4) | (col))
-#define ROW(code)       (((code) & ROW_MASK) >> 4)
-#define COL(code)       ((code) & COL_MASK)
-#define ROW_BITS(code)  (1 << COL(code))
-
+#define CODE(row, col) (((row) << 4) | (col))
+#define ROW(code)      (((code) & ROW_MASK) >> 4)
+#define COL(code)      ((code) & COL_MASK)
+#define ROW_BITS(code) (1 << COL(code))
 
 // Integrated key state of all keyboards
 static report_keyboard_t local_keyboard_report;
 
-static bool matrix_is_mod = false;
-
 /*
  * USB Host Shield HID keyboards
  * This supports two cascaded hubs and four keyboards
  */
 USB usb_host;
-HIDBoot<HID_PROTOCOL_KEYBOARD>    kbd1(&usb_host);
-HIDBoot<HID_PROTOCOL_KEYBOARD>    kbd2(&usb_host);
-HIDBoot<HID_PROTOCOL_KEYBOARD>    kbd3(&usb_host);
-HIDBoot<HID_PROTOCOL_KEYBOARD>    kbd4(&usb_host);
+USBHub hub1(&usb_host);
+USBHub hub2(&usb_host);
+HIDBoot<HID_PROTOCOL_KEYBOARD> kbd1(&usb_host);
+HIDBoot<HID_PROTOCOL_KEYBOARD> kbd2(&usb_host);
+HIDBoot<HID_PROTOCOL_KEYBOARD> kbd3(&usb_host);
+HIDBoot<HID_PROTOCOL_KEYBOARD> kbd4(&usb_host);
 KBDReportParser kbd_parser1;
 KBDReportParser kbd_parser2;
 KBDReportParser kbd_parser3;
 KBDReportParser kbd_parser4;
-USBHub hub1(&usb_host);
-USBHub hub2(&usb_host);
 
-
-extern "C"
-{
+extern "C" {
     uint8_t matrix_rows(void) { return MATRIX_ROWS; }
     uint8_t matrix_cols(void) { return MATRIX_COLS; }
     bool matrix_has_ghost(void) { return false; }
@@ -135,6 +130,7 @@ extern "C"
     }
 
     uint8_t matrix_scan(void) {
+        bool changed = false;
         static uint16_t last_time_stamp1 = 0;
         static uint16_t last_time_stamp2 = 0;
         static uint16_t last_time_stamp3 = 0;
@@ -158,15 +154,13 @@ extern "C"
             or_report(kbd_parser3.report);
             or_report(kbd_parser4.report);
 
-            matrix_is_mod = true;
+            changed = true;
 
             dprintf("state:  %02X %02X", local_keyboard_report.mods, local_keyboard_report.reserved);
             for (uint8_t i = 0; i < KEYBOARD_REPORT_KEYS; i++) {
                 dprintf(" %02X", local_keyboard_report.keys[i]);
             }
             dprint("\r\n");
-        } else {
-            matrix_is_mod = false;
         }
 
         uint16_t timer;
@@ -189,7 +183,7 @@ extern "C"
             }
         }
         matrix_scan_quantum();
-        return 1;
+        return changed;
     }
 
     bool matrix_is_on(uint8_t row, uint8_t col) {
@@ -234,13 +228,11 @@ extern "C"
         }
     }
 
-    void led_set(uint8_t usb_led)
-    {
+    void led_set(uint8_t usb_led) {
         if (kbd1.isReady()) kbd1.SetReport(0, 0, 2, 0, 1, &usb_led);
         if (kbd2.isReady()) kbd2.SetReport(0, 0, 2, 0, 1, &usb_led);
         if (kbd3.isReady()) kbd3.SetReport(0, 0, 2, 0, 1, &usb_led);
         if (kbd4.isReady()) kbd4.SetReport(0, 0, 2, 0, 1, &usb_led);
         led_set_kb(usb_led);
     }
-
-};
+}
diff --git a/keyboards/converter/usb_usb/hasu/hasu.h b/keyboards/converter/usb_usb/hasu/hasu.h
index 3dccc23a41..3351176047 100644
--- a/keyboards/converter/usb_usb/hasu/hasu.h
+++ b/keyboards/converter/usb_usb/hasu/hasu.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include QMK_KEYBOARD_H
+#include "usb_usb.h"
diff --git a/keyboards/converter/usb_usb/main.c b/keyboards/converter/usb_usb/main.c
deleted file mode 100644
index 76e88922cb..0000000000
--- a/keyboards/converter/usb_usb/main.c
+++ /dev/null
@@ -1,102 +0,0 @@
-#include <avr/io.h>
-#include <avr/wdt.h>
-#include <avr/power.h>
-#include <util/delay.h>
-
-// LUFA
-#include "lufa.h"
-
-#include "sendchar.h"
-#include "debug.h"
-#include "keyboard.h"
-#include "led.h"
-
-
-/* LED ping configuration */
-#define TMK_LED
-//#define LEONARDO_LED
-#if defined(TMK_LED)
-// For TMK converter and Teensy
-#define LED_TX_INIT    (DDRD  |=  (1<<6))
-#define LED_TX_ON      (PORTD |=  (1<<6))
-#define LED_TX_OFF     (PORTD &= ~(1<<6))
-#define LED_TX_TOGGLE  (PORTD ^=  (1<<6))
-#elif defined(LEONARDO_LED)
-// For Leonardo(TX LED)
-#define LED_TX_INIT    (DDRD  |=  (1<<5))
-#define LED_TX_ON      (PORTD &= ~(1<<5))
-#define LED_TX_OFF     (PORTD |=  (1<<5))
-#define LED_TX_TOGGLE  (PORTD ^=  (1<<5))
-#else
-#define LED_TX_INIT
-#define LED_TX_ON
-#define LED_TX_OFF
-#define LED_TX_TOGGLE
-#endif
-
-
-static void LUFA_setup(void)
-{
-    /* Disable watchdog if enabled by bootloader/fuses */
-    MCUSR &= ~(1 << WDRF);
-    wdt_disable();
-
-    /* Disable clock division */
-#if (F_CPU == 8000000)
-    clock_prescale_set(clock_div_2);    // 16MHz crystal divided by 2
-#else
-    clock_prescale_set(clock_div_1);
-#endif
-
-    // Leonardo needs. Without this USB device is not recognized.
-    USB_Disable();
-
-    USB_Init();
-
-    // for Console_Task
-    USB_Device_EnableSOFEvents();
-    print_set_sendchar(sendchar);
-}
-
-
-
-int main(void)
-{
-    // LED for debug
-    LED_TX_INIT;
-    LED_TX_ON;
-
-    debug_enable = true;
-    debug_keyboard = true;
-
-    host_set_driver(&lufa_driver);
-    keyboard_init();
-
-    LUFA_setup();
-
-    /* NOTE: Don't insert time consuming job here.
-     * It'll cause unclear initialization failure when DFU reset(worm start).
-     */
-    sei();
-
-/* Some keyboards bootup quickly and cannot be initialized with this startup wait.
-    // wait for startup of sendchar routine
-    while (USB_DeviceState != DEVICE_STATE_Configured) ;
-    if (debug_enable) {
-        _delay_ms(1000);
-    }
-*/
-
-    debug("init: done\n");
-
-    for (;;) {
-        keyboard_task();
-
-#if !defined(INTERRUPT_CONTROL_ENDPOINT)
-        // LUFA Task for control request
-        USB_USBTask();
-#endif
-    }
-
-    return 0;
-}
diff --git a/keyboards/converter/usb_usb/pro_micro/pro_micro.h b/keyboards/converter/usb_usb/pro_micro/pro_micro.h
index 3dccc23a41..3351176047 100644
--- a/keyboards/converter/usb_usb/pro_micro/pro_micro.h
+++ b/keyboards/converter/usb_usb/pro_micro/pro_micro.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include QMK_KEYBOARD_H
+#include "usb_usb.h"
diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk
index 19903ed331..a33c0aaa54 100644
--- a/keyboards/converter/usb_usb/rules.mk
+++ b/keyboards/converter/usb_usb/rules.mk
@@ -8,15 +8,17 @@ BOOTLOADER = caterina
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-#MOUSEKEY_ENABLE  = yes  # Mouse keys
-EXTRAKEY_ENABLE  = yes  # Audio control and System control
-#CONSOLE_ENABLE   = yes  # Console for debug
-#COMMAND_ENABLE   = yes  # Commands for debug and configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover
-#BACKLIGHT_ENABLE = yes
-USB_HID_ENABLE   = yes
-CUSTOM_MATRIX    = yes
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+USB_HID_ENABLE = yes
+CUSTOM_MATRIX = yes
 
-SRC = custom_matrix.cpp
+SRC += custom_matrix.cpp
 
 DEFAULT_FOLDER = converter/usb_usb/hasu
diff --git a/keyboards/converter/usb_usb/usb_usb.h b/keyboards/converter/usb_usb/usb_usb.h
index 3acd67634a..4a25cf5d2e 100644
--- a/keyboards/converter/usb_usb/usb_usb.h
+++ b/keyboards/converter/usb_usb/usb_usb.h
@@ -19,6 +19,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
+#if defined(KEYBOARD_converter_usb_usb_ble)
+#    include "ble.h"
+#elif defined(KEYBOARD_converter_usb_usb_hasu)
+#    include "hasu.h"
+#elif defined(KEYBOARD_converter_usb_usb_pro_micro)
+#    include "pro_micro.h"
+#endif
+
 #define XXX KC_NO
 
 #define ______ KC_TRNS

From c0f417911703738b3ede14b87be5c4a39db07016 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 14 Mar 2022 10:54:49 +1100
Subject: [PATCH 811/867] Move keyboard USB IDs and strings to data driven: 0-9
 (#16481)

---
 keyboards/0xc7/61key/config.h                 |  9 +--------
 keyboards/0xc7/61key/info.json                |  6 ++++++
 keyboards/0xcb/1337/config.h                  |  7 -------
 keyboards/0xcb/1337/info.json                 |  8 +++++++-
 keyboards/0xcb/static/config.h                |  6 ------
 keyboards/0xcb/static/info.json               |  8 +++++++-
 keyboards/10bleoledhub/config.h               |  5 -----
 keyboards/10bleoledhub/info.json              |  6 ++++++
 keyboards/1upkeyboards/1up60hse/config.h      |  7 -------
 keyboards/1upkeyboards/1up60hse/info.json     |  6 ++++++
 keyboards/1upkeyboards/1up60hte/config.h      |  7 -------
 keyboards/1upkeyboards/1up60hte/info.json     |  6 ++++++
 keyboards/1upkeyboards/1up60rgb/config.h      |  7 -------
 keyboards/1upkeyboards/1up60rgb/info.json     |  8 +++++++-
 keyboards/1upkeyboards/super16/config.h       |  7 -------
 keyboards/1upkeyboards/super16/info.json      |  6 ++++++
 keyboards/1upkeyboards/super16v2/config.h     |  7 -------
 keyboards/1upkeyboards/super16v2/info.json    |  8 +++++++-
 keyboards/25keys/cassette42/config.h          |  8 --------
 keyboards/25keys/cassette42/info.json         | 12 +++++++++---
 keyboards/2key2crawl/config.h                 |  7 -------
 keyboards/2key2crawl/info.json                |  8 +++++++-
 keyboards/30wer/config.h                      |  7 -------
 keyboards/30wer/info.json                     | 12 +++++++++---
 keyboards/3keyecosystem/2key2/config.h        |  7 -------
 keyboards/3keyecosystem/2key2/info.json       |  8 +++++++-
 keyboards/40percentclub/25/config.h           |  7 -------
 keyboards/40percentclub/25/info.json          |  8 +++++++-
 keyboards/40percentclub/4pack/config.h        |  7 -------
 keyboards/40percentclub/4pack/info.json       | 12 +++++++++---
 keyboards/40percentclub/4x4/config.h          |  7 -------
 keyboards/40percentclub/4x4/info.json         |  8 +++++++-
 keyboards/40percentclub/5x5/config.h          |  7 -------
 keyboards/40percentclub/5x5/info.json         |  8 +++++++-
 keyboards/40percentclub/6lit/config.h         |  7 -------
 keyboards/40percentclub/6lit/info.json        |  8 +++++++-
 keyboards/40percentclub/foobar/config.h       |  7 -------
 keyboards/40percentclub/foobar/info.json      |  8 +++++++-
 keyboards/40percentclub/gherkin/config.h      |  7 -------
 keyboards/40percentclub/gherkin/info.json     |  6 ++++++
 keyboards/40percentclub/half_n_half/config.h  |  7 -------
 keyboards/40percentclub/half_n_half/info.json |  6 ++++++
 keyboards/40percentclub/i75/config.h          |  7 -------
 keyboards/40percentclub/i75/info.json         |  6 ++++++
 keyboards/40percentclub/luddite/config.h      |  7 -------
 keyboards/40percentclub/luddite/info.json     |  6 ++++++
 keyboards/40percentclub/mf68/config.h         |  7 -------
 keyboards/40percentclub/mf68/info.json        |  6 ++++++
 keyboards/40percentclub/nano/config.h         |  7 -------
 keyboards/40percentclub/nano/info.json        |  6 ++++++
 keyboards/40percentclub/nein/config.h         |  7 -------
 keyboards/40percentclub/nein/info.json        |  8 +++++++-
 keyboards/40percentclub/nori/config.h         |  7 -------
 keyboards/40percentclub/nori/info.json        |  8 +++++++-
 keyboards/40percentclub/polyandry/config.h    |  7 -------
 keyboards/40percentclub/polyandry/info.json   |  8 +++++++-
 keyboards/40percentclub/sixpack/config.h      |  7 -------
 keyboards/40percentclub/sixpack/info.json     |  6 ++++++
 keyboards/40percentclub/tomato/config.h       |  7 -------
 keyboards/40percentclub/tomato/info.json      |  6 ++++++
 keyboards/40percentclub/ut47/config.h         |  7 -------
 keyboards/40percentclub/ut47/info.json        |  8 +++++++-
 keyboards/45_ats/config.h                     |  7 -------
 keyboards/45_ats/info.json                    |  8 +++++++-
 keyboards/4by3/config.h                       |  7 -------
 keyboards/4by3/info.json                      |  6 ++++++
 keyboards/7c8/framework/config.h              |  6 ------
 keyboards/7c8/framework/info.json             |  6 ++++++
 keyboards/9key/config.h                       |  7 -------
 keyboards/9key/info.json                      |  8 +++++++-
 70 files changed, 237 insertions(+), 269 deletions(-)

diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h
index d83a855572..d1edf3284e 100644
--- a/keyboards/0xc7/61key/config.h
+++ b/keyboards/0xc7/61key/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0xE117
-#define PRODUCT_ID   0x6161
-#define DEVICE_VER   0x0001
-#define MANUFACTURER 0xC7
-#define PRODUCT      61Key
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
@@ -149,4 +142,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/0xc7/61key/info.json b/keyboards/0xc7/61key/info.json
index 02070e87c9..9ed798c93b 100644
--- a/keyboards/0xc7/61key/info.json
+++ b/keyboards/0xc7/61key/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "61Key",
+    "manufacturer": "0xC7",
     "url": "",
     "maintainer": "RealEmanGaming",
+    "usb": {
+        "vid": "0xE117",
+        "pid": "0x6161",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT": "LAYOUT_60_ansi"
     },
diff --git a/keyboards/0xcb/1337/config.h b/keyboards/0xcb/1337/config.h
index d134d1ab49..3b34af6580 100644
--- a/keyboards/0xcb/1337/config.h
+++ b/keyboards/0xcb/1337/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 // clang-format off
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xCB00
-#define PRODUCT_ID      0x1337
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    0xCB
-#define PRODUCT         1337
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3
diff --git a/keyboards/0xcb/1337/info.json b/keyboards/0xcb/1337/info.json
index 25899933cb..cd5993ee0d 100644
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "0xCB 1337",
+  "keyboard_name": "1337",
+  "manufacturer": "0xCB",
   "url": "https://0xCB.dev",
   "maintainer": "Conor-Burns",
+  "usb": {
+    "vid": "0xCB00",
+    "pid": "0x1337",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/0xcb/static/config.h b/keyboards/0xcb/static/config.h
index c30450b460..9c3a0c6649 100644
--- a/keyboards/0xcb/static/config.h
+++ b/keyboards/0xcb/static/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 // clang-format off
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xCB00
-#define PRODUCT_ID      0xA455
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    0xCB
-#define PRODUCT         Static
 
 /* key matrix size */
 #define MATRIX_ROWS 8
diff --git a/keyboards/0xcb/static/info.json b/keyboards/0xcb/static/info.json
index 33fa8d265e..4a6232abad 100644
--- a/keyboards/0xcb/static/info.json
+++ b/keyboards/0xcb/static/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "0xCB Static",
+  "keyboard_name": "Static",
+  "manufacturer": "0xCB",
   "url": "https://0xCB.dev",
   "maintainer": "Conor-Burns",
+  "usb": {
+    "vid": "0xCB00",
+    "pid": "0xA455",
+    "device_version": "0.0.1"
+  },
   "layout_aliases": {
     "LAYOUT": "LAYOUT_all"
   },
diff --git a/keyboards/10bleoledhub/config.h b/keyboards/10bleoledhub/config.h
index d3e845fec9..867589a27c 100644
--- a/keyboards/10bleoledhub/config.h
+++ b/keyboards/10bleoledhub/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 #pragma once
 
 #include "config_common.h"
-#define VENDOR_ID       0x7C88 // "hw" = haierwangwei2005
-#define PRODUCT_ID      0x7C99 // "10b" = 10bleoledhub
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    haierwangwei2005
-#define PRODUCT         10bleoledhub
 
 /* key matrix size */
 #define MATRIX_ROWS 4
diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json
index 769c98874d..ec468454b1 100644
--- a/keyboards/10bleoledhub/info.json
+++ b/keyboards/10bleoledhub/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "10bleoledhub",
+    "manufacturer": "haierwangwei2005",
     "url": "https://github.com/haierwangwei2005/10BLE-OLED-HUB",
     "maintainer": "haierwangwei2005",
+    "usb": {
+        "vid": "0x7C88",
+        "pid": "0x7C99",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index 7a7fa56fe5..3f4f742b48 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6F75 // OU
-#define PRODUCT_ID      0x6873
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    1upkeyboards
-#define PRODUCT         1up60hse
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json
index 7eca93d8a9..d6d87310d6 100644
--- a/keyboards/1upkeyboards/1up60hse/info.json
+++ b/keyboards/1upkeyboards/1up60hse/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "1up60hse",
+    "manufacturer": "1upkeyboards",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x6F75",
+        "pid": "0x6873",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [{"label":"~", "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":"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":"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":"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":"Alt", "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}]
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index 81fa0e1eb6..256af396e5 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -20,13 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6F75 // OU
-#define PRODUCT_ID      0x6874 // HT
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    1upkeyboards
-#define PRODUCT         1up60hte
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 14
diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json
index 830c6e289f..3a4a716d96 100644
--- a/keyboards/1upkeyboards/1up60hte/info.json
+++ b/keyboards/1upkeyboards/1up60hte/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "1up60hte",
+    "manufacturer": "1upkeyboards",
     "url": "https://www.1upkeyboards.com/shop/controllers/1up-rgb-60-pcb-hte/",
     "maintainer": "1upkeyboards",
+    "usb": {
+        "vid": "0x6F75",
+        "pid": "0x6874",
+        "device_version": "0.0.1"
+    },
     "layout_aliases": {
         "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
     },
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index c78fc3e52b..00cff570b1 100644
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6F75 // OU
-#define PRODUCT_ID      0x7267 // RG
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    1upkeyboards
-#define PRODUCT         1UP RGB Underglow PCB
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json
index 701088c461..956ccb0afa 100644
--- a/keyboards/1upkeyboards/1up60rgb/info.json
+++ b/keyboards/1upkeyboards/1up60rgb/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "1up60rgb",
+  "keyboard_name": "1UP RGB Underglow PCB",
+  "manufacturer": "1upkeyboards",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x6F75",
+    "pid": "0x7267",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_all": {
       "layout": [
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index c0c0a7891b..354f0680e8 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x6F75    // "ou"
-#define PRODUCT_ID      0x5516    // "U" 16
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    1upkeyboards
-#define PRODUCT         super16
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4
diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json
index 261fde20a6..b437bb5038 100644
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "super16",
+  "manufacturer": "1upkeyboards",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x6F75",
+    "pid": "0x5516",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_ortho_4x4": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 4fd4238780..77bb89d954 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x6F75 // OU
-#define PRODUCT_ID   0x5517
-#define DEVICE_VER   0x0001
-#define MANUFACTURER 1upkeyboards
-#define PRODUCT      super16v2
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json
index 2a384f775d..891eaf316b 100644
--- a/keyboards/1upkeyboards/super16v2/info.json
+++ b/keyboards/1upkeyboards/super16v2/info.json
@@ -1,10 +1,16 @@
 {
     "keyboard_name": "super16v2",
+    "manufacturer": "1upkeyboards",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+      "vid": "0x6F75",
+      "pid": "0x5517",
+      "device_version": "0.0.1"
+    },
     "layouts": {
       "LAYOUT_ortho_4x4": {
         "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
       }
     }
-  }
\ No newline at end of file
+  }
diff --git a/keyboards/25keys/cassette42/config.h b/keyboards/25keys/cassette42/config.h
index cac03f6346..71621695f4 100644
--- a/keyboards/25keys/cassette42/config.h
+++ b/keyboards/25keys/cassette42/config.h
@@ -19,14 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0xCA42
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    monksoffunk
-#define PRODUCT         cassette42
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 6
diff --git a/keyboards/25keys/cassette42/info.json b/keyboards/25keys/cassette42/info.json
index 87c67df951..4fe088f9e6 100644
--- a/keyboards/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "cassette42", 
-    "url": "http://www.sho-k.co.uk/tech/1246.html", 
-    "maintainer": "monksoffunk", 
+    "keyboard_name": "cassette42",
+    "manufacturer": "monksoffunk",
+    "url": "http://www.sho-k.co.uk/tech/1246.html",
+    "maintainer": "monksoffunk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0xCA42",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0.5, "y":0.75}, {"x":2.5, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.75}, {"x":2, "y":1.75}, {"x":3, "y":1.75}]
diff --git a/keyboards/2key2crawl/config.h b/keyboards/2key2crawl/config.h
index 27a94a00ca..f6fc6f8c1e 100644
--- a/keyboards/2key2crawl/config.h
+++ b/keyboards/2key2crawl/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6090
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    WoodKeys.click
-#define PRODUCT         2Key2Crawl
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 7
diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json
index cc48e81138..c2cad98470 100644
--- a/keyboards/2key2crawl/info.json
+++ b/keyboards/2key2crawl/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "2Key2CrawlPad",
+    "keyboard_name": "2Key2Crawl",
+    "manufacturer": "WoodKeys.click",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x6090",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/30wer/config.h b/keyboards/30wer/config.h
index d4f656edca..65a54cba4a 100644
--- a/keyboards/30wer/config.h
+++ b/keyboards/30wer/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x1234
-#define PRODUCT_ID      0x5678
-#define DEVICE_VER      0x0000
-#define MANUFACTURER    8o7wer
-#define PRODUCT         30wer
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 13
diff --git a/keyboards/30wer/info.json b/keyboards/30wer/info.json
index 18ea404fd2..62fee361a0 100644
--- a/keyboards/30wer/info.json
+++ b/keyboards/30wer/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "30wer", 
-    "url": "", 
-    "maintainer": "qmk", 
+    "keyboard_name": "30wer",
+    "manufacturer": "8o7wer",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x1234",
+        "pid": "0x5678",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h
index 4ca0e830ee..58010eea55 100644
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -18,13 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x1209
-#define PRODUCT_ID   0x3304
-#define DEVICE_VER   0x0001
-#define MANUFACTURER 3-Key-Ecosystem
-#define PRODUCT      2key2
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 2
diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json
index 49caf91b5a..79e999cc16 100644
--- a/keyboards/3keyecosystem/2key2/info.json
+++ b/keyboards/3keyecosystem/2key2/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "3-Key-Ecosystem 2key2: 2x1 macro-keyboard",
+    "keyboard_name": "2key2",
+    "manufacturer": "3-Key-Ecosystem",
     "url": "https://github.com/softplus/3keyecosystem/tree/main/2key2",
     "maintainer": "softplus",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0x3304",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index d478131e95..292854f68f 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025 // 40%
-#define PRODUCT_ID      0x0F25
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    di0ib
-#define PRODUCT         The 5x5 Keyboard
-
 #define USE_SERIAL
 /* serial.c configuration for split keyboard */
 #define SOFT_SERIAL_PIN D0
diff --git a/keyboards/40percentclub/25/info.json b/keyboards/40percentclub/25/info.json
index 1e86454125..15995f8479 100644
--- a/keyboards/40percentclub/25/info.json
+++ b/keyboards/40percentclub/25/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "foobar",
+    "keyboard_name": "The 5x5 Keyboard",
+    "manufacturer": "di0ib",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x0F25",
+        "device_version": "1.0.0"
+    },
     "layouts": {
         "LAYOUT_ortho_5x5": {
             "layout": [
diff --git a/keyboards/40percentclub/4pack/config.h b/keyboards/40percentclub/4pack/config.h
index 023df5fc4e..305e71e542 100644
--- a/keyboards/40percentclub/4pack/config.h
+++ b/keyboards/40percentclub/4pack/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4025
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0001
-#define MANUFACTURER 40percentclub
-#define PRODUCT 4pack
-
 /* key matrix size */
 #define MATRIX_ROWS 1
 #define MATRIX_COLS 4
diff --git a/keyboards/40percentclub/4pack/info.json b/keyboards/40percentclub/4pack/info.json
index d328a999c2..e8e0463ab6 100644
--- a/keyboards/40percentclub/4pack/info.json
+++ b/keyboards/40percentclub/4pack/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "4pack", 
-    "url": "", 
-    "maintainer": "qmk", 
+    "keyboard_name": "4pack",
+    "manufacturer": "40percentclub",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}]
diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h
index 439aa1b147..b74eb62c1e 100644
--- a/keyboards/40percentclub/4x4/config.h
+++ b/keyboards/40percentclub/4x4/config.h
@@ -4,13 +4,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025 //"40 %", since 0x3430 is already registered.
-#define PRODUCT_ID      0x0A0C
-#define DEVICE_VER      0x4444
-#define MANUFACTURER    di0ib
-#define PRODUCT         The 4x4 Keyboard
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 16
diff --git a/keyboards/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/info.json
index 96a08d3fd5..f0e55b4c23 100644
--- a/keyboards/40percentclub/4x4/info.json
+++ b/keyboards/40percentclub/4x4/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "40percent.club 4x4",
+    "keyboard_name": "The 4x4 Keyboard",
+    "manufacturer": "di0ib",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x0A0C",
+        "device_version": "44.4.4"
+    },
     "layouts": {
         "LAYOUT_ortho_4x4": {
             "layout": [
diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
index c3bb5d6380..62d63b8afa 100644
--- a/keyboards/40percentclub/5x5/config.h
+++ b/keyboards/40percentclub/5x5/config.h
@@ -4,13 +4,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025 // 40%
-#define PRODUCT_ID      0x05B5
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    di0ib
-#define PRODUCT         The 5x5 Keyboard
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/info.json
index bb6b836ba9..94ffc2d9d2 100644
--- a/keyboards/40percentclub/5x5/info.json
+++ b/keyboards/40percentclub/5x5/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "40percent.club 5x5",
+    "keyboard_name": "The 5x5 Keyboard",
+    "manufacturer": "di0ib",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x05B5",
+        "device_version": "1.0.0"
+    },
     "layouts": {
         "LAYOUT_ortho_5x5": {
             "layout": [
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index ae4ee1bad8..e402932b21 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025 // 40%
-#define PRODUCT_ID      0x0F61
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    di0ib
-#define PRODUCT         The 6lit Macropad
-
 #define USE_SERIAL
 
 /* serial.c configuration for split keyboard */
diff --git a/keyboards/40percentclub/6lit/info.json b/keyboards/40percentclub/6lit/info.json
index 8308847f6c..a844a044e2 100644
--- a/keyboards/40percentclub/6lit/info.json
+++ b/keyboards/40percentclub/6lit/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "6lit",
+    "keyboard_name": "The 6lit Macropad",
+    "manufacturer": "di0ib",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x0F61",
+        "device_version": "1.0.0"
+    },
     "layouts": {
         "LAYOUT_ortho_2x3": {
             "layout": [
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index 1e91d3bd10..3f6cb1f10c 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025 // 40%
-#define PRODUCT_ID      0x0F00
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    di0ib
-#define PRODUCT         The foobar Keyboard
-
 #define USE_SERIAL
 
 /* serial.c configuration for split keyboard */
diff --git a/keyboards/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/info.json
index b825ed0267..832e65bfc6 100644
--- a/keyboards/40percentclub/foobar/info.json
+++ b/keyboards/40percentclub/foobar/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "foobar",
+    "keyboard_name": "The foobar Keyboard",
+    "manufacturer": "di0ib",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x0F00",
+        "device_version": "1.0.0"
+    },
     "layouts": {
         "LAYOUT_ortho_3x5": {
             "layout": [
diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h
index 6373ea2e60..e7062990cb 100644
--- a/keyboards/40percentclub/gherkin/config.h
+++ b/keyboards/40percentclub/gherkin/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025 //"40 %", since 0x3430 is already registered.
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    40 Percent Club
-#define PRODUCT         Gherkin
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 6
diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json
index b4600eba00..8693875449 100644
--- a/keyboards/40percentclub/gherkin/info.json
+++ b/keyboards/40percentclub/gherkin/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Gherkin",
+  "manufacturer": "40 Percent Club",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x6060",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_ortho_3x10": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
index 0c819031da..292ac485bd 100644
--- a/keyboards/40percentclub/half_n_half/config.h
+++ b/keyboards/40percentclub/half_n_half/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025 // 40%
-#define PRODUCT_ID      0x4A1F
-#define DEVICE_VER      0x0100
-#define MANUFACTURER    di0ib
-#define PRODUCT         half_n_half
-
 /* key matrix size */
 #define MATRIX_ROWS 4*2
 #define MATRIX_COLS 7
diff --git a/keyboards/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/info.json
index 57a65424f0..1b7f129401 100644
--- a/keyboards/40percentclub/half_n_half/info.json
+++ b/keyboards/40percentclub/half_n_half/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "half_n_half",
+  "manufacturer": "di0ib",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x4A1F",
+    "device_version": "1.0.0"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [
diff --git a/keyboards/40percentclub/i75/config.h b/keyboards/40percentclub/i75/config.h
index bacf9eb30f..bce564c042 100644
--- a/keyboards/40percentclub/i75/config.h
+++ b/keyboards/40percentclub/i75/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025
-#define PRODUCT_ID      0x0A0C
-#define DEVICE_VER      0x0175
-#define MANUFACTURER    di0ib
-#define PRODUCT         i75
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/40percentclub/i75/info.json b/keyboards/40percentclub/i75/info.json
index 7e705cdf86..1753d42309 100644
--- a/keyboards/40percentclub/i75/info.json
+++ b/keyboards/40percentclub/i75/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "i75",
+  "manufacturer": "di0ib",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x0A0C",
+    "device_version": "1.7.5"
+  },
   "layouts": {
       "LAYOUT_ortho_5x15": {
           "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
index 3f15523c89..3924841b04 100644
--- a/keyboards/40percentclub/luddite/config.h
+++ b/keyboards/40percentclub/luddite/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025 // "40%", changed since 0x3430 is already officially registered
-#define PRODUCT_ID      0x4C55 // "LU"
-#define DEVICE_VER      0x1001
-#define MANUFACTURER    di0ib
-#define PRODUCT         Luddite
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 8
diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json
index 45a446e818..565880a165 100644
--- a/keyboards/40percentclub/luddite/info.json
+++ b/keyboards/40percentclub/luddite/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Luddite",
+  "manufacturer": "di0ib",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x4C55",
+    "device_version": "10.0.1"
+  },
   "layouts": {
     "LAYOUT_60_ansi": {
       "layout": [
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
index 7ebe5ae1b3..2ed8c87195 100644
--- a/keyboards/40percentclub/mf68/config.h
+++ b/keyboards/40percentclub/mf68/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025 // "40%", changed since 0x3430 is already officially registered
-#define PRODUCT_ID      0x4D68 // "M68"
-#define DEVICE_VER      0x0101
-#define MANUFACTURER    di0ib
-#define PRODUCT         MF68
-
 /* key matrix size */
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 9
diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/info.json
index 873824edb0..5a8164bcb4 100644
--- a/keyboards/40percentclub/mf68/info.json
+++ b/keyboards/40percentclub/mf68/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "MF68",
+  "manufacturer": "di0ib",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x4D68",
+    "device_version": "1.0.1"
+  },
   "layouts": {
       "LAYOUT_68_ansi": {
           "layout": [{"label":"~", "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}, {"x":15.25, "y":0}, {"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}, {"x":15.25, "y":1}, {"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}, {"x":15.25, "y":3}, {"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":"Alt", "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}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}]
diff --git a/keyboards/40percentclub/nano/config.h b/keyboards/40percentclub/nano/config.h
index c6d66a1bb3..7d789cff04 100644
--- a/keyboards/40percentclub/nano/config.h
+++ b/keyboards/40percentclub/nano/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025 //"40 %", to make it consistent with other 40percent.club boards.
-#define PRODUCT_ID      0x0007
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    di0ib
-#define PRODUCT         Nano
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 4
diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json
index 35eff7e960..914b32aaa4 100644
--- a/keyboards/40percentclub/nano/info.json
+++ b/keyboards/40percentclub/nano/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Nano",
+  "manufacturer": "di0ib",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x0007",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_ortho_2x4": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}]
diff --git a/keyboards/40percentclub/nein/config.h b/keyboards/40percentclub/nein/config.h
index 87c62673f9..4dfb143e52 100644
--- a/keyboards/40percentclub/nein/config.h
+++ b/keyboards/40percentclub/nein/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025 // "40%", changed since 0x3430 is already officially registered
-#define PRODUCT_ID      0x9999
-#define DEVICE_VER      0x9999
-#define MANUFACTURER    di0ib
-#define PRODUCT         The nein Keyboard
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3
diff --git a/keyboards/40percentclub/nein/info.json b/keyboards/40percentclub/nein/info.json
index 6d948877d1..812853d0fe 100644
--- a/keyboards/40percentclub/nein/info.json
+++ b/keyboards/40percentclub/nein/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "nein",
+  "keyboard_name": "The nein Keyboard",
+  "manufacturer": "di0ib",
   "url": "http://www.40percent.club/2019/04/nein.html",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "vid": "0x9999",
+    "device_version": "99.9.9"
+  },
   "layouts": {
     "LAYOUT_ortho_3x3": {
       "layout": [
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index 882da633e0..0fed3daf11 100644
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025
-#define PRODUCT_ID      0x0A0C
-#define DEVICE_VER      0x0444
-#define MANUFACTURER    di0ib
-#define PRODUCT         The nori Keyboard
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json
index 9de33d52f0..5366966705 100644
--- a/keyboards/40percentclub/nori/info.json
+++ b/keyboards/40percentclub/nori/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "nori",
+    "keyboard_name": "The nori Keyboard",
+    "manufacturer": "di0ib",
     "url": "",
     "maintainer": "qmk",
+    "usb": {
+      "vid": "0x4025",
+      "pid": "0xA0C",
+      "device_version": "4.4.4"
+    },
     "layouts": {
       "LAYOUT_ortho_4x4": {
           "layout": [
diff --git a/keyboards/40percentclub/polyandry/config.h b/keyboards/40percentclub/polyandry/config.h
index 6f04d12297..1fd3e22f49 100644
--- a/keyboards/40percentclub/polyandry/config.h
+++ b/keyboards/40percentclub/polyandry/config.h
@@ -18,13 +18,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    di0ib
-#define PRODUCT         Polypad
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
diff --git a/keyboards/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json
index d0d1a00f86..3572b38c23 100644
--- a/keyboards/40percentclub/polyandry/info.json
+++ b/keyboards/40percentclub/polyandry/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "Polyandry",
+    "keyboard_name": "Polypad",
+    "manufacturer": "di0ib",
     "url": "",
     "maintainer": "QMK",
+    "usb": {
+        "vid": "0x4025",
+        "pid": "0x6060",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/40percentclub/sixpack/config.h b/keyboards/40percentclub/sixpack/config.h
index edb123c4b9..4ddad2efb7 100644
--- a/keyboards/40percentclub/sixpack/config.h
+++ b/keyboards/40percentclub/sixpack/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025 //"40 %", since 0x3430 is already registered.
-#define PRODUCT_ID      0x5350 // "SP"
-#define DEVICE_VER      0x1001
-#define MANUFACTURER    di0ib
-#define PRODUCT         Six Pack
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3
diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json
index 3e02a01bc2..b99c24a617 100644
--- a/keyboards/40percentclub/sixpack/info.json
+++ b/keyboards/40percentclub/sixpack/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Six Pack",
+    "manufacturer": "di0ib",
     "url": "https://www.40percent.club/2017/05/six-pack-11.html",
     "maintainer": "qmk",
+    "usb": {
+      "vid": "0x4025",
+      "pid": "0x5350",
+      "device_version": "10.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_2x3": {
           "layout": [
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index 8f06341aad..b6534622ea 100644
--- a/keyboards/40percentclub/tomato/config.h
+++ b/keyboards/40percentclub/tomato/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025
-#define PRODUCT_ID      0x546F //"To", was duplicate with polyandry
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    40 Percent Club
-#define PRODUCT         Tomato
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 6
diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json
index 57bcfd17a3..1ecaa84aff 100644
--- a/keyboards/40percentclub/tomato/info.json
+++ b/keyboards/40percentclub/tomato/info.json
@@ -1,7 +1,13 @@
 {
   "keyboard_name": "Tomato",
+  "manufacturer": "40 Percent Club",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "pid": "0x546F",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT_ortho_3x10": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
diff --git a/keyboards/40percentclub/ut47/config.h b/keyboards/40percentclub/ut47/config.h
index 7ead58e096..3724e4b2d5 100644
--- a/keyboards/40percentclub/ut47/config.h
+++ b/keyboards/40percentclub/ut47/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4025
-#define PRODUCT_ID      0x7574 //"ut"
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    40percent.club
-#define PRODUCT         ut47
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
diff --git a/keyboards/40percentclub/ut47/info.json b/keyboards/40percentclub/ut47/info.json
index 4993bebb0f..e3173098e4 100644
--- a/keyboards/40percentclub/ut47/info.json
+++ b/keyboards/40percentclub/ut47/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "UT47",
+  "keyboard_name": "ut47",
+  "manufacturer": "40percent.club",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0x4025",
+    "vid": "0x7574",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "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":"Backspace", "x":11, "y":0, "w":1.5}, {"label":"LT(3) / Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.25}, {"label":"Shift", "x":0, "y":2, "w":1.5}, {"label":"Z", "x":1.5, "y":2}, {"label":"X", "x":2.5, "y":2}, {"label":"C", "x":3.5, "y":2}, {"label":"V", "x":4.5, "y":2}, {"label":"B", "x":5.5, "y":2}, {"label":"N", "x":6.5, "y":2}, {"label":"M", "x":7.5, "y":2}, {"label":"<", "x":8.5, "y":2}, {"label":">", "x":9.5, "y":2}, {"label":"?", "x":10.5, "y":2}, {"label":"Shift / Enter", "x":11.5, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Alt", "x":1, "y":3}, {"label":"GUI", "x":2, "y":3}, {"label":"Menu", "x":3, "y":3}, {"label":"MO(2)", "x":4, "y":3, "w":1.25}, {"x":5.25, "y":3, "w":2}, {"label":"MO(1)", "x":7.25, "y":3, "w":1.25}, {"label":"\u2190", "x":8.5, "y":3}, {"label":"\u2193", "x":9.5, "y":3}, {"label":"\u2191", "x":10.5, "y":3}, {"label":"\u2192", "x":11.5, "y":3}]
diff --git a/keyboards/45_ats/config.h b/keyboards/45_ats/config.h
index 4733095bc1..8177f89038 100644
--- a/keyboards/45_ats/config.h
+++ b/keyboards/45_ats/config.h
@@ -20,13 +20,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xAB13
-#define PRODUCT_ID      0x4511
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Abec13
-#define PRODUCT         45ATS
-
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 14
diff --git a/keyboards/45_ats/info.json b/keyboards/45_ats/info.json
index 2ea14357ee..268af942fe 100644
--- a/keyboards/45_ats/info.json
+++ b/keyboards/45_ats/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "45-ATS",
+    "keyboard_name": "45ATS",
+    "manufacturer": "Abec13",
     "url": "",
     "maintainer": "The-Royal",
+    "usb": {
+      "vid": "0xAB13",
+      "pid": "0x4511",
+      "device_version": "0.0.1"
+    },
     "layouts": {
       "LAYOUT_split_space": {
         "layout": [
diff --git a/keyboards/4by3/config.h b/keyboards/4by3/config.h
index daaafb02a6..27ad7441cc 100644
--- a/keyboards/4by3/config.h
+++ b/keyboards/4by3/config.h
@@ -2,13 +2,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xEEEE
-#define PRODUCT_ID      0x2019
-#define DEVICE_VER		0x0001
-#define MANUFACTURER    Elias Sjögreen
-#define PRODUCT         4by3
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 4
diff --git a/keyboards/4by3/info.json b/keyboards/4by3/info.json
index 50f7c44b4f..24a2b3d34a 100644
--- a/keyboards/4by3/info.json
+++ b/keyboards/4by3/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "4by3",
+    "manufacturer": "Elias Sjögreen",
     "url": "https://github.com/eliassjogreen/4by3",
     "maintainer": "eliassjogreen",
+    "usb": {
+        "vid": "0xEEEE",
+        "pid": "0x2019",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_horizontal": {
             "layout": [
diff --git a/keyboards/7c8/framework/config.h b/keyboards/7c8/framework/config.h
index 44a69bf4e5..5ed43862cc 100644
--- a/keyboards/7c8/framework/config.h
+++ b/keyboards/7c8/framework/config.h
@@ -17,12 +17,6 @@
 #pragma once
 #include "config_common.h"
 
-#define VENDOR_ID 0x77C8
-#define PRODUCT_ID 0x0001
-#define DEVICE_VER 0x0000
-#define MANUFACTURER 7c8
-#define PRODUCT Framework
-
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 6
 
diff --git a/keyboards/7c8/framework/info.json b/keyboards/7c8/framework/info.json
index f78ea1eb58..1a2c0b300b 100644
--- a/keyboards/7c8/framework/info.json
+++ b/keyboards/7c8/framework/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Framework",
+    "manufacturer": "7c8",
     "url": "",
     "maintainer": "stevennguyen",
+    "usb": {
+        "vid": "0x77C8",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_5x12": {
             "layout": [
diff --git a/keyboards/9key/config.h b/keyboards/9key/config.h
index b0462eb50f..622ccc7ae9 100644
--- a/keyboards/9key/config.h
+++ b/keyboards/9key/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0007
-#define DEVICE_VER 		0x0001
-#define MANUFACTURER    Bishop Keyboards
-#define PRODUCT         9Key
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3
diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json
index 326a63b12c..5508697df6 100644
--- a/keyboards/9key/info.json
+++ b/keyboards/9key/info.json
@@ -1,7 +1,13 @@
 {
-  "keyboard_name": "9key",
+  "keyboard_name": "9Key",
+  "manufacturer": "Bishop Keyboards",
   "url": "",
   "maintainer": "qmk",
+  "usb": {
+    "vid": "0xFEED",
+    "pid": "0x0007",
+    "device_version": "0.0.1"
+  },
   "layouts": {
     "LAYOUT": {
       "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}]

From dde4120a1e2b4234e68e40e47f02a7c166fbf90f Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Mon, 14 Mar 2022 10:55:47 +1100
Subject: [PATCH 812/867] ISP flashing guide: add instructions for flashing
 STM32duino bootloader (#16568)

---
 docs/isp_flashing_guide.md | 92 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 91 insertions(+), 1 deletion(-)

diff --git a/docs/isp_flashing_guide.md b/docs/isp_flashing_guide.md
index febb34c574..08f56e987b 100644
--- a/docs/isp_flashing_guide.md
+++ b/docs/isp_flashing_guide.md
@@ -4,7 +4,7 @@ In order to flash a microcontroller over USB, it needs something called a bootlo
 
 However, it can sometimes happen that the bootloader becomes corrupted and needs reflashing, or you may want to change the bootloader to another one. It's not possible to do this with the existing bootloader, because, of course, it is already running, and cannot overwrite itself. Instead, you will need to ISP flash the microcontroller.
 
-There are several different kinds of bootloaders available for AVR microcontrollers. Most STM32 ARM-based microcontrollers already have a USB-capable bootloader in ROM, so generally do not need to be ISP flashed.
+There are several different kinds of bootloaders available for AVR microcontrollers. Most STM32 ARM-based microcontrollers already have a USB-capable bootloader in ROM, so generally do not need to be ISP flashed. The one current exception is the [STM32F103](#flashing-stm32duino-bootloader).
 
 ## Hardware
 
@@ -260,3 +260,93 @@ For mass production purposes, it is possible to join the bootloader and QMK firm
  4. Save it as a new file, for example `<keyboard>_<keymap>_production.hex`.
 
 You can then ISP flash this combined firmware instead, which allows you to skip the extra step of flashing the QMK firmware over USB.
+
+## Flashing STM32Duino Bootloader
+
+As mentioned above, *most* supported STM32 devices already possess a USB DFU bootloader which cannot be overwritten, however the ROM bootloader in the STM32F103 used on the Bluepill is not USB capable. In this case an ST-Link V2 dongle is required to upload the STM32Duino bootloader to the device. These can be readily purchased for relatively cheap on eBay and other places.
+
+This bootloader is a descendant of the Maple bootloader by Leaflabs, and is compatible with dfu-util.
+
+### Software
+
+To communicate with the ST-Link, you must install the following packages:
+
+* **macOS:** `brew install stlink openocd`
+* **Windows (MSYS2):** `pacman -S mingw-w64-x86_64-stlink mingw-w64-x86_64-openocd`
+* **Linux:** will vary by distribution, but will likely be `stlink` and `openocd` through your particular package manager
+
+Additionally, you may need to update the ST-Link's firmware with the [`STSW-LINK007`](https://www.st.com/en/development-tools/stsw-link007.html) application. Note you will be asked to provide your name and email address if you do not have an ST.com account (this does not create one).
+
+Finally, the bootloader binary itself can be downloaded from [here](https://github.com/rogerclarkmelbourne/STM32duino-bootloader/blob/master/bootloader_only_binaries/generic_boot20_pc13.bin).
+
+### Wiring
+
+Connect the four-pin header on the end of the Bluepill to the matching pins on the ST-Link (the pinout will usually be printed on the side):
+
+|ST-Link      |Bluepill|
+|-------------|--------|
+|`GND` (6)    |`GND`   |
+|`SWCLK` (2)  |`DCLK`  |
+|`SWDIO` (4)  |`DIO`   |
+|`3.3V` (8)   |`3.3`   |
+
+### Flashing
+
+Firstly, make sure both jumpers on the Bluepill are set to 0.
+
+Check that the ST-Link can talk to the Bluepill by running `st-info --probe`:
+
+```
+Found 1 stlink programmers
+  version:    V2J37S7
+  serial:     2C1219002B135937334D4E00
+  flash:      65536 (pagesize: 1024)
+  sram:       20480
+  chipid:     0x0410
+  descr:      F1xx Medium-density
+```
+
+If the reported `chipid` is `0x0410`, everything is working. If it is `0x0000`, check your wiring, and try swapping the `SWDIO` and `SWCLK` pins, as some ST-Link dongles may have incorrect pinouts.
+
+Next, run the following command:
+
+```
+st-flash --reset --format binary write <path-to-bootloader> 0x08000000
+```
+
+where `<path-to-bootloader>` is the path to the bootloader `.bin` file above. You can run this command from the directory you downloaded it to, so that you can simply pass in the filename.
+
+If all goes well, you should get output similar to the following:
+
+```
+st-flash 1.7.0
+2022-03-08T12:16:30 INFO common.c: F1xx Medium-density: 20 KiB SRAM, 64 KiB flash in at least 1 KiB pages.
+file generic_boot20_pc13.bin md5 checksum: 333c30605e739ce9bedee5999fdaf81b, stlink checksum: 0x0008e534
+2022-03-08T12:16:30 INFO common.c: Attempting to write 7172 (0x1c04) bytes to stm32 address: 134217728 (0x8000000)
+2022-03-08T12:16:30 INFO common.c: Flash page at addr: 0x08000000 erased
+2022-03-08T12:16:30 INFO common.c: Flash page at addr: 0x08000400 erased
+2022-03-08T12:16:31 INFO common.c: Flash page at addr: 0x08000800 erased
+2022-03-08T12:16:31 INFO common.c: Flash page at addr: 0x08000c00 erased
+2022-03-08T12:16:31 INFO common.c: Flash page at addr: 0x08001000 erased
+2022-03-08T12:16:31 INFO common.c: Flash page at addr: 0x08001400 erased
+2022-03-08T12:16:31 INFO common.c: Flash page at addr: 0x08001800 erased
+2022-03-08T12:16:31 INFO common.c: Flash page at addr: 0x08001c00 erased
+2022-03-08T12:16:31 INFO common.c: Finished erasing 8 pages of 1024 (0x400) bytes
+2022-03-08T12:16:31 INFO common.c: Starting Flash write for VL/F0/F3/F1_XL
+2022-03-08T12:16:31 INFO flash_loader.c: Successfully loaded flash loader in sram
+2022-03-08T12:16:31 INFO flash_loader.c: Clear DFSR
+  8/  8 pages written
+2022-03-08T12:16:31 INFO common.c: Starting verification of write complete
+2022-03-08T12:16:31 INFO common.c: Flash written and verified! jolly good!
+2022-03-08T12:16:31 WARN common.c: NRST is not connected
+```
+
+Otherwise, if you receive an `Unknown memory region` error, run the following command to unlock the STM32F103:
+
+```
+openocd -f interface/stlink.cfg -f target/stm32f1x.cfg -c "init; reset halt; stm32f1x unlock 0; reset halt; exit"
+```
+
+Then re-plug the ST-Link and try again.
+
+After all of this, unplug the Bluepill from the ST-Link and connect it to USB. It should now be ready to flash using dfu-util, the QMK CLI or Toolbox.

From 8d90cf36f1a8484bdb7fcc0660887efaf0b7c106 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 13 Mar 2022 19:04:11 -0600
Subject: [PATCH 813/867] Fix 40percentclub USB descriptors (#16638)

---
 keyboards/40percentclub/nein/info.json | 2 +-
 keyboards/40percentclub/nori/info.json | 2 +-
 keyboards/40percentclub/ut47/info.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/keyboards/40percentclub/nein/info.json b/keyboards/40percentclub/nein/info.json
index 812853d0fe..09d25e30de 100644
--- a/keyboards/40percentclub/nein/info.json
+++ b/keyboards/40percentclub/nein/info.json
@@ -5,7 +5,7 @@
   "maintainer": "qmk",
   "usb": {
     "vid": "0x4025",
-    "vid": "0x9999",
+    "pid": "0x9999",
     "device_version": "99.9.9"
   },
   "layouts": {
diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json
index 5366966705..d6415b73f9 100644
--- a/keyboards/40percentclub/nori/info.json
+++ b/keyboards/40percentclub/nori/info.json
@@ -5,7 +5,7 @@
     "maintainer": "qmk",
     "usb": {
       "vid": "0x4025",
-      "pid": "0xA0C",
+      "pid": "0x0A0C",
       "device_version": "4.4.4"
     },
     "layouts": {
diff --git a/keyboards/40percentclub/ut47/info.json b/keyboards/40percentclub/ut47/info.json
index e3173098e4..e0bd0264cb 100644
--- a/keyboards/40percentclub/ut47/info.json
+++ b/keyboards/40percentclub/ut47/info.json
@@ -5,7 +5,7 @@
   "maintainer": "qmk",
   "usb": {
     "vid": "0x4025",
-    "vid": "0x7574",
+    "pid": "0x7574",
     "device_version": "0.0.1"
   },
   "layouts": {

From c17323b0f5fddf891929e6a25232825769a64e28 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Mon, 14 Mar 2022 01:56:52 +0000
Subject: [PATCH 814/867] bolsa/damapad - Fix missing layout macro (#16639)

---
 keyboards/bolsa/damapad/damapad.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/keyboards/bolsa/damapad/damapad.h b/keyboards/bolsa/damapad/damapad.h
index da0a4d863e..9f0d0d4170 100644
--- a/keyboards/bolsa/damapad/damapad.h
+++ b/keyboards/bolsa/damapad/damapad.h
@@ -30,3 +30,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ K10, K11, K12, K13, K14, K15 }, \
 	{ K20, K21, XXX, K23, XXX, K25 }  \
 }
+
+#define LAYOUT_bar( \
+	K00, K01, K02, K03, K04, K05, \
+	K10, K11, K12, K13, K14, K15, \
+	K20,           K23,      K25  \
+) { \
+	{ K00, K01, K02, K03, K04, K05 }, \
+	{ K10, K11, K12, K13, K14, K15 }, \
+	{ K20, XXX, XXX, K23, XXX, K25 }  \
+}

From 5fb269b2b49f31dcee34e3e088ef77cd016d0450 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 15 Mar 2022 00:57:44 +1100
Subject: [PATCH 815/867] keebio/iris: Add ifdefs to encoder callbacks (#16642)

---
 keyboards/keebio/iris/rev3/rev3.c | 2 ++
 keyboards/keebio/iris/rev4/rev4.c | 2 ++
 keyboards/keebio/iris/rev5/rev5.c | 2 ++
 keyboards/keebio/iris/rev6/rev6.c | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/keyboards/keebio/iris/rev3/rev3.c b/keyboards/keebio/iris/rev3/rev3.c
index e874b9beae..2b3d6b1d96 100644
--- a/keyboards/keebio/iris/rev3/rev3.c
+++ b/keyboards/keebio/iris/rev3/rev3.c
@@ -36,6 +36,7 @@ void eeconfig_init_kb(void) {
     eeconfig_init_user();
 }
 
+#ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 0) {
@@ -53,3 +54,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return false;
 }
+#endif
diff --git a/keyboards/keebio/iris/rev4/rev4.c b/keyboards/keebio/iris/rev4/rev4.c
index 36ef461cd0..112c86f413 100644
--- a/keyboards/keebio/iris/rev4/rev4.c
+++ b/keyboards/keebio/iris/rev4/rev4.c
@@ -17,6 +17,7 @@ void eeconfig_init_kb(void) {
     eeconfig_init_user();
 }
 
+#ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 0) {
@@ -34,3 +35,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return false;
 }
+#endif
diff --git a/keyboards/keebio/iris/rev5/rev5.c b/keyboards/keebio/iris/rev5/rev5.c
index 2a89c6923b..b597c05de8 100644
--- a/keyboards/keebio/iris/rev5/rev5.c
+++ b/keyboards/keebio/iris/rev5/rev5.c
@@ -13,6 +13,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "rev5.h"
 
+#ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 0) {
@@ -30,3 +31,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return false;
 }
+#endif
diff --git a/keyboards/keebio/iris/rev6/rev6.c b/keyboards/keebio/iris/rev6/rev6.c
index 152df0b2f9..8b612c3555 100644
--- a/keyboards/keebio/iris/rev6/rev6.c
+++ b/keyboards/keebio/iris/rev6/rev6.c
@@ -64,6 +64,7 @@ led_config_t g_led_config = { {
 } };
 #endif
 
+#ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) { return false; }
     if (index == 0) {
@@ -81,3 +82,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return false;
 }
+#endif

From 6a6a333c75e60692c4497aafe949e6304b22f8b8 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 15 Mar 2022 00:58:05 +1100
Subject: [PATCH 816/867] Disable RGB matrix pixel animations for some boards
 (#16643)

* idobao/id87/v2: disable RGB matrix pixel animations

* Same for two more boards
---
 keyboards/dztech/dz60rgb_wkl/v2/config.h    | 3 ---
 keyboards/idobao/id87/v2/config.h           | 3 ---
 keyboards/kbdfans/kbd67/mkiirgb/v4/config.h | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h
index 5985fccea7..5d715a1e0d 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h
@@ -69,9 +69,6 @@
 #    define ENABLE_RGB_MATRIX_HUE_BREATHING
 #    define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
 #    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 // #    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h
index 8a2c58aa2d..3ef24f0bc5 100644
--- a/keyboards/idobao/id87/v2/config.h
+++ b/keyboards/idobao/id87/v2/config.h
@@ -79,9 +79,6 @@
 #    define ENABLE_RGB_MATRIX_HUE_BREATHING
 #    define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
 #    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index 7de9281d40..9960022a13 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -94,9 +94,6 @@
 #    define ENABLE_RGB_MATRIX_HUE_BREATHING
 #    define ENABLE_RGB_MATRIX_HUE_PENDULUM
 #    define ENABLE_RGB_MATRIX_HUE_WAVE
-#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
-#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
-#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
 // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
 #    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 // #define ENABLE_RGB_MATRIX_DIGITAL_RAIN

From a12d58c6c965254bdf40ae0f02a6644e183eb17c Mon Sep 17 00:00:00 2001
From: Danny <nooges@users.noreply.github.com>
Date: Mon, 14 Mar 2022 14:08:10 -0400
Subject: [PATCH 817/867] [Keyboard] Add BAMFK-1 (#16409)

Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/keebio/bamfk1/bamfk1.c              |   4 +
 keyboards/keebio/bamfk1/bamfk1.h              |  14 +++
 keyboards/keebio/bamfk1/config.h              | 113 ++++++++++++++++++
 keyboards/keebio/bamfk1/info.json             |  19 +++
 .../keebio/bamfk1/keymaps/default/keymap.c    |  39 ++++++
 .../keebio/bamfk1/keymaps/default/rules.mk    |   1 +
 keyboards/keebio/bamfk1/keymaps/via/keymap.c  |  39 ++++++
 keyboards/keebio/bamfk1/keymaps/via/rules.mk  |   2 +
 keyboards/keebio/bamfk1/readme.md             |  27 +++++
 keyboards/keebio/bamfk1/rules.mk              |  21 ++++
 keyboards/keebio/encoder_actions.c            |  68 +++++++++++
 keyboards/keebio/encoder_actions.h            |  21 ++++
 12 files changed, 368 insertions(+)
 create mode 100644 keyboards/keebio/bamfk1/bamfk1.c
 create mode 100644 keyboards/keebio/bamfk1/bamfk1.h
 create mode 100644 keyboards/keebio/bamfk1/config.h
 create mode 100644 keyboards/keebio/bamfk1/info.json
 create mode 100644 keyboards/keebio/bamfk1/keymaps/default/keymap.c
 create mode 100644 keyboards/keebio/bamfk1/keymaps/default/rules.mk
 create mode 100644 keyboards/keebio/bamfk1/keymaps/via/keymap.c
 create mode 100644 keyboards/keebio/bamfk1/keymaps/via/rules.mk
 create mode 100644 keyboards/keebio/bamfk1/readme.md
 create mode 100644 keyboards/keebio/bamfk1/rules.mk
 create mode 100644 keyboards/keebio/encoder_actions.c
 create mode 100644 keyboards/keebio/encoder_actions.h

diff --git a/keyboards/keebio/bamfk1/bamfk1.c b/keyboards/keebio/bamfk1/bamfk1.c
new file mode 100644
index 0000000000..eddd7e624e
--- /dev/null
+++ b/keyboards/keebio/bamfk1/bamfk1.c
@@ -0,0 +1,4 @@
+// Copyright 2021 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "bamfk1.h"
diff --git a/keyboards/keebio/bamfk1/bamfk1.h b/keyboards/keebio/bamfk1/bamfk1.h
new file mode 100644
index 0000000000..be1fd00808
--- /dev/null
+++ b/keyboards/keebio/bamfk1/bamfk1.h
@@ -0,0 +1,14 @@
+// Copyright 2021 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    k00, e01, e02, \
+    e01a, e01b, e02a, e02b \
+) { \
+    { k00, e01, e02, KC_NO }, \
+    { e01a, e01b, e02a, e02b }  \
+}
diff --git a/keyboards/keebio/bamfk1/config.h b/keyboards/keebio/bamfk1/config.h
new file mode 100644
index 0000000000..5cd86a9d16
--- /dev/null
+++ b/keyboards/keebio/bamfk1/config.h
@@ -0,0 +1,113 @@
+// Copyright 2021 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xCB10
+#define PRODUCT_ID   0x1111
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Keebio
+#define PRODUCT      BAMFK-1
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 4
+
+/*
+ * Keyboard Matrix Assignments
+ */
+
+#define DIRECT_PINS { \
+    { E6, B6, D6, NO_PIN }, \
+    { NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
+}
+#define AUDIO_PIN C6
+#ifdef AUDIO_ENABLE
+#    define STARTUP_SONG SONG(STARTUP_SOUND)
+#endif
+
+#define ENCODERS_PAD_A { C7, D7 }
+#define ENCODERS_PAD_B { B5, D4 }
+#define ENCODERS 2
+#define ENCODERS_CW_KEY  { { 1, 1 }, { 3, 1 } }
+#define ENCODERS_CCW_KEY { { 0, 1 }, { 2, 1 } }
+
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 16
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#    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
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keebio/bamfk1/info.json b/keyboards/keebio/bamfk1/info.json
new file mode 100644
index 0000000000..817eb98af0
--- /dev/null
+++ b/keyboards/keebio/bamfk1/info.json
@@ -0,0 +1,19 @@
+{
+    "keyboard_name": "BAMFK-1",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "k00", "x": 1.5, "y": 0, "h":2, "w": 2},
+                {"label": "k01", "x": 0.5, "y": 2.25},
+                {"label": "k02", "x": 3.5, "y": 2.25},
+
+                {"label": "k10", "x": 0, "y": 3.5},
+                {"label": "k11", "x": 1, "y": 3.5},
+                {"label": "k12", "x": 3, "y": 3.5},
+                {"label": "k13", "x": 4, "y": 3.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/bamfk1/keymaps/default/keymap.c b/keyboards/keebio/bamfk1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..aa0780eafc
--- /dev/null
+++ b/keyboards/keebio/bamfk1/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2021 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _MAIN,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MAIN] = LAYOUT(
+        KC_A,               // Big Switch
+        MO(1),   KC_MUTE,   // Encoder presses
+        KC_DOWN, KC_UP,     // Left encoder turns
+        KC_VOLD, KC_VOLU     // Right encoder turns
+    ),
+    [_FN1] = LAYOUT(
+        KC_B,               // Big Switch
+        _______, KC_C,      // Encoder presses
+        KC_PGDN, KC_PGUP,   // Left encoder turns
+        KC_VOLU, KC_VOLD    // Right encoder turns
+    ),
+    [_FN2] = LAYOUT(
+        _______,            // Big Switch
+        _______, _______,   // Encoder presses
+        _______, _______,   // Left encoder turns
+        _______, _______    // Right encoder turns
+    ),
+    [_FN3] = LAYOUT(
+        _______,            // Big Switch
+        _______, _______,   // Encoder presses
+        _______, _______,   // Left encoder turns
+        _______, _______    // Right encoder turns
+    )
+};
diff --git a/keyboards/keebio/bamfk1/keymaps/default/rules.mk b/keyboards/keebio/bamfk1/keymaps/default/rules.mk
new file mode 100644
index 0000000000..4da205a168
--- /dev/null
+++ b/keyboards/keebio/bamfk1/keymaps/default/rules.mk
@@ -0,0 +1 @@
+LTO_ENABLE = yes
diff --git a/keyboards/keebio/bamfk1/keymaps/via/keymap.c b/keyboards/keebio/bamfk1/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e7cde2d7ee
--- /dev/null
+++ b/keyboards/keebio/bamfk1/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+// Copyright 2021 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _MAIN,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MAIN] = LAYOUT(
+        RGB_MOD,            // Big Switch
+        FN_MO13, KC_MUTE,   // Encoder presses
+        KC_DOWN, KC_UP,     // Left encoder turns
+        KC_VOLD, KC_VOLU    // Right encoder turns
+    ),
+    [_FN1] = LAYOUT(
+        KC_B,               // Big Switch
+        _______, KC_C,      // Encoder presses
+        KC_PGDN, KC_PGUP,   // Left encoder turns
+        KC_VOLU, KC_VOLD    // Right encoder turns
+    ),
+    [_FN2] = LAYOUT(
+        _______,            // Big Switch
+        _______, _______,   // Encoder presses
+        _______, _______,   // Left encoder turns
+        _______, _______    // Right encoder turns
+    ),
+    [_FN3] = LAYOUT(
+        _______,            // Big Switch
+        _______, _______,   // Encoder presses
+        _______, _______,   // Left encoder turns
+        _______, _______    // Right encoder turns
+    )
+};
diff --git a/keyboards/keebio/bamfk1/keymaps/via/rules.mk b/keyboards/keebio/bamfk1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/keebio/bamfk1/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/keebio/bamfk1/readme.md b/keyboards/keebio/bamfk1/readme.md
new file mode 100644
index 0000000000..a90ee8ac8c
--- /dev/null
+++ b/keyboards/keebio/bamfk1/readme.md
@@ -0,0 +1,27 @@
+# BAMFK-1
+
+![bamfk1](https://cdn.shopify.com/s/files/1/1851/5125/products/bamfk-1-back_1100x.png?v=1635304218)
+
+PCB for the Big Switch with support for horizontal rotary encoders.
+
+* Keyboard Maintainer: [Keebio](https://github.com/nooges)
+* Hardware Supported: BAMFK-1 PCB
+* Hardware Availability: [Keebio](https://keeb.io/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keebio/bamfk1:default
+
+Flashing example for this keyboard:
+
+    make keebio/bamfk1:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/keebio/bamfk1/rules.mk b/keyboards/keebio/bamfk1/rules.mk
new file mode 100644
index 0000000000..abcf10c871
--- /dev/null
+++ b/keyboards/keebio/bamfk1/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # 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 = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = yes          # Audio output
+ENCODER_ENABLE = yes
+
+SRC += encoder_actions.c
diff --git a/keyboards/keebio/encoder_actions.c b/keyboards/keebio/encoder_actions.c
new file mode 100644
index 0000000000..c4e49813f4
--- /dev/null
+++ b/keyboards/keebio/encoder_actions.c
@@ -0,0 +1,68 @@
+/* Copyright 2020 Neil Brian Ramirez
+ * Copyright 2021 drashna jael're (@drashna)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "encoder_actions.h"
+
+#if defined(ENCODER_ENABLE)
+
+#    ifdef ENCODERS
+static uint8_t  encoder_state[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[ENCODERS]   = ENCODERS_CCW_KEY;
+#    endif
+
+void encoder_action_unregister(void) {
+#    ifdef ENCODERS
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index]) {
+            keyevent_t encoder_event = (keyevent_t) {
+                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
+                .pressed = false,
+                .time = (timer_read() | 1)
+            };
+            encoder_state[index] = 0;
+            action_exec(encoder_event);
+        }
+    }
+#    endif
+}
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+#    ifdef ENCODERS
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = true,
+        .time = (timer_read() | 1)
+    };
+    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+#    endif
+}
+
+void matrix_scan_kb(void) {
+    encoder_action_unregister();
+    matrix_scan_user();
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    // don't return user actions, because they are in the keymap
+    // encoder_update_user(index, clockwise);
+    return true;
+};
+
+#endif
diff --git a/keyboards/keebio/encoder_actions.h b/keyboards/keebio/encoder_actions.h
new file mode 100644
index 0000000000..2484af52ae
--- /dev/null
+++ b/keyboards/keebio/encoder_actions.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Neil Brian Ramirez
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+void encoder_action_unregister(void);
+
+void encoder_action_register(uint8_t index, bool clockwise);

From 6c11579876cc721b46c734ffd34b66102726df58 Mon Sep 17 00:00:00 2001
From: Yakbats <yakbats@gmail.com>
Date: Mon, 14 Mar 2022 15:05:39 -0700
Subject: [PATCH 818/867] [Keyboard] Add via keymap to AL1 (#16499)

---
 keyboards/al1/config.h              |  4 +--
 keyboards/al1/keymaps/via/keymap.c  | 46 +++++++++++++++++++++++++++++
 keyboards/al1/keymaps/via/readme.md |  1 +
 keyboards/al1/keymaps/via/rules.mk  |  2 ++
 4 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 keyboards/al1/keymaps/via/keymap.c
 create mode 100644 keyboards/al1/keymaps/via/readme.md
 create mode 100644 keyboards/al1/keymaps/via/rules.mk

diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h
index b003a9cd6c..c8edb8ebfe 100644
--- a/keyboards/al1/config.h
+++ b/keyboards/al1/config.h
@@ -27,8 +27,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT      AL1
 
 /* key matrix size */
-#define MATRIX_ROWS 7
-#define MATRIX_COLS 20
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 16
 
 #define LED_NUM_LOCK_PIN D0
 #define LED_CAPS_LOCK_PIN B7
diff --git a/keyboards/al1/keymaps/via/keymap.c b/keyboards/al1/keymaps/via/keymap.c
new file mode 100644
index 0000000000..931755270b
--- /dev/null
+++ b/keyboards/al1/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2018 MechMerlin
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+       [0] = LAYOUT(
+       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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+       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_P7,   KC_P8,   KC_P9,   KC_PPLS,
+       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_P4,   KC_P5,   KC_P6,
+       KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_UP,   KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+       KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT          ),
+
+       [1] = LAYOUT(
+       KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS         ),
+	   
+	   [2] = LAYOUT(
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS         ),
+	   
+	   [3] = LAYOUT(
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS         ),
+};
diff --git a/keyboards/al1/keymaps/via/readme.md b/keyboards/al1/keymaps/via/readme.md
new file mode 100644
index 0000000000..458df9ca13
--- /dev/null
+++ b/keyboards/al1/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The via keymap for al1
diff --git a/keyboards/al1/keymaps/via/rules.mk b/keyboards/al1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/al1/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

From a939adb55c53d7cd7cbcc26e81ae6ee700ad3f6c Mon Sep 17 00:00:00 2001
From: ethsol <mmx233@gmail.com>
Date: Mon, 14 Mar 2022 23:20:50 +0100
Subject: [PATCH 819/867] Sentence correction (#16650)

---
 docs/feature_bootmagic.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/feature_bootmagic.md b/docs/feature_bootmagic.md
index 148ea92b9e..6b3c7e45fd 100644
--- a/docs/feature_bootmagic.md
+++ b/docs/feature_bootmagic.md
@@ -51,7 +51,7 @@ void bootmagic_lite(void) {
 }
 ```
 
-You can additional feature here. For instance, resetting the EEPROM or requiring additional keys to be pressed to trigger Bootmagic Lite. Keep in mind that `bootmagic_lite` is called before a majority of features are initialized in the firmware.
+You can define additional logic here. For instance, resetting the EEPROM or requiring additional keys to be pressed to trigger Bootmagic Lite. Keep in mind that `bootmagic_lite` is called before a majority of features are initialized in the firmware.
 
 ## Addenda
 

From 7fde30979986732433126d50911efdef928c2b64 Mon Sep 17 00:00:00 2001
From: mechlovin <57231893+mechlovin@users.noreply.github.com>
Date: Tue, 15 Mar 2022 07:23:57 +0700
Subject: [PATCH 820/867] [Keyboard] Add Kay65 PCB by Team Mechlovin' (#15565)

* add kay65 PCB

* update

* update

* Update readme.md

* Update keyboards/mechlovin/kay65/rev1/rules.mk

* Update keyboards/mechlovin/olly/jf/rules.mk

* Update keyboards/mechlovin/kay65/rev1/rules.mk

* Update keyboards/mechlovin/kay65/rev1/info.json

* Update keymap.c

* update

* Update keyboards/mechlovin/kay65/rev1/rev1.h

* Update keyboards/mechlovin/kay65/rev1/info.json

* Update keyboards/mechlovin/kay65/rev1/info.json

* Update keyboards/mechlovin/kay65/rev1/rules.mk

* Update keymap.c

* Update readme.md

* Update keyboards/mechlovin/olly/jf/readme.md

* Update keyboards/mechlovin/kay65/rev1/config.h
---
 keyboards/mechlovin/kay65/rev1/config.h       | 147 ++++++++++++
 keyboards/mechlovin/kay65/rev1/info.json      | 223 ++++++++++++++++++
 .../kay65/rev1/keymaps/default/keymap.c       |  52 ++++
 .../kay65/rev1/keymaps/default/readme.md      |   1 +
 .../mechlovin/kay65/rev1/keymaps/via/keymap.c |  72 ++++++
 .../kay65/rev1/keymaps/via/readme.md          |   1 +
 .../mechlovin/kay65/rev1/keymaps/via/rules.mk |   2 +
 keyboards/mechlovin/kay65/rev1/readme.md      |  27 +++
 keyboards/mechlovin/kay65/rev1/rev1.c         |  25 ++
 keyboards/mechlovin/kay65/rev1/rev1.h         |  62 +++++
 keyboards/mechlovin/kay65/rev1/rules.mk       |  20 ++
 keyboards/mechlovin/olly/jf/config.h          |   4 +
 .../mechlovin/olly/jf/keymaps/via/config.h    |   3 +-
 .../mechlovin/olly/jf/keymaps/via/keymap.c    |   9 +-
 keyboards/mechlovin/olly/jf/readme.md         |   5 +-
 15 files changed, 642 insertions(+), 11 deletions(-)
 create mode 100644 keyboards/mechlovin/kay65/rev1/config.h
 create mode 100644 keyboards/mechlovin/kay65/rev1/info.json
 create mode 100644 keyboards/mechlovin/kay65/rev1/keymaps/default/keymap.c
 create mode 100644 keyboards/mechlovin/kay65/rev1/keymaps/default/readme.md
 create mode 100644 keyboards/mechlovin/kay65/rev1/keymaps/via/keymap.c
 create mode 100644 keyboards/mechlovin/kay65/rev1/keymaps/via/readme.md
 create mode 100644 keyboards/mechlovin/kay65/rev1/keymaps/via/rules.mk
 create mode 100644 keyboards/mechlovin/kay65/rev1/readme.md
 create mode 100644 keyboards/mechlovin/kay65/rev1/rev1.c
 create mode 100644 keyboards/mechlovin/kay65/rev1/rev1.h
 create mode 100644 keyboards/mechlovin/kay65/rev1/rules.mk

diff --git a/keyboards/mechlovin/kay65/rev1/config.h b/keyboards/mechlovin/kay65/rev1/config.h
new file mode 100644
index 0000000000..cc1b991672
--- /dev/null
+++ b/keyboards/mechlovin/kay65/rev1/config.h
@@ -0,0 +1,147 @@
+/*
+Copyright 2021 Mechlovin'
+
+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    0x4D4C
+#define PRODUCT_ID   0x6502
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Team Mechlovin
+#define PRODUCTION   Kay65 Rev. 1
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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, D3, D5, D4, C6 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, C7, E6, B0, D2, D1, D0, B3, B2, B1 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+#define LED_CAPS_LOCK_PIN D6
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 24
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+#    define RGBLIGHT_EFFECT_TWINKLE
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+//#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mechlovin/kay65/rev1/info.json b/keyboards/mechlovin/kay65/rev1/info.json
new file mode 100644
index 0000000000..9a2f7dc01b
--- /dev/null
+++ b/keyboards/mechlovin/kay65/rev1/info.json
@@ -0,0 +1,223 @@
+{
+    "keyboard_name": "Kay65",
+    "url": "",
+    "maintainer": "Mechlovin' Studio",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"K00 (B0,B5)", "x":0, "y":0},
+                {"label":"K01 (B0,B6)", "x":1, "y":0},
+                {"label":"K02 (B0,B7)", "x":2, "y":0},
+                {"label":"K03 (B0,C0)", "x":3, "y":0},
+                {"label":"K04 (B0,C1)", "x":4, "y":0},
+                {"label":"K05 (B0,C2)", "x":5, "y":0},
+                {"label":"K06 (B0,C3)", "x":6, "y":0},
+                {"label":"K07 (B0,C4)", "x":7, "y":0},
+                {"label":"K08 (B0,C5)", "x":8, "y":0},
+                {"label":"K09 (B0,C6)", "x":9, "y":0},
+                {"label":"K0A (B0,C7)", "x":10, "y":0},
+                {"label":"K0B (B0,D0)", "x":11, "y":0},
+                {"label":"K0C (B0,D1)", "x":12, "y":0},
+                {"label":"K0D (B0,D2)", "x":13, "y":0},
+                {"label":"K1D (B1,D2)", "x":14, "y":0},
+                {"label":"K0E (B0,D3)", "x":15, "y":0},
+                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
+                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
+                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
+                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
+                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
+                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
+                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
+                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
+                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
+                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
+                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
+                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
+                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
+                {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K1E (B1,D3)", "x":15, "y":1},
+                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
+                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
+                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
+                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
+                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
+                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
+                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
+                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
+                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
+                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
+                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
+                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
+                {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K2E (B2,D3)", "x":15, "y":2},
+                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
+                {"label":"K31 (B3,B6)", "x":1.25, "y":3},
+                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
+                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
+                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
+                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
+                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
+                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
+                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
+                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
+                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
+                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
+                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
+                {"label":"K3D (B3,D2)", "x":14, "y":3},
+                {"label":"K3E (B3,D3)", "x":15, "y":3},
+                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
+                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
+                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
+                {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
+                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
+                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K4C (B4,D1)", "x":13, "y":4},
+                {"label":"K4D (B4,D2)", "x":14, "y":4},
+                {"label":"K4E (B4,D3)", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"label":"K00 (B0,B5)", "x":0, "y":0},
+                {"label":"K01 (B0,B6)", "x":1, "y":0},
+                {"label":"K02 (B0,B7)", "x":2, "y":0},
+                {"label":"K03 (B0,C0)", "x":3, "y":0},
+                {"label":"K04 (B0,C1)", "x":4, "y":0},
+                {"label":"K05 (B0,C2)", "x":5, "y":0},
+                {"label":"K06 (B0,C3)", "x":6, "y":0},
+                {"label":"K07 (B0,C4)", "x":7, "y":0},
+                {"label":"K08 (B0,C5)", "x":8, "y":0},
+                {"label":"K09 (B0,C6)", "x":9, "y":0},
+                {"label":"K0A (B0,C7)", "x":10, "y":0},
+                {"label":"K0B (B0,D0)", "x":11, "y":0},
+                {"label":"K0C (B0,D1)", "x":12, "y":0},
+                {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
+                {"label":"K0E (B0,D3)", "x":15, "y":0},
+                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
+                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
+                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
+                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
+                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
+                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
+                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
+                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
+                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
+                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
+                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
+                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
+                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
+                {"label":"K2C (B2,D1)", "x":13.5, "y":1, "w":1.5},
+                {"label":"K1E (B1,D3)", "x":15, "y":1},
+                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
+                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
+                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
+                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
+                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
+                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
+                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
+                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
+                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
+                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
+                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
+                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
+                {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25},
+                {"label":"K2E (B2,D3)", "x":15, "y":2},
+                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25},
+                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
+                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
+                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
+                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
+                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
+                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
+                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
+                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
+                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
+                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
+                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
+                {"label":"K3D (B3,D2)", "x":14, "y":3},
+                {"label":"K3E (B3,D3)", "x":15, "y":3},
+                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
+                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
+                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
+                {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
+                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
+                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K4C (B4,D1)", "x":13, "y":4},
+                {"label":"K4D (B4,D2)", "x":14, "y":4},
+                {"label":"K4E (B4,D3)", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"label":"K00 (B0,B5)", "x":0, "y":0},
+                {"label":"K01 (B0,B6)", "x":1, "y":0},
+                {"label":"K02 (B0,B7)", "x":2, "y":0},
+                {"label":"K03 (B0,C0)", "x":3, "y":0},
+                {"label":"K04 (B0,C1)", "x":4, "y":0},
+                {"label":"K05 (B0,C2)", "x":5, "y":0},
+                {"label":"K06 (B0,C3)", "x":6, "y":0},
+                {"label":"K07 (B0,C4)", "x":7, "y":0},
+                {"label":"K08 (B0,C5)", "x":8, "y":0},
+                {"label":"K09 (B0,C6)", "x":9, "y":0},
+                {"label":"K0A (B0,C7)", "x":10, "y":0},
+                {"label":"K0B (B0,D0)", "x":11, "y":0},
+                {"label":"K0C (B0,D1)", "x":12, "y":0},
+                {"label":"K0D (B0,D2)", "x":13, "y":0, "w":2},
+                {"label":"K0E (B0,D3)", "x":15, "y":0},
+                {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5},
+                {"label":"K11 (B1,B6)", "x":1.5, "y":1},
+                {"label":"K12 (B1,B7)", "x":2.5, "y":1},
+                {"label":"K13 (B1,C0)", "x":3.5, "y":1},
+                {"label":"K14 (B1,C1)", "x":4.5, "y":1},
+                {"label":"K15 (B1,C2)", "x":5.5, "y":1},
+                {"label":"K16 (B1,C3)", "x":6.5, "y":1},
+                {"label":"K17 (B1,C4)", "x":7.5, "y":1},
+                {"label":"K18 (B1,C5)", "x":8.5, "y":1},
+                {"label":"K19 (B1,C6)", "x":9.5, "y":1},
+                {"label":"K1A (B1,C7)", "x":10.5, "y":1},
+                {"label":"K1B (B1,D0)", "x":11.5, "y":1},
+                {"label":"K1C (B1,D1)", "x":12.5, "y":1},
+                {"label":"K1E (B1,D3)", "x":15, "y":1},
+                {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75},
+                {"label":"K21 (B2,B6)", "x":1.75, "y":2},
+                {"label":"K22 (B2,B7)", "x":2.75, "y":2},
+                {"label":"K23 (B2,C0)", "x":3.75, "y":2},
+                {"label":"K24 (B2,C1)", "x":4.75, "y":2},
+                {"label":"K25 (B2,C2)", "x":5.75, "y":2},
+                {"label":"K26 (B2,C3)", "x":6.75, "y":2},
+                {"label":"K27 (B2,C4)", "x":7.75, "y":2},
+                {"label":"K28 (B2,C5)", "x":8.75, "y":2},
+                {"label":"K29 (B2,C6)", "x":9.75, "y":2},
+                {"label":"K2A (B2,C7)", "x":10.75, "y":2},
+                {"label":"K2B (B2,D0)", "x":11.75, "y":2},
+                {"label":"K2C (B2,D1)", "x":12.75, "y":2},
+                {"label":"K2D (B2,D2)", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"K2E (B2,D3)", "x":15, "y":2},
+                {"label":"K30 (B3,B5)", "x":0, "y":3, "w":1.25},
+                {"label":"K31 (B3,B6)", "x":1.25, "y":3},
+                {"label":"K32 (B3,B7)", "x":2.25, "y":3},
+                {"label":"K33 (B3,C0)", "x":3.25, "y":3},
+                {"label":"K34 (B3,C1)", "x":4.25, "y":3},
+                {"label":"K35 (B3,C2)", "x":5.25, "y":3},
+                {"label":"K36 (B3,C3)", "x":6.25, "y":3},
+                {"label":"K37 (B3,C4)", "x":7.25, "y":3},
+                {"label":"K38 (B3,C5)", "x":8.25, "y":3},
+                {"label":"K39 (B3,C6)", "x":9.25, "y":3},
+                {"label":"K3A (B3,C7)", "x":10.25, "y":3},
+                {"label":"K3B (B3,D0)", "x":11.25, "y":3},
+                {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75},
+                {"label":"K3D (B3,D2)", "x":14, "y":3},
+                {"label":"K3E (B3,D3)", "x":15, "y":3},
+                {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.25},
+                {"label":"K41 (B4,B6)", "x":1.25, "y":4, "w":1.25},
+                {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.25},
+                {"label":"K46 (B4,C3)", "x":3.75, "y":4, "w":6.25},
+                {"label":"K4A (B4,C7)", "x":10, "y":4, "w":1.25},
+                {"label":"K4B (B4,D0)", "x":11.25, "y":4, "w":1.25},
+                {"label":"K4C (B4,D1)", "x":13, "y":4},
+                {"label":"K4D (B4,D2)", "x":14, "y":4},
+                {"label":"K4E (B4,D3)", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/default/keymap.c b/keyboards/mechlovin/kay65/rev1/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1607eee4fd
--- /dev/null
+++ b/keyboards/mechlovin/kay65/rev1/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/*
+Copyright 2021 Mechlovin'
+
+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 my_keycodes {
+  LOGO_LED_ON = USER00,
+  LOGO_LED_OFF = USER01
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case LOGO_LED_ON:
+        if (record->event.pressed) {
+             writePinHigh(D7);	
+        } 
+        break;
+    case LOGO_LED_OFF:
+        if (record->event.pressed) {
+             writePinLow(D7);	
+        } 
+        break;
+  }
+    return true;
+};
+
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/default/readme.md b/keyboards/mechlovin/kay65/rev1/keymaps/default/readme.md
new file mode 100644
index 0000000000..95a00bd46c
--- /dev/null
+++ b/keyboards/mechlovin/kay65/rev1/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Kay65
\ No newline at end of file
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/via/keymap.c b/keyboards/mechlovin/kay65/rev1/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c2bdbf219f
--- /dev/null
+++ b/keyboards/mechlovin/kay65/rev1/keymaps/via/keymap.c
@@ -0,0 +1,72 @@
+/*
+Copyright 2021 Mechlovin'
+
+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 my_keycodes {
+  LOGO_LED_ON = USER00,
+  LOGO_LED_OFF = USER01
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        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_PGDN,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,          KC_UP,   KC_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case LOGO_LED_ON:
+        if (record->event.pressed) {
+             writePinHigh(D7);	
+        } 
+        break;
+    case LOGO_LED_OFF:
+        if (record->event.pressed) {
+             writePinLow(D7);	
+        } 
+        break;
+  }
+    return true;
+};
\ No newline at end of file
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/via/readme.md b/keyboards/mechlovin/kay65/rev1/keymaps/via/readme.md
new file mode 100644
index 0000000000..9a13f95f0d
--- /dev/null
+++ b/keyboards/mechlovin/kay65/rev1/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for Kay65
\ No newline at end of file
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/via/rules.mk b/keyboards/mechlovin/kay65/rev1/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/mechlovin/kay65/rev1/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/mechlovin/kay65/rev1/readme.md b/keyboards/mechlovin/kay65/rev1/readme.md
new file mode 100644
index 0000000000..dfa454d370
--- /dev/null
+++ b/keyboards/mechlovin/kay65/rev1/readme.md
@@ -0,0 +1,27 @@
+# Kay65
+
+![Kay65](https://i.imgur.com/tuu6w1Ul.png)
+
+A 65% PCB with centered USB, RGB underglow and top right LED.
+
+* Keyboard Maintainer: [Mechlovin' Studio](https://github.com/mechlovin)
+* Hardware Supported: Kay65 Rev.1, Atmega32u4
+* Hardware Availability: [Mechlovin' Store](https://mechlovin.studio/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechlovin/kay65/rev1:default
+
+Flashing example for this keyboard:
+
+    make mechlovin/kay65/rev1:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/mechlovin/kay65/rev1/rev1.c b/keyboards/mechlovin/kay65/rev1/rev1.c
new file mode 100644
index 0000000000..bc894a96e1
--- /dev/null
+++ b/keyboards/mechlovin/kay65/rev1/rev1.c
@@ -0,0 +1,25 @@
+/*
+Copyright 2021 Mechlovin'
+
+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 "rev1.h"
+
+void keyboard_pre_init_user(void) {
+  // Call the keyboard pre init code.
+
+  // Set our LED pins as output
+  setPinOutput(D7);
+}
\ No newline at end of file
diff --git a/keyboards/mechlovin/kay65/rev1/rev1.h b/keyboards/mechlovin/kay65/rev1/rev1.h
new file mode 100644
index 0000000000..7da2a74969
--- /dev/null
+++ b/keyboards/mechlovin/kay65/rev1/rev1.h
@@ -0,0 +1,62 @@
+/*
+Copyright 2021 Mechlovin'
+
+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, K0A, K0B, K0C, K0D, K1D, K0E,   \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C,      K1E,   \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,           K2D, K2E,   \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3D, K3E,   \
+    K40, K41, K42,                K46,                K4A, K4B,      K4C, K4D, K4E    \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
+    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
+}
+
+#define LAYOUT_65_ansi_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E,   \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D,      K2E,   \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,   \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E    \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
+    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
+    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
+}
+
+#define LAYOUT_65_iso_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,   \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      K1E,   \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,   \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,   \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K4E    \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   KC_NO, K1E   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
+    { K40,   K41,   K42,   KC_NO, KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }, \
+}
diff --git a/keyboards/mechlovin/kay65/rev1/rules.mk b/keyboards/mechlovin/kay65/rev1/rules.mk
new file mode 100644
index 0000000000..a9dd139c6b
--- /dev/null
+++ b/keyboards/mechlovin/kay65/rev1/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 65_ansi_blocker 65_iso_blocker
diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/config.h
index 66826aafa4..f1c40cb365 100644
--- a/keyboards/mechlovin/olly/jf/config.h
+++ b/keyboards/mechlovin/olly/jf/config.h
@@ -72,3 +72,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 14
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/config.h b/keyboards/mechlovin/olly/jf/keymaps/via/config.h
index 82c2e51eb9..01d7e4bc38 100644
--- a/keyboards/mechlovin/olly/jf/keymaps/via/config.h
+++ b/keyboards/mechlovin/olly/jf/keymaps/via/config.h
@@ -17,4 +17,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
+
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c b/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
index 18ac685abc..947b3b0d35 100644
--- a/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
@@ -32,12 +32,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
     ),
-    [2] = LAYOUT_all(
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-        KC_TRNS,  KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
-    ),
+
 };
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/readme.md b/keyboards/mechlovin/olly/jf/readme.md
index b45498f849..6a6bbc415a 100644
--- a/keyboards/mechlovin/olly/jf/readme.md
+++ b/keyboards/mechlovin/olly/jf/readme.md
@@ -18,6 +18,7 @@ Flashing example for this keyboard:
 
 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).
 
-**Reset Key:** 2 ways to put the Olly JF into bootloader:
+**Reset Key:** 3 ways to put the Olly JF into bootloader:
 By keycode: Tap RESET keycode.
-By bootloader: hold ESC key while plugging in
\ No newline at end of file
+By Bootloader: hold ESC key while plugging in (jump to bootloader)
+By Bootmagic: hold Insert key while pluging in (jump to bootloader and reset EEPROM)
\ No newline at end of file

From 04826d1aa175c5aeb808ae9af8d90d164532f199 Mon Sep 17 00:00:00 2001
From: evanmcook <42785294+evanmcook@users.noreply.github.com>
Date: Mon, 14 Mar 2022 21:56:27 -0400
Subject: [PATCH 821/867] [Keyboard] evancookaudio sleepingdinosaur v2 (#16625)

---
 .../evancookaudio/sleepingdinosaur/config.h   |  4 +-
 .../sleepingdinosaur/keymaps/via/keymap.c     | 61 +++++++++++++++++++
 .../sleepingdinosaur/keymaps/via/rules.mk     |  1 +
 .../evancookaudio/sleepingdinosaur/rules.mk   |  4 +-
 4 files changed, 66 insertions(+), 4 deletions(-)
 create mode 100644 keyboards/evancookaudio/sleepingdinosaur/keymaps/via/keymap.c
 create mode 100644 keyboards/evancookaudio/sleepingdinosaur/keymaps/via/rules.mk

diff --git a/keyboards/evancookaudio/sleepingdinosaur/config.h b/keyboards/evancookaudio/sleepingdinosaur/config.h
index 4412e9eb60..c03ce94c1e 100644
--- a/keyboards/evancookaudio/sleepingdinosaur/config.h
+++ b/keyboards/evancookaudio/sleepingdinosaur/config.h
@@ -37,8 +37,8 @@
 
 /* key matrix pins */
 
-#define MATRIX_ROW_PINS {D0, D1, D4, C6, D7}
-#define MATRIX_COL_PINS {F4, F5, F6, F7, B1, B3}
+#define MATRIX_ROW_PINS {D1, D0, D4, C6, D7}
+#define MATRIX_COL_PINS {B3, B1, F7, F6, F5, F4}
 
 #define UNUSED_PINS {B2, B6, B7, D5, C7, F1, F0, B4, E6}
 
diff --git a/keyboards/evancookaudio/sleepingdinosaur/keymaps/via/keymap.c b/keyboards/evancookaudio/sleepingdinosaur/keymaps/via/keymap.c
new file mode 100644
index 0000000000..250f3bee7c
--- /dev/null
+++ b/keyboards/evancookaudio/sleepingdinosaur/keymaps/via/keymap.c
@@ -0,0 +1,61 @@
+/* Copyright 2022 evan cook <evan@evancook.audio>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* LAYER 0
+ * ,-----------------------------------------------.
+ * |   1   |   2   |   3   |   4   |   5   |   -   |
+ * |-------+-------+-------|-------|-------|-------|
+ * |   6   |   7   |   8   |   9   |   0   |   R   |
+ * |-------+-------+-------|-------|-------|-------|
+ * | LT(/) |   Q   |   W   |   E   |   U   |   V   |
+ *  -------+-------+-------|-------|-------|-------|
+ * | ENTER |   A   |   S   |   D   | SPACE |   O   |
+ * |       |-------+-------+-------|       |-------|
+ * |       |   Z   |   X   |   C   |       |   N   |
+ * ,-----------------------------------------------.
+ */
+LAYOUT(
+  KC_1,       KC_2,      KC_3,      KC_4,      KC_5,      KC_MINS,
+  KC_6,       KC_7,      KC_8,      KC_9,      KC_0,      KC_R,
+  LT(1,KC_SLSH), KC_Q,   KC_W,      KC_E,      KC_U,      KC_V,
+  KC_ENT,     KC_A,      KC_S,      KC_D,      KC_SPC,    KC_O,
+              KC_Z,      KC_X,      KC_C,                 KC_N     
+)
+LAYOUT(
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+              KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS   
+)
+LAYOUT(
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+              KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS   
+)
+LAYOUT(
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+              KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS   
+)
+};
diff --git a/keyboards/evancookaudio/sleepingdinosaur/keymaps/via/rules.mk b/keyboards/evancookaudio/sleepingdinosaur/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/evancookaudio/sleepingdinosaur/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/evancookaudio/sleepingdinosaur/rules.mk b/keyboards/evancookaudio/sleepingdinosaur/rules.mk
index 6cf6d9358b..94d6846c6c 100644
--- a/keyboards/evancookaudio/sleepingdinosaur/rules.mk
+++ b/keyboards/evancookaudio/sleepingdinosaur/rules.mk
@@ -7,9 +7,9 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
+EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = no            # Enable N-Key Rollover

From 5e5047f071e7fad23104df76c47f059ce47bad84 Mon Sep 17 00:00:00 2001
From: Pear <93159069+WestMProducts@users.noreply.github.com>
Date: Mon, 14 Mar 2022 20:55:33 -0700
Subject: [PATCH 822/867] [Keyboard westm68 rev1 and fine tune westm boards
 (#16528)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/westm/westm68/config.h      | 24 ++++---------------
 keyboards/westm/westm68/halconf.h     |  1 -
 keyboards/westm/westm68/rev1/config.h | 34 +++++++++++++++++++++++++++
 keyboards/westm/westm68/rev1/rev1.c   | 22 +++++++++++++++++
 keyboards/westm/westm68/rev1/rev1.h   | 17 ++++++++++++++
 keyboards/westm/westm68/rev1/rules.mk |  0
 keyboards/westm/westm68/westm68.c     |  3 +--
 keyboards/westm/westmergo/westmergo.c |  2 +-
 8 files changed, 80 insertions(+), 23 deletions(-)
 create mode 100644 keyboards/westm/westm68/rev1/config.h
 create mode 100644 keyboards/westm/westm68/rev1/rev1.c
 create mode 100644 keyboards/westm/westm68/rev1/rev1.h
 create mode 100644 keyboards/westm/westm68/rev1/rules.mk

diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h
index ceecbb914c..42e3eeb5a4 100644
--- a/keyboards/westm/westm68/config.h
+++ b/keyboards/westm/westm68/config.h
@@ -16,10 +16,13 @@
 
 #pragma once
 
+#include "config_common.h"
+
+/* Ensure we jump to bootloader if the RESET keycode was pressed */
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x574D // WM
-#define PRODUCT_ID      0x0001 
-#define DEVICE_VER      0x0001 // Revision prototype
 #define MANUFACTURER    WestM
 #define PRODUCT         WestM68
 
@@ -31,23 +34,6 @@
 #define MATRIX_COL_PINS { B14, B13, B12, B11, B10, B2, B1, B8, B7, B6, B5, B4, B3, A15, A14 }
 #define DIODE_DIRECTION COL2ROW
 
-#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
-#define RGBLIGHT_EFFECT_TWINKLE
-// The pin connected to the data pin of the LEDs
-#define RGB_DI_PIN A8
-#define RGBLED_NUM 19
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE    5
 
diff --git a/keyboards/westm/westm68/halconf.h b/keyboards/westm/westm68/halconf.h
index a73f08fb6d..a0a9318360 100644
--- a/keyboards/westm/westm68/halconf.h
+++ b/keyboards/westm/westm68/halconf.h
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #pragma once
 
 #define HAL_USE_PWM TRUE
diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h
new file mode 100644
index 0000000000..0e43d98613
--- /dev/null
+++ b/keyboards/westm/westm68/rev1/config.h
@@ -0,0 +1,34 @@
+/* Copyright 2021 WestM
+ *
+ * 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 PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0001
+
+// The pin connected to the data pin of the LEDs
+#define RGB_DI_PIN A8
+#define RGBLED_NUM 16
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
\ No newline at end of file
diff --git a/keyboards/westm/westm68/rev1/rev1.c b/keyboards/westm/westm68/rev1/rev1.c
new file mode 100644
index 0000000000..d198c1447a
--- /dev/null
+++ b/keyboards/westm/westm68/rev1/rev1.c
@@ -0,0 +1,22 @@
+/* Copyright 2021 WestM
+ *
+ * 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 "rev1.h"
+
+void board_init(void) {
+    rgblight_toggle(); // Fixes if LEDs were off in the first place buggy LED turns on
+    rgblight_set(); // Need this to fix buggy first LED upon plugging in PCB
+}
\ No newline at end of file
diff --git a/keyboards/westm/westm68/rev1/rev1.h b/keyboards/westm/westm68/rev1/rev1.h
new file mode 100644
index 0000000000..e30df949a9
--- /dev/null
+++ b/keyboards/westm/westm68/rev1/rev1.h
@@ -0,0 +1,17 @@
+/* Copyright 2021 WestM
+ *
+ * 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 "westm68.h"
\ No newline at end of file
diff --git a/keyboards/westm/westm68/rev1/rules.mk b/keyboards/westm/westm68/rev1/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/westm/westm68/westm68.c b/keyboards/westm/westm68/westm68.c
index f5ec496247..e30df949a9 100644
--- a/keyboards/westm/westm68/westm68.c
+++ b/keyboards/westm/westm68/westm68.c
@@ -14,5 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "westm68.h"
+#include "westm68.h"
\ No newline at end of file
diff --git a/keyboards/westm/westmergo/westmergo.c b/keyboards/westm/westmergo/westmergo.c
index d78a8f9d4e..18055d3789 100644
--- a/keyboards/westm/westmergo/westmergo.c
+++ b/keyboards/westm/westmergo/westmergo.c
@@ -14,4 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "westmergo.h"
+#include "westmergo.h"
\ No newline at end of file

From 36ddb567cc21944b6bdc76807ca08c3b44978dc5 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 14 Mar 2022 22:00:57 -0600
Subject: [PATCH 823/867] [Keyboard] Fix mechlovin/kay65 (#16653)

---
 keyboards/mechlovin/kay65/{rev1 => }/config.h               | 0
 keyboards/mechlovin/kay65/{rev1 => }/info.json              | 0
 keyboards/mechlovin/kay65/{rev1/rev1.c => kay65.c}          | 4 ++--
 keyboards/mechlovin/kay65/{rev1/rev1.h => kay65.h}          | 0
 .../mechlovin/kay65/{rev1 => }/keymaps/default/keymap.c     | 6 +++---
 .../mechlovin/kay65/{rev1 => }/keymaps/default/readme.md    | 0
 keyboards/mechlovin/kay65/{rev1 => }/keymaps/via/keymap.c   | 4 ++--
 keyboards/mechlovin/kay65/{rev1 => }/keymaps/via/readme.md  | 0
 keyboards/mechlovin/kay65/{rev1 => }/keymaps/via/rules.mk   | 0
 keyboards/mechlovin/kay65/{rev1 => }/readme.md              | 4 ++--
 keyboards/mechlovin/kay65/{rev1 => }/rules.mk               | 0
 11 files changed, 9 insertions(+), 9 deletions(-)
 rename keyboards/mechlovin/kay65/{rev1 => }/config.h (100%)
 rename keyboards/mechlovin/kay65/{rev1 => }/info.json (100%)
 rename keyboards/mechlovin/kay65/{rev1/rev1.c => kay65.c} (97%)
 rename keyboards/mechlovin/kay65/{rev1/rev1.h => kay65.h} (100%)
 rename keyboards/mechlovin/kay65/{rev1 => }/keymaps/default/keymap.c (96%)
 rename keyboards/mechlovin/kay65/{rev1 => }/keymaps/default/readme.md (100%)
 rename keyboards/mechlovin/kay65/{rev1 => }/keymaps/via/keymap.c (99%)
 rename keyboards/mechlovin/kay65/{rev1 => }/keymaps/via/readme.md (100%)
 rename keyboards/mechlovin/kay65/{rev1 => }/keymaps/via/rules.mk (100%)
 rename keyboards/mechlovin/kay65/{rev1 => }/readme.md (92%)
 rename keyboards/mechlovin/kay65/{rev1 => }/rules.mk (100%)

diff --git a/keyboards/mechlovin/kay65/rev1/config.h b/keyboards/mechlovin/kay65/config.h
similarity index 100%
rename from keyboards/mechlovin/kay65/rev1/config.h
rename to keyboards/mechlovin/kay65/config.h
diff --git a/keyboards/mechlovin/kay65/rev1/info.json b/keyboards/mechlovin/kay65/info.json
similarity index 100%
rename from keyboards/mechlovin/kay65/rev1/info.json
rename to keyboards/mechlovin/kay65/info.json
diff --git a/keyboards/mechlovin/kay65/rev1/rev1.c b/keyboards/mechlovin/kay65/kay65.c
similarity index 97%
rename from keyboards/mechlovin/kay65/rev1/rev1.c
rename to keyboards/mechlovin/kay65/kay65.c
index bc894a96e1..abc6a7f8d4 100644
--- a/keyboards/mechlovin/kay65/rev1/rev1.c
+++ b/keyboards/mechlovin/kay65/kay65.c
@@ -15,11 +15,11 @@ 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 "rev1.h"
+#include "kay65.h"
 
 void keyboard_pre_init_user(void) {
   // Call the keyboard pre init code.
 
   // Set our LED pins as output
   setPinOutput(D7);
-}
\ No newline at end of file
+}
diff --git a/keyboards/mechlovin/kay65/rev1/rev1.h b/keyboards/mechlovin/kay65/kay65.h
similarity index 100%
rename from keyboards/mechlovin/kay65/rev1/rev1.h
rename to keyboards/mechlovin/kay65/kay65.h
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/default/keymap.c b/keyboards/mechlovin/kay65/keymaps/default/keymap.c
similarity index 96%
rename from keyboards/mechlovin/kay65/rev1/keymaps/default/keymap.c
rename to keyboards/mechlovin/kay65/keymaps/default/keymap.c
index 1607eee4fd..cc7cdc44fa 100644
--- a/keyboards/mechlovin/kay65/rev1/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/kay65/keymaps/default/keymap.c
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 
 enum my_keycodes {
-  LOGO_LED_ON = USER00,
-  LOGO_LED_OFF = USER01
+  LOGO_LED_ON = SAFE_RANGE,
+  LOGO_LED_OFF
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -47,6 +47,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         } 
         break;
   }
-    return true;
+  return true;
 };
 
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/default/readme.md b/keyboards/mechlovin/kay65/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mechlovin/kay65/rev1/keymaps/default/readme.md
rename to keyboards/mechlovin/kay65/keymaps/default/readme.md
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/via/keymap.c b/keyboards/mechlovin/kay65/keymaps/via/keymap.c
similarity index 99%
rename from keyboards/mechlovin/kay65/rev1/keymaps/via/keymap.c
rename to keyboards/mechlovin/kay65/keymaps/via/keymap.c
index c2bdbf219f..02e1b8578d 100644
--- a/keyboards/mechlovin/kay65/rev1/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/kay65/keymaps/via/keymap.c
@@ -68,5 +68,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         } 
         break;
   }
-    return true;
-};
\ No newline at end of file
+  return true;
+};
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/via/readme.md b/keyboards/mechlovin/kay65/keymaps/via/readme.md
similarity index 100%
rename from keyboards/mechlovin/kay65/rev1/keymaps/via/readme.md
rename to keyboards/mechlovin/kay65/keymaps/via/readme.md
diff --git a/keyboards/mechlovin/kay65/rev1/keymaps/via/rules.mk b/keyboards/mechlovin/kay65/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mechlovin/kay65/rev1/keymaps/via/rules.mk
rename to keyboards/mechlovin/kay65/keymaps/via/rules.mk
diff --git a/keyboards/mechlovin/kay65/rev1/readme.md b/keyboards/mechlovin/kay65/readme.md
similarity index 92%
rename from keyboards/mechlovin/kay65/rev1/readme.md
rename to keyboards/mechlovin/kay65/readme.md
index dfa454d370..768ce12aa7 100644
--- a/keyboards/mechlovin/kay65/rev1/readme.md
+++ b/keyboards/mechlovin/kay65/readme.md
@@ -10,11 +10,11 @@ A 65% PCB with centered USB, RGB underglow and top right LED.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mechlovin/kay65/rev1:default
+    make mechlovin/kay65:default
 
 Flashing example for this keyboard:
 
-    make mechlovin/kay65/rev1:default:flash
+    make mechlovin/kay65:default:flash
 
 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).
 
diff --git a/keyboards/mechlovin/kay65/rev1/rules.mk b/keyboards/mechlovin/kay65/rules.mk
similarity index 100%
rename from keyboards/mechlovin/kay65/rev1/rules.mk
rename to keyboards/mechlovin/kay65/rules.mk

From 1ef4e305e3a6f1f46235831b4eb06c4a200651b5 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Mon, 14 Mar 2022 22:02:49 -0600
Subject: [PATCH 824/867] Fix evancookaudio/sleepingdinosaur (#16654)

---
 .../evancookaudio/sleepingdinosaur/config.h   |  4 +-
 .../sleepingdinosaur/keymaps/via/keymap.c     | 59 +++++++++----------
 2 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/keyboards/evancookaudio/sleepingdinosaur/config.h b/keyboards/evancookaudio/sleepingdinosaur/config.h
index c03ce94c1e..ca1bdbf1c2 100644
--- a/keyboards/evancookaudio/sleepingdinosaur/config.h
+++ b/keyboards/evancookaudio/sleepingdinosaur/config.h
@@ -39,6 +39,4 @@
 
 #define MATRIX_ROW_PINS {D1, D0, D4, C6, D7}
 #define MATRIX_COL_PINS {B3, B1, F7, F6, F5, F4}
-
-#define UNUSED_PINS {B2, B6, B7, D5, C7, F1, F0, B4, E6}
-
+#define UNUSED_PINS
diff --git a/keyboards/evancookaudio/sleepingdinosaur/keymaps/via/keymap.c b/keyboards/evancookaudio/sleepingdinosaur/keymaps/via/keymap.c
index 250f3bee7c..53edbf1321 100644
--- a/keyboards/evancookaudio/sleepingdinosaur/keymaps/via/keymap.c
+++ b/keyboards/evancookaudio/sleepingdinosaur/keymaps/via/keymap.c
@@ -15,8 +15,6 @@
 */
 #include QMK_KEYBOARD_H
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
 /* LAYER 0
  * ,-----------------------------------------------.
  * |   1   |   2   |   3   |   4   |   5   |   -   |
@@ -30,32 +28,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |       |   Z   |   X   |   C   |       |   N   |
  * ,-----------------------------------------------.
  */
-LAYOUT(
-  KC_1,       KC_2,      KC_3,      KC_4,      KC_5,      KC_MINS,
-  KC_6,       KC_7,      KC_8,      KC_9,      KC_0,      KC_R,
-  LT(1,KC_SLSH), KC_Q,   KC_W,      KC_E,      KC_U,      KC_V,
-  KC_ENT,     KC_A,      KC_S,      KC_D,      KC_SPC,    KC_O,
-              KC_Z,      KC_X,      KC_C,                 KC_N     
-)
-LAYOUT(
-  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-              KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS   
-)
-LAYOUT(
-  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-              KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS   
-)
-LAYOUT(
-  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-  KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
-              KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS   
-)
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_1,       KC_2,      KC_3,      KC_4,      KC_5,      KC_MINS,
+    KC_6,       KC_7,      KC_8,      KC_9,      KC_0,      KC_R,
+    LT(1,KC_SLSH), KC_Q,   KC_W,      KC_E,      KC_U,      KC_V,
+    KC_ENT,     KC_A,      KC_S,      KC_D,      KC_SPC,    KC_O,
+                KC_Z,      KC_X,      KC_C,                 KC_N     
+  ),
+  [1] = LAYOUT(
+    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+                KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS   
+  ),
+  [2] = LAYOUT(
+    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+                KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS   
+  ),
+  [3] = LAYOUT(
+    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+                KC_TRNS,   KC_TRNS,   KC_TRNS,              KC_TRNS   
+  )
 };

From 87bb1a3890dd203f4e0fbf8a68455e1ecd25fd0e Mon Sep 17 00:00:00 2001
From: thompson-ele <ele.thompson12@gmail.com>
Date: Tue, 15 Mar 2022 00:28:21 -0700
Subject: [PATCH 825/867] [Keyboard] Add Bacca70 keyboard (#16626)

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
---
 keyboards/bacca70/bacca70.c                   |  17 ++
 keyboards/bacca70/bacca70.h                   |  65 +++++++
 keyboards/bacca70/chconf.h                    |  25 +++
 keyboards/bacca70/config.h                    |  49 +++++
 keyboards/bacca70/info.json                   | 170 ++++++++++++++++++
 .../bacca70/keymaps/debaccabean/keymap.c      |  40 +++++
 .../bacca70/keymaps/dede-special/keymap.c     |  74 ++++++++
 keyboards/bacca70/keymaps/default/keymap.c    |  38 ++++
 keyboards/bacca70/keymaps/via/keymap.c        |  56 ++++++
 keyboards/bacca70/keymaps/via/rules.mk        |   1 +
 keyboards/bacca70/readme.md                   |  23 +++
 keyboards/bacca70/rules.mk                    |  18 ++
 12 files changed, 576 insertions(+)
 create mode 100644 keyboards/bacca70/bacca70.c
 create mode 100644 keyboards/bacca70/bacca70.h
 create mode 100644 keyboards/bacca70/chconf.h
 create mode 100644 keyboards/bacca70/config.h
 create mode 100644 keyboards/bacca70/info.json
 create mode 100644 keyboards/bacca70/keymaps/debaccabean/keymap.c
 create mode 100644 keyboards/bacca70/keymaps/dede-special/keymap.c
 create mode 100644 keyboards/bacca70/keymaps/default/keymap.c
 create mode 100644 keyboards/bacca70/keymaps/via/keymap.c
 create mode 100644 keyboards/bacca70/keymaps/via/rules.mk
 create mode 100644 keyboards/bacca70/readme.md
 create mode 100644 keyboards/bacca70/rules.mk

diff --git a/keyboards/bacca70/bacca70.c b/keyboards/bacca70/bacca70.c
new file mode 100644
index 0000000000..174b4d97e7
--- /dev/null
+++ b/keyboards/bacca70/bacca70.c
@@ -0,0 +1,17 @@
+/* Copyright 2022 keebnewb
+ *
+ * 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 "bacca70.h"
diff --git a/keyboards/bacca70/bacca70.h b/keyboards/bacca70/bacca70.h
new file mode 100644
index 0000000000..0583fd8043
--- /dev/null
+++ b/keyboards/bacca70/bacca70.h
@@ -0,0 +1,65 @@
+/* Copyright 2022 keebnewb
+ *
+ * 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 ___ KC_NO
+
+#define LAYOUT_default( \
+    k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,  \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k67,  \
+    k80, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k96, k87,  \
+    ka0, ka1, ka3, kb5, ka7 \
+){ \
+    { k00, k01, k02, k03, k04, k05, k06, ___ }, \
+    { ___, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
+    { k30, k31, k32, k33, k34, k35, k36, ___ }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
+    { k50, k51, k52, k53, k54, k55, ___, ___ }, \
+    { k60, k61, k62, k63, k64, k65, ___, k67 }, \
+    { k70, k71, k72, k73, k74, k75, ___, ___ }, \
+    { k80, k81, k82, k83, k84, k85, ___, k87 }, \
+    { ___, k91, k92, k93, k94, k95, k96, ___ }, \
+    { ka0, ka1, ___, ka3, ___, ___, ___, ka7 }, \
+    { ___, ___, ___, ___, ___, kb5, ___, ___ }  \
+}
+
+#define LAYOUT_debaccabean( \
+    k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,  \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47,  \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67,  \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87,  \
+    ka0, ka1, ka2, ka3, ka4, kb5, ka7 \
+){ \
+    { k00, k01, k02, k03, k04, k05, k06, ___ }, \
+    { ___, k11, k12, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
+    { k30, k31, k32, k33, k34, k35, k36, ___ }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
+    { k50, k51, k52, k53, k54, k55, k56, ___ }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
+    { k70, k71, k72, k73, k74, k75, k76, ___ }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87 }, \
+    { k90, k91, k92, k93, k94, k95, k96, ___ }, \
+    { ka0, ka1, ka2, ka3, ka4, ___, ___, ka7 }, \
+    { ___, ___, ___, ___, ___, kb5, ___, ___ }  \
+}
diff --git a/keyboards/bacca70/chconf.h b/keyboards/bacca70/chconf.h
new file mode 100644
index 0000000000..9fee9bb49d
--- /dev/null
+++ b/keyboards/bacca70/chconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2022 keebnewb
+ *
+ * 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 CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_OPTIMIZE_SPEED FALSE
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
diff --git a/keyboards/bacca70/config.h b/keyboards/bacca70/config.h
new file mode 100644
index 0000000000..703baaaf3a
--- /dev/null
+++ b/keyboards/bacca70/config.h
@@ -0,0 +1,49 @@
+/*
+Copyright 2022 keebnewb
+
+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       0xBACA
+#define PRODUCT_ID      0x6970
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Viktus Design LLC
+#define PRODUCT         Bacca70
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 8
+
+//                         0   1   2   3   4   5   6   7   8    9   A    B
+#define MATRIX_ROW_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, A9, A10 }
+#define MATRIX_COL_PINS { A0, A1, A2, B12, B13, B14, B15, A8 }
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+
diff --git a/keyboards/bacca70/info.json b/keyboards/bacca70/info.json
new file mode 100644
index 0000000000..ddc2f894ac
--- /dev/null
+++ b/keyboards/bacca70/info.json
@@ -0,0 +1,170 @@
+{
+    "keyboard_name": "Bacca70",
+    "url": "https://3dkeebs.com/",
+    "maintainer": "keebnewb",
+    "layouts": {
+        "LAYOUT_default": {
+          "layout": [
+            {"x":0, "y":0},
+            {"x":1.25, "y":0},
+            {"x":2.25, "y":0},
+            {"x":3.25, "y":0},
+            {"x":4.25, "y":0},
+            {"x":5.5, "y":0},
+            {"x":6.5, "y":0},
+            {"x":7.5, "y":0},
+            {"x":8.5, "y":0},
+            {"x":9.75, "y":0},
+            {"x":10.75, "y":0},
+            {"x":11.75, "y":0},
+            {"x":12.75, "y":0},
+            {"x":14, "y":0},
+            {"x":0, "y":1.25},
+            {"x":1, "y":1.25},
+            {"x":2, "y":1.25},
+            {"x":3, "y":1.25},
+            {"x":4, "y":1.25},
+            {"x":5, "y":1.25},
+            {"x":6, "y":1.25},
+            {"x":7, "y":1.25},
+            {"x":8, "y":1.25},
+            {"x":9, "y":1.25},
+            {"x":10, "y":1.25},
+            {"x":11, "y":1.25},
+            {"x":12, "y":1.25},
+            {"x":13, "y":1.25},
+            {"x":14, "y":1.25},
+            {"x":0, "y":2.25, "w":1.5},
+            {"x":1.5, "y":2.25},
+            {"x":2.5, "y":2.25},
+            {"x":3.5, "y":2.25},
+            {"x":4.5, "y":2.25},
+            {"x":5.5, "y":2.25},
+            {"x":6.5, "y":2.25},
+            {"x":7.5, "y":2.25},
+            {"x":8.5, "y":2.25},
+            {"x":9.5, "y":2.25},
+            {"x":10.5, "y":2.25},
+            {"x":11.5, "y":2.25},
+            {"x":12.5, "y":2.25},
+            {"x":13.5, "y":2.25, "w":1.5},
+            {"x":0, "y":3.25, "w":1.75},
+            {"x":1.75, "y":3.25},
+            {"x":2.75, "y":3.25},
+            {"x":3.75, "y":3.25},
+            {"x":4.75, "y":3.25},
+            {"x":5.75, "y":3.25},
+            {"x":6.75, "y":3.25},
+            {"x":7.75, "y":3.25},
+            {"x":8.75, "y":3.25},
+            {"x":9.75, "y":3.25},
+            {"x":10.75, "y":3.25},
+            {"x":11.75, "y":3.25},
+            {"x":12.75, "y":3.25, "w":2.25},
+            {"x":0, "y":4.25, "w":2.25},
+            {"x":2.25, "y":4.25},
+            {"x":3.25, "y":4.25},
+            {"x":4.25, "y":4.25},
+            {"x":5.25, "y":4.25},
+            {"x":6.25, "y":4.25},
+            {"x":7.25, "y":4.25},
+            {"x":8.25, "y":4.25},
+            {"x":9.25, "y":4.25},
+            {"x":10.25, "y":4.25},
+            {"x":11.25, "y":4.25},
+            {"x":12.25, "y":4.25, "w":1.75},
+            {"x":14, "y":4.25},
+            {"x":0, "y":5.25, "w":1.5},
+            {"x":2.5, "y":5.25, "w":1.5},
+            {"x":4, "y":5.25, "w":7},
+            {"x":11, "y":5.25, "w":1.5},
+            {"x":13.5, "y":5.25, "w":1.5}
+          ]
+        },
+        "LAYOUT_debaccabean": {
+          "layout": [
+            {"x":0, "y":0},
+            {"x":1.25, "y":0},
+            {"x":2.25, "y":0},
+            {"x":3.25, "y":0},
+            {"x":4.25, "y":0},
+            {"x":5.5, "y":0},
+            {"x":6.5, "y":0},
+            {"x":7.5, "y":0},
+            {"x":8.5, "y":0},
+            {"x":9.75, "y":0},
+            {"x":10.75, "y":0},
+            {"x":11.75, "y":0},
+            {"x":12.75, "y":0},
+            {"x":14, "y":0},
+            {"x":0, "y":1.25},
+            {"x":1, "y":1.25},
+            {"x":2, "y":1.25},
+            {"x":3, "y":1.25},
+            {"x":4, "y":1.25},
+            {"x":5, "y":1.25},
+            {"x":6, "y":1.25},
+            {"x":7, "y":1.25},
+            {"x":8, "y":1.25},
+            {"x":9, "y":1.25},
+            {"x":10, "y":1.25},
+            {"x":11, "y":1.25},
+            {"x":12, "y":1.25},
+            {"x":13, "y":1.25},
+            {"x":14, "y":1.25},
+            {"x":0, "y":2.25},
+            {"x":1, "y":2.25},
+            {"x":2, "y":2.25},
+            {"x":3, "y":2.25},
+            {"x":4, "y":2.25},
+            {"x":5, "y":2.25},
+            {"x":6, "y":2.25},
+            {"x":7, "y":2.25},
+            {"x":8, "y":2.25},
+            {"x":9, "y":2.25},
+            {"x":10, "y":2.25},
+            {"x":11, "y":2.25},
+            {"x":12, "y":2.25},
+            {"x":13, "y":2.25},
+            {"x":14, "y":2.25},
+            {"x":0, "y":3.25},
+            {"x":1, "y":3.25},
+            {"x":2, "y":3.25},
+            {"x":3, "y":3.25},
+            {"x":4, "y":3.25},
+            {"x":5, "y":3.25},
+            {"x":6, "y":3.25},
+            {"x":7, "y":3.25},
+            {"x":8, "y":3.25},
+            {"x":9, "y":3.25},
+            {"x":10, "y":3.25},
+            {"x":11, "y":3.25},
+            {"x":12, "y":3.25},
+            {"x":13, "y":3.25},
+            {"x":14, "y":3.25},
+            {"x":0, "y":4.25},
+            {"x":1, "y":4.25},
+            {"x":2, "y":4.25},
+            {"x":3, "y":4.25},
+            {"x":4, "y":4.25},
+            {"x":5, "y":4.25},
+            {"x":6, "y":4.25},
+            {"x":7, "y":4.25},
+            {"x":8, "y":4.25},
+            {"x":9, "y":4.25},
+            {"x":10, "y":4.25},
+            {"x":11, "y":4.25},
+            {"x":12, "y":4.25},
+            {"x":13, "y":4.25},
+            {"x":14, "y":4.25},
+            {"x":0, "y":5.25, "w":1.5},
+            {"x":2.5, "y":5.25, "w":1.5},
+            {"x":4, "y":5.25, "w":3},
+            {"x":7, "y":5.25},
+            {"x":8, "y":5.25, "w":3},
+            {"x":11, "y":5.25, "w":1.5},
+            {"x":13.5, "y":5.25, "w":1.5}
+          ]
+        }
+      }
+}
diff --git a/keyboards/bacca70/keymaps/debaccabean/keymap.c b/keyboards/bacca70/keymaps/debaccabean/keymap.c
new file mode 100644
index 0000000000..66e3ec0b5f
--- /dev/null
+++ b/keyboards/bacca70/keymaps/debaccabean/keymap.c
@@ -0,0 +1,40 @@
+/*
+Copyright 2022 keebnewb
+
+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
+
+#define CAP_GUI MT(MOD_LGUI, KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_debaccabean(
+        KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_DEL,
+        KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_LBRC,KC_INS, KC_RBRC,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_P7,  KC_P8,  KC_P9,  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSLS,
+        CAP_GUI,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_P4,  KC_P5,  KC_P6,  KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
+        KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_P1,  KC_P2,  KC_P3,  KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_ENT,
+        KC_LCTL,        KC_LALT,                                KC_SPC, KC_SPC, KC_SPC,                 MO(1),          KC_RCTL
+    ),
+
+    [1] = LAYOUT_debaccabean(
+        RESET,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,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_INS, KC_UP,  KC_PGUP,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_MPLY,KC_MUTE,KC_VOLD,KC_VOLU,KC_MPRV,KC_MNXT,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,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_HOME,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                                KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,        KC_TRNS
+    )
+};
diff --git a/keyboards/bacca70/keymaps/dede-special/keymap.c b/keyboards/bacca70/keymaps/dede-special/keymap.c
new file mode 100644
index 0000000000..1c7514e81b
--- /dev/null
+++ b/keyboards/bacca70/keymaps/dede-special/keymap.c
@@ -0,0 +1,74 @@
+/*
+Copyright 2022 keebnewb
+
+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
+
+// Windows mods
+#define GRV_CTL MT(MOD_LCTL, KC_GRV)
+#define BLS_CTL MT(MOD_RCTL, KC_BSLS)
+#define TAB_ALT MT(MOD_LALT, KC_TAB)
+
+// MacOS mods
+#define GRV_GUI MT(MOD_LGUI, KC_GRV)
+#define BLS_GUI MT(MOD_RGUI, KC_BSLS)
+#define TAB_CTL MT(MOD_LCTL, KC_TAB)
+
+// mod tap bracket shifts
+#define LBR_SFT MT(MOD_LSFT, KC_LBRC)
+#define RBR_SFT MT(MOD_RSFT, KC_RBRC)
+
+// Arrow/TenKey/Media Keys/Reset hold with Backspace tap
+#define BSPC_LR LT(3, KC_BSPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_debaccabean(
+        KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_F13,
+        KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_LBRC,KC_GRV, KC_RBRC,KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_DEL,
+        KC_ESC, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_P7,  KC_P8,  KC_P9,  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_ENT,
+        TAB_ALT,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_P4,  KC_P5,  KC_P6,  KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
+        LBR_SFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_P1,  KC_P2,  KC_P3,  KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,RBR_SFT,
+        KC_LGUI,        GRV_CTL,                                BSPC_LR,MO(2),  KC_SPC,                 BLS_CTL,        KC_RGUI
+    ),
+
+    // MacOS layer
+    [1] = LAYOUT_debaccabean(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        TAB_CTL,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_LALT,        GRV_GUI,                                KC_TRNS,KC_TRNS,KC_TRNS,                BLS_GUI,        KC_RALT
+    ),
+
+    [2] = LAYOUT_debaccabean(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_UNDS,KC_EXLM,KC_AT,  KC_HASH,KC_DLR, KC_DLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_PLUS,
+        KC_MINS,KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_TRNS,KC_TRNS,KC_TRNS,KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_EQL,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                                KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,        KC_TRNS
+    ),
+
+    [3] = LAYOUT_debaccabean(
+        RESET,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,TG(1),
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_TRNS,KC_TRNS,
+        KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_UP,  KC_PGUP,KC_TRNS,KC_TRNS,
+        KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_MNXT,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_TRNS,
+        KC_MPLY,KC_MUTE,KC_VOLD,KC_VOLU,KC_MPRV,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_HOME,KC_END, KC_PGDN,KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                                KC_TRNS,KC_TRNS,KC_TRNS,                KC_TRNS,        KC_TRNS
+    )
+};
diff --git a/keyboards/bacca70/keymaps/default/keymap.c b/keyboards/bacca70/keymaps/default/keymap.c
new file mode 100644
index 0000000000..65f1252ba6
--- /dev/null
+++ b/keyboards/bacca70/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/*
+Copyright 2022 keebnewb
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_default(
+        KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_DEL,
+        KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSLS,KC_BSPC,
+        KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,
+        KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        KC_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_RSFT,
+        KC_LCTL,        KC_LALT,                KC_SPC,                                         MO(1),          KC_RCTL
+    ),
+
+    [1] = LAYOUT_default(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                KC_TRNS,                                        RESET,          KC_TRNS
+    )
+};
diff --git a/keyboards/bacca70/keymaps/via/keymap.c b/keyboards/bacca70/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a4a74b7252
--- /dev/null
+++ b/keyboards/bacca70/keymaps/via/keymap.c
@@ -0,0 +1,56 @@
+/*
+Copyright 2022 keebnewb
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_default(
+        KC_ESC, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_DEL,
+        KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSLS,KC_BSPC,
+        KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSLS,
+        KC_CAPS,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,        KC_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_RSFT,
+        KC_LCTL,        KC_LALT,                KC_SPC,                                         MO(1),          KC_RCTL
+    ),
+
+    [1]=LAYOUT_default(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                KC_TRNS,                                        RESET,          KC_TRNS
+    ),
+
+    [2] = LAYOUT_default(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                KC_TRNS,                                        RESET,          KC_TRNS
+    ),
+
+    [3] = LAYOUT_default(
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS,KC_TRNS,
+        KC_TRNS,        KC_TRNS,                KC_TRNS,                                        RESET,          KC_TRNS
+    )
+};
diff --git a/keyboards/bacca70/keymaps/via/rules.mk b/keyboards/bacca70/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/bacca70/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/bacca70/readme.md b/keyboards/bacca70/readme.md
new file mode 100644
index 0000000000..2141138b8f
--- /dev/null
+++ b/keyboards/bacca70/readme.md
@@ -0,0 +1,23 @@
+# Bacca70
+
+![Bacca70](https://imgur.com/TQMALjwh.png)
+
+The Bacca70 is a winkeyless (WKL) 60% layout that includes a F-row. It's classy, hefty and it was designed by Chewwy (of MechsOnDeck) and BlindAssassin.
+
+* Keyboard Maintainer: [keebnewb](https://github.com/thompson-ele)  
+* Hardware Supported: Bacca70 PCB and the ortholinear variant the DeBaccaBean PCB
+* Hardware Availability: [3DKeebs](https://3dkeebs.com/)
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the top left key (Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB. The button is next to the MCU.
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available. For the default keymap it is on the right alt key on the second layer.
+
+## Make example for this keyboard (after setting up your build environment):
+
+    make bacca70: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).
diff --git a/keyboards/bacca70/rules.mk b/keyboards/bacca70/rules.mk
new file mode 100644
index 0000000000..a0b213f847
--- /dev/null
+++ b/keyboards/bacca70/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = STM32F072
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 92a9e7c50b8577e76f2bee9719b344af0e639494 Mon Sep 17 00:00:00 2001
From: PaperCraneKeyboards
 <96899643+PaperCraneKeyboards@users.noreply.github.com>
Date: Tue, 15 Mar 2022 01:29:35 -0700
Subject: [PATCH 826/867] [Keyboard] Adding Gerald65 (#15872)

* Gerald65 new keyboard files

* removing initial population of pck

* Initial Gerald65 Keyboard files

* Changed diode direction

* added fn layer, added picture to readme

* directed mo keycode to fn layer

* Changes to vendor id and bootloader instructions

* Changed to direct image reference

* Update keyboards/papercranekeyboards/gerald65/readme.md

* Remove no longer used features
---
 .../papercranekeyboards/gerald65/config.h     | 130 ++++++++++++++++++
 .../papercranekeyboards/gerald65/gerald65.c   |   4 +
 .../papercranekeyboards/gerald65/gerald65.h   |  29 ++++
 .../papercranekeyboards/gerald65/info.json    |  78 +++++++++++
 .../gerald65/keymaps/default/keymap.c         |  29 ++++
 .../gerald65/keymaps/default/readme.md        |   1 +
 .../papercranekeyboards/gerald65/readme.md    |  27 ++++
 .../papercranekeyboards/gerald65/rules.mk     |  18 +++
 8 files changed, 316 insertions(+)
 create mode 100644 keyboards/papercranekeyboards/gerald65/config.h
 create mode 100644 keyboards/papercranekeyboards/gerald65/gerald65.c
 create mode 100644 keyboards/papercranekeyboards/gerald65/gerald65.h
 create mode 100644 keyboards/papercranekeyboards/gerald65/info.json
 create mode 100644 keyboards/papercranekeyboards/gerald65/keymaps/default/keymap.c
 create mode 100644 keyboards/papercranekeyboards/gerald65/keymaps/default/readme.md
 create mode 100644 keyboards/papercranekeyboards/gerald65/readme.md
 create mode 100644 keyboards/papercranekeyboards/gerald65/rules.mk

diff --git a/keyboards/papercranekeyboards/gerald65/config.h b/keyboards/papercranekeyboards/gerald65/config.h
new file mode 100644
index 0000000000..9e795b1501
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/config.h
@@ -0,0 +1,130 @@
+// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x5012 // 
+#define PRODUCT_ID   0x1501 // '21 keyboard 1
+#define DEVICE_VER   0x0001
+#define MANUFACTURER PaperCraneKeyboards
+#define PRODUCT      gerald65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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, D6, E6, B4, B5 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, D7, D4, D3, D2, D1, D0, B6, C6, C7 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose 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
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/papercranekeyboards/gerald65/gerald65.c b/keyboards/papercranekeyboards/gerald65/gerald65.c
new file mode 100644
index 0000000000..a33f05d8dc
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/gerald65.c
@@ -0,0 +1,4 @@
+// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "gerald65.h"
diff --git a/keyboards/papercranekeyboards/gerald65/gerald65.h b/keyboards/papercranekeyboards/gerald65/gerald65.h
new file mode 100644
index 0000000000..b433051bb7
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/gerald65.h
@@ -0,0 +1,29 @@
+// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT( \
+    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,   k36, k37, k38, k39, k40, k41, k42,      k43, \
+    k44, k45, k46, k47, k48, k49,   k50, k51, k52, k53, k54, k55,      k56, k57, \
+    k58,      k59, k60,      k61,   k62,      k63,                k64, k65, k66  \
+) { \
+    {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,   k36, k37,   k38, k39,   k40,   k41,   k42, KC_NO, k43}, \
+    {k44, k45,   k46, k47, k48,   k49,   k50, k51,   k52, k53,   k54,   k55,   KC_NO, k56, k57}, \
+    {k58, KC_NO, k59, k60, KC_NO, k61,   k62, KC_NO, k63, KC_NO, KC_NO, KC_NO, k64,   k65, k66} \
+}
diff --git a/keyboards/papercranekeyboards/gerald65/info.json b/keyboards/papercranekeyboards/gerald65/info.json
new file mode 100644
index 0000000000..c9b08304b3
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "gerald65",
+    "url": "",
+    "maintainer": "PaperCraneKeyboards",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"~", "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":8.25, "y":0}, 
+                {"label":"*", "x":9.25, "y":0}, 
+                {"label":"(", "x":10.25, "y":0}, 
+                {"label":")", "x":11.25, "y":0}, 
+                {"label":"_", "x":12.25, "y":0}, 
+                {"label":"+", "x":13.25, "y":0}, 
+                {"label":"Backspace", "x":14.25, "y":0, "w":2}, 
+                {"label":"Delete", "x":16.5, "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":7.75, "y":1}, 
+                {"label":"U", "x":8.75, "y":1}, 
+                {"label":"I", "x":9.75, "y":1}, 
+                {"label":"O", "x":10.75, "y":1}, 
+                {"label":"P", "x":11.75, "y":1}, 
+                {"label":"{", "x":12.75, "y":1}, 
+                {"label":"}", "x":13.75, "y":1}, 
+                {"label":"|", "x":14.75, "y":1, "w":1.5}, 
+                {"label":"Page Up", "x":16.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":8, "y":2}, 
+                {"label":"J", "x":9, "y":2}, 
+                {"label":"K", "x":10, "y":2}, 
+                {"label":"L", "x":11, "y":2}, 
+                {"label":":", "x":12, "y":2}, 
+                {"label":"\"", "x":13, "y":2}, 
+                {"label":"Enter", "x":14, "y":2, "w":2.25}, 
+                {"label":"Page Down", "x":16.5, "y":2}, 
+                {"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":8.5, "y":3}, 
+                {"label":"M", "x":9.5, "y":3}, 
+                {"label":"<", "x":10.5, "y":3}, 
+                {"label":">", "x":11.5, "y":3}, 
+                {"label":"?", "x":12.5, "y":3}, 
+                {"label":"Shift", "x":13.5, "y":3, "w":1.75}, 
+                {"label":"up", "x":15.5, "y":3}, 
+                {"label":"Home", "x":16.5, "y":3}, 
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25}, 
+                {"label":"Alt", "x":3.25, "y":4, "w":1.25}, 
+                {"label":"space", "x":4.5, "y":4, "w":2}, 
+                {"label":"space", "x":6.5, "y":4}, 
+                {"label":"space", "x":8.25, "y":4, "w":2.75}, 
+                {"label":"Win", "x":11, "y":4, "w":1.25}, 
+                {"label":"left", "x":14.5, "y":4}, 
+                {"label":"down", "x":15.5, "y":4}, 
+                {"label":"right", "x":16.5, "y":4}
+            ]
+        }
+    }
+}
diff --git a/keyboards/papercranekeyboards/gerald65/keymaps/default/keymap.c b/keyboards/papercranekeyboards/gerald65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b7f54ceb7c
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE, _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+        KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PAUSE,
+        KC_LCTL,       KC_LALT, KC_SPC, MO(_FN),       KC_SPC, KC_LGUI,                   KC_LEFT, KC_DOWN, KC_RGHT
+            
+    ),
+    [_FN] = LAYOUT(
+        KC_GRV,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_TRNS, RESET,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+            
+    )
+};
diff --git a/keyboards/papercranekeyboards/gerald65/keymaps/default/readme.md b/keyboards/papercranekeyboards/gerald65/keymaps/default/readme.md
new file mode 100644
index 0000000000..e548f34ac4
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for gerald65
diff --git a/keyboards/papercranekeyboards/gerald65/readme.md b/keyboards/papercranekeyboards/gerald65/readme.md
new file mode 100644
index 0000000000..2dafff9e20
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/readme.md
@@ -0,0 +1,27 @@
+# Paper Crane Keyboards Gerald65
+
+![gerald65](https://i.imgur.com/Qh9cLeEh.jpeg)
+
+A 65% ergonomic acrylic keyboard emphasizing customizability.
+
+* Keyboard Maintainer: [PaperCraneKeyboards](https://github.com/PaperCraneKeyboards)
+* Hardware Supported: Gerald65 PCB
+* Hardware Availability: [Paper Crane Keyboards](https://papercranekeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make papercranekeyboards/gerald65:default
+
+Flashing example for this keyboard:
+
+    make papercranekeyboards/gerald65:default:flash
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB (located in the center)
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available. To do this, hold down the key to the right of the left spacebar (1u key in the center of bottom row), and then also press the key in the top right (by default, the delete key).
+
+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).
diff --git a/keyboards/papercranekeyboards/gerald65/rules.mk b/keyboards/papercranekeyboards/gerald65/rules.mk
new file mode 100644
index 0000000000..1275531ef6
--- /dev/null
+++ b/keyboards/papercranekeyboards/gerald65/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 9aaf4a5a9b19f1e2a12c3f2508e2083f7ec58bec Mon Sep 17 00:00:00 2001
From: Albert Y <76888457+filterpaper@users.noreply.github.com>
Date: Tue, 15 Mar 2022 16:31:17 +0800
Subject: [PATCH 827/867] Add split keyboard example for Bootmagic Lite
 (#16349)

* Add split keyboard example for bootmagic lite

* Add handedness link

* Edit sentence structure

* Apply suggested language correction
---
 docs/feature_bootmagic.md | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/docs/feature_bootmagic.md b/docs/feature_bootmagic.md
index 6b3c7e45fd..4239cdfd2a 100644
--- a/docs/feature_bootmagic.md
+++ b/docs/feature_bootmagic.md
@@ -23,14 +23,35 @@ And to trigger the bootloader, you hold this key down when plugging the keyboard
 
 ## Split Keyboards
 
-When handedness is predetermined via an option like `SPLIT_HAND_PIN`, you might need to configure a different key between halves. To do so, add these entries to your `config.h` file:
+When [handedness](feature_split_keyboard.md#setting-handedness) is predetermined via options like `SPLIT_HAND_PIN` or `EE_HANDS`, you might need to configure a different key between halves. To identify the correct key for the right half, examine the split key matrix defined in the `<keyboard>.h` file, e.g.:
+
+```c
+#define LAYOUT_split_3x5_2( \
+        L01, L02, L03, L04, L05,   R01, R02, R03, R04, R05, \
+        L06, L07, L08, L09, L10,   R06, R07, R08, R09, R10, \
+        L11, L12, L13, L14, L15,   R11, R12, R13, R14, R15, \
+                       L16, L17,   R16, R17                 \
+    ) \
+    { \
+        { L01, L02, L03, L04, L05 }, \
+        { L06, L07, L08, L09, L10 }, \
+        { L11, L12, L13, L14, L15 }, \
+        { L16, L17, KC_NO, KC_NO, KC_NO }, \
+        { R01, R02, R03, R04, R05 }, \
+        { R06, R07, R08, R09, R10 }, \
+        { R11, R12, R13, R14, R15 }, \
+        { R16, R17, KC_NO, KC_NO, KC_NO }  \
+    }
+```
+
+If you pick the top right key for the right half, it is `R05` on the top layout. Within the key matrix below, `R05` is located on row 4 columnn 4. To use that key as the right half's Bootmagic Lite trigger, add these entries to your `config.h` file:
 
 ```c
 #define BOOTMAGIC_LITE_ROW_RIGHT 4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 1
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 4
 ```
 
-By default, these values are not set.
+?> These values are not set by default.
 
 ## Advanced Bootmagic Lite
 

From e94c2df3f3908295c824e20c0593e718c45a0f56 Mon Sep 17 00:00:00 2001
From: jpuerto96 <jpuerto96@hotmail.com>
Date: Tue, 15 Mar 2022 04:35:11 -0400
Subject: [PATCH 828/867] [Keyboard] Io mini1800 (#16115)

* First commit

* first commit

* 2x3u layout functional

* 625u layout

* rotary encoder

* Modifications to keymaps

* Remove ingrained from io_mini branch

* Update readme

* Update info.json

* change hardware availability

* Change rules.mk wording to match other PR

* Update keyboards/io_mini1800/rules.mk

* Update keyboards/io_mini1800/keymaps/default/keymap.c

* Update keyboards/io_mini1800/keymaps/2x3u/keymap.c

* Update keyboards/io_mini1800/io_mini1800.c

* Update keyboards/io_mini1800/keymaps/2x3u/readme.md

* Update keyboards/io_mini1800/readme.md
---
 keyboards/io_mini1800/config.h                | 40 ++++++++++++++
 keyboards/io_mini1800/info.json               | 24 +++++++++
 keyboards/io_mini1800/io_mini1800.c           | 18 +++++++
 keyboards/io_mini1800/io_mini1800.h           | 52 +++++++++++++++++++
 keyboards/io_mini1800/keymaps/2x3u/keymap.c   | 21 ++++++++
 keyboards/io_mini1800/keymaps/2x3u/readme.md  |  1 +
 .../io_mini1800/keymaps/default/keymap.c      | 21 ++++++++
 .../io_mini1800/keymaps/default/readme.md     |  1 +
 keyboards/io_mini1800/readme.md               | 24 +++++++++
 keyboards/io_mini1800/rules.mk                | 20 +++++++
 10 files changed, 222 insertions(+)
 create mode 100644 keyboards/io_mini1800/config.h
 create mode 100644 keyboards/io_mini1800/info.json
 create mode 100644 keyboards/io_mini1800/io_mini1800.c
 create mode 100644 keyboards/io_mini1800/io_mini1800.h
 create mode 100644 keyboards/io_mini1800/keymaps/2x3u/keymap.c
 create mode 100644 keyboards/io_mini1800/keymaps/2x3u/readme.md
 create mode 100644 keyboards/io_mini1800/keymaps/default/keymap.c
 create mode 100644 keyboards/io_mini1800/keymaps/default/readme.md
 create mode 100644 keyboards/io_mini1800/readme.md
 create mode 100644 keyboards/io_mini1800/rules.mk

diff --git a/keyboards/io_mini1800/config.h b/keyboards/io_mini1800/config.h
new file mode 100644
index 0000000000..ea7efd8ff4
--- /dev/null
+++ b/keyboards/io_mini1800/config.h
@@ -0,0 +1,40 @@
+// Copyright 2022 s8erdude (@jpuerto96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x0000
+#define DEVICE_VER   0x0001
+#define MANUFACTURER jpuerto96
+#define PRODUCT      io_mini1800
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 10
+
+/*
+ * 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 { D6, D7, B4, B5, D4, E6, B3, D2, D5, D3 }
+#define MATRIX_COL_PINS { D1, D0, B7, B2, F0, F1, F7, F6, F4, F5 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define ENCODERS_PAD_A { B0 }
+#define ENCODERS_PAD_B { B1 }
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/io_mini1800/info.json b/keyboards/io_mini1800/info.json
new file mode 100644
index 0000000000..020a776027
--- /dev/null
+++ b/keyboards/io_mini1800/info.json
@@ -0,0 +1,24 @@
+{
+    "keyboard_name": "io_mini1800",
+    "url": "https://github.com/jpuerto96",
+    "maintainer": "jpuerto96 (s8erdude)",
+    "layouts": {
+        "LAYOUT_625u": {
+            "layout": [
+                {"label":"~", "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":"Ins", "x":15.25, "y":0}, {"label":"Home", "x":16.25, "y":0}, {"label":"Num Lock", "x":17.5, "y":0}, {"label":"/", "x":18.5, "y":0}, {"label":"*", "x":19.5, "y":0}, {"label":"-", "x":20.5, "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":"End", "x":15.25, "y":1}, {"label":"Del", "x":16.25, "y":1}, {"label":"7", "x":17.5, "y":1}, {"label":"8", "x":18.5, "y":1}, {"label":"9", "x":19.5, "y":1}, {"label":"+", "x":20.5, "y":1, "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":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"4", "x":17.5, "y":2}, {"label":"5", "x":18.5, "y":2}, {"label":"6", "x":19.5, "y":2},
+                {"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":"Up", "x":15.75, "y":3.5}, {"label":"1", "x":17.5, "y":3}, {"label":"2", "x":18.5, "y":3}, {"label":"3", "x":19.5, "y":3},
+                {"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":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Win", "x":11.5, "y":4, "w":1.25}, {"label":"Fn", "x":12.75, "y":4, "w":1.25}, {"label":"Left", "x":14.75, "y":4.5}, {"label":"Down", "x":15.75, "y":4.5}, {"label":"Right", "x":16.75, "y":4.5}, {"label":"0", "x":18.5, "y":4}, {"label":".", "x":19.5, "y":4}, {"label":"Enter", "x":20.5, "y":3, "h":2}
+            ]
+        },
+        "LAYOUT_2x3u": {
+            "layout": [
+                {"label":"~", "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":"Ins", "x":15.25, "y":0}, {"label":"Home", "x":16.25, "y":0}, {"label":"Num Lock", "x":17.5, "y":0}, {"label":"/", "x":18.5, "y":0}, {"label":"*", "x":19.5, "y":0}, {"label":"-", "x":20.5, "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":"End", "x":15.25, "y":1}, {"label":"Del", "x":16.25, "y":1}, {"label":"7", "x":17.5, "y":1}, {"label":"8", "x":18.5, "y":1}, {"label":"9", "x":19.5, "y":1}, {"label":"+", "x":20.5, "y":1, "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":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"4", "x":17.5, "y":2}, {"label":"5", "x":18.5, "y":2}, {"label":"6", "x":19.5, "y":2},
+                {"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":"Up", "x":15.75, "y":3.5}, {"label":"1", "x":17.5, "y":3}, {"label":"2", "x":18.5, "y":3}, {"label":"3", "x":19.5, "y":3},
+                {"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":3}, {"x":6.75, "y":4, "w":3}, {"label":"Alt", "x":9.75, "y":4, "w":1.5}, {"label":"Win", "x":11.25, "y":4, "w":1.5}, {"label":"Fn", "x":12.75, "y":4, "w":1.25}, {"label":"Left", "x":14.75, "y":4.5}, {"label":"Down", "x":15.75, "y":4.5}, {"label":"Right", "x":16.75, "y":4.5}, {"label":"0", "x":18.5, "y":4}, {"label":".", "x":19.5, "y":4}, {"label":"Enter", "x":20.5, "y":3, "h":2}]
+        }
+    }
+}
diff --git a/keyboards/io_mini1800/io_mini1800.c b/keyboards/io_mini1800/io_mini1800.c
new file mode 100644
index 0000000000..aa500c469a
--- /dev/null
+++ b/keyboards/io_mini1800/io_mini1800.c
@@ -0,0 +1,18 @@
+// Copyright 2022 s8erdude (@jpuerto96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "io_mini1800.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/io_mini1800/io_mini1800.h b/keyboards/io_mini1800/io_mini1800.h
new file mode 100644
index 0000000000..634592d62c
--- /dev/null
+++ b/keyboards/io_mini1800/io_mini1800.h
@@ -0,0 +1,52 @@
+// Copyright 2022 s8erdude (@jpuerto96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_2x3u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k59, k58, k57, k56,   k55, k54,     k53, k52, k51, k50, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k69, k68, k67, k66,   k65, k64,     k63, k62, k61, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k79, k78, k77,                      k73, k72, k71, k70, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k89, k88,                k85,       k83, k82, k81, \
+    k40, k41, k42, k43,           k46,           k49, k99, k98,           k96, k95, k94,       k92, k91, k90 \
+) { \
+    { 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, k36, k37, k38, k39 }, \
+    { k40, k41, k42, k43, KC_NO, KC_NO, k46, KC_NO, KC_NO, k49 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
+    { KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
+    { k70, k71, k72, k73, KC_NO, KC_NO, KC_NO, k77, k78, k79 }, \
+    { KC_NO, k81, k82, k83, KC_NO, k85, KC_NO, KC_NO, k88, k89 }, \
+    { k90, k91, k92, KC_NO, k94, k95, k96, KC_NO, k98, k99 } \
+}
+
+#define LAYOUT_625u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k59, k58, k57, k56,   k55, k54,     k53, k52, k51, k50, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k69, k68, k67, k66,   k65, k64,     k63, k62, k61, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k79, k78, k77,                      k73, k72, k71, k70, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k89, k88,                k85,       k83, k82, k81, \
+    k40, k41, k42,           k45,                k49, k99, k98,           k96, k95, k94,       k92, k91, k90 \
+) { \
+    { 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, k36, k37, k38, k39 }, \
+    { k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, KC_NO, k49 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
+    { KC_NO, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
+    { k70, k71, k72, k73, KC_NO, KC_NO, KC_NO, k77, k78, k79 }, \
+    { KC_NO, k81, k82, k83, KC_NO, k85, KC_NO, KC_NO, k88, k89 }, \
+    { k90, k91, k92, KC_NO, k94, k95, k96, KC_NO, k98, k99 } \
+}
diff --git a/keyboards/io_mini1800/keymaps/2x3u/keymap.c b/keyboards/io_mini1800/keymaps/2x3u/keymap.c
new file mode 100644
index 0000000000..75e4145207
--- /dev/null
+++ b/keyboards/io_mini1800/keymaps/2x3u/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2022 s8erdude (@jpuerto96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+[_BASE] = LAYOUT_2x3u(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS, KC_HOME, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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_END, KC_DEL,  KC_P7,   KC_P8,   KC_P9,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        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_P1,   KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,                    KC_SPC,           KC_RALT, KC_RGUI, KC_RCTL,                       KC_LEFT, KC_DOWN, KC_RIGHT,    KC_P0, KC_PDOT, KC_PENT
+    )
+};
+
diff --git a/keyboards/io_mini1800/keymaps/2x3u/readme.md b/keyboards/io_mini1800/keymaps/2x3u/readme.md
new file mode 100644
index 0000000000..7e6980f5cd
--- /dev/null
+++ b/keyboards/io_mini1800/keymaps/2x3u/readme.md
@@ -0,0 +1 @@
+# The default Split Spacebar keymap for io_mini1800
diff --git a/keyboards/io_mini1800/keymaps/default/keymap.c b/keyboards/io_mini1800/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1a3573fe5f
--- /dev/null
+++ b/keyboards/io_mini1800/keymaps/default/keymap.c
@@ -0,0 +1,21 @@
+// Copyright 2022 s8erdude (@jpuerto96)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_625u(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS, KC_HOME, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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_END, KC_DEL,  KC_P7,   KC_P8,   KC_P9,
+        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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        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_P1,   KC_P2,   KC_P3,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL,                       KC_LEFT, KC_DOWN, KC_RIGHT,    KC_P0,   KC_PDOT, KC_PENT
+    )
+};
+
diff --git a/keyboards/io_mini1800/keymaps/default/readme.md b/keyboards/io_mini1800/keymaps/default/readme.md
new file mode 100644
index 0000000000..4bcc9ba512
--- /dev/null
+++ b/keyboards/io_mini1800/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for io_mini1800
diff --git a/keyboards/io_mini1800/readme.md b/keyboards/io_mini1800/readme.md
new file mode 100644
index 0000000000..c6139203bb
--- /dev/null
+++ b/keyboards/io_mini1800/readme.md
@@ -0,0 +1,24 @@
+# io_mini1800
+
+This keyboard is a mini 1800 with a minimal navigation cluster, which also offers a rotary encoder option.
+
+* Keyboard Maintainer: [s8erdude](https://github.com/jpuerto96)
+* Hardware Supported: IO-Mini 1800
+* Hardware Availability: [P3D Store](https://p3dstore.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make io_mini1800:default
+
+Flashing example for this keyboard:
+
+    make io_mini1800:default:flash
+
+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).
+
+## Bootloader
+
+To reset the board into bootloader, do one of the following:
+
+* **Hardware reset**: short the pad labeled RESET on the back, near the microcontroller
+* **Bootmagic reset**: hold down the top left key (usually programmed as Escape) while plugging in the keyboard (also resets persistent storage)
diff --git a/keyboards/io_mini1800/rules.mk b/keyboards/io_mini1800/rules.mk
new file mode 100644
index 0000000000..284ea23e78
--- /dev/null
+++ b/keyboards/io_mini1800/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+
+ENCODER_ENABLE = yes

From e9bf95e0f2de74590c57bfd64258559e4219dd1f Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Tue, 15 Mar 2022 03:35:17 -0600
Subject: [PATCH 829/867] [Keyboard] Fix westm/westm68 compliation errors
 (#16657)

---
 keyboards/westm/westm68/config.h      | 6 ++----
 keyboards/westm/westm68/rev1/config.h | 5 +----
 keyboards/westm/westm68/rev1/rules.mk | 1 +
 keyboards/westm/westm68/rules.mk      | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h
index 42e3eeb5a4..d1063583d3 100644
--- a/keyboards/westm/westm68/config.h
+++ b/keyboards/westm/westm68/config.h
@@ -23,6 +23,8 @@
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x574D // WM
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0001
 #define MANUFACTURER    WestM
 #define PRODUCT         WestM68
 
@@ -41,7 +43,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* Hold ESC key (first key of first column) to trigger bootloader */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
diff --git a/keyboards/westm/westm68/rev1/config.h b/keyboards/westm/westm68/rev1/config.h
index 0e43d98613..054b47cca2 100644
--- a/keyboards/westm/westm68/rev1/config.h
+++ b/keyboards/westm/westm68/rev1/config.h
@@ -16,9 +16,6 @@
 
 #pragma once
 
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN A8
 #define RGBLED_NUM 16
@@ -31,4 +28,4 @@
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #define RGBLIGHT_EFFECT_RGB_TEST
 #define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
\ No newline at end of file
+#define RGBLIGHT_EFFECT_TWINKLE
diff --git a/keyboards/westm/westm68/rev1/rules.mk b/keyboards/westm/westm68/rev1/rules.mk
index e69de29bb2..1e3cebb145 100644
--- a/keyboards/westm/westm68/rev1/rules.mk
+++ b/keyboards/westm/westm68/rev1/rules.mk
@@ -0,0 +1 @@
+RGBLIGHT_ENABLE = yes
diff --git a/keyboards/westm/westm68/rules.mk b/keyboards/westm/westm68/rules.mk
index 0ad5e320fb..a54cc39924 100644
--- a/keyboards/westm/westm68/rules.mk
+++ b/keyboards/westm/westm68/rules.mk
@@ -17,5 +17,5 @@ CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes           # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 46e85ded4747fb3d89f107cb098d9054ea5e632c Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 15 Mar 2022 12:49:23 +0000
Subject: [PATCH 830/867] Add merge workflow for XAP branch (#16652)

* Add merge workflow for XAP branch

* uncomment
---
 .github/workflows/develop_update.yml        |  8 -----
 .github/workflows/feature_branch_update.yml | 34 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/feature_branch_update.yml

diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml
index 285720fefe..1f5c841bff 100644
--- a/.github/workflows/develop_update.yml
+++ b/.github/workflows/develop_update.yml
@@ -5,7 +5,6 @@ on:
     branches:
     - master
 
-
 jobs:
   develop_update:
     runs-on: ubuntu-latest
@@ -22,14 +21,7 @@ jobs:
         git fetch origin master develop
         git checkout develop
 
-    - name: Check if branch locked
-      id: check_locked
-      uses: andstor/file-existence-action@v1
-      with:
-        files: ".locked"
-
     - name: Update develop from master
-      if: steps.check_locked.outputs.files_exists == 'false'
       run: |
         git config --global user.name "QMK Bot"
         git config --global user.email "hello@qmk.fm"
diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml
new file mode 100644
index 0000000000..fc7bbafd18
--- /dev/null
+++ b/.github/workflows/feature_branch_update.yml
@@ -0,0 +1,34 @@
+name: Update feature branches after develop merge
+
+on:
+  push:
+    branches:
+    - develop
+
+jobs:
+  feature_branch_update:
+    runs-on: ubuntu-latest
+
+    if: github.repository == 'qmk/qmk_firmware'
+
+    strategy:
+      matrix:
+        branch:
+        - xap
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Checkout branch
+      run: |
+        git fetch origin develop ${{ matrix.branch }}
+        git checkout ${{ matrix.branch }}
+
+    - name: Update branch from develop
+      run: |
+        git config --global user.name "QMK Bot"
+        git config --global user.email "hello@qmk.fm"
+        git merge origin/develop
+        git push origin ${{ matrix.branch }}

From 764dc18a81f762fdff5f74eb6d3b517ba79d5c11 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 16 Mar 2022 00:56:58 +1100
Subject: [PATCH 831/867] Remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION`
 from keyboard config.h (#16655)

---
 keyboards/0_sixty/config.h                              | 2 --
 keyboards/0_sixty/underglow/config.h                    | 2 --
 keyboards/0xc7/61key/config.h                           | 4 ----
 keyboards/1upkeyboards/1up60hse/config.h                | 2 --
 keyboards/1upkeyboards/super16/config.h                 | 2 --
 keyboards/1upkeyboards/super16v2/config.h               | 4 ----
 keyboards/25keys/aleth42/rev0/config.h                  | 4 ----
 keyboards/25keys/zinc/rev1/config.h                     | 2 --
 keyboards/25keys/zinc/reva/config.h                     | 2 --
 keyboards/3keyecosystem/2key2/config.h                  | 4 ----
 keyboards/3w6/rev1/config.h                             | 5 -----
 keyboards/3w6/rev2/config.h                             | 5 -----
 keyboards/40percentclub/25/config.h                     | 2 --
 keyboards/40percentclub/4pack/config.h                  | 2 --
 keyboards/40percentclub/4x4/config.h                    | 2 --
 keyboards/40percentclub/5x5/config.h                    | 2 --
 keyboards/40percentclub/6lit/config.h                   | 2 --
 keyboards/40percentclub/foobar/config.h                 | 2 --
 keyboards/40percentclub/half_n_half/config.h            | 2 --
 keyboards/40percentclub/i75/config.h                    | 2 --
 keyboards/40percentclub/mf68/config.h                   | 2 --
 keyboards/40percentclub/nein/config.h                   | 2 --
 keyboards/40percentclub/nori/config.h                   | 2 --
 keyboards/40percentclub/polyandry/config.h              | 2 --
 keyboards/abacus/config.h                               | 4 ----
 keyboards/abstract/ellipse/rev1/config.h                | 2 --
 keyboards/acekeyboard/titan60/config.h                  | 4 ----
 keyboards/acheron/arctic/config.h                       | 2 --
 keyboards/acheron/austin/config.h                       | 2 --
 keyboards/acheron/elongate/beta/config.h                | 4 ----
 keyboards/acheron/keebspcb/config.h                     | 2 --
 keyboards/acheron/lasgweloth/config.h                   | 2 --
 keyboards/acheron/shark/config.h                        | 2 --
 keyboards/ada/infinity81/config.h                       | 4 ----
 keyboards/adelheid/config.h                             | 2 --
 keyboards/adkb96/rev1/config.h                          | 2 --
 keyboards/adpenrose/kintsugi/config.h                   | 4 ----
 keyboards/afternoonlabs/breeze/config.h                 | 3 ---
 keyboards/afternoonlabs/gust/config.h                   | 3 ---
 keyboards/afternoonlabs/oceanbreeze/config.h            | 3 ---
 keyboards/afternoonlabs/southern_breeze/config.h        | 3 ---
 keyboards/afternoonlabs/summer_breeze/config.h          | 3 ---
 keyboards/ai03/equinox/config.h                         | 2 --
 keyboards/ai03/jp60/config.h                            | 4 ----
 keyboards/ai03/lunar/config.h                           | 2 --
 keyboards/ai03/orbit/config.h                           | 2 --
 keyboards/ai03/orbit_x/config.h                         | 4 ----
 keyboards/ai03/polaris/config.h                         | 2 --
 keyboards/ai03/quasar/config.h                          | 2 --
 keyboards/ai03/soyuz/config.h                           | 2 --
 keyboards/ai03/vega/config.h                            | 2 --
 keyboards/ai03/voyager60_alps/config.h                  | 2 --
 keyboards/al1/config.h                                  | 4 ----
 keyboards/aleblazer/zodiark/config.h                    | 2 --
 keyboards/alf/dc60/config.h                             | 2 --
 keyboards/alf/x11/config.h                              | 2 --
 keyboards/alpine65/config.h                             | 2 --
 keyboards/alps64/config.h                               | 2 --
 keyboards/amj40/config.h                                | 2 --
 keyboards/amj60/config.h                                | 4 ----
 keyboards/amj96/config.h                                | 2 --
 keyboards/amjkeyboard/amj84/config.h                    | 4 ----
 keyboards/amjpad/config.h                               | 2 --
 keyboards/arabica37/rev1/config.h                       | 2 --
 keyboards/arisu/config.h                                | 2 --
 keyboards/ash1800/config.h                              | 2 --
 keyboards/ashpil/modelm_usbc/config.h                   | 2 --
 keyboards/at_at/660m/config.h                           | 2 --
 keyboards/atlas_65/config.h                             | 2 --
 keyboards/atomic/config.h                               | 2 --
 keyboards/atreus/config.h                               | 2 --
 keyboards/atreus62/config.h                             | 2 --
 keyboards/atxkb/1894/config.h                           | 2 --
 keyboards/aves60/config.h                               | 4 ----
 keyboards/baguette/config.h                             | 2 --
 keyboards/bandominedoni/config.h                        | 4 ----
 keyboards/bantam44/config.h                             | 2 --
 keyboards/barleycorn_smd/config.h                       | 2 --
 keyboards/barracuda/config.h                            | 4 ----
 keyboards/bastardkb/charybdis/3x5/config.h              | 4 ----
 keyboards/bastardkb/charybdis/4x6/config.h              | 4 ----
 keyboards/bear_face/config.h                            | 2 --
 keyboards/biacco42/ergo42/rev1/config.h                 | 2 --
 keyboards/biacco42/meishi/config.h                      | 2 --
 keyboards/biacco42/meishi2/config.h                     | 2 --
 keyboards/bioi/f60/config.h                             | 4 ----
 keyboards/blank/blank01/config.h                        | 4 ----
 keyboards/blockey/config.h                              | 2 --
 keyboards/boardrun/bizarre/config.h                     | 2 --
 keyboards/boardrun/classic/config.h                     | 2 --
 keyboards/boardsource/3x4/config.h                      | 2 --
 keyboards/boardsource/4x12/config.h                     | 2 --
 keyboards/boardsource/5x12/config.h                     | 2 --
 keyboards/boardsource/beiwagon/config.h                 | 4 ----
 keyboards/boardsource/holiday/spooky/config.h           | 4 ----
 keyboards/boardsource/microdox/config.h                 | 2 --
 keyboards/boardsource/technik_o/config.h                | 4 ----
 keyboards/boardsource/technik_s/config.h                | 4 ----
 keyboards/boardsource/the_mark/config.h                 | 4 ----
 keyboards/boardwalk/config.h                            | 2 --
 keyboards/boston/config.h                               | 2 --
 keyboards/boston_meetup/2019/config.h                   | 2 --
 keyboards/boston_meetup/config.h                        | 2 --
 keyboards/box75/config.h                                | 2 --
 keyboards/bpiphany/frosty_flake/config.h                | 3 +--
 keyboards/bpiphany/hid_liber/config.h                   | 2 --
 keyboards/bpiphany/kitten_paw/config.h                  | 2 --
 keyboards/bpiphany/sixshooter/config.h                  | 2 --
 keyboards/bpiphany/tiger_lily/config.h                  | 2 --
 keyboards/bpiphany/unloved_bastard/config.h             | 2 --
 keyboards/bt66tech/bt66tech60/config.h                  | 2 --
 keyboards/bthlabs/geekpad/config.h                      | 2 --
 keyboards/buildakb/potato65/config.h                    | 4 ----
 keyboards/buildakb/potato65hs/config.h                  | 4 ----
 keyboards/buildakb/potato65s/config.h                   | 4 ----
 keyboards/caffeinated/serpent65/config.h                | 2 --
 keyboards/canary/canary60rgb/v1/config.h                | 6 +-----
 keyboards/cannonkeys/adelie/config.h                    | 4 ----
 keyboards/cannonkeys/aella/config.h                     | 2 --
 keyboards/cannonkeys/an_c/config.h                      | 2 --
 keyboards/cannonkeys/atlas/config.h                     | 2 --
 keyboards/cannonkeys/balance/config.h                   | 2 --
 keyboards/cannonkeys/chimera65/config.h                 | 2 --
 keyboards/cannonkeys/db60/config.h                      | 2 --
 keyboards/cannonkeys/devastatingtkl/config.h            | 2 --
 keyboards/cannonkeys/hoodrowg/config.h                  | 2 --
 keyboards/cannonkeys/instant60/config.h                 | 2 --
 keyboards/cannonkeys/instant65/config.h                 | 2 --
 keyboards/cannonkeys/iron165/config.h                   | 2 --
 keyboards/cannonkeys/obliterated75/config.h             | 2 --
 keyboards/cannonkeys/onyx/config.h                      | 2 --
 keyboards/cannonkeys/ortho48/config.h                   | 2 --
 keyboards/cannonkeys/ortho60/config.h                   | 2 --
 keyboards/cannonkeys/ortho75/config.h                   | 2 --
 keyboards/cannonkeys/practice60/config.h                | 2 --
 keyboards/cannonkeys/practice65/config.h                | 2 --
 keyboards/cannonkeys/rekt1800/config.h                  | 2 --
 keyboards/cannonkeys/sagittarius/config.h               | 2 --
 keyboards/cannonkeys/satisfaction75/config.h            | 2 --
 keyboards/cannonkeys/savage65/config.h                  | 2 --
 keyboards/cannonkeys/tmov2/config.h                     | 2 --
 keyboards/cannonkeys/tsukuyomi/config.h                 | 2 --
 keyboards/cannonkeys/vicious40/config.h                 | 2 --
 keyboards/capsunlocked/cu24/config.h                    | 2 --
 keyboards/capsunlocked/cu65/config.h                    | 4 ----
 keyboards/capsunlocked/cu75/config.h                    | 2 --
 keyboards/centromere/config.h                           | 2 --
 keyboards/checkerboards/plexus75/config.h               | 2 --
 keyboards/checkerboards/pursuit40/config.h              | 2 --
 keyboards/checkerboards/quark/config.h                  | 2 --
 keyboards/ck60i/config.h                                | 2 --
 keyboards/ckeys/handwire_101/config.h                   | 2 --
 keyboards/ckeys/nakey/config.h                          | 2 --
 keyboards/ckeys/obelus/config.h                         | 2 --
 keyboards/ckeys/thedora/config.h                        | 2 --
 keyboards/ckeys/washington/config.h                     | 4 ----
 keyboards/clueboard/66_hotswap/config.h                 | 1 -
 keyboards/clueboard/66_hotswap/gen1/config.h            | 2 --
 keyboards/coarse/cordillera/config.h                    | 2 --
 keyboards/contender/config.h                            | 4 ----
 keyboards/converter/a1200/miss1200/config.h             | 2 --
 keyboards/converter/a1200/teensy2pp/config.h            | 2 --
 keyboards/converter/modelm101/config.h                  | 2 --
 keyboards/converter/modelm_ssk/config.h                 | 2 --
 keyboards/converter/siemens_tastatur/config.h           | 2 --
 keyboards/cool836a/config.h                             | 4 ----
 keyboards/copenhagen_click/click_pad_v1/config.h        | 2 --
 keyboards/coseyfannitutti/discipad/config.h             | 2 --
 keyboards/coseyfannitutti/discipline/config.h           | 2 --
 keyboards/coseyfannitutti/mullet/config.h               | 3 ---
 keyboards/coseyfannitutti/mulletpad/config.h            | 3 ---
 keyboards/coseyfannitutti/mysterium/config.h            | 2 --
 keyboards/coseyfannitutti/romeo/config.h                | 2 --
 keyboards/craftwalk/config.h                            | 3 ---
 keyboards/crazy_keyboard_68/config.h                    | 4 ----
 keyboards/crkbd/config.h                                | 6 +-----
 keyboards/cutie_club/wraith/config.h                    | 2 --
 keyboards/dailycraft/bat43/config.h                     | 4 ----
 keyboards/dailycraft/claw44/config.h                    | 3 ---
 keyboards/dailycraft/claw44/rev1/config.h               | 2 --
 keyboards/dailycraft/owl8/config.h                      | 4 ----
 keyboards/dailycraft/stickey4/config.h                  | 4 ----
 keyboards/dailycraft/wings42/rev1/config.h              | 4 ----
 keyboards/dailycraft/wings42/rev1_extkeys/config.h      | 4 ----
 keyboards/dailycraft/wings42/rev2/config.h              | 4 ----
 keyboards/dc01/left/config.h                            | 2 --
 keyboards/delikeeb/flatbread60/config.h                 | 4 ----
 keyboards/delikeeb/vaguettelite/config.h                | 4 ----
 keyboards/delikeeb/vanana/rev1/config.h                 | 4 ----
 keyboards/delikeeb/vanana/rev2/config.h                 | 4 ----
 keyboards/delikeeb/vaneela/config.h                     | 4 ----
 keyboards/delikeeb/vaneelaex/config.h                   | 4 ----
 keyboards/delikeeb/waaffle/rev3/config.h                | 4 ----
 keyboards/deltapad/config.h                             | 4 ----
 keyboards/deltasplit75/v2/config.h                      | 2 --
 keyboards/demiurge/config.h                             | 4 ----
 keyboards/dichotomy/config.h                            | 2 --
 keyboards/dk60/config.h                                 | 4 ----
 keyboards/dm9records/ergoinu/config.h                   | 2 --
 keyboards/dm9records/lain/config.h                      | 4 ----
 keyboards/dm9records/plaid/config.h                     | 2 --
 keyboards/dm9records/tartan/config.h                    | 2 --
 keyboards/donutcables/scrabblepad/config.h              | 2 --
 keyboards/doppelganger/config.h                         | 2 --
 keyboards/draytronics/daisy/config.h                    | 3 ---
 keyboards/draytronics/scarlet/config.h                  | 3 ---
 keyboards/drewkeys/iskar/config.h                       | 4 ----
 keyboards/dtisaac/dosa40rgb/config.h                    | 4 ----
 keyboards/dtisaac/dtisaac01/config.h                    | 9 ---------
 keyboards/duck/jetfire/config.h                         | 2 --
 keyboards/dztech/dz60rgb/v1/config.h                    | 4 ----
 keyboards/dztech/dz60rgb/v2/config.h                    | 4 ----
 keyboards/dztech/dz60rgb/v2_1/config.h                  | 4 ----
 keyboards/dztech/dz60rgb_ansi/v1/config.h               | 4 ----
 keyboards/dztech/dz60rgb_ansi/v2/config.h               | 4 ----
 keyboards/dztech/dz60rgb_ansi/v2_1/config.h             | 4 ----
 keyboards/dztech/dz60rgb_wkl/v1/config.h                | 4 ----
 keyboards/dztech/dz60rgb_wkl/v2/config.h                | 4 ----
 keyboards/dztech/dz60rgb_wkl/v2_1/config.h              | 4 ----
 keyboards/dztech/dz64rgb/config.h                       | 4 +---
 keyboards/dztech/dz65rgb/v1/config.h                    | 4 ----
 keyboards/dztech/dz65rgb/v2/config.h                    | 4 ----
 keyboards/dztech/dz65rgb/v3/config.h                    | 4 +---
 keyboards/e88/config.h                                  | 4 ----
 keyboards/ealdin/quadrant/config.h                      | 2 --
 keyboards/earth_rover/config.h                          | 4 ----
 keyboards/eco/config.h                                  | 2 --
 keyboards/edi/hardlight/mk2/config.h                    | 2 --
 keyboards/edi/standaside/config.h                       | 3 ---
 keyboards/eek/config.h                                  | 3 ---
 keyboards/efreet/config.h                               | 4 ----
 keyboards/emajesty/eiri/config.h                        | 4 ----
 keyboards/eniigmakeyboards/ek65/config.h                | 5 -----
 keyboards/eniigmakeyboards/ek87/config.h                | 4 ----
 keyboards/ep/40/config.h                                | 2 --
 keyboards/ep/96/config.h                                | 2 --
 keyboards/ep/comsn/mollydooker/config.h                 | 2 --
 keyboards/ergodox_ez/config.h                           | 3 +--
 keyboards/ergosaurus/config.h                           | 2 --
 keyboards/ergoslab/rev1/config.h                        | 2 --
 keyboards/ergotravel/rev1/config.h                      | 2 --
 keyboards/ericrlau/numdiscipline/rev1/config.h          | 2 --
 keyboards/esca/getawayvan/config.h                      | 2 --
 keyboards/esca/getawayvan_f042/config.h                 | 2 --
 keyboards/eternal_keypad/config.h                       | 4 ----
 keyboards/evil80/config.h                               | 2 --
 keyboards/evolv/config.h                                | 2 --
 keyboards/evyd13/atom47/rev5/config.h                   | 4 ----
 keyboards/evyd13/eon40/config.h                         | 2 --
 keyboards/evyd13/eon65/config.h                         | 2 --
 keyboards/evyd13/eon75/config.h                         | 2 --
 keyboards/evyd13/eon87/config.h                         | 2 --
 keyboards/evyd13/eon95/config.h                         | 2 --
 keyboards/evyd13/gh80_1800/config.h                     | 2 --
 keyboards/evyd13/gh80_3700/config.h                     | 2 --
 keyboards/evyd13/gud70/config.h                         | 4 ----
 keyboards/evyd13/minitomic/config.h                     | 2 --
 keyboards/evyd13/mx5160/config.h                        | 2 --
 keyboards/evyd13/nt660/config.h                         | 4 ----
 keyboards/evyd13/nt750/config.h                         | 4 ----
 keyboards/evyd13/nt980/config.h                         | 4 ----
 keyboards/evyd13/omrontkl/config.h                      | 2 --
 keyboards/evyd13/pockettype/config.h                    | 2 --
 keyboards/evyd13/quackfire/config.h                     | 2 --
 keyboards/evyd13/solheim68/config.h                     | 2 --
 keyboards/evyd13/wasdat/config.h                        | 2 --
 keyboards/evyd13/wasdat_code/config.h                   | 2 --
 keyboards/exclusive/e7v1se/config.h                     | 4 ----
 keyboards/exclusive/e85/config.h                        | 4 ----
 keyboards/exent/config.h                                | 4 ----
 keyboards/eyeohdesigns/babyv/config.h                   | 4 ----
 keyboards/fc660c/config.h                               | 2 --
 keyboards/fc980c/config.h                               | 2 --
 keyboards/ffkeebs/puca/config.h                         | 5 -----
 keyboards/fjlabs/7vhotswap/config.h                     | 2 --
 keyboards/fjlabs/ad65/config.h                          | 2 --
 keyboards/fjlabs/bks65/config.h                         | 2 --
 keyboards/fjlabs/bks65solder/config.h                   | 2 --
 keyboards/fjlabs/bolsa65/config.h                       | 2 --
 keyboards/fjlabs/kf87/config.h                          | 2 --
 keyboards/fjlabs/kyuu/config.h                          | 2 --
 keyboards/fjlabs/ldk65/config.h                         | 2 --
 keyboards/fjlabs/midway60/config.h                      | 2 --
 keyboards/fjlabs/mk61rgbansi/config.h                   | 2 --
 keyboards/fjlabs/polaris/config.h                       | 2 --
 keyboards/fjlabs/ready100/config.h                      | 2 --
 keyboards/fjlabs/tf60ansi/config.h                      | 2 --
 keyboards/fjlabs/tf60v2/config.h                        | 2 --
 keyboards/fjlabs/tf65rgbv2/config.h                     | 2 --
 keyboards/flehrad/downbubble/config.h                   | 2 --
 keyboards/fleuron/config.h                              | 2 --
 keyboards/fluorite/config.h                             | 2 --
 keyboards/flxlb/zplit/config.h                          | 2 --
 keyboards/flygone60/rev3/config.h                       | 4 ----
 keyboards/foostan/cornelius/config.h                    | 4 ----
 keyboards/for_science/config.h                          | 2 --
 keyboards/forever65/config.h                            | 4 ----
 keyboards/fortitude60/rev1/config.h                     | 2 --
 keyboards/foxlab/key65/hotswap/config.h                 | 4 ----
 keyboards/foxlab/key65/universal/config.h               | 4 ----
 keyboards/foxlab/leaf60/hotswap/config.h                | 2 --
 keyboards/foxlab/leaf60/universal/config.h              | 2 --
 keyboards/foxlab/time80/config.h                        | 4 ----
 keyboards/gboards/georgi/config.h                       | 2 --
 keyboards/gh60/revc/config.h                            | 2 --
 keyboards/gh60/satan/config.h                           | 2 --
 keyboards/ghs/rar/config.h                              | 4 ----
 keyboards/gkeyboard/gkb_m16/config.h                    | 4 ----
 keyboards/glenpickle/chimera_ergo/config.h              | 2 --
 keyboards/glenpickle/chimera_ls/config.h                | 2 --
 keyboards/glenpickle/chimera_ortho/config.h             | 2 --
 keyboards/glenpickle/chimera_ortho_plus/config.h        | 2 --
 keyboards/gray_studio/space65/config.h                  | 2 --
 keyboards/hadron/config.h                               | 2 --
 keyboards/hadron/ver3/config.h                          | 2 --
 keyboards/halfcliff/config.h                            | 4 ----
 keyboards/han60/config.h                                | 4 ----
 keyboards/handwired/412_64/config.h                     | 3 ---
 keyboards/handwired/amigopunk/config.h                  | 4 ----
 keyboards/handwired/aranck/config.h                     | 2 --
 keyboards/handwired/arrow_pad/config.h                  | 2 --
 keyboards/handwired/atreus50/config.h                   | 2 --
 keyboards/handwired/baredev/rev1/config.h               | 5 -----
 keyboards/handwired/bolek/config.h                      | 4 ----
 keyboards/handwired/brain/config.h                      | 2 --
 keyboards/handwired/bstk100/config.h                    | 4 ----
 keyboards/handwired/ck4x4/config.h                      | 3 ---
 keyboards/handwired/cmd60/config.h                      | 2 --
 keyboards/handwired/co60/rev1/config.h                  | 2 --
 keyboards/handwired/dactyl_left/config.h                | 2 --
 keyboards/handwired/dactyl_promicro/config.h            | 2 --
 keyboards/handwired/dactyl_rah/config.h                 | 6 ------
 keyboards/handwired/dc/mc/001/config.h                  | 4 ----
 keyboards/handwired/elrgo_s/config.h                    | 2 --
 keyboards/handwired/ergocheap/config.h                  | 2 --
 keyboards/handwired/evk/v1_3/config.h                   | 2 --
 keyboards/handwired/fc200rt_qmk/config.h                | 4 ----
 keyboards/handwired/fivethirteen/config.h               | 2 --
 keyboards/handwired/floorboard/config.h                 | 4 ----
 keyboards/handwired/frankie_macropad/config.h           | 4 ----
 keyboards/handwired/frenchdev/config.h                  | 3 +--
 keyboards/handwired/gamenum/config.h                    | 2 --
 keyboards/handwired/hacked_motospeed/config.h           | 2 --
 keyboards/handwired/heisenberg/config.h                 | 2 --
 keyboards/handwired/hnah108/config.h                    | 4 ----
 keyboards/handwired/hnah40/config.h                     | 2 --
 keyboards/handwired/ibm122m/config.h                    | 2 --
 keyboards/handwired/jtallbean/split_65/config.h         | 4 ----
 keyboards/handwired/juliet/config.h                     | 3 ---
 keyboards/handwired/kbod/config.h                       | 2 --
 keyboards/handwired/ks63/config.h                       | 2 --
 keyboards/handwired/leftynumpad/config.h                | 4 ----
 keyboards/handwired/lemonpad/config.h                   | 4 ----
 keyboards/handwired/macroboard/config.h                 | 4 ----
 keyboards/handwired/magicforce61/config.h               | 2 --
 keyboards/handwired/magicforce68/config.h               | 2 --
 keyboards/handwired/mechboards_micropad/config.h        | 2 --
 keyboards/handwired/meck_tkl/config.h                   | 4 ----
 keyboards/handwired/minorca/config.h                    | 3 ---
 keyboards/handwired/ms_sculpt_mobile/config.h           | 2 --
 keyboards/handwired/nicekey/config.h                    | 2 --
 keyboards/handwired/not_so_minidox/config.h             | 2 --
 keyboards/handwired/numpad20/config.h                   | 2 --
 keyboards/handwired/obuwunkunubi/spaget/config.h        | 2 --
 keyboards/handwired/oem_ansi_fullsize/config.h          | 4 ----
 keyboards/handwired/onekey/config.h                     | 4 ----
 keyboards/handwired/ortho5x13/config.h                  | 2 --
 keyboards/handwired/ortho5x14/config.h                  | 3 ---
 keyboards/handwired/owlet60/config.h                    | 2 --
 keyboards/handwired/pilcrow/config.h                    | 2 --
 keyboards/handwired/promethium/config.h                 | 2 --
 keyboards/handwired/reddot/config.h                     | 2 --
 keyboards/handwired/retro_refit/config.h                | 2 --
 keyboards/handwired/sick68/config.h                     | 4 ----
 keyboards/handwired/snatchpad/config.h                  | 4 ----
 keyboards/handwired/sono1/config.h                      | 6 +-----
 keyboards/handwired/split65/promicro/config.h           | 2 --
 keyboards/handwired/split65/stm32/config.h              | 2 --
 keyboards/handwired/split89/config.h                    | 4 ----
 keyboards/handwired/splittest/config.h                  | 2 --
 keyboards/handwired/sticc14/config.h                    | 2 --
 keyboards/handwired/symmetric70_proto/promicro/config.h | 4 ----
 keyboards/handwired/symmetric70_proto/proton_c/config.h | 4 ----
 keyboards/handwired/t111/config.h                       | 4 ----
 keyboards/handwired/tennie/config.h                     | 2 --
 keyboards/handwired/terminus_mini/config.h              | 2 --
 keyboards/handwired/tractyl_manuform/4x6_right/config.h | 2 --
 keyboards/handwired/tractyl_manuform/5x6_right/config.h | 2 --
 keyboards/handwired/tractyl_manuform/config.h           | 2 --
 keyboards/handwired/traveller/config.h                  | 4 ----
 keyboards/handwired/tritium_numpad/config.h             | 3 ---
 keyboards/handwired/twadlee/tp69/config.h               | 4 ----
 keyboards/handwired/unk/rev1/config.h                   | 2 --
 keyboards/handwired/uthol/rev3/config.h                 | 4 ----
 keyboards/handwired/videowriter/config.h                | 4 ----
 keyboards/handwired/woodpad/config.h                    | 4 ----
 keyboards/handwired/xealous/rev1/config.h               | 3 +--
 keyboards/handwired/z150/config.h                       | 4 ----
 keyboards/helix/pico/config.h                           | 2 --
 keyboards/helix/rev2/config.h                           | 3 ---
 keyboards/helix/rev3_4rows/config.h                     | 4 ----
 keyboards/helix/rev3_5rows/config.h                     | 4 ----
 keyboards/hhkb/ansi/config.h                            | 2 --
 keyboards/hhkb/jp/config.h                              | 2 --
 keyboards/hineybush/h08_ocelot/config.h                 | 4 ----
 keyboards/hineybush/h10/config.h                        | 4 ----
 keyboards/hineybush/h60/config.h                        | 4 ----
 keyboards/hineybush/h65/config.h                        | 4 ----
 keyboards/hineybush/h65_hotswap/config.h                | 4 ----
 keyboards/hineybush/h660s/config.h                      | 4 ----
 keyboards/hineybush/h75_singa/config.h                  | 2 --
 keyboards/hineybush/physix/config.h                     | 4 ----
 keyboards/hineybush/sm68/config.h                       | 2 --
 keyboards/hnahkb/freyr/config.h                         | 4 ----
 keyboards/hnahkb/stella/config.h                        | 4 ----
 keyboards/hnahkb/vn66/config.h                          | 4 ----
 keyboards/honeycomb/config.h                            | 2 --
 keyboards/horizon/config.h                              | 4 ----
 keyboards/hotdox/config.h                               | 3 +--
 keyboards/hub20/config.h                                | 4 ----
 keyboards/ianklug/grooveboard/config.h                  | 4 ----
 keyboards/ibnuda/gurindam/config.h                      | 2 --
 keyboards/ibnuda/squiggle/config.h                      | 5 -----
 keyboards/idb/idb_60/config.h                           | 2 --
 keyboards/idobao/id75/v1/config.h                       | 2 --
 keyboards/idobao/id75/v2/config.h                       | 2 --
 keyboards/idobao/id87/v2/config.h                       | 4 ----
 keyboards/illuminati/is0/config.h                       | 2 --
 keyboards/illusion/rosa/config.h                        | 6 +-----
 keyboards/ilumkb/primus75/config.h                      | 3 ---
 keyboards/ilumkb/simpler61/config.h                     | 4 ----
 keyboards/ilumkb/simpler64/config.h                     | 4 ----
 keyboards/input_club/ergodox_infinity/config.h          | 2 --
 keyboards/input_club/infinity60/config.h                | 2 --
 keyboards/input_club/k_type/config.h                    | 4 ----
 keyboards/input_club/whitefox/config.h                  | 4 ----
 keyboards/irene/config.h                                | 4 ----
 keyboards/iriskeyboards/config.h                        | 4 ----
 keyboards/j80/config.h                                  | 4 ----
 keyboards/jacky_studio/s7_elephant/rev2/config.h        | 4 ----
 keyboards/jadookb/jkb65/config.h                        | 3 ---
 keyboards/jae/j01/config.h                              | 4 ----
 keyboards/jagdpietr/drakon/config.h                     | 4 ----
 keyboards/jc65/v32a/config.h                            | 3 ---
 keyboards/jd45/config.h                                 | 2 --
 keyboards/jm60/config.h                                 | 4 ----
 keyboards/jones/v03/config.h                            | 4 ----
 keyboards/jones/v03_1/config.h                          | 4 ----
 keyboards/jones/v1/config.h                             | 4 ----
 keyboards/kagizaraya/chidori/config.h                   | 2 --
 keyboards/kagizaraya/halberd/config.h                   | 2 --
 keyboards/kagizaraya/scythe/config.h                    | 2 --
 keyboards/kakunpc/angel17/alpha/config.h                | 2 --
 keyboards/kakunpc/angel17/rev1/config.h                 | 2 --
 keyboards/kakunpc/angel64/alpha/config.h                | 2 --
 keyboards/kakunpc/angel64/rev1/config.h                 | 2 --
 keyboards/kakunpc/business_card/alpha/config.h          | 2 --
 keyboards/kakunpc/business_card/beta/config.h           | 2 --
 keyboards/kakunpc/choc_taro/config.h                    | 4 ----
 keyboards/kakunpc/rabbit_capture_plan/config.h          | 4 ----
 keyboards/kakunpc/suihankey/alpha/config.h              | 2 --
 keyboards/kakunpc/suihankey/rev1/config.h               | 2 --
 keyboards/kakunpc/suihankey/split/alpha/config.h        | 2 --
 keyboards/kakunpc/suihankey/split/rev1/config.h         | 2 --
 keyboards/kakunpc/thedogkeyboard/config.h               | 2 --
 keyboards/kapcave/arya/config.h                         | 2 --
 keyboards/kb58/config.h                                 | 4 ----
 keyboards/kb_elmo/isolation/config.h                    | 4 ----
 keyboards/kb_elmo/vertex/config.h                       | 4 ----
 keyboards/kbdclack/kaishi65/config.h                    | 4 ----
 keyboards/kbdfans/bella/rgb/config.h                    | 1 -
 keyboards/kbdfans/bella/rgb_iso/config.h                | 1 -
 keyboards/kbdfans/boop65/rgb/config.h                   | 3 ---
 keyboards/kbdfans/kbd19x/config.h                       | 3 ---
 keyboards/kbdfans/kbd4x/config.h                        | 3 ---
 keyboards/kbdfans/kbd66/config.h                        | 2 --
 keyboards/kbdfans/kbd67/hotswap/config.h                | 2 --
 keyboards/kbdfans/kbd67/mkiirgb/v3/config.h             | 4 +---
 keyboards/kbdfans/kbd67/mkiirgb/v4/config.h             | 4 +---
 keyboards/kbdfans/kbd67/mkiirgb_iso/config.h            | 4 +---
 keyboards/kbdfans/kbd67/rev1/config.h                   | 2 --
 keyboards/kbdfans/kbd6x/config.h                        | 3 ---
 keyboards/kbdfans/kbd75hs/config.h                      | 3 ---
 keyboards/kbdfans/kbd75rgb/config.h                     | 4 +---
 keyboards/kbdfans/kbd8x/config.h                        | 2 --
 keyboards/kbdfans/kbd8x_mk2/config.h                    | 2 --
 keyboards/kbdfans/kbdmini/config.h                      | 4 ----
 keyboards/kbdfans/kbdpad/mk2/config.h                   | 2 --
 keyboards/kbdfans/niu_mini/config.h                     | 2 --
 keyboards/kbdfans/odin/soldered/config.h                | 3 +--
 keyboards/kc60/config.h                                 | 4 ----
 keyboards/kc60se/config.h                               | 2 --
 keyboards/keebio/bfo9000/config.h                       | 2 --
 keyboards/keebio/bigswitchseat/config.h                 | 4 ----
 keyboards/keebio/choconum/config.h                      | 4 ----
 keyboards/keebio/ergodicity/config.h                    | 2 --
 keyboards/keebio/fourier/config.h                       | 2 --
 keyboards/keebio/nyquist/rev1/config.h                  | 2 --
 keyboards/keebio/nyquist/rev2/config.h                  | 2 --
 keyboards/keebio/nyquist/rev3/config.h                  | 2 --
 keyboards/keebsforall/coarse60/config.h                 | 3 ---
 keyboards/keebsforall/freebird60/config.h               | 4 ----
 keyboards/keebsforall/freebirdtkl/config.h              | 3 ---
 keyboards/keebwerk/nano_slider/config.h                 | 4 ----
 keyboards/keebzdotnet/wazowski/config.h                 | 4 ----
 keyboards/keybage/radpad/config.h                       | 4 ----
 keyboards/keybee/keybee65/config.h                      | 3 ---
 keyboards/keyboardio/atreus/config.h                    | 2 --
 keyboards/keycapsss/o4l_5x12/config.h                   | 4 ----
 keyboards/keyhive/maypad/config.h                       | 2 --
 keyboards/keyprez/bison/config.h                        | 4 ----
 keyboards/keyprez/corgi/config.h                        | 4 ----
 keyboards/keyprez/rhino/config.h                        | 4 ----
 keyboards/keyprez/unicorn/config.h                      | 4 ----
 keyboards/kikkou/config.h                               | 4 ----
 keyboards/kindakeyboards/conone65/config.h              | 4 ----
 keyboards/kinesis/config.h                              | 2 --
 keyboards/kira75/config.h                               | 2 --
 keyboards/kiwikeebs/macro/config.h                      | 4 ----
 keyboards/kiwikeebs/macro_v2/config.h                   | 4 ----
 keyboards/kiwikey/borderland/config.h                   | 4 ----
 keyboards/kiwikey/kawii9/config.h                       | 4 ----
 keyboards/kiwikey/wanderland/config.h                   | 4 ----
 keyboards/kkatano/bakeneko60/config.h                   | 4 ----
 keyboards/kkatano/bakeneko65/rev2/config.h              | 4 ----
 keyboards/kkatano/bakeneko65/rev3/config.h              | 4 ----
 keyboards/kkatano/bakeneko80/config.h                   | 4 ----
 keyboards/kkatano/wallaby/config.h                      | 4 ----
 keyboards/kkatano/yurei/config.h                        | 4 ----
 keyboards/kmac/config.h                                 | 2 --
 keyboards/kmac_pad/config.h                             | 2 --
 keyboards/knops/mini/config.h                           | 2 --
 keyboards/kona_classic/config.h                         | 2 --
 keyboards/kopibeng/xt65/config.h                        | 2 --
 keyboards/kprepublic/bm16a/config.h                     | 2 --
 keyboards/kprepublic/bm60hsrgb/rev2/config.h            | 3 ---
 keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h        | 3 ---
 keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h      | 3 ---
 keyboards/kprepublic/bm65hsrgb/rev1/config.h            | 4 ----
 keyboards/kprepublic/bm68hsrgb/rev1/config.h            | 4 ----
 keyboards/kprepublic/bm68hsrgb/rev2/config.h            | 4 +---
 keyboards/kprepublic/bm80hsrgb/config.h                 | 4 ----
 keyboards/kprepublic/bm980hsrgb/config.h                | 4 ----
 keyboards/kprepublic/cospad/config.h                    | 4 ----
 keyboards/ktec/daisy/config.h                           | 4 ----
 keyboards/ktec/ergodone/config.h                        | 3 +--
 keyboards/kudox/columner/config.h                       | 2 --
 keyboards/kudox/rev1/config.h                           | 2 --
 keyboards/kudox/rev2/config.h                           | 2 --
 keyboards/kudox/rev3/config.h                           | 2 --
 keyboards/kudox_full/rev1/config.h                      | 2 --
 keyboards/kudox_game/rev1/config.h                      | 2 --
 keyboards/kudox_game/rev2/config.h                      | 2 --
 keyboards/ky01/config.h                                 | 4 ----
 keyboards/labyrinth75/config.h                          | 4 ----
 keyboards/latincompass/latin17rgb/config.h              | 4 ----
 keyboards/latincompass/latin47ble/config.h              | 2 --
 keyboards/latincompass/latin60rgb/config.h              | 4 ----
 keyboards/latincompass/latin6rgb/config.h               | 4 ----
 keyboards/latincompass/latinpadble/config.h             | 4 ----
 keyboards/lattice60/config.h                            | 4 ----
 keyboards/lets_split/rev1/config.h                      | 2 --
 keyboards/lets_split/rev2/config.h                      | 2 --
 keyboards/lfkeyboards/lfk65_hs/config.h                 | 2 --
 keyboards/lfkeyboards/lfk78/config.h                    | 4 ----
 keyboards/lfkeyboards/lfk87/config.h                    | 2 --
 keyboards/lfkeyboards/lfkpad/config.h                   | 4 ----
 keyboards/lfkeyboards/mini1800/config.h                 | 2 --
 keyboards/lfkeyboards/smk65/revb/config.h               | 2 --
 keyboards/lfkeyboards/smk65/revf/config.h               | 6 +-----
 keyboards/lily58/config.h                               | 7 -------
 keyboards/lily58/rev1/config.h                          | 2 --
 keyboards/lime/rev1/config.h                            | 2 --
 keyboards/linworks/fave84h/config.h                     | 3 ---
 keyboards/linworks/fave87h/config.h                     | 3 ---
 keyboards/lizard_trick/tenkey_plusplus/config.h         | 4 ----
 keyboards/lm_keyboard/lm60n/config.h                    | 4 ----
 keyboards/lucid/alexa/config.h                          | 2 --
 keyboards/lucid/kbd8x_hs/config.h                       | 2 --
 keyboards/lucid/phantom_hs/config.h                     | 2 --
 keyboards/lucid/phantom_solder/config.h                 | 2 --
 keyboards/lucid/scarlet/config.h                        | 2 --
 keyboards/m10a/config.h                                 | 2 --
 keyboards/machine_industries/m4_a/config.h              | 4 ----
 keyboards/majistic/config.h                             | 4 ----
 keyboards/malevolti/lyra/rev1/config.h                  | 3 ---
 keyboards/malevolti/superlyra/rev1/config.h             | 3 ---
 keyboards/manta60/config.h                              | 4 ----
 keyboards/manyboard/macro/config.h                      | 3 ---
 keyboards/maple_computing/c39/config.h                  | 2 --
 keyboards/maple_computing/ivy/config.h                  | 2 --
 keyboards/maple_computing/launchpad/config.h            | 2 --
 keyboards/maple_computing/minidox/config.h              | 2 --
 keyboards/maple_computing/the_ruler/config.h            | 2 --
 keyboards/marksard/leftover30/config.h                  | 4 ----
 keyboards/marksard/treadstone48/rev1/config.h           | 4 ----
 keyboards/marksard/treadstone48/rev2/config.h           | 4 ----
 keyboards/massdrop/alt/config.h                         | 2 --
 keyboards/massdrop/ctrl/config.h                        | 2 --
 keyboards/matchstickworks/southpad/config.h             | 2 --
 keyboards/matthewdias/m3n3van/config.h                  | 4 ----
 keyboards/matthewdias/minim/config.h                    | 4 ----
 keyboards/matthewdias/model_v/config.h                  | 4 ----
 keyboards/matthewdias/txuu/config.h                     | 4 ----
 keyboards/maxipad/config.h                              | 2 --
 keyboards/maxr1998/pulse4k/config.h                     | 2 --
 keyboards/mb44/config.h                                 | 6 ------
 keyboards/mc_76k/config.h                               | 4 ----
 keyboards/mechkeys/mk60/config.h                        | 2 --
 keyboards/mechlovin/hannah910/config.h                  | 2 --
 keyboards/mechlovin/jay60/config.h                      | 4 ----
 keyboards/mechwild/bde/rev2/config.h                    | 4 ----
 keyboards/mechwild/murphpad/config.h                    | 4 ----
 keyboards/mechwild/obe/config.h                         | 4 ----
 keyboards/mechwild/waka60/config.h                      | 4 ----
 keyboards/melgeek/mach80/config.h                       | 4 ----
 keyboards/melgeek/mj61/config.h                         | 4 ----
 keyboards/melgeek/mj63/config.h                         | 4 ----
 keyboards/melgeek/mj64/config.h                         | 4 ----
 keyboards/melgeek/mj65/config.h                         | 4 ----
 keyboards/melgeek/mojo68/config.h                       | 4 ----
 keyboards/melgeek/mojo75/config.h                       | 4 ----
 keyboards/melgeek/z70ultra/config.h                     | 4 ----
 keyboards/meme/config.h                                 | 2 --
 keyboards/meow65/config.h                               | 4 ----
 keyboards/mesa/mesa_tkl/config.h                        | 4 ----
 keyboards/meson/config.h                                | 3 ---
 keyboards/mikeneko65/rev3/config.h                      | 4 ----
 keyboards/mikeneko65/rev4/config.h                      | 4 ----
 keyboards/miller/gm862/config.h                         | 4 ----
 keyboards/millipad/config.h                             | 8 +-------
 keyboards/mini_elixivy/config.h                         | 6 +-----
 keyboards/mini_ten_key_plus/config.h                    | 4 ----
 keyboards/miniaxe/config.h                              | 2 --
 keyboards/mint60/config.h                               | 2 --
 keyboards/mitosis/config.h                              | 2 --
 keyboards/miuni32/config.h                              | 2 --
 keyboards/mlego/m48/config.h                            | 4 ----
 keyboards/mlego/m60/config.h                            | 4 ----
 keyboards/mlego/m60_split/config.h                      | 4 ----
 keyboards/mntre/config.h                                | 4 ----
 keyboards/mode/m65ha_alpha/config.h                     | 2 --
 keyboards/mode/m65hi_alpha/config.h                     | 2 --
 keyboards/mode/m65s/config.h                            | 2 --
 keyboards/mode/m75h/config.h                            | 2 --
 keyboards/mode/m75s/config.h                            | 2 --
 keyboards/mode/m80v1/config.h                           | 2 --
 keyboards/molecule/config.h                             | 4 ----
 keyboards/momoka_ergo/config.h                          | 4 ----
 keyboards/monarch/config.h                              | 2 --
 keyboards/moonlander/config.h                           | 2 --
 keyboards/morizon/config.h                              | 4 ----
 keyboards/mountainblocks/mb17/config.h                  | 5 -----
 keyboards/mschwingen/modelm/config.h                    | 2 --
 keyboards/mt40/config.h                                 | 2 --
 keyboards/mtbkeys/mtb60/hotswap/config.h                | 4 ----
 keyboards/mtbkeys/mtb60/solder/config.h                 | 4 ----
 keyboards/murcielago/rev1/config.h                      | 4 ----
 keyboards/nacly/splitreus62/config.h                    | 2 --
 keyboards/nacly/ua62/config.h                           | 2 --
 keyboards/nemui/config.h                                | 2 --
 keyboards/nibiria/stream15/config.h                     | 2 --
 keyboards/nightingale_studios/hailey/config.h           | 4 ----
 keyboards/nightly_boards/alter/rev1/config.h            | 7 -------
 keyboards/nightly_boards/n2/config.h                    | 5 -----
 keyboards/nightly_boards/n60_s/config.h                 | 3 ---
 keyboards/nightly_boards/n87/config.h                   | 4 ----
 keyboards/nightly_boards/n9/config.h                    | 5 -----
 keyboards/nightmare/config.h                            | 2 --
 keyboards/novelkeys/novelpad/config.h                   | 2 --
 keyboards/noxary/220/config.h                           | 2 --
 keyboards/noxary/260/config.h                           | 2 --
 keyboards/noxary/268_2/config.h                         | 2 --
 keyboards/noxary/280/config.h                           | 2 --
 keyboards/noxary/378/config.h                           | 2 --
 keyboards/noxary/valhalla/config.h                      | 2 --
 keyboards/noxary/vulcan/config.h                        | 2 --
 keyboards/noxary/x268/config.h                          | 2 --
 keyboards/numatreus/config.h                            | 2 --
 keyboards/oddball/config.h                              | 4 ----
 keyboards/orthodox/rev1/config.h                        | 2 --
 keyboards/orthodox/rev3/config.h                        | 2 --
 keyboards/orthodox/rev3_teensy/config.h                 | 2 --
 keyboards/paprikman/albacore/config.h                   | 4 ----
 keyboards/parallel/parallel_65/hotswap/config.h         | 4 ----
 keyboards/parallel/parallel_65/soldered/config.h        | 4 ----
 keyboards/pdxkbc/config.h                               | 2 --
 keyboards/pearl/config.h                                | 3 ---
 keyboards/peranekofactory/tone/rev1/config.h            | 4 ----
 keyboards/peranekofactory/tone/rev2/config.h            | 4 ----
 keyboards/phantom/config.h                              | 4 ----
 keyboards/pico/65keys/config.h                          | 2 --
 keyboards/pico/70keys/config.h                          | 2 --
 keyboards/pinky/3/config.h                              | 2 --
 keyboards/pinky/4/config.h                              | 2 --
 keyboards/pisces/config.h                               | 4 ----
 keyboards/pizzakeyboards/pizza65/config.h               | 4 ----
 keyboards/planck/config.h                               | 2 --
 keyboards/planck/ez/config.h                            | 2 --
 keyboards/planck/rev6/config.h                          | 3 ---
 keyboards/planck/rev6_drop/config.h                     | 2 --
 keyboards/ploopyco/mouse/config.h                       | 2 --
 keyboards/ploopyco/trackball/config.h                   | 2 --
 keyboards/ploopyco/trackball_mini/config.h              | 2 --
 keyboards/ploopyco/trackball_nano/config.h              | 2 --
 keyboards/pluckey/config.h                              | 4 ----
 keyboards/plume/plume65/config.h                        | 2 --
 keyboards/plut0nium/0x3e/config.h                       | 4 ----
 keyboards/pohjolaworks/louhi/config.h                   | 4 ----
 keyboards/polilla/rev1/config.h                         | 4 ----
 keyboards/portal_66/hotswap/config.h                    | 4 ----
 keyboards/portal_66/soldered/config.h                   | 4 ----
 keyboards/pos78/config.h                                | 4 ----
 keyboards/preonic/config.h                              | 2 --
 keyboards/preonic/rev3/config.h                         | 2 --
 keyboards/preonic/rev3_drop/config.h                    | 2 --
 keyboards/program_yoink/config.h                        | 4 ----
 keyboards/projectcain/vault35/config.h                  | 6 +-----
 keyboards/projectcain/vault45/config.h                  | 4 ----
 keyboards/projectkb/alice/rev1/config.h                 | 2 --
 keyboards/projectkb/alice/rev2/config.h                 | 2 --
 keyboards/prototypist/allison/config.h                  | 4 ----
 keyboards/prototypist/allison_numpad/config.h           | 4 ----
 keyboards/psuieee/pluto12/config.h                      | 4 ----
 keyboards/pteron36/config.h                             | 6 +-----
 keyboards/punk75/config.h                               | 4 ----
 keyboards/qpockets/wanten/config.h                      | 4 ----
 keyboards/quad_h/lb75/config.h                          | 2 --
 keyboards/quantrik/kyuu/config.h                        | 2 --
 keyboards/qwertyydox/config.h                           | 2 --
 keyboards/rabbit/rabbit68/config.h                      | 2 --
 keyboards/ramonimbao/aelith/config.h                    | 4 ----
 keyboards/ramonimbao/chevron/config.h                   | 4 ----
 keyboards/ramonimbao/herringbone/pro/config.h           | 4 ----
 keyboards/ramonimbao/herringbone/v1/config.h            | 4 ----
 keyboards/ramonimbao/mona/v1/config.h                   | 4 ----
 keyboards/ramonimbao/mona/v1_1/config.h                 | 5 -----
 keyboards/ramonimbao/mona/v32a/config.h                 | 5 -----
 keyboards/ramonimbao/squishy65/config.h                 | 2 --
 keyboards/ramonimbao/squishyfrl/config.h                | 4 ----
 keyboards/ramonimbao/squishytkl/config.h                | 4 ----
 keyboards/ramonimbao/tkl_ff/config.h                    | 4 ----
 keyboards/ramonimbao/wete/v1/config.h                   | 2 --
 keyboards/ramonimbao/wete/v2/config.h                   | 4 ----
 keyboards/rart/rartlice/config.h                        | 2 --
 keyboards/rate/pistachio/rev1/config.h                  | 4 ----
 keyboards/rate/pistachio/rev2/config.h                  | 4 ----
 keyboards/rate/pistachio_mp/config.h                    | 4 ----
 keyboards/rate/pistachio_pro/config.h                   | 4 ----
 keyboards/recompile_keys/mio/config.h                   | 4 ----
 keyboards/recompile_keys/nomu30/rev2/config.h           | 4 ----
 keyboards/redox/rev1/config.h                           | 2 --
 keyboards/redox/rev1/proton_c/config.h                  | 2 --
 keyboards/redox_w/config.h                              | 2 --
 keyboards/redscarf_iiplus/verb/config.h                 | 2 --
 keyboards/redscarf_iiplus/verc/config.h                 | 2 --
 keyboards/redscarf_iiplus/verd/config.h                 | 2 --
 keyboards/retro_75/config.h                             | 2 --
 keyboards/reversestudio/decadepad/config.h              | 2 --
 keyboards/reviung/reviung33/config.h                    | 4 ----
 keyboards/reviung/reviung34/config.h                    | 2 --
 keyboards/reviung/reviung39/config.h                    | 2 --
 keyboards/reviung/reviung41/config.h                    | 2 --
 keyboards/reviung/reviung5/config.h                     | 4 ----
 keyboards/reviung/reviung53/config.h                    | 4 ----
 keyboards/reviung/reviung61/config.h                    | 4 ----
 keyboards/rgbkb/sol/config.h                            | 2 --
 keyboards/rgbkb/zen/rev1/config.h                       | 2 --
 keyboards/rgbkb/zen/rev2/config.h                       | 2 --
 keyboards/rgbkb/zygomorph/rev1/config.h                 | 2 --
 keyboards/rocketboard_16/config.h                       | 2 --
 keyboards/rominronin/katana60/rev1/config.h             | 2 --
 keyboards/rominronin/katana60/rev2/config.h             | 2 --
 keyboards/roseslite/config.h                            | 2 --
 keyboards/rubi/config.h                                 | 4 ----
 keyboards/runes/vaengr/config.h                         | 4 ----
 keyboards/ryanbaekr/rb69/config.h                       | 4 ----
 keyboards/ryanbaekr/rb86/config.h                       | 4 ----
 keyboards/sandwich/keeb68/config.h                      | 4 ----
 keyboards/satt/comet46/config.h                         | 2 --
 keyboards/satt/vision/config.h                          | 2 --
 keyboards/scatter42/config.h                            | 4 ----
 keyboards/sck/m0116b/config.h                           | 2 --
 keyboards/sck/neiso/config.h                            | 2 --
 keyboards/sck/osa/config.h                              | 2 --
 keyboards/sekigon/grs_70ec/config.h                     | 4 ----
 keyboards/senselessclay/ck60/config.h                   | 4 ----
 keyboards/senselessclay/ck65/config.h                   | 6 +-----
 keyboards/senselessclay/gos65/config.h                  | 6 +-----
 keyboards/senselessclay/had60/config.h                  | 4 ----
 keyboards/sentraq/s60_x/default/config.h                | 2 --
 keyboards/shapeshifter4060/config.h                     | 2 --
 keyboards/shiro/config.h                                | 2 --
 keyboards/shk9/config.h                                 | 4 ----
 keyboards/sidderskb/majbritt/rev2/config.h              | 3 ---
 keyboards/silverbullet44/config.h                       | 4 ----
 keyboards/sirius/uni660/rev1/config.h                   | 4 ----
 keyboards/sirius/uni660/rev2/ansi/config.h              | 4 ----
 keyboards/sirius/uni660/rev2/iso/config.h               | 4 ----
 keyboards/sirius/unigo66/config.h                       | 2 --
 keyboards/sixkeyboard/config.h                          | 2 --
 keyboards/skippys_custom_pcs/roopad/config.h            | 3 ---
 keyboards/slz40/config.h                                | 4 ----
 keyboards/smallice/config.h                             | 4 ----
 keyboards/smallkeyboard/config.h                        | 4 ----
 keyboards/smk60/config.h                                | 2 --
 keyboards/snampad/config.h                              | 2 --
 keyboards/sofle/rev1/config.h                           | 3 ---
 keyboards/soup10/config.h                               | 4 ----
 keyboards/spacetime/config.h                            | 2 --
 keyboards/spacey/config.h                               | 5 -----
 keyboards/specskeys/config.h                            | 4 ----
 keyboards/splitty/config.h                              | 4 ----
 keyboards/studiokestra/bourgeau/config.h                | 2 --
 keyboards/studiokestra/cascade/config.h                 | 2 --
 keyboards/studiokestra/galatea/config.h                 | 4 ----
 keyboards/studiokestra/nue/config.h                     | 4 ----
 keyboards/subatomic/config.h                            | 2 --
 keyboards/switchplate/southpaw_65/config.h              | 2 --
 keyboards/switchplate/southpaw_fullsize/config.h        | 4 ----
 keyboards/switchplate/switchplate910/config.h           | 4 ----
 keyboards/tada68/config.h                               | 2 --
 keyboards/takashicompany/center_enter/config.h          | 4 ----
 keyboards/takashicompany/compacx/config.h               | 4 ----
 keyboards/takashicompany/dogtag/config.h                | 4 ----
 keyboards/takashicompany/endzone34/config.h             | 4 ----
 keyboards/takashicompany/heavy_left/config.h            | 6 +-----
 keyboards/takashicompany/qoolee/config.h                | 6 +-----
 keyboards/takashicompany/radialex/config.h              | 4 ----
 keyboards/takashiski/hecomi/alpha/config.h              | 2 --
 keyboards/takashiski/namecard2x4/rev1/config.h          | 3 ---
 keyboards/takashiski/namecard2x4/rev2/config.h          | 3 ---
 keyboards/takashiski/otaku_split/rev0/config.h          | 2 --
 keyboards/takashiski/otaku_split/rev1/config.h          | 2 --
 keyboards/tanuki/config.h                               | 2 --
 keyboards/team0110/p1800fl/config.h                     | 6 +-----
 keyboards/technika/config.h                             | 2 --
 keyboards/telophase/config.h                            | 4 ----
 keyboards/tetris/config.h                               | 3 ---
 keyboards/tg4x/config.h                                 | 2 --
 keyboards/tgr/910ce/config.h                            | 5 -----
 keyboards/thevankeyboards/jetvan/config.h               | 2 --
 keyboards/thevankeyboards/roadkit/config.h              | 2 --
 keyboards/tkc/california/config.h                       | 2 --
 keyboards/tkc/candybar/lefty/config.h                   | 2 --
 keyboards/tkc/candybar/lefty_r3/config.h                | 2 --
 keyboards/tkc/candybar/righty/config.h                  | 2 --
 keyboards/tkc/candybar/righty_r3/config.h               | 2 --
 keyboards/tkc/godspeed75/config.h                       | 2 --
 keyboards/tkc/m0lly/config.h                            | 4 ----
 keyboards/tkc/osav2/config.h                            | 2 --
 keyboards/tkc/portico/config.h                          | 4 ----
 keyboards/tkc/portico68v2/config.h                      | 4 ----
 keyboards/tkc/portico75/config.h                        | 4 ----
 keyboards/tkc/tkc1800/config.h                          | 2 --
 keyboards/tkc/tkl_ab87/config.h                         | 2 --
 keyboards/tkw/grandiceps/config.h                       | 4 ----
 keyboards/tkw/stoutgat/v1/config.h                      | 4 ----
 keyboards/tkw/stoutgat/v2/config.h                      | 4 ----
 keyboards/tmo50/config.h                                | 2 --
 keyboards/touchpad/config.h                             | 2 --
 keyboards/treasure/type9/config.h                       | 3 ---
 keyboards/tszaboo/ortho4exent/config.h                  | 4 ----
 keyboards/tw40/config.h                                 | 3 ---
 keyboards/unikeyboard/diverge3/config.h                 | 2 --
 keyboards/unikeyboard/felix/config.h                    | 2 --
 keyboards/unison/v04/config.h                           | 4 ----
 keyboards/uranuma/config.h                              | 2 --
 keyboards/uzu42/config.h                                | 3 ---
 keyboards/uzu42/rev1/config.h                           | 2 --
 keyboards/v4n4g0rth0n/config.h                          | 4 ----
 keyboards/v60_type_r/config.h                           | 2 --
 keyboards/viktus/smolka/config.h                        | 4 ----
 keyboards/viktus/sp111/config.h                         | 4 ----
 keyboards/viktus/sp_mini/config.h                       | 2 --
 keyboards/viktus/styrka/config.h                        | 2 --
 keyboards/vitamins_included/rev1/config.h               | 2 --
 keyboards/vitamins_included/rev2/config.h               | 2 --
 keyboards/waldo/config.h                                | 4 +---
 keyboards/wavtype/foundation/config.h                   | 4 ----
 keyboards/wekey/polaris/config.h                        | 4 ----
 keyboards/wekey/stelo65/config.h                        | 4 ----
 keyboards/wekey/we27/config.h                           | 4 ----
 keyboards/westfoxtrot/cyclops/config.h                  | 2 --
 keyboards/whale/sk/v3/config.h                          | 4 ----
 keyboards/wilba_tech/rama_works_kara/config.h           | 2 --
 keyboards/wilba_tech/rama_works_koyu/config.h           | 2 --
 keyboards/wilba_tech/rama_works_m10_b/config.h          | 2 --
 keyboards/wilba_tech/rama_works_m10_c/config.h          | 4 ----
 keyboards/wilba_tech/rama_works_m50_a/config.h          | 4 ----
 keyboards/wilba_tech/rama_works_m50_ax/config.h         | 4 ----
 keyboards/wilba_tech/rama_works_m60_a/config.h          | 2 --
 keyboards/wilba_tech/rama_works_u80_a/config.h          | 2 --
 keyboards/wilba_tech/wt60_a/config.h                    | 2 --
 keyboards/wilba_tech/wt60_d/config.h                    | 2 --
 keyboards/wilba_tech/wt60_xt/config.h                   | 2 --
 keyboards/wilba_tech/wt65_a/config.h                    | 2 --
 keyboards/wilba_tech/wt65_b/config.h                    | 2 --
 keyboards/wilba_tech/wt69_a/config.h                    | 2 --
 keyboards/wilba_tech/wt75_a/config.h                    | 2 --
 keyboards/wilba_tech/wt75_b/config.h                    | 2 --
 keyboards/wilba_tech/wt75_c/config.h                    | 2 --
 keyboards/wilba_tech/wt80_a/config.h                    | 2 --
 keyboards/wilba_tech/zeal60/config.h                    | 2 --
 keyboards/wilba_tech/zeal65/config.h                    | 4 +---
 keyboards/winkeys/mini_winni/config.h                   | 4 ----
 keyboards/wolf/kuku65/config.h                          | 3 ---
 keyboards/wolf/sabre/config.h                           | 3 ---
 keyboards/wolf/ts60/config.h                            | 3 ---
 keyboards/wolfmarkclub/wm1/config.h                     | 2 --
 keyboards/woodkeys/meira/featherble/config.h            | 2 --
 keyboards/woodkeys/meira/promicro/config.h              | 2 --
 keyboards/woodkeys/scarletbandana/config.h              | 3 ---
 keyboards/work_louder/loop/config.h                     | 4 ----
 keyboards/work_louder/nano/config.h                     | 4 ----
 keyboards/work_louder/work_board/config.h               | 4 ----
 keyboards/wren/config.h                                 | 4 ----
 keyboards/x16/config.h                                  | 2 --
 keyboards/xbows/knight/config.h                         | 4 ----
 keyboards/xbows/knight_plus/config.h                    | 4 ----
 keyboards/xbows/nature/config.h                         | 4 ----
 keyboards/xbows/numpad/config.h                         | 4 ----
 keyboards/xbows/ranger/config.h                         | 4 ----
 keyboards/xelus/dawn60/rev1/config.h                    | 2 --
 keyboards/xiaomi/mk02/config.h                          | 2 --
 keyboards/xiudi/xd004/v1/config.h                       | 2 --
 keyboards/xiudi/xd68/config.h                           | 2 --
 keyboards/xiudi/xd75/config.h                           | 4 ----
 keyboards/xiudi/xd84/config.h                           | 2 --
 keyboards/xiudi/xd84pro/config.h                        | 3 ---
 keyboards/xiudi/xd87/config.h                           | 3 ---
 keyboards/xiudi/xd96/config.h                           | 2 --
 keyboards/yampad/config.h                               | 2 --
 keyboards/ydkb/chili/config.h                           | 2 --
 keyboards/ydkb/just60/config.h                          | 4 ----
 keyboards/ydkb/yd68/config.h                            | 3 ---
 keyboards/yiancardesigns/barleycorn/config.h            | 2 --
 keyboards/yiancardesigns/gingham/config.h               | 3 ---
 keyboards/yiancardesigns/seigaiha/config.h              | 2 --
 keyboards/ymdk/np21/config.h                            | 4 ----
 keyboards/ymdk/sp64/config.h                            | 4 ----
 keyboards/ymdk/ymd09/config.h                           | 4 ----
 keyboards/yoichiro/lunakey_macro/config.h               | 4 ----
 keyboards/yoichiro/lunakey_mini/config.h                | 4 ----
 keyboards/yosino58/config.h                             | 3 ---
 keyboards/yosino58/rev1/config.h                        | 2 --
 keyboards/yugo_m/model_m_101/config.h                   | 2 --
 keyboards/yushakobo/navpad/10/config.h                  | 6 +-----
 keyboards/yushakobo/navpad/10_helix_r/config.h          | 6 +-----
 keyboards/yushakobo/quick17/config.h                    | 4 ----
 keyboards/yushakobo/quick7/config.h                     | 6 ------
 keyboards/yynmt/acperience12/rev1/config.h              | 4 ----
 keyboards/yynmt/dozen0/config.h                         | 2 --
 keyboards/yynmt/kagamidget/config.h                     | 2 --
 keyboards/ziggurat/config.h                             | 4 ----
 keyboards/zoo/wampus/config.h                           | 4 ----
 keyboards/zvecr/split_blackpill/config.h                | 4 ----
 keyboards/zvecr/zv48/config.h                           | 4 ----
 958 files changed, 32 insertions(+), 2807 deletions(-)

diff --git a/keyboards/0_sixty/config.h b/keyboards/0_sixty/config.h
index fa371a54cc..9d9394c14f 100644
--- a/keyboards/0_sixty/config.h
+++ b/keyboards/0_sixty/config.h
@@ -64,5 +64,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/0_sixty/underglow/config.h b/keyboards/0_sixty/underglow/config.h
index 5f4ebd4c45..1cff58d944 100644
--- a/keyboards/0_sixty/underglow/config.h
+++ b/keyboards/0_sixty/underglow/config.h
@@ -58,5 +58,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/0xc7/61key/config.h b/keyboards/0xc7/61key/config.h
index d1edf3284e..11b01ad8b6 100644
--- a/keyboards/0xc7/61key/config.h
+++ b/keyboards/0xc7/61key/config.h
@@ -136,10 +136,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index 3f4f742b48..2396e9083b 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -108,5 +108,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index 354f0680e8..fd11e13fe1 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -181,8 +181,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 77bb89d954..4685e66b2d 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -135,10 +135,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/25keys/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
index da10e30a4f..8424b2edc3 100644
--- a/keyboards/25keys/aleth42/rev0/config.h
+++ b/keyboards/25keys/aleth42/rev0/config.h
@@ -76,7 +76,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
\ No newline at end of file
diff --git a/keyboards/25keys/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
index a0bc34ece4..43af843a0b 100644
--- a/keyboards/25keys/zinc/rev1/config.h
+++ b/keyboards/25keys/zinc/rev1/config.h
@@ -73,5 +73,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/25keys/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
index 378fd9e6d9..428c704d19 100644
--- a/keyboards/25keys/zinc/reva/config.h
+++ b/keyboards/25keys/zinc/reva/config.h
@@ -73,5 +73,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/3keyecosystem/2key2/config.h b/keyboards/3keyecosystem/2key2/config.h
index 58010eea55..80e864ce9d 100644
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -91,7 +91,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/3w6/rev1/config.h b/keyboards/3w6/rev1/config.h
index 1f0bab97fa..0c14dc72d3 100644
--- a/keyboards/3w6/rev1/config.h
+++ b/keyboards/3w6/rev1/config.h
@@ -56,8 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/3w6/rev2/config.h b/keyboards/3w6/rev2/config.h
index d191360607..4101aa76cd 100644
--- a/keyboards/3w6/rev2/config.h
+++ b/keyboards/3w6/rev2/config.h
@@ -56,8 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index 292854f68f..c753f7c29f 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -116,5 +116,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/40percentclub/4pack/config.h b/keyboards/40percentclub/4pack/config.h
index 305e71e542..943b918d56 100644
--- a/keyboards/40percentclub/4pack/config.h
+++ b/keyboards/40percentclub/4pack/config.h
@@ -137,8 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h
index b74eb62c1e..44628ac741 100644
--- a/keyboards/40percentclub/4x4/config.h
+++ b/keyboards/40percentclub/4x4/config.h
@@ -83,5 +83,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
index 62d63b8afa..460f5ba93d 100644
--- a/keyboards/40percentclub/5x5/config.h
+++ b/keyboards/40percentclub/5x5/config.h
@@ -92,5 +92,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index e402932b21..302decc162 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -117,5 +117,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index 3f6cb1f10c..afc50acb7e 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -117,5 +117,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
index 292ac485bd..2ed218199f 100644
--- a/keyboards/40percentclub/half_n_half/config.h
+++ b/keyboards/40percentclub/half_n_half/config.h
@@ -126,8 +126,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/40percentclub/i75/config.h b/keyboards/40percentclub/i75/config.h
index bce564c042..2bf67cff1d 100644
--- a/keyboards/40percentclub/i75/config.h
+++ b/keyboards/40percentclub/i75/config.h
@@ -72,8 +72,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
index 2ed8c87195..404cd6f7d3 100644
--- a/keyboards/40percentclub/mf68/config.h
+++ b/keyboards/40percentclub/mf68/config.h
@@ -115,5 +115,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/40percentclub/nein/config.h b/keyboards/40percentclub/nein/config.h
index 4dfb143e52..53c227d832 100644
--- a/keyboards/40percentclub/nein/config.h
+++ b/keyboards/40percentclub/nein/config.h
@@ -121,8 +121,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index 0fed3daf11..bf0507716f 100644
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/config.h
@@ -105,5 +105,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/40percentclub/polyandry/config.h b/keyboards/40percentclub/polyandry/config.h
index 1fd3e22f49..bc0683f6fb 100644
--- a/keyboards/40percentclub/polyandry/config.h
+++ b/keyboards/40percentclub/polyandry/config.h
@@ -75,8 +75,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h
index eee2f3f919..5a627e630a 100644
--- a/keyboards/abacus/config.h
+++ b/keyboards/abacus/config.h
@@ -102,7 +102,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/abstract/ellipse/rev1/config.h b/keyboards/abstract/ellipse/rev1/config.h
index 6e16c8d228..060229abb2 100644
--- a/keyboards/abstract/ellipse/rev1/config.h
+++ b/keyboards/abstract/ellipse/rev1/config.h
@@ -127,8 +127,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
index 67d02c98ea..6cfaa7980e 100644
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/config.h
@@ -80,7 +80,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h
index 4056ad0073..1275eb5a65 100644
--- a/keyboards/acheron/arctic/config.h
+++ b/keyboards/acheron/arctic/config.h
@@ -66,5 +66,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h
index e90fb0ee7c..ddbd6975d4 100644
--- a/keyboards/acheron/austin/config.h
+++ b/keyboards/acheron/austin/config.h
@@ -66,5 +66,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
index c02cf08979..874183362c 100644
--- a/keyboards/acheron/elongate/beta/config.h
+++ b/keyboards/acheron/elongate/beta/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h
index 70ffc52615..05e08f74f7 100644
--- a/keyboards/acheron/keebspcb/config.h
+++ b/keyboards/acheron/keebspcb/config.h
@@ -66,5 +66,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h
index e131787f76..f9a2427fae 100644
--- a/keyboards/acheron/lasgweloth/config.h
+++ b/keyboards/acheron/lasgweloth/config.h
@@ -66,5 +66,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/acheron/shark/config.h b/keyboards/acheron/shark/config.h
index 78f763fe90..cd2d88129c 100644
--- a/keyboards/acheron/shark/config.h
+++ b/keyboards/acheron/shark/config.h
@@ -148,8 +148,6 @@ B0, which is unconnected on the PCB
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
index 1cbce84720..af28efeae2 100644
--- a/keyboards/ada/infinity81/config.h
+++ b/keyboards/ada/infinity81/config.h
@@ -117,10 +117,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/adelheid/config.h b/keyboards/adelheid/config.h
index 487559af16..aca9bdc701 100644
--- a/keyboards/adelheid/config.h
+++ b/keyboards/adelheid/config.h
@@ -127,5 +127,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/adkb96/rev1/config.h b/keyboards/adkb96/rev1/config.h
index c5b768721c..9727e7eaf7 100644
--- a/keyboards/adkb96/rev1/config.h
+++ b/keyboards/adkb96/rev1/config.h
@@ -74,5 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/adpenrose/kintsugi/config.h b/keyboards/adpenrose/kintsugi/config.h
index cbd38b6664..b3aca40a06 100644
--- a/keyboards/adpenrose/kintsugi/config.h
+++ b/keyboards/adpenrose/kintsugi/config.h
@@ -137,10 +137,6 @@ increase the value. If you need 2 clicks for 1 keycode, decrease*/
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/afternoonlabs/breeze/config.h b/keyboards/afternoonlabs/breeze/config.h
index 48331fa076..0b832322a3 100644
--- a/keyboards/afternoonlabs/breeze/config.h
+++ b/keyboards/afternoonlabs/breeze/config.h
@@ -17,6 +17,3 @@
 #pragma once
 
 #include "config_common.h"
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/afternoonlabs/gust/config.h b/keyboards/afternoonlabs/gust/config.h
index 48331fa076..0b832322a3 100644
--- a/keyboards/afternoonlabs/gust/config.h
+++ b/keyboards/afternoonlabs/gust/config.h
@@ -17,6 +17,3 @@
 #pragma once
 
 #include "config_common.h"
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/afternoonlabs/oceanbreeze/config.h b/keyboards/afternoonlabs/oceanbreeze/config.h
index 1197fa2257..71eaed42a2 100644
--- a/keyboards/afternoonlabs/oceanbreeze/config.h
+++ b/keyboards/afternoonlabs/oceanbreeze/config.h
@@ -17,6 +17,3 @@
 #pragma once
 
 #include "config_common.h"
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/afternoonlabs/southern_breeze/config.h b/keyboards/afternoonlabs/southern_breeze/config.h
index 1197fa2257..71eaed42a2 100644
--- a/keyboards/afternoonlabs/southern_breeze/config.h
+++ b/keyboards/afternoonlabs/southern_breeze/config.h
@@ -17,6 +17,3 @@
 #pragma once
 
 #include "config_common.h"
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/afternoonlabs/summer_breeze/config.h b/keyboards/afternoonlabs/summer_breeze/config.h
index 1197fa2257..71eaed42a2 100644
--- a/keyboards/afternoonlabs/summer_breeze/config.h
+++ b/keyboards/afternoonlabs/summer_breeze/config.h
@@ -17,6 +17,3 @@
 #pragma once
 
 #include "config_common.h"
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/ai03/equinox/config.h b/keyboards/ai03/equinox/config.h
index 5130f510b6..4a6b841b60 100644
--- a/keyboards/ai03/equinox/config.h
+++ b/keyboards/ai03/equinox/config.h
@@ -132,8 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ai03/jp60/config.h b/keyboards/ai03/jp60/config.h
index a06d75c8e5..2e48321546 100644
--- a/keyboards/ai03/jp60/config.h
+++ b/keyboards/ai03/jp60/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ai03/lunar/config.h b/keyboards/ai03/lunar/config.h
index 9ee8cbf6f8..65f428776f 100644
--- a/keyboards/ai03/lunar/config.h
+++ b/keyboards/ai03/lunar/config.h
@@ -132,8 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ai03/orbit/config.h b/keyboards/ai03/orbit/config.h
index 0e4f4c3baf..1b745b4e1f 100644
--- a/keyboards/ai03/orbit/config.h
+++ b/keyboards/ai03/orbit/config.h
@@ -140,8 +140,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ai03/orbit_x/config.h b/keyboards/ai03/orbit_x/config.h
index 7d3e8ef511..74acd64746 100644
--- a/keyboards/ai03/orbit_x/config.h
+++ b/keyboards/ai03/orbit_x/config.h
@@ -110,10 +110,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ai03/polaris/config.h b/keyboards/ai03/polaris/config.h
index 0cd6e6f580..2d869dd0bd 100644
--- a/keyboards/ai03/polaris/config.h
+++ b/keyboards/ai03/polaris/config.h
@@ -107,8 +107,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ai03/quasar/config.h b/keyboards/ai03/quasar/config.h
index 2563125be0..97fa2df2da 100644
--- a/keyboards/ai03/quasar/config.h
+++ b/keyboards/ai03/quasar/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ai03/soyuz/config.h b/keyboards/ai03/soyuz/config.h
index feb55107c3..8022145ceb 100644
--- a/keyboards/ai03/soyuz/config.h
+++ b/keyboards/ai03/soyuz/config.h
@@ -132,8 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ai03/vega/config.h b/keyboards/ai03/vega/config.h
index ac589276a7..5f94ea9a7d 100644
--- a/keyboards/ai03/vega/config.h
+++ b/keyboards/ai03/vega/config.h
@@ -59,5 +59,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ai03/voyager60_alps/config.h b/keyboards/ai03/voyager60_alps/config.h
index cd749cc505..cd06071989 100644
--- a/keyboards/ai03/voyager60_alps/config.h
+++ b/keyboards/ai03/voyager60_alps/config.h
@@ -90,8 +90,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h
index c8edb8ebfe..078e9cb41e 100644
--- a/keyboards/al1/config.h
+++ b/keyboards/al1/config.h
@@ -88,7 +88,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/aleblazer/zodiark/config.h b/keyboards/aleblazer/zodiark/config.h
index 84795f024b..a3ea6382e4 100644
--- a/keyboards/aleblazer/zodiark/config.h
+++ b/keyboards/aleblazer/zodiark/config.h
@@ -25,8 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MANUFACTURER    Aleblazer
 #define PRODUCT         Zodiark
 
-#define NO_ACTION_MACRO
-
 #define SOFT_SERIAL_PIN D3
 #define SERIAL_USE_MULTI_TRANSACTION
 #define SELECT_SOFT_SERIAL_SPEED 1
diff --git a/keyboards/alf/dc60/config.h b/keyboards/alf/dc60/config.h
index 5c37685322..bdbea9578c 100644
--- a/keyboards/alf/dc60/config.h
+++ b/keyboards/alf/dc60/config.h
@@ -117,5 +117,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/alf/x11/config.h b/keyboards/alf/x11/config.h
index 437f1e22ba..a489174b2d 100644
--- a/keyboards/alf/x11/config.h
+++ b/keyboards/alf/x11/config.h
@@ -132,8 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/alpine65/config.h b/keyboards/alpine65/config.h
index 68aae56383..ce674396ab 100644
--- a/keyboards/alpine65/config.h
+++ b/keyboards/alpine65/config.h
@@ -72,5 +72,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/alps64/config.h b/keyboards/alps64/config.h
index 31837b3a9e..640bab8bca 100644
--- a/keyboards/alps64/config.h
+++ b/keyboards/alps64/config.h
@@ -68,5 +68,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/amj40/config.h b/keyboards/amj40/config.h
index 7fce438337..71a8d34413 100755
--- a/keyboards/amj40/config.h
+++ b/keyboards/amj40/config.h
@@ -84,5 +84,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/amj60/config.h b/keyboards/amj60/config.h
index 8d53efd3f3..1c25e4fea0 100644
--- a/keyboards/amj60/config.h
+++ b/keyboards/amj60/config.h
@@ -109,10 +109,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/amj96/config.h b/keyboards/amj96/config.h
index 5de56683a6..f5b26220b7 100644
--- a/keyboards/amj96/config.h
+++ b/keyboards/amj96/config.h
@@ -129,5 +129,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h
index 279d1268e8..569c06dac2 100644
--- a/keyboards/amjkeyboard/amj84/config.h
+++ b/keyboards/amjkeyboard/amj84/config.h
@@ -103,10 +103,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/amjpad/config.h b/keyboards/amjpad/config.h
index f1d57592b5..dd8ed34e47 100644
--- a/keyboards/amjpad/config.h
+++ b/keyboards/amjpad/config.h
@@ -84,5 +84,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/arabica37/rev1/config.h b/keyboards/arabica37/rev1/config.h
index 7951bc49ea..c0339a1a09 100644
--- a/keyboards/arabica37/rev1/config.h
+++ b/keyboards/arabica37/rev1/config.h
@@ -77,5 +77,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/arisu/config.h b/keyboards/arisu/config.h
index 8cadc50741..8e2da440c2 100644
--- a/keyboards/arisu/config.h
+++ b/keyboards/arisu/config.h
@@ -127,5 +127,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ash1800/config.h b/keyboards/ash1800/config.h
index 051db87a79..7b55f31bd3 100644
--- a/keyboards/ash1800/config.h
+++ b/keyboards/ash1800/config.h
@@ -140,8 +140,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ashpil/modelm_usbc/config.h b/keyboards/ashpil/modelm_usbc/config.h
index f383a30714..8572171527 100644
--- a/keyboards/ashpil/modelm_usbc/config.h
+++ b/keyboards/ashpil/modelm_usbc/config.h
@@ -66,8 +66,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/at_at/660m/config.h b/keyboards/at_at/660m/config.h
index 41443f8ae6..5a53e8c38a 100644
--- a/keyboards/at_at/660m/config.h
+++ b/keyboards/at_at/660m/config.h
@@ -65,5 +65,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/atlas_65/config.h b/keyboards/atlas_65/config.h
index d96c2c3976..86613cb193 100644
--- a/keyboards/atlas_65/config.h
+++ b/keyboards/atlas_65/config.h
@@ -126,5 +126,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/atomic/config.h b/keyboards/atomic/config.h
index cb4aee0f7f..095cac906c 100644
--- a/keyboards/atomic/config.h
+++ b/keyboards/atomic/config.h
@@ -99,5 +99,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/atreus/config.h b/keyboards/atreus/config.h
index 07f4d7f15a..ae3eb4f232 100644
--- a/keyboards/atreus/config.h
+++ b/keyboards/atreus/config.h
@@ -59,5 +59,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/atreus62/config.h b/keyboards/atreus62/config.h
index 31baef145f..2bb3da484c 100644
--- a/keyboards/atreus62/config.h
+++ b/keyboards/atreus62/config.h
@@ -68,5 +68,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/atxkb/1894/config.h b/keyboards/atxkb/1894/config.h
index c59efe91a7..fd621e169a 100644
--- a/keyboards/atxkb/1894/config.h
+++ b/keyboards/atxkb/1894/config.h
@@ -107,8 +107,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/aves60/config.h b/keyboards/aves60/config.h
index 9f90b2109e..d44951a4ce 100644
--- a/keyboards/aves60/config.h
+++ b/keyboards/aves60/config.h
@@ -130,10 +130,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 4
 #define BOOTMAGIC_LITE_COLUMN 6
diff --git a/keyboards/baguette/config.h b/keyboards/baguette/config.h
index 9a6b08ed9e..b4937579a3 100644
--- a/keyboards/baguette/config.h
+++ b/keyboards/baguette/config.h
@@ -114,5 +114,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h
index e1e4d87405..d95b600536 100644
--- a/keyboards/bandominedoni/config.h
+++ b/keyboards/bandominedoni/config.h
@@ -240,10 +240,6 @@
 // NO_ACTION_ONESHOT -388 bytes
 #define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/bantam44/config.h b/keyboards/bantam44/config.h
index 6cff8b2899..2745f5c045 100644
--- a/keyboards/bantam44/config.h
+++ b/keyboards/bantam44/config.h
@@ -69,5 +69,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/barleycorn_smd/config.h b/keyboards/barleycorn_smd/config.h
index 2ac86bf8a8..e56992f1fc 100644
--- a/keyboards/barleycorn_smd/config.h
+++ b/keyboards/barleycorn_smd/config.h
@@ -107,5 +107,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/barracuda/config.h b/keyboards/barracuda/config.h
index 97eee0bd65..9b83522b1a 100644
--- a/keyboards/barracuda/config.h
+++ b/keyboards/barracuda/config.h
@@ -53,7 +53,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/bastardkb/charybdis/3x5/config.h b/keyboards/bastardkb/charybdis/3x5/config.h
index 9c69f7c358..89b896bc35 100644
--- a/keyboards/bastardkb/charybdis/3x5/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/config.h
@@ -58,10 +58,6 @@
 /* Set 0 if debouncing isn't needed. */
 #define DEBOUNCE 5
 
-/* Disable action features. */
-#define NO_ACTION_MACRO     // Disable old-style macro handling.
-#define NO_ACTION_FUNCTION  // Disable old-style function handling.
-
 /* PMW3360 settings. */
 #define PMW3360_CS_PIN B0
 
diff --git a/keyboards/bastardkb/charybdis/4x6/config.h b/keyboards/bastardkb/charybdis/4x6/config.h
index f00fb382f6..423f12fdbe 100644
--- a/keyboards/bastardkb/charybdis/4x6/config.h
+++ b/keyboards/bastardkb/charybdis/4x6/config.h
@@ -60,10 +60,6 @@
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
-/* Disable action features. */
-#define NO_ACTION_MACRO     // Disable old-style macro handling.
-#define NO_ACTION_FUNCTION  // Disable old-style function handling.
-
 /* PMW3360 settings. */
 #define PMW3360_CS_PIN B0
 
diff --git a/keyboards/bear_face/config.h b/keyboards/bear_face/config.h
index 9b389f127a..593f8a23a4 100644
--- a/keyboards/bear_face/config.h
+++ b/keyboards/bear_face/config.h
@@ -95,5 +95,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/biacco42/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h
index a6bf914515..c8bfe1170f 100644
--- a/keyboards/biacco42/ergo42/rev1/config.h
+++ b/keyboards/biacco42/ergo42/rev1/config.h
@@ -76,5 +76,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/biacco42/meishi/config.h b/keyboards/biacco42/meishi/config.h
index 6664e371a1..ff6c22dc56 100644
--- a/keyboards/biacco42/meishi/config.h
+++ b/keyboards/biacco42/meishi/config.h
@@ -106,5 +106,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/biacco42/meishi2/config.h b/keyboards/biacco42/meishi2/config.h
index df3203991c..57a4e226a3 100644
--- a/keyboards/biacco42/meishi2/config.h
+++ b/keyboards/biacco42/meishi2/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/bioi/f60/config.h b/keyboards/bioi/f60/config.h
index a0d498b90e..40a7f6250f 100644
--- a/keyboards/bioi/f60/config.h
+++ b/keyboards/bioi/f60/config.h
@@ -66,7 +66,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/blank/blank01/config.h b/keyboards/blank/blank01/config.h
index 5b28e8199c..5ebf8c774a 100644
--- a/keyboards/blank/blank01/config.h
+++ b/keyboards/blank/blank01/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/blockey/config.h b/keyboards/blockey/config.h
index 7ad3311c71..d954be2d7e 100644
--- a/keyboards/blockey/config.h
+++ b/keyboards/blockey/config.h
@@ -110,5 +110,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/boardrun/bizarre/config.h b/keyboards/boardrun/bizarre/config.h
index 6e08d1f4a7..9f4b91e2b5 100644
--- a/keyboards/boardrun/bizarre/config.h
+++ b/keyboards/boardrun/bizarre/config.h
@@ -71,8 +71,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // ws2812 options
 #define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
diff --git a/keyboards/boardrun/classic/config.h b/keyboards/boardrun/classic/config.h
index 6c814eb373..754c42975f 100644
--- a/keyboards/boardrun/classic/config.h
+++ b/keyboards/boardrun/classic/config.h
@@ -71,8 +71,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // ws2812 options
 #define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
diff --git a/keyboards/boardsource/3x4/config.h b/keyboards/boardsource/3x4/config.h
index 01d163ca50..b7a067bb6f 100644
--- a/keyboards/boardsource/3x4/config.h
+++ b/keyboards/boardsource/3x4/config.h
@@ -68,5 +68,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/boardsource/4x12/config.h b/keyboards/boardsource/4x12/config.h
index 967bb1c9f0..4df24944f8 100644
--- a/keyboards/boardsource/4x12/config.h
+++ b/keyboards/boardsource/4x12/config.h
@@ -66,5 +66,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/boardsource/5x12/config.h b/keyboards/boardsource/5x12/config.h
index 455965a09e..f70dec9efb 100644
--- a/keyboards/boardsource/5x12/config.h
+++ b/keyboards/boardsource/5x12/config.h
@@ -67,5 +67,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/boardsource/beiwagon/config.h b/keyboards/boardsource/beiwagon/config.h
index 797da34613..72386c4236 100644
--- a/keyboards/boardsource/beiwagon/config.h
+++ b/keyboards/boardsource/beiwagon/config.h
@@ -160,10 +160,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/boardsource/holiday/spooky/config.h b/keyboards/boardsource/holiday/spooky/config.h
index 92eb4c32ac..87d63b0d9e 100644
--- a/keyboards/boardsource/holiday/spooky/config.h
+++ b/keyboards/boardsource/holiday/spooky/config.h
@@ -124,10 +124,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/boardsource/microdox/config.h b/keyboards/boardsource/microdox/config.h
index 65af0f16de..7e6347dbda 100644
--- a/keyboards/boardsource/microdox/config.h
+++ b/keyboards/boardsource/microdox/config.h
@@ -76,5 +76,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
\ No newline at end of file
diff --git a/keyboards/boardsource/technik_o/config.h b/keyboards/boardsource/technik_o/config.h
index 51c9529da4..146141a911 100644
--- a/keyboards/boardsource/technik_o/config.h
+++ b/keyboards/boardsource/technik_o/config.h
@@ -160,10 +160,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/boardsource/technik_s/config.h b/keyboards/boardsource/technik_s/config.h
index 7b5f297c9e..a34ab1577a 100644
--- a/keyboards/boardsource/technik_s/config.h
+++ b/keyboards/boardsource/technik_s/config.h
@@ -160,10 +160,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/boardsource/the_mark/config.h b/keyboards/boardsource/the_mark/config.h
index cbfe4cd510..99696e5d28 100644
--- a/keyboards/boardsource/the_mark/config.h
+++ b/keyboards/boardsource/the_mark/config.h
@@ -151,10 +151,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/boardwalk/config.h b/keyboards/boardwalk/config.h
index b98b709738..03e481ce62 100644
--- a/keyboards/boardwalk/config.h
+++ b/keyboards/boardwalk/config.h
@@ -71,8 +71,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // ws2812 options
 #define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
diff --git a/keyboards/boston/config.h b/keyboards/boston/config.h
index ff9c253ded..247616d3da 100644
--- a/keyboards/boston/config.h
+++ b/keyboards/boston/config.h
@@ -88,5 +88,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/boston_meetup/2019/config.h b/keyboards/boston_meetup/2019/config.h
index 138dedab57..99ce9e85db 100644
--- a/keyboards/boston_meetup/2019/config.h
+++ b/keyboards/boston_meetup/2019/config.h
@@ -104,8 +104,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Haptic Driver initialization settings
  * Feedback Control Settings */
diff --git a/keyboards/boston_meetup/config.h b/keyboards/boston_meetup/config.h
index 013b0b1484..60e490435f 100644
--- a/keyboards/boston_meetup/config.h
+++ b/keyboards/boston_meetup/config.h
@@ -55,5 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/box75/config.h b/keyboards/box75/config.h
index b3b52c8730..b6bcc31b0a 100644
--- a/keyboards/box75/config.h
+++ b/keyboards/box75/config.h
@@ -66,5 +66,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h
index a60d728ac6..1ca00f231d 100644
--- a/keyboards/bpiphany/frosty_flake/config.h
+++ b/keyboards/bpiphany/frosty_flake/config.h
@@ -91,6 +91,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
+
 #define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/keyboards/bpiphany/hid_liber/config.h b/keyboards/bpiphany/hid_liber/config.h
index 1664b9e314..95e617f562 100755
--- a/keyboards/bpiphany/hid_liber/config.h
+++ b/keyboards/bpiphany/hid_liber/config.h
@@ -88,5 +88,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h
index 7dbf027699..b357289e69 100644
--- a/keyboards/bpiphany/kitten_paw/config.h
+++ b/keyboards/bpiphany/kitten_paw/config.h
@@ -105,5 +105,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/bpiphany/sixshooter/config.h b/keyboards/bpiphany/sixshooter/config.h
index 9e7a1803af..74acfac9b0 100644
--- a/keyboards/bpiphany/sixshooter/config.h
+++ b/keyboards/bpiphany/sixshooter/config.h
@@ -59,5 +59,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h
index 54a1c2e7f4..1831e3e4d4 100644
--- a/keyboards/bpiphany/tiger_lily/config.h
+++ b/keyboards/bpiphany/tiger_lily/config.h
@@ -96,5 +96,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/bpiphany/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h
index a6589be4a1..1f1cf72a18 100644
--- a/keyboards/bpiphany/unloved_bastard/config.h
+++ b/keyboards/bpiphany/unloved_bastard/config.h
@@ -89,5 +89,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/bt66tech/bt66tech60/config.h b/keyboards/bt66tech/bt66tech60/config.h
index 7083b0f70d..18a7a2d85e 100644
--- a/keyboards/bt66tech/bt66tech60/config.h
+++ b/keyboards/bt66tech/bt66tech60/config.h
@@ -91,5 +91,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/bthlabs/geekpad/config.h b/keyboards/bthlabs/geekpad/config.h
index 7994a9cab5..5dad96a7b4 100644
--- a/keyboards/bthlabs/geekpad/config.h
+++ b/keyboards/bthlabs/geekpad/config.h
@@ -114,8 +114,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/buildakb/potato65/config.h b/keyboards/buildakb/potato65/config.h
index 350e1018f7..4a0a17ace0 100644
--- a/keyboards/buildakb/potato65/config.h
+++ b/keyboards/buildakb/potato65/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/buildakb/potato65hs/config.h b/keyboards/buildakb/potato65hs/config.h
index b3b2cfdcd4..cf565d8176 100644
--- a/keyboards/buildakb/potato65hs/config.h
+++ b/keyboards/buildakb/potato65hs/config.h
@@ -47,10 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
 #    define RGBLIGHT_ANIMATIONS
diff --git a/keyboards/buildakb/potato65s/config.h b/keyboards/buildakb/potato65s/config.h
index 5183327855..c1374558c9 100644
--- a/keyboards/buildakb/potato65s/config.h
+++ b/keyboards/buildakb/potato65s/config.h
@@ -47,10 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define RGB_DI_PIN D5
 #ifdef RGB_DI_PIN
 #    define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/caffeinated/serpent65/config.h b/keyboards/caffeinated/serpent65/config.h
index f09a1c2b08..358e7d0f4c 100644
--- a/keyboards/caffeinated/serpent65/config.h
+++ b/keyboards/caffeinated/serpent65/config.h
@@ -105,5 +105,3 @@ B0, which is unconnected on the PCB
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h
index 303bde7e77..f02b29c1b9 100644
--- a/keyboards/canary/canary60rgb/v1/config.h
+++ b/keyboards/canary/canary60rgb/v1/config.h
@@ -65,10 +65,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
@@ -91,4 +87,4 @@
 #    define DRIVER_ADDR_1 0b1010000
 #    define DRIVER_COUNT 1
 #    define DRIVER_LED_TOTAL 63
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h
index 25ddcf0c91..16f308ad2c 100644
--- a/keyboards/cannonkeys/adelie/config.h
+++ b/keyboards/cannonkeys/adelie/config.h
@@ -106,10 +106,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/cannonkeys/aella/config.h b/keyboards/cannonkeys/aella/config.h
index b32880d409..dd8a6376d5 100644
--- a/keyboards/cannonkeys/aella/config.h
+++ b/keyboards/cannonkeys/aella/config.h
@@ -59,5 +59,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/an_c/config.h b/keyboards/cannonkeys/an_c/config.h
index 83e98c2e28..09e2382595 100644
--- a/keyboards/cannonkeys/an_c/config.h
+++ b/keyboards/cannonkeys/an_c/config.h
@@ -74,5 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h
index 1ba5c0fb0e..40984c3f64 100644
--- a/keyboards/cannonkeys/atlas/config.h
+++ b/keyboards/cannonkeys/atlas/config.h
@@ -68,5 +68,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/balance/config.h b/keyboards/cannonkeys/balance/config.h
index 2cdf7d27a7..937de92f55 100644
--- a/keyboards/cannonkeys/balance/config.h
+++ b/keyboards/cannonkeys/balance/config.h
@@ -67,5 +67,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/chimera65/config.h b/keyboards/cannonkeys/chimera65/config.h
index f7108264af..1fe204a4ad 100644
--- a/keyboards/cannonkeys/chimera65/config.h
+++ b/keyboards/cannonkeys/chimera65/config.h
@@ -66,5 +66,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h
index dc2007c17c..6dd0d0d7f8 100644
--- a/keyboards/cannonkeys/db60/config.h
+++ b/keyboards/cannonkeys/db60/config.h
@@ -73,5 +73,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h
index 0a76a3466f..7173a46378 100644
--- a/keyboards/cannonkeys/devastatingtkl/config.h
+++ b/keyboards/cannonkeys/devastatingtkl/config.h
@@ -74,5 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
index 91d89ec81d..fc305188a6 100644
--- a/keyboards/cannonkeys/hoodrowg/config.h
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@@ -75,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h
index d34bc0003e..9b4aac8e15 100644
--- a/keyboards/cannonkeys/instant60/config.h
+++ b/keyboards/cannonkeys/instant60/config.h
@@ -74,5 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/instant65/config.h b/keyboards/cannonkeys/instant65/config.h
index dc097494b2..464ef09044 100644
--- a/keyboards/cannonkeys/instant65/config.h
+++ b/keyboards/cannonkeys/instant65/config.h
@@ -75,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/iron165/config.h b/keyboards/cannonkeys/iron165/config.h
index 899e73bb9e..b0b3dd8d7b 100644
--- a/keyboards/cannonkeys/iron165/config.h
+++ b/keyboards/cannonkeys/iron165/config.h
@@ -67,5 +67,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h
index 7a8a7ff28c..aef5a3e374 100644
--- a/keyboards/cannonkeys/obliterated75/config.h
+++ b/keyboards/cannonkeys/obliterated75/config.h
@@ -75,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/onyx/config.h b/keyboards/cannonkeys/onyx/config.h
index 4fd95bd84a..2149520a5a 100644
--- a/keyboards/cannonkeys/onyx/config.h
+++ b/keyboards/cannonkeys/onyx/config.h
@@ -65,5 +65,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/ortho48/config.h b/keyboards/cannonkeys/ortho48/config.h
index 35471484ca..cc904a27a0 100644
--- a/keyboards/cannonkeys/ortho48/config.h
+++ b/keyboards/cannonkeys/ortho48/config.h
@@ -70,5 +70,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h
index 36d92de76c..4e7db76b6b 100644
--- a/keyboards/cannonkeys/ortho60/config.h
+++ b/keyboards/cannonkeys/ortho60/config.h
@@ -70,5 +70,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/ortho75/config.h b/keyboards/cannonkeys/ortho75/config.h
index e05bfba75a..93fe02f536 100644
--- a/keyboards/cannonkeys/ortho75/config.h
+++ b/keyboards/cannonkeys/ortho75/config.h
@@ -73,5 +73,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/practice60/config.h b/keyboards/cannonkeys/practice60/config.h
index d89671f557..6937f5752a 100644
--- a/keyboards/cannonkeys/practice60/config.h
+++ b/keyboards/cannonkeys/practice60/config.h
@@ -70,5 +70,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/practice65/config.h b/keyboards/cannonkeys/practice65/config.h
index 69a2f859f1..343d4d5272 100644
--- a/keyboards/cannonkeys/practice65/config.h
+++ b/keyboards/cannonkeys/practice65/config.h
@@ -70,5 +70,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/rekt1800/config.h b/keyboards/cannonkeys/rekt1800/config.h
index e6f7de2e86..78cd623953 100644
--- a/keyboards/cannonkeys/rekt1800/config.h
+++ b/keyboards/cannonkeys/rekt1800/config.h
@@ -69,5 +69,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h
index a263ebc713..dd8563df6b 100644
--- a/keyboards/cannonkeys/sagittarius/config.h
+++ b/keyboards/cannonkeys/sagittarius/config.h
@@ -80,5 +80,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h
index 53e4c18e5e..2a0ac91b2d 100644
--- a/keyboards/cannonkeys/satisfaction75/config.h
+++ b/keyboards/cannonkeys/satisfaction75/config.h
@@ -107,5 +107,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/savage65/config.h b/keyboards/cannonkeys/savage65/config.h
index 3c3166c919..049574c532 100644
--- a/keyboards/cannonkeys/savage65/config.h
+++ b/keyboards/cannonkeys/savage65/config.h
@@ -75,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h
index cddff4ce7e..821c9b7b5d 100644
--- a/keyboards/cannonkeys/tmov2/config.h
+++ b/keyboards/cannonkeys/tmov2/config.h
@@ -74,5 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/tsukuyomi/config.h b/keyboards/cannonkeys/tsukuyomi/config.h
index d3e955450f..51411c5241 100644
--- a/keyboards/cannonkeys/tsukuyomi/config.h
+++ b/keyboards/cannonkeys/tsukuyomi/config.h
@@ -75,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cannonkeys/vicious40/config.h b/keyboards/cannonkeys/vicious40/config.h
index 768ee7397d..c4f8c26235 100644
--- a/keyboards/cannonkeys/vicious40/config.h
+++ b/keyboards/cannonkeys/vicious40/config.h
@@ -66,5 +66,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/capsunlocked/cu24/config.h b/keyboards/capsunlocked/cu24/config.h
index a2a4e727ff..cd5e0ccd39 100644
--- a/keyboards/capsunlocked/cu24/config.h
+++ b/keyboards/capsunlocked/cu24/config.h
@@ -108,5 +108,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/capsunlocked/cu65/config.h b/keyboards/capsunlocked/cu65/config.h
index 8fac6cd06d..79ff7435bd 100644
--- a/keyboards/capsunlocked/cu65/config.h
+++ b/keyboards/capsunlocked/cu65/config.h
@@ -99,7 +99,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/capsunlocked/cu75/config.h b/keyboards/capsunlocked/cu75/config.h
index cfcb08cce1..8ad8feb24a 100644
--- a/keyboards/capsunlocked/cu75/config.h
+++ b/keyboards/capsunlocked/cu75/config.h
@@ -90,5 +90,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/centromere/config.h b/keyboards/centromere/config.h
index b4cae20332..69af48c30f 100644
--- a/keyboards/centromere/config.h
+++ b/keyboards/centromere/config.h
@@ -54,5 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/checkerboards/plexus75/config.h b/keyboards/checkerboards/plexus75/config.h
index 5c123c43f1..f4d84d9d57 100644
--- a/keyboards/checkerboards/plexus75/config.h
+++ b/keyboards/checkerboards/plexus75/config.h
@@ -60,8 +60,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // ws2812 options
 #define RGB_DI_PIN D3 // pin the DI on the ws2812 is hooked-up to
diff --git a/keyboards/checkerboards/pursuit40/config.h b/keyboards/checkerboards/pursuit40/config.h
index b73872306a..53b1ef90a5 100644
--- a/keyboards/checkerboards/pursuit40/config.h
+++ b/keyboards/checkerboards/pursuit40/config.h
@@ -61,8 +61,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // ws2812 options
 #define RGB_DI_PIN F0 // pin the DI on the ws2812 is hooked-up to
diff --git a/keyboards/checkerboards/quark/config.h b/keyboards/checkerboards/quark/config.h
index 353569d8ec..d0ecf3bde8 100644
--- a/keyboards/checkerboards/quark/config.h
+++ b/keyboards/checkerboards/quark/config.h
@@ -61,8 +61,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // ws2812 options
 #define RGB_DI_PIN D0 // pin the DI on the ws2812 is hooked-up to
diff --git a/keyboards/ck60i/config.h b/keyboards/ck60i/config.h
index 113cb5a421..3e09f1dfb0 100644
--- a/keyboards/ck60i/config.h
+++ b/keyboards/ck60i/config.h
@@ -75,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ckeys/handwire_101/config.h b/keyboards/ckeys/handwire_101/config.h
index 42e26be869..6b3f6c5b7f 100755
--- a/keyboards/ckeys/handwire_101/config.h
+++ b/keyboards/ckeys/handwire_101/config.h
@@ -115,5 +115,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ckeys/nakey/config.h b/keyboards/ckeys/nakey/config.h
index 26ba86e146..b620ff08c7 100644
--- a/keyboards/ckeys/nakey/config.h
+++ b/keyboards/ckeys/nakey/config.h
@@ -105,5 +105,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ckeys/obelus/config.h b/keyboards/ckeys/obelus/config.h
index 00e224c206..1759f6c5fc 100644
--- a/keyboards/ckeys/obelus/config.h
+++ b/keyboards/ckeys/obelus/config.h
@@ -100,8 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #ifdef AUDIO_ENABLE
   #define AUDIO_VOICES
diff --git a/keyboards/ckeys/thedora/config.h b/keyboards/ckeys/thedora/config.h
index bfc3141731..8e96c8ed06 100755
--- a/keyboards/ckeys/thedora/config.h
+++ b/keyboards/ckeys/thedora/config.h
@@ -115,5 +115,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ckeys/washington/config.h b/keyboards/ckeys/washington/config.h
index 0b7da2782e..2d5a8ce3ad 100644
--- a/keyboards/ckeys/washington/config.h
+++ b/keyboards/ckeys/washington/config.h
@@ -138,10 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/clueboard/66_hotswap/config.h b/keyboards/clueboard/66_hotswap/config.h
index 9b1dba3dc3..4e3af45222 100644
--- a/keyboards/clueboard/66_hotswap/config.h
+++ b/keyboards/clueboard/66_hotswap/config.h
@@ -23,4 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *  These options are also useful to firmware size reduction.
  */
 #define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
diff --git a/keyboards/clueboard/66_hotswap/gen1/config.h b/keyboards/clueboard/66_hotswap/gen1/config.h
index 1e124745bd..b1bf6b3543 100644
--- a/keyboards/clueboard/66_hotswap/gen1/config.h
+++ b/keyboards/clueboard/66_hotswap/gen1/config.h
@@ -62,8 +62,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
  /* Backlight configuration
  */
diff --git a/keyboards/coarse/cordillera/config.h b/keyboards/coarse/cordillera/config.h
index 1d8c9e294c..7bc2dca560 100644
--- a/keyboards/coarse/cordillera/config.h
+++ b/keyboards/coarse/cordillera/config.h
@@ -71,5 +71,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h
index 0b5e5e9342..9977a5033e 100644
--- a/keyboards/contender/config.h
+++ b/keyboards/contender/config.h
@@ -139,10 +139,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/converter/a1200/miss1200/config.h b/keyboards/converter/a1200/miss1200/config.h
index 5a6c679651..7347f1948c 100644
--- a/keyboards/converter/a1200/miss1200/config.h
+++ b/keyboards/converter/a1200/miss1200/config.h
@@ -58,5 +58,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/converter/a1200/teensy2pp/config.h b/keyboards/converter/a1200/teensy2pp/config.h
index 19e7ca9b95..84a81c297c 100644
--- a/keyboards/converter/a1200/teensy2pp/config.h
+++ b/keyboards/converter/a1200/teensy2pp/config.h
@@ -57,5 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/converter/modelm101/config.h b/keyboards/converter/modelm101/config.h
index 639b325ff3..33c6303036 100644
--- a/keyboards/converter/modelm101/config.h
+++ b/keyboards/converter/modelm101/config.h
@@ -68,5 +68,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/converter/modelm_ssk/config.h b/keyboards/converter/modelm_ssk/config.h
index 74d549ba49..ff7aa12000 100644
--- a/keyboards/converter/modelm_ssk/config.h
+++ b/keyboards/converter/modelm_ssk/config.h
@@ -72,5 +72,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/converter/siemens_tastatur/config.h b/keyboards/converter/siemens_tastatur/config.h
index cd54ed3d83..86fe59fbd5 100644
--- a/keyboards/converter/siemens_tastatur/config.h
+++ b/keyboards/converter/siemens_tastatur/config.h
@@ -62,5 +62,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/cool836a/config.h b/keyboards/cool836a/config.h
index 3ac036786f..4cf356d8b3 100644
--- a/keyboards/cool836a/config.h
+++ b/keyboards/cool836a/config.h
@@ -144,10 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/copenhagen_click/click_pad_v1/config.h b/keyboards/copenhagen_click/click_pad_v1/config.h
index 08a9777b51..7fc16c54fe 100755
--- a/keyboards/copenhagen_click/click_pad_v1/config.h
+++ b/keyboards/copenhagen_click/click_pad_v1/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/coseyfannitutti/discipad/config.h b/keyboards/coseyfannitutti/discipad/config.h
index 33ce2576f8..69e2e1561c 100644
--- a/keyboards/coseyfannitutti/discipad/config.h
+++ b/keyboards/coseyfannitutti/discipad/config.h
@@ -135,8 +135,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/coseyfannitutti/discipline/config.h b/keyboards/coseyfannitutti/discipline/config.h
index 70bc4536f3..570fff8752 100644
--- a/keyboards/coseyfannitutti/discipline/config.h
+++ b/keyboards/coseyfannitutti/discipline/config.h
@@ -133,8 +133,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/coseyfannitutti/mullet/config.h b/keyboards/coseyfannitutti/mullet/config.h
index b186aa82d1..d01be9744c 100644
--- a/keyboards/coseyfannitutti/mullet/config.h
+++ b/keyboards/coseyfannitutti/mullet/config.h
@@ -115,6 +115,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/coseyfannitutti/mulletpad/config.h b/keyboards/coseyfannitutti/mulletpad/config.h
index b2a9303571..e6d68469bf 100644
--- a/keyboards/coseyfannitutti/mulletpad/config.h
+++ b/keyboards/coseyfannitutti/mulletpad/config.h
@@ -115,6 +115,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/coseyfannitutti/mysterium/config.h b/keyboards/coseyfannitutti/mysterium/config.h
index 0b2df0a051..4fa4b15708 100644
--- a/keyboards/coseyfannitutti/mysterium/config.h
+++ b/keyboards/coseyfannitutti/mysterium/config.h
@@ -131,8 +131,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/coseyfannitutti/romeo/config.h b/keyboards/coseyfannitutti/romeo/config.h
index 93cda95d20..811787df79 100644
--- a/keyboards/coseyfannitutti/romeo/config.h
+++ b/keyboards/coseyfannitutti/romeo/config.h
@@ -134,8 +134,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/craftwalk/config.h b/keyboards/craftwalk/config.h
index 484a2e13aa..f87c61cdb1 100644
--- a/keyboards/craftwalk/config.h
+++ b/keyboards/craftwalk/config.h
@@ -137,9 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/crazy_keyboard_68/config.h b/keyboards/crazy_keyboard_68/config.h
index 53759a716a..ea2bc568bc 100644
--- a/keyboards/crazy_keyboard_68/config.h
+++ b/keyboards/crazy_keyboard_68/config.h
@@ -140,10 +140,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/crkbd/config.h b/keyboards/crkbd/config.h
index f354efbb47..02732819f9 100644
--- a/keyboards/crkbd/config.h
+++ b/keyboards/crkbd/config.h
@@ -68,9 +68,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-#define USE_SERIAL
 
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+#define USE_SERIAL
diff --git a/keyboards/cutie_club/wraith/config.h b/keyboards/cutie_club/wraith/config.h
index 685aed81d6..fa7467eb4a 100644
--- a/keyboards/cutie_club/wraith/config.h
+++ b/keyboards/cutie_club/wraith/config.h
@@ -134,8 +134,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/dailycraft/bat43/config.h b/keyboards/dailycraft/bat43/config.h
index 19b485fd16..4c42f6a06d 100644
--- a/keyboards/dailycraft/bat43/config.h
+++ b/keyboards/dailycraft/bat43/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/dailycraft/claw44/config.h b/keyboards/dailycraft/claw44/config.h
index 0bd74ff833..cfb6bf4ffc 100644
--- a/keyboards/dailycraft/claw44/config.h
+++ b/keyboards/dailycraft/claw44/config.h
@@ -19,6 +19,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/dailycraft/claw44/rev1/config.h b/keyboards/dailycraft/claw44/rev1/config.h
index 8116b605cd..bcfcbababa 100644
--- a/keyboards/dailycraft/claw44/rev1/config.h
+++ b/keyboards/dailycraft/claw44/rev1/config.h
@@ -70,5 +70,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/dailycraft/owl8/config.h b/keyboards/dailycraft/owl8/config.h
index d28fd9c927..b0634c2566 100644
--- a/keyboards/dailycraft/owl8/config.h
+++ b/keyboards/dailycraft/owl8/config.h
@@ -144,10 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/dailycraft/stickey4/config.h b/keyboards/dailycraft/stickey4/config.h
index 85e49bca96..d9bd0f3301 100644
--- a/keyboards/dailycraft/stickey4/config.h
+++ b/keyboards/dailycraft/stickey4/config.h
@@ -144,10 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/dailycraft/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h
index cfb4274921..0d53ff7634 100644
--- a/keyboards/dailycraft/wings42/rev1/config.h
+++ b/keyboards/dailycraft/wings42/rev1/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
index f0f04eca59..b2fe3210b6 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/config.h
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/dailycraft/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h
index 836833718c..f1e7716bb4 100644
--- a/keyboards/dailycraft/wings42/rev2/config.h
+++ b/keyboards/dailycraft/wings42/rev2/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/dc01/left/config.h b/keyboards/dc01/left/config.h
index 43883975c4..d5b2962590 100644
--- a/keyboards/dc01/left/config.h
+++ b/keyboards/dc01/left/config.h
@@ -120,5 +120,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/delikeeb/flatbread60/config.h b/keyboards/delikeeb/flatbread60/config.h
index 5d63a8f5fc..3de88a16f6 100644
--- a/keyboards/delikeeb/flatbread60/config.h
+++ b/keyboards/delikeeb/flatbread60/config.h
@@ -116,7 +116,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/delikeeb/vaguettelite/config.h b/keyboards/delikeeb/vaguettelite/config.h
index ef1aec49ef..5ad1942437 100644
--- a/keyboards/delikeeb/vaguettelite/config.h
+++ b/keyboards/delikeeb/vaguettelite/config.h
@@ -110,10 +110,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index d584e32a39..8213404eb3 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -91,10 +91,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define GRAVE_ESC_CTRL_OVERRIDE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index 8893bb09f5..8397424aa9 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -91,10 +91,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define GRAVE_ESC_CTRL_OVERRIDE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/delikeeb/vaneela/config.h b/keyboards/delikeeb/vaneela/config.h
index 4feaf44a72..936c8eb5ec 100644
--- a/keyboards/delikeeb/vaneela/config.h
+++ b/keyboards/delikeeb/vaneela/config.h
@@ -101,10 +101,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/delikeeb/vaneelaex/config.h b/keyboards/delikeeb/vaneelaex/config.h
index 4eb6303838..27d2420176 100644
--- a/keyboards/delikeeb/vaneelaex/config.h
+++ b/keyboards/delikeeb/vaneelaex/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/delikeeb/waaffle/rev3/config.h b/keyboards/delikeeb/waaffle/rev3/config.h
index 0c4327623d..12ff241f4c 100644
--- a/keyboards/delikeeb/waaffle/rev3/config.h
+++ b/keyboards/delikeeb/waaffle/rev3/config.h
@@ -128,10 +128,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 6
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/deltapad/config.h b/keyboards/deltapad/config.h
index a4a78f244a..186a11ee27 100644
--- a/keyboards/deltapad/config.h
+++ b/keyboards/deltapad/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/deltasplit75/v2/config.h b/keyboards/deltasplit75/v2/config.h
index 397683ce45..ffc2724e5e 100644
--- a/keyboards/deltasplit75/v2/config.h
+++ b/keyboards/deltasplit75/v2/config.h
@@ -77,5 +77,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/demiurge/config.h b/keyboards/demiurge/config.h
index abe6c193c4..b7e3c70b3c 100755
--- a/keyboards/demiurge/config.h
+++ b/keyboards/demiurge/config.h
@@ -73,7 +73,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* disable print */
 //#define NO_PRINT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/dichotomy/config.h b/keyboards/dichotomy/config.h
index 40e7f18e6f..c4bb030900 100644
--- a/keyboards/dichotomy/config.h
+++ b/keyboards/dichotomy/config.h
@@ -54,5 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/dk60/config.h b/keyboards/dk60/config.h
index bec665419b..eef0ddc474 100644
--- a/keyboards/dk60/config.h
+++ b/keyboards/dk60/config.h
@@ -132,10 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index 89ea9e7903..e4fb80ad2e 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -106,5 +106,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h
index 8bccf4bbb5..adc0d165c3 100644
--- a/keyboards/dm9records/lain/config.h
+++ b/keyboards/dm9records/lain/config.h
@@ -40,8 +40,4 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 6
diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h
index 86ff5be356..ab6b0fbabc 100644
--- a/keyboards/dm9records/plaid/config.h
+++ b/keyboards/dm9records/plaid/config.h
@@ -135,8 +135,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h
index 7ad97ea453..4faec53721 100644
--- a/keyboards/dm9records/tartan/config.h
+++ b/keyboards/dm9records/tartan/config.h
@@ -133,8 +133,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/donutcables/scrabblepad/config.h b/keyboards/donutcables/scrabblepad/config.h
index 5543c61335..2c6c704bde 100644
--- a/keyboards/donutcables/scrabblepad/config.h
+++ b/keyboards/donutcables/scrabblepad/config.h
@@ -143,8 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/doppelganger/config.h b/keyboards/doppelganger/config.h
index d063cee5bc..39e29e7c15 100644
--- a/keyboards/doppelganger/config.h
+++ b/keyboards/doppelganger/config.h
@@ -144,8 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/draytronics/daisy/config.h b/keyboards/draytronics/daisy/config.h
index b524f89028..fa04b0d41c 100644
--- a/keyboards/draytronics/daisy/config.h
+++ b/keyboards/draytronics/daisy/config.h
@@ -94,9 +94,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 //Underglow
 #define RGB_DI_PIN D4 // Underglow led pin
diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h
index f7b50dee75..9c4db29ac6 100644
--- a/keyboards/draytronics/scarlet/config.h
+++ b/keyboards/draytronics/scarlet/config.h
@@ -91,6 +91,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/drewkeys/iskar/config.h b/keyboards/drewkeys/iskar/config.h
index e20369fde0..956456201f 100644
--- a/keyboards/drewkeys/iskar/config.h
+++ b/keyboards/drewkeys/iskar/config.h
@@ -50,7 +50,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
index c5c13bd270..8d61f61128 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/config.h
@@ -107,7 +107,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 //#define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h
index f417d64499..eb1ff71536 100644
--- a/keyboards/dtisaac/dtisaac01/config.h
+++ b/keyboards/dtisaac/dtisaac01/config.h
@@ -81,15 +81,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 //#define FORCE_NKRO
 
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable these deprecated features by default */
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h
index 3b6c7d89fd..0512d4a1f4 100644
--- a/keyboards/duck/jetfire/config.h
+++ b/keyboards/duck/jetfire/config.h
@@ -92,5 +92,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/dztech/dz60rgb/v1/config.h b/keyboards/dztech/dz60rgb/v1/config.h
index 0d464b5d6b..7bdad00144 100644
--- a/keyboards/dztech/dz60rgb/v1/config.h
+++ b/keyboards/dztech/dz60rgb/v1/config.h
@@ -31,10 +31,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/dztech/dz60rgb/v2/config.h b/keyboards/dztech/dz60rgb/v2/config.h
index 3db8ea40f5..9426a7be99 100644
--- a/keyboards/dztech/dz60rgb/v2/config.h
+++ b/keyboards/dztech/dz60rgb/v2/config.h
@@ -31,10 +31,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/dztech/dz60rgb/v2_1/config.h b/keyboards/dztech/dz60rgb/v2_1/config.h
index d785d1e539..7e5dfd6703 100644
--- a/keyboards/dztech/dz60rgb/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb/v2_1/config.h
@@ -47,10 +47,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
diff --git a/keyboards/dztech/dz60rgb_ansi/v1/config.h b/keyboards/dztech/dz60rgb_ansi/v1/config.h
index 176bb03a13..ccfe91b66b 100644
--- a/keyboards/dztech/dz60rgb_ansi/v1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v1/config.h
@@ -31,10 +31,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/dztech/dz60rgb_ansi/v2/config.h b/keyboards/dztech/dz60rgb_ansi/v2/config.h
index 5ff2cd6a8c..865ac2ab21 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2/config.h
@@ -31,10 +31,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
index 84aa7802c3..64e2a40bda 100644
--- a/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_ansi/v2_1/config.h
@@ -47,10 +47,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/dztech/dz60rgb_wkl/v1/config.h b/keyboards/dztech/dz60rgb_wkl/v1/config.h
index b8c70ff4fb..9af78167ad 100644
--- a/keyboards/dztech/dz60rgb_wkl/v1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h
@@ -31,10 +31,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/dztech/dz60rgb_wkl/v2/config.h b/keyboards/dztech/dz60rgb_wkl/v2/config.h
index 5d715a1e0d..140d74fee0 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h
@@ -31,10 +31,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
index 960285b976..3ab221391e 100644
--- a/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2_1/config.h
@@ -47,10 +47,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
diff --git a/keyboards/dztech/dz64rgb/config.h b/keyboards/dztech/dz64rgb/config.h
index 224c2672cc..86848077fa 100644
--- a/keyboards/dztech/dz64rgb/config.h
+++ b/keyboards/dztech/dz64rgb/config.h
@@ -32,8 +32,6 @@
 #define DEBOUNCE 5
 
 #define USB_SUSPEND_WAKEUP_DELAY 5000
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_MATRIX_KEYPRESSES
@@ -69,4 +67,4 @@
 #define DRIVER_COUNT 1
 #define DRIVER_LED_TOTAL 64
 #endif
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
\ No newline at end of file
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/dztech/dz65rgb/v1/config.h b/keyboards/dztech/dz65rgb/v1/config.h
index 5fe0ba3eba..d281eaa51e 100644
--- a/keyboards/dztech/dz65rgb/v1/config.h
+++ b/keyboards/dztech/dz65rgb/v1/config.h
@@ -42,10 +42,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/dztech/dz65rgb/v2/config.h b/keyboards/dztech/dz65rgb/v2/config.h
index b8677e4436..5267f42aa2 100644
--- a/keyboards/dztech/dz65rgb/v2/config.h
+++ b/keyboards/dztech/dz65rgb/v2/config.h
@@ -42,10 +42,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/dztech/dz65rgb/v3/config.h b/keyboards/dztech/dz65rgb/v3/config.h
index ba7863f42a..6c21fa22c2 100755
--- a/keyboards/dztech/dz65rgb/v3/config.h
+++ b/keyboards/dztech/dz65rgb/v3/config.h
@@ -37,9 +37,7 @@
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
diff --git a/keyboards/e88/config.h b/keyboards/e88/config.h
index 11b040c92d..e83dfb9b06 100644
--- a/keyboards/e88/config.h
+++ b/keyboards/e88/config.h
@@ -100,9 +100,5 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define QMK_ESC_OUTPUT F0 // usually COL
 #define QMK_ESC_INPUT B7 // usually ROW
diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h
index 733b59c5a7..b37af15ea6 100644
--- a/keyboards/ealdin/quadrant/config.h
+++ b/keyboards/ealdin/quadrant/config.h
@@ -99,5 +99,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/earth_rover/config.h b/keyboards/earth_rover/config.h
index 6e958f1388..2e7ceda4e1 100644
--- a/keyboards/earth_rover/config.h
+++ b/keyboards/earth_rover/config.h
@@ -105,10 +105,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/eco/config.h b/keyboards/eco/config.h
index e5258e3a0b..5c4466985c 100644
--- a/keyboards/eco/config.h
+++ b/keyboards/eco/config.h
@@ -58,8 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #ifdef SUBPROJECT_rev1
     #include "rev1/config.h"
diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
index ab4b006827..8580aabec5 100644
--- a/keyboards/edi/hardlight/mk2/config.h
+++ b/keyboards/edi/hardlight/mk2/config.h
@@ -77,5 +77,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/edi/standaside/config.h b/keyboards/edi/standaside/config.h
index 797a463a15..c72c915d82 100644
--- a/keyboards/edi/standaside/config.h
+++ b/keyboards/edi/standaside/config.h
@@ -99,6 +99,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index d8a949269e..919c112722 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -125,9 +125,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h
index ed5bb730a7..90e76d9c5a 100644
--- a/keyboards/efreet/config.h
+++ b/keyboards/efreet/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/emajesty/eiri/config.h b/keyboards/emajesty/eiri/config.h
index ea7afa4822..99b606770d 100644
--- a/keyboards/emajesty/eiri/config.h
+++ b/keyboards/emajesty/eiri/config.h
@@ -87,10 +87,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/eniigmakeyboards/ek65/config.h b/keyboards/eniigmakeyboards/ek65/config.h
index bd8f59ef1b..7a272c1491 100644
--- a/keyboards/eniigmakeyboards/ek65/config.h
+++ b/keyboards/eniigmakeyboards/ek65/config.h
@@ -137,11 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/eniigmakeyboards/ek87/config.h b/keyboards/eniigmakeyboards/ek87/config.h
index fdde69cef3..838f46f844 100644
--- a/keyboards/eniigmakeyboards/ek87/config.h
+++ b/keyboards/eniigmakeyboards/ek87/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ep/40/config.h b/keyboards/ep/40/config.h
index 40ed06ad24..780d64fd69 100644
--- a/keyboards/ep/40/config.h
+++ b/keyboards/ep/40/config.h
@@ -105,5 +105,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ep/96/config.h b/keyboards/ep/96/config.h
index 83ddb873de..bcb1074867 100644
--- a/keyboards/ep/96/config.h
+++ b/keyboards/ep/96/config.h
@@ -101,5 +101,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ep/comsn/mollydooker/config.h b/keyboards/ep/comsn/mollydooker/config.h
index ec4f47f870..def201cd8b 100644
--- a/keyboards/ep/comsn/mollydooker/config.h
+++ b/keyboards/ep/comsn/mollydooker/config.h
@@ -110,5 +110,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 109a80d2c5..f25ff162cd 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -205,6 +205,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+
 //#define DEBUG_MATRIX_SCAN_RATE
diff --git a/keyboards/ergosaurus/config.h b/keyboards/ergosaurus/config.h
index e4981e0013..41f9a09311 100644
--- a/keyboards/ergosaurus/config.h
+++ b/keyboards/ergosaurus/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ergoslab/rev1/config.h b/keyboards/ergoslab/rev1/config.h
index c9382ea765..b754a7810c 100644
--- a/keyboards/ergoslab/rev1/config.h
+++ b/keyboards/ergoslab/rev1/config.h
@@ -66,5 +66,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ergotravel/rev1/config.h b/keyboards/ergotravel/rev1/config.h
index dc08ceab8e..096a85d370 100644
--- a/keyboards/ergotravel/rev1/config.h
+++ b/keyboards/ergotravel/rev1/config.h
@@ -76,5 +76,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h
index 82035518a6..72abf556d4 100644
--- a/keyboards/ericrlau/numdiscipline/rev1/config.h
+++ b/keyboards/ericrlau/numdiscipline/rev1/config.h
@@ -135,8 +135,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/esca/getawayvan/config.h b/keyboards/esca/getawayvan/config.h
index 3b718c5835..34498cc3fb 100644
--- a/keyboards/esca/getawayvan/config.h
+++ b/keyboards/esca/getawayvan/config.h
@@ -73,5 +73,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/esca/getawayvan_f042/config.h b/keyboards/esca/getawayvan_f042/config.h
index 8921e9db4d..6812d4e52b 100644
--- a/keyboards/esca/getawayvan_f042/config.h
+++ b/keyboards/esca/getawayvan_f042/config.h
@@ -72,5 +72,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index fbcdb45021..5b5ad02f44 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/keyboards/eternal_keypad/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/evil80/config.h b/keyboards/evil80/config.h
index 4036b473a0..6876c0e086 100644
--- a/keyboards/evil80/config.h
+++ b/keyboards/evil80/config.h
@@ -55,5 +55,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/evolv/config.h b/keyboards/evolv/config.h
index 59223cd2c9..3a3ff3be35 100644
--- a/keyboards/evolv/config.h
+++ b/keyboards/evolv/config.h
@@ -77,5 +77,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/evyd13/atom47/rev5/config.h b/keyboards/evyd13/atom47/rev5/config.h
index 383aa23789..25c419b4cd 100644
--- a/keyboards/evyd13/atom47/rev5/config.h
+++ b/keyboards/evyd13/atom47/rev5/config.h
@@ -138,10 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/evyd13/eon40/config.h b/keyboards/evyd13/eon40/config.h
index 8f39d0532e..14cbe42099 100644
--- a/keyboards/evyd13/eon40/config.h
+++ b/keyboards/evyd13/eon40/config.h
@@ -138,8 +138,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/evyd13/eon65/config.h b/keyboards/evyd13/eon65/config.h
index 7d4e80d5bb..08922a2d4c 100644
--- a/keyboards/evyd13/eon65/config.h
+++ b/keyboards/evyd13/eon65/config.h
@@ -135,8 +135,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/evyd13/eon75/config.h b/keyboards/evyd13/eon75/config.h
index da2775fd40..203cfe8a7d 100644
--- a/keyboards/evyd13/eon75/config.h
+++ b/keyboards/evyd13/eon75/config.h
@@ -140,8 +140,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/evyd13/eon87/config.h b/keyboards/evyd13/eon87/config.h
index 18a21bac27..bfa593db51 100644
--- a/keyboards/evyd13/eon87/config.h
+++ b/keyboards/evyd13/eon87/config.h
@@ -135,8 +135,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/evyd13/eon95/config.h b/keyboards/evyd13/eon95/config.h
index 48de3f3782..6a6b329c29 100644
--- a/keyboards/evyd13/eon95/config.h
+++ b/keyboards/evyd13/eon95/config.h
@@ -140,8 +140,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/evyd13/gh80_1800/config.h b/keyboards/evyd13/gh80_1800/config.h
index 26ad8a8b13..d2fa370c0d 100644
--- a/keyboards/evyd13/gh80_1800/config.h
+++ b/keyboards/evyd13/gh80_1800/config.h
@@ -140,8 +140,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/evyd13/gh80_3700/config.h b/keyboards/evyd13/gh80_3700/config.h
index 200f179cf7..d05ca87958 100644
--- a/keyboards/evyd13/gh80_3700/config.h
+++ b/keyboards/evyd13/gh80_3700/config.h
@@ -135,8 +135,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // Define rotary encoder
 #define ENCODERS_PAD_A { F1 }
diff --git a/keyboards/evyd13/gud70/config.h b/keyboards/evyd13/gud70/config.h
index 914a87f4f5..395d1c303e 100644
--- a/keyboards/evyd13/gud70/config.h
+++ b/keyboards/evyd13/gud70/config.h
@@ -141,10 +141,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/evyd13/minitomic/config.h b/keyboards/evyd13/minitomic/config.h
index ad31fd0aec..01af62d69d 100644
--- a/keyboards/evyd13/minitomic/config.h
+++ b/keyboards/evyd13/minitomic/config.h
@@ -138,8 +138,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/evyd13/mx5160/config.h b/keyboards/evyd13/mx5160/config.h
index 5cce240a87..3d25e1704f 100644
--- a/keyboards/evyd13/mx5160/config.h
+++ b/keyboards/evyd13/mx5160/config.h
@@ -144,8 +144,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/evyd13/nt660/config.h b/keyboards/evyd13/nt660/config.h
index 225f2ccf2d..f633a4206e 100644
--- a/keyboards/evyd13/nt660/config.h
+++ b/keyboards/evyd13/nt660/config.h
@@ -140,10 +140,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/evyd13/nt750/config.h b/keyboards/evyd13/nt750/config.h
index 35fc000671..076bb344a5 100644
--- a/keyboards/evyd13/nt750/config.h
+++ b/keyboards/evyd13/nt750/config.h
@@ -140,10 +140,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/evyd13/nt980/config.h b/keyboards/evyd13/nt980/config.h
index 1509dde061..e483ab46c9 100644
--- a/keyboards/evyd13/nt980/config.h
+++ b/keyboards/evyd13/nt980/config.h
@@ -142,10 +142,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/evyd13/omrontkl/config.h b/keyboards/evyd13/omrontkl/config.h
index d61b338e97..40f8384831 100644
--- a/keyboards/evyd13/omrontkl/config.h
+++ b/keyboards/evyd13/omrontkl/config.h
@@ -135,8 +135,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/evyd13/pockettype/config.h b/keyboards/evyd13/pockettype/config.h
index fa45630c1a..b62c3549f8 100644
--- a/keyboards/evyd13/pockettype/config.h
+++ b/keyboards/evyd13/pockettype/config.h
@@ -135,8 +135,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/evyd13/quackfire/config.h b/keyboards/evyd13/quackfire/config.h
index 151219a016..4df2abd5a8 100644
--- a/keyboards/evyd13/quackfire/config.h
+++ b/keyboards/evyd13/quackfire/config.h
@@ -141,8 +141,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 6
diff --git a/keyboards/evyd13/solheim68/config.h b/keyboards/evyd13/solheim68/config.h
index d61e095f1d..ef449ab7d4 100644
--- a/keyboards/evyd13/solheim68/config.h
+++ b/keyboards/evyd13/solheim68/config.h
@@ -135,8 +135,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/evyd13/wasdat/config.h b/keyboards/evyd13/wasdat/config.h
index 38f9fe4bda..e151496aed 100644
--- a/keyboards/evyd13/wasdat/config.h
+++ b/keyboards/evyd13/wasdat/config.h
@@ -142,8 +142,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/evyd13/wasdat_code/config.h b/keyboards/evyd13/wasdat_code/config.h
index 6c39403e52..ae009c1c29 100644
--- a/keyboards/evyd13/wasdat_code/config.h
+++ b/keyboards/evyd13/wasdat_code/config.h
@@ -148,8 +148,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 2
diff --git a/keyboards/exclusive/e7v1se/config.h b/keyboards/exclusive/e7v1se/config.h
index 1bb0eb3acf..cce08878eb 100644
--- a/keyboards/exclusive/e7v1se/config.h
+++ b/keyboards/exclusive/e7v1se/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/exclusive/e85/config.h b/keyboards/exclusive/e85/config.h
index cc4fcd97d0..2683403204 100644
--- a/keyboards/exclusive/e85/config.h
+++ b/keyboards/exclusive/e85/config.h
@@ -121,10 +121,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/exent/config.h b/keyboards/exent/config.h
index c6f4452708..e9dc026867 100644
--- a/keyboards/exent/config.h
+++ b/keyboards/exent/config.h
@@ -76,10 +76,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/eyeohdesigns/babyv/config.h b/keyboards/eyeohdesigns/babyv/config.h
index c49a039df2..f90d68e2e5 100644
--- a/keyboards/eyeohdesigns/babyv/config.h
+++ b/keyboards/eyeohdesigns/babyv/config.h
@@ -54,7 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fc660c/config.h b/keyboards/fc660c/config.h
index 460881cb17..7df5811f42 100644
--- a/keyboards/fc660c/config.h
+++ b/keyboards/fc660c/config.h
@@ -70,8 +70,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // higher value means deeper actuation point, less sensitive
 // be careful and only make small adjustments (steps of 1 or 2).
diff --git a/keyboards/fc980c/config.h b/keyboards/fc980c/config.h
index b0bffef760..250e7336a9 100644
--- a/keyboards/fc980c/config.h
+++ b/keyboards/fc980c/config.h
@@ -77,8 +77,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // higher value means deeper actuation point, less sensitive
 // be careful and only make small adjustments (steps of 1 or 2).
diff --git a/keyboards/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h
index 29bb9a782b..e8e57c72e8 100644
--- a/keyboards/ffkeebs/puca/config.h
+++ b/keyboards/ffkeebs/puca/config.h
@@ -62,8 +62,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/fjlabs/7vhotswap/config.h b/keyboards/fjlabs/7vhotswap/config.h
index a34bf8f5fa..66ee195a58 100644
--- a/keyboards/fjlabs/7vhotswap/config.h
+++ b/keyboards/fjlabs/7vhotswap/config.h
@@ -114,5 +114,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/ad65/config.h b/keyboards/fjlabs/ad65/config.h
index 8f9d672d83..3bbf7a01d1 100644
--- a/keyboards/fjlabs/ad65/config.h
+++ b/keyboards/fjlabs/ad65/config.h
@@ -101,5 +101,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/bks65/config.h b/keyboards/fjlabs/bks65/config.h
index 37cb2b687b..b1deccd4e1 100644
--- a/keyboards/fjlabs/bks65/config.h
+++ b/keyboards/fjlabs/bks65/config.h
@@ -116,5 +116,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/bks65solder/config.h b/keyboards/fjlabs/bks65solder/config.h
index 6b3839c8c8..5dff84a0c1 100644
--- a/keyboards/fjlabs/bks65solder/config.h
+++ b/keyboards/fjlabs/bks65solder/config.h
@@ -113,5 +113,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/bolsa65/config.h b/keyboards/fjlabs/bolsa65/config.h
index c53d2ab656..bf389ee445 100644
--- a/keyboards/fjlabs/bolsa65/config.h
+++ b/keyboards/fjlabs/bolsa65/config.h
@@ -113,5 +113,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/kf87/config.h b/keyboards/fjlabs/kf87/config.h
index 38bd7566bb..b133e375bb 100644
--- a/keyboards/fjlabs/kf87/config.h
+++ b/keyboards/fjlabs/kf87/config.h
@@ -118,5 +118,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h
index b73d6c8f85..75f9643a79 100644
--- a/keyboards/fjlabs/kyuu/config.h
+++ b/keyboards/fjlabs/kyuu/config.h
@@ -116,5 +116,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/ldk65/config.h b/keyboards/fjlabs/ldk65/config.h
index 1c8eaff2ec..15626c0700 100644
--- a/keyboards/fjlabs/ldk65/config.h
+++ b/keyboards/fjlabs/ldk65/config.h
@@ -101,5 +101,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/midway60/config.h b/keyboards/fjlabs/midway60/config.h
index d5a39c89c0..f70a932a51 100644
--- a/keyboards/fjlabs/midway60/config.h
+++ b/keyboards/fjlabs/midway60/config.h
@@ -101,5 +101,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/mk61rgbansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h
index 4d459b6f88..fdc8571344 100644
--- a/keyboards/fjlabs/mk61rgbansi/config.h
+++ b/keyboards/fjlabs/mk61rgbansi/config.h
@@ -117,5 +117,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/polaris/config.h b/keyboards/fjlabs/polaris/config.h
index d622778ce0..6efae34205 100644
--- a/keyboards/fjlabs/polaris/config.h
+++ b/keyboards/fjlabs/polaris/config.h
@@ -101,5 +101,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/ready100/config.h b/keyboards/fjlabs/ready100/config.h
index a32f9d94ac..31adbd7f4b 100644
--- a/keyboards/fjlabs/ready100/config.h
+++ b/keyboards/fjlabs/ready100/config.h
@@ -115,5 +115,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/tf60ansi/config.h b/keyboards/fjlabs/tf60ansi/config.h
index eede9b7544..1b19a0e2ec 100644
--- a/keyboards/fjlabs/tf60ansi/config.h
+++ b/keyboards/fjlabs/tf60ansi/config.h
@@ -117,5 +117,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h
index 11cb92a33f..0c1a069464 100644
--- a/keyboards/fjlabs/tf60v2/config.h
+++ b/keyboards/fjlabs/tf60v2/config.h
@@ -117,5 +117,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/fjlabs/tf65rgbv2/config.h b/keyboards/fjlabs/tf65rgbv2/config.h
index 65e1932f43..111b2c8928 100644
--- a/keyboards/fjlabs/tf65rgbv2/config.h
+++ b/keyboards/fjlabs/tf65rgbv2/config.h
@@ -117,5 +117,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/flehrad/downbubble/config.h b/keyboards/flehrad/downbubble/config.h
index b8d69244eb..fa13006a97 100644
--- a/keyboards/flehrad/downbubble/config.h
+++ b/keyboards/flehrad/downbubble/config.h
@@ -132,8 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/fleuron/config.h b/keyboards/fleuron/config.h
index fae7d941ae..24212bfdc1 100644
--- a/keyboards/fleuron/config.h
+++ b/keyboards/fleuron/config.h
@@ -105,8 +105,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define RGB_DI_PIN E6     // The pin the LED strip is connected to
 #define RGBLED_NUM 18     // Number of LEDs in your strip
diff --git a/keyboards/fluorite/config.h b/keyboards/fluorite/config.h
index 9be3008684..397fdaaebf 100644
--- a/keyboards/fluorite/config.h
+++ b/keyboards/fluorite/config.h
@@ -132,8 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/flxlb/zplit/config.h b/keyboards/flxlb/zplit/config.h
index 83fe084844..74c7339bdc 100644
--- a/keyboards/flxlb/zplit/config.h
+++ b/keyboards/flxlb/zplit/config.h
@@ -86,5 +86,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/flygone60/rev3/config.h b/keyboards/flygone60/rev3/config.h
index e398b1dc60..b670def338 100644
--- a/keyboards/flygone60/rev3/config.h
+++ b/keyboards/flygone60/rev3/config.h
@@ -54,7 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/foostan/cornelius/config.h b/keyboards/foostan/cornelius/config.h
index b50b308255..a3e784150f 100644
--- a/keyboards/foostan/cornelius/config.h
+++ b/keyboards/foostan/cornelius/config.h
@@ -136,10 +136,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/for_science/config.h b/keyboards/for_science/config.h
index 7428e5a564..9c2f484dc9 100644
--- a/keyboards/for_science/config.h
+++ b/keyboards/for_science/config.h
@@ -70,5 +70,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/forever65/config.h b/keyboards/forever65/config.h
index 4ea906b5a7..0de59946c4 100644
--- a/keyboards/forever65/config.h
+++ b/keyboards/forever65/config.h
@@ -64,8 +64,4 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/keyboards/fortitude60/rev1/config.h b/keyboards/fortitude60/rev1/config.h
index 472472329c..e4366f959f 100644
--- a/keyboards/fortitude60/rev1/config.h
+++ b/keyboards/fortitude60/rev1/config.h
@@ -86,5 +86,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/foxlab/key65/hotswap/config.h b/keyboards/foxlab/key65/hotswap/config.h
index 621c640720..8c0e5a1b9e 100644
--- a/keyboards/foxlab/key65/hotswap/config.h
+++ b/keyboards/foxlab/key65/hotswap/config.h
@@ -115,7 +115,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/foxlab/key65/universal/config.h b/keyboards/foxlab/key65/universal/config.h
index 241d2ce2cb..44911bed77 100644
--- a/keyboards/foxlab/key65/universal/config.h
+++ b/keyboards/foxlab/key65/universal/config.h
@@ -115,7 +115,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/foxlab/leaf60/hotswap/config.h b/keyboards/foxlab/leaf60/hotswap/config.h
index 6092a24f01..f224957c59 100644
--- a/keyboards/foxlab/leaf60/hotswap/config.h
+++ b/keyboards/foxlab/leaf60/hotswap/config.h
@@ -119,8 +119,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/foxlab/leaf60/universal/config.h b/keyboards/foxlab/leaf60/universal/config.h
index b4214882bc..d25e145361 100644
--- a/keyboards/foxlab/leaf60/universal/config.h
+++ b/keyboards/foxlab/leaf60/universal/config.h
@@ -119,8 +119,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/foxlab/time80/config.h b/keyboards/foxlab/time80/config.h
index 8fea3e7e6e..27013c5c67 100644
--- a/keyboards/foxlab/time80/config.h
+++ b/keyboards/foxlab/time80/config.h
@@ -120,10 +120,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h
index 5cd2f1620e..f2e73da899 100644
--- a/keyboards/gboards/georgi/config.h
+++ b/keyboards/gboards/georgi/config.h
@@ -27,9 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VERBOSE
 
 #define FORCE_NKRO
-#define NO_ACTION_FUNCTION
 #define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
 #define IGNORE_MOD_TAP_INTERRUPT
 
 /* USB Device descriptor parameter */
diff --git a/keyboards/gh60/revc/config.h b/keyboards/gh60/revc/config.h
index 4483473a62..527bf4c959 100644
--- a/keyboards/gh60/revc/config.h
+++ b/keyboards/gh60/revc/config.h
@@ -103,5 +103,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/gh60/satan/config.h b/keyboards/gh60/satan/config.h
index 2b87f925de..98218d8466 100644
--- a/keyboards/gh60/satan/config.h
+++ b/keyboards/gh60/satan/config.h
@@ -83,5 +83,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ghs/rar/config.h b/keyboards/ghs/rar/config.h
index 10755f99c2..d97e8841f1 100644
--- a/keyboards/ghs/rar/config.h
+++ b/keyboards/ghs/rar/config.h
@@ -110,10 +110,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/gkeyboard/gkb_m16/config.h b/keyboards/gkeyboard/gkb_m16/config.h
index be1861b90f..690ecf42d1 100644
--- a/keyboards/gkeyboard/gkb_m16/config.h
+++ b/keyboards/gkeyboard/gkb_m16/config.h
@@ -142,10 +142,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/glenpickle/chimera_ergo/config.h b/keyboards/glenpickle/chimera_ergo/config.h
index 3c0cc5c162..616d8af24e 100644
--- a/keyboards/glenpickle/chimera_ergo/config.h
+++ b/keyboards/glenpickle/chimera_ergo/config.h
@@ -54,5 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/glenpickle/chimera_ls/config.h b/keyboards/glenpickle/chimera_ls/config.h
index ca92e1e2e4..f5da32e3c3 100644
--- a/keyboards/glenpickle/chimera_ls/config.h
+++ b/keyboards/glenpickle/chimera_ls/config.h
@@ -54,5 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/glenpickle/chimera_ortho/config.h b/keyboards/glenpickle/chimera_ortho/config.h
index 3d86343a67..8ae25c1eb4 100644
--- a/keyboards/glenpickle/chimera_ortho/config.h
+++ b/keyboards/glenpickle/chimera_ortho/config.h
@@ -54,5 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/glenpickle/chimera_ortho_plus/config.h b/keyboards/glenpickle/chimera_ortho_plus/config.h
index ebffb85657..4846a1b20d 100644
--- a/keyboards/glenpickle/chimera_ortho_plus/config.h
+++ b/keyboards/glenpickle/chimera_ortho_plus/config.h
@@ -54,5 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/gray_studio/space65/config.h b/keyboards/gray_studio/space65/config.h
index 6091515b52..23bf1e7f94 100644
--- a/keyboards/gray_studio/space65/config.h
+++ b/keyboards/gray_studio/space65/config.h
@@ -130,8 +130,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/hadron/config.h b/keyboards/hadron/config.h
index fc0e920eb9..3281984d19 100644
--- a/keyboards/hadron/config.h
+++ b/keyboards/hadron/config.h
@@ -61,5 +61,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/hadron/ver3/config.h b/keyboards/hadron/ver3/config.h
index 54fab6662d..c61cc9a1e0 100644
--- a/keyboards/hadron/ver3/config.h
+++ b/keyboards/hadron/ver3/config.h
@@ -116,8 +116,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Haptic Driver initialization settings
  * Feedback Control Settings */
diff --git a/keyboards/halfcliff/config.h b/keyboards/halfcliff/config.h
index 287fd2f4ac..9cd03089ba 100644
--- a/keyboards/halfcliff/config.h
+++ b/keyboards/halfcliff/config.h
@@ -63,7 +63,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/han60/config.h b/keyboards/han60/config.h
index a695cd92a3..c96cb6782f 100644
--- a/keyboards/han60/config.h
+++ b/keyboards/han60/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/412_64/config.h b/keyboards/handwired/412_64/config.h
index 6cc094d6d5..df8961dc04 100644
--- a/keyboards/handwired/412_64/config.h
+++ b/keyboards/handwired/412_64/config.h
@@ -90,6 +90,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/handwired/amigopunk/config.h b/keyboards/handwired/amigopunk/config.h
index 29141234d4..473f33aa9d 100644
--- a/keyboards/handwired/amigopunk/config.h
+++ b/keyboards/handwired/amigopunk/config.h
@@ -51,7 +51,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/aranck/config.h b/keyboards/handwired/aranck/config.h
index 75f5232f90..88b394a29e 100644
--- a/keyboards/handwired/aranck/config.h
+++ b/keyboards/handwired/aranck/config.h
@@ -149,8 +149,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/handwired/arrow_pad/config.h b/keyboards/handwired/arrow_pad/config.h
index dcbdef2fcc..c8b19524bb 100644
--- a/keyboards/handwired/arrow_pad/config.h
+++ b/keyboards/handwired/arrow_pad/config.h
@@ -99,5 +99,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h
index 4a385c35cf..0356bf3d7d 100644
--- a/keyboards/handwired/atreus50/config.h
+++ b/keyboards/handwired/atreus50/config.h
@@ -99,5 +99,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/baredev/rev1/config.h b/keyboards/handwired/baredev/rev1/config.h
index f3d36fd08b..430018495a 100644
--- a/keyboards/handwired/baredev/rev1/config.h
+++ b/keyboards/handwired/baredev/rev1/config.h
@@ -18,8 +18,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h
index ecf0b0de36..aafaa62174 100644
--- a/keyboards/handwired/bolek/config.h
+++ b/keyboards/handwired/bolek/config.h
@@ -138,10 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
index 2ca3cf1d1e..87aec1a299 100644
--- a/keyboards/handwired/brain/config.h
+++ b/keyboards/handwired/brain/config.h
@@ -96,8 +96,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 //#define PREVENT_STUCK_MODIFIERS
 //#define TAPPING_TERM 150
diff --git a/keyboards/handwired/bstk100/config.h b/keyboards/handwired/bstk100/config.h
index 6769f9b5c0..29a5afa35e 100644
--- a/keyboards/handwired/bstk100/config.h
+++ b/keyboards/handwired/bstk100/config.h
@@ -147,10 +147,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/ck4x4/config.h b/keyboards/handwired/ck4x4/config.h
index 61a5d3baf9..428a163170 100644
--- a/keyboards/handwired/ck4x4/config.h
+++ b/keyboards/handwired/ck4x4/config.h
@@ -62,6 +62,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/handwired/cmd60/config.h b/keyboards/handwired/cmd60/config.h
index ba54cab247..14bcdec530 100644
--- a/keyboards/handwired/cmd60/config.h
+++ b/keyboards/handwired/cmd60/config.h
@@ -100,5 +100,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/co60/rev1/config.h b/keyboards/handwired/co60/rev1/config.h
index 42524994ae..a41bde6fa2 100644
--- a/keyboards/handwired/co60/rev1/config.h
+++ b/keyboards/handwired/co60/rev1/config.h
@@ -108,5 +108,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/dactyl_left/config.h b/keyboards/handwired/dactyl_left/config.h
index 1e4d279178..c962f6e176 100644
--- a/keyboards/handwired/dactyl_left/config.h
+++ b/keyboards/handwired/dactyl_left/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/handwired/dactyl_promicro/config.h b/keyboards/handwired/dactyl_promicro/config.h
index 29547f2533..19874be799 100644
--- a/keyboards/handwired/dactyl_promicro/config.h
+++ b/keyboards/handwired/dactyl_promicro/config.h
@@ -79,5 +79,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/dactyl_rah/config.h b/keyboards/handwired/dactyl_rah/config.h
index 2ffe4e8a52..b5f272ba70 100644
--- a/keyboards/handwired/dactyl_rah/config.h
+++ b/keyboards/handwired/dactyl_rah/config.h
@@ -70,9 +70,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/handwired/dc/mc/001/config.h b/keyboards/handwired/dc/mc/001/config.h
index 4c687ae7fa..5cba80831f 100644
--- a/keyboards/handwired/dc/mc/001/config.h
+++ b/keyboards/handwired/dc/mc/001/config.h
@@ -70,10 +70,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // The (default) Stop key
 // Doesn't work, though. Maybe becuase of the bootloader that's in use?
diff --git a/keyboards/handwired/elrgo_s/config.h b/keyboards/handwired/elrgo_s/config.h
index b2ef4681e5..0ba6f77586 100644
--- a/keyboards/handwired/elrgo_s/config.h
+++ b/keyboards/handwired/elrgo_s/config.h
@@ -54,5 +54,3 @@ Copyright 2021 Yaroslav Smirnov <elorenn@bk.ru>
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/ergocheap/config.h b/keyboards/handwired/ergocheap/config.h
index f563036642..26905e8cb3 100644
--- a/keyboards/handwired/ergocheap/config.h
+++ b/keyboards/handwired/ergocheap/config.h
@@ -63,5 +63,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/evk/v1_3/config.h b/keyboards/handwired/evk/v1_3/config.h
index 2ddde6548e..374ad9d0c3 100644
--- a/keyboards/handwired/evk/v1_3/config.h
+++ b/keyboards/handwired/evk/v1_3/config.h
@@ -140,8 +140,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/handwired/fc200rt_qmk/config.h b/keyboards/handwired/fc200rt_qmk/config.h
index 4f10da75eb..2eec7f584c 100644
--- a/keyboards/handwired/fc200rt_qmk/config.h
+++ b/keyboards/handwired/fc200rt_qmk/config.h
@@ -73,7 +73,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 //#define FORCE_NKRO
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/fivethirteen/config.h b/keyboards/handwired/fivethirteen/config.h
index 45b459a0ad..6ef436506b 100644
--- a/keyboards/handwired/fivethirteen/config.h
+++ b/keyboards/handwired/fivethirteen/config.h
@@ -100,5 +100,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/floorboard/config.h b/keyboards/handwired/floorboard/config.h
index 7bac3cd2dc..74be3e4426 100644
--- a/keyboards/handwired/floorboard/config.h
+++ b/keyboards/handwired/floorboard/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/frankie_macropad/config.h b/keyboards/handwired/frankie_macropad/config.h
index 5047972d18..57e6d7e0dd 100644
--- a/keyboards/handwired/frankie_macropad/config.h
+++ b/keyboards/handwired/frankie_macropad/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 2
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/frenchdev/config.h b/keyboards/handwired/frenchdev/config.h
index 7b2fb6e002..84f16ea96e 100644
--- a/keyboards/handwired/frenchdev/config.h
+++ b/keyboards/handwired/frenchdev/config.h
@@ -76,6 +76,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
+
 //#define DEBUG_MATRIX_SCAN_RATE
diff --git a/keyboards/handwired/gamenum/config.h b/keyboards/handwired/gamenum/config.h
index 1be44a1156..6fba6586da 100644
--- a/keyboards/handwired/gamenum/config.h
+++ b/keyboards/handwired/gamenum/config.h
@@ -100,5 +100,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/hacked_motospeed/config.h b/keyboards/handwired/hacked_motospeed/config.h
index 589b62c01f..062376222f 100644
--- a/keyboards/handwired/hacked_motospeed/config.h
+++ b/keyboards/handwired/hacked_motospeed/config.h
@@ -135,8 +135,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h
index 9bf73440c8..9438f3a082 100644
--- a/keyboards/handwired/heisenberg/config.h
+++ b/keyboards/handwired/heisenberg/config.h
@@ -149,8 +149,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h
index b08f24ed86..e0249ba0c2 100644
--- a/keyboards/handwired/hnah108/config.h
+++ b/keyboards/handwired/hnah108/config.h
@@ -158,10 +158,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/hnah40/config.h b/keyboards/handwired/hnah40/config.h
index 6e4493d47f..123c4ca38a 100644
--- a/keyboards/handwired/hnah40/config.h
+++ b/keyboards/handwired/hnah40/config.h
@@ -115,5 +115,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/ibm122m/config.h b/keyboards/handwired/ibm122m/config.h
index c58b8897ed..cf65a8b909 100644
--- a/keyboards/handwired/ibm122m/config.h
+++ b/keyboards/handwired/ibm122m/config.h
@@ -108,5 +108,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/jtallbean/split_65/config.h b/keyboards/handwired/jtallbean/split_65/config.h
index 1620dde024..196b0bc55d 100644
--- a/keyboards/handwired/jtallbean/split_65/config.h
+++ b/keyboards/handwired/jtallbean/split_65/config.h
@@ -140,10 +140,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/juliet/config.h b/keyboards/handwired/juliet/config.h
index bab4fe3333..5189017dfb 100644
--- a/keyboards/handwired/juliet/config.h
+++ b/keyboards/handwired/juliet/config.h
@@ -133,9 +133,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 
 /* Bootmagic Lite key configuration
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h
index b8b40728cd..8cf38f59dc 100644
--- a/keyboards/handwired/kbod/config.h
+++ b/keyboards/handwired/kbod/config.h
@@ -100,8 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #undef TAPPING_TOGGLE
 #define TAPPING_TOGGLE 2
diff --git a/keyboards/handwired/ks63/config.h b/keyboards/handwired/ks63/config.h
index e49d090678..b75346e6f5 100644
--- a/keyboards/handwired/ks63/config.h
+++ b/keyboards/handwired/ks63/config.h
@@ -73,8 +73,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define MASTER_LEFT
 #define USE_SERIAL
diff --git a/keyboards/handwired/leftynumpad/config.h b/keyboards/handwired/leftynumpad/config.h
index 9059bfe760..db89057e62 100644
--- a/keyboards/handwired/leftynumpad/config.h
+++ b/keyboards/handwired/leftynumpad/config.h
@@ -96,7 +96,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/lemonpad/config.h b/keyboards/handwired/lemonpad/config.h
index 46369cb999..c4e488f572 100644
--- a/keyboards/handwired/lemonpad/config.h
+++ b/keyboards/handwired/lemonpad/config.h
@@ -131,10 +131,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
index 92b633d75c..fa49ae4e6f 100644
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -132,10 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/magicforce61/config.h b/keyboards/handwired/magicforce61/config.h
index 193d85d2f3..e54ee545da 100644
--- a/keyboards/handwired/magicforce61/config.h
+++ b/keyboards/handwired/magicforce61/config.h
@@ -100,5 +100,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/magicforce68/config.h b/keyboards/handwired/magicforce68/config.h
index 8ad3269d56..0539fab023 100644
--- a/keyboards/handwired/magicforce68/config.h
+++ b/keyboards/handwired/magicforce68/config.h
@@ -100,5 +100,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/mechboards_micropad/config.h b/keyboards/handwired/mechboards_micropad/config.h
index 3eec736aea..f008d596f1 100644
--- a/keyboards/handwired/mechboards_micropad/config.h
+++ b/keyboards/handwired/mechboards_micropad/config.h
@@ -132,8 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h
index 5c22e781e4..7029e22530 100644
--- a/keyboards/handwired/meck_tkl/config.h
+++ b/keyboards/handwired/meck_tkl/config.h
@@ -38,10 +38,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/minorca/config.h b/keyboards/handwired/minorca/config.h
index 9828c03e11..e987ba67f0 100644
--- a/keyboards/handwired/minorca/config.h
+++ b/keyboards/handwired/minorca/config.h
@@ -67,9 +67,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 
 /* bootmagic salt key */
 #define BOOTMAGIC_KEY_SALT              KC_ESC
diff --git a/keyboards/handwired/ms_sculpt_mobile/config.h b/keyboards/handwired/ms_sculpt_mobile/config.h
index c3c2a0962e..13f5a588b6 100644
--- a/keyboards/handwired/ms_sculpt_mobile/config.h
+++ b/keyboards/handwired/ms_sculpt_mobile/config.h
@@ -82,5 +82,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/nicekey/config.h b/keyboards/handwired/nicekey/config.h
index 19e707c1fc..7a41e62a57 100644
--- a/keyboards/handwired/nicekey/config.h
+++ b/keyboards/handwired/nicekey/config.h
@@ -62,5 +62,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/not_so_minidox/config.h b/keyboards/handwired/not_so_minidox/config.h
index 177552e2a6..aa6319cb0f 100644
--- a/keyboards/handwired/not_so_minidox/config.h
+++ b/keyboards/handwired/not_so_minidox/config.h
@@ -74,5 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/numpad20/config.h b/keyboards/handwired/numpad20/config.h
index dba74f43bd..4b9ca1baf3 100644
--- a/keyboards/handwired/numpad20/config.h
+++ b/keyboards/handwired/numpad20/config.h
@@ -100,5 +100,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/obuwunkunubi/spaget/config.h b/keyboards/handwired/obuwunkunubi/spaget/config.h
index 56fb46ad91..1558acb55a 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/config.h
+++ b/keyboards/handwired/obuwunkunubi/spaget/config.h
@@ -69,5 +69,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/oem_ansi_fullsize/config.h b/keyboards/handwired/oem_ansi_fullsize/config.h
index 7219bd3403..710b4a871b 100644
--- a/keyboards/handwired/oem_ansi_fullsize/config.h
+++ b/keyboards/handwired/oem_ansi_fullsize/config.h
@@ -150,10 +150,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/onekey/config.h b/keyboards/handwired/onekey/config.h
index 950146a5d3..f491d4d393 100644
--- a/keyboards/handwired/onekey/config.h
+++ b/keyboards/handwired/onekey/config.h
@@ -59,10 +59,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/ortho5x13/config.h b/keyboards/handwired/ortho5x13/config.h
index d831940b8d..7731d29f0c 100644
--- a/keyboards/handwired/ortho5x13/config.h
+++ b/keyboards/handwired/ortho5x13/config.h
@@ -100,5 +100,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/ortho5x14/config.h b/keyboards/handwired/ortho5x14/config.h
index 33ad68b0b1..a5aab6168f 100644
--- a/keyboards/handwired/ortho5x14/config.h
+++ b/keyboards/handwired/ortho5x14/config.h
@@ -104,6 +104,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/handwired/owlet60/config.h b/keyboards/handwired/owlet60/config.h
index d20e1fa975..9613a97580 100644
--- a/keyboards/handwired/owlet60/config.h
+++ b/keyboards/handwired/owlet60/config.h
@@ -137,8 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/handwired/pilcrow/config.h b/keyboards/handwired/pilcrow/config.h
index 15f487082b..3ed0f5de6a 100644
--- a/keyboards/handwired/pilcrow/config.h
+++ b/keyboards/handwired/pilcrow/config.h
@@ -100,5 +100,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/promethium/config.h b/keyboards/handwired/promethium/config.h
index 612675c63a..68f83035f9 100644
--- a/keyboards/handwired/promethium/config.h
+++ b/keyboards/handwired/promethium/config.h
@@ -123,8 +123,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define PS2_MOUSE_INIT_DELAY 2000
 #define BATTERY_POLL         30000
diff --git a/keyboards/handwired/reddot/config.h b/keyboards/handwired/reddot/config.h
index 196f08f6f5..6028971dda 100755
--- a/keyboards/handwired/reddot/config.h
+++ b/keyboards/handwired/reddot/config.h
@@ -98,5 +98,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/retro_refit/config.h b/keyboards/handwired/retro_refit/config.h
index 74cebfb825..beb9b26deb 100644
--- a/keyboards/handwired/retro_refit/config.h
+++ b/keyboards/handwired/retro_refit/config.h
@@ -85,5 +85,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/sick68/config.h b/keyboards/handwired/sick68/config.h
index 2205126cc3..16b5fc76e7 100644
--- a/keyboards/handwired/sick68/config.h
+++ b/keyboards/handwired/sick68/config.h
@@ -139,10 +139,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/snatchpad/config.h b/keyboards/handwired/snatchpad/config.h
index c0d337d5df..c0ac5ebbde 100644
--- a/keyboards/handwired/snatchpad/config.h
+++ b/keyboards/handwired/snatchpad/config.h
@@ -136,10 +136,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/sono1/config.h b/keyboards/handwired/sono1/config.h
index 3b06342a1a..91519e884a 100644
--- a/keyboards/handwired/sono1/config.h
+++ b/keyboards/handwired/sono1/config.h
@@ -36,14 +36,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
 
 /* mechanical locking support. NumLock key on the numpad uses Alps SKCL Lock switch */
 #define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
\ No newline at end of file
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/split65/promicro/config.h b/keyboards/handwired/split65/promicro/config.h
index 824dc76402..e700578e08 100644
--- a/keyboards/handwired/split65/promicro/config.h
+++ b/keyboards/handwired/split65/promicro/config.h
@@ -47,7 +47,5 @@
 // Feature diable options
 //#define NO_DEBUG
 //#define NO_PRINT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 #define OLED_DISPLAY_128X64
diff --git a/keyboards/handwired/split65/stm32/config.h b/keyboards/handwired/split65/stm32/config.h
index 28df964423..b173481280 100644
--- a/keyboards/handwired/split65/stm32/config.h
+++ b/keyboards/handwired/split65/stm32/config.h
@@ -54,7 +54,5 @@
 // Feature diable options
 //#define NO_DEBUG
 //#define NO_PRINT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 #define OLED_DISPLAY_128X64
diff --git a/keyboards/handwired/split89/config.h b/keyboards/handwired/split89/config.h
index d78535a201..7927c1d83c 100644
--- a/keyboards/handwired/split89/config.h
+++ b/keyboards/handwired/split89/config.h
@@ -154,10 +154,6 @@ COLS = number of cols per side which curently needs to be equal so there are bla
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/splittest/config.h b/keyboards/handwired/splittest/config.h
index 93b5164d76..d4816e4355 100644
--- a/keyboards/handwired/splittest/config.h
+++ b/keyboards/handwired/splittest/config.h
@@ -65,5 +65,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/sticc14/config.h b/keyboards/handwired/sticc14/config.h
index 6c296d7893..c269f4706d 100644
--- a/keyboards/handwired/sticc14/config.h
+++ b/keyboards/handwired/sticc14/config.h
@@ -136,8 +136,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/handwired/symmetric70_proto/promicro/config.h b/keyboards/handwired/symmetric70_proto/promicro/config.h
index 2060c62606..570de7039d 100644
--- a/keyboards/handwired/symmetric70_proto/promicro/config.h
+++ b/keyboards/handwired/symmetric70_proto/promicro/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/symmetric70_proto/proton_c/config.h b/keyboards/handwired/symmetric70_proto/proton_c/config.h
index 84586854f4..92716a21f6 100644
--- a/keyboards/handwired/symmetric70_proto/proton_c/config.h
+++ b/keyboards/handwired/symmetric70_proto/proton_c/config.h
@@ -151,10 +151,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/t111/config.h b/keyboards/handwired/t111/config.h
index e459e7659e..04c1ece0e5 100644
--- a/keyboards/handwired/t111/config.h
+++ b/keyboards/handwired/t111/config.h
@@ -83,10 +83,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h
index 6955f08db7..e74b9f2aee 100644
--- a/keyboards/handwired/tennie/config.h
+++ b/keyboards/handwired/tennie/config.h
@@ -132,8 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/handwired/terminus_mini/config.h b/keyboards/handwired/terminus_mini/config.h
index e1d77d55e2..94c182eb4a 100644
--- a/keyboards/handwired/terminus_mini/config.h
+++ b/keyboards/handwired/terminus_mini/config.h
@@ -106,5 +106,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
index bba9db137b..ab46bc5276 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h
@@ -84,8 +84,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 /* PMW3360 Settings */
 #define PMW3360_CS_PIN           B0
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
index b4f09e5e87..fc5037ae9d 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h
@@ -47,7 +47,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 #define POINTING_DEVICE_RIGHT
diff --git a/keyboards/handwired/tractyl_manuform/config.h b/keyboards/handwired/tractyl_manuform/config.h
index 821f9be9b6..845125c5cd 100644
--- a/keyboards/handwired/tractyl_manuform/config.h
+++ b/keyboards/handwired/tractyl_manuform/config.h
@@ -33,8 +33,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 #define SPLIT_POINTING_ENABLE
 #define POINTING_DEVICE_TASK_THROTTLE_MS 1
diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h
index 2e3767e0cd..815ec7fdd5 100644
--- a/keyboards/handwired/traveller/config.h
+++ b/keyboards/handwired/traveller/config.h
@@ -132,10 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h
index 1424c6b491..ef835ad2aa 100644
--- a/keyboards/handwired/tritium_numpad/config.h
+++ b/keyboards/handwired/tritium_numpad/config.h
@@ -80,6 +80,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/handwired/twadlee/tp69/config.h b/keyboards/handwired/twadlee/tp69/config.h
index aac4c874b2..f16444c119 100644
--- a/keyboards/handwired/twadlee/tp69/config.h
+++ b/keyboards/handwired/twadlee/tp69/config.h
@@ -140,10 +140,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h
index 84c6b123ab..65a02ff7ca 100644
--- a/keyboards/handwired/unk/rev1/config.h
+++ b/keyboards/handwired/unk/rev1/config.h
@@ -86,5 +86,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h
index 47f079e612..90880998b7 100644
--- a/keyboards/handwired/uthol/rev3/config.h
+++ b/keyboards/handwired/uthol/rev3/config.h
@@ -58,10 +58,6 @@
 
 #define TAPPING_TERM 500
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 // RGB Stuff
 #define RGB_DI_PIN B0
 #define RGBLED_NUM 39
diff --git a/keyboards/handwired/videowriter/config.h b/keyboards/handwired/videowriter/config.h
index 73162b6da6..b4909ffba1 100644
--- a/keyboards/handwired/videowriter/config.h
+++ b/keyboards/handwired/videowriter/config.h
@@ -58,10 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 1
 #define BOOTMAGIC_LITE_COLUMN 7
diff --git a/keyboards/handwired/woodpad/config.h b/keyboards/handwired/woodpad/config.h
index 9894fe1338..9b92798d96 100644
--- a/keyboards/handwired/woodpad/config.h
+++ b/keyboards/handwired/woodpad/config.h
@@ -132,10 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/xealous/rev1/config.h b/keyboards/handwired/xealous/rev1/config.h
index 8bd5b464a4..cbb4648d19 100644
--- a/keyboards/handwired/xealous/rev1/config.h
+++ b/keyboards/handwired/xealous/rev1/config.h
@@ -77,6 +77,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
+
 #define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/handwired/z150/config.h b/keyboards/handwired/z150/config.h
index ecdb739544..5d11c31a2a 100644
--- a/keyboards/handwired/z150/config.h
+++ b/keyboards/handwired/z150/config.h
@@ -83,10 +83,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index ea2ce8c941..b08865d0a4 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -135,5 +135,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
index 9b813b347a..577edba56b 100644
--- a/keyboards/helix/rev2/config.h
+++ b/keyboards/helix/rev2/config.h
@@ -162,6 +162,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/helix/rev3_4rows/config.h b/keyboards/helix/rev3_4rows/config.h
index 218ef5e5cc..1c0ec4d36c 100644
--- a/keyboards/helix/rev3_4rows/config.h
+++ b/keyboards/helix/rev3_4rows/config.h
@@ -161,10 +161,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/helix/rev3_5rows/config.h b/keyboards/helix/rev3_5rows/config.h
index 79c7961ed9..c880e27c88 100644
--- a/keyboards/helix/rev3_5rows/config.h
+++ b/keyboards/helix/rev3_5rows/config.h
@@ -161,10 +161,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/hhkb/ansi/config.h b/keyboards/hhkb/ansi/config.h
index 78fe0c47ae..8307fc1679 100644
--- a/keyboards/hhkb/ansi/config.h
+++ b/keyboards/hhkb/ansi/config.h
@@ -87,5 +87,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/hhkb/jp/config.h b/keyboards/hhkb/jp/config.h
index 22ac6aa623..04ee61c768 100644
--- a/keyboards/hhkb/jp/config.h
+++ b/keyboards/hhkb/jp/config.h
@@ -87,5 +87,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/hineybush/h08_ocelot/config.h b/keyboards/hineybush/h08_ocelot/config.h
index 9b5fd2d9b9..80f1a1df1e 100644
--- a/keyboards/hineybush/h08_ocelot/config.h
+++ b/keyboards/hineybush/h08_ocelot/config.h
@@ -141,10 +141,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/hineybush/h10/config.h b/keyboards/hineybush/h10/config.h
index 81641bdbd3..eafcd95eef 100644
--- a/keyboards/hineybush/h10/config.h
+++ b/keyboards/hineybush/h10/config.h
@@ -116,10 +116,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 //#define FORCE_NKRO
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/hineybush/h60/config.h b/keyboards/hineybush/h60/config.h
index 4553bb1229..044f05fa84 100644
--- a/keyboards/hineybush/h60/config.h
+++ b/keyboards/hineybush/h60/config.h
@@ -79,10 +79,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/hineybush/h65/config.h b/keyboards/hineybush/h65/config.h
index b99f486013..19c9c5b5d8 100644
--- a/keyboards/hineybush/h65/config.h
+++ b/keyboards/hineybush/h65/config.h
@@ -141,10 +141,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/hineybush/h65_hotswap/config.h b/keyboards/hineybush/h65_hotswap/config.h
index 805476d002..f266003a88 100644
--- a/keyboards/hineybush/h65_hotswap/config.h
+++ b/keyboards/hineybush/h65_hotswap/config.h
@@ -141,10 +141,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/hineybush/h660s/config.h b/keyboards/hineybush/h660s/config.h
index 8f33fe3e6b..45a1c53508 100644
--- a/keyboards/hineybush/h660s/config.h
+++ b/keyboards/hineybush/h660s/config.h
@@ -132,10 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/hineybush/h75_singa/config.h b/keyboards/hineybush/h75_singa/config.h
index e1389c8f96..c8b3ab7285 100644
--- a/keyboards/hineybush/h75_singa/config.h
+++ b/keyboards/hineybush/h75_singa/config.h
@@ -132,8 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/hineybush/physix/config.h b/keyboards/hineybush/physix/config.h
index c4a0274b93..87c49270b3 100644
--- a/keyboards/hineybush/physix/config.h
+++ b/keyboards/hineybush/physix/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/hineybush/sm68/config.h b/keyboards/hineybush/sm68/config.h
index fd2403b8b5..89541179c2 100644
--- a/keyboards/hineybush/sm68/config.h
+++ b/keyboards/hineybush/sm68/config.h
@@ -128,8 +128,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/hnahkb/freyr/config.h b/keyboards/hnahkb/freyr/config.h
index d912b3cc1a..9658793aa2 100644
--- a/keyboards/hnahkb/freyr/config.h
+++ b/keyboards/hnahkb/freyr/config.h
@@ -136,10 +136,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/hnahkb/stella/config.h b/keyboards/hnahkb/stella/config.h
index 512b7571d5..2ca475c38c 100644
--- a/keyboards/hnahkb/stella/config.h
+++ b/keyboards/hnahkb/stella/config.h
@@ -136,10 +136,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/hnahkb/vn66/config.h b/keyboards/hnahkb/vn66/config.h
index d809541841..1f6387fafa 100644
--- a/keyboards/hnahkb/vn66/config.h
+++ b/keyboards/hnahkb/vn66/config.h
@@ -139,10 +139,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/honeycomb/config.h b/keyboards/honeycomb/config.h
index c959543618..6780c2d41b 100755
--- a/keyboards/honeycomb/config.h
+++ b/keyboards/honeycomb/config.h
@@ -43,5 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/horizon/config.h b/keyboards/horizon/config.h
index 8abc3b131b..bb0a6dcbfc 100644
--- a/keyboards/horizon/config.h
+++ b/keyboards/horizon/config.h
@@ -40,7 +40,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/hotdox/config.h b/keyboards/hotdox/config.h
index 21d5938faf..b72faa613c 100644
--- a/keyboards/hotdox/config.h
+++ b/keyboards/hotdox/config.h
@@ -72,6 +72,5 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
+
 //#define DEBUG_MATRIX_SCAN_RATE
diff --git a/keyboards/hub20/config.h b/keyboards/hub20/config.h
index de2526522c..aca3d7acce 100644
--- a/keyboards/hub20/config.h
+++ b/keyboards/hub20/config.h
@@ -113,7 +113,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/ianklug/grooveboard/config.h b/keyboards/ianklug/grooveboard/config.h
index aac9be1022..4103759d02 100644
--- a/keyboards/ianklug/grooveboard/config.h
+++ b/keyboards/ianklug/grooveboard/config.h
@@ -146,10 +146,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h
index 9262bdbcda..a79ea6c5db 100644
--- a/keyboards/ibnuda/gurindam/config.h
+++ b/keyboards/ibnuda/gurindam/config.h
@@ -113,5 +113,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ibnuda/squiggle/config.h b/keyboards/ibnuda/squiggle/config.h
index 6aca2c1b18..d9a144aca7 100644
--- a/keyboards/ibnuda/squiggle/config.h
+++ b/keyboards/ibnuda/squiggle/config.h
@@ -37,8 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
-
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/idb/idb_60/config.h b/keyboards/idb/idb_60/config.h
index 8a0852ccbd..81dcfa854e 100644
--- a/keyboards/idb/idb_60/config.h
+++ b/keyboards/idb/idb_60/config.h
@@ -97,5 +97,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h
index caaf7f75dc..918dc16481 100644
--- a/keyboards/idobao/id75/v1/config.h
+++ b/keyboards/idobao/id75/v1/config.h
@@ -114,8 +114,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h
index c2b64649cb..c2e54f611d 100644
--- a/keyboards/idobao/id75/v2/config.h
+++ b/keyboards/idobao/id75/v2/config.h
@@ -144,8 +144,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h
index 3ef24f0bc5..f094ef0638 100644
--- a/keyboards/idobao/id87/v2/config.h
+++ b/keyboards/idobao/id87/v2/config.h
@@ -151,10 +151,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/illuminati/is0/config.h b/keyboards/illuminati/is0/config.h
index 948ea8282c..cd7a7ce28f 100644
--- a/keyboards/illuminati/is0/config.h
+++ b/keyboards/illuminati/is0/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/illusion/rosa/config.h b/keyboards/illusion/rosa/config.h
index 6bd4884138..5ad421ecbe 100644
--- a/keyboards/illusion/rosa/config.h
+++ b/keyboards/illusion/rosa/config.h
@@ -49,10 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-// #define NO_ACTION_MACRO
-// #define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
-// #define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ilumkb/primus75/config.h b/keyboards/ilumkb/primus75/config.h
index fc5dd87f09..4b6901d096 100644
--- a/keyboards/ilumkb/primus75/config.h
+++ b/keyboards/ilumkb/primus75/config.h
@@ -56,7 +56,4 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/keyboards/ilumkb/simpler61/config.h b/keyboards/ilumkb/simpler61/config.h
index 1efdb1af25..ae737bd1b6 100644
--- a/keyboards/ilumkb/simpler61/config.h
+++ b/keyboards/ilumkb/simpler61/config.h
@@ -39,10 +39,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/ilumkb/simpler64/config.h b/keyboards/ilumkb/simpler64/config.h
index 179b98113b..faf8fd152d 100644
--- a/keyboards/ilumkb/simpler64/config.h
+++ b/keyboards/ilumkb/simpler64/config.h
@@ -39,10 +39,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index e6f1b81f54..debf9a62b9 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
@@ -153,5 +153,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/input_club/infinity60/config.h b/keyboards/input_club/infinity60/config.h
index e73a663b39..18fedcb219 100644
--- a/keyboards/input_club/infinity60/config.h
+++ b/keyboards/input_club/infinity60/config.h
@@ -57,5 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/input_club/k_type/config.h b/keyboards/input_club/k_type/config.h
index de73e06a98..8502ba7046 100644
--- a/keyboards/input_club/k_type/config.h
+++ b/keyboards/input_club/k_type/config.h
@@ -98,10 +98,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/input_club/whitefox/config.h b/keyboards/input_club/whitefox/config.h
index d2b6639a30..4ea7e7806f 100644
--- a/keyboards/input_club/whitefox/config.h
+++ b/keyboards/input_club/whitefox/config.h
@@ -117,10 +117,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/irene/config.h b/keyboards/irene/config.h
index 15750f5406..34093e33a1 100644
--- a/keyboards/irene/config.h
+++ b/keyboards/irene/config.h
@@ -141,10 +141,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/iriskeyboards/config.h b/keyboards/iriskeyboards/config.h
index 77aedd69f1..8757c407b2 100644
--- a/keyboards/iriskeyboards/config.h
+++ b/keyboards/iriskeyboards/config.h
@@ -145,10 +145,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/j80/config.h b/keyboards/j80/config.h
index 10b4116181..3aaeb26dad 100644
--- a/keyboards/j80/config.h
+++ b/keyboards/j80/config.h
@@ -42,10 +42,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 3
 #define BACKLIGHT_PIN D4
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/jacky_studio/s7_elephant/rev2/config.h b/keyboards/jacky_studio/s7_elephant/rev2/config.h
index d0ca4045c7..246479dd37 100644
--- a/keyboards/jacky_studio/s7_elephant/rev2/config.h
+++ b/keyboards/jacky_studio/s7_elephant/rev2/config.h
@@ -25,10 +25,6 @@
 #define MANUFACTURER    Jacky
 #define PRODUCT         Jacky S7 Elephant Rev 2
 
-/* Don't remove this without also removing LTO_ENABLE=yes in rules.mk */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 16
diff --git a/keyboards/jadookb/jkb65/config.h b/keyboards/jadookb/jkb65/config.h
index d397f1962b..dae3cea49a 100644
--- a/keyboards/jadookb/jkb65/config.h
+++ b/keyboards/jadookb/jkb65/config.h
@@ -98,6 +98,3 @@
 #define DEBOUNCE 5
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/jae/j01/config.h b/keyboards/jae/j01/config.h
index 68e8b0ff08..552f6930cb 100644
--- a/keyboards/jae/j01/config.h
+++ b/keyboards/jae/j01/config.h
@@ -110,10 +110,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 2
diff --git a/keyboards/jagdpietr/drakon/config.h b/keyboards/jagdpietr/drakon/config.h
index f9565e41a4..611b107137 100644
--- a/keyboards/jagdpietr/drakon/config.h
+++ b/keyboards/jagdpietr/drakon/config.h
@@ -108,7 +108,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/jc65/v32a/config.h b/keyboards/jc65/v32a/config.h
index d6907c96c3..b4cef251b5 100644
--- a/keyboards/jc65/v32a/config.h
+++ b/keyboards/jc65/v32a/config.h
@@ -43,6 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_EFFECT_KNIGHT_LED_NUM 8
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/jd45/config.h b/keyboards/jd45/config.h
index be2f0963ac..3deea19740 100644
--- a/keyboards/jd45/config.h
+++ b/keyboards/jd45/config.h
@@ -69,5 +69,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/jm60/config.h b/keyboards/jm60/config.h
index 2409142e09..113c6b4dfb 100644
--- a/keyboards/jm60/config.h
+++ b/keyboards/jm60/config.h
@@ -130,10 +130,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/jones/v03/config.h b/keyboards/jones/v03/config.h
index 7a37fc1f3d..706c1d05e9 100644
--- a/keyboards/jones/v03/config.h
+++ b/keyboards/jones/v03/config.h
@@ -156,10 +156,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/jones/v03_1/config.h b/keyboards/jones/v03_1/config.h
index 1b67b6b58f..33dd0994a5 100644
--- a/keyboards/jones/v03_1/config.h
+++ b/keyboards/jones/v03_1/config.h
@@ -157,10 +157,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/jones/v1/config.h b/keyboards/jones/v1/config.h
index 1f8acc6eb6..16610eef4a 100644
--- a/keyboards/jones/v1/config.h
+++ b/keyboards/jones/v1/config.h
@@ -65,10 +65,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite trigger key. Left-Top of the layout. */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 9
diff --git a/keyboards/kagizaraya/chidori/config.h b/keyboards/kagizaraya/chidori/config.h
index 2db5d57ef7..fba0ab1e39 100644
--- a/keyboards/kagizaraya/chidori/config.h
+++ b/keyboards/kagizaraya/chidori/config.h
@@ -156,8 +156,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kagizaraya/halberd/config.h b/keyboards/kagizaraya/halberd/config.h
index 66777a2509..085688e335 100644
--- a/keyboards/kagizaraya/halberd/config.h
+++ b/keyboards/kagizaraya/halberd/config.h
@@ -113,8 +113,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
index ad4d1ded4f..fb75e32b62 100644
--- a/keyboards/kagizaraya/scythe/config.h
+++ b/keyboards/kagizaraya/scythe/config.h
@@ -116,8 +116,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kakunpc/angel17/alpha/config.h b/keyboards/kakunpc/angel17/alpha/config.h
index 35e9c132b8..192464c216 100644
--- a/keyboards/kakunpc/angel17/alpha/config.h
+++ b/keyboards/kakunpc/angel17/alpha/config.h
@@ -136,8 +136,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h
index a43208d2b9..f042a089c4 100644
--- a/keyboards/kakunpc/angel17/rev1/config.h
+++ b/keyboards/kakunpc/angel17/rev1/config.h
@@ -131,8 +131,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kakunpc/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h
index b3270fdd8b..d2057266ce 100644
--- a/keyboards/kakunpc/angel64/alpha/config.h
+++ b/keyboards/kakunpc/angel64/alpha/config.h
@@ -129,8 +129,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kakunpc/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h
index b3270fdd8b..d2057266ce 100644
--- a/keyboards/kakunpc/angel64/rev1/config.h
+++ b/keyboards/kakunpc/angel64/rev1/config.h
@@ -129,8 +129,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kakunpc/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h
index 81bb16161f..e7b5f7147d 100644
--- a/keyboards/kakunpc/business_card/alpha/config.h
+++ b/keyboards/kakunpc/business_card/alpha/config.h
@@ -130,8 +130,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kakunpc/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h
index 9e4e8da963..2bee5f5337 100644
--- a/keyboards/kakunpc/business_card/beta/config.h
+++ b/keyboards/kakunpc/business_card/beta/config.h
@@ -130,8 +130,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kakunpc/choc_taro/config.h b/keyboards/kakunpc/choc_taro/config.h
index 2852206b14..e81abe07a6 100644
--- a/keyboards/kakunpc/choc_taro/config.h
+++ b/keyboards/kakunpc/choc_taro/config.h
@@ -134,10 +134,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kakunpc/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h
index b622d33c1a..a115454fcc 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/config.h
+++ b/keyboards/kakunpc/rabbit_capture_plan/config.h
@@ -139,10 +139,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h
index b11478adfc..3d821566ae 100644
--- a/keyboards/kakunpc/suihankey/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/alpha/config.h
@@ -133,8 +133,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h
index b2801cd862..106cfc2c3b 100644
--- a/keyboards/kakunpc/suihankey/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/rev1/config.h
@@ -133,8 +133,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h
index ae5acdbd4b..4131283166 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/split/alpha/config.h
@@ -133,8 +133,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h
index 6b7dd2bac9..83dc587e57 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/split/rev1/config.h
@@ -133,8 +133,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kakunpc/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h
index 099c157cff..fdf0336f5f 100644
--- a/keyboards/kakunpc/thedogkeyboard/config.h
+++ b/keyboards/kakunpc/thedogkeyboard/config.h
@@ -133,8 +133,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kapcave/arya/config.h b/keyboards/kapcave/arya/config.h
index 62df795ff5..c6b6c61cf5 100644
--- a/keyboards/kapcave/arya/config.h
+++ b/keyboards/kapcave/arya/config.h
@@ -64,5 +64,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/kb58/config.h b/keyboards/kb58/config.h
index 9b8216e75b..81d946aaab 100644
--- a/keyboards/kb58/config.h
+++ b/keyboards/kb58/config.h
@@ -145,10 +145,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kb_elmo/isolation/config.h b/keyboards/kb_elmo/isolation/config.h
index 3d32efbcb4..2f083955b0 100644
--- a/keyboards/kb_elmo/isolation/config.h
+++ b/keyboards/kb_elmo/isolation/config.h
@@ -56,7 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/kb_elmo/vertex/config.h b/keyboards/kb_elmo/vertex/config.h
index 7fca07280e..9d8eafe5bf 100644
--- a/keyboards/kb_elmo/vertex/config.h
+++ b/keyboards/kb_elmo/vertex/config.h
@@ -40,7 +40,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/kbdclack/kaishi65/config.h b/keyboards/kbdclack/kaishi65/config.h
index 390ef64981..d9ac9b8137 100644
--- a/keyboards/kbdclack/kaishi65/config.h
+++ b/keyboards/kbdclack/kaishi65/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kbdfans/bella/rgb/config.h b/keyboards/kbdfans/bella/rgb/config.h
index c412411133..18add4d136 100644
--- a/keyboards/kbdfans/bella/rgb/config.h
+++ b/keyboards/kbdfans/bella/rgb/config.h
@@ -34,7 +34,6 @@
 
 #define DEBOUNCE 5
 
-/* disable these deprecated features by default */
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/kbdfans/bella/rgb_iso/config.h b/keyboards/kbdfans/bella/rgb_iso/config.h
index ca43d80708..78082a0a01 100644
--- a/keyboards/kbdfans/bella/rgb_iso/config.h
+++ b/keyboards/kbdfans/bella/rgb_iso/config.h
@@ -34,7 +34,6 @@
 
 #define DEBOUNCE 5
 
-/* disable these deprecated features by default */
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/kbdfans/boop65/rgb/config.h b/keyboards/kbdfans/boop65/rgb/config.h
index 20ee0df25a..b74da64e20 100644
--- a/keyboards/kbdfans/boop65/rgb/config.h
+++ b/keyboards/kbdfans/boop65/rgb/config.h
@@ -37,9 +37,6 @@
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
diff --git a/keyboards/kbdfans/kbd19x/config.h b/keyboards/kbdfans/kbd19x/config.h
index 0fbf429c45..e738f77177 100644
--- a/keyboards/kbdfans/kbd19x/config.h
+++ b/keyboards/kbdfans/kbd19x/config.h
@@ -120,6 +120,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/kbdfans/kbd4x/config.h b/keyboards/kbdfans/kbd4x/config.h
index a75efa6eae..86989e2b08 100644
--- a/keyboards/kbdfans/kbd4x/config.h
+++ b/keyboards/kbdfans/kbd4x/config.h
@@ -115,6 +115,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/kbdfans/kbd66/config.h b/keyboards/kbdfans/kbd66/config.h
index 2098ebf60f..2a10bf08ae 100644
--- a/keyboards/kbdfans/kbd66/config.h
+++ b/keyboards/kbdfans/kbd66/config.h
@@ -106,5 +106,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/kbdfans/kbd67/hotswap/config.h b/keyboards/kbdfans/kbd67/hotswap/config.h
index 2179acb5f8..4c0e0b794d 100644
--- a/keyboards/kbdfans/kbd67/hotswap/config.h
+++ b/keyboards/kbdfans/kbd67/hotswap/config.h
@@ -134,8 +134,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
index 5b50c415ae..23b0a8a30c 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/config.h
@@ -37,9 +37,7 @@
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+
 #ifdef RGB_MATRIX_ENABLE
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
index 9960022a13..a63a3ee61b 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/config.h
@@ -36,9 +36,7 @@
 #define DIODE_DIRECTION COL2ROW
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
 #define RGB_DI_PIN C7
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
index 42f5af8c25..0877d04cca 100644
--- a/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
+++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/config.h
@@ -36,9 +36,7 @@
 #define DIODE_DIRECTION COL2ROW
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 
 #define RGB_DI_PIN C7
diff --git a/keyboards/kbdfans/kbd67/rev1/config.h b/keyboards/kbdfans/kbd67/rev1/config.h
index 04ea9c9f1b..72aa27afcc 100644
--- a/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/keyboards/kbdfans/kbd67/rev1/config.h
@@ -131,8 +131,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kbdfans/kbd6x/config.h b/keyboards/kbdfans/kbd6x/config.h
index 332898383e..080bdb33b2 100644
--- a/keyboards/kbdfans/kbd6x/config.h
+++ b/keyboards/kbdfans/kbd6x/config.h
@@ -118,6 +118,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/kbdfans/kbd75hs/config.h b/keyboards/kbdfans/kbd75hs/config.h
index e23e50636f..bf14934d2b 100644
--- a/keyboards/kbdfans/kbd75hs/config.h
+++ b/keyboards/kbdfans/kbd75hs/config.h
@@ -38,9 +38,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 #define FORCE_NKRO
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 #define LED_CAPS_LOCK_PIN C6
 #define LED_PIN_ON_STATE 1
diff --git a/keyboards/kbdfans/kbd75rgb/config.h b/keyboards/kbdfans/kbd75rgb/config.h
index e49cf68b98..2499c25933 100644
--- a/keyboards/kbdfans/kbd75rgb/config.h
+++ b/keyboards/kbdfans/kbd75rgb/config.h
@@ -36,9 +36,7 @@
 #define DIODE_DIRECTION COL2ROW
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+
 #define USB_SUSPEND_WAKEUP_DELAY 5000
 #define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
 
diff --git a/keyboards/kbdfans/kbd8x/config.h b/keyboards/kbdfans/kbd8x/config.h
index 67d155b556..b53a898a27 100644
--- a/keyboards/kbdfans/kbd8x/config.h
+++ b/keyboards/kbdfans/kbd8x/config.h
@@ -84,5 +84,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/kbdfans/kbd8x_mk2/config.h b/keyboards/kbdfans/kbd8x_mk2/config.h
index ea535b00fd..010bba4617 100644
--- a/keyboards/kbdfans/kbd8x_mk2/config.h
+++ b/keyboards/kbdfans/kbd8x_mk2/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kbdfans/kbdmini/config.h b/keyboards/kbdfans/kbdmini/config.h
index f2137fcd1f..a3e0a0237e 100644
--- a/keyboards/kbdfans/kbdmini/config.h
+++ b/keyboards/kbdfans/kbdmini/config.h
@@ -91,7 +91,3 @@
 #define DRIVER_COUNT 1
 #define DRIVER_LED_TOTAL 52
 #endif
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/kbdfans/kbdpad/mk2/config.h b/keyboards/kbdfans/kbdpad/mk2/config.h
index e64aaa3379..99f3792d55 100644
--- a/keyboards/kbdfans/kbdpad/mk2/config.h
+++ b/keyboards/kbdfans/kbdpad/mk2/config.h
@@ -137,8 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kbdfans/niu_mini/config.h b/keyboards/kbdfans/niu_mini/config.h
index 96210cf3d0..82f23e3d5c 100644
--- a/keyboards/kbdfans/niu_mini/config.h
+++ b/keyboards/kbdfans/niu_mini/config.h
@@ -81,5 +81,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/kbdfans/odin/soldered/config.h b/keyboards/kbdfans/odin/soldered/config.h
index 74e87aee2e..d51dd06e82 100644
--- a/keyboards/kbdfans/odin/soldered/config.h
+++ b/keyboards/kbdfans/odin/soldered/config.h
@@ -35,8 +35,7 @@
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 15
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+
 #define RGB_DI_PIN B15
 #ifdef RGB_DI_PIN
 #define RGBLED_NUM 4
diff --git a/keyboards/kc60/config.h b/keyboards/kc60/config.h
index c58aedd76f..c536ab83f0 100644
--- a/keyboards/kc60/config.h
+++ b/keyboards/kc60/config.h
@@ -132,10 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kc60se/config.h b/keyboards/kc60se/config.h
index fc75f68ff0..876aa891df 100644
--- a/keyboards/kc60se/config.h
+++ b/keyboards/kc60se/config.h
@@ -96,5 +96,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/keebio/bfo9000/config.h b/keyboards/keebio/bfo9000/config.h
index 7e9d4cec0b..7bb150d8cf 100644
--- a/keyboards/keebio/bfo9000/config.h
+++ b/keyboards/keebio/bfo9000/config.h
@@ -69,5 +69,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/keebio/bigswitchseat/config.h b/keyboards/keebio/bigswitchseat/config.h
index f5558ca279..dbf8311c8d 100644
--- a/keyboards/keebio/bigswitchseat/config.h
+++ b/keyboards/keebio/bigswitchseat/config.h
@@ -77,10 +77,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keebio/choconum/config.h b/keyboards/keebio/choconum/config.h
index 45dca64585..dcd116534a 100644
--- a/keyboards/keebio/choconum/config.h
+++ b/keyboards/keebio/choconum/config.h
@@ -92,10 +92,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keebio/ergodicity/config.h b/keyboards/keebio/ergodicity/config.h
index 1e6327aec0..014eb13759 100644
--- a/keyboards/keebio/ergodicity/config.h
+++ b/keyboards/keebio/ergodicity/config.h
@@ -120,8 +120,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/keebio/fourier/config.h b/keyboards/keebio/fourier/config.h
index 1ce0aac7ea..faa3ef4004 100644
--- a/keyboards/keebio/fourier/config.h
+++ b/keyboards/keebio/fourier/config.h
@@ -81,5 +81,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/keebio/nyquist/rev1/config.h b/keyboards/keebio/nyquist/rev1/config.h
index 774f49c904..47622ba1e9 100644
--- a/keyboards/keebio/nyquist/rev1/config.h
+++ b/keyboards/keebio/nyquist/rev1/config.h
@@ -73,5 +73,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/keebio/nyquist/rev2/config.h b/keyboards/keebio/nyquist/rev2/config.h
index d558c204d1..e47110b8a5 100644
--- a/keyboards/keebio/nyquist/rev2/config.h
+++ b/keyboards/keebio/nyquist/rev2/config.h
@@ -74,5 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/keebio/nyquist/rev3/config.h b/keyboards/keebio/nyquist/rev3/config.h
index d165815726..3536f5c629 100644
--- a/keyboards/keebio/nyquist/rev3/config.h
+++ b/keyboards/keebio/nyquist/rev3/config.h
@@ -76,5 +76,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/keebsforall/coarse60/config.h b/keyboards/keebsforall/coarse60/config.h
index ee37802145..7d14ea4cbd 100644
--- a/keyboards/keebsforall/coarse60/config.h
+++ b/keyboards/keebsforall/coarse60/config.h
@@ -96,8 +96,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 
 #define SLEEP_LED_GPT_DRIVER GPTD1
diff --git a/keyboards/keebsforall/freebird60/config.h b/keyboards/keebsforall/freebird60/config.h
index 81b468bb97..5d9f98cacf 100644
--- a/keyboards/keebsforall/freebird60/config.h
+++ b/keyboards/keebsforall/freebird60/config.h
@@ -48,7 +48,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 
 #define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/keebsforall/freebirdtkl/config.h b/keyboards/keebsforall/freebirdtkl/config.h
index f9717d06d5..47c83ea5b7 100644
--- a/keyboards/keebsforall/freebirdtkl/config.h
+++ b/keyboards/keebsforall/freebirdtkl/config.h
@@ -50,6 +50,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define LOCKING_SUPPORT_ENABLE
 #define LOCKING_RESYNC_ENABLE
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/keebwerk/nano_slider/config.h b/keyboards/keebwerk/nano_slider/config.h
index 827923fea7..53b887692b 100644
--- a/keyboards/keebwerk/nano_slider/config.h
+++ b/keyboards/keebwerk/nano_slider/config.h
@@ -106,10 +106,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keebzdotnet/wazowski/config.h b/keyboards/keebzdotnet/wazowski/config.h
index 71db031cae..fe8b5cbcd5 100644
--- a/keyboards/keebzdotnet/wazowski/config.h
+++ b/keyboards/keebzdotnet/wazowski/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h
index 0d885ddea9..e0f4b76361 100644
--- a/keyboards/keybage/radpad/config.h
+++ b/keyboards/keybage/radpad/config.h
@@ -52,10 +52,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 1
 #define BOOTMAGIC_LITE_COLUMN 3
diff --git a/keyboards/keybee/keybee65/config.h b/keyboards/keybee/keybee65/config.h
index a6666b5d23..54f847a2dd 100644
--- a/keyboards/keybee/keybee65/config.h
+++ b/keyboards/keybee/keybee65/config.h
@@ -62,6 +62,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/keyboardio/atreus/config.h b/keyboards/keyboardio/atreus/config.h
index fb3a48e58f..74b56ceb7d 100644
--- a/keyboards/keyboardio/atreus/config.h
+++ b/keyboards/keyboardio/atreus/config.h
@@ -77,5 +77,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/keycapsss/o4l_5x12/config.h b/keyboards/keycapsss/o4l_5x12/config.h
index e24275160f..4b7b863906 100644
--- a/keyboards/keycapsss/o4l_5x12/config.h
+++ b/keyboards/keycapsss/o4l_5x12/config.h
@@ -115,10 +115,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keyhive/maypad/config.h b/keyboards/keyhive/maypad/config.h
index bb3ef2d646..b85053888f 100644
--- a/keyboards/keyhive/maypad/config.h
+++ b/keyboards/keyhive/maypad/config.h
@@ -135,8 +135,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/keyprez/bison/config.h b/keyboards/keyprez/bison/config.h
index a85e33c7e9..b98cbc1be1 100644
--- a/keyboards/keyprez/bison/config.h
+++ b/keyboards/keyprez/bison/config.h
@@ -149,10 +149,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keyprez/corgi/config.h b/keyboards/keyprez/corgi/config.h
index 7a304ab707..a3ebf2747f 100644
--- a/keyboards/keyprez/corgi/config.h
+++ b/keyboards/keyprez/corgi/config.h
@@ -57,7 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/keyprez/rhino/config.h b/keyboards/keyprez/rhino/config.h
index b89be8fdc2..54077ac939 100644
--- a/keyboards/keyprez/rhino/config.h
+++ b/keyboards/keyprez/rhino/config.h
@@ -106,10 +106,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/keyprez/unicorn/config.h b/keyboards/keyprez/unicorn/config.h
index fcfc6fe926..44eadb5bfb 100644
--- a/keyboards/keyprez/unicorn/config.h
+++ b/keyboards/keyprez/unicorn/config.h
@@ -132,10 +132,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kikkou/config.h b/keyboards/kikkou/config.h
index deedfd8382..586c8e9661 100644
--- a/keyboards/kikkou/config.h
+++ b/keyboards/kikkou/config.h
@@ -52,7 +52,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* disable print */
 //#define NO_PRINT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/kindakeyboards/conone65/config.h b/keyboards/kindakeyboards/conone65/config.h
index c29599cadd..0a7127708c 100644
--- a/keyboards/kindakeyboards/conone65/config.h
+++ b/keyboards/kindakeyboards/conone65/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kinesis/config.h b/keyboards/kinesis/config.h
index b04d325903..63b296a528 100644
--- a/keyboards/kinesis/config.h
+++ b/keyboards/kinesis/config.h
@@ -75,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/kira75/config.h b/keyboards/kira75/config.h
index 373c3e4f0b..18d8b8fad9 100644
--- a/keyboards/kira75/config.h
+++ b/keyboards/kira75/config.h
@@ -112,5 +112,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h
index d9dcc3ba60..47349d0e09 100644
--- a/keyboards/kiwikeebs/macro/config.h
+++ b/keyboards/kiwikeebs/macro/config.h
@@ -102,7 +102,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/kiwikeebs/macro_v2/config.h b/keyboards/kiwikeebs/macro_v2/config.h
index 9ecc4d6686..a962a9a82a 100644
--- a/keyboards/kiwikeebs/macro_v2/config.h
+++ b/keyboards/kiwikeebs/macro_v2/config.h
@@ -102,7 +102,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h
index 02a33926aa..648c3a88de 100644
--- a/keyboards/kiwikey/borderland/config.h
+++ b/keyboards/kiwikey/borderland/config.h
@@ -117,10 +117,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h
index 33ce43f302..59adcd253e 100644
--- a/keyboards/kiwikey/kawii9/config.h
+++ b/keyboards/kiwikey/kawii9/config.h
@@ -128,10 +128,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h
index 546a03aa30..e0b9ba8946 100644
--- a/keyboards/kiwikey/wanderland/config.h
+++ b/keyboards/kiwikey/wanderland/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kkatano/bakeneko60/config.h b/keyboards/kkatano/bakeneko60/config.h
index 9b923552bb..9e373686fd 100644
--- a/keyboards/kkatano/bakeneko60/config.h
+++ b/keyboards/kkatano/bakeneko60/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kkatano/bakeneko65/rev2/config.h b/keyboards/kkatano/bakeneko65/rev2/config.h
index 6639e82395..7e70f549cd 100644
--- a/keyboards/kkatano/bakeneko65/rev2/config.h
+++ b/keyboards/kkatano/bakeneko65/rev2/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kkatano/bakeneko65/rev3/config.h b/keyboards/kkatano/bakeneko65/rev3/config.h
index 6001ce3159..9fa3e68ca0 100644
--- a/keyboards/kkatano/bakeneko65/rev3/config.h
+++ b/keyboards/kkatano/bakeneko65/rev3/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kkatano/bakeneko80/config.h b/keyboards/kkatano/bakeneko80/config.h
index da330c395f..0e61db875b 100644
--- a/keyboards/kkatano/bakeneko80/config.h
+++ b/keyboards/kkatano/bakeneko80/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kkatano/wallaby/config.h b/keyboards/kkatano/wallaby/config.h
index 3c0d446418..00ba00ccac 100644
--- a/keyboards/kkatano/wallaby/config.h
+++ b/keyboards/kkatano/wallaby/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kkatano/yurei/config.h b/keyboards/kkatano/yurei/config.h
index 57877dc8fa..14eae7f387 100644
--- a/keyboards/kkatano/yurei/config.h
+++ b/keyboards/kkatano/yurei/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kmac/config.h b/keyboards/kmac/config.h
index 23cf0a0470..3bc567333e 100644
--- a/keyboards/kmac/config.h
+++ b/keyboards/kmac/config.h
@@ -100,5 +100,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/kmac_pad/config.h b/keyboards/kmac_pad/config.h
index eb33a994b3..189f2f9c08 100644
--- a/keyboards/kmac_pad/config.h
+++ b/keyboards/kmac_pad/config.h
@@ -98,5 +98,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/knops/mini/config.h b/keyboards/knops/mini/config.h
index eca8b8b4a8..8fb094fb94 100644
--- a/keyboards/knops/mini/config.h
+++ b/keyboards/knops/mini/config.h
@@ -103,5 +103,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/kona_classic/config.h b/keyboards/kona_classic/config.h
index c6dc3a0318..c5a783c811 100644
--- a/keyboards/kona_classic/config.h
+++ b/keyboards/kona_classic/config.h
@@ -102,5 +102,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/kopibeng/xt65/config.h b/keyboards/kopibeng/xt65/config.h
index e39f832bdf..e134e8b864 100644
--- a/keyboards/kopibeng/xt65/config.h
+++ b/keyboards/kopibeng/xt65/config.h
@@ -100,8 +100,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kprepublic/bm16a/config.h b/keyboards/kprepublic/bm16a/config.h
index c38f74458e..120232bb91 100644
--- a/keyboards/kprepublic/bm16a/config.h
+++ b/keyboards/kprepublic/bm16a/config.h
@@ -133,8 +133,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
index b4aa1a549c..d8e7501b22 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h
@@ -48,9 +48,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
index 5e695aec57..4653db4fd6 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/config.h
@@ -50,9 +50,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
index 27c3a6df55..d40004f502 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h
@@ -48,9 +48,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 //rgb light setting
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
diff --git a/keyboards/kprepublic/bm65hsrgb/rev1/config.h b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
index 1fbfab9368..b428a78864 100644
--- a/keyboards/kprepublic/bm65hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm65hsrgb/rev1/config.h
@@ -113,10 +113,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
index a779c97b7b..636ff1c785 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/config.h
@@ -165,10 +165,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/config.h b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
index 4faca73c0d..900aa699cb 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/config.h
@@ -38,9 +38,7 @@
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+
 #define RGBLIGHT_LIMIT_VAL 150
 #define RGBLED_NUM          6
 #define RGB_DI_PIN          E2
diff --git a/keyboards/kprepublic/bm80hsrgb/config.h b/keyboards/kprepublic/bm80hsrgb/config.h
index f56daf948c..7adc89720d 100644
--- a/keyboards/kprepublic/bm80hsrgb/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/config.h
@@ -136,7 +136,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/kprepublic/bm980hsrgb/config.h b/keyboards/kprepublic/bm980hsrgb/config.h
index e4499a0b05..01266e652c 100644
--- a/keyboards/kprepublic/bm980hsrgb/config.h
+++ b/keyboards/kprepublic/bm980hsrgb/config.h
@@ -127,10 +127,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/kprepublic/cospad/config.h b/keyboards/kprepublic/cospad/config.h
index 47c4a1d9af..bc53ef6206 100644
--- a/keyboards/kprepublic/cospad/config.h
+++ b/keyboards/kprepublic/cospad/config.h
@@ -141,10 +141,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ktec/daisy/config.h b/keyboards/ktec/daisy/config.h
index 3d504888ec..2079d172aa 100644
--- a/keyboards/ktec/daisy/config.h
+++ b/keyboards/ktec/daisy/config.h
@@ -140,10 +140,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ktec/ergodone/config.h b/keyboards/ktec/ergodone/config.h
index db626ab808..ee51e4c055 100644
--- a/keyboards/ktec/ergodone/config.h
+++ b/keyboards/ktec/ergodone/config.h
@@ -73,6 +73,5 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
+
 //#define DEBUG_MATRIX_SCAN_RATE
diff --git a/keyboards/kudox/columner/config.h b/keyboards/kudox/columner/config.h
index 1109331275..13a02bc803 100644
--- a/keyboards/kudox/columner/config.h
+++ b/keyboards/kudox/columner/config.h
@@ -80,8 +80,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
diff --git a/keyboards/kudox/rev1/config.h b/keyboards/kudox/rev1/config.h
index 8e994770f9..de5dbbbe71 100644
--- a/keyboards/kudox/rev1/config.h
+++ b/keyboards/kudox/rev1/config.h
@@ -80,8 +80,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
diff --git a/keyboards/kudox/rev2/config.h b/keyboards/kudox/rev2/config.h
index 81b1fb676f..c510926919 100644
--- a/keyboards/kudox/rev2/config.h
+++ b/keyboards/kudox/rev2/config.h
@@ -80,8 +80,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
diff --git a/keyboards/kudox/rev3/config.h b/keyboards/kudox/rev3/config.h
index 9d24106f4c..969111d0c8 100644
--- a/keyboards/kudox/rev3/config.h
+++ b/keyboards/kudox/rev3/config.h
@@ -80,8 +80,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
diff --git a/keyboards/kudox_full/rev1/config.h b/keyboards/kudox_full/rev1/config.h
index 46d680e442..bd47ed6b42 100644
--- a/keyboards/kudox_full/rev1/config.h
+++ b/keyboards/kudox_full/rev1/config.h
@@ -73,5 +73,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/kudox_game/rev1/config.h b/keyboards/kudox_game/rev1/config.h
index ab34f889dc..821a6af8bb 100644
--- a/keyboards/kudox_game/rev1/config.h
+++ b/keyboards/kudox_game/rev1/config.h
@@ -80,8 +80,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
diff --git a/keyboards/kudox_game/rev2/config.h b/keyboards/kudox_game/rev2/config.h
index ea27d5efb8..e1907bf29f 100644
--- a/keyboards/kudox_game/rev2/config.h
+++ b/keyboards/kudox_game/rev2/config.h
@@ -80,8 +80,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
diff --git a/keyboards/ky01/config.h b/keyboards/ky01/config.h
index 22c211dace..e0b94622c6 100644
--- a/keyboards/ky01/config.h
+++ b/keyboards/ky01/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/labyrinth75/config.h b/keyboards/labyrinth75/config.h
index cb95204885..afc77a8dd5 100644
--- a/keyboards/labyrinth75/config.h
+++ b/keyboards/labyrinth75/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 2
diff --git a/keyboards/latincompass/latin17rgb/config.h b/keyboards/latincompass/latin17rgb/config.h
index 6b929f249d..02d8522606 100644
--- a/keyboards/latincompass/latin17rgb/config.h
+++ b/keyboards/latincompass/latin17rgb/config.h
@@ -48,10 +48,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/latincompass/latin47ble/config.h b/keyboards/latincompass/latin47ble/config.h
index f9f94d0dbf..eb10693501 100644
--- a/keyboards/latincompass/latin47ble/config.h
+++ b/keyboards/latincompass/latin47ble/config.h
@@ -119,7 +119,5 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define VIA_HAS_BROKEN_KEYCODES
diff --git a/keyboards/latincompass/latin60rgb/config.h b/keyboards/latincompass/latin60rgb/config.h
index cc7b83b9b8..fa4ea39288 100644
--- a/keyboards/latincompass/latin60rgb/config.h
+++ b/keyboards/latincompass/latin60rgb/config.h
@@ -47,10 +47,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/latincompass/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
index 718d8aa26f..9beebe0f87 100644
--- a/keyboards/latincompass/latin6rgb/config.h
+++ b/keyboards/latincompass/latin6rgb/config.h
@@ -49,10 +49,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
diff --git a/keyboards/latincompass/latinpadble/config.h b/keyboards/latincompass/latinpadble/config.h
index da89046176..fc833a0269 100644
--- a/keyboards/latincompass/latinpadble/config.h
+++ b/keyboards/latincompass/latinpadble/config.h
@@ -26,10 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 // #define NO_ACTION_LAYER
 // #define NO_ACTION_TAPPING
 // #define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/keyboards/lattice60/config.h b/keyboards/lattice60/config.h
index 1346c73f47..c1e067287b 100644
--- a/keyboards/lattice60/config.h
+++ b/keyboards/lattice60/config.h
@@ -96,7 +96,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/lets_split/rev1/config.h b/keyboards/lets_split/rev1/config.h
index 02eee1f3da..fc9e348a86 100644
--- a/keyboards/lets_split/rev1/config.h
+++ b/keyboards/lets_split/rev1/config.h
@@ -74,5 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/lets_split/rev2/config.h b/keyboards/lets_split/rev2/config.h
index 37353b8b3d..7d8dff4f2f 100644
--- a/keyboards/lets_split/rev2/config.h
+++ b/keyboards/lets_split/rev2/config.h
@@ -74,5 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h
index 0adc0b3f56..18d6bbebe7 100644
--- a/keyboards/lfkeyboards/lfk65_hs/config.h
+++ b/keyboards/lfkeyboards/lfk65_hs/config.h
@@ -80,5 +80,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/lfkeyboards/lfk78/config.h b/keyboards/lfkeyboards/lfk78/config.h
index fbb02e71ee..1fab81a645 100644
--- a/keyboards/lfkeyboards/lfk78/config.h
+++ b/keyboards/lfkeyboards/lfk78/config.h
@@ -103,10 +103,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/lfkeyboards/lfk87/config.h b/keyboards/lfkeyboards/lfk87/config.h
index 387c58851c..af0a4b173b 100644
--- a/keyboards/lfkeyboards/lfk87/config.h
+++ b/keyboards/lfkeyboards/lfk87/config.h
@@ -111,5 +111,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/lfkeyboards/lfkpad/config.h b/keyboards/lfkeyboards/lfkpad/config.h
index 972b0283b5..0ddb4b95b6 100644
--- a/keyboards/lfkeyboards/lfkpad/config.h
+++ b/keyboards/lfkeyboards/lfkpad/config.h
@@ -120,10 +120,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h
index 7c81c9f98c..e7b0b5112a 100644
--- a/keyboards/lfkeyboards/mini1800/config.h
+++ b/keyboards/lfkeyboards/mini1800/config.h
@@ -98,5 +98,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/lfkeyboards/smk65/revb/config.h b/keyboards/lfkeyboards/smk65/revb/config.h
index 924a04fd9e..ecb183e8af 100644
--- a/keyboards/lfkeyboards/smk65/revb/config.h
+++ b/keyboards/lfkeyboards/smk65/revb/config.h
@@ -107,8 +107,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/lfkeyboards/smk65/revf/config.h b/keyboards/lfkeyboards/smk65/revf/config.h
index d2cb5226dd..1b8295b152 100644
--- a/keyboards/lfkeyboards/smk65/revf/config.h
+++ b/keyboards/lfkeyboards/smk65/revf/config.h
@@ -125,10 +125,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/lily58/config.h b/keyboards/lily58/config.h
index 0bdaa1f76e..57fc7fa7f9 100644
--- a/keyboards/lily58/config.h
+++ b/keyboards/lily58/config.h
@@ -25,13 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SERIAL_USE_MULTI_TRANSACTION
 #endif
 
-#if !defined(NO_ACTION_MACRO)
-    #define NO_ACTION_MACRO
-#endif
-#if !defined(NO_ACTION_FUNCTION)
-    #define NO_ACTION_FUNCTION
-#endif
-
 #define DIODE_DIRECTION COL2ROW
 
 // Use the lily version to get the Lily58 logo instead of the qmk logo
diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h
index 24dc41151f..6bfc7ffa75 100644
--- a/keyboards/lily58/rev1/config.h
+++ b/keyboards/lily58/rev1/config.h
@@ -68,5 +68,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/lime/rev1/config.h b/keyboards/lime/rev1/config.h
index 55c045dc67..547b881761 100644
--- a/keyboards/lime/rev1/config.h
+++ b/keyboards/lime/rev1/config.h
@@ -58,8 +58,6 @@
 #define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
 
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 #define SPLIT_USB_DETECT
 
 #ifdef WPM_ENABLE
diff --git a/keyboards/linworks/fave84h/config.h b/keyboards/linworks/fave84h/config.h
index 4127c211fd..7df7a9ace0 100644
--- a/keyboards/linworks/fave84h/config.h
+++ b/keyboards/linworks/fave84h/config.h
@@ -110,6 +110,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     #define ENABLE_RGB_MATRIX_SOLID_SPLASH
     #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #endif
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/linworks/fave87h/config.h b/keyboards/linworks/fave87h/config.h
index 64f6fc4cba..97d9bddba7 100644
--- a/keyboards/linworks/fave87h/config.h
+++ b/keyboards/linworks/fave87h/config.h
@@ -98,6 +98,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     #define ENABLE_RGB_MATRIX_SOLID_SPLASH
     #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 #endif
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/lizard_trick/tenkey_plusplus/config.h b/keyboards/lizard_trick/tenkey_plusplus/config.h
index d1087851cb..8883194891 100644
--- a/keyboards/lizard_trick/tenkey_plusplus/config.h
+++ b/keyboards/lizard_trick/tenkey_plusplus/config.h
@@ -150,10 +150,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/lm_keyboard/lm60n/config.h b/keyboards/lm_keyboard/lm60n/config.h
index 3515f4432b..171fa2fe5b 100644
--- a/keyboards/lm_keyboard/lm60n/config.h
+++ b/keyboards/lm_keyboard/lm60n/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/lucid/alexa/config.h b/keyboards/lucid/alexa/config.h
index a4ac8b62d2..19b5f4f19a 100644
--- a/keyboards/lucid/alexa/config.h
+++ b/keyboards/lucid/alexa/config.h
@@ -101,5 +101,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/lucid/kbd8x_hs/config.h b/keyboards/lucid/kbd8x_hs/config.h
index a5d47ce73e..1e5cff8e7f 100644
--- a/keyboards/lucid/kbd8x_hs/config.h
+++ b/keyboards/lucid/kbd8x_hs/config.h
@@ -101,5 +101,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/lucid/phantom_hs/config.h b/keyboards/lucid/phantom_hs/config.h
index 3e6fe45892..b94b345c16 100644
--- a/keyboards/lucid/phantom_hs/config.h
+++ b/keyboards/lucid/phantom_hs/config.h
@@ -101,5 +101,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/lucid/phantom_solder/config.h b/keyboards/lucid/phantom_solder/config.h
index af2537d386..2c78c4f5ff 100644
--- a/keyboards/lucid/phantom_solder/config.h
+++ b/keyboards/lucid/phantom_solder/config.h
@@ -101,5 +101,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/lucid/scarlet/config.h b/keyboards/lucid/scarlet/config.h
index 73c7272922..67c2fe7b07 100644
--- a/keyboards/lucid/scarlet/config.h
+++ b/keyboards/lucid/scarlet/config.h
@@ -98,5 +98,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/m10a/config.h b/keyboards/m10a/config.h
index 01f9d0d0a3..e09942f93a 100644
--- a/keyboards/m10a/config.h
+++ b/keyboards/m10a/config.h
@@ -70,5 +70,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/machine_industries/m4_a/config.h b/keyboards/machine_industries/m4_a/config.h
index 1ba3f4f715..f27cb8ae5b 100644
--- a/keyboards/machine_industries/m4_a/config.h
+++ b/keyboards/machine_industries/m4_a/config.h
@@ -129,10 +129,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/majistic/config.h b/keyboards/majistic/config.h
index 4ced5dd890..6e823ae3d6 100644
--- a/keyboards/majistic/config.h
+++ b/keyboards/majistic/config.h
@@ -51,7 +51,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/malevolti/lyra/rev1/config.h b/keyboards/malevolti/lyra/rev1/config.h
index 4e006c2bdf..18563f8270 100644
--- a/keyboards/malevolti/lyra/rev1/config.h
+++ b/keyboards/malevolti/lyra/rev1/config.h
@@ -44,6 +44,3 @@
 /* communication between sides */
 #define USE_SERIAL
 #define SOFT_SERIAL_PIN D2
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/malevolti/superlyra/rev1/config.h b/keyboards/malevolti/superlyra/rev1/config.h
index 65c41392fa..62c005ff9d 100644
--- a/keyboards/malevolti/superlyra/rev1/config.h
+++ b/keyboards/malevolti/superlyra/rev1/config.h
@@ -39,6 +39,3 @@
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/manta60/config.h b/keyboards/manta60/config.h
index 8bb63a566e..7c9a3b5ebe 100644
--- a/keyboards/manta60/config.h
+++ b/keyboards/manta60/config.h
@@ -147,10 +147,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h
index d7a950f2e6..63db714e63 100644
--- a/keyboards/manyboard/macro/config.h
+++ b/keyboards/manyboard/macro/config.h
@@ -48,6 +48,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/maple_computing/c39/config.h b/keyboards/maple_computing/c39/config.h
index 409023f1fa..45c503846f 100755
--- a/keyboards/maple_computing/c39/config.h
+++ b/keyboards/maple_computing/c39/config.h
@@ -72,5 +72,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/maple_computing/ivy/config.h b/keyboards/maple_computing/ivy/config.h
index 2ccf3b8f6f..130f2e0b61 100644
--- a/keyboards/maple_computing/ivy/config.h
+++ b/keyboards/maple_computing/ivy/config.h
@@ -62,5 +62,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/maple_computing/launchpad/config.h b/keyboards/maple_computing/launchpad/config.h
index 327d67016b..901c63c93b 100644
--- a/keyboards/maple_computing/launchpad/config.h
+++ b/keyboards/maple_computing/launchpad/config.h
@@ -58,8 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #ifdef SUBPROJECT_rev1
     #include "rev1/config.h"
diff --git a/keyboards/maple_computing/minidox/config.h b/keyboards/maple_computing/minidox/config.h
index 2c71378961..613e45977c 100644
--- a/keyboards/maple_computing/minidox/config.h
+++ b/keyboards/maple_computing/minidox/config.h
@@ -57,5 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/maple_computing/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h
index bcb7441140..ec9687cc0b 100644
--- a/keyboards/maple_computing/the_ruler/config.h
+++ b/keyboards/maple_computing/the_ruler/config.h
@@ -96,8 +96,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define RGB_DI_PIN E6     // The pin your RGB strip is wired to
 #define RGBLED_NUM 1      // Number of LEDs
diff --git a/keyboards/marksard/leftover30/config.h b/keyboards/marksard/leftover30/config.h
index 42c6c62872..5fc1b156a2 100644
--- a/keyboards/marksard/leftover30/config.h
+++ b/keyboards/marksard/leftover30/config.h
@@ -132,7 +132,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/marksard/treadstone48/rev1/config.h b/keyboards/marksard/treadstone48/rev1/config.h
index ad9de636d0..68d1191156 100644
--- a/keyboards/marksard/treadstone48/rev1/config.h
+++ b/keyboards/marksard/treadstone48/rev1/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/marksard/treadstone48/rev2/config.h b/keyboards/marksard/treadstone48/rev2/config.h
index 6df1467d8c..e0353925be 100644
--- a/keyboards/marksard/treadstone48/rev2/config.h
+++ b/keyboards/marksard/treadstone48/rev2/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/massdrop/alt/config.h b/keyboards/massdrop/alt/config.h
index df3cd891b6..2ab9c26d2c 100644
--- a/keyboards/massdrop/alt/config.h
+++ b/keyboards/massdrop/alt/config.h
@@ -128,8 +128,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 15
diff --git a/keyboards/massdrop/ctrl/config.h b/keyboards/massdrop/ctrl/config.h
index 6c0678c5ed..15abcaa674 100644
--- a/keyboards/massdrop/ctrl/config.h
+++ b/keyboards/massdrop/ctrl/config.h
@@ -127,8 +127,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 15
diff --git a/keyboards/matchstickworks/southpad/config.h b/keyboards/matchstickworks/southpad/config.h
index 247084a862..8831599828 100644
--- a/keyboards/matchstickworks/southpad/config.h
+++ b/keyboards/matchstickworks/southpad/config.h
@@ -92,8 +92,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/matthewdias/m3n3van/config.h b/keyboards/matthewdias/m3n3van/config.h
index 15f62cecfd..cef9d8d70a 100644
--- a/keyboards/matthewdias/m3n3van/config.h
+++ b/keyboards/matthewdias/m3n3van/config.h
@@ -59,7 +59,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/matthewdias/minim/config.h b/keyboards/matthewdias/minim/config.h
index e13d2b798f..9f31ba31cf 100644
--- a/keyboards/matthewdias/minim/config.h
+++ b/keyboards/matthewdias/minim/config.h
@@ -57,7 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/matthewdias/model_v/config.h b/keyboards/matthewdias/model_v/config.h
index 847599a369..d1c5dcd81d 100644
--- a/keyboards/matthewdias/model_v/config.h
+++ b/keyboards/matthewdias/model_v/config.h
@@ -56,7 +56,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/matthewdias/txuu/config.h b/keyboards/matthewdias/txuu/config.h
index 202777a965..f81c300a13 100644
--- a/keyboards/matthewdias/txuu/config.h
+++ b/keyboards/matthewdias/txuu/config.h
@@ -57,7 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/maxipad/config.h b/keyboards/maxipad/config.h
index a45c3e442d..7a4b00ccad 100644
--- a/keyboards/maxipad/config.h
+++ b/keyboards/maxipad/config.h
@@ -53,8 +53,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/maxr1998/pulse4k/config.h b/keyboards/maxr1998/pulse4k/config.h
index 75ff88f308..4b9c60aac2 100644
--- a/keyboards/maxr1998/pulse4k/config.h
+++ b/keyboards/maxr1998/pulse4k/config.h
@@ -70,5 +70,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/mb44/config.h b/keyboards/mb44/config.h
index 013efa8570..daafe52b41 100644
--- a/keyboards/mb44/config.h
+++ b/keyboards/mb44/config.h
@@ -53,9 +53,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/mc_76k/config.h b/keyboards/mc_76k/config.h
index a1d28185f1..cc7ac306f4 100644
--- a/keyboards/mc_76k/config.h
+++ b/keyboards/mc_76k/config.h
@@ -95,7 +95,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * useful if your keyboard/keypad is missing keys and you want magic key support.
  *
  */
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/mechkeys/mk60/config.h b/keyboards/mechkeys/mk60/config.h
index a841152f4f..680c498ef4 100644
--- a/keyboards/mechkeys/mk60/config.h
+++ b/keyboards/mechkeys/mk60/config.h
@@ -135,8 +135,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/mechlovin/hannah910/config.h b/keyboards/mechlovin/hannah910/config.h
index 7e0b9dd30c..cc2ac81bc5 100644
--- a/keyboards/mechlovin/hannah910/config.h
+++ b/keyboards/mechlovin/hannah910/config.h
@@ -106,8 +106,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/mechlovin/jay60/config.h b/keyboards/mechlovin/jay60/config.h
index 0b9770e5e2..521b8ae0db 100644
--- a/keyboards/mechlovin/jay60/config.h
+++ b/keyboards/mechlovin/jay60/config.h
@@ -138,10 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mechwild/bde/rev2/config.h b/keyboards/mechwild/bde/rev2/config.h
index ca14cf784d..0f290ecc33 100644
--- a/keyboards/mechwild/bde/rev2/config.h
+++ b/keyboards/mechwild/bde/rev2/config.h
@@ -68,7 +68,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
\ No newline at end of file
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index 0887025ad8..3995546e8e 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/config.h
@@ -85,10 +85,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index 03ff968787..1b7ed824aa 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -140,10 +140,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 5
 #define BOOTMAGIC_LITE_COLUMN 4
diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h
index 636e13de38..e3fc719b8f 100644
--- a/keyboards/mechwild/waka60/config.h
+++ b/keyboards/mechwild/waka60/config.h
@@ -134,10 +134,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/melgeek/mach80/config.h b/keyboards/melgeek/mach80/config.h
index 8f8377941f..0e98030e25 100755
--- a/keyboards/melgeek/mach80/config.h
+++ b/keyboards/melgeek/mach80/config.h
@@ -32,10 +32,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/melgeek/mj61/config.h b/keyboards/melgeek/mj61/config.h
index e3097b9cf7..0b5bd9ff48 100644
--- a/keyboards/melgeek/mj61/config.h
+++ b/keyboards/melgeek/mj61/config.h
@@ -32,10 +32,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/melgeek/mj63/config.h b/keyboards/melgeek/mj63/config.h
index db80371a2b..ddd953e1de 100644
--- a/keyboards/melgeek/mj63/config.h
+++ b/keyboards/melgeek/mj63/config.h
@@ -32,10 +32,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/melgeek/mj64/config.h b/keyboards/melgeek/mj64/config.h
index a249be3fea..684c48720b 100644
--- a/keyboards/melgeek/mj64/config.h
+++ b/keyboards/melgeek/mj64/config.h
@@ -32,10 +32,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/melgeek/mj65/config.h b/keyboards/melgeek/mj65/config.h
index 70a12d9255..4cf4f3f233 100644
--- a/keyboards/melgeek/mj65/config.h
+++ b/keyboards/melgeek/mj65/config.h
@@ -32,10 +32,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/melgeek/mojo68/config.h b/keyboards/melgeek/mojo68/config.h
index 15ea1a58b4..ee441be0e1 100755
--- a/keyboards/melgeek/mojo68/config.h
+++ b/keyboards/melgeek/mojo68/config.h
@@ -32,10 +32,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/melgeek/mojo75/config.h b/keyboards/melgeek/mojo75/config.h
index 9e2d1080d1..2db335dafb 100644
--- a/keyboards/melgeek/mojo75/config.h
+++ b/keyboards/melgeek/mojo75/config.h
@@ -32,10 +32,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/melgeek/z70ultra/config.h b/keyboards/melgeek/z70ultra/config.h
index 2df25bf501..0f294c9e00 100644
--- a/keyboards/melgeek/z70ultra/config.h
+++ b/keyboards/melgeek/z70ultra/config.h
@@ -31,10 +31,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
 #define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/meme/config.h b/keyboards/meme/config.h
index 0757846f57..58bc794ee8 100644
--- a/keyboards/meme/config.h
+++ b/keyboards/meme/config.h
@@ -105,5 +105,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/meow65/config.h b/keyboards/meow65/config.h
index 54af798314..20f725ee30 100644
--- a/keyboards/meow65/config.h
+++ b/keyboards/meow65/config.h
@@ -138,10 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mesa/mesa_tkl/config.h b/keyboards/mesa/mesa_tkl/config.h
index 23da260bcf..348d95a809 100644
--- a/keyboards/mesa/mesa_tkl/config.h
+++ b/keyboards/mesa/mesa_tkl/config.h
@@ -54,7 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h
index e777320487..3abeb479a2 100644
--- a/keyboards/meson/config.h
+++ b/keyboards/meson/config.h
@@ -109,9 +109,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/mikeneko65/rev3/config.h b/keyboards/mikeneko65/rev3/config.h
index dad2532012..33415392f8 100644
--- a/keyboards/mikeneko65/rev3/config.h
+++ b/keyboards/mikeneko65/rev3/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mikeneko65/rev4/config.h b/keyboards/mikeneko65/rev4/config.h
index 2e7efaf8db..b6b62b880c 100644
--- a/keyboards/mikeneko65/rev4/config.h
+++ b/keyboards/mikeneko65/rev4/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/miller/gm862/config.h b/keyboards/miller/gm862/config.h
index 09429b4d19..57a832dc08 100644
--- a/keyboards/miller/gm862/config.h
+++ b/keyboards/miller/gm862/config.h
@@ -28,10 +28,6 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/millipad/config.h b/keyboards/millipad/config.h
index c15d433a4c..cfc91a2a16 100644
--- a/keyboards/millipad/config.h
+++ b/keyboards/millipad/config.h
@@ -77,12 +77,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define FORCE_NKRO
 
-
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
@@ -91,4 +85,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define ENCODERS_PAD_A { D3 }
 #define ENCODERS_PAD_B { D2 }
-#define ENCODER_RESOLUTION 4
\ No newline at end of file
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/mini_elixivy/config.h b/keyboards/mini_elixivy/config.h
index e0853c0251..863934df6b 100644
--- a/keyboards/mini_elixivy/config.h
+++ b/keyboards/mini_elixivy/config.h
@@ -99,10 +99,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mini_ten_key_plus/config.h b/keyboards/mini_ten_key_plus/config.h
index 92ac355fe8..c8a44356f2 100644
--- a/keyboards/mini_ten_key_plus/config.h
+++ b/keyboards/mini_ten_key_plus/config.h
@@ -99,10 +99,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/miniaxe/config.h b/keyboards/miniaxe/config.h
index b9295bad9f..3c0ddf9074 100644
--- a/keyboards/miniaxe/config.h
+++ b/keyboards/miniaxe/config.h
@@ -122,8 +122,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/mint60/config.h b/keyboards/mint60/config.h
index b421349d86..ee44ae446b 100644
--- a/keyboards/mint60/config.h
+++ b/keyboards/mint60/config.h
@@ -121,5 +121,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/mitosis/config.h b/keyboards/mitosis/config.h
index 2c72eed5f2..5c2a0b9657 100644
--- a/keyboards/mitosis/config.h
+++ b/keyboards/mitosis/config.h
@@ -54,5 +54,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/miuni32/config.h b/keyboards/miuni32/config.h
index c25dfcaf99..cf8b875b2f 100644
--- a/keyboards/miuni32/config.h
+++ b/keyboards/miuni32/config.h
@@ -100,8 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define RGB_DI_PIN D0     // The pin your RGB strip is wired to
 #define RGBLED_NUM 17     // Number of LEDs
diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h
index 6be2373d8f..d1c4da9397 100644
--- a/keyboards/mlego/m48/config.h
+++ b/keyboards/mlego/m48/config.h
@@ -31,7 +31,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h
index 07698f7539..18c36671a9 100644
--- a/keyboards/mlego/m60/config.h
+++ b/keyboards/mlego/m60/config.h
@@ -31,7 +31,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h
index 6750d4d40b..7c19f9171d 100644
--- a/keyboards/mlego/m60_split/config.h
+++ b/keyboards/mlego/m60_split/config.h
@@ -31,7 +31,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/mntre/config.h b/keyboards/mntre/config.h
index 9ee3d3f272..af5f810741 100644
--- a/keyboards/mntre/config.h
+++ b/keyboards/mntre/config.h
@@ -92,10 +92,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h
index dc921fb335..cdeffe6fa3 100644
--- a/keyboards/mode/m65ha_alpha/config.h
+++ b/keyboards/mode/m65ha_alpha/config.h
@@ -69,5 +69,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h
index 1a048e94d2..daacee56ce 100644
--- a/keyboards/mode/m65hi_alpha/config.h
+++ b/keyboards/mode/m65hi_alpha/config.h
@@ -69,5 +69,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h
index e2e553bca9..9cd3bfcb35 100644
--- a/keyboards/mode/m65s/config.h
+++ b/keyboards/mode/m65s/config.h
@@ -69,7 +69,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define TAP_CODE_DELAY 50
diff --git a/keyboards/mode/m75h/config.h b/keyboards/mode/m75h/config.h
index 980ebc5b66..6618d2bdbd 100644
--- a/keyboards/mode/m75h/config.h
+++ b/keyboards/mode/m75h/config.h
@@ -67,8 +67,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define TAP_CODE_DELAY 50
 
diff --git a/keyboards/mode/m75s/config.h b/keyboards/mode/m75s/config.h
index 8ac31b069e..9e902a1585 100644
--- a/keyboards/mode/m75s/config.h
+++ b/keyboards/mode/m75s/config.h
@@ -67,8 +67,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define TAP_CODE_DELAY 50
 
diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h
index d0c61d1193..a0d39774e6 100644
--- a/keyboards/mode/m80v1/config.h
+++ b/keyboards/mode/m80v1/config.h
@@ -97,5 +97,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/molecule/config.h b/keyboards/molecule/config.h
index e3bc5ad342..419554ed2c 100755
--- a/keyboards/molecule/config.h
+++ b/keyboards/molecule/config.h
@@ -150,10 +150,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h
index 3c22e3fc84..e8fe01f504 100644
--- a/keyboards/momoka_ergo/config.h
+++ b/keyboards/momoka_ergo/config.h
@@ -113,10 +113,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0	
diff --git a/keyboards/monarch/config.h b/keyboards/monarch/config.h
index 6822b2f789..90131c5931 100644
--- a/keyboards/monarch/config.h
+++ b/keyboards/monarch/config.h
@@ -75,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/moonlander/config.h b/keyboards/moonlander/config.h
index d6686425c4..bd06c5006d 100644
--- a/keyboards/moonlander/config.h
+++ b/keyboards/moonlander/config.h
@@ -77,8 +77,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 #define DRIVER_ADDR_1 0b1110100
 #define DRIVER_ADDR_2 0b1110111
diff --git a/keyboards/morizon/config.h b/keyboards/morizon/config.h
index bf9e1b9a35..4b419283cb 100644
--- a/keyboards/morizon/config.h
+++ b/keyboards/morizon/config.h
@@ -40,7 +40,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/mountainblocks/mb17/config.h b/keyboards/mountainblocks/mb17/config.h
index aef58dc5da..9667d9e551 100644
--- a/keyboards/mountainblocks/mb17/config.h
+++ b/keyboards/mountainblocks/mb17/config.h
@@ -90,8 +90,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 //#define FORCE_NKRO
-
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/mschwingen/modelm/config.h b/keyboards/mschwingen/modelm/config.h
index 2b42bb38ed..57ac1c089b 100644
--- a/keyboards/mschwingen/modelm/config.h
+++ b/keyboards/mschwingen/modelm/config.h
@@ -57,8 +57,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 //#define DEBUG_MATRIX_SCAN_RATE
 #define DYNAMIC_MACRO_NO_NESTING
diff --git a/keyboards/mt40/config.h b/keyboards/mt40/config.h
index a48d758e7f..6626b24f3a 100644
--- a/keyboards/mt40/config.h
+++ b/keyboards/mt40/config.h
@@ -114,5 +114,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h
index 6cfc312243..c235686cc8 100644
--- a/keyboards/mtbkeys/mtb60/hotswap/config.h
+++ b/keyboards/mtbkeys/mtb60/hotswap/config.h
@@ -70,10 +70,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h
index 02037e83df..7b0909492d 100644
--- a/keyboards/mtbkeys/mtb60/solder/config.h
+++ b/keyboards/mtbkeys/mtb60/solder/config.h
@@ -70,10 +70,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/murcielago/rev1/config.h b/keyboards/murcielago/rev1/config.h
index 3f71dbca8d..2851ae884b 100644
--- a/keyboards/murcielago/rev1/config.h
+++ b/keyboards/murcielago/rev1/config.h
@@ -87,10 +87,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/nacly/splitreus62/config.h b/keyboards/nacly/splitreus62/config.h
index d8e67661bd..51013ee967 100644
--- a/keyboards/nacly/splitreus62/config.h
+++ b/keyboards/nacly/splitreus62/config.h
@@ -72,5 +72,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/nacly/ua62/config.h b/keyboards/nacly/ua62/config.h
index 492bba93e8..803bddc294 100644
--- a/keyboards/nacly/ua62/config.h
+++ b/keyboards/nacly/ua62/config.h
@@ -137,8 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/nemui/config.h b/keyboards/nemui/config.h
index e2c3827a5f..32b757d610 100644
--- a/keyboards/nemui/config.h
+++ b/keyboards/nemui/config.h
@@ -57,5 +57,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/nibiria/stream15/config.h b/keyboards/nibiria/stream15/config.h
index a36ee9146e..824357b475 100644
--- a/keyboards/nibiria/stream15/config.h
+++ b/keyboards/nibiria/stream15/config.h
@@ -60,5 +60,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/nightingale_studios/hailey/config.h b/keyboards/nightingale_studios/hailey/config.h
index e3eb062c3b..f3331b3f1c 100644
--- a/keyboards/nightingale_studios/hailey/config.h
+++ b/keyboards/nightingale_studios/hailey/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/nightly_boards/alter/rev1/config.h b/keyboards/nightly_boards/alter/rev1/config.h
index 4f9bade717..f42c49eb5c 100644
--- a/keyboards/nightly_boards/alter/rev1/config.h
+++ b/keyboards/nightly_boards/alter/rev1/config.h
@@ -90,10 +90,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/nightly_boards/n2/config.h b/keyboards/nightly_boards/n2/config.h
index 5ffa15f084..e19b26e76b 100644
--- a/keyboards/nightly_boards/n2/config.h
+++ b/keyboards/nightly_boards/n2/config.h
@@ -86,8 +86,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h
index 34656fa134..2f50f49273 100644
--- a/keyboards/nightly_boards/n60_s/config.h
+++ b/keyboards/nightly_boards/n60_s/config.h
@@ -94,6 +94,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/nightly_boards/n87/config.h b/keyboards/nightly_boards/n87/config.h
index 543399e71a..0bb8e62046 100644
--- a/keyboards/nightly_boards/n87/config.h
+++ b/keyboards/nightly_boards/n87/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/nightly_boards/n9/config.h b/keyboards/nightly_boards/n9/config.h
index b8b29099ca..153d02c245 100644
--- a/keyboards/nightly_boards/n9/config.h
+++ b/keyboards/nightly_boards/n9/config.h
@@ -86,8 +86,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/nightmare/config.h b/keyboards/nightmare/config.h
index 14477ee4de..ac4fe163e6 100644
--- a/keyboards/nightmare/config.h
+++ b/keyboards/nightmare/config.h
@@ -136,8 +136,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/novelkeys/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h
index a7947220ff..2b96638966 100755
--- a/keyboards/novelkeys/novelpad/config.h
+++ b/keyboards/novelkeys/novelpad/config.h
@@ -136,8 +136,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/noxary/220/config.h b/keyboards/noxary/220/config.h
index 522d1beca8..05fe1be559 100644
--- a/keyboards/noxary/220/config.h
+++ b/keyboards/noxary/220/config.h
@@ -109,8 +109,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/noxary/260/config.h b/keyboards/noxary/260/config.h
index 2a9ac07bdb..29818862da 100644
--- a/keyboards/noxary/260/config.h
+++ b/keyboards/noxary/260/config.h
@@ -142,8 +142,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/noxary/268_2/config.h b/keyboards/noxary/268_2/config.h
index c8fbdd3bf4..b447a37f57 100644
--- a/keyboards/noxary/268_2/config.h
+++ b/keyboards/noxary/268_2/config.h
@@ -110,8 +110,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/noxary/280/config.h b/keyboards/noxary/280/config.h
index 15de702859..3147d12528 100644
--- a/keyboards/noxary/280/config.h
+++ b/keyboards/noxary/280/config.h
@@ -109,8 +109,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/noxary/378/config.h b/keyboards/noxary/378/config.h
index a159af02fd..fa08601875 100644
--- a/keyboards/noxary/378/config.h
+++ b/keyboards/noxary/378/config.h
@@ -67,5 +67,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/noxary/valhalla/config.h b/keyboards/noxary/valhalla/config.h
index 4e87afecb9..abce175dce 100644
--- a/keyboards/noxary/valhalla/config.h
+++ b/keyboards/noxary/valhalla/config.h
@@ -67,5 +67,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/noxary/vulcan/config.h b/keyboards/noxary/vulcan/config.h
index 6281cb07d1..e478071110 100644
--- a/keyboards/noxary/vulcan/config.h
+++ b/keyboards/noxary/vulcan/config.h
@@ -99,8 +99,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/noxary/x268/config.h b/keyboards/noxary/x268/config.h
index 5f33c18e81..3c4965a6cc 100644
--- a/keyboards/noxary/x268/config.h
+++ b/keyboards/noxary/x268/config.h
@@ -117,8 +117,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/numatreus/config.h b/keyboards/numatreus/config.h
index c22c67ed8c..b2c147fcc1 100644
--- a/keyboards/numatreus/config.h
+++ b/keyboards/numatreus/config.h
@@ -95,5 +95,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/oddball/config.h b/keyboards/oddball/config.h
index 4bc9c7997c..cfb134c4e3 100644
--- a/keyboards/oddball/config.h
+++ b/keyboards/oddball/config.h
@@ -45,10 +45,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* optical sensor settings */
 #define SCROLL_DIVIDER 12
 #define CPI_1 2000
diff --git a/keyboards/orthodox/rev1/config.h b/keyboards/orthodox/rev1/config.h
index 1dadae388d..db45e2d75d 100644
--- a/keyboards/orthodox/rev1/config.h
+++ b/keyboards/orthodox/rev1/config.h
@@ -87,5 +87,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/orthodox/rev3/config.h b/keyboards/orthodox/rev3/config.h
index ae51281647..678a3603f1 100644
--- a/keyboards/orthodox/rev3/config.h
+++ b/keyboards/orthodox/rev3/config.h
@@ -91,5 +91,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/orthodox/rev3_teensy/config.h b/keyboards/orthodox/rev3_teensy/config.h
index a35c276d95..d21d50e579 100644
--- a/keyboards/orthodox/rev3_teensy/config.h
+++ b/keyboards/orthodox/rev3_teensy/config.h
@@ -85,5 +85,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/paprikman/albacore/config.h b/keyboards/paprikman/albacore/config.h
index 3fa81b160f..37a211726e 100644
--- a/keyboards/paprikman/albacore/config.h
+++ b/keyboards/paprikman/albacore/config.h
@@ -71,10 +71,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Set lower left modifier key as a bootmagic key */
 #define BOOTMAGIC_LITE_ROW 1
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/parallel/parallel_65/hotswap/config.h b/keyboards/parallel/parallel_65/hotswap/config.h
index 26734936ed..ae730c3c9f 100644
--- a/keyboards/parallel/parallel_65/hotswap/config.h
+++ b/keyboards/parallel/parallel_65/hotswap/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/parallel/parallel_65/soldered/config.h b/keyboards/parallel/parallel_65/soldered/config.h
index a5eace0be2..2ff2492ad4 100644
--- a/keyboards/parallel/parallel_65/soldered/config.h
+++ b/keyboards/parallel/parallel_65/soldered/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/pdxkbc/config.h b/keyboards/pdxkbc/config.h
index dad0396330..ce6c79bc32 100644
--- a/keyboards/pdxkbc/config.h
+++ b/keyboards/pdxkbc/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/pearl/config.h b/keyboards/pearl/config.h
index 09e0c8e1e4..2e9a2faf1d 100644
--- a/keyboards/pearl/config.h
+++ b/keyboards/pearl/config.h
@@ -44,6 +44,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/peranekofactory/tone/rev1/config.h b/keyboards/peranekofactory/tone/rev1/config.h
index 54a59ed551..38bfd6259c 100644
--- a/keyboards/peranekofactory/tone/rev1/config.h
+++ b/keyboards/peranekofactory/tone/rev1/config.h
@@ -150,10 +150,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/peranekofactory/tone/rev2/config.h b/keyboards/peranekofactory/tone/rev2/config.h
index 54a59ed551..38bfd6259c 100644
--- a/keyboards/peranekofactory/tone/rev2/config.h
+++ b/keyboards/peranekofactory/tone/rev2/config.h
@@ -150,10 +150,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/phantom/config.h b/keyboards/phantom/config.h
index a948987d18..b30adef9dd 100644
--- a/keyboards/phantom/config.h
+++ b/keyboards/phantom/config.h
@@ -135,10 +135,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/pico/65keys/config.h b/keyboards/pico/65keys/config.h
index 981418263f..e0cc6ea566 100644
--- a/keyboards/pico/65keys/config.h
+++ b/keyboards/pico/65keys/config.h
@@ -80,8 +80,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
diff --git a/keyboards/pico/70keys/config.h b/keyboards/pico/70keys/config.h
index 2d94f4d5f7..b2d07c9691 100644
--- a/keyboards/pico/70keys/config.h
+++ b/keyboards/pico/70keys/config.h
@@ -80,8 +80,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define MOUSEKEY_INTERVAL       20
 #define MOUSEKEY_DELAY          0
diff --git a/keyboards/pinky/3/config.h b/keyboards/pinky/3/config.h
index c8d576388c..78192bc19e 100644
--- a/keyboards/pinky/3/config.h
+++ b/keyboards/pinky/3/config.h
@@ -107,8 +107,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/pinky/4/config.h b/keyboards/pinky/4/config.h
index d0d46f1926..f5a9024045 100644
--- a/keyboards/pinky/4/config.h
+++ b/keyboards/pinky/4/config.h
@@ -107,8 +107,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/pisces/config.h b/keyboards/pisces/config.h
index 7c6c65f247..163edb8727 100644
--- a/keyboards/pisces/config.h
+++ b/keyboards/pisces/config.h
@@ -64,7 +64,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/pizzakeyboards/pizza65/config.h b/keyboards/pizzakeyboards/pizza65/config.h
index 039fc68263..505a573630 100644
--- a/keyboards/pizzakeyboards/pizza65/config.h
+++ b/keyboards/pizzakeyboards/pizza65/config.h
@@ -49,10 +49,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/planck/config.h b/keyboards/planck/config.h
index a86359327a..8fb9dda32a 100644
--- a/keyboards/planck/config.h
+++ b/keyboards/planck/config.h
@@ -75,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h
index 537c215096..d948fb5808 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -106,8 +106,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // #define WS2812_LED_N 2
 // #define RGBLED_NUM WS2812_LED_N
diff --git a/keyboards/planck/rev6/config.h b/keyboards/planck/rev6/config.h
index aa70d46a8e..778fa12fcc 100644
--- a/keyboards/planck/rev6/config.h
+++ b/keyboards/planck/rev6/config.h
@@ -102,9 +102,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 
 /*
  * WS2812 Underglow Matrix options
diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h
index c1baa34b72..f41d46b889 100644
--- a/keyboards/planck/rev6_drop/config.h
+++ b/keyboards/planck/rev6_drop/config.h
@@ -109,8 +109,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /*
  * WS2812 Underglow Matrix options
diff --git a/keyboards/ploopyco/mouse/config.h b/keyboards/ploopyco/mouse/config.h
index df1ea1297b..98fc81bb05 100644
--- a/keyboards/ploopyco/mouse/config.h
+++ b/keyboards/ploopyco/mouse/config.h
@@ -63,8 +63,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ploopyco/trackball/config.h b/keyboards/ploopyco/trackball/config.h
index 4275e9d119..dd068e4838 100644
--- a/keyboards/ploopyco/trackball/config.h
+++ b/keyboards/ploopyco/trackball/config.h
@@ -41,8 +41,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 #define USB_MAX_POWER_CONSUMPTION 100
 
diff --git a/keyboards/ploopyco/trackball_mini/config.h b/keyboards/ploopyco/trackball_mini/config.h
index 731e6fbc97..9c53f1f501 100644
--- a/keyboards/ploopyco/trackball_mini/config.h
+++ b/keyboards/ploopyco/trackball_mini/config.h
@@ -42,8 +42,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 #define USB_MAX_POWER_CONSUMPTION 100
 
diff --git a/keyboards/ploopyco/trackball_nano/config.h b/keyboards/ploopyco/trackball_nano/config.h
index 98a2c662fa..985ddc09ba 100644
--- a/keyboards/ploopyco/trackball_nano/config.h
+++ b/keyboards/ploopyco/trackball_nano/config.h
@@ -38,8 +38,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 #define USB_MAX_POWER_CONSUMPTION 100
 
diff --git a/keyboards/pluckey/config.h b/keyboards/pluckey/config.h
index 295fe93a85..f98318437b 100644
--- a/keyboards/pluckey/config.h
+++ b/keyboards/pluckey/config.h
@@ -81,10 +81,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/plume/plume65/config.h b/keyboards/plume/plume65/config.h
index 5035ee1ead..b7d91e1023 100644
--- a/keyboards/plume/plume65/config.h
+++ b/keyboards/plume/plume65/config.h
@@ -126,8 +126,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/plut0nium/0x3e/config.h b/keyboards/plut0nium/0x3e/config.h
index f61d22228f..055fe63ce7 100644
--- a/keyboards/plut0nium/0x3e/config.h
+++ b/keyboards/plut0nium/0x3e/config.h
@@ -105,10 +105,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/pohjolaworks/louhi/config.h b/keyboards/pohjolaworks/louhi/config.h
index c790ddfbb2..b9cbde16d3 100644
--- a/keyboards/pohjolaworks/louhi/config.h
+++ b/keyboards/pohjolaworks/louhi/config.h
@@ -141,10 +141,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/polilla/rev1/config.h b/keyboards/polilla/rev1/config.h
index 5f0f10d355..b48e99e6d5 100644
--- a/keyboards/polilla/rev1/config.h
+++ b/keyboards/polilla/rev1/config.h
@@ -73,10 +73,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/portal_66/hotswap/config.h b/keyboards/portal_66/hotswap/config.h
index db4c59bd44..96ea091a20 100644
--- a/keyboards/portal_66/hotswap/config.h
+++ b/keyboards/portal_66/hotswap/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/portal_66/soldered/config.h b/keyboards/portal_66/soldered/config.h
index 3a3efc80b5..f5e0d734c4 100644
--- a/keyboards/portal_66/soldered/config.h
+++ b/keyboards/portal_66/soldered/config.h
@@ -100,10 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/pos78/config.h b/keyboards/pos78/config.h
index c070d1358d..81449c844f 100644
--- a/keyboards/pos78/config.h
+++ b/keyboards/pos78/config.h
@@ -106,10 +106,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h
index 8f72de9094..6bcfa26380 100644
--- a/keyboards/preonic/config.h
+++ b/keyboards/preonic/config.h
@@ -75,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/preonic/rev3/config.h b/keyboards/preonic/rev3/config.h
index f2c4b3c3d8..efa32d5916 100644
--- a/keyboards/preonic/rev3/config.h
+++ b/keyboards/preonic/rev3/config.h
@@ -89,8 +89,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /*
  * WS2812 Underglow Matrix options
diff --git a/keyboards/preonic/rev3_drop/config.h b/keyboards/preonic/rev3_drop/config.h
index 1a0605e739..813675eb84 100644
--- a/keyboards/preonic/rev3_drop/config.h
+++ b/keyboards/preonic/rev3_drop/config.h
@@ -91,8 +91,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /*
  * WS2812 Underglow Matrix options
diff --git a/keyboards/program_yoink/config.h b/keyboards/program_yoink/config.h
index 8ff859913a..156044d24a 100644
--- a/keyboards/program_yoink/config.h
+++ b/keyboards/program_yoink/config.h
@@ -94,7 +94,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/projectcain/vault35/config.h b/keyboards/projectcain/vault35/config.h
index d88863e5b5..1490b0ba4e 100644
--- a/keyboards/projectcain/vault35/config.h
+++ b/keyboards/projectcain/vault35/config.h
@@ -144,10 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/projectcain/vault45/config.h b/keyboards/projectcain/vault45/config.h
index 6accb223a4..e531c7f530 100644
--- a/keyboards/projectcain/vault45/config.h
+++ b/keyboards/projectcain/vault45/config.h
@@ -147,10 +147,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h
index 05180c756f..498c1f9370 100644
--- a/keyboards/projectkb/alice/rev1/config.h
+++ b/keyboards/projectkb/alice/rev1/config.h
@@ -81,5 +81,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h
index 0b017936c5..21742ac7b8 100644
--- a/keyboards/projectkb/alice/rev2/config.h
+++ b/keyboards/projectkb/alice/rev2/config.h
@@ -82,5 +82,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/prototypist/allison/config.h b/keyboards/prototypist/allison/config.h
index 85cb6ee9f5..89a24768de 100644
--- a/keyboards/prototypist/allison/config.h
+++ b/keyboards/prototypist/allison/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/prototypist/allison_numpad/config.h b/keyboards/prototypist/allison_numpad/config.h
index 581926c24c..59fb02d9a5 100644
--- a/keyboards/prototypist/allison_numpad/config.h
+++ b/keyboards/prototypist/allison_numpad/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/psuieee/pluto12/config.h b/keyboards/psuieee/pluto12/config.h
index b59bd05afe..49466f7b4a 100644
--- a/keyboards/psuieee/pluto12/config.h
+++ b/keyboards/psuieee/pluto12/config.h
@@ -36,7 +36,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h
index d6f31514e6..793dc8e5ed 100644
--- a/keyboards/pteron36/config.h
+++ b/keyboards/pteron36/config.h
@@ -144,10 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
@@ -164,4 +160,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //RGB Underglow
 #define RGB_DI_PIN B6
-#define RGBLED_NUM 10
\ No newline at end of file
+#define RGBLED_NUM 10
diff --git a/keyboards/punk75/config.h b/keyboards/punk75/config.h
index 76d620b222..61950da946 100644
--- a/keyboards/punk75/config.h
+++ b/keyboards/punk75/config.h
@@ -66,7 +66,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
  */
 // #define GRAVE_ESC_CTRL_OVERRIDE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/qpockets/wanten/config.h b/keyboards/qpockets/wanten/config.h
index ed6294f73f..18a91c1dfd 100644
--- a/keyboards/qpockets/wanten/config.h
+++ b/keyboards/qpockets/wanten/config.h
@@ -152,10 +152,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/quad_h/lb75/config.h b/keyboards/quad_h/lb75/config.h
index e752dfcdd5..36cb275a97 100644
--- a/keyboards/quad_h/lb75/config.h
+++ b/keyboards/quad_h/lb75/config.h
@@ -134,8 +134,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/quantrik/kyuu/config.h b/keyboards/quantrik/kyuu/config.h
index a2fc756fba..772e404ad0 100644
--- a/keyboards/quantrik/kyuu/config.h
+++ b/keyboards/quantrik/kyuu/config.h
@@ -132,8 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h
index 4cd214e222..4ca8fed192 100644
--- a/keyboards/qwertyydox/config.h
+++ b/keyboards/qwertyydox/config.h
@@ -144,8 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/rabbit/rabbit68/config.h b/keyboards/rabbit/rabbit68/config.h
index bae66808ac..9ebd5e55ae 100644
--- a/keyboards/rabbit/rabbit68/config.h
+++ b/keyboards/rabbit/rabbit68/config.h
@@ -132,8 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ramonimbao/aelith/config.h b/keyboards/ramonimbao/aelith/config.h
index 0c4c2285d5..a2911dac4f 100644
--- a/keyboards/ramonimbao/aelith/config.h
+++ b/keyboards/ramonimbao/aelith/config.h
@@ -99,7 +99,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/ramonimbao/chevron/config.h b/keyboards/ramonimbao/chevron/config.h
index ec52ee5954..9deeff3856 100644
--- a/keyboards/ramonimbao/chevron/config.h
+++ b/keyboards/ramonimbao/chevron/config.h
@@ -133,10 +133,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ramonimbao/herringbone/pro/config.h b/keyboards/ramonimbao/herringbone/pro/config.h
index 4aab52fcb5..f78665a880 100644
--- a/keyboards/ramonimbao/herringbone/pro/config.h
+++ b/keyboards/ramonimbao/herringbone/pro/config.h
@@ -108,10 +108,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ramonimbao/herringbone/v1/config.h b/keyboards/ramonimbao/herringbone/v1/config.h
index 9944cfbd19..7f37bcc8b2 100644
--- a/keyboards/ramonimbao/herringbone/v1/config.h
+++ b/keyboards/ramonimbao/herringbone/v1/config.h
@@ -136,10 +136,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ramonimbao/mona/v1/config.h b/keyboards/ramonimbao/mona/v1/config.h
index 81ddb806e8..5ee7ca3e33 100644
--- a/keyboards/ramonimbao/mona/v1/config.h
+++ b/keyboards/ramonimbao/mona/v1/config.h
@@ -57,7 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/ramonimbao/mona/v1_1/config.h b/keyboards/ramonimbao/mona/v1_1/config.h
index de657cd8e6..ce9c01139e 100644
--- a/keyboards/ramonimbao/mona/v1_1/config.h
+++ b/keyboards/ramonimbao/mona/v1_1/config.h
@@ -55,8 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
-
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/ramonimbao/mona/v32a/config.h b/keyboards/ramonimbao/mona/v32a/config.h
index 9cd47cd024..fdd80e59aa 100644
--- a/keyboards/ramonimbao/mona/v32a/config.h
+++ b/keyboards/ramonimbao/mona/v32a/config.h
@@ -55,8 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
-
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/ramonimbao/squishy65/config.h b/keyboards/ramonimbao/squishy65/config.h
index 9aa3c8d82d..1f2bfd7e66 100644
--- a/keyboards/ramonimbao/squishy65/config.h
+++ b/keyboards/ramonimbao/squishy65/config.h
@@ -64,5 +64,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ramonimbao/squishyfrl/config.h b/keyboards/ramonimbao/squishyfrl/config.h
index 0c1d417b81..9a50948771 100644
--- a/keyboards/ramonimbao/squishyfrl/config.h
+++ b/keyboards/ramonimbao/squishyfrl/config.h
@@ -144,10 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ramonimbao/squishytkl/config.h b/keyboards/ramonimbao/squishytkl/config.h
index ebebc35bb4..0ee0bc9509 100644
--- a/keyboards/ramonimbao/squishytkl/config.h
+++ b/keyboards/ramonimbao/squishytkl/config.h
@@ -144,10 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ramonimbao/tkl_ff/config.h b/keyboards/ramonimbao/tkl_ff/config.h
index ec73601f84..d0b3ee75ff 100644
--- a/keyboards/ramonimbao/tkl_ff/config.h
+++ b/keyboards/ramonimbao/tkl_ff/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ramonimbao/wete/v1/config.h b/keyboards/ramonimbao/wete/v1/config.h
index 3d89550090..ae9ffc6d97 100644
--- a/keyboards/ramonimbao/wete/v1/config.h
+++ b/keyboards/ramonimbao/wete/v1/config.h
@@ -75,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ramonimbao/wete/v2/config.h b/keyboards/ramonimbao/wete/v2/config.h
index 00cc6593d3..d66fe09ad3 100644
--- a/keyboards/ramonimbao/wete/v2/config.h
+++ b/keyboards/ramonimbao/wete/v2/config.h
@@ -150,10 +150,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h
index fc6fbaa117..cf02cfedb6 100644
--- a/keyboards/rart/rartlice/config.h
+++ b/keyboards/rart/rartlice/config.h
@@ -68,5 +68,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/rate/pistachio/rev1/config.h b/keyboards/rate/pistachio/rev1/config.h
index 24f121ef17..efffd3c9e2 100644
--- a/keyboards/rate/pistachio/rev1/config.h
+++ b/keyboards/rate/pistachio/rev1/config.h
@@ -61,7 +61,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* nKey Rollover */
 #define FORCE_NKRO
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/rate/pistachio/rev2/config.h b/keyboards/rate/pistachio/rev2/config.h
index d0de298542..5363f76df4 100644
--- a/keyboards/rate/pistachio/rev2/config.h
+++ b/keyboards/rate/pistachio/rev2/config.h
@@ -65,7 +65,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* nKey Rollover */
 #define FORCE_NKRO
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/rate/pistachio_mp/config.h b/keyboards/rate/pistachio_mp/config.h
index 4da866bb7d..09b067c8ee 100644
--- a/keyboards/rate/pistachio_mp/config.h
+++ b/keyboards/rate/pistachio_mp/config.h
@@ -72,7 +72,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* nKey Rollover */
 #define FORCE_NKRO
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/rate/pistachio_pro/config.h b/keyboards/rate/pistachio_pro/config.h
index f268967f6e..d140aa5407 100644
--- a/keyboards/rate/pistachio_pro/config.h
+++ b/keyboards/rate/pistachio_pro/config.h
@@ -86,10 +86,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/recompile_keys/mio/config.h b/keyboards/recompile_keys/mio/config.h
index 7eab9ea590..0c4438e53e 100644
--- a/keyboards/recompile_keys/mio/config.h
+++ b/keyboards/recompile_keys/mio/config.h
@@ -58,10 +58,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_ANIMATIONS
 #endif
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/recompile_keys/nomu30/rev2/config.h b/keyboards/recompile_keys/nomu30/rev2/config.h
index de9b37ec26..49d80a7162 100644
--- a/keyboards/recompile_keys/nomu30/rev2/config.h
+++ b/keyboards/recompile_keys/nomu30/rev2/config.h
@@ -41,7 +41,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h
index c9863fdcb6..95c4e3cbbf 100644
--- a/keyboards/redox/rev1/config.h
+++ b/keyboards/redox/rev1/config.h
@@ -78,5 +78,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h
index 4ec4a975a4..eec50ab879 100644
--- a/keyboards/redox/rev1/proton_c/config.h
+++ b/keyboards/redox/rev1/proton_c/config.h
@@ -62,5 +62,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/redox_w/config.h b/keyboards/redox_w/config.h
index c4aeb32d58..4fe2447b06 100644
--- a/keyboards/redox_w/config.h
+++ b/keyboards/redox_w/config.h
@@ -53,5 +53,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/redscarf_iiplus/verb/config.h b/keyboards/redscarf_iiplus/verb/config.h
index c313b90a32..daf1bc8823 100755
--- a/keyboards/redscarf_iiplus/verb/config.h
+++ b/keyboards/redscarf_iiplus/verb/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/redscarf_iiplus/verc/config.h b/keyboards/redscarf_iiplus/verc/config.h
index c313b90a32..daf1bc8823 100755
--- a/keyboards/redscarf_iiplus/verc/config.h
+++ b/keyboards/redscarf_iiplus/verc/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/redscarf_iiplus/verd/config.h b/keyboards/redscarf_iiplus/verd/config.h
index 94b0e88539..d0ab1abe33 100644
--- a/keyboards/redscarf_iiplus/verd/config.h
+++ b/keyboards/redscarf_iiplus/verd/config.h
@@ -142,8 +142,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/retro_75/config.h b/keyboards/retro_75/config.h
index 6ab89d7617..5d8c26450d 100644
--- a/keyboards/retro_75/config.h
+++ b/keyboards/retro_75/config.h
@@ -136,8 +136,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/reversestudio/decadepad/config.h b/keyboards/reversestudio/decadepad/config.h
index 383a539d78..f4bbdfda11 100644
--- a/keyboards/reversestudio/decadepad/config.h
+++ b/keyboards/reversestudio/decadepad/config.h
@@ -79,5 +79,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
\ No newline at end of file
diff --git a/keyboards/reviung/reviung33/config.h b/keyboards/reviung/reviung33/config.h
index b65d1d7c39..f113de6d11 100644
--- a/keyboards/reviung/reviung33/config.h
+++ b/keyboards/reviung/reviung33/config.h
@@ -128,10 +128,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/reviung/reviung34/config.h b/keyboards/reviung/reviung34/config.h
index 0847678e86..254ea550af 100755
--- a/keyboards/reviung/reviung34/config.h
+++ b/keyboards/reviung/reviung34/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/reviung/reviung39/config.h b/keyboards/reviung/reviung39/config.h
index 098497bc9f..1377cecd3f 100644
--- a/keyboards/reviung/reviung39/config.h
+++ b/keyboards/reviung/reviung39/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/reviung/reviung41/config.h b/keyboards/reviung/reviung41/config.h
index 967ca791d5..afa83220c7 100644
--- a/keyboards/reviung/reviung41/config.h
+++ b/keyboards/reviung/reviung41/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/reviung/reviung5/config.h b/keyboards/reviung/reviung5/config.h
index b06c5797fd..38b88c07a8 100644
--- a/keyboards/reviung/reviung5/config.h
+++ b/keyboards/reviung/reviung5/config.h
@@ -136,10 +136,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/reviung/reviung53/config.h b/keyboards/reviung/reviung53/config.h
index d73e6eab8a..f874297d77 100644
--- a/keyboards/reviung/reviung53/config.h
+++ b/keyboards/reviung/reviung53/config.h
@@ -129,10 +129,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/reviung/reviung61/config.h b/keyboards/reviung/reviung61/config.h
index 26588d8688..0d10c983c9 100644
--- a/keyboards/reviung/reviung61/config.h
+++ b/keyboards/reviung/reviung61/config.h
@@ -57,7 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h
index e813894549..50cb5b82b7 100644
--- a/keyboards/rgbkb/sol/config.h
+++ b/keyboards/rgbkb/sol/config.h
@@ -130,5 +130,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/rgbkb/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h
index 649a380055..d41ffa477d 100644
--- a/keyboards/rgbkb/zen/rev1/config.h
+++ b/keyboards/rgbkb/zen/rev1/config.h
@@ -69,5 +69,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/rgbkb/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h
index 859d115ea5..e37bd7a168 100644
--- a/keyboards/rgbkb/zen/rev2/config.h
+++ b/keyboards/rgbkb/zen/rev2/config.h
@@ -79,5 +79,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/rgbkb/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h
index 190a8bbe3e..19fd28d2ec 100644
--- a/keyboards/rgbkb/zygomorph/rev1/config.h
+++ b/keyboards/rgbkb/zygomorph/rev1/config.h
@@ -99,5 +99,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/rocketboard_16/config.h b/keyboards/rocketboard_16/config.h
index cd99fcc73b..d06895f709 100644
--- a/keyboards/rocketboard_16/config.h
+++ b/keyboards/rocketboard_16/config.h
@@ -79,5 +79,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/rominronin/katana60/rev1/config.h b/keyboards/rominronin/katana60/rev1/config.h
index fe10d1a533..fea2d7d643 100644
--- a/keyboards/rominronin/katana60/rev1/config.h
+++ b/keyboards/rominronin/katana60/rev1/config.h
@@ -101,5 +101,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/rominronin/katana60/rev2/config.h b/keyboards/rominronin/katana60/rev2/config.h
index 7eff68a7f4..24984c8179 100644
--- a/keyboards/rominronin/katana60/rev2/config.h
+++ b/keyboards/rominronin/katana60/rev2/config.h
@@ -101,5 +101,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/roseslite/config.h b/keyboards/roseslite/config.h
index 48e251e96d..44f415b379 100644
--- a/keyboards/roseslite/config.h
+++ b/keyboards/roseslite/config.h
@@ -127,5 +127,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/rubi/config.h b/keyboards/rubi/config.h
index 5b6b1c4531..25c7aa5be7 100644
--- a/keyboards/rubi/config.h
+++ b/keyboards/rubi/config.h
@@ -58,8 +58,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define OLED_FONT_H "lib/glcdfont.c"
diff --git a/keyboards/runes/vaengr/config.h b/keyboards/runes/vaengr/config.h
index 22b38760c4..67ba4ca0fe 100644
--- a/keyboards/runes/vaengr/config.h
+++ b/keyboards/runes/vaengr/config.h
@@ -138,10 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ryanbaekr/rb69/config.h b/keyboards/ryanbaekr/rb69/config.h
index 2112eda1a7..0464befc5f 100644
--- a/keyboards/ryanbaekr/rb69/config.h
+++ b/keyboards/ryanbaekr/rb69/config.h
@@ -112,7 +112,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 //#define FORCE_NKRO
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/ryanbaekr/rb86/config.h b/keyboards/ryanbaekr/rb86/config.h
index ec93c2b3c5..fd076dd706 100644
--- a/keyboards/ryanbaekr/rb86/config.h
+++ b/keyboards/ryanbaekr/rb86/config.h
@@ -90,7 +90,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 //#define FORCE_NKRO
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/sandwich/keeb68/config.h b/keyboards/sandwich/keeb68/config.h
index 7dddf54d76..9395d8ef1a 100644
--- a/keyboards/sandwich/keeb68/config.h
+++ b/keyboards/sandwich/keeb68/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/satt/comet46/config.h b/keyboards/satt/comet46/config.h
index 5ea40c14c5..d75294dc13 100644
--- a/keyboards/satt/comet46/config.h
+++ b/keyboards/satt/comet46/config.h
@@ -54,8 +54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // Define masks for modifiers
 #define MODS_SHIFT_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
diff --git a/keyboards/satt/vision/config.h b/keyboards/satt/vision/config.h
index 62a7244aa4..2db8fa8b29 100644
--- a/keyboards/satt/vision/config.h
+++ b/keyboards/satt/vision/config.h
@@ -58,5 +58,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/scatter42/config.h b/keyboards/scatter42/config.h
index 3bca175cc5..ca7ce70ff3 100644
--- a/keyboards/scatter42/config.h
+++ b/keyboards/scatter42/config.h
@@ -138,10 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/sck/m0116b/config.h b/keyboards/sck/m0116b/config.h
index b01ea2d2ef..b008ff1b24 100644
--- a/keyboards/sck/m0116b/config.h
+++ b/keyboards/sck/m0116b/config.h
@@ -136,8 +136,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
  #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/sck/neiso/config.h b/keyboards/sck/neiso/config.h
index ccf4da9f10..9ff392ec25 100644
--- a/keyboards/sck/neiso/config.h
+++ b/keyboards/sck/neiso/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/sck/osa/config.h b/keyboards/sck/osa/config.h
index 957652f286..6e3d617e9a 100644
--- a/keyboards/sck/osa/config.h
+++ b/keyboards/sck/osa/config.h
@@ -142,8 +142,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/sekigon/grs_70ec/config.h b/keyboards/sekigon/grs_70ec/config.h
index b1559fcc2f..2eb52658e5 100644
--- a/keyboards/sekigon/grs_70ec/config.h
+++ b/keyboards/sekigon/grs_70ec/config.h
@@ -145,10 +145,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/senselessclay/ck60/config.h b/keyboards/senselessclay/ck60/config.h
index f826ad9ad7..dc2cb68c79 100644
--- a/keyboards/senselessclay/ck60/config.h
+++ b/keyboards/senselessclay/ck60/config.h
@@ -74,7 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
 #    define ENABLE_RGB_MATRIX_MULTISPLASH
 #    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/senselessclay/ck65/config.h b/keyboards/senselessclay/ck65/config.h
index 772b2e410a..f23560f164 100644
--- a/keyboards/senselessclay/ck65/config.h
+++ b/keyboards/senselessclay/ck65/config.h
@@ -102,10 +102,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
@@ -116,4 +112,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_LIMIT_VAL 122
 #define RGBLIGHT_SLEEP
-#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5
\ No newline at end of file
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5
diff --git a/keyboards/senselessclay/gos65/config.h b/keyboards/senselessclay/gos65/config.h
index e910f5a15d..5656d77ea5 100644
--- a/keyboards/senselessclay/gos65/config.h
+++ b/keyboards/senselessclay/gos65/config.h
@@ -107,10 +107,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
@@ -120,4 +116,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLED_NUM 68
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_LIMIT_VAL 125
-#define RGBLIGHT_SLEEP
\ No newline at end of file
+#define RGBLIGHT_SLEEP
diff --git a/keyboards/senselessclay/had60/config.h b/keyboards/senselessclay/had60/config.h
index a410ee91d5..60a4b23d02 100644
--- a/keyboards/senselessclay/had60/config.h
+++ b/keyboards/senselessclay/had60/config.h
@@ -105,10 +105,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/sentraq/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h
index 355adc6921..3f08499531 100644
--- a/keyboards/sentraq/s60_x/default/config.h
+++ b/keyboards/sentraq/s60_x/default/config.h
@@ -41,5 +41,3 @@
 #define LOCKING_RESYNC_ENABLE
 
 #define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/shapeshifter4060/config.h b/keyboards/shapeshifter4060/config.h
index c8953821a7..ee84318f3d 100644
--- a/keyboards/shapeshifter4060/config.h
+++ b/keyboards/shapeshifter4060/config.h
@@ -67,5 +67,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define NO_ACTION_LAYER
 // #define NO_ACTION_TAPPING
 // #define NO_ACTION_ONESHOT
-// #define NO_ACTION_MACRO
-// #define NO_ACTION_FUNCTION
diff --git a/keyboards/shiro/config.h b/keyboards/shiro/config.h
index 52c0f361fd..0e7ac54f97 100644
--- a/keyboards/shiro/config.h
+++ b/keyboards/shiro/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/shk9/config.h b/keyboards/shk9/config.h
index a8ddd3f870..059515c776 100644
--- a/keyboards/shk9/config.h
+++ b/keyboards/shk9/config.h
@@ -45,7 +45,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
\ No newline at end of file
diff --git a/keyboards/sidderskb/majbritt/rev2/config.h b/keyboards/sidderskb/majbritt/rev2/config.h
index 06049727cb..6bee0fa6bf 100644
--- a/keyboards/sidderskb/majbritt/rev2/config.h
+++ b/keyboards/sidderskb/majbritt/rev2/config.h
@@ -43,6 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/silverbullet44/config.h b/keyboards/silverbullet44/config.h
index 5b4ae5a110..28b53eb066 100644
--- a/keyboards/silverbullet44/config.h
+++ b/keyboards/silverbullet44/config.h
@@ -180,10 +180,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/sirius/uni660/rev1/config.h b/keyboards/sirius/uni660/rev1/config.h
index f9815844cb..4b810e2cd6 100644
--- a/keyboards/sirius/uni660/rev1/config.h
+++ b/keyboards/sirius/uni660/rev1/config.h
@@ -53,8 +53,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 4
diff --git a/keyboards/sirius/uni660/rev2/ansi/config.h b/keyboards/sirius/uni660/rev2/ansi/config.h
index 8777dc4011..19ee1166c3 100644
--- a/keyboards/sirius/uni660/rev2/ansi/config.h
+++ b/keyboards/sirius/uni660/rev2/ansi/config.h
@@ -53,8 +53,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 4
diff --git a/keyboards/sirius/uni660/rev2/iso/config.h b/keyboards/sirius/uni660/rev2/iso/config.h
index 763230dca8..f0f771707e 100644
--- a/keyboards/sirius/uni660/rev2/iso/config.h
+++ b/keyboards/sirius/uni660/rev2/iso/config.h
@@ -53,8 +53,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define DYNAMIC_KEYMAP_LAYER_COUNT 4
diff --git a/keyboards/sirius/unigo66/config.h b/keyboards/sirius/unigo66/config.h
index 8383a2f302..777046db0c 100644
--- a/keyboards/sirius/unigo66/config.h
+++ b/keyboards/sirius/unigo66/config.h
@@ -43,5 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/sixkeyboard/config.h b/keyboards/sixkeyboard/config.h
index d6505e70c7..a4d19a5ca1 100644
--- a/keyboards/sixkeyboard/config.h
+++ b/keyboards/sixkeyboard/config.h
@@ -62,5 +62,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 #define NO_ACTION_TAPPING
 #define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/skippys_custom_pcs/roopad/config.h b/keyboards/skippys_custom_pcs/roopad/config.h
index 53a29c6158..9d30421dcb 100644
--- a/keyboards/skippys_custom_pcs/roopad/config.h
+++ b/keyboards/skippys_custom_pcs/roopad/config.h
@@ -66,6 +66,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_SNAKE
 #define RGBLIGHT_EFFECT_STATIC_GRADIENT
 #define RGBLIGHT_EFFECT_TWINKLE
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/slz40/config.h b/keyboards/slz40/config.h
index cc868e4c0c..7bcc71bb3c 100644
--- a/keyboards/slz40/config.h
+++ b/keyboards/slz40/config.h
@@ -137,10 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/smallice/config.h b/keyboards/smallice/config.h
index 551c3cefd2..5ebafba42d 100644
--- a/keyboards/smallice/config.h
+++ b/keyboards/smallice/config.h
@@ -81,10 +81,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/smallkeyboard/config.h b/keyboards/smallkeyboard/config.h
index 2630666359..c96fa911e5 100644
--- a/keyboards/smallkeyboard/config.h
+++ b/keyboards/smallkeyboard/config.h
@@ -49,10 +49,6 @@
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
diff --git a/keyboards/smk60/config.h b/keyboards/smk60/config.h
index 59866c006f..2c7d0e178f 100644
--- a/keyboards/smk60/config.h
+++ b/keyboards/smk60/config.h
@@ -40,8 +40,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 //rgb light setting
 #define RGBLED_NUM      4
diff --git a/keyboards/snampad/config.h b/keyboards/snampad/config.h
index 64bb16fb40..f15fc72200 100644
--- a/keyboards/snampad/config.h
+++ b/keyboards/snampad/config.h
@@ -132,8 +132,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/sofle/rev1/config.h b/keyboards/sofle/rev1/config.h
index 831387e990..a34c574326 100644
--- a/keyboards/sofle/rev1/config.h
+++ b/keyboards/sofle/rev1/config.h
@@ -33,6 +33,3 @@
 #define USE_SERIAL
 #define SERIAL_USE_MULTI_TRANSACTION
 #define SOFT_SERIAL_PIN D2
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/soup10/config.h b/keyboards/soup10/config.h
index 83fb2dd895..81acb34604 100644
--- a/keyboards/soup10/config.h
+++ b/keyboards/soup10/config.h
@@ -144,10 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/spacetime/config.h b/keyboards/spacetime/config.h
index 7dfca576a0..93eae10402 100644
--- a/keyboards/spacetime/config.h
+++ b/keyboards/spacetime/config.h
@@ -133,8 +133,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/spacey/config.h b/keyboards/spacey/config.h
index 81f3df6a89..52923d2f8e 100644
--- a/keyboards/spacey/config.h
+++ b/keyboards/spacey/config.h
@@ -100,11 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
 
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/specskeys/config.h b/keyboards/specskeys/config.h
index 09988ba63b..8478a31e71 100644
--- a/keyboards/specskeys/config.h
+++ b/keyboards/specskeys/config.h
@@ -142,10 +142,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/splitty/config.h b/keyboards/splitty/config.h
index 3f0a8b9b20..68ea1b9411 100644
--- a/keyboards/splitty/config.h
+++ b/keyboards/splitty/config.h
@@ -60,7 +60,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/studiokestra/bourgeau/config.h b/keyboards/studiokestra/bourgeau/config.h
index 744149c34e..afb8bb858f 100644
--- a/keyboards/studiokestra/bourgeau/config.h
+++ b/keyboards/studiokestra/bourgeau/config.h
@@ -75,8 +75,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/studiokestra/cascade/config.h b/keyboards/studiokestra/cascade/config.h
index 88b2a583cb..1ef4c21e50 100644
--- a/keyboards/studiokestra/cascade/config.h
+++ b/keyboards/studiokestra/cascade/config.h
@@ -76,8 +76,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/studiokestra/galatea/config.h b/keyboards/studiokestra/galatea/config.h
index e9a6b80b14..accc0d2b43 100644
--- a/keyboards/studiokestra/galatea/config.h
+++ b/keyboards/studiokestra/galatea/config.h
@@ -68,10 +68,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/studiokestra/nue/config.h b/keyboards/studiokestra/nue/config.h
index 72514d85c9..dc4aee20aa 100644
--- a/keyboards/studiokestra/nue/config.h
+++ b/keyboards/studiokestra/nue/config.h
@@ -41,10 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/subatomic/config.h b/keyboards/subatomic/config.h
index 47fcc72fd2..d53805b62f 100644
--- a/keyboards/subatomic/config.h
+++ b/keyboards/subatomic/config.h
@@ -72,5 +72,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/switchplate/southpaw_65/config.h b/keyboards/switchplate/southpaw_65/config.h
index 7512e0e2b3..20fe48eb9b 100644
--- a/keyboards/switchplate/southpaw_65/config.h
+++ b/keyboards/switchplate/southpaw_65/config.h
@@ -127,8 +127,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/switchplate/southpaw_fullsize/config.h b/keyboards/switchplate/southpaw_fullsize/config.h
index c15cb1d0be..fb407383ad 100644
--- a/keyboards/switchplate/southpaw_fullsize/config.h
+++ b/keyboards/switchplate/southpaw_fullsize/config.h
@@ -78,10 +78,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/switchplate/switchplate910/config.h b/keyboards/switchplate/switchplate910/config.h
index 81f8254703..e1e50411c4 100644
--- a/keyboards/switchplate/switchplate910/config.h
+++ b/keyboards/switchplate/switchplate910/config.h
@@ -78,10 +78,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/tada68/config.h b/keyboards/tada68/config.h
index b537380cc0..2e035e08af 100755
--- a/keyboards/tada68/config.h
+++ b/keyboards/tada68/config.h
@@ -73,5 +73,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h
index 94868bde1e..9900d35f37 100644
--- a/keyboards/takashicompany/center_enter/config.h
+++ b/keyboards/takashicompany/center_enter/config.h
@@ -144,10 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/takashicompany/compacx/config.h b/keyboards/takashicompany/compacx/config.h
index 5428482ed3..1db4a7357a 100644
--- a/keyboards/takashicompany/compacx/config.h
+++ b/keyboards/takashicompany/compacx/config.h
@@ -140,10 +140,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/takashicompany/dogtag/config.h b/keyboards/takashicompany/dogtag/config.h
index 631435092d..bc4c44d24c 100644
--- a/keyboards/takashicompany/dogtag/config.h
+++ b/keyboards/takashicompany/dogtag/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h
index ff6697623b..c2c9e04200 100644
--- a/keyboards/takashicompany/endzone34/config.h
+++ b/keyboards/takashicompany/endzone34/config.h
@@ -142,10 +142,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/takashicompany/heavy_left/config.h b/keyboards/takashicompany/heavy_left/config.h
index b5a16def68..4c3138fc8e 100644
--- a/keyboards/takashicompany/heavy_left/config.h
+++ b/keyboards/takashicompany/heavy_left/config.h
@@ -136,12 +136,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
 
-#define EE_HANDS
\ No newline at end of file
+#define EE_HANDS
diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h
index 99c8ce0142..3095f84159 100644
--- a/keyboards/takashicompany/qoolee/config.h
+++ b/keyboards/takashicompany/qoolee/config.h
@@ -144,10 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
-//#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h
index ee6e958f9c..7aa3c85360 100644
--- a/keyboards/takashicompany/radialex/config.h
+++ b/keyboards/takashicompany/radialex/config.h
@@ -130,10 +130,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/takashiski/hecomi/alpha/config.h b/keyboards/takashiski/hecomi/alpha/config.h
index 55c5ac50eb..165b815667 100644
--- a/keyboards/takashiski/hecomi/alpha/config.h
+++ b/keyboards/takashiski/hecomi/alpha/config.h
@@ -131,8 +131,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h
index d743c0e339..a91df15b08 100644
--- a/keyboards/takashiski/namecard2x4/rev1/config.h
+++ b/keyboards/takashiski/namecard2x4/rev1/config.h
@@ -112,6 +112,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h
index 37434d41a0..402737dc71 100644
--- a/keyboards/takashiski/namecard2x4/rev2/config.h
+++ b/keyboards/takashiski/namecard2x4/rev2/config.h
@@ -112,6 +112,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/takashiski/otaku_split/rev0/config.h b/keyboards/takashiski/otaku_split/rev0/config.h
index 454f4866e6..5fab9ea77e 100644
--- a/keyboards/takashiski/otaku_split/rev0/config.h
+++ b/keyboards/takashiski/otaku_split/rev0/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/takashiski/otaku_split/rev1/config.h b/keyboards/takashiski/otaku_split/rev1/config.h
index 7ae6155d8c..05979a6e04 100644
--- a/keyboards/takashiski/otaku_split/rev1/config.h
+++ b/keyboards/takashiski/otaku_split/rev1/config.h
@@ -142,8 +142,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h
index 4680753dd4..3c323ba10e 100644
--- a/keyboards/tanuki/config.h
+++ b/keyboards/tanuki/config.h
@@ -73,5 +73,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h
index 75e63c75ce..f4aa79e88b 100644
--- a/keyboards/team0110/p1800fl/config.h
+++ b/keyboards/team0110/p1800fl/config.h
@@ -74,10 +74,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/technika/config.h b/keyboards/technika/config.h
index c2be7cf7d4..80d3137225 100644
--- a/keyboards/technika/config.h
+++ b/keyboards/technika/config.h
@@ -68,5 +68,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/telophase/config.h b/keyboards/telophase/config.h
index 837bb8ab9b..6d23b98ae3 100644
--- a/keyboards/telophase/config.h
+++ b/keyboards/telophase/config.h
@@ -68,7 +68,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/tetris/config.h b/keyboards/tetris/config.h
index 1f13f5f168..cfea2a72dc 100755
--- a/keyboards/tetris/config.h
+++ b/keyboards/tetris/config.h
@@ -30,9 +30,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef AUDIO_ENABLE
   #define AUDIO_PIN B5
   #define STARTUP_SONG SONG(ONE_UP_SOUND)
diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h
index 87636d8371..0fb0099833 100644
--- a/keyboards/tg4x/config.h
+++ b/keyboards/tg4x/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/tgr/910ce/config.h b/keyboards/tgr/910ce/config.h
index fd21a2de76..58b7426a1f 100644
--- a/keyboards/tgr/910ce/config.h
+++ b/keyboards/tgr/910ce/config.h
@@ -43,8 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 #define RGBLIGHT_ANIMATIONS
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/thevankeyboards/jetvan/config.h b/keyboards/thevankeyboards/jetvan/config.h
index ea229cc29d..74094a183a 100644
--- a/keyboards/thevankeyboards/jetvan/config.h
+++ b/keyboards/thevankeyboards/jetvan/config.h
@@ -104,5 +104,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/thevankeyboards/roadkit/config.h b/keyboards/thevankeyboards/roadkit/config.h
index 4572f5e2b9..0bbd93ad7d 100644
--- a/keyboards/thevankeyboards/roadkit/config.h
+++ b/keyboards/thevankeyboards/roadkit/config.h
@@ -100,5 +100,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/tkc/california/config.h b/keyboards/tkc/california/config.h
index 7820869142..2945514787 100644
--- a/keyboards/tkc/california/config.h
+++ b/keyboards/tkc/california/config.h
@@ -115,8 +115,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/tkc/candybar/lefty/config.h b/keyboards/tkc/candybar/lefty/config.h
index ba5c0b0778..104ead511a 100644
--- a/keyboards/tkc/candybar/lefty/config.h
+++ b/keyboards/tkc/candybar/lefty/config.h
@@ -77,8 +77,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // #define WS2812_LED_N 2
 // #define RGBLED_NUM WS2812_LED_N
diff --git a/keyboards/tkc/candybar/lefty_r3/config.h b/keyboards/tkc/candybar/lefty_r3/config.h
index d7a4908430..9ce16dd731 100644
--- a/keyboards/tkc/candybar/lefty_r3/config.h
+++ b/keyboards/tkc/candybar/lefty_r3/config.h
@@ -77,8 +77,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // #define WS2812_LED_N 2
 // #define RGBLED_NUM WS2812_LED_N
diff --git a/keyboards/tkc/candybar/righty/config.h b/keyboards/tkc/candybar/righty/config.h
index 47e3985ff3..dcbe840c8e 100644
--- a/keyboards/tkc/candybar/righty/config.h
+++ b/keyboards/tkc/candybar/righty/config.h
@@ -77,8 +77,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // #define WS2812_LED_N 2
 // #define RGBLED_NUM WS2812_LED_N
diff --git a/keyboards/tkc/candybar/righty_r3/config.h b/keyboards/tkc/candybar/righty_r3/config.h
index f68e29013c..0c8604a9ac 100644
--- a/keyboards/tkc/candybar/righty_r3/config.h
+++ b/keyboards/tkc/candybar/righty_r3/config.h
@@ -77,8 +77,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // #define WS2812_LED_N 2
 // #define RGBLED_NUM WS2812_LED_N
diff --git a/keyboards/tkc/godspeed75/config.h b/keyboards/tkc/godspeed75/config.h
index f50d4c638c..edda02ea79 100644
--- a/keyboards/tkc/godspeed75/config.h
+++ b/keyboards/tkc/godspeed75/config.h
@@ -77,8 +77,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define RGB_DI_PIN A13
 #define RGBLED_NUM 14
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index ebcda755c2..377499ba72 100644
--- a/keyboards/tkc/m0lly/config.h
+++ b/keyboards/tkc/m0lly/config.h
@@ -142,10 +142,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h
index 5622621e2b..370e7b7b5b 100644
--- a/keyboards/tkc/osav2/config.h
+++ b/keyboards/tkc/osav2/config.h
@@ -138,8 +138,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/tkc/portico/config.h b/keyboards/tkc/portico/config.h
index 35d615a023..be042050f5 100644
--- a/keyboards/tkc/portico/config.h
+++ b/keyboards/tkc/portico/config.h
@@ -36,10 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/tkc/portico68v2/config.h b/keyboards/tkc/portico68v2/config.h
index af0a162810..486863d702 100644
--- a/keyboards/tkc/portico68v2/config.h
+++ b/keyboards/tkc/portico68v2/config.h
@@ -39,10 +39,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define DRIVER_ADDR_1 0b0110000
 #define DRIVER_COUNT 1
 #define DRIVER_1_LED_TOTAL 82
diff --git a/keyboards/tkc/portico75/config.h b/keyboards/tkc/portico75/config.h
index 48be10a427..bbafc0d309 100644
--- a/keyboards/tkc/portico75/config.h
+++ b/keyboards/tkc/portico75/config.h
@@ -47,10 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 4
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 26
diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h
index 02fccd82ff..5bf93542c2 100644
--- a/keyboards/tkc/tkc1800/config.h
+++ b/keyboards/tkc/tkc1800/config.h
@@ -111,5 +111,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
index 71bf94caa8..5ab7b94692 100644
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/config.h
@@ -143,8 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/tkw/grandiceps/config.h b/keyboards/tkw/grandiceps/config.h
index e51c9ab223..b2b6008240 100644
--- a/keyboards/tkw/grandiceps/config.h
+++ b/keyboards/tkw/grandiceps/config.h
@@ -58,7 +58,3 @@
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/tkw/stoutgat/v1/config.h b/keyboards/tkw/stoutgat/v1/config.h
index 2c60e8b565..96471e443d 100644
--- a/keyboards/tkw/stoutgat/v1/config.h
+++ b/keyboards/tkw/stoutgat/v1/config.h
@@ -37,7 +37,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h
index 1c0a66f3c6..73b3eef90b 100644
--- a/keyboards/tkw/stoutgat/v2/config.h
+++ b/keyboards/tkw/stoutgat/v2/config.h
@@ -60,10 +60,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/tmo50/config.h b/keyboards/tmo50/config.h
index 4547fcf63e..f3640197ae 100644
--- a/keyboards/tmo50/config.h
+++ b/keyboards/tmo50/config.h
@@ -126,5 +126,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/touchpad/config.h b/keyboards/touchpad/config.h
index 2f512d17c3..8b42d0fe4f 100644
--- a/keyboards/touchpad/config.h
+++ b/keyboards/touchpad/config.h
@@ -60,5 +60,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/treasure/type9/config.h b/keyboards/treasure/type9/config.h
index cc629e3e45..86734a7fd8 100644
--- a/keyboards/treasure/type9/config.h
+++ b/keyboards/treasure/type9/config.h
@@ -114,6 +114,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/tszaboo/ortho4exent/config.h b/keyboards/tszaboo/ortho4exent/config.h
index dec9cdd7ee..b331cfbde9 100644
--- a/keyboards/tszaboo/ortho4exent/config.h
+++ b/keyboards/tszaboo/ortho4exent/config.h
@@ -128,10 +128,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/tw40/config.h b/keyboards/tw40/config.h
index 839babb920..67547b247e 100644
--- a/keyboards/tw40/config.h
+++ b/keyboards/tw40/config.h
@@ -44,6 +44,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 
 #define LOCKING_RESYNC_ENABLE
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/unikeyboard/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h
index 45dedfe621..502e97bd91 100644
--- a/keyboards/unikeyboard/diverge3/config.h
+++ b/keyboards/unikeyboard/diverge3/config.h
@@ -110,5 +110,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h
index 73f9d1fa86..64319f029f 100644
--- a/keyboards/unikeyboard/felix/config.h
+++ b/keyboards/unikeyboard/felix/config.h
@@ -119,8 +119,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/unison/v04/config.h b/keyboards/unison/v04/config.h
index 88807811a9..93c1ae2e4b 100644
--- a/keyboards/unison/v04/config.h
+++ b/keyboards/unison/v04/config.h
@@ -119,7 +119,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/uranuma/config.h b/keyboards/uranuma/config.h
index c5acad4882..2c304012d3 100644
--- a/keyboards/uranuma/config.h
+++ b/keyboards/uranuma/config.h
@@ -123,8 +123,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/uzu42/config.h b/keyboards/uzu42/config.h
index 45f497d782..3364d3063d 100644
--- a/keyboards/uzu42/config.h
+++ b/keyboards/uzu42/config.h
@@ -24,6 +24,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SOFT_SERIAL_PIN D2
 #define SERIAL_USE_MULTI_TRANSACTION
 #endif
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/uzu42/rev1/config.h b/keyboards/uzu42/rev1/config.h
index 5d8c9000e6..815442ed21 100644
--- a/keyboards/uzu42/rev1/config.h
+++ b/keyboards/uzu42/rev1/config.h
@@ -74,5 +74,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/v4n4g0rth0n/config.h b/keyboards/v4n4g0rth0n/config.h
index e023875feb..14721308f9 100644
--- a/keyboards/v4n4g0rth0n/config.h
+++ b/keyboards/v4n4g0rth0n/config.h
@@ -35,10 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 // TOP, MID, BOT
 // B4, D7, D6
 #define LED_NUM_LOCK_PIN B4
diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h
index c013bb9931..1d0b38988a 100644
--- a/keyboards/v60_type_r/config.h
+++ b/keyboards/v60_type_r/config.h
@@ -115,5 +115,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/viktus/smolka/config.h b/keyboards/viktus/smolka/config.h
index 82acfff214..fa655ae3e8 100644
--- a/keyboards/viktus/smolka/config.h
+++ b/keyboards/viktus/smolka/config.h
@@ -107,10 +107,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 1
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/viktus/sp111/config.h b/keyboards/viktus/sp111/config.h
index 7dda6457f6..c38eea5adc 100644
--- a/keyboards/viktus/sp111/config.h
+++ b/keyboards/viktus/sp111/config.h
@@ -77,7 +77,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/viktus/sp_mini/config.h b/keyboards/viktus/sp_mini/config.h
index 06b8c2f51a..a0671c97f3 100644
--- a/keyboards/viktus/sp_mini/config.h
+++ b/keyboards/viktus/sp_mini/config.h
@@ -95,5 +95,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/viktus/styrka/config.h b/keyboards/viktus/styrka/config.h
index 9fe66a8b58..666ebbf866 100644
--- a/keyboards/viktus/styrka/config.h
+++ b/keyboards/viktus/styrka/config.h
@@ -105,5 +105,3 @@ B0, which is unconnected on the PCB
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h
index e8390aa27b..675dae1044 100644
--- a/keyboards/vitamins_included/rev1/config.h
+++ b/keyboards/vitamins_included/rev1/config.h
@@ -79,5 +79,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h
index bab387ce68..6ea80ec05a 100644
--- a/keyboards/vitamins_included/rev2/config.h
+++ b/keyboards/vitamins_included/rev2/config.h
@@ -80,5 +80,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h
index fda26c4355..b4fac7a606 100644
--- a/keyboards/waldo/config.h
+++ b/keyboards/waldo/config.h
@@ -64,8 +64,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // RGB LED
 #define RGB_DI_PIN B0
@@ -76,4 +74,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h
index e19ea19f7e..dff85685e1 100644
--- a/keyboards/wavtype/foundation/config.h
+++ b/keyboards/wavtype/foundation/config.h
@@ -127,10 +127,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/wekey/polaris/config.h b/keyboards/wekey/polaris/config.h
index 621d30df5a..5902c4bfc9 100644
--- a/keyboards/wekey/polaris/config.h
+++ b/keyboards/wekey/polaris/config.h
@@ -143,10 +143,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/wekey/stelo65/config.h b/keyboards/wekey/stelo65/config.h
index 6a5ab4bb98..6bcd065ac4 100644
--- a/keyboards/wekey/stelo65/config.h
+++ b/keyboards/wekey/stelo65/config.h
@@ -141,10 +141,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/wekey/we27/config.h b/keyboards/wekey/we27/config.h
index 851e85aabb..9420a4d06a 100644
--- a/keyboards/wekey/we27/config.h
+++ b/keyboards/wekey/we27/config.h
@@ -222,10 +222,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/westfoxtrot/cyclops/config.h b/keyboards/westfoxtrot/cyclops/config.h
index ce5d3bbbc1..0ecd64ecd0 100644
--- a/keyboards/westfoxtrot/cyclops/config.h
+++ b/keyboards/westfoxtrot/cyclops/config.h
@@ -101,8 +101,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/whale/sk/v3/config.h b/keyboards/whale/sk/v3/config.h
index 8fff28ca72..fc1e4ffeff 100644
--- a/keyboards/whale/sk/v3/config.h
+++ b/keyboards/whale/sk/v3/config.h
@@ -47,7 +47,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 3
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/wilba_tech/rama_works_kara/config.h b/keyboards/wilba_tech/rama_works_kara/config.h
index 724098257b..1191c0991f 100644
--- a/keyboards/wilba_tech/rama_works_kara/config.h
+++ b/keyboards/wilba_tech/rama_works_kara/config.h
@@ -63,8 +63,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define RGB_BACKLIGHT_ENABLED 1
 
diff --git a/keyboards/wilba_tech/rama_works_koyu/config.h b/keyboards/wilba_tech/rama_works_koyu/config.h
index ab00f30d7f..334070472f 100644
--- a/keyboards/wilba_tech/rama_works_koyu/config.h
+++ b/keyboards/wilba_tech/rama_works_koyu/config.h
@@ -66,8 +66,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define RGB_BACKLIGHT_ENABLED 1
 
diff --git a/keyboards/wilba_tech/rama_works_m10_b/config.h b/keyboards/wilba_tech/rama_works_m10_b/config.h
index d30cf7fe84..9f3326caba 100644
--- a/keyboards/wilba_tech/rama_works_m10_b/config.h
+++ b/keyboards/wilba_tech/rama_works_m10_b/config.h
@@ -105,7 +105,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define DYNAMIC_KEYMAP_LAYER_COUNT 10
diff --git a/keyboards/wilba_tech/rama_works_m10_c/config.h b/keyboards/wilba_tech/rama_works_m10_c/config.h
index 08ae1d081a..7b515736f7 100644
--- a/keyboards/wilba_tech/rama_works_m10_c/config.h
+++ b/keyboards/wilba_tech/rama_works_m10_c/config.h
@@ -53,10 +53,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 // IS31FL3731 driver
 #define DRIVER_COUNT 1
 #define DRIVER_LED_TOTAL 12
diff --git a/keyboards/wilba_tech/rama_works_m50_a/config.h b/keyboards/wilba_tech/rama_works_m50_a/config.h
index c16afd7900..70b35dbb90 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m50_a/config.h
@@ -53,10 +53,6 @@
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 // IS31FL3731 driver
 #define DRIVER_COUNT 2
 #define DRIVER_LED_TOTAL 72
diff --git a/keyboards/wilba_tech/rama_works_m50_ax/config.h b/keyboards/wilba_tech/rama_works_m50_ax/config.h
index 61887e8fc3..3b2a23033d 100644
--- a/keyboards/wilba_tech/rama_works_m50_ax/config.h
+++ b/keyboards/wilba_tech/rama_works_m50_ax/config.h
@@ -52,7 +52,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/wilba_tech/rama_works_m60_a/config.h b/keyboards/wilba_tech/rama_works_m60_a/config.h
index b8d9249dde..4bb0ebefc6 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/config.h
+++ b/keyboards/wilba_tech/rama_works_m60_a/config.h
@@ -63,8 +63,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define RGB_BACKLIGHT_ENABLED 1
 
diff --git a/keyboards/wilba_tech/rama_works_u80_a/config.h b/keyboards/wilba_tech/rama_works_u80_a/config.h
index 2bc32a7006..0cb3e211ba 100644
--- a/keyboards/wilba_tech/rama_works_u80_a/config.h
+++ b/keyboards/wilba_tech/rama_works_u80_a/config.h
@@ -104,8 +104,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // IS31FL3731 driver
 #define DRIVER_COUNT 3
diff --git a/keyboards/wilba_tech/wt60_a/config.h b/keyboards/wilba_tech/wt60_a/config.h
index 587c9b9ae7..029b228e2c 100644
--- a/keyboards/wilba_tech/wt60_a/config.h
+++ b/keyboards/wilba_tech/wt60_a/config.h
@@ -104,8 +104,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/wt60_d/config.h b/keyboards/wilba_tech/wt60_d/config.h
index e6d367f4b1..c3c0a0c7a6 100644
--- a/keyboards/wilba_tech/wt60_d/config.h
+++ b/keyboards/wilba_tech/wt60_d/config.h
@@ -104,5 +104,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/wilba_tech/wt60_xt/config.h b/keyboards/wilba_tech/wt60_xt/config.h
index 43f3f70db8..f08d3179ef 100644
--- a/keyboards/wilba_tech/wt60_xt/config.h
+++ b/keyboards/wilba_tech/wt60_xt/config.h
@@ -107,5 +107,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/wilba_tech/wt65_a/config.h b/keyboards/wilba_tech/wt65_a/config.h
index 4eca9b3ba0..46df641ae4 100644
--- a/keyboards/wilba_tech/wt65_a/config.h
+++ b/keyboards/wilba_tech/wt65_a/config.h
@@ -104,8 +104,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/wt65_b/config.h b/keyboards/wilba_tech/wt65_b/config.h
index 7db0552ce6..bc81515c19 100644
--- a/keyboards/wilba_tech/wt65_b/config.h
+++ b/keyboards/wilba_tech/wt65_b/config.h
@@ -104,8 +104,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/wt69_a/config.h b/keyboards/wilba_tech/wt69_a/config.h
index d8184a8d2e..7db475ba60 100644
--- a/keyboards/wilba_tech/wt69_a/config.h
+++ b/keyboards/wilba_tech/wt69_a/config.h
@@ -104,5 +104,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/wilba_tech/wt75_a/config.h b/keyboards/wilba_tech/wt75_a/config.h
index 479cdda00d..6562e65fcc 100644
--- a/keyboards/wilba_tech/wt75_a/config.h
+++ b/keyboards/wilba_tech/wt75_a/config.h
@@ -104,8 +104,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/wt75_b/config.h b/keyboards/wilba_tech/wt75_b/config.h
index e6365c4ef3..a8905fc2cc 100644
--- a/keyboards/wilba_tech/wt75_b/config.h
+++ b/keyboards/wilba_tech/wt75_b/config.h
@@ -104,8 +104,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/wt75_c/config.h b/keyboards/wilba_tech/wt75_c/config.h
index bbc4757e06..8e65c1a149 100644
--- a/keyboards/wilba_tech/wt75_c/config.h
+++ b/keyboards/wilba_tech/wt75_c/config.h
@@ -104,8 +104,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/wt80_a/config.h b/keyboards/wilba_tech/wt80_a/config.h
index a09bcaebad..de4de0af2b 100644
--- a/keyboards/wilba_tech/wt80_a/config.h
+++ b/keyboards/wilba_tech/wt80_a/config.h
@@ -104,8 +104,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // enable the mono backlight
 #define MONO_BACKLIGHT_ENABLED 1
diff --git a/keyboards/wilba_tech/zeal60/config.h b/keyboards/wilba_tech/zeal60/config.h
index 2ccf49d80a..12093be63a 100644
--- a/keyboards/wilba_tech/zeal60/config.h
+++ b/keyboards/wilba_tech/zeal60/config.h
@@ -63,8 +63,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define RGB_BACKLIGHT_ENABLED 1
 
diff --git a/keyboards/wilba_tech/zeal65/config.h b/keyboards/wilba_tech/zeal65/config.h
index 40d0218014..eff5502ebc 100644
--- a/keyboards/wilba_tech/zeal65/config.h
+++ b/keyboards/wilba_tech/zeal65/config.h
@@ -63,8 +63,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define RGB_BACKLIGHT_ENABLED 1
 
@@ -119,4 +117,4 @@
 #define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
 
 // VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
\ No newline at end of file
+#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/winkeys/mini_winni/config.h b/keyboards/winkeys/mini_winni/config.h
index 821f5cdc76..fcf700b0b3 100644
--- a/keyboards/winkeys/mini_winni/config.h
+++ b/keyboards/winkeys/mini_winni/config.h
@@ -62,7 +62,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* disable print */
 //#define NO_PRINT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/wolf/kuku65/config.h b/keyboards/wolf/kuku65/config.h
index 7c5afed524..c67224a522 100644
--- a/keyboards/wolf/kuku65/config.h
+++ b/keyboards/wolf/kuku65/config.h
@@ -51,6 +51,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/wolf/sabre/config.h b/keyboards/wolf/sabre/config.h
index 02b897ba4f..76ec7d6332 100644
--- a/keyboards/wolf/sabre/config.h
+++ b/keyboards/wolf/sabre/config.h
@@ -56,6 +56,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #define LED_CAPS_LOCK_PIN B3
 #define LED_SCROLL_LOCK_PIN B0
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/wolf/ts60/config.h b/keyboards/wolf/ts60/config.h
index 8074f6fc58..4e15ab4cd5 100644
--- a/keyboards/wolf/ts60/config.h
+++ b/keyboards/wolf/ts60/config.h
@@ -73,6 +73,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 6
 #define BACKLIGHT_DEFAULT_LEVEL 6
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
\ No newline at end of file
diff --git a/keyboards/wolfmarkclub/wm1/config.h b/keyboards/wolfmarkclub/wm1/config.h
index 135700b988..ecbdc61eb3 100644
--- a/keyboards/wolfmarkclub/wm1/config.h
+++ b/keyboards/wolfmarkclub/wm1/config.h
@@ -75,5 +75,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/woodkeys/meira/featherble/config.h b/keyboards/woodkeys/meira/featherble/config.h
index 94bef3b330..44f294a06a 100644
--- a/keyboards/woodkeys/meira/featherble/config.h
+++ b/keyboards/woodkeys/meira/featherble/config.h
@@ -93,5 +93,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/woodkeys/meira/promicro/config.h b/keyboards/woodkeys/meira/promicro/config.h
index bbdaa9dbd8..1b9b099d1a 100644
--- a/keyboards/woodkeys/meira/promicro/config.h
+++ b/keyboards/woodkeys/meira/promicro/config.h
@@ -84,5 +84,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/woodkeys/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h
index b9c8dd9b0f..3afbfeae84 100644
--- a/keyboards/woodkeys/scarletbandana/config.h
+++ b/keyboards/woodkeys/scarletbandana/config.h
@@ -51,7 +51,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define NO_MUSIC_MODE
 #endif
 
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define DEBOUNCE 5
diff --git a/keyboards/work_louder/loop/config.h b/keyboards/work_louder/loop/config.h
index b40c1207fe..b397ec2c1d 100644
--- a/keyboards/work_louder/loop/config.h
+++ b/keyboards/work_louder/loop/config.h
@@ -196,10 +196,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 11
diff --git a/keyboards/work_louder/nano/config.h b/keyboards/work_louder/nano/config.h
index ac12c87199..4e03f0a897 100644
--- a/keyboards/work_louder/nano/config.h
+++ b/keyboards/work_louder/nano/config.h
@@ -194,10 +194,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW    0
 #define BOOTMAGIC_LITE_COLUMN 2
diff --git a/keyboards/work_louder/work_board/config.h b/keyboards/work_louder/work_board/config.h
index 78444e744f..106184b7de 100644
--- a/keyboards/work_louder/work_board/config.h
+++ b/keyboards/work_louder/work_board/config.h
@@ -185,10 +185,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #define ENCODERS_PAD_A \
     { B0 }
 #define ENCODERS_PAD_B \
diff --git a/keyboards/wren/config.h b/keyboards/wren/config.h
index 93b8468c17..13e69804bc 100644
--- a/keyboards/wren/config.h
+++ b/keyboards/wren/config.h
@@ -116,10 +116,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/x16/config.h b/keyboards/x16/config.h
index 7dda59b948..8378880d08 100644
--- a/keyboards/x16/config.h
+++ b/keyboards/x16/config.h
@@ -133,8 +133,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index b91dd8db66..be7b2bfe9f 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -30,10 +30,6 @@
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/xbows/knight_plus/config.h b/keyboards/xbows/knight_plus/config.h
index add7d53679..e9e82c13df 100644
--- a/keyboards/xbows/knight_plus/config.h
+++ b/keyboards/xbows/knight_plus/config.h
@@ -30,10 +30,6 @@
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/xbows/nature/config.h b/keyboards/xbows/nature/config.h
index 2395ae778c..0fc0accb59 100644
--- a/keyboards/xbows/nature/config.h
+++ b/keyboards/xbows/nature/config.h
@@ -30,10 +30,6 @@
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/xbows/numpad/config.h b/keyboards/xbows/numpad/config.h
index 96dff5241a..04604676bc 100644
--- a/keyboards/xbows/numpad/config.h
+++ b/keyboards/xbows/numpad/config.h
@@ -30,10 +30,6 @@
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/xbows/ranger/config.h b/keyboards/xbows/ranger/config.h
index e5b9764074..a7bcee7b4f 100644
--- a/keyboards/xbows/ranger/config.h
+++ b/keyboards/xbows/ranger/config.h
@@ -30,10 +30,6 @@
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 3
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_PROCESS_LIMIT 18
 #    define RGB_MATRIX_LED_FLUSH_LIMIT 16
diff --git a/keyboards/xelus/dawn60/rev1/config.h b/keyboards/xelus/dawn60/rev1/config.h
index 375bea9486..52dab44f48 100644
--- a/keyboards/xelus/dawn60/rev1/config.h
+++ b/keyboards/xelus/dawn60/rev1/config.h
@@ -67,8 +67,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 #define RGB_BACKLIGHT_ENABLED 1
 
diff --git a/keyboards/xiaomi/mk02/config.h b/keyboards/xiaomi/mk02/config.h
index 4a28cf6c71..1b029d6b49 100644
--- a/keyboards/xiaomi/mk02/config.h
+++ b/keyboards/xiaomi/mk02/config.h
@@ -55,5 +55,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h
index 30f837b8ce..826540de4c 100644
--- a/keyboards/xiudi/xd004/v1/config.h
+++ b/keyboards/xiudi/xd004/v1/config.h
@@ -75,5 +75,3 @@ further optimizations can be done on that side.
 /* disable action features */
 // #define NO_ACTION_ONESHOT // 462 bytes <- this needs to be un-commented out if Link Time Optimization is disabled, otherwise file is too large
 // The two below are implicit since we use LTO_ENABLE (in rules.mk)
-// #define NO_ACTION_MACRO
-// #define NO_ACTION_FUNCTION
diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h
index 4fbb66b815..af8e8b7dab 100644
--- a/keyboards/xiudi/xd68/config.h
+++ b/keyboards/xiudi/xd68/config.h
@@ -103,8 +103,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 // ws2812 options
 #define RGB_DI_PIN F6 // pin the DI on the ws2812 is hooked-up to
diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h
index 2958a49ebe..9cceea3467 100644
--- a/keyboards/xiudi/xd75/config.h
+++ b/keyboards/xiudi/xd75/config.h
@@ -133,10 +133,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h
index bba8cf5566..a96793cd75 100644
--- a/keyboards/xiudi/xd84/config.h
+++ b/keyboards/xiudi/xd84/config.h
@@ -131,8 +131,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h
index 01f410ea6b..797d209db3 100644
--- a/keyboards/xiudi/xd84pro/config.h
+++ b/keyboards/xiudi/xd84pro/config.h
@@ -73,6 +73,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h
index 41e8bf3690..5f5b704f36 100644
--- a/keyboards/xiudi/xd87/config.h
+++ b/keyboards/xiudi/xd87/config.h
@@ -120,6 +120,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h
index 5ec2543ffa..ddf97f9d00 100644
--- a/keyboards/xiudi/xd96/config.h
+++ b/keyboards/xiudi/xd96/config.h
@@ -132,8 +132,6 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/yampad/config.h b/keyboards/yampad/config.h
index b21a606ddc..2e03580060 100644
--- a/keyboards/yampad/config.h
+++ b/keyboards/yampad/config.h
@@ -77,8 +77,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ydkb/chili/config.h b/keyboards/ydkb/chili/config.h
index 13bd700363..e3a4e004b8 100644
--- a/keyboards/ydkb/chili/config.h
+++ b/keyboards/ydkb/chili/config.h
@@ -108,5 +108,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ydkb/just60/config.h b/keyboards/ydkb/just60/config.h
index b2ff156310..82272ffffa 100644
--- a/keyboards/ydkb/just60/config.h
+++ b/keyboards/ydkb/just60/config.h
@@ -45,7 +45,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/ydkb/yd68/config.h b/keyboards/ydkb/yd68/config.h
index a501a98476..40a0609347 100644
--- a/keyboards/ydkb/yd68/config.h
+++ b/keyboards/ydkb/yd68/config.h
@@ -117,6 +117,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/yiancardesigns/barleycorn/config.h b/keyboards/yiancardesigns/barleycorn/config.h
index 77714a87fc..71c6076d46 100644
--- a/keyboards/yiancardesigns/barleycorn/config.h
+++ b/keyboards/yiancardesigns/barleycorn/config.h
@@ -99,5 +99,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/yiancardesigns/gingham/config.h b/keyboards/yiancardesigns/gingham/config.h
index 62f25b06c9..5dcc1efa19 100644
--- a/keyboards/yiancardesigns/gingham/config.h
+++ b/keyboards/yiancardesigns/gingham/config.h
@@ -133,6 +133,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
diff --git a/keyboards/yiancardesigns/seigaiha/config.h b/keyboards/yiancardesigns/seigaiha/config.h
index 5e87bd6f83..fdb957f783 100644
--- a/keyboards/yiancardesigns/seigaiha/config.h
+++ b/keyboards/yiancardesigns/seigaiha/config.h
@@ -101,5 +101,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/ymdk/np21/config.h b/keyboards/ymdk/np21/config.h
index 83423792b0..762ac2b4bf 100644
--- a/keyboards/ymdk/np21/config.h
+++ b/keyboards/ymdk/np21/config.h
@@ -130,10 +130,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/ymdk/sp64/config.h b/keyboards/ymdk/sp64/config.h
index d3395c7841..38880d1a85 100644
--- a/keyboards/ymdk/sp64/config.h
+++ b/keyboards/ymdk/sp64/config.h
@@ -30,10 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RIGHT_HALF
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* RGB underglow */
 #define RGBLED_NUM 12
 #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/ymdk/ymd09/config.h b/keyboards/ymdk/ymd09/config.h
index f379abde5f..0152fe1c2b 100644
--- a/keyboards/ymdk/ymd09/config.h
+++ b/keyboards/ymdk/ymd09/config.h
@@ -57,7 +57,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/yoichiro/lunakey_macro/config.h b/keyboards/yoichiro/lunakey_macro/config.h
index d68f69f515..1b9449b822 100644
--- a/keyboards/yoichiro/lunakey_macro/config.h
+++ b/keyboards/yoichiro/lunakey_macro/config.h
@@ -149,10 +149,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/yoichiro/lunakey_mini/config.h b/keyboards/yoichiro/lunakey_mini/config.h
index abbecef443..da75f3be5f 100644
--- a/keyboards/yoichiro/lunakey_mini/config.h
+++ b/keyboards/yoichiro/lunakey_mini/config.h
@@ -144,10 +144,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/yosino58/config.h b/keyboards/yosino58/config.h
index 0c308480ee..24831ee5b2 100644
--- a/keyboards/yosino58/config.h
+++ b/keyboards/yosino58/config.h
@@ -23,6 +23,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define USE_I2C
 #define USE_SERIAL
-
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/yosino58/rev1/config.h b/keyboards/yosino58/rev1/config.h
index ce792d18c4..b7bbace5d9 100644
--- a/keyboards/yosino58/rev1/config.h
+++ b/keyboards/yosino58/rev1/config.h
@@ -67,5 +67,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/yugo_m/model_m_101/config.h b/keyboards/yugo_m/model_m_101/config.h
index 76580a60e4..94861a7587 100644
--- a/keyboards/yugo_m/model_m_101/config.h
+++ b/keyboards/yugo_m/model_m_101/config.h
@@ -96,5 +96,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
diff --git a/keyboards/yushakobo/navpad/10/config.h b/keyboards/yushakobo/navpad/10/config.h
index c242ee60e2..0dddfb4d02 100644
--- a/keyboards/yushakobo/navpad/10/config.h
+++ b/keyboards/yushakobo/navpad/10/config.h
@@ -70,10 +70,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
@@ -81,4 +77,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 132
-#define TAPPING_LAYER_TERM 90
\ No newline at end of file
+#define TAPPING_LAYER_TERM 90
diff --git a/keyboards/yushakobo/navpad/10_helix_r/config.h b/keyboards/yushakobo/navpad/10_helix_r/config.h
index 2d62885328..3d463549df 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/config.h
+++ b/keyboards/yushakobo/navpad/10_helix_r/config.h
@@ -112,10 +112,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
@@ -123,4 +119,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define TAPPING_FORCE_HOLD
 #define TAPPING_TERM 132
-#define TAPPING_LAYER_TERM 90
\ No newline at end of file
+#define TAPPING_LAYER_TERM 90
diff --git a/keyboards/yushakobo/quick17/config.h b/keyboards/yushakobo/quick17/config.h
index ab33c84082..7c845a2106 100644
--- a/keyboards/yushakobo/quick17/config.h
+++ b/keyboards/yushakobo/quick17/config.h
@@ -134,10 +134,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/yushakobo/quick7/config.h b/keyboards/yushakobo/quick7/config.h
index 01cc0f0a87..f3afcd2df7 100644
--- a/keyboards/yushakobo/quick7/config.h
+++ b/keyboards/yushakobo/quick7/config.h
@@ -137,12 +137,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#ifndef LTO_ENABLE
-  #define NO_ACTION_MACRO
-  #define NO_ACTION_FUNCTION
-#endif
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/yynmt/acperience12/rev1/config.h b/keyboards/yynmt/acperience12/rev1/config.h
index 7281f9bf7f..d1adb8106c 100644
--- a/keyboards/yynmt/acperience12/rev1/config.h
+++ b/keyboards/yynmt/acperience12/rev1/config.h
@@ -44,7 +44,3 @@
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/yynmt/dozen0/config.h b/keyboards/yynmt/dozen0/config.h
index 48d847bde1..c63af586e6 100644
--- a/keyboards/yynmt/dozen0/config.h
+++ b/keyboards/yynmt/dozen0/config.h
@@ -114,8 +114,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/yynmt/kagamidget/config.h b/keyboards/yynmt/kagamidget/config.h
index 2bf5b8d7f8..3a0ddeaf30 100644
--- a/keyboards/yynmt/kagamidget/config.h
+++ b/keyboards/yynmt/kagamidget/config.h
@@ -109,8 +109,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
diff --git a/keyboards/ziggurat/config.h b/keyboards/ziggurat/config.h
index 9c38f5e796..d2332a3e48 100644
--- a/keyboards/ziggurat/config.h
+++ b/keyboards/ziggurat/config.h
@@ -40,7 +40,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/zoo/wampus/config.h b/keyboards/zoo/wampus/config.h
index f572c91fc7..7da55184a0 100644
--- a/keyboards/zoo/wampus/config.h
+++ b/keyboards/zoo/wampus/config.h
@@ -87,7 +87,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/keyboards/zvecr/split_blackpill/config.h b/keyboards/zvecr/split_blackpill/config.h
index c6ca34779a..75a7ced350 100644
--- a/keyboards/zvecr/split_blackpill/config.h
+++ b/keyboards/zvecr/split_blackpill/config.h
@@ -115,10 +115,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/zvecr/zv48/config.h b/keyboards/zvecr/zv48/config.h
index 881282c286..56be1b27d2 100644
--- a/keyboards/zvecr/zv48/config.h
+++ b/keyboards/zvecr/zv48/config.h
@@ -121,10 +121,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-/* disable these deprecated features by default */
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 0

From a808c297269573f8f18b45d750405e2238302bc2 Mon Sep 17 00:00:00 2001
From: Tom Konidas <tomkonidas@protonmail.ch>
Date: Tue, 15 Mar 2022 18:48:13 -0400
Subject: [PATCH 832/867] [Keymap] Planck Keymap: tomkonidas (#15869)

---
 keyboards/planck/keymaps/tomkonidas/config.h  |  46 +++
 keyboards/planck/keymaps/tomkonidas/keymap.c  | 353 ++++++++++++++++++
 keyboards/planck/keymaps/tomkonidas/readme.md | 101 +++++
 keyboards/planck/keymaps/tomkonidas/rules.mk  |   1 +
 4 files changed, 501 insertions(+)
 create mode 100644 keyboards/planck/keymaps/tomkonidas/config.h
 create mode 100644 keyboards/planck/keymaps/tomkonidas/keymap.c
 create mode 100644 keyboards/planck/keymaps/tomkonidas/readme.md
 create mode 100644 keyboards/planck/keymaps/tomkonidas/rules.mk

diff --git a/keyboards/planck/keymaps/tomkonidas/config.h b/keyboards/planck/keymaps/tomkonidas/config.h
new file mode 100644
index 0000000000..6e6d0f3ac7
--- /dev/null
+++ b/keyboards/planck/keymaps/tomkonidas/config.h
@@ -0,0 +1,46 @@
+/* Copyright 2015-2021 Jack Humbert
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef AUDIO_ENABLE
+#    define STARTUP_SONG SONG(PLANCK_SOUND)
+// #define STARTUP_SONG SONG(NO_SOUND)
+
+#    define DEFAULT_LAYER_SONGS \
+        { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
+#endif
+
+/*
+ * MIDI options
+ */
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+// Most tactile encoders have detents every 4 stages
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/planck/keymaps/tomkonidas/keymap.c b/keyboards/planck/keymaps/tomkonidas/keymap.c
new file mode 100644
index 0000000000..39933e8a21
--- /dev/null
+++ b/keyboards/planck/keymaps/tomkonidas/keymap.c
@@ -0,0 +1,353 @@
+/* Copyright 2015-2021 Jack Humbert
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "muse.h"
+
+
+enum planck_layers {
+  _DVORAK,
+  _QWERTY,
+  _COLEMAK,
+  _LOWER,
+  _RAISE,
+  _PLOVER,
+  _ADJUST
+};
+
+enum planck_keycodes {
+  DVORAK = SAFE_RANGE,
+  QWERTY,
+  COLEMAK,
+  PLOVER,
+  BACKLIT,
+  EXT_PLV
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Dvorak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl | Alt | Brite | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_DVORAK] = LAYOUT_planck_grid(
+    KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
+    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_ENT ,
+    KC_LCTL, KC_LALT, BACKLIT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl | Alt | Brite | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_planck_grid(
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    KC_LCTL, KC_LALT, BACKLIT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Colemak
+ * ,-----------------------------------------------------------------------------------.
+ * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl | Alt | Brite | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT_planck_grid(
+    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+    KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
+    KC_LCTL, KC_LALT, BACKLIT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_planck_grid(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_planck_grid(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Plover layer (http://opensteno.org)
+ * ,-----------------------------------------------------------------------------------.
+ * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Exit |      |      |   A  |   O  |      |      |   E  |   U  |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_PLOVER] = LAYOUT_planck_grid(
+    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   ,
+    XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
+    XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
+),
+
+/* Adjust (Lower + Raise)
+ *                      v------------------------RGB CONTROL--------------------v
+ * ,-----------------------------------------------------------------------------------.
+ * |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_planck_grid(
+    _______, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD,  RGB_VAI, RGB_VAD, KC_DEL ,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK,  DVORAK,  PLOVER,  _______,
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  TERM_ON, TERM_OFF, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______
+)
+
+};
+
+#ifdef AUDIO_ENABLE
+  float plover_song[][2]     = SONG(PLOVER_SOUND);
+  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case DVORAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_DVORAK);
+      }
+      return false;
+      break;
+    case QWERTY:
+      if (record->event.pressed) {
+        print("mode just switched to qwerty and this is a huge string\n");
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+      break;
+    case COLEMAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_COLEMAK);
+      }
+      return false;
+      break;
+    case BACKLIT:
+      if (record->event.pressed) {
+        register_code(KC_RSFT);
+        #ifdef BACKLIGHT_ENABLE
+          backlight_step();
+        #endif
+        #ifdef KEYBOARD_planck_rev5
+          writePinLow(E6);
+        #endif
+      } else {
+        unregister_code(KC_RSFT);
+        #ifdef KEYBOARD_planck_rev5
+          writePinHigh(E6);
+        #endif
+      }
+      return false;
+      break;
+    case PLOVER:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          stop_all_notes();
+          PLAY_SONG(plover_song);
+        #endif
+        layer_off(_RAISE);
+        layer_off(_LOWER);
+        layer_off(_ADJUST);
+        layer_on(_PLOVER);
+        if (!eeconfig_is_enabled()) {
+            eeconfig_init();
+        }
+        keymap_config.raw = eeconfig_read_keymap();
+        keymap_config.nkro = 1;
+        eeconfig_update_keymap(keymap_config.raw);
+      }
+      return false;
+      break;
+    case EXT_PLV:
+      if (record->event.pressed) {
+        #ifdef AUDIO_ENABLE
+          PLAY_SONG(plover_gb_song);
+        #endif
+        layer_off(_PLOVER);
+      }
+      return false;
+      break;
+  }
+  return true;
+}
+
+bool muse_mode = false;
+uint8_t last_muse_note = 0;
+uint16_t muse_counter = 0;
+uint8_t muse_offset = 70;
+uint16_t muse_tempo = 50;
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+  if (muse_mode) {
+    if (IS_LAYER_ON(_RAISE)) {
+      if (clockwise) {
+        muse_offset++;
+      } else {
+        muse_offset--;
+      }
+    } else {
+      if (clockwise) {
+        muse_tempo+=1;
+      } else {
+        muse_tempo-=1;
+      }
+    }
+  } else {
+    if (clockwise) {
+      #ifdef MOUSEKEY_ENABLE
+        tap_code(KC_MS_WH_DOWN);
+      #else
+        tap_code(KC_PGDN);
+      #endif
+    } else {
+      #ifdef MOUSEKEY_ENABLE
+        tap_code(KC_MS_WH_UP);
+      #else
+        tap_code(KC_PGUP);
+      #endif
+    }
+  }
+    return true;
+}
+
+bool dip_switch_update_user(uint8_t index, bool active) {
+    switch (index) {
+        case 0: {
+#ifdef AUDIO_ENABLE
+            static bool play_sound = false;
+#endif
+            if (active) {
+#ifdef AUDIO_ENABLE
+                if (play_sound) { PLAY_SONG(plover_song); }
+#endif
+                layer_on(_ADJUST);
+            } else {
+#ifdef AUDIO_ENABLE
+                if (play_sound) { PLAY_SONG(plover_gb_song); }
+#endif
+                layer_off(_ADJUST);
+            }
+#ifdef AUDIO_ENABLE
+            play_sound = true;
+#endif
+            break;
+        }
+        case 1:
+            if (active) {
+                muse_mode = true;
+            } else {
+                muse_mode = false;
+            }
+    }
+    return true;
+}
+
+void matrix_scan_user(void) {
+#ifdef AUDIO_ENABLE
+    if (muse_mode) {
+        if (muse_counter == 0) {
+            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
+            if (muse_note != last_muse_note) {
+                stop_note(compute_freq_for_midi_note(last_muse_note));
+                play_note(compute_freq_for_midi_note(muse_note), 0xF);
+                last_muse_note = muse_note;
+            }
+        }
+        muse_counter = (muse_counter + 1) % muse_tempo;
+    } else {
+        if (muse_counter) {
+            stop_all_notes();
+            muse_counter = 0;
+        }
+    }
+#endif
+}
+
+bool music_mask_user(uint16_t keycode) {
+  switch (keycode) {
+    case RAISE:
+    case LOWER:
+      return false;
+    default:
+      return true;
+  }
+}
diff --git a/keyboards/planck/keymaps/tomkonidas/readme.md b/keyboards/planck/keymaps/tomkonidas/readme.md
new file mode 100644
index 0000000000..34c2147604
--- /dev/null
+++ b/keyboards/planck/keymaps/tomkonidas/readme.md
@@ -0,0 +1,101 @@
+# Planck Rev6 Layers
+
+```
+ Dvorak
+ ,-----------------------------------------------------------------------------------.
+ | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Bksp |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | Shift|   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Enter |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | Ctrl | Alt | Brite | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+ `-----------------------------------------------------------------------------------'
+
+```
+
+```
+ Qwerty
+ ,-----------------------------------------------------------------------------------.
+ | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | Ctrl | Alt | Brite | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+ `-----------------------------------------------------------------------------------'
+
+```
+
+```
+ Colemak
+ ,-----------------------------------------------------------------------------------.
+ | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Bksp |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | Shift|   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Enter |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | Ctrl | Alt | Brite | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+ `-----------------------------------------------------------------------------------'
+
+```
+
+```
+ Lower
+ ,-----------------------------------------------------------------------------------.
+ |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO ~ |ISO | | Home | End  |      |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
+ `-----------------------------------------------------------------------------------'
+
+```
+
+```
+ Raise
+ ,-----------------------------------------------------------------------------------.
+ |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | Del  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   -  |   =  |   [  |   ]  |  \   |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |ISO # |ISO / |Pg Up |Pg Dn |      |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
+ `-----------------------------------------------------------------------------------'
+
+```
+
+
+```
+ Adjust (Lower + Raise)
+                      v------------------------RGB CONTROL--------------------v
+ ,-----------------------------------------------------------------------------------.
+ |      | Reset|Debug | RGB  |RGBMOD| HUE+ | HUE- | SAT+ | SAT- |BRGTH+|BRGTH-|  Del |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ |      |      |MUSmod|Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|TermOn|TermOf|      |      |      |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ |      |      |      |      |      |      |      |      |      |      |      |      |
+ `-----------------------------------------------------------------------------------'
+
+```
+
+```
+ Plover layer (http://opensteno.org)
+ ,-----------------------------------------------------------------------------------.
+ |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
+ |------+------+------+------+------+------+------+------+------+------+------+------|
+ | Exit |      |      |   A  |   O  |      |      |   E  |   U  |      |      |      |
+ `-----------------------------------------------------------------------------------'
+
+```
diff --git a/keyboards/planck/keymaps/tomkonidas/rules.mk b/keyboards/planck/keymaps/tomkonidas/rules.mk
new file mode 100644
index 0000000000..dcf16bef39
--- /dev/null
+++ b/keyboards/planck/keymaps/tomkonidas/rules.mk
@@ -0,0 +1 @@
+SRC += muse.c

From 77aafd80562e0a3d4b91f1077f029e47ffb852f1 Mon Sep 17 00:00:00 2001
From: Moritz <moritz.plattner@gmx.net>
Date: Tue, 15 Mar 2022 23:58:16 +0100
Subject: [PATCH 833/867] [Keyboard] Add Dolice keyboard (#16186)

---
 keyboards/linworks/dolice/config.h            |  47 +++
 keyboards/linworks/dolice/dolice.c            |  16 +
 keyboards/linworks/dolice/dolice.h            |  93 ++++++
 keyboards/linworks/dolice/info.json           | 282 ++++++++++++++++++
 .../linworks/dolice/keymaps/default/keymap.c  |  33 ++
 .../linworks/dolice/keymaps/via/keymap.c      |  47 +++
 .../linworks/dolice/keymaps/via/rules.mk      |   1 +
 keyboards/linworks/dolice/readme.md           |  21 ++
 keyboards/linworks/dolice/rules.mk            |  18 ++
 9 files changed, 558 insertions(+)
 create mode 100644 keyboards/linworks/dolice/config.h
 create mode 100644 keyboards/linworks/dolice/dolice.c
 create mode 100644 keyboards/linworks/dolice/dolice.h
 create mode 100644 keyboards/linworks/dolice/info.json
 create mode 100644 keyboards/linworks/dolice/keymaps/default/keymap.c
 create mode 100644 keyboards/linworks/dolice/keymaps/via/keymap.c
 create mode 100644 keyboards/linworks/dolice/keymaps/via/rules.mk
 create mode 100644 keyboards/linworks/dolice/readme.md
 create mode 100644 keyboards/linworks/dolice/rules.mk

diff --git a/keyboards/linworks/dolice/config.h b/keyboards/linworks/dolice/config.h
new file mode 100644
index 0000000000..b42fda933f
--- /dev/null
+++ b/keyboards/linworks/dolice/config.h
@@ -0,0 +1,47 @@
+/*
+Copyright 2021 Moritz Plattner
+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       0x4C58      //"LX"
+#define PRODUCT_ID      0x0004
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    KLC
+#define PRODUCT         Dolice
+
+/* Set 1 kHz polling rate and force USB NKRO */
+#define USB_POLLING_INTERVAL_MS 1
+#define FORCE_NKRO
+
+/* key matrix size */
+#define MATRIX_ROWS 9
+#define MATRIX_COLS 8
+
+#define MATRIX_ROW_PINS { F5, F4, F6, F7, B0, B7, D7, D6, D4 }
+#define MATRIX_COL_PINS { E6, F0, F1, B4, D5, D3, D2, B2 }
+#define UNUSED_PINS { B1, B3, D0, D1, E2 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Backlight */
+#define BACKLIGHT_PIN B5 // Timer 1 on mega32u4
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_ON_STATE 1
diff --git a/keyboards/linworks/dolice/dolice.c b/keyboards/linworks/dolice/dolice.c
new file mode 100644
index 0000000000..febac2099f
--- /dev/null
+++ b/keyboards/linworks/dolice/dolice.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Moritz Plattner
+ *
+ * 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 "dolice.h"
diff --git a/keyboards/linworks/dolice/dolice.h b/keyboards/linworks/dolice/dolice.h
new file mode 100644
index 0000000000..22a9338cf3
--- /dev/null
+++ b/keyboards/linworks/dolice/dolice.h
@@ -0,0 +1,93 @@
+/* Copyright 221 Moritz Plattner
+ *
+ * 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_alice( \
+    K00,  K10,  K01,  K11,  K02,  K12,  K03,  K13,  K14,  K05,  K15,  K06,  K16,  K07,  K17,  \
+    K20,  K30,  K21,  K22,  K32,  K23,  K33,  K24,  K34,  K25,  K35,  K26,  K36,  K27,  K37,  \
+    K40,  K50,  K41,  K42,  K52,  K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,        K47,  \
+          K70,  K61,  K62,  K72,  K63,  K73,  K64,  K74,  K65,  K75,  K66,  K76,  K67,  K77,  \
+          K80,              K81,  K82,  K83,        K84,        K85,                    K87   \
+) { \
+  { K00,   K01,   K02,   K03,   KC_NO, K05,   K06,   K07,    }, \
+  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,    }, \
+  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,    }, \
+  { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,    }, \
+  { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,    }, \
+  { K50,   KC_NO, K52,   K53,   K54,   K55,   K56,   KC_NO,  }, \
+  { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,    }, \
+  { K70,   KC_NO, K72,   K73,   K74,   K75,   K76,   K77,    }, \
+  { K80,   K81,   K82,   K83,   K84,   K85,   KC_NO, K87     }  \
+}
+
+#define LAYOUT_alice_split_bs( \
+    K00,  K10,  K01,  K11,  K02,  K12,  K03,  K13,  K14,  K05,  K15,  K06,  K16,  K07,  K17,  K57,  \
+    K20,  K30,  K21,  K22,  K32,  K23,  K33,  K24,  K34,  K25,  K35,  K26,  K36,  K27,  K37,  \
+    K40,  K50,  K41,  K42,  K52,  K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,        K47,  \
+          K70,  K61,  K62,  K72,  K63,  K73,  K64,  K74,  K65,  K75,  K66,  K76,  K67,  K77,  \
+          K80,              K81,  K82,  K83,        K84,        K85,                    K87   \
+) { \
+  { K00,   K01,   K02,   K03,   KC_NO, K05,   K06,   K07,    }, \
+  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,    }, \
+  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,    }, \
+  { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,    }, \
+  { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,    }, \
+  { K50,   KC_NO, K52,   K53,   K54,   K55,   K56,   K57,    }, \
+  { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,    }, \
+  { K70,   KC_NO, K72,   K73,   K74,   K75,   K76,   K77,    }, \
+  { K80,   K81,   K82,   K83,   K84,   K85,   KC_NO, K87     }  \
+}
+
+#define LAYOUT_long_rshift( \
+    K00,  K10,  K01,  K11,  K02,  K12,  K03,  K13,  K14,  K05,  K15,  K06,  K16,  K07,  K17,  \
+    K20,  K30,  K21,  K22,  K32,  K23,  K33,  K24,  K34,  K25,  K35,  K26,  K36,  K27,  K37,  \
+    K40,  K50,  K41,  K42,  K52,  K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,        K47,  \
+          K70,  K61,  K62,  K72,  K63,  K73,  K64,  K74,  K65,  K75,  K66,  K76,  K67,        \
+          K80,              K81,  K82,  K83,        K84,        K85,                    K87   \
+) { \
+  { K00,   K01,   K02,   K03,   KC_NO, K05,   K06,   K07,    }, \
+  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,    }, \
+  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,    }, \
+  { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,    }, \
+  { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,    }, \
+  { K50,   KC_NO, K52,   K53,   K54,   K55,   K56,   KC_NO,  }, \
+  { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,    }, \
+  { K70,   KC_NO, K72,   K73,   K74,   K75,   K76,   KC_NO,  }, \
+  { K80,   K81,   K82,   K83,   K84,   K85,   KC_NO, K87     }  \
+}
+
+#define LAYOUT_long_rshift_split_bs( \
+    K00,  K10,  K01,  K11,  K02,  K12,  K03,  K13,  K14,  K05,  K15,  K06,  K16,  K07,  K17,  K57,  \
+    K20,  K30,  K21,  K22,  K32,  K23,  K33,  K24,  K34,  K25,  K35,  K26,  K36,  K27,  K37,  \
+    K40,  K50,  K41,  K42,  K52,  K43,  K53,  K44,  K54,  K45,  K55,  K46,  K56,        K47,  \
+          K70,  K61,  K62,  K72,  K63,  K73,  K64,  K74,  K65,  K75,  K66,  K76,  K67,        \
+          K80,              K81,  K82,  K83,        K84,        K85,                    K87   \
+) { \
+  { K00,   K01,   K02,   K03,   KC_NO, K05,   K06,   K07,    }, \
+  { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,    }, \
+  { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,    }, \
+  { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,    }, \
+  { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,    }, \
+  { K50,   KC_NO, K52,   K53,   K54,   K55,   K56,   K57,    }, \
+  { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,    }, \
+  { K70,   KC_NO, K72,   K73,   K74,   K75,   K76,   KC_NO,  }, \
+  { K80,   K81,   K82,   K83,   K84,   K85,   KC_NO, K87     }  \
+}
+
+#define LAYOUT_all LAYOUT_alice_split_bs
\ No newline at end of file
diff --git a/keyboards/linworks/dolice/info.json b/keyboards/linworks/dolice/info.json
new file mode 100644
index 0000000000..5a72496f1c
--- /dev/null
+++ b/keyboards/linworks/dolice/info.json
@@ -0,0 +1,282 @@
+{
+    "keyboard_name": "Dolice",
+    "maintainer": "ebastler",
+    "layouts": {
+      "LAYOUT_alice": {
+        "layout": [
+          {"x":0, "y":0},
+          {"x":1.25, "y":0},
+          {"x":2.25, "y":0},
+          {"x":3.25, "y":0},
+          {"x":4.25, "y":0},
+          {"x":5.25, "y":0},
+          {"x":6.25, "y":0},
+          {"x":7.25, "y":0},
+          {"x":10.25, "y":0},
+          {"x":11.25, "y":0},
+          {"x":12.25, "y":0},
+          {"x":13.25, "y":0},
+          {"x":14.25, "y":0},
+          {"x":15.25, "y":0},
+          {"x":16.25, "y":0, "w": 2},
+          {"x":0, "y":1},
+          {"x":1.25, "y":1, "w":1.5},
+          {"x":2.75, "y":1},
+          {"x":3.75, "y":1},
+          {"x":4.75, "y":1},
+          {"x":5.75, "y":1},
+          {"x":6.75, "y":1},
+          {"x":9.75, "y":1},
+          {"x":10.75, "y":1},
+          {"x":11.75, "y":1},
+          {"x":12.75, "y":1},
+          {"x":13.75, "y":1},
+          {"x":14.75, "y":1},
+          {"x":15.75, "y":1},
+          {"x":16.75, "y":1, "w":1.5},
+          {"x":0, "y":2},
+          {"x":1.25, "y":2, "w":1.75},
+          {"x":3, "y":2},
+          {"x":4, "y":2},
+          {"x":5, "y":2},
+          {"x":6, "y":2},
+          {"x":7, "y":2},
+          {"x":10, "y":2},
+          {"x":11, "y":2},
+          {"x":12, "y":2},
+          {"x":13, "y":2},
+          {"x":14, "y":2},
+          {"x":15, "y":2},
+          {"x":16, "y":2, "w":2.25},
+          {"x":1.25, "y":3, "w":2.25},
+          {"x":3.5, "y":3},
+          {"x":4.5, "y":3},
+          {"x":5.5, "y":3},
+          {"x":6.5, "y":3},
+          {"x":7.5, "y":3},
+          {"x":9.5, "y":3},
+          {"x":10.5, "y":3},
+          {"x":11.5, "y":3},
+          {"x":12.5, "y":3},
+          {"x":13.5, "y":3},
+          {"x":14.5, "y":3},
+          {"x":15.5, "y":3, "w":1.75},
+          {"x":17.25, "y":3},
+          {"x":1.25, "y":4, "w":1.5},
+          {"x":4.25, "y":4, "w":1.5},
+          {"x":5.75, "y":4, "w":2},
+          {"x":7.75, "y":4, "w":1.25},
+          {"x":9.5, "y":4, "w":2.75},
+          {"x":12.25, "y":4, "w":1.5},
+          {"x":16.75, "y":4, "w":1.5}
+        ]
+      },
+      "LAYOUT_alice_split_bs": {
+        "layout": [
+          {"x":0, "y":0},
+          {"x":1.25, "y":0},
+          {"x":2.25, "y":0},
+          {"x":3.25, "y":0},
+          {"x":4.25, "y":0},
+          {"x":5.25, "y":0},
+          {"x":6.25, "y":0},
+          {"x":7.25, "y":0},
+          {"x":10.25, "y":0},
+          {"x":11.25, "y":0},
+          {"x":12.25, "y":0},
+          {"x":13.25, "y":0},
+          {"x":14.25, "y":0},
+          {"x":15.25, "y":0},
+          {"x":16.25, "y":0},
+          {"x":17.25, "y":0},
+          {"x":0, "y":1},
+          {"x":1.25, "y":1, "w":1.5},
+          {"x":2.75, "y":1},
+          {"x":3.75, "y":1},
+          {"x":4.75, "y":1},
+          {"x":5.75, "y":1},
+          {"x":6.75, "y":1},
+          {"x":9.75, "y":1},
+          {"x":10.75, "y":1},
+          {"x":11.75, "y":1},
+          {"x":12.75, "y":1},
+          {"x":13.75, "y":1},
+          {"x":14.75, "y":1},
+          {"x":15.75, "y":1},
+          {"x":16.75, "y":1, "w":1.5},
+          {"x":0, "y":2},
+          {"x":1.25, "y":2, "w":1.75},
+          {"x":3, "y":2},
+          {"x":4, "y":2},
+          {"x":5, "y":2},
+          {"x":6, "y":2},
+          {"x":7, "y":2},
+          {"x":10, "y":2},
+          {"x":11, "y":2},
+          {"x":12, "y":2},
+          {"x":13, "y":2},
+          {"x":14, "y":2},
+          {"x":15, "y":2},
+          {"x":16, "y":2, "w":2.25},
+          {"x":1.25, "y":3, "w":2.25},
+          {"x":3.5, "y":3},
+          {"x":4.5, "y":3},
+          {"x":5.5, "y":3},
+          {"x":6.5, "y":3},
+          {"x":7.5, "y":3},
+          {"x":9.5, "y":3},
+          {"x":10.5, "y":3},
+          {"x":11.5, "y":3},
+          {"x":12.5, "y":3},
+          {"x":13.5, "y":3},
+          {"x":14.5, "y":3},
+          {"x":15.5, "y":3, "w":1.75},
+          {"x":17.25, "y":3},
+          {"x":1.25, "y":4, "w":1.5},
+          {"x":4.25, "y":4, "w":1.5},
+          {"x":5.75, "y":4, "w":2},
+          {"x":7.75, "y":4, "w":1.25},
+          {"x":9.5, "y":4, "w":2.75},
+          {"x":12.25, "y":4, "w":1.5},
+          {"x":16.75, "y":4, "w":1.5}
+        ]
+      },
+      "LAYOUT_long_rshift": {
+        "layout": [
+          {"x":0, "y":0},
+          {"x":1.25, "y":0},
+          {"x":2.25, "y":0},
+          {"x":3.25, "y":0},
+          {"x":4.25, "y":0},
+          {"x":5.25, "y":0},
+          {"x":6.25, "y":0},
+          {"x":7.25, "y":0},
+          {"x":10.25, "y":0},
+          {"x":11.25, "y":0},
+          {"x":12.25, "y":0},
+          {"x":13.25, "y":0},
+          {"x":14.25, "y":0},
+          {"x":15.25, "y":0},
+          {"x":16.25, "y":0, "w":2},
+          {"x":0, "y":1},
+          {"x":1.25, "y":1, "w":1.5},
+          {"x":2.75, "y":1},
+          {"x":3.75, "y":1},
+          {"x":4.75, "y":1},
+          {"x":5.75, "y":1},
+          {"x":6.75, "y":1},
+          {"x":9.75, "y":1},
+          {"x":10.75, "y":1},
+          {"x":11.75, "y":1},
+          {"x":12.75, "y":1},
+          {"x":13.75, "y":1},
+          {"x":14.75, "y":1},
+          {"x":15.75, "y":1},
+          {"x":16.75, "y":1, "w":1.5},
+          {"x":0, "y":2},
+          {"x":1.25, "y":2, "w":1.75},
+          {"x":3, "y":2},
+          {"x":4, "y":2},
+          {"x":5, "y":2},
+          {"x":6, "y":2},
+          {"x":7, "y":2},
+          {"x":10, "y":2},
+          {"x":11, "y":2},
+          {"x":12, "y":2},
+          {"x":13, "y":2},
+          {"x":14, "y":2},
+          {"x":15, "y":2},
+          {"x":16, "y":2, "w":2.25},
+          {"x":1.25, "y":3, "w":2.25},
+          {"x":3.5, "y":3},
+          {"x":4.5, "y":3},
+          {"x":5.5, "y":3},
+          {"x":6.5, "y":3},
+          {"x":7.5, "y":3},
+          {"x":9.5, "y":3},
+          {"x":10.5, "y":3},
+          {"x":11.5, "y":3},
+          {"x":12.5, "y":3},
+          {"x":13.5, "y":3},
+          {"x":14.5, "y":3},
+          {"x":15.5, "y":3, "w":2.75},
+          {"x":1.25, "y":4, "w":1.5},
+          {"x":4.25, "y":4, "w":1.5},
+          {"x":5.75, "y":4, "w":2},
+          {"x":7.75, "y":4, "w":1.25},
+          {"x":9.5, "y":4, "w":2.75},
+          {"x":12.25, "y":4, "w":1.5},
+          {"x":16.75, "y":4, "w":1.5}
+        ]
+      },
+      "LAYOUT_long_rshift_split_bs": {
+        "layout": [
+          {"x":0, "y":0},
+          {"x":1.25, "y":0},
+          {"x":2.25, "y":0},
+          {"x":3.25, "y":0},
+          {"x":4.25, "y":0},
+          {"x":5.25, "y":0},
+          {"x":6.25, "y":0},
+          {"x":7.25, "y":0},
+          {"x":10.25, "y":0},
+          {"x":11.25, "y":0},
+          {"x":12.25, "y":0},
+          {"x":13.25, "y":0},
+          {"x":14.25, "y":0},
+          {"x":15.25, "y":0},
+          {"x":16.25, "y":0},
+          {"x":17.25, "y":0},
+          {"x":0, "y":1},
+          {"x":1.25, "y":1, "w":1.5},
+          {"x":2.75, "y":1},
+          {"x":3.75, "y":1},
+          {"x":4.75, "y":1},
+          {"x":5.75, "y":1},
+          {"x":6.75, "y":1},
+          {"x":9.75, "y":1},
+          {"x":10.75, "y":1},
+          {"x":11.75, "y":1},
+          {"x":12.75, "y":1},
+          {"x":13.75, "y":1},
+          {"x":14.75, "y":1},
+          {"x":15.75, "y":1},
+          {"x":16.75, "y":1, "w":1.5},
+          {"x":0, "y":2},
+          {"x":1.25, "y":2, "w":1.75},
+          {"x":3, "y":2},
+          {"x":4, "y":2},
+          {"x":5, "y":2},
+          {"x":6, "y":2},
+          {"x":7, "y":2},
+          {"x":10, "y":2},
+          {"x":11, "y":2},
+          {"x":12, "y":2},
+          {"x":13, "y":2},
+          {"x":14, "y":2},
+          {"x":15, "y":2},
+          {"x":16, "y":2, "w":2.25},
+          {"x":1.25, "y":3, "w":2.25},
+          {"x":3.5, "y":3},
+          {"x":4.5, "y":3},
+          {"x":5.5, "y":3},
+          {"x":6.5, "y":3},
+          {"x":7.5, "y":3},
+          {"x":9.5, "y":3},
+          {"x":10.5, "y":3},
+          {"x":11.5, "y":3},
+          {"x":12.5, "y":3},
+          {"x":13.5, "y":3},
+          {"x":14.5, "y":3},
+          {"x":15.5, "y":3, "w":2.75},
+          {"x":1.25, "y":4, "w":1.5},
+          {"x":4.25, "y":4, "w":1.5},
+          {"x":5.75, "y":4, "w":2},
+          {"x":7.75, "y":4, "w":1.25},
+          {"x":9.5, "y":4, "w":2.75},
+          {"x":12.25, "y":4, "w":1.5},
+          {"x":16.75, "y":4, "w":1.5}
+        ]
+      }
+    }
+  }
\ No newline at end of file
diff --git a/keyboards/linworks/dolice/keymaps/default/keymap.c b/keyboards/linworks/dolice/keymaps/default/keymap.c
new file mode 100644
index 0000000000..45f710a7a9
--- /dev/null
+++ b/keyboards/linworks/dolice/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2021 Moritz Plattner
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_alice(
+        KC_PSCR, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_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_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+                 KC_LCTL,                   KC_LALT, KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                            KC_RCTL
+    ),
+    [1] = LAYOUT_alice(
+        KC_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, 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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS,
+                 KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                            KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/linworks/dolice/keymaps/via/keymap.c b/keyboards/linworks/dolice/keymaps/via/keymap.c
new file mode 100644
index 0000000000..4879f3bad7
--- /dev/null
+++ b/keyboards/linworks/dolice/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2021 Moritz Plattner
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_PSCR, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_DEL,
+        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_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                 KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+                 KC_LCTL,                   KC_LALT, KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                            KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        KC_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, 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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS,
+                 KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                            KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, 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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS,
+                 KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                            KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, 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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS,
+                 KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                            KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/keyboards/linworks/dolice/keymaps/via/rules.mk b/keyboards/linworks/dolice/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/linworks/dolice/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/linworks/dolice/readme.md b/keyboards/linworks/dolice/readme.md
new file mode 100644
index 0000000000..e46fb8261b
--- /dev/null
+++ b/keyboards/linworks/dolice/readme.md
@@ -0,0 +1,21 @@
+# Dolice
+
+The Dolice is a alice keyboard designed by Lx3 (Linworks) and yuktsi (TGR) and run by KLC.
+
+* Keyboard maintainer: [ebastler](https://github.com/ebastler)
+* Hardware supported: Linworks/TGR/KLC Dolice
+* Hardware availability: Groupbuys. Check the ongoing ones on [the KLC Discord](https://discord.gg/d2A72mGPRB) or [Webshop](https://klc-playground.com/).
+
+Make example for this keyboard (after setting up your build environment):
+
+    make linworks/dolice:default
+
+Flash example for this keyboard:
+
+    make linworks/dolice:default:flash
+
+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).
+
+## Enter the bootloader: 
+* **Bootmagic reset**: Hold down the top left most switch and plug in the keyboard
+* **Physical reset button**: Briefly short the pads marked "RES" and "GND" on the 6-pin programming header with tweezers
diff --git a/keyboards/linworks/dolice/rules.mk b/keyboards/linworks/dolice/rules.mk
new file mode 100644
index 0000000000..a3d10eaaaa
--- /dev/null
+++ b/keyboards/linworks/dolice/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file

From 8bffc6195959ceb3a0623595f3d4d5ac072af8c1 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 15 Mar 2022 23:27:55 +0000
Subject: [PATCH 834/867] Ensure dependent CI workflows run (#16662)

---
 .github/workflows/develop_update.yml        | 1 +
 .github/workflows/feature_branch_update.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/develop_update.yml b/.github/workflows/develop_update.yml
index 1f5c841bff..90159406a6 100644
--- a/.github/workflows/develop_update.yml
+++ b/.github/workflows/develop_update.yml
@@ -14,6 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
       with:
+        token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0
 
     - name: Checkout develop
diff --git a/.github/workflows/feature_branch_update.yml b/.github/workflows/feature_branch_update.yml
index fc7bbafd18..98d3616ad1 100644
--- a/.github/workflows/feature_branch_update.yml
+++ b/.github/workflows/feature_branch_update.yml
@@ -19,6 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
       with:
+        token: ${{ secrets.QMK_BOT_TOKEN }}
         fetch-depth: 0
 
     - name: Checkout branch

From f6f4d85aa5256cfeadcae0b502830342bfd0a085 Mon Sep 17 00:00:00 2001
From: an_achronism <87213873+an-achronism@users.noreply.github.com>
Date: Wed, 16 Mar 2022 00:06:27 +0000
Subject: [PATCH 835/867] yugo_m enhancement: include all available key
 positions (#16216)

* yugo_m enhancement to include all available key positions in matrix
---
 keyboards/yugo_m/model_m_101/config.h         |  4 ++
 keyboards/yugo_m/model_m_101/info.json        |  4 +-
 .../keymaps/an_achronism_106/keymap.c         | 53 ++++++++++++++
 .../keymaps/an_achronism_106/readme.md        |  3 +
 .../model_m_101/keymaps/default/keymap.c      | 29 ++++----
 .../model_m_101/keymaps/default/readme.md     |  2 +-
 .../yugo_m/model_m_101/keymaps/via/keymap.c   | 69 +++++++++++++++++++
 .../yugo_m/model_m_101/keymaps/via/rules.mk   |  1 +
 keyboards/yugo_m/model_m_101/model_m_101.h    | 23 ++++---
 keyboards/yugo_m/model_m_101/readme.md        |  8 +++
 keyboards/yugo_m/readme.md                    |  8 +++
 11 files changed, 176 insertions(+), 28 deletions(-)
 create mode 100644 keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/keymap.c
 create mode 100644 keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/readme.md
 create mode 100644 keyboards/yugo_m/model_m_101/keymaps/via/keymap.c
 create mode 100644 keyboards/yugo_m/model_m_101/keymaps/via/rules.mk

diff --git a/keyboards/yugo_m/model_m_101/config.h b/keyboards/yugo_m/model_m_101/config.h
index 94861a7587..e17f8310b8 100644
--- a/keyboards/yugo_m/model_m_101/config.h
+++ b/keyboards/yugo_m/model_m_101/config.h
@@ -1,5 +1,6 @@
 /*
 Copyright 2020 Nidzo Tomic <tomicn8@hotmail.com>
+Copyright 2022 an_achronism <87213873+an-achronism@users.noreply.github.com>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -96,3 +97,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
+
+/* redefine available (emulated) EEPROM as 4 kB rather than the default 1 kB to let VIA use more of the 8 kB of on-chip Flash of the STM32F303 to store 4 layers (since 4 layers * 8 rows * 16 columns * 2 = 1024 bytes but the default max available is 1023 bytes due to ATMEGA32U4 etc. only having 1 kB of EEPROM) */
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095
diff --git a/keyboards/yugo_m/model_m_101/info.json b/keyboards/yugo_m/model_m_101/info.json
index ec978056d3..399307c2d0 100644
--- a/keyboards/yugo_m/model_m_101/info.json
+++ b/keyboards/yugo_m/model_m_101/info.json
@@ -1,10 +1,10 @@
 {
-    "keyboard_name": "IBM Model M 101/102",
+    "keyboard_name": "IBM Enhanced Keyboard",
     "url": "https://github.com/tomic1785/qmk_firmware/tree/stm32_model_m/keyboards/yugo_m/model_m_101",
     "maintainer": "Nidzo Tomic",
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}]
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"Print Screen", "x":15.5, "y":0}, {"label":"Scroll Lock", "x":16.5, "y":0}, {"label":"Pause", "x":17.5, "y":0}, {"label":"\u00ac", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"\"", "x":2, "y":1.5}, {"label":"\u00a3", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"\uff0a", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"<i class='kb kb-Arrows-Left'></i>", "x":14, "y":1.5}, {"label":"Insert", "x":15.5, "y":1.5}, {"label":"Home", "x":16.5, "y":1.5}, {"label":"PgUp", "x":17.5, "y":1.5}, {"label":"Num Lock", "x":19, "y":1.5}, {"label":"/", "x":20, "y":1.5}, {"label":"\uff0a", "x":21, "y":1.5}, {"label":"\u2212", "x":22, "y":1.5}, {"label":"<i class='kb kb-Line-Start-End'></i>", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.5, "y":2.5}, {"label":"End", "x":16.5, "y":2.5}, {"label":"PgDn", "x":17.5, "y":2.5}, {"label":"7", "x":19, "y":2.5}, {"label":"8", "x":20, "y":2.5}, {"label":"9", "x":21, "y":2.5}, {"label":"+", "x":22, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.25}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"@", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"<i class='kb kb-Return-2'></i>", "x":13.75, "y":3.5, "w":1.25}, {"label":"4", "x":19, "y":3.5}, {"label":"5", "x":20, "y":3.5}, {"label":"6", "x":21, "y":3.5}, {"label":"=", "x":22, "y":3.5}, {"label":"\u21e7", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"_", "x":12.25, "y":4.5}, {"label":"\u21e7", "x":13.25, "y":4.5, "w":1.75}, {"label":"<i class='kb kb-Arrows-Up'></i>", "x":16.5, "y":4.5}, {"label":"1", "x":19, "y":4.5}, {"label":"2", "x":20, "y":4.5}, {"label":"3", "x":21, "y":4.5}, {"label":"Enter", "x":22, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt Gr", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"<i class='kb kb-Arrows-Left'></i>", "x":15.5, "y":5.5}, {"label":"<i class='kb kb-Arrows-Down'></i>", "x":16.5, "y":5.5}, {"label":"<i class='kb kb-Arrows-Right'></i>", "x":17.5, "y":5.5}, {"label":"0", "x":19, "y":5.5}, {"label":",", "x":20, "y":5.5}, {"label":".", "x":21, "y":5.5}, {"label":"GUI", "x":22, "y":5.5}]
         }
     }
 }
diff --git a/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/keymap.c b/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/keymap.c
new file mode 100644
index 0000000000..4b9646f9ea
--- /dev/null
+++ b/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2022 an_achronism <87213873+an-achronism@users.noreply.github.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum keyboard_layers {
+    _BL, // Base Layer
+    _FN  // Function Layer
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Layer 0: Default Layer
+     * ,-------------------------------------------------------------------------------------------------.
+     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12|    |PSc|ScL|Cap|                    |
+     * |                                                                                                 |
+     * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |BSp|Pse|    |Ins|Hom|PgU|    |Num|/  |*  |=  |
+     * |-----------------------------------------------------------|    |-----------|    |---------------|
+     * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |RCtrl|    |Del|End|PgD|    |7  |8  |9  |-  |
+     * |-----------------------------------------------------------|                     |---------------|
+     * |LCtrl |A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |#  |Rtn |                     |4  |5  |6  |+  |
+     * |-----------------------------------------------------------|                     |---------------|
+     * |LShift|\  |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |RShift  |        |Up |        |1  |2  |3  |Ent|
+     * |-----------------------------------------------------------|        |---|        |-----------|   |
+     * |Esc/LAlt| |LGUI |           Space           |BS/Fn|  |RAlt |    |Lt |Dn |Rt |    |0  |Fn |  .|   |
+     * `-------------------------------------------------------------------------------------------------'
+     */
+    [_BL] = LAYOUT_all(
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_CAPS,
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_PAUS,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PEQL,
+      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_RCTL,            KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+      KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1, KC_RSFT,                     KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+      LALT_T(KC_ESC),   KC_LGUI,                            KC_SPC,                                      LT(_FN, KC_BSPC), KC_RALT,            KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   MO(_FN), KC_PDOT, KC_NO),
+    [_FN] = LAYOUT_all(
+      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MSTP, C(KC_BRK), _______, _______, _______,   KC_F10,  KC_F11,  KC_F12,  KC_PWR,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_MPRV, KC_MNXT, KC_APP,             _______, _______, _______,   KC_F7,   KC_F8,   KC_F9,   KC_SLEP,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,                                         KC_F4,   KC_F5,   KC_F6,   KC_CALC,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,            KC_F1,   KC_F2,   KC_F3,   KC_EJCT,
+      _______,          _______,                            _______,                                     _______,          _______,            _______, _______, _______,   _______, _______, _______, _______),
+};
diff --git a/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/readme.md b/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/readme.md
new file mode 100644
index 0000000000..6d3a7ff5d9
--- /dev/null
+++ b/keyboards/yugo_m/model_m_101/keymaps/an_achronism_106/readme.md
@@ -0,0 +1,3 @@
+# an_achronism's custom 106-key layout (107-key if you stick the appropriate keys on RShift and JIS backslash, which are already mapped for convenience).
+
+# With the exception of a single extra matrix position between LAlt and Space which only appears on certain later membranes and is almost never actually used, the only unmapped key is the bottom right corner of the numpad (the unused lower half of the vertical 2u key most commonly used as either Enter or Field +). If you like, you can easily add that into the keymap by changing the appropriate KC_NO to whatever you want.
diff --git a/keyboards/yugo_m/model_m_101/keymaps/default/keymap.c b/keyboards/yugo_m/model_m_101/keymaps/default/keymap.c
index 52f79457e2..d8615cb6e5 100644
--- a/keyboards/yugo_m/model_m_101/keymaps/default/keymap.c
+++ b/keyboards/yugo_m/model_m_101/keymaps/default/keymap.c
@@ -1,4 +1,5 @@
 /* Copyright 2020 Nidzo Tomic <tomicn8@hotmail.com>
+ * Copyright 2022 an_achronism <87213873+an-achronism@users.noreply.github.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,24 +23,24 @@ enum keyboard_layers {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Layer 0: Default Layer
      * ,-------------------------------------------------------------------------------------------------.
-     * |Esc|   | F1| F2| F3| F4| | F5| F6| F7| F8| | F9|F10|F11|F12|    |PSc|ScL| Ps|                    |
+     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12|    |PSc|ScL|Pse|                    |
      * |                                                                                                 |
-     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|    BSp|    |Ins|Hom|PgU|    |Num|  /|  *|  -|
+     * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |¥  |BSp|    |Ins|Hom|PgU|    |Num|/  |*  |-  |
      * |-----------------------------------------------------------|    |-----------|    |---------------|
-     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|    |Del|End|PgD|    |  7|  8|  9|   |
-     * |-----------------------------------------------------------|                     |-----------|   |
-     * |CapsLk|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  #|Ent |                     |  4|  5|  6|  +|
+     * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |    |Del|End|PgD|    |7  |8  |9  |+  |
      * |-----------------------------------------------------------|                     |---------------|
-     * |Shift|  \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift    |        | Up|        |  1|  2|  3|   |
-     * |-----------------------------------------------------------|        |---|        |-----------|   |
-     * |Ctrl |   |Alt  |           Space          |Alt Gr|   |Ctrl |    | Lt| Dn| Rt|    |      0|  ,|Ent|
+     * |CapsLk|A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |#  |Ent |                     |4  |5  |6  |=  |
+     * |-----------------------------------------------------------|                     |---------------|
+     * |Shift|\  |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |\  |Shift|        |Up |        |1  |2  |3  |Ent|
+     * |-----------------------------------------------------------|        |---|        |---------------|
+     * |Ctrl |   |Alt  |           Space          |Alt Gr|   |Ctrl |    |Lt |Dn |Rt |    |0  |,  |.  |GUI|
      * `-------------------------------------------------------------------------------------------------'
      */
     [_BL] = LAYOUT_all(
-      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
-      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
-      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_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                 KC_P4,   KC_P5,   KC_P6,
-      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,            KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
-      KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,            KC_PDOT),
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      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_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                          KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1, KC_RSFT,                     KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+      KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_INT6, KC_PDOT, KC_LGUI),
 };
diff --git a/keyboards/yugo_m/model_m_101/keymaps/default/readme.md b/keyboards/yugo_m/model_m_101/keymaps/default/readme.md
index ba8b91239e..3d983cc1e7 100644
--- a/keyboards/yugo_m/model_m_101/keymaps/default/readme.md
+++ b/keyboards/yugo_m/model_m_101/keymaps/default/readme.md
@@ -1 +1 @@
-# The default keymap for 101/102 key keyboards. 
+# The default keymap for IBM/Lexmark/Unicomp Enhanced Keyboards (a.k.a. "Keyboard M", "Model M") with arrays comprising between 101 and 108 keys (unused keys can simply be ignored as they will be physically blocked by keycap stabiliser posts). As of February 2022, ANSI, ISO, and JIS key positions are all supported and mapped to the appropriate default functions.
diff --git a/keyboards/yugo_m/model_m_101/keymaps/via/keymap.c b/keyboards/yugo_m/model_m_101/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ee3de82e3b
--- /dev/null
+++ b/keyboards/yugo_m/model_m_101/keymaps/via/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2022 an_achronism <87213873+an-achronism@users.noreply.github.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+enum keyboard_layers {
+    _L0, // Base Layer
+    _L1,
+    _L2,
+    _L3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Layer 0: Default Layer
+     * ,-------------------------------------------------------------------------------------------------.
+     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12|    |PSc|ScL|Pse|                    |
+     * |                                                                                                 |
+     * |`  |1  |2  |3  |4  |5  |6  |7  |8  |9  |0  |-  |=  |¥  |BSp|    |Ins|Hom|PgU|    |Num|/  |*  |-  |
+     * |-----------------------------------------------------------|    |-----------|    |---------------|
+     * |Tab  |Q  |W  |E  |R  |T  |Y  |U  |I  |O  |P  |[  |]  |\    |    |Del|End|PgD|    |7  |8  |9  |+  |
+     * |-----------------------------------------------------------|                     |---------------|
+     * |CapsLk|A  |S  |D  |F  |G  |H  |J  |K  |L  |;  |'  |#  |Ent |                     |4  |5  |6  |=  |
+     * |-----------------------------------------------------------|                     |---------------|
+     * |Shift|\  |Z  |X  |C  |V  |B  |N  |M  |,  |.  |/  |\  |Shift|        |Up |        |1  |2  |3  |Ent|
+     * |-----------------------------------------------------------|        |---|        |---------------|
+     * |Ctrl |   |Alt  |           Space          |Alt Gr|   |Ctrl |    |Lt |Dn |Rt |    |0  |,  |.  |GUI|
+     * `-------------------------------------------------------------------------------------------------'
+     */
+    [_L0] = LAYOUT_all(
+      KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,             KC_PSCR, KC_SLCK, KC_PAUS,
+      KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_INT3, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,   KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+      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_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+      KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                          KC_P4,   KC_P5,   KC_P6,   KC_PEQL,
+      KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_INT1, KC_RSFT,                     KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+      KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_INT6, KC_PDOT, KC_LGUI),
+    [_L1] = LAYOUT_all(
+      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,   _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                         _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,            _______, _______, _______, _______,
+      _______,          _______,                            _______,                                     _______,          _______,            _______, _______, _______,   _______, _______, _______, _______),
+    [_L2] = LAYOUT_all(
+      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,   _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                         _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,            _______, _______, _______, _______,
+      _______,          _______,                            _______,                                     _______,          _______,            _______, _______, _______,   _______, _______, _______, _______),
+    [_L3] = LAYOUT_all(
+      _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,   _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,   _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                         _______, _______, _______, _______,
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,            _______, _______, _______, _______,
+      _______,          _______,                            _______,                                     _______,          _______,            _______, _______, _______,   _______, _______, _______, _______),
+};
diff --git a/keyboards/yugo_m/model_m_101/keymaps/via/rules.mk b/keyboards/yugo_m/model_m_101/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yugo_m/model_m_101/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yugo_m/model_m_101/model_m_101.h b/keyboards/yugo_m/model_m_101/model_m_101.h
index 7ee44f367b..4b5961ee54 100644
--- a/keyboards/yugo_m/model_m_101/model_m_101.h
+++ b/keyboards/yugo_m/model_m_101/model_m_101.h
@@ -1,4 +1,5 @@
 /* Copyright 2020 Nidzo Tomic <tomicn8@hotmail.com>
+ * Copyright 2022 an_achronism <87213873+an-achronism@users.noreply.github.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,22 +25,22 @@
  * (where COLUMNS and ROWS crosses). */
 
 #define LAYOUT_all( \
-    K5A,      K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M,   K5N, K5O, K5P, \
+    K5A,      K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M,        K5N, K5O, K5P, \
     \
-    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N,   K4O, K4P, K4Q,   K4R, K4S, K4T, K4U, \
-    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N,   K3O, K3P, K3Q,   K3R, K3S, K3T, K3U, \
-    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N,                    K2O, K2P, K2Q, \
-    K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L,      K1M,        K1N,        K1O, K1P, K1Q, K1R, \
-    K0A,      K0B,                K0C,                     K0D,      K0E,   K0F, K0G, K0H,   K0I,      K0J \
+    K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, MK1, K4N,   K4O, K4P, K4Q,   K4R, K4S, K4T, K4U, \
+    K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N,        K3O, K3P, K3Q,   K3R, K3S, K3T, K3U, \
+    K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N,                         K2O, K2P, K2Q, MK2, \
+    K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, MK3, K1M,             K1N,        K1O, K1P, K1Q, K1R, \
+    K0A,      K0B,                K0C,                     K0D,      K0E,        K0F, K0G, K0H,   MK4, K0I, K0J, MK5  \
 ) \
 { \
-/* 00 */ { KC_NO, KC_NO, K5A,   K1B,   K5E,   K2F, K5F,   K2G, K5G,   KC_NO, K2L,   KC_NO, K0I, K0J, K1N,   K0B   }, \
-/* 01 */ { KC_NO, K1A,   K3A,   K2A,   K5D,   K3F, K4N,   K3G, K3M,   K5H,   K3L,   K2O,   K2P, K2Q, KC_NO, KC_NO }, \
+/* 00 */ { KC_NO, KC_NO, K5A,   K1B,   K5E,   K2F, K5F,   K2G, K5G,   KC_NO, K2L,   MK4,   K0I, K0J, K1N,   K0B   }, \
+/* 01 */ { KC_NO, K1A,   K3A,   K2A,   K5D,   K3F, K4N,   K3G, K3M,   K5H,   K3L,   K2O,   K2P, K2Q, MK2,   KC_NO }, \
 /* 02 */ { K0A,   KC_NO, K4A,   K5B,   K5C,   K4F, K5J,   K4G, K4M,   K5I,   K4L,   K3O,   K4O, K4Q, K4P,   KC_NO }, \
 /* 03 */ { KC_NO, KC_NO, K4B,   K4C,   K4D,   K4E, K5K,   K4H, K4I,   K4J,   K4K,   K5L,   K5M, K3Q, K3P,   K5N   }, \
-/* 04 */ { KC_NO, KC_NO, K3B,   K3C,   K3D,   K3E, KC_NO, K3H, K3I,   K3J,   K3K,   K3R,   K3S, K3T, K3U,   K5O   }, \
-/* 05 */ { KC_NO, KC_NO, K2B,   K2C,   K2D,   K2E, K3N,   K2H, K2I,   K2J,   K2K,   K1O,   K1P, K1Q, K1R,   KC_NO }, \
+/* 04 */ { KC_NO, KC_NO, K3B,   K3C,   K3D,   K3E, MK1,   K3H, K3I,   K3J,   K3K,   K3R,   K3S, K3T, K3U,   K5O   }, \
+/* 05 */ { KC_NO, KC_NO, K2B,   K2C,   K2D,   K2E, K3N,   K2H, K2I,   K2J,   K2K,   K1O,   K1P, K1Q, K1R,   MK5   }, \
 /* 06 */ { K0E,   K1M,   K1C,   K1D,   K1E,   K1F, K2N,   K1I, K1J,   K1K,   K2M,   K4R,   K4S, K4T, K5P,   KC_NO }, \
-/* 07 */ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1G, K0C,   K1H, KC_NO, KC_NO, K1L,   K0G,   K0H, K4U, K0F,   K0D   }, \
+/* 07 */ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1G, K0C,   K1H, MK3,   KC_NO, K1L,   K0G,   K0H, K4U, K0F,   K0D   }, \
 }
 /*         0      1      2      3      4      5    6      7    8      9      A      B      C    D    E      F       */
diff --git a/keyboards/yugo_m/model_m_101/readme.md b/keyboards/yugo_m/model_m_101/readme.md
index 598f0fa79d..7c14dea804 100644
--- a/keyboards/yugo_m/model_m_101/readme.md
+++ b/keyboards/yugo_m/model_m_101/readme.md
@@ -15,3 +15,11 @@ Make example for this keyboard (after setting up your build environment):
     make yugo_m/model_m_101: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).
+
+
+
+Note regarding 2022 matrix update:
+
+The original author's firmware did not make several lesser-used membrane/matrix positions available to the controller. These are useful for JIS users and/or if you simply want to create a more unique layout. I've added all of the unused membrane positions to the firmware, except for an extremely seldom used one that sits in the left side of the space bar on some later membranes (I would have added it if I knew its matrix position, but I haven't mapped that out yet). The default mappings for these additional keys follow JIS conventions, except for the extra key on the bottom right corner of the numpad (lower half of vertical 2u Enter), which I've mapped to the LGUI key a.k.a. left Windows/Command key for now. Remap as you wish!
+
+- an_achronism, February 2022
\ No newline at end of file
diff --git a/keyboards/yugo_m/readme.md b/keyboards/yugo_m/readme.md
index 557c4262d5..40c7b64073 100644
--- a/keyboards/yugo_m/readme.md
+++ b/keyboards/yugo_m/readme.md
@@ -9,3 +9,11 @@ Currently available only for 101/102 key keyboards.
   * Rev 1.1b
 
 For more info visit the project repository: [Yugo-M-controller-project](https://github.com/tomic1785/Yugo-M-controller-project)
+
+
+
+Note regarding 2022 matrix update:
+
+The original author's firmware did not make several lesser-used membrane/matrix positions available to the controller. These are useful for JIS users and/or if you simply want to create a more unique layout. I've added all of the unused membrane positions to the firmware, except for an extremely seldom used one that sits in the left side of the space bar on some later membranes (I would have added it if I knew its matrix position, but I haven't mapped that out yet). The default mappings for these additional keys follow JIS conventions, except for the extra key on the bottom right corner of the numpad (lower half of vertical 2u Enter), which I've mapped to the LGUI key a.k.a. left Windows/Command key for now. Remap as you wish!
+
+- an_achronism, February 2022
\ No newline at end of file

From fded67f1a97499887857b1d2d2e226e4069ffdf5 Mon Sep 17 00:00:00 2001
From: AnthonyNguyen168 <89651736+AnthonyNguyen168@users.noreply.github.com>
Date: Wed, 16 Mar 2022 10:13:14 +0700
Subject: [PATCH 836/867] [MB-65S] Change layout to follow change request from
 OEM (#16663)

---
 .../mb65s/keymaps/default/keymap.c            | 24 +++++++--------
 .../mechbrewery/mb65s/keymaps/iso/keymap.c    | 22 +++++++-------
 .../mb65s/keymaps/split_bs/keymap.c           | 30 +++++++++----------
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
index 512c04a296..5625e07568 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/default/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Keymap (Base Layer) Default Layer
      * ,---------------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |Del|
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |Hom|
      * |---------------------------------------------------------------|
      * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |PUp|
      * |---------------------------------------------------------------|
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      * `---------------------------------------------------------------'
      */
     [0] = LAYOUT_65_ansi_blocker(
-        KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
         KC_TAB,  KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         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_PGDN,
         KC_LSFT,          KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,
@@ -41,23 +41,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Keymap Fn Layer
      * ,---------------------------------------------------------------.
-     * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete |Ins|
+     * |~ `|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Delete |   |
      * |---------------------------------------------------------------|
-     * |     |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |   |
+     * |Caps |   |Up |   |   |   |   |   |Ins|   |PSc|SLk|Pau|     |   |
      * |---------------------------------------------------------------|
-     * |      |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig|  Reset |   |
+     * |      |Lef|Dow|Rig|   |   |   |   |   |   |Hom|PUp|        |   |
      * |---------------------------------------------------------------|
-     * |        |BL-|BLT|BL+|BLS|BLM|   |   |End|PDn|Dow|      |PUp|   |
+     * |        |   |   |   |   |   |Vo-|Vo+|Mut|End|PDn|      |   |   |
      * |---------------------------------------------------------------|
-     * |    |    |    |                        |    |    | |Hom|PDn|End|
+     * |    |    |    |                        |    |    | |   |   |   |
      * `---------------------------------------------------------------'
      */
     [1] = LAYOUT_65_ansi_blocker(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_INS,
-        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
-        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          RESET,   _______,
-        _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, KC_PGUP, _______,
-        _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,    KC_F9,  KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        KC_CAPS, _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______
     ),
 
 };
diff --git a/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c
index f6101815ac..7899762838 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/iso/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Base layer
      * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Del│
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Hom│
      * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
      * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │PUp│
      * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
@@ -42,23 +42,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Function layer
      * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │ § │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │Prt│
+     * │ § │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │   │
      * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │     │Prv│Pau│Nxt│   │   │   │   │   │   │   │   │   │Reset│Ins│
+     * │Caps │   │Up │   │   │   │   │   │Ins│   │PSc│SLk│Pau│     │   │
      * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
-     * │      │Vl-│V0 │Vl+│   │   │   │   │   │   │   │   │   │    │Hom│
+     * │      │Lef│Dow│Rig│   │   │   │   │   │   │Hom│PUp│   │    │   │
      * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
-     * │        │BL-│BLT│BL+│BLS│BLM│   │   │   │   │   │LClick│MUp│End│
+     * │        │   │   │   │   │   │Vo-│Vo+│Mut│End│PDn│      │   │   │
      * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
-     * │    │    │    │                        │    │    │ │MLt│MDw│MRt│
+     * │    │    │    │                        │    │    │ │   │   │   │
      * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
      */
     [1] = LAYOUT_65_ansi_blocker_isoenter(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
-        _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_INS,
-        _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_HOME,
-        _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_END,
-        _______, _______, _______,                   _______,                            _______, _______,          KC_MS_L, KC_MS_D, KC_MS_R
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  _______,
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS,          _______,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, _______, _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
     ),
 
 };
diff --git a/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c b/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c
index 0cbb5040ea..db56fae442 100644
--- a/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c
+++ b/keyboards/mechbrewery/mb65s/keymaps/split_bs/keymap.c
@@ -20,44 +20,44 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* Keymap (Base Layer) Default Layer
      * ,---------------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| - | = |Bsp|Del|Hom|
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| - | = |Bsp|Bsp|Hom|
      * |---------------------------------------------------------------|
      * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P| [ | ] |  \  |PUp|
      * |---------------------------------------------------------------|
      * |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L| ; | ' |Return |PDn|
      * |---------------------------------------------------------------|
-     * |Shift   |  Z|  X|  C|  V|  B|  N|  M| , | . | / |Shift | Up|Hom|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M| , | . | / |Shift | Up|End|
      * |---------------------------------------------------------------|
-     * |Ctrl|LGUI|Alt |          Space         |GUI |Fn  | |Lef|Dow|Rig|
+     * |Ctrl|LGUI|Alt |          Space         |Alt |Fn  | |Lef|Dow|Rig|
      * `---------------------------------------------------------------'
      */
     [0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
         KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
         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_PGDN,
         KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RGUI  MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
     /* Keymap Fn Layer
      * ,---------------------------------------------------------------.
-     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| - | = |   |Del|Ins|
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0| - | = |Del|Del|   |
      * |---------------------------------------------------------------|
-     * |     |   |Up |   |   |   |   |   |PSc|SLk|Pau|Up |   |     |   |
+     * |Caps |   |Up |   |   |   |   |   |Ins|   |PSc|SLk|Pau|     |   |
      * |---------------------------------------------------------------|
-     * |       |Lef|Dow|Rig|   |   |   |   |Hom|PUp|Lef|Rig| Reset |Vl+|
+     * |       |Lef|Dow|Rig|   |   |   |   |   |   |Hom|PUp|       |   |
      * |---------------------------------------------------------------|
-     * |        |BL-|BLT|BL+|BLS|BLM|   |   |End|PDn|Dow|      |   |Vl-|
+     * |        |   |   |   |   |   |Vo-|Vo+|Mut|End|PDn|      |   |   |
      * |---------------------------------------------------------------|
-     * |    |    |    |                        |    |    | |Prv|Ply|Nxt|
+     * |    |    |    |                        |    |    | |   |   |   |
      * `---------------------------------------------------------------'
      */
     [1] = LAYOUT_all(
-        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_DEL,  KC_INS,
-        _______,          _______, KC_UP,   _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______, _______,
-        _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          RESET,   KC_VOLU,
-        _______,          BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, BL_BRTG, _______, _______, KC_END,  KC_PGDN, KC_DOWN,          _______, _______, KC_VOLD,
-        _______, _______, _______,                            _______,                            _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_DEL,  _______,
+        _______,          _______, KC_UP,   _______, _______, _______, _______, KC_INS,  _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______,
+        _______,          KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN,          _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
     ),
 
 };

From a867cfc26d811367ad345f31657547e9d603d869 Mon Sep 17 00:00:00 2001
From: Yakbats <yakbats@gmail.com>
Date: Tue, 15 Mar 2022 20:14:31 -0700
Subject: [PATCH 837/867] Update the AL1 Vender ID (#16660)

* Add via to AL1

* Updated number of rows and columns, and applied suggestions from code review

* Update Vender ID

Change the Vender ID for Triangle Lab to comply with the via PR checklist.
---
 keyboards/al1/config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/al1/config.h b/keyboards/al1/config.h
index 078e9cb41e..ea6474dc18 100644
--- a/keyboards/al1/config.h
+++ b/keyboards/al1/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID    0xFEED
+#define VENDOR_ID    0x544C
 #define PRODUCT_ID   0x6050
 #define DEVICE_VER   0x0104
 #define MANUFACTURER Alsoran

From 8c5779f7689d8e0f84f98d29e7e63f1058f30f0e Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 16 Mar 2022 14:57:47 +1100
Subject: [PATCH 838/867] Fix m3n3van and minim keyboard names in keymap JSON
 (#16665)

---
 keyboards/matthewdias/m3n3van/keymaps/default/keymap.json | 2 +-
 keyboards/matthewdias/minim/keymaps/default/keymap.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/keyboards/matthewdias/m3n3van/keymaps/default/keymap.json b/keyboards/matthewdias/m3n3van/keymaps/default/keymap.json
index d59debdaf1..f2e65452ca 100644
--- a/keyboards/matthewdias/m3n3van/keymaps/default/keymap.json
+++ b/keyboards/matthewdias/m3n3van/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
 {
-  "keyboard": "m3n3van",
+  "keyboard": "matthewdias/m3n3van",
   "keymap": "default",
   "layout": "LAYOUT",
   "layers": [
diff --git a/keyboards/matthewdias/minim/keymaps/default/keymap.json b/keyboards/matthewdias/minim/keymaps/default/keymap.json
index bc7407e93a..3bb5fe1992 100644
--- a/keyboards/matthewdias/minim/keymaps/default/keymap.json
+++ b/keyboards/matthewdias/minim/keymaps/default/keymap.json
@@ -1,5 +1,5 @@
 {
-  "keyboard": "minim",
+  "keyboard": "matthewdias/minim",
   "keymap": "default",
   "layout": "LAYOUT",
   "layers": [

From d5d2a01db2bc09735806fd62ef31997428885ddf Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 16 Mar 2022 15:08:52 +1100
Subject: [PATCH 839/867] gboards/butterstick: move steno rules config to
 keymap level (#16666)

---
 keyboards/gboards/butterstick/keymaps/default/rules.mk | 4 ++++
 keyboards/gboards/butterstick/rules.mk                 | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 keyboards/gboards/butterstick/keymaps/default/rules.mk

diff --git a/keyboards/gboards/butterstick/keymaps/default/rules.mk b/keyboards/gboards/butterstick/keymaps/default/rules.mk
new file mode 100644
index 0000000000..6a33461108
--- /dev/null
+++ b/keyboards/gboards/butterstick/keymaps/default/rules.mk
@@ -0,0 +1,4 @@
+STENO_ENABLE = yes
+
+OPT_DEFS += -DONLYQWERTY -DDEBUG_MATRIX
+SRC += sten.c
diff --git a/keyboards/gboards/butterstick/rules.mk b/keyboards/gboards/butterstick/rules.mk
index 4229aa7eec..e05ccd047c 100644
--- a/keyboards/gboards/butterstick/rules.mk
+++ b/keyboards/gboards/butterstick/rules.mk
@@ -12,8 +12,4 @@ 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           # Enable N-Key Rollover
-STENO_ENABLE		= yes 		# Needed for chording
-
-OPT_DEFS += -DONLYQWERTY -DDEBUG_MATRIX
-SRC += sten.c
 LTO_ENABLE = yes

From 193dd01f4ec06c3153b23a5cd809fbd97f43012d Mon Sep 17 00:00:00 2001
From: Jay Greco <jayv.greco@gmail.com>
Date: Wed, 16 Mar 2022 08:34:16 -0700
Subject: [PATCH 840/867] [Keyboard] Add nullbits TIDBIT (#15182)

---
 keyboards/nullbitsco/tidbit/config.h          |  62 ++++
 keyboards/nullbitsco/tidbit/info.json         |  14 +
 .../tidbit/keymaps/default/keymap.c           |  40 +++
 .../nullbitsco/tidbit/keymaps/oled/keymap.c   |  58 ++++
 .../nullbitsco/tidbit/keymaps/oled/rules.mk   |   3 +
 .../tidbit/keymaps/snailmap_lite/keymap.c     | 283 ++++++++++++++++++
 .../tidbit/keymaps/snailmap_lite/rules.mk     |   6 +
 .../nullbitsco/tidbit/keymaps/via/keymap.c    |  59 ++++
 .../nullbitsco/tidbit/keymaps/via/rules.mk    |   1 +
 keyboards/nullbitsco/tidbit/readme.md         |  26 ++
 keyboards/nullbitsco/tidbit/rules.mk          |  26 ++
 keyboards/nullbitsco/tidbit/tidbit.c          | 157 ++++++++++
 keyboards/nullbitsco/tidbit/tidbit.h          |  37 +++
 13 files changed, 772 insertions(+)
 create mode 100644 keyboards/nullbitsco/tidbit/config.h
 create mode 100644 keyboards/nullbitsco/tidbit/info.json
 create mode 100644 keyboards/nullbitsco/tidbit/keymaps/default/keymap.c
 create mode 100644 keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c
 create mode 100644 keyboards/nullbitsco/tidbit/keymaps/oled/rules.mk
 create mode 100644 keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
 create mode 100644 keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk
 create mode 100644 keyboards/nullbitsco/tidbit/keymaps/via/keymap.c
 create mode 100644 keyboards/nullbitsco/tidbit/keymaps/via/rules.mk
 create mode 100644 keyboards/nullbitsco/tidbit/readme.md
 create mode 100644 keyboards/nullbitsco/tidbit/rules.mk
 create mode 100644 keyboards/nullbitsco/tidbit/tidbit.c
 create mode 100644 keyboards/nullbitsco/tidbit/tidbit.h

diff --git a/keyboards/nullbitsco/tidbit/config.h b/keyboards/nullbitsco/tidbit/config.h
new file mode 100644
index 0000000000..103dabdb96
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/config.h
@@ -0,0 +1,62 @@
+/* Copyright 2021 Jay Greco
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* Used to set remote for remote KB if VUSB detect doesn't work. */
+// #define KEYBOARD_REMOTE
+
+// Workaround for freezing after MacOS sleep
+#define USB_SUSPEND_WAKEUP_DELAY 200
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6E61
+#define PRODUCT_ID      0x6064
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    nullbits
+#define PRODUCT         TIDBIT
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 6
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B1, E6, D7, C6, D4 }
+#define MATRIX_COL_PINS { NO_PIN, NO_PIN, F4, F5, F6, F7 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Optional SMT LED pins */
+#define RGB_DI_PIN B6
+#define RGBLED_NUM 8
+#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
+#define RGBLIGHT_EFFECT_TWINKLE
+
+/* Optional encoder pins */
+// Encoders are defined in order. 1: B2 & B3, 2: B4 & B5, 3: D0 & D1, 4: D2 & D3
+#define ENCODERS_PAD_A { B2, B4, D0, D3 }
+#define ENCODERS_PAD_B { B3, B5, D1, D2 }
diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json
new file mode 100644
index 0000000000..5d260cc453
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/info.json
@@ -0,0 +1,14 @@
+{
+    "keyboard_name": "TIDBIT 19",
+    "url": "https://nullbits.co/tidbit/",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"/", "x":3.25, "y":0}, {"label":"*", "x":4.25, "y":0}, {"label":"-", "x":5.25, "y":0}, 
+                {"label":"Enc 1", "x":0, "y":1}, {"label":"Enc 1", "x":1, "y":1}, {"label":"7", "x":2.25, "y":1}, {"label":"8", "x":3.25, "y":1}, {"label":"9", "x":4.25, "y":1}, {"label":"+", "x":5.25, "y":1}, 
+                {"label":"Enc 2", "x":0, "y":2}, {"label":"Enc 2", "x":1, "y":2}, {"label":"4", "x":2.25, "y":2}, {"label":"5", "x":3.25, "y":2}, {"label":"6", "x":4.25, "y":2}, {"label":"+", "x":5.25, "y":2}, 
+                {"label":"Enc 3", "x":0, "y":3}, {"label":"Enc 3", "x":1, "y":3}, {"label":"1", "x":2.25, "y":3}, {"label":"2", "x":3.25, "y":3}, {"label":"3", "x":4.25, "y":3}, {"label":"Enter", "x":5.25, "y":3},
+                {"label":"Enc 4", "x":0, "y":4}, {"label":"Enc 4", "x":1, "y":4}, {"label":"0", "x":2.25, "y":4}, {"label":"0", "x":3.25, "y":4}, {"label":".", "x":4.25, "y":4}, {"label":"Enter", "x":5.25, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c
new file mode 100644
index 0000000000..995aff8d69
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 Jay Greco
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE = 0,
+    _FUNC
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+                            KC_PSLS, KC_PAST, KC_PMNS, 
+    KC_VOLD, KC_VOLU, KC_P7, KC_P8,   KC_P9,   KC_PPLS, 
+    KC_MPRV, KC_MNXT, KC_P4, KC_P5,   KC_P6,   KC_PPLS, 
+    KC_LEFT, KC_RGHT, KC_P1, KC_P2,   KC_P3,   KC_PENT, 
+    KC_TRNS, KC_TRNS, KC_P0, KC_P0,   KC_PDOT, KC_PENT  
+    ),
+
+    [_FUNC] = LAYOUT(
+                    ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___  
+    ),
+};
diff --git a/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c
new file mode 100644
index 0000000000..3fbfb638ec
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c
@@ -0,0 +1,58 @@
+/* Copyright 2021 Jay Greco
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE = 0,
+    _VIA1,
+    _VIA2,
+    _VIA3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+                            KC_PSLS, KC_PAST, KC_PMNS, 
+    KC_VOLD, KC_VOLU, KC_P7, KC_P8,   KC_P9,   KC_PPLS, 
+    KC_TRNS, KC_TRNS, KC_P4, KC_P5,   KC_P6,   KC_PPLS, 
+    KC_TRNS, KC_TRNS, KC_P1, KC_P2,   KC_P3,   KC_PENT, 
+    KC_TRNS, KC_TRNS, KC_P0, KC_P0,   KC_PDOT, KC_PENT  
+    ),
+
+    [_VIA1] = LAYOUT(
+                    ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___  
+    ),
+
+    [_VIA2] = LAYOUT(
+                    ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___
+    ),
+
+    [_VIA3] = LAYOUT(
+                    ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___
+    ),
+};
diff --git a/keyboards/nullbitsco/tidbit/keymaps/oled/rules.mk b/keyboards/nullbitsco/tidbit/keymaps/oled/rules.mk
new file mode 100644
index 0000000000..ef531564fc
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/keymaps/oled/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+OLED_ENABLE = yes
+OLED_DRIVER = SSD1306
diff --git a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
new file mode 100644
index 0000000000..cfe97e30a3
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c
@@ -0,0 +1,283 @@
+/* Copyright 2021 dogspace <https://github.com/dogspace>
+ *
+ * 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 layer_names {
+    _LAY0,
+    _LAY1,
+    _LAY2,
+    _LAY3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_LAY0] = LAYOUT(
+                            KC_PSLS, KC_PAST, KC_PMNS, 
+    KC_VOLD, KC_VOLU, KC_P7, KC_P8,   KC_P9,   KC_PPLS, 
+    KC_TRNS, KC_TRNS, KC_P4, KC_P5,   KC_P6,   KC_PPLS, 
+    KC_TRNS, KC_TRNS, KC_P1, KC_P2,   KC_P3,   KC_PENT, 
+    KC_TRNS, KC_TRNS, KC_P0, KC_P0,   KC_PDOT, KC_PENT  
+    ),
+
+    [_LAY1] = LAYOUT(
+                    ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___  
+    ),
+
+    [_LAY2] = LAYOUT(
+                    ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___
+    ),
+
+    [_LAY3] = LAYOUT(
+                    ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___, 
+    ___, ___, ___, ___, ___, ___
+    ),
+};
+
+#ifdef OLED_ENABLE
+/*===========================================    OLED CONFIGURATION    ===========================================*/
+#define OLED_ROTATE      true         // OLED rotation (flip 180* from default orientation)
+#define GRAPH_DIRECTION  true         // Graph movement  (true = right to left,  false = left to right)
+#define GRAPH_TOP_WPM    100.0        // Minimum WPM required to reach the top of the graph
+#define GRAPH_REFRESH    1000         // In milliseconds, determines the graph-line frequency
+#define ICON_MED_WPM     10           // WPM required to display the medium snail
+#define ICON_FAST_WPM    25           // WPM required to display the fast snail
+
+// Layer names:  Should be exactly 5 characters in length if vertical display, or 6 characters if horizontal
+#define MA_LAYER_NAME     "LAY 0"      // Layer _MA name
+#define L1_LAYER_NAME     "LAY 1"      // Layer _L1 name
+#define L2_LAYER_NAME     "LAY 2"      // Layer _L2 name
+#define L3_LAYER_NAME     "LAY 3"      // Layer _L3 name
+
+#define CAPLCK_STR        "CAPLK"       // Caps Lock string
+#define NUMLCK_STR        "NUMLK"       // Num Lock string
+#define SCRLK_STR         "SCRLK"       // Scroll Lock string
+#define EMPTY_STR         "     "       // Empty string
+
+/*================================================================================================================*/
+
+typedef struct oled_params {
+    bool first_loop : 1;
+    uint8_t wpm_icon : 7;
+    uint16_t timer;
+    uint8_t wpm_limit;
+    uint8_t max_wpm;
+    uint8_t graph_lines[32];
+} oled_params;
+
+oled_params oled_data;
+
+void oled_init_data(void) {
+    // Initialize oled params
+    oled_data.first_loop = true;
+    oled_data.wpm_icon = 5;
+    oled_data.timer = 0;
+    oled_data.wpm_limit = 20;
+    oled_data.max_wpm = 0;
+
+    for (int i=0; i<32; i++) {
+        oled_data.graph_lines[i] = 0;
+    }
+}
+
+// Set OLED rotation
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    oled_init_data();
+    return OLED_ROTATE ? OLED_ROTATION_270 : OLED_ROTATION_90;
+}
+
+// Draw static background image to OLED (keyboard with no bottom row)
+static void render_background(void) {
+    static const char PROGMEM nullbits_n_oled[] = {
+        0x00, 0xe0, 0xf0, 0xf0, 0xf8, 0xf8, 0xf0, 0xf0, 0xe0, 0x80, 0x20, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 
+        0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xe0, 0xe0, 0xe0, 0xc0, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 
+        0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xf0, 0x00, 0x00, 
+        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 
+        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
+        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
+        0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x07, 0x03, 0x00, 
+    };
+    oled_write_raw_P(nullbits_n_oled, sizeof(nullbits_n_oled));
+}
+
+// Toggles pixel on/off, converts horizontal coordinates to vertical equivalent if necessary
+static void write_pixel(uint8_t x, uint8_t y, bool onoff) {
+    oled_write_pixel(y, 127 - x, onoff);
+}
+
+// Write active layer name
+static void render_layer_state(void) {
+  oled_set_cursor(0, 15);
+  switch (get_highest_layer(layer_state)) {
+  case _LAY0:
+      oled_write_P(PSTR(MA_LAYER_NAME), false);
+      break;
+  case _LAY1:
+      oled_write_P(PSTR(L1_LAYER_NAME), false);
+      break;
+  case _LAY2:
+      oled_write_P(PSTR(L2_LAYER_NAME), false);
+      break;
+  case _LAY3:
+      oled_write_P(PSTR(L3_LAYER_NAME), false);
+      break;
+  default:
+      oled_write("ERROR", false);
+      break;
+  }
+}
+
+// Update WPM counters
+static void render_wpm_counters(uint8_t current_wpm) {
+    uint8_t cursorposition_cur = 13;
+    uint8_t cursorposition_max = 14;
+
+    oled_set_cursor(0, cursorposition_cur);
+    oled_write(get_u8_str(current_wpm, '0'), false);
+
+    if (current_wpm > oled_data.max_wpm) {
+        oled_data.max_wpm = current_wpm;
+        oled_data.wpm_limit = oled_data.max_wpm + 20;
+        oled_set_cursor(0, cursorposition_max);
+        oled_write(get_u8_str(current_wpm, '0'), false);
+    }
+}
+
+static void render_led_status(void) {
+    // Host Keyboard LED Status
+    uint8_t led_usb_state = host_keyboard_leds();
+    oled_set_cursor(0, 8);
+    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_CAPS_LOCK) ? PSTR(CAPLCK_STR) : PSTR(EMPTY_STR), false);
+    oled_set_cursor(0, 9);
+    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_NUM_LOCK) ? PSTR(NUMLCK_STR) : PSTR(EMPTY_STR), false);
+    oled_set_cursor(0, 10);
+    oled_write_P(IS_LED_ON(led_usb_state, USB_LED_SCROLL_LOCK) ? PSTR(SCRLK_STR) : PSTR(EMPTY_STR), false);
+}
+
+// Update WPM snail icon
+static void render_wpm_icon(uint8_t current_wpm) {
+    // wpm_icon is used to prevent unnecessary redraw
+    if ((current_wpm < ICON_MED_WPM) && (oled_data.wpm_icon != 0)) {
+        oled_data.wpm_icon = 0;
+    } else if ((current_wpm >= ICON_MED_WPM) && (current_wpm < ICON_FAST_WPM) && (oled_data.wpm_icon != 1)) {
+        oled_data.wpm_icon = 1;
+    } else if ((current_wpm >= ICON_FAST_WPM) && (oled_data.wpm_icon != 2)) {
+        oled_data.wpm_icon = 2;
+    } else {
+        return;
+    }
+    static const char PROGMEM snails[][2][24] = {
+        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0xA0, 0x20, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x50, 0x88, 0x04, 0x00, 0x00},
+         {0x40, 0x60, 0x50, 0x4E, 0x51, 0x64, 0x4A, 0x51, 0x54, 0x49, 0x41, 0x62, 0x54, 0x49, 0x46, 0x41, 0x40, 0x30, 0x09, 0x04, 0x02, 0x01, 0x00, 0x00}},
+        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x04, 0x98, 0x60, 0x80, 0x00, 0x00, 0x00, 0x00},
+         {0x60, 0x50, 0x54, 0x4A, 0x51, 0x64, 0x4A, 0x51, 0x55, 0x49, 0x41, 0x62, 0x54, 0x49, 0x46, 0x41, 0x21, 0x10, 0x0A, 0x08, 0x05, 0x02, 0x00, 0x00}},
+        {{0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x40, 0x40, 0x40, 0x80, 0x80, 0x10, 0x10, 0x10, 0x20, 0x40, 0x40, 0xC0, 0x80, 0x80, 0x00, 0x00, 0x00},
+         {0x60, 0x58, 0x54, 0x62, 0x49, 0x54, 0x52, 0x51, 0x55, 0x49, 0x62, 0x52, 0x4D, 0x45, 0x46, 0x22, 0x21, 0x11, 0x10, 0x0A, 0x08, 0x05, 0x02, 0x00}}
+    };
+    oled_set_cursor(0, 11);
+    oled_write_raw_P(snails[oled_data.wpm_icon][0], sizeof(snails[oled_data.wpm_icon][0]));
+    oled_set_cursor(0, 12);
+    oled_write_raw_P(snails[oled_data.wpm_icon][1], sizeof(snails[oled_data.wpm_icon][1]));
+}
+
+// Update WPM graph
+static void render_wpm_graph(uint8_t current_wpm) {
+    uint8_t line_height = ((current_wpm / GRAPH_TOP_WPM) * 7);
+    if (line_height > 7) {
+        line_height = 7;
+    }
+    // Count graph line pixels, return if nothing to draw
+    uint8_t pixel_count = line_height;
+    for (int i = 0; i < 31; i++) {
+        pixel_count += oled_data.graph_lines[i];
+    }
+    if (pixel_count == 0) {
+        return;
+    }
+    // Shift array elements left or right depending on GRAPH_DIRECTION pend new graph line
+    if (GRAPH_DIRECTION) {
+        for (int i = 0; i < 31; i++) {
+            oled_data.graph_lines[i] = oled_data.graph_lines[i + 1];
+        }
+        oled_data.graph_lines[31] = line_height;
+    } else {
+        for (int i = 31; i > 0; i--) {
+            oled_data.graph_lines[i] = oled_data.graph_lines[i - 1];
+        }
+        oled_data.graph_lines[0] = line_height;
+    }
+    // Draw all graph lines (left to right, bottom to top)
+    uint16_t draw_count, arrpos;
+    for (int x = 1; x <= 63; x += 2) {
+        arrpos = x / 2;
+        draw_count = oled_data.graph_lines[arrpos];
+        for (int y = 31; y >= 25; y--) {
+            if (draw_count > 0) {
+                write_pixel(x, y, true);
+                draw_count--;
+            } else {
+                write_pixel(x, y, false);
+            }
+        }
+    }
+}
+
+// Call OLED functions
+bool oled_task_user(void) {
+    // Draw OLED keyboard, prevent redraw
+    if (oled_data.first_loop) {
+        render_background();
+        oled_data.first_loop = false;
+    }
+    // Get current WPM, subtract 25% for accuracy and prevent large jumps caused by simultaneous keypresses
+    uint8_t current_wpm = get_current_wpm();
+    // Write active layer name to display
+    render_layer_state();
+    // Update WPM counters
+    render_wpm_counters(current_wpm);
+    // Update WPM snail icon
+    render_wpm_icon(current_wpm);
+    // Update LED status
+    render_led_status();
+    // Update WPM graph every graph_refresh milliseconds
+    if (timer_elapsed(oled_data.timer) > GRAPH_REFRESH) {
+        render_wpm_graph(current_wpm);
+        oled_data.timer = timer_read();
+    }
+    return false;
+}
+#endif
+
+bool wpm_keycode_user(uint16_t keycode) {
+    // Count all keycodes on the macropad
+    return true;
+}
+
diff --git a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk
new file mode 100644
index 0000000000..1b72fd006a
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/rules.mk
@@ -0,0 +1,6 @@
+OLED_ENABLE = yes
+WPM_ENABLE = yes
+VIA_ENABLE = yes
+SPACE_CADET_ENABLE = no
+GRAVE_ESC_ENABLE = no
+MAGIC_ENABLE = no
diff --git a/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ad3e18075c
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2021 Jay Greco
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+    _BASE = 0,
+    _VIA1,
+    _VIA2,
+    _VIA3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+                            KC_PSLS, KC_PAST, KC_PMNS, 
+  KC_VOLD, KC_VOLU, KC_P7, KC_P8,   KC_P9,   KC_PPLS, 
+  KC_TRNS, KC_TRNS, KC_P4, KC_P5,   KC_P6,   KC_PPLS, 
+  KC_TRNS, KC_TRNS, KC_P1, KC_P2,   KC_P3,   KC_PENT, 
+  KC_TRNS, KC_TRNS, KC_P0, KC_P0,   KC_PDOT, KC_PENT  
+  ),
+
+  [_VIA1] = LAYOUT(
+                  ___, ___, ___, 
+  ___, ___, ___, ___, ___, ___, 
+  ___, ___, ___, ___, ___, ___, 
+  ___, ___, ___, ___, ___, ___, 
+  ___, ___, ___, ___, ___, ___  
+  ),
+
+  [_VIA2] = LAYOUT(
+                  ___, ___, ___, 
+  ___, ___, ___, ___, ___, ___, 
+  ___, ___, ___, ___, ___, ___, 
+  ___, ___, ___, ___, ___, ___, 
+  ___, ___, ___, ___, ___, ___
+  ),
+
+  [_VIA3] = LAYOUT(
+                  ___, ___, ___, 
+  ___, ___, ___, ___, ___, ___, 
+  ___, ___, ___, ___, ___, ___, 
+  ___, ___, ___, ___, ___, ___, 
+  ___, ___, ___, ___, ___, ___
+  ),
+};
+
diff --git a/keyboards/nullbitsco/tidbit/keymaps/via/rules.mk b/keyboards/nullbitsco/tidbit/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/nullbitsco/tidbit/readme.md b/keyboards/nullbitsco/tidbit/readme.md
new file mode 100644
index 0000000000..f2d0d9934b
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/readme.md
@@ -0,0 +1,26 @@
+# TIDBIT
+
+![TIDBIT](https://nullbits.co/static/img/tidbit1.jpg)
+
+A very moddable 19-key numpad kit built by nullbits. [More info at nullbits.co](https://nullbits.co/tidbit/)
+
+* Keyboard Maintainer: [Jay Greco](https://github.com/jaygreco)
+* Hardware Supported: TIDBIT Rev1, Pro Micro comaptible MCUs.
+* Hardware Availability: [nullbits.co](https://nullbits.co/)
+
+Note: If you are seeing issues with MacOS and keyboard hangs after sleep, make sure `NO_USB_STARTUP_CHECK = yes` is set in your rules.mk.
+
+Adds experimental "Remote Keyboard" functionality, which forwards keystrokes from an external macropad, keyboard, or numpad over UART/TRRS, removing the need for an additional USB connection.
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nullbitsco/tidbit: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).
diff --git a/keyboards/nullbitsco/tidbit/rules.mk b/keyboards/nullbitsco/tidbit/rules.mk
new file mode 100644
index 0000000000..13893a69e2
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+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
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+LTO_ENABLE = yes
+
+# Project specific files
+SRC += common/bitc_led.c \
+    common/remote_kb.c
+QUANTUM_LIB_SRC += i2c_master.c \
+    uart.c
diff --git a/keyboards/nullbitsco/tidbit/tidbit.c b/keyboards/nullbitsco/tidbit/tidbit.c
new file mode 100644
index 0000000000..6e7ef460e5
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/tidbit.c
@@ -0,0 +1,157 @@
+/* Copyright 2021 Jay Greco
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+typedef struct PACKED {
+    uint8_t r;
+    uint8_t c;
+} encodermap_t;
+
+// Map encoders to their respective virtual matrix entry
+// Allows for encoder control using VIA
+const encodermap_t encoder_map[4][2] = {
+    {{1, 0}, {1, 1}},  // Encoder 1 matrix location
+    {{2, 0}, {2, 1}},  // Encoder 2 matrix location
+    {{3, 0}, {3, 1}},  // Encoder 3 matrix location
+    {{4, 0}, {4, 1}},  // Encoder 4 matrix location
+};
+
+bool numlock_set = false;
+
+#ifdef OLED_ENABLE
+oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+
+static void render_logo(void) {
+    static const char PROGMEM tidbit_oled[] = {
+        0x00, 0x0e, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+        0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x0e, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 
+        0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 
+        0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3e, 0x3e, 0x7e, 0xfc, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xf8, 0xfe, 0xfe, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 
+        0x1f, 0x1f, 0x3f, 0x7e, 0xfe, 0xfe, 0xfc, 0xf8, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0xfe, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x0e, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 
+        0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1e, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
+        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xc0, 
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 
+        0xe0, 0xf0, 0xf0, 0xf8, 0xff, 0xff, 0xbf, 0x1f, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
+        0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x03, 
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 
+        0x03, 0x03, 0x03, 0x07, 0x07, 0xbf, 0xff, 0xff, 0xff, 0xfe, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x7f, 0xff, 0xff, 0x7f, 0x3f, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 
+        0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 
+        0xf8, 0xf8, 0xf8, 0x7c, 0x7c, 0x7c, 0x7e, 0x3e, 0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x01, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x1f, 0x7f, 0x7f, 0x7f, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 
+        0xf8, 0x7c, 0x7c, 0x7c, 0x7e, 0x3f, 0x3f, 0x1f, 0x1f, 0x07, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x7f, 0xff, 0xff, 0x7f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x3f, 0x7f, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+    
+    oled_write_raw_P(tidbit_oled, sizeof(tidbit_oled));
+};
+
+bool oled_task_kb(void) {
+    if (!oled_task_user()) return false;
+    render_logo();
+    return true;
+}
+
+#endif
+
+static void process_encoder_matrix(encodermap_t pos) {
+    action_exec((keyevent_t){
+        .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = true, .time = (timer_read() | 1) /* time should not be 0 */
+    });
+#if TAP_CODE_DELAY > 0
+    wait_ms(TAP_CODE_DELAY);
+#endif
+    action_exec((keyevent_t){
+        .key = (keypos_t){.row = pos.r, .col = pos.c}, .pressed = false, .time = (timer_read() | 1) /* time should not be 0 */
+    });
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) return false;
+    process_encoder_matrix(encoder_map[index][clockwise ? 0 : 1]);
+    return false;
+}
+
+// Use Bit-C LED to show NUM LOCK status
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        set_bitc_LED(led_state.num_lock ? LED_DIM : LED_OFF);
+    }
+    return res;
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+    process_record_remote_kb(keycode, record);
+    if (!process_record_user(keycode, record)) return false;
+
+    // Get the current NLCK status & set if not set.
+    // Only do this once, in case user has a NLCK key
+    // and wants to disable it later on.
+    if (!numlock_set && record->event.pressed) {
+        led_t led_state = host_keyboard_led_state();
+        if (!led_state.num_lock) {
+            register_code(KC_NLCK);
+        }
+        numlock_set = true;
+    }
+
+    switch (keycode) {
+        case RESET:
+            if (record->event.pressed) {
+                set_bitc_LED(LED_DIM);
+                rgblight_disable_noeeprom();
+                #ifdef OLED_ENABLE
+                oled_off();
+                #endif
+                bootloader_jump();  // jump to bootloader
+            }
+            return false;
+
+        default:
+            break;
+    }
+
+    return true;
+}
+
+void matrix_init_kb(void) {
+    set_bitc_LED(LED_OFF);
+    matrix_init_remote_kb();
+    matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+    matrix_scan_remote_kb();
+    matrix_scan_user();
+}
diff --git a/keyboards/nullbitsco/tidbit/tidbit.h b/keyboards/nullbitsco/tidbit/tidbit.h
new file mode 100644
index 0000000000..e4e80107e3
--- /dev/null
+++ b/keyboards/nullbitsco/tidbit/tidbit.h
@@ -0,0 +1,37 @@
+/* Copyright 2021 Jay Greco
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define ___ KC_NO
+
+#include "quantum.h"
+#include "common/remote_kb.h"
+#include "common/bitc_led.h"
+
+#define LAYOUT( \
+                      K01, K02, K03, \
+    E1CCW, E1CW, K10, K11, K12, K13, \
+    E2CCW, E2CW, K20, K21, K22, K23, \
+    E3CCW, E3CW, K30, K31, K32, K33, \
+    E4CCW, E4CW, K40, K41, K42, K43  \
+) \
+{ \
+    { ___,   ___,  ___, K01, K02, K03 }, \
+    { E1CCW, E1CW, K10, K11, K12, K13 }, \
+    { E2CCW, E2CW, K20, K21, K22, K23 }, \
+    { E3CCW, E3CW, K30, K31, K32, K33 }, \
+    { E4CCW, E4CW, K40, K41, K42, K43 }  \
+}

From 417f08911507307906f1dfbdb45d9d3a81232576 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Wed, 16 Mar 2022 23:45:06 +0000
Subject: [PATCH 841/867] Print out generated files during build (#16672)

---
 builddefs/build_keyboard.mk | 20 +++++++++++++++-----
 builddefs/message.mk        |  1 +
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index d5efcb4193..44acd964cc 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -159,10 +159,14 @@ ifneq ("$(wildcard $(KEYMAP_JSON))", "")
 
 # Add rules to generate the keymap files - indentation here is important
 $(KEYMAP_OUTPUT)/src/keymap.c: $(KEYMAP_JSON)
-	$(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON)
+	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
+	$(eval CMD=$(QMK_BIN) json2c --quiet --output $(KEYMAP_C) $(KEYMAP_JSON))
+	@$(BUILD_CMD)
 
 $(KEYMAP_OUTPUT)/src/config.h: $(KEYMAP_JSON)
-	$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_H)
+	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
+	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --keymap $(KEYMAP) --output $(KEYMAP_H))
+	@$(BUILD_CMD)
 
 generated-files: $(KEYMAP_OUTPUT)/src/config.h $(KEYMAP_OUTPUT)/src/keymap.c
 
@@ -326,13 +330,19 @@ endif
 CONFIG_H += $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/layouts.h
 
 $(KEYBOARD_OUTPUT)/src/info_config.h: $(INFO_JSON_FILES)
-	$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h
+	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
+	$(eval CMD=$(QMK_BIN) generate-config-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/info_config.h)
+	@$(BUILD_CMD)
 
 $(KEYBOARD_OUTPUT)/src/default_keyboard.h: $(INFO_JSON_FILES)
-	$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h
+	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
+	$(eval CMD=$(QMK_BIN) generate-keyboard-h --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/default_keyboard.h)
+	@$(BUILD_CMD)
 
 $(KEYBOARD_OUTPUT)/src/layouts.h: $(INFO_JSON_FILES)
-	$(QMK_BIN) generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h
+	@$(SILENT) || printf "$(MSG_GENERATING) $@" | $(AWK_CMD)
+	$(eval CMD=$(QMK_BIN) generate-layouts --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/layouts.h)
+	@$(BUILD_CMD)
 
 generated-files: $(KEYBOARD_OUTPUT)/src/info_config.h $(KEYBOARD_OUTPUT)/src/default_keyboard.h $(KEYBOARD_OUTPUT)/src/layouts.h
 
diff --git a/builddefs/message.mk b/builddefs/message.mk
index d441f560be..07d0e07ce8 100644
--- a/builddefs/message.mk
+++ b/builddefs/message.mk
@@ -63,6 +63,7 @@ MSG_COMPILING_CXX = Compiling:
 MSG_ASSEMBLING = Assembling:
 MSG_CLEANING = Cleaning project:
 MSG_CREATING_LIBRARY = Creating library:
+MSG_GENERATING = Generating:
 MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR) Some git submodules are out of date or modified.\n\
 Please consider running $(BOLD)make git-submodule$(NO_COLOR).\n\n
 MSG_NO_CMP = $(ERROR_COLOR)Error:$(NO_COLOR)$(BOLD) cmp command not found, please install diffutils\n$(NO_COLOR)

From e5823b56501598c39d3f57719cf32f344212ede6 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 18 Mar 2022 01:09:29 +0000
Subject: [PATCH 842/867] [CLI] Add common util for dumping generated content
 (#16674)

---
 lib/python/qmk/cli/generate/config_h.py   | 18 ++-----
 lib/python/qmk/cli/generate/dfu_header.py | 18 ++-----
 lib/python/qmk/cli/generate/keyboard_h.py | 18 ++-----
 lib/python/qmk/cli/generate/layouts.py    | 19 ++-----
 lib/python/qmk/cli/generate/rules_mk.py   | 14 ++---
 lib/python/qmk/cli/generate/version_h.py  | 44 +++++++++++-----
 lib/python/qmk/commands.py                | 54 ++++++-------------
 lib/python/qmk/constants.py               | 63 +++++++++++++++++++++++
 8 files changed, 132 insertions(+), 116 deletions(-)

diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index 24bbbdf517..fdc76b23d4 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -9,7 +9,9 @@ from qmk.info import info_json
 from qmk.json_schema import json_load, validate
 from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.keymap import locate_keymap
+from qmk.commands import dump_lines
 from qmk.path import normpath
+from qmk.constants import GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
 
 
 def direct_pins(direct_pins, postfix):
@@ -181,7 +183,7 @@ def generate_config_h(cli):
         kb_info_json = dotty(info_json(cli.args.keyboard))
 
     # Build the info_config.h file.
-    config_h_lines = ['/* This file was generated by `qmk generate-config-h`. Do not edit or copy.', ' */', '', '#pragma once']
+    config_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once']
 
     generate_config_items(kb_info_json, config_h_lines)
 
@@ -194,16 +196,4 @@ def generate_config_h(cli):
         generate_split_config(kb_info_json, config_h_lines)
 
     # Show the results
-    config_h = '\n'.join(config_h_lines)
-
-    if cli.args.output:
-        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
-        if cli.args.output.exists():
-            cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
-        cli.args.output.write_text(config_h)
-
-        if not cli.args.quiet:
-            cli.log.info('Wrote info_config.h to %s.', cli.args.output)
-
-    else:
-        print(config_h)
+    dump_lines(cli.args.output, config_h_lines, cli.args.quiet)
diff --git a/lib/python/qmk/cli/generate/dfu_header.py b/lib/python/qmk/cli/generate/dfu_header.py
index 7fb585fc7d..e873117387 100644
--- a/lib/python/qmk/cli/generate/dfu_header.py
+++ b/lib/python/qmk/cli/generate/dfu_header.py
@@ -7,6 +7,8 @@ from qmk.decorators import automagic_keyboard
 from qmk.info import info_json
 from qmk.path import is_keyboard, normpath
 from qmk.keyboard import keyboard_completer
+from qmk.commands import dump_lines
+from qmk.constants import GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
 
 
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
@@ -30,7 +32,7 @@ def generate_dfu_header(cli):
     # Build the Keyboard.h file.
     kb_info_json = dotty(info_json(cli.config.generate_dfu_header.keyboard))
 
-    keyboard_h_lines = ['/* This file was generated by `qmk generate-dfu-header`. Do not edit or copy.', ' */', '', '#pragma once']
+    keyboard_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once']
     keyboard_h_lines.append(f'#define MANUFACTURER {kb_info_json["manufacturer"]}')
     keyboard_h_lines.append(f'#define PRODUCT {kb_info_json["keyboard_name"]} Bootloader')
 
@@ -45,16 +47,4 @@ def generate_dfu_header(cli):
         keyboard_h_lines.append(f'#define QMK_SPEAKER {kb_info_json["qmk_lufa_bootloader.speaker"]}')
 
     # Show the results
-    keyboard_h = '\n'.join(keyboard_h_lines)
-
-    if cli.args.output:
-        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
-        if cli.args.output.exists():
-            cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
-        cli.args.output.write_text(keyboard_h)
-
-        if not cli.args.quiet:
-            cli.log.info('Wrote Keyboard.h to %s.', cli.args.output)
-
-    else:
-        print(keyboard_h)
+    dump_lines(cli.args.output, keyboard_h_lines, cli.args.quiet)
diff --git a/lib/python/qmk/cli/generate/keyboard_h.py b/lib/python/qmk/cli/generate/keyboard_h.py
index f05178cede..2058865cbf 100755
--- a/lib/python/qmk/cli/generate/keyboard_h.py
+++ b/lib/python/qmk/cli/generate/keyboard_h.py
@@ -3,8 +3,10 @@
 from milc import cli
 
 from qmk.info import info_json
+from qmk.commands import dump_lines
 from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.path import normpath
+from qmk.constants import GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
 
 
 def would_populate_layout_h(keyboard):
@@ -36,22 +38,10 @@ def generate_keyboard_h(cli):
     has_layout_h = would_populate_layout_h(cli.args.keyboard)
 
     # Build the layouts.h file.
-    keyboard_h_lines = ['/* This file was generated by `qmk generate-keyboard-h`. Do not edit or copy.', ' */', '', '#pragma once', '#include "quantum.h"']
+    keyboard_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once', '#include "quantum.h"']
 
     if not has_layout_h:
         keyboard_h_lines.append('#pragma error("<keyboard>.h is only optional for data driven keyboards - kb.h == bad times")')
 
     # Show the results
-    keyboard_h = '\n'.join(keyboard_h_lines) + '\n'
-
-    if cli.args.output:
-        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
-        if cli.args.output.exists():
-            cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
-        cli.args.output.write_text(keyboard_h)
-
-        if not cli.args.quiet:
-            cli.log.info('Wrote keyboard_h to %s.', cli.args.output)
-
-    else:
-        print(keyboard_h)
+    dump_lines(cli.args.output, keyboard_h_lines, cli.args.quiet)
diff --git a/lib/python/qmk/cli/generate/layouts.py b/lib/python/qmk/cli/generate/layouts.py
index a21311bd49..193633baf6 100755
--- a/lib/python/qmk/cli/generate/layouts.py
+++ b/lib/python/qmk/cli/generate/layouts.py
@@ -2,11 +2,12 @@
 """
 from milc import cli
 
-from qmk.constants import COL_LETTERS, ROW_LETTERS
+from qmk.constants import COL_LETTERS, ROW_LETTERS, GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
 from qmk.decorators import automagic_keyboard, automagic_keymap
 from qmk.info import info_json
 from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.path import is_keyboard, normpath
+from qmk.commands import dump_lines
 
 usb_properties = {
     'vid': 'VENDOR_ID',
@@ -38,7 +39,7 @@ def generate_layouts(cli):
     kb_info_json = info_json(cli.config.generate_layouts.keyboard)
 
     # Build the layouts.h file.
-    layouts_h_lines = ['/* This file was generated by `qmk generate-layouts`. Do not edit or copy.', ' */', '', '#pragma once']
+    layouts_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once']
 
     if 'matrix_size' not in kb_info_json:
         cli.log.error('%s: Invalid matrix config.', cli.config.generate_layouts.keyboard)
@@ -86,16 +87,4 @@ def generate_layouts(cli):
         layouts_h_lines.append('#endif')
 
     # Show the results
-    layouts_h = '\n'.join(layouts_h_lines) + '\n'
-
-    if cli.args.output:
-        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
-        if cli.args.output.exists():
-            cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
-        cli.args.output.write_text(layouts_h)
-
-        if not cli.args.quiet:
-            cli.log.info('Wrote info_config.h to %s.', cli.args.output)
-
-    else:
-        print(layouts_h)
+    dump_lines(cli.args.output, layouts_h_lines, cli.args.quiet)
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py
index ce824f6378..29a1130f99 100755
--- a/lib/python/qmk/cli/generate/rules_mk.py
+++ b/lib/python/qmk/cli/generate/rules_mk.py
@@ -9,7 +9,9 @@ from qmk.info import info_json
 from qmk.json_schema import json_load, validate
 from qmk.keyboard import keyboard_completer, keyboard_folder
 from qmk.keymap import locate_keymap
+from qmk.commands import dump_lines
 from qmk.path import normpath
+from qmk.constants import GPL2_HEADER_SH_LIKE, GENERATED_HEADER_SH_LIKE
 
 
 def process_mapping_rule(kb_info_json, rules_key, info_dict):
@@ -55,7 +57,7 @@ def generate_rules_mk(cli):
         kb_info_json = dotty(info_json(cli.args.keyboard))
 
     info_rules_map = json_load(Path('data/mappings/info_rules.json'))
-    rules_mk_lines = ['# This file was generated by `qmk generate-rules-mk`. Do not edit or copy.', '']
+    rules_mk_lines = [GPL2_HEADER_SH_LIKE, GENERATED_HEADER_SH_LIKE]
 
     # Iterate through the info_rules map to generate basic rules
     for rules_key, info_dict in info_rules_map.items():
@@ -83,14 +85,9 @@ def generate_rules_mk(cli):
             rules_mk_lines.append('CUSTOM_MATRIX ?= yes')
 
     # Show the results
-    rules_mk = '\n'.join(rules_mk_lines) + '\n'
+    dump_lines(cli.args.output, rules_mk_lines)
 
     if cli.args.output:
-        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
-        if cli.args.output.exists():
-            cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
-        cli.args.output.write_text(rules_mk)
-
         if cli.args.quiet:
             if cli.args.escape:
                 print(cli.args.output.as_posix().replace(' ', '\\ '))
@@ -98,6 +95,3 @@ def generate_rules_mk(cli):
                 print(cli.args.output)
         else:
             cli.log.info('Wrote rules.mk to %s.', cli.args.output)
-
-    else:
-        print(rules_mk)
diff --git a/lib/python/qmk/cli/generate/version_h.py b/lib/python/qmk/cli/generate/version_h.py
index 69341e36f0..be9646748e 100644
--- a/lib/python/qmk/cli/generate/version_h.py
+++ b/lib/python/qmk/cli/generate/version_h.py
@@ -1,9 +1,15 @@
 """Used by the make system to generate version.h for use in code.
 """
+from time import strftime
+
 from milc import cli
 
-from qmk.commands import create_version_h
 from qmk.path import normpath
+from qmk.commands import dump_lines
+from qmk.commands import get_git_version
+from qmk.constants import GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
+
+TIME_FMT = '%Y-%m-%d-%H:%M:%S'
 
 
 @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to')
@@ -17,15 +23,29 @@ def generate_version_h(cli):
     if cli.args.skip_all:
         cli.args.skip_git = True
 
-    version_h = create_version_h(cli.args.skip_git, cli.args.skip_all)
-
-    if cli.args.output:
-        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
-        if cli.args.output.exists():
-            cli.args.output.replace(cli.args.output.parent / (cli.args.output.name + '.bak'))
-        cli.args.output.write_text(version_h)
-
-        if not cli.args.quiet:
-            cli.log.info('Wrote version.h to %s.', cli.args.output)
+    if cli.args.skip_all:
+        current_time = "1970-01-01-00:00:00"
     else:
-        print(version_h)
+        current_time = strftime(TIME_FMT)
+
+    if cli.args.skip_git:
+        git_version = "NA"
+        chibios_version = "NA"
+        chibios_contrib_version = "NA"
+    else:
+        git_version = get_git_version(current_time)
+        chibios_version = get_git_version(current_time, "chibios", "os")
+        chibios_contrib_version = get_git_version(current_time, "chibios-contrib", "os")
+
+    # Build the version.h file.
+    version_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once']
+
+    version_h_lines.append(f"""
+#define QMK_VERSION "{git_version}"
+#define QMK_BUILDDATE "{current_time}"
+#define CHIBIOS_VERSION "{chibios_version}"
+#define CHIBIOS_CONTRIB_VERSION "{chibios_contrib_version}"
+""")
+
+    # Show the results
+    dump_lines(cli.args.output, version_h_lines, cli.args.quiet)
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index e38f17156a..44bd97d9be 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -5,7 +5,6 @@ import sys
 import shutil
 from pathlib import Path
 from subprocess import DEVNULL
-from time import strftime
 
 from milc import cli
 import jsonschema
@@ -14,8 +13,6 @@ import qmk.keymap
 from qmk.constants import QMK_FIRMWARE, KEYBOARD_OUTPUT_PREFIX
 from qmk.json_schema import json_load, validate
 
-time_fmt = '%Y-%m-%d-%H:%M:%S'
-
 
 def _find_make():
     """Returns the correct make command for this environment.
@@ -136,37 +133,6 @@ def get_make_parallel_args(parallel=1):
     return parallel_args
 
 
-def create_version_h(skip_git=False, skip_all=False):
-    """Generate version.h contents
-    """
-    if skip_all:
-        current_time = "1970-01-01-00:00:00"
-    else:
-        current_time = strftime(time_fmt)
-
-    if skip_git:
-        git_version = "NA"
-        chibios_version = "NA"
-        chibios_contrib_version = "NA"
-    else:
-        git_version = get_git_version(current_time)
-        chibios_version = get_git_version(current_time, "chibios", "os")
-        chibios_contrib_version = get_git_version(current_time, "chibios-contrib", "os")
-
-    version_h_lines = f"""/* This file was automatically generated. Do not edit or copy.
- */
-
-#pragma once
-
-#define QMK_VERSION "{git_version}"
-#define QMK_BUILDDATE "{current_time}"
-#define CHIBIOS_VERSION "{chibios_version}"
-#define CHIBIOS_CONTRIB_VERSION "{chibios_contrib_version}"
-"""
-
-    return version_h_lines
-
-
 def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_vars):
     """Convert a configurator export JSON file into a C file and then compile it.
 
@@ -201,9 +167,6 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va
     keymap_dir.mkdir(exist_ok=True, parents=True)
     keymap_c.write_text(c_text)
 
-    version_h = Path('quantum/version.h')
-    version_h.write_text(create_version_h())
-
     # Return a command that can be run to make the keymap and flash if given
     verbose = 'true' if cli.config.general.verbose else 'false'
     color = 'true' if cli.config.general.color else 'false'
@@ -357,3 +320,20 @@ def in_virtualenv():
     """
     active_prefix = getattr(sys, "base_prefix", None) or getattr(sys, "real_prefix", None) or sys.prefix
     return active_prefix != sys.prefix
+
+
+def dump_lines(output_file, lines, quiet=True):
+    """Handle dumping to stdout or file
+    Creates parent folders if required
+    """
+    generated = '\n'.join(lines) + '\n'
+    if output_file and output_file.name != '-':
+        output_file.parent.mkdir(parents=True, exist_ok=True)
+        if output_file.exists():
+            output_file.replace(output_file.parent / (output_file.name + '.bak'))
+        output_file.write_text(generated)
+
+        if not quiet:
+            cli.log.info(f'Wrote {output_file.name} to {output_file}.')
+    else:
+        print(generated)
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py
index e4b699cdb1..6956b70772 100644
--- a/lib/python/qmk/constants.py
+++ b/lib/python/qmk/constants.py
@@ -1,6 +1,7 @@
 """Information that should be available to the python library.
 """
 from os import environ
+from datetime import date
 from pathlib import Path
 
 # The root of the qmk_firmware tree.
@@ -75,3 +76,65 @@ LED_INDICATORS = {
 # Constants that should match their counterparts in make
 BUILD_DIR = environ.get('BUILD_DIR', '.build')
 KEYBOARD_OUTPUT_PREFIX = f'{BUILD_DIR}/obj_'
+
+# Headers for generated files
+GPL2_HEADER_C_LIKE = f'''\
+// Copyright {date.today().year} QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+'''
+
+GPL2_HEADER_SH_LIKE = f'''\
+# Copyright {date.today().year} QMK
+# SPDX-License-Identifier: GPL-2.0-or-later
+'''
+
+GENERATED_HEADER_C_LIKE = '''\
+/*******************************************************************************
+  88888888888 888      d8b                .d888 d8b 888               d8b
+      888     888      Y8P               d88P"  Y8P 888               Y8P
+      888     888                        888        888
+      888     88888b.  888 .d8888b       888888 888 888  .d88b.       888 .d8888b
+      888     888 "88b 888 88K           888    888 888 d8P  Y8b      888 88K
+      888     888  888 888 "Y8888b.      888    888 888 88888888      888 "Y8888b.
+      888     888  888 888      X88      888    888 888 Y8b.          888      X88
+      888     888  888 888  88888P'      888    888 888  "Y8888       888  88888P'
+                                                        888                 888
+                                                        888                 888
+                                                        888                 888
+     .d88b.   .d88b.  88888b.   .d88b.  888d888 8888b.  888888 .d88b.   .d88888
+    d88P"88b d8P  Y8b 888 "88b d8P  Y8b 888P"      "88b 888   d8P  Y8b d88" 888
+    888  888 88888888 888  888 88888888 888    .d888888 888   88888888 888  888
+    Y88b 888 Y8b.     888  888 Y8b.     888    888  888 Y88b. Y8b.     Y88b 888
+     "Y88888  "Y8888  888  888  "Y8888  888    "Y888888  "Y888 "Y8888   "Y88888
+         888
+    Y8b d88P
+     "Y88P"
+*******************************************************************************/
+'''
+
+GENERATED_HEADER_SH_LIKE = '''\
+################################################################################
+#
+# 88888888888 888      d8b                .d888 d8b 888               d8b
+#     888     888      Y8P               d88P"  Y8P 888               Y8P
+#     888     888                        888        888
+#     888     88888b.  888 .d8888b       888888 888 888  .d88b.       888 .d8888b
+#     888     888 "88b 888 88K           888    888 888 d8P  Y8b      888 88K
+#     888     888  888 888 "Y8888b.      888    888 888 88888888      888 "Y8888b.
+#     888     888  888 888      X88      888    888 888 Y8b.          888      X88
+#     888     888  888 888  88888P'      888    888 888  "Y8888       888  88888P'
+#
+#                                                       888                 888
+#                                                       888                 888
+#                                                       888                 888
+#    .d88b.   .d88b.  88888b.   .d88b.  888d888 8888b.  888888 .d88b.   .d88888
+#   d88P"88b d8P  Y8b 888 "88b d8P  Y8b 888P"      "88b 888   d8P  Y8b d88" 888
+#   888  888 88888888 888  888 88888888 888    .d888888 888   88888888 888  888
+#   Y88b 888 Y8b.     888  888 Y8b.     888    888  888 Y88b. Y8b.     Y88b 888
+#    "Y88888  "Y8888  888  888  "Y8888  888    "Y888888  "Y888 "Y8888   "Y88888
+#        888
+#   Y8b d88P
+#    "Y88P"
+#
+################################################################################
+'''

From ed773ab73cab83b842dc62ff94ffb337ec66a5f3 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 18 Mar 2022 16:02:24 +0000
Subject: [PATCH 843/867] Relocate CLI git interactions (#16682)

---
 lib/python/qmk/cli/doctor/check.py       |  12 ---
 lib/python/qmk/cli/doctor/main.py        |   3 +-
 lib/python/qmk/cli/generate/version_h.py |   8 +-
 lib/python/qmk/cli/new/keyboard.py       |   2 +-
 lib/python/qmk/commands.py               | 105 +---------------------
 lib/python/qmk/git.py                    | 110 +++++++++++++++++++++++
 6 files changed, 118 insertions(+), 122 deletions(-)
 create mode 100644 lib/python/qmk/git.py

diff --git a/lib/python/qmk/cli/doctor/check.py b/lib/python/qmk/cli/doctor/check.py
index 2d691b64b0..8a0422ba72 100644
--- a/lib/python/qmk/cli/doctor/check.py
+++ b/lib/python/qmk/cli/doctor/check.py
@@ -7,7 +7,6 @@ from subprocess import DEVNULL
 
 from milc import cli
 from qmk import submodules
-from qmk.constants import QMK_FIRMWARE
 
 
 class CheckStatus(Enum):
@@ -150,14 +149,3 @@ def is_executable(command):
 
     cli.log.error("{fg_red}Can't run `%s %s`", command, version_arg)
     return False
-
-
-def check_git_repo():
-    """Checks that the .git directory exists inside QMK_HOME.
-
-    This is a decent enough indicator that the qmk_firmware directory is a
-    proper Git repository, rather than a .zip download from GitHub.
-    """
-    dot_git = QMK_FIRMWARE / '.git'
-
-    return CheckStatus.OK if dot_git.exists() else CheckStatus.WARNING
diff --git a/lib/python/qmk/cli/doctor/main.py b/lib/python/qmk/cli/doctor/main.py
index 2e5e221e8f..2898a9894c 100755
--- a/lib/python/qmk/cli/doctor/main.py
+++ b/lib/python/qmk/cli/doctor/main.py
@@ -11,7 +11,8 @@ from milc.questions import yesno
 from qmk import submodules
 from qmk.constants import QMK_FIRMWARE, QMK_FIRMWARE_UPSTREAM
 from .check import CheckStatus, check_binaries, check_binary_versions, check_submodules
-from qmk.commands import git_check_repo, git_get_branch, git_get_tag, git_is_dirty, git_get_remotes, git_check_deviation, in_virtualenv
+from qmk.git import git_check_repo, git_get_branch, git_get_tag, git_is_dirty, git_get_remotes, git_check_deviation
+from qmk.commands import in_virtualenv
 
 
 def os_tests():
diff --git a/lib/python/qmk/cli/generate/version_h.py b/lib/python/qmk/cli/generate/version_h.py
index be9646748e..a75702c529 100644
--- a/lib/python/qmk/cli/generate/version_h.py
+++ b/lib/python/qmk/cli/generate/version_h.py
@@ -6,7 +6,7 @@ from milc import cli
 
 from qmk.path import normpath
 from qmk.commands import dump_lines
-from qmk.commands import get_git_version
+from qmk.git import git_get_version
 from qmk.constants import GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE
 
 TIME_FMT = '%Y-%m-%d-%H:%M:%S'
@@ -33,9 +33,9 @@ def generate_version_h(cli):
         chibios_version = "NA"
         chibios_contrib_version = "NA"
     else:
-        git_version = get_git_version(current_time)
-        chibios_version = get_git_version(current_time, "chibios", "os")
-        chibios_contrib_version = get_git_version(current_time, "chibios-contrib", "os")
+        git_version = git_get_version() or current_time
+        chibios_version = git_get_version("chibios", "os") or current_time
+        chibios_contrib_version = git_get_version("chibios-contrib", "os") or current_time
 
     # Build the version.h file.
     version_h_lines = [GPL2_HEADER_C_LIKE, GENERATED_HEADER_C_LIKE, '#pragma once']
diff --git a/lib/python/qmk/cli/new/keyboard.py b/lib/python/qmk/cli/new/keyboard.py
index 6fa9ad5b2c..1cdfe53206 100644
--- a/lib/python/qmk/cli/new/keyboard.py
+++ b/lib/python/qmk/cli/new/keyboard.py
@@ -10,7 +10,7 @@ from dotty_dict import dotty
 from milc import cli
 from milc.questions import choice, question
 
-from qmk.commands import git_get_username
+from qmk.git import git_get_username
 from qmk.json_schema import load_jsonschema
 from qmk.path import keyboard
 from qmk.json_encoders import InfoJSONEncoder
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py
index 44bd97d9be..d0bd00beb7 100644
--- a/lib/python/qmk/commands.py
+++ b/lib/python/qmk/commands.py
@@ -4,13 +4,12 @@ import os
 import sys
 import shutil
 from pathlib import Path
-from subprocess import DEVNULL
 
 from milc import cli
 import jsonschema
 
 import qmk.keymap
-from qmk.constants import QMK_FIRMWARE, KEYBOARD_OUTPUT_PREFIX
+from qmk.constants import KEYBOARD_OUTPUT_PREFIX
 from qmk.json_schema import json_load, validate
 
 
@@ -90,31 +89,6 @@ def create_make_command(keyboard, keymap, target=None, dry_run=False, parallel=1
     return create_make_target(':'.join(make_args), dry_run=dry_run, parallel=parallel, **env_vars)
 
 
-def get_git_version(current_time, repo_dir='.', check_dir='.'):
-    """Returns the current git version for a repo, or the current time.
-    """
-    git_describe_cmd = ['git', 'describe', '--abbrev=6', '--dirty', '--always', '--tags']
-
-    if repo_dir != '.':
-        repo_dir = Path('lib') / repo_dir
-
-    if check_dir != '.':
-        check_dir = repo_dir / check_dir
-
-    if Path(check_dir).exists():
-        git_describe = cli.run(git_describe_cmd, stdin=DEVNULL, cwd=repo_dir)
-
-        if git_describe.returncode == 0:
-            return git_describe.stdout.strip()
-
-        else:
-            cli.log.warn(f'"{" ".join(git_describe_cmd)}" returned error code {git_describe.returncode}')
-            print(git_describe.stderr)
-            return current_time
-
-    return current_time
-
-
 def get_make_parallel_args(parallel=1):
     """Returns the arguments for running the specified number of parallel jobs.
     """
@@ -237,83 +211,6 @@ def parse_configurator_json(configurator_file):
     return user_keymap
 
 
-def git_get_username():
-    """Retrieves user's username from Git config, if set.
-    """
-    git_username = cli.run(['git', 'config', '--get', 'user.name'])
-
-    if git_username.returncode == 0 and git_username.stdout:
-        return git_username.stdout.strip()
-
-
-def git_check_repo():
-    """Checks that the .git directory exists inside QMK_HOME.
-
-    This is a decent enough indicator that the qmk_firmware directory is a
-    proper Git repository, rather than a .zip download from GitHub.
-    """
-    dot_git_dir = QMK_FIRMWARE / '.git'
-
-    return dot_git_dir.is_dir()
-
-
-def git_get_branch():
-    """Returns the current branch for a repo, or None.
-    """
-    git_branch = cli.run(['git', 'branch', '--show-current'])
-    if not git_branch.returncode != 0 or not git_branch.stdout:
-        # Workaround for Git pre-2.22
-        git_branch = cli.run(['git', 'rev-parse', '--abbrev-ref', 'HEAD'])
-
-    if git_branch.returncode == 0:
-        return git_branch.stdout.strip()
-
-
-def git_get_tag():
-    """Returns the current tag for a repo, or None.
-    """
-    git_tag = cli.run(['git', 'describe', '--abbrev=0', '--tags'])
-    if git_tag.returncode == 0:
-        return git_tag.stdout.strip()
-
-
-def git_is_dirty():
-    """Returns 1 if repo is dirty, or 0 if clean
-    """
-    git_diff_staged_cmd = ['git', 'diff', '--quiet']
-    git_diff_unstaged_cmd = [*git_diff_staged_cmd, '--cached']
-
-    unstaged = cli.run(git_diff_staged_cmd)
-    staged = cli.run(git_diff_unstaged_cmd)
-
-    return unstaged.returncode != 0 or staged.returncode != 0
-
-
-def git_get_remotes():
-    """Returns the current remotes for a repo.
-    """
-    remotes = {}
-
-    git_remote_show_cmd = ['git', 'remote', 'show']
-    git_remote_get_cmd = ['git', 'remote', 'get-url']
-
-    git_remote_show = cli.run(git_remote_show_cmd)
-    if git_remote_show.returncode == 0:
-        for name in git_remote_show.stdout.splitlines():
-            git_remote_name = cli.run([*git_remote_get_cmd, name])
-            remotes[name.strip()] = {"url": git_remote_name.stdout.strip()}
-
-    return remotes
-
-
-def git_check_deviation(active_branch):
-    """Return True if branch has custom commits
-    """
-    cli.run(['git', 'fetch', 'upstream', active_branch])
-    deviations = cli.run(['git', '--no-pager', 'log', f'upstream/{active_branch}...{active_branch}'])
-    return bool(deviations.returncode)
-
-
 def in_virtualenv():
     """Check if running inside a virtualenv.
     Based on https://stackoverflow.com/a/1883251
diff --git a/lib/python/qmk/git.py b/lib/python/qmk/git.py
new file mode 100644
index 0000000000..beeb689144
--- /dev/null
+++ b/lib/python/qmk/git.py
@@ -0,0 +1,110 @@
+"""Functions for working with the QMK repo.
+"""
+from subprocess import DEVNULL
+from pathlib import Path
+
+from milc import cli
+
+from qmk.constants import QMK_FIRMWARE
+
+
+def git_get_version(repo_dir='.', check_dir='.'):
+    """Returns the current git version for a repo, or None.
+    """
+    git_describe_cmd = ['git', 'describe', '--abbrev=6', '--dirty', '--always', '--tags']
+
+    if repo_dir != '.':
+        repo_dir = Path('lib') / repo_dir
+
+    if check_dir != '.':
+        check_dir = repo_dir / check_dir
+
+    if Path(check_dir).exists():
+        git_describe = cli.run(git_describe_cmd, stdin=DEVNULL, cwd=repo_dir)
+
+        if git_describe.returncode == 0:
+            return git_describe.stdout.strip()
+
+        else:
+            cli.log.warn(f'"{" ".join(git_describe_cmd)}" returned error code {git_describe.returncode}')
+            print(git_describe.stderr)
+            return None
+
+    return None
+
+
+def git_get_username():
+    """Retrieves user's username from Git config, if set.
+    """
+    git_username = cli.run(['git', 'config', '--get', 'user.name'])
+
+    if git_username.returncode == 0 and git_username.stdout:
+        return git_username.stdout.strip()
+
+
+def git_get_branch():
+    """Returns the current branch for a repo, or None.
+    """
+    git_branch = cli.run(['git', 'branch', '--show-current'])
+    if not git_branch.returncode != 0 or not git_branch.stdout:
+        # Workaround for Git pre-2.22
+        git_branch = cli.run(['git', 'rev-parse', '--abbrev-ref', 'HEAD'])
+
+    if git_branch.returncode == 0:
+        return git_branch.stdout.strip()
+
+
+def git_get_tag():
+    """Returns the current tag for a repo, or None.
+    """
+    git_tag = cli.run(['git', 'describe', '--abbrev=0', '--tags'])
+    if git_tag.returncode == 0:
+        return git_tag.stdout.strip()
+
+
+def git_get_remotes():
+    """Returns the current remotes for a repo.
+    """
+    remotes = {}
+
+    git_remote_show_cmd = ['git', 'remote', 'show']
+    git_remote_get_cmd = ['git', 'remote', 'get-url']
+
+    git_remote_show = cli.run(git_remote_show_cmd)
+    if git_remote_show.returncode == 0:
+        for name in git_remote_show.stdout.splitlines():
+            git_remote_name = cli.run([*git_remote_get_cmd, name])
+            remotes[name.strip()] = {"url": git_remote_name.stdout.strip()}
+
+    return remotes
+
+
+def git_is_dirty():
+    """Returns 1 if repo is dirty, or 0 if clean
+    """
+    git_diff_staged_cmd = ['git', 'diff', '--quiet']
+    git_diff_unstaged_cmd = [*git_diff_staged_cmd, '--cached']
+
+    unstaged = cli.run(git_diff_staged_cmd)
+    staged = cli.run(git_diff_unstaged_cmd)
+
+    return unstaged.returncode != 0 or staged.returncode != 0
+
+
+def git_check_repo():
+    """Checks that the .git directory exists inside QMK_HOME.
+
+    This is a decent enough indicator that the qmk_firmware directory is a
+    proper Git repository, rather than a .zip download from GitHub.
+    """
+    dot_git_dir = QMK_FIRMWARE / '.git'
+
+    return dot_git_dir.is_dir()
+
+
+def git_check_deviation(active_branch):
+    """Return True if branch has custom commits
+    """
+    cli.run(['git', 'fetch', 'upstream', active_branch])
+    deviations = cli.run(['git', '--no-pager', 'log', f'upstream/{active_branch}...{active_branch}'])
+    return bool(deviations.returncode)

From 773242503ca7e12f7a77a588789640d0dbde8c04 Mon Sep 17 00:00:00 2001
From: Florian <Metaln00b@web.de>
Date: Fri, 18 Mar 2022 18:24:43 +0100
Subject: [PATCH 844/867] annepro2: Add more LED functionalities to
 default-layer-indicators (#16676)

---
 keyboards/annepro2/annepro2.c                            | 9 +++++++++
 keyboards/annepro2/annepro2.h                            | 1 +
 .../annepro2/keymaps/default-layer-indicators/keymap.c   | 9 +++++++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/keyboards/annepro2/annepro2.c b/keyboards/annepro2/annepro2.c
index 8767265315..0f49f93104 100644
--- a/keyboards/annepro2/annepro2.c
+++ b/keyboards/annepro2/annepro2.c
@@ -192,6 +192,15 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
                 ap2_led_reset_foreground_color();
                 break;
 
+            case KC_AP_LED_TOG:
+                if (ap2_led_status.matrix_enabled) {
+                    ap2_led_disable();
+                } else {
+                    ap2_led_enable();
+                    ap2_led_reset_foreground_color();
+                }
+                break;
+
             case KC_AP_LED_NEXT_PROFILE:
                 ap2_led_next_profile();
                 ap2_led_reset_foreground_color();
diff --git a/keyboards/annepro2/annepro2.h b/keyboards/annepro2/annepro2.h
index 1b5933f577..143904b6ad 100644
--- a/keyboards/annepro2/annepro2.h
+++ b/keyboards/annepro2/annepro2.h
@@ -53,6 +53,7 @@ enum AP2KeyCodes {
     KC_AP2_USB,
     KC_AP_LED_ON,
     KC_AP_LED_OFF,
+    KC_AP_LED_TOG,
     KC_AP_LED_NEXT_PROFILE,
     KC_AP_LED_PREV_PROFILE,
     KC_AP_LED_NEXT_INTENSITY,
diff --git a/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c b/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
index 405769466a..1fd97c584e 100644
--- a/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
+++ b/keyboards/annepro2/keymaps/default-layer-indicators/keymap.c
@@ -83,7 +83,7 @@ enum anne_pro_layers {
   /*
   * Layer FN2
   * ,-----------------------------------------------------------------------------------------.
-  * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 |  F7 |LEDOF|LEDON| F10 | F11 | F12 |    Bksp   |
+  * |  ~  | BT1 | BT2 | BT3 | BT4 |  F5 |  F6 |  F7 |  F8 |LEDTG|LEDI+|LEDPV|LEDNX|    Bksp   |
   * |-----------------------------------------------------------------------------------------+
   * | Tab    |  q  | UP  |  e  |  r  |  t  |  y  |  u  |  i  |  o  | PS | HOME | END |   \    |
   * |-----------------------------------------------------------------------------------------+
@@ -96,7 +96,7 @@ enum anne_pro_layers {
   *
   */
  [FN2] = LAYOUT_60_ansi( /* FN2 */
-    _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, KC_AP_LED_OFF, KC_AP_LED_ON, _______, _______, _______, _______,
+    _______, KC_AP2_BT1, KC_AP2_BT2, KC_AP2_BT3, KC_AP2_BT4, _______, _______, _______, _______, KC_AP_LED_TOG, KC_AP_LED_NEXT_INTENSITY, KC_AP_LED_PREV_PROFILE, KC_AP_LED_NEXT_PROFILE, _______,
     MO(FN2), _______,    KC_UP,      _______,    _______,    _______, _______, _______, _______, _______, KC_PSCR, KC_HOME, KC_END,  _______,
     _______, KC_LEFT,    KC_DOWN,    KC_RGHT,    _______,    _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,
     _______,             _______,    _______,    _______,    _______, _______, _______, _______, _______, KC_INS,  KC_DEL,  _______,
@@ -105,6 +105,11 @@ enum anne_pro_layers {
 };
 // clang-format on
 
+void keyboard_post_init_user(void) {
+    ap2_led_enable();
+    ap2_led_set_profile(7);
+}
+
 layer_state_t layer_state_set_user(layer_state_t state) {
     switch (get_highest_layer(state)) {
         case FN1:

From 61c644f6d00cc107e9079aa5e87716174ad77d44 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 18 Mar 2022 11:49:22 -0700
Subject: [PATCH 845/867] [Keyboard] Update Tractyl Manuform config files
 (#16684)

---
 .../tractyl_manuform/5x6_right/f411/chconf.h  | 38 -------------------
 .../tractyl_manuform/5x6_right/f411/config.h  |  8 ----
 2 files changed, 46 deletions(-)
 delete mode 100644 keyboards/handwired/tractyl_manuform/5x6_right/f411/chconf.h

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/chconf.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/chconf.h
deleted file mode 100644
index 8b55eaeef0..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/chconf.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2020 QMK
- *
- * 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/>.
- */
-
-/*
- * This file was auto-generated by:
- *    `qmk chibios-confmigrate -i keyboards/handwired/onekey/blackpill_f411/chconf.h -r platforms/chibios/common/configs/chconf.h`
- */
-
-#pragma once
-
-#define CH_CFG_ST_FREQUENCY 10000
-
-#define CH_CFG_FACTORY_OBJECTS_REGISTRY TRUE
-
-#define CH_CFG_FACTORY_GENERIC_BUFFERS TRUE
-
-#define CH_CFG_FACTORY_SEMAPHORES TRUE
-
-#define CH_CFG_FACTORY_MAILBOXES TRUE
-
-#define CH_CFG_FACTORY_OBJ_FIFOS TRUE
-
-#define CH_CFG_FACTORY_PIPES TRUE
-
-#include_next <chconf.h>
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 87c3239057..6f19332a62 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -100,14 +100,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* eeprom config */
 #define EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN A4
 #define EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR    64
-// #define EXTERNAL_EEPROM_BYTE_COUNT           8196
-// #define EXTERNAL_EEPROM_PAGE_SIZE            32
-// #define EXTERNAL_EEPROM_ADDRESS_SIZE         2
-// #define DEBUG_EEPROM_OUTPUT
-
-#ifdef EEPROM_SPI
-#    define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 8195
-#endif
 
 /* pmw3360 config  */
 #define PMW3360_CS_PIN                       B0

From 06b6729b168334c6496288acf6734aa586d335e2 Mon Sep 17 00:00:00 2001
From: stanrc85 <47038504+stanrc85@users.noreply.github.com>
Date: Sat, 19 Mar 2022 02:52:33 -0400
Subject: [PATCH 846/867] [Keymap] Update some code and keyboard rules (#16680)

---
 users/stanrc85/config.h   | 6 ++++++
 users/stanrc85/rules.mk   | 4 +++-
 users/stanrc85/stanrc85.c | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/users/stanrc85/config.h b/users/stanrc85/config.h
index b883a21dd2..e12beedb90 100644
--- a/users/stanrc85/config.h
+++ b/users/stanrc85/config.h
@@ -15,6 +15,12 @@
   #define INDICATOR_PIN_2 D4
 #endif
 
+#ifdef KEYBOARD_mechlovin_adelais_standard_led_arm_rev4_stm32f303
+  #define INDICATOR_PIN_0 B2
+  #define INDICATOR_PIN_1 C15
+  #define INDICATOR_PIN_2 B9
+#endif
+
 #ifdef KEYBOARD_boardsource_the_mark
   #define RGB_MATRIX_KEYPRESSES
 #endif
diff --git a/users/stanrc85/rules.mk b/users/stanrc85/rules.mk
index 16cf1ace5d..94f4027b96 100644
--- a/users/stanrc85/rules.mk
+++ b/users/stanrc85/rules.mk
@@ -36,8 +36,10 @@ ifeq ($(strip $(KEYBOARD)), jacky_studio/bear_65)
 endif
 ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/rgb_led/rev2)
   SRC += rgb_layers.c
+  SRC += rgb_timeout.c
 endif
 ifeq ($(strip $(KEYBOARD)), mechlovin/adelais/standard_led/arm/rev4/stm32f303)
+  OPT_DEFS += -DHAS_INDICATORS
   SRC += rgb_timeout.c
-  SRC += layer_rgb.c
+  SRC += indicator_layers_sneakbox.c
 endif
diff --git a/users/stanrc85/stanrc85.c b/users/stanrc85/stanrc85.c
index f8555d87bd..56e67e52b1 100644
--- a/users/stanrc85/stanrc85.c
+++ b/users/stanrc85/stanrc85.c
@@ -68,7 +68,7 @@ void lock_unlock (qk_tap_dance_state_t *state, void *user_data) {
     tap_code16(KC_CAD);
     #if defined(HAS_INDICATORS)
       led_user = 0;
-      #if defined(KEYBOARD_sneakbox_aliceclone)
+      #if defined(KEYBOARD_sneakbox_aliceclone) || defined(KEYBOARD_mechlovin_adelais_standard_led_arm_rev4_stm32f303)
         led_user = 1;
       #endif
       writePin(INDICATOR_PIN_0, !led_user);
@@ -84,7 +84,7 @@ void lock_unlock (qk_tap_dance_state_t *state, void *user_data) {
     tap_code16(KC_LOCK);
     #if defined(HAS_INDICATORS)
       led_user = 1;
-      #if defined(KEYBOARD_sneakbox_aliceclone)
+      #if defined(KEYBOARD_sneakbox_aliceclone) || defined(KEYBOARD_mechlovin_adelais_standard_led_arm_rev4_stm32f303)
         led_user = 0;
       #endif
       writePin(INDICATOR_PIN_2, !led_user);

From e354cbe7820cec45f0514de930ba60b3c19cb290 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 19 Mar 2022 22:52:40 +1100
Subject: [PATCH 847/867] `device_ver` -> `device_version` for some more boards
 (#16685)

---
 keyboards/dyz/dyz40/info.json                 | 2 +-
 keyboards/dyz/dyz_tkl/info.json               | 2 +-
 keyboards/dyz/selka40/info.json               | 2 +-
 keyboards/dyz/synthesis60/info.json           | 2 +-
 keyboards/handwired/3dortho14u/rev1/info.json | 4 ++--
 keyboards/handwired/3dortho14u/rev2/info.json | 4 ++--
 keyboards/handwired/baredev/rev1/info.json    | 2 +-
 keyboards/handwired/hillside/0_1/info.json    | 2 +-
 keyboards/handwired/pytest/info.json          | 2 +-
 keyboards/handwired/wakizashi40/info.json     | 4 ++--
 keyboards/karlb/kbic65/info.json              | 2 +-
 keyboards/splitography/info.json              | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/keyboards/dyz/dyz40/info.json b/keyboards/dyz/dyz40/info.json
index 2a30ca0bb2..db525a4707 100644
--- a/keyboards/dyz/dyz40/info.json
+++ b/keyboards/dyz/dyz40/info.json
@@ -20,7 +20,7 @@
     "usb": {
         "vid": "0xD772",
         "pid": "0x000B",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/dyz/dyz_tkl/info.json b/keyboards/dyz/dyz_tkl/info.json
index 8cba9c24e7..07a1a7cb7b 100644
--- a/keyboards/dyz/dyz_tkl/info.json
+++ b/keyboards/dyz/dyz_tkl/info.json
@@ -17,7 +17,7 @@
     "usb": {
         "vid": "0xD772",
         "pid": "0x000C",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/dyz/selka40/info.json b/keyboards/dyz/selka40/info.json
index b947bbb59a..740eb0d5f1 100644
--- a/keyboards/dyz/selka40/info.json
+++ b/keyboards/dyz/selka40/info.json
@@ -20,7 +20,7 @@
     "usb": {
         "vid": "0xD772",
         "pid": "0x0012",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/info.json
index 381e7efb36..c0d9baf560 100644
--- a/keyboards/dyz/synthesis60/info.json
+++ b/keyboards/dyz/synthesis60/info.json
@@ -35,7 +35,7 @@
     "usb": {
         "vid": "0xD772",
         "pid": "0x0017",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/handwired/3dortho14u/rev1/info.json b/keyboards/handwired/3dortho14u/rev1/info.json
index 72ed95e5f4..bd9220281c 100644
--- a/keyboards/handwired/3dortho14u/rev1/info.json
+++ b/keyboards/handwired/3dortho14u/rev1/info.json
@@ -28,9 +28,9 @@
       "rows": ["B0", "B1", "B2", "B3", "B7"]
     },
     "usb": {
-      "device_ver": "0x0001",
+      "vid": "0x6662",
       "pid": "0x3D14",
-      "vid": "0x6662"
+      "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/handwired/3dortho14u/rev2/info.json b/keyboards/handwired/3dortho14u/rev2/info.json
index 705d6b5570..7f241f35ff 100644
--- a/keyboards/handwired/3dortho14u/rev2/info.json
+++ b/keyboards/handwired/3dortho14u/rev2/info.json
@@ -28,9 +28,9 @@
       "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
     },
     "usb": {
-      "device_ver": "0x0001",
+      "vid": "0x6662",
       "pid": "0x3D14",
-      "vid": "0x6662"
+      "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/handwired/baredev/rev1/info.json b/keyboards/handwired/baredev/rev1/info.json
index 601b5df128..6292817538 100644
--- a/keyboards/handwired/baredev/rev1/info.json
+++ b/keyboards/handwired/baredev/rev1/info.json
@@ -44,7 +44,7 @@
     "usb": {
         "vid": "0x1209",
         "pid": "0x4126",
-        "device_ver": "0x0001",
+        "device_version": "0.0.1",
         "polling_interval": 1,
         "shared_endpoint": {
             "keyboard": true
diff --git a/keyboards/handwired/hillside/0_1/info.json b/keyboards/handwired/hillside/0_1/info.json
index 8c00f70366..7e128d5191 100644
--- a/keyboards/handwired/hillside/0_1/info.json
+++ b/keyboards/handwired/hillside/0_1/info.json
@@ -18,7 +18,7 @@
     "usb": {
       "vid": "0xFEED",
       "pid": "0x67C0",
-      "device_ver": "0x0001"
+      "device_version": "0.0.1"
     },
 
     "features": {
diff --git a/keyboards/handwired/pytest/info.json b/keyboards/handwired/pytest/info.json
index 5c941af9bf..331472762c 100644
--- a/keyboards/handwired/pytest/info.json
+++ b/keyboards/handwired/pytest/info.json
@@ -5,6 +5,6 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x6465",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     }
 }
diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/info.json
index b64ab55116..58eadb29e6 100644
--- a/keyboards/handwired/wakizashi40/info.json
+++ b/keyboards/handwired/wakizashi40/info.json
@@ -24,9 +24,9 @@
     "rows": ["C0", "C1", "C2", "C3"]
   },
   "usb": {
-    "device_ver": "0x0001",
+    "vid": "0x6662",
     "pid": "0x7740",
-    "vid": "0x6662"
+    "device_version": "0.0.1"
   },
   "layout_aliases": {
     "LAYOUT": "LAYOUT_all"
diff --git a/keyboards/karlb/kbic65/info.json b/keyboards/karlb/kbic65/info.json
index 560e162a3e..857f8d3cc5 100644
--- a/keyboards/karlb/kbic65/info.json
+++ b/keyboards/karlb/kbic65/info.json
@@ -29,7 +29,7 @@
     "usb": {
         "vid": "0x424B",
         "pid": "0xD87A",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT": {
diff --git a/keyboards/splitography/info.json b/keyboards/splitography/info.json
index 2d07607c29..a7f8bb7c95 100644
--- a/keyboards/splitography/info.json
+++ b/keyboards/splitography/info.json
@@ -23,7 +23,7 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x6060",
-        "device_ver": "0x0001"
+        "device_version": "0.0.1"
     },
     "layouts": {
         "LAYOUT": {

From 3502bbbd16feff23ac020ed561ebfef95cc271e8 Mon Sep 17 00:00:00 2001
From: leviport <levi@system76.com>
Date: Sat, 19 Mar 2022 10:37:35 -0600
Subject: [PATCH 848/867] Fix typo in docs/ref_functions.md (#16690)

---
 docs/ref_functions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ref_functions.md b/docs/ref_functions.md
index 209dcef722..a25c326b43 100644
--- a/docs/ref_functions.md
+++ b/docs/ref_functions.md
@@ -1,6 +1,6 @@
 # List of Useful Core Functions To Make Your Keyboard Better
 
-There are a lot of hidden functions in QMK that are incredible useful, or may add a bit of functionality that you've been wanting.  Functions that are specific to certain features are not included here, as those will be on their respective feature page.
+There are a lot of hidden functions in QMK that are incredibly useful, or may add a bit of functionality that you've been wanting.  Functions that are specific to certain features are not included here, as those will be on their respective feature page.
 
 ## (OLKB) Tri Layers :id=olkb-tri-layers
 

From 047ef3cd121e6bed3702eaf7ed3e96cf1e765ec5 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Sat, 19 Mar 2022 17:40:47 +0000
Subject: [PATCH 849/867] VUSB - Use correct endpoint poll for VIA (#16691)

---
 tmk_core/protocol/vusb/protocol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmk_core/protocol/vusb/protocol.c b/tmk_core/protocol/vusb/protocol.c
index 20d0530483..ae99680ce4 100644
--- a/tmk_core/protocol/vusb/protocol.c
+++ b/tmk_core/protocol/vusb/protocol.c
@@ -158,7 +158,7 @@ void protocol_task(void) {
 #ifdef RAW_ENABLE
         usbPoll();
 
-        if (usbConfiguration && usbInterruptIsReady3()) {
+        if (usbConfiguration && usbInterruptIsReady4()) {
             raw_hid_task();
         }
 #endif

From 2f095b8925df98cf2c8c818c8fc44a9015efd6be Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sun, 20 Mar 2022 07:58:30 +1100
Subject: [PATCH 850/867] qmk.path.FileType: fix argument handling (#16693)

* qmk.path.FileType: pass in mode as first argument

* Better solution

* Grammar...
---
 lib/python/qmk/path.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/python/qmk/path.py b/lib/python/qmk/path.py
index 9b94abbc12..556d0eefc8 100644
--- a/lib/python/qmk/path.py
+++ b/lib/python/qmk/path.py
@@ -70,9 +70,11 @@ def normpath(path):
 
 
 class FileType(argparse.FileType):
-    def __init__(self, encoding='UTF-8'):
+    def __init__(self, *args, **kwargs):
         # Use UTF8 by default for stdin
-        return super().__init__(encoding=encoding)
+        if 'encoding' not in kwargs:
+            kwargs['encoding'] = 'UTF-8'
+        return super().__init__(*args, **kwargs)
 
     def __call__(self, string):
         """normalize and check exists

From 6125f7bf4d15b4ab9403186a5282bb75bc00bd07 Mon Sep 17 00:00:00 2001
From: Joshua Barber <josh@jwjb.io>
Date: Sun, 20 Mar 2022 17:02:46 +0000
Subject: [PATCH 851/867] Add MutePad keyboard (Handwired) (#16590)

* Add MutePad keyboard

* Update info.json and readme

* Move mutepad to handwired folder

* Address PR comments
---
 keyboards/handwired/mutepad/config.h          | 90 +++++++++++++++++++
 keyboards/handwired/mutepad/info.json         | 15 ++++
 .../mutepad/keymaps/default/keymap.c          | 43 +++++++++
 .../mutepad/keymaps/default/readme.md         |  1 +
 keyboards/handwired/mutepad/mutepad.c         |  4 +
 keyboards/handwired/mutepad/mutepad.h         | 19 ++++
 keyboards/handwired/mutepad/readme.md         | 33 +++++++
 keyboards/handwired/mutepad/rules.mk          | 19 ++++
 8 files changed, 224 insertions(+)
 create mode 100644 keyboards/handwired/mutepad/config.h
 create mode 100644 keyboards/handwired/mutepad/info.json
 create mode 100644 keyboards/handwired/mutepad/keymaps/default/keymap.c
 create mode 100644 keyboards/handwired/mutepad/keymaps/default/readme.md
 create mode 100644 keyboards/handwired/mutepad/mutepad.c
 create mode 100644 keyboards/handwired/mutepad/mutepad.h
 create mode 100644 keyboards/handwired/mutepad/readme.md
 create mode 100644 keyboards/handwired/mutepad/rules.mk

diff --git a/keyboards/handwired/mutepad/config.h b/keyboards/handwired/mutepad/config.h
new file mode 100644
index 0000000000..7113063223
--- /dev/null
+++ b/keyboards/handwired/mutepad/config.h
@@ -0,0 +1,90 @@
+// Copyright 2022 JoshwJB (@JoshwJB)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0x0000
+#define DEVICE_VER 0x0001
+#define MANUFACTURER JoshwJB
+#define PRODUCT MutePad
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 4
+
+/*
+ * 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 \
+    { F6 }
+#define MATRIX_COL_PINS \
+    { B1, B3, B2, B6 }
+#define UNUSED_PINS
+
+/* encoder support */
+#define ENCODERS_PAD_A \
+    { F4 }
+#define ENCODERS_PAD_B \
+    { F5 }
+
+#define ENCODER_RESOLUTION 2
+
+#define TAP_CODE_DELAY 10
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/handwired/mutepad/info.json b/keyboards/handwired/mutepad/info.json
new file mode 100644
index 0000000000..b4a75a10e2
--- /dev/null
+++ b/keyboards/handwired/mutepad/info.json
@@ -0,0 +1,15 @@
+{
+    "keyboard_name": "MutePad",
+    "url": "https://github.com/JoshwJB/MutePad",
+    "maintainer": "JoshwJB",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "k00", "x": 0, "y": 0},
+                {"label": "k01", "x": 1, "y": 0},
+                {"label": "k02", "x": 2, "y": 0},
+                {"label": "k03", "x": 3, "y": 0},
+            ]
+        }
+    }
+}
diff --git a/keyboards/handwired/mutepad/keymaps/default/keymap.c b/keyboards/handwired/mutepad/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d26e230e53
--- /dev/null
+++ b/keyboards/handwired/mutepad/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+// Copyright 2022 Joshua Barber (@JoshwJB)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names { _BASE };
+
+enum custom_keycodes { MUTE_GOOGLE_MEET = 0, MUTE_TEAMS = 1 };
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case MUTE_GOOGLE_MEET:
+            if (record->event.pressed) {
+                tap_code16(G(KC_D));
+            }
+            break;
+        case MUTE_TEAMS:
+            if (record->event.pressed) {
+                tap_code16(C(S(KC_M)));
+            }
+            break;
+    }
+
+    return true;
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(MUTE_TEAMS, KC_F23, KC_F24, KC_MPLY)};
+
+#ifdef ENCODER_ENABLE
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+    return true;
+}
+
+#endif
diff --git a/keyboards/handwired/mutepad/keymaps/default/readme.md b/keyboards/handwired/mutepad/keymaps/default/readme.md
new file mode 100644
index 0000000000..c3c9ec6aec
--- /dev/null
+++ b/keyboards/handwired/mutepad/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for MutePad
diff --git a/keyboards/handwired/mutepad/mutepad.c b/keyboards/handwired/mutepad/mutepad.c
new file mode 100644
index 0000000000..09210c3f4f
--- /dev/null
+++ b/keyboards/handwired/mutepad/mutepad.c
@@ -0,0 +1,4 @@
+// Copyright 2022 JoshwJB (@JoshwJB)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "mutepad.h"
diff --git a/keyboards/handwired/mutepad/mutepad.h b/keyboards/handwired/mutepad/mutepad.h
new file mode 100644
index 0000000000..57c317cb60
--- /dev/null
+++ b/keyboards/handwired/mutepad/mutepad.h
@@ -0,0 +1,19 @@
+// Copyright 2022 JoshwJB (@JoshwJB)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT(K00, K01, K02, K03) \
+    {                              \
+        { K00, K01, K02, K03 }     \
+    }
diff --git a/keyboards/handwired/mutepad/readme.md b/keyboards/handwired/mutepad/readme.md
new file mode 100644
index 0000000000..cbd1c9f316
--- /dev/null
+++ b/keyboards/handwired/mutepad/readme.md
@@ -0,0 +1,33 @@
+# MutePad
+
+[MutePad Repo](https://github.com/JoshwJB/MutePad)
+
+A 3D printed under desk mounted keypad with rotary encoder, for muting applications (discord, zoom etc.) and adjusting volume.
+
+* Keyboard Maintainer: [JoshwJB](https://github.com/JoshwJB)
+* Hardware Supported: ProMicro
+* Hardware Availability: Handwired - see [MutePad Repo](https://github.com/JoshwJB/MutePad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/mutepad:default
+
+Flashing example for this keyboard:
+
+    make handwired/mutepad:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly short the ground and reset on the ProMicro
+
+## Images
+![image](https://user-images.githubusercontent.com/15612025/157335123-a76ce059-86b4-4484-9bb2-0abff8a13cc8.png)
+
+### Wiring
+![image](https://user-images.githubusercontent.com/15612025/157336673-ad348e3d-4314-4703-afe0-a43a6f73b892.png)
+![image](https://user-images.githubusercontent.com/15612025/157335150-8491553f-a7dc-462a-a6af-bc4be223b703.png)
diff --git a/keyboards/handwired/mutepad/rules.mk b/keyboards/handwired/mutepad/rules.mk
new file mode 100644
index 0000000000..1a63bd74b1
--- /dev/null
+++ b/keyboards/handwired/mutepad/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes

From 1bc8793f83b205bb1c1dd18a6f9f3db14bbafe91 Mon Sep 17 00:00:00 2001
From: Alabahuy <rezolutionrez@gmail.com>
Date: Mon, 21 Mar 2022 00:05:56 +0700
Subject: [PATCH 852/867] Add Rart75 hotswap and support via (#16619)

* Add Keyboard Rart75 Hotswap version

* Update readme

* Update config and readme

* Update info.json

* update readme and keymaps
---
 keyboards/rart/rart75hs/config.h              | 75 ++++++++++++++
 keyboards/rart/rart75hs/info.json             | 99 +++++++++++++++++++
 .../rart/rart75hs/keymaps/default/keymap.c    | 37 +++++++
 keyboards/rart/rart75hs/keymaps/via/keymap.c  | 55 +++++++++++
 keyboards/rart/rart75hs/keymaps/via/rules.mk  |  2 +
 keyboards/rart/rart75hs/rart75hs.c            | 31 ++++++
 keyboards/rart/rart75hs/rart75hs.h            | 34 +++++++
 keyboards/rart/rart75hs/readme.md             | 30 ++++++
 keyboards/rart/rart75hs/rules.mk              | 22 +++++
 9 files changed, 385 insertions(+)
 create mode 100644 keyboards/rart/rart75hs/config.h
 create mode 100644 keyboards/rart/rart75hs/info.json
 create mode 100644 keyboards/rart/rart75hs/keymaps/default/keymap.c
 create mode 100644 keyboards/rart/rart75hs/keymaps/via/keymap.c
 create mode 100644 keyboards/rart/rart75hs/keymaps/via/rules.mk
 create mode 100644 keyboards/rart/rart75hs/rart75hs.c
 create mode 100644 keyboards/rart/rart75hs/rart75hs.h
 create mode 100644 keyboards/rart/rart75hs/readme.md
 create mode 100644 keyboards/rart/rart75hs/rules.mk

diff --git a/keyboards/rart/rart75hs/config.h b/keyboards/rart/rart75hs/config.h
new file mode 100644
index 0000000000..d08e0612a2
--- /dev/null
+++ b/keyboards/rart/rart75hs/config.h
@@ -0,0 +1,75 @@
+/*
+Copyright 2022 Alabahuy
+
+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       0x414C  // "AL"
+#define PRODUCT_ID      0x5575  // "75"
+#define DEVICE_VER      0x0003
+#define MANUFACTURER    Alabahuy
+#define PRODUCT         RART75 Hotswap
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 16
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D5, D6, D7, D0, C5, C4 }
+#define MATRIX_COL_PINS { B4, B3, B2, B1, B0, A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C3 }
+#define UNUSED_PINS
+
+/* 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
+
+#define LED_CAPS_LOCK_PIN D4
+#define LED_PIN_ON_STATE 0
+
+#define ENCODERS_PAD_A { C1 }
+#define ENCODERS_PAD_B { C2 }
+#define ENCODER_RESOLUTION 4 //default/suggested
+
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 1
+
+#define RGB_DI_PIN C0
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_TWINKLE
+/* You can change the number of RGB strip */
+#define RGBLED_NUM 11
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 240
+#define RGBLIGHT_SLEEP
+#endif
diff --git a/keyboards/rart/rart75hs/info.json b/keyboards/rart/rart75hs/info.json
new file mode 100644
index 0000000000..2a8cae96f8
--- /dev/null
+++ b/keyboards/rart/rart75hs/info.json
@@ -0,0 +1,99 @@
+{
+    "keyboard_name": "RART75 Hotswap",
+    "url": "",
+    "maintainer": "Alabahuy",
+    "layouts": {
+            "LAYOUT_all": {
+            "layout": [
+                {"label" : "Esc", "x":0, "y":0},
+                {"label" : "F1", "x":1.25, "y":0},
+                {"label" : "F2", "x":2.25, "y":0},
+                {"label" : "F3", "x":3.25, "y":0},
+                {"label" : "F4", "x":4.25, "y":0},
+                {"label" : "F5", "x":5.5, "y":0},
+                {"label" : "F6", "x":6.5, "y":0},
+                {"label" : "F7", "x":7.5, "y":0},
+                {"label" : "F8", "x":8.5, "y":0},
+                {"label" : "F9", "x":9.75, "y":0},
+                {"label" : "F10", "x":10.75, "y":0},
+                {"label" : "F11", "x":11.75, "y":0},
+                {"label" : "F12", "x":12.75, "y":0},
+                {"label" : "Delete", "x":14, "y":0},
+                {"label" : "Encoder", "x":15.5, "y":0},
+               
+                {"label" : "`", "x":0, "y":1.25},
+                {"label" : "1", "x":1, "y":1.25},
+                {"label" : "2", "x":2, "y":1.25},
+                {"label" : "3", "x":3, "y":1.25},
+                {"label" : "4", "x":4, "y":1.25},
+                {"label" : "5", "x":5, "y":1.25},
+                {"label" : "6", "x":6, "y":1.25},
+                {"label" : "7", "x":7, "y":1.25},
+                {"label" : "8", "x":8, "y":1.25},
+                {"label" : "9", "x":9, "y":1.25},
+                {"label" : "0", "x":10, "y":1.25},
+                {"label" : "-", "x":11, "y":1.25},
+                {"label" : "=", "x":12, "y":1.25},
+                {"label" : "Backspace", "x":13, "y":1.25, "w":2},
+                {"label" : "Page up", "x":15.5, "y":1.25},
+              
+                {"label" : "Tab", "x":0, "y":2.25, "w":1.5},
+                {"label" : "Q", "x":1.5, "y":2.25},
+                {"label" : "W", "x":2.5, "y":2.25},
+                {"label" : "E", "x":3.5, "y":2.25},
+                {"label" : "R", "x":4.5, "y":2.25},
+                {"label" : "T", "x":5.5, "y":2.25},
+                {"label" : "Y", "x":6.5, "y":2.25},
+                {"label" : "U", "x":7.5, "y":2.25},
+                {"label" : "I", "x":8.5, "y":2.25},
+                {"label" : "O", "x":9.5, "y":2.25},
+                {"label" : "P", "x":10.5, "y":2.25},
+                {"label" : "[", "x":11.5, "y":2.25},
+                {"label" : "]", "x":12.5, "y":2.25},
+                {"label" : "|", "x":13.5, "y":2.25, "w":1.5},
+                {"label" : "Page  down", "x":15.5, "y":2.25},
+              
+                {"label" : "Caps lock", "x":0, "y":3.25, "w":1.75},
+                {"label" : "A", "x":1.75, "y":3.25},
+                {"label" : "S", "x":2.75, "y":3.25},
+                {"label" : "D", "x":3.75, "y":3.25},
+                {"label" : "F", "x":4.75, "y":3.25},
+                {"label" : "G", "x":5.75, "y":3.25},
+                {"label" : "H", "x":6.75, "y":3.25},
+                {"label" : "J", "x":7.75, "y":3.25},
+                {"label" : "K", "x":8.75, "y":3.25},
+                {"label" : "L", "x":9.75, "y":3.25},
+                {"label" : ";", "x":10.75, "y":3.25},
+                {"label" : "'", "x":11.75, "y":3.25},
+                {"label" : "Enter", "x":12.75, "y":3.25, "w":2.25},
+                {"label" : "Home", "x":15.5, "y":3.25},
+             
+                {"label" : "Shift", "x":0, "y":4.25, "w":2.25},
+                {"label" : "Z", "x":2.25, "y":4.25},
+                {"label" : "X", "x":3.25, "y":4.25},
+                {"label" : "C", "x":4.25, "y":4.25},
+                {"label" : "V", "x":5.25, "y":4.25},
+                {"label" : "B", "x":6.25, "y":4.25},
+                {"label" : "N", "x":7.25, "y":4.25},
+                {"label" : "M", "x":8.25, "y":4.25},
+                {"label" : ",", "x":9.25, "y":4.25},
+                {"label" : ".", "x":10.25, "y":4.25},
+                {"label" : "/", "x":11.25, "y":4.25},
+                {"label" : "Shift", "x":12.25, "y":4.25, "w":1.75},
+                {"label" : "Up", "x":14.25, "y":4.5},
+                {"label" : "End", "x":15.5, "y":4.25},
+               
+                {"label" : "Ctrl", "x":0, "y":5.25, "w":1.25},
+                {"label" : "Windows", "x":1.25, "y":5.25, "w":1.25},
+                {"label" : "Alt", "x":2.5, "y":5.25, "w":1.25},
+                {"label" : "Space", "x":3.75, "y":5.25, "w":6.25},
+                {"label" : "Alt", "x":10, "y":5.25 },
+                {"label" : "Windows","x":11, "y":5.25 },
+                {"label" : "Ctrl", "x":12, "y":5.25 },
+                {"label" : "Left", "x":13.25, "y":5.5 },
+                {"label" : "Down", "x":14.25, "y":5.5 },
+                {"label" : "Right", "x":15.25, "y":5.5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/rart/rart75hs/keymaps/default/keymap.c b/keyboards/rart/rart75hs/keymaps/default/keymap.c
new file mode 100644
index 0000000000..c6f334e98f
--- /dev/null
+++ b/keyboards/rart/rart75hs/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2022 Alabahuy
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_all(
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,              KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_MPLY,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,             KC_BSPC,  KC_HOME,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_END,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,                       KC_PGUP,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,    KC_PGDN,
+    KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT,                      KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RESET,    _______,
+    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,
+    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,                      _______,  _______,
+    _______,  _______,  _______,            _______,                                _______,  _______,  _______,  _______,                      _______,  _______
+  )
+
+};
diff --git a/keyboards/rart/rart75hs/keymaps/via/keymap.c b/keyboards/rart/rart75hs/keymaps/via/keymap.c
new file mode 100644
index 0000000000..27a4f99fa6
--- /dev/null
+++ b/keyboards/rart/rart75hs/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2022 Alabahuy
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_all(
+    KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,              KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_INS,   KC_MPLY,
+    KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,             KC_BSPC,  KC_HOME,
+    KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,            KC_END,
+    KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_ENT,                       KC_PGUP,
+    KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,                      KC_UP,    KC_PGDN,
+    KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,                                 KC_RALT,  MO(1),    KC_RCTL,  KC_LEFT,                      KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            RESET,    _______,
+    _______,  RGB_TOG,  RGB_MOD,  RGB_HUI,  RGB_HUD,  RGB_SAI,  RGB_SAD,  RGB_VAI,  RGB_VAD,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,
+    _______,  _______,  _______,  _______,  BL_DEC,   BL_TOGG,  BL_INC,   BL_STEP,  _______,  _______,  _______,  _______,                      _______,  _______,
+    _______,  _______,  _______,            _______,                                _______,  _______,  _______,  _______,                      _______,  _______
+  ),
+
+  [2] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
+    _______,  _______,  _______,            _______,                                _______,  _______,  _______,  _______,                      _______,  _______
+  ),
+
+  [3] = LAYOUT_all(
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
+    _______,  _______,  _______,            _______,                                _______,  _______,  _______,  _______,                      _______,  _______
+  )
+
+};
diff --git a/keyboards/rart/rart75hs/keymaps/via/rules.mk b/keyboards/rart/rart75hs/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/rart/rart75hs/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/rart/rart75hs/rart75hs.c b/keyboards/rart/rart75hs/rart75hs.c
new file mode 100644
index 0000000000..f2475ab960
--- /dev/null
+++ b/keyboards/rart/rart75hs/rart75hs.c
@@ -0,0 +1,31 @@
+/* Copyright 2022 Alabahuy
+ * 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 "rart75hs.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    switch (index) {
+        case 0:
+            if (clockwise) {
+                tap_code(KC_VOLU);
+            } else {
+                tap_code(KC_VOLD);
+            }
+        break;
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/rart/rart75hs/rart75hs.h b/keyboards/rart/rart75hs/rart75hs.h
new file mode 100644
index 0000000000..f3b25df1b6
--- /dev/null
+++ b/keyboards/rart/rart75hs/rart75hs.h
@@ -0,0 +1,34 @@
+/* Copyright 2022 Alabahuy
+ * 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,      K0A, K0B, K0C, K0D, K0E, K0F, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      K1F, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,           K3F, \
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,           K4E, K4F, \
+    K50, K51, K52,      K54,                K58, K59, K5A, K5B,           K5E, K5F  \
+) \
+{ \
+    { K00, K01, K02, K03,   K04, K05,   K06,   K07,   K08,   KC_NO, K0A, K0B, K0C,   K0D,   K0E,   K0F }, \
+    { K10, K11, K12, K13,   K14, K15,   K16,   K17,   K18,   K19,   K1A, K1B, K1C,   K1D,   KC_NO, K1F }, \
+    { K20, K21, K22, K23,   K24, K25,   K26,   K27,   K28,   K29,   K2A, K2B, K2C,   K2D,   KC_NO, K2F }, \
+    { K30, K31, K32, K33,   K34, K35,   K36,   K37,   K38,   K39,   K3A, K3B, K3C,   KC_NO, KC_NO, K3F }, \
+    { K40, K41, K42, K43,   K44, K45,   K46,   K47,   K48,   K49,   K4A, K4B, KC_NO, KC_NO, K4E,   K4F }, \
+    { K50, K51, K52, KC_NO, K54, KC_NO, KC_NO, KC_NO, K58,   K59,   K5A, K5B, KC_NO, KC_NO, K5E,   K5F }, \
+}
diff --git a/keyboards/rart/rart75hs/readme.md b/keyboards/rart/rart75hs/readme.md
new file mode 100644
index 0000000000..af8db99a02
--- /dev/null
+++ b/keyboards/rart/rart75hs/readme.md
@@ -0,0 +1,30 @@
+# [RART 75 Hotswap](https://github.com/alabahuy/RART/tree/master/RART75)
+
+![RART 75](https://i.imgur.com/FVWlm8Uh.jpeg)
+
+75% pcb with encoder, based on IMKG (Indonesia Mechanical Keyboard Group)
+
+* Keyboard Maintainer: [Alabahuy](https://github.com/alabahuy)
+* Hardware Supported: RART75 PCB, Atmega32a, Type C, Encoders
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rart/rart75hs:default
+
+Flashing example for this keyboard:
+
+    make rart/rart75hs:default:flash
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* To Enter the bootloader you can short and hold boot pin, short reset pin, release reset and boot pin. 
+
+* Bootmagic reset, hold down the key at (0,0) in the matrix (ESC) and plug in the keyboard. 
+
+* Bootloader reset on the matrix, hold down key at (0,1) and plug in the keyboard
+
+
+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).
diff --git a/keyboards/rart/rart75hs/rules.mk b/keyboards/rart/rart75hs/rules.mk
new file mode 100644
index 0000000000..3a9dc7e9bc
--- /dev/null
+++ b/keyboards/rart/rart75hs/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32a
+
+# Bootloader selection
+BOOTLOADER = usbasploader
+
+# Processor frequency
+F_CPU = 16000000
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes

From 669ad3c8052fa36e03c105cb00b60b178aaf20cc Mon Sep 17 00:00:00 2001
From: Droxx <101306764+furfuzz@users.noreply.github.com>
Date: Sun, 20 Mar 2022 11:24:09 -0600
Subject: [PATCH 853/867] Droxx keymap (#16607)

* add droxx kaymap

* add droxx keymap

* fixed config.h

* fixed rules.mk

* fixed rules.mk

* updated readme.md

* Update config.h

* Update keymap.c

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update config.h

* Update readme.md

* Update keymap.c
---
 .../kbdfans/kbd67/rev2/keymaps/droxx/config.h | 30 ++++++++
 .../kbdfans/kbd67/rev2/keymaps/droxx/keymap.c | 71 +++++++++++++++++++
 .../kbd67/rev2/keymaps/droxx/readme.md        | 30 ++++++++
 .../kbdfans/kbd67/rev2/keymaps/droxx/rules.mk |  3 +
 4 files changed, 134 insertions(+)
 create mode 100644 keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h
 create mode 100644 keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c
 create mode 100644 keyboards/kbdfans/kbd67/rev2/keymaps/droxx/readme.md
 create mode 100644 keyboards/kbdfans/kbd67/rev2/keymaps/droxx/rules.mk

diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h
new file mode 100644
index 0000000000..911051c31a
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/config.h
@@ -0,0 +1,30 @@
+/* 
+Copyright 2022 Alex K
+
+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
+
+/* USB Device descriptor parameter */
+#undef VENDOR_ID
+#undef MANUFACTURER
+#undef PRODUCT
+
+#define VENDOR_ID       0xAF88
+#define MANUFACTURER    Droxx-FurFuzz
+#define PRODUCT         Carbon v2 4rk
+
+/* force N key rollover even on startup regardless of EEPROM setting */
+#define FORCE_NKRO
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c
new file mode 100644
index 0000000000..1c6e2b982d
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/keymap.c
@@ -0,0 +1,71 @@
+// KBD67 Rev 2 ANSI Layout
+
+/* Copyright 2022 Alex K
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+// #include "droxx.h"
+
+// make keycodes easier to change for the future
+#define DRXX        KC_TRNS
+
+// enumerate custom layer names for the keymap
+enum keymap_layers {
+    _DRXXMAIN = 0,
+    _DRXXFN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap Base Layer
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+   * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ BackSp│Hom│
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+   * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│ BkSl│PgU│
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+   * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│PgD│
+   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+   * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ ↑ │End│
+   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+   * │Ctrl│ Win│ Alt│          Space         │Alt│Fn │Ctl│ ← │ ↓ │ → │
+   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+   */
+[_DRXXMAIN] = LAYOUT_65_ansi(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,   KC_BSPC,  KC_HOME,
+  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PGUP,
+  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_PGDN,
+  KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,            KC_UP,    KC_END,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                     KC_SPC,                        KC_RALT,     MO(_DRXXFN),     KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+  /* Keymap Fn Layer
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+   * │~ `│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│    Del│Ins│
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+   * │     │RM-│RB+│RM+│   │RTg│   │   │   │   │   │   │   │     │Pau│
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+   * │      │RS-│RB-│RS+│   │   │   │   │   │   │   │   │        │SLk│
+   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+   * │        │   │DGu│EGu│   │   │   │   │   │   │   │      │   │PSr│
+   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+   * │    │    │    │                        │   │   │   │   │   │   │
+   * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+   */
+[_DRXXFN] = LAYOUT_65_ansi(
+  KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_DEL,   KC_INS,
+  DRXX  ,   RGB_RMOD, RGB_VAI,  RGB_MOD,  DRXX,     RGB_TOG,  DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     KC_PAUS,
+  DRXX,     RGB_SPD,  RGB_VAD,  RGB_SPI,  DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,               DRXX,     KC_SLCK,
+  DRXX,     DRXX,     GUI_OFF,  GUI_ON,   DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,     DRXX,               DRXX,     KC_PSCR,
+  DRXX,     DRXX,     DRXX,                         DRXX,                         DRXX,          DRXX,          DRXX,     DRXX,     DRXX,     DRXX),
+};
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/readme.md b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/readme.md
new file mode 100644
index 0000000000..26d686c977
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/readme.md
@@ -0,0 +1,30 @@
+## Droxx's ANSI style keymap for the KBD67 REV 2 PCB
+
+* An ANSI keymap layout made by Alex for the KBD67 Rev 2
+* This keymap features two layers using basic Fn alternate keys on the second layer as well as lighting control
+
+![KBD67Rev2 Layout](https://i.imgur.com/DPSMhIX.png)
+
+### Layer 0 (_DRXXMAIN)
+
+The base QWERTY layer
+
+* Basic qwerty key layout with nothing other than an Fn key
+* Fn on the bottom row activates layer 1
+
+### Layer 1 (_DRXXFN)
+
+The function layer
+
+* Backspace will trigger KC_DEL until I find the KC_HOME key less useful.
+* Pressing T will toggle the keyboard underglow feature on and off.
+* Keys Q and E are used to change the underglow style of the keyboard.
+* Keys W and S modify the brightness of the underglow.
+* Keys A and D change the speed of the LED RGB animation.
+
+~~When Fn is held on layer 0, the arrow keys become a control surface for the LED baclighting~~
+~~The up arrow is used to cycle backlight modes, down arrow for toggling the backlight on or off,~~
+~~and the right and left for increasing and decreasing the brightness respectively.~~[^note]
+* X is used to disable the GUI key and C is used to enable the GUI key.
+
+[^note]: I don't have in-switch LEDs installed?
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/rules.mk b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/rules.mk
new file mode 100644
index 0000000000..c9b5587d59
--- /dev/null
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/droxx/rules.mk
@@ -0,0 +1,3 @@
+MOUSEKEY_ENABLE = no
+BACKLIGHT_ENABLE = no
+RGBLIGHT_ENABLE = yes

From 7eb6f86bc0aac3ff83abe4365cd11c5c195dc403 Mon Sep 17 00:00:00 2001
From: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Date: Mon, 21 Mar 2022 17:05:38 +0900
Subject: [PATCH 854/867] [Keyboard] add oled_task_kb() into
 keyboards/helix/rev2/rev2.c (#16697)

---
 .../helix/rev2/keymaps/default/oled_display.c |  6 ++---
 keyboards/helix/rev2/rev2.c                   | 24 +++++++++++++++++++
 keyboards/helix/rev2/rev2.h                   |  4 ++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/keyboards/helix/rev2/keymaps/default/oled_display.c b/keyboards/helix/rev2/keymaps/default/oled_display.c
index 4ee3f002d6..824d2e4d86 100644
--- a/keyboards/helix/rev2/keymaps/default/oled_display.c
+++ b/keyboards/helix/rev2/keymaps/default/oled_display.c
@@ -74,9 +74,6 @@ void matrix_update(struct CharacterMatrix *dest,
 
 #    ifdef SSD1306OLED
 static void render_logo(struct CharacterMatrix *matrix) {
-#    else
-static void render_logo(void) {
-#    endif
 
     static const char helix_logo[] PROGMEM ={
         0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
@@ -85,6 +82,7 @@ static void render_logo(void) {
         0};
     oled_write_P(helix_logo, false);
 }
+#    endif
 
 #    ifdef SSD1306OLED
 static void render_rgbled_status(bool full, struct CharacterMatrix *matrix) {
@@ -219,7 +217,7 @@ bool oled_task_user(void) {
     if (is_keyboard_master()) {
         render_status();
     } else {
-        render_logo();
+        render_helix_logo();
         render_rgbled_status(false);
         render_layer_status();
     }
diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c
index f579027c71..ba29f3c7de 100644
--- a/keyboards/helix/rev2/rev2.c
+++ b/keyboards/helix/rev2/rev2.c
@@ -64,3 +64,27 @@ void matrix_slave_scan_user(void) {
     matrix_scan_user();
 }
 #endif
+
+#ifdef OLED_ENABLE
+void render_helix_logo(void) {
+    static const char helix_logo[] PROGMEM ={
+        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
+        0};
+    oled_write_P(helix_logo, false);
+}
+
+bool oled_task_kb(void) {
+    if (oled_task_user()) {
+        /* keymap/user level oled_task_user() dose not exist */
+        led_t led_state = host_keyboard_led_state();
+        oled_write_P(led_state.num_lock ? PSTR("NUMLOCK") : PSTR("       "), false);
+        oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
+        oled_write_P(led_state.scroll_lock ? PSTR("SCLK") : PSTR("    "), false);
+        oled_write_P(PSTR("\n"), false);
+        render_helix_logo();
+    }
+    return false;
+}
+#endif /* end of OLED_ENABLE */
diff --git a/keyboards/helix/rev2/rev2.h b/keyboards/helix/rev2/rev2.h
index 5c7cc93d17..fccbaf1ac4 100644
--- a/keyboards/helix/rev2/rev2.h
+++ b/keyboards/helix/rev2/rev2.h
@@ -20,6 +20,10 @@
 bool is_mac_mode(void);
 void set_mac_mode_kb(bool macmode);
 
+#ifdef OLED_ENABLE
+void render_helix_logo(void);
+#endif
+
 #ifndef SPLIT_KEYBOARD
     extern bool is_helix_master(void);
     #define is_keyboard_master() is_helix_master()

From f610011aa3d43c41489ddc638a3a8731ae0d51bf Mon Sep 17 00:00:00 2001
From: Luc <luc.wastiaux@xsmail.com>
Date: Wed, 23 Mar 2022 00:38:50 +0800
Subject: [PATCH 855/867] [Keymap] personal keymap, ergodox_ez and atreus /
 dvorak_42_key (#16695)

---
 .../atreus/keymaps/dvorak_42_key/keymap.c     | 32 ++++++--
 .../ergodox_ez/keymaps/dvorak_42_key/keymap.c | 77 ++++++++++++++-----
 2 files changed, 82 insertions(+), 27 deletions(-)

diff --git a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
index dbe39a38bc..eff7c8d577 100644
--- a/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/atreus/keymaps/dvorak_42_key/keymap.c
@@ -30,20 +30,23 @@
 
 // visual studio code shortcuts
 #define VS_FILE LCTL(KC_P)
+#define VS_OPEN_FILE LCTL(KC_O)
 #define VS_LINE LCTL(KC_G)
 #define VS_SYMBOLEDITOR LCTL(LSFT(KC_O))
-#define VS_DEFINITION KC_F12
-#define VS_IMPLEMENTATION LCTL(KC_F12)
-#define VS_REFERENCES LSFT(KC_F12)
+#define VS_DEFINITION MEH(KC_F5)
+#define VS_IMPLEMENTATION MEH(KC_F6)
+#define VS_REFERENCES MEH(KC_F7)
 #define VS_BACK LALT(KC_LEFT)
 #define VS_BRACKET LCTL(LSFT(KC_BSLS))
-#define VS_TABLEFT LCTL(KC_PGUP)
-#define VS_TABRIGHT LCTL(KC_PGDN)
-#define VS_CLOSETAB LCTL(KC_W)
+#define VS_TABLEFT MEH(KC_F1)
+#define VS_TABRIGHT MEH(KC_F2)
+#define VS_CLOSETAB MEH(KC_F3)
 #define VS_CLOSEPANEL LCTL(LSFT(KC_W))
+#define VS_GROUP_1 LCTL(KC_1)
+#define VS_GROUP_2 LCTL(KC_2)
 #define VS_TERMINAL LCTL(KC_GRAVE)
 #define VS_BUILD LCTL(LSFT(KC_B))
-#define VS_COMMANDS LCTL(LSFT(KC_P))
+#define VS_COMMANDS MEH(KC_F4)
 #define VS_CMT_BLOCK LSFT(LALT(KC_A))
 #define VS_CMT_LINE LCTL(KC_SLSH)
 #define VS_DEL_LINE LCTL(LSFT(KC_K))
@@ -54,7 +57,18 @@
 #define VS_BM_PREV LCTL(LALT(KC_P))
 #define VS_BM_NEXT LCTL(LALT(KC_N))
 #define VS_BM_TOGGLE LCTL(LALT(KC_K))
-#define VS_BM_LABEL LCTL(LALT(KC_B))
+#define VS_BM_CLEARALL LCTL(LALT(KC_C))
+// visual studio code navigation shortcuts
+#define VS_FOCUS_EDITOR MEH(KC_F8)
+#define VS_FOCUS_TERMINAL MEH(KC_F9)
+#define VS_TOGGLE_TERMINAL MEH(KC_F10)
+#define VS_CLEAR_TERMINAL MEH(KC_F11)
+#define VS_TERMINAL_PREV MEH(KC_F12)
+#define VS_TERMINAL_NEXT MEH(KC_F13)
+#define VS_TERMINAL_NEW MEH(KC_F14)
+#define VS_TERMINAL_DETACH MEH(KC_F15)
+#define VS_TERMINAL_RENAME MEH(KC_F16)
+#define VS_JUMPY MEH(KC_F17)
 
 /*
 // VS code bookmark prev/next requires the following in vscode shortcuts config
@@ -80,6 +94,8 @@ enum custom_keycodes {
 
 // building/flashing instructions:
 // make atreus/astar:dvorak_42_key:flash
+// or
+// qmk compile -kb atreus -km dvorak_42_key
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT(
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
index 67a09188ab..fab2977356 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/dvorak_42_key/keymap.c
@@ -79,9 +79,9 @@ enum custom_keycodes {
 
   SCREEN_READREG_1,
   SCREEN_READREG_2,
-  SCREEN_READREG_3, 
+  SCREEN_READREG_3,
   SCREEN_PASTEREG_1,
-  SCREEN_PASTEREG_2, 
+  SCREEN_PASTEREG_2,
   SCREEN_PASTEREG_3,
 
   // Windows 10 macros,
@@ -101,6 +101,7 @@ enum custom_keycodes {
 #define COMBINED         7 // combined numbers and symbols layer
 #define ANDROID_STUDIO   8 // android studio specific layer
 #define VSCODE           9 // visual studio code specific layer
+#define VSCODE_NAV       10 // visual studio code, navigation within IDE
 
 
 
@@ -131,22 +132,22 @@ enum custom_keycodes {
 #define VS_OPEN_FILE LCTL(KC_O)
 #define VS_LINE LCTL(KC_G)
 #define VS_SYMBOLEDITOR LCTL(LSFT(KC_O))
-#define VS_DEFINITION KC_F12
-#define VS_IMPLEMENTATION LCTL(KC_F12)
-#define VS_REFERENCES LSFT(KC_F12)
+#define VS_DEFINITION MEH(KC_F5)
+#define VS_IMPLEMENTATION MEH(KC_F6)
+#define VS_REFERENCES MEH(KC_F7)
 #define VS_BACK LALT(KC_LEFT)
 #define VS_BRACKET LCTL(LSFT(KC_BSLS))
-#define VS_TABLEFT LCTL(KC_PGUP)
-#define VS_TABRIGHT LCTL(KC_PGDN)
-#define VS_CLOSETAB LCTL(KC_W)
+#define VS_TABLEFT MEH(KC_F1)
+#define VS_TABRIGHT MEH(KC_F2)
+#define VS_CLOSETAB MEH(KC_F3)
 #define VS_CLOSEPANEL LCTL(LSFT(KC_W))
 #define VS_GROUP_1 LCTL(KC_1)
 #define VS_GROUP_2 LCTL(KC_2)
 #define VS_TERMINAL LCTL(KC_GRAVE)
 #define VS_BUILD LCTL(LSFT(KC_B))
-#define VS_COMMANDS LCTL(LSFT(KC_P))
+#define VS_COMMANDS MEH(KC_F4)
 #define VS_CMT_BLOCK LSFT(LALT(KC_A))
-#define VS_CMT_LINE LCTL(KC_SLSH)
+#define VS_CMT_LINE MEH(KC_F18)
 #define VS_DEL_LINE LCTL(LSFT(KC_K))
 #define VS_COPYLINEDOWN LSFT(LALT(KC_DOWN))
 // visual studio bookmark commands
@@ -156,6 +157,18 @@ enum custom_keycodes {
 #define VS_BM_NEXT LCTL(LALT(KC_N))
 #define VS_BM_TOGGLE LCTL(LALT(KC_K))
 #define VS_BM_CLEARALL LCTL(LALT(KC_C))
+// visual studio code navigation shortcuts
+#define VS_FOCUS_EDITOR MEH(KC_F8)
+#define VS_FOCUS_TERMINAL MEH(KC_F9)
+#define VS_TOGGLE_TERMINAL MEH(KC_F10)
+#define VS_CLEAR_TERMINAL MEH(KC_F11)
+#define VS_TERMINAL_PREV MEH(KC_F12)
+#define VS_TERMINAL_NEXT MEH(KC_F13)
+#define VS_TERMINAL_NEW MEH(KC_F14)
+#define VS_TERMINAL_DETACH MEH(KC_F15)
+#define VS_TERMINAL_RENAME MEH(KC_F16)
+#define VS_JUMPY MEH(KC_F17)
+#define VS_FIND MEH(KC_F19)
 
 
 #define MACRO_SCREEN_NUM(MACRO_NAME,NUM) \
@@ -204,10 +217,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [BASE] = LAYOUT_ergodox(
       // left hand
       KC_ESC,            KC_F1,         KC_F2,      KC_F3,        KC_F4,   KC_F5,   KC_F6,
-      OSL(SCREEN_NAV),   KC_QUOTE,      KC_COMMA,   KC_DOT,       KC_P,    KC_Y,    MO(ANDROID_STUDIO),
+      OSL(SCREEN_NAV),   KC_QUOTE,      KC_COMMA,   KC_DOT,       KC_P,    KC_Y,    MO(VSCODE_NAV),
       OSL(SHELL_NAV),    KC_A,          KC_O,       KC_E,         KC_U,    KC_I,
       OSL(SHELL_SCREEN), KC_SCOLON,     KC_Q,       KC_J,         KC_K,    KC_X,    MO(VSCODE),
-      MEH(KC_1),         OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL),
+      MEH(KC_0),         OSM(MOD_LSFT), OSM(MOD_LCTL), MO(KEYSEL), MO(BROWSER_CONTROL),
 
       // left thumb cluster
                 WINDOWS10_WORKSPACE_LEFT, WINDOWS10_WORKSPACE_RIGHT,
@@ -215,14 +228,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       MO(COMBINED),MO(KEYNAV),  OSM(MOD_LALT),
 
       // right hand
-      KC_F7,     KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MEH(KC_9),
-      MEH(KC_7), KC_F,  KC_G,  KC_C,   KC_R,   KC_L,   KC_TAB,
+      KC_F7,     KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MEH(KC_7),
+      MEH(KC_1), KC_F,  KC_G,  KC_C,   KC_R,   KC_L,   KC_TAB,
                  KC_D,  KC_H,  KC_T,   KC_N,   KC_S,   RCTL(KC_BSPC),
-      MEH(KC_8), KC_B,  KC_M,  KC_W,   KC_V,   KC_Z,   MEH(KC_F3),
-      KC_BSPC,   RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT),MEH(KC_F4),
+      MEH(KC_2), KC_B,  KC_M,  KC_W,   KC_V,   KC_Z,   MEH(KC_8),
+      KC_BSPC,   RCTL(KC_BSPC), KC_CAPSLOCK, OSM(MOD_LSFT),MEH(KC_9),
 
       // right thumb cluster
-      MEH(KC_F5),MEH(KC_F6),MEH(KC_F7),MEH(KC_F8),KC_ENTER,KC_SPACE
+      MEH(KC_3), MEH(KC_4), MEH(KC_5), MEH(KC_6),KC_ENTER,KC_SPACE
 
   ),
 
@@ -398,7 +411,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS,      KC_TRNS,          KC_TRNS,       KC_TRNS,          KC_TRNS,             KC_TRNS,         KC_TRNS,
        VS_CMT_LINE,  VS_COPYLINEDOWN,  VS_REFERENCES, VS_DEFINITION,    VS_IMPLEMENTATION,   VS_LINE,         VS_BRACKET,
                      VS_CLOSETAB,      VS_TABLEFT,    VS_TABRIGHT,      VS_SYMBOLEDITOR,     VS_FILE,         VS_BACK,
-       VS_CMT_BLOCK, KC_TRNS,          VS_BM_PREV,    VS_BM_NEXT,       VS_GROUP_1,          VS_GROUP_2,      VS_BM_TOGGLE,
+       VS_CMT_BLOCK, VS_FIND,          VS_BM_PREV,    VS_BM_NEXT,       VS_GROUP_1,          VS_GROUP_2,      VS_BM_TOGGLE,
                                        // bottom row
                                        VS_COMMANDS,   VS_BM_LIST,       VS_BM_LISTALL,       VS_CLOSEPANEL,   VS_BM_CLEARALL,
        // thumb cluster
@@ -407,6 +420,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, VS_DEL_LINE, KC_TRNS
   ),
 
+    // vscode navigation shortcuts
+  [VSCODE_NAV] = LAYOUT_ergodox(
+       // left hand
+       KC_NO,  KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,   KC_TRNS,
+       KC_TRNS,KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,   KC_TRNS,
+       KC_TRNS,KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,
+       KC_TRNS,KC_TRNS,    KC_TRNS,     KC_TRNS,     KC_TRNS,     KC_TRNS,   KC_TRNS,
+               // bottom row
+               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+                                       // thumb cluster
+                                       KC_TRNS,KC_TRNS,
+                                               KC_TRNS,
+                               KC_TRNS,KC_TRNS,KC_TRNS,
+       // right hand
+       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,
+                VS_TOGGLE_TERMINAL,  VS_FOCUS_TERMINAL, VS_FOCUS_EDITOR,   VS_JUMPY,        KC_TRNS,            KC_TRNS,
+       KC_TRNS, VS_CLEAR_TERMINAL,   VS_TERMINAL_PREV,  VS_TERMINAL_NEXT,  VS_TERMINAL_NEW, VS_TERMINAL_DETACH, VS_TERMINAL_RENAME,
+                                       // bottom row
+                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       // thumb cluster
+       KC_TRNS, KC_TRNS,
+       KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
   [COMBINED] = LAYOUT_ergodox(
 
     // left hand
@@ -659,7 +698,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             tap_code16(C(KC_A));
             tap_code16(S(KC_SCOLON));
             SEND_STRING("paste 1\n");
-            break;        
+            break;
         case SCREEN_PASTEREG_2:
             tap_code16(C(KC_A));
             tap_code16(S(KC_SCOLON));

From c803c50dc069e58d0759b500f2964f6dc4f4c913 Mon Sep 17 00:00:00 2001
From: kb-elmo <lorwel@mailbox.org>
Date: Wed, 23 Mar 2022 06:06:26 +0100
Subject: [PATCH 856/867] [Keyboard] Add Axolstudio Foundation Gamma (#15948)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 .../axolstudio/foundation_gamma/config.h      |  44 ++++
 .../foundation_gamma/foundation_gamma.c       |  17 ++
 .../foundation_gamma/foundation_gamma.h       |  53 +++++
 .../axolstudio/foundation_gamma/info.json     | 191 ++++++++++++++++++
 .../foundation_gamma/keymaps/default/keymap.c |  35 ++++
 .../foundation_gamma/keymaps/via/keymap.c     |  51 +++++
 .../foundation_gamma/keymaps/via/rules.mk     |   2 +
 .../axolstudio/foundation_gamma/readme.md     |  25 +++
 .../axolstudio/foundation_gamma/rules.mk      |  18 ++
 9 files changed, 436 insertions(+)
 create mode 100644 keyboards/axolstudio/foundation_gamma/config.h
 create mode 100644 keyboards/axolstudio/foundation_gamma/foundation_gamma.c
 create mode 100644 keyboards/axolstudio/foundation_gamma/foundation_gamma.h
 create mode 100644 keyboards/axolstudio/foundation_gamma/info.json
 create mode 100644 keyboards/axolstudio/foundation_gamma/keymaps/default/keymap.c
 create mode 100644 keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c
 create mode 100644 keyboards/axolstudio/foundation_gamma/keymaps/via/rules.mk
 create mode 100644 keyboards/axolstudio/foundation_gamma/readme.md
 create mode 100644 keyboards/axolstudio/foundation_gamma/rules.mk

diff --git a/keyboards/axolstudio/foundation_gamma/config.h b/keyboards/axolstudio/foundation_gamma/config.h
new file mode 100644
index 0000000000..6883e51d57
--- /dev/null
+++ b/keyboards/axolstudio/foundation_gamma/config.h
@@ -0,0 +1,44 @@
+/*
+Copyright 2021 kb-elmo<mail@elmo.space>
+
+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    0x525C
+#define PRODUCT_ID   0xE3EB
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Axolstudio
+#define PRODUCT      Foundation Gamma
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/* Keyboard Matrix Assignments */
+#define MATRIX_ROW_PINS { B2, B1, B0, F7, F6, F5 }
+#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, F4, F1, F0 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* CAPS LED */
+#define LED_CAPS_LOCK_PIN B7
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/axolstudio/foundation_gamma/foundation_gamma.c b/keyboards/axolstudio/foundation_gamma/foundation_gamma.c
new file mode 100644
index 0000000000..e686d8f321
--- /dev/null
+++ b/keyboards/axolstudio/foundation_gamma/foundation_gamma.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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 "foundation_gamma.h"
diff --git a/keyboards/axolstudio/foundation_gamma/foundation_gamma.h b/keyboards/axolstudio/foundation_gamma/foundation_gamma.h
new file mode 100644
index 0000000000..1a96a6d813
--- /dev/null
+++ b/keyboards/axolstudio/foundation_gamma/foundation_gamma.h
@@ -0,0 +1,53 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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 ____ KC_NO
+
+#define LAYOUT_all( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013,        k014, k015, k016, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k213,  k114, k115, k116, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,        k214, k215, k216, \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,    k312,                             \
+    k400,       k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412,              k415,       \
+    k500, k501, k502,                   k506,                   k510, k511, k512,              k514, k515, k516  \
+) { \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116 }, \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216 }, \
+    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____, ____ }, \
+    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, ____, ____, k415, ____ }, \
+    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, k510, k511, k512, ____, k514, k515, k516 }  \
+}
+
+#define LAYOUT_ansi_tsangan( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013,    k014, k015, k016, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113,    k114, k115, k116, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,    k214, k215, k216, \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311,    k312,                         \
+    k400,       k401, k402, k403, k404, k405, k406, k407, k408, k409, k410,    k411,             k415,       \
+    k500, k501, k502,                   k506,                   k510, k511, k512,          k514, k515, k516  \
+) { \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, k016 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116 }, \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, ____, k214, k215, k216 }, \
+    { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____, ____ }, \
+    { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, ____, ____, ____, k415, ____ }, \
+    { k500, k501, k502, ____, ____, ____, k506, ____, ____, ____, k510, k511, k512, ____, k514, k515, k516 }  \
+}
diff --git a/keyboards/axolstudio/foundation_gamma/info.json b/keyboards/axolstudio/foundation_gamma/info.json
new file mode 100644
index 0000000000..62214ce80c
--- /dev/null
+++ b/keyboards/axolstudio/foundation_gamma/info.json
@@ -0,0 +1,191 @@
+{
+    "keyboard_name": "Foundation Gamma", 
+    "url": "https://axolstudio.ca/foundation-gamma", 
+    "maintainer": "kb-elmo", 
+    "layouts": {
+        "LAYOUT_ansi_tsangan": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+                {"x":0, "y":1.5},
+                {"x":1, "y":1.5},
+                {"x":2, "y":1.5},
+                {"x":3, "y":1.5},
+                {"x":4, "y":1.5},
+                {"x":5, "y":1.5},
+                {"x":6, "y":1.5},
+                {"x":7, "y":1.5},
+                {"x":8, "y":1.5},
+                {"x":9, "y":1.5},
+                {"x":10, "y":1.5},
+                {"x":11, "y":1.5},
+                {"x":12, "y":1.5},
+                {"x":13, "y":1.5, "w":2},
+                {"x":15.25, "y":1.5},
+                {"x":16.25, "y":1.5},
+                {"x":17.25, "y":1.5},
+                {"x":0, "y":2.5, "w":1.5},
+                {"x":1.5, "y":2.5},
+                {"x":2.5, "y":2.5},
+                {"x":3.5, "y":2.5},
+                {"x":4.5, "y":2.5},
+                {"x":5.5, "y":2.5},
+                {"x":6.5, "y":2.5},
+                {"x":7.5, "y":2.5},
+                {"x":8.5, "y":2.5},
+                {"x":9.5, "y":2.5},
+                {"x":10.5, "y":2.5},
+                {"x":11.5, "y":2.5},
+                {"x":12.5, "y":2.5},
+                {"x":13.5, "y":2.5, "w":1.5},
+                {"x":15.25, "y":2.5},
+                {"x":16.25, "y":2.5},
+                {"x":17.25, "y":2.5},
+                {"x":0, "y":3.5, "w":1.75},
+                {"x":1.75, "y":3.5},
+                {"x":2.75, "y":3.5},
+                {"x":3.75, "y":3.5},
+                {"x":4.75, "y":3.5},
+                {"x":5.75, "y":3.5},
+                {"x":6.75, "y":3.5},
+                {"x":7.75, "y":3.5},
+                {"x":8.75, "y":3.5},
+                {"x":9.75, "y":3.5},
+                {"x":10.75, "y":3.5},
+                {"x":11.75, "y":3.5},
+                {"x":12.75, "y":3.5, "w":2.25},
+                {"x":0, "y":4.5, "w":2.25},
+                {"x":2.25, "y":4.5},
+                {"x":3.25, "y":4.5},
+                {"x":4.25, "y":4.5},
+                {"x":5.25, "y":4.5},
+                {"x":6.25, "y":4.5},
+                {"x":7.25, "y":4.5},
+                {"x":8.25, "y":4.5},
+                {"x":9.25, "y":4.5},
+                {"x":10.25, "y":4.5},
+                {"x":11.25, "y":4.5},
+                {"x":12.25, "y":4.5, "w":2.75},
+                {"x":16.25, "y":4.5},
+                {"x":0, "y":5.5, "w":1.5},
+                {"x":1.5, "y":5.5},
+                {"x":2.5, "y":5.5, "w":1.5},
+                {"x":4, "y":5.5, "w":7},
+                {"x":11, "y":5.5, "w":1.5},
+                {"x":12.5, "y":5.5},
+                {"x":13.5, "y":5.5, "w":1.5},
+                {"x":15.25, "y":5.5},
+                {"x":16.25, "y":5.5},
+                {"x":17.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+                {"x":0, "y":1.5},
+                {"x":1, "y":1.5},
+                {"x":2, "y":1.5},
+                {"x":3, "y":1.5},
+                {"x":4, "y":1.5},
+                {"x":5, "y":1.5},
+                {"x":6, "y":1.5},
+                {"x":7, "y":1.5},
+                {"x":8, "y":1.5},
+                {"x":9, "y":1.5},
+                {"x":10, "y":1.5},
+                {"x":11, "y":1.5},
+                {"x":12, "y":1.5},
+                {"x":13, "y":1.5},
+                {"x":14, "y":1.5},
+                {"x":15.25, "y":1.5},
+                {"x":16.25, "y":1.5},
+                {"x":17.25, "y":1.5},
+                {"x":0, "y":2.5, "w":1.5},
+                {"x":1.5, "y":2.5},
+                {"x":2.5, "y":2.5},
+                {"x":3.5, "y":2.5},
+                {"x":4.5, "y":2.5},
+                {"x":5.5, "y":2.5},
+                {"x":6.5, "y":2.5},
+                {"x":7.5, "y":2.5},
+                {"x":8.5, "y":2.5},
+                {"x":9.5, "y":2.5},
+                {"x":10.5, "y":2.5},
+                {"x":11.5, "y":2.5},
+                {"x":12.5, "y":2.5},
+                {"x":13.5, "y":2.5, "w":1.5},
+                {"x":15.25, "y":2.5},
+                {"x":16.25, "y":2.5},
+                {"x":17.25, "y":2.5},
+                {"x":0, "y":3.5, "w":1.75},
+                {"x":1.75, "y":3.5},
+                {"x":2.75, "y":3.5},
+                {"x":3.75, "y":3.5},
+                {"x":4.75, "y":3.5},
+                {"x":5.75, "y":3.5},
+                {"x":6.75, "y":3.5},
+                {"x":7.75, "y":3.5},
+                {"x":8.75, "y":3.5},
+                {"x":9.75, "y":3.5},
+                {"x":10.75, "y":3.5},
+                {"x":11.75, "y":3.5},
+                {"x":12.75, "y":3.5, "w":2.25},
+                {"x":0, "y":4.5, "w":2.25},
+                {"x":2.25, "y":4.5},
+                {"x":3.25, "y":4.5},
+                {"x":4.25, "y":4.5},
+                {"x":5.25, "y":4.5},
+                {"x":6.25, "y":4.5},
+                {"x":7.25, "y":4.5},
+                {"x":8.25, "y":4.5},
+                {"x":9.25, "y":4.5},
+                {"x":10.25, "y":4.5},
+                {"x":11.25, "y":4.5},
+                {"x":12.25, "y":4.5, "w":1.75},
+                {"x":14, "y":4.5},
+                {"x":16.25, "y":4.5},
+                {"x":0, "y":5.5, "w":1.5},
+                {"x":1.5, "y":5.5},
+                {"x":2.5, "y":5.5, "w":1.5},
+                {"x":4, "y":5.5, "w":7},
+                {"x":11, "y":5.5, "w":1.5},
+                {"x":12.5, "y":5.5},
+                {"x":13.5, "y":5.5, "w":1.5},
+                {"x":15.25, "y":5.5},
+                {"x":16.25, "y":5.5},
+                {"x":17.25, "y":5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/axolstudio/foundation_gamma/keymaps/default/keymap.c b/keyboards/axolstudio/foundation_gamma/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9d354bd1e1
--- /dev/null
+++ b/keyboards/axolstudio/foundation_gamma/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ansi_tsangan(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,      KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,      KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_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(1),   KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_ansi_tsangan(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_VOLU,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_MPLY, KC_MNXT, KC_VOLD,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,                   KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c b/keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e6cad9a87a
--- /dev/null
+++ b/keyboards/axolstudio/foundation_gamma/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MUTE,            KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,   KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,            KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,      KC_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, MO(1),                       KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_VOLU,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_MPLY, KC_MNXT, KC_VOLD,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS
+    ),      
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS
+    ),      
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
+        KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                     KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/axolstudio/foundation_gamma/keymaps/via/rules.mk b/keyboards/axolstudio/foundation_gamma/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/axolstudio/foundation_gamma/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/axolstudio/foundation_gamma/readme.md b/keyboards/axolstudio/foundation_gamma/readme.md
new file mode 100644
index 0000000000..522ddd16c6
--- /dev/null
+++ b/keyboards/axolstudio/foundation_gamma/readme.md
@@ -0,0 +1,25 @@
+# Axolstudio Foundation Gamma
+
+![foundation](https://i.imgur.com/wxLv3oGl.jpg)
+
+Seamless, Screwless, Gasket mounted F13 TKL
+
+* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo)
+* Hardware Supported: Axolstudio Foundation Gamma F13 PCB
+* Hardware Availability: https://axolstudio.ca/foundation-gamma
+
+Make example for this keyboard (after setting up your build environment):
+
+    make axolstudio/foundation_gamma:default
+
+Flashing example for this keyboard:
+
+    make axolstudio/foundation_gamma:default:flash
+
+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).
+
+## Bootloader
+
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
+* **Physical reset button**: Briefly press the button labeled "SW1" on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/axolstudio/foundation_gamma/rules.mk b/keyboards/axolstudio/foundation_gamma/rules.mk
new file mode 100644
index 0000000000..a95ad7bcc0
--- /dev/null
+++ b/keyboards/axolstudio/foundation_gamma/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output

From 28bd777f5899c0502cd79fbab5ee8d38fb15dd14 Mon Sep 17 00:00:00 2001
From: ChrisBeswick <Chris-beswick@hotmail.co.uk>
Date: Wed, 23 Mar 2022 06:01:55 +0000
Subject: [PATCH 857/867] [Keyboard] Graystudio Apollo80 (#16469)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/gray_studio/apollo80/apollo80.c     |  18 ++++
 keyboards/gray_studio/apollo80/apollo80.h     |  35 ++++++
 keyboards/gray_studio/apollo80/config.h       |  71 ++++++++++++
 keyboards/gray_studio/apollo80/info.json      | 102 ++++++++++++++++++
 .../apollo80/keymaps/default/config.h         |  20 ++++
 .../apollo80/keymaps/default/keymap.c         |  51 +++++++++
 .../gray_studio/apollo80/keymaps/via/config.h |  20 ++++
 .../gray_studio/apollo80/keymaps/via/keymap.c |  67 ++++++++++++
 .../gray_studio/apollo80/keymaps/via/rules.mk |   1 +
 keyboards/gray_studio/apollo80/readme.md      |  26 +++++
 keyboards/gray_studio/apollo80/rules.mk       |  18 ++++
 11 files changed, 429 insertions(+)
 create mode 100644 keyboards/gray_studio/apollo80/apollo80.c
 create mode 100644 keyboards/gray_studio/apollo80/apollo80.h
 create mode 100644 keyboards/gray_studio/apollo80/config.h
 create mode 100644 keyboards/gray_studio/apollo80/info.json
 create mode 100644 keyboards/gray_studio/apollo80/keymaps/default/config.h
 create mode 100644 keyboards/gray_studio/apollo80/keymaps/default/keymap.c
 create mode 100644 keyboards/gray_studio/apollo80/keymaps/via/config.h
 create mode 100644 keyboards/gray_studio/apollo80/keymaps/via/keymap.c
 create mode 100644 keyboards/gray_studio/apollo80/keymaps/via/rules.mk
 create mode 100644 keyboards/gray_studio/apollo80/readme.md
 create mode 100644 keyboards/gray_studio/apollo80/rules.mk

diff --git a/keyboards/gray_studio/apollo80/apollo80.c b/keyboards/gray_studio/apollo80/apollo80.c
new file mode 100644
index 0000000000..842a63f318
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/apollo80.c
@@ -0,0 +1,18 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+ *
+ * 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 "apollo80.h"
+
+
diff --git a/keyboards/gray_studio/apollo80/apollo80.h b/keyboards/gray_studio/apollo80/apollo80.h
new file mode 100644
index 0000000000..be3a3ee54d
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/apollo80.h
@@ -0,0 +1,35 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+    K00,      K02, K03, K04, K05,    K07, K08, K09, K0A,    K0B, K0C, K0D,K06,  K0E, K0F, K0G,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E,  K1E, K1F, K1G,  \
+    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,     K2E, K2F, K2G,  \
+    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D,                         \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,     K4D,       K4F,       \
+    K50,  K51,  K52,              K56,                K5A,  K5B,  K5C,  K5D,    K5E, K5F, K5G   \
+) { \
+    { K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,   K3E,   KC_NO, KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   KC_NO, K4F,   KC_NO }, \
+    { K50,   K51,   K52,   KC_NO, KC_NO, KC_NO, K56,   KC_NO, KC_NO, KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }, \
+}
+
diff --git a/keyboards/gray_studio/apollo80/config.h b/keyboards/gray_studio/apollo80/config.h
new file mode 100644
index 0000000000..f00550fb65
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/config.h
@@ -0,0 +1,71 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+
+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       0x4753
+#define PRODUCT_ID      0x3001
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Graystudio
+#define PRODUCT         apollo80
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/*
+ * 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 { D1, D0, B3, B0, B2, B1 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D4, D6, D2, D3, D5 }
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
+
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 22
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+
+    #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+    /*== or choose 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
+    #define RGBLIGHT_EFFECT_TWINKLE
+#endif
+
diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json
new file mode 100644
index 0000000000..c0e3efdb88
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/info.json
@@ -0,0 +1,102 @@
+{
+    "keyboard_name": "apollo 80",
+    "url": "https://graystudio.club/products/gb-space80-apollo",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (D1,F0)", "x":0, "y":0},
+                {"label":"K02 (D1,F4)", "x":2, "y":0},
+                {"label":"K03 (D1,F5)", "x":3, "y":0},
+                {"label":"K04 (D1,F6)", "x":4, "y":0},
+                {"label":"K05 (D1,F7)", "x":5, "y":0},
+                {"label":"K06 (D1,C7)", "x":6.5, "y":0},
+                {"label":"K07 (D1,C6)", "x":7.5, "y":0},
+                {"label":"K08 (D1,B6)", "x":8.5, "y":0},
+                {"label":"K09 (D1,B5)", "x":9.5, "y":0},
+                {"label":"K0A (D1,B4)", "x":11, "y":0},
+                {"label":"K0B (D1,D7)", "x":12, "y":0},
+                {"label":"K0C (D1,D4)", "x":13, "y":0},
+                {"label":"K0D (D1,D6)", "x":14, "y":0},
+                {"label":"K0E (D1,D2)", "x":15.25, "y":0},
+                {"label":"K0F (D1,D3)", "x":16.25, "y":0},
+                {"label":"K0G (D1,D5)", "x":17.25, "y":0},
+                {"label":"K10 (D0,F0)", "x":0, "y":1.5},
+                {"label":"K11 (D0,F1)", "x":1, "y":1.5},
+                {"label":"K12 (D0,F4)", "x":2, "y":1.5},
+                {"label":"K13 (D0,F5)", "x":3, "y":1.5},
+                {"label":"K14 (D0,F6)", "x":4, "y":1.5},
+                {"label":"K15 (D0,F7)", "x":5, "y":1.5},
+                {"label":"K16 (D0,C7)", "x":6, "y":1.5},
+                {"label":"K17 (D0,C6)", "x":7, "y":1.5},
+                {"label":"K18 (D0,B6)", "x":8, "y":1.5},
+                {"label":"K19 (D0,B5)", "x":9, "y":1.5},
+                {"label":"K1A (D0,B4)", "x":10, "y":1.5},
+                {"label":"K1B (D0,D7)", "x":11, "y":1.5},
+                {"label":"K1C (D0,D4)", "x":12, "y":1.5},
+                {"label":"K1D (D0,D6)", "x":13, "y":1.5},
+                {"label":"K3E (B0,D2)", "x":14, "y":1.5},
+                {"label":"K1E (D0,D2)", "x":15.25, "y":1.5},
+                {"label":"K1F (D0,D3)", "x":16.25, "y":1.5},
+                {"label":"K1G (D0,D5)", "x":17.25, "y":1.5},
+                {"label":"K20 (B3,F0)", "x":0, "y":2.5, "w":1.5},
+                {"label":"K21 (B3,F1)", "x":1.5, "y":2.5},
+                {"label":"K22 (B3,F4)", "x":2.5, "y":2.5},
+                {"label":"K23 (B3,F5)", "x":3.5, "y":2.5},
+                {"label":"K24 (B3,F6)", "x":4.5, "y":2.5},
+                {"label":"K25 (B3,F7)", "x":5.5, "y":2.5},
+                {"label":"K26 (B3,C7)", "x":6.5, "y":2.5},
+                {"label":"K27 (B3,C6)", "x":7.5, "y":2.5},
+                {"label":"K28 (B3,B6)", "x":8.5, "y":2.5},
+                {"label":"K29 (B3,B5)", "x":9.5, "y":2.5},
+                {"label":"K2A (B3,B4)", "x":10.5, "y":2.5},
+                {"label":"K2B (B3,D7)", "x":11.5, "y":2.5},
+                {"label":"K2C (B3,D4)", "x":12.5, "y":2.5},
+                {"label":"K2D (B3,D6)", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"K2E (B3,D2)", "x":15.25, "y":2.5},
+                {"label":"K2F (B3,D3)", "x":16.25, "y":2.5},
+                {"label":"K2G (B3,D5)", "x":17.25, "y":2.5},
+                {"label":"K30 (B0,F0)", "x":0, "y":3.5, "w":1.75},
+                {"label":"K31 (B0,F1)", "x":1.75, "y":3.5},
+                {"label":"K32 (B0,F4)", "x":2.75, "y":3.5},
+                {"label":"K33 (B0,F5)", "x":3.75, "y":3.5},
+                {"label":"K34 (B0,F6)", "x":4.75, "y":3.5},
+                {"label":"K35 (B0,F7)", "x":5.75, "y":3.5},
+                {"label":"K36 (B0,C7)", "x":6.75, "y":3.5},
+                {"label":"K37 (B0,C6)", "x":7.75, "y":3.5},
+                {"label":"K38 (B0,B6)", "x":8.75, "y":3.5},
+                {"label":"K39 (B0,B5)", "x":9.75, "y":3.5},
+                {"label":"K3A (B0,B4)", "x":10.75, "y":3.5},
+                {"label":"K3B (B0,D7)", "x":11.75, "y":3.5},
+                {"label":"K3D (B0,D6)", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"K40 (B2,F0)", "x":0, "y":4.5, "w":1.25},
+                {"label":"K41 (B2,F1)", "x":1.25, "y":4.5},
+                {"label":"K42 (B2,F4)", "x":2.25, "y":4.5},
+                {"label":"K43 (B2,F5)", "x":3.25, "y":4.5},
+                {"label":"K44 (B2,F6)", "x":4.25, "y":4.5},
+                {"label":"K45 (B2,F7)", "x":5.25, "y":4.5},
+                {"label":"K46 (B2,C7)", "x":6.25, "y":4.5},
+                {"label":"K47 (B2,C6)", "x":7.25, "y":4.5},
+                {"label":"K48 (B2,B6)", "x":8.25, "y":4.5},
+                {"label":"K49 (B2,B5)", "x":9.25, "y":4.5},
+                {"label":"K4A (B2,B4)", "x":10.25, "y":4.5},
+                {"label":"K4B (B2,D7)", "x":11.25, "y":4.5},
+                {"label":"K4C (B2,D4)", "x":12.25, "y":4.5, "w":1.75},
+                {"label":"K4D (B2,D6)", "x":14, "y":4.5},
+                {"label":"K4F (B2,D3)", "x":16.25, "y":4.5},
+                {"label":"K50 (B1,F0)", "x":0, "y":5.5, "w":1.25},
+                {"label":"K51 (B1,F1)", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"K52 (B1,F4)", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"K56 (B1,C7)", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"K5A (B1,B4)", "x":10, "y":5.5, "w":1.25},
+                {"label":"K5B (B1,D7)", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"K5C (B1,D4)", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"K5D (B1,D6)", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"K5E (B1,D2)", "x":15.25, "y":5.5},
+                {"label":"K5F (B1,D3)", "x":16.25, "y":5.5},
+                {"label":"K5G (B1,D5)", "x":17.25, "y":5.5}
+            ]
+        }
+    }
+
+}
diff --git a/keyboards/gray_studio/apollo80/keymaps/default/config.h b/keyboards/gray_studio/apollo80/keymaps/default/config.h
new file mode 100644
index 0000000000..68ad650de4
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/keymaps/default/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+
+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 RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/gray_studio/apollo80/keymaps/default/keymap.c b/keyboards/gray_studio/apollo80/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b4eb52630e
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/keymaps/default/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT,   KC_NUBS,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,        KC_RSFT,             KC_UP,
+        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,   MO(1),     KC_RGUI,   KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        RESET,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,   _______,_______,_______,_______,_______,_______, NK_TOGG, _______, _______, _______, _______, _______,        _______,            _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______, _______, _______
+    ),
+
+};
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0,4, HSV_WHITE}
+);     
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    return true;
+}
diff --git a/keyboards/gray_studio/apollo80/keymaps/via/config.h b/keyboards/gray_studio/apollo80/keymaps/via/config.h
new file mode 100644
index 0000000000..68ad650de4
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+
+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 RGBLIGHT_LAYERS
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/gray_studio/apollo80/keymaps/via/keymap.c b/keyboards/gray_studio/apollo80/keymaps/via/keymap.c
new file mode 100644
index 0000000000..27f0a2c2c0
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/keymaps/via/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2020 Demo Studio <https://www.instagram.com/demostudio01>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,       KC_F5,   KC_F6,   KC_F7,   KC_F8,        KC_F9,   KC_F10,  KC_F11,  KC_F12,    KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        KC_DEL,  KC_END,  KC_PGDN,
+        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSFT,   KC_NUBS,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,        KC_RSFT,             KC_UP,
+        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT,   MO(1),     KC_RGUI,   KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        RESET,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,   _______,_______,_______,_______,_______,_______, NK_TOGG, _______, _______, _______, _______, _______,        _______,            _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______, _______, _______
+    ),
+    [2] = LAYOUT(
+       _______,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,   _______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______,        _______,            _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______, _______, _______
+    ),
+    [3] = LAYOUT(
+        _______,           _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,   _______,_______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______,        _______,            _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______, _______, _______
+    ),
+
+};
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {0,4, HSV_WHITE}
+);     
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_capslock_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = my_rgb_layers;
+}
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(0, led_state.caps_lock);
+    return true;
+}
\ No newline at end of file
diff --git a/keyboards/gray_studio/apollo80/keymaps/via/rules.mk b/keyboards/gray_studio/apollo80/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/gray_studio/apollo80/readme.md b/keyboards/gray_studio/apollo80/readme.md
new file mode 100644
index 0000000000..e70e104ef3
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/readme.md
@@ -0,0 +1,26 @@
+# APOLLO 80
+
+80% / TKL keyboard with a 5.5 degree angle ran by Airpotter. PCB Manufactured by DEMO Studio and Keyboard manufactured by Gray Studio.
+
+-   Keyboard Maintainer: [Chris Beswick](https://github.com/ChrisBeswick/)
+-   Hardware Supported: Stock / Default Apollo80 PCB
+-   Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=110033.0)
+-   Group Buy Location: [Graystudio.club](https://graystudio.club/products/gb-space80-apollo)
+
+How to build this firmware using QMK MSYS
+
+    qmk compile -kb gray_studio/apollo80 -km default
+
+Make example for this keyboard (after setting up your build environment using make):
+
+    make gray_studio/apollo80: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+-   **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+-   **Physical reset button**: Bridge the pads labelled 'RE' underneath the Space Bar.
+-   **Keycode in layout**: Hold MO(1) and press ESC (If you've changed bindings from the default, this may not be the case)
diff --git a/keyboards/gray_studio/apollo80/rules.mk b/keyboards/gray_studio/apollo80/rules.mk
new file mode 100644
index 0000000000..cb5238f27d
--- /dev/null
+++ b/keyboards/gray_studio/apollo80/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file

From a772a7f3a796d29aa830769d7629ed8cd8cb5f0d Mon Sep 17 00:00:00 2001
From: Dan Beste <drb@wishalloy.com>
Date: Wed, 23 Mar 2022 11:33:30 -0500
Subject: [PATCH 858/867] [Keymap] Input Club's Whitefox "True Fox" (#16711)

---
 .../whitefox/keymaps/truefox/keymap.c         | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 keyboards/input_club/whitefox/keymaps/truefox/keymap.c

diff --git a/keyboards/input_club/whitefox/keymaps/truefox/keymap.c b/keyboards/input_club/whitefox/keymaps/truefox/keymap.c
new file mode 100644
index 0000000000..2af5467311
--- /dev/null
+++ b/keyboards/input_club/whitefox/keymaps/truefox/keymap.c
@@ -0,0 +1,60 @@
+/*
+Copyright 2015 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ ~ │ \ │PrS│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+     * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Backs│Del│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │Enter   │PgU│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │Shift   │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │PgD│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │Ctrl│GUI │Alt │                        │Alt │Fn  │ │ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
+    [0] = LAYOUT_65_ansi_blocker_split_bs(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV, KC_BSLS, KC_PSCR,
+        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_BSPC,         KC_DEL,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,     KC_ENT,               KC_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,     KC_UP,       KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),                KC_LEFT, KC_DOWN,     KC_RGHT
+    ),
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Fla│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│PrS│ \ │Mut│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+     * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │Delet│Del│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │Enter   │Vl+│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │Shift   │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │PgU│Vl-│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │Ctrl│GUI │Alt │                        │Alt │Fn  │ │Hom│PgD│End│
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
+    [1] = LAYOUT_65_ansi_blocker_split_bs(
+        QK_BOOT, 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_MUTE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,               KC_VOLU,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     KC_PGUP,      KC_VOLD,
+        _______, _______, _______,                            _______,                   _______, _______,              KC_HOME, KC_PGDN,      KC_END
+    )
+};

From 74f4682309d23f347d51f2d64481d7f231697133 Mon Sep 17 00:00:00 2001
From: 4pplet <mail@4pplet.com>
Date: Wed, 23 Mar 2022 17:34:07 +0100
Subject: [PATCH 859/867] [Keyboard] Waffling60 - readme update (#16707)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: 4pplet <4pplet@protonmail.com>
Co-authored-by: 4pplet <stefan.ess@gmail.com>
---
 keyboards/4pplet/waffling60/readme.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/keyboards/4pplet/waffling60/readme.md b/keyboards/4pplet/waffling60/readme.md
index bf5fda8803..374b56ffba 100644
--- a/keyboards/4pplet/waffling60/readme.md
+++ b/keyboards/4pplet/waffling60/readme.md
@@ -11,5 +11,12 @@ Make example for this keyboard (after setting up your build environment):
 
     make 4pplet/waffling60/rev_a:default
     make 4pplet/waffling60/rev_b:default
+    make 4pplet/waffling60/rev_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).
+
+How to enter bootloader (DFU):
+* Tap the physical reset button or short the reset-header (labled RESET) on tha back of the PCB for keyboard to enter DFU. When in DFU, it's ready to flash the firmware.
+
+Alternative option if the firmware is already pre-flashed:
+* Unplug your keyboard, hold down the Spacebar and B at the same time, plug in your keyboard and wait a second before releasing the keys. The keyboard will enter DFU and is ready to flash the firmware.

From 92d38c37ec06aba943464a272886c70ba88e5f68 Mon Sep 17 00:00:00 2001
From: Dan Hertz <daniel@dhertz.com>
Date: Wed, 23 Mar 2022 09:34:42 -0700
Subject: [PATCH 860/867] [Keymap] Add dhertz keychron map v0 (#16571)

---
 keyboards/keychron/q2/rev_0113/config.h       |  2 +-
 .../q2/rev_0113/keymaps/dhertz/keymap.c       | 94 +++++++++++++++++++
 .../q2/rev_0113/keymaps/dhertz/rules.mk       |  1 +
 users/dhertz/dhertz.c                         |  9 ++
 users/dhertz/dhertz.h                         |  5 +
 5 files changed, 110 insertions(+), 1 deletion(-)
 create mode 100644 keyboards/keychron/q2/rev_0113/keymaps/dhertz/keymap.c
 create mode 100644 keyboards/keychron/q2/rev_0113/keymaps/dhertz/rules.mk

diff --git a/keyboards/keychron/q2/rev_0113/config.h b/keyboards/keychron/q2/rev_0113/config.h
index 92b9c2e364..486d3fd3b8 100644
--- a/keyboards/keychron/q2/rev_0113/config.h
+++ b/keyboards/keychron/q2/rev_0113/config.h
@@ -30,4 +30,4 @@
 #define ENCODERS_PAD_B { B5 }
 
 /* Specifies the number of pulses the encoder registers between each detent */
-#define ENCODER_RESOLUTION 2
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/dhertz/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/dhertz/keymap.c
new file mode 100644
index 0000000000..16c2a6d784
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/dhertz/keymap.c
@@ -0,0 +1,94 @@
+// Copyright 2022 Dan Hertz (@dhertz)
+// SPDX-License-Identifier: GPL-3.0
+
+#include QMK_KEYBOARD_H
+#include "dhertz.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Layer 0: Default Layer
+     * ,---------------------------------------------------------------.
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Backsp|( )|
+     * |---------------------------------------------------------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|Enter|Del|
+     * |------------------------------------------------------`    |---|
+     * |SrCtl |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  \|    |Hom|
+     * |---------------------------------------------------------------|
+     * |Shif|  #|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Up |   |
+     * |---------------------------------------------------------------|
+     * |NcCtl|  Alt| CTab|       LyrSpc        |CGv|Alt|CSL|Lef|Dow|Rig|
+     * `---------------------------------------------------------------'
+     */
+  [0] = LAYOUT_iso_68(
+      KC_ESC, KC_1,  KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_MUTE,
+      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_DEL,
+      SRCH_CTL,   KC_A,  KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
+      KC_LSFT, HSH_TLD, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+      NC_CTL, KC_LALT, CMD_TAB_CMD, LYR_SPC, CMD_GRV_CMD, KC_RALT, CMD_SFT_ALT_A, KC_LEFT, KC_DOWN, KC_RIGHT
+      ),
+    /* Layer 1: Special
+     * ,---------------------------------------------------------------.
+     * |  §| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|       |( )|
+     * |---------------------------------------------------------------|
+     * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
+     * |------------------------------------------------------`    |---|
+     * |      |   |   |   |   |   |   |   |   |CSL|   |   |  `|    |   |
+     * |---------------------------------------------------------------|
+     * |    |  `|   |   |CAC|   |   |   |   |   |   |   |      |PgU|   |
+     * |---------------------------------------------------------------|
+     * |     |     |     |                     |   |   |   |Hom|PgD|End|
+     * `---------------------------------------------------------------'
+     */
+  [1] = LAYOUT_iso_68(
+      KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F10, KC_F11, KC_TRNS, CMD_SFT_A,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CMD_SFT_L, KC_TRNS, KC_TRNS, KC_NUBS, KC_TRNS, KC_END,
+      KC_TRNS, KC_NUBS, KC_TRNS, KC_TRNS, CMD_ALT_C, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDOWN, KC_END
+      ),
+};
+
+void keyboard_post_init_user(void) {
+    rgb_matrix_mode(RGB_MATRIX_NONE);
+    rgb_matrix_set_color_all(RGB_BLACK);
+}
+
+uint32_t cancel_cmd(uint32_t trigger_time, void *cb_arg) {
+    if (get_highest_layer(layer_state|default_layer_state) > 0) {
+        return 20;
+    }
+    unregister_code(KC_LCMD);
+    return 0;
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (get_highest_layer(layer_state|default_layer_state) == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    } else {  
+        if ((get_mods() & MOD_BIT(KC_LCMD)) != MOD_BIT(KC_LCMD)) {
+            register_code(KC_LCMD);
+            defer_exec(20, cancel_cmd, NULL);
+        }
+        if (clockwise) {
+            tap_code(KC_TAB);
+        } else {
+            tap_code16(S(KC_TAB));
+        }
+    }
+    return false;
+}
+
+void rgb_matrix_indicators_kb(void) {
+    switch(get_highest_layer(layer_state|default_layer_state)) {
+        case 1:
+            rgb_matrix_set_color_all(RGB_BLACK);
+            rgb_matrix_set_color_all(25, 25, 112);
+            break;
+        default:
+            rgb_matrix_set_color_all(RGB_BLACK);
+            break;
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/dhertz/rules.mk b/keyboards/keychron/q2/rev_0113/keymaps/dhertz/rules.mk
new file mode 100644
index 0000000000..199bad85f3
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/dhertz/rules.mk
@@ -0,0 +1 @@
+DEFERRED_EXEC_ENABLE = yes
diff --git a/users/dhertz/dhertz.c b/users/dhertz/dhertz.c
index f33981e15b..163b1cb644 100644
--- a/users/dhertz/dhertz.c
+++ b/users/dhertz/dhertz.c
@@ -1,3 +1,6 @@
+// Copyright 2022 Dan Hertz (@dhertz)
+// SPDX-License-Identifier: GPL-3.0
+
 #include "dhertz.h"
 
 // Add reconfigurable functions here, for keymap customization
@@ -63,6 +66,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             case CMD_SFT_L:
                 SEND_STRING(SS_LGUI("L"));
                 break;
+            case CMD_SFT_A:
+                SEND_STRING(SS_LGUI("A"));
+                break;
+            case CMD_SFT_ALT_A:
+                SEND_STRING(SS_LGUI(SS_LALT("A")));
+                break;
             case ISO_COUNTRY_CODE:
                 SEND_STRING("country_iso_alpha2_code");
                 break;
diff --git a/users/dhertz/dhertz.h b/users/dhertz/dhertz.h
index aef613f55d..f980329fa5 100644
--- a/users/dhertz/dhertz.h
+++ b/users/dhertz/dhertz.h
@@ -1,3 +1,6 @@
+// Copyright 2022 Dan Hertz (@dhertz)
+// SPDX-License-Identifier: GPL-3.0
+
 #ifndef USERSPACE
 #define USERSPACE
 
@@ -15,6 +18,8 @@ enum custom_keycodes {
     ISO_COUNTRY_CODE,
     CMD_TAB_CMD,
     CMD_GRV_CMD,
+    CMD_SFT_A,
+    CMD_SFT_ALT_A,
     NEW_SAFE_RANGE,
 };
 

From 08aa54b66f0177648c4077bc3e6d4534c8dc4ad7 Mon Sep 17 00:00:00 2001
From: Minna Pallari <pallarim@gmail.com>
Date: Wed, 23 Mar 2022 18:35:14 +0200
Subject: [PATCH 861/867] [Keymap] Xiudi XD75 Finnish/Swedish keymap (#16311)

---
 keyboards/xiudi/xd75/keymaps/minna/config.h  |  7 ++
 keyboards/xiudi/xd75/keymaps/minna/keymap.c  | 79 ++++++++++++++++++++
 keyboards/xiudi/xd75/keymaps/minna/readme.md | 13 ++++
 keyboards/xiudi/xd75/keymaps/minna/rules.mk  |  1 +
 4 files changed, 100 insertions(+)
 create mode 100644 keyboards/xiudi/xd75/keymaps/minna/config.h
 create mode 100644 keyboards/xiudi/xd75/keymaps/minna/keymap.c
 create mode 100644 keyboards/xiudi/xd75/keymaps/minna/readme.md
 create mode 100644 keyboards/xiudi/xd75/keymaps/minna/rules.mk

diff --git a/keyboards/xiudi/xd75/keymaps/minna/config.h b/keyboards/xiudi/xd75/keymaps/minna/config.h
new file mode 100644
index 0000000000..27975f0e24
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/minna/config.h
@@ -0,0 +1,7 @@
+// Copyright 2022 Minna Pallari (@pallarim)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+// place overrides here
+#define UNICODE_SELECTED_MODES UC_WINC, UC_LNX, UC_MAC
\ No newline at end of file
diff --git a/keyboards/xiudi/xd75/keymaps/minna/keymap.c b/keyboards/xiudi/xd75/keymaps/minna/keymap.c
new file mode 100644
index 0000000000..ef3f400bc1
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/minna/keymap.c
@@ -0,0 +1,79 @@
+// Copyright 2022 Minna Pallari (@pallarim)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+#include "keymap_finnish.h"
+
+enum unicode_names {
+    BEER,
+    BEERS
+};
+
+enum custom_keycodes {
+    QMKBEST = SAFE_RANGE,
+};
+
+const uint32_t PROGMEM unicode_map[] = {
+    [BEER]  = 0x1F37A,  // 🍺
+    [BEERS] = 0x1F37B   // 🍻
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+		switch(keycode) {
+			case QMKBEST:
+				SEND_STRING(SS_LGUI("r") SS_DELAY(500) "calc\n" SS_DELAY(1000) "1337");
+                break;
+		}
+	}
+	return true;
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ESC│ § | 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ + │ ´ │BS │
+ * ├───|───|───|───|───|───|───|───|───|───|───|───|───|───|───|
+ * │TAB    | Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Å │ ¨ │   │
+ * ├───|───|───|───|───|───|───|───|───|───|───|───|───|───|ENT|
+ * │CPS    │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ö │ Ä │ ' │   │
+ * ├───|───|───|───|───|───|───|───|───|───|───|───|───|───|───|
+ * │SFT│ < │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │SFT|UP |   │
+ * ├───|───|───|───|───|───|───|───|───|───|───|───|───|───|───|
+ * │CTR│FN │WIN│ALT│BER│  SPC  │  SPC  │AGR│MNU│CTR│LF │DN │RG │
+ * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+ */
+
+	[0] = LAYOUT_ortho_5x15(
+   KC_ESC, FI_SECT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, FI_PLUS, FI_ACUT, KC_BSPC,
+   KC_TAB, KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, FI_ARNG, FI_DIAE, KC_ENT, 
+   KC_CAPS, KC_NO, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, FI_ODIA, FI_ADIA, FI_QUOT, KC_NO,
+   KC_LSFT, FI_LABK, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, FI_MINS, KC_RSFT, KC_UP, KC_NO,
+   KC_LCTL, MO(1), KC_LGUI, KC_LALT, XP(BEER, BEERS), KC_SPC, KC_NO, KC_SPC, KC_NO, KC_RALT, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+/*
+ * ┌────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Mute│CAL| F1│F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│DEL│
+ * ├────|───|───|───|───|───|───|───|───|───|───|───|───|───|───|
+ * │MSel    |My │Ma │RGB│RGB│Cal│ 7 │ 8 │ 9 │ - │   │Prn│SL │ P │
+ * │        |Cmp│il │HUD│HUI│   │   │   │   │   │   │Scr│CK │ a │
+ * ├────|───|───|───|───|───|───|───|───|───|───|───|───|───| u |
+ * │MPrev   │   │   │RGB│RGB│   │ 4 │ 5 │ 6 │ + │RST│   │   │ s │
+ * │        │NXT│STP│SAD│SAI│PLY│   │   │   │   │   │   │   │ e │
+ * ├────|───|───|───|───|───|───|───|───|───|───|───|───|───|───|
+ * │Vo- │Mte│Vo+│App│RGB│RGB│   │ 1 │ 2 │ 3 │ENT│   │   |   |   │
+ * │    │   │   │   │VAD│VAI│   │ 1 │ 2 │ 3 │ENT│   │   |   |   │
+ * ├────|───|───|───|───|───|───|───|───|───|───|───|───|───|───|
+ * │    │FN │RGB│   │RMR│RGB_MOD│ 0     │ . │ENT│ENT│FN │UCR│UCM│
+ * └────┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+ */
+
+	[1] = LAYOUT_ortho_5x15(
+    KC_MUTE, QMKBEST, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
+    KC_MSEL, KC_NO,   KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_CALC, KC_P7, KC_P8, KC_P9, KC_MINS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS,
+    KC_MPRV, KC_NO,   KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_MPLY, KC_P4, KC_P5, KC_P6, KC_PLUS, RESET, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_NO, KC_P1, KC_P2, KC_P3, KC_PENT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, MO(1),   RGB_TOG, KC_NO,   RGB_RMOD,RGB_MOD, KC_NO, KC_P0, KC_NO, KC_PDOT, KC_PENT, KC_PENT, MO(1), UC_RMOD, UC_MOD)
+};
+
diff --git a/keyboards/xiudi/xd75/keymaps/minna/readme.md b/keyboards/xiudi/xd75/keymaps/minna/readme.md
new file mode 100644
index 0000000000..0291fd3a85
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/minna/readme.md
@@ -0,0 +1,13 @@
+# XD75 Fi/Sv board with some extras
+
+## Keymap
+
+### Base & Function Layer
+
+![Base layer](https://i.imgur.com/x8VFgYg.png)
+
+## Build
+
+To build the default keymap, simply run:
+
+    make xiudi/xd75/minna
diff --git a/keyboards/xiudi/xd75/keymaps/minna/rules.mk b/keyboards/xiudi/xd75/keymaps/minna/rules.mk
new file mode 100644
index 0000000000..0517619ed1
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/minna/rules.mk
@@ -0,0 +1 @@
+UNICODEMAP_ENABLE = yes
\ No newline at end of file

From 4a3b4104feb7f0948a8b9f97b39534fc68c62e73 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Wed, 23 Mar 2022 09:38:51 -0700
Subject: [PATCH 862/867] [Bug] Fix unused variable error when using ChibiOS
 Bitbang serial driver (#16709)

---
 platforms/chibios/drivers/serial.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platforms/chibios/drivers/serial.c b/platforms/chibios/drivers/serial.c
index 6db5d85250..bb7b3c0554 100644
--- a/platforms/chibios/drivers/serial.c
+++ b/platforms/chibios/drivers/serial.c
@@ -171,7 +171,8 @@ void interrupt_handler(void *arg) {
         checksum_computed += split_trans_initiator2target_buffer(trans)[i];
     }
     checksum_computed ^= 7;
-    uint8_t checksum_received = serial_read_byte();
+
+    serial_read_byte();
     sync_send();
 
     // wait for the sync to finish sending

From 55b3b2b8487ff9008806d41bd77a10fc796c4103 Mon Sep 17 00:00:00 2001
From: kopibeng <52724926+kopibeng@users.noreply.github.com>
Date: Thu, 24 Mar 2022 02:42:54 +0800
Subject: [PATCH 863/867] [Keyboard] Add support for XT60 (#16708)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/kopibeng/xt60/config.h              | 81 +++++++++++++++++++
 keyboards/kopibeng/xt60/info.json             | 81 +++++++++++++++++++
 .../kopibeng/xt60/keymaps/default/keymap.c    | 57 +++++++++++++
 keyboards/kopibeng/xt60/keymaps/via/keymap.c  | 57 +++++++++++++
 keyboards/kopibeng/xt60/keymaps/via/rules.mk  |  2 +
 keyboards/kopibeng/xt60/readme.md             | 21 +++++
 keyboards/kopibeng/xt60/rules.mk              | 18 +++++
 keyboards/kopibeng/xt60/xt60.c                | 17 ++++
 keyboards/kopibeng/xt60/xt60.h                | 55 +++++++++++++
 9 files changed, 389 insertions(+)
 create mode 100644 keyboards/kopibeng/xt60/config.h
 create mode 100644 keyboards/kopibeng/xt60/info.json
 create mode 100644 keyboards/kopibeng/xt60/keymaps/default/keymap.c
 create mode 100644 keyboards/kopibeng/xt60/keymaps/via/keymap.c
 create mode 100644 keyboards/kopibeng/xt60/keymaps/via/rules.mk
 create mode 100644 keyboards/kopibeng/xt60/readme.md
 create mode 100644 keyboards/kopibeng/xt60/rules.mk
 create mode 100644 keyboards/kopibeng/xt60/xt60.c
 create mode 100644 keyboards/kopibeng/xt60/xt60.h

diff --git a/keyboards/kopibeng/xt60/config.h b/keyboards/kopibeng/xt60/config.h
new file mode 100644
index 0000000000..30aff4955e
--- /dev/null
+++ b/keyboards/kopibeng/xt60/config.h
@@ -0,0 +1,81 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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       0x4B50 // 'KP' kopibeng  
+#define PRODUCT_ID      0x0600 
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    kopibeng
+#define PRODUCT         XT60
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * 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 { F7, F4, D0, B3, B7 }
+#define MATRIX_COL_PINS { C7, F5, F1, F0, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1 }
+
+#define LED_CAPS_LOCK_PIN D4
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN F6
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 14
+    #define RGBLIGHT_HUE_STEP 8
+    #define RGBLIGHT_SAT_STEP 8
+    #define RGBLIGHT_VAL_STEP 8
+    #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//    #define RGBLIGHT_ANIMATIONS
+// /*== or choose 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
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
\ No newline at end of file
diff --git a/keyboards/kopibeng/xt60/info.json b/keyboards/kopibeng/xt60/info.json
new file mode 100644
index 0000000000..fbd8904a7f
--- /dev/null
+++ b/keyboards/kopibeng/xt60/info.json
@@ -0,0 +1,81 @@
+{
+    "keyboard_name": "XT60",
+    "maintainer": "Kopibeng",
+    "url": "",
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "0,0", "x": 0, "y": 0 },
+                { "label": "0,1", "x": 1, "y": 0 },
+                { "label": "0,2", "x": 2, "y": 0 },
+                { "label": "0,3", "x": 3, "y": 0 },
+                { "label": "0,4", "x": 4, "y": 0 },
+                { "label": "0,5", "x": 5, "y": 0 },
+                { "label": "0,6", "x": 6, "y": 0 },
+                { "label": "0,7", "x": 7, "y": 0 },
+                { "label": "0,8", "x": 8, "y": 0 },
+                { "label": "0,9", "x": 9, "y": 0 },
+                { "label": "0,A", "x": 10, "y": 0 },
+                { "label": "0,B", "x": 11, "y": 0 },
+                { "label": "0,C", "x": 12, "y": 0 },
+                { "label": "0,D", "x": 13, "y": 0 },
+                { "label": "1,D", "x": 14, "y": 0 },
+				
+                { "label": "1,0", "w": 1.5, "x": 0, "y": 1 },
+                { "label": "1,1", "x": 1.5, "y": 1 },
+                { "label": "1,2", "x": 2.5, "y": 1 },
+                { "label": "1,3", "x": 3.5, "y": 1 },
+                { "label": "1,4", "x": 4.5, "y": 1 },
+                { "label": "1,5", "x": 5.5, "y": 1 },
+                { "label": "1,6", "x": 6.5, "y": 1 },
+                { "label": "1,7", "x": 7.5, "y": 1 },
+                { "label": "1,8", "x": 8.5, "y": 1 },
+                { "label": "1,9", "x": 9.5, "y": 1 },
+                { "label": "1,A", "x": 10.5, "y": 1 },
+                { "label": "1,B", "x": 11.5, "y": 1 },
+                { "label": "1,C", "x": 12.5, "y": 1 },
+                { "label": "2,C", "w": 1.5, "x": 13.5, "y": 1 },
+				
+                { "label": "2,0", "w": 1.75, "x": 0, "y": 2 },
+                { "label": "2,1", "x": 1.75, "y": 2 },
+                { "label": "2,2", "x": 2.75, "y": 2 },
+                { "label": "2,3", "x": 3.75, "y": 2 },
+                { "label": "2,4", "x": 4.75, "y": 2 },
+                { "label": "2,5", "x": 5.75, "y": 2 },
+                { "label": "2,6", "x": 6.75, "y": 2 },
+                { "label": "2,7", "x": 7.75, "y": 2 },
+                { "label": "2,8", "x": 8.75, "y": 2 },
+                { "label": "2,9", "x": 9.75, "y": 2 },
+                { "label": "2,A", "x": 10.75, "y": 2 },
+                { "label": "2,B", "x": 11.75, "y": 2 },
+                { "label": "2,D", "w": 2.25, "x": 12.75, "y": 2 },
+				
+                { "label": "3,0", "w": 1.25, "x": 0, "y": 3 },
+                { "label": "3,1", "x": 1.25, "y": 3 },
+                { "label": "3,2", "x": 2.25, "y": 3 },
+                { "label": "3,3", "x": 3.25, "y": 3 },
+                { "label": "3,4", "x": 4.25, "y": 3 },
+                { "label": "3,5", "x": 5.25, "y": 3 },
+                { "label": "3,6", "x": 6.25, "y": 3 },
+                { "label": "3,7", "x": 7.25, "y": 3 },
+                { "label": "3,8", "x": 8.25, "y": 3 },
+                { "label": "3,9", "x": 9.25, "y": 3 },
+                { "label": "3,A", "x": 10.25, "y": 3 },
+                { "label": "3,B", "x": 11.25, "y": 3 },
+                { "label": "3,C", "w": 1.75, "x": 12.25, "y": 3 },
+                { "label": "3,D", "x": 14, "y": 3 },
+				
+                { "label": "4,0", "w": 1.25, "x": 0, "y": 4 },
+                { "label": "4,1", "w": 1.25, "x": 1.25, "y": 4 },
+                { "label": "4,2", "w": 1.25, "x": 2.5, "y": 4 },
+                { "label": "4,4", "w": 2.25, "x": 3.75, "y": 4 },
+                { "label": "4,6", "w": 1.25, "x": 6, "y": 4 },
+                { "label": "4,8", "w": 2.75, "x": 7.25, "y": 4 },
+                { "label": "4,A", "w": 1.25, "x": 10, "y": 4 },
+                { "label": "4,B", "w": 1.25, "x": 11.25, "y": 4 },
+                { "label": "4,C", "w": 1.25, "x": 12.5, "y": 4 },
+                { "label": "4,D", "w": 1.25, "x": 13.75, "y": 4 }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/keyboards/kopibeng/xt60/keymaps/default/keymap.c b/keyboards/kopibeng/xt60/keymaps/default/keymap.c
new file mode 100644
index 0000000000..337ec2836f
--- /dev/null
+++ b/keyboards/kopibeng/xt60/keymaps/default/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	// Default layer
+	[0] = LAYOUT_all(
+		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_BSPC,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,         
+		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),  
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           MO(2),   KC_RALT, MO(1),   KC_RCTL
+	),
+
+	// Fn1 Layer
+	[1] = LAYOUT_all(
+		KC_TRNS, 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_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	// Fn2 Layer
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+	
+	// Fn3 Layer
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+};
+
diff --git a/keyboards/kopibeng/xt60/keymaps/via/keymap.c b/keyboards/kopibeng/xt60/keymaps/via/keymap.c
new file mode 100644
index 0000000000..337ec2836f
--- /dev/null
+++ b/keyboards/kopibeng/xt60/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	// Default layer
+	[0] = LAYOUT_all(
+		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_BSPC,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,        
+		KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,         
+		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(2),  
+		KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC,           KC_SPC,           KC_SPC,           MO(2),   KC_RALT, MO(1),   KC_RCTL
+	),
+
+	// Fn1 Layer
+	[1] = LAYOUT_all(
+		KC_TRNS, 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_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+
+	// Fn2 Layer
+	[2] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+	
+	// Fn3 Layer
+	[3] = LAYOUT_all(
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+	),
+};
+
diff --git a/keyboards/kopibeng/xt60/keymaps/via/rules.mk b/keyboards/kopibeng/xt60/keymaps/via/rules.mk
new file mode 100644
index 0000000000..43061db1dd
--- /dev/null
+++ b/keyboards/kopibeng/xt60/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/kopibeng/xt60/readme.md b/keyboards/kopibeng/xt60/readme.md
new file mode 100644
index 0000000000..177b22be4c
--- /dev/null
+++ b/keyboards/kopibeng/xt60/readme.md
@@ -0,0 +1,21 @@
+# XT60
+
+![XT60](https://i.imgur.com/n1arBEw.png)
+
+A QMK-powered, VIA-enabled universal 60% PCB with support for ANSI/ISO layouts, split Backspace, split Right Shift, stepped Caps Lock, 6.25U/7U bottom row, split Spacebar and RGB underglow. 
+
+* Keyboard Maintainer: kopibeng
+* Hardware Supported: A 60% keyboard with ATMEGA32U4
+* Hardware Availability: N/A
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kopibeng/xt60:via
+
+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).
+
+## Bootloader
+
+* Physical reset button: Press the RESET switch on top side of PCB.
+* Bootmagic reset: Unplug keyboard, hold down ESC key and plug in the keyboard.
+* Keycode reset: Press the RESET keycode (default: MO(1) + R keys) in layout if available.
\ No newline at end of file
diff --git a/keyboards/kopibeng/xt60/rules.mk b/keyboards/kopibeng/xt60/rules.mk
new file mode 100644
index 0000000000..72ab2800c5
--- /dev/null
+++ b/keyboards/kopibeng/xt60/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/keyboards/kopibeng/xt60/xt60.c b/keyboards/kopibeng/xt60/xt60.c
new file mode 100644
index 0000000000..db8993d58b
--- /dev/null
+++ b/keyboards/kopibeng/xt60/xt60.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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 "xt60.h"
\ No newline at end of file
diff --git a/keyboards/kopibeng/xt60/xt60.h b/keyboards/kopibeng/xt60/xt60.h
new file mode 100644
index 0000000000..0e4b4ea2aa
--- /dev/null
+++ b/keyboards/kopibeng/xt60/xt60.h
@@ -0,0 +1,55 @@
+/* Copyright 2021 Samuel Lu
+ *
+ * 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 ___ KC_NO
+
+/*
+ *              ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐    ┌───────┐
+ *              │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1D │    │1D     │ 2u Backspace
+ *              ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤    └─┬─────┤
+ *              │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │2C   │      │     │
+ *  2.25u       ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤   ┌──┴┐2D  │ ISO Enter
+ *  LShift      │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │   │2C │    │
+ * ┌────────┐   ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌─┴───┴────┤
+ * │30      │   │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │ │3C        │ 2.75u RShift
+ * └────────┘   ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤ └──────────┘
+ *              │40  │41  │42  │44      │46  │48        │4A  │4B  │4C  │4D  │  2.25u/1.25u/2.75u Split Spacebar
+ *              └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+ *              ┌────┬────┬────┬────────────────────────┬────┬────┬────┬────┐
+ *              │40  │41  │42  │46                      │4A  │4B  │4C  │4D  │  ANSI 6.25u
+ *              └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ *              ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
+ *              │40   │41 │42   │46                         │4B   │4C │4D   │  7u/WKL
+ *              └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+
+#define LAYOUT_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41, K42,      K44,      K46,      K48,      K4A, K4B, K4C, K4D  \
+) { \
+    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \
+    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \
+    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D}, \
+    {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D}, \
+    {K40, K41, K42, ___, K44, ___, K46, ___, K48, ___, K4A, K4B, K4C, K4D}  \
+}

From e335d62eda6f9c295c1717cf7511dfb74a436f03 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Wed, 23 Mar 2022 23:23:40 -0600
Subject: [PATCH 864/867] [Keyboard] Add keyboard level encoder function for
 GMMK Pro (#16721)

---
 keyboards/gmmk/pro/pro.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/keyboards/gmmk/pro/pro.c b/keyboards/gmmk/pro/pro.c
index 816d089a58..6aed1d6e18 100644
--- a/keyboards/gmmk/pro/pro.c
+++ b/keyboards/gmmk/pro/pro.c
@@ -14,3 +14,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "pro.h"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    if (clockwise) {
+        tap_code_delay(KC_VOLU, 10);
+    } else {
+        tap_code_delay(KC_VOLD, 10);
+    }
+    return false;
+}
+#endif

From 980a1b05629e351d19ff9ddc1bb5a1d38bab6414 Mon Sep 17 00:00:00 2001
From: Nathan Johnson <njohnson@ena.com>
Date: Thu, 24 Mar 2022 00:24:02 -0500
Subject: [PATCH 865/867] [Keymap] ergodox: updating
 osx_whiskey_tango_foxtrot_capslock to use process_record_user (#16715)

---
 .../keymap.c                                  | 45 ++++++++++++++++++-
 .../rules.mk                                  |  2 +
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/rules.mk

diff --git a/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c
index 54e1183e9f..2285aa4a94 100644
--- a/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c
+++ b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c
@@ -15,6 +15,10 @@ enum layer_names {
 
 typedef enum onoff_t {OFF, ON} onoff;
 
+#define caps_led_on  ergodox_right_led_2_on
+#define caps_led_off ergodox_right_led_2_off
+
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
@@ -123,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
     // MEDIA AND TENKEY
     [MDIA] = LAYOUT_ergodox(
-       KC_NO,   KC_NO,   KC_MUTE, KC_VOLD, KC_VOLU, KC_F14,  KC_F15,
+       QK_BOOT, KC_NO,   KC_MUTE, KC_VOLD, KC_VOLU, KC_F14,  KC_F15,
        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
@@ -142,6 +146,45 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_TRNS, KC_TRNS, KC_TRNS
     ),
 };
+#ifndef NO_FAKE_CAPS
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static onoff caps_state = OFF;
+
+    switch (keycode) {
+        case KC_CAPS:
+            if (record->event.pressed) {
+                if (caps_state == OFF) {
+                    caps_led_on();
+                    caps_state = ON;
+                } else {
+                    caps_led_off();
+                    caps_state = OFF;
+                }
+            }
+            break;
+        default:
+            if (keycode < KC_A || keycode > KC_Z) {
+                // This isn't an alpha or a KC_CAPS, continue on as usual.
+                return true;
+            }
+            if (record->event.pressed) {
+                bool shifted = (caps_state == ON && get_mods() == 0);
+                if (shifted) {
+                    register_code(KC_LSFT);
+                }
+                register_code(keycode);
+                if (shifted) {
+                    unregister_code(KC_LSFT);
+                }
+            } else {
+                unregister_code(keycode);
+            }
+            break;
+    }
+    // If we get here, we've already handled the keypresses.
+    return false;
+}
+#endif
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
diff --git a/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/rules.mk b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/rules.mk
new file mode 100644
index 0000000000..e8242c2695
--- /dev/null
+++ b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/rules.mk
@@ -0,0 +1,2 @@
+# uncomment below to disable fake capslock
+# OPT_DEFS += -DNO_FAKE_CAPS

From f7a5ec2483ef05d22b6604f0da1447cea5281243 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 24 Mar 2022 17:42:48 +0100
Subject: [PATCH 866/867] update
 kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala keymap (#16725)

---
 .../kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h   | 1 +
 .../kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
index b8dea6a76a..997e4015de 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/config.h
@@ -3,4 +3,5 @@
 
 #pragma once
 
+#define TAPPING_TERM 150
 #define UNICODE_SELECTED_MODES UC_LNX
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk
index fd581f26db..12dd57c557 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala/rules.mk
@@ -1,2 +1,3 @@
 MOUSEKEY_ENABLE = no
+NKRO_ENABLE = yes
 UNICODE_ENABLE = yes

From efc9c525b19b33c6e09057218ea64f07f45f9555 Mon Sep 17 00:00:00 2001
From: Erovia <Erovia@users.noreply.github.com>
Date: Thu, 24 Mar 2022 20:13:40 +0000
Subject: [PATCH 867/867] CLI: Add 'via2json' subcommand (#16468)

---
 docs/cli_commands.md            |  17 ++++
 lib/python/qmk/cli/__init__.py  |   1 +
 lib/python/qmk/cli/via2json.py  | 145 ++++++++++++++++++++++++++++++++
 lib/python/qmk/json_encoders.py |   8 +-
 lib/python/qmk/keymap.py        |   7 +-
 5 files changed, 176 insertions(+), 2 deletions(-)
 create mode 100755 lib/python/qmk/cli/via2json.py

diff --git a/docs/cli_commands.md b/docs/cli_commands.md
index 93af906b8a..463abcef12 100644
--- a/docs/cli_commands.md
+++ b/docs/cli_commands.md
@@ -335,6 +335,23 @@ This command cleans up the `.build` folder. If `--all` is passed, any .hex or .b
 qmk clean [-a]
 ```
 
+## `qmk via2json`
+
+This command an generate a keymap.json from a VIA keymap backup. Both the layers and the macros are converted, enabling users to easily move away from a VIA-enabled firmware without writing any code or reimplementing their keymaps in QMK Configurator.
+
+**Usage**:
+
+```
+qmk via2json -kb KEYBOARD [-l LAYOUT] [-km KEYMAP] [-o OUTPUT] filename
+```
+
+**Example:**
+
+```
+$ qmk via2json -kb ai03/polaris -o polaris_keymap.json polaris_via_backup.json
+Ψ Wrote keymap to /home/you/qmk_firmware/polaris_keymap.json
+```
+
 ---
 
 # Developer Commands
diff --git a/lib/python/qmk/cli/__init__.py b/lib/python/qmk/cli/__init__.py
index c51eece955..5f65e677e5 100644
--- a/lib/python/qmk/cli/__init__.py
+++ b/lib/python/qmk/cli/__init__.py
@@ -69,6 +69,7 @@ subcommands = [
     'qmk.cli.new.keymap',
     'qmk.cli.pyformat',
     'qmk.cli.pytest',
+    'qmk.cli.via2json',
 ]
 
 
diff --git a/lib/python/qmk/cli/via2json.py b/lib/python/qmk/cli/via2json.py
new file mode 100755
index 0000000000..6edc9dfbe5
--- /dev/null
+++ b/lib/python/qmk/cli/via2json.py
@@ -0,0 +1,145 @@
+"""Generate a keymap.c from a configurator export.
+"""
+import json
+import re
+
+from milc import cli
+
+import qmk.keyboard
+import qmk.path
+from qmk.info import info_json
+from qmk.json_encoders import KeymapJSONEncoder
+from qmk.commands import parse_configurator_json, dump_lines
+from qmk.keymap import generate_json, list_keymaps, locate_keymap, parse_keymap_c
+
+
+def _find_via_layout_macro(keyboard):
+    keymap_layout = None
+    if 'via' in list_keymaps(keyboard):
+        keymap_path = locate_keymap(keyboard, 'via')
+        if keymap_path.suffix == '.json':
+            keymap_layout = parse_configurator_json(keymap_path)['layout']
+        else:
+            keymap_layout = parse_keymap_c(keymap_path)['layers'][0]['layout']
+    return keymap_layout
+
+
+def _convert_macros(via_macros):
+    via_macros = list(filter(lambda f: bool(f), via_macros))
+    if len(via_macros) == 0:
+        return list()
+    split_regex = re.compile(r'(}\,)|(\,{)')
+    macros = list()
+    for via_macro in via_macros:
+        # Split VIA macro to its elements
+        macro = split_regex.split(via_macro)
+        # Remove junk elements (None, '},' and ',{')
+        macro = list(filter(lambda f: False if f in (None, '},', ',{') else True, macro))
+        macro_data = list()
+        for m in macro:
+            if '{' in m or '}' in m:
+                # Found keycode(s)
+                keycodes = m.split(',')
+                # Remove whitespaces and curly braces from around keycodes
+                keycodes = list(map(lambda s: s.strip(' {}'), keycodes))
+                # Remove the KC prefix
+                keycodes = list(map(lambda s: s.replace('KC_', ''), keycodes))
+                macro_data.append({"action": "tap", "keycodes": keycodes})
+            else:
+                # Found text
+                macro_data.append(m)
+        macros.append(macro_data)
+
+    return macros
+
+
+def _fix_macro_keys(keymap_data):
+    macro_no = re.compile(r'MACRO0?([0-9]{1,2})')
+    for i in range(0, len(keymap_data)):
+        for j in range(0, len(keymap_data[i])):
+            kc = keymap_data[i][j]
+            m = macro_no.match(kc)
+            if m:
+                keymap_data[i][j] = f'MACRO_{m.group(1)}'
+    return keymap_data
+
+
+def _via_to_keymap(via_backup, keyboard_data, keymap_layout):
+    # Check if passed LAYOUT is correct
+    layout_data = keyboard_data['layouts'].get(keymap_layout)
+    if not layout_data:
+        cli.log.error(f'LAYOUT macro {keymap_layout} is not a valid one for keyboard {cli.args.keyboard}!')
+        exit(1)
+
+    layout_data = layout_data['layout']
+    sorting_hat = list()
+    for index, data in enumerate(layout_data):
+        sorting_hat.append([index, data['matrix']])
+
+    sorting_hat.sort(key=lambda k: (k[1][0], k[1][1]))
+
+    pos = 0
+    for row_num in range(0, keyboard_data['matrix_size']['rows']):
+        for col_num in range(0, keyboard_data['matrix_size']['cols']):
+            if pos >= len(sorting_hat) or sorting_hat[pos][1][0] != row_num or sorting_hat[pos][1][1] != col_num:
+                sorting_hat.insert(pos, [None, [row_num, col_num]])
+            else:
+                sorting_hat.append([None, [row_num, col_num]])
+            pos += 1
+
+    keymap_data = list()
+    for layer in via_backup['layers']:
+        pos = 0
+        layer_data = list()
+        for key in layer:
+            if sorting_hat[pos][0] is not None:
+                layer_data.append([sorting_hat[pos][0], key])
+            pos += 1
+        layer_data.sort()
+        layer_data = [kc[1] for kc in layer_data]
+        keymap_data.append(layer_data)
+
+    return keymap_data
+
+
+@cli.argument('-o', '--output', arg_only=True, type=qmk.path.normpath, help='File to write to')
+@cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages")
+@cli.argument('filename', type=qmk.path.FileType('r'), arg_only=True, help='VIA Backup JSON file')
+@cli.argument('-kb', '--keyboard', type=qmk.keyboard.keyboard_folder, completer=qmk.keyboard.keyboard_completer, arg_only=True, required=True, help='The keyboard\'s name')
+@cli.argument('-km', '--keymap', arg_only=True, default='via2json', help='The keymap\'s name')
+@cli.argument('-l', '--layout', arg_only=True, help='The keymap\'s layout')
+@cli.subcommand('Convert a VIA backup json to keymap.json format.')
+def via2json(cli):
+    """Convert a VIA backup json to keymap.json format.
+
+    This command uses the `qmk.keymap` module to generate a keymap.json from a VIA backup json. The generated keymap is written to stdout, or to a file if -o is provided.
+    """
+    # Find appropriate layout macro
+    keymap_layout = cli.args.layout if cli.args.layout else _find_via_layout_macro(cli.args.keyboard)
+    if not keymap_layout:
+        cli.log.error(f"Couldn't find LAYOUT macro for keyboard {cli.args.keyboard}. Please specify it with the '-l' argument.")
+        exit(1)
+
+    # Load the VIA backup json
+    with cli.args.filename.open('r') as fd:
+        via_backup = json.load(fd)
+
+    # Generate keyboard metadata
+    keyboard_data = info_json(cli.args.keyboard)
+
+    # Get keycode array
+    keymap_data = _via_to_keymap(via_backup, keyboard_data, keymap_layout)
+
+    # Convert macros
+    macro_data = list()
+    if via_backup.get('macros'):
+        macro_data = _convert_macros(via_backup['macros'])
+
+        # Replace VIA macro keys with JSON keymap ones
+        keymap_data = _fix_macro_keys(keymap_data)
+
+    # Generate the keymap.json
+    keymap_json = generate_json(cli.args.keymap, cli.args.keyboard, keymap_layout, keymap_data, macro_data)
+
+    keymap_lines = [json.dumps(keymap_json, cls=KeymapJSONEncoder)]
+    dump_lines(cli.args.output, keymap_lines, cli.args.quiet)
diff --git a/lib/python/qmk/json_encoders.py b/lib/python/qmk/json_encoders.py
index 72e91973a3..40a5c1dea8 100755
--- a/lib/python/qmk/json_encoders.py
+++ b/lib/python/qmk/json_encoders.py
@@ -146,7 +146,13 @@ class KeymapJSONEncoder(QMKJSONEncoder):
                 if key == 'JSON_NEWLINE':
                     layer.append([])
                 else:
-                    layer[-1].append(f'"{key}"')
+                    if isinstance(key, dict):
+                        # We have a macro
+
+                        # TODO: Add proper support for nicely formatting keymap.json macros
+                        layer[-1].append(f'{self.encode(key)}')
+                    else:
+                        layer[-1].append(f'"{key}"')
 
             layer = [f"{self.indent_str*indent_level}{', '.join(row)}" for row in layer]
 
diff --git a/lib/python/qmk/keymap.py b/lib/python/qmk/keymap.py
index 00b5a78a5a..ca5be0959b 100644
--- a/lib/python/qmk/keymap.py
+++ b/lib/python/qmk/keymap.py
@@ -158,7 +158,7 @@ def is_keymap_dir(keymap, c=True, json=True, additional_files=None):
             return True
 
 
-def generate_json(keymap, keyboard, layout, layers):
+def generate_json(keymap, keyboard, layout, layers, macros=None):
     """Returns a `keymap.json` for the specified keyboard, layout, and layers.
 
     Args:
@@ -173,11 +173,16 @@ def generate_json(keymap, keyboard, layout, layers):
 
         layers
             An array of arrays describing the keymap. Each item in the inner array should be a string that is a valid QMK keycode.
+
+        macros
+            A sequence of strings containing macros to implement for this keyboard.
     """
     new_keymap = template_json(keyboard)
     new_keymap['keymap'] = keymap
     new_keymap['layout'] = layout
     new_keymap['layers'] = layers
+    if macros:
+        new_keymap['macros'] = macros
 
     return new_keymap